diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
| commit | 794410352fd92ccf06974763e4b3be0b807641ab (patch) | |
| tree | 05f5dd861966762db9556082229cee82e8b5eed9 /engine/predef.asm | |
| parent | 9c5473e965520f672640daf4ee76622640e0de15 (diff) | |
| parent | 4bcd71e3227181baa536357af3d87a8d02af3890 (diff) | |
Merge pull request #328 from PikalaxALT/master
Split out most of main.asm
Diffstat (limited to 'engine/predef.asm')
| -rw-r--r-- | engine/predef.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/predef.asm b/engine/predef.asm index 6079b48a4..680a6b4a0 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -37,7 +37,7 @@ PredefPointers:: ; 856b add_predef DrawPartyMenuHPBar add_predef FillPP add_predef TryAddMonToParty - add_predef Functionda96 + add_predef AddTempmonToParty add_predef SentGetPkmnIntoFromBox add_predef SentPkmnIntoBox add_predef GiveEgg @@ -46,7 +46,7 @@ PredefPointers:: ; 856b add_predef CalcPkmnStatC add_predef CanLearnTMHMMove add_predef GetTMHMMove - add_predef Function28eef ; $ 10 + add_predef Predef_LinkTextbox ; $ 10 add_predef PrintMoveDesc add_predef UpdatePlayerHUD add_predef FillBox @@ -58,9 +58,9 @@ PredefPointers:: ; 856b add_predef GetMonFrontpic add_predef LearnLevelMoves add_predef FillMoves - add_predef Function421e6 - add_predef Function28f63 - add_predef Function28f24 + add_predef EvolveAfterBattle + add_predef TradeAnimationPlayer2 + add_predef TradeAnimation add_predef CopyPkmnToTempMon add_predef ListMoves ; $20 add_predef PlaceNonFaintStatus @@ -92,12 +92,12 @@ PredefPointers:: ; 856b add_predef PartyMonItemName add_predef GetFrontpic add_predef GetBackpic - add_predef Function5108b + add_predef FrontpicPredef add_predef GetTrainerPic add_predef DecompressPredef ; $40 add_predef CheckTypeMatchup add_predef ConvertMon_1to2 - add_predef Functionfb877 + add_predef NewPokedexEntry add_predef AnimateMon_Slow_Normal add_predef PlaceStatusString add_predef LoadMonAnimation |