module 44 fully shiftable

1 files changed, 29 insertions, 15 deletions

diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/module_44.s
index dfb28de6..bcee6542 100644
--- a/arm9/modules/44/asm/module_44.s
+++ b/arm9/modules/44/asm/module_44.s
@@ -105,7 +105,7 @@ MOD44_022548EC: ; 0x022548EC
 	cmp r1, #3
 	bhs _02254918
 	lsl r2, r1, #2
-	ldr r1, _0225491C ; =0x02254C54
+	ldr r1, _0225491C ; =MOD44_02254C54
 	add r0, r4, #0
 	ldr r1, [r1, r2]
 	blx r1
@@ -120,7 +120,7 @@ MOD44_022548EC: ; 0x022548EC
 _02254918:
 	pop {r3, r4, r5, pc}
 	nop
-_0225491C: .word 0x02254C54
+_0225491C: .word MOD44_02254C54
 	thumb_func_end MOD44_022548EC
 
 	thumb_func_start MOD44_02254920
@@ -357,7 +357,7 @@ MOD44_02254A90: ; 0x02254A90
 	bl MOD20_02253FBC
 	add r2, r5, #0
 	ldr r0, [r5, #0x20]
-	ldr r1, _02254AE0 ; =0x02254C60
+	ldr r1, _02254AE0 ; =MOD44_02254C60
 	add r2, #0x28
 	bl MOD20_02253E74
 	str r0, [r5, #0x24]
@@ -371,7 +371,7 @@ MOD44_02254A90: ; 0x02254A90
 	add sp, #0xc
 	pop {r4, r5, pc}
 	.align 2, 0
-_02254AE0: .word 0x02254C60
+_02254AE0: .word MOD44_02254C60
 	thumb_func_end MOD44_02254A90
 
 	thumb_func_start MOD44_02254AE4
@@ -415,13 +415,13 @@ MOD44_02254B14: ; 0x02254B14
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254B34 ; =0x02254C8C
+	ldr r0, _02254B34 ; =MOD44_02254C8C
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254B34: .word 0x02254C8C
+_02254B34: .word MOD44_02254C8C
 	thumb_func_end MOD44_02254B14
 
 	thumb_func_start MOD44_02254B38
@@ -465,7 +465,7 @@ MOD44_02254B64: ; 0x02254B64
 	add r0, r4, #0
 	bl MOD20_022538A4
 	ldr r0, [r5, #4]
-	ldr r2, _02254BEC ; =0x02254C70
+	ldr r2, _02254BEC ; =MOD44_02254C70
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
@@ -517,7 +517,7 @@ MOD44_02254B64: ; 0x02254B64
 	add sp, #0x14
 	pop {r4, r5, pc}
 	.align 2, 0
-_02254BEC: .word 0x02254C70
+_02254BEC: .word MOD44_02254C70
 _02254BF0: .word 0x04001000
 _02254BF4: .word 0xFFFFE0FF
 	thumb_func_end MOD44_02254B64
@@ -568,11 +568,25 @@ _02254C50: .word 0x00000663
 	thumb_func_end MOD44_02254C14
 
 	.section .rodata
-	; 0x02254C54
-	.byte 0x3D, 0x49, 0x25, 0x02, 0x7D, 0x49, 0x25, 0x02, 0x21, 0x4A, 0x25, 0x02, 0x00, 0x80, 0x03, 0x00
-	.byte 0x00, 0x40, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD44_02254C54
+MOD44_02254C54: ; 0x02254C54
+	.word MOD44_0225493C, MOD44_0225497C, MOD44_02254A20
+
+	.global MOD44_02254C60
+MOD44_02254C60: ; 0x02254C60
+	.byte 0x00, 0x80, 0x03, 0x00
+	.byte 0x00, 0x40, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD44_02254C70
+MOD44_02254C70: ; 0x02254C70
+	.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, 0x65, 0x4B, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xF9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x02, 0x00, 0x00, 0x00, 0x15, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD44_02254C8C
+MOD44_02254C8C: ; 0x02254C8C
+	.word 0x00, MOD44_02254B64, 0x00
+	.word 0x01, MOD44_02254BF8, 0x00
+	.word 0x02, MOD44_02254C14, 0x00
+	.word 0x00, 0x00000000, 0x00