Level select done, saves folder obsoleted

Fixed fish missile health, don't know if right-facing is fixed or not Ma Pignon room was throwing an address error because of...... a pot!
andwn · Feb 25, 2017 · 732f095 · 732f095
1 parent f22c3b8
commit 732f095
Show file tree

Hide file tree

Showing 250 changed files with 120 additions and 49 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,5 +10,5 @@ prof2sram
 tscomp
 tileopt
 lutgen
+savetrim
 savegen_cache/
-save/
diff --git a/Makefile b/Makefile
@@ -106,6 +106,9 @@ lutgen:
 prof2sram:
 	gcc tools/prof2sram/prof2sram.c -o prof2sram $(TOOLFLAGS)
 
+savetrim:
+	gcc tools/savetrim/savetrim.c -o savetrim $(TOOLFLAGS)
+
 clean:
 	rm -f $(RESOURCES)
 	rm -f doukutsu.bin doukutsu.elf temp.bin symbol.txt

diff --git a/inc/sheet.h b/inc/sheet.h
@@ -95,7 +95,7 @@ enum {
 	SHEET_SISHEAD, SHEET_BUYOB,  SHEET_BUYO,	SHEET_HOPPY,  SHEET_ACID,   SHEET_NIGHTSHOT,
 	SHEET_GUNFSHOT,SHEET_MIDO,   SHEET_PRESS,	SHEET_STUMPY, SHEET_CORES1, SHEET_CORES3,
 	SHEET_CORES4,  SHEET_REDDOT, SHEET_MIMI,	SHEET_DOCSHOT,SHEET_RING,	SHEET_SHOCK,
-	SHEET_FIRE,
+	SHEET_FIRE,    SHEET_MAPI,
 };
 
 u8 sheet_num;

diff --git a/res/resources.res b/res/resources.res
@@ -985,23 +985,25 @@ WAV SFX_9B		"sfx/9B.wav" 5
 # Level Select Saves
 # ----------------------------------------------------------------------------------------------
 
-BIN LS_Mimi		"save/mimi.sram"
-BIN LS_Eggs		"save/eggs.sram"
-BIN LS_Weed		"save/weed.sram"
-BIN LS_Balfrog	"save/balfrog.sram"
-BIN LS_Sand		"save/sand.sram"
-BIN LS_Toroko	"save/toroko.sram"
-BIN LS_Maze		"save/maze.sram"
-BIN LS_Booster	"save/booster.sram"
-BIN LS_Core		"save/core.sram"
-BIN LS_Stream	"save/stream.sram"
-BIN LS_Mimi2	"save/mimi2.sram"
-BIN LS_Oside	"save/oside.sram"
-BIN LS_Cent		"save/cent.sram"
-BIN LS_Last		"save/last.sram"
-BIN LS_Blcny	"save/blcny.sram"
-BIN LS_Stream2	"save/stream2.sram"
-BIN LS_Pignon	"save/pignon.sram"
-BIN LS_Last2	"save/last2.sram"
-BIN LS_Hell		"save/hell.sram"
-BIN LS_Ballos	"save/ballos.sram"
+BIN LS_00		"save/00_firstcave.sram-trim"
+BIN LS_01		"save/01_mimigavillage.sram-trim"
+BIN LS_02		"save/02_eggcorridor.sram-trim"
+BIN LS_03		"save/03_grasstown.sram-trim"
+BIN LS_04		"save/04_malco.sram-trim"
+BIN LS_05		"save/05_balfrog.sram-trim"
+BIN LS_06		"save/06_sandzone.sram-trim"
+BIN LS_07		"save/07_omega.sram-trim"
+BIN LS_08		"save/08_storehouse.sram-trim"
+BIN LS_09		"save/09_labyrinth.sram-trim"
+BIN LS_10		"save/10_monsterx.sram-trim"
+BIN LS_11		"save/11_labyrinthm.sram-trim"
+BIN LS_12		"save/12_core.sram-trim"
+BIN LS_13		"save/13_waterway.sram-trim"
+BIN LS_14		"save/14_eggcorridor2.sram-trim"
+BIN LS_15		"save/15_outerwall.sram-trim"
+BIN LS_16		"save/16_plantation.sram-trim"
+BIN LS_17		"save/17_lastcave.sram-trim"
+BIN LS_18		"save/18_lastcave2.sram-trim"
+BIN LS_19		"save/19_balcony.sram-trim"
+BIN LS_20		"save/20_sacredground.sram"
+BIN LS_21		"save/21_sealchamber.sram"
diff --git a/save/minigma village.blastem.sram → res/save/00_firstcave.sram-trim b/save/minigma village.blastem.sram → res/save/00_firstcave.sram-trim
diff --git a/save/3hp mimiga village.blastem.sram → res/save/01_mimigavillage.sram-trim b/save/3hp mimiga village.blastem.sram → res/save/01_mimigavillage.sram-trim
diff --git a/res/save/mimi.sram → res/save/02_eggcorridor.sram-trim b/res/save/mimi.sram → res/save/02_eggcorridor.sram-trim
diff --git a/save/beat balrog.blastem.sram → res/save/03_grasstown.sram-trim b/save/beat balrog.blastem.sram → res/save/03_grasstown.sram-trim
diff --git a/save/restart egg corridor.blastem.sram → res/save/04_malco.sram-trim b/save/restart egg corridor.blastem.sram → res/save/04_malco.sram-trim
diff --git a/res/save/05_balfrog.sram-trim b/res/save/05_balfrog.sram-trim
diff --git a/save/pre-trade for machinegun.blastem.sram → res/save/06_sandzone.sram-trim b/save/pre-trade for machinegun.blastem.sram → res/save/06_sandzone.sram-trim
diff --git a/save/pre-sand zone.blastem.sram → res/save/07_omega.sram-trim b/save/pre-sand zone.blastem.sram → res/save/07_omega.sram-trim
diff --git a/save/before toroko.blastem.sram → res/save/08_storehouse.sram-trim b/save/before toroko.blastem.sram → res/save/08_storehouse.sram-trim
diff --git a/save/3hp before grasstown.blastem.sram → res/save/09_labyrinth.sram-trim b/save/3hp before grasstown.blastem.sram → res/save/09_labyrinth.sram-trim
diff --git a/save/got arms barrier.blastem.sram → res/save/10_monsterx.sram-trim b/save/got arms barrier.blastem.sram → res/save/10_monsterx.sram-trim
diff --git a/save/3hp got jelly juice.blastem.sram → res/save/11_labyrinthm.sram-trim b/save/3hp got jelly juice.blastem.sram → res/save/11_labyrinthm.sram-trim
diff --git a/res/save/12_core.sram-trim b/res/save/12_core.sram-trim
diff --git a/res/save/balfrog.sram → res/save/13_waterway.sram-trim b/res/save/balfrog.sram → res/save/13_waterway.sram-trim
diff --git a/res/save/eggs.sram → res/save/14_eggcorridor2.sram-trim b/res/save/eggs.sram → res/save/14_eggcorridor2.sram-trim
diff --git a/res/save/weed.sram → res/save/15_outerwall.sram-trim b/res/save/weed.sram → res/save/15_outerwall.sram-trim
diff --git a/res/save/16_plantation.sram-trim b/res/save/16_plantation.sram-trim
diff --git a/res/save/17_lastcave.sram-trim b/res/save/17_lastcave.sram-trim
diff --git a/res/save/18_lastcave2.sram-trim b/res/save/18_lastcave2.sram-trim
diff --git a/res/save/19_balcony.sram-trim b/res/save/19_balcony.sram-trim
diff --git a/res/save/hell.sram → res/save/20_sacredground.sram b/res/save/hell.sram → res/save/20_sacredground.sram
diff --git a/res/save/ballos.sram → res/save/21_sealchamber.sram b/res/save/ballos.sram → res/save/21_sealchamber.sram
diff --git a/res/save/blcny.sram b/res/save/blcny.sram
diff --git a/res/save/booster.sram b/res/save/booster.sram
diff --git a/res/save/cent.sram b/res/save/cent.sram
diff --git a/res/save/core.sram b/res/save/core.sram
diff --git a/res/save/last.sram b/res/save/last.sram
diff --git a/res/save/last2.sram b/res/save/last2.sram
diff --git a/res/save/maze.sram b/res/save/maze.sram
diff --git a/res/save/mimi2.sram b/res/save/mimi2.sram
diff --git a/res/save/oside.sram b/res/save/oside.sram
diff --git a/res/save/pignon.sram b/res/save/pignon.sram
diff --git a/res/save/sand.sram b/res/save/sand.sram
diff --git a/res/save/stream.sram b/res/save/stream.sram
diff --git a/res/save/stream2.sram b/res/save/stream2.sram
diff --git a/res/save/toroko.sram b/res/save/toroko.sram
diff --git a/res/sprite/pot.png b/res/sprite/pot.png
diff --git a/save/3hp before grasstown.gens.srm b/save/3hp before grasstown.gens.srm
diff --git a/save/3hp got jelly juice.gens.srm b/save/3hp got jelly juice.gens.srm
diff --git a/save/3hp mimiga village.gens.srm b/save/3hp mimiga village.gens.srm
diff --git a/save/4 dogs collected.blastem.sram b/save/4 dogs collected.blastem.sram
diff --git a/save/4 dogs collected.gens.srm b/save/4 dogs collected.gens.srm
diff --git a/save/arrive at plantation.blastem.sram b/save/arrive at plantation.blastem.sram
diff --git a/save/arrive at plantation.gens.srm b/save/arrive at plantation.gens.srm
diff --git a/save/arthur's place (whimsi, undies, arms barr, little quest).blastem.sram b/save/arthur's place (whimsi, undies, arms barr, little quest).blastem.sram
diff --git a/save/arthur's place (whimsi, undies, arms barr, little quest).gens.srm b/save/arthur's place (whimsi, undies, arms barr, little quest).gens.srm
diff --git a/save/arthur's place exploring.blastem.sram b/save/arthur's place exploring.blastem.sram
diff --git a/save/arthur's place exploring.gens.srm b/save/arthur's place exploring.gens.srm
diff --git a/save/arthur's place found undies.blastem.sram b/save/arthur's place found undies.blastem.sram
diff --git a/save/arthur's place found undies.gens.srm b/save/arthur's place found undies.gens.srm
diff --git a/save/arthur's place got nemesis.blastem.sram b/save/arthur's place got nemesis.blastem.sram
diff --git a/save/arthur's place got nemesis.gens.srm b/save/arthur's place got nemesis.gens.srm
diff --git a/save/arthur's place to sand zone.blastem.sram b/save/arthur's place to sand zone.blastem.sram
diff --git a/save/arthur's place to sand zone.gens.srm b/save/arthur's place to sand zone.gens.srm
diff --git a/save/arthur's place.blastem.sram b/save/arthur's place.blastem.sram
diff --git a/save/arthur's place.gens.srm b/save/arthur's place.gens.srm
diff --git a/save/back to village.blastem.sram b/save/back to village.blastem.sram
diff --git a/save/back to village.gens.srm b/save/back to village.gens.srm
diff --git a/save/beat balrog.gens.srm b/save/beat balrog.gens.srm
diff --git a/save/beat core with polar star.blastem.sram b/save/beat core with polar star.blastem.sram
diff --git a/save/beat core with polar star.gens.srm b/save/beat core with polar star.gens.srm
diff --git a/save/beat ghost.blastem.sram b/save/beat ghost.blastem.sram
diff --git a/save/beat ghost.gens.srm b/save/beat ghost.gens.srm
diff --git a/save/beat last boss with spur only.blastem.sram b/save/beat last boss with spur only.blastem.sram
diff --git a/save/beat last boss with spur only.gens.srm b/save/beat last boss with spur only.gens.srm
diff --git a/save/beat monster x with machinegun.blastem.sram b/save/beat monster x with machinegun.blastem.sram
diff --git a/save/beat monster x with machinegun.gens.srm b/save/beat monster x with machinegun.gens.srm
diff --git a/save/beat monster x with snake.blastem.sram b/save/beat monster x with snake.blastem.sram
diff --git a/save/beat monster x with snake.gens.srm b/save/beat monster x with snake.gens.srm
diff --git a/save/beat omega.blastem.sram b/save/beat omega.blastem.sram
diff --git a/save/beat omega.gens.srm b/save/beat omega.gens.srm
diff --git a/save/before balrog.blastem.sram b/save/before balrog.blastem.sram
diff --git a/save/before balrog.gens.srm b/save/before balrog.gens.srm
diff --git a/save/before blue mush with mask.blastem.sram b/save/before blue mush with mask.blastem.sram
diff --git a/save/before blue mush with mask.gens.srm b/save/before blue mush with mask.gens.srm
diff --git a/save/before decision.blastem.sram b/save/before decision.blastem.sram
diff --git a/save/before decision.gens.srm b/save/before decision.gens.srm
diff --git a/save/before enraged mimiga.blastem.sram b/save/before enraged mimiga.blastem.sram
diff --git a/save/before enraged mimiga.gens.srm b/save/before enraged mimiga.gens.srm
diff --git a/save/before feed mush with mask.blastem.sram b/save/before feed mush with mask.blastem.sram
diff --git a/save/before feed mush with mask.gens.srm b/save/before feed mush with mask.gens.srm
diff --git a/save/before feed mushroom.blastem.sram b/save/before feed mushroom.blastem.sram
diff --git a/save/before feed mushroom.gens.srm b/save/before feed mushroom.gens.srm
diff --git a/save/before final bosses 2.blastem.sram b/save/before final bosses 2.blastem.sram
diff --git a/save/before final bosses 2.gens.srm b/save/before final bosses 2.gens.srm
diff --git a/save/before final bosses with mask.blastem.sram b/save/before final bosses with mask.blastem.sram
diff --git a/save/before final bosses with mask.gens.srm b/save/before final bosses with mask.gens.srm
diff --git a/save/before final bosses with whimsi.blastem.sram b/save/before final bosses with whimsi.blastem.sram
diff --git a/save/before final bosses with whimsi.gens.srm b/save/before final bosses with whimsi.gens.srm
diff --git a/save/before final bosses.blastem.sram b/save/before final bosses.blastem.sram
diff --git a/save/before final bosses.gens.srm b/save/before final bosses.gens.srm
diff --git a/save/before final cave hidden.blastem.sram b/save/before final cave hidden.blastem.sram
diff --git a/save/before final cave hidden.gens.srm b/save/before final cave hidden.gens.srm
diff --git a/save/before final cave with mask.blastem.sram b/save/before final cave with mask.blastem.sram
diff --git a/save/before final cave with mask.gens.srm b/save/before final cave with mask.gens.srm
diff --git a/save/before ghost.blastem.sram b/save/before ghost.blastem.sram
diff --git a/save/before ghost.gens.srm b/save/before ghost.gens.srm
diff --git a/save/before last bosses again.blastem.sram b/save/before last bosses again.blastem.sram
diff --git a/save/before last bosses again.gens.srm b/save/before last bosses again.gens.srm
diff --git a/save/before last bosses.blastem.sram b/save/before last bosses.blastem.sram
diff --git a/save/before last bosses.gens.srm b/save/before last bosses.gens.srm
diff --git a/save/before mushroom.blastem.sram b/save/before mushroom.blastem.sram
diff --git a/save/before mushroom.gens.srm b/save/before mushroom.gens.srm
diff --git a/save/before sisters.blastem.sram b/save/before sisters.blastem.sram
diff --git a/save/before sisters.gens.srm b/save/before sisters.gens.srm
diff --git a/save/before toroko.gens.srm b/save/before toroko.gens.srm
diff --git a/save/decision time.blastem.sram b/save/decision time.blastem.sram
diff --git a/save/decision time.gens.srm b/save/decision time.gens.srm
diff --git a/save/done fetch quest.blastem.sram b/save/done fetch quest.blastem.sram
diff --git a/save/done fetch quest.gens.srm b/save/done fetch quest.gens.srm
diff --git a/save/early labyrinth.blastem.sram b/save/early labyrinth.blastem.sram
diff --git a/save/early labyrinth.gens.srm b/save/early labyrinth.gens.srm
diff --git a/save/egg corridor 2 beat sisters.blastem.sram b/save/egg corridor 2 beat sisters.blastem.sram
diff --git a/save/egg corridor 2 beat sisters.gens.srm b/save/egg corridor 2 beat sisters.gens.srm
diff --git a/save/egg corridor 2 pre-choice.blastem.sram b/save/egg corridor 2 pre-choice.blastem.sram
diff --git a/save/egg corridor 2 pre-choice.gens.srm b/save/egg corridor 2 pre-choice.gens.srm
diff --git a/save/egg corridor 2.blastem.sram b/save/egg corridor 2.blastem.sram
diff --git a/save/egg corridor 2.gens.srm b/save/egg corridor 2.gens.srm
diff --git a/save/egg corridor with id.blastem.sram b/save/egg corridor with id.blastem.sram
diff --git a/save/egg corridor with id.gens.srm b/save/egg corridor with id.gens.srm
diff --git a/save/egg corridor.blastem.sram b/save/egg corridor.blastem.sram
diff --git a/save/egg corridor.gens.srm b/save/egg corridor.gens.srm
diff --git a/save/enter sacred ground.blastem.sram b/save/enter sacred ground.blastem.sram
diff --git a/save/enter sacred ground.gens.srm b/save/enter sacred ground.gens.srm
diff --git a/save/final cave 2.blastem.sram b/save/final cave 2.blastem.sram
diff --git a/save/final cave 2.gens.srm b/save/final cave 2.gens.srm
diff --git a/save/final cave.blastem.sram b/save/final cave.blastem.sram
diff --git a/save/final cave.gens.srm b/save/final cave.gens.srm
diff --git a/save/finished fetching.blastem.sram b/save/finished fetching.blastem.sram
diff --git a/save/finished fetching.gens.srm b/save/finished fetching.gens.srm
diff --git a/save/getting turbocharge before bosses.blastem.sram b/save/getting turbocharge before bosses.blastem.sram
diff --git a/save/getting turbocharge before bosses.gens.srm b/save/getting turbocharge before bosses.gens.srm
diff --git a/save/got arms barrier.gens.srm b/save/got arms barrier.gens.srm
diff --git a/save/got nemesis with spur.blastem.sram b/save/got nemesis with spur.blastem.sram
diff --git a/save/got nemesis with spur.gens.srm b/save/got nemesis with spur.gens.srm
diff --git a/save/got spur and bubbler.blastem.sram b/save/got spur and bubbler.blastem.sram
diff --git a/save/got spur and bubbler.gens.srm b/save/got spur and bubbler.gens.srm
diff --git a/save/grasstown done.blastem.sram b/save/grasstown done.blastem.sram
diff --git a/save/grasstown done.gens.srm b/save/grasstown done.gens.srm
diff --git a/save/grasstown pre-jail at plantation.blastem.sram b/save/grasstown pre-jail at plantation.blastem.sram
diff --git a/save/grasstown pre-jail at plantation.gens.srm b/save/grasstown pre-jail at plantation.gens.srm
diff --git a/save/grasstown.blastem.sram b/save/grasstown.blastem.sram
diff --git a/save/grasstown.gens.srm b/save/grasstown.gens.srm
diff --git a/save/just got 5th dog in hand.blastem.sram b/save/just got 5th dog in hand.blastem.sram
diff --git a/save/just got 5th dog in hand.gens.srm b/save/just got 5th dog in hand.gens.srm
diff --git a/save/labyrinth after ghost weapon up.blastem.sram b/save/labyrinth after ghost weapon up.blastem.sram
diff --git a/save/labyrinth after ghost weapon up.gens.srm b/save/labyrinth after ghost weapon up.gens.srm
diff --git a/save/labyrinth after ghost.blastem.sram b/save/labyrinth after ghost.blastem.sram
diff --git a/save/labyrinth after ghost.gens.srm b/save/labyrinth after ghost.gens.srm
diff --git a/save/labyrinth beat boss and balrog.blastem.sram b/save/labyrinth beat boss and balrog.blastem.sram
diff --git a/save/labyrinth beat boss and balrog.gens.srm b/save/labyrinth beat boss and balrog.gens.srm
diff --git a/save/labyrinth before core 2.blastem.sram b/save/labyrinth before core 2.blastem.sram
diff --git a/save/labyrinth before core 2.gens.srm b/save/labyrinth before core 2.gens.srm
diff --git a/save/labyrinth before core.blastem.sram b/save/labyrinth before core.blastem.sram
diff --git a/save/labyrinth before core.gens.srm b/save/labyrinth before core.gens.srm
diff --git a/save/labyrinth before ghost.blastem.sram b/save/labyrinth before ghost.blastem.sram
diff --git a/save/labyrinth before ghost.gens.srm b/save/labyrinth before ghost.gens.srm
diff --git a/save/labyrinth got snake and arms barrier.blastem.sram b/save/labyrinth got snake and arms barrier.blastem.sram
diff --git a/save/labyrinth got snake and arms barrier.gens.srm b/save/labyrinth got snake and arms barrier.gens.srm
diff --git a/save/labyrinth got turbocharger.blastem.sram b/save/labyrinth got turbocharger.blastem.sram
diff --git a/save/labyrinth got turbocharger.gens.srm b/save/labyrinth got turbocharger.gens.srm
diff --git a/save/labyrinth opened door.blastem.sram b/save/labyrinth opened door.blastem.sram
diff --git a/save/labyrinth opened door.gens.srm b/save/labyrinth opened door.gens.srm
diff --git a/save/labyrinth pre-boss (snake grabbed) 2.blastem.sram b/save/labyrinth pre-boss (snake grabbed) 2.blastem.sram
diff --git a/save/labyrinth pre-boss (snake grabbed) 2.gens.srm b/save/labyrinth pre-boss (snake grabbed) 2.gens.srm
diff --git a/save/labyrinth pre-boss (snake grabbed).blastem.sram b/save/labyrinth pre-boss (snake grabbed).blastem.sram
diff --git a/save/labyrinth pre-boss (snake grabbed).gens.srm b/save/labyrinth pre-boss (snake grabbed).gens.srm
diff --git a/save/labyrinth.blastem.sram b/save/labyrinth.blastem.sram
diff --git a/save/labyrinth.gens.srm b/save/labyrinth.gens.srm
diff --git a/save/mimiga village before blue mush fight.blastem.sram b/save/mimiga village before blue mush fight.blastem.sram
diff --git a/save/mimiga village before blue mush fight.gens.srm b/save/mimiga village before blue mush fight.gens.srm
diff --git a/save/mimiga village booster 2.blastem.sram b/save/mimiga village booster 2.blastem.sram
diff --git a/save/mimiga village booster 2.gens.srm b/save/mimiga village booster 2.gens.srm
diff --git a/save/minigma village.gens.srm b/save/minigma village.gens.srm
diff --git a/save/option to grab snake.blastem.sram b/save/option to grab snake.blastem.sram
diff --git a/save/option to grab snake.gens.srm b/save/option to grab snake.gens.srm
diff --git a/save/plantation finished fetching.blastem.sram b/save/plantation finished fetching.blastem.sram
diff --git a/save/plantation finished fetching.gens.srm b/save/plantation finished fetching.gens.srm
diff --git a/save/plantation just before final cave.blastem.sram b/save/plantation just before final cave.blastem.sram
diff --git a/save/plantation just before final cave.gens.srm b/save/plantation just before final cave.gens.srm
diff --git a/save/plantation rocket ready.blastem.sram b/save/plantation rocket ready.blastem.sram
diff --git a/save/plantation rocket ready.gens.srm b/save/plantation rocket ready.gens.srm
diff --git a/save/pre-core with polar star.blastem.sram b/save/pre-core with polar star.blastem.sram
diff --git a/save/pre-core with polar star.gens.srm b/save/pre-core with polar star.gens.srm
diff --git a/save/pre-frog-balrog.blastem.sram b/save/pre-frog-balrog.blastem.sram
diff --git a/save/pre-frog-balrog.gens.srm b/save/pre-frog-balrog.gens.srm
diff --git a/save/pre-last boss.blastem.sram b/save/pre-last boss.blastem.sram
diff --git a/save/pre-last boss.gens.srm b/save/pre-last boss.gens.srm
diff --git a/save/pre-omega.blastem.sram b/save/pre-omega.blastem.sram
diff --git a/save/pre-omega.gens.srm b/save/pre-omega.gens.srm
diff --git a/save/pre-sand zone.gens.srm b/save/pre-sand zone.gens.srm
diff --git a/save/pre-trade for machinegun.gens.srm b/save/pre-trade for machinegun.gens.srm
diff --git a/save/predecision.blastem.sram b/save/predecision.blastem.sram
diff --git a/save/predecision.gens.srm b/save/predecision.gens.srm
diff --git a/save/reget lev 3 machinegun.blastem.sram b/save/reget lev 3 machinegun.blastem.sram
diff --git a/save/reget lev 3 machinegun.gens.srm b/save/reget lev 3 machinegun.gens.srm
diff --git a/save/reload beat monst x NOT getting booster.blastem.sram b/save/reload beat monst x NOT getting booster.blastem.sram
diff --git a/save/reload beat monst x NOT getting booster.gens.srm b/save/reload beat monst x NOT getting booster.gens.srm
diff --git a/save/reload just before polar star trade.blastem.sram b/save/reload just before polar star trade.blastem.sram
diff --git a/save/reload just before polar star trade.gens.srm b/save/reload just before polar star trade.gens.srm
diff --git a/save/restart egg corridor.gens.srm b/save/restart egg corridor.gens.srm
diff --git a/save/retry after core.blastem.sram b/save/retry after core.blastem.sram
diff --git a/save/retry after core.gens.srm b/save/retry after core.gens.srm
diff --git a/save/retry again before decision.blastem.sram b/save/retry again before decision.blastem.sram
diff --git a/save/retry again before decision.gens.srm b/save/retry again before decision.gens.srm
diff --git a/save/retry beat ghost no snake.blastem.sram b/save/retry beat ghost no snake.blastem.sram
diff --git a/save/retry beat ghost no snake.gens.srm b/save/retry beat ghost no snake.gens.srm
diff --git a/save/right before final cave.blastem.sram b/save/right before final cave.blastem.sram
diff --git a/save/right before final cave.gens.srm b/save/right before final cave.gens.srm
diff --git a/save/sacred ground with spur.blastem.sram b/save/sacred ground with spur.blastem.sram
diff --git a/save/sacred ground with spur.gens.srm b/save/sacred ground with spur.gens.srm
diff --git a/save/sacred grounds with whimsi.blastem.sram b/save/sacred grounds with whimsi.blastem.sram
diff --git a/save/sacred grounds with whimsi.gens.srm b/save/sacred grounds with whimsi.gens.srm
diff --git a/save/sand zone 2 just beat curly.blastem.sram b/save/sand zone 2 just beat curly.blastem.sram
diff --git a/save/sand zone 2 just beat curly.gens.srm b/save/sand zone 2 just beat curly.gens.srm
diff --git a/save/sand zone before toroka.blastem.sram b/save/sand zone before toroka.blastem.sram
diff --git a/save/sand zone before toroka.gens.srm b/save/sand zone before toroka.gens.srm
diff --git a/save/sand zone boss with polar star.blastem.sram b/save/sand zone boss with polar star.blastem.sram
diff --git a/save/sand zone boss with polar star.gens.srm b/save/sand zone boss with polar star.gens.srm
diff --git a/save/sand zone.blastem.sram b/save/sand zone.blastem.sram
diff --git a/save/sand zone.gens.srm b/save/sand zone.gens.srm
diff --git a/save/save at door to plantation.blastem.sram b/save/save at door to plantation.blastem.sram
diff --git a/save/save at door to plantation.gens.srm b/save/save at door to plantation.gens.srm
diff --git a/save/storehouse.blastem.sram b/save/storehouse.blastem.sram
diff --git a/save/storehouse.gens.srm b/save/storehouse.gens.srm
diff --git a/save/turbocharge.blastem.sram b/save/turbocharge.blastem.sram
diff --git a/save/turbocharge.gens.srm b/save/turbocharge.gens.srm
diff --git a/save/waterfall arrive.blastem.sram b/save/waterfall arrive.blastem.sram
diff --git a/save/waterfall arrive.gens.srm b/save/waterfall arrive.gens.srm
diff --git a/save/waterfall curly.blastem.sram b/save/waterfall curly.blastem.sram
diff --git a/save/waterfall curly.gens.srm b/save/waterfall curly.gens.srm
diff --git a/save/waterway 2.blastem.sram b/save/waterway 2.blastem.sram
diff --git a/save/waterway 2.gens.srm b/save/waterway 2.gens.srm
diff --git a/save/waterway build back missiles.blastem.sram b/save/waterway build back missiles.blastem.sram
diff --git a/save/waterway build back missiles.gens.srm b/save/waterway build back missiles.gens.srm
diff --git a/save/waterway.blastem.sram b/save/waterway.blastem.sram
diff --git a/save/waterway.gens.srm b/save/waterway.gens.srm
diff --git a/src/ai/cemetery.c b/src/ai/cemetery.c
@@ -212,7 +212,7 @@ void ai_ma_pignon(Entity *e) {
 	u8 blockl = FALSE, blockr = FALSE;
 
 	// Ma Pignon jumps off screen and should not collide with the map while doing so
-	if (e->y > block_to_sub(8)) {
+	if (e->y_next > block_to_sub(5)) {
 		blockl = e->x_speed < 0 && collide_stage_leftwall(e);
 		blockr = e->x_speed > 0 && collide_stage_rightwall(e);
 		if(!e->grounded) e->grounded = collide_stage_floor(e);
@@ -402,7 +402,7 @@ void ai_ma_pignon(Entity *e) {
 			e->frame = 2;
 			if (++e->timer > 4) {
 				e->state++;
-				e->frame = 12;
+				e->frame = 11;
 				e->y_speed = -SPEED(0x800);
 				e->grounded = FALSE;
 				sound_play(SND_FUNNY_EXPLODE, 5);
@@ -415,7 +415,7 @@ void ai_ma_pignon(Entity *e) {
 		break;
 		case MP_Fly_Up+1:		// flying up
 		{
-			ANIMATE(e, 4, 12,13);
+			ANIMATE(e, 4, 10,11);
 
 			if (e->y < (16<<CSF))
 				e->state = MP_Spawn_Clones;
@@ -432,7 +432,7 @@ void ai_ma_pignon(Entity *e) {
 		}
 		case MP_Spawn_Clones+1:
 		{
-			ANIMATE(e, 4, 12,13);
+			ANIMATE(e, 4, 10,11);
 
 			if ((++e->timer % 8) == 0) {
 				s32 x = block_to_sub(4 + (random() % 12));

diff --git a/src/ai/monsterx.c b/src/ai/monsterx.c
@@ -94,7 +94,7 @@ static void spawn_fish(u8 index) {
 	fish->eflags &= ~NPC_INVINCIBLE;
 	fish->nflags &= ~NPC_SHOOTABLE;
 	fish->eflags |= NPC_SHOOTABLE;
-	fish->health = 10;
+	fish->health = 1;
 	//FIRE_ANGLED_SHOT(OBJ_X_FISHY_MISSILE, 
 	//				 bossEntity->x + xoffs[index], bossEntity->y + yoffs[index], 
 	//				 0x80 + index * 0x100, SPEED(0x400));
@@ -392,6 +392,7 @@ void ai_monsterx(Entity *e) {
 				entities_clear_by_type(OBJ_X_DOOR);
 				entities_clear_by_type(OBJ_X_TREAD);
 				entities_clear_by_type(OBJ_X_INTERNALS);
+				player.grounded = FALSE; // Stop player from floating where treads were
 				e->state = STATE_DELETE;
 				return;
 			}
@@ -717,6 +718,8 @@ void ai_x_fishy_missile(Entity *e) {
 	e->y_speed = sin[e->cur_angle];
 	e->x += e->x_speed;
 	e->y += e->y_speed;
+
+	e->dir = 0; // Never flip sprite, let angles handle it all
 }
 
 

diff --git a/src/db/npc.c b/src/db/npc.c
@@ -337,7 +337,7 @@ const npc_info_def npc_info[NPC_COUNT + 9 + 14 + 4] = {
 	{ NULL, 		NOSHEET, PAL0, 1, &ai_null, &ai_null, &ondeath_default }, // Bute (Sword)
 	{ NULL, 		NOSHEET, PAL0, 1, &ai_null, &ai_null, &ondeath_default }, // Bute (Archer)
 	{ NULL, 		NOSHEET, PAL0, 1, &ai_null, &ai_null, &ai_null }, // Bute Projectile
-	{ &SPR_MaPignon,NOSHEET, PAL3, 1, &onspawn_persistent, &ai_ma_pignon, &ondeath_default }, // Ma Pignon
+	{ NULL,		SHEET_MAPI, PAL3, 1, &onspawn_persistent, &ai_ma_pignon, &ondeath_default }, // Ma Pignon
 	{ NULL, 		NOSHEET, PAL0, 1, &ai_null, &ai_null, &ai_null }, // Falling (?)
 	{ NULL, 	NOSHEET, PAL1, 1, &ai_null, &ai_null, &ondeath_default }, // Hopping Enemy (?)
 	{ NULL, 		NOSHEET, PAL0, 1, &ai_null, &ai_null, &ondeath_default }, // Bute (Defeated)

diff --git a/src/game.c b/src/game.c
@@ -49,15 +49,20 @@ void vblank() {
 
 u8 game_main(u8 load) {
 	SYS_disableInts();
-	VDP_setEnable(FALSE);
+	VDP_setPaletteColors(0, PAL_FadeOut, 64);
+	VDP_setPaletteColor(15, 0x000);
+	//VDP_setEnable(FALSE);
 	// This is the SGDK font with a blue background for the message window
 	VDP_loadTileSet(&TS_MsgFont, TILE_FONTINDEX, TRUE);
 	SYS_setVIntCallback(vblank);
 	//SYS_setHIntCallback(hblank_water);
 	effects_init();
+	SYS_enableInts();
+
 	game_reset(load);
 
-	VDP_setEnable(TRUE);
+	SYS_disableInts();
+	//VDP_setEnable(TRUE);
 	VDP_setWindowPos(0, 0);
 
 	// Load game doesn't run a script that fades in and shows the HUD, so do it manually
@@ -110,6 +115,8 @@ u8 game_main(u8 load) {
 						VDP_fadeTo(0, 63, VDP_getCachedPalette(), 20, TRUE);
 						continue;
 					} else if(rtn == 3) {
+						VDP_setPaletteColors(0, PAL_FadeOut, 64);
+						VDP_setPaletteColor(15, 0x000);
 						game_reset(FALSE); // Start from beginning
 						continue;
 					} else { // End credits
@@ -131,11 +138,13 @@ u8 game_main(u8 load) {
 }
 
 void game_reset(u8 load) {
+	SYS_disableInts();
 	camera_init();
 	tsc_init();
 	hud_create();
 	// Default sprite sheets
 	sheets_load_stage(255, TRUE, TRUE);
+	SYS_enableInts();
 	gameFrozen = FALSE;
 	if(load) {
 		if(load == 1) {
@@ -153,11 +162,13 @@ void game_reset(u8 load) {
 		system_new();
 		tsc_call_event(GAME_START_EVENT);
 	}
+	SYS_disableInts();
 	SHEET_LOAD(&SPR_Bonk, 1, 1, 1, 1, 0,0);
 	// Load up the main palettes
 	VDP_setCachedPalette(PAL0, PAL_Main.data);
 	VDP_setCachedPalette(PAL1, PAL_Sym.data);
 	VDP_setPaletteColors(0, PAL_FadeOut, 64);
+	SYS_enableInts();
 }
 
 void draw_itemmenu(u8 resetCursor) {

diff --git a/src/sheet.c b/src/sheet.c
@@ -352,6 +352,10 @@ void sheets_load_stage(u16 sid, u8 init_base, u8 init_tiloc) {
 			SHEET_ADD(SHEET_CRITTER, &SPR_MizaCritter, 3,2,2, 0,1, 0,2, 0,3);
 			// Projectile
 		} break;
+		case 0x53: // Ma Pignon
+		{	SHEET_ADD(SHEET_MAPI, &SPR_MaPignon, 12,2,2, 
+					0,1, 0,2, 0,3, 0,4, 0,5, 0,6, 0,7, 0,8, 0,9, 0,10, 0,11);
+		} break;
 		default: printf("Stage %hu has no sheet set", sid);
 	}
 	// Weapons at the end

diff --git a/src/stage.c b/src/stage.c
@@ -185,7 +185,8 @@ void stage_load_entities() {
 		// each entity as it is loaded so the problematic NPC can be found
 		/*
 		{
-			VDP_setEnable(TRUE);
+			SYS_disableInts();
+			//VDP_setEnable(TRUE);
 			VDP_setPaletteColor(15, 0xEEE);
 			char str[2][36];
 			sprintf(str[0], "X:%hu Y:%hu I:%hu", x, y, id);
@@ -197,9 +198,11 @@ void stage_load_entities() {
 			while(!joy_pressed(BUTTON_C)) {
 				input_update();
 				VDP_waitVSync();
+				VDP_setHorizontalScroll(PLAN_A, 0);
+				VDP_setVerticalScroll(PLAN_A, 0);
 			}
-			SYS_disableInts();
-			VDP_setEnable(FALSE);
+			//SYS_disableInts();
+			//VDP_setEnable(FALSE);
 		}
 		*/
 		Entity *e = entity_create((x<<CSF)*16 + (8<<CSF), 

diff --git a/src/system.c b/src/system.c
@@ -25,9 +25,9 @@
 typedef struct { u8 hour, minute, second, frame; } Time;
 
 static const uint8_t *FileList[] = {
-	LS_Mimi, LS_Eggs, LS_Weed, LS_Balfrog, LS_Sand, LS_Toroko, LS_Maze, LS_Booster,
-	NULL, LS_Core, LS_Stream, LS_Mimi2, LS_Oside, LS_Cent, LS_Last, LS_Blcny,
-	NULL, LS_Stream2, LS_Pignon, LS_Last2, LS_Hell, LS_Ballos,
+	LS_00, LS_01, LS_02, LS_03, LS_04, LS_05, LS_06, LS_07,
+	LS_08, LS_09, LS_10, LS_11, LS_12, LS_13, LS_14, LS_15,
+	LS_16, LS_17, LS_18, LS_19, LS_20, LS_21,
 };
 
 u8 debuggingEnabled = FALSE;

diff --git a/src/titlescreen.c b/src/titlescreen.c
@@ -136,34 +136,37 @@ u8 titlescreen_main() {
 		VDP_setPaletteColor(12, 0x666);
 		VDP_setPaletteColor(16 + 15, 0xAAA);
 		static const char *levelStr[] = {
+			" First Cave",
 			" Mimiga Village",
 			" Egg Corridor",
 			" Grasstown",
+			" Malco",
 			" Balfrog",
 			" Sand Zone",
-			" Toroko",
+			" Omega",
+			" Storehouse",
 			" Labyrinth",
-			" Booster",
-			"=NORMAL END ROUTE=",
+			" Monster X",
+			" Labyrinth M",
 			" Core",
 			" Waterway",
-			" Empty Village",
+			" Egg Corridor 2",
 			" Outer Wall",
 			" Plantation",
 			" Last Cave",
-			" Balcony",
-			"= BEST END ROUTE =",
-			" Waterway 2",
-			" Ma Pignon",
 			" Last Cave 2",
+			" Balcony",
 			" Sacred Ground",
-			" Ballos",
+			" Seal Chamber",
 		};
-		static const u16 tx = 11, ty = 2;
+		u16 tx = 11, ty = 1;
+		if(IS_PALSYSTEM) ty++;
+		VDP_drawText("= Welcome to Warp Zone =", 7, ty);
+		ty += 2;
 		for(u8 i = 0; i < SAVES; i++) {
 			if(cursor == i) VDP_setTextPalette(PAL0);
 			else VDP_setTextPalette(PAL1);
-			VDP_drawText(levelStr[i], tx, 2+i);
+			VDP_drawText(levelStr[i], tx, ty+i);
 		}
 		SYS_enableInts();
 		while(!joy_pressed(BUTTON_C) && !joy_pressed(BUTTON_START)) {
@@ -173,7 +176,7 @@ u8 titlescreen_main() {
 				VDP_drawText(levelStr[cursor], tx, ty + cursor);
 				if(cursor == 0) cursor = SAVES - 1;
 				else cursor--;
-				if(cursor == 8 || cursor == 16) cursor--;
+				//if(cursor == 8 || cursor == 16) cursor--;
 				VDP_setTextPalette(PAL0);
 				VDP_drawText(levelStr[cursor], tx, ty + cursor);
 				sound_play(SND_MENU_MOVE, 0);
@@ -182,7 +185,7 @@ u8 titlescreen_main() {
 				VDP_drawText(levelStr[cursor], tx, ty + cursor);
 				if(cursor == SAVES - 1) cursor = 0;
 				else cursor++;
-				if(cursor == 8 || cursor == 16) cursor++;
+				//if(cursor == 8 || cursor == 16) cursor++;
 				VDP_setTextPalette(PAL0);
 				VDP_drawText(levelStr[cursor], tx, ty + cursor);
 				sound_play(SND_MENU_MOVE, 0);

diff --git a/tools/savetrim/savetrim.c b/tools/savetrim/savetrim.c
@@ -0,0 +1,42 @@
+/*
+ * Strip padding at the end of SRAM
+ * 
+ * Compile:
+ * gcc savetrim.c -o savetrim
+ * 
+ * Usage:
+ * ./prof2sram <file1> [file2] [...]
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#define SRAM_SIZE 0x500
+
+int main(int argc, char *argv[]) {
+	for(int i = 1; i < argc; i++) {
+		FILE *in = fopen(argv[i], "rb");
+		if(!in) {
+			printf("E: Couldn't open %s.\n", argv[i]);
+			continue;
+		}
+		char outfn[256];
+		sprintf(outfn, "%s-trim", argv[i]);
+		FILE *out = fopen(outfn, "wb");
+		if(!out) {
+			printf("E: Couldn't create %s.\n", outfn);
+			continue;
+			fclose(in);
+		}
+		uint8_t sram[SRAM_SIZE];
+		if(fread(sram, 1, SRAM_SIZE, in) < SRAM_SIZE) {
+			printf("E: %s shorter than %d bytes.\n", argv[i], SRAM_SIZE);
+		}
+		fclose(in);
+		if(fwrite(sram, 1, SRAM_SIZE, out) < SRAM_SIZE) {
+			printf("E: Wrote less than %d bytes to %s.\n", SRAM_SIZE, outfn);
+		}
+		fclose(out);
+	}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,5 +10,5 @@ prof2sram @@
     tscomp
     tileopt
     lutgen
+    savetrim
     savegen_cache/
-    save/