diff --git a/snes/fatfstest/Makefile b/snes/fatfstest/Makefile index eac5362..70ea76b 100644 --- a/snes/fatfstest/Makefile +++ b/snes/fatfstest/Makefile @@ -29,7 +29,7 @@ LIBS=-L$(SDK)/lib/cl #-L$(SDK)/lib/c134 -OBJS=hook.obj StartupSnes.obj main.obj pad.obj PPU.obj debug.obj ressource.obj diskio.obj ff.obj +OBJS=StartupSnes.obj main.obj pad.obj PPU.obj debug.obj ressource.obj diskio.obj ff.obj APP=fatfs.smc GFX=debugfont @@ -63,14 +63,24 @@ hook.obj: hook.asm %.obj: %.c $(CC) -wl -wp -sop -ML -I $(INC) $? -$(APP): $(OBJS) +#$(APP): $(OBJS) +# $(LD) -HB -M21 -V -T -Pff \ +# -C008000,0000 -U0000,0000 \ +# -Avectors=FFE4,7FE4 \ +# -Aregistration_data=FFB0,7FB0 \ +# -Aressource=18000,8000 \ +# -N $(OBJS) $(LIBS) -O $@ + +$(APP): $(OBJS) hook.obj $(LD) -B -HB -M21 -V -T -Pff \ -C3e8000,1f0000 -U000000,000000 \ -Avectors=FFE4,7FE4 \ -Aregistration_data=FFB0,7FB0 \ - -Aressource=18000,8000 \ + -Aressource=3f8000,1f8000 \ -Ahook=008000,0000 \ - -N $(OBJS) $(LIBS) -O $@ + -N $(OBJS) hook.obj $(LIBS) -O $@ + + repair: $(APP) $(UCON) -snes -chk $(APP) 2>&1 >/dev/null rm -rf fatfs.bak diff --git a/snes/fatfstest/debug.c b/snes/fatfstest/debug.c index 32a94f8..1df8c1c 100644 --- a/snes/fatfstest/debug.c +++ b/snes/fatfstest/debug.c @@ -19,12 +19,6 @@ word debugMap[0x400]; static char debug_buffer[255]; static char screen_buffer[255]; -/* -word debug_colors[] = { - 0x0000, 0x001f, 0x0218, 0x7297, 0x5ab5, 0x5abf, 0x5b1f, 0x737b, - 0x7f98, 0x5f7f, 0x03ff, 0x7ffc, 0x7fff, 0x0000, 0x0000, 0x0000 -}; -*/ void debug_init(void) { word i; @@ -37,7 +31,6 @@ void debug_init(void) { void debug_enable(void){ VRAMLoad((word) debugFont_pic, 0x5000, 2048); - //CGRAMLoad((word) debug_colors, (byte) 0x00, (word) 16); VRAMLoad((word) debugMap, 0x4000, 0x0800); setTileMapLocation(0x4000, (byte) 0x00, (byte) 0); setCharacterLocation(0x5000, (byte) 0); diff --git a/snes/fatfstest/ressource.asm b/snes/fatfstest/ressource.asm index 6d89e4d..64712dd 100644 --- a/snes/fatfstest/ressource.asm +++ b/snes/fatfstest/ressource.asm @@ -1,23 +1,9 @@ -resource .section +ressource .section -; XDEF __title_map -;__title_map: -; INSERT ressource/kungfu.map -; -; XDEF __title_pic -;__title_pic: -; INSERT ressource/kungfu.pic -; -; XDEF __title_pal -;__title_pal: -;make INSERT ressource/kungfu.clr XDEF ~~debugFont_pic ~~debugFont_pic INSERT ressource/debugFont.pic - XDEF ~~debugFont_pal -~~debugFont_pal - INSERT ressource/debugFont.clr .ends diff --git a/snes/fatfstest/ressource.h b/snes/fatfstest/ressource.h index 8298c7e..c4c8d96 100644 --- a/snes/fatfstest/ressource.h +++ b/snes/fatfstest/ressource.h @@ -1,3 +1,2 @@ extern word debugFont_pic[]; -extern word debugFont_pal[];