diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-29 03:00:08 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-29 03:09:24 +0800 |
commit | 4b5195c9cb7afa4f7fd45d5381b258a0e7ee17cf (patch) | |
tree | 7c64a1fe5ceeeef620e7e35adc75f021108aed5e /src/help_system.c | |
parent | 2bd15329e07a23d3515dc1c9c9e5d8f75d3be429 (diff) | |
parent | 6c0fd9884cfa7eca6c2b2f0394efea1140d0feb1 (diff) |
Merge branch 'master' into battle
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] ); } |