diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 20:39:54 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 20:39:54 -0500 |
| commit | 335c2699f0b965be90c13bd3613b1df49f32af8b (patch) | |
| tree | 7738a0c52a558fceec0d7977843d5dede30ddae7 /data/predef_pointers.asm | |
| parent | 10173f2a6293542f8976cc5dccc9d2080a52caa7 (diff) | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# constants/map_constants.asm
# constants/wram_constants.asm
# data/radio/oaks_pkmn_talk_routes.asm
# data/radio/pnp_hidden_places.asm
# engine/battle/core.asm
# engine/breeding.asm
# engine/phone/phone_scripts.asm
# engine/radio.asm
# maps/BattleTower1F.asm
# maps/OlivineLighthouse2F.asm
# maps/OlivineLighthouse6F.asm
# maps/PokemonFanClub.asm
# maps/RadioTower1F.asm
# maps/RadioTower2F.asm
# maps/Route30BerryHouse.asm
# maps/Route34IlexForestGate.asm
# maps/Route36NationalParkGate.asm
# maps/RuinsOfAlphKabutoChamber.asm
# maps/RuinsOfAlphResearchCenter.asm
# maps/VermilionPort.asm
# maps/VictoryRoad.asm
Diffstat (limited to 'data/predef_pointers.asm')
| -rw-r--r-- | data/predef_pointers.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index 16281d035..3a14a19ee 100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm @@ -15,19 +15,19 @@ PredefPointers:: ; 856b add_predef FillPP add_predef TryAddMonToParty add_predef AddTempmonToParty - add_predef SendGetPkmnIntoFromBox - add_predef SendPkmnIntoBox + add_predef SendGetMonIntoFromBox + add_predef SendMonIntoBox add_predef GiveEgg add_predef AnimateHPBar - add_predef CalcPkmnStats - add_predef CalcPkmnStatC + add_predef CalcMonStats + add_predef CalcMonStatC add_predef CanLearnTMHMMove add_predef GetTMHMMove add_predef LinkTextboxAtHL ; $ 10 add_predef PrintMoveDesc add_predef UpdatePlayerHUD add_predef PlaceGraphic - add_predef CheckPlayerPartyForFitPkmn + add_predef CheckPlayerPartyForFitMon add_predef UpdateEnemyHUD add_predef StartBattle add_predef FillInExpBar @@ -38,7 +38,7 @@ PredefPointers:: ; 856b add_predef EvolveAfterBattle add_predef TradeAnimationPlayer2 add_predef TradeAnimation - add_predef CopyPkmnToTempMon + add_predef CopyMonToTempMon add_predef ListMoves ; $20 add_predef PlaceNonFaintStatus add_predef Unused_PlaceEnemyHPLevel |