You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
map_header → map_def; map_header_2 → map_data
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
CheckForHiddenItems: ; b8172
|
||||
; Checks to see if there are hidden items on the screen that have not yet been found. If it finds one, returns carry.
|
||||
call GetMapScriptHeaderBank
|
||||
call GetMapScriptsBank
|
||||
ld [Buffer1], a
|
||||
; Get the coordinate of the bottom right corner of the screen, and load it in Buffer3/Buffer4.
|
||||
ld a, [XCoord]
|
||||
@@ -9,8 +9,8 @@ CheckForHiddenItems: ; b8172
|
||||
ld a, [YCoord]
|
||||
add SCREEN_HEIGHT / 4
|
||||
ld [Buffer3], a
|
||||
; Get the pointer for the first BG event header in the map...
|
||||
ld hl, wCurrMapBGEventHeaderPointer
|
||||
; Get the pointer for the first bg_event in the map...
|
||||
ld hl, wCurrMapBGEventsPointer
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
@@ -20,7 +20,7 @@ CheckForHiddenItems: ; b8172
|
||||
jr z, .nobgeventitems
|
||||
; For i = 1:wCurrMapBGEventCount...
|
||||
.loop
|
||||
; Store the counter in Buffer2, and store the BG event header pointer in the stack.
|
||||
; Store the counter in Buffer2, and store the bg_event pointer in the stack.
|
||||
ld [Buffer2], a
|
||||
push hl
|
||||
; Get the Y coordinate of the BG event.
|
||||
@@ -58,7 +58,7 @@ CheckForHiddenItems: ; b8172
|
||||
jr z, .itemnearby
|
||||
|
||||
.next
|
||||
; Restore the BG event header pointer and increment it by the length of a BG event header.
|
||||
; Restore the bg_event pointer and increment it by the length of a bg_event.
|
||||
pop hl
|
||||
ld bc, 5
|
||||
add hl, bc
|
||||
|
||||
@@ -9,7 +9,7 @@ MomTriesToBuySomething:: ; fcfec
|
||||
ld a, [wMapReentryScriptQueueFlag]
|
||||
and a
|
||||
ret nz
|
||||
call GetMapHeaderPhoneServiceNybble
|
||||
call GetMapPhoneService
|
||||
and a
|
||||
ret nz
|
||||
xor a
|
||||
|
||||
@@ -3,7 +3,7 @@ Special_HoOhChamber: ; 0x8addb
|
||||
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 GetSecondaryMapHeaderPointer
|
||||
call GetMapDataPointer ; pointless?
|
||||
ld de, EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
|
||||
ld b, SET_FLAG
|
||||
call EventFlagAction
|
||||
@@ -12,7 +12,7 @@ Special_HoOhChamber: ; 0x8addb
|
||||
; 0x8adef
|
||||
|
||||
Special_OmanyteChamber: ; 8adef
|
||||
call GetSecondaryMapHeaderPointer
|
||||
call GetMapDataPointer ; 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 GetSecondaryMapHeaderPointer
|
||||
call GetMapDataPointer ; 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 GetSecondaryMapHeaderPointer
|
||||
call GetMapDataPointer
|
||||
ld a, h
|
||||
cp HIGH(RuinsOfAlphAerodactylChamber_SecondMapHeader)
|
||||
cp HIGH(RuinsOfAlphAerodactylChamber_MapData)
|
||||
jr nz, .nope
|
||||
ld a, l
|
||||
cp LOW(RuinsOfAlphAerodactylChamber_SecondMapHeader)
|
||||
cp LOW(RuinsOfAlphAerodactylChamber_MapData)
|
||||
jr nz, .nope
|
||||
|
||||
ld de, EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
|
||||
@@ -85,12 +85,12 @@ SpecialKabutoChamber: ; 8ae4e
|
||||
push hl
|
||||
push de
|
||||
|
||||
call GetSecondaryMapHeaderPointer
|
||||
call GetMapDataPointer
|
||||
ld a, h
|
||||
cp HIGH(RuinsOfAlphKabutoChamber_SecondMapHeader)
|
||||
cp HIGH(RuinsOfAlphKabutoChamber_MapData)
|
||||
jr nz, .done
|
||||
ld a, l
|
||||
cp LOW(RuinsOfAlphKabutoChamber_SecondMapHeader)
|
||||
cp LOW(RuinsOfAlphKabutoChamber_MapData)
|
||||
jr nz, .done
|
||||
|
||||
ld de, EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
|
||||
|
||||
Reference in New Issue
Block a user