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

Adjust world map icons/ram, show level 1 icon alone, 2-7 grouped

Browse Source
This commit is contained in:
scawful
2024-11-19 20:47:49 -05:00
parent ce5d9f7620
commit 4b4256133b
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Core/symbols.asm
View File

@@ -55,14 +55,14 @@ OOSPROG = $7EF3D6
OOSPROG2 = $7EF3C6 OOSPROG2 = $7EF3C6
; Map icon ; Map icon
; 0x00 - Red X on castle | Save zelda ; 0x00 - Red X on Maku Tree/Maku Warp
; 0x01 - Red X on Kakariko | Talk to villagers about elders ; 0x01 - Red X on Hall of Secrets
; 0x02 - Red X on Eastern | Talk to Sahasrahla ; 0x02 - Red X on Kalyxo Pyramid
; 0x03 - Pendants and MS | Obtain the master sword ; 0x03 - Toadstool Woods Crystal
; 0x04 - Master sword on LW | Grab the master sword ; 0x04 - Kalyxo Crystals All
; 0x05 - Skull on castle | Kill Agahnim ; 0x05 -
; 0x06 - Crystal on POD | Get the first crystal ; 0x06 -
; 0x07 - Crystals | Get all 7 crystals ; 0x07 -
; 0x08 - Skull on GT | Climb Ganon's Tower ; 0x08 - Skull on GT | Climb Ganon's Tower
MAPICON = $7EF3C7 MAPICON = $7EF3C7

7
Overworld/world_map.asm
View File

@@ -221,7 +221,8 @@ MapIconDraw:
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 : BEQ .draw_crystal_1
CMP.b #$04 : BCS .draw_crystals
JSL DrawEonEscapeIcon JSL DrawEonEscapeIcon
JSR HandleMapDrawIcon JSR HandleMapDrawIcon
JMP restore_coords_and_exit JMP restore_coords_and_exit
@@ -236,7 +237,7 @@ MapIconDraw:
JSR HandleMapDrawIcon_noflash JSR HandleMapDrawIcon_noflash
JMP .skip_draw_6 JMP .skip_draw_6
.draw_crystals .draw_crystal_1
; 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
@@ -253,7 +254,9 @@ MapIconDraw:
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
JMP restore_coords_and_exit
.draw_crystals
; Draw Crystal 2 ; Draw Crystal 2
LDA.l $7EF37A : AND #$10 : BNE .skip_draw_1 LDA.l $7EF37A : AND #$10 : BNE .skip_draw_1
; X position (2) ; X position (2)