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

bit of cleanup

Browse Source
This commit is contained in:
Jared_Brian_
2024-03-19 18:51:11 -06:00
parent c8c062ee89
commit 3a80bd774b
1 changed files with 127 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
Menu/menu_draw.asm
View File

@@ -61,7 +61,6 @@ DrawMenuItem:
RTS RTS
} }
; ========================================================= ; =========================================================
; Quest Icons Tilemap Draw Routine ; Quest Icons Tilemap Draw Routine
@@ -91,7 +90,6 @@ Menu_DrawQuestIcons:
RTS RTS
} }
; ========================================================= ; =========================================================
Menu_DrawTriforceIcons: Menu_DrawTriforceIcons:
@@ -188,16 +186,17 @@ Menu_DrawHeartPieces:
BCS .bottom_left BCS .bottom_left
RTS RTS
.top_right .top_right
LDX.w #$64AD : STX.w $14A0 LDX.w #$64AD : STX.w $14A0
.bottom_left
.bottom_left
LDX.w #$24AE : STX.w $14DE LDX.w #$24AE : STX.w $14DE
.top_left
.top_left
LDX.w #$24AD : STX.w $149E LDX.w #$24AD : STX.w $149E
RTS RTS
} }
; ========================================================= ; =========================================================
Menu_DrawMusicNotes: Menu_DrawMusicNotes:
@@ -247,12 +246,13 @@ DrawYItems:
LDA.l $7EF342 : AND.w #$00FF : CMP.w #$0000 : BEQ .no_hookshot LDA.l $7EF342 : AND.w #$00FF : CMP.w #$0000 : BEQ .no_hookshot
LDA.w GoldstarOrHookshot : BNE .spoof_hookshot LDA.w GoldstarOrHookshot : BNE .spoof_hookshot
LDA #$0001 ; No goldstar, but hookshot LDA #$0001 ; No goldstar, but hookshot
.spoof_hookshot .spoof_hookshot
STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof
LDX.w #menu_offset(7,9) LDX.w #menu_offset(7,9)
LDY.w #HookGFX LDY.w #HookGFX
JSR DrawMenuItem JSR DrawMenuItem
.no_hookshot .no_hookshot
LDA.l $7EF343 LDA.l $7EF343
AND.w #$00FF : CMP.w #$00 : BEQ .no_bomb AND.w #$00FF : CMP.w #$00 : BEQ .no_bomb
@@ -262,7 +262,7 @@ DrawYItems:
LDX.w #menu_offset(7,13) LDX.w #menu_offset(7,13)
LDY.w #BombsGFX LDY.w #BombsGFX
JSR DrawMenuItem JSR DrawMenuItem
.no_bomb .no_bomb
LDA.w #$7EF344 LDA.w #$7EF344
LDX.w #menu_offset(7,16) LDX.w #menu_offset(7,16)
@@ -311,30 +311,31 @@ 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)
LDY.w #OcarinaGFX LDY.w #OcarinaGFX
JSR DrawMenuItem JSR DrawMenuItem
.no_ocarina .no_ocarina
LDA.l $7EF34E : AND.w #$00FF : CMP.w #$00 : BEQ .no_book LDA.l $7EF34E : AND.w #$00FF : CMP.w #$00 : BEQ .no_book
LDA.w #$01 : STA.w ShortSpoof : LDA.w #ShortSpoof LDA.w #$01 : STA.w ShortSpoof : LDA.w #ShortSpoof
LDX.w #menu_offset(13,6) LDX.w #menu_offset(13,6)
LDY.w #BookGFX LDY.w #BookGFX
JSR DrawMenuItem JSR DrawMenuItem
.no_book .no_book
; LDA.l $7EF350 : CMP.w #$00 : BEQ .no_somaria ; LDA.l $7EF350 : CMP.w #$00 : BEQ .no_somaria
; LDA.w SomariaOrByrna : BNE .spoof_somaria ; LDA.w SomariaOrByrna : BNE .spoof_somaria
; .spoof_somaria ; .spoof_somaria
; LDA.w #$01 : STA.w ShortSpoof : LDA.w #ShortSpoof ; LDA.w #$01 : STA.w ShortSpoof : LDA.w #ShortSpoof
LDA.w #$7EF350 LDA.w #$7EF350
LDX.w #menu_offset(13,9) LDX.w #menu_offset(13,9)
LDY.w #SomariaGFX LDY.w #SomariaGFX
JSR DrawMenuItem JSR DrawMenuItem
.no_somaria .no_somaria
LDA.w #$7EF351 LDA.w #$7EF351
LDX.w #menu_offset(13,13) LDX.w #menu_offset(13,13)
@@ -441,18 +442,15 @@ Menu_DrawQuestItems:
Menu_DrawBigKey: Menu_DrawBigKey:
{ {
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
; Check if we have the big key in this palace ; Check if we have the big key in this palace
LDA $7EF366 LDA $7EF366
.locateBigKeyFlag .locateBigKeyFlag
ASL A : DEX : BPL .locateBigKeyFlag : BCC .dontHaveBigKey ASL A : DEX : BPL .locateBigKeyFlag : BCC .dontHaveBigKey
JSR CheckPalaceItemPossession : LDA $02 : BEQ .noTreasureYet JSR CheckPalaceItemPossession : LDA $02 : BEQ .noTreasureYet
SEP #$30 SEP #$30
LDA.b #$7E : STA.b $0A LDA.b #$7E : STA.b $0A
REP #$30 REP #$30
@@ -464,7 +462,7 @@ Menu_DrawBigKey:
LDY.w #TreasureChestGFX LDY.w #TreasureChestGFX
JSR DrawMenuItem JSR DrawMenuItem
.noTreasureYet .noTreasureYet
SEP #$30 SEP #$30
LDA.b #$7E : STA.b $0A LDA.b #$7E : STA.b $0A
@@ -478,20 +476,18 @@ Menu_DrawBigKey:
LDY.w #BigKeyGFX LDY.w #BigKeyGFX
JSR DrawMenuItem JSR DrawMenuItem
.dontHaveBigKey .dontHaveBigKey
.notInPalace .notInPalace
LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalaceAgain LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalaceAgain
LSR A : TAX LSR A : TAX
; Check if we have the map in this dungeon ; Check if we have the map in this dungeon
LDA $7EF368 LDA $7EF368
.locateMapFlag .locateMapFlag
ASL A : DEX : BPL .locateMapFlag : BCC .dontHaveMap ASL A : DEX : BPL .locateMapFlag : BCC .dontHaveMap
LDA.w #$01 LDA.w #$01
STA.w ShortSpoof STA.w ShortSpoof
LDA.w #ShortSpoof LDA.w #ShortSpoof
@@ -500,15 +496,15 @@ Menu_DrawBigKey:
LDY.w #MapGFX LDY.w #MapGFX
JSR DrawMenuItem JSR DrawMenuItem
.dontHaveMap .dontHaveMap
.notInPalaceAgain .notInPalaceAgain
RTS RTS
} }
; ========================================================= ; =========================================================
; *$6EEB6-$6EEDB LOCAL ; $06EEB6-$06EEDB LOCAL
CheckPalaceItemPossession: CheckPalaceItemPossession:
{ {
SEP #$30 SEP #$30
@@ -538,63 +534,62 @@ CheckPalaceItemPossession:
; *$6EEDC-$6EEE0 JUMP LOCATION ; *$6EEDC-$6EEE0 JUMP LOCATION
.pool_CheckPalaceItemPossession: .pool_CheckPalaceItemPossession:
{ {
.failure
.failure
STZ $02 STZ $02
STZ $03 STZ $03
RTS RTS
.bow .bow
LDA $7EF340 LDA $7EF340
.no_item .no_item
.compare .compare
BEQ .failure BEQ .failure
.success .success
LDA.b #$01 : STA $02 LDA.b #$01 : STA $02
STZ $03 STZ $03
RTS RTS
.power_glove .power_glove
LDA $7EF354 : BRA .compare LDA $7EF354 : BRA .compare
.hookshot .hookshot
LDA $7EF342 : BRA .compare LDA $7EF342 : BRA .compare
.hammer .hammer
LDA $7EF34B : BRA .compare LDA $7EF34B : BRA .compare
.cane_of_somaria .cane_of_somaria
LDA $7EF350 : BRA .compare LDA $7EF350 : BRA .compare
.fire_rod .fire_rod
LDA $7EF345 : BRA .compare LDA $7EF345 : BRA .compare
.blue_mail .blue_mail
LDA $7EF35B : BRA .compare LDA $7EF35B : BRA .compare
.moon_pearl .moon_pearl
LDA $7EF357 : BRA .compare LDA $7EF357 : BRA .compare
.titans_mitt .titans_mitt
LDA $7EF354 : DEC A : BRA .compare LDA $7EF354 : DEC A : BRA .compare
.mirror_shield .mirror_shield
LDA $7EF35A : CMP.b #$03 : BEQ .success LDA $7EF35A : CMP.b #$03 : BEQ .success
@@ -603,7 +598,7 @@ CheckPalaceItemPossession:
RTS RTS
.red_mail .red_mail
LDA $7EF35B : CMP.b #$02 : BEQ .success LDA $7EF35B : CMP.b #$02 : BEQ .success
@@ -617,16 +612,14 @@ CheckPalaceItemPossession:
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
BCC .dontHaveCompass BCC .dontHaveCompass
SEP #$30 SEP #$30
LDA.b #$7E : STA.b $0A LDA.b #$7E : STA.b $0A
REP #$30 REP #$30
@@ -638,8 +631,10 @@ Menu_DrawBigChestKey:
LDY.w #BigChestKeyGFX LDY.w #BigChestKeyGFX
JSR DrawMenuItem JSR DrawMenuItem
.dontHaveCompass .dontHaveCompass
.notInPalace .notInPalace
RTS RTS
} }
; =========================================================