module 49 fully shiftable

1 files changed, 34 insertions, 16 deletions

diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s
index d829718b..a3ab2dcf 100644
--- a/arm9/modules/49/asm/module_49.s
+++ b/arm9/modules/49/asm/module_49.s
@@ -96,7 +96,7 @@ _022548D8:
 	strb r0, [r7, #2]
 	mov r0, #8
 	str r0, [sp]
-	ldr r0, _02254918 ; =0x02254CF0
+	ldr r0, _02254918 ; =MOD49_02254CF0
 	ldr r2, _0225491C ; =MOD49_0225497C
 	mov r1, #0xc
 	add r3, r7, #0
@@ -115,7 +115,7 @@ _02254912:
 	add sp, #0x10
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02254918: .word 0x02254CF0
+_02254918: .word MOD49_02254CF0
 _0225491C: .word MOD49_0225497C
 	thumb_func_end MOD49_0225489C
 
@@ -146,7 +146,7 @@ MOD49_02254938: ; 0x02254938
 	ldrb r1, [r4]
 	add r0, r4, #0
 	lsl r2, r1, #2
-	ldr r1, _02254970 ; =0x02254CE4
+	ldr r1, _02254970 ; =MOD49_02254CE4
 	ldr r1, [r1, r2]
 	blx r1
 	cmp r0, #0
@@ -160,7 +160,7 @@ MOD49_02254938: ; 0x02254938
 _0225496E:
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_02254970: .word 0x02254CE4
+_02254970: .word MOD49_02254CE4
 	thumb_func_end MOD49_02254938
 
 	thumb_func_start MOD49_02254974
@@ -342,13 +342,13 @@ MOD49_02254A84: ; 0x02254A84
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254AA4 ; =0x02254D3C
+	ldr r0, _02254AA4 ; =MOD49_02254D3C
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254AA4: .word 0x02254D3C
+_02254AA4: .word MOD49_02254D3C
 	thumb_func_end MOD49_02254A84
 
 	thumb_func_start MOD49_02254AA8
@@ -393,7 +393,7 @@ MOD49_02254AD4: ; 0x02254AD4
 	bl MOD20_022538A4
 	str r0, [sp, #0x14]
 	ldr r0, [r5, #4]
-	ldr r2, _02254BD0 ; =0x02254D20
+	ldr r2, _02254BD0 ; =MOD49_02254D20
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
@@ -492,7 +492,7 @@ _02254B94:
 	add sp, #0x2c
 	pop {r4, r5, r6, r7, pc}
 	nop
-_02254BD0: .word 0x02254D20
+_02254BD0: .word MOD49_02254D20
 _02254BD4: .word 0x00000197
 _02254BD8: .word 0x00010104
 _02254BDC: .word 0x04001000
@@ -541,7 +541,7 @@ MOD49_02254C04: ; 0x02254C04
 	add r0, r5, #0
 	str r0, [sp, #0x10]
 	add r0, #0x54
-	ldr r7, _02254CB4 ; =0x02254D60
+	ldr r7, _02254CB4 ; =MOD49_02254D60
 	str r4, [sp, #0xc]
 	str r0, [sp, #0x10]
 _02254C3E:
@@ -601,7 +601,7 @@ _02254C9C:
 	add sp, #0x14
 	pop {r4, r5, r6, r7, pc}
 	nop
-_02254CB4: .word 0x02254D60
+_02254CB4: .word MOD49_02254D60
 	thumb_func_end MOD49_02254C04
 
 	thumb_func_start MOD49_02254CB8
@@ -631,15 +631,33 @@ _02254CD0:
 	thumb_func_end MOD49_02254CB8
 
 	.section .rodata
-	; 0x02254CE4
-	.byte 0x99, 0x49, 0x25, 0x02, 0xD9, 0x49, 0x25, 0x02, 0x11, 0x4A, 0x25, 0x02, 0x7E, 0xA2, 0x90, 0xC0
+
+	.global MOD49_02254CE4
+MOD49_02254CE4: ; 0x02254CE4
+	.word MOD49_02254998, MOD49_022549D8, MOD49_02254A10
+
+	.global MOD49_02254CF0
+MOD49_02254CF0: ; 0x02254CF0
+	.byte 0x7E, 0xA2, 0x90, 0xC0
 	.byte 0x7E, 0xA2, 0x68, 0x98, 0x7E, 0xA2, 0x40, 0x70, 0x7E, 0xA2, 0x18, 0x48, 0x4E, 0x72, 0x90, 0xC0
 	.byte 0x4E, 0x72, 0x68, 0x98, 0x4E, 0x72, 0x40, 0x70, 0x4E, 0x72, 0x18, 0x48, 0x1E, 0x42, 0x90, 0xC0
-	.byte 0x1E, 0x42, 0x68, 0x98, 0x1E, 0x42, 0x40, 0x70, 0x1E, 0x42, 0x18, 0x48, 0x00, 0x00, 0x00, 0x00
+	.byte 0x1E, 0x42, 0x68, 0x98, 0x1E, 0x42, 0x40, 0x70, 0x1E, 0x42, 0x18, 0x48
+
+	.global MOD49_02254D20
+MOD49_02254D20: ; 0x02254D20
+	.byte 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
-	.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x4A, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xE5, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00
+	.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD49_02254D3C
+MOD49_02254D3C: ; 0x02254D3C
+	.word 0x00, MOD49_02254AD4, 0x00
+	.word 0x01, MOD49_02254BE4, 0x00
+	.word 0x00, 0x00000000, 0x00
+
+	.global MOD49_02254D60
+MOD49_02254D60: ; 0x02254D60
+	.byte 0x00, 0x00, 0x03, 0x00
 	.byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0C, 0x01, 0x00, 0x00, 0x00, 0x80, 0x05, 0x00
 	.byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0B, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0A, 0x01, 0x00, 0x00, 0x00, 0x80, 0x0A, 0x00