convert more constants

2024-12-26 03:34:15 +01:00 · 2017-12-11 12:27:51 -06:00 · 2017-12-11 12:27:51 -06:00 · c681b482c2
commit c681b482c2
parent 19fbf024ff
89 changed files with 13177 additions and 12922 deletions
--- a/asm/macros/pokemon_data.inc
+++ b/asm/macros/pokemon_data.inc
@ -52,5 +52,5 @@
 	.byte \max_level
 	.endif

-	.2byte SPECIES_\species
+	.2byte \species
 	.endm
--- a/asm/trade.s
+++ b/asm/trade.s
@ -1,5 +1,7 @@
 	.include "asm/macros.inc"
-	.include "constants/constants.inc"
+	.include "constants/gba_constants.inc"
+	.include "constants/misc_constants.inc"
+	.include "constants/species_constants.inc"

 	.syntax unified

--- a/constants/constants.inc
+++ b/constants/constants.inc
@ -1,20 +1,20 @@
 	.include "constants/gba_constants.inc"
 	.include "constants/misc_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "constants/ability_constants.inc"
-	.include "constants/move_constants.inc"
+@	.include "constants/species_constants.inc"
+@	.include "constants/ability_constants.inc"
+@	.include "constants/move_constants.inc"
 	.include "constants/item_constants.inc"
 	.include "constants/type_constants.inc"
 	.include "constants/contest_constants.inc"
 	.include "constants/pokemon_data_constants.inc"
 	.include "constants/item_data_constants.inc"
 	.include "constants/battle_move_constants.inc"
-	.include "constants/easy_chat_constants.inc"
+@	.include "constants/easy_chat_constants.inc"
 	.include "constants/trainer_constants.inc"
 	.include "constants/battle_frontier_constants.inc"
 	.include "constants/map_constants.inc"
-	.include "constants/map_object_constants.inc"
+@	.include "constants/map_object_constants.inc"
 	.include "constants/berry_constants.inc"
 	.include "constants/field_object_constants.inc"
 	.include "constants/contest_move_effects.inc"
-	.include "constants/songs.inc"
+@	.include "constants/songs.inc"
--- a/constants/field_object_constants.inc
+++ b/constants/field_object_constants.inc
@ -237,15 +237,3 @@
 	.set FIELD_OBJ_GFX_RUBY_SAPPHIRE_MAY,         236
 	.set FIELD_OBJ_GFX_LUGIA,                     237
 	.set FIELD_OBJ_GFX_HO_OH,                     238
-
-	.set SHADOW_SIZE_S,  0
-	.set SHADOW_SIZE_M,  1
-	.set SHADOW_SIZE_L,  2
-	.set SHADOW_SIZE_XL, 3
-
-	.set F_INANIMATE,                       1 << 6
-	.set F_DISABLE_REFLECTION_PALETTE_LOAD, 1 << 7
-
-	.set TRACKS_NONE,      0
-	.set TRACKS_FOOT,      1
-	.set TRACKS_BIKE_TIRE, 2
--- a/data/battle_frontier/battle_frontier_mons.inc
+++ b/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
--- a/data/battle_frontier/battle_frontier_trainers.inc
+++ b/data/battle_frontier/battle_frontier_trainers.inc
--- a/data/battle_frontier/fallarbor_battle_tent_trainers.inc
+++ b/data/battle_frontier/fallarbor_battle_tent_trainers.inc
--- a/data/battle_frontier/slateport_battle_tent_trainers.inc
+++ b/data/battle_frontier/slateport_battle_tent_trainers.inc
--- a/data/battle_frontier/verdanturf_battle_tent_trainers.inc
+++ b/data/battle_frontier/verdanturf_battle_tent_trainers.inc
--- a/data/battle_frontier_2.s
+++ b/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"

--- a/data/battle_scripts_1.s
+++ b/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"
--- a/data/battle_scripts_2.s
+++ b/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"
--- a/data/battle_tower.s
+++ b/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"

--- a/data/cable_car.s
+++ b/data/cable_car.s
@ -1,3 +1,4 @@
+#include "constants/map_objects.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"

--- a/data/data2b.s
+++ b/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"

--- a/data/data2c.s
+++ b/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"

--- a/data/easy_chat.s
+++ b/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"

--- a/data/event_scripts.s
+++ b/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

--- a/data/field_map_obj.s
+++ b/data/field_map_obj.s
@ -1,3 +1,4 @@
+#include "constants/map_objects.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"

--- a/data/graphics/pokemon/animation_delay_table.inc
+++ b/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
--- a/data/graphics/pokemon/front_anim_ids_table.inc
+++ b/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
--- a/data/link.s
+++ b/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"

--- a/data/map_events.s
+++ b/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"
--- a/data/maps.s
+++ b/data/maps.s
@ -1,3 +1,4 @@
+#include "constants/songs.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"

--- a/data/text/easy_chat/easy_chat_group_pokemon2.s
+++ b/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
--- a/data/text/easy_chat/easy_chat_words_by_letter.inc
+++ b/data/text/easy_chat/easy_chat_words_by_letter.inc
--- a/data/wild_encounter.s
+++ b/data/wild_encounter.s
@ -1,3 +1,4 @@
+#include "constants/species.h"
    .include "asm/macros.inc"
    .include "constants/constants.inc"

--- a/data/wild_mons.inc
+++ b/data/wild_mons.inc
--- a/include/constants/easy_chat.h
+++ b/include/constants/easy_chat.h
@ -44,6 +44,14 @@
 #define EC_WORD_POKEDEX       (EC_GROUP_TRAINER << 9) | 0x10
 #define EC_WORD_RUBY          (EC_GROUP_TRAINER << 9) | 0x11
 #define EC_WORD_LEVEL         (EC_GROUP_TRAINER << 9) | 0x12
+#define EC_WORD_RED           (EC_GROUP_TRAINER << 9) | 0x13
+#define EC_WORD_GREEN         (EC_GROUP_TRAINER << 9) | 0x14
+#define EC_WORD_BAG           (EC_GROUP_TRAINER << 9) | 0x15
+#define EC_WORD_FLAME         (EC_GROUP_TRAINER << 9) | 0x16
+#define EC_WORD_GOLD          (EC_GROUP_TRAINER << 9) | 0x17
+#define EC_WORD_LEAF          (EC_GROUP_TRAINER << 9) | 0x18
+#define EC_WORD_SILVER        (EC_GROUP_TRAINER << 9) | 0x19
+#define EC_WORD_EMERALD       (EC_GROUP_TRAINER << 9) | 0x1a

 // STATUS
 #define EC_WORD_DARK          (EC_GROUP_STATUS << 9) | 0x0
@ -1017,6 +1025,13 @@
 #define EC_WORD_MASTER        (EC_GROUP_EVENTS << 9) | 0x13
 #define EC_WORD_RANK          (EC_GROUP_EVENTS << 9) | 0x14
 #define EC_WORD_RIBBON        (EC_GROUP_EVENTS << 9) | 0x15
+#define EC_WORD_CRUSH         (EC_GROUP_EVENTS << 9) | 0x16
+#define EC_WORD_DIRECT        (EC_GROUP_EVENTS << 9) | 0x17
+#define EC_WORD_TOWER         (EC_GROUP_EVENTS << 9) | 0x18
+#define EC_WORD_UNION         (EC_GROUP_EVENTS << 9) | 0x19
+#define EC_WORD_ROOM          (EC_GROUP_EVENTS << 9) | 0x1a
+#define EC_WORD_WIRELESS      (EC_GROUP_EVENTS << 9) | 0x1b
+#define EC_WORD_FRONTIER      (EC_GROUP_EVENTS << 9) | 0x1c

 // TRENDY_SAYING
 #define EC_WORD_KTHX_BYE       (EC_GROUP_TRENDY_SAYING << 9) | 0x0
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
--- a/include/constants/map_objects.h
+++ b/include/constants/map_objects.h
@ -42,7 +42,7 @@
 #define MAP_OBJ_GFX_SCHOOL_KID_M                38
 #define MAP_OBJ_GFX_MANIAC                      39
 #define MAP_OBJ_GFX_HEX_MANIAC                  40
-#define MAP_OBJ_GFX_WOMAN_8 41
+#define MAP_OBJ_GFX_RAYQUAZA_1                  41
 #define MAP_OBJ_GFX_SWIMMER_M                   42
 #define MAP_OBJ_GFX_SWIMMER_F                   43
 #define MAP_OBJ_GFX_BLACK_BELT                  44
@ -71,12 +71,12 @@
 #define MAP_OBJ_GFX_REPORTER_M                  67
 #define MAP_OBJ_GFX_REPORTER_F                  68
 #define MAP_OBJ_GFX_BARD                        69
-#define MAP_OBJ_GFX_HIPSTER 70
-#define MAP_OBJ_GFX_TRADER 71
-#define MAP_OBJ_GFX_STORYTELLER 72
-#define MAP_OBJ_GFX_GIDDY 73
-#define MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_1 74
-#define MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_2 75
+#define MAP_OBJ_GFX_ANABEL                      70
+#define MAP_OBJ_GFX_TUCKER                      71
+#define MAP_OBJ_GFX_GRETA                       72
+#define MAP_OBJ_GFX_SPENSER                     73
+#define MAP_OBJ_GFX_NOLAND                      74
+#define MAP_OBJ_GFX_LUCY                        75
 #define MAP_OBJ_GFX_UNUSED_NATU_DOLL            76
 #define MAP_OBJ_GFX_UNUSED_MAGNEMITE_DOLL       77
 #define MAP_OBJ_GFX_UNUSED_SQUIRTLE_DOLL        78
@ -96,10 +96,10 @@
 #define MAP_OBJ_GFX_MAY_SURFING                 92
 #define MAP_OBJ_GFX_MAY_FIELD_MOVE              93
 #define MAP_OBJ_GFX_TRUCK                       94
-#define MAP_OBJ_GFX_MACHOKE_CARRYING_BOX 95
-#define MAP_OBJ_GFX_MACHOKE_FACING_AWAY 96
+#define MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX       95
+#define MAP_OBJ_GFX_VIGAROTH_FACING_AWAY        96
 #define MAP_OBJ_GFX_BIRCHS_BAG                  97
-#define MAP_OBJ_GFX_POOCHYENA 98
+#define MAP_OBJ_GFX_ZIGZAGOON_1                 98
 #define MAP_OBJ_GFX_ARTIST                      99
 #define MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL       100
 #define MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE    101
@ -208,8 +208,8 @@
 #define MAP_OBJ_GFX_KECLEON_1                  204
 #define MAP_OBJ_GFX_KYOGRE_2                   205
 #define MAP_OBJ_GFX_GROUDON_2                  206
-#define MAP_OBJ_GFX_RAYQUAZA 207
-#define MAP_OBJ_GFX_ZIGZAGOON 208
+#define MAP_OBJ_GFX_RAYQUAZA_2                 207
+#define MAP_OBJ_GFX_ZIGZAGOON_2                208
 #define MAP_OBJ_GFX_PIKACHU                    209
 #define MAP_OBJ_GFX_AZUMARILL                  210
 #define MAP_OBJ_GFX_WINGULL                    211
@ -219,12 +219,43 @@
 #define MAP_OBJ_GFX_MOM                        215
 #define MAP_OBJ_GFX_LINK_BRENDAN               216
 #define MAP_OBJ_GFX_LINK_MAY                   217
+#define MAP_OBJ_GFX_JUAN                       218
+#define MAP_OBJ_GFX_SCOTT                      219
+#define MAP_OBJ_GFX_POOCHYENA                  220
+#define MAP_OBJ_GFX_KYOGRE_3                   221
+#define MAP_OBJ_GFX_GROUDON_3                  222
+#define MAP_OBJ_GFX_MYSTERY_GIFT_MAN           223
+#define MAP_OBJ_GFX_TRICK_HOUSE_STATUE         224
+#define MAP_OBJ_GFX_KIRLIA                     225
+#define MAP_OBJ_GFX_DUSCLOPS                   226
+#define MAP_OBJ_GFX_UNION_ROOM_NURSE           227
+#define MAP_OBJ_GFX_SUDOWOODO                  228
+#define MAP_OBJ_GFX_MEW                        229
+#define MAP_OBJ_GFX_RED                        230
+#define MAP_OBJ_GFX_LEAF                       231
+#define MAP_OBJ_GFX_DEOXYS                     232
+#define MAP_OBJ_GFX_DEOXYS_TRIANGLE            233
+#define MAP_OBJ_GFX_BRANDON                    234
+#define MAP_OBJ_GFX_LINK_RS_BRENDAN            235
+#define MAP_OBJ_GFX_LINK_RS_MAY                236
+#define MAP_OBJ_GFX_LUGIA                      237
+#define MAP_OBJ_GFX_HOOH                       238
+#define MAP_OBJ_GFX_BARD_2                     239
+#define MAP_OBJ_GFX_HIPSTER                    240
+#define MAP_OBJ_GFX_TRADER                     241
+#define MAP_OBJ_GFX_STORYTELLER                242
+#define MAP_OBJ_GFX_GIDDY                      243
+#define MAP_OBJ_GFX_PLACEHOLDER_1              244
+#define MAP_OBJ_GFX_PLACEHOLDER_2              245

 #define SHADOW_SIZE_S   0
 #define SHADOW_SIZE_M   1
 #define SHADOW_SIZE_L   2
 #define SHADOW_SIZE_XL  3

+#define F_INANIMATE                        (1 << 6)
+#define F_DISABLE_REFLECTION_PALETTE_LOAD  (1 << 7)
+
 #define TRACKS_NONE       0
 #define TRACKS_FOOT       1
 #define TRACKS_BIKE_TIRE  2
--- a/include/constants/moves.h
+++ b/include/constants/moves.h
@ -357,4 +357,6 @@
 #define MOVE_DOOM_DESIRE 353
 #define MOVE_PSYCHO_BOOST 354

+#define LAST_MOVE_INDEX     MOVE_PSYCHO_BOOST
+
 #endif  // GUARD_CONSTANTS_MOVES_H
--- a/include/constants/opponents.h
+++ b/include/constants/opponents.h
@ -1,699 +0,0 @@
-#ifndef GUARD_CONSTANTS_OPPONENTS_H
-#define GUARD_CONSTANTS_OPPONENTS_H
-
-#define OPPONENT_NONE 0
-#define OPPONENT_ARCHIE_1 1
-#define OPPONENT_GRUNT_1 2
-#define OPPONENT_GRUNT_2 3
-#define OPPONENT_GRUNT_3 4
-#define OPPONENT_GRUNT_4 5
-#define OPPONENT_GRUNT_5 6
-#define OPPONENT_GRUNT_6 7
-#define OPPONENT_GRUNT_7 8
-#define OPPONENT_GRUNT_8 9
-#define OPPONENT_GRUNT_9 10
-#define OPPONENT_GRUNT_10 11
-#define OPPONENT_GRUNT_11 12
-#define OPPONENT_GRUNT_12 13
-#define OPPONENT_GRUNT_13 14
-#define OPPONENT_GRUNT_14 15
-#define OPPONENT_GRUNT_15 16
-#define OPPONENT_GRUNT_16 17
-#define OPPONENT_GRUNT_17 18
-#define OPPONENT_GRUNT_18 19
-#define OPPONENT_GRUNT_19 20
-#define OPPONENT_GRUNT_20 21
-#define OPPONENT_GRUNT_21 22
-#define OPPONENT_GRUNT_22 23
-#define OPPONENT_GRUNT_23 24
-#define OPPONENT_GRUNT_24 25
-#define OPPONENT_GRUNT_25 26
-#define OPPONENT_GRUNT_26 27
-#define OPPONENT_GRUNT_27 28
-#define OPPONENT_ANONYMOUS_1 29
-#define OPPONENT_MATT_1 30
-#define OPPONENT_MATT_2 31
-#define OPPONENT_SHELLY_1 32
-#define OPPONENT_SHELLY_2 33
-#define OPPONENT_ARCHIE_2 34
-#define OPPONENT_ARCHIE_3 35
-#define OPPONENT_DAISY 36
-#define OPPONENT_ROSE_1 37
-#define OPPONENT_LILY 38
-#define OPPONENT_VIOLET 39
-#define OPPONENT_ROSE_2 40
-#define OPPONENT_ROSE_3 41
-#define OPPONENT_ROSE_4 42
-#define OPPONENT_ROSE_5 43
-#define OPPONENT_DUSTY_1 44
-#define OPPONENT_CHIP 45
-#define OPPONENT_FOSTER 46
-#define OPPONENT_DUSTY_2 47
-#define OPPONENT_DUSTY_3 48
-#define OPPONENT_DUSTY_4 49
-#define OPPONENT_DUSTY_5 50
-#define OPPONENT_GABBY_AND_TY_1 51
-#define OPPONENT_GABBY_AND_TY_2 52
-#define OPPONENT_GABBY_AND_TY_3 53
-#define OPPONENT_GABBY_AND_TY_4 54
-#define OPPONENT_GABBY_AND_TY_5 55
-#define OPPONENT_GABBY_AND_TY_6 56
-#define OPPONENT_LOLA_1 57
-#define OPPONENT_CARMEN 58
-#define OPPONENT_GWEN 59
-#define OPPONENT_LOLA_2 60
-#define OPPONENT_LOLA_3 61
-#define OPPONENT_LOLA_4 62
-#define OPPONENT_LOLA_5 63
-#define OPPONENT_RICKY_1 64
-#define OPPONENT_SIMON 65
-#define OPPONENT_CHARLIE 66
-#define OPPONENT_RICKY_2 67
-#define OPPONENT_RICKY_3 68
-#define OPPONENT_RICKY_4 69
-#define OPPONENT_RICKY_5 70
-#define OPPONENT_RANDALL 71
-#define OPPONENT_PARKER 72
-#define OPPONENT_GEORGE 73
-#define OPPONENT_BERKE 74
-#define OPPONENT_CLYDE 75
-#define OPPONENT_VINCENT 76
-#define OPPONENT_LEROY 77
-#define OPPONENT_WILTON_1 78
-#define OPPONENT_EDGAR 79
-#define OPPONENT_ALBERT 80
-#define OPPONENT_SAMUEL 81
-#define OPPONENT_VITO 82
-#define OPPONENT_OWEN 83
-#define OPPONENT_WILTON_2 84
-#define OPPONENT_WILTON_3 85
-#define OPPONENT_WILTON_4 86
-#define OPPONENT_WILTON_5 87
-#define OPPONENT_WARREN 88
-#define OPPONENT_MARY 89
-#define OPPONENT_LORI 90
-#define OPPONENT_JODY 91
-#define OPPONENT_WENDY 92
-#define OPPONENT_ELAINE 93
-#define OPPONENT_BROOKE_1 94
-#define OPPONENT_JENNIFER 95
-#define OPPONENT_HOPE 96
-#define OPPONENT_SHANNON 97
-#define OPPONENT_MICHELLE 98
-#define OPPONENT_CAROLINE 99
-#define OPPONENT_JULIE 100
-#define OPPONENT_BROOKE_2 101
-#define OPPONENT_BROOKE_3 102
-#define OPPONENT_BROOKE_4 103
-#define OPPONENT_BROOKE_5 104
-#define OPPONENT_PATRICIA 105
-#define OPPONENT_KINDRA 106
-#define OPPONENT_TAMMY 107
-#define OPPONENT_VALERIE_1 108
-#define OPPONENT_TASHA 109
-#define OPPONENT_VALERIE_2 110
-#define OPPONENT_VALERIE_3 111
-#define OPPONENT_VALERIE_4 112
-#define OPPONENT_VALERIE_5 113
-#define OPPONENT_CINDY_1 114
-#define OPPONENT_ANONYMOUS_2 115
-#define OPPONENT_BRIANNA_1 116
-#define OPPONENT_CINDY_2 117
-#define OPPONENT_BRIANNA_2 118
-#define OPPONENT_ANETTE 119
-#define OPPONENT_CINDY_3 120
-#define OPPONENT_CINDY_4 121
-#define OPPONENT_CINDY_5 122
-#define OPPONENT_CINDY_6 123
-#define OPPONENT_MELISSA 124
-#define OPPONENT_SHEILA 125
-#define OPPONENT_SHIRLEY 126
-#define OPPONENT_JESSICA_1 127
-#define OPPONENT_CONNIE 128
-#define OPPONENT_BRIDGET 129
-#define OPPONENT_OLIVIA 130
-#define OPPONENT_TIFFANY 131
-#define OPPONENT_JESSICA_2 132
-#define OPPONENT_JESSICA_3 133
-#define OPPONENT_JESSICA_4 134
-#define OPPONENT_JESSICA_5 135
-#define OPPONENT_WINSTON_1 136
-#define OPPONENT_ANONYMOUS_3 137
-#define OPPONENT_GARRET 138
-#define OPPONENT_WINSTON_2 139
-#define OPPONENT_WINSTON_3 140
-#define OPPONENT_WINSTON_4 141
-#define OPPONENT_WINSTON_5 142
-#define OPPONENT_STEVE_1 143
-#define OPPONENT_CHRIS 144
-#define OPPONENT_MARK 145
-#define OPPONENT_KENN 146
-#define OPPONENT_STEVE_2 147
-#define OPPONENT_STEVE_3 148
-#define OPPONENT_STEVE_4 149
-#define OPPONENT_STEVE_5 150
-#define OPPONENT_LUIS 151
-#define OPPONENT_AUSTIN 152
-#define OPPONENT_DOUGLAS 153
-#define OPPONENT_DARRIN 154
-#define OPPONENT_TONY_1 155
-#define OPPONENT_JEROME 156
-#define OPPONENT_MATTHEW 157
-#define OPPONENT_DAVID 158
-#define OPPONENT_SPENCER 159
-#define OPPONENT_ROLAND 160
-#define OPPONENT_CODY 161
-#define OPPONENT_STAN 162
-#define OPPONENT_BARRY 163
-#define OPPONENT_DEAN 164
-#define OPPONENT_RODNEY 165
-#define OPPONENT_RICHARD 166
-#define OPPONENT_HERMAN 167
-#define OPPONENT_ANONYMOUS_4 168
-#define OPPONENT_GILBERT 169
-#define OPPONENT_FRANKLIN 170
-#define OPPONENT_DANNY 171
-#define OPPONENT_JACK 172
-#define OPPONENT_DUDLEY 173
-#define OPPONENT_CHAD 174
-#define OPPONENT_TONY_2 175
-#define OPPONENT_TONY_3 176
-#define OPPONENT_TONY_4 177
-#define OPPONENT_TONY_5 178
-#define OPPONENT_HIDEKI 179
-#define OPPONENT_HITOSHI 180
-#define OPPONENT_KIYO 181
-#define OPPONENT_KOICHI 182
-#define OPPONENT_NOB_1 183
-#define OPPONENT_NOB_2 184
-#define OPPONENT_NOB_3 185
-#define OPPONENT_NOB_4 186
-#define OPPONENT_NOB_5 187
-#define OPPONENT_YUJI 188
-#define OPPONENT_DAISUKE 189
-#define OPPONENT_ATSUSHI 190
-#define OPPONENT_KIRK 191
-#define OPPONENT_SCOTT 192
-#define OPPONENT_HARVEY 193
-#define OPPONENT_SHAWN 194
-#define OPPONENT_RANDY 195
-#define OPPONENT_DALTON_1 196
-#define OPPONENT_DALTON_2 197
-#define OPPONENT_DALTON_3 198
-#define OPPONENT_DALTON_4 199
-#define OPPONENT_DALTON_5 200
-#define OPPONENT_COLE 201
-#define OPPONENT_FLINT 202
-#define OPPONENT_AXLE 203
-#define OPPONENT_JAKE 204
-#define OPPONENT_ANDY 205
-#define OPPONENT_BERNIE_1 206
-#define OPPONENT_BERNIE_2 207
-#define OPPONENT_BERNIE_3 208
-#define OPPONENT_BERNIE_4 209
-#define OPPONENT_BERNIE_5 210
-#define OPPONENT_DREW 211
-#define OPPONENT_CLIFF 212
-#define OPPONENT_LARRY 213
-#define OPPONENT_SHANE 214
-#define OPPONENT_JUSTIN 215
-#define OPPONENT_ETHAN_1 216
-#define OPPONENT_JEFF 217
-#define OPPONENT_TRAVIS 218
-#define OPPONENT_ETHAN_2 219
-#define OPPONENT_ETHAN_3 220
-#define OPPONENT_ETHAN_4 221
-#define OPPONENT_ETHAN_5 222
-#define OPPONENT_BRENT 223
-#define OPPONENT_DONALD 224
-#define OPPONENT_TAYLOR 225
-#define OPPONENT_BRANDON_1 226
-#define OPPONENT_DEREK 227
-#define OPPONENT_BRANDON_2 228
-#define OPPONENT_BRANDON_3 229
-#define OPPONENT_BRANDON_4 230
-#define OPPONENT_BRANDON_5 231
-#define OPPONENT_EDWARD 232
-#define OPPONENT_PRESTON 233
-#define OPPONENT_VIRGIL 234
-#define OPPONENT_FRITZ 235
-#define OPPONENT_WILLIAM 236
-#define OPPONENT_JOSHUA 237
-#define OPPONENT_CAMERON_1 238
-#define OPPONENT_CAMERON_2 239
-#define OPPONENT_CAMERON_3 240
-#define OPPONENT_CAMERON_4 241
-#define OPPONENT_CAMERON_5 242
-#define OPPONENT_JACLYN 243
-#define OPPONENT_HANNAH 244
-#define OPPONENT_SAMANTHA 245
-#define OPPONENT_MAURA 246
-#define OPPONENT_KAYLA 247
-#define OPPONENT_ALEXIS 248
-#define OPPONENT_JACKI_1 249
-#define OPPONENT_JACKI_2 250
-#define OPPONENT_JACKI_3 251
-#define OPPONENT_JACKI_4 252
-#define OPPONENT_JACKI_5 253
-#define OPPONENT_WALTER_1 254
-#define OPPONENT_TUCKER 255
-#define OPPONENT_THOMAS 256
-#define OPPONENT_WALTER_2 257
-#define OPPONENT_WALTER_3 258
-#define OPPONENT_WALTER_4 259
-#define OPPONENT_WALTER_5 260
-#define OPPONENT_SIDNEY 261
-#define OPPONENT_PHOEBE 262
-#define OPPONENT_GLACIA 263
-#define OPPONENT_DRAKE 264
-#define OPPONENT_ROXANNE 265
-#define OPPONENT_BRAWLY 266
-#define OPPONENT_WATTSON 267
-#define OPPONENT_FLANNERY 268
-#define OPPONENT_NORMAN 269
-#define OPPONENT_WINONA 270
-#define OPPONENT_TATE_AND_LIZA 271
-#define OPPONENT_WALLACE 272
-#define OPPONENT_JERRY_1 273
-#define OPPONENT_TED 274
-#define OPPONENT_PAUL 275
-#define OPPONENT_JERRY_2 276
-#define OPPONENT_JERRY_3 277
-#define OPPONENT_JERRY_4 278
-#define OPPONENT_JERRY_5 279
-#define OPPONENT_KAREN_1 280
-#define OPPONENT_GEORGIA 281
-#define OPPONENT_KAREN_2 282
-#define OPPONENT_KAREN_3 283
-#define OPPONENT_KAREN_4 284
-#define OPPONENT_KAREN_5 285
-#define OPPONENT_KATE_AND_JOY 286
-#define OPPONENT_ANNA_AND_MEG_1 287
-#define OPPONENT_ANNA_AND_MEG_2 288
-#define OPPONENT_ANNA_AND_MEG_3 289
-#define OPPONENT_ANNA_AND_MEG_4 290
-#define OPPONENT_ANNA_AND_MEG_5 291
-#define OPPONENT_VICTOR 292
-#define OPPONENT_MIGUEL_1 293
-#define OPPONENT_COLTON 294
-#define OPPONENT_MIGUEL_2 295
-#define OPPONENT_MIGUEL_3 296
-#define OPPONENT_MIGUEL_4 297
-#define OPPONENT_MIGUEL_5 298
-#define OPPONENT_VICTORIA 299
-#define OPPONENT_VANESSA 300
-#define OPPONENT_MARISSA 301
-#define OPPONENT_ISABEL_1 302
-#define OPPONENT_ISABEL_2 303
-#define OPPONENT_ISABEL_3 304
-#define OPPONENT_ISABEL_4 305
-#define OPPONENT_ISABEL_5 306
-#define OPPONENT_TIMOTHY_1 307
-#define OPPONENT_TIMOTHY_2 308
-#define OPPONENT_TIMOTHY_3 309
-#define OPPONENT_TIMOTHY_4 310
-#define OPPONENT_TIMOTHY_5 311
-#define OPPONENT_VICKY 312
-#define OPPONENT_SHELBY_1 313
-#define OPPONENT_SHELBY_2 314
-#define OPPONENT_SHELBY_3 315
-#define OPPONENT_SHELBY_4 316
-#define OPPONENT_SHELBY_5 317
-#define OPPONENT_CALVIN_1 318
-#define OPPONENT_BILLY 319
-#define OPPONENT_JOSH 320
-#define OPPONENT_TOMMY 321
-#define OPPONENT_JOEY 322
-#define OPPONENT_BEN 323
-#define OPPONENT_ANONYMOUS_5 324
-#define OPPONENT_KEVIN 325
-#define OPPONENT_NEAL 326
-#define OPPONENT_DILLON 327
-#define OPPONENT_CALVIN_2 328
-#define OPPONENT_CALVIN_3 329
-#define OPPONENT_CALVIN_4 330
-#define OPPONENT_CALVIN_5 331
-#define OPPONENT_EDDIE 332
-#define OPPONENT_ALLEN 333
-#define OPPONENT_TIMMY 334
-#define OPPONENT_STEVEN 335
-#define OPPONENT_ANDREW 336
-#define OPPONENT_IVAN 337
-#define OPPONENT_CLAUDE 338
-#define OPPONENT_ELLIOT_1 339
-#define OPPONENT_NED 340
-#define OPPONENT_DALE 341
-#define OPPONENT_NOLAN 342
-#define OPPONENT_BARNY 343
-#define OPPONENT_WADE 344
-#define OPPONENT_CARTER 345
-#define OPPONENT_ELLIOT_2 346
-#define OPPONENT_ELLIOT_3 347
-#define OPPONENT_ELLIOT_4 348
-#define OPPONENT_ELLIOT_5 349
-#define OPPONENT_RONALD 350
-#define OPPONENT_JACOB 351
-#define OPPONENT_ANTHONY 352
-#define OPPONENT_BENJAMIN_1 353
-#define OPPONENT_BENJAMIN_2 354
-#define OPPONENT_BENJAMIN_3 355
-#define OPPONENT_BENJAMIN_4 356
-#define OPPONENT_BENJAMIN_5 357
-#define OPPONENT_ABIGAIL_1 358
-#define OPPONENT_JASMINE 359
-#define OPPONENT_ABIGAIL_2 360
-#define OPPONENT_ABIGAIL_3 361
-#define OPPONENT_ABIGAIL_4 362
-#define OPPONENT_ABIGAIL_5 363
-#define OPPONENT_DYLAN_1 364
-#define OPPONENT_DYLAN_2 365
-#define OPPONENT_DYLAN_3 366
-#define OPPONENT_DYLAN_4 367
-#define OPPONENT_DYLAN_5 368
-#define OPPONENT_MARIA_1 369
-#define OPPONENT_MARIA_2 370
-#define OPPONENT_MARIA_3 371
-#define OPPONENT_MARIA_4 372
-#define OPPONENT_MARIA_5 373
-#define OPPONENT_CALEB 374
-#define OPPONENT_ANONYMOUS_6 375
-#define OPPONENT_ISAIAH_1 376
-#define OPPONENT_ANONYMOUS_7 377
-#define OPPONENT_CHASE 378
-#define OPPONENT_ISAIAH_2 379
-#define OPPONENT_ISAIAH_3 380
-#define OPPONENT_ISAIAH_4 381
-#define OPPONENT_ISAIAH_5 382
-#define OPPONENT_ANONYMOUS_8 383
-#define OPPONENT_CONNOR 384
-#define OPPONENT_ANONYMOUS_9 385
-#define OPPONENT_KATELYN_1 386
-#define OPPONENT_ALLISON 387
-#define OPPONENT_KATELYN_2 388
-#define OPPONENT_KATELYN_3 389
-#define OPPONENT_KATELYN_4 390
-#define OPPONENT_KATELYN_5 391
-#define OPPONENT_NICOLAS_1 392
-#define OPPONENT_NICOLAS_2 393
-#define OPPONENT_NICOLAS_3 394
-#define OPPONENT_NICOLAS_4 395
-#define OPPONENT_NICOLAS_5 396
-#define OPPONENT_AARON 397
-#define OPPONENT_PERRY 398
-#define OPPONENT_HUGH 399
-#define OPPONENT_PHIL 400
-#define OPPONENT_JARED 401
-#define OPPONENT_ANONYMOUS_10 402
-#define OPPONENT_TANNER 403
-#define OPPONENT_WILL 404
-#define OPPONENT_COLIN 405
-#define OPPONENT_ROBERT_1 406
-#define OPPONENT_BENNY 407
-#define OPPONENT_CHESTER 408
-#define OPPONENT_ROBERT_2 409
-#define OPPONENT_ROBERT_3 410
-#define OPPONENT_ROBERT_4 411
-#define OPPONENT_ROBERT_5 412
-#define OPPONENT_ALEX 413
-#define OPPONENT_BECK 414
-#define OPPONENT_YASU 415
-#define OPPONENT_TAKASHI 416
-#define OPPONENT_MAKOTO 417
-#define OPPONENT_HIDEO_1 418
-#define OPPONENT_LAO_1 419
-#define OPPONENT_LUNG 420
-#define OPPONENT_LAO_2 421
-#define OPPONENT_LAO_3 422
-#define OPPONENT_LAO_4 423
-#define OPPONENT_LAO_5 424
-#define OPPONENT_TESSA 425
-#define OPPONENT_LAURA 426
-#define OPPONENT_CYNDY_1 427
-#define OPPONENT_CORA 428
-#define OPPONENT_JILL 429
-#define OPPONENT_CYNDY_2 430
-#define OPPONENT_CYNDY_3 431
-#define OPPONENT_CYNDY_4 432
-#define OPPONENT_CYNDY_5 433
-#define OPPONENT_MADELINE_1 434
-#define OPPONENT_CLARISSA 435
-#define OPPONENT_ANGELICA 436
-#define OPPONENT_MADELINE_2 437
-#define OPPONENT_MADELINE_3 438
-#define OPPONENT_MADELINE_4 439
-#define OPPONENT_MADELINE_5 440
-#define OPPONENT_BEVERLY 441
-#define OPPONENT_DAWN 442
-#define OPPONENT_NICOLE 443
-#define OPPONENT_DENISE 444
-#define OPPONENT_BETH 445
-#define OPPONENT_TARA 446
-#define OPPONENT_MISSY 447
-#define OPPONENT_ALICE 448
-#define OPPONENT_JENNY_1 449
-#define OPPONENT_GRACE 450
-#define OPPONENT_TANYA 451
-#define OPPONENT_SHARON 452
-#define OPPONENT_NIKKI 453
-#define OPPONENT_BRENDA 454
-#define OPPONENT_KATIE 455
-#define OPPONENT_SUSIE 456
-#define OPPONENT_KARA 457
-#define OPPONENT_DANA 458
-#define OPPONENT_ERIN 459
-#define OPPONENT_DEBRA 460
-#define OPPONENT_LINDA 461
-#define OPPONENT_KAYLEE 462
-#define OPPONENT_LAUREL 463
-#define OPPONENT_DARCY 464
-#define OPPONENT_JENNY_2 465
-#define OPPONENT_JENNY_3 466
-#define OPPONENT_JENNY_4 467
-#define OPPONENT_JENNY_5 468
-#define OPPONENT_HEIDI 469
-#define OPPONENT_BECKY 470
-#define OPPONENT_CAROL 471
-#define OPPONENT_NANCY 472
-#define OPPONENT_MARTHA 473
-#define OPPONENT_DIANA_1 474
-#define OPPONENT_NINA 475
-#define OPPONENT_IRENE 476
-#define OPPONENT_DIANA_2 477
-#define OPPONENT_DIANA_3 478
-#define OPPONENT_DIANA_4 479
-#define OPPONENT_DIANA_5 480
-#define OPPONENT_AMY_AND_LIV_1 481
-#define OPPONENT_AMY_AND_LIV_2 482
-#define OPPONENT_GINA_AND_MIA_1 483
-#define OPPONENT_MIU_AND_YUKI 484
-#define OPPONENT_AMY_AND_LIV_3 485
-#define OPPONENT_GINA_AND_MIA_2 486
-#define OPPONENT_AMY_AND_LIV_4 487
-#define OPPONENT_AMY_AND_LIV_5 488
-#define OPPONENT_AMY_AND_LIV_6 489
-#define OPPONENT_HUEY 490
-#define OPPONENT_EDMOND 491
-#define OPPONENT_ERNEST_1 492
-#define OPPONENT_DWAYNE 493
-#define OPPONENT_PHILLIP 494
-#define OPPONENT_LEONARD 495
-#define OPPONENT_DUNCAN 496
-#define OPPONENT_ERNEST_2 497
-#define OPPONENT_ERNEST_3 498
-#define OPPONENT_ERNEST_4 499
-#define OPPONENT_ERNEST_5 500
-#define OPPONENT_ANONYMOUS_11 501
-#define OPPONENT_ANONYMOUS_12 502
-#define OPPONENT_ANONYMOUS_13 503
-#define OPPONENT_SONNY 504
-#define OPPONENT_DONOVAN 505
-#define OPPONENT_GERALD 506
-#define OPPONENT_KELVIN 507
-#define OPPONENT_KODY 508
-#define OPPONENT_TEVIN 509
-#define OPPONENT_DAMON 510
-#define OPPONENT_PABLO 511
-#define OPPONENT_EDWIN_1 512
-#define OPPONENT_HECTOR_1 513
-#define OPPONENT_HECTOR_2 514
-#define OPPONENT_EDWIN_2 515
-#define OPPONENT_EDWIN_3 516
-#define OPPONENT_EDWIN_4 517
-#define OPPONENT_EDWIN_5 518
-#define OPPONENT_WALLY_1 519
-#define OPPONENT_BRENDAN_1 520
-#define OPPONENT_BRENDAN_2 521
-#define OPPONENT_BRENDAN_3 522
-#define OPPONENT_BRENDAN_4 523
-#define OPPONENT_BRENDAN_5 524
-#define OPPONENT_BRENDAN_6 525
-#define OPPONENT_BRENDAN_7 526
-#define OPPONENT_BRENDAN_8 527
-#define OPPONENT_BRENDAN_9 528
-#define OPPONENT_MAY_1 529
-#define OPPONENT_MAY_2 530
-#define OPPONENT_MAY_3 531
-#define OPPONENT_MAY_4 532
-#define OPPONENT_MAY_5 533
-#define OPPONENT_MAY_6 534
-#define OPPONENT_MAY_7 535
-#define OPPONENT_MAY_8 536
-#define OPPONENT_MAY_9 537
-#define OPPONENT_ISAAC_1 538
-#define OPPONENT_RILEY 539
-#define OPPONENT_AIDAN 540
-#define OPPONENT_ISAAC_2 541
-#define OPPONENT_ISAAC_3 542
-#define OPPONENT_ISAAC_4 543
-#define OPPONENT_ISAAC_5 544
-#define OPPONENT_LYDIA_1 545
-#define OPPONENT_ALEXIA 546
-#define OPPONENT_DANIELLE 547
-#define OPPONENT_LYDIA_2 548
-#define OPPONENT_LYDIA_3 549
-#define OPPONENT_LYDIA_4 550
-#define OPPONENT_LYDIA_5 551
-#define OPPONENT_JACKSON_1 552
-#define OPPONENT_CARLOS 553
-#define OPPONENT_SEBASTIAN 554
-#define OPPONENT_JACKSON_2 555
-#define OPPONENT_JACKSON_3 556
-#define OPPONENT_JACKSON_4 557
-#define OPPONENT_JACKSON_5 558
-#define OPPONENT_CATHERINE_1 559
-#define OPPONENT_JENNA 560
-#define OPPONENT_SOPHIA 561
-#define OPPONENT_CATHERINE_2 562
-#define OPPONENT_CATHERINE_3 563
-#define OPPONENT_CATHERINE_4 564
-#define OPPONENT_CATHERINE_5 565
-#define OPPONENT_MAXIE_1 566
-#define OPPONENT_GRUNT_28 567
-#define OPPONENT_GRUNT_29 568
-#define OPPONENT_GRUNT_30 569
-#define OPPONENT_GRUNT_31 570
-#define OPPONENT_GRUNT_32 571
-#define OPPONENT_GRUNT_33 572
-#define OPPONENT_GRUNT_34 573
-#define OPPONENT_GRUNT_35 574
-#define OPPONENT_GRUNT_36 575
-#define OPPONENT_GRUNT_37 576
-#define OPPONENT_GRUNT_38 577
-#define OPPONENT_GRUNT_39 578
-#define OPPONENT_GRUNT_40 579
-#define OPPONENT_GRUNT_41 580
-#define OPPONENT_GRUNT_42 581
-#define OPPONENT_GRUNT_43 582
-#define OPPONENT_GRUNT_44 583
-#define OPPONENT_GRUNT_45 584
-#define OPPONENT_GRUNT_46 585
-#define OPPONENT_GRUNT_47 586
-#define OPPONENT_GRUNT_48 587
-#define OPPONENT_GRUNT_49 588
-#define OPPONENT_GRUNT_50 589
-#define OPPONENT_GRUNT_51 590
-#define OPPONENT_GRUNT_52 591
-#define OPPONENT_GRUNT_53 592
-#define OPPONENT_GRUNT_54 593
-#define OPPONENT_ANONYMOUS_14 594
-#define OPPONENT_ANONYMOUS_15 595
-#define OPPONENT_TABITHA_1 596
-#define OPPONENT_TABITHA_2 597
-#define OPPONENT_ANONYMOUS_16 598
-#define OPPONENT_COURTNEY_1 599
-#define OPPONENT_COURTNEY_2 600
-#define OPPONENT_MAXIE_2 601
-#define OPPONENT_MAXIE_3 602
-#define OPPONENT_TIANA 603
-#define OPPONENT_HALEY_1 604
-#define OPPONENT_JANICE 605
-#define OPPONENT_VIVI 606
-#define OPPONENT_HALEY_2 607
-#define OPPONENT_HALEY_3 608
-#define OPPONENT_HALEY_4 609
-#define OPPONENT_HALEY_5 610
-#define OPPONENT_SALLY 611
-#define OPPONENT_ROBIN 612
-#define OPPONENT_ANDREA 613
-#define OPPONENT_CRISSY 614
-#define OPPONENT_RICK 615
-#define OPPONENT_LYLE 616
-#define OPPONENT_JOSE 617
-#define OPPONENT_DOUG 618
-#define OPPONENT_GREG 619
-#define OPPONENT_KENT 620
-#define OPPONENT_JAMES_1 621
-#define OPPONENT_JAMES_2 622
-#define OPPONENT_JAMES_3 623
-#define OPPONENT_JAMES_4 624
-#define OPPONENT_JAMES_5 625
-#define OPPONENT_BRICE 626
-#define OPPONENT_TRENT_1 627
-#define OPPONENT_LENNY 628
-#define OPPONENT_LUCAS_1 629
-#define OPPONENT_ALAN 630
-#define OPPONENT_CLARK 631
-#define OPPONENT_ERIC 632
-#define OPPONENT_LUCAS_2 633
-#define OPPONENT_MIKE_1 634
-#define OPPONENT_MIKE_2 635
-#define OPPONENT_TRENT_2 636
-#define OPPONENT_TRENT_3 637
-#define OPPONENT_TRENT_4 638
-#define OPPONENT_TRENT_5 639
-#define OPPONENT_DEZ_AND_LUKE 640
-#define OPPONENT_LEA_AND_JED 641
-#define OPPONENT_LOIS_AND_HAL_1 642
-#define OPPONENT_LOIS_AND_HAL_2 643
-#define OPPONENT_LOIS_AND_HAL_3 644
-#define OPPONENT_LOIS_AND_HAL_4 645
-#define OPPONENT_LOIS_AND_HAL_5 646
-#define OPPONENT_JOHANNA 647
-#define OPPONENT_ZANE 648
-#define OPPONENT_VIVIAN 649
-#define OPPONENT_SADIE 650
-#define OPPONENT_HIDEO_2 651
-#define OPPONENT_KEIGO 652
-#define OPPONENT_TSUNAO 653
-#define OPPONENT_TERRELL 654
-#define OPPONENT_KYLEE 655
-#define OPPONENT_WALLY_2 656
-#define OPPONENT_WALLY_3 657
-#define OPPONENT_WALLY_4 658
-#define OPPONENT_WALLY_5 659
-#define OPPONENT_WALLY_6 660
-#define OPPONENT_BRENDAN_10 661
-#define OPPONENT_BRENDAN_11 662
-#define OPPONENT_BRENDAN_12 663
-#define OPPONENT_MAY_10 664
-#define OPPONENT_MAY_11 665
-#define OPPONENT_MAY_12 666
-#define OPPONENT_JONAH 667
-#define OPPONENT_HENRY 668
-#define OPPONENT_ROGER 669
-#define OPPONENT_ALEXA 670
-#define OPPONENT_RUBEN 671
-#define OPPONENT_KOJI 672
-#define OPPONENT_WAYNE 673
-#define OPPONENT_BYRON 674
-#define OPPONENT_REED 675
-#define OPPONENT_TISHA 676
-#define OPPONENT_TORI_AND_TIA 677
-#define OPPONENT_KIM_AND_IRIS 678
-#define OPPONENT_TYRA_AND_IVY 679
-#define OPPONENT_MEL_AND_PAUL 680
-#define OPPONENT_JOHN_AND_JAY_1 681
-#define OPPONENT_JOHN_AND_JAY_2 682
-#define OPPONENT_JOHN_AND_JAY_3 683
-#define OPPONENT_JOHN_AND_JAY_4 684
-#define OPPONENT_JOHN_AND_JAY_5 685
-#define OPPONENT_RELI_AND_IAN 686
-#define OPPONENT_RITA_AND_SAM_1 687
-#define OPPONENT_RITA_AND_SAM_2 688
-#define OPPONENT_RITA_AND_SAM_3 689
-#define OPPONENT_RITA_AND_SAM_4 690
-#define OPPONENT_RITA_AND_SAM_5 691
-#define OPPONENT_LISA_AND_RAY 692
-#define OPPONENT_EUGENE 693
-
-#endif  // GUARD_CONSTANTS_OPPONENTS_H
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@ -357,16 +357,108 @@
 #define BGM_DAIGO 454
 #define BGM_THANKFOR 455
 #define BGM_END 456
-#define BGM_BATTLE27 457
-#define BGM_BATTLE31 458
-#define BGM_BATTLE20 459
-#define BGM_BATTLE32 460
-#define BGM_BATTLE33 461
-#define BGM_BATTLE36 462
-#define BGM_BATTLE34 463
-#define BGM_BATTLE35 464
-#define BGM_BATTLE38 465
-#define BGM_BATTLE30 466
+#define BGM_BATTLE_FRONTIER 457
+#define BGM_BATTLE_ARENA 458
+#define BGM_ME_BATTLE_POINTS 459
+#define BGM_ME_MATCH_CALL 460
+#define BGM_BATTLE_PYRAMID 461
+#define BGM_BATTLE_PYRAMID_SUMMIT 462
+#define BGM_BATTLE_PALACE 463
+#define BGM_FANFA_RAYQUAZA 464
+#define BGM_BATTLE_TOWER 465
+#define BGM_ME_BATTLE_SYMBOL 466
+#define BGM_BATTLE_DOME_TOURNAMENT 467
+#define BGM_BATTLE_PIKE 468
+#define BGM_BATTLE_FACTORY 469
+#define BGM_BATTLE_LEGENDARY 470
+#define BGM_BATTLE_FRONTIER_BRAIN 471
+#define BGM_BATTLE_MEW 472
+#define BGM_BATTLE_DOME 473
+#define BGM_BATTLE27 474
+#define BGM_BATTLE31 475
+#define BGM_BATTLE20 476
+#define BGM_BATTLE32 477
+#define BGM_BATTLE33 478
+#define BGM_BATTLE36 479
+#define BGM_BATTLE34 480
+#define BGM_BATTLE35 481
+#define BGM_BATTLE38 482
+#define BGM_BATTLE30 483
+#define BGM_FRLG_FOLLOW_ME 484
+#define BGM_FRLG_GAMECORNER 485
+#define BGM_FRLG_ROCKET_HIDEOUT 486
+#define BGM_FRLG_GYM 487
+#define BGM_FRLG_JIGGLYPUFF 488
+#define BGM_FRLG_OPENING 489
+#define BGM_FRLG_TITLE 490
+#define BGM_FRLG_CINNABAR_ISLAND 491
+#define BGM_FRLG_LAVENDER_TOWN 492
+#define BGM_FRLG_HEALING_TEST 493
+#define BGM_FRLG_BICYCLE 494
+#define BGM_FRLG_SUSPICIOUS_EYE 495
+#define BGM_FRLG_GIRL_EYE 496
+#define BGM_FRLG_BOY_EYE 497
+#define BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME 498
+#define BGM_FRLG_VIRIDIAN_FOREST 499
+#define BGM_FRLG_MT_MOON 500
+#define BGM_FRLG_POKEMON_MANSION 501
+#define BGM_FRLG_CREDITS 502
+#define BGM_FRLG_ROUTE_1 503
+#define BGM_FRLG_ROUTE_24 504
+#define BGM_FRLG_ROUTE_3 505
+#define BGM_FRLG_ROUTE_11 506
+#define BGM_FRLG_INDIGO_PLATEAU 507
+#define BGM_FRLG_BATTLE_LEADER 508
+#define BGM_FRLG_BATTLE_TRAINER 509
+#define BGM_FRLG_BATTLE_WILD_POKEMON 510
+#define BGM_FRLG_BATTLE_CHAMPION 511
+#define BGM_FRLG_PALLET_TOWN 512
+#define BGM_FRLG_OAK_LAB 513
+#define BGM_FRLG_PROF_OAK 514
+#define BGM_FRLG_POKEMON_CENTER 515
+#define BGM_FRLG_SS_ANNE 516
+#define BGM_FRLG_SURF 517
+#define BGM_FRLG_POKEMON_TOWER 518
+#define BGM_FRLG_SILPH 519
+#define BGM_FRLG_CERULEAN_CITY 520
+#define BGM_FRLG_CELADON_CITY 521
+#define BGM_FRLG_KACHI_TRAINER 522
+#define BGM_FRLG_KACHI_WILD_POKEMON 523
+#define BGM_FRLG_KACHI_LEADER 524
+#define BGM_FRLG_VERMILION_CITY 525
+#define BGM_FRLG_VIRIDIAN_CITY 526
+#define BGM_FRLG_RIVAL 527
+#define BGM_FRLG_RIVAL_POSTBATTLE 528
+#define BGM_FRLG_ME_POKEDEX_EVAL 529
+#define BGM_FRLG_ME_KEYITEM 530
+#define BGM_FRLG_FANFA_POKEMON_CAUGHT 531
+#define BGM_FRLG_FANFA_TRAINERCARD_PHOTO 532
+#define BGM_FRLG_GAMEFREAK_LOGO 533
+#define BGM_FRLG_CAUGHT_POKEMON 534
+#define BGM_FRLG_GAME_EXPLANATION_START 535
+#define BGM_FRLG_GAME_EXPLANATION_MIDDLE 536
+#define BGM_FRLG_GAME_EXPLANATION_END 537
+#define BGM_FRLG_POKEMON_JUMP 538
+#define BGM_FRLG_UNION_ROOM 539
+#define BGM_FRLG_POKEMON_NETWORK_CENTER 540
+#define BGM_FRLG_MYSTERY_GIFT 541
+#define BGM_FRLG_DODRIO_BERRY_PICK 542
+#define BGM_FRLG_MT_EMBER 543
+#define BGM_FRLG_TEACHY_TV_EPISODE 544
+#define BGM_FRLG_SEVII_ISLANDS 545
+#define BGM_FRLG_TANOBY_RUINS 546
+#define BGM_FRLG_ISLAND_ONE 547
+#define BGM_FRLG_ISLAND_FOUR 548
+#define BGM_FRLG_ISLAND_SIX 549
+#define BGM_FRLG_FLUTE 550
+#define BGM_FRLG_BATTLE_DEOXYS 551
+#define BGM_FRLG_BATTLE_MEWTWO 552
+#define BGM_FRLG_BATTLE_LEGENDARY 553
+#define BGM_FRLG_LEADER_EYE 554
+#define BGM_FRLG_DEOXYS_EYE 555
+#define BGM_FRLG_TRAINER_TOWER 556
+#define BGM_FRLG_HALL_OF_FAME_PALLET_TOWN 557
+#define BGM_FRLG_TEACHY_TV 558

 #define BGM_ROUTE_118 0x7FFF  // What is this for?

--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@ -14,6 +14,26 @@
 #define VAR_0x4008                 0x4008
 #define VAR_0x4009                 0x4009
 #define VAR_0x400A                 0x400A
+#define VAR_0x400B                 0x400B
+#define VAR_0x400C                 0x400C
+#define VAR_0x400D                 0x400D
+#define VAR_0x400E                 0x400E
+#define VAR_0x400F                 0x400F
+#define VAR_0x4010                 0x4010
+#define VAR_0x4011                 0x4011
+#define VAR_0x4012                 0x4012
+#define VAR_0x4013                 0x4013
+#define VAR_0x4014                 0x4014
+#define VAR_0x4015                 0x4015
+#define VAR_0x4016                 0x4016
+#define VAR_0x4017                 0x4017
+#define VAR_0x4018                 0x4018
+#define VAR_0x4019                 0x4019
+#define VAR_0x401A                 0x401A
+#define VAR_0x401B                 0x401B
+#define VAR_0x401C                 0x401C
+#define VAR_0x401D                 0x401D
+#define VAR_0x401E                 0x401E
 #define VAR_0x401F                 0x401F
 #define VAR_RECYCLE_GOODS          0x4020
 #define VAR_REPEL_STEP_COUNT       0x4021
@ -22,35 +42,244 @@
 #define VAR_MIRAGE_RND_H           0x4024
 #define VAR_MIRAGE_RND_L           0x4025
 #define VAR_SECRET_BASE_MAP        0x4026
-
+#define VAR_0x4027                 0x4027
+#define VAR_0x4028                 0x4028
+#define VAR_0x4029                 0x4029
 #define VAR_HAPPINESS_STEP_COUNTER 0x402A
 #define VAR_POISON_STEP_COUNTER    0x402B
 #define VAR_RESET_RTC_ENABLE       0x402C
-
+#define VAR_0x402D                 0x402D
+#define VAR_0x402E                 0x402E
+#define VAR_0x402F                 0x402F
+#define VAR_0x4030                 0x4030
+#define VAR_0x4031                 0x4031
+#define VAR_0x4032                 0x4032
+#define VAR_0x4033                 0x4033
+#define VAR_0x4034                 0x4034
+#define VAR_0x4035                 0x4035
+#define VAR_STORAGE_UNKNOWN        0x4036
+#define VAR_0x4037                 0x4037
+#define VAR_0x4038                 0x4038
+#define VAR_0x4039                 0x4039
+#define VAR_0x403A                 0x403A
+#define VAR_0x403B                 0x403B
+#define VAR_0x403C                 0x403C
+#define VAR_0x403D                 0x403D
+#define VAR_ALTERING_CAVE_WILD_SET 0x403E
+#define VAR_0x403F                 0x403F
 #define VAR_DAYS                   0x4040
-
+#define VAR_0x4041                 0x4041
+#define VAR_0x4042                 0x4042
 #define VAR_DEPT_STORE_FLOOR       0x4043
+#define VAR_0x4044                 0x4044
 #define VAR_POKELOT_PRIZE          0x4045
 #define VAR_NATIONAL_DEX           0x4046
-#define VAR_SHROOMISH_SIZE_RECORD  0x4047
+#define VAR_SEEDOT_SIZE_RECORD     0x4047
 #define VAR_ASH_GATHER_COUNT       0x4048
 #define VAR_BIRCH_STATE            0x4049
 #define VAR_CRUISE_STEP_COUNT      0x404A
 #define VAR_POKELOT_RND1           0x404B
 #define VAR_POKELOT_RND2           0x404C
-
-#define VAR_BARBOACH_SIZE_RECORD   0x404F
-
+#define VAR_0x404D                 0x404D
+#define VAR_0x404E                 0x404E
+#define VAR_LOTAD_SIZE_RECORD      0x404F
+#define VAR_0x4050                 0x4050
+#define VAR_0x4051                 0x4051
+#define VAR_0x4052                 0x4052
+#define VAR_0x4053                 0x4053
 #define VAR_0x4054                 0x4054
-
+#define VAR_0x4055                 0x4055
+#define VAR_0x4056                 0x4056
+#define VAR_0x4057                 0x4057
+#define VAR_0x4058                 0x4058
+#define VAR_0x4059                 0x4059
+#define VAR_0x405A                 0x405A
+#define VAR_0x405B                 0x405B
+#define VAR_0x405C                 0x405C
+#define VAR_0x405D                 0x405D
+#define VAR_0x405E                 0x405E
+#define VAR_0x405F                 0x405F
+#define VAR_0x4060                 0x4060
+#define VAR_0x4061                 0x4061
+#define VAR_0x4062                 0x4062
+#define VAR_0x4063                 0x4063
+#define VAR_0x4064                 0x4064
+#define VAR_0x4065                 0x4065
+#define VAR_0x4066                 0x4066
+#define VAR_0x4067                 0x4067
+#define VAR_0x4068                 0x4068
+#define VAR_0x4069                 0x4069
+#define VAR_0x406A                 0x406A
+#define VAR_0x406B                 0x406B
+#define VAR_0x406C                 0x406C
+#define VAR_0x406D                 0x406D
+#define VAR_0x406E                 0x406E
+#define VAR_0x406F                 0x406F
+#define VAR_0x4070                 0x4070
+#define VAR_0x4071                 0x4071
+#define VAR_0x4072                 0x4072
+#define VAR_0x4073                 0x4073
+#define VAR_0x4074                 0x4074
+#define VAR_0x4075                 0x4075
+#define VAR_0x4076                 0x4076
+#define VAR_0x4077                 0x4077
+#define VAR_0x4078                 0x4078
+#define VAR_0x4079                 0x4079
+#define VAR_0x407A                 0x407A
+#define VAR_0x407B                 0x407B
+#define VAR_0x407C                 0x407C
+#define VAR_0x407D                 0x407D
+#define VAR_0x407E                 0x407E
+#define VAR_0x407F                 0x407F
+#define VAR_0x4080                 0x4080
+#define VAR_0x4081                 0x4081
+#define VAR_0x4082                 0x4082
+#define VAR_0x4083                 0x4083
+#define VAR_0x4084                 0x4084
+#define VAR_0x4085                 0x4085
+#define VAR_0x4086                 0x4086
+#define VAR_0x4087                 0x4087
+#define VAR_0x4088                 0x4088
 #define VAR_0x4089                 0x4089
+#define VAR_0x408A                 0x408A
+#define VAR_0x408B                 0x408B
+#define VAR_0x408C                 0x408C
+#define VAR_0x408D                 0x408D
+#define VAR_0x408E                 0x408E
+#define VAR_0x408F                 0x408F
+#define VAR_0x4090                 0x4090
+#define VAR_0x4091                 0x4091
+#define VAR_0x4092                 0x4092
+#define VAR_0x4093                 0x4093
+#define VAR_0x4094                 0x4094
 #define VAR_0x4095                 0x4095
+#define VAR_0x4096                 0x4096
 #define VAR_0x4097                 0x4097
-#define VAR_0x409a                 0x409a
-#define VAR_WEATHER_INSTITUTE_CLEARED 0x040B3
+#define VAR_0x4098                 0x4098
+#define VAR_0x4099                 0x4099
+#define VAR_0x409A                 0x409A
+#define VAR_0x409B                 0x409B
+#define VAR_0x409C                 0x409C
+#define VAR_0x409D                 0x409D
+#define VAR_0x409E                 0x409E
+#define VAR_0x409F                 0x409F
+#define VAR_0x40A0                 0x40A0
+#define VAR_0x40A1                 0x40A1
+#define VAR_0x40A2                 0x40A2
+#define VAR_0x40A3                 0x40A3
+#define VAR_0x40A4                 0x40A4
+#define VAR_0x40A5                 0x40A5
+#define VAR_0x40A6                 0x40A6
+#define VAR_0x40A7                 0x40A7
+#define VAR_0x40A8                 0x40A8
+#define VAR_0x40A9                 0x40A9
+#define VAR_0x40AA                 0x40AA
+#define VAR_0x40AB                 0x40AB
+#define VAR_0x40AC                 0x40AC
+#define VAR_0x40AD                 0x40AD
+#define VAR_0x40AE                 0x40AE
+#define VAR_0x40AF                 0x40AF
+#define VAR_0x40B0                 0x40B0
+#define VAR_0x40B1                 0x40B1
+#define VAR_0x40B2                 0x40B2
+#define VAR_0x40B3                 0x40B3
 #define VAR_PORTHOLE               0x40B4
-
+#define VAR_0x40B5                 0x40B5
+#define VAR_0x40B6                 0x40B6
+#define VAR_0x40B7                 0x40B7
+#define VAR_0x40B8                 0x40B8
+#define VAR_0x40B9                 0x40B9
+#define VAR_0x40BA                 0x40BA
+#define VAR_0x40BB                 0x40BB
 #define VAR_0x40BC                 0x40BC
+#define VAR_0x40BD                 0x40BD
+#define VAR_0x40BE                 0x40BE
+#define VAR_0x40BF                 0x40BF
+#define VAR_0x40C0                 0x40C0
+#define VAR_0x40C1                 0x40C1
 #define VAR_0x40C2                 0x40C2
+#define VAR_0x40C3                 0x40C3
+#define VAR_0x40C4                 0x40C4
+#define VAR_0x40C5                 0x40C5
+#define VAR_0x40C6                 0x40C6
+#define VAR_0x40C7                 0x40C7
+#define VAR_0x40C8                 0x40C8
+#define VAR_0x40C9                 0x40C9
+#define VAR_0x40CA                 0x40CA
+#define VAR_0x40CB                 0x40CB
+#define VAR_0x40CC                 0x40CC
+#define VAR_0x40CD                 0x40CD
+#define VAR_0x40CE                 0x40CE
+#define VAR_FRONTIER_FACILITY      0x40CF
+#define VAR_0x40D0                 0x40D0
+#define VAR_0x40D1                 0x40D1
+#define VAR_0x40D2                 0x40D2
+#define VAR_0x40D3                 0x40D3
+#define VAR_0x40D4                 0x40D4
+#define VAR_0x40D5                 0x40D5
+#define VAR_0x40D6                 0x40D6
+#define VAR_0x40D7                 0x40D7
+#define VAR_0x40D8                 0x40D8
+#define VAR_0x40D9                 0x40D9
+#define VAR_0x40DA                 0x40DA
+#define VAR_0x40DB                 0x40DB
+#define VAR_0x40DC                 0x40DC
+#define VAR_0x40DD                 0x40DD
+#define VAR_0x40DE                 0x40DE
+#define VAR_0x40DF                 0x40DF
+#define VAR_0x40E0                 0x40E0
+#define VAR_0x40E1                 0x40E1
+#define VAR_0x40E2                 0x40E2
+#define VAR_0x40E3                 0x40E3
+#define VAR_0x40E4                 0x40E4
+#define VAR_0x40E5                 0x40E5
+#define VAR_DAILY_SLOTS            0x40E6
+#define VAR_DAILY_WILDS            0x40E7
+#define VAR_DAILY_BLENDER          0x40E8
+#define VAR_DAILY_PLANTED_BERRIES  0x40E9
+#define VAR_DAILY_PICKED_BERRIES   0x40EA
+#define VAR_DAILY_ROULETTE         0x40EB
+#define VAR_0x40EC                 0x40EC
+#define VAR_0x40ED                 0x40ED
+#define VAR_0x40EE                 0x40EE
+#define VAR_0x40EF                 0x40EF
+#define VAR_0x40F0                 0x40F0
+#define VAR_DAILY_BP               0x40F1
+#define VAR_0x40F2                 0x40F2
+#define VAR_0x40F3                 0x40F3
+#define VAR_0x40F4                 0x40F4
+#define VAR_0x40F5                 0x40F5
+#define VAR_0x40F6                 0x40F6
+#define VAR_0x40F7                 0x40F7
+#define VAR_0x40F8                 0x40F8
+#define VAR_0x40F9                 0x40F9
+#define VAR_0x40FA                 0x40FA
+#define VAR_0x40FB                 0x40FB
+#define VAR_0x40FC                 0x40FC
+#define VAR_0x40FD                 0x40FD
+#define VAR_0x40FE                 0x40FE
+#define VAR_0x40FF                 0x40FF
+
+#define VAR_0x8000                 0x8000
+#define VAR_0x8001                 0x8001
+#define VAR_0x8002                 0x8002
+#define VAR_0x8003                 0x8003
+#define VAR_0x8004                 0x8004
+#define VAR_0x8005                 0x8005
+#define VAR_0x8006                 0x8006
+#define VAR_0x8007                 0x8007
+#define VAR_0x8008                 0x8008
+#define VAR_0x8009                 0x8009
+#define VAR_0x800A                 0x800A
+#define VAR_0x800B                 0x800B
+#define VAR_FACING                 0x800C
+#define VAR_RESULT                 0x800D
+#define VAR_ITEM_ID                0x800E
+#define VAR_LAST_TALKED            0x800F
+#define VAR_CONTEST_RANK           0x8010
+#define VAR_CONTEST_CATEGORY       0x8011
+#define VAR_MON_BOX_ID             0x8012
+#define VAR_MON_BOX_POS            0x8013
+#define VAR_0x8014                 0x8014

 #endif // GUARD_CONSTANTS_VARS_H
--- a/include/data/bard_music/pokemon.h
+++ b/include/data/bard_music/pokemon.h
@ -1,6 +1,6 @@
 #ifndef GUARD_DATA_BARD_MUSIC_POKEMON_H
 #define GUARD_DATA_BARD_MUSIC_POKEMON_H
-#include "species.h"
+#include "constants/species.h"

 const u16 gUnknown_085F5490 = NUM_SPECIES;

--- a/include/event_data.h
+++ b/include/event_data.h
@ -2,7 +2,7 @@
 #define GUARD_EVENT_DATA_H

 #include "constants/flags.h"
-#include "vars.h"
+#include "constants/vars.h"

 void InitEventData(void);
 void ClearTempFieldEventData(void);
--- a/include/moves.h
+++ b/include/moves.h
@ -1,366 +0,0 @@
-#ifndef GUARD_MOVES_H
-#define GUARD_MOVES_H
-
-enum
-{
-    MOVE_NONE,
-    MOVE_POUND,
-    MOVE_KARATE_CHOP,
-    MOVE_DOUBLE_SLAP,
-    MOVE_COMET_PUNCH,
-    MOVE_MEGA_PUNCH,
-    MOVE_PAY_DAY,
-    MOVE_FIRE_PUNCH,
-    MOVE_ICE_PUNCH,
-    MOVE_THUNDER_PUNCH,
-    MOVE_SCRATCH,
-    MOVE_VICE_GRIP,
-    MOVE_GUILLOTINE,
-    MOVE_RAZOR_WIND,
-    MOVE_SWORDS_DANCE,
-    MOVE_CUT,
-    MOVE_GUST,
-    MOVE_WING_ATTACK,
-    MOVE_WHIRLWIND,
-    MOVE_FLY,
-    MOVE_BIND,
-    MOVE_SLAM,
-    MOVE_VINE_WHIP,
-    MOVE_STOMP,
-    MOVE_DOUBLE_KICK,
-    MOVE_MEGA_KICK,
-    MOVE_JUMP_KICK,
-    MOVE_ROLLING_KICK,
-    MOVE_SAND_ATTACK,
-    MOVE_HEADBUTT,
-    MOVE_HORN_ATTACK,
-    MOVE_FURY_ATTACK,
-    MOVE_HORN_DRILL,
-    MOVE_TACKLE,
-    MOVE_BODY_SLAM,
-    MOVE_WRAP,
-    MOVE_TAKE_DOWN,
-    MOVE_THRASH,
-    MOVE_DOUBLE_EDGE,
-    MOVE_TAIL_WHIP,
-    MOVE_POISON_STING,
-    MOVE_TWINEEDLE,
-    MOVE_PIN_MISSILE,
-    MOVE_LEER,
-    MOVE_BITE,
-    MOVE_GROWL,
-    MOVE_ROAR,
-    MOVE_SING,
-    MOVE_SUPERSONIC,
-    MOVE_SONIC_BOOM,
-    MOVE_DISABLE,
-    MOVE_ACID,
-    MOVE_EMBER,
-    MOVE_FLAMETHROWER,
-    MOVE_MIST,
-    MOVE_WATER_GUN,
-    MOVE_HYDRO_PUMP,
-    MOVE_SURF,
-    MOVE_ICE_BEAM,
-    MOVE_BLIZZARD,
-    MOVE_PSYBEAM,
-    MOVE_BUBBLE_BEAM,
-    MOVE_AURORA_BEAM,
-    MOVE_HYPER_BEAM,
-    MOVE_PECK,
-    MOVE_DRILL_PECK,
-    MOVE_SUBMISSION,
-    MOVE_LOW_KICK,
-    MOVE_COUNTER,
-    MOVE_SEISMIC_TOSS,
-    MOVE_STRENGTH,
-    MOVE_ABSORB,
-    MOVE_MEGA_DRAIN,
-    MOVE_LEECH_SEED,
-    MOVE_GROWTH,
-    MOVE_RAZOR_LEAF,
-    MOVE_SOLAR_BEAM,
-    MOVE_POISON_POWDER,
-    MOVE_STUN_SPORE,
-    MOVE_SLEEP_POWDER,
-    MOVE_PETAL_DANCE,
-    MOVE_STRING_SHOT,
-    MOVE_DRAGON_RAGE,
-    MOVE_FIRE_SPIN,
-    MOVE_THUNDER_SHOCK,
-    MOVE_THUNDERBOLT,
-    MOVE_THUNDER_WAVE,
-    MOVE_THUNDER,
-    MOVE_ROCK_THROW,
-    MOVE_EARTHQUAKE,
-    MOVE_FISSURE,
-    MOVE_DIG,
-    MOVE_TOXIC,
-    MOVE_CONFUSION,
-    MOVE_PSYCHIC,
-    MOVE_HYPNOSIS,
-    MOVE_MEDITATE,
-    MOVE_AGILITY,
-    MOVE_QUICK_ATTACK,
-    MOVE_RAGE,
-    MOVE_TELEPORT,
-    MOVE_NIGHT_SHADE,
-    MOVE_MIMIC,
-    MOVE_SCREECH,
-    MOVE_DOUBLE_TEAM,
-    MOVE_RECOVER,
-    MOVE_HARDEN,
-    MOVE_MINIMIZE,
-    MOVE_SMOKESCREEN,
-    MOVE_CONFUSE_RAY,
-    MOVE_WITHDRAW,
-    MOVE_DEFENSE_CURL,
-    MOVE_BARRIER,
-    MOVE_LIGHT_SCREEN,
-    MOVE_HAZE,
-    MOVE_REFLECT,
-    MOVE_FOCUS_ENERGY,
-    MOVE_BIDE,
-    MOVE_METRONOME,
-    MOVE_MIRROR_MOVE,
-    MOVE_SELF_DESTRUCT,
-    MOVE_EGG_BOMB,
-    MOVE_LICK,
-    MOVE_SMOG,
-    MOVE_SLUDGE,
-    MOVE_BONE_CLUB,
-    MOVE_FIRE_BLAST,
-    MOVE_WATERFALL,
-    MOVE_CLAMP,
-    MOVE_SWIFT,
-    MOVE_SKULL_BASH,
-    MOVE_SPIKE_CANNON,
-    MOVE_CONSTRICT,
-    MOVE_AMNESIA,
-    MOVE_KINESIS,
-    MOVE_SOFT_BOILED,
-    MOVE_HI_JUMP_KICK,
-    MOVE_GLARE,
-    MOVE_DREAM_EATER,
-    MOVE_POISON_GAS,
-    MOVE_BARRAGE,
-    MOVE_LEECH_LIFE,
-    MOVE_LOVELY_KISS,
-    MOVE_SKY_ATTACK,
-    MOVE_TRANSFORM,
-    MOVE_BUBBLE,
-    MOVE_DIZZY_PUNCH,
-    MOVE_SPORE,
-    MOVE_FLASH,
-    MOVE_PSYWAVE,
-    MOVE_SPLASH,
-    MOVE_ACID_ARMOR,
-    MOVE_CRABHAMMER,
-    MOVE_EXPLOSION,
-    MOVE_FURY_SWIPES,
-    MOVE_BONEMERANG,
-    MOVE_REST,
-    MOVE_ROCK_SLIDE,
-    MOVE_HYPER_FANG,
-    MOVE_SHARPEN,
-    MOVE_CONVERSION,
-    MOVE_TRI_ATTACK,
-    MOVE_SUPER_FANG,
-    MOVE_SLASH,
-    MOVE_SUBSTITUTE,
-    MOVE_STRUGGLE,
-    MOVE_SKETCH,
-    MOVE_TRIPLE_KICK,
-    MOVE_THIEF,
-    MOVE_SPIDER_WEB,
-    MOVE_MIND_READER,
-    MOVE_NIGHTMARE,
-    MOVE_FLAME_WHEEL,
-    MOVE_SNORE,
-    MOVE_CURSE,
-    MOVE_FLAIL,
-    MOVE_CONVERSION_2,
-    MOVE_AEROBLAST,
-    MOVE_COTTON_SPORE,
-    MOVE_REVERSAL,
-    MOVE_SPITE,
-    MOVE_POWDER_SNOW,
-    MOVE_PROTECT,
-    MOVE_MACH_PUNCH,
-    MOVE_SCARY_FACE,
-    MOVE_FAINT_ATTACK,
-    MOVE_SWEET_KISS,
-    MOVE_BELLY_DRUM,
-    MOVE_SLUDGE_BOMB,
-    MOVE_MUD_SLAP,
-    MOVE_OCTAZOOKA,
-    MOVE_SPIKES,
-    MOVE_ZAP_CANNON,
-    MOVE_FORESIGHT,
-    MOVE_DESTINY_BOND,
-    MOVE_PERISH_SONG,
-    MOVE_ICY_WIND,
-    MOVE_DETECT,
-    MOVE_BONE_RUSH,
-    MOVE_LOCK_ON,
-    MOVE_OUTRAGE,
-    MOVE_SANDSTORM,
-    MOVE_GIGA_DRAIN,
-    MOVE_ENDURE,
-    MOVE_CHARM,
-    MOVE_ROLLOUT,
-    MOVE_FALSE_SWIPE,
-    MOVE_SWAGGER,
-    MOVE_MILK_DRINK,
-    MOVE_SPARK,
-    MOVE_FURY_CUTTER,
-    MOVE_STEEL_WING,
-    MOVE_MEAN_LOOK,
-    MOVE_ATTRACT,
-    MOVE_SLEEP_TALK,
-    MOVE_HEAL_BELL,
-    MOVE_RETURN,
-    MOVE_PRESENT,
-    MOVE_FRUSTRATION,
-    MOVE_SAFEGUARD,
-    MOVE_PAIN_SPLIT,
-    MOVE_SACRED_FIRE,
-    MOVE_MAGNITUDE,
-    MOVE_DYNAMIC_PUNCH,
-    MOVE_MEGAHORN,
-    MOVE_DRAGON_BREATH,
-    MOVE_BATON_PASS,
-    MOVE_ENCORE,
-    MOVE_PURSUIT,
-    MOVE_RAPID_SPIN,
-    MOVE_SWEET_SCENT,
-    MOVE_IRON_TAIL,
-    MOVE_METAL_CLAW,
-    MOVE_VITAL_THROW,
-    MOVE_MORNING_SUN,
-    MOVE_SYNTHESIS,
-    MOVE_MOONLIGHT,
-    MOVE_HIDDEN_POWER,
-    MOVE_CROSS_CHOP,
-    MOVE_TWISTER,
-    MOVE_RAIN_DANCE,
-    MOVE_SUNNY_DAY,
-    MOVE_CRUNCH,
-    MOVE_MIRROR_COAT,
-    MOVE_PSYCH_UP,
-    MOVE_EXTREME_SPEED,
-    MOVE_ANCIENT_POWER,
-    MOVE_SHADOW_BALL,
-    MOVE_FUTURE_SIGHT,
-    MOVE_ROCK_SMASH,
-    MOVE_WHIRLPOOL,
-    MOVE_BEAT_UP,
-    MOVE_FAKE_OUT,
-    MOVE_UPROAR,
-    MOVE_STOCKPILE,
-    MOVE_SPIT_UP,
-    MOVE_SWALLOW,
-    MOVE_HEAT_WAVE,
-    MOVE_HAIL,
-    MOVE_TORMENT,
-    MOVE_FLATTER,
-    MOVE_WILL_O_WISP,
-    MOVE_MEMENTO,
-    MOVE_FACADE,
-    MOVE_FOCUS_PUNCH,
-    MOVE_SMELLING_SALT,
-    MOVE_FOLLOW_ME,
-    MOVE_NATURE_POWER,
-    MOVE_CHARGE,
-    MOVE_TAUNT,
-    MOVE_HELPING_HAND,
-    MOVE_TRICK,
-    MOVE_ROLE_PLAY,
-    MOVE_WISH,
-    MOVE_ASSIST,
-    MOVE_INGRAIN,
-    MOVE_SUPERPOWER,
-    MOVE_MAGIC_COAT,
-    MOVE_RECYCLE,
-    MOVE_REVENGE,
-    MOVE_BRICK_BREAK,
-    MOVE_YAWN,
-    MOVE_KNOCK_OFF,
-    MOVE_ENDEAVOR,
-    MOVE_ERUPTION,
-    MOVE_SKILL_SWAP,
-    MOVE_IMPRISON,
-    MOVE_REFRESH,
-    MOVE_GRUDGE,
-    MOVE_SNATCH,
-    MOVE_SECRET_POWER,
-    MOVE_DIVE,
-    MOVE_ARM_THRUST,
-    MOVE_CAMOUFLAGE,
-    MOVE_TAIL_GLOW,
-    MOVE_LUSTER_PURGE,
-    MOVE_MIST_BALL,
-    MOVE_FEATHER_DANCE,
-    MOVE_TEETER_DANCE,
-    MOVE_BLAZE_KICK,
-    MOVE_MUD_SPORT,
-    MOVE_ICE_BALL,
-    MOVE_NEEDLE_ARM,
-    MOVE_SLACK_OFF,
-    MOVE_HYPER_VOICE,
-    MOVE_POISON_FANG,
-    MOVE_CRUSH_CLAW,
-    MOVE_BLAST_BURN,
-    MOVE_HYDRO_CANNON,
-    MOVE_METEOR_MASH,
-    MOVE_ASTONISH,
-    MOVE_WEATHER_BALL,
-    MOVE_AROMATHERAPY,
-    MOVE_FAKE_TEARS,
-    MOVE_AIR_CUTTER,
-    MOVE_OVERHEAT,
-    MOVE_ODOR_SLEUTH,
-    MOVE_ROCK_TOMB,
-    MOVE_SILVER_WIND,
-    MOVE_METAL_SOUND,
-    MOVE_GRASS_WHISTLE,
-    MOVE_TICKLE,
-    MOVE_COSMIC_POWER,
-    MOVE_WATER_SPOUT,
-    MOVE_SIGNAL_BEAM,
-    MOVE_SHADOW_PUNCH,
-    MOVE_EXTRASENSORY,
-    MOVE_SKY_UPPERCUT,
-    MOVE_SAND_TOMB,
-    MOVE_SHEER_COLD,
-    MOVE_MUDDY_WATER,
-    MOVE_BULLET_SEED,
-    MOVE_AERIAL_ACE,
-    MOVE_ICICLE_SPEAR,
-    MOVE_IRON_DEFENSE,
-    MOVE_BLOCK,
-    MOVE_HOWL,
-    MOVE_DRAGON_CLAW,
-    MOVE_FRENZY_PLANT,
-    MOVE_BULK_UP,
-    MOVE_BOUNCE,
-    MOVE_MUD_SHOT,
-    MOVE_POISON_TAIL,
-    MOVE_COVET,
-    MOVE_VOLT_TACKLE,
-    MOVE_MAGICAL_LEAF,
-    MOVE_WATER_SPORT,
-    MOVE_CALM_MIND,
-    MOVE_LEAF_BLADE,
-    MOVE_DRAGON_DANCE,
-    MOVE_ROCK_BLAST,
-    MOVE_SHOCK_WAVE,
-    MOVE_WATER_PULSE,
-    MOVE_DOOM_DESIRE,
-    MOVE_PSYCHO_BOOST,
-};
-extern const u8 gMoveNames[][13];
-
-#define LAST_MOVE_INDEX     MOVE_PSYCHO_BOOST
-
-#endif // GUARD_MOVES_H
--- a/include/species.h
+++ b/include/species.h
@ -1,454 +0,0 @@
-#ifndef GUARD_SPECIES_H
-#define GUARD_SPECIES_H
-
-enum
-{
-    SPECIES_NONE,       // 0x000
-    SPECIES_BULBASAUR,  // 0x001
-    SPECIES_IVYSAUR,    // 0x002
-    SPECIES_VENUSAUR,   // 0x003
-    SPECIES_CHARMANDER, // 0x004
-    SPECIES_CHARMELEON, // 0x005
-    SPECIES_CHARIZARD,  // 0x006
-    SPECIES_SQUIRTLE,   // 0x007
-    SPECIES_WARTORTLE,  // 0x008
-    SPECIES_BLASTOISE,  // 0x009
-    SPECIES_CATERPIE,   // 0x00a
-    SPECIES_METAPOD,    // 0x00b
-    SPECIES_BUTTERFREE, // 0x00c
-    SPECIES_WEEDLE,     // 0x00d
-    SPECIES_KAKUNA,     // 0x00e
-    SPECIES_BEEDRILL,   // 0x00f
-    SPECIES_PIDGEY,     // 0x010
-    SPECIES_PIDGEOTTO,  // 0x011
-    SPECIES_PIDGEOT,    // 0x012
-    SPECIES_RATTATA,    // 0x013
-    SPECIES_RATICATE,   // 0x014
-    SPECIES_SPEAROW,    // 0x015
-    SPECIES_FEAROW,     // 0x016
-    SPECIES_EKANS,      // 0x017
-    SPECIES_ARBOK,      // 0x018
-    SPECIES_PIKACHU,    // 0x019
-    SPECIES_RAICHU,     // 0x01a
-    SPECIES_SANDSHREW,  // 0x01b
-    SPECIES_SANDSLASH,  // 0x01c
-    SPECIES_NIDORAN_F,  // 0x01d
-    SPECIES_NIDORINA,   // 0x01e
-    SPECIES_NIDOQUEEN,  // 0x01f
-    SPECIES_NIDORAN_M,  // 0x020
-    SPECIES_NIDORINO,   // 0x021
-    SPECIES_NIDOKING,   // 0x022
-    SPECIES_CLEFAIRY,   // 0x023
-    SPECIES_CLEFABLE,   // 0x024
-    SPECIES_VULPIX,     // 0x025
-    SPECIES_NINETALES,  // 0x026
-    SPECIES_JIGGLYPUFF, // 0x027
-    SPECIES_WIGGLYTUFF, // 0x028
-    SPECIES_ZUBAT,      // 0x029
-    SPECIES_GOLBAT,     // 0x02a
-    SPECIES_ODDISH,     // 0x02b
-    SPECIES_GLOOM,      // 0x02c
-    SPECIES_VILEPLUME,  // 0x02d
-    SPECIES_PARAS,      // 0x02e
-    SPECIES_PARASECT,   // 0x02f
-    SPECIES_VENONAT,    // 0x030
-    SPECIES_VENOMOTH,   // 0x031
-    SPECIES_DIGLETT,    // 0x032
-    SPECIES_DUGTRIO,    // 0x033
-    SPECIES_MEOWTH,     // 0x034
-    SPECIES_PERSIAN,    // 0x035
-    SPECIES_PSYDUCK,    // 0x036
-    SPECIES_GOLDUCK,    // 0x037
-    SPECIES_MANKEY,     // 0x038
-    SPECIES_PRIMEAPE,   // 0x039
-    SPECIES_GROWLITHE,  // 0x03a
-    SPECIES_ARCANINE,   // 0x03b
-    SPECIES_POLIWAG,    // 0x03c
-    SPECIES_POLIWHIRL,  // 0x03d
-    SPECIES_POLIWRATH,  // 0x03e
-    SPECIES_ABRA,       // 0x03f
-    SPECIES_KADABRA,    // 0x040
-    SPECIES_ALAKAZAM,   // 0x041
-    SPECIES_MACHOP,     // 0x042
-    SPECIES_MACHOKE,    // 0x043
-    SPECIES_MACHAMP,    // 0x044
-    SPECIES_BELLSPROUT, // 0x045
-    SPECIES_WEEPINBELL, // 0x046
-    SPECIES_VICTREEBEL, // 0x047
-    SPECIES_TENTACOOL,  // 0x048
-    SPECIES_TENTACRUEL, // 0x049
-    SPECIES_GEODUDE,    // 0x04a
-    SPECIES_GRAVELER,   // 0x04b
-    SPECIES_GOLEM,      // 0x04c
-    SPECIES_PONYTA,     // 0x04d
-    SPECIES_RAPIDASH,   // 0x04e
-    SPECIES_SLOWPOKE,   // 0x04f
-    SPECIES_SLOWBRO,    // 0x050
-    SPECIES_MAGNEMITE,  // 0x051
-    SPECIES_MAGNETON,   // 0x052
-    SPECIES_FARFETCHD,  // 0x053
-    SPECIES_DODUO,      // 0x054
-    SPECIES_DODRIO,     // 0x055
-    SPECIES_SEEL,       // 0x056
-    SPECIES_DEWGONG,    // 0x057
-    SPECIES_GRIMER,     // 0x058
-    SPECIES_MUK,        // 0x059
-    SPECIES_SHELLDER,   // 0x05a
-    SPECIES_CLOYSTER,   // 0x05b
-    SPECIES_GASTLY,     // 0x05c
-    SPECIES_HAUNTER,    // 0x05d
-    SPECIES_GENGAR,     // 0x05e
-    SPECIES_ONIX,       // 0x05f
-    SPECIES_DROWZEE,    // 0x060
-    SPECIES_HYPNO,      // 0x061
-    SPECIES_KRABBY,     // 0x062
-    SPECIES_KINGLER,    // 0x063
-    SPECIES_VOLTORB,    // 0x064
-    SPECIES_ELECTRODE,  // 0x065
-    SPECIES_EXEGGCUTE,  // 0x066
-    SPECIES_EXEGGUTOR,  // 0x067
-    SPECIES_CUBONE,     // 0x068
-    SPECIES_MAROWAK,    // 0x069
-    SPECIES_HITMONLEE,  // 0x06a
-    SPECIES_HITMONCHAN, // 0x06b
-    SPECIES_LICKITUNG,  // 0x06c
-    SPECIES_KOFFING,    // 0x06d
-    SPECIES_WEEZING,    // 0x06e
-    SPECIES_RHYHORN,    // 0x06f
-    SPECIES_RHYDON,     // 0x070
-    SPECIES_CHANSEY,    // 0x071
-    SPECIES_TANGELA,    // 0x072
-    SPECIES_KANGASKHAN, // 0x073
-    SPECIES_HORSEA,     // 0x074
-    SPECIES_SEADRA,     // 0x075
-    SPECIES_GOLDEEN,    // 0x076
-    SPECIES_SEAKING,    // 0x077
-    SPECIES_STARYU,     // 0x078
-    SPECIES_STARMIE,    // 0x079
-    SPECIES_MR_MIME,    // 0x07a
-    SPECIES_SCYTHER,    // 0x07b
-    SPECIES_JYNX,       // 0x07c
-    SPECIES_ELECTABUZZ, // 0x07d
-    SPECIES_MAGMAR,     // 0x07e
-    SPECIES_PINSIR,     // 0x07f
-    SPECIES_TAUROS,     // 0x080
-    SPECIES_MAGIKARP,   // 0x081
-    SPECIES_GYARADOS,   // 0x082
-    SPECIES_LAPRAS,     // 0x083
-    SPECIES_DITTO,      // 0x084
-    SPECIES_EEVEE,      // 0x085
-    SPECIES_VAPOREON,   // 0x086
-    SPECIES_JOLTEON,    // 0x087
-    SPECIES_FLAREON,    // 0x088
-    SPECIES_PORYGON,    // 0x089
-    SPECIES_OMANYTE,    // 0x08a
-    SPECIES_OMASTAR,    // 0x08b
-    SPECIES_KABUTO,     // 0x08c
-    SPECIES_KABUTOPS,   // 0x08d
-    SPECIES_AERODACTYL, // 0x08e
-    SPECIES_SNORLAX,    // 0x08f
-    SPECIES_ARTICUNO,   // 0x090
-    SPECIES_ZAPDOS,     // 0x091
-    SPECIES_MOLTRES,    // 0x092
-    SPECIES_DRATINI,    // 0x093
-    SPECIES_DRAGONAIR,  // 0x094
-    SPECIES_DRAGONITE,  // 0x095
-    SPECIES_MEWTWO,     // 0x096
-    SPECIES_MEW,        // 0x097
-    SPECIES_CHIKORITA,  // 0x098
-    SPECIES_BAYLEEF,    // 0x099
-    SPECIES_MEGANIUM,   // 0x09a
-    SPECIES_CYNDAQUIL,  // 0x09b
-    SPECIES_QUILAVA,    // 0x09c
-    SPECIES_TYPHLOSION, // 0x09d
-    SPECIES_TOTODILE,   // 0x09e
-    SPECIES_CROCONAW,   // 0x09f
-    SPECIES_FERALIGATR, // 0x0a0
-    SPECIES_SENTRET,    // 0x0a1
-    SPECIES_FURRET,     // 0x0a2
-    SPECIES_HOOTHOOT,   // 0x0a3
-    SPECIES_NOCTOWL,    // 0x0a4
-    SPECIES_LEDYBA,     // 0x0a5
-    SPECIES_LEDIAN,     // 0x0a6
-    SPECIES_SPINARAK,   // 0x0a7
-    SPECIES_ARIADOS,    // 0x0a8
-    SPECIES_CROBAT,     // 0x0a9
-    SPECIES_CHINCHOU,   // 0x0aa
-    SPECIES_LANTURN,    // 0x0ab
-    SPECIES_PICHU,      // 0x0ac
-    SPECIES_CLEFFA,     // 0x0ad
-    SPECIES_IGGLYBUFF,  // 0x0ae
-    SPECIES_TOGEPI,     // 0x0af
-    SPECIES_TOGETIC,    // 0x0b0
-    SPECIES_NATU,       // 0x0b1
-    SPECIES_XATU,       // 0x0b2
-    SPECIES_MAREEP,     // 0x0b3
-    SPECIES_FLAAFFY,    // 0x0b4
-    SPECIES_AMPHAROS,   // 0x0b5
-    SPECIES_BELLOSSOM,  // 0x0b6
-    SPECIES_MARILL,     // 0x0b7
-    SPECIES_AZUMARILL,  // 0x0b8
-    SPECIES_SUDOWOODO,  // 0x0b9
-    SPECIES_POLITOED,   // 0x0ba
-    SPECIES_HOPPIP,     // 0x0bb
-    SPECIES_SKIPLOOM,   // 0x0bc
-    SPECIES_JUMPLUFF,   // 0x0bd
-    SPECIES_AIPOM,      // 0x0be
-    SPECIES_SUNKERN,    // 0x0bf
-    SPECIES_SUNFLORA,   // 0x0c0
-    SPECIES_YANMA,      // 0x0c1
-    SPECIES_WOOPER,     // 0x0c2
-    SPECIES_QUAGSIRE,   // 0x0c3
-    SPECIES_ESPEON,     // 0x0c4
-    SPECIES_UMBREON,    // 0x0c5
-    SPECIES_MURKROW,    // 0x0c6
-    SPECIES_SLOWKING,   // 0x0c7
-    SPECIES_MISDREAVUS, // 0x0c8
-    SPECIES_UNOWN,      // 0x0c9
-    SPECIES_WOBBUFFET,  // 0x0ca
-    SPECIES_GIRAFARIG,  // 0x0cb
-    SPECIES_PINECO,     // 0x0cc
-    SPECIES_FORRETRESS, // 0x0cd
-    SPECIES_DUNSPARCE,  // 0x0ce
-    SPECIES_GLIGAR,     // 0x0cf
-    SPECIES_STEELIX,    // 0x0d0
-    SPECIES_SNUBBULL,   // 0x0d1
-    SPECIES_GRANBULL,   // 0x0d2
-    SPECIES_QWILFISH,   // 0x0d3
-    SPECIES_SCIZOR,     // 0x0d4
-    SPECIES_SHUCKLE,    // 0x0d5
-    SPECIES_HERACROSS,  // 0x0d6
-    SPECIES_SNEASEL,    // 0x0d7
-    SPECIES_TEDDIURSA,  // 0x0d8
-    SPECIES_URSARING,   // 0x0d9
-    SPECIES_SLUGMA,     // 0x0da
-    SPECIES_MAGCARGO,   // 0x0db
-    SPECIES_SWINUB,     // 0x0dc
-    SPECIES_PILOSWINE,  // 0x0dd
-    SPECIES_CORSOLA,    // 0x0de
-    SPECIES_REMORAID,   // 0x0df
-    SPECIES_OCTILLERY,  // 0x0e0
-    SPECIES_DELIBIRD,   // 0x0e1
-    SPECIES_MANTINE,    // 0x0e2
-    SPECIES_SKARMORY,   // 0x0e3
-    SPECIES_HOUNDOUR,   // 0x0e4
-    SPECIES_HOUNDOOM,   // 0x0e5
-    SPECIES_KINGDRA,    // 0x0e6
-    SPECIES_PHANPY,     // 0x0e7
-    SPECIES_DONPHAN,    // 0x0e8
-    SPECIES_PORYGON2,   // 0x0e9
-    SPECIES_STANTLER,   // 0x0ea
-    SPECIES_SMEARGLE,   // 0x0eb
-    SPECIES_TYROGUE,    // 0x0ec
-    SPECIES_HITMONTOP,  // 0x0ed
-    SPECIES_SMOOCHUM,   // 0x0ee
-    SPECIES_ELEKID,     // 0x0ef
-    SPECIES_MAGBY,      // 0x0f0
-    SPECIES_MILTANK,    // 0x0f1
-    SPECIES_BLISSEY,    // 0x0f2
-    SPECIES_RAIKOU,     // 0x0f3
-    SPECIES_ENTEI,      // 0x0f4
-    SPECIES_SUICUNE,    // 0x0f5
-    SPECIES_LARVITAR,   // 0x0f6
-    SPECIES_PUPITAR,    // 0x0f7
-    SPECIES_TYRANITAR,  // 0x0f8
-    SPECIES_LUGIA,      // 0x0f9
-    SPECIES_HO_OH,      // 0x0fa
-    SPECIES_CELEBI,     // 0x0fb
-
-    SPECIES_OLD_UNOWN_B,
-    SPECIES_OLD_UNOWN_C,
-    SPECIES_OLD_UNOWN_D,
-    SPECIES_OLD_UNOWN_E,
-    SPECIES_OLD_UNOWN_F,
-    SPECIES_OLD_UNOWN_G,
-    SPECIES_OLD_UNOWN_H,
-    SPECIES_OLD_UNOWN_I,
-    SPECIES_OLD_UNOWN_J,
-    SPECIES_OLD_UNOWN_K,
-    SPECIES_OLD_UNOWN_L,
-    SPECIES_OLD_UNOWN_M,
-    SPECIES_OLD_UNOWN_N,
-    SPECIES_OLD_UNOWN_O,
-    SPECIES_OLD_UNOWN_P,
-    SPECIES_OLD_UNOWN_Q,
-    SPECIES_OLD_UNOWN_R,
-    SPECIES_OLD_UNOWN_S,
-    SPECIES_OLD_UNOWN_T,
-    SPECIES_OLD_UNOWN_U,
-    SPECIES_OLD_UNOWN_V,
-    SPECIES_OLD_UNOWN_W,
-    SPECIES_OLD_UNOWN_X,
-    SPECIES_OLD_UNOWN_Y,
-    SPECIES_OLD_UNOWN_Z,
-
-    SPECIES_TREECKO,    // 0x115
-    SPECIES_GROVYLE,    // 0x116
-    SPECIES_SCEPTILE,   // 0x117
-    SPECIES_TORCHIC,    // 0x118
-    SPECIES_COMBUSKEN,  // 0x119
-    SPECIES_BLAZIKEN,   // 0x11a
-    SPECIES_MUDKIP,     // 0x11b
-    SPECIES_MARSHTOMP,  // 0x11c
-    SPECIES_SWAMPERT,   // 0x11d
-    SPECIES_POOCHYENA,  // 0x11e
-    SPECIES_MIGHTYENA,  // 0x11f
-    SPECIES_ZIGZAGOON,  // 0x120
-    SPECIES_LINOONE,    // 0x121
-    SPECIES_WURMPLE,    // 0x122
-    SPECIES_SILCOON,    // 0x123
-    SPECIES_BEAUTIFLY,  // 0x124
-    SPECIES_CASCOON,    // 0x125
-    SPECIES_DUSTOX,     // 0x126
-    SPECIES_LOTAD,      // 0x127
-    SPECIES_LOMBRE,     // 0x128
-    SPECIES_LUDICOLO,   // 0x129
-    SPECIES_SEEDOT,     // 0x12a
-    SPECIES_NUZLEAF,    // 0x12b
-    SPECIES_SHIFTRY,    // 0x12c
-    SPECIES_NINCADA,    // 0x12d
-    SPECIES_NINJASK,    // 0x12e
-    SPECIES_SHEDINJA,   // 0x12f
-    SPECIES_TAILLOW,    // 0x130
-    SPECIES_SWELLOW,    // 0x131
-    SPECIES_SHROOMISH,  // 0x132
-    SPECIES_BRELOOM,    // 0x133
-    SPECIES_SPINDA,     // 0x134
-    SPECIES_WINGULL,    // 0x135
-    SPECIES_PELIPPER,   // 0x136
-    SPECIES_SURSKIT,    // 0x137
-    SPECIES_MASQUERAIN, // 0x138
-    SPECIES_WAILMER,    // 0x139
-    SPECIES_WAILORD,    // 0x13a
-    SPECIES_SKITTY,     // 0x13b
-    SPECIES_DELCATTY,   // 0x13c
-    SPECIES_KECLEON,    // 0x13d
-    SPECIES_BALTOY,     // 0x13e
-    SPECIES_CLAYDOL,    // 0x13f
-    SPECIES_NOSEPASS,   // 0x140
-    SPECIES_TORKOAL,    // 0x141
-    SPECIES_SABLEYE,    // 0x142
-    SPECIES_BARBOACH,   // 0x143
-    SPECIES_WHISCASH,   // 0x144
-    SPECIES_LUVDISC,    // 0x145
-    SPECIES_CORPHISH,   // 0x146
-    SPECIES_CRAWDAUNT,  // 0x147
-    SPECIES_FEEBAS,     // 0x148
-    SPECIES_MILOTIC,    // 0x149
-    SPECIES_CARVANHA,   // 0x14a
-    SPECIES_SHARPEDO,   // 0x14b
-    SPECIES_TRAPINCH,   // 0x14c
-    SPECIES_VIBRAVA,    // 0x14d
-    SPECIES_FLYGON,     // 0x14e
-    SPECIES_MAKUHITA,   // 0x14f
-    SPECIES_HARIYAMA,   // 0x150
-    SPECIES_ELECTRIKE,  // 0x151
-    SPECIES_MANECTRIC,  // 0x152
-    SPECIES_NUMEL,      // 0x153
-    SPECIES_CAMERUPT,   // 0x154
-    SPECIES_SPHEAL,     // 0x155
-    SPECIES_SEALEO,     // 0x156
-    SPECIES_WALREIN,    // 0x157
-    SPECIES_CACNEA,     // 0x158
-    SPECIES_CACTURNE,   // 0x159
-    SPECIES_SNORUNT,    // 0x15a
-    SPECIES_GLALIE,     // 0x15b
-    SPECIES_LUNATONE,   // 0x15c
-    SPECIES_SOLROCK,    // 0x15d
-    SPECIES_AZURILL,    // 0x15e
-    SPECIES_SPOINK,     // 0x15f
-    SPECIES_GRUMPIG,    // 0x160
-    SPECIES_PLUSLE,     // 0x161
-    SPECIES_MINUN,      // 0x162
-    SPECIES_MAWILE,     // 0x163
-    SPECIES_MEDITITE,   // 0x164
-    SPECIES_MEDICHAM,   // 0x165
-    SPECIES_SWABLU,     // 0x166
-    SPECIES_ALTARIA,    // 0x167
-    SPECIES_WYNAUT,     // 0x168
-    SPECIES_DUSKULL,    // 0x169
-    SPECIES_DUSCLOPS,   // 0x16a
-    SPECIES_ROSELIA,    // 0x16b
-    SPECIES_SLAKOTH,    // 0x16c
-    SPECIES_VIGOROTH,   // 0x16d
-    SPECIES_SLAKING,    // 0x16e
-    SPECIES_GULPIN,     // 0x16f
-    SPECIES_SWALOT,     // 0x170
-    SPECIES_TROPIUS,    // 0x171
-    SPECIES_WHISMUR,    // 0x172
-    SPECIES_LOUDRED,    // 0x173
-    SPECIES_EXPLOUD,    // 0x174
-    SPECIES_CLAMPERL,   // 0x175
-    SPECIES_HUNTAIL,    // 0x176
-    SPECIES_GOREBYSS,   // 0x177
-    SPECIES_ABSOL,      // 0x178
-    SPECIES_SHUPPET,    // 0x179
-    SPECIES_BANETTE,    // 0x17a
-    SPECIES_SEVIPER,    // 0x17b
-    SPECIES_ZANGOOSE,   // 0x17c
-    SPECIES_RELICANTH,  // 0x17d
-    SPECIES_ARON,       // 0x17e
-    SPECIES_LAIRON,     // 0x17f
-    SPECIES_AGGRON,     // 0x180
-    SPECIES_CASTFORM,   // 0x181
-    SPECIES_VOLBEAT,    // 0x182
-    SPECIES_ILLUMISE,   // 0x183
-    SPECIES_LILEEP,     // 0x184
-    SPECIES_CRADILY,    // 0x185
-    SPECIES_ANORITH,    // 0x186
-    SPECIES_ARMALDO,    // 0x187
-    SPECIES_RALTS,      // 0x188
-    SPECIES_KIRLIA,     // 0x189
-    SPECIES_GARDEVOIR,  // 0x18a
-    SPECIES_BAGON,      // 0x18b
-    SPECIES_SHELGON,    // 0x18c
-    SPECIES_SALAMENCE,  // 0x18d
-    SPECIES_BELDUM,     // 0x18e
-    SPECIES_METANG,     // 0x18f
-    SPECIES_METAGROSS,  // 0x190
-    SPECIES_REGIROCK,   // 0x191
-    SPECIES_REGICE,     // 0x192
-    SPECIES_REGISTEEL,  // 0x193
-    SPECIES_KYOGRE,     // 0x194
-    SPECIES_GROUDON,    // 0x195
-    SPECIES_RAYQUAZA,   // 0x196
-    SPECIES_LATIAS,     // 0x197
-    SPECIES_LATIOS,     // 0x198
-    SPECIES_JIRACHI,    // 0x199
-    SPECIES_DEOXYS,     // 0x19a
-    SPECIES_CHIMECHO,   // 0x19b
-    SPECIES_EGG,        // 0x19c
-
-    SPECIES_UNOWN_B,
-    SPECIES_UNOWN_C,
-    SPECIES_UNOWN_D,
-    SPECIES_UNOWN_E,
-    SPECIES_UNOWN_F,
-    SPECIES_UNOWN_G,
-    SPECIES_UNOWN_H,
-    SPECIES_UNOWN_I,
-    SPECIES_UNOWN_J,
-    SPECIES_UNOWN_K,
-    SPECIES_UNOWN_L,
-    SPECIES_UNOWN_M,
-    SPECIES_UNOWN_N,
-    SPECIES_UNOWN_O,
-    SPECIES_UNOWN_P,
-    SPECIES_UNOWN_Q,
-    SPECIES_UNOWN_R,
-    SPECIES_UNOWN_S,
-    SPECIES_UNOWN_T,
-    SPECIES_UNOWN_U,
-    SPECIES_UNOWN_V,
-    SPECIES_UNOWN_W,
-    SPECIES_UNOWN_X,
-    SPECIES_UNOWN_Y,
-    SPECIES_UNOWN_Z,
-    SPECIES_UNOWN_EMARK,
-    SPECIES_UNOWN_QMARK,
-};
-
-#define NUM_SPECIES SPECIES_EGG
-extern const u8 gSpeciesNames[][11];
-
-#endif // GUARD_SPECIES_H
--- a/include/vars.h
+++ b/include/vars.h
@ -1,75 +0,0 @@
-#ifndef GUARD_VARS_H
-#define GUARD_VARS_H
-
-#define VAR_0x3F20                 0x3F20
-
-#define VAR_0x4000                 0x4000
-#define VAR_0x4001                 0x4001
-#define VAR_0x4002                 0x4002
-#define VAR_0x4003                 0x4003
-#define VAR_0x4004                 0x4004
-#define VAR_0x4005                 0x4005
-#define VAR_0x4006                 0x4006
-#define VAR_0x4007                 0x4007
-#define VAR_0x4008                 0x4008
-#define VAR_0x4009                 0x4009
-#define VAR_0x400A                 0x400A
-#define VAR_0x4010                 0x4010
-#define VAR_0x4011                 0x4011
-#define VAR_0x401F                 0x401F
-#define VAR_RECYCLE_GOODS          0x4020
-#define VAR_REPEL_STEP_COUNT       0x4021
-#define VAR_ICE_STEP_COUNT         0x4022
-#define VAR_FIRST_POKE             0x4023
-#define VAR_MIRAGE_RND_H           0x4024
-#define VAR_MIRAGE_RND_L           0x4025
-#define VAR_SECRET_BASE_MAP        0x4026
-
-#define VAR_HAPPINESS_STEP_COUNTER 0x402A
-#define VAR_POISON_STEP_COUNTER    0x402B
-#define VAR_RESET_RTC_ENABLE       0x402C
-
-#define VAR_0x4037                 0x4037
-#define VAR_ALTERING_CAVE_WILD_SET 0x403E
-#define VAR_DAYS                   0x4040
-
-#define VAR_DEPT_STORE_FLOOR       0x4043
-#define VAR_STORAGE_UNKNOWN        0x4036
-#define VAR_POKELOT_PRIZE          0x4045
-#define VAR_NATIONAL_DEX           0x4046
-#define VAR_SEEDOT_SIZE_RECORD     0x4047
-#define VAR_ASH_GATHER_COUNT       0x4048
-#define VAR_BIRCH_STATE            0x4049
-#define VAR_CRUISE_STEP_COUNT      0x404A
-#define VAR_POKELOT_RND1           0x404B
-#define VAR_POKELOT_RND2           0x404C
-
-#define VAR_LOTAD_SIZE_RECORD   0x404F
-
-#define VAR_0x4054                 0x4054
-
-#define VAR_0x4089                 0x4089
-#define VAR_0x4095                 0x4095
-#define VAR_0x4097                 0x4097
-#define VAR_0x409a                 0x409a
-#define VAR_PORTHOLE               0x40B4
-
-#define VAR_0x40BC                 0x40BC
-#define VAR_0x40C2                 0x40C2
-
-#define VAR_FRONTIER_FACILITY      0x40CF
-
-#define VAR_DAILY_SLOTS            0x40E6
-#define VAR_DAILY_WILDS            0x40E7
-#define VAR_DAILY_BLENDER          0x40E8
-#define VAR_DAILY_PLANTED_BERRIES  0x40E9
-#define VAR_DAILY_PICKED_BERRIES   0x40EA
-#define VAR_DAILY_ROULETTE         0x40EB
-#define VAR_0x40EC                 0x40EC
-#define VAR_0x40ED                 0x40ED
-#define VAR_0x40EE                 0x40EE
-#define VAR_0x40EF                 0x40EF
-#define VAR_0x40F0                 0x40F0
-#define VAR_DAILY_BP               0x40F1
-
-#endif // GUARD_VARS_H
--- a/src/battle_2.c
+++ b/src/battle_2.c
@ -11,7 +11,7 @@
 #include "palette.h"
 #include "task.h"
 #include "event_data.h"
-#include "species.h"
+#include "constants/species.h"
 #include "berry.h"
 #include "text.h"
 #include "item.h"
@ -26,7 +26,7 @@
 #include "m4a.h"
 #include "window.h"
 #include "random.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "battle_message.h"
 #include "sprite.h"
@ -37,7 +37,7 @@
 #include "battle_controllers.h"
 #include "pokedex.h"
 #include "constants/abilities.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "trainer_classes.h"
 #include "evolution_scene.h"
 #include "roamer.h"
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@ -2,12 +2,12 @@
 #include "battle_ai_script_commands.h"
 #include "pokemon.h"
 #include "battle.h"
-#include "species.h"
+#include "constants/species.h"
 #include "constants/abilities.h"
 #include "random.h"
 #include "item.h"
 #include "constants/battle_move_effects.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "util.h"

 #define AIScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24)
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@ -2,9 +2,9 @@
 #include "battle.h"
 #include "battle_controllers.h"
 #include "constants/abilities.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "pokemon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "random.h"
 #include "util.h"
 #include "constants/items.h"
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@ -10,7 +10,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@ -10,7 +10,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@ -12,9 +12,9 @@
 #include "main.h"
 #include "item.h"
 #include "constants/items.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "window.h"
 #include "m4a.h"
 #include "palette.h"
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@ -11,9 +11,9 @@
 #include "main.h"
 #include "item.h"
 #include "constants/items.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "window.h"
 #include "m4a.h"
 #include "palette.h"
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@ -9,7 +9,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@ -11,7 +11,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@ -10,7 +10,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@ -8,7 +8,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@ -11,9 +11,9 @@
 #include "main.h"
 #include "item.h"
 #include "constants/items.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "window.h"
 #include "m4a.h"
 #include "palette.h"
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@ -6,7 +6,7 @@
 #include "battle_ai_script_commands.h"
 #include "battle_anim.h"
 #include "pokemon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "recorded_battle.h"
 #include "util.h"
 #include "constants/abilities.h"
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@ -4,7 +4,7 @@
 #include "sprite.h"
 #include "window.h"
 #include "malloc.h"
-#include "species.h"
+#include "constants/species.h"
 #include "palette.h"
 #include "decompress.h"
 #include "battle_dome_cards.h"
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@ -9,18 +9,18 @@
 #include "random.h"
 #include "util.h"
 #include "pokemon.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "task.h"
 #include "sprite.h"
 #include "sound.h"
 #include "m4a.h"
-#include "species.h"
+#include "constants/species.h"
 #include "decompress.h"
 #include "data2.h"
 #include "palette.h"
 #include "blend_palette.h"
 #include "contest.h"
-#include "songs.h"
+#include "constants/songs.h"

 extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gActiveBank;
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@ -8,13 +8,13 @@
 #include "string_util.h"
 #include "text.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "decompress.h"
 #include "task.h"
 #include "util.h"
 #include "gpu_regs.h"
 #include "battle_message.h"
-#include "species.h"
+#include "constants/species.h"
 #include "pokedex.h"
 #include "palette.h"
 #include "international_string_util.h"
--- a/src/battle_message.c
+++ b/src/battle_message.c
@ -2,7 +2,7 @@
 #include "battle.h"
 #include "battle_message.h"
 #include "battle_string_ids.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "text.h"
 #include "string_util.h"
 #include "constants/items.h"
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@ -4,7 +4,7 @@
 #include "battle_message.h"
 #include "battle_ai_script_commands.h"
 #include "battle_scripts.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "constants/abilities.h"
 #include "item.h"
 #include "constants/items.h"
@ -15,8 +15,8 @@
 #include "random.h"
 #include "battle_controllers.h"
 #include "battle_interface.h"
-#include "species.h"
-#include "songs.h"
+#include "constants/species.h"
+#include "constants/songs.h"
 #include "text.h"
 #include "sound.h"
 #include "pokedex.h"
--- a/src/battle_util.c
+++ b/src/battle_util.c
@ -1,10 +1,10 @@
 #include "global.h"
 #include "battle.h"
 #include "constants/abilities.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "constants/hold_effects.h"
 #include "pokemon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "item.h"
 #include "constants/items.h"
 #include "util.h"
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@ -7,7 +7,7 @@
 #include "task.h"
 #include "sprite.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "m4a.h"
 #include "bg.h"
 #include "palette.h"
@ -1068,7 +1068,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum)
        sBerryBlenderData->playersNo = 2;
        StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName);

-        if (!FlagGet(FLAG_340))
+        if (!FlagGet(FLAG_0x340))
            StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MASTER]);
        else
            StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISTER]);
@ -1592,7 +1592,7 @@ static void sub_80808D4(void)

        if (gSpecialVar_0x8004 == 1)
        {
-            if (!FlagGet(FLAG_340))
+            if (!FlagGet(FLAG_0x340))
                sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10);
            else
                sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10);
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@ -1,9 +1,9 @@
 #include "global.h"
 #include "event_data.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "script.h"
-#include "species.h"
+#include "constants/species.h"
 #include "task.h"
 #include "field_effect.h"
 #include "constants/flags.h"
--- a/src/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
@ -6,8 +6,8 @@
 #include "item.h"
 #include "constants/items.h"
 #include "pokemon.h"
-#include "species.h"
-#include "moves.h"
+#include "constants/species.h"
+#include "constants/moves.h"
 #include "constants/battle_move_effects.h"

 extern u32 gBattleTypeFlags;
--- a/src/clear_save_data_screen.c
+++ b/src/clear_save_data_screen.c
@ -9,7 +9,7 @@
 #include "gpu_regs.h"
 #include "bg.h"
 #include "text_window.h"
-#include "songs.h"
+#include "constants/songs.h"

 extern u8 gText_ClearAllSaveData[];
 extern u8 gText_ClearingData[];
--- a/src/daycare.c
+++ b/src/daycare.c
@ -2,14 +2,14 @@
 #include "pokemon.h"
 #include "daycare.h"
 #include "string_util.h"
-#include "species.h"
+#include "constants/species.h"
 #include "constants/items.h"
 #include "mail.h"
 #include "pokemon_storage_system.h"
 #include "event_data.h"
 #include "random.h"
 #include "main.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "egg_hatch.h"
 #include "text.h"
 #include "menu.h"
--- a/src/decompress.c
+++ b/src/decompress.c
@ -1,6 +1,6 @@
 #include "global.h"
 #include "decompress.h"
-#include "species.h"
+#include "constants/species.h"
 #include "text.h"
 #include "malloc.h"
 #include "pokemon.h"
--- a/src/decoration.c
+++ b/src/decoration.c
@ -9,7 +9,7 @@
 #include "task.h"
 #include "main.h"
 #include "palette.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "overworld.h"
 #include "fieldmap.h"
 #include "metatile_behavior.h"
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@ -10,7 +10,7 @@
 #include "main.h"
 #include "event_data.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "text.h"
 #include "text_window.h"
 #include "string_util.h"
--- a/src/event_data.c
+++ b/src/event_data.c
@ -44,7 +44,7 @@ void ClearTempFieldEventData(void)
    FlagClear(FLAG_SYS_ENC_DOWN_ITEM);
    FlagClear(FLAG_SYS_USE_STRENGTH);
    FlagClear(FLAG_SYS_CTRL_OBJ_DELETE);
-    FlagClear(FLAG_SYS_UNKNOWN_880);
+    FlagClear(FLAG_0x880);
 }

 // probably had different flag splits at one point.
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@ -6,7 +6,7 @@
 #include "decompress.h"
 #include "task.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "palette.h"

 // this file's functions
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@ -16,9 +16,9 @@
 #include "m4a.h"
 #include "menu.h"
 #include "pokedex.h"
-#include "species.h"
+#include "constants/species.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "overworld.h"
 #include "battle_message.h"
 #include "battle_string_ids.h"
@ -52,6 +52,7 @@ extern u8 gBattleTerrain;
 extern struct SpriteTemplate gUnknown_0202499C;
 extern bool8 gAffineAnimsDisabled;
 extern u16 gMoveToLearn;
+extern const u8 gSpeciesNames[][11];

 extern u8 gBattleCommunication[];
 #define sEvoCursorPos           gBattleCommunication[1] // when learning a new move
--- a/src/field_poison.c
+++ b/src/field_poison.c
@ -1,7 +1,7 @@
 #include "global.h"
 #include "string_util.h"
 #include "party_menu.h"
-#include "species.h"
+#include "constants/species.h"
 #include "task.h"
 #include "field_message_box.h"
 #include "strings.h"
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@ -2,11 +2,11 @@
 #include "task.h"
 #include "sprite.h"
 #include "field_map_obj.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "palette.h"
 #include "script.h"
-#include "vars.h"
+#include "constants/vars.h"
 #include "event_data.h"
 #include "main.h"

--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@ -9,12 +9,12 @@
 #include "gpu_regs.h"
 #include "main.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "decompress.h"
 #include "save.h"
 #include "window.h"
 #include "bg.h"
-#include "species.h"
+#include "constants/species.h"
 #include "constants/game_stat.h"
 #include "blend_palette.h"
 #include "string_util.h"
@ -58,6 +58,7 @@ extern struct MusicPlayerInfo gMPlay_BGM;
 extern MainCallback gGameContinueCallback;
 extern u32 gDamagedSaveSectors;
 extern u8 gReservedSpritePaletteCount;
+extern const u8 gSpeciesNames[][11];

 #define HALL_OF_FAME_MAX_TEAMS 50

--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@ -4,7 +4,7 @@
 #include "pokemon.h"
 #include "constants/items.h"
 #include "random.h"
-#include "species.h"
+#include "constants/species.h"
 #include "string_util.h"
 #include "text.h"

--- a/src/mail.c
+++ b/src/mail.c
@ -15,7 +15,7 @@
 #include "gpu_regs.h"
 #include "bg.h"
 #include "pokemon_icon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "malloc.h"
 #include "easy_chat.h"
 #include "mail_data.h"
--- a/src/pokeball.c
+++ b/src/pokeball.c
@ -6,12 +6,12 @@
 #include "battle_anim.h"
 #include "task.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "trig.h"
 #include "main.h"
 #include "m4a.h"
 #include "decompress.h"
-#include "species.h"
+#include "constants/species.h"
 #include "util.h"
 #include "graphics.h"

--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@ -4,7 +4,7 @@
 #include "event_data.h"
 #include "random.h"
 #include "sprite.h"
-#include "species.h"
+#include "constants/species.h"
 #include "text.h"
 #include "string_util.h"

--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@ -7,13 +7,13 @@
 #include "rtc.h"
 #include "item.h"
 #include "battle.h"
-#include "species.h"
+#include "constants/species.h"
 #include "link.h"
 #include "constants/hold_effects.h"
 #include "random.h"
 #include "trainer_classes.h"
 #include "trainer_ids.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "m4a.h"
 #include "task.h"
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@ -1,7 +1,7 @@
 #include "global.h"
 #include "pokemon_size_record.h"
 #include "event_data.h"
-#include "species.h"
+#include "constants/species.h"
 #include "string_util.h"
 #include "text.h"
 #include "pokemon.h"
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@ -1,7 +1,7 @@
 #include "global.h"
 #include "pokemon_storage_system.h"
 #include "pokemon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "event_data.h"
 #include "string_util.h"
 #include "text.h"
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@ -8,12 +8,12 @@
 #include "m4a.h"
 #include "main.h"
 #include "malloc.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "palette.h"
 #include "pokemon.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
-#include "species.h"
+#include "constants/species.h"
 #include "sprite.h"
 #include "unk_text_util.h"
 #include "string_util.h"
--- a/src/region_map.c
+++ b/src/region_map.c
@ -17,7 +17,7 @@
 #include "international_string_util.h"
 #include "strings.h"
 #include "text_window.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "m4a.h"
 #include "field_effect.h"
 #include "region_map.h"
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@ -10,7 +10,7 @@
 #include "battle_controllers.h"
 #include "link.h"
 #include "sprite.h"
-#include "species.h"
+#include "constants/species.h"
 #include "battle_interface.h"

 extern u16 gBattle_BG0_X;
--- a/src/roamer.c
+++ b/src/roamer.c
@ -2,7 +2,7 @@
 #include "roamer.h"
 #include "pokemon.h"
 #include "random.h"
-#include "species.h"
+#include "constants/species.h"
 #include "event_data.h"

 enum
--- a/src/secret_base.c
+++ b/src/secret_base.c
@ -12,7 +12,7 @@
 #include "new_menu_helpers.h"
 #include "menu_indicators.h"
 #include "constants/maps.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "overworld.h"
 #include "fieldmap.h"
--- a/src/sound.c
+++ b/src/sound.c
@ -5,7 +5,7 @@
 #include "m4a.h"
 #include "main.h"
 #include "pokemon.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "task.h"

 struct Fanfare
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@ -12,7 +12,7 @@
 #include "decompress.h"
 #include "menu.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "event_data.h"
 #include "pokedex.h"
 #include "data2.h"
--- a/src/tv.c
+++ b/src/tv.c
@ -14,8 +14,8 @@
 #include "pokemon_storage_system.h"
 #include "field_message_box.h"
 #include "easy_chat.h"
-#include "species.h"
-#include "moves.h"
+#include "constants/species.h"
+#include "constants/moves.h"
 #include "battle.h"
 #include "battle_tower.h"
 #include "contest.h"
@ -38,6 +38,9 @@
 #include "secret_base.h"
 #include "tv.h"

+extern const u8 gSpeciesNames[][11];
+extern const u8 gMoveNames[][13];
+
 // Static type declarations

 #define rbernoulli(num, den) TV_BernoulliTrial(0xFFFF * (num) / (den))
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@ -1,7 +1,7 @@
 #include "global.h"
 #include "wild_encounter.h"
 #include "pokemon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "metatile_behavior.h"
 #include "fieldmap.h"
 #include "random.h"