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

add magic bean bottle to menu and hud

Browse Source
This commit is contained in:
scawful
2024-06-14 11:04:22 -04:00
parent c23f638956
commit 555f5383a4
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Menu/menu_draw.asm
View File

@@ -338,20 +338,13 @@ DrawYItems:
JSR DrawMenuItem JSR DrawMenuItem
.no_book .no_book
; LDA.l $7EF350 : CMP.w #$00 : BEQ .no_somaria LDA.w #$7EF350
; LDA.w SomariaOrByrna : BNE .spoof_somaria LDX.w #menu_offset(13,9)
; .spoof_somaria LDY.w #SomariaGFX
JSR DrawMenuItem
; LDA.w #$01 : STA.w ShortSpoof : LDA.w #ShortSpoof
LDA.w #$7EF350
LDX.w #menu_offset(13,9)
LDY.w #SomariaGFX
JSR DrawMenuItem
.no_somaria
LDA.w #$7EF351 LDA.w #$7EF351
LDX.w #menu_offset(13,13) LDX.w #menu_offset(13,13)
;LDY.w #ByrnaGFX
LDY.w #FishingRodGFX LDY.w #FishingRodGFX
JSR DrawMenuItem JSR DrawMenuItem

1
Menu/menu_gfx_table.asm
View File

@@ -125,6 +125,7 @@ BottlesGFX:
dw $2855, $6855, $2C57, $2C5A ; Fairy dw $2855, $6855, $2C57, $2C5A ; Fairy
dw $2837, $2838, $2839, $283A ; Bee dw $2837, $2838, $2839, $283A ; Bee
dw $2837, $2838, $2839, $283A ; Good bee dw $2837, $2838, $2839, $283A ; Good bee
dw $2837, $2838, $3CF7, $3CF8 ; Magic Bean
; --------------------------------------------------------- ; ---------------------------------------------------------

14
Menu/menu_hud.asm
View File

@@ -399,7 +399,7 @@ HudItems:
; hammer, lamp, fire rod, ice rod, mirror, bottle2 ; hammer, lamp, fire rod, ice rod, mirror, bottle2
dw $F701, $F6F1, $F6A1, $F6B1, $F7C1, $F751 dw $F701, $F6F1, $F6A1, $F6B1, $F7C1, $F751
; flute, book, somaria, byrna, feather, bottle3 ; flute, book, somaria, byrna, feather, bottle3
dw $F859, $F741, $F799, $F7A9, $F729, $F751 dw $F859, $F741, $F7A1, $F7A9, $F729, $F751
; deku, zora, wolf, bunny, stone, bottle4 ; deku, zora, wolf, bunny, stone, bottle4
dw $F6E1, $F821, $F6D1, $F7B9, $F811, $F751 dw $F6E1, $F821, $F6D1, $F7B9, $F811, $F751
} }
@@ -478,15 +478,21 @@ org $0DF751
dw $2855, $6855, $2C57, $2C5A ; Fairy dw $2855, $6855, $2C57, $2C5A ; Fairy
dw $2837, $2838, $2839, $283A ; Bee dw $2837, $2838, $2839, $283A ; Bee
dw $2837, $2838, $2839, $283A ; Good bee dw $2837, $2838, $2839, $283A ; Good bee
dw $2837, $2838, $3CF7, $3CF8 ; Magic Bean
; Somaria (Unchanged) ; Somaria (Unchanged)
; org $0DF799
; dw $20F5, $20F5, $20F5, $20F5 ; No somaria
org $0DF7A1
dw $20F5, $20F5, $20F5, $20F5 ; No somaria
dw $24DC, $24DD, $24EC, $24ED ; Cane of Somaria
; Byrna ; Byrna
org $0DF7A9 ; org $0DF7A9
dw $2CDC, $2CDD, $2CEC, $2CED ; Cane of Byrna ; dw $2CDC, $2CDD, $2CEC, $2CED ; Cane of Byrna
org $0DF7B1
dw $2C82, $2C83, $2C8B, $2C8C ; Fishing Rod dw $2C82, $2C83, $2C8B, $2C8C ; Fishing Rod
; Deku (Quake) ; Deku (Quake)
org $0DF6E1 org $0DF6E1
dw $20F5, $20F5, $20F5, $20F5 ; No bombos dw $20F5, $20F5, $20F5, $20F5 ; No bombos

2
Menu/menu_text.asm
View File

@@ -141,7 +141,9 @@ Menu_BottleItems:
dw "_GREEN_POTION_ " dw "_GREEN_POTION_ "
dw "_BLUE_POTION__ " dw "_BLUE_POTION__ "
dw "____FAIRY_____ " dw "____FAIRY_____ "
dw "_____BEE______ "
dw "__GOOD_BEE____ " dw "__GOOD_BEE____ "
dw "_MAGIC_BEAN___ "
Menu_GoldstarLabel: Menu_GoldstarLabel:
dw "__GOLD_STAR___ " dw "__GOLD_STAR___ "