summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/global.inc2
-rw-r--r--arm9/modules/43/asm/module_43.s134
-rw-r--r--arm9/modules/45/asm/module_45.s5
-rw-r--r--arm9/modules/47/asm/module_47.s9
-rw-r--r--arm9/modules/48/asm/module_48.s4
-rw-r--r--arm9/modules/53/asm/module_53.s52
-rw-r--r--arm9/modules/54/asm/module_54.s28
7 files changed, 175 insertions, 59 deletions
diff --git a/arm9/global.inc b/arm9/global.inc
index 1a77046c..d682b675 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -2004,6 +2004,7 @@
.extern FUN_0202A170
.extern FUN_0202A1B8
.extern FUN_0202A1C4
+.extern FUN_0202A1E0
.extern FUN_0202A1E4
.extern FUN_0202A240
.extern FUN_0202A2C4
@@ -2145,6 +2146,7 @@
.extern FUN_0202B8B8
.extern FUN_0202B8E4
.extern FUN_0202B8F0
+.extern FUN_0202B934
.extern FUN_0202B9EC
.extern FUN_0202BCF4
.extern FUN_0202BD6C
diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s
index 51f11701..c9bbedfd 100644
--- a/arm9/modules/43/asm/module_43.s
+++ b/arm9/modules/43/asm/module_43.s
@@ -1135,22 +1135,124 @@ MOD43_022550A8: ; 0x022550A8
.global MOD43_022550B4
MOD43_022550B4: ; 0x022550B4
- .byte 0x05, 0x14, 0x05, 0x14
- .byte 0x06, 0x14, 0x06, 0x14, 0x06, 0x13, 0x06, 0x13, 0x07, 0x11, 0x07, 0x11, 0x07, 0x11, 0x07, 0x11
- .byte 0x05, 0x12, 0x05, 0x12, 0x05, 0x12, 0x05, 0x12, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10
- .byte 0x09, 0x13, 0x09, 0x13, 0x09, 0x15, 0x09, 0x15, 0x09, 0x16, 0x09, 0x16, 0x09, 0x16, 0x09, 0x16
- .byte 0x0D, 0x16, 0x0D, 0x16, 0x0D, 0x16, 0x0D, 0x16, 0x10, 0x16, 0x10, 0x16, 0x11, 0x15, 0x11, 0x15
- .byte 0x11, 0x14, 0x11, 0x14, 0x11, 0x14, 0x11, 0x14, 0x11, 0x13, 0x11, 0x13, 0x11, 0x13, 0x11, 0x13
- .byte 0x0F, 0x10, 0x0F, 0x10, 0x0F, 0x10, 0x0F, 0x10, 0x0D, 0x10, 0x0D, 0x10, 0x0D, 0x10, 0x0D, 0x10
- .byte 0x0E, 0x18, 0x0E, 0x18, 0x0E, 0x19, 0x0E, 0x19, 0x11, 0x1A, 0x11, 0x1A, 0x11, 0x1A, 0x11, 0x1A
- .byte 0x13, 0x19, 0x13, 0x19, 0x13, 0x19, 0x13, 0x19, 0x14, 0x19, 0x14, 0x19, 0x14, 0x19, 0x14, 0x19
- .byte 0x16, 0x14, 0x16, 0x14, 0x16, 0x14, 0x16, 0x14, 0x13, 0x12, 0x13, 0x12, 0x14, 0x12, 0x14, 0x12
- .byte 0x02, 0x17, 0x02, 0x17, 0x02, 0x17, 0x02, 0x17, 0x08, 0x1C, 0x08, 0x1C, 0x08, 0x1C, 0x08, 0x1C
- .byte 0x17, 0x18, 0x17, 0x18, 0x17, 0x18, 0x17, 0x18, 0x1C, 0x10, 0x1C, 0x10, 0x1C, 0x10, 0x1C, 0x10
- .byte 0x13, 0x0D, 0x14, 0x0D, 0x14, 0x0D, 0x14, 0x0D, 0x13, 0x0A, 0x13, 0x0A, 0x13, 0x0A, 0x13, 0x0A
- .byte 0x15, 0x0A, 0x15, 0x0A, 0x15, 0x0A, 0x15, 0x0A, 0x18, 0x0C, 0x18, 0x0C, 0x18, 0x0C, 0x18, 0x0C
- .byte 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0E, 0x19, 0x0E, 0x19, 0x0E, 0x19, 0x0E
- .byte 0x15, 0x0D, 0x15, 0x0D, 0x15, 0x0D, 0x15, 0x0D
+ .byte 0x05, 0x14
+ .byte 0x05, 0x14
+ .byte 0x06, 0x14
+ .byte 0x06, 0x14
+ .byte 0x06, 0x13
+ .byte 0x06, 0x13
+ .byte 0x07, 0x11
+ .byte 0x07, 0x11
+ .byte 0x07, 0x11
+ .byte 0x07, 0x11
+ .byte 0x05, 0x12
+ .byte 0x05, 0x12
+ .byte 0x05, 0x12
+ .byte 0x05, 0x12
+ .byte 0x08, 0x10
+ .byte 0x08, 0x10
+ .byte 0x08, 0x10
+ .byte 0x08, 0x10
+ .byte 0x09, 0x13
+ .byte 0x09, 0x13
+ .byte 0x09, 0x15
+ .byte 0x09, 0x15
+ .byte 0x09, 0x16
+ .byte 0x09, 0x16
+ .byte 0x09, 0x16
+ .byte 0x09, 0x16
+ .byte 0x0D, 0x16
+ .byte 0x0D, 0x16
+ .byte 0x0D, 0x16
+ .byte 0x0D, 0x16
+ .byte 0x10, 0x16
+ .byte 0x10, 0x16
+ .byte 0x11, 0x15
+ .byte 0x11, 0x15
+ .byte 0x11, 0x14
+ .byte 0x11, 0x14
+ .byte 0x11, 0x14
+ .byte 0x11, 0x14
+ .byte 0x11, 0x13
+ .byte 0x11, 0x13
+ .byte 0x11, 0x13
+ .byte 0x11, 0x13
+ .byte 0x0F, 0x10
+ .byte 0x0F, 0x10
+ .byte 0x0F, 0x10
+ .byte 0x0F, 0x10
+ .byte 0x0D, 0x10
+ .byte 0x0D, 0x10
+ .byte 0x0D, 0x10
+ .byte 0x0D, 0x10
+ .byte 0x0E, 0x18
+ .byte 0x0E, 0x18
+ .byte 0x0E, 0x19
+ .byte 0x0E, 0x19
+ .byte 0x11, 0x1A
+ .byte 0x11, 0x1A
+ .byte 0x11, 0x1A
+ .byte 0x11, 0x1A
+ .byte 0x13, 0x19
+ .byte 0x13, 0x19
+ .byte 0x13, 0x19
+ .byte 0x13, 0x19
+ .byte 0x14, 0x19
+ .byte 0x14, 0x19
+ .byte 0x14, 0x19
+ .byte 0x14, 0x19
+ .byte 0x16, 0x14
+ .byte 0x16, 0x14
+ .byte 0x16, 0x14
+ .byte 0x16, 0x14
+ .byte 0x13, 0x12
+ .byte 0x13, 0x12
+ .byte 0x14, 0x12
+ .byte 0x14, 0x12
+ .byte 0x02, 0x17
+ .byte 0x02, 0x17
+ .byte 0x02, 0x17
+ .byte 0x02, 0x17
+ .byte 0x08, 0x1C
+ .byte 0x08, 0x1C
+ .byte 0x08, 0x1C
+ .byte 0x08, 0x1C
+ .byte 0x17, 0x18
+ .byte 0x17, 0x18
+ .byte 0x17, 0x18
+ .byte 0x17, 0x18
+ .byte 0x1C, 0x10
+ .byte 0x1C, 0x10
+ .byte 0x1C, 0x10
+ .byte 0x1C, 0x10
+ .byte 0x13, 0x0D
+ .byte 0x14, 0x0D
+ .byte 0x14, 0x0D
+ .byte 0x14, 0x0D
+ .byte 0x13, 0x0A
+ .byte 0x13, 0x0A
+ .byte 0x13, 0x0A
+ .byte 0x13, 0x0A
+ .byte 0x15, 0x0A
+ .byte 0x15, 0x0A
+ .byte 0x15, 0x0A
+ .byte 0x15, 0x0A
+ .byte 0x18, 0x0C
+ .byte 0x18, 0x0C
+ .byte 0x18, 0x0C
+ .byte 0x18, 0x0C
+ .byte 0x19, 0x0D
+ .byte 0x19, 0x0D
+ .byte 0x19, 0x0D
+ .byte 0x19, 0x0D
+ .byte 0x19, 0x0E
+ .byte 0x19, 0x0E
+ .byte 0x19, 0x0E
+ .byte 0x19, 0x0E
+ .byte 0x15, 0x0D
+ .byte 0x15, 0x0D
+ .byte 0x15, 0x0D
+ .byte 0x15, 0x0D
.global MOD43_022551A0
MOD43_022551A0: ; 0x022551A0
diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s
index 39a3e9cf..effe8de8 100644
--- a/arm9/modules/45/asm/module_45.s
+++ b/arm9/modules/45/asm/module_45.s
@@ -1084,9 +1084,8 @@ MOD45_022550B8: ; 0x022550B8
.global MOD45_022550C6
MOD45_022550C6: ; 0x022550C6
- .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00
- .byte 0x08, 0x00, 0x18, 0x00, 0x1C, 0x00, 0x20, 0x00, 0x30, 0x00, 0x34, 0x00, 0x38, 0x00, 0x48, 0x00
- .byte 0x4C, 0x00, 0x50, 0x00
+ .short 0x00, 0x00, 0x04, 0x08, 0x18, 0x1C, 0x20, 0x30
+ .short 0x34, 0x38, 0x48, 0x4C, 0x50
.global MOD45_022550E0
MOD45_022550E0: ; 0x022550E0
diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s
index 752a92ca..2afd8e35 100644
--- a/arm9/modules/47/asm/module_47.s
+++ b/arm9/modules/47/asm/module_47.s
@@ -1500,8 +1500,9 @@ MOD47_022553A8: ; 0x022553A8
.global MOD47_022553B0
MOD47_022553B0: ; 0x022553B0
- .byte 0x00, 0x06, 0x08, 0x0B, 0x0C, 0x0E, 0x00, 0x00
+ .byte 0x00, 0x06, 0x08, 0x0B, 0x0C, 0x0E
+ .balign 4, 0
.global MOD47_022553B8
MOD47_022553B8: ; 0x022553B8
.word MOD47_02254938, MOD47_02254978, MOD47_022549E4, MOD47_02254AD4
@@ -1509,8 +1510,10 @@ MOD47_022553B8: ; 0x022553B8
.global MOD47_022553D0
MOD47_022553D0: ; 0x022553D0
- .word MOD47_022553A4, 0x00000004, MOD47_022553A0, 0x00000001
- .word MOD47_022553A8, 0x00000005, MOD47_022553B0, 0x00000006
+ .word MOD47_022553A4, 0x00000004
+ .word MOD47_022553A0, 0x00000001
+ .word MOD47_022553A8, 0x00000005
+ .word MOD47_022553B0, 0x00000006
.global MOD47_022553F0
MOD47_022553F0: ; 0x022553F0
diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s
index 42f3adb7..32b5d3c8 100644
--- a/arm9/modules/48/asm/module_48.s
+++ b/arm9/modules/48/asm/module_48.s
@@ -956,7 +956,9 @@ _02254F5C: .word 0x000003E7
.global MOD48_02254F60
MOD48_02254F60: ; 0x02254F60
- .byte 0x3E, 0x62, 0x58, 0x88, 0x4E, 0x72, 0x98, 0xC8, 0x56, 0x7A, 0x18, 0x48
+ .byte 0x3E, 0x62, 0x58, 0x88
+ .byte 0x4E, 0x72, 0x98, 0xC8
+ .byte 0x56, 0x7A, 0x18, 0x48
.global MOD48_02254F6C
MOD48_02254F6C: ; 0x02254F6C
diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s
index 226cefed..d46aaf36 100644
--- a/arm9/modules/53/asm/module_53.s
+++ b/arm9/modules/53/asm/module_53.s
@@ -222,7 +222,7 @@ _021D76D2:
lsl r0, r0, #2
ldr r0, [r4, r0]
lsl r2, r0, #3
- ldr r0, _021D7754 ; =0x021D98A0
+ ldr r0, _021D7754 ; =MOD53_021D98A0
ldr r2, [r0, r2]
cmp r2, #0
beq _021D76E8
@@ -256,11 +256,11 @@ _021D7718:
lsl r0, r0, #2
ldr r0, [r4, r0]
lsl r3, r0, #3
- ldr r0, _021D7754 ; =0x021D98A0
+ ldr r0, _021D7754 ; =MOD53_021D98A0
ldr r2, [r0, r3]
cmp r2, #0
beq _021D7744
- ldr r0, _021D7760 ; =0x021D98A4
+ ldr r0, _021D7760 ; =MOD53_021D98A0 + 4
ldr r0, [r0, r3]
cmp r0, #0
beq _021D7744
@@ -284,7 +284,7 @@ _021D7750: .word 0x000093B4
_021D7754: .word MOD53_021D98A0
_021D7758: .word 0x000E0D0F
_021D775C: .word 0x00004374
-_021D7760: .word MOD53_021D98A4
+_021D7760: .word MOD53_021D98A0 + 4
thumb_func_end MOD53_021D7654
thumb_func_start MOD53_021D7764
@@ -3907,7 +3907,7 @@ MOD53_021D93E8: ; 0x021D93E8
pop {r3, r4}
bx lr
_021D9404:
- ldr r1, _021D9418 ; =0x021D98A4
+ ldr r1, _021D9418 ; =MOD53_021D98A0 + 4
lsl r4, r2, #3
ldr r1, [r1, r4]
cmp r1, #0
@@ -3918,7 +3918,7 @@ _021D9412:
pop {r3, r4}
bx lr
nop
-_021D9418: .word MOD53_021D98A4
+_021D9418: .word MOD53_021D98A0 + 4
thumb_func_end MOD53_021D93E8
thumb_func_start MOD53_021D941C
@@ -4147,21 +4147,29 @@ MOD53_021D9648: ; 0x021D9648
.data
.global MOD53_021D98A0
MOD53_021D98A0: ; 0x021D98A0
- .byte 0x00, 0x00, 0x00, 0x00
-
- .global MOD53_021D98A4
-MOD53_021D98A4: ; 0x021D98A4
- .word 0x01, MOD53_021D8494, 0x00, MOD53_021D84EC
- .word 0x00, MOD53_021D84F8, 0x00, MOD53_021D8424
- .word 0x00, MOD53_021D852C, 0x01, MOD53_021D857C
- .word 0x01, MOD53_021D86E0, 0x01, MOD53_021D8704
- .word 0x01, MOD53_021D879C, 0x01, MOD53_021D87D8
- .word 0x01, MOD53_021D87F8, 0x01, MOD53_021D8824
- .word 0x01, MOD53_021D8860, 0x01, MOD53_021D88B0
- .word 0x01, MOD53_021D896C, 0x01, MOD53_021D89A0
- .word 0x01, MOD53_021D89C8, 0x01, MOD53_021D8A08
- .word 0x01, MOD53_021D8A0C, 0x01, MOD53_021D8A2C
- .word 0x01, MOD53_021D8A50, 0x01, MOD53_021D8AB0
- .word 0x01, MOD53_021D8AF8, 0x01
+ .word 0x00000000, 0x01
+ .word MOD53_021D8494, 0x00
+ .word MOD53_021D84EC, 0x00
+ .word MOD53_021D84F8, 0x00
+ .word MOD53_021D8424, 0x00
+ .word MOD53_021D852C, 0x01
+ .word MOD53_021D857C, 0x01
+ .word MOD53_021D86E0, 0x01
+ .word MOD53_021D8704, 0x01
+ .word MOD53_021D879C, 0x01
+ .word MOD53_021D87D8, 0x01
+ .word MOD53_021D87F8, 0x01
+ .word MOD53_021D8824, 0x01
+ .word MOD53_021D8860, 0x01
+ .word MOD53_021D88B0, 0x01
+ .word MOD53_021D896C, 0x01
+ .word MOD53_021D89A0, 0x01
+ .word MOD53_021D89C8, 0x01
+ .word MOD53_021D8A08, 0x01
+ .word MOD53_021D8A0C, 0x01
+ .word MOD53_021D8A2C, 0x01
+ .word MOD53_021D8A50, 0x01
+ .word MOD53_021D8AB0, 0x01
+ .word MOD53_021D8AF8, 0x01
.bss
diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s
index 752e8f3c..132efee7 100644
--- a/arm9/modules/54/asm/module_54.s
+++ b/arm9/modules/54/asm/module_54.s
@@ -4436,23 +4436,23 @@ MOD54_021D9758: ; 0x021D9758
.global MOD54_021D9780
MOD54_021D9780: ; 0x021D9780
- .byte 0x31, 0x94, 0x1D, 0x02, 0x3D, 0x94, 0x1D, 0x02, 0x65, 0x94, 0x1D, 0x02, 0x7D, 0x94, 0x1D, 0x02
- .byte 0x89, 0x94, 0x1D, 0x02, 0xB5, 0x94, 0x1D, 0x02, 0xB5, 0x91, 0x1D, 0x02, 0x75, 0x92, 0x1D, 0x02
- .byte 0xD1, 0x94, 0x1D, 0x02, 0xBD, 0x91, 0x1D, 0x02, 0xAD, 0x92, 0x1D, 0x02, 0xE9, 0x94, 0x1D, 0x02
- .byte 0xAD, 0x91, 0x1D, 0x02, 0x39, 0x92, 0x1D, 0x02, 0x01, 0x95, 0x1D, 0x02, 0x35, 0xB9, 0x02, 0x02
- .byte 0x19, 0x95, 0x1D, 0x02, 0x21, 0x95, 0x1D, 0x02, 0xE1, 0xA1, 0x02, 0x02, 0x45, 0x95, 0x1D, 0x02
- .byte 0x6D, 0x95, 0x1D, 0x02
+ .word MOD54_021D9430, MOD54_021D943C, MOD54_021D9464, MOD54_021D947C
+ .word MOD54_021D9488, MOD54_021D94B4, MOD54_021D91B4, MOD54_021D9274
+ .word MOD54_021D94D0, MOD54_021D91BC, MOD54_021D92AC, MOD54_021D94E8
+ .word MOD54_021D91AC, MOD54_021D9238, MOD54_021D9500, FUN_0202B934
+ .word MOD54_021D9518, MOD54_021D9520, FUN_0202A1E0, MOD54_021D9544
+ .word MOD54_021D956C
.data
.global MOD54_021D97E0
MOD54_021D97E0: ; 0x021D97E0
- .byte 0x0D, 0x7F, 0x1D, 0x02, 0xA5, 0x80, 0x1D, 0x02, 0xF1, 0x80, 0x1D, 0x02, 0x45, 0x7F, 0x1D, 0x02
- .byte 0x21, 0x81, 0x1D, 0x02, 0x51, 0x81, 0x1D, 0x02, 0x81, 0x82, 0x1D, 0x02, 0x99, 0x82, 0x1D, 0x02
- .byte 0x21, 0x83, 0x1D, 0x02, 0xA5, 0x85, 0x1D, 0x02, 0xC5, 0x85, 0x1D, 0x02, 0x01, 0x86, 0x1D, 0x02
- .byte 0x31, 0x86, 0x1D, 0x02, 0xDD, 0x86, 0x1D, 0x02, 0x2D, 0x87, 0x1D, 0x02, 0x51, 0x87, 0x1D, 0x02
- .byte 0x71, 0x87, 0x1D, 0x02, 0xB1, 0x87, 0x1D, 0x02, 0xD1, 0x87, 0x1D, 0x02, 0xF5, 0x87, 0x1D, 0x02
- .byte 0x4D, 0x88, 0x1D, 0x02, 0x89, 0x88, 0x1D, 0x02, 0x41, 0x83, 0x1D, 0x02, 0x71, 0x83, 0x1D, 0x02
- .byte 0x21, 0x84, 0x1D, 0x02, 0x7D, 0x84, 0x1D, 0x02, 0xAD, 0x84, 0x1D, 0x02, 0xD5, 0x84, 0x1D, 0x02
- .byte 0x19, 0x85, 0x1D, 0x02, 0x89, 0x85, 0x1D, 0x02, 0xCD, 0x80, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
+ .word MOD54_021D7F0C, MOD54_021D80A4, MOD54_021D80F0, MOD54_021D7F44
+ .word MOD54_021D8120, MOD54_021D8150, MOD54_021D8280, MOD54_021D8298
+ .word MOD54_021D8320, MOD54_021D85A4, MOD54_021D85C4, MOD54_021D8600
+ .word MOD54_021D8630, MOD54_021D86DC, MOD54_021D872C, MOD54_021D8750
+ .word MOD54_021D8770, MOD54_021D87B0, MOD54_021D87D0, MOD54_021D87F4
+ .word MOD54_021D884C, MOD54_021D8888, MOD54_021D8340, MOD54_021D8370
+ .word MOD54_021D8420, MOD54_021D847C, MOD54_021D84AC, MOD54_021D84D4
+ .word MOD54_021D8518, MOD54_021D8588, MOD54_021D80CC, 0x00000000
.bss
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 17:26:46 +0000