diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-08-22 15:10:58 +0200 |
|---|---|---|
| committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-08-22 15:10:58 +0200 |
| commit | 23071e67d75ab4a52d68ef4fdecd090215216506 (patch) | |
| tree | 49b432bf55bddacbcfb5112668cb69323c22d824 /arm9/src/error_message_reset.c | |
| parent | d789398ef7fc5a2955199ac4f87be40b90182405 (diff) | |
| parent | d08722a7381c4c05a40ee59bb6de556616e1dfc2 (diff) | |
Merge branch 'master' into unk_02006D98
Diffstat (limited to 'arm9/src/error_message_reset.c')
| -rw-r--r-- | arm9/src/error_message_reset.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index d49e8e51..12af3c6f 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -6,6 +6,8 @@ #include "bg_window.h" #include "PAD_pad.h" #include "font.h" +#include "brightness.h" +#include "render_window.h" const struct WindowTemplate UNK_020FF49C = { @@ -43,10 +45,7 @@ const struct GraphicsBanks UNK_020FF4D8 = { .bg = 3 }; u32 sErrorMessagePrinterLock; extern void FUN_0200E3A0(PMLCDTarget, int); -extern void FUN_0200CB00(struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5); -extern void FUN_0200CCA4(struct Window *param0, u32 param1, u32 param2, u32 param3); extern void FUN_0200E394(u32 param0); -extern void FUN_0200A274(u32 param0, u32 param1, u32 param2); THUMB_FUNC void VBlankHandler() { @@ -85,7 +84,7 @@ THUMB_FUNC void PrintErrorMessageAndReset() SetKeyRepeatTimers(4, 8); - gMain.unk65 = 0; + gMain.screensFlipped = 0; GX_SwapDisplay(); G2_BlendNone(); @@ -114,7 +113,7 @@ THUMB_FUNC void PrintErrorMessageAndReset() FUN_0201BD5C(); AddWindow(ptr, &buf, &UNK_020FF49C); FillWindowPixelRect(&buf, 15, 0, 0, 0xd0, 0x90); - FUN_0200CCA4(&buf, 0, 0x1f7, 2); + DrawFrameAndWindow1(&buf, 0, 0x1f7, 2); ReadMsgDataIntoString(msg_data, 3, str); @@ -124,7 +123,7 @@ THUMB_FUNC void PrintErrorMessageAndReset() GX_BothDispOn(); FUN_0200E394(0); FUN_0200E394(1); - FUN_0200A274(0, 0x3f, 3); + SetBrightness(0, 0x3f, 3); FUN_02032DAC(); while (1) |