module 40 fully shiftable

1 files changed, 39 insertions, 20 deletions

diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s
index 02f648c8..e46b1f2a 100644
--- a/arm9/modules/40/asm/module_40.s
+++ b/arm9/modules/40/asm/module_40.s
@@ -87,7 +87,7 @@ MOD40_0225489C: ; 0x0225489C
 	strb r0, [r5, #2]
 	mov r0, #8
 	str r0, [sp]
-	ldr r0, _02254938 ; =0x02255328
+	ldr r0, _02254938 ; =MOD40_02255328
 	ldr r2, _0225493C ; =MOD40_02254990
 	mov r1, #6
 	add r3, r5, #0
@@ -123,7 +123,7 @@ _02254930:
 	add sp, #0xc
 	pop {r3, r4, r5, r6, pc}
 	nop
-_02254938: .word 0x02255328
+_02254938: .word MOD40_02255328
 _0225493C: .word MOD40_02254990
 	thumb_func_end MOD40_0225489C
 
@@ -193,7 +193,7 @@ MOD40_02254998: ; 0x02254998
 	ldrb r1, [r4]
 	add r0, r4, #0
 	lsl r2, r1, #2
-	ldr r1, _022549D0 ; =0x02255314
+	ldr r1, _022549D0 ; =MOD40_02255314
 	ldr r1, [r1, r2]
 	blx r1
 	cmp r0, #0
@@ -207,7 +207,7 @@ MOD40_02254998: ; 0x02254998
 _022549CE:
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_022549D0: .word 0x02255314
+_022549D0: .word MOD40_02255314
 	thumb_func_end MOD40_02254998
 
 	thumb_func_start MOD40_022549D4
@@ -806,7 +806,7 @@ MOD40_02254DBC: ; 0x02254DBC
 	add r0, r5, #0
 	str r0, [sp, #0x10]
 	add r0, #0x7c
-	ldr r7, _02254EE0 ; =0x022553B0
+	ldr r7, _02254EE0 ; =MOD40_022553B0
 	mov r4, #0
 	add r6, r5, #0
 	str r0, [sp, #0x10]
@@ -890,7 +890,7 @@ _02254EB2:
 	add sp, #0x18
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
-_02254EE0: .word 0x022553B0
+_02254EE0: .word MOD40_022553B0
 	thumb_func_end MOD40_02254DBC
 
 	thumb_func_start MOD40_02254EE4
@@ -999,13 +999,13 @@ MOD40_02254F98: ; 0x02254F98
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254FB8 ; =0x0225535C
+	ldr r0, _02254FB8 ; =MOD40_0225535C
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254FB8: .word 0x0225535C
+_02254FB8: .word MOD40_0225535C
 	thumb_func_end MOD40_02254F98
 
 	thumb_func_start MOD40_02254FBC
@@ -1047,7 +1047,7 @@ MOD40_02254FE8: ; 0x02254FE8
 	bl MOD20_022538A0
 	add r5, r0, #0
 	ldr r0, [r5, #4]
-	ldr r2, _0225506C ; =0x02255340
+	ldr r2, _0225506C ; =MOD40_02255340
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
@@ -1099,7 +1099,7 @@ MOD40_02254FE8: ; 0x02254FE8
 	add sp, #0x14
 	pop {r4, r5, pc}
 	nop
-_0225506C: .word 0x02255340
+_0225506C: .word MOD40_02255340
 _02255070: .word 0x04001000
 _02255074: .word 0xFFFFE0FF
 	thumb_func_end MOD40_02254FE8
@@ -1410,17 +1410,36 @@ MOD40_0225530C: ; 0x0225530C
 	thumb_func_end MOD40_0225530C
 
 	.section .rodata
-	; 0x02255314
-	.byte 0xF1, 0x49, 0x25, 0x02, 0x41, 0x4A, 0x25, 0x02, 0x51, 0x4B, 0x25, 0x02, 0x1D, 0x4C, 0x25, 0x02
-	.byte 0x19, 0x4D, 0x25, 0x02, 0x48, 0x68, 0xB0, 0xD0, 0x68, 0x88, 0xB0, 0xD0, 0x70, 0x80, 0x40, 0x50
-	.byte 0xA0, 0xB0, 0x40, 0x50, 0x70, 0x80, 0x70, 0x80, 0xA0, 0xB0, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD40_02255314
+MOD40_02255314: ; 0x02255314
+	.word MOD40_022549F0, MOD40_02254A40, MOD40_02254B50, MOD40_02254C1C
+	.word MOD40_02254D18
+
+	.global MOD40_02255328
+MOD40_02255328: ; 0x02255328
+	.byte 0x48, 0x68, 0xB0, 0xD0, 0x68, 0x88, 0xB0, 0xD0, 0x70, 0x80, 0x40, 0x50
+	.byte 0xA0, 0xB0, 0x40, 0x50, 0x70, 0x80, 0x70, 0x80, 0xA0, 0xB0, 0x70, 0x80
+
+	.global MOD40_02255340
+MOD40_02255340: ; 0x02255340
+	.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, 0xE9, 0x4F, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x79, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x02, 0x00, 0x00, 0x00, 0xC1, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-	.byte 0x3D, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xB9, 0x51, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xF9, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00
+	.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD40_0225535C
+MOD40_0225535C: ; 0x0225535C
+	.word 0x00, MOD40_02254FE8, 0x00
+	.word 0x01, MOD40_02255078, 0x00
+	.word 0x02, MOD40_022550C0, 0x00
+	.word 0x03, MOD40_0225513C, 0x00
+	.word 0x04, MOD40_022551B8, 0x00
+	.word 0x05, MOD40_022551F8, 0x00
+	.word 0x00, 0x00000000, 0x00
+
+	.global MOD40_022553B0
+MOD40_022553B0: ; 0x022553B0
+	.byte 0x00, 0x00, 0x0C, 0x00
 	.byte 0x00, 0x80, 0x06, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00
 	.byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00
 	.byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00