diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 27c0c3a..606aad8 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -423,7 +423,6 @@ DEF JOHTO_POKEMON EQU const_value const RUDDERNAUT const PIXYTOP const MAWTLE - const EVOLOTTO const XYLODON const XYLOFIN const DOKUROAR @@ -449,7 +448,6 @@ DEF JOHTO_POKEMON EQU const_value const HYOSHU_YANG const HYOSHU_YIN const CELEBI ; fb - const DEOXYS DEF NUM_POKEMON EQU const_value - 1 DEF EGG EQU -3 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 408e9ad..a40cb3f 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -428,7 +428,6 @@ INCLUDE "data/pokemon/base_stats/inoshika.asm" INCLUDE "data/pokemon/base_stats/ruddernaut.asm" INCLUDE "data/pokemon/base_stats/pixytop.asm" INCLUDE "data/pokemon/base_stats/mawtle.asm" -INCLUDE "data/pokemon/base_stats/evolotto.asm" INCLUDE "data/pokemon/base_stats/xylodon.asm" INCLUDE "data/pokemon/base_stats/xylofin.asm" INCLUDE "data/pokemon/base_stats/dokuroar.asm" @@ -454,5 +453,4 @@ INCLUDE "data/pokemon/base_stats/ho_oh.asm" INCLUDE "data/pokemon/base_stats/hyoshu_yang.asm" INCLUDE "data/pokemon/base_stats/hyoshu_yin.asm" INCLUDE "data/pokemon/base_stats/celebi.asm" -INCLUDE "data/pokemon/base_stats/deoxys.asm" .IndirectEnd:: diff --git a/data/pokemon/base_stats/deoxys.asm b/data/pokemon/base_stats/deoxys.asm deleted file mode 100644 index 93abcc6..0000000 --- a/data/pokemon/base_stats/deoxys.asm +++ /dev/null @@ -1,21 +0,0 @@ - db 0 ; species ID placeholder - - db 50, 150, 50, 150, 150, 50 - ; hp atk def spd sat sdf - - db PSYCHIC_TYPE, PSYCHIC_TYPE ; type - db 3 ; catch rate - db 215 ; base exp - db NO_ITEM, NO_ITEM ; items - db GENDER_UNKNOWN ; gender ratio - db 100 ; unknown 1 - db 120 ; step cycles to hatch - db 5 ; unknown 2 - INCBIN "gfx/pokemon/deoxys/front.dimensions" - dw NULL, NULL ; unused (beta front/back pics) - db GROWTH_MEDIUM_SLOW ; growth rate - dn EGG_NONE, EGG_NONE ; egg groups - - ; tm/hm learnset - tmhm DYNAMICPUNCH, HEADBUTT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, DETECT, REST, FIRE_PUNCH, NIGHTMARE, CUT, STRENGTH, FLASH, ICE_BEAM, THUNDERBOLT - ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index fb54b95..f374f44 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -407,7 +407,6 @@ PokemonCries:: mon_cry CRY_NIDORAN_M, 0, 128 ; RUDDERNAUT mon_cry CRY_NIDORAN_M, 0, 0 ; PIXYTOP (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; MAWTLE (incomplete) - mon_cry CRY_NIDORAN_M, 0, 0 ; EVOLOTTO (incomplete) mon_cry CRY_NIDORAN_M, 0, 128 ; XYLODON mon_cry CRY_NIDORAN_M, 0, 128 ; XYLOFIN mon_cry CRY_METAPOD, 766, 566 ; DOKUROAR @@ -433,5 +432,4 @@ PokemonCries:: mon_cry CRY_NIDORAN_M, 0, 128 ; HYOSHU_YANG (placeholder) mon_cry CRY_NIDORAN_M, 0, 128 ; HYOSHU_YIN (placeholder) mon_cry CRY_ENTEI, 330, 273 ; CELEBI - mon_cry CRY_NIDORAN_M, 0, 0 ; DEOXYS (incomplete) assert_table_length NUM_POKEMON diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 608afa1..3f0da86 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -441,5 +441,4 @@ MagnetitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnetite.asm" MagnezonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnezone.asm" GavillainPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gavillain.asm" BuuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/buu.asm" -EvolottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/evolotto.asm" -DeoxysPokedexEntry:: INCLUDE "data/pokemon/dex_entries/deoxys.asm" + diff --git a/data/pokemon/dex_entries/deoxys.asm b/data/pokemon/dex_entries/deoxys.asm deleted file mode 100644 index 2bcc822..0000000 --- a/data/pokemon/dex_entries/deoxys.asm +++ /dev/null @@ -1,10 +0,0 @@ - db "DNA@" ; species name - dw 507, 1340 ; height, weight - - db "Born from a" - next "mutated space" - next "virus, the crystal" - - page "in DEOXYS' chest" - next "is actually its" - next "brain.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index ac22bbf..a9b24c6 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -402,7 +402,6 @@ PokedexDataPointerTable: dba RuddernautPokedexEntry dba PixytopPokedexEntry dba MawtlePokedexEntry - dba EvolottoPokedexEntry dba XylodonPokedexEntry dba XylofinPokedexEntry dba DokuroarPokedexEntry @@ -428,5 +427,4 @@ PokedexDataPointerTable: dba HyoshuYangPokedexEntry dba HyoshuYinPokedexEntry dba CelebiPokedexEntry - dba DeoxysPokedexEntry assert_table_length NUM_POKEMON diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index d719e7a..2201363 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -74,7 +74,6 @@ AlphabeticalPokedexOrder: dw CYNDAQUIL dw DECILLA dw DELIBIRD - dw DEOXYS dw DEWGONG dw DIGLETT dw DISTURBAN @@ -104,7 +103,6 @@ AlphabeticalPokedexOrder: dw ENTEI dw ESPEON dw EUCALA - dw EVOLOTTO dw EXEGGCUTE dw EXEGGUTOR dw FARFETCH_D diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index e235a0b..9815236 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -368,7 +368,6 @@ NewPokedexOrder: dw RUDDERNAUT dw PIXYTOP dw MAWTLE - dw EVOLOTTO dw XYLODON dw XYLOFIN dw DOKUROAR @@ -429,5 +428,4 @@ NewPokedexOrder: dw MELTAN dw MELMETAL dw CELEBI - dw DEOXYS assert_table_length NUM_POKEMON diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 8ed6c64..96c9ef9 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -177,7 +177,6 @@ EggMovePointers2:: dw RuddernautEggMoves dw PixytopEggMoves dw MawtleEggMoves - dw NoEggMoves2 ; Evolotto dw XylodonEggMoves dw NoEggMoves2 dw NoEggMoves2 ; Dokuroar @@ -203,7 +202,6 @@ EggMovePointers2:: dw NoEggMoves2 dw NoEggMoves2 dw NoEggMoves2 - dw NoEggMoves2 ; Deoxys .IndirectEnd:: ChikoritaEggMoves: diff --git a/data/pokemon/evolution_moves.asm b/data/pokemon/evolution_moves.asm index 58b97fa..acb6d1e 100644 --- a/data/pokemon/evolution_moves.asm +++ b/data/pokemon/evolution_moves.asm @@ -400,7 +400,6 @@ EvolutionMoves:: dw NO_MOVE ;RUDDERNAUT dw NO_MOVE ;PIXYTOP dw NO_MOVE ;MAWTLE - dw NO_MOVE ;EVOLOTTO dw NO_MOVE ;XYLODON dw NO_MOVE ;XYLOFIN dw NO_MOVE ;DOKUROAR diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index 24d783b..b93db08 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -176,7 +176,6 @@ EvosAttacksPointers2:: dw RuddernautEvosAttacks dw PixytopEvosAttacks dw MawtleEvosAttacks - dw EvolottoEvosAttacks dw XylodonEvosAttacks dw XylofinEvosAttacks dw DokuroarEvosAttacks @@ -202,7 +201,6 @@ EvosAttacksPointers2:: dw HyoshuYangEvosAttacks dw HyoshuYinEvosAttacks dw CelebiEvosAttacks - dw DeoxysEvosAttacks .IndirectEnd:: ChikoritaEvosAttacks: @@ -1022,8 +1020,8 @@ HoppipEvosAttacks: dbw 17, STUN_SPORE dbw 18, SLEEP_POWDER dbw 22, LEECH_SEED - dbw 25, MEGA_DRAIN - dbw 30, SLAM ; SW97 + dbw 25, SLAM ; SW97 + dbw 30, MEGA_DRAIN dbw 35, GROWTH ; SW97 dbw 39, RAZOR_LEAF ; SW97 dbw 45, COTTON_SPORE @@ -1043,8 +1041,8 @@ SkiploomEvosAttacks: dbw 17, STUN_SPORE dbw 18, SLEEP_POWDER dbw 24, LEECH_SEED - dbw 27, MEGA_DRAIN - dbw 32, SLAM ; SW97 + dbw 27, SLAM ; SW97 + dbw 32, MEGA_DRAIN dbw 39, GROWTH ; SW97 dbw 43, RAZOR_LEAF ; SW97 dbw 49, COTTON_SPORE @@ -1063,8 +1061,8 @@ JumpluffEvosAttacks: dbw 17, STUN_SPORE dbw 18, SLEEP_POWDER dbw 24, LEECH_SEED - dbw 27, MEGA_DRAIN - dbw 34, SLAM ; SW97 + dbw 27, SLAM ; SW97 + dbw 34, MEGA_DRAIN dbw 41, GROWTH ; SW97 dbw 47, RAZOR_LEAF ; SW97 dbw 53, COTTON_SPORE @@ -3031,12 +3029,6 @@ MawtleEvosAttacks: dbw 54, CRUNCH dbw 60, SKULL_BASH db 0 ; no more level-up moves - -EvolottoEvosAttacks: - dbbw EVOLVE_LEVEL, 1, EEVEE ; PLACEHOLDER - db 0 ; no more evolutions - dbw 1, HIDDEN_POWER - db 0 ; no more level-up moves XylodonEvosAttacks: dbbw EVOLVE_LEVEL, 40, XYLOFIN ; no more evolutions @@ -3459,20 +3451,3 @@ CelebiEvosAttacks: dbw 40, BATON_PASS dbw 50, PERISH_SONG db 0 ; no more level-up moves - -DeoxysEvosAttacks: -db 0 ; no more evolutions - dbw 1, LEER - dbw 1, WRAP - dbw 9, NIGHT_SHADE - dbw 17, TELEPORT - dbw 25, CONFUSION - dbw 33, PURSUIT - dbw 41, PSYBEAM - dbw 49, COMET_PUNCH - dbw 57, PSYCHIC_M - dbw 65, SAFEGUARD - dbw 73, RECOVER - dbw 81, FUTURE_SIGHT - dbw 89, HYPER_BEAM - db 0 ; no more level-up moves diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index a49cd02..77346bd 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -2386,11 +2386,10 @@ KinglerEvosAttacks: dbw 53, FLAIL ; FRLG db 0 ; no more level-up moves -VoltorbEvosAttacks: +VoltorbEvosAttacks: ; spark and twave should be here somewhere dbbw EVOLVE_LEVEL, 30, ELECTRODE db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, THUNDERSHOCK dbw 7, SCREECH dbw 12, THUNDER_WAVE ; SW97 dbw 17, SONICBOOM @@ -2407,7 +2406,6 @@ VoltorbEvosAttacks: ElectrodeEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE - dbw 1, THUNDERSHOCK dbw 7, SCREECH dbw 12, THUNDER_WAVE ; SW97 dbw 17, SONICBOOM @@ -3352,7 +3350,6 @@ EeveeEvosAttacks: dbw 36, BATON_PASS dbw 42, TAKE_DOWN dbw 47, FOCUS_ENERGY ; RBY, GS - dbw 52, SWIFT ; LGPE db 0 ; no more level-up moves VaporeonEvosAttacks: diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 2829183..5f21302 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -402,7 +402,6 @@ FirstEvoStages:: dw RUDDERNAUT dw PIXYTOP dw MAWTLE - dw EVOLOTTO dw XYLODON dw XYLODON dw DOKUROAR @@ -428,5 +427,4 @@ FirstEvoStages:: dw HYOSHU_YANG dw HYOSHU_YIN dw CELEBI - dw DEOXYS assert_table_length NUM_POKEMON diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 71ad521..d94efa6 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -403,7 +403,6 @@ MonMenuIcons: db ICON_LAPRAS ; RUDDERNAUT db ICON_CLEFAIRY ; PIXYTOP db ICON_SQUIRTLE ; MAWTLE - db ICON_BLOB ; EVOLOTTO db ICON_MONSTER ; XYLODON db ICON_MONSTER ; XYLOFIN db ICON_MONSTER ; DOKUROAR @@ -429,5 +428,4 @@ MonMenuIcons: db ICON_FOX ; HYOSHU_YANG db ICON_FOX ; HYOSHU_YIN db ICON_HUMANSHAPE ; CELEBI - db ICON_HUMANSHAPE ; DEOXYS assert_table_length NUM_POKEMON diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index dc26817..c915978 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -406,7 +406,6 @@ PokemonNames:: db "RUDDERNAUT" db "PIXYTOP@@@" db "MAWTLE@@@@" - db "EVOLOTTO@@" db "XYLODON@@@" db "XYLOFIN@@@" db "DOKUROAR@@" @@ -432,5 +431,4 @@ PokemonNames:: db "HYOSHU@@@@" db "HYOSHU@@@@" db "CELEBI@@@@" - db "DEOXYS@@@@" assert_table_length NUM_POKEMON diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 154f9dd..4c9ee51 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -836,8 +836,6 @@ INCBIN "gfx/pokemon/pixytop/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/pixytop/shiny.pal" INCBIN "gfx/pokemon/mawtle/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/mawtle/shiny.pal" -INCBIN "gfx/pokemon/evolotto/front.gbcpal", middle_colors -INCLUDE "gfx/pokemon/evolotto/shiny.pal" INCBIN "gfx/pokemon/xylodon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/xylodon/shiny.pal" INCBIN "gfx/pokemon/xylofin/front.gbcpal", middle_colors @@ -890,8 +888,6 @@ INCBIN "gfx/pokemon/hyoshu_yin/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/hyoshu_yin/shiny.pal" INCBIN "gfx/pokemon/celebi/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/celebi/shiny.pal" -INCBIN "gfx/pokemon/deoxys/front.gbcpal", middle_colors -INCLUDE "gfx/pokemon/deoxys/shiny.pal" assert_table_length NUM_POKEMON + 1 diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index b1b05c4..361d17e 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -818,8 +818,6 @@ PokemonPicPointers:: dba PixytopBackpic dba MawtleFrontpic dba MawtleBackpic - dba EvolottoFrontpic - dba EvolottoBackpic dba XylodonFrontpic dba XylodonBackpic dba XylofinFrontpic @@ -870,6 +868,4 @@ PokemonPicPointers:: dba HyoshuYinBackpic dba CelebiFrontpic dba CelebiBackpic - dba DeoxysFrontpic - dba DeoxysBackpic assert_table_length NUM_POKEMON + 1 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 9a86a25..3a8e42e 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -17,7 +17,7 @@ FalknerGroup: dw TACKLE, MUD_SLAP, GROWL, FORESIGHT db 12 dw PIDGEOTTO - dw TACKLE, MUD_SLAP, GUST, SAND_ATTACK + dw TACKLE, MUD_SLAP, GUST, NO_MOVE db -1 ; end end_list_items @@ -79,21 +79,19 @@ MortyGroup: PryceGroup: next_list_item ; PRYCE (1) db "PRYCE@", TRAINERTYPE_MOVES - db 40 + db 33 dw DELIBIRD - dw SPIKES, ICY_WIND, PRESENT, ENCORE - db 39 + dw PRESENT, ICY_WIND, RAPID_SPIN, RAIN_DANCE ; Rain Dance can make Fire moves worse ig? Spikes is cool but it's an event move - do we want that? + db 33 dw BUU - dw ICE_PUNCH, ICY_WIND, FAINT_ATTACK, DIZZY_PUNCH - db 40 + dw HEADBUTT, ICY_WIND, AURORA_BEAM, REST + db 35 dw DEWGONG - dw HEADBUTT, ICY_WIND, SING, REST - db 39 - dw WEARLYCAN - dw VITAL_THROW, ICY_WIND, SCARY_FACE, DIG - db 42 - dw HIRSUSWINE - dw ICY_WIND, MAGNITUDE, HORN_DRILL, TAKE_DOWN + dw HEADBUTT, ICY_WIND, AURORA_BEAM, REST + ; WEARLYCAN + db 41 + dw PILOSWINE ; MAMOSWINE + dw ICY_WIND, FURY_ATTACK, MIST, BLIZZARD db -1 ; end end_list_items @@ -110,10 +108,10 @@ JasmineGroup: ; Jasmine is going to use Egg Moves! db 34 dw SKARMORY dw DRILL_PECK, SAND_ATTACK, STEEL_WING, LEER + ; db 35 + ; dw SHARPOON + ; dw IRON_TAIL, BUBBLEBEAM, CRUNCH, SWORDS_DANCE db 35 - dw SHARPOON - dw IRON_TAIL, BUBBLEBEAM, CRUNCH, SWORDS_DANCE - db 37 dw STEELIX dw SCREECH, SANDSTORM, ROCK_HEAD, IRON_TAIL db -1 ; end @@ -129,9 +127,9 @@ ChuckGroup: db 32 dw HERACROSS dw HORN_ATTACK, KARATE_CHOP, ENDURE, LEER - db 31 - dw TANOBI - dw JUMP_KICK, WING_ATTACK, SWIFT, AGILITY + ; db 31 + ; dw ALOLAN SNORLAX + ; dw ??? db 32 dw HITMONTOP ; maybe Pixytop? dw ROLLING_KICK, RAPID_SPIN, PURSUIT, COUNTER @@ -145,22 +143,22 @@ ChuckGroup: ClairGroup: next_list_item ; CLAIR (1) db "CLAIR@", TRAINERTYPE_MOVES - db 45 + db 41 dw COATL dw TRANSFORM, DRAGONBREATH, MORNING_SUN, GUST - db 44 + db 43 dw GYARADOS dw FLAMETHROWER, SURF, BODY_SLAM, DRAGONBREATH - db 45 + db 43 dw AMPHAROS - dw THUNDER_WAVE, THUNDERBOLT, FIRE_PUNCH, DAZZLING_GLEAM + dw THUNDER_WAVE, THUNDERBOLT, FIRE_PUNCH, HEADBUTT + db 47 + dw DRAGONAIR ; MINISTARE + dw THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH db 47 dw DRAGONAIR dw THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH - db 47 - dw MINISTARE - dw GLARE, FURY_SWIPES, BUBBLEBEAM, DRAGONBREATH - db 48 + db 50 dw KINGDRA dw SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH db -1 ; end @@ -247,7 +245,7 @@ Rival1Group: dw LEECH_LIFE, DISABLE, DESTINY_BOND, SPITE db 25 dw QUILAVA - dw LEER, SMOKESCREEN, FLAME_WHEEL, QUICK_ATTACK + dw LEER, SMOKESCREEN, EMBER, QUICK_ATTACK db -1 ; end next_list_item ; RIVAL1 (9) @@ -268,125 +266,125 @@ Rival1Group: next_list_item ; RIVAL1 (10) db "?@", TRAINERTYPE_MOVES - db 40 - dw SNEASEL - dw FAINT_ATTACK, ICY_WIND, FURY_SWIPES, SCREECH - db 42 - dw URSARING - dw SLASH, FAINT_ATTACK, LICK, MOONLIGHT - db 40 + db 30 dw GOLBAT - dw WING_ATTACK, THRASH, CONFUSION, CONFUSE_RAY - db 41 - dw STROMEN - dw NIGHT_SHADE, DISABLE, DESTINY_BOND, SUBSTITUTE - db 43 + dw LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 28 + dw MAGNEMITE + dw TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE + db 30 + dw HAUNTER + dw LICK, MEAN_LOOK, CURSE, SHADOW_BALL + db 32 + dw SNEASEL + dw LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK + db 32 dw MEGANIUM - dw RAZOR_LEAF, BODY_SLAM, SLEEP_POWDER, SYNTHESIS + dw REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM db -1 ; end next_list_item ; RIVAL1 (11) db "?@", TRAINERTYPE_MOVES - db 40 - dw SNEASEL - dw FAINT_ATTACK, ICY_WIND, FURY_SWIPES, SCREECH - db 42 - dw URSARING - dw SLASH, FAINT_ATTACK, LICK, MOONLIGHT - db 40 + db 30 dw GOLBAT - dw WING_ATTACK, THRASH, CONFUSION, CONFUSE_RAY - db 41 - dw STROMEN - dw NIGHT_SHADE, DISABLE, DESTINY_BOND, SUBSTITUTE - db 43 - dw TYPHLOSION - dw FLAME_WHEEL, ROLLOUT, SWIFT, SMOKESCREEN + dw LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 28 + dw MAGNEMITE + dw TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE + db 30 + dw HAUNTER + dw LICK, MEAN_LOOK, CURSE, SHADOW_BALL + db 32 + dw SNEASEL + dw LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK + db 32 + dw QUILAVA + dw SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL db -1 ; end next_list_item ; RIVAL1 (12) db "?@", TRAINERTYPE_MOVES - db 40 - dw SNEASEL - dw FAINT_ATTACK, ICY_WIND, FURY_SWIPES, SCREECH - db 42 - dw URSARING - dw SLASH, FAINT_ATTACK, LICK, MOONLIGHT - db 40 + db 30 dw GOLBAT - dw WING_ATTACK, THRASH, CONFUSION, CONFUSE_RAY - db 41 - dw STROMEN - dw NIGHT_SHADE, DISABLE, DESTINY_BOND, SUBSTITUTE - db 43 + dw LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 28 + dw MAGNEMITE + dw TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE + db 30 + dw HAUNTER + dw LICK, MEAN_LOOK, CURSE, SHADOW_BALL + db 32 + dw SNEASEL + dw LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK + db 32 dw FERALIGATR - dw WATER_GUN, BITE, SLASH, SCARY_FACE + dw RAGE, WATER_GUN, BITE, SCARY_FACE db -1 ; end next_list_item ; RIVAL1 (13) db "?@", TRAINERTYPE_MOVES - db 52 - dw WEAVILE - dw SLASH, BLIZZARD, FURY_CUTTER, SCREECH - db 51 - dw URSARING - dw SLASH, EARTHQUAKE, LEER, MOONLIGHT - db 52 - dw CROBAT - dw WING_ATTACK, RETURN, TOXIC, SCREECH - db 51 - dw PHANDARIN - dw SHADOW_BALL, PSYCHIC_M, THUNDERBOLT, SUBSTITUTE - db 50 - dw PUPITAR - dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE - db 54 + db 34 + dw SNEASEL + dw QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 36 + dw GOLBAT + dw LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 35 + dw MAGNETON + dw THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 35 + dw HAUNTER + dw MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 35 + dw KADABRA + dw DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 38 dw MEGANIUM - dw GIGA_DRAIN, EARTHQUAKE, BODY_SLAM, SLEEP_POWDER + dw REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM db -1 ; end next_list_item ; RIVAL1 (14) db "?@", TRAINERTYPE_MOVES - db 52 - dw WEAVILE - dw SLASH, BLIZZARD, FURY_CUTTER, SCREECH - db 51 - dw URSARING - dw SLASH, EARTHQUAKE, LEER, MOONLIGHT - db 52 - dw CROBAT - dw WING_ATTACK, RETURN, TOXIC, SCREECH - db 51 - dw PHANDARIN - dw SHADOW_BALL, PSYCHIC_M, THUNDERBOLT, SUBSTITUTE - db 50 - dw PUPITAR - dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE - db 54 + db 34 + dw SNEASEL + dw QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 36 + dw GOLBAT + dw LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 35 + dw MAGNETON + dw THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 35 + dw HAUNTER + dw MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 35 + dw KADABRA + dw DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 38 dw TYPHLOSION - dw FLAMETHROWER, THUNDERPUNCH, SWIFT, SMOKESCREEN + dw SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL db -1 ; end next_list_item ; RIVAL1 (15) db "?@", TRAINERTYPE_MOVES - db 52 - dw WEAVILE - dw SLASH, BLIZZARD, FURY_CUTTER, SCREECH - db 51 - dw URSARING - dw SLASH, EARTHQUAKE, LEER, MOONLIGHT - db 52 - dw CROBAT - dw WING_ATTACK, RETURN, TOXIC, SCREECH - db 51 - dw PHANDARIN - dw SHADOW_BALL, PSYCHIC_M, THUNDERBOLT, SUBSTITUTE - db 50 - dw PUPITAR - dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE - db 54 + db 34 + dw SNEASEL + dw QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 36 + dw GOLBAT + dw LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 34 + dw MAGNETON + dw THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 35 + dw HAUNTER + dw MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 35 + dw KADABRA + dw DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 38 dw FERALIGATR - dw SURF, CRUNCH, SLASH, SCARY_FACE + dw RAGE, WATER_GUN, SCARY_FACE, SLASH db -1 ; end end_list_items @@ -419,22 +417,19 @@ PokemonProfGroup: WillGroup: next_list_item ; WILL (1) db "WILL@", TRAINERTYPE_MOVES - db 55 + db 40 dw XATU - dw NIGHT_SHADE, CONFUSE_RAY, DRILL_PECK, PSYCHIC_M - db 54 - dw WYRDEER - dw PSYCHIC_M, DOUBLE_EDGE, REFLECT, LIGHT_SCREEN - db 53 + dw NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M + db 41 dw JYNX - dw DRAINING_KISS, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M - db 55 + dw MEAN_LOOK, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M + db 41 + dw ESPEON + dw REFLECT, QUICK_ATTACK, MORNING_SUN, PSYCHIC_M + db 41 dw SLOWKING dw CURSE, SURF, EARTHQUAKE, PSYCHIC_M - db 54 - dw ESPEON - dw REFLECT, SHADOW_BALL, MORNING_SUN, PSYCHIC_M - db 57 + db 42 dw FARIGIRAF dw PSYCHIC_M, CRUNCH, STOMP, AGILITY ; Check how Return/Frustration work db -1 ; end @@ -526,24 +521,21 @@ PKMNTrainerGroup: BrunoGroup: next_list_item ; BRUNO (1) db "BRUNO@", TRAINERTYPE_MOVES - db 56 - dw GORILLAIMO - dw SUBMISSION, BODY_SLAM, THUNDERPUNCH, AMNESIA - db 55 + db 42 + dw JABETTA + dw JUMP_KICK, HYDRO_PUMP, MEDITATE, DRILL_PECK + db 42 + dw HITMONLEE + dw SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT + db 42 + dw HITMONCHAN + dw MEGA_PUNCH, ICE_PUNCH, COUNTER, MACH_PUNCH + db 43 dw STEELIX dw IRON_TAIL, EARTHQUAKE, EXPLOSION, ROCK_HEAD - db 57 - dw HITMONCHAN - dw DYNAMICPUNCH, ICE_PUNCH, MEGA_PUNCH, COUNTER - db 57 - dw HITMONLEE - dw HI_JUMP_KICK, BODY_SLAM, MEGA_KICK, MEDITATE - db 56 - dw WEARLYCAN - dw CROSS_CHOP, BLIZZARD, GUILLOTINE, SLASH - db 59 + db 46 dw MACHAMP - dw ROCK_SLIDE, CROSS_CHOP, FORESIGHT, LIGHT_SCREEN + dw ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP db -1 ; end next_list_item ; BRUNO (1) @@ -573,24 +565,21 @@ BrunoGroup: KarenGroup: next_list_item ; KAREN (1) db "KAREN@", TRAINERTYPE_MOVES - db 58 + db 42 dw UMBREON - dw PURSUIT, SAND_ATTACK, TOXIC, MEAN_LOOK - db 57 + dw SAND_ATTACK, CONFUSE_RAY, PURSUIT, MEAN_LOOK + db 42 dw BELLEDAM dw PURSUIT, HEAL_BELL, LOVELY_KISS, ATTRACT - db 56 - dw JUNGELA - dw PURSUIT, GIGA_DRAIN, SLEEP_POWDER, GROWTH - db 57 + db 44 dw HONCHKROW - dw PURSUIT, WING_ATTACK, WHIRLWIND, DETECT - db 58 - dw WEAVILE - dw PURSUIT, ICE_BEAM, METAL_CLAW, AGILITY - db 60 + dw QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK + db 47 dw HOUNDOOM - dw PURSUIT, FLAMETHROWER, BONEMERANG, ROAR + dw ROAR, PURSUIT, FLAMETHROWER, CRUNCH + db 55 + dw TYRANITAR + dw PURSUIT, ROCK_SLIDE, ICE_BEAM, DYNAMICPUNCH db -1 ; end next_list_item ; KAREN (1) @@ -620,24 +609,21 @@ KarenGroup: KogaGroup: next_list_item ; KOGA (1) db "KOGA@", TRAINERTYPE_MOVES - db 54 + db 43 dw QWILFATHER dw SPIKES, HYDRO_PUMP, MINIMIZE, HAZE - db 55 + db 40 + dw ARIADOS + dw DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, AGILITY + db 41 dw VENOMOTH dw SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, TOXIC - db 56 - dw WEEZING - dw SLUDGE_BOMB, FIRE_BLAST, EXPLOSION, DESTINY_BOND - db 55 - dw TENTACRUEL - dw SURF, SLUDGE_BOMB, WRAP, BARRIER - db 56 + db 42 dw MUK - dw MINIMIZE, MOONBLAST, SLUDGE_BOMB, TOXIC - db 58 + dw MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC + db 44 dw CROBAT - dw DOUBLE_TEAM, STEEL_WING, WING_ATTACK, TOXIC + dw DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC db -1 ; end next_list_item ; KOGA (1) @@ -667,24 +653,24 @@ KogaGroup: ChampionGroup: next_list_item ; CHAMPION (1) db "LANCE@", TRAINERTYPE_MOVES - db 61 + db 44 dw GYARADOS - dw THUNDERBOLT, OUTRAGE, SURF, HYPER_BEAM - db 59 + dw THUNDERBOLT, RAIN_DANCE, SURF, HYPER_BEAM + db 47 dw CHARIZARD dw ROCK_SLIDE, FLAMETHROWER, EARTHQUAKE, HYPER_BEAM - db 60 + db 47 dw GAVILLAIN dw THUNDERBOLT, DRAGONBREATH, GLARE, HYPER_BEAM - db 60 + db 46 dw AERODACTYL - dw WING_ATTACK, ROCK_HEAD, EARTHQUAKE, HYPER_BEAM ; Now legal! - db 61 + dw WING_ATTACK, ANCIENTPOWER, EARTHQUAKE, HYPER_BEAM ; Now legal! + db 46 dw IGUANARCH - dw OUTRAGE, GLARE, ICE_BEAM, HYPER_BEAM - db 63 + dw DRAGONBREATH, GLARE, THUNDERBOLT, HYPER_BEAM + db 50 dw DRAGONITE - dw OUTRAGE, FIRE_BLAST, EXTREMESPEED, HYPER_BEAM + dw FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM db -1 ; end next_list_item ; CHAMPION (1) @@ -789,46 +775,42 @@ LtSurgeGroup: ScientistGroup: next_list_item ; SCIENTIST (1) db "ROSS@", TRAINERTYPE_NORMAL - db 30 + db 22 + dw KOFFING + db 22 dw KOFFING - db 30 - dw ELECTRODE - db 30 - dw PORYGON db -1 ; end next_list_item ; SCIENTIST (2) db "MITCH@", TRAINERTYPE_NORMAL - db 30 + db 24 dw DITTO - db 30 - dw DITTO - db 30 - dw MIMMEO db -1 ; end next_list_item ; SCIENTIST (3) db "JED@", TRAINERTYPE_NORMAL - db 29 - dw MAGNETITE - db 29 - dw KADABRA - db 30 - dw MR__MIME + db 20 + dw MAGNEMITE + db 20 + dw MAGNEMITE + db 20 + dw MAGNEMITE db -1 ; end next_list_item ; SCIENTIST (4) db "MARC@", TRAINERTYPE_NORMAL - db 35 - dw MAGNETON - db 35 - dw QATU + db 27 + dw MAGNEMITE + db 27 + dw MAGNEMITE + db 27 + dw MAGNEMITE db -1 ; end next_list_item ; SCIENTIST (5) db "RICH@", TRAINERTYPE_MOVES - db 37 - dw PORYGON2 + db 30 + dw PORYGON dw CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK db -1 ; end @@ -1295,12 +1277,10 @@ BirdKeeperGroup: next_list_item ; BIRD_KEEPER (7) db "VANCE@", TRAINERTYPE_NORMAL - db 37 - dw NOCTOWL - db 37 - dw DODRIO - db 36 - dw MURKROW + db 25 + dw PIDGEOTTO + db 25 + dw PIDGEOTTO db -1 ; end next_list_item ; BIRD_KEEPER (8) @@ -1337,14 +1317,8 @@ BirdKeeperGroup: next_list_item ; BIRD_KEEPER (12) db "JOSE@", TRAINERTYPE_NORMAL - db 44 - dw DODRIO - db 45 - dw CACAWPHONY - db 46 - dw TREBIR - db 47 - dw LUXWAN + db 36 + dw FARFETCH_D db -1 ; end next_list_item ; BIRD_KEEPER (13) @@ -1502,47 +1476,39 @@ CooltrainerMGroup: next_list_item ; COOLTRAINERM (3) db "PAUL@", TRAINERTYPE_NORMAL - db 43 + db 34 + dw DRATINI + db 34 + dw DRATINI + db 34 dw DRATINI - db 43 - dw SQUEAMATA - db 43 - dw SEADRA db -1 ; end next_list_item ; COOLTRAINERM (4) db "CODY@", TRAINERTYPE_NORMAL - db 41 - dw GYARADOS - db 42 - dw AERODACTYL - db 43 - dw CHARIZARD + db 34 + dw HORSEA + db 36 + dw SEADRA db -1 ; end next_list_item ; COOLTRAINERM (5) db "MIKE@", TRAINERTYPE_NORMAL - db 45 - dw MINISTARE + db 37 + dw DRAGONAIR db -1 ; end next_list_item ; COOLTRAINERM (6) db "GAVEN@", TRAINERTYPE_MOVES - db 45 + db 35 dw VICTREEBEL - dw WRAP, TOXIC, SLUDGE_BOMB, RAZOR_LEAF - db 45 + dw WRAP, TOXIC, ACID, RAZOR_LEAF + db 35 dw KINGLER - dw CRABHAMMER, STOMP, GUILLOTINE, PROTECT - db 44 - dw PILOSWINE - dw EARTHQUAKE, ICY_WIND, TAKE_DOWN, ENDURE - db 46 - dw WYRDEER - dw PSYBEAM, STOMP, SAND_ATTACK, HYPNOSIS - db 48 + dw BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT + db 35 dw FLAREON - dw FLAMETHROWER, QUICK_ATTACK, BITE, SAND_ATTACK + dw SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN db -1 ; end next_list_item ; COOLTRAINERM (7) @@ -1563,37 +1529,22 @@ CooltrainerMGroup: next_list_item ; COOLTRAINERM (8) db "RYAN@", TRAINERTYPE_MOVES - db 38 + db 25 dw PIDGEOT - dw WING_ATTACK, QUICK_ATTACK, WHIRLWIND, SING - db 38 + dw SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK + db 27 dw ELECTABUZZ - dw THUNDERPUNCH, LOW_KICK, SWIFT, LIGHT_SCREEN - db 39 - dw CROBAT - dw WING_ATTACK, CONFUSION, THRASH, MOONLIGHT - db 39 - dw TOGETIC - dw SPIKE_CANNON, FAIRY_WIND, SWEET_KISS, ENCORE + dw THUNDERPUNCH, LIGHT_SCREEN, SWIFT, SCREECH db -1 ; end next_list_item ; COOLTRAINERM (9) db "JAKE@", TRAINERTYPE_MOVES - db 44 + db 33 dw PARASECT - dw GIGA_DRAIN, SPORE, SLASH, SWORDS_DANCE - db 45 + dw LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE + db 35 dw GOLDUCK - dw PSYCHIC_M, AMNESIA, PSYCH_UP, SURF - db 46 - dw BELLEDAM - dw FAINT_ATTACK, LOVELY_KISS, SWEET_KISS, ATTRACT - db 47 - dw YANMEGA - dw WING_ATTACK, ANCIENTPOWER, HYPNOSIS, SCREECH - db 48 - dw GRANBULL - dw TAKE_DOWN, PLAY_ROUGH, SING, SWEET_KISS + dw CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES db -1 ; end next_list_item ; COOLTRAINERM (10) @@ -1611,31 +1562,22 @@ CooltrainerMGroup: next_list_item ; COOLTRAINERM (11) db "BLAKE@", TRAINERTYPE_MOVES - db 46 - dw MAGNEZONE - dw THUNDERBOLT, SUPERSONIC, THUNDER_WAVE, SCREECH - db 44 + db 33 + dw MAGNETON + dw THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH + db 31 dw QUAGSIRE - dw SURF, SLAM, AMNESIA, EARTHQUAKE - db 44 - dw EXEGGUTOR - dw LEECH_SEED, PSYBEAM, SLEEP_POWDER, SOLARBEAM - db 45 - dw GRENMAR - dw BUBBLEBEAM, FLAME_WHEEL, SMOG, SING + dw WATER_GUN, SLAM, AMNESIA, EARTHQUAKE + db 31 + dw EXEGGCUTE + dw LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM db -1 ; end next_list_item ; COOLTRAINERM (12) db "BRIAN@", TRAINERTYPE_MOVES - db 46 + db 35 dw SANDSLASH - dw DIG, SLASH, SAND_ATTACK, SWORDS_DANCE - db 46 - dw URSARING - dw SLASH, MOONLIGHT, METAL_CLAW, LEER - db 47 - dw WEAVILE - dw SLASH, FAINT_ATTACK, ICY_WIND, AGILITY + dw SAND_ATTACK, POISON_STING, SLASH, SWIFT db -1 ; end ; Previously unused, now Winner's Path @@ -1707,34 +1649,16 @@ CooltrainerMGroup: next_list_item ; COOLTRAINERM (19) db "ALLEN@", TRAINERTYPE_MOVES - db 35 + db 27 dw CHARMELEON - dw FLAMETHROWER, SMOKESCREEN, RAGE, SCARY_FACE - db 35 - dw WARTORTLE - dw BUBBLEBEAM, MEGA_DRAIN, STOMP, WITHDRAW - db 35 - dw IVYSAUR - dw RAZOR_LEAF, LEECH_SEED, SLEEP_POWDER, GROWTH - db 35 - dw EEVEE - dw SWIFT, QUICK_ATTACK, MUD_SLAP, TAIL_WHIP - db 35 - dw RAICHU - dw THUNDERBOLT, SLAM, DOUBLE_TEAM, THUNDER_WAVE + dw EMBER, SMOKESCREEN, RAGE, SCARY_FACE db -1 ; end next_list_item ; COOLTRAINERM (20) db "DARIN@", TRAINERTYPE_MOVES - db 41 - dw GYARADOS - dw TWISTER, SURF, DRAGON_RAGE, THRASH - db 42 - dw FERADACTYL - dw ROCK_SLIDE, TAKE_DOWN, SCARY_FACE, LEER - db 43 - dw MINISTARE - dw DRAGONBREATH, FURY_SWIPES, DRAGON_RAGE, TAIL_WHIP + db 37 + dw DRAGONAIR + dw WRAP, SURF, DRAGON_RAGE, SLAM db -1 ; end next_list_item ; COOLTRAINERM (11) @@ -1780,18 +1704,16 @@ CooltrainerFGroup: next_list_item ; COOLTRAINERF (3) db "FRAN@", TRAINERTYPE_NORMAL - db 43 - dw AMPHAROS - db 45 - dw GAVILLAIN + db 37 + dw SEADRA db -1 ; end next_list_item ; COOLTRAINERF (4) db "LOLA@", TRAINERTYPE_NORMAL - db 44 + db 34 + dw DRATINI + db 36 dw DRAGONAIR - db 44 - dw COATL db -1 ; end next_list_item ; COOLTRAINERF (5) @@ -1812,73 +1734,52 @@ CooltrainerFGroup: next_list_item ; COOLTRAINERF (7) db "KELLY@", TRAINERTYPE_NORMAL - db 41 - dw AZUMARILL - db 40 - dw TOTARTLE - db 40 - dw BLASTOISE + db 27 + dw MARILL + db 24 + dw WARTORTLE + db 24 + dw WARTORTLE db -1 ; end next_list_item ; COOLTRAINERF (8) db "JOYCE@", TRAINERTYPE_MOVES - db 46 + db 36 + dw PIKACHU + dw QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER + db 32 dw BLASTOISE - dw IRON_TAIL, CURSE, SURF, RAIN_DANCE - db 45 - dw BELLOSSOM - dw PETAL_DANCE, SLEEP_POWDER, CHARM, GROWTH - db 46 - dw HOUNDOOM - dw FLAMETHROWER, BONEMERANG, FAINT_ATTACK, SCARY_FACE - db 47 - dw HERACROSS - dw KARATE_CHOP, FURY_ATTACK, REFLECT, COUNTER - db 49 - dw GOROCHU - dw THUNDER, THUNDERBOLT, DOUBLE_TEAM, THUNDER_WAVE + dw BITE, CURSE, SURF, RAIN_DANCE db -1 ; end next_list_item ; COOLTRAINERF (9) db "BETH@", TRAINERTYPE_MOVES - db 47 + db 36 dw RAPIDASH - dw STOMP, FLAME_WHEEL, DOUBLE_KICK, AGILITY - db 48 - dw UMBREON - dw FAINT_ATTACK, SYNCHRONIZE, MEAN_LOOK, CONFUSE_RAY - db 48 - dw CHANSEY - dw EGG_BOMB, SOFTBOILED, ICE_BEAM, DEFENSE_CURL - db 50 - dw MIMEAR - dw DRAINING_KISS, RAZOR_LEAF, CHARM, MIRROR_COAT + dw STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY db -1 ; end next_list_item ; COOLTRAINERF (10) db "REENA@", TRAINERTYPE_NORMAL - db 47 - dw MANTINE - db 46 - dw ARCANINE - db 48 + db 31 + dw STARMIE + db 33 dw NIDOQUEEN + db 31 + dw STARMIE db -1 ; end next_list_item ; COOLTRAINERF (11) db "MEGAN@", TRAINERTYPE_MOVES - db 44 + db 32 + dw BULBASAUR + dw GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF + db 32 dw IVYSAUR - dw RAZOR_LEAF, LEECH_SEED, TOXIC, SYNTHESIS - db 46 + dw GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF + db 32 dw VENUSAUR - dw BODY_SLAM, RAZOR_LEAF, GROWTH, SYNTHESIS - db 44 - dw BUNDRA - dw RAZOR_LEAF, ICE_BEAM, MIST, SYNTHESIS - db 46 - dw BUNDRAKE - dw RAZOR_LEAF, SURF, HEADBUTT, DEFENSE_CURL + dw BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT db -1 ; end next_list_item ; COOLTRAINERF (12) @@ -1914,18 +1815,12 @@ CooltrainerFGroup: next_list_item ; COOLTRAINERF (16) db "CYBIL@", TRAINERTYPE_MOVES - db 35 - dw LEDIAN - dw LIGHT_SCREEN, REFLECT, SUPERSONIC, COMET_PUNCH - db 35 + db 25 dw BUTTERFREE - dw PSYBEAM, SLEEP_POWDER, WHIRLWIND, GUST - db 36 + dw CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST + db 25 dw BELLOSSOM - dw SOLARBEAM, STUN_SPORE, ACID, MEGA_DRAIN - db 36 - dw SUNFLORA - dw SOLARBEAM, ENCORE, SYNTHESIS, SING + dw ABSORB, STUN_SPORE, ACID, SOLARBEAM db -1 ; end next_list_item ; COOLTRAINERF (17) @@ -1972,15 +1867,15 @@ CooltrainerFGroup: next_list_item ; COOLTRAINERF (21) db "CARA@", TRAINERTYPE_MOVES - db 42 + db 33 dw HORSEA dw SMOKESCREEN, LEER, WHIRLPOOL, TWISTER - db 42 + db 33 + dw HORSEA + dw SMOKESCREEN, LEER, WHIRLPOOL, TWISTER + db 35 dw SEADRA dw SWIFT, LEER, WATERFALL, TWISTER - db 42 - dw AMPHAROS - dw THUNDERBOLT, DAZZLING_GLEAM, COTTON_SPORE, THUNDER_WAVE db -1 ; end end_list_items @@ -2150,41 +2045,27 @@ PokemaniacGroup: next_list_item ; POKEMANIAC (4) db "SHANE@", TRAINERTYPE_NORMAL - db 29 - dw JIGGLYPUFF - db 29 - dw CLEFAIRY - db 30 + db 16 dw NIDORINA - db 30 + db 16 dw NIDORINO db -1 ; end next_list_item ; POKEMANIAC (5) db "BEN@", TRAINERTYPE_NORMAL - db 31 - dw GORILLAIMO - db 32 - dw DISTURBAN - db 33 + db 19 dw SLOWBRO db -1 ; end next_list_item ; POKEMANIAC (6) db "BRENT@", TRAINERTYPE_NORMAL - db 32 - dw GAVILLAIN - db 32 - dw LICKILORD + db 19 + dw LICKITUNG db -1 ; end next_list_item ; POKEMANIAC (7) db "RON@", TRAINERTYPE_NORMAL - db 31 - dw HYPNO - db 30 - dw WEARLYCAN - db 33 + db 19 dw NIDOKING db -1 ; end @@ -2214,9 +2095,8 @@ PokemaniacGroup: db 12 dw LICKITUNG dw LICK, SUPERSONIC, CUT, NO_MOVE - db 12 - dw WARFURS - dw SCRATCH, TAIL_WHIP, POWDER_SNOW, CUT + ; dw 12 + ; dw WARFURS db -1 ; end next_list_item ; POKEMANIAC (12) @@ -2229,10 +2109,8 @@ PokemaniacGroup: next_list_item ; POKEMANIAC (13) db "ZACH@", TRAINERTYPE_NORMAL - db 38 + db 27 dw RHYHORN - db 38 - dw TRAMPEL db -1 ; end next_list_item ; POKEMANIAC (14) @@ -2244,14 +2122,10 @@ PokemaniacGroup: next_list_item ; POKEMANIAC (15) db "MILLER@", TRAINERTYPE_NORMAL - db 28 + db 17 dw NIDOKING - db 28 + db 17 dw NIDOQUEEN - db 28 - dw NIDOREIGN - db 30 - dw KANGASKHAN db -1 ; end end_list_items @@ -2279,99 +2153,88 @@ GruntMGroup: next_list_item ; GRUNTM (3) db "GRUNT@", TRAINERTYPE_NORMAL - db 34 + db 24 + dw RATICATE + db 24 dw RATICATE - db 35 - dw ELECTRODE db -1 ; end next_list_item ; GRUNTM (4) db "GRUNT@", TRAINERTYPE_NORMAL - db 32 - dw QWILFISH - db 33 - dw ARIADOS - db 35 + db 23 + dw GRIMER + db 23 + dw GRIMER + db 25 dw MUK db -1 ; end next_list_item ; GRUNTM (5) db "GRUNT@", TRAINERTYPE_NORMAL - db 29 - dw KOFFING - db 29 - dw KOFFING - db 29 - dw KOFFING - db 29 - dw KOFFING - db 32 - dw WEEZING + db 21 + dw RATTATA + db 21 + dw RATTATA + db 23 + dw RATTATA + db 23 + dw RATTATA + db 23 + dw RATTATA db -1 ; end next_list_item ; GRUNTM (6) db "GRUNT@", TRAINERTYPE_NORMAL - db 30 - dw GOLBAT - db 31 - dw RATICATE - db 32 - dw GLOOM - db 32 - dw ELECTRODE + db 26 + dw ZUBAT + db 26 + dw ZUBAT db -1 ; end next_list_item ; GRUNTM (7) db "GRUNT@", TRAINERTYPE_NORMAL - db 33 + db 23 dw KOFFING - db 33 + db 23 dw GRIMER - db 34 - dw VICTREEBEL + db 23 + dw ZUBAT + db 23 + dw RATTATA db -1 ; end next_list_item ; GRUNTM (8) - db "GRUNT@", TRAINERTYPE_MOVES - db 33 - dw SNEASEL - dw THIEF, FURY_SWIPES, SCREECH, QUICK_ATTACK - db 32 + db "GRUNT@", TRAINERTYPE_NORMAL + db 26 dw WEEZING - dw THIEF, HAZE, SLUDGE, SELFDESTRUCT - db 35 - dw BELLEDAM - dw THIEF, SWEET_KISS, LOVELY_KISS, HEAL_BELL db -1 ; end next_list_item ; GRUNTM (9) db "GRUNT@", TRAINERTYPE_NORMAL - db 35 - dw MURKROW - db 34 - dw GRAVELER - db 36 - dw GRANBULL + db 24 + dw RATICATE + db 26 + dw KOFFING db -1 ; end next_list_item ; GRUNTM (10) db "GRUNT@", TRAINERTYPE_NORMAL - db 33 + db 22 + dw ZUBAT + db 24 dw GOLBAT - db 34 - dw SANDSLASH - db 35 - dw CROAKOZUNA + db 22 + dw GRIMER db -1 ; end next_list_item ; GRUNTM (11) db "GRUNT@", TRAINERTYPE_NORMAL - db 33 - dw TANGELA - db 33 - dw REROAD - db 36 + db 23 dw MUK + db 23 + dw KOFFING + db 25 + dw RATTATA db -1 ; end next_list_item ; GRUNTM (12) @@ -2382,90 +2245,78 @@ GruntMGroup: next_list_item ; GRUNTM (13) db "GRUNT@", TRAINERTYPE_NORMAL - db 34 - dw RATICATE - db 35 - dw FURRET - db 34 - dw DUNSPARCE + db 27 + dw RATTATA db -1 ; end next_list_item ; GRUNTM (14) db "GRUNT@", TRAINERTYPE_NORMAL - db 34 - dw BELLEDAM - db 34 + db 24 + dw RATICATE + db 24 dw GOLBAT db -1 ; end next_list_item ; GRUNTM (15) db "GRUNT@", TRAINERTYPE_NORMAL - db 33 - dw RATICATE - db 33 - dw RATICATE ; Should be Alolan later - db 35 + db 26 + dw GRIMER + db 23 dw WEEZING db -1 ; end next_list_item ; GRUNTM (16) db "GRUNT@", TRAINERTYPE_NORMAL - db 26 - dw EKANS - db 27 - dw KOFFING - db 27 - dw GRIMER - db 28 - dw RATICATE + db 16 + dw RATTATA + db 16 + dw RATTATA + db 16 + dw RATTATA + db 16 + dw RATTATA db -1 ; end next_list_item ; GRUNTM (17) db "GRUNT@", TRAINERTYPE_NORMAL - db 31 + db 18 dw GOLBAT - db 31 - dw ARBOK db -1 ; end next_list_item ; GRUNTM (18) db "GRUNT@", TRAINERTYPE_NORMAL - db 29 - dw GRAVELER - db 29 - dw SLOWPOKE - db 31 - dw BELLEDAM + db 17 + dw RATTATA + db 17 + dw ZUBAT + db 17 + dw RATTATA db -1 ; end next_list_item ; GRUNTM (19) db "GRUNT@", TRAINERTYPE_NORMAL - db 30 - dw VENOMOTH - db 30 - dw BEEDRILL - db 30 - dw ONIYANMA + db 18 + dw VENONAT + db 18 + dw VENONAT db -1 ; end next_list_item ; GRUNTM (20) db "GRUNT@", TRAINERTYPE_NORMAL - db 25 - dw ARIADOS - db 24 - dw GOLBAT - db 26 - dw HYPNO + db 17 + dw DROWZEE + db 19 + dw ZUBAT db -1 ; end next_list_item ; GRUNTM (21) db "GRUNT@", TRAINERTYPE_NORMAL - db 24 - dw RATICATE - db 23 + db 16 + dw ZUBAT + db 17 dw GRIMER - db 27 - dw ARBOK + db 18 + dw RATTATA db -1 ; end next_list_item ; GRUNTM (22) @@ -2482,18 +2333,18 @@ GruntMGroup: next_list_item ; GRUNTM (24) db "GRUNT@", TRAINERTYPE_NORMAL - db 35 - dw VENOMOTH - db 35 - dw MACHOKE + db 25 + dw KOFFING + db 25 + dw KOFFING db -1 ; end next_list_item ; GRUNTM (25) db "GRUNT@", TRAINERTYPE_NORMAL - db 35 - dw SNUBBULL - db 35 - dw WEEZING + db 24 + dw KOFFING + db 24 + dw MUK db -1 ; end next_list_item ; GRUNTM (26) @@ -2512,10 +2363,8 @@ GruntMGroup: next_list_item ; GRUNTM (28) db "GRUNT@", TRAINERTYPE_NORMAL - db 32 + db 19 dw RATICATE - db 32 - dw RATICATE ; Should be Alolan later db -1 ; end next_list_item ; GRUNTM (29) @@ -2588,16 +2437,14 @@ GentlemanGroup: SkierGroup: next_list_item ; SKIER (1) db "ROXANNE@", TRAINERTYPE_NORMAL - db 33 + db 28 dw JYNX - db 35 - dw BUU db -1 ; end next_list_item ; SKIER (2) db "CLARISSA@", TRAINERTYPE_NORMAL - db 37 - dw GLACEON + db 28 + dw DEWGONG db -1 ; end end_list_items @@ -2944,20 +2791,20 @@ FisherGroup: next_list_item ; FISHER (6) db "MARVIN@", TRAINERTYPE_NORMAL ; Route 43, so this is where stuff becomes real + db 30 + dw MAGIKARP + db 20 + dw GYARADOS db 35 dw MAGIKARP - db 29 - dw REROAD - db 30 - dw POLIWHIRL - db 32 + db 25 dw GYARADOS db -1 ; end next_list_item ; FISHER (7) db "TULLY@", TRAINERTYPE_NORMAL - db 32 - dw JABETTA + db 18 + dw QWILFISH db -1 ; end next_list_item ; FISHER (8) @@ -2984,25 +2831,20 @@ FisherGroup: next_list_item ; FISHER (10) db "WILTON@", TRAINERTYPE_NORMAL - db 34 - dw SEAKING - db 36 - dw POLIWRATH - db 37 - dw POLITOED + db 33 + dw MANTINE + db 35 + dw OCTILLERY db -1 ; end next_list_item ; FISHER (11) db "EDGAR@", TRAINERTYPE_MOVES ; Unsure about this guy - db 34 - dw GYARADOS - dw WATERFALL, LEER, DRAGON_RAGE, THRASH - db 35 - dw POLIWHIRL - dw WATER_GUN, COMET_PUNCH, LOW_KICK, HYPNOSIS - db 37 - dw OCTILLERY - dw LOCK_ON, PSYBEAM, AURORA_BEAM, OCTAZOOKA + db 25 + dw REMORAID + dw LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM + db 25 + dw REMORAID + dw LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM db -1 ; end next_list_item ; FISHER (12) @@ -3089,12 +2931,12 @@ FisherGroup: next_list_item ; FISHER (21) db "SCOTT@", TRAINERTYPE_NORMAL - db 47 - dw KAZAPPELIN - db 47 - dw QWILFATHER - db 47 - dw SEAKING ; OVERQWIL + db 30 + dw QWILFISH + db 30 + dw QWILFISH + db 34 + dw SEAKING db -1 ; end next_list_item ; FISHER (22) @@ -3732,28 +3574,16 @@ SuperNerdGroup: next_list_item ; SUPER_NERD (13) db "HUGH@", TRAINERTYPE_MOVES - db 42 + db 39 dw SEADRA dw SMOKESCREEN, TWISTER, SURF, WATERFALL - db 43 - dw MUK - dw SLUDGE, SCREECH, ACID_ARMOR, MINIMIZE - db 42 - dw MAGNETON - dw SPARK, TRI_ATTACK, LIGHT_SCREEN, SCREECH db -1 ; end next_list_item ; SUPER_NERD (14) db "MARKUS@", TRAINERTYPE_MOVES - db 29 - dw KOFFING - dw SMOG, SELFDESTRUCT, SLUDGE, SMOKESCREEN - db 29 - dw ELECTRODE - dw THUNDER_WAVE, SONICBOOM, SELFDESTRUCT, ROLLOUT - db 30 - dw SLOWKING - dw CURSE, WATER_GUN, CONFUSION, STRENGTH + db 19 + dw SLOWPOKE + dw CURSE, WATER_GUN, GROWL, STRENGTH db -1 ; end end_list_items @@ -3961,68 +3791,60 @@ HikerGroup: next_list_item ; HIKER (6) db "BENJAMIN@", TRAINERTYPE_NORMAL - db 30 - dw DONPHAN - db 29 - dw RHYHORN - db 30 - dw DUGTRIO + db 16 + dw PHANPY + db 16 + dw GEODUDE + db 18 + dw DUGTRIO ; WHAT THE FUCK YOU'RE AT MT MORTAR you can keep it tho db -1 ; end next_list_item ; HIKER (7) db "ERIK@", TRAINERTYPE_NORMAL ; outside blackthorn... - db 38 - dw RHYHORN - db 38 - dw MACHOKE - db 39 + db 24 + dw PHANPY + db 27 + dw GRAVELER + db 32 dw URSARING - db 40 - dw GOLEM db -1 ; end next_list_item ; HIKER (8) db "MICHAEL@", TRAINERTYPE_NORMAL - db 39 - dw GRAVELER - db 40 - dw SUDOWOODO - db 41 - dw RHYDON + db 25 + dw MACHOP + db 27 + dw GLIGAR + db 32 + dw GOLEM db -1 ; end next_list_item ; HIKER (9) db "PARRY@", TRAINERTYPE_NORMAL - db 40 + db 35 dw STEELIX - db 39 + db 33 ; Bulbapedia says he doesn't have a Swinub? Cool tho. dw PILOSWINE - db 40 - dw NIDOKING db -1 ; end next_list_item ; HIKER (10) db "TIMOTHY@", TRAINERTYPE_NORMAL ; changed to optimise, moves type is unnecessary. - db 39 + db 27 + dw LARVITAR + db 32 dw DUGTRIO - db 40 - dw DONPHAN - db 41 - dw GLISCOR db -1 ; end next_list_item ; HIKER (11) - db "BAILEY@", TRAINERTYPE_NORMAL - db 30 - dw GRAVELER - db 30 - dw GOLBAT - db 30 + db "BAILEY@", TRAINERTYPE_NORMAL ; genuinely deranged to have 5 L13 Geodudes when you're on the way to the Elite Four... + db 32 + dw SLUGMA + db 32 + dw PUPITAR + db 34 dw URSARING - db 31 - dw DUNSPARCE - db 31 - dw WOBBUFFET + db 38 + dw STEELIX db -1 ; end next_list_item ; HIKER (12) @@ -4246,20 +4068,20 @@ BlaineGroup: BurglarGroup: next_list_item ; BURGLAR (1) db "DUNCAN@", TRAINERTYPE_NORMAL ; Goldenrod tunnel, I believe during the rocket invasion. same with the next. evaluate levels. - db 32 - dw SLUGMA - db 33 - dw PERSIAN - db 35 + db 23 + dw TRUSTAN + db 25 dw MAGMAR + db 23 + dw HOUNDOUR db -1 ; end next_list_item ; BURGLAR (2) db "EDDIE@", TRAINERTYPE_NORMAL ; probably doesn't need type-moves - db 33 - dw HOUNDOUR - db 35 + db 26 dw TRUSTAN + db 24 + dw FURRET db -1 ; end next_list_item ; BURGLAR (3) @@ -4483,39 +4305,28 @@ BlackbeltGroup: db -1 ; end next_list_item ; BLACKBELT_T (6) - db "KIYO@", TRAINERTYPE_MOVES ; Boss fight who gives Tyrogue. - db 44 - dw JABETTA - dw SURF, WATERFALL, DRILL_PECK, JUMP_KICK - db 43 - dw CARAPTHOR - dw PIN_MISSILE, SWAGGER, STRENGTH, SUBSTITUTE - db 45 + db "KIYO@", TRAINERTYPE_NORMAL ; Boss fight who gives Tyrogue. + db 34 dw HITMONLEE - dw HI_JUMP_KICK, FORESIGHT, MIND_READER, MEDITATE - db 45 + db 34 dw HITMONCHAN - dw MACH_PUNCH, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH - db 45 + db 36 dw HITMONTOP ; Demonstrates all 3 evolutions instead of just two. - dw TRIPLE_KICK, RAPID_SPIN, AGILITY, COUNTER db -1 ; end next_list_item ; BLACKBELT_T (7) db "LANG@", TRAINERTYPE_NORMAL ; Cianwood gym - name changed due to spelling error db 31 - dw JABETTA + dw JABETTA ; JABETTA - is that in the game yet? lol db 31 dw PRIMEAPE - db 32 - dw WEARLYCAN + ; db 32 + ; dw WEARLYCAN db -1 ; end next_list_item ; BLACKBELT_T (8) db "KENJI@", TRAINERTYPE_NORMAL ; Only Kenji fight in Crystal - db 40 - dw HITMONTOP - db 41 + db 34 dw MACHAMP db -1 ; end @@ -4531,53 +4342,44 @@ BlackbeltGroup: end_list_items -ExecutiveMGroup: +ExecutiveMGroup: ; Unsure which is which. Little help? next_list_item ; EXECUTIVEM (2) - db "EXECUTIVE@", TRAINERTYPE_MOVES ; Radio Tower Proton - db 39 - dw DISTURBAN - dw SPIKES, CLAMP, POISON_GAS, PROTECT - db 39 - dw WEEZING - dw SLUDGE_BOMB, SMOKESCREEN, HAZE, SELFDESTRUCT - db 40 + db "EXECUTIVE@", TRAINERTYPE_MOVES + db 36 dw GOLBAT - dw WING_ATTACK, THRASH, SCREECH, CONFUSE_RAY - db 41 - dw SLOWBRO ; Needs to be Galarian eventually - dw WATER_GUN, CONFUSION, HEADBUTT, CURSE + dw LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK db -1 ; end next_list_item ; EXECUTIVEM (3) - db "EXECUTIVE@", TRAINERTYPE_MOVES ; Radio Tower Petrel - db 39 - dw BALUMBA - dw DRAINING_KISS, SELFDESTRUCT, CONFUSE_RAY, HYPNOSIS - db 38 - dw MIMMEO - dw TRANSFORM, REFLECT, LIGHT_SCREEN, MIST - db 39 + db "EXECUTIVE@", TRAINERTYPE_MOVES + db 30 + dw KOFFING + dw TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 30 + dw KOFFING + dw TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 30 + dw KOFFING + dw TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 32 dw WEEZING - dw SLUDGE_BOMB, SMOKESCREEN, HAZE, SELFDESTRUCT - db 40 - dw RATICATE ; Needs to be alolan eventually - dw SLASH, SUPER_FANG, SCREECH, FOCUS_ENERGY + dw TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN + db 30 + dw KOFFING + dw TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 30 + dw KOFFING + dw TACKLE, SMOG, SLUDGE, SMOKESCREEN db -1 ; end next_list_item ; EXECUTIVEM (4) - db "EXECUTIVE@", TRAINERTYPE_MOVES ; Rocket HQ Petrel - db 34 - dw BALUMBA - dw DRAINING_KISS, SELFDESTRUCT, CONFUSE_RAY, HYPNOSIS - db 34 - dw MIMMEO - dw TRANSFORM, REFLECT, LIGHT_SCREEN, MIST - db 35 - dw WEEZING - dw SLUDGE, SMOKESCREEN, HAZE, SELFDESTRUCT - db 37 + db "EXECUTIVE@", TRAINERTYPE_NORMAL + db 22 + dw ZUBAT + db 24 dw RATICATE - dw HYPER_FANG, SUPER_FANG, SCREECH, FOCUS_ENERGY + db 22 + dw KOFFING db -1 ; end end_list_items @@ -4659,36 +4461,27 @@ PsychicGroup: next_list_item ; PSYCHIC_T (8) db "PHIL@", TRAINERTYPE_MOVES - db 35 - dw XATU - dw CONFUSION, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY - db 35 + db 28 + dw NATU + dw LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY + db 32 dw KADABRA dw DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT - db 37 - dw GIRAFARIG - dw PSYBEAM, DOUBLE_KICK, STOMP, AGILITY db -1 ; end next_list_item ; PSYCHIC_T (9) db "RICHARD@", TRAINERTYPE_NORMAL - db 47 - dw ALAKAZAM db 46 - dw HYPNO - db 47 - dw MR__MIME - db 48 dw ESPEON db -1 ; end next_list_item ; PSYCHIC_T (10) db "GILBERT@", TRAINERTYPE_NORMAL ; your parents were so mean holy - db 46 + db 40 ; Kanto Route 47 dw STARMIE - db 45 - dw XATU - db 48 + db 40 + dw EXEGGUTOR + db 44 dw FARIGIRAF db -1 ; end @@ -4790,13 +4583,11 @@ PicnickerGroup: db -1 ; end next_list_item ; PICNICKER (10) - db "ERIN@", TRAINERTYPE_NORMAL - db 32 + db "ERIN@", TRAINERTYPE_NORMAL ; Route 46...post-blackthorn? I-I'm speechless, this genuinely makes me angry, TWO L16 PONYTAS + db 30 ; Technically post-Sudowoodo you can find your way there, but this is still unjustified as hell dw RAPIDASH db 33 dw FURRET - db 33 - dw ZORRIEGO db -1 ; end next_list_item ; PICNICKER (11) @@ -4845,16 +4636,16 @@ PicnickerGroup: next_list_item ; PICNICKER (16) db "TIFFANY@", TRAINERTYPE_MOVES ; Route 43 - db 34 - dw CLEFABLE - dw ENCORE, SING, DOUBLESLAP, FAIRY_WIND + db 31 + dw CLEFAIRY + dw ENCORE, SING, DOUBLESLAP, MINIMIZE db -1 ; end next_list_item ; PICNICKER (17) db "TIFFANY@", TRAINERTYPE_MOVES - db 40 - dw CLEFABLE - dw ENCORE, DOUBLESLAP, FAIRY_WIND, METRONOME + db 37 + dw CLEFAIRY + dw ENCORE, DOUBLESLAP, MINIMIZE, METRONOME db -1 ; end next_list_item ; PICNICKER (18) @@ -5028,8 +4819,8 @@ CamperGroup: next_list_item ; CAMPER (11) db "TED@", TRAINERTYPE_NORMAL - db 35 - dw PRIMEAPE + db 17 + dw MANKEY db -1 ; end next_list_item ; CAMPER (12) @@ -5109,9 +4900,9 @@ CamperGroup: next_list_item ; CAMPER (19) db "SPENCER@", TRAINERTYPE_NORMAL ; Route 43 db 30 - dw SANDSLASH + dw SANDSHREW db 30 - dw AMPHAROS + dw SANDSLASH db 32 dw GOLBAT db -1 ; end @@ -5146,12 +4937,12 @@ CamperGroup: next_list_item ; CAMPER (22) db "QUENTIN@", TRAINERTYPE_NORMAL ; Route 45 - db 40 - dw PRIMEAPE - db 40 + db 32 ; It seems the devs realised they messed up this area and fixed it real quick + dw FEAROW + db 32 + dw PRIMEAPE ; ANNIHILAPE? + db 34 dw TAUROS - db 40 - dw SKARMORY db -1 ; end end_list_items @@ -5159,37 +4950,38 @@ CamperGroup: ArianaGroup: ; Ariana next_list_item ; EXECUTIVEF (1) db "ARIANA@", TRAINERTYPE_MOVES ; Radio Tower - db 41 + db 30 + dw BELLEDAM + dw PURSUIT, HEAL_BELL, LOVELY_KISS, FAINT_ATTACK + db 32 dw ARBOK - dw ACID, DOUBLE_EDGE, WRAP, GLARE - db 42 - dw VILEPLUME - dw PETAL_DANCE, TOXIC, SLEEP_POWDER, MOONLIGHT - db 41 - dw HONCHKROW - dw WING_ATTACK, FAINT_ATTACK, SWAGGER, NIGHT_SHADE - db 43 - dw WEAVILE ; Needs to be Sneasler eventually - dw FAINT_ATTACK, BLIZZARD, FURY_SWIPES, DIG + dw WRAP, POISON_STING, BITE, GLARE + db 32 + dw MUK ; A fun thing we can do is acknowledge Team Rocket is Kantonian and give the Pokemon Kanto-exclusive TMs. Show they have money and power! + dw SLUDGE, SELFDESTRUCT, MINIMIZE, DISABLE + db 32 + dw VILEPLUME + dw ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID + db 32 + dw MURKROW + dw PECK, PURSUIT, HAZE, NIGHT_SHADE db -1 ; end next_list_item ; EXECUTIVEF (2) - db "ARIANA@", TRAINERTYPE_MOVES ; Rocket HQ - db 37 - dw BELLEDAM - dw FAINT_ATTACK, GROWL, LOVELY_KISS, SWEET_KISS - db 36 - dw VILEPLUME - dw MEGA_DRAIN, ACID, SLEEP_POWDER, MOONLIGHT - db 36 - dw MUK - dw SLUDGE, MOONBLAST, SCREECH, DISABLE - db 37 + db "ARIANA@", TRAINERTYPE_MOVES ; Rocket HQ - severely overtuned. consider revising. + db 32 dw ARBOK - dw ACID, HEADBUTT, GLARE, SCREECH - db 39 + dw WRAP, POISON_STING, BITE, GLARE + db 32 + dw VILEPLUME + dw ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID + db 32 dw HONCHKROW - dw WING_ATTACK, FAINT_ATTACK, SWAGGER, NIGHT_SHADE + dw PECK, PURSUIT, HAZE, NIGHT_SHADE + ; Sneasler + db 35 + dw JUNGELA + dw GIGA_DRAIN, NO_MOVE, NO_MOVE, NO_MOVE ; needs sorting - also, this thing is ridiculous. disrespectfully strong. db -1 ; end next_list_item ; EXECUTIVEF (3) @@ -5284,19 +5076,19 @@ SageGroup: dw VINE_WHIP, GROWTH, FLASH, NO_MOVE db -1 ; end -; So these sages are in the Bellchime Trail but end up being the Kimono Girls but again. +; So these sages are in the Dragon's Den but end up being the Kimono Girls but again. ; Let's give them the Eeveelutions the Kimono Girls don't have! next_list_item ; SAGE (9) db "GAKU@", TRAINERTYPE_NORMAL - db 45 - dw DODRIO - db 46 + db 42 + dw NOCTOWL + db 42 dw LEAFEON db -1 ; end next_list_item ; SAGE (10) db "MASA@", TRAINERTYPE_NORMAL - db 4 + db 42 dw NOCTOWL db 42 dw GLACEON @@ -5435,30 +5227,30 @@ MediumGroup: BoarderGroup: ; All in Pryce's Gym. Could expand to Ice Path and Seafoam. next_list_item ; BOARDER (1) db "RONALD@", TRAINERTYPE_NORMAL - db 33 - dw BUNICE - db 33 + db 28 + dw SNEASEL + db 29 dw DEWGONG - db 34 - dw BUNDRA + db 30 + dw SEEL db -1 ; end next_list_item ; BOARDER (2) db "BRAD@", TRAINERTYPE_NORMAL - db 34 + db 28 dw SWINUB - db 34 - dw WEARLYCAN + db 28 + dw SWINUB ; WARFURS db -1 ; end next_list_item ; BOARDER (3) db "DOUGLAS@", TRAINERTYPE_NORMAL - db 33 - dw SNEASEL - db 32 - dw BUNDRA - db 35 + db 27 + dw SHELLDER + db 30 dw CLOYSTER + db 26 + dw BUU db -1 ; end end_list_items @@ -5832,43 +5624,38 @@ GruntFGroup: next_list_item ; GRUNTF (2) db "GRUNT@", TRAINERTYPE_NORMAL - db 33 + db 26 dw ARBOK - db 33 - dw HYPNO - db 34 - dw TENTACRUEL db -1 ; end next_list_item ; GRUNTF (3) db "GRUNT@", TRAINERTYPE_NORMAL - db 34 + db 25 + dw GLOOM + db 25 dw GLOOM - db 36 - dw BELLIGNAN db -1 ; end next_list_item ; GRUNTF (4) db "GRUNT@", TRAINERTYPE_NORMAL - db 34 - dw ARBOK - db 35 - dw VILEPLUME - db 36 - dw BELLOSSOM + db 21 + dw EKANS + db 23 + dw ODDISH + db 21 + dw EKANS + db 24 + dw GLOOM db -1 ; end next_list_item ; GRUNTF (5) db "GRUNT@", TRAINERTYPE_MOVES - db 29 - dw SLOWPOKE - dw WATER_GUN, CONFUSION, DISABLE, HEADBUTT - db 30 - dw ARBOK - dw HEADBUTT, ACID, BITE, GLARE - db 31 - dw VILEPLUME - dw MEGA_DRAIN, ACID, STUN_SPORE, SLEEP_POWDER + db 18 + dw EKANS + dw WRAP, LEER, POISON_STING, BITE + db 18 + dw GLOOM + dw ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER db -1 ; end end_list_items @@ -5884,7 +5671,7 @@ MysticalmanGroup: dw MEGA_DRAIN, SLEEP_POWDER, LEECH_SEED, FAIRY_WIND db 31 dw ELECTRODE - dw SCREECH, SONICBOOM, SPARK, ROLLOUT + dw SCREECH, SONICBOOM, THUNDER, ROLLOUT db 30 dw KADABRA dw PSYBEAM, KINESIS, DISABLE, FLASH diff --git a/data/trainers/parties_new_classes.asm b/data/trainers/parties_new_classes.asm index e25d09a..85ab1ae 100644 --- a/data/trainers/parties_new_classes.asm +++ b/data/trainers/parties_new_classes.asm @@ -668,19 +668,15 @@ KurtGroup: ArcherGroup: next_list_item - db "ARCHER@", TRAINERTYPE_MOVES - db 42 + db "ARCHER@", TRAINERTYPE_NORMAL + db 33 dw ELECTRODE - dw THUNDER, ROLLOUT, THUNDER_WAVE, EXPLOSION - db 43 + db 33 dw MAGMAR - dw FLAMETHROWER, FAINT_ATTACK, SMOKESCREEN, CONFUSE_RAY - db 43 + db 33 dw GOLBAT - dw WING_ATTACK, THRASH, SCREECH, MEAN_LOOK - db 45 + db 35 dw HOUNDOOM - dw FIRE_BLAST, FAINT_ATTACK, SLUDGE_BOMB, SCARY_FACE db -1 ; end db "ARCHER@", TRAINERTYPE_NORMAL @@ -862,20 +858,20 @@ TwinsGroup: next_list_item ; TWINS (9) db "LEA & PIA@", TRAINERTYPE_MOVES - db 43 + db 35 dw DRATINI dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT - db 43 - dw SQUEAMATA - dw GLARE, DRAGONBREATH, ICE_BEAM, FURY_SWIPES + db 35 + dw DRATINI + dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT db -1 ; end next_list_item ; TWINS (10) db "LEA & PIA@", TRAINERTYPE_MOVES - db 43 - dw SQUEAMATA - dw GLARE, DRAGONBREATH, ICE_BEAM, FURY_SWIPES - db 43 + db 38 + dw DRATINI + dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT + db 38 dw DRATINI dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT db -1 ; end diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index debf2bb..21fc667 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -388,7 +388,7 @@ JohtoGrassWildMons: ; morn dbw 24, SMEARGLE dbw 26, QATU - dbw 24, AERCROW + dbw 24, QATU dbw 27, QATU dbw 25, SMEARGLE dbw 25, GIRAFARIG @@ -396,7 +396,7 @@ JohtoGrassWildMons: ; day dbw 24, SMEARGLE dbw 26, QATU - dbw 24, AERCROW + dbw 24, QATU dbw 27, QATU dbw 25, SMEARGLE dbw 25, GIRAFARIG @@ -618,29 +618,29 @@ JohtoGrassWildMons: def_grass_wildmons MOUNT_MORTAR_1F_OUTSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 27, RATICATE - dbw 27, KOTORA - dbw 26, MACHOP - dbw 28, GAOTORA - dbw 28, GRAVELER - dbw 29, RATICATE - dbw 28, GRENMAR + dbw 19, RATTATA + dbw 22, KOTORA + dbw 18, MACHOP + dbw 21, KOTORA + dbw 19, GEODUDE + dbw 20, RATICATE + dbw 20, GRENMAR ; day - dbw 27, RATICATE - dbw 27, KOTORA - dbw 26, MACHOP - dbw 28, GAOTORA - dbw 28, GRAVELER - dbw 29, RATICATE - dbw 28, GRENMAR + dbw 19, RATTATA + dbw 22, KOTORA + dbw 18, MACHOP + dbw 21, KOTORA + dbw 19, GEODUDE + dbw 20, RATICATE + dbw 20, GRENMAR ; nite - dbw 27, RATICATE - dbw 27, GOLBAT - dbw 26, MARILL - dbw 29, GOLBAT - dbw 28, GRAVELER - dbw 29, RATICATE - dbw 28, GRENMAR + dbw 18, RATTATA + dbw 22, ZUBAT + dbw 21, MARILL + dbw 22, GOLBAT + dbw 19, GEODUDE + dbw 20, RATICATE + dbw 20, GRENMAR end_grass_wildmons ; Also, Larvitar is available in the morning and daytime, unless it's B2F, wherein it's all-day. @@ -648,29 +648,29 @@ JohtoGrassWildMons: def_grass_wildmons MOUNT_MORTAR_1F_INSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 27, GRAVELER - dbw 29, RATICATE - dbw 28, MACHOKE - dbw 29, GRENMAR - dbw 28, MARILL - dbw 25, LARVITAR - dbw 30, LARVITAR + dbw 18, GEODUDE + dbw 19, RATTATA + dbw 20, MACHOP + dbw 20, GRENMAR + dbw 22, MARILL + dbw 22, LARVITAR + dbw 23, LARVITAR ; day - dbw 27, GRAVELER - dbw 29, RATICATE - dbw 28, MACHOKE - dbw 29, GRENMAR - dbw 28, MARILL - dbw 25, LARVITAR - dbw 30, LARVITAR + dbw 18, GEODUDE + dbw 19, RATTATA + dbw 20, MACHOP + dbw 20, GRENMAR + dbw 22, MARILL + dbw 22, LARVITAR + dbw 23, LARVITAR ; nite - dbw 27, GRAVELER - dbw 29, RATICATE - dbw 30, GRENMAR - dbw 29, ZUBAT - dbw 29, MARILL - dbw 30, MARILL - dbw 30, GOLBAT + dbw 18, GEODUDE + dbw 19, RATTATA + dbw 20, GRENMAR + dbw 22, ZUBAT + dbw 21, MARILL + dbw 22, GOLBAT + dbw 23, GOLBAT end_grass_wildmons def_grass_wildmons MOUNT_MORTAR_2F_INSIDE @@ -678,55 +678,55 @@ JohtoGrassWildMons: ; morn dbw 41, GRAVELER dbw 42, MACHOKE - dbw 42, GRAVELER - dbw 41, GRENMAR - dbw 45, AZUMARILL - dbw 42, PUPITAR - dbw 43, PUPITAR + dbw 41, GEODUDE + dbw 40, GRENMAR + dbw 48, MARILL + dbw 40, PUPITAR + dbw 40, PUPITAR ; day dbw 41, GRAVELER dbw 42, MACHOKE - dbw 42, GRAVELER - dbw 41, GRENMAR - dbw 45, AZUMARILL - dbw 42, PUPITAR - dbw 43, PUPITAR + dbw 41, GEODUDE + dbw 40, GRENMAR + dbw 48, MARILL + dbw 40, PUPITAR + dbw 40, PUPITAR ; nite dbw 41, GRAVELER - dbw 42, RATICATE - dbw 41, GRENMAR + dbw 41, GEODUDE + dbw 40, GRENMAR + dbw 40, GOLBAT + dbw 48, AZUMARILL + dbw 42, GOLBAT dbw 42, GOLBAT - dbw 45, AZUMARILL - dbw 43, GOLBAT - dbw 44, GOLBAT end_grass_wildmons def_grass_wildmons MOUNT_MORTAR_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 28, GRAVELER - dbw 29, GRAVELER - dbw 29, GOLBAT - dbw 31, AZUMARILL - dbw 30, GRENMAR - dbw 30, LARVITAR - dbw 31, LARVITAR + dbw 19, ZUBAT + dbw 20, ZUBAT + dbw 23, GOLBAT + dbw 21, MARILL + dbw 20, GRENMAR + dbw 24, LARVITAR + dbw 24, LARVITAR ; day - dbw 28, GRAVELER - dbw 29, GRAVELER - dbw 29, GOLBAT - dbw 31, AZUMARILL - dbw 30, GRENMAR - dbw 30, LARVITAR - dbw 31, LARVITAR + dbw 19, ZUBAT + dbw 20, ZUBAT + dbw 23, GOLBAT + dbw 21, MARILL + dbw 20, GRENMAR + dbw 24, LARVITAR + dbw 24, LARVITAR ; nite - dbw 28, GRAVELER - dbw 29, GRAVELER - dbw 29, GOLBAT - dbw 31, AZUMARILL - dbw 30, GRENMAR - dbw 30, LARVITAR - dbw 31, LARVITAR + dbw 19, ZUBAT + dbw 20, ZUBAT + dbw 23, GOLBAT + dbw 21, MARILL + dbw 20, GRENMAR + dbw 24, LARVITAR + dbw 24, LARVITAR end_grass_wildmons ; Ice Path is very close to working. It just doesn't have good frequency in Johto encounters. @@ -736,141 +736,141 @@ JohtoGrassWildMons: def_grass_wildmons ICE_PATH_1F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn - dbw 34, SWINUB - dbw 35, BUNICE - dbw 36, GOLBAT + dbw 31, SWINUB + dbw 32, SNEASEL + dbw 32, GOLBAT dbw 33, SWINUB dbw 34, SNEASEL - dbw 35, SMOOCHUM - dbw 36, SMOOCHUM + dbw 32, GOLBAT + dbw 32, GOLBAT ; day - dbw 34, SWINUB - dbw 35, BUNICE - dbw 36, GOLBAT + dbw 31, SWINUB + dbw 32, SNEASEL + dbw 32, GOLBAT dbw 33, SWINUB dbw 34, SNEASEL - dbw 35, SMOOCHUM - dbw 36, SMOOCHUM + dbw 32, GOLBAT + dbw 32, GOLBAT ; nite - dbw 34, DELIBIRD - dbw 35, SNEASEL - dbw 36, GOLBAT - dbw 33, BUNICE + dbw 31, DELIBIRD + dbw 32, SNEASEL + dbw 32, GOLBAT + dbw 33, DELIBIRD dbw 34, SNEASEL - dbw 35, WARFURS - dbw 36, WARFURS + dbw 32, GOLBAT + dbw 32, GOLBAT end_grass_wildmons def_grass_wildmons ICE_PATH_B1F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn + dbw 32, SWINUB + dbw 33, SNEASEL + dbw 33, GOLBAT dbw 34, SWINUB - dbw 35, BUNICE - dbw 36, GOLBAT - dbw 33, SWINUB - dbw 34, SNEASEL - dbw 35, SMOOCHUM - dbw 36, SMOOCHUM + dbw 35, SNEASEL + dbw 33, GOLBAT + dbw 32, JYNX ; day + dbw 32, SWINUB + dbw 33, SNEASEL + dbw 33, GOLBAT dbw 34, SWINUB - dbw 35, BUNICE - dbw 36, GOLBAT - dbw 33, SWINUB - dbw 34, SNEASEL - dbw 35, SMOOCHUM - dbw 36, SMOOCHUM + dbw 35, SNEASEL + dbw 33, GOLBAT + dbw 32, JYNX ; nite + dbw 32, DELIBIRD + dbw 33, SNEASEL + dbw 33, GOLBAT dbw 34, DELIBIRD dbw 35, SNEASEL - dbw 36, GOLBAT - dbw 33, BUNICE - dbw 34, SNEASEL - dbw 35, WARFURS - dbw 36, WARFURS + dbw 33, GOLBAT + dbw 32, JYNX ; BUU end_grass_wildmons def_grass_wildmons ICE_PATH_B2F_MAHOGANY_SIDE db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn - dbw 34, SWINUB - dbw 35, SNEASEL + dbw 33, SWINUB + dbw 34, SNEASEL dbw 34, GOLBAT - dbw 35, PILOSWINE + dbw 35, SWINUB dbw 36, SNEASEL - dbw 36, JYNX - dbw 37, JYNX + dbw 32, JYNX + dbw 34, JYNX ; day - dbw 34, SWINUB - dbw 35, SNEASEL + dbw 33, SWINUB + dbw 34, SNEASEL dbw 34, GOLBAT - dbw 35, PILOSWINE + dbw 35, SWINUB dbw 36, SNEASEL - dbw 36, JYNX - dbw 37, JYNX + dbw 32, JYNX + dbw 34, JYNX ; nite - dbw 34, WARFURS - dbw 35, SNEASEL + dbw 33, DELIBIRD + dbw 34, SNEASEL dbw 34, GOLBAT dbw 35, DELIBIRD dbw 36, SNEASEL - dbw 36, BUU - dbw 37, BUU + dbw 32, JYNX ; BUU + dbw 34, JYNX ; BUU end_grass_wildmons def_grass_wildmons ICE_PATH_B2F_BLACKTHORN_SIDE db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn - dbw 34, SWINUB - dbw 35, SNEASEL + dbw 33, SWINUB + dbw 34, SNEASEL dbw 34, GOLBAT - dbw 35, PILOSWINE + dbw 35, SWINUB dbw 36, SNEASEL - dbw 36, JYNX - dbw 37, JYNX + dbw 32, JYNX + dbw 34, JYNX ; day - dbw 34, SWINUB - dbw 35, SNEASEL + dbw 33, SWINUB + dbw 34, SNEASEL dbw 34, GOLBAT - dbw 35, PILOSWINE + dbw 35, SWINUB dbw 36, SNEASEL - dbw 36, JYNX - dbw 37, JYNX + dbw 32, JYNX + dbw 34, JYNX ; nite - dbw 34, WARFURS - dbw 35, SNEASEL + dbw 33, DELIBIRD + dbw 34, SNEASEL dbw 34, GOLBAT dbw 35, DELIBIRD - dbw 36, SNEASEL - dbw 36, BUU - dbw 37, BUU + dbw 36, GOLBAT + dbw 32, JYNX ; BUU + dbw 34, JYNX ; BUU end_grass_wildmons def_grass_wildmons ICE_PATH_B3F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn - dbw 34, WARFURS + dbw 34, SWINUB dbw 35, SNEASEL dbw 35, GOLBAT - dbw 36, PILOSWINE - dbw 36, SNEASEL + dbw 36, SWINUB + dbw 32, SNEASEL + dbw 34, JYNX dbw 36, JYNX - dbw 37, JYNX ; day - dbw 34, WARFURS + dbw 34, SWINUB dbw 35, SNEASEL dbw 35, GOLBAT - dbw 36, PILOSWINE - dbw 36, SNEASEL + dbw 36, SWINUB + dbw 32, SNEASEL + dbw 34, JYNX dbw 36, JYNX - dbw 37, JYNX ; nite - dbw 34, WARFURS + dbw 34, DELIBIRD dbw 35, SNEASEL dbw 35, GOLBAT dbw 36, DELIBIRD - dbw 36, SNEASEL - dbw 36, BUU - dbw 37, BUU + dbw 32, SNEASEL + dbw 34, JYNX ; BUU + dbw 36, JYNX ; BUU end_grass_wildmons def_grass_wildmons WHIRL_ISLAND_NW @@ -896,8 +896,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, DISTURBAN - dbw 44, DISTURBAN + dbw 45, SHELLDER ; DISTURBAN + dbw 44, SHELLDER ; DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -924,8 +924,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, DISTURBAN - dbw 44, DISTURBAN + dbw 45, SHELLDER ; DISTURBAN + dbw 44, SHELLDER ; DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -952,8 +952,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, DISTURBAN - dbw 44, DISTURBAN + dbw 45, SHELLDER ; DISTURBAN + dbw 44, SHELLDER ; DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -980,8 +980,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, DISTURBAN - dbw 44, DISTURBAN + dbw 45, SHELLDER ; DISTURBAN + dbw 44, SHELLDER ; DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -1008,8 +1008,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, DISTURBAN - dbw 44, DISTURBAN + dbw 45, SHELLDER ; DISTURBAN + dbw 44, SHELLDER ; DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -1036,8 +1036,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, DISTURBAN - dbw 44, DISTURBAN + dbw 45, SHELLDER ; DISTURBAN + dbw 44, SHELLDER ; DISTURBAN dbw 47, SLOWKING end_grass_wildmons @@ -1064,8 +1064,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, DISTURBAN - dbw 44, DISTURBAN + dbw 45, SHELLDER ; DISTURBAN + dbw 44, SHELLDER ; DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -1092,8 +1092,8 @@ JohtoGrassWildMons: dbw 52, GOLBAT dbw 53, CORSOLA dbw 54, QUAGSIRE - dbw 55, DISTURBAN - dbw 54, DISTURBAN + dbw 55, SHELLDER ; DISTURBAN + dbw 54, SHELLDER ; DISTURBAN dbw 54, SLOWKING end_grass_wildmons @@ -1240,29 +1240,29 @@ JohtoGrassWildMons: def_grass_wildmons DARK_CAVE_BLACKTHORN_ENTRANCE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn - dbw 31, DONPHAN - dbw 34, GOLBAT - dbw 33, DONPHAN - dbw 35, URSARING - dbw 34, URSARING - dbw 33, DUDUNSPARCE - dbw 34, DUDUNSPARCE + dbw 23, GEODUDE + dbw 23, ZUBAT + dbw 25, GRAVELER + dbw 25, URSARING + dbw 20, TEDDIURSA + dbw 23, GOLBAT + dbw 23, GOLBAT ; day - dbw 31, DONPHAN - dbw 34, GOLBAT - dbw 33, DONPHAN - dbw 35, URSARING - dbw 34, URSARING - dbw 33, DUDUNSPARCE - dbw 34, DUDUNSPARCE + dbw 23, GEODUDE + dbw 23, ZUBAT + dbw 25, GRAVELER + dbw 25, URSARING + dbw 30, URSARING + dbw 23, GOLBAT + dbw 23, GOLBAT ; nite - dbw 33, GRAVELER - dbw 31, GOLBAT - dbw 32, GRAVELER - dbw 33, WOBBUFFET - dbw 35, WOBBUFFET - dbw 33, DUDUNSPARCE - dbw 34, DUDUNSPARCE + dbw 23, GEODUDE + dbw 23, ZUBAT + dbw 25, GRAVELER + dbw 20, WOBBUFFET + dbw 25, WOBBUFFET + dbw 23, GOLBAT + dbw 23, GAVILLAIN end_grass_wildmons def_grass_wildmons ROUTE_29 @@ -1298,17 +1298,17 @@ JohtoGrassWildMons: ; morn dbw 3, LEDYBA dbw 3, CATERPIE - dbw 4, WEEDLE + dbw 4, CATERPIE dbw 4, LEDYBA - dbw 3, GENTLARVA + dbw 3, WEEDLE dbw 4, HOPPIP dbw 5, HOPPIP ; day - dbw 3, PIDGEY + dbw 3, LEDYBA dbw 3, CATERPIE - dbw 4, WEEDLE - dbw 4, PIDGEY - dbw 3, GENTLARVA + dbw 4, CATERPIE + dbw 4, LEDYBA + dbw 3, WEEDLE dbw 4, HOPPIP dbw 5, HOPPIP ; nite @@ -1332,14 +1332,14 @@ JohtoGrassWildMons: dbw 4, CATERPIE dbw 6, LEDYBA dbw 4, LEDYBA - dbw 4, CATERPIE + dbw 4, WEEDLE dbw 5, BELLSPROUT dbw 5, HOPPIP ; day - dbw 5, PIDGEY - dbw 4, GENTLARVA + dbw 5, LEDYBA + dbw 4, CATERPIE dbw 5, BELLSPROUT - dbw 4, PIDGEY + dbw 4, LEDYBA dbw 4, WEEDLE dbw 6, BELLSPROUT dbw 5, HOPPIP @@ -1348,7 +1348,7 @@ JohtoGrassWildMons: dbw 4, POLIWAG dbw 5, MOIBELLE dbw 5, HOOTHOOT - dbw 4, SPINARAK + dbw 4, BITTYBAT dbw 6, MOIBELLE dbw 5, MISDREAVUS end_grass_wildmons @@ -1386,7 +1386,7 @@ JohtoGrassWildMons: ; morn dbw 7, RATTATA dbw 8, SPEAROW - dbw 7, SUNKERN + dbw 7, GEODUDE dbw 9, SUNKERN dbw 8, EKANS dbw 8, AZURILL @@ -1394,7 +1394,7 @@ JohtoGrassWildMons: ; day dbw 7, RATTATA dbw 8, SPEAROW - dbw 7, SUNKERN + dbw 7, GEODUDE dbw 9, SUNKERN dbw 8, EKANS dbw 8, AZURILL @@ -1499,23 +1499,23 @@ JohtoGrassWildMons: def_grass_wildmons ROUTE_37 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 16, ZORRIEGO + dbw 16, GROWLITHE dbw 18, STANTLER - dbw 17, AERCROW - dbw 17, ZORRIEGO + dbw 17, PIDGEOTTO + dbw 17, GROWLITHE dbw 15, BONSLY dbw 18, LEDIAN dbw 19, LEDIAN ; day - dbw 16, ZORRIEGO + dbw 16, GROWLITHE dbw 17, STANTLER - dbw 17, AERCROW - dbw 18, ZORRIEGO + dbw 17, PIDGEOTTO + dbw 18, GROWLITHE dbw 15, BONSLY dbw 17, KOLTA dbw 18, KOLTA ; nite - dbw 16, ZORRIEGO + dbw 16, VULPIX dbw 18, STANTLER dbw 17, HOOTHOOT dbw 16, MURKROW @@ -1530,7 +1530,7 @@ JohtoGrassWildMons: db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn dbw 22, MEOWTH - dbw 20, SNUBBULL + dbw 20, FURRET dbw 21, MAGNEMITE dbw 22, FARFETCH_D dbw 23, MILTANK @@ -1538,7 +1538,7 @@ JohtoGrassWildMons: dbw 21, SNUBBULL ; day dbw 22, MEOWTH - dbw 20, SNUBBULL + dbw 20, FURRET dbw 21, MAGNEMITE dbw 22, FARFETCH_D dbw 23, MILTANK @@ -1589,7 +1589,7 @@ JohtoGrassWildMons: ; morn dbw 28, MANKEY dbw 28, ARBOK - dbw 28, MARILL + dbw 28, FEAROW dbw 29, FEAROW dbw 28, FLAAFFY dbw 29, FLAAFFY @@ -1597,7 +1597,7 @@ JohtoGrassWildMons: ; day dbw 28, MANKEY dbw 28, ARBOK - dbw 28, MARILL + dbw 28, FEAROW dbw 29, FEAROW dbw 28, FLAAFFY dbw 29, FLAAFFY @@ -1617,18 +1617,18 @@ JohtoGrassWildMons: ; morn dbw 31, FLAAFFY ; From Gold dbw 30, GIRAFARIG ; From Gold - dbw 33, LUXWAN + dbw 33, FARFETCH_D ; LUXWAN dbw 32, FURRET dbw 33, FURRET - dbw 32, TANGELA + dbw 32, FURRET dbw 34, TANGELA ; day dbw 31, FLAAFFY ; From Gold dbw 30, GIRAFARIG ; From Gold - dbw 33, LUXWAN + dbw 33, FARFETCH_D ; LUXWAN dbw 32, FURRET dbw 33, FURRET - dbw 32, TANGELA + dbw 32, FURRET dbw 34, TANGELA ; nite dbw 31, FLAAFFY ; From Gold @@ -1645,55 +1645,55 @@ JohtoGrassWildMons: ; morn dbw 33, TANGELA dbw 33, LICKITUNG - dbw 33, BUNICE + dbw 33, BELLSPROUT ; BUNICE dbw 34, WEEPINBELL dbw 32, LICKITUNG - dbw 32, BUNICE + dbw 33, LICKITUNG dbw 35, DELIBIRD ; day dbw 33, TANGELA dbw 33, LICKITUNG - dbw 33, BUNICE + dbw 33, BELLSPROUT ; BUNICE dbw 34, WEEPINBELL dbw 32, LICKITUNG - dbw 32, BUNICE + dbw 33, LICKITUNG dbw 35, DELIBIRD ; nite dbw 33, TANGELA dbw 33, POLIWHIRL - dbw 33, BUNICE + dbw 33, ODDISH ; WARFURS dbw 34, GLOOM dbw 32, POLIWHIRL - dbw 32, BUNICE + dbw 33, POLIWHIRL dbw 35, DELIBIRD end_grass_wildmons def_grass_wildmons ROUTE_45 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 36, DONPHAN - dbw 35, GRAVELER - dbw 35, GLIGAR - dbw 35, URSARING - dbw 36, GLIGAR + dbw 33, PHANPY + dbw 33, GRAVELER + dbw 34, GLIGAR + dbw 35, DONPHAN + dbw 30, PHANPY + dbw 37, SKARMORY dbw 37, SKARMORY - dbw 38, SKARMORY ; day - dbw 36, DONPHAN - dbw 35, GRAVELER - dbw 35, GLIGAR - dbw 35, URSARING - dbw 36, GLIGAR + dbw 33, PHANPY + dbw 33, GRAVELER + dbw 34, GLIGAR + dbw 35, DONPHAN + dbw 30, DONPHAN + dbw 37, SKARMORY dbw 37, SKARMORY - dbw 38, SKARMORY ; nite - dbw 36, DONPHAN - dbw 35, GRAVELER - dbw 35, GLIGAR - dbw 35, URSARING - dbw 36, GLIGAR - dbw 37, SKARMORY - dbw 38, SKARMORY + dbw 33, GEODUDE + dbw 33, GRAVELER + dbw 34, GLIGAR + dbw 35, DUNSPARCE + dbw 37, DUNSPARCE + dbw 37, URSARING + dbw 37, URSARING end_grass_wildmons ; Buff Phanpy encounter rates to replace Geodude in the daytime, expanding on Crystal's work. diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm index 919bbfc..ccaa1b1 100644 --- a/data/wild/johto_water.asm +++ b/data/wild/johto_water.asm @@ -4,51 +4,51 @@ JohtoWaterWildMons: def_water_wildmons RUINS_OF_ALPH_OUTSIDE db 2 percent ; encounter rate - dbw 20, WOOPER - dbw 23, QUAGSIRE + dbw 15, WOOPER dbw 20, QUAGSIRE + dbw 15, QUAGSIRE end_water_wildmons def_water_wildmons UNION_CAVE_1F db 2 percent ; encounter rate - dbw 20, WOOPER - dbw 23, QUAGSIRE - dbw 20, RIBBITO + dbw 15, WOOPER + dbw 20, QUAGSIRE + dbw 15, RIBBITO end_water_wildmons def_water_wildmons UNION_CAVE_B1F db 2 percent ; encounter rate - dbw 20, WOOPER - dbw 23, QUAGSIRE - dbw 20, RIBBITO + dbw 15, WOOPER + dbw 20, QUAGSIRE + dbw 15, RIBBITO end_water_wildmons def_water_wildmons UNION_CAVE_B2F db 4 percent ; encounter rate - dbw 23, RIBBITO - dbw 23, QUAGSIRE - dbw 25, TENTACRUEL + dbw 15, TENTACOOL + dbw 20, QUAGSIRE + dbw 20, TENTACRUEL end_water_wildmons def_water_wildmons SLOWPOKE_WELL_B1F db 2 percent ; encounter rate + dbw 15, SLOWPOKE dbw 20, SLOWPOKE - dbw 23, SLOWPOKE - dbw 20, SHELLDER + dbw 10, SHELLDER end_water_wildmons def_water_wildmons SLOWPOKE_WELL_B2F db 2 percent ; encounter rate - dbw 23, SLOWPOKE - dbw 25, DISTURBAN - dbw 25, SLOWBRO + dbw 15, SLOWPOKE + dbw 20, DISTURBAN + dbw 20, SLOWBRO end_water_wildmons def_water_wildmons ILEX_FOREST db 2 percent ; encounter rate dbw 20, PSYDUCK dbw 25, WEIRDUCK - dbw 30, GOLDUCK + dbw 35, GOLDUCK end_water_wildmons def_water_wildmons MOUNT_MORTAR_1F_OUTSIDE @@ -123,36 +123,36 @@ JohtoWaterWildMons: def_water_wildmons OLIVINE_PORT db 2 percent ; encounter rate - dbw 20, MANTYKE - dbw 20, CHINCHOU - dbw 25, TENTACOOL + dbw 30, TENTACOOL ; MANTYKE + dbw 35, CHINCHOU + dbw 30, TENTACRUEL end_water_wildmons def_water_wildmons ROUTE_30 db 2 percent ; encounter rate dbw 20, RIBBITO - dbw 20, POLIWAG - dbw 23, POLIWHIRL + dbw 15, POLIWAG + dbw 20, POLIWHIRL end_water_wildmons def_water_wildmons ROUTE_31 db 2 percent ; encounter rate dbw 20, RIBBITO - dbw 20, POLIWAG - dbw 23, POLIWHIRL + dbw 15, POLIWAG + dbw 20, POLIWHIRL end_water_wildmons def_water_wildmons ROUTE_32 db 6 percent ; encounter rate - dbw 20, TENTACOOL - dbw 23, QUAGSIRE - dbw 23, TENTACRUEL + dbw 15, TENTACOOL + dbw 20, QUAGSIRE + dbw 20, TENTACRUEL end_water_wildmons def_water_wildmons ROUTE_34 db 6 percent ; encounter rate dbw 20, MANTYKE - dbw 23, CHINCHOU + dbw 15, CHINCHOU dbw 20, TENTACOOL end_water_wildmons @@ -160,42 +160,42 @@ JohtoWaterWildMons: db 4 percent ; encounter rate dbw 20, MANTYKE dbw 25, WEIRDUCK - dbw 30, GOLDUCK + dbw 35, GOLDUCK end_water_wildmons def_water_wildmons ROUTE_40 db 6 percent ; encounter rate - dbw 22, SAILWING - dbw 21, TENTACOOL + dbw 22, TENTACOOL ; SAILWING + dbw 21, REMORAID dbw 23, CHINCHOU end_water_wildmons def_water_wildmons ROUTE_41 db 6 percent ; encounter rate - dbw 20, SAILWING - dbw 20, CHINCHOU + dbw 20, TENTACOOL ; SAILWING + dbw 20, REMORAID dbw 25, MANTINE end_water_wildmons def_water_wildmons ROUTE_42 db 4 percent ; encounter rate - dbw 27, SAILWING - dbw 28, GOLDEEN + dbw 30, GOLDEEN ; SAILWING + dbw 35, GOLDEEN dbw 30, SEAKING end_water_wildmons def_water_wildmons ROUTE_43 db 2 percent ; encounter rate - dbw 20, MAGIKARP - dbw 25, MAGIKARP - dbw 20, WOOPER + dbw 30, MAGIKARP + dbw 35, MAGIKARP + dbw 30, WOOPER end_water_wildmons def_water_wildmons ROUTE_44 db 2 percent ; encounter rate + dbw 35, SEEL dbw 30, SEEL - dbw 32, SEEL - dbw 34, DEWGONG + dbw 35, DEWGONG end_water_wildmons def_water_wildmons ROUTE_45 @@ -221,37 +221,37 @@ JohtoWaterWildMons: def_water_wildmons VIOLET_CITY db 2 percent ; encounter rate - dbw 20, GOLDEEN - dbw 22, GOLDEEN - dbw 25, SEAKING + dbw 30, GOLDEEN + dbw 31, GOLDEEN + dbw 35, SEAKING end_water_wildmons def_water_wildmons CIANWOOD_CITY db 6 percent ; encounter rate dbw 25, TENTACOOL dbw 20, CHINCHOU - dbw 25, POLIWHIRL + dbw 25, TENTACRUEL end_water_wildmons def_water_wildmons OLIVINE_CITY db 6 percent ; encounter rate - dbw 20, MANTYKE - dbw 20, CHINCHOU - dbw 25, TENTACOOL + dbw 20, TENTACOOL + dbw 15, CHINCHOU + dbw 20, TENTACRUEL end_water_wildmons def_water_wildmons ECRUTEAK_CITY db 2 percent ; encounter rate - dbw 20, GOLDEEN - dbw 22, GOLDEEN - dbw 25, SEAKING + dbw 31, GOLDEEN + dbw 32, GOLDEEN + dbw 35, SEAKING end_water_wildmons def_water_wildmons LAKE_OF_RAGE db 6 percent ; encounter rate - dbw 25, MAGIKARP dbw 20, MAGIKARP - dbw 25, GYARADOS + dbw 20, MAGIKARP + dbw 21, GYARADOS end_water_wildmons def_water_wildmons BLACKTHORN_CITY diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index 8b056a4..6c5a71b 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -114,60 +114,60 @@ KantoGrassWildMons: dbw 35, GOLBAT ; GAVILLAIN end_grass_wildmons - def_grass_wildmons VICTORY_ROAD ; all one map, needs separate encounter tables later + def_grass_wildmons VICTORY_ROAD db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 42, MACHOKE - dbw 43, RHYHORN - dbw 42, STEELIX - dbw 41, MAGCARGO - dbw 43, DONPHAN - dbw 41, TYROGUE - dbw 50, CHANSEY + dbw 34, GRAVELER + dbw 32, RHYHORN + dbw 33, ONIX + dbw 34, GOLBAT + dbw 35, SANDSLASH + dbw 35, RHYDON + dbw 35, RHYDON ; day - dbw 42, MACHOKE - dbw 43, RHYHORN - dbw 42, STEELIX - dbw 41, MAGCARGO - dbw 43, DONPHAN - dbw 41, TYROGUE - dbw 50, CHANSEY + dbw 34, GRAVELER + dbw 32, RHYHORN + dbw 33, ONIX + dbw 34, GOLBAT + dbw 35, SANDSLASH + dbw 35, RHYDON + dbw 35, RHYDON ; nite - dbw 42, GOLBAT - dbw 43, URSARING - dbw 42, STEELIX - dbw 41, HOUNDOOM - dbw 43, GAVILLAIN - dbw 41, LARVITAR - dbw 42, LARVITAR + dbw 34, GOLBAT + dbw 34, GRAVELER + dbw 32, ONIX + dbw 36, GRAVELER + dbw 38, GRAVELER + dbw 40, GRAVELER + dbw 40, GRAVELER end_grass_wildmons def_grass_wildmons TOHJO_FALLS db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 38, GOLBAT - dbw 38, RATICATE - dbw 39, NIDORINA - dbw 39, NIDORINO - dbw 40, GOLBAT - dbw 40, PUPITAR - dbw 41, PUPITAR + dbw 22, ZUBAT + dbw 22, RATICATE + dbw 24, GOLBAT + dbw 21, SLOWPOKE + dbw 20, RATTATA + dbw 23, SLOWPOKE + dbw 23, SLOWPOKE ; day - dbw 38, GOLBAT - dbw 38, RATICATE - dbw 39, NIDORINA - dbw 39, NIDORINO - dbw 40, GOLBAT - dbw 40, PUPITAR - dbw 41, PUPITAR + dbw 22, ZUBAT + dbw 22, RATICATE + dbw 24, GOLBAT + dbw 21, SLOWPOKE + dbw 20, RATTATA + dbw 23, SLOWPOKE + dbw 23, SLOWPOKE ; nite - dbw 38, GOLBAT - dbw 38, RATICATE - dbw 39, NIDORINA - dbw 39, NIDORINO - dbw 40, GOLBAT - dbw 40, PUPITAR - dbw 41, PUPITAR + dbw 22, ZUBAT + dbw 22, RATICATE + dbw 24, GOLBAT + dbw 21, SLOWPOKE + dbw 20, RATTATA + dbw 23, SLOWPOKE + dbw 23, SLOWPOKE end_grass_wildmons def_grass_wildmons ROUTE_1 @@ -763,57 +763,57 @@ KantoGrassWildMons: def_grass_wildmons ROUTE_26 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 39, SANDSLASH - dbw 39, BALUMBA - dbw 42, PONYTA - dbw 41, BALUMBA - dbw 40, DODRIO - dbw 41, ARBOK - dbw 42, ARBOK + dbw 48, DODUO + dbw 48, SANDSLASH + dbw 52, PONYTA + dbw 50, RATICATE + dbw 50, DODUO + dbw 50, ARBOK + dbw 50, ARBOK ; day - dbw 39, SANDSLASH - dbw 39, BALUMBA - dbw 42, PONYTA - dbw 41, BALUMBA - dbw 40, DODRIO - dbw 41, ARBOK - dbw 42, ARBOK + dbw 48, DODUO + dbw 48, SANDSLASH + dbw 52, PONYTA + dbw 50, RATICATE + dbw 50, DODUO + dbw 50, ARBOK + dbw 50, ARBOK ; nite - dbw 39, NOCTOWL - dbw 39, BALUMBA - dbw 41, NOCTOWL - dbw 40, RATICATE - dbw 41, QUAGSIRE - dbw 41, MAROWAK - dbw 42, MAROWAK + dbw 48, NOCTOWL + dbw 48, RATICATE + dbw 52, NOCTOWL + dbw 50, RATICATE + dbw 50, QUAGSIRE + dbw 50, QUAGSIRE + dbw 50, QUAGSIRE end_grass_wildmons def_grass_wildmons ROUTE_27 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 38, DODUO - dbw 38, ARBOK - dbw 40, FURRET - dbw 40, DODUO - dbw 41, PONYTA - dbw 40, DODRIO - dbw 41, DODRIO + dbw 48, DODUO + dbw 48, ARBOK + dbw 50, RATICATE + dbw 50, DODUO + dbw 52, PONYTA + dbw 50, DODRIO + dbw 50, DODRIO ; day - dbw 38, DODUO - dbw 38, ARBOK - dbw 40, FURRET - dbw 40, DODUO - dbw 41, PONYTA - dbw 40, DODRIO - dbw 41, DODRIO + dbw 48, DODUO + dbw 48, ARBOK + dbw 50, RATICATE + dbw 50, DODUO + dbw 52, PONYTA + dbw 50, DODRIO + dbw 50, DODRIO ; nite - dbw 38, CUBONE - dbw 38, NOCTOWL - dbw 40, RATICATE - dbw 40, QUAGSIRE - dbw 41, NOCTOWL - dbw 40, MAROWAK - dbw 41, MAROWAK + dbw 48, QUAGSIRE + dbw 48, NOCTOWL + dbw 50, RATICATE + dbw 50, QUAGSIRE + dbw 52, NOCTOWL + dbw 52, NOCTOWL + dbw 52, NOCTOWL end_grass_wildmons def_grass_wildmons ROUTE_28 diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm index 50d20db..5b09305 100644 --- a/data/wild/kanto_water.asm +++ b/data/wild/kanto_water.asm @@ -4,9 +4,9 @@ KantoWaterWildMons: def_water_wildmons TOHJO_FALLS db 4 percent ; encounter rate - dbw 35, MAGIKARP - dbw 30, MANTINE - dbw 30, SEAKING + dbw 20, GOLDEEN + dbw 20, SLOWPOKE + dbw 20, SEAKING end_water_wildmons def_water_wildmons VERMILION_PORT @@ -102,16 +102,16 @@ KantoWaterWildMons: def_water_wildmons ROUTE_26 db 6 percent ; encounter rate - dbw 30, BLOTTLE - dbw 35, PENDRAKEN - dbw 35, TENTACRUEL + dbw 30, TENTACOOL + dbw 25, TENTACOOL + dbw 30, TENTACRUEL end_water_wildmons def_water_wildmons ROUTE_27 db 6 percent ; encounter rate - dbw 30, BLOTTLE - dbw 35, PENDRAKEN - dbw 35, TENTACRUEL + dbw 20, TENTACOOL + dbw 15, TENTACOOL + dbw 20, TENTACRUEL end_water_wildmons def_water_wildmons ROUTE_28 diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index e4dc61f..c9a4f89 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -87,10 +87,6 @@ GeneratePartyMonStats: ld e, l ld d, h push hl - ; DE = wPartyMon Struct to fill - ; HL = wPartyMon Struct to fill - ; Stack: - ; > wPartyMon Struct to fill ; Initialize the species ld a, [wCurPartySpecies] @@ -99,7 +95,6 @@ GeneratePartyMonStats: ld a, [wBaseSpecies] ld [de], a inc de - ; DE = wPartyMonXItem ; Copy the item if it's a wild mon ld a, [wBattleMode] @@ -110,13 +105,9 @@ GeneratePartyMonStats: .skipitem ld [de], a inc de - ; DE = wPartyMonXMoves ; Copy the moves if it's a wild mon push de - ; Stack: - ; > wPartyMonX - ; > wPartyMonXMoves ld h, d ld l, e ld a, [wBattleMode] @@ -137,7 +128,7 @@ endr .randomlygeneratemoves xor a -rept NUM_MOVES +rept NUM_MOVES - 1 ld [hli], a endr ld [hl], a @@ -146,11 +137,9 @@ endr .next pop de - ; DE = wPartyMonXMoves rept NUM_MOVES inc de endr - ; DE = wPartyMonXID ; Initialize ID. ld a, [wPlayerID] @@ -159,7 +148,6 @@ endr ld a, [wPlayerID + 1] ld [de], a inc de - ; DE = wPartyMonXExp ; Initialize Exp. push de @@ -224,8 +212,6 @@ endr ld [de], a ; Set Shininess for New Dex Entry - push hl - push de dec de ld b, d ld c, e @@ -238,19 +224,18 @@ endr inc a .shinycont ld [wPokedexShinyToggle], a - pop de - pop hl - inc de ; now at wPartyMonXPP + ; Unclobber de + inc de + inc de ; Initialize PP. -.PPBugDebug push hl push de inc hl - inc hl ; now at wPartyMonXMoves + inc hl call FillPP pop de - pop hl ; now at wPartyMonX + pop hl rept NUM_MOVES inc de endr @@ -285,10 +270,8 @@ endr inc de ; Initialize HP. -.HPBugDebug ld bc, MON_STAT_EXP - 1 - ;ld bc, 11 - add hl, bc ; now wPartyMonXHPExp + add hl, bc ld a, 1 ld c, a ld b, FALSE @@ -408,13 +391,11 @@ endr ret FillPP: - ; HL = Mon Moves - ; DE = Mon PP push bc ld b, NUM_MOVES .loop ld a, [hli] - and a ; test if A == 0 without changing A + and a jr z, .next push hl push de diff --git a/gfx/footprints/deoxys.png b/gfx/footprints/deoxys.png deleted file mode 100644 index dfe2ee3..0000000 Binary files a/gfx/footprints/deoxys.png and /dev/null differ diff --git a/gfx/footprints/evolotto.png b/gfx/footprints/evolotto.png deleted file mode 100644 index dfe2ee3..0000000 Binary files a/gfx/footprints/evolotto.png and /dev/null differ diff --git a/gfx/footprints_johto.asm b/gfx/footprints_johto.asm index 47889ff..b87de9a 100644 --- a/gfx/footprints_johto.asm +++ b/gfx/footprints_johto.asm @@ -176,7 +176,6 @@ INCBIN "gfx/footprints/inoshika.1bpp" INCBIN "gfx/footprints/ruddernaut.1bpp" INCBIN "gfx/footprints/pixytop.1bpp" INCBIN "gfx/footprints/mawtle.1bpp" -INCBIN "gfx/footprints/evolotto.1bpp" INCBIN "gfx/footprints/xylodon.1bpp" INCBIN "gfx/footprints/xylofin.1bpp" INCBIN "gfx/footprints/dokuroar.1bpp" @@ -202,7 +201,6 @@ INCBIN "gfx/footprints/ho_oh.1bpp" INCBIN "gfx/footprints/hyoshu_yang.1bpp" INCBIN "gfx/footprints/hyoshu_yin.1bpp" INCBIN "gfx/footprints/celebi.1bpp" -INCBIN "gfx/footprints/deoxys.1bpp" INCBIN "gfx/footprints/252.1bpp" INCBIN "gfx/footprints/253.1bpp" INCBIN "gfx/footprints/254.1bpp" diff --git a/gfx/pics.asm b/gfx/pics.asm index 11e027e..4844a02 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -880,6 +880,22 @@ ToedscruelFrontpic: INCBIN "gfx/pokemon/toedscruel/front.animated.2bpp.lz" ToedscruelBackpic: INCBIN "gfx/pokemon/toedscruel/back.2bpp.lz" BlottleFrontpic: INCBIN "gfx/pokemon/blottle/front.animated.2bpp.lz" BlottleBackpic: INCBIN "gfx/pokemon/blottle/back.2bpp.lz" +PendrakenFrontpic: INCBIN "gfx/pokemon/pendraken/front.animated.2bpp.lz" +PendrakenBackpic: INCBIN "gfx/pokemon/pendraken/back.2bpp.lz" +KoltaFrontpic: INCBIN "gfx/pokemon/kolta/front.animated.2bpp.lz" +KoltaBackpic: INCBIN "gfx/pokemon/kolta/back.2bpp.lz" +BalumbaFrontpic: INCBIN "gfx/pokemon/balumba/front.animated.2bpp.lz" +BalumbaBackpic: INCBIN "gfx/pokemon/balumba/back.2bpp.lz" +MagnetiteFrontpic: INCBIN "gfx/pokemon/magnetite/front.animated.2bpp.lz" +MagnetiteBackpic: INCBIN "gfx/pokemon/magnetite/back.2bpp.lz" +MagnezoneFrontpic: INCBIN "gfx/pokemon/magnezone/front.animated.2bpp.lz" +MagnezoneBackpic: INCBIN "gfx/pokemon/magnezone/back.2bpp.lz" +GavillainFrontpic: INCBIN "gfx/pokemon/gavillain/front.animated.2bpp.lz" +GavillainBackpic: INCBIN "gfx/pokemon/gavillain/back.2bpp.lz" +BuuFrontpic: INCBIN "gfx/pokemon/buu/front.animated.2bpp.lz" +BuuBackpic: INCBIN "gfx/pokemon/buu/back.2bpp.lz" +GrenmarFrontpic: INCBIN "gfx/pokemon/grenmar/front.animated.2bpp.lz" +GrenmarBackpic: INCBIN "gfx/pokemon/grenmar/back.2bpp.lz" SECTION "Pics 23", ROMX @@ -1107,30 +1123,10 @@ PixytopFrontpic: INCBIN "gfx/pokemon/pixytop/front.animated.2bpp.lz" PixytopBackpic: INCBIN "gfx/pokemon/pixytop/back.2bpp.lz" MawtleFrontpic: INCBIN "gfx/pokemon/mawtle/front.animated.2bpp.lz" MawtleBackpic: INCBIN "gfx/pokemon/mawtle/back.2bpp.lz" -EvolottoFrontpic: INCBIN "gfx/pokemon/evolotto/front.animated.2bpp.lz" -EvolottoBackpic: INCBIN "gfx/pokemon/evolotto/back.2bpp.lz" AlphalithFrontpic: INCBIN "gfx/pokemon/alphalith/front.animated.2bpp.lz" AlphalithBackpic: INCBIN "gfx/pokemon/alphalith/back.2bpp.lz" -SECTION "Pics 29", ROMX -PendrakenFrontpic: INCBIN "gfx/pokemon/pendraken/front.animated.2bpp.lz" -PendrakenBackpic: INCBIN "gfx/pokemon/pendraken/back.2bpp.lz" -KoltaFrontpic: INCBIN "gfx/pokemon/kolta/front.animated.2bpp.lz" -KoltaBackpic: INCBIN "gfx/pokemon/kolta/back.2bpp.lz" -BalumbaFrontpic: INCBIN "gfx/pokemon/balumba/front.animated.2bpp.lz" -BalumbaBackpic: INCBIN "gfx/pokemon/balumba/back.2bpp.lz" -MagnetiteFrontpic: INCBIN "gfx/pokemon/magnetite/front.animated.2bpp.lz" -MagnetiteBackpic: INCBIN "gfx/pokemon/magnetite/back.2bpp.lz" -MagnezoneFrontpic: INCBIN "gfx/pokemon/magnezone/front.animated.2bpp.lz" -MagnezoneBackpic: INCBIN "gfx/pokemon/magnezone/back.2bpp.lz" -GavillainFrontpic: INCBIN "gfx/pokemon/gavillain/front.animated.2bpp.lz" -GavillainBackpic: INCBIN "gfx/pokemon/gavillain/back.2bpp.lz" -BuuFrontpic: INCBIN "gfx/pokemon/buu/front.animated.2bpp.lz" -BuuBackpic: INCBIN "gfx/pokemon/buu/back.2bpp.lz" -GrenmarFrontpic: INCBIN "gfx/pokemon/grenmar/front.animated.2bpp.lz" -GrenmarBackpic: INCBIN "gfx/pokemon/grenmar/back.2bpp.lz" -DeoxysFrontpic: INCBIN "gfx/pokemon/deoxys/front.animated.2bpp.lz" -DeoxysBackpic: INCBIN "gfx/pokemon/deoxys/back.2bpp.lz" + ; spillover KabutopsFossilPic: INCBIN "gfx/trainers/kabutops.2bpp.lz" AerodactylFossilPic: INCBIN "gfx/trainers/aerodactyl.2bpp.lz" \ No newline at end of file diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 2e8ce81..297250e 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -402,7 +402,6 @@ AnimationPointers: dw RuddernautAnimation dw PixytopAnimation dw MawtleAnimation - dw EvolottoAnimation dw XylodonAnimation dw XylofinAnimation dw DokuroarAnimation @@ -428,5 +427,4 @@ AnimationPointers: dw HyoshuYangAnimation dw HyoshuYinAnimation dw CelebiAnimation - dw DeoxysAnimation assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 240a81e..3979f65 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -400,7 +400,6 @@ InoshikaAnimation: INCLUDE "gfx/pokemon/inoshika/anim.asm" RuddernautAnimation: INCLUDE "gfx/pokemon/ruddernaut/anim.asm" PixytopAnimation: INCLUDE "gfx/pokemon/pixytop/anim.asm" MawtleAnimation: INCLUDE "gfx/pokemon/mawtle/anim.asm" -EvolottoAnimation: INCLUDE "gfx/pokemon/evolotto/anim.asm" XylodonAnimation: INCLUDE "gfx/pokemon/xylodon/anim.asm" XylofinAnimation: INCLUDE "gfx/pokemon/xylofin/anim.asm" DokuroarAnimation: INCLUDE "gfx/pokemon/dokuroar/anim.asm" @@ -427,5 +426,4 @@ HoOhAnimation: INCLUDE "gfx/pokemon/ho_oh/anim.asm" HyoshuYangAnimation: INCLUDE "gfx/pokemon/hyoshu_yang/anim.asm" HyoshuYinAnimation: INCLUDE "gfx/pokemon/hyoshu_yin/anim.asm" CelebiAnimation: INCLUDE "gfx/pokemon/celebi/anim.asm" -DeoxysAnimation: INCLUDE "gfx/pokemon/deoxys/anim.asm" EggAnimation: INCLUDE "gfx/pokemon/egg/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 00a9c20..d16cde3 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -402,7 +402,6 @@ BitmasksPointers: dw RuddernautBitmasks dw PixytopBitmasks dw MawtleBitmasks - dw EvolottoBitmasks dw XylodonBitmasks dw XylofinBitmasks dw DokuroarBitmasks @@ -429,5 +428,4 @@ BitmasksPointers: dw HyoshuYangBitmasks dw HyoshuYinBitmasks dw CelebiBitmasks - dw DeoxysBitmasks assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 46a85b5..9d50afa 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -400,7 +400,6 @@ InoshikaBitmasks: INCLUDE "gfx/pokemon/inoshika/bitmask.asm" RuddernautBitmasks: INCLUDE "gfx/pokemon/ruddernaut/bitmask.asm" PixytopBitmasks: INCLUDE "gfx/pokemon/pixytop/bitmask.asm" MawtleBitmasks: INCLUDE "gfx/pokemon/mawtle/bitmask.asm" -EvolottoBitmasks: INCLUDE "gfx/pokemon/evolotto/bitmask.asm" XylodonBitmasks: INCLUDE "gfx/pokemon/xylodon/bitmask.asm" XylofinBitmasks: INCLUDE "gfx/pokemon/xylofin/bitmask.asm" DokuroarBitmasks: INCLUDE "gfx/pokemon/dokuroar/bitmask.asm" @@ -427,5 +426,4 @@ HoOhBitmasks: INCLUDE "gfx/pokemon/ho_oh/bitmask.asm" HyoshuYangBitmasks: INCLUDE "gfx/pokemon/hyoshu_yang/bitmask.asm" HyoshuYinBitmasks: INCLUDE "gfx/pokemon/hyoshu_yin/bitmask.asm" CelebiBitmasks: INCLUDE "gfx/pokemon/celebi/bitmask.asm" -DeoxysBitmasks: INCLUDE "gfx/pokemon/deoxys/bitmask.asm" EggBitmasks: INCLUDE "gfx/pokemon/egg/bitmask.asm" diff --git a/gfx/pokemon/deoxys/anim.asm b/gfx/pokemon/deoxys/anim.asm deleted file mode 100644 index e859e93..0000000 --- a/gfx/pokemon/deoxys/anim.asm +++ /dev/null @@ -1,12 +0,0 @@ - frame 1, 06 - frame 2, 06 - frame 1, 06 - frame 2, 06 - frame 1, 06 - frame 3, 06 - frame 4, 06 - frame 3, 06 - frame 5, 06 - frame 3, 06 - frame 0, 06 - endanim \ No newline at end of file diff --git a/gfx/pokemon/deoxys/anim_idle.asm b/gfx/pokemon/deoxys/anim_idle.asm deleted file mode 100644 index bffb357..0000000 --- a/gfx/pokemon/deoxys/anim_idle.asm +++ /dev/null @@ -1,5 +0,0 @@ - frame 1, 06 - frame 2, 06 - frame 1, 06 - frame 2, 06 - endanim \ No newline at end of file diff --git a/gfx/pokemon/deoxys/back.png b/gfx/pokemon/deoxys/back.png deleted file mode 100644 index 6fcb9cb..0000000 Binary files a/gfx/pokemon/deoxys/back.png and /dev/null differ diff --git a/gfx/pokemon/deoxys/front.png b/gfx/pokemon/deoxys/front.png deleted file mode 100644 index fc4072b..0000000 Binary files a/gfx/pokemon/deoxys/front.png and /dev/null differ diff --git a/gfx/pokemon/deoxys/shiny.pal b/gfx/pokemon/deoxys/shiny.pal deleted file mode 100644 index 6a7a53d..0000000 --- a/gfx/pokemon/deoxys/shiny.pal +++ /dev/null @@ -1,13 +0,0 @@ - - RGB 08, 25, 11 - RGB 31, 26, 07 - - - - - - - - - - diff --git a/gfx/pokemon/evolotto/anim.asm b/gfx/pokemon/evolotto/anim.asm deleted file mode 100644 index 875f7be..0000000 --- a/gfx/pokemon/evolotto/anim.asm +++ /dev/null @@ -1 +0,0 @@ - endanim \ No newline at end of file diff --git a/gfx/pokemon/evolotto/anim_idle.asm b/gfx/pokemon/evolotto/anim_idle.asm deleted file mode 100644 index 875f7be..0000000 --- a/gfx/pokemon/evolotto/anim_idle.asm +++ /dev/null @@ -1 +0,0 @@ - endanim \ No newline at end of file diff --git a/gfx/pokemon/evolotto/back.png b/gfx/pokemon/evolotto/back.png deleted file mode 100644 index c7216be..0000000 Binary files a/gfx/pokemon/evolotto/back.png and /dev/null differ diff --git a/gfx/pokemon/evolotto/front.png b/gfx/pokemon/evolotto/front.png deleted file mode 100644 index e0a9da9..0000000 Binary files a/gfx/pokemon/evolotto/front.png and /dev/null differ diff --git a/gfx/pokemon/evolotto/shiny.pal b/gfx/pokemon/evolotto/shiny.pal deleted file mode 100644 index 5c88669..0000000 --- a/gfx/pokemon/evolotto/shiny.pal +++ /dev/null @@ -1,2 +0,0 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index e9ecdeb..c8b4fd4 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -402,7 +402,6 @@ FramesPointers: dba RuddernautFrames dba PixytopFrames dba MawtleFrames - dba EvolottoFrames dba XylodonFrames dba XylofinFrames dba DokuroarFrames @@ -429,5 +428,4 @@ FramesPointers: dba HyoshuYangFrames dba HyoshuYinFrames dba CelebiFrames - dba DeoxysFrames assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/gorochu/front.png b/gfx/pokemon/gorochu/front.png index 0aea2fa..e0a9da9 100644 Binary files a/gfx/pokemon/gorochu/front.png and b/gfx/pokemon/gorochu/front.png differ diff --git a/gfx/pokemon/gorochu/shiny.pal b/gfx/pokemon/gorochu/shiny.pal index 1861bff..5c88669 100644 --- a/gfx/pokemon/gorochu/shiny.pal +++ b/gfx/pokemon/gorochu/shiny.pal @@ -1,2 +1,2 @@ - RGB 21, 16, 14 - RGB 21, 04, 06 \ No newline at end of file + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index ab222c4..f3ae200 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -402,7 +402,6 @@ AnimationIdlePointers: dw RuddernautAnimationIdle dw PixytopAnimationIdle dw MawtleAnimationIdle - dw EvolottoAnimationIdle dw XylodonAnimationIdle dw XylofinAnimationIdle dw DokuroarAnimationIdle @@ -428,5 +427,4 @@ AnimationIdlePointers: dw HyoshuYangAnimationIdle dw HyoshuYinAnimationIdle dw CelebiAnimationIdle - dw DeoxysAnimationIdle assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index f82072c..5f94472 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -400,7 +400,6 @@ InoshikaAnimationIdle: INCLUDE "gfx/pokemon/inoshika/anim_idle.asm" RuddernautAnimationIdle: INCLUDE "gfx/pokemon/ruddernaut/anim_idle.asm" PixytopAnimationIdle: INCLUDE "gfx/pokemon/pixytop/anim_idle.asm" MawtleAnimationIdle: INCLUDE "gfx/pokemon/mawtle/anim_idle.asm" -EvolottoAnimationIdle: INCLUDE "gfx/pokemon/evolotto/anim_idle.asm" XylodonAnimationIdle: INCLUDE "gfx/pokemon/xylodon/anim_idle.asm" XylofinAnimationIdle: INCLUDE "gfx/pokemon/xylofin/anim_idle.asm" DokuroarAnimationIdle: INCLUDE "gfx/pokemon/dokuroar/anim_idle.asm" @@ -427,5 +426,4 @@ HoOhAnimationIdle: INCLUDE "gfx/pokemon/ho_oh/anim_idle.asm" HyoshuYangAnimationIdle: INCLUDE "gfx/pokemon/hyoshu_yang/anim_idle.asm" HyoshuYinAnimationIdle: INCLUDE "gfx/pokemon/hyoshu_yin/anim_idle.asm" CelebiAnimationIdle: INCLUDE "gfx/pokemon/celebi/anim_idle.asm" -DeoxysAnimationIdle: INCLUDE "gfx/pokemon/deoxys/anim_idle.asm" EggAnimationIdle: INCLUDE "gfx/pokemon/egg/anim_idle.asm" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index 9165dd0..c48ab7d 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -176,7 +176,6 @@ InoshikaFrames: INCLUDE "gfx/pokemon/inoshika/frames.asm" RuddernautFrames: INCLUDE "gfx/pokemon/ruddernaut/frames.asm" PixytopFrames: INCLUDE "gfx/pokemon/pixytop/frames.asm" MawtleFrames: INCLUDE "gfx/pokemon/mawtle/frames.asm" -EvolottoFrames: INCLUDE "gfx/pokemon/evolotto/frames.asm" XylodonFrames: INCLUDE "gfx/pokemon/xylodon/frames.asm" XylofinFrames: INCLUDE "gfx/pokemon/xylofin/frames.asm" DokuroarFrames: INCLUDE "gfx/pokemon/dokuroar/frames.asm" @@ -203,5 +202,4 @@ HoOhFrames: INCLUDE "gfx/pokemon/ho_oh/frames.asm" HyoshuYangFrames: INCLUDE "gfx/pokemon/hyoshu_yang/frames.asm" HyoshuYinFrames: INCLUDE "gfx/pokemon/hyoshu_yin/frames.asm" CelebiFrames: INCLUDE "gfx/pokemon/celebi/frames.asm" -DeoxysFrames: INCLUDE "gfx/pokemon/deoxys/frames.asm" EggFrames: INCLUDE "gfx/pokemon/egg/frames.asm" diff --git a/gfx/pokemon/nidoqueen/shiny.pal b/gfx/pokemon/nidoqueen/shiny.pal index 25ea81f..b27c118 100644 --- a/gfx/pokemon/nidoqueen/shiny.pal +++ b/gfx/pokemon/nidoqueen/shiny.pal @@ -1,4 +1,4 @@ - RGB 26, 27, 17 - RGB 28, 09, 24 + RGB 31, 16, 31 + RGB 11, 13, 08 diff --git a/gfx/pokemon/pendraken/front.png b/gfx/pokemon/pendraken/front.png index 94e6989..e0a9da9 100644 Binary files a/gfx/pokemon/pendraken/front.png and b/gfx/pokemon/pendraken/front.png differ diff --git a/layout.link b/layout.link index d4aa4b2..7c2ee5b 100644 --- a/layout.link +++ b/layout.link @@ -63,6 +63,7 @@ ROMX $0d "Effect Commands" ROMX $0e "Enemy Trainers" + "Enemy Trainer Parties 2" ROMX $0f "Battle Core" ROMX $10 @@ -318,8 +319,6 @@ ROMX $80 "Pic Pointers" ROMX $81 "Enemy Trainer Parties 4" -ROMX $82 - "Enemy Trainer Parties 2" ; moved up here, hope this doesn't break things WRAM0 "Stack" "Audio RAM" diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 6a33951..65edaa5 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -8,23 +8,23 @@ DebugRoom_MapScripts: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, WEARLYCAN + getmonname STRING_BUFFER_3, WARFURS writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke WEARLYCAN, 53, MASTER_BALL + givepoke WARFURS, 23, RARE_CANDY closetext end DebugPokemon2Script: opentext - getmonname STRING_BUFFER_3, EVOLOTTO + getmonname STRING_BUFFER_3, FOLAGE writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke EVOLOTTO, 31, RARE_CANDY + givepoke FOLAGE, 31, RARE_CANDY closetext end @@ -39,11 +39,11 @@ DebugPokemon3Script: faceplayer opentext writetext DebugTextA - cry DEOXYS + cry BELLSPROUT pause 15 closetext - loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY - loadwildmon DEOXYS, 5 + loadvar VAR_BATTLETYPE, BATTLETYPE_INVERSE + loadwildmon BELLSPROUT, 10 startbattle reloadmapafterbattle end @@ -56,11 +56,11 @@ DebugPokemon4Script: faceplayer opentext writetext DebugTextB - cry GOROCHU + cry KLEAVOR pause 15 closetext loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE - loadwildmon DEOXYS, 70 + loadwildmon KLEAVOR, 10 startbattle reloadmapafterbattle end