dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+3 -3
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
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+4 -4
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
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+3 -3
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
data/maps/Route4_PokemonCenter_1F/scripts.inc
+3 -3
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
data/maps/SaffronCity_Dojo/scripts.inc
+3 -3
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
data/maps/SilphCo_7F/scripts.inc
+3 -3
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