diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-28 18:18:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 18:18:51 -0600 |
| commit | c0357cea46635ec3867d18e43b341fb7a4a2fef2 (patch) | |
| tree | ba33bf4088bb73a504d24924c609fd40d63a41ca /src/battle_controller_link_partner.c | |
| parent | bcef4e7d1c20bad3d4631c5a8314a8de8da80e49 (diff) | |
| parent | 20baa1bc7a8cdf7ba5e88384b26b352e0f488afa (diff) | |
Merge pull request #222 from DizzyEggg/decompile_battle_link_817C95C
Decompile battle_tv previously known as battle_link_817C95C
Diffstat (limited to 'src/battle_controller_link_partner.c')
| -rw-r--r-- | src/battle_controller_link_partner.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index b74cb859f..6ca50dc5c 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -6,7 +6,7 @@ #include "battle_anim.h" #include "constants/battle_anim.h" #include "battle_ai_script_commands.h" -#include "battle_link_817C95C.h" +#include "battle_tv.h" #include "pokemon.h" #include "link.h" #include "util.h" @@ -1237,7 +1237,7 @@ static void LinkPartnerHandleMoveAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; gBattlerControllerFuncs[gActiveBattler] = LinkPartnerDoMoveAnimation; - sub_817E0FC(move, gWeatherMoveAnim, gAnimDisableStructPtr); + BattleTv_SetDataBasedOnMove(move, gWeatherMoveAnim, gAnimDisableStructPtr); } } } @@ -1301,7 +1301,7 @@ static void LinkPartnerHandlePrintString(void) BufferStringBattle(*stringId); BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; - sub_817C95C(*stringId); + BattleTv_SetDataBasedOnString(*stringId); } static void LinkPartnerHandlePrintSelectionString(void) @@ -1665,7 +1665,7 @@ static void LinkPartnerHandleBattleAnimation(void) else gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation; - sub_817E32C(animationId); + BattleTv_SetDataBasedOnAnimation(animationId); } } |