fix rom3 conflicts

2017-10-13 19:58:45 +02:00
parent 20d158cf4a 3040c1e1aa
commit 72ed861715
93 changed files with 13360 additions and 18899 deletions
@@ -1029,16 +1029,7 @@ gBagPockets: @ 2039DD8
 	.space 0x28

 gUnknown_02039E00: @ 2039E00
-	.space 0x2
-
-gUnknown_02039E02: @ 2039E02
-	.space 0xB
-
-gUnknown_02039E0D: @ 2039E0D
-	.space 0x11
-
-gUnknown_02039E1E: @ 2039E1E
-	.space 0xE2
+	.space 0x100

 gUnknown_02039F00: @ 2039F00
 	.space 0x8
@@ -1145,26 +1136,7 @@ gUnknown_0203A01D: @ 203A01D
 gUnknown_0203A020: @ 203A020
 	.space 0x4

-gUnknown_0203A024: @ 203A024
-	.space 0x2
-
-gUnknown_0203A026: @ 203A026
-	.space 0x2
-
-gUnknown_0203A028: @ 203A028
-	.space 0x2
-
-gUnknown_0203A02A: @ 203A02A
-	.space 0x2
-
-gUnknown_0203A02C: @ 203A02C
-	.space 0x4
-
-gUnknown_0203A030: @ 203A030
-	.space 0x1
-
-gUnknown_0203A031: @ 203A031
-	.space 0x3
+    .include "src/tv.o"

 gUnknown_0203A034: @ 203A034
 	.space 0x4