Try to be more toolchain agnostic

.gitignore

@@ -1,11 +1,15 @@
 doukutsu.bin
 doukutsu-*.bin
 temp.bin
+bin/
 *.lst
 *.cpxm
+*.pal
 *.pat
 *.map
 *.tsb
+*.spr
+*.uftc
 *.pcm
 *.xgc
 *.patch

Makefile

@@ -20,16 +20,16 @@ GCCVER := $(shell $(CC) -dumpversion)
 PLUGIN  := $(MDROOT)/libexec/gcc/m68k-elf/$(GCCVER)
 
 # Z80 Assembler to build XGM driver
-ASMZ80   := $(MDBIN)/sjasm
+ASMZ80   := bin/sjasm
 # SGDK Tools
 BINTOS   := bin/bintos
 RESCOMP  := bin/rescomp
 WAVTORAW := bin/wavtoraw
 XGMTOOL  := bin/xgmtool
 # Sik's Tools
-MDTILER  := $(MDBIN)/mdtiler
-SLZ      := $(MDBIN)/slz
-UFTC     := $(MDBIN)/uftc
+MDTILER  := bin/mdtiler
+SLZ      := bin/slz
+UFTC     := bin/uftc
 # Cave Story Tools
 AIGEN    := python3 tools/aigen.py
 PATCHROM := bin/patchrom
@@ -139,6 +139,7 @@ translate: $(TARGET)-es.bin $(TARGET)-fr.bin $(TARGET)-de.bin $(TARGET)-it.bin
 translate: $(TARGET)-pt.bin $(TARGET)-br.bin $(TARGET)-ja.bin $(TARGET)-zh.bin
 translate: $(TARGET)-ko.bin
 
+prereq: $(ASMZ80) $(MDTILER) $(SLZ) $(UFTC)
 prereq: $(BINTOS) $(RESCOMP) $(XGMTOOL) $(WAVTORAW) $(TSCOMP)
 prereq: $(CPXMS) $(XGCS) $(PCMS) $(ZOBJ) $(TSBS)
 prereq: $(TSETO) $(CTSETP) $(CTSETO) $(SPRO) $(CSPRP) $(CSPRO)
@@ -170,10 +171,13 @@ prereq: $(TSETO) $(CTSETP) $(CTSETO) $(SPRO) $(CSPRP) $(CSPRO)
 %.o80: %.s80
 	$(ASMZ80) $(Z80FLAGS) $< $@ z80_xgm.lst
 
-# Old SGDK tools
+
 bin:
 	mkdir -p bin
 
+$(ASMZ80): bin
+	c++ -w -DMAX_PATH=MAXPATHLEN tools/sjasm/*.cpp -o $(ASMZ80)
+
 $(BINTOS): bin
 	cc tools/bintos.c -o $@
 
@@ -186,7 +190,15 @@ $(XGMTOOL): bin
 $(WAVTORAW): bin
 	cc tools/wavtoraw.c -o $@ -lm
 
-# Cave Story tools
+$(MDTILER): bin
+	cc tools/mdtiler/*.c -o $(MDTILER) -lpng
+
+$(SLZ): bin
+	cc tools/slz/*.c -o $(SLZ)
+
+$(UFTC): bin
+	cc tools/uftc/*.c -o $(UFTC)
+
 $(TSCOMP): bin
 	cc tools/tscomp/tscomp.c -o $@
 

README.md

@@ -31,8 +31,12 @@ You can still get crushed, drown and fall out of bounds.
 Note that you can't load or save the game while cheating (including the counter).
 
 ## Compilation
-1. Setup [marsdev](https://github.com/andwn/marsdev) and `python3`
-  - Marsdev targets: `m68k-toolchain z80-tools sik-tools`
+1. Dependencies: `build-essential libpng-dev python3` and one of the following toolchains:
+  - [m68k-elf-toolchain](github.com/andwn/m68k-elf-toolchain)
+  - [Marsdev](github.com/andwn/marsdev)
+  - [SGDK](github.com/Stephane-D/SGDK)
+  - [Megadev](github.com/drojaazu/megadev)
+  - [Gendev](github.com/kubilus1/gendev)
 2. Clone & `make`
   - For translations: `make translate`
 

src/main.c

@@ -23,22 +23,14 @@ uint8_t paused;
 uint8_t gameFrozen;
 
 void aftervsync() {
-	//disable_ints();
-    //z80_pause_fast();
-
     vdp_fade_step_dma();
 	dma_flush();
 	dqueued = FALSE;
 	if(ready) {
 		if(inFade) vdp_sprites_clear();
-        //if(gamemode == GM_GAME) stage_update(); // Scrolling
 		vdp_sprites_update();
 		ready = FALSE;
 	}
-
-    //z80_resume();
-    //enable_ints();
-
     vdp_fade_step_calc();
     joy_update();
 }
@@ -54,9 +46,7 @@ void main() {
 	if(system_checkdata() != SRAM_INVALID) {
 		system_load_config();
 	}
-    //dma_clear();
 	joy_init();
-	//enable_ints();
     // Initialize time and speed tables (framerate adjusted)
     if(pal_mode) {
 		time_tab = time_tab_pal;
@@ -65,8 +55,6 @@ void main() {
         time_tab = time_tab_ntsc;
         speed_tab = speed_tab_ntsc;
 	}
-    // let's the fun go on !
-
     sound_init();
 
 	// Error Tests