summaryrefslogtreecommitdiff
path: root/src/battle_controller_player_partner.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-10-08 16:50:52 -0400
committerGriffinR <griffin.g.richards@gmail.com>2021-10-09 03:01:10 -0400
commitd8e65fc4b669fb0115615299b1255723e9f8397d (patch)
treebdc93d89ccb0b453a1294f3a24e2e8a82030e256 /src/battle_controller_player_partner.c
parent31b501e7eb6ba15602dd13f6a2d728fca9f04ca5 (diff)
More battle doc, add battle window ids
Diffstat (limited to 'src/battle_controller_player_partner.c')
-rw-r--r--src/battle_controller_player_partner.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index d1d23099a..d07f2763a 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -27,7 +27,6 @@
#include "constants/songs.h"
#include "constants/trainers.h"
-// this file's functions
static void PlayerPartnerHandleGetMonData(void);
static void PlayerPartnerHandleGetRawMonData(void);
static void PlayerPartnerHandleSetMonData(void);
@@ -300,7 +299,7 @@ static void CompleteOnHealthbarDone(void)
static void CompleteOnInactiveTextPrinter(void)
{
- if (!IsTextPrinterActive(0))
+ if (!IsTextPrinterActive(B_WIN_MSG))
PlayerPartnerBufferExecCompleted();
}
@@ -497,7 +496,7 @@ static void FreeMonSpriteAfterSwitchOutAnim(void)
static void CompleteOnInactiveTextPrinter2(void)
{
- if (!IsTextPrinterActive(0))
+ if (!IsTextPrinterActive(B_WIN_MSG))
PlayerPartnerBufferExecCompleted();
}
@@ -1491,7 +1490,7 @@ static void PlayerPartnerHandlePrintString(void)
gBattle_BG0_Y = 0;
stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
BufferStringBattle(*stringId);
- BattlePutTextOnWindow(gDisplayedStringBattle, 0);
+ BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2;
}