convert more constants

data/battle_frontier/battle_frontier_mons.inc

@@ -960,7 +960,7 @@ gBattleFrontierMons:: @ 85D97BC
 	.4byte NATURE_DOCILE
 
 @ 137
-	.2byte SPECIES_FARFETCH_D
+	.2byte SPECIES_FARFETCHD
 	.2byte MOVE_SLASH, MOVE_KNOCK_OFF, MOVE_SWORDS_DANCE, MOVE_AGILITY
 	.byte BATTLE_FRONTIER_ITEM_STICK
 	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP

data/battle_frontier_2.s

@@ -1,3 +1,5 @@
+#include "constants/moves.h"
+#include "constants/species.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 

data/battle_scripts_1.s

@@ -1,3 +1,6 @@
+#include "constants/abilities.h"
+#include "constants/moves.h"
+#include "constants/songs.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/battle_script.inc"
 	.include "constants/constants.inc"

data/battle_scripts_2.s

@@ -1,3 +1,4 @@
+#include "constants/songs.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/battle_script.inc"
 	.include "constants/constants.inc"

data/battle_tower.s

@@ -1,3 +1,6 @@
+#include "constants/easy_chat.h"
+#include "constants/species.h"
+#include "constants/moves.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 

data/cable_car.s

@@ -1,3 +1,4 @@
+#include "constants/map_objects.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 

data/data2b.s

@@ -1,5 +1,7 @@
 @ the second big chunk of data
 
+#include "constants/moves.h"
+#include "constants/species.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 

data/data2c.s

@@ -1,5 +1,8 @@
 @ the second big chunk of data
 
+#include "constants/abilities.h"
+#include "constants/moves.h"
+#include "constants/species.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 

data/easy_chat.s

@@ -1,3 +1,6 @@
+#include "constants/easy_chat.h"
+#include "constants/moves.h"
+#include "constants/species.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 

data/event_scripts.s

@@ -1,8 +1,11 @@
+#include "constants/flags.h"
+#include "constants/vars.h"
+#include "constants/moves.h"
+#include "constants/songs.h"
+#include "constants/species.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
-	.include "constants/variables.inc"
-	.include "constants/flags.inc"
 
 	.section script_data, "aw", %progbits
 

data/field_map_obj.s

@@ -1,3 +1,4 @@
+#include "constants/map_objects.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 

data/graphics/pokemon/animation_delay_table.inc

@@ -81,7 +81,7 @@ gMonAnimationDelayTable:: @ 8329B87
 	.byte 0x00 @ SPECIES_SLOWBRO
 	.byte 0x00 @ SPECIES_MAGNEMITE
 	.byte 0x00 @ SPECIES_MAGNETON
-	.byte 0x00 @ SPECIES_FARFETCH_D
+	.byte 0x00 @ SPECIES_FARFETCHD
 	.byte 0x00 @ SPECIES_DODUO
 	.byte 0x00 @ SPECIES_DODRIO
 	.byte 0x00 @ SPECIES_SEEL

data/graphics/pokemon/front_anim_ids_table.inc

@@ -81,7 +81,7 @@ gMonFrontAnimIdsTable:: @ 83299EC
 	.byte 0x0b @ SPECIES_SLOWBRO
 	.byte 0x54 @ SPECIES_MAGNEMITE
 	.byte 0x2c @ SPECIES_MAGNETON
-	.byte 0x48 @ SPECIES_FARFETCH_D
+	.byte 0x48 @ SPECIES_FARFETCHD
 	.byte 0x4c @ SPECIES_DODUO
 	.byte 0x41 @ SPECIES_DODRIO
 	.byte 0x0b @ SPECIES_SEEL

data/link.s

@@ -1,5 +1,6 @@
 @ the second big chunk of data
 
+#include "constants/species.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 

data/map_events.s

@@ -1,3 +1,4 @@
+#include "constants/map_objects.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 	.include "constants/flags.inc"

data/maps.s

@@ -1,3 +1,4 @@
+#include "constants/songs.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 

data/text/easy_chat/easy_chat_group_pokemon2.s

@@ -57,7 +57,7 @@ gEasyChatGroup_Pokemon2:: @ 859CE0C
 	.2byte SPECIES_ESPEON
 	.2byte SPECIES_EXEGGCUTE
 	.2byte SPECIES_EXEGGUTOR
-	.2byte SPECIES_FARFETCH_D
+	.2byte SPECIES_FARFETCHD
 	.2byte SPECIES_FEAROW
 	.2byte SPECIES_FERALIGATR
 	.2byte SPECIES_FLAAFFY

data/wild_encounter.s

@@ -1,3 +1,4 @@
+#include "constants/species.h"
     .include "asm/macros.inc"
     .include "constants/constants.inc"