diff options
| author | Garak <garakmon@gmail.com> | 2018-08-08 12:19:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 12:19:07 -0400 |
| commit | 4ebe2448a4dff2e36ca3c11496c68bcf3767b6cc (patch) | |
| tree | c19885fa4e4801de0f777efe1adfe7db34893a44 /data/specials.inc | |
| parent | 67242f5d0fae1c573d74117b3ce3cf9bef48489e (diff) | |
| parent | fce8a1b817d2033d2203c341dfa12d1115f564ca (diff) | |
Merge pull request #11 from pret/master
merge with source repo
Diffstat (limited to 'data/specials.inc')
| -rw-r--r-- | data/specials.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/specials.inc b/data/specials.inc index 7983c71af..db77f74a9 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -203,7 +203,7 @@ gSpecials:: def_special TakePokemonFromDaycare def_special ScriptHatchMon def_special EggHatch - def_special sub_8042B4C + def_special DaycareMonReceivedMail def_special ShowLinkBattleRecords def_special HasEnoughMoneyFor def_special PayMoneyFor @@ -240,7 +240,7 @@ gSpecials:: def_special UpdateCyclingRoadState def_special GetLeadMonFriendshipScore def_special sub_8134548 - def_special sub_81347F8 + def_special ChooseNextBattleTowerTrainer def_special CheckPartyBattleTowerBanlist def_special PrintBattleTowerTrainerGreeting def_special PrintEReaderTrainerGreeting |