diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-31 13:30:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-31 13:30:40 -0400 |
commit | 3e60a7840653e50845abf10bb02cd1b519dcd80f (patch) | |
tree | cb4a0d227a238ebdeb3b6cb9fdb92781bcc4f5e7 /data/scripts/pc_transfer.inc | |
parent | 602855ea99d8015ef5b7709f6fb1e9fd167239e2 (diff) | |
parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) |
Merge branch 'master' into doc-frontierpass2
Diffstat (limited to 'data/scripts/pc_transfer.inc')
-rw-r--r-- | data/scripts/pc_transfer.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc index ec58b26f1..1fe575d55 100644 --- a/data/scripts/pc_transfer.inc +++ b/data/scripts/pc_transfer.inc @@ -1,11 +1,11 @@ @ VAR_0x8004 here is used by ChangePokemonNickname -Common_EventScript_GetGiftMonPartySlot:: @ 827378B +Common_EventScript_GetGiftMonPartySlot:: getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT return -Common_EventScript_NameReceivedBoxMon:: @ 8273797 +Common_EventScript_NameReceivedBoxMon:: fadescreen FADE_TO_BLACK special ChangeBoxPokemonNickname waitstate @@ -13,40 +13,40 @@ Common_EventScript_NameReceivedBoxMon:: @ 8273797 faceplayer return -Common_EventScript_TransferredToPC:: @ 82737A0 +Common_EventScript_TransferredToPC:: bufferboxname 0, VAR_PC_BOX_TO_SEND_MON bufferspeciesname 1, VAR_TEMP_1 call_if_unset FLAG_SYS_PC_LANETTE, EventScript_TransferredSomeonesPC call_if_set FLAG_SYS_PC_LANETTE, EventScript_TransferredLanettesPC return -EventScript_TransferredSomeonesPC:: @ 82737BB +EventScript_TransferredSomeonesPC:: specialvar VAR_RESULT, ShouldShowBoxWasFullMessage compare VAR_RESULT, 1 goto_if_eq EventScript_SomeonesPCBoxFull msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT return -EventScript_SomeonesPCBoxFull:: @ 82737D4 +EventScript_SomeonesPCBoxFull:: specialvar VAR_RESULT, GetPCBoxToSendMon bufferboxname 2, VAR_RESULT msgbox gText_PkmnTransferredSomeonesPCBoxFull, MSGBOX_DEFAULT return -EventScript_TransferredLanettesPC:: @ 82737E6 +EventScript_TransferredLanettesPC:: specialvar VAR_RESULT, ShouldShowBoxWasFullMessage compare VAR_RESULT, TRUE goto_if_eq EventScript_LanettesPCBoxFull msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT return -EventScript_LanettesPCBoxFull:: @ 82737FF +EventScript_LanettesPCBoxFull:: specialvar VAR_RESULT, GetPCBoxToSendMon bufferboxname 2, VAR_RESULT msgbox gText_PkmnTransferredLanettesPCBoxFull, MSGBOX_DEFAULT return -Common_EventScript_NoMoreRoomForPokemon:: @ 8273811 +Common_EventScript_NoMoreRoomForPokemon:: msgbox gText_NoMoreRoomForPokemon, MSGBOX_DEFAULT release end |