diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-22 23:30:41 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-22 23:30:41 +0100 |
| commit | adb4927504784f101a327c07425a7d05d00c2602 (patch) | |
| tree | 00c5646fc6c2b206836f71143bf7441de2c98433 /include/global.h | |
| parent | 6dffa6d17c35fe13f5878bd7bbf8a3fe1054c20c (diff) | |
| parent | ebbe826133661d3faabc17f9167fa565b405514a (diff) | |
Merge with master
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h index e3792ac56..090ba7ce4 100644 --- a/include/global.h +++ b/include/global.h @@ -872,15 +872,15 @@ typedef union // 3b58 struct WaldaPhrase { - u16 field_0; - u16 field_2; + u16 colors[2]; // Background, foreground. u8 text[16]; u8 iconId; u8 patternId; bool8 patternUnlocked; }; -struct UnkSaveSubstruct_3b98 { +struct UnkSaveSubstruct_3b98 +{ u32 trainerId; u8 trainerName[PLAYER_NAME_LENGTH + 1]; }; |