Merge pull request #302 from Slawter666/data2b

Move some data from data2b.s to C

6 files changed, 0 insertions, 315 deletions

diff --git a/data/graphics/trainers/back_pic_coords.inc b/data/graphics/trainers/back_pic_coords.inc
deleted file mode 100644
index 57a45c71e..000000000
--- a/data/graphics/trainers/back_pic_coords.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-	.align 2
-gTrainerBackPicCoords:: @ 8305D2C
-	.byte 0x08, 0x04, 0x00, 0x00
-	.byte 0x08, 0x04, 0x00, 0x00
-	.byte 0x08, 0x05, 0x00, 0x00
-	.byte 0x08, 0x05, 0x00, 0x00
-	.byte 0x08, 0x04, 0x00, 0x00
-	.byte 0x08, 0x04, 0x00, 0x00
-	.byte 0x08, 0x04, 0x00, 0x00
-	.byte 0x08, 0x04, 0x00, 0x00
diff --git a/data/graphics/trainers/back_pic_palette_table.inc b/data/graphics/trainers/back_pic_palette_table.inc
deleted file mode 100644
index 46e56f2ac..000000000
--- a/data/graphics/trainers/back_pic_palette_table.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-	.align 2
-gTrainerBackPicPaletteTable:: @ 8305D8C
-	obj_pal gTrainerPalette_Brendan, 0
-	obj_pal gTrainerPalette_May, 1
-	obj_pal gTrainerBackPicPalette_Red, 2
-	obj_pal gTrainerBackPicPalette_Leaf, 3
-	obj_pal gTrainerPalette_RubySapphireBrendan, 4
-	obj_pal gTrainerPalette_RubySapphireMay, 5
-	obj_pal gTrainerPalette_Wally, 6
-	obj_pal gTrainerPalette_Steven, 7
diff --git a/data/graphics/trainers/back_pic_table.inc b/data/graphics/trainers/back_pic_table.inc
deleted file mode 100644
index e67c2a073..000000000
--- a/data/graphics/trainers/back_pic_table.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-	.align 2
-gTrainerBackPicTable:: @ 8305D4C
-	obj_tiles gTrainerBackPic_Brendan, 0x2000, 0
-	obj_tiles gTrainerBackPic_May, 0x2000, 1
-	obj_tiles gTrainerBackPic_Red, 0x2800, 2
-	obj_tiles gTrainerBackPic_Leaf, 0x2800, 3
-	obj_tiles gTrainerBackPic_RubySapphireBrendan, 0x2000, 4
-	obj_tiles gTrainerBackPic_RubySapphireMay, 0x2000, 5
-	obj_tiles gTrainerBackPic_Wally, 0x2000, 6
-	obj_tiles gTrainerBackPic_Steven, 0x2000, 7
diff --git a/data/graphics/trainers/front_pic_coords.inc b/data/graphics/trainers/front_pic_coords.inc
deleted file mode 100644
index 8d20f0a9e..000000000
--- a/data/graphics/trainers/front_pic_coords.inc
+++ /dev/null
@@ -1,95 +0,0 @@
-	.align 2
-gTrainerFrontPicCoords:: @ 83054E0
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x02, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
-	.byte 0x08, 0x01, 0x00, 0x00
diff --git a/data/graphics/trainers/front_pic_palette_table.inc b/data/graphics/trainers/front_pic_palette_table.inc
deleted file mode 100644
index 44cf98dab..000000000
--- a/data/graphics/trainers/front_pic_palette_table.inc
+++ /dev/null
@@ -1,95 +0,0 @@
-	.align 2
-gTrainerFrontPicPaletteTable:: @ 830593C
-	obj_pal gTrainerPalette_Hiker, 0
-	obj_pal gTrainerPalette_AquaGruntM, 1
-	obj_pal gTrainerPalette_PokemonBreederF, 2
-	obj_pal gTrainerPalette_CoolTrainerM, 3
-	obj_pal gTrainerPalette_BirdKeeper, 4
-	obj_pal gTrainerPalette_Collector, 5
-	obj_pal gTrainerPalette_AquaGruntF, 6
-	obj_pal gTrainerPalette_SwimmerM, 7
-	obj_pal gTrainerPalette_MagmaGruntM, 8
-	obj_pal gTrainerPalette_ExpertM, 9
-	obj_pal gTrainerPalette_AquaAdminM, 10
-	obj_pal gTrainerPalette_BlackBelt, 11
-	obj_pal gTrainerPalette_AquaAdminF, 12
-	obj_pal gTrainerPalette_AquaLeaderArchie, 13
-	obj_pal gTrainerPalette_HexManiac, 14
-	obj_pal gTrainerPalette_AromaLady, 15
-	obj_pal gTrainerPalette_RuinManiac, 16
-	obj_pal gTrainerPalette_Interviewer, 17
-	obj_pal gTrainerPalette_TuberF, 18
-	obj_pal gTrainerPalette_TuberM, 19
-	obj_pal gTrainerPalette_CoolTrainerF, 20
-	obj_pal gTrainerPalette_Lady, 21
-	obj_pal gTrainerPalette_Beauty, 22
-	obj_pal gTrainerPalette_RichBoy, 23
-	obj_pal gTrainerPalette_ExpertF, 24
-	obj_pal gTrainerPalette_Pokemaniac, 25
-	obj_pal gTrainerPalette_MagmaGruntF, 26
-	obj_pal gTrainerPalette_Guitarist, 27
-	obj_pal gTrainerPalette_Kindler, 28
-	obj_pal gTrainerPalette_Camper, 29
-	obj_pal gTrainerPalette_Picnicker, 30
-	obj_pal gTrainerPalette_BugManiac, 31
-	obj_pal gTrainerPalette_PokemonBreederM, 32
-	obj_pal gTrainerPalette_PsychicM, 33
-	obj_pal gTrainerPalette_PsychicF, 34
-	obj_pal gTrainerPalette_Gentleman, 35
-	obj_pal gTrainerPalette_EliteFourSidney, 36
-	obj_pal gTrainerPalette_EliteFourPhoebe, 37
-	obj_pal gTrainerPalette_EliteFourGlacia, 38
-	obj_pal gTrainerPalette_EliteFourDrake, 39
-	obj_pal gTrainerPalette_LeaderRoxanne, 40
-	obj_pal gTrainerPalette_LeaderBrawly, 41
-	obj_pal gTrainerPalette_LeaderWattson, 42
-	obj_pal gTrainerPalette_LeaderFlannery, 43
-	obj_pal gTrainerPalette_LeaderNorman, 44
-	obj_pal gTrainerPalette_LeaderWinona, 45
-	obj_pal gTrainerPalette_LeaderTateAndLiza, 46
-	obj_pal gTrainerPalette_LeaderJuan, 47
-	obj_pal gTrainerPalette_SchoolKidM, 48
-	obj_pal gTrainerPalette_SchoolKidF, 49
-	obj_pal gTrainerPalette_SrAndJr, 50
-	obj_pal gTrainerPalette_WinstrateM, 51
-	obj_pal gTrainerPalette_WinstrateF, 52
-	obj_pal gTrainerPalette_Youngster, 53
-	obj_pal gTrainerPalette_ChampionWallace, 54
-	obj_pal gTrainerPalette_Fisherman, 55
-	obj_pal gTrainerPalette_CyclingTriathleteM, 56
-	obj_pal gTrainerPalette_CyclingTriathleteF, 57
-	obj_pal gTrainerPalette_RunningTriathleteM, 58
-	obj_pal gTrainerPalette_RunningTriathleteF, 59
-	obj_pal gTrainerPalette_SwimmingTriathleteM, 60
-	obj_pal gTrainerPalette_SwimmingTriathleteF, 61
-	obj_pal gTrainerPalette_DragonTamer, 62
-	obj_pal gTrainerPalette_NinjaBoy, 63
-	obj_pal gTrainerPalette_BattleGirl, 64
-	obj_pal gTrainerPalette_ParasolLady, 65
-	obj_pal gTrainerPalette_SwimmerF, 66
-	obj_pal gTrainerPalette_Twins, 67
-	obj_pal gTrainerPalette_Sailor, 68
-	obj_pal gTrainerPalette_MagmaAdmin, 69
-	obj_pal gTrainerPalette_Wally, 70
-	obj_pal gTrainerPalette_Brendan, 71
-	obj_pal gTrainerPalette_May, 72
-	obj_pal gTrainerPalette_BugCatcher, 73
-	obj_pal gTrainerPalette_PokemonRangerM, 74
-	obj_pal gTrainerPalette_PokemonRangerF, 75
-	obj_pal gTrainerPalette_MagmaLeaderMaxie, 76
-	obj_pal gTrainerPalette_Lass, 77
-	obj_pal gTrainerPalette_YoungCouple, 78
-	obj_pal gTrainerPalette_OldCouple, 79
-	obj_pal gTrainerPalette_SisAndBro, 80
-	obj_pal gTrainerPalette_Steven, 81
-	obj_pal gTrainerPalette_SalonMaidenAnabel, 82
-	obj_pal gTrainerPalette_DomeAceTucker, 83
-	obj_pal gTrainerPalette_PalaceMavenSpenser, 84
-	obj_pal gTrainerPalette_ArenaTycoonGreta, 85
-	obj_pal gTrainerPalette_FactoryHeadNoland, 86
-	obj_pal gTrainerPalette_PikeQueenLucy, 87
-	obj_pal gTrainerPalette_PyramidKingBrandon, 88
-	obj_pal gTrainerPalette_Red, 89
-	obj_pal gTrainerPalette_Leaf, 90
-	obj_pal gTrainerPalette_RubySapphireBrendan, 91
-	obj_pal gTrainerPalette_RubySapphireMay, 92
diff --git a/data/graphics/trainers/front_pic_table.inc b/data/graphics/trainers/front_pic_table.inc
deleted file mode 100644
index 91294d170..000000000
--- a/data/graphics/trainers/front_pic_table.inc
+++ /dev/null
@@ -1,95 +0,0 @@
-	.align 2
-gTrainerFrontPicTable:: @ 8305654
-	obj_tiles gTrainerFrontPic_Hiker, 0x800, 0
-	obj_tiles gTrainerFrontPic_AquaGruntM, 0x800, 1
-	obj_tiles gTrainerFrontPic_PokemonBreederF, 0x800, 2
-	obj_tiles gTrainerFrontPic_CoolTrainerM, 0x800, 3
-	obj_tiles gTrainerFrontPic_BirdKeeper, 0x800, 4
-	obj_tiles gTrainerFrontPic_Collector, 0x800, 5
-	obj_tiles gTrainerFrontPic_AquaGruntF, 0x800, 6
-	obj_tiles gTrainerFrontPic_SwimmerM, 0x800, 7
-	obj_tiles gTrainerFrontPic_MagmaGruntM, 0x800, 8
-	obj_tiles gTrainerFrontPic_ExpertM, 0x800, 9
-	obj_tiles gTrainerFrontPic_AquaAdminM, 0x800, 10
-	obj_tiles gTrainerFrontPic_BlackBelt, 0x800, 11
-	obj_tiles gTrainerFrontPic_AquaAdminF, 0x800, 12
-	obj_tiles gTrainerFrontPic_AquaLeaderArchie, 0x800, 13
-	obj_tiles gTrainerFrontPic_HexManiac, 0x800, 14
-	obj_tiles gTrainerFrontPic_AromaLady, 0x800, 15
-	obj_tiles gTrainerFrontPic_RuinManiac, 0x800, 16
-	obj_tiles gTrainerFrontPic_Interviewer, 0x800, 17
-	obj_tiles gTrainerFrontPic_TuberF, 0x800, 18
-	obj_tiles gTrainerFrontPic_TuberM, 0x800, 19
-	obj_tiles gTrainerFrontPic_CoolTrainerF, 0x800, 20
-	obj_tiles gTrainerFrontPic_Lady, 0x800, 21
-	obj_tiles gTrainerFrontPic_Beauty, 0x800, 22
-	obj_tiles gTrainerFrontPic_RichBoy, 0x800, 23
-	obj_tiles gTrainerFrontPic_ExpertF, 0x800, 24
-	obj_tiles gTrainerFrontPic_Pokemaniac, 0x800, 25
-	obj_tiles gTrainerFrontPic_MagmaGruntF, 0x800, 26
-	obj_tiles gTrainerFrontPic_Guitarist, 0x800, 27
-	obj_tiles gTrainerFrontPic_Kindler, 0x800, 28
-	obj_tiles gTrainerFrontPic_Camper, 0x800, 29
-	obj_tiles gTrainerFrontPic_Picnicker, 0x800, 30
-	obj_tiles gTrainerFrontPic_BugManiac, 0x800, 31
-	obj_tiles gTrainerFrontPic_PokemonBreederM, 0x800, 32
-	obj_tiles gTrainerFrontPic_PsychicM, 0x800, 33
-	obj_tiles gTrainerFrontPic_PsychicF, 0x800, 34
-	obj_tiles gTrainerFrontPic_Gentleman, 0x800, 35
-	obj_tiles gTrainerFrontPic_EliteFourSidney, 0x800, 36
-	obj_tiles gTrainerFrontPic_EliteFourPhoebe, 0x800, 37
-	obj_tiles gTrainerFrontPic_EliteFourGlacia, 0x800, 38
-	obj_tiles gTrainerFrontPic_EliteFourDrake, 0x800, 39
-	obj_tiles gTrainerFrontPic_LeaderRoxanne, 0x800, 40
-	obj_tiles gTrainerFrontPic_LeaderBrawly, 0x800, 41
-	obj_tiles gTrainerFrontPic_LeaderWattson, 0x800, 42
-	obj_tiles gTrainerFrontPic_LeaderFlannery, 0x800, 43
-	obj_tiles gTrainerFrontPic_LeaderNorman, 0x800, 44
-	obj_tiles gTrainerFrontPic_LeaderWinona, 0x800, 45
-	obj_tiles gTrainerFrontPic_LeaderTateAndLiza, 0x800, 46
-	obj_tiles gTrainerFrontPic_LeaderJuan, 0x800, 47
-	obj_tiles gTrainerFrontPic_SchoolKidM, 0x800, 48
-	obj_tiles gTrainerFrontPic_SchoolKidF, 0x800, 49
-	obj_tiles gTrainerFrontPic_SrAndJr, 0x1000, 50
-	obj_tiles gTrainerFrontPic_WinstrateM, 0x1000, 51
-	obj_tiles gTrainerFrontPic_WinstrateF, 0x800, 52
-	obj_tiles gTrainerFrontPic_Youngster, 0x800, 53
-	obj_tiles gTrainerFrontPic_ChampionWallace, 0x1000, 54
-	obj_tiles gTrainerFrontPic_Fisherman, 0x800, 55
-	obj_tiles gTrainerFrontPic_CyclingTriathleteM, 0x1000, 56
-	obj_tiles gTrainerFrontPic_CyclingTriathleteF, 0x800, 57
-	obj_tiles gTrainerFrontPic_RunningTriathleteM, 0x800, 58
-	obj_tiles gTrainerFrontPic_RunningTriathleteF, 0x800, 59
-	obj_tiles gTrainerFrontPic_SwimmingTriathleteM, 0x800, 60
-	obj_tiles gTrainerFrontPic_SwimmingTriathleteF, 0x800, 61
-	obj_tiles gTrainerFrontPic_DragonTamer, 0x800, 62
-	obj_tiles gTrainerFrontPic_NinjaBoy, 0x800, 63
-	obj_tiles gTrainerFrontPic_BattleGirl, 0x1000, 64
-	obj_tiles gTrainerFrontPic_ParasolLady, 0x800, 65
-	obj_tiles gTrainerFrontPic_SwimmerF, 0x800, 66
-	obj_tiles gTrainerFrontPic_Twins, 0x800, 67
-	obj_tiles gTrainerFrontPic_Sailor, 0x800, 68
-	obj_tiles gTrainerFrontPic_MagmaAdmin, 0x800, 69
-	obj_tiles gTrainerFrontPic_Wally, 0x800, 70
-	obj_tiles gTrainerFrontPic_Brendan, 0x800, 71
-	obj_tiles gTrainerFrontPic_May, 0x800, 72
-	obj_tiles gTrainerFrontPic_BugCatcher, 0x800, 73
-	obj_tiles gTrainerFrontPic_PokemonRangerM, 0x800, 74
-	obj_tiles gTrainerFrontPic_PokemonRangerF, 0x800, 75
-	obj_tiles gTrainerFrontPic_MagmaLeaderMaxie, 0x800, 76
-	obj_tiles gTrainerFrontPic_Lass, 0x800, 77
-	obj_tiles gTrainerFrontPic_YoungCouple, 0x800, 78
-	obj_tiles gTrainerFrontPic_OldCouple, 0x800, 79
-	obj_tiles gTrainerFrontPic_SisAndBro, 0x800, 80
-	obj_tiles gTrainerFrontPic_Steven, 0x800, 81
-	obj_tiles gTrainerFrontPic_SalonMaidenAnabel, 0x800, 82
-	obj_tiles gTrainerFrontPic_DomeAceTucker, 0x800, 83
-	obj_tiles gTrainerFrontPic_PalaceMavenSpenser, 0x800, 84
-	obj_tiles gTrainerFrontPic_ArenaTycoonGreta, 0x1000, 85
-	obj_tiles gTrainerFrontPic_FactoryHeadNoland, 0x800, 86
-	obj_tiles gTrainerFrontPic_PikeQueenLucy, 0x800, 87
-	obj_tiles gTrainerFrontPic_PyramidKingBrandon, 0x800, 88
-	obj_tiles gTrainerFrontPic_Red, 0x800, 89
-	obj_tiles gTrainerFrontPic_Leaf, 0x800, 90
-	obj_tiles gTrainerFrontPic_RubySapphireBrendan, 0x800, 91
-	obj_tiles gTrainerFrontPic_RubySapphireMay, 0x800, 92