summaryrefslogtreecommitdiff
path: root/src/battle_message.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-09-30 16:41:16 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-09-30 16:41:16 -0700
commit4c5bfdc153a8484c00aae30ed22badf006d7f8d9 (patch)
tree47bfb4286c03f021d48ffadde5da675a9f903f61 /src/battle_message.c
parentaaa09d735451cced915bc6bacfce45ced8e33fa1 (diff)
parentf74d4742f597a423b7a8685d72c06597c8c78db7 (diff)
Merge remote-tracking branch 'upstream/master' into name_labels
Diffstat (limited to 'src/battle_message.c')
-rw-r--r--src/battle_message.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/src/battle_message.c b/src/battle_message.c
index 37ec14459..a3cc320ad 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -116,22 +116,7 @@ struct StatusFlagString
extern const struct StatusFlagString gUnknown_081FA6D4[7]; // status flag/text
extern const u8 gUnknown_084017A8[8]; // empty flags
-struct StringInfo
-{
- u16 currentMove;
- u16 lastMove;
- u16 lastItem;
- u8 lastAbility;
- u8 scrActive;
- u8 unk1605E;
- u8 hpScale;
- u8 StringBank;
- u8 moveType;
- u8 abilities[4];
- u8 textBuffs[3][0x10];
-};
-
-extern struct StringInfo* gSelectedOrderFromParty;
+extern struct StringInfoBattle* gSelectedOrderFromParty;
#define gStringInfo gSelectedOrderFromParty
void sub_8121D1C(u8* textBuff);
@@ -156,7 +141,7 @@ void BufferStringBattle(u16 stringID)
int i;
const u8* stringPtr = NULL;
- gStringInfo = (struct StringInfo*)(&gBattleBufferA[gActiveBank][4]);
+ gStringInfo = (struct StringInfoBattle*)(&gBattleBufferA[gActiveBank][4]);
gLastUsedItem = gStringInfo->lastItem;
gLastUsedAbility = gStringInfo->lastAbility;
BATTLE_STRUCT->scriptingActive = gStringInfo->scrActive;