module 21 fully shiftable

1 files changed, 28 insertions, 15 deletions

diff --git a/arm9/modules/21/asm/module_21.s b/arm9/modules/21/asm/module_21.s
index c54eab3e..d0a6eed9 100644
--- a/arm9/modules/21/asm/module_21.s
+++ b/arm9/modules/21/asm/module_21.s
@@ -94,7 +94,7 @@ _022548E6:
 	strb r0, [r5, #5]
 	mov r0, #8
 	str r0, [sp]
-	ldr r0, _02254914 ; =0x02254D80
+	ldr r0, _02254914 ; =MOD21_02254D80
 	mov r1, #1
 	add r3, r5, #0
 	bl MOD20_02254130
@@ -112,7 +112,7 @@ _0225490A:
 	pop {r3, r4, r5, pc}
 	nop
 _02254910: .word MOD21_02254974
-_02254914: .word 0x02254D80
+_02254914: .word MOD21_02254D80
 	thumb_func_end MOD21_0225489C
 
 	thumb_func_start MOD21_02254918
@@ -142,7 +142,7 @@ MOD21_02254930: ; 0x02254930
 	ldrb r1, [r4]
 	add r0, r4, #0
 	lsl r2, r1, #2
-	ldr r1, _02254968 ; =0x02254D84
+	ldr r1, _02254968 ; =MOD21_02254D84
 	ldr r1, [r1, r2]
 	blx r1
 	cmp r0, #0
@@ -156,7 +156,7 @@ MOD21_02254930: ; 0x02254930
 _02254966:
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_02254968: .word 0x02254D84
+_02254968: .word MOD21_02254D84
 	thumb_func_end MOD21_02254930
 
 	thumb_func_start MOD21_0225496C
@@ -412,13 +412,13 @@ MOD21_02254B10: ; 0x02254B10
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254B30 ; =0x02254DAC
+	ldr r0, _02254B30 ; =MOD21_02254DAC
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254B30: .word 0x02254DAC
+_02254B30: .word MOD21_02254DAC
 	thumb_func_end MOD21_02254B10
 
 	thumb_func_start MOD21_02254B34
@@ -460,7 +460,7 @@ MOD21_02254B60: ; 0x02254B60
 	bl MOD20_022538A0
 	add r5, r0, #0
 	ldr r0, [r5, #4]
-	ldr r2, _02254BE8 ; =0x02254D90
+	ldr r2, _02254BE8 ; =MOD21_02254D90
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
@@ -514,7 +514,7 @@ MOD21_02254B60: ; 0x02254B60
 	add sp, #0x14
 	pop {r4, r5, pc}
 	.align 2, 0
-_02254BE8: .word 0x02254D90
+_02254BE8: .word MOD21_02254D90
 _02254BEC: .word 0x04001000
 _02254BF0: .word 0xFFFFE0FF
 	thumb_func_end MOD21_02254B60
@@ -722,11 +722,24 @@ _02254D7C: .word 0x040002A8
 	thumb_func_end MOD21_02254C5C
 
 	.section .rodata
-	; 0x02254D80
-	.byte 0x10, 0xAF, 0x10, 0xCF, 0xA5, 0x49, 0x25, 0x02, 0xE5, 0x49, 0x25, 0x02, 0x39, 0x4A, 0x25, 0x02
+
+	.global MOD21_02254D80
+MOD21_02254D80: ; 0x02254D80
+	.byte 0x10, 0xAF, 0x10, 0xCF
+
+	.global MOD21_02254D84
+MOD21_02254D84: ; 0x02254D84
+	.word MOD21_022549A4, MOD21_022549E4, MOD21_02254A38
+
+	.global MOD21_02254D90
+MOD21_02254D90: ; 0x02254D90
 	.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 0x61, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xF5, 0x4B, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x15, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x03, 0x00, 0x00, 0x00, 0x41, 0x4C, 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 MOD21_02254DAC
+MOD21_02254DAC: ; 0x02254DAC
+	.word 0x00, MOD21_02254B60, 0x00
+	.word 0x01, MOD21_02254BF4, 0x00
+	.word 0x02, MOD21_02254C14, 0x00
+	.word 0x03, MOD21_02254C40, 0x00
+	.word 0x00, 0x00000000, 0x00