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/diploma.c | |
| parent | 2bd15329e07a23d3515dc1c9c9e5d8f75d3be429 (diff) | |
| parent | 6c0fd9884cfa7eca6c2b2f0394efea1140d0feb1 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/diploma.c')
| -rw-r--r-- | src/diploma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/diploma.c b/src/diploma.c index 7fa140430..afb22400b 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -52,7 +52,7 @@ static const u8 gUnknown_84159B3[] = _("{HIGHLIGHT TRANSPARENT}　　　　　ムstatic const u8 gUnknown_84159ED[] = _("{COLOR RED}{HIGHLIGHT TRANSPARENT}ゲームフリーク"); static const u8 gUnknown_84159FB[] = _("{COLOR RED}{HIGHLIGHT TRANSPARENT}"); -static const ALIGNED(4) struct TextColor gUnknown_8415A04 = {0, 2, 3}; +static const ALIGNED(4) u8 gUnknown_8415A04[3] = {0, 2, 3}; static const struct BgTemplate gUnknown_8415A08[] = { { @@ -276,10 +276,10 @@ static void DiplomaPrintText(void) FillWindowPixelBuffer(0, 0); DynamicPlaceholderTextUtil_ExpandPlaceholders(arr, gUnknown_841B60E); width = GetStringWidth(2, arr, -1); - AddTextPrinterParameterized3(0, 2, 0x78 - (width / 2), 4, &gUnknown_8415A04, -1, arr); + AddTextPrinterParameterized3(0, 2, 0x78 - (width / 2), 4, gUnknown_8415A04, -1, arr); DynamicPlaceholderTextUtil_ExpandPlaceholders(arr, gUnknown_841B619); width = GetStringWidth(2, arr, -1); - AddTextPrinterParameterized3(0, 0x2, 0x78 - (width / 2), 0x1E, &gUnknown_8415A04, -1, arr); - AddTextPrinterParameterized3(0, 0x2, 0x78, 0x69, &gUnknown_8415A04, 0, gUnknown_841B684); + AddTextPrinterParameterized3(0, 0x2, 0x78 - (width / 2), 0x1E, gUnknown_8415A04, -1, arr); + AddTextPrinterParameterized3(0, 0x2, 0x78, 0x69, gUnknown_8415A04, 0, gUnknown_841B684); PutWindowTilemap(0); } |