module 13 fully shiftable and fix module 12 types

1 files changed, 22 insertions, 29 deletions

diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index e5d27d08..7a48bc38 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -48161,9 +48161,8 @@ MOD12_02244AB4: ; 0x02244AB4
 
 	.global MOD12_02244AC8
 MOD12_02244AC8: ; 0x02244AC8
-	.byte 0x60, 0x00, 0x00, 0x00
-	.byte 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
-	.byte 0x08, 0x00, 0x00, 0x00
+	.word 0x60, 0x20, 0x40, 0x40
+	.word 0x08, 0x08
 
 	.global MOD12_02244AE0
 MOD12_02244AE0: ; 0x02244AE0
@@ -48376,11 +48375,10 @@ MOD12_02244EE4: ; 0x02244EE4
 
 	.global MOD12_02244F24
 MOD12_02244F24: ; 0x02244F24
-	.byte 0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00
-	.byte 0x01, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00
-	.byte 0x11, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00
-	.byte 0x01, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00
-	.byte 0x11, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00
+	.word 0x01, 0x0B, 0x01, 0x0E
+	.word 0x01, 0x0B, 0x11, 0x1E
+	.word 0x0D, 0x17, 0x01, 0x0E
+	.word 0x0D, 0x17, 0x11, 0x1E
 
 	.global MOD12_02244F64
 MOD12_02244F64: ; 0x02244F64
@@ -48489,8 +48487,7 @@ MOD12_02245218: ; 0x02245218
 
 	.global MOD12_02245228
 MOD12_02245228: ; 0x02245228
-	.byte 0x05, 0x00, 0x2B, 0x00
-	.byte 0x05, 0x00, 0x5B, 0x00, 0x05, 0x00, 0x8B, 0x00, 0x05, 0x00, 0xBB, 0x00
+	.short 0x05, 0x2B, 0x05, 0x5B, 0x05, 0x8B, 0x05, 0xBB
 
 	.global MOD12_02245238
 MOD12_02245238: ; 0x02245238
@@ -48800,8 +48797,8 @@ MOD12_02245F84: ; 0x02245F84
 
 	.global MOD12_02245F8C
 MOD12_02245F8C: ; 0x02245F8C
-	.byte 0x20, 0x00, 0x28, 0x00, 0x30, 0x00, 0x38, 0x00, 0xA0, 0x00, 0xA8, 0x00, 0xB0, 0x00, 0xB8, 0x00
-	.byte 0x20, 0x01, 0x28, 0x01, 0x30, 0x01, 0x38, 0x01
+	.short 0x20, 0x28, 0x30, 0x38, 0xA0, 0xA8, 0xB0, 0xB8
+	.short 0x0120, 0x0128, 0x0130, 0x0138
 
 	.global MOD12_02245FA4
 MOD12_02245FA4: ; 0x02245FA4
@@ -48876,13 +48873,12 @@ MOD12_022461E0: ; 0x022461E0
 
 	.global MOD12_022461E4
 MOD12_022461E4: ; 0x022461E4
-	.byte 0x80, 0x00, 0x58, 0x00, 0x30, 0x00, 0x20, 0x00
-	.byte 0x80, 0x00, 0x20, 0x00, 0xD0, 0x00, 0x20, 0x00
+	.short 0x80, 0x58, 0x30, 0x20, 0x80, 0x20, 0xD0, 0x20
 
 	.global MOD12_022461F4
 MOD12_022461F4: ; 0x022461F4
-	.byte 0x80, 0x00, 0x60, 0x00, 0x00, 0xFE, 0x30, 0x00
-	.byte 0x28, 0x00, 0x80, 0xFD, 0x80, 0x00, 0x28, 0x00, 0x80, 0xFD, 0xD0, 0x00, 0x28, 0x00, 0x80, 0xFD
+	.short 0x80, 0x60, -0x200, 0x30, 0x28, -0x280, 0x80, 0x28
+	.short -0x280, 0xD0, 0x28, -0x280
 
 	.global MOD12_0224620C
 MOD12_0224620C: ; 0x0224620C
@@ -48891,9 +48887,8 @@ MOD12_0224620C: ; 0x0224620C
 
 	.global MOD12_02246224
 MOD12_02246224: ; 0x02246224
-	.byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00
-	.byte 0x14, 0x00, 0x01, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x09, 0x00, 0x03, 0x00, 0x0A, 0x00, 0x03, 0x00
-	.byte 0x12, 0x00, 0x04, 0x00, 0x13, 0x00, 0x00, 0x00
+	.short 0x00, 0x00, 0x08, 0x06, 0x14, 0x01, 0x0B, 0x00
+	.short 0x09, 0x03, 0x0A, 0x03, 0x12, 0x04, 0x13, 0x00
 
 	.global MOD12_02246244
 MOD12_02246244: ; 0x02246244
@@ -48959,8 +48954,8 @@ MOD12_02246404: ; 0x02246404
 
 	.global MOD12_0224640C
 MOD12_0224640C: ; 0x0224640C
-	.byte 0x20, 0x00, 0x28, 0x00, 0x30, 0x00, 0x38, 0x00, 0xA0, 0x00, 0xA8, 0x00, 0xB0, 0x00, 0xB8, 0x00
-	.byte 0x20, 0x01, 0x28, 0x01, 0x30, 0x01, 0x38, 0x01
+	.short 0x20, 0x28, 0x30, 0x38, 0xA0, 0xA8, 0xB0, 0xB8
+	.short 0x120, 0x128, 0x130, 0x138
 
 	.global MOD12_02246424
 MOD12_02246424: ; 0x02246424
@@ -48991,8 +48986,8 @@ MOD12_022464C8: ; 0x022464C8
 
 	.global MOD12_022464D0
 MOD12_022464D0: ; 0x022464D0
-	.byte 0x30, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00
-	.byte 0x35, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00
+	.word 0x30, 0x34, 0x33, 0x35
+	.word 0x36
 
 	.global MOD12_022464E4
 MOD12_022464E4: ; 0x022464E4
@@ -49049,18 +49044,16 @@ MOD12_022465C0: ; 0x022465C0
 
 	.global MOD12_02246614
 MOD12_02246614: ; 0x02246614
-	.byte 0x1C, 0x00, 0x14, 0x00, 0x1C, 0x00, 0x34, 0x00
-	.byte 0x1C, 0x00, 0x54, 0x00, 0x1C, 0x00, 0x74, 0x00
+	.short 0x1C, 0x14, 0x1C, 0x34, 0x1C, 0x54, 0x1C, 0x74
 
 	.global MOD12_02246624
 MOD12_02246624: ; 0x02246624
-	.byte 0xE8, 0x00, 0x0D, 0x00, 0xE8, 0x00, 0x2D, 0x00
-	.byte 0xE8, 0x00, 0x4D, 0x00, 0xE8, 0x00, 0x6D, 0x00
+	.short 0xE8, 0x0D, 0xE8, 0x2D, 0xE8, 0x4D, 0xE8, 0x6D
 
 	.global MOD12_02246634
 MOD12_02246634: ; 0x02246634
-	.byte 0x2C, 0x00, 0x46, 0x00, 0x00, 0xFE, 0x64, 0x00
-	.byte 0x46, 0x00, 0x80, 0xFD, 0x9C, 0x00, 0x46, 0x00, 0x80, 0xFD, 0xD4, 0x00, 0x46, 0x00, 0x80, 0xFD
+	.short 0x2C, 0x46, -0x200, 0x64, 0x46, -0x280, 0x9C, 0x46
+	.short -0x280, 0xD4, 0x46, -0x280
 
 	.global MOD12_0224664C
 MOD12_0224664C: ; 0x0224664C