dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document pc_transfer.inc

Browse Source
This commit is contained in:
GriffinR
2019-10-22 18:07:08 -04:00
committed by huderlem
parent 9a86769847
commit ca2c6fa9b1
9 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+3 -3
View File
@@ -366,7 +366,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2 LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2
call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 call Common_EventScript_TransferredToPC
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
end end
@@ -411,7 +411,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193 LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193
call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 call Common_EventScript_TransferredToPC
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
end end
@@ -456,7 +456,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234 LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234
call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 call Common_EventScript_TransferredToPC
goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
end end
data/maps/MossdeepCity_StevensHouse/scripts.inc
+1 -1
View File
@@ -113,7 +113,7 @@ MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD
end end
MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0 MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0
call MossdeepCity_StevensHouse_EventScript_2737A0 call Common_EventScript_TransferredToPC
goto MossdeepCity_StevensHouse_EventScript_222901 goto MossdeepCity_StevensHouse_EventScript_222901
end end
data/maps/Route119_WeatherInstitute_2F/scripts.inc
+1 -1
View File
@@ -112,7 +112,7 @@ Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD
end end
Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0 Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0
call Route119_WeatherInstitute_2F_EventScript_2737A0 call Common_EventScript_TransferredToPC
goto Route119_WeatherInstitute_2F_EventScript_2700EA goto Route119_WeatherInstitute_2F_EventScript_2700EA
end end
data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+2 -2
View File
@@ -185,7 +185,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96
end end
RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9 RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9
call RustboroCity_DevonCorp_2F_EventScript_2737A0 call Common_EventScript_TransferredToPC
goto RustboroCity_DevonCorp_2F_EventScript_211AD7 goto RustboroCity_DevonCorp_2F_EventScript_211AD7
end end
@@ -234,7 +234,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39
end end
RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C
call RustboroCity_DevonCorp_2F_EventScript_2737A0 call Common_EventScript_TransferredToPC
goto RustboroCity_DevonCorp_2F_EventScript_211B7A goto RustboroCity_DevonCorp_2F_EventScript_211B7A
end end
data/scripts/pc_transfer.inc
+11 -14
View File
@@ -13,40 +13,37 @@ Common_EventScript_NameReceivedBoxMon:: @ 8273797
faceplayer faceplayer
return return
LittlerootTown_ProfessorBirchsLab_EventScript_2737A0:: @ 82737A0 Common_EventScript_TransferredToPC:: @ 82737A0
MossdeepCity_StevensHouse_EventScript_2737A0:: @ 82737A0
Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0
RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0
bufferboxname 0, VAR_PC_BOX_TO_SEND_MON bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
bufferspeciesname 1, VAR_TEMP_1 bufferspeciesname 1, VAR_TEMP_1
call_if_unset FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB call_if_unset FLAG_SYS_PC_LANETTE, EventScript_TransferredSomeonesPC
call_if_set FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6 call_if_set FLAG_SYS_PC_LANETTE, EventScript_TransferredLanettesPC
return return
LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB EventScript_TransferredSomeonesPC:: @ 82737BB
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 goto_if_eq EventScript_SomeonesPCBoxFull
msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT
return return
LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4 EventScript_SomeonesPCBoxFull:: @ 82737D4
specialvar VAR_RESULT, GetPCBoxToSendMon specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT bufferboxname 2, VAR_RESULT
msgbox gText_PkmnBoxSomeonesPCFull, MSGBOX_DEFAULT msgbox gText_PkmnTransferredSomeonesPCBoxFull, MSGBOX_DEFAULT
return return
LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6 EventScript_TransferredLanettesPC:: @ 82737E6
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF goto_if_eq EventScript_LanettesPCBoxFull
msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT
return return
LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF EventScript_LanettesPCBoxFull:: @ 82737FF
specialvar VAR_RESULT, GetPCBoxToSendMon specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT bufferboxname 2, VAR_RESULT
msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT msgbox gText_PkmnTransferredLanettesPCBoxFull, MSGBOX_DEFAULT
return return
Common_EventScript_NoMoreRoomForPokemon:: @ 8273811 Common_EventScript_NoMoreRoomForPokemon:: @ 8273811
data/text/pc_transfer.inc
+2 -2
View File
@@ -9,13 +9,13 @@ gText_PkmnTransferredLanettesPC:: @ 8273256
.string "It was placed in \n" .string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$" .string "BOX “{STR_VAR_1}.”$"
gText_PkmnBoxSomeonesPCFull:: @ 8273296 gText_PkmnTransferredSomeonesPCBoxFull:: @ 8273296
.string "BOX “{STR_VAR_3}” on\n" .string "BOX “{STR_VAR_3}” on\n"
.string "SOMEONE'S PC was full.\p" .string "SOMEONE'S PC was full.\p"
.string "{STR_VAR_2} was transferred to\n" .string "{STR_VAR_2} was transferred to\n"
.string "BOX “{STR_VAR_1}.”$" .string "BOX “{STR_VAR_1}.”$"
gText_PkmnBoxLanettesPCFull:: @ 82732D9 gText_PkmnTransferredLanettesPCBoxFull:: @ 82732D9
.string "BOX “{STR_VAR_3}” on\n" .string "BOX “{STR_VAR_3}” on\n"
.string "LANETTE'S PC was full.\p" .string "LANETTE'S PC was full.\p"
.string "{STR_VAR_2} was transferred to\n" .string "{STR_VAR_2} was transferred to\n"
include/strings.h
+2 -2
View File
@@ -2035,8 +2035,8 @@ extern const u8 gText_Confusion[];
extern const u8 gText_Love[]; extern const u8 gText_Love[];
// battle message // battle message
extern const u8 gText_PkmnBoxSomeonesPCFull[]; extern const u8 gText_PkmnTransferredSomeonesPCBoxFull[];
extern const u8 gText_PkmnBoxLanettesPCFull[]; extern const u8 gText_PkmnTransferredLanettesPCBoxFull[];
extern const u8 gText_PkmnTransferredSomeonesPC[]; extern const u8 gText_PkmnTransferredSomeonesPC[];
extern const u8 gText_PkmnTransferredLanettesPC[]; extern const u8 gText_PkmnTransferredLanettesPC[];
src/battle_message.c
+2 -2
View File
@@ -874,8 +874,8 @@ const u8 * const gBattleStringsTable[BATTLESTRINGS_COUNT] =
[STRINGID_FORFEITEDMATCH - 12] = sText_ForfeitedMatch, [STRINGID_FORFEITEDMATCH - 12] = sText_ForfeitedMatch,
[STRINGID_PKMNTRANSFERREDSOMEONESPC - 12] = gText_PkmnTransferredSomeonesPC, [STRINGID_PKMNTRANSFERREDSOMEONESPC - 12] = gText_PkmnTransferredSomeonesPC,
[STRINGID_PKMNTRANSFERREDLANETTESPC - 12] = gText_PkmnTransferredLanettesPC, [STRINGID_PKMNTRANSFERREDLANETTESPC - 12] = gText_PkmnTransferredLanettesPC,
[STRINGID_PKMNBOXSOMEONESPCFULL - 12] = gText_PkmnBoxSomeonesPCFull, [STRINGID_PKMNBOXSOMEONESPCFULL - 12] = gText_PkmnTransferredSomeonesPCBoxFull,
[STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnBoxLanettesPCFull, [STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnTransferredLanettesPCBoxFull,
[STRINGID_TRAINER1WINTEXT - 12] = sText_Trainer1WinText, [STRINGID_TRAINER1WINTEXT - 12] = sText_Trainer1WinText,
[STRINGID_TRAINER2WINTEXT - 12] = sText_Trainer2WinText, [STRINGID_TRAINER2WINTEXT - 12] = sText_Trainer2WinText,
}; };
src/naming_screen.c
+4 -8
View File
@@ -34,10 +34,6 @@ extern u16 gKeyRepeatStartDelay;
// extern text // extern text
extern const u8 gExpandedPlaceholder_Empty[]; 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_MoveOkBack[];
extern const u8 gText_YourName[]; extern const u8 gText_YourName[];
extern const u8 gText_BoxName[]; 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_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal");
static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.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_PkmnTransferredSomeonesPC,
gText_PkmnTransferredLanettesPC, gText_PkmnTransferredLanettesPC,
gText_PkmnBoxSomeonesPCFull, gText_PkmnTransferredSomeonesPCBoxFull,
gText_PkmnBoxLanettesPCFull gText_PkmnTransferredLanettesPCBoxFull
}; };
static const u8 gUnknown_0858BDC8[] = _("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!"); static const u8 gUnknown_0858BDC8[] = _("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!");
@@ -562,7 +558,7 @@ static void DisplaySentToPCMessage(void)
if (FlagGet(FLAG_SYS_PC_LANETTE)) if (FlagGet(FLAG_SYS_PC_LANETTE))
stringToDisplay++; stringToDisplay++;
StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]); StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]);
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, 0);
gTextFlags.canABSpeedUpPrint = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeedDelay(), 0, 2, 1, 3); AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeedDelay(), 0, 2, 1, 3);