module 24 fully shiftable

1 files changed, 49 insertions, 24 deletions

diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s
index 8ec9903c..ccf6c969 100644
--- a/arm9/modules/24/asm/module_24.s
+++ b/arm9/modules/24/asm/module_24.s
@@ -92,7 +92,7 @@ _022548E0:
 	pop {r3, r4, r5, pc}
 	.align 2, 0
 _022548E4: .word 0x000016F0
-_022548E8: .word 0x022550F8
+_022548E8: .word MOD24_022550F8
 _022548EC: .word MOD24_02254960
 _022548F0: .word 0x000016FC
 	thumb_func_end MOD24_0225489C
@@ -131,7 +131,7 @@ MOD24_02254918: ; 0x02254918
 	ldrb r1, [r4]
 	add r0, r4, #0
 	lsl r2, r1, #2
-	ldr r1, _0225495C ; =0x02255100
+	ldr r1, _0225495C ; =MOD24_02255100
 	ldr r1, [r1, r2]
 	blx r1
 	cmp r0, #0
@@ -147,7 +147,7 @@ _02254954:
 	pop {r3, r4, r5, pc}
 	nop
 _02254958: .word 0x000016F8
-_0225495C: .word 0x02255100
+_0225495C: .word MOD24_02255100
 	thumb_func_end MOD24_02254918
 
 	thumb_func_start MOD24_02254960
@@ -679,7 +679,7 @@ MOD24_02254D00: ; 0x02254D00
 	add r1, r0, #0
 	beq _02254D3C
 	ldr r0, [r4, #4]
-	ldr r2, _02254D40 ; =0x0225510C
+	ldr r2, _02254D40 ; =MOD24_0225510C
 	bl FUN_02019150
 	mov r2, #0xbe
 	ldr r1, [r4]
@@ -701,7 +701,7 @@ _02254D3C:
 	mov r0, #0
 	pop {r4, pc}
 	.align 2, 0
-_02254D40: .word 0x0225510C
+_02254D40: .word MOD24_0225510C
 _02254D44: .word 0x000016E8
 	thumb_func_end MOD24_02254D00
 
@@ -750,13 +750,13 @@ MOD24_02254D8C: ; 0x02254D8C
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254DAC ; =0x0225516C
+	ldr r0, _02254DAC ; =MOD24_0225516C
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254DAC: .word 0x0225516C
+_02254DAC: .word MOD24_0225516C
 	thumb_func_end MOD24_02254D8C
 
 	thumb_func_start MOD24_02254DB0
@@ -804,12 +804,12 @@ _02254DF0:
 	bl MOD20_022538A0
 	add r5, r0, #0
 	ldr r0, [r5, #4]
-	ldr r2, _02254ED0 ; =0x02255114
+	ldr r2, _02254ED0 ; =MOD24_02255114
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
 	ldr r0, [r5, #4]
-	ldr r2, _02254ED4 ; =0x02255130
+	ldr r2, _02254ED4 ; =MOD24_02255130
 	mov r1, #7
 	mov r3, #0
 	bl FUN_02016C18
@@ -897,8 +897,8 @@ _02254ECC:
 	add sp, #0x14
 	pop {r4, r5, pc}
 	.align 2, 0
-_02254ED0: .word 0x02255114
-_02254ED4: .word 0x02255130
+_02254ED0: .word MOD24_02255114
+_02254ED4: .word MOD24_02255130
 _02254ED8: .word 0x04001000
 _02254EDC: .word 0xFFFFE0FF
 	thumb_func_end MOD24_02254DDC
@@ -1136,7 +1136,7 @@ MOD24_02255078: ; 0x02255078
 	add r0, r7, #0
 	str r0, [sp, #0xc]
 	add r0, #0x54
-	ldr r4, _022550D0 ; =0x0225514C
+	ldr r4, _022550D0 ; =MOD24_0225514C
 	mov r6, #0
 	add r5, r7, #0
 	str r0, [sp, #0xc]
@@ -1155,7 +1155,7 @@ _022550CC:
 	add sp, #0x10
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_022550D0: .word 0x0225514C
+_022550D0: .word MOD24_0225514C
 	thumb_func_end MOD24_02255078
 
 	thumb_func_start MOD24_022550D4
@@ -1180,20 +1180,45 @@ _022550DC:
 	thumb_func_end MOD24_022550D4
 
 	.section .rodata
-	; 0x022550F8
-	.byte 0x18, 0x58, 0xB4, 0xCC, 0x68, 0xA8, 0xB4, 0xCC, 0xAD, 0x49, 0x25, 0x02, 0xF9, 0x49, 0x25, 0x02
-	.byte 0x65, 0x4C, 0x25, 0x02, 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00
+	.global MOD24_022550F8
+MOD24_022550F8: ; 0x022550F8
+	.byte 0x18, 0x58, 0xB4, 0xCC, 0x68, 0xA8, 0xB4, 0xCC
+
+	.global MOD24_02255100
+MOD24_02255100: ; 0x02255100
+	.word MOD24_022549AC, MOD24_022549F8, MOD24_02254C64
+
+	.global MOD24_0225510C
+MOD24_0225510C: ; 0x0225510C
+	.byte 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x0C, 0x00
+
+	.global MOD24_02255114
+MOD24_02255114: ; 0x02255114
+	.byte 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00
-	.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD24_02255130
+MOD24_02255130: ; 0x02255130
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02
+	.byte 0x00, 0x00, 0x00, 0x00
+
+	.global MOD24_0225514C
+MOD24_0225514C: ; 0x0225514C
+	.byte 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x08, 0x00, 0x03, 0x00, 0x00, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDD, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x01, 0x00, 0x00, 0x00, 0xE1, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-	.byte 0x29, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x41, 0x4F, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x39, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x05, 0x00, 0x00, 0x00, 0x51, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00
+
+	.global MOD24_0225516C
+MOD24_0225516C: ; 0x0225516C
+	.word 0x00, MOD24_02254DDC, 0x00
+	.word 0x01, MOD24_02254EE0, 0x00
+	.word 0x02, MOD24_02254F28, 0x00
+	.word 0x03, MOD24_02254F40, 0x00
+	.word 0x04, MOD24_02255038, 0x00
+	.word 0x05, MOD24_02255050, 0x00
+	.word 0x00, 0x00000000, 0x00
 
 	.section .sinit
 	.word MOD24_02254840