diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-03-15 17:26:10 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-03-15 19:50:39 -0400 |
| commit | ad50e94b5029ce5a7d45fd3576f8f017eae6449c (patch) | |
| tree | 5a81c2c1d2bfc29206d29ff3c107f784b0b18be4 /engine/events | |
| parent | 65f22544e0a2d3fdbbd23b0fee026120d84202d8 (diff) | |
Add a `LANDMARK_` prefix to landmark constants
Resolves #697
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/map_name_sign.asm | 14 | ||||
| -rw-r--r-- | engine/events/poke_seer.asm | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index f345c49ed..d674eebb1 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -63,24 +63,24 @@ InitMapNameSign:: ld a, [wPrevLandmark] cp c ret z - cp SPECIAL_MAP + cp LANDMARK_SPECIAL ret .CheckSpecialMap: ; These landmarks do not get pop-up signs. cp -1 ret z - cp SPECIAL_MAP ; redundant check + cp LANDMARK_SPECIAL ; redundant check ret z - cp RADIO_TOWER + cp LANDMARK_RADIO_TOWER ret z - cp LAV_RADIO_TOWER + cp LANDMARK_LAV_RADIO_TOWER ret z - cp UNDERGROUND_PATH + cp LANDMARK_UNDERGROUND_PATH ret z - cp INDIGO_PLATEAU + cp LANDMARK_INDIGO_PLATEAU ret z - cp POWER_PLANT + cp LANDMARK_POWER_PLANT ret z ld a, 1 and a diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index 9bca9d169..8e62d5ded 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -218,9 +218,9 @@ GetCaughtLocation: ld a, [wSeerCaughtGender] and CAUGHT_LOCATION_MASK jr z, .Unknown - cp EVENT_LOCATION + cp LANDMARK_EVENT jr z, .event - cp GIFT_LOCATION + cp LANDMARK_GIFT jr z, .fail ld e, a farcall GetLandmarkName @@ -390,7 +390,7 @@ GetCaughtGender: ld a, [hl] and CAUGHT_LOCATION_MASK jr z, .genderless - cp EVENT_LOCATION + cp LANDMARK_EVENT jr z, .genderless ld a, [hl] |