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 /include | |
| 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 'include')
| -rw-r--r-- | include/battle_message.h | 15 | ||||
| -rw-r--r-- | include/rom3.h | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/include/battle_message.h b/include/battle_message.h index d115e5357..3e37a1ccd 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -1,6 +1,21 @@ #ifndef GUARD_BATTLE_MESSAGE_H #define GUARD_BATTLE_MESSAGE_H +struct StringInfoBattle +{ + 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]; +}; + void BufferStringBattle(u16 stringID); u32 StrCpyDecodeToDisplayedStringBattle(const u8* src); u32 StrCpyDecodeBattle(const u8* src, u8* dst); diff --git a/include/rom3.h b/include/rom3.h index 95ef5cca4..81bb56df1 100644 --- a/include/rom3.h +++ b/include/rom3.h @@ -10,7 +10,7 @@ void sub_800B9A8(void); void sub_800BA78(void); void sub_800BD54(void); void sub_800BF28(void); -void dp01_prepare_buffer_wireless_probably(u8 a, u16, u8 *c); +void PrepareBufferDataTransferLink(u8 a, u16, u8 *c); void sub_800C1A8(u8); void sub_800C35C(void); void sub_800C47C(u8); |