menu updates

Menu/menu.asm

@@ -42,7 +42,6 @@ Menu_Entry:
 {
   PHB : PHK : PLB 
   LDA.w $0200 : ASL : TAX
-  LDA.b #$10 : STA $BC
   JSR (.vectors,X)
   
   SEP #$20

Menu/menu_draw.asm

@@ -264,7 +264,7 @@ DrawYItems:
 
 	LDA.w #$7EF347
 	LDX.w #menu_offset(10,16)
-	LDY.w #GoronMaskGFX
+	LDY.w #ZoraMaskGFX
 	JSR DrawMenuItem
 
 	LDA.w #$7EF35D
@@ -276,7 +276,7 @@ DrawYItems:
 
 	LDA.w #$7EF34F ; 7EF34C
 	LDX.w #menu_offset(13,3)
-	LDY.w #ShovelGFX
+	LDY.w #WolfMaskGFX
 	JSR DrawMenuItem
 
   LDA.w #$7EF34D

Menu/menu_gfx_table.asm

@@ -89,8 +89,8 @@ ShovelGFX:
 
 OcarinaGFX:
   dw $2CD4, $2CD5, $2CE4, $2CE5 
-  dw $2CD4, $2CD5, $2CE4, $2CE5
-  dw $2CD4, $2CD5, $2CE4, $2CE5
+  ; dw $2CD4, $2CD5, $2CE4, $2CE5
+  ; dw $2CD4, $2CD5, $2CE4, $2CE5
 
 ; -------------------------------------
 ; formerly fishing net
@@ -132,6 +132,16 @@ StoneMaskGFX:
 
 ; -------------------------------------
 
+WolfMaskGFX:
+  dw $3086, $7086, $3087, $7087
+
+; -------------------------------------
+
+ZoraMaskGFX:
+  dw $2C88, $6C88, $2C89, $6C89
+
+; -------------------------------------
+
 MirrorGFX:
 	dw $2C72, $2C73, $2C62, $2C63 ; Mirror
   dw $2C62, $2C63, $2C72, $2C73 ; Mirror

Menu/menu_hud.asm

@@ -458,40 +458,45 @@ HUD_AnimateHeartRefill:
 ; ============================================================================ 
 ; *$6FAFD-$6FB90 LOCAL
 
+HudItems:
+  dw BowsGFX
+  dw BoomsGFX
+  dw HookGFX
+  dw BombsGFX
+  dw DekuMaskGFX
+  dw BottlesGFX
+  dw Fire_rodGFX
+  dw Ice_rodGFX
+  dw LampGFX
+  dw HammerGFX
+  dw GoronMaskGFX
+  dw BottlesGFX
+  dw SomariaGFX
+  dw ByrnaGFX
+  dw BookGFX
+  dw JumpFeatherGFX
+  dw BunnyHoodGFX 
+  dw BottlesGFX
+  dw OcarinaGFX
+  dw MirrorGFX
+  dw ShovelGFX
+  dw PowderGFX
+  dw StoneMaskGFX
+  dw BottlesGFX
+
 HUD_UpdateItemBox:
 {
     SEP #$30
     
     ; Dost thou haveth the the bow?
     LDA $7EF340 : BEQ .havethNoBow
-    
-    ; Dost thou haveth the silver arrows?
-    ; (okay I'll stop soon)
-    ; CMP.b #$03 : BCC .havethNoSilverArrows 
-    
-    ; Draw the arrow guage icon as silver rather than normal wood arrows.
-;     LDA.b #$86 : STA $7EC71E
-;     LDA.b #$24 : STA $7EC71F
-;     LDA.b #$87 : STA $7EC720
-;     LDA.b #$24 : STA $7EC721
-    
     LDX.b #$04
     
     ; check how many arrows the player has
     LDA $7EF377 : BNE .drawBowItemIcon
-    
     LDX.b #$03
-    
     BRA .drawBowItemIcon
 
-; .havethNoSilverArrows
-
-;     LDX.b #$02
-    
-;     LDA $7EF377 : BNE .drawBowItemIcon
-    
-;     LDX.b #$01
-
 .drawBowItemIcon
 
     ; values of X correspond to how the icon will end up drawn:
@@ -507,7 +512,7 @@ HUD_UpdateItemBox:
     
     LDX $0202 : BEQ .noEquippedItem
     
-    LDA $7EF33F, X : AND.w #$00FF
+    LDA Menu_ItemIndex, X : AND.w #$00FF
     
     CPX.w #$0004 : BNE .bombsNotEquipped
     

Menu/menu_select_item.asm

@@ -2,30 +2,14 @@
 ;  Item Selection Code
 
 Menu_ItemIndex:
-  db $03 ; slingshot
-  db $02 ; boomerang
-  db $0E ; hookshot 
-  db $01 ; bombs
-  db $11 ; deku mask 
-  db $0B ; bottle1
-  db $04 ; hammer 
-  db $09 ; lamp 
-  db $05 ; firerod (nimbus)
-  db $06 ; icerod 
-  db $0F ; bombos / goron 
-  db $4B ; bottle2
-  db $0B ; shovel
-  db $07 ; feather 
-  db $12 ; somaria
-  db $0D ; byrna
-  db $10 ; bunny hood
-  db $8B ; bottle3
-  db $0A ; powder 
-  db $0C ; book 
-  db $08 ; ocarina 
-  db $14 ; mirror
-  db $13 ; stone mask
-  db $CB ; bottle4
+  ;  Bow,    Boomerang, Hookshot, Bombs,   Deku,       Bottle 1
+  db $03,    $02,       $0E,      $01,     $11,        $0B 
+  ;  Hammer, Lamp,      Fire Rod, Ice Rod, Zora,       Bottle 2
+  db $04,    $09,       $05,      $06,     $0F,        $4B 
+  ;  Wolf,   Feather,   Somaria,  Byrna,   Bunny Hood, Bottle3
+  db $0B,    $07,       $12,      $0D,     $10,        $8B 
+  ;  Powder, Book,      Ocarina,  Mirror,  Stone Mask, Bottle4
+  db $0A,    $0C,       $08,      $14,     $13,        $CB 
 
 ; -----------------------------------------------------------------------------
 
@@ -38,15 +22,15 @@ Menu_AddressIndex:
   db $7EF35C ; bottle1
   db $7EF34B ; hammer 
   db $7EF34A ; lamp 
-  db $7EF345 ; firerod (nimbus)
+  db $7EF345 ; firerod
   db $7EF346 ; icerod 
-  db $7EF347 ; bombos / goron 
+  db $7EF347 ; Zora Mask
   db $7EF35D ; bottle2
   db $7EF34F ; shovel
   db $7EF34D ; feather 
   db $7EF350 ; somaria
   db $7EF351 ; byrna
-  db $7EF349 ; bunny hood
+  db $7EF349 ; Bunny Hood
   db $7EF35E ; bottle3
   db $7EF344 ; powder 
   db $7EF34E ; book 

Menu/menu_text.asm

@@ -102,9 +102,9 @@ Menu_ItemNames:
   dw "_____LAMP_____  "
   dw "___FIRE_ROD___  "
   dw "___ICE_ROD____  "
-  dw "__GORON_MASK__  "
+  dw "__ZORA_MASK___  "
   dw "____BOTTLE____  "
-  dw "____SHOVEL____  "
+  dw "__WOLF_MASK___  "
   dw "_JUMP_FEATHER_  "
   dw "___SOMARIA____  "
   dw "____BYRNA_____  "