change item layouts and fix scrolling selector bug

Menu/menu_draw_items.asm

@@ -174,17 +174,17 @@ DrawYItems:
 	REP #$30
 
 	LDA.w #$7EF340
-	LDX.w #menu_offset(7,2)
+	LDX.w #menu_offset(7,3)
 	LDY.w #BowsGFX
 	JSR DrawMenuItem
 
 	LDA.w #$7EF341
-	LDX.w #menu_offset(7,5)
+	LDX.w #menu_offset(7,6)
 	LDY.w #BoomsGFX
 	JSR DrawMenuItem
 
 	LDA.w #$7EF342
-	LDX.w #menu_offset(7,8)
+	LDX.w #menu_offset(7,9)
 	LDY.w #HookGFX
 	JSR DrawMenuItem
 
@@ -193,117 +193,132 @@ DrawYItems:
   LDA.w #$0001
   STA.w MenuItemValueSpoof
   LDA.w #MenuItemValueSpoof
-  LDX.w #menu_offset(7,11)
+  LDX.w #menu_offset(7,13)
   LDY.w #BombsGFX
 	JSR DrawMenuItem
 .no_bomb
 
 	LDA.w #$7EF348
-	LDX.w #menu_offset(7,14)
+	LDX.w #menu_offset(7,16)
 	LDY.w #DekuMaskGFX
 	JSR DrawMenuItem
 
 	LDA.w #$7EF35C
-	LDX.w #menu_offset(7,17)
+	LDX.w #menu_offset(7,19)
 	LDY.w #BottlesGFX
 	JSR DrawMenuItem
 
+  ;; next row
+
+	LDA.w #$7EF34B 
+	LDX.w #menu_offset(10,3)
+	LDY.w #HammerGFX
+	JSR DrawMenuItem
+
+  LDA.w #$7EF34A
+	LDX.w #menu_offset(10,6)
+	LDY.w #LampGFX
+	JSR DrawMenuItem
 
   LDA.w #$7EF345
-	LDX.w #menu_offset(10,2)
+	LDX.w #menu_offset(10,9)
 	LDY.w #Fire_rodGFX
 	JSR DrawMenuItem
 
 	LDA.w #$7EF346
-	LDX.w #menu_offset(10,5)
+	LDX.w #menu_offset(10,13)
 	LDY.w #Ice_rodGFX
 	JSR DrawMenuItem
 
-  LDA.w #$7EF34A
-	LDX.w #menu_offset(10,8)
-	LDY.w #LampGFX
-	JSR DrawMenuItem
-
-  LDA.w #$7EF34B
-	LDX.w #menu_offset(10,11)
-	LDY.w #HammerGFX
-	JSR DrawMenuItem
-
 	LDA.w #$7EF347
-	LDX.w #menu_offset(10,14)
+	LDX.w #menu_offset(10,16)
 	LDY.w #GoronMaskGFX
 	JSR DrawMenuItem
 
 	LDA.w #$7EF35D
-	LDX.w #menu_offset(10,17)
+	LDX.w #menu_offset(10,19)
 	LDY.w #BottlesGFX
 	JSR DrawMenuItem
 
+  ;; next row 
+
+	LDA.w #$7EF34F ; 7EF34C
+	LDX.w #menu_offset(13,3)
+	LDY.w #ShovelGFX
+	JSR DrawMenuItem
+
+  ;LDA.w #$7EF34D
+  LDA.l $7EF34D
+  CMP.w #$00 : BEQ .no_feather
+  LDA.w #$01
+  STA.w ShortSpoof
+  LDA.w #ShortSpoof
+	LDX.w #menu_offset(13,6)
+	LDY.w #JumpFeatherGFX
+	JSR DrawMenuItem
+.no_feather
 
 	LDA.w #$7EF350
-	LDX.w #menu_offset(13,2)
+	LDX.w #menu_offset(13,9)
 	LDY.w #SomariaGFX
 	JSR DrawMenuItem
 
 	LDA.w #$7EF351
-	LDX.w #menu_offset(13,5)
+	LDX.w #menu_offset(13,13)
 	LDY.w #ByrnaGFX
 	JSR DrawMenuItem
 
-	; LDA.w #$7EF34C
-	; LDX.w #menu_offset(13,8)
-	; LDY.w #ShovelGFX
-	; JSR DrawMenuItem
-
-	LDA.w #$7EF34E
-	LDX.w #menu_offset(13,8)
-	LDY.w #BookGFX
-	JSR DrawMenuItem
-
-  LDA.w #$7EF34D
-	LDX.w #menu_offset(13,11)
-	LDY.w #JumpFeatherGFX
-	JSR DrawMenuItem
-
 	LDA.w #$7EF349
-	LDX.w #menu_offset(13,14)
+	LDX.w #menu_offset(13,16)
 	LDY.w #BunnyHoodGFX
 	JSR DrawMenuItem
 
 	LDA.w #$7EF35E
-	LDX.w #menu_offset(13,17)
+	LDX.w #menu_offset(13,19)
 	LDY.w #BottlesGFX
 	JSR DrawMenuItem
 
-
+  ;; next row
-
-  LDA.w #$7EF34C ; ocarina
-	LDX.w #menu_offset(16,2)
-	LDY.w #ShovelGFX
-	JSR DrawMenuItem
-
-	LDA.w #$7EF353
-	LDX.w #menu_offset(16,5)
-	LDY.w #MirrorGFX
-	JSR DrawMenuItem
-
-  LDA.w #$7EF34F
-	LDX.w #menu_offset(16,8)
-	LDY.w #ShovelGFX
-	JSR DrawMenuItem
 
   LDA.w #$7EF344
-	LDX.w #menu_offset(16,11)
+	LDX.w #menu_offset(16,3)
 	LDY.w #PowderGFX
 	JSR DrawMenuItem
 
+  ;LDA.w #$7EF34E
+  LDA.l $7EF34E
+  CMP.w #$00 : BEQ .no_book
+  LDA.w #$01
+  STA.w ShortSpoof
+  LDA.w #ShortSpoof
+	LDX.w #menu_offset(13,6)
+	LDY.w #BookGFX
+	JSR DrawMenuItem
+.no_book
+
+  ; LDA.w #$7EF34C ; ocarina
+  LDA.l $7EF34C
+  CMP.w #$00 : BEQ .no_flute
+  LDA.w #$01
+  STA.w ShortSpoof
+  LDA.w #ShortSpoof
+	LDX.w #menu_offset(16,9)
+	LDY.w #OcarinaGFX
+	JSR DrawMenuItem
+.no_flute
+
+	LDA.w #$7EF353
+	LDX.w #menu_offset(16,13)
+	LDY.w #MirrorGFX
+	JSR DrawMenuItem
+
 	LDA.w #$7EF352
-	LDX.w #menu_offset(16,14)
+	LDX.w #menu_offset(16,16)
 	LDY.w #StoneMaskGFX
 	JSR DrawMenuItem
 
 	LDA.w #$7EF35F
-	LDX.w #menu_offset(16,17)
+	LDX.w #menu_offset(16,19)
 	LDY.w #BottlesGFX
 	JSR DrawMenuItem
 

Menu/menu_gfx_table.asm

@@ -12,7 +12,7 @@ NothingGFX:
 
 BowsGFX:
 	dw $28BA, $28E9, $28E8, $28CB ; Empty bow
-  dw $297C, $297D, $2849, $284A ; NEW slingshot
+  ; dw $297C, $297D, $2849, $284A ; NEW slingshot
 	dw $28BA, $284A, $2849, $28CB ; Bow and arrows
 	dw $28BA, $28E9, $28E8, $28CB ; Empty silvers bow
 	dw $28BA, $28BB, $24CA, $28CB ; Silver bow and arrows
@@ -20,11 +20,11 @@ BowsGFX:
 BoomsGFX:
 	dw $2CB8, $2CB9, $2CC9, $ACB9 ; NEW Blue boomerang
 	dw $24B8, $24B9, $24C9, $A4B9 ; NEW red boomerang
-  dw $3CB8, $3CB9, $3CC9, $BCB9 ; NEW green boomerang
+  ; dw $3CB8, $3CB9, $3CC9, $BCB9 ; NEW green boomerang
 
 HookGFX:
 	dw $24F5, $24F6, $24C0, $24F5 ; Hookshot
-  dw $2C17, $3531, $2D40, $3541 ; Ball & Chain
+  ; dw $2C17, $3531, $2D40, $3541 ; Ball & Chain
 
 BombsGFX:
 	dw $2CB2, $2CB3, $2CC2, $6CC2 ; Bombs
@@ -59,11 +59,11 @@ HammerGFX:
 
 ShovelGFX:
 	dw $30D0, $20D1, $30E0, $30E1 ; NEW Shovel
-	dw $2CD4, $2CD5, $2CE4, $2CE5 ; Flute
-	dw $2CD4, $2CD5, $2CE4, $2CE5 ; Flute (active)
 
 OcarinaGFX:
   dw $2CD4, $2CD5, $2CE4, $2CE5 ; Flute
+  dw $2CD4, $2CD5, $2CE4, $2CE5
+  dw $2CD4, $2CD5, $2CE4, $2CE5
 
 ; formerly fishing net
 JumpFeatherGFX:

Menu/menu_select_item.asm

@@ -9,22 +9,22 @@ Menu_ItemIndex:
   db $01 ; bombs
   db $11 ; deku mask 
   db $0B ; bottle1
+  db $04 ; hammer 
+  db $09 ; lamp 
   db $05 ; firerod (nimbus)
   db $06 ; icerod 
-  db $09 ; lamp 
-  db $04 ; hammer 
   db $0F ; bombos / goron 
   db $4B ; bottle2
+  db $0B ; shovel
+  db $07 ; feather 
   db $12 ; somaria
   db $0D ; byrna
-  db $0C ; book 
-  db $07 ; feather 
   db $10 ; bunny hood
   db $8B ; bottle3
+  db $0A ; powder 
+  db $0C ; book 
   db $08 ; ocarina 
   db $14 ; mirror
-  db $0B ; shovel
-  db $0A ; powder 
   db $13 ; stone mask
   db $CB ; bottle4
 
@@ -37,52 +37,55 @@ Menu_AddressIndex:
   db $7EF343 ; bombs
   db $7EF348 ; deku mask 
   db $7EF35C ; bottle1
+  db $7EF34B ; hammer 
+  db $7EF34A ; lamp 
   db $7EF345 ; firerod (nimbus)
   db $7EF346 ; icerod 
-  db $7EF34A ; lamp 
-  db $7EF34B ; hammer 
   db $7EF347 ; bombos / goron 
   db $7EF35D ; bottle2
+  db $7EF34F ; shovel
+  db $7EF34D ; feather 
   db $7EF350 ; somaria
   db $7EF351 ; byrna
-  db $7EF34E ; book 
-  db $7EF34D ; feather 
   db $7EF349 ; bunny hood
   db $7EF35E ; bottle3
+  db $7EF344 ; powder 
+  db $7EF34E ; book 
   db $7EF34C ; ocarina 
   db $7EF353 ; mirror
-  db $7EF34F ; shovel
-  db $7EF344 ; powder 
   db $7EF352 ; stone mask
   db $7EF35F ; bottle4
 
 ; -----------------------------------------------------------------------------
 
 Menu_ItemCursorPositions:
-  dw menu_offset(6,1) ; bow
+  dw menu_offset(6,2) ; bow
-  dw menu_offset(6,4) ; boom
+  dw menu_offset(6,5) ; boom
-  dw menu_offset(6,7) ; hookshot
+  dw menu_offset(6,8) ; hookshot
-  dw menu_offset(6,10) ; bombs
+  dw menu_offset(6,12) ; bombs
-  dw menu_offset(6,13) ; deku mask
+  dw menu_offset(6,15) ; deku mask
-  dw menu_offset(6,16) ; bottle1
+  dw menu_offset(6,18) ; bottle1
-  dw menu_offset(9,1) ; firerod
+
-  dw menu_offset(9,4) ; icerod
+  dw menu_offset(9,2) ; hammer 
-  dw menu_offset(9,7) ; lamp
+  dw menu_offset(9,5) ; lamp
-  dw menu_offset(9,10) ; hammer 
+  dw menu_offset(9,8) ; firerod
-  dw menu_offset(9,13) ; goron
+  dw menu_offset(9,12) ; icerod
-  dw menu_offset(9,16) ; bottle2
+  dw menu_offset(9,15) ; goron
-  dw menu_offset(12,1) ; somaria
+  dw menu_offset(9,18) ; bottle2
-  dw menu_offset(12,4) ; byrna
+
-  dw menu_offset(12,7) ; book 
+  dw menu_offset(12,2) ; shovel 
-  dw menu_offset(12,10) ; feather 
+  dw menu_offset(12,5) ; feather 
-  dw menu_offset(12,13) ; bunny hood
+  dw menu_offset(12,8) ; somaria
-  dw menu_offset(12,16) ; bottle3
+  dw menu_offset(12,12) ; byrna
-  dw menu_offset(15,1) ; flute
+  dw menu_offset(12,15) ; bunny hood
-  dw menu_offset(15,4) ; mirror
+  dw menu_offset(12,18) ; bottle3
-  dw menu_offset(15,7) ; shovel 
+
-  dw menu_offset(15,10) ; powder 
+  dw menu_offset(15,2) ; powder 
-  dw menu_offset(15,13) ; stone mask 
+  dw menu_offset(15,5) ; book 
-  dw menu_offset(15,16) ; bottle
+  dw menu_offset(15,8) ; flute
+  dw menu_offset(15,12) ; mirror
+  dw menu_offset(15,15) ; stone mask 
+  dw menu_offset(15,18) ; bottle4
 
 ; -----------------------------------------------------------------------------
 
@@ -118,7 +121,7 @@ Menu_FindNextDownItem:
   TAY : STY.w $0202
   LDX.w Menu_AddressIndex-1, Y 
   LDA.l $7EF300, X
-  BEQ Menu_FindNextUpItem
+  BEQ Menu_FindNextItem
   RTS 
 
 ; -----------------------------------------------------------------------------
@@ -131,7 +134,7 @@ Menu_FindNextUpItem:
   TAY : STY.w $0202
   LDX.w Menu_AddressIndex-1, Y 
   LDA.l $7EF300, X
-  BEQ Menu_FindNextDownItem
+  BEQ Menu_FindPrevItem
   RTS 
 
 ; -----------------------------------------------------------------------------

Menu/menu_text.asm

@@ -98,22 +98,22 @@ Menu_ItemNames:
   dw "____BOMBS_____  "
   dw "__DEKU_MASK___  "
   dw "____BOTTLE____  "
+  dw "____HAMMER____  "
+  dw "_____LAMP_____  "
   dw "___FIRE_ROD___  "
   dw "___ICE_ROD____  "
-  dw "_____LAMP_____  "
-  dw "____HAMMER____  "
   dw "__GORON_MASK__  "
   dw "____BOTTLE____  "
+  dw "____SHOVEL____  "
+  dw "_JUMP_FEATHER_  "
   dw "___SOMARIA____  "
   dw "____BYRNA_____  "
-  dw "_SECRET_TOME__  "
-  dw "_JUMP_FEATHER_  "
   dw "__BUNNY_HOOD__  "
   dw "____BOTTLE____  "
+  dw "_MAGIC_POWDER_  "
+  dw "_SECRET_TOME__  "
   dw "___OCARINA____  "
   dw "_MAGIC_MIRROR_  "
-  dw "____SHOVEL____  "
-  dw "_MAGIC_POWDER_  "
   dw "__STONE_MASK__  "
   dw "____BOTTLE____  "