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

Cleanup world_map.asm

Browse Source
This commit is contained in:
scawful
2024-10-04 00:08:51 -04:00
parent 15df798812
commit f1f759cbec
1 changed files with 64 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
Overworld/world_map.asm
View File

@@ -190,72 +190,73 @@ pushpc
org $0ABF90 org $0ABF90
MapIconDraw: MapIconDraw:
{ {
; .dont_draw_link ; .dont_draw_link
LDA.l $7EC108 LDA.l $7EC108
PHA PHA
LDA.l $7EC109 LDA.l $7EC109
PHA PHA
LDA.l $7EC10A LDA.l $7EC10A
PHA PHA
LDA.l $7EC10B LDA.l $7EC10B
PHA PHA
;----------------------------------- ;-----------------------------------
.draw_prizes .draw_prizes
LDA.b $8A : AND.b #$40 : BEQ .lwprizes LDA.b $8A : AND.b #$40 : BEQ .lwprizes
LDA.l OOSPROG : AND.b #$02 : BNE .check_pendants LDA.l OOSPROG : AND.b #$02 : BNE .check_pendants
JSL DrawEonEscapeIcon JSL DrawEonEscapeIcon
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
JMP restore_coords_and_exit JMP restore_coords_and_exit
.check_pendants .check_pendants
LDA.l OOSPROG : AND.b #$10 : BEQ .check_master_sword LDA.l OOSPROG : AND.b #$10 : BEQ .check_master_sword
JSL DrawPowerPendant JSL DrawPowerPendant
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
JSL DrawWisdomPendant JSL DrawWisdomPendant
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
JSL DrawCouragePendant JSL DrawCouragePendant
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
.check_master_sword
LDA.l OOSPROG : AND.b #$20 : BEQ .check_fortress
JSL DrawMasterSwordIcon
JSR HandleMapDrawIcon
JMP restore_coords_and_exit
.check_fortress
LDA.l OOSPROG : AND.b #$40 : BEQ .check_final_boss
JSL DrawFortressOfSecretsIcon
JSR HandleMapDrawIcon
JMP restore_coords_and_exit
.check_final_boss
LDA.l OOSPROG : AND.b #$80 : BEQ .exit_dw
JSL DrawFinalBossIcon
JSR HandleMapDrawIcon
.exit_dw
JMP restore_coords_and_exit
.lwprizes
.check_master_sword ;-----------------------------------
LDA.l OOSPROG : AND.b #$20 : BEQ .check_fortress
JSL DrawMasterSwordIcon
JSR HandleMapDrawIcon
JMP restore_coords_and_exit
.check_fortress
LDA.l OOSPROG : AND.b #$40 : BEQ .check_final_boss
JSL DrawFortressOfSecretsIcon
JSR HandleMapDrawIcon
JMP restore_coords_and_exit
.check_final_boss
LDA.l OOSPROG : AND.b #$80 : BEQ .exit_dw
JSL DrawFinalBossIcon
JSR HandleMapDrawIcon
.exit_dw
JMP restore_coords_and_exit
.lwprizes
LDA.l $7EF3C7 : CMP.b #$01 : BEQ .hall_of_secrets LDA.l $7EF3C7 : CMP.b #$01 : BEQ .hall_of_secrets
CMP.b #$02 : BEQ .draw_secret CMP.b #$02 : BEQ .draw_secret
CMP.b #$03 : BCS .draw_crystals CMP.b #$03 : BCS .draw_crystals
JMP restore_coords_and_exit JMP restore_coords_and_exit
.hall_of_secrets .hall_of_secrets
JSL DrawHallOfSecretsIcon JSL DrawHallOfSecretsIcon
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
JMP restore_coords_and_exit JMP restore_coords_and_exit
.draw_secret ; Pyramid of Power .draw_secret ; Pyramid of Power
JSL DrawPyramidIcon JSL DrawPyramidIcon
JSR HandleMapDrawIcon_noflash JSR HandleMapDrawIcon_noflash
JMP .skip_draw_6 JMP .skip_draw_6
.draw_crystals .draw_crystals
; Draw Crystal 1 ; Draw Crystal 1
LDA.l $7EF37A : AND #$02 : BNE .skip_draw_0 LDA.l $7EF37A : AND #$02 : BNE .skip_draw_0
; X position ; X position
@@ -271,7 +272,6 @@ MapIconDraw:
LDA.b #$02 : STA.b $0B ; 02 = 16x16, 00 = 8x8 LDA.b #$02 : STA.b $0B ; 02 = 16x16, 00 = 8x8
LDA.b #$0E : STA.l $7EC025 ; OAM Slot used LDA.b #$0E : STA.l $7EC025 ; OAM Slot used
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
.skip_draw_0 .skip_draw_0
; Draw Crystal 2 ; Draw Crystal 2
@@ -290,7 +290,6 @@ MapIconDraw:
LDA.b #$08 : STA.l $7EC025 LDA.b #$08 : STA.l $7EC025
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
.skip_draw_1 .skip_draw_1
; Draw Crystal 3 ; Draw Crystal 3
@@ -309,7 +308,6 @@ MapIconDraw:
LDA.b #$0D : STA.l $7EC025 LDA.b #$0D : STA.l $7EC025
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
.skip_draw_2 .skip_draw_2
@@ -329,7 +327,6 @@ MapIconDraw:
LDA.b #$0B : STA.l $7EC025 LDA.b #$0B : STA.l $7EC025
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
.skip_draw_3 .skip_draw_3
; Draw Crystal 5 ; Draw Crystal 5
@@ -348,7 +345,6 @@ MapIconDraw:
LDA.b #$09 : STA.l $7EC025 LDA.b #$09 : STA.l $7EC025
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
.skip_draw_4 .skip_draw_4
; Draw Crystal 6 ; Draw Crystal 6
@@ -392,22 +388,19 @@ MapIconDraw:
HandleMapDrawIcon: HandleMapDrawIcon:
{ {
LDA.b $1A ; Timer to make it flash
AND.b #$10 LDA.b $1A : AND.b #$10 : BNE .skip_draw
BNE .skip_draw ; Timer to make it flash .noflash ; ALTERNATE ENTRY POINT
.noflash ; ALTERNATE ENTRY POINT JSR WorldMapIcon_AdjustCoordinate
JSR WorldMapIcon_AdjustCoordinate LDA.l $7EC025 : TAX
LDA.l $7EC025 : TAX JSR WorldMap_CalculateOAMCoordinates
JSR WorldMap_CalculateOAMCoordinates
BCC .skip_draw BCC .skip_draw
LDA.l $7EC025 : TAX LDA.l $7EC025 : TAX
LDA.b #$02 LDA.b #$02
JSR WorldMap_HandleSpriteBlink JSR WorldMap_HandleSpriteBlink
.skip_draw
.skip_draw RTS
RTS
} }
FixMaskPaletteOnExit: FixMaskPaletteOnExit: