diff --git a/Oracle_main.asm b/Oracle_main.asm index 378eafb..ddec36b 100644 --- a/Oracle_main.asm +++ b/Oracle_main.asm @@ -28,6 +28,21 @@ ; ; ========================================================= +; .... h.m. +; h - hall of secrets +; m - maku tree +OOSPROG = $7EF3D6 + +; Bitfield of less important progression +; .fbh .zsu +; u - Uncle visited in secret passage; controls spawn (0: spawn | 1: gone) +; s - Priest visited in sanc after Zelda is kidnapped again +; z - Zelda brought to sanc +; h - Uncle has left Link's house; controls spawn (0: spawn | 1: gone) +; b - Book of Mudora obtained/mentioned; controls Aginah dialog +; f - Flipped by fortune tellers to decide which fortune set to give +OOSPROG2 = $7EF3C6 + incsrc "Overworld/custom_gfx.asm" print "End of custom_gfx.asm ", pc incsrc "Overworld/ZCustomOverworld.asm" diff --git a/Sprites/NPCs/impa.asm b/Sprites/NPCs/impa.asm index be6cfec..de6266a 100644 --- a/Sprites/NPCs/impa.asm +++ b/Sprites/NPCs/impa.asm @@ -1,13 +1,4 @@ -; Bitfield of less important progression -; .fbh .zsu -; u - Uncle visited in secret passage; controls spawn (0: spawn | 1: gone) -; s - Priest visited in sanc after Zelda is kidnapped again -; z - Zelda brought to sanc -; h - Uncle has left Link's house; controls spawn (0: spawn | 1: gone) -; b - Book of Mudora obtained/mentioned; controls Aginah dialog -; f - Flipped by fortune tellers to decide which fortune set to give -PROGLITE = $7EF3C6 ; 0x00 - Link's house ; 0x01 - Sanctuary (Hall of Secrets) @@ -18,11 +9,6 @@ PROGLITE = $7EF3C6 ; 0x06 - Old man home SPAWNPT = $7EF3C8 -; .... h.m. -; h - hall of secrets -; m - maku tree -OOSPROG = $7EF3D6 - ; set spawn point flag for hall of secrets by impa Impa_SetSpawnPointFlag: {