diff options
32 files changed, 757 insertions, 719 deletions
diff --git a/arm9/asm/crt0.s b/arm9/asm/crt0.s index 05a91b28..65084858 100644 --- a/arm9/asm/crt0.s +++ b/arm9/asm/crt0.s @@ -73,7 +73,7 @@ _020008C4: bl _fp_init bl NitroStartUp bl __call_static_initializers - ldr r1, _02000934 ; =0x02000C55 + ldr r1, _02000934 ; =NitroMain ldr lr, _02000938 ; =0xFFFF0000 tst sp, #4 subne sp, sp, #4 diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s index d45448fb..e029023c 100644 --- a/arm9/asm/unk_02006864.s +++ b/arm9/asm/unk_02006864.s @@ -5096,13 +5096,13 @@ _02008DD8: .word 0x0001FE00 thumb_func_start FUN_02008DDC
FUN_02008DDC: ; 0x02008DDC
- ldr r3, _02008DE8 ; =0x0201E069
+ ldr r3, _02008DE8 ; =FUN_0201E068
add r1, r0, #0x0
mov r0, #0x3
lsl r0, r0, #0xe
bx r3
nop
-_02008DE8: .word 0x0201E069
+_02008DE8: .word FUN_0201E068
thumb_func_start FUN_02008DEC
FUN_02008DEC: ; 0x02008DEC
@@ -12523,11 +12523,11 @@ _0200C5A4: .word FUN_020201E4 thumb_func_start FUN_0200C5A8
FUN_0200C5A8: ; 0x0200C5A8
- ldr r3, _0200C5B0 ; =0x0200C59D
+ ldr r3, _0200C5B0 ; =FUN_0200C59C
ldr r0, [r0, #0x0]
bx r3
nop
-_0200C5B0: .word 0x0200C59D
+_0200C5B0: .word FUN_0200C59C
thumb_func_start FUN_0200C5B4
FUN_0200C5B4: ; 0x0200C5B4
@@ -12607,11 +12607,11 @@ _0200C618: .word FUN_02020208 thumb_func_start FUN_0200C61C
FUN_0200C61C: ; 0x0200C61C
- ldr r3, _0200C624 ; =0x0200C615
+ ldr r3, _0200C624 ; =FUN_0200C614
ldr r0, [r0, #0x0]
bx r3
nop
-_0200C624: .word 0x0200C615
+_0200C624: .word FUN_0200C614
thumb_func_start FUN_0200C628
FUN_0200C628: ; 0x0200C628
@@ -12707,11 +12707,11 @@ _0200C6A0: .word FUN_02020238 thumb_func_start FUN_0200C6A4
FUN_0200C6A4: ; 0x0200C6A4
- ldr r3, _0200C6AC ; =0x02020241
+ ldr r3, _0200C6AC ; =FUN_02020240
ldr r0, [r0, #0x0]
bx r3
nop
-_0200C6AC: .word 0x02020241
+_0200C6AC: .word FUN_02020240
thumb_func_start FUN_0200C6B0
FUN_0200C6B0: ; 0x0200C6B0
@@ -12949,11 +12949,11 @@ _0200C83C: .word FUN_020200EC thumb_func_start FUN_0200C840
FUN_0200C840: ; 0x0200C840
- ldr r3, _0200C848 ; =0x0200C839
+ ldr r3, _0200C848 ; =FUN_0200C838
ldr r0, [r0, #0x0]
bx r3
nop
-_0200C848: .word 0x0200C839
+_0200C848: .word FUN_0200C838
thumb_func_start FUN_0200C84C
FUN_0200C84C: ; 0x0200C84C
@@ -13057,11 +13057,11 @@ FUN_0200C8DC: ; 0x0200C8DC thumb_func_start FUN_0200C8F8
FUN_0200C8F8: ; 0x0200C8F8
- ldr r3, _0200C900 ; =0x02020359
+ ldr r3, _0200C900 ; =FUN_02020358
ldr r0, [r0, #0x0]
bx r3
nop
-_0200C900: .word 0x02020359
+_0200C900: .word FUN_02020358
thumb_func_start FUN_0200C904
FUN_0200C904: ; 0x0200C904
@@ -31039,11 +31039,11 @@ _02014F24: .word FUN_02014F08 thumb_func_start FUN_02014F28
FUN_02014F28: ; 0x02014F28
- ldr r3, _02014F30 ; =0x02014F1D
+ ldr r3, _02014F30 ; =FUN_02014F1C
mov r1, #0x1
bx r3
nop
-_02014F30: .word 0x02014F1D
+_02014F30: .word FUN_02014F1C
thumb_func_start FUN_02014F34
FUN_02014F34: ; 0x02014F34
@@ -47117,21 +47117,21 @@ _0201C4F0: .word 0xFFFF0000 thumb_func_start FUN_0201C4F4
FUN_0201C4F4: ; 0x0201C4F4
- ldr r3, _0201C4FC ; =0x0201C50D
+ ldr r3, _0201C4FC ; =FUN_0201C50C
ldr r0, [r0, #0x4]
ldrb r1, [r1, #0x0]
bx r3
.balign 4
-_0201C4FC: .word 0x0201C50D
+_0201C4FC: .word FUN_0201C50C
thumb_func_start FUN_0201C500
FUN_0201C500: ; 0x0201C500
- ldr r3, _0201C508 ; =0x0201C541
+ ldr r3, _0201C508 ; =FUN_0201C540
ldr r0, [r0, #0x4]
ldrb r1, [r1, #0x1]
bx r3
.balign 4
-_0201C508: .word 0x0201C541
+_0201C508: .word FUN_0201C540
thumb_func_start FUN_0201C50C
FUN_0201C50C: ; 0x0201C50C
@@ -66319,11 +66319,11 @@ _02024EBC: .word FUN_02022610 thumb_func_start FUN_02024EC0
FUN_02024EC0: ; 0x02024EC0
- ldr r3, _02024EC8 ; =0x02022635
+ ldr r3, _02024EC8 ; =FUN_02022634
mov r1, #0xa
bx r3
nop
-_02024EC8: .word 0x02022635
+_02024EC8: .word FUN_02022634
thumb_func_start FUN_02024ECC
FUN_02024ECC: ; 0x02024ECC
diff --git a/arm9/asm/unk_02046030.s b/arm9/asm/unk_02046030.s index 4b46da9e..1eda4b12 100644 --- a/arm9/asm/unk_02046030.s +++ b/arm9/asm/unk_02046030.s @@ -10681,11 +10681,11 @@ FUN_0204B410: ; 0x0204B410 thumb_func_start FUN_0204B444
FUN_0204B444: ; 0x0204B444
- ldr r3, _0204B44C ; =0x021E4C01
+ ldr r3, _0204B44C ; =MOD05_021E4C00
ldr r0, [r0, #0x60]
bx r3
nop
-_0204B44C: .word 0x021E4C01
+_0204B44C: .word MOD05_021E4C00
thumb_func_start FUN_0204B450
FUN_0204B450: ; 0x0204B450
@@ -11519,11 +11519,11 @@ _0204BAD0: .word 0x021C5A1C thumb_func_start FUN_0204BAD4
FUN_0204BAD4: ; 0x0204BAD4
- ldr r3, _0204BADC ; =0x0204BE11
+ ldr r3, _0204BADC ; =FUN_0204BE10
ldr r0, _0204BAE0 ; =0x021C5A1C
bx r3
nop
-_0204BADC: .word 0x0204BE11
+_0204BADC: .word FUN_0204BE10
_0204BAE0: .word 0x021C5A1C
thumb_func_start FUN_0204BAE4
@@ -16813,11 +16813,11 @@ FUN_0204E2E0: ; 0x0204E2E0 thumb_func_start FUN_0204E2F0
FUN_0204E2F0: ; 0x0204E2F0
- ldr r3, _0204E2F8 ; =0x0223E4BD
+ ldr r3, _0204E2F8 ; =MOD18_0223E4BC
ldrb r0, [r2, #0x0]
bx r3
nop
-_0204E2F8: .word 0x0223E4BD
+_0204E2F8: .word MOD18_0223E4BC
thumb_func_start FUN_0204E2FC
FUN_0204E2FC: ; 0x0204E2FC
@@ -21235,10 +21235,10 @@ _02050588: .word FUN_0205058C thumb_func_start FUN_0205058C
FUN_0205058C: ; 0x0205058C
- ldr r3, _02050590 ; =0x02247831
+ ldr r3, _02050590 ; =MOD18_02247830
bx r3
.balign 4
-_02050590: .word 0x02247831
+_02050590: .word MOD18_02247830
thumb_func_start FUN_02050594
FUN_02050594: ; 0x02050594
@@ -127105,11 +127105,11 @@ FUN_020835A0: ; 0x020835A0 mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r3, r0]
- ldr r3, _020835AC ; =0x0223D1CD
+ ldr r3, _020835AC ; =MOD12_0223D1CC
add r1, r2, #0x0
bx r3
.balign 4
-_020835AC: .word 0x0223D1CD
+_020835AC: .word MOD12_0223D1CC
thumb_func_start FUN_020835B0
FUN_020835B0: ; 0x020835B0
diff --git a/arm9/global.inc b/arm9/global.inc index 05c59cbd..117dbdb2 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -5710,6 +5710,44 @@ .extern FUN_020334DC
.extern FUN_02088858
.extern FUN_02088868
+.extern FUN_02006874
+.extern FUN_0200AF88
+.extern FUN_0200AFBC
+.extern FUN_02013840
+.extern FUN_02013EFC
+.extern FUN_02013F00
+.extern FUN_0201C78C
+.extern FUN_02024648
+.extern FUN_02024674
+.extern FUN_020247A4
+.extern FUN_02024828
+.extern FUN_0202489C
+.extern FUN_0202490C
+.extern FUN_02024930
+.extern FUN_02024970
+.extern FUN_02024CC4
+.extern FUN_02025E20
+.extern FUN_02025FFC
+.extern FUN_020260EC
+.extern FUN_0202A398
+.extern FUN_0202B5D8
+.extern FUN_0202B9EC
+.extern FUN_02031258
+.extern FUN_02046948
+.extern FUN_0204E178
+.extern FUN_02050E10
+.extern FUN_02050E2C
+.extern FUN_020556C8
+.extern FUN_0205E49C
+.extern FUN_0206EA54
+.extern FUN_02085410
+.extern FUN_02085414
+.extern FUN_02087A38
+.extern MOD05_021F54E0
+.extern MOD06_0224C24C
+.extern MOD12_0223D1CC
+.extern MOD18_0223E4BC
+.extern MOD18_02247830
.extern MOD04_021D80E0
.extern MOD04_021D83D4
.extern MOD04_021D8478
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index cbfe382b..3cefdc1e 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -744,10 +744,10 @@ MOD05_021D7B38: ; 0x021D7B38 thumb_func_start MOD05_021D7B5C MOD05_021D7B5C: ; 0x021D7B5C - ldr r3, _021D7B60 ; =0x02009FA1 + ldr r3, _021D7B60 ; =FUN_02009FA0 bx r3 .balign 4, 0 -_021D7B60: .word 0x02009FA1 +_021D7B60: .word FUN_02009FA0 thumb_func_start MOD05_021D7B64 MOD05_021D7B64: ; 0x021D7B64 @@ -1207,10 +1207,10 @@ MOD05_021D7F40: ; 0x021D7F40 thumb_func_start MOD05_021D7F44 MOD05_021D7F44: ; 0x021D7F44 - ldr r3, _021D7F48 ; =0x02016A19 + ldr r3, _021D7F48 ; =FUN_02016A18 bx r3 .balign 4, 0 -_021D7F48: .word 0x02016A19 +_021D7F48: .word FUN_02016A18 thumb_func_start MOD05_021D7F4C MOD05_021D7F4C: ; 0x021D7F4C @@ -1278,11 +1278,11 @@ _021D7FBC: thumb_func_start MOD05_021D7FD0 MOD05_021D7FD0: ; 0x021D7FD0 - ldr r3, _021D7FD8 ; =0x0201B5CD + ldr r3, _021D7FD8 ; =FUN_0201B5CC ldr r0, [r0, #0x10] bx r3 nop -_021D7FD8: .word 0x0201B5CD +_021D7FD8: .word FUN_0201B5CC thumb_func_start MOD05_021D7FDC MOD05_021D7FDC: ; 0x021D7FDC @@ -3238,12 +3238,12 @@ MOD05_021D8F90: ; 0x021D8F90 thumb_func_start MOD05_021D8F9C MOD05_021D8F9C: ; 0x021D8F9C - ldr r3, _021D8FA4 ; =0x0224C24D + ldr r3, _021D8FA4 ; =MOD06_0224C24C add r1, r0, #0 ldr r0, [r1, #0xc] bx r3 .balign 4, 0 -_021D8FA4: .word 0x0224C24D +_021D8FA4: .word MOD06_0224C24C thumb_func_start MOD05_021D8FA8 MOD05_021D8FA8: ; 0x021D8FA8 @@ -5724,11 +5724,11 @@ _021DA21A: MOD05_021DA220: ; 0x021DA220 mov r1, #0xad lsl r1, r1, #2 - ldr r3, _021DA22C ; =0x02006875 + ldr r3, _021DA22C ; =FUN_02006874 ldr r0, [r0, r1] bx r3 nop -_021DA22C: .word 0x02006875 +_021DA22C: .word FUN_02006874 thumb_func_start MOD05_021DA230 MOD05_021DA230: ; 0x021DA230 @@ -6243,10 +6243,10 @@ MOD05_021DA5B8: ; 0x021DA5B8 thumb_func_start MOD05_021DA5C8 MOD05_021DA5C8: ; 0x021DA5C8 - ldr r3, _021DA5CC ; =0x02016A19 + ldr r3, _021DA5CC ; =FUN_02016A18 bx r3 .balign 4, 0 -_021DA5CC: .word 0x02016A19 +_021DA5CC: .word FUN_02016A18 thumb_func_start MOD05_021DA5D0 MOD05_021DA5D0: ; 0x021DA5D0 @@ -9476,10 +9476,10 @@ _021DBE94: .word MOD05_021EFAAC thumb_func_start MOD05_021DBE98 MOD05_021DBE98: ; 0x021DBE98 - ldr r3, _021DBE9C ; =0x02050E2D + ldr r3, _021DBE9C ; =FUN_02050E2C bx r3 .balign 4, 0 -_021DBE9C: .word 0x02050E2D +_021DBE9C: .word FUN_02050E2C thumb_func_start MOD05_021DBEA0 MOD05_021DBEA0: ; 0x021DBEA0 @@ -9505,10 +9505,10 @@ _021DBEC0: .word MOD05_021EFB14 thumb_func_start MOD05_021DBEC4 MOD05_021DBEC4: ; 0x021DBEC4 - ldr r3, _021DBEC8 ; =0x02050E11 + ldr r3, _021DBEC8 ; =FUN_02050E10 bx r3 .balign 4, 0 -_021DBEC8: .word 0x02050E11 +_021DBEC8: .word FUN_02050E10 thumb_func_start MOD05_021DBECC MOD05_021DBECC: ; 0x021DBECC @@ -10288,12 +10288,12 @@ _021DC470: .word MOD05_021DC474 thumb_func_start MOD05_021DC474 MOD05_021DC474: ; 0x021DC474 - ldr r3, _021DC47C ; =0x0201FDED + ldr r3, _021DC47C ; =FUN_0201FDEC add r1, #0xf4 ldr r0, [r1] bx r3 .balign 4, 0 -_021DC47C: .word 0x0201FDED +_021DC47C: .word FUN_0201FDEC thumb_func_start MOD05_021DC480 MOD05_021DC480: ; 0x021DC480 @@ -20312,13 +20312,13 @@ _021E127E: thumb_func_start MOD05_021E1290 MOD05_021E1290: ; 0x021E1290 - ldr r3, _021E129C ; =0x0200CA99 + ldr r3, _021E129C ; =FUN_0200CA98 add r1, r0, #0 ldr r0, _021E12A0 ; =MOD05_021E12A4 mov r2, #0x80 bx r3 nop -_021E129C: .word 0x0200CA99 +_021E129C: .word FUN_0200CA98 _021E12A0: .word MOD05_021E12A4 thumb_func_start MOD05_021E12A4 @@ -21231,10 +21231,10 @@ _021E1986: thumb_func_start MOD05_021E198C MOD05_021E198C: ; 0x021E198C - ldr r3, _021E1990 ; =0x02058E91 + ldr r3, _021E1990 ; =FUN_02058E90 bx r3 .balign 4, 0 -_021E1990: .word 0x02058E91 +_021E1990: .word FUN_02058E90 thumb_func_start MOD05_021E1994 MOD05_021E1994: ; 0x021E1994 @@ -25672,14 +25672,14 @@ _021E3BFC: .word 0xFFFF1FFF thumb_func_start MOD05_021E3C00 MOD05_021E3C00: ; 0x021E3C00 - ldr r3, _021E3C0C ; =0x0200CA99 + ldr r3, _021E3C0C ; =FUN_0200CA98 mov r2, #1 add r1, r0, #0 ldr r0, _021E3C10 ; =MOD05_021E3C14 lsl r2, r2, #0xa bx r3 .balign 4, 0 -_021E3C0C: .word 0x0200CA99 +_021E3C0C: .word FUN_0200CA98 _021E3C10: .word MOD05_021E3C14 thumb_func_start MOD05_021E3C14 @@ -26334,10 +26334,10 @@ MOD05_021E4140: ; 0x021E4140 thumb_func_start MOD05_021E4158 MOD05_021E4158: ; 0x021E4158 - ldr r3, _021E415C ; =0x02016A19 + ldr r3, _021E415C ; =FUN_02016A18 bx r3 .balign 4, 0 -_021E415C: .word 0x02016A19 +_021E415C: .word FUN_02016A18 thumb_func_start MOD05_021E4160 MOD05_021E4160: ; 0x021E4160 @@ -26452,10 +26452,10 @@ MOD05_021E4220: ; 0x021E4220 thumb_func_start MOD05_021E4238 MOD05_021E4238: ; 0x021E4238 - ldr r3, _021E423C ; =0x02016A19 + ldr r3, _021E423C ; =FUN_02016A18 bx r3 .balign 4, 0 -_021E423C: .word 0x02016A19 +_021E423C: .word FUN_02016A18 thumb_func_start MOD05_021E4240 MOD05_021E4240: ; 0x021E4240 @@ -26859,10 +26859,10 @@ _021E452A: thumb_func_start MOD05_021E4534 MOD05_021E4534: ; 0x021E4534 - ldr r3, _021E4538 ; =0x02016A19 + ldr r3, _021E4538 ; =FUN_02016A18 bx r3 .balign 4, 0 -_021E4538: .word 0x02016A19 +_021E4538: .word FUN_02016A18 thumb_func_start MOD05_021E453C MOD05_021E453C: ; 0x021E453C @@ -27610,14 +27610,14 @@ _021E4ACC: .word 0x0400006C thumb_func_start MOD05_021E4AD0 MOD05_021E4AD0: ; 0x021E4AD0 - ldr r3, _021E4ADC ; =0x0200CA99 + ldr r3, _021E4ADC ; =FUN_0200CA98 mov r2, #1 add r1, r0, #0 ldr r0, _021E4AE0 ; =MOD05_021E4AB8 lsl r2, r2, #0xa bx r3 .balign 4, 0 -_021E4ADC: .word 0x0200CA99 +_021E4ADC: .word FUN_0200CA98 _021E4AE0: .word MOD05_021E4AB8 thumb_func_start MOD05_021E4AE4 @@ -27772,10 +27772,10 @@ MOD05_021E4BE8: ; 0x021E4BE8 thumb_func_start MOD05_021E4C00 MOD05_021E4C00: ; 0x021E4C00 - ldr r3, _021E4C04 ; =0x02016A19 + ldr r3, _021E4C04 ; =FUN_02016A18 bx r3 .balign 4, 0 -_021E4C04: .word 0x02016A19 +_021E4C04: .word FUN_02016A18 thumb_func_start MOD05_021E4C08 MOD05_021E4C08: ; 0x021E4C08 @@ -27822,27 +27822,27 @@ MOD05_021E4C34: ; 0x021E4C34 thumb_func_start MOD05_021E4C48 MOD05_021E4C48: ; 0x021E4C48 - ldr r3, _021E4C50 ; =0x020066F5 + ldr r3, _021E4C50 ; =FUN_020066F4 ldr r0, [r0, #0x20] bx r3 nop -_021E4C50: .word 0x020066F5 +_021E4C50: .word FUN_020066F4 thumb_func_start MOD05_021E4C54 MOD05_021E4C54: ; 0x021E4C54 - ldr r3, _021E4C5C ; =0x020067D1 + ldr r3, _021E4C5C ; =FUN_020067D0 ldr r0, [r0, #0x20] bx r3 nop -_021E4C5C: .word 0x020067D1 +_021E4C5C: .word FUN_020067D0 thumb_func_start MOD05_021E4C60 MOD05_021E4C60: ; 0x021E4C60 - ldr r3, _021E4C68 ; =0x02006775 + ldr r3, _021E4C68 ; =FUN_02006774 ldr r0, [r0, #0x20] bx r3 nop -_021E4C68: .word 0x02006775 +_021E4C68: .word FUN_02006774 thumb_func_start MOD05_021E4C6C MOD05_021E4C6C: ; 0x021E4C6C @@ -28079,10 +28079,10 @@ _021E4DDE: thumb_func_start MOD05_021E4DE4 MOD05_021E4DE4: ; 0x021E4DE4 - ldr r3, _021E4DE8 ; =0x02064521 + ldr r3, _021E4DE8 ; =FUN_02064520 bx r3 .balign 4, 0 -_021E4DE8: .word 0x02064521 +_021E4DE8: .word FUN_02064520 thumb_func_start MOD05_021E4DEC MOD05_021E4DEC: ; 0x021E4DEC @@ -28513,11 +28513,11 @@ _021E5106: thumb_func_start MOD05_021E5114 MOD05_021E5114: ; 0x021E5114 ldr r0, [r0, #0x28] - ldr r3, _021E511C ; =0x02020FF1 + ldr r3, _021E511C ; =FUN_02020FF0 ldr r0, [r0, #0x18] bx r3 .balign 4, 0 -_021E511C: .word 0x02020FF1 +_021E511C: .word FUN_02020FF0 thumb_func_start MOD05_021E5120 MOD05_021E5120: ; 0x021E5120 @@ -30435,10 +30435,10 @@ _021E5FD4: .word MOD05_021F5430 thumb_func_start MOD05_021E5FD8 MOD05_021E5FD8: ; 0x021E5FD8 - ldr r3, _021E5FDC ; =0x020553D5 + ldr r3, _021E5FDC ; =FUN_020553D4 bx r3 .balign 4, 0 -_021E5FDC: .word 0x020553D5 +_021E5FDC: .word FUN_020553D4 thumb_func_start MOD05_021E5FE0 MOD05_021E5FE0: ; 0x021E5FE0 @@ -30576,11 +30576,11 @@ _021E60D2: thumb_func_start MOD05_021E610C MOD05_021E610C: ; 0x021E610C - ldr r3, _021E6114 ; =0x020556C9 + ldr r3, _021E6114 ; =FUN_020556C8 mov r1, #1 bx r3 nop -_021E6114: .word 0x020556C9 +_021E6114: .word FUN_020556C8 thumb_func_start MOD05_021E6118 MOD05_021E6118: ; 0x021E6118 @@ -32839,12 +32839,12 @@ _021E72CC: thumb_func_start MOD05_021E72DC MOD05_021E72DC: ; 0x021E72DC - ldr r3, _021E72E4 ; =0x02016A8D + ldr r3, _021E72E4 ; =FUN_02016A8C add r1, r0, #0 mov r0, #4 bx r3 .balign 4, 0 -_021E72E4: .word 0x02016A8D +_021E72E4: .word FUN_02016A8C thumb_func_start MOD05_021E72E8 MOD05_021E72E8: ; 0x021E72E8 @@ -33116,12 +33116,12 @@ _021E74E8: thumb_func_start MOD05_021E74F8 MOD05_021E74F8: ; 0x021E74F8 - ldr r3, _021E7500 ; =0x02016A8D + ldr r3, _021E7500 ; =FUN_02016A8C add r1, r0, #0 mov r0, #4 bx r3 .balign 4, 0 -_021E7500: .word 0x02016A8D +_021E7500: .word FUN_02016A8C thumb_func_start MOD05_021E7504 MOD05_021E7504: ; 0x021E7504 @@ -33157,12 +33157,12 @@ _021E7532: str r0, [r1, #0x10] _021E7536: ldr r0, [r1] - ldr r3, _021E7540 ; =0x02055305 + ldr r3, _021E7540 ; =FUN_02055304 ldr r0, [r0, #0x38] ldr r1, [r1, #0x10] bx r3 .balign 4, 0 -_021E7540: .word 0x02055305 +_021E7540: .word FUN_02055304 thumb_func_start MOD05_021E7544 MOD05_021E7544: ; 0x021E7544 @@ -34048,10 +34048,10 @@ MOD05_021E7C00: ; 0x021E7C00 thumb_func_start MOD05_021E7C14 MOD05_021E7C14: ; 0x021E7C14 - ldr r3, _021E7C18 ; =0x02016A19 + ldr r3, _021E7C18 ; =FUN_02016A18 bx r3 .balign 4, 0 -_021E7C18: .word 0x02016A19 +_021E7C18: .word FUN_02016A18 thumb_func_start MOD05_021E7C1C MOD05_021E7C1C: ; 0x021E7C1C @@ -36434,14 +36434,14 @@ _021E8E50: .word 0x04000010 thumb_func_start MOD05_021E8E54 MOD05_021E8E54: ; 0x021E8E54 - ldr r3, _021E8E60 ; =0x0200CA61 + ldr r3, _021E8E60 ; =FUN_0200CA60 mov r2, #1 add r1, r0, #0 ldr r0, _021E8E64 ; =MOD05_021E8E68 lsl r2, r2, #0xa bx r3 .balign 4, 0 -_021E8E60: .word 0x0200CA61 +_021E8E60: .word FUN_0200CA60 _021E8E64: .word MOD05_021E8E68 thumb_func_start MOD05_021E8E68 @@ -45836,11 +45836,11 @@ MOD05_021EDA98: ; 0x021EDA98 thumb_func_start MOD05_021EDAE8 MOD05_021EDAE8: ; 0x021EDAE8 - ldr r3, _021EDAF0 ; =0x0201F745 + ldr r3, _021EDAF0 ; =FUN_0201F744 ldr r0, [r1, #0x20] bx r3 nop -_021EDAF0: .word 0x0201F745 +_021EDAF0: .word FUN_0201F744 thumb_func_start MOD05_021EDAF4 MOD05_021EDAF4: ; 0x021EDAF4 @@ -54282,10 +54282,10 @@ _021F1C18: .word MOD05_021F1CA4 thumb_func_start MOD05_021F1C1C MOD05_021F1C1C: ; 0x021F1C1C - ldr r3, _021F1C20 ; =0x02058629 + ldr r3, _021F1C20 ; =FUN_02058628 bx r3 .balign 4, 0 -_021F1C20: .word 0x02058629 +_021F1C20: .word FUN_02058628 thumb_func_start MOD05_021F1C24 MOD05_021F1C24: ; 0x021F1C24 @@ -56743,10 +56743,10 @@ MOD05_021F2E40: ; 0x021F2E40 thumb_func_start MOD05_021F2E68 MOD05_021F2E68: ; 0x021F2E68 - ldr r3, _021F2E6C ; =0x0201F23D + ldr r3, _021F2E6C ; =FUN_0201F23C bx r3 .balign 4, 0 -_021F2E6C: .word 0x0201F23D +_021F2E6C: .word FUN_0201F23C thumb_func_start MOD05_021F2E70 MOD05_021F2E70: ; 0x021F2E70 @@ -57964,12 +57964,12 @@ _021F37C2: thumb_func_start MOD05_021F37D0 MOD05_021F37D0: ; 0x021F37D0 - ldr r3, _021F37D8 ; =0x02016A8D + ldr r3, _021F37D8 ; =FUN_02016A8C add r1, r0, #0 ldr r0, [r1] bx r3 .balign 4, 0 -_021F37D8: .word 0x02016A8D +_021F37D8: .word FUN_02016A8C thumb_func_start MOD05_021F37DC MOD05_021F37DC: ; 0x021F37DC @@ -59235,13 +59235,13 @@ _021F4180: thumb_func_start MOD05_021F4184 MOD05_021F4184: ; 0x021F4184 - ldr r3, _021F4190 ; =0x02006865 + ldr r3, _021F4190 ; =FUN_02006864 add r2, r1, #0 mov r1, #0x1c ldr r2, [r2] bx r3 nop -_021F4190: .word 0x02006865 +_021F4190: .word FUN_02006864 thumb_func_start MOD05_021F4194 MOD05_021F4194: ; 0x021F4194 @@ -59250,10 +59250,10 @@ MOD05_021F4194: ; 0x021F4194 mov r1, #0xc mul r1, r2 ldr r2, [r3, #0x10] - ldr r3, _021F41A4 ; =0x02006865 + ldr r3, _021F41A4 ; =FUN_02006864 bx r3 nop -_021F41A4: .word 0x02006865 +_021F41A4: .word FUN_02006864 thumb_func_start MOD05_021F41A8 MOD05_021F41A8: ; 0x021F41A8 @@ -59262,10 +59262,10 @@ MOD05_021F41A8: ; 0x021F41A8 mov r1, #0xc mul r1, r2 ldr r2, [r3, #0x14] - ldr r3, _021F41B8 ; =0x02006865 + ldr r3, _021F41B8 ; =FUN_02006864 bx r3 nop -_021F41B8: .word 0x02006865 +_021F41B8: .word FUN_02006864 thumb_func_start MOD05_021F41BC MOD05_021F41BC: ; 0x021F41BC @@ -59274,41 +59274,41 @@ MOD05_021F41BC: ; 0x021F41BC mov r1, #0xc mul r1, r2 ldr r2, [r3, #4] - ldr r3, _021F41CC ; =0x02006865 + ldr r3, _021F41CC ; =FUN_02006864 bx r3 nop -_021F41CC: .word 0x02006865 +_021F41CC: .word FUN_02006864 thumb_func_start MOD05_021F41D0 MOD05_021F41D0: ; 0x021F41D0 add r3, r1, #0 ldr r1, [r2, #0xc] ldr r2, [r3, #8] - ldr r3, _021F41DC ; =0x02006865 + ldr r3, _021F41DC ; =FUN_02006864 lsl r1, r1, #2 bx r3 .balign 4, 0 -_021F41DC: .word 0x02006865 +_021F41DC: .word FUN_02006864 thumb_func_start MOD05_021F41E0 MOD05_021F41E0: ; 0x021F41E0 add r3, r1, #0 ldr r1, [r2, #0x14] ldr r2, [r3, #0xc] - ldr r3, _021F41EC ; =0x02006865 + ldr r3, _021F41EC ; =FUN_02006864 bx r3 nop -_021F41EC: .word 0x02006865 +_021F41EC: .word FUN_02006864 thumb_func_start MOD05_021F41F0 MOD05_021F41F0: ; 0x021F41F0 add r3, r1, #0 ldr r1, [r2, #0x10] ldr r2, [r3, #0x18] - ldr r3, _021F41FC ; =0x02006865 + ldr r3, _021F41FC ; =FUN_02006864 bx r3 nop -_021F41FC: .word 0x02006865 +_021F41FC: .word FUN_02006864 thumb_func_start MOD05_021F4200 MOD05_021F4200: ; 0x021F4200 @@ -60336,12 +60336,12 @@ MOD05_021F491C: ; 0x021F491C thumb_func_start MOD05_021F4968 MOD05_021F4968: ; 0x021F4968 ldr r2, [r1, #0x14] - ldr r3, _021F4974 ; =0x02016B45 + ldr r3, _021F4974 ; =FUN_02016B44 add r1, r1, r2 sub r1, r1, r0 bx r3 nop -_021F4974: .word 0x02016B45 +_021F4974: .word FUN_02016B44 thumb_func_start MOD05_021F4978 MOD05_021F4978: ; 0x021F4978 @@ -62106,21 +62106,21 @@ _021F5696: thumb_func_start MOD05_021F569C MOD05_021F569C: ; 0x021F569C - ldr r3, _021F56A4 ; =0x02017FE5 + ldr r3, _021F56A4 ; =FUN_02017FE4 mov r0, #2 mov r1, #0 bx r3 .balign 4, 0 -_021F56A4: .word 0x02017FE5 +_021F56A4: .word FUN_02017FE4 thumb_func_start MOD05_021F56A8 MOD05_021F56A8: ; 0x021F56A8 - ldr r3, _021F56B0 ; =0x02017FE5 + ldr r3, _021F56B0 ; =FUN_02017FE4 mov r0, #2 ldr r1, _021F56B4 ; =0x00007FFF bx r3 .balign 4, 0 -_021F56B0: .word 0x02017FE5 +_021F56B0: .word FUN_02017FE4 _021F56B4: .word 0x00007FFF thumb_func_start MOD05_021F56B8 @@ -62710,10 +62710,10 @@ _021F5B30: thumb_func_start MOD05_021F5B34 MOD05_021F5B34: ; 0x021F5B34 - ldr r3, _021F5B38 ; =0x02016A19 + ldr r3, _021F5B38 ; =FUN_02016A18 bx r3 .balign 4, 0 -_021F5B38: .word 0x02016A19 +_021F5B38: .word FUN_02016A18 thumb_func_start MOD05_021F5B3C MOD05_021F5B3C: ; 0x021F5B3C @@ -63791,13 +63791,13 @@ _021F62F2: thumb_func_start MOD05_021F62FC MOD05_021F62FC: ; 0x021F62FC - ldr r3, _021F6308 ; =0x0201EFE1 + ldr r3, _021F6308 ; =FUN_0201EFE0 add r1, r0, #0 ldr r0, [r1, #0x20] ldr r1, [r1, #0x30] bx r3 nop -_021F6308: .word 0x0201EFE1 +_021F6308: .word FUN_0201EFE0 thumb_func_start MOD05_021F630C MOD05_021F630C: ; 0x021F630C diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index b439e37b..a7ddd5a6 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -180,26 +180,26 @@ _022397F0: .word 0x0224F1D8 thumb_func_start MOD06_022397F4 MOD06_022397F4: ; 0x022397F4 - ldr r3, _02239800 ; =0x0200CA99 + ldr r3, _02239800 ; =FUN_0200CA98 mov r2, #1 add r1, r0, #0 ldr r0, _02239804 ; =MOD06_0223981C lsl r2, r2, #0xa bx r3 .align 2, 0 -_02239800: .word 0x0200CA99 +_02239800: .word FUN_0200CA98 _02239804: .word MOD06_0223981C thumb_func_start MOD06_02239808 MOD06_02239808: ; 0x02239808 - ldr r3, _02239814 ; =0x0200CA99 + ldr r3, _02239814 ; =FUN_0200CA98 mov r2, #1 add r1, r0, #0 ldr r0, _02239818 ; =MOD06_02239840 lsl r2, r2, #0xa bx r3 .align 2, 0 -_02239814: .word 0x0200CA99 +_02239814: .word FUN_0200CA98 _02239818: .word MOD06_02239840 thumb_func_start MOD06_0223981C @@ -238,10 +238,10 @@ MOD06_02239840: ; 0x02239840 thumb_func_start MOD06_02239864 MOD06_02239864: ; 0x02239864 - ldr r3, _02239868 ; =0x021D7A29 + ldr r3, _02239868 ; =MOD05_021D7A28 bx r3 .align 2, 0 -_02239868: .word 0x021D7A29 +_02239868: .word MOD05_021D7A28 thumb_func_start MOD06_0223986C MOD06_0223986C: ; 0x0223986C @@ -279,14 +279,14 @@ _022398A4: .word 0x0224F21C thumb_func_start MOD06_022398A8 MOD06_022398A8: ; 0x022398A8 - ldr r3, _022398B4 ; =0x0200CA99 + ldr r3, _022398B4 ; =FUN_0200CA98 mov r2, #1 add r1, r0, #0 ldr r0, _022398B8 ; =MOD06_022398BC lsl r2, r2, #0xa bx r3 .align 2, 0 -_022398B4: .word 0x0200CA99 +_022398B4: .word FUN_0200CA98 _022398B8: .word MOD06_022398BC thumb_func_start MOD06_022398BC @@ -822,20 +822,20 @@ _02239CE4: thumb_func_start MOD06_02239CE8 MOD06_02239CE8: ; 0x02239CE8 ldr r0, [r0, #4] - ldr r3, _02239CF4 ; =0x021D8025 + ldr r3, _02239CF4 ; =MOD05_021D8024 ldr r0, [r0, #4] ldr r1, _02239CF8 ; =0x0224F1C0 bx r3 nop -_02239CF4: .word 0x021D8025 +_02239CF4: .word MOD05_021D8024 _02239CF8: .word 0x0224F1C0 thumb_func_start MOD06_02239CFC MOD06_02239CFC: ; 0x02239CFC - ldr r3, _02239D00 ; =0x021D80A5 + ldr r3, _02239D00 ; =MOD05_021D80A4 bx r3 .align 2, 0 -_02239D00: .word 0x021D80A5 +_02239D00: .word MOD05_021D80A4 thumb_func_start MOD06_02239D04 MOD06_02239D04: ; 0x02239D04 @@ -1170,20 +1170,20 @@ _02239F60: .word MOD06_0223B340 thumb_func_start MOD06_02239F64 MOD06_02239F64: ; 0x02239F64 ldr r0, [r0, #4] - ldr r3, _02239F70 ; =0x021D8025 + ldr r3, _02239F70 ; =MOD05_021D8024 ldr r0, [r0, #4] ldr r1, _02239F74 ; =0x0224F190 bx r3 nop -_02239F70: .word 0x021D8025 +_02239F70: .word MOD05_021D8024 _02239F74: .word 0x0224F190 thumb_func_start MOD06_02239F78 MOD06_02239F78: ; 0x02239F78 - ldr r3, _02239F7C ; =0x021D80A5 + ldr r3, _02239F7C ; =MOD05_021D80A4 bx r3 .align 2, 0 -_02239F7C: .word 0x021D80A5 +_02239F7C: .word MOD05_021D80A4 thumb_func_start MOD06_02239F80 MOD06_02239F80: ; 0x02239F80 @@ -1437,7 +1437,7 @@ MOD06_0223A1B0: ; 0x0223A1B0 MOD06_0223A1C4: ; 0x0223A1C4 lsl r2, r1, #2 ldr r1, _0223A1D8 ; =0x0224F174 - ldr r3, _0223A1DC ; =0x021D8025 + ldr r3, _0223A1DC ; =MOD05_021D8024 ldr r2, [r1, r2] ldr r1, _0223A1E0 ; =0x02252240 str r2, [r1, #8] @@ -1447,7 +1447,7 @@ MOD06_0223A1C4: ; 0x0223A1C4 bx r3 .align 2, 0 _0223A1D8: .word 0x0224F174 -_0223A1DC: .word 0x021D8025 +_0223A1DC: .word MOD05_021D8024 _0223A1E0: .word 0x02252240 _0223A1E4: .word 0x02252240 @@ -1585,20 +1585,20 @@ _0223A2E4: .word MOD06_0223A828 thumb_func_start MOD06_0223A2E8 MOD06_0223A2E8: ; 0x0223A2E8 ldr r0, [r0, #4] - ldr r3, _0223A2F4 ; =0x021D8025 + ldr r3, _0223A2F4 ; =MOD05_021D8024 ldr r0, [r0, #4] ldr r1, _0223A2F8 ; =0x0224F1A8 bx r3 nop -_0223A2F4: .word 0x021D8025 +_0223A2F4: .word MOD05_021D8024 _0223A2F8: .word 0x0224F1A8 thumb_func_start MOD06_0223A2FC MOD06_0223A2FC: ; 0x0223A2FC - ldr r3, _0223A300 ; =0x021D80A5 + ldr r3, _0223A300 ; =MOD05_021D80A4 bx r3 .align 2, 0 -_0223A300: .word 0x021D80A5 +_0223A300: .word MOD05_021D80A4 thumb_func_start MOD06_0223A304 MOD06_0223A304: ; 0x0223A304 @@ -1701,10 +1701,10 @@ MOD06_0223A39C: ; 0x0223A39C thumb_func_start MOD06_0223A3A4 MOD06_0223A3A4: ; 0x0223A3A4 - ldr r3, _0223A3A8 ; =0x021F52C9 + ldr r3, _0223A3A8 ; =MOD05_021F52C8 bx r3 .align 2, 0 -_0223A3A8: .word 0x021F52C9 +_0223A3A8: .word MOD05_021F52C8 thumb_func_start MOD06_0223A3AC MOD06_0223A3AC: ; 0x0223A3AC @@ -1720,70 +1720,70 @@ MOD06_0223A3AC: ; 0x0223A3AC thumb_func_start MOD06_0223A3C0 MOD06_0223A3C0: ; 0x0223A3C0 - ldr r3, _0223A3C4 ; =0x021F5359 + ldr r3, _0223A3C4 ; =MOD05_021F5358 bx r3 .align 2, 0 -_0223A3C4: .word 0x021F5359 +_0223A3C4: .word MOD05_021F5358 thumb_func_start MOD06_0223A3C8 MOD06_0223A3C8: ; 0x0223A3C8 - ldr r3, _0223A3D0 ; =0x021F5385 + ldr r3, _0223A3D0 ; =MOD05_021F5384 mov r1, #1 lsl r1, r1, #0xc bx r3 .align 2, 0 -_0223A3D0: .word 0x021F5385 +_0223A3D0: .word MOD05_021F5384 thumb_func_start MOD06_0223A3D4 MOD06_0223A3D4: ; 0x0223A3D4 - ldr r3, _0223A3D8 ; =0x021F5385 + ldr r3, _0223A3D8 ; =MOD05_021F5384 bx r3 .align 2, 0 -_0223A3D8: .word 0x021F5385 +_0223A3D8: .word MOD05_021F5384 thumb_func_start MOD06_0223A3DC MOD06_0223A3DC: ; 0x0223A3DC - ldr r3, _0223A3E4 ; =0x021F53BD + ldr r3, _0223A3E4 ; =MOD05_021F53BC mov r1, #1 lsl r1, r1, #0xc bx r3 .align 2, 0 -_0223A3E4: .word 0x021F53BD +_0223A3E4: .word MOD05_021F53BC thumb_func_start MOD06_0223A3E8 MOD06_0223A3E8: ; 0x0223A3E8 - ldr r3, _0223A3EC ; =0x021F53F9 + ldr r3, _0223A3EC ; =MOD05_021F53F8 bx r3 .align 2, 0 -_0223A3EC: .word 0x021F53F9 +_0223A3EC: .word MOD05_021F53F8 thumb_func_start MOD06_0223A3F0 MOD06_0223A3F0: ; 0x0223A3F0 - ldr r3, _0223A3F4 ; =0x021F5401 + ldr r3, _0223A3F4 ; =MOD05_021F5400 bx r3 .align 2, 0 -_0223A3F4: .word 0x021F5401 +_0223A3F4: .word MOD05_021F5400 thumb_func_start MOD06_0223A3F8 MOD06_0223A3F8: ; 0x0223A3F8 - ldr r3, _0223A3FC ; =0x021F5425 + ldr r3, _0223A3FC ; =MOD05_021F5424 bx r3 .align 2, 0 -_0223A3FC: .word 0x021F5425 +_0223A3FC: .word MOD05_021F5424 thumb_func_start MOD06_0223A400 MOD06_0223A400: ; 0x0223A400 - ldr r3, _0223A404 ; =0x021F5431 + ldr r3, _0223A404 ; =MOD05_021F5430 bx r3 .align 2, 0 -_0223A404: .word 0x021F5431 +_0223A404: .word MOD05_021F5430 thumb_func_start MOD06_0223A408 MOD06_0223A408: ; 0x0223A408 - ldr r3, _0223A40C ; =0x021F54CD + ldr r3, _0223A40C ; =MOD05_021F54CC bx r3 .align 2, 0 -_0223A40C: .word 0x021F54CD +_0223A40C: .word MOD05_021F54CC thumb_func_start MOD06_0223A410 MOD06_0223A410: ; 0x0223A410 @@ -1799,10 +1799,10 @@ MOD06_0223A418: ; 0x0223A418 thumb_func_start MOD06_0223A420 MOD06_0223A420: ; 0x0223A420 - ldr r3, _0223A424 ; =0x021F54E1 + ldr r3, _0223A424 ; =MOD05_021F54E0 bx r3 .align 2, 0 -_0223A424: .word 0x021F54E1 +_0223A424: .word MOD05_021F54E0 thumb_func_start MOD06_0223A428 MOD06_0223A428: ; 0x0223A428 @@ -2335,7 +2335,7 @@ MOD06_0223A800: ; 0x0223A800 mov r2, #0 lsl r0, r0, #4 str r2, [r1, r0] - ldr r3, _0223A818 ; =0x0200CA45 + ldr r3, _0223A818 ; =FUN_0200CA44 mov r2, #4 sub r0, r0, #4 str r2, [r1, r0] @@ -2343,7 +2343,7 @@ MOD06_0223A800: ; 0x0223A800 lsl r2, r2, #8 bx r3 .align 2, 0 -_0223A818: .word 0x0200CA45 +_0223A818: .word FUN_0200CA44 _0223A81C: .word MOD06_0223A944 thumb_func_start MOD06_0223A820 @@ -4371,10 +4371,10 @@ _0223B72C: thumb_func_start MOD06_0223B73C MOD06_0223B73C: ; 0x0223B73C - ldr r3, _0223B740 ; =0x02016A19 + ldr r3, _0223B740 ; =FUN_02016A18 bx r3 .align 2, 0 -_0223B740: .word 0x02016A19 +_0223B740: .word FUN_02016A18 thumb_func_start MOD06_0223B744 MOD06_0223B744: ; 0x0223B744 @@ -4388,12 +4388,12 @@ MOD06_0223B744: ; 0x0223B744 str r1, [r0, #0x10] str r2, [r0, #0x14] ldr r0, [r0] - ldr r3, _0223B764 ; =0x021DB52D + ldr r3, _0223B764 ; =MOD05_021DB52C ldr r0, [r0, #0x48] bx r3 nop _0223B760: .word 0x0224F248 -_0223B764: .word 0x021DB52D +_0223B764: .word MOD05_021DB52C thumb_func_start MOD06_0223B768 MOD06_0223B768: ; 0x0223B768 @@ -11061,11 +11061,11 @@ _0223ECC4: .word 0x00000241 MOD06_0223ECC8: ; 0x0223ECC8 mov r2, #2 lsl r2, r2, #8 - ldr r3, _0223ECD4 ; =0x0200C665 + ldr r3, _0223ECD4 ; =FUN_0200C664 ldr r0, [r0, r2] bx r3 nop -_0223ECD4: .word 0x0200C665 +_0223ECD4: .word FUN_0200C664 thumb_func_start MOD06_0223ECD8 MOD06_0223ECD8: ; 0x0223ECD8 @@ -12486,10 +12486,10 @@ MOD06_0223F89C: ; 0x0223F89C thumb_func_start MOD06_0223F8B4 MOD06_0223F8B4: ; 0x0223F8B4 - ldr r3, _0223F8B8 ; =0x02050025 + ldr r3, _0223F8B8 ; =FUN_02050024 bx r3 .align 2, 0 -_0223F8B8: .word 0x02050025 +_0223F8B8: .word FUN_02050024 thumb_func_start MOD06_0223F8BC MOD06_0223F8BC: ; 0x0223F8BC @@ -14240,26 +14240,26 @@ _0224074C: .word 0x02252420 thumb_func_start MOD06_02240750 MOD06_02240750: ; 0x02240750 ldr r0, _0224075C ; =0x02252420 - ldr r3, _02240760 ; =0x02031259 + ldr r3, _02240760 ; =FUN_02031258 ldr r0, [r0] add r0, #0x91 ldrb r0, [r0] bx r3 .align 2, 0 _0224075C: .word 0x02252420 -_02240760: .word 0x02031259 +_02240760: .word FUN_02031258 thumb_func_start MOD06_02240764 MOD06_02240764: ; 0x02240764 ldr r0, _02240770 ; =0x02252420 - ldr r3, _02240774 ; =0x02031249 + ldr r3, _02240774 ; =FUN_02031248 ldr r0, [r0] add r0, #0x91 ldrb r0, [r0] bx r3 .align 2, 0 _02240770: .word 0x02252420 -_02240774: .word 0x02031249 +_02240774: .word FUN_02031248 thumb_func_start MOD06_02240778 MOD06_02240778: ; 0x02240778 @@ -19828,17 +19828,17 @@ _022433A4: .word 0x020CD3B4 thumb_func_start MOD06_022433A8 MOD06_022433A8: ; 0x022433A8 - ldr r3, _022433AC ; =0x0202A1E5 + ldr r3, _022433AC ; =FUN_0202A1E4 bx r3 .align 2, 0 -_022433AC: .word 0x0202A1E5 +_022433AC: .word FUN_0202A1E4 thumb_func_start MOD06_022433B0 MOD06_022433B0: ; 0x022433B0 - ldr r3, _022433B4 ; =0x0202A399 + ldr r3, _022433B4 ; =FUN_0202A398 bx r3 .align 2, 0 -_022433B4: .word 0x0202A399 +_022433B4: .word FUN_0202A398 thumb_func_start MOD06_022433B8 MOD06_022433B8: ; 0x022433B8 @@ -21125,10 +21125,10 @@ _02243DB4: .word MOD06_022442C4 thumb_func_start MOD06_02243DB8 MOD06_02243DB8: ; 0x02243DB8 - ldr r3, _02243DBC ; =0x02046949 + ldr r3, _02243DBC ; =FUN_02046948 bx r3 .align 2, 0 -_02243DBC: .word 0x02046949 +_02243DBC: .word FUN_02046948 thumb_func_start MOD06_02243DC0 MOD06_02243DC0: ; 0x02243DC0 @@ -23104,20 +23104,20 @@ MOD06_02244CE8: ; 0x02244CE8 add r3, r0, #0 add r2, r1, #0 add r1, r3, #0 - ldr r3, _02244CF4 ; =0x0200650D + ldr r3, _02244CF4 ; =LoadFromNarc_2 mov r0, #0x86 bx r3 .align 2, 0 -_02244CF4: .word 0x0200650D +_02244CF4: .word LoadFromNarc_2 thumb_func_start MOD06_02244CF8 MOD06_02244CF8: ; 0x02244CF8 - ldr r3, _02244D00 ; =0x020064F1 + ldr r3, _02244D00 ; =LoadFromNARC add r2, r1, #0 mov r1, #0x87 bx r3 .align 2, 0 -_02244D00: .word 0x020064F1 +_02244D00: .word LoadFromNARC thumb_func_start MOD06_02244D04 MOD06_02244D04: ; 0x02244D04 @@ -23207,19 +23207,19 @@ _02244DA4: thumb_func_start MOD06_02244DB0 MOD06_02244DB0: ; 0x02244DB0 - ldr r3, _02244DB8 ; =0x020169D9 + ldr r3, _02244DB8 ; =FUN_020169D8 mov r1, #0x17 lsl r1, r1, #4 bx r3 .align 2, 0 -_02244DB8: .word 0x020169D9 +_02244DB8: .word FUN_020169D8 thumb_func_start MOD06_02244DBC MOD06_02244DBC: ; 0x02244DBC - ldr r3, _02244DC0 ; =0x02016A19 + ldr r3, _02244DC0 ; =FUN_02016A18 bx r3 .align 2, 0 -_02244DC0: .word 0x02016A19 +_02244DC0: .word FUN_02016A18 thumb_func_start MOD06_02244DC4 MOD06_02244DC4: ; 0x02244DC4 @@ -23376,14 +23376,14 @@ MOD06_02244EF8: ; 0x02244EF8 mov r2, #1 lsl r0, r0, #2 str r2, [r1, r0] - ldr r3, _02244F10 ; =0x0200CA45 + ldr r3, _02244F10 ; =FUN_0200CA44 mov r2, #0 add r0, r0, #4 str r2, [r1, r0] ldr r0, _02244F14 ; =MOD06_02244F64 bx r3 nop -_02244F10: .word 0x0200CA45 +_02244F10: .word FUN_0200CA44 _02244F14: .word MOD06_02244F64 thumb_func_start MOD06_02244F18 @@ -23688,10 +23688,10 @@ _0224518C: .word 0x0000071D thumb_func_start MOD06_02245190 MOD06_02245190: ; 0x02245190 - ldr r3, _02245194 ; =0x02016A19 + ldr r3, _02245194 ; =FUN_02016A18 bx r3 .align 2, 0 -_02245194: .word 0x02016A19 +_02245194: .word FUN_02016A18 thumb_func_start MOD06_02245198 MOD06_02245198: ; 0x02245198 @@ -24562,10 +24562,10 @@ _02245808: thumb_func_start MOD06_02245824 MOD06_02245824: ; 0x02245824 - ldr r3, _02245828 ; =0x0205E49D + ldr r3, _02245828 ; =FUN_0205E49C bx r3 .align 2, 0 -_02245828: .word 0x0205E49D +_02245828: .word FUN_0205E49C thumb_func_start MOD06_0224582C MOD06_0224582C: ; 0x0224582C @@ -25623,11 +25623,11 @@ _02245FEE: thumb_func_start MOD06_02245FF8 MOD06_02245FF8: ; 0x02245FF8 - ldr r3, _02246000 ; =0x0201FFC9 + ldr r3, _02246000 ; =FUN_0201FFC8 ldr r0, [r1, #0x68] bx r3 nop -_02246000: .word 0x0201FFC9 +_02246000: .word FUN_0201FFC8 thumb_func_start MOD06_02246004 MOD06_02246004: ; 0x02246004 @@ -26394,12 +26394,12 @@ MOD06_02246600: ; 0x02246600 thumb_func_start MOD06_02246604 MOD06_02246604: ; 0x02246604 - ldr r3, _0224660C ; =0x02006671 + ldr r3, _0224660C ; =FUN_02006670 mov r0, #0x61 mov r1, #4 bx r3 .align 2, 0 -_0224660C: .word 0x02006671 +_0224660C: .word FUN_02006670 thumb_func_start MOD06_02246610 MOD06_02246610: ; 0x02246610 @@ -26514,10 +26514,10 @@ MOD06_022466C0: ; 0x022466C0 thumb_func_start MOD06_022466E0 MOD06_022466E0: ; 0x022466E0 - ldr r3, _022466E4 ; =0x02016A19 + ldr r3, _022466E4 ; =FUN_02016A18 bx r3 .align 2, 0 -_022466E4: .word 0x02016A19 +_022466E4: .word FUN_02016A18 thumb_func_start MOD06_022466E8 MOD06_022466E8: ; 0x022466E8 @@ -27751,12 +27751,12 @@ _02247008: .word 0x04000008 thumb_func_start MOD06_0224700C MOD06_0224700C: ; 0x0224700C - ldr r3, _02247014 ; =0x02006671 + ldr r3, _02247014 ; =FUN_02006670 mov r0, #0x61 mov r1, #4 bx r3 .align 2, 0 -_02247014: .word 0x02006671 +_02247014: .word FUN_02006670 thumb_func_start MOD06_02247018 MOD06_02247018: ; 0x02247018 @@ -28514,11 +28514,11 @@ MOD06_022475A4: ; 0x022475A4 thumb_func_start MOD06_02247610 MOD06_02247610: ; 0x02247610 - ldr r3, _02247618 ; =0x02018745 + ldr r3, _02247618 ; =FUN_02018744 mov r1, #3 bx r3 nop -_02247618: .word 0x02018745 +_02247618: .word FUN_02018744 thumb_func_start MOD06_0224761C MOD06_0224761C: ; 0x0224761C @@ -28718,14 +28718,14 @@ _02247778: .word 0x0400004A thumb_func_start MOD06_0224777C MOD06_0224777C: ; 0x0224777C - ldr r3, _02247788 ; =0x02068B69 + ldr r3, _02247788 ; =FUN_02068B68 add r2, r0, #0 add r0, r1, #0 ldr r1, [r2, #0x5c] mov r2, #2 bx r3 .align 2, 0 -_02247788: .word 0x02068B69 +_02247788: .word FUN_02068B68 thumb_func_start MOD06_0224778C MOD06_0224778C: ; 0x0224778C @@ -28769,10 +28769,10 @@ MOD06_022477D4: ; 0x022477D4 add r2, r1, #0 ldrh r0, [r3] ldrh r1, [r3, #4] - ldr r3, _022477E0 ; =0x02012471 + ldr r3, _022477E0 ; =FUN_02012470 bx r3 .align 2, 0 -_022477E0: .word 0x02012471 +_022477E0: .word FUN_02012470 thumb_func_start MOD06_022477E4 MOD06_022477E4: ; 0x022477E4 @@ -29127,11 +29127,11 @@ MOD06_02247A54: ; 0x02247A54 thumb_func_start MOD06_02247A9C MOD06_02247A9C: ; 0x02247A9C - ldr r3, _02247AA4 ; =0x0201FFC9 + ldr r3, _02247AA4 ; =FUN_0201FFC8 ldr r0, [r1, #8] bx r3 nop -_02247AA4: .word 0x0201FFC9 +_02247AA4: .word FUN_0201FFC8 thumb_func_start MOD06_02247AA8 MOD06_02247AA8: ; 0x02247AA8 @@ -29290,11 +29290,11 @@ MOD06_02247BA0: ; 0x02247BA0 thumb_func_start MOD06_02247BCC MOD06_02247BCC: ; 0x02247BCC - ldr r3, _02247BD4 ; =0x0201FFC9 + ldr r3, _02247BD4 ; =FUN_0201FFC8 ldr r0, [r1, #0x58] bx r3 nop -_02247BD4: .word 0x0201FFC9 +_02247BD4: .word FUN_0201FFC8 thumb_func_start MOD06_02247BD8 MOD06_02247BD8: ; 0x02247BD8 @@ -31249,12 +31249,12 @@ MOD06_02248B20: ; 0x02248B20 thumb_func_start MOD06_02248B24 MOD06_02248B24: ; 0x02248B24 - ldr r3, _02248B2C ; =0x02002269 + ldr r3, _02248B2C ; =StringCopyN add r0, r0, #4 mov r2, #8 bx r3 .align 2, 0 -_02248B2C: .word 0x02002269 +_02248B2C: .word StringCopyN thumb_func_start MOD06_02248B30 MOD06_02248B30: ; 0x02248B30 @@ -31296,11 +31296,11 @@ MOD06_02248B5C: ; 0x02248B5C thumb_func_start MOD06_02248B60 MOD06_02248B60: ; 0x02248B60 - ldr r3, _02248B68 ; =0x0202B5D9 + ldr r3, _02248B68 ; =FUN_0202B5D8 ldr r0, [r0, #0x14] bx r3 nop -_02248B68: .word 0x0202B5D9 +_02248B68: .word FUN_0202B5D8 thumb_func_start MOD06_02248B6C MOD06_02248B6C: ; 0x02248B6C @@ -31450,10 +31450,10 @@ _02248CA4: thumb_func_start MOD06_02248CB8 MOD06_02248CB8: ; 0x02248CB8 - ldr r3, _02248CBC ; =0x02016A19 + ldr r3, _02248CBC ; =FUN_02016A18 bx r3 .align 2, 0 -_02248CBC: .word 0x02016A19 +_02248CBC: .word FUN_02016A18 thumb_func_start MOD06_02248CC0 MOD06_02248CC0: ; 0x02248CC0 @@ -32321,11 +32321,11 @@ _0224930C: .word MOD06_02249388 thumb_func_start MOD06_02249310 MOD06_02249310: ; 0x02249310 - ldr r3, _02249318 ; =0x0200CAB5 + ldr r3, _02249318 ; =FUN_0200CAB4 ldr r0, [r0, #0x24] bx r3 nop -_02249318: .word 0x0200CAB5 +_02249318: .word FUN_0200CAB4 thumb_func_start MOD06_0224931C MOD06_0224931C: ; 0x0224931C @@ -32939,22 +32939,22 @@ MOD06_022497BC: ; 0x022497BC thumb_func_start MOD06_022497CC MOD06_022497CC: ; 0x022497CC - ldr r3, _022497D8 ; =0x021E5079 + ldr r3, _022497D8 ; =MOD05_021E5078 ldr r0, [r0] mov r1, #2 mov r2, #0x14 bx r3 nop -_022497D8: .word 0x021E5079 +_022497D8: .word MOD05_021E5078 thumb_func_start MOD06_022497DC MOD06_022497DC: ; 0x022497DC - ldr r3, _022497E4 ; =0x021E50A1 + ldr r3, _022497E4 ; =MOD05_021E50A0 ldr r0, [r0] mov r1, #2 bx r3 .align 2, 0 -_022497E4: .word 0x021E50A1 +_022497E4: .word MOD05_021E50A0 thumb_func_start MOD06_022497E8 MOD06_022497E8: ; 0x022497E8 @@ -33477,11 +33477,11 @@ _02249BD6: thumb_func_start MOD06_02249C24 MOD06_02249C24: ; 0x02249C24 - ldr r3, _02249C2C ; =0x0201F745 + ldr r3, _02249C2C ; =FUN_0201F744 ldr r0, [r1, #0x3c] bx r3 nop -_02249C2C: .word 0x0201F745 +_02249C2C: .word FUN_0201F744 thumb_func_start MOD06_02249C30 MOD06_02249C30: ; 0x02249C30 @@ -35124,11 +35124,11 @@ _0224A86C: thumb_func_start MOD06_0224A870 MOD06_0224A870: ; 0x0224A870 ldr r0, [r1, #0x1c] - ldr r3, _0224A878 ; =0x021F5431 + ldr r3, _0224A878 ; =MOD05_021F5430 add r0, #0x18 bx r3 .align 2, 0 -_0224A878: .word 0x021F5431 +_0224A878: .word MOD05_021F5430 thumb_func_start MOD06_0224A87C MOD06_0224A87C: ; 0x0224A87C @@ -35174,11 +35174,11 @@ MOD06_0224A8A8: ; 0x0224A8A8 thumb_func_start MOD06_0224A8C8 MOD06_0224A8C8: ; 0x0224A8C8 - ldr r3, _0224A8D0 ; =0x021E4C01 + ldr r3, _0224A8D0 ; =MOD05_021E4C00 ldr r0, [r0, #0x5c] bx r3 nop -_0224A8D0: .word 0x021E4C01 +_0224A8D0: .word MOD05_021E4C00 thumb_func_start MOD06_0224A8D4 MOD06_0224A8D4: ; 0x0224A8D4 @@ -35364,11 +35364,11 @@ MOD06_0224AA14: ; 0x0224AA14 thumb_func_start MOD06_0224AA34 MOD06_0224AA34: ; 0x0224AA34 - ldr r3, _0224AA3C ; =0x021E4C01 + ldr r3, _0224AA3C ; =MOD05_021E4C00 ldr r0, [r0, #0x5c] bx r3 nop -_0224AA3C: .word 0x021E4C01 +_0224AA3C: .word MOD05_021E4C00 thumb_func_start MOD06_0224AA40 MOD06_0224AA40: ; 0x0224AA40 @@ -35554,11 +35554,11 @@ MOD06_0224AB80: ; 0x0224AB80 thumb_func_start MOD06_0224ABA0 MOD06_0224ABA0: ; 0x0224ABA0 - ldr r3, _0224ABA8 ; =0x021E4C01 + ldr r3, _0224ABA8 ; =MOD05_021E4C00 ldr r0, [r0, #0x5c] bx r3 nop -_0224ABA8: .word 0x021E4C01 +_0224ABA8: .word MOD05_021E4C00 thumb_func_start MOD06_0224ABAC MOD06_0224ABAC: ; 0x0224ABAC @@ -36429,11 +36429,11 @@ _0224B234: thumb_func_start MOD06_0224B23C MOD06_0224B23C: ; 0x0224B23C ldr r0, [r1] - ldr r3, _0224B244 ; =0x021F5431 + ldr r3, _0224B244 ; =MOD05_021F5430 add r0, #0x18 bx r3 .align 2, 0 -_0224B244: .word 0x021F5431 +_0224B244: .word MOD05_021F5430 thumb_func_start MOD06_0224B248 MOD06_0224B248: ; 0x0224B248 @@ -36635,11 +36635,11 @@ _0224B3D0: thumb_func_start MOD06_0224B3D8 MOD06_0224B3D8: ; 0x0224B3D8 ldr r0, [r1] - ldr r3, _0224B3E0 ; =0x021F5431 + ldr r3, _0224B3E0 ; =MOD05_021F5430 add r0, #0x18 bx r3 .align 2, 0 -_0224B3E0: .word 0x021F5431 +_0224B3E0: .word MOD05_021F5430 thumb_func_start MOD06_0224B3E4 MOD06_0224B3E4: ; 0x0224B3E4 @@ -36928,11 +36928,11 @@ _0224B65E: thumb_func_start MOD06_0224B664 MOD06_0224B664: ; 0x0224B664 - ldr r3, _0224B66C ; =0x0201F745 + ldr r3, _0224B66C ; =FUN_0201F744 ldr r0, [r1, #0x34] bx r3 nop -_0224B66C: .word 0x0201F745 +_0224B66C: .word FUN_0201F744 thumb_func_start MOD06_0224B670 MOD06_0224B670: ; 0x0224B670 @@ -37102,11 +37102,11 @@ MOD06_0224B788: ; 0x0224B788 thumb_func_start MOD06_0224B7C0 MOD06_0224B7C0: ; 0x0224B7C0 - ldr r3, _0224B7C8 ; =0x0201F745 + ldr r3, _0224B7C8 ; =FUN_0201F744 ldr r0, [r1, #0x1c] bx r3 nop -_0224B7C8: .word 0x0201F745 +_0224B7C8: .word FUN_0201F744 thumb_func_start MOD06_0224B7CC MOD06_0224B7CC: ; 0x0224B7CC @@ -37270,11 +37270,11 @@ _0224B8EC: thumb_func_start MOD06_0224B8FC MOD06_0224B8FC: ; 0x0224B8FC - ldr r3, _0224B904 ; =0x0201F745 + ldr r3, _0224B904 ; =FUN_0201F744 ldr r0, [r1, #0x24] bx r3 nop -_0224B904: .word 0x0201F745 +_0224B904: .word FUN_0201F744 thumb_func_start MOD06_0224B908 MOD06_0224B908: ; 0x0224B908 @@ -37470,11 +37470,11 @@ MOD06_0224BA30: ; 0x0224BA30 thumb_func_start MOD06_0224BA88 MOD06_0224BA88: ; 0x0224BA88 - ldr r3, _0224BA90 ; =0x0201F745 + ldr r3, _0224BA90 ; =FUN_0201F744 ldr r0, [r1, #0x24] bx r3 nop -_0224BA90: .word 0x0201F745 +_0224BA90: .word FUN_0201F744 thumb_func_start MOD06_0224BA94 MOD06_0224BA94: ; 0x0224BA94 @@ -37723,11 +37723,11 @@ MOD06_0224BC50: ; 0x0224BC50 thumb_func_start MOD06_0224BC94 MOD06_0224BC94: ; 0x0224BC94 - ldr r3, _0224BC9C ; =0x0201F745 + ldr r3, _0224BC9C ; =FUN_0201F744 ldr r0, [r1, #0x20] bx r3 nop -_0224BC9C: .word 0x0201F745 +_0224BC9C: .word FUN_0201F744 thumb_func_start MOD06_0224BCA0 MOD06_0224BCA0: ; 0x0224BCA0 @@ -37966,11 +37966,11 @@ _0224BE86: thumb_func_start MOD06_0224BE8C MOD06_0224BE8C: ; 0x0224BE8C - ldr r3, _0224BE94 ; =0x0201F745 + ldr r3, _0224BE94 ; =FUN_0201F744 ldr r0, [r1, #0x34] bx r3 nop -_0224BE94: .word 0x0201F745 +_0224BE94: .word FUN_0201F744 thumb_func_start MOD06_0224BE98 MOD06_0224BE98: ; 0x0224BE98 @@ -38299,11 +38299,11 @@ _0224C138: thumb_func_start MOD06_0224C140 MOD06_0224C140: ; 0x0224C140 - ldr r3, _0224C148 ; =0x0201F745 + ldr r3, _0224C148 ; =FUN_0201F744 ldr r0, [r1, #0x34] bx r3 nop -_0224C148: .word 0x0201F745 +_0224C148: .word FUN_0201F744 thumb_func_start MOD06_0224C14C MOD06_0224C14C: ; 0x0224C14C @@ -38992,21 +38992,21 @@ _0224C6E4: .word 0x02251DE4 thumb_func_start MOD06_0224C6E8 MOD06_0224C6E8: ; 0x0224C6E8 - ldr r3, _0224C6F0 ; =0x021DA4ED + ldr r3, _0224C6F0 ; =MOD05_021DA4EC ldr r0, [r0, #0x50] mov r2, #0 bx r3 .align 2, 0 -_0224C6F0: .word 0x021DA4ED +_0224C6F0: .word MOD05_021DA4EC thumb_func_start MOD06_0224C6F4 MOD06_0224C6F4: ; 0x0224C6F4 - ldr r3, _0224C6FC ; =0x021DA4ED + ldr r3, _0224C6FC ; =MOD05_021DA4EC ldr r0, [r0, #0x50] mov r2, #1 bx r3 .align 2, 0 -_0224C6FC: .word 0x021DA4ED +_0224C6FC: .word MOD05_021DA4EC thumb_func_start MOD06_0224C700 MOD06_0224C700: ; 0x0224C700 @@ -40655,11 +40655,11 @@ MOD06_0224D344: ; 0x0224D344 thumb_func_start MOD06_0224D388 MOD06_0224D388: ; 0x0224D388 - ldr r3, _0224D390 ; =0x0201F745 + ldr r3, _0224D390 ; =FUN_0201F744 ldr r0, [r1, #0x20] bx r3 nop -_0224D390: .word 0x0201F745 +_0224D390: .word FUN_0201F744 thumb_func_start MOD06_0224D394 MOD06_0224D394: ; 0x0224D394 @@ -41710,11 +41710,11 @@ MOD06_0224DC3C: ; 0x0224DC3C thumb_func_start MOD06_0224DC50 MOD06_0224DC50: ; 0x0224DC50 - ldr r3, _0224DC58 ; =0x0201FD59 + ldr r3, _0224DC58 ; =FUN_0201FD58 ldr r0, [r0, #0x1c] bx r3 nop -_0224DC58: .word 0x0201FD59 +_0224DC58: .word FUN_0201FD58 thumb_func_start MOD06_0224DC5C MOD06_0224DC5C: ; 0x0224DC5C @@ -42756,13 +42756,13 @@ _0224E4A2: thumb_func_start MOD06_0224E4A4 MOD06_0224E4A4: ; 0x0224E4A4 - ldr r3, _0224E4B0 ; =0x020021AD + ldr r3, _0224E4B0 ; =FUN_020021AC add r1, r0, #0 ldr r0, [r1, #4] ldr r1, [r1, #8] bx r3 nop -_0224E4B0: .word 0x020021AD +_0224E4B0: .word FUN_020021AC thumb_func_start MOD06_0224E4B4 MOD06_0224E4B4: ; 0x0224E4B4 @@ -42822,11 +42822,11 @@ MOD06_0224E510: ; 0x0224E510 mov r3, #0xc mul r3, r2 ldr r1, [r1, r3] - ldr r3, _0224E51C ; =0x020270D9 + ldr r3, _0224E51C ; =FUN_020270D8 mov r2, #1 bx r3 .align 2, 0 -_0224E51C: .word 0x020270D9 +_0224E51C: .word FUN_020270D8 thumb_func_start MOD06_0224E520 MOD06_0224E520: ; 0x0224E520 @@ -43156,13 +43156,13 @@ _0224E794: thumb_func_start MOD06_0224E7C4 MOD06_0224E7C4: ; 0x0224E7C4 - ldr r3, _0224E7D0 ; =0x0204640D + ldr r3, _0224E7D0 ; =FUN_0204640C ldr r0, [r0, #0x10] ldr r1, _0224E7D4 ; =MOD06_0224E7D8 mov r2, #0 bx r3 nop -_0224E7D0: .word 0x0204640D +_0224E7D0: .word FUN_0204640C _0224E7D4: .word MOD06_0224E7D8 thumb_func_start MOD06_0224E7D8 @@ -43506,10 +43506,10 @@ _0224EA58: thumb_func_start MOD06_0224EA5C MOD06_0224EA5C: ; 0x0224EA5C - ldr r3, _0224EA60 ; =0x021F5431 + ldr r3, _0224EA60 ; =MOD05_021F5430 bx r3 .align 2, 0 -_0224EA60: .word 0x021F5431 +_0224EA60: .word MOD05_021F5430 thumb_func_start MOD06_0224EA64 MOD06_0224EA64: ; 0x0224EA64 @@ -43595,20 +43595,20 @@ _0224EAF8: .word MOD06_0224EA5C thumb_func_start MOD06_0224EAFC MOD06_0224EAFC: ; 0x0224EAFC ldr r0, [r0, #4] - ldr r3, _0224EB08 ; =0x021D8025 + ldr r3, _0224EB08 ; =MOD05_021D8024 ldr r0, [r0, #4] ldr r1, _0224EB0C ; =0x022521D4 bx r3 nop -_0224EB08: .word 0x021D8025 +_0224EB08: .word MOD05_021D8024 _0224EB0C: .word 0x022521D4 thumb_func_start MOD06_0224EB10 MOD06_0224EB10: ; 0x0224EB10 - ldr r3, _0224EB14 ; =0x021D80A5 + ldr r3, _0224EB14 ; =MOD05_021D80A4 bx r3 .align 2, 0 -_0224EB14: .word 0x021D80A5 +_0224EB14: .word MOD05_021D80A4 thumb_func_start MOD06_0224EB18 MOD06_0224EB18: ; 0x0224EB18 @@ -43744,31 +43744,31 @@ _0224EC10: .word MOD06_0224EA5C thumb_func_start MOD06_0224EC14 MOD06_0224EC14: ; 0x0224EC14 ldr r0, [r0, #4] - ldr r3, _0224EC20 ; =0x021D8025 + ldr r3, _0224EC20 ; =MOD05_021D8024 ldr r0, [r0, #4] ldr r1, _0224EC24 ; =0x0225218C bx r3 nop -_0224EC20: .word 0x021D8025 +_0224EC20: .word MOD05_021D8024 _0224EC24: .word 0x0225218C thumb_func_start MOD06_0224EC28 MOD06_0224EC28: ; 0x0224EC28 ldr r0, [r0, #4] - ldr r3, _0224EC34 ; =0x021D8025 + ldr r3, _0224EC34 ; =MOD05_021D8024 ldr r0, [r0, #4] ldr r1, _0224EC38 ; =0x022521A4 bx r3 nop -_0224EC34: .word 0x021D8025 +_0224EC34: .word MOD05_021D8024 _0224EC38: .word 0x022521A4 thumb_func_start MOD06_0224EC3C MOD06_0224EC3C: ; 0x0224EC3C - ldr r3, _0224EC40 ; =0x021D80A5 + ldr r3, _0224EC40 ; =MOD05_021D80A4 bx r3 .align 2, 0 -_0224EC40: .word 0x021D80A5 +_0224EC40: .word MOD05_021D80A4 thumb_func_start MOD06_0224EC44 MOD06_0224EC44: ; 0x0224EC44 @@ -43949,20 +43949,20 @@ MOD06_0224ED84: ; 0x0224ED84 thumb_func_start MOD06_0224ED94 MOD06_0224ED94: ; 0x0224ED94 ldr r0, [r0, #4] - ldr r3, _0224EDA0 ; =0x021D8025 + ldr r3, _0224EDA0 ; =MOD05_021D8024 ldr r0, [r0, #4] ldr r1, _0224EDA4 ; =0x022521BC bx r3 nop -_0224EDA0: .word 0x021D8025 +_0224EDA0: .word MOD05_021D8024 _0224EDA4: .word 0x022521BC thumb_func_start MOD06_0224EDA8 MOD06_0224EDA8: ; 0x0224EDA8 - ldr r3, _0224EDAC ; =0x021D80A5 + ldr r3, _0224EDAC ; =MOD05_021D80A4 bx r3 .align 2, 0 -_0224EDAC: .word 0x021D80A5 +_0224EDAC: .word MOD05_021D80A4 thumb_func_start MOD06_0224EDB0 MOD06_0224EDB0: ; 0x0224EDB0 @@ -44373,20 +44373,20 @@ _0224F0AC: thumb_func_start MOD06_0224F0BC MOD06_0224F0BC: ; 0x0224F0BC ldr r0, [r0, #4] - ldr r3, _0224F0C8 ; =0x021D8025 + ldr r3, _0224F0C8 ; =MOD05_021D8024 ldr r0, [r0, #4] ldr r1, _0224F0CC ; =0x022521EC bx r3 nop -_0224F0C8: .word 0x021D8025 +_0224F0C8: .word MOD05_021D8024 _0224F0CC: .word 0x022521EC thumb_func_start MOD06_0224F0D0 MOD06_0224F0D0: ; 0x0224F0D0 - ldr r3, _0224F0D4 ; =0x021D80A5 + ldr r3, _0224F0D4 ; =MOD05_021D80A4 bx r3 .align 2, 0 -_0224F0D4: .word 0x021D80A5 +_0224F0D4: .word MOD05_021D80A4 thumb_func_start MOD06_0224F0D8 MOD06_0224F0D8: ; 0x0224F0D8 diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index ec645354..26cea47c 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -1003,13 +1003,13 @@ _02212544: thumb_func_start MOD08_0221255C
MOD08_0221255C: ; 0x0221255C
- ldr r3, _02212568 ; =0x0200CA45
+ ldr r3, _02212568 ; =FUN_0200CA44
str r0, [r1, #0x38]
ldr r0, _0221256C ; =MOD08_02212574
ldr r2, _02212570 ; =0x0000044C
bx r3
nop
-_02212568: .word 0x0200CA45
+_02212568: .word FUN_0200CA44
_0221256C: .word MOD08_02212574
_02212570: .word 0x0000044C
@@ -6040,7 +6040,7 @@ MOD08_02214B38: ; 0x02214B38 thumb_func_start MOD08_02214B3C
MOD08_02214B3C: ; 0x02214B3C
ldr r1, [r0, #0x18]
- ldr r3, _02214B50 ; =0x020054C9
+ ldr r3, _02214B50 ; =FUN_020054C8
add r1, r1, #4
str r1, [r0, #0x18]
ldr r2, [r1]
@@ -6050,7 +6050,7 @@ MOD08_02214B3C: ; 0x02214B3C lsr r0, r0, #0x10
bx r3
.align 2, 0
-_02214B50: .word 0x020054C9
+_02214B50: .word FUN_020054C8
thumb_func_start MOD08_02214B54
MOD08_02214B54: ; 0x02214B54
@@ -7001,18 +7001,18 @@ MOD08_02215284: ; 0x02215284 add r2, r0, r2
mov r0, #0x4f
lsl r0, r0, #2
- ldr r3, _022152A4 ; =0x0200C645
+ ldr r3, _022152A4 ; =FUN_0200C644
ldr r0, [r2, r0]
bx r3
.align 2, 0
-_022152A4: .word 0x0200C645
+_022152A4: .word FUN_0200C644
thumb_func_start MOD08_022152A8
MOD08_022152A8: ; 0x022152A8
- ldr r3, _022152AC ; =0x02020C2D
+ ldr r3, _022152AC ; =ErrorHandling
bx r3
.align 2, 0
-_022152AC: .word 0x02020C2D
+_022152AC: .word ErrorHandling
thumb_func_start MOD08_022152B0
MOD08_022152B0: ; 0x022152B0
@@ -8148,10 +8148,10 @@ MOD08_02215ACC: ; 0x02215ACC thumb_func_start MOD08_02215AF8
MOD08_02215AF8: ; 0x02215AF8
- ldr r3, _02215AFC ; =0x02006705
+ ldr r3, _02215AFC ; =FUN_02006704
bx r3
.align 2, 0
-_02215AFC: .word 0x02006705
+_02215AFC: .word FUN_02006704
thumb_func_start MOD08_02215B00
MOD08_02215B00: ; 0x02215B00
@@ -14296,11 +14296,11 @@ MOD08_022188BC: ; 0x022188BC thumb_func_start MOD08_022188D0
MOD08_022188D0: ; 0x022188D0
- ldr r3, _022188D8 ; =0x02012B69
+ ldr r3, _022188D8 ; =FUN_02012B68
ldr r0, [r0, #0x1c]
bx r3
nop
-_022188D8: .word 0x02012B69
+_022188D8: .word FUN_02012B68
thumb_func_start MOD08_022188DC
MOD08_022188DC: ; 0x022188DC
@@ -32594,19 +32594,19 @@ _02221D98: thumb_func_start MOD08_02221DF0
MOD08_02221DF0: ; 0x02221DF0
- ldr r3, _02221DF8 ; =0x0200C3DD
+ ldr r3, _02221DF8 ; =FUN_0200C3DC
ldr r0, [r0]
bx r3
nop
-_02221DF8: .word 0x0200C3DD
+_02221DF8: .word FUN_0200C3DC
thumb_func_start MOD08_02221DFC
MOD08_02221DFC: ; 0x02221DFC
- ldr r3, _02221E04 ; =0x0200C645
+ ldr r3, _02221E04 ; =FUN_0200C644
ldr r0, [r0]
bx r3
nop
-_02221E04: .word 0x0200C645
+_02221E04: .word FUN_0200C644
thumb_func_start MOD08_02221E08
MOD08_02221E08: ; 0x02221E08
@@ -34855,11 +34855,11 @@ _022230D4: .word 0xBF800000 thumb_func_start MOD08_022230D8
MOD08_022230D8: ; 0x022230D8
- ldr r3, _022230E0 ; =0x0200C3DD
+ ldr r3, _022230E0 ; =FUN_0200C3DC
ldr r0, [r0]
bx r3
nop
-_022230E0: .word 0x0200C3DD
+_022230E0: .word FUN_0200C3DC
thumb_func_start MOD08_022230E4
MOD08_022230E4: ; 0x022230E4
@@ -44142,11 +44142,11 @@ _02227B4E: thumb_func_start MOD08_02227B64
MOD08_02227B64: ; 0x02227B64
- ldr r3, _02227B6C ; =0x0200C7A1
+ ldr r3, _02227B6C ; =FUN_0200C7A0
add r2, r1, #2
bx r3
nop
-_02227B6C: .word 0x0200C7A1
+_02227B6C: .word FUN_0200C7A0
thumb_func_start MOD08_02227B70
MOD08_02227B70: ; 0x02227B70
@@ -45529,10 +45529,10 @@ _02228616: thumb_func_start MOD08_02228618
MOD08_02228618: ; 0x02228618
- ldr r3, _0222861C ; =0x02016A19
+ ldr r3, _0222861C ; =FUN_02016A18
bx r3
.align 2, 0
-_0222861C: .word 0x02016A19
+_0222861C: .word FUN_02016A18
thumb_func_start MOD08_02228620
MOD08_02228620: ; 0x02228620
@@ -45972,10 +45972,10 @@ _0222896C: thumb_func_start MOD08_02228970
MOD08_02228970: ; 0x02228970
- ldr r3, _02228974 ; =0x02016A19
+ ldr r3, _02228974 ; =FUN_02016A18
bx r3
.align 2, 0
-_02228974: .word 0x02016A19
+_02228974: .word FUN_02016A18
thumb_func_start MOD08_02228978
MOD08_02228978: ; 0x02228978
@@ -48264,12 +48264,12 @@ MOD08_02229A5C: ; 0x02229A5C add r1, r2, #0
str r0, [r2, #0x1c]
ldr r0, [r2, #0x30]
- ldr r3, _02229A7C ; =0x0200C7A1
+ ldr r3, _02229A7C ; =FUN_0200C7A0
add r1, #0xb8
add r2, #0xba
bx r3
nop
-_02229A7C: .word 0x0200C7A1
+_02229A7C: .word FUN_0200C7A0
thumb_func_start MOD08_02229A80
MOD08_02229A80: ; 0x02229A80
@@ -48971,27 +48971,27 @@ _02229FE0: .word 0x00001770 thumb_func_start MOD08_02229FE4
MOD08_02229FE4: ; 0x02229FE4
- ldr r3, _02229FEC ; =0x0200C645
+ ldr r3, _02229FEC ; =FUN_0200C644
ldr r0, [r0, #0x30]
bx r3
nop
-_02229FEC: .word 0x0200C645
+_02229FEC: .word FUN_0200C644
thumb_func_start MOD08_02229FF0
MOD08_02229FF0: ; 0x02229FF0
- ldr r3, _02229FF8 ; =0x0200C715
+ ldr r3, _02229FF8 ; =FUN_0200C714
ldr r0, [r0, #0x30]
bx r3
nop
-_02229FF8: .word 0x0200C715
+_02229FF8: .word FUN_0200C714
thumb_func_start MOD08_02229FFC
MOD08_02229FFC: ; 0x02229FFC
- ldr r3, _0222A004 ; =0x0200C899
+ ldr r3, _0222A004 ; =FUN_0200C898
ldr r0, [r0, #0x30]
bx r3
nop
-_0222A004: .word 0x0200C899
+_0222A004: .word FUN_0200C898
thumb_func_start MOD08_0222A008
MOD08_0222A008: ; 0x0222A008
@@ -49000,19 +49000,19 @@ MOD08_0222A008: ; 0x0222A008 thumb_func_start MOD08_0222A00C
MOD08_0222A00C: ; 0x0222A00C
- ldr r3, _0222A014 ; =0x0200C6C5
+ ldr r3, _0222A014 ; =FUN_0200C6C4
ldr r0, [r0, #0x30]
bx r3
nop
-_0222A014: .word 0x0200C6C5
+_0222A014: .word FUN_0200C6C4
thumb_func_start MOD08_0222A018
MOD08_0222A018: ; 0x0222A018
- ldr r3, _0222A020 ; =0x0200C6B1
+ ldr r3, _0222A020 ; =FUN_0200C6B0
ldr r0, [r0, #0x30]
bx r3
nop
-_0222A020: .word 0x0200C6B1
+_0222A020: .word FUN_0200C6B0
thumb_func_start MOD08_0222A024
MOD08_0222A024: ; 0x0222A024
@@ -49325,10 +49325,10 @@ _0222A24E: thumb_func_start MOD08_0222A258
MOD08_0222A258: ; 0x0222A258
- ldr r3, _0222A25C ; =0x0201341D
+ ldr r3, _0222A25C ; =FUN_0201341C
bx r3
.align 2, 0
-_0222A25C: .word 0x0201341D
+_0222A25C: .word FUN_0201341C
thumb_func_start MOD08_0222A260
MOD08_0222A260: ; 0x0222A260
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 04792e97..27a9c5be 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -2950,11 +2950,11 @@ _02213610: .word 0x00002088 thumb_func_start MOD09_02213614
MOD09_02213614: ; 0x02213614
- ldr r3, _0221361C ; =0x02020989
+ ldr r3, _0221361C ; =FUN_02020988
add r0, r1, #0
bx r3
nop
-_0221361C: .word 0x02020989
+_0221361C: .word FUN_02020988
thumb_func_start MOD09_02213620
MOD09_02213620: ; 0x02213620
@@ -3742,10 +3742,10 @@ _02213C1C: add r0, r1, r0
ldrh r0, [r0, #0x34]
_02213C2A:
- ldr r3, _02213C30 ; =0x0206EA55
+ ldr r3, _02213C30 ; =FUN_0206EA54
bx r3
nop
-_02213C30: .word 0x0206EA55
+_02213C30: .word FUN_0206EA54
thumb_func_start MOD09_02213C34
MOD09_02213C34: ; 0x02213C34
@@ -3969,12 +3969,12 @@ MOD09_02213DE0: ; 0x02213DE0 add r2, r0, #0
ldr r0, [r2, r1]
add r1, r1, #4
- ldr r3, _02213DF4 ; =0x020191A5
+ ldr r3, _02213DF4 ; =FUN_020191A4
ldrb r1, [r2, r1]
bx r3
nop
_02213DF0: .word 0x00002070
-_02213DF4: .word 0x020191A5
+_02213DF4: .word FUN_020191A4
thumb_func_start MOD09_02213DF8
MOD09_02213DF8: ; 0x02213DF8
@@ -14263,11 +14263,11 @@ _02219420: .word 0x0000114C thumb_func_start MOD09_02219424
MOD09_02219424: ; 0x02219424
- ldr r3, _0221942C ; =0x02020989
+ ldr r3, _0221942C ; =FUN_02020988
add r0, r1, #0
bx r3
nop
-_0221942C: .word 0x02020989
+_0221942C: .word FUN_02020988
thumb_func_start MOD09_02219430
MOD09_02219430: ; 0x02219430
@@ -14391,11 +14391,11 @@ MOD09_02219510: ; 0x02219510 add r1, r0, #0
ldr r0, [r1, #0x2c]
add r1, #0x30
- ldr r3, _0221951C ; =0x020191A5
+ ldr r3, _0221951C ; =FUN_020191A4
ldrb r1, [r1]
bx r3
.align 2, 0
-_0221951C: .word 0x020191A5
+_0221951C: .word FUN_020191A4
thumb_func_start MOD09_02219520
MOD09_02219520: ; 0x02219520
@@ -17275,10 +17275,10 @@ _0221AC12: thumb_func_start MOD09_0221AC1C
MOD09_0221AC1C: ; 0x0221AC1C
- ldr r3, _0221AC20 ; =0x02016A19
+ ldr r3, _0221AC20 ; =FUN_02016A18
bx r3
.align 2, 0
-_0221AC20: .word 0x02016A19
+_0221AC20: .word FUN_02016A18
thumb_func_start MOD09_0221AC24
MOD09_0221AC24: ; 0x0221AC24
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index 37f1b829..9112a837 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -3053,10 +3053,10 @@ _0222EFD0: .word 0x04000580 thumb_func_start MOD11_0222EFD4
MOD11_0222EFD4: ; 0x0222EFD4
- ldr r3, _0222EFD8 ; =0x020223BD
+ ldr r3, _0222EFD8 ; =FUN_020223BC
bx r3
.align 2, 0
-_0222EFD8: .word 0x020223BD
+_0222EFD8: .word FUN_020223BC
thumb_func_start MOD11_0222EFDC
MOD11_0222EFDC: ; 0x0222EFDC
@@ -5432,11 +5432,11 @@ MOD11_02230218: ; 0x02230218 MOD11_0223021C: ; 0x0223021C
lsl r1, r1, #2
add r0, r0, r1
- ldr r3, _02230228 ; =0x020239CD
+ ldr r3, _02230228 ; =FUN_020239CC
ldr r0, [r0, #0x48]
bx r3
nop
-_02230228: .word 0x020239CD
+_02230228: .word FUN_020239CC
thumb_func_start MOD11_0223022C
MOD11_0223022C: ; 0x0223022C
@@ -7002,11 +7002,11 @@ _02230E40: MOD11_02230E44: ; 0x02230E44
mov r1, #0x6d
lsl r1, r1, #2
- ldr r3, _02230E50 ; =0x02025085
+ ldr r3, _02230E50 ; =FUN_02025084
ldr r0, [r0, r1]
bx r3
nop
-_02230E50: .word 0x02025085
+_02230E50: .word FUN_02025084
thumb_func_start MOD11_02230E54
MOD11_02230E54: ; 0x02230E54
@@ -7029,11 +7029,11 @@ _02230E62: MOD11_02230E70: ; 0x02230E70
mov r1, #0x6d
lsl r1, r1, #2
- ldr r3, _02230E7C ; =0x02025049
+ ldr r3, _02230E7C ; =FUN_02025048
ldr r0, [r0, r1]
bx r3
nop
-_02230E7C: .word 0x02025049
+_02230E7C: .word FUN_02025048
thumb_func_start MOD11_02230E80
MOD11_02230E80: ; 0x02230E80
@@ -7605,22 +7605,22 @@ _02231288: .word 0x0000242C MOD11_0223128C: ; 0x0223128C
mov r2, #0x86
lsl r2, r2, #2
- ldr r3, _02231298 ; =0x0202A0E9
+ ldr r3, _02231298 ; =FUN_0202A0E8
ldr r0, [r0, r2]
bx r3
nop
-_02231298: .word 0x0202A0E9
+_02231298: .word FUN_0202A0E8
thumb_func_start MOD11_0223129C
MOD11_0223129C: ; 0x0223129C
mov r1, #0x86
lsl r1, r1, #2
ldr r0, [r0, r1]
- ldr r3, _022312A8 ; =0x0202A171
+ ldr r3, _022312A8 ; =FUN_0202A170
mov r1, #0x16
bx r3
.align 2, 0
-_022312A8: .word 0x0202A171
+_022312A8: .word FUN_0202A170
thumb_func_start MOD11_022312AC
MOD11_022312AC: ; 0x022312AC
@@ -8186,13 +8186,13 @@ _02231664: thumb_func_start MOD11_02231668
MOD11_02231668: ; 0x02231668
- ldr r3, _02231674 ; =0x02024595
+ ldr r3, _02231674 ; =FUN_02024594
lsl r1, r1, #0x10
ldr r0, [r0, #0x60]
lsr r1, r1, #0x10
bx r3
nop
-_02231674: .word 0x02024595
+_02231674: .word FUN_02024594
thumb_func_start MOD11_02231678
MOD11_02231678: ; 0x02231678
@@ -9450,19 +9450,19 @@ MOD11_022320C8: ; 0x022320C8 thumb_func_start MOD11_022320EC
MOD11_022320EC: ; 0x022320EC
- ldr r3, _022320F4 ; =0x0200AD5D
+ ldr r3, _022320F4 ; =FUN_0200AD5C
ldr r0, [r0, #0x14]
bx r3
nop
-_022320F4: .word 0x0200AD5D
+_022320F4: .word FUN_0200AD5C
thumb_func_start MOD11_022320F8
MOD11_022320F8: ; 0x022320F8
- ldr r3, _02232100 ; =0x0200AE39
+ ldr r3, _02232100 ; =FUN_0200AE38
ldr r0, [r0, #0x14]
bx r3
nop
-_02232100: .word 0x0200AE39
+_02232100: .word FUN_0200AE38
thumb_func_start MOD11_02232104
MOD11_02232104: ; 0x02232104
@@ -9504,35 +9504,35 @@ _02232134: thumb_func_start MOD11_02232148
MOD11_02232148: ; 0x02232148
- ldr r3, _02232150 ; =0x0200AF19
+ ldr r3, _02232150 ; =FUN_0200AF18
ldr r0, [r0, #0x14]
bx r3
nop
-_02232150: .word 0x0200AF19
+_02232150: .word FUN_0200AF18
thumb_func_start MOD11_02232154
MOD11_02232154: ; 0x02232154
- ldr r3, _0223215C ; =0x0200ADCD
+ ldr r3, _0223215C ; =FUN_0200ADCC
ldr r0, [r0, #0x14]
bx r3
nop
-_0223215C: .word 0x0200ADCD
+_0223215C: .word FUN_0200ADCC
thumb_func_start MOD11_02232160
MOD11_02232160: ; 0x02232160
- ldr r3, _02232168 ; =0x0200AF51
+ ldr r3, _02232168 ; =FUN_0200AF50
ldr r0, [r0, #0x14]
bx r3
nop
-_02232168: .word 0x0200AF51
+_02232168: .word FUN_0200AF50
thumb_func_start MOD11_0223216C
MOD11_0223216C: ; 0x0223216C
- ldr r3, _02232174 ; =0x0200AF89
+ ldr r3, _02232174 ; =FUN_0200AF88
ldr r0, [r0, #0x14]
bx r3
nop
-_02232174: .word 0x0200AF89
+_02232174: .word FUN_0200AF88
thumb_func_start MOD11_02232178
MOD11_02232178: ; 0x02232178
@@ -9560,11 +9560,11 @@ MOD11_0223219C: ; 0x0223219C thumb_func_start MOD11_022321A0
MOD11_022321A0: ; 0x022321A0
- ldr r3, _022321A8 ; =0x0200AFBD
+ ldr r3, _022321A8 ; =FUN_0200AFBC
ldr r0, [r0, #0x14]
bx r3
nop
-_022321A8: .word 0x0200AFBD
+_022321A8: .word FUN_0200AFBC
thumb_func_start MOD11_022321AC
MOD11_022321AC: ; 0x022321AC
@@ -91571,11 +91571,11 @@ _0225A3F0: .word MOD11_0225A3F4 thumb_func_start MOD11_0225A3F4
MOD11_0225A3F4: ; 0x0225A3F4
- ldr r3, _0225A3FC ; =0x0200C5A9
+ ldr r3, _0225A3FC ; =FUN_0200C5A8
add r0, r1, #0
bx r3
nop
-_0225A3FC: .word 0x0200C5A9
+_0225A3FC: .word FUN_0200C5A8
thumb_func_start MOD11_0225A400
MOD11_0225A400: ; 0x0225A400
@@ -98209,12 +98209,12 @@ _0225D650: thumb_func_start MOD11_0225D664
MOD11_0225D664: ; 0x0225D664
- ldr r3, _0225D66C ; =0x0200C645
+ ldr r3, _0225D66C ; =FUN_0200C644
ldr r0, [r0, #0x10]
mov r1, #0
bx r3
.align 2, 0
-_0225D66C: .word 0x0200C645
+_0225D66C: .word FUN_0200C644
thumb_func_start MOD11_0225D670
MOD11_0225D670: ; 0x0225D670
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index cb6807a6..f7999898 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -4162,12 +4162,12 @@ _0222F820: .word 0x000080EA thumb_func_start MOD12_0222F824 MOD12_0222F824: ; 0x0222F824 - ldr r3, _0222F82C ; =0x0200C369 + ldr r3, _0222F82C ; =FUN_0200C368 ldr r0, [r0, #0x2c] ldr r1, _0222F830 ; =0x000080EA bx r3 .align 2, 0 -_0222F82C: .word 0x0200C369 +_0222F82C: .word FUN_0200C368 _0222F830: .word 0x000080EA thumb_func_start MOD12_0222F834 @@ -5933,10 +5933,10 @@ MOD12_022306A4: ; 0x022306A4 thumb_func_start MOD12_022306F0 MOD12_022306F0: ; 0x022306F0 - ldr r3, _022306F4 ; =0x02012CC9 + ldr r3, _022306F4 ; =FUN_02012CC8 bx r3 .align 2, 0 -_022306F4: .word 0x02012CC9 +_022306F4: .word FUN_02012CC8 thumb_func_start MOD12_022306F8 MOD12_022306F8: ; 0x022306F8 @@ -7537,10 +7537,10 @@ _02231374: .word 0x04000580 thumb_func_start MOD12_02231378 MOD12_02231378: ; 0x02231378 - ldr r3, _0223137C ; =0x020223BD + ldr r3, _0223137C ; =FUN_020223BC bx r3 .align 2, 0 -_0223137C: .word 0x020223BD +_0223137C: .word FUN_020223BC thumb_func_start MOD12_02231380 MOD12_02231380: ; 0x02231380 @@ -7680,12 +7680,12 @@ MOD12_02231490: ; 0x02231490 lsr r3, r3, #1 sub r1, r1, r3 _0223149A: - ldr r3, _022314A4 ; =0x020118C5 + ldr r3, _022314A4 ; =FUN_020118C4 ldr r0, [r0] sub r2, #8 bx r3 nop -_022314A4: .word 0x020118C5 +_022314A4: .word FUN_020118C4 thumb_func_start MOD12_022314A8 MOD12_022314A8: ; 0x022314A8 @@ -11875,10 +11875,10 @@ _02233498: .word 0x000080F6 thumb_func_start MOD12_0223349C MOD12_0223349C: ; 0x0223349C - ldr r3, _022334A0 ; =0x0200C3DD + ldr r3, _022334A0 ; =FUN_0200C3DC bx r3 .align 2, 0 -_022334A0: .word 0x0200C3DD +_022334A0: .word FUN_0200C3DC thumb_func_start MOD12_022334A4 MOD12_022334A4: ; 0x022334A4 @@ -11953,10 +11953,10 @@ _02233530: .word 0x0224519C thumb_func_start MOD12_02233534 MOD12_02233534: ; 0x02233534 - ldr r3, _02233538 ; =0x0200C3DD + ldr r3, _02233538 ; =FUN_0200C3DC bx r3 .align 2, 0 -_02233538: .word 0x0200C3DD +_02233538: .word FUN_0200C3DC thumb_func_start MOD12_0223353C MOD12_0223353C: ; 0x0223353C @@ -12621,10 +12621,10 @@ _02233A60: .word 0x0224533C thumb_func_start MOD12_02233A64 MOD12_02233A64: ; 0x02233A64 - ldr r3, _02233A68 ; =0x0200C3DD + ldr r3, _02233A68 ; =FUN_0200C3DC bx r3 .align 2, 0 -_02233A68: .word 0x0200C3DD +_02233A68: .word FUN_0200C3DC thumb_func_start MOD12_02233A6C MOD12_02233A6C: ; 0x02233A6C @@ -25566,12 +25566,12 @@ _02239B78: .word 0x02245F4A thumb_func_start MOD12_02239B7C MOD12_02239B7C: ; 0x02239B7C - ldr r3, _02239B84 ; =0x0201BD71 + ldr r3, _02239B84 ; =FUN_0201BD70 add r0, #0xd0 ldrb r0, [r0] bx r3 .align 2, 0 -_02239B84: .word 0x0201BD71 +_02239B84: .word FUN_0201BD70 thumb_func_start MOD12_02239B88 MOD12_02239B88: ; 0x02239B88 @@ -31736,11 +31736,11 @@ _0223CB14: .word 0x00009CAE MOD12_0223CB18: ; 0x0223CB18 mov r1, #2 lsl r1, r1, #8 - ldr r3, _0223CB24 ; =0x0200CAB5 + ldr r3, _0223CB24 ; =FUN_0200CAB4 ldr r0, [r0, r1] bx r3 nop -_0223CB24: .word 0x0200CAB5 +_0223CB24: .word FUN_0200CAB4 thumb_func_start MOD12_0223CB28 MOD12_0223CB28: ; 0x0223CB28 @@ -34820,12 +34820,12 @@ _0223E2A4: .word 0x02246226 thumb_func_start MOD12_0223E2A8 MOD12_0223E2A8: ; 0x0223E2A8 ldr r1, _0223E2B0 ; =0x00000AB8 - ldr r3, _0223E2B4 ; =0x0201BD71 + ldr r3, _0223E2B4 ; =FUN_0201BD70 ldrb r0, [r0, r1] bx r3 .align 2, 0 _0223E2B0: .word 0x00000AB8 -_0223E2B4: .word 0x0201BD71 +_0223E2B4: .word FUN_0201BD70 thumb_func_start MOD12_0223E2B8 MOD12_0223E2B8: ; 0x0223E2B8 @@ -34963,11 +34963,11 @@ _0223E3CA: strb r0, [r1, #0xc] _0223E3CE: ldr r0, [r1, #4] - ldr r3, _0223E3D8 ; =0x0200C59D + ldr r3, _0223E3D8 ; =FUN_0200C59C ldr r0, [r0] bx r3 nop -_0223E3D8: .word 0x0200C59D +_0223E3D8: .word FUN_0200C59C thumb_func_start MOD12_0223E3DC MOD12_0223E3DC: ; 0x0223E3DC @@ -35014,12 +35014,12 @@ _0223E438: .word 0x00027100 thumb_func_start MOD12_0223E43C MOD12_0223E43C: ; 0x0223E43C - ldr r3, _0223E444 ; =0x0200C645 + ldr r3, _0223E444 ; =FUN_0200C644 ldr r0, [r0, #4] mov r1, #0 bx r3 .align 2, 0 -_0223E444: .word 0x0200C645 +_0223E444: .word FUN_0200C644 thumb_func_start MOD12_0223E448 MOD12_0223E448: ; 0x0223E448 @@ -40568,10 +40568,10 @@ MOD12_02240E34: ; 0x02240E34 thumb_func_start MOD12_02240E7C MOD12_02240E7C: ; 0x02240E7C - ldr r3, _02240E80 ; =0x0200C359 + ldr r3, _02240E80 ; =FUN_0200C358 bx r3 .align 2, 0 -_02240E80: .word 0x0200C359 +_02240E80: .word FUN_0200C358 thumb_func_start MOD12_02240E84 MOD12_02240E84: ; 0x02240E84 @@ -40612,10 +40612,10 @@ _02240EA6: thumb_func_start MOD12_02240EC8 MOD12_02240EC8: ; 0x02240EC8 - ldr r3, _02240ECC ; =0x0200C3DD + ldr r3, _02240ECC ; =FUN_0200C3DC bx r3 .align 2, 0 -_02240ECC: .word 0x0200C3DD +_02240ECC: .word FUN_0200C3DC thumb_func_start MOD12_02240ED0 MOD12_02240ED0: ; 0x02240ED0 @@ -43608,11 +43608,11 @@ _022426A8: .word 0x0224664E MOD12_022426AC: ; 0x022426AC mov r1, #0xe6 lsl r1, r1, #2 - ldr r3, _022426B8 ; =0x0201BD71 + ldr r3, _022426B8 ; =FUN_0201BD70 ldrb r0, [r0, r1] bx r3 nop -_022426B8: .word 0x0201BD71 +_022426B8: .word FUN_0201BD70 thumb_func_start MOD12_022426BC MOD12_022426BC: ; 0x022426BC diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 1ace4733..e725bfc5 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -7805,11 +7805,11 @@ MOD14_021DB470: ; 0x021DB470 thumb_func_start MOD14_021DB490 MOD14_021DB490: ; 0x021DB490 - ldr r3, _021DB498 ; =0x02016A19 + ldr r3, _021DB498 ; =FUN_02016A18 ldr r0, [r0] bx r3 nop -_021DB498: .word 0x02016A19 +_021DB498: .word FUN_02016A18 thumb_func_start MOD14_021DB49C MOD14_021DB49C: ; 0x021DB49C @@ -7829,11 +7829,11 @@ MOD14_021DB49C: ; 0x021DB49C thumb_func_start MOD14_021DB4BC MOD14_021DB4BC: ; 0x021DB4BC - ldr r3, _021DB4C4 ; =0x02021A21 + ldr r3, _021DB4C4 ; =FUN_02021A20 ldr r0, [r0, #4] bx r3 nop -_021DB4C4: .word 0x02021A21 +_021DB4C4: .word FUN_02021A20 thumb_func_start MOD14_021DB4C8 MOD14_021DB4C8: ; 0x021DB4C8 @@ -9849,11 +9849,11 @@ MOD14_021DC3AC: ; 0x021DC3AC MOD14_021DC3B4: ; 0x021DC3B4 mov r1, #0x69 lsl r1, r1, #2 - ldr r3, _021DC3C0 ; =0x02025085 + ldr r3, _021DC3C0 ; =FUN_02025084 ldr r0, [r0, r1] bx r3 nop -_021DC3C0: .word 0x02025085 +_021DC3C0: .word FUN_02025084 thumb_func_start MOD14_021DC3C4 MOD14_021DC3C4: ; 0x021DC3C4 @@ -13176,10 +13176,10 @@ _021DDD3C: thumb_func_start MOD14_021DDD40 MOD14_021DDD40: ; 0x021DDD40 - ldr r3, _021DDD44 ; =0x0200CA61 + ldr r3, _021DDD44 ; =FUN_0200CA60 bx r3 .align 2, 0 -_021DDD44: .word 0x0200CA61 +_021DDD44: .word FUN_0200CA60 thumb_func_start MOD14_021DDD48 MOD14_021DDD48: ; 0x021DDD48 @@ -17686,12 +17686,12 @@ _021E0024: thumb_func_start MOD14_021E002C MOD14_021E002C: ; 0x021E002C - ldr r3, _021E0034 ; =0x02020131 + ldr r3, _021E0034 ; =FUN_02020130 ldr r0, [r0, #4] mov r1, #1 bx r3 .align 2, 0 -_021E0034: .word 0x02020131 +_021E0034: .word FUN_02020130 thumb_func_start MOD14_021E0038 MOD14_021E0038: ; 0x021E0038 @@ -19244,11 +19244,11 @@ _021E0C64: _021E0C66: ldr r0, [r1] ldrh r1, [r1, #0x2c] - ldr r3, _021E0C70 ; =0x02020249 + ldr r3, _021E0C70 ; =FUN_02020248 add r1, r1, r2 bx r3 .align 2, 0 -_021E0C70: .word 0x02020249 +_021E0C70: .word FUN_02020248 thumb_func_start MOD14_021E0C74 MOD14_021E0C74: ; 0x021E0C74 @@ -27001,12 +27001,12 @@ _021E4762: thumb_func_start MOD14_021E4764 MOD14_021E4764: ; 0x021E4764 - ldr r3, _021E476C ; =0x0201797D + ldr r3, _021E476C ; =FUN_0201797C mov r0, #4 mov r1, #0 bx r3 .align 2, 0 -_021E476C: .word 0x0201797D +_021E476C: .word FUN_0201797C thumb_func_start MOD14_021E4770 MOD14_021E4770: ; 0x021E4770 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 8659bfeb..88e9d55a 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -2402,11 +2402,11 @@ MOD15_021D86E4: ; 0x021D86E4 thumb_func_start MOD15_021D86E8
MOD15_021D86E8: ; 0x021D86E8
- ldr r3, _021D86F0 ; =0x02085411
+ ldr r3, _021D86F0 ; =FUN_02085410
ldr r0, [r0]
bx r3
nop
-_021D86F0: .word 0x02085411
+_021D86F0: .word FUN_02085410
thumb_func_start MOD15_021D86F4
MOD15_021D86F4: ; 0x021D86F4
@@ -2417,11 +2417,11 @@ MOD15_021D86F4: ; 0x021D86F4 thumb_func_start MOD15_021D86FC
MOD15_021D86FC: ; 0x021D86FC
- ldr r3, _021D8704 ; =0x02013921
+ ldr r3, _021D8704 ; =FUN_02013920
add r0, #8
bx r3
nop
-_021D8704: .word 0x02013921
+_021D8704: .word FUN_02013920
thumb_func_start MOD15_021D8708
MOD15_021D8708: ; 0x021D8708
@@ -2440,11 +2440,11 @@ _021D8718: thumb_func_start MOD15_021D8720
MOD15_021D8720: ; 0x021D8720
- ldr r3, _021D8728 ; =0x02013841
+ ldr r3, _021D8728 ; =FUN_02013840
add r0, #8
bx r3
nop
-_021D8728: .word 0x02013841
+_021D8728: .word FUN_02013840
thumb_func_start MOD15_021D872C
MOD15_021D872C: ; 0x021D872C
@@ -2560,11 +2560,11 @@ _021D87DC: thumb_func_start MOD15_021D87E0
MOD15_021D87E0: ; 0x021D87E0
- ldr r3, _021D87E8 ; =0x02085415
+ ldr r3, _021D87E8 ; =FUN_02085414
ldr r0, [r0]
bx r3
nop
-_021D87E8: .word 0x02085415
+_021D87E8: .word FUN_02085414
thumb_func_start MOD15_021D87EC
MOD15_021D87EC: ; 0x021D87EC
@@ -2676,10 +2676,10 @@ _021D88CE: thumb_func_start MOD15_021D88D0
MOD15_021D88D0: ; 0x021D88D0
- ldr r3, _021D88D4 ; =0x0200CA61
+ ldr r3, _021D88D4 ; =FUN_0200CA60
bx r3
.align 2, 0
-_021D88D4: .word 0x0200CA61
+_021D88D4: .word FUN_0200CA60
thumb_func_start MOD15_021D88D8
MOD15_021D88D8: ; 0x021D88D8
@@ -4967,11 +4967,11 @@ _021D9B2C: .word 0x0000FFFE thumb_func_start MOD15_021D9B30
MOD15_021D9B30: ; 0x021D9B30
- ldr r3, _021D9B38 ; =0x02021A21
+ ldr r3, _021D9B38 ; =FUN_02021A20
ldr r0, [r0]
bx r3
nop
-_021D9B38: .word 0x02021A21
+_021D9B38: .word FUN_02021A20
thumb_func_start MOD15_021D9B3C
MOD15_021D9B3C: ; 0x021D9B3C
@@ -5718,37 +5718,37 @@ MOD15_021DA0B8: ; 0x021DA0B8 thumb_func_start MOD15_021DA0F4
MOD15_021DA0F4: ; 0x021DA0F4
- ldr r3, _021DA0FC ; =0x02020131
+ ldr r3, _021DA0FC ; =FUN_02020130
ldr r0, [r0, #0xc]
mov r1, #3
bx r3
.align 2, 0
-_021DA0FC: .word 0x02020131
+_021DA0FC: .word FUN_02020130
thumb_func_start MOD15_021DA100
MOD15_021DA100: ; 0x021DA100
- ldr r3, _021DA108 ; =0x02020131
+ ldr r3, _021DA108 ; =FUN_02020130
ldr r0, [r0, #0xc]
mov r1, #2
bx r3
.align 2, 0
-_021DA108: .word 0x02020131
+_021DA108: .word FUN_02020130
thumb_func_start MOD15_021DA10C
MOD15_021DA10C: ; 0x021DA10C
- ldr r3, _021DA114 ; =0x020200A1
+ ldr r3, _021DA114 ; =FUN_020200A0
ldr r0, [r0, #0xc]
bx r3
nop
-_021DA114: .word 0x020200A1
+_021DA114: .word FUN_020200A0
thumb_func_start MOD15_021DA118
MOD15_021DA118: ; 0x021DA118
- ldr r3, _021DA120 ; =0x02020129
+ ldr r3, _021DA120 ; =FUN_02020128
ldr r0, [r0, #0xc]
bx r3
nop
-_021DA120: .word 0x02020129
+_021DA120: .word FUN_02020128
thumb_func_start MOD15_021DA124
MOD15_021DA124: ; 0x021DA124
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 77cc5176..4c66bac5 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -229,10 +229,10 @@ MOD16_021D7684: ; 0x021D7684 thumb_func_start MOD16_021D76A4 MOD16_021D76A4: ; 0x021D76A4 - ldr r3, _021D76A8 ; =0x0200E309 + ldr r3, _021D76A8 ; =FUN_0200E308 bx r3 .align 2, 0 -_021D76A8: .word 0x0200E309 +_021D76A8: .word FUN_0200E308 thumb_func_end MOD16_021D76A4 thumb_func_start MOD16_021D76AC @@ -2954,11 +2954,11 @@ _021D8B1C: thumb_func_start MOD16_021D8B30 MOD16_021D8B30: ; 0x021D8B30 - ldr r3, _021D8B38 ; =0x02020129 + ldr r3, _021D8B38 ; =FUN_02020128 ldr r0, [r0] bx r3 nop -_021D8B38: .word 0x02020129 +_021D8B38: .word FUN_02020128 thumb_func_end MOD16_021D8B30 thumb_func_start MOD16_021D8B3C @@ -3527,11 +3527,11 @@ MOD16_021D8F60: ; 0x021D8F60 thumb_func_start MOD16_021D8F90 MOD16_021D8F90: ; 0x021D8F90 - ldr r3, _021D8F98 ; =0x02019179 + ldr r3, _021D8F98 ; =FUN_02019178 add r0, r0, #4 bx r3 nop -_021D8F98: .word 0x02019179 +_021D8F98: .word FUN_02019178 thumb_func_end MOD16_021D8F90 thumb_func_start MOD16_021D8F9C @@ -4322,11 +4322,11 @@ _021D95E0: .word MOD16_021D95F4 MOD16_021D95E4: ; 0x021D95E4 mov r1, #0x9d lsl r1, r1, #2 - ldr r3, _021D95F0 ; =0x0200CAB5 + ldr r3, _021D95F0 ; =FUN_0200CAB4 ldr r0, [r0, r1] bx r3 nop -_021D95F0: .word 0x0200CAB5 +_021D95F0: .word FUN_0200CAB4 thumb_func_end MOD16_021D95E4 thumb_func_start MOD16_021D95F4 @@ -4712,13 +4712,13 @@ _021D98D8: .word 0x00001748 thumb_func_start MOD16_021D98DC MOD16_021D98DC: ; 0x021D98DC - ldr r3, _021D98E8 ; =0x02024675 + ldr r3, _021D98E8 ; =FUN_02024674 lsl r1, r1, #0x10 ldr r0, [r0] lsr r1, r1, #0x10 bx r3 nop -_021D98E8: .word 0x02024675 +_021D98E8: .word FUN_02024674 thumb_func_end MOD16_021D98DC thumb_func_start MOD16_021D98EC @@ -4882,84 +4882,84 @@ _021D99F0: thumb_func_start MOD16_021D99F4 MOD16_021D99F4: ; 0x021D99F4 - ldr r3, _021D99FC ; =0x0202471D + ldr r3, _021D99FC ; =FUN_0202471C ldr r0, [r0] bx r3 nop -_021D99FC: .word 0x0202471D +_021D99FC: .word FUN_0202471C thumb_func_end MOD16_021D99F4 thumb_func_start MOD16_021D9A00 MOD16_021D9A00: ; 0x021D9A00 - ldr r3, _021D9A08 ; =0x020247A5 + ldr r3, _021D9A08 ; =FUN_020247A4 ldr r0, [r0] bx r3 nop -_021D9A08: .word 0x020247A5 +_021D9A08: .word FUN_020247A4 thumb_func_end MOD16_021D9A00 thumb_func_start MOD16_021D9A0C MOD16_021D9A0C: ; 0x021D9A0C - ldr r3, _021D9A14 ; =0x02024829 + ldr r3, _021D9A14 ; =FUN_02024828 ldr r0, [r0] bx r3 nop -_021D9A14: .word 0x02024829 +_021D9A14: .word FUN_02024828 thumb_func_end MOD16_021D9A0C thumb_func_start MOD16_021D9A18 MOD16_021D9A18: ; 0x021D9A18 - ldr r3, _021D9A20 ; =0x0202489D + ldr r3, _021D9A20 ; =FUN_0202489C ldr r0, [r0] bx r3 nop -_021D9A20: .word 0x0202489D +_021D9A20: .word FUN_0202489C thumb_func_end MOD16_021D9A18 thumb_func_start MOD16_021D9A24 MOD16_021D9A24: ; 0x021D9A24 - ldr r3, _021D9A2C ; =0x0202490D + ldr r3, _021D9A2C ; =FUN_0202490C ldr r0, [r0] bx r3 nop -_021D9A2C: .word 0x0202490D +_021D9A2C: .word FUN_0202490C thumb_func_end MOD16_021D9A24 thumb_func_start MOD16_021D9A30 MOD16_021D9A30: ; 0x021D9A30 - ldr r3, _021D9A38 ; =0x02024649 + ldr r3, _021D9A38 ; =FUN_02024648 ldr r0, [r0] mov r1, #0 bx r3 .align 2, 0 -_021D9A38: .word 0x02024649 +_021D9A38: .word FUN_02024648 thumb_func_end MOD16_021D9A30 thumb_func_start MOD16_021D9A3C MOD16_021D9A3C: ; 0x021D9A3C - ldr r3, _021D9A44 ; =0x02024931 + ldr r3, _021D9A44 ; =FUN_02024930 ldr r0, [r0] bx r3 nop -_021D9A44: .word 0x02024931 +_021D9A44: .word FUN_02024930 thumb_func_end MOD16_021D9A3C thumb_func_start MOD16_021D9A48 MOD16_021D9A48: ; 0x021D9A48 - ldr r3, _021D9A50 ; =0x02024971 + ldr r3, _021D9A50 ; =FUN_02024970 ldr r0, [r0] bx r3 nop -_021D9A50: .word 0x02024971 +_021D9A50: .word FUN_02024970 thumb_func_end MOD16_021D9A48 thumb_func_start MOD16_021D9A54 MOD16_021D9A54: ; 0x021D9A54 - ldr r3, _021D9A5C ; =0x02024CA5 + ldr r3, _021D9A5C ; =FUN_02024CA4 ldr r0, [r0] bx r3 nop -_021D9A5C: .word 0x02024CA5 +_021D9A5C: .word FUN_02024CA4 thumb_func_end MOD16_021D9A54 thumb_func_start MOD16_021D9A60 @@ -5709,11 +5709,11 @@ _021D9F72: thumb_func_start MOD16_021D9F80 MOD16_021D9F80: ; 0x021D9F80 - ldr r3, _021D9F88 ; =0x02024CC5 + ldr r3, _021D9F88 ; =FUN_02024CC4 ldr r0, [r0] bx r3 nop -_021D9F88: .word 0x02024CC5 +_021D9F88: .word FUN_02024CC4 thumb_func_end MOD16_021D9F80 thumb_func_start MOD16_021D9F8C @@ -8453,11 +8453,11 @@ MOD16_021DB388: ; 0x021DB388 thumb_func_start MOD16_021DB3BC MOD16_021DB3BC: ; 0x021DB3BC - ldr r3, _021DB3C4 ; =0x020191A5 + ldr r3, _021DB3C4 ; =FUN_020191A4 mov r1, #1 bx r3 nop -_021DB3C4: .word 0x020191A5 +_021DB3C4: .word FUN_020191A4 thumb_func_end MOD16_021DB3BC thumb_func_start MOD16_021DB3C8 @@ -8590,10 +8590,10 @@ _021DB49E: thumb_func_start MOD16_021DB4A8 MOD16_021DB4A8: ; 0x021DB4A8 - ldr r3, _021DB4AC ; =0x02016A19 + ldr r3, _021DB4AC ; =FUN_02016A18 bx r3 .align 2, 0 -_021DB4AC: .word 0x02016A19 +_021DB4AC: .word FUN_02016A18 thumb_func_end MOD16_021DB4A8 thumb_func_start MOD16_021DB4B0 @@ -9663,22 +9663,22 @@ _021DBBA8: thumb_func_start MOD16_021DBBAC MOD16_021DBBAC: ; 0x021DBBAC - ldr r3, _021DBBB0 ; =0x02021A21 + ldr r3, _021DBBB0 ; =FUN_02021A20 bx r3 .align 2, 0 -_021DBBB0: .word 0x02021A21 +_021DBBB0: .word FUN_02021A20 thumb_func_end MOD16_021DBBAC thumb_func_start MOD16_021DBBB4 MOD16_021DBBB4: ; 0x021DBBB4 add r1, r0, #1 ldr r0, _021DBBC0 ; =0x021FF568 - ldr r3, _021DBBC4 ; =0x02087A39 + ldr r3, _021DBBC4 ; =FUN_02087A38 ldrb r0, [r0, r1] bx r3 nop _021DBBC0: .word 0x021FF568 -_021DBBC4: .word 0x02087A39 +_021DBBC4: .word FUN_02087A38 thumb_func_end MOD16_021DBBB4 thumb_func_start MOD16_021DBBC8 @@ -28228,22 +28228,22 @@ _021E4534: thumb_func_start MOD16_021E4538 MOD16_021E4538: ; 0x021E4538 - ldr r3, _021E4540 ; =0x02020399 + ldr r3, _021E4540 ; =FUN_02020398 ldr r0, [r0] mov r1, #1 bx r3 .align 2, 0 -_021E4540: .word 0x02020399 +_021E4540: .word FUN_02020398 thumb_func_end MOD16_021E4538 thumb_func_start MOD16_021E4544 MOD16_021E4544: ; 0x021E4544 - ldr r3, _021E454C ; =0x02020399 + ldr r3, _021E454C ; =FUN_02020398 ldr r0, [r0] mov r1, #0 bx r3 .align 2, 0 -_021E454C: .word 0x02020399 +_021E454C: .word FUN_02020398 thumb_func_end MOD16_021E4544 thumb_func_start MOD16_021E4550 @@ -28576,11 +28576,11 @@ _021E47D4: .word 0x0000083F thumb_func_start MOD16_021E47D8 MOD16_021E47D8: ; 0x021E47D8 - ldr r3, _021E47E0 ; =0x0201FFC9 + ldr r3, _021E47E0 ; =FUN_0201FFC8 ldr r0, [r0] bx r3 nop -_021E47E0: .word 0x0201FFC9 +_021E47E0: .word FUN_0201FFC8 thumb_func_end MOD16_021E47D8 thumb_func_start MOD16_021E47E4 @@ -44846,13 +44846,13 @@ _021EC10C: .word 0x0000FFFF thumb_func_start MOD16_021EC110 MOD16_021EC110: ; 0x021EC110 - ldr r3, _021EC11C ; =0x02004829 + ldr r3, _021EC11C ; =FUN_02004828 add r1, r0, #0 mov r0, #8 mov r2, #0 bx r3 nop -_021EC11C: .word 0x02004829 +_021EC11C: .word FUN_02004828 thumb_func_end MOD16_021EC110 thumb_func_start MOD16_021EC120 @@ -45330,22 +45330,22 @@ _021EC456: thumb_func_start MOD16_021EC45C MOD16_021EC45C: ; 0x021EC45C - ldr r3, _021EC464 ; =0x02020399 + ldr r3, _021EC464 ; =FUN_02020398 ldr r0, [r0, #0x10] mov r1, #1 bx r3 .align 2, 0 -_021EC464: .word 0x02020399 +_021EC464: .word FUN_02020398 thumb_func_end MOD16_021EC45C thumb_func_start MOD16_021EC468 MOD16_021EC468: ; 0x021EC468 - ldr r3, _021EC470 ; =0x02020399 + ldr r3, _021EC470 ; =FUN_02020398 ldr r0, [r0, #0x10] mov r1, #0 bx r3 .align 2, 0 -_021EC470: .word 0x02020399 +_021EC470: .word FUN_02020398 thumb_func_end MOD16_021EC468 thumb_func_start MOD16_021EC474 @@ -45767,11 +45767,11 @@ _021EC7D0: .word 0x00001748 thumb_func_start MOD16_021EC7D4 MOD16_021EC7D4: ; 0x021EC7D4 - ldr r3, _021EC7DC ; =0x0201FFC9 + ldr r3, _021EC7DC ; =FUN_0201FFC8 ldr r0, [r0, #0x10] bx r3 nop -_021EC7DC: .word 0x0201FFC9 +_021EC7DC: .word FUN_0201FFC8 thumb_func_end MOD16_021EC7D4 thumb_func_start MOD16_021EC7E0 @@ -46079,13 +46079,13 @@ MOD16_021ECA48: ; 0x021ECA48 thumb_func_start MOD16_021ECA64 MOD16_021ECA64: ; 0x021ECA64 - ldr r3, _021ECA70 ; =0x02007559 + ldr r3, _021ECA70 ; =FUN_02007558 add r2, r1, #0 mov r1, #1 add r2, #0x58 bx r3 nop -_021ECA70: .word 0x02007559 +_021ECA70: .word FUN_02007558 thumb_func_end MOD16_021ECA64 thumb_func_start MOD16_021ECA74 @@ -49068,11 +49068,11 @@ MOD16_021EE110: ; 0x021EE110 thumb_func_start MOD16_021EE14C MOD16_021EE14C: ; 0x021EE14C - ldr r3, _021EE154 ; =0x02013EA9 + ldr r3, _021EE154 ; =FUN_02013EA8 ldr r0, [r0, #0xc] bx r3 nop -_021EE154: .word 0x02013EA9 +_021EE154: .word FUN_02013EA8 thumb_func_end MOD16_021EE14C thumb_func_start MOD16_021EE158 @@ -50660,11 +50660,11 @@ _021EECF4: .word 0x0000083F thumb_func_start MOD16_021EECF8 MOD16_021EECF8: ; 0x021EECF8 - ldr r3, _021EED00 ; =0x0201FFC9 + ldr r3, _021EED00 ; =FUN_0201FFC8 ldr r0, [r0] bx r3 nop -_021EED00: .word 0x0201FFC9 +_021EED00: .word FUN_0201FFC8 thumb_func_end MOD16_021EECF8 thumb_func_start MOD16_021EED04 @@ -51798,11 +51798,11 @@ _021EF5DA: thumb_func_start MOD16_021EF5E0 MOD16_021EF5E0: ; 0x021EF5E0 - ldr r3, _021EF5E8 ; =0x0201FFC9 + ldr r3, _021EF5E8 ; =FUN_0201FFC8 ldr r0, [r0] bx r3 nop -_021EF5E8: .word 0x0201FFC9 +_021EF5E8: .word FUN_0201FFC8 thumb_func_end MOD16_021EF5E0 thumb_func_start MOD16_021EF5EC @@ -51848,11 +51848,11 @@ _021EF62E: thumb_func_start MOD16_021EF63C MOD16_021EF63C: ; 0x021EF63C - ldr r3, _021EF644 ; =0x0201FFC9 + ldr r3, _021EF644 ; =FUN_0201FFC8 ldr r0, [r0] bx r3 nop -_021EF644: .word 0x0201FFC9 +_021EF644: .word FUN_0201FFC8 thumb_func_end MOD16_021EF63C thumb_func_start MOD16_021EF648 @@ -52482,10 +52482,10 @@ _021EFB14: .word 0x00200010 thumb_func_start MOD16_021EFB18 MOD16_021EFB18: ; 0x021EFB18 - ldr r3, _021EFB1C ; =0x0201D12D + ldr r3, _021EFB1C ; =FUN_0201D12C bx r3 .align 2, 0 -_021EFB1C: .word 0x0201D12D +_021EFB1C: .word FUN_0201D12C thumb_func_end MOD16_021EFB18 thumb_func_start MOD16_021EFB20 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index b839403b..68f06a9b 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -159,11 +159,11 @@ MOD17_021D75DC: ; 0x021D75DC thumb_func_start MOD17_021D75F4 MOD17_021D75F4: ; 0x021D75F4 - ldr r3, _021D75FC ; =0x02013EC5 + ldr r3, _021D75FC ; =FUN_02013EC4 ldr r0, [r0, #4] bx r3 nop -_021D75FC: .word 0x02013EC5 +_021D75FC: .word FUN_02013EC4 thumb_func_end MOD17_021D75F4 thumb_func_start MOD17_021D7600 @@ -222,29 +222,29 @@ MOD17_021D7630: ; 0x021D7630 thumb_func_start MOD17_021D7660 MOD17_021D7660: ; 0x021D7660 - ldr r3, _021D7668 ; =0x02013EB1 + ldr r3, _021D7668 ; =FUN_02013EB0 ldr r0, [r0, #4] bx r3 nop -_021D7668: .word 0x02013EB1 +_021D7668: .word FUN_02013EB0 thumb_func_end MOD17_021D7660 thumb_func_start MOD17_021D766C MOD17_021D766C: ; 0x021D766C - ldr r3, _021D7674 ; =0x02013EFD + ldr r3, _021D7674 ; =FUN_02013EFC ldr r0, [r0, #4] bx r3 nop -_021D7674: .word 0x02013EFD +_021D7674: .word FUN_02013EFC thumb_func_end MOD17_021D766C thumb_func_start MOD17_021D7678 MOD17_021D7678: ; 0x021D7678 - ldr r3, _021D7680 ; =0x02013F01 + ldr r3, _021D7680 ; =FUN_02013F00 ldr r0, [r0, #4] bx r3 nop -_021D7680: .word 0x02013F01 +_021D7680: .word FUN_02013F00 thumb_func_end MOD17_021D7678 thumb_func_start MOD17_021D7684 @@ -1016,21 +1016,21 @@ MOD17_021D7BE4: ; 0x021D7BE4 thumb_func_start MOD17_021D7C10 MOD17_021D7C10: ; 0x021D7C10 - ldr r3, _021D7C18 ; =0x020178A1 + ldr r3, _021D7C18 ; =FUN_020178A0 ldr r0, [r0, #0x38] mov r1, #2 bx r3 .align 2, 0 -_021D7C18: .word 0x020178A1 +_021D7C18: .word FUN_020178A0 thumb_func_end MOD17_021D7C10 thumb_func_start MOD17_021D7C1C MOD17_021D7C1C: ; 0x021D7C1C - ldr r3, _021D7C24 ; =0x020081C5 + ldr r3, _021D7C24 ; =FUN_020081C4 ldr r0, [r0, #0x20] bx r3 nop -_021D7C24: .word 0x020081C5 +_021D7C24: .word FUN_020081C4 thumb_func_end MOD17_021D7C1C thumb_func_start MOD17_021D7C28 @@ -1330,11 +1330,11 @@ MOD17_021D7E58: ; 0x021D7E58 thumb_func_start MOD17_021D7E68 MOD17_021D7E68: ; 0x021D7E68 - ldr r3, _021D7E70 ; =0x02013D5D + ldr r3, _021D7E70 ; =FUN_02013D5C ldr r0, [r0] bx r3 nop -_021D7E70: .word 0x02013D5D +_021D7E70: .word FUN_02013D5C thumb_func_end MOD17_021D7E68 thumb_func_start MOD17_021D7E74 @@ -1730,11 +1730,11 @@ _021D8178: thumb_func_start MOD17_021D8194 MOD17_021D8194: ; 0x021D8194 - ldr r3, _021D819C ; =0x0201FDED + ldr r3, _021D819C ; =FUN_0201FDEC ldr r0, [r0, #0x3c] bx r3 nop -_021D819C: .word 0x0201FDED +_021D819C: .word FUN_0201FDEC thumb_func_end MOD17_021D8194 thumb_func_start MOD17_021D81A0 @@ -1956,11 +1956,11 @@ _021D8348: .word 0xFFFF0000 thumb_func_start MOD17_021D834C MOD17_021D834C: ; 0x021D834C - ldr r3, _021D8354 ; =0x020072E9 + ldr r3, _021D8354 ; =FUN_020072E8 ldr r0, [r0, #0x20] bx r3 nop -_021D8354: .word 0x020072E9 +_021D8354: .word FUN_020072E8 thumb_func_end MOD17_021D834C thumb_func_start MOD17_021D8358 @@ -8952,23 +8952,23 @@ _021DB7CE: thumb_func_start MOD17_021DB7D8 MOD17_021DB7D8: ; 0x021DB7D8 - ldr r3, _021DB7E4 ; =0x02007559 + ldr r3, _021DB7E4 ; =FUN_02007558 add r2, r1, #0 ldr r0, [r0] mov r1, #2 bx r3 nop -_021DB7E4: .word 0x02007559 +_021DB7E4: .word FUN_02007558 thumb_func_end MOD17_021DB7D8 thumb_func_start MOD17_021DB7E8 MOD17_021DB7E8: ; 0x021DB7E8 - ldr r3, _021DB7F0 ; =0x0200782D + ldr r3, _021DB7F0 ; =FUN_0200782C ldr r0, [r0] mov r1, #2 bx r3 .align 2, 0 -_021DB7F0: .word 0x0200782D +_021DB7F0: .word FUN_0200782C thumb_func_end MOD17_021DB7E8 thumb_func_start MOD17_021DB7F4 @@ -9011,20 +9011,20 @@ MOD17_021DB7F4: ; 0x021DB7F4 thumb_func_start MOD17_021DB840 MOD17_021DB840: ; 0x021DB840 - ldr r3, _021DB848 ; =0x02020A41 + ldr r3, _021DB848 ; =FUN_02020A40 add r0, r0, #4 bx r3 nop -_021DB848: .word 0x02020A41 +_021DB848: .word FUN_02020A40 thumb_func_end MOD17_021DB840 thumb_func_start MOD17_021DB84C MOD17_021DB84C: ; 0x021DB84C - ldr r3, _021DB854 ; =0x02020AE9 + ldr r3, _021DB854 ; =FUN_02020AE8 add r0, r0, #4 bx r3 nop -_021DB854: .word 0x02020AE9 +_021DB854: .word FUN_02020AE8 thumb_func_end MOD17_021DB84C thumb_func_start MOD17_021DB858 @@ -10513,32 +10513,32 @@ MOD17_021DC2DC: ; 0x021DC2DC thumb_func_start MOD17_021DC2E0 MOD17_021DC2E0: ; 0x021DC2E0 - ldr r3, _021DC2E8 ; =0x02020209 + ldr r3, _021DC2E8 ; =FUN_02020208 ldr r0, [r0] mov r1, #2 bx r3 .align 2, 0 -_021DC2E8: .word 0x02020209 +_021DC2E8: .word FUN_02020208 thumb_func_end MOD17_021DC2E0 thumb_func_start MOD17_021DC2EC MOD17_021DC2EC: ; 0x021DC2EC - ldr r3, _021DC2F4 ; =0x02020209 + ldr r3, _021DC2F4 ; =FUN_02020208 ldr r0, [r0] mov r1, #0 bx r3 .align 2, 0 -_021DC2F4: .word 0x02020209 +_021DC2F4: .word FUN_02020208 thumb_func_end MOD17_021DC2EC thumb_func_start MOD17_021DC2F8 MOD17_021DC2F8: ; 0x021DC2F8 - ldr r3, _021DC300 ; =0x02020209 + ldr r3, _021DC300 ; =FUN_02020208 ldr r0, [r0] mov r1, #1 bx r3 .align 2, 0 -_021DC300: .word 0x02020209 +_021DC300: .word FUN_02020208 thumb_func_end MOD17_021DC2F8 thumb_func_start MOD17_021DC304 @@ -11304,11 +11304,11 @@ _021DC8F4: .word 0x00010203 thumb_func_start MOD17_021DC8F8 MOD17_021DC8F8: ; 0x021DC8F8 - ldr r3, _021DC900 ; =0x020191A5 + ldr r3, _021DC900 ; =FUN_020191A4 mov r1, #1 bx r3 nop -_021DC900: .word 0x020191A5 +_021DC900: .word FUN_020191A4 thumb_func_end MOD17_021DC8F8 thumb_func_start MOD17_021DC904 @@ -11844,11 +11844,11 @@ _021DCCDC: .word MOD17_021DBD4C thumb_func_start MOD17_021DCCE0 MOD17_021DCCE0: ; 0x021DCCE0 - ldr r3, _021DCCE8 ; =0x020191A5 + ldr r3, _021DCCE8 ; =FUN_020191A4 mov r1, #1 bx r3 nop -_021DCCE8: .word 0x020191A5 +_021DCCE8: .word FUN_020191A4 thumb_func_end MOD17_021DCCE0 thumb_func_start MOD17_021DCCEC diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index f6e4bcea..3c1d52e4 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -6785,10 +6785,10 @@ _0223CB58: .word 0x00000808 thumb_func_start MOD18_0223CB5C MOD18_0223CB5C: ; 0x0223CB5C - ldr r3, _0223CB60 ; =0x0204F7FD + ldr r3, _0223CB60 ; =FUN_0204F7FC bx r3 .align 2, 0 -_0223CB60: .word 0x0204F7FD +_0223CB60: .word FUN_0204F7FC thumb_func_end MOD18_0223CB5C thumb_func_start MOD18_0223CB64 @@ -11161,10 +11161,10 @@ _0223ECD8: .word 0x022513A0 thumb_func_start MOD18_0223ECDC MOD18_0223ECDC: ; 0x0223ECDC - ldr r3, _0223ECE0 ; =0x0204F7FD + ldr r3, _0223ECE0 ; =FUN_0204F7FC bx r3 .align 2, 0 -_0223ECE0: .word 0x0204F7FD +_0223ECE0: .word FUN_0204F7FC thumb_func_end MOD18_0223ECDC thumb_func_start MOD18_0223ECE4 @@ -13519,20 +13519,20 @@ MOD18_0223FE98: ; 0x0223FE98 thumb_func_start MOD18_0223FEAC MOD18_0223FEAC: ; 0x0223FEAC - ldr r3, _0223FEB4 ; =0x0204E759 + ldr r3, _0223FEB4 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_0223FEB4: .word 0x0204E759 +_0223FEB4: .word FUN_0204E758 thumb_func_end MOD18_0223FEAC thumb_func_start MOD18_0223FEB8 MOD18_0223FEB8: ; 0x0223FEB8 - ldr r3, _0223FEC0 ; =0x0204E759 + ldr r3, _0223FEC0 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_0223FEC0: .word 0x0204E759 +_0223FEC0: .word FUN_0204E758 thumb_func_end MOD18_0223FEB8 thumb_func_start MOD18_0223FEC4 @@ -13549,82 +13549,82 @@ MOD18_0223FEC4: ; 0x0223FEC4 thumb_func_start MOD18_0223FED8 MOD18_0223FED8: ; 0x0223FED8 - ldr r3, _0223FEE0 ; =0x0204E179 + ldr r3, _0223FEE0 ; =FUN_0204E178 mov r1, #0 add r2, r1, #0 bx r3 .align 2, 0 -_0223FEE0: .word 0x0204E179 +_0223FEE0: .word FUN_0204E178 thumb_func_end MOD18_0223FED8 thumb_func_start MOD18_0223FEE4 MOD18_0223FEE4: ; 0x0223FEE4 - ldr r3, _0223FEEC ; =0x0204E179 + ldr r3, _0223FEEC ; =FUN_0204E178 mov r1, #1 mov r2, #0 bx r3 .align 2, 0 -_0223FEEC: .word 0x0204E179 +_0223FEEC: .word FUN_0204E178 thumb_func_end MOD18_0223FEE4 thumb_func_start MOD18_0223FEF0 MOD18_0223FEF0: ; 0x0223FEF0 - ldr r3, _0223FEF8 ; =0x0204E179 + ldr r3, _0223FEF8 ; =FUN_0204E178 mov r1, #2 mov r2, #0 bx r3 .align 2, 0 -_0223FEF8: .word 0x0204E179 +_0223FEF8: .word FUN_0204E178 thumb_func_end MOD18_0223FEF0 thumb_func_start MOD18_0223FEFC MOD18_0223FEFC: ; 0x0223FEFC - ldr r3, _0223FF04 ; =0x0204E179 + ldr r3, _0223FF04 ; =FUN_0204E178 mov r1, #3 mov r2, #0 bx r3 .align 2, 0 -_0223FF04: .word 0x0204E179 +_0223FF04: .word FUN_0204E178 thumb_func_end MOD18_0223FEFC thumb_func_start MOD18_0223FF08 MOD18_0223FF08: ; 0x0223FF08 - ldr r3, _0223FF10 ; =0x0204E179 + ldr r3, _0223FF10 ; =FUN_0204E178 mov r1, #0 mov r2, #1 bx r3 .align 2, 0 -_0223FF10: .word 0x0204E179 +_0223FF10: .word FUN_0204E178 thumb_func_end MOD18_0223FF08 thumb_func_start MOD18_0223FF14 MOD18_0223FF14: ; 0x0223FF14 - ldr r3, _0223FF1C ; =0x0204E179 + ldr r3, _0223FF1C ; =FUN_0204E178 mov r1, #1 add r2, r1, #0 bx r3 .align 2, 0 -_0223FF1C: .word 0x0204E179 +_0223FF1C: .word FUN_0204E178 thumb_func_end MOD18_0223FF14 thumb_func_start MOD18_0223FF20 MOD18_0223FF20: ; 0x0223FF20 - ldr r3, _0223FF28 ; =0x0204E179 + ldr r3, _0223FF28 ; =FUN_0204E178 mov r1, #2 mov r2, #1 bx r3 .align 2, 0 -_0223FF28: .word 0x0204E179 +_0223FF28: .word FUN_0204E178 thumb_func_end MOD18_0223FF20 thumb_func_start MOD18_0223FF2C MOD18_0223FF2C: ; 0x0223FF2C - ldr r3, _0223FF34 ; =0x0204E179 + ldr r3, _0223FF34 ; =FUN_0204E178 mov r1, #3 mov r2, #1 bx r3 .align 2, 0 -_0223FF34: .word 0x0204E179 +_0223FF34: .word FUN_0204E178 thumb_func_end MOD18_0223FF2C thumb_func_start MOD18_0223FF38 @@ -18630,11 +18630,11 @@ _022425C4: .word 0x022513A0 thumb_func_start MOD18_022425C8 MOD18_022425C8: ; 0x022425C8 - ldr r3, _022425D0 ; =0x0204E759 + ldr r3, _022425D0 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_022425D0: .word 0x0204E759 +_022425D0: .word FUN_0204E758 thumb_func_end MOD18_022425C8 thumb_func_start MOD18_022425D4 @@ -20189,11 +20189,11 @@ _0224321C: .word 0x022513A0 thumb_func_start MOD18_02243220 MOD18_02243220: ; 0x02243220 - ldr r3, _02243228 ; =0x0204E759 + ldr r3, _02243228 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_02243228: .word 0x0204E759 +_02243228: .word FUN_0204E758 thumb_func_end MOD18_02243220 thumb_func_start MOD18_0224322C @@ -20943,11 +20943,11 @@ _02243808: .word 0x022513A0 thumb_func_start MOD18_0224380C MOD18_0224380C: ; 0x0224380C - ldr r3, _02243814 ; =0x0204E759 + ldr r3, _02243814 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_02243814: .word 0x0204E759 +_02243814: .word FUN_0204E758 thumb_func_end MOD18_0224380C thumb_func_start MOD18_02243818 @@ -21213,11 +21213,11 @@ _02243A14: .word 0x022513A0 thumb_func_start MOD18_02243A18 MOD18_02243A18: ; 0x02243A18 - ldr r3, _02243A20 ; =0x0204E759 + ldr r3, _02243A20 ; =FUN_0204E758 mov r1, #2 bx r3 nop -_02243A20: .word 0x0204E759 +_02243A20: .word FUN_0204E758 thumb_func_end MOD18_02243A18 thumb_func_start MOD18_02243A24 @@ -24592,10 +24592,10 @@ _022453DC: .word 0x00001284 thumb_func_start MOD18_022453E0 MOD18_022453E0: ; 0x022453E0 - ldr r3, _022453E4 ; =0x0204F7FD + ldr r3, _022453E4 ; =FUN_0204F7FC bx r3 .align 2, 0 -_022453E4: .word 0x0204F7FD +_022453E4: .word FUN_0204F7FC thumb_func_end MOD18_022453E0 thumb_func_start MOD18_022453E8 @@ -26007,11 +26007,11 @@ _02245F18: .word 0x000013E6 thumb_func_start MOD18_02245F1C MOD18_02245F1C: ; 0x02245F1C - ldr r3, _02245F24 ; =0x020311DD + ldr r3, _02245F24 ; =FUN_020311DC mov r0, #0x38 bx r3 nop -_02245F24: .word 0x020311DD +_02245F24: .word FUN_020311DC thumb_func_end MOD18_02245F1C thumb_func_start MOD18_02245F28 @@ -31952,22 +31952,22 @@ _02248E68: .word 0x00002710 thumb_func_start MOD18_02248E6C MOD18_02248E6C: ; 0x02248E6C - ldr r3, _02248E74 ; =0x02030C4D + ldr r3, _02248E74 ; =FUN_02030C4C mov r0, #0x4b add r1, r2, #0 bx r3 .align 2, 0 -_02248E74: .word 0x02030C4D +_02248E74: .word FUN_02030C4C thumb_func_end MOD18_02248E6C thumb_func_start MOD18_02248E78 MOD18_02248E78: ; 0x02248E78 - ldr r3, _02248E80 ; =0x02030C4D + ldr r3, _02248E80 ; =FUN_02030C4C mov r0, #0x4c add r1, r2, #0 bx r3 .align 2, 0 -_02248E80: .word 0x02030C4D +_02248E80: .word FUN_02030C4C thumb_func_end MOD18_02248E78 thumb_func_start MOD18_02248E84 @@ -32040,12 +32040,12 @@ MOD18_02248EF0: ; 0x02248EF0 thumb_func_start MOD18_02248EF4 MOD18_02248EF4: ; 0x02248EF4 - ldr r3, _02248EFC ; =0x02030C4D + ldr r3, _02248EFC ; =FUN_02030C4C mov r0, #0x4e add r1, r2, #0 bx r3 .align 2, 0 -_02248EFC: .word 0x02030C4D +_02248EFC: .word FUN_02030C4C thumb_func_end MOD18_02248EF4 thumb_func_start MOD18_02248F00 @@ -32114,12 +32114,12 @@ MOD18_02248F74: ; 0x02248F74 thumb_func_start MOD18_02248F78 MOD18_02248F78: ; 0x02248F78 - ldr r3, _02248F80 ; =0x02030C4D + ldr r3, _02248F80 ; =FUN_02030C4C mov r0, #0x50 add r1, r2, #0 bx r3 .align 2, 0 -_02248F80: .word 0x02030C4D +_02248F80: .word FUN_02030C4C thumb_func_end MOD18_02248F78 thumb_func_start MOD18_02248F84 @@ -32612,12 +32612,12 @@ _02249324: .word 0x022513F8 thumb_func_start MOD18_02249328 MOD18_02249328: ; 0x02249328 ldr r0, _02249330 ; =0x022513F8 - ldr r3, _02249334 ; =0x02016A19 + ldr r3, _02249334 ; =FUN_02016A18 ldr r0, [r0] bx r3 .align 2, 0 _02249330: .word 0x022513F8 -_02249334: .word 0x02016A19 +_02249334: .word FUN_02016A18 thumb_func_end MOD18_02249328 thumb_func_start MOD18_02249338 @@ -32823,26 +32823,26 @@ _0224949C: .word 0x022513F8 MOD18_022494A0: ; 0x022494A0 add r1, r0, #0 ldr r0, _022494AC ; =0x022513F8 - ldr r3, _022494B0 ; =0x02026299 + ldr r3, _022494B0 ; =FUN_02026298 ldr r0, [r0] ldr r0, [r0] bx r3 .align 2, 0 _022494AC: .word 0x022513F8 -_022494B0: .word 0x02026299 +_022494B0: .word FUN_02026298 thumb_func_end MOD18_022494A0 thumb_func_start MOD18_022494B4 MOD18_022494B4: ; 0x022494B4 add r1, r0, #0 ldr r0, _022494C0 ; =0x022513F8 - ldr r3, _022494C4 ; =0x02025FD9 + ldr r3, _022494C4 ; =FUN_02025FD8 ldr r0, [r0] ldr r0, [r0] bx r3 .align 2, 0 _022494C0: .word 0x022513F8 -_022494C4: .word 0x02025FD9 +_022494C4: .word FUN_02025FD8 thumb_func_end MOD18_022494B4 thumb_func_start MOD18_022494C8 @@ -34102,7 +34102,7 @@ MOD18_02249EF4: ; 0x02249EF4 str r1, [r0, r2] ldr r1, _02249F24 ; =MOD18_02249EBC str r1, [r0, #0x60] - ldr r1, _02249F28 ; =0x020260ED + ldr r1, _02249F28 ; =FUN_020260EC bx r3 nop _02249F14: .word MOD18_022493C8 @@ -34110,7 +34110,7 @@ _02249F18: .word MOD18_022493F4 _02249F1C: .word MOD18_0224940C _02249F20: .word MOD18_02249F8C _02249F24: .word MOD18_02249EBC -_02249F28: .word 0x020260ED +_02249F28: .word FUN_020260EC thumb_func_end MOD18_02249EF4 thumb_func_start MOD18_02249F2C @@ -34145,7 +34145,7 @@ MOD18_02249F2C: ; 0x02249F2C ldr r0, [r4, r0] add r1, #0x1c strh r0, [r4, r1] - ldr r1, _02249F88 ; =0x020260ED + ldr r1, _02249F88 ; =FUN_020260EC add r0, r4, #0 bl MOD18_02249F8C pop {r4, pc} @@ -34154,7 +34154,7 @@ _02249F78: .word MOD18_022493C8 _02249F7C: .word MOD18_022493F4 _02249F80: .word MOD18_0224940C _02249F84: .word MOD18_02249EBC -_02249F88: .word 0x020260ED +_02249F88: .word FUN_020260EC thumb_func_end MOD18_02249F2C thumb_func_start MOD18_02249F8C @@ -35487,7 +35487,7 @@ MOD18_0224AA4C: ; 0x0224AA4C ldr r0, [r4, r0] add r1, #0x1c strh r0, [r4, r1] - ldr r1, _0224AAA0 ; =0x02025FFD + ldr r1, _0224AAA0 ; =FUN_02025FFC add r0, r4, #0 bl MOD18_0224AB08 pop {r4, pc} @@ -35495,7 +35495,7 @@ MOD18_0224AA4C: ; 0x0224AA4C _0224AA94: .word MOD18_02249378 _0224AA98: .word MOD18_0224938C _0224AA9C: .word MOD18_0224A9B4 -_0224AAA0: .word 0x02025FFD +_0224AAA0: .word FUN_02025FFC thumb_func_end MOD18_0224AA4C thumb_func_start MOD18_0224AAA4 @@ -35512,14 +35512,14 @@ MOD18_0224AAA4: ; 0x0224AAA4 str r1, [r0, #0x60] mov r1, #0 str r1, [r0, #0x64] - ldr r1, _0224AAD0 ; =0x02025FFD + ldr r1, _0224AAD0 ; =FUN_02025FFC bx r3 .align 2, 0 _0224AAC0: .word MOD18_02249378 _0224AAC4: .word MOD18_0224938C _0224AAC8: .word MOD18_0224A9B4 _0224AACC: .word MOD18_0224AB08 -_0224AAD0: .word 0x02025FFD +_0224AAD0: .word FUN_02025FFC thumb_func_end MOD18_0224AAA4 thumb_func_start MOD18_0224AAD4 @@ -35536,7 +35536,7 @@ MOD18_0224AAD4: ; 0x0224AAD4 str r1, [r0, #0x60] ldr r1, _0224AB00 ; =MOD18_0224A9EC str r1, [r0, #0x64] - ldr r1, _0224AB04 ; =0x02025E21 + ldr r1, _0224AB04 ; =FUN_02025E20 bx r3 .align 2, 0 _0224AAF0: .word MOD18_0224934C @@ -35544,7 +35544,7 @@ _0224AAF4: .word MOD18_02249360 _0224AAF8: .word MOD18_0224A9B4 _0224AAFC: .word MOD18_0224AB08 _0224AB00: .word MOD18_0224A9EC -_0224AB04: .word 0x02025E21 +_0224AB04: .word FUN_02025E20 thumb_func_end MOD18_0224AAD4 thumb_func_start MOD18_0224AB08 @@ -36307,11 +36307,11 @@ _0224B118: thumb_func_start MOD18_0224B11C MOD18_0224B11C: ; 0x0224B11C - ldr r3, _0224B124 ; =0x0204F775 + ldr r3, _0224B124 ; =FUN_0204F774 mov r0, #0x40 bx r3 nop -_0224B124: .word 0x0204F775 +_0224B124: .word FUN_0204F774 thumb_func_end MOD18_0224B11C thumb_func_start MOD18_0224B128 @@ -40932,11 +40932,11 @@ MOD18_0224D734: ; 0x0224D734 add r3, r1, #0 add r1, r2, #0 add r2, r3, #0 - ldr r3, _0224D740 ; =0x02030BC5 + ldr r3, _0224D740 ; =FUN_02030BC4 mov r0, #0x52 bx r3 .align 2, 0 -_0224D740: .word 0x02030BC5 +_0224D740: .word FUN_02030BC4 thumb_func_end MOD18_0224D734 thumb_func_start MOD18_0224D744 @@ -40990,10 +40990,10 @@ _0224D790: .word 0x022513FC thumb_func_start MOD18_0224D794 MOD18_0224D794: ; 0x0224D794 - ldr r3, _0224D798 ; =0x0204F7FD + ldr r3, _0224D798 ; =FUN_0204F7FC bx r3 .align 2, 0 -_0224D798: .word 0x0204F7FD +_0224D798: .word FUN_0204F7FC thumb_func_end MOD18_0224D794 thumb_func_start MOD18_0224D79C @@ -42024,11 +42024,11 @@ MOD18_0224DF40: ; 0x0224DF40 thumb_func_start MOD18_0224DF54 MOD18_0224DF54: ; 0x0224DF54 - ldr r3, _0224DF5C ; =0x0200B7A9 + ldr r3, _0224DF5C ; =FUN_0200B7A8 ldr r0, [r0, #0x28] bx r3 nop -_0224DF5C: .word 0x0200B7A9 +_0224DF5C: .word FUN_0200B7A8 thumb_func_end MOD18_0224DF54 thumb_func_start MOD18_0224DF60 @@ -42156,12 +42156,12 @@ _0224E018: .word 0x0225074A thumb_func_start MOD18_0224E01C MOD18_0224E01C: ; 0x0224E01C - ldr r3, _0224E024 ; =0x02016999 + ldr r3, _0224E024 ; =FUN_02016998 mov r0, #4 mov r1, #0x44 bx r3 .align 2, 0 -_0224E024: .word 0x02016999 +_0224E024: .word FUN_02016998 thumb_func_end MOD18_0224E01C thumb_func_start MOD18_0224E028 @@ -42194,10 +42194,10 @@ _0224E058: .word 0x000003D9 thumb_func_start MOD18_0224E05C MOD18_0224E05C: ; 0x0224E05C - ldr r3, _0224E060 ; =0x02016A19 + ldr r3, _0224E060 ; =FUN_02016A18 bx r3 .align 2, 0 -_0224E060: .word 0x02016A19 +_0224E060: .word FUN_02016A18 thumb_func_end MOD18_0224E05C thumb_func_start MOD18_0224E064 @@ -42508,12 +42508,12 @@ _0224E2CC: thumb_func_start MOD18_0224E2D8 MOD18_0224E2D8: ; 0x0224E2D8 - ldr r3, _0224E2E0 ; =0x02016999 + ldr r3, _0224E2E0 ; =FUN_02016998 mov r0, #4 mov r1, #0x4c bx r3 .align 2, 0 -_0224E2E0: .word 0x02016999 +_0224E2E0: .word FUN_02016998 thumb_func_end MOD18_0224E2D8 thumb_func_start MOD18_0224E2E4 @@ -42555,10 +42555,10 @@ MOD18_0224E314: ; 0x0224E314 thumb_func_start MOD18_0224E320 MOD18_0224E320: ; 0x0224E320 - ldr r3, _0224E324 ; =0x02016A19 + ldr r3, _0224E324 ; =FUN_02016A18 bx r3 .align 2, 0 -_0224E324: .word 0x02016A19 +_0224E324: .word FUN_02016A18 thumb_func_end MOD18_0224E320 thumb_func_start MOD18_0224E328 @@ -42930,7 +42930,7 @@ _0224E5CE: ldr r0, _0224E6A0 ; =MOD18_0224E3F0 str r7, [sp, #0x4c] str r0, [sp, #0x34] - ldr r0, _0224E6A4 ; =0x02025E21 + ldr r0, _0224E6A4 ; =FUN_02025E20 str r0, [sp] str r7, [sp, #4] mov r0, #1 @@ -42978,7 +42978,7 @@ _0224E694: .word 0x00000115 _0224E698: .word 0x022507D0 _0224E69C: .word MOD18_0224E2B4 _0224E6A0: .word MOD18_0224E3F0 -_0224E6A4: .word 0x02025E21 +_0224E6A4: .word FUN_02025E20 thumb_func_end MOD18_0224E430 thumb_func_start MOD18_0224E6A8 @@ -43142,13 +43142,13 @@ _0224E776: thumb_func_start MOD18_0224E7E4 MOD18_0224E7E4: ; 0x0224E7E4 add r2, r0, #0 - ldr r3, _0224E7F0 ; =0x021E7C81 + ldr r3, _0224E7F0 ; =MOD05_021E7C80 add r2, #0xa0 add r0, r1, #0 ldr r1, [r2] bx r3 .align 2, 0 -_0224E7F0: .word 0x021E7C81 +_0224E7F0: .word MOD05_021E7C80 thumb_func_end MOD18_0224E7E4 thumb_func_start MOD18_0224E7F4 @@ -45659,11 +45659,11 @@ _0224FBC4: .word 0x02251350 thumb_func_start MOD18_0224FBC8 MOD18_0224FBC8: ; 0x0224FBC8 - ldr r3, _0224FBD0 ; =0x02016A19 + ldr r3, _0224FBD0 ; =FUN_02016A18 ldr r0, [r0, #0x54] bx r3 nop -_0224FBD0: .word 0x02016A19 +_0224FBD0: .word FUN_02016A18 thumb_func_end MOD18_0224FBC8 thumb_func_start MOD18_0224FBD4 diff --git a/arm9/modules/21/asm/module_21.s b/arm9/modules/21/asm/module_21.s index 0c30eb9a..45ec356b 100644 --- a/arm9/modules/21/asm/module_21.s +++ b/arm9/modules/21/asm/module_21.s @@ -423,20 +423,20 @@ _02254B30: .word 0x02254DAC thumb_func_start MOD21_02254B34 MOD21_02254B34: ; 0x02254B34 - ldr r3, _02254B3C ; =0x02253795 + ldr r3, _02254B3C ; =MOD20_02253794 add r0, #8 bx r3 nop -_02254B3C: .word 0x02253795 +_02254B3C: .word MOD20_02253794 thumb_func_end MOD21_02254B34 thumb_func_start MOD21_02254B40 MOD21_02254B40: ; 0x02254B40 - ldr r3, _02254B48 ; =0x022537B9 + ldr r3, _02254B48 ; =MOD20_022537B8 add r0, #8 bx r3 nop -_02254B48: .word 0x022537B9 +_02254B48: .word MOD20_022537B8 thumb_func_end MOD21_02254B40 thumb_func_start MOD21_02254B4C diff --git a/arm9/modules/22/asm/module_22.s b/arm9/modules/22/asm/module_22.s index 610d0a55..5a63c8bc 100644 --- a/arm9/modules/22/asm/module_22.s +++ b/arm9/modules/22/asm/module_22.s @@ -626,11 +626,11 @@ _02254CD0: .word MOD22_02254CE0 thumb_func_start MOD22_02254CD4 MOD22_02254CD4: ; 0x02254CD4 - ldr r3, _02254CDC ; =0x02254199 + ldr r3, _02254CDC ; =MOD20_02254198 ldr r0, [r0, #0x5c] bx r3 nop -_02254CDC: .word 0x02254199 +_02254CDC: .word MOD20_02254198 thumb_func_end MOD22_02254CD4 thumb_func_start MOD22_02254CE0 @@ -1124,20 +1124,20 @@ _02255068: .word 0x02255670 thumb_func_start MOD22_0225506C MOD22_0225506C: ; 0x0225506C - ldr r3, _02255074 ; =0x02253795 + ldr r3, _02255074 ; =MOD20_02253794 add r0, #8 bx r3 nop -_02255074: .word 0x02253795 +_02255074: .word MOD20_02253794 thumb_func_end MOD22_0225506C thumb_func_start MOD22_02255078 MOD22_02255078: ; 0x02255078 - ldr r3, _02255080 ; =0x022537B9 + ldr r3, _02255080 ; =MOD20_022537B8 add r0, #8 bx r3 nop -_02255080: .word 0x022537B9 +_02255080: .word MOD20_022537B8 thumb_func_end MOD22_02255078 thumb_func_start MOD22_02255084 diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s index a5adabbb..acb9bed3 100644 --- a/arm9/modules/23/asm/module_23.s +++ b/arm9/modules/23/asm/module_23.s @@ -1123,20 +1123,20 @@ _02255058: .word 0x02256040 thumb_func_start MOD23_0225505C MOD23_0225505C: ; 0x0225505C - ldr r3, _02255064 ; =0x02253795 + ldr r3, _02255064 ; =MOD20_02253794 add r0, #8 bx r3 nop -_02255064: .word 0x02253795 +_02255064: .word MOD20_02253794 thumb_func_end MOD23_0225505C thumb_func_start MOD23_02255068 MOD23_02255068: ; 0x02255068 - ldr r3, _02255070 ; =0x022537B9 + ldr r3, _02255070 ; =MOD20_022537B8 add r0, #8 bx r3 nop -_02255070: .word 0x022537B9 +_02255070: .word MOD20_022537B8 thumb_func_end MOD23_02255068 thumb_func_start MOD23_02255074 @@ -1746,10 +1746,10 @@ _0225553C: thumb_func_start MOD23_02255540 MOD23_02255540: ; 0x02255540 - ldr r3, _02255544 ; =0x02016A19 + ldr r3, _02255544 ; =FUN_02016A18 bx r3 .align 2, 0 -_02255544: .word 0x02016A19 +_02255544: .word FUN_02016A18 thumb_func_end MOD23_02255540 thumb_func_start MOD23_02255548 diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index e1a1d741..42733627 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -5,12 +5,12 @@ thumb_func_start MOD28_02254840 MOD28_02254840: ; 0x02254840 - ldr r3, _02254848 ; =0x02252979 + ldr r3, _02254848 ; =MOD20_02252978 ldr r0, _0225484C ; =MOD28_02254854 ldr r1, _02254850 ; =MOD28_022549F4 bx r3 .align 2, 0 -_02254848: .word 0x02252979 +_02254848: .word MOD20_02252978 _0225484C: .word MOD28_02254854 _02254850: .word MOD28_022549F4 thumb_func_end MOD28_02254840 @@ -519,20 +519,20 @@ _02254BE8: .word 0x02255EF4 thumb_func_start MOD28_02254BEC MOD28_02254BEC: ; 0x02254BEC - ldr r3, _02254BF4 ; =0x02253795 + ldr r3, _02254BF4 ; =MOD20_02253794 add r0, #8 bx r3 nop -_02254BF4: .word 0x02253795 +_02254BF4: .word MOD20_02253794 thumb_func_end MOD28_02254BEC thumb_func_start MOD28_02254BF8 MOD28_02254BF8: ; 0x02254BF8 - ldr r3, _02254C00 ; =0x022537B9 + ldr r3, _02254C00 ; =MOD20_022537B8 add r0, #8 bx r3 nop -_02254C00: .word 0x022537B9 +_02254C00: .word MOD20_022537B8 thumb_func_end MOD28_02254BF8 thumb_func_start MOD28_02254C04 @@ -1531,11 +1531,11 @@ MOD28_02255344: ; 0x02255344 mov r0, #0x4e lsl r0, r0, #2 ldr r0, [r1, r0] - ldr r3, _02255358 ; =0x02253F79 + ldr r3, _02255358 ; =MOD20_02253F78 mov r1, #1 bx r3 nop -_02255358: .word 0x02253F79 +_02255358: .word MOD20_02253F78 thumb_func_end MOD28_02255344 thumb_func_start MOD28_0225535C diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index e4dacfc6..ce93b6bc 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -3691,11 +3691,11 @@ MOD53_021D925C: ; 0x021D925C mov r1, #0xb6 lsl r1, r1, #2 add r0, r0, r1 - ldr r3, _021D9268 ; =0x0200D0E1 + ldr r3, _021D9268 ; =FUN_0200D0E0 mov r1, #0 bx r3 .align 2, 0 -_021D9268: .word 0x0200D0E1 +_021D9268: .word FUN_0200D0E0 thumb_func_end MOD53_021D925C thumb_func_start MOD53_021D926C diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 817d6824..c3e477c6 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -3082,11 +3082,11 @@ MOD54_021D8D40: ; 0x021D8D40 mov r1, #0xba lsl r1, r1, #2 add r0, r0, r1 - ldr r3, _021D8D4C ; =0x0200D0E1 + ldr r3, _021D8D4C ; =FUN_0200D0E0 mov r1, #0 bx r3 .align 2, 0 -_021D8D4C: .word 0x0200D0E1 +_021D8D4C: .word FUN_0200D0E0 thumb_func_end MOD54_021D8D40 thumb_func_start MOD54_021D8D50 @@ -4184,10 +4184,10 @@ MOD54_021D9500: ; 0x021D9500 thumb_func_start MOD54_021D9518 MOD54_021D9518: ; 0x021D9518 - ldr r3, _021D951C ; =0x0202B9ED + ldr r3, _021D951C ; =FUN_0202B9EC bx r3 .align 2, 0 -_021D951C: .word 0x0202B9ED +_021D951C: .word FUN_0202B9EC thumb_func_end MOD54_021D9518 thumb_func_start MOD54_021D9520 diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 46173b3f..a854022c 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -385,11 +385,11 @@ _021D7808: .word 0x00003FF8 thumb_func_start MOD55_021D780C MOD55_021D780C: ; 0x021D780C - ldr r3, _021D7814 ; =0x0201E66D + ldr r3, _021D7814 ; =FUN_0201E66C ldr r0, _021D7818 ; =0x021DA458 bx r3 nop -_021D7814: .word 0x0201E66D +_021D7814: .word FUN_0201E66C _021D7818: .word 0x021DA458 thumb_func_end MOD55_021D780C @@ -5033,11 +5033,11 @@ MOD55_021D9E04: ; 0x021D9E04 thumb_func_start MOD55_021D9E34 MOD55_021D9E34: ; 0x021D9E34 - ldr r3, _021D9E3C ; =0x0201C78D + ldr r3, _021D9E3C ; =FUN_0201C78C ldrh r0, [r0] bx r3 nop -_021D9E3C: .word 0x0201C78D +_021D9E3C: .word FUN_0201C78C thumb_func_end MOD55_021D9E34 thumb_func_start MOD55_021D9E40 @@ -5518,11 +5518,11 @@ MOD55_021DA214: ; 0x021DA214 mov r1, #0xce lsl r1, r1, #2 add r0, r0, r1 - ldr r3, _021DA220 ; =0x0200D0E1 + ldr r3, _021DA220 ; =FUN_0200D0E0 mov r1, #0 bx r3 .align 2, 0 -_021DA220: .word 0x0200D0E1 +_021DA220: .word FUN_0200D0E0 thumb_func_end MOD55_021DA214 thumb_func_start MOD55_021DA224 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 7208de4e..d5dae418 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -2487,11 +2487,11 @@ _021D8864: thumb_func_start MOD57_021D8894 MOD57_021D8894: ; 0x021D8894 - ldr r3, _021D889C ; =0x020054C9 + ldr r3, _021D889C ; =FUN_020054C8 ldr r0, _021D88A0 ; =0x00000699 bx r3 nop -_021D889C: .word 0x020054C9 +_021D889C: .word FUN_020054C8 _021D88A0: .word 0x00000699 thumb_func_end MOD57_021D8894 diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index 0809afd7..7841f0bd 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -265,11 +265,11 @@ _021D7720: .word 0x021D76D8 thumb_func_start MOD59_021D7724 MOD59_021D7724: ; 0x021D7724 - ldr r3, _021D772C ; =0x0201AB61 + ldr r3, _021D772C ; =FUN_0201AB60 ldr r0, [r0, #0x18] bx r3 nop -_021D772C: .word 0x0201AB61 +_021D772C: .word FUN_0201AB60 thumb_func_end MOD59_021D7724 thumb_func_start MOD59_021D7730 @@ -647,11 +647,11 @@ MOD59_021D7A4C: ; 0x021D7A4C thumb_func_start MOD59_021D7A5C MOD59_021D7A5C: ; 0x021D7A5C - ldr r3, _021D7A64 ; =0x020145A9 + ldr r3, _021D7A64 ; =FUN_020145A8 ldr r0, [r0, #0x68] bx r3 nop -_021D7A64: .word 0x020145A9 +_021D7A64: .word FUN_020145A8 thumb_func_end MOD59_021D7A5C thumb_func_start MOD59_021D7A68 @@ -2536,12 +2536,12 @@ _021D8910: .word 0x000001BE thumb_func_start MOD59_021D8914 MOD59_021D8914: ; 0x021D8914 - ldr r3, _021D891C ; =0x020178BD + ldr r3, _021D891C ; =FUN_020178BC mov r0, #2 mov r1, #1 bx r3 .align 2, 0 -_021D891C: .word 0x020178BD +_021D891C: .word FUN_020178BC thumb_func_end MOD59_021D8914 thumb_func_start MOD59_021D8920 @@ -4616,11 +4616,11 @@ MOD59_021D99F8: ; 0x021D99F8 thumb_func_start MOD59_021D9A14 MOD59_021D9A14: ; 0x021D9A14 - ldr r3, _021D9A1C ; =0x0201AB61 + ldr r3, _021D9A1C ; =FUN_0201AB60 ldr r0, [r0, #4] bx r3 nop -_021D9A1C: .word 0x0201AB61 +_021D9A1C: .word FUN_0201AB60 thumb_func_end MOD59_021D9A14 thumb_func_start MOD59_021D9A20 @@ -4887,11 +4887,11 @@ _021D9C64: .word 0x00000225 thumb_func_start MOD59_021D9C68 MOD59_021D9C68: ; 0x021D9C68 - ldr r3, _021D9C70 ; =0x0200A8B9 + ldr r3, _021D9C70 ; =FUN_0200A8B8 ldr r0, [r0, #8] bx r3 nop -_021D9C70: .word 0x0200A8B9 +_021D9C70: .word FUN_0200A8B8 thumb_func_end MOD59_021D9C68 thumb_func_start MOD59_021D9C74 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 6318e002..d458564e 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -817,11 +817,11 @@ MOD60_021D7A40: ; 0x021D7A40 thumb_func_start MOD60_021D7B98 MOD60_021D7B98: ; 0x021D7B98 - ldr r3, _021D7BA0 ; =0x02016A19 + ldr r3, _021D7BA0 ; =FUN_02016A18 ldr r0, [r0, #0x24] bx r3 nop -_021D7BA0: .word 0x02016A19 +_021D7BA0: .word FUN_02016A18 thumb_func_end MOD60_021D7B98 thumb_func_start MOD60_021D7BA4 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 4623b0ae..ced7fa63 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -4374,14 +4374,14 @@ MOD62_0222F778: ; 0x0222F778 mov r0, #0xf1 lsl r0, r0, #2 ldr r0, [r1, r0] - ldr r3, _0222F78C ; =0x02029C75 + ldr r3, _0222F78C ; =FUN_02029C74 lsl r0, r0, #3 add r0, r1, r0 ldr r0, [r0, #8] add r1, #0x68 bx r3 .align 2, 0 -_0222F78C: .word 0x02029C75 +_0222F78C: .word FUN_02029C74 thumb_func_end MOD62_0222F778 thumb_func_start MOD62_0222F790 @@ -4390,14 +4390,14 @@ MOD62_0222F790: ; 0x0222F790 add r2, r0, #0 lsl r1, r1, #2 ldr r1, [r2, r1] - ldr r3, _0222F7A4 ; =0x02029C75 + ldr r3, _0222F7A4 ; =FUN_02029C74 lsl r1, r1, #3 add r1, r2, r1 add r0, #0x68 ldr r1, [r1, #8] bx r3 .align 2, 0 -_0222F7A4: .word 0x02029C75 +_0222F7A4: .word FUN_02029C74 thumb_func_end MOD62_0222F790 thumb_func_start MOD62_0222F7A8 @@ -5927,22 +5927,22 @@ MOD62_02230388: ; 0x02230388 mov r1, #0x6a lsl r1, r1, #2 ldr r0, [r0, r1] - ldr r3, _02230398 ; =0x02007559 + ldr r3, _02230398 ; =FUN_02007558 mov r1, #6 bx r3 nop -_02230398: .word 0x02007559 +_02230398: .word FUN_02007558 thumb_func_end MOD62_02230388 thumb_func_start MOD62_0223039C MOD62_0223039C: ; 0x0223039C mov r1, #0x6a lsl r1, r1, #2 - ldr r3, _022303A8 ; =0x02007535 + ldr r3, _022303A8 ; =FUN_02007534 ldr r0, [r0, r1] bx r3 nop -_022303A8: .word 0x02007535 +_022303A8: .word FUN_02007534 thumb_func_end MOD62_0223039C thumb_func_start MOD62_022303AC diff --git a/arm9/modules/63/asm/module_63.s b/arm9/modules/63/asm/module_63.s index beeb3428..8759faaf 100644 --- a/arm9/modules/63/asm/module_63.s +++ b/arm9/modules/63/asm/module_63.s @@ -400,11 +400,11 @@ _021D7828: .word 0x021DBE18 thumb_func_start MOD63_021D782C MOD63_021D782C: ; 0x021D782C - ldr r3, _021D7834 ; =0x0201AB61 + ldr r3, _021D7834 ; =FUN_0201AB60 ldr r0, [r0, #4] bx r3 nop -_021D7834: .word 0x0201AB61 +_021D7834: .word FUN_0201AB60 thumb_func_end MOD63_021D782C thumb_func_start MOD63_021D7838 @@ -482,11 +482,11 @@ _021D78AC: .word 0x04000008 thumb_func_start MOD63_021D78B0 MOD63_021D78B0: ; 0x021D78B0 - ldr r3, _021D78B8 ; =0x020223BD + ldr r3, _021D78B8 ; =FUN_020223BC ldr r0, [r0, #8] bx r3 nop -_021D78B8: .word 0x020223BD +_021D78B8: .word FUN_020223BC thumb_func_end MOD63_021D78B0 thumb_func_start MOD63_021D78BC @@ -2178,12 +2178,12 @@ _021D8640: .word 0x020ECAC0 thumb_func_start MOD63_021D8644 MOD63_021D8644: ; 0x021D8644 - ldr r3, _021D864C ; =0x02019179 + ldr r3, _021D864C ; =FUN_02019178 add r2, #0xac add r0, r2, #0 bx r3 .align 2, 0 -_021D864C: .word 0x02019179 +_021D864C: .word FUN_02019178 thumb_func_end MOD63_021D8644 thumb_func_start MOD63_021D8650 @@ -2972,10 +2972,10 @@ _021D8CA4: .word 0x04000580 thumb_func_start MOD63_021D8CA8 MOD63_021D8CA8: ; 0x021D8CA8 - ldr r3, _021D8CAC ; =0x02009F81 + ldr r3, _021D8CAC ; =FUN_02009F80 bx r3 .align 2, 0 -_021D8CAC: .word 0x02009F81 +_021D8CAC: .word FUN_02009F80 thumb_func_end MOD63_021D8CA8 thumb_func_start MOD63_021D8CB0 @@ -6002,11 +6002,11 @@ MOD63_021DA588: ; 0x021DA588 strb r2, [r0, #3] mov r2, #0 strb r2, [r0, #1] - ldr r3, _021DA59C ; =0x0201E6E5 + ldr r3, _021DA59C ; =FUN_0201E6E4 add r0, r1, #0 bx r3 nop -_021DA59C: .word 0x0201E6E5 +_021DA59C: .word FUN_0201E6E4 thumb_func_end MOD63_021DA588 thumb_func_start MOD63_021DA5A0 @@ -6807,11 +6807,11 @@ _021DABEC: thumb_func_start MOD63_021DAC18 MOD63_021DAC18: ; 0x021DAC18 - ldr r3, _021DAC20 ; =0x0201FDED + ldr r3, _021DAC20 ; =FUN_0201FDEC ldr r0, [r0] bx r3 nop -_021DAC20: .word 0x0201FDED +_021DAC20: .word FUN_0201FDEC thumb_func_end MOD63_021DAC18 thumb_func_start MOD63_021DAC24 @@ -6821,11 +6821,11 @@ MOD63_021DAC24: ; 0x021DAC24 mov r0, #0x63 lsl r0, r0, #2 ldr r0, [r1, r0] - ldr r3, _021DAC34 ; =0x020200A1 + ldr r3, _021DAC34 ; =FUN_020200A0 add r1, r2, #0 bx r3 .align 2, 0 -_021DAC34: .word 0x020200A1 +_021DAC34: .word FUN_020200A0 thumb_func_end MOD63_021DAC24 thumb_func_start MOD63_021DAC38 @@ -7533,11 +7533,11 @@ _021DB15C: thumb_func_start MOD63_021DB1A0 MOD63_021DB1A0: ; 0x021DB1A0 - ldr r3, _021DB1A8 ; =0x0201FDED + ldr r3, _021DB1A8 ; =FUN_0201FDEC ldr r0, [r0] bx r3 nop -_021DB1A8: .word 0x0201FDED +_021DB1A8: .word FUN_0201FDEC thumb_func_end MOD63_021DB1A0 thumb_func_start MOD63_021DB1AC diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index e7d103d1..be87b0fd 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -362,10 +362,10 @@ MOD64_021D77E8: ; 0x021D77E8 thumb_func_start MOD64_021D7808 MOD64_021D7808: ; 0x021D7808 - ldr r3, _021D780C ; =0x0200E309 + ldr r3, _021D780C ; =FUN_0200E308 bx r3 .align 2, 0 -_021D780C: .word 0x0200E309 +_021D780C: .word FUN_0200E308 thumb_func_end MOD64_021D7808 thumb_func_start MOD64_021D7810 @@ -911,12 +911,12 @@ _021D7C60: .word 0x0000064C thumb_func_start MOD64_021D7C64 MOD64_021D7C64: ; 0x021D7C64 ldr r1, _021D7C6C ; =0x0000064C - ldr r3, _021D7C70 ; =0x02013D19 + ldr r3, _021D7C70 ; =FUN_02013D18 ldr r0, [r0, r1] bx r3 .align 2, 0 _021D7C6C: .word 0x0000064C -_021D7C70: .word 0x02013D19 +_021D7C70: .word FUN_02013D18 thumb_func_end MOD64_021D7C64 thumb_func_start MOD64_021D7C74 @@ -1736,11 +1736,11 @@ _021D82B8: .word 0x00000FA4 MOD64_021D82BC: ; 0x021D82BC mov r1, #0x5f lsl r1, r1, #4 - ldr r3, _021D82C8 ; =0x0201EB71 + ldr r3, _021D82C8 ; =FUN_0201EB70 ldr r0, [r0, r1] bx r3 nop -_021D82C8: .word 0x0201EB71 +_021D82C8: .word FUN_0201EB70 thumb_func_end MOD64_021D82BC thumb_func_start MOD64_021D82CC @@ -2765,11 +2765,11 @@ MOD64_021D89FC: ; 0x021D89FC thumb_func_start MOD64_021D8A78 MOD64_021D8A78: ; 0x021D8A78 - ldr r3, _021D8A80 ; =0x0201FFC9 + ldr r3, _021D8A80 ; =FUN_0201FFC8 ldr r0, [r0] bx r3 nop -_021D8A80: .word 0x0201FFC9 +_021D8A80: .word FUN_0201FFC8 thumb_func_end MOD64_021D8A78 thumb_func_start MOD64_021D8A84 @@ -2890,11 +2890,11 @@ _021D8B56: thumb_func_start MOD64_021D8B58 MOD64_021D8B58: ; 0x021D8B58 - ldr r3, _021D8B60 ; =0x020200A1 + ldr r3, _021D8B60 ; =FUN_020200A0 ldr r0, [r0] bx r3 nop -_021D8B60: .word 0x020200A1 +_021D8B60: .word FUN_020200A0 thumb_func_end MOD64_021D8B58 thumb_func_start MOD64_021D8B64 @@ -2999,11 +2999,11 @@ MOD64_021D8C0C: ; 0x021D8C0C thumb_func_start MOD64_021D8C30 MOD64_021D8C30: ; 0x021D8C30 - ldr r3, _021D8C38 ; =0x02013EB1 + ldr r3, _021D8C38 ; =FUN_02013EB0 ldr r0, [r0, #8] bx r3 nop -_021D8C38: .word 0x02013EB1 +_021D8C38: .word FUN_02013EB0 thumb_func_end MOD64_021D8C30 thumb_func_start MOD64_021D8C3C @@ -3537,14 +3537,14 @@ MOD64_021D902C: ; 0x021D902C add r1, r0, #0 add r1, #0xa8 ldr r1, [r1] - ldr r3, _021D9040 ; =0x02019571 + ldr r3, _021D9040 ; =FUN_02019570 lsl r1, r1, #2 add r0, r0, r1 add r0, #0x9c ldr r0, [r0] bx r3 nop -_021D9040: .word 0x02019571 +_021D9040: .word FUN_02019570 thumb_func_end MOD64_021D902C thumb_func_start MOD64_021D9044 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index a254fc52..07e7acd3 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -2057,11 +2057,11 @@ _021D84E0: .word 0x00000001 thumb_func_start MOD65_021D84E4 MOD65_021D84E4: ; 0x021D84E4 - ldr r3, _021D84EC ; =0x02001471 + ldr r3, _021D84EC ; =FUN_02001470 mov r1, #0x13 bx r3 nop -_021D84EC: .word 0x02001471 +_021D84EC: .word FUN_02001470 thumb_func_end MOD65_021D84E4 thumb_func_start MOD65_021D84F0 @@ -3416,11 +3416,11 @@ MOD65_021D8F34: ; 0x021D8F34 thumb_func_start MOD65_021D8FA4 MOD65_021D8FA4: ; 0x021D8FA4 - ldr r3, _021D8FAC ; =0x02021A21 + ldr r3, _021D8FAC ; =FUN_02021A20 ldr r0, [r0, #0x3c] bx r3 nop -_021D8FAC: .word 0x02021A21 +_021D8FAC: .word FUN_02021A20 thumb_func_end MOD65_021D8FA4 thumb_func_start MOD65_021D8FB0 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 709a8b84..e1053077 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -3727,20 +3727,20 @@ MOD66_021D91F4: ; 0x021D91F4 thumb_func_start MOD66_021D9214 MOD66_021D9214: ; 0x021D9214 - ldr r3, _021D921C ; =0x0200BC1D + ldr r3, _021D921C ; =FUN_0200BC1C add r0, #0xdc ldr r0, [r0] bx r3 .align 2, 0 -_021D921C: .word 0x0200BC1D +_021D921C: .word FUN_0200BC1C thumb_func_end MOD66_021D9214 thumb_func_start MOD66_021D9220 MOD66_021D9220: ; 0x021D9220 - ldr r3, _021D9224 ; =0x0200BC31 + ldr r3, _021D9224 ; =FUN_0200BC30 bx r3 .align 2, 0 -_021D9224: .word 0x0200BC31 +_021D9224: .word FUN_0200BC30 thumb_func_end MOD66_021D9220 thumb_func_start MOD66_021D9228 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 8756cbb5..c7484f37 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -708,10 +708,10 @@ _021D7AA4: .word 0x0000105F thumb_func_start MOD67_021D7AA8 MOD67_021D7AA8: ; 0x021D7AA8 - ldr r3, _021D7AAC ; =0x0200E309 + ldr r3, _021D7AAC ; =FUN_0200E308 bx r3 .align 2, 0 -_021D7AAC: .word 0x0200E309 +_021D7AAC: .word FUN_0200E308 thumb_func_end MOD67_021D7AA8 thumb_func_start MOD67_021D7AB0 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 1c34783c..1ee371c6 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -1496,12 +1496,12 @@ _021D80A4: .word 0x04000540 thumb_func_start MOD_021D80A8 MOD_021D80A8: ; 0x021D80A8 - ldr r3, _021D80B0 ; =0x0201EB71 + ldr r3, _021D80B0 ; =FUN_0201EB70 add r0, #0xd0 ldr r0, [r0] bx r3 .align 2, 0 -_021D80B0: .word 0x0201EB71 +_021D80B0: .word FUN_0201EB70 thumb_func_end MOD_021D80A8 thumb_func_start MOD_021D80B4 |