Cleanup world_map.asm
This commit is contained in:
@@ -221,7 +221,6 @@ MapIconDraw:
|
||||
|
||||
JSL DrawCouragePendant
|
||||
JSR HandleMapDrawIcon
|
||||
|
||||
.check_master_sword
|
||||
LDA.l OOSPROG : AND.b #$20 : BEQ .check_fortress
|
||||
JSL DrawMasterSwordIcon
|
||||
@@ -240,6 +239,8 @@ MapIconDraw:
|
||||
JMP restore_coords_and_exit
|
||||
.lwprizes
|
||||
|
||||
;-----------------------------------
|
||||
|
||||
LDA.l $7EF3C7 : CMP.b #$01 : BEQ .hall_of_secrets
|
||||
CMP.b #$02 : BEQ .draw_secret
|
||||
CMP.b #$03 : BCS .draw_crystals
|
||||
@@ -271,7 +272,6 @@ MapIconDraw:
|
||||
LDA.b #$02 : STA.b $0B ; 02 = 16x16, 00 = 8x8
|
||||
LDA.b #$0E : STA.l $7EC025 ; OAM Slot used
|
||||
JSR HandleMapDrawIcon
|
||||
|
||||
.skip_draw_0
|
||||
|
||||
; Draw Crystal 2
|
||||
@@ -290,7 +290,6 @@ MapIconDraw:
|
||||
LDA.b #$08 : STA.l $7EC025
|
||||
|
||||
JSR HandleMapDrawIcon
|
||||
|
||||
.skip_draw_1
|
||||
|
||||
; Draw Crystal 3
|
||||
@@ -309,7 +308,6 @@ MapIconDraw:
|
||||
LDA.b #$0D : STA.l $7EC025
|
||||
|
||||
JSR HandleMapDrawIcon
|
||||
|
||||
.skip_draw_2
|
||||
|
||||
|
||||
@@ -329,7 +327,6 @@ MapIconDraw:
|
||||
LDA.b #$0B : STA.l $7EC025
|
||||
|
||||
JSR HandleMapDrawIcon
|
||||
|
||||
.skip_draw_3
|
||||
|
||||
; Draw Crystal 5
|
||||
@@ -348,7 +345,6 @@ MapIconDraw:
|
||||
LDA.b #$09 : STA.l $7EC025
|
||||
|
||||
JSR HandleMapDrawIcon
|
||||
|
||||
.skip_draw_4
|
||||
|
||||
; Draw Crystal 6
|
||||
@@ -392,9 +388,8 @@ MapIconDraw:
|
||||
|
||||
HandleMapDrawIcon:
|
||||
{
|
||||
LDA.b $1A
|
||||
AND.b #$10
|
||||
BNE .skip_draw ; Timer to make it flash
|
||||
; Timer to make it flash
|
||||
LDA.b $1A : AND.b #$10 : BNE .skip_draw
|
||||
.noflash ; ALTERNATE ENTRY POINT
|
||||
JSR WorldMapIcon_AdjustCoordinate
|
||||
LDA.l $7EC025 : TAX
|
||||
@@ -404,9 +399,7 @@ HandleMapDrawIcon:
|
||||
LDA.l $7EC025 : TAX
|
||||
LDA.b #$02
|
||||
JSR WorldMap_HandleSpriteBlink
|
||||
|
||||
.skip_draw
|
||||
|
||||
RTS
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user