diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-19 08:09:17 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-19 08:09:17 -0400 |
commit | 934a7e7a5d2074e9f80294ac8f538a2b038061b1 (patch) | |
tree | 0e2859b1814453bba70a514b3cee23e776a6a9f9 /src/battle_controller_link_partner.c | |
parent | 164590e37d67a385bf6479aafcbe5b351891bc0b (diff) | |
parent | e1900efe1ead0e3344ca95a327b453617c807b6a (diff) |
Merge pull request #1516 from GriffinRichards/doc-miscbattle
Miscellaneous battle documentation
Diffstat (limited to 'src/battle_controller_link_partner.c')
-rw-r--r-- | src/battle_controller_link_partner.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 07101c682..a9240b0ac 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -29,7 +29,6 @@ #include "constants/trainers.h" #include "recorded_battle.h" -// this file's functions static void LinkPartnerHandleGetMonData(void); static void LinkPartnerHandleGetRawMonData(void); static void LinkPartnerHandleSetMonData(void); @@ -313,7 +312,7 @@ static void FreeMonSpriteAfterSwitchOutAnim(void) static void CompleteOnInactiveTextPrinter(void) { - if (!IsTextPrinterActive(0)) + if (!IsTextPrinterActive(B_WIN_MSG)) LinkPartnerBufferExecCompleted(); } @@ -443,7 +442,7 @@ static void LinkPartnerHandleGetMonData(void) monToCheck >>= 1; } } - BtlController_EmitDataTransfer(1, size, monData); + BtlController_EmitDataTransfer(BUFFER_B, size, monData); LinkPartnerBufferExecCompleted(); } @@ -1301,7 +1300,7 @@ static void LinkPartnerHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; BattleTv_SetDataBasedOnString(*stringId); } |