diff options
40 files changed, 110 insertions, 107 deletions
diff --git a/arm9/asm/OS_alarm.s b/arm9/asm/OS_alarm.s index 1e32c0e3..9978bfbe 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 ; =OS_IRQTable + ldr r0, _020CCF20 ; =0x027E0000 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 OS_IRQTable +_020CCF20: .word 0x027E0000 _020CCF24: .word OSi_AlarmQueue arm_func_start OS_CancelAlarm diff --git a/arm9/asm/unk_02015EA0.s b/arm9/asm/unk_02015EA0.s index fba42f0b..3a876cb5 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 ; =OS_IRQTable + ldr r3, _02015EC8 ; =0x027E0000 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 OS_IRQTable +_02015EC8: .word 0x027E0000 _02015ECC: .word 0x00003FF8 _02015ED0: .word gUnknown21C48B8 thumb_func_start FUN_02015ED4 FUN_02015ED4: ; 0x02015ED4 - ldr r3, _02015EE8 ; =OS_IRQTable + ldr r3, _02015EE8 ; =0x027E0000 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 OS_IRQTable +_02015EE8: .word 0x027E0000 _02015EEC: .word 0x00003FF8 _02015EF0: .word MI_WaitDma diff --git a/arm9/asm/unk_02020AFC.s b/arm9/asm/unk_02020AFC.s index 46ea1a85..3d43d259 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 ; =OS_IRQTable + ldr r3, _02020B70 ; =0x027E0000 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 OS_IRQTable +_02020B70: .word 0x027E0000 _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 abc07964..ff184e1c 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 ; =OS_IRQTable + ldr r3, _02033F64 ; =0x027E0000 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 OS_IRQTable +_02033F64: .word 0x027E0000 _02033F68: .word 0x00003FF8 _02033F6C: .word MI_WaitDma diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index b6e829ee..30db1fe3 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 ; =OS_IRQTable + ldr r3, _0206DD64 ; =0x027E0000 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 OS_IRQTable +_0206DD64: .word 0x027E0000 _0206DD68: .word 0x00003FF8 thumb_func_start FUN_0206DD6C diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 7fc0cd29..23b8fdb0 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 ; =OS_IRQTable + ldr r3, _0206FB78 ; =0x027E0000 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 OS_IRQTable +_0206FB78: .word 0x027E0000 _0206FB7C: .word 0x00003FF8 thumb_func_start FUN_0206FB80 diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index f589578f..6011647b 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 ; =OS_IRQTable + ldr r3, _02077B00 ; =0x027E0000 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 OS_IRQTable +_02077B00: .word 0x027E0000 _02077B04: .word 0x00003FF8 thumb_func_start FUN_02077B08 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 7d952d1a..644dbb64 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 ; =OS_IRQTable + ldr r3, _02079F50 ; =0x027E0000 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 OS_IRQTable +_02079F50: .word 0x027E0000 _02079F54: .word 0x00003FF8 thumb_func_start FUN_02079F58 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index aee0c117..d479cde5 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 ; =OS_IRQTable + ldr r3, _02086690 ; =0x027E0000 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 OS_IRQTable +_02086690: .word 0x027E0000 _02086694: .word 0x00003FF8 thumb_func_start FUN_02086698 diff --git a/arm9/asm/unk_0208A998.s b/arm9/asm/unk_0208A998.s index 21601e50..2c02879a 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 ; =OS_IRQTable + ldr r3, _0208A9AC ; =0x027E0000 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 OS_IRQTable +_0208A9AC: .word 0x027E0000 _0208A9B0: .word 0x00003FF8 _0208A9B4: .word MI_WaitDma diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 44f186d8..26d85266 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 ; =OS_IRQTable + ldr r3, _02212D90 ; =0x027E0000 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 OS_IRQTable +_02212D90: .word 0x027E0000 _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 f3d55c31..4bce64dc 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 ; =OS_IRQTable + ldr r3, _0222F0CC ; =0x027E0000 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 OS_IRQTable +_0222F0CC: .word 0x027E0000 _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 ; =OS_IRQTable + ldr r3, _0222F0F8 ; =0x027E0000 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 OS_IRQTable +_0222F0F8: .word 0x027E0000 _0222F0FC: .word 0x00003FF8 thumb_func_start MOD11_0222F100 @@ -29068,7 +29068,7 @@ _0223BBEE: mov r2, #0 bl GetMonData str r0, [r5, #0x10] - ldr r0, _0223BF18 ; =0x020FA5FC + ldr r0, _0223BF18 ; =UNK_020FA5FC add r1, r5, #0 mov r2, #5 bl FUN_02006234 @@ -29423,7 +29423,7 @@ _0223BF06: ldr r0, _0223BF30 ; =0x0000035F b _0223BF34 nop -_0223BF18: .word 0x020FA5FC +_0223BF18: .word UNK_020FA5FC _0223BF1C: .word 0x0000219C _0223BF20: .word 0x0000FFFF _0223BF24: .word 0x00000496 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 496db71c..51210dd5 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 ; =OS_IRQTable + ldr r3, _0222DB10 ; =0x027E0000 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 OS_IRQTable +_0222DB10: .word 0x027E0000 _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 ; =OS_IRQTable + ldr r3, _0222F4EC ; =0x027E0000 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 OS_IRQTable +_0222F4EC: .word 0x027E0000 _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 ; =OS_IRQTable + ldr r3, _022304A8 ; =0x027E0000 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 OS_IRQTable +_022304A8: .word 0x027E0000 _022304AC: .word 0x00003FF8 thumb_func_start MOD12_022304B0 @@ -41666,7 +41666,7 @@ MOD12_02241754: ; 0x02241754 bl FUN_0200372C ldr r0, [r4, #0x30] bl FUN_0201AB60 - ldr r3, _022417D4 ; =OS_IRQTable + ldr r3, _022417D4 ; =0x027E0000 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 OS_IRQTable +_022417D4: .word 0x027E0000 _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 5b84a4a8..f919cf8b 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 ; =OS_IRQTable + ldr r0, _0223B79C ; =0x027E0000 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 OS_IRQTable +_0223B79C: .word 0x027E0000 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 77e21eab..2f0cd49b 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -5619,7 +5619,7 @@ _021DA256: _021DA2BC: pop {r3, r4, r5, pc} nop -_021DA2C0: .word 0x020FA5FC +_021DA2C0: .word UNK_020FA5FC _021DA2C4: .word MOD14_021D76E8 thumb_func_start MOD14_021DA2C8 @@ -10995,7 +10995,7 @@ MOD14_021DCBFC: ; 0x021DCBFC ldr r0, [r4, #0x18] bl FUN_0201FDEC bl FUN_02009F80 - ldr r3, _021DCC24 ; =MOD14_027E0000 + ldr r3, _021DCC24 ; =0x027E0000 ldr r1, _021DCC28 ; =0x00003FF8 mov r0, #1 ldr r2, [r3, r1] @@ -11004,7 +11004,7 @@ MOD14_021DCBFC: ; 0x021DCBFC pop {r4, pc} .align 2, 0 _021DCC20: .word 0x000065A0 -_021DCC24: .word OS_IRQTable +_021DCC24: .word 0x027E0000 _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 1eb5b358..040c4ddb 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 ; =OS_IRQTable + ldr r3, _021D88F8 ; =0x027E0000 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 OS_IRQTable +_021D88F8: .word 0x027E0000 _021D88FC: .word 0x00003FF8 thumb_func_start MOD15_021D8900 diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 78e44fb3..7d33bbfb 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -247,6 +247,9 @@ _021D76C4: .word 0x00000BB8 .global MOD52_021D76C8 MOD52_021D76C8: ; 0x021D76C8 .word MOD52_021D757C, MOD52_021D7594, MOD52_021D75E8, 0xFFFFFFFF + + .global MOD52_021D76D8 +MOD52_021D76D8: ; 0x021D76D8 .word MOD52_021D7528, MOD52_021D7540, MOD52_021D7560, 0xFFFFFFFF .global MOD52_021D76E8 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 32e61a25..8dfb9b59 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 ; =OS_IRQTable + ldr r3, _021D78C8 ; =0x027E0000 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 OS_IRQTable +_021D78C8: .word 0x027E0000 _021D78CC: .word 0x00003FF8 thumb_func_end MOD53_021D78A8 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index fbf8aba9..752e8f3c 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 ; =OS_IRQTable + ldr r3, _021D786C ; =0x027E0000 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 OS_IRQTable +_021D786C: .word 0x027E0000 _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 ecc39c8d..1aff4965 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 ; =OS_IRQTable + ldr r3, _021D7804 ; =0x027E0000 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 OS_IRQTable +_021D7804: .word 0x027E0000 _021D7808: .word 0x00003FF8 thumb_func_end MOD55_021D77D0 @@ -1777,7 +1777,7 @@ MOD55_021D8320: ; 0x021D8320 add r3, r1, #0 bl FUN_02077A84 str r0, [r5] - ldr r0, _021D836C ; =0x020FA5FC + ldr r0, _021D836C ; =UNK_020FA5FC ldr r1, [r5] mov r2, #0x34 bl FUN_02006234 @@ -1791,7 +1791,7 @@ _021D8366: add r0, r4, #0 pop {r3, r4, r5, pc} nop -_021D836C: .word 0x020FA5FC +_021D836C: .word UNK_020FA5FC thumb_func_end MOD55_021D8320 thumb_func_start MOD55_021D8370 @@ -1877,7 +1877,7 @@ MOD55_021D8404: ; 0x021D8404 mov r3, #0xc bl FUN_02077A84 str r0, [r5] - ldr r0, _021D843C ; =0x020FA5FC + ldr r0, _021D843C ; =UNK_020FA5FC ldr r1, [r5] mov r2, #0x34 bl FUN_02006234 @@ -1890,7 +1890,7 @@ MOD55_021D8404: ; 0x021D8404 add r0, r4, #0 pop {r3, r4, r5, pc} nop -_021D843C: .word 0x020FA5FC +_021D843C: .word UNK_020FA5FC thumb_func_end MOD55_021D8404 thumb_func_start MOD55_021D8440 @@ -5065,7 +5065,7 @@ MOD55_021D9E40: ; 0x021D9E40 add r3, r1, #0 bl FUN_02077A84 str r0, [r4] - ldr r0, _021D9EC4 ; =0x020FA5FC + ldr r0, _021D9EC4 ; =UNK_020FA5FC ldr r1, [r4] mov r2, #0x34 bl FUN_02006234 @@ -5100,7 +5100,7 @@ _021D9EBE: add sp, #4 pop {r3, r4, r5, r6, pc} .align 2, 0 -_021D9EC4: .word 0x020FA5FC +_021D9EC4: .word UNK_020FA5FC thumb_func_end MOD55_021D9E40 thumb_func_start MOD55_021D9EC8 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 21e3047a..ef4e11b1 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 ; =OS_IRQTable + ldr r3, _022122AC ; =0x027E0000 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 OS_IRQTable +_022122AC: .word 0x027E0000 _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 9644a30a..1bcc1de1 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -1942,7 +1942,7 @@ MOD57_021D848C: ; 0x021D848C push {r3, lr} bl FUN_0201C30C bl FUN_02009F80 - ldr r3, _021D84A4 ; =OS_IRQTable + ldr r3, _021D84A4 ; =0x027E0000 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 OS_IRQTable +_021D84A4: .word 0x027E0000 _021D84A8: .word 0x00003FF8 thumb_func_end MOD57_021D848C diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 12de0321..e32e80d6 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 ; =OS_IRQTable + ldr r3, _021D9CD4 ; =0x027E0000 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 OS_IRQTable +_021D9CD4: .word 0x027E0000 _021D9CD8: .word 0x00003FF8 thumb_func_end MOD58_021D9CB4 diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index fc1cec7b..8754739b 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -254,13 +254,13 @@ MOD59_021D76C0: ; 0x021D76C0 add r0, r5, #0 bl FUN_020168D0 ldr r0, _021D771C ; =SDK_OVERLAY_MODULE_52_ID - ldr r1, _021D7720 ; =0x021D76D8 + ldr r1, _021D7720 ; =MOD52_021D76D8 bl FUN_02000E7C mov r0, #1 pop {r4, r5, r6, pc} nop _021D771C: .word SDK_OVERLAY_MODULE_52_ID -_021D7720: .word 0x021D76D8 +_021D7720: .word MOD52_021D76D8 thumb_func_end MOD59_021D76C0 thumb_func_start MOD59_021D7724 @@ -3900,7 +3900,7 @@ _021D945C: ldr r1, [r0] ldr r0, [r4, #0x70] str r1, [r0, #4] - ldr r0, _021D9778 ; =0x020FA5FC + ldr r0, _021D9778 ; =UNK_020FA5FC ldr r1, [r4, #0x70] ldr r2, [r4] bl FUN_02006234 @@ -4176,7 +4176,7 @@ _021D9672: str r0, [r4, #0xc] b _021D985C _021D9684: - ldr r0, _021D9778 ; =0x020FA5FC + ldr r0, _021D9778 ; =UNK_020FA5FC ldr r1, [r4, #0x74] ldr r2, [r4] bl FUN_02006234 @@ -4294,7 +4294,7 @@ _021D9764: str r0, [r4, #0xc] b _021D985C nop -_021D9778: .word 0x020FA5FC +_021D9778: .word UNK_020FA5FC _021D977C: .word gGameVersion _021D9780: .word MOD59_021D9F40 _021D9784: .word MOD59_021D9F68 @@ -5068,7 +5068,7 @@ MOD59_021D9DCC: ; 0x021D9DCC .global MOD59_021D9DDC MOD59_021D9DDC: ; 0x021D9DDC - .byte 0x69, 0x98, 0x1D, 0x02, 0x99, 0x98, 0x1D, 0x02, 0xF9, 0x99, 0x1D, 0x02, 0xFF, 0xFF, 0xFF, 0xFF + .word MOD59_021D9868, MOD59_021D9898, MOD59_021D99F8, 0xFFFFFFFF .global MOD59_021D9DEC MOD59_021D9DEC: ; 0x021D9DEC diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index dd5bdf55..8d19e186 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 ; =OS_IRQTable + ldr r3, _021D782C ; =0x027E0000 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 OS_IRQTable +_021D782C: .word 0x027E0000 _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 729f0eb1..950a5689 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 ; =OS_IRQTable + ldr r3, _021D7AA0 ; =0x027E0000 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 OS_IRQTable +_021D7AA0: .word 0x027E0000 _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 9eb1fa41..a6136dbb 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -7523,7 +7523,7 @@ MOD62_022310CC: ; 0x022310CC add r4, #0xe4 ldr r0, [r4] bl FUN_0201AB60 - ldr r3, _02231104 ; =OS_IRQTable + ldr r3, _02231104 ; =0x027E0000 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 OS_IRQTable +_02231104: .word 0x027E0000 _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 0d47ac71..f6d62b38 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 ; =OS_IRQTable + ldr r3, _021D7708 ; =0x027E0000 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 OS_IRQTable +_021D7708: .word 0x027E0000 _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 ; =OS_IRQTable + ldr r3, _021D8CB0 ; =0x027E0000 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 OS_IRQTable +_021D8CB0: .word 0x027E0000 _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 ce7be54a..f7fff5bf 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 ; =OS_IRQTable + ldr r3, _021D7600 ; =0x027E0000 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 OS_IRQTable +_021D7600: .word 0x027E0000 _021D7604: .word 0x00003FF8 thumb_func_end MOD66_021D75C8 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index a57f6021..857b05b7 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 ; =OS_IRQTable + ldr r3, _021D7678 ; =0x027E0000 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 OS_IRQTable +_021D7678: .word 0x027E0000 _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 52ed4639..46eca3b8 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 ; =OS_IRQTable + ldr r3, _021D7698 ; =0x027E0000 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 OS_IRQTable +_021D7698: .word 0x027E0000 _021D769C: .word 0x00003FF8 thumb_func_end MOD68_021D7680 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 8afec6e0..f4b87636 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 ; =OS_IRQTable + ldr r3, _021D7928 ; =0x027E0000 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 OS_IRQTable +_021D7928: .word 0x027E0000 _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 4e9cca68..81137308 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 ; =OS_IRQTable + ldr r3, _0222E550 ; =0x027E0000 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 OS_IRQTable +_0222E550: .word 0x027E0000 _0222E554: .word 0x00003FF8 thumb_func_end MOD71_0222E4DC diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index acb40fad..bbf859db 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 ; =OS_IRQTable + ldr r3, _021D77A4 ; =0x027E0000 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 OS_IRQTable +_021D77A4: .word 0x027E0000 _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 ccf9d7c1..e195dbcf 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 ; =OS_IRQTable + ldr r3, _021E702C ; =0x027E0000 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 OS_IRQTable +_021E702C: .word 0x027E0000 _021E7030: .word 0x00003FF8 thumb_func_end MOD75_021E700C diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 356fd136..852b7592 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 ; =OS_IRQTable + ldr r3, _021D7708 ; =0x027E0000 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 OS_IRQTable +_021D7708: .word 0x027E0000 _021D770C: .word 0x00003FF8 thumb_func_end MOD76_021D76E8 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 980d3321..257ac70a 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 ; =OS_IRQTable + ldr r3, _0222E310 ; =0x027E0000 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 OS_IRQTable +_0222E310: .word 0x027E0000 _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 a58eb8fe..4f7d4453 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 ; =OS_IRQTable + ldr r3, _02238110 ; =0x027E0000 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 OS_IRQTable +_02238110: .word 0x027E0000 _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 80b848a6..48654b9a 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 ; =OS_IRQTable + ldr r3, _0222DCDC ; =0x027E0000 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 OS_IRQTable +_0222DCDC: .word 0x027E0000 _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 07496c77..1a13327a 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 ; =OS_IRQTable + ldr r3, _0222E484 ; =0x027E0000 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 OS_IRQTable +_0222E484: .word 0x027E0000 _0222E488: .word 0x00003FF8 thumb_func_end MOD83_0222E464 @@ -18219,7 +18219,7 @@ _02236520: bl FUN_02009F80 ldr r0, [r4, #0x20] bl FUN_0201AB60 - ldr r3, _02236540 ; =OS_IRQTable + ldr r3, _02236540 ; =0x027E0000 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 OS_IRQTable +_02236540: .word 0x027E0000 _02236544: .word 0x00003FF8 thumb_func_end MOD83_0223650C @@ -23826,7 +23826,7 @@ MOD83_02238F00: ; 0x02238F00 _02238F1E: bl FUN_0201C30C bl FUN_02009F80 - ldr r3, _02238F3C ; =OS_IRQTable + ldr r3, _02238F3C ; =0x027E0000 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 OS_IRQTable +_02238F3C: .word 0x027E0000 _02238F40: .word 0x00003FF8 thumb_func_end MOD83_02238F00 |