summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arm9/asm/SPI_pm.s20
-rw-r--r--arm9/asm/unk_02021590.s4
-rw-r--r--arm9/asm/unk_020377F0.s38
-rw-r--r--arm9/asm/unk_020625EC.s2
-rw-r--r--arm9/asm/unk_020859C0.s4
-rw-r--r--arm9/global.inc43
6 files changed, 77 insertions, 34 deletions
diff --git a/arm9/asm/SPI_pm.s b/arm9/asm/SPI_pm.s
index 2b889339..1fa1423e 100644
--- a/arm9/asm/SPI_pm.s
+++ b/arm9/asm/SPI_pm.s
@@ -47,22 +47,22 @@ UNK_021D5510: ; 0x021D5510
arm_func_start PM_DeletePostSleepCallback
PM_DeletePostSleepCallback: ; 0x020D4AE8
- ldr ip, _020D4AF8 ; =0x020D4B78
+ ldr ip, _020D4AF8 ; =PMi_DeleteList
mov r1, r0
ldr r0, _020D4AFC ; =UNK_021D54E0
bx r12
.balign 4
-_020D4AF8: .word 0x020D4B78
+_020D4AF8: .word PMi_DeleteList
_020D4AFC: .word UNK_021D54E0
arm_func_start PM_DeletePreSleepCallback
PM_DeletePreSleepCallback: ; 0x020D4B00
- ldr ip, _020D4B10 ; =0x020D4B78
+ ldr ip, _020D4B10 ; =PMi_DeleteList
mov r1, r0
ldr r0, _020D4B14 ; =UNK_021D54D8
bx r12
.balign 4
-_020D4B10: .word 0x020D4B78
+_020D4B10: .word PMi_DeleteList
_020D4B14: .word UNK_021D54D8
arm_func_start PM_AppendPostSleepCallback
@@ -102,7 +102,7 @@ _020D4B58:
bx lr
arm_func_start PMi_DeleteList
-PMi_DeleteList:
+PMi_DeleteList: ; 0x020D4B78
cmp r0, #0x0
bxeq lr
ldr r3, [r0]
@@ -160,7 +160,7 @@ PMi_PrependList: ; 0x020D4C0C
PM_GetLEDPattern: ; 0x020D4C20
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r1, _020D4C58 ; =0x020D587C
+ ldr r1, _020D4C58 ; =PMi_DummyCallback
add r2, sp, #0x0
bl PM_GetLEDPatternAsync
_020D4C34:
@@ -173,7 +173,7 @@ _020D4C34:
add sp, sp, #0x4
ldmfd sp!, {lr}
bx lr
-_020D4C58: .word 0x020D587C
+_020D4C58: .word PMi_DummyCallback
arm_func_start PM_GetLEDPatternAsync
PM_GetLEDPatternAsync:
@@ -203,7 +203,7 @@ _020D4CA8: .word 0x03006700
PMi_SendLEDPatternCommand: ; 0x020D4CAC
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r1, _020D4CE4 ; =0x020D587C
+ ldr r1, _020D4CE4 ; =PMi_DummyCallback
add r2, sp, #0x0
bl PMi_SendLEDPatternCommandAsync
_020D4CC0:
@@ -216,7 +216,7 @@ _020D4CC0:
add sp, sp, #0x4
ldmfd sp!, {lr}
bx lr
-_020D4CE4: .word 0x020D587C
+_020D4CE4: .word PMi_DummyCallback
arm_func_start PMi_SendLEDPatternCommandAsync
PMi_SendLEDPatternCommandAsync:
@@ -1115,7 +1115,7 @@ PMi_CallCallbackAndUnlock: ; 0x020D5828
_020D5878: .word UNK_021D54E4
arm_func_start PMi_DummyCallback
-PMi_DummyCallback: ; 0x020D587C
+PMi_DummyCallback: ; PMi_DummyCallback
str r0, [r1, #0x0]
bx lr
diff --git a/arm9/asm/unk_02021590.s b/arm9/asm/unk_02021590.s
index 7299e97e..82989218 100644
--- a/arm9/asm/unk_02021590.s
+++ b/arm9/asm/unk_02021590.s
@@ -9,11 +9,11 @@ UNK_020EE668: ; 0x020EE668
.global UNK_020EE66C
UNK_020EE66C: ; 0x020EE66C
- .byte 0xED, 0x16, 0x02, 0x02, 0x1D, 0x17, 0x02, 0x02
+ .word FUN_020216EC, FUN_0202171C
.global UNK_020EE674
UNK_020EE674: ; 0x020EE674
- .byte 0x3D, 0x17, 0x02, 0x02, 0x4D, 0x17, 0x02, 0x02
+ .word FUN_0202173C, FUN_0202174C
.text
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index f5272628..2dd22237 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -72,76 +72,76 @@ UNK_020F2C74: ; 0x020F2C74
.global UNK_020F2C84
UNK_020F2C84: ; 0x020F2C84
- .byte 0xE1, 0x74, 0x1D, 0x02, 0x69, 0x75, 0x1D, 0x02, 0x1D, 0x76, 0x1D, 0x02, 0x4C, 0x00, 0x00, 0x00
+ .word MOD76_021D74E0, MOD76_021D7568, MOD76_021D761C, SDK_OVERLAY_MODULE_76_ID
.global UNK_020F2C94
UNK_020F2C94: ; 0x020F2C94
- .byte 0xE1, 0x74, 0x1D, 0x02, 0x55, 0x76, 0x1D, 0x02, 0x65, 0x77, 0x1D, 0x02, 0x35, 0x00, 0x00, 0x00
+ .word MOD53_021D74E0, MOD53_021D7654, MOD53_021D7764, SDK_OVERLAY_MODULE_53_ID
.global UNK_020F2CA4
UNK_020F2CA4: ; 0x020F2CA4
- .byte 0x41, 0x7E, 0x23, 0x02, 0x65, 0x80, 0x23, 0x02, 0x05, 0x80, 0x23, 0x02, 0x51, 0x00, 0x00, 0x00
+ .word MOD81_02237E40, MOD81_02238064, MOD81_02238004, SDK_OVERLAY_MODULE_81_ID
.global UNK_020F2CB4
UNK_020F2CB4: ; 0x020F2CB4
- .byte 0xE1, 0x74, 0x1D, 0x02, 0x5D, 0x75, 0x1D, 0x02, 0x41, 0x75, 0x1D, 0x02, 0x4A, 0x00, 0x00, 0x00
+ .word MOD74_021D74E0, MOD74_021D755C, MOD74_021D7540, SDK_OVERLAY_MODULE_74_ID
.global UNK_020F2CC4
UNK_020F2CC4: ; 0x020F2CC4
- .byte 0xE1, 0x74, 0x1D, 0x02, 0xB9, 0x76, 0x1D, 0x02, 0xB1, 0x75, 0x1D, 0x02, 0x3C, 0x00, 0x00, 0x00
+ .word MOD60_021D74E0, MOD60_021D76B8, MOD60_021D75B0, SDK_OVERLAY_MODULE_60_ID
.global UNK_020F2CD4
UNK_020F2CD4: ; 0x020F2CD4
- .byte 0xE1, 0x74, 0x1D, 0x02, 0x39, 0x75, 0x1D, 0x02, 0xB1, 0x75, 0x1D, 0x02, 0x42, 0x00, 0x00, 0x00
+ .word MOD66_021D74E0, MOD66_021D7538, MOD66_021D75B0, SDK_OVERLAY_MODULE_66_ID
.global UNK_020F2CE4
UNK_020F2CE4: ; 0x020F2CE4
- .byte 0xE1, 0x74, 0x1D, 0x02, 0x59, 0x75, 0x1D, 0x02, 0x09, 0x76, 0x1D, 0x02, 0x0F, 0x00, 0x00, 0x00
+ .word MOD15_021D74E0, MOD15_021D7558, MOD15_021D7608, SDK_OVERLAY_MODULE_15_ID
.global UNK_020F2CF4
UNK_020F2CF4: ; 0x020F2CF4
- .byte 0xE1, 0x74, 0x1D, 0x02, 0x4D, 0x75, 0x1D, 0x02, 0xB9, 0x75, 0x1D, 0x02, 0x0E, 0x00, 0x00, 0x00
+ .word MOD14_021D74E0, MOD14_021D754C, MOD14_021D75B8, SDK_OVERLAY_MODULE_14_ID
.global UNK_020F2D04
UNK_020F2D04: ; 0x020F2D04
- .byte 0xE1, 0x74, 0x1D, 0x02, 0x4D, 0x76, 0x1D, 0x02, 0x41, 0x77, 0x1D, 0x02, 0x36, 0x00, 0x00, 0x00
+ .word MOD54_021D74E0, MOD54_021D764C, MOD54_021D7740, SDK_OVERLAY_MODULE_54_ID
.global UNK_020F2D14
UNK_020F2D14: ; 0x020F2D14
- .byte 0xE1, 0x74, 0x1D, 0x02, 0x05, 0x76, 0x1D, 0x02, 0xAD, 0x7B, 0x1D, 0x02, 0x4D, 0x00, 0x00, 0x00
+ .word MOD77_021D74E0, MOD77_021D7604, MOD77_021D7BAC, SDK_OVERLAY_MODULE_77_ID
.global UNK_020F2D24
UNK_020F2D24: ; 0x020F2D24
- .byte 0xE1, 0x74, 0x1D, 0x02, 0xD1, 0x75, 0x1D, 0x02, 0x25, 0x76, 0x1D, 0x02, 0x43, 0x00, 0x00, 0x00
- .byte 0x15, 0x76, 0x1D, 0x02, 0xBD, 0x76, 0x1D, 0x02, 0xAD, 0x77, 0x1D, 0x02, 0x37, 0x00, 0x00, 0x00
+ .word MOD67_021D74E0, MOD67_021D75D0, MOD67_021D7624, SDK_OVERLAY_MODULE_67_ID
+ .word MOD55_021D7614, MOD55_021D76BC, MOD55_021D77AC, SDK_OVERLAY_MODULE_55_ID
.global UNK_020F2D44
UNK_020F2D44: ; 0x020F2D44
- .byte 0xE1, 0x74, 0x1D, 0x02, 0xD9, 0x75, 0x1D, 0x02, 0x2D, 0x76, 0x1D, 0x02, 0x44, 0x00, 0x00, 0x00
+ .word MOD68_021D74E0, MOD68_021D75D8, MOD68_021D762C, SDK_OVERLAY_MODULE_68_ID
.global UNK_020F2D54
UNK_020F2D54: ; 0x020F2D54
- .byte 0x6D, 0x75, 0x1D, 0x02, 0xBD, 0x76, 0x1D, 0x02, 0xAD, 0x77, 0x1D, 0x02, 0x37, 0x00, 0x00, 0x00
+ .word MOD55_021D756C, MOD55_021D76BC, MOD55_021D77AC, SDK_OVERLAY_MODULE_55_ID
.global UNK_020F2D64
UNK_020F2D64: ; 0x020F2D64
- .byte 0xC1, 0xD5, 0x22, 0x02, 0xF5, 0xD7, 0x22, 0x02, 0x51, 0xD7, 0x22, 0x02, 0x45, 0x00, 0x00, 0x00
+ .word MOD69_0222D5C0, MOD69_0222D7F4, MOD69_0222D750, SDK_OVERLAY_MODULE_69_ID
.global UNK_020F2D74
UNK_020F2D74: ; 0x020F2D74
- .byte 0xA1, 0x6B, 0x1E, 0x02, 0x6D, 0x6D, 0x1E, 0x02, 0x01, 0x6F, 0x1E, 0x02, 0x4B, 0x00, 0x00, 0x00
+ .word MOD75_021E6BA0, MOD75_021E6D6C, MOD75_021E6F00, SDK_OVERLAY_MODULE_75_ID
.global UNK_020F2D84
UNK_020F2D84: ; 0x020F2D84
- .byte 0xE1, 0x74, 0x1D, 0x02, 0xD1, 0x75, 0x1D, 0x02, 0xB9, 0x76, 0x1D, 0x02, 0x4E, 0x00, 0x00, 0x00
+ .word MOD78_021D74E0, MOD78_021D75D0, MOD78_021D76B8, SDK_OVERLAY_MODULE_78_ID
.global UNK_020F2D94
UNK_020F2D94: ; 0x020F2D94
- .byte 0xF1, 0x77, 0x03, 0x02, 0xF5, 0x77, 0x03, 0x02, 0x09, 0x78, 0x03, 0x02, 0x0B, 0x00, 0x00, 0x00
+ .word FUN_020377F0, FUN_020377F4, FUN_02037808, SDK_OVERLAY_MODULE_11_ID
.global UNK_020F2DA4
UNK_020F2DA4: ; 0x020F2DA4
- .byte 0xE1, 0x74, 0x1D, 0x02, 0x8D, 0x75, 0x1D, 0x02, 0xB1, 0x76, 0x1D, 0x02, 0x56, 0x00, 0x00, 0x00
+ .word MOD86_021D74E0, MOD86_021D758C, MOD86_021D76B0, SDK_OVERLAY_MODULE_86_ID
.section .data
diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s
index 18aac665..2450a9ad 100644
--- a/arm9/asm/unk_020625EC.s
+++ b/arm9/asm/unk_020625EC.s
@@ -11,7 +11,7 @@ UNK_020F7BC8: ; 0x020F7BC8
.global UNK_020F7BD0
UNK_020F7BD0: ; 0x020F7BD0
- .byte 0x4C, 0x7C, 0x0F, 0x02, 0x0C, 0x7C, 0x0F, 0x02, 0xF4, 0x7B, 0x0F, 0x02
+ .word UNK_020F7C4C, UNK_020F7C0C, UNK_020F7BF4
.global UNK_020F7BDC
UNK_020F7BDC: ; 0x020F7BDC
diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s
index 0111206a..e810dde1 100644
--- a/arm9/asm/unk_020859C0.s
+++ b/arm9/asm/unk_020859C0.s
@@ -283,7 +283,7 @@ _02085A9A:
bl FUN_0201CC24
add r0, r4, #0x0
bl MOD62_022300E4
- ldr r0, _02085BAC ; =0x022310CD
+ ldr r0, _02085BAC ; =MOD62_022310CC
add r1, r4, #0x0
bl FUN_02015F10
add r0, r4, #0x0
@@ -298,7 +298,7 @@ _02085A9A:
_02085BA0: .word 0x0000042C
_02085BA4: .word 0x00000428
_02085BA8: .word 0x0000041C
-_02085BAC: .word 0x022310CD
+_02085BAC: .word MOD62_022310CC
thumb_func_start FUN_02085BB0
FUN_02085BB0: ; 0x02085BB0
diff --git a/arm9/global.inc b/arm9/global.inc
index f63505da..bbe11aad 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -6671,7 +6671,9 @@
.extern MOD06_0224C8E8
.extern MOD06_0224CA58
.extern MOD06_0224CA88
+.extern MOD06_0224CAAC
.extern MOD06_0224CB30
+.extern MOD06_0224CB54
.extern MOD06_0224CBB0
.extern MOD06_0224CC24
.extern MOD06_0224CE30
@@ -6853,6 +6855,9 @@
.extern MOD13_0221A7EC
.extern MOD13_0221A8A4
.extern MOD13_02223494
+.extern MOD14_021D74E0
+.extern MOD14_021D754C
+.extern MOD14_021D75B8
.extern MOD15_021D74E0
.extern MOD15_021D7558
.extern MOD15_021D7608
@@ -7105,12 +7110,22 @@
.extern MOD20_02254488
.extern MOD51_02254A68
.extern MOD51_02254AB8
+.extern MOD53_021D74E0
+.extern MOD53_021D7654
+.extern MOD53_021D7764
.extern MOD53_021D8B64
.extern MOD53_021D917C
+.extern MOD54_021D74E0
+.extern MOD54_021D764C
+.extern MOD54_021D7740
.extern MOD54_021D844C
.extern MOD54_021D88E4
.extern MOD54_021D89CC
.extern MOD54_021D8C24
+.extern MOD55_021D756C
+.extern MOD55_021D7614
+.extern MOD55_021D76BC
+.extern MOD55_021D77AC
.extern MOD56_02212084
.extern MOD56_02212164
.extern MOD56_02212240
@@ -7124,6 +7139,9 @@
.extern MOD59_021D74E0
.extern MOD59_021D7564
.extern MOD59_021D76C0
+.extern MOD60_021D74E0
+.extern MOD60_021D76B8
+.extern MOD60_021D75B0
.extern MOD61_021D74E0
.extern MOD61_021D7550
.extern MOD61_021D7568
@@ -7142,6 +7160,7 @@
.extern MOD62_02230F3C
.extern MOD62_02230F70
.extern MOD62_02230F80
+.extern MOD62_022310CC
.extern MOD64_021D74E0
.extern MOD64_021D7640
.extern MOD64_021D76F4
@@ -7151,9 +7170,18 @@
.extern MOD65_021D8A08
.extern MOD65_021D8A40
.extern MOD65_021D8BBC
+.extern MOD66_021D74E0
+.extern MOD66_021D7538
+.extern MOD66_021D75B0
+.extern MOD67_021D74E0
+.extern MOD67_021D75D0
+.extern MOD67_021D7624
.extern MOD68_021D74E0
.extern MOD68_021D75D8
.extern MOD68_021D762C
+.extern MOD69_0222D5C0
+.extern MOD69_0222D7F4
+.extern MOD69_0222D750
.extern MOD69_0222EC60
.extern MOD70_021D74E0
.extern MOD70_021D758C
@@ -7181,9 +7209,21 @@
.extern MOD73_021D9088
.extern MOD73_021D908C
.extern MOD73_021D9090
+.extern MOD74_021D74E0
+.extern MOD74_021D755C
+.extern MOD74_021D7540
.extern MOD75_021E6BA0
.extern MOD75_021E6D6C
.extern MOD75_021E6F00
+.extern MOD76_021D74E0
+.extern MOD76_021D7568
+.extern MOD76_021D761C
+.extern MOD77_021D74E0
+.extern MOD77_021D7604
+.extern MOD77_021D7BAC
+.extern MOD78_021D74E0
+.extern MOD78_021D75D0
+.extern MOD78_021D76B8
.extern MOD79_022122E4
.extern MOD79_02212308
.extern MOD79_022123A8
@@ -7209,6 +7249,9 @@
.extern MOD85_021D74E0
.extern MOD85_021D75A0
.extern MOD85_021D7644
+.extern MOD86_021D74E0
+.extern MOD86_021D758C
+.extern MOD86_021D76B0
.extern MTX_Concat33
.extern MTX_Concat43
.extern MTX_Concat44