From d4170f5fa80ef8d96a289b742d540058dee3f02c Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 26 Oct 2023 16:16:00 +0100 Subject: [PATCH 1/4] Walking Wake and the Guardian Beast! - Added preliminary data for Walking Wake and the new Legendary Pokemon Shi-Shi. - Changed Bellignan's dex entry to reference how Sprout Tower was constructed. - Changed some dialogue in Sprout Tower to reflect this. Wake sprite by EyeDonutz Shi-Shi sprite by me, but still unfinished. Will definitely rework sometime. --- constants/pokemon_constants.asm | 6 ++- data/pokemon/base_stats.asm | 2 + data/pokemon/base_stats/shi_shi.asm | 21 ++++++++++ .../{walkingwake.asm => walking_wake.asm} | 2 +- data/pokemon/cries.asm | 2 + data/pokemon/dex_entries.asm | 2 + data/pokemon/dex_entries/bellignan.asm | 12 +++--- data/pokemon/dex_entries/shi_shi.asm | 10 +++++ data/pokemon/dex_entries/walking_wake.asm | 10 +++++ data/pokemon/dex_entry_pointers.asm | 2 + data/pokemon/dex_order_alpha.asm | 2 + data/pokemon/dex_order_new.asm | 2 + data/pokemon/egg_moves_johto.asm | 2 + data/pokemon/evos_attacks_johto.asm | 32 +++++++++++++++ data/pokemon/first_stages.asm | 2 + data/pokemon/gen1_order.asm | 6 +-- data/pokemon/menu_icons.asm | 2 + data/pokemon/names.asm | 2 + data/pokemon/palettes.asm | 4 ++ data/pokemon/pic_pointers.asm | 4 ++ data/trainers/parties.asm | 9 ++--- gfx/footprints.asm | 4 +- gfx/footprints/shi_shi.png | Bin 0 -> 69 bytes gfx/footprints/walking_wake.png | Bin 0 -> 69 bytes gfx/pics.asm | 4 ++ gfx/pokemon/anim_pointers.asm | 2 + gfx/pokemon/anims.asm | 2 + gfx/pokemon/bitmask_pointers.asm | 2 + gfx/pokemon/bitmasks.asm | 2 + gfx/pokemon/frame_pointers.asm | 2 + gfx/pokemon/idle_pointers.asm | 2 + gfx/pokemon/idles.asm | 2 + gfx/pokemon/johto_frames.asm | 2 + gfx/pokemon/shi_shi/anim.asm | 1 + gfx/pokemon/shi_shi/anim_idle.asm | 1 + gfx/pokemon/shi_shi/back.png | Bin 0 -> 565 bytes gfx/pokemon/shi_shi/front.png | Bin 0 -> 888 bytes gfx/pokemon/shi_shi/shiny.pal | 2 + gfx/pokemon/walking_wake/anim.asm | 32 +++++++++++++++ gfx/pokemon/walking_wake/anim_idle.asm | 6 +++ gfx/pokemon/walking_wake/back.png | Bin 0 -> 588 bytes gfx/pokemon/walking_wake/front.png | Bin 0 -> 3249 bytes gfx/pokemon/walking_wake/shiny.pal | 4 ++ maps/PlayersHouse2F.asm | 38 +++++++++++++++++- maps/SproutTower1F.asm | 2 +- 45 files changed, 225 insertions(+), 21 deletions(-) create mode 100644 data/pokemon/base_stats/shi_shi.asm rename data/pokemon/base_stats/{walkingwake.asm => walking_wake.asm} (93%) create mode 100644 data/pokemon/dex_entries/shi_shi.asm create mode 100644 data/pokemon/dex_entries/walking_wake.asm create mode 100644 gfx/footprints/shi_shi.png create mode 100644 gfx/footprints/walking_wake.png create mode 100644 gfx/pokemon/shi_shi/anim.asm create mode 100644 gfx/pokemon/shi_shi/anim_idle.asm create mode 100644 gfx/pokemon/shi_shi/back.png create mode 100644 gfx/pokemon/shi_shi/front.png create mode 100644 gfx/pokemon/shi_shi/shiny.pal create mode 100644 gfx/pokemon/walking_wake/anim.asm create mode 100644 gfx/pokemon/walking_wake/anim_idle.asm create mode 100644 gfx/pokemon/walking_wake/back.png create mode 100644 gfx/pokemon/walking_wake/front.png create mode 100644 gfx/pokemon/walking_wake/shiny.pal diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index f5afe9b..43300e7 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -27,7 +27,7 @@ const CHARIZARD ; 06 const SQUIRTLE ; 07 const WARTORTLE ; 08 - const TOTARTLE ; 09 + const TOTARTLE ; 09 const CATERPIE ; 0a const METAPOD ; 0b const BUTTERFREE ; 0c @@ -268,13 +268,15 @@ DEF JOHTO_POKEMON EQU const_value const RAIKOU ; f3 const ENTEI ; f4 const SUICUNE ; f5 + const WALKING_WAKE const LARVITAR ; f6 const PUPITAR ; f7 const TYRANITAR ; f8 const LUGIA ; f9 const HO_OH ; fa + const SHI_SHI const CELEBI ; fb -DEF NUM_POKEMON EQU const_value - 1 +DEF NUM_POKEMON EQU const_value DEF EGG EQU -3 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index aa7e8d6..fd29220 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -275,10 +275,12 @@ INCLUDE "data/pokemon/base_stats/blissey.asm" INCLUDE "data/pokemon/base_stats/raikou.asm" INCLUDE "data/pokemon/base_stats/entei.asm" INCLUDE "data/pokemon/base_stats/suicune.asm" +INCLUDE "data/pokemon/base_stats/walking_wake.asm" INCLUDE "data/pokemon/base_stats/larvitar.asm" INCLUDE "data/pokemon/base_stats/pupitar.asm" INCLUDE "data/pokemon/base_stats/tyranitar.asm" INCLUDE "data/pokemon/base_stats/lugia.asm" INCLUDE "data/pokemon/base_stats/ho_oh.asm" +INCLUDE "data/pokemon/base_stats/shi_shi.asm" INCLUDE "data/pokemon/base_stats/celebi.asm" .IndirectEnd:: diff --git a/data/pokemon/base_stats/shi_shi.asm b/data/pokemon/base_stats/shi_shi.asm new file mode 100644 index 0000000..d8f296f --- /dev/null +++ b/data/pokemon/base_stats/shi_shi.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 106, 154, 90, 110, 130, 90 + ; hp atk def spd sat sdf + + db ICE, FLYING ; type + db 3 ; catch rate + db 220 ; 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/shi_shi/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, THIEF, NIGHTMARE, FLY, STRENGTH, FLASH, ICE_BEAM + ; end diff --git a/data/pokemon/base_stats/walkingwake.asm b/data/pokemon/base_stats/walking_wake.asm similarity index 93% rename from data/pokemon/base_stats/walkingwake.asm rename to data/pokemon/base_stats/walking_wake.asm index 2428f32..e6faa92 100644 --- a/data/pokemon/base_stats/walkingwake.asm +++ b/data/pokemon/base_stats/walking_wake.asm @@ -11,7 +11,7 @@ db 100 ; unknown 1 db 80 ; step cycles to hatch db 5 ; unknown 2 - INCBIN "gfx/pokemon/walkingwake/front.dimensions" + INCBIN "gfx/pokemon/walking_wake/front.dimensions" dw NULL, NULL ; unused (beta front/back pics) db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 2ce8313..feefbe0 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -254,10 +254,12 @@ PokemonCries:: mon_cry CRY_RAIKOU, 558, 288 ; RAIKOU mon_cry CRY_ENTEI, 0, 416 ; ENTEI mon_cry CRY_MAGCARGO, 0, 384 ; SUICUNE + mon_cry CRY_MAGCARGO, 0, 384 ; WALKING_WAKE mon_cry CRY_RAIKOU, 95, 208 ; LARVITAR mon_cry CRY_SPINARAK, -475, 336 ; PUPITAR mon_cry CRY_RAIKOU, -256, 384 ; TYRANITAR mon_cry CRY_TYPHLOSION, 0, 256 ; LUGIA mon_cry CRY_AIPOM, 0, 384 ; HO_OH + mon_cry CRY_NIDORAN_M, 0, 128 ; SHI_SHI (placeholder) mon_cry CRY_ENTEI, 330, 273 ; CELEBI assert_table_length NUM_POKEMON diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index f4b6826..6b7c1ae 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -260,9 +260,11 @@ BlisseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/blissey.asm" RaikouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raikou.asm" EnteiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/entei.asm" SuicunePokedexEntry:: INCLUDE "data/pokemon/dex_entries/suicune.asm" +WalkingWakePokedexEntry:: INCLUDE "data/pokemon/dex_entries/walking_wake.asm" LarvitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/larvitar.asm" PupitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupitar.asm" TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tyranitar.asm" LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lugia.asm" HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ho_oh.asm" +ShiShiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/shi_shi.asm" CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/celebi.asm" diff --git a/data/pokemon/dex_entries/bellignan.asm b/data/pokemon/dex_entries/bellignan.asm index 521da74..0a5aa21 100644 --- a/data/pokemon/dex_entries/bellignan.asm +++ b/data/pokemon/dex_entries/bellignan.asm @@ -1,10 +1,10 @@ db "SPROUT@" ; species name dw 403, 160 ; height, weight - db "It lives through" - next "absorbing nutrients" - next "in the ground with" + db "It digs its root-" + next "like feet into the" + next "ground to absorb" - page "its root-like" - next "feet. Revered" - next "by some faiths.@" \ No newline at end of file + page "nutrients. It can" + next "grow to an immense" + next "size this way.@" \ No newline at end of file diff --git a/data/pokemon/dex_entries/shi_shi.asm b/data/pokemon/dex_entries/shi_shi.asm new file mode 100644 index 0000000..fa0da5d --- /dev/null +++ b/data/pokemon/dex_entries/shi_shi.asm @@ -0,0 +1,10 @@ + db "GUARDIAN@" ; species name + dw 1002, 6060 ; height, weight + + db "Said to be the" + next "embodiment of the" + next "the north wind, it" + + page "leads and protects" + next "those fleeing from" + next "persecution.@" diff --git a/data/pokemon/dex_entries/walking_wake.asm b/data/pokemon/dex_entries/walking_wake.asm new file mode 100644 index 0000000..b37ede2 --- /dev/null +++ b/data/pokemon/dex_entries/walking_wake.asm @@ -0,0 +1,10 @@ + db "PARADOX@" ; species name + dw 1106, 6170 ; height, weight + + db "Ecology under" + next "research." + next "" + + page "Ecology under" + next "research." + next "@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 3c18e90..45cbe5e 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -249,10 +249,12 @@ PokedexDataPointerTable: dba RaikouPokedexEntry dba EnteiPokedexEntry dba SuicunePokedexEntry + dba WalkingWakePokedexEntry dba LarvitarPokedexEntry dba PupitarPokedexEntry dba TyranitarPokedexEntry dba LugiaPokedexEntry dba HoOhPokedexEntry + dba ShiShiPokedexEntry dba CelebiPokedexEntry assert_table_length NUM_POKEMON diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 03b7665..94284ab 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -198,6 +198,7 @@ AlphabeticalPokedexOrder: dw SEEL dw SENTRET dw SHELLDER + dw SHI_SHI dw SHUCKLE dw SKARMORY dw SKIPLOOM @@ -245,6 +246,7 @@ AlphabeticalPokedexOrder: dw VILEPLUME dw VOLTORB dw VULPIX + dw WALKING_WAKE dw WARTORTLE dw WEEDLE dw WEEPINBELL diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index d4aa3d2..094036a 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -245,6 +245,7 @@ NewPokedexOrder: dw RAIKOU dw ENTEI dw SUICUNE + dw WALKING_WAKE dw DRATINI dw DRAGONAIR dw DRAGONITE @@ -253,6 +254,7 @@ NewPokedexOrder: dw TYRANITAR dw LUGIA dw HO_OH + dw SHI_SHI dw MEWTWO dw MEW dw CELEBI diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 1dc5038..9970126 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -95,12 +95,14 @@ EggMovePointers2:: dw NoEggMoves2 dw NoEggMoves2 dw NoEggMoves2 + dw NoEggMoves2 dw LarvitarEggMoves dw NoEggMoves2 dw NoEggMoves2 dw NoEggMoves2 dw NoEggMoves2 dw NoEggMoves2 + dw NoEggMoves2 .IndirectEnd:: ChikoritaEggMoves: diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index 472eea4..21f5ee8 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -95,11 +95,13 @@ EvosAttacksPointers2:: dw RaikouEvosAttacks dw EnteiEvosAttacks dw SuicuneEvosAttacks + dw WalkingWakeEvosAttacks dw LarvitarEvosAttacks dw PupitarEvosAttacks dw TyranitarEvosAttacks dw LugiaEvosAttacks dw HoOhEvosAttacks + dw ShiShiEvosAttacks dw CelebiEvosAttacks .IndirectEnd:: @@ -1315,6 +1317,22 @@ SuicuneEvosAttacks: dbw 71, HYDRO_PUMP db 0 ; no more level-up moves +WalkingWakeEvosAttacks: + db 0 ; no more evolutions + dbw 1, BITE + dbw 1, LEER + dbw 7, SUNNY_DAY + dbw 14, WATER_GUN + dbw 21, ROAR + dbw 28, DRAGONBREATH + dbw 35, AURORA_BEAM + dbw 42, TWISTER + dbw 49, CRUNCH + dbw 56, OUTRAGE + dbw 63, FLAMETHROWER + dbw 70, HYDRO_PUMP + db 0 ; no more level-up moves + LarvitarEvosAttacks: dbbw EVOLVE_LEVEL, 30, PUPITAR db 0 ; no more evolutions @@ -1391,6 +1409,20 @@ HoOhEvosAttacks: dbw 99, FUTURE_SIGHT db 0 ; no more level-up moves +ShiShiEvosAttacks: + db 0 ; no more evolutions + dbw 1, FLY ; (placeholder before Wind Ride is added) + dbw 11, SAFEGUARD + dbw 22, GUST + dbw 33, RECOVER + dbw 44, BLIZZARD + dbw 55, CRUNCH + dbw 66, BODY_SLAM + dbw 77, WHIRLWIND + dbw 88, EXTREMESPEED + dbw 99, FUTURE_SIGHT + db 0 ; no more level-up moves + CelebiEvosAttacks: db 0 ; no more evolutions dbw 1, LEECH_SEED diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index dc560dc..8e26158 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -249,10 +249,12 @@ FirstEvoStages:: dw RAIKOU dw ENTEI dw SUICUNE + dw WALKING_WAKE dw LARVITAR dw LARVITAR dw LARVITAR ;f8 dw LUGIA dw HO_OH + dw SHI_SHI dw CELEBI assert_table_length NUM_POKEMON diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index e1b5f42..7a52ca0 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -253,7 +253,7 @@ Pokered_MonIndices: db SNUBBULL db GRANBULL db QWILFISH - db WOBBUFFET - db WOBBUFFET db BELLIGNAN - assert_table_length NUM_POKEMON + 1 + db WALKING_WAKE + db SHI_SHI + assert_table_length NUM_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index ba9554b..546b69a 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -250,10 +250,12 @@ MonMenuIcons: db ICON_FOX ; RAIKOU db ICON_FOX ; ENTEI db ICON_FOX ; SUICUNE + db ICON_MONSTER ; WALKING_WAKE db ICON_MONSTER ; LARVITAR db ICON_MONSTER ; PUPITAR db ICON_MONSTER ; TYRANITAR db ICON_LUGIA ; LUGIA db ICON_HO_OH ; HO_OH + db ICON_FOX ; SHI_SHI db ICON_HUMANSHAPE ; CELEBI assert_table_length NUM_POKEMON diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index dd66941..5030bd8 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -252,10 +252,12 @@ PokemonNames:: db "RAIKOU@@@@" db "ENTEI@@@@@" db "SUICUNE@@@" + db "WALKINWAKE" ; this is terrible but unless we can increase the character limit this is our best option db "LARVITAR@@" db "PUPITAR@@@" db "TYRANITAR@" db "LUGIA@@@@@" db "HO-OH@@@@@" + db "SHI-SHI@@@" db "CELEBI@@@@" assert_table_length NUM_POKEMON diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 776dbb7..b13ba62 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -529,6 +529,8 @@ INCBIN "gfx/pokemon/entei/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/entei/shiny.pal" INCBIN "gfx/pokemon/suicune/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/suicune/shiny.pal" +INCBIN "gfx/pokemon/walking_wake/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/walking_wake/shiny.pal" INCBIN "gfx/pokemon/larvitar/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/larvitar/shiny.pal" INCBIN "gfx/pokemon/pupitar/front.gbcpal", middle_colors @@ -539,6 +541,8 @@ INCBIN "gfx/pokemon/lugia/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/lugia/shiny.pal" INCBIN "gfx/pokemon/ho_oh/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/ho_oh/shiny.pal" +INCBIN "gfx/pokemon/shi_shi/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/shi_shi/shiny.pal" INCBIN "gfx/pokemon/celebi/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/celebi/shiny.pal" diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 10f69b0..2c90846 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -512,6 +512,8 @@ PokemonPicPointers:: dba EnteiBackpic dba SuicuneFrontpic dba SuicuneBackpic + dba WalkingWakeFrontpic + dba WalkingWakeBackpic dba LarvitarFrontpic dba LarvitarBackpic dba PupitarFrontpic @@ -522,6 +524,8 @@ PokemonPicPointers:: dba LugiaBackpic dba HoOhFrontpic dba HoOhBackpic + dba ShiShiFrontpic + dba ShiShiBackpic dba CelebiFrontpic dba CelebiBackpic assert_table_length NUM_POKEMON + 1 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 6a02c15..752b3bf 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -4699,13 +4699,10 @@ SageGroup: db -1 ; end next_list_item ; SAGE (9) - db "LI@", TRAINERTYPE_NORMAL - db 7 - dw BELLSPROUT - db 7 - dw BELLSPROUT + db "LI@", TRAINERTYPE_MOVES db 10 - dw HOOTHOOT + dw BELLIGNAN + dw FLASH, VINE_WHIP, GROWTH, WRAP db -1 ; end next_list_item ; SAGE (10) diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 9de45bc..73d4354 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -249,11 +249,13 @@ INCBIN "gfx/footprints/blissey.1bpp" INCBIN "gfx/footprints/raikou.1bpp" INCBIN "gfx/footprints/entei.1bpp" INCBIN "gfx/footprints/suicune.1bpp" +INCBIN "gfx/footprints/walking_wake.1bpp" INCBIN "gfx/footprints/larvitar.1bpp" INCBIN "gfx/footprints/pupitar.1bpp" INCBIN "gfx/footprints/tyranitar.1bpp" INCBIN "gfx/footprints/lugia.1bpp" INCBIN "gfx/footprints/ho_oh.1bpp" +INCBIN "gfx/footprints/shi_shi.1bpp" INCBIN "gfx/footprints/celebi.1bpp" INCBIN "gfx/footprints/252.1bpp" INCBIN "gfx/footprints/253.1bpp" @@ -261,4 +263,4 @@ INCBIN "gfx/footprints/254.1bpp" INCBIN "gfx/footprints/255.1bpp" INCBIN "gfx/footprints/256.1bpp" - assert_table_length $102 + assert_table_length $104 diff --git a/gfx/footprints/shi_shi.png b/gfx/footprints/shi_shi.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ9#0p?kcwN$2@CXqyZ{Eqvu9P> OK=PihelF{r5}E*#W)1`Z literal 0 HcmV?d00001 diff --git a/gfx/footprints/walking_wake.png b/gfx/footprints/walking_wake.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ9#0p?kcwN$2@CXqyZ{Eqvu9P> OK=PihelF{r5}E*#W)1`Z literal 0 HcmV?d00001 diff --git a/gfx/pics.asm b/gfx/pics.asm index 0c25ca2..57f8edb 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -719,6 +719,10 @@ BlastykeFrontpic: INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz" BlastykeBackpic: INCBIN "gfx/pokemon/blastyke/back.2bpp.lz" BellignanFrontpic: INCBIN "gfx/pokemon/bellignan/front.animated.2bpp.lz" BellignanBackpic: INCBIN "gfx/pokemon/bellignan/back.2bpp.lz" +WalkingWakeFrontpic: INCBIN "gfx/pokemon/walking_wake/front.animated.2bpp.lz" +WalkingWakeBackpic: INCBIN "gfx/pokemon/walking_wake/back.2bpp.lz" +ShiShiFrontpic: INCBIN "gfx/pokemon/shi_shi/front.animated.2bpp.lz" +ShiShiBackpic: INCBIN "gfx/pokemon/shi_shi/back.2bpp.lz" INCBIN "gfx/pokemon/poliwag/back.2bpp.lz" INCBIN "gfx/pokemon/squirtle/back.2bpp.lz" INCBIN "gfx/pokemon/shuckle/back.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index ab37b35..3e39ac0 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -248,10 +248,12 @@ AnimationPointers: dw RaikouAnimation dw EnteiAnimation dw SuicuneAnimation + dw WalkingWakeAnimation dw LarvitarAnimation dw PupitarAnimation dw TyranitarAnimation dw LugiaAnimation dw HoOhAnimation + dw ShiShiAnimation dw CelebiAnimation assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 88e95aa..f6807f5 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -246,10 +246,12 @@ BlisseyAnimation: INCLUDE "gfx/pokemon/blissey/anim.asm" RaikouAnimation: INCLUDE "gfx/pokemon/raikou/anim.asm" EnteiAnimation: INCLUDE "gfx/pokemon/entei/anim.asm" SuicuneAnimation: INCLUDE "gfx/pokemon/suicune/anim.asm" +WalkingWakeAnimation: INCLUDE "gfx/pokemon/walking_wake/anim.asm" LarvitarAnimation: INCLUDE "gfx/pokemon/larvitar/anim.asm" PupitarAnimation: INCLUDE "gfx/pokemon/pupitar/anim.asm" TyranitarAnimation: INCLUDE "gfx/pokemon/tyranitar/anim.asm" LugiaAnimation: INCLUDE "gfx/pokemon/lugia/anim.asm" HoOhAnimation: INCLUDE "gfx/pokemon/ho_oh/anim.asm" +ShiShiAnimation: INCLUDE "gfx/pokemon/shi_shi/anim.asm" CelebiAnimation: INCLUDE "gfx/pokemon/celebi/anim.asm" EggAnimation: INCLUDE "gfx/pokemon/egg/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index b7755e8..f7e77a9 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -248,10 +248,12 @@ BitmasksPointers: dw RaikouBitmasks dw EnteiBitmasks dw SuicuneBitmasks + dw WalkingWakeBitmasks dw LarvitarBitmasks dw PupitarBitmasks dw TyranitarBitmasks dw LugiaBitmasks dw HoOhBitmasks + dw ShiShiBitmasks dw CelebiBitmasks assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index c9ad3a5..7b449cf 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -246,10 +246,12 @@ BlisseyBitmasks: INCLUDE "gfx/pokemon/blissey/bitmask.asm" RaikouBitmasks: INCLUDE "gfx/pokemon/raikou/bitmask.asm" EnteiBitmasks: INCLUDE "gfx/pokemon/entei/bitmask.asm" SuicuneBitmasks: INCLUDE "gfx/pokemon/suicune/bitmask.asm" +WalkingWakeBitmasks: INCLUDE "gfx/pokemon/walking_wake/bitmask.asm" LarvitarBitmasks: INCLUDE "gfx/pokemon/larvitar/bitmask.asm" PupitarBitmasks: INCLUDE "gfx/pokemon/pupitar/bitmask.asm" TyranitarBitmasks: INCLUDE "gfx/pokemon/tyranitar/bitmask.asm" LugiaBitmasks: INCLUDE "gfx/pokemon/lugia/bitmask.asm" HoOhBitmasks: INCLUDE "gfx/pokemon/ho_oh/bitmask.asm" +ShiShiBitmasks: INCLUDE "gfx/pokemon/shi_shi/bitmask.asm" CelebiBitmasks: INCLUDE "gfx/pokemon/celebi/bitmask.asm" EggBitmasks: INCLUDE "gfx/pokemon/egg/bitmask.asm" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index 32caf3b..c78da85 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -248,10 +248,12 @@ FramesPointers: dba RaikouFrames dba EnteiFrames dba SuicuneFrames + dba WalkingWakeFrames dba LarvitarFrames dba PupitarFrames dba TyranitarFrames dba LugiaFrames dba HoOhFrames + dba ShiShiFrames dba CelebiFrames assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index 94fda4a..f773c78 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -248,10 +248,12 @@ AnimationIdlePointers: dw RaikouAnimationIdle dw EnteiAnimationIdle dw SuicuneAnimationIdle + dw WalkingWakeAnimationIdle dw LarvitarAnimationIdle dw PupitarAnimationIdle dw TyranitarAnimationIdle dw LugiaAnimationIdle dw HoOhAnimationIdle + dw ShiShiAnimationIdle dw CelebiAnimationIdle assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index f4090c7..0e74eed 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -246,10 +246,12 @@ BlisseyAnimationIdle: INCLUDE "gfx/pokemon/blissey/anim_idle.asm" RaikouAnimationIdle: INCLUDE "gfx/pokemon/raikou/anim_idle.asm" EnteiAnimationIdle: INCLUDE "gfx/pokemon/entei/anim_idle.asm" SuicuneAnimationIdle: INCLUDE "gfx/pokemon/suicune/anim_idle.asm" +WalkingWakeAnimationIdle: INCLUDE "gfx/pokemon/walking_wake/anim_idle.asm" LarvitarAnimationIdle: INCLUDE "gfx/pokemon/larvitar/anim_idle.asm" PupitarAnimationIdle: INCLUDE "gfx/pokemon/pupitar/anim_idle.asm" TyranitarAnimationIdle: INCLUDE "gfx/pokemon/tyranitar/anim_idle.asm" LugiaAnimationIdle: INCLUDE "gfx/pokemon/lugia/anim_idle.asm" HoOhAnimationIdle: INCLUDE "gfx/pokemon/ho_oh/anim_idle.asm" +ShiShiAnimationIdle: INCLUDE "gfx/pokemon/shi_shi/anim_idle.asm" CelebiAnimationIdle: INCLUDE "gfx/pokemon/celebi/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 f8e3b3f..13ec3b1 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -94,10 +94,12 @@ BlisseyFrames: INCLUDE "gfx/pokemon/blissey/frames.asm" RaikouFrames: INCLUDE "gfx/pokemon/raikou/frames.asm" EnteiFrames: INCLUDE "gfx/pokemon/entei/frames.asm" SuicuneFrames: INCLUDE "gfx/pokemon/suicune/frames.asm" +WalkingWakeFrames: INCLUDE "gfx/pokemon/walking_wake/frames.asm" LarvitarFrames: INCLUDE "gfx/pokemon/larvitar/frames.asm" PupitarFrames: INCLUDE "gfx/pokemon/pupitar/frames.asm" TyranitarFrames: INCLUDE "gfx/pokemon/tyranitar/frames.asm" LugiaFrames: INCLUDE "gfx/pokemon/lugia/frames.asm" HoOhFrames: INCLUDE "gfx/pokemon/ho_oh/frames.asm" +ShiShiFrames: INCLUDE "gfx/pokemon/shi_shi/frames.asm" CelebiFrames: INCLUDE "gfx/pokemon/celebi/frames.asm" EggFrames: INCLUDE "gfx/pokemon/egg/frames.asm" diff --git a/gfx/pokemon/shi_shi/anim.asm b/gfx/pokemon/shi_shi/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/shi_shi/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/shi_shi/anim_idle.asm b/gfx/pokemon/shi_shi/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/shi_shi/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/shi_shi/back.png b/gfx/pokemon/shi_shi/back.png new file mode 100644 index 0000000000000000000000000000000000000000..37502cc56ea46a84034d8571fb323ec7af783e23 GIT binary patch literal 565 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD=;=N%4wHIqf)54-^tF zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6-A0X`wF|NsA=GUeF0bN@jKi2$#pFDe3+F(!GtyZm3u{^=-?9qH-f z7*a9k>g2}WHwrv1jOGjr8xy1qcKpAW_r^i*`&5w+6U)SZrXCYM-1g!AS}pmn4!^?s z8}Er))>v@vz5e(o;|uAUFBba_Jo)gBRp5)S@lTh<;wC#P*{;?_6b`}U3gg<|RPceRbfV||)T?)sieNq^>Hc(sZ>Pc7-4gG*tKgMdQ_mr#Fjm1ent z?9o$dLJjU&)wVrq5}A(~r9N-De?;rg4in!WT{E^^IZ}H)*e~1vh3c7Tr-R!Ao7!iX zpICWN_Pd7Ugt}_ZIT1<=nv40lMV%+DS`??1J$*N;gIikg6wBjNEp`jHE|$HkD)4Ht z>#U^~8&caPrwbogvGiZlRi_DCSM^_hld_#-=Y6|v3`bZ+tg55F^3S@gn$f9#_{6KL z?>kF`ABf)0m?y$GNtW|pgMdS5c>hL*SF+8%OU%#*z%<9x z#WAE}PHt%T)W-%KQ|im2lxZ#PdnBGFE9^XSdjpgH(w3h6-272DINHP1{=L(5e#^C4ZuZ>|Ixk~R zZSa)7712`j^j%+WYwtzYV`sKy?)}r0zhKoG<{2lJ_$S@f78YeYw}$;msg3%HzU>wF zSr2hOUsiIPHPD=Oht(OCi+UO^(s$Y3udHy_a#-!tR=`*`lhtcFhh%EO9i^j=KjvB; znq{}W)n7!iQhY`m$3wHTdpJtBX)HKza>r_8;w#RRdK#A+VgqJw)v4loaipi?4fBC{ zJECtEJ$cEuoo&`VW|wUStGE`LWQ0vlpLC$+T(pnMOSWmUOYIcb@>JNjn0TqhJ}5J> zi{a4Mov4|!IP?Dx%Li{S$5}4Be{oC9ug&VenO#|w`RqC(7w9*KFXJdpDmo$}aMYYD zT=D*li&NA1D~(%s{IOyeXwDx}jMG zo^}y#OD{DqYJ1&@K+pDJ@SeBO<0|>XxwA* zh)+&0zm>>MZJ72e`o8Hdjqmru6jsP>n|wm(Fz?dsGcGV0W=>w!UR~WJer)Y&?qytu zgSKw)C`nbce{iSu@Q3e|AwdZi$zGn;)Qi>#A}t~0BV?6jqyZTP>RyPV~4XUep~Pd4m( z-p}UC{KItHVpH7dtzjX@4H`H^FW>+BkvZ!lvI6-A0X`wF|NsAw+WWs)U@1r;5x{H3wO*hy#w2fdm;X!IKOF_K3p`yM zLn`KMofO#gM1jMlH^$)uQf;%4F|n`X#6L0=XmaE;t}~s)^Y)ZG%ggJJqMKH6i0dV_6ohIJCow)xP(C zhW+CwDJv#v=QO$)b_OgH6k}|-ZFlbO#_snoG}k`067hMjb1&swS!2athPl-*`4z6$ r+FMsuv4`0os4L0X?YMpZMw5SxlT^KO9hPM+0mYZ6tDnm{r-UW|^&jLf literal 0 HcmV?d00001 diff --git a/gfx/pokemon/walking_wake/front.png b/gfx/pokemon/walking_wake/front.png new file mode 100644 index 0000000000000000000000000000000000000000..2338fae11ec1d58746264fa46523b6bc5cde2742 GIT binary patch literal 3249 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 Date: Fri, 27 Oct 2023 17:28:18 +0100 Subject: [PATCH 2/4] Route 45 encounter update Increases frequency of Phanpy encounters to be morning/day and replace Geodude in that time span. Adds 5% Jigglypuff from Silver that was removed (you'll see a lot of silver additions, it was a very based game) --- data/wild/johto_grass.asm | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index bf3d5df..fd20f0d 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -1681,32 +1681,36 @@ JohtoGrassWildMons: dbw 27, GRAVELER end_grass_wildmons +; Buff Phanpy encounter rates to replace Geodude in the daytime, expanding on Crystal's work. +; Ports the 5% Jigglypuff all-day encounter from GS. +; Makes Hoothoot replace a Rattata at night to have continuity with Spearow. +; Overall, increased Johto frequency that matches early advertising for the game. def_grass_wildmons ROUTE_46 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 2, GEODUDE - dbw 2, SPEAROW - dbw 3, GEODUDE - dbw 3, RATTATA dbw 2, PHANPY - dbw 2, RATTATA - dbw 2, RATTATA - ; day - dbw 2, GEODUDE dbw 2, SPEAROW - dbw 3, GEODUDE + dbw 3, PHANPY dbw 3, RATTATA dbw 2, RATTATA + dbw 2, JIGGLYPUFF + dbw 2, JIGGLYPUFF + ; day + dbw 2, PHANPY + dbw 2, SPEAROW + dbw 3, PHANPY + dbw 3, RATTATA dbw 2, RATTATA - dbw 2, RATTATA + dbw 2, JIGGLYPUFF + dbw 2, JIGGLYPUFF ; nite dbw 2, GEODUDE - dbw 2, RATTATA + dbw 2, HOOTHOOT dbw 3, GEODUDE dbw 3, RATTATA dbw 2, RATTATA - dbw 2, RATTATA - dbw 2, RATTATA + dbw 2, JIGGLYPUFF + dbw 2, JIGGLYPUFF end_grass_wildmons def_grass_wildmons SILVER_CAVE_OUTSIDE From 5669dce327ed849eb9dc639857583ef326b01cb4 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 27 Oct 2023 17:49:00 +0100 Subject: [PATCH 3/4] Kanto level buffs This makes Kanto Pokemon be ~L30 minimum, then L40 from L20 onwards, then L50 from L30 onwards. --- data/wild/kanto_grass.asm | 1178 ++++++++++++++++++------------------- 1 file changed, 589 insertions(+), 589 deletions(-) diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index 79d593c..91ce40c 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -5,113 +5,113 @@ KantoGrassWildMons: def_grass_wildmons DIGLETTS_CAVE db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite ; morn - dbw 3, DIGLETT - dbw 6, DIGLETT - dbw 12, DIGLETT - dbw 24, DIGLETT - dbw 24, DUGTRIO - dbw 24, DUGTRIO - dbw 24, DUGTRIO - ; day - dbw 2, DIGLETT - dbw 4, DIGLETT - dbw 8, DIGLETT - dbw 16, DIGLETT - dbw 16, DUGTRIO - dbw 16, DUGTRIO - dbw 16, DUGTRIO - ; nite - dbw 4, DIGLETT - dbw 8, DIGLETT - dbw 16, DIGLETT + dbw 33, DIGLETT + dbw 36, DIGLETT dbw 32, DIGLETT - dbw 32, DUGTRIO - dbw 32, DUGTRIO - dbw 32, DUGTRIO + dbw 44, DIGLETT + dbw 44, DUGTRIO + dbw 44, DUGTRIO + dbw 44, DUGTRIO + ; day + dbw 32, DIGLETT + dbw 34, DIGLETT + dbw 38, DIGLETT + dbw 36, DIGLETT + dbw 46, DUGTRIO + dbw 46, DUGTRIO + dbw 46, DUGTRIO + ; nite + dbw 34, DIGLETT + dbw 38, DIGLETT + dbw 36, DIGLETT + dbw 32, DIGLETT + dbw 42, DUGTRIO + dbw 42, DUGTRIO + dbw 42, DUGTRIO end_grass_wildmons def_grass_wildmons MOUNT_MOON db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 6, ZUBAT - dbw 8, GEODUDE - dbw 8, SANDSHREW - dbw 12, PARAS - dbw 10, GEODUDE - dbw 8, CLEFAIRY - dbw 8, CLEFAIRY + dbw 36, ZUBAT + dbw 38, GEODUDE + dbw 38, SANDSHREW + dbw 32, PARAS + dbw 30, GEODUDE + dbw 38, CLEFAIRY + dbw 38, CLEFAIRY ; day - dbw 6, ZUBAT - dbw 8, GEODUDE - dbw 8, SANDSHREW - dbw 12, PARAS - dbw 10, GEODUDE - dbw 8, CLEFAIRY - dbw 8, CLEFAIRY + dbw 36, ZUBAT + dbw 38, GEODUDE + dbw 38, SANDSHREW + dbw 32, PARAS + dbw 30, GEODUDE + dbw 38, CLEFAIRY + dbw 38, CLEFAIRY ; nite - dbw 6, ZUBAT - dbw 8, GEODUDE - dbw 8, CLEFAIRY - dbw 12, PARAS - dbw 10, GEODUDE - dbw 12, CLEFAIRY - dbw 12, CLEFAIRY + dbw 36, ZUBAT + dbw 38, GEODUDE + dbw 38, CLEFAIRY + dbw 32, PARAS + dbw 30, GEODUDE + dbw 32, CLEFAIRY + dbw 32, CLEFAIRY end_grass_wildmons def_grass_wildmons ROCK_TUNNEL_1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 10, CUBONE - dbw 11, GEODUDE - dbw 12, MACHOP - dbw 12, ZUBAT - dbw 15, MACHOKE - dbw 12, MAROWAK - dbw 12, MAROWAK + dbw 30, CUBONE + dbw 31, GEODUDE + dbw 32, MACHOP + dbw 32, ZUBAT + dbw 35, MACHOKE + dbw 32, MAROWAK + dbw 32, MAROWAK ; day - dbw 10, CUBONE - dbw 11, GEODUDE - dbw 12, MACHOP - dbw 12, ZUBAT - dbw 15, MACHOKE - dbw 12, MAROWAK - dbw 12, MAROWAK + dbw 30, CUBONE + dbw 31, GEODUDE + dbw 32, MACHOP + dbw 32, ZUBAT + dbw 35, MACHOKE + dbw 32, MAROWAK + dbw 32, MAROWAK ; nite - dbw 12, ZUBAT - dbw 11, GEODUDE - dbw 12, GEODUDE - dbw 17, HAUNTER - dbw 15, ZUBAT - dbw 15, ZUBAT - dbw 15, ZUBAT + dbw 32, ZUBAT + dbw 31, GEODUDE + dbw 32, GEODUDE + dbw 37, HAUNTER + dbw 35, ZUBAT + dbw 35, ZUBAT + dbw 35, ZUBAT end_grass_wildmons def_grass_wildmons ROCK_TUNNEL_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 12, CUBONE - dbw 14, GEODUDE - dbw 16, ONIX - dbw 12, ZUBAT - dbw 15, MAROWAK - dbw 15, KANGASKHAN - dbw 15, KANGASKHAN + dbw 32, CUBONE + dbw 34, GEODUDE + dbw 36, ONIX + dbw 32, ZUBAT + dbw 35, MAROWAK + dbw 35, KANGASKHAN + dbw 35, KANGASKHAN ; day - dbw 12, CUBONE - dbw 14, GEODUDE - dbw 16, ONIX - dbw 12, ZUBAT - dbw 15, MAROWAK - dbw 15, KANGASKHAN - dbw 15, KANGASKHAN + dbw 32, CUBONE + dbw 34, GEODUDE + dbw 36, ONIX + dbw 32, ZUBAT + dbw 35, MAROWAK + dbw 35, KANGASKHAN + dbw 35, KANGASKHAN ; nite - dbw 12, ZUBAT - dbw 14, GEODUDE - dbw 16, ONIX - dbw 15, ZUBAT - dbw 15, HAUNTER - dbw 15, GOLBAT - dbw 15, GOLBAT + dbw 32, ZUBAT + dbw 34, GEODUDE + dbw 36, ONIX + dbw 35, ZUBAT + dbw 35, HAUNTER + dbw 35, GOLBAT ; GAVILLAIN + dbw 35, GOLBAT ; GAVILLAIN end_grass_wildmons def_grass_wildmons VICTORY_ROAD @@ -173,645 +173,645 @@ KantoGrassWildMons: def_grass_wildmons ROUTE_1 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 2, PIDGEY - dbw 2, RATTATA - dbw 3, SENTRET - dbw 3, PIDGEY - dbw 6, FURRET - dbw 4, PIDGEY - dbw 4, PIDGEY + dbw 32, PIDGEY + dbw 32, RATTATA + dbw 33, SENTRET + dbw 33, PIDGEY + dbw 36, FURRET + dbw 34, PIDGEY + dbw 34, PIDGEY ; day - dbw 2, PIDGEY - dbw 2, RATTATA - dbw 3, SENTRET - dbw 3, PIDGEY - dbw 6, FURRET - dbw 4, PIDGEY - dbw 4, PIDGEY + dbw 32, PIDGEY + dbw 32, RATTATA + dbw 33, SENTRET + dbw 33, PIDGEY + dbw 36, FURRET + dbw 34, PIDGEY + dbw 34, PIDGEY ; nite - dbw 2, HOOTHOOT - dbw 2, RATTATA - dbw 3, RATTATA - dbw 3, HOOTHOOT - dbw 6, RATICATE - dbw 4, HOOTHOOT - dbw 4, HOOTHOOT + dbw 32, HOOTHOOT + dbw 32, RATTATA + dbw 33, RATTATA + dbw 33, HOOTHOOT + dbw 36, RATICATE + dbw 34, HOOTHOOT + dbw 34, HOOTHOOT end_grass_wildmons def_grass_wildmons ROUTE_2 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 3, CATERPIE - dbw 3, LEDYBA - dbw 5, PIDGEY - dbw 7, BUTTERFREE - dbw 7, LEDIAN - dbw 4, PIKACHU - dbw 4, PIKACHU + dbw 33, CATERPIE + dbw 33, LEDYBA + dbw 35, PIDGEY + dbw 37, BUTTERFREE + dbw 37, LEDIAN + dbw 34, PIKACHU + dbw 34, PIKACHU ; day - dbw 3, CATERPIE - dbw 3, PIDGEY - dbw 5, PIDGEY - dbw 7, BUTTERFREE - dbw 7, PIDGEOTTO - dbw 4, PIKACHU - dbw 4, PIKACHU + dbw 33, CATERPIE + dbw 33, PIDGEY + dbw 35, PIDGEY + dbw 37, BUTTERFREE + dbw 37, PIDGEOTTO + dbw 34, PIKACHU + dbw 34, PIKACHU ; nite - dbw 3, HOOTHOOT - dbw 3, SPINARAK - dbw 5, HOOTHOOT - dbw 7, NOCTOWL - dbw 7, ARIADOS - dbw 4, NOCTOWL - dbw 4, NOCTOWL + dbw 33, HOOTHOOT + dbw 33, SPINARAK + dbw 35, HOOTHOOT + dbw 37, NOCTOWL + dbw 37, ARIADOS + dbw 34, NOCTOWL + dbw 34, NOCTOWL end_grass_wildmons def_grass_wildmons ROUTE_3 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 5, SPEAROW - dbw 5, RATTATA - dbw 8, EKANS - dbw 10, RATICATE - dbw 10, ARBOK - dbw 10, SANDSHREW - dbw 10, SANDSHREW + dbw 35, SPEAROW + dbw 35, RATTATA + dbw 38, EKANS + dbw 30, RATICATE + dbw 30, ARBOK + dbw 30, SANDSHREW + dbw 30, SANDSHREW ; day - dbw 5, SPEAROW - dbw 5, RATTATA - dbw 8, EKANS - dbw 10, RATICATE - dbw 10, ARBOK - dbw 10, SANDSHREW - dbw 10, SANDSHREW + dbw 35, SPEAROW + dbw 35, RATTATA + dbw 38, EKANS + dbw 30, RATICATE + dbw 30, ARBOK + dbw 30, SANDSHREW + dbw 30, SANDSHREW ; nite - dbw 5, RATTATA - dbw 10, RATTATA - dbw 10, RATICATE - dbw 6, ZUBAT - dbw 5, RATTATA - dbw 6, CLEFAIRY - dbw 6, CLEFAIRY + dbw 35, RATTATA + dbw 30, RATTATA + dbw 30, RATICATE + dbw 36, ZUBAT + dbw 35, RATTATA + dbw 36, CLEFAIRY + dbw 36, CLEFAIRY end_grass_wildmons def_grass_wildmons ROUTE_4 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 5, SPEAROW - dbw 5, RATTATA - dbw 8, EKANS - dbw 10, RATICATE - dbw 10, ARBOK - dbw 10, SANDSHREW - dbw 10, SANDSHREW + dbw 35, SPEAROW + dbw 35, RATTATA + dbw 38, EKANS + dbw 30, RATICATE + dbw 30, ARBOK + dbw 30, SANDSHREW + dbw 30, SANDSHREW ; day - dbw 5, SPEAROW - dbw 5, RATTATA - dbw 8, EKANS - dbw 10, RATICATE - dbw 10, ARBOK - dbw 10, SANDSHREW - dbw 10, SANDSHREW + dbw 35, SPEAROW + dbw 35, RATTATA + dbw 38, EKANS + dbw 30, RATICATE + dbw 30, ARBOK + dbw 30, SANDSHREW + dbw 30, SANDSHREW ; nite - dbw 5, RATTATA - dbw 10, RATTATA - dbw 10, RATICATE - dbw 6, ZUBAT - dbw 5, RATTATA - dbw 6, CLEFAIRY - dbw 6, CLEFAIRY + dbw 35, RATTATA + dbw 30, RATTATA + dbw 30, RATICATE + dbw 36, ZUBAT + dbw 35, RATTATA + dbw 36, CLEFAIRY + dbw 36, CLEFAIRY end_grass_wildmons def_grass_wildmons ROUTE_5 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 13, PIDGEY - dbw 13, SNUBBULL - dbw 15, PIDGEOTTO - dbw 12, ABRA - dbw 14, JIGGLYPUFF - dbw 14, ABRA - dbw 14, ABRA + dbw 33, PIDGEY + dbw 33, SNUBBULL + dbw 35, PIDGEOTTO + dbw 32, ABRA + dbw 34, JIGGLYPUFF + dbw 34, ABRA + dbw 34, ABRA ; day - dbw 13, PIDGEY - dbw 13, SNUBBULL - dbw 15, PIDGEOTTO - dbw 12, ABRA - dbw 14, JIGGLYPUFF - dbw 14, ABRA - dbw 14, ABRA + dbw 33, PIDGEY + dbw 33, SNUBBULL + dbw 35, PIDGEOTTO + dbw 32, ABRA + dbw 34, JIGGLYPUFF + dbw 34, ABRA + dbw 34, ABRA ; nite - dbw 13, HOOTHOOT - dbw 13, MEOWTH - dbw 15, NOCTOWL - dbw 12, ABRA - dbw 14, JIGGLYPUFF - dbw 14, ABRA - dbw 14, ABRA + dbw 33, HOOTHOOT + dbw 33, MEOWTH + dbw 35, NOCTOWL + dbw 32, ABRA + dbw 34, JIGGLYPUFF + dbw 34, ABRA + dbw 34, ABRA end_grass_wildmons def_grass_wildmons ROUTE_6 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 13, RATTATA - dbw 13, SNUBBULL - dbw 14, MAGNEMITE - dbw 15, RATICATE - dbw 12, JIGGLYPUFF - dbw 15, GRANBULL - dbw 15, GRANBULL + dbw 33, RATTATA + dbw 33, SNUBBULL + dbw 34, MAGNEMITE + dbw 35, RATICATE + dbw 32, JIGGLYPUFF + dbw 35, GRANBULL + dbw 35, GRANBULL ; day - dbw 13, RATTATA - dbw 13, SNUBBULL - dbw 14, MAGNEMITE - dbw 15, RATICATE - dbw 12, JIGGLYPUFF - dbw 15, GRANBULL - dbw 15, GRANBULL + dbw 33, RATTATA + dbw 33, SNUBBULL + dbw 34, MAGNEMITE + dbw 35, RATICATE + dbw 32, JIGGLYPUFF + dbw 35, GRANBULL + dbw 35, GRANBULL ; nite - dbw 13, MEOWTH - dbw 13, DROWZEE - dbw 14, MAGNEMITE - dbw 15, PSYDUCK - dbw 12, JIGGLYPUFF - dbw 15, RATICATE - dbw 15, RATICATE + dbw 33, MEOWTH + dbw 33, DROWZEE + dbw 34, MAGNEMITE + dbw 35, PSYDUCK + dbw 32, JIGGLYPUFF + dbw 35, RATICATE + dbw 35, RATICATE end_grass_wildmons def_grass_wildmons ROUTE_7 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 17, RATTATA - dbw 17, SPEAROW - dbw 18, SNUBBULL - dbw 18, RATICATE - dbw 18, JIGGLYPUFF - dbw 16, ABRA - dbw 16, ABRA + dbw 37, RATTATA + dbw 37, SPEAROW + dbw 38, SNUBBULL + dbw 38, RATICATE + dbw 38, JIGGLYPUFF + dbw 36, ABRA + dbw 36, ABRA ; day - dbw 17, RATTATA - dbw 17, SPEAROW - dbw 18, SNUBBULL - dbw 18, RATICATE - dbw 18, JIGGLYPUFF - dbw 16, ABRA - dbw 16, ABRA + dbw 37, RATTATA + dbw 37, SPEAROW + dbw 38, SNUBBULL + dbw 38, RATICATE + dbw 38, JIGGLYPUFF + dbw 36, ABRA + dbw 36, ABRA ; nite - dbw 17, MEOWTH - dbw 17, MURKROW - dbw 18, HOUNDOUR - dbw 18, PERSIAN - dbw 18, JIGGLYPUFF - dbw 16, ABRA - dbw 16, ABRA + dbw 37, MEOWTH + dbw 37, MURKROW + dbw 38, HOUNDOUR + dbw 38, PERSIAN + dbw 38, JIGGLYPUFF + dbw 36, ABRA + dbw 36, ABRA end_grass_wildmons def_grass_wildmons ROUTE_8 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 17, SNUBBULL - dbw 19, PIDGEOTTO - dbw 16, ABRA - dbw 17, GROWLITHE - dbw 16, JIGGLYPUFF - dbw 18, KADABRA - dbw 18, KADABRA + dbw 37, SNUBBULL + dbw 39, PIDGEOTTO + dbw 36, ABRA + dbw 37, GROWLITHE + dbw 36, JIGGLYPUFF + dbw 38, KADABRA + dbw 38, KADABRA ; day - dbw 17, SNUBBULL - dbw 19, PIDGEOTTO - dbw 16, ABRA - dbw 17, GROWLITHE - dbw 16, JIGGLYPUFF - dbw 18, KADABRA - dbw 18, KADABRA + dbw 37, SNUBBULL + dbw 39, PIDGEOTTO + dbw 36, ABRA + dbw 37, GROWLITHE + dbw 36, JIGGLYPUFF + dbw 38, KADABRA + dbw 38, KADABRA ; nite - dbw 17, MEOWTH - dbw 20, NOCTOWL - dbw 16, ABRA - dbw 17, HAUNTER - dbw 16, JIGGLYPUFF - dbw 18, KADABRA - dbw 18, KADABRA + dbw 37, MEOWTH + dbw 30, NOCTOWL + dbw 36, ABRA + dbw 37, HAUNTER + dbw 36, JIGGLYPUFF + dbw 38, KADABRA + dbw 38, KADABRA end_grass_wildmons def_grass_wildmons ROUTE_9 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 15, RATTATA - dbw 15, SPEAROW - dbw 15, RATICATE - dbw 15, FEAROW - dbw 15, FEAROW - dbw 18, MAROWAK - dbw 18, MAROWAK + dbw 35, RATTATA + dbw 35, SPEAROW + dbw 35, RATICATE + dbw 35, FEAROW + dbw 35, FEAROW + dbw 38, MAROWAK + dbw 38, MAROWAK ; day - dbw 15, RATTATA - dbw 15, SPEAROW - dbw 15, RATICATE - dbw 15, FEAROW - dbw 15, FEAROW - dbw 18, MAROWAK - dbw 18, MAROWAK + dbw 35, RATTATA + dbw 35, SPEAROW + dbw 35, RATICATE + dbw 35, FEAROW + dbw 35, FEAROW + dbw 38, MAROWAK + dbw 38, MAROWAK ; nite - dbw 15, RATTATA - dbw 15, VENONAT - dbw 15, RATICATE - dbw 15, VENOMOTH - dbw 15, ZUBAT - dbw 18, RATICATE - dbw 18, RATICATE + dbw 35, RATTATA + dbw 35, VENONAT + dbw 35, RATICATE + dbw 35, VENOMOTH + dbw 35, ZUBAT + dbw 38, RATICATE + dbw 38, RATICATE end_grass_wildmons def_grass_wildmons ROUTE_10_NORTH db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 15, SPEAROW - dbw 17, VOLTORB - dbw 15, RATICATE - dbw 15, FEAROW - dbw 15, MAROWAK - dbw 16, ELECTABUZZ - dbw 16, ELECTABUZZ + dbw 35, SPEAROW + dbw 37, VOLTORB + dbw 35, RATICATE + dbw 35, FEAROW + dbw 35, MAROWAK + dbw 36, ELECTABUZZ + dbw 36, ELECTABUZZ ; day - dbw 15, SPEAROW - dbw 17, VOLTORB - dbw 15, RATICATE - dbw 15, FEAROW - dbw 15, MAROWAK - dbw 18, ELECTABUZZ - dbw 18, ELECTABUZZ + dbw 35, SPEAROW + dbw 37, VOLTORB + dbw 35, RATICATE + dbw 35, FEAROW + dbw 35, MAROWAK + dbw 38, ELECTABUZZ + dbw 38, ELECTABUZZ ; nite - dbw 15, VENONAT - dbw 17, VOLTORB - dbw 15, RATICATE - dbw 15, VENOMOTH - dbw 15, ZUBAT - dbw 16, ELECTABUZZ - dbw 16, ELECTABUZZ + dbw 35, VENONAT + dbw 37, VOLTORB + dbw 35, RATICATE + dbw 35, VENOMOTH + dbw 35, ZUBAT + dbw 36, ELECTABUZZ + dbw 36, ELECTABUZZ end_grass_wildmons def_grass_wildmons ROUTE_11 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 14, HOPPIP - dbw 13, RATICATE - dbw 15, MAGNEMITE - dbw 16, PIDGEOTTO - dbw 16, RATTATA - dbw 16, HOPPIP - dbw 16, HOPPIP + dbw 34, HOPPIP + dbw 33, RATICATE + dbw 35, MAGNEMITE + dbw 36, PIDGEOTTO + dbw 36, RATTATA + dbw 36, HOPPIP + dbw 36, HOPPIP ; day - dbw 14, HOPPIP - dbw 13, RATICATE - dbw 15, MAGNEMITE - dbw 16, PIDGEOTTO - dbw 16, RATTATA - dbw 16, HOPPIP - dbw 16, HOPPIP + dbw 34, HOPPIP + dbw 33, RATICATE + dbw 35, MAGNEMITE + dbw 36, PIDGEOTTO + dbw 36, RATTATA + dbw 36, HOPPIP + dbw 36, HOPPIP ; nite - dbw 14, DROWZEE - dbw 13, MEOWTH - dbw 15, MAGNEMITE - dbw 16, NOCTOWL - dbw 16, RATICATE - dbw 16, HYPNO - dbw 16, HYPNO + dbw 34, DROWZEE + dbw 33, MEOWTH + dbw 35, MAGNEMITE + dbw 36, NOCTOWL + dbw 36, RATICATE + dbw 36, HYPNO + dbw 36, HYPNO end_grass_wildmons def_grass_wildmons ROUTE_13 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 23, NIDORINO - dbw 23, NIDORINA - dbw 25, PIDGEOTTO - dbw 25, HOPPIP - dbw 27, HOPPIP - dbw 27, HOPPIP - dbw 25, CHANSEY + dbw 43, NIDORINO + dbw 43, NIDORINA + dbw 45, PIDGEOTTO + dbw 45, HOPPIP + dbw 47, HOPPIP + dbw 47, HOPPIP + dbw 45, CHANSEY ; day - dbw 23, NIDORINO - dbw 23, NIDORINA - dbw 25, PIDGEOTTO - dbw 25, HOPPIP - dbw 27, HOPPIP - dbw 27, HOPPIP - dbw 25, CHANSEY + dbw 43, NIDORINO + dbw 43, NIDORINA + dbw 45, PIDGEOTTO + dbw 45, HOPPIP + dbw 47, HOPPIP + dbw 47, HOPPIP + dbw 35, CHANSEY ; nite - dbw 23, VENONAT - dbw 23, QUAGSIRE - dbw 25, NOCTOWL - dbw 25, VENOMOTH - dbw 25, QUAGSIRE - dbw 25, QUAGSIRE - dbw 25, CHANSEY + dbw 43, VENONAT + dbw 43, QUAGSIRE + dbw 45, NOCTOWL + dbw 45, VENOMOTH + dbw 45, QUAGSIRE + dbw 45, QUAGSIRE + dbw 45, CHANSEY end_grass_wildmons def_grass_wildmons ROUTE_14 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 26, NIDORINO - dbw 26, NIDORINA - dbw 28, PIDGEOTTO - dbw 28, HOPPIP - dbw 30, SKIPLOOM - dbw 30, SKIPLOOM - dbw 28, CHANSEY + dbw 46, NIDORINO + dbw 46, NIDORINA + dbw 48, PIDGEOTTO + dbw 48, HOPPIP + dbw 50, SKIPLOOM + dbw 50, SKIPLOOM + dbw 38, CHANSEY ; day - dbw 26, NIDORINO - dbw 26, NIDORINA - dbw 28, PIDGEOTTO - dbw 28, HOPPIP - dbw 30, SKIPLOOM - dbw 30, SKIPLOOM - dbw 28, CHANSEY + dbw 46, NIDORINO + dbw 46, NIDORINA + dbw 48, PIDGEOTTO + dbw 48, HOPPIP + dbw 50, SKIPLOOM + dbw 50, SKIPLOOM + dbw 38, CHANSEY ; nite - dbw 26, VENONAT - dbw 26, QUAGSIRE - dbw 28, NOCTOWL - dbw 28, VENOMOTH - dbw 28, QUAGSIRE - dbw 28, QUAGSIRE - dbw 28, CHANSEY + dbw 46, VENONAT + dbw 46, QUAGSIRE + dbw 48, NOCTOWL + dbw 48, VENOMOTH + dbw 48, QUAGSIRE + dbw 48, QUAGSIRE + dbw 38, CHANSEY end_grass_wildmons def_grass_wildmons ROUTE_15 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 23, NIDORINO - dbw 23, NIDORINA - dbw 25, PIDGEOTTO - dbw 25, HOPPIP - dbw 27, HOPPIP - dbw 27, HOPPIP - dbw 25, CHANSEY + dbw 43, NIDORINO + dbw 43, NIDORINA + dbw 45, PIDGEOTTO + dbw 45, HOPPIP + dbw 47, HOPPIP + dbw 47, HOPPIP + dbw 45, CHANSEY ; day - dbw 23, NIDORINO - dbw 23, NIDORINA - dbw 25, PIDGEOTTO - dbw 25, HOPPIP - dbw 27, HOPPIP - dbw 27, HOPPIP - dbw 25, CHANSEY + dbw 43, NIDORINO + dbw 43, NIDORINA + dbw 45, PIDGEOTTO + dbw 45, HOPPIP + dbw 47, HOPPIP + dbw 47, HOPPIP + dbw 35, CHANSEY ; nite - dbw 23, VENONAT - dbw 23, QUAGSIRE - dbw 25, NOCTOWL - dbw 25, VENOMOTH - dbw 25, QUAGSIRE - dbw 25, QUAGSIRE - dbw 25, CHANSEY + dbw 43, VENONAT + dbw 43, QUAGSIRE + dbw 45, NOCTOWL + dbw 45, VENOMOTH + dbw 45, QUAGSIRE + dbw 45, QUAGSIRE + dbw 35, CHANSEY end_grass_wildmons def_grass_wildmons ROUTE_16 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 26, GRIMER - dbw 27, FEAROW - dbw 28, GRIMER - dbw 29, FEAROW - dbw 29, FEAROW - dbw 30, MUK - dbw 30, MUK + dbw 46, GRIMER + dbw 47, FEAROW + dbw 48, GRIMER + dbw 49, FEAROW + dbw 49, FEAROW + dbw 50, MUK + dbw 50, MUK ; day - dbw 26, GRIMER - dbw 27, FEAROW - dbw 28, GRIMER - dbw 29, FEAROW - dbw 29, SLUGMA - dbw 30, MUK - dbw 30, MUK + dbw 46, GRIMER + dbw 47, FEAROW + dbw 48, GRIMER + dbw 49, FEAROW + dbw 49, SLUGMA + dbw 50, MUK + dbw 50, MUK ; nite - dbw 26, GRIMER - dbw 27, GRIMER - dbw 28, GRIMER - dbw 29, MURKROW - dbw 29, MURKROW - dbw 30, MUK - dbw 30, MUK + dbw 46, GRIMER + dbw 47, GRIMER + dbw 48, GRIMER + dbw 49, MURKROW + dbw 49, MURKROW + dbw 50, MUK + dbw 50, MUK end_grass_wildmons def_grass_wildmons ROUTE_17 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 30, FEAROW - dbw 29, GRIMER - dbw 31, GRIMER - dbw 32, FEAROW - dbw 33, GRIMER - dbw 33, MUK - dbw 33, MUK + dbw 50, FEAROW + dbw 49, GRIMER + dbw 41, GRIMER + dbw 42, FEAROW + dbw 43, GRIMER + dbw 53, MUK + dbw 53, MUK ; day - dbw 30, FEAROW - dbw 29, SLUGMA - dbw 29, GRIMER - dbw 32, FEAROW - dbw 32, SLUGMA - dbw 33, MUK - dbw 33, MUK + dbw 50, FEAROW + dbw 49, SLUGMA + dbw 49, GRIMER + dbw 42, FEAROW + dbw 42, SLUGMA + dbw 53, MUK + dbw 53, MUK ; nite - dbw 30, GRIMER - dbw 29, GRIMER - dbw 31, GRIMER - dbw 32, GRIMER - dbw 33, GRIMER - dbw 33, MUK - dbw 33, MUK + dbw 50, GRIMER + dbw 49, GRIMER + dbw 41, GRIMER + dbw 42, GRIMER + dbw 43, GRIMER + dbw 53, MUK + dbw 53, MUK end_grass_wildmons def_grass_wildmons ROUTE_18 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 26, GRIMER - dbw 27, FEAROW - dbw 28, GRIMER - dbw 29, FEAROW - dbw 29, FEAROW - dbw 30, MUK - dbw 30, MUK + dbw 46, GRIMER + dbw 47, FEAROW + dbw 48, GRIMER + dbw 49, FEAROW + dbw 49, FEAROW + dbw 50, MUK + dbw 50, MUK ; day - dbw 26, GRIMER - dbw 27, FEAROW - dbw 28, GRIMER - dbw 29, FEAROW - dbw 29, SLUGMA - dbw 30, MUK - dbw 30, MUK + dbw 46, GRIMER + dbw 47, FEAROW + dbw 48, GRIMER + dbw 49, FEAROW + dbw 49, SLUGMA + dbw 50, MUK + dbw 50, MUK ; nite - dbw 26, GRIMER - dbw 27, GRIMER - dbw 28, GRIMER - dbw 29, GRIMER - dbw 29, GRIMER - dbw 30, MUK - dbw 30, MUK + dbw 46, GRIMER + dbw 47, GRIMER + dbw 48, GRIMER + dbw 49, GRIMER + dbw 49, GRIMER + dbw 50, MUK + dbw 50, MUK end_grass_wildmons def_grass_wildmons ROUTE_21 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 30, TANGELA - dbw 25, RATTATA - dbw 35, TANGELA - dbw 20, RATICATE - dbw 30, MR__MIME - dbw 28, MR__MIME - dbw 28, MR__MIME + dbw 50, TANGELA + dbw 45, RATTATA + dbw 55, TANGELA + dbw 50, RATICATE + dbw 50, MR__MIME + dbw 48, MR__MIME + dbw 48, MR__MIME ; day - dbw 30, TANGELA - dbw 25, RATTATA - dbw 35, TANGELA - dbw 20, RATICATE - dbw 28, MR__MIME - dbw 30, MR__MIME - dbw 30, MR__MIME + dbw 50, TANGELA + dbw 45, RATTATA + dbw 55, TANGELA + dbw 40, RATICATE + dbw 48, MR__MIME + dbw 50, MR__MIME + dbw 50, MR__MIME ; nite - dbw 30, TANGELA - dbw 25, RATTATA - dbw 35, TANGELA - dbw 20, RATICATE - dbw 30, TANGELA - dbw 28, TANGELA - dbw 28, TANGELA + dbw 50, TANGELA + dbw 45, RATTATA + dbw 55, TANGELA + dbw 40, RATICATE + dbw 50, TANGELA + dbw 48, TANGELA + dbw 48, TANGELA end_grass_wildmons def_grass_wildmons ROUTE_22 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 3, RATTATA - dbw 3, SPEAROW - dbw 5, SPEAROW - dbw 4, DODUO - dbw 6, PONYTA - dbw 7, FEAROW - dbw 7, FEAROW + dbw 33, RATTATA + dbw 33, SPEAROW + dbw 35, SPEAROW + dbw 34, DODUO + dbw 36, PONYTA + dbw 37, FEAROW + dbw 37, FEAROW ; day - dbw 3, RATTATA - dbw 3, SPEAROW - dbw 5, SPEAROW - dbw 4, DODUO - dbw 6, PONYTA - dbw 7, FEAROW - dbw 7, FEAROW + dbw 33, RATTATA + dbw 33, SPEAROW + dbw 35, SPEAROW + dbw 34, DODUO + dbw 36, PONYTA + dbw 37, FEAROW + dbw 37, FEAROW ; nite - dbw 3, RATTATA - dbw 3, POLIWAG - dbw 5, RATTATA - dbw 4, POLIWAG - dbw 6, RATTATA - dbw 7, RATTATA - dbw 7, RATTATA + dbw 33, RATTATA + dbw 33, POLIWAG + dbw 35, RATTATA + dbw 34, POLIWAG + dbw 36, RATTATA + dbw 37, RATTATA + dbw 37, RATTATA end_grass_wildmons def_grass_wildmons ROUTE_24 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 8, CATERPIE - dbw 10, CATERPIE - dbw 12, METAPOD - dbw 12, ABRA - dbw 10, BELLSPROUT - dbw 14, BUTTERFREE - dbw 14, BUTTERFREE + dbw 38, CATERPIE + dbw 30, CATERPIE + dbw 32, METAPOD + dbw 32, ABRA + dbw 30, BELLSPROUT + dbw 34, BUTTERFREE + dbw 34, BUTTERFREE ; day - dbw 8, CATERPIE - dbw 12, SUNKERN - dbw 10, CATERPIE - dbw 12, ABRA - dbw 10, BELLSPROUT - dbw 14, BUTTERFREE - dbw 14, BUTTERFREE + dbw 38, CATERPIE + dbw 32, SUNKERN + dbw 30, CATERPIE + dbw 32, ABRA + dbw 30, BELLSPROUT + dbw 34, BUTTERFREE + dbw 34, BUTTERFREE ; nite - dbw 10, VENONAT - dbw 10, ODDISH - dbw 12, ODDISH - dbw 12, ABRA - dbw 10, BELLSPROUT - dbw 14, GLOOM - dbw 14, GLOOM + dbw 30, VENONAT + dbw 30, ODDISH + dbw 32, ODDISH + dbw 32, ABRA + dbw 30, BELLSPROUT + dbw 34, GLOOM + dbw 34, GLOOM end_grass_wildmons def_grass_wildmons ROUTE_25 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 10, CATERPIE - dbw 10, PIDGEY - dbw 12, PIDGEOTTO - dbw 12, METAPOD - dbw 10, BELLSPROUT - dbw 14, BUTTERFREE - dbw 14, BUTTERFREE + dbw 30, CATERPIE + dbw 30, PIDGEY + dbw 32, PIDGEOTTO + dbw 32, METAPOD + dbw 30, BELLSPROUT + dbw 34, BUTTERFREE + dbw 34, BUTTERFREE ; day - dbw 10, CATERPIE - dbw 10, PIDGEY - dbw 12, PIDGEOTTO - dbw 12, METAPOD - dbw 10, BELLSPROUT - dbw 14, BUTTERFREE - dbw 14, BUTTERFREE + dbw 30, CATERPIE + dbw 30, PIDGEY + dbw 32, PIDGEOTTO + dbw 32, METAPOD + dbw 30, BELLSPROUT + dbw 34, BUTTERFREE + dbw 34, BUTTERFREE ; nite - dbw 10, ODDISH - dbw 10, HOOTHOOT - dbw 10, VENONAT - dbw 12, NOCTOWL - dbw 10, BELLSPROUT - dbw 14, NOCTOWL - dbw 14, NOCTOWL + dbw 30, ODDISH + dbw 30, HOOTHOOT + dbw 30, VENONAT + dbw 32, NOCTOWL + dbw 30, BELLSPROUT + dbw 34, NOCTOWL + dbw 34, NOCTOWL end_grass_wildmons def_grass_wildmons ROUTE_26 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 28, DODUO - dbw 28, SANDSLASH - dbw 32, PONYTA - dbw 30, RATICATE - dbw 30, DODUO - dbw 30, ARBOK - dbw 30, ARBOK + dbw 48, DODUO + dbw 48, SANDSLASH + dbw 52, PONYTA + dbw 50, RATICATE + dbw 50, DODUO + dbw 50, ARBOK + dbw 50, ARBOK ; day - dbw 28, DODUO - dbw 28, SANDSLASH - dbw 32, PONYTA - dbw 30, RATICATE - dbw 30, DODUO - dbw 30, ARBOK - dbw 30, ARBOK + dbw 48, DODUO + dbw 48, SANDSLASH + dbw 52, PONYTA + dbw 50, RATICATE + dbw 50, DODUO + dbw 50, ARBOK + dbw 50, ARBOK ; nite - dbw 28, NOCTOWL - dbw 28, RATICATE - dbw 32, NOCTOWL - dbw 30, RATICATE - dbw 30, QUAGSIRE - dbw 30, QUAGSIRE - dbw 30, QUAGSIRE + 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 28, DODUO - dbw 28, ARBOK - dbw 30, RATICATE - dbw 30, DODUO - dbw 32, PONYTA - dbw 30, DODRIO - dbw 30, DODRIO + dbw 48, DODUO + dbw 48, ARBOK + dbw 50, RATICATE + dbw 50, DODUO + dbw 52, PONYTA + dbw 50, DODRIO + dbw 50, DODRIO ; day - dbw 28, DODUO - dbw 28, ARBOK - dbw 30, RATICATE - dbw 30, DODUO - dbw 32, PONYTA - dbw 30, DODRIO - dbw 30, DODRIO + dbw 48, DODUO + dbw 48, ARBOK + dbw 50, RATICATE + dbw 50, DODUO + dbw 52, PONYTA + dbw 50, DODRIO + dbw 50, DODRIO ; nite - dbw 28, QUAGSIRE - dbw 28, NOCTOWL - dbw 30, RATICATE - dbw 30, QUAGSIRE - dbw 32, NOCTOWL - dbw 32, NOCTOWL - dbw 32, NOCTOWL + 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 @@ -875,29 +875,29 @@ KantoGrassWildMons: def_grass_wildmons VIRIDIAN_FOREST db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn - dbw 5, CATERPIE - dbw 6, METAPOD - dbw 6, CATERPIE - dbw 5, PARAS - dbw 5, ZUBAT ; KOKANA - dbw 6, PARAS - dbw 6, PIKACHU + dbw 35, CATERPIE + dbw 36, METAPOD + dbw 36, CATERPIE + dbw 35, PARAS + dbw 35, ZUBAT ; KOKANA + dbw 36, PARAS + dbw 36, PIKACHU ; day - dbw 5, CATERPIE - dbw 6, CATERPIE - dbw 5, METAPOD - dbw 6, METAPOD - dbw 5, ZUBAT ; KOKANA - dbw 6, PARAS - dbw 6, PIKACHU + dbw 35, CATERPIE + dbw 36, CATERPIE + dbw 35, METAPOD + dbw 36, METAPOD + dbw 35, ZUBAT ; KOKANA + dbw 36, PARAS + dbw 36, PIKACHU ; nite - dbw 5, ODDISH ; KOTORA - dbw 6, ODDISH ; KOTORA - dbw 6, ZUBAT - dbw 5, PARAS - dbw 5, ZUBAT ; KOKANA - dbw 6, PARAS - dbw 6, PIKACHU + dbw 35, ODDISH ; KOTORA + dbw 36, ODDISH ; KOTORA + dbw 36, ZUBAT + dbw 35, PARAS + dbw 35, ZUBAT ; KOKANA + dbw 36, PARAS + dbw 36, PIKACHU end_grass_wildmons db -1 ; end From 245680d2ca1ec7279c1932eae9ad21caeb1d8c63 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 27 Oct 2023 18:05:55 +0100 Subject: [PATCH 4/4] Update evos_attacks_johto.asm --- data/pokemon/evos_attacks_johto.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index 21f5ee8..6e62d51 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -1417,9 +1417,9 @@ ShiShiEvosAttacks: dbw 33, RECOVER dbw 44, BLIZZARD dbw 55, CRUNCH - dbw 66, BODY_SLAM + dbw 66, EXTREMESPEED dbw 77, WHIRLWIND - dbw 88, EXTREMESPEED + dbw 88, ANCIENTPOWER dbw 99, FUTURE_SIGHT db 0 ; no more level-up moves