Merge consecutive incbins

6 files changed, 13 insertions, 26 deletions

diff --git a/data/const/manager/manager1.s b/data/const/manager/manager1.s
index 9a21cd36..67076fa2 100644
--- a/data/const/manager/manager1.s
+++ b/data/const/manager/manager1.s
@@ -5,8 +5,7 @@
     .align 2
 
 gUnk_08107C1C:: @ 08107C1C
-	.incbin "baserom.gba", 0x107C1C, 0x000000E
-	.incbin "baserom.gba", 0x107C2A, 0x0000006
+	.incbin "baserom.gba", 0x107C1C, 0x0000014
 
 gUnk_08107C30:: @ 08107C30
 	.incbin "baserom.gba", 0x107C30, 0x0000010
diff --git a/data/const/manager/manager13.s b/data/const/manager/manager13.s
index f6627b4d..8fcab1fa 100644
--- a/data/const/manager/manager13.s
+++ b/data/const/manager/manager13.s
@@ -5,8 +5,7 @@
     .align 2
 
 gUnk_081084C8:: @ 081084C8
-	.incbin "baserom.gba", 0x1084C8, 0x000004A
-	.incbin "baserom.gba", 0x108512, 0x000001E
+	.incbin "baserom.gba", 0x1084C8, 0x0000068
 
 gUnk_08108530:: @ 08108530
 	.incbin "baserom.gba", 0x108530, 0x0000058
diff --git a/data/const/manager/manager1A.s b/data/const/manager/manager1A.s
index 392f3273..205ecd48 100644
--- a/data/const/manager/manager1A.s
+++ b/data/const/manager/manager1A.s
@@ -103,8 +103,7 @@ gUnk_081086FC:: @ 081086FC
 	.incbin "baserom.gba", 0x1086FC, 0x0000008
 
 gUnk_08108704:: @ 08108704
-	.incbin "baserom.gba", 0x108704, 0x0000003
-	.incbin "baserom.gba", 0x108707, 0x0000005
+	.incbin "baserom.gba", 0x108704, 0x0000008
 
 gUnk_0810870C:: @ 0810870C
 	.incbin "baserom.gba", 0x10870C, 0x0000008
@@ -128,8 +127,7 @@ gUnk_0810873C:: @ 0810873C
 	.incbin "baserom.gba", 0x10873C, 0x0000008
 
 gUnk_08108744:: @ 08108744
-	.incbin "baserom.gba", 0x108744, 0x0000006
-	.incbin "baserom.gba", 0x10874A, 0x0000002
+	.incbin "baserom.gba", 0x108744, 0x0000008
 
 gUnk_0810874C:: @ 0810874C
 	.incbin "baserom.gba", 0x10874C, 0x0000008
@@ -138,8 +136,7 @@ gUnk_08108754:: @ 08108754
 	.incbin "baserom.gba", 0x108754, 0x0000008
 
 gUnk_0810875C:: @ 0810875C
-	.incbin "baserom.gba", 0x10875C, 0x0000002
-	.incbin "baserom.gba", 0x10875E, 0x0000006
+	.incbin "baserom.gba", 0x10875C, 0x0000008
 
 gUnk_08108764:: @ 08108764
 	.incbin "baserom.gba", 0x108764, 0x0000020
@@ -154,18 +151,15 @@ gUnk_08108764:: @ 08108764
 	.4byte gUnk_081086A0
 	.incbin "baserom.gba", 0x1087D8, 0x0000010
 	.4byte gUnk_081086AC
-	.incbin "baserom.gba", 0x1087EC, 0x0000027
-	.incbin "baserom.gba", 0x108813, 0x0000001
+	.incbin "baserom.gba", 0x1087EC, 0x0000028
 	.4byte gUnk_081086DC
 	.incbin "baserom.gba", 0x108818, 0x0000010
 	.4byte gUnk_081086E4
 	.incbin "baserom.gba", 0x10882C, 0x0000010
 	.4byte gUnk_081086EC
-	.incbin "baserom.gba", 0x108840, 0x0000004
-	.incbin "baserom.gba", 0x108844, 0x000000C
+	.incbin "baserom.gba", 0x108840, 0x0000010
 	.4byte gUnk_081086F4
-	.incbin "baserom.gba", 0x108854, 0x0000010
-	.incbin "baserom.gba", 0x108864, 0x0000010
+	.incbin "baserom.gba", 0x108854, 0x0000020
 	.4byte gUnk_0810867C
 	.incbin "baserom.gba", 0x108878, 0x00001B8
 	.4byte gUnk_081086FC
@@ -177,8 +171,7 @@ gUnk_08108764:: @ 08108764
 	.4byte gUnk_08108714
 	.incbin "baserom.gba", 0x108A84, 0x0000010
 	.4byte gUnk_0810871C
-	.incbin "baserom.gba", 0x108A98, 0x0000003
-	.incbin "baserom.gba", 0x108A9B, 0x0000021
+	.incbin "baserom.gba", 0x108A98, 0x0000024
 	.4byte gUnk_08108724
 	.incbin "baserom.gba", 0x108AC0, 0x0000010
 	.4byte gUnk_0810872C
@@ -198,5 +191,4 @@ gUnk_08108764:: @ 08108764
 	.4byte gUnk_081086C4
 	.incbin "baserom.gba", 0x108B98, 0x0000010
 	.4byte gUnk_081086D0
-	.incbin "baserom.gba", 0x108BAC, 0x0000066
-	.incbin "baserom.gba", 0x108C12, 0x0000016
+	.incbin "baserom.gba", 0x108BAC, 0x000007C
diff --git a/data/const/manager/manager1C.s b/data/const/manager/manager1C.s
index bf71a685..d9f3a0ad 100644
--- a/data/const/manager/manager1C.s
+++ b/data/const/manager/manager1C.s
@@ -9,8 +9,7 @@ gUnk_08108C64:: @ 08108C64
 	.4byte sub_0805B55C
 
 gUnk_08108C6C:: @ 08108C6C
-	.incbin "baserom.gba", 0x108C6C, 0x000000B
-	.incbin "baserom.gba", 0x108C77, 0x0000005
+	.incbin "baserom.gba", 0x108C6C, 0x0000010
 
 gUnk_08108C7C:: @ 08108C7C
 	.incbin "baserom.gba", 0x108C7C, 0x0000004
diff --git a/data/const/manager/manager39.s b/data/const/manager/manager39.s
index ddc4a570..fd012d35 100644
--- a/data/const/manager/manager39.s
+++ b/data/const/manager/manager39.s
@@ -15,8 +15,7 @@ gUnk_08108E30:: @ 08108E30
 	.incbin "baserom.gba", 0x108E30, 0x0000018
 
 gUnk_08108E48:: @ 08108E48
-	.incbin "baserom.gba", 0x108E48, 0x0000002
-	.incbin "baserom.gba", 0x108E4A, 0x0000016
+	.incbin "baserom.gba", 0x108E48, 0x0000018
 
 gUnk_08108E60:: @ 08108E60
 	.incbin "baserom.gba", 0x108E60, 0x000000C
diff --git a/data/const/manager/manager4.s b/data/const/manager/manager4.s
index 90b5d2de..dba352c3 100644
--- a/data/const/manager/manager4.s
+++ b/data/const/manager/manager4.s
@@ -27,8 +27,7 @@ gUnk_08107CE0:: @ 08107CE0
 	.incbin "baserom.gba", 0x107CE0, 0x0000018
 
 gUnk_08107CF8:: @ 08107CF8
-	.incbin "baserom.gba", 0x107CF8, 0x000000A
-	.incbin "baserom.gba", 0x107D02, 0x0000006
+	.incbin "baserom.gba", 0x107CF8, 0x0000010
 
 gUnk_08107D08:: @ 08107D08
 	.incbin "baserom.gba", 0x107D08, 0x0000018