module 38 fully shiftable

1 files changed, 58 insertions, 28 deletions

diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s
index 46391ca3..59871d4a 100644
--- a/arm9/modules/38/asm/module_38.s
+++ b/arm9/modules/38/asm/module_38.s
@@ -85,7 +85,7 @@ _022548C0:
 	strb r0, [r5, #2]
 	mov r0, #8
 	str r0, [sp]
-	ldr r0, _02254900 ; =0x0225511C
+	ldr r0, _02254900 ; =MOD38_0225511C
 	ldr r2, _02254904 ; =MOD38_02254988
 	mov r1, #6
 	add r3, r5, #0
@@ -102,7 +102,7 @@ _022548F8:
 	add sp, #4
 	pop {r3, r4, r5, r6, pc}
 	nop
-_02254900: .word 0x0225511C
+_02254900: .word MOD38_0225511C
 _02254904: .word MOD38_02254988
 	thumb_func_end MOD38_0225489C
 
@@ -157,7 +157,7 @@ MOD38_0225494C: ; 0x0225494C
 	ldrb r1, [r4]
 	add r0, r4, #0
 	lsl r2, r1, #2
-	ldr r1, _02254984 ; =0x02255110
+	ldr r1, _02254984 ; =MOD38_02255110
 	ldr r1, [r1, r2]
 	blx r1
 	cmp r0, #0
@@ -171,7 +171,7 @@ MOD38_0225494C: ; 0x0225494C
 _02254982:
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_02254984: .word 0x02255110
+_02254984: .word MOD38_02255110
 	thumb_func_end MOD38_0225494C
 
 	thumb_func_start MOD38_02254988
@@ -414,7 +414,7 @@ _02254B26:
 	thumb_func_start MOD38_02254B2C
 MOD38_02254B2C: ; 0x02254B2C
 	push {r4, r5}
-	ldr r5, _02254B68 ; =0x02255134
+	ldr r5, _02254B68 ; =MOD38_02255134
 	mov r3, #0x12
 	add r4, r0, #0
 	mul r4, r3
@@ -447,13 +447,13 @@ _02254B64:
 	pop {r4, r5}
 	bx lr
 	.align 2, 0
-_02254B68: .word 0x02255134
+_02254B68: .word MOD38_02255134
 	thumb_func_end MOD38_02254B2C
 
 	thumb_func_start MOD38_02254B6C
 MOD38_02254B6C: ; 0x02254B6C
 	push {r4, r5}
-	ldr r5, _02254BC0 ; =0x02255278
+	ldr r5, _02254BC0 ; =MOD38_02255278
 	mov r4, #0
 _02254B72:
 	ldrb r3, [r5]
@@ -497,12 +497,12 @@ _02254BA6:
 _02254BB4:
 	mov r4, #0x10
 _02254BB6:
-	ldr r0, _02254BC0 ; =0x02255278
+	ldr r0, _02254BC0 ; =MOD38_02255278
 	ldrb r0, [r0, r4]
 	pop {r4, r5}
 	bx lr
 	nop
-_02254BC0: .word 0x02255278
+_02254BC0: .word MOD38_02255278
 	thumb_func_end MOD38_02254B6C
 
 	thumb_func_start MOD38_02254BC4
@@ -583,7 +583,7 @@ MOD38_02254C38: ; 0x02254C38
 	add r0, r6, #0
 	str r0, [sp, #0xc]
 	add r0, #0x60
-	ldr r4, _02254CBC ; =0x02255300
+	ldr r4, _02254CBC ; =MOD38_02255300
 	mov r7, #0
 	add r5, r6, #0
 	str r0, [sp, #0xc]
@@ -607,7 +607,7 @@ _02254C72:
 	str r0, [sp, #0x10]
 _02254C96:
 	ldr r0, [r6, #0x30]
-	ldr r1, _02254CC0 ; =0x0225528C
+	ldr r1, _02254CC0 ; =MOD38_0225528C
 	ldr r2, [sp, #0x10]
 	bl MOD20_02253E74
 	mov r2, #3
@@ -623,8 +623,8 @@ _02254C96:
 	add sp, #0x14
 	pop {r4, r5, r6, r7, pc}
 	nop
-_02254CBC: .word 0x02255300
-_02254CC0: .word 0x0225528C
+_02254CBC: .word MOD38_02255300
+_02254CC0: .word MOD38_0225528C
 	thumb_func_end MOD38_02254C38
 
 	thumb_func_start MOD38_02254CC4
@@ -699,13 +699,13 @@ MOD38_02254D34: ; 0x02254D34
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254D54 ; =0x022552B8
+	ldr r0, _02254D54 ; =MOD38_022552B8
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254D54: .word 0x022552B8
+_02254D54: .word MOD38_022552B8
 	thumb_func_end MOD38_02254D34
 
 	thumb_func_start MOD38_02254D58
@@ -750,7 +750,7 @@ MOD38_02254D84: ; 0x02254D84
 	bl MOD20_022538A4
 	add r7, r0, #0
 	ldr r0, [r5, #4]
-	ldr r2, _02254E1C ; =0x0225529C
+	ldr r2, _02254E1C ; =MOD38_0225529C
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
@@ -807,7 +807,7 @@ MOD38_02254D84: ; 0x02254D84
 	add sp, #0x14
 	pop {r4, r5, r6, r7, pc}
 	nop
-_02254E1C: .word 0x0225529C
+_02254E1C: .word MOD38_0225529C
 _02254E20: .word 0x04001000
 _02254E24: .word 0xFFFFE0FF
 	thumb_func_end MOD38_02254D84
@@ -1186,10 +1186,20 @@ _0225510C: .word 0x00000000
 	thumb_func_end MOD38_022550D0
 
 	.section .rodata
-	; 0x02255110
-	.byte 0xAD, 0x49, 0x25, 0x02, 0xED, 0x49, 0x25, 0x02, 0xF9, 0x4A, 0x25, 0x02, 0x70, 0x90, 0x10, 0x28
+
+	.global MOD38_02255110
+MOD38_02255110: ; 0x02255110
+	.word MOD38_022549AC, MOD38_022549EC, MOD38_02254AF8
+
+	.global MOD38_0225511C
+MOD38_0225511C: ; 0x0225511C
+	.byte 0x70, 0x90, 0x10, 0x28
 	.byte 0x70, 0x90, 0x68, 0x80, 0x18, 0x38, 0x60, 0x78, 0x18, 0x38, 0xB8, 0xD0, 0x38, 0x58, 0x60, 0x78
-	.byte 0x38, 0x58, 0xB8, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xF6, 0xFF, 0x00, 0x00, 0x00
+	.byte 0x38, 0x58, 0xB8, 0xD0
+
+	.global MOD38_02255134
+MOD38_02255134: ; 0x02255134
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xF6, 0xFF, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x01, 0xFF, 0xF6, 0x01, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00
 	.byte 0xFF, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF
@@ -1209,15 +1219,35 @@ _0225510C: .word 0x00000000
 	.byte 0x00, 0xF6, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x01, 0x00
 	.byte 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x0A, 0x0B, 0x0D, 0x0C, 0x0F, 0x01, 0x03
-	.byte 0x04, 0x02, 0x0E, 0x06, 0x05, 0x07, 0x10, 0x11, 0x08, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x02, 0x00
-	.byte 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF
+
+	.global MOD38_02255278
+MOD38_02255278: ; 0x02255278
+	.byte 0x00, 0x0A, 0x0B, 0x0D, 0x0C, 0x0F, 0x01, 0x03
+	.byte 0x04, 0x02, 0x0E, 0x06, 0x05, 0x07, 0x10, 0x11, 0x08, 0x00, 0x00, 0x00
+
+	.global MOD38_0225528C
+MOD38_0225528C: ; 0x0225528C
+	.byte 0x00, 0xC0, 0x02, 0x00
+	.byte 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD38_0225529C
+MOD38_0225529C: ; 0x0225529C
+	.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, 0x85, 0x4D, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x02, 0x00, 0x00, 0x00, 0x39, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-	.byte 0x75, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xA9, 0x4F, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD38_022552B8
+MOD38_022552B8: ; 0x022552B8
+	.word 0x00, MOD38_02254D84, 0x00
+	.word 0x01, MOD38_02254F18, 0x00
+	.word 0x02, MOD38_02254F38, 0x00
+	.word 0x03, MOD38_02254F74, 0x00
+	.word 0x04, MOD38_02254FA8, 0x00
+	.word 0x00, 0x00000000, 0x00
+
+	.global MOD38_02255300
+MOD38_02255300: ; 0x02255300
 	.byte 0x00, 0xC0, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x40, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0xC0, 0x06, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00