module 47 fully shiftable

1 files changed, 60 insertions, 25 deletions

diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s
index 63e10ef6..752a92ca 100644
--- a/arm9/modules/47/asm/module_47.s
+++ b/arm9/modules/47/asm/module_47.s
@@ -105,7 +105,7 @@ MOD47_022548E0: ; 0x022548E0
 	ldrb r1, [r4]
 	add r0, r4, #0
 	lsl r2, r1, #2
-	ldr r1, _02254918 ; =0x022553B8
+	ldr r1, _02254918 ; =MOD47_022553B8
 	ldr r1, [r1, r2]
 	blx r1
 	cmp r0, #0
@@ -119,7 +119,7 @@ MOD47_022548E0: ; 0x022548E0
 _02254914:
 	pop {r3, r4, r5, pc}
 	nop
-_02254918: .word 0x022553B8
+_02254918: .word MOD47_022553B8
 	thumb_func_end MOD47_022548E0
 
 	thumb_func_start MOD47_0225491C
@@ -543,7 +543,7 @@ MOD47_02254C1C: ; 0x02254C1C
 	sub sp, #8
 	add r7, r0, #0
 	mov r0, #0
-	ldr r5, _02254C68 ; =0x022553D0
+	ldr r5, _02254C68 ; =MOD47_022553D0
 	str r0, [sp]
 	str r0, [sp, #4]
 _02254C2A:
@@ -580,7 +580,7 @@ _02254C52:
 	add sp, #8
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
-_02254C68: .word 0x022553D0
+_02254C68: .word MOD47_022553D0
 	thumb_func_end MOD47_02254C1C
 
 	thumb_func_start MOD47_02254C6C
@@ -773,7 +773,7 @@ MOD47_02254D8C: ; 0x02254D8C
 	add r0, r6, #0
 	str r0, [sp, #0xc]
 	add r0, #0x44
-	ldr r4, _02254DF8 ; =0x02255410
+	ldr r4, _02254DF8 ; =MOD47_02255410
 	mov r7, #0
 	add r5, r6, #0
 	str r0, [sp, #0xc]
@@ -800,7 +800,7 @@ _02254DC6:
 	add sp, #0x10
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02254DF8: .word 0x02255410
+_02254DF8: .word MOD47_02255410
 	thumb_func_end MOD47_02254D8C
 
 	thumb_func_start MOD47_02254DFC
@@ -838,13 +838,13 @@ MOD47_02254E24: ; 0x02254E24
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254E44 ; =0x02255450
+	ldr r0, _02254E44 ; =MOD47_02255450
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254E44: .word 0x02255450
+_02254E44: .word MOD47_02255450
 	thumb_func_end MOD47_02254E24
 
 	thumb_func_start MOD47_02254E48
@@ -886,7 +886,7 @@ MOD47_02254E74: ; 0x02254E74
 	bl MOD20_022538A0
 	add r5, r0, #0
 	ldr r0, [r5, #4]
-	ldr r2, _02254F28 ; =0x022553F4
+	ldr r2, _02254F28 ; =MOD47_022553F4
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
@@ -960,7 +960,7 @@ MOD47_02254E74: ; 0x02254E74
 	add sp, #0x18
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_02254F28: .word 0x022553F4
+_02254F28: .word MOD47_022553F4
 _02254F2C: .word 0x04001000
 _02254F30: .word 0xFFFFE0FF
 	thumb_func_end MOD47_02254E74
@@ -1481,26 +1481,61 @@ _0225532C:
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
 _02255398: .word 0x00010104
-_0225539C: .word 0x022553F0
+_0225539C: .word MOD47_022553F0
 	thumb_func_end MOD47_022552D8
 
 	.section .rodata
-	; 0x022553A0
-	.byte 0x0A, 0x00, 0x00, 0x00, 0x09, 0x0D, 0x07, 0x12, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00
-	.byte 0x00, 0x06, 0x08, 0x0B, 0x0C, 0x0E, 0x00, 0x00, 0x39, 0x49, 0x25, 0x02, 0x79, 0x49, 0x25, 0x02
-	.byte 0xE5, 0x49, 0x25, 0x02, 0xD5, 0x4A, 0x25, 0x02, 0x39, 0x4B, 0x25, 0x02, 0x89, 0x4B, 0x25, 0x02
-	.byte 0xA4, 0x53, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00, 0xA0, 0x53, 0x25, 0x02, 0x01, 0x00, 0x00, 0x00
-	.byte 0xA8, 0x53, 0x25, 0x02, 0x05, 0x00, 0x00, 0x00, 0xB0, 0x53, 0x25, 0x02, 0x06, 0x00, 0x00, 0x00
-	.byte 0x06, 0x07, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.global MOD47_022553A0
+MOD47_022553A0: ; 0x022553A0
+	.byte 0x0A, 0x00, 0x00, 0x00
+
+	.global MOD47_022553A4
+MOD47_022553A4: ; 0x022553A4
+	.byte 0x09, 0x0D, 0x07, 0x12
+
+	.global MOD47_022553A8
+MOD47_022553A8: ; 0x022553A8
+	.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00
+
+	.global MOD47_022553B0
+MOD47_022553B0: ; 0x022553B0
+	.byte 0x00, 0x06, 0x08, 0x0B, 0x0C, 0x0E, 0x00, 0x00
+
+	.global MOD47_022553B8
+MOD47_022553B8: ; 0x022553B8
+	.word MOD47_02254938, MOD47_02254978, MOD47_022549E4, MOD47_02254AD4
+	.word MOD47_02254B38, MOD47_02254B88
+
+	.global MOD47_022553D0
+MOD47_022553D0: ; 0x022553D0
+	.word MOD47_022553A4, 0x00000004, MOD47_022553A0, 0x00000001
+	.word MOD47_022553A8, 0x00000005, MOD47_022553B0, 0x00000006
+
+	.global MOD47_022553F0
+MOD47_022553F0: ; 0x022553F0
+	.byte 0x06, 0x07, 0x08, 0x09
+
+	.global MOD47_022553F4
+MOD47_022553F4: ; 0x022553F4
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD47_02255410
+MOD47_02255410: ; 0x02255410
 	.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x09, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x06, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x06, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x75, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-	.byte 0x35, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x59, 0x4F, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x9D, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x04, 0x00, 0x00, 0x00, 0xE9, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
-	.byte 0x35, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x81, 0x50, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD9, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD47_02255450
+MOD47_02255450: ; 0x02255450
+	.word 0x00, MOD47_02254E74, 0x00
+	.word 0x01, MOD47_02254F34, 0x00
+	.word 0x02, MOD47_02254F58, 0x00
+	.word 0x03, MOD47_02254F9C, 0x00
+	.word 0x04, MOD47_02254FE8, 0x00
+	.word 0x05, MOD47_02255034, 0x00
+	.word 0x06, MOD47_02255080, 0x00
+	.word 0x07, MOD47_022550D8, 0x00
+	.word 0x00, 0x00000000, 0x00