summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc6
-rw-r--r--data/maps/MossdeepCity_StevensHouse/scripts.inc2
-rw-r--r--data/maps/Route119_WeatherInstitute_2F/scripts.inc2
-rw-r--r--data/maps/RustboroCity_DevonCorp_2F/scripts.inc4
-rw-r--r--data/scripts/pc_transfer.inc25
-rw-r--r--data/text/pc_transfer.inc4
-rw-r--r--include/strings.h4
-rw-r--r--src/battle_message.c4
-rw-r--r--src/naming_screen.c12
9 files changed, 28 insertions, 35 deletions
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 283be0477..f9c4b46d7 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -366,7 +366,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC
end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2
- call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
+ call Common_EventScript_TransferredToPC
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
end
@@ -411,7 +411,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D
end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193
- call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
+ call Common_EventScript_TransferredToPC
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
end
@@ -456,7 +456,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E
end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234
- call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
+ call Common_EventScript_TransferredToPC
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
end
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 33b30e1d0..cc50ff37a 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -113,7 +113,7 @@ MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD
end
MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0
- call MossdeepCity_StevensHouse_EventScript_2737A0
+ call Common_EventScript_TransferredToPC
goto MossdeepCity_StevensHouse_EventScript_222901
end
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index ac47539c7..1e415dd41 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -112,7 +112,7 @@ Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD
end
Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0
- call Route119_WeatherInstitute_2F_EventScript_2737A0
+ call Common_EventScript_TransferredToPC
goto Route119_WeatherInstitute_2F_EventScript_2700EA
end
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index 0784f523c..acdcb9528 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -185,7 +185,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96
end
RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9
- call RustboroCity_DevonCorp_2F_EventScript_2737A0
+ call Common_EventScript_TransferredToPC
goto RustboroCity_DevonCorp_2F_EventScript_211AD7
end
@@ -234,7 +234,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39
end
RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C
- call RustboroCity_DevonCorp_2F_EventScript_2737A0
+ call Common_EventScript_TransferredToPC
goto RustboroCity_DevonCorp_2F_EventScript_211B7A
end
diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc
index 6a72eae75..594956a31 100644
--- a/data/scripts/pc_transfer.inc
+++ b/data/scripts/pc_transfer.inc
@@ -13,40 +13,37 @@ Common_EventScript_NameReceivedBoxMon:: @ 8273797
faceplayer
return
-LittlerootTown_ProfessorBirchsLab_EventScript_2737A0:: @ 82737A0
-MossdeepCity_StevensHouse_EventScript_2737A0:: @ 82737A0
-Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0
-RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0
+Common_EventScript_TransferredToPC:: @ 82737A0
bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
bufferspeciesname 1, VAR_TEMP_1
- call_if_unset FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB
- call_if_set FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6
+ call_if_unset FLAG_SYS_PC_LANETTE, EventScript_TransferredSomeonesPC
+ call_if_set FLAG_SYS_PC_LANETTE, EventScript_TransferredLanettesPC
return
-LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB
+EventScript_TransferredSomeonesPC:: @ 82737BB
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, 1
- goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4
+ goto_if_eq EventScript_SomeonesPCBoxFull
msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT
return
-LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4
+EventScript_SomeonesPCBoxFull:: @ 82737D4
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
- msgbox gText_PkmnBoxSomeonesPCFull, MSGBOX_DEFAULT
+ msgbox gText_PkmnTransferredSomeonesPCBoxFull, MSGBOX_DEFAULT
return
-LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6
+EventScript_TransferredLanettesPC:: @ 82737E6
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, 1
- goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF
+ goto_if_eq EventScript_LanettesPCBoxFull
msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT
return
-LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF
+EventScript_LanettesPCBoxFull:: @ 82737FF
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
- msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT
+ msgbox gText_PkmnTransferredLanettesPCBoxFull, MSGBOX_DEFAULT
return
Common_EventScript_NoMoreRoomForPokemon:: @ 8273811
diff --git a/data/text/pc_transfer.inc b/data/text/pc_transfer.inc
index 0f0268bb5..216e0b570 100644
--- a/data/text/pc_transfer.inc
+++ b/data/text/pc_transfer.inc
@@ -9,13 +9,13 @@ gText_PkmnTransferredLanettesPC:: @ 8273256
.string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$"
-gText_PkmnBoxSomeonesPCFull:: @ 8273296
+gText_PkmnTransferredSomeonesPCBoxFull:: @ 8273296
.string "BOX “{STR_VAR_3}” on\n"
.string "SOMEONE'S PC was full.\p"
.string "{STR_VAR_2} was transferred to\n"
.string "BOX “{STR_VAR_1}.”$"
-gText_PkmnBoxLanettesPCFull:: @ 82732D9
+gText_PkmnTransferredLanettesPCBoxFull:: @ 82732D9
.string "BOX “{STR_VAR_3}” on\n"
.string "LANETTE'S PC was full.\p"
.string "{STR_VAR_2} was transferred to\n"
diff --git a/include/strings.h b/include/strings.h
index 0b678f2f5..62bc7d5d2 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2035,8 +2035,8 @@ extern const u8 gText_Confusion[];
extern const u8 gText_Love[];
// battle message
-extern const u8 gText_PkmnBoxSomeonesPCFull[];
-extern const u8 gText_PkmnBoxLanettesPCFull[];
+extern const u8 gText_PkmnTransferredSomeonesPCBoxFull[];
+extern const u8 gText_PkmnTransferredLanettesPCBoxFull[];
extern const u8 gText_PkmnTransferredSomeonesPC[];
extern const u8 gText_PkmnTransferredLanettesPC[];
diff --git a/src/battle_message.c b/src/battle_message.c
index 22cdee0b8..80c6f583b 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -874,8 +874,8 @@ const u8 * const gBattleStringsTable[BATTLESTRINGS_COUNT] =
[STRINGID_FORFEITEDMATCH - 12] = sText_ForfeitedMatch,
[STRINGID_PKMNTRANSFERREDSOMEONESPC - 12] = gText_PkmnTransferredSomeonesPC,
[STRINGID_PKMNTRANSFERREDLANETTESPC - 12] = gText_PkmnTransferredLanettesPC,
- [STRINGID_PKMNBOXSOMEONESPCFULL - 12] = gText_PkmnBoxSomeonesPCFull,
- [STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnBoxLanettesPCFull,
+ [STRINGID_PKMNBOXSOMEONESPCFULL - 12] = gText_PkmnTransferredSomeonesPCBoxFull,
+ [STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnTransferredLanettesPCBoxFull,
[STRINGID_TRAINER1WINTEXT - 12] = sText_Trainer1WinText,
[STRINGID_TRAINER2WINTEXT - 12] = sText_Trainer2WinText,
};
diff --git a/src/naming_screen.c b/src/naming_screen.c
index cc73031aa..73eda32c8 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -34,10 +34,6 @@ extern u16 gKeyRepeatStartDelay;
// extern text
extern const u8 gExpandedPlaceholder_Empty[];
-extern const u8 gText_PkmnTransferredSomeonesPC[];
-extern const u8 gText_PkmnTransferredLanettesPC[];
-extern const u8 gText_PkmnBoxSomeonesPCFull[];
-extern const u8 gText_PkmnBoxLanettesPCFull[];
extern const u8 gText_MoveOkBack[];
extern const u8 gText_YourName[];
extern const u8 gText_BoxName[];
@@ -51,12 +47,12 @@ static const u8 gSpriteImage_858BCB8[] = INCBIN_U8("graphics/naming_screen/pc_ic
static const u16 gUnknown_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal");
static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.gbapal");
-static const u8 *const gUnknown_0858BDB8[] =
+static const u8 *const sTransferredToPCMessages[] =
{
gText_PkmnTransferredSomeonesPC,
gText_PkmnTransferredLanettesPC,
- gText_PkmnBoxSomeonesPCFull,
- gText_PkmnBoxLanettesPCFull
+ gText_PkmnTransferredSomeonesPCBoxFull,
+ gText_PkmnTransferredLanettesPCBoxFull
};
static const u8 gUnknown_0858BDC8[] = _("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!");
@@ -562,7 +558,7 @@ static void DisplaySentToPCMessage(void)
if (FlagGet(FLAG_SYS_PC_LANETTE))
stringToDisplay++;
- StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]);
+ StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]);
DrawDialogueFrame(0, 0);
gTextFlags.canABSpeedUpPrint = TRUE;
AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeedDelay(), 0, 2, 1, 3);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 20:08:10 +0000