bit of cleanup
This commit is contained in:
@@ -61,7 +61,6 @@ DrawMenuItem:
|
||||
RTS
|
||||
}
|
||||
|
||||
|
||||
; =========================================================
|
||||
; Quest Icons Tilemap Draw Routine
|
||||
|
||||
@@ -91,7 +90,6 @@ Menu_DrawQuestIcons:
|
||||
RTS
|
||||
}
|
||||
|
||||
|
||||
; =========================================================
|
||||
|
||||
Menu_DrawTriforceIcons:
|
||||
@@ -190,14 +188,15 @@ Menu_DrawHeartPieces:
|
||||
|
||||
.top_right
|
||||
LDX.w #$64AD : STX.w $14A0
|
||||
|
||||
.bottom_left
|
||||
LDX.w #$24AE : STX.w $14DE
|
||||
|
||||
.top_left
|
||||
LDX.w #$24AD : STX.w $149E
|
||||
RTS
|
||||
}
|
||||
|
||||
|
||||
; =========================================================
|
||||
|
||||
Menu_DrawMusicNotes:
|
||||
@@ -248,6 +247,7 @@ DrawYItems:
|
||||
LDA.w GoldstarOrHookshot : BNE .spoof_hookshot
|
||||
LDA #$0001 ; No goldstar, but hookshot
|
||||
.spoof_hookshot
|
||||
|
||||
STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof
|
||||
LDX.w #menu_offset(7,9)
|
||||
LDY.w #HookGFX
|
||||
@@ -312,6 +312,7 @@ DrawYItems:
|
||||
LDA.w $030F : BNE .spoof_ocarina
|
||||
LDA #$0001 ; Multi-songs not unlocked yet
|
||||
.spoof_ocarina
|
||||
|
||||
STA.w ShortSpoof : LDA.w #ShortSpoof
|
||||
LDX.w #menu_offset(13,3)
|
||||
LDY.w #OcarinaGFX
|
||||
@@ -328,6 +329,7 @@ DrawYItems:
|
||||
; LDA.l $7EF350 : CMP.w #$00 : BEQ .no_somaria
|
||||
; LDA.w SomariaOrByrna : BNE .spoof_somaria
|
||||
; .spoof_somaria
|
||||
|
||||
; LDA.w #$01 : STA.w ShortSpoof : LDA.w #ShortSpoof
|
||||
LDA.w #$7EF350
|
||||
LDX.w #menu_offset(13,9)
|
||||
@@ -335,7 +337,6 @@ DrawYItems:
|
||||
JSR DrawMenuItem
|
||||
.no_somaria
|
||||
|
||||
|
||||
LDA.w #$7EF351
|
||||
LDX.w #menu_offset(13,13)
|
||||
;LDY.w #ByrnaGFX
|
||||
@@ -441,7 +442,6 @@ Menu_DrawQuestItems:
|
||||
Menu_DrawBigKey:
|
||||
{
|
||||
LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalace
|
||||
|
||||
LSR A : TAX
|
||||
|
||||
; Check if we have the big key in this palace
|
||||
@@ -450,9 +450,7 @@ Menu_DrawBigKey:
|
||||
.locateBigKeyFlag
|
||||
|
||||
ASL A : DEX : BPL .locateBigKeyFlag : BCC .dontHaveBigKey
|
||||
|
||||
JSR CheckPalaceItemPossession : LDA $02 : BEQ .noTreasureYet
|
||||
|
||||
SEP #$30
|
||||
LDA.b #$7E : STA.b $0A
|
||||
REP #$30
|
||||
@@ -482,7 +480,6 @@ Menu_DrawBigKey:
|
||||
.notInPalace
|
||||
|
||||
LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalaceAgain
|
||||
|
||||
LSR A : TAX
|
||||
|
||||
; Check if we have the map in this dungeon
|
||||
@@ -491,7 +488,6 @@ Menu_DrawBigKey:
|
||||
.locateMapFlag
|
||||
|
||||
ASL A : DEX : BPL .locateMapFlag : BCC .dontHaveMap
|
||||
|
||||
LDA.w #$01
|
||||
STA.w ShortSpoof
|
||||
LDA.w #ShortSpoof
|
||||
@@ -508,7 +504,7 @@ Menu_DrawBigKey:
|
||||
|
||||
; =========================================================
|
||||
|
||||
; *$6EEB6-$6EEDB LOCAL
|
||||
; $06EEB6-$06EEDB LOCAL
|
||||
CheckPalaceItemPossession:
|
||||
{
|
||||
SEP #$30
|
||||
@@ -538,7 +534,6 @@ CheckPalaceItemPossession:
|
||||
; *$6EEDC-$6EEE0 JUMP LOCATION
|
||||
.pool_CheckPalaceItemPossession:
|
||||
{
|
||||
|
||||
.failure
|
||||
|
||||
STZ $02
|
||||
@@ -617,7 +612,6 @@ CheckPalaceItemPossession:
|
||||
Menu_DrawBigChestKey:
|
||||
{
|
||||
LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalace
|
||||
|
||||
LSR A : TAX
|
||||
|
||||
LDA $7EF364
|
||||
@@ -626,7 +620,6 @@ Menu_DrawBigChestKey:
|
||||
|
||||
ASL A : DEX : BPL .locateCompassFlag
|
||||
BCC .dontHaveCompass
|
||||
|
||||
SEP #$30
|
||||
LDA.b #$7E : STA.b $0A
|
||||
REP #$30
|
||||
@@ -643,3 +636,5 @@ Menu_DrawBigChestKey:
|
||||
|
||||
RTS
|
||||
}
|
||||
|
||||
; =========================================================
|
||||
Reference in New Issue
Block a user