Move some data into battle_bg.c

1 files changed, 0 insertions, 136 deletions

diff --git a/src/battle/battle_1.c b/src/battle/battle_1.c
index 0eaca7b76..9ab9e08c5 100644
--- a/src/battle/battle_1.c
+++ b/src/battle/battle_1.c
@@ -468,139 +468,3 @@ const u8 gEnemyMonElevation[] = {
 #endif
 
 const u32 gUnknown_81F9528 = 0x101;
-
-const struct OamData gOamData_81F952C = {
-    .affineMode = ST_OAM_AFFINE_DOUBLE,
-    .size = 3
-};
-
-const struct OamData gOamData_81F9534 = {
-    .affineMode = ST_OAM_AFFINE_DOUBLE,
-    .size = 3,
-    .tileNum = 64
-};
-
-const union AffineAnimCmd gSpriteAffineAnim_81F953C[] = {
-    AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
-    AFFINEANIMCMD_END
-};
-
-const union AffineAnimCmd gSpriteAffineAnim_81F954C[] = {
-    AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
-    AFFINEANIMCMD_FRAME(0x18, 0x18, 0, -128),
-    AFFINEANIMCMD_FRAME(0x18, 0x18, 0, -128),
-    AFFINEANIMCMD_END
-};
-
-const union AffineAnimCmd *const gSpriteAffineAnimTable_81F956C[] = {
-    gSpriteAffineAnim_81F953C,
-    gSpriteAffineAnim_81F954C
-};
-
-const struct SpriteTemplate gSpriteTemplate_81F9574 = {
-    .tileTag = 10000,
-    .paletteTag = 10000,
-    .oam = &gOamData_81F952C,
-    .anims = gDummySpriteAnimTable,
-    .images = NULL,
-    .affineAnims = gSpriteAffineAnimTable_81F956C,
-    .callback = nullsub_36
-};
-
-const struct SpriteTemplate gSpriteTemplate_81F958C = {
-    .tileTag = 10000,
-    .paletteTag = 10000,
-    .oam = &gOamData_81F9534,
-    .anims = gDummySpriteAnimTable,
-    .images = NULL,
-    .affineAnims = gSpriteAffineAnimTable_81F956C,
-    .callback = nullsub_36
-};
-
-extern const u8 gUnknown_08E5DC2C[];
-
-const struct CompressedSpriteSheet gUnknown_081F95A4[] = {
-    {gUnknown_08E5DC2C, 4096, 0x2710},
-};
-
-struct BattleBackground
-{
-    const void *tileset;
-    const void *tilemap;
-    const void *entryTileset;
-    const void *entryTilemap;
-    const void *palette;
-};
-
-const struct BattleBackground gBattleTerrainTable[] = {
-    {
-	.tileset = gBattleTerrainTiles_TallGrass,
-	.tilemap = gBattleTerrainTilemap_TallGrass,
-	.entryTileset = gBattleTerrainAnimTiles_TallGrass,
-	.entryTilemap = gBattleTerrainAnimTilemap_TallGrass,
-	.palette = gBattleTerrainPalette_TallGrass
-    },
-    {
-	.tileset = gBattleTerrainTiles_LongGrass,
-	.tilemap = gBattleTerrainTilemap_LongGrass,
-	.entryTileset = gBattleTerrainAnimTiles_LongGrass,
-	.entryTilemap = gBattleTerrainAnimTilemap_LongGrass,
-	.palette = gBattleTerrainPalette_LongGrass
-    },
-    {
-	.tileset = gBattleTerrainTiles_Sand,
-	.tilemap = gBattleTerrainTilemap_Sand,
-	.entryTileset = gBattleTerrainAnimTiles_Sand,
-	.entryTilemap = gBattleTerrainAnimTilemap_Sand,
-	.palette = gBattleTerrainPalette_Sand
-    },
-    {
-	.tileset = gBattleTerrainTiles_Underwater,
-	.tilemap = gBattleTerrainTilemap_Underwater,
-	.entryTileset = gBattleTerrainAnimTiles_Underwater,
-	.entryTilemap = gBattleTerrainAnimTilemap_Underwater,
-	.palette = gBattleTerrainPalette_Underwater
-    },
-    {
-	.tileset = gBattleTerrainTiles_Water,
-	.tilemap = gBattleTerrainTilemap_Water,
-	.entryTileset = gBattleTerrainAnimTiles_Water,
-	.entryTilemap = gBattleTerrainAnimTilemap_Water,
-	.palette = gBattleTerrainPalette_Water
-    },
-    {
-	.tileset = gBattleTerrainTiles_PondWater,
-	.tilemap = gBattleTerrainTilemap_PondWater,
-	.entryTileset = gBattleTerrainAnimTiles_PondWater,
-	.entryTilemap = gBattleTerrainAnimTilemap_PondWater,
-	.palette = gBattleTerrainPalette_PondWater
-    },
-    {
-	.tileset = gBattleTerrainTiles_Rock,
-	.tilemap = gBattleTerrainTilemap_Rock,
-	.entryTileset = gBattleTerrainAnimTiles_Rock,
-	.entryTilemap = gBattleTerrainAnimTilemap_Rock,
-	.palette = gBattleTerrainPalette_Rock
-    },
-    {
-	.tileset = gBattleTerrainTiles_Cave,
-	.tilemap = gBattleTerrainTilemap_Cave,
-	.entryTileset = gBattleTerrainAnimTiles_Cave,
-	.entryTilemap = gBattleTerrainAnimTilemap_Cave,
-	.palette = gBattleTerrainPalette_Cave
-    },
-    {
-	.tileset = gBattleTerrainTiles_Building,
-	.tilemap = gBattleTerrainTilemap_Building,
-	.entryTileset = gBattleTerrainAnimTiles_Building,
-	.entryTilemap = gBattleTerrainAnimTilemap_Building,
-	.palette = gBattleTerrainPalette_Building
-    },
-    {
-	.tileset = gBattleTerrainTiles_Building,
-	.tilemap = gBattleTerrainTilemap_Building,
-	.entryTileset = gBattleTerrainAnimTiles_Building,
-	.entryTilemap = gBattleTerrainAnimTilemap_Building,
-	.palette = gBattleTerrainPalette_Plain
-    }
-};