diff options
| author | yenatch <yenatch@gmail.com> | 2015-09-09 16:02:55 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-09-09 16:02:55 -0400 |
| commit | cc0d5d4c8bb9721f8ab0354d87c8f6d848dbe23b (patch) | |
| tree | 2ab9e19e9f85d1894b42cb93dd969fa57327b0ed /engine | |
| parent | c432709715df83f5cd063fd5b14684389e037e15 (diff) | |
| parent | 0d4c2776d927e5d3162d9a4430fc82f35bf50be5 (diff) | |
Merge pull request #312 from JimB16/master
Added comments and changed labels (mainly for BattleTower)
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/predef.asm | 2 | ||||
| -rw-r--r-- | engine/specials.asm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/predef.asm b/engine/predef.asm index 22e323246..9ee46bf47 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -39,7 +39,7 @@ PredefPointers:: ; 856b add_predef Functiond88c add_predef Functionda96 add_predef Functiondb3f ; $8 - add_predef Functionde6e + add_predef SentPkmnIntoBox add_predef GiveEgg add_predef Functionc6e0 add_predef Functione167 diff --git a/engine/specials.asm b/engine/specials.asm index 409b47434..5a10090ec 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -142,9 +142,9 @@ SpecialsPointers:: ; c029 add_special Function170215 add_special Function1704e1 add_special Function17021d - add_special Function170b44 + add_special Function_LoadOpponentTrainerAndPokemonsWithOTSprite add_special Function11ba38 - add_special Function170bd3 + add_special SpecialCheckForBattleTowerRules add_special Function117656 add_special Reset add_special Function1011f1 @@ -156,7 +156,7 @@ SpecialsPointers:: ; c029 add_special Function11c1ab add_special Function170687 add_special Special_DisplayUnownWords - add_special Function17d224 + add_special Special_Menu_ChallengeExplanationCancel add_special Function17d2b6 add_special Function17d2ce add_special Function17f53d |