diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-07 19:31:33 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-07 19:31:33 -0500 |
| commit | 03f8d0d6ce48a302a21d7ef99eed9825800a6394 (patch) | |
| tree | cb0240ef6e2468ee49730a3b620d440e5e88d4bc /src/egg_hatch.c | |
| parent | 4a903279df847024148b823990a317e79bc23c9f (diff) | |
| parent | 250538fcae79e4d11c6efb4f4bfb34080f72bd48 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu
Diffstat (limited to 'src/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index e8f22e903..5a2fe5ca2 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -41,7 +41,7 @@ struct EggHatchData u8 unused_9; u8 unused_A; u16 species; - struct TextColor textColor; + u8 textColor[3]; }; extern struct SpriteTemplate gUnknown_0202499C; @@ -863,10 +863,10 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed) { FillWindowPixelBuffer(windowId, 0xFF); - sEggHatchData->textColor.fgColor = 0; - sEggHatchData->textColor.bgColor = 5; - sEggHatchData->textColor.shadowColor = 6; - AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, &sEggHatchData->textColor, speed, string); + sEggHatchData->textColor[0] = 0; + sEggHatchData->textColor[1] = 5; + sEggHatchData->textColor[2] = 6; + AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, sEggHatchData->textColor, speed, string); } u8 GetEggStepsToSubtract(void) |