From 30f2afad04c9b2c20caaed2ea5fc5e3a8c5f45f0 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 1 Oct 2022 02:53:32 -0500 Subject: [PATCH] housekeeping --- Debug/debug.asm | 4 +- {Intro => Events}/intro.asm | 0 {LostSea => Events}/lostsea.asm | 0 Book/book.asm => Items/book_of_secrets.asm | 0 IceRod/icerod.asm => Items/ice_rod.asm | 0 {Book => Items}/reveal_secrets.asm | 1 - .../bunnyhood.asm => Masks/bunny_hood.asm | 0 Menu/menu.asm | 59 ++++++++----------- Oracle_main.asm | 30 +++++----- .../happy_mask_salesman.asm | 23 ++++---- 10 files changed, 53 insertions(+), 64 deletions(-) rename {Intro => Events}/intro.asm (100%) rename {LostSea => Events}/lostsea.asm (100%) rename Book/book.asm => Items/book_of_secrets.asm (100%) rename IceRod/icerod.asm => Items/ice_rod.asm (100%) rename {Book => Items}/reveal_secrets.asm (96%) rename BunnyHood/bunnyhood.asm => Masks/bunny_hood.asm (100%) rename FortuneTeller/fortuneteller.asm => Sprites/happy_mask_salesman.asm (50%) diff --git a/Debug/debug.asm b/Debug/debug.asm index f1e9105..7fd9a57 100644 --- a/Debug/debug.asm +++ b/Debug/debug.asm @@ -73,11 +73,11 @@ namespace Debug STA $7EF356 LDA #$01 ; 0 - nothing. 1 - moon pearl. STA $7EF357 - LDA #$03 ; 0-No sword. 1-Fighter Sword. 2-Master Sword. 3-Tempered Sword. 4-Golden Sword + LDA #$04 ; 0-No sword. 1-Fighter Sword. 2-Master Sword. 3-Tempered Sword. 4-Golden Sword STA $7EF359 LDA #$03 ; 0-No shield. 1-Blue Shield. 2-Hero's Shield. 3-Mirror Shield STA $7EF35A - LDA #$01 ; 0-Green Jerkin. 1-Blue Mail. 2-Red Mail + LDA #$02 ; 0-Green Jerkin. 1-Blue Mail. 2-Red Mail STA $7EF35B LDA #$02 ; 0-No bottle. 1-Mushroom (no use). 2-Empty bottle. 3-Red Potion. 4-Green Potion. 5-Blue Potion. 6-Fairy. 7-Bee. 8-Good Bee STA $7EF35C diff --git a/Intro/intro.asm b/Events/intro.asm similarity index 100% rename from Intro/intro.asm rename to Events/intro.asm diff --git a/LostSea/lostsea.asm b/Events/lostsea.asm similarity index 100% rename from LostSea/lostsea.asm rename to Events/lostsea.asm diff --git a/Book/book.asm b/Items/book_of_secrets.asm similarity index 100% rename from Book/book.asm rename to Items/book_of_secrets.asm diff --git a/IceRod/icerod.asm b/Items/ice_rod.asm similarity index 100% rename from IceRod/icerod.asm rename to Items/ice_rod.asm diff --git a/Book/reveal_secrets.asm b/Items/reveal_secrets.asm similarity index 96% rename from Book/reveal_secrets.asm rename to Items/reveal_secrets.asm index 9b90ec1..88208f9 100644 --- a/Book/reveal_secrets.asm +++ b/Items/reveal_secrets.asm @@ -17,7 +17,6 @@ Reveal_Secrets: { - header lorom ORG $0288FD ; go to the code that branches behind the dungeon map load if player didn't press X diff --git a/BunnyHood/bunnyhood.asm b/Masks/bunny_hood.asm similarity index 100% rename from BunnyHood/bunnyhood.asm rename to Masks/bunny_hood.asm diff --git a/Menu/menu.asm b/Menu/menu.asm index 036700c..d4971e1 100644 --- a/Menu/menu.asm +++ b/Menu/menu.asm @@ -1,50 +1,39 @@ ; ============================================================================= -; The Legend of Zelda: Oracle of Secrets -; ------------NEW Custom Menu ------------ +; The Legend of Zelda: Oracle of Secrets +; ------------ Custom Menu ------------ ; -; Details: Complete overhaul of original LTTP menu -; Two Pane Oot/MM inspired design -; Original item layout and designs -; Detailed Quest Status screen -; Player name, location name, and death count +; Details: Complete overhaul of original LTTP menu +; Two Pane Oot/MM inspired design +; Original item layout and designs +; Detailed Quest Status screen +; Player name, location name, and death count ; ; Significant thanks to Kan for helping me craft this menu! ; ; ============================================================================= pushpc -org $1BD662 ; update in game hud colors - dw hexto555($814f16), hexto555($552903) -org $1BD66A - dw hexto555($d51d00), hexto555($f9f9f9) -org $1DB672 - dw hexto555($d1a452), hexto555($f9f9f9) -org $1DB67A - dw hexto555($5987e0), hexto555($f9f9f9) -org $1DB682 - dw hexto555($7b7b83), hexto555($bbbbbb) -org $1DB68A - dw hexto555($a58100), hexto555($dfb93f) -org $0098AB ; hook vanilla menu routine - db $D8>>1 -org $00F877 - db Menu_Entry>>0 -org $00F883 - db Menu_Entry>>8 -org $00F88F - db Menu_Entry>>16 -org $808B6B - LDX.w #$6040 -org $8DDFB2 - LDA.l Menu_ItemIndex, X +; update in game hud colors +org $1BD662 : dw hexto555($814f16), hexto555($552903) +org $1BD66A : dw hexto555($d51d00), hexto555($f9f9f9) +org $1DB672 : dw hexto555($d1a452), hexto555($f9f9f9) +org $1DB67A : dw hexto555($5987e0), hexto555($f9f9f9) +org $1DB682 : dw hexto555($7b7b83), hexto555($bbbbbb) +org $1DB68A : dw hexto555($a58100), hexto555($dfb93f) + +; hook vanilla menu routine +org $0098AB : db $D8>>1 +org $00F877 : db Menu_Entry>>0 +org $00F883 : db Menu_Entry>>8 +org $00F88F : db Menu_Entry>>16 +org $808B6B : LDX.w #$6040 +org $8DDFB2 : LDA.l Menu_ItemIndex, X pullpc ; upload tilemaps containing frame of menu and icons org $248000 -Menu_Tilemap: - incbin "tilemaps/menu_frame.tilemap" -Menu_QuestIcons: - incbin "tilemaps/quest_icons.tilemap" +Menu_Tilemap: incbin "tilemaps/menu_frame.tilemap" +Menu_QuestIcons: incbin "tilemaps/quest_icons.tilemap" incsrc "menu_gfx_table.asm" incsrc "menu_draw_items.asm" incsrc "menu_text.asm" diff --git a/Oracle_main.asm b/Oracle_main.asm index 8ea9f1a..e38b4bc 100644 --- a/Oracle_main.asm +++ b/Oracle_main.asm @@ -23,28 +23,28 @@ namespace Oracle incsrc "Util/functions.asm" incsrc "Menu/menu.asm" - print "End of Menu/menu.asm ", pc + print "End of Menu/menu.asm ", pc - incsrc "Book/book.asm" - print "End of Book/Book.asm ", pc + incsrc "Events/intro.asm" + print "End of Events/intro.asm ", pc - incsrc "BunnyHood/bunnyhood.asm" - print "End of BunnyHood/bunnyhood.asm ", pc + incsrc "Events/lostsea.asm" + print "End of Events/lostsea.asm ", pc - incsrc "Debug/debug.asm" - print "End of Debug/debug.asm ", pc + incsrc "Items/ice_rod.asm" + print "End of Items/ice_rod.asm ", pc - incsrc "IceRod/icerod.asm" - print "End of IceRod/icerod.asm ", pc - - incsrc "Intro/intro.asm" - print "End of Intro/intro.asm ", pc + incsrc "Masks/bunny_hood.asm" + print "End of Masks/bunny_hood.asm ", pc incsrc "KeyBlock/keyblock.asm" - print "End of KeyBlock/keyblock.asm ", pc + print "End of KeyBlock/keyblock.asm ", pc - incsrc "LostSea/lostsea.asm" - print "End of LostSea/lostsea.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 print "" print "Finished applying patches" diff --git a/FortuneTeller/fortuneteller.asm b/Sprites/happy_mask_salesman.asm similarity index 50% rename from FortuneTeller/fortuneteller.asm rename to Sprites/happy_mask_salesman.asm index 6dd951c..ceb18a1 100644 --- a/FortuneTeller/fortuneteller.asm +++ b/Sprites/happy_mask_salesman.asm @@ -1,11 +1,12 @@ -;=========================================================== -; -;=========================================================== - -namespace FortuneTeller -{ - Main: - { - - } ; label Main -} ; namespace FortuneTeller +;=========================================================== +; Happy Mask Salesman +;=========================================================== + +namespace Sprites +{ + namespace HappyMaskSalesman + { + + + } ; namespace HappyMaskSalesman +} ; namespace Sprites