summaryrefslogtreecommitdiff
path: root/maps/Route35NationalParkgate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route35NationalParkgate.asm')
-rw-r--r--maps/Route35NationalParkgate.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm
index fa09f69f2..08ff386ef 100644
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -77,7 +77,7 @@ Route35NationalParkgate_GoBackIn:
playsound SFX_ENTER_DOOR
special FadeBlackBGMap
waitbutton
- warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f
+ warpfacing $1, NATIONAL_PARK_BUG_CONTEST, $a, $2f
end
OfficerScript_0x6a204:
@@ -115,7 +115,7 @@ Route35NationalParkgate_OkayToProceed:
special FadeBlackBGMap
waitbutton
special Special_SelectRandomBugContestContestants
- warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f
+ warpfacing $1, NATIONAL_PARK_BUG_CONTEST, $a, $2f
end
Route35NationalParkgate_EnterContest:
@@ -135,7 +135,7 @@ Route35NationalParkgate_LeaveTheRestBehind:
if_equal 0, Route35NationalParkgate_NoRoomInBox
Route35NationalParkgate_LessThanFullParty: ; 6a27d
- special Function71ac
+ special CheckFirstMonIsEgg
if_equal $1, Route35NationalParkgate_FirstMonIsEgg
writetext UnknownText_0x6a4c6
yesorno
@@ -444,10 +444,10 @@ Route35NationalParkgate_MapEventHeader:
.Warps:
db 4
- warp_def $0, $3, 3, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK
- warp_def $0, $4, 4, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK
- warp_def $7, $3, 3, GROUP_ROUTE_35, MAP_ROUTE_35
- warp_def $7, $4, 3, GROUP_ROUTE_35, MAP_ROUTE_35
+ warp_def $0, $3, 3, NATIONAL_PARK
+ warp_def $0, $4, 4, NATIONAL_PARK
+ warp_def $7, $3, 3, ROUTE_35
+ warp_def $7, $4, 3, ROUTE_35
.XYTriggers:
db 0