diff options
Diffstat (limited to 'engine/events/unown_walls.asm')
| -rw-r--r-- | engine/events/unown_walls.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm index 5cc241966..64558167a 100644 --- a/engine/events/unown_walls.asm +++ b/engine/events/unown_walls.asm @@ -1,9 +1,9 @@ -Special_HoOhChamber: ; 0x8addb +HoOhChamber: ; 0x8addb ld hl, wPartySpecies ld a, [hl] cp HO_OH ; is Ho-oh the first Pokémon in the party? jr nz, .done ; if not, we're done - call GetMapDataPointer ; pointless? + call GetMapAttributesPointer ; pointless? ld de, EVENT_WALL_OPENED_IN_HO_OH_CHAMBER ld b, SET_FLAG call EventFlagAction @@ -11,8 +11,8 @@ Special_HoOhChamber: ; 0x8addb ret ; 0x8adef -Special_OmanyteChamber: ; 8adef - call GetMapDataPointer ; pointless? +OmanyteChamber: ; 8adef + call GetMapAttributesPointer ; pointless? ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER ld b, CHECK_FLAG call EventFlagAction @@ -44,7 +44,7 @@ Special_OmanyteChamber: ; 8adef jr nz, .loop .open - call GetMapDataPointer ; pointless? + call GetMapAttributesPointer ; pointless? ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER ld b, SET_FLAG call EventFlagAction @@ -57,12 +57,12 @@ SpecialAerodactylChamber: ; 8ae30 push de push bc - call GetMapDataPointer + call GetMapAttributesPointer ld a, h - cp HIGH(RuinsOfAlphAerodactylChamber_MapData) + cp HIGH(RuinsOfAlphAerodactylChamber_MapAttributes) jr nz, .nope ld a, l - cp LOW(RuinsOfAlphAerodactylChamber_MapData) + cp LOW(RuinsOfAlphAerodactylChamber_MapAttributes) jr nz, .nope ld de, EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER @@ -85,12 +85,12 @@ SpecialKabutoChamber: ; 8ae4e push hl push de - call GetMapDataPointer + call GetMapAttributesPointer ld a, h - cp HIGH(RuinsOfAlphKabutoChamber_MapData) + cp HIGH(RuinsOfAlphKabutoChamber_MapAttributes) jr nz, .done ld a, l - cp LOW(RuinsOfAlphKabutoChamber_MapData) + cp LOW(RuinsOfAlphKabutoChamber_MapAttributes) jr nz, .done ld de, EVENT_WALL_OPENED_IN_KABUTO_CHAMBER @@ -103,9 +103,9 @@ SpecialKabutoChamber: ; 8ae4e ret ; 8ae68 -Special_DisplayUnownWords: ; 8ae68 +DisplayUnownWords: ; 8ae68 ld a, [wScriptVar] - ld hl, MenuDataHeaders_UnownWalls + ld hl, MenuHeaders_UnownWalls and a jr z, .load @@ -117,7 +117,7 @@ Special_DisplayUnownWords: ; 8ae68 jr nz, .loop .load - call LoadMenuDataHeader + call LoadMenuHeader xor a ld [hBGMapMode], a call MenuBox @@ -153,7 +153,7 @@ Special_DisplayUnownWords: ; 8ae68 ret ; 8aebc -INCLUDE "data/unown_walls.asm" +INCLUDE "data/events/unown_walls.asm" _DisplayUnownWords_FillAttr: ; 8aee9 ld a, [de] |