module 32 fully shiftable

1 files changed, 34 insertions, 17 deletions

diff --git a/arm9/modules/32/asm/module_32.s b/arm9/modules/32/asm/module_32.s
index 5a5feeea..6b884f10 100644
--- a/arm9/modules/32/asm/module_32.s
+++ b/arm9/modules/32/asm/module_32.s
@@ -84,7 +84,7 @@ _022548BA:
 	strb r0, [r5, #2]
 	mov r0, #8
 	str r0, [sp]
-	ldr r0, _022548F8 ; =0x02254C54
+	ldr r0, _022548F8 ; =MOD32_02254C54
 	ldr r2, _022548FC ; =MOD32_02254918
 	mov r1, #2
 	add r3, r5, #0
@@ -101,7 +101,7 @@ _022548F2:
 	add sp, #8
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_022548F8: .word 0x02254C54
+_022548F8: .word MOD32_02254C54
 _022548FC: .word MOD32_02254918
 	thumb_func_end MOD32_0225489C
 
@@ -140,7 +140,7 @@ MOD32_02254920: ; 0x02254920
 	ldrb r1, [r4]
 	add r0, r4, #0
 	lsl r2, r1, #2
-	ldr r1, _02254958 ; =0x02254C5C
+	ldr r1, _02254958 ; =MOD32_02254C5C
 	ldr r1, [r1, r2]
 	blx r1
 	cmp r0, #0
@@ -154,7 +154,7 @@ MOD32_02254920: ; 0x02254920
 _02254956:
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_02254958: .word 0x02254C5C
+_02254958: .word MOD32_02254C5C
 	thumb_func_end MOD32_02254920
 
 	thumb_func_start MOD32_0225495C
@@ -372,7 +372,7 @@ MOD32_02254A9C: ; 0x02254A9C
 	bl MOD20_02253FBC
 	add r2, r5, #0
 	ldr r0, [r5, #0x20]
-	ldr r1, _02254AEC ; =0x02254C68
+	ldr r1, _02254AEC ; =MOD32_02254C68
 	add r2, #0x28
 	bl MOD20_02253E74
 	str r0, [r5, #0x24]
@@ -386,7 +386,7 @@ _02254AE6:
 	add sp, #0xc
 	pop {r4, r5, pc}
 	nop
-_02254AEC: .word 0x02254C68
+_02254AEC: .word MOD32_02254C68
 	thumb_func_end MOD32_02254A9C
 
 	thumb_func_start MOD32_02254AF0
@@ -414,13 +414,13 @@ MOD32_02254B08: ; 0x02254B08
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254B28 ; =0x02254C94
+	ldr r0, _02254B28 ; =MOD32_02254C94
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254B28: .word 0x02254C94
+_02254B28: .word MOD32_02254C94
 	thumb_func_end MOD32_02254B08
 
 	thumb_func_start MOD32_02254B2C
@@ -462,7 +462,7 @@ MOD32_02254B58: ; 0x02254B58
 	bl MOD20_022538A0
 	add r5, r0, #0
 	ldr r0, [r5, #4]
-	ldr r2, _02254BDC ; =0x02254C78
+	ldr r2, _02254BDC ; =MOD32_02254C78
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
@@ -514,7 +514,7 @@ MOD32_02254B58: ; 0x02254B58
 	add sp, #0x14
 	pop {r4, r5, pc}
 	nop
-_02254BDC: .word 0x02254C78
+_02254BDC: .word MOD32_02254C78
 _02254BE0: .word 0x04001000
 _02254BE4: .word 0xFFFFE0FF
 	thumb_func_end MOD32_02254B58
@@ -572,11 +572,28 @@ _02254C50: .word 0x00000663
 	thumb_func_end MOD32_02254C08
 
 	.section .rodata
-	; 0x02254C54
-	.byte 0x48, 0x68, 0x5C, 0x84, 0x68, 0x88, 0x5C, 0x84, 0x79, 0x49, 0x25, 0x02, 0xB9, 0x49, 0x25, 0x02
-	.byte 0x21, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.global MOD32_02254C54
+MOD32_02254C54: ; 0x02254C54
+	.byte 0x48, 0x68, 0x5C, 0x84, 0x68, 0x88, 0x5C, 0x84
+
+	.global MOD32_02254C5C
+MOD32_02254C5C: ; 0x02254C5C
+	.word MOD32_02254978, MOD32_022549B8, MOD32_02254A20
+
+	.global MOD32_02254C68
+MOD32_02254C68: ; 0x02254C68
+	.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02
+	.byte 0x00, 0x00, 0x00, 0x00
+
+	.global MOD32_02254C78
+MOD32_02254C78: ; 0x02254C78
+	.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
-	.byte 0x00, 0x00, 0x00, 0x00, 0x59, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-	.byte 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD32_02254C94
+MOD32_02254C94: ; 0x02254C94
+	.word 0x00, MOD32_02254B58, 0x00
+	.word 0x01, MOD32_02254BE8, 0x00
+	.word 0x02, MOD32_02254C08, 0x00
+	.word 0x00, 0x00000000, 0x00