diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:14:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:19:52 -0500 |
| commit | 6b2d0ae841f5a7ff851d462b12f09eac998d2d8f (patch) | |
| tree | 280e64b26f9b525606de02701f0c9a768301c4d2 /engine/predef.asm | |
| parent | 010b450834bd595b961582aea5e5771632510ef9 (diff) | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
Fix merge conflicts
Diffstat (limited to 'engine/predef.asm')
| -rw-r--r-- | engine/predef.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/predef.asm b/engine/predef.asm index 748d14c49..9fa26875a 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -38,11 +38,11 @@ PredefPointers:: ; 856b add_predef FillPP add_predef TryAddMonToParty add_predef Functionda96 - add_predef Functiondb3f ; $8 + add_predef SentGetPkmnIntoFromBox add_predef SentPkmnIntoBox add_predef GiveEgg add_predef Functionc6e0 - add_predef Functione167 + add_predef CalcPkmnStats add_predef Functione17b add_predef CanLearnTMHMMove add_predef GetTMHMMove @@ -50,7 +50,7 @@ PredefPointers:: ; 856b add_predef PrintMoveDesc add_predef UpdatePlayerHUD add_predef FillBox - add_predef Function3d873 + add_predef CheckPlayerPartyForFitPkmn add_predef UpdateEnemyHUD add_predef StartBattle add_predef FillInExpBar @@ -61,7 +61,7 @@ PredefPointers:: ; 856b add_predef Function421e6 add_predef Function28f63 add_predef Function28f24 - add_predef Function5084a + add_predef CopyPkmnToTempMon add_predef ListMoves ; $20 add_predef Function50d2e add_predef Function50cdb |