summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/pc.inc8
-rw-r--r--data/scripts/pokedex_rating.inc2
-rw-r--r--data/scripts/trainer_battle.inc4
3 files changed, 7 insertions, 7 deletions
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc
index a517bced1..af9eca601 100644
--- a/data/scripts/pc.inc
+++ b/data/scripts/pc.inc
@@ -3,7 +3,7 @@ EventScript_PC:: @ 81A6955
lockall
goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled
setvar VAR_0x8004, 27
- special Special_SetSomeVariable
+ special HelpSystem_SetSomeVariable
setvar VAR_0x8004, 0
special AnimatePcTurnOn
playse SE_PC_ON
@@ -20,7 +20,7 @@ EventScript_PCDisabled:: @ 81A698E
EventScript_PCMainMenu:: @ 81A6998
message Text_AccessWhichPC
waitmessage
- special ScrSpecial_CreatePCMenu
+ special CreatePCMenu
waitstate
goto EventScript_ChoosePCMenu
end
@@ -51,7 +51,7 @@ EventScript_AccessPokemonStorage:: @ 81A6A05
special ShowPokemonStorageSystem
waitstate
setvar VAR_0x8004, 27
- special Special_SetSomeVariable
+ special HelpSystem_SetSomeVariable
goto EventScript_PCMainMenu
end
@@ -76,7 +76,7 @@ EventScript_AccessHallOfFame:: @ 81A6A56
playse SE_PC_LOGIN
setvar VAR_0x8004, 31
special HelpSystem_BackupSomeVariable
- special Special_SetSomeVariable
+ special HelpSystem_SetSomeVariable
special HallOfFamePCBeginFade
waitstate
special HelpSystem_RestoreSomeVariable
diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc
index 903d06aa1..c8b126e60 100644
--- a/data/scripts/pokedex_rating.inc
+++ b/data/scripts/pokedex_rating.inc
@@ -37,7 +37,7 @@ PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC
PokedexRating_EventScript_Rate:: @ 81A73E0
setvar VAR_0x8004, 31
special HelpSystem_BackupSomeVariable
- special Special_SetSomeVariable
+ special HelpSystem_SetSomeVariable
setvar VAR_0x8004, 0
specialvar VAR_RESULT, GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc
index 3e4eb2c44..6a5dc3345 100644
--- a/data/scripts/trainer_battle.inc
+++ b/data/scripts/trainer_battle.inc
@@ -10,7 +10,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1
faceplayer
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
- specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
+ specialvar VAR_RESULT, Script_HasTrainerBeenFought
compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoTrainerBattle
special PlayTrainerEncounterMusic
@@ -24,7 +24,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
lock
faceplayer
call EventScript_RevealTrainer
- specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
+ specialvar VAR_RESULT, Script_HasTrainerBeenFought
compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoDoubleTrainerBattle
special HasEnoughMonsForDoubleBattle