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/communication_error.c | |
| parent | d789398ef7fc5a2955199ac4f87be40b90182405 (diff) | |
| parent | d08722a7381c4c05a40ee59bb6de556616e1dfc2 (diff) | |
Merge branch 'master' into unk_02006D98
Diffstat (limited to 'arm9/src/communication_error.c')
| -rw-r--r-- | arm9/src/communication_error.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arm9/src/communication_error.c b/arm9/src/communication_error.c index 0ea26458..848e3d0a 100644 --- a/arm9/src/communication_error.c +++ b/arm9/src/communication_error.c @@ -6,11 +6,9 @@ #include "msgdata.h" #include "msgdata/msg.naix" #include "text.h" +#include "brightness.h" +#include "render_window.h" -extern void FUN_02002ED0(enum GFBgLayer layer, u32 base_addr, u32 heap_id); -extern void FUN_0200A274(fx32 brightness, fx32, u32); -extern void FUN_0200CB00(struct BgConfig* bg_config, enum GFBgLayer layer, u32 num_tiles, u32, u8, u32 heap_id); -extern void FUN_0200CCA4(struct Window* window, BOOL copy_to_vram, u16 fill_value, u32 palette_num); extern void FUN_0200E394(BOOL set_brightness_on_bottom_screen); extern void FUN_0200E3A0(BOOL set_brightness_on_bottom_screen, s32); @@ -108,7 +106,7 @@ THUMB_FUNC void ShowCommunicationError(u32 heap_id, u32 error, u32 error_code) SetKeyRepeatTimers(4, 8); - gMain.unk65 = 0; + gMain.screensFlipped = 0; GX_SwapDisplay(); reg_G2_BLDCNT = 0; @@ -137,7 +135,7 @@ THUMB_FUNC void ShowCommunicationError(u32 heap_id, u32 error, u32 error_code) AddWindow(bg_config, &window, &sCommunicationErrorWindowTemplate); FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); - FUN_0200CCA4(&window, FALSE, 0x01F7, 2); + DrawFrameAndWindow1(&window, FALSE, 0x01F7, 2); BufferIntegerAsString(mgr, 0, (s32)error_code, 5, 2, 1); ReadMsgDataIntoString(error_message_data, error_message_no, tmp_str); @@ -150,7 +148,7 @@ THUMB_FUNC void ShowCommunicationError(u32 heap_id, u32 error, u32 error_code) GX_BothDispOn(); FUN_0200E394(PM_LCD_TOP); FUN_0200E394(PM_LCD_BOTTOM); - FUN_0200A274(0, 0x3F, 3); + SetBrightness(0, 0x3F, 3); RemoveWindow(&window); DestroyMsgData(error_message_data); |