diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-08-28 14:56:08 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-28 14:56:08 -0400 |
commit | 6c0fd9884cfa7eca6c2b2f0394efea1140d0feb1 (patch) | |
tree | a8743c0093dee3a30b0f4624bd690183620bc0d8 /src/help_system.c | |
parent | 634fe80e9dcaffc9b1cf622b3132e686e926e97f (diff) | |
parent | 1e8b809ff231a255837dbf711d976895354062e1 (diff) |
Merge pull request #95 from PikalaxALT/no_struct_textcolor
Eliminate `struct TextColor` definition and use
Diffstat (limited to 'src/help_system.c')
-rw-r--r-- | src/help_system.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/help_system.c b/src/help_system.c index 1fd43fffa..2d96ae9d6 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -25,7 +25,7 @@ struct HelpSystemVideoState /*0x0c*/ u16 savedBg0Hofs; /*0x0e*/ u16 savedBg0Vofs; /*0x10*/ u16 savedBldCnt; - /*0x12*/ struct TextColor savedTextColor; + /*0x12*/ u8 savedTextColor[3]; /*0x15*/ u8 state; }; @@ -171,9 +171,9 @@ void SaveMapTiles(void) void SaveMapTextColors(void) { SaveTextColors( - &sVideoState.savedTextColor.fgColor, - &sVideoState.savedTextColor.bgColor, - &sVideoState.savedTextColor.shadowColor + &sVideoState.savedTextColor[0], + &sVideoState.savedTextColor[1], + &sVideoState.savedTextColor[2] ); } @@ -200,9 +200,9 @@ void RestoreMapTiles(void) void RestoreMapTextColors(void) { RestoreTextColors( - &sVideoState.savedTextColor.fgColor, - &sVideoState.savedTextColor.bgColor, - &sVideoState.savedTextColor.shadowColor + &sVideoState.savedTextColor[0], + &sVideoState.savedTextColor[1], + &sVideoState.savedTextColor[2] ); } |