Merge pull request #1 from pret/master

Update fork to match main fork.

4 files changed, 846 insertions, 696 deletions

diff --git a/constants/item_constants.inc b/constants/item_constants.inc
index 934ebd798..46b84d681 100644
--- a/constants/item_constants.inc
+++ b/constants/item_constants.inc
@@ -1,310 +1,385 @@
-	.set ITEM_NONE,           0x000
-	.set ITEM_MASTER_BALL,    0x001
-	.set ITEM_ULTRA_BALL,     0x002
-	.set ITEM_GREAT_BALL,     0x003
-	.set ITEM_POKE_BALL,      0x004
-	.set ITEM_SAFARI_BALL,    0x005
-	.set ITEM_NET_BALL,       0x006
-	.set ITEM_DIVE_BALL,      0x007
-	.set ITEM_NEST_BALL,      0x008
-	.set ITEM_REPEAT_BALL,    0x009
-	.set ITEM_TIMER_BALL,     0x00a
-	.set ITEM_LUXURY_BALL,    0x00b
-	.set ITEM_PREMIER_BALL,   0x00c
-	.set ITEM_POTION,         0x00d
-	.set ITEM_ANTIDOTE,       0x00e
-	.set ITEM_BURN_HEAL,      0x00f
-	.set ITEM_ICE_HEAL,       0x010
-	.set ITEM_AWAKENING,      0x011
-	.set ITEM_PARALYZE_HEAL,  0x012
-	.set ITEM_FULL_RESTORE,   0x013
-	.set ITEM_MAX_POTION,     0x014
-	.set ITEM_HYPER_POTION,   0x015
-	.set ITEM_SUPER_POTION,   0x016
-	.set ITEM_FULL_HEAL,      0x017
-	.set ITEM_REVIVE,         0x018
-	.set ITEM_MAX_REVIVE,     0x019
-	.set ITEM_FRESH_WATER,    0x01a
-	.set ITEM_SODA_POP,       0x01b
-	.set ITEM_LEMONADE,       0x01c
-	.set ITEM_MOOMOO_MILK,    0x01d
-	.set ITEM_ENERGY_POWDER,  0x01e
-	.set ITEM_ENERGY_ROOT,    0x01f
-	.set ITEM_HEAL_POWDER,    0x020
-	.set ITEM_REVIVAL_HERB,   0x021
-	.set ITEM_ETHER,          0x022
-	.set ITEM_MAX_ETHER,      0x023
-	.set ITEM_ELIXIR,         0x024
-	.set ITEM_MAX_ELIXIR,     0x025
-	.set ITEM_LAVA_COOKIE,    0x026
-	.set ITEM_BLUE_FLUTE,     0x027
-	.set ITEM_YELLOW_FLUTE,   0x028
-	.set ITEM_RED_FLUTE,      0x029
-	.set ITEM_BLACK_FLUTE,    0x02a
-	.set ITEM_WHITE_FLUTE,    0x02b
-	.set ITEM_BERRY_JUICE,    0x02c
-	.set ITEM_SACRED_ASH,     0x02d
-	.set ITEM_SHOAL_SALT,     0x02e
-	.set ITEM_SHOAL_SHELL,    0x02f
-	.set ITEM_RED_SHARD,      0x030
-	.set ITEM_BLUE_SHARD,     0x031
-	.set ITEM_YELLOW_SHARD,   0x032
-	.set ITEM_GREEN_SHARD,    0x033
-	.set ITEM_HP_UP,          0x03f
-	.set ITEM_PROTEIN,        0x040
-	.set ITEM_IRON,           0x041
-	.set ITEM_CARBOS,         0x042
-	.set ITEM_CALCIUM,        0x043
-	.set ITEM_RARE_CANDY,     0x044
-	.set ITEM_PP_UP,          0x045
-	.set ITEM_ZINC,           0x046
-	.set ITEM_PP_MAX,         0x047
-	.set ITEM_GUARD_SPEC,     0x049
-	.set ITEM_DIRE_HIT,       0x04a
-	.set ITEM_X_ATTACK,       0x04b
-	.set ITEM_X_DEFEND,       0x04c
-	.set ITEM_X_SPEED,        0x04d
-	.set ITEM_X_ACCURACY,     0x04e
-	.set ITEM_X_SPECIAL,      0x04f
-	.set ITEM_POKE_DOLL,      0x050
-	.set ITEM_FLUFFY_TAIL,    0x051
-	.set ITEM_SUPER_REPEL,    0x053
-	.set ITEM_MAX_REPEL,      0x054
-	.set ITEM_ESCAPE_ROPE,    0x055
-	.set ITEM_REPEL,          0x056
-	.set ITEM_SUN_STONE,      0x05d
-	.set ITEM_MOON_STONE,     0x05e
-	.set ITEM_FIRE_STONE,     0x05f
-	.set ITEM_THUNDER_STONE,  0x060
-	.set ITEM_WATER_STONE,    0x061
-	.set ITEM_LEAF_STONE,     0x062
-	.set ITEM_TINY_MUSHROOM,  0x067
-	.set ITEM_BIG_MUSHROOM,   0x068
-	.set ITEM_PEARL,          0x06a
-	.set ITEM_BIG_PEARL,      0x06b
-	.set ITEM_STARDUST,       0x06c
-	.set ITEM_STAR_PIECE,     0x06d
-	.set ITEM_NUGGET,         0x06e
-	.set ITEM_HEART_SCALE,    0x06f
-	.set ITEM_ORANGE_MAIL,    0x079
-	.set ITEM_HARBOR_MAIL,    0x07a
-	.set ITEM_GLITTER_MAIL,   0x07b
-	.set ITEM_MECH_MAIL,      0x07c
-	.set ITEM_WOOD_MAIL,      0x07d
-	.set ITEM_WAVE_MAIL,      0x07e
-	.set ITEM_BEAD_MAIL,      0x07f
-	.set ITEM_SHADOW_MAIL,    0x080
-	.set ITEM_TROPIC_MAIL,    0x081
-	.set ITEM_DREAM_MAIL,     0x082
-	.set ITEM_FAB_MAIL,       0x083
-	.set ITEM_RETRO_MAIL,     0x084
-	.set ITEM_CHERI_BERRY,    0x085
-	.set ITEM_CHESTO_BERRY,   0x086
-	.set ITEM_PECHA_BERRY,    0x087
-	.set ITEM_RAWST_BERRY,    0x088
-	.set ITEM_ASPEAR_BERRY,   0x089
-	.set ITEM_LEPPA_BERRY,    0x08a
-	.set ITEM_ORAN_BERRY,     0x08b
-	.set ITEM_PERSIM_BERRY,   0x08c
-	.set ITEM_LUM_BERRY,      0x08d
-	.set ITEM_SITRUS_BERRY,   0x08e
-	.set ITEM_FIGY_BERRY,     0x08f
-	.set ITEM_WIKI_BERRY,     0x090
-	.set ITEM_MAGO_BERRY,     0x091
-	.set ITEM_AGUAV_BERRY,    0x092
-	.set ITEM_IAPAPA_BERRY,   0x093
-	.set ITEM_RAZZ_BERRY,     0x094
-	.set ITEM_BLUK_BERRY,     0x095
-	.set ITEM_NANAB_BERRY,    0x096
-	.set ITEM_WEPEAR_BERRY,   0x097
-	.set ITEM_PINAP_BERRY,    0x098
-	.set ITEM_POMEG_BERRY,    0x099
-	.set ITEM_KELPSY_BERRY,   0x09a
-	.set ITEM_QUALOT_BERRY,   0x09b
-	.set ITEM_HONDEW_BERRY,   0x09c
-	.set ITEM_GREPA_BERRY,    0x09d
-	.set ITEM_TAMATO_BERRY,   0x09e
-	.set ITEM_CORNN_BERRY,    0x09f
-	.set ITEM_MAGOST_BERRY,   0x0a0
-	.set ITEM_RABUTA_BERRY,   0x0a1
-	.set ITEM_NOMEL_BERRY,    0x0a2
-	.set ITEM_SPELON_BERRY,   0x0a3
-	.set ITEM_PAMTRE_BERRY,   0x0a4
-	.set ITEM_WATMEL_BERRY,   0x0a5
-	.set ITEM_DURIN_BERRY,    0x0a6
-	.set ITEM_BELUE_BERRY,    0x0a7
-	.set ITEM_LIECHI_BERRY,   0x0a8
-	.set ITEM_GANLON_BERRY,   0x0a9
-	.set ITEM_SALAC_BERRY,    0x0aa
-	.set ITEM_PETAYA_BERRY,   0x0ab
-	.set ITEM_APICOT_BERRY,   0x0ac
-	.set ITEM_LANSAT_BERRY,   0x0ad
-	.set ITEM_STARF_BERRY,    0x0ae
-	.set ITEM_ENIGMA_BERRY,   0x0af
-	.set ITEM_BRIGHT_POWDER,  0x0b3
-	.set ITEM_WHITE_HERB,     0x0b4
-	.set ITEM_MACHO_BRACE,    0x0b5
-	.set ITEM_EXP_SHARE,      0x0b6
-	.set ITEM_QUICK_CLAW,     0x0b7
-	.set ITEM_SOOTHE_BELL,    0x0b8
-	.set ITEM_MENTAL_HERB,    0x0b9
-	.set ITEM_CHOICE_BAND,    0x0ba
-	.set ITEM_KINGS_ROCK,     0x0bb
-	.set ITEM_SILVER_POWDER,  0x0bc
-	.set ITEM_AMULET_COIN,    0x0bd
-	.set ITEM_CLEANSE_TAG,    0x0be
-	.set ITEM_SOUL_DEW,       0x0bf
-	.set ITEM_DEEP_SEA_TOOTH, 0x0c0
-	.set ITEM_DEEP_SEA_SCALE, 0x0c1
-	.set ITEM_SMOKE_BALL,     0x0c2
-	.set ITEM_EVERSTONE,      0x0c3
-	.set ITEM_FOCUS_BAND,     0x0c4
-	.set ITEM_LUCKY_EGG,      0x0c5
-	.set ITEM_SCOPE_LENS,     0x0c6
-	.set ITEM_METAL_COAT,     0x0c7
-	.set ITEM_LEFTOVERS,      0x0c8
-	.set ITEM_DRAGON_SCALE,   0x0c9
-	.set ITEM_LIGHT_BALL,     0x0ca
-	.set ITEM_SOFT_SAND,      0x0cb
-	.set ITEM_HARD_STONE,     0x0cc
-	.set ITEM_MIRACLE_SEED,   0x0cd
-	.set ITEM_BLACK_GLASSES,  0x0ce
-	.set ITEM_BLACK_BELT,     0x0cf
-	.set ITEM_MAGNET,         0x0d0
-	.set ITEM_MYSTIC_WATER,   0x0d1
-	.set ITEM_SHARP_BEAK,     0x0d2
-	.set ITEM_POISON_BARB,    0x0d3
-	.set ITEM_NEVER_MELT_ICE, 0x0d4
-	.set ITEM_SPELL_TAG,      0x0d5
-	.set ITEM_TWISTED_SPOON,  0x0d6
-	.set ITEM_CHARCOAL,       0x0d7
-	.set ITEM_DRAGON_FANG,    0x0d8
-	.set ITEM_SILK_SCARF,     0x0d9
-	.set ITEM_UP_GRADE,       0x0da
-	.set ITEM_SHELL_BELL,     0x0db
-	.set ITEM_SEA_INCENSE,    0x0dc
-	.set ITEM_LAX_INCENSE,    0x0dd
-	.set ITEM_LUCKY_PUNCH,    0x0de
-	.set ITEM_METAL_POWDER,   0x0df
-	.set ITEM_THICK_CLUB,     0x0e0
-	.set ITEM_STICK,          0x0e1
-	.set ITEM_RED_SCARF,      0x0fe
-	.set ITEM_BLUE_SCARF,     0x0ff
-	.set ITEM_PINK_SCARF,     0x100
-	.set ITEM_GREEN_SCARF,    0x101
-	.set ITEM_YELLOW_SCARF,   0x102
-	.set ITEM_MACH_BIKE,      0x103
-	.set ITEM_COIN_CASE,      0x104
-	.set ITEM_ITEMFINDER,     0x105
-	.set ITEM_OLD_ROD,        0x106
-	.set ITEM_GOOD_ROD,       0x107
-	.set ITEM_SUPER_ROD,      0x108
-	.set ITEM_SS_TICKET,      0x109
-	.set ITEM_CONTEST_PASS,   0x10a
-	.set ITEM_WAILMER_PAIL,   0x10c
-	.set ITEM_DEVON_GOODS,    0x10d
-	.set ITEM_SOOT_SACK,      0x10e
-	.set ITEM_BASEMENT_KEY,   0x10f
-	.set ITEM_ACRO_BIKE,      0x110
-	.set ITEM_POKEBLOCK_CASE, 0x111
-	.set ITEM_LETTER,         0x112
-	.set ITEM_EON_TICKET,     0x113
-	.set ITEM_RED_ORB,        0x114
-	.set ITEM_BLUE_ORB,       0x115
-	.set ITEM_SCANNER,        0x116
-	.set ITEM_GO_GOGGLES,     0x117
-	.set ITEM_METEORITE,      0x118
-	.set ITEM_ROOM_1_KEY,     0x119
-	.set ITEM_ROOM_2_KEY,     0x11a
-	.set ITEM_ROOM_4_KEY,     0x11b
-	.set ITEM_ROOM_6_KEY,     0x11c
-	.set ITEM_STORAGE_KEY,    0x11d
-	.set ITEM_ROOT_FOSSIL,    0x11e
-	.set ITEM_CLAW_FOSSIL,    0x11f
-	.set ITEM_DEVON_SCOPE,    0x120
-	.set ITEM_TM01,           0x121
-	.set ITEM_TM02,           0x122
-	.set ITEM_TM03,           0x123
-	.set ITEM_TM04,           0x124
-	.set ITEM_TM05,           0x125
-	.set ITEM_TM06,           0x126
-	.set ITEM_TM07,           0x127
-	.set ITEM_TM08,           0x128
-	.set ITEM_TM09,           0x129
-	.set ITEM_TM10,           0x12a
-	.set ITEM_TM11,           0x12b
-	.set ITEM_TM12,           0x12c
-	.set ITEM_TM13,           0x12d
-	.set ITEM_TM14,           0x12e
-	.set ITEM_TM15,           0x12f
-	.set ITEM_TM16,           0x130
-	.set ITEM_TM17,           0x131
-	.set ITEM_TM18,           0x132
-	.set ITEM_TM19,           0x133
-	.set ITEM_TM20,           0x134
-	.set ITEM_TM21,           0x135
-	.set ITEM_TM22,           0x136
-	.set ITEM_TM23,           0x137
-	.set ITEM_TM24,           0x138
-	.set ITEM_TM25,           0x139
-	.set ITEM_TM26,           0x13a
-	.set ITEM_TM27,           0x13b
-	.set ITEM_TM28,           0x13c
-	.set ITEM_TM29,           0x13d
-	.set ITEM_TM30,           0x13e
-	.set ITEM_TM31,           0x13f
-	.set ITEM_TM32,           0x140
-	.set ITEM_TM33,           0x141
-	.set ITEM_TM34,           0x142
-	.set ITEM_TM35,           0x143
-	.set ITEM_TM36,           0x144
-	.set ITEM_TM37,           0x145
-	.set ITEM_TM38,           0x146
-	.set ITEM_TM39,           0x147
-	.set ITEM_TM40,           0x148
-	.set ITEM_TM41,           0x149
-	.set ITEM_TM42,           0x14a
-	.set ITEM_TM43,           0x14b
-	.set ITEM_TM44,           0x14c
-	.set ITEM_TM45,           0x14d
-	.set ITEM_TM46,           0x14e
-	.set ITEM_TM47,           0x14f
-	.set ITEM_TM48,           0x150
-	.set ITEM_TM49,           0x151
-	.set ITEM_TM50,           0x152
-	.set ITEM_HM01,           0x153
-	.set ITEM_HM02,           0x154
-	.set ITEM_HM03,           0x155
-	.set ITEM_HM04,           0x156
-	.set ITEM_HM05,           0x157
-	.set ITEM_HM06,           0x158
-	.set ITEM_HM07,           0x159
-	.set ITEM_HM08,           0x15a
-	.set ITEM_OAKS_PARCEL,    0x15d
-	.set ITEM_POKE_FLUTE,     0x15e
-	.set ITEM_SECRET_KEY,     0x15f
-	.set ITEM_BIKE_VOUCHER,   0x160
-	.set ITEM_GOLD_TEETH,     0x161
-	.set ITEM_OLD_AMBER,      0x162
-	.set ITEM_CARD_KEY,       0x163
-	.set ITEM_LIFT_KEY,       0x164
-	.set ITEM_HELIX_FOSSIL,   0x165
-	.set ITEM_DOME_FOSSIL,    0x166
-	.set ITEM_SILPH_SCOPE,    0x167
-	.set ITEM_BICYCLE,        0x168
-	.set ITEM_TOWN_MAP,       0x169
-	.set ITEM_VS_SEEKER,      0x16a
-	.set ITEM_FAME_CHECKER,   0x16b
-	.set ITEM_TM_CASE,        0x16c
-	.set ITEM_BERRY_POUCH,    0x16d
-	.set ITEM_TEACHY_TV,      0x16e
-	.set ITEM_TRI_PASS,       0x16f
-	.set ITEM_RAINBOW_PASS,   0x170
-	.set ITEM_TEA,            0x171
-	.set ITEM_MYSTIC_TICKET,  0x172
-	.set ITEM_AURORA_TICKET,  0x173
-	.set ITEM_POWDER_JAR,     0x174
-	.set ITEM_RUBY,           0x175
-	.set ITEM_SAPPHIRE,       0x176
-	.set ITEM_MAGMA_EMBLEM,   0x177
-	.set ITEM_OLD_SEA_MAP,    0x178
+	.include "asm/macros/asm.inc"
+
+	enum_start
+
+	enum ITEM_NONE           @ 0x000
+	enum ITEM_MASTER_BALL    @ 0x001
+	enum ITEM_ULTRA_BALL     @ 0x002
+	enum ITEM_GREAT_BALL     @ 0x003
+	enum ITEM_POKE_BALL      @ 0x004
+	enum ITEM_SAFARI_BALL    @ 0x005
+	enum ITEM_NET_BALL       @ 0x006
+	enum ITEM_DIVE_BALL      @ 0x007
+	enum ITEM_NEST_BALL      @ 0x008
+	enum ITEM_REPEAT_BALL    @ 0x009
+	enum ITEM_TIMER_BALL     @ 0x00a
+	enum ITEM_LUXURY_BALL    @ 0x00b
+	enum ITEM_PREMIER_BALL   @ 0x00c
+	enum ITEM_POTION         @ 0x00d
+	enum ITEM_ANTIDOTE       @ 0x00e
+	enum ITEM_BURN_HEAL      @ 0x00f
+	enum ITEM_ICE_HEAL       @ 0x010
+	enum ITEM_AWAKENING      @ 0x011
+	enum ITEM_PARALYZE_HEAL  @ 0x012
+	enum ITEM_FULL_RESTORE   @ 0x013
+	enum ITEM_MAX_POTION     @ 0x014
+	enum ITEM_HYPER_POTION   @ 0x015
+	enum ITEM_SUPER_POTION   @ 0x016
+	enum ITEM_FULL_HEAL      @ 0x017
+	enum ITEM_REVIVE         @ 0x018
+	enum ITEM_MAX_REVIVE     @ 0x019
+	enum ITEM_FRESH_WATER    @ 0x01a
+	enum ITEM_SODA_POP       @ 0x01b
+	enum ITEM_LEMONADE       @ 0x01c
+	enum ITEM_MOOMOO_MILK    @ 0x01d
+	enum ITEM_ENERGY_POWDER  @ 0x01e
+	enum ITEM_ENERGY_ROOT    @ 0x01f
+	enum ITEM_HEAL_POWDER    @ 0x020
+	enum ITEM_REVIVAL_HERB   @ 0x021
+	enum ITEM_ETHER          @ 0x022
+	enum ITEM_MAX_ETHER      @ 0x023
+	enum ITEM_ELIXIR         @ 0x024
+	enum ITEM_MAX_ELIXIR     @ 0x025
+	enum ITEM_LAVA_COOKIE    @ 0x026
+	enum ITEM_BLUE_FLUTE     @ 0x027
+	enum ITEM_YELLOW_FLUTE   @ 0x028
+	enum ITEM_RED_FLUTE      @ 0x029
+	enum ITEM_BLACK_FLUTE    @ 0x02a
+	enum ITEM_WHITE_FLUTE    @ 0x02b
+	enum ITEM_BERRY_JUICE    @ 0x02c
+	enum ITEM_SACRED_ASH     @ 0x02d
+	enum ITEM_SHOAL_SALT     @ 0x02e
+	enum ITEM_SHOAL_SHELL    @ 0x02f
+	enum ITEM_RED_SHARD      @ 0x030
+	enum ITEM_BLUE_SHARD     @ 0x031
+	enum ITEM_YELLOW_SHARD   @ 0x032
+	enum ITEM_GREEN_SHARD    @ 0x033
+	enum ITEM_034
+	enum ITEM_035
+	enum ITEM_036
+	enum ITEM_037
+	enum ITEM_038
+	enum ITEM_039
+	enum ITEM_03A
+	enum ITEM_03B
+	enum ITEM_03C
+	enum ITEM_03D
+	enum ITEM_03E
+	enum ITEM_HP_UP          @ 0x03f
+	enum ITEM_PROTEIN        @ 0x040
+	enum ITEM_IRON           @ 0x041
+	enum ITEM_CARBOS         @ 0x042
+	enum ITEM_CALCIUM        @ 0x043
+	enum ITEM_RARE_CANDY     @ 0x044
+	enum ITEM_PP_UP          @ 0x045
+	enum ITEM_ZINC           @ 0x046
+	enum ITEM_PP_MAX         @ 0x047
+	enum ITEM_048
+	enum ITEM_GUARD_SPEC     @ 0x049
+	enum ITEM_DIRE_HIT       @ 0x04a
+	enum ITEM_X_ATTACK       @ 0x04b
+	enum ITEM_X_DEFEND       @ 0x04c
+	enum ITEM_X_SPEED        @ 0x04d
+	enum ITEM_X_ACCURACY     @ 0x04e
+	enum ITEM_X_SPECIAL      @ 0x04f
+	enum ITEM_POKE_DOLL      @ 0x050
+	enum ITEM_FLUFFY_TAIL    @ 0x051
+	enum ITEM_052
+	enum ITEM_SUPER_REPEL    @ 0x053
+	enum ITEM_MAX_REPEL      @ 0x054
+	enum ITEM_ESCAPE_ROPE    @ 0x055
+	enum ITEM_REPEL          @ 0x056
+	enum ITEM_057
+	enum ITEM_058
+	enum ITEM_059
+	enum ITEM_05A
+	enum ITEM_05B
+	enum ITEM_05C
+	enum ITEM_SUN_STONE      @ 0x05d
+	enum ITEM_MOON_STONE     @ 0x05e
+	enum ITEM_FIRE_STONE     @ 0x05f
+	enum ITEM_THUNDER_STONE  @ 0x060
+	enum ITEM_WATER_STONE    @ 0x061
+	enum ITEM_LEAF_STONE     @ 0x062
+	enum ITEM_063
+	enum ITEM_064
+	enum ITEM_065
+	enum ITEM_066
+	enum ITEM_TINY_MUSHROOM  @ 0x067
+	enum ITEM_BIG_MUSHROOM   @ 0x068
+	enum ITEM_069
+	enum ITEM_PEARL          @ 0x06a
+	enum ITEM_BIG_PEARL      @ 0x06b
+	enum ITEM_STARDUST       @ 0x06c
+	enum ITEM_STAR_PIECE     @ 0x06d
+	enum ITEM_NUGGET         @ 0x06e
+	enum ITEM_HEART_SCALE    @ 0x06f
+	enum ITEM_070
+	enum ITEM_071
+	enum ITEM_072
+	enum ITEM_073
+	enum ITEM_074
+	enum ITEM_075
+	enum ITEM_076
+	enum ITEM_077
+	enum ITEM_078
+	enum ITEM_ORANGE_MAIL    @ 0x079
+	enum ITEM_HARBOR_MAIL    @ 0x07a
+	enum ITEM_GLITTER_MAIL   @ 0x07b
+	enum ITEM_MECH_MAIL      @ 0x07c
+	enum ITEM_WOOD_MAIL      @ 0x07d
+	enum ITEM_WAVE_MAIL      @ 0x07e
+	enum ITEM_BEAD_MAIL      @ 0x07f
+	enum ITEM_SHADOW_MAIL    @ 0x080
+	enum ITEM_TROPIC_MAIL    @ 0x081
+	enum ITEM_DREAM_MAIL     @ 0x082
+	enum ITEM_FAB_MAIL       @ 0x083
+	enum ITEM_RETRO_MAIL     @ 0x084
+	enum ITEM_CHERI_BERRY    @ 0x085
+	enum ITEM_CHESTO_BERRY   @ 0x086
+	enum ITEM_PECHA_BERRY    @ 0x087
+	enum ITEM_RAWST_BERRY    @ 0x088
+	enum ITEM_ASPEAR_BERRY   @ 0x089
+	enum ITEM_LEPPA_BERRY    @ 0x08a
+	enum ITEM_ORAN_BERRY     @ 0x08b
+	enum ITEM_PERSIM_BERRY   @ 0x08c
+	enum ITEM_LUM_BERRY      @ 0x08d
+	enum ITEM_SITRUS_BERRY   @ 0x08e
+	enum ITEM_FIGY_BERRY     @ 0x08f
+	enum ITEM_WIKI_BERRY     @ 0x090
+	enum ITEM_MAGO_BERRY     @ 0x091
+	enum ITEM_AGUAV_BERRY    @ 0x092
+	enum ITEM_IAPAPA_BERRY   @ 0x093
+	enum ITEM_RAZZ_BERRY     @ 0x094
+	enum ITEM_BLUK_BERRY     @ 0x095
+	enum ITEM_NANAB_BERRY    @ 0x096
+	enum ITEM_WEPEAR_BERRY   @ 0x097
+	enum ITEM_PINAP_BERRY    @ 0x098
+	enum ITEM_POMEG_BERRY    @ 0x099
+	enum ITEM_KELPSY_BERRY   @ 0x09a
+	enum ITEM_QUALOT_BERRY   @ 0x09b
+	enum ITEM_HONDEW_BERRY   @ 0x09c
+	enum ITEM_GREPA_BERRY    @ 0x09d
+	enum ITEM_TAMATO_BERRY   @ 0x09e
+	enum ITEM_CORNN_BERRY    @ 0x09f
+	enum ITEM_MAGOST_BERRY   @ 0x0a0
+	enum ITEM_RABUTA_BERRY   @ 0x0a1
+	enum ITEM_NOMEL_BERRY    @ 0x0a2
+	enum ITEM_SPELON_BERRY   @ 0x0a3
+	enum ITEM_PAMTRE_BERRY   @ 0x0a4
+	enum ITEM_WATMEL_BERRY   @ 0x0a5
+	enum ITEM_DURIN_BERRY    @ 0x0a6
+	enum ITEM_BELUE_BERRY    @ 0x0a7
+	enum ITEM_LIECHI_BERRY   @ 0x0a8
+	enum ITEM_GANLON_BERRY   @ 0x0a9
+	enum ITEM_SALAC_BERRY    @ 0x0aa
+	enum ITEM_PETAYA_BERRY   @ 0x0ab
+	enum ITEM_APICOT_BERRY   @ 0x0ac
+	enum ITEM_LANSAT_BERRY   @ 0x0ad
+	enum ITEM_STARF_BERRY    @ 0x0ae
+	enum ITEM_ENIGMA_BERRY   @ 0x0af
+	enum ITEM_0B0
+	enum ITEM_0B1
+	enum ITEM_0B2
+	enum ITEM_BRIGHT_POWDER  @ 0x0b3
+	enum ITEM_WHITE_HERB     @ 0x0b4
+	enum ITEM_MACHO_BRACE    @ 0x0b5
+	enum ITEM_EXP_SHARE      @ 0x0b6
+	enum ITEM_QUICK_CLAW     @ 0x0b7
+	enum ITEM_SOOTHE_BELL    @ 0x0b8
+	enum ITEM_MENTAL_HERB    @ 0x0b9
+	enum ITEM_CHOICE_BAND    @ 0x0ba
+	enum ITEM_KINGS_ROCK     @ 0x0bb
+	enum ITEM_SILVER_POWDER  @ 0x0bc
+	enum ITEM_AMULET_COIN    @ 0x0bd
+	enum ITEM_CLEANSE_TAG    @ 0x0be
+	enum ITEM_SOUL_DEW       @ 0x0bf
+	enum ITEM_DEEP_SEA_TOOTH @ 0x0c0
+	enum ITEM_DEEP_SEA_SCALE @ 0x0c1
+	enum ITEM_SMOKE_BALL     @ 0x0c2
+	enum ITEM_EVERSTONE      @ 0x0c3
+	enum ITEM_FOCUS_BAND     @ 0x0c4
+	enum ITEM_LUCKY_EGG      @ 0x0c5
+	enum ITEM_SCOPE_LENS     @ 0x0c6
+	enum ITEM_METAL_COAT     @ 0x0c7
+	enum ITEM_LEFTOVERS      @ 0x0c8
+	enum ITEM_DRAGON_SCALE   @ 0x0c9
+	enum ITEM_LIGHT_BALL     @ 0x0ca
+	enum ITEM_SOFT_SAND      @ 0x0cb
+	enum ITEM_HARD_STONE     @ 0x0cc
+	enum ITEM_MIRACLE_SEED   @ 0x0cd
+	enum ITEM_BLACK_GLASSES  @ 0x0ce
+	enum ITEM_BLACK_BELT     @ 0x0cf
+	enum ITEM_MAGNET         @ 0x0d0
+	enum ITEM_MYSTIC_WATER   @ 0x0d1
+	enum ITEM_SHARP_BEAK     @ 0x0d2
+	enum ITEM_POISON_BARB    @ 0x0d3
+	enum ITEM_NEVER_MELT_ICE @ 0x0d4
+	enum ITEM_SPELL_TAG      @ 0x0d5
+	enum ITEM_TWISTED_SPOON  @ 0x0d6
+	enum ITEM_CHARCOAL       @ 0x0d7
+	enum ITEM_DRAGON_FANG    @ 0x0d8
+	enum ITEM_SILK_SCARF     @ 0x0d9
+	enum ITEM_UP_GRADE       @ 0x0da
+	enum ITEM_SHELL_BELL     @ 0x0db
+	enum ITEM_SEA_INCENSE    @ 0x0dc
+	enum ITEM_LAX_INCENSE    @ 0x0dd
+	enum ITEM_LUCKY_PUNCH    @ 0x0de
+	enum ITEM_METAL_POWDER   @ 0x0df
+	enum ITEM_THICK_CLUB     @ 0x0e0
+	enum ITEM_STICK          @ 0x0e1
+	enum ITEM_0E2
+	enum ITEM_0E3
+	enum ITEM_0E4
+	enum ITEM_0E5
+	enum ITEM_0E6
+	enum ITEM_0E7
+	enum ITEM_0E8
+	enum ITEM_0E9
+	enum ITEM_0EA
+	enum ITEM_0EB
+	enum ITEM_0EC
+	enum ITEM_0ED
+	enum ITEM_0EE
+	enum ITEM_0EF
+	enum ITEM_0F0
+	enum ITEM_0F1
+	enum ITEM_0F2
+	enum ITEM_0F3
+	enum ITEM_0F4
+	enum ITEM_0F5
+	enum ITEM_0F6
+	enum ITEM_0F7
+	enum ITEM_0F8
+	enum ITEM_0F9
+	enum ITEM_0FA
+	enum ITEM_0FB
+	enum ITEM_0FC
+	enum ITEM_0FD
+	enum ITEM_RED_SCARF      @ 0x0fe
+	enum ITEM_BLUE_SCARF     @ 0x0ff
+	enum ITEM_PINK_SCARF     @ 0x100
+	enum ITEM_GREEN_SCARF    @ 0x101
+	enum ITEM_YELLOW_SCARF   @ 0x102
+	enum ITEM_MACH_BIKE      @ 0x103
+	enum ITEM_COIN_CASE      @ 0x104
+	enum ITEM_ITEMFINDER     @ 0x105
+	enum ITEM_OLD_ROD        @ 0x106
+	enum ITEM_GOOD_ROD       @ 0x107
+	enum ITEM_SUPER_ROD      @ 0x108
+	enum ITEM_SS_TICKET      @ 0x109
+	enum ITEM_CONTEST_PASS   @ 0x10a
+	enum ITEM_10B
+	enum ITEM_WAILMER_PAIL   @ 0x10c
+	enum ITEM_DEVON_GOODS    @ 0x10d
+	enum ITEM_SOOT_SACK      @ 0x10e
+	enum ITEM_BASEMENT_KEY   @ 0x10f
+	enum ITEM_ACRO_BIKE      @ 0x110
+	enum ITEM_POKEBLOCK_CASE @ 0x111
+	enum ITEM_LETTER         @ 0x112
+	enum ITEM_EON_TICKET     @ 0x113
+	enum ITEM_RED_ORB        @ 0x114
+	enum ITEM_BLUE_ORB       @ 0x115
+	enum ITEM_SCANNER        @ 0x116
+	enum ITEM_GO_GOGGLES     @ 0x117
+	enum ITEM_METEORITE      @ 0x118
+	enum ITEM_ROOM_1_KEY     @ 0x119
+	enum ITEM_ROOM_2_KEY     @ 0x11a
+	enum ITEM_ROOM_4_KEY     @ 0x11b
+	enum ITEM_ROOM_6_KEY     @ 0x11c
+	enum ITEM_STORAGE_KEY    @ 0x11d
+	enum ITEM_ROOT_FOSSIL    @ 0x11e
+	enum ITEM_CLAW_FOSSIL    @ 0x11f
+	enum ITEM_DEVON_SCOPE    @ 0x120
+	enum ITEM_TM01           @ 0x121
+	enum ITEM_TM02           @ 0x122
+	enum ITEM_TM03           @ 0x123
+	enum ITEM_TM04           @ 0x124
+	enum ITEM_TM05           @ 0x125
+	enum ITEM_TM06           @ 0x126
+	enum ITEM_TM07           @ 0x127
+	enum ITEM_TM08           @ 0x128
+	enum ITEM_TM09           @ 0x129
+	enum ITEM_TM10           @ 0x12a
+	enum ITEM_TM11           @ 0x12b
+	enum ITEM_TM12           @ 0x12c
+	enum ITEM_TM13           @ 0x12d
+	enum ITEM_TM14           @ 0x12e
+	enum ITEM_TM15           @ 0x12f
+	enum ITEM_TM16           @ 0x130
+	enum ITEM_TM17           @ 0x131
+	enum ITEM_TM18           @ 0x132
+	enum ITEM_TM19           @ 0x133
+	enum ITEM_TM20           @ 0x134
+	enum ITEM_TM21           @ 0x135
+	enum ITEM_TM22           @ 0x136
+	enum ITEM_TM23           @ 0x137
+	enum ITEM_TM24           @ 0x138
+	enum ITEM_TM25           @ 0x139
+	enum ITEM_TM26           @ 0x13a
+	enum ITEM_TM27           @ 0x13b
+	enum ITEM_TM28           @ 0x13c
+	enum ITEM_TM29           @ 0x13d
+	enum ITEM_TM30           @ 0x13e
+	enum ITEM_TM31           @ 0x13f
+	enum ITEM_TM32           @ 0x140
+	enum ITEM_TM33           @ 0x141
+	enum ITEM_TM34           @ 0x142
+	enum ITEM_TM35           @ 0x143
+	enum ITEM_TM36           @ 0x144
+	enum ITEM_TM37           @ 0x145
+	enum ITEM_TM38           @ 0x146
+	enum ITEM_TM39           @ 0x147
+	enum ITEM_TM40           @ 0x148
+	enum ITEM_TM41           @ 0x149
+	enum ITEM_TM42           @ 0x14a
+	enum ITEM_TM43           @ 0x14b
+	enum ITEM_TM44           @ 0x14c
+	enum ITEM_TM45           @ 0x14d
+	enum ITEM_TM46           @ 0x14e
+	enum ITEM_TM47           @ 0x14f
+	enum ITEM_TM48           @ 0x150
+	enum ITEM_TM49           @ 0x151
+	enum ITEM_TM50           @ 0x152
+	enum ITEM_HM01           @ 0x153
+	enum ITEM_HM02           @ 0x154
+	enum ITEM_HM03           @ 0x155
+	enum ITEM_HM04           @ 0x156
+	enum ITEM_HM05           @ 0x157
+	enum ITEM_HM06           @ 0x158
+	enum ITEM_HM07           @ 0x159
+	enum ITEM_HM08           @ 0x15a
+	enum ITEM_15B
+	enum ITEM_15C
+
+	@ FireRed/LeafGreen
+	enum ITEM_OAKS_PARCEL    @ 0x15d
+	enum ITEM_POKE_FLUTE     @ 0x15e
+	enum ITEM_SECRET_KEY     @ 0x15f
+	enum ITEM_BIKE_VOUCHER   @ 0x160
+	enum ITEM_GOLD_TEETH     @ 0x161
+	enum ITEM_OLD_AMBER      @ 0x162
+	enum ITEM_CARD_KEY       @ 0x163
+	enum ITEM_LIFT_KEY       @ 0x164
+	enum ITEM_HELIX_FOSSIL   @ 0x165
+	enum ITEM_DOME_FOSSIL    @ 0x166
+	enum ITEM_SILPH_SCOPE    @ 0x167
+	enum ITEM_BICYCLE        @ 0x168
+	enum ITEM_TOWN_MAP       @ 0x169
+	enum ITEM_VS_SEEKER      @ 0x16a
+	enum ITEM_FAME_CHECKER   @ 0x16b
+	enum ITEM_TM_CASE        @ 0x16c
+	enum ITEM_BERRY_POUCH    @ 0x16d
+	enum ITEM_TEACHY_TV      @ 0x16e
+	enum ITEM_TRI_PASS       @ 0x16f
+	enum ITEM_RAINBOW_PASS   @ 0x170
+	enum ITEM_TEA            @ 0x171
+	enum ITEM_MYSTIC_TICKET  @ 0x172
+	enum ITEM_AURORA_TICKET  @ 0x173
+	enum ITEM_POWDER_JAR     @ 0x174
+	enum ITEM_RUBY           @ 0x175
+	enum ITEM_SAPPHIRE       @ 0x176
+
+	@ Emerald
+	enum ITEM_MAGMA_EMBLEM   @ 0x177
+	enum ITEM_OLD_SEA_MAP    @ 0x178
diff --git a/constants/map_constants.inc b/constants/map_constants.inc
index d7a8a323e..6d92c5e65 100644
--- a/constants/map_constants.inc
+++ b/constants/map_constants.inc
@@ -461,3 +461,4 @@
 
 	new_map_group
 	map_group Route124_DivingTreasureHuntersHouse     @ 33.0
+
diff --git a/constants/misc_constants.inc b/constants/misc_constants.inc
index 64f671e8f..438fed6b6 100644
--- a/constants/misc_constants.inc
+++ b/constants/misc_constants.inc
@@ -31,3 +31,15 @@
 
 	.equiv MALE, 0
 	.equiv FEMALE, 1
+
+	.equiv GAME_LANGUAGE, 2
+	
+	.equiv ENEMY_TYPE1,  0
+	.equiv ENEMY_TYPE2,  1
+	.equiv PLAYER_TYPE1,  2
+	.equiv PLAYER_TYPE2,  3
+	.equiv CURRENT_MOVE,  4
+	
+	.equiv LESS_THAN, 0
+	.equiv GREATER_THAN, 1
+	.equiv EQUAL, 2
diff --git a/constants/species_constants.inc b/constants/species_constants.inc
index 8f164a1d9..d023662b7 100644
--- a/constants/species_constants.inc
+++ b/constants/species_constants.inc
@@ -1,386 +1,448 @@
-	.set SPECIES_BULBASAUR,  0x001
-	.set SPECIES_IVYSAUR,    0x002
-	.set SPECIES_VENUSAUR,   0x003
-	.set SPECIES_CHARMANDER, 0x004
-	.set SPECIES_CHARMELEON, 0x005
-	.set SPECIES_CHARIZARD,  0x006
-	.set SPECIES_SQUIRTLE,   0x007
-	.set SPECIES_WARTORTLE,  0x008
-	.set SPECIES_BLASTOISE,  0x009
-	.set SPECIES_CATERPIE,   0x00a
-	.set SPECIES_METAPOD,    0x00b
-	.set SPECIES_BUTTERFREE, 0x00c
-	.set SPECIES_WEEDLE,     0x00d
-	.set SPECIES_KAKUNA,     0x00e
-	.set SPECIES_BEEDRILL,   0x00f
-	.set SPECIES_PIDGEY,     0x010
-	.set SPECIES_PIDGEOTTO,  0x011
-	.set SPECIES_PIDGEOT,    0x012
-	.set SPECIES_RATTATA,    0x013
-	.set SPECIES_RATICATE,   0x014
-	.set SPECIES_SPEAROW,    0x015
-	.set SPECIES_FEAROW,     0x016
-	.set SPECIES_EKANS,      0x017
-	.set SPECIES_ARBOK,      0x018
-	.set SPECIES_PIKACHU,    0x019
-	.set SPECIES_RAICHU,     0x01a
-	.set SPECIES_SANDSHREW,  0x01b
-	.set SPECIES_SANDSLASH,  0x01c
-	.set SPECIES_NIDORAN_F,  0x01d
-	.set SPECIES_NIDORINA,   0x01e
-	.set SPECIES_NIDOQUEEN,  0x01f
-	.set SPECIES_NIDORAN_M,  0x020
-	.set SPECIES_NIDORINO,   0x021
-	.set SPECIES_NIDOKING,   0x022
-	.set SPECIES_CLEFAIRY,   0x023
-	.set SPECIES_CLEFABLE,   0x024
-	.set SPECIES_VULPIX,     0x025
-	.set SPECIES_NINETALES,  0x026
-	.set SPECIES_JIGGLYPUFF, 0x027
-	.set SPECIES_WIGGLYTUFF, 0x028
-	.set SPECIES_ZUBAT,      0x029
-	.set SPECIES_GOLBAT,     0x02a
-	.set SPECIES_ODDISH,     0x02b
-	.set SPECIES_GLOOM,      0x02c
-	.set SPECIES_VILEPLUME,  0x02d
-	.set SPECIES_PARAS,      0x02e
-	.set SPECIES_PARASECT,   0x02f
-	.set SPECIES_VENONAT,    0x030
-	.set SPECIES_VENOMOTH,   0x031
-	.set SPECIES_DIGLETT,    0x032
-	.set SPECIES_DUGTRIO,    0x033
-	.set SPECIES_MEOWTH,     0x034
-	.set SPECIES_PERSIAN,    0x035
-	.set SPECIES_PSYDUCK,    0x036
-	.set SPECIES_GOLDUCK,    0x037
-	.set SPECIES_MANKEY,     0x038
-	.set SPECIES_PRIMEAPE,   0x039
-	.set SPECIES_GROWLITHE,  0x03a
-	.set SPECIES_ARCANINE,   0x03b
-	.set SPECIES_POLIWAG,    0x03c
-	.set SPECIES_POLIWHIRL,  0x03d
-	.set SPECIES_POLIWRATH,  0x03e
-	.set SPECIES_ABRA,       0x03f
-	.set SPECIES_KADABRA,    0x040
-	.set SPECIES_ALAKAZAM,   0x041
-	.set SPECIES_MACHOP,     0x042
-	.set SPECIES_MACHOKE,    0x043
-	.set SPECIES_MACHAMP,    0x044
-	.set SPECIES_BELLSPROUT, 0x045
-	.set SPECIES_WEEPINBELL, 0x046
-	.set SPECIES_VICTREEBEL, 0x047
-	.set SPECIES_TENTACOOL,  0x048
-	.set SPECIES_TENTACRUEL, 0x049
-	.set SPECIES_GEODUDE,    0x04a
-	.set SPECIES_GRAVELER,   0x04b
-	.set SPECIES_GOLEM,      0x04c
-	.set SPECIES_PONYTA,     0x04d
-	.set SPECIES_RAPIDASH,   0x04e
-	.set SPECIES_SLOWPOKE,   0x04f
-	.set SPECIES_SLOWBRO,    0x050
-	.set SPECIES_MAGNEMITE,  0x051
-	.set SPECIES_MAGNETON,   0x052
-	.set SPECIES_FARFETCHD,  0x053
-	.set SPECIES_DODUO,      0x054
-	.set SPECIES_DODRIO,     0x055
-	.set SPECIES_SEEL,       0x056
-	.set SPECIES_DEWGONG,    0x057
-	.set SPECIES_GRIMER,     0x058
-	.set SPECIES_MUK,        0x059
-	.set SPECIES_SHELLDER,   0x05a
-	.set SPECIES_CLOYSTER,   0x05b
-	.set SPECIES_GASTLY,     0x05c
-	.set SPECIES_HAUNTER,    0x05d
-	.set SPECIES_GENGAR,     0x05e
-	.set SPECIES_ONIX,       0x05f
-	.set SPECIES_DROWZEE,    0x060
-	.set SPECIES_HYPNO,      0x061
-	.set SPECIES_KRABBY,     0x062
-	.set SPECIES_KINGLER,    0x063
-	.set SPECIES_VOLTORB,    0x064
-	.set SPECIES_ELECTRODE,  0x065
-	.set SPECIES_EXEGGCUTE,  0x066
-	.set SPECIES_EXEGGUTOR,  0x067
-	.set SPECIES_CUBONE,     0x068
-	.set SPECIES_MAROWAK,    0x069
-	.set SPECIES_HITMONLEE,  0x06a
-	.set SPECIES_HITMONCHAN, 0x06b
-	.set SPECIES_LICKITUNG,  0x06c
-	.set SPECIES_KOFFING,    0x06d
-	.set SPECIES_WEEZING,    0x06e
-	.set SPECIES_RHYHORN,    0x06f
-	.set SPECIES_RHYDON,     0x070
-	.set SPECIES_CHANSEY,    0x071
-	.set SPECIES_TANGELA,    0x072
-	.set SPECIES_KANGASKHAN, 0x073
-	.set SPECIES_HORSEA,     0x074
-	.set SPECIES_SEADRA,     0x075
-	.set SPECIES_GOLDEEN,    0x076
-	.set SPECIES_SEAKING,    0x077
-	.set SPECIES_STARYU,     0x078
-	.set SPECIES_STARMIE,    0x079
-	.set SPECIES_MR_MIME,    0x07a
-	.set SPECIES_SCYTHER,    0x07b
-	.set SPECIES_JYNX,       0x07c
-	.set SPECIES_ELECTABUZZ, 0x07d
-	.set SPECIES_MAGMAR,     0x07e
-	.set SPECIES_PINSIR,     0x07f
-	.set SPECIES_TAUROS,     0x080
-	.set SPECIES_MAGIKARP,   0x081
-	.set SPECIES_GYARADOS,   0x082
-	.set SPECIES_LAPRAS,     0x083
-	.set SPECIES_DITTO,      0x084
-	.set SPECIES_EEVEE,      0x085
-	.set SPECIES_VAPOREON,   0x086
-	.set SPECIES_JOLTEON,    0x087
-	.set SPECIES_FLAREON,    0x088
-	.set SPECIES_PORYGON,    0x089
-	.set SPECIES_OMANYTE,    0x08a
-	.set SPECIES_OMASTAR,    0x08b
-	.set SPECIES_KABUTO,     0x08c
-	.set SPECIES_KABUTOPS,   0x08d
-	.set SPECIES_AERODACTYL, 0x08e
-	.set SPECIES_SNORLAX,    0x08f
-	.set SPECIES_ARTICUNO,   0x090
-	.set SPECIES_ZAPDOS,     0x091
-	.set SPECIES_MOLTRES,    0x092
-	.set SPECIES_DRATINI,    0x093
-	.set SPECIES_DRAGONAIR,  0x094
-	.set SPECIES_DRAGONITE,  0x095
-	.set SPECIES_MEWTWO,     0x096
-	.set SPECIES_MEW,        0x097
-	.set SPECIES_CHIKORITA,  0x098
-	.set SPECIES_BAYLEEF,    0x099
-	.set SPECIES_MEGANIUM,   0x09a
-	.set SPECIES_CYNDAQUIL,  0x09b
-	.set SPECIES_QUILAVA,    0x09c
-	.set SPECIES_TYPHLOSION, 0x09d
-	.set SPECIES_TOTODILE,   0x09e
-	.set SPECIES_CROCONAW,   0x09f
-	.set SPECIES_FERALIGATR, 0x0a0
-	.set SPECIES_SENTRET,    0x0a1
-	.set SPECIES_FURRET,     0x0a2
-	.set SPECIES_HOOTHOOT,   0x0a3
-	.set SPECIES_NOCTOWL,    0x0a4
-	.set SPECIES_LEDYBA,     0x0a5
-	.set SPECIES_LEDIAN,     0x0a6
-	.set SPECIES_SPINARAK,   0x0a7
-	.set SPECIES_ARIADOS,    0x0a8
-	.set SPECIES_CROBAT,     0x0a9
-	.set SPECIES_CHINCHOU,   0x0aa
-	.set SPECIES_LANTURN,    0x0ab
-	.set SPECIES_PICHU,      0x0ac
-	.set SPECIES_CLEFFA,     0x0ad
-	.set SPECIES_IGGLYBUFF,  0x0ae
-	.set SPECIES_TOGEPI,     0x0af
-	.set SPECIES_TOGETIC,    0x0b0
-	.set SPECIES_NATU,       0x0b1
-	.set SPECIES_XATU,       0x0b2
-	.set SPECIES_MAREEP,     0x0b3
-	.set SPECIES_FLAAFFY,    0x0b4
-	.set SPECIES_AMPHAROS,   0x0b5
-	.set SPECIES_BELLOSSOM,  0x0b6
-	.set SPECIES_MARILL,     0x0b7
-	.set SPECIES_AZUMARILL,  0x0b8
-	.set SPECIES_SUDOWOODO,  0x0b9
-	.set SPECIES_POLITOED,   0x0ba
-	.set SPECIES_HOPPIP,     0x0bb
-	.set SPECIES_SKIPLOOM,   0x0bc
-	.set SPECIES_JUMPLUFF,   0x0bd
-	.set SPECIES_AIPOM,      0x0be
-	.set SPECIES_SUNKERN,    0x0bf
-	.set SPECIES_SUNFLORA,   0x0c0
-	.set SPECIES_YANMA,      0x0c1
-	.set SPECIES_WOOPER,     0x0c2
-	.set SPECIES_QUAGSIRE,   0x0c3
-	.set SPECIES_ESPEON,     0x0c4
-	.set SPECIES_UMBREON,    0x0c5
-	.set SPECIES_MURKROW,    0x0c6
-	.set SPECIES_SLOWKING,   0x0c7
-	.set SPECIES_MISDREAVUS, 0x0c8
-	.set SPECIES_UNOWN,      0x0c9
-	.set SPECIES_WOBBUFFET,  0x0ca
-	.set SPECIES_GIRAFARIG,  0x0cb
-	.set SPECIES_PINECO,     0x0cc
-	.set SPECIES_FORRETRESS, 0x0cd
-	.set SPECIES_DUNSPARCE,  0x0ce
-	.set SPECIES_GLIGAR,     0x0cf
-	.set SPECIES_STEELIX,    0x0d0
-	.set SPECIES_SNUBBULL,   0x0d1
-	.set SPECIES_GRANBULL,   0x0d2
-	.set SPECIES_QWILFISH,   0x0d3
-	.set SPECIES_SCIZOR,     0x0d4
-	.set SPECIES_SHUCKLE,    0x0d5
-	.set SPECIES_HERACROSS,  0x0d6
-	.set SPECIES_SNEASEL,    0x0d7
-	.set SPECIES_TEDDIURSA,  0x0d8
-	.set SPECIES_URSARING,   0x0d9
-	.set SPECIES_SLUGMA,     0x0da
-	.set SPECIES_MAGCARGO,   0x0db
-	.set SPECIES_SWINUB,     0x0dc
-	.set SPECIES_PILOSWINE,  0x0dd
-	.set SPECIES_CORSOLA,    0x0de
-	.set SPECIES_REMORAID,   0x0df
-	.set SPECIES_OCTILLERY,  0x0e0
-	.set SPECIES_DELIBIRD,   0x0e1
-	.set SPECIES_MANTINE,    0x0e2
-	.set SPECIES_SKARMORY,   0x0e3
-	.set SPECIES_HOUNDOUR,   0x0e4
-	.set SPECIES_HOUNDOOM,   0x0e5
-	.set SPECIES_KINGDRA,    0x0e6
-	.set SPECIES_PHANPY,     0x0e7
-	.set SPECIES_DONPHAN,    0x0e8
-	.set SPECIES_PORYGON2,   0x0e9
-	.set SPECIES_STANTLER,   0x0ea
-	.set SPECIES_SMEARGLE,   0x0eb
-	.set SPECIES_TYROGUE,    0x0ec
-	.set SPECIES_HITMONTOP,  0x0ed
-	.set SPECIES_SMOOCHUM,   0x0ee
-	.set SPECIES_ELEKID,     0x0ef
-	.set SPECIES_MAGBY,      0x0f0
-	.set SPECIES_MILTANK,    0x0f1
-	.set SPECIES_BLISSEY,    0x0f2
-	.set SPECIES_RAIKOU,     0x0f3
-	.set SPECIES_ENTEI,      0x0f4
-	.set SPECIES_SUICUNE,    0x0f5
-	.set SPECIES_LARVITAR,   0x0f6
-	.set SPECIES_PUPITAR,    0x0f7
-	.set SPECIES_TYRANITAR,  0x0f8
-	.set SPECIES_LUGIA,      0x0f9
-	.set SPECIES_HO_OH,      0x0fa
-	.set SPECIES_CELEBI,     0x0fb
-	.set SPECIES_TREECKO,    0x115
-	.set SPECIES_GROVYLE,    0x116
-	.set SPECIES_SCEPTILE,   0x117
-	.set SPECIES_TORCHIC,    0x118
-	.set SPECIES_COMBUSKEN,  0x119
-	.set SPECIES_BLAZIKEN,   0x11a
-	.set SPECIES_MUDKIP,     0x11b
-	.set SPECIES_MARSHTOMP,  0x11c
-	.set SPECIES_SWAMPERT,   0x11d
-	.set SPECIES_POOCHYENA,  0x11e
-	.set SPECIES_MIGHTYENA,  0x11f
-	.set SPECIES_ZIGZAGOON,  0x120
-	.set SPECIES_LINOONE,    0x121
-	.set SPECIES_WURMPLE,    0x122
-	.set SPECIES_SILCOON,    0x123
-	.set SPECIES_BEAUTIFLY,  0x124
-	.set SPECIES_CASCOON,    0x125
-	.set SPECIES_DUSTOX,     0x126
-	.set SPECIES_LOTAD,      0x127
-	.set SPECIES_LOMBRE,     0x128
-	.set SPECIES_LUDICOLO,   0x129
-	.set SPECIES_SEEDOT,     0x12a
-	.set SPECIES_NUZLEAF,    0x12b
-	.set SPECIES_SHIFTRY,    0x12c
-	.set SPECIES_NINCADA,    0x12d
-	.set SPECIES_NINJASK,    0x12e
-	.set SPECIES_SHEDINJA,   0x12f
-	.set SPECIES_TAILLOW,    0x130
-	.set SPECIES_SWELLOW,    0x131
-	.set SPECIES_SHROOMISH,  0x132
-	.set SPECIES_BRELOOM,    0x133
-	.set SPECIES_SPINDA,     0x134
-	.set SPECIES_WINGULL,    0x135
-	.set SPECIES_PELIPPER,   0x136
-	.set SPECIES_SURSKIT,    0x137
-	.set SPECIES_MASQUERAIN, 0x138
-	.set SPECIES_WAILMER,    0x139
-	.set SPECIES_WAILORD,    0x13a
-	.set SPECIES_SKITTY,     0x13b
-	.set SPECIES_DELCATTY,   0x13c
-	.set SPECIES_KECLEON,    0x13d
-	.set SPECIES_BALTOY,     0x13e
-	.set SPECIES_CLAYDOL,    0x13f
-	.set SPECIES_NOSEPASS,   0x140
-	.set SPECIES_TORKOAL,    0x141
-	.set SPECIES_SABLEYE,    0x142
-	.set SPECIES_BARBOACH,   0x143
-	.set SPECIES_WHISCASH,   0x144
-	.set SPECIES_LUVDISC,    0x145
-	.set SPECIES_CORPHISH,   0x146
-	.set SPECIES_CRAWDAUNT,  0x147
-	.set SPECIES_FEEBAS,     0x148
-	.set SPECIES_MILOTIC,    0x149
-	.set SPECIES_CARVANHA,   0x14a
-	.set SPECIES_SHARPEDO,   0x14b
-	.set SPECIES_TRAPINCH,   0x14c
-	.set SPECIES_VIBRAVA,    0x14d
-	.set SPECIES_FLYGON,     0x14e
-	.set SPECIES_MAKUHITA,   0x14f
-	.set SPECIES_HARIYAMA,   0x150
-	.set SPECIES_ELECTRIKE,  0x151
-	.set SPECIES_MANECTRIC,  0x152
-	.set SPECIES_NUMEL,      0x153
-	.set SPECIES_CAMERUPT,   0x154
-	.set SPECIES_SPHEAL,     0x155
-	.set SPECIES_SEALEO,     0x156
-	.set SPECIES_WALREIN,    0x157
-	.set SPECIES_CACNEA,     0x158
-	.set SPECIES_CACTURNE,   0x159
-	.set SPECIES_SNORUNT,    0x15a
-	.set SPECIES_GLALIE,     0x15b
-	.set SPECIES_LUNATONE,   0x15c
-	.set SPECIES_SOLROCK,    0x15d
-	.set SPECIES_AZURILL,    0x15e
-	.set SPECIES_SPOINK,     0x15f
-	.set SPECIES_GRUMPIG,    0x160
-	.set SPECIES_PLUSLE,     0x161
-	.set SPECIES_MINUN,      0x162
-	.set SPECIES_MAWILE,     0x163
-	.set SPECIES_MEDITITE,   0x164
-	.set SPECIES_MEDICHAM,   0x165
-	.set SPECIES_SWABLU,     0x166
-	.set SPECIES_ALTARIA,    0x167
-	.set SPECIES_WYNAUT,     0x168
-	.set SPECIES_DUSKULL,    0x169
-	.set SPECIES_DUSCLOPS,   0x16a
-	.set SPECIES_ROSELIA,    0x16b
-	.set SPECIES_SLAKOTH,    0x16c
-	.set SPECIES_VIGOROTH,   0x16d
-	.set SPECIES_SLAKING,    0x16e
-	.set SPECIES_GULPIN,     0x16f
-	.set SPECIES_SWALOT,     0x170
-	.set SPECIES_TROPIUS,    0x171
-	.set SPECIES_WHISMUR,    0x172
-	.set SPECIES_LOUDRED,    0x173
-	.set SPECIES_EXPLOUD,    0x174
-	.set SPECIES_CLAMPERL,   0x175
-	.set SPECIES_HUNTAIL,    0x176
-	.set SPECIES_GOREBYSS,   0x177
-	.set SPECIES_ABSOL,      0x178
-	.set SPECIES_SHUPPET,    0x179
-	.set SPECIES_BANETTE,    0x17a
-	.set SPECIES_SEVIPER,    0x17b
-	.set SPECIES_ZANGOOSE,   0x17c
-	.set SPECIES_RELICANTH,  0x17d
-	.set SPECIES_ARON,       0x17e
-	.set SPECIES_LAIRON,     0x17f
-	.set SPECIES_AGGRON,     0x180
-	.set SPECIES_CASTFORM,   0x181
-	.set SPECIES_VOLBEAT,    0x182
-	.set SPECIES_ILLUMISE,   0x183
-	.set SPECIES_LILEEP,     0x184
-	.set SPECIES_CRADILY,    0x185
-	.set SPECIES_ANORITH,    0x186
-	.set SPECIES_ARMALDO,    0x187
-	.set SPECIES_RALTS,      0x188
-	.set SPECIES_KIRLIA,     0x189
-	.set SPECIES_GARDEVOIR,  0x18a
-	.set SPECIES_BAGON,      0x18b
-	.set SPECIES_SHELGON,    0x18c
-	.set SPECIES_SALAMENCE,  0x18d
-	.set SPECIES_BELDUM,     0x18e
-	.set SPECIES_METANG,     0x18f
-	.set SPECIES_METAGROSS,  0x190
-	.set SPECIES_REGIROCK,   0x191
-	.set SPECIES_REGICE,     0x192
-	.set SPECIES_REGISTEEL,  0x193
-	.set SPECIES_KYOGRE,     0x194
-	.set SPECIES_GROUDON,    0x195
-	.set SPECIES_RAYQUAZA,   0x196
-	.set SPECIES_LATIAS,     0x197
-	.set SPECIES_LATIOS,     0x198
-	.set SPECIES_JIRACHI,    0x199
-	.set SPECIES_DEOXYS,     0x19a
-	.set SPECIES_CHIMECHO,   0x19b
+	.include "asm/macros/asm.inc"
+
+	enum_start
+	enum SPECIES_NONE       @ 0x000
+	enum SPECIES_BULBASAUR  @ 0x001
+	enum SPECIES_IVYSAUR    @ 0x002
+	enum SPECIES_VENUSAUR   @ 0x003
+	enum SPECIES_CHARMANDER @ 0x004
+	enum SPECIES_CHARMELEON @ 0x005
+	enum SPECIES_CHARIZARD  @ 0x006
+	enum SPECIES_SQUIRTLE   @ 0x007
+	enum SPECIES_WARTORTLE  @ 0x008
+	enum SPECIES_BLASTOISE  @ 0x009
+	enum SPECIES_CATERPIE   @ 0x00a
+	enum SPECIES_METAPOD    @ 0x00b
+	enum SPECIES_BUTTERFREE @ 0x00c
+	enum SPECIES_WEEDLE     @ 0x00d
+	enum SPECIES_KAKUNA     @ 0x00e
+	enum SPECIES_BEEDRILL   @ 0x00f
+	enum SPECIES_PIDGEY     @ 0x010
+	enum SPECIES_PIDGEOTTO  @ 0x011
+	enum SPECIES_PIDGEOT    @ 0x012
+	enum SPECIES_RATTATA    @ 0x013
+	enum SPECIES_RATICATE   @ 0x014
+	enum SPECIES_SPEAROW    @ 0x015
+	enum SPECIES_FEAROW     @ 0x016
+	enum SPECIES_EKANS      @ 0x017
+	enum SPECIES_ARBOK      @ 0x018
+	enum SPECIES_PIKACHU    @ 0x019
+	enum SPECIES_RAICHU     @ 0x01a
+	enum SPECIES_SANDSHREW  @ 0x01b
+	enum SPECIES_SANDSLASH  @ 0x01c
+	enum SPECIES_NIDORAN_F  @ 0x01d
+	enum SPECIES_NIDORINA   @ 0x01e
+	enum SPECIES_NIDOQUEEN  @ 0x01f
+	enum SPECIES_NIDORAN_M  @ 0x020
+	enum SPECIES_NIDORINO   @ 0x021
+	enum SPECIES_NIDOKING   @ 0x022
+	enum SPECIES_CLEFAIRY   @ 0x023
+	enum SPECIES_CLEFABLE   @ 0x024
+	enum SPECIES_VULPIX     @ 0x025
+	enum SPECIES_NINETALES  @ 0x026
+	enum SPECIES_JIGGLYPUFF @ 0x027
+	enum SPECIES_WIGGLYTUFF @ 0x028
+	enum SPECIES_ZUBAT      @ 0x029
+	enum SPECIES_GOLBAT     @ 0x02a
+	enum SPECIES_ODDISH     @ 0x02b
+	enum SPECIES_GLOOM      @ 0x02c
+	enum SPECIES_VILEPLUME  @ 0x02d
+	enum SPECIES_PARAS      @ 0x02e
+	enum SPECIES_PARASECT   @ 0x02f
+	enum SPECIES_VENONAT    @ 0x030
+	enum SPECIES_VENOMOTH   @ 0x031
+	enum SPECIES_DIGLETT    @ 0x032
+	enum SPECIES_DUGTRIO    @ 0x033
+	enum SPECIES_MEOWTH     @ 0x034
+	enum SPECIES_PERSIAN    @ 0x035
+	enum SPECIES_PSYDUCK    @ 0x036
+	enum SPECIES_GOLDUCK    @ 0x037
+	enum SPECIES_MANKEY     @ 0x038
+	enum SPECIES_PRIMEAPE   @ 0x039
+	enum SPECIES_GROWLITHE  @ 0x03a
+	enum SPECIES_ARCANINE   @ 0x03b
+	enum SPECIES_POLIWAG    @ 0x03c
+	enum SPECIES_POLIWHIRL  @ 0x03d
+	enum SPECIES_POLIWRATH  @ 0x03e
+	enum SPECIES_ABRA       @ 0x03f
+	enum SPECIES_KADABRA    @ 0x040
+	enum SPECIES_ALAKAZAM   @ 0x041
+	enum SPECIES_MACHOP     @ 0x042
+	enum SPECIES_MACHOKE    @ 0x043
+	enum SPECIES_MACHAMP    @ 0x044
+	enum SPECIES_BELLSPROUT @ 0x045
+	enum SPECIES_WEEPINBELL @ 0x046
+	enum SPECIES_VICTREEBEL @ 0x047
+	enum SPECIES_TENTACOOL  @ 0x048
+	enum SPECIES_TENTACRUEL @ 0x049
+	enum SPECIES_GEODUDE    @ 0x04a
+	enum SPECIES_GRAVELER   @ 0x04b
+	enum SPECIES_GOLEM      @ 0x04c
+	enum SPECIES_PONYTA     @ 0x04d
+	enum SPECIES_RAPIDASH   @ 0x04e
+	enum SPECIES_SLOWPOKE   @ 0x04f
+	enum SPECIES_SLOWBRO    @ 0x050
+	enum SPECIES_MAGNEMITE  @ 0x051
+	enum SPECIES_MAGNETON   @ 0x052
+	enum SPECIES_FARFETCHD  @ 0x053
+	enum SPECIES_DODUO      @ 0x054
+	enum SPECIES_DODRIO     @ 0x055
+	enum SPECIES_SEEL       @ 0x056
+	enum SPECIES_DEWGONG    @ 0x057
+	enum SPECIES_GRIMER     @ 0x058
+	enum SPECIES_MUK        @ 0x059
+	enum SPECIES_SHELLDER   @ 0x05a
+	enum SPECIES_CLOYSTER   @ 0x05b
+	enum SPECIES_GASTLY     @ 0x05c
+	enum SPECIES_HAUNTER    @ 0x05d
+	enum SPECIES_GENGAR     @ 0x05e
+	enum SPECIES_ONIX       @ 0x05f
+	enum SPECIES_DROWZEE    @ 0x060
+	enum SPECIES_HYPNO      @ 0x061
+	enum SPECIES_KRABBY     @ 0x062
+	enum SPECIES_KINGLER    @ 0x063
+	enum SPECIES_VOLTORB    @ 0x064
+	enum SPECIES_ELECTRODE  @ 0x065
+	enum SPECIES_EXEGGCUTE  @ 0x066
+	enum SPECIES_EXEGGUTOR  @ 0x067
+	enum SPECIES_CUBONE     @ 0x068
+	enum SPECIES_MAROWAK    @ 0x069
+	enum SPECIES_HITMONLEE  @ 0x06a
+	enum SPECIES_HITMONCHAN @ 0x06b
+	enum SPECIES_LICKITUNG  @ 0x06c
+	enum SPECIES_KOFFING    @ 0x06d
+	enum SPECIES_WEEZING    @ 0x06e
+	enum SPECIES_RHYHORN    @ 0x06f
+	enum SPECIES_RHYDON     @ 0x070
+	enum SPECIES_CHANSEY    @ 0x071
+	enum SPECIES_TANGELA    @ 0x072
+	enum SPECIES_KANGASKHAN @ 0x073
+	enum SPECIES_HORSEA     @ 0x074
+	enum SPECIES_SEADRA     @ 0x075
+	enum SPECIES_GOLDEEN    @ 0x076
+	enum SPECIES_SEAKING    @ 0x077
+	enum SPECIES_STARYU     @ 0x078
+	enum SPECIES_STARMIE    @ 0x079
+	enum SPECIES_MR_MIME    @ 0x07a
+	enum SPECIES_SCYTHER    @ 0x07b
+	enum SPECIES_JYNX       @ 0x07c
+	enum SPECIES_ELECTABUZZ @ 0x07d
+	enum SPECIES_MAGMAR     @ 0x07e
+	enum SPECIES_PINSIR     @ 0x07f
+	enum SPECIES_TAUROS     @ 0x080
+	enum SPECIES_MAGIKARP   @ 0x081
+	enum SPECIES_GYARADOS   @ 0x082
+	enum SPECIES_LAPRAS     @ 0x083
+	enum SPECIES_DITTO      @ 0x084
+	enum SPECIES_EEVEE      @ 0x085
+	enum SPECIES_VAPOREON   @ 0x086
+	enum SPECIES_JOLTEON    @ 0x087
+	enum SPECIES_FLAREON    @ 0x088
+	enum SPECIES_PORYGON    @ 0x089
+	enum SPECIES_OMANYTE    @ 0x08a
+	enum SPECIES_OMASTAR    @ 0x08b
+	enum SPECIES_KABUTO     @ 0x08c
+	enum SPECIES_KABUTOPS   @ 0x08d
+	enum SPECIES_AERODACTYL @ 0x08e
+	enum SPECIES_SNORLAX    @ 0x08f
+	enum SPECIES_ARTICUNO   @ 0x090
+	enum SPECIES_ZAPDOS     @ 0x091
+	enum SPECIES_MOLTRES    @ 0x092
+	enum SPECIES_DRATINI    @ 0x093
+	enum SPECIES_DRAGONAIR  @ 0x094
+	enum SPECIES_DRAGONITE  @ 0x095
+	enum SPECIES_MEWTWO     @ 0x096
+	enum SPECIES_MEW        @ 0x097
+	enum SPECIES_CHIKORITA  @ 0x098
+	enum SPECIES_BAYLEEF    @ 0x099
+	enum SPECIES_MEGANIUM   @ 0x09a
+	enum SPECIES_CYNDAQUIL  @ 0x09b
+	enum SPECIES_QUILAVA    @ 0x09c
+	enum SPECIES_TYPHLOSION @ 0x09d
+	enum SPECIES_TOTODILE   @ 0x09e
+	enum SPECIES_CROCONAW   @ 0x09f
+	enum SPECIES_FERALIGATR @ 0x0a0
+	enum SPECIES_SENTRET    @ 0x0a1
+	enum SPECIES_FURRET     @ 0x0a2
+	enum SPECIES_HOOTHOOT   @ 0x0a3
+	enum SPECIES_NOCTOWL    @ 0x0a4
+	enum SPECIES_LEDYBA     @ 0x0a5
+	enum SPECIES_LEDIAN     @ 0x0a6
+	enum SPECIES_SPINARAK   @ 0x0a7
+	enum SPECIES_ARIADOS    @ 0x0a8
+	enum SPECIES_CROBAT     @ 0x0a9
+	enum SPECIES_CHINCHOU   @ 0x0aa
+	enum SPECIES_LANTURN    @ 0x0ab
+	enum SPECIES_PICHU      @ 0x0ac
+	enum SPECIES_CLEFFA     @ 0x0ad
+	enum SPECIES_IGGLYBUFF  @ 0x0ae
+	enum SPECIES_TOGEPI     @ 0x0af
+	enum SPECIES_TOGETIC    @ 0x0b0
+	enum SPECIES_NATU       @ 0x0b1
+	enum SPECIES_XATU       @ 0x0b2
+	enum SPECIES_MAREEP     @ 0x0b3
+	enum SPECIES_FLAAFFY    @ 0x0b4
+	enum SPECIES_AMPHAROS   @ 0x0b5
+	enum SPECIES_BELLOSSOM  @ 0x0b6
+	enum SPECIES_MARILL     @ 0x0b7
+	enum SPECIES_AZUMARILL  @ 0x0b8
+	enum SPECIES_SUDOWOODO  @ 0x0b9
+	enum SPECIES_POLITOED   @ 0x0ba
+	enum SPECIES_HOPPIP     @ 0x0bb
+	enum SPECIES_SKIPLOOM   @ 0x0bc
+	enum SPECIES_JUMPLUFF   @ 0x0bd
+	enum SPECIES_AIPOM      @ 0x0be
+	enum SPECIES_SUNKERN    @ 0x0bf
+	enum SPECIES_SUNFLORA   @ 0x0c0
+	enum SPECIES_YANMA      @ 0x0c1
+	enum SPECIES_WOOPER     @ 0x0c2
+	enum SPECIES_QUAGSIRE   @ 0x0c3
+	enum SPECIES_ESPEON     @ 0x0c4
+	enum SPECIES_UMBREON    @ 0x0c5
+	enum SPECIES_MURKROW    @ 0x0c6
+	enum SPECIES_SLOWKING   @ 0x0c7
+	enum SPECIES_MISDREAVUS @ 0x0c8
+	enum SPECIES_UNOWN      @ 0x0c9
+	enum SPECIES_WOBBUFFET  @ 0x0ca
+	enum SPECIES_GIRAFARIG  @ 0x0cb
+	enum SPECIES_PINECO     @ 0x0cc
+	enum SPECIES_FORRETRESS @ 0x0cd
+	enum SPECIES_DUNSPARCE  @ 0x0ce
+	enum SPECIES_GLIGAR     @ 0x0cf
+	enum SPECIES_STEELIX    @ 0x0d0
+	enum SPECIES_SNUBBULL   @ 0x0d1
+	enum SPECIES_GRANBULL   @ 0x0d2
+	enum SPECIES_QWILFISH   @ 0x0d3
+	enum SPECIES_SCIZOR     @ 0x0d4
+	enum SPECIES_SHUCKLE    @ 0x0d5
+	enum SPECIES_HERACROSS  @ 0x0d6
+	enum SPECIES_SNEASEL    @ 0x0d7
+	enum SPECIES_TEDDIURSA  @ 0x0d8
+	enum SPECIES_URSARING   @ 0x0d9
+	enum SPECIES_SLUGMA     @ 0x0da
+	enum SPECIES_MAGCARGO   @ 0x0db
+	enum SPECIES_SWINUB     @ 0x0dc
+	enum SPECIES_PILOSWINE  @ 0x0dd
+	enum SPECIES_CORSOLA    @ 0x0de
+	enum SPECIES_REMORAID   @ 0x0df
+	enum SPECIES_OCTILLERY  @ 0x0e0
+	enum SPECIES_DELIBIRD   @ 0x0e1
+	enum SPECIES_MANTINE    @ 0x0e2
+	enum SPECIES_SKARMORY   @ 0x0e3
+	enum SPECIES_HOUNDOUR   @ 0x0e4
+	enum SPECIES_HOUNDOOM   @ 0x0e5
+	enum SPECIES_KINGDRA    @ 0x0e6
+	enum SPECIES_PHANPY     @ 0x0e7
+	enum SPECIES_DONPHAN    @ 0x0e8
+	enum SPECIES_PORYGON2   @ 0x0e9
+	enum SPECIES_STANTLER   @ 0x0ea
+	enum SPECIES_SMEARGLE   @ 0x0eb
+	enum SPECIES_TYROGUE    @ 0x0ec
+	enum SPECIES_HITMONTOP  @ 0x0ed
+	enum SPECIES_SMOOCHUM   @ 0x0ee
+	enum SPECIES_ELEKID     @ 0x0ef
+	enum SPECIES_MAGBY      @ 0x0f0
+	enum SPECIES_MILTANK    @ 0x0f1
+	enum SPECIES_BLISSEY    @ 0x0f2
+	enum SPECIES_RAIKOU     @ 0x0f3
+	enum SPECIES_ENTEI      @ 0x0f4
+	enum SPECIES_SUICUNE    @ 0x0f5
+	enum SPECIES_LARVITAR   @ 0x0f6
+	enum SPECIES_PUPITAR    @ 0x0f7
+	enum SPECIES_TYRANITAR  @ 0x0f8
+	enum SPECIES_LUGIA      @ 0x0f9
+	enum SPECIES_HO_OH      @ 0x0fa
+	enum SPECIES_CELEBI     @ 0x0fb
+
+	enum SPECIES_OLD_UNOWN_B
+	enum SPECIES_OLD_UNOWN_C
+	enum SPECIES_OLD_UNOWN_D
+	enum SPECIES_OLD_UNOWN_E
+	enum SPECIES_OLD_UNOWN_F
+	enum SPECIES_OLD_UNOWN_G
+	enum SPECIES_OLD_UNOWN_H
+	enum SPECIES_OLD_UNOWN_I
+	enum SPECIES_OLD_UNOWN_J
+	enum SPECIES_OLD_UNOWN_K
+	enum SPECIES_OLD_UNOWN_L
+	enum SPECIES_OLD_UNOWN_M
+	enum SPECIES_OLD_UNOWN_N
+	enum SPECIES_OLD_UNOWN_O
+	enum SPECIES_OLD_UNOWN_P
+	enum SPECIES_OLD_UNOWN_Q
+	enum SPECIES_OLD_UNOWN_R
+	enum SPECIES_OLD_UNOWN_S
+	enum SPECIES_OLD_UNOWN_T
+	enum SPECIES_OLD_UNOWN_U
+	enum SPECIES_OLD_UNOWN_V
+	enum SPECIES_OLD_UNOWN_W
+	enum SPECIES_OLD_UNOWN_X
+	enum SPECIES_OLD_UNOWN_Y
+	enum SPECIES_OLD_UNOWN_Z
+
+	enum SPECIES_TREECKO    @ 0x115
+	enum SPECIES_GROVYLE    @ 0x116
+	enum SPECIES_SCEPTILE   @ 0x117
+	enum SPECIES_TORCHIC    @ 0x118
+	enum SPECIES_COMBUSKEN  @ 0x119
+	enum SPECIES_BLAZIKEN   @ 0x11a
+	enum SPECIES_MUDKIP     @ 0x11b
+	enum SPECIES_MARSHTOMP  @ 0x11c
+	enum SPECIES_SWAMPERT   @ 0x11d
+	enum SPECIES_POOCHYENA  @ 0x11e
+	enum SPECIES_MIGHTYENA  @ 0x11f
+	enum SPECIES_ZIGZAGOON  @ 0x120
+	enum SPECIES_LINOONE    @ 0x121
+	enum SPECIES_WURMPLE    @ 0x122
+	enum SPECIES_SILCOON    @ 0x123
+	enum SPECIES_BEAUTIFLY  @ 0x124
+	enum SPECIES_CASCOON    @ 0x125
+	enum SPECIES_DUSTOX     @ 0x126
+	enum SPECIES_LOTAD      @ 0x127
+	enum SPECIES_LOMBRE     @ 0x128
+	enum SPECIES_LUDICOLO   @ 0x129
+	enum SPECIES_SEEDOT     @ 0x12a
+	enum SPECIES_NUZLEAF    @ 0x12b
+	enum SPECIES_SHIFTRY    @ 0x12c
+	enum SPECIES_NINCADA    @ 0x12d
+	enum SPECIES_NINJASK    @ 0x12e
+	enum SPECIES_SHEDINJA   @ 0x12f
+	enum SPECIES_TAILLOW    @ 0x130
+	enum SPECIES_SWELLOW    @ 0x131
+	enum SPECIES_SHROOMISH  @ 0x132
+	enum SPECIES_BRELOOM    @ 0x133
+	enum SPECIES_SPINDA     @ 0x134
+	enum SPECIES_WINGULL    @ 0x135
+	enum SPECIES_PELIPPER   @ 0x136
+	enum SPECIES_SURSKIT    @ 0x137
+	enum SPECIES_MASQUERAIN @ 0x138
+	enum SPECIES_WAILMER    @ 0x139
+	enum SPECIES_WAILORD    @ 0x13a
+	enum SPECIES_SKITTY     @ 0x13b
+	enum SPECIES_DELCATTY   @ 0x13c
+	enum SPECIES_KECLEON    @ 0x13d
+	enum SPECIES_BALTOY     @ 0x13e
+	enum SPECIES_CLAYDOL    @ 0x13f
+	enum SPECIES_NOSEPASS   @ 0x140
+	enum SPECIES_TORKOAL    @ 0x141
+	enum SPECIES_SABLEYE    @ 0x142
+	enum SPECIES_BARBOACH   @ 0x143
+	enum SPECIES_WHISCASH   @ 0x144
+	enum SPECIES_LUVDISC    @ 0x145
+	enum SPECIES_CORPHISH   @ 0x146
+	enum SPECIES_CRAWDAUNT  @ 0x147
+	enum SPECIES_FEEBAS     @ 0x148
+	enum SPECIES_MILOTIC    @ 0x149
+	enum SPECIES_CARVANHA   @ 0x14a
+	enum SPECIES_SHARPEDO   @ 0x14b
+	enum SPECIES_TRAPINCH   @ 0x14c
+	enum SPECIES_VIBRAVA    @ 0x14d
+	enum SPECIES_FLYGON     @ 0x14e
+	enum SPECIES_MAKUHITA   @ 0x14f
+	enum SPECIES_HARIYAMA   @ 0x150
+	enum SPECIES_ELECTRIKE  @ 0x151
+	enum SPECIES_MANECTRIC  @ 0x152
+	enum SPECIES_NUMEL      @ 0x153
+	enum SPECIES_CAMERUPT   @ 0x154
+	enum SPECIES_SPHEAL     @ 0x155
+	enum SPECIES_SEALEO     @ 0x156
+	enum SPECIES_WALREIN    @ 0x157
+	enum SPECIES_CACNEA     @ 0x158
+	enum SPECIES_CACTURNE   @ 0x159
+	enum SPECIES_SNORUNT    @ 0x15a
+	enum SPECIES_GLALIE     @ 0x15b
+	enum SPECIES_LUNATONE   @ 0x15c
+	enum SPECIES_SOLROCK    @ 0x15d
+	enum SPECIES_AZURILL    @ 0x15e
+	enum SPECIES_SPOINK     @ 0x15f
+	enum SPECIES_GRUMPIG    @ 0x160
+	enum SPECIES_PLUSLE     @ 0x161
+	enum SPECIES_MINUN      @ 0x162
+	enum SPECIES_MAWILE     @ 0x163
+	enum SPECIES_MEDITITE   @ 0x164
+	enum SPECIES_MEDICHAM   @ 0x165
+	enum SPECIES_SWABLU     @ 0x166
+	enum SPECIES_ALTARIA    @ 0x167
+	enum SPECIES_WYNAUT     @ 0x168
+	enum SPECIES_DUSKULL    @ 0x169
+	enum SPECIES_DUSCLOPS   @ 0x16a
+	enum SPECIES_ROSELIA    @ 0x16b
+	enum SPECIES_SLAKOTH    @ 0x16c
+	enum SPECIES_VIGOROTH   @ 0x16d
+	enum SPECIES_SLAKING    @ 0x16e
+	enum SPECIES_GULPIN     @ 0x16f
+	enum SPECIES_SWALOT     @ 0x170
+	enum SPECIES_TROPIUS    @ 0x171
+	enum SPECIES_WHISMUR    @ 0x172
+	enum SPECIES_LOUDRED    @ 0x173
+	enum SPECIES_EXPLOUD    @ 0x174
+	enum SPECIES_CLAMPERL   @ 0x175
+	enum SPECIES_HUNTAIL    @ 0x176
+	enum SPECIES_GOREBYSS   @ 0x177
+	enum SPECIES_ABSOL      @ 0x178
+	enum SPECIES_SHUPPET    @ 0x179
+	enum SPECIES_BANETTE    @ 0x17a
+	enum SPECIES_SEVIPER    @ 0x17b
+	enum SPECIES_ZANGOOSE   @ 0x17c
+	enum SPECIES_RELICANTH  @ 0x17d
+	enum SPECIES_ARON       @ 0x17e
+	enum SPECIES_LAIRON     @ 0x17f
+	enum SPECIES_AGGRON     @ 0x180
+	enum SPECIES_CASTFORM   @ 0x181
+	enum SPECIES_VOLBEAT    @ 0x182
+	enum SPECIES_ILLUMISE   @ 0x183
+	enum SPECIES_LILEEP     @ 0x184
+	enum SPECIES_CRADILY    @ 0x185
+	enum SPECIES_ANORITH    @ 0x186
+	enum SPECIES_ARMALDO    @ 0x187
+	enum SPECIES_RALTS      @ 0x188
+	enum SPECIES_KIRLIA     @ 0x189
+	enum SPECIES_GARDEVOIR  @ 0x18a
+	enum SPECIES_BAGON      @ 0x18b
+	enum SPECIES_SHELGON    @ 0x18c
+	enum SPECIES_SALAMENCE  @ 0x18d
+	enum SPECIES_BELDUM     @ 0x18e
+	enum SPECIES_METANG     @ 0x18f
+	enum SPECIES_METAGROSS  @ 0x190
+	enum SPECIES_REGIROCK   @ 0x191
+	enum SPECIES_REGICE     @ 0x192
+	enum SPECIES_REGISTEEL  @ 0x193
+	enum SPECIES_KYOGRE     @ 0x194
+	enum SPECIES_GROUDON    @ 0x195
+	enum SPECIES_RAYQUAZA   @ 0x196
+	enum SPECIES_LATIAS     @ 0x197
+	enum SPECIES_LATIOS     @ 0x198
+	enum SPECIES_JIRACHI    @ 0x199
+	enum SPECIES_DEOXYS     @ 0x19a
+	enum SPECIES_CHIMECHO   @ 0x19b
+	enum SPECIES_EGG        @ 0x19c
+
+	enum SPECIES_UNOWN_B
+	enum SPECIES_UNOWN_C
+	enum SPECIES_UNOWN_D
+	enum SPECIES_UNOWN_E
+	enum SPECIES_UNOWN_F
+	enum SPECIES_UNOWN_G
+	enum SPECIES_UNOWN_H
+	enum SPECIES_UNOWN_I
+	enum SPECIES_UNOWN_J
+	enum SPECIES_UNOWN_K
+	enum SPECIES_UNOWN_L
+	enum SPECIES_UNOWN_M
+	enum SPECIES_UNOWN_N
+	enum SPECIES_UNOWN_O
+	enum SPECIES_UNOWN_P
+	enum SPECIES_UNOWN_Q
+	enum SPECIES_UNOWN_R
+	enum SPECIES_UNOWN_S
+	enum SPECIES_UNOWN_T
+	enum SPECIES_UNOWN_U
+	enum SPECIES_UNOWN_V
+	enum SPECIES_UNOWN_W
+	enum SPECIES_UNOWN_X
+	enum SPECIES_UNOWN_Y
+	enum SPECIES_UNOWN_Z
+	enum SPECIES_UNOWN_EMARK
+	enum SPECIES_UNOWN_QMARK
+
+	.set NUM_SPECIES, SPECIES_EGG