diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2018-05-04 17:45:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 17:45:50 -0400 |
| commit | 58200616d55798002046e67a656f5295834455ec (patch) | |
| tree | 7487b983c8205a97832831b6b6b06cf60534f65a /data/scripts/cable_club.inc | |
| parent | 4acbcf5759cb2d5453631dd104e3a845931df66c (diff) | |
| parent | cdb5e9e3143b2f1086d8bd4f02a76186c164d02a (diff) | |
Merge branch 'master' into trader
Diffstat (limited to 'data/scripts/cable_club.inc')
| -rw-r--r-- | data/scripts/cable_club.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index e5b330bf3..bd633a115 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -450,8 +450,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD special HealPlayerParty - special copy_player_party_to_sav1 - special copy_bags_and_unk_data_from_save_blocks + special SavePlayerParty + special LoadPlayerBag copyvar VAR_0x4087, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 waitmessage @@ -787,9 +787,9 @@ MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360 gUnknown_08277365:: @ 8277365 lockall setvar VAR_0x8004, 0 - special sub_813C4BC + special ShowLinkBattleRecords waitbuttonpress - special sub_813C5A0 + special RemoveRecordsWindow releaseall end |