Move some trainer data from data2b.s to c structs.

1 files changed, 0 insertions, 232 deletions

diff --git a/data/data2b.s b/data/data2b.s
index 87ca0b881..bf28d13d6 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -4630,235 +4630,3 @@ gUnknown_08305D0C:: @ 8305D0C
 	.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
 	.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
 	.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
-
-@ 830B62C
-	.include "data/trainer_parties.inc"
-
-@ 830FCD4
-	.include "data/text/trainer_class_names.inc"
-
-@ 8310030
-	.include "data/trainers.inc"
-
-@ 83185C8
-	.include "data/text/species_names.inc"
-
-@ 831977C
-	.include "data/text/move_names.inc"
-
-.align 2
-	.2byte 0x0300, 0x0000
-
-	.align 2
-gUnknown_0831A988:: @ 831A988
-	.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_0831A990:: @ 831A990
-	.byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_0831A998:: @ 831A998
-	.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
-	.align 2
-gUnknown_0831A9A8:: @ 831A9A8
-	.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000
-	.2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
-	.align 2
-gUnknown_0831A9C8:: @ 831A9C8
-	.4byte gUnknown_0831A998
-	.4byte gUnknown_0831A9A8
-
-	.align 2
-gUnknown_0831A9D0:: @ 831A9D0
-	spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
-
-	.align 2
-gUnknown_0831A9E8:: @ 831A9E8
-	spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
-
-	.align 2
-gUnknown_0831AA00:: @ 831AA00
-	obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
-
-	.align 2
-gBattleBgTemplates:: @ 831AA08
-	.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
-
-	.align 2
-gUnknown_0831AA18:: @ 831AA18
-	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
-	window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
-	window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
-	window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
-	window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
-	window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
-	window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
-	window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
-	window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
-	window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
-	window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
-	window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
-	window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
-	window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
-	window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
-	window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020
-	window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040
-	window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020
-	window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040
-	window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060
-	window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080
-	window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
-	window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
-	window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
-	null_window_template
-
-	.align 2
-gUnknown_0831AAE0:: @ 831AAE0
-	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
-	window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
-	window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
-	window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
-	window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
-	window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
-	window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
-	window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
-	window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
-	window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
-	window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
-	window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
-	window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
-	window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
-	window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
-	window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100
-	window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110
-	window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114
-	window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124
-	window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130
-	window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
-	window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
-	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
-	null_window_template
-
-	.align 2
-gBattleWindowTemplates:: @ 831ABA0
-	.4byte gUnknown_0831AA18
-	.4byte gUnknown_0831AAE0
-
-	.align 2
-gBattleTerrainTable:: @ 831ABA8
-	@ tall_grass
-	.4byte gBattleTerrainTiles_TallGrass
-	.4byte gBattleTerrainTilemap_TallGrass
-	.4byte gBattleTerrainAnimTiles_TallGrass
-	.4byte gBattleTerrainAnimTilemap_TallGrass
-	.4byte gBattleTerrainPalette_TallGrass
-
-	@ long_grass
-	.4byte gBattleTerrainTiles_LongGrass
-	.4byte gBattleTerrainTilemap_LongGrass
-	.4byte gBattleTerrainAnimTiles_LongGrass
-	.4byte gBattleTerrainAnimTilemap_LongGrass
-	.4byte gBattleTerrainPalette_LongGrass
-
-	@ sand
-	.4byte gBattleTerrainTiles_Sand
-	.4byte gBattleTerrainTilemap_Sand
-	.4byte gBattleTerrainAnimTiles_Sand
-	.4byte gBattleTerrainAnimTilemap_Sand
-	.4byte gBattleTerrainPalette_Sand
-
-	@ underwater
-	.4byte gBattleTerrainTiles_Underwater
-	.4byte gBattleTerrainTilemap_Underwater
-	.4byte gBattleTerrainAnimTiles_Underwater
-	.4byte gBattleTerrainAnimTilemap_Underwater
-	.4byte gBattleTerrainPalette_Underwater
-
-	@ water
-	.4byte gBattleTerrainTiles_Water
-	.4byte gBattleTerrainTilemap_Water
-	.4byte gBattleTerrainAnimTiles_Water
-	.4byte gBattleTerrainAnimTilemap_Water
-	.4byte gBattleTerrainPalette_Water
-
-	@ pond_water
-	.4byte gBattleTerrainTiles_PondWater
-	.4byte gBattleTerrainTilemap_PondWater
-	.4byte gBattleTerrainAnimTiles_PondWater
-	.4byte gBattleTerrainAnimTilemap_PondWater
-	.4byte gBattleTerrainPalette_PondWater
-
-	@ rock
-	.4byte gBattleTerrainTiles_Rock
-	.4byte gBattleTerrainTilemap_Rock
-	.4byte gBattleTerrainAnimTiles_Rock
-	.4byte gBattleTerrainAnimTilemap_Rock
-	.4byte gBattleTerrainPalette_Rock
-
-	@ cave
-	.4byte gBattleTerrainTiles_Cave
-	.4byte gBattleTerrainTilemap_Cave
-	.4byte gBattleTerrainAnimTiles_Cave
-	.4byte gBattleTerrainAnimTilemap_Cave
-	.4byte gBattleTerrainPalette_Cave
-
-	@ building
-	.4byte gBattleTerrainTiles_Building
-	.4byte gBattleTerrainTilemap_Building
-	.4byte gBattleTerrainAnimTiles_Building
-	.4byte gBattleTerrainAnimTilemap_Building
-	.4byte gBattleTerrainPalette_Building
-
-	@ plain
-	.4byte gBattleTerrainTiles_Building
-	.4byte gBattleTerrainTilemap_Building
-	.4byte gBattleTerrainAnimTiles_Building
-	.4byte gBattleTerrainAnimTilemap_Building
-	.4byte gBattleTerrainPalette_Plain
-
-	.align 2
-gUnknown_0831AC70:: @ 831AC70
-	.4byte REG_BG3HOFS
-	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
-	.4byte 1
-	.4byte REG_BG3HOFS
-	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
-	.4byte 1
-
-	.align 2
-gUnknown_0831AC88:: @ 831AC88
-	spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528
-
-gText_ShedinjaJapaneseName:: @ 831ACA0
-	.string "ヌケニン$" @ Nukenin
-    
-	.align 2
-gUnknown_0831ACA8:: @ 831ACA8
-	.2byte 0x0100
-	.2byte 0xC000
-	.2byte 0x0800
-
-	.align 2
-gUnknown_0831ACB0:: @ 831ACB0
-	.2byte 0x0100
-	.2byte 0xC000
-	.2byte 0x2800
-
-	.align 2
-gUnknown_0831ACB8:: @ 831ACB8
-	.2byte 0x0000, 0x0005, 0xfffe, 0x0000
-
-	.align 2
-gUnknown_0831ACC0:: @ 831ACC0
-	.4byte gUnknown_0831ACB8
-
-	.align 2
-gUnknown_0831ACC4:: @ 831ACC4
-	.2byte 0xfff0, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x3c00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
-
-	.align 2
-gUnknown_0831ACDC:: @ 831ACDC
-	.4byte gUnknown_0831ACC4