diff --git a/Core/symbols.asm b/Core/symbols.asm index 7d5f869..0da9ddd 100644 --- a/Core/symbols.asm +++ b/Core/symbols.asm @@ -1,3 +1,86 @@ +; ========================================================= +; WRAM in Use +org $008000 +base $7E0730 ; MAP16OVERFLOW free ram region + +MenuScrollLevelV: skip 1 +MenuScrollLevelH: skip 1 +MenuScrollHDirection: skip 2 +MenuItemValueSpoof: skip 2 +ShortSpoof: skip 1 +MusicNoteValue: skip 2 +OverworldLocationPointer: skip 2 +HasGoldstar: skip 1 +GoldstarOrHookshot: skip 1 +Neck_Index: skip 1 +Neck1_OffsetX: skip 1 +Neck1_OffsetY: skip 1 +Neck2_OffsetX: skip 1 +Neck2_OffsetY: skip 1 +Neck3_OffsetX: skip 1 +Neck3_OffsetY: skip 1 +Offspring1_Id: skip 1 +Offspring2_Id: skip 1 +Offspring3_Id: skip 1 +Kydreeok_Id: skip 1 +FishingOrPortalRod: skip 1 + +base off + +; ========================================================= +; SRAM in Use + +; .fmp h.i. +; f - fortress of secrets +; m - master sword +; p - pendant quest +; h - hall of secrets +; i - intro over, maku tree +OOSPROG = $7EF3D6 + +; Bitfield of less important progression +; .fbh .zsu +; u - Uncle +; 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 + +; .... ...m +; m - maku tree has met link (0: no | 1: yes) +OOSPROG3 = $7EF3D4 + +; Current Dream ID (0x00-0x07) +CurrentDream = $0426 + +CurrentSong = $030F + +; .dgi zktm +; m - Mushroom Grotto +; t - Tail Palace +; k - Kalyxo Castle +; z - Zora Temple +; i - Glacia Estate +; g - Goron Mines +; d - Dragon Ship +DREAMS = $7EF410 + +; Collectibles +Bananas = $7EF38B +Pineapples = $7EF38D +RockMeat = $7EF38F +Seashells = $7EF391 +Honeycomb = $7EF393 +DekuSticks = $7EF395 + +; 01 - Fishing Rod +; 02 - Portal Rod +CUSTOMRODS = $7EF351 + +FishingRod = $7EF38A + ; ========================================================= ; Sprite RAM and Functions diff --git a/Oracle_main.asm b/Oracle_main.asm index 334e9de..ad81ef9 100644 --- a/Oracle_main.asm +++ b/Oracle_main.asm @@ -32,55 +32,6 @@ ; Goron Mines 0x0E (Misery Mire) ; Dragon Ship 0x18 (Turtle Rock) -; .fmp h.i. -; f - fortress of secrets -; m - master sword -; p - pendant quest -; h - hall of secrets -; i - intro over, 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 - -; .... ...m -; m - maku tree has met link (0: no | 1: yes) -OOSPROG3 = $7EF3D4 - -; .dgi zktm -; m - Mushroom Grotto -; t - Tail Palace -; k - Kalyxo Castle -; z - Zora Temple -; i - Glacia Estate -; g - Goron Mines -; d - Dragon Ship -DREAMS = $7EF410 - -; Current Dream ID (0x00-0x07) -CurrentDream = $0426 - -CurrentSong = $030F - -; 01 - Fishing Rod -; 02 - Portal Rod -CUSTOMRODS = $7EF351 - -; Collectibles -Bananas = $7EF38B -Pineapples = $7EF38D -RockMeat = $7EF38F -Seashells = $7EF391 -Honeycomb = $7EF393 -DekuSticks = $7EF395 - ; ========================================================= ; ZSCustomOverworld version @@ -103,7 +54,6 @@ namespace Oracle print "Applying patches to Oracle of Secrets" print "" - incsrc "Util/ram.asm" incsrc "Util/functions.asm" incsrc "Core/music_macros.asm" incsrc "Core/symbols.asm" diff --git a/Util/ram.asm b/Util/ram.asm deleted file mode 100644 index 88c8429..0000000 --- a/Util/ram.asm +++ /dev/null @@ -1,33 +0,0 @@ -; ========================================================= -; WRAM in Use -org $008000 -base $7E0730 ; MAP16OVERFLOW free ram region - -MenuScrollLevelV: skip 1 -MenuScrollLevelH: skip 1 -MenuScrollHDirection: skip 2 -MenuItemValueSpoof: skip 2 -ShortSpoof: skip 1 -MusicNoteValue: skip 2 -OverworldLocationPointer: skip 2 -HasGoldstar: skip 1 -GoldstarOrHookshot: skip 1 -Neck_Index: skip 1 -Neck1_OffsetX: skip 1 -Neck1_OffsetY: skip 1 -Neck2_OffsetX: skip 1 -Neck2_OffsetY: skip 1 -Neck3_OffsetX: skip 1 -Neck3_OffsetY: skip 1 -Offspring1_Id: skip 1 -Offspring2_Id: skip 1 -Offspring3_Id: skip 1 -Kydreeok_Id: skip 1 -FishingOrPortalRod: skip 1 - -base off - -; ========================================================= -; SRAM in Use - -FishingRod = $7EF38A \ No newline at end of file