summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-11 16:11:08 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-11 16:15:06 -0500
commit91068077f05afbbfd6571ceadada2c03ac7c8038 (patch)
tree5d3ff368c3a31c99cd1967a589403a37ee1377ff /maps
parentb522b0f165b6aae278ca9b4b18bada606d4ae737 (diff)
Further split bank 4
Diffstat (limited to 'maps')
-rw-r--r--maps/Route35NationalParkgate.asm4
-rw-r--r--maps/Route36NationalParkgate.asm4
2 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm
index b1360b194..be2ddf686 100644
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -96,7 +96,7 @@ OfficerScript_0x6a204:
iffalse Route35NationalParkgate_DeclinedToParticipate
checkcode VAR_PARTYCOUNT
if_greater_than $1, Route35NationalParkgate_LeaveTheRestBehind
- special CheckFirstMonFainted
+ special ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
Route35NationalParkgate_OkayToProceed:
setflag ENGINE_BUG_CONTEST_TIMER
@@ -140,7 +140,7 @@ Route35NationalParkgate_LessThanFullParty: ; 6a27d
writetext UnknownText_0x6a4c6
yesorno
iffalse Route35NationalParkgate_DeclinedToLeaveMonsBehind
- special CheckFirstMonFainted
+ special ContestDropOffMons
iftrue Route35NationalParkgate_FirstMonIsFainted
setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
writetext UnknownText_0x6a537
diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
index 4985b5476..703670d7c 100644
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -148,7 +148,7 @@ Route36OfficerScriptContest:
iffalse .DecidedNotToJoinContest
checkcode VAR_PARTYCOUNT
if_greater_than $1, .LeaveMonsWithOfficer
- special CheckFirstMonFainted
+ special ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
.ResumeStartingContest:
setflag ENGINE_BUG_CONTEST_TIMER
@@ -183,7 +183,7 @@ Route36OfficerScriptContest:
writetext UnknownText_0x6afb0
yesorno
iffalse .RefusedToLeaveMons
- special CheckFirstMonFainted
+ special ContestDropOffMons
iftrue .FirstMonIsFainted
setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
writetext UnknownText_0x6b021