summaryrefslogtreecommitdiff
path: root/arm9/modules/17/asm/module_17.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/17/asm/module_17.s')
-rw-r--r--arm9/modules/17/asm/module_17.s79
1 files changed, 56 insertions, 23 deletions
diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s
index b02c0773..87a2cd04 100644
--- a/arm9/modules/17/asm/module_17.s
+++ b/arm9/modules/17/asm/module_17.s
@@ -471,7 +471,7 @@ MOD17_021D77D4: ; 0x021D77D4
add sp, #0x10
pop {r3, r4, r5, pc}
.align 2, 0
-_021D7824: .word 0x021DE274
+_021D7824: .word MOD17_021DE274
thumb_func_end MOD17_021D77D4
thumb_func_start MOD17_021D7828
@@ -990,7 +990,7 @@ MOD17_021D7B94: ; 0x021D7B94
add sp, #0x1c
pop {r4, r5, pc}
nop
-_021D7BE0: .word 0x021DE2D8
+_021D7BE0: .word MOD17_021DE2D8
thumb_func_end MOD17_021D7B94
thumb_func_start MOD17_021D7BE4
@@ -1167,7 +1167,7 @@ _021D7D12:
add sp, #0x28
pop {r4, pc}
.align 2, 0
-_021D7D24: .word 0x021DE32C
+_021D7D24: .word MOD17_021DE32C
thumb_func_end MOD17_021D7D08
thumb_func_start MOD17_021D7D28
@@ -1265,7 +1265,7 @@ MOD17_021D7DB0: ; 0x021D7DB0
add sp, #0x10
pop {r4, pc}
.align 2, 0
-_021D7DF8: .word 0x021DE254
+_021D7DF8: .word MOD17_021DE254
_021D7DFC: .word 0xFFCFFFEF
thumb_func_end MOD17_021D7DB0
@@ -1570,11 +1570,11 @@ MOD17_021D7F34: ; 0x021D7F34
add sp, #0x8c
pop {r4, r5, pc}
nop
-_021D8044: .word 0x021DE2A0
-_021D8048: .word 0x021DE2BC
-_021D804C: .word 0x021DE2F4
-_021D8050: .word 0x021DE284
-_021D8054: .word 0x021DE310
+_021D8044: .word MOD17_021DE2A0
+_021D8048: .word MOD17_021DE2BC
+_021D804C: .word MOD17_021DE2F4
+_021D8050: .word MOD17_021DE284
+_021D8054: .word MOD17_021DE310
thumb_func_end MOD17_021D7F34
thumb_func_start MOD17_021D8058
@@ -1705,7 +1705,7 @@ MOD17_021D80CC: ; 0x021D80CC
add sp, #0x24
pop {r4, r5, pc}
nop
-_021D8168: .word 0x021DE264
+_021D8168: .word MOD17_021DE264
thumb_func_end MOD17_021D80CC
thumb_func_start MOD17_021D816C
@@ -14601,21 +14601,54 @@ _021DE24C: .word 0x00000151
_021DE250: .word 0x00010200
thumb_func_end MOD17_021DE0F4
- .section .rodata
- ; 0x021DE254
+ .rodata
+ .global MOD17_021DE254
+MOD17_021DE254: ; 0x021DE254
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+
+ .global MOD17_021DE264
+MOD17_021DE264: ; 0x021DE264
.byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00
+
+ .global MOD17_021DE274
+MOD17_021DE274: ; 0x021DE274
.byte 0xCE, 0x02, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00
+
+ .global MOD17_021DE284
+MOD17_021DE284: ; 0x021DE284
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x0F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD17_021DE2A0
+MOD17_021DE2A0: ; 0x021DE2A0
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD17_021DE2BC
+MOD17_021DE2BC: ; 0x021DE2BC
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x0F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1F, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1E, 0x01, 0x00, 0x02, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1E, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x1E, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD17_021DE2D8
+MOD17_021DE2D8: ; 0x021DE2D8
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x1E, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD17_021DE2F4
+MOD17_021DE2F4: ; 0x021DE2F4
.byte 0x00, 0x00, 0x00, 0x00, 0x6F, 0xFF, 0xFF, 0xFF, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x1D, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x01
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x1D, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD17_021DE310
+MOD17_021DE310: ; 0x021DE310
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x0E, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD17_021DE32C
+MOD17_021DE32C: ; 0x021DE32C
+ .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x03, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
+
+ .data
+ .bss