Merge pull request #181 from red031000/master

module_05 fully shiftable

arm9/asm/unk_0205CE48.s

@@ -1138,7 +1138,7 @@ FUN_0205D6BC: ; 0x0205D6BC
 	add r7, r0, #0x0
 	bl memset
 	mov r0, #0x72
-	ldr r1, _0205D710 ; =0x021F57F1
+	ldr r1, _0205D710 ; =MOD05_021F57F0
 	lsl r0, r0, #0x2
 	str r1, [r4, r0]
 	add r0, #0x30
@@ -1153,7 +1153,7 @@ FUN_0205D6BC: ; 0x0205D6BC
 	bl FUN_0206EDD4
 	pop {r3-r7, pc}
 	.balign 4
-_0205D710: .word 0x021F57F1
+_0205D710: .word MOD05_021F57F0
 
 	thumb_func_start FUN_0205D714
 FUN_0205D714: ; 0x0205D714
@@ -1202,7 +1202,7 @@ FUN_0205D74C: ; 0x0205D74C
 	add r0, r5, #0x0
 	bl FUN_0204649C
 	mov r0, #0x72
-	ldr r1, _0205D784 ; =0x021F5C71
+	ldr r1, _0205D784 ; =MOD05_021F5C70
 	lsl r0, r0, #0x2
 	str r1, [r4, r0]
 	add r0, r5, #0x0
@@ -1216,7 +1216,7 @@ FUN_0205D74C: ; 0x0205D74C
 	strh r0, [r4, #0x2a]
 	pop {r3-r5, pc}
 	.balign 4
-_0205D784: .word 0x021F5C71
+_0205D784: .word MOD05_021F5C70
 
 	thumb_func_start FUN_0205D788
 FUN_0205D788: ; 0x0205D788
@@ -1228,12 +1228,12 @@ FUN_0205D788: ; 0x0205D788
 	bl MOD05_021F5C44
 	add r2, r0, #0x0
 	ldr r0, [r4, #0x0]
-	ldr r1, _0205D7A4 ; =0x021F5C71
+	ldr r1, _0205D7A4 ; =MOD05_021F5C70
 	bl FUN_020463CC
 	mov r0, #0x0
 	pop {r4, pc}
 	.balign 4
-_0205D7A4: .word 0x021F5C71
+_0205D7A4: .word MOD05_021F5C70
 
 	thumb_func_start FUN_0205D7A8
 FUN_0205D7A8: ; 0x0205D7A8
@@ -1248,7 +1248,7 @@ FUN_0205D7A8: ; 0x0205D7A8
 	add r0, r5, #0x0
 	bl FUN_0204649C
 	mov r0, #0x72
-	ldr r1, _0205D7E0 ; =0x021F5C71
+	ldr r1, _0205D7E0 ; =MOD05_021F5C70
 	lsl r0, r0, #0x2
 	str r1, [r4, r0]
 	add r0, r5, #0x0
@@ -1262,7 +1262,7 @@ FUN_0205D7A8: ; 0x0205D7A8
 	strh r0, [r4, #0x2a]
 	pop {r3-r5, pc}
 	.balign 4
-_0205D7E0: .word 0x021F5C71
+_0205D7E0: .word MOD05_021F5C70
 
 	thumb_func_start FUN_0205D7E4
 FUN_0205D7E4: ; 0x0205D7E4
@@ -1274,12 +1274,12 @@ FUN_0205D7E4: ; 0x0205D7E4
 	bl MOD05_021F5C44
 	add r2, r0, #0x0
 	ldr r0, [r4, #0x0]
-	ldr r1, _0205D800 ; =0x021F5C71
+	ldr r1, _0205D800 ; =MOD05_021F5C70
 	bl FUN_020463CC
 	mov r0, #0x0
 	pop {r4, pc}
 	.balign 4
-_0205D800: .word 0x021F5C71
+_0205D800: .word MOD05_021F5C70
 
 	thumb_func_start FUN_0205D804
 FUN_0205D804: ; 0x0205D804
@@ -1294,7 +1294,7 @@ FUN_0205D804: ; 0x0205D804
 	add r0, r5, #0x0
 	bl FUN_0204649C
 	mov r0, #0x72
-	ldr r1, _0205D83C ; =0x021F5C71
+	ldr r1, _0205D83C ; =MOD05_021F5C70
 	lsl r0, r0, #0x2
 	str r1, [r4, r0]
 	add r0, r5, #0x0
@@ -1308,7 +1308,7 @@ FUN_0205D804: ; 0x0205D804
 	strh r0, [r4, #0x2a]
 	pop {r3-r5, pc}
 	.balign 4
-_0205D83C: .word 0x021F5C71
+_0205D83C: .word MOD05_021F5C70
 
 	thumb_func_start FUN_0205D840
 FUN_0205D840: ; 0x0205D840
@@ -1320,12 +1320,12 @@ FUN_0205D840: ; 0x0205D840
 	bl MOD05_021F5C44
 	add r2, r0, #0x0
 	ldr r0, [r4, #0x0]
-	ldr r1, _0205D85C ; =0x021F5C71
+	ldr r1, _0205D85C ; =MOD05_021F5C70
 	bl FUN_020463CC
 	mov r0, #0x0
 	pop {r4, pc}
 	.balign 4
-_0205D85C: .word 0x021F5C71
+_0205D85C: .word MOD05_021F5C70
 
 	thumb_func_start FUN_0205D860
 FUN_0205D860: ; 0x0205D860

arm9/asm/unk_02063948.s

@@ -1265,7 +1265,7 @@ FUN_020642B4: ; 0x020642B4
 	add r0, r5, #0x0
 	bl FUN_0204649C
 	mov r0, #0x72
-	ldr r1, _0206430C ; =0x021F6361
+	ldr r1, _0206430C ; =MOD05_021F6360
 	lsl r0, r0, #0x2
 	str r1, [r4, r0]
 	add r0, #0x30
@@ -1286,7 +1286,7 @@ FUN_020642B4: ; 0x020642B4
 	bl FUN_02028AD4
 	pop {r4-r6, pc}
 	.balign 4
-_0206430C: .word 0x021F6361
+_0206430C: .word MOD05_021F6360
 
 	thumb_func_start FUN_02064310
 FUN_02064310: ; 0x02064310

arm9/global.inc

@@ -6439,13 +6439,16 @@
 .extern MOD05_021F54D8
 .extern MOD05_021F54E0
 .extern MOD05_021F57EC
+.extern MOD05_021F57F0
 .extern MOD05_021F5C44
+.extern MOD05_021F5C70
 .extern MOD05_021F61DC
 .extern MOD05_021F61E8
 .extern MOD05_021F61F4
 .extern MOD05_021F6234
 .extern MOD05_021F6240
 .extern MOD05_021F6254
+.extern MOD05_021F6360
 .extern MOD06_02239944
 .extern MOD06_02239AAC
 .extern MOD06_0223BA04
@@ -6580,34 +6583,70 @@
 .extern MOD06_02249038
 .extern MOD06_022490A0
 .extern MOD06_022491FC
+.extern MOD06_022492B0
+.extern MOD06_022492D4
 .extern MOD06_02249508
 .extern MOD06_02249668
+.extern MOD06_022497A0
+.extern MOD06_022497BC
 .extern MOD06_022497E8
 .extern MOD06_02249B7C
+.extern MOD06_02249C98
+.extern MOD06_02249CB8
 .extern MOD06_02249E6C
 .extern MOD06_02249E78
 .extern MOD06_02249E84
 .extern MOD06_02249E90
+.extern MOD06_0224A040
+.extern MOD06_0224A05C
 .extern MOD06_0224A130
+.extern MOD06_0224A280
+.extern MOD06_0224A29C
 .extern MOD06_0224A310
+.extern MOD06_0224A44C
+.extern MOD06_0224A460
 .extern MOD06_0224A528
+.extern MOD06_0224A63C
+.extern MOD06_0224A658
 .extern MOD06_0224A6B8
 .extern MOD06_0224A6FC
 .extern MOD06_0224A7C8
+.extern MOD06_0224A87C
+.extern MOD06_0224A898
 .extern MOD06_0224A8D4
+.extern MOD06_0224A9E8
+.extern MOD06_0224AA04
 .extern MOD06_0224AA40
+.extern MOD06_0224AB54
+.extern MOD06_0224AB70
 .extern MOD06_0224ABAC
 .extern MOD06_0224ADF8
+.extern MOD06_0224AE10
+.extern MOD06_0224AE24
 .extern MOD06_0224AEE8
 .extern MOD06_0224AF68
+.extern MOD06_0224B0A8
+.extern MOD06_0224B0C4
 .extern MOD06_0224B124
+.extern MOD06_0224B248
+.extern MOD06_0224B264
 .extern MOD06_0224B2C4
+.extern MOD06_0224B3E4
+.extern MOD06_0224B400
 .extern MOD06_0224B568
 .extern MOD06_0224B818
 .extern MOD06_0224B86C
+.extern MOD06_0224B948
+.extern MOD06_0224B964
 .extern MOD06_0224B9E0
+.extern MOD06_0224BB50
+.extern MOD06_0224BB6C
 .extern MOD06_0224BBEC
+.extern MOD06_0224BCF4
+.extern MOD06_0224BD10
 .extern MOD06_0224BD90
+.extern MOD06_0224BF9C
+.extern MOD06_0224BFB8
 .extern MOD06_0224C038
 .extern MOD06_0224C24C
 .extern MOD06_0224C27C
@@ -6623,8 +6662,12 @@
 .extern MOD06_0224CB30
 .extern MOD06_0224CBB0
 .extern MOD06_0224CC24
+.extern MOD06_0224CE30
+.extern MOD06_0224CE4C
 .extern MOD06_0224CECC
 .extern MOD06_0224D14C
+.extern MOD06_0224D244
+.extern MOD06_0224D260
 .extern MOD06_0224D2E0
 .extern MOD06_0224D3E8
 .extern MOD06_0224D70C