module 45 fully shiftable

1 files changed, 63 insertions, 30 deletions

diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s
index 7f47eb2f..39a3e9cf 100644
--- a/arm9/modules/45/asm/module_45.s
+++ b/arm9/modules/45/asm/module_45.s
@@ -96,7 +96,7 @@ MOD45_0225489C: ; 0x0225489C
 	strb r0, [r5, #2]
 	mov r0, #8
 	str r0, [sp]
-	ldr r0, _02254924 ; =0x02255018
+	ldr r0, _02254924 ; =MOD45_02255018
 	ldr r2, _02254928 ; =MOD45_022549E0
 	mov r1, #0x25
 	add r3, r5, #0
@@ -118,7 +118,7 @@ _0225491C:
 	add sp, #0x14
 	pop {r3, r4, r5, r6, pc}
 	nop
-_02254924: .word 0x02255018
+_02254924: .word MOD45_02255018
 _02254928: .word MOD45_022549E0
 	thumb_func_end MOD45_0225489C
 
@@ -133,7 +133,7 @@ MOD45_0225492C: ; 0x0225492C
 	ldr r0, [r4, #8]
 	str r0, [r6, #8]
 	ldr r1, [r6]
-	ldr r0, _022549BC ; =0x022550AB
+	ldr r0, _022549BC ; =MOD45_022550AB
 	ldrb r0, [r0, r1]
 	str r0, [r6, #4]
 	ldr r0, [r6]
@@ -197,7 +197,7 @@ _0225499A:
 _022549BA:
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_022549BC: .word 0x022550AB
+_022549BC: .word MOD45_022550AB
 	thumb_func_end MOD45_0225492C
 
 	thumb_func_start MOD45_022549C0
@@ -244,7 +244,7 @@ MOD45_022549EC: ; 0x022549EC
 	ldrb r1, [r4]
 	add r0, r4, #0
 	lsl r2, r1, #2
-	ldr r1, _02254A2C ; =0x0225500C
+	ldr r1, _02254A2C ; =MOD45_0225500C
 	ldr r1, [r1, r2]
 	blx r1
 	cmp r0, #0
@@ -259,7 +259,7 @@ MOD45_022549EC: ; 0x022549EC
 _02254A2A:
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_02254A2C: .word 0x0225500C
+_02254A2C: .word MOD45_0225500C
 	thumb_func_end MOD45_022549EC
 
 	thumb_func_start MOD45_02254A30
@@ -528,7 +528,7 @@ MOD45_02254BE0: ; 0x02254BE0
 	bl MOD20_02253FBC
 	add r2, r5, #0
 	ldr r0, [r5, #0x20]
-	ldr r1, _02254C2C ; =0x022550B8
+	ldr r1, _02254C2C ; =MOD45_022550B8
 	add r2, #0x28
 	bl MOD20_02253E74
 	str r0, [r5, #0x24]
@@ -540,7 +540,7 @@ MOD45_02254BE0: ; 0x02254BE0
 	add sp, #0xc
 	pop {r4, r5, pc}
 	.align 2, 0
-_02254C2C: .word 0x022550B8
+_02254C2C: .word MOD45_022550B8
 	thumb_func_end MOD45_02254BE0
 
 	thumb_func_start MOD45_02254C30
@@ -595,13 +595,13 @@ MOD45_02254C7C: ; 0x02254C7C
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254C9C ; =0x02255140
+	ldr r0, _02254C9C ; =MOD45_02255140
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254C9C: .word 0x02255140
+_02254C9C: .word MOD45_02255140
 	thumb_func_end MOD45_02254C7C
 
 	thumb_func_start MOD45_02254CA0
@@ -646,12 +646,12 @@ MOD45_02254CCC: ; 0x02254CCC
 	bl MOD20_022538A4
 	add r4, r0, #0
 	ldr r0, [r5, #4]
-	ldr r2, _02254D60 ; =0x022550FC
+	ldr r2, _02254D60 ; =MOD45_022550FC
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
 	ldr r0, [r5, #4]
-	ldr r2, _02254D64 ; =0x022550E0
+	ldr r2, _02254D64 ; =MOD45_022550E0
 	mov r1, #7
 	mov r3, #0
 	bl FUN_02016C18
@@ -700,8 +700,8 @@ MOD45_02254CCC: ; 0x02254CCC
 	add sp, #0x14
 	pop {r3, r4, r5, r6, pc}
 	.align 2, 0
-_02254D60: .word 0x022550FC
-_02254D64: .word 0x022550E0
+_02254D60: .word MOD45_022550FC
+_02254D64: .word MOD45_022550E0
 _02254D68: .word 0x04001000
 _02254D6C: .word 0xFFFFE0FF
 	thumb_func_end MOD45_02254CCC
@@ -887,7 +887,7 @@ MOD45_02254EBC: ; 0x02254EBC
 	push {r4, r5, r6, r7, lr}
 	sub sp, #0x14
 	add r7, r0, #0
-	ldr r0, _02254F10 ; =0x022550C6
+	ldr r0, _02254F10 ; =MOD45_022550C6
 	lsl r1, r1, #1
 	ldrh r4, [r0, r1]
 	mov r0, #0
@@ -927,7 +927,7 @@ _02254ED6:
 	add sp, #0x14
 	pop {r4, r5, r6, r7, pc}
 	nop
-_02254F10: .word 0x022550C6
+_02254F10: .word MOD45_022550C6
 	thumb_func_end MOD45_02254EBC
 
 	thumb_func_start MOD45_02254F14
@@ -970,7 +970,7 @@ _02254F46:
 	mov r0, #0x14
 	add r2, r6, #0
 	mul r2, r0
-	ldr r0, _02255008 ; =0x02255118
+	ldr r0, _02255008 ; =MOD45_02255118
 	lsl r1, r7, #1
 	add r0, r0, r2
 	ldrh r7, [r1, r0]
@@ -1010,7 +1010,7 @@ _02254FAE:
 	add r3, r6, #0
 	mul r3, r0
 	ldr r0, [sp, #0x18]
-	ldr r2, _02255008 ; =0x02255118
+	ldr r2, _02255008 ; =MOD45_02255118
 	lsl r1, r0, #1
 	add r0, r2, r3
 	ldrh r6, [r1, r0]
@@ -1050,12 +1050,18 @@ _02254FAE:
 	add sp, #0x1c
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_02255008: .word 0x02255118
+_02255008: .word MOD45_02255118
 	thumb_func_end MOD45_02254F14
 
 	.section .rodata
-	; 0x0225500C
-	.byte 0x4D, 0x4A, 0x25, 0x02, 0x99, 0x4A, 0x25, 0x02, 0x59, 0x4B, 0x25, 0x02, 0x28, 0x38, 0x20, 0x30
+
+	.global MOD45_0225500C
+MOD45_0225500C: ; 0x0225500C
+	.word MOD45_02254A4C, MOD45_02254A98, MOD45_02254B58
+
+	.global MOD45_02255018
+MOD45_02255018: ; 0x02255018
+	.byte 0x28, 0x38, 0x20, 0x30
 	.byte 0x28, 0x38, 0x38, 0x48, 0x28, 0x38, 0x50, 0x60, 0x28, 0x38, 0x68, 0x78, 0x28, 0x38, 0x80, 0x90
 	.byte 0x28, 0x38, 0x98, 0xA8, 0x28, 0x38, 0xB0, 0xC0, 0x40, 0x50, 0x20, 0x30, 0x40, 0x50, 0x38, 0x48
 	.byte 0x40, 0x50, 0x50, 0x60, 0x40, 0x50, 0x68, 0x78, 0x40, 0x50, 0x80, 0x90, 0x40, 0x50, 0x98, 0xA8
@@ -1064,20 +1070,47 @@ _02255008: .word 0x02255118
 	.byte 0x70, 0x80, 0x20, 0x30, 0x70, 0x80, 0x38, 0x48, 0x70, 0x80, 0x50, 0x60, 0x70, 0x80, 0x68, 0x78
 	.byte 0x70, 0x80, 0x80, 0x90, 0x70, 0x80, 0x98, 0xA8, 0x70, 0x80, 0xB0, 0xC0, 0x88, 0x98, 0x20, 0x30
 	.byte 0x88, 0x98, 0x38, 0x48, 0x88, 0x98, 0x50, 0x60, 0x88, 0x98, 0x68, 0x78, 0x88, 0x98, 0x80, 0x90
-	.byte 0x88, 0x98, 0x98, 0xA8, 0x88, 0x98, 0xB0, 0xC0, 0xA0, 0xB0, 0x20, 0x30, 0xA0, 0xB0, 0x38, 0x48
-	.byte 0x1F, 0x1C, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00
+	.byte 0x88, 0x98, 0x98, 0xA8, 0x88, 0x98, 0xB0, 0xC0, 0xA0, 0xB0, 0x20, 0x30, 0xA0, 0xB0, 0x38
+
+	.global MOD45_022550AB
+MOD45_022550AB: ; 0x022550AB
+	.byte 0x48
+	.byte 0x1F, 0x1C, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F
+
+	.global MOD45_022550B8
+MOD45_022550B8: ; 0x022550B8
+	.byte 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
+
+	.global MOD45_022550C6
+MOD45_022550C6: ; 0x022550C6
+	.byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00
 	.byte 0x08, 0x00, 0x18, 0x00, 0x1C, 0x00, 0x20, 0x00, 0x30, 0x00, 0x34, 0x00, 0x38, 0x00, 0x48, 0x00
-	.byte 0x4C, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+	.byte 0x4C, 0x00, 0x50, 0x00
+
+	.global MOD45_022550E0
+MOD45_022550E0: ; 0x022550E0
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD45_022550FC
+MOD45_022550FC: ; 0x022550FC
 	.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, 0x60, 0x00, 0x61, 0x00
+	.byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD45_02255118
+MOD45_02255118: ; 0x02255118
+	.byte 0x60, 0x00, 0x61, 0x00
 	.byte 0x62, 0x00, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00
 	.byte 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, 0x00
-	.byte 0x80, 0x00, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCD, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x01, 0x00, 0x00, 0x00, 0x71, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-	.byte 0x95, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00
+	.byte 0x80, 0x00, 0x81, 0x00
+
+	.global MOD45_02255140
+MOD45_02255140: ; 0x02255140
+	.word 0x00, MOD45_02254CCC, 0x00
+	.word 0x01, MOD45_02254D70, 0x00
+	.word 0x02, MOD45_02254D94, 0x00
+	.word 0x00, 0x00000000, 0x00
 
 	.section .sinit
 	.word MOD45_02254840