address issues with types

4 files changed, 23 insertions, 28 deletions

diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index 9a1f26da..d11eeb44 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -1456,14 +1456,13 @@ MOD27_0225533C: ; 0x0225533C
 
 	.global MOD27_02255348
 MOD27_02255348: ; 0x02255348
-	.byte 0x40, 0x00, 0x24, 0x00
-	.byte 0xA0, 0x00, 0x24, 0x00, 0x40, 0x00, 0x54, 0x00, 0xA0, 0x00, 0x54, 0x00, 0x40, 0x00, 0x84, 0x00
-	.byte 0xA0, 0x00, 0x84, 0x00
+	.short 0x40, 0x24, 0xA0, 0x24, 0x40, 0x54, 0xA0, 0x54
+	.short 0x40, 0x84, 0xA0, 0x84
 
 	.global MOD27_02255360
 MOD27_02255360: ; 0x02255360
-	.byte 0x04, 0x00, 0x08, 0x00, 0x10, 0x00, 0x08, 0x00, 0x04, 0x00, 0x0E, 0x00
-	.byte 0x10, 0x00, 0x0E, 0x00, 0x04, 0x00, 0x14, 0x00, 0x10, 0x00, 0x14, 0x00
+	.short 0x04, 0x08, 0x10, 0x08, 0x04, 0x0E, 0x10, 0x0E
+	.short 0x04, 0x14, 0x10, 0x14
 
 	.global MOD27_02255378
 MOD27_02255378: ; 0x02255378
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index 27fab047..dba3ebba 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -2994,8 +2994,8 @@ MOD28_02255EA8: ; 0x02255EA8
 
 	.global MOD28_02255EC0
 MOD28_02255EC0: ; 0x02255EC0
-	.byte 0x30, 0x00, 0x2C, 0x00, 0xB0, 0x00, 0x2C, 0x00
-	.byte 0x30, 0x00, 0x5C, 0x00, 0xB0, 0x00, 0x5C, 0x00, 0x30, 0x00, 0x8C, 0x00, 0xB0, 0x00, 0x8C, 0x00
+	.short 0x30, 0x2C, 0xB0, 0x2C, 0x30, 0x5C, 0xB0, 0x5C
+	.short 0x30, 0x8C, 0xB0, 0x8C
 
 	.global MOD28_02255ED8
 MOD28_02255ED8: ; 0x02255ED8
@@ -3048,4 +3048,3 @@ MOD28_02255F94: ; 0x02255F94
 	.global MOD28_02255FA8
 MOD28_02255FA8: ; 0x02255FA8
 	.asciz " icon[%d] Reset!!\n"
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00
diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s
index 57e2aa5b..4a439bd8 100644
--- a/arm9/modules/34/asm/module_34.s
+++ b/arm9/modules/34/asm/module_34.s
@@ -602,7 +602,7 @@ MOD34_02254C7C: ; 0x02254C7C
 
 	.global MOD34_02254C94
 MOD34_02254C94: ; 0x02254C94
-	.byte 0x42, 0x00, 0x54, 0x00, 0x22, 0x01, 0x34, 0x01, 0x02, 0x02, 0x14, 0x02
+	.short 0x42, 0x54, 0x122, 0x134, 0x202, 0x214
 
 	.global MOD34_02254CA0
 MOD34_02254CA0: ; 0x02254CA0
diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s
index 22127e11..abd624df 100644
--- a/arm9/modules/39/asm/module_39.s
+++ b/arm9/modules/39/asm/module_39.s
@@ -1456,8 +1456,8 @@ MOD39_0225530C: ; 0x0225530C
 
 	.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
+	.word -2, 0x10, 0x10, -5
+	.word 0x66B, -1
 
 	.global MOD39_02255330
 MOD39_02255330: ; 0x02255330
@@ -1466,17 +1466,15 @@ MOD39_02255330: ; 0x02255330
 
 	.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
+	.word -2, 0x10, 0x10, -5
+	.word 0x66B, -2, 0x10, 0x10
+	.word -5, 0x66B, -1
 
 	.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
+	.word -2, 0x10, 0x10, -4
+	.word 0x10, -6, -5, 0x66C
+	.word -3, 0x10, 0x10, -1
 
 	.global MOD39_022553A8
 MOD39_022553A8: ; 0x022553A8
@@ -1501,12 +1499,11 @@ MOD39_02255408: ; 0x02255408
 
 	.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
-	.byte 0x6B, 0x06, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF
-	.byte 0x6D, 0x06, 0x00, 0x00, 0xF9, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
-	.byte 0xF9, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xF9, 0xFF, 0xFF, 0xFF
-	.byte 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
-	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.word -2, 0x10, 0x10, -5
+	.word 0x066B, -2, 0x10, 0x10
+	.word -5, 0x66B, -2, 0x10
+	.word 0x10, -5, 0x66B, -4
+	.word 0x10, -5, 0x66D, -7
+	.word 0x02, 0x07, -7, 0x03
+	.word 0x08, -7, 0x01, 0x04
+	.word -4, 0x10, -1