Merge pull request #667 from MokhaLeee/fe6sio

split data
FireEmblemUniverse · Aug 22, 2024 · b8e8b56 · b8e8b56
2 parents 8e7ea35 + ed5ce10
commit b8e8b56
Show file tree

Hide file tree

Showing 30 changed files with 1,639 additions and 11,037 deletions.
diff --git a/data/const_data_DAD68.s b/data/const_data_DAD68.s
diff --git a/data/data_A195B0.s b/data/data_A195B0.s
@@ -30,15 +30,7 @@ gUnknown_08A1A23C:  @ 0x08A1A23C
 
 	.global gUnknown_08A1A3FC
 gUnknown_08A1A3FC:  @ 0x08A1A3FC
-@ Replacing .incbin "baserom.gba", 0xA1A3FC, 0x20
-    .4byte 0x5ab50000
-    .4byte 0x2508462f
-    .4byte 0x26b50000
-    .4byte 0x8A708A7 + 0xa5
-    .4byte 0x59400956
-    .4byte 0x394e520e
-    .4byte 0x32ca01a1
-    .4byte 0x30a5
+	.incbin "baserom.gba", 0xA1A3FC, 0x20
 
 	.global Tsa_08A1A41C
 Tsa_08A1A41C:  @ 0x08A1A41C
@@ -226,12 +218,4 @@ gGfx_SupportMenu:  @ 0x08A1DD0C
 
 	.global gPal_SupportMenu
 gPal_SupportMenu:  @ 0x08A1E0D8
-@ Replacing .incbin "baserom.gba", 0xA1E0D8, 0x1A1C
-    .4byte 0x14c7520e
-    .4byte 0x2d2628e4
-    .4byte 0x3d8a3548
-    .4byte 0x4a0e41cc
-    .4byte 0x56925250
-    .4byte 0x7fff14c7
-    .4byte 0x52d7677d
-    .4byte 0x3e11
+	.incbin "baserom.gba", 0xA1E0D8, 0x20
diff --git a/data/data_AA7760.s b/data/data_AA7760.s
@@ -90,15 +90,7 @@ gTsa_08AB0A20:  @ 0x08AB0A20
 
 	.global gPal_08AB0B24
 gPal_08AB0B24:  @ 0x08AB0B24
-@ Replacing .incbin "baserom.gba", 0xAB0B24, 0x20
-    .4byte 0x4414290
-    .4byte 0x1f3e571d
-    .4byte 0x33bf277f
-    .4byte 0x6bff47bf
-    .4byte 0x45ee21ba
-    .4byte Pal_NaglfarSprites_B + 0x2c4
-    .4byte 0xcd2467b
-    .4byte 0x7fff044a
+	.incbin "baserom.gba", 0xAB0B24, 0x20
 
 	.global gGfx_TitleDemonKing
 gGfx_TitleDemonKing:  @ 0x08AB0B44

diff --git a/data/data_B12A60.s b/data/data_B12A60.s
@@ -8,8 +8,8 @@ Img_CommGameBgScreen:  @ 0x08B12DB4
 Pal_CommGameBgScreenInShop:  @ 0x08B1754C
 	.incbin "baserom.gba", 0xB1754C, 0x20
 
-	.global gUnknown_08B1756C
-gUnknown_08B1756C:  @ 0x08B1756C
+	.global Pal_08B1756C
+Pal_08B1756C:  @ 0x08B1756C
 	.incbin "baserom.gba", 0xB1756C, 0x160
 
 	.global Tsa_08B176CC
@@ -28,39 +28,34 @@ Img_08B17864:  @ 0x08B17864
 Pal_08B17B44:  @ 0x08B17B44
 	.incbin "baserom.gba", 0xB17B44, 0x20
 
-	.global gUnknown_08B17B64
-gUnknown_08B17B64:  @ 0x08B17B64
+	.global Img_08B17B64
+Img_08B17B64:  @ 0x08B17B64
 	.incbin "baserom.gba", 0xB17B64, 0x1204
 
-	.global gUnknown_08B18D68
-gUnknown_08B18D68:  @ 0x08B18D68
+	.global Tsa_08B18D68
+Tsa_08B18D68:  @ 0x08B18D68
 	.incbin "baserom.gba", 0xB18D68, 0x16C
 
-	.global gUnknown_08B18ED4
-gUnknown_08B18ED4:  @ 0x08B18ED4
+	.global Pal_08B18ED4
+Pal_08B18ED4:  @ 0x08B18ED4
 	.incbin "baserom.gba", 0xB18ED4, 0x60
 
-	.global gUnknown_08B18F34
-gUnknown_08B18F34:  @ 0x08B18F34
+	.global Img_08B18F34
+Img_08B18F34:  @ 0x08B18F34
 	.incbin "baserom.gba", 0xB18F34, 0x7A4
 
-	.global gUnknown_08B196D8
-gUnknown_08B196D8:  @ 0x08B196D8
+	.global Img_08B196D8
+Img_08B196D8:  @ 0x08B196D8
 	.incbin "baserom.gba", 0xB196D8, 0x17C
 
-	.global gUnknown_08B19854
-gUnknown_08B19854:  @ 0x08B19854
+	.global Pal_08B19854
+Pal_08B19854:  @ 0x08B19854
 	.incbin "baserom.gba", 0xB19854, 0x20
 
-	.global gUnknown_08B19874
-gUnknown_08B19874:  @ 0x08B19874
+	.global Img_08B19874
+Img_08B19874:  @ 0x08B19874
 	.incbin "baserom.gba", 0xB19874, 0x578
 
-	.global gUnknown_08B19DEC
-gUnknown_08B19DEC:  @ 0x08B19DEC
+	.global Pal_08B19DEC
+Pal_08B19DEC:  @ 0x08B19DEC
 	.incbin "baserom.gba", 0xB19DEC, 0x20
-
-	.global gGuideTable
-gGuideTable:  @ 0x08B19E0C
-	.incbin "baserom.gba", 0xB19E0C, 0x5928
-