summaryrefslogtreecommitdiff
path: root/maps/Route36NationalParkGate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route36NationalParkGate.asm')
-rw-r--r--maps/Route36NationalParkGate.asm13
1 files changed, 6 insertions, 7 deletions
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 90fe2555c..24854b9e3 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -76,7 +76,7 @@ Route36NationalParkGate_MapScriptHeader:
waitbutton
closetext
special Special_FadeBlackQuickly
- special Special_ReloadSpritesNoPalettes
+ special ReloadSpritesNoPalettes
scall .CopyContestants
disappear ROUTE36NATIONALPARKGATE_OFFICER1
appear ROUTE36NATIONALPARKGATE_OFFICER2
@@ -91,7 +91,7 @@ Route36NationalParkGate_MapScriptHeader:
closetext
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
- special FadeOutPalettes
+ special Special_FadeOutPalettes
waitsfx
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18
end
@@ -156,7 +156,7 @@ Route36OfficerScriptContest:
iffalse .DecidedNotToJoinContest
checkcode VAR_PARTYCOUNT
if_greater_than 1, .LeaveMonsWithOfficer
- special ContestDropOffMons
+ special Special_ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
.ResumeStartingContest:
setflag ENGINE_BUG_CONTEST_TIMER
@@ -174,7 +174,7 @@ Route36OfficerScriptContest:
special Special_GiveParkBalls
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
- special FadeOutPalettes
+ special Special_FadeOutPalettes
waitsfx
special Special_SelectRandomBugContestContestants
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18
@@ -186,12 +186,12 @@ Route36OfficerScriptContest:
checkcode VAR_BOXSPACE
if_equal 0, .BoxFull
.ContinueLeavingMons:
- special CheckFirstMonIsEgg
+ special Special_CheckFirstMonIsEgg
if_equal TRUE, .FirstMonIsEgg
writetext UnknownText_0x6afb0
yesorno
iffalse .RefusedToLeaveMons
- special ContestDropOffMons
+ special Special_ContestDropOffMons
iftrue .FirstMonIsFainted
setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
writetext UnknownText_0x6b021
@@ -799,7 +799,6 @@ UnknownText_0x6b7af:
; This text is unused and unreferenced in the final game.
; The tree Pokémon is Sudowoodo.
; The Silph Scope 2 was later reworked into the Squirtbottle.
-
UnusedSudowoodoText:
text "I hear there's a"
line "#MON that looks"