From 3a89673fbe5eea3c2f84ebe17a64b2bd9c4bc67e Mon Sep 17 00:00:00 2001 From: Artrios Date: Wed, 19 Jul 2023 21:04:35 +0800 Subject: [PATCH] Update for pokeemerald-expansion --- battle-e/berries/macros.asm | 2 +- battle-e/enigmaberry.asm | 10 +- battle-e/trainers/alana.asm | 36 - battle-e/trainers/annie.asm | 36 - battle-e/trainers/anthony.asm | 38 +- battle-e/trainers/antonio.asm | 36 - battle-e/trainers/april.asm | 40 +- battle-e/trainers/astrid.asm | 40 +- battle-e/trainers/belford.asm | 36 - battle-e/trainers/bryce.asm | 36 - battle-e/trainers/candice.asm | 36 - battle-e/trainers/celina.asm | 38 +- battle-e/trainers/chisa.asm | 36 - battle-e/trainers/clayton.asm | 36 - battle-e/trainers/daikichi.asm | 36 - battle-e/trainers/danpei.asm | 36 - battle-e/trainers/devin.asm | 36 - battle-e/trainers/dominic.asm | 36 - battle-e/trainers/dustin.asm | 36 - battle-e/trainers/ellie.asm | 36 - battle-e/trainers/fay.asm | 36 - battle-e/trainers/fiennes.asm | 36 - battle-e/trainers/fuego.asm | 36 - battle-e/trainers/fugen.asm | 38 +- battle-e/trainers/fukune.asm | 36 - battle-e/trainers/goro.asm | 38 +- battle-e/trainers/griffin.asm | 36 - battle-e/trainers/harue.asm | 36 - battle-e/trainers/hayden.asm | 38 +- battle-e/trainers/heather.asm | 36 - battle-e/trainers/hillary.asm | 38 +- battle-e/trainers/hoyoshi.asm | 36 - battle-e/trainers/hugo.asm | 36 - battle-e/trainers/ihara.asm | 38 +- battle-e/trainers/irazu.asm | 36 - battle-e/trainers/irvin.asm | 38 +- battle-e/trainers/jeffrey.asm | 36 - battle-e/trainers/jo.asm | 40 +- battle-e/trainers/judith.asm | 36 - battle-e/trainers/junji.asm | 38 +- battle-e/trainers/junpei.asm | 38 +- battle-e/trainers/justine.asm | 36 - battle-e/trainers/kendall.asm | 36 - battle-e/trainers/kiyoshi.asm | 38 +- battle-e/trainers/koto.asm | 36 - battle-e/trainers/kuen.asm | 36 - battle-e/trainers/kyohei.asm | 38 +- battle-e/trainers/logan.asm | 36 - battle-e/trainers/macros.asm | 2 +- battle-e/trainers/maggie.asm | 36 - battle-e/trainers/makio.asm | 36 - battle-e/trainers/mami.asm | 36 - battle-e/trainers/mandy.asm | 36 - battle-e/trainers/marcus.asm | 36 - battle-e/trainers/masaru.asm | 38 +- battle-e/trainers/matsuo.asm | 36 - battle-e/trainers/miyoko.asm | 38 +- battle-e/trainers/moet.asm | 36 - battle-e/trainers/momoko.asm | 36 - battle-e/trainers/natalie.asm | 38 +- battle-e/trainers/natasha.asm | 36 - battle-e/trainers/natsuko.asm | 36 - battle-e/trainers/nils.asm | 36 - battle-e/trainers/noriko.asm | 36 - battle-e/trainers/nozomu.asm | 36 - battle-e/trainers/oscar.asm | 36 - battle-e/trainers/otoya.asm | 36 - battle-e/trainers/patrick.asm | 36 - battle-e/trainers/raquel.asm | 36 - battle-e/trainers/reina.asm | 36 - battle-e/trainers/renee.asm | 38 +- battle-e/trainers/rina.asm | 36 - battle-e/trainers/rudy.asm | 36 - battle-e/trainers/ruizo.asm | 36 - battle-e/trainers/ryo.asm | 36 - battle-e/trainers/sadayo.asm | 36 - battle-e/trainers/sandia.asm | 36 - battle-e/trainers/sandy.asm | 36 - battle-e/trainers/satoe.asm | 36 - battle-e/trainers/shigeko.asm | 36 - battle-e/trainers/shigenobu.asm | 36 - battle-e/trainers/shinji.asm | 38 +- battle-e/trainers/shizu.asm | 36 - battle-e/trainers/sofia.asm | 38 +- battle-e/trainers/sonya.asm | 36 - battle-e/trainers/sophie.asm | 36 - battle-e/trainers/stuart.asm | 36 - battle-e/trainers/suekichi.asm | 38 +- battle-e/trainers/sueno.asm | 36 - battle-e/trainers/tomoyasu.asm | 36 - battle-e/trainers/toshinao.asm | 36 - battle-e/trainers/toshitsugu.asm | 38 +- battle-e/trainers/tsutomu.asm | 36 - battle-e/trainers/tyler.asm | 36 - battle-e/trainers/umami.asm | 38 +- battle-e/trainers/wilson.asm | 38 +- battle-e/trainers/yoko.asm | 36 - battle-e/trainers/yu.asm | 36 - battle-e/trainers/yuka.asm | 38 +- battle-e/trainers/yukio.asm | 36 - battle-e/trainers/zuril.asm | 38 +- constants/easychat.asm | 22 +- constants/items.asm | 1555 ++++++++++-------- constants/moves.asm | 1509 ++++++++++------- constants/pokemon.asm | 2579 ++++++++++++++++-------------- decoration/decoration.asm | 4 +- decoration/tickets.asm | 4 +- eonticket/00-C000.asm | 11 +- giftpokemon/macros.asm | 2 +- macros.asm | 2 +- scripts/checksum.py | 2 +- 111 files changed, 3192 insertions(+), 6100 deletions(-) diff --git a/battle-e/berries/macros.asm b/battle-e/berries/macros.asm index 472fec4..e99be05 100644 --- a/battle-e/berries/macros.asm +++ b/battle-e/berries/macros.asm @@ -4,7 +4,7 @@ Enigma_Berry: MACRO Section "berry",ROM0[$100] db $01 dd $02000000 - db REGION,0,REGION,0,0,0,$04,0,$80,$01,0,0 + db REGION,0,REGION,0,0,0,$04,0,$00,$02,0,0 db $07 dd $02000018 db $02,$00 diff --git a/battle-e/enigmaberry.asm b/battle-e/enigmaberry.asm index 36537ff..e6dd0d1 100644 --- a/battle-e/enigmaberry.asm +++ b/battle-e/enigmaberry.asm @@ -37,14 +37,14 @@ BerrySpriteData: db $06,$06,$01,$01,$01,$01,$01 Instructions1: ; B65 - db "Link e-Reader to Pokémon Ruby or \n" - db "Sapphire and select MYSTERY EVENTS\n" - db "on the game's main menu.\n" + db "Link e-Reader to Pokémon Emerald\n" + db "and select MYSTERY EVENTS on the\n" + db "game's main menu.\n" db "Press the B Button to cancel.\0" Instructions2: ; BE1 db "Press the A Button on the Game Boy\n" - db "Advance containing Pokémon Ruby or\n" - db "Sapphire to send a BERRY.\0" + db "Advance containing Pokémon Emerald\n" + db "to send a BERRY.\0" BerrySendingInProcess: ; C41 db "BERRY sending in Process...\0" ABerryWasSent: ; C5D diff --git a/battle-e/trainers/alana.asm b/battle-e/trainers/alana.asm index 7c7b0ed..f382a2d 100644 --- a/battle-e/trainers/alana.asm +++ b/battle-e/trainers/alana.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "サニーゴ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/annie.asm b/battle-e/trainers/annie.asm index 8c458e3..2170229 100644 --- a/battle-e/trainers/annie.asm +++ b/battle-e/trainers/annie.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "カメックス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/anthony.asm b/battle-e/trainers/anthony.asm index 0eeb40b..bb9c38d 100644 --- a/battle-e/trainers/anthony.asm +++ b/battle-e/trainers/anthony.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon ALAKAZAM Holds LUM_BERRY - Moves CALM_MIND, PSYCHIC, REFLECT, THUNDERPUNCH + Moves CALM_MIND, PSYCHIC, REFLECT, THUNDER_PUNCH Level 50 PP_Ups 0,0,0,0 EVs 6,0,0,252,252,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ヌケニン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/antonio.asm b/battle-e/trainers/antonio.asm index 590507c..b68fa60 100644 --- a/battle-e/trainers/antonio.asm +++ b/battle-e/trainers/antonio.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ヘルガー"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/april.asm b/battle-e/trainers/april.asm index 2d473b2..908d4f8 100644 --- a/battle-e/trainers/april.asm +++ b/battle-e/trainers/april.asm @@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm" Pokemon BELLOSSOM Holds MENTAL_HERB - Moves SWEET_SCENT, SOLARBEAM, STUN_SPORE, MOONLIGHT + Moves SWEET_SCENT, SOLAR_BEAM, STUN_SPORE, MOONLIGHT Level 72 PP_Ups 0,0,0,0 EVs 252,0,252,0,0,6 @@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm" Pokemon TROPIUS Holds WHITE_HERB - Moves SWEET_SCENT, SOLARBEAM, BODY_SLAM, STEEL_WING + Moves SWEET_SCENT, SOLAR_BEAM, BODY_SLAM, STEEL_WING Level 74 PP_Ups 0,0,0,0 EVs 252,0,252,0,0,6 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "トロピウス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/astrid.asm b/battle-e/trainers/astrid.asm index 4baad60..b142ac6 100644 --- a/battle-e/trainers/astrid.asm +++ b/battle-e/trainers/astrid.asm @@ -14,7 +14,7 @@ INCLUDE "trainers/macros.asm" Pokemon MAWILE Holds SITRUS_BERRY - Moves IRON_DEFENSE, BITE, VICEGRIP, FAKE_TEARS + Moves IRON_DEFENSE, BITE, VISE_GRIP, FAKE_TEARS Level 50 PP_Ups 0,0,0,0 EVs 255,0,255,0,0,0 @@ -38,7 +38,7 @@ INCLUDE "trainers/macros.asm" Pokemon SHIFTRY Holds LEFTOVERS - Moves SUNNY_DAY, SOLARBEAM, SWAGGER, FAINT_ATTACK + Moves SUNNY_DAY, SOLAR_BEAM, SWAGGER, FEINT_ATTACK Level 50 PP_Ups 0,0,0,0 EVs 170,0,0,170,170,0 @@ -48,40 +48,4 @@ INCLUDE "trainers/macros.asm" Text_EN "SHIFTRY"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/belford.asm b/battle-e/trainers/belford.asm index ddfe114..1c3ee4d 100644 --- a/battle-e/trainers/belford.asm +++ b/battle-e/trainers/belford.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "レジスチル"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/bryce.asm b/battle-e/trainers/bryce.asm index 4464a8a..1db689c 100644 --- a/battle-e/trainers/bryce.asm +++ b/battle-e/trainers/bryce.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ナマズン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/candice.asm b/battle-e/trainers/candice.asm index 6d8fb9f..4a5fab4 100644 --- a/battle-e/trainers/candice.asm +++ b/battle-e/trainers/candice.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ヨマワル"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/celina.asm b/battle-e/trainers/celina.asm index 7bb9f58..ed65d28 100644 --- a/battle-e/trainers/celina.asm +++ b/battle-e/trainers/celina.asm @@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm" Pokemon SABLEYE Holds SPELL_TAG - Moves FAINT_ATTACK, SHADOW_BALL, TOXIC, PROTECT + Moves FEINT_ATTACK, SHADOW_BALL, TOXIC, PROTECT Level 62 PP_Ups 0,0,0,0 EVs 252,0,252,0,0,6 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ヌケニン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/chisa.asm b/battle-e/trainers/chisa.asm index 67840cb..029c36c 100644 --- a/battle-e/trainers/chisa.asm +++ b/battle-e/trainers/chisa.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ピチュー"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/clayton.asm b/battle-e/trainers/clayton.asm index e2e5568..5267ca5 100644 --- a/battle-e/trainers/clayton.asm +++ b/battle-e/trainers/clayton.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ラグラージ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/daikichi.asm b/battle-e/trainers/daikichi.asm index e6aac78..6eb22be 100644 --- a/battle-e/trainers/daikichi.asm +++ b/battle-e/trainers/daikichi.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "キリンリキ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/danpei.asm b/battle-e/trainers/danpei.asm index 6679956..e80bc55 100644 --- a/battle-e/trainers/danpei.asm +++ b/battle-e/trainers/danpei.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "コモルー"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/devin.asm b/battle-e/trainers/devin.asm index 8dd62a1..99d9680 100644 --- a/battle-e/trainers/devin.asm +++ b/battle-e/trainers/devin.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "メタグロス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/dominic.asm b/battle-e/trainers/dominic.asm index dc2d79f..55139e0 100644 --- a/battle-e/trainers/dominic.asm +++ b/battle-e/trainers/dominic.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "バクオング"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/dustin.asm b/battle-e/trainers/dustin.asm index b1a0fc8..09ed9d8 100644 --- a/battle-e/trainers/dustin.asm +++ b/battle-e/trainers/dustin.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "マッスグマ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/ellie.asm b/battle-e/trainers/ellie.asm index 1dba27e..a4bd38f 100644 --- a/battle-e/trainers/ellie.asm +++ b/battle-e/trainers/ellie.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "チリーン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/fay.asm b/battle-e/trainers/fay.asm index c202296..6dfe09a 100644 --- a/battle-e/trainers/fay.asm +++ b/battle-e/trainers/fay.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "レジアイス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/fiennes.asm b/battle-e/trainers/fiennes.asm index 0eacbcd..1dc78bf 100644 --- a/battle-e/trainers/fiennes.asm +++ b/battle-e/trainers/fiennes.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "バクフーン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/fuego.asm b/battle-e/trainers/fuego.asm index 43299f3..98122ad 100644 --- a/battle-e/trainers/fuego.asm +++ b/battle-e/trainers/fuego.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "レジロック"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/fugen.asm b/battle-e/trainers/fugen.asm index 777799b..3b53fd9 100644 --- a/battle-e/trainers/fugen.asm +++ b/battle-e/trainers/fugen.asm @@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm" Pokemon MEDICHAM Holds LUM_BERRY - Moves REVERSAL, HI_JUMP_KICK, ICE_PUNCH, PSYCHIC + Moves REVERSAL, HIGH_JUMP_KICK, ICE_PUNCH, PSYCHIC Level 100 PP_Ups 0,0,0,0 EVs 252,0,0,252,0,6 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "バシャーモ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/fukune.asm b/battle-e/trainers/fukune.asm index 9723d7e..8fdc186 100644 --- a/battle-e/trainers/fukune.asm +++ b/battle-e/trainers/fukune.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ラグラージ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/goro.asm b/battle-e/trainers/goro.asm index f5f2f23..bb4383d 100644 --- a/battle-e/trainers/goro.asm +++ b/battle-e/trainers/goro.asm @@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm" Pokemon NINJASK Holds KINGS_ROCK - Moves SILVER_WIND, AERIAL_ACE, FAINT_ATTACK, SHADOW_BALL + Moves SILVER_WIND, AERIAL_ACE, FEINT_ATTACK, SHADOW_BALL Level 52 PP_Ups 0,0,0,0 EVs 0,255,0,255,0,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "クロバット"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/griffin.asm b/battle-e/trainers/griffin.asm index b0d4c0e..7476d44 100644 --- a/battle-e/trainers/griffin.asm +++ b/battle-e/trainers/griffin.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "サマヨール"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/harue.asm b/battle-e/trainers/harue.asm index f39111a..27235f7 100644 --- a/battle-e/trainers/harue.asm +++ b/battle-e/trainers/harue.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "サクラビス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/hayden.asm b/battle-e/trainers/hayden.asm index 98ef791..7a35f7e 100644 --- a/battle-e/trainers/hayden.asm +++ b/battle-e/trainers/hayden.asm @@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm" Pokemon SHIFTRY Holds FOCUS_BAND - Moves EXPLOSION, FAINT_ATTACK, PROTECT, TOXIC + Moves EXPLOSION, FEINT_ATTACK, PROTECT, TOXIC Level 84 PP_Ups 0,0,0,0 EVs 252,0,0,252,6,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ダーテング"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/heather.asm b/battle-e/trainers/heather.asm index 28595b7..1a163da 100644 --- a/battle-e/trainers/heather.asm +++ b/battle-e/trainers/heather.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ソーナンス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/hillary.asm b/battle-e/trainers/hillary.asm index adbb969..5813fa3 100644 --- a/battle-e/trainers/hillary.asm +++ b/battle-e/trainers/hillary.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon XATU Holds TWISTED_SPOON - Moves PSYCHIC, SUNNY_DAY, CONFUSE_RAY, SOLARBEAM + Moves PSYCHIC, SUNNY_DAY, CONFUSE_RAY, SOLAR_BEAM Level 54 PP_Ups 0,0,0,0 EVs 0,0,0,255,255,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ヘルガー"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/hoyoshi.asm b/battle-e/trainers/hoyoshi.asm index 50ba41d..c95d68d 100644 --- a/battle-e/trainers/hoyoshi.asm +++ b/battle-e/trainers/hoyoshi.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ミロカロス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/hugo.asm b/battle-e/trainers/hugo.asm index e31a754..843c3f3 100644 --- a/battle-e/trainers/hugo.asm +++ b/battle-e/trainers/hugo.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ブーピッグ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/ihara.asm b/battle-e/trainers/ihara.asm index faca395..ee05a67 100644 --- a/battle-e/trainers/ihara.asm +++ b/battle-e/trainers/ihara.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon SHIFTRY Holds BRIGHT_POWDER - Moves SWAGGER, EXTRASENSORY, FAINT_ATTACK, GROWTH + Moves SWAGGER, EXTRASENSORY, FEINT_ATTACK, GROWTH Level 100 PP_Ups 0,0,0,0 EVs 6,0,0,252,252,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ケッキング"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/irazu.asm b/battle-e/trainers/irazu.asm index a359750..71dece7 100644 --- a/battle-e/trainers/irazu.asm +++ b/battle-e/trainers/irazu.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "レジスチル"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/irvin.asm b/battle-e/trainers/irvin.asm index 3e20bfb..e168acb 100644 --- a/battle-e/trainers/irvin.asm +++ b/battle-e/trainers/irvin.asm @@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm" Pokemon MASQUERAIN Holds LAX_INCENSE - Moves SILVER_WIND, SOLARBEAM, ICE_BEAM, STUN_SPORE + Moves SILVER_WIND, SOLAR_BEAM, ICE_BEAM, STUN_SPORE Level 91 PP_Ups 0,0,0,0 EVs 0,255,0,0,255,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "アメモース"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/jeffrey.asm b/battle-e/trainers/jeffrey.asm index 057cdda..4eab713 100644 --- a/battle-e/trainers/jeffrey.asm +++ b/battle-e/trainers/jeffrey.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "カメックス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/jo.asm b/battle-e/trainers/jo.asm index 2f3ae37..0f10720 100644 --- a/battle-e/trainers/jo.asm +++ b/battle-e/trainers/jo.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon SOLROCK Holds WHITE_HERB - Moves SUNNY_DAY, SOLARBEAM, FLAMETHROWER, EXPLOSION + Moves SUNNY_DAY, SOLAR_BEAM, FLAMETHROWER, EXPLOSION Level 58 PP_Ups 0,0,0,0 EVs 252,0,6,0,0,252 @@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm" Pokemon SHIFTRY Holds - Moves SUNNY_DAY, SOLARBEAM, GIGA_DRAIN, THIEF + Moves SUNNY_DAY, SOLAR_BEAM, GIGA_DRAIN, THIEF Level 60 PP_Ups 0,0,0,0 EVs 252,0,0,0,252,6 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "バクーダ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/judith.asm b/battle-e/trainers/judith.asm index 02d14ad..6161d5a 100644 --- a/battle-e/trainers/judith.asm +++ b/battle-e/trainers/judith.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "マッスグマ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/junji.asm b/battle-e/trainers/junji.asm index 613052f..7a08d13 100644 --- a/battle-e/trainers/junji.asm +++ b/battle-e/trainers/junji.asm @@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm" Pokemon SPINDA Holds PERSIM_BERRY - Moves TEETER_DANCE, DIZZY_PUNCH, HYPNOSIS, FAINT_ATTACK + Moves TEETER_DANCE, DIZZY_PUNCH, HYPNOSIS, FEINT_ATTACK Level 88 PP_Ups 0,0,0,0 EVs 252,6,252,0,0,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "パッチール"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/junpei.asm b/battle-e/trainers/junpei.asm index 3f25b29..35d780f 100644 --- a/battle-e/trainers/junpei.asm +++ b/battle-e/trainers/junpei.asm @@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm" Pokemon KINGDRA Holds BLACK_GLASSES - Moves DRAGONBREATH, SURF, ICE_BEAM, HIDDEN_POWER + Moves DRAGON_BREATH, SURF, ICE_BEAM, HIDDEN_POWER Level 54 PP_Ups 0,0,0,0 EVs 252,0,0,0,252,6 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "キングドラ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/justine.asm b/battle-e/trainers/justine.asm index 807c14c..c4f4b6d 100644 --- a/battle-e/trainers/justine.asm +++ b/battle-e/trainers/justine.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ゲンガー"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/kendall.asm b/battle-e/trainers/kendall.asm index eba78fb..10192eb 100644 --- a/battle-e/trainers/kendall.asm +++ b/battle-e/trainers/kendall.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ユキワラシ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/kiyoshi.asm b/battle-e/trainers/kiyoshi.asm index caa43fe..6a1cf50 100644 --- a/battle-e/trainers/kiyoshi.asm +++ b/battle-e/trainers/kiyoshi.asm @@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm" Pokemon SHIFTRY Holds LEFTOVERS - Moves EXTRASENSORY, BRICK_BREAK, GIGA_DRAIN, FAINT_ATTACK + Moves EXTRASENSORY, BRICK_BREAK, GIGA_DRAIN, FEINT_ATTACK Level 50 PP_Ups 0,0,0,0 EVs 6,0,0,252,252,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "バクオング"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/koto.asm b/battle-e/trainers/koto.asm index fe259cc..8eebf08 100644 --- a/battle-e/trainers/koto.asm +++ b/battle-e/trainers/koto.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ダグトリオ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/kuen.asm b/battle-e/trainers/kuen.asm index 9273990..eab36ec 100644 --- a/battle-e/trainers/kuen.asm +++ b/battle-e/trainers/kuen.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ジュカイン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/kyohei.asm b/battle-e/trainers/kyohei.asm index 6218cd6..40f755e 100644 --- a/battle-e/trainers/kyohei.asm +++ b/battle-e/trainers/kyohei.asm @@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm" Pokemon ROSELIA Holds POISON_BARB - Moves SLUDGE_BOMB, GIGA_DRAIN, GRASSWHISTLE, SYNTHESIS + Moves SLUDGE_BOMB, GIGA_DRAIN, GRASS_WHISTLE, SYNTHESIS Level 58 PP_Ups 0,0,0,0 EVs 0,255,0,0,255,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ロゼリア"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/logan.asm b/battle-e/trainers/logan.asm index 3dafa49..1e8c422 100644 --- a/battle-e/trainers/logan.asm +++ b/battle-e/trainers/logan.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ジーランス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/macros.asm b/battle-e/trainers/macros.asm index e27c478..49bc4bd 100644 --- a/battle-e/trainers/macros.asm +++ b/battle-e/trainers/macros.asm @@ -13,7 +13,7 @@ Battle_Trainer: MACRO Section "battle",ROM0[$100] db $01 dd $02000000 - db REGION,0,REGION,0,0,0,$04,0,$80,$01,0,0 + db REGION,0,REGION,0,0,0,$04,0,$00,$02,0,0 db $0D dd $02000018 db $02,$00 diff --git a/battle-e/trainers/maggie.asm b/battle-e/trainers/maggie.asm index 0ba0509..a1efde8 100644 --- a/battle-e/trainers/maggie.asm +++ b/battle-e/trainers/maggie.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ピカチュウ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/makio.asm b/battle-e/trainers/makio.asm index 47f189f..9772870 100644 --- a/battle-e/trainers/makio.asm +++ b/battle-e/trainers/makio.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ダーテング"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/mami.asm b/battle-e/trainers/mami.asm index 1f54c40..1032f27 100644 --- a/battle-e/trainers/mami.asm +++ b/battle-e/trainers/mami.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ミロカロス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/mandy.asm b/battle-e/trainers/mandy.asm index ec99266..96aa1f1 100644 --- a/battle-e/trainers/mandy.asm +++ b/battle-e/trainers/mandy.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ケッキング"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/marcus.asm b/battle-e/trainers/marcus.asm index 2ca656b..720b529 100644 --- a/battle-e/trainers/marcus.asm +++ b/battle-e/trainers/marcus.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ラグラージ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/masaru.asm b/battle-e/trainers/masaru.asm index 1a75e93..47a269d 100644 --- a/battle-e/trainers/masaru.asm +++ b/battle-e/trainers/masaru.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon MEDICHAM Holds BLACK_BELT - Moves DETECT, RECOVER, HI_JUMP_KICK, PSYCHIC + Moves DETECT, RECOVER, HIGH_JUMP_KICK, PSYCHIC Level 52 PP_Ups 0,0,0,0 EVs 0,255,0,0,255,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ヘラクロス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/matsuo.asm b/battle-e/trainers/matsuo.asm index 14c1b4e..57e4d26 100644 --- a/battle-e/trainers/matsuo.asm +++ b/battle-e/trainers/matsuo.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "マリル"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/miyoko.asm b/battle-e/trainers/miyoko.asm index 42deb6c..c18386b 100644 --- a/battle-e/trainers/miyoko.asm +++ b/battle-e/trainers/miyoko.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon CACTURNE Holds SHELL_BELL - Moves LEECH_SEED, FAINT_ATTACK, COUNTER, NEEDLE_ARM + Moves LEECH_SEED, FEINT_ATTACK, COUNTER, NEEDLE_ARM Level 55 PP_Ups 0,0,0,0 EVs 255,255,0,0,0,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ジュカイン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/moet.asm b/battle-e/trainers/moet.asm index d8b2c04..191b6b4 100644 --- a/battle-e/trainers/moet.asm +++ b/battle-e/trainers/moet.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "サーナイト"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/momoko.asm b/battle-e/trainers/momoko.asm index 5c31916..1947462 100644 --- a/battle-e/trainers/momoko.asm +++ b/battle-e/trainers/momoko.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "サマヨール"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/natalie.asm b/battle-e/trainers/natalie.asm index bfce8bf..e3242cf 100644 --- a/battle-e/trainers/natalie.asm +++ b/battle-e/trainers/natalie.asm @@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm" Pokemon SHELGON Holds SITRUS_BERRY - Moves DRAGONBREATH, EMBER, BITE, THRASH + Moves DRAGON_BREATH, EMBER, BITE, THRASH Level 50 PP_Ups 0,0,0,0 EVs 255,0,0,0,0,255 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "コモルー"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/natasha.asm b/battle-e/trainers/natasha.asm index 177545d..d64a500 100644 --- a/battle-e/trainers/natasha.asm +++ b/battle-e/trainers/natasha.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ジュカイン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/natsuko.asm b/battle-e/trainers/natsuko.asm index e7980bc..b699874 100644 --- a/battle-e/trainers/natsuko.asm +++ b/battle-e/trainers/natsuko.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ジーランス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/nils.asm b/battle-e/trainers/nils.asm index 93ba4a3..64630a5 100644 --- a/battle-e/trainers/nils.asm +++ b/battle-e/trainers/nils.asm @@ -48,40 +48,4 @@ INCLUDE "trainers/macros.asm" Text_EN "LUDICOLO"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/noriko.asm b/battle-e/trainers/noriko.asm index 0d66f2f..2131919 100644 --- a/battle-e/trainers/noriko.asm +++ b/battle-e/trainers/noriko.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ボーマンダ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/nozomu.asm b/battle-e/trainers/nozomu.asm index 9b3d3cd..85a6715 100644 --- a/battle-e/trainers/nozomu.asm +++ b/battle-e/trainers/nozomu.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ケンタロス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/oscar.asm b/battle-e/trainers/oscar.asm index 7d50beb..a421f53 100644 --- a/battle-e/trainers/oscar.asm +++ b/battle-e/trainers/oscar.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ゲンガー"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/otoya.asm b/battle-e/trainers/otoya.asm index f9ada5c..4f7a57b 100644 --- a/battle-e/trainers/otoya.asm +++ b/battle-e/trainers/otoya.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "エアームド"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/patrick.asm b/battle-e/trainers/patrick.asm index 0a0424e..ab81c42 100644 --- a/battle-e/trainers/patrick.asm +++ b/battle-e/trainers/patrick.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "フライゴン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/raquel.asm b/battle-e/trainers/raquel.asm index 5ceed32..c2d2871 100644 --- a/battle-e/trainers/raquel.asm +++ b/battle-e/trainers/raquel.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "バシャーモ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/reina.asm b/battle-e/trainers/reina.asm index 5afe8f2..3a57cbe 100644 --- a/battle-e/trainers/reina.asm +++ b/battle-e/trainers/reina.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "トロピウス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/renee.asm b/battle-e/trainers/renee.asm index 79335ab..516aea7 100644 --- a/battle-e/trainers/renee.asm +++ b/battle-e/trainers/renee.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon CASTFORM Holds PETAYA_BERRY - Moves WEATHER_BALL, SOLARBEAM, SUNNY_DAY, FLAMETHROWER + Moves WEATHER_BALL, SOLAR_BEAM, SUNNY_DAY, FLAMETHROWER Level 72 PP_Ups 0,0,0,0 EVs 0,0,0,255,255,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ポワルン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/rina.asm b/battle-e/trainers/rina.asm index ea89102..2e4b7e4 100644 --- a/battle-e/trainers/rina.asm +++ b/battle-e/trainers/rina.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "サーナイト"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/rudy.asm b/battle-e/trainers/rudy.asm index 90d2d16..49c6410 100644 --- a/battle-e/trainers/rudy.asm +++ b/battle-e/trainers/rudy.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "コイキング"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/ruizo.asm b/battle-e/trainers/ruizo.asm index 6ef2bfc..2874169 100644 --- a/battle-e/trainers/ruizo.asm +++ b/battle-e/trainers/ruizo.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ザングース"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/ryo.asm b/battle-e/trainers/ryo.asm index 8610ea1..6b14a3d 100644 --- a/battle-e/trainers/ryo.asm +++ b/battle-e/trainers/ryo.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ポリゴン２"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/sadayo.asm b/battle-e/trainers/sadayo.asm index 643c62c..e152ba0 100644 --- a/battle-e/trainers/sadayo.asm +++ b/battle-e/trainers/sadayo.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ヌケニン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/sandia.asm b/battle-e/trainers/sandia.asm index ba409a6..220b0cb 100644 --- a/battle-e/trainers/sandia.asm +++ b/battle-e/trainers/sandia.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "レジアイス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/sandy.asm b/battle-e/trainers/sandy.asm index c20358c..ff3299f 100644 --- a/battle-e/trainers/sandy.asm +++ b/battle-e/trainers/sandy.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ドードリオ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/satoe.asm b/battle-e/trainers/satoe.asm index 4395986..ab4165b 100644 --- a/battle-e/trainers/satoe.asm +++ b/battle-e/trainers/satoe.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "レアコイル"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/shigeko.asm b/battle-e/trainers/shigeko.asm index 151fef2..23dedc4 100644 --- a/battle-e/trainers/shigeko.asm +++ b/battle-e/trainers/shigeko.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ピカチュウ"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/shigenobu.asm b/battle-e/trainers/shigenobu.asm index a782b2f..2129ca0 100644 --- a/battle-e/trainers/shigenobu.asm +++ b/battle-e/trainers/shigenobu.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "バネブー"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/shinji.asm b/battle-e/trainers/shinji.asm index 58b96b9..e053739 100644 --- a/battle-e/trainers/shinji.asm +++ b/battle-e/trainers/shinji.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon BELLOSSOM Holds MIRACLE_SEED - Moves INGRAIN, POISONPOWDER, RETURN, GIGA_DRAIN + Moves INGRAIN, POISON_POWDER, RETURN, GIGA_DRAIN Level 90 PP_Ups 0,0,0,0 EVs 252,0,0,0,252,6 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "サクラビス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/shizu.asm b/battle-e/trainers/shizu.asm index 265232f..7bdc467 100644 --- a/battle-e/trainers/shizu.asm +++ b/battle-e/trainers/shizu.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ケッキング"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/sofia.asm b/battle-e/trainers/sofia.asm index 9db4ce3..a9847bf 100644 --- a/battle-e/trainers/sofia.asm +++ b/battle-e/trainers/sofia.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon KINGDRA Holds MYSTIC_WATER - Moves RAIN_DANCE, SURF, ICE_BEAM, DRAGONBREATH + Moves RAIN_DANCE, SURF, ICE_BEAM, DRAGON_BREATH Level 52 PP_Ups 0,0,0,0 EVs 0,0,0,255,255,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ライボルト"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/sonya.asm b/battle-e/trainers/sonya.asm index 92e4f44..833cd74 100644 --- a/battle-e/trainers/sonya.asm +++ b/battle-e/trainers/sonya.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "マタドガス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/sophie.asm b/battle-e/trainers/sophie.asm index c394ca8..b9daea3 100644 --- a/battle-e/trainers/sophie.asm +++ b/battle-e/trainers/sophie.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "キルリア"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/stuart.asm b/battle-e/trainers/stuart.asm index 82df134..afd8964 100644 --- a/battle-e/trainers/stuart.asm +++ b/battle-e/trainers/stuart.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "メタグロス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/suekichi.asm b/battle-e/trainers/suekichi.asm index 4acf72b..371cb09 100644 --- a/battle-e/trainers/suekichi.asm +++ b/battle-e/trainers/suekichi.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon KECLEON Holds QUICK_CLAW - Moves AERIAL_ACE, DOUBLE_TEAM, FAINT_ATTACK, PSYBEAM + Moves AERIAL_ACE, DOUBLE_TEAM, FEINT_ATTACK, PSYBEAM Level 55 PP_Ups 0,0,0,0 EVs 0,255,0,0,255,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "サンドパン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/sueno.asm b/battle-e/trainers/sueno.asm index a942f1b..7ab1b20 100644 --- a/battle-e/trainers/sueno.asm +++ b/battle-e/trainers/sueno.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ノズパス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/tomoyasu.asm b/battle-e/trainers/tomoyasu.asm index dccbddf..95d8eb5 100644 --- a/battle-e/trainers/tomoyasu.asm +++ b/battle-e/trainers/tomoyasu.asm @@ -55,41 +55,5 @@ INCLUDE "trainers/macros.asm" Text_EN "DUSCLOPS"11 Text_JP "サマヨール"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/toshinao.asm b/battle-e/trainers/toshinao.asm index 755a084..8959416 100644 --- a/battle-e/trainers/toshinao.asm +++ b/battle-e/trainers/toshinao.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "クロバット"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/toshitsugu.asm b/battle-e/trainers/toshitsugu.asm index ba84024..c3d9e7e 100644 --- a/battle-e/trainers/toshitsugu.asm +++ b/battle-e/trainers/toshitsugu.asm @@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm" Pokemon CRADILY Holds LEFTOVERS - Moves GIGA_DRAIN, ANCIENTPOWER, AMNESIA, RECOVER + Moves GIGA_DRAIN, ANCIENT_POWER, AMNESIA, RECOVER Level 58 PP_Ups 0,0,0,0 EVs 0,0,255,0,0,255 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ユレイドル"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/tsutomu.asm b/battle-e/trainers/tsutomu.asm index 49c482b..d0c914e 100644 --- a/battle-e/trainers/tsutomu.asm +++ b/battle-e/trainers/tsutomu.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "カイリキー"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/tyler.asm b/battle-e/trainers/tyler.asm index 8ed1912..1557b6f 100644 --- a/battle-e/trainers/tyler.asm +++ b/battle-e/trainers/tyler.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "サイドン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/umami.asm b/battle-e/trainers/umami.asm index 115b9d2..3e4241e 100644 --- a/battle-e/trainers/umami.asm +++ b/battle-e/trainers/umami.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon ARMALDO Holds LEFTOVERS - Moves HYPER_BEAM, ANCIENTPOWER, AERIAL_ACE, SWORDS_DANCE + Moves HYPER_BEAM, ANCIENT_POWER, AERIAL_ACE, SWORDS_DANCE Level 100 PP_Ups 0,0,0,0 EVs 0,252,6,0,0,252 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "メタグロス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/wilson.asm b/battle-e/trainers/wilson.asm index ec01734..50bae7d 100644 --- a/battle-e/trainers/wilson.asm +++ b/battle-e/trainers/wilson.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon GLOOM Holds SUN_STONE - Moves POISONPOWDER, STUN_SPORE, SLEEP_POWDER, RAZOR_LEAF + Moves POISON_POWDER, STUN_SPORE, SLEEP_POWDER, RAZOR_LEAF Level 50 PP_Ups 0,0,0,0 EVs 252,0,0,0,252,6 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "パールル"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/yoko.asm b/battle-e/trainers/yoko.asm index dc194b3..ff94369 100644 --- a/battle-e/trainers/yoko.asm +++ b/battle-e/trainers/yoko.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ラブカス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/yu.asm b/battle-e/trainers/yu.asm index 78d9edc..882a02f 100644 --- a/battle-e/trainers/yu.asm +++ b/battle-e/trainers/yu.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ベトベトン"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/yuka.asm b/battle-e/trainers/yuka.asm index 0c453a7..94a4d91 100644 --- a/battle-e/trainers/yuka.asm +++ b/battle-e/trainers/yuka.asm @@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm" Pokemon SABLEYE Holds BRIGHT_POWDER - Moves SHADOW_BALL, KNOCK_OFF, FAINT_ATTACK, CONFUSE_RAY + Moves SHADOW_BALL, KNOCK_OFF, FEINT_ATTACK, CONFUSE_RAY Level 75 PP_Ups 0,0,0,0 EVs 252,6,0,0,252,0 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "パールル"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/yukio.asm b/battle-e/trainers/yukio.asm index fab433c..1842b3a 100644 --- a/battle-e/trainers/yukio.asm +++ b/battle-e/trainers/yukio.asm @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "ヘラクロス"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/zuril.asm b/battle-e/trainers/zuril.asm index 774d16b..53ea9a2 100644 --- a/battle-e/trainers/zuril.asm +++ b/battle-e/trainers/zuril.asm @@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm" Pokemon REGIROCK Holds LEFTOVERS - Moves EXPLOSION, ANCIENTPOWER, EARTHQUAKE, REST + Moves EXPLOSION, ANCIENT_POWER, EARTHQUAKE, REST Level 100 PP_Ups 0,0,0,0 EVs 252,6,0,0,0,252 @@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm" Text_JP "レジロック"11 Friendship 255 - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - - Pokemon SPECIES_NONE - Holds ITEM_NONE - Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE - Level 100 - PP_Ups 0,0,0,0 - EVs 0,0,0,0,0,0 - OT_ID 00000, 00000 - IVs 31,31,31,31,31,31, ABILITY1 - PV HARDY_FEMALE - Text_EN "BULBASUAR"11 - Friendship 255 - End_Trainer \ No newline at end of file diff --git a/constants/easychat.asm b/constants/easychat.asm index b2bd144..de10430 100644 --- a/constants/easychat.asm +++ b/constants/easychat.asm @@ -211,7 +211,7 @@ EVOLVE EQU $0204 ENCYCLOPEDIA EQU $0205 NATURE EQU $0206 CENTER EQU $0207 -EGG EQU $0208 +_EGG EQU $0208 LINK EQU $0209 SP_ABILITY EQU $020A ; SP. ABILITY TRAINER EQU $020B @@ -350,7 +350,7 @@ CAN_WIN EQU $060B NO_MATCH EQU $060C SPIRIT EQU $060D DECIDED EQU $060E -TRUMP_CARD EQU $060F +_TRUMP_CARD EQU $060F TAKE_THAT EQU $0610 COME_ON EQU $0611 ATTACK EQU $0612 @@ -1199,7 +1199,7 @@ RIBBON EQU $2215 ; MOVE 1 _KARATE_CHOP EQU $2402 _DOUBLESLAP EQU $2403 -_THUNDERPUNCH EQU $2409 +_THUNDER_PUNCH EQU $2409 _RAZOR_WIND EQU $240D _CUT EQU $240F _GUST EQU $2410 @@ -1224,7 +1224,7 @@ _COUNTER EQU $2444 _STRENGTH EQU $2446 _ABSORB EQU $2447 _GROWTH EQU $244A -_SOLARBEAM EQU $244C +_SOLAR_BEAM EQU $244C _STUN_SPORE EQU $244E _STRING_SHOT EQU $2451 _THUNDERBOLT EQU $2455 @@ -1307,7 +1307,7 @@ _RAIN_DANCE EQU $24F0 _CRUNCH EQU $24F2 _PSYCH_UP EQU $24F4 _EXTREMESPEED EQU $24F5 -_ANCIENTPOWER EQU $24F6 +_ANCIENT_POWER EQU $24F6 _SHADOW_BALL EQU $24F7 _ROCK_SMASH EQU $24F9 _WHIRLPOOL EQU $24FA @@ -1340,7 +1340,7 @@ _ODOR_SLEUTH EQU $253C _ROCK_TOMB EQU $253D _SILVER_WIND EQU $253E _METAL_SOUND EQU $253F -_GRASSWHISTLE EQU $2540 +_GRASS_WHISTLE EQU $2540 _TICKLE EQU $2541 _COSMIC_POWER EQU $2542 _WATER_SPOUT EQU $2543 @@ -1359,7 +1359,7 @@ _PAY_DAY EQU $2606 _FIRE_PUNCH EQU $2607 _ICE_PUNCH EQU $2608 _SCRATCH EQU $260A -_VICEGRIP EQU $260B +_VISE_GRIP EQU $260B _GUILLOTINE EQU $260C _SWORDS_DANCE EQU $260E _WING_ATTACK EQU $2611 @@ -1400,7 +1400,7 @@ _SEISMIC_TOSS EQU $2645 _MEGA_DRAIN EQU $2648 _LEECH_SEED EQU $2649 _RAZOR_LEAF EQU $264B -_POISONPOWDER EQU $264D +_POISON_POWDER EQU $264D _SLEEP_POWDER EQU $264F _PETAL_DANCE EQU $2650 _DRAGON_RAGE EQU $2652 @@ -1429,7 +1429,7 @@ _SKULL_BASH EQU $2682 _SPIKE_CANNON EQU $2683 _AMNESIA EQU $2685 _SOFTBOILED EQU $2687 -_HI_JUMP_KICK EQU $2688 +_HIGH_JUMP_KICK EQU $2688 _GLARE EQU $2689 _DREAM_EATER EQU $268A _POISON_GAS EQU $268B @@ -1455,7 +1455,7 @@ _CONVERSION_2 EQU $26B0 _COTTON_SPORE EQU $26B2 _PROTECT EQU $26B6 _MACH_PUNCH EQU $26B7 -_FAINT_ATTACK EQU $26B9 +_FEINT_ATTACK EQU $26B9 _SWEET_KISS EQU $26BA _BELLY_DRUM EQU $26BB _SLUDGE_BOMB EQU $26BC @@ -1479,7 +1479,7 @@ _FRUSTRATION EQU $26DA _MAGNITUDE EQU $26DE _DYNAMICPUNCH EQU $26DF _MEGAHORN EQU $26E0 -_DRAGONBREATH EQU $26E1 +_DRAGON_BREATH EQU $26E1 _BATON_PASS EQU $26E2 _METAL_CLAW EQU $26E8 _MOONLIGHT EQU $26EC diff --git a/constants/items.asm b/constants/items.asm index f02285e..ec317c6 100644 --- a/constants/items.asm +++ b/constants/items.asm @@ -1,710 +1,901 @@ -ITEM_NONE EQU $000 +ITEM_NONE EQU 0 -; Balls -MASTER_BALL EQU $001 -ULTRA_BALL EQU $002 -GREAT_BALL EQU $003 -POKE_BALL EQU $004 -SAFARI_BALL EQU $005 -NET_BALL EQU $006 -DIVE_BALL EQU $007 -NEST_BALL EQU $008 -REPEAT_BALL EQU $009 -TIMER_BALL EQU $00A -LUXURY_BALL EQU $00B -DUSK_BALL EQU $00C -HEAL_BALL EQU $00D -QUICK_BALL EQU $00E -CHERISH_BALL EQU $00F -FAST_BALL EQU $010 -LEVEL_BALL EQU $011 -LURE_BALL EQU $012 -HEAVY_BALL EQU $013 -LOVE_BALL EQU $014 -FRIEND_BALL EQU $015 -MOON_BALL EQU $016 -SPORT_BALL EQU $017 -PARK_BALL EQU $018 -DREAM_BALL EQU $019 -BEAST_BALL EQU $01A -PREMIER_BALL EQU $01B +; Poké Balls +POKE_BALL EQU 1 +GREAT_BALL EQU 2 +ULTRA_BALL EQU 3 +MASTER_BALL EQU 4 +PREMIER_BALL EQU 5 +HEAL_BALL EQU 6 +NET_BALL EQU 7 +NEST_BALL EQU 8 +DIVE_BALL EQU 9 +DUSK_BALL EQU 10 +TIMER_BALL EQU 11 +QUICK_BALL EQU 12 +REPEAT_BALL EQU 13 +LUXURY_BALL EQU 14 +LEVEL_BALL EQU 15 +LURE_BALL EQU 16 +MOON_BALL EQU 17 +FRIEND_BALL EQU 18 +LOVE_BALL EQU 19 +FAST_BALL EQU 20 +HEAVY_BALL EQU 21 +DREAM_BALL EQU 22 +SAFARI_BALL EQU 23 +SPORT_BALL EQU 24 +PARK_BALL EQU 25 +BEAST_BALL EQU 26 +CHERISH_BALL EQU 27 -; Pokemon Items -POTION EQU $01C -ANTIDOTE EQU $01D -BURN_HEAL EQU $01E -ICE_HEAL EQU $01F -AWAKENING EQU $020 -PARALYZE_HEAL EQU $021 -FULL_RESTORE EQU $022 -MAX_POTION EQU $023 -HYPER_POTION EQU $024 -SUPER_POTION EQU $025 -FULL_HEAL EQU $026 -REVIVE EQU $027 -MAX_REVIVE EQU $028 -FRESH_WATER EQU $029 -SODA_POP EQU $02A -LEMONADE EQU $02B -MOOMOO_MILK EQU $02C -ENERGY_POWDER EQU $02D -ENERGY_ROOT EQU $02E -HEAL_POWDER EQU $02F -REVIVAL_HERB EQU $030 -ETHER EQU $031 -MAX_ETHER EQU $032 -ELIXIR EQU $033 -MAX_ELIXIR EQU $034 -LAVA_COOKIE EQU $035 -BLUE_FLUTE EQU $036 -YELLOW_FLUTE EQU $037 -RED_FLUTE EQU $038 -BLACK_FLUTE EQU $039 -WHITE_FLUTE EQU $03A -BERRY_JUICE EQU $03B -SWEET_HEART EQU $03C -BIG_MALASADA EQU $03D -OLD_GATEAU EQU $03E -SACRED_ASH EQU $03F -SHOAL_SALT EQU $040 -SHOAL_SHELL EQU $041 -RED_SHARD EQU $042 -BLUE_SHARD EQU $043 -YELLOW_SHARD EQU $044 -GREEN_SHARD EQU $045 -HP_UP EQU $046 -PROTEIN EQU $047 -IRON EQU $048 -CARBOS EQU $049 -CALCIUM EQU $04A -RARE_CANDY EQU $04B -PP_UP EQU $04C -ZINC EQU $04D -PP_MAX EQU $04E -GUARD_SPEC EQU $04F -DIRE_HIT EQU $050 -X_ATTACK EQU $051 -X_DEFENSE EQU $052 -X_SPEED EQU $053 -X_ACCURACY EQU $054 -X_SP_ATK EQU $055 -X_SP_DEF EQU $056 -POKE_DOLL EQU $057 -FLUFFY_TAIL EQU $058 -ESCAPE_ROPE EQU $059 -REPEL EQU $05A -SUPER_REPEL EQU $05B -MAX_REPEL EQU $05C -ABILITY_CAPSULE EQU $05D +; Medicine +POTION EQU 28 +SUPER_POTION EQU 29 +HYPER_POTION EQU 30 +MAX_POTION EQU 31 +FULL_RESTORE EQU 32 +REVIVE EQU 33 +MAX_REVIVE EQU 34 +FRESH_WATER EQU 35 +SODA_POP EQU 36 +LEMONADE EQU 37 +MOOMOO_MILK EQU 38 +ENERGY_POWDER EQU 39 +ENERGY_ROOT EQU 40 +HEAL_POWDER EQU 41 +REVIVAL_HERB EQU 42 +ANTIDOTE EQU 43 +PARALYZE_HEAL EQU 44 +BURN_HEAL EQU 45 +ICE_HEAL EQU 46 +AWAKENING EQU 47 +FULL_HEAL EQU 48 +ETHER EQU 49 +MAX_ETHER EQU 50 +ELIXIR EQU 51 +MAX_ELIXIR EQU 52 +BERRY_JUICE EQU 53 +SACRED_ASH EQU 54 +SWEET_HEART EQU 55 +MAX_HONEY EQU 56 -; Wings -HEALTH_FEATHER EQU $05E -MUSCLE_FEATHER EQU $05F -RESIST_FEATHER EQU $060 -GENIUS_FEATHER EQU $061 -CLEVER_FEATHER EQU $062 -SWIFT_FEATHER EQU $063 -PRETTY_FEATHER EQU $064 +; Regional Specialties +PEWTER_CRUNCHIES EQU 57 +RAGE_CANDY_BAR EQU 58 +LAVA_COOKIE EQU 59 +OLD_GATEAU EQU 60 +CASTELIACONE EQU 61 +LUMIOSE_GALETTE EQU 62 +SHALOUR_SABLE EQU 63 +BIG_MALASADA EQU 64 -; Evolution stones -SUN_STONE EQU $065 -MOON_STONE EQU $066 -FIRE_STONE EQU $067 -THUNDER_STONE EQU $068 -WATER_STONE EQU $069 -LEAF_STONE EQU $06A -DAWN_STONE EQU $06B -DUSK_STONE EQU $06C -SHINY_STONE EQU $06D -ICE_STONE EQU $06E +; Vitamins +HP_UP EQU 65 +PROTEIN EQU 66 +IRON EQU 67 +CALCIUM EQU 68 +ZINC EQU 69 +CARBOS EQU 70 +PP_UP EQU 71 +PP_MAX EQU 72 -; Unusable -RED_APRICORN EQU $06F -BLUE_APRICORN EQU $070 -YELLOW_APRICORN EQU $071 -GREEN_APRICORN EQU $072 -PINK_APRICORN EQU $073 -WHITE_APRICORN EQU $074 -BLACK_APRICORN EQU $075 -TINY_MUSHROOM EQU $076 -BIG_MUSHROOM EQU $077 -PEARL EQU $078 -BIG_PEARL EQU $079 -STARDUST EQU $07A -STAR_PIECE EQU $07B -NUGGET EQU $07C -HEART_SCALE EQU $07D -RED_NECTAR EQU $07E -YELLOW_NECTAR EQU $07F -PINK_NECTAR EQU $080 -PURPLE_NECTAR EQU $081 -HONEY EQU $082 -RARE_BONE EQU $083 +; EV Feathers +HEALTH_FEATHER EQU 73 +MUSCLE_FEATHER EQU 74 +RESIST_FEATHER EQU 75 +GENIUS_FEATHER EQU 76 +CLEVER_FEATHER EQU 77 +SWIFT_FEATHER EQU 78 -; Mails -ORANGE_MAIL EQU $084 -HARBOR_MAIL EQU $085 -GLITTER_MAIL EQU $086 -MECH_MAIL EQU $087 -WOOD_MAIL EQU $088 -WAVE_MAIL EQU $089 -BEAD_MAIL EQU $08A -SHADOW_MAIL EQU $08B -TROPIC_MAIL EQU $08C -DREAM_MAIL EQU $08D -FAB_MAIL EQU $08E -RETRO_MAIL EQU $08F +; Ability Modifiers +ABILITY_CAPSULE EQU 79 +ABILITY_PATCH EQU 80 -; Berries -CHERI_BERRY EQU $090 -CHESTO_BERRY EQU $091 -PECHA_BERRY EQU $092 -RAWST_BERRY EQU $093 -ASPEAR_BERRY EQU $094 -LEPPA_BERRY EQU $095 -ORAN_BERRY EQU $096 -PERSIM_BERRY EQU $097 -LUM_BERRY EQU $098 -SITRUS_BERRY EQU $099 -FIGY_BERRY EQU $09A -WIKI_BERRY EQU $09B -MAGO_BERRY EQU $09C -AGUAV_BERRY EQU $09D -IAPAPA_BERRY EQU $09E -RAZZ_BERRY EQU $09F -BLUK_BERRY EQU $0A0 -NANAB_BERRY EQU $0A1 -WEPEAR_BERRY EQU $0A2 -PINAP_BERRY EQU $0A3 -POMEG_BERRY EQU $0A4 -KELPSY_BERRY EQU $0A5 -QUALOT_BERRY EQU $0A6 -HONDEW_BERRY EQU $0A7 -GREPA_BERRY EQU $0A8 -TAMATO_BERRY EQU $0A9 -CORNN_BERRY EQU $0AA -MAGOST_BERRY EQU $0AB -RABUTA_BERRY EQU $0AC -NOMEL_BERRY EQU $0AD -SPELON_BERRY EQU $0AE -PAMTRE_BERRY EQU $0AF -WATMEL_BERRY EQU $0B0 -DURIN_BERRY EQU $0B1 -BELUE_BERRY EQU $0B2 -OCCA_BERRY EQU $0B3 -PASSHO_BERRY EQU $0B4 -WACAN_BERRY EQU $0B5 -RINDO_BERRY EQU $0B6 -YACHE_BERRY EQU $0B7 -CHOPLE_BERRY EQU $0B8 -KEBIA_BERRY EQU $0B9 -SHUCA_BERRY EQU $0BA -COBA_BERRY EQU $0BB -PAYAPA_BERRY EQU $0BC -TANGA_BERRY EQU $0BD -CHARTI_BERRY EQU $0BE -KASIB_BERRY EQU $0BF -HABAN_BERRY EQU $0C0 -COLBUR_BERRY EQU $0C1 -BABIRI_BERRY EQU $0C2 -CHILAN_BERRY EQU $0C3 -ROSELI_BERRY EQU $0C4 -LIECHI_BERRY EQU $0C5 -GANLON_BERRY EQU $0C6 -SALAC_BERRY EQU $0C7 -PETAYA_BERRY EQU $0C8 -APICOT_BERRY EQU $0C9 -LANSAT_BERRY EQU $0CA -STARF_BERRY EQU $0CB -MICLE_BERRY EQU $0CC -ENIGMA_BERRY EQU $0CD -CUSTAP_BERRY EQU $0CE -JABOCA_BERRY EQU $0CF -ROWAP_BERRY EQU $0D0 -KEE_BERRY EQU $0D1 -MARANGA_BERRY EQU $0D2 +; Mints +LONELY_MINT EQU 81 +ADAMANT_MINT EQU 82 +NAUGHTY_MINT EQU 83 +BRAVE_MINT EQU 84 +BOLD_MINT EQU 85 +IMPISH_MINT EQU 86 +LAX_MINT EQU 87 +RELAXED_MINT EQU 88 +MODEST_MINT EQU 89 +MILD_MINT EQU 90 +RASH_MINT EQU 91 +QUIET_MINT EQU 92 +CALM_MINT EQU 93 +GENTLE_MINT EQU 94 +CAREFUL_MINT EQU 95 +SASSY_MINT EQU 96 +TIMID_MINT EQU 97 +HASTY_MINT EQU 98 +JOLLY_MINT EQU 99 +NAIVE_MINT EQU 100 +SERIOUS_MINT EQU 101 -; Battle Held items -BRIGHT_POWDER EQU $0D3 -WHITE_HERB EQU $0D4 -MACHO_BRACE EQU $0D5 -EXP_SHARE EQU $0D6 -QUICK_CLAW EQU $0D7 -SOOTHE_BELL EQU $0D8 -MENTAL_HERB EQU $0D9 -CHOICE_BAND EQU $0DA -KINGS_ROCK EQU $0DB -SILVER_POWDER EQU $0DC -AMULET_COIN EQU $0DD -CLEANSE_TAG EQU $0DE -SMOKE_BALL EQU $0DF -EVERSTONE EQU $0E0 -FOCUS_BAND EQU $0E1 -LUCKY_EGG EQU $0E2 -SCOPE_LENS EQU $0E3 -METAL_COAT EQU $0E4 -LEFTOVERS EQU $0E5 -DRAGON_SCALE EQU $0E6 -OVAL_STONE EQU $0E7 -PROTECTOR EQU $0E8 -ELECTIRIZER EQU $0E9 -MAGMARIZER EQU $0EA -DUBIOUS_DISC EQU $0EB -REAPER_CLOTH EQU $0EC -RAZOR_CLAW EQU $0ED -RAZOR_FANG EQU $0EE -PRISM_SCALE EQU $0EF -WHIPPED_DREAM EQU $0F0 -SACHET EQU $0F1 -SOFT_SAND EQU $0F2 -HARD_STONE EQU $0F3 -MIRACLE_SEED EQU $0F4 -BLACK_GLASSES EQU $0F5 -BLACK_BELT EQU $0F6 -MAGNET EQU $0F7 -MYSTIC_WATER EQU $0F8 -SHARP_BEAK EQU $0F9 -POISON_BARB EQU $0FA -NEVER_MELT_ICE EQU $0FB -SPELL_TAG EQU $0FC -TWISTED_SPOON EQU $0FD -CHARCOAL EQU $0FE -DRAGON_FANG EQU $0FF -SILK_SCARF EQU $100 -UP_GRADE EQU $101 -SHELL_BELL EQU $102 -POWER_BRACER EQU $103 -POWER_BELT EQU $104 -POWER_LENS EQU $105 -POWER_BAND EQU $106 -POWER_ANKLET EQU $107 -POWER_WEIGHT EQU $108 -POWER_HERB EQU $109 -CHOICE_SCARF EQU $10A -CHOICE_SPECS EQU $10B -FOCUS_SASH EQU $10C -WIDE_LENS EQU $10D -ZOOM_LENS EQU $10E -ITEM_METRONOME EQU $10F -MUSCLE_BAND EQU $110 -WISE_GLASSES EQU $111 -EXPERT_BELT EQU $112 -LIGHT_CLAY EQU $113 -ICY_ROCK EQU $114 -SMOOTH_ROCK EQU $115 -HEAT_ROCK EQU $116 -DAMP_ROCK EQU $117 -DESTINY_KNOT EQU $118 -GRIP_CLAW EQU $119 -LIFE_ORB EQU $11A -TOXIC_ORB EQU $11B -FLAME_ORB EQU $11C -STICKY_BARB EQU $11D -BLACK_SLUDGE EQU $11E -IRON_BALL EQU $11F -LAGGING_TAIL EQU $120 -SHED_SHELL EQU $121 -BIG_ROOT EQU $122 -EVIOLITE EQU $123 -FLOAT_STONE EQU $124 -ROCKY_HELMET EQU $125 -AIR_BALLOON EQU $126 -RED_CARD EQU $127 -RING_TARGET EQU $128 -BINDING_BAND EQU $129 -EJECT_BUTTON EQU $12A -ABSORB_BULB EQU $12B -CELL_BATTERY EQU $12C -LUMINOUS_MOSS EQU $12D -SNOWBALL EQU $12E -WEAKNESS_POLICY EQU $12F -ASSAULT_VEST EQU $130 -SAFETY_GOGGLES EQU $131 -ADRENALINE_ORB EQU $132 -TERRAIN_EXTENDER EQU $133 -PROTECTIVE_PADS EQU $134 -ELECTRIC_SEED EQU $135 -PSYCHIC_SEED EQU $136 -MISTY_SEED EQU $137 -GRASSY_SEED EQU $138 +; Candy +RARE_CANDY EQU 102 +EXP_CANDY_XS EQU 103 +EXP_CANDY_S EQU 104 +EXP_CANDY_M EQU 105 +EXP_CANDY_L EQU 106 +EXP_CANDY_XL EQU 107 +DYNAMAX_CANDY EQU 108 -; Incenses -SEA_INCENSE EQU $139 -LAX_INCENSE EQU $13A -ODD_INCENSE EQU $13B -ROCK_INCENSE EQU $13C -FULL_INCENSE EQU $13D -WAVE_INCENSE EQU $13E -ROSE_INCENSE EQU $13F -LUCK_INCENSE EQU $140 -PURE_INCENSE EQU $141 +; Medicinal Flutes +BLUE_FLUTE EQU 109 +YELLOW_FLUTE EQU 110 +RED_FLUTE EQU 111 -; Plates -INSECT_PLATE EQU $142 -DREAD_PLATE EQU $143 -DRACO_PLATE EQU $144 -ZAP_PLATE EQU $145 -PIXIE_PLATE EQU $146 -FIST_PLATE EQU $147 -FLAME_PLATE EQU $148 -SKY_PLATE EQU $149 -SPOOKY_PLATE EQU $14A -MEADOW_PLATE EQU $14B -EARTH_PLATE EQU $14C -ICICLE_PLATE EQU $14D -TOXIC_PLATE EQU $14E -MIND_PLATE EQU $14F -STONE_PLATE EQU $150 -IRON_PLATE EQU $151 -SPLASH_PLATE EQU $152 +; Encounter-modifying Flutes +BLACK_FLUTE EQU 112 +WHITE_FLUTE EQU 113 -; Gems -BUG_GEM EQU $153 -DARK_GEM EQU $154 -DRAGON_GEM EQU $155 -ELECTRIC_GEM EQU $156 -FAIRY_GEM EQU $157 -FIGHTING_GEM EQU $158 -FIRE_GEM EQU $159 -FLYING_GEM EQU $15A -GHOST_GEM EQU $15B -GRASS_GEM EQU $15C -GROUND_GEM EQU $15D -ICE_GEM EQU $15E -NORMAL_GEM EQU $15F -POISON_GEM EQU $160 -PSYCHIC_GEM EQU $161 -ROCK_GEM EQU $162 -STEEL_GEM EQU $163 -WATER_GEM EQU $164 +; Encounter Modifiers +REPEL EQU 114 +SUPER_REPEL EQU 115 +MAX_REPEL EQU 116 +LURE EQU 117 +SUPER_LURE EQU 118 +MAX_LURE EQU 119 -; Mon specific -SOUL_DEW EQU $165 -DEEP_SEA_TOOTH EQU $166 -DEEP_SEA_SCALE EQU $167 -LUCKY_PUNCH EQU $168 -METAL_POWDER EQU $169 -THICK_CLUB EQU $16A -STICK EQU $16B -LIGHT_BALL EQU $16C -QUICK_POWDER EQU $16D -ODD_KEYSTONE EQU $16E -ADAMANT_ORB EQU $16F -LUSTROUS_ORB EQU $170 -GRISEOUS_ORB EQU $171 -GRACIDEA EQU $172 +ESCAPE_ROPE EQU 120 -; Memories -BUG_MEMORY EQU $173 -DARK_MEMORY EQU $174 -DRAGON_MEMORY EQU $175 -ELECTRIC_MEMORY EQU $176 -FAIRY_MEMORY EQU $177 -FIGHTING_MEMORY EQU $178 -FIRE_MEMORY EQU $179 -FLYING_MEMORY EQU $17A -GHOST_MEMORY EQU $17B -GRASS_MEMORY EQU $17C -GROUND_MEMORY EQU $17D -ICE_MEMORY EQU $17E -POISON_MEMORY EQU $17F -PSYCHIC_MEMORY EQU $180 -ROCK_MEMORY EQU $181 -STEEL_MEMORY EQU $182 -WATER_MEMORY EQU $183 +; X Items +X_ATTACK EQU 121 +X_DEFENSE EQU 122 +X_SP_ATK EQU 123 +X_SP_DEF EQU 124 +X_SPEED EQU 125 +X_ACCURACY EQU 126 -; Drives -DOUSE_DRIVE EQU $184 -SHOCK_DRIVE EQU $185 -BURN_DRIVE EQU $186 -CHILL_DRIVE EQU $187 +DIRE_HIT EQU 127 +GUARD_SPEC EQU 128 -; Contest held items -RED_SCARF EQU $188 -BLUE_SCARF EQU $189 -PINK_SCARF EQU $18A -GREEN_SCARF EQU $18B -YELLOW_SCARF EQU $18C +; Escape Items +POKE_DOLL EQU 129 +FLUFFY_TAIL EQU 130 +POKE_TOY EQU 131 -; Mega stones -ABOMASITE EQU $18D -ABSOLITE EQU $18E -AERODACTYLITE EQU $18F -AGGRONITE EQU $190 -ALAKAZITE EQU $191 -ALTARIANITE EQU $192 -AMPHAROSITE EQU $193 -AUDINITE EQU $194 -BANETTITE EQU $195 -BEEDRILLITE EQU $196 -BLASTOISINITE EQU $197 -BLAZIKENITE EQU $198 -CAMERUPTITE EQU $199 -CHARIZARDITE_X EQU $19A -CHARIZARDITE_Y EQU $19B -DIANCITE EQU $19C -GALLADITE EQU $19D -GARCHOMPITE EQU $19E -GARDEVOIRITE EQU $19F -GENGARITE EQU $1A0 -GLALITITE EQU $1A1 -GYARADOSITE EQU $1A2 -HERACRONITE EQU $1A3 -HOUNDOOMINITE EQU $1A4 -KANGASKHANITE EQU $1A5 -LATIASITE EQU $1A6 -LATIOSITE EQU $1A7 -LOPUNNITE EQU $1A8 -LUCARIONITE EQU $1A9 -MANECTITE EQU $1AA -MAWILITE EQU $1AB -MEDICHAMITE EQU $1AC -METAGROSSITE EQU $1AD -MEWTWONITE_X EQU $1AE -MEWTWONITE_Y EQU $1AF -PIDGEOTITE EQU $1B0 -PINSIRITE EQU $1B1 -SABLENITE EQU $1B2 -SALAMENCITE EQU $1B3 -SCEPTILITE EQU $1B4 -SCIZORITE EQU $1B5 -SHARPEDONITE EQU $1B6 -SLOWBRONITE EQU $1B7 -STEELIXITE EQU $1B8 -SWAMPERTITE EQU $1B9 -TYRANITARITE EQU $1BA -VENUSAURITE EQU $1BB -MEGA_BRACELET EQU $1BC +MAX_MUSHROOMS EQU 132 + +; Treasures +BOTTLE_CAP EQU 133 +GOLD_BOTTLE_CAP EQU 134 +NUGGET EQU 135 +BIG_NUGGET EQU 136 +TINY_MUSHROOM EQU 137 +BIG_MUSHROOM EQU 138 +BALM_MUSHROOM EQU 139 +PEARL EQU 140 +BIG_PEARL EQU 141 +PEARL_STRING EQU 142 +STARDUST EQU 143 +STAR_PIECE EQU 144 +COMET_SHARD EQU 145 +SHOAL_SALT EQU 146 +SHOAL_SHELL EQU 147 +RED_SHARD EQU 148 +BLUE_SHARD EQU 149 +YELLOW_SHARD EQU 150 +GREEN_SHARD EQU 151 +HEART_SCALE EQU 152 +HONEY EQU 153 +RARE_BONE EQU 154 +ODD_KEYSTONE EQU 155 +PRETTY_FEATHER EQU 156 +RELIC_COPPER EQU 157 +RELIC_SILVER EQU 158 +RELIC_GOLD EQU 159 +RELIC_VASE EQU 160 +RELIC_BAND EQU 161 +RELIC_STATUE EQU 162 +RELIC_CROWN EQU 163 +STRANGE_SOUVENIR EQU 164 ; Fossils -ARMOR_FOSSIL EQU $1BD -SKULL_FOSSIL EQU $1BE -HELIX_FOSSIL EQU $1BF -DOME_FOSSIL EQU $1C0 -COVER_FOSSIL EQU $1C1 -PLUME_FOSSIL EQU $1C2 -JAW_FOSSIL EQU $1C3 -SAIL_FOSSIL EQU $1C4 -ROOT_FOSSIL EQU $1C5 -CLAW_FOSSIL EQU $1C6 +HELIX_FOSSIL EQU 165 +DOME_FOSSIL EQU 166 +OLD_AMBER EQU 167 +ROOT_FOSSIL EQU 168 +CLAW_FOSSIL EQU 169 +ARMOR_FOSSIL EQU 170 +SKULL_FOSSIL EQU 171 +COVER_FOSSIL EQU 172 +PLUME_FOSSIL EQU 173 +JAW_FOSSIL EQU 174 +SAIL_FOSSIL EQU 175 +FOSSILIZED_BIRD EQU 176 +FOSSILIZED_FISH EQU 177 +FOSSILIZED_DRAKE EQU 178 +FOSSILIZED_DINO EQU 179 -; Key Items -MACH_BIKE EQU $1C7 -COIN_CASE EQU $1C8 -ITEMFINDER EQU $1C9 -OLD_ROD EQU $1CA -GOOD_ROD EQU $1CB -SUPER_ROD EQU $1CC -SS_TICKET EQU $1CD -CONTEST_PASS EQU $1CE -WAILMER_PAIL EQU $1CF -DEVON_GOODS EQU $1D0 -SOOT_SACK EQU $1D1 -BASEMENT_KEY EQU $1D2 -ACRO_BIKE EQU $1D3 -POKEBLOCK_CASE EQU $1D4 -LETTER EQU $1D5 -EON_TICKET EQU $1D6 -RED_ORB EQU $1D7 -BLUE_ORB EQU $1D8 -SCANNER EQU $1D9 -GO_GOGGLES EQU $1DA -METEORITE EQU $1DB -ROOM_1_KEY EQU $1DC -ROOM_2_KEY EQU $1DD -ROOM_4_KEY EQU $1DE -ROOM_6_KEY EQU $1DF -STORAGE_KEY EQU $1E0 -DEVON_SCOPE EQU $1E1 +; Mulch +GROWTH_MULCH EQU 180 +DAMP_MULCH EQU 181 +STABLE_MULCH EQU 182 +GOOEY_MULCH EQU 183 +RICH_MULCH EQU 184 +SURPRISE_MULCH EQU 185 +BOOST_MULCH EQU 186 +AMAZE_MULCH EQU 187 + +; Apricorns +RED_APRICORN EQU 188 +BLUE_APRICORN EQU 189 +YELLOW_APRICORN EQU 190 +GREEN_APRICORN EQU 191 +PINK_APRICORN EQU 192 +WHITE_APRICORN EQU 193 +BLACK_APRICORN EQU 194 + +WISHING_PIECE EQU 195 +GALARICA_TWIG EQU 196 +ARMORITE_ORE EQU 197 +DYNITE_ORE EQU 198 + +; Mail +ORANGE_MAIL EQU 199 +HARBOR_MAIL EQU 200 +GLITTER_MAIL EQU 201 +MECH_MAIL EQU 202 +WOOD_MAIL EQU 203 +WAVE_MAIL EQU 204 +BEAD_MAIL EQU 205 +SHADOW_MAIL EQU 206 +TROPIC_MAIL EQU 207 +DREAM_MAIL EQU 208 +FAB_MAIL EQU 209 +RETRO_MAIL EQU 210 + +; Evolution Items +FIRE_STONE EQU 211 +WATER_STONE EQU 212 +THUNDER_STONE EQU 213 +LEAF_STONE EQU 214 +ICE_STONE EQU 215 +SUN_STONE EQU 216 +MOON_STONE EQU 217 +SHINY_STONE EQU 218 +DUSK_STONE EQU 219 +DAWN_STONE EQU 220 +SWEET_APPLE EQU 221 +TART_APPLE EQU 222 +CRACKED_POT EQU 223 +CHIPPED_POT EQU 224 +GALARICA_CUFF EQU 225 +GALARICA_WREATH EQU 226 +DRAGON_SCALE EQU 227 +UPGRADE EQU 228 +PROTECTOR EQU 229 +ELECTIRIZER EQU 230 +MAGMARIZER EQU 231 +DUBIOUS_DISC EQU 232 +REAPER_CLOTH EQU 233 +PRISM_SCALE EQU 234 +WHIPPED_DREAM EQU 235 +SACHET EQU 236 +OVAL_STONE EQU 237 +STRAWBERRY_SWEET EQU 238 +LOVE_SWEET EQU 239 +BERRY_SWEET EQU 240 +CLOVER_SWEET EQU 241 +FLOWER_SWEET EQU 242 +STAR_SWEET EQU 243 +RIBBON_SWEET EQU 244 + +EVERSTONE EQU 245 + +; Nectars +RED_NECTAR EQU 246 +YELLOW_NECTAR EQU 247 +PINK_NECTAR EQU 248 +PURPLE_NECTAR EQU 249 + +; Plates +FLAME_PLATE EQU 250 +SPLASH_PLATE EQU 251 +ZAP_PLATE EQU 252 +MEADOW_PLATE EQU 253 +ICICLE_PLATE EQU 254 +FIST_PLATE EQU 255 +TOXIC_PLATE EQU 256 +EARTH_PLATE EQU 257 +SKY_PLATE EQU 258 +MIND_PLATE EQU 259 +INSECT_PLATE EQU 260 +STONE_PLATE EQU 261 +SPOOKY_PLATE EQU 262 +DRACO_PLATE EQU 263 +DREAD_PLATE EQU 264 +IRON_PLATE EQU 265 +PIXIE_PLATE EQU 266 + +; Drives +DOUSE_DRIVE EQU 267 +SHOCK_DRIVE EQU 268 +BURN_DRIVE EQU 269 +CHILL_DRIVE EQU 270 + +; Memories +FIRE_MEMORY EQU 271 +WATER_MEMORY EQU 272 +ELECTRIC_MEMORY EQU 273 +GRASS_MEMORY EQU 274 +ICE_MEMORY EQU 275 +FIGHTING_MEMORY EQU 276 +POISON_MEMORY EQU 277 +GROUND_MEMORY EQU 278 +FLYING_MEMORY EQU 279 +PSYCHIC_MEMORY EQU 280 +BUG_MEMORY EQU 281 +ROCK_MEMORY EQU 282 +GHOST_MEMORY EQU 283 +DRAGON_MEMORY EQU 284 +DARK_MEMORY EQU 285 +STEEL_MEMORY EQU 286 +FAIRY_MEMORY EQU 287 + +RUSTED_SWORD EQU 288 +RUSTED_SHIELD EQU 289 + +; Colored Orbs +RED_ORB EQU 290 +BLUE_ORB EQU 291 + +; Mega Stones +VENUSAURITE EQU 292 +CHARIZARDITE_X EQU 293 +CHARIZARDITE_Y EQU 294 +BLASTOISINITE EQU 295 +BEEDRILLITE EQU 296 +PIDGEOTITE EQU 297 +ALAKAZITE EQU 298 +SLOWBRONITE EQU 299 +GENGARITE EQU 300 +KANGASKHANITE EQU 301 +PINSIRITE EQU 302 +GYARADOSITE EQU 303 +AERODACTYLITE EQU 304 +MEWTWONITE_X EQU 305 +MEWTWONITE_Y EQU 306 +AMPHAROSITE EQU 307 +STEELIXITE EQU 308 +SCIZORITE EQU 309 +HERACRONITE EQU 310 +HOUNDOOMINITE EQU 311 +TYRANITARITE EQU 312 +SCEPTILITE EQU 313 +BLAZIKENITE EQU 314 +SWAMPERTITE EQU 315 +GARDEVOIRITE EQU 316 +SABLENITE EQU 317 +MAWILITE EQU 318 +AGGRONITE EQU 319 +MEDICHAMITE EQU 320 +MANECTITE EQU 321 +SHARPEDONITE EQU 322 +CAMERUPTITE EQU 323 +ALTARIANITE EQU 324 +BANETTITE EQU 325 +ABSOLITE EQU 326 +GLALITITE EQU 327 +SALAMENCITE EQU 328 +METAGROSSITE EQU 329 +LATIASITE EQU 330 +LATIOSITE EQU 331 +LOPUNNITE EQU 332 +GARCHOMPITE EQU 333 +LUCARIONITE EQU 334 +ABOMASITE EQU 335 +GALLADITE EQU 336 +AUDINITE EQU 337 +DIANCITE EQU 338 + +; Gems +NORMAL_GEM EQU 339 +FIRE_GEM EQU 340 +WATER_GEM EQU 341 +ELECTRIC_GEM EQU 342 +GRASS_GEM EQU 343 +ICE_GEM EQU 344 +FIGHTING_GEM EQU 345 +POISON_GEM EQU 346 +GROUND_GEM EQU 347 +FLYING_GEM EQU 348 +PSYCHIC_GEM EQU 349 +BUG_GEM EQU 350 +ROCK_GEM EQU 351 +GHOST_GEM EQU 352 +DRAGON_GEM EQU 353 +DARK_GEM EQU 354 +STEEL_GEM EQU 355 +FAIRY_GEM EQU 356 + +; Z-Crystals +NORMALIUM_Z EQU 357 +FIRIUM_Z EQU 358 +WATERIUM_Z EQU 359 +ELECTRIUM_Z EQU 360 +GRASSIUM_Z EQU 361 +ICIUM_Z EQU 362 +FIGHTINIUM_Z EQU 363 +POISONIUM_Z EQU 364 +GROUNDIUM_Z EQU 365 +FLYINIUM_Z EQU 366 +PSYCHIUM_Z EQU 367 +BUGINIUM_Z EQU 368 +ROCKIUM_Z EQU 369 +GHOSTIUM_Z EQU 370 +DRAGONIUM_Z EQU 371 +DARKINIUM_Z EQU 372 +STEELIUM_Z EQU 373 +FAIRIUM_Z EQU 374 +PIKANIUM_Z EQU 375 +EEVIUM_Z EQU 376 +SNORLIUM_Z EQU 377 +MEWNIUM_Z EQU 378 +DECIDIUM_Z EQU 379 +INCINIUM_Z EQU 380 +PRIMARIUM_Z EQU 381 +LYCANIUM_Z EQU 382 +MIMIKIUM_Z EQU 383 +KOMMONIUM_Z EQU 384 +TAPUNIUM_Z EQU 385 +SOLGANIUM_Z EQU 386 +LUNALIUM_Z EQU 387 +MARSHADIUM_Z EQU 388 +ALORAICHIUM_Z EQU 389 +PIKASHUNIUM_Z EQU 390 +ULTRANECROZIUM_Z EQU 391 + +; Species-specific Held Items +LIGHT_BALL EQU 392 +LEEK EQU 393 +THICK_CLUB EQU 394 +LUCKY_PUNCH EQU 395 +METAL_POWDER EQU 396 +QUICK_POWDER EQU 397 +DEEP_SEA_SCALE EQU 398 +DEEP_SEA_TOOTH EQU 399 +SOUL_DEW EQU 400 +ADAMANT_ORB EQU 401 +LUSTROUS_ORB EQU 402 +GRISEOUS_ORB EQU 403 + +; Incenses +SEA_INCENSE EQU 404 +LAX_INCENSE EQU 405 +ODD_INCENSE EQU 406 +ROCK_INCENSE EQU 407 +FULL_INCENSE EQU 408 +WAVE_INCENSE EQU 409 +ROSE_INCENSE EQU 410 +LUCK_INCENSE EQU 411 +PURE_INCENSE EQU 412 + +; Contest Scarves +RED_SCARF EQU 413 +BLUE_SCARF EQU 414 +PINK_SCARF EQU 415 +GREEN_SCARF EQU 416 +YELLOW_SCARF EQU 417 + +; EV Gain Modifiers +MACHO_BRACE EQU 418 +POWER_WEIGHT EQU 419 +POWER_BRACER EQU 420 +POWER_BELT EQU 421 +POWER_LENS EQU 422 +POWER_BAND EQU 423 +POWER_ANKLET EQU 424 + +; Type-boosting Held Items +SILK_SCARF EQU 425 +CHARCOAL EQU 426 +MYSTIC_WATER EQU 427 +MAGNET EQU 428 +MIRACLE_SEED EQU 429 +NEVER_MELT_ICE EQU 430 +BLACK_BELT EQU 431 +POISON_BARB EQU 432 +SOFT_SAND EQU 433 +SHARP_BEAK EQU 434 +TWISTED_SPOON EQU 435 +SILVER_POWDER EQU 436 +HARD_STONE EQU 437 +SPELL_TAG EQU 438 +DRAGON_FANG EQU 439 +BLACK_GLASSES EQU 440 +METAL_COAT EQU 441 + +; Choice Items +CHOICE_BAND EQU 442 +CHOICE_SPECS EQU 443 +CHOICE_SCARF EQU 444 + +; Status Orbs +FLAME_ORB EQU 445 +TOXIC_ORB EQU 446 + +; Weather Rocks +DAMP_ROCK EQU 447 +HEAT_ROCK EQU 448 +SMOOTH_ROCK EQU 449 +ICY_ROCK EQU 450 + +; Terrain Seeds +ELECTRIC_SEED EQU 451 +PSYCHIC_SEED EQU 452 +MISTY_SEED EQU 453 +GRASSY_SEED EQU 454 + +; Type-activated Stat Modifiers +ABSORB_BULB EQU 455 +CELL_BATTERY EQU 456 +LUMINOUS_MOSS EQU 457 +SNOWBALL EQU 458 + +; Misc. Held Items +BRIGHT_POWDER EQU 459 +WHITE_HERB EQU 460 +EXP_SHARE EQU 461 +QUICK_CLAW EQU 462 +SOOTHE_BELL EQU 463 +MENTAL_HERB EQU 464 +KINGS_ROCK EQU 465 +AMULET_COIN EQU 466 +CLEANSE_TAG EQU 467 +SMOKE_BALL EQU 468 +FOCUS_BAND EQU 469 +LUCKY_EGG EQU 470 +SCOPE_LENS EQU 471 +LEFTOVERS EQU 472 +SHELL_BELL EQU 473 +WIDE_LENS EQU 474 +MUSCLE_BAND EQU 475 +WISE_GLASSES EQU 476 +EXPERT_BELT EQU 477 +LIGHT_CLAY EQU 478 +LIFE_ORB EQU 479 +POWER_HERB EQU 480 +FOCUS_SASH EQU 481 +ZOOM_LENS EQU 482 +ITEM_METRONOME EQU 483 +IRON_BALL EQU 484 +LAGGING_TAIL EQU 485 +DESTINY_KNOT EQU 486 +BLACK_SLUDGE EQU 487 +GRIP_CLAW EQU 488 +STICKY_BARB EQU 489 +SHED_SHELL EQU 490 +BIG_ROOT EQU 491 +RAZOR_CLAW EQU 492 +RAZOR_FANG EQU 493 +EVIOLITE EQU 494 +FLOAT_STONE EQU 495 +ROCKY_HELMET EQU 496 +AIR_BALLOON EQU 497 +RED_CARD EQU 498 +RING_TARGET EQU 499 +BINDING_BAND EQU 500 +EJECT_BUTTON EQU 501 +WEAKNESS_POLICY EQU 502 +ASSAULT_VEST EQU 503 +SAFETY_GOGGLES EQU 504 +ADRENALINE_ORB EQU 505 +TERRAIN_EXTENDER EQU 506 +PROTECTIVE_PADS EQU 507 +THROAT_SPRAY EQU 508 +EJECT_PACK EQU 509 +HEAVY_DUTY_BOOTS EQU 510 +BLUNDER_POLICY EQU 511 +ROOM_SERVICE EQU 512 +UTILITY_UMBRELLA EQU 513 + +; Berries +CHERI_BERRY EQU 514 +CHESTO_BERRY EQU 515 +PECHA_BERRY EQU 516 +RAWST_BERRY EQU 517 +ASPEAR_BERRY EQU 518 +LEPPA_BERRY EQU 519 +ORAN_BERRY EQU 520 +PERSIM_BERRY EQU 521 +LUM_BERRY EQU 522 +SITRUS_BERRY EQU 523 +FIGY_BERRY EQU 524 +WIKI_BERRY EQU 525 +MAGO_BERRY EQU 526 +AGUAV_BERRY EQU 527 +IAPAPA_BERRY EQU 528 +RAZZ_BERRY EQU 529 +BLUK_BERRY EQU 530 +NANAB_BERRY EQU 531 +WEPEAR_BERRY EQU 532 +PINAP_BERRY EQU 533 +POMEG_BERRY EQU 534 +KELPSY_BERRY EQU 535 +QUALOT_BERRY EQU 536 +HONDEW_BERRY EQU 537 +GREPA_BERRY EQU 538 +TAMATO_BERRY EQU 539 +CORNN_BERRY EQU 540 +MAGOST_BERRY EQU 541 +RABUTA_BERRY EQU 542 +NOMEL_BERRY EQU 543 +SPELON_BERRY EQU 544 +PAMTRE_BERRY EQU 545 +WATMEL_BERRY EQU 546 +DURIN_BERRY EQU 547 +BELUE_BERRY EQU 548 +CHILAN_BERRY EQU 549 +OCCA_BERRY EQU 550 +PASSHO_BERRY EQU 551 +WACAN_BERRY EQU 552 +RINDO_BERRY EQU 553 +YACHE_BERRY EQU 554 +CHOPLE_BERRY EQU 555 +KEBIA_BERRY EQU 556 +SHUCA_BERRY EQU 557 +COBA_BERRY EQU 558 +PAYAPA_BERRY EQU 559 +TANGA_BERRY EQU 560 +CHARTI_BERRY EQU 561 +KASIB_BERRY EQU 562 +HABAN_BERRY EQU 563 +COLBUR_BERRY EQU 564 +BABIRI_BERRY EQU 565 +ROSELI_BERRY EQU 566 +LIECHI_BERRY EQU 567 +GANLON_BERRY EQU 568 +SALAC_BERRY EQU 569 +PETAYA_BERRY EQU 570 +APICOT_BERRY EQU 571 +LANSAT_BERRY EQU 572 +STARF_BERRY EQU 573 +ENIGMA_BERRY EQU 574 +MICLE_BERRY EQU 575 +CUSTAP_BERRY EQU 576 +JABOCA_BERRY EQU 577 +ROWAP_BERRY EQU 578 +KEE_BERRY EQU 579 +MARANGA_BERRY EQU 580 +ENIGMA_BERRY_E_READER EQU 581 ; TMs/HMs -TM01 EQU $1E2 -TM02 EQU $1E3 -TM03 EQU $1E4 -TM04 EQU $1E5 -TM05 EQU $1E6 -TM06 EQU $1E7 -TM07 EQU $1E8 -TM08 EQU $1E9 -TM09 EQU $1EA -TM10 EQU $1EB -TM11 EQU $1EC -TM12 EQU $1ED -TM13 EQU $1EE -TM14 EQU $1EF -TM15 EQU $1F0 -TM16 EQU $1F1 -TM17 EQU $1F2 -TM18 EQU $1F3 -TM19 EQU $1F4 -TM20 EQU $1F5 -TM21 EQU $1F6 -TM22 EQU $1F7 -TM23 EQU $1F8 -TM24 EQU $1F9 -TM25 EQU $1FA -TM26 EQU $1FB -TM27 EQU $1FC -TM28 EQU $1FD -TM29 EQU $1FE -TM30 EQU $1FF -TM31 EQU $200 -TM32 EQU $201 -TM33 EQU $202 -TM34 EQU $203 -TM35 EQU $204 -TM36 EQU $205 -TM37 EQU $206 -TM38 EQU $207 -TM39 EQU $208 -TM40 EQU $209 -TM41 EQU $20A -TM42 EQU $20B -TM43 EQU $20C -TM44 EQU $20D -TM45 EQU $20E -TM46 EQU $20F -TM47 EQU $210 -TM48 EQU $211 -TM49 EQU $212 -TM50 EQU $213 +TM01 EQU 582 +TM02 EQU 583 +TM03 EQU 584 +TM04 EQU 585 +TM05 EQU 586 +TM06 EQU 587 +TM07 EQU 588 +TM08 EQU 589 +TM09 EQU 590 +TM10 EQU 591 +TM11 EQU 592 +TM12 EQU 593 +TM13 EQU 594 +TM14 EQU 595 +TM15 EQU 596 +TM16 EQU 597 +TM17 EQU 598 +TM18 EQU 599 +TM19 EQU 600 +TM20 EQU 601 +TM21 EQU 602 +TM22 EQU 603 +TM23 EQU 604 +TM24 EQU 605 +TM25 EQU 606 +TM26 EQU 607 +TM27 EQU 608 +TM28 EQU 609 +TM29 EQU 610 +TM30 EQU 611 +TM31 EQU 612 +TM32 EQU 613 +TM33 EQU 614 +TM34 EQU 615 +TM35 EQU 616 +TM36 EQU 617 +TM37 EQU 618 +TM38 EQU 619 +TM39 EQU 620 +TM40 EQU 621 +TM41 EQU 622 +TM42 EQU 623 +TM43 EQU 624 +TM44 EQU 625 +TM45 EQU 626 +TM46 EQU 627 +TM47 EQU 628 +TM48 EQU 629 +TM49 EQU 630 +TM50 EQU 631 +TM51 EQU 632 +TM52 EQU 633 +TM53 EQU 634 +TM54 EQU 635 +TM55 EQU 636 +TM56 EQU 637 +TM57 EQU 638 +TM58 EQU 639 +TM59 EQU 640 +TM60 EQU 641 +TM61 EQU 642 +TM62 EQU 643 +TM63 EQU 644 +TM64 EQU 645 +TM65 EQU 646 +TM66 EQU 647 +TM67 EQU 648 +TM68 EQU 649 +TM69 EQU 650 +TM70 EQU 651 +TM71 EQU 652 +TM72 EQU 653 +TM73 EQU 654 +TM74 EQU 655 +TM75 EQU 656 +TM76 EQU 657 +TM77 EQU 658 +TM78 EQU 659 +TM79 EQU 660 +TM80 EQU 661 +TM81 EQU 662 +TM82 EQU 663 +TM83 EQU 664 +TM84 EQU 665 +TM85 EQU 666 +TM86 EQU 667 +TM87 EQU 668 +TM88 EQU 669 +TM89 EQU 670 +TM90 EQU 671 +TM91 EQU 672 +TM92 EQU 673 +TM93 EQU 674 +TM94 EQU 675 +TM95 EQU 676 +TM96 EQU 677 +TM97 EQU 678 +TM98 EQU 679 +TM99 EQU 680 +TM100 EQU 681 -HM01 EQU $214 -HM02 EQU $215 -HM03 EQU $216 -HM04 EQU $217 -HM05 EQU $218 -HM06 EQU $219 -HM07 EQU $21A -HM08 EQU $21B +HM01 EQU 682 +HM02 EQU 683 +HM03 EQU 684 +HM04 EQU 685 +HM05 EQU 686 +HM06 EQU 687 +HM07 EQU 688 +HM08 EQU 689 -TM01_FOCUS_PUNCH EQU TM01 -TM02_DRAGON_CLAW EQU TM02 -TM03_WATER_PULSE EQU TM03 -TM04_CALM_MIND EQU TM04 -TM05_ROAR EQU TM05 -TM06_TOXIC EQU TM06 -TM07_HAIL EQU TM07 -TM08_BULK_UP EQU TM08 -TM09_BULLET_SEED EQU TM09 -TM10_HIDDEN_POWER EQU TM10 -TM11_SUNNY_DAY EQU TM11 -TM12_TAUNT EQU TM12 -TM13_ICE_BEAM EQU TM13 -TM14_BLIZZARD EQU TM14 -TM15_HYPER_BEAM EQU TM15 -TM16_LIGHT_SCREEN EQU TM16 -TM17_PROTECT EQU TM17 -TM18_RAIN_DANCE EQU TM18 -TM19_GIGA_DRAIN EQU TM19 -TM20_SAFEGUARD EQU TM20 -TM21_FRUSTRATION EQU TM21 -TM22_SOLARBEAM EQU TM22 -TM23_IRON_TAIL EQU TM23 -TM24_THUNDERBOLT EQU TM24 -TM25_THUNDER EQU TM25 -TM26_EARTHQUAKE EQU TM26 -TM27_RETURN EQU TM27 -TM28_DIG EQU TM28 -TM29_PSYCHIC EQU TM29 -TM30_SHADOW_BALL EQU TM30 -TM31_BRICK_BREAK EQU TM31 -TM32_DOUBLE_TEAM EQU TM32 -TM33_REFLECT EQU TM33 -TM34_SHOCK_WAVE EQU TM34 -TM35_FLAMETHROWER EQU TM35 -TM36_SLUDGE_BOMB EQU TM36 -TM37_SANDSTORM EQU TM37 -TM38_FIRE_BLAST EQU TM38 -TM39_ROCK_TOMB EQU TM39 -TM40_AERIAL_ACE EQU TM40 -TM41_TORMENT EQU TM41 -TM42_FACADE EQU TM42 -TM43_SECRET_POWER EQU TM43 -TM44_REST EQU TM44 -TM45_ATTRACT EQU TM45 -TM46_THIEF EQU TM46 -TM47_STEEL_WING EQU TM47 -TM48_SKILL_SWAP EQU TM48 -TM49_SNATCH EQU TM49 -TM50_OVERHEAT EQU TM50 +; Charms +OVAL_CHARM EQU 690 +SHINY_CHARM EQU 691 +CATCHING_CHARM EQU 692 +EXP_CHARM EQU 693 -HM01_CUT EQU HM01 -HM02_FLY EQU HM02 -HM03_SURF EQU HM03 -HM04_STRENGTH EQU HM04 -HM05_FLASH EQU HM05 -HM06_ROCK_SMASH EQU HM06 -HM07_WATERFALL EQU HM07 -HM08_DIVE EQU HM08 +; Form-changing Key Items +ROTOM_CATALOG EQU 694 +GRACIDEA EQU 695 +REVEAL_GLASS EQU 696 +DNA_SPLICERS EQU 697 +ZYGARDE_CUBE EQU 698 +PRISON_BOTTLE EQU 699 +N_SOLARIZER EQU 700 +N_LUNARIZER EQU 701 +REINS_OF_UNITY EQU 702 -; FireRed/LeafGreen -OAKS_PARCEL EQU $21C -POKE_FLUTE EQU $21D -SECRET_KEY EQU $21E -BIKE_VOUCHER EQU $21F -GOLD_TEETH EQU $220 -OLD_AMBER EQU $221 -CARD_KEY EQU $222 -LIFT_KEY EQU $223 -SILPH_SCOPE EQU $224 -BICYCLE EQU $225 -TOWN_MAP EQU $226 -VS_SEEKER EQU $227 -FAME_CHECKER EQU $228 -TM_CASE EQU $229 -BERRY_POUCH EQU $22A -TEACHY_TV EQU $22B -TRI_PASS EQU $22C -RAINBOW_PASS EQU $22D -TEA EQU $22E -MYSTIC_TICKET EQU $22F -AURORA_TICKET EQU $230 -POWDER_JAR EQU $231 -RUBY EQU $232 -SAPPHIRE EQU $233 +; Battle Mechanic Key Items +MEGA_RING EQU 703 +Z_POWER_RING EQU 704 +DYNAMAX_BAND EQU 705 -; Emerald -MAGMA_EMBLEM EQU $234 -OLD_SEA_MAP EQU $235 +; Misc. Key Items +BICYCLE EQU 706 +MACH_BIKE EQU 707 +ACRO_BIKE EQU 708 +OLD_ROD EQU 709 +GOOD_ROD EQU 710 +SUPER_ROD EQU 711 +DOWSING_MACHINE EQU 712 +TOWN_MAP EQU 713 +VS_SEEKER EQU 714 +TM_CASE EQU 715 +BERRY_POUCH EQU 716 +POKEMON_BOX_LINK EQU 717 +COIN_CASE EQU 718 +POWDER_JAR EQU 719 +WAILMER_PAIL EQU 720 +POKE_RADAR EQU 721 +POKEBLOCK_CASE EQU 722 +SOOT_SACK EQU 723 +POKE_FLUTE EQU 724 +FAME_CHECKER EQU 725 +TEACHY_TV EQU 726 -SHINY_CHARM EQU $236 -OVAL_CHARM EQU $237 +; Story Key Items +SS_TICKET EQU 727 +EON_TICKET EQU 728 +MYSTIC_TICKET EQU 729 +AURORA_TICKET EQU 730 +OLD_SEA_MAP EQU 731 +LETTER EQU 732 +DEVON_PARTS EQU 733 +GO_GOGGLES EQU 734 +DEVON_SCOPE EQU 735 +BASEMENT_KEY EQU 736 +SCANNER EQU 737 +STORAGE_KEY EQU 738 +KEY_TO_ROOM_1 EQU 739 +KEY_TO_ROOM_2 EQU 740 +KEY_TO_ROOM_4 EQU 741 +KEY_TO_ROOM_6 EQU 742 +METEORITE EQU 743 +MAGMA_EMBLEM EQU 744 +CONTEST_PASS EQU 745 +OAKS_PARCEL EQU 746 +SECRET_KEY EQU 747 +BIKE_VOUCHER EQU 748 +GOLD_TEETH EQU 749 +CARD_KEY EQU 750 +LIFT_KEY EQU 751 +SILPH_SCOPE EQU 752 +TRI_PASS EQU 753 +RAINBOW_PASS EQU 754 +TEA EQU 755 +RUBY EQU 756 +SAPPHIRE EQU 757 -; Z Crystals -Z_RING EQU $238 -NORMALIUM_Z EQU $239 -FIGHTINIUM_Z EQU $23A -FLYINIUM_Z EQU $23B -POISONIUM_Z EQU $23C -GROUNDIUM_Z EQU $23D -ROCKIUM_Z EQU $23E -BUGINIUM_Z EQU $23F -GHOSTIUM_Z EQU $240 -STEELIUM_Z EQU $241 -FIRIUM_Z EQU $242 -WATERIUM_Z EQU $243 -GRASSIUM_Z EQU $244 -ELECTRIUM_Z EQU $245 -PSYCHIUM_Z EQU $246 -ICIUM_Z EQU $247 -DRAGONIUM_Z EQU $248 -DARKINIUM_Z EQU $249 -FAIRIUM_Z EQU $24A -ALORAICHIUM_Z EQU $24B -DECIDIUM_Z EQU $24C -EEVIUM_Z EQU $24D -INCINIUM_Z EQU $24E -KOMMONIUM_Z EQU $24F -LUNALIUM_Z EQU $250 -LYCANIUM_Z EQU $251 -MARSHADIUM_Z EQU $252 -MEWNIUM_Z EQU $253 -MIMIKIUM_Z EQU $254 -PIKANIUM_Z EQU $255 -PIKASHUNIUM_Z EQU $256 -PRIMARIUM_Z EQU $257 -SNORLIUM_Z EQU $258 -SOLGANIUM_Z EQU $259 -TAPUNIUM_Z EQU $25A -ULTRANECROZIUM_Z EQU $25B \ No newline at end of file +; GEN IX ITEMS +ABILITY_SHIELD EQU 758 +CLEAR_AMULET EQU 759 +PUNCHING_GLOVE EQU 760 +COVERT_CLOAK EQU 761 +LOADED_DICE EQU 762 +AUSPICIOUS_ARMOR EQU 763 +BOOSTER_ENERGY EQU 764 +BIG_BAMBOO_SHOOT EQU 765 +GIMMIGHOUL_COIN EQU 766 +LEADERS_CREST EQU 767 +MALICIOUS_ARMOR EQU 768 +MIRROR_HERB EQU 769 +SCROLL_OF_DARKNESS EQU 770 +SCROLL_OF_WATERS EQU 771 +TERA_ORB EQU 772 +TINY_BAMBOO_SHOOT EQU 773 + +BUG_TERA_SHARD EQU 774 +DARK_TERA_SHARD EQU 775 +DRAGON_TERA_SHARD EQU 776 +ELECTRIC_TERA_SHARD EQU 777 +FAIRY_TERA_SHARD EQU 778 +FIGHTING_TERA_SHARD EQU 779 +FIRE_TERA_SHARD EQU 780 +FLYING_TERA_SHARD EQU 781 +GHOST_TERA_SHARD EQU 782 +GRASS_TERA_SHARD EQU 783 +GROUND_TERA_SHARD EQU 784 +ICE_TERA_SHARD EQU 785 +NORMAL_TERA_SHARD EQU 786 +POISON_TERA_SHARD EQU 787 +PSYCHIC_TERA_SHARD EQU 788 +ROCK_TERA_SHARD EQU 789 +STEEL_TERA_SHARD EQU 790 +WATER_TERA_SHARD EQU 791 + +ADAMANT_CRYSTAL EQU 792 +GRISEOUS_CORE EQU 793 +LUSTROUS_GLOBE EQU 794 + +BLACK_AUGURITE EQU 795 +LINKING_CORD EQU 796 +PEAT_BLOCK EQU 797 +BERSERK_GENE EQU 798 diff --git a/constants/moves.asm b/constants/moves.asm index 78b8023..704c6a8 100644 --- a/constants/moves.asm +++ b/constants/moves.asm @@ -1,624 +1,889 @@ -MOVE_NONE EQU $000 -POUND EQU $001 -KARATE_CHOP EQU $002 -DOUBLESLAP EQU $003 -COMET_PUNCH EQU $004 -MEGA_PUNCH EQU $005 -PAY_DAY EQU $006 -FIRE_PUNCH EQU $007 -ICE_PUNCH EQU $008 -THUNDERPUNCH EQU $009 -SCRATCH EQU $00A -VICEGRIP EQU $00B -GUILLOTINE EQU $00C -RAZOR_WIND EQU $00D -SWORDS_DANCE EQU $00E -CUT EQU $00F -GUST EQU $010 -WING_ATTACK EQU $011 -WHIRLWIND EQU $012 -FLY EQU $013 -BIND EQU $014 -SLAM EQU $015 -VINE_WHIP EQU $016 -STOMP EQU $017 -DOUBLE_KICK EQU $018 -MEGA_KICK EQU $019 -JUMP_KICK EQU $01A -ROLLING_KICK EQU $01B -SAND_ATTACK EQU $01C -HEADBUTT EQU $01D -HORN_ATTACK EQU $01E -FURY_ATTACK EQU $01F -HORN_DRILL EQU $020 -TACKLE EQU $021 -BODY_SLAM EQU $022 -WRAP EQU $023 -TAKE_DOWN EQU $024 -THRASH EQU $025 -DOUBLE_EDGE EQU $026 ; DOUBLE-EDGE -TAIL_WHIP EQU $027 -POISON_STING EQU $028 -TWINEEDLE EQU $029 -PIN_MISSILE EQU $02A -LEER EQU $02B -BITE EQU $02C -GROWL EQU $02D -ROAR EQU $02E -SING EQU $02F -SUPERSONIC EQU $030 -SONICBOOM EQU $031 -DISABLE EQU $032 -ACID EQU $033 -EMBER EQU $034 -FLAMETHROWER EQU $035 -MIST EQU $036 -WATER_GUN EQU $037 -HYDRO_PUMP EQU $038 -SURF EQU $039 -ICE_BEAM EQU $03A -BLIZZARD EQU $03B -PSYBEAM EQU $03C -BUBBLEBEAM EQU $03D -AURORA_BEAM EQU $03E -HYPER_BEAM EQU $03F -PECK EQU $040 -DRILL_PECK EQU $041 -SUBMISSION EQU $042 -LOW_KICK EQU $043 -COUNTER EQU $044 -SEISMIC_TOSS EQU $045 -STRENGTH EQU $046 -ABSORB EQU $047 -MEGA_DRAIN EQU $048 -LEECH_SEED EQU $049 -GROWTH EQU $04A -RAZOR_LEAF EQU $04B -SOLARBEAM EQU $04C -POISONPOWDER EQU $04D -STUN_SPORE EQU $04E -SLEEP_POWDER EQU $04F -PETAL_DANCE EQU $050 -STRING_SHOT EQU $051 -DRAGON_RAGE EQU $052 -FIRE_SPIN EQU $053 -THUNDERSHOCK EQU $054 -THUNDERBOLT EQU $055 -THUNDER_WAVE EQU $056 -THUNDER EQU $057 -ROCK_THROW EQU $058 -EARTHQUAKE EQU $059 -FISSURE EQU $05A -DIG EQU $05B -TOXIC EQU $05C -CONFUSION EQU $05D -PSYCHIC EQU $05E -HYPNOSIS EQU $05F -MEDITATE EQU $060 -AGILITY EQU $061 -QUICK_ATTACK EQU $062 -RAGE EQU $063 -TELEPORT EQU $064 -NIGHT_SHADE EQU $065 -MIMIC EQU $066 -SCREECH EQU $067 -DOUBLE_TEAM EQU $068 -RECOVER EQU $069 -HARDEN EQU $06A -MINIMIZE EQU $06B -SMOKESCREEN EQU $06C -CONFUSE_RAY EQU $06D -WITHDRAW EQU $06E -DEFENSE_CURL EQU $06F -BARRIER EQU $070 -LIGHT_SCREEN EQU $071 -HAZE EQU $072 -REFLECT EQU $073 -FOCUS_ENERGY EQU $074 -BIDE EQU $075 -METRONOME EQU $076 -MIRROR_MOVE EQU $077 -SELFDESTRUCT EQU $078 -EGG_BOMB EQU $079 -LICK EQU $07A -SMOG EQU $07B -SLUDGE EQU $07C -BONE_CLUB EQU $07D -FIRE_BLAST EQU $07E -WATERFALL EQU $07F -CLAMP EQU $080 -SWIFT EQU $081 -SKULL_BASH EQU $082 -SPIKE_CANNON EQU $083 -CONSTRICT EQU $084 -AMNESIA EQU $085 -KINESIS EQU $086 -SOFTBOILED EQU $087 -HI_JUMP_KICK EQU $088 -GLARE EQU $089 -DREAM_EATER EQU $08A -POISON_GAS EQU $08B -BARRAGE EQU $08C -LEECH_LIFE EQU $08D -LOVELY_KISS EQU $08E -SKY_ATTACK EQU $08F -TRANSFORM EQU $090 -BUBBLE EQU $091 -DIZZY_PUNCH EQU $092 -SPORE EQU $093 -FLASH EQU $094 -PSYWAVE EQU $095 -SPLASH EQU $096 -ACID_ARMOR EQU $097 -CRABHAMMER EQU $098 -EXPLOSION EQU $099 -FURY_SWIPES EQU $09A -BONEMERANG EQU $09B -REST EQU $09C -ROCK_SLIDE EQU $09D -HYPER_FANG EQU $09E -SHARPEN EQU $09F -CONVERSION EQU $0A0 -TRI_ATTACK EQU $0A1 -SUPER_FANG EQU $0A2 -SLASH EQU $0A3 -SUBSTITUTE EQU $0A4 -STRUGGLE EQU $0A5 +MOVE_NONE EQU 0 +POUND EQU 1 +KARATE_CHOP EQU 2 +DOUBLE_SLAP EQU 3 +COMET_PUNCH EQU 4 +MEGA_PUNCH EQU 5 +PAY_DAY EQU 6 +FIRE_PUNCH EQU 7 +ICE_PUNCH EQU 8 +THUNDER_PUNCH EQU 9 +SCRATCH EQU 10 +VISE_GRIP EQU 11 +GUILLOTINE EQU 12 +RAZOR_WIND EQU 13 +SWORDS_DANCE EQU 14 +CUT EQU 15 +GUST EQU 16 +WING_ATTACK EQU 17 +WHIRLWIND EQU 18 +FLY EQU 19 +BIND EQU 20 +SLAM EQU 21 +VINE_WHIP EQU 22 +STOMP EQU 23 +DOUBLE_KICK EQU 24 +MEGA_KICK EQU 25 +JUMP_KICK EQU 26 +ROLLING_KICK EQU 27 +SAND_ATTACK EQU 28 +HEADBUTT EQU 29 +HORN_ATTACK EQU 30 +FURY_ATTACK EQU 31 +HORN_DRILL EQU 32 +TACKLE EQU 33 +BODY_SLAM EQU 34 +WRAP EQU 35 +TAKE_DOWN EQU 36 +THRASH EQU 37 +DOUBLE_EDGE EQU 38 +TAIL_WHIP EQU 39 +POISON_STING EQU 40 +TWINEEDLE EQU 41 +PIN_MISSILE EQU 42 +LEER EQU 43 +BITE EQU 44 +GROWL EQU 45 +ROAR EQU 46 +SING EQU 47 +SUPERSONIC EQU 48 +SONIC_BOOM EQU 49 +DISABLE EQU 50 +ACID EQU 51 +EMBER EQU 52 +FLAMETHROWER EQU 53 +MIST EQU 54 +WATER_GUN EQU 55 +HYDRO_PUMP EQU 56 +SURF EQU 57 +ICE_BEAM EQU 58 +BLIZZARD EQU 59 +PSYBEAM EQU 60 +BUBBLE_BEAM EQU 61 +AURORA_BEAM EQU 62 +HYPER_BEAM EQU 63 +PECK EQU 64 +DRILL_PECK EQU 65 +SUBMISSION EQU 66 +LOW_KICK EQU 67 +COUNTER EQU 68 +SEISMIC_TOSS EQU 69 +STRENGTH EQU 70 +ABSORB EQU 71 +MEGA_DRAIN EQU 72 +LEECH_SEED EQU 73 +GROWTH EQU 74 +RAZOR_LEAF EQU 75 +SOLAR_BEAM EQU 76 +POISON_POWDER EQU 77 +STUN_SPORE EQU 78 +SLEEP_POWDER EQU 79 +PETAL_DANCE EQU 80 +STRING_SHOT EQU 81 +DRAGON_RAGE EQU 82 +FIRE_SPIN EQU 83 +THUNDER_SHOCK EQU 84 +THUNDERBOLT EQU 85 +THUNDER_WAVE EQU 86 +THUNDER EQU 87 +ROCK_THROW EQU 88 +EARTHQUAKE EQU 89 +FISSURE EQU 90 +DIG EQU 91 +TOXIC EQU 92 +CONFUSION EQU 93 +PSYCHIC EQU 94 +HYPNOSIS EQU 95 +MEDITATE EQU 96 +AGILITY EQU 97 +QUICK_ATTACK EQU 98 +RAGE EQU 99 +TELEPORT EQU 100 +NIGHT_SHADE EQU 101 +MIMIC EQU 102 +SCREECH EQU 103 +DOUBLE_TEAM EQU 104 +RECOVER EQU 105 +HARDEN EQU 106 +MINIMIZE EQU 107 +SMOKESCREEN EQU 108 +CONFUSE_RAY EQU 109 +WITHDRAW EQU 110 +DEFENSE_CURL EQU 111 +BARRIER EQU 112 +LIGHT_SCREEN EQU 113 +HAZE EQU 114 +REFLECT EQU 115 +FOCUS_ENERGY EQU 116 +BIDE EQU 117 +METRONOME EQU 118 +MIRROR_MOVE EQU 119 +SELF_DESTRUCT EQU 120 +EGG_BOMB EQU 121 +LICK EQU 122 +SMOG EQU 123 +SLUDGE EQU 124 +BONE_CLUB EQU 125 +FIRE_BLAST EQU 126 +WATERFALL EQU 127 +CLAMP EQU 128 +SWIFT EQU 129 +SKULL_BASH EQU 130 +SPIKE_CANNON EQU 131 +CONSTRICT EQU 132 +AMNESIA EQU 133 +KINESIS EQU 134 +SOFT_BOILED EQU 135 +HIGH_JUMP_KICK EQU 136 +GLARE EQU 137 +DREAM_EATER EQU 138 +POISON_GAS EQU 139 +BARRAGE EQU 140 +LEECH_LIFE EQU 141 +LOVELY_KISS EQU 142 +SKY_ATTACK EQU 143 +TRANSFORM EQU 144 +BUBBLE EQU 145 +DIZZY_PUNCH EQU 146 +SPORE EQU 147 +FLASH EQU 148 +PSYWAVE EQU 149 +SPLASH EQU 150 +ACID_ARMOR EQU 151 +CRABHAMMER EQU 152 +EXPLOSION EQU 153 +FURY_SWIPES EQU 154 +BONEMERANG EQU 155 +REST EQU 156 +ROCK_SLIDE EQU 157 +HYPER_FANG EQU 158 +SHARPEN EQU 159 +CONVERSION EQU 160 +TRI_ATTACK EQU 161 +SUPER_FANG EQU 162 +SLASH EQU 163 +SUBSTITUTE EQU 164 +STRUGGLE EQU 165 +SKETCH EQU 166 +TRIPLE_KICK EQU 167 +THIEF EQU 168 +SPIDER_WEB EQU 169 +MIND_READER EQU 170 +NIGHTMARE EQU 171 +FLAME_WHEEL EQU 172 +SNORE EQU 173 +CURSE EQU 174 +FLAIL EQU 175 +CONVERSION_2 EQU 176 +AEROBLAST EQU 177 +COTTON_SPORE EQU 178 +REVERSAL EQU 179 +SPITE EQU 180 +POWDER_SNOW EQU 181 +PROTECT EQU 182 +MACH_PUNCH EQU 183 +SCARY_FACE EQU 184 +FEINT_ATTACK EQU 185 +SWEET_KISS EQU 186 +BELLY_DRUM EQU 187 +SLUDGE_BOMB EQU 188 +MUD_SLAP EQU 189 +OCTAZOOKA EQU 190 +SPIKES EQU 191 +ZAP_CANNON EQU 192 +FORESIGHT EQU 193 +DESTINY_BOND EQU 194 +PERISH_SONG EQU 195 +ICY_WIND EQU 196 +DETECT EQU 197 +BONE_RUSH EQU 198 +LOCK_ON EQU 199 +OUTRAGE EQU 200 +SANDSTORM EQU 201 +GIGA_DRAIN EQU 202 +ENDURE EQU 203 +CHARM EQU 204 +ROLLOUT EQU 205 +FALSE_SWIPE EQU 206 +SWAGGER EQU 207 +MILK_DRINK EQU 208 +SPARK EQU 209 +FURY_CUTTER EQU 210 +STEEL_WING EQU 211 +MEAN_LOOK EQU 212 +ATTRACT EQU 213 +SLEEP_TALK EQU 214 +HEAL_BELL EQU 215 +RETURN EQU 216 +PRESENT EQU 217 +FRUSTRATION EQU 218 +SAFEGUARD EQU 219 +PAIN_SPLIT EQU 220 +SACRED_FIRE EQU 221 +MAGNITUDE EQU 222 +DYNAMIC_PUNCH EQU 223 +MEGAHORN EQU 224 +DRAGON_BREATH EQU 225 +BATON_PASS EQU 226 +ENCORE EQU 227 +PURSUIT EQU 228 +RAPID_SPIN EQU 229 +SWEET_SCENT EQU 230 +IRON_TAIL EQU 231 +METAL_CLAW EQU 232 +VITAL_THROW EQU 233 +MORNING_SUN EQU 234 +SYNTHESIS EQU 235 +MOONLIGHT EQU 236 +HIDDEN_POWER EQU 237 +CROSS_CHOP EQU 238 +TWISTER EQU 239 +RAIN_DANCE EQU 240 +SUNNY_DAY EQU 241 +CRUNCH EQU 242 +MIRROR_COAT EQU 243 +PSYCH_UP EQU 244 +EXTREME_SPEED EQU 245 +ANCIENT_POWER EQU 246 +SHADOW_BALL EQU 247 +FUTURE_SIGHT EQU 248 +ROCK_SMASH EQU 249 +WHIRLPOOL EQU 250 +BEAT_UP EQU 251 +FAKE_OUT EQU 252 +UPROAR EQU 253 +STOCKPILE EQU 254 +SPIT_UP EQU 255 +SWALLOW EQU 256 +HEAT_WAVE EQU 257 +HAIL EQU 258 +TORMENT EQU 259 +FLATTER EQU 260 +WILL_O_WISP EQU 261 +MEMENTO EQU 262 +FACADE EQU 263 +FOCUS_PUNCH EQU 264 +SMELLING_SALTS EQU 265 +FOLLOW_ME EQU 266 +NATURE_POWER EQU 267 +CHARGE EQU 268 +TAUNT EQU 269 +HELPING_HAND EQU 270 +TRICK EQU 271 +ROLE_PLAY EQU 272 +WISH EQU 273 +ASSIST EQU 274 +INGRAIN EQU 275 +SUPERPOWER EQU 276 +MAGIC_COAT EQU 277 +RECYCLE EQU 278 +REVENGE EQU 279 +BRICK_BREAK EQU 280 +YAWN EQU 281 +KNOCK_OFF EQU 282 +ENDEAVOR EQU 283 +ERUPTION EQU 284 +SKILL_SWAP EQU 285 +IMPRISON EQU 286 +REFRESH EQU 287 +GRUDGE EQU 288 +SNATCH EQU 289 +SECRET_POWER EQU 290 +DIVE EQU 291 +ARM_THRUST EQU 292 +CAMOUFLAGE EQU 293 +TAIL_GLOW EQU 294 +LUSTER_PURGE EQU 295 +MIST_BALL EQU 296 +FEATHER_DANCE EQU 297 +TEETER_DANCE EQU 298 +BLAZE_KICK EQU 299 +MUD_SPORT EQU 300 +ICE_BALL EQU 301 +NEEDLE_ARM EQU 302 +SLACK_OFF EQU 303 +HYPER_VOICE EQU 304 +POISON_FANG EQU 305 +CRUSH_CLAW EQU 306 +BLAST_BURN EQU 307 +HYDRO_CANNON EQU 308 +METEOR_MASH EQU 309 +ASTONISH EQU 310 +WEATHER_BALL EQU 311 +AROMATHERAPY EQU 312 +FAKE_TEARS EQU 313 +AIR_CUTTER EQU 314 +OVERHEAT EQU 315 +ODOR_SLEUTH EQU 316 +ROCK_TOMB EQU 317 +SILVER_WIND EQU 318 +METAL_SOUND EQU 319 +GRASS_WHISTLE EQU 320 +TICKLE EQU 321 +COSMIC_POWER EQU 322 +WATER_SPOUT EQU 323 +SIGNAL_BEAM EQU 324 +SHADOW_PUNCH EQU 325 +EXTRASENSORY EQU 326 +SKY_UPPERCUT EQU 327 +SAND_TOMB EQU 328 +SHEER_COLD EQU 329 +MUDDY_WATER EQU 330 +BULLET_SEED EQU 331 +AERIAL_ACE EQU 332 +ICICLE_SPEAR EQU 333 +IRON_DEFENSE EQU 334 +BLOCK EQU 335 +HOWL EQU 336 +DRAGON_CLAW EQU 337 +FRENZY_PLANT EQU 338 +BULK_UP EQU 339 +BOUNCE EQU 340 +MUD_SHOT EQU 341 +POISON_TAIL EQU 342 +COVET EQU 343 +VOLT_TACKLE EQU 344 +MAGICAL_LEAF EQU 345 +WATER_SPORT EQU 346 +CALM_MIND EQU 347 +LEAF_BLADE EQU 348 +DRAGON_DANCE EQU 349 +ROCK_BLAST EQU 350 +SHOCK_WAVE EQU 351 +WATER_PULSE EQU 352 +DOOM_DESIRE EQU 353 +PSYCHO_BOOST EQU 354 -SKETCH EQU $0A6 -TRIPLE_KICK EQU $0A7 -THIEF EQU $0A8 -SPIDER_WEB EQU $0A9 -MIND_READER EQU $0AA -NIGHTMARE EQU $0AB -FLAME_WHEEL EQU $0AC -SNORE EQU $0AD -CURSE EQU $0AE -FLAIL EQU $0AF -CONVERSION_2 EQU $0B0 -AEROBLAST EQU $0B1 -COTTON_SPORE EQU $0B2 -REVERSAL EQU $0B3 -SPITE EQU $0B4 -POWDER_SNOW EQU $0B5 -PROTECT EQU $0B6 -MACH_PUNCH EQU $0B7 -SCARY_FACE EQU $0B8 -FAINT_ATTACK EQU $0B9 -SWEET_KISS EQU $0BA -BELLY_DRUM EQU $0BB -SLUDGE_BOMB EQU $0BC -MUD_SLAP EQU $0BD ; MUD-SLAP -OCTAZOOKA EQU $0BE -SPIKES EQU $0BF -ZAP_CANNON EQU $0C0 -FORESIGHT EQU $0C1 -DESTINY_BOND EQU $0C2 -PERISH_SONG EQU $0C3 -ICY_WIND EQU $0C4 -DETECT EQU $0C5 -BONE_RUSH EQU $0C6 -LOCK_ON EQU $0C7 ; LOCK-ON -OUTRAGE EQU $0C8 -SANDSTORM EQU $0C9 -GIGA_DRAIN EQU $0CA -ENDURE EQU $0CB -CHARM EQU $0CC -ROLLOUT EQU $0CD -FALSE_SWIPE EQU $0CE -SWAGGER EQU $0CF -MILK_DRINK EQU $0D0 -SPARK EQU $0D1 -FURY_CUTTER EQU $0D2 -STEEL_WING EQU $0D3 -MEAN_LOOK EQU $0D4 -ATTRACT EQU $0D5 -SLEEP_TALK EQU $0D6 -HEAL_BELL EQU $0D7 -RETURN EQU $0D8 -PRESENT EQU $0D9 -FRUSTRATION EQU $0DA -SAFEGUARD EQU $0DB -PAIN_SPLIT EQU $0DC -SACRED_FIRE EQU $0DD -MAGNITUDE EQU $0DE -DYNAMICPUNCH EQU $0DF -MEGAHORN EQU $0E0 -DRAGONBREATH EQU $0E1 -BATON_PASS EQU $0E2 -ENCORE EQU $0E3 -PURSUIT EQU $0E4 -RAPID_SPIN EQU $0E5 -SWEET_SCENT EQU $0E6 -IRON_TAIL EQU $0E7 -METAL_CLAW EQU $0E8 -VITAL_THROW EQU $0E9 -MORNING_SUN EQU $0EA -SYNTHESIS EQU $0EB -MOONLIGHT EQU $0EC -HIDDEN_POWER EQU $0ED -CROSS_CHOP EQU $0EE -TWISTER EQU $0EF -RAIN_DANCE EQU $0F0 -SUNNY_DAY EQU $0F1 -CRUNCH EQU $0F2 -MIRROR_COAT EQU $0F3 -PSYCH_UP EQU $0F4 -EXTREMESPEED EQU $0F5 -ANCIENTPOWER EQU $0F6 -SHADOW_BALL EQU $0F7 -FUTURE_SIGHT EQU $0F8 -ROCK_SMASH EQU $0F9 -WHIRLPOOL EQU $0FA -BEAT_UP EQU $0FB +; Gen 4 moves. +ROOST EQU 355 +GRAVITY EQU 356 +MIRACLE_EYE EQU 357 +WAKE_UP_SLAP EQU 358 +HAMMER_ARM EQU 359 +GYRO_BALL EQU 360 +HEALING_WISH EQU 361 +BRINE EQU 362 +NATURAL_GIFT EQU 363 +FEINT EQU 364 +PLUCK EQU 365 +TAILWIND EQU 366 +ACUPRESSURE EQU 367 +METAL_BURST EQU 368 +U_TURN EQU 369 +CLOSE_COMBAT EQU 370 +PAYBACK EQU 371 +ASSURANCE EQU 372 +EMBARGO EQU 373 +FLING EQU 374 +PSYCHO_SHIFT EQU 375 +TRUMP_CARD EQU 376 +HEAL_BLOCK EQU 377 +WRING_OUT EQU 378 +POWER_TRICK EQU 379 +GASTRO_ACID EQU 380 +LUCKY_CHANT EQU 381 +ME_FIRST EQU 382 +COPYCAT EQU 383 +POWER_SWAP EQU 384 +GUARD_SWAP EQU 385 +PUNISHMENT EQU 386 +LAST_RESORT EQU 387 +WORRY_SEED EQU 388 +SUCKER_PUNCH EQU 389 +TOXIC_SPIKES EQU 390 +HEART_SWAP EQU 391 +AQUA_RING EQU 392 +MAGNET_RISE EQU 393 +FLARE_BLITZ EQU 394 +FORCE_PALM EQU 395 +AURA_SPHERE EQU 396 +ROCK_POLISH EQU 397 +POISON_JAB EQU 398 +DARK_PULSE EQU 399 +NIGHT_SLASH EQU 400 +AQUA_TAIL EQU 401 +SEED_BOMB EQU 402 +AIR_SLASH EQU 403 +X_SCISSOR EQU 404 +BUG_BUZZ EQU 405 +DRAGON_PULSE EQU 406 +DRAGON_RUSH EQU 407 +POWER_GEM EQU 408 +DRAIN_PUNCH EQU 409 +VACUUM_WAVE EQU 410 +FOCUS_BLAST EQU 411 +ENERGY_BALL EQU 412 +BRAVE_BIRD EQU 413 +EARTH_POWER EQU 414 +SWITCHEROO EQU 415 +GIGA_IMPACT EQU 416 +NASTY_PLOT EQU 417 +BULLET_PUNCH EQU 418 +AVALANCHE EQU 419 +ICE_SHARD EQU 420 +SHADOW_CLAW EQU 421 +THUNDER_FANG EQU 422 +ICE_FANG EQU 423 +FIRE_FANG EQU 424 +SHADOW_SNEAK EQU 425 +MUD_BOMB EQU 426 +PSYCHO_CUT EQU 427 +ZEN_HEADBUTT EQU 428 +MIRROR_SHOT EQU 429 +FLASH_CANNON EQU 430 +ROCK_CLIMB EQU 431 +DEFOG EQU 432 +TRICK_ROOM EQU 433 +DRACO_METEOR EQU 434 +DISCHARGE EQU 435 +LAVA_PLUME EQU 436 +LEAF_STORM EQU 437 +POWER_WHIP EQU 438 +ROCK_WRECKER EQU 439 +CROSS_POISON EQU 440 +GUNK_SHOT EQU 441 +IRON_HEAD EQU 442 +MAGNET_BOMB EQU 443 +STONE_EDGE EQU 444 +CAPTIVATE EQU 445 +STEALTH_ROCK EQU 446 +GRASS_KNOT EQU 447 +CHATTER EQU 448 +JUDGMENT EQU 449 +BUG_BITE EQU 450 +CHARGE_BEAM EQU 451 +WOOD_HAMMER EQU 452 +AQUA_JET EQU 453 +ATTACK_ORDER EQU 454 +DEFEND_ORDER EQU 455 +HEAL_ORDER EQU 456 +HEAD_SMASH EQU 457 +DOUBLE_HIT EQU 458 +ROAR_OF_TIME EQU 459 +SPACIAL_REND EQU 460 +LUNAR_DANCE EQU 461 +CRUSH_GRIP EQU 462 +MAGMA_STORM EQU 463 +DARK_VOID EQU 464 +SEED_FLARE EQU 465 +OMINOUS_WIND EQU 466 +SHADOW_FORCE EQU 467 -FAKE_OUT EQU $0FC -UPROAR EQU $0FD -STOCKPILE EQU $0FE -SPIT_UP EQU $0FF -SWALLOW EQU $100 -HEAT_WAVE EQU $101 -HAIL EQU $102 -TORMENT EQU $103 -FLATTER EQU $104 -WILL_O_WISP EQU $105 ; WILL-O-WISP -MEMENTO EQU $106 -FACADE EQU $107 -FOCUS_PUNCH EQU $108 -SMELLINGSALT EQU $109 -FOLLOW_ME EQU $10A -NATURE_POWER EQU $10B -CHARGE EQU $10C -TAUNT EQU $10D -HELPING_HAND EQU $10E -TRICK EQU $10F -ROLE_PLAY EQU $110 -WISH EQU $111 -ASSIST EQU $112 -INGRAIN EQU $113 -SUPERPOWER EQU $114 -MAGIC_COAT EQU $115 -RECYCLE EQU $116 -REVENGE EQU $117 -BRICK_BREAK EQU $118 -YAWN EQU $119 -KNOCK_OFF EQU $11A -ENDEAVOR EQU $11B -ERUPTION EQU $11C -SKILL_SWAP EQU $11D -IMPRISON EQU $11E -REFRESH EQU $11F -GRUDGE EQU $120 -SNATCH EQU $121 -SECRET_POWER EQU $122 -DIVE EQU $123 -ARM_THRUST EQU $124 -CAMOUFLAGE EQU $125 -TAIL_GLOW EQU $126 -LUSTER_PURGE EQU $127 -MIST_BALL EQU $128 -FEATHERDANCE EQU $129 -TEETER_DANCE EQU $12A -BLAZE_KICK EQU $12B -MUD_SPORT EQU $12C -ICE_BALL EQU $12D -NEEDLE_ARM EQU $12E -SLACK_OFF EQU $12F -HYPER_VOICE EQU $130 -POISON_FANG EQU $131 -CRUSH_CLAW EQU $132 -BLAST_BURN EQU $133 -HYDRO_CANNON EQU $134 -METEOR_MASH EQU $135 -ASTONISH EQU $136 -WEATHER_BALL EQU $137 -AROMATHERAPY EQU $138 -FAKE_TEARS EQU $139 -AIR_CUTTER EQU $13A -OVERHEAT EQU $13B -ODOR_SLEUTH EQU $13C -ROCK_TOMB EQU $13D -SILVER_WIND EQU $13E -METAL_SOUND EQU $13F -GRASSWHISTLE EQU $140 -TICKLE EQU $141 -COSMIC_POWER EQU $142 -WATER_SPOUT EQU $143 -SIGNAL_BEAM EQU $144 -SHADOW_PUNCH EQU $145 -EXTRASENSORY EQU $146 -SKY_UPPERCUT EQU $147 -SAND_TOMB EQU $148 -SHEER_COLD EQU $149 -MUDDY_WATER EQU $14A -BULLET_SEED EQU $14B -AERIAL_ACE EQU $14C -ICICLE_SPEAR EQU $14D -IRON_DEFENSE EQU $14E -BLOCK EQU $14F -HOWL EQU $150 -DRAGON_CLAW EQU $151 -FRENZY_PLANT EQU $152 -BULK_UP EQU $153 -BOUNCE EQU $154 -MUD_SHOT EQU $155 -POISON_TAIL EQU $156 -COVET EQU $157 -VOLT_TACKLE EQU $158 -MAGICAL_LEAF EQU $159 -WATER_SPORT EQU $15A -CALM_MIND EQU $15B -LEAF_BLADE EQU $15C -DRAGON_DANCE EQU $15D -ROCK_BLAST EQU $15E -SHOCK_WAVE EQU $15F -WATER_PULSE EQU $160 -DOOM_DESIRE EQU $161 -PSYCHO_BOOST EQU $162 -ROOST EQU $163 -GRAVITY EQU $164 -MIRACLE_EYE EQU $165 -WAKE_UP_SLAP EQU $166 -HAMMER_ARM EQU $167 -GYRO_BALL EQU $168 -HEALING_WISH EQU $169 -BRINE EQU $16A -NATURAL_GIFT EQU $16B -FEINT EQU $16C -PLUCK EQU $16D -TAILWIND EQU $16E -ACUPRESSURE EQU $16F -METAL_BURST EQU $170 -U_TURN EQU $171 -CLOSE_COMBAT EQU $172 -PAYBACK EQU $173 -ASSURANCE EQU $174 -EMBARGO EQU $175 -FLING EQU $176 -PSYCHO_SHIFT EQU $177 -MOVE_TRUMP_CARD EQU $178 -HEAL_BLOCK EQU $179 -WRING_OUT EQU $17A -POWER_TRICK EQU $17B -GASTRO_ACID EQU $17C -LUCKY_CHANT EQU $17D -ME_FIRST EQU $17E -COPYCAT EQU $17F -POWER_SWAP EQU $180 -GUARD_SWAP EQU $181 -PUNISHMENT EQU $182 -LAST_RESORT EQU $183 -WORRY_SEED EQU $184 -SUCKER_PUNCH EQU $185 -TOXIC_SPIKES EQU $186 -HEART_SWAP EQU $187 -AQUA_RING EQU $188 -MAGNET_RISE EQU $189 -FLARE_BLITZ EQU $18A -FORCE_PALM EQU $18B -AURA_SPHERE EQU $18C -ROCK_POLISH EQU $18D -POISON_JAB EQU $18E -DARK_PULSE EQU $18F -NIGHT_SLASH EQU $190 -AQUA_TAIL EQU $191 -SEED_BOMB EQU $192 -AIR_SLASH EQU $193 -X_SCISSOR EQU $194 -BUG_BUZZ EQU $195 -DRAGON_PULSE EQU $196 -DRAGON_RUSH EQU $197 -POWER_GEM EQU $198 -DRAIN_PUNCH EQU $199 -VACUUM_WAVE EQU $19A -FOCUS_BLAST EQU $19B -ENERGY_BALL EQU $19C -BRAVE_BIRD EQU $19D -EARTH_POWER EQU $19E -SWITCHEROO EQU $19F -GIGA_IMPACT EQU $1A0 -NASTY_PLOT EQU $1A1 -BULLET_PUNCH EQU $1A2 -AVALANCHE EQU $1A3 -ICE_SHARD EQU $1A4 -SHADOW_CLAW EQU $1A5 -THUNDER_FANG EQU $1A6 -ICE_FANG EQU $1A7 -FIRE_FANG EQU $1A8 -SHADOW_SNEAK EQU $1A9 -MUD_BOMB EQU $1AA -PSYCHO_CUT EQU $1AB -ZEN_HEADBUTT EQU $1AC -MIRROR_SHOT EQU $1AD -FLASH_CANNON EQU $1AE -ROCK_CLIMB EQU $1AF -DEFOG EQU $1B0 -TRICK_ROOM EQU $1B1 -DRACO_METEOR EQU $1B2 -DISCHARGE EQU $1B3 -LAVA_PLUME EQU $1B4 -LEAF_STORM EQU $1B5 -POWER_WHIP EQU $1B6 -ROCK_WRECKER EQU $1B7 -CROSS_POISON EQU $1B8 -GUNK_SHOT EQU $1B9 -IRON_HEAD EQU $1BA -MAGNET_BOMB EQU $1BB -STONE_EDGE EQU $1BC -CAPTIVATE EQU $1BD -STEALTH_ROCK EQU $1BE -GRASS_KNOT EQU $1BF -CHATTER EQU $1C0 -JUDGMENT EQU $1C1 -BUG_BITE EQU $1C2 -CHARGE_BEAM EQU $1C3 -WOOD_HAMMER EQU $1C4 -AQUA_JET EQU $1C5 -ATTACK_ORDER EQU $1C6 -DEFEND_ORDER EQU $1C7 -HEAL_ORDER EQU $1C8 -HEAD_SMASH EQU $1C9 -DOUBLE_HIT EQU $1CA -ROAR_OF_TIME EQU $1CB -SPACIAL_REND EQU $1CC -LUNAR_DANCE EQU $1CD -CRUSH_GRIP EQU $1CE -MAGMA_STORM EQU $1CF -DARK_VOID EQU $1D0 -SEED_FLARE EQU $1D1 -OMINOUS_WIND EQU $1D2 -SHADOW_FORCE EQU $1D3 -HONE_CLAWS EQU $1D4 -WIDE_GUARD EQU $1D5 -GUARD_SPLIT EQU $1D6 -POWER_SPLIT EQU $1D7 -WONDER_ROOM EQU $1D8 -PSYSHOCK EQU $1D9 -VENOSHOCK EQU $1DA -AUTOTOMIZE EQU $1DB -RAGE_POWDER EQU $1DC -TELEKINESIS EQU $1DD -MAGIC_ROOM EQU $1DE -SMACK_DOWN EQU $1DF -STORM_THROW EQU $1E0 -FLAME_BURST EQU $1E1 -SLUDGE_WAVE EQU $1E2 -QUIVER_DANCE EQU $1E3 -HEAVY_SLAM EQU $1E4 -SYNCHRONOISE EQU $1E5 -ELECTRO_BALL EQU $1E6 -SOAK EQU $1E7 -FLAME_CHARGE EQU $1E8 -COIL EQU $1E9 -LOW_SWEEP EQU $1EA -ACID_SPRAY EQU $1EB -FOUL_PLAY EQU $1EC -SIMPLE_BEAM EQU $1ED -ENTRAINMENT EQU $1EE -AFTER_YOU EQU $1EF -ROUND EQU $1F0 -ECHOED_VOICE EQU $1F1 -CHIP_AWAY EQU $1F2 -CLEAR_SMOG EQU $1F3 -STORED_POWER EQU $1F4 -QUICK_GUARD EQU $1F5 -ALLY_SWITCH EQU $1F6 -SCALD EQU $1F7 -SHELL_SMASH EQU $1F8 -HEAL_PULSE EQU $1F9 -HEX EQU $1FA -SKY_DROP EQU $1FB -SHIFT_GEAR EQU $1FC -CIRCLE_THROW EQU $1FD -INCINERATE EQU $1FE -QUASH EQU $1FF -ACROBATICS EQU $200 -REFLECT_TYPE EQU $201 -RETALIATE EQU $202 -FINAL_GAMBIT EQU $203 -BESTOW EQU $204 -INFERNO EQU $205 -WATER_PLEDGE EQU $206 -FIRE_PLEDGE EQU $207 -GRASS_PLEDGE EQU $208 -VOLT_SWITCH EQU $209 -STRUGGLE_BUG EQU $20A -BULLDOZE EQU $20B -FROST_BREATH EQU $20C -DRAGON_TAIL EQU $20D -WORK_UP EQU $20E -ELECTROWEB EQU $20F -WILD_CHARGE EQU $210 -DRILL_RUN EQU $211 -DUAL_CHOP EQU $212 -HEART_STAMP EQU $213 -HORN_LEECH EQU $214 -SACRED_SWORD EQU $215 -RAZOR_SHELL EQU $216 -HEAT_CRASH EQU $217 -LEAF_TORNADO EQU $218 -STEAMROLLER EQU $219 -COTTON_GUARD EQU $21A -NIGHT_DAZE EQU $21B -PSYSTRIKE EQU $21C -TAIL_SLAP EQU $21D -HURRICANE EQU $21E -HEAD_CHARGE EQU $21F -GEAR_GRIND EQU $220 -SEARING_SHOT EQU $221 -TECHNO_BLAST EQU $222 -RELIC_SONG EQU $223 -SECRET_SWORD EQU $224 -GLACIATE EQU $225 -BOLT_STRIKE EQU $226 -BLUE_FLARE EQU $227 -FIERY_DANCE EQU $228 -FREEZE_SHOCK EQU $229 -ICE_BURN EQU $22A -SNARL EQU $22B -ICICLE_CRASH EQU $22C -V_CREATE EQU $22D -FUSION_FLARE EQU $22E -FUSION_BOLT EQU $22F -FLYING_PRESS EQU $230 -MAT_BLOCK EQU $231 -BELCH EQU $232 -ROTOTILLER EQU $233 -STICKY_WEB EQU $234 -FELL_STINGER EQU $235 -PHANTOM_FORCE EQU $236 -TRICK_OR_TREAT EQU $237 -NOBLE_ROAR EQU $238 -ION_DELUGE EQU $239 -PARABOLIC_CHARGE EQU $23A -FORESTS_CURSE EQU $23B -PETAL_BLIZZARD EQU $23C -FREEZE_DRY EQU $23D -DISARMING_VOICE EQU $23E -PARTING_SHOT EQU $23F -TOPSY_TURVY EQU $240 -DRAINING_KISS EQU $241 -CRAFTY_SHIELD EQU $242 -FLOWER_SHIELD EQU $243 -GRASSY_TERRAIN EQU $244 -MISTY_TERRAIN EQU $245 -ELECTRIFY EQU $246 -PLAY_ROUGH EQU $247 -FAIRY_WIND EQU $248 -MOONBLAST EQU $249 -BOOMBURST EQU $24A -FAIRY_LOCK EQU $24B -KINGS_SHIELD EQU $24C -PLAY_NICE EQU $24D -CONFIDE EQU $24E -DIAMOND_STORM EQU $24F -STEAM_ERUPTION EQU $250 -HYPERSPACE_HOLE EQU $251 -WATER_SHURIKEN EQU $252 -MYSTICAL_FIRE EQU $253 -SPIKY_SHIELD EQU $254 -AROMATIC_MIST EQU $255 -EERIE_IMPULSE EQU $256 -VENOM_DRENCH EQU $257 -POWDER EQU $258 -GEOMANCY EQU $259 -MAGNETIC_FLUX EQU $25A -HAPPY_HOUR EQU $25B -ELECTRIC_TERRAIN EQU $25C -DAZZLING_GLEAM EQU $25D -CELEBRATE EQU $25E -HOLD_HANDS EQU $25F -BABY_DOLL_EYES EQU $260 -NUZZLE EQU $261 -HOLD_BACK EQU $262 -INFESTATION EQU $263 -POWER_UP_PUNCH EQU $264 -OBLIVION_WING EQU $265 -THOUSAND_ARROWS EQU $266 -THOUSAND_WAVES EQU $267 -LANDS_WRATH EQU $268 -LIGHT_OF_RUIN EQU $269 -ORIGIN_PULSE EQU $26A -PRECIPICE_BLADES EQU $26B -DRAGON_ASCENT EQU $26C -HYPERSPACE_FURY EQU $26D \ No newline at end of file +; Gen 5 moves. +HONE_CLAWS EQU 468 +WIDE_GUARD EQU 469 +GUARD_SPLIT EQU 470 +POWER_SPLIT EQU 471 +WONDER_ROOM EQU 472 +PSYSHOCK EQU 473 +VENOSHOCK EQU 474 +AUTOTOMIZE EQU 475 +RAGE_POWDER EQU 476 +TELEKINESIS EQU 477 +MAGIC_ROOM EQU 478 +SMACK_DOWN EQU 479 +STORM_THROW EQU 480 +FLAME_BURST EQU 481 +SLUDGE_WAVE EQU 482 +QUIVER_DANCE EQU 483 +HEAVY_SLAM EQU 484 +SYNCHRONOISE EQU 485 +ELECTRO_BALL EQU 486 +SOAK EQU 487 +FLAME_CHARGE EQU 488 +COIL EQU 489 +LOW_SWEEP EQU 490 +ACID_SPRAY EQU 491 +FOUL_PLAY EQU 492 +SIMPLE_BEAM EQU 493 +ENTRAINMENT EQU 494 +AFTER_YOU EQU 495 +ROUND EQU 496 +ECHOED_VOICE EQU 497 +CHIP_AWAY EQU 498 +CLEAR_SMOG EQU 499 +STORED_POWER EQU 500 +QUICK_GUARD EQU 501 +ALLY_SWITCH EQU 502 +SCALD EQU 503 +SHELL_SMASH EQU 504 +HEAL_PULSE EQU 505 +HEX EQU 506 +SKY_DROP EQU 507 +SHIFT_GEAR EQU 508 +CIRCLE_THROW EQU 509 +INCINERATE EQU 510 +QUASH EQU 511 +ACROBATICS EQU 512 +REFLECT_TYPE EQU 513 +RETALIATE EQU 514 +FINAL_GAMBIT EQU 515 +BESTOW EQU 516 +INFERNO EQU 517 +WATER_PLEDGE EQU 518 +FIRE_PLEDGE EQU 519 +GRASS_PLEDGE EQU 520 +VOLT_SWITCH EQU 521 +STRUGGLE_BUG EQU 522 +BULLDOZE EQU 523 +FROST_BREATH EQU 524 +DRAGON_TAIL EQU 525 +WORK_UP EQU 526 +ELECTROWEB EQU 527 +WILD_CHARGE EQU 528 +DRILL_RUN EQU 529 +DUAL_CHOP EQU 530 +HEART_STAMP EQU 531 +HORN_LEECH EQU 532 +SACRED_SWORD EQU 533 +RAZOR_SHELL EQU 534 +HEAT_CRASH EQU 535 +LEAF_TORNADO EQU 536 +STEAMROLLER EQU 537 +COTTON_GUARD EQU 538 +NIGHT_DAZE EQU 539 +PSYSTRIKE EQU 540 +TAIL_SLAP EQU 541 +HURRICANE EQU 542 +HEAD_CHARGE EQU 543 +GEAR_GRIND EQU 544 +SEARING_SHOT EQU 545 +TECHNO_BLAST EQU 546 +RELIC_SONG EQU 547 +SECRET_SWORD EQU 548 +GLACIATE EQU 549 +BOLT_STRIKE EQU 550 +BLUE_FLARE EQU 551 +FIERY_DANCE EQU 552 +FREEZE_SHOCK EQU 553 +ICE_BURN EQU 554 +SNARL EQU 555 +ICICLE_CRASH EQU 556 +V_CREATE EQU 557 +FUSION_FLARE EQU 558 +FUSION_BOLT EQU 559 + +; Gen 6 moves. +FLYING_PRESS EQU 560 +MAT_BLOCK EQU 561 +BELCH EQU 562 +ROTOTILLER EQU 563 +STICKY_WEB EQU 564 +FELL_STINGER EQU 565 +PHANTOM_FORCE EQU 566 +TRICK_OR_TREAT EQU 567 +NOBLE_ROAR EQU 568 +ION_DELUGE EQU 569 +PARABOLIC_CHARGE EQU 570 +FORESTS_CURSE EQU 571 +PETAL_BLIZZARD EQU 572 +FREEZE_DRY EQU 573 +DISARMING_VOICE EQU 574 +PARTING_SHOT EQU 575 +TOPSY_TURVY EQU 576 +DRAINING_KISS EQU 577 +CRAFTY_SHIELD EQU 578 +FLOWER_SHIELD EQU 579 +GRASSY_TERRAIN EQU 580 +MISTY_TERRAIN EQU 581 +ELECTRIFY EQU 582 +PLAY_ROUGH EQU 583 +FAIRY_WIND EQU 584 +MOONBLAST EQU 585 +BOOMBURST EQU 586 +FAIRY_LOCK EQU 587 +KINGS_SHIELD EQU 588 +PLAY_NICE EQU 589 +CONFIDE EQU 590 +DIAMOND_STORM EQU 591 +STEAM_ERUPTION EQU 592 +HYPERSPACE_HOLE EQU 593 +WATER_SHURIKEN EQU 594 +MYSTICAL_FIRE EQU 595 +SPIKY_SHIELD EQU 596 +AROMATIC_MIST EQU 597 +EERIE_IMPULSE EQU 598 +VENOM_DRENCH EQU 599 +POWDER EQU 600 +GEOMANCY EQU 601 +MAGNETIC_FLUX EQU 602 +HAPPY_HOUR EQU 603 +ELECTRIC_TERRAIN EQU 604 +DAZZLING_GLEAM EQU 605 +CELEBRATE EQU 606 +HOLD_HANDS EQU 607 +BABY_DOLL_EYES EQU 608 +NUZZLE EQU 609 +HOLD_BACK EQU 610 +INFESTATION EQU 611 +POWER_UP_PUNCH EQU 612 +OBLIVION_WING EQU 613 +THOUSAND_ARROWS EQU 614 +THOUSAND_WAVES EQU 615 +LANDS_WRATH EQU 616 +LIGHT_OF_RUIN EQU 617 +; ORAS Moves +ORIGIN_PULSE EQU 618 +PRECIPICE_BLADES EQU 619 +DRAGON_ASCENT EQU 620 +HYPERSPACE_FURY EQU 621 + +; Gen 7 moves. +SHORE_UP EQU 622 +FIRST_IMPRESSION EQU 623 +BANEFUL_BUNKER EQU 624 +SPIRIT_SHACKLE EQU 625 +DARKEST_LARIAT EQU 626 +SPARKLING_ARIA EQU 627 +ICE_HAMMER EQU 628 +FLORAL_HEALING EQU 629 +HIGH_HORSEPOWER EQU 630 +STRENGTH_SAP EQU 631 +SOLAR_BLADE EQU 632 +LEAFAGE EQU 633 +SPOTLIGHT EQU 634 +TOXIC_THREAD EQU 635 +LASER_FOCUS EQU 636 +GEAR_UP EQU 637 +THROAT_CHOP EQU 638 +POLLEN_PUFF EQU 639 +ANCHOR_SHOT EQU 640 +PSYCHIC_TERRAIN EQU 641 +LUNGE EQU 642 +FIRE_LASH EQU 643 +POWER_TRIP EQU 644 +BURN_UP EQU 645 +SPEED_SWAP EQU 646 +SMART_STRIKE EQU 647 +PURIFY EQU 648 +REVELATION_DANCE EQU 649 +CORE_ENFORCER EQU 650 +TROP_KICK EQU 651 +INSTRUCT EQU 652 +BEAK_BLAST EQU 653 +CLANGING_SCALES EQU 654 +DRAGON_HAMMER EQU 655 +BRUTAL_SWING EQU 656 +AURORA_VEIL EQU 657 +SHELL_TRAP EQU 658 +FLEUR_CANNON EQU 659 +PSYCHIC_FANGS EQU 660 +STOMPING_TANTRUM EQU 661 +SHADOW_BONE EQU 662 +ACCELEROCK EQU 663 +LIQUIDATION EQU 664 +PRISMATIC_LASER EQU 665 +SPECTRAL_THIEF EQU 666 +SUNSTEEL_STRIKE EQU 667 +MOONGEIST_BEAM EQU 668 +TEARFUL_LOOK EQU 669 +ZING_ZAP EQU 670 +NATURES_MADNESS EQU 671 +MULTI_ATTACK EQU 672 +; USUM Moves +MIND_BLOWN EQU 673 +PLASMA_FISTS EQU 674 +PHOTON_GEYSER EQU 675 +; LGPE Moves +ZIPPY_ZAP EQU 676 +SPLISHY_SPLASH EQU 677 +FLOATY_FALL EQU 678 +PIKA_PAPOW EQU 679 +BOUNCY_BUBBLE EQU 680 +BUZZY_BUZZ EQU 681 +SIZZLY_SLIDE EQU 682 +GLITZY_GLOW EQU 683 +BADDY_BAD EQU 684 +SAPPY_SEED EQU 685 +FREEZY_FROST EQU 686 +SPARKLY_SWIRL EQU 687 +VEEVEE_VOLLEY EQU 688 +DOUBLE_IRON_BASH EQU 689 + +; Gen 8 moves. +DYNAMAX_CANNON EQU 690 +SNIPE_SHOT EQU 691 +JAW_LOCK EQU 692 +STUFF_CHEEKS EQU 693 +NO_RETREAT EQU 694 +TAR_SHOT EQU 695 +MAGIC_POWDER EQU 696 +DRAGON_DARTS EQU 697 +TEATIME EQU 698 +OCTOLOCK EQU 699 +BOLT_BEAK EQU 700 +FISHIOUS_REND EQU 701 +COURT_CHANGE EQU 702 +CLANGOROUS_SOUL EQU 703 +BODY_PRESS EQU 704 +DECORATE EQU 705 +DRUM_BEATING EQU 706 +SNAP_TRAP EQU 707 +PYRO_BALL EQU 708 +BEHEMOTH_BLADE EQU 709 +BEHEMOTH_BASH EQU 710 +AURA_WHEEL EQU 711 +BREAKING_SWIPE EQU 712 +BRANCH_POKE EQU 713 +OVERDRIVE EQU 714 +APPLE_ACID EQU 715 +GRAV_APPLE EQU 716 +SPIRIT_BREAK EQU 717 +STRANGE_STEAM EQU 718 +LIFE_DEW EQU 719 +OBSTRUCT EQU 720 +FALSE_SURRENDER EQU 721 +METEOR_ASSAULT EQU 722 +ETERNABEAM EQU 723 +STEEL_BEAM EQU 724 +; Isle of Armor Moves +EXPANDING_FORCE EQU 725 +STEEL_ROLLER EQU 726 +SCALE_SHOT EQU 727 +METEOR_BEAM EQU 728 +SHELL_SIDE_ARM EQU 729 +MISTY_EXPLOSION EQU 730 +GRASSY_GLIDE EQU 731 +RISING_VOLTAGE EQU 732 +TERRAIN_PULSE EQU 733 +SKITTER_SMACK EQU 734 +BURNING_JEALOUSY EQU 735 +LASH_OUT EQU 736 +POLTERGEIST EQU 737 +CORROSIVE_GAS EQU 738 +COACHING EQU 739 +FLIP_TURN EQU 740 +TRIPLE_AXEL EQU 741 +DUAL_WINGBEAT EQU 742 +SCORCHING_SANDS EQU 743 +JUNGLE_HEALING EQU 744 +WICKED_BLOW EQU 745 +SURGING_STRIKES EQU 746 +; Crown Tundra Moves +THUNDER_CAGE EQU 747 +DRAGON_ENERGY EQU 748 +FREEZING_GLARE EQU 749 +FIERY_WRATH EQU 750 +THUNDEROUS_KICK EQU 751 +GLACIAL_LANCE EQU 752 +ASTRAL_BARRAGE EQU 753 +EERIE_SPELL EQU 754 +; Legends: Arceus Moves +DIRE_CLAW EQU 755 +PSYSHIELD_BASH EQU 756 +POWER_SHIFT EQU 757 +STONE_AXE EQU 758 +SPRINGTIDE_STORM EQU 759 +MYSTICAL_POWER EQU 760 +RAGING_FURY EQU 761 +WAVE_CRASH EQU 762 +CHLOROBLAST EQU 763 +MOUNTAIN_GALE EQU 764 +VICTORY_DANCE EQU 765 +HEADLONG_RUSH EQU 766 +BARB_BARRAGE EQU 767 +ESPER_WING EQU 768 +BITTER_MALICE EQU 769 +SHELTER EQU 770 +TRIPLE_ARROWS EQU 771 +INFERNAL_PARADE EQU 772 +CEASELESS_EDGE EQU 773 +BLEAKWIND_STORM EQU 774 +WILDBOLT_STORM EQU 775 +SANDSEAR_STORM EQU 776 +LUNAR_BLESSING EQU 777 +TAKE_HEART EQU 778 + +; Gen 9 moves. +TERA_BLAST EQU 779 +SILK_TRAP EQU 780 +AXE_KICK EQU 781 +LAST_RESPECTS EQU 782 +LUMINA_CRASH EQU 783 +ORDER_UP EQU 784 +JET_PUNCH EQU 785 +SPICY_EXTRACT EQU 786 +SPIN_OUT EQU 787 +POPULATION_BOMB EQU 788 +ICE_SPINNER EQU 789 +GLAIVE_RUSH EQU 790 +REVIVAL_BLESSING EQU 791 +SALT_CURE EQU 792 +TRIPLE_DIVE EQU 793 +MORTAL_SPIN EQU 794 +DOODLE EQU 795 +FILLET_AWAY EQU 796 +KOWTOW_CLEAVE EQU 797 +FLOWER_TRICK EQU 798 +TORCH_SONG EQU 799 +AQUA_STEP EQU 800 +RAGING_BULL EQU 801 +MAKE_IT_RAIN EQU 802 +RUINATION EQU 803 +COLLISION_COURSE EQU 804 +ELECTRO_DRIFT EQU 805 +SHED_TAIL EQU 806 +CHILLY_RECEPTION EQU 807 +TIDY_UP EQU 808 +SNOWSCAPE EQU 809 +POUNCE EQU 810 +TRAILBLAZE EQU 811 +CHILLING_WATER EQU 812 +HYPER_DRILL EQU 813 +TWIN_BEAM EQU 814 +RAGE_FIST EQU 815 +ARMOR_CANNON EQU 816 +BITTER_BLADE EQU 817 +DOUBLE_SHOCK EQU 818 +GIGATON_HAMMER EQU 819 +COMEUPPANCE EQU 820 +AQUA_CUTTER EQU 821 +BLAZING_TORQUE EQU 822 +WICKED_TORQUE EQU 823 +NOXIOUS_TORQUE EQU 824 +COMBAT_TORQUE EQU 825 +MAGICAL_TORQUE EQU 826 +PSYBLADE EQU 827 +HYDRO_STEAM EQU 828 + +MOVES_COUNT_GEN9 EQU 829 + +MOVES_COUNT EQU MOVES_COUNT_GEN9 + +; Z Moves +BREAKNECK_BLITZ EQU MOVES_COUNT + 0 +ALL_OUT_PUMMELING EQU MOVES_COUNT + 1 +SUPERSONIC_SKYSTRIKE EQU MOVES_COUNT + 2 +ACID_DOWNPOUR EQU MOVES_COUNT + 3 +TECTONIC_RAGE EQU MOVES_COUNT + 4 +CONTINENTAL_CRUSH EQU MOVES_COUNT + 5 +SAVAGE_SPIN_OUT EQU MOVES_COUNT + 6 +NEVER_ENDING_NIGHTMARE EQU MOVES_COUNT + 7 +CORKSCREW_CRASH EQU MOVES_COUNT + 8 +INFERNO_OVERDRIVE EQU MOVES_COUNT + 9 +HYDRO_VORTEX EQU MOVES_COUNT + 10 +BLOOM_DOOM EQU MOVES_COUNT + 11 +GIGAVOLT_HAVOC EQU MOVES_COUNT + 12 +SHATTERED_PSYCHE EQU MOVES_COUNT + 13 +SUBZERO_SLAMMER EQU MOVES_COUNT + 14 +DEVASTATING_DRAKE EQU MOVES_COUNT + 15 +BLACK_HOLE_ECLIPSE EQU MOVES_COUNT + 16 +TWINKLE_TACKLE EQU MOVES_COUNT + 17 +; Signature Z Moves +CATASTROPIKA EQU MOVES_COUNT + 18 +TEN_MILLION_VOLT_THUNDERBOLT EQU MOVES_COUNT + 19 +STOKED_SPARKSURFER EQU MOVES_COUNT + 20 +EXTREME_EVOBOOST EQU MOVES_COUNT + 21 +PULVERIZING_PANCAKE EQU MOVES_COUNT + 22 +GENESIS_SUPERNOVA EQU MOVES_COUNT + 23 +SINISTER_ARROW_RAID EQU MOVES_COUNT + 24 +MALICIOUS_MOONSAULT EQU MOVES_COUNT + 25 +OCEANIC_OPERETTA EQU MOVES_COUNT + 26 +SPLINTERED_STORMSHARDS EQU MOVES_COUNT + 27 +LETS_SNUGGLE_FOREVER EQU MOVES_COUNT + 28 +CLANGOROUS_SOULBLAZE EQU MOVES_COUNT + 29 +GUARDIAN_OF_ALOLA EQU MOVES_COUNT + 30 +SEARING_SUNRAZE_SMASH EQU MOVES_COUNT + 31 +MENACING_MOONRAZE_MAELSTROM EQU MOVES_COUNT + 32 +LIGHT_THAT_BURNS_THE_SKY EQU MOVES_COUNT + 33 +SOUL_STEALING_7_STAR_STRIKE EQU MOVES_COUNT + 34 diff --git a/constants/pokemon.asm b/constants/pokemon.asm index b00967b..983554e 100644 --- a/constants/pokemon.asm +++ b/constants/pokemon.asm @@ -1,1208 +1,1373 @@ -SPECIES_NONE EQU $000 -BULBASAUR EQU $001 -IVYSAUR EQU $002 -VENUSAUR EQU $003 -CHARMANDER EQU $004 -CHARMELEON EQU $005 -CHARIZARD EQU $006 -SQUIRTLE EQU $007 -WARTORTLE EQU $008 -BLASTOISE EQU $009 -CATERPIE EQU $00A -METAPOD EQU $00B -BUTTERFREE EQU $00C -WEEDLE EQU $00D -KAKUNA EQU $00E -BEEDRILL EQU $00F -PIDGEY EQU $010 -PIDGEOTTO EQU $011 -PIDGEOT EQU $012 -RATTATA EQU $013 -RATICATE EQU $014 -SPEAROW EQU $015 -FEAROW EQU $016 -EKANS EQU $017 -ARBOK EQU $018 -PIKACHU EQU $019 -RAICHU EQU $01A -SANDSHREW EQU $01B -SANDSLASH EQU $01C -NIDORAN_F EQU $01D ; NIDORAN♀ -NIDORINA EQU $01E -NIDOQUEEN EQU $01F -NIDORAN_M EQU $020 ; NIDORAN♂ -NIDORINO EQU $021 -NIDOKING EQU $022 -CLEFAIRY EQU $023 -CLEFABLE EQU $024 -VULPIX EQU $025 -NINETALES EQU $026 -JIGGLYPUFF EQU $027 -WIGGLYTUFF EQU $028 -ZUBAT EQU $029 -GOLBAT EQU $02A -ODDISH EQU $02B -GLOOM EQU $02C -VILEPLUME EQU $02D -PARAS EQU $02E -PARASECT EQU $02F -VENONAT EQU $030 -VENOMOTH EQU $031 -DIGLETT EQU $032 -DUGTRIO EQU $033 -MEOWTH EQU $034 -PERSIAN EQU $035 -PSYDUCK EQU $036 -GOLDUCK EQU $037 -MANKEY EQU $038 -PRIMEAPE EQU $039 -GROWLITHE EQU $03A -ARCANINE EQU $03B -POLIWAG EQU $03C -POLIWHIRL EQU $03D -POLIWRATH EQU $03E -ABRA EQU $03F -KADABRA EQU $040 -ALAKAZAM EQU $041 -MACHOP EQU $042 -MACHOKE EQU $043 -MACHAMP EQU $044 -BELLSPROUT EQU $045 -WEEPINBELL EQU $046 -VICTREEBEL EQU $047 -TENTACOOL EQU $048 -TENTACRUEL EQU $049 -GEODUDE EQU $04A -GRAVELER EQU $04B -GOLEM EQU $04C -PONYTA EQU $04D -RAPIDASH EQU $04E -SLOWPOKE EQU $04F -SLOWBRO EQU $050 -MAGNEMITE EQU $051 -MAGNETON EQU $052 -FARFETCH_D EQU $053 ; FARFETCH’D -DODUO EQU $054 -DODRIO EQU $055 -SEEL EQU $056 -DEWGONG EQU $057 -GRIMER EQU $058 -MUK EQU $059 -SHELLDER EQU $05A -CLOYSTER EQU $05B -GASTLY EQU $05C -HAUNTER EQU $05D -GENGAR EQU $05E -ONIX EQU $05F -DROWZEE EQU $060 -HYPNO EQU $061 -KRABBY EQU $062 -KINGLER EQU $063 -VOLTORB EQU $064 -ELECTRODE EQU $065 -EXEGGCUTE EQU $066 -EXEGGUTOR EQU $067 -CUBONE EQU $068 -MAROWAK EQU $069 -HITMONLEE EQU $06A -HITMONCHAN EQU $06B -LICKITUNG EQU $06C -KOFFING EQU $06D -WEEZING EQU $06E -RHYHORN EQU $06F -RHYDON EQU $070 -CHANSEY EQU $071 -TANGELA EQU $072 -KANGASKHAN EQU $073 -HORSEA EQU $074 -SEADRA EQU $075 -GOLDEEN EQU $076 -SEAKING EQU $077 -STARYU EQU $078 -STARMIE EQU $079 -MR_MIME EQU $07A ; MR. MIME -SCYTHER EQU $07B -JYNX EQU $07C -ELECTABUZZ EQU $07D -MAGMAR EQU $07E -PINSIR EQU $07F -TAUROS EQU $080 -MAGIKARP EQU $081 -GYARADOS EQU $082 -LAPRAS EQU $083 -DITTO EQU $084 -EEVEE EQU $085 -VAPOREON EQU $086 -JOLTEON EQU $087 -FLAREON EQU $088 -PORYGON EQU $089 -OMANYTE EQU $08A -OMASTAR EQU $08B -KABUTO EQU $08C -KABUTOPS EQU $08D -AERODACTYL EQU $08E -SNORLAX EQU $08F -ARTICUNO EQU $090 -ZAPDOS EQU $091 -MOLTRES EQU $092 -DRATINI EQU $093 -DRAGONAIR EQU $094 -DRAGONITE EQU $095 -MEWTWO EQU $096 -MEW EQU $097 +SPECIES_NONE EQU 0 +BULBASAUR EQU 1 +IVYSAUR EQU 2 +VENUSAUR EQU 3 +CHARMANDER EQU 4 +CHARMELEON EQU 5 +CHARIZARD EQU 6 +SQUIRTLE EQU 7 +WARTORTLE EQU 8 +BLASTOISE EQU 9 +CATERPIE EQU 10 +METAPOD EQU 11 +BUTTERFREE EQU 12 +WEEDLE EQU 13 +KAKUNA EQU 14 +BEEDRILL EQU 15 +PIDGEY EQU 16 +PIDGEOTTO EQU 17 +PIDGEOT EQU 18 +RATTATA EQU 19 +RATICATE EQU 20 +SPEAROW EQU 21 +FEAROW EQU 22 +EKANS EQU 23 +ARBOK EQU 24 +PIKACHU EQU 25 +RAICHU EQU 26 +SANDSHREW EQU 27 +SANDSLASH EQU 28 +NIDORAN_F EQU 29 +NIDORINA EQU 30 +NIDOQUEEN EQU 31 +NIDORAN_M EQU 32 +NIDORINO EQU 33 +NIDOKING EQU 34 +CLEFAIRY EQU 35 +CLEFABLE EQU 36 +VULPIX EQU 37 +NINETALES EQU 38 +JIGGLYPUFF EQU 39 +WIGGLYTUFF EQU 40 +ZUBAT EQU 41 +GOLBAT EQU 42 +ODDISH EQU 43 +GLOOM EQU 44 +VILEPLUME EQU 45 +PARAS EQU 46 +PARASECT EQU 47 +VENONAT EQU 48 +VENOMOTH EQU 49 +DIGLETT EQU 50 +DUGTRIO EQU 51 +MEOWTH EQU 52 +PERSIAN EQU 53 +PSYDUCK EQU 54 +GOLDUCK EQU 55 +MANKEY EQU 56 +PRIMEAPE EQU 57 +GROWLITHE EQU 58 +ARCANINE EQU 59 +POLIWAG EQU 60 +POLIWHIRL EQU 61 +POLIWRATH EQU 62 +ABRA EQU 63 +KADABRA EQU 64 +ALAKAZAM EQU 65 +MACHOP EQU 66 +MACHOKE EQU 67 +MACHAMP EQU 68 +BELLSPROUT EQU 69 +WEEPINBELL EQU 70 +VICTREEBEL EQU 71 +TENTACOOL EQU 72 +TENTACRUEL EQU 73 +GEODUDE EQU 74 +GRAVELER EQU 75 +GOLEM EQU 76 +PONYTA EQU 77 +RAPIDASH EQU 78 +SLOWPOKE EQU 79 +SLOWBRO EQU 80 +MAGNEMITE EQU 81 +MAGNETON EQU 82 +FARFETCHD EQU 83 +DODUO EQU 84 +DODRIO EQU 85 +SEEL EQU 86 +DEWGONG EQU 87 +GRIMER EQU 88 +MUK EQU 89 +SHELLDER EQU 90 +CLOYSTER EQU 91 +GASTLY EQU 92 +HAUNTER EQU 93 +GENGAR EQU 94 +ONIX EQU 95 +DROWZEE EQU 96 +HYPNO EQU 97 +KRABBY EQU 98 +KINGLER EQU 99 +VOLTORB EQU 100 +ELECTRODE EQU 101 +EXEGGCUTE EQU 102 +EXEGGUTOR EQU 103 +CUBONE EQU 104 +MAROWAK EQU 105 +HITMONLEE EQU 106 +HITMONCHAN EQU 107 +LICKITUNG EQU 108 +KOFFING EQU 109 +WEEZING EQU 110 +RHYHORN EQU 111 +RHYDON EQU 112 +CHANSEY EQU 113 +TANGELA EQU 114 +KANGASKHAN EQU 115 +HORSEA EQU 116 +SEADRA EQU 117 +GOLDEEN EQU 118 +SEAKING EQU 119 +STARYU EQU 120 +STARMIE EQU 121 +MR_MIME EQU 122 +SCYTHER EQU 123 +JYNX EQU 124 +ELECTABUZZ EQU 125 +MAGMAR EQU 126 +PINSIR EQU 127 +TAUROS EQU 128 +MAGIKARP EQU 129 +GYARADOS EQU 130 +LAPRAS EQU 131 +DITTO EQU 132 +EEVEE EQU 133 +VAPOREON EQU 134 +JOLTEON EQU 135 +FLAREON EQU 136 +PORYGON EQU 137 +OMANYTE EQU 138 +OMASTAR EQU 139 +KABUTO EQU 140 +KABUTOPS EQU 141 +AERODACTYL EQU 142 +SNORLAX EQU 143 +ARTICUNO EQU 144 +ZAPDOS EQU 145 +MOLTRES EQU 146 +DRATINI EQU 147 +DRAGONAIR EQU 148 +DRAGONITE EQU 149 +MEWTWO EQU 150 +MEW EQU 151 +CHIKORITA EQU 152 +BAYLEEF EQU 153 +MEGANIUM EQU 154 +CYNDAQUIL EQU 155 +QUILAVA EQU 156 +TYPHLOSION EQU 157 +TOTODILE EQU 158 +CROCONAW EQU 159 +FERALIGATR EQU 160 +SENTRET EQU 161 +FURRET EQU 162 +HOOTHOOT EQU 163 +NOCTOWL EQU 164 +LEDYBA EQU 165 +LEDIAN EQU 166 +SPINARAK EQU 167 +ARIADOS EQU 168 +CROBAT EQU 169 +CHINCHOU EQU 170 +LANTURN EQU 171 +PICHU EQU 172 +CLEFFA EQU 173 +IGGLYBUFF EQU 174 +TOGEPI EQU 175 +TOGETIC EQU 176 +NATU EQU 177 +XATU EQU 178 +MAREEP EQU 179 +FLAAFFY EQU 180 +AMPHAROS EQU 181 +BELLOSSOM EQU 182 +MARILL EQU 183 +AZUMARILL EQU 184 +SUDOWOODO EQU 185 +POLITOED EQU 186 +HOPPIP EQU 187 +SKIPLOOM EQU 188 +JUMPLUFF EQU 189 +AIPOM EQU 190 +SUNKERN EQU 191 +SUNFLORA EQU 192 +YANMA EQU 193 +WOOPER EQU 194 +QUAGSIRE EQU 195 +ESPEON EQU 196 +UMBREON EQU 197 +MURKROW EQU 198 +SLOWKING EQU 199 +MISDREAVUS EQU 200 +UNOWN EQU 201 +WOBBUFFET EQU 202 +GIRAFARIG EQU 203 +PINECO EQU 204 +FORRETRESS EQU 205 +DUNSPARCE EQU 206 +GLIGAR EQU 207 +STEELIX EQU 208 +SNUBBULL EQU 209 +GRANBULL EQU 210 +QWILFISH EQU 211 +SCIZOR EQU 212 +SHUCKLE EQU 213 +HERACROSS EQU 214 +SNEASEL EQU 215 +TEDDIURSA EQU 216 +URSARING EQU 217 +SLUGMA EQU 218 +MAGCARGO EQU 219 +SWINUB EQU 220 +PILOSWINE EQU 221 +CORSOLA EQU 222 +REMORAID EQU 223 +OCTILLERY EQU 224 +DELIBIRD EQU 225 +MANTINE EQU 226 +SKARMORY EQU 227 +HOUNDOUR EQU 228 +HOUNDOOM EQU 229 +KINGDRA EQU 230 +PHANPY EQU 231 +DONPHAN EQU 232 +PORYGON2 EQU 233 +STANTLER EQU 234 +SMEARGLE EQU 235 +TYROGUE EQU 236 +HITMONTOP EQU 237 +SMOOCHUM EQU 238 +ELEKID EQU 239 +MAGBY EQU 240 +MILTANK EQU 241 +BLISSEY EQU 242 +RAIKOU EQU 243 +ENTEI EQU 244 +SUICUNE EQU 245 +LARVITAR EQU 246 +PUPITAR EQU 247 +TYRANITAR EQU 248 +LUGIA EQU 249 +HO_OH EQU 250 +CELEBI EQU 251 +TREECKO EQU 252 +GROVYLE EQU 253 +SCEPTILE EQU 254 +TORCHIC EQU 255 +COMBUSKEN EQU 256 +BLAZIKEN EQU 257 +MUDKIP EQU 258 +MARSHTOMP EQU 259 +SWAMPERT EQU 260 +POOCHYENA EQU 261 +MIGHTYENA EQU 262 +ZIGZAGOON EQU 263 +LINOONE EQU 264 +WURMPLE EQU 265 +SILCOON EQU 266 +BEAUTIFLY EQU 267 +CASCOON EQU 268 +DUSTOX EQU 269 +LOTAD EQU 270 +LOMBRE EQU 271 +LUDICOLO EQU 272 +SEEDOT EQU 273 +NUZLEAF EQU 274 +SHIFTRY EQU 275 +TAILLOW EQU 276 +SWELLOW EQU 277 +WINGULL EQU 278 +PELIPPER EQU 279 +RALTS EQU 280 +KIRLIA EQU 281 +GARDEVOIR EQU 282 +SURSKIT EQU 283 +MASQUERAIN EQU 284 +SHROOMISH EQU 285 +BRELOOM EQU 286 +SLAKOTH EQU 287 +VIGOROTH EQU 288 +SLAKING EQU 289 +NINCADA EQU 290 +NINJASK EQU 291 +SHEDINJA EQU 292 +WHISMUR EQU 293 +LOUDRED EQU 294 +EXPLOUD EQU 295 +MAKUHITA EQU 296 +HARIYAMA EQU 297 +AZURILL EQU 298 +NOSEPASS EQU 299 +SKITTY EQU 300 +DELCATTY EQU 301 +SABLEYE EQU 302 +MAWILE EQU 303 +ARON EQU 304 +LAIRON EQU 305 +AGGRON EQU 306 +MEDITITE EQU 307 +MEDICHAM EQU 308 +ELECTRIKE EQU 309 +MANECTRIC EQU 310 +PLUSLE EQU 311 +MINUN EQU 312 +VOLBEAT EQU 313 +ILLUMISE EQU 314 +ROSELIA EQU 315 +GULPIN EQU 316 +SWALOT EQU 317 +CARVANHA EQU 318 +SHARPEDO EQU 319 +WAILMER EQU 320 +WAILORD EQU 321 +NUMEL EQU 322 +CAMERUPT EQU 323 +TORKOAL EQU 324 +SPOINK EQU 325 +GRUMPIG EQU 326 +SPINDA EQU 327 +TRAPINCH EQU 328 +VIBRAVA EQU 329 +FLYGON EQU 330 +CACNEA EQU 331 +CACTURNE EQU 332 +SWABLU EQU 333 +ALTARIA EQU 334 +ZANGOOSE EQU 335 +SEVIPER EQU 336 +LUNATONE EQU 337 +SOLROCK EQU 338 +BARBOACH EQU 339 +WHISCASH EQU 340 +CORPHISH EQU 341 +CRAWDAUNT EQU 342 +BALTOY EQU 343 +CLAYDOL EQU 344 +LILEEP EQU 345 +CRADILY EQU 346 +ANORITH EQU 347 +ARMALDO EQU 348 +FEEBAS EQU 349 +MILOTIC EQU 350 +CASTFORM EQU 351 +KECLEON EQU 352 +SHUPPET EQU 353 +BANETTE EQU 354 +DUSKULL EQU 355 +DUSCLOPS EQU 356 +TROPIUS EQU 357 +CHIMECHO EQU 358 +ABSOL EQU 359 +WYNAUT EQU 360 +SNORUNT EQU 361 +GLALIE EQU 362 +SPHEAL EQU 363 +SEALEO EQU 364 +WALREIN EQU 365 +CLAMPERL EQU 366 +HUNTAIL EQU 367 +GOREBYSS EQU 368 +RELICANTH EQU 369 +LUVDISC EQU 370 +BAGON EQU 371 +SHELGON EQU 372 +SALAMENCE EQU 373 +BELDUM EQU 374 +METANG EQU 375 +METAGROSS EQU 376 +REGIROCK EQU 377 +REGICE EQU 378 +REGISTEEL EQU 379 +LATIAS EQU 380 +LATIOS EQU 381 +KYOGRE EQU 382 +GROUDON EQU 383 +RAYQUAZA EQU 384 +JIRACHI EQU 385 +DEOXYS EQU 386 +TURTWIG EQU 387 +GROTLE EQU 388 +TORTERRA EQU 389 +CHIMCHAR EQU 390 +MONFERNO EQU 391 +INFERNAPE EQU 392 +PIPLUP EQU 393 +PRINPLUP EQU 394 +EMPOLEON EQU 395 +STARLY EQU 396 +STARAVIA EQU 397 +STARAPTOR EQU 398 +BIDOOF EQU 399 +BIBAREL EQU 400 +KRICKETOT EQU 401 +KRICKETUNE EQU 402 +SHINX EQU 403 +LUXIO EQU 404 +LUXRAY EQU 405 +BUDEW EQU 406 +ROSERADE EQU 407 +CRANIDOS EQU 408 +RAMPARDOS EQU 409 +SHIELDON EQU 410 +BASTIODON EQU 411 +BURMY EQU 412 +WORMADAM EQU 413 +MOTHIM EQU 414 +COMBEE EQU 415 +VESPIQUEN EQU 416 +PACHIRISU EQU 417 +BUIZEL EQU 418 +FLOATZEL EQU 419 +CHERUBI EQU 420 +CHERRIM EQU 421 +SHELLOS EQU 422 +GASTRODON EQU 423 +AMBIPOM EQU 424 +DRIFLOON EQU 425 +DRIFBLIM EQU 426 +BUNEARY EQU 427 +LOPUNNY EQU 428 +MISMAGIUS EQU 429 +HONCHKROW EQU 430 +GLAMEOW EQU 431 +PURUGLY EQU 432 +CHINGLING EQU 433 +STUNKY EQU 434 +SKUNTANK EQU 435 +BRONZOR EQU 436 +BRONZONG EQU 437 +BONSLY EQU 438 +MIME_JR EQU 439 +HAPPINY EQU 440 +CHATOT EQU 441 +SPIRITOMB EQU 442 +GIBLE EQU 443 +GABITE EQU 444 +GARCHOMP EQU 445 +MUNCHLAX EQU 446 +RIOLU EQU 447 +LUCARIO EQU 448 +HIPPOPOTAS EQU 449 +HIPPOWDON EQU 450 +SKORUPI EQU 451 +DRAPION EQU 452 +CROAGUNK EQU 453 +TOXICROAK EQU 454 +CARNIVINE EQU 455 +FINNEON EQU 456 +LUMINEON EQU 457 +MANTYKE EQU 458 +SNOVER EQU 459 +ABOMASNOW EQU 460 +WEAVILE EQU 461 +MAGNEZONE EQU 462 +LICKILICKY EQU 463 +RHYPERIOR EQU 464 +TANGROWTH EQU 465 +ELECTIVIRE EQU 466 +MAGMORTAR EQU 467 +TOGEKISS EQU 468 +YANMEGA EQU 469 +LEAFEON EQU 470 +GLACEON EQU 471 +GLISCOR EQU 472 +MAMOSWINE EQU 473 +PORYGON_Z EQU 474 +GALLADE EQU 475 +PROBOPASS EQU 476 +DUSKNOIR EQU 477 +FROSLASS EQU 478 +ROTOM EQU 479 +UXIE EQU 480 +MESPRIT EQU 481 +AZELF EQU 482 +DIALGA EQU 483 +PALKIA EQU 484 +HEATRAN EQU 485 +REGIGIGAS EQU 486 +GIRATINA EQU 487 +CRESSELIA EQU 488 +PHIONE EQU 489 +MANAPHY EQU 490 +DARKRAI EQU 491 +SHAYMIN EQU 492 +ARCEUS EQU 493 +VICTINI EQU 494 +SNIVY EQU 495 +SERVINE EQU 496 +SERPERIOR EQU 497 +TEPIG EQU 498 +PIGNITE EQU 499 +EMBOAR EQU 500 +OSHAWOTT EQU 501 +DEWOTT EQU 502 +SAMUROTT EQU 503 +PATRAT EQU 504 +WATCHOG EQU 505 +LILLIPUP EQU 506 +HERDIER EQU 507 +STOUTLAND EQU 508 +PURRLOIN EQU 509 +LIEPARD EQU 510 +PANSAGE EQU 511 +SIMISAGE EQU 512 +PANSEAR EQU 513 +SIMISEAR EQU 514 +PANPOUR EQU 515 +SIMIPOUR EQU 516 +MUNNA EQU 517 +MUSHARNA EQU 518 +PIDOVE EQU 519 +TRANQUILL EQU 520 +UNFEZANT EQU 521 +BLITZLE EQU 522 +ZEBSTRIKA EQU 523 +ROGGENROLA EQU 524 +BOLDORE EQU 525 +GIGALITH EQU 526 +WOOBAT EQU 527 +SWOOBAT EQU 528 +DRILBUR EQU 529 +EXCADRILL EQU 530 +AUDINO EQU 531 +TIMBURR EQU 532 +GURDURR EQU 533 +CONKELDURR EQU 534 +TYMPOLE EQU 535 +PALPITOAD EQU 536 +SEISMITOAD EQU 537 +THROH EQU 538 +SAWK EQU 539 +SEWADDLE EQU 540 +SWADLOON EQU 541 +LEAVANNY EQU 542 +VENIPEDE EQU 543 +WHIRLIPEDE EQU 544 +SCOLIPEDE EQU 545 +COTTONEE EQU 546 +WHIMSICOTT EQU 547 +PETILIL EQU 548 +LILLIGANT EQU 549 +BASCULIN EQU 550 +SANDILE EQU 551 +KROKOROK EQU 552 +KROOKODILE EQU 553 +DARUMAKA EQU 554 +DARMANITAN EQU 555 +MARACTUS EQU 556 +DWEBBLE EQU 557 +CRUSTLE EQU 558 +SCRAGGY EQU 559 +SCRAFTY EQU 560 +SIGILYPH EQU 561 +YAMASK EQU 562 +COFAGRIGUS EQU 563 +TIRTOUGA EQU 564 +CARRACOSTA EQU 565 +ARCHEN EQU 566 +ARCHEOPS EQU 567 +TRUBBISH EQU 568 +GARBODOR EQU 569 +ZORUA EQU 570 +ZOROARK EQU 571 +MINCCINO EQU 572 +CINCCINO EQU 573 +GOTHITA EQU 574 +GOTHORITA EQU 575 +GOTHITELLE EQU 576 +SOLOSIS EQU 577 +DUOSION EQU 578 +REUNICLUS EQU 579 +DUCKLETT EQU 580 +SWANNA EQU 581 +VANILLITE EQU 582 +VANILLISH EQU 583 +VANILLUXE EQU 584 +DEERLING EQU 585 +SAWSBUCK EQU 586 +EMOLGA EQU 587 +KARRABLAST EQU 588 +ESCAVALIER EQU 589 +FOONGUS EQU 590 +AMOONGUSS EQU 591 +FRILLISH EQU 592 +JELLICENT EQU 593 +ALOMOMOLA EQU 594 +JOLTIK EQU 595 +GALVANTULA EQU 596 +FERROSEED EQU 597 +FERROTHORN EQU 598 +KLINK EQU 599 +KLANG EQU 600 +KLINKLANG EQU 601 +TYNAMO EQU 602 +EELEKTRIK EQU 603 +EELEKTROSS EQU 604 +ELGYEM EQU 605 +BEHEEYEM EQU 606 +LITWICK EQU 607 +LAMPENT EQU 608 +CHANDELURE EQU 609 +AXEW EQU 610 +FRAXURE EQU 611 +HAXORUS EQU 612 +CUBCHOO EQU 613 +BEARTIC EQU 614 +CRYOGONAL EQU 615 +SHELMET EQU 616 +ACCELGOR EQU 617 +STUNFISK EQU 618 +MIENFOO EQU 619 +MIENSHAO EQU 620 +DRUDDIGON EQU 621 +GOLETT EQU 622 +GOLURK EQU 623 +PAWNIARD EQU 624 +BISHARP EQU 625 +BOUFFALANT EQU 626 +RUFFLET EQU 627 +BRAVIARY EQU 628 +VULLABY EQU 629 +MANDIBUZZ EQU 630 +HEATMOR EQU 631 +DURANT EQU 632 +DEINO EQU 633 +ZWEILOUS EQU 634 +HYDREIGON EQU 635 +LARVESTA EQU 636 +VOLCARONA EQU 637 +COBALION EQU 638 +TERRAKION EQU 639 +VIRIZION EQU 640 +TORNADUS EQU 641 +THUNDURUS EQU 642 +RESHIRAM EQU 643 +ZEKROM EQU 644 +LANDORUS EQU 645 +KYUREM EQU 646 +KELDEO EQU 647 +MELOETTA EQU 648 +GENESECT EQU 649 +CHESPIN EQU 650 +QUILLADIN EQU 651 +CHESNAUGHT EQU 652 +FENNEKIN EQU 653 +BRAIXEN EQU 654 +DELPHOX EQU 655 +FROAKIE EQU 656 +FROGADIER EQU 657 +GRENINJA EQU 658 +BUNNELBY EQU 659 +DIGGERSBY EQU 660 +FLETCHLING EQU 661 +FLETCHINDER EQU 662 +TALONFLAME EQU 663 +SCATTERBUG EQU 664 +SPEWPA EQU 665 +VIVILLON EQU 666 ; Icy Snow Pattern +LITLEO EQU 667 +PYROAR EQU 668 +FLABEBE EQU 669 ; Red Flower +FLOETTE EQU 670 +FLORGES EQU 671 +SKIDDO EQU 672 +GOGOAT EQU 673 +PANCHAM EQU 674 +PANGORO EQU 675 +FURFROU EQU 676 +ESPURR EQU 677 +MEOWSTIC EQU 678 +HONEDGE EQU 679 +DOUBLADE EQU 680 +AEGISLASH EQU 681 +SPRITZEE EQU 682 +AROMATISSE EQU 683 +SWIRLIX EQU 684 +SLURPUFF EQU 685 +INKAY EQU 686 +MALAMAR EQU 687 +BINACLE EQU 688 +BARBARACLE EQU 689 +SKRELP EQU 690 +DRAGALGE EQU 691 +CLAUNCHER EQU 692 +CLAWITZER EQU 693 +HELIOPTILE EQU 694 +HELIOLISK EQU 695 +TYRUNT EQU 696 +TYRANTRUM EQU 697 +AMAURA EQU 698 +AURORUS EQU 699 +SYLVEON EQU 700 +HAWLUCHA EQU 701 +DEDENNE EQU 702 +CARBINK EQU 703 +GOOMY EQU 704 +SLIGGOO EQU 705 +GOODRA EQU 706 +KLEFKI EQU 707 +PHANTUMP EQU 708 +TREVENANT EQU 709 +PUMPKABOO EQU 710 +GOURGEIST EQU 711 +BERGMITE EQU 712 +AVALUGG EQU 713 +NOIBAT EQU 714 +NOIVERN EQU 715 +XERNEAS EQU 716 +YVELTAL EQU 717 +ZYGARDE EQU 718 +DIANCIE EQU 719 +HOOPA EQU 720 +VOLCANION EQU 721 +ROWLET EQU 722 +DARTRIX EQU 723 +DECIDUEYE EQU 724 +LITTEN EQU 725 +TORRACAT EQU 726 +INCINEROAR EQU 727 +POPPLIO EQU 728 +BRIONNE EQU 729 +PRIMARINA EQU 730 +PIKIPEK EQU 731 +TRUMBEAK EQU 732 +TOUCANNON EQU 733 +YUNGOOS EQU 734 +GUMSHOOS EQU 735 +GRUBBIN EQU 736 +CHARJABUG EQU 737 +VIKAVOLT EQU 738 +CRABRAWLER EQU 739 +CRABOMINABLE EQU 740 +ORICORIO EQU 741 +CUTIEFLY EQU 742 +RIBOMBEE EQU 743 +ROCKRUFF EQU 744 +LYCANROC EQU 745 +WISHIWASHI EQU 746 +MAREANIE EQU 747 +TOXAPEX EQU 748 +MUDBRAY EQU 749 +MUDSDALE EQU 750 +DEWPIDER EQU 751 +ARAQUANID EQU 752 +FOMANTIS EQU 753 +LURANTIS EQU 754 +MORELULL EQU 755 +SHIINOTIC EQU 756 +SALANDIT EQU 757 +SALAZZLE EQU 758 +STUFFUL EQU 759 +BEWEAR EQU 760 +BOUNSWEET EQU 761 +STEENEE EQU 762 +TSAREENA EQU 763 +COMFEY EQU 764 +ORANGURU EQU 765 +PASSIMIAN EQU 766 +WIMPOD EQU 767 +GOLISOPOD EQU 768 +SANDYGAST EQU 769 +PALOSSAND EQU 770 +PYUKUMUKU EQU 771 +TYPE_NULL EQU 772 +SILVALLY EQU 773 +MINIOR EQU 774 +KOMALA EQU 775 +TURTONATOR EQU 776 +TOGEDEMARU EQU 777 +MIMIKYU EQU 778 +BRUXISH EQU 779 +DRAMPA EQU 780 +DHELMISE EQU 781 +JANGMO_O EQU 782 +HAKAMO_O EQU 783 +KOMMO_O EQU 784 +TAPU_KOKO EQU 785 +TAPU_LELE EQU 786 +TAPU_BULU EQU 787 +TAPU_FINI EQU 788 +COSMOG EQU 789 +COSMOEM EQU 790 +SOLGALEO EQU 791 +LUNALA EQU 792 +NIHILEGO EQU 793 +BUZZWOLE EQU 794 +PHEROMOSA EQU 795 +XURKITREE EQU 796 +CELESTEELA EQU 797 +KARTANA EQU 798 +GUZZLORD EQU 799 +NECROZMA EQU 800 +MAGEARNA EQU 801 +MARSHADOW EQU 802 +POIPOLE EQU 803 +NAGANADEL EQU 804 +STAKATAKA EQU 805 +BLACEPHALON EQU 806 +ZERAORA EQU 807 +MELTAN EQU 808 +MELMETAL EQU 809 +GROOKEY EQU 810 +THWACKEY EQU 811 +RILLABOOM EQU 812 +SCORBUNNY EQU 813 +RABOOT EQU 814 +CINDERACE EQU 815 +SOBBLE EQU 816 +DRIZZILE EQU 817 +INTELEON EQU 818 +SKWOVET EQU 819 +GREEDENT EQU 820 +ROOKIDEE EQU 821 +CORVISQUIRE EQU 822 +CORVIKNIGHT EQU 823 +BLIPBUG EQU 824 +DOTTLER EQU 825 +ORBEETLE EQU 826 +NICKIT EQU 827 +THIEVUL EQU 828 +GOSSIFLEUR EQU 829 +ELDEGOSS EQU 830 +WOOLOO EQU 831 +DUBWOOL EQU 832 +CHEWTLE EQU 833 +DREDNAW EQU 834 +YAMPER EQU 835 +BOLTUND EQU 836 +ROLYCOLY EQU 837 +CARKOL EQU 838 +COALOSSAL EQU 839 +APPLIN EQU 840 +FLAPPLE EQU 841 +APPLETUN EQU 842 +SILICOBRA EQU 843 +SANDACONDA EQU 844 +CRAMORANT EQU 845 +ARROKUDA EQU 846 +BARRASKEWDA EQU 847 +TOXEL EQU 848 +TOXTRICITY EQU 849 +SIZZLIPEDE EQU 850 +CENTISKORCH EQU 851 +CLOBBOPUS EQU 852 +GRAPPLOCT EQU 853 +SINISTEA EQU 854 +POLTEAGEIST EQU 855 +HATENNA EQU 856 +HATTREM EQU 857 +HATTERENE EQU 858 +IMPIDIMP EQU 859 +MORGREM EQU 860 +GRIMMSNARL EQU 861 +OBSTAGOON EQU 862 +PERRSERKER EQU 863 +CURSOLA EQU 864 +SIRFETCHD EQU 865 +MR_RIME EQU 866 +RUNERIGUS EQU 867 +MILCERY EQU 868 +ALCREMIE EQU 869 +FALINKS EQU 870 +PINCURCHIN EQU 871 +SNOM EQU 872 +FROSMOTH EQU 873 +STONJOURNER EQU 874 +EISCUE EQU 875 +INDEEDEE EQU 876 +MORPEKO EQU 877 +CUFANT EQU 878 +COPPERAJAH EQU 879 +DRACOZOLT EQU 880 +ARCTOZOLT EQU 881 +DRACOVISH EQU 882 +ARCTOVISH EQU 883 +DURALUDON EQU 884 +DREEPY EQU 885 +DRAKLOAK EQU 886 +DRAGAPULT EQU 887 +ZACIAN EQU 888 +ZAMAZENTA EQU 889 +ETERNATUS EQU 890 +KUBFU EQU 891 +URSHIFU EQU 892 +ZARUDE EQU 893 +REGIELEKI EQU 894 +REGIDRAGO EQU 895 +GLASTRIER EQU 896 +SPECTRIER EQU 897 +CALYREX EQU 898 +WYRDEER EQU 899 +KLEAVOR EQU 900 +URSALUNA EQU 901 +BASCULEGION EQU 902 +SNEASLER EQU 903 +OVERQWIL EQU 904 +ENAMORUS EQU 905 -CHIKORITA EQU $098 -BAYLEEF EQU $099 -MEGANIUM EQU $09A -CYNDAQUIL EQU $09B -QUILAVA EQU $09C -TYPHLOSION EQU $09D -TOTODILE EQU $09E -CROCONAW EQU $09F -FERALIGATR EQU $0A0 -SENTRET EQU $0A1 -FURRET EQU $0A2 -HOOTHOOT EQU $0A3 -NOCTOWL EQU $0A4 -LEDYBA EQU $0A5 -LEDIAN EQU $0A6 -SPINARAK EQU $0A7 -ARIADOS EQU $0A8 -CROBAT EQU $0A9 -CHINCHOU EQU $0AA -LANTURN EQU $0AB -PICHU EQU $0AC -CLEFFA EQU $0AD -IGGLYBUFF EQU $0AE -TOGEPI EQU $0AF -TOGETIC EQU $0B0 -NATU EQU $0B1 -XATU EQU $0B2 -MAREEP EQU $0B3 -FLAAFFY EQU $0B4 -AMPHAROS EQU $0B5 -BELLOSSOM EQU $0B6 -MARILL EQU $0B7 -AZUMARILL EQU $0B8 -SUDOWOODO EQU $0B9 -POLITOED EQU $0BA -HOPPIP EQU $0BB -SKIPLOOM EQU $0BC -JUMPLUFF EQU $0BD -AIPOM EQU $0BE -SUNKERN EQU $0BF -SUNFLORA EQU $0C0 -YANMA EQU $0C1 -WOOPER EQU $0C2 -QUAGSIRE EQU $0C3 -ESPEON EQU $0C4 -UMBREON EQU $0C5 -MURKROW EQU $0C6 -SLOWKING EQU $0C7 -MISDREAVUS EQU $0C8 -UNOWN EQU $0C9 -WOBBUFFET EQU $0CA -GIRAFARIG EQU $0CB -PINECO EQU $0CC -FORRETRESS EQU $0CD -DUNSPARCE EQU $0CE -GLIGAR EQU $0CF -STEELIX EQU $0D0 -SNUBBULL EQU $0D1 -GRANBULL EQU $0D2 -QWILFISH EQU $0D3 -SCIZOR EQU $0D4 -SHUCKLE EQU $0D5 -HERACROSS EQU $0D6 -SNEASEL EQU $0D7 -TEDDIURSA EQU $0D8 -URSARING EQU $0D9 -SLUGMA EQU $0DA -MAGCARGO EQU $0DB -SWINUB EQU $0DC -PILOSWINE EQU $0DD -CORSOLA EQU $0DE -REMORAID EQU $0DF -OCTILLERY EQU $0E0 -DELIBIRD EQU $0E1 -MANTINE EQU $0E2 -SKARMORY EQU $0E3 -HOUNDOUR EQU $0E4 -HOUNDOOM EQU $0E5 -KINGDRA EQU $0E6 -PHANPY EQU $0E7 -DONPHAN EQU $0E8 -PORYGON2 EQU $0E9 -STANTLER EQU $0EA -SMEARGLE EQU $0EB -TYROGUE EQU $0EC -HITMONTOP EQU $0ED -SMOOCHUM EQU $0EE -ELEKID EQU $0EF -MAGBY EQU $0F0 -MILTANK EQU $0F1 -BLISSEY EQU $0F2 -RAIKOU EQU $0F3 -ENTEI EQU $0F4 -SUICUNE EQU $0F5 -LARVITAR EQU $0F6 -PUPITAR EQU $0F7 -TYRANITAR EQU $0F8 -LUGIA EQU $0F9 -HO_OH EQU $0FA ; HO-OH -CELEBI EQU $0FB -TREECKO EQU $0FC -GROVYLE EQU $0FD -SCEPTILE EQU $0FE -TORCHIC EQU $0FF -COMBUSKEN EQU $100 -BLAZIKEN EQU $101 -MUDKIP EQU $102 -MARSHTOMP EQU $103 -SWAMPERT EQU $104 -POOCHYENA EQU $105 -MIGHTYENA EQU $106 -ZIGZAGOON EQU $107 -LINOONE EQU $108 -WURMPLE EQU $109 -SILCOON EQU $10A -BEAUTIFLY EQU $10B -CASCOON EQU $10C -DUSTOX EQU $10D -LOTAD EQU $10E -LOMBRE EQU $10F -LUDICOLO EQU $110 -SEEDOT EQU $111 -NUZLEAF EQU $112 -SHIFTRY EQU $113 -TAILLOW EQU $114 -SWELLOW EQU $115 -WINGULL EQU $116 -PELIPPER EQU $117 -RALTS EQU $118 -KIRLIA EQU $119 -GARDEVOIR EQU $11A -SURSKIT EQU $11B -MASQUERAIN EQU $11C -SHROOMISH EQU $11D -BRELOOM EQU $11E -SLAKOTH EQU $11F -VIGOROTH EQU $120 -SLAKING EQU $121 -NINCADA EQU $122 -NINJASK EQU $123 -SHEDINJA EQU $124 -WHISMUR EQU $125 -LOUDRED EQU $126 -EXPLOUD EQU $127 -MAKUHITA EQU $128 -HARIYAMA EQU $129 -AZURILL EQU $12A -NOSEPASS EQU $12B -SKITTY EQU $12C -DELCATTY EQU $12D -SABLEYE EQU $12E -MAWILE EQU $12F -ARON EQU $130 -LAIRON EQU $131 -AGGRON EQU $132 -MEDITITE EQU $133 -MEDICHAM EQU $134 -ELECTRIKE EQU $135 -MANECTRIC EQU $136 -PLUSLE EQU $137 -MINUN EQU $138 -VOLBEAT EQU $139 -ILLUMISE EQU $13A -ROSELIA EQU $13B -GULPIN EQU $13C -SWALOT EQU $13D -CARVANHA EQU $13E -SHARPEDO EQU $13F -WAILMER EQU $140 -WAILORD EQU $141 -NUMEL EQU $142 -CAMERUPT EQU $143 -TORKOAL EQU $144 -SPOINK EQU $145 -GRUMPIG EQU $146 -SPINDA EQU $147 -TRAPINCH EQU $148 -VIBRAVA EQU $149 -FLYGON EQU $14A -CACNEA EQU $14B -CACTURNE EQU $14C -SWABLU EQU $14D -ALTARIA EQU $14E -ZANGOOSE EQU $14F -SEVIPER EQU $150 -LUNATONE EQU $151 -SOLROCK EQU $152 -BARBOACH EQU $153 -WHISCASH EQU $154 -CORPHISH EQU $155 -CRAWDAUNT EQU $156 -BALTOY EQU $157 -CLAYDOL EQU $158 -LILEEP EQU $159 -CRADILY EQU $15A -ANORITH EQU $15B -ARMALDO EQU $15C -FEEBAS EQU $15D -MILOTIC EQU $15E -CASTFORM EQU $15F -KECLEON EQU $160 -SHUPPET EQU $161 -BANETTE EQU $162 -DUSKULL EQU $163 -DUSCLOPS EQU $164 -TROPIUS EQU $165 -CHIMECHO EQU $166 -ABSOL EQU $167 -WYNAUT EQU $168 -SNORUNT EQU $169 -GLALIE EQU $16A -SPHEAL EQU $16B -SEALEO EQU $16C -WALREIN EQU $16D -CLAMPERL EQU $16E -HUNTAIL EQU $16F -GOREBYSS EQU $170 -RELICANTH EQU $171 -LUVDISC EQU $172 -BAGON EQU $173 -SHELGON EQU $174 -SALAMENCE EQU $175 -BELDUM EQU $176 -METANG EQU $177 -METAGROSS EQU $178 -REGIROCK EQU $179 -REGICE EQU $17A -REGISTEEL EQU $17B -LATIAS EQU $17C -LATIOS EQU $17D -KYOGRE EQU $17E -GROUDON EQU $17F -RAYQUAZA EQU $180 -JIRACHI EQU $181 -DEOXYS EQU $182 -TURTWIG EQU $183 -GROTLE EQU $184 -TORTERRA EQU $185 -CHIMCHAR EQU $186 -MONFERNO EQU $187 -INFERNAPE EQU $188 -PIPLUP EQU $189 -PRINPLUP EQU $18A -EMPOLEON EQU $18B -STARLY EQU $18C -STARAVIA EQU $18D -STARAPTOR EQU $18E -BIDOOF EQU $18F -BIBAREL EQU $190 -KRICKETOT EQU $191 -KRICKETUNE EQU $192 -SHINX EQU $193 -LUXIO EQU $194 -LUXRAY EQU $195 -BUDEW EQU $196 -ROSERADE EQU $197 -CRANIDOS EQU $198 -RAMPARDOS EQU $199 -SHIELDON EQU $19A -BASTIODON EQU $19B -BURMY EQU $19C -WORMADAM EQU $19D -MOTHIM EQU $19E -COMBEE EQU $19F -VESPIQUEN EQU $1A0 -PACHIRISU EQU $1A1 -BUIZEL EQU $1A2 -FLOATZEL EQU $1A3 -CHERUBI EQU $1A4 -CHERRIM EQU $1A5 -SHELLOS EQU $1A6 -GASTRODON EQU $1A7 -AMBIPOM EQU $1A8 -DRIFLOON EQU $1A9 -DRIFBLIM EQU $1AA -BUNEARY EQU $1AB -LOPUNNY EQU $1AC -MISMAGIUS EQU $1AD -HONCHKROW EQU $1AE -GLAMEOW EQU $1AF -PURUGLY EQU $1B0 -CHINGLING EQU $1B1 -STUNKY EQU $1B2 -SKUNTANK EQU $1B3 -BRONZOR EQU $1B4 -BRONZONG EQU $1B5 -BONSLY EQU $1B6 -MIME_JR EQU $1B7 -HAPPINY EQU $1B8 -CHATOT EQU $1B9 -SPIRITOMB EQU $1BA -GIBLE EQU $1BB -GABITE EQU $1BC -GARCHOMP EQU $1BD -MUNCHLAX EQU $1BE -RIOLU EQU $1BF -LUCARIO EQU $1C0 -HIPPOPOTAS EQU $1C1 -HIPPOWDON EQU $1C2 -SKORUPI EQU $1C3 -DRAPION EQU $1C4 -CROAGUNK EQU $1C5 -TOXICROAK EQU $1C6 -CARNIVINE EQU $1C7 -FINNEON EQU $1C8 -LUMINEON EQU $1C9 -MANTYKE EQU $1CA -SNOVER EQU $1CB -ABOMASNOW EQU $1CC -WEAVILE EQU $1CD -MAGNEZONE EQU $1CE -LICKILICKY EQU $1CF -RHYPERIOR EQU $1D0 -TANGROWTH EQU $1D1 -ELECTIVIRE EQU $1D2 -MAGMORTAR EQU $1D3 -TOGEKISS EQU $1D4 -YANMEGA EQU $1D5 -LEAFEON EQU $1D6 -GLACEON EQU $1D7 -GLISCOR EQU $1D8 -MAMOSWINE EQU $1D9 -PORYGON_Z EQU $1DA -GALLADE EQU $1DB -PROBOPASS EQU $1DC -DUSKNOIR EQU $1DD -FROSLASS EQU $1DE -ROTOM EQU $1DF -UXIE EQU $1E0 -MESPRIT EQU $1E1 -AZELF EQU $1E2 -DIALGA EQU $1E3 -PALKIA EQU $1E4 -HEATRAN EQU $1E5 -REGIGIGAS EQU $1E6 -GIRATINA EQU $1E7 -CRESSELIA EQU $1E8 -PHIONE EQU $1E9 -MANAPHY EQU $1EA -DARKRAI EQU $1EB -SHAYMIN EQU $1EC -ARCEUS EQU $1ED -VICTINI EQU $1EE -SNIVY EQU $1EF -SERVINE EQU $1F0 -SERPERIOR EQU $1F1 -TEPIG EQU $1F2 -PIGNITE EQU $1F3 -EMBOAR EQU $1F4 -OSHAWOTT EQU $1F5 -DEWOTT EQU $1F6 -SAMUROTT EQU $1F7 -PATRAT EQU $1F8 -WATCHOG EQU $1F9 -LILLIPUP EQU $1FA -HERDIER EQU $1FB -STOUTLAND EQU $1FC -PURRLOIN EQU $1FD -LIEPARD EQU $1FE -PANSAGE EQU $1FF -SIMISAGE EQU $200 -PANSEAR EQU $201 -SIMISEAR EQU $202 -PANPOUR EQU $203 -SIMIPOUR EQU $204 -MUNNA EQU $205 -MUSHARNA EQU $206 -PIDOVE EQU $207 -TRANQUILL EQU $208 -UNFEZANT EQU $209 -BLITZLE EQU $20A -ZEBSTRIKA EQU $20B -ROGGENROLA EQU $20C -BOLDORE EQU $20D -GIGALITH EQU $20E -WOOBAT EQU $20F -SWOOBAT EQU $210 -DRILBUR EQU $211 -EXCADRILL EQU $212 -AUDINO EQU $213 -TIMBURR EQU $214 -GURDURR EQU $215 -CONKELDURR EQU $216 -TYMPOLE EQU $217 -PALPITOAD EQU $218 -SEISMITOAD EQU $219 -THROH EQU $21A -SAWK EQU $21B -SEWADDLE EQU $21C -SWADLOON EQU $21D -LEAVANNY EQU $21E -VENIPEDE EQU $21F -WHIRLIPEDE EQU $220 -SCOLIPEDE EQU $221 -COTTONEE EQU $222 -WHIMSICOTT EQU $223 -PETILIL EQU $224 -LILLIGANT EQU $225 -BASCULIN EQU $226 -SANDILE EQU $227 -KROKOROK EQU $228 -KROOKODILE EQU $229 -DARUMAKA EQU $22A -DARMANITAN EQU $22B -MARACTUS EQU $22C -DWEBBLE EQU $22D -CRUSTLE EQU $22E -SCRAGGY EQU $22F -SCRAFTY EQU $230 -SIGILYPH EQU $231 -YAMASK EQU $232 -COFAGRIGUS EQU $233 -TIRTOUGA EQU $234 -CARRACOSTA EQU $235 -ARCHEN EQU $236 -ARCHEOPS EQU $237 -TRUBBISH EQU $238 -GARBODOR EQU $239 -ZORUA EQU $23A -ZOROARK EQU $23B -MINCCINO EQU $23C -CINCCINO EQU $23D -GOTHITA EQU $23E -GOTHORITA EQU $23F -GOTHITELLE EQU $240 -SOLOSIS EQU $241 -DUOSION EQU $242 -REUNICLUS EQU $243 -DUCKLETT EQU $244 -SWANNA EQU $245 -VANILLITE EQU $246 -VANILLISH EQU $247 -VANILLUXE EQU $248 -DEERLING EQU $249 -SAWSBUCK EQU $24A -EMOLGA EQU $24B -KARRABLAST EQU $24C -ESCAVALIER EQU $24D -FOONGUS EQU $24E -AMOONGUSS EQU $24F -FRILLISH EQU $250 -JELLICENT EQU $251 -ALOMOMOLA EQU $252 -JOLTIK EQU $253 -GALVANTULA EQU $254 -FERROSEED EQU $255 -FERROTHORN EQU $256 -KLINK EQU $257 -KLANG EQU $258 -KLINKLANG EQU $259 -TYNAMO EQU $25A -EELEKTRIK EQU $25B -EELEKTROSS EQU $25C -ELGYEM EQU $25D -BEHEEYEM EQU $25E -LITWICK EQU $25F -LAMPENT EQU $260 -CHANDELURE EQU $261 -AXEW EQU $262 -FRAXURE EQU $263 -HAXORUS EQU $264 -CUBCHOO EQU $265 -BEARTIC EQU $266 -CRYOGONAL EQU $267 -SHELMET EQU $268 -ACCELGOR EQU $269 -STUNFISK EQU $26A -MIENFOO EQU $26B -MIENSHAO EQU $26C -DRUDDIGON EQU $26D -GOLETT EQU $26E -GOLURK EQU $26F -PAWNIARD EQU $270 -BISHARP EQU $271 -BOUFFALANT EQU $272 -RUFFLET EQU $273 -BRAVIARY EQU $274 -VULLABY EQU $275 -MANDIBUZZ EQU $276 -HEATMOR EQU $277 -DURANT EQU $278 -DEINO EQU $279 -ZWEILOUS EQU $27A -HYDREIGON EQU $27B -LARVESTA EQU $27C -VOLCARONA EQU $27D -COBALION EQU $27E -TERRAKION EQU $27F -VIRIZION EQU $280 -TORNADUS EQU $281 -THUNDURUS EQU $282 -RESHIRAM EQU $283 -ZEKROM EQU $284 -LANDORUS EQU $285 -KYUREM EQU $286 -KELDEO EQU $287 -MELOETTA EQU $288 -GENESECT EQU $289 -CHESPIN EQU $28A -QUILLADIN EQU $28B -CHESNAUGHT EQU $28C -FENNEKIN EQU $28D -BRAIXEN EQU $28E -DELPHOX EQU $28F -FROAKIE EQU $290 -FROGADIER EQU $291 -GRENINJA EQU $292 -BUNNELBY EQU $293 -DIGGERSBY EQU $294 -FLETCHLING EQU $295 -FLETCHINDER EQU $296 -TALONFLAME EQU $297 -SCATTERBUG EQU $298 -SPEWPA EQU $299 -VIVILLON EQU $29A -LITLEO EQU $29B -PYROAR EQU $29C -FLABEBE EQU $29D -FLOETTE EQU $29E -FLORGES EQU $29F -SKIDDO EQU $2A0 -GOGOAT EQU $2A1 -PANCHAM EQU $2A2 -PANGORO EQU $2A3 -FURFROU EQU $2A4 -ESPURR EQU $2A5 -MEOWSTIC EQU $2A6 -HONEDGE EQU $2A7 -DOUBLADE EQU $2A8 -AEGISLASH EQU $2A9 -SPRITZEE EQU $2AA -AROMATISSE EQU $2AB -SWIRLIX EQU $2AC -SLURPUFF EQU $2AD -INKAY EQU $2AE -MALAMAR EQU $2AF -BINACLE EQU $2B0 -BARBARACLE EQU $2B1 -SKRELP EQU $2B2 -DRAGALGE EQU $2B3 -CLAUNCHER EQU $2B4 -CLAWITZER EQU $2B5 -HELIOPTILE EQU $2B6 -HELIOLISK EQU $2B7 -TYRUNT EQU $2B8 -TYRANTRUM EQU $2B9 -AMAURA EQU $2BA -AURORUS EQU $2BB -SYLVEON EQU $2BC -HAWLUCHA EQU $2BD -DEDENNE EQU $2BE -CARBINK EQU $2BF -GOOMY EQU $2C0 -SLIGGOO EQU $2C1 -GOODRA EQU $2C2 -KLEFKI EQU $2C3 -PHANTUMP EQU $2C4 -TREVENANT EQU $2C5 -PUMPKABOO EQU $2C6 -GOURGEIST EQU $2C7 -BERGMITE EQU $2C8 -AVALUGG EQU $2C9 -NOIBAT EQU $2CA -NOIVERN EQU $2CB -XERNEAS EQU $2CC -YVELTAL EQU $2CD -ZYGARDE EQU $2CE -DIANCIE EQU $2CF -HOOPA EQU $2D0 -VOLCANION EQU $2D1 -ROWLET EQU $2D2 -DARTRIX EQU $2D3 -DECIDUEYE EQU $2D4 -LITTEN EQU $2D5 -TORRACAT EQU $2D6 -INCINEROAR EQU $2D7 -POPPLIO EQU $2D8 -BRIONNE EQU $2D9 -PRIMARINA EQU $2DA -PIKIPEK EQU $2DB -TRUMBEAK EQU $2DC -TOUCANNON EQU $2DD -YUNGOOS EQU $2DE -GUMSHOOS EQU $2DF -GRUBBIN EQU $2E0 -CHARJABUG EQU $2E1 -VIKAVOLT EQU $2E2 -CRABRAWLER EQU $2E3 -CRABOMINABLE EQU $2E4 -ORICORIO EQU $2E5 -CUTIEFLY EQU $2E6 -RIBOMBEE EQU $2E7 -ROCKRUFF EQU $2E8 -LYCANROC EQU $2E9 -WISHIWASHI EQU $2EA -MAREANIE EQU $2EB -TOXAPEX EQU $2EC -MUDBRAY EQU $2ED -MUDSDALE EQU $2EE -DEWPIDER EQU $2EF -ARAQUANID EQU $2F0 -FOMANTIS EQU $2F1 -LURANTIS EQU $2F2 -MORELULL EQU $2F3 -SHIINOTIC EQU $2F4 -SALANDIT EQU $2F5 -SALAZZLE EQU $2F6 -STUFFUL EQU $2F7 -BEWEAR EQU $2F8 -BOUNSWEET EQU $2F9 -STEENEE EQU $2FA -TSAREENA EQU $2FB -COMFEY EQU $2FC -ORANGURU EQU $2FD -PASSIMIAN EQU $2FE -WIMPOD EQU $2FF -GOLISOPOD EQU $300 -SANDYGAST EQU $301 -PALOSSAND EQU $302 -PYUKUMUKU EQU $303 -TYPE_NULL EQU $304 -SILVALLY EQU $305 -MINIOR EQU $306 -KOMALA EQU $307 -TURTONATOR EQU $308 -TOGEDEMARU EQU $309 -MIMIKYU EQU $30A -BRUXISH EQU $30B -DRAMPA EQU $30C -DHELMISE EQU $30D -JANGMO_O EQU $30E -HAKAMO_O EQU $30F -KOMMO_O EQU $310 -TAPU_KOKO EQU $311 -TAPU_LELE EQU $312 -TAPU_BULU EQU $313 -TAPU_FINI EQU $314 -COSMOG EQU $315 -COSMOEM EQU $316 -SOLGALEO EQU $317 -LUNALA EQU $318 -NIHILEGO EQU $319 -BUZZWOLE EQU $31A -PHEROMOSA EQU $31B -XURKITREE EQU $31C -CELESTEELA EQU $31D -KARTANA EQU $31E -GUZZLORD EQU $31F -NECROZMA EQU $320 -MAGEARNA EQU $321 -MARSHADOW EQU $322 -POIPOLE EQU $323 -NAGANADEL EQU $324 -STAKATAKA EQU $325 -BLACEPHALON EQU $326 -ZERAORA EQU $327 -MELTAN EQU $328 -MELMETAL EQU $329 -GROOKEY EQU $32A -THWACKEY EQU $32B -RILLABOOM EQU $32C -SCORBUNNY EQU $32D -RABOOT EQU $32E -CINDERACE EQU $32F -SOBBLE EQU $330 -DRIZZILE EQU $331 -INTELEON EQU $332 -SKWOVET EQU $333 -GREEDENT EQU $334 -ROOKIDEE EQU $335 -CORVISQUIRE EQU $336 -CORVIKNIGHT EQU $337 -BLIPBUG EQU $338 -DOTTLER EQU $339 -ORBEETLE EQU $33A -NICKIT EQU $33B -THIEVUL EQU $33C -GOSSIFLEUR EQU $33D -ELDEGOSS EQU $33E -WOOLOO EQU $33F -DUBWOOL EQU $340 -CHEWTLE EQU $341 -DREDNAW EQU $342 -YAMPER EQU $343 -BOLTUND EQU $344 -ROLYCOLY EQU $345 -CARKOL EQU $346 -COALOSSAL EQU $347 -APPLIN EQU $348 -FLAPPLE EQU $349 -APPLETUN EQU $34A -SILICOBRA EQU $34B -SANDACONDA EQU $34C -CRAMORANT EQU $34D -ARROKUDA EQU $34E -BARRASKEWDA EQU $34F -TOXEL EQU $350 -TOXTRICITY EQU $351 -SIZZLIPEDE EQU $352 -CENTISKORCH EQU $353 -CLOBBOPUS EQU $354 -GRAPPLOCT EQU $355 -SINISTEA EQU $356 -POLTEAGEIST EQU $357 -HATENNA EQU $358 -HATTREM EQU $359 -HATTERENE EQU $35A -IMPIDIMP EQU $35B -MORGREM EQU $35C -GRIMMSNARL EQU $35D -OBSTAGOON EQU $35E -PERRSERKER EQU $35F -CURSOLA EQU $360 -SIRFETCHD EQU $361 -MR_RIME EQU $362 -RUNERIGUS EQU $363 -MILCERY EQU $364 -ALCREMIE EQU $365 -FALINKS EQU $366 -PINCURCHIN EQU $367 -SNOM EQU $368 -FROSMOTH EQU $369 -STONJOURNER EQU $36A -EISCUE EQU $36B -INDEEDEE EQU $36C -MORPEKO EQU $36D -CUFANT EQU $36E -COPPERAJAH EQU $36F -DRACOZOLT EQU $370 -ARCTOZOLT EQU $371 -DRACOVISH EQU $372 -ARCTOVISH EQU $373 -DURALUDON EQU $374 -DREEPY EQU $375 -DRAKLOAK EQU $376 -DRAGAPULT EQU $377 -ZACIAN EQU $378 -ZAMAZENTA EQU $379 -ETERNATUS EQU $37A -KUBFU EQU $37B -URSHIFU EQU $37C -ZARUDE EQU $37D -REGIELEKI EQU $37E -REGIDRAGO EQU $37F -GLASTRIER EQU $380 -SPECTRIER EQU $381 -CALYREX EQU $382 -VENUSAUR_MEGA EQU $383 -CHARIZARD_MEGA_X EQU $384 -CHARIZARD_MEGA_Y EQU $385 -BLASTOISE_MEGA EQU $386 -BEEDRILL_MEGA EQU $387 -PIDGEOT_MEGA EQU $388 -ALAKAZAM_MEGA EQU $389 -SLOWBRO_MEGA EQU $38A -GENGAR_MEGA EQU $38B -KANGASKHAN_MEGA EQU $38C -PINSIR_MEGA EQU $38D -GYARADOS_MEGA EQU $38E -AERODACTYL_MEGA EQU $38F -MEWTWO_MEGA_X EQU $390 -MEWTWO_MEGA_Y EQU $391 -AMPHAROS_MEGA EQU $392 -STEELIX_MEGA EQU $393 -SCIZOR_MEGA EQU $394 -HERACROSS_MEGA EQU $395 -HOUNDOOM_MEGA EQU $396 -TYRANITAR_MEGA EQU $397 -SCEPTILE_MEGA EQU $398 -BLAZIKEN_MEGA EQU $399 -SWAMPERT_MEGA EQU $39A -GARDEVOIR_MEGA EQU $39B -SABLEYE_MEGA EQU $39C -MAWILE_MEGA EQU $39D -AGGRON_MEGA EQU $39E -MEDICHAM_MEGA EQU $39F -MANECTRIC_MEGA EQU $3A0 -SHARPEDO_MEGA EQU $3A1 -CAMERUPT_MEGA EQU $3A2 -ALTARIA_MEGA EQU $3A3 -BANETTE_MEGA EQU $3A4 -ABSOL_MEGA EQU $3A5 -GLALIE_MEGA EQU $3A6 -SALAMENCE_MEGA EQU $3A7 -METAGROSS_MEGA EQU $3A8 -LATIAS_MEGA EQU $3A9 -LATIOS_MEGA EQU $3AA -LOPUNNY_MEGA EQU $3AB -GARCHOMP_MEGA EQU $3AC -LUCARIO_MEGA EQU $3AD -ABOMASNOW_MEGA EQU $3AE -GALLADE_MEGA EQU $3AF -AUDINO_MEGA EQU $3B0 -DIANCIE_MEGA EQU $3B1 -RAYQUAZA_MEGA EQU $3B2 -KYOGRE_PRIMAL EQU $3B3 -GROUDON_PRIMAL EQU $3B4 -RATTATA_ALOLAN EQU $3B5 -RATICATE_ALOLAN EQU $3B6 -RAICHU_ALOLAN EQU $3B7 -SANDSHREW_ALOLAN EQU $3B8 -SANDSLASH_ALOLAN EQU $3B9 -VULPIX_ALOLAN EQU $3BA -NINETALES_ALOLAN EQU $3BB -DIGLETT_ALOLAN EQU $3BC -DUGTRIO_ALOLAN EQU $3BD -MEOWTH_ALOLAN EQU $3BE -PERSIAN_ALOLAN EQU $3BF -GEODUDE_ALOLAN EQU $3C0 -GRAVELER_ALOLAN EQU $3C1 -GOLEM_ALOLAN EQU $3C2 -GRIMER_ALOLAN EQU $3C3 -MUK_ALOLAN EQU $3C4 -EXEGGUTOR_ALOLAN EQU $3C5 -MAROWAK_ALOLAN EQU $3C6 -MEOWTH_GALARIAN EQU $3C7 -PONYTA_GALARIAN EQU $3C8 -RAPIDASH_GALARIAN EQU $3C9 -SLOWPOKE_GALARIAN EQU $3CA -SLOWBRO_GALARIAN EQU $3CB -FARFETCHD_GALARIAN EQU $3CC -WEEZING_GALARIAN EQU $3CD -MR_MIME_GALARIAN EQU $3CE -ARTICUNO_GALARIAN EQU $3CF -ZAPDOS_GALARIAN EQU $3D0 -MOLTRES_GALARIAN EQU $3D1 -SLOWKING_GALARIAN EQU $3D2 -CORSOLA_GALARIAN EQU $3D3 -ZIGZAGOON_GALARIAN EQU $3D4 -LINOONE_GALARIAN EQU $3D5 -DARUMAKA_GALARIAN EQU $3D6 -DARMANITAN_GALARIAN EQU $3D7 -YAMASK_GALARIAN EQU $3D8 -STUNFISK_GALARIAN EQU $3D9 -PIKACHU_COSPLAY EQU $3DA -PIKACHU_ROCK_STAR EQU $3DB -PIKACHU_BELLE EQU $3DC -PIKACHU_POP_STAR EQU $3DD -PIKACHU_PH_D EQU $3DE -PIKACHU_LIBRE EQU $3DF -PIKACHU_ORIGINAL_CAP EQU $3E0 -PIKACHU_HOENN_CAP EQU $3E1 -PIKACHU_SINNOH_CAP EQU $3E2 -PIKACHU_UNOVA_CAP EQU $3E3 -PIKACHU_KALOS_CAP EQU $3E4 -PIKACHU_ALOLA_CAP EQU $3E5 -PIKACHU_PARTNER_CAP EQU $3E6 -PIKACHU_WORLD_CAP EQU $3E7 -PICHU_SPIKY_EARED EQU $3E8 -UNOWN_B EQU $3E9 -UNOWN_C EQU $3EA -UNOWN_D EQU $3EB -UNOWN_E EQU $3EC -UNOWN_F EQU $3ED -UNOWN_G EQU $3EE -UNOWN_H EQU $3EF -UNOWN_I EQU $3F0 -UNOWN_J EQU $3F1 -UNOWN_K EQU $3F2 -UNOWN_L EQU $3F3 -UNOWN_M EQU $3F4 -UNOWN_N EQU $3F5 -UNOWN_O EQU $3F6 -UNOWN_P EQU $3F7 -UNOWN_Q EQU $3F8 -UNOWN_R EQU $3F9 -UNOWN_S EQU $3FA -UNOWN_T EQU $3FB -UNOWN_U EQU $3FC -UNOWN_V EQU $3FD -UNOWN_W EQU $3FE -UNOWN_X EQU $3FF -UNOWN_Y EQU $400 -UNOWN_Z EQU $401 -UNOWN_EMARK EQU $402 -UNOWN_QMARK EQU $403 -CASTFORM_SUNNY EQU $404 -CASTFORM_RAINY EQU $405 -CASTFORM_SNOWY EQU $406 -DEOXYS_ATTACK EQU $407 -DEOXYS_DEFENSE EQU $408 -DEOXYS_SPEED EQU $409 -BURMY_SANDY_CLOAK EQU $40A -BURMY_TRASH_CLOAK EQU $40B -WORMADAM_SANDY_CLOAK EQU $40C -WORMADAM_TRASH_CLOAK EQU $40D -CHERRIM_SUNSHINE EQU $40E -SHELLOS_EAST_SEA EQU $40F -GASTRODON_EAST_SEA EQU $410 -ROTOM_HEAT EQU $411 -ROTOM_WASH EQU $412 -ROTOM_FROST EQU $413 -ROTOM_FAN EQU $414 -ROTOM_MOW EQU $415 -GIRATINA_ORIGIN EQU $416 -SHAYMIN_SKY EQU $417 -ARCEUS_FIGHTING EQU $418 -ARCEUS_FLYING EQU $419 -ARCEUS_POISON EQU $41A -ARCEUS_GROUND EQU $41B -ARCEUS_ROCK EQU $41C -ARCEUS_BUG EQU $41D -ARCEUS_GHOST EQU $41E -ARCEUS_STEEL EQU $41F -ARCEUS_FIRE EQU $420 -ARCEUS_WATER EQU $421 -ARCEUS_GRASS EQU $422 -ARCEUS_ELECTRIC EQU $423 -ARCEUS_PSYCHIC EQU $424 -ARCEUS_ICE EQU $425 -ARCEUS_DRAGON EQU $426 -ARCEUS_DARK EQU $427 -ARCEUS_FAIRY EQU $428 -BASCULIN_BLUE_STRIPED EQU $429 -DARMANITAN_ZEN_MODE EQU $42A -DARMANITAN_ZEN_MODE_GALARIAN EQU $42B -DEERLING_SUMMER EQU $42C -DEERLING_AUTUMN EQU $42D -DEERLING_WINTER EQU $42E -SAWSBUCK_SUMMER EQU $42F -SAWSBUCK_AUTUMN EQU $430 -SAWSBUCK_WINTER EQU $431 -TORNADUS_THERIAN EQU $432 -THUNDURUS_THERIAN EQU $433 -LANDORUS_THERIAN EQU $434 -KYUREM_WHITE EQU $435 -KYUREM_BLACK EQU $436 -KELDEO_RESOLUTE EQU $437 -MELOETTA_PIROUETTE EQU $438 -GENESECT_DOUSE_DRIVE EQU $439 -GENESECT_SHOCK_DRIVE EQU $43A -GENESECT_BURN_DRIVE EQU $43B -GENESECT_CHILL_DRIVE EQU $43C -GRENINJA_BATTLE_BOND EQU $43D -GRENINJA_ASH EQU $43E -VIVILLON_POLAR EQU $43F -VIVILLON_TUNDRA EQU $440 -VIVILLON_CONTINENTAL EQU $441 -VIVILLON_GARDEN EQU $442 -VIVILLON_ELEGANT EQU $443 -VIVILLON_MEADOW EQU $444 -VIVILLON_MODERN EQU $445 -VIVILLON_MARINE EQU $446 -VIVILLON_ARCHIPELAGO EQU $447 -VIVILLON_HIGH_PLAINS EQU $448 -VIVILLON_SANDSTORM EQU $449 -VIVILLON_RIVER EQU $44A -VIVILLON_MONSOON EQU $44B -VIVILLON_SAVANNA EQU $44C -VIVILLON_SUN EQU $44D -VIVILLON_OCEAN EQU $44E -VIVILLON_JUNGLE EQU $44F -VIVILLON_FANCY EQU $450 -VIVILLON_POKE_BALL EQU $451 -FLABEBE_YELLOW_FLOWER EQU $452 -FLABEBE_ORANGE_FLOWER EQU $453 -FLABEBE_BLUE_FLOWER EQU $454 -FLABEBE_WHITE_FLOWER EQU $455 -FLOETTE_YELLOW_FLOWER EQU $456 -FLOETTE_ORANGE_FLOWER EQU $457 -FLOETTE_BLUE_FLOWER EQU $458 -FLOETTE_WHITE_FLOWER EQU $459 -FLOETTE_ETERNAL_FLOWER EQU $45A -FLORGES_YELLOW_FLOWER EQU $45B -FLORGES_ORANGE_FLOWER EQU $45C -FLORGES_BLUE_FLOWER EQU $45D -FLORGES_WHITE_FLOWER EQU $45E -FURFROU_HEART_TRIM EQU $45F -FURFROU_STAR_TRIM EQU $460 -FURFROU_DIAMOND_TRIM EQU $461 -FURFROU_DEBUTANTE_TRIM EQU $462 -FURFROU_MATRON_TRIM EQU $463 -FURFROU_DANDY_TRIM EQU $464 -FURFROU_LA_REINE_TRIM EQU $465 -FURFROU_KABUKI_TRIM EQU $466 -FURFROU_PHARAOH_TRIM EQU $467 -MEOWSTIC_FEMALE EQU $468 -AEGISLASH_BLADE EQU $469 -PUMPKABOO_SMALL EQU $46A -PUMPKABOO_LARGE EQU $46B -PUMPKABOO_SUPER EQU $46C -GOURGEIST_SMALL EQU $46D -GOURGEIST_LARGE EQU $46E -GOURGEIST_SUPER EQU $46F -XERNEAS_ACTIVE EQU $470 -ZYGARDE_10 EQU $471 -ZYGARDE_10_POWER_CONSTRUCT EQU $472 -ZYGARDE_50_POWER_CONSTRUCT EQU $473 -ZYGARDE_COMPLETE EQU $474 -HOOPA_UNBOUND EQU $475 -ORICORIO_POM_POM EQU $476 -ORICORIO_PAU EQU $477 -ORICORIO_SENSU EQU $478 -ROCKRUFF_OWN_TEMPO EQU $479 -LYCANROC_MIDNIGHT EQU $47A -LYCANROC_DUSK EQU $47B -WISHIWASHI_SCHOOL EQU $47C -SILVALLY_FIGHTING EQU $47D -SILVALLY_FLYING EQU $47E -SILVALLY_POISON EQU $47F -SILVALLY_GROUND EQU $480 -SILVALLY_ROCK EQU $481 -SILVALLY_BUG EQU $482 -SILVALLY_GHOST EQU $483 -SILVALLY_STEEL EQU $484 -SILVALLY_FIRE EQU $485 -SILVALLY_WATER EQU $486 -SILVALLY_GRASS EQU $487 -SILVALLY_ELECTRIC EQU $488 -SILVALLY_PSYCHIC EQU $489 -SILVALLY_ICE EQU $48A -SILVALLY_DRAGON EQU $48B -SILVALLY_DARK EQU $48C -SILVALLY_FAIRY EQU $48D -MINIOR_METEOR_ORANGE EQU $48E -MINIOR_METEOR_YELLOW EQU $48F -MINIOR_METEOR_GREEN EQU $490 -MINIOR_METEOR_BLUE EQU $491 -MINIOR_METEOR_INDIGO EQU $492 -MINIOR_METEOR_VIOLET EQU $493 -MINIOR_CORE_RED EQU $494 -MINIOR_CORE_ORANGE EQU $495 -MINIOR_CORE_YELLOW EQU $496 -MINIOR_CORE_GREEN EQU $497 -MINIOR_CORE_BLUE EQU $498 -MINIOR_CORE_INDIGO EQU $499 -MINIOR_CORE_VIOLET EQU $49A -MIMIKYU_BUSTED EQU $49B -NECROZMA_DUSK_MANE EQU $49C -NECROZMA_DAWN_WINGS EQU $49D -NECROZMA_ULTRA EQU $49E -MAGEARNA_ORIGINAL_COLOR EQU $49F -CRAMORANT_GULPING EQU $4A0 -CRAMORANT_GORGING EQU $4A1 -TOXTRICITY_LOW_KEY EQU $4A2 -SINISTEA_ANTIQUE EQU $4A3 -POLTEAGEIST_ANTIQUE EQU $4A4 -ALCREMIE_RUBY_CREAM EQU $4A5 -ALCREMIE_MATCHA_CREAM EQU $4A6 -ALCREMIE_MINT_CREAM EQU $4A7 -ALCREMIE_LEMON_CREAM EQU $4A8 -ALCREMIE_SALTED_CREAM EQU $4A9 -ALCREMIE_RUBY_SWIRL EQU $4AA -ALCREMIE_CARAMEL_SWIRL EQU $4AB -ALCREMIE_RAINBOW_SWIRL EQU $4AC -EISCUE_NOICE_FACE EQU $4AD -INDEEDEE_FEMALE EQU $4AE -MORPEKO_HANGRY EQU $4AF -ZACIAN_CROWNED_SWORD EQU $4B0 -ZAMAZENTA_CROWNED_SHIELD EQU $4B1 -ETERNATUS_ETERNAMAX EQU $4B2 -URSHIFU_RAPID_STRIKE_STYLE EQU $4B3 -ZARUDE_DADA EQU $4B4 -CALYREX_ICE_RIDER EQU $4B5 -CALYREX_SHADOW_RIDER EQU $4B6 \ No newline at end of file +FORMS_START EQU ENAMORUS + +; Megas +VENUSAUR_MEGA EQU FORMS_START + 1 +CHARIZARD_MEGA_X EQU FORMS_START + 2 +CHARIZARD_MEGA_Y EQU FORMS_START + 3 +BLASTOISE_MEGA EQU FORMS_START + 4 +BEEDRILL_MEGA EQU FORMS_START + 5 +PIDGEOT_MEGA EQU FORMS_START + 6 +ALAKAZAM_MEGA EQU FORMS_START + 7 +SLOWBRO_MEGA EQU FORMS_START + 8 +GENGAR_MEGA EQU FORMS_START + 9 +KANGASKHAN_MEGA EQU FORMS_START + 10 +PINSIR_MEGA EQU FORMS_START + 11 +GYARADOS_MEGA EQU FORMS_START + 12 +AERODACTYL_MEGA EQU FORMS_START + 13 +MEWTWO_MEGA_X EQU FORMS_START + 14 +MEWTWO_MEGA_Y EQU FORMS_START + 15 +AMPHAROS_MEGA EQU FORMS_START + 16 +STEELIX_MEGA EQU FORMS_START + 17 +SCIZOR_MEGA EQU FORMS_START + 18 +HERACROSS_MEGA EQU FORMS_START + 19 +HOUNDOOM_MEGA EQU FORMS_START + 20 +TYRANITAR_MEGA EQU FORMS_START + 21 +SCEPTILE_MEGA EQU FORMS_START + 22 +BLAZIKEN_MEGA EQU FORMS_START + 23 +SWAMPERT_MEGA EQU FORMS_START + 24 +GARDEVOIR_MEGA EQU FORMS_START + 25 +SABLEYE_MEGA EQU FORMS_START + 26 +MAWILE_MEGA EQU FORMS_START + 27 +AGGRON_MEGA EQU FORMS_START + 28 +MEDICHAM_MEGA EQU FORMS_START + 29 +MANECTRIC_MEGA EQU FORMS_START + 30 +SHARPEDO_MEGA EQU FORMS_START + 31 +CAMERUPT_MEGA EQU FORMS_START + 32 +ALTARIA_MEGA EQU FORMS_START + 33 +BANETTE_MEGA EQU FORMS_START + 34 +ABSOL_MEGA EQU FORMS_START + 35 +GLALIE_MEGA EQU FORMS_START + 36 +SALAMENCE_MEGA EQU FORMS_START + 37 +METAGROSS_MEGA EQU FORMS_START + 38 +LATIAS_MEGA EQU FORMS_START + 39 +LATIOS_MEGA EQU FORMS_START + 40 +LOPUNNY_MEGA EQU FORMS_START + 41 +GARCHOMP_MEGA EQU FORMS_START + 42 +LUCARIO_MEGA EQU FORMS_START + 43 +ABOMASNOW_MEGA EQU FORMS_START + 44 +GALLADE_MEGA EQU FORMS_START + 45 +AUDINO_MEGA EQU FORMS_START + 46 +DIANCIE_MEGA EQU FORMS_START + 47 + +; Special Mega + Primals +RAYQUAZA_MEGA EQU FORMS_START + 48 +KYOGRE_PRIMAL EQU FORMS_START + 49 +GROUDON_PRIMAL EQU FORMS_START + 50 + +; Alolan Forms +RATTATA_ALOLAN EQU FORMS_START + 51 +RATICATE_ALOLAN EQU FORMS_START + 52 +RAICHU_ALOLAN EQU FORMS_START + 53 +SANDSHREW_ALOLAN EQU FORMS_START + 54 +SANDSLASH_ALOLAN EQU FORMS_START + 55 +VULPIX_ALOLAN EQU FORMS_START + 56 +NINETALES_ALOLAN EQU FORMS_START + 57 +DIGLETT_ALOLAN EQU FORMS_START + 58 +DUGTRIO_ALOLAN EQU FORMS_START + 59 +MEOWTH_ALOLAN EQU FORMS_START + 60 +PERSIAN_ALOLAN EQU FORMS_START + 61 +GEODUDE_ALOLAN EQU FORMS_START + 62 +GRAVELER_ALOLAN EQU FORMS_START + 63 +GOLEM_ALOLAN EQU FORMS_START + 64 +GRIMER_ALOLAN EQU FORMS_START + 65 +MUK_ALOLAN EQU FORMS_START + 66 +EXEGGUTOR_ALOLAN EQU FORMS_START + 67 +MAROWAK_ALOLAN EQU FORMS_START + 68 + +; Galarian Forms +MEOWTH_GALARIAN EQU FORMS_START + 69 +PONYTA_GALARIAN EQU FORMS_START + 70 +RAPIDASH_GALARIAN EQU FORMS_START + 71 +SLOWPOKE_GALARIAN EQU FORMS_START + 72 +SLOWBRO_GALARIAN EQU FORMS_START + 73 +FARFETCHD_GALARIAN EQU FORMS_START + 74 +WEEZING_GALARIAN EQU FORMS_START + 75 +MR_MIME_GALARIAN EQU FORMS_START + 76 +ARTICUNO_GALARIAN EQU FORMS_START + 77 +ZAPDOS_GALARIAN EQU FORMS_START + 78 +MOLTRES_GALARIAN EQU FORMS_START + 79 +SLOWKING_GALARIAN EQU FORMS_START + 80 +CORSOLA_GALARIAN EQU FORMS_START + 81 +ZIGZAGOON_GALARIAN EQU FORMS_START + 82 +LINOONE_GALARIAN EQU FORMS_START + 83 +DARUMAKA_GALARIAN EQU FORMS_START + 84 +DARMANITAN_GALARIAN EQU FORMS_START + 85 +YAMASK_GALARIAN EQU FORMS_START + 86 +STUNFISK_GALARIAN EQU FORMS_START + 87 + +;Hisuian Forms +GROWLITHE_HISUIAN EQU FORMS_START + 88 +ARCANINE_HISUIAN EQU FORMS_START + 89 +VOLTORB_HISUIAN EQU FORMS_START + 90 +ELECTRODE_HISUIAN EQU FORMS_START + 91 +TYPHLOSION_HISUIAN EQU FORMS_START + 92 +QWILFISH_HISUIAN EQU FORMS_START + 93 +SNEASEL_HISUIAN EQU FORMS_START + 94 +SAMUROTT_HISUIAN EQU FORMS_START + 95 +LILLIGANT_HISUIAN EQU FORMS_START + 96 +ZORUA_HISUIAN EQU FORMS_START + 97 +ZOROARK_HISUIAN EQU FORMS_START + 98 +BRAVIARY_HISUIAN EQU FORMS_START + 99 +SLIGGOO_HISUIAN EQU FORMS_START + 100 +GOODRA_HISUIAN EQU FORMS_START + 101 +AVALUGG_HISUIAN EQU FORMS_START + 102 +DECIDUEYE_HISUIAN EQU FORMS_START + 103 + +; Misc Forms + +; Cosplay Pikachu +PIKACHU_COSPLAY EQU FORMS_START + 104 +PIKACHU_ROCK_STAR EQU FORMS_START + 105 +PIKACHU_BELLE EQU FORMS_START + 106 +PIKACHU_POP_STAR EQU FORMS_START + 107 +PIKACHU_PH_D EQU FORMS_START + 108 +PIKACHU_LIBRE EQU FORMS_START + 109 + +; Cap Pikachu +PIKACHU_ORIGINAL_CAP EQU FORMS_START + 110 +PIKACHU_HOENN_CAP EQU FORMS_START + 111 +PIKACHU_SINNOH_CAP EQU FORMS_START + 112 +PIKACHU_UNOVA_CAP EQU FORMS_START + 113 +PIKACHU_KALOS_CAP EQU FORMS_START + 114 +PIKACHU_ALOLA_CAP EQU FORMS_START + 115 +PIKACHU_PARTNER_CAP EQU FORMS_START + 116 +PIKACHU_WORLD_CAP EQU FORMS_START + 117 + +; Pichu +PICHU_SPIKY_EARED EQU FORMS_START + 118 + +; Unown +UNOWN_B EQU FORMS_START + 119 +UNOWN_C EQU FORMS_START + 120 +UNOWN_D EQU FORMS_START + 121 +UNOWN_E EQU FORMS_START + 122 +UNOWN_F EQU FORMS_START + 123 +UNOWN_G EQU FORMS_START + 124 +UNOWN_H EQU FORMS_START + 125 +UNOWN_I EQU FORMS_START + 126 +UNOWN_J EQU FORMS_START + 127 +UNOWN_K EQU FORMS_START + 128 +UNOWN_L EQU FORMS_START + 129 +UNOWN_M EQU FORMS_START + 130 +UNOWN_N EQU FORMS_START + 131 +UNOWN_O EQU FORMS_START + 132 +UNOWN_P EQU FORMS_START + 133 +UNOWN_Q EQU FORMS_START + 134 +UNOWN_R EQU FORMS_START + 135 +UNOWN_S EQU FORMS_START + 136 +UNOWN_T EQU FORMS_START + 137 +UNOWN_U EQU FORMS_START + 138 +UNOWN_V EQU FORMS_START + 139 +UNOWN_W EQU FORMS_START + 140 +UNOWN_X EQU FORMS_START + 141 +UNOWN_Y EQU FORMS_START + 142 +UNOWN_Z EQU FORMS_START + 143 +UNOWN_EMARK EQU FORMS_START + 144 +UNOWN_QMARK EQU FORMS_START + 145 + +; Castform +CASTFORM_SUNNY EQU FORMS_START + 146 +CASTFORM_RAINY EQU FORMS_START + 147 +CASTFORM_SNOWY EQU FORMS_START + 148 + +; Deoxys +DEOXYS_ATTACK EQU FORMS_START + 149 +DEOXYS_DEFENSE EQU FORMS_START + 150 +DEOXYS_SPEED EQU FORMS_START + 151 + +; Burmy +BURMY_SANDY_CLOAK EQU FORMS_START + 152 +BURMY_TRASH_CLOAK EQU FORMS_START + 153 + +; Wormadam +WORMADAM_SANDY_CLOAK EQU FORMS_START + 154 +WORMADAM_TRASH_CLOAK EQU FORMS_START + 155 + +; Cherrim +CHERRIM_SUNSHINE EQU FORMS_START + 156 + +; Shellos +SHELLOS_EAST_SEA EQU FORMS_START + 157 + +; Gastrodon +GASTRODON_EAST_SEA EQU FORMS_START + 158 + +; Rotom +ROTOM_HEAT EQU FORMS_START + 159 +ROTOM_WASH EQU FORMS_START + 160 +ROTOM_FROST EQU FORMS_START + 161 +ROTOM_FAN EQU FORMS_START + 162 +ROTOM_MOW EQU FORMS_START + 163 + +; Origin Forme +DIALGA_ORIGIN EQU FORMS_START + 164 +PALKIA_ORIGIN EQU FORMS_START + 165 +GIRATINA_ORIGIN EQU FORMS_START + 166 + +; Shaymin +SHAYMIN_SKY EQU FORMS_START + 167 + +; Arceus +ARCEUS_FIGHTING EQU FORMS_START + 168 +ARCEUS_FLYING EQU FORMS_START + 169 +ARCEUS_POISON EQU FORMS_START + 170 +ARCEUS_GROUND EQU FORMS_START + 171 +ARCEUS_ROCK EQU FORMS_START + 172 +ARCEUS_BUG EQU FORMS_START + 173 +ARCEUS_GHOST EQU FORMS_START + 174 +ARCEUS_STEEL EQU FORMS_START + 175 +ARCEUS_FIRE EQU FORMS_START + 176 +ARCEUS_WATER EQU FORMS_START + 177 +ARCEUS_GRASS EQU FORMS_START + 178 +ARCEUS_ELECTRIC EQU FORMS_START + 179 +ARCEUS_PSYCHIC EQU FORMS_START + 180 +ARCEUS_ICE EQU FORMS_START + 181 +ARCEUS_DRAGON EQU FORMS_START + 182 +ARCEUS_DARK EQU FORMS_START + 183 +ARCEUS_FAIRY EQU FORMS_START + 184 + +; Basculin +BASCULIN_BLUE_STRIPED EQU FORMS_START + 185 +BASCULIN_WHITE_STRIPED EQU FORMS_START + 186 + +; Darmanitan +DARMANITAN_ZEN_MODE EQU FORMS_START + 187 +DARMANITAN_ZEN_MODE_GALARIAN EQU FORMS_START + 188 + +; Deerling +DEERLING_SUMMER EQU FORMS_START + 189 +DEERLING_AUTUMN EQU FORMS_START + 190 +DEERLING_WINTER EQU FORMS_START + 191 + +; Sawsbuck +SAWSBUCK_SUMMER EQU FORMS_START + 192 +SAWSBUCK_AUTUMN EQU FORMS_START + 193 +SAWSBUCK_WINTER EQU FORMS_START + 194 + +; Therian Forms +TORNADUS_THERIAN EQU FORMS_START + 195 +THUNDURUS_THERIAN EQU FORMS_START + 196 +LANDORUS_THERIAN EQU FORMS_START + 197 +ENAMORUS_THERIAN EQU FORMS_START + 198 + +; Kyurem +KYUREM_WHITE EQU FORMS_START + 199 +KYUREM_BLACK EQU FORMS_START + 200 + +; Keldeo +KELDEO_RESOLUTE EQU FORMS_START + 201 + +; Meloetta +MELOETTA_PIROUETTE EQU FORMS_START + 202 + +; Genesect +GENESECT_DOUSE_DRIVE EQU FORMS_START + 203 +GENESECT_SHOCK_DRIVE EQU FORMS_START + 204 +GENESECT_BURN_DRIVE EQU FORMS_START + 205 +GENESECT_CHILL_DRIVE EQU FORMS_START + 206 + +; Greninja +GRENINJA_BATTLE_BOND EQU FORMS_START + 207 +GRENINJA_ASH EQU FORMS_START + 208 + +; Vivillon +VIVILLON_POLAR EQU FORMS_START + 209 +VIVILLON_TUNDRA EQU FORMS_START + 210 +VIVILLON_CONTINENTAL EQU FORMS_START + 211 +VIVILLON_GARDEN EQU FORMS_START + 212 +VIVILLON_ELEGANT EQU FORMS_START + 213 +VIVILLON_MEADOW EQU FORMS_START + 214 +VIVILLON_MODERN EQU FORMS_START + 215 +VIVILLON_MARINE EQU FORMS_START + 216 +VIVILLON_ARCHIPELAGO EQU FORMS_START + 217 +VIVILLON_HIGH_PLAINS EQU FORMS_START + 218 +VIVILLON_SANDSTORM EQU FORMS_START + 219 +VIVILLON_RIVER EQU FORMS_START + 220 +VIVILLON_MONSOON EQU FORMS_START + 221 +VIVILLON_SAVANNA EQU FORMS_START + 222 +VIVILLON_SUN EQU FORMS_START + 223 +VIVILLON_OCEAN EQU FORMS_START + 224 +VIVILLON_JUNGLE EQU FORMS_START + 225 +VIVILLON_FANCY EQU FORMS_START + 226 +VIVILLON_POKE_BALL EQU FORMS_START + 227 + +; Flabébé +FLABEBE_YELLOW_FLOWER EQU FORMS_START + 228 +FLABEBE_ORANGE_FLOWER EQU FORMS_START + 229 +FLABEBE_BLUE_FLOWER EQU FORMS_START + 230 +FLABEBE_WHITE_FLOWER EQU FORMS_START + 231 + +; Floette +FLOETTE_YELLOW_FLOWER EQU FORMS_START + 232 +FLOETTE_ORANGE_FLOWER EQU FORMS_START + 233 +FLOETTE_BLUE_FLOWER EQU FORMS_START + 234 +FLOETTE_WHITE_FLOWER EQU FORMS_START + 235 +FLOETTE_ETERNAL_FLOWER EQU FORMS_START + 236 + +; Florges +FLORGES_YELLOW_FLOWER EQU FORMS_START + 237 +FLORGES_ORANGE_FLOWER EQU FORMS_START + 238 +FLORGES_BLUE_FLOWER EQU FORMS_START + 239 +FLORGES_WHITE_FLOWER EQU FORMS_START + 240 + +; Furfrou +FURFROU_HEART_TRIM EQU FORMS_START + 241 +FURFROU_STAR_TRIM EQU FORMS_START + 242 +FURFROU_DIAMOND_TRIM EQU FORMS_START + 243 +FURFROU_DEBUTANTE_TRIM EQU FORMS_START + 244 +FURFROU_MATRON_TRIM EQU FORMS_START + 245 +FURFROU_DANDY_TRIM EQU FORMS_START + 246 +FURFROU_LA_REINE_TRIM EQU FORMS_START + 247 +FURFROU_KABUKI_TRIM EQU FORMS_START + 248 +FURFROU_PHARAOH_TRIM EQU FORMS_START + 249 + +; Meowstic +MEOWSTIC_FEMALE EQU FORMS_START + 250 + +; Aegislash +AEGISLASH_BLADE EQU FORMS_START + 251 + +; Pumpkaboo +PUMPKABOO_SMALL EQU FORMS_START + 252 +PUMPKABOO_LARGE EQU FORMS_START + 253 +PUMPKABOO_SUPER EQU FORMS_START + 254 + +; Gourgeist +GOURGEIST_SMALL EQU FORMS_START + 255 +GOURGEIST_LARGE EQU FORMS_START + 256 +GOURGEIST_SUPER EQU FORMS_START + 257 + +; Xerneas +XERNEAS_ACTIVE EQU FORMS_START + 258 + +; Zygarde +ZYGARDE_10 EQU FORMS_START + 259 +ZYGARDE_10_POWER_CONSTRUCT EQU FORMS_START + 260 +ZYGARDE_50_POWER_CONSTRUCT EQU FORMS_START + 261 +ZYGARDE_COMPLETE EQU FORMS_START + 262 + +; Hoopa +HOOPA_UNBOUND EQU FORMS_START + 263 + +; Oricorio +ORICORIO_POM_POM EQU FORMS_START + 264 +ORICORIO_PAU EQU FORMS_START + 265 +ORICORIO_SENSU EQU FORMS_START + 266 + +; Rockruff +ROCKRUFF_OWN_TEMPO EQU FORMS_START + 267 + +; Lycanroc +LYCANROC_MIDNIGHT EQU FORMS_START + 268 +LYCANROC_DUSK EQU FORMS_START + 269 + +; Wishiwashi +WISHIWASHI_SCHOOL EQU FORMS_START + 270 + +; Silvally +SILVALLY_FIGHTING EQU FORMS_START + 271 +SILVALLY_FLYING EQU FORMS_START + 272 +SILVALLY_POISON EQU FORMS_START + 273 +SILVALLY_GROUND EQU FORMS_START + 274 +SILVALLY_ROCK EQU FORMS_START + 275 +SILVALLY_BUG EQU FORMS_START + 276 +SILVALLY_GHOST EQU FORMS_START + 277 +SILVALLY_STEEL EQU FORMS_START + 278 +SILVALLY_FIRE EQU FORMS_START + 279 +SILVALLY_WATER EQU FORMS_START + 280 +SILVALLY_GRASS EQU FORMS_START + 281 +SILVALLY_ELECTRIC EQU FORMS_START + 282 +SILVALLY_PSYCHIC EQU FORMS_START + 283 +SILVALLY_ICE EQU FORMS_START + 284 +SILVALLY_DRAGON EQU FORMS_START + 285 +SILVALLY_DARK EQU FORMS_START + 286 +SILVALLY_FAIRY EQU FORMS_START + 287 + +; Minior +MINIOR_METEOR_ORANGE EQU FORMS_START + 288 +MINIOR_METEOR_YELLOW EQU FORMS_START + 289 +MINIOR_METEOR_GREEN EQU FORMS_START + 290 +MINIOR_METEOR_BLUE EQU FORMS_START + 291 +MINIOR_METEOR_INDIGO EQU FORMS_START + 292 +MINIOR_METEOR_VIOLET EQU FORMS_START + 293 +MINIOR_CORE_RED EQU FORMS_START + 294 +MINIOR_CORE_ORANGE EQU FORMS_START + 295 +MINIOR_CORE_YELLOW EQU FORMS_START + 296 +MINIOR_CORE_GREEN EQU FORMS_START + 297 +MINIOR_CORE_BLUE EQU FORMS_START + 298 +MINIOR_CORE_INDIGO EQU FORMS_START + 299 +MINIOR_CORE_VIOLET EQU FORMS_START + 300 + +; Mimikyu +MIMIKYU_BUSTED EQU FORMS_START + 301 + +; Necrozma +NECROZMA_DUSK_MANE EQU FORMS_START + 302 +NECROZMA_DAWN_WINGS EQU FORMS_START + 303 +NECROZMA_ULTRA EQU FORMS_START + 304 + +; Magearna +MAGEARNA_ORIGINAL_COLOR EQU FORMS_START + 305 + +; Cramorant +CRAMORANT_GULPING EQU FORMS_START + 306 +CRAMORANT_GORGING EQU FORMS_START + 307 + +; Toxtricity +TOXTRICITY_LOW_KEY EQU FORMS_START + 308 + +; Sinistea +SINISTEA_ANTIQUE EQU FORMS_START + 309 + +; Polteageist +POLTEAGEIST_ANTIQUE EQU FORMS_START + 310 + +; Alcremie +ALCREMIE_RUBY_CREAM EQU FORMS_START + 311 +ALCREMIE_MATCHA_CREAM EQU FORMS_START + 312 +ALCREMIE_MINT_CREAM EQU FORMS_START + 313 +ALCREMIE_LEMON_CREAM EQU FORMS_START + 314 +ALCREMIE_SALTED_CREAM EQU FORMS_START + 315 +ALCREMIE_RUBY_SWIRL EQU FORMS_START + 316 +ALCREMIE_CARAMEL_SWIRL EQU FORMS_START + 317 +ALCREMIE_RAINBOW_SWIRL EQU FORMS_START + 318 + +; Eiscue +EISCUE_NOICE_FACE EQU FORMS_START + 319 + +; Indeedee +INDEEDEE_FEMALE EQU FORMS_START + 320 + +; Morpeko +MORPEKO_HANGRY EQU FORMS_START + 321 + +; Zacian +ZACIAN_CROWNED_SWORD EQU FORMS_START + 322 + +; Zamazenta +ZAMAZENTA_CROWNED_SHIELD EQU FORMS_START + 323 + +; Eternatus +ETERNATUS_ETERNAMAX EQU FORMS_START + 324 + +; Urshifu +URSHIFU_RAPID_STRIKE_STYLE EQU FORMS_START + 325 + +; Zarude +ZARUDE_DADA EQU FORMS_START + 326 + +; Calyrex +CALYREX_ICE_RIDER EQU FORMS_START + 327 +CALYREX_SHADOW_RIDER EQU FORMS_START + 328 + +; Basculegion +BASCULEGION_FEMALE EQU FORMS_START + 329 + +EGG EQU BASCULEGION_FEMALE + 1 diff --git a/decoration/decoration.asm b/decoration/decoration.asm index 20553ad..9a51b5d 100644 --- a/decoration/decoration.asm +++ b/decoration/decoration.asm @@ -42,7 +42,7 @@ RegirockEnd: DataStartRegice: - db $01,$00,$00,$00,$02,$02,$00,$02,$00,$00,$00,$04,$00,$80,$01,$00,$00 ; Mystery_Event + db $01,$00,$00,$00,$02,$02,$00,$02,$00,$00,$00,$04,$00,$00,$02,$00,$00 ; Mystery_Event db CHECKSUM_CRC dd 0 ; checksum placeholder GBAPTR ScriptStartRegirock @@ -80,7 +80,7 @@ RegiceEnd: db $00,$00,$00 DataStartRegisteel: - db $01,$00,$00,$00,$02,$02,$00,$02,$00,$00,$00,$04,$00,$80,$01,$00,$00 ; Mystery_Event + db $01,$00,$00,$00,$02,$02,$00,$02,$00,$00,$00,$04,$00,$00,$02,$00,$00 ; Mystery_Event db CHECKSUM_CRC dd 0 ; checksum placeholder GBAPTR ScriptStartRegirock diff --git a/decoration/tickets.asm b/decoration/tickets.asm index 2b91d4a..db5ee9a 100644 --- a/decoration/tickets.asm +++ b/decoration/tickets.asm @@ -45,7 +45,7 @@ EonTicketEnd: DataStartAuroraTicket: - db $01,$00,$00,$00,$02,$02,$00,$02,$00,$00,$00,$04,$00,$80,$01,$00,$00 ; Mystery_Event + db $01,$00,$00,$00,$02,$02,$00,$02,$00,$00,$00,$04,$00,$00,$02,$00,$00 ; Mystery_Event db CHECKSUM_CRC dd 0 ; checksum placeholder GBAPTR ScriptStartEonTicket @@ -86,7 +86,7 @@ AuroraTicketEnd: db $00,$00,$00 DataStartMysticTicket: - db $01,$00,$00,$00,$02,$02,$00,$02,$00,$00,$00,$04,$00,$80,$01,$00,$00 ; Mystery_Event + db $01,$00,$00,$00,$02,$02,$00,$02,$00,$00,$00,$04,$00,$00,$02,$00,$00 ; Mystery_Event db CHECKSUM_CRC dd 0 ; checksum placeholder GBAPTR ScriptStartEonTicket diff --git a/eonticket/00-C000.asm b/eonticket/00-C000.asm index 32a66bf..240251d 100644 --- a/eonticket/00-C000.asm +++ b/eonticket/00-C000.asm @@ -22,16 +22,15 @@ SpriteData: db $15,$08,$01,$01,$01,$01,$01 ; width 15, height 8 Instructions1: ; 1921 - db "Link e-Reader to Pokémon Ruby or \n" - db "Sapphire and select MYSTERY EVENTS\n" - db "on the game's main menu.\n" + db "Link e-Reader to Pokémon Emerald\n" + db "and select MYSTERY EVENTS on the\n" + db "game's main menu.\n" db "Press the B Button to cancel.\0" Instructions2: ; 199d db "Press the A Button on the Game Boy\n" - db "Advance containing Pokémon Ruby or\n" - db "Sapphire to begin sending the EON\n" - db "TICKET.\0" + db "Advance containing Pokémon Emerald\n" + db "to begin sending the EON TICKET.\0" DeliveryInProcess: ; 1a0d db "EON TICKET delivery in Process...\0" diff --git a/giftpokemon/macros.asm b/giftpokemon/macros.asm index adfd80d..4077a37 100644 --- a/giftpokemon/macros.asm +++ b/giftpokemon/macros.asm @@ -13,7 +13,7 @@ Battle_Trainer: MACRO Section "battle",ROM0[$100] db $01 dd $02000000 - db REGION,0,REGION,0,0,0,$04,0,$80,$01,0,0 + db REGION,0,REGION,0,0,0,$04,0,$00,$02,0,0 db $0D dd $02000018 db $02,$00 diff --git a/macros.asm b/macros.asm index d91b02a..387f43a 100644 --- a/macros.asm +++ b/macros.asm @@ -127,7 +127,7 @@ ScriptBaseAddress EQU $100 SECTION "mysteryevent", ROM0[$100] db $01 dd $02000000 - db REGION,0,REGION,0,0,0,$04,0,$80,$01,0,0 + db REGION,0,REGION,0,0,0,$04,0,$00,$02,0,0 ENDM REGION_JP EQU $01 diff --git a/scripts/checksum.py b/scripts/checksum.py index cfba879..8b5f63c 100644 --- a/scripts/checksum.py +++ b/scripts/checksum.py @@ -26,7 +26,7 @@ while i < len(data): bytewises.append([start_address + 0x52C, start_address, start_address + 0x52C]) elif chunk_type == 0x0D: # BATTLE_TRAINER start_address = struct.unpack('