diff --git a/asm/main_etable.s b/asm/main_etable.s index 36e05e59be..c18c04420b 100644 --- a/asm/main_etable.s +++ b/asm/main_etable.s @@ -1,8 +1,68 @@ .include "macros/function.inc" + .extern Unk_020E4558 + .extern Unk_020E4560 + .extern Unk_020E4568 + .extern Unk_020E4570 + .extern Unk_020E4578 + .extern Unk_020E4580 + .extern Unk_020E4588 + .extern Unk_020E4590 + .extern Unk_020E45A0 + .extern Unk_020E45B4 + .extern Unk_020E45CC + .extern Unk_020E45D4 + .extern Unk_020E45E4 + .extern Unk_020E45EC + .extern Unk_020E4600 + .extern Unk_020E4608 + .extern Unk_020E4610 + .extern Unk_020E4628 + .extern Unk_020E4644 + .extern Unk_020E465C .section .exception, 4 .global Exception_Table_Index Exception_Table_Index: ; 0x020E4670 - .incbin "incbin/arm9_exception.bin", 0x118, 0x5D0 \ No newline at end of file + .incbin "incbin/arm9_exception.bin", 0x118, 0x164 + .word Unk_020E4558 + .incbin "incbin/arm9_exception.bin",0x280,0x68 + .word Unk_020E4560 + .incbin "incbin/arm9_exception.bin",0x2EC,0x2C + .word Unk_020E4568 + .incbin "incbin/arm9_exception.bin",0x31C,0x8C + .word Unk_020E4570 + .incbin "incbin/arm9_exception.bin",0x3AC,0x8 + .word Unk_020E4578 + .incbin "incbin/arm9_exception.bin",0x3B8,0x2C + .word Unk_020E4580 + .incbin "incbin/arm9_exception.bin",0x3E8,0x80 + .word Unk_020E4588 + .incbin "incbin/arm9_exception.bin",0x46C,0x2C + .word Unk_020E4590 + .incbin "incbin/arm9_exception.bin",0x49C,0x2C + .word Unk_020E45A0 + .incbin "incbin/arm9_exception.bin",0x4CC,0x68 + .word Unk_020E45B4 + .incbin "incbin/arm9_exception.bin",0x538,0x2C + .word Unk_020E45CC + .incbin "incbin/arm9_exception.bin",0x568,0x8 + .word Unk_020E45D4 + .incbin "incbin/arm9_exception.bin",0x574,0x8 + .word Unk_020E45E4 + .incbin "incbin/arm9_exception.bin",0x580,0x14 + .word Unk_020E45EC + .incbin "incbin/arm9_exception.bin",0x598,0x8 + .word Unk_020E4600 + .incbin "incbin/arm9_exception.bin",0x5A4,0x8 + .word Unk_020E4608 + .incbin "incbin/arm9_exception.bin",0x5B0,0x38 + .word Unk_020E4610 + .incbin "incbin/arm9_exception.bin",0x5EC,0x8 + .word Unk_020E4628 + .incbin "incbin/arm9_exception.bin",0x5F8,0x14 + .word Unk_020E4644 + .incbin "incbin/arm9_exception.bin",0x610,0x8 + .word Unk_020E465C + .incbin "incbin/arm9_exception.bin",0x61C,0xCC \ No newline at end of file diff --git a/asm/overlay011/ov11_0221F840.s b/asm/overlay011/ov11_0221F840.s index 0dbf32d12f..a356ff4a59 100644 --- a/asm/overlay011/ov11_0221F840.s +++ b/asm/overlay011/ov11_0221F840.s @@ -1,7 +1,8 @@ .include "macros/function.inc" .include "overlay011/ov11_0221F840.inc" - + .extern NNS_GfdDefaultFuncAllocTexVram + .extern NNS_GfdDefaultFuncAllocPlttVram .text @@ -125,7 +126,7 @@ ov11_0221F914: ; 0x0221F914 lsr r0, r0, #0xd pop {r4, pc} nop -_0221F92C: .word 0x02100DEC +_0221F92C: .word NNS_GfdDefaultFuncAllocTexVram thumb_func_end ov11_0221F914 thumb_func_start ov11_0221F930 @@ -141,5 +142,5 @@ ov11_0221F930: ; 0x0221F930 lsr r0, r0, #0xd pop {r4, pc} nop -_0221F948: .word 0x02100DF4 +_0221F948: .word NNS_GfdDefaultFuncAllocPlttVram thumb_func_end ov11_0221F930 \ No newline at end of file diff --git a/asm/overlay023/ov23_02253598.s b/asm/overlay023/ov23_02253598.s index c71c841ef3..31f267cce8 100644 --- a/asm/overlay023/ov23_02253598.s +++ b/asm/overlay023/ov23_02253598.s @@ -1,6 +1,21 @@ .include "macros/function.inc" .include "overlay023/ov23_02253598.inc" + + .extern sub_020294B8 + .extern sub_020294EC + .extern sub_02029524 + .extern sub_020295B8 + .extern sub_020295F0 + .extern sub_0202963C + .extern sub_020296CC + .extern sub_02029704 + .extern sub_0202973C + .extern sub_02029774 + .extern sub_020297AC + .extern sub_020297E4 + .extern sub_0202981C + .extern sub_020295B8 .text @@ -279,7 +294,7 @@ _02253768: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop -_022537D0: .word 0x022576EC +_022537D0: .word Unk_ov23_022576EC thumb_func_end ov23_0225360C thumb_func_start ov23_022537D4 @@ -613,7 +628,7 @@ _02253A20: bl ov23_02253F40 pop {r3, r4, r5, r6, r7, pc} nop -_02253A70: .word 0x022576EC +_02253A70: .word Unk_ov23_022576EC _02253A74: .word ov23_022539F8 thumb_func_end ov23_02253A00 @@ -941,7 +956,20 @@ _02253D36: .global Unk_ov23_022576EC Unk_ov23_022576EC: ; 0x022576EC - .incbin "incbin/overlay23_data.bin", 0xB0C, 0x38 + .word sub_020294B8 + .word sub_020294EC + .word sub_02029524 + .word sub_020295B8 + .word sub_020295F0 + .word sub_0202963C + .word sub_020296CC + .word sub_02029704 + .word sub_0202973C + .word sub_02029774 + .word sub_020297AC + .word sub_020297E4 + .word sub_0202981C + .word sub_020295B8 .bss diff --git a/asm/unk_02014D38.s b/asm/unk_02014D38.s index 2fb109f2ac..b7fbafa380 100644 --- a/asm/unk_02014D38.s +++ b/asm/unk_02014D38.s @@ -550,5 +550,16 @@ Unk_020E5522: ; 0x020E5522 .global Unk_020E5538 Unk_020E5538: ; 0x020E5538 - .incbin "incbin/arm9_rodata.bin", 0x8F8, 0x60 + .word Unk_020E54D8, 0x2 + .word Unk_020E54CC, 0x2 + .word Unk_020E54F4, 0x2 + .word Unk_020E54F8, 0x4 + .word Unk_020E54EC, 0x2 + .word Unk_020E54E8, 0x2 + .word Unk_020E54D4, 0x2 + .word Unk_020E54D0, 0x2 + .word Unk_020E54DC, 0x2 + .word Unk_020E54F0, 0x2 + .word Unk_020E54E4, 0x2 + .word Unk_020E54E0, 0x2 diff --git a/asm/unk_02024358.s b/asm/unk_02024358.s index 20efe024a6..6a4d2625a2 100644 --- a/asm/unk_02024358.s +++ b/asm/unk_02024358.s @@ -64,7 +64,7 @@ _020243C8: .word 0x027FFE00 _020243CC: .word 0x027FF000 _020243D0: .word 0x027FFA80 _020243D4: .word 0x4A414441 -_020243D8: .word 0x020E5828 +_020243D8: .word Unk_020E5828 _020243DC: .word 0x00003130 thumb_func_end sub_02024358 diff --git a/asm/unk_0208EA44.s b/asm/unk_0208EA44.s index 453922a224..09ee3445c5 100644 --- a/asm/unk_0208EA44.s +++ b/asm/unk_0208EA44.s @@ -521,7 +521,7 @@ _0208EE52: nop _0208EE90: .word 0x00000263 _0208EE94: .word 0x00000414 -_0208EE98: .word 0x020F411C +_0208EE98: .word Unk_020F411C thumb_func_end sub_0208EE3C thumb_func_start sub_0208EE9C diff --git a/asm/unk_0209C400.s b/asm/unk_0209C400.s index 0cab684611..11ad49a99a 100644 --- a/asm/unk_0209C400.s +++ b/asm/unk_0209C400.s @@ -1,7 +1,8 @@ .include "macros/function.inc" .include "include/unk_0209C400.inc" - + .extern NNS_GfdDefaultFuncAllocTexVram + .extern NNS_GfdDefaultFuncAllocPlttVram .text @@ -791,7 +792,7 @@ sub_0209CE90: ; 0x0209CE90 ldmia sp!, {lr} bx lr ; .align 2, 0 -_0209CEC0: .word 0x02100DF4 +_0209CEC0: .word NNS_GfdDefaultFuncAllocPlttVram _0209CEC4: .word 0x0000FFFF arm_func_end sub_0209CE90 @@ -810,6 +811,6 @@ sub_0209CEC8: ; 0x0209CEC8 ldmia sp!, {lr} bx lr ; .align 2, 0 -_0209CEF8: .word 0x02100DEC +_0209CEF8: .word NNS_GfdDefaultFuncAllocTexVram _0209CEFC: .word 0x0000FFFF arm_func_end sub_0209CEC8 \ No newline at end of file diff --git a/asm/unk_020A5A2C.s b/asm/unk_020A5A2C.s index f21fc6ec18..ac91309b10 100644 --- a/asm/unk_020A5A2C.s +++ b/asm/unk_020A5A2C.s @@ -22,9 +22,9 @@ FreeTexVram_: ; 0x020A5A34 .global NNS_GfdDefaultFuncAllocTexVram NNS_GfdDefaultFuncAllocTexVram: ; 0x02100DEC - .incbin "incbin/arm9_data.bin", 0x210C, 0x2110 - 0x210C + .word AllocTexVram_ .global NNS_GfdDefaultFuncFreeTexVram NNS_GfdDefaultFuncFreeTexVram: ; 0x02100DF0 - .incbin "incbin/arm9_data.bin", 0x2110, 0x4 + .word FreeTexVram_ diff --git a/asm/unk_020A5A3C.s b/asm/unk_020A5A3C.s index dfe3ffeed4..f327e082a3 100644 --- a/asm/unk_020A5A3C.s +++ b/asm/unk_020A5A3C.s @@ -22,9 +22,9 @@ FreePlttVram_: ; 0x020A5A44 .global NNS_GfdDefaultFuncAllocPlttVram NNS_GfdDefaultFuncAllocPlttVram: ; 0x02100DF4 - .incbin "incbin/arm9_data.bin", 0x2114, 0x2118 - 0x2114 + .word AllocPlttVram_ .global NNS_GfdDefaultFuncFreePlttVram NNS_GfdDefaultFuncFreePlttVram: ; 0x02100DF8 - .incbin "incbin/arm9_data.bin", 0x2118, 0x4 + .word FreePlttVram_ diff --git a/asm/unk_020A5A4C.s b/asm/unk_020A5A4C.s index 57b24f0913..f8bb19a419 100644 --- a/asm/unk_020A5A4C.s +++ b/asm/unk_020A5A4C.s @@ -1,6 +1,10 @@ .include "macros/function.inc" .include "include/unk_020A5A4C.inc" + + .extern NNS_GfdDefaultFuncAllocTexVram + .extern NNS_GfdDefaultFuncFreeTexVram + .text @@ -63,9 +67,9 @@ _020A5AD8: ; .align 2, 0 _020A5B08: .word Unk_021C3AB0 _020A5B0C: .word NNS_GfdAllocFrmTexVram -_020A5B10: .word 0x02100DEC +_020A5B10: .word NNS_GfdDefaultFuncAllocTexVram _020A5B14: .word NNS_GfdFreeFrmTexVram -_020A5B18: .word 0x02100DF0 +_020A5B18: .word NNS_GfdDefaultFuncFreeTexVram arm_func_end NNS_GfdInitFrmTexVramManager arm_func_start NNS_GfdResetFrmTexVramState diff --git a/asm/unk_020A5D88.s b/asm/unk_020A5D88.s index f67b2065d7..e863c1a1cb 100644 --- a/asm/unk_020A5D88.s +++ b/asm/unk_020A5D88.s @@ -2,7 +2,8 @@ .include "include/unk_020A5D88.inc" .extern Unk_021C3AB4 - + .extern NNS_GfdDefaultFuncAllocPlttVram + .extern NNS_GfdDefaultFuncFreePlttVram .text @@ -26,9 +27,9 @@ NNS_GfdInitFrmPlttVramManager: ; 0x020A5D88 ; .align 2, 0 _020A5DC0: .word Unk_021C3AB4 _020A5DC4: .word NNS_GfdAllocFrmPlttVram -_020A5DC8: .word 0x02100DF4 +_020A5DC8: .word NNS_GfdDefaultFuncAllocPlttVram _020A5DCC: .word NNS_GfdFreeFrmPlttVram -_020A5DD0: .word 0x02100DF8 +_020A5DD0: .word NNS_GfdDefaultFuncFreePlttVram arm_func_end NNS_GfdInitFrmPlttVramManager arm_func_start NNS_GfdAllocFrmPlttVram diff --git a/asm/unk_020A6824.s b/asm/unk_020A6824.s index 7b4479c803..eba9402532 100644 --- a/asm/unk_020A6824.s +++ b/asm/unk_020A6824.s @@ -1,7 +1,8 @@ .include "macros/function.inc" .include "include/unk_020A6824.inc" - + .extern NNS_GfdDefaultFuncAllocTexVram + .extern NNS_GfdDefaultFuncFreeTexVram .text @@ -34,9 +35,9 @@ NNS_GfdInitLnkTexVramManager: ; 0x020A682C ; .align 2, 0 _020A6870: .word Unk_021C3AD4 _020A6874: .word NNS_GfdAllocLnkTexVram -_020A6878: .word 0x02100DEC +_020A6878: .word NNS_GfdDefaultFuncAllocTexVram _020A687C: .word NNS_GfdFreeLnkTexVram -_020A6880: .word 0x02100DF0 +_020A6880: .word NNS_GfdDefaultFuncFreeTexVram arm_func_end NNS_GfdInitLnkTexVramManager arm_func_start NNS_GfdAllocLnkTexVram diff --git a/asm/unk_020A6B84.s b/asm/unk_020A6B84.s index de45637910..172165df56 100644 --- a/asm/unk_020A6B84.s +++ b/asm/unk_020A6B84.s @@ -1,7 +1,8 @@ .include "macros/function.inc" .include "include/unk_020A6B84.inc" - + .extern NNS_GfdDefaultFuncAllocPlttVram + .extern NNS_GfdDefaultFuncFreePlttVram .text @@ -33,9 +34,9 @@ NNS_GfdInitLnkPlttVramManager: ; 0x020A6B8C ; .align 2, 0 _020A6BCC: .word Unk_021C3AF0 _020A6BD0: .word NNS_GfdAllocLnkPlttVram -_020A6BD4: .word 0x02100DF4 +_020A6BD4: .word NNS_GfdDefaultFuncAllocPlttVram _020A6BD8: .word NNS_GfdFreeLnkPlttVram -_020A6BDC: .word 0x02100DF8 +_020A6BDC: .word NNS_GfdDefaultFuncFreePlttVram arm_func_end NNS_GfdInitLnkPlttVramManager arm_func_start NNS_GfdAllocLnkPlttVram diff --git a/asm/unk_020B2840.s b/asm/unk_020B2840.s index 318a47dde3..e0412d0eca 100644 --- a/asm/unk_020B2840.s +++ b/asm/unk_020B2840.s @@ -1,7 +1,10 @@ .include "macros/function.inc" .include "include/unk_020B2840.inc" - + .extern NNS_GfdDefaultFuncAllocTexVram + .extern NNS_GfdDefaultFuncFreeTexVram + .extern NNS_GfdDefaultFuncAllocPlttVram + .extern NNS_GfdDefaultFuncFreePlttVram .text @@ -224,10 +227,10 @@ _020B2B08: _020B2B10: .word 0x30415642 _020B2B14: .word 0x30505442 _020B2B18: .word 0x30444D42 -_020B2B1C: .word 0x02100DEC -_020B2B20: .word 0x02100DF4 -_020B2B24: .word 0x02100DF8 -_020B2B28: .word 0x02100DF0 +_020B2B1C: .word NNS_GfdDefaultFuncAllocTexVram +_020B2B20: .word NNS_GfdDefaultFuncAllocPlttVram +_020B2B24: .word NNS_GfdDefaultFuncFreePlttVram +_020B2B28: .word NNS_GfdDefaultFuncFreeTexVram arm_func_end NNS_G3dResDefaultSetup arm_func_start NNS_G3dWorldPosToScrPos diff --git a/asm/unk_020D2114.s b/asm/unk_020D2114.s index 3d2cec83ba..8651bd991f 100644 --- a/asm/unk_020D2114.s +++ b/asm/unk_020D2114.s @@ -5,6 +5,7 @@ .extern Unk_021D03AC .extern Unk_021D03C8 .extern Unk_021D03DC + .extern CTRDGi_PollingSR512kCOMMON .text @@ -460,9 +461,25 @@ Unk_020FE620: ; 0x020FE620 .global Unk_020FE628 Unk_020FE628: ; 0x020FE628 - .incbin "incbin/arm9_rodata.bin", 0x199E8, 0x19A24 - 0x199E8 + .word CTRDGi_WriteFlashSectorLE + .word CTRDGi_EraseFlashChipLE + .word CTRDGi_EraseFlashSectorLE + .word CTRDGi_WriteFlashSectorAsyncLE + .word CTRDGi_EraseFlashChipAsyncLE + .word CTRDGi_EraseFlashSectorAsyncLE + .word CTRDGi_PollingSR512kCOMMON + .word Unk_020FE620 + .incbin "incbin/arm9_rodata.bin", 0x199E8+0x20, 0x19A24 - 0x19A08 .global Unk_020FE664 Unk_020FE664: ; 0x020FE664 - .incbin "incbin/arm9_rodata.bin", 0x19A24, 0x3C + .word CTRDGi_WriteFlashSectorLE + .word CTRDGi_EraseFlashChipLE + .word CTRDGi_EraseFlashSectorLE + .word CTRDGi_WriteFlashSectorAsyncLE + .word CTRDGi_EraseFlashChipAsyncLE + .word CTRDGi_EraseFlashSectorAsyncLE + .word CTRDGi_PollingSR512kCOMMON + .word Unk_020FE620 + .incbin "incbin/arm9_rodata.bin", 0x19A24+0x20, 0x1C diff --git a/asm/unk_020D26F4.s b/asm/unk_020D26F4.s index 787e18c847..e7a0c6f4d5 100644 --- a/asm/unk_020D26F4.s +++ b/asm/unk_020D26F4.s @@ -5,6 +5,7 @@ .extern Unk_021D03AC .extern Unk_021D03C8 .extern Unk_021D03DC + .extern CTRDGi_PollingSR1MCOMMON .text @@ -508,11 +509,27 @@ Unk_020FE6A0: ; 0x020FE6A0 .global Unk_020FE6A8 Unk_020FE6A8: ; 0x020FE6A8 - .incbin "incbin/arm9_rodata.bin", 0x19A68, 0x19AA4 - 0x19A68 + .word CTRDGi_WriteFlashSectorMX + .word CTRDGi_EraseFlashChipMX + .word CTRDGi_EraseFlashSectorMX, + .word CTRDGi_WriteFlashSectorAsyncMX + .word CTRDGi_EraseFlashChipAsyncMX + .word CTRDGi_EraseFlashSectorAsyncMX + .word CTRDGi_PollingSR1MCOMMON + .word Unk_020FE6A0 + .incbin "incbin/arm9_rodata.bin", 0x19A68+0x20, 0x19AA4 - 0x19A88 .global Unk_020FE6E4 Unk_020FE6E4: ; 0x020FE6E4 - .incbin "incbin/arm9_rodata.bin", 0x19AA4, 0x19AE0 - 0x19AA4 + .word CTRDGi_WriteFlashSectorMX + .word CTRDGi_EraseFlashChipMX + .word CTRDGi_EraseFlashSectorMX + .word CTRDGi_WriteFlashSectorAsyncMX + .word CTRDGi_EraseFlashChipAsyncMX + .word CTRDGi_EraseFlashSectorAsyncMX + .word CTRDGi_PollingSR1MCOMMON + .word Unk_020FE6A0 + .incbin "incbin/arm9_rodata.bin", 0x19AA4+0x20, 0x19AE0 - 0x19AC4 .global Unk_020FE720 Unk_020FE720: ; 0x020FE720 diff --git a/asm/unk_020D5280.s b/asm/unk_020D5280.s index d3b47be654..2b3d69b54b 100644 --- a/asm/unk_020D5280.s +++ b/asm/unk_020D5280.s @@ -1124,15 +1124,15 @@ _020D6180: bx lr ; .align 2, 0 _020D6208: .word 0x000001FD -_020D620C: .word 0x021017D8 -_020D6210: .word 0x021017E0 -_020D6214: .word 0x021017E8 -_020D6218: .word 0x021017F0 -_020D621C: .word 0x021017F4 -_020D6220: .word 0x021017F8 -_020D6224: .word 0x02101800 -_020D6228: .word 0x02101808 -_020D622C: .word 0x0210180C +_020D620C: .word Unk_021017D8 +_020D6210: .word Unk_021017E0 +_020D6214: .word Unk_021017E8 +_020D6218: .word Unk_021017F0 +_020D621C: .word Unk_021017F4 +_020D6220: .word Unk_021017F8 +_020D6224: .word Unk_02101800 +_020D6228: .word Unk_02101808 +_020D622C: .word Unk_0210180C _020D6230: .word 0x000007FF arm_func_end double2hex_dup1 @@ -1745,14 +1745,14 @@ _020D6A7C: ; .align 2, 0 _020D6A90: .word 0x000001FD _020D6A94: .word 0x020FE864 -_020D6A98: .word 0x021017E0 -_020D6A9C: .word 0x021017E8 -_020D6AA0: .word 0x021017F0 -_020D6AA4: .word 0x021017F4 -_020D6AA8: .word 0x021017F8 -_020D6AAC: .word 0x02101800 -_020D6AB0: .word 0x02101808 -_020D6AB4: .word 0x0210180C +_020D6A98: .word Unk_021017E0 +_020D6A9C: .word Unk_021017E8 +_020D6AA0: .word Unk_021017F0 +_020D6AA4: .word Unk_021017F4 +_020D6AA8: .word Unk_021017F8 +_020D6AAC: .word Unk_02101800 +_020D6AB0: .word Unk_02101808 +_020D6AB4: .word Unk_0210180C _020D6AB8: .word 0x66666667 arm_func_end float2str_dup1 @@ -2338,8 +2338,8 @@ _020D72C4: add sp, sp, #0x10 bx lr ; .align 2, 0 -_020D72D8: .word 0x02101810 -_020D72DC: .word 0x02101814 +_020D72D8: .word Unk_02101810 +_020D72DC: .word Unk_02101814 arm_func_end __pformatter arm_func_start __FileWrite diff --git a/asm/unk_020D76E4.s b/asm/unk_020D76E4.s index 25cbf130cf..69f89d2187 100644 --- a/asm/unk_020D76E4.s +++ b/asm/unk_020D76E4.s @@ -370,7 +370,7 @@ _020D7BAC: add sp, sp, #0x28 ldmia sp!, {r3, r4, r5, r6, r7, pc} ; .align 2, 0 -_020D7BD4: .word 0x020FE964 +_020D7BD4: .word Unk_020FE964 _020D7BD8: .word 0x020FE864 arm_func_end parse_format_dup2 diff --git a/asm/unk_020D911C.s b/asm/unk_020D911C.s index 7a2604fd52..bd944be29b 100644 --- a/asm/unk_020D911C.s +++ b/asm/unk_020D911C.s @@ -1174,8 +1174,8 @@ _020DA0A4: str r1, [r0, #0] b _020DA150 ; .align 2, 0 -_020DA0FC: .word 0x020FE991 -_020DA100: .word 0x020FE98C +_020DA0FC: .word Unk_020FE991 +_020DA100: .word Unk_020FE98C _020DA104: .word 0x020FE864 _020DA108: .word 0x020FE7E4 _020DA10C: .word Unk_021015AC diff --git a/asm/unk_020DAECC.s b/asm/unk_020DAECC.s index b316ad159b..c438a166d2 100644 --- a/asm/unk_020DAECC.s +++ b/asm/unk_020DAECC.s @@ -1035,15 +1035,15 @@ _020DBC78: bx lr ; .align 2, 0 _020DBD00: .word 0x000001FD -_020DBD04: .word 0x02101828 -_020DBD08: .word 0x02101834 -_020DBD0C: .word 0x02101840 -_020DBD10: .word 0x0210184C -_020DBD14: .word 0x02101854 -_020DBD18: .word 0x0210185C -_020DBD1C: .word 0x02101868 -_020DBD20: .word 0x02101874 -_020DBD24: .word 0x0210187C +_020DBD04: .word Unk_02101828 +_020DBD08: .word Unk_02101834 +_020DBD0C: .word Unk_02101840 +_020DBD10: .word Unk_0210184C +_020DBD14: .word Unk_02101854 +_020DBD18: .word Unk_0210185C +_020DBD1C: .word Unk_02101868 +_020DBD20: .word Unk_02101874 +_020DBD24: .word Unk_0210187C _020DBD28: .word 0x000007FF arm_func_end double2hex_dup2 @@ -1580,14 +1580,14 @@ _020DC434: ; .align 2, 0 _020DC470: .word 0x000001FD _020DC474: .word Unk_020FEA9C -_020DC478: .word 0x02101834 -_020DC47C: .word 0x02101840 -_020DC480: .word 0x0210184C -_020DC484: .word 0x02101854 -_020DC488: .word 0x0210185C -_020DC48C: .word 0x02101868 -_020DC490: .word 0x02101874 -_020DC494: .word 0x0210187C +_020DC478: .word Unk_02101834 +_020DC47C: .word Unk_02101840 +_020DC480: .word Unk_0210184C +_020DC484: .word Unk_02101854 +_020DC488: .word Unk_0210185C +_020DC48C: .word Unk_02101868 +_020DC490: .word Unk_02101874 +_020DC494: .word Unk_0210187C _020DC498: .word 0x66666667 arm_func_end float2str_dup2 @@ -2227,8 +2227,8 @@ _020DCD6C: bx lr ; .align 2, 0 _020DCD80: .word 0x0000FFFF -_020DCD84: .word 0x02101884 -_020DCD88: .word 0x02101888 +_020DCD84: .word Unk_02101884 +_020DCD88: .word Unk_02101888 arm_func_end __wpformatter arm_func_start __wStringWrite @@ -2308,7 +2308,7 @@ Unk_020E4570: ; 0x020E4570 .incbin "incbin/arm9_exception.bin", 0x18, 0x8 .global Unk_020E4578 -Unk_Unk_020E4578: ; Unk_020E4578 +Unk_020E4578: ; 0x020E4578 .incbin "incbin/arm9_exception.bin", 0x20, 0x8 diff --git a/asm/unk_020DCED4.s b/asm/unk_020DCED4.s index 51c2e57215..1fb9f2b43c 100644 --- a/asm/unk_020DCED4.s +++ b/asm/unk_020DCED4.s @@ -409,7 +409,7 @@ _020DD4B4: .word 0x3E54AE0B _020DD4B8: .word 0x652B82FE _020DD4BC: .word 0x0003988E _020DD4C0: .word 0x000BB67A -_020DD4C4: .word 0x020FECAC +_020DD4C4: .word Unk_020FECAC _020DD4C8: .word 0x4A454EEF _020DD4CC: .word 0x3FCA7E28 _020DD4D0: .word 0x93C9DB65 @@ -427,8 +427,8 @@ _020DD4FC: .word 0x3FEEC709 _020DD500: .word 0x145B01F5 _020DD504: .word 0xBE3E2FE0 _020DD508: .word 0xDC3A03FD -_020DD50C: .word 0x020FECBC -_020DD510: .word 0x020FEC9C +_020DD50C: .word Unk_020FECBC +_020DD510: .word Unk_020FEC9C _020DD514: .word 0x40900000 _020DD518: .word 0x8800759C _020DD51C: .word 0x7E37E43C diff --git a/asm/unk_020DE3B8.s b/asm/unk_020DE3B8.s index c646604504..1e750fcae9 100644 --- a/asm/unk_020DE3B8.s +++ b/asm/unk_020DE3B8.s @@ -541,27 +541,27 @@ _020DEAB8: add sp, sp, #0x4c ldmia sp!, {r4, r5, pc} ; .align 2, 0 -_020DEAD0: .word 0x021018CC -_020DEAD4: .word 0x021018FC -_020DEAD8: .word 0x02101924 -_020DEADC: .word 0x0210193C -_020DEAE0: .word 0x0210194C -_020DEAE4: .word 0x02101954 -_020DEAE8: .word 0x0210195C -_020DEAEC: .word 0x02101964 -_020DEAF0: .word 0x0210196C -_020DEAF4: .word 0x02101970 -_020DEAF8: .word 0x02101974 -_020DEAFC: .word 0x02101978 -_020DEB00: .word 0x0210197C -_020DEB04: .word 0x02101980 -_020DEB08: .word 0x02101984 -_020DEB0C: .word 0x02101988 -_020DEB10: .word 0x0210198C -_020DEB14: .word 0x02101990 -_020DEB18: .word 0x02101994 -_020DEB1C: .word 0x02101998 -_020DEB20: .word 0x0210199C +_020DEAD0: .word Unk_021018CC +_020DEAD4: .word Unk_021018FC +_020DEAD8: .word Unk_02101924 +_020DEADC: .word Unk_0210193C +_020DEAE0: .word Unk_0210194C +_020DEAE4: .word Unk_02101954 +_020DEAE8: .word Unk_0210195C +_020DEAEC: .word Unk_02101964 +_020DEAF0: .word Unk_0210196C +_020DEAF4: .word Unk_02101970 +_020DEAF8: .word Unk_02101974 +_020DEAFC: .word Unk_02101978 +_020DEB00: .word Unk_0210197C +_020DEB04: .word Unk_02101980 +_020DEB08: .word Unk_02101984 +_020DEB0C: .word Unk_02101988 +_020DEB10: .word Unk_0210198C +_020DEB14: .word Unk_02101990 +_020DEB18: .word Unk_02101994 +_020DEB1C: .word Unk_02101998 +_020DEB20: .word Unk_0210199C arm_func_end __two_exp arm_func_start __equals_dec @@ -1469,8 +1469,8 @@ _020DF7B4: .word 0x3FF00000 _020DF7B8: .word 0xBFF00000 _020DF7BC: .word Unk_021015AC _020DF7C0: .word 0x7FF00000 -_020DF7C4: .word 0x021019A0 -_020DF7C8: .word 0x0210188C +_020DF7C4: .word Unk_021019A0 +_020DF7C8: .word Unk_0210188C _020DF7CC: .word 0x40140000 _020DF7D0: .word 0x7FEFFFFF arm_func_end __dec2num diff --git a/asm/unk_020FE5DC.s b/asm/unk_020FE5DC.s index 32b77b8be3..26318d7d2b 100644 --- a/asm/unk_020FE5DC.s +++ b/asm/unk_020FE5DC.s @@ -1,6 +1,12 @@ .include "macros/function.inc" - + .extern CTRDGi_WriteFlashSectorMX + .extern CTRDGi_EraseFlashChipMX + .extern CTRDGi_EraseFlashSectorMX + .extern CTRDGi_WriteFlashSectorAsyncMX + .extern CTRDGi_EraseFlashChipAsyncMX + .extern CTRDGi_EraseFlashSectorAsyncMX + .extern CTRDGi_PollingSR1MCOMMON .rodata @@ -11,5 +17,13 @@ Unk_020FE5DC: ; 0x020FE5DC .global Unk_020FE5E4 Unk_020FE5E4: ; 0x020FE5E4 - .incbin "incbin/arm9_rodata.bin", 0x199A4, 0x3C + .word CTRDGi_WriteFlashSectorMX + .word CTRDGi_EraseFlashChipMX + .word CTRDGi_EraseFlashSectorMX + .word CTRDGi_WriteFlashSectorAsyncMX + .word CTRDGi_EraseFlashChipAsyncMX + .word CTRDGi_EraseFlashSectorAsyncMX + .word CTRDGi_PollingSR1MCOMMON + .word Unk_020FE5DC + .incbin "incbin/arm9_rodata.bin", 0x199A4+0x20, 0x1C