diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
| commit | ecee02816d475f012dd4eec8a59b9ad3ba9ab531 (patch) | |
| tree | 5eb0cdad91aeba20866a731033d76add878c3ec4 /data/specials.inc | |
| parent | 7dcb614cca6d61c5e51960826dddc004858ed9f1 (diff) | |
| parent | 6ef96717181dfa1cda548cbe405410aba065e41c (diff) | |
Merge with master
Diffstat (limited to 'data/specials.inc')
| -rw-r--r-- | data/specials.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/specials.inc b/data/specials.inc index ab8bb59ab..318d272d5 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -34,7 +34,7 @@ gSpecials:: @ 81DBA64 def_special sub_8129708 def_special sub_80E91F8 def_special sub_80EA30C - def_special sub_80FA57C + def_special DoSecretBasePCTurnOffEffect def_special sub_80E6BE8 def_special sub_80B2DA4 def_special sub_80B2E4C @@ -105,7 +105,7 @@ gSpecials:: @ 81DBA64 def_special GiveMonArtistRibbon def_special sub_80B3000 def_special SaveGame - def_special sub_80FAFF8 + def_special DoWateringBerryTreeAnim def_special easy_chat_input_maybe def_special sub_811EECC def_special ScrSpecial_GetCurrentMauvilleMan @@ -163,7 +163,7 @@ gSpecials:: @ 81DBA64 def_special GetRivalSonDaughterString def_special SetFlagInVar def_special CableCarWarp - def_special sub_814FC9C + def_special CableCar def_special Overworld_PlaySpecialMapMusic def_special StartWallClock def_special Special_ViewWallClock @@ -286,8 +286,8 @@ gSpecials:: @ 81DBA64 def_special GameClear def_special ShakeScreenInElevator def_special nullsub_55 - def_special SpawnScriptEventObject - def_special RemoveScriptEventObject + def_special SpawnCameraObject + def_special RemoveCameraObject def_special GetPokeblockNameByMonNature def_special GetSecretBaseNearbyMapName def_special CheckRelicanthWailord @@ -317,7 +317,7 @@ gSpecials:: @ 81DBA64 def_special ScriptCheckFreePokemonStorageSpace def_special DoSealedChamberShakingEffect1 def_special sub_8139B60 - def_special sub_80FAC78 + def_special GetShieldToyTVDecorationInfo def_special IsPokerusInParty def_special SetSootopolisGymCrackedIceMetatiles def_special sub_8139560 |