summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/event_scripts.s1
-rw-r--r--data/maps/BattleFrontier_Lounge7/scripts.inc2
-rw-r--r--data/maps/FallarborTown_Mart/map.json2
-rw-r--r--data/maps/FortreeCity_House2/map.json2
-rw-r--r--data/maps/LavaridgeTown_House/map.json2
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreRooftop/map.json2
-rw-r--r--data/maps/MauvilleCity/map.json2
-rw-r--r--data/maps/MossdeepCity/map.json2
-rw-r--r--data/maps/PacifidlogTown_PokemonCenter_1F/map.json2
-rw-r--r--data/maps/SlateportCity_PokemonFanClub/map.json2
-rw-r--r--data/maps/SootopolisCity_PokemonCenter_1F/map.json2
-rw-r--r--data/maps/VerdanturfTown_PokemonCenter_1F/map.json2
-rw-r--r--data/scripts/move_tutors.inc317
-rw-r--r--data/specials.inc2
-rw-r--r--data/text/move_tutors.inc82
-rw-r--r--include/constants/party_menu.h52
-rw-r--r--include/party_menu.h59
-rwxr-xr-xsrc/party_menu.c2
18 files changed, 263 insertions, 274 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index ca51379c2..730788a66 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -22,6 +22,7 @@
#include "constants/maps.h"
#include "constants/metatile_labels.h"
#include "constants/moves.h"
+#include "constants/party_menu.h"
#include "constants/pokemon.h"
#include "constants/script_menu.h"
#include "constants/secret_bases.h"
diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc
index 82b04023f..854a1d360 100644
--- a/data/maps/BattleFrontier_Lounge7/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge7/scripts.inc
@@ -265,7 +265,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696
fadescreen 1
special CloseBattlePointsWindow
special CloseBattleFrontierTutorWindow
- special sub_81B892C
+ special OpenPartyMenuForMoveTutor
waitstate
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_Lounge7_EventScript_265645
diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json
index 9248eec87..60b0be26a 100644
--- a/data/maps/FallarborTown_Mart/map.json
+++ b/data/maps/FallarborTown_Mart/map.json
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FallarborTown_Mart_EventScript_2C80B6",
+ "script": "FallarborTown_Mart_EventScript_MetronomeTutor",
"flag": "0"
}
],
diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json
index 17f928fe9..492590c6c 100644
--- a/data/maps/FortreeCity_House2/map.json
+++ b/data/maps/FortreeCity_House2/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FortreeCity_House2_EventScript_2C811E",
+ "script": "FortreeCity_House2_EventScript_SleepTalkTutor",
"flag": "0"
}
],
diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json
index a0cd74f59..83416a7c0 100644
--- a/data/maps/LavaridgeTown_House/map.json
+++ b/data/maps/LavaridgeTown_House/map.json
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LavaridgeTown_House_EventScript_2C804E",
+ "script": "LavaridgeTown_House_EventScript_MimicTutor",
"flag": "0"
}
],
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
index 7514a548a..06159b81a 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186",
+ "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor",
"flag": "0"
}
],
diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json
index 4163f4d9d..d5dc8ae99 100644
--- a/data/maps/MauvilleCity/map.json
+++ b/data/maps/MauvilleCity/map.json
@@ -162,7 +162,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_EventScript_2C7F7E",
+ "script": "MauvilleCity_EventScript_RolloutTutor",
"flag": "0"
},
{
diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json
index db24a9b3b..580b4ca62 100644
--- a/data/maps/MossdeepCity/map.json
+++ b/data/maps/MossdeepCity/map.json
@@ -222,7 +222,7 @@
"movement_range_y": 3,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MossdeepCity_EventScript_2C81EE",
+ "script": "MossdeepCity_EventScript_DynamicPunchTutor",
"flag": "0"
},
{
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
index 690243277..83fdd1f79 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE",
+ "script": "PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor",
"flag": "0"
}
],
diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json
index 045a0c315..faf7e7db2 100644
--- a/data/maps/SlateportCity_PokemonFanClub/map.json
+++ b/data/maps/SlateportCity_PokemonFanClub/map.json
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "SlateportCity_PokemonFanClub_EventScript_2C7F16",
+ "script": "SlateportCity_PokemonFanClub_EventScript_SwaggerTutor",
"flag": "0"
}
],
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json
index 90a8dcdad..a2307dc10 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "SootopolisCity_PokemonCenter_1F_EventScript_2C8256",
+ "script": "SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor",
"flag": "0"
}
],
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
index f9df06d33..c437aeece 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6",
+ "script": "VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor",
"flag": "0"
}
],
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/specials.inc b/data/specials.inc
index 6a328ca9e..2c5cc28ce 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -485,7 +485,7 @@ gSpecials:: @ 81DBA64
def_special BufferBattleFrontierTutorMoveName
def_special CloseBattleFrontierTutorWindow
def_special sub_813ADD4
- def_special sub_81B892C
+ def_special OpenPartyMenuForMoveTutor
def_special GetBattleFrontierTutorMoveIndex
def_special sub_813AF48
def_special DoDeoxysRockInteraction
diff --git a/data/text/move_tutors.inc b/data/text/move_tutors.inc
index 6f3910b80..baadad73d 100644
--- a/data/text/move_tutors.inc
+++ b/data/text/move_tutors.inc
@@ -1,8 +1,8 @@
-MauvilleCity_Text_2C6E05: @ 82C6E05
+MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce: @ 82C6E05
.string "This move can be learned only\n"
.string "once. Is that okay?$"
-SlateportCity_PokemonFanClub_Text_2C6E37: @ 82C6E37
+MoveTutor_Text_SwaggerTeach: @ 82C6E37
.string "Heh! My POKéMON totally rules!\n"
.string "It's cooler than any POKéMON!\p"
.string "I was lipping off with a swagger in\n"
@@ -12,19 +12,19 @@ SlateportCity_PokemonFanClub_Text_2C6E37: @ 82C6E37
.string "If you'd like, I'll teach the move\n"
.string "SWAGGER to a POKéMON of yours.$"
-SlateportCity_PokemonFanClub_Text_2C6F33: @ 82C6F33
+MoveTutor_Text_SwaggerDeclined: @ 82C6F33
.string "What, no? Can't you get into\n"
.string "the spirit of things?$"
-SlateportCity_PokemonFanClub_Text_2C6F66: @ 82C6F66
+MoveTutor_Text_SwaggerWhichMon: @ 82C6F66
.string "All right, which POKéMON wants to\n"
.string "learn how to SWAGGER?$"
-SlateportCity_PokemonFanClub_Text_2C6F9E: @ 82C6F9E
+MoveTutor_Text_SwaggerTaught: @ 82C6F9E
.string "I'll just praise my POKéMON from now\n"
.string "on without the swagger.$"
-MauvilleCity_Text_2C6FDB: @ 82C6FDB
+MoveTutor_Text_RolloutTeach: @ 82C6FDB
.string "Did you know that you can go from\n"
.string "here a long way in that direction\l"
.string "without changing direction?\p"
@@ -35,19 +35,19 @@ MauvilleCity_Text_2C6FDB: @ 82C6FDB
.string "I can teach one the move ROLLOUT\n"
.string "if you'd like.$"
-MauvilleCity_Text_2C70C4: @ 82C70C4
+MoveTutor_Text_RolloutDeclined: @ 82C70C4
.string "You don't need to be shy about it.\n"
.string "Let's roll!$"
-MauvilleCity_Text_2C70F3: @ 82C70F3
+MoveTutor_Text_RolloutWhichMon: @ 82C70F3
.string "Ehehe, sure thing! It'd be great if\n"
.string "the POKéMON looked like me.$"
-MauvilleCity_Text_2C7133: @ 82C7133
+MoveTutor_Text_RolloutTaught: @ 82C7133
.string "Rolling around in the grass makes me\n"
.string "happy. Come on, let's roll!$"
-VerdanturfTown_PokemonCenter_1F_Text_2C7174: @ 82C7174
+MoveTutor_Text_FuryCutterTeach: @ 82C7174
.string "There's a move that gets stronger\n"
.string "when you keep using it in a row.\p"
.string "It's a BUG-type move, and it is\n"
@@ -55,18 +55,18 @@ VerdanturfTown_PokemonCenter_1F_Text_2C7174: @ 82C7174
.string "It's called FURY CUTTER.\n"
.string "Want me to teach it to a POKéMON?$"
-VerdanturfTown_PokemonCenter_1F_Text_2C7221: @ 82C7221
+MoveTutor_Text_FuryCutterDeclined: @ 82C7221
.string "We're not on the same wavelength.$"
-VerdanturfTown_PokemonCenter_1F_Text_2C7243: @ 82C7243
+MoveTutor_Text_FuryCutterWhichMon: @ 82C7243
.string "Yay!\n"
.string "Show me which POKéMON I should teach.$"
-VerdanturfTown_PokemonCenter_1F_Text_2C726E: @ 82C726E
+MoveTutor_Text_FuryCutterTaught: @ 82C726E
.string "I get a thrill watching to see if\n"
.string "the move keeps hitting in succession!$"
-LavaridgeTown_House_Text_2C72B6: @ 82C72B6
+MoveTutor_MimicTeach: @ 82C72B6
.string "Ah, young one!\p"
.string "I am also a young one, but I mimic\n"
.string "the styles and speech of the elderly\l"
@@ -75,21 +75,21 @@ LavaridgeTown_House_Text_2C72B6: @ 82C72B6
.string "Would you agree to it if I were to\l"
.string "offer to teach the move MIMIC?$"
-LavaridgeTown_House_Text_2C737F: @ 82C737F
+MoveTutor_MimicDeclined: @ 82C737F
.string "Oh, boo! I wanted to teach MIMIC\n"
.string "to your POKéMON!$"
-LavaridgeTown_House_Text_2C73B1: @ 82C73B1
+MoveTutor_Text_MimicWhichMon: @ 82C73B1
.string "Fwofwo! And so I shall!\n"
.string "Let me see the POKéMON\l"
.string "you wish me to teach.$"
-LavaridgeTown_House_Text_2C73F6: @ 82C73F6
+MoveTutor_Text_MimicTaught: @ 82C73F6
.string "MIMIC is a move of great depth.\p"
.string "Could you execute it to perfection\n"
.string "as well as me…?$"
-FallarborTown_Mart_Text_2C7449: @ 82C7449
+MoveTutor_Text_MetronomeTeach: @ 82C7449
.string "I want all sorts of things!\n"
.string "But I used up my allowance…\p"
.string "Wouldn't it be nice if there were\n"
@@ -100,22 +100,22 @@ FallarborTown_Mart_Text_2C7449: @ 82C7449
.string "Money won't appear, but your POKéMON\n"
.string "will waggle a finger. Yes?$"
-FallarborTown_Mart_Text_2C7556: @ 82C7556
+MoveTutor_Text_MetronomeDeclined: @ 82C7556
.string "Okay. I'll be here if you change\n"
.string "your mind.$"
-FallarborTown_Mart_Text_2C7582: @ 82C7582
+MoveTutor_Text_MetronomeWhichMon: @ 82C7582
.string "Okay! I'll teach it!\n"
.string "Which POKéMON should I teach?$"
-FallarborTown_Mart_Text_2C75B5: @ 82C75B5
+MoveTutor_Text_MetronomeTaught: @ 82C75B5
.string "When a POKéMON waggles its finger\n"
.string "like a METRONOME, all sorts of nice\l"
.string "things happen.\p"
.string "Wouldn't it be nice if we could\n"
.string "use it, too?$"
-FortreeCity_House2_Text_2C7637: @ 82C7637
+MoveTutor_Text_SleepTalkTeach: @ 82C7637
.string "Humph! My wife relies on HIDDEN\n"
.string "POWER to stay awake.\p"
.string "She should just take a nap like I do,\n"
@@ -123,21 +123,21 @@ FortreeCity_House2_Text_2C7637: @ 82C7637
.string "I can teach your POKéMON how to\n"
.string "SLEEP TALK instead. Interested?$"
-FortreeCity_House2_Text_2C76E2: @ 82C76E2
+MoveTutor_Text_SleepTalkDeclined: @ 82C76E2
.string "Oh, fine, fine. You want to stay awake\n"
.string "with HIDDEN POWER, too…$"
-FortreeCity_House2_Text_2C7721: @ 82C7721
+MoveTutor_Text_SleepTalkWhichMon: @ 82C7721
.string "Ah, an appreciative child!\n"
.string "Which POKéMON should I teach?$"
-FortreeCity_House2_Text_2C775A: @ 82C775A
+MoveTutor_Text_SleepTalkTaught: @ 82C775A
.string "I've never once gotten my wife's\n"
.string "coin trick right.\p"
.string "I would be happy if I got it right\n"
.string "even as I SLEEP TALK…$"
-LilycoveCity_DepartmentStoreRooftop_Text_2C77C6: @ 82C77C6
+MoveTutor_Text_SubstituteTeach: @ 82C77C6
.string "When I see the wide world from up\n"
.string "here on the roof…\p"
.string "I think about how nice it would be\n"
@@ -148,22 +148,22 @@ LilycoveCity_DepartmentStoreRooftop_Text_2C77C6: @ 82C77C6
.string "I know! Would you be interested in\n"
.string "having a POKéMON learn SUBSTITUTE?$"
-LilycoveCity_DepartmentStoreRooftop_Text_2C78D1: @ 82C78D1
+MoveTutor_Text_SubstituteDeclined: @ 82C78D1
.string "Oh, no?\p"
.string "A POKéMON can make a copy of\n"
.string "itself using it, you know.$"
-LilycoveCity_DepartmentStoreRooftop_Text_2C7911: @ 82C7911
+MoveTutor_Text_SubstituteWhichMon: @ 82C7911
.string "Giggle…\n"
.string "Which POKéMON do you want me to\l"
.string "teach SUBSTITUTE?$"
-LilycoveCity_DepartmentStoreRooftop_Text_2C794B: @ 82C794B
+MoveTutor_Text_SubstituteTaught: @ 82C794B
.string "We human beings should enjoy our\n"
.string "own lives to the utmost!\p"
.string "I hope you'll get that way, too!$"
-MossdeepCity_Text_2C79A6: @ 82C79A6
+MoveTutor_Text_DynamicPunchTeach: @ 82C79A6
.string "I can't do this anymore!\p"
.string "It's utterly hopeless!\p"
.string "I'm a FIGHTING-type TRAINER,\n"
@@ -176,19 +176,19 @@ MossdeepCity_Text_2C79A6: @ 82C79A6
.string "Or do you want me to teach your\n"
.string "POKéMON DYNAMICPUNCH?$"
-MossdeepCity_Text_2C7AD4: @ 82C7AD4
+MoveTutor_Text_DynamicPunchDeclined: @ 82C7AD4
.string "Darn! You're even making fun of me?\n"
.string "Punch! Punch! Punch!$"
-MossdeepCity_Text_2C7B0D: @ 82C7B0D
+MoveTutor_Text_DynamicPunchWhichMon: @ 82C7B0D
.string "What? You do? You're a good person!\n"
.string "Which POKéMON should I teach?$"
-MossdeepCity_Text_2C7B4F: @ 82C7B4F
+MoveTutor_Text_DynamicPunchTaught: @ 82C7B4F
.string "I want you to win at the MOSSDEEP GYM\n"
.string "using that DYNAMICPUNCH!$"
-SootopolisCity_PokemonCenter_1F_Text_2C7B8E: @ 82C7B8E
+MoveTutor_Text_DoubleEdgeTeach: @ 82C7B8E
.string "Sigh…\p"
.string "SOOTOPOLIS's GYM LEADER is really\n"
.string "lovably admirable.\p"
@@ -199,19 +199,19 @@ SootopolisCity_PokemonCenter_1F_Text_2C7B8E: @ 82C7B8E
.string "Please, let me teach your POKéMON\n"
.string "the move DOUBLE-EDGE!$"
-SootopolisCity_PokemonCenter_1F_Text_2C7C7E: @ 82C7C7E
+MoveTutor_Text_DoubleEdgeDeclined: @ 82C7C7E
.string "Oh…\n"
.string "Even you rejected me…$"
-SootopolisCity_PokemonCenter_1F_Text_2C7C98: @ 82C7C98
+MoveTutor_Text_DoubleEdgeWhichMon: @ 82C7C98
.string "Okay, which POKéMON should I teach\n"
.string "DOUBLE-EDGE?$"
-SootopolisCity_PokemonCenter_1F_Text_2C7CC8: @ 82C7CC8
+MoveTutor_Text_DoubleEdgeTaught: @ 82C7CC8
.string "I won't live for love anymore!\n"
.string "I'll become tough!$"
-PacifidlogTown_PokemonCenter_1F_Text_2C7CFA: @ 82C7CFA
+MoveTutor_Text_ExplosionTeach: @ 82C7CFA
.string "I don't intend to be going nowhere\n"
.string "fast in the sticks like this forever.\p"
.string "You watch me, I'll get out to the city\n"
@@ -221,15 +221,15 @@ PacifidlogTown_PokemonCenter_1F_Text_2C7CFA: @ 82C7CFA
.string "If you overheard that, I'll happily\n"
.string "teach EXPLOSION to your POKéMON!$"
-PacifidlogTown_PokemonCenter_1F_Text_2C7E04: @ 82C7E04
+MoveTutor_Text_ExplosionDeclined: @ 82C7E04
.string "Gaah! You're turning me down because\n"
.string "I live in the country?$"
-PacifidlogTown_PokemonCenter_1F_Text_2C7E40: @ 82C7E40
+MoveTutor_Text_ExplosionWhichMon: @ 82C7E40
.string "Fine! An EXPLOSION it is!\n"
.string "Which POKéMON wants to blow up?$"
-PacifidlogTown_PokemonCenter_1F_Text_2C7E7A: @ 82C7E7A
+MoveTutor_Text_ExplosionTaught: @ 82C7E7A
.string "For a long time, I've taught POKéMON\n"
.string "how to use EXPLOSION, but I've yet\l"
.string "to ignite my own EXPLOSION…\p"
diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h
new file mode 100644
index 000000000..213263b47
--- /dev/null
+++ b/include/constants/party_menu.h
@@ -0,0 +1,52 @@
+#ifndef GUARD_CONSTANTS_PARTY_MENU_H
+#define GUARD_CONSTANTS_PARTY_MENU_H
+
+#define AILMENT_NONE 0
+#define AILMENT_PSN 1
+#define AILMENT_PRZ 2
+#define AILMENT_SLP 3
+#define AILMENT_FRZ 4
+#define AILMENT_BRN 5
+#define AILMENT_PKRS 6
+#define AILMENT_FNT 7
+
+#define PARTY_CHOOSE_MON 0
+#define PARTY_MUST_CHOOSE_MON 1
+#define PARTY_CANT_SWITCH 2
+#define PARTY_USE_ITEM_ON 3
+#define PARTY_ABILITY_PREVENTS 4
+#define PARTY_GIVE_ITEM 5
+
+#define TUTOR_MOVE_MEGA_PUNCH 0
+#define TUTOR_MOVE_SWORDS_DANCE 1
+#define TUTOR_MOVE_MEGA_KICK 2
+#define TUTOR_MOVE_BODY_SLAM 3
+#define TUTOR_MOVE_DOUBLE_EDGE 4
+#define TUTOR_MOVE_COUNTER 5
+#define TUTOR_MOVE_SEISMIC_TOSS 6
+#define TUTOR_MOVE_MIMIC 7
+#define TUTOR_MOVE_METRONOME 8
+#define TUTOR_MOVE_SOFT_BOILED 9
+#define TUTOR_MOVE_DREAM_EATER 10
+#define TUTOR_MOVE_THUNDER_WAVE 11
+#define TUTOR_MOVE_EXPLOSION 12
+#define TUTOR_MOVE_ROCK_SLIDE 13
+#define TUTOR_MOVE_SUBSTITUTE 14
+#define TUTOR_MOVE_DYNAMIC_PUNCH 15
+#define TUTOR_MOVE_ROLLOUT 16
+#define TUTOR_MOVE_PSYCH_UP 17
+#define TUTOR_MOVE_SNORE 18
+#define TUTOR_MOVE_ICY_WIND 19
+#define TUTOR_MOVE_ENDURE 20
+#define TUTOR_MOVE_MUD_SLAP 21
+#define TUTOR_MOVE_ICE_PUNCH 22
+#define TUTOR_MOVE_SWAGGER 23
+#define TUTOR_MOVE_SLEEP_TALK 24
+#define TUTOR_MOVE_SWIFT 25
+#define TUTOR_MOVE_DEFENSE_CURL 26
+#define TUTOR_MOVE_THUNDER_PUNCH 27
+#define TUTOR_MOVE_FIRE_PUNCH 28
+#define TUTOR_MOVE_FURY_CUTTER 29
+#define TUTOR_MOVE_COUNT 30
+
+#endif // GUARD_CONSTANTS_PARTY_MENU_H
diff --git a/include/party_menu.h b/include/party_menu.h
index d76e50788..84b6c1ad8 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -4,62 +4,7 @@
#include "main.h"
#include "task.h"
-enum
-{
- AILMENT_NONE,
- AILMENT_PSN,
- AILMENT_PRZ,
- AILMENT_SLP,
- AILMENT_FRZ,
- AILMENT_BRN,
- AILMENT_PKRS,
- AILMENT_FNT
-};
-
-enum
-{
- PARTY_CHOOSE_MON,
- PARTY_MUST_CHOOSE_MON,
- PARTY_CANT_SWITCH,
- PARTY_USE_ITEM_ON,
- PARTY_ABILITY_PREVENTS,
- PARTY_GIVE_ITEM,
-};
-
-enum
-{
- TUTOR_MOVE_MEGA_PUNCH,
- TUTOR_MOVE_SWORDS_DANCE,
- TUTOR_MOVE_MEGA_KICK,
- TUTOR_MOVE_BODY_SLAM,
- TUTOR_MOVE_DOUBLE_EDGE,
- TUTOR_MOVE_COUNTER,
- TUTOR_MOVE_SEISMIC_TOSS,
- TUTOR_MOVE_MIMIC,
- TUTOR_MOVE_METRONOME,
- TUTOR_MOVE_SOFT_BOILED,
- TUTOR_MOVE_DREAM_EATER,
- TUTOR_MOVE_THUNDER_WAVE,
- TUTOR_MOVE_EXPLOSION,
- TUTOR_MOVE_ROCK_SLIDE,
- TUTOR_MOVE_SUBSTITUTE,
- TUTOR_MOVE_DYNAMIC_PUNCH,
- TUTOR_MOVE_ROLLOUT,
- TUTOR_MOVE_PSYCH_UP,
- TUTOR_MOVE_SNORE,
- TUTOR_MOVE_ICY_WIND,
- TUTOR_MOVE_ENDURE,
- TUTOR_MOVE_MUD_SLAP,
- TUTOR_MOVE_ICE_PUNCH,
- TUTOR_MOVE_SWAGGER,
- TUTOR_MOVE_SLEEP_TALK,
- TUTOR_MOVE_SWIFT,
- TUTOR_MOVE_DEFENSE_CURL,
- TUTOR_MOVE_THUNDER_PUNCH,
- TUTOR_MOVE_FIRE_PUNCH,
- TUTOR_MOVE_FURY_CUTTER,
- TUTOR_MOVE_COUNT
-};
+#include "constants/party_menu.h"
struct Struct203CEC8
{
@@ -123,7 +68,7 @@ void sub_81B8448(void);
void InitChooseHalfPartyForBattle(u8 unused);
void sub_81B8558(void);
void sub_81B8904(u8 initArg, MainCallback callback);
-void sub_81B892C(void);
+void OpenPartyMenuForMoveTutor(void);
void sub_81B8958(void);
void OpenPartyMenuInBattle(u8 arg);
void sub_81B89F0(void);
diff --git a/src/party_menu.c b/src/party_menu.c
index b3938ef2a..03c013f39 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -6756,7 +6756,7 @@ void sub_81B8904(u8 initArg, MainCallback callback)
InitPartyMenu(initArg, 0, 0, 0, 0, sub_81B1370, callback);
}
-void sub_81B892C(void)
+void OpenPartyMenuForMoveTutor(void)
{
InitPartyMenu(0, 0, 12, 0, 4, sub_81B1370, CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 16:09:01 +0000