Add maku tree map indicator during intro

Move map icon and dungeon id documentation to symbols.asm
This commit is contained in:
scawful
2024-11-19 14:56:38 -05:00
parent caab7bf1e0
commit 1abe75ddb1
3 changed files with 33 additions and 30 deletions

View File

@@ -54,6 +54,37 @@ OOSPROG = $7EF3D6
; f - Flipped by fortune tellers to decide fortune set to give ; f - Flipped by fortune tellers to decide fortune set to give
OOSPROG2 = $7EF3C6 OOSPROG2 = $7EF3C6
; Map icon
; 0x00 - Red X on castle | Save zelda
; 0x01 - Red X on Kakariko | Talk to villagers about elders
; 0x02 - Red X on Eastern | Talk to Sahasrahla
; 0x03 - Pendants and MS | Obtain the master sword
; 0x04 - Master sword on LW | Grab the master sword
; 0x05 - Skull on castle | Kill Agahnim
; 0x06 - Crystal on POD | Get the first crystal
; 0x07 - Crystals | Get all 7 crystals
; 0x08 - Skull on GT | Climb Ganon's Tower
MAPICON = $7EF3C7
; Dungeon ID Legend
; Mushroom Grotto ID 0x0C (Palace of Darkness)
; Tail Palace ID 0x0A (Swamp Palace)
; Kalyxo Castle ID 0x10 (Skull Woods)
; Zora Temple ID 0x16 (Thieves Town)
; Glacia Estate 0x12 (Ice Palace)
; Goron Mines 0x0E (Misery Mire)
; Dragon Ship 0x18 (Turtle Rock)
; .wbs tipm
; p - Palace of Darkness
; s - Swamp Palace
; w - Skull Woods
; b - Thieves' Town
; i - Ice Palace
; m - Misery Mire
; t - Turtle Rock
CRYSTALS = $7EF37A
; .... ...m ; .... ...m
; m - maku tree has met link (0: no | 1: yes) ; m - maku tree has met link (0: no | 1: yes)
OOSPROG3 = $7EF3D4 OOSPROG3 = $7EF3D4

View File

@@ -25,14 +25,6 @@
; 3F - DW ZS Tile32 ; 3F - DW ZS Tile32
; 40 - LW World Map ; 40 - LW World Map
; 41 - DW World Map ; 41 - DW World Map
; Mushroom Grotto ID 0x0C (Palace of Darkness)
; Tail Palace ID 0x0A (Swamp Palace)
; Kalyxo Castle ID 0x10 (Skull Woods)
; Zora Temple ID 0x16 (Thieves Town)
; Glacia Estate 0x12 (Ice Palace)
; Goron Mines 0x0E (Misery Mire)
; Dragon Ship 0x18 (Turtle Rock)
; ========================================================= ; =========================================================
; ZSCustomOverworld version ; ZSCustomOverworld version

View File

@@ -7,28 +7,6 @@ org $0AC589
org $0AC51C org $0AC51C
WorldMap_HandleSpriteBlink: WorldMap_HandleSpriteBlink:
; Map icon
; 0x00 - Red X on castle | Save zelda
; 0x01 - Red X on Kakariko | Talk to villagers about elders
; 0x02 - Red X on Eastern | Talk to Sahasrahla
; 0x03 - Pendants and MS | Obtain the master sword
; 0x04 - Master sword on LW | Grab the master sword
; 0x05 - Skull on castle | Kill Agahnim
; 0x06 - Crystal on POD | Get the first crystal
; 0x07 - Crystals | Get all 7 crystals
; 0x08 - Skull on GT | Climb Ganon's Tower
MAPICON = $7EF3C7
; .wbs tipm
; p - Palace of Darkness
; s - Swamp Palace
; w - Skull Woods
; b - Thieves' Town
; i - Ice Palace
; m - Misery Mire
; t - Turtle Rock
CRYSTALS = $7EF37A
pullpc pullpc
DrawWisdomPendant: DrawWisdomPendant:
@@ -244,6 +222,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 : BCS .draw_crystals
JSL DrawEonEscapeIcon
JSR HandleMapDrawIcon
JMP restore_coords_and_exit JMP restore_coords_and_exit
.hall_of_secrets .hall_of_secrets