module 39 fully shiftable

1 files changed, 65 insertions, 32 deletions

diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s
index 27675b6d..22127e11 100644
--- a/arm9/modules/39/asm/module_39.s
+++ b/arm9/modules/39/asm/module_39.s
@@ -131,7 +131,7 @@ _0225491A:
 	strb r1, [r0, #2]
 	mov r0, #8
 	str r0, [sp]
-	ldr r0, _0225496C ; =0x02255300
+	ldr r0, _0225496C ; =MOD39_02255300
 	ldr r2, _02254970 ; =MOD39_0225498C
 	ldr r3, [sp, #4]
 	mov r1, #3
@@ -153,7 +153,7 @@ _02254964:
 	add sp, #0x14
 	pop {r4, r5, r6, r7, pc}
 	nop
-_0225496C: .word 0x02255300
+_0225496C: .word MOD39_02255300
 _02254970: .word MOD39_0225498C
 	thumb_func_end MOD39_0225489C
 
@@ -194,7 +194,7 @@ MOD39_02254998: ; 0x02254998
 	ldrb r1, [r4]
 	add r0, r4, #0
 	lsl r2, r1, #2
-	ldr r1, _022549D0 ; =0x0225530C
+	ldr r1, _022549D0 ; =MOD39_0225530C
 	ldr r1, [r1, r2]
 	blx r1
 	cmp r0, #0
@@ -208,7 +208,7 @@ MOD39_02254998: ; 0x02254998
 _022549CE:
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_022549D0: .word 0x0225530C
+_022549D0: .word MOD39_0225530C
 	thumb_func_end MOD39_02254998
 
 	thumb_func_start MOD39_022549D4
@@ -627,7 +627,7 @@ MOD39_02254C6C: ; 0x02254C6C
 	add r0, r5, #0
 	str r0, [sp, #0x10]
 	add r0, #0x3c
-	ldr r7, _02254D74 ; =0x02255408
+	ldr r7, _02254D74 ; =MOD39_02255408
 	mov r4, #0
 	add r6, r5, #0
 	str r0, [sp, #0x10]
@@ -644,7 +644,7 @@ _02254CD6:
 	blt _02254CD6
 	cmp r4, #6
 	bge _02254D18
-	ldr r1, _02254D74 ; =0x02255408
+	ldr r1, _02254D74 ; =MOD39_02255408
 	lsl r0, r4, #4
 	add r7, r1, r0
 	lsl r0, r4, #2
@@ -708,7 +708,7 @@ _02254D70:
 	add sp, #0x18
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02254D74: .word 0x02255408
+_02254D74: .word MOD39_02255408
 	thumb_func_end MOD39_02254C6C
 
 	thumb_func_start MOD39_02254D78
@@ -747,13 +747,13 @@ MOD39_02254DA4: ; 0x02254DA4
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254DC4 ; =0x022553A8
+	ldr r0, _02254DC4 ; =MOD39_022553A8
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254DC4: .word 0x022553A8
+_02254DC4: .word MOD39_022553A8
 	thumb_func_end MOD39_02254DA4
 
 	thumb_func_start MOD39_02254DC8
@@ -797,7 +797,7 @@ MOD39_02254DF4: ; 0x02254DF4
 	add r0, r4, #0
 	bl MOD20_022538A4
 	ldr r0, [r5, #4]
-	ldr r2, _02254E7C ; =0x02255330
+	ldr r2, _02254E7C ; =MOD39_02255330
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
@@ -849,7 +849,7 @@ MOD39_02254DF4: ; 0x02254DF4
 	add sp, #0x14
 	pop {r4, r5, pc}
 	.align 2, 0
-_02254E7C: .word 0x02255330
+_02254E7C: .word MOD39_02255330
 _02254E80: .word 0x04001000
 _02254E84: .word 0xFFFFE0FF
 	thumb_func_end MOD39_02254DF4
@@ -1143,25 +1143,25 @@ _022550C4: ; jump table
 	.short _022550D2 - _022550C4 - 2 ; case 2
 	.short _022550CC - _022550C4 - 2 ; case 3
 _022550CC:
-	ldr r0, _02255104 ; =0x02255378
+	ldr r0, _02255104 ; =MOD39_02255378
 	str r0, [r4, #0x6c]
 	b _022550FA
 _022550D2:
-	ldr r0, _02255108 ; =0x02255318
+	ldr r0, _02255108 ; =MOD39_02255318
 	mov r1, #1
 	str r0, [r4, #0x6c]
 	ldr r0, [r4, #0x28]
 	bl MOD20_02253F28
 	b _022550FA
 _022550E0:
-	ldr r0, _0225510C ; =0x0225534C
+	ldr r0, _0225510C ; =MOD39_0225534C
 	mov r1, #2
 	str r0, [r4, #0x6c]
 	ldr r0, [r4, #0x28]
 	bl MOD20_02253F28
 	b _022550FA
 _022550EE:
-	ldr r0, _02255110 ; =0x02255468
+	ldr r0, _02255110 ; =MOD39_02255468
 	mov r1, #3
 	str r0, [r4, #0x6c]
 	ldr r0, [r4, #0x28]
@@ -1172,10 +1172,10 @@ _022550FA:
 	bl MOD39_02255114
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_02255104: .word 0x02255378
-_02255108: .word 0x02255318
-_0225510C: .word 0x0225534C
-_02255110: .word 0x02255468
+_02255104: .word MOD39_02255378
+_02255108: .word MOD39_02255318
+_0225510C: .word MOD39_0225534C
+_02255110: .word MOD39_02255468
 	thumb_func_end MOD39_0225509C
 
 	thumb_func_start MOD39_02255114
@@ -1445,30 +1445,63 @@ _022552FA:
 	thumb_func_end MOD39_02255114
 
 	.section .rodata
-	; 0x02255300
-	.byte 0x80, 0xA8, 0x5C, 0x84, 0x82, 0xA4, 0x18, 0x48, 0x82, 0xA4, 0x98, 0xC8, 0xF1, 0x49, 0x25, 0x02
-	.byte 0x31, 0x4A, 0x25, 0x02, 0xE9, 0x4B, 0x25, 0x02, 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
+
+	.global MOD39_02255300
+MOD39_02255300: ; 0x02255300
+	.byte 0x80, 0xA8, 0x5C, 0x84, 0x82, 0xA4, 0x18, 0x48, 0x82, 0xA4, 0x98, 0xC8
+
+	.global MOD39_0225530C
+MOD39_0225530C: ; 0x0225530C
+	.word MOD39_022549F0, MOD39_02254A30, MOD39_02254BE8
+
+	.global MOD39_02255318
+MOD39_02255318: ; 0x02255318
+	.byte 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
 	.byte 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
+
+	.global MOD39_02255330
+MOD39_02255330: ; 0x02255330
 	.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, 0xFE, 0xFF, 0xFF, 0xFF
+	.byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD39_0225534C
+MOD39_0225534C: ; 0x0225534C
+	.byte 0xFE, 0xFF, 0xFF, 0xFF
 	.byte 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00
 	.byte 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF
-	.byte 0x6B, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
+	.byte 0x6B, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
+
+	.global MOD39_02255378
+MOD39_02255378: ; 0x02255378
+	.byte 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
 	.byte 0x10, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0xFA, 0xFF, 0xFF, 0xFF
 	.byte 0xFB, 0xFF, 0xFF, 0xFF, 0x6C, 0x06, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
-	.byte 0x10, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xF5, 0x4D, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x02, 0x00, 0x00, 0x00, 0xCD, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-	.byte 0xF9, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1D, 0x4F, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x61, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x06, 0x00, 0x00, 0x00, 0x31, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x40, 0x09, 0x00
+	.byte 0x10, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
+
+	.global MOD39_022553A8
+MOD39_022553A8: ; 0x022553A8
+	.word 0x00, MOD39_02254DF4, 0x00
+	.word 0x01, MOD39_02254E88, 0x00
+	.word 0x02, MOD39_02254ECC, 0x00
+	.word 0x03, MOD39_02254EF8, 0x00
+	.word 0x04, MOD39_02254F1C, 0x00
+	.word 0x05, MOD39_02254F60, 0x00
+	.word 0x06, MOD39_02255030, 0x00
+	.word 0x00, 0x00000000, 0x00
+
+	.global MOD39_02255408
+MOD39_02255408: ; 0x02255408
+	.byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x40, 0x09, 0x00
 	.byte 0x09, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00
 	.byte 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x05, 0x00
 	.byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x80, 0x05, 0x00
 	.byte 0x06, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xC0, 0x08, 0x00
 	.byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0xC0, 0x08, 0x00
-	.byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
+	.byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00
+
+	.global MOD39_02255468
+MOD39_02255468: ; 0x02255468
+	.byte 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
 	.byte 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF
 	.byte 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00
 	.byte 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF