Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-04-25 07:19:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync pc_transfer

Browse Source
This commit is contained in:
GriffinR 2020-01-17 14:08:46 -05:00
parent ad643af58a
commit 3101657e97
12 changed files with 116 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
data/event_scripts.s
View File

@ -1005,43 +1005,7 @@ Text_1A5CD3:: @ 81A5CD3
Text_TheDoorIsOpen:: @ 81A5CDF
.string "The door is open…$"
Text_1A5CF1:: @ 81A5CF1
.string "{STR_VAR_2} was transferred to\n"
.string "Someone's PC.\p"
.string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$"
Text_1A5D31:: @ 81A5D31
.string "{STR_VAR_2} was transferred to\n"
.string "BILL'S PC.\p"
.string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$"
Text_1A5D6E:: @ 81A5D6E
.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}.”$"
Text_1A5DB1:: @ 81A5DB1
.string "BOX “{STR_VAR_3}” on\n"
.string "BILL'S PC was full.\p"
.string "{STR_VAR_2} was transferred to\n"
.string "BOX “{STR_VAR_1}.”$"
Text_1A5DF1:: @ 81A5DF1
.string "{PLAYER} obtained\n"
.string "the {STR_VAR_1}!$"
Text_1A5E05:: @ 81A5E05
.string "ポケモンを　もちきれないので\n"
.string "パソコンの　ボックス“{STR_VAR_1}”　に\l"
.string "{STR_VAR_2}を　てんそうした！$"
Text_NoMoreRoomForPokemon:: @ 81A5E31
.string "There's no more room for POKéMON!\p"
.string "The POKéMON BOXES are full and\n"
.string "can't accept any more!$"
.include "data/text/pc_transfer.inc"
Text_1A5E89:: @ 81A5E89
.string "First, you should restore your\n"
@ -1618,53 +1582,7 @@ EventScript_1A80FE:: @ 81A80FE
end
.include "data/scripts/silphco_doors.inc"
EventScript_1A8C27:: @ 81A8C27
getpartysize
subvar VAR_RESULT, 1
copyvar VAR_0x8004, VAR_RESULT
return
EventScript_1A8C33:: @ 81A8C33
fadescreen FADE_TO_BLACK
special ChangeBoxPokemonNickname
waitstate
lock
faceplayer
return
EventScript_1A8C3C:: @ 81A8C3C
bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
getspeciesname 1, VAR_TEMP_1
call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C57
call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_1A8C82
return
EventScript_1A8C57:: @ 81A8C57
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A8C70
msgbox Text_1A5CF1
return
EventScript_1A8C70:: @ 81A8C70
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
msgbox Text_1A5D6E
return
EventScript_1A8C82:: @ 81A8C82
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, TRUE
goto_if_eq EventScript_1A8C9B
msgbox Text_1A5D31
return
EventScript_1A8C9B:: @ 81A8C9B
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
msgbox Text_1A5DB1
return
.include "data/scripts/pc_transfer.inc"
EventScript_GetInGameTradeSpeciesInfo:: @ 81A8CAD
copyvar VAR_0x8004, VAR_0x8008

6
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
View File

@ -29,7 +29,7 @@ EventScript_16C4A6:: @ 816C4A6
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16C514
call EventScript_1A8C27
call EventScript_GetGiftMonPartySlot
call EventScript_ChangePokemonNickname
goto EventScript_16C514
end
@ -44,12 +44,12 @@ EventScript_16C4DA:: @ 816C4DA
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16C509
call EventScript_1A8C33
call EventScript_NameReceivedBoxMon
goto EventScript_16C509
end
EventScript_16C509:: @ 816C509
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_16C514
end

8
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
View File

@ -215,7 +215,7 @@ EventScript_16CDB3:: @ 816CDB3
updatecoinsbox 0, 5
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
message Text_1A5DF1
message Text_PlayerObtainedTheMon
waitmessage
waitfanfare
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
@ -229,18 +229,18 @@ EventScript_16CDE0:: @ 816CDE0
updatecoinsbox 0, 5
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
message Text_1A5DF1
message Text_PlayerObtainedTheMon
waitmessage
waitfanfare
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16CE12
call EventScript_1A8C33
call EventScript_NameReceivedBoxMon
goto EventScript_16CE12
end
EventScript_16CE12:: @ 816CE12
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_16CC10
end

6
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
View File

@ -263,7 +263,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E827:: @ 816E827
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E895
call EventScript_1A8C27
call EventScript_GetGiftMonPartySlot
call EventScript_ChangePokemonNickname
goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E895
end
@ -278,12 +278,12 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E85B:: @ 816E85B
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E88A
call EventScript_1A8C33
call EventScript_NameReceivedBoxMon
goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E88A
end
CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E88A:: @ 816E88A
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E895
end

6
data/maps/Route4_PokemonCenter_1F/scripts.inc
View File

@ -62,7 +62,7 @@ EventScript_16F7F6:: @ 816F7F6
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16F861
call EventScript_1A8C27
call EventScript_GetGiftMonPartySlot
fadescreen FADE_TO_BLACK
hidemoneybox 0, 0
special ChangePokemonNickname
@ -85,12 +85,12 @@ EventScript_16F822:: @ 816F822
end
EventScript_16F84B:: @ 816F84B
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_16F861
end
EventScript_16F856:: @ 816F856
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_16F86A
end

6
data/maps/SaffronCity_Dojo/scripts.inc
View File

@ -79,7 +79,7 @@ EventScript_16ECB5:: @ 816ECB5
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16ED29
call EventScript_1A8C27
call EventScript_GetGiftMonPartySlot
call EventScript_ChangePokemonNickname
goto EventScript_16ED29
end
@ -95,12 +95,12 @@ EventScript_16ECEC:: @ 816ECEC
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16ED1E
call EventScript_1A8C33
call EventScript_NameReceivedBoxMon
goto EventScript_16ED1E
end
EventScript_16ED1E:: @ 816ED1E
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_16ED29
end

6
data/maps/SilphCo_7F/scripts.inc
View File

@ -150,7 +150,7 @@ EventScript_161B12:: @ 8161B12
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_161B7E
call EventScript_1A8C27
call EventScript_GetGiftMonPartySlot
call EventScript_ChangePokemonNickname
goto EventScript_161B7E
@ -167,14 +167,14 @@ EventScript_161B45:: @ 8161B45
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_161B73
call EventScript_1A8C33
call EventScript_NameReceivedBoxMon
goto EventScript_161B73
EventScript_161B72:: @ 8161B72
end
EventScript_161B73:: @ 8161B73
call EventScript_1A8C3C
call EventScript_TransferredToPC
goto EventScript_161B7E
EventScript_161B7D:: @ 8161B7D

8
data/naming_screen.s
View File

@ -16,10 +16,10 @@ gUnknown_83E1980:: @ 83E1980
.incbin "graphics/interface/naming_screen_83E1980.4bpp"
gUnknown_83E2280:: @ 83E2280
.4byte Text_1A5CF1
.4byte Text_1A5D31
.4byte Text_1A5D6E
.4byte Text_1A5DB1
.4byte Text_MonSentToBoxInSomeonesPC
.4byte Text_MonSentToBoxInBillsPC
.4byte Text_MonSentToBoxSomeonesBoxFull
.4byte Text_MonSentToBoxBillsBoxFull
gUnknown_83E2290:: @ 83E2290
.4byte 0x000001e0

46
data/scripts/pc_transfer.inc Normal file
View File

@ -0,0 +1,46 @@
EventScript_GetGiftMonPartySlot:: @ 81A8C27
getpartysize
subvar VAR_RESULT, 1
copyvar VAR_0x8004, VAR_RESULT
return
EventScript_NameReceivedBoxMon:: @ 81A8C33
fadescreen FADE_TO_BLACK
special ChangeBoxPokemonNickname
waitstate
lock
faceplayer
return
EventScript_TransferredToPC:: @ 81A8C3C
bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
getspeciesname 1, VAR_TEMP_1
call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_TransferredSomeonesPC
call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_TransferredBillsPC
return
EventScript_TransferredSomeonesPC:: @ 81A8C57
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, TRUE
goto_if_eq EventScript_TransferredSomeonesPCBoxFull
msgbox Text_MonSentToBoxInSomeonesPC
return
EventScript_TransferredSomeonesPCBoxFull:: @ 81A8C70
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
msgbox Text_MonSentToBoxSomeonesBoxFull
return
EventScript_TransferredBillsPC:: @ 81A8C82
specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
compare VAR_RESULT, TRUE
goto_if_eq EventScript_TransferredBillsPCBoxFull
msgbox Text_MonSentToBoxInBillsPC
return
EventScript_TransferredBillsPCBoxFull:: @ 81A8C9B
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
msgbox Text_MonSentToBoxBillsBoxFull
return

37
data/text/pc_transfer.inc Normal file
View File

@ -0,0 +1,37 @@
Text_MonSentToBoxInSomeonesPC:: @ 81A5CF1
.string "{STR_VAR_2} was transferred to\n"
.string "Someone's PC.\p"
.string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$"
Text_MonSentToBoxInBillsPC:: @ 81A5D31
.string "{STR_VAR_2} was transferred to\n"
.string "BILL'S PC.\p"
.string "It was placed in \n"
.string "BOX “{STR_VAR_1}.”$"
Text_MonSentToBoxSomeonesBoxFull:: @ 81A5D6E
.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}.”$"
Text_MonSentToBoxBillsBoxFull:: @ 81A5DB1
.string "BOX “{STR_VAR_3}” on\n"
.string "BILL'S PC was full.\p"
.string "{STR_VAR_2} was transferred to\n"
.string "BOX “{STR_VAR_1}.”$"
Text_PlayerObtainedTheMon:: @ 81A5DF1
.string "{PLAYER} obtained\n"
.string "the {STR_VAR_1}!$"
Text_1A5E05:: @ 81A5E05
.string "ポケモンを　もちきれないので\n"
.string "パソコンの　ボックス“{STR_VAR_1}”　に\l"
.string "{STR_VAR_2}を　てんそうした！$"
Text_NoMoreRoomForPokemon:: @ 81A5E31
.string "There's no more room for POKéMON!\p"
.string "The POKéMON BOXES are full and\n"
.string "can't accept any more!$"

8
include/event_scripts.h
View File

@ -1190,9 +1190,9 @@ extern const u8 EventScript_PC[];
extern const u8 EventScript_RepelWoreOff[];
// battle_message
extern const u8 Text_1A5CF1[];
extern const u8 Text_1A5D31[];
extern const u8 Text_1A5D6E[];
extern const u8 Text_1A5DB1[];
extern const u8 Text_MonSentToBoxInSomeonesPC[];
extern const u8 Text_MonSentToBoxInBillsPC[];
extern const u8 Text_MonSentToBoxSomeonesBoxFull[];
extern const u8 Text_MonSentToBoxBillsBoxFull[];
#endif //GUARD_EVENT_SCRIPTS_H

8
src/battle_message.c
View File

@ -872,10 +872,10 @@ const u8 *const gBattleStringsTable[] = {
gUnknown_83FDDEB,
gUnknown_83FB484,
gUnknown_83FB4BE,
Text_1A5CF1,
Text_1A5D31,
Text_1A5D6E,
Text_1A5DB1,
Text_MonSentToBoxInSomeonesPC,
Text_MonSentToBoxInBillsPC,
Text_MonSentToBoxSomeonesBoxFull,
Text_MonSentToBoxBillsBoxFull,
sText_PokeDudeUsedItem,
gUnknown_83FDA4D,
gUnknown_83FDA7A,