define more data in C (#220)

* define more data in C

* correct typo in comments

6 files changed, 0 insertions, 407 deletions

diff --git a/data/battle_setup.s b/data/battle_setup.s
deleted file mode 100644
index eb790edf4..000000000
--- a/data/battle_setup.s
+++ /dev/null
@@ -1,77 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gBattleTransitionTable_Wild:: @ 839ACF8
-	.byte  8,  9,  5, 10,  0, 10,  7,  6
-
-gBattleTransitionTable_Trainer:: @ 839AD00
-	.byte  4, 11,  2,  3,  0, 10,  1,  6
-
-	.align 2
-gTrainerBattleSpecs_0:: @ 839AD08
-	.4byte gTrainerBattleMode, 0
-	.4byte gTrainerBattleOpponent, 1
-	.4byte gTrainerMapObjectLocalId, 1
-	.4byte gTrainerIntroSpeech, 2
-	.4byte gTrainerDefeatSpeech, 2
-	.4byte gTrainerVictorySpeech, 5
-	.4byte gTrainerCannotBattleSpeech, 5
-	.4byte gTrainerBattleEndScript, 5
-	.4byte gTrainerBattleScriptReturnAddress, 6
-
-	.align 2
-gTrainerBattleSpecs_1:: @ 839AD50
-	.4byte gTrainerBattleMode, 0
-	.4byte gTrainerBattleOpponent, 1
-	.4byte gTrainerMapObjectLocalId, 1
-	.4byte gTrainerIntroSpeech, 2
-	.4byte gTrainerDefeatSpeech, 2
-	.4byte gTrainerVictorySpeech, 5
-	.4byte gTrainerCannotBattleSpeech, 5
-	.4byte gTrainerBattleEndScript, 2
-	.4byte gTrainerBattleScriptReturnAddress, 6
-
-	.align 2
-gTrainerBattleSpecs_2:: @ 839AD98
-	.4byte gTrainerBattleMode, 0
-	.4byte gTrainerBattleOpponent, 1
-	.4byte gTrainerMapObjectLocalId, 1
-	.4byte gTrainerIntroSpeech, 2
-	.4byte gTrainerDefeatSpeech, 2
-	.4byte gTrainerVictorySpeech, 5
-	.4byte gTrainerCannotBattleSpeech, 2
-	.4byte gTrainerBattleEndScript, 5
-	.4byte gTrainerBattleScriptReturnAddress, 6
-
-	.align 2
-gTrainerBattleSpecs_3:: @ 839ADE0
-	.4byte gTrainerBattleMode, 0
-	.4byte gTrainerBattleOpponent, 1
-	.4byte gTrainerMapObjectLocalId, 1
-	.4byte gTrainerIntroSpeech, 5
-	.4byte gTrainerDefeatSpeech, 2
-	.4byte gTrainerVictorySpeech, 5
-	.4byte gTrainerCannotBattleSpeech, 5
-	.4byte gTrainerBattleEndScript, 5
-	.4byte gTrainerBattleScriptReturnAddress, 6
-
-	.align 2
-gTrainerBattleSpecs_4:: @ 839AE28
-	.4byte gTrainerBattleMode, 0
-	.4byte gTrainerBattleOpponent, 1
-	.4byte gTrainerMapObjectLocalId, 1
-	.4byte gTrainerIntroSpeech, 2
-	.4byte gTrainerDefeatSpeech, 2
-	.4byte gTrainerVictorySpeech, 5
-	.4byte gTrainerCannotBattleSpeech, 2
-	.4byte gTrainerBattleEndScript, 2
-	.4byte gTrainerBattleScriptReturnAddress, 6
-
-@ 839AE70
-	.include "data/trainer_eye_trainers.inc"
-
-	.align 2
-gBadgeFlags:: @ 839B1F0
-	.2byte 0x0807, 0x0808, 0x0809, 0x080a, 0x080b, 0x080c, 0x080d, 0x080e
diff --git a/data/contest_painting.s b/data/contest_painting.s
deleted file mode 100644
index 071661cb4..000000000
--- a/data/contest_painting.s
+++ /dev/null
@@ -1,102 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gPictureFramePalettes:: @ 83EF198
-	.incbin "graphics/picture_frame/bg0.gbapal"
-	.incbin "graphics/picture_frame/bg1.gbapal"
-	.incbin "graphics/picture_frame/bg2.gbapal"
-	.incbin "graphics/picture_frame/bg3.gbapal"
-	.incbin "graphics/picture_frame/bg4.gbapal"
-	.incbin "graphics/picture_frame/bg5.gbapal"
-	.space 10 * 32
-
-	.align 2
-gPictureFrameTiles_0:: @ 83EF398
-	.incbin "graphics/picture_frame/frame0.4bpp.rl"
-
-	.align 2
-gPictureFrameTiles_1:: @ 83F041C
-	.incbin "graphics/picture_frame/frame1.4bpp.rl"
-
-	.align 2
-gPictureFrameTiles_2:: @ 83F104C
-	.incbin "graphics/picture_frame/frame2.4bpp.rl"
-
-	.align 2
-gPictureFrameTiles_3:: @ 83F1B84
-	.incbin "graphics/picture_frame/frame3.4bpp.rl"
-
-	.align 2
-gPictureFrameTiles_4:: @ 83F2B3C
-	.incbin "graphics/picture_frame/frame4.4bpp.rl"
-
-	.align 2
-gPictureFrameTiles_5:: @ 83F3C6C
-	.incbin "graphics/picture_frame/frame5.4bpp.rl"
-
-	.align 2
-gPictureFrameTilemap_0:: @ 83F4260
-	.incbin "graphics/picture_frame/frame0_map.bin.rl"
-
-	.align 2
-gPictureFrameTilemap_1:: @ 83F476C
-	.incbin "graphics/picture_frame/frame1_map.bin.rl"
-
-	.align 2
-gPictureFrameTilemap_2:: @ 83F4C78
-	.incbin "graphics/picture_frame/frame2_map.bin.rl"
-
-	.align 2
-gPictureFrameTilemap_3:: @ 83F5184
-	.incbin "graphics/picture_frame/frame3_map.bin.rl"
-
-	.align 2
-gPictureFrameTilemap_4:: @ 83F5690
-	.incbin "graphics/picture_frame/frame4_map.bin.rl"
-
-	.align 2
-gPictureFrameTilemap_5:: @ 83F5B9C
-	.incbin "graphics/picture_frame/frame5_map.bin.rl"
-
-	.align 2
-gUnknown_083F60AC:: @ 83F60AC
-	.4byte OtherText_Cool
-	.4byte OtherText_Beauty2
-	.4byte OtherText_Cute
-	.4byte OtherText_Smart
-	.4byte OtherText_Tough
-
-	.align 2
-gUnknown_083F60C0:: @ 83F60C0
-	.4byte OtherText_NonstopSuperCool, OtherText_Terminator6
-	.4byte OtherText_GoodLookingPoke, OtherText_Terminator7
-	.4byte OtherText_MarvelousGreat, OtherText_Terminator8
-
-	.4byte OtherText_CenturyLastVenus, OtherText_Terminator9
-	.4byte OtherText_Terminator10, OtherText_DazzlingSlime
-	.4byte OtherText_PokeCenterIdol, OtherText_Terminator11
-
-	.4byte OtherText_LovelyAndSweet, OtherText_Terminator12
-	.4byte OtherText_ThePretty, OtherText_WinningPortrait
-	.4byte OtherText_GiveUsWink, OtherText_Terminator13
-
-	.4byte OtherText_SmartnessMaestro, OtherText_Terminator15
-	.4byte OtherText_ChosenPokeAmong, OtherText_Terminator15
-	.4byte OtherText_TheExcellent, OtherText_ItsMomentOfElegance
-
-	.4byte OtherText_PowerfullyMuscular, OtherText_Terminator16
-	.4byte OtherText_StrongErEst, OtherText_Terminator17
-	.4byte OtherText_MightyTough, OtherText_Exclamation
-
-	.align 2
-gOamData_83F6138:: @ 83F6138
-	.2byte 0x3000
-	.2byte 0xC000
-	.2byte 0x0000
-
-	.align 2
-gUnknown_083F6140:: @ 83F6140
-	.space 4
diff --git a/data/heal_location.s b/data/heal_location.s
deleted file mode 100644
index 101bec24f..000000000
--- a/data/heal_location.s
+++ /dev/null
@@ -1,29 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gHealLocations:: @ 83E5A20
-	heal_location LittlerootTown_BrendansHouse_2F, 4, 2
-	heal_location LittlerootTown_MaysHouse_2F, 4, 2
-	heal_location PetalburgCity, 20, 17
-	heal_location SlateportCity, 19, 20
-	heal_location MauvilleCity, 22, 6
-	heal_location RustboroCity, 16, 39
-	heal_location FortreeCity, 5, 7
-	heal_location LilycoveCity, 24, 15
-	heal_location MossdeepCity, 28, 17
-	heal_location SootopolisCity, 43, 32
-	heal_location EverGrandeCity, 27, 49
-	heal_location LittlerootTown, 5, 9
-	heal_location LittlerootTown, 14, 9
-	heal_location OldaleTown, 6, 17
-	heal_location DewfordTown, 2, 11
-	heal_location LavaridgeTown, 9, 7
-	heal_location FallarborTown, 14, 8
-	heal_location VerdanturfTown, 16, 4
-	heal_location PacifidlogTown, 8, 16
-	heal_location EverGrandeCity, 18, 6
-	heal_location BattleTower_Outside, 14, 9
-	heal_location SouthernIsland_Exterior, 15, 20
diff --git a/data/intro.s b/data/intro.s
deleted file mode 100644
index ed5daf33a..000000000
--- a/data/intro.s
+++ /dev/null
@@ -1,112 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gSpriteAnim_840B114:: @ 840B114
-	obj_image_anim_frame 6, 8
-	obj_image_anim_frame 6, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_840B120:: @ 840B120
-	.4byte gSpriteAnim_840B114
-
-	.align 2
-gSpriteTemplate_840B124:: @ 840B124
-	spr_template 2003, 2004, gOamData_840B10C, gSpriteAnimTable_840B120, NULL, gDummySpriteAffineAnimTable, sub_813E804
-
-	.align 2
-gOamData_840B13C:: @ 840B13C
-	.2byte 0x00A0
-	.2byte 0x4000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_840B144:: @ 840B144
-	obj_image_anim_frame 10, 8
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_840B14C:: @ 840B14C
-	.4byte gSpriteAnim_840B144
-
-	.align 2
-gSpriteTemplate_840B150:: @ 840B150
-	spr_template 2003, 2004, gOamData_840B13C, gSpriteAnimTable_840B14C, NULL, gDummySpriteAffineAnimTable, sub_813E980
-
-gUnknown_0840B168:: @ 840B168
-	.incbin "baserom.gba", 0x0040b168, 0x8
-
-	.align 2
-gSpriteTemplate_840B170:: @ 840B170
-	spr_template 2003, 2004, gOamData_840B13C, gSpriteAnimTable_840B14C, NULL, gDummySpriteAffineAnimTable, sub_813EA60
-
-gUnknown_0840B188:: @ 840B188
-	.incbin "baserom.gba", 0x0040b188, 0x14
-
-	.align 2
-gOamData_840B19C:: @ 840B19C
-	.2byte 0x00A0
-	.2byte 0x4000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_840B1A4:: @ 840B1A4
-	obj_image_anim_frame 2, 8
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_840B1AC:: @ 840B1AC
-	.4byte gSpriteAnim_840B1A4
-
-	.align 2
-gSpriteTemplate_840B1B0:: @ 840B1B0
-	spr_template 2003, 2004, gOamData_840B19C, gSpriteAnimTable_840B1AC, NULL, gDummySpriteAffineAnimTable, sub_813EBBC
-
-	.align 2
-gSpriteTemplate_840B1C8:: @ 840B1C8
-	spr_template 2003, 2004, gOamData_840B19C, gSpriteAnimTable_840B1AC, NULL, gDummySpriteAffineAnimTable, sub_813EC90
-
-	.align 2
-gOamData_840B1E0:: @ 840B1E0
-	.2byte 0x00A0
-	.2byte 0xC000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_840B1E8:: @ 840B1E8
-	obj_image_anim_frame 16, 8
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_840B1F0:: @ 840B1F0
-	.4byte gSpriteAnim_840B1E8
-
-	.align 2
-gSpriteTemplate_840B1F4:: @ 840B1F4
-	spr_template 2003, 2003, gOamData_840B1E0, gSpriteAnimTable_840B1F0, NULL, gDummySpriteAffineAnimTable, sub_813EDFC
-
-	.align 2
-gIntro3PokeballGfx_Table:: @ 840B20C
-	obj_tiles gInterfaceGfx_PokeBall, 0x100, 2002
-	.space 8
-
-	.align 2
-gIntro3MiscGfx_Table:: @ 840B21C
-	obj_tiles gIntro3MiscTiles, 0xa00, 2003
-	.space 8
-
-	.align 2
-gInterfacePokeballPal_Table:: @ 840B22C
-	obj_pal gInterfacePal_PokeBall, 2002
-	.space 8
-
-	.align 2
-gIntro3MiscPal_Table:: @ 840B23C
-	obj_pal gIntro3Misc1Palette, 2003
-	obj_pal gIntro3Misc2Palette, 2004
-	.space 8
-
-	.incbin "baserom.gba", 0x0040b254, 0x4
diff --git a/data/starter_choose.s b/data/starter_choose.s
deleted file mode 100644
index 123d1e5fe..000000000
--- a/data/starter_choose.s
+++ /dev/null
@@ -1,29 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_083F7794:: @ 83F7794
-	obj_tiles gBirchBallarrow_Gfx, 0x0800, 0x1000
-	.space 8
-
-gUnknown_083F77A4:: @ 83F77A4
-	obj_tiles gBirchCircle_Gfx, 0x0800, 0x1001
-	.space 8
-
-gUnknown_083F77B4:: @ 83F77B4
-	obj_pal gBirchBallarrow_Pal, 0x1000
-	obj_pal gBirchCircle_Pal, 0x1001
-	.space 8
-
-	.align 2
-gSpriteTemplate_83F77CC:: @ 83F77CC
-	spr_template 4096, 4096, gOamData_83F76CC, gSpriteAnimTable_83F774C, NULL, gDummySpriteAffineAnimTable, sub_810A62C
-
-	.align 2
-gSpriteTemplate_83F77E4:: @ 83F77E4
-	spr_template 4096, 4096, gOamData_83F76D4, gSpriteAnimTable_83F7750, NULL, gDummySpriteAffineAnimTable, sub_810A68C
-
-	.align 2
-gSpriteTemplate_83F77FC:: @ 83F77FC
-	spr_template 4097, 4097, gOamData_83F76DC, gSpriteAnimTable_83F7758, NULL, gSpriteAffineAnimTable_83F7790, StarterPokemonSpriteAnimCallback
diff --git a/data/trainer_eye_trainers.inc b/data/trainer_eye_trainers.inc
deleted file mode 100644
index 3628ea598..000000000
--- a/data/trainer_eye_trainers.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-	.align 2
-gTrainerEyeTrainers:: @ 839AE70
-	trainer_eye_trainer ROSE_1, ROSE_2, ROSE_3, ROSE_4, ROSE_5, Route118
-	trainer_eye_trainer DUSTY_1, DUSTY_2, DUSTY_3, DUSTY_4, DUSTY_5, Route111
-	trainer_eye_trainer LOLA_1, LOLA_2, LOLA_3, LOLA_4, LOLA_5, Route109
-	trainer_eye_trainer RICKY_1, RICKY_2, RICKY_3, RICKY_4, RICKY_5, Route109
-	trainer_eye_trainer RITA_AND_SAM_1, RITA_AND_SAM_2, RITA_AND_SAM_3, RITA_AND_SAM_4, RITA_AND_SAM_5, Route124
-	trainer_eye_trainer BROOKE_1, BROOKE_2, BROOKE_3, BROOKE_4, BROOKE_5, Route111
-	trainer_eye_trainer WILTON_1, WILTON_2, WILTON_3, WILTON_4, WILTON_5, Route111
-	trainer_eye_trainer VALERIE_1, VALERIE_2, VALERIE_3, VALERIE_4, VALERIE_5, MtPyre_6F
-	trainer_eye_trainer CINDY_1, CINDY_3, CINDY_4, CINDY_5, CINDY_6, Route104
-	trainer_eye_trainer JESSICA_1, JESSICA_2, JESSICA_3, JESSICA_4, JESSICA_5, Route121
-	trainer_eye_trainer WINSTON_1, WINSTON_2, WINSTON_3, WINSTON_4, WINSTON_5, Route104
-	trainer_eye_trainer STEVE_1, STEVE_2, STEVE_3, STEVE_4, STEVE_5, Route114
-	trainer_eye_trainer TONY_1, TONY_2, TONY_3, TONY_4, TONY_5, Route107
-	trainer_eye_trainer NOB_1, NOB_2, NOB_3, NOB_4, NOB_5, Route115
-	trainer_eye_trainer DALTON_1, DALTON_2, DALTON_3, DALTON_4, DALTON_5, Route118
-	trainer_eye_trainer BERNIE_1, BERNIE_2, BERNIE_3, BERNIE_4, BERNIE_5, Route114
-	trainer_eye_trainer ETHAN_1, ETHAN_2, ETHAN_3, ETHAN_4, ETHAN_5, JaggedPass
-	trainer_eye_trainer JOHN_AND_JAY_1, JOHN_AND_JAY_2, JOHN_AND_JAY_3, JOHN_AND_JAY_4, JOHN_AND_JAY_5, MeteorFalls_1F_2R
-	trainer_eye_trainer BRANDON_1, BRANDON_2, BRANDON_3, BRANDON_4, BRANDON_5, Route120
-	trainer_eye_trainer CAMERON_1, CAMERON_2, CAMERON_3, CAMERON_4, CAMERON_5, Route123
-	trainer_eye_trainer JACKI_1, JACKI_2, JACKI_3, JACKI_4, JACKI_5, Route123
-	trainer_eye_trainer WALTER_1, WALTER_2, WALTER_3, WALTER_4, WALTER_5, Route121
-	trainer_eye_trainer KAREN_1, KAREN_2, KAREN_3, KAREN_4, KAREN_5, Route116
-	trainer_eye_trainer JERRY_1, JERRY_2, JERRY_3, JERRY_4, JERRY_5, Route116
-	trainer_eye_trainer ANNA_AND_MEG_1, ANNA_AND_MEG_2, ANNA_AND_MEG_3, ANNA_AND_MEG_4, ANNA_AND_MEG_5, Route117
-	trainer_eye_trainer ISABEL_1, ISABEL_2, ISABEL_3, ISABEL_4, ISABEL_5, Route110
-	trainer_eye_trainer MIGUEL_1, MIGUEL_2, MIGUEL_3, MIGUEL_4, MIGUEL_5, Route103
-	trainer_eye_trainer TIMOTHY_1, TIMOTHY_2, TIMOTHY_3, TIMOTHY_4, TIMOTHY_5, Route115
-	trainer_eye_trainer SHELBY_1, SHELBY_2, SHELBY_3, SHELBY_4, SHELBY_5, MtChimney
-	trainer_eye_trainer CALVIN_1, CALVIN_2, CALVIN_3, CALVIN_4, CALVIN_5, Route102
-	trainer_eye_trainer ELLIOT_1, ELLIOT_2, ELLIOT_3, ELLIOT_4, ELLIOT_5, Route106
-	trainer_eye_trainer ABIGAIL_1, ABIGAIL_2, ABIGAIL_3, ABIGAIL_4, ABIGAIL_5, Route110
-	trainer_eye_trainer BENJAMIN_1, BENJAMIN_2, BENJAMIN_3, BENJAMIN_4, BENJAMIN_5, Route110
-	trainer_eye_trainer ISAIAH_1, ISAIAH_2, ISAIAH_3, ISAIAH_4, ISAIAH_5, Route128
-	trainer_eye_trainer KATELYN_1, KATELYN_2, KATELYN_3, KATELYN_4, KATELYN_5, Route128
-	trainer_eye_trainer MARIA_1, MARIA_2, MARIA_3, MARIA_4, MARIA_5, Route117
-	trainer_eye_trainer DYLAN_1, DYLAN_2, DYLAN_3, DYLAN_4, DYLAN_5, Route117
-	trainer_eye_trainer NICOLAS_1, NICOLAS_2, NICOLAS_3, NICOLAS_4, NICOLAS_5, MeteorFalls_1F_2R
-	trainer_eye_trainer ROBERT_1, ROBERT_2, ROBERT_3, ROBERT_4, ROBERT_5, Route120
-	trainer_eye_trainer LAO_1, LAO_2, LAO_3, LAO_4, LAO_5, Route113
-	trainer_eye_trainer CYNDY_1, CYNDY_2, CYNDY_3, CYNDY_4, CYNDY_5, Route115
-	trainer_eye_trainer MADELINE_1, MADELINE_2, MADELINE_3, MADELINE_4, MADELINE_5, Route113
-	trainer_eye_trainer JENNY_1, JENNY_2, JENNY_3, JENNY_4, JENNY_5, Route124
-	trainer_eye_trainer DIANA_1, DIANA_2, DIANA_3, DIANA_4, DIANA_5, JaggedPass
-	trainer_eye_trainer AMY_AND_LIV_1, AMY_AND_LIV_2, AMY_AND_LIV_4, AMY_AND_LIV_5, AMY_AND_LIV_6, Route103
-	trainer_eye_trainer ERNEST_1, ERNEST_2, ERNEST_3, ERNEST_4, ERNEST_5, Route125
-	trainer_eye_trainer EDWIN_1, EDWIN_2, EDWIN_3, EDWIN_4, EDWIN_5, Route110
-	trainer_eye_trainer LYDIA_1, LYDIA_2, LYDIA_3, LYDIA_4, LYDIA_5, Route117
-	trainer_eye_trainer ISAAC_1, ISAAC_2, ISAAC_3, ISAAC_4, ISAAC_5, Route117
-	trainer_eye_trainer CATHERINE_1, CATHERINE_2, CATHERINE_3, CATHERINE_4, CATHERINE_5, Route119
-	trainer_eye_trainer JACKSON_1, JACKSON_2, JACKSON_3, JACKSON_4, JACKSON_5, Route119
-	trainer_eye_trainer HALEY_1, HALEY_2, HALEY_3, HALEY_4, HALEY_5, Route104
-	trainer_eye_trainer JAMES_1, JAMES_2, JAMES_3, JAMES_4, JAMES_5, PetalburgWoods
-	trainer_eye_trainer TRENT_1, TRENT_2, TRENT_3, TRENT_4, TRENT_5, Route112
-	trainer_eye_trainer LOIS_AND_HAL_1, LOIS_AND_HAL_2, LOIS_AND_HAL_3, LOIS_AND_HAL_4, LOIS_AND_HAL_5, AbandonedShip_Rooms2_1F
-	trainer_eye_trainer WALLY_3, WALLY_4, WALLY_5, WALLY_6, NONE, VictoryRoad_1F