summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/abilities.h2
-rw-r--r--include/constants/battle.h4
-rw-r--r--include/constants/battle_frontier.h13
-rw-r--r--include/constants/battle_script_commands.h15
-rwxr-xr-xinclude/constants/bg_event_constants.h13
-rw-r--r--include/constants/decorations.h1
-rwxr-xr-xinclude/constants/event_object_movement_constants.h245
-rw-r--r--include/constants/event_objects.h263
-rw-r--r--include/constants/flags.h25
-rw-r--r--include/constants/heal_locations.h27
-rw-r--r--include/constants/items.h14
-rw-r--r--include/constants/map_objects.h263
-rwxr-xr-xinclude/constants/map_types.h25
-rw-r--r--include/constants/maps.h154
-rw-r--r--include/constants/moves.h2
-rw-r--r--include/constants/opponents.h1712
-rwxr-xr-xinclude/constants/secret_bases.h110
-rw-r--r--include/constants/trainers.h872
-rw-r--r--include/constants/vars.h99
19 files changed, 1744 insertions, 2115 deletions
diff --git a/include/constants/abilities.h b/include/constants/abilities.h
index 4e2c4056c..4ad54c86f 100644
--- a/include/constants/abilities.h
+++ b/include/constants/abilities.h
@@ -80,4 +80,6 @@
#define ABILITY_CACOPHONY 76
#define ABILITY_AIR_LOCK 77
+#define ABILITIES_COUNT 78
+
#endif // GUARD_CONSTANTS_ABILITIES_H
diff --git a/include/constants/battle.h b/include/constants/battle.h
index f3d7a8e0e..b3f9d919a 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -130,7 +130,7 @@
#define STATUS2_TORMENT 0x80000000
// Seems like per-battler statuses. Not quite sure how to categorize these
-#define STATUS3_LEECHSEED_BANK 0x3
+#define STATUS3_LEECHSEED_BATTLER 0x3
#define STATUS3_LEECHSEED 0x4
#define STATUS3_ALWAYS_HITS 0x18 // two bits
#define STATUS3_PERISH_SONG 0x20
@@ -159,7 +159,7 @@
#define HITMARKER_NO_ATTACKSTRING 0x00000200
#define HITMARKER_ATTACKSTRING_PRINTED 0x00000400
#define HITMARKER_NO_PPDEDUCT 0x00000800
-#define HITMARKER_PURSUIT_TRAP 0x00001000
+#define HITMARKER_SWAP_ATTACKER_TARGET 0x00001000
#define HITMARKER_IGNORE_SAFEGUARD 0x00002000
#define HITMARKER_SYNCHRONISE_EFFECT 0x00004000
#define HITMARKER_RUN 0x00008000
diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h
new file mode 100644
index 000000000..4145805c4
--- /dev/null
+++ b/include/constants/battle_frontier.h
@@ -0,0 +1,13 @@
+#ifndef GUARD_CONSTANTS_BATTLE_FRONTIER_H
+#define GUARD_CONSTANTS_BATTLE_FRONTIER_H
+
+// Battle Frontier facility ids.
+#define FRONTIER_FACILITY_TOWER 0
+#define FRONTIER_FACILITY_DOME 1
+#define FRONTIER_FACILITY_PALACE 2
+#define FRONTIER_FACILITY_ARENA 3
+#define FRONTIER_FACILITY_FACTORY 4
+#define FRONTIER_FACILITY_PIKE 5
+#define FRONTIER_FACILITY_PYRAMID 6
+
+#endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index a1a4ed50a..84ec9d512 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -17,7 +17,7 @@
#define sB_ANIM_TURN gBattleScripting + 0x18
#define sB_ANIM_TARGETS_HIT gBattleScripting + 0x19
#define sSTATCHANGER gBattleScripting + 0x1A
-#define sFIELD_1B gBattleScripting + 0x1B
+#define sSTAT_ANIM_PLAYED gBattleScripting + 0x1B
#define sGIVEEXP_STATE gBattleScripting + 0x1C
#define sBATTLE_STYLE gBattleScripting + 0x1D
#define sLVLBOX_STATE gBattleScripting + 0x1E
@@ -37,7 +37,7 @@
#define BS_ATTACKER 1
#define BS_EFFECT_BATTLER 2
#define BS_FAINTED 3
-#define BS_BANK_0 7
+#define BS_BATTLER_0 7
#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update
#define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability
#define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability
@@ -91,7 +91,16 @@
// atk48
#define ATK48_STAT_NEGATIVE 0x1
#define ATK48_STAT_BY_TWO 0x2
-#define ATK48_BIT_x4 0x4
+#define ATK48_ONLY_MULTIPLE 0x4
#define ATK48_DONT_CHECK_LOWER 0x8
+#define BIT_HP 0x1
+#define BIT_ATK 0x2
+#define BIT_DEF 0x4
+#define BIT_SPEED 0x8
+#define BIT_SPATK 0x10
+#define BIT_SPDEF 0x20
+#define BIT_ACC 0x40
+#define BIT_EVASION 0x80
+
#endif // GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H
diff --git a/include/constants/bg_event_constants.h b/include/constants/bg_event_constants.h
new file mode 100755
index 000000000..a915bc509
--- /dev/null
+++ b/include/constants/bg_event_constants.h
@@ -0,0 +1,13 @@
+#ifndef GUARD_CONSTANTS_BG_EVENT_H
+#define GUARD_CONSTANTS_BG_EVENT_H
+
+#define BG_EVENT_PLAYER_FACING_ANY 0
+#define BG_EVENT_PLAYER_FACING_NORTH 1
+#define BG_EVENT_PLAYER_FACING_SOUTH 2
+#define BG_EVENT_PLAYER_FACING_EAST 3
+#define BG_EVENT_PLAYER_FACING_WEST 4
+
+#define BG_EVENT_HIDDEN_ITEM 7
+#define BG_EVENT_SECRET_BASE 8
+
+#endif // GUARD_CONSTANTS_BG_EVENT_H
diff --git a/include/constants/decorations.h b/include/constants/decorations.h
index 2e3558721..b9f626d24 100644
--- a/include/constants/decorations.h
+++ b/include/constants/decorations.h
@@ -122,5 +122,6 @@
#define DECOR_REGIROCK_DOLL 118
#define DECOR_REGICE_DOLL 119
#define DECOR_REGISTEEL_DOLL 120
+#define NUM_DECORATIONS DECOR_REGISTEEL_DOLL
#endif // GUARD_CONSTANTS_DECORATIONS_H
diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement_constants.h
new file mode 100755
index 000000000..2a80f9a09
--- /dev/null
+++ b/include/constants/event_object_movement_constants.h
@@ -0,0 +1,245 @@
+#ifndef GUARD_CONSTANTS_EVENTOBJMV_H
+#define GUARD_CONSTANTS_EVENTOBJMV_H
+
+#define MOVEMENT_TYPE_NONE 0x0
+#define MOVEMENT_TYPE_LOOK_AROUND 0x1
+#define MOVEMENT_TYPE_WANDER_AROUND 0x2
+#define MOVEMENT_TYPE_WANDER_UP_AND_DOWN 0x3
+#define MOVEMENT_TYPE_WANDER_DOWN_AND_UP 0x4
+#define MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT 0x5
+#define MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT 0x6
+#define MOVEMENT_TYPE_FACE_UP 0x7
+#define MOVEMENT_TYPE_FACE_DOWN 0x8
+#define MOVEMENT_TYPE_FACE_LEFT 0x9
+#define MOVEMENT_TYPE_FACE_RIGHT 0xA
+#define MOVEMENT_TYPE_PLAYER 0xB
+#define MOVEMENT_TYPE_BERRY_TREE_GROWTH 0xC
+#define MOVEMENT_TYPE_FACE_DOWN_AND_UP 0xD
+#define MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT 0xE
+#define MOVEMENT_TYPE_FACE_UP_AND_LEFT 0xF
+#define MOVEMENT_TYPE_FACE_UP_AND_RIGHT 0x10
+#define MOVEMENT_TYPE_FACE_DOWN_AND_LEFT 0x11
+#define MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT 0x12
+#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT 0x13
+#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT 0x14
+#define MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT 0x15
+#define MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT 0x16
+#define MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE 0x17
+#define MOVEMENT_TYPE_ROTATE_CLOCKWISE 0x18
+#define MOVEMENT_TYPE_WALK_UP_AND_DOWN 0x19
+#define MOVEMENT_TYPE_WALK_DOWN_AND_UP 0x1A
+#define MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT 0x1B
+#define MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT 0x1C
+#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN 0x1D
+#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP 0x1E
+#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT 0x1F
+#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT 0x20
+#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN 0x21
+#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP 0x22
+#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT 0x23
+#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT 0x24
+#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT 0x25
+#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT 0x26
+#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN 0x27
+#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP 0x28
+#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT 0x29
+#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT 0x2A
+#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN 0x2B
+#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP 0x2C
+#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT 0x2D
+#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT 0x2E
+#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP 0x2F
+#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN 0x30
+#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT 0x31
+#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT 0x32
+#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN 0x33
+#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP 0x34
+#define MOVEMENT_TYPE_COPY_PLAYER 0x35
+#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE 0x36
+#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE 0x37
+#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE 0x38
+#define MOVEMENT_TYPE_TREE_DISGUISE 0x39
+#define MOVEMENT_TYPE_MOUNTAIN_DISGUISE 0x3A
+#define MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS 0x3B
+#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS 0x3C
+#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS 0x3D
+#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS 0x3E
+#define MOVEMENT_TYPE_HIDDEN 0x3F
+#define MOVEMENT_TYPE_WALK_IN_PLACE_DOWN 0x40
+#define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41
+#define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42
+#define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43
+#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44
+#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45
+#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46
+#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47
+#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48
+#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49
+#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A
+#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B
+#define MOVEMENT_TYPE_INVISIBLE 0x4C
+#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN 0x4D
+#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP 0x4E
+#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT 0x4F
+#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT 0x50
+
+#define MOVEMENT_ACTION_FACE_DOWN 0x0
+#define MOVEMENT_ACTION_FACE_UP 0x1
+#define MOVEMENT_ACTION_FACE_LEFT 0x2
+#define MOVEMENT_ACTION_FACE_RIGHT 0x3
+#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4
+#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5
+#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6
+#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7
+#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8
+#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9
+#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA
+#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB
+#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC
+#define MOVEMENT_ACTION_JUMP_2_UP 0xD
+#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE
+#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF
+#define MOVEMENT_ACTION_DELAY_1 0x10
+#define MOVEMENT_ACTION_DELAY_2 0x11
+#define MOVEMENT_ACTION_DELAY_4 0x12
+#define MOVEMENT_ACTION_DELAY_8 0x13
+#define MOVEMENT_ACTION_DELAY_16 0x14
+#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15
+#define MOVEMENT_ACTION_WALK_FAST_UP 0x16
+#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17
+#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18
+#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19
+#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A
+#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B
+#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C
+#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D
+#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E
+#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F
+#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20
+#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21
+#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22
+#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23
+#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24
+#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25
+#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26
+#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27
+#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28
+#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29
+#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A
+#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B
+#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C
+#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D
+#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E
+#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F
+#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30
+#define MOVEMENT_ACTION_SLIDE_DOWN 0x31
+#define MOVEMENT_ACTION_SLIDE_UP 0x32
+#define MOVEMENT_ACTION_SLIDE_LEFT 0x33
+#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34
+#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35
+#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36
+#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37
+#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38
+#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39
+#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A
+#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B
+#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C
+#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D
+#define MOVEMENT_ACTION_FACE_PLAYER 0x3E
+#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x3F
+#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x40
+#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x41
+#define MOVEMENT_ACTION_JUMP_DOWN 0x42
+#define MOVEMENT_ACTION_JUMP_UP 0x43
+#define MOVEMENT_ACTION_JUMP_LEFT 0x44
+#define MOVEMENT_ACTION_JUMP_RIGHT 0x45
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x46
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x47
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x48
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x49
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x4A
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x4B
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x4C
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x4D
+#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x4E
+#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x4F
+#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50
+#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51
+#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x52
+#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x53
+#define MOVEMENT_ACTION_SET_INVISIBLE 0x54
+#define MOVEMENT_ACTION_SET_VISIBLE 0x55
+#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x56
+#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x57
+#define MOVEMENT_ACTION_EMOTE_HEART 0x58
+#define MOVEMENT_ACTION_REVEAL_TRAINER 0x59
+#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x5A
+#define MOVEMENT_ACTION_CUT_TREE 0x5B
+#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x5C
+#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x5D
+#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x5E
+#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x5F
+#define MOVEMENT_ACTION_UNKNOWN1 0x60
+#define MOVEMENT_ACTION_UNKNOWN2 0x61
+#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x62
+#define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x63
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x64
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x65
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x66
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x67
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x68
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x69
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x6A
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x6B
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x6C
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x6D
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x6E
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x6F
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x70
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x71
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x72
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x73
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x74
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x75
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x76
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x77
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x78
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x79
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x7A
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x7B
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x7C
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x7D
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x7E
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x7F
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x80
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x81
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x82
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x83
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x84
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x85
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x86
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x87
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x88
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x89
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x8A
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x8B
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT 0x8C
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT 0x8D
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT 0x8E
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT 0x8F
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT 0x90
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT 0x91
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT 0x92
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT 0x93
+#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM 0x94
+#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM 0x95
+#define MOVEMENT_ACTION_WALK_LEFT_AFFINE 0x96
+#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE 0x97
+#define MOVEMENT_ACTION_LEVITATE 0x98
+#define MOVEMENT_ACTION_STOP_LEVITATE 0x99
+#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP 0x9A
+#define MOVEMENT_ACTION_FIGURE_8 0x9B
+#define MOVEMENT_ACTION_FLY_UP 0x9C
+#define MOVEMENT_ACTION_FLY_DOWN 0x9D
+
+#endif // GUARD_CONSTANTS_EVENTOBJMV_H
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
new file mode 100644
index 000000000..d04f0a1f9
--- /dev/null
+++ b/include/constants/event_objects.h
@@ -0,0 +1,263 @@
+#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H
+#define GUARD_CONSTANTS_EVENT_OBJECTS_H
+
+#define EVENT_OBJ_GFX_BRENDAN_NORMAL 0
+#define EVENT_OBJ_GFX_BRENDAN_MACH_BIKE 1
+#define EVENT_OBJ_GFX_BRENDAN_SURFING 2
+#define EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE 3
+#define EVENT_OBJ_GFX_QUINTY_PLUMP 4
+#define EVENT_OBJ_GFX_LITTLE_BOY_1 5
+#define EVENT_OBJ_GFX_LITTLE_GIRL_1 6
+#define EVENT_OBJ_GFX_BOY_1 7
+#define EVENT_OBJ_GFX_GIRL_1 8
+#define EVENT_OBJ_GFX_BOY_2 9
+#define EVENT_OBJ_GFX_GIRL_2 10
+#define EVENT_OBJ_GFX_LITTLE_BOY_2 11
+#define EVENT_OBJ_GFX_LITTLE_GIRL_2 12
+#define EVENT_OBJ_GFX_BOY_3 13
+#define EVENT_OBJ_GFX_GIRL_3 14
+#define EVENT_OBJ_GFX_BOY_4 15
+#define EVENT_OBJ_GFX_WOMAN_1 16
+#define EVENT_OBJ_GFX_FAT_MAN 17
+#define EVENT_OBJ_GFX_WOMAN_2 18
+#define EVENT_OBJ_GFX_MAN_1 19
+#define EVENT_OBJ_GFX_WOMAN_3 20
+#define EVENT_OBJ_GFX_OLD_MAN_1 21
+#define EVENT_OBJ_GFX_OLD_WOMAN_1 22
+#define EVENT_OBJ_GFX_MAN_2 23
+#define EVENT_OBJ_GFX_WOMAN_4 24
+#define EVENT_OBJ_GFX_MAN_3 25
+#define EVENT_OBJ_GFX_WOMAN_5 26
+#define EVENT_OBJ_GFX_COOK 27
+#define EVENT_OBJ_GFX_WOMAN_6 28
+#define EVENT_OBJ_GFX_OLD_MAN_2 29
+#define EVENT_OBJ_GFX_OLD_WOMAN_2 30
+#define EVENT_OBJ_GFX_CAMPER 31
+#define EVENT_OBJ_GFX_PICNICKER 32
+#define EVENT_OBJ_GFX_MAN_4 33
+#define EVENT_OBJ_GFX_WOMAN_7 34
+#define EVENT_OBJ_GFX_YOUNGSTER 35
+#define EVENT_OBJ_GFX_BUG_CATCHER 36
+#define EVENT_OBJ_GFX_PSYCHIC_M 37
+#define EVENT_OBJ_GFX_SCHOOL_KID_M 38
+#define EVENT_OBJ_GFX_MANIAC 39
+#define EVENT_OBJ_GFX_HEX_MANIAC 40
+#define EVENT_OBJ_GFX_RAYQUAZA_1 41
+#define EVENT_OBJ_GFX_SWIMMER_M 42
+#define EVENT_OBJ_GFX_SWIMMER_F 43
+#define EVENT_OBJ_GFX_BLACK_BELT 44
+#define EVENT_OBJ_GFX_BEAUTY 45
+#define EVENT_OBJ_GFX_SCIENTIST_1 46
+#define EVENT_OBJ_GFX_LASS 47
+#define EVENT_OBJ_GFX_GENTLEMAN 48
+#define EVENT_OBJ_GFX_SAILOR 49
+#define EVENT_OBJ_GFX_FISHERMAN 50
+#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M 51
+#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F 52
+#define EVENT_OBJ_GFX_TUBER_F 53
+#define EVENT_OBJ_GFX_TUBER_M 54
+#define EVENT_OBJ_GFX_HIKER 55
+#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M 56
+#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F 57
+#define EVENT_OBJ_GFX_NURSE 58
+#define EVENT_OBJ_GFX_ITEM_BALL 59
+#define EVENT_OBJ_GFX_BERRY_TREE 60
+#define EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES 61
+#define EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES 62
+#define EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE 63
+#define EVENT_OBJ_GFX_PROF_BIRCH 64
+#define EVENT_OBJ_GFX_MAN_5 65
+#define EVENT_OBJ_GFX_MAN_6 66
+#define EVENT_OBJ_GFX_REPORTER_M 67
+#define EVENT_OBJ_GFX_REPORTER_F 68
+#define EVENT_OBJ_GFX_BARD 69
+#define EVENT_OBJ_GFX_ANABEL 70
+#define EVENT_OBJ_GFX_TUCKER 71
+#define EVENT_OBJ_GFX_GRETA 72
+#define EVENT_OBJ_GFX_SPENSER 73
+#define EVENT_OBJ_GFX_NOLAND 74
+#define EVENT_OBJ_GFX_LUCY 75
+#define EVENT_OBJ_GFX_UNUSED_NATU_DOLL 76
+#define EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL 77
+#define EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL 78
+#define EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL 79
+#define EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL 80
+#define EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL 81
+#define EVENT_OBJ_GFX_CUTTABLE_TREE 82
+#define EVENT_OBJ_GFX_MART_EMPLOYEE 83
+#define EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN 84
+#define EVENT_OBJ_GFX_TEALA 85
+#define EVENT_OBJ_GFX_BREAKABLE_ROCK 86
+#define EVENT_OBJ_GFX_PUSHABLE_BOULDER 87
+#define EVENT_OBJ_GFX_MR_BRINEYS_BOAT 88
+#define EVENT_OBJ_GFX_MAY_NORMAL 89
+#define EVENT_OBJ_GFX_MAY_MACH_BIKE 90
+#define EVENT_OBJ_GFX_MAY_ACRO_BIKE 91
+#define EVENT_OBJ_GFX_MAY_SURFING 92
+#define EVENT_OBJ_GFX_MAY_FIELD_MOVE 93
+#define EVENT_OBJ_GFX_TRUCK 94
+#define EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX 95
+#define EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY 96
+#define EVENT_OBJ_GFX_BIRCHS_BAG 97
+#define EVENT_OBJ_GFX_ZIGZAGOON_1 98
+#define EVENT_OBJ_GFX_ARTIST 99
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL 100
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE 101
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE 102
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING 103
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE 104
+#define EVENT_OBJ_GFX_RIVAL_MAY_NORMAL 105
+#define EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE 106
+#define EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE 107
+#define EVENT_OBJ_GFX_RIVAL_MAY_SURFING 108
+#define EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE 109
+#define EVENT_OBJ_GFX_CAMERAMAN 110
+#define EVENT_OBJ_GFX_BRENDAN_UNDERWATER 111
+#define EVENT_OBJ_GFX_MAY_UNDERWATER 112
+#define EVENT_OBJ_GFX_MOVING_BOX 113
+#define EVENT_OBJ_GFX_CABLE_CAR 114
+#define EVENT_OBJ_GFX_SCIENTIST_2 115
+#define EVENT_OBJ_GFX_MAN_7 116
+#define EVENT_OBJ_GFX_AQUA_MEMBER_M 117
+#define EVENT_OBJ_GFX_AQUA_MEMBER_F 118
+#define EVENT_OBJ_GFX_MAGMA_MEMBER_M 119
+#define EVENT_OBJ_GFX_MAGMA_MEMBER_F 120
+#define EVENT_OBJ_GFX_SIDNEY 121
+#define EVENT_OBJ_GFX_PHOEBE 122
+#define EVENT_OBJ_GFX_GLACIA 123
+#define EVENT_OBJ_GFX_DRAKE 124
+#define EVENT_OBJ_GFX_ROXANNE 125
+#define EVENT_OBJ_GFX_BRAWLY 126
+#define EVENT_OBJ_GFX_WATTSON 127
+#define EVENT_OBJ_GFX_FLANNERY 128
+#define EVENT_OBJ_GFX_NORMAN 129
+#define EVENT_OBJ_GFX_WINONA 130
+#define EVENT_OBJ_GFX_LIZA 131
+#define EVENT_OBJ_GFX_TATE 132
+#define EVENT_OBJ_GFX_WALLACE 133
+#define EVENT_OBJ_GFX_STEVEN 134
+#define EVENT_OBJ_GFX_WALLY 135
+#define EVENT_OBJ_GFX_LITTLE_BOY_3 136
+#define EVENT_OBJ_GFX_BRENDAN_FISHING 137
+#define EVENT_OBJ_GFX_MAY_FISHING 138
+#define EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN 139
+#define EVENT_OBJ_GFX_SS_TIDAL 140
+#define EVENT_OBJ_GFX_SUBMARINE_SHADOW 141
+#define EVENT_OBJ_GFX_PICHU_DOLL 142
+#define EVENT_OBJ_GFX_PIKACHU_DOLL 143
+#define EVENT_OBJ_GFX_MARILL_DOLL 144
+#define EVENT_OBJ_GFX_TOGEPI_DOLL 145
+#define EVENT_OBJ_GFX_CYNDAQUIL_DOLL 146
+#define EVENT_OBJ_GFX_CHIKORITA_DOLL 147
+#define EVENT_OBJ_GFX_TOTODILE_DOLL 148
+#define EVENT_OBJ_GFX_JIGGLYPUFF_DOLL 149
+#define EVENT_OBJ_GFX_MEOWTH_DOLL 150
+#define EVENT_OBJ_GFX_CLEFAIRY_DOLL 151
+#define EVENT_OBJ_GFX_DITTO_DOLL 152
+#define EVENT_OBJ_GFX_SMOOCHUM_DOLL 153
+#define EVENT_OBJ_GFX_TREECKO_DOLL 154
+#define EVENT_OBJ_GFX_TORCHIC_DOLL 155
+#define EVENT_OBJ_GFX_MUDKIP_DOLL 156
+#define EVENT_OBJ_GFX_DUSKULL_DOLL 157
+#define EVENT_OBJ_GFX_WYNAUT_DOLL 158
+#define EVENT_OBJ_GFX_BALTOY_DOLL 159
+#define EVENT_OBJ_GFX_KECLEON_DOLL 160
+#define EVENT_OBJ_GFX_AZURILL_DOLL 161
+#define EVENT_OBJ_GFX_SKITTY_DOLL 162
+#define EVENT_OBJ_GFX_SWABLU_DOLL 163
+#define EVENT_OBJ_GFX_GULPIN_DOLL 164
+#define EVENT_OBJ_GFX_LOTAD_DOLL 165
+#define EVENT_OBJ_GFX_SEEDOT_DOLL 166
+#define EVENT_OBJ_GFX_PIKA_CUSHION 167
+#define EVENT_OBJ_GFX_ROUND_CUSHION 168
+#define EVENT_OBJ_GFX_KISS_CUSHION 169
+#define EVENT_OBJ_GFX_ZIGZAG_CUSHION 170
+#define EVENT_OBJ_GFX_SPIN_CUSHION 171
+#define EVENT_OBJ_GFX_DIAMOND_CUSHION 172
+#define EVENT_OBJ_GFX_BALL_CUSHION 173
+#define EVENT_OBJ_GFX_GRASS_CUSHION 174
+#define EVENT_OBJ_GFX_FIRE_CUSHION 175
+#define EVENT_OBJ_GFX_WATER_CUSHION 176
+#define EVENT_OBJ_GFX_BIG_SNORLAX_DOLL 177
+#define EVENT_OBJ_GFX_BIG_RHYDON_DOLL 178
+#define EVENT_OBJ_GFX_BIG_LAPRAS_DOLL 179
+#define EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL 180
+#define EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL 181
+#define EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL 182
+#define EVENT_OBJ_GFX_BIG_WAILMER_DOLL 183
+#define EVENT_OBJ_GFX_BIG_REGIROCK_DOLL 184
+#define EVENT_OBJ_GFX_BIG_REGICE_DOLL 185
+#define EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL 186
+#define EVENT_OBJ_GFX_LATIAS 187
+#define EVENT_OBJ_GFX_LATIOS 188
+#define EVENT_OBJ_GFX_BOY_5 189
+#define EVENT_OBJ_GFX_CONTEST_JUDGE 190
+#define EVENT_OBJ_GFX_BRENDAN_WATERING 191
+#define EVENT_OBJ_GFX_MAY_WATERING 192
+#define EVENT_OBJ_GFX_BRENDAN_DECORATING 193
+#define EVENT_OBJ_GFX_MAY_DECORATING 194
+#define EVENT_OBJ_GFX_ARCHIE 195
+#define EVENT_OBJ_GFX_MAXIE 196
+#define EVENT_OBJ_GFX_KYOGRE_1 197
+#define EVENT_OBJ_GFX_GROUDON_1 198
+#define EVENT_OBJ_GFX_FOSSIL 199
+#define EVENT_OBJ_GFX_REGIROCK 200
+#define EVENT_OBJ_GFX_REGICE 201
+#define EVENT_OBJ_GFX_REGISTEEL 202
+#define EVENT_OBJ_GFX_SKITTY 203
+#define EVENT_OBJ_GFX_KECLEON_1 204
+#define EVENT_OBJ_GFX_KYOGRE_2 205
+#define EVENT_OBJ_GFX_GROUDON_2 206
+#define EVENT_OBJ_GFX_RAYQUAZA_2 207
+#define EVENT_OBJ_GFX_ZIGZAGOON_2 208
+#define EVENT_OBJ_GFX_PIKACHU 209
+#define EVENT_OBJ_GFX_AZUMARILL 210
+#define EVENT_OBJ_GFX_WINGULL 211
+#define EVENT_OBJ_GFX_KECLEON_2 212
+#define EVENT_OBJ_GFX_TUBER_M_SWIMMING 213
+#define EVENT_OBJ_GFX_AZURILL 214
+#define EVENT_OBJ_GFX_MOM 215
+#define EVENT_OBJ_GFX_LINK_BRENDAN 216
+#define EVENT_OBJ_GFX_LINK_MAY 217
+#define EVENT_OBJ_GFX_JUAN 218
+#define EVENT_OBJ_GFX_SCOTT 219
+#define EVENT_OBJ_GFX_POOCHYENA 220
+#define EVENT_OBJ_GFX_KYOGRE_3 221
+#define EVENT_OBJ_GFX_GROUDON_3 222
+#define EVENT_OBJ_GFX_MYSTERY_GIFT_MAN 223
+#define EVENT_OBJ_GFX_TRICK_HOUSE_STATUE 224
+#define EVENT_OBJ_GFX_KIRLIA 225
+#define EVENT_OBJ_GFX_DUSCLOPS 226
+#define EVENT_OBJ_GFX_UNION_ROOM_NURSE 227
+#define EVENT_OBJ_GFX_SUDOWOODO 228
+#define EVENT_OBJ_GFX_MEW 229
+#define EVENT_OBJ_GFX_RED 230
+#define EVENT_OBJ_GFX_LEAF 231
+#define EVENT_OBJ_GFX_DEOXYS 232
+#define EVENT_OBJ_GFX_DEOXYS_TRIANGLE 233
+#define EVENT_OBJ_GFX_BRANDON 234
+#define EVENT_OBJ_GFX_LINK_RS_BRENDAN 235
+#define EVENT_OBJ_GFX_LINK_RS_MAY 236
+#define EVENT_OBJ_GFX_LUGIA 237
+#define EVENT_OBJ_GFX_HOOH 238
+#define EVENT_OBJ_GFX_BARD_2 239
+#define EVENT_OBJ_GFX_HIPSTER 240
+#define EVENT_OBJ_GFX_TRADER 241
+#define EVENT_OBJ_GFX_STORYTELLER 242
+#define EVENT_OBJ_GFX_GIDDY 243
+#define EVENT_OBJ_GFX_PLACEHOLDER_1 244
+#define EVENT_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
+
+#endif // GUARD_CONSTANTS_EVENT_OBJECTS_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 7f52018a1..6c1400410 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -199,7 +199,7 @@
#define FLAG_0x0C4 0xC4
#define FLAG_0x0C5 0xC5
#define FLAG_0x0C6 0xC6
-#define FLAG_0x0C7 0xC7
+#define FLAG_RUSTURF_TUNNEL_OPENED 0xC7
#define FLAG_0x0C8 0xC8
#define FLAG_0x0C9 0xC9
#define FLAG_0x0CA 0xCA
@@ -348,6 +348,7 @@
#define FLAG_0x159 0x159
#define FLAG_0x15A 0x15A
#define FLAG_0x15B 0x15B
+
#define FLAG_MATCH_CALL_REGISTERED 0x15C
#define FLAG_0x15D 0x15D
#define FLAG_0x15E 0x15E
@@ -531,10 +532,10 @@
#define FLAG_0x210 0x210
#define FLAG_0x211 0x211
#define FLAG_0x212 0x212
-#define FLAG_0x213 0x213
-#define FLAG_0x214 0x214
-#define FLAG_0x215 0x215
-#define FLAG_0x216 0x216
+#define FLAG_HIDDEN_ITEM_1F 0x213
+#define FLAG_HIDDEN_ITEM_20 0x214
+#define FLAG_HIDDEN_ITEM_21 0x215
+#define FLAG_HIDDEN_ITEM_22 0x216
#define FLAG_0x217 0x217
#define FLAG_0x218 0x218
#define FLAG_0x219 0x219
@@ -596,7 +597,7 @@
#define FLAG_0x251 0x251
#define FLAG_0x252 0x252
#define FLAG_0x253 0x253
-#define FLAG_0x254 0x254
+#define FLAG_HIDDEN_ITEM_BLACK_GLASSES 0x254
#define FLAG_0x255 0x255
#define FLAG_0x256 0x256
#define FLAG_0x257 0x257
@@ -789,10 +790,10 @@
#define FLAG_0x312 0x312
#define FLAG_0x313 0x313
#define FLAG_0x314 0x314
-#define FLAG_0x315 0x315
-#define FLAG_0x316 0x316
-#define FLAG_0x317 0x317
-#define FLAG_0x318 0x318
+#define FLAG_HIDE_FANCLUB_OLD_LADY 0x315
+#define FLAG_HIDE_FANCLUB_BOY 0x316
+#define FLAG_HIDE_FANCLUB_LITTLE_BOY 0x317
+#define FLAG_HIDE_FANCLUB_LADY 0x318
#define FLAG_0x319 0x319
#define FLAG_0x31A 0x31A
#define FLAG_0x31B 0x31B
@@ -931,8 +932,8 @@
#define FLAG_0x3A0 0x3A0
#define FLAG_0x3A1 0x3A1
#define FLAG_0x3A2 0x3A2
-#define FLAG_0x3A3 0x3A3
-#define FLAG_0x3A4 0x3A4
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3
+#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4
#define FLAG_0x3A5 0x3A5
#define FLAG_0x3A6 0x3A6
#define FLAG_0x3A7 0x3A7
diff --git a/include/constants/heal_locations.h b/include/constants/heal_locations.h
new file mode 100644
index 000000000..64c8956a9
--- /dev/null
+++ b/include/constants/heal_locations.h
@@ -0,0 +1,27 @@
+#ifndef GUARD_CONSTANTS_HEAL_LOCATIONS_H
+#define GUARD_CONSTANTS_HEAL_LOCATIONS_H
+
+#define HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 1
+#define HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F 2
+#define HEAL_LOCATION_PETALBURG_CITY 3
+#define HEAL_LOCATION_SLATEPORT_CITY 4
+#define HEAL_LOCATION_MAUVILLE_CITY 5
+#define HEAL_LOCATION_RUSTBORO_CITY 6
+#define HEAL_LOCATION_FORTREE_CITY 7
+#define HEAL_LOCATION_LILYCOVE_CITY 8
+#define HEAL_LOCATION_MOSSDEEP_CITY 9
+#define HEAL_LOCATION_SOOTOPOLIS_CITY 10
+#define HEAL_LOCATION_EVER_GRANDE_CITY_1 11
+#define HEAL_LOCATION_LITTLEROOT_TOWN_1 12
+#define HEAL_LOCATION_LITTLEROOT_TOWN_2 13
+#define HEAL_LOCATION_OLDALE_TOWN 14
+#define HEAL_LOCATION_DEWFORD_TOWN 15
+#define HEAL_LOCATION_LAVARIDGE_TOWN 16
+#define HEAL_LOCATION_FALLARBOR_TOWN 17
+#define HEAL_LOCATION_VERDANTURF_TOWN 18
+#define HEAL_LOCATION_PACIFIDLOG_TOWN 19
+#define HEAL_LOCATION_EVER_GRANDE_CITY_2 20
+#define HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR 21
+#define HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST 22
+
+#endif // GUARD_CONSTANTS_HEAL_LOCATIONS_H
diff --git a/include/constants/items.h b/include/constants/items.h
index 8717ecbd5..294499c8b 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -108,6 +108,8 @@
#define ITEM_064 100
#define ITEM_065 101
#define ITEM_066 102
+
+// Unusable
#define ITEM_TINY_MUSHROOM 103
#define ITEM_BIG_MUSHROOM 104
#define ITEM_069 105
@@ -126,6 +128,8 @@
#define ITEM_076 118
#define ITEM_077 119
#define ITEM_078 120
+
+// Mails
#define ITEM_ORANGE_MAIL 121
#define ITEM_HARBOR_MAIL 122
#define ITEM_GLITTER_MAIL 123
@@ -138,6 +142,8 @@
#define ITEM_DREAM_MAIL 130
#define ITEM_FAB_MAIL 131
#define ITEM_RETRO_MAIL 132
+
+// Berries
#define ITEM_CHERI_BERRY 133
#define ITEM_CHESTO_BERRY 134
#define ITEM_PECHA_BERRY 135
@@ -185,7 +191,7 @@
#define ITEM_0B1 177
#define ITEM_0B2 178
-// hold items
+// Battle Held items
#define ITEM_BRIGHT_POWDER 179
#define ITEM_WHITE_HERB 180
#define ITEM_MACHO_BRACE 181
@@ -261,6 +267,8 @@
#define ITEM_0FB 251
#define ITEM_0FC 252
#define ITEM_0FD 253
+
+// Contest held items
#define ITEM_RED_SCARF 254
#define ITEM_BLUE_SCARF 255
#define ITEM_PINK_SCARF 256
@@ -454,8 +462,8 @@
#define ITEM_MAGMA_EMBLEM 375
#define ITEM_OLD_SEA_MAP 376
-#define ITEM_LAST_ID 376
-#define ITEM_FIELD_ARROW ITEM_LAST_ID + 1
+#define ITEMS_COUNT 377
+#define ITEM_FIELD_ARROW ITEMS_COUNT
#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY
diff --git a/include/constants/map_objects.h b/include/constants/map_objects.h
deleted file mode 100644
index d5b983005..000000000
--- a/include/constants/map_objects.h
+++ /dev/null
@@ -1,263 +0,0 @@
-#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H
-#define GUARD_CONSTANTS_MAP_OBJECTS_H
-
-#define MAP_OBJ_GFX_BRENDAN_NORMAL 0
-#define MAP_OBJ_GFX_BRENDAN_MACH_BIKE 1
-#define MAP_OBJ_GFX_BRENDAN_SURFING 2
-#define MAP_OBJ_GFX_BRENDAN_FIELD_MOVE 3
-#define MAP_OBJ_GFX_QUINTY_PLUMP 4
-#define MAP_OBJ_GFX_LITTLE_BOY_1 5
-#define MAP_OBJ_GFX_LITTLE_GIRL_1 6
-#define MAP_OBJ_GFX_BOY_1 7
-#define MAP_OBJ_GFX_GIRL_1 8
-#define MAP_OBJ_GFX_BOY_2 9
-#define MAP_OBJ_GFX_GIRL_2 10
-#define MAP_OBJ_GFX_LITTLE_BOY_2 11
-#define MAP_OBJ_GFX_LITTLE_GIRL_2 12
-#define MAP_OBJ_GFX_BOY_3 13
-#define MAP_OBJ_GFX_GIRL_3 14
-#define MAP_OBJ_GFX_BOY_4 15
-#define MAP_OBJ_GFX_WOMAN_1 16
-#define MAP_OBJ_GFX_FAT_MAN 17
-#define MAP_OBJ_GFX_WOMAN_2 18
-#define MAP_OBJ_GFX_MAN_1 19
-#define MAP_OBJ_GFX_WOMAN_3 20
-#define MAP_OBJ_GFX_OLD_MAN_1 21
-#define MAP_OBJ_GFX_OLD_WOMAN_1 22
-#define MAP_OBJ_GFX_MAN_2 23
-#define MAP_OBJ_GFX_WOMAN_4 24
-#define MAP_OBJ_GFX_MAN_3 25
-#define MAP_OBJ_GFX_WOMAN_5 26
-#define MAP_OBJ_GFX_COOK 27
-#define MAP_OBJ_GFX_WOMAN_6 28
-#define MAP_OBJ_GFX_OLD_MAN_2 29
-#define MAP_OBJ_GFX_OLD_WOMAN_2 30
-#define MAP_OBJ_GFX_CAMPER 31
-#define MAP_OBJ_GFX_PICNICKER 32
-#define MAP_OBJ_GFX_MAN_4 33
-#define MAP_OBJ_GFX_WOMAN_7 34
-#define MAP_OBJ_GFX_YOUNGSTER 35
-#define MAP_OBJ_GFX_BUG_CATCHER 36
-#define MAP_OBJ_GFX_PSYCHIC_M 37
-#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_RAYQUAZA_1 41
-#define MAP_OBJ_GFX_SWIMMER_M 42
-#define MAP_OBJ_GFX_SWIMMER_F 43
-#define MAP_OBJ_GFX_BLACK_BELT 44
-#define MAP_OBJ_GFX_BEAUTY 45
-#define MAP_OBJ_GFX_SCIENTIST_1 46
-#define MAP_OBJ_GFX_LASS 47
-#define MAP_OBJ_GFX_GENTLEMAN 48
-#define MAP_OBJ_GFX_SAILOR 49
-#define MAP_OBJ_GFX_FISHERMAN 50
-#define MAP_OBJ_GFX_RUNNING_TRIATHLETE_M 51
-#define MAP_OBJ_GFX_RUNNING_TRIATHLETE_F 52
-#define MAP_OBJ_GFX_TUBER_F 53
-#define MAP_OBJ_GFX_TUBER_M 54
-#define MAP_OBJ_GFX_HIKER 55
-#define MAP_OBJ_GFX_CYCLING_TRIATHLETE_M 56
-#define MAP_OBJ_GFX_CYCLING_TRIATHLETE_F 57
-#define MAP_OBJ_GFX_NURSE 58
-#define MAP_OBJ_GFX_ITEM_BALL 59
-#define MAP_OBJ_GFX_BERRY_TREE 60
-#define MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES 61
-#define MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES 62
-#define MAP_OBJ_GFX_BRENDAN_ACRO_BIKE 63
-#define MAP_OBJ_GFX_PROF_BIRCH 64
-#define MAP_OBJ_GFX_MAN_5 65
-#define MAP_OBJ_GFX_MAN_6 66
-#define MAP_OBJ_GFX_REPORTER_M 67
-#define MAP_OBJ_GFX_REPORTER_F 68
-#define MAP_OBJ_GFX_BARD 69
-#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
-#define MAP_OBJ_GFX_UNUSED_WOOPER_DOLL 79
-#define MAP_OBJ_GFX_UNUSED_PIKACHU_DOLL 80
-#define MAP_OBJ_GFX_UNUSED_PORYGON2_DOLL 81
-#define MAP_OBJ_GFX_CUTTABLE_TREE 82
-#define MAP_OBJ_GFX_MART_EMPLOYEE 83
-#define MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN 84
-#define MAP_OBJ_GFX_TEALA 85
-#define MAP_OBJ_GFX_BREAKABLE_ROCK 86
-#define MAP_OBJ_GFX_PUSHABLE_BOULDER 87
-#define MAP_OBJ_GFX_MR_BRINEYS_BOAT 88
-#define MAP_OBJ_GFX_MAY_NORMAL 89
-#define MAP_OBJ_GFX_MAY_MACH_BIKE 90
-#define MAP_OBJ_GFX_MAY_ACRO_BIKE 91
-#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_VIGAROTH_CARRYING_BOX 95
-#define MAP_OBJ_GFX_VIGAROTH_FACING_AWAY 96
-#define MAP_OBJ_GFX_BIRCHS_BAG 97
-#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
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE 102
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING 103
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE 104
-#define MAP_OBJ_GFX_RIVAL_MAY_NORMAL 105
-#define MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE 106
-#define MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE 107
-#define MAP_OBJ_GFX_RIVAL_MAY_SURFING 108
-#define MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE 109
-#define MAP_OBJ_GFX_CAMERAMAN 110
-#define MAP_OBJ_GFX_BRENDAN_UNDERWATER 111
-#define MAP_OBJ_GFX_MAY_UNDERWATER 112
-#define MAP_OBJ_GFX_MOVING_BOX 113
-#define MAP_OBJ_GFX_CABLE_CAR 114
-#define MAP_OBJ_GFX_SCIENTIST_2 115
-#define MAP_OBJ_GFX_MAN_7 116
-#define MAP_OBJ_GFX_AQUA_MEMBER_M 117
-#define MAP_OBJ_GFX_AQUA_MEMBER_F 118
-#define MAP_OBJ_GFX_MAGMA_MEMBER_M 119
-#define MAP_OBJ_GFX_MAGMA_MEMBER_F 120
-#define MAP_OBJ_GFX_SIDNEY 121
-#define MAP_OBJ_GFX_PHOEBE 122
-#define MAP_OBJ_GFX_GLACIA 123
-#define MAP_OBJ_GFX_DRAKE 124
-#define MAP_OBJ_GFX_ROXANNE 125
-#define MAP_OBJ_GFX_BRAWLY 126
-#define MAP_OBJ_GFX_WATTSON 127
-#define MAP_OBJ_GFX_FLANNERY 128
-#define MAP_OBJ_GFX_NORMAN 129
-#define MAP_OBJ_GFX_WINONA 130
-#define MAP_OBJ_GFX_LIZA 131
-#define MAP_OBJ_GFX_TATE 132
-#define MAP_OBJ_GFX_WALLACE 133
-#define MAP_OBJ_GFX_STEVEN 134
-#define MAP_OBJ_GFX_WALLY 135
-#define MAP_OBJ_GFX_LITTLE_BOY_3 136
-#define MAP_OBJ_GFX_BRENDAN_FISHING 137
-#define MAP_OBJ_GFX_MAY_FISHING 138
-#define MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN 139
-#define MAP_OBJ_GFX_SS_TIDAL 140
-#define MAP_OBJ_GFX_SUBMARINE_SHADOW 141
-#define MAP_OBJ_GFX_PICHU_DOLL 142
-#define MAP_OBJ_GFX_PIKACHU_DOLL 143
-#define MAP_OBJ_GFX_MARILL_DOLL 144
-#define MAP_OBJ_GFX_TOGEPI_DOLL 145
-#define MAP_OBJ_GFX_CYNDAQUIL_DOLL 146
-#define MAP_OBJ_GFX_CHIKORITA_DOLL 147
-#define MAP_OBJ_GFX_TOTODILE_DOLL 148
-#define MAP_OBJ_GFX_JIGGLYPUFF_DOLL 149
-#define MAP_OBJ_GFX_MEOWTH_DOLL 150
-#define MAP_OBJ_GFX_CLEFAIRY_DOLL 151
-#define MAP_OBJ_GFX_DITTO_DOLL 152
-#define MAP_OBJ_GFX_SMOOCHUM_DOLL 153
-#define MAP_OBJ_GFX_TREECKO_DOLL 154
-#define MAP_OBJ_GFX_TORCHIC_DOLL 155
-#define MAP_OBJ_GFX_MUDKIP_DOLL 156
-#define MAP_OBJ_GFX_DUSKULL_DOLL 157
-#define MAP_OBJ_GFX_WYNAUT_DOLL 158
-#define MAP_OBJ_GFX_BALTOY_DOLL 159
-#define MAP_OBJ_GFX_KECLEON_DOLL 160
-#define MAP_OBJ_GFX_AZURILL_DOLL 161
-#define MAP_OBJ_GFX_SKITTY_DOLL 162
-#define MAP_OBJ_GFX_SWABLU_DOLL 163
-#define MAP_OBJ_GFX_GULPIN_DOLL 164
-#define MAP_OBJ_GFX_LOTAD_DOLL 165
-#define MAP_OBJ_GFX_SEEDOT_DOLL 166
-#define MAP_OBJ_GFX_PIKA_CUSHION 167
-#define MAP_OBJ_GFX_ROUND_CUSHION 168
-#define MAP_OBJ_GFX_KISS_CUSHION 169
-#define MAP_OBJ_GFX_ZIGZAG_CUSHION 170
-#define MAP_OBJ_GFX_SPIN_CUSHION 171
-#define MAP_OBJ_GFX_DIAMOND_CUSHION 172
-#define MAP_OBJ_GFX_BALL_CUSHION 173
-#define MAP_OBJ_GFX_GRASS_CUSHION 174
-#define MAP_OBJ_GFX_FIRE_CUSHION 175
-#define MAP_OBJ_GFX_WATER_CUSHION 176
-#define MAP_OBJ_GFX_BIG_SNORLAX_DOLL 177
-#define MAP_OBJ_GFX_BIG_RHYDON_DOLL 178
-#define MAP_OBJ_GFX_BIG_LAPRAS_DOLL 179
-#define MAP_OBJ_GFX_BIG_VENUSAUR_DOLL 180
-#define MAP_OBJ_GFX_BIG_CHARIZARD_DOLL 181
-#define MAP_OBJ_GFX_BIG_BLASTOISE_DOLL 182
-#define MAP_OBJ_GFX_BIG_WAILMER_DOLL 183
-#define MAP_OBJ_GFX_BIG_REGIROCK_DOLL 184
-#define MAP_OBJ_GFX_BIG_REGICE_DOLL 185
-#define MAP_OBJ_GFX_BIG_REGISTEEL_DOLL 186
-#define MAP_OBJ_GFX_LATIAS 187
-#define MAP_OBJ_GFX_LATIOS 188
-#define MAP_OBJ_GFX_BOY_5 189
-#define MAP_OBJ_GFX_CONTEST_JUDGE 190
-#define MAP_OBJ_GFX_BRENDAN_WATERING 191
-#define MAP_OBJ_GFX_MAY_WATERING 192
-#define MAP_OBJ_GFX_BRENDAN_DECORATING 193
-#define MAP_OBJ_GFX_MAY_DECORATING 194
-#define MAP_OBJ_GFX_ARCHIE 195
-#define MAP_OBJ_GFX_MAXIE 196
-#define MAP_OBJ_GFX_KYOGRE_1 197
-#define MAP_OBJ_GFX_GROUDON_1 198
-#define MAP_OBJ_GFX_FOSSIL 199
-#define MAP_OBJ_GFX_REGIROCK 200
-#define MAP_OBJ_GFX_REGICE 201
-#define MAP_OBJ_GFX_REGISTEEL 202
-#define MAP_OBJ_GFX_SKITTY 203
-#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_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
-#define MAP_OBJ_GFX_KECLEON_2 212
-#define MAP_OBJ_GFX_TUBER_M_SWIMMING 213
-#define MAP_OBJ_GFX_AZURILL 214
-#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
-
-#endif // GUARD_CONSTANTS_MAP_OBJECTS_H
diff --git a/include/constants/map_types.h b/include/constants/map_types.h
new file mode 100755
index 000000000..504575859
--- /dev/null
+++ b/include/constants/map_types.h
@@ -0,0 +1,25 @@
+#ifndef GUARD_CONSTANTS_MAP_TYPES_H
+#define GUARD_CONSTANTS_MAP_TYPES_H
+
+#define MAP_TYPE_0 0
+#define MAP_TYPE_TOWN 1
+#define MAP_TYPE_CITY 2
+#define MAP_TYPE_ROUTE 3
+#define MAP_TYPE_UNDERGROUND 4
+#define MAP_TYPE_UNDERWATER 5
+#define MAP_TYPE_6 6
+#define MAP_TYPE_7 7
+#define MAP_TYPE_INDOOR 8
+#define MAP_TYPE_SECRET_BASE 9
+
+#define MAP_BATTLE_SCENE_NORMAL 0
+#define MAP_BATTLE_SCENE_GYM 1
+#define MAP_BATTLE_SCENE_MAGMA 2
+#define MAP_BATTLE_SCENE_AQUA 3
+#define MAP_BATTLE_SCENE_SIDNEY 4
+#define MAP_BATTLE_SCENE_PHOEBE 5
+#define MAP_BATTLE_SCENE_GLACIA 6
+#define MAP_BATTLE_SCENE_DRAKE 7
+#define MAP_BATTLE_SCENE_FRONTIER 8
+
+#endif // GUARD_CONSTANTS_MAP_TYPES_H
diff --git a/include/constants/maps.h b/include/constants/maps.h
index fb1cb82a8..bcb778422 100644
--- a/include/constants/maps.h
+++ b/include/constants/maps.h
@@ -228,21 +228,21 @@
#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8))
// Map Group 15
-#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE8 (12 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE9_1F (13 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE9_B1F (14 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE (12 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F (13 | (15 << 8))
+#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8))
// Map Group 16
#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (16 << 8))
@@ -250,11 +250,11 @@
#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR1 (5 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR2 (6 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR3 (7 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR4 (8 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR5 (9 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL1 (5 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL2 (6 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL3 (7 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL4 (8 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL5 (9 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8))
@@ -327,9 +327,9 @@
#define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8))
#define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8))
#define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B1F (39 | (24 << 8)) //
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F (40 | (24 << 8)) // Ruby/Sapphire leftovers
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F (41 | (24 << 8)) //
+#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8)) //
+#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8)) // Ruby/Sapphire leftovers
+#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (24 << 8)) //
#define MAP_CAVE_OF_ORIGIN_B1F (42 | (24 << 8))
#define MAP_VICTORY_ROAD_1F (43 | (24 << 8))
#define MAP_VICTORY_ROAD_B1F (44 | (24 << 8))
@@ -442,29 +442,29 @@
#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8))
#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8))
#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_01 (44 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_02 (45 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_03 (46 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_04 (47 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_05 (48 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_06 (49 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_07 (50 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_08 (51 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_09 (52 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_10 (53 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_11 (54 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_12 (55 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_13 (56 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_14 (57 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_15 (58 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE_16 (59 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8))
#define MAP_UNION_ROOM (60 | (25 << 8))
// Map Group 26
#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8))
-#define MAP_SAFARI_ZONE_NORTHEAST (1 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8))
#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHEAST (3 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8))
#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8))
@@ -473,12 +473,12 @@
#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8))
#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8))
#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8))
-#define MAP_SAFARI_ZONE_EM_1 (12 | (26 << 8))
-#define MAP_SAFARI_ZONE_EM_2 (13 | (26 << 8))
+#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8))
+#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8))
#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 (16 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2 (17 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 (16 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 (17 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8))
@@ -498,22 +498,22 @@
#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 (37 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_2 (38 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_3 (39 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 (37 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 (38 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 (39 | (26 << 8))
#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_1 (41 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8))
#define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_2 (43 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_3 (44 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_4 (45 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8))
#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_5 (47 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_6 (48 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_7 (49 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8))
#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_8 (51 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE_9 (52 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8))
+#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8))
#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8))
#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8))
#define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8))
@@ -530,24 +530,24 @@
#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8))
#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8))
#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8))
-#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8))
-#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP_1 (71 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP_2 (72 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP_3 (73 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP_4 (74 | (26 << 8))
-#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_01 (76 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_02 (77 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_03 (78 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_04 (79 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_05 (80 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_06 (81 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_07 (82 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_08 (83 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_09 (84 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_10 (85 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN_11 (86 | (26 << 8))
+#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8))
+#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8))
+#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8))
+#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8))
+#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8))
#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8))
#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8))
@@ -570,8 +570,8 @@
#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8))
#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8))
#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8))
-#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (11 | (29 << 8))
-#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (12 | (29 << 8))
+#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8))
+#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8))
// Map Group 30
#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8))
diff --git a/include/constants/moves.h b/include/constants/moves.h
index f3a3acb90..85c02e3da 100644
--- a/include/constants/moves.h
+++ b/include/constants/moves.h
@@ -357,6 +357,6 @@
#define MOVE_DOOM_DESIRE 353
#define MOVE_PSYCHO_BOOST 354
-#define LAST_MOVE_INDEX MOVE_PSYCHO_BOOST
+#define MOVES_COUNT 355
#endif // GUARD_CONSTANTS_MOVES_H
diff --git a/include/constants/opponents.h b/include/constants/opponents.h
index 680a63763..9f74baf67 100644
--- a/include/constants/opponents.h
+++ b/include/constants/opponents.h
@@ -1,860 +1,862 @@
#ifndef GUARD_CONSTANTS_OPPONENTS_H
#define GUARD_CONSTANTS_OPPONENTS_H
-#define OPPONENT_NONE 0
-#define OPPONENT_SAWYER_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_GABRIELLE_1 9
-#define OPPONENT_GRUNT_8 10
-#define OPPONENT_MARCEL 11
-#define OPPONENT_ALBERTO 12
-#define OPPONENT_ED 13
-#define OPPONENT_GRUNT_9 14
-#define OPPONENT_DECLAN 15
-#define OPPONENT_GRUNT_10 16
-#define OPPONENT_GRUNT_11 17
-#define OPPONENT_GRUNT_12 18
-#define OPPONENT_GRUNT_13 19
-#define OPPONENT_GRUNT_14 20
-#define OPPONENT_GRUNT_15 21
-#define OPPONENT_GRUNT_16 22
-#define OPPONENT_GRUNT_17 23
-#define OPPONENT_GRUNT_18 24
-#define OPPONENT_GRUNT_19 25
-#define OPPONENT_GRUNT_20 26
-#define OPPONENT_GRUNT_21 27
-#define OPPONENT_GRUNT_22 28
-#define OPPONENT_FREDRICK 29
-#define OPPONENT_MATT_1 30
-#define OPPONENT_ZANDER 31
-#define OPPONENT_SHELLY_1 32
-#define OPPONENT_SHELLY_2 33
-#define OPPONENT_ARCHIE 34
-#define OPPONENT_LEAH 35
-#define OPPONENT_DAISY 36
-#define OPPONENT_ROSE_1 37
-#define OPPONENT_FELIX 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_AUSTINA 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_BRAXTON 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_ALEXIA 90
-#define OPPONENT_JODY 91
-#define OPPONENT_WENDY 92
-#define OPPONENT_KEIRA 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_DAPHNE 115
-#define OPPONENT_GRUNT_23 116
-#define OPPONENT_CINDY_2 117
-#define OPPONENT_BRIANNA 118
-#define OPPONENT_NAOMI 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_MOLLIE 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_THALIA_1 144
-#define OPPONENT_MARK 145
-#define OPPONENT_GRUNT_24 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_DOMINIK 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_NOLEN 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_SANTIAGO 168
-#define OPPONENT_GILBERT 169
-#define OPPONENT_FRANKLIN 170
-#define OPPONENT_KEVIN 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_TAKAO 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_GRUNT_25 192
-#define OPPONENT_GRUNT_26 193
-#define OPPONENT_SHAWN 194
-#define OPPONENT_FERNANDO_1 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_JEFF 202
-#define OPPONENT_AXLE 203
-#define OPPONENT_JACE 204
-#define OPPONENT_KEEGAN 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_BEAU 212
-#define OPPONENT_LARRY 213
-#define OPPONENT_SHANE 214
-#define OPPONENT_JUSTIN 215
-#define OPPONENT_ETHAN_1 216
-#define OPPONENT_AUTUMN 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_JEFFREY_1 226
-#define OPPONENT_DEREK 227
-#define OPPONENT_JEFFREY_2 228
-#define OPPONENT_JEFFREY_3 229
-#define OPPONENT_JEFFREY_4 230
-#define OPPONENT_JEFFREY_5 231
-#define OPPONENT_EDWARD 232
-#define OPPONENT_PRESTON 233
-#define OPPONENT_VIRGIL 234
-#define OPPONENT_BLAKE 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_MICAH 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_1 265
-#define OPPONENT_BRAWLY_1 266
-#define OPPONENT_WATTSON_1 267
-#define OPPONENT_FLANNERY_1 268
-#define OPPONENT_NORMAN_1 269
-#define OPPONENT_WINONA_1 270
-#define OPPONENT_TATE_AND_LIZA_1 271
-#define OPPONENT_JUAN_1 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_BETHANY 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_QUINCY 324
-#define OPPONENT_KATELYNN 325
-#define OPPONENT_JAYLEN 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_WALLACE 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_CAMDEN 374
-#define OPPONENT_DEMETRIUS 375
-#define OPPONENT_ISAIAH_1 376
-#define OPPONENT_PABLO_1 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_ISOBEL 383
-#define OPPONENT_DONNY 384
-#define OPPONENT_TALIA 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_HUMBERTO 402
-#define OPPONENT_PRESLEY 403
-#define OPPONENT_EDWARDO 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_DIANNE 417
-#define OPPONENT_JANI 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_JOCELYN 425
-#define OPPONENT_LAURA 426
-#define OPPONENT_CYNDY_1 427
-#define OPPONENT_CORA 428
-#define OPPONENT_PAULA 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_IMANI 442
-#define OPPONENT_KYLA 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_SIENNA 459
-#define OPPONENT_DEBRA 460
-#define OPPONENT_LINDA 461
-#define OPPONENT_KAYLEE 462
-#define OPPONENT_LAUREL 463
-#define OPPONENT_CARLEE 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_CEDRIC 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_ELI 501
-#define OPPONENT_ANNIKA 502
-#define OPPONENT_JAZMYN 503
-#define OPPONENT_JONAS 504
-#define OPPONENT_KAYLEY 505
-#define OPPONENT_AURON 506
-#define OPPONENT_KELVIN 507
-#define OPPONENT_MARLEY 508
-#define OPPONENT_REYNA 509
-#define OPPONENT_HUDSON 510
-#define OPPONENT_CONOR 511
-#define OPPONENT_EDWIN_1 512
-#define OPPONENT_HECTOR 513
-#define OPPONENT_TABITHA_1 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_DAVIS 539
-#define OPPONENT_MITCHELL 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_HALLE 546
-#define OPPONENT_GARRISON 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_LORENZO 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_JULIO 566
-#define OPPONENT_GRUNT_27 567
-#define OPPONENT_GRUNT_28 568
-#define OPPONENT_GRUNT_29 569
-#define OPPONENT_GRUNT_30 570
-#define OPPONENT_MARC 571
-#define OPPONENT_BRENDEN 572
-#define OPPONENT_LILITH 573
-#define OPPONENT_CRISTIAN 574
-#define OPPONENT_SYLVIA 575
-#define OPPONENT_LEONARDO 576
-#define OPPONENT_ATHENA 577
-#define OPPONENT_HARRISON 578
-#define OPPONENT_GRUNT_31 579
-#define OPPONENT_CLARENCE 580
-#define OPPONENT_TERRY 581
-#define OPPONENT_NATE 582
-#define OPPONENT_KATHLEEN 583
-#define OPPONENT_CLIFFORD 584
-#define OPPONENT_NICHOLAS 585
-#define OPPONENT_GRUNT_32 586
-#define OPPONENT_GRUNT_33 587
-#define OPPONENT_GRUNT_34 588
-#define OPPONENT_GRUNT_35 589
-#define OPPONENT_GRUNT_36 590
-#define OPPONENT_MACEY 591
-#define OPPONENT_BRENDAN_10 592
-#define OPPONENT_BRENDAN_11 593
-#define OPPONENT_PAXTON 594
-#define OPPONENT_ISABELLA 595
-#define OPPONENT_GRUNT_37 596
-#define OPPONENT_TABITHA_2 597
-#define OPPONENT_JONATHAN 598
-#define OPPONENT_BRENDAN_12 599
-#define OPPONENT_MAY_10 600
-#define OPPONENT_MAXIE_1 601
-#define OPPONENT_MAXIE_2 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_KIRA_AND_DAN_1 642
-#define OPPONENT_KIRA_AND_DAN_2 643
-#define OPPONENT_KIRA_AND_DAN_3 644
-#define OPPONENT_KIRA_AND_DAN_4 645
-#define OPPONENT_KIRA_AND_DAN_5 646
-#define OPPONENT_JOHANNA 647
-#define OPPONENT_GERALD 648
-#define OPPONENT_VIVIAN 649
-#define OPPONENT_DANIELLE 650
-#define OPPONENT_HIDEO 651
-#define OPPONENT_KEIGO 652
-#define OPPONENT_RILEY 653
-#define OPPONENT_FLINT 654
-#define OPPONENT_ASHLEY 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_13 661
-#define OPPONENT_BRENDAN_14 662
-#define OPPONENT_BRENDAN_15 663
-#define OPPONENT_MAY_11 664
-#define OPPONENT_MAY_12 665
-#define OPPONENT_MAY_13 666
-#define OPPONENT_JONAH 667
-#define OPPONENT_HENRY 668
-#define OPPONENT_ROGER 669
-#define OPPONENT_ALEXA 670
-#define OPPONENT_RUBEN 671
-#define OPPONENT_KOJI_1 672
-#define OPPONENT_WAYNE 673
-#define OPPONENT_AIDAN 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_LILA_AND_ROY_1 687
-#define OPPONENT_LILA_AND_ROY_2 688
-#define OPPONENT_LILA_AND_ROY_3 689
-#define OPPONENT_LILA_AND_ROY_4 690
-#define OPPONENT_LILA_AND_ROY_5 691
-#define OPPONENT_LISA_AND_RAY 692
-#define OPPONENT_CHRIS 693
-#define OPPONENT_DAWSON 694
-#define OPPONENT_SARAH 695
-#define OPPONENT_DARIAN 696
-#define OPPONENT_HAILEY 697
-#define OPPONENT_CHANDLER 698
-#define OPPONENT_KALEB 699
-#define OPPONENT_JOSEPH 700
-#define OPPONENT_ALYSSA 701
-#define OPPONENT_MARCOS 702
-#define OPPONENT_RHETT 703
-#define OPPONENT_TYRON 704
-#define OPPONENT_CELINA 705
-#define OPPONENT_BIANCA 706
-#define OPPONENT_HAYDEN 707
-#define OPPONENT_SOPHIE 708
-#define OPPONENT_COBY 709
-#define OPPONENT_LAWRENCE 710
-#define OPPONENT_WYATT 711
-#define OPPONENT_ANGELINA 712
-#define OPPONENT_KAI 713
-#define OPPONENT_CHARLOTTE 714
-#define OPPONENT_DEANDRE 715
-#define OPPONENT_GRUNT_38 716
-#define OPPONENT_GRUNT_39 717
-#define OPPONENT_GRUNT_40 718
-#define OPPONENT_GRUNT_41 719
-#define OPPONENT_GRUNT_42 720
-#define OPPONENT_GRUNT_43 721
-#define OPPONENT_GRUNT_44 722
-#define OPPONENT_GRUNT_45 723
-#define OPPONENT_GRUNT_46 724
-#define OPPONENT_GRUNT_47 725
-#define OPPONENT_GRUNT_48 726
-#define OPPONENT_GRUNT_49 727
-#define OPPONENT_GRUNT_50 728
-#define OPPONENT_GRUNT_51 729
-#define OPPONENT_GRUNT_52 730
-#define OPPONENT_GRUNT_53 731
-#define OPPONENT_TABITHA_3 732
-#define OPPONENT_DARCY 733
-#define OPPONENT_MAXIE_3 734
-#define OPPONENT_PETE 735
-#define OPPONENT_ISABELLE 736
-#define OPPONENT_ANDRES_1 737
-#define OPPONENT_JOSUE 738
-#define OPPONENT_CAMRON 739
-#define OPPONENT_CORY_1 740
-#define OPPONENT_CAROLINA 741
-#define OPPONENT_ELIJAH 742
-#define OPPONENT_CELIA 743
-#define OPPONENT_BRYAN 744
-#define OPPONENT_BRANDEN 745
-#define OPPONENT_BRYANT 746
-#define OPPONENT_SHAYLA 747
-#define OPPONENT_KYRA 748
-#define OPPONENT_JAIDEN 749
-#define OPPONENT_ALIX 750
-#define OPPONENT_HELENE 751
-#define OPPONENT_MARLENE 752
-#define OPPONENT_DEVAN 753
-#define OPPONENT_JOHNSON 754
-#define OPPONENT_MELINA 755
-#define OPPONENT_BRANDI 756
-#define OPPONENT_AISHA 757
-#define OPPONENT_MAKAYLA 758
-#define OPPONENT_FABIAN 759
-#define OPPONENT_DAYTON 760
-#define OPPONENT_RACHEL 761
-#define OPPONENT_LEONEL 762
-#define OPPONENT_CALLIE 763
-#define OPPONENT_CALE 764
-#define OPPONENT_MYLES 765
-#define OPPONENT_PAT 766
-#define OPPONENT_CRISTIN_1 767
-#define OPPONENT_MAY_14 768
-#define OPPONENT_MAY_15 769
-#define OPPONENT_ROXANNE_2 770
-#define OPPONENT_ROXANNE_3 771
-#define OPPONENT_ROXANNE_4 772
-#define OPPONENT_ROXANNE_5 773
-#define OPPONENT_BRAWLY_2 774
-#define OPPONENT_BRAWLY_3 775
-#define OPPONENT_BRAWLY_4 776
-#define OPPONENT_BRAWLY_5 777
-#define OPPONENT_WATTSON_2 778
-#define OPPONENT_WATTSON_3 779
-#define OPPONENT_WATTSON_4 780
-#define OPPONENT_WATTSON_5 781
-#define OPPONENT_FLANNERY_2 782
-#define OPPONENT_FLANNERY_3 783
-#define OPPONENT_FLANNERY_4 784
-#define OPPONENT_FLANNERY_5 785
-#define OPPONENT_NORMAN_2 786
-#define OPPONENT_NORMAN_3 787
-#define OPPONENT_NORMAN_4 788
-#define OPPONENT_NORMAN_5 789
-#define OPPONENT_WINONA_2 790
-#define OPPONENT_WINONA_3 791
-#define OPPONENT_WINONA_4 792
-#define OPPONENT_WINONA_5 793
-#define OPPONENT_TATE_AND_LIZA_2 794
-#define OPPONENT_TATE_AND_LIZA_3 795
-#define OPPONENT_TATE_AND_LIZA_4 796
-#define OPPONENT_TATE_AND_LIZA_5 797
-#define OPPONENT_JUAN_2 798
-#define OPPONENT_JUAN_3 799
-#define OPPONENT_JUAN_4 800
-#define OPPONENT_JUAN_5 801
-#define OPPONENT_ANGELO 802
-#define OPPONENT_DARIUS 803
-#define OPPONENT_STEVEN 804
-#define OPPONENT_ANABEL 805
-#define OPPONENT_TUCKER 806
-#define OPPONENT_SPENSER 807
-#define OPPONENT_GRETA 808
-#define OPPONENT_NOLAND 809
-#define OPPONENT_LUCY 810
-#define OPPONENT_BRANDON 811
-#define OPPONENT_ANDRES_2 812
-#define OPPONENT_ANDRES_3 813
-#define OPPONENT_ANDRES_4 814
-#define OPPONENT_ANDRES_5 815
-#define OPPONENT_CORY_2 816
-#define OPPONENT_CORY_3 817
-#define OPPONENT_CORY_4 818
-#define OPPONENT_CORY_5 819
-#define OPPONENT_PABLO_2 820
-#define OPPONENT_PABLO_3 821
-#define OPPONENT_PABLO_4 822
-#define OPPONENT_PABLO_5 823
-#define OPPONENT_KOJI_2 824
-#define OPPONENT_KOJI_3 825
-#define OPPONENT_KOJI_4 826
-#define OPPONENT_KOJI_5 827
-#define OPPONENT_CRISTIN_2 828
-#define OPPONENT_CRISTIN_3 829
-#define OPPONENT_CRISTIN_4 830
-#define OPPONENT_CRISTIN_5 831
-#define OPPONENT_FERNANDO_2 832
-#define OPPONENT_FERNANDO_3 833
-#define OPPONENT_FERNANDO_4 834
-#define OPPONENT_FERNANDO_5 835
-#define OPPONENT_SAWYER_2 836
-#define OPPONENT_SAWYER_3 837
-#define OPPONENT_SAWYER_4 838
-#define OPPONENT_SAWYER_5 839
-#define OPPONENT_GABRIELLE_2 840
-#define OPPONENT_GABRIELLE_3 841
-#define OPPONENT_GABRIELLE_4 842
-#define OPPONENT_GABRIELLE_5 843
-#define OPPONENT_THALIA_2 844
-#define OPPONENT_THALIA_3 845
-#define OPPONENT_THALIA_4 846
-#define OPPONENT_THALIA_5 847
-#define OPPONENT_MARIELA 848
-#define OPPONENT_ALVARO 848
-#define OPPONENT_EVERETT 850
-#define OPPONENT_RED 851
-#define OPPONENT_LEAF 852
-#define OPPONENT_BRENDAN_16 853
-#define OPPONENT_MAY_16 854
+#define TRAINER_NONE 0
+#define TRAINER_SAWYER_1 1
+#define TRAINER_GRUNT_1 2
+#define TRAINER_GRUNT_2 3
+#define TRAINER_GRUNT_3 4
+#define TRAINER_GRUNT_4 5
+#define TRAINER_GRUNT_5 6
+#define TRAINER_GRUNT_6 7
+#define TRAINER_GRUNT_7 8
+#define TRAINER_GABRIELLE_1 9
+#define TRAINER_GRUNT_8 10
+#define TRAINER_MARCEL 11
+#define TRAINER_ALBERTO 12
+#define TRAINER_ED 13
+#define TRAINER_GRUNT_9 14
+#define TRAINER_DECLAN 15
+#define TRAINER_GRUNT_10 16
+#define TRAINER_GRUNT_11 17
+#define TRAINER_GRUNT_12 18
+#define TRAINER_GRUNT_13 19
+#define TRAINER_GRUNT_14 20
+#define TRAINER_GRUNT_15 21
+#define TRAINER_GRUNT_16 22
+#define TRAINER_GRUNT_17 23
+#define TRAINER_GRUNT_18 24
+#define TRAINER_GRUNT_19 25
+#define TRAINER_GRUNT_20 26
+#define TRAINER_GRUNT_21 27
+#define TRAINER_GRUNT_22 28
+#define TRAINER_FREDRICK 29
+#define TRAINER_MATT 30
+#define TRAINER_ZANDER 31
+#define TRAINER_SHELLY_1 32
+#define TRAINER_SHELLY_2 33
+#define TRAINER_ARCHIE 34
+#define TRAINER_LEAH 35
+#define TRAINER_DAISY 36
+#define TRAINER_ROSE_1 37
+#define TRAINER_FELIX 38
+#define TRAINER_VIOLET 39
+#define TRAINER_ROSE_2 40
+#define TRAINER_ROSE_3 41
+#define TRAINER_ROSE_4 42
+#define TRAINER_ROSE_5 43
+#define TRAINER_DUSTY_1 44
+#define TRAINER_CHIP 45
+#define TRAINER_FOSTER 46
+#define TRAINER_DUSTY_2 47
+#define TRAINER_DUSTY_3 48
+#define TRAINER_DUSTY_4 49
+#define TRAINER_DUSTY_5 50
+#define TRAINER_GABBY_AND_TY_1 51
+#define TRAINER_GABBY_AND_TY_2 52
+#define TRAINER_GABBY_AND_TY_3 53
+#define TRAINER_GABBY_AND_TY_4 54
+#define TRAINER_GABBY_AND_TY_5 55
+#define TRAINER_GABBY_AND_TY_6 56
+#define TRAINER_LOLA_1 57
+#define TRAINER_AUSTINA 58
+#define TRAINER_GWEN 59
+#define TRAINER_LOLA_2 60
+#define TRAINER_LOLA_3 61
+#define TRAINER_LOLA_4 62
+#define TRAINER_LOLA_5 63
+#define TRAINER_RICKY_1 64
+#define TRAINER_SIMON 65
+#define TRAINER_CHARLIE 66
+#define TRAINER_RICKY_2 67
+#define TRAINER_RICKY_3 68
+#define TRAINER_RICKY_4 69
+#define TRAINER_RICKY_5 70
+#define TRAINER_RANDALL 71
+#define TRAINER_PARKER 72
+#define TRAINER_GEORGE 73
+#define TRAINER_BERKE 74
+#define TRAINER_BRAXTON 75
+#define TRAINER_VINCENT 76
+#define TRAINER_LEROY 77
+#define TRAINER_WILTON_1 78
+#define TRAINER_EDGAR 79
+#define TRAINER_ALBERT 80
+#define TRAINER_SAMUEL 81
+#define TRAINER_VITO 82
+#define TRAINER_OWEN 83
+#define TRAINER_WILTON_2 84
+#define TRAINER_WILTON_3 85
+#define TRAINER_WILTON_4 86
+#define TRAINER_WILTON_5 87
+#define TRAINER_WARREN 88
+#define TRAINER_MARY 89
+#define TRAINER_ALEXIA 90
+#define TRAINER_JODY 91
+#define TRAINER_WENDY 92
+#define TRAINER_KEIRA 93
+#define TRAINER_BROOKE_1 94
+#define TRAINER_JENNIFER 95
+#define TRAINER_HOPE 96
+#define TRAINER_SHANNON 97
+#define TRAINER_MICHELLE 98
+#define TRAINER_CAROLINE 99
+#define TRAINER_JULIE 100
+#define TRAINER_BROOKE_2 101
+#define TRAINER_BROOKE_3 102
+#define TRAINER_BROOKE_4 103
+#define TRAINER_BROOKE_5 104
+#define TRAINER_PATRICIA 105
+#define TRAINER_KINDRA 106
+#define TRAINER_TAMMY 107
+#define TRAINER_VALERIE_1 108
+#define TRAINER_TASHA 109
+#define TRAINER_VALERIE_2 110
+#define TRAINER_VALERIE_3 111
+#define TRAINER_VALERIE_4 112
+#define TRAINER_VALERIE_5 113
+#define TRAINER_CINDY_1 114
+#define TRAINER_DAPHNE 115
+#define TRAINER_GRUNT_23 116
+#define TRAINER_CINDY_2 117
+#define TRAINER_BRIANNA 118
+#define TRAINER_NAOMI 119
+#define TRAINER_CINDY_3 120
+#define TRAINER_CINDY_4 121
+#define TRAINER_CINDY_5 122
+#define TRAINER_CINDY_6 123
+#define TRAINER_MELISSA 124
+#define TRAINER_SHEILA 125
+#define TRAINER_SHIRLEY 126
+#define TRAINER_JESSICA_1 127
+#define TRAINER_CONNIE 128
+#define TRAINER_BRIDGET 129
+#define TRAINER_OLIVIA 130
+#define TRAINER_TIFFANY 131
+#define TRAINER_JESSICA_2 132
+#define TRAINER_JESSICA_3 133
+#define TRAINER_JESSICA_4 134
+#define TRAINER_JESSICA_5 135
+#define TRAINER_WINSTON_1 136
+#define TRAINER_MOLLIE 137
+#define TRAINER_GARRET 138
+#define TRAINER_WINSTON_2 139
+#define TRAINER_WINSTON_3 140
+#define TRAINER_WINSTON_4 141
+#define TRAINER_WINSTON_5 142
+#define TRAINER_STEVE_1 143
+#define TRAINER_THALIA_1 144
+#define TRAINER_MARK 145
+#define TRAINER_GRUNT_24 146
+#define TRAINER_STEVE_2 147
+#define TRAINER_STEVE_3 148
+#define TRAINER_STEVE_4 149
+#define TRAINER_STEVE_5 150
+#define TRAINER_LUIS 151
+#define TRAINER_DOMINIK 152
+#define TRAINER_DOUGLAS 153
+#define TRAINER_DARRIN 154
+#define TRAINER_TONY_1 155
+#define TRAINER_JEROME 156
+#define TRAINER_MATTHEW 157
+#define TRAINER_DAVID 158
+#define TRAINER_SPENCER 159
+#define TRAINER_ROLAND 160
+#define TRAINER_NOLEN 161
+#define TRAINER_STAN 162
+#define TRAINER_BARRY 163
+#define TRAINER_DEAN 164
+#define TRAINER_RODNEY 165
+#define TRAINER_RICHARD 166
+#define TRAINER_HERMAN 167
+#define TRAINER_SANTIAGO 168
+#define TRAINER_GILBERT 169
+#define TRAINER_FRANKLIN 170
+#define TRAINER_KEVIN 171
+#define TRAINER_JACK 172
+#define TRAINER_DUDLEY 173
+#define TRAINER_CHAD 174
+#define TRAINER_TONY_2 175
+#define TRAINER_TONY_3 176
+#define TRAINER_TONY_4 177
+#define TRAINER_TONY_5 178
+#define TRAINER_TAKAO 179
+#define TRAINER_HITOSHI 180
+#define TRAINER_KIYO 181
+#define TRAINER_KOICHI 182
+#define TRAINER_NOB_1 183
+#define TRAINER_NOB_2 184
+#define TRAINER_NOB_3 185
+#define TRAINER_NOB_4 186
+#define TRAINER_NOB_5 187
+#define TRAINER_YUJI 188
+#define TRAINER_DAISUKE 189
+#define TRAINER_ATSUSHI 190
+#define TRAINER_KIRK 191
+#define TRAINER_GRUNT_25 192
+#define TRAINER_GRUNT_26 193
+#define TRAINER_SHAWN 194
+#define TRAINER_FERNANDO_1 195
+#define TRAINER_DALTON_1 196
+#define TRAINER_DALTON_2 197
+#define TRAINER_DALTON_3 198
+#define TRAINER_DALTON_4 199
+#define TRAINER_DALTON_5 200
+#define TRAINER_COLE 201
+#define TRAINER_JEFF 202
+#define TRAINER_AXLE 203
+#define TRAINER_JACE 204
+#define TRAINER_KEEGAN 205
+#define TRAINER_BERNIE_1 206
+#define TRAINER_BERNIE_2 207
+#define TRAINER_BERNIE_3 208
+#define TRAINER_BERNIE_4 209
+#define TRAINER_BERNIE_5 210
+#define TRAINER_DREW 211
+#define TRAINER_BEAU 212
+#define TRAINER_LARRY 213
+#define TRAINER_SHANE 214
+#define TRAINER_JUSTIN 215
+#define TRAINER_ETHAN_1 216
+#define TRAINER_AUTUMN 217
+#define TRAINER_TRAVIS 218
+#define TRAINER_ETHAN_2 219
+#define TRAINER_ETHAN_3 220
+#define TRAINER_ETHAN_4 221
+#define TRAINER_ETHAN_5 222
+#define TRAINER_BRENT 223
+#define TRAINER_DONALD 224
+#define TRAINER_TAYLOR 225
+#define TRAINER_JEFFREY_1 226
+#define TRAINER_DEREK 227
+#define TRAINER_JEFFREY_2 228
+#define TRAINER_JEFFREY_3 229
+#define TRAINER_JEFFREY_4 230
+#define TRAINER_JEFFREY_5 231
+#define TRAINER_EDWARD 232
+#define TRAINER_PRESTON 233
+#define TRAINER_VIRGIL 234
+#define TRAINER_BLAKE 235
+#define TRAINER_WILLIAM 236
+#define TRAINER_JOSHUA 237
+#define TRAINER_CAMERON_1 238
+#define TRAINER_CAMERON_2 239
+#define TRAINER_CAMERON_3 240
+#define TRAINER_CAMERON_4 241
+#define TRAINER_CAMERON_5 242
+#define TRAINER_JACLYN 243
+#define TRAINER_HANNAH 244
+#define TRAINER_SAMANTHA 245
+#define TRAINER_MAURA 246
+#define TRAINER_KAYLA 247
+#define TRAINER_ALEXIS 248
+#define TRAINER_JACKI_1 249
+#define TRAINER_JACKI_2 250
+#define TRAINER_JACKI_3 251
+#define TRAINER_JACKI_4 252
+#define TRAINER_JACKI_5 253
+#define TRAINER_WALTER_1 254
+#define TRAINER_MICAH 255
+#define TRAINER_THOMAS 256
+#define TRAINER_WALTER_2 257
+#define TRAINER_WALTER_3 258
+#define TRAINER_WALTER_4 259
+#define TRAINER_WALTER_5 260
+#define TRAINER_SIDNEY 261
+#define TRAINER_PHOEBE 262
+#define TRAINER_GLACIA 263
+#define TRAINER_DRAKE 264
+#define TRAINER_ROXANNE_1 265
+#define TRAINER_BRAWLY_1 266
+#define TRAINER_WATTSON_1 267
+#define TRAINER_FLANNERY_1 268
+#define TRAINER_NORMAN_1 269
+#define TRAINER_WINONA_1 270
+#define TRAINER_TATE_AND_LIZA_1 271
+#define TRAINER_JUAN_1 272
+#define TRAINER_JERRY_1 273
+#define TRAINER_TED 274
+#define TRAINER_PAUL 275
+#define TRAINER_JERRY_2 276
+#define TRAINER_JERRY_3 277
+#define TRAINER_JERRY_4 278
+#define TRAINER_JERRY_5 279
+#define TRAINER_KAREN_1 280
+#define TRAINER_GEORGIA 281
+#define TRAINER_KAREN_2 282
+#define TRAINER_KAREN_3 283
+#define TRAINER_KAREN_4 284
+#define TRAINER_KAREN_5 285
+#define TRAINER_KATE_AND_JOY 286
+#define TRAINER_ANNA_AND_MEG_1 287
+#define TRAINER_ANNA_AND_MEG_2 288
+#define TRAINER_ANNA_AND_MEG_3 289
+#define TRAINER_ANNA_AND_MEG_4 290
+#define TRAINER_ANNA_AND_MEG_5 291
+#define TRAINER_VICTOR 292
+#define TRAINER_MIGUEL_1 293
+#define TRAINER_COLTON 294
+#define TRAINER_MIGUEL_2 295
+#define TRAINER_MIGUEL_3 296
+#define TRAINER_MIGUEL_4 297
+#define TRAINER_MIGUEL_5 298
+#define TRAINER_VICTORIA 299
+#define TRAINER_VANESSA 300
+#define TRAINER_BETHANY 301
+#define TRAINER_ISABEL_1 302
+#define TRAINER_ISABEL_2 303
+#define TRAINER_ISABEL_3 304
+#define TRAINER_ISABEL_4 305
+#define TRAINER_ISABEL_5 306
+#define TRAINER_TIMOTHY_1 307
+#define TRAINER_TIMOTHY_2 308
+#define TRAINER_TIMOTHY_3 309
+#define TRAINER_TIMOTHY_4 310
+#define TRAINER_TIMOTHY_5 311
+#define TRAINER_VICKY 312
+#define TRAINER_SHELBY_1 313
+#define TRAINER_SHELBY_2 314
+#define TRAINER_SHELBY_3 315
+#define TRAINER_SHELBY_4 316
+#define TRAINER_SHELBY_5 317
+#define TRAINER_CALVIN_1 318
+#define TRAINER_BILLY 319
+#define TRAINER_JOSH 320
+#define TRAINER_TOMMY 321
+#define TRAINER_JOEY 322
+#define TRAINER_BEN 323
+#define TRAINER_QUINCY 324
+#define TRAINER_KATELYNN 325
+#define TRAINER_JAYLEN 326
+#define TRAINER_DILLON 327
+#define TRAINER_CALVIN_2 328
+#define TRAINER_CALVIN_3 329
+#define TRAINER_CALVIN_4 330
+#define TRAINER_CALVIN_5 331
+#define TRAINER_EDDIE 332
+#define TRAINER_ALLEN 333
+#define TRAINER_TIMMY 334
+#define TRAINER_WALLACE 335
+#define TRAINER_ANDREW 336
+#define TRAINER_IVAN 337
+#define TRAINER_CLAUDE 338
+#define TRAINER_ELLIOT_1 339
+#define TRAINER_NED 340
+#define TRAINER_DALE 341
+#define TRAINER_NOLAN 342
+#define TRAINER_BARNY 343
+#define TRAINER_WADE 344
+#define TRAINER_CARTER 345
+#define TRAINER_ELLIOT_2 346
+#define TRAINER_ELLIOT_3 347
+#define TRAINER_ELLIOT_4 348
+#define TRAINER_ELLIOT_5 349
+#define TRAINER_RONALD 350
+#define TRAINER_JACOB 351
+#define TRAINER_ANTHONY 352
+#define TRAINER_BENJAMIN_1 353
+#define TRAINER_BENJAMIN_2 354
+#define TRAINER_BENJAMIN_3 355
+#define TRAINER_BENJAMIN_4 356
+#define TRAINER_BENJAMIN_5 357
+#define TRAINER_ABIGAIL_1 358
+#define TRAINER_JASMINE 359
+#define TRAINER_ABIGAIL_2 360
+#define TRAINER_ABIGAIL_3 361
+#define TRAINER_ABIGAIL_4 362
+#define TRAINER_ABIGAIL_5 363
+#define TRAINER_DYLAN_1 364
+#define TRAINER_DYLAN_2 365
+#define TRAINER_DYLAN_3 366
+#define TRAINER_DYLAN_4 367
+#define TRAINER_DYLAN_5 368
+#define TRAINER_MARIA_1 369
+#define TRAINER_MARIA_2 370
+#define TRAINER_MARIA_3 371
+#define TRAINER_MARIA_4 372
+#define TRAINER_MARIA_5 373
+#define TRAINER_CAMDEN 374
+#define TRAINER_DEMETRIUS 375
+#define TRAINER_ISAIAH_1 376
+#define TRAINER_PABLO_1 377
+#define TRAINER_CHASE 378
+#define TRAINER_ISAIAH_2 379
+#define TRAINER_ISAIAH_3 380
+#define TRAINER_ISAIAH_4 381
+#define TRAINER_ISAIAH_5 382
+#define TRAINER_ISOBEL 383
+#define TRAINER_DONNY 384
+#define TRAINER_TALIA 385
+#define TRAINER_KATELYN_1 386
+#define TRAINER_ALLISON 387
+#define TRAINER_KATELYN_2 388
+#define TRAINER_KATELYN_3 389
+#define TRAINER_KATELYN_4 390
+#define TRAINER_KATELYN_5 391
+#define TRAINER_NICOLAS_1 392
+#define TRAINER_NICOLAS_2 393
+#define TRAINER_NICOLAS_3 394
+#define TRAINER_NICOLAS_4 395
+#define TRAINER_NICOLAS_5 396
+#define TRAINER_AARON 397
+#define TRAINER_PERRY 398
+#define TRAINER_HUGH 399
+#define TRAINER_PHIL 400
+#define TRAINER_JARED 401
+#define TRAINER_HUMBERTO 402
+#define TRAINER_PRESLEY 403
+#define TRAINER_EDWARDO 404
+#define TRAINER_COLIN 405
+#define TRAINER_ROBERT_1 406
+#define TRAINER_BENNY 407
+#define TRAINER_CHESTER 408
+#define TRAINER_ROBERT_2 409
+#define TRAINER_ROBERT_3 410
+#define TRAINER_ROBERT_4 411
+#define TRAINER_ROBERT_5 412
+#define TRAINER_ALEX 413
+#define TRAINER_BECK 414
+#define TRAINER_YASU 415
+#define TRAINER_TAKASHI 416
+#define TRAINER_DIANNE 417
+#define TRAINER_JANI 418
+#define TRAINER_LAO_1 419
+#define TRAINER_LUNG 420
+#define TRAINER_LAO_2 421
+#define TRAINER_LAO_3 422
+#define TRAINER_LAO_4 423
+#define TRAINER_LAO_5 424
+#define TRAINER_JOCELYN 425
+#define TRAINER_LAURA 426
+#define TRAINER_CYNDY_1 427
+#define TRAINER_CORA 428
+#define TRAINER_PAULA 429
+#define TRAINER_CYNDY_2 430
+#define TRAINER_CYNDY_3 431
+#define TRAINER_CYNDY_4 432
+#define TRAINER_CYNDY_5 433
+#define TRAINER_MADELINE_1 434
+#define TRAINER_CLARISSA 435
+#define TRAINER_ANGELICA 436
+#define TRAINER_MADELINE_2 437
+#define TRAINER_MADELINE_3 438
+#define TRAINER_MADELINE_4 439
+#define TRAINER_MADELINE_5 440
+#define TRAINER_BEVERLY 441
+#define TRAINER_IMANI 442
+#define TRAINER_KYLA 443
+#define TRAINER_DENISE 444
+#define TRAINER_BETH 445
+#define TRAINER_TARA 446
+#define TRAINER_MISSY 447
+#define TRAINER_ALICE 448
+#define TRAINER_JENNY_1 449
+#define TRAINER_GRACE 450
+#define TRAINER_TANYA 451
+#define TRAINER_SHARON 452
+#define TRAINER_NIKKI 453
+#define TRAINER_BRENDA 454
+#define TRAINER_KATIE 455
+#define TRAINER_SUSIE 456
+#define TRAINER_KARA 457
+#define TRAINER_DANA 458
+#define TRAINER_SIENNA 459
+#define TRAINER_DEBRA 460
+#define TRAINER_LINDA 461
+#define TRAINER_KAYLEE 462
+#define TRAINER_LAUREL 463
+#define TRAINER_CARLEE 464
+#define TRAINER_JENNY_2 465
+#define TRAINER_JENNY_3 466
+#define TRAINER_JENNY_4 467
+#define TRAINER_JENNY_5 468
+#define TRAINER_HEIDI 469
+#define TRAINER_BECKY 470
+#define TRAINER_CAROL 471
+#define TRAINER_NANCY 472
+#define TRAINER_MARTHA 473
+#define TRAINER_DIANA_1 474
+#define TRAINER_CEDRIC 475
+#define TRAINER_IRENE 476
+#define TRAINER_DIANA_2 477
+#define TRAINER_DIANA_3 478
+#define TRAINER_DIANA_4 479
+#define TRAINER_DIANA_5 480
+#define TRAINER_AMY_AND_LIV_1 481
+#define TRAINER_AMY_AND_LIV_2 482
+#define TRAINER_GINA_AND_MIA_1 483
+#define TRAINER_MIU_AND_YUKI 484
+#define TRAINER_AMY_AND_LIV_3 485
+#define TRAINER_GINA_AND_MIA_2 486
+#define TRAINER_AMY_AND_LIV_4 487
+#define TRAINER_AMY_AND_LIV_5 488
+#define TRAINER_AMY_AND_LIV_6 489
+#define TRAINER_HUEY 490
+#define TRAINER_EDMOND 491
+#define TRAINER_ERNEST_1 492
+#define TRAINER_DWAYNE 493
+#define TRAINER_PHILLIP 494
+#define TRAINER_LEONARD 495
+#define TRAINER_DUNCAN 496
+#define TRAINER_ERNEST_2 497
+#define TRAINER_ERNEST_3 498
+#define TRAINER_ERNEST_4 499
+#define TRAINER_ERNEST_5 500
+#define TRAINER_ELI 501
+#define TRAINER_ANNIKA 502
+#define TRAINER_JAZMYN 503
+#define TRAINER_JONAS 504
+#define TRAINER_KAYLEY 505
+#define TRAINER_AURON 506
+#define TRAINER_KELVIN 507
+#define TRAINER_MARLEY 508
+#define TRAINER_REYNA 509
+#define TRAINER_HUDSON 510
+#define TRAINER_CONOR 511
+#define TRAINER_EDWIN_1 512
+#define TRAINER_HECTOR 513
+#define TRAINER_TABITHA_1 514
+#define TRAINER_EDWIN_2 515
+#define TRAINER_EDWIN_3 516
+#define TRAINER_EDWIN_4 517
+#define TRAINER_EDWIN_5 518
+#define TRAINER_WALLY_1 519
+#define TRAINER_BRENDAN_1 520
+#define TRAINER_BRENDAN_2 521
+#define TRAINER_BRENDAN_3 522
+#define TRAINER_BRENDAN_4 523
+#define TRAINER_BRENDAN_5 524
+#define TRAINER_BRENDAN_6 525
+#define TRAINER_BRENDAN_7 526
+#define TRAINER_BRENDAN_8 527
+#define TRAINER_BRENDAN_9 528
+#define TRAINER_MAY_1 529
+#define TRAINER_MAY_2 530
+#define TRAINER_MAY_3 531
+#define TRAINER_MAY_4 532
+#define TRAINER_MAY_5 533
+#define TRAINER_MAY_6 534
+#define TRAINER_MAY_7 535
+#define TRAINER_MAY_8 536
+#define TRAINER_MAY_9 537
+#define TRAINER_ISAAC_1 538
+#define TRAINER_DAVIS 539
+#define TRAINER_MITCHELL 540
+#define TRAINER_ISAAC_2 541
+#define TRAINER_ISAAC_3 542
+#define TRAINER_ISAAC_4 543
+#define TRAINER_ISAAC_5 544
+#define TRAINER_LYDIA_1 545
+#define TRAINER_HALLE 546
+#define TRAINER_GARRISON 547
+#define TRAINER_LYDIA_2 548
+#define TRAINER_LYDIA_3 549
+#define TRAINER_LYDIA_4 550
+#define TRAINER_LYDIA_5 551
+#define TRAINER_JACKSON_1 552
+#define TRAINER_LORENZO 553
+#define TRAINER_SEBASTIAN 554
+#define TRAINER_JACKSON_2 555
+#define TRAINER_JACKSON_3 556
+#define TRAINER_JACKSON_4 557
+#define TRAINER_JACKSON_5 558
+#define TRAINER_CATHERINE_1 559
+#define TRAINER_JENNA 560
+#define TRAINER_SOPHIA 561
+#define TRAINER_CATHERINE_2 562
+#define TRAINER_CATHERINE_3 563
+#define TRAINER_CATHERINE_4 564
+#define TRAINER_CATHERINE_5 565
+#define TRAINER_JULIO 566
+#define TRAINER_GRUNT_27 567
+#define TRAINER_GRUNT_28 568
+#define TRAINER_GRUNT_29 569
+#define TRAINER_GRUNT_30 570
+#define TRAINER_MARC 571
+#define TRAINER_BRENDEN 572
+#define TRAINER_LILITH 573
+#define TRAINER_CRISTIAN 574
+#define TRAINER_SYLVIA 575
+#define TRAINER_LEONARDO 576
+#define TRAINER_ATHENA 577
+#define TRAINER_HARRISON 578
+#define TRAINER_GRUNT_31 579
+#define TRAINER_CLARENCE 580
+#define TRAINER_TERRY 581
+#define TRAINER_NATE 582
+#define TRAINER_KATHLEEN 583
+#define TRAINER_CLIFFORD 584
+#define TRAINER_NICHOLAS 585
+#define TRAINER_GRUNT_32 586
+#define TRAINER_GRUNT_33 587
+#define TRAINER_GRUNT_34 588
+#define TRAINER_GRUNT_35 589
+#define TRAINER_GRUNT_36 590
+#define TRAINER_MACEY 591
+#define TRAINER_BRENDAN_10 592
+#define TRAINER_BRENDAN_11 593
+#define TRAINER_PAXTON 594
+#define TRAINER_ISABELLA 595
+#define TRAINER_GRUNT_37 596
+#define TRAINER_TABITHA_2 597
+#define TRAINER_JONATHAN 598
+#define TRAINER_BRENDAN_12 599
+#define TRAINER_MAY_10 600
+#define TRAINER_MAXIE_1 601
+#define TRAINER_MAXIE_2 602
+#define TRAINER_TIANA 603
+#define TRAINER_HALEY_1 604
+#define TRAINER_JANICE 605
+#define TRAINER_VIVI 606
+#define TRAINER_HALEY_2 607
+#define TRAINER_HALEY_3 608
+#define TRAINER_HALEY_4 609
+#define TRAINER_HALEY_5 610
+#define TRAINER_SALLY 611
+#define TRAINER_ROBIN 612
+#define TRAINER_ANDREA 613
+#define TRAINER_CRISSY 614
+#define TRAINER_RICK 615
+#define TRAINER_LYLE 616
+#define TRAINER_JOSE 617
+#define TRAINER_DOUG 618
+#define TRAINER_GREG 619
+#define TRAINER_KENT 620
+#define TRAINER_JAMES_1 621
+#define TRAINER_JAMES_2 622
+#define TRAINER_JAMES_3 623
+#define TRAINER_JAMES_4 624
+#define TRAINER_JAMES_5 625
+#define TRAINER_BRICE 626
+#define TRAINER_TRENT_1 627
+#define TRAINER_LENNY 628
+#define TRAINER_LUCAS_1 629
+#define TRAINER_ALAN 630
+#define TRAINER_CLARK 631
+#define TRAINER_ERIC 632
+#define TRAINER_LUCAS_2 633
+#define TRAINER_MIKE_1 634
+#define TRAINER_MIKE_2 635
+#define TRAINER_TRENT_2 636
+#define TRAINER_TRENT_3 637
+#define TRAINER_TRENT_4 638
+#define TRAINER_TRENT_5 639
+#define TRAINER_DEZ_AND_LUKE 640
+#define TRAINER_LEA_AND_JED 641
+#define TRAINER_KIRA_AND_DAN_1 642
+#define TRAINER_KIRA_AND_DAN_2 643
+#define TRAINER_KIRA_AND_DAN_3 644
+#define TRAINER_KIRA_AND_DAN_4 645
+#define TRAINER_KIRA_AND_DAN_5 646
+#define TRAINER_JOHANNA 647
+#define TRAINER_GERALD 648
+#define TRAINER_VIVIAN 649
+#define TRAINER_DANIELLE 650
+#define TRAINER_HIDEO 651
+#define TRAINER_KEIGO 652
+#define TRAINER_RILEY 653
+#define TRAINER_FLINT 654
+#define TRAINER_ASHLEY 655
+#define TRAINER_WALLY_2 656
+#define TRAINER_WALLY_3 657
+#define TRAINER_WALLY_4 658
+#define TRAINER_WALLY_5 659
+#define TRAINER_WALLY_6 660
+#define TRAINER_BRENDAN_13 661
+#define TRAINER_BRENDAN_14 662
+#define TRAINER_BRENDAN_15 663
+#define TRAINER_MAY_11 664
+#define TRAINER_MAY_12 665
+#define TRAINER_MAY_13 666
+#define TRAINER_JONAH 667
+#define TRAINER_HENRY 668
+#define TRAINER_ROGER 669
+#define TRAINER_ALEXA 670
+#define TRAINER_RUBEN 671
+#define TRAINER_KOJI_1 672
+#define TRAINER_WAYNE 673
+#define TRAINER_AIDAN 674
+#define TRAINER_REED 675
+#define TRAINER_TISHA 676
+#define TRAINER_TORI_AND_TIA 677
+#define TRAINER_KIM_AND_IRIS 678
+#define TRAINER_TYRA_AND_IVY 679
+#define TRAINER_MEL_AND_PAUL 680
+#define TRAINER_JOHN_AND_JAY_1 681
+#define TRAINER_JOHN_AND_JAY_2 682
+#define TRAINER_JOHN_AND_JAY_3 683
+#define TRAINER_JOHN_AND_JAY_4 684
+#define TRAINER_JOHN_AND_JAY_5 685
+#define TRAINER_RELI_AND_IAN 686
+#define TRAINER_LILA_AND_ROY_1 687
+#define TRAINER_LILA_AND_ROY_2 688
+#define TRAINER_LILA_AND_ROY_3 689
+#define TRAINER_LILA_AND_ROY_4 690
+#define TRAINER_LILA_AND_ROY_5 691
+#define TRAINER_LISA_AND_RAY 692
+#define TRAINER_CHRIS 693
+#define TRAINER_DAWSON 694
+#define TRAINER_SARAH 695
+#define TRAINER_DARIAN 696
+#define TRAINER_HAILEY 697
+#define TRAINER_CHANDLER 698
+#define TRAINER_KALEB 699
+#define TRAINER_JOSEPH 700
+#define TRAINER_ALYSSA 701
+#define TRAINER_MARCOS 702
+#define TRAINER_RHETT 703
+#define TRAINER_TYRON 704
+#define TRAINER_CELINA 705
+#define TRAINER_BIANCA 706
+#define TRAINER_HAYDEN 707
+#define TRAINER_SOPHIE 708
+#define TRAINER_COBY 709
+#define TRAINER_LAWRENCE 710
+#define TRAINER_WYATT 711
+#define TRAINER_ANGELINA 712
+#define TRAINER_KAI 713
+#define TRAINER_CHARLOTTE 714
+#define TRAINER_DEANDRE 715
+#define TRAINER_GRUNT_38 716
+#define TRAINER_GRUNT_39 717
+#define TRAINER_GRUNT_40 718
+#define TRAINER_GRUNT_41 719
+#define TRAINER_GRUNT_42 720
+#define TRAINER_GRUNT_43 721
+#define TRAINER_GRUNT_44 722
+#define TRAINER_GRUNT_45 723
+#define TRAINER_GRUNT_46 724
+#define TRAINER_GRUNT_47 725
+#define TRAINER_GRUNT_48 726
+#define TRAINER_GRUNT_49 727
+#define TRAINER_GRUNT_50 728
+#define TRAINER_GRUNT_51 729
+#define TRAINER_GRUNT_52 730
+#define TRAINER_GRUNT_53 731
+#define TRAINER_TABITHA_3 732
+#define TRAINER_DARCY 733
+#define TRAINER_MAXIE_3 734
+#define TRAINER_PETE 735
+#define TRAINER_ISABELLE 736
+#define TRAINER_ANDRES_1 737
+#define TRAINER_JOSUE 738
+#define TRAINER_CAMRON 739
+#define TRAINER_CORY_1 740
+#define TRAINER_CAROLINA 741
+#define TRAINER_ELIJAH 742
+#define TRAINER_CELIA 743
+#define TRAINER_BRYAN 744
+#define TRAINER_BRANDEN 745
+#define TRAINER_BRYANT 746
+#define TRAINER_SHAYLA 747
+#define TRAINER_KYRA 748
+#define TRAINER_JAIDEN 749
+#define TRAINER_ALIX 750
+#define TRAINER_HELENE 751
+#define TRAINER_MARLENE 752
+#define TRAINER_DEVAN 753
+#define TRAINER_JOHNSON 754
+#define TRAINER_MELINA 755
+#define TRAINER_BRANDI 756
+#define TRAINER_AISHA 757
+#define TRAINER_MAKAYLA 758
+#define TRAINER_FABIAN 759
+#define TRAINER_DAYTON 760
+#define TRAINER_RACHEL 761
+#define TRAINER_LEONEL 762
+#define TRAINER_CALLIE 763
+#define TRAINER_CALE 764
+#define TRAINER_MYLES 765
+#define TRAINER_PAT 766
+#define TRAINER_CRISTIN_1 767
+#define TRAINER_MAY_14 768
+#define TRAINER_MAY_15 769
+#define TRAINER_ROXANNE_2 770
+#define TRAINER_ROXANNE_3 771
+#define TRAINER_ROXANNE_4 772
+#define TRAINER_ROXANNE_5 773
+#define TRAINER_BRAWLY_2 774
+#define TRAINER_BRAWLY_3 775
+#define TRAINER_BRAWLY_4 776
+#define TRAINER_BRAWLY_5 777
+#define TRAINER_WATTSON_2 778
+#define TRAINER_WATTSON_3 779
+#define TRAINER_WATTSON_4 780
+#define TRAINER_WATTSON_5 781
+#define TRAINER_FLANNERY_2 782
+#define TRAINER_FLANNERY_3 783
+#define TRAINER_FLANNERY_4 784
+#define TRAINER_FLANNERY_5 785
+#define TRAINER_NORMAN_2 786
+#define TRAINER_NORMAN_3 787
+#define TRAINER_NORMAN_4 788
+#define TRAINER_NORMAN_5 789
+#define TRAINER_WINONA_2 790
+#define TRAINER_WINONA_3 791
+#define TRAINER_WINONA_4 792
+#define TRAINER_WINONA_5 793
+#define TRAINER_TATE_AND_LIZA_2 794
+#define TRAINER_TATE_AND_LIZA_3 795
+#define TRAINER_TATE_AND_LIZA_4 796
+#define TRAINER_TATE_AND_LIZA_5 797
+#define TRAINER_JUAN_2 798
+#define TRAINER_JUAN_3 799
+#define TRAINER_JUAN_4 800
+#define TRAINER_JUAN_5 801
+#define TRAINER_ANGELO 802
+#define TRAINER_DARIUS 803
+#define TRAINER_STEVEN 804
+#define TRAINER_ANABEL 805
+#define TRAINER_TUCKER 806
+#define TRAINER_SPENSER 807
+#define TRAINER_GRETA 808
+#define TRAINER_NOLAND 809
+#define TRAINER_LUCY 810
+#define TRAINER_BRANDON 811
+#define TRAINER_ANDRES_2 812
+#define TRAINER_ANDRES_3 813
+#define TRAINER_ANDRES_4 814
+#define TRAINER_ANDRES_5 815
+#define TRAINER_CORY_2 816
+#define TRAINER_CORY_3 817
+#define TRAINER_CORY_4 818
+#define TRAINER_CORY_5 819
+#define TRAINER_PABLO_2 820
+#define TRAINER_PABLO_3 821
+#define TRAINER_PABLO_4 822
+#define TRAINER_PABLO_5 823
+#define TRAINER_KOJI_2 824
+#define TRAINER_KOJI_3 825
+#define TRAINER_KOJI_4 826
+#define TRAINER_KOJI_5 827
+#define TRAINER_CRISTIN_2 828
+#define TRAINER_CRISTIN_3 829
+#define TRAINER_CRISTIN_4 830
+#define TRAINER_CRISTIN_5 831
+#define TRAINER_FERNANDO_2 832
+#define TRAINER_FERNANDO_3 833
+#define TRAINER_FERNANDO_4 834
+#define TRAINER_FERNANDO_5 835
+#define TRAINER_SAWYER_2 836
+#define TRAINER_SAWYER_3 837
+#define TRAINER_SAWYER_4 838
+#define TRAINER_SAWYER_5 839
+#define TRAINER_GABRIELLE_2 840
+#define TRAINER_GABRIELLE_3 841
+#define TRAINER_GABRIELLE_4 842
+#define TRAINER_GABRIELLE_5 843
+#define TRAINER_THALIA_2 844
+#define TRAINER_THALIA_3 845
+#define TRAINER_THALIA_4 846
+#define TRAINER_THALIA_5 847
+#define TRAINER_MARIELA 848
+#define TRAINER_ALVARO 849
+#define TRAINER_EVERETT 850
+#define TRAINER_RED 851
+#define TRAINER_LEAF 852
+#define TRAINER_BRENDAN_16 853
+#define TRAINER_MAY_16 854
+
+#define TRAINERS_COUNT 855
#endif // GUARD_CONSTANTS_OPPONENTS_H
diff --git a/include/constants/secret_bases.h b/include/constants/secret_bases.h
new file mode 100755
index 000000000..0f51054a8
--- /dev/null
+++ b/include/constants/secret_bases.h
@@ -0,0 +1,110 @@
+#ifndef GUARD_CONSTANTS_SECRET_BASES_H
+#define GUARD_CONSTANTS_SECRET_BASES_H
+
+// Each secret base location is assigned an identifier value.
+// The secret base's map is determined by (id / 10). The ones
+// digit is used to differentiate secret bases using the same map.
+// Therefore, each secret base map can be used by up to 10 different
+// secret bases in the game. These ids are 1-based, but there is no
+// apparent reason for that.
+
+#define SECRET_BASE_RED_CAVE1_1 1
+#define SECRET_BASE_RED_CAVE1_2 2
+#define SECRET_BASE_RED_CAVE1_3 3
+
+#define SECRET_BASE_RED_CAVE2_1 11
+#define SECRET_BASE_RED_CAVE2_2 12
+#define SECRET_BASE_RED_CAVE2_3 13
+
+#define SECRET_BASE_RED_CAVE3_1 21
+#define SECRET_BASE_RED_CAVE3_2 22
+#define SECRET_BASE_RED_CAVE3_3 23
+
+#define SECRET_BASE_RED_CAVE4_1 31
+#define SECRET_BASE_RED_CAVE4_2 32
+#define SECRET_BASE_RED_CAVE4_3 33
+
+#define SECRET_BASE_BROWN_CAVE1_1 41
+#define SECRET_BASE_BROWN_CAVE1_2 42
+#define SECRET_BASE_BROWN_CAVE1_3 43
+
+#define SECRET_BASE_BROWN_CAVE2_1 51
+#define SECRET_BASE_BROWN_CAVE2_2 52
+#define SECRET_BASE_BROWN_CAVE2_3 53
+
+#define SECRET_BASE_BROWN_CAVE3_1 61
+#define SECRET_BASE_BROWN_CAVE3_2 62
+#define SECRET_BASE_BROWN_CAVE3_3 63
+
+#define SECRET_BASE_BROWN_CAVE4_1 71
+#define SECRET_BASE_BROWN_CAVE4_2 72
+#define SECRET_BASE_BROWN_CAVE4_3 73
+
+#define SECRET_BASE_BLUE_CAVE1_1 81
+#define SECRET_BASE_BLUE_CAVE1_2 82
+#define SECRET_BASE_BLUE_CAVE1_3 83
+
+#define SECRET_BASE_BLUE_CAVE2_1 91
+#define SECRET_BASE_BLUE_CAVE2_2 92
+#define SECRET_BASE_BLUE_CAVE2_3 93
+
+#define SECRET_BASE_BLUE_CAVE3_1 101
+#define SECRET_BASE_BLUE_CAVE3_2 102
+#define SECRET_BASE_BLUE_CAVE3_3 103
+
+#define SECRET_BASE_BLUE_CAVE4_1 111
+#define SECRET_BASE_BLUE_CAVE4_2 112
+#define SECRET_BASE_BLUE_CAVE4_3 113
+
+#define SECRET_BASE_YELLOW_CAVE1_1 121
+#define SECRET_BASE_YELLOW_CAVE1_2 122
+#define SECRET_BASE_YELLOW_CAVE1_3 123
+
+#define SECRET_BASE_YELLOW_CAVE2_1 131
+#define SECRET_BASE_YELLOW_CAVE2_2 132
+#define SECRET_BASE_YELLOW_CAVE2_3 133
+
+#define SECRET_BASE_YELLOW_CAVE3_1 141
+#define SECRET_BASE_YELLOW_CAVE3_2 142
+#define SECRET_BASE_YELLOW_CAVE3_3 143
+
+#define SECRET_BASE_YELLOW_CAVE4_1 151
+#define SECRET_BASE_YELLOW_CAVE4_2 152
+#define SECRET_BASE_YELLOW_CAVE4_3 153
+
+#define SECRET_BASE_TREE1_1 161
+#define SECRET_BASE_TREE1_2 162
+#define SECRET_BASE_TREE1_3 163
+#define SECRET_BASE_TREE1_4 164
+
+#define SECRET_BASE_TREE2_1 171
+#define SECRET_BASE_TREE2_2 172
+#define SECRET_BASE_TREE2_3 173
+#define SECRET_BASE_TREE2_4 174
+
+#define SECRET_BASE_TREE3_1 181
+#define SECRET_BASE_TREE3_2 182
+#define SECRET_BASE_TREE3_3 183
+
+#define SECRET_BASE_TREE4_1 191
+#define SECRET_BASE_TREE4_2 192
+#define SECRET_BASE_TREE4_3 193
+
+#define SECRET_BASE_SHRUB1_1 201
+#define SECRET_BASE_SHRUB1_2 202
+#define SECRET_BASE_SHRUB1_3 203
+#define SECRET_BASE_SHRUB1_4 204
+
+#define SECRET_BASE_SHRUB2_1 211
+#define SECRET_BASE_SHRUB2_2 212
+#define SECRET_BASE_SHRUB2_3 213
+
+#define SECRET_BASE_SHRUB3_1 221
+#define SECRET_BASE_SHRUB3_2 222
+#define SECRET_BASE_SHRUB3_3 223
+
+#define SECRET_BASE_SHRUB4_1 231
+#define SECRET_BASE_SHRUB4_2 232
+#define SECRET_BASE_SHRUB4_3 233
+
+#endif // GUARD_CONSTANTS_SECRET_BASES_H
diff --git a/include/constants/trainers.h b/include/constants/trainers.h
index a017b6975..57c7fd523 100644
--- a/include/constants/trainers.h
+++ b/include/constants/trainers.h
@@ -1,863 +1,14 @@
#ifndef GUARD_TRAINERS_H
#define GUARD_TRAINERS_H
-#define TRAINER_NONE 0
-#define TRAINER_SAWYER_1 1
-#define TRAINER_GRUNT_1 2
-#define TRAINER_GRUNT_2 3
-#define TRAINER_GRUNT_3 4
-#define TRAINER_GRUNT_4 5
-#define TRAINER_GRUNT_5 6
-#define TRAINER_GRUNT_6 7
-#define TRAINER_GRUNT_7 8
-#define TRAINER_GABRIELLE_1 9
-#define TRAINER_GRUNT_8 10
-#define TRAINER_MARCEL 11
-#define TRAINER_ALBERTO 12
-#define TRAINER_ED 13
-#define TRAINER_GRUNT_9 14
-#define TRAINER_DECLAN 15
-#define TRAINER_GRUNT_10 16
-#define TRAINER_GRUNT_11 17
-#define TRAINER_GRUNT_12 18
-#define TRAINER_GRUNT_13 19
-#define TRAINER_GRUNT_14 20
-#define TRAINER_GRUNT_15 21
-#define TRAINER_GRUNT_16 22
-#define TRAINER_GRUNT_17 23
-#define TRAINER_GRUNT_18 24
-#define TRAINER_GRUNT_19 25
-#define TRAINER_GRUNT_20 26
-#define TRAINER_GRUNT_21 27
-#define TRAINER_GRUNT_22 28
-#define TRAINER_FREDRICK 29
-#define TRAINER_MATT 30
-#define TRAINER_ZANDER 31
-#define TRAINER_SHELLY_1 32
-#define TRAINER_SHELLY_2 33
-#define TRAINER_ARCHIE 34
-#define TRAINER_LEAH 35
-#define TRAINER_DAISY 36
-#define TRAINER_ROSE_1 37
-#define TRAINER_FELIX 38
-#define TRAINER_VIOLET 39
-#define TRAINER_ROSE_2 40
-#define TRAINER_ROSE_3 41
-#define TRAINER_ROSE_4 42
-#define TRAINER_ROSE_5 43
-#define TRAINER_DUSTY_1 44
-#define TRAINER_CHIP 45
-#define TRAINER_FOSTER 46
-#define TRAINER_DUSTY_2 47
-#define TRAINER_DUSTY_3 48
-#define TRAINER_DUSTY_4 49
-#define TRAINER_DUSTY_5 50
-#define TRAINER_GABBY_AND_TY_1 51
-#define TRAINER_GABBY_AND_TY_2 52
-#define TRAINER_GABBY_AND_TY_3 53
-#define TRAINER_GABBY_AND_TY_4 54
-#define TRAINER_GABBY_AND_TY_5 55
-#define TRAINER_GABBY_AND_TY_6 56
-#define TRAINER_LOLA_1 57
-#define TRAINER_AUSTINA 58
-#define TRAINER_GWEN 59
-#define TRAINER_LOLA_2 60
-#define TRAINER_LOLA_3 61
-#define TRAINER_LOLA_4 62
-#define TRAINER_LOLA_5 63
-#define TRAINER_RICKY_1 64
-#define TRAINER_SIMON 65
-#define TRAINER_CHARLIE 66
-#define TRAINER_RICKY_2 67
-#define TRAINER_RICKY_3 68
-#define TRAINER_RICKY_4 69
-#define TRAINER_RICKY_5 70
-#define TRAINER_RANDALL 71
-#define TRAINER_PARKER 72
-#define TRAINER_GEORGE 73
-#define TRAINER_BERKE 74
-#define TRAINER_BRAXTON 75
-#define TRAINER_VINCENT 76
-#define TRAINER_LEROY 77
-#define TRAINER_WILTON_1 78
-#define TRAINER_EDGAR 79
-#define TRAINER_ALBERT 80
-#define TRAINER_SAMUEL 81
-#define TRAINER_VITO 82
-#define TRAINER_OWEN 83
-#define TRAINER_WILTON_2 84
-#define TRAINER_WILTON_3 85
-#define TRAINER_WILTON_4 86
-#define TRAINER_WILTON_5 87
-#define TRAINER_WARREN 88
-#define TRAINER_MARY 89
-#define TRAINER_ALEXIA 90
-#define TRAINER_JODY 91
-#define TRAINER_WENDY 92
-#define TRAINER_KEIRA 93
-#define TRAINER_BROOKE_1 94
-#define TRAINER_JENNIFER 95
-#define TRAINER_HOPE 96
-#define TRAINER_SHANNON 97
-#define TRAINER_MICHELLE 98
-#define TRAINER_CAROLINE 99
-#define TRAINER_JULIE 100
-#define TRAINER_BROOKE_2 101
-#define TRAINER_BROOKE_3 102
-#define TRAINER_BROOKE_4 103
-#define TRAINER_BROOKE_5 104
-#define TRAINER_PATRICIA 105
-#define TRAINER_KINDRA 106
-#define TRAINER_TAMMY 107
-#define TRAINER_VALERIE_1 108
-#define TRAINER_TASHA 109
-#define TRAINER_VALERIE_2 110
-#define TRAINER_VALERIE_3 111
-#define TRAINER_VALERIE_4 112
-#define TRAINER_VALERIE_5 113
-#define TRAINER_CINDY_1 114
-#define TRAINER_DAPHNE 115
-#define TRAINER_GRUNT_23 116
-#define TRAINER_CINDY_2 117
-#define TRAINER_BRIANNA 118
-#define TRAINER_NAOMI 119
-#define TRAINER_CINDY_3 120
-#define TRAINER_CINDY_4 121
-#define TRAINER_CINDY_5 122
-#define TRAINER_CINDY_6 123
-#define TRAINER_MELISSA 124
-#define TRAINER_SHEILA 125
-#define TRAINER_SHIRLEY 126
-#define TRAINER_JESSICA_1 127
-#define TRAINER_CONNIE 128
-#define TRAINER_BRIDGET 129
-#define TRAINER_OLIVIA 130
-#define TRAINER_TIFFANY 131
-#define TRAINER_JESSICA_2 132
-#define TRAINER_JESSICA_3 133
-#define TRAINER_JESSICA_4 134
-#define TRAINER_JESSICA_5 135
-#define TRAINER_WINSTON_1 136
-#define TRAINER_MOLLIE 137
-#define TRAINER_GARRET 138
-#define TRAINER_WINSTON_2 139
-#define TRAINER_WINSTON_3 140
-#define TRAINER_WINSTON_4 141
-#define TRAINER_WINSTON_5 142
-#define TRAINER_STEVE_1 143
-#define TRAINER_THALIA_1 144
-#define TRAINER_MARK 145
-#define TRAINER_GRUNT_24 146
-#define TRAINER_STEVE_2 147
-#define TRAINER_STEVE_3 148
-#define TRAINER_STEVE_4 149
-#define TRAINER_STEVE_5 150
-#define TRAINER_LUIS 151
-#define TRAINER_DOMINIK 152
-#define TRAINER_DOUGLAS 153
-#define TRAINER_DARRIN 154
-#define TRAINER_TONY_1 155
-#define TRAINER_JEROME 156
-#define TRAINER_MATTHEW 157
-#define TRAINER_DAVID 158
-#define TRAINER_SPENCER 159
-#define TRAINER_ROLAND 160
-#define TRAINER_NOLEN 161
-#define TRAINER_STAN 162
-#define TRAINER_BARRY 163
-#define TRAINER_DEAN 164
-#define TRAINER_RODNEY 165
-#define TRAINER_RICHARD 166
-#define TRAINER_HERMAN 167
-#define TRAINER_SANTIAGO 168
-#define TRAINER_GILBERT 169
-#define TRAINER_FRANKLIN 170
-#define TRAINER_KEVIN 171
-#define TRAINER_JACK 172
-#define TRAINER_DUDLEY 173
-#define TRAINER_CHAD 174
-#define TRAINER_TONY_2 175
-#define TRAINER_TONY_3 176
-#define TRAINER_TONY_4 177
-#define TRAINER_TONY_5 178
-#define TRAINER_TAKAO 179
-#define TRAINER_HITOSHI 180
-#define TRAINER_KIYO 181
-#define TRAINER_KOICHI 182
-#define TRAINER_NOB_1 183
-#define TRAINER_NOB_2 184
-#define TRAINER_NOB_3 185
-#define TRAINER_NOB_4 186
-#define TRAINER_NOB_5 187
-#define TRAINER_YUJI 188
-#define TRAINER_DAISUKE 189
-#define TRAINER_ATSUSHI 190
-#define TRAINER_KIRK 191
-#define TRAINER_GRUNT_25 192
-#define TRAINER_GRUNT_26 193
-#define TRAINER_SHAWN 194
-#define TRAINER_FERNANDO_1 195
-#define TRAINER_DALTON_1 196
-#define TRAINER_DALTON_2 197
-#define TRAINER_DALTON_3 198
-#define TRAINER_DALTON_4 199
-#define TRAINER_DALTON_5 200
-#define TRAINER_COLE 201
-#define TRAINER_JEFF 202
-#define TRAINER_AXLE 203
-#define TRAINER_JACE 204
-#define TRAINER_KEEGAN 205
-#define TRAINER_BERNIE_1 206
-#define TRAINER_BERNIE_2 207
-#define TRAINER_BERNIE_3 208
-#define TRAINER_BERNIE_4 209
-#define TRAINER_BERNIE_5 210
-#define TRAINER_DREW 211
-#define TRAINER_BEAU 212
-#define TRAINER_LARRY 213
-#define TRAINER_SHANE 214
-#define TRAINER_JUSTIN 215
-#define TRAINER_ETHAN_1 216
-#define TRAINER_AUTUMN 217
-#define TRAINER_TRAVIS 218
-#define TRAINER_ETHAN_2 219
-#define TRAINER_ETHAN_3 220
-#define TRAINER_ETHAN_4 221
-#define TRAINER_ETHAN_5 222
-#define TRAINER_BRENT 223
-#define TRAINER_DONALD 224
-#define TRAINER_TAYLOR 225
-#define TRAINER_JEFFREY_1 226
-#define TRAINER_DEREK 227
-#define TRAINER_JEFFREY_2 228
-#define TRAINER_JEFFREY_3 229
-#define TRAINER_JEFFREY_4 230
-#define TRAINER_JEFFREY_5 231
-#define TRAINER_EDWARD 232
-#define TRAINER_PRESTON 233
-#define TRAINER_VIRGIL 234
-#define TRAINER_BLAKE 235
-#define TRAINER_WILLIAM 236
-#define TRAINER_JOSHUA 237
-#define TRAINER_CAMERON_1 238
-#define TRAINER_CAMERON_2 239
-#define TRAINER_CAMERON_3 240
-#define TRAINER_CAMERON_4 241
-#define TRAINER_CAMERON_5 242
-#define TRAINER_JACLYN 243
-#define TRAINER_HANNAH 244
-#define TRAINER_SAMANTHA 245
-#define TRAINER_MAURA 246
-#define TRAINER_KAYLA 247
-#define TRAINER_ALEXIS 248
-#define TRAINER_JACKI_1 249
-#define TRAINER_JACKI_2 250
-#define TRAINER_JACKI_3 251
-#define TRAINER_JACKI_4 252
-#define TRAINER_JACKI_5 253
-#define TRAINER_WALTER_1 254
-#define TRAINER_MICAH 255
-#define TRAINER_THOMAS 256
-#define TRAINER_WALTER_2 257
-#define TRAINER_WALTER_3 258
-#define TRAINER_WALTER_4 259
-#define TRAINER_WALTER_5 260
-#define TRAINER_SIDNEY 261
-#define TRAINER_PHOEBE 262
-#define TRAINER_GLACIA 263
-#define TRAINER_DRAKE 264
-#define TRAINER_ROXANNE_1 265
-#define TRAINER_BRAWLY_1 266
-#define TRAINER_WATTSON_1 267
-#define TRAINER_FLANNERY_1 268
-#define TRAINER_NORMAN_1 269
-#define TRAINER_WINONA_1 270
-#define TRAINER_TATE_AND_LIZA_1 271
-#define TRAINER_JUAN_1 272
-#define TRAINER_JERRY_1 273
-#define TRAINER_TED 274
-#define TRAINER_PAUL 275
-#define TRAINER_JERRY_2 276
-#define TRAINER_JERRY_3 277
-#define TRAINER_JERRY_4 278
-#define TRAINER_JERRY_5 279
-#define TRAINER_KAREN_1 280
-#define TRAINER_GEORGIA 281
-#define TRAINER_KAREN_2 282
-#define TRAINER_KAREN_3 283
-#define TRAINER_KAREN_4 284
-#define TRAINER_KAREN_5 285
-#define TRAINER_KATE_AND_JOY 286
-#define TRAINER_ANNA_AND_MEG_1 287
-#define TRAINER_ANNA_AND_MEG_2 288
-#define TRAINER_ANNA_AND_MEG_3 289
-#define TRAINER_ANNA_AND_MEG_4 290
-#define TRAINER_ANNA_AND_MEG_5 291
-#define TRAINER_VICTOR 292
-#define TRAINER_MIGUEL_1 293
-#define TRAINER_COLTON 294
-#define TRAINER_MIGUEL_2 295
-#define TRAINER_MIGUEL_3 296
-#define TRAINER_MIGUEL_4 297
-#define TRAINER_MIGUEL_5 298
-#define TRAINER_VICTORIA 299
-#define TRAINER_VANESSA 300
-#define TRAINER_BETHANY 301
-#define TRAINER_ISABEL_1 302
-#define TRAINER_ISABEL_2 303
-#define TRAINER_ISABEL_3 304
-#define TRAINER_ISABEL_4 305
-#define TRAINER_ISABEL_5 306
-#define TRAINER_TIMOTHY_1 307
-#define TRAINER_TIMOTHY_2 308
-#define TRAINER_TIMOTHY_3 309
-#define TRAINER_TIMOTHY_4 310
-#define TRAINER_TIMOTHY_5 311
-#define TRAINER_VICKY 312
-#define TRAINER_SHELBY_1 313
-#define TRAINER_SHELBY_2 314
-#define TRAINER_SHELBY_3 315
-#define TRAINER_SHELBY_4 316
-#define TRAINER_SHELBY_5 317
-#define TRAINER_CALVIN_1 318
-#define TRAINER_BILLY 319
-#define TRAINER_JOSH 320
-#define TRAINER_TOMMY 321
-#define TRAINER_JOEY 322
-#define TRAINER_BEN 323
-#define TRAINER_QUINCY 324
-#define TRAINER_KATELYNN 325
-#define TRAINER_JAYLEN 326
-#define TRAINER_DILLON 327
-#define TRAINER_CALVIN_2 328
-#define TRAINER_CALVIN_3 329
-#define TRAINER_CALVIN_4 330
-#define TRAINER_CALVIN_5 331
-#define TRAINER_EDDIE 332
-#define TRAINER_ALLEN 333
-#define TRAINER_TIMMY 334
-#define TRAINER_WALLACE 335
-#define TRAINER_ANDREW 336
-#define TRAINER_IVAN 337
-#define TRAINER_CLAUDE 338
-#define TRAINER_ELLIOT_1 339
-#define TRAINER_NED 340
-#define TRAINER_DALE 341
-#define TRAINER_NOLAN 342
-#define TRAINER_BARNY 343
-#define TRAINER_WADE 344
-#define TRAINER_CARTER 345
-#define TRAINER_ELLIOT_2 346
-#define TRAINER_ELLIOT_3 347
-#define TRAINER_ELLIOT_4 348
-#define TRAINER_ELLIOT_5 349
-#define TRAINER_RONALD 350
-#define TRAINER_JACOB 351
-#define TRAINER_ANTHONY 352
-#define TRAINER_BENJAMIN_1 353
-#define TRAINER_BENJAMIN_2 354
-#define TRAINER_BENJAMIN_3 355
-#define TRAINER_BENJAMIN_4 356
-#define TRAINER_BENJAMIN_5 357
-#define TRAINER_ABIGAIL_1 358
-#define TRAINER_JASMINE 359
-#define TRAINER_ABIGAIL_2 360
-#define TRAINER_ABIGAIL_3 361
-#define TRAINER_ABIGAIL_4 362
-#define TRAINER_ABIGAIL_5 363
-#define TRAINER_DYLAN_1 364
-#define TRAINER_DYLAN_2 365
-#define TRAINER_DYLAN_3 366
-#define TRAINER_DYLAN_4 367
-#define TRAINER_DYLAN_5 368
-#define TRAINER_MARIA_1 369
-#define TRAINER_MARIA_2 370
-#define TRAINER_MARIA_3 371
-#define TRAINER_MARIA_4 372
-#define TRAINER_MARIA_5 373
-#define TRAINER_CAMDEN 374
-#define TRAINER_DEMETRIUS 375
-#define TRAINER_ISAIAH_1 376
-#define TRAINER_PABLO_1 377
-#define TRAINER_CHASE 378
-#define TRAINER_ISAIAH_2 379
-#define TRAINER_ISAIAH_3 380
-#define TRAINER_ISAIAH_4 381
-#define TRAINER_ISAIAH_5 382
-#define TRAINER_ISOBEL 383
-#define TRAINER_DONNY 384
-#define TRAINER_TALIA 385
-#define TRAINER_KATELYN_1 386
-#define TRAINER_ALLISON 387
-#define TRAINER_KATELYN_2 388
-#define TRAINER_KATELYN_3 389
-#define TRAINER_KATELYN_4 390
-#define TRAINER_KATELYN_5 391
-#define TRAINER_NICOLAS_1 392
-#define TRAINER_NICOLAS_2 393
-#define TRAINER_NICOLAS_3 394
-#define TRAINER_NICOLAS_4 395
-#define TRAINER_NICOLAS_5 396
-#define TRAINER_AARON 397
-#define TRAINER_PERRY 398
-#define TRAINER_HUGH 399
-#define TRAINER_PHIL 400
-#define TRAINER_JARED 401
-#define TRAINER_HUMBERTO 402
-#define TRAINER_PRESLEY 403
-#define TRAINER_EDWARDO 404
-#define TRAINER_COLIN 405
-#define TRAINER_ROBERT_1 406
-#define TRAINER_BENNY 407
-#define TRAINER_CHESTER 408
-#define TRAINER_ROBERT_2 409
-#define TRAINER_ROBERT_3 410
-#define TRAINER_ROBERT_4 411
-#define TRAINER_ROBERT_5 412
-#define TRAINER_ALEX 413
-#define TRAINER_BECK 414
-#define TRAINER_YASU 415
-#define TRAINER_TAKASHI 416
-#define TRAINER_DIANNE 417
-#define TRAINER_JANI 418
-#define TRAINER_LAO_1 419
-#define TRAINER_LUNG 420
-#define TRAINER_LAO_2 421
-#define TRAINER_LAO_3 422
-#define TRAINER_LAO_4 423
-#define TRAINER_LAO_5 424
-#define TRAINER_JOCELYN 425
-#define TRAINER_LAURA 426
-#define TRAINER_CYNDY_1 427
-#define TRAINER_CORA 428
-#define TRAINER_PAULA 429
-#define TRAINER_CYNDY_2 430
-#define TRAINER_CYNDY_3 431
-#define TRAINER_CYNDY_4 432
-#define TRAINER_CYNDY_5 433
-#define TRAINER_MADELINE_1 434
-#define TRAINER_CLARISSA 435
-#define TRAINER_ANGELICA 436
-#define TRAINER_MADELINE_2 437
-#define TRAINER_MADELINE_3 438
-#define TRAINER_MADELINE_4 439
-#define TRAINER_MADELINE_5 440
-#define TRAINER_BEVERLY 441
-#define TRAINER_IMANI 442
-#define TRAINER_KYLA 443
-#define TRAINER_DENISE 444
-#define TRAINER_BETH 445
-#define TRAINER_TARA 446
-#define TRAINER_MISSY 447
-#define TRAINER_ALICE 448
-#define TRAINER_JENNY_1 449
-#define TRAINER_GRACE 450
-#define TRAINER_TANYA 451
-#define TRAINER_SHARON 452
-#define TRAINER_NIKKI 453
-#define TRAINER_BRENDA 454
-#define TRAINER_KATIE 455
-#define TRAINER_SUSIE 456
-#define TRAINER_KARA 457
-#define TRAINER_DANA 458
-#define TRAINER_SIENNA 459
-#define TRAINER_DEBRA 460
-#define TRAINER_LINDA 461
-#define TRAINER_KAYLEE 462
-#define TRAINER_LAUREL 463
-#define TRAINER_CARLEE 464
-#define TRAINER_JENNY_2 465
-#define TRAINER_JENNY_3 466
-#define TRAINER_JENNY_4 467
-#define TRAINER_JENNY_5 468
-#define TRAINER_HEIDI 469
-#define TRAINER_BECKY 470
-#define TRAINER_CAROL 471
-#define TRAINER_NANCY 472
-#define TRAINER_MARTHA 473
-#define TRAINER_DIANA_1 474
-#define TRAINER_CEDRIC 475
-#define TRAINER_IRENE 476
-#define TRAINER_DIANA_2 477
-#define TRAINER_DIANA_3 478
-#define TRAINER_DIANA_4 479
-#define TRAINER_DIANA_5 480
-#define TRAINER_AMY_AND_LIV_1 481
-#define TRAINER_AMY_AND_LIV_2 482
-#define TRAINER_GINA_AND_MIA_1 483
-#define TRAINER_MIU_AND_YUKI 484
-#define TRAINER_AMY_AND_LIV_3 485
-#define TRAINER_GINA_AND_MIA_2 486
-#define TRAINER_AMY_AND_LIV_4 487
-#define TRAINER_AMY_AND_LIV_5 488
-#define TRAINER_AMY_AND_LIV_6 489
-#define TRAINER_HUEY 490
-#define TRAINER_EDMOND 491
-#define TRAINER_ERNEST_1 492
-#define TRAINER_DWAYNE 493
-#define TRAINER_PHILLIP 494
-#define TRAINER_LEONARD 495
-#define TRAINER_DUNCAN 496
-#define TRAINER_ERNEST_2 497
-#define TRAINER_ERNEST_3 498
-#define TRAINER_ERNEST_4 499
-#define TRAINER_ERNEST_5 500
-#define TRAINER_ELI 501
-#define TRAINER_ANNIKA 502
-#define TRAINER_JAZMYN 503
-#define TRAINER_JONAS 504
-#define TRAINER_KAYLEY 505
-#define TRAINER_AURON 506
-#define TRAINER_KELVIN 507
-#define TRAINER_MARLEY 508
-#define TRAINER_REYNA 509
-#define TRAINER_HUDSON 510
-#define TRAINER_CONOR 511
-#define TRAINER_EDWIN_1 512
-#define TRAINER_HECTOR 513
-#define TRAINER_TABITHA_1 514
-#define TRAINER_EDWIN_2 515
-#define TRAINER_EDWIN_3 516
-#define TRAINER_EDWIN_4 517
-#define TRAINER_EDWIN_5 518
-#define TRAINER_WALLY_1 519
-#define TRAINER_BRENDAN_1 520
-#define TRAINER_BRENDAN_2 521
-#define TRAINER_BRENDAN_3 522
-#define TRAINER_BRENDAN_4 523
-#define TRAINER_BRENDAN_5 524
-#define TRAINER_BRENDAN_6 525
-#define TRAINER_BRENDAN_7 526
-#define TRAINER_BRENDAN_8 527
-#define TRAINER_BRENDAN_9 528
-#define TRAINER_MAY_1 529
-#define TRAINER_MAY_2 530
-#define TRAINER_MAY_3 531
-#define TRAINER_MAY_4 532
-#define TRAINER_MAY_5 533
-#define TRAINER_MAY_6 534
-#define TRAINER_MAY_7 535
-#define TRAINER_MAY_8 536
-#define TRAINER_MAY_9 537
-#define TRAINER_ISAAC_1 538
-#define TRAINER_DAVIS 539
-#define TRAINER_MITCHELL 540
-#define TRAINER_ISAAC_2 541
-#define TRAINER_ISAAC_3 542
-#define TRAINER_ISAAC_4 543
-#define TRAINER_ISAAC_5 544
-#define TRAINER_LYDIA_1 545
-#define TRAINER_HALLE 546
-#define TRAINER_GARRISON 547
-#define TRAINER_LYDIA_2 548
-#define TRAINER_LYDIA_3 549
-#define TRAINER_LYDIA_4 550
-#define TRAINER_LYDIA_5 551
-#define TRAINER_JACKSON_1 552
-#define TRAINER_LORENZO 553
-#define TRAINER_SEBASTIAN 554
-#define TRAINER_JACKSON_2 555
-#define TRAINER_JACKSON_3 556
-#define TRAINER_JACKSON_4 557
-#define TRAINER_JACKSON_5 558
-#define TRAINER_CATHERINE_1 559
-#define TRAINER_JENNA 560
-#define TRAINER_SOPHIA 561
-#define TRAINER_CATHERINE_2 562
-#define TRAINER_CATHERINE_3 563
-#define TRAINER_CATHERINE_4 564
-#define TRAINER_CATHERINE_5 565
-#define TRAINER_JULIO 566
-#define TRAINER_GRUNT_27 567
-#define TRAINER_GRUNT_28 568
-#define TRAINER_GRUNT_29 569
-#define TRAINER_GRUNT_30 570
-#define TRAINER_MARC 571
-#define TRAINER_BRENDEN 572
-#define TRAINER_LILITH 573
-#define TRAINER_CRISTIAN 574
-#define TRAINER_SYLVIA 575
-#define TRAINER_LEONARDO 576
-#define TRAINER_ATHENA 577
-#define TRAINER_HARRISON 578
-#define TRAINER_GRUNT_31 579
-#define TRAINER_CLARENCE 580
-#define TRAINER_TERRY 581
-#define TRAINER_NATE 582
-#define TRAINER_KATHLEEN 583
-#define TRAINER_CLIFFORD 584
-#define TRAINER_NICHOLAS 585
-#define TRAINER_GRUNT_32 586
-#define TRAINER_GRUNT_33 587
-#define TRAINER_GRUNT_34 588
-#define TRAINER_GRUNT_35 589
-#define TRAINER_GRUNT_36 590
-#define TRAINER_MACEY 591
-#define TRAINER_BRENDAN_10 592
-#define TRAINER_BRENDAN_11 593
-#define TRAINER_PAXTON 594
-#define TRAINER_ISABELLA 595
-#define TRAINER_GRUNT_37 596
-#define TRAINER_TABITHA_2 597
-#define TRAINER_JONATHAN 598
-#define TRAINER_BRENDAN_12 599
-#define TRAINER_MAY_10 600
-#define TRAINER_MAXIE_1 601
-#define TRAINER_MAXIE_2 602
-#define TRAINER_TIANA 603
-#define TRAINER_HALEY_1 604
-#define TRAINER_JANICE 605
-#define TRAINER_VIVI 606
-#define TRAINER_HALEY_2 607
-#define TRAINER_HALEY_3 608
-#define TRAINER_HALEY_4 609
-#define TRAINER_HALEY_5 610
-#define TRAINER_SALLY 611
-#define TRAINER_ROBIN 612
-#define TRAINER_ANDREA 613
-#define TRAINER_CRISSY 614
-#define TRAINER_RICK 615
-#define TRAINER_LYLE 616
-#define TRAINER_JOSE 617
-#define TRAINER_DOUG 618
-#define TRAINER_GREG 619
-#define TRAINER_KENT 620
-#define TRAINER_JAMES_1 621
-#define TRAINER_JAMES_2 622
-#define TRAINER_JAMES_3 623
-#define TRAINER_JAMES_4 624
-#define TRAINER_JAMES_5 625
-#define TRAINER_BRICE 626
-#define TRAINER_TRENT_1 627
-#define TRAINER_LENNY 628
-#define TRAINER_LUCAS_1 629
-#define TRAINER_ALAN 630
-#define TRAINER_CLARK 631
-#define TRAINER_ERIC 632
-#define TRAINER_LUCAS_2 633
-#define TRAINER_MIKE_1 634
-#define TRAINER_MIKE_2 635
-#define TRAINER_TRENT_2 636
-#define TRAINER_TRENT_3 637
-#define TRAINER_TRENT_4 638
-#define TRAINER_TRENT_5 639
-#define TRAINER_DEZ_AND_LUKE 640
-#define TRAINER_LEA_AND_JED 641
-#define TRAINER_KIRA_AND_DAN_1 642
-#define TRAINER_KIRA_AND_DAN_2 643
-#define TRAINER_KIRA_AND_DAN_3 644
-#define TRAINER_KIRA_AND_DAN_4 645
-#define TRAINER_KIRA_AND_DAN_5 646
-#define TRAINER_JOHANNA 647
-#define TRAINER_GERALD 648
-#define TRAINER_VIVIAN 649
-#define TRAINER_DANIELLE 650
-#define TRAINER_HIDEO 651
-#define TRAINER_KEIGO 652
-#define TRAINER_RILEY 653
-#define TRAINER_FLINT 654
-#define TRAINER_ASHLEY 655
-#define TRAINER_WALLY_2 656
-#define TRAINER_WALLY_3 657
-#define TRAINER_WALLY_4 658
-#define TRAINER_WALLY_5 659
-#define TRAINER_WALLY_6 660
-#define TRAINER_BRENDAN_13 661
-#define TRAINER_BRENDAN_14 662
-#define TRAINER_BRENDAN_15 663
-#define TRAINER_MAY_11 664
-#define TRAINER_MAY_12 665
-#define TRAINER_MAY_13 666
-#define TRAINER_JONAH 667
-#define TRAINER_HENRY 668
-#define TRAINER_ROGER 669
-#define TRAINER_ALEXA 670
-#define TRAINER_RUBEN 671
-#define TRAINER_KOJI_1 672
-#define TRAINER_WAYNE 673
-#define TRAINER_AIDAN 674
-#define TRAINER_REED 675
-#define TRAINER_TISHA 676
-#define TRAINER_TORI_AND_TIA 677
-#define TRAINER_KIM_AND_IRIS 678
-#define TRAINER_TYRA_AND_IVY 679
-#define TRAINER_MEL_AND_PAUL 680
-#define TRAINER_JOHN_AND_JAY_1 681
-#define TRAINER_JOHN_AND_JAY_2 682
-#define TRAINER_JOHN_AND_JAY_3 683
-#define TRAINER_JOHN_AND_JAY_4 684
-#define TRAINER_JOHN_AND_JAY_5 685
-#define TRAINER_RELI_AND_IAN 686
-#define TRAINER_LILA_AND_ROY_1 687
-#define TRAINER_LILA_AND_ROY_2 688
-#define TRAINER_LILA_AND_ROY_3 689
-#define TRAINER_LILA_AND_ROY_4 690
-#define TRAINER_LILA_AND_ROY_5 691
-#define TRAINER_LISA_AND_RAY 692
-#define TRAINER_CHRIS 693
-#define TRAINER_DAWSON 694
-#define TRAINER_SARAH 695
-#define TRAINER_DARIAN 696
-#define TRAINER_HAILEY 697
-#define TRAINER_CHANDLER 698
-#define TRAINER_KALEB 699
-#define TRAINER_JOSEPH 700
-#define TRAINER_ALYSSA 701
-#define TRAINER_MARCOS 702
-#define TRAINER_RHETT 703
-#define TRAINER_TYRON 704
-#define TRAINER_CELINA 705
-#define TRAINER_BIANCA 706
-#define TRAINER_HAYDEN 707
-#define TRAINER_SOPHIE 708
-#define TRAINER_COBY 709
-#define TRAINER_LAWRENCE 710
-#define TRAINER_WYATT 711
-#define TRAINER_ANGELINA 712
-#define TRAINER_KAI 713
-#define TRAINER_CHARLOTTE 714
-#define TRAINER_DEANDRE 715
-#define TRAINER_GRUNT_38 716
-#define TRAINER_GRUNT_39 717
-#define TRAINER_GRUNT_40 718
-#define TRAINER_GRUNT_41 719
-#define TRAINER_GRUNT_42 720
-#define TRAINER_GRUNT_43 721
-#define TRAINER_GRUNT_44 722
-#define TRAINER_GRUNT_45 723
-#define TRAINER_GRUNT_46 724
-#define TRAINER_GRUNT_47 725
-#define TRAINER_GRUNT_48 726
-#define TRAINER_GRUNT_49 727
-#define TRAINER_GRUNT_50 728
-#define TRAINER_GRUNT_51 729
-#define TRAINER_GRUNT_52 730
-#define TRAINER_GRUNT_53 731
-#define TRAINER_TABITHA_3 732
-#define TRAINER_DARCY 733
-#define TRAINER_MAXIE_3 734
-#define TRAINER_PETE 735
-#define TRAINER_ISABELLE 736
-#define TRAINER_ANDRES_1 737
-#define TRAINER_JOSUE 738
-#define TRAINER_CAMRON 739
-#define TRAINER_CORY_1 740
-#define TRAINER_CAROLINA 741
-#define TRAINER_ELIJAH 742
-#define TRAINER_CELIA 743
-#define TRAINER_BRYAN 744
-#define TRAINER_BRANDEN 745
-#define TRAINER_BRYANT 746
-#define TRAINER_SHAYLA 747
-#define TRAINER_KYRA 748
-#define TRAINER_JAIDEN 749
-#define TRAINER_ALIX 750
-#define TRAINER_HELENE 751
-#define TRAINER_MARLENE 752
-#define TRAINER_DEVAN 753
-#define TRAINER_JOHNSON 754
-#define TRAINER_MELINA 755
-#define TRAINER_BRANDI 756
-#define TRAINER_AISHA 757
-#define TRAINER_MAKAYLA 758
-#define TRAINER_FABIAN 759
-#define TRAINER_DAYTON 760
-#define TRAINER_RACHEL 761
-#define TRAINER_LEONEL 762
-#define TRAINER_CALLIE 763
-#define TRAINER_CALE 764
-#define TRAINER_MYLES 765
-#define TRAINER_PAT 766
-#define TRAINER_CRISTIN_1 767
-#define TRAINER_MAY_14 768
-#define TRAINER_MAY_15 769
-#define TRAINER_ROXANNE_2 770
-#define TRAINER_ROXANNE_3 771
-#define TRAINER_ROXANNE_4 772
-#define TRAINER_ROXANNE_5 773
-#define TRAINER_BRAWLY_2 774
-#define TRAINER_BRAWLY_3 775
-#define TRAINER_BRAWLY_4 776
-#define TRAINER_BRAWLY_5 777
-#define TRAINER_WATTSON_2 778
-#define TRAINER_WATTSON_3 779
-#define TRAINER_WATTSON_4 780
-#define TRAINER_WATTSON_5 781
-#define TRAINER_FLANNERY_2 782
-#define TRAINER_FLANNERY_3 783
-#define TRAINER_FLANNERY_4 784
-#define TRAINER_FLANNERY_5 785
-#define TRAINER_NORMAN_2 786
-#define TRAINER_NORMAN_3 787
-#define TRAINER_NORMAN_4 788
-#define TRAINER_NORMAN_5 789
-#define TRAINER_WINONA_2 790
-#define TRAINER_WINONA_3 791
-#define TRAINER_WINONA_4 792
-#define TRAINER_WINONA_5 793
-#define TRAINER_TATE_AND_LIZA_2 794
-#define TRAINER_TATE_AND_LIZA_3 795
-#define TRAINER_TATE_AND_LIZA_4 796
-#define TRAINER_TATE_AND_LIZA_5 797
-#define TRAINER_JUAN_2 798
-#define TRAINER_JUAN_3 799
-#define TRAINER_JUAN_4 800
-#define TRAINER_JUAN_5 801
-#define TRAINER_ANGELO 802
-#define TRAINER_DARIUS 803
-#define TRAINER_STEVEN 804
-#define TRAINER_ANABEL 805
-#define TRAINER_TUCKER 806
-#define TRAINER_SPENSER 807
-#define TRAINER_GRETA 808
-#define TRAINER_NOLAND 809
-#define TRAINER_LUCY 810
-#define TRAINER_BRANDON 811
-#define TRAINER_ANDRES_2 812
-#define TRAINER_ANDRES_3 813
-#define TRAINER_ANDRES_4 814
-#define TRAINER_ANDRES_5 815
-#define TRAINER_CORY_2 816
-#define TRAINER_CORY_3 817
-#define TRAINER_CORY_4 818
-#define TRAINER_CORY_5 819
-#define TRAINER_PABLO_2 820
-#define TRAINER_PABLO_3 821
-#define TRAINER_PABLO_4 822
-#define TRAINER_PABLO_5 823
-#define TRAINER_KOJI_2 824
-#define TRAINER_KOJI_3 825
-#define TRAINER_KOJI_4 826
-#define TRAINER_KOJI_5 827
-#define TRAINER_CRISTIN_2 828
-#define TRAINER_CRISTIN_3 829
-#define TRAINER_CRISTIN_4 830
-#define TRAINER_CRISTIN_5 831
-#define TRAINER_FERNANDO_2 832
-#define TRAINER_FERNANDO_3 833
-#define TRAINER_FERNANDO_4 834
-#define TRAINER_FERNANDO_5 835
-#define TRAINER_SAWYER_2 836
-#define TRAINER_SAWYER_3 837
-#define TRAINER_SAWYER_4 838
-#define TRAINER_SAWYER_5 839
-#define TRAINER_GABRIELLE_2 840
-#define TRAINER_GABRIELLE_3 841
-#define TRAINER_GABRIELLE_4 842
-#define TRAINER_GABRIELLE_5 843
-#define TRAINER_THALIA_2 844
-#define TRAINER_THALIA_3 845
-#define TRAINER_THALIA_4 846
-#define TRAINER_THALIA_5 847
-#define TRAINER_MARIELA 848
-#define TRAINER_ALVARO 849
-#define TRAINER_EVERETT 850
-#define TRAINER_RED 851
-#define TRAINER_LEAF 852
-#define TRAINER_BRENDAN_16 853
-#define TRAINER_MAY_16 854
+#include "constants/opponents.h"
-#define NO_OF_TRAINERS 854
+// Special Trainer Ids.
+#define TRAINER_FRONTIER_BRAIN 1022
+#define TRAINER_SECRET_BASE 1024
+#define TRAINER_LINK_OPPONENT 2048
+#define TRAINER_OPPONENT_C00 3072
+#define TRAINER_STEVEN_PARTNER 3075
#define TRAINER_PIC_HIKER 0
#define TRAINER_PIC_AQUA_GRUNT_M 1
@@ -953,6 +104,15 @@
#define TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN 91
#define TRAINER_PIC_RUBY_SAPPHIRE_MAY 92
+#define TRAINER_BACK_PIC_BRENDAN 0
+#define TRAINER_BACK_PIC_MAY 1
+#define TRAINER_BACK_PIC_RED 2
+#define TRAINER_BACK_PIC_LEAF 3
+#define TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN 4
+#define TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY 5
+#define TRAINER_BACK_PIC_WALLY 6
+#define TRAINER_BACK_PIC_STEVEN 7
+
#define FACILITY_CLASS_HIKER 0x0
#define FACILITY_CLASS_TEAM_AQUA_1 0x1
#define FACILITY_CLASS_PKMN_BREEDER_1 0x2
diff --git a/include/constants/vars.h b/include/constants/vars.h
index be21f1730..7cf232efe 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -3,48 +3,59 @@
#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_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 VARS_START 0x4000
+
+// temporary vars
+// The first 0x10 vars are are temporary--they are cleared every time a map is loaded.
+#define VAR_TEMP_0 0x4000
+#define VAR_TEMP_1 0x4001
+#define VAR_TEMP_2 0x4002
+#define VAR_TEMP_3 0x4003
+#define VAR_TEMP_4 0x4004
+#define VAR_TEMP_5 0x4005
+#define VAR_TEMP_6 0x4006
+#define VAR_TEMP_7 0x4007
+#define VAR_TEMP_8 0x4008
+#define VAR_TEMP_9 0x4009
+#define VAR_TEMP_A 0x400A
+#define VAR_TEMP_B 0x400B
+#define VAR_TEMP_C 0x400C
+#define VAR_TEMP_D 0x400D
+#define VAR_TEMP_E 0x400E
+#define VAR_TEMP_F 0x400F
+
+// object gfx id vars
+// These 0x10 vars are used to dynamically control a map object's sprite.
+// For example, the rival's sprite id is dynamically set based on the player's gender.
+// See VarGetEventObjectGraphicsId().
+#define VAR_OBJ_GFX_ID_0 0x4010
+#define VAR_OBJ_GFX_ID_1 0x4011
+#define VAR_OBJ_GFX_ID_2 0x4012
+#define VAR_OBJ_GFX_ID_3 0x4013
+#define VAR_OBJ_GFX_ID_4 0x4014
+#define VAR_OBJ_GFX_ID_5 0x4015
+#define VAR_OBJ_GFX_ID_6 0x4016
+#define VAR_OBJ_GFX_ID_7 0x4017
+#define VAR_OBJ_GFX_ID_8 0x4018
+#define VAR_OBJ_GFX_ID_9 0x4019
+#define VAR_OBJ_GFX_ID_A 0x401A
+#define VAR_OBJ_GFX_ID_B 0x401B
+#define VAR_OBJ_GFX_ID_C 0x401C
+#define VAR_OBJ_GFX_ID_D 0x401D
+#define VAR_OBJ_GFX_ID_E 0x401E
+#define VAR_OBJ_GFX_ID_F 0x401F
+
+// general purpose vars
#define VAR_RECYCLE_GOODS 0x4020
#define VAR_REPEL_STEP_COUNT 0x4021
#define VAR_ICE_STEP_COUNT 0x4022
-#define VAR_FIRST_POKE 0x4023
+#define VAR_STARTER_MON 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip
#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_CYCLING_ROAD_RECORD_COLLISIONS 0x4027
+#define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028
+#define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029
#define VAR_HAPPINESS_STEP_COUNTER 0x402A
#define VAR_POISON_STEP_COUNTER 0x402B
#define VAR_RESET_RTC_ENABLE 0x402C
@@ -70,8 +81,8 @@
#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_FANCLUB_UNKNOWN_1 0x4041
+#define VAR_FANCLUB_UNKNOWN_2 0x4042
#define VAR_DEPT_STORE_FLOOR 0x4043
#define VAR_0x4044 0x4044
#define VAR_POKELOT_PRIZE 0x4045
@@ -154,12 +165,12 @@
#define VAR_0x4092 0x4092
#define VAR_0x4093 0x4093
#define VAR_0x4094 0x4094
-#define VAR_0x4095 0x4095
+#define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095
#define VAR_0x4096 0x4096
#define VAR_0x4097 0x4097
#define VAR_0x4098 0x4098
#define VAR_0x4099 0x4099
-#define VAR_0x409A 0x409A
+#define VAR_RUSTURF_TUNNEL_STATE 0x409A
#define VAR_0x409B 0x409B
#define VAR_0x409C 0x409C
#define VAR_0x409D 0x409D
@@ -174,7 +185,7 @@
#define VAR_0x40A6 0x40A6
#define VAR_0x40A7 0x40A7
#define VAR_0x40A8 0x40A8
-#define VAR_0x40A9 0x40A9
+#define VAR_CYCLING_CHALLENGE_STATE 0x40A9
#define VAR_0x40AA 0x40AA
#define VAR_0x40AB 0x40AB
#define VAR_0x40AC 0x40AC
@@ -185,7 +196,7 @@
#define VAR_0x40B1 0x40B1
#define VAR_0x40B2 0x40B2
#define VAR_WEATHER_INSTITUTE_STATE 0x40B3
-#define VAR_PORTHOLE 0x40B4
+#define VAR_PORTHOLE_STATE 0x40B4
#define VAR_0x40B5 0x40B5
#define VAR_0x40B6 0x40B6
#define VAR_0x40B7 0x40B7
@@ -199,7 +210,7 @@
#define VAR_0x40BF 0x40BF
#define VAR_0x40C0 0x40C0
#define VAR_0x40C1 0x40C1
-#define VAR_0x40C2 0x40C2
+#define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2
#define VAR_0x40C3 0x40C3
#define VAR_0x40C4 0x40C4
#define VAR_0x40C5 0x40C5
@@ -262,6 +273,8 @@
#define VAR_0x40FE 0x40FE
#define VAR_0x40FF 0x40FF
+// special vars
+// They are commonly used as parameters to commands, or return values from commands.
#define VAR_0x8000 0x8000
#define VAR_0x8001 0x8001
#define VAR_0x8002 0x8002