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

Housekeeping

Browse Source
This commit is contained in:
scawful
2024-10-06 08:22:39 -04:00
parent 7638a7f7ec
commit 79e71b0a93
2 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Menu/menu_draw.asm
View File

@@ -340,7 +340,7 @@ DrawYItems:
LDA.l $7EF34C : AND.w #$00FF : CMP.w #$0000 : BEQ .no_ocarina LDA.l $7EF34C : AND.w #$00FF : CMP.w #$0000 : BEQ .no_ocarina
LDA.w $030F : BNE .spoof_ocarina LDA.w $030F : BNE .spoof_ocarina
LDA #$0001 ; Multi-songs not unlocked yet LDA #$0001 ; Multi-songs not unlocked yet
.spoof_ocarina .spoof_ocarina
STA.w ShortSpoof : LDA.w #ShortSpoof STA.w ShortSpoof : LDA.w #ShortSpoof
LDX.w #menu_offset(13,3) LDX.w #menu_offset(13,3)
@@ -362,8 +362,8 @@ DrawYItems:
; LDA.w #$7EF351 ; LDA.w #$7EF351
LDA.l $7EF351 : AND.w #$00FF : CMP.w #$00 : BEQ .no_rods LDA.l $7EF351 : AND.w #$00FF : CMP.w #$00 : BEQ .no_rods
LDA.w FishingOrPortalRod LDA.w FishingOrPortalRod
INC A INC A
STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof
LDX.w #menu_offset(13,13) LDX.w #menu_offset(13,13)
LDY.w #FishingRodGFX LDY.w #FishingRodGFX
@@ -426,7 +426,7 @@ Menu_DrawQuestItems:
LDA.w #$7EF359 LDA.w #$7EF359
LDX.w #menu_offset(14,2) LDX.w #menu_offset(14,2)
LDY.w #SwordGFX LDY.w #SwordGFX
JSR DrawMenuItem JSR DrawMenuItem
LDA.w #$7EF35A LDA.w #$7EF35A
LDX.w #menu_offset(14,5) LDX.w #menu_offset(14,5)
@@ -611,30 +611,24 @@ CheckPalaceItemPossession:
.mirror_shield .mirror_shield
LDA $7EF35A : CMP.b #$03 : BEQ .success LDA $7EF35A : CMP.b #$03 : BEQ .success
STZ $02 STZ $02
STZ $03 STZ $03
RTS RTS
.red_mail .red_mail
LDA $7EF35B : CMP.b #$02 : BEQ .success LDA $7EF35B : CMP.b #$02 : BEQ .success
STZ $02 STZ $02
STZ $03 STZ $03
RTS RTS
} }
; *$6EF39-$6EF66 LOCAL ; *$6EF39-$6EF66 LOCAL
Menu_DrawBigChestKey: Menu_DrawBigChestKey:
{ {
LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalace LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalace
LSR A : TAX LSR A : TAX
LDA $7EF364 LDA $7EF364
.locateCompassFlag .locateCompassFlag
ASL A : DEX : BPL .locateCompassFlag ASL A : DEX : BPL .locateCompassFlag
@@ -649,10 +643,8 @@ Menu_DrawBigChestKey:
LDX.w #menu_offset(11, 5) LDX.w #menu_offset(11, 5)
LDY.w #BigChestKeyGFX LDY.w #BigChestKeyGFX
JSR DrawMenuItem JSR DrawMenuItem
.dontHaveCompass .dontHaveCompass
.notInPalace .notInPalace
RTS RTS
} }
@@ -660,7 +652,7 @@ Menu_DrawBigChestKey:
Menu_DrawSongMenu: Menu_DrawSongMenu:
{ {
REP #$30 REP #$30
LDX.w #$FE ; $1700-17FF LDX.w #$FE ; $1700-17FF
.loop .loop
LDA.w .magic_bag_tilemap, X LDA.w .magic_bag_tilemap, X
@@ -682,7 +674,6 @@ Menu_DrawSongMenu:
DEX : DEX DEX : DEX
BPL .loop BPL .loop
RTS RTS
.magic_bag_tilemap .magic_bag_tilemap
@@ -692,7 +683,7 @@ Menu_DrawSongMenu:
Menu_DrawMagicBag: Menu_DrawMagicBag:
{ {
REP #$30 REP #$30
LDX.w #$FE ; $1700-17FF LDX.w #$FE ; $1700-17FF
.loop .loop
LDA.w .magic_bag_tilemap, X LDA.w .magic_bag_tilemap, X
@@ -714,7 +705,6 @@ Menu_DrawMagicBag:
DEX : DEX DEX : DEX
BPL .loop BPL .loop
RTS RTS
.magic_bag_tilemap .magic_bag_tilemap
@@ -724,7 +714,7 @@ Menu_DrawMagicBag:
Menu_DrawRingBox: Menu_DrawRingBox:
{ {
REP #$30 REP #$30
LDX.w #$FE ; $1700-17FF LDX.w #$FE ; $1700-17FF
.loop .loop
LDA.w .ring_box_tilemap, X LDA.w .ring_box_tilemap, X

12
Sprites/NPCs/bean_vendor.asm
View File

@@ -37,16 +37,12 @@
Sprite_BeanVendor_Long: Sprite_BeanVendor_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
JSR Sprite_BeanVendor_Draw JSR Sprite_BeanVendor_Draw
JSL Sprite_CheckActive ; Check if game is not paused JSL Sprite_CheckActive : BCC .SpriteIsNotActive
BCC .SpriteIsNotActive ; Skip Main code is sprite is innactive JSR Sprite_BeanVendor_Main
JSR Sprite_BeanVendor_Main ; Call the main sprite code
.SpriteIsNotActive .SpriteIsNotActive
PLB ; Get back the databank we stored previously PLB
RTL ; Go back to original code RTL
} }
; ========================================================= ; =========================================================