battle frontier/tent pokemon

3 files changed, 97 insertions, 0 deletions

diff --git a/constants/battle_frontier_constants.s b/constants/battle_frontier_constants.s
new file mode 100644
index 000000000..a6c069723
--- /dev/null
+++ b/constants/battle_frontier_constants.s
@@ -0,0 +1,70 @@
+	.set F_EV_SPREAD_HP,         1 << 0
+	.set F_EV_SPREAD_ATTACK,     1 << 1
+	.set F_EV_SPREAD_DEFENSE,    1 << 2
+	.set F_EV_SPREAD_SPEED,      1 << 3
+	.set F_EV_SPREAD_SP_ATTACK,  1 << 4
+	.set F_EV_SPREAD_SP_DEFENSE, 1 << 5
+
+	.set BATTLE_FRONTIER_ITEM_NONE,           0
+	.set BATTLE_FRONTIER_ITEM_KINGS_ROCK,     1
+	.set BATTLE_FRONTIER_ITEM_SITRUS_BERRY,   2
+	.set BATTLE_FRONTIER_ITEM_ORAN_BERRY,     3
+	.set BATTLE_FRONTIER_ITEM_CHESTO_BERRY,   4
+	.set BATTLE_FRONTIER_ITEM_HARD_STONE,     5
+	.set BATTLE_FRONTIER_ITEM_FOCUS_BAND,     6
+	.set BATTLE_FRONTIER_ITEM_PERSIM_BERRY,   7
+	.set BATTLE_FRONTIER_ITEM_MIRACLE_SEED,   8
+	.set BATTLE_FRONTIER_ITEM_BERRY_JUICE,    9
+	.set BATTLE_FRONTIER_ITEM_MACHO_BRACE,    10
+	.set BATTLE_FRONTIER_ITEM_SILVER_POWDER,  11
+	.set BATTLE_FRONTIER_ITEM_CHERI_BERRY,    12
+	.set BATTLE_FRONTIER_ITEM_BLACK_GLASSES,  13
+	.set BATTLE_FRONTIER_ITEM_BLACK_BELT,     14
+	.set BATTLE_FRONTIER_ITEM_SOUL_DEW,       15
+	.set BATTLE_FRONTIER_ITEM_CHOICE_BAND,    16
+	.set BATTLE_FRONTIER_ITEM_MAGNET,         17
+	.set BATTLE_FRONTIER_ITEM_SILK_SCARF,     18
+	.set BATTLE_FRONTIER_ITEM_WHITE_HERB,     19
+	.set BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE, 20
+	.set BATTLE_FRONTIER_ITEM_DEEP_SEA_TOOTH, 21
+	.set BATTLE_FRONTIER_ITEM_MYSTIC_WATER,   22
+	.set BATTLE_FRONTIER_ITEM_SHARP_BEAK,     23
+	.set BATTLE_FRONTIER_ITEM_QUICK_CLAW,     24
+	.set BATTLE_FRONTIER_ITEM_LEFTOVERS,      25
+	.set BATTLE_FRONTIER_ITEM_RAWST_BERRY,    26
+	.set BATTLE_FRONTIER_ITEM_LIGHT_BALL,     27
+	.set BATTLE_FRONTIER_ITEM_POISON_BARB,    28
+	.set BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, 29
+	.set BATTLE_FRONTIER_ITEM_ASPEAR_BERRY,   30
+	.set BATTLE_FRONTIER_ITEM_SPELL_TAG,      31
+	.set BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,  32
+	.set BATTLE_FRONTIER_ITEM_LEPPA_BERRY,    33
+	.set BATTLE_FRONTIER_ITEM_SCOPE_LENS,     34
+	.set BATTLE_FRONTIER_ITEM_TWISTED_SPOON,  35
+	.set BATTLE_FRONTIER_ITEM_METAL_COAT,     36
+	.set BATTLE_FRONTIER_ITEM_MENTAL_HERB,    37
+	.set BATTLE_FRONTIER_ITEM_CHARCOAL,       38
+	.set BATTLE_FRONTIER_ITEM_PECHA_BERRY,    39
+	.set BATTLE_FRONTIER_ITEM_SOFT_SAND,      40
+	.set BATTLE_FRONTIER_ITEM_LUM_BERRY,      41
+	.set BATTLE_FRONTIER_ITEM_DRAGON_SCALE,   42
+	.set BATTLE_FRONTIER_ITEM_DRAGON_FANG,    43
+	.set BATTLE_FRONTIER_ITEM_IAPAPA_BERRY,   44
+	.set BATTLE_FRONTIER_ITEM_WIKI_BERRY,     45
+	.set BATTLE_FRONTIER_ITEM_SEA_INCENSE,    46
+	.set BATTLE_FRONTIER_ITEM_SHELL_BELL,     47
+	.set BATTLE_FRONTIER_ITEM_SALAC_BERRY,    48
+	.set BATTLE_FRONTIER_ITEM_LANSAT_BERRY,   49
+	.set BATTLE_FRONTIER_ITEM_APICOT_BERRY,   50
+	.set BATTLE_FRONTIER_ITEM_STARF_BERRY,    51
+	.set BATTLE_FRONTIER_ITEM_LIECHI_BERRY,   52
+	.set BATTLE_FRONTIER_ITEM_STICK,          53
+	.set BATTLE_FRONTIER_ITEM_LAX_INCENSE,    54
+	.set BATTLE_FRONTIER_ITEM_AGUAV_BERRY,    55
+	.set BATTLE_FRONTIER_ITEM_FIGY_BERRY,     56
+	.set BATTLE_FRONTIER_ITEM_THICK_CLUB,     57
+	.set BATTLE_FRONTIER_ITEM_MAGO_BERRY,     58
+	.set BATTLE_FRONTIER_ITEM_METAL_POWDER,   59
+	.set BATTLE_FRONTIER_ITEM_PETAYA_BERRY,   60
+	.set BATTLE_FRONTIER_ITEM_LUCKY_PUNCH,    61
+	.set BATTLE_FRONTIER_ITEM_GANLON_BERRY,   62
diff --git a/constants/constants.s b/constants/constants.s
index e2e376fc0..3c7eca487 100644
--- a/constants/constants.s
+++ b/constants/constants.s
@@ -11,3 +11,4 @@
 	.include "constants/battle_move_constants.s"
 	.include "constants/easy_chat_constants.s"
 	.include "constants/trainer_class_constants.s"
+	.include "constants/battle_frontier_constants.s"
diff --git a/constants/pokemon_data_constants.s b/constants/pokemon_data_constants.s
index b41cd0500..565eae71e 100644
--- a/constants/pokemon_data_constants.s
+++ b/constants/pokemon_data_constants.s
@@ -1,3 +1,29 @@
+	.set NATURE_HARDY,   0
+	.set NATURE_LONELY,  1
+	.set NATURE_BRAVE,   2
+	.set NATURE_ADAMANT, 3
+	.set NATURE_NAUGHTY, 4
+	.set NATURE_BOLD,    5
+	.set NATURE_DOCILE,  6
+	.set NATURE_RELAXED, 7
+	.set NATURE_IMPISH,  8
+	.set NATURE_LAX,     9
+	.set NATURE_TIMID,   10
+	.set NATURE_HASTY,   11
+	.set NATURE_SERIOUS, 12
+	.set NATURE_JOLLY,   13
+	.set NATURE_NAIVE,   14
+	.set NATURE_MODEST,  15
+	.set NATURE_MILD,    16
+	.set NATURE_QUIET,   17
+	.set NATURE_BASHFUL, 18
+	.set NATURE_RASH,    19
+	.set NATURE_CALM,    20
+	.set NATURE_GENTLE,  21
+	.set NATURE_SASSY,   22
+	.set NATURE_CAREFUL, 23
+	.set NATURE_QUIRKY,  24
+
 	.set GROWTH_MEDIUM_FAST, 0x00
 	.set GROWTH_ERRATIC,     0x01
 	.set GROWTH_FLUCTUATING, 0x02