diff --git a/Oracle_main.asm b/Oracle_main.asm index ec904db..8d85fbc 100644 --- a/Oracle_main.asm +++ b/Oracle_main.asm @@ -12,6 +12,7 @@ ; Lost Sea Area Combo ; ;=========================================================== + namespace Oracle { print "" @@ -21,31 +22,43 @@ namespace Oracle incsrc "Util/ram.asm" incsrc "Util/functions.asm" - incsrc "Menu/menu.asm" - print "End of Menu/menu.asm ", pc - - incsrc "Events/intro.asm" - print "End of Events/intro.asm ", pc - - incsrc "MakuTree/maku_tree.asm" - print "End of MakuTree/maku_tree.asm ", pc - - incsrc "Events/lostsea.asm" - print "End of Events/lostsea.asm ", pc - - incsrc "Items/ice_rod.asm" - print "End of Items/ice_rod.asm ", pc - - + ; --------------------------------------------------------- incsrc "KeyBlock/keyblock.asm" print "End of KeyBlock/keyblock.asm ", pc + ; --------------------------------------------------------- + incsrc "Events/house_tag.asm" + print "End of Events/house_tag.asm ", pc + + ; --------------------------------------------------------- + incsrc "Menu/menu.asm" + print "End of Menu/menu.asm ", pc + + ; --------------------------------------------------------- + incsrc "Events/intro.asm" + print "End of Events/intro.asm ", pc + + ; --------------------------------------------------------- + incsrc "MakuTree/maku_tree.asm" + print "End of MakuTree/maku_tree.asm ", pc + + ; --------------------------------------------------------- + incsrc "Events/lostsea.asm" + print "End of Events/lostsea.asm ", pc + + ; --------------------------------------------------------- + incsrc "Items/ice_rod.asm" + print "End of Items/ice_rod.asm ", pc + + ; --------------------------------------------------------- incsrc "Items/book_of_secrets.asm" print "End of Items/book_of_secrets.asm ", pc + ; --------------------------------------------------------- incsrc "Debug/debug.asm" print "End of Debug/debug.asm ", pc + ; --------------------------------------------------------- incsrc "Masks/mask_routines.asm" incsrc "Masks/deku_mask.asm" @@ -55,7 +68,7 @@ namespace Oracle print "End of Masks/zora_mask.asm ", pc incsrc "Masks/wolf_mask.asm" - print "End of Masks/wolf_mask.asm ", pc + print "End of Masks/wolf_mask.asm ", pc incsrc "Masks/bunny_hood.asm" print "End of Masks/bunny_hood.asm ", pc diff --git a/Util/ram.asm b/Util/ram.asm index 3690005..6d40d26 100644 --- a/Util/ram.asm +++ b/Util/ram.asm @@ -1,3 +1,7 @@ +; ============================== +; RAM in Use +StoryState = $7C + org $008000 base $7E0730 @@ -9,4 +13,4 @@ ShortSpoof: skip 1 MusicNoteValue: skip 2 OverworldLocationPointer: skip 2 -base off \ No newline at end of file +base off