housekeeping

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

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

Menu/menu.asm

@@ -1,6 +1,6 @@
 ; =============================================================================
 ;                The Legend of Zelda: Oracle of Secrets
-;                    ------------NEW Custom Menu ------------
+;                ------------ Custom Menu ------------
 ;
 ;        Details:  Complete overhaul of original LTTP menu
 ;                  Two Pane Oot/MM inspired design
@@ -13,38 +13,27 @@
 ; =============================================================================
 
 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"

Oracle_main.asm

@@ -25,26 +25,26 @@ namespace Oracle
   incsrc "Menu/menu.asm"
   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
 
-  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"

Sprites/happy_mask_salesman.asm

@@ -1,11 +1,12 @@
 ;===========================================================
-;
+; Happy Mask Salesman 
 ;===========================================================
 
-namespace FortuneTeller 
+namespace Sprites 
 {
-  Main: 
+  namespace HappyMaskSalesman
   {
 
-  }  ; label Main
-}  ; namespace FortuneTeller
+
+  } ; namespace HappyMaskSalesman
+}  ; namespace Sprites