summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/battle_pike.inc38
-rw-r--r--data/scripts/cable_club.inc2
-rw-r--r--data/scripts/cave_hole.inc22
-rw-r--r--data/scripts/elite_four.inc4
-rw-r--r--data/scripts/field_poison.inc38
-rw-r--r--data/scripts/gabby_and_ty.inc4
-rw-r--r--data/scripts/kecleon.inc57
-rw-r--r--data/scripts/move_tutors.inc317
-rw-r--r--data/scripts/movement.inc33
-rw-r--r--data/scripts/pkmn_center_nurse.inc4
-rw-r--r--data/scripts/players_house.inc34
-rw-r--r--data/scripts/trainer_hill.inc8
12 files changed, 270 insertions, 291 deletions
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index 581a789e4..9892ffb7b 100644
--- a/data/scripts/battle_pike.inc
+++ b/data/scripts/battle_pike.inc
@@ -3,9 +3,9 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25
- setvar VAR_0x8004, 4
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_UP_ROOM_OBJECTS
special CallBattlePikeFunction
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1
@@ -50,7 +50,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
compare VAR_RESULT, 3
goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35
@@ -92,11 +92,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePikeFunction
addvar VAR_RESULT, 1
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
@@ -108,9 +108,9 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
- setvar VAR_0x8004, 0
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE
special CallBattlePikeFunction
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030
@@ -167,17 +167,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
- setvar VAR_0x8004, 25
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128
compare VAR_RESULT, 1
call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePikeFunction
addvar VAR_RESULT, 1
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
@@ -189,7 +189,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
- setvar VAR_0x8004, 3
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144
@@ -200,14 +200,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128
- setvar VAR_0x8004, 24
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
setvar VAR_0x8005, 1
special CallBattlePikeFunction
return
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136
- setvar VAR_0x8004, 24
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
setvar VAR_0x8005, 0
special CallBattlePikeFunction
return
@@ -229,19 +229,19 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C
return
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
- setvar VAR_0x8004, 7
+ setvar VAR_0x8004,BATTLE_PIKE_FUNC_7
special CallBattlePikeFunction
- setvar VAR_0x8004, 25
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128
compare VAR_RESULT, 1
call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136
- setvar VAR_0x8004, 1
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePikeFunction
addvar VAR_RESULT, 1
- setvar VAR_0x8004, 2
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
@@ -253,7 +253,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174
setvar VAR_0x8005, 2
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
- setvar VAR_0x8004, 3
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM
special CallBattlePikeFunction
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144
@@ -275,7 +275,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D
closemessage
end
-BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222
+BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 4
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 3fcb25807..693860be4 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -312,7 +312,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5
OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
lockall
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT
closemessage
diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc
index 86689fdb0..0852149a6 100644
--- a/data/scripts/cave_hole.inc
+++ b/data/scripts/cave_hole.inc
@@ -1,23 +1,15 @@
-GraniteCave_B1F_MapScript2_2A8327: @ 82A8327
-MirageTower_2F_MapScript2_2A8327: @ 82A8327
-MirageTower_3F_MapScript2_2A8327: @ 82A8327
-MtPyre_2F_MapScript2_2A8327: @ 82A8327
-SkyPillar_2F_MapScript2_2A8327: @ 82A8327
-SkyPillar_4F_MapScript2_2A8327: @ 82A8327
+CaveHole_MapScript2_CheckFallDownHole: @ 82A8327
map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole
.2byte 0
-GraniteCave_B1F_MapScript1_2A8331: @ 82A8331
-MirageTower_2F_MapScript1_2A8331: @ 82A8331
-MirageTower_3F_MapScript1_2A8331: @ 82A8331
-MtPyre_2F_MapScript1_2A8331: @ 82A8331
- copyvar VAR_ICE_STEP_COUNT, 0x1
+CaveHole_MapScript1_FixCrackedGround: @ 82A8331
+ copyvar VAR_ICE_STEP_COUNT, 1
end
EventScript_FallDownHole:: @ 82A8337
lockall
delay 20
- applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369
+ applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
delay 60
@@ -25,10 +17,10 @@ EventScript_FallDownHole:: @ 82A8337
waitstate
end
-gUnknown_082A8350:: @ 82A8350
+EventScript_FallDownHoleMtPyre:: @ 82A8350
lockall
delay 20
- applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369
+ applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
delay 60
@@ -36,6 +28,6 @@ gUnknown_082A8350:: @ 82A8350
waitstate
end
-GraniteCave_B1F_Movement_2A8369: @ 82A8369
+Movement_SetInvisible: @ 82A8369
set_invisible
step_end
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
index c6b8d5578..c60e3889e 100644
--- a/data/scripts/elite_four.inc
+++ b/data/scripts/elite_four.inc
@@ -3,7 +3,7 @@ EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8
EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8
EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8
PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
- applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_DOOR
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
@@ -25,7 +25,7 @@ EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475
EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475
EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475
EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475
- applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
playse SE_TRACK_DOOR
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index 9f8058e4e..2ca9c7b06 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -1,51 +1,51 @@
-EventScript_Poison:: @ 82736BC
+EventScript_FieldPoison:: @ 82736BC
lockall
- special ExecuteWhiteOut
+ special TryFieldPoisonWhiteOut
waitstate
- compare VAR_RESULT, 1
- goto_if_eq EventScript_2736D9
- compare VAR_RESULT, 2
- goto_if_eq EventScript_2736F8
+ compare VAR_RESULT, FLDPSN_WHITEOUT
+ goto_if_eq EventScript_FieldWhiteOut
+ compare VAR_RESULT, FLDPSN_FRONTIER_WHITEOUT
+ goto_if_eq EventScript_FrontierFieldWhiteOut
releaseall
end
-EventScript_2736D9:: @ 82736D9
+EventScript_FieldWhiteOut:: @ 82736D9
message gText_PlayerWhitedOut
waitmessage
waitbuttonpress
- special sub_80B05B4
+ special Script_FadeOutMapMusic
waitstate
fadescreen 1
- call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_2736F4
- special sp0C8_whiteout_maybe
+ call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter
+ special SetCB2WhiteOut
waitstate
end
-EventScript_2736F4:: @ 82736F4
+EventScript_SetRespawnLavaridgePkmnCenter:: @ 82736F4
setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
return
-EventScript_2736F8:: @ 82736F8
+EventScript_FrontierFieldWhiteOut:: @ 82736F8
message gText_PlayerWhitedOut
waitmessage
waitbuttonpress
- setvar VAR_0x8004, 16
+ setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN
special CallBattlePikeFunction
compare VAR_RESULT, 1
- goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222
- setvar VAR_0x8004, 12
+ goto_if_eq BattleFrontier_BattlePike_EventScript_Retire
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
special CallBattlePyramidFunction
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
- setvar VAR_0x8004, TRAINER_HILL_FUNC_10
+ setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN
special CallTrainerHillFunction
compare VAR_RESULT, 1
- goto_if_eq TrainerHill_1F_EventScript_2C83C9
- special sub_80B05B4
+ goto_if_eq TrainerHill_1F_EventScript_Lost
+ special Script_FadeOutMapMusic
waitstate
fadescreen 1
- special sp0C8_whiteout_maybe
+ special SetCB2WhiteOut
waitstate
end
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index be8277baa..0f8d71f6b 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -232,13 +232,13 @@ Route111_EventScript_28CF94:: @ 828CF94
Route111_EventScript_28CF9F:: @ 828CF9F
applymovement VAR_0x8004, Route111_Movement_28D04F
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
Route111_EventScript_28CFB1:: @ 828CFB1
applymovement VAR_0x8004, Route111_Movement_28D051
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc
index e4118d3e1..ac0931fd8 100644
--- a/data/scripts/kecleon.inc
+++ b/data/scripts/kecleon.inc
@@ -1,74 +1,73 @@
-Route120_EventScript_2722DB:: @ 82722DB
+Route120_EventScript_Kecleon1:: @ 82722DB
lock
faceplayer
setvar VAR_0x8009, 1
- goto Route120_EventScript_272336
+ goto EventScript_Kecleon
end
-Route120_EventScript_2722E8:: @ 82722E8
+Route120_EventScript_Kecleon2:: @ 82722E8
lock
faceplayer
setvar VAR_0x8009, 2
- goto Route120_EventScript_272336
+ goto EventScript_Kecleon
end
-Route120_EventScript_2722F5:: @ 82722F5
+Route120_EventScript_Kecleon3:: @ 82722F5
lock
faceplayer
setvar VAR_0x8009, 3
- goto Route120_EventScript_272336
+ goto EventScript_Kecleon
end
-Route120_EventScript_272302:: @ 8272302
+Route120_EventScript_Kecleon4:: @ 8272302
lock
faceplayer
setvar VAR_0x8009, 4
- goto Route120_EventScript_272336
+ goto EventScript_Kecleon
end
-Route120_EventScript_27230F:: @ 827230F
+Route120_EventScript_Kecleon5:: @ 827230F
lock
faceplayer
setvar VAR_0x8009, 5
- goto Route120_EventScript_272336
+ goto EventScript_Kecleon
end
-Route119_EventScript_27231C:: @ 827231C
+Route119_EventScript_Kecleon1:: @ 827231C
lock
faceplayer
setvar VAR_0x8009, 6
- goto Route119_EventScript_272336
+ goto EventScript_Kecleon
end
-Route119_EventScript_272329:: @ 8272329
+Route119_EventScript_Kecleon2:: @ 8272329
lock
faceplayer
setvar VAR_0x8009, 7
- goto Route119_EventScript_272336
+ goto EventScript_Kecleon
end
-Route119_EventScript_272336:: @ 8272336
-Route120_EventScript_272336:: @ 8272336
+EventScript_Kecleon:: @ 8272336
checkitem ITEM_DEVON_SCOPE, 1
compare VAR_RESULT, 1
- goto_if_eq Route119_EventScript_272350
- msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT
+ goto_if_eq EventScript_AskUseDevonScope
+ msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_DEFAULT
release
end
-Route119_EventScript_272350:: @ 8272350
- msgbox Route119_Text_1F5D23, MSGBOX_YESNO
+EventScript_AskUseDevonScope:: @ 8272350
+ msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_if_eq Route119_EventScript_272365
+ goto_if_eq EventScript_BattleKecleon
release
end
-Route119_EventScript_272365:: @ 8272365
- msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT
+EventScript_BattleKecleon:: @ 8272365
+ msgbox Kecleon_Text_UseDevonScopeMonAttacked, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
waitmovement 0
- applymovement VAR_LAST_TALKED, Route119_Movement_2723C7
+ applymovement VAR_LAST_TALKED, Movement_KecleonAppears
waitmovement 0
waitse
playmoncry SPECIES_KECLEON, 2
@@ -79,11 +78,11 @@ Route119_EventScript_272365:: @ 8272365
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
- compare VAR_RESULT, 1
+ compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_RemoveKecleon
- compare VAR_RESULT, 4
+ compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_RemoveKecleon
- compare VAR_RESULT, 5
+ compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_RemoveKecleon
release
end
@@ -92,9 +91,7 @@ EventScript_RemoveKecleon:: @ 82723C1
goto Common_EventScript_RemoveStaticPokemon
end
-FortreeCity_Movement_2723C7: @ 82723C7
-Route119_Movement_2723C7: @ 82723C7
-Route120_Movement_2723C7: @ 82723C7
+Movement_KecleonAppears: @ 82723C7
set_visible
delay_4
set_invisible
diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc
index 8780b9994..b6ba75e0d 100644
--- a/data/scripts/move_tutors.inc
+++ b/data/scripts/move_tutors.inc
@@ -1,309 +1,300 @@
-SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16
+SlateportCity_PokemonFanClub_EventScript_SwaggerTutor:: @ 82C7F16
lock
faceplayer
- goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, SlateportCity_PokemonFanClub_EventScript_2C7F74
- msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO
+ goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, MoveTutor_EventScript_SwaggerTaught
+ msgbox MoveTutor_Text_SwaggerTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A
- call SlateportCity_PokemonFanClub_EventScript_2C832D
+ goto_if_eq MoveTutor_EventScript_SwaggerDeclined
+ call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A
- msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT
- setvar VAR_0x8005, 23
- call EventScript_ShowPartyMenu
+ goto_if_eq MoveTutor_EventScript_SwaggerDeclined
+ msgbox MoveTutor_Text_SwaggerWhichMon, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TUTOR_MOVE_SWAGGER
+ call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
- goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A
+ goto_if_eq MoveTutor_EventScript_SwaggerDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER
- goto SlateportCity_PokemonFanClub_EventScript_2C7F74
+ goto MoveTutor_EventScript_SwaggerTaught
end
-SlateportCity_PokemonFanClub_EventScript_2C7F6A:: @ 82C7F6A
- msgbox SlateportCity_PokemonFanClub_Text_2C6F33, MSGBOX_DEFAULT
+MoveTutor_EventScript_SwaggerDeclined:: @ 82C7F6A
+ msgbox MoveTutor_Text_SwaggerDeclined, MSGBOX_DEFAULT
release
end
-SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74
- msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, MSGBOX_DEFAULT
+MoveTutor_EventScript_SwaggerTaught:: @ 82C7F74
+ msgbox MoveTutor_Text_SwaggerTaught, MSGBOX_DEFAULT
release
end
-MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E
+MauvilleCity_EventScript_RolloutTutor:: @ 82C7F7E
lock
faceplayer
- goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MauvilleCity_EventScript_2C7FDC
- msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO
+ goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MoveTutor_EventScript_RolloutTaught
+ msgbox MoveTutor_Text_RolloutTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_EventScript_2C7FD2
- call MauvilleCity_EventScript_2C832D
+ goto_if_eq MoveTutor_EventScript_RolloutDeclined
+ call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_EventScript_2C7FD2
- msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT
- setvar VAR_0x8005, 16
- call EventScript_ShowPartyMenu
+ goto_if_eq MoveTutor_EventScript_RolloutDeclined
+ msgbox MoveTutor_Text_RolloutWhichMon, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TUTOR_MOVE_ROLLOUT
+ call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_EventScript_2C7FD2
+ goto_if_eq MoveTutor_EventScript_RolloutDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT
- goto MauvilleCity_EventScript_2C7FDC
+ goto MoveTutor_EventScript_RolloutTaught
end
-MauvilleCity_EventScript_2C7FD2:: @ 82C7FD2
- msgbox MauvilleCity_Text_2C70C4, MSGBOX_DEFAULT
+MoveTutor_EventScript_RolloutDeclined:: @ 82C7FD2
+ msgbox MoveTutor_Text_RolloutDeclined, MSGBOX_DEFAULT
release
end
-MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC
- msgbox MauvilleCity_Text_2C7133, MSGBOX_DEFAULT
+MoveTutor_EventScript_RolloutTaught:: @ 82C7FDC
+ msgbox MoveTutor_Text_RolloutTaught, MSGBOX_DEFAULT
release
end
-VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6
+VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor:: @ 82C7FE6
lock
faceplayer
- goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044
- msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO
+ goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, MoveTutor_EventScript_FuryCutterTaught
+ msgbox MoveTutor_Text_FuryCutterTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A
- call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D
+ goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
+ call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
- goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A
- msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT
- setvar VAR_0x8005, 29
- call EventScript_ShowPartyMenu
+ goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
+ msgbox MoveTutor_Text_FuryCutterWhichMon, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TUTOR_MOVE_FURY_CUTTER
+ call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
- goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A
+ goto_if_eq MoveTutor_EventScript_FuryCutterDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER
- goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044
+ goto MoveTutor_EventScript_FuryCutterTaught
end
-VerdanturfTown_PokemonCenter_1F_EventScript_2C803A:: @ 82C803A
- msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, MSGBOX_DEFAULT
+MoveTutor_EventScript_FuryCutterDeclined:: @ 82C803A
+ msgbox MoveTutor_Text_FuryCutterDeclined, MSGBOX_DEFAULT
release
end
-VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044
- msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, MSGBOX_DEFAULT
+MoveTutor_EventScript_FuryCutterTaught:: @ 82C8044
+ msgbox MoveTutor_Text_FuryCutterTaught, MSGBOX_DEFAULT
release
end
-LavaridgeTown_House_EventScript_2C804E:: @ 82C804E
+LavaridgeTown_House_EventScript_MimicTutor:: @ 82C804E
lock
faceplayer
- goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, LavaridgeTown_House_EventScript_2C80AC
- msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO
+ goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, MoveTutor_EventScript_MimicTaught
+ msgbox MoveTutor_MimicTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq LavaridgeTown_House_EventScript_2C80A2
- call LavaridgeTown_House_EventScript_2C832D
+ goto_if_eq MoveTutor_EventScript_MimicDeclined
+ call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
- goto_if_eq LavaridgeTown_House_EventScript_2C80A2
- msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT
- setvar VAR_0x8005, 7
- call EventScript_ShowPartyMenu
+ goto_if_eq MoveTutor_EventScript_MimicDeclined
+ msgbox MoveTutor_Text_MimicWhichMon, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TUTOR_MOVE_MIMIC
+ call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
- goto_if_eq LavaridgeTown_House_EventScript_2C80A2
+ goto_if_eq MoveTutor_EventScript_MimicDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC
- goto LavaridgeTown_House_EventScript_2C80AC
+ goto MoveTutor_EventScript_MimicTaught
end
-LavaridgeTown_House_EventScript_2C80A2:: @ 82C80A2
- msgbox LavaridgeTown_House_Text_2C737F, MSGBOX_DEFAULT
+MoveTutor_EventScript_MimicDeclined:: @ 82C80A2
+ msgbox MoveTutor_MimicDeclined, MSGBOX_DEFAULT
release
end
-LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC
- msgbox LavaridgeTown_House_Text_2C73F6, MSGBOX_DEFAULT
+MoveTutor_EventScript_MimicTaught:: @ 82C80AC
+ msgbox MoveTutor_Text_MimicTaught, MSGBOX_DEFAULT
release
end
-FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6
+FallarborTown_Mart_EventScript_MetronomeTutor:: @ 82C80B6
lock
faceplayer
- goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, FallarborTown_Mart_EventScript_2C8114
- msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO
+ goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, MoveTutor_EventScript_MetronomeTaught
+ msgbox MoveTutor_Text_MetronomeTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq FallarborTown_Mart_EventScript_2C810A
- call FallarborTown_Mart_EventScript_2C832D
+ goto_if_eq MoveTutor_EventScript_MetronomeDeclined
+ call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
- goto_if_eq FallarborTown_Mart_EventScript_2C810A
- msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT
- setvar VAR_0x8005, 8
- call EventScript_ShowPartyMenu
+ goto_if_eq MoveTutor_EventScript_MetronomeDeclined
+ msgbox MoveTutor_Text_MetronomeWhichMon, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TUTOR_MOVE_METRONOME
+ call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
- goto_if_eq FallarborTown_Mart_EventScript_2C810A
+ goto_if_eq MoveTutor_EventScript_MetronomeDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME
- goto FallarborTown_Mart_EventScript_2C8114
+ goto MoveTutor_EventScript_MetronomeTaught
end
-FallarborTown_Mart_EventScript_2C810A:: @ 82C810A
- msgbox FallarborTown_Mart_Text_2C7556, MSGBOX_DEFAULT
+MoveTutor_EventScript_MetronomeDeclined:: @ 82C810A
+ msgbox MoveTutor_Text_MetronomeDeclined, MSGBOX_DEFAULT
release
end
-FallarborTown_Mart_EventScript_2C8114:: @ 82C8114
- msgbox FallarborTown_Mart_Text_2C75B5, MSGBOX_DEFAULT
+MoveTutor_EventScript_MetronomeTaught:: @ 82C8114
+ msgbox MoveTutor_Text_MetronomeTaught, MSGBOX_DEFAULT
release
end
-FortreeCity_House2_EventScript_2C811E:: @ 82C811E
+FortreeCity_House2_EventScript_SleepTalkTutor:: @ 82C811E
lock
faceplayer
- goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, FortreeCity_House2_EventScript_2C817C
- msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO
+ goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, MoveTutor_EventScript_SleepTalkTaught
+ msgbox MoveTutor_Text_SleepTalkTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq FortreeCity_House2_EventScript_2C8172
- call FortreeCity_House2_EventScript_2C832D
+ goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
+ call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
- goto_if_eq FortreeCity_House2_EventScript_2C8172
- msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT
- setvar VAR_0x8005, 24
- call EventScript_ShowPartyMenu
+ goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
+ msgbox MoveTutor_Text_SleepTalkWhichMon, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TUTOR_MOVE_SLEEP_TALK
+ call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
- goto_if_eq FortreeCity_House2_EventScript_2C8172
+ goto_if_eq MoveTutor_EventScript_SleepTalkDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK
- goto FortreeCity_House2_EventScript_2C817C
+ goto MoveTutor_EventScript_SleepTalkTaught
end
-FortreeCity_House2_EventScript_2C8172:: @ 82C8172
- msgbox FortreeCity_House2_Text_2C76E2, MSGBOX_DEFAULT
+MoveTutor_EventScript_SleepTalkDeclined:: @ 82C8172
+ msgbox MoveTutor_Text_SleepTalkDeclined, MSGBOX_DEFAULT
release
end
-FortreeCity_House2_EventScript_2C817C:: @ 82C817C
- msgbox FortreeCity_House2_Text_2C775A, MSGBOX_DEFAULT
+MoveTutor_EventScript_SleepTalkTaught:: @ 82C817C
+ msgbox MoveTutor_Text_SleepTalkTaught, MSGBOX_DEFAULT
release
end
-LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186
+LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor:: @ 82C8186
lock
faceplayer
- goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4
- msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO
+ goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, MoveTutor_EventScript_SubstituteTaught
+ msgbox MoveTutor_Text_SubstituteTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA
- call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D
+ goto_if_eq MoveTutor_EventScript_SubstituteDeclined
+ call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
- goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA
- msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT
- setvar VAR_0x8005, 14
- call EventScript_ShowPartyMenu
+ goto_if_eq MoveTutor_EventScript_SubstituteDeclined
+ msgbox MoveTutor_Text_SubstituteWhichMon, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TUTOR_MOVE_SUBSTITUTE
+ call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
- goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA
+ goto_if_eq MoveTutor_EventScript_SubstituteDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE
- goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4
+ goto MoveTutor_EventScript_SubstituteTaught
end
-LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA:: @ 82C81DA
- msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, MSGBOX_DEFAULT
+MoveTutor_EventScript_SubstituteDeclined:: @ 82C81DA
+ msgbox MoveTutor_Text_SubstituteDeclined, MSGBOX_DEFAULT
release
end
-LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4
- msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, MSGBOX_DEFAULT
+MoveTutor_EventScript_SubstituteTaught:: @ 82C81E4
+ msgbox MoveTutor_Text_SubstituteTaught, MSGBOX_DEFAULT
release
end
-MossdeepCity_EventScript_2C81EE:: @ 82C81EE
+MossdeepCity_EventScript_DynamicPunchTutor:: @ 82C81EE
lock
faceplayer
- goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MossdeepCity_EventScript_2C824C
- msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO
+ goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MoveTutor_EventScript_DynamicPunchTaught
+ msgbox MoveTutor_Text_DynamicPunchTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq MossdeepCity_EventScript_2C8242
- call MossdeepCity_EventScript_2C832D
+ goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
+ call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
- goto_if_eq MossdeepCity_EventScript_2C8242
- msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT
- setvar VAR_0x8005, 15
- call EventScript_ShowPartyMenu
+ goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
+ msgbox MoveTutor_Text_DynamicPunchWhichMon, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TUTOR_MOVE_DYNAMIC_PUNCH
+ call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
- goto_if_eq MossdeepCity_EventScript_2C8242
+ goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH
- goto MossdeepCity_EventScript_2C824C
+ goto MoveTutor_EventScript_DynamicPunchTaught
end
-MossdeepCity_EventScript_2C8242:: @ 82C8242
- msgbox MossdeepCity_Text_2C7AD4, MSGBOX_DEFAULT
+MoveTutor_EventScript_DynamicPunchDeclined:: @ 82C8242
+ msgbox MoveTutor_Text_DynamicPunchDeclined, MSGBOX_DEFAULT
release
end
-MossdeepCity_EventScript_2C824C:: @ 82C824C
- msgbox MossdeepCity_Text_2C7B4F, MSGBOX_DEFAULT
+MoveTutor_EventScript_DynamicPunchTaught:: @ 82C824C
+ msgbox MoveTutor_Text_DynamicPunchTaught, MSGBOX_DEFAULT
release
end
-SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256
+SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor:: @ 82C8256
lock
faceplayer
- goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4
- msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO
+ goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, MoveTutor_EventScript_DoubleEdgeTaught
+ msgbox MoveTutor_Text_DoubleEdgeTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA
- call SootopolisCity_PokemonCenter_1F_EventScript_2C832D
+ goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
+ call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
- goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA
- msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT
- setvar VAR_0x8005, 4
- call EventScript_ShowPartyMenu
+ goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
+ msgbox MoveTutor_Text_DoubleEdgeWhichMon, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TUTOR_MOVE_DOUBLE_EDGE
+ call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
- goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA
+ goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE
- goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4
+ goto MoveTutor_EventScript_DoubleEdgeTaught
end
-SootopolisCity_PokemonCenter_1F_EventScript_2C82AA:: @ 82C82AA
- msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, MSGBOX_DEFAULT
+MoveTutor_EventScript_DoubleEdgeDeclined:: @ 82C82AA
+ msgbox MoveTutor_Text_DoubleEdgeDeclined, MSGBOX_DEFAULT
release
end
-SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4
- msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, MSGBOX_DEFAULT
+MoveTutor_EventScript_DoubleEdgeTaught:: @ 82C82B4
+ msgbox MoveTutor_Text_DoubleEdgeTaught, MSGBOX_DEFAULT
release
end
-PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE
+PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor:: @ 82C82BE
lock
faceplayer
- goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C
- msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO
+ goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, MoveTutor_EventScript_ExplosionTaught
+ msgbox MoveTutor_Text_ExplosionTeach, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312
- call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D
+ goto_if_eq MoveTutor_EventScript_ExplosionDeclined
+ call MoveTutor_EventScript_CanOnlyBeLearnedOnce
compare VAR_RESULT, 0
- goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312
- msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT
- setvar VAR_0x8005, 12
- call EventScript_ShowPartyMenu
+ goto_if_eq MoveTutor_EventScript_ExplosionDeclined
+ msgbox MoveTutor_Text_ExplosionWhichMon, MSGBOX_DEFAULT
+ setvar VAR_0x8005, TUTOR_MOVE_EXPLOSION
+ call MoveTutor_EventScript_OpenPartyMenu
compare VAR_RESULT, 0
- goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312
+ goto_if_eq MoveTutor_EventScript_ExplosionDeclined
setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION
- goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C
+ goto MoveTutor_EventScript_ExplosionTaught
end
-PacifidlogTown_PokemonCenter_1F_EventScript_2C8312:: @ 82C8312
- msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, MSGBOX_DEFAULT
+MoveTutor_EventScript_ExplosionDeclined:: @ 82C8312
+ msgbox MoveTutor_Text_ExplosionDeclined, MSGBOX_DEFAULT
release
end
-PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C
- msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, MSGBOX_DEFAULT
+MoveTutor_EventScript_ExplosionTaught:: @ 82C831C
+ msgbox MoveTutor_Text_ExplosionTaught, MSGBOX_DEFAULT
release
end
-EventScript_ShowPartyMenu:: @ 82C8326
- special sub_81B892C
+MoveTutor_EventScript_OpenPartyMenu:: @ 82C8326
+ special OpenPartyMenuForMoveTutor
waitstate
lock
faceplayer
return
-FallarborTown_Mart_EventScript_2C832D:: @ 82C832D
-FortreeCity_House2_EventScript_2C832D:: @ 82C832D
-LavaridgeTown_House_EventScript_2C832D:: @ 82C832D
-LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D:: @ 82C832D
-MauvilleCity_EventScript_2C832D:: @ 82C832D
-MossdeepCity_EventScript_2C832D:: @ 82C832D
-PacifidlogTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D
-SlateportCity_PokemonFanClub_EventScript_2C832D:: @ 82C832D
-SootopolisCity_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D
-VerdanturfTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D
- msgbox MauvilleCity_Text_2C6E05, MSGBOX_YESNO
+MoveTutor_EventScript_CanOnlyBeLearnedOnce:: @ 82C832D
+ msgbox MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce, MSGBOX_YESNO
return
diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc
index b7abceae4..3dd1a8144 100644
--- a/data/scripts/movement.inc
+++ b/data/scripts/movement.inc
@@ -1,4 +1,4 @@
-SlateportCity_Movement_272596: @ 8272596
+Common_Movement_QuestionMark: @ 8272596
emote_question_mark
step_end
@@ -24,27 +24,27 @@ Common_Movement_FaceOriginalDirection: @ 82725A2
face_original_direction
step_end
-Common_Movement_WalkInPlaceLeft: @ 82725A4
+Common_Movement_WalkInPlaceFastestLeft: @ 82725A4
walk_in_place_fastest_left
step_end
-Common_Movement_WalkInPlaceUp: @ 82725A6
+Common_Movement_WalkInPlaceFastestUp: @ 82725A6
walk_in_place_fastest_up
step_end
-Common_Movement_WalkInPlaceRight: @ 82725A8
+Common_Movement_WalkInPlaceFastestRight: @ 82725A8
walk_in_place_fastest_right
step_end
-Common_Movement_WalkInPlaceDown: @ 82725AA
+Common_Movement_WalkInPlaceFastestDown: @ 82725AA
walk_in_place_fastest_down
step_end
-RustboroCity_Movement_2725AC: @ 82725AC
+Common_Movement_FaceRight: @ 82725AC
face_right
step_end
-RustboroCity_Movement_2725AE: @ 82725AE
+Common_Movement_FaceLeft: @ 82725AE
face_left
step_end
@@ -56,21 +56,19 @@ Common_Movement_FaceUp: @ 82725B2
face_up
step_end
-BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4
-MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4
+Common_Movement_WalkInPlaceDown: @ 82725B4
walk_in_place_down
step_end
-BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6
-BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6
+Common_Movement_WalkInPlaceLeft: @ 82725B6
walk_in_place_left
step_end
-Route121_Movement_2725B8: @ 82725B8
+Common_Movement_WalkInPlaceRight: @ 82725B8
walk_in_place_right
step_end
-EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA
+Common_Movement_WalkUp6: @ 82725BA
walk_up
walk_up
walk_up
@@ -79,23 +77,24 @@ EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA
walk_up
step_end
-EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1
+Common_Movement_WalkUp4: @ 82725C1
walk_up
walk_up
walk_up
walk_up
step_end
-EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6
+Common_Movement_Delay32: @ 82725C6
delay_16
delay_16
step_end
-Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9
+Common_Movement_WalkUp: @ 82725C9
walk_up
step_end
-Movement_2725CB:: @ 82725CB
+@ Unused
+Common_Movement_WalkUp2:: @ 82725CB
walk_up
walk_up
step_end
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index bfeba79e3..0d4be2c0d 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -38,11 +38,11 @@ EventScript_PkmnCenterNurse_IllTakeYourPkmn2:: @ 827198D
return
EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993
- applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft
+ applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
dofieldeffect FLDEFF_POKECENTER_HEAL
waitfieldeffect FLDEFF_POKECENTER_HEAL
- applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown
+ applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
special HealPlayerParty
return
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 741b7f41e..f88d3af6c 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -16,18 +16,18 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
closemessage
setvar VAR_LITTLEROOT_INTRO_STATE, 4
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763
- applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765
LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT
closemessage
- applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0
waitmovement 0
releaseall
@@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
@@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
@@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866
end
LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_29294B
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0
@@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_29296C
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
end
LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_29294B
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8
@@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_29296C
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B
LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C
LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT
fadedefaultbgm
@@ -586,28 +586,28 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13
LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7
waitmovement 0
- applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft
+ applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE
waitmovement 0
- applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight
+ applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -624,14 +624,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D
LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc
index 5b43118d1..7d898a93d 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -10,11 +10,11 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
setvar VAR_0x8005, 5
special CallFrontierUtilFunc
compare VAR_RESULT, B_OUTCOME_LOST
- goto_if_eq TrainerHill_1F_EventScript_2C83C9
+ goto_if_eq TrainerHill_1F_EventScript_Lost
compare VAR_RESULT, B_OUTCOME_DREW
- goto_if_eq TrainerHill_1F_EventScript_2C83C9
+ goto_if_eq TrainerHill_1F_EventScript_Lost
compare VAR_RESULT, B_OUTCOME_FORFEITED
- goto_if_eq TrainerHill_1F_EventScript_2C83C9
+ goto_if_eq TrainerHill_1F_EventScript_Lost
end
TrainerHill_1F_MapScript2_2C8372: @ 82C8372
@@ -56,7 +56,7 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF
waitstate
end
-TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9
+TrainerHill_1F_EventScript_Lost:: @ 82C83C9
setvar VAR_0x8004, TRAINER_HILL_FUNC_12
special CallTrainerHillFunction
setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 22:53:50 +0000