summaryrefslogtreecommitdiff
path: root/arm9/modules/54/asm/module_54.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/54/asm/module_54.s')
-rw-r--r--arm9/modules/54/asm/module_54.s130
1 files changed, 89 insertions, 41 deletions
diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s
index 30987170..7a3d1a43 100644
--- a/arm9/modules/54/asm/module_54.s
+++ b/arm9/modules/54/asm/module_54.s
@@ -267,7 +267,7 @@ _021D7726:
pop {r3, r4, r5, pc}
.align 2, 0
_021D7730: .word 0x00004A50
-_021D7734: .word 0x021D97E0
+_021D7734: .word MOD54_021D97E0
_021D7738: .word 0x00004A40
_021D773C: .word 0x00010300
thumb_func_end MOD54_021D764C
@@ -391,8 +391,8 @@ _021D7838:
_021D7842:
pop {r4, pc}
.align 2, 0
-_021D7844: .word 0x021D968A
-_021D7848: .word 0x021D968B
+_021D7844: .word MOD54_021D968A
+_021D7848: .word MOD54_021D968B
thumb_func_end MOD54_021D77E8
thumb_func_start MOD54_021D784C
@@ -432,7 +432,7 @@ _021D787E:
add sp, #0x28
pop {r4, pc}
.align 2, 0
-_021D7890: .word 0x021D9758
+_021D7890: .word MOD54_021D9758
thumb_func_end MOD54_021D7874
thumb_func_start MOD54_021D7894
@@ -546,12 +546,12 @@ MOD54_021D7894: ; 0x021D7894
add sp, #0x9c
pop {r4, r5, pc}
nop
-_021D7984: .word 0x021D9694
-_021D7988: .word 0x021D9720
-_021D798C: .word 0x021D973C
-_021D7990: .word 0x021D96CC
-_021D7994: .word 0x021D96E8
-_021D7998: .word 0x021D9704
+_021D7984: .word MOD54_021D9694
+_021D7988: .word MOD54_021D9720
+_021D798C: .word MOD54_021D973C
+_021D7990: .word MOD54_021D96CC
+_021D7994: .word MOD54_021D96E8
+_021D7998: .word MOD54_021D9704
thumb_func_end MOD54_021D7894
thumb_func_start MOD54_021D799C
@@ -811,7 +811,7 @@ MOD54_021D7B8C: ; 0x021D7B8C
add sp, #0x10
pop {r4, pc}
.align 2, 0
-_021D7BB8: .word 0x021D96A4
+_021D7BB8: .word MOD54_021D96A4
thumb_func_end MOD54_021D7B8C
thumb_func_start MOD54_021D7BBC
@@ -1052,7 +1052,7 @@ _021D7D4C:
add sp, #0x5c
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_021D7DB0: .word 0x021D96B4
+_021D7DB0: .word MOD54_021D96B4
thumb_func_end MOD54_021D7CAC
thumb_func_start MOD54_021D7DB4
@@ -1514,7 +1514,7 @@ MOD54_021D8120: ; 0x021D8120
add r0, r4, #0
pop {r3, r4, r5, pc}
.align 2, 0
-_021D814C: .word 0x021D9678
+_021D814C: .word MOD54_021D9678
thumb_func_end MOD54_021D8120
thumb_func_start MOD54_021D8150
@@ -1779,7 +1779,7 @@ MOD54_021D8340: ; 0x021D8340
add r0, r4, #0
pop {r3, r4, r5, pc}
.align 2, 0
-_021D836C: .word 0x021D9678
+_021D836C: .word MOD54_021D9678
thumb_func_end MOD54_021D8340
thumb_func_start MOD54_021D8370
@@ -2140,7 +2140,7 @@ MOD54_021D8600: ; 0x021D8600
add r0, r4, #0
pop {r3, r4, r5, pc}
.align 2, 0
-_021D862C: .word 0x021D9678
+_021D862C: .word MOD54_021D9678
thumb_func_end MOD54_021D8600
thumb_func_start MOD54_021D8630
@@ -3310,7 +3310,7 @@ MOD54_021D8EC8: ; 0x021D8EC8
bl GX_LoadOBJPltt
pop {r3, r4, r5, r6, r7, pc}
nop
-_021D8F08: .word 0x021D9680
+_021D8F08: .word MOD54_021D9680
thumb_func_end MOD54_021D8EC8
thumb_func_start MOD54_021D8F0C
@@ -4282,7 +4282,7 @@ _021D959C:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_021D95C4: .word 0x00000BB8
-_021D95C8: .word 0x021D9780
+_021D95C8: .word MOD54_021D9780
thumb_func_end MOD54_021D9570
thumb_func_start MOD54_021D95CC
@@ -4370,36 +4370,82 @@ _021D962A:
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_021D9670: .word 0x00000BB8
-_021D9674: .word 0x021D9780
+_021D9674: .word MOD54_021D9780
thumb_func_end MOD54_021D95CC
- .section .rodata
- ; 0x021D9678
- .byte 0x00, 0x17, 0x0D, 0x07, 0x04, 0x0D, 0x78, 0x01, 0xA0, 0x01, 0xA0, 0x07, 0xA0, 0x0D, 0xA0, 0x13
- .byte 0xA0, 0x19, 0x08, 0x02, 0x08, 0x03, 0x08, 0x04, 0x18, 0x00, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00
- .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x54, 0x00
- .byte 0xCC, 0x00, 0x35, 0x00, 0xE9, 0x00, 0x48, 0x00, 0xDF, 0x00, 0x67, 0x00, 0xB8, 0x00, 0x67, 0x00
- .byte 0xAE, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1B, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .rodata
+ .global MOD54_021D9678
+MOD54_021D9678: ; 0x021D9678
+ .byte 0x00, 0x17, 0x0D, 0x07, 0x04, 0x0D, 0x78, 0x01
+
+ .global MOD54_021D9680
+MOD54_021D9680: ; 0x021D9680
+ .byte 0xA0, 0x01, 0xA0, 0x07, 0xA0, 0x0D, 0xA0, 0x13, 0xA0, 0x19
+
+ .global MOD54_021D968A
+MOD54_021D968A: ; 0x021D968A
+ .byte 0x08
+
+ .global MOD54_021D968B
+MOD54_021D968B: ; 0x021D968B
+ .byte 0x02, 0x08, 0x03, 0x08, 0x04, 0x18, 0x00, 0x00, 0xFF
+
+ .global MOD54_021D9694
+MOD54_021D9694: ; 0x021D9694
+ .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD54_021D96A4
+MOD54_021D96A4: ; 0x021D96A4
+ .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00
+
+ .global MOD54_021D96B4
+MOD54_021D96B4: ; 0x021D96B4
+ .byte 0xCC, 0x00, 0x54, 0x00, 0xCC, 0x00, 0x35, 0x00, 0xE9, 0x00, 0x48, 0x00, 0xDF, 0x00, 0x67, 0x00
+ .byte 0xB8, 0x00, 0x67, 0x00, 0xAE, 0x00, 0x48, 0x00
+
+ .global MOD54_021D96CC
+MOD54_021D96CC: ; 0x021D96CC
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x1B, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD54_021D96E8
+MOD54_021D96E8: ; 0x021D96E8
.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, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1E, 0x02
- .byte 0x00, 0x01, 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, 0x04, 0x00, 0x00, 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, 0x1F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD54_021D9704
+MOD54_021D9704: ; 0x021D9704
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x1E, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD54_021D9720
+MOD54_021D9720: ; 0x021D9720
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x1E, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD54_021D973C
+MOD54_021D973C: ; 0x021D973C
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x01, 0x00, 0x1F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD54_021D9758
+MOD54_021D9758: ; 0x021D9758
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x94, 0x1D, 0x02, 0x3D, 0x94, 0x1D, 0x02
- .byte 0x65, 0x94, 0x1D, 0x02, 0x7D, 0x94, 0x1D, 0x02, 0x89, 0x94, 0x1D, 0x02, 0xB5, 0x94, 0x1D, 0x02
- .byte 0xB5, 0x91, 0x1D, 0x02, 0x75, 0x92, 0x1D, 0x02, 0xD1, 0x94, 0x1D, 0x02, 0xBD, 0x91, 0x1D, 0x02
- .byte 0xAD, 0x92, 0x1D, 0x02, 0xE9, 0x94, 0x1D, 0x02, 0xAD, 0x91, 0x1D, 0x02, 0x39, 0x92, 0x1D, 0x02
- .byte 0x01, 0x95, 0x1D, 0x02, 0x35, 0xB9, 0x02, 0x02, 0x19, 0x95, 0x1D, 0x02, 0x21, 0x95, 0x1D, 0x02
- .byte 0xE1, 0xA1, 0x02, 0x02, 0x45, 0x95, 0x1D, 0x02, 0x6D, 0x95, 0x1D, 0x02
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .section .data
- ; 0x021D97E0
+ .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
+
+ .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
@@ -4408,3 +4454,5 @@ _021D9674: .word 0x021D9780
.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
+
+ .bss