summaryrefslogtreecommitdiff
path: root/include/battle_message.h
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-03-18 15:25:46 -0400
committerGitHub <noreply@github.com>2021-03-18 15:25:46 -0400
commited16a7409ae9c808a110975dec1930f9f949a6d6 (patch)
tree662be8b474b9c50264fc49262cbaf21769479516 /include/battle_message.h
parent5075067ecd8718ab96a063946662c71fe3ef5369 (diff)
parentc5aa5d37229e5692355e4b3979b6cafbcad7caee (diff)
Merge pull request #403 from PikalaxALT/battle_multi_buffer
Battle documentation (14032021)
Diffstat (limited to 'include/battle_message.h')
-rw-r--r--include/battle_message.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/battle_message.h b/include/battle_message.h
index 5a16a4250..04c5b1839 100644
--- a/include/battle_message.h
+++ b/include/battle_message.h
@@ -199,7 +199,7 @@ struct BattleMsgData
u16 lastItem;
u8 lastAbility;
u8 scrActive;
- u8 unk1605E;
+ u8 bakScriptPartyIdx;
u8 hpScale;
u8 itemEffectBattler;
u8 moveType;
@@ -213,8 +213,8 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
void BattleHandleAddTextPrinter(const u8* text, u8 arg1);
void SetPpNumbersPaletteInMoveSelection(void);
u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
-void BattlePutTextOnWindow(const u8* text, u8 arg1);
-bool8 sub_80D89B0(u16);
+void BattlePutTextOnWindow(const u8* text, u8 windowId_flags);
+bool8 BattleStringShouldBeColored(u16);
extern struct BattleMsgData *gBattleMsgDataPtr;