scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rearrange menu item layout

Browse Source
This commit is contained in:
scawful
2022-12-15 21:59:06 -06:00
parent 8dfa653aeb
commit e286f5b187
3 changed files with 77 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
Menu/menu_draw.asm
View File

@@ -230,9 +230,9 @@ DrawYItems:
JSR DrawMenuItem
.no_bomb
LDA.w #$7EF348
LDX.w #menu_offset(7,16)
LDY.w #DekuMaskGFX
LDA.w #$7EF344
LDX.w #menu_offset(7,16)
LDY.w #PowderGFX
JSR DrawMenuItem
LDA.w #$7EF35C
@@ -262,9 +262,9 @@ DrawYItems:
LDY.w #Ice_rodGFX
JSR DrawMenuItem
LDA.w #$7EF347
LDA.w #$7EF353
LDX.w #menu_offset(10,16)
LDY.w #ZoraMaskGFX
LDY.w #MirrorGFX
JSR DrawMenuItem
LDA.w #$7EF35D
@@ -274,42 +274,16 @@ DrawYItems:
;; next row
LDA.w #$7EF34F ; 7EF34C
; 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(13,3)
LDY.w #WolfMaskGFX
JSR DrawMenuItem
LDA.w #$7EF34D
LDX.w #menu_offset(13,6)
LDY.w #JumpFeatherGFX
JSR DrawMenuItem
LDA.w #$7EF350
LDX.w #menu_offset(13,9)
LDY.w #SomariaGFX
JSR DrawMenuItem
LDA.w #$7EF351
LDX.w #menu_offset(13,13)
LDY.w #ByrnaGFX
JSR DrawMenuItem
LDA.w #$7EF349
LDX.w #menu_offset(13,16)
LDY.w #BunnyHoodGFX
JSR DrawMenuItem
LDA.w #$7EF35E
LDX.w #menu_offset(13,19)
LDY.w #BottlesGFX
JSR DrawMenuItem
;; next row
LDA.w #$7EF344
LDX.w #menu_offset(16,3)
LDY.w #PowderGFX
LDY.w #OcarinaGFX
JSR DrawMenuItem
.no_flute
;LDA.w #$7EF34E
LDA.l $7EF34E
@@ -322,20 +296,46 @@ DrawYItems:
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
LDA.w #$7EF350
LDX.w #menu_offset(13,9)
LDY.w #SomariaGFX
JSR DrawMenuItem
.no_flute
LDA.w #$7EF353
LDA.w #$7EF351
LDX.w #menu_offset(13,13)
LDY.w #ByrnaGFX
JSR DrawMenuItem
LDA.w #$7EF34D
LDX.w #menu_offset(13,16)
LDY.w #JumpFeatherGFX
JSR DrawMenuItem
LDA.w #$7EF35E
LDX.w #menu_offset(13,19)
LDY.w #BottlesGFX
JSR DrawMenuItem
;; next row
LDA.w #$7EF348
LDX.w #menu_offset(16,3)
LDY.w #DekuMaskGFX
JSR DrawMenuItem
LDA.w #$7EF347
LDX.w #menu_offset(16,6)
LDY.w #ZoraMaskGFX
JSR DrawMenuItem
LDA.w #$7EF34F ; 7EF34C
LDX.w #menu_offset(16,9)
LDY.w #WolfMaskGFX
JSR DrawMenuItem
LDA.w #$7EF349
LDX.w #menu_offset(16,13)
LDY.w #MirrorGFX
LDY.w #BunnyHoodGFX
JSR DrawMenuItem
LDA.w #$7EF352

33
Menu/menu_select_item.asm
View File

@@ -3,14 +3,14 @@
; Decides which function to jump to.
Menu_ItemIndex:
; 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 $08, $07, $12, $0D, $10, $8B
; Powder, Book, Ocarina, Mirror, Stone Mask, Bottle4
db $0A, $0C, $08, $14, $13, $CB
; Bow, Boomerang, Hookshot, Bombs, Powder, Bottle 1
db $03, $02, $0E, $01, $0A, $0B
; Hammer, Lamp, Fire Rod, Ice Rod, Mirror, Bottle 2
db $04, $09, $05, $06, $14, $4B
; Ocarina, Book, Somaria, Byrna, Feather, Bottle3
db $08, $0C, $12, $0D, $07, $8B
; Deku, Zora, Wolf, Bunny Hood, Stone Mask, Bottle4
db $11, $0F, $08, $10, $13, $CB
; -----------------------------------------------------------------------------
; Decides which graphics is drawn
@@ -19,24 +19,27 @@ Menu_AddressIndex:
db $7EF341 ; boom
db $7EF342 ; hookshot
db $7EF343 ; bombs
db $7EF348 ; deku mask
db $7EF344 ; powder
db $7EF35C ; bottle1
db $7EF34B ; hammer
db $7EF34A ; lamp
db $7EF345 ; firerod
db $7EF346 ; icerod
db $7EF347 ; Zora Mask
db $7EF353 ; mirror
db $7EF35D ; bottle2
db $7EF34C ; shovel 7EF34F
db $7EF34D ; feather
db $7EF34E ; book
db $7EF350 ; somaria
db $7EF351 ; byrna
db $7EF349 ; Bunny Hood
db $7EF34D ; feather
db $7EF35E ; bottle3
db $7EF344 ; powder
db $7EF34E ; book
db $7EF348 ; deku mask
db $7EF347 ; Zora Mask
db $7EF349 ; Bunny Hood
db $7EF34C ; ocarina
db $7EF353 ; mirror
db $7EF352 ; stone mask
db $7EF35F ; bottle4

18
Menu/menu_text.asm
View File

@@ -96,24 +96,24 @@ Menu_ItemNames:
dw "__BOOMERANG___ "
dw "___HOOKSHOT___ "
dw "____BOMBS_____ "
dw "__DEKU_MASK___ "
dw "_MAGIC_POWDER_ "
dw "____BOTTLE____ "
dw "____HAMMER____ "
dw "_____LAMP_____ "
dw "___FIRE_ROD___ "
dw "___ICE_ROD____ "
dw "__ZORA_MASK___ "
dw "_MAGIC_MIRROR_ "
dw "____BOTTLE____ "
dw "__WOLF_MASK___ "
dw "_JUMP_FEATHER_ "
dw "___OCARINA____ "
dw "_SECRET_TOME__ "
dw "___SOMARIA____ "
dw "____BYRNA_____ "
dw "__BUNNY_HOOD__ "
dw "_JUMP_FEATHER_ "
dw "____BOTTLE____ "
dw "_MAGIC_POWDER_ "
dw "_SECRET_TOME__ "
dw "___OCARINA____ "
dw "_MAGIC_MIRROR_ "
dw "__DEKU_MASK___ "
dw "__ZORA_MASK___ "
dw "__WOLF_MASK___ "
dw "__BUNNY_HOOD__ "
dw "__STONE_MASK__ "
dw "____BOTTLE____ "