diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-10 21:06:06 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-10 21:16:54 -0500 |
| commit | dbabd8b4a94014749a9c2a6f36ed524947c4403e (patch) | |
| tree | a5b0868100d73df192381de9122cfe73689060b1 /engine | |
| parent | 71073a5f3bcbf4f2725e16bdce147c070c8b833e (diff) | |
Define MAPGROUP_* constants and verify MapGroup_* table sizes
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/overworld/warp_connection.asm | 4 | ||||
| -rw-r--r-- | engine/phone/scripts/mom.asm | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index 0b87de722..eebbc91cf 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -176,14 +176,14 @@ EnterMapWarp: ; Dig and Escape Rope should not take you to them. ld a, [wPrevMapGroup] cp GROUP_MOUNT_MOON_SQUARE + jr nz, .not_mt_moon_square_or_tin_tower_roof assert GROUP_MOUNT_MOON_SQUARE == GROUP_TIN_TOWER_ROOF - jr nz, .not_mt_moon_or_tin_tower ld a, [wPrevMapNumber] cp MAP_MOUNT_MOON_SQUARE ret z cp MAP_TIN_TOWER_ROOF ret z -.not_mt_moon_or_tin_tower +.not_mt_moon_square_or_tin_tower_roof ld a, [wPrevWarp] ld [wDigWarpNumber], a diff --git a/engine/phone/scripts/mom.asm b/engine/phone/scripts/mom.asm index bd56e1faa..40a8ba5bd 100644 --- a/engine/phone/scripts/mom.asm +++ b/engine/phone/scripts/mom.asm @@ -15,9 +15,9 @@ MomPhoneCalleeScript: farwritetext MomPhoneGreetingText promptbutton getcurlandmarkname STRING_BUFFER_3 - readvar VAR_ROOFPALETTE - ifequal 1, MomPhonePalette1 - ifequal 2, MomPhonePalette2 + readvar VAR_ENVIRONMENT + ifequal TOWN, MomPhoneInTown + ifequal ROUTE, MomPhoneOnRoute sjump MomPhoneOther MomPhoneLandmark: @@ -25,7 +25,7 @@ MomPhoneLandmark: promptbutton sjump MomSavingMoney -MomPhonePalette1: +MomPhoneInTown: readvar VAR_MAPGROUP ifequal GROUP_NEW_BARK_TOWN, .newbark ifequal GROUP_CHERRYGROVE_CITY, .cherrygrove @@ -56,7 +56,7 @@ MomPhonePalette1: getlandmarkname STRING_BUFFER_4, LANDMARK_RADIO_TOWER sjump MomPhoneLandmark -MomPhonePalette2: +MomPhoneOnRoute: farwritetext MomOtherAreaText promptbutton sjump MomSavingMoney |