Merge consecutive incbins

22 files changed, 50 insertions, 138 deletions

diff --git a/data/animations/object/beanstalk.s b/data/animations/object/beanstalk.s
index be83d930..f98756a0 100644
--- a/data/animations/object/beanstalk.s
+++ b/data/animations/object/beanstalk.s
@@ -5,9 +5,7 @@
 @    .align 2
 
 gUnk_08120EF9:: @ 08120EF9
-	.incbin "baserom.gba", 0x120EF9, 0x000000A
-	.incbin "baserom.gba", 0x120F03, 0x0000018
-	.incbin "baserom.gba", 0x120F1B, 0x000000F
+	.incbin "baserom.gba", 0x120EF9, 0x0000031
 
 gUnk_08120F2A:: @ 08120F2A
 	.incbin "baserom.gba", 0x120F2A, 0x0000004
@@ -40,14 +38,7 @@ gUnk_08120FF2:: @ 08120FF2
 	.incbin "baserom.gba", 0x120FF2, 0x0000004
 
 gUnk_08120FF6:: @ 08120FF6
-	.incbin "baserom.gba", 0x120FF6, 0x0000013
-	.incbin "baserom.gba", 0x121009, 0x0000002
-	.incbin "baserom.gba", 0x12100B, 0x0000001
-	.incbin "baserom.gba", 0x12100C, 0x0000001
-	.incbin "baserom.gba", 0x12100D, 0x0000002
-	.incbin "baserom.gba", 0x12100F, 0x0000003
-	.incbin "baserom.gba", 0x121012, 0x0000002
-	.incbin "baserom.gba", 0x121014, 0x0000002
+	.incbin "baserom.gba", 0x120FF6, 0x0000020
 
 gUnk_08121016:: @ 08121016
 	.incbin "baserom.gba", 0x121016, 0x0000006
diff --git a/data/animations/object/bossDoor.s b/data/animations/object/bossDoor.s
index b66f5809..84c57ba4 100644
--- a/data/animations/object/bossDoor.s
+++ b/data/animations/object/bossDoor.s
@@ -5,8 +5,7 @@
     .align 2
 
 gUnk_08121514:: @ 08121514
-	.incbin "baserom.gba", 0x121514, 0x0000007
-	.incbin "baserom.gba", 0x12151B, 0x000001D
+	.incbin "baserom.gba", 0x121514, 0x0000024
 
 gUnk_08121538:: @ 08121538
 	.incbin "baserom.gba", 0x121538, 0x0000024
diff --git a/data/animations/object/deathFx.s b/data/animations/object/deathFx.s
index e2df04be..8c456e43 100644
--- a/data/animations/object/deathFx.s
+++ b/data/animations/object/deathFx.s
@@ -14,9 +14,7 @@ gUnk_0811ED86:: @ 0811ED86
 	.incbin "baserom.gba", 0x11ED86, 0x0000031
 
 gUnk_0811EDB7:: @ 0811EDB7
-	.incbin "baserom.gba", 0x11EDB7, 0x0000034
-	.incbin "baserom.gba", 0x11EDEB, 0x0000014
-	.incbin "baserom.gba", 0x11EDFF, 0x0000011
+	.incbin "baserom.gba", 0x11EDB7, 0x0000059
 
 gUnk_0811EE10:: @ 0811EE10
 	.4byte gUnk_0811ECD4
diff --git a/data/animations/object/fan.s b/data/animations/object/fan.s
index 30277362..5785aee0 100644
--- a/data/animations/object/fan.s
+++ b/data/animations/object/fan.s
@@ -5,8 +5,7 @@
     .align 2
 
 gUnk_081243F4:: @ 081243F4
-	.incbin "baserom.gba", 0x1243F4, 0x000003F
-	.incbin "baserom.gba", 0x124433, 0x0000032
+	.incbin "baserom.gba", 0x1243F4, 0x0000071
 
 gUnk_08124465:: @ 08124465
 	.incbin "baserom.gba", 0x124465, 0x0000071
diff --git a/data/animations/object/figurineDevice.s b/data/animations/object/figurineDevice.s
index 8e44ea0c..83a7946f 100644
--- a/data/animations/object/figurineDevice.s
+++ b/data/animations/object/figurineDevice.s
@@ -11,9 +11,7 @@ gUnk_08120AED:: @ 08120AED
 	.incbin "baserom.gba", 0x120AED, 0x0000014
 
 gUnk_08120B01:: @ 08120B01
-	.incbin "baserom.gba", 0x120B01, 0x0000003
-	.incbin "baserom.gba", 0x120B04, 0x0000006
-	.incbin "baserom.gba", 0x120B0A, 0x0000006
+	.incbin "baserom.gba", 0x120B01, 0x000000F
 
 gUnk_08120B10:: @ 08120B10
 	.4byte gUnk_08120AE8
diff --git a/data/animations/object/fileScreenObjects.s b/data/animations/object/fileScreenObjects.s
index e68503c3..be90ed5a 100644
--- a/data/animations/object/fileScreenObjects.s
+++ b/data/animations/object/fileScreenObjects.s
@@ -5,8 +5,7 @@
     .align 2
 
 gUnk_08121E24:: @ 08121E24
-	.incbin "baserom.gba", 0x121E24, 0x0000005
-	.incbin "baserom.gba", 0x121E29, 0x0000008
+	.incbin "baserom.gba", 0x121E24, 0x000000D
 
 gUnk_08121E31:: @ 08121E31
 	.incbin "baserom.gba", 0x121E31, 0x000001F
diff --git a/data/animations/object/furniture.s b/data/animations/object/furniture.s
index e049b5d7..e4bd071e 100644
--- a/data/animations/object/furniture.s
+++ b/data/animations/object/furniture.s
@@ -5,8 +5,7 @@
     .align 2
 
 gUnk_08122128:: @ 08122128
-	.incbin "baserom.gba", 0x122128, 0x000000A
-	.incbin "baserom.gba", 0x122132, 0x0000066
+	.incbin "baserom.gba", 0x122128, 0x0000070
 
 gUnk_08122198:: @ 08122198
 	.incbin "baserom.gba", 0x122198, 0x0000010
diff --git a/data/animations/object/gentariCurtains.s b/data/animations/object/gentariCurtains.s
index 26c65908..b52a88ef 100644
--- a/data/animations/object/gentariCurtains.s
+++ b/data/animations/object/gentariCurtains.s
@@ -5,8 +5,7 @@
     .align 2
 
 gUnk_0812261C:: @ 0812261C
-	.incbin "baserom.gba", 0x12261C, 0x000000E
-	.incbin "baserom.gba", 0x12262A, 0x0000007
+	.incbin "baserom.gba", 0x12261C, 0x0000015
 
 gUnk_08122631:: @ 08122631
 	.incbin "baserom.gba", 0x122631, 0x0000007
diff --git a/data/animations/object/minecart.s b/data/animations/object/minecart.s
index fd057151..ee51437c 100644
--- a/data/animations/object/minecart.s
+++ b/data/animations/object/minecart.s
@@ -17,8 +17,7 @@ gUnk_08122402:: @ 08122402
 	.incbin "baserom.gba", 0x122402, 0x000001A
 
 gUnk_0812241C:: @ 0812241C
-	.incbin "baserom.gba", 0x12241C, 0x0000011
-	.incbin "baserom.gba", 0x12242D, 0x0000009
+	.incbin "baserom.gba", 0x12241C, 0x000001A
 
 gUnk_08122436:: @ 08122436
 	.incbin "baserom.gba", 0x122436, 0x000001A
diff --git a/data/animations/object/object1E.s b/data/animations/object/object1E.s
index 2e01b0a2..fe78dc8a 100644
--- a/data/animations/object/object1E.s
+++ b/data/animations/object/object1E.s
@@ -8,9 +8,7 @@ gUnk_081208C8:: @ 081208C8
 	.incbin "baserom.gba", 0x1208C8, 0x0000034
 
 gUnk_081208FC:: @ 081208FC
-	.incbin "baserom.gba", 0x1208FC, 0x0000005
-	.incbin "baserom.gba", 0x120901, 0x0000005
-	.incbin "baserom.gba", 0x120906, 0x000002A
+	.incbin "baserom.gba", 0x1208FC, 0x0000034
 
 gUnk_08120930:: @ 08120930
 	.incbin "baserom.gba", 0x120930, 0x0000034
diff --git a/data/animations/object/object24.s b/data/animations/object/object24.s
index 778e2d9f..ac45287b 100644
--- a/data/animations/object/object24.s
+++ b/data/animations/object/object24.s
@@ -5,19 +5,16 @@
 @    .align 2
 
 gUnk_08120BF1:: @ 08120BF1
-	.incbin "baserom.gba", 0x120BF1, 0x0000003
-	.incbin "baserom.gba", 0x120BF4, 0x0000001
+	.incbin "baserom.gba", 0x120BF1, 0x0000004
 
 gUnk_08120BF5:: @ 08120BF5
 	.incbin "baserom.gba", 0x120BF5, 0x0000004
 
 gUnk_08120BF9:: @ 08120BF9
-	.incbin "baserom.gba", 0x120BF9, 0x0000003
-	.incbin "baserom.gba", 0x120BFC, 0x0000001
+	.incbin "baserom.gba", 0x120BF9, 0x0000004
 
 gUnk_08120BFD:: @ 08120BFD
-	.incbin "baserom.gba", 0x120BFD, 0x0000001
-	.incbin "baserom.gba", 0x120BFE, 0x0000003
+	.incbin "baserom.gba", 0x120BFD, 0x0000004
 
 gUnk_08120C01:: @ 08120C01
 	.incbin "baserom.gba", 0x120C01, 0x0000007
diff --git a/data/animations/object/object35.s b/data/animations/object/object35.s
index 44eb4d52..0948e415 100644
--- a/data/animations/object/object35.s
+++ b/data/animations/object/object35.s
@@ -5,16 +5,13 @@
     .align 2
 
 gUnk_081213FC:: @ 081213FC
-	.incbin "baserom.gba", 0x1213FC, 0x0000009
-	.incbin "baserom.gba", 0x121405, 0x0000008
+	.incbin "baserom.gba", 0x1213FC, 0x0000011
 
 gUnk_0812140D:: @ 0812140D
-	.incbin "baserom.gba", 0x12140D, 0x000000A
-	.incbin "baserom.gba", 0x121417, 0x0000007
+	.incbin "baserom.gba", 0x12140D, 0x0000011
 
 gUnk_0812141E:: @ 0812141E
-	.incbin "baserom.gba", 0x12141E, 0x0000004
-	.incbin "baserom.gba", 0x121422, 0x000000E
+	.incbin "baserom.gba", 0x12141E, 0x0000012
 
 gUnk_08121430:: @ 08121430
 	.4byte gUnk_081213FC
diff --git a/data/animations/object/object4.s b/data/animations/object/object4.s
index e5e1fd0d..34b7d891 100644
--- a/data/animations/object/object4.s
+++ b/data/animations/object/object4.s
@@ -74,8 +74,7 @@ gUnk_0811EFD9:: @ 0811EFD9
 	.incbin "baserom.gba", 0x11EFD9, 0x0000015
 
 gUnk_0811EFEE:: @ 0811EFEE
-	.incbin "baserom.gba", 0x11EFEE, 0x000000E
-	.incbin "baserom.gba", 0x11EFFC, 0x0000007
+	.incbin "baserom.gba", 0x11EFEE, 0x0000015
 
 gUnk_0811F003:: @ 0811F003
 	.incbin "baserom.gba", 0x11F003, 0x0000015
diff --git a/data/animations/object/object43.s b/data/animations/object/object43.s
index 7c739fde..1bf13295 100644
--- a/data/animations/object/object43.s
+++ b/data/animations/object/object43.s
@@ -5,36 +5,19 @@
     .align 2
 
 gUnk_081217E0:: @ 081217E0
-	.incbin "baserom.gba", 0x1217E0, 0x000003A
-	.incbin "baserom.gba", 0x12181A, 0x0000001
-	.incbin "baserom.gba", 0x12181B, 0x0000001
-	.incbin "baserom.gba", 0x12181C, 0x0000001
-	.incbin "baserom.gba", 0x12181D, 0x0000047
+	.incbin "baserom.gba", 0x1217E0, 0x0000084
 
 gUnk_08121864:: @ 08121864
 	.incbin "baserom.gba", 0x121864, 0x0000084
 
 gUnk_081218E8:: @ 081218E8
-	.incbin "baserom.gba", 0x1218E8, 0x0000031
-	.incbin "baserom.gba", 0x121919, 0x0000001
-	.incbin "baserom.gba", 0x12191A, 0x0000002
-	.incbin "baserom.gba", 0x12191C, 0x0000001
-	.incbin "baserom.gba", 0x12191D, 0x0000001
-	.incbin "baserom.gba", 0x12191E, 0x0000001
-	.incbin "baserom.gba", 0x12191F, 0x0000001
-	.incbin "baserom.gba", 0x121920, 0x0000001
-	.incbin "baserom.gba", 0x121921, 0x000004B
+	.incbin "baserom.gba", 0x1218E8, 0x0000084
 
 gUnk_0812196C:: @ 0812196C
 	.incbin "baserom.gba", 0x12196C, 0x0000084
 
 gUnk_081219F0:: @ 081219F0
-	.incbin "baserom.gba", 0x1219F0, 0x000000C
-	.incbin "baserom.gba", 0x1219FC, 0x0000020
-	.incbin "baserom.gba", 0x121A1C, 0x0000002
-	.incbin "baserom.gba", 0x121A1E, 0x0000001
-	.incbin "baserom.gba", 0x121A1F, 0x0000001
-	.incbin "baserom.gba", 0x121A20, 0x000000D
+	.incbin "baserom.gba", 0x1219F0, 0x000003D
 
 gUnk_08121A2D:: @ 08121A2D
 	.incbin "baserom.gba", 0x121A2D, 0x000003D
@@ -43,8 +26,7 @@ gUnk_08121A6A:: @ 08121A6A
 	.incbin "baserom.gba", 0x121A6A, 0x000003D
 
 gUnk_08121AA7:: @ 08121AA7
-	.incbin "baserom.gba", 0x121AA7, 0x0000001
-	.incbin "baserom.gba", 0x121AA8, 0x000003C
+	.incbin "baserom.gba", 0x121AA7, 0x000003D
 
 gUnk_08121AE4:: @ 08121AE4
 	.incbin "baserom.gba", 0x121AE4, 0x0000010
@@ -56,9 +38,7 @@ gUnk_08121B04:: @ 08121B04
 	.incbin "baserom.gba", 0x121B04, 0x0000010
 
 gUnk_08121B14:: @ 08121B14
-	.incbin "baserom.gba", 0x121B14, 0x000000B
-	.incbin "baserom.gba", 0x121B1F, 0x0000004
-	.incbin "baserom.gba", 0x121B23, 0x0000001
+	.incbin "baserom.gba", 0x121B14, 0x0000010
 
 gUnk_08121B24:: @ 08121B24
 	.incbin "baserom.gba", 0x121B24, 0x0000024
diff --git a/data/animations/object/object45.s b/data/animations/object/object45.s
index b97e0f1f..a9077f5d 100644
--- a/data/animations/object/object45.s
+++ b/data/animations/object/object45.s
@@ -8,9 +8,7 @@ gUnk_08121BE0:: @ 08121BE0
 	.incbin "baserom.gba", 0x121BE0, 0x0000018
 
 gUnk_08121BF8:: @ 08121BF8
-	.incbin "baserom.gba", 0x121BF8, 0x0000022
-	.incbin "baserom.gba", 0x121C1A, 0x000000B
-	.incbin "baserom.gba", 0x121C25, 0x000000F
+	.incbin "baserom.gba", 0x121BF8, 0x000003C
 
 gUnk_08121C34:: @ 08121C34
 	.4byte gUnk_08121BE0
diff --git a/data/animations/object/object6A.s b/data/animations/object/object6A.s
index 8d82b5df..ff0da8bd 100644
--- a/data/animations/object/object6A.s
+++ b/data/animations/object/object6A.s
@@ -6,8 +6,7 @@
 
 
 gUnk_08122B4C:: @ 08122B4C
-	.incbin "baserom.gba", 0x122B4C, 0x0000001
-	.incbin "baserom.gba", 0x122B4D, 0x0000008
+	.incbin "baserom.gba", 0x122B4C, 0x0000009
 
 gUnk_08122B55:: @ 08122B55
 	.incbin "baserom.gba", 0x122B55, 0x000000F
@@ -138,8 +137,7 @@ gUnk_08122D22:: @ 08122D22
 	.incbin "baserom.gba", 0x122D22, 0x0000009
 
 gUnk_08122D2B:: @ 08122D2B
-	.incbin "baserom.gba", 0x122D2B, 0x0000004
-	.incbin "baserom.gba", 0x122D2F, 0x0000005
+	.incbin "baserom.gba", 0x122D2B, 0x0000009
 
 gUnk_08122D34:: @ 08122D34
 	.incbin "baserom.gba", 0x122D34, 0x0000021
diff --git a/data/animations/object/object9B.s b/data/animations/object/object9B.s
index dca3e7c9..2664994b 100644
--- a/data/animations/object/object9B.s
+++ b/data/animations/object/object9B.s
@@ -5,8 +5,7 @@
     .align 2
 
 gUnk_081242E8:: @ 081242E8
-	.incbin "baserom.gba", 0x1242E8, 0x000002C
-	.incbin "baserom.gba", 0x124314, 0x000000C
+	.incbin "baserom.gba", 0x1242E8, 0x0000038
 
 gUnk_08124320:: @ 08124320
 	.incbin "baserom.gba", 0x124320, 0x0000028
diff --git a/data/animations/object/pot.s b/data/animations/object/pot.s
index 6d82034b..73b08ea1 100644
--- a/data/animations/object/pot.s
+++ b/data/animations/object/pot.s
@@ -20,15 +20,13 @@ gUnk_0811F0F0:: @ 0811F0F0
 	.incbin "baserom.gba", 0x11F0F0, 0x0000005
 
 gUnk_0811F0F5:: @ 0811F0F5
-	.incbin "baserom.gba", 0x11F0F5, 0x0000003
-	.incbin "baserom.gba", 0x11F0F8, 0x0000002
+	.incbin "baserom.gba", 0x11F0F5, 0x0000005
 
 gUnk_0811F0FA:: @ 0811F0FA
 	.incbin "baserom.gba", 0x11F0FA, 0x0000005
 
 gUnk_0811F0FF:: @ 0811F0FF
-	.incbin "baserom.gba", 0x11F0FF, 0x0000001
-	.incbin "baserom.gba", 0x11F100, 0x0000004
+	.incbin "baserom.gba", 0x11F0FF, 0x0000005
 
 gUnk_0811F104:: @ 0811F104
 	.incbin "baserom.gba", 0x11F104, 0x0000005
diff --git a/data/animations/object/pullableLever.s b/data/animations/object/pullableLever.s
index dd92ce2c..3aa4daa4 100644
--- a/data/animations/object/pullableLever.s
+++ b/data/animations/object/pullableLever.s
@@ -68,8 +68,7 @@ gUnk_08122314:: @ 08122314
 	.incbin "baserom.gba", 0x122314, 0x0000004
 
 gUnk_08122318:: @ 08122318
-	.incbin "baserom.gba", 0x122318, 0x0000003
-	.incbin "baserom.gba", 0x12231B, 0x0000001
+	.incbin "baserom.gba", 0x122318, 0x0000004
 
 gUnk_0812231C:: @ 0812231C
 	.incbin "baserom.gba", 0x12231C, 0x0000004
@@ -78,8 +77,7 @@ gUnk_08122320:: @ 08122320
 	.incbin "baserom.gba", 0x122320, 0x0000004
 
 gUnk_08122324:: @ 08122324
-	.incbin "baserom.gba", 0x122324, 0x0000003
-	.incbin "baserom.gba", 0x122327, 0x0000001
+	.incbin "baserom.gba", 0x122324, 0x0000004
 
 gUnk_08122328:: @ 08122328
 	.incbin "baserom.gba", 0x122328, 0x0000004
diff --git a/data/animations/object/pullableMushroom.s b/data/animations/object/pullableMushroom.s
index 0f36d55c..ab8154da 100644
--- a/data/animations/object/pullableMushroom.s
+++ b/data/animations/object/pullableMushroom.s
@@ -8,16 +8,13 @@ gUnk_08121204:: @ 08121204
 	.incbin "baserom.gba", 0x121204, 0x0000004
 
 gUnk_08121208:: @ 08121208
-	.incbin "baserom.gba", 0x121208, 0x000000C
-	.incbin "baserom.gba", 0x121214, 0x0000011
+	.incbin "baserom.gba", 0x121208, 0x000001D
 
 gUnk_08121225:: @ 08121225
-	.incbin "baserom.gba", 0x121225, 0x000000F
-	.incbin "baserom.gba", 0x121234, 0x0000001
+	.incbin "baserom.gba", 0x121225, 0x0000010
 
 gUnk_08121235:: @ 08121235
-	.incbin "baserom.gba", 0x121235, 0x0000002
-	.incbin "baserom.gba", 0x121237, 0x000001B
+	.incbin "baserom.gba", 0x121235, 0x000001D
 
 gUnk_08121252:: @ 08121252
 	.incbin "baserom.gba", 0x121252, 0x0000011
diff --git a/data/animations/object/pushableRock.s b/data/animations/object/pushableRock.s
index 2b780a20..0b7a0b11 100644
--- a/data/animations/object/pushableRock.s
+++ b/data/animations/object/pushableRock.s
@@ -11,15 +11,10 @@ gUnk_08121094:: @ 08121094
 	.incbin "baserom.gba", 0x121094, 0x000003C
 
 gUnk_081210D0:: @ 081210D0
-	.incbin "baserom.gba", 0x1210D0, 0x0000036
-	.incbin "baserom.gba", 0x121106, 0x0000005
-	.incbin "baserom.gba", 0x12110B, 0x0000001
+	.incbin "baserom.gba", 0x1210D0, 0x000003C
 
 gUnk_0812110C:: @ 0812110C
-	.incbin "baserom.gba", 0x12110C, 0x0000007
-	.incbin "baserom.gba", 0x121113, 0x0000006
-	.incbin "baserom.gba", 0x121119, 0x0000003
-	.incbin "baserom.gba", 0x12111C, 0x000002C
+	.incbin "baserom.gba", 0x12110C, 0x000003C
 
 gUnk_08121148:: @ 08121148
 	.incbin "baserom.gba", 0x121148, 0x000000C
diff --git a/data/animations/object/specialFx.s b/data/animations/object/specialFx.s
index 2d1b976c..9e6a1ede 100644
--- a/data/animations/object/specialFx.s
+++ b/data/animations/object/specialFx.s
@@ -17,8 +17,7 @@ gUnk_0811FBC1:: @ 0811FBC1
 	.incbin "baserom.gba", 0x11FBC1, 0x0000020
 
 gUnk_0811FBE1:: @ 0811FBE1
-	.incbin "baserom.gba", 0x11FBE1, 0x000000C
-	.incbin "baserom.gba", 0x11FBED, 0x0000010
+	.incbin "baserom.gba", 0x11FBE1, 0x000001C
 
 gUnk_0811FBFD:: @ 0811FBFD
 	.incbin "baserom.gba", 0x11FBFD, 0x0000014
@@ -135,46 +134,31 @@ gUnk_0811FFDF:: @ 0811FFDF
 	.incbin "baserom.gba", 0x11FFDF, 0x0000018
 
 gUnk_0811FFF7:: @ 0811FFF7
-	.incbin "baserom.gba", 0x11FFF7, 0x0000009
-	.incbin "baserom.gba", 0x120000, 0x0000004
-	.incbin "baserom.gba", 0x120004, 0x0000006
-	.incbin "baserom.gba", 0x12000A, 0x0000004
-	.incbin "baserom.gba", 0x12000E, 0x0000001
-	.incbin "baserom.gba", 0x12000F, 0x0000001
-	.incbin "baserom.gba", 0x120010, 0x0000007
+	.incbin "baserom.gba", 0x11FFF7, 0x0000020
 
 gUnk_08120017:: @ 08120017
-	.incbin "baserom.gba", 0x120017, 0x0000011
-	.incbin "baserom.gba", 0x120028, 0x0000004
-	.incbin "baserom.gba", 0x12002C, 0x000000F
+	.incbin "baserom.gba", 0x120017, 0x0000024
 
 gUnk_0812003B:: @ 0812003B
-	.incbin "baserom.gba", 0x12003B, 0x0000017
-	.incbin "baserom.gba", 0x120052, 0x000000A
-	.incbin "baserom.gba", 0x12005C, 0x0000007
+	.incbin "baserom.gba", 0x12003B, 0x0000028
 
 gUnk_08120063:: @ 08120063
 	.incbin "baserom.gba", 0x120063, 0x000001C
 
 gUnk_0812007F:: @ 0812007F
-	.incbin "baserom.gba", 0x12007F, 0x0000009
-	.incbin "baserom.gba", 0x120088, 0x0000013
+	.incbin "baserom.gba", 0x12007F, 0x000001C
 
 gUnk_0812009B:: @ 0812009B
 	.incbin "baserom.gba", 0x12009B, 0x0000014
 
 gUnk_081200AF:: @ 081200AF
-	.incbin "baserom.gba", 0x1200AF, 0x000001B
-	.incbin "baserom.gba", 0x1200CA, 0x0000001
+	.incbin "baserom.gba", 0x1200AF, 0x000001C
 
 gUnk_081200CB:: @ 081200CB
-	.incbin "baserom.gba", 0x1200CB, 0x0000005
-	.incbin "baserom.gba", 0x1200D0, 0x0000012
-	.incbin "baserom.gba", 0x1200E2, 0x0000009
+	.incbin "baserom.gba", 0x1200CB, 0x0000020
 
 gUnk_081200EB:: @ 081200EB
-	.incbin "baserom.gba", 0x1200EB, 0x0000013
-	.incbin "baserom.gba", 0x1200FE, 0x0000001
+	.incbin "baserom.gba", 0x1200EB, 0x0000014
 
 gUnk_081200FF:: @ 081200FF
 	.incbin "baserom.gba", 0x1200FF, 0x0000024
@@ -189,8 +173,7 @@ gUnk_08120167:: @ 08120167
 	.incbin "baserom.gba", 0x120167, 0x0000018
 
 gUnk_0812017F:: @ 0812017F
-	.incbin "baserom.gba", 0x12017F, 0x0000011
-	.incbin "baserom.gba", 0x120190, 0x0000007
+	.incbin "baserom.gba", 0x12017F, 0x0000018
 
 gUnk_08120197:: @ 08120197
 	.incbin "baserom.gba", 0x120197, 0x0000018
@@ -199,9 +182,7 @@ gUnk_081201AF:: @ 081201AF
 	.incbin "baserom.gba", 0x1201AF, 0x0000031
 
 gUnk_081201E0:: @ 081201E0
-	.incbin "baserom.gba", 0x1201E0, 0x000000D
-	.incbin "baserom.gba", 0x1201ED, 0x000000B
-	.incbin "baserom.gba", 0x1201F8, 0x0000011
+	.incbin "baserom.gba", 0x1201E0, 0x0000029
 
 gUnk_08120209:: @ 08120209
 	.incbin "baserom.gba", 0x120209, 0x0000038
@@ -210,8 +191,7 @@ gUnk_08120241:: @ 08120241
 	.incbin "baserom.gba", 0x120241, 0x0000038
 
 gUnk_08120279:: @ 08120279
-	.incbin "baserom.gba", 0x120279, 0x0000007
-	.incbin "baserom.gba", 0x120280, 0x000002D
+	.incbin "baserom.gba", 0x120279, 0x0000034
 
 gUnk_081202AD:: @ 081202AD
 	.incbin "baserom.gba", 0x1202AD, 0x0000011
@@ -220,12 +200,10 @@ gUnk_081202BE:: @ 081202BE
 	.incbin "baserom.gba", 0x1202BE, 0x0000025
 
 gUnk_081202E3:: @ 081202E3
-	.incbin "baserom.gba", 0x1202E3, 0x0000009
-	.incbin "baserom.gba", 0x1202EC, 0x0000020
+	.incbin "baserom.gba", 0x1202E3, 0x0000029
 
 gUnk_0812030C:: @ 0812030C
-	.incbin "baserom.gba", 0x12030C, 0x0000014
-	.incbin "baserom.gba", 0x120320, 0x0000030
+	.incbin "baserom.gba", 0x12030C, 0x0000044
 
 gUnk_08120350:: @ 08120350
 	.incbin "baserom.gba", 0x120350, 0x000001C
@@ -237,8 +215,7 @@ gUnk_0812038C:: @ 0812038C
 	.incbin "baserom.gba", 0x12038C, 0x0000038
 
 gUnk_081203C4:: @ 081203C4
-	.incbin "baserom.gba", 0x1203C4, 0x0000026
-	.incbin "baserom.gba", 0x1203EA, 0x0000012
+	.incbin "baserom.gba", 0x1203C4, 0x0000038
 
 gUnk_081203FC:: @ 081203FC
 	.4byte gUnk_0811FB10