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

Define MAPGROUP_* constants and verify MapGroup_* table sizes

Browse Source
This commit is contained in:
Rangi
2021-03-10 21:06:06 -05:00
parent 71073a5f3b
commit dbabd8b4a9
9 changed files with 139 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/overworld/warp_connection.asm
View File

@@ -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

10
engine/phone/scripts/mom.asm
View File

@@ -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