diff options
author | tgsm <doodrabbit@hotmail.com> | 2021-08-20 16:49:35 -0400 |
---|---|---|
committer | tgsm <doodrabbit@hotmail.com> | 2021-08-20 16:49:35 -0400 |
commit | f31aa875f127653e7e1fc81a3093b2d8f09aea8f (patch) | |
tree | 3c9050e3d2021ac0bd45d9e9ebbe3aed150d5a7f | |
parent | bb16d9a030161b764029628f99eb22a8834b96d5 (diff) |
Decompile unk_02089D90 -> save_data_read_error
-rw-r--r-- | arm9/arm9.lsf | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02089D90.s | 188 | ||||
-rw-r--r-- | arm9/asm/unk_02089F24.s | 24 | ||||
-rw-r--r-- | arm9/global.inc | 2 | ||||
-rw-r--r-- | arm9/src/main.c | 4 | ||||
-rw-r--r-- | arm9/src/save.c | 6 | ||||
-rw-r--r-- | arm9/src/save_data_read_error.c | 123 | ||||
-rw-r--r-- | include/save_data_read_error.h | 6 |
8 files changed, 147 insertions, 208 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 8287f133..5e9e5ba9 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -315,7 +315,7 @@ Static arm9 Object unk_020893E0.o Object unk_02089498.o Object unk_02089960.o - Object unk_02089D90.o + Object save_data_read_error.o Object unk_02089F24.o Object unk_0208A258.o Object unk_0208A300.o diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s deleted file mode 100644 index 077b7bf5..00000000 --- a/arm9/asm/unk_02089D90.s +++ /dev/null @@ -1,188 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .extern gMain - - .section .rodata - - .global UNK_020FF3E4 -UNK_020FF3E4: ; 0x020FF3E4 - .byte 0x00, 0x03, 0x03, 0x1A, 0x12, 0x01, 0x23, 0x00 - - .global UNK_020FF3EC -UNK_020FF3EC: ; 0x020FF3EC - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .global UNK_020FF3FC -UNK_020FF3FC: ; 0x020FF3FC - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .global UNK_020FF418 -UNK_020FF418: ; 0x020FF418 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .text - - thumb_func_start FUN_02089D90 -FUN_02089D90: ; 0x02089D90 - push {r3-r6, lr} - sub sp, #0x1c - add r4, r0, #0x0 - mov r0, #0x0 - add r1, r0, #0x0 - bl FUN_0200E3A0 - mov r0, #0x1 - mov r1, #0x0 - bl FUN_0200E3A0 - mov r0, #0x0 - add r1, r0, #0x0 - bl Main_SetVBlankIntrCB - mov r0, #0x0 - add r1, r0, #0x0 - bl FUN_02015F34 - bl GX_DisableEngineALayers - bl GX_DisableEngineBLayers - mov r2, #0x1 - lsl r2, r2, #0x1a - ldr r1, [r2, #0x0] - ldr r0, _02089EF4 ; =0xFFFFE0FF - and r1, r0 - str r1, [r2, #0x0] - ldr r2, _02089EF8 ; =0x04001000 - ldr r1, [r2, #0x0] - and r0, r1 - str r0, [r2, #0x0] - mov r0, #0x4 - mov r1, #0x8 - bl SetKeyRepeatTimers - ldr r0, _02089EFC ; =gMain + 0x60 - mov r1, #0x0 - strb r1, [r0, #0x5] - bl GX_SwapDisplay - ldr r3, _02089F00 ; =0x04000050 - mov r0, #0x0 - strh r0, [r3, #0x0] - ldr r2, _02089F04 ; =0x04001050 - sub r3, #0x50 - strh r0, [r2, #0x0] - ldr r1, [r3, #0x0] - ldr r0, _02089F08 ; =0xFFFF1FFF - sub r2, #0x50 - and r1, r0 - str r1, [r3, #0x0] - ldr r1, [r2, #0x0] - and r0, r1 - str r0, [r2, #0x0] - ldr r0, _02089F0C ; =UNK_020FF418 - bl GX_SetBanks - add r0, r4, #0x0 - bl BgConfig_Alloc - add r5, r0, #0x0 - ldr r0, _02089F10 ; =UNK_020FF3EC - bl SetBothScreensModesAndDisable - mov r1, #0x0 - ldr r2, _02089F14 ; =UNK_020FF3FC - add r0, r5, #0x0 - add r3, r1, #0x0 - bl InitBgFromTemplate - add r0, r5, #0x0 - mov r1, #0x0 - bl BgClearTilemapBufferAndCommit - mov r1, #0x0 - str r1, [sp, #0x0] - ldr r2, _02089F18 ; =0x000001F7 - add r0, r5, #0x0 - mov r3, #0x2 - str r4, [sp, #0x4] - bl FUN_0200CB00 - mov r0, #0x0 - mov r1, #0x20 - add r2, r4, #0x0 - bl FUN_02002ED0 - mov r0, #0x0 - mov r1, #0x20 - add r2, r0, #0x0 - add r3, r4, #0x0 - bl BG_ClearCharDataRange - ldr r1, _02089F1C ; =0x00006C21 - mov r0, #0x0 - bl BG_SetMaskColor - ldr r1, _02089F1C ; =0x00006C21 - mov r0, #0x4 - bl BG_SetMaskColor - mov r0, #0x1 - mov r1, #0x1a - mov r2, #0x5 - add r3, r4, #0x0 - bl NewMsgDataFromNarc - add r6, r0, #0x0 - mov r0, #0x6 - lsl r0, r0, #0x6 - add r1, r4, #0x0 - bl String_ctor - add r4, r0, #0x0 - bl FUN_0201BD5C - ldr r2, _02089F20 ; =UNK_020FF3E4 - add r0, r5, #0x0 - add r1, sp, #0xc - bl AddWindow - mov r0, #0xd0 - str r0, [sp, #0x0] - mov r0, #0x90 - mov r2, #0x0 - str r0, [sp, #0x4] - add r0, sp, #0xc - mov r1, #0xf - add r3, r2, #0x0 - bl FillWindowPixelRect - ldr r2, _02089F18 ; =0x000001F7 - add r0, sp, #0xc - mov r1, #0x0 - mov r3, #0x2 - bl FUN_0200CCA4 - add r0, r6, #0x0 - mov r1, #0x0 - add r2, r4, #0x0 - bl ReadMsgDataIntoString - mov r1, #0x0 - str r1, [sp, #0x0] - str r1, [sp, #0x4] - add r0, sp, #0xc - add r2, r4, #0x0 - add r3, r1, #0x0 - str r1, [sp, #0x8] - bl AddTextPrinterParameterized - add r0, r4, #0x0 - bl String_dtor - bl GX_BothDispOn - mov r0, #0x0 - bl FUN_0200E394 - mov r0, #0x1 - bl FUN_0200E394 - mov r0, #0x0 - mov r1, #0x3f - mov r2, #0x3 - bl SetBrightness - mov r4, #0x1 -_02089EE4: - bl HandleDSLidAction - add r0, r4, #0x0 - add r1, r4, #0x0 - bl OS_WaitIrq - b _02089EE4 - nop -_02089EF4: .word 0xFFFFE0FF -_02089EF8: .word 0x04001000 -_02089EFC: .word gMain + 0x60 -_02089F00: .word 0x04000050 -_02089F04: .word 0x04001050 -_02089F08: .word 0xFFFF1FFF -_02089F0C: .word UNK_020FF418 -_02089F10: .word UNK_020FF3EC -_02089F14: .word UNK_020FF3FC -_02089F18: .word 0x000001F7 -_02089F1C: .word 0x00006C21 -_02089F20: .word UNK_020FF3E4 diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s index 3fbde6cb..dd936ec8 100644 --- a/arm9/asm/unk_02089F24.s +++ b/arm9/asm/unk_02089F24.s @@ -2,10 +2,10 @@ .include "global.inc" .extern gMain - .extern UNK_020FF3E4 - .extern UNK_020FF3EC - .extern UNK_020FF3FC - .extern UNK_020FF418 + .extern gSaveDataReadErrorWindowTemplate + .extern gSaveDataReadErrorGraphicsModes + .extern gSaveDataReadErrorBgTemplate + .extern gSaveDataReadErrorGraphicsBanks .section .rodata @@ -80,15 +80,15 @@ FUN_02089F24: ; 0x02089F24 ldr r1, [r2, #0x0] and r0, r1 str r0, [r2, #0x0] - ldr r0, _0208A0A0 ; =UNK_020FF418 + ldr r0, _0208A0A0 ; =gSaveDataReadErrorGraphicsBanks bl GX_SetBanks add r0, r4, #0x0 bl BgConfig_Alloc add r5, r0, #0x0 - ldr r0, _0208A0A4 ; =UNK_020FF3EC + ldr r0, _0208A0A4 ; =gSaveDataReadErrorGraphicsModes bl SetBothScreensModesAndDisable mov r1, #0x0 - ldr r2, _0208A0A8 ; =UNK_020FF3FC + ldr r2, _0208A0A8 ; =gSaveDataReadErrorBgTemplate add r0, r5, #0x0 add r3, r1, #0x0 bl InitBgFromTemplate @@ -129,7 +129,7 @@ FUN_02089F24: ; 0x02089F24 bl String_ctor add r4, r0, #0x0 bl FUN_0201BD5C - ldr r2, _0208A0B4 ; =UNK_020FF3E4 + ldr r2, _0208A0B4 ; =gSaveDataReadErrorWindowTemplate add r0, r5, #0x0 add r1, sp, #0xc bl AddWindow @@ -184,12 +184,12 @@ _0208A090: .word gMain + 0x60 _0208A094: .word 0x04000050 _0208A098: .word 0x04001050 _0208A09C: .word 0xFFFF1FFF -_0208A0A0: .word UNK_020FF418 -_0208A0A4: .word UNK_020FF3EC -_0208A0A8: .word UNK_020FF3FC +_0208A0A0: .word gSaveDataReadErrorGraphicsBanks +_0208A0A4: .word gSaveDataReadErrorGraphicsModes +_0208A0A8: .word gSaveDataReadErrorBgTemplate _0208A0AC: .word 0x000001F7 _0208A0B0: .word 0x00006C21 -_0208A0B4: .word UNK_020FF3E4 +_0208A0B4: .word gSaveDataReadErrorWindowTemplate thumb_func_start FUN_0208A0B8 FUN_0208A0B8: ; 0x0208A0B8 diff --git a/arm9/global.inc b/arm9/global.inc index 2f9f2d11..04d457a0 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -5467,7 +5467,7 @@ .extern FUN_02089418 .extern FUN_02089444 .extern FUN_0208946C -.extern FUN_02089D90 +.extern ShowSaveDataReadError .extern FUN_02089F24 .extern FUN_0208A0B8 .extern FUN_0208A258 diff --git a/arm9/src/main.c b/arm9/src/main.c index 312d222c..3b3b0dd6 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -11,6 +11,7 @@ #include "game_init.h" #include "poke_overlay.h" #include "player_data.h" +#include "save_data_read_error.h" #include "sound.h" #include "timer3.h" #include "unk_02031734.h" @@ -32,7 +33,6 @@ struct UnkStruct_02016FA8 UNK_02016FA8; extern void FUN_02022294(void); extern void GF_InitRTCWork(void); extern int FUN_020337E8(int); -extern void FUN_02089D90(int); extern void FUN_02015E30(void); extern void FUN_0201B5CC(void *); extern void GF_RTC_UpdateOnFrame(void); @@ -72,7 +72,7 @@ THUMB_FUNC void NitroMain(void) ShowWFCUserInfoWarning(3, 0); if (FUN_020227FC(UNK_02016FA8.unk18) == 0) { - FUN_02089D90(0); + ShowSaveDataReadError(0); } else { diff --git a/arm9/src/save.c b/arm9/src/save.c index 7eb523f6..9ddb7336 100644 --- a/arm9/src/save.c +++ b/arm9/src/save.c @@ -4,6 +4,7 @@ #include "heap.h" #include "CARD_backup.h" #include "OS_spinLock.h" +#include "save_data_read_error.h" #pragma thumb on @@ -13,9 +14,6 @@ extern void FUN_02016444(u8 mask); extern void FUN_02016454(u8 mask); -// unk_02089D90.s -extern void FUN_02089D90(int); - // unk_02089F24.s extern void FUN_0208A0B8(int, int); @@ -861,7 +859,7 @@ BOOL FlashLoadChunk(u32 src, void * dest, u32 size) if (!r5) { FreeToHeap(UNK_021C59C8.ptr); - FUN_02089D90(1); + ShowSaveDataReadError(1); } return r5; } diff --git a/arm9/src/save_data_read_error.c b/arm9/src/save_data_read_error.c new file mode 100644 index 00000000..708b3a3c --- /dev/null +++ b/arm9/src/save_data_read_error.c @@ -0,0 +1,123 @@ +#include "global.h" +#include "bg_window.h" +#include "brightness.h" +#include "game_init.h" +#include "msgdata.h" +#include "msgdata/msg.naix" +#include "save_data_read_error.h" +#include "text.h" + +extern void FUN_02002ED0(enum GFBgLayer layer, u32 base_addr, u32 heap_id); +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); + +const struct WindowTemplate gSaveDataReadErrorWindowTemplate = { + .bgId = GF_BG_LYR_MAIN_0, + .tilemapLeft = 3, + .tilemapTop = 3, + .width = 26, + .height = 18, + .paletteNum = 0x01, + .baseTile = 0x23, +}; + +const struct GraphicsModes gSaveDataReadErrorGraphicsModes = { + .dispMode = GX_DISPMODE_GRAPHICS, + .bgMode = GX_BGMODE_0, + .subMode = GX_BGMODE_0, + ._2d3dMode = GX_BG0_AS_2D, +}; + +const struct BgTemplate gSaveDataReadErrorBgTemplate = { + .x = 0, + .y = 0, + .bufferSize = 0x800, + .baseTile = 0, + .size = GF_BG_SCR_SIZE_256x256, + .colorMode = GX_BG_COLORMODE_16, + .screenBase = GX_BG_SCRBASE_0x0000, + .charBase = GX_BG_CHARBASE_0x18000, + .bgExtPltt = GX_BG_EXTPLTT_01, + .priority = 1, + .areaOver = GX_BG_AREAOVER_XLU, + .unk17 = 0, + .mosaic = FALSE, +}; + +const struct GraphicsBanks gSaveDataReadErrorGraphicsBanks = { + .bg = 3, + .bgextpltt = 0, + .subbg = 0, + .subbgextpltt = 0, + .obj = 0, + .objextpltt = 0, + .subobj = 0, + .subobjextpltt = 0, + .tex = 0, + .texpltt = 0, +}; + +THUMB_FUNC void ShowSaveDataReadError(u32 heap_id) +{ + struct Window window; + + FUN_0200E3A0(PM_LCD_TOP, 0); + FUN_0200E3A0(PM_LCD_BOTTOM, 0); + + Main_SetVBlankIntrCB(NULL, NULL); + FUN_02015F34(NULL, NULL); + + GX_DisableEngineALayers(); + GX_DisableEngineBLayers(); + reg_GX_DISPCNT &= ~REG_GX_DISPCNT_DISPLAY_MASK; + reg_GXS_DB_DISPCNT &= ~REG_GX_DISPCNT_DISPLAY_MASK; + + SetKeyRepeatTimers(4, 8); + + gMain.unk65 = 0; + + GX_SwapDisplay(); + reg_G2_BLDCNT = 0; + reg_G2S_DB_BLDCNT = 0; + reg_GX_DISPCNT &= ~(REG_GX_DISPCNT_OW_MASK | REG_GX_DISPCNT_W1_MASK | REG_GX_DISPCNT_W0_MASK); + reg_GXS_DB_DISPCNT &= ~(REG_GXS_DB_DISPCNT_OW_MASK | REG_GXS_DB_DISPCNT_W1_MASK | REG_GXS_DB_DISPCNT_W0_MASK); + GX_SetBanks(&gSaveDataReadErrorGraphicsBanks); + + struct BgConfig* bg_config = BgConfig_Alloc(heap_id); + + SetBothScreensModesAndDisable(&gSaveDataReadErrorGraphicsModes); + + InitBgFromTemplate(bg_config, 0, &gSaveDataReadErrorBgTemplate, 0); + BgClearTilemapBufferAndCommit(bg_config, 0); + FUN_0200CB00(bg_config, GF_BG_LYR_MAIN_0, 0x01F7, 2, 0, heap_id); + FUN_02002ED0(GF_BG_LYR_MAIN_0, 0x20, heap_id); + BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, heap_id); + BG_SetMaskColor(GF_BG_LYR_MAIN_0, 0x6C21); + BG_SetMaskColor(GF_BG_LYR_SUB_0, 0x6C21); + + struct MsgData* msg_data = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, NARC_msg_narc_0005_bin, heap_id); + struct String* str = String_ctor(384, heap_id); + + FUN_0201BD5C(); + + AddWindow(bg_config, &window, &gSaveDataReadErrorWindowTemplate); + FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); + FUN_0200CCA4(&window, FALSE, 0x01F7, 2); + + ReadMsgDataIntoString(msg_data, 0, str); + AddTextPrinterParameterized(&window, 0, str, 0, 0, 0, NULL); + String_dtor(str); + + GX_BothDispOn(); + FUN_0200E394(PM_LCD_TOP); + FUN_0200E394(PM_LCD_BOTTOM); + SetBrightness(0, 0x3F, 3); + + while (TRUE) + { + HandleDSLidAction(); + OS_WaitIrq(TRUE, OS_IE_V_BLANK); + } +} diff --git a/include/save_data_read_error.h b/include/save_data_read_error.h new file mode 100644 index 00000000..fe78b8f0 --- /dev/null +++ b/include/save_data_read_error.h @@ -0,0 +1,6 @@ +#ifndef POKEDIAMOND_SAVE_READ_DATA_ERROR_H +#define POKEDIAMOND_SAVE_READ_DATA_ERROR_H + +void ShowSaveDataReadError(u32 heap_id); + +#endif |