summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity_PokemonSchool/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/RustboroCity_PokemonSchool/scripts.inc')
-rw-r--r--data/maps/RustboroCity_PokemonSchool/scripts.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc
index c01e4a436..ff52ee5ac 100644
--- a/data/maps/RustboroCity_PokemonSchool/scripts.inc
+++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc
@@ -85,9 +85,9 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT
giveitem_std ITEM_QUICK_CLAW
compare VAR_RESULT, 0
- goto_if_eq RustboroCity_PokemonSchool_EventScript_272054
+ goto_if_eq Common_EventScript_ShowBagIsFull
closemessage
- applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA
+ applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
waitmovement 0
setflag FLAG_RECEIVED_QUICK_CLAW
release
@@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0
RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB
msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT
closemessage
- applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA
+ applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
waitmovement 0
release
end
@@ -170,7 +170,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040
goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_21406F
goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082
msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT
- addvar VAR_0x40D1, 1
+ addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_RUSTBORO
release
end
@@ -192,7 +192,7 @@ RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090
end
RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E
- addvar VAR_0x40D1, 1
+ addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE
release
end