diff options
author | red031000 <rubenru09@aol.com> | 2020-06-30 22:29:16 +0100 |
---|---|---|
committer | red031000 <rubenru09@aol.com> | 2020-06-30 22:29:42 +0100 |
commit | 2dc369ea69f8f5a4b827ca2f20864997856b57e0 (patch) | |
tree | b15536c2e559377a92c8b84be939121d5d904114 | |
parent | 3706f5edabc9633e941ddeaeadb7a6c18bf46b3b (diff) |
module 83 fully shiftable
46 files changed, 355 insertions, 294 deletions
diff --git a/arm9/asm/OS_alarm.s b/arm9/asm/OS_alarm.s index 9978bfbe..1e32c0e3 100644 --- a/arm9/asm/OS_alarm.s +++ b/arm9/asm/OS_alarm.s @@ -29,7 +29,7 @@ OSi_ArrangeTimer: ; 0x020CCE10 mov r0, #0x10 strh r2, [r1, #0x0] bl OS_DisableIrqMask - ldr r0, _020CCF20 ; =0x027E0000 + ldr r0, _020CCF20 ; =OS_IRQTable add r0, r0, #0x3000 ldr r1, [r0, #0xff8] orr r1, r1, #0x10 @@ -94,7 +94,7 @@ _020CCEF4: bx lr .balign 4 _020CCF1C: .word 0x04000106 -_020CCF20: .word 0x027E0000 +_020CCF20: .word OS_IRQTable _020CCF24: .word OSi_AlarmQueue arm_func_start OS_CancelAlarm diff --git a/arm9/asm/unk_02015EA0.s b/arm9/asm/unk_02015EA0.s index 3a876cb5..fba42f0b 100644 --- a/arm9/asm/unk_02015EA0.s +++ b/arm9/asm/unk_02015EA0.s @@ -39,7 +39,7 @@ UNK_021C4D20: ; 0x021C4D20 thumb_func_start FUN_02015EA0 FUN_02015EA0: ; 0x02015EA0 push {r3, lr} - ldr r3, _02015EC8 ; =0x027E0000 + ldr r3, _02015EC8 ; =OS_IRQTable ldr r1, _02015ECC ; =0x00003FF8 mov r0, #0x1 ldr r2, [r3, r1] @@ -56,13 +56,13 @@ FUN_02015EA0: ; 0x02015EA0 str r1, [r0, #0x30] pop {r3, pc} nop -_02015EC8: .word 0x027E0000 +_02015EC8: .word OS_IRQTable _02015ECC: .word 0x00003FF8 _02015ED0: .word gUnknown21C48B8 thumb_func_start FUN_02015ED4 FUN_02015ED4: ; 0x02015ED4 - ldr r3, _02015EE8 ; =0x027E0000 + ldr r3, _02015EE8 ; =OS_IRQTable ldr r1, _02015EEC ; =0x00003FF8 mov r0, #0x1 ldr r2, [r3, r1] @@ -72,7 +72,7 @@ FUN_02015ED4: ; 0x02015ED4 mov r0, #0x3 bx r3 nop -_02015EE8: .word 0x027E0000 +_02015EE8: .word OS_IRQTable _02015EEC: .word 0x00003FF8 _02015EF0: .word MI_WaitDma diff --git a/arm9/asm/unk_02020AFC.s b/arm9/asm/unk_02020AFC.s index 3d43d259..46ea1a85 100644 --- a/arm9/asm/unk_02020AFC.s +++ b/arm9/asm/unk_02020AFC.s @@ -55,7 +55,7 @@ FUN_02020B30: ; 0x02020B30 strh r1, [r2, #0x0] str r3, [r0, #0x0] _02020B54: - ldr r3, _02020B70 ; =0x027E0000 + ldr r3, _02020B70 ; =OS_IRQTable ldr r1, _02020B74 ; =0x00003FF8 mov r0, #0x40 ldr r2, [r3, r1] @@ -67,7 +67,7 @@ _02020B54: nop _02020B68: .word UNK_021C59B0 _02020B6C: .word 0x0400010E -_02020B70: .word 0x027E0000 +_02020B70: .word OS_IRQTable _02020B74: .word 0x00003FF8 _02020B78: .word OS_SetIrqFunction _02020B7C: .word FUN_02020B30 diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index ff184e1c..abc07964 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -28,7 +28,7 @@ UNK_020EECD0: ; 0x020EECD0 thumb_func_start FUN_02033F50 FUN_02033F50: ; 0x02033F50 - ldr r3, _02033F64 ; =0x027E0000 + ldr r3, _02033F64 ; =OS_IRQTable ldr r1, _02033F68 ; =0x00003FF8 mov r0, #0x1 ldr r2, [r3, r1] @@ -38,7 +38,7 @@ FUN_02033F50: ; 0x02033F50 mov r0, #0x3 bx r3 nop -_02033F64: .word 0x027E0000 +_02033F64: .word OS_IRQTable _02033F68: .word 0x00003FF8 _02033F6C: .word MI_WaitDma diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 30db1fe3..b6e829ee 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2645,7 +2645,7 @@ FUN_0206DD08: ; 0x0206DD08 bl FUN_0200372C ldr r0, [r4, #0x0] bl FUN_0201AB60 - ldr r3, _0206DD64 ; =0x027E0000 + ldr r3, _0206DD64 ; =OS_IRQTable ldr r1, _0206DD68 ; =0x00003FF8 mov r0, #0x1 ldr r2, [r3, r1] @@ -2654,7 +2654,7 @@ FUN_0206DD08: ; 0x0206DD08 pop {r3-r5, pc} nop _0206DD60: .word 0x04000040 -_0206DD64: .word 0x027E0000 +_0206DD64: .word OS_IRQTable _0206DD68: .word 0x00003FF8 thumb_func_start FUN_0206DD6C diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 23b8fdb0..7fc0cd29 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1037,7 +1037,7 @@ FUN_0206FB58: ; 0x0206FB58 bl FUN_0201AB60 bl FUN_0201C30C bl FUN_0200BC30 - ldr r3, _0206FB78 ; =0x027E0000 + ldr r3, _0206FB78 ; =OS_IRQTable ldr r1, _0206FB7C ; =0x00003FF8 mov r0, #0x1 ldr r2, [r3, r1] @@ -1045,7 +1045,7 @@ FUN_0206FB58: ; 0x0206FB58 str r0, [r3, r1] pop {r3, pc} nop -_0206FB78: .word 0x027E0000 +_0206FB78: .word OS_IRQTable _0206FB7C: .word 0x00003FF8 thumb_func_start FUN_0206FB80 diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 6011647b..f589578f 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -1331,7 +1331,7 @@ FUN_02077AE8: ; 0x02077AE8 push {r3, lr} bl FUN_0201C30C bl FUN_02009F80 - ldr r3, _02077B00 ; =0x027E0000 + ldr r3, _02077B00 ; =OS_IRQTable ldr r1, _02077B04 ; =0x00003FF8 mov r0, #0x1 ldr r2, [r3, r1] @@ -1339,7 +1339,7 @@ FUN_02077AE8: ; 0x02077AE8 str r0, [r3, r1] pop {r3, pc} .balign 4 -_02077B00: .word 0x027E0000 +_02077B00: .word OS_IRQTable _02077B04: .word 0x00003FF8 thumb_func_start FUN_02077B08 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 644dbb64..7d952d1a 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -357,7 +357,7 @@ FUN_02079F24: ; 0x02079F24 bl FUN_020081C4 bl FUN_0201C30C bl FUN_0200BC30 - ldr r3, _02079F50 ; =0x027E0000 + ldr r3, _02079F50 ; =OS_IRQTable ldr r1, _02079F54 ; =0x00003FF8 mov r0, #0x1 ldr r2, [r3, r1] @@ -365,7 +365,7 @@ FUN_02079F24: ; 0x02079F24 str r0, [r3, r1] pop {r4, pc} nop -_02079F50: .word 0x027E0000 +_02079F50: .word OS_IRQTable _02079F54: .word 0x00003FF8 thumb_func_start FUN_02079F58 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index d479cde5..aee0c117 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -381,7 +381,7 @@ FUN_02086664: ; 0x02086664 bl FUN_0200372C ldr r0, [r4, #0x4] bl FUN_0201AB60 - ldr r3, _02086690 ; =0x027E0000 + ldr r3, _02086690 ; =OS_IRQTable ldr r1, _02086694 ; =0x00003FF8 mov r0, #0x1 ldr r2, [r3, r1] @@ -389,7 +389,7 @@ FUN_02086664: ; 0x02086664 str r0, [r3, r1] pop {r4, pc} .balign 4 -_02086690: .word 0x027E0000 +_02086690: .word OS_IRQTable _02086694: .word 0x00003FF8 thumb_func_start FUN_02086698 diff --git a/arm9/asm/unk_0208A998.s b/arm9/asm/unk_0208A998.s index 2c02879a..21601e50 100644 --- a/arm9/asm/unk_0208A998.s +++ b/arm9/asm/unk_0208A998.s @@ -38,7 +38,7 @@ UNK_021C8C58: ; 0x021C8C58 thumb_func_start FUN_0208A998 FUN_0208A998: ; 0x0208A998 - ldr r3, _0208A9AC ; =0x027E0000 + ldr r3, _0208A9AC ; =OS_IRQTable ldr r1, _0208A9B0 ; =0x00003FF8 mov r0, #0x1 ldr r2, [r3, r1] @@ -48,7 +48,7 @@ FUN_0208A998: ; 0x0208A998 mov r0, #0x3 bx r3 nop -_0208A9AC: .word 0x027E0000 +_0208A9AC: .word OS_IRQTable _0208A9B0: .word 0x00003FF8 _0208A9B4: .word MI_WaitDma diff --git a/arm9/global.inc b/arm9/global.inc index bbe11aad..1bc304e8 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -7110,6 +7110,8 @@ .extern MOD20_02254488 .extern MOD51_02254A68 .extern MOD51_02254AB8 +.extern MOD52_021D76C8 +.extern MOD52_021D76E8 .extern MOD53_021D74E0 .extern MOD53_021D7654 .extern MOD53_021D7764 @@ -7279,6 +7281,7 @@ .extern MTX_ScaleApply43 .extern MTX_TransApply44 .extern NitroMain +.extern gBacklightTop .extern OS_AllocFromArenaHi .extern OS_AllocFromArenaLo .extern OS_AllocFromHeap @@ -7755,8 +7758,10 @@ .extern UNK_020FB740 .extern UNK_020FB764 .extern UNK_020FD144 +.extern UNK_020FD6D4 .extern UNK_021064B8 .extern UNK_021064C0 +.extern UNK_021C48F8 .extern UNK_021C8ECC .extern UNK_021C8ED0 .extern UNK_021C8ED4 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 26d85266..44f186d8 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -1873,7 +1873,7 @@ MOD07_02212D68: ; 0x02212D68 bl FUN_0200372C bl FUN_0201C30C bl FUN_0200BC30 - ldr r3, _02212D90 ; =0x027E0000 + ldr r3, _02212D90 ; =OS_IRQTable ldr r1, _02212D94 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -1881,7 +1881,7 @@ MOD07_02212D68: ; 0x02212D68 str r0, [r3, r1] pop {r4, pc} nop -_02212D90: .word 0x027E0000 +_02212D90: .word OS_IRQTable _02212D94: .word 0x00003FF8 thumb_func_start MOD07_02212D98 diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index ef15a30d..f3d55c31 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -3158,7 +3158,7 @@ _0222F088: bl FUN_0200372C ldr r0, [r4, #4] bl FUN_0201AB60 - ldr r3, _0222F0CC ; =0x027E0000 + ldr r3, _0222F0CC ; =OS_IRQTable ldr r1, _0222F0D0 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -3172,7 +3172,7 @@ _0222F0BC: .word 0x04000050 _0222F0C0: .word 0x04001050 _0222F0C4: .word 0x0225DA90 _0222F0C8: .word 0x0225DAB8 -_0222F0CC: .word 0x027E0000 +_0222F0CC: .word OS_IRQTable _0222F0D0: .word 0x00003FF8 thumb_func_start MOD11_0222F0D4 @@ -3184,7 +3184,7 @@ MOD11_0222F0D4: ; 0x0222F0D4 bl FUN_0201C30C ldr r0, [r4, #4] bl FUN_0201AB60 - ldr r3, _0222F0F8 ; =0x027E0000 + ldr r3, _0222F0F8 ; =OS_IRQTable ldr r1, _0222F0FC ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -3192,7 +3192,7 @@ MOD11_0222F0D4: ; 0x0222F0D4 str r0, [r3, r1] pop {r4, pc} nop -_0222F0F8: .word 0x027E0000 +_0222F0F8: .word OS_IRQTable _0222F0FC: .word 0x00003FF8 thumb_func_start MOD11_0222F100 @@ -94196,7 +94196,7 @@ MOD11_0225B824: ; 0x0225B824 mov r1, #1 bl FUN_02003204 add r4, r0, #0 - ldr r0, _0225B8AC ; =0x021C48F8 + ldr r0, _0225B8AC ; =UNK_021C48F8 ldrh r0, [r0, #0x22] cmp r0, #0 beq _0225B888 @@ -94238,7 +94238,7 @@ _0225B888: _0225B8A8: pop {r3, r4, r5, r6, r7, pc} nop -_0225B8AC: .word 0x021C48F8 +_0225B8AC: .word UNK_021C48F8 thumb_func_start MOD11_0225B8B0 MOD11_0225B8B0: ; 0x0225B8B0 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index d8814351..496db71c 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -547,7 +547,7 @@ MOD12_0222DAE4: ; 0x0222DAE4 bl FUN_0200372C ldr r0, [r4, #0x30] bl FUN_0201AB60 - ldr r3, _0222DB10 ; =0x027E0000 + ldr r3, _0222DB10 ; =OS_IRQTable ldr r1, _0222DB14 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -555,7 +555,7 @@ MOD12_0222DAE4: ; 0x0222DAE4 str r0, [r3, r1] pop {r4, pc} .align 2, 0 -_0222DB10: .word 0x027E0000 +_0222DB10: .word OS_IRQTable _0222DB14: .word 0x00003FF8 thumb_func_start MOD12_0222DB18 @@ -3760,7 +3760,7 @@ _0222F4BA: bl FUN_0200372C ldr r0, [r6, #0x30] bl FUN_0201AB60 - ldr r3, _0222F4EC ; =0x027E0000 + ldr r3, _0222F4EC ; =OS_IRQTable ldr r1, _0222F4F0 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -3770,7 +3770,7 @@ _0222F4BA: .align 2, 0 _0222F4E4: .word 0x00000F63 _0222F4E8: .word 0x04000040 -_0222F4EC: .word 0x027E0000 +_0222F4EC: .word OS_IRQTable _0222F4F0: .word 0x00003FF8 thumb_func_start MOD12_0222F4F4 @@ -5643,7 +5643,7 @@ _02230464: bl FUN_0200372C ldr r0, [r4, #0x74] bl FUN_0201AB60 - ldr r3, _022304A8 ; =0x027E0000 + ldr r3, _022304A8 ; =OS_IRQTable ldr r1, _022304AC ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -5656,7 +5656,7 @@ _02230498: .word 0x00000AF8 _0223049C: .word 0x00001388 _022304A0: .word 0x0000114C _022304A4: .word 0x00001138 -_022304A8: .word 0x027E0000 +_022304A8: .word OS_IRQTable _022304AC: .word 0x00003FF8 thumb_func_start MOD12_022304B0 @@ -28412,7 +28412,7 @@ _0223B14C: mov r0, #1 tst r0, r1 bne _0223B174 - ldr r0, _0223B34C ; =0x021C48F8 + ldr r0, _0223B34C ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 beq _0223B186 @@ -28665,7 +28665,7 @@ _0223B340: .align 2, 0 _0223B344: .word 0x00000171 _0223B348: .word gUnknown21C48B8 -_0223B34C: .word 0x021C48F8 +_0223B34C: .word UNK_021C48F8 _0223B350: .word 0x000006ED _0223B354: .word 0x02245F84 _0223B358: .word 0x02245F8C @@ -41666,7 +41666,7 @@ MOD12_02241754: ; 0x02241754 bl FUN_0200372C ldr r0, [r4, #0x30] bl FUN_0201AB60 - ldr r3, _022417D4 ; =0x027E0000 + ldr r3, _022417D4 ; =OS_IRQTable ldr r1, _022417D8 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -41676,7 +41676,7 @@ MOD12_02241754: ; 0x02241754 nop _022417CC: .word 0x00000854 _022417D0: .word 0x04000040 -_022417D4: .word 0x027E0000 +_022417D4: .word OS_IRQTable _022417D8: .word 0x00003FF8 thumb_func_start MOD12_022417DC diff --git a/arm9/modules/13/asm/module_13_arm2.s b/arm9/modules/13/asm/module_13_arm2.s index f919cf8b..5b84a4a8 100644 --- a/arm9/modules/13/asm/module_13_arm2.s +++ b/arm9/modules/13/asm/module_13_arm2.s @@ -34409,7 +34409,7 @@ MOD13_0223B770: ; 0x0223B770 sub sp, sp, #4 mov r0, #1 bl MOD13_0223C1E0 - ldr r0, _0223B79C ; =0x027E0000 + ldr r0, _0223B79C ; =OS_IRQTable add r0, r0, #0x3000 ldr r1, [r0, #0xff8] orr r1, r1, #1 @@ -34417,7 +34417,7 @@ MOD13_0223B770: ; 0x0223B770 add sp, sp, #4 ldmia sp!, {pc} .align 2, 0 -_0223B79C: .word 0x027E0000 +_0223B79C: .word OS_IRQTable arm_func_start MOD13_0223B7A0 MOD13_0223B7A0: ; 0x0223B7A0 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 6a156551..77e21eab 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -11004,7 +11004,7 @@ MOD14_021DCBFC: ; 0x021DCBFC pop {r4, pc} .align 2, 0 _021DCC20: .word 0x000065A0 -_021DCC24: .word 0x027E0000 +_021DCC24: .word OS_IRQTable _021DCC28: .word 0x00003FF8 thumb_func_start MOD14_021DCC2C diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 040c4ddb..1eb5b358 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -2692,7 +2692,7 @@ MOD15_021D88DC: ; 0x021D88DC ldr r0, [r1, #0x24] bl FUN_0201FDEC bl FUN_02009F80 - ldr r3, _021D88F8 ; =0x027E0000 + ldr r3, _021D88F8 ; =OS_IRQTable ldr r1, _021D88FC ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -2700,7 +2700,7 @@ MOD15_021D88DC: ; 0x021D88DC str r0, [r3, r1] pop {r3, pc} nop -_021D88F8: .word 0x027E0000 +_021D88F8: .word OS_IRQTable _021D88FC: .word 0x00003FF8 thumb_func_start MOD15_021D8900 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index f74e7e78..f76ed718 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -5718,7 +5718,7 @@ _021D9F88: .word FUN_02024CC4 thumb_func_start MOD16_021D9F8C MOD16_021D9F8C: ; 0x021D9F8C - ldr r1, _021D9FAC ; =0x021C48F8 + ldr r1, _021D9FAC ; =UNK_021C48F8 ldrh r1, [r1, #0x22] cmp r1, #0 beq _021D9F9C @@ -5737,7 +5737,7 @@ _021D9F9C: _021D9FAA: bx lr .align 2, 0 -_021D9FAC: .word 0x021C48F8 +_021D9FAC: .word UNK_021C48F8 _021D9FB0: .word 0x00001758 _021D9FB4: .word gUnknown21C48B8 thumb_func_end MOD16_021D9F8C @@ -14617,7 +14617,7 @@ MOD16_021DE108: ; 0x021DE108 beq _021DE12E b _021DE1D6 _021DE122: - ldr r0, _021DE1DC ; =0x021C48F8 + ldr r0, _021DE1DC ; =UNK_021C48F8 ldrh r1, [r0, #0x1c] str r1, [r4, #0x14] ldrh r0, [r0, #0x1e] @@ -14706,7 +14706,7 @@ _021DE1A2: mov r0, #0 str r0, [r4, #0xc] _021DE1C6: - ldr r0, _021DE1DC ; =0x021C48F8 + ldr r0, _021DE1DC ; =UNK_021C48F8 ldrh r1, [r0, #0x1c] str r1, [r4, #0x14] ldrh r0, [r0, #0x1e] @@ -14720,7 +14720,7 @@ _021DE1D6: str r0, [r4, #0x20] pop {r4, r5, r6, pc} .align 2, 0 -_021DE1DC: .word 0x021C48F8 +_021DE1DC: .word UNK_021C48F8 thumb_func_end MOD16_021DE108 thumb_func_start MOD16_021DE1E0 @@ -15553,7 +15553,7 @@ MOD16_021DE8A0: ; 0x021DE8A0 mov r0, #0x83 lsl r0, r0, #2 str r0, [sp] - ldr r3, _021DE8CC ; =0x021C48F8 + ldr r3, _021DE8CC ; =UNK_021C48F8 ldr r0, [r4, #0x14] ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] @@ -15569,7 +15569,7 @@ MOD16_021DE8A0: ; 0x021DE8A0 add sp, #4 pop {r3, r4, pc} .align 2, 0 -_021DE8CC: .word 0x021C48F8 +_021DE8CC: .word UNK_021C48F8 thumb_func_end MOD16_021DE8A0 thumb_func_start MOD16_021DE8D0 @@ -28665,7 +28665,7 @@ MOD16_021E482C: ; 0x021E482C MOD16_021E4850: ; 0x021E4850 push {r3, r4, r5, lr} add r5, r0, #0 - ldr r0, _021E48B4 ; =0x021C48F8 + ldr r0, _021E48B4 ; =UNK_021C48F8 add r4, r1, #0 ldrh r0, [r0, #0x22] cmp r0, #0 @@ -28712,7 +28712,7 @@ _021E48A0: _021E48B2: pop {r3, r4, r5, pc} .align 2, 0 -_021E48B4: .word 0x021C48F8 +_021E48B4: .word UNK_021C48F8 _021E48B8: .word gUnknown21C48B8 thumb_func_end MOD16_021E4850 @@ -28726,7 +28726,7 @@ MOD16_021E48BC: ; 0x021E48BC add r4, r1, #0 cmp r3, #0 beq _021E492E - ldr r0, _021E4934 ; =0x021C48F8 + ldr r0, _021E4934 ; =UNK_021C48F8 ldrh r1, [r0, #0x22] cmp r1, #0 beq _021E492A @@ -28782,7 +28782,7 @@ _021E492E: bl MOD16_021E4850 pop {r3, r4, r5, pc} .align 2, 0 -_021E4934: .word 0x021C48F8 +_021E4934: .word UNK_021C48F8 thumb_func_end MOD16_021E48BC thumb_func_start MOD16_021E4938 @@ -28795,7 +28795,7 @@ MOD16_021E4938: ; 0x021E4938 bl FUN_020054C8 mov r0, #1 str r0, [r4, #0x20] - ldr r0, _021E4964 ; =0x021C48F8 + ldr r0, _021E4964 ; =UNK_021C48F8 ldr r1, [r4] ldrh r2, [r0, #0x1c] sub r1, r2, r1 @@ -28808,7 +28808,7 @@ _021E495C: pop {r4, pc} nop _021E4960: .word 0x000005DD -_021E4964: .word 0x021C48F8 +_021E4964: .word UNK_021C48F8 thumb_func_end MOD16_021E4938 thumb_func_start MOD16_021E4968 @@ -43280,7 +43280,7 @@ _021EB50A: add r0, r4, #0 bl MOD16_021EC000 _021EB516: - ldr r0, _021EB564 ; =0x021C48F8 + ldr r0, _021EB564 ; =UNK_021C48F8 ldrh r0, [r0, #0x1c] str r0, [r4, #0x38] mov r0, #1 @@ -43295,7 +43295,7 @@ _021EB522: _021EB52E: mov r0, #1 str r0, [r4, #0x4c] - ldr r0, _021EB564 ; =0x021C48F8 + ldr r0, _021EB564 ; =UNK_021C48F8 ldrh r1, [r0, #0x1c] str r1, [r4, #0x54] ldrh r0, [r0, #0x1e] @@ -43320,7 +43320,7 @@ _021EB55C: str r0, [r4, #0x20] pop {r4, pc} nop -_021EB564: .word 0x021C48F8 +_021EB564: .word UNK_021C48F8 thumb_func_end MOD16_021EB4F8 thumb_func_start MOD16_021EB568 @@ -43338,7 +43338,7 @@ _021EB57A: ldr r0, [r4, #0x30] cmp r0, #1 bne _021EB638 - ldr r1, _021EB63C ; =0x021C48F8 + ldr r1, _021EB63C ; =UNK_021C48F8 ldr r0, [r4, #0x38] ldrh r2, [r1, #0x1c] sub r2, r2, r0 @@ -43376,7 +43376,7 @@ _021EB5BA: bl MOD16_021EBC98 add r0, r4, #0 bl MOD16_021EBCC4 - ldr r0, _021EB63C ; =0x021C48F8 + ldr r0, _021EB63C ; =UNK_021C48F8 ldrh r1, [r0, #0x1c] str r1, [r4, #0x54] ldrh r0, [r0, #0x1e] @@ -43396,7 +43396,7 @@ _021EB5DE: bl MOD16_021EC0C0 b _021EB632 _021EB5F8: - ldr r1, _021EB63C ; =0x021C48F8 + ldr r1, _021EB63C ; =UNK_021C48F8 ldrh r0, [r1, #0x1e] cmp r0, #0x83 bhs _021EB626 @@ -43430,7 +43430,7 @@ _021EB632: _021EB638: pop {r4, pc} nop -_021EB63C: .word 0x021C48F8 +_021EB63C: .word UNK_021C48F8 _021EB640: .word 0x000005F7 _021EB644: .word 0xFFFFFA00 thumb_func_end MOD16_021EB568 @@ -44176,7 +44176,7 @@ MOD16_021EBC30: ; 0x021EBC30 add r5, r0, #0 mov r0, #0 str r0, [sp] - ldr r3, _021EBC94 ; =0x021C48F8 + ldr r3, _021EBC94 ; =UNK_021C48F8 ldr r0, [r5, #0x54] ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] @@ -44225,7 +44225,7 @@ _021EBC90: add sp, #4 pop {r3, r4, r5, r6, pc} .align 2, 0 -_021EBC94: .word 0x021C48F8 +_021EBC94: .word UNK_021C48F8 thumb_func_end MOD16_021EBC30 thumb_func_start MOD16_021EBC98 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index e6c0d81c..43a76d69 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -87,7 +87,7 @@ _021D756E: add r1, sp, #8 add r2, sp, #4 bl MOD17_021D7600 - ldr r0, _021D75D8 ; =0x021C48F8 + ldr r0, _021D75D8 ; =UNK_021C48F8 ldr r1, [sp, #8] ldrh r2, [r0, #0x1c] sub r1, r2, r1 @@ -140,7 +140,7 @@ _021D75D2: add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 -_021D75D8: .word 0x021C48F8 +_021D75D8: .word UNK_021C48F8 thumb_func_end MOD17_021D7554 thumb_func_start MOD17_021D75DC @@ -2242,7 +2242,7 @@ _021D85AA: ldr r1, [r0, #0x48] mov r0, #3 and r1, r0 - ldr r0, _021D872C ; =0x021C48F8 + ldr r0, _021D872C ; =UNK_021C48F8 ldrh r0, [r0, #0x20] orr r0, r1 bne _021D85BC @@ -2424,7 +2424,7 @@ _021D871C: .word 0x00000554 _021D8720: .word 0x00000151 _021D8724: .word 0x000006CC _021D8728: .word gUnknown21C48B8 -_021D872C: .word 0x021C48F8 +_021D872C: .word UNK_021C48F8 _021D8730: .word 0x0000069C _021D8734: .word 0x0000048C thumb_func_end MOD17_021D84F0 @@ -7839,7 +7839,7 @@ _021DAF60: .word MOD17_021DAFA0 thumb_func_start MOD17_021DAF64 MOD17_021DAF64: ; 0x021DAF64 push {r4, lr} - ldr r1, _021DAF9C ; =0x021C48F8 + ldr r1, _021DAF9C ; =UNK_021C48F8 add r4, r0, #0 ldrh r2, [r1, #0x20] cmp r2, #0 @@ -7861,7 +7861,7 @@ _021DAF82: ldr r1, [r4, #8] blx r1 _021DAF8C: - ldr r0, _021DAF9C ; =0x021C48F8 + ldr r0, _021DAF9C ; =UNK_021C48F8 ldrh r1, [r0, #0x1c] strh r1, [r4, #0x14] ldrh r1, [r0, #0x1e] @@ -7870,7 +7870,7 @@ _021DAF8C: strb r0, [r4, #0x18] pop {r4, pc} .align 2, 0 -_021DAF9C: .word 0x021C48F8 +_021DAF9C: .word UNK_021C48F8 thumb_func_end MOD17_021DAF64 thumb_func_start MOD17_021DAFA0 @@ -8397,7 +8397,7 @@ MOD17_021DB3A4: ; 0x021DB3A4 ldr r0, [r2, #0x10] cmp r0, #0 beq _021DB3C8 - ldr r3, _021DB3CC ; =0x021C48F8 + ldr r3, _021DB3CC ; =UNK_021C48F8 ldr r1, _021DB3D0 ; =0x0000FFFF ldrh r4, [r3, #0x1c] cmp r4, r1 @@ -8412,7 +8412,7 @@ MOD17_021DB3A4: ; 0x021DB3A4 _021DB3C8: pop {r4, pc} nop -_021DB3CC: .word 0x021C48F8 +_021DB3CC: .word UNK_021C48F8 _021DB3D0: .word 0x0000FFFF thumb_func_end MOD17_021DB3A4 @@ -8449,7 +8449,7 @@ MOD17_021DB404: ; 0x021DB404 ldr r0, [r4, #0x10] cmp r0, #0 beq _021DB49E - ldr r1, _021DB4A4 ; =0x021C48F8 + ldr r1, _021DB4A4 ; =UNK_021C48F8 ldrh r2, [r1, #0x1c] ldr r1, _021DB4A8 ; =0x0000FFFF cmp r2, r1 @@ -8462,7 +8462,7 @@ MOD17_021DB404: ; 0x021DB404 add r1, sp, #0x10 add r2, sp, #0xc bl MOD17_021DBC08 - ldr r0, _021DB4A4 ; =0x021C48F8 + ldr r0, _021DB4A4 ; =UNK_021C48F8 ldr r1, [r4, #0x14] ldrh r2, [r0, #0x1c] ldr r3, [sp, #0xc] @@ -8522,7 +8522,7 @@ _021DB49E: add sp, #0x14 pop {r4, r5, r6, r7, pc} nop -_021DB4A4: .word 0x021C48F8 +_021DB4A4: .word UNK_021C48F8 _021DB4A8: .word 0x0000FFFF thumb_func_end MOD17_021DB404 @@ -9089,7 +9089,7 @@ _021DB89A: asr r2, r2, #1 sub r0, r0, r2 str r0, [sp] - ldr r0, _021DB8F4 ; =0x021C48F8 + ldr r0, _021DB8F4 ; =UNK_021C48F8 str r1, [sp, #4] ldrh r2, [r0, #0x1c] mov r3, #0 @@ -9112,7 +9112,7 @@ _021DB8EE: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_021DB8F4: .word 0x021C48F8 +_021DB8F4: .word UNK_021C48F8 thumb_func_end MOD17_021DB880 thumb_func_start MOD17_021DB8F8 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index dc563f4c..bdeca256 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -2247,7 +2247,7 @@ _0223A844: bl FUN_0201BD70 cmp r0, #0 bne _0223A922 - ldr r0, _0223AB08 ; =0x021C48F8 + ldr r0, _0223AB08 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 bne _0223A86C @@ -2326,7 +2326,7 @@ _0223A8E4: ldr r0, [r4, #0x4c] sub r0, r0, #1 str r0, [r4, #0x4c] - ldr r0, _0223AB08 ; =0x021C48F8 + ldr r0, _0223AB08 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 bne _0223A924 @@ -2380,7 +2380,7 @@ _0223A958: bl FUN_0201BD70 cmp r0, #0 bne _0223AA5A - ldr r0, _0223AB08 ; =0x021C48F8 + ldr r0, _0223AB08 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 bne _0223A98A @@ -2558,7 +2558,7 @@ _0223AAF2: .align 2, 0 _0223AB00: .word 0x00000621 _0223AB04: .word MOD18_02251380 -_0223AB08: .word 0x021C48F8 +_0223AB08: .word UNK_021C48F8 _0223AB0C: .word gUnknown21C48B8 _0223AB10: .word 0x000005E3 _0223AB14: .word 0x000003D9 @@ -2665,7 +2665,7 @@ _0223ABDC: bl FUN_0201BD70 cmp r0, #0 bne _0223AC10 - ldr r0, _0223AC1C ; =0x021C48F8 + ldr r0, _0223AC1C ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 bne _0223AC04 @@ -2685,7 +2685,7 @@ _0223AC10: .align 2, 0 _0223AC14: .word MOD18_02251380 _0223AC18: .word 0x000006A1 -_0223AC1C: .word 0x021C48F8 +_0223AC1C: .word UNK_021C48F8 _0223AC20: .word gUnknown21C48B8 thumb_func_end MOD18_0223A64C @@ -5595,7 +5595,7 @@ MOD18_0223C1F0: ; 0x0223C1F0 mov r1, #0 strb r1, [r2, r0] _0223C216: - ldr r1, _0223C340 ; =0x021C48F8 + ldr r1, _0223C340 ; =UNK_021C48F8 ldrh r0, [r1, #0x20] cmp r0, #0 beq _0223C29A @@ -5673,7 +5673,7 @@ _0223C29A: bl FUN_020054C8 _0223C2AC: ldr r0, _0223C338 ; =0x02251380 - ldr r2, _0223C340 ; =0x021C48F8 + ldr r2, _0223C340 ; =UNK_021C48F8 ldr r3, [r0] ldr r4, _0223C33C ; =0x000009E5 ldr r0, [r3, #4] @@ -5741,7 +5741,7 @@ _0223C332: .align 2, 0 _0223C338: .word MOD18_02251380 _0223C33C: .word 0x000009E5 -_0223C340: .word 0x021C48F8 +_0223C340: .word UNK_021C48F8 _0223C344: .word 0x000009E4 _0223C348: .word 0x000009E7 _0223C34C: .word 0x000009E8 @@ -8588,7 +8588,7 @@ MOD18_0223D8F4: ; 0x0223D8F4 mov r0, #0 pop {r3, pc} _0223D912: - ldr r1, _0223D9DC ; =0x021C48F8 + ldr r1, _0223D9DC ; =UNK_021C48F8 ldrh r1, [r1, #0x20] cmp r1, #0 beq _0223D9BA @@ -8625,7 +8625,7 @@ _0223D950: pop {r3, pc} _0223D962: ldr r3, _0223D9D4 ; =0x02251388 - ldr r2, _0223D9DC ; =0x021C48F8 + ldr r2, _0223D9DC ; =UNK_021C48F8 ldr r3, [r3] ldrh r1, [r2, #0x1c] ldr r3, [r3, #0xc] @@ -8644,7 +8644,7 @@ _0223D962: strh r1, [r0] ldr r1, [sp, #4] strh r1, [r0, #2] - ldr r1, _0223D9DC ; =0x021C48F8 + ldr r1, _0223D9DC ; =UNK_021C48F8 ldr r0, _0223D9D4 ; =0x02251388 ldrh r3, [r1, #0x1c] ldr r2, [r0] @@ -8682,7 +8682,7 @@ _0223D9CC: nop _0223D9D4: .word MOD18_02251388 _0223D9D8: .word 0x00000146 -_0223D9DC: .word 0x021C48F8 +_0223D9DC: .word UNK_021C48F8 thumb_func_end MOD18_0223D8F4 thumb_func_start MOD18_0223D9E0 @@ -14808,7 +14808,7 @@ _0224079E: add sp, #0x1c pop {r3, r4, pc} _022407DE: - ldr r1, _02240894 ; =0x021C48F8 + ldr r1, _02240894 ; =UNK_021C48F8 ldrh r0, [r1, #0x22] cmp r0, #0 beq _02240816 @@ -14892,7 +14892,7 @@ _02240884: .word MOD18_022513A0 _02240888: .word 0x00000B3B _0224088C: .word MOD18_022500A8 _02240890: .word 0x00000661 -_02240894: .word 0x021C48F8 +_02240894: .word UNK_021C48F8 thumb_func_end MOD18_02240658 thumb_func_start MOD18_02240898 @@ -18413,7 +18413,7 @@ _022423E6: mov r0, #1 pop {r4, r5, r6, r7, pc} _022423F4: - ldr r0, _02242580 ; =0x021C48F8 + ldr r0, _02242580 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 beq _022424C4 @@ -18429,14 +18429,14 @@ _0224240A: ldr r0, [r0] cmp r0, #0 bne _022424B6 - ldr r0, _02242580 ; =0x021C48F8 + ldr r0, _02242580 ; =UNK_021C48F8 ldrh r0, [r0, #0x1e] lsl r1, r0, #0xc ldr r0, [r4, #0x48] sub r0, r1, r0 str r0, [sp, #0xc] asr r7, r0, #0x1f - ldr r0, _02242580 ; =0x021C48F8 + ldr r0, _02242580 ; =UNK_021C48F8 ldrh r0, [r0, #0x1c] lsl r1, r0, #0xc ldr r0, [r4, #0x44] @@ -18611,7 +18611,7 @@ _02242570: add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 -_02242580: .word 0x021C48F8 +_02242580: .word UNK_021C48F8 _02242584: .word 0x00000000 _02242588: .word MOD18_022500C0 _0224258C: .word 0x00000626 @@ -19324,7 +19324,7 @@ _02242B0E: str r2, [r4, r0] b _02242E6C _02242B22: - ldr r1, _02242D78 ; =0x021C48F8 + ldr r1, _02242D78 ; =UNK_021C48F8 ldrh r2, [r1, #0x20] cmp r2, #0 beq _02242BD2 @@ -19612,7 +19612,7 @@ _02242D68: .word MOD18_022513A0 _02242D6C: .word 0x0000065E _02242D70: .word 0x0000065D _02242D74: .word 0x00000B3B -_02242D78: .word 0x021C48F8 +_02242D78: .word UNK_021C48F8 _02242D7C: .word 0x00000627 _02242D80: .word 0x0000062A _02242D84: @@ -45740,7 +45740,7 @@ MOD18_0224FC18: ; 0x0224FC18 add r5, r1, #0 str r0, [sp] add r0, #0x88 - ldr r1, _0224FCD4 ; =0x021C48F8 + ldr r1, _0224FCD4 ; =UNK_021C48F8 ldr r6, [r0] ldrh r0, [r1, #0x1c] ldrh r1, [r1, #0x1e] @@ -45825,7 +45825,7 @@ _0224FCCE: add sp, #0x24 pop {r4, r5, r6, r7, pc} nop -_0224FCD4: .word 0x021C48F8 +_0224FCD4: .word UNK_021C48F8 thumb_func_end MOD18_0224FC18 thumb_func_start MOD18_0224FCD8 @@ -45834,7 +45834,7 @@ MOD18_0224FCD8: ; 0x0224FCD8 sub sp, #0x1c add r4, r1, #0 add r0, #0x88 - ldr r1, _0224FD6C ; =0x021C48F8 + ldr r1, _0224FD6C ; =UNK_021C48F8 ldr r5, [r0] ldrh r0, [r1, #0x1c] add r6, r2, #0 @@ -45902,7 +45902,7 @@ _0224FD66: add sp, #0x1c pop {r3, r4, r5, r6, pc} nop -_0224FD6C: .word 0x021C48F8 +_0224FD6C: .word UNK_021C48F8 thumb_func_end MOD18_0224FCD8 thumb_func_start MOD18_0224FD70 @@ -45910,7 +45910,7 @@ MOD18_0224FD70: ; 0x0224FD70 push {r3, r4, r5, lr} add r3, r0, #0 mov r0, #0 - ldr r4, _0224FDD0 ; =0x021C48F8 + ldr r4, _0224FDD0 ; =UNK_021C48F8 str r0, [r2] ldrh r5, [r4, #0x20] cmp r5, #0 @@ -45959,7 +45959,7 @@ _0224FDC0: _0224FDCE: pop {r3, r4, r5, pc} .align 2, 0 -_0224FDD0: .word 0x021C48F8 +_0224FDD0: .word UNK_021C48F8 _0224FDD4: .word gUnknown21C48B8 _0224FDD8: .word 0x000004F8 thumb_func_end MOD18_0224FD70 @@ -45969,7 +45969,7 @@ MOD18_0224FDDC: ; 0x0224FDDC push {r3, r4, r5, lr} add r3, r0, #0 mov r0, #0 - ldr r4, _0224FE40 ; =0x021C48F8 + ldr r4, _0224FE40 ; =UNK_021C48F8 str r0, [r2] ldrh r5, [r4, #0x20] cmp r5, #0 @@ -46020,7 +46020,7 @@ _0224FE30: _0224FE3E: pop {r3, r4, r5, pc} .align 2, 0 -_0224FE40: .word 0x021C48F8 +_0224FE40: .word UNK_021C48F8 _0224FE44: .word gUnknown21C48B8 _0224FE48: .word 0x000004F8 thumb_func_end MOD18_0224FDDC @@ -46030,7 +46030,7 @@ MOD18_0224FE4C: ; 0x0224FE4C push {r4, lr} add r3, r0, #0 mov r0, #0 - ldr r4, _0224FE88 ; =0x021C48F8 + ldr r4, _0224FE88 ; =UNK_021C48F8 str r0, [r2] ldrh r4, [r4, #0x20] cmp r4, #0 @@ -46058,7 +46058,7 @@ _0224FE80: str r0, [r3, r1] pop {r4, pc} nop -_0224FE88: .word 0x021C48F8 +_0224FE88: .word UNK_021C48F8 _0224FE8C: .word gUnknown21C48B8 _0224FE90: .word 0x000004F8 thumb_func_end MOD18_0224FE4C @@ -46068,7 +46068,7 @@ MOD18_0224FE94: ; 0x0224FE94 push {r3, r4, r5, lr} add r3, r0, #0 mov r0, #0 - ldr r4, _0224FEF4 ; =0x021C48F8 + ldr r4, _0224FEF4 ; =UNK_021C48F8 str r0, [r2] ldrh r5, [r4, #0x20] cmp r5, #0 @@ -46117,7 +46117,7 @@ _0224FEE4: _0224FEF2: pop {r3, r4, r5, pc} .align 2, 0 -_0224FEF4: .word 0x021C48F8 +_0224FEF4: .word UNK_021C48F8 _0224FEF8: .word gUnknown21C48B8 _0224FEFC: .word 0x000004F8 thumb_func_end MOD18_0224FE94 diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index d5cf5223..78e44fb3 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -248,6 +248,9 @@ _021D76C4: .word 0x00000BB8 MOD52_021D76C8: ; 0x021D76C8 .word MOD52_021D757C, MOD52_021D7594, MOD52_021D75E8, 0xFFFFFFFF .word MOD52_021D7528, MOD52_021D7540, MOD52_021D7560, 0xFFFFFFFF + + .global MOD52_021D76E8 +MOD52_021D76E8: ; 0x021D76E8 .word MOD52_021D74E0, MOD52_021D74F8, MOD52_021D750C, 0xFFFFFFFF .global MOD52_021D76F8 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 517ae168..32e61a25 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -437,7 +437,7 @@ MOD53_021D78A8: ; 0x021D78A8 bl FUN_02009F80 add r0, r4, #0 bl FUN_0201AB60 - ldr r3, _021D78C8 ; =0x027E0000 + ldr r3, _021D78C8 ; =OS_IRQTable ldr r1, _021D78CC ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -445,7 +445,7 @@ MOD53_021D78A8: ; 0x021D78A8 str r0, [r3, r1] pop {r4, pc} .align 2, 0 -_021D78C8: .word 0x027E0000 +_021D78C8: .word OS_IRQTable _021D78CC: .word 0x00003FF8 thumb_func_end MOD53_021D78A8 @@ -1716,7 +1716,7 @@ _021D8316: bl FUN_02031190 lsl r1, r0, #2 ldr r0, [sp] - ldr r2, _021D83D0 ; =0x021C48F8 + ldr r2, _021D83D0 ; =UNK_021C48F8 add r1, r0, r1 mov r0, #0x76 lsl r0, r0, #2 @@ -1774,7 +1774,7 @@ _021D83C0: .word 0x0000438B _021D83C4: .word 0x00004377 _021D83C8: .word 0x000005E5 _021D83CC: .word MOD53_021D94F0 -_021D83D0: .word 0x021C48F8 +_021D83D0: .word UNK_021C48F8 _021D83D4: .word 0x00004378 _021D83D8: .word 0x00004380 thumb_func_end MOD53_021D81B0 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 752e8f3c..fbf8aba9 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -403,7 +403,7 @@ MOD54_021D784C: ; 0x021D784C bl FUN_02009F80 add r0, r4, #0 bl FUN_0201AB60 - ldr r3, _021D786C ; =0x027E0000 + ldr r3, _021D786C ; =OS_IRQTable ldr r1, _021D7870 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -411,7 +411,7 @@ MOD54_021D784C: ; 0x021D784C str r0, [r3, r1] pop {r4, pc} .align 2, 0 -_021D786C: .word 0x027E0000 +_021D786C: .word OS_IRQTable _021D7870: .word 0x00003FF8 thumb_func_end MOD54_021D784C diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index e341c23e..ecc39c8d 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -371,7 +371,7 @@ _021D77E6: bl FUN_0201AB60 bl FUN_0201C30C bl FUN_02009F80 - ldr r3, _021D7804 ; =0x027E0000 + ldr r3, _021D7804 ; =OS_IRQTable ldr r1, _021D7808 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -379,7 +379,7 @@ _021D77E6: str r0, [r3, r1] pop {r4, pc} nop -_021D7804: .word 0x027E0000 +_021D7804: .word OS_IRQTable _021D7808: .word 0x00003FF8 thumb_func_end MOD55_021D77D0 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index ef4e11b1..21e3047a 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -578,7 +578,7 @@ MOD56_0221228C: ; 0x0221228C bl FUN_0201AB60 bl FUN_0201C30C bl FUN_02009F80 - ldr r3, _022122AC ; =0x027E0000 + ldr r3, _022122AC ; =OS_IRQTable ldr r1, _022122B0 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -586,7 +586,7 @@ MOD56_0221228C: ; 0x0221228C str r0, [r3, r1] pop {r3, pc} .align 2, 0 -_022122AC: .word 0x027E0000 +_022122AC: .word OS_IRQTable _022122B0: .word 0x00003FF8 thumb_func_end MOD56_0221228C diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index ddc7f715..9644a30a 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -1599,7 +1599,7 @@ MOD57_021D81F8: ; 0x021D81F8 ldr r0, _021D82A8 ; =0x000030D4 sub r1, r6, #1 str r1, [r5, r0] - ldr r1, _021D82AC ; =0x021C48F8 + ldr r1, _021D82AC ; =UNK_021C48F8 add r4, r6, #0 ldrh r1, [r1, #0x20] cmp r1, #0 @@ -1634,7 +1634,7 @@ _021D8214: add r4, r6, #0 b _021D8288 _021D8248: - ldr r0, _021D82AC ; =0x021C48F8 + ldr r0, _021D82AC ; =UNK_021C48F8 ldrh r0, [r0, #0x22] cmp r0, #0 beq _021D8282 @@ -1686,7 +1686,7 @@ _021D82A2: pop {r4, r5, r6, pc} nop _021D82A8: .word 0x000030D4 -_021D82AC: .word 0x021C48F8 +_021D82AC: .word UNK_021C48F8 _021D82B0: .word MOD57_021D9754 _021D82B4: .word 0x00003318 _021D82B8: .word gUnknown21C48B8 @@ -1696,7 +1696,7 @@ _021D82B8: .word gUnknown21C48B8 MOD57_021D82BC: ; 0x021D82BC push {r4, r5, r6, lr} add r5, r0, #0 - ldr r0, _021D83BC ; =0x021C48F8 + ldr r0, _021D83BC ; =UNK_021C48F8 ldr r6, _021D83C0 ; =0x0000FFFF ldrh r3, [r0, #0x1c] mov r4, #0 @@ -1745,7 +1745,7 @@ _021D8312: blt _021D8358 cmp r2, #0x28 bgt _021D8358 - ldr r0, _021D83BC ; =0x021C48F8 + ldr r0, _021D83BC ; =UNK_021C48F8 ldrh r1, [r0, #0x1e] ldr r0, _021D83CC ; =0x000030E0 ldr r0, [r5, r0] @@ -1778,7 +1778,7 @@ _021D834C: _021D8358: cmp r2, #0x28 bgt _021D8398 - ldr r0, _021D83BC ; =0x021C48F8 + ldr r0, _021D83BC ; =UNK_021C48F8 ldrh r1, [r0, #0x1e] ldr r0, _021D83CC ; =0x000030E0 ldr r0, [r5, r0] @@ -1820,7 +1820,7 @@ _021D8398: lsr r1, r1, #0x18 bl MOD57_021D84AC _021D83AC: - ldr r1, _021D83BC ; =0x021C48F8 + ldr r1, _021D83BC ; =UNK_021C48F8 ldr r0, _021D83C4 ; =0x000030DC ldrh r2, [r1, #0x1c] str r2, [r5, r0] @@ -1829,7 +1829,7 @@ _021D83AC: str r1, [r5, r0] pop {r4, r5, r6, pc} .align 2, 0 -_021D83BC: .word 0x021C48F8 +_021D83BC: .word UNK_021C48F8 _021D83C0: .word 0x0000FFFF _021D83C4: .word 0x000030DC _021D83C8: .word 0x00003302 @@ -1942,7 +1942,7 @@ MOD57_021D848C: ; 0x021D848C push {r3, lr} bl FUN_0201C30C bl FUN_02009F80 - ldr r3, _021D84A4 ; =0x027E0000 + ldr r3, _021D84A4 ; =OS_IRQTable ldr r1, _021D84A8 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -1950,7 +1950,7 @@ MOD57_021D848C: ; 0x021D848C str r0, [r3, r1] pop {r3, pc} .align 2, 0 -_021D84A4: .word 0x027E0000 +_021D84A4: .word OS_IRQTable _021D84A8: .word 0x00003FF8 thumb_func_end MOD57_021D848C @@ -2567,7 +2567,7 @@ MOD57_021D890C: ; 0x021D890C strh r1, [r0] add r0, sp, #4 str r0, [sp] - ldr r3, _021D8950 ; =0x021C48F8 + ldr r3, _021D8950 ; =UNK_021C48F8 add r0, r5, #0 ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] @@ -2585,7 +2585,7 @@ _021D894C: add sp, #8 pop {r3, r4, r5, pc} .align 2, 0 -_021D8950: .word 0x021C48F8 +_021D8950: .word UNK_021C48F8 thumb_func_end MOD57_021D890C thumb_func_start MOD57_021D8954 @@ -2607,7 +2607,7 @@ MOD57_021D8954: ; 0x021D8954 strh r1, [r0] add r0, sp, #4 str r0, [sp] - ldr r3, _021D8998 ; =0x021C48F8 + ldr r3, _021D8998 ; =UNK_021C48F8 add r0, r5, #0 ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] @@ -2625,7 +2625,7 @@ _021D8994: add sp, #8 pop {r3, r4, r5, pc} .align 2, 0 -_021D8998: .word 0x021C48F8 +_021D8998: .word UNK_021C48F8 thumb_func_end MOD57_021D8954 thumb_func_start MOD57_021D899C diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 309b356c..12de0321 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -290,7 +290,7 @@ MOD58_021D9CB4: ; 0x021D9CB4 bl FUN_02009F80 add r0, r4, #0 bl FUN_0201AB60 - ldr r3, _021D9CD4 ; =0x027E0000 + ldr r3, _021D9CD4 ; =OS_IRQTable ldr r1, _021D9CD8 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -298,7 +298,7 @@ MOD58_021D9CB4: ; 0x021D9CB4 str r0, [r3, r1] pop {r4, pc} .align 2, 0 -_021D9CD4: .word 0x027E0000 +_021D9CD4: .word OS_IRQTable _021D9CD8: .word 0x00003FF8 thumb_func_end MOD58_021D9CB4 @@ -2320,7 +2320,7 @@ _021DAC6E: thumb_func_start MOD58_021DAC7C MOD58_021DAC7C: ; 0x021DAC7C push {r3, r4, r5, lr} - ldr r1, _021DAD28 ; =0x021C48F8 + ldr r1, _021DAD28 ; =UNK_021C48F8 add r4, r0, #0 ldrh r0, [r1, #0x1c] ldr r3, _021DAD2C ; =0x0000FFFF @@ -2353,7 +2353,7 @@ _021DACB0: blt _021DACE6 cmp r3, #0x28 bgt _021DACE6 - ldr r0, _021DAD28 ; =0x021C48F8 + ldr r0, _021DAD28 ; =UNK_021C48F8 ldrh r2, [r0, #0x1e] ldr r0, _021DAD34 ; =0x00005CAC ldr r1, [r4, r0] @@ -2378,7 +2378,7 @@ _021DACD4: _021DACE6: cmp r3, #0x28 bgt _021DAD16 - ldr r0, _021DAD28 ; =0x021C48F8 + ldr r0, _021DAD28 ; =UNK_021C48F8 ldrh r2, [r0, #0x1e] ldr r0, _021DAD34 ; =0x00005CAC ldr r1, [r4, r0] @@ -2402,7 +2402,7 @@ _021DAD02: add r0, r4, r0 bl MOD58_021DAD3C _021DAD16: - ldr r1, _021DAD28 ; =0x021C48F8 + ldr r1, _021DAD28 ; =UNK_021C48F8 ldr r0, _021DAD30 ; =0x00005CA8 ldrh r2, [r1, #0x1c] str r2, [r4, r0] @@ -2411,7 +2411,7 @@ _021DAD16: str r1, [r4, r0] pop {r3, r4, r5, pc} nop -_021DAD28: .word 0x021C48F8 +_021DAD28: .word UNK_021C48F8 _021DAD2C: .word 0x0000FFFF _021DAD30: .word 0x00005CA8 _021DAD34: .word 0x00005CAC diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index 3c354aee..fc1cec7b 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -275,7 +275,7 @@ _021D772C: .word FUN_0201AB60 thumb_func_start MOD59_021D7730 MOD59_021D7730: ; 0x021D7730 push {r3, r4} - ldr r2, _021D7788 ; =0x021C48F8 + ldr r2, _021D7788 ; =UNK_021C48F8 mov r0, #0 ldrh r1, [r2, #0x20] cmp r1, #0 @@ -324,7 +324,7 @@ _021D7784: pop {r3, r4} bx lr .align 2, 0 -_021D7788: .word 0x021C48F8 +_021D7788: .word UNK_021C48F8 thumb_func_end MOD59_021D7730 thumb_func_start MOD59_021D778C diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 8d19e186..dd5bdf55 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -406,7 +406,7 @@ _021D7804: bl FUN_020AEEB8 ldr r0, [r4, #0x14] bl FUN_0201AB60 - ldr r3, _021D782C ; =0x027E0000 + ldr r3, _021D782C ; =OS_IRQTable ldr r1, _021D7830 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -417,7 +417,7 @@ _021D7804: nop _021D7824: .word 0x00000202 _021D7828: .word 0xFFDFFFFF -_021D782C: .word 0x027E0000 +_021D782C: .word OS_IRQTable _021D7830: .word 0x00003FF8 thumb_func_end MOD60_021D77D4 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index 950a5689..729f0eb1 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -740,7 +740,7 @@ _021D7A88: bl FUN_020AEEB8 ldr r0, [r4, #0x18] bl FUN_0201AB60 - ldr r3, _021D7AA0 ; =0x027E0000 + ldr r3, _021D7AA0 ; =OS_IRQTable ldr r1, _021D7AA4 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -748,7 +748,7 @@ _021D7A88: str r0, [r3, r1] pop {r4, pc} .align 2, 0 -_021D7AA0: .word 0x027E0000 +_021D7AA0: .word OS_IRQTable _021D7AA4: .word 0x00003FF8 thumb_func_end MOD61_021D7A6C diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index d1aa6be9..9eb1fa41 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -50,7 +50,7 @@ MOD62_0222D5F8: ; 0x0222D5F8 beq _0222D64C cmp r2, #1 bne _0222D628 - ldr r3, _0222D650 ; =0x021C48F8 + ldr r3, _0222D650 ; =UNK_021C48F8 mov r1, #0x1c mov r2, #0x1e ldrsh r1, [r3, r1] @@ -85,7 +85,7 @@ _0222D628: _0222D64C: pop {r3, r4, r5, pc} nop -_0222D650: .word 0x021C48F8 +_0222D650: .word UNK_021C48F8 thumb_func_end MOD62_0222D5F8 thumb_func_start MOD62_0222D654 @@ -7523,7 +7523,7 @@ MOD62_022310CC: ; 0x022310CC add r4, #0xe4 ldr r0, [r4] bl FUN_0201AB60 - ldr r3, _02231104 ; =0x027E0000 + ldr r3, _02231104 ; =OS_IRQTable ldr r1, _02231108 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -7531,7 +7531,7 @@ MOD62_022310CC: ; 0x022310CC str r0, [r3, r1] pop {r4, pc} nop -_02231104: .word 0x027E0000 +_02231104: .word OS_IRQTable _02231108: .word 0x00003FF8 thumb_func_end MOD62_022310CC diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index f6d62b38..0d47ac71 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -265,7 +265,7 @@ _021D76EE: bl FUN_0201C30C ldr r0, [r4, #0x24] bl FUN_0201AB60 - ldr r3, _021D7708 ; =0x027E0000 + ldr r3, _021D7708 ; =OS_IRQTable ldr r1, _021D770C ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -273,7 +273,7 @@ _021D76EE: str r0, [r3, r1] pop {r4, pc} nop -_021D7708: .word 0x027E0000 +_021D7708: .word OS_IRQTable _021D770C: .word 0x00003FF8 thumb_func_end MOD65_021D76DC @@ -3030,7 +3030,7 @@ MOD65_021D8C88: ; 0x021D8C88 bl FUN_020081C4 bl FUN_0200BC30 bl FUN_0201C30C - ldr r3, _021D8CB0 ; =0x027E0000 + ldr r3, _021D8CB0 ; =OS_IRQTable ldr r1, _021D8CB4 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -3038,7 +3038,7 @@ MOD65_021D8C88: ; 0x021D8C88 str r0, [r3, r1] pop {r4, pc} nop -_021D8CB0: .word 0x027E0000 +_021D8CB0: .word OS_IRQTable _021D8CB4: .word 0x00003FF8 thumb_func_end MOD65_021D8C88 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 34220b58..ce7be54a 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -143,7 +143,7 @@ _021D75DE: bl MOD66_021D9220 ldr r0, [r4, #0x28] bl FUN_0201AB60 - ldr r3, _021D7600 ; =0x027E0000 + ldr r3, _021D7600 ; =OS_IRQTable ldr r1, _021D7604 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -152,7 +152,7 @@ _021D75DE: pop {r4, pc} .align 2, 0 _021D75FC: .word MOD66_021D95E8 -_021D7600: .word 0x027E0000 +_021D7600: .word OS_IRQTable _021D7604: .word 0x00003FF8 thumb_func_end MOD66_021D75C8 @@ -1402,7 +1402,7 @@ _021D7FCE: strh r1, [r0] add r0, sp, #4 str r0, [sp] - ldr r3, _021D7FF8 ; =0x021C48F8 + ldr r3, _021D7FF8 ; =UNK_021C48F8 ldr r0, [r5, #0x28] ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] @@ -1418,7 +1418,7 @@ _021D7FEE: pop {r4, r5, r6, pc} .align 2, 0 _021D7FF4: .word MOD66_021D9720 -_021D7FF8: .word 0x021C48F8 +_021D7FF8: .word UNK_021C48F8 thumb_func_end MOD66_021D7FA4 thumb_func_start MOD66_021D7FFC diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 857b05b7..a57f6021 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -176,7 +176,7 @@ MOD67_021D7660: ; 0x021D7660 push {r3, lr} ldr r0, [r0] bl FUN_0201AB60 - ldr r3, _021D7678 ; =0x027E0000 + ldr r3, _021D7678 ; =OS_IRQTable ldr r1, _021D767C ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -184,7 +184,7 @@ MOD67_021D7660: ; 0x021D7660 str r0, [r3, r1] pop {r3, pc} nop -_021D7678: .word 0x027E0000 +_021D7678: .word OS_IRQTable _021D767C: .word 0x00003FF8 thumb_func_end MOD67_021D7660 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 925a6c6a..52ed4639 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -188,7 +188,7 @@ MOD68_021D7680: ; 0x021D7680 push {r3, lr} ldr r0, [r0] bl FUN_0201AB60 - ldr r3, _021D7698 ; =0x027E0000 + ldr r3, _021D7698 ; =OS_IRQTable ldr r1, _021D769C ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -196,7 +196,7 @@ MOD68_021D7680: ; 0x021D7680 str r0, [r3, r1] pop {r3, pc} nop -_021D7698: .word 0x027E0000 +_021D7698: .word OS_IRQTable _021D769C: .word 0x00003FF8 thumb_func_end MOD68_021D7680 @@ -1183,7 +1183,7 @@ _021D7E50: mov r0, #2 tst r0, r1 bne _021D7E60 - ldr r0, _021D7E74 ; =0x021C48F8 + ldr r0, _021D7E74 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 beq _021D7E6C @@ -1198,7 +1198,7 @@ _021D7E6C: pop {r4, pc} .align 2, 0 _021D7E70: .word gUnknown21C48B8 -_021D7E74: .word 0x021C48F8 +_021D7E74: .word UNK_021C48F8 thumb_func_end MOD68_021D7D9C thumb_func_start MOD68_021D7E78 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index f4b87636..8afec6e0 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -539,7 +539,7 @@ MOD70_021D790C: ; 0x021D790C ldr r0, [r0, #0x34] bl FUN_0201FDEC bl FUN_02009F80 - ldr r3, _021D7928 ; =0x027E0000 + ldr r3, _021D7928 ; =OS_IRQTable ldr r1, _021D792C ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -547,7 +547,7 @@ MOD70_021D790C: ; 0x021D790C str r0, [r3, r1] pop {r3, pc} nop -_021D7928: .word 0x027E0000 +_021D7928: .word OS_IRQTable _021D792C: .word 0x00003FF8 thumb_func_end MOD70_021D790C diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 81137308..4e9cca68 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -1828,7 +1828,7 @@ MOD71_0222E4DC: ; 0x0222E4DC _0222E52E: bl FUN_0201C30C bl FUN_02009F80 - ldr r3, _0222E550 ; =0x027E0000 + ldr r3, _0222E550 ; =OS_IRQTable ldr r1, _0222E554 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -1839,7 +1839,7 @@ _0222E52E: nop _0222E548: .word 0x00002110 _0222E54C: .word 0x000020F0 -_0222E550: .word 0x027E0000 +_0222E550: .word OS_IRQTable _0222E554: .word 0x00003FF8 thumb_func_end MOD71_0222E4DC diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index a83f3eec..107b6334 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -1055,7 +1055,7 @@ _021D7D94: sub r0, r0, #1 str r0, [r4, #0x1c] bmi _021D7DAE - ldr r0, _021D7F50 ; =0x021C48F8 + ldr r0, _021D7F50 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 bne _021D7DAE @@ -1101,7 +1101,7 @@ _021D7DF4: ldr r0, [r4, #0x1c] sub r0, r0, #1 str r0, [r4, #0x1c] - ldr r0, _021D7F50 ; =0x021C48F8 + ldr r0, _021D7F50 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 bne _021D7E14 @@ -1214,7 +1214,7 @@ _021D7ED6: ldr r0, [r4, #0x1c] sub r0, r0, #1 str r0, [r4, #0x1c] - ldr r0, _021D7F50 ; =0x021C48F8 + ldr r0, _021D7F50 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 bne _021D7EF4 @@ -1271,7 +1271,7 @@ _021D7F3E: _021D7F44: .word 0x0000063C _021D7F48: .word 0x00001410 _021D7F4C: .word 0x000006C3 -_021D7F50: .word 0x021C48F8 +_021D7F50: .word UNK_021C48F8 _021D7F54: .word gUnknown21C48B8 _021D7F58: .word 0x0000152C _021D7F5C: .word 0x00001420 @@ -8110,7 +8110,7 @@ MOD73_021DB318: ; 0x021DB318 push {r4, lr} sub sp, #8 add r4, r0, #0 - ldr r0, _021DB364 ; =0x021C48F8 + ldr r0, _021DB364 ; =UNK_021C48F8 ldrh r1, [r0, #0x22] cmp r1, #0 beq _021DB33C @@ -8140,13 +8140,13 @@ _021DB33C: str r0, [r4, #8] ldr r0, [r4, #4] str r0, [r4, #0xc] - ldr r0, _021DB364 ; =0x021C48F8 + ldr r0, _021DB364 ; =UNK_021C48F8 ldrh r0, [r0, #0x22] str r0, [r4, #0x14] add sp, #8 pop {r4, pc} .align 2, 0 -_021DB364: .word 0x021C48F8 +_021DB364: .word UNK_021C48F8 thumb_func_end MOD73_021DB318 thumb_func_start MOD73_021DB368 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index bbf859db..acb40fad 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -344,7 +344,7 @@ MOD74_021D7784: ; 0x021D7784 bl FUN_020AEEB8 ldr r0, [r4, #0x10] bl FUN_0201AB60 - ldr r3, _021D77A4 ; =0x027E0000 + ldr r3, _021D77A4 ; =OS_IRQTable ldr r1, _021D77A8 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -352,7 +352,7 @@ MOD74_021D7784: ; 0x021D7784 str r0, [r3, r1] pop {r4, pc} .align 2, 0 -_021D77A4: .word 0x027E0000 +_021D77A4: .word OS_IRQTable _021D77A8: .word 0x00003FF8 thumb_func_end MOD74_021D7784 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index c937024d..ccf9d7c1 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -533,7 +533,7 @@ MOD75_021E700C: ; 0x021E700C bl FUN_0201AB60 bl FUN_0201C30C bl FUN_0200BC30 - ldr r3, _021E702C ; =0x027E0000 + ldr r3, _021E702C ; =OS_IRQTable ldr r1, _021E7030 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -541,7 +541,7 @@ MOD75_021E700C: ; 0x021E700C str r0, [r3, r1] pop {r3, pc} nop -_021E702C: .word 0x027E0000 +_021E702C: .word OS_IRQTable _021E7030: .word 0x00003FF8 thumb_func_end MOD75_021E700C @@ -3040,7 +3040,7 @@ MOD75_021E8374: ; 0x021E8374 strh r1, [r0] add r0, sp, #4 str r0, [sp] - ldr r3, _021E83C8 ; =0x021C48F8 + ldr r3, _021E83C8 ; =UNK_021C48F8 ldr r0, [r5] ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] @@ -3060,7 +3060,7 @@ _021E83B6: _021E83BC: .word 0x00000424 _021E83C0: .word MOD75_021EC628 _021E83C4: .word 0x0000FFFE -_021E83C8: .word 0x021C48F8 +_021E83C8: .word UNK_021C48F8 thumb_func_end MOD75_021E8374 thumb_func_start MOD75_021E83CC @@ -3084,7 +3084,7 @@ MOD75_021E83CC: ; 0x021E83CC strh r1, [r0] add r0, sp, #4 str r0, [sp] - ldr r3, _021E8420 ; =0x021C48F8 + ldr r3, _021E8420 ; =UNK_021C48F8 ldr r0, [r5] ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] @@ -3104,7 +3104,7 @@ _021E840E: _021E8414: .word 0x00000424 _021E8418: .word MOD75_021EC628 _021E841C: .word 0x0000FFFE -_021E8420: .word 0x021C48F8 +_021E8420: .word UNK_021C48F8 thumb_func_end MOD75_021E83CC thumb_func_start MOD75_021E8424 @@ -3598,7 +3598,7 @@ MOD75_021E87B8: ; 0x021E87B8 strh r1, [r0] add r0, sp, #4 str r0, [sp] - ldr r3, _021E8804 ; =0x021C48F8 + ldr r3, _021E8804 ; =UNK_021C48F8 ldr r0, [r4] ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] @@ -3620,7 +3620,7 @@ _021E87F4: nop _021E87FC: .word MOD75_021EC3F4 _021E8800: .word 0x0000FFFE -_021E8804: .word 0x021C48F8 +_021E8804: .word UNK_021C48F8 thumb_func_end MOD75_021E87B8 thumb_func_start MOD75_021E8808 @@ -4493,7 +4493,7 @@ MOD75_021E8EB0: ; 0x021E8EB0 mov r0, #3 tst r0, r1 bne _021E8ED2 - ldr r0, _021E8F0C ; =0x021C48F8 + ldr r0, _021E8F0C ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 beq _021E8F00 @@ -4525,7 +4525,7 @@ _021E8F00: .align 2, 0 _021E8F04: .word 0x00000426 _021E8F08: .word gUnknown21C48B8 -_021E8F0C: .word 0x021C48F8 +_021E8F0C: .word UNK_021C48F8 thumb_func_end MOD75_021E8EB0 thumb_func_start MOD75_021E8F10 @@ -4712,7 +4712,7 @@ _021E9070: mov r0, #3 tst r0, r1 bne _021E908E - ldr r0, _021E91B4 ; =0x021C48F8 + ldr r0, _021E91B4 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 beq _021E9132 @@ -4851,7 +4851,7 @@ _021E91A4: .word 0x00000483 _021E91A8: .word 0x000003D9 _021E91AC: .word 0x00000426 _021E91B0: .word gUnknown21C48B8 -_021E91B4: .word 0x021C48F8 +_021E91B4: .word UNK_021C48F8 thumb_func_end MOD75_021E8FD8 thumb_func_start MOD75_021E91B8 @@ -5128,7 +5128,7 @@ _021E93D2: mov r0, #3 tst r0, r1 bne _021E93F0 - ldr r0, _021E9438 ; =0x021C48F8 + ldr r0, _021E9438 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 beq _021E9422 @@ -5164,7 +5164,7 @@ _021E9428: .word 0x00000483 _021E942C: .word 0x000003D9 _021E9430: .word 0x00000426 _021E9434: .word gUnknown21C48B8 -_021E9438: .word 0x021C48F8 +_021E9438: .word UNK_021C48F8 thumb_func_end MOD75_021E9394 thumb_func_start MOD75_021E943C @@ -5564,7 +5564,7 @@ MOD75_021E9750: ; 0x021E9750 mov r0, #3 tst r0, r1 bne _021E9772 - ldr r0, _021E97A0 ; =0x021C48F8 + ldr r0, _021E97A0 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 beq _021E9794 @@ -5589,7 +5589,7 @@ _021E9794: .align 2, 0 _021E9798: .word 0x00000426 _021E979C: .word gUnknown21C48B8 -_021E97A0: .word 0x021C48F8 +_021E97A0: .word UNK_021C48F8 _021E97A4: .word 0x00000479 thumb_func_end MOD75_021E9750 @@ -5796,7 +5796,7 @@ MOD75_021E9930: ; 0x021E9930 mov r0, #3 tst r0, r1 bne _021E9952 - ldr r0, _021E997C ; =0x021C48F8 + ldr r0, _021E997C ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 beq _021E9970 @@ -5819,7 +5819,7 @@ _021E9970: .align 2, 0 _021E9974: .word 0x00000426 _021E9978: .word gUnknown21C48B8 -_021E997C: .word 0x021C48F8 +_021E997C: .word UNK_021C48F8 thumb_func_end MOD75_021E9930 thumb_func_start MOD75_021E9980 @@ -6547,7 +6547,7 @@ MOD75_021E9F74: ; 0x021E9F74 mov r0, #3 tst r0, r1 bne _021E9F96 - ldr r0, _021E9FD4 ; =0x021C48F8 + ldr r0, _021E9FD4 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 beq _021E9FC8 @@ -6579,7 +6579,7 @@ _021E9FC8: .align 2, 0 _021E9FCC: .word 0x00000426 _021E9FD0: .word gUnknown21C48B8 -_021E9FD4: .word 0x021C48F8 +_021E9FD4: .word UNK_021C48F8 _021E9FD8: .word 0x00000479 thumb_func_end MOD75_021E9F74 @@ -6790,7 +6790,7 @@ MOD75_021EA148: ; 0x021EA148 add r0, r1, #2 str r2, [r5, r0] add r0, r1, #0 - ldr r2, _021EA2C0 ; =0x021C48F8 + ldr r2, _021EA2C0 ; =UNK_021C48F8 add r0, #0xc ldrh r3, [r2, #0x1c] add r1, #0xe @@ -6812,7 +6812,7 @@ _021EA18A: mov r3, #0x50 ldr r1, _021EA2C4 ; =0x0000049E str r3, [sp] - ldr r4, _021EA2C0 ; =0x021C48F8 + ldr r4, _021EA2C0 ; =UNK_021C48F8 ldrh r0, [r5, r1] add r1, r1, #2 ldrh r1, [r5, r1] @@ -6937,7 +6937,7 @@ _021EA274: ldr r0, _021EA2D4 ; =0x00000494 str r1, [r5, r0] _021EA298: - ldr r1, _021EA2C0 ; =0x021C48F8 + ldr r1, _021EA2C0 ; =UNK_021C48F8 ldr r0, _021EA2C4 ; =0x0000049E ldrh r2, [r1, #0x1c] strh r2, [r5, r0] @@ -6959,7 +6959,7 @@ _021EA2B6: pop {r3, r4, r5, r6, r7, pc} nop _021EA2BC: .word 0x00000492 -_021EA2C0: .word 0x021C48F8 +_021EA2C0: .word UNK_021C48F8 _021EA2C4: .word 0x0000049E _021EA2C8: .word 0x0000049A _021EA2CC: .word 0x000001F6 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 852b7592..356fd136 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -250,7 +250,7 @@ MOD76_021D76E8: ; 0x021D76E8 bl FUN_0201AB60 bl FUN_0201C30C bl FUN_0200BC30 - ldr r3, _021D7708 ; =0x027E0000 + ldr r3, _021D7708 ; =OS_IRQTable ldr r1, _021D770C ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -258,7 +258,7 @@ MOD76_021D76E8: ; 0x021D76E8 str r0, [r3, r1] pop {r3, pc} nop -_021D7708: .word 0x027E0000 +_021D7708: .word OS_IRQTable _021D770C: .word 0x00003FF8 thumb_func_end MOD76_021D76E8 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 45d5c131..c16a4c14 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -1127,7 +1127,7 @@ MOD77_021D7E24: ; 0x021D7E24 ldr r0, _021D7F2C ; =0x0000C2F8 mov r1, #0 str r1, [r4, r0] - ldr r1, _021D7F30 ; =0x021C48F8 + ldr r1, _021D7F30 ; =UNK_021C48F8 ldrh r2, [r1, #0x20] cmp r2, #0 beq _021D7E86 @@ -1160,7 +1160,7 @@ _021D7E54: str r2, [r4, r1] sub r1, r0, #4 str r2, [r4, r1] - ldr r2, _021D7F30 ; =0x021C48F8 + ldr r2, _021D7F30 ; =UNK_021C48F8 add r1, r0, #4 ldrh r3, [r2, #0x1c] str r3, [r4, r1] @@ -1172,7 +1172,7 @@ _021D7E54: mov r1, #4 str r1, [r4, r0] _021D7E86: - ldr r0, _021D7F30 ; =0x021C48F8 + ldr r0, _021D7F30 ; =UNK_021C48F8 ldrh r0, [r0, #0x22] cmp r0, #0 beq _021D7F02 @@ -1227,7 +1227,7 @@ _021D7EBA: add r0, #0x14 str r2, [r4, r0] add r0, r1, #0 - ldr r2, _021D7F30 ; =0x021C48F8 + ldr r2, _021D7F30 ; =UNK_021C48F8 add r0, #8 ldrh r3, [r2, #0x1c] add r1, #0xc @@ -1260,7 +1260,7 @@ _021D7F10: pop {r4, pc} nop _021D7F2C: .word 0x0000C2F8 -_021D7F30: .word 0x021C48F8 +_021D7F30: .word UNK_021C48F8 _021D7F34: .word 0x0000C2FC _021D7F38: .word 0x0000C310 thumb_func_end MOD77_021D7E24 @@ -1269,7 +1269,7 @@ _021D7F38: .word 0x0000C310 MOD77_021D7F3C: ; 0x021D7F3C push {r3, r4, r5, r6, r7, lr} mov lr, r0 - ldr r0, _021D7FA4 ; =0x021C48F8 + ldr r0, _021D7FA4 ; =UNK_021C48F8 mov ip, r1 ldrh r5, [r0, #0x1c] mov r1, #0 @@ -1298,7 +1298,7 @@ _021D7F6C: add r0, r3, #0 and r0, r1 str r0, [r6] - ldr r0, _021D7FA4 ; =0x021C48F8 + ldr r0, _021D7FA4 ; =UNK_021C48F8 ldrh r3, [r0, #0x1e] ldr r0, _021D7FA8 ; =0x0000FFFF cmp r3, r0 @@ -1324,7 +1324,7 @@ _021D7F94: str r1, [r0] pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_021D7FA4: .word 0x021C48F8 +_021D7FA4: .word UNK_021C48F8 _021D7FA8: .word 0x0000FFFF thumb_func_end MOD77_021D7F3C diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 257ac70a..980d3321 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1713,7 +1713,7 @@ MOD80_0222E2E0: ; 0x0222E2E0 _0222E2F4: bl FUN_0201C30C bl FUN_02009F80 - ldr r3, _0222E310 ; =0x027E0000 + ldr r3, _0222E310 ; =OS_IRQTable ldr r1, _0222E314 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -1722,7 +1722,7 @@ _0222E2F4: pop {r4, pc} nop _0222E30C: .word 0x00001014 -_0222E310: .word 0x027E0000 +_0222E310: .word OS_IRQTable _0222E314: .word 0x00003FF8 thumb_func_end MOD80_0222E2E0 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 4f7d4453..a58eb8fe 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -328,7 +328,7 @@ MOD81_022380F4: ; 0x022380F4 ldr r0, [r1, #0x18] bl FUN_0201FDEC bl FUN_02009F80 - ldr r3, _02238110 ; =0x027E0000 + ldr r3, _02238110 ; =OS_IRQTable ldr r1, _02238114 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -336,7 +336,7 @@ MOD81_022380F4: ; 0x022380F4 str r0, [r3, r1] pop {r3, pc} nop -_02238110: .word 0x027E0000 +_02238110: .word OS_IRQTable _02238114: .word 0x00003FF8 thumb_func_end MOD81_022380F4 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 48654b9a..80b848a6 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -901,7 +901,7 @@ MOD82_0222DCC4: ; 0x0222DCC4 push {r3, lr} bl FUN_0201C30C bl FUN_02009F80 - ldr r3, _0222DCDC ; =0x027E0000 + ldr r3, _0222DCDC ; =OS_IRQTable ldr r1, _0222DCE0 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -909,7 +909,7 @@ MOD82_0222DCC4: ; 0x0222DCC4 str r0, [r3, r1] pop {r3, pc} .align 2, 0 -_0222DCDC: .word 0x027E0000 +_0222DCDC: .word OS_IRQTable _0222DCE0: .word 0x00003FF8 thumb_func_end MOD82_0222DCC4 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 3937ec87..07496c77 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -1895,7 +1895,7 @@ MOD83_0222E464: ; 0x0222E464 bl FUN_02009F80 add r0, r4, #0 bl FUN_0201AB60 - ldr r3, _0222E484 ; =0x027E0000 + ldr r3, _0222E484 ; =OS_IRQTable ldr r1, _0222E488 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -1903,7 +1903,7 @@ MOD83_0222E464: ; 0x0222E464 str r0, [r3, r1] pop {r4, pc} .align 2, 0 -_0222E484: .word 0x027E0000 +_0222E484: .word OS_IRQTable _0222E488: .word 0x00003FF8 thumb_func_end MOD83_0222E464 @@ -2308,12 +2308,12 @@ _0222E7C0: ; jump table .short _0222E80A - _0222E7C0 - 2 ; case 7 _0222E7D0: ldr r0, _0222E824 ; =SDK_OVERLAY_MODULE_52_ID - ldr r1, _0222E828 ; =0x021D76C8 + ldr r1, _0222E828 ; =MOD52_021D76C8 bl FUN_02000E7C pop {r3, pc} _0222E7DA: ldr r0, _0222E824 ; =SDK_OVERLAY_MODULE_52_ID - ldr r1, _0222E82C ; =0x021D76E8 + ldr r1, _0222E82C ; =MOD52_021D76E8 bl FUN_02000E7C pop {r3, pc} _0222E7E4: @@ -2338,28 +2338,28 @@ _0222E802: _0222E80A: bl FUN_0200541C mov r0, #0 - ldr r1, _0222E844 ; =0x020FD6D4 + ldr r1, _0222E844 ; =UNK_020FD6D4 mvn r0, r0 bl FUN_02000E7C pop {r3, pc} _0222E81A: ldr r0, _0222E848 ; =SDK_OVERLAY_MODULE_63_ID - ldr r1, _0222E84C ; =0x021DBAB8 + ldr r1, _0222E84C ; =MOD63_021DBAB8 bl FUN_02000E7C _0222E822: pop {r3, pc} .align 2, 0 _0222E824: .word SDK_OVERLAY_MODULE_52_ID -_0222E828: .word 0x021D76C8 -_0222E82C: .word 0x021D76E8 +_0222E828: .word MOD52_021D76C8 +_0222E82C: .word MOD52_021D76E8 _0222E830: .word SDK_OVERLAY_MODULE_83_ID _0222E834: .word MOD83_0223A434 _0222E838: .word MOD83_0223A4FC _0222E83C: .word MOD83_0223A3A8 _0222E840: .word MOD83_0223A8C4 -_0222E844: .word 0x020FD6D4 +_0222E844: .word UNK_020FD6D4 _0222E848: .word SDK_OVERLAY_MODULE_63_ID -_0222E84C: .word 0x021DBAB8 +_0222E84C: .word MOD63_021DBAB8 thumb_func_end MOD83_0222E7AC thumb_func_start MOD83_0222E850 @@ -3313,7 +3313,7 @@ MOD83_0222F048: ; 0x0222F048 mov r0, #0x5b bl FUN_020168D0 ldr r0, _0222F06C ; =SDK_OVERLAY_MODULE_63_ID - ldr r1, _0222F070 ; =0x021DBAB8 + ldr r1, _0222F070 ; =MOD63_021DBAB8 bl FUN_02000E7C add r0, r4, #0 bl FUN_0200627C @@ -3323,7 +3323,7 @@ MOD83_0222F048: ; 0x0222F048 pop {r4, pc} nop _0222F06C: .word SDK_OVERLAY_MODULE_63_ID -_0222F070: .word 0x021DBAB8 +_0222F070: .word MOD63_021DBAB8 thumb_func_end MOD83_0222F048 thumb_func_start MOD83_0222F074 @@ -7683,7 +7683,7 @@ MOD83_0223137C: ; 0x0223137C cmp r0, #0 bne _0223139A ldr r0, _022313D0 ; =SDK_OVERLAY_MODULE_63_ID - ldr r1, _022313D4 ; =0x021DBAB8 + ldr r1, _022313D4 ; =MOD63_021DBAB8 bl FUN_02000E7C b _022313A6 _0223139A: @@ -7712,7 +7712,7 @@ _022313C6: pop {r3, r4, r5, pc} .align 2, 0 _022313D0: .word SDK_OVERLAY_MODULE_63_ID -_022313D4: .word 0x021DBAB8 +_022313D4: .word MOD63_021DBAB8 _022313D8: .word SDK_OVERLAY_MODULE_83_ID _022313DC: .word MOD83_0223A444 _022313E0: .word 0x000015D4 @@ -18219,7 +18219,7 @@ _02236520: bl FUN_02009F80 ldr r0, [r4, #0x20] bl FUN_0201AB60 - ldr r3, _02236540 ; =0x027E0000 + ldr r3, _02236540 ; =OS_IRQTable ldr r1, _02236544 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -18228,7 +18228,7 @@ _02236520: pop {r4, pc} .align 2, 0 _0223653C: .word 0x00012604 -_02236540: .word 0x027E0000 +_02236540: .word OS_IRQTable _02236544: .word 0x00003FF8 thumb_func_end MOD83_0223650C @@ -18475,7 +18475,7 @@ _02236712: mov r0, #1 pop {r3, r4, r5, pc} _02236730: - ldr r0, _0223675C ; =0x021C48F8 + ldr r0, _0223675C ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 bne _02236740 @@ -18496,7 +18496,7 @@ _02236750: .align 2, 0 _02236754: .word 0x000005DC _02236758: .word 0x00000474 -_0223675C: .word 0x021C48F8 +_0223675C: .word UNK_021C48F8 _02236760: .word gUnknown21C48B8 thumb_func_end MOD83_022366D0 @@ -18575,7 +18575,7 @@ MOD83_02236804: ; 0x02236804 bl CTRDG_IsPulledOut cmp r0, #1 beq _02236822 - ldr r0, _02236B3C ; =0x02106FA4 + ldr r0, _02236B3C ; =gBacklightTop + 4 ldr r0, [r0] cmp r0, #0 beq _02236828 @@ -18791,7 +18791,7 @@ _022369BC: str r0, [r5] b _02236D90 _022369CE: - ldr r0, _02236B54 ; =0x021C48F8 + ldr r0, _02236B54 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 bne _022369DE @@ -18965,13 +18965,13 @@ _02236B2E: str r0, [r5] b _02236D90 .align 2, 0 -_02236B3C: .word 0x02106FA4 +_02236B3C: .word gBacklightTop + 4 _02236B40: .word 0x000004A8 _02236B44: .word 0x000004AC _02236B48: .word 0x0000E880 _02236B4C: .word MOD83_0223650C _02236B50: .word 0x0000E88C -_02236B54: .word 0x021C48F8 +_02236B54: .word UNK_021C48F8 _02236B58: .word gUnknown21C48B8 _02236B5C: .word 0x00000498 _02236B60: .word 0x0000E898 @@ -19221,7 +19221,7 @@ _02236D36: bl FUN_020166B8 b _02236D90 _02236D54: - ldr r0, _02236DC8 ; =0x021C48F8 + ldr r0, _02236DC8 ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 bne _02236D64 @@ -19269,7 +19269,7 @@ _02236DB8: .word 0x0000E890 _02236DBC: .word 0x0000E898 _02236DC0: .word 0x0000061B _02236DC4: .word 0x0000042C -_02236DC8: .word 0x021C48F8 +_02236DC8: .word UNK_021C48F8 _02236DCC: .word gUnknown21C48B8 thumb_func_end MOD83_02236804 @@ -19281,7 +19281,7 @@ MOD83_02236DD0: ; 0x02236DD0 ldr r0, [r0, #0x20] bl FreeToHeap ldr r0, _02236DFC ; =SDK_OVERLAY_MODULE_63_ID - ldr r1, _02236E00 ; =0x021DBAB8 + ldr r1, _02236E00 ; =MOD63_021DBAB8 bl FUN_02000E7C add r0, r4, #0 bl FUN_0200627C @@ -19293,7 +19293,7 @@ MOD83_02236DD0: ; 0x02236DD0 pop {r4, pc} .align 2, 0 _02236DFC: .word SDK_OVERLAY_MODULE_63_ID -_02236E00: .word 0x021DBAB8 +_02236E00: .word MOD63_021DBAB8 thumb_func_end MOD83_02236DD0 thumb_func_start MOD83_02236E04 @@ -23826,7 +23826,7 @@ MOD83_02238F00: ; 0x02238F00 _02238F1E: bl FUN_0201C30C bl FUN_02009F80 - ldr r3, _02238F3C ; =0x027E0000 + ldr r3, _02238F3C ; =OS_IRQTable ldr r1, _02238F40 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -23836,7 +23836,7 @@ _02238F1E: .align 2, 0 _02238F34: .word MOD83_0223CAB0 _02238F38: .word MOD83_0223BC30 -_02238F3C: .word 0x027E0000 +_02238F3C: .word OS_IRQTable _02238F40: .word 0x00003FF8 thumb_func_end MOD83_02238F00 @@ -26065,7 +26065,7 @@ _0223A002: str r0, [r5] b _0223A034 _0223A020: - ldr r1, _0223A278 ; =0x021DD984 + ldr r1, _0223A278 ; =MOD04_021DD984 add r0, r0, #4 str r1, [r4, r0] ldr r0, _0223A27C ; =0x00001004 @@ -26351,7 +26351,7 @@ _0223A268: .word 0x00001003 _0223A26C: .word 0x0000261C _0223A270: .word MOD83_0223CADC _0223A274: .word 0x0000100D -_0223A278: .word 0x021DD984 +_0223A278: .word MOD04_021DD984 _0223A27C: .word 0x00001004 _0223A280: .word gUnknown21C48B8 _0223A284: .word 0x00001005 @@ -26450,7 +26450,7 @@ _0223A35C: .word 0x0000261C .rodata .global MOD83_0223A360 MOD83_0223A360: ; 0x0223A360 - .byte 0x8D, 0xE4, 0x22, 0x02, 0x41, 0xE5, 0x22, 0x02, 0x51, 0xE8, 0x22, 0x02, 0xFF, 0xFF, 0xFF, 0xFF + .word MOD83_0222E48C, MOD83_0222E540, MOD83_0222E850, 0xFFFFFFFF .global MOD83_0223A370 MOD83_0223A370: ; 0x0223A370 @@ -26464,7 +26464,7 @@ MOD83_0223A380: ; 0x0223A380 .global MOD83_0223A3A8 MOD83_0223A3A8: ; 0x0223A3A8 - .byte 0xF9, 0xED, 0x22, 0x02, 0x8D, 0xEE, 0x22, 0x02, 0x49, 0xF0, 0x22, 0x02, 0xFF, 0xFF, 0xFF, 0xFF + .word MOD83_0222EDF8, MOD83_0222EE8C, MOD83_0222F048, 0xFFFFFFFF .global MOD83_0223A3B8 MOD83_0223A3B8: ; 0x0223A3B8 @@ -26478,8 +26478,8 @@ MOD83_0223A3C8: ; 0x0223A3C8 .global MOD83_0223A3F0 MOD83_0223A3F0: ; 0x0223A3F0 - .byte 0x85, 0xF9, 0x22, 0x02, 0xB1, 0xF9, 0x22, 0x02, 0xB9, 0xF9, 0x22, 0x02, 0xC5, 0xF9, 0x22, 0x02 - .byte 0x81, 0xDA, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00 + .word MOD83_0222F984, MOD83_0222F9B0, MOD83_0222F9B8, MOD83_0222F9C4 + .word FUN_0202DA80, 0x00000000 .global MOD83_0223A408 MOD83_0223A408: ; 0x0223A408 @@ -26492,11 +26492,11 @@ MOD83_0223A418: ; 0x0223A418 .global MOD83_0223A434 MOD83_0223A434: ; 0x0223A434 - .byte 0x55, 0x09, 0x23, 0x02, 0x11, 0x0A, 0x23, 0x02, 0x7D, 0x13, 0x23, 0x02, 0xFF, 0xFF, 0xFF, 0xFF + .word MOD83_02230954, MOD83_02230A10, MOD83_0223137C, 0xFFFFFFFF .global MOD83_0223A444 MOD83_0223A444: ; 0x0223A444 - .byte 0xA9, 0x23, 0x23, 0x02, 0x89, 0x27, 0x23, 0x02, 0xA5, 0x30, 0x23, 0x02, 0xFF, 0xFF, 0xFF, 0xFF + .word MOD83_022323A8, MOD83_02232788, MOD83_022330A4, 0xFFFFFFFF .global MOD83_0223A454 MOD83_0223A454: ; 0x0223A454 @@ -26530,7 +26530,7 @@ MOD83_0223A4D4: ; 0x0223A4D4 .global MOD83_0223A4FC MOD83_0223A4FC: ; 0x0223A4FC - .byte 0x65, 0x67, 0x23, 0x02, 0x05, 0x68, 0x23, 0x02, 0xD1, 0x6D, 0x23, 0x02, 0xFF, 0xFF, 0xFF, 0xFF + .word MOD83_02236764, MOD83_02236804, MOD83_02236DD0, 0xFFFFFFFF .global MOD83_0223A50C MOD83_0223A50C: ; 0x0223A50C @@ -26661,13 +26661,13 @@ MOD83_0223A854: ; 0x0223A854 .global MOD83_0223A85C MOD83_0223A85C: ; 0x0223A85C - .byte 0x00, 0x00, 0x00, 0x00, 0x25, 0xDD, 0x22, 0x02, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x41, 0xDF, 0x22, 0x02, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0xED, 0xDF, 0x22, 0x02, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0xCD, 0xDE, 0x22, 0x02, 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x49, 0xE0, 0x22, 0x02, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x99, 0xE0, 0x22, 0x02 + .word 0x00, MOD83_0222DD24, 0x02, 0x02 + .word 0x01, 0x00000000, 0x03, 0x02 + .word 0x02, MOD83_0222DF40, 0x04, 0x02 + .word 0x03, MOD83_0222DFEC, 0x05, 0x02 + .word 0x00, MOD83_0222DECC, 0x06, 0x02 + .word 0x0A, MOD83_0222E048, 0x07, 0x02 + .word 0x0B, MOD83_0222E098 .global MOD83_0223A8C4 MOD83_0223A8C4: ; 0x0223A8C4 @@ -26675,7 +26675,8 @@ MOD83_0223A8C4: ; 0x0223A8C4 .global MOD83_0223A8D4 MOD83_0223A8D4: ; 0x0223A8D4 - .byte 0x16, 0x01, 0x15, 0x00, 0x70, 0xB8, 0x23, 0x02, 0x60, 0xB8, 0x23, 0x02 + .byte 0x16, 0x01, 0x15, 0x00 + .word MOD83_0223B870, MOD83_0223B860 .global MOD83_0223A8E0 MOD83_0223A8E0: ; 0x0223A8E0 @@ -26761,53 +26762,67 @@ MOD83_0223AD6C: ; 0x0223AD6C .global MOD83_0223AD98 MOD83_0223AD98: ; 0x0223AD98 - .byte 0x12, 0x00, 0x00, 0x00, 0xAD, 0x00, 0x23, 0x02, 0x13, 0x00, 0x00, 0x00, 0xE9, 0xFD, 0x22, 0x02 + .word 0x12, MOD83_022300AC + .word 0x13, MOD83_0222FDE8 .global MOD83_0223ADA8 MOD83_0223ADA8: ; 0x0223ADA8 - .byte 0x12, 0x00, 0x00, 0x00, 0x11, 0x00, 0x23, 0x02, 0x13, 0x00, 0x00, 0x00, 0xE9, 0xFD, 0x22, 0x02 + .word 0x12, MOD83_02230010 + .word 0x13, MOD83_0222FDE8 .global MOD83_0223ADB8 MOD83_0223ADB8: ; 0x0223ADB8 - .byte 0x12, 0x00, 0x00, 0x00, 0x49, 0x00, 0x23, 0x02, 0x13, 0x00, 0x00, 0x00, 0x85, 0x00, 0x23, 0x02 + .word 0x12, MOD83_02230048 + .word 0x13, MOD83_02230084 .global MOD83_0223ADC8 MOD83_0223ADC8: ; 0x0223ADC8 - .byte 0x12, 0x00, 0x00, 0x00, 0x5D, 0xFB, 0x22, 0x02, 0x13, 0x00, 0x00, 0x00, 0xE9, 0xFD, 0x22, 0x02 + .word 0x12, MOD83_0222FB5C, 0x13, MOD83_0222FDE8 .global MOD83_0223ADD8 MOD83_0223ADD8: ; 0x0223ADD8 - .byte 0x12, 0x00, 0x00, 0x00, 0xBD, 0xFB, 0x22, 0x02, 0x13, 0x00, 0x00, 0x00, 0xD9, 0xFF, 0x22, 0x02 - .byte 0x0C, 0x00, 0x00, 0x00, 0x19, 0x01, 0x23, 0x02, 0x0D, 0x00, 0x00, 0x00, 0x9D, 0x01, 0x23, 0x02 - .byte 0x0E, 0x00, 0x00, 0x00, 0xD5, 0x01, 0x23, 0x02 + .word 0x12, MOD83_0222FBBC + .word 0x13, MOD83_0222FFD8 + .word 0x0C, MOD83_02230118 + .word 0x0D, MOD83_0223019C + .word 0x0E, MOD83_022301D4 .global MOD83_0223AE00 MOD83_0223AE00: ; 0x0223AE00 - .byte 0x00, 0x00, 0x00, 0x00, 0x15, 0x94, 0x23, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .word 0x00, MOD83_02239414, 0x00, 0x00 .byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x0C, 0x00, 0x10, 0x2F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00 .global MOD83_0223AE20 MOD83_0223AE20: ; 0x0223AE20 - .byte 0x0F, 0x00, 0x00, 0x00, 0x25, 0xFE, 0x22, 0x02, 0x14, 0x00, 0x00, 0x00, 0x11, 0xFF, 0x22, 0x02 - .byte 0x10, 0x00, 0x00, 0x00, 0xA1, 0xFE, 0x22, 0x02, 0x11, 0x00, 0x00, 0x00, 0xF9, 0x00, 0x23, 0x02 + .word 0x0F, MOD83_0222FE24 + .word 0x14, MOD83_0222FF10 + .word 0x10, MOD83_0222FEA0 + .word 0x11, MOD83_022300F8 .global MOD83_0223AE40 MOD83_0223AE40: ; 0x0223AE40 - .byte 0x40, 0x00, 0x00, 0x00, 0x31, 0x19, 0x23, 0x02, 0x41, 0x00, 0x00, 0x00, 0xD1, 0x19, 0x23, 0x02 + .word 0x40, MOD83_02231930 + .word 0x41, MOD83_022319D0 .global MOD83_0223AE50 MOD83_0223AE50: ; 0x0223AE50 - .byte 0x40, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0xD1, 0x19, 0x23, 0x02 + .byte 0x40, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 + .word 0x41, MOD83_022319D0 .global MOD83_0223AE60 MOD83_0223AE60: ; 0x0223AE60 - .byte 0x40, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0xD1, 0x19, 0x23, 0x02 - .byte 0x2A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0xB1, 0x18, 0x23, 0x02 - .byte 0x2C, 0x00, 0x00, 0x00, 0xE1, 0x18, 0x23, 0x02, 0x2D, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00 + .byte 0x40, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00 + .word 0x41, MOD83_022319D0 + .byte 0x2A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 + .word 0x2B, MOD83_022318B0 + .word 0x2C, MOD83_022318E0 + .byte 0x2D, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00 + .global MOD83_0223AE90 MOD83_0223AE90: ; 0x0223AE90 - .byte 0x00, 0x00, 0x00, 0x00, 0x15, 0x94, 0x23, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .word 0x00, MOD83_02239414 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x04, 0x00, 0x00, 0x0C, 0x00, 0x10, 0x2F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00 .global MOD83_0223AEB0 @@ -26998,28 +27013,66 @@ MOD83_0223B69C: ; 0x0223B69C .byte 0x45, 0x4A, 0x35, 0x42, 0x45, 0x4B, 0x35, 0x42, 0x45, 0x4C, 0x35, 0x42, 0x45, 0x4D, 0x35, 0x42 .byte 0x45, 0x50, 0x35, 0x42, 0x45, 0x51, 0x35, 0x42, 0x45, 0x52, 0x35, 0x42, 0x45, 0x53, 0x35, 0x42 .byte 0x45, 0x54, 0x35, 0x42, 0x45, 0x55, 0x35, 0x42, 0x45, 0x56, 0x35, 0x42, 0x45, 0x57, 0x35, 0x42 - .byte 0x00, 0x00, 0x00, 0x00, 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54 - .byte 0x45, 0x5F, 0x49, 0x44, 0x4C, 0x45, 0x00, 0x00, 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53 - .byte 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x42, 0x55, 0x53, 0x59, 0x00, 0x00, 0x6D, 0x79, 0x77, 0x68 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD83_0223B6F0 +MOD83_0223B6F0: ; 0x0223B6F0 + .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54 + .byte 0x45, 0x5F, 0x49, 0x44, 0x4C, 0x45, 0x00, 0x00 + + .global MOD83_0223B704 +MOD83_0223B704: ; 0x0223B704 + .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53 + .byte 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x42, 0x55, 0x53, 0x59, 0x00, 0x00 + + .global MOD83_0223B718 +MOD83_0223B718: ; 0x0223B718 + .byte 0x6D, 0x79, 0x77, 0x68 .byte 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x53, 0x54, 0x4F, 0x50, 0x00, 0x00 + + .global MOD83_0223B72C +MOD83_0223B72C: ; 0x0223B72C .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x45, 0x52 - .byte 0x52, 0x4F, 0x52, 0x00, 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54 - .byte 0x45, 0x5F, 0x53, 0x43, 0x41, 0x4E, 0x4E, 0x49, 0x4E, 0x47, 0x00, 0x00, 0x6D, 0x79, 0x77, 0x68 + .byte 0x52, 0x4F, 0x52, 0x00 + + .global MOD83_0223B740 +MOD83_0223B740: ; 0x0223B740 + .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54 + .byte 0x45, 0x5F, 0x53, 0x43, 0x41, 0x4E, 0x4E, 0x49, 0x4E, 0x47, 0x00, 0x00 + + .global MOD83_0223B758 +MOD83_0223B758: ; 0x0223B758 + .byte 0x6D, 0x79, 0x77, 0x68 .byte 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43 - .byte 0x54, 0x45, 0x44, 0x00, 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54 + .byte 0x54, 0x45, 0x44, 0x00 + + .global MOD83_0223B770 +MOD83_0223B770: ; 0x0223B770 + .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54 .byte 0x45, 0x5F, 0x4B, 0x45, 0x59, 0x53, 0x48, 0x41, 0x52, 0x49, 0x4E, 0x47, 0x00, 0x00, 0x00, 0x00 + + .global MOD83_0223B78C +MOD83_0223B78C: ; 0x0223B78C .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x44, 0x41 - .byte 0x54, 0x41, 0x53, 0x48, 0x41, 0x52, 0x49, 0x4E, 0x47, 0x00, 0x00, 0x00, 0x6D, 0x79, 0x77, 0x68 + .byte 0x54, 0x41, 0x53, 0x48, 0x41, 0x52, 0x49, 0x4E, 0x47, 0x00, 0x00, 0x00 + + .global MOD83_0223B7A8 +MOD83_0223B7A8: ; 0x0223B7A8 + .byte 0x6D, 0x79, 0x77, 0x68 .byte 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43 - .byte 0x54, 0x5F, 0x46, 0x41, 0x49, 0x4C, 0x00, 0x00, 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53 + .byte 0x54, 0x5F, 0x46, 0x41, 0x49, 0x4C, 0x00, 0x00 + + .global MOD83_0223B7C4 +MOD83_0223B7C4: ; 0x0223B7C4 + .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53 .byte 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x4D, 0x45, 0x41, 0x53, 0x55, 0x52, 0x45, 0x43, 0x48, 0x41 .byte 0x4E, 0x4E, 0x45, 0x4C, 0x00, 0x00, 0x00, 0x00 .global MOD83_0223B7E4 MOD83_0223B7E4: ; 0x0223B7E4 - .byte 0x18, 0xB7, 0x23, 0x02, 0xF0, 0xB6, 0x23, 0x02, 0x40, 0xB7, 0x23, 0x02, 0x04, 0xB7, 0x23, 0x02 - .byte 0x58, 0xB7, 0x23, 0x02, 0x8C, 0xB7, 0x23, 0x02, 0x70, 0xB7, 0x23, 0x02, 0xC4, 0xB7, 0x23, 0x02 - .byte 0xA8, 0xB7, 0x23, 0x02, 0x2C, 0xB7, 0x23, 0x02 + .word MOD83_0223B718, MOD83_0223B6F0, MOD83_0223B740, MOD83_0223B704 + .word MOD83_0223B758, MOD83_0223B78C, MOD83_0223B770, MOD83_0223B7C4 + .word MOD83_0223B7A8, MOD83_0223B72C .global MOD83_0223B80C MOD83_0223B80C: ; 0x0223B80C |