diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-08-27 13:19:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-27 13:19:16 -0500 |
| commit | 3d9ef5ea2c6c1ba173c17e98d91044926167bf6a (patch) | |
| tree | 0279b0c58f40bf27cf40c7e175aa671c9a6fde00 /src/battle_message.c | |
| parent | d58e89a51850a38bf6ae332736bdedcfd62770f7 (diff) | |
| parent | df0edd693361f4f4e587a39360fd035e7cec8cda (diff) | |
Merge pull request #422 from DizzyEggg/fix_nonmatching_emits
fix emits nonmatchings and add a few labels
Diffstat (limited to 'src/battle_message.c')
| -rw-r--r-- | src/battle_message.c | 19 |
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; |