module 34 fully shiftable

1 files changed, 35 insertions, 18 deletions

diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s
index d53be79b..57e2aa5b 100644
--- a/arm9/modules/34/asm/module_34.s
+++ b/arm9/modules/34/asm/module_34.s
@@ -69,7 +69,7 @@ MOD34_0225489C: ; 0x0225489C
 	str r4, [r5, #0x28]
 	mov r0, #8
 	str r0, [sp]
-	ldr r0, _022548E0 ; =0x02254C7C
+	ldr r0, _022548E0 ; =MOD34_02254C7C
 	ldr r2, _022548E4 ; =MOD34_02254904
 	mov r1, #6
 	add r3, r5, #0
@@ -89,7 +89,7 @@ _022548DC:
 	mov r0, #0
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_022548E0: .word 0x02254C7C
+_022548E0: .word MOD34_02254C7C
 _022548E4: .word MOD34_02254904
 	thumb_func_end MOD34_0225489C
 
@@ -131,7 +131,7 @@ MOD34_0225490C: ; 0x0225490C
 	ldrb r1, [r4]
 	add r0, r4, #0
 	lsl r2, r1, #2
-	ldr r1, _02254944 ; =0x02254C70
+	ldr r1, _02254944 ; =MOD34_02254C70
 	ldr r1, [r1, r2]
 	blx r1
 	cmp r0, #0
@@ -145,7 +145,7 @@ MOD34_0225490C: ; 0x0225490C
 _02254942:
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_02254944: .word 0x02254C70
+_02254944: .word MOD34_02254C70
 	thumb_func_end MOD34_0225490C
 
 	thumb_func_start MOD34_02254948
@@ -353,13 +353,13 @@ MOD34_02254A98: ; 0x02254A98
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254AB8 ; =0x02254CBC
+	ldr r0, _02254AB8 ; =MOD34_02254CBC
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254AB8: .word 0x02254CBC
+_02254AB8: .word MOD34_02254CBC
 	thumb_func_end MOD34_02254A98
 
 	thumb_func_start MOD34_02254ABC
@@ -404,7 +404,7 @@ MOD34_02254AE8: ; 0x02254AE8
 	bl MOD20_022538A4
 	add r5, r0, #0
 	ldr r0, [r6, #4]
-	ldr r2, _02254B8C ; =0x02254CA0
+	ldr r2, _02254B8C ; =MOD34_02254CA0
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
@@ -469,7 +469,7 @@ _02254B4A:
 	add sp, #0x18
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02254B8C: .word 0x02254CA0
+_02254B8C: .word MOD34_02254CA0
 _02254B90: .word 0x04001000
 _02254B94: .word 0xFFFFE0FF
 	thumb_func_end MOD34_02254AE8
@@ -548,7 +548,7 @@ MOD34_02254C1C: ; 0x02254C1C
 	add r4, r2, #0
 	add r6, r3, #0
 	bl FUN_0201886C
-	ldr r1, _02254C6C ; =0x02254C94
+	ldr r1, _02254C6C ; =MOD34_02254C94
 	lsl r2, r5, #1
 	ldrh r1, [r1, r2]
 	lsl r1, r1, #1
@@ -585,17 +585,34 @@ _02254C54:
 	blt _02254C50
 	pop {r4, r5, r6, pc}
 	nop
-_02254C6C: .word 0x02254C94
+_02254C6C: .word MOD34_02254C94
 	thumb_func_end MOD34_02254C1C
 
 	.section .rodata
-	; 0x02254C70
-	.byte 0x65, 0x49, 0x25, 0x02, 0xA5, 0x49, 0x25, 0x02, 0x29, 0x4A, 0x25, 0x02, 0x10, 0x40, 0x10, 0x40
+
+	.global MOD34_02254C70
+MOD34_02254C70: ; 0x02254C70
+	.word MOD34_02254964, MOD34_022549A4, MOD34_02254A28
+
+	.global MOD34_02254C7C
+MOD34_02254C7C: ; 0x02254C7C
+	.byte 0x10, 0x40, 0x10, 0x40
 	.byte 0x10, 0x40, 0xA0, 0xD0, 0x48, 0x78, 0x10, 0x40, 0x48, 0x78, 0xA0, 0xD0, 0x80, 0xB0, 0x10, 0x40
-	.byte 0x80, 0xB0, 0xA0, 0xD0, 0x42, 0x00, 0x54, 0x00, 0x22, 0x01, 0x34, 0x01, 0x02, 0x02, 0x14, 0x02
+	.byte 0x80, 0xB0, 0xA0, 0xD0
+
+	.global MOD34_02254C94
+MOD34_02254C94: ; 0x02254C94
+	.byte 0x42, 0x00, 0x54, 0x00, 0x22, 0x01, 0x34, 0x01, 0x02, 0x02, 0x14, 0x02
+
+	.global MOD34_02254CA0
+MOD34_02254CA0: ; 0x02254CA0
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0xE9, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x99, 0x4B, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xB5, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x03, 0x00, 0x00, 0x00, 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD34_02254CBC
+MOD34_02254CBC: ; 0x02254CBC
+	.word 0x00, MOD34_02254AE8, 0x00
+	.word 0x01, MOD34_02254B98, 0x00
+	.word 0x02, MOD34_02254BB4, 0x00
+	.word 0x03, MOD34_02254BE8, 0x00
+	.word 0x00, 0x00000000, 0x00