Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a LANDMARK_ prefix to landmark constants

Browse Source 
Resolves #697
This commit is contained in:
Rangi
2020-03-15 17:26:10 -04:00
parent 65f22544e0
commit ad50e94b50
37 changed files with 630 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
engine/pokegear/pokegear.asm
View File

@@ -130,7 +130,7 @@ Pokegear_LoadGFX:
ld a, [wMapNumber]
ld c, a
call GetWorldMapLocation
cp FAST_SHIP
cp LANDMARK_FAST_SHIP
jr z, .ssaqua
farcall GetPlayerIcon
push de
@@ -195,7 +195,7 @@ TownMap_GetCurrentLandmark:
ld a, [wMapNumber]
ld c, a
call GetWorldMapLocation
cp SPECIAL_MAP
cp LANDMARK_SPECIAL
ret nz
ld a, [wBackupMapGroup]
ld b, a
@@ -210,9 +210,9 @@ TownMap_InitCursorAndPlayerIconPositions:
ld a, [wMapNumber]
ld c, a
call GetWorldMapLocation
cp FAST_SHIP
cp LANDMARK_FAST_SHIP
jr z, .FastShip
cp SPECIAL_MAP
cp LANDMARK_SPECIAL
jr nz, .LoadLandmark
ld a, [wBackupMapGroup]
ld b, a
@@ -226,7 +226,7 @@ TownMap_InitCursorAndPlayerIconPositions:
.FastShip:
ld [wPokegearMapPlayerIconLandmark], a
ld a, NEW_BARK_TOWN
ld a, LANDMARK_NEW_BARK_TOWN
ld [wPokegearMapCursorLandmark], a
ret
@@ -324,7 +324,7 @@ InitPokegearTilemap:
.Map:
ld a, [wPokegearMapPlayerIconLandmark]
cp FAST_SHIP
cp LANDMARK_FAST_SHIP
jr z, .johto
cp KANTO_LANDMARK
jr nc, .kanto
@@ -539,7 +539,7 @@ Pokegear_UpdateClock:
PokegearMap_CheckRegion:
ld a, [wPokegearMapPlayerIconLandmark]
cp FAST_SHIP
cp LANDMARK_FAST_SHIP
jr z, .johto
cp KANTO_LANDMARK
jr nc, .kanto
@@ -574,8 +574,8 @@ PokegearMap_KantoMap:
jr PokegearMap_ContinueMap
PokegearMap_JohtoMap:
ld d, SILVER_CAVE
ld e, NEW_BARK_TOWN
ld d, LANDMARK_SILVER_CAVE
ld e, LANDMARK_NEW_BARK_TOWN
PokegearMap_ContinueMap:
ld hl, hJoyLast
ld a, [hl]
@@ -737,13 +737,13 @@ TownMap_GetKantoLandmarkLimits:
ld a, [wStatusFlags]
bit STATUSFLAGS_HALL_OF_FAME_F, a
jr z, .not_hof
ld d, ROUTE_28
ld e, PALLET_TOWN
ld d, LANDMARK_ROUTE_28
ld e, LANDMARK_PALLET_TOWN
ret
.not_hof
ld d, ROUTE_28
ld e, VICTORY_ROAD
ld d, LANDMARK_ROUTE_28
ld e, LANDMARK_VICTORY_ROAD
ret
PokegearRadio_Init:
@@ -1502,7 +1502,7 @@ RadioChannels:
.RuinsOfAlphRadio:
ld a, [wPokegearMapPlayerIconLandmark]
cp RUINS_OF_ALPH
cp LANDMARK_RUINS_OF_ALPH
jr nz, .NoSignal
jp LoadStation_UnownRadio
@@ -1536,11 +1536,11 @@ RadioChannels:
bit STATUSFLAGS_ROCKET_SIGNAL_F, a
jr z, .NoSignal
ld a, [wPokegearMapPlayerIconLandmark]
cp MAHOGANY_TOWN
cp LANDMARK_MAHOGANY_TOWN
jr z, .ok
cp ROUTE_43
cp LANDMARK_ROUTE_43
jr z, .ok
cp LAKE_OF_RAGE
cp LANDMARK_LAKE_OF_RAGE
jr nz, .NoSignal
.ok
jp LoadStation_EvolutionRadio
@@ -1554,7 +1554,7 @@ RadioChannels:
; otherwise clear carry
ld a, [wPokegearMapPlayerIconLandmark]
cp FAST_SHIP
cp LANDMARK_FAST_SHIP
jr z, .johto
cp KANTO_LANDMARK
jr c, .johto
@@ -2266,7 +2266,7 @@ FlyMap:
call GetWorldMapLocation
; If we're not in a valid location, i.e. Pokecenter floor 2F,
; the backup map information is used.
cp SPECIAL_MAP
cp LANDMARK_SPECIAL
jr nz, .CheckRegion
ld a, [wBackupMapGroup]
ld b, a
@@ -2589,7 +2589,7 @@ Pokedex_GetArea:
; not in the same region as what's currently
; on the screen.
ld a, [wTownMapPlayerIconLandmark]
cp FAST_SHIP
cp LANDMARK_FAST_SHIP
jr z, .johto
cp KANTO_LANDMARK
jr c, .johto
@@ -2617,7 +2617,7 @@ Pokedex_GetArea:
.GetPlayerOrFastShipIcon:
ld a, [wTownMapPlayerIconLandmark]
cp FAST_SHIP
cp LANDMARK_FAST_SHIP
jr z, .FastShip
farcall GetPlayerIcon
ret