diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
| commit | 32153295edc1e93bd27894f75f2ab01f9140bed5 (patch) | |
| tree | 397bb2852fbacc95b66a2b121c0a7eeb31c5c44d /data | |
| parent | e78f49f1efc2eadb674d00c00ffc9a4018b3cdbd (diff) | |
| parent | 242af849cb56ce0c4469c4e2be82a3ad5dbd3434 (diff) | |
Merge remote-tracking branch 'upstream/master' into decompile_battle_2
Diffstat (limited to 'data')
| -rw-r--r-- | data/field_weather.s (renamed from data/field_screeneffect.s) | 0 | ||||
| -rw-r--r-- | data/specials.inc | 12 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/field_screeneffect.s b/data/field_weather.s index 836bfbe99..836bfbe99 100644 --- a/data/field_screeneffect.s +++ b/data/field_weather.s diff --git a/data/specials.inc b/data/specials.inc index 941fd12a8..bac45b91b 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -38,7 +38,7 @@ gSpecials:: .4byte sub_8083820 .4byte sub_8083614 .4byte GetLinkPartnerNames - .4byte sub_810DB28 + .4byte SpawnBerryBlenderLinkPlayerSprites .4byte SavePlayerParty .4byte LoadPlayerParty .4byte sub_80C5568 @@ -139,14 +139,14 @@ gSpecials:: .4byte sub_80C4C78 .4byte sub_80C4D50 .4byte ShowContestWinner - .4byte sub_810DCCC - .4byte sub_810DC7C + .4byte MauvilleGymSpecial2 + .4byte MauvilleGymSpecial1 .4byte ShowFieldMessageStringVar4 .4byte DrawWholeMapView .4byte StorePlayerCoordsInVars - .4byte sub_810DEDC - .4byte sub_810E070 - .4byte sub_810E230 + .4byte MauvilleGymSpecial3 + .4byte PetalburgGymSpecial1 + .4byte PetalburgGymSpecial2 .4byte GetPlayerTrainerIdOnesDigit .4byte GetPlayerBigGuyGirlString .4byte GetRivalSonDaughterString |