From 5347a46208a697b1bc212944e0a0b013d4a80127 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 14 Sep 2025 11:26:54 -0600 Subject: [PATCH 1/7] SURPRISE EVOLOTTO This took like 10 minutes okay now I'm going to rest for at least a day --- constants/pokemon_constants.asm | 1 + data/pokemon/base_stats.asm | 1 + data/pokemon/cries.asm | 1 + data/pokemon/dex_entries.asm | 2 +- data/pokemon/dex_entry_pointers.asm | 1 + data/pokemon/dex_order_alpha.asm | 1 + data/pokemon/dex_order_new.asm | 1 + data/pokemon/egg_moves_johto.asm | 1 + data/pokemon/evolution_moves.asm | 1 + data/pokemon/evos_attacks_johto.asm | 7 +++++++ data/pokemon/first_stages.asm | 1 + data/pokemon/menu_icons.asm | 1 + data/pokemon/names.asm | 1 + data/pokemon/palettes.asm | 2 ++ data/pokemon/pic_pointers.asm | 2 ++ gfx/footprints/evolotto.png | Bin 0 -> 69 bytes gfx/footprints_johto.asm | 1 + gfx/pics.asm | 2 ++ gfx/pokemon/anim_pointers.asm | 1 + gfx/pokemon/anims.asm | 1 + gfx/pokemon/bitmask_pointers.asm | 1 + gfx/pokemon/bitmasks.asm | 1 + gfx/pokemon/evolotto/anim.asm | 1 + gfx/pokemon/evolotto/anim_idle.asm | 1 + gfx/pokemon/evolotto/back.png | Bin 0 -> 304 bytes gfx/pokemon/evolotto/front.png | Bin 0 -> 315 bytes gfx/pokemon/evolotto/shiny.pal | 2 ++ gfx/pokemon/frame_pointers.asm | 1 + gfx/pokemon/idle_pointers.asm | 1 + gfx/pokemon/idles.asm | 1 + gfx/pokemon/johto_frames.asm | 1 + maps/DebugRoom.asm | 4 ++-- 32 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 gfx/footprints/evolotto.png create mode 100644 gfx/pokemon/evolotto/anim.asm create mode 100644 gfx/pokemon/evolotto/anim_idle.asm create mode 100644 gfx/pokemon/evolotto/back.png create mode 100644 gfx/pokemon/evolotto/front.png create mode 100644 gfx/pokemon/evolotto/shiny.pal diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 606aad8..be2a496 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -423,6 +423,7 @@ DEF JOHTO_POKEMON EQU const_value const RUDDERNAUT const PIXYTOP const MAWTLE + const EVOLOTTO const XYLODON const XYLOFIN const DOKUROAR diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index a40cb3f..011851f 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -428,6 +428,7 @@ 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" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index f374f44..ea6bfbb 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -407,6 +407,7 @@ 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 diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 3f0da86..fa1372d 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -441,4 +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" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index a9b24c6..173c585 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -402,6 +402,7 @@ PokedexDataPointerTable: dba RuddernautPokedexEntry dba PixytopPokedexEntry dba MawtlePokedexEntry + dba EvolottoPokedexEntry dba XylodonPokedexEntry dba XylofinPokedexEntry dba DokuroarPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 2201363..e990857 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -103,6 +103,7 @@ 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 9815236..42f4d23 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -368,6 +368,7 @@ NewPokedexOrder: dw RUDDERNAUT dw PIXYTOP dw MAWTLE + dw EVOLOTTO dw XYLODON dw XYLOFIN dw DOKUROAR diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 96c9ef9..00a89a2 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -177,6 +177,7 @@ EggMovePointers2:: dw RuddernautEggMoves dw PixytopEggMoves dw MawtleEggMoves + dw NoEggMoves2 ; Evolotto dw XylodonEggMoves dw NoEggMoves2 dw NoEggMoves2 ; Dokuroar diff --git a/data/pokemon/evolution_moves.asm b/data/pokemon/evolution_moves.asm index acb6d1e..58b97fa 100644 --- a/data/pokemon/evolution_moves.asm +++ b/data/pokemon/evolution_moves.asm @@ -400,6 +400,7 @@ 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 b93db08..a4db5df 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -176,6 +176,7 @@ EvosAttacksPointers2:: dw RuddernautEvosAttacks dw PixytopEvosAttacks dw MawtleEvosAttacks + dw EvolottoEvosAttacks dw XylodonEvosAttacks dw XylofinEvosAttacks dw DokuroarEvosAttacks @@ -3029,6 +3030,12 @@ 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 diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 5f21302..7b47235 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -402,6 +402,7 @@ FirstEvoStages:: dw RUDDERNAUT dw PIXYTOP dw MAWTLE + dw EVOLOTTO dw XYLODON dw XYLODON dw DOKUROAR diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index d94efa6..1f9ffa9 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -403,6 +403,7 @@ 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 diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index c915978..d57161d 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -406,6 +406,7 @@ PokemonNames:: db "RUDDERNAUT" db "PIXYTOP@@@" db "MAWTLE@@@@" + db "EVOLOTTO@@" db "XYLODON@@@" db "XYLOFIN@@@" db "DOKUROAR@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 4c9ee51..d9d59f4 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -836,6 +836,8 @@ 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 diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 361d17e..dd8e427 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -818,6 +818,8 @@ PokemonPicPointers:: dba PixytopBackpic dba MawtleFrontpic dba MawtleBackpic + dba EvolottoFrontpic + dba EvolottoBackpic dba XylodonFrontpic dba XylodonBackpic dba XylofinFrontpic diff --git a/gfx/footprints/evolotto.png b/gfx/footprints/evolotto.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdCI$uuh60TpG7Jn1Jf1F&Ar-fh6Bg((Ffar# UFrGcD(gu?EboFyt=akR{0Fq`71ONa4 literal 0 HcmV?d00001 diff --git a/gfx/footprints_johto.asm b/gfx/footprints_johto.asm index b87de9a..f72923f 100644 --- a/gfx/footprints_johto.asm +++ b/gfx/footprints_johto.asm @@ -176,6 +176,7 @@ 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" diff --git a/gfx/pics.asm b/gfx/pics.asm index 4844a02..0ad3a43 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -1123,6 +1123,8 @@ 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" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 297250e..15c819a 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -402,6 +402,7 @@ AnimationPointers: dw RuddernautAnimation dw PixytopAnimation dw MawtleAnimation + dw EvolottoAnimation dw XylodonAnimation dw XylofinAnimation dw DokuroarAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 3979f65..58abafa 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -400,6 +400,7 @@ 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" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index d16cde3..be196b2 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -402,6 +402,7 @@ BitmasksPointers: dw RuddernautBitmasks dw PixytopBitmasks dw MawtleBitmasks + dw EvolottoBitmasks dw XylodonBitmasks dw XylofinBitmasks dw DokuroarBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 9d50afa..d3d8d06 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -400,6 +400,7 @@ 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" diff --git a/gfx/pokemon/evolotto/anim.asm b/gfx/pokemon/evolotto/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/evolotto/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/evolotto/anim_idle.asm b/gfx/pokemon/evolotto/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/evolotto/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/evolotto/back.png b/gfx/pokemon/evolotto/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4rT@hhJ-tuTNxM_cmjMvT>t<7zxO#u@e~FI z28N*Ao$3q>3@jx6$|Noz>;a17Oz_8WR#WAGf*3m10e9Zr}aV99gtK+Rk*0P7<5Z zex6bE1>=dD6&9?Dk4)rSp9-ob{O4fZc0J3hBVX*P;`^215C8FWM~Jeo3Rj80r?z?R z`~3@c-;{sA+~&jg%-`dzEdv7sUuuMBny)W|76StV2gsug3=EfoCxcj?u6{1-oD!M< DEmm+u literal 0 HcmV?d00001 diff --git a/gfx/pokemon/evolotto/front.png b/gfx/pokemon/evolotto/front.png new file mode 100644 index 0000000000000000000000000000000000000000..e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4rT@hhJ-tuTNxM_cmjMvT>t<7zxO#u@e~FI z28N*Ao$3q>3@jx6$|Noz>;a17Oz;M9R#WAGf*4wF$e1{D`YN~dR zby3LPDal648#Zpd$q}K?P!oPYl(9AckNUlZ6>|#bK4?~Wx|czuLikTy@Sk%6U*BY( z{*lqMzF%1^X@6Zmzv{BEKZ#2YtvR-|VMRt*|4gQ&v+9h0TzGkWJgN-Jw;j=6`@r_b z)^oBYSrv1ZZBY2}*d>ou^oMSd+uLi7ttP7^d)6sRG6ilZ$yu{I>)K4?rI~jgEDn_a zxwn1MY4!XQx`$qWd~3J={|`?a#Gz`$@R Qcru9P>FVdQ&MBb@0Gt7SSO5S3 literal 0 HcmV?d00001 diff --git a/gfx/pokemon/evolotto/shiny.pal b/gfx/pokemon/evolotto/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/evolotto/shiny.pal @@ -0,0 +1,2 @@ + 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 c8b4fd4..17d8a5e 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -402,6 +402,7 @@ FramesPointers: dba RuddernautFrames dba PixytopFrames dba MawtleFrames + dba EvolottoFrames dba XylodonFrames dba XylofinFrames dba DokuroarFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index f3ae200..bde4092 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -402,6 +402,7 @@ AnimationIdlePointers: dw RuddernautAnimationIdle dw PixytopAnimationIdle dw MawtleAnimationIdle + dw EvolottoAnimationIdle dw XylodonAnimationIdle dw XylofinAnimationIdle dw DokuroarAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 5f94472..cd88051 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -400,6 +400,7 @@ 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" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index c48ab7d..a7a21b6 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -176,6 +176,7 @@ 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" diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 65edaa5..d8d026e 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -19,12 +19,12 @@ DebugPokemon1Script: DebugPokemon2Script: opentext - getmonname STRING_BUFFER_3, FOLAGE + getmonname STRING_BUFFER_3, EVOLOTTO writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke FOLAGE, 31, RARE_CANDY + givepoke EVOLOTTO, 31, RARE_CANDY closetext end From 429b390f3b897ee1a42bf50f025a2e32fae66e99 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Sun, 28 Sep 2025 12:53:34 -0400 Subject: [PATCH 2/7] couple of sprites, shiny nidoqueen fix based on beta palettes --- gfx/pics.asm | 34 ++++++++++++++++---------------- gfx/pokemon/gorochu/front.png | Bin 315 -> 633 bytes gfx/pokemon/gorochu/shiny.pal | 4 ++-- gfx/pokemon/nidoqueen/shiny.pal | 4 ++-- gfx/pokemon/pendraken/front.png | Bin 315 -> 784 bytes maps/DebugRoom.asm | 14 ++++++------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gfx/pics.asm b/gfx/pics.asm index 0ad3a43..ef1aadd 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -880,22 +880,6 @@ 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 @@ -1128,7 +1112,23 @@ 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" ; 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/gorochu/front.png b/gfx/pokemon/gorochu/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..0aea2faa530d2bb1bd516e1182cfd7098305b5b3 100644 GIT binary patch literal 633 zcmeAS@N?(olHy`uVBq!ia0y~yV6XsT4rT@hhWQbvbr={JcmjMvT>t<7|Noff`zQtm z28N{$_qZ4sm^3_H978H@&7JC<#H_&KlKSjl`8p=8CbityEuK$4vPb`Z%V;0>t@*dC z^v@$pOa*steiL54GW z`tf|Xz|PAW*XJih9A%%iBSB>Kv4ks&gEa1Jd&y;SyScrZ_4b1w`j@YNocZnYYlX&* z(sf5?M(d{kJo=Hv`{8|=4ZJb8J{&dllgN(WzmucMcTk-7A05?}nha6YjZ{R?Rsf<>+%eT4?CTB?{GiTEn}3leOh|{8msiddk@yAB!>2iJySlo_mt6!hvj~r zjLB`+#rNj+zD%4|>zw_1>rbbSZ_3Ux+va_7I-9tc`=G+IzNH*Tp4_>m(%%u@u%gP&vtUp6w;Zk4pt7KS+Ji_rNP?{VWb=9Yv$Le|LLE)|Og67UPd^Hl8ZK zR$<4?7Skt@@6J9yBFFzw=>B}M0Gp1Ji7O0E#C!JH9en)4VdoCr-|8BUYv13qD_9nK5I sU+nTdd3^GOEnDp8|1Wwax$op3hBvo)j~X6R0VOU5Pgg&ebxsLQ0BYbUzyJUM literal 315 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4rT@hhJ-tuTNxM_cmjMvT>t<7zxO#u@e~FI z28N*Ao$3q>3@jx6$|Noz>;a17Oz;M9R#WAGf*4wF$e1{D`YN~dR zby3LPDal648#Zpd$q}K?P!oPYl(9AckNUlZ6>|#bK4?~Wx|czuLikTy@Sk%6U*BY( z{*lqMzF%1^X@6Zmzv{BEKZ#2YtvR-|VMRt*|4gQ&v+9h0TzGkWJgN-Jw;j=6`@r_b z)^oBYSrv1ZZBY2}*d>ou^oMSd+uLi7ttP7^d)6sRG6ilZ$yu{I>)K4?rI~jgEDn_a zxwn1MY4!XQx`$qWd~3J={|`?a#Gz`$@R Qcru9P>FVdQ&MBb@0Gt7SSO5S3 diff --git a/gfx/pokemon/gorochu/shiny.pal b/gfx/pokemon/gorochu/shiny.pal index 5c88669..1861bff 100644 --- a/gfx/pokemon/gorochu/shiny.pal +++ b/gfx/pokemon/gorochu/shiny.pal @@ -1,2 +1,2 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + RGB 21, 16, 14 + RGB 21, 04, 06 \ No newline at end of file diff --git a/gfx/pokemon/nidoqueen/shiny.pal b/gfx/pokemon/nidoqueen/shiny.pal index b27c118..25ea81f 100644 --- a/gfx/pokemon/nidoqueen/shiny.pal +++ b/gfx/pokemon/nidoqueen/shiny.pal @@ -1,4 +1,4 @@ - RGB 31, 16, 31 - RGB 11, 13, 08 + RGB 26, 27, 17 + RGB 28, 09, 24 diff --git a/gfx/pokemon/pendraken/front.png b/gfx/pokemon/pendraken/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..94e69894f95a1b2a9f6e58195071f9cb900cc3f5 100644 GIT binary patch literal 784 zcmeAS@N?(olHy`uVBq!ia0y~yV6XsT4rT@hhWQbvbr={JcmjMvT>t<7|9{FgONJH( z28PKYU#l4ynD%?RIEGZ*nme5{@2&xl%h8#?@9%u%chW2Rh-1V47o8%O&cD|$6+iiP zcDHvOYtmnRj$5r<9zWGHdwygWip_3mdR`{3dYoM>J()}B+ugpi{9^ZSOpSb3fAHU` zZ6b{CZ%G~zyr#@0x+L$}?0brpL2>@}OWXoO<~?!rOv}pMa_dIZ-%m{EBkI(ul=$=x zW!E*dF=qH}db{SI@usJuydFV2Sr#%1uFg9*Ip>_iNwZ^YorT{NyI$Dd<4#ma%iJTm z`M132E2q<@#!IXA(!TYz?;@`p`6+`G);finKEjKxxdbU!r7mWc@ys9=QIM*4Z%v=%MD1LLnqzWG| z&Ul$6C)w;J_U&M|G|HX3?YZ=y9e-vmHPkjRVGsZ2dhfv_8L`N_25(h(ZJzNQ-*RGI z#o3-C(o0@H=i-Q+WN7JF-#+0<;4PNB@v=q^9|IR^-i&bH<#j07PR!jSt$$C0$;97B zEPIX`IJBmG_qY{TyKqlpO8Xg;_R>j`%=*?f4b|7TG~Vq|5x;KnM)KHIbMd(i4;MUr z**$Nn)sdQg!Zru@u)A33?|2a}roz{krIfwt)was}6AHTSOb=U;*WmNv@ZN)ZyR_wk z68K8aUMh|?UD3AhX4uK!1&8bm-!fMm$avQ^`}hQb)sE`DD<+BUQ2S_*{(b-B(o3hC z7RgKAnqw&aN$+L#wF#RHw|fgV^{zW0n(psm8@+t<7zxO#u@e~FI z28N*Ao$3q>3@jx6$|Noz>;a17Oz;M9R#WAGf*4wF$e1{D`YN~dR zby3LPDal648#Zpd$q}K?P!oPYl(9AckNUlZ6>|#bK4?~Wx|czuLikTy@Sk%6U*BY( z{*lqMzF%1^X@6Zmzv{BEKZ#2YtvR-|VMRt*|4gQ&v+9h0TzGkWJgN-Jw;j=6`@r_b z)^oBYSrv1ZZBY2}*d>ou^oMSd+uLi7ttP7^d)6sRG6ilZ$yu{I>)K4?rI~jgEDn_a zxwn1MY4!XQx`$qWd~3J={|`?a#Gz`$@R Qcru9P>FVdQ&MBb@0Gt7SSO5S3 diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index d8d026e..db0e584 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -8,12 +8,12 @@ DebugRoom_MapScripts: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, WARFURS + getmonname STRING_BUFFER_3, WEARLYCAN writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke WARFURS, 23, RARE_CANDY + givepoke WEARLYCAN, 53, RARE_CANDY closetext end @@ -39,11 +39,11 @@ DebugPokemon3Script: faceplayer opentext writetext DebugTextA - cry BELLSPROUT + cry NIDOQUEEN pause 15 closetext - loadvar VAR_BATTLETYPE, BATTLETYPE_INVERSE - loadwildmon BELLSPROUT, 10 + loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY + loadwildmon NIDOQUEEN, 10 startbattle reloadmapafterbattle end @@ -56,11 +56,11 @@ DebugPokemon4Script: faceplayer opentext writetext DebugTextB - cry KLEAVOR + cry GOROCHU pause 15 closetext loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE - loadwildmon KLEAVOR, 10 + loadwildmon GOROCHU, 69 startbattle reloadmapafterbattle end From bb3fc104f8aabb5f4392bdb35e69f70cbe1cad37 Mon Sep 17 00:00:00 2001 From: Misty Date: Sat, 25 Oct 2025 16:05:42 -0600 Subject: [PATCH 3/7] The Great Trainer Overhaul (Part 2)... and...? Finishes the trainers of Johto, and a little something extra ;3 --- constants/pokemon_constants.asm | 1 + data/pokemon/base_stats.asm | 1 + data/pokemon/base_stats/deoxys.asm | 21 + data/pokemon/cries.asm | 1 + data/pokemon/dex_entries.asm | 1 + data/pokemon/dex_entries/deoxys.asm | 10 + data/pokemon/dex_entry_pointers.asm | 1 + data/pokemon/dex_order_alpha.asm | 1 + data/pokemon/dex_order_new.asm | 1 + data/pokemon/egg_moves_johto.asm | 1 + data/pokemon/evos_attacks_johto.asm | 30 +- data/pokemon/evos_attacks_kanto.asm | 5 +- data/pokemon/first_stages.asm | 1 + data/pokemon/menu_icons.asm | 1 + data/pokemon/names.asm | 1 + data/pokemon/palettes.asm | 2 + data/pokemon/pic_pointers.asm | 2 + data/trainers/parties.asm | 1337 ++++++++++++++----------- data/trainers/parties_new_classes.asm | 30 +- gfx/footprints_johto.asm | 1 + gfx/pics.asm | 2 + gfx/pokemon/anim_pointers.asm | 1 + gfx/pokemon/anims.asm | 1 + gfx/pokemon/bitmask_pointers.asm | 1 + gfx/pokemon/bitmasks.asm | 1 + gfx/pokemon/deoxys/anim.asm | 12 + gfx/pokemon/deoxys/anim_idle.asm | 5 + gfx/pokemon/deoxys/back.png | Bin 0 -> 780 bytes gfx/pokemon/deoxys/front.png | Bin 0 -> 2682 bytes gfx/pokemon/deoxys/shiny.pal | 13 + gfx/pokemon/frame_pointers.asm | 1 + gfx/pokemon/idle_pointers.asm | 1 + gfx/pokemon/idles.asm | 1 + gfx/pokemon/johto_frames.asm | 1 + 34 files changed, 907 insertions(+), 582 deletions(-) create mode 100644 data/pokemon/base_stats/deoxys.asm create mode 100644 data/pokemon/dex_entries/deoxys.asm create mode 100644 gfx/pokemon/deoxys/anim.asm create mode 100644 gfx/pokemon/deoxys/anim_idle.asm create mode 100644 gfx/pokemon/deoxys/back.png create mode 100644 gfx/pokemon/deoxys/front.png create mode 100644 gfx/pokemon/deoxys/shiny.pal diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index be2a496..27c0c3a 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -449,6 +449,7 @@ 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 011851f..408e9ad 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -454,4 +454,5 @@ 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 new file mode 100644 index 0000000..93abcc6 --- /dev/null +++ b/data/pokemon/base_stats/deoxys.asm @@ -0,0 +1,21 @@ + 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 ea6bfbb..fb54b95 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -433,4 +433,5 @@ 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 fa1372d..608afa1 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -442,3 +442,4 @@ 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 new file mode 100644 index 0000000..d081dc5 --- /dev/null +++ b/data/pokemon/dex_entries/deoxys.asm @@ -0,0 +1,10 @@ + db "DNA@" ; species name + dw 507, 1340 ; height, weight + + db "Born from a" + next "mutated space" + next "virus, the crystal" + + db "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 173c585..ac22bbf 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -428,4 +428,5 @@ 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 e990857..d719e7a 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -74,6 +74,7 @@ AlphabeticalPokedexOrder: dw CYNDAQUIL dw DECILLA dw DELIBIRD + dw DEOXYS dw DEWGONG dw DIGLETT dw DISTURBAN diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 42f4d23..e235a0b 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -429,4 +429,5 @@ 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 00a89a2..8ed6c64 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -203,6 +203,7 @@ EggMovePointers2:: dw NoEggMoves2 dw NoEggMoves2 dw NoEggMoves2 + dw NoEggMoves2 ; Deoxys .IndirectEnd:: ChikoritaEggMoves: diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index a4db5df..24d783b 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -202,6 +202,7 @@ EvosAttacksPointers2:: dw HyoshuYangEvosAttacks dw HyoshuYinEvosAttacks dw CelebiEvosAttacks + dw DeoxysEvosAttacks .IndirectEnd:: ChikoritaEvosAttacks: @@ -1021,8 +1022,8 @@ HoppipEvosAttacks: dbw 17, STUN_SPORE dbw 18, SLEEP_POWDER dbw 22, LEECH_SEED - dbw 25, SLAM ; SW97 - dbw 30, MEGA_DRAIN + dbw 25, MEGA_DRAIN + dbw 30, SLAM ; SW97 dbw 35, GROWTH ; SW97 dbw 39, RAZOR_LEAF ; SW97 dbw 45, COTTON_SPORE @@ -1042,8 +1043,8 @@ SkiploomEvosAttacks: dbw 17, STUN_SPORE dbw 18, SLEEP_POWDER dbw 24, LEECH_SEED - dbw 27, SLAM ; SW97 - dbw 32, MEGA_DRAIN + dbw 27, MEGA_DRAIN + dbw 32, SLAM ; SW97 dbw 39, GROWTH ; SW97 dbw 43, RAZOR_LEAF ; SW97 dbw 49, COTTON_SPORE @@ -1062,8 +1063,8 @@ JumpluffEvosAttacks: dbw 17, STUN_SPORE dbw 18, SLEEP_POWDER dbw 24, LEECH_SEED - dbw 27, SLAM ; SW97 - dbw 34, MEGA_DRAIN + dbw 27, MEGA_DRAIN + dbw 34, SLAM ; SW97 dbw 41, GROWTH ; SW97 dbw 47, RAZOR_LEAF ; SW97 dbw 53, COTTON_SPORE @@ -3458,3 +3459,20 @@ 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 77346bd..a49cd02 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -2386,10 +2386,11 @@ KinglerEvosAttacks: dbw 53, FLAIL ; FRLG db 0 ; no more level-up moves -VoltorbEvosAttacks: ; spark and twave should be here somewhere +VoltorbEvosAttacks: 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 @@ -2406,6 +2407,7 @@ VoltorbEvosAttacks: ; spark and twave should be here somewhere ElectrodeEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE + dbw 1, THUNDERSHOCK dbw 7, SCREECH dbw 12, THUNDER_WAVE ; SW97 dbw 17, SONICBOOM @@ -3350,6 +3352,7 @@ 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 7b47235..2829183 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -428,4 +428,5 @@ 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 1f9ffa9..71ad521 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -429,4 +429,5 @@ 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 d57161d..dc26817 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -432,4 +432,5 @@ 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 d9d59f4..154f9dd 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -890,6 +890,8 @@ 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 dd8e427..b1b05c4 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -870,4 +870,6 @@ 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 3a8e42e..b551309 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, NO_MOVE + dw TACKLE, MUD_SLAP, GUST, SAND_ATTACK db -1 ; end end_list_items @@ -79,19 +79,21 @@ MortyGroup: PryceGroup: next_list_item ; PRYCE (1) db "PRYCE@", TRAINERTYPE_MOVES - db 33 + db 40 dw DELIBIRD - 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 SPIKES, ICY_WIND, PRESENT, ENCORE + db 39 dw BUU - dw HEADBUTT, ICY_WIND, AURORA_BEAM, REST - db 35 + dw ICE_PUNCH, ICY_WIND, FAINT_ATTACK, DIZZY_PUNCH + db 40 dw DEWGONG - dw HEADBUTT, ICY_WIND, AURORA_BEAM, REST - ; WEARLYCAN - db 41 - dw PILOSWINE ; MAMOSWINE - dw ICY_WIND, FURY_ATTACK, MIST, BLIZZARD + 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 db -1 ; end end_list_items @@ -108,10 +110,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 @@ -127,9 +129,9 @@ ChuckGroup: db 32 dw HERACROSS dw HORN_ATTACK, KARATE_CHOP, ENDURE, LEER - ; db 31 - ; dw ALOLAN SNORLAX - ; dw ??? + db 31 + dw TANOBI + dw JUMP_KICK, WING_ATTACK, SWIFT, AGILITY db 32 dw HITMONTOP ; maybe Pixytop? dw ROLLING_KICK, RAPID_SPIN, PURSUIT, COUNTER @@ -143,22 +145,22 @@ ChuckGroup: ClairGroup: next_list_item ; CLAIR (1) db "CLAIR@", TRAINERTYPE_MOVES - db 41 + db 45 dw COATL dw TRANSFORM, DRAGONBREATH, MORNING_SUN, GUST - db 43 + db 44 dw GYARADOS dw FLAMETHROWER, SURF, BODY_SLAM, DRAGONBREATH - db 43 + db 45 dw AMPHAROS - dw THUNDER_WAVE, THUNDERBOLT, FIRE_PUNCH, HEADBUTT - db 47 - dw DRAGONAIR ; MINISTARE - dw THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH + dw THUNDER_WAVE, THUNDERBOLT, FIRE_PUNCH, DAZZLING_GLEAM db 47 dw DRAGONAIR dw THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH - db 50 + db 47 + dw MINISTARE + dw GLARE, FURY_SWIPES, BUBBLEBEAM, DRAGONBREATH + db 48 dw KINGDRA dw SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH db -1 ; end @@ -245,7 +247,7 @@ Rival1Group: dw LEECH_LIFE, DISABLE, DESTINY_BOND, SPITE db 25 dw QUILAVA - dw LEER, SMOKESCREEN, EMBER, QUICK_ATTACK + dw LEER, SMOKESCREEN, FLAME_WHEEL, QUICK_ATTACK db -1 ; end next_list_item ; RIVAL1 (9) @@ -266,125 +268,125 @@ Rival1Group: next_list_item ; RIVAL1 (10) db "?@", TRAINERTYPE_MOVES - db 30 - dw GOLBAT - 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 + db 40 dw SNEASEL - dw LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK - db 32 + dw FAINT_ATTACK, ICY_WIND, FURY_SWIPES, SCREECH + db 42 + dw URSARING + dw SLASH, FAINT_ATTACK, LICK, MOONLIGHT + db 40 + dw GOLBAT + dw WING_ATTACK, THRASH, CONFUSION, CONFUSE_RAY + db 41 + dw STROMEN + dw NIGHT_SHADE, DISABLE, DESTINY_BOND, SUBSTITUTE + db 43 dw MEGANIUM - dw REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM + dw RAZOR_LEAF, BODY_SLAM, SLEEP_POWDER, SYNTHESIS db -1 ; end next_list_item ; RIVAL1 (11) db "?@", TRAINERTYPE_MOVES - db 30 - dw GOLBAT - 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 + db 40 dw SNEASEL - dw LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK - db 32 - dw QUILAVA - dw SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL + dw FAINT_ATTACK, ICY_WIND, FURY_SWIPES, SCREECH + db 42 + dw URSARING + dw SLASH, FAINT_ATTACK, LICK, MOONLIGHT + db 40 + 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 db -1 ; end next_list_item ; RIVAL1 (12) db "?@", TRAINERTYPE_MOVES - db 30 - dw GOLBAT - 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 + db 40 dw SNEASEL - dw LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK - db 32 + dw FAINT_ATTACK, ICY_WIND, FURY_SWIPES, SCREECH + db 42 + dw URSARING + dw SLASH, FAINT_ATTACK, LICK, MOONLIGHT + db 40 + dw GOLBAT + dw WING_ATTACK, THRASH, CONFUSION, CONFUSE_RAY + db 41 + dw STROMEN + dw NIGHT_SHADE, DISABLE, DESTINY_BOND, SUBSTITUTE + db 43 dw FERALIGATR - dw RAGE, WATER_GUN, BITE, SCARY_FACE + dw WATER_GUN, BITE, SLASH, SCARY_FACE db -1 ; end next_list_item ; RIVAL1 (13) db "?@", TRAINERTYPE_MOVES - 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 + 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, THUNDERBOLT, SUBSTITUTE + db 50 + dw PUPITAR + dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE + db 54 dw MEGANIUM - dw REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM + dw GIGA_DRAIN, EARTHQUAKE, BODY_SLAM, SLEEP_POWDER db -1 ; end next_list_item ; RIVAL1 (14) db "?@", TRAINERTYPE_MOVES - 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 + 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, THUNDERBOLT, SUBSTITUTE + db 50 + dw PUPITAR + dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE + db 54 dw TYPHLOSION - dw SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL + dw FLAMETHROWER, THUNDERPUNCH, SWIFT, SMOKESCREEN db -1 ; end next_list_item ; RIVAL1 (15) db "?@", TRAINERTYPE_MOVES - 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 + 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, THUNDERBOLT, SUBSTITUTE + db 50 + dw PUPITAR + dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE + db 54 dw FERALIGATR - dw RAGE, WATER_GUN, SCARY_FACE, SLASH + dw SURF, CRUNCH, SLASH, SCARY_FACE db -1 ; end end_list_items @@ -417,19 +419,22 @@ PokemonProfGroup: WillGroup: next_list_item ; WILL (1) db "WILL@", TRAINERTYPE_MOVES - db 40 + db 55 dw XATU - dw NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M - db 41 + dw NIGHT_SHADE, CONFUSE_RAY, DRILL_PECK, PSYCHIC_M + db 54 + dw WYRDEER + dw PSYCHIC_M, DOUBLE_EDGE, REFLECT, LIGHT_SCREEN + db 53 dw JYNX - dw MEAN_LOOK, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M - db 41 - dw ESPEON - dw REFLECT, QUICK_ATTACK, MORNING_SUN, PSYCHIC_M - db 41 + dw DRAINING_KISS, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M + db 55 dw SLOWKING dw CURSE, SURF, EARTHQUAKE, PSYCHIC_M - db 42 + db 54 + dw ESPEON + dw REFLECT, SHADOW_BALL, MORNING_SUN, PSYCHIC_M + db 57 dw FARIGIRAF dw PSYCHIC_M, CRUNCH, STOMP, AGILITY ; Check how Return/Frustration work db -1 ; end @@ -521,21 +526,24 @@ PKMNTrainerGroup: BrunoGroup: next_list_item ; BRUNO (1) db "BRUNO@", TRAINERTYPE_MOVES - 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 + db 56 + dw GORILLAIMO + dw SUBMISSION, BODY_SLAM, THUNDERPUNCH, AMNESIA + db 55 dw STEELIX dw IRON_TAIL, EARTHQUAKE, EXPLOSION, ROCK_HEAD - db 46 + 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 dw MACHAMP - dw ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP + dw ROCK_SLIDE, CROSS_CHOP, FORESIGHT, LIGHT_SCREEN db -1 ; end next_list_item ; BRUNO (1) @@ -565,21 +573,24 @@ BrunoGroup: KarenGroup: next_list_item ; KAREN (1) db "KAREN@", TRAINERTYPE_MOVES - db 42 + db 58 dw UMBREON - dw SAND_ATTACK, CONFUSE_RAY, PURSUIT, MEAN_LOOK - db 42 + dw PURSUIT, SAND_ATTACK, TOXIC, MEAN_LOOK + db 57 dw BELLEDAM dw PURSUIT, HEAL_BELL, LOVELY_KISS, ATTRACT - db 44 + db 56 + dw JUNGELA + dw PURSUIT, GIGA_DRAIN, SLEEP_POWDER, GROWTH + db 57 dw HONCHKROW - dw QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK - db 47 + dw PURSUIT, WING_ATTACK, WHIRLWIND, DETECT + db 58 + dw WEAVILE + dw PURSUIT, ICE_BEAM, METAL_CLAW, AGILITY + db 60 dw HOUNDOOM - dw ROAR, PURSUIT, FLAMETHROWER, CRUNCH - db 55 - dw TYRANITAR - dw PURSUIT, ROCK_SLIDE, ICE_BEAM, DYNAMICPUNCH + dw PURSUIT, FLAMETHROWER, BONEMERANG, ROAR db -1 ; end next_list_item ; KAREN (1) @@ -609,21 +620,24 @@ KarenGroup: KogaGroup: next_list_item ; KOGA (1) db "KOGA@", TRAINERTYPE_MOVES - db 43 + db 54 dw QWILFATHER dw SPIKES, HYDRO_PUMP, MINIMIZE, HAZE - db 40 - dw ARIADOS - dw DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, AGILITY - db 41 + db 55 dw VENOMOTH dw SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, TOXIC - db 42 + db 56 + dw WEEZING + dw SLUDGE_BOMB, FIRE_BLAST, EXPLOSION, DESTINY_BOND + db 55 + dw TENTACRUEL + dw SURF, SLUDGE_BOMB, WRAP, BARRIER + db 56 dw MUK - dw MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC - db 44 + dw MINIMIZE, MOONBLAST, SLUDGE_BOMB, TOXIC + db 58 dw CROBAT - dw DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC + dw DOUBLE_TEAM, STEEL_WING, WING_ATTACK, TOXIC db -1 ; end next_list_item ; KOGA (1) @@ -653,24 +667,24 @@ KogaGroup: ChampionGroup: next_list_item ; CHAMPION (1) db "LANCE@", TRAINERTYPE_MOVES - db 44 + db 61 dw GYARADOS - dw THUNDERBOLT, RAIN_DANCE, SURF, HYPER_BEAM - db 47 + dw THUNDERBOLT, OUTRAGE, SURF, HYPER_BEAM + db 59 dw CHARIZARD dw ROCK_SLIDE, FLAMETHROWER, EARTHQUAKE, HYPER_BEAM - db 47 + db 60 dw GAVILLAIN dw THUNDERBOLT, DRAGONBREATH, GLARE, HYPER_BEAM - db 46 + db 60 dw AERODACTYL - dw WING_ATTACK, ANCIENTPOWER, EARTHQUAKE, HYPER_BEAM ; Now legal! - db 46 + dw WING_ATTACK, ROCK_HEAD, EARTHQUAKE, HYPER_BEAM ; Now legal! + db 61 dw IGUANARCH - dw DRAGONBREATH, GLARE, THUNDERBOLT, HYPER_BEAM - db 50 + dw OUTRAGE, GLARE, ICE_BEAM, HYPER_BEAM + db 63 dw DRAGONITE - dw FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM + dw OUTRAGE, FIRE_BLAST, EXTREMESPEED, HYPER_BEAM db -1 ; end next_list_item ; CHAMPION (1) @@ -775,42 +789,46 @@ LtSurgeGroup: ScientistGroup: next_list_item ; SCIENTIST (1) db "ROSS@", TRAINERTYPE_NORMAL - db 22 - dw KOFFING - db 22 + db 30 dw KOFFING + db 30 + dw ELECTRODE + db 30 + dw PORYGON db -1 ; end next_list_item ; SCIENTIST (2) db "MITCH@", TRAINERTYPE_NORMAL - db 24 + db 30 dw DITTO + db 30 + dw DITTO + db 30 + dw MIMMEO db -1 ; end next_list_item ; SCIENTIST (3) db "JED@", TRAINERTYPE_NORMAL - db 20 - dw MAGNEMITE - db 20 - dw MAGNEMITE - db 20 - dw MAGNEMITE + db 29 + dw MAGNETITE + db 29 + dw KADABRA + db 30 + dw MR__MIME db -1 ; end next_list_item ; SCIENTIST (4) db "MARC@", TRAINERTYPE_NORMAL - db 27 - dw MAGNEMITE - db 27 - dw MAGNEMITE - db 27 - dw MAGNEMITE + db 35 + dw MAGNETON + db 35 + dw QATU db -1 ; end next_list_item ; SCIENTIST (5) db "RICH@", TRAINERTYPE_MOVES - db 30 - dw PORYGON + db 37 + dw PORYGON2 dw CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK db -1 ; end @@ -1277,10 +1295,12 @@ BirdKeeperGroup: next_list_item ; BIRD_KEEPER (7) db "VANCE@", TRAINERTYPE_NORMAL - db 25 - dw PIDGEOTTO - db 25 - dw PIDGEOTTO + db 37 + dw NOCTOWL + db 37 + dw DODRIO + db 36 + dw MURKROW db -1 ; end next_list_item ; BIRD_KEEPER (8) @@ -1317,8 +1337,14 @@ BirdKeeperGroup: next_list_item ; BIRD_KEEPER (12) db "JOSE@", TRAINERTYPE_NORMAL - db 36 - dw FARFETCH_D + db 44 + dw DODRIO + db 45 + dw CACAWPHONY + db 46 + dw TREBIR + db 47 + dw LUXWAN db -1 ; end next_list_item ; BIRD_KEEPER (13) @@ -1476,39 +1502,47 @@ CooltrainerMGroup: next_list_item ; COOLTRAINERM (3) db "PAUL@", TRAINERTYPE_NORMAL - db 34 - dw DRATINI - db 34 - dw DRATINI - db 34 + db 43 dw DRATINI + db 43 + dw SQUEAMATA + db 43 + dw SEADRA db -1 ; end next_list_item ; COOLTRAINERM (4) db "CODY@", TRAINERTYPE_NORMAL - db 34 - dw HORSEA - db 36 - dw SEADRA + db 41 + dw GYARADOS + db 42 + dw AERODACTYL + db 43 + dw CHARIZARD db -1 ; end next_list_item ; COOLTRAINERM (5) db "MIKE@", TRAINERTYPE_NORMAL - db 37 - dw DRAGONAIR + db 45 + dw MINISTARE db -1 ; end next_list_item ; COOLTRAINERM (6) db "GAVEN@", TRAINERTYPE_MOVES - db 35 + db 45 dw VICTREEBEL - dw WRAP, TOXIC, ACID, RAZOR_LEAF - db 35 + dw WRAP, TOXIC, SLUDGE_BOMB, RAZOR_LEAF + db 45 dw KINGLER - dw BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT - db 35 + 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 FLAREON - dw SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN + dw FLAMETHROWER, QUICK_ATTACK, BITE, SAND_ATTACK db -1 ; end next_list_item ; COOLTRAINERM (7) @@ -1529,22 +1563,37 @@ CooltrainerMGroup: next_list_item ; COOLTRAINERM (8) db "RYAN@", TRAINERTYPE_MOVES - db 25 + db 38 dw PIDGEOT - dw SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK - db 27 + dw WING_ATTACK, QUICK_ATTACK, WHIRLWIND, SING + db 38 dw ELECTABUZZ - dw THUNDERPUNCH, LIGHT_SCREEN, SWIFT, SCREECH + 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 db -1 ; end next_list_item ; COOLTRAINERM (9) db "JAKE@", TRAINERTYPE_MOVES - db 33 + db 44 dw PARASECT - dw LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE - db 35 + dw GIGA_DRAIN, SPORE, SLASH, SWORDS_DANCE + db 45 dw GOLDUCK - dw CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES + 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 db -1 ; end next_list_item ; COOLTRAINERM (10) @@ -1562,22 +1611,31 @@ CooltrainerMGroup: next_list_item ; COOLTRAINERM (11) db "BLAKE@", TRAINERTYPE_MOVES - db 33 - dw MAGNETON - dw THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH - db 31 + db 46 + dw MAGNEZONE + dw THUNDERBOLT, SUPERSONIC, THUNDER_WAVE, SCREECH + db 44 dw QUAGSIRE - dw WATER_GUN, SLAM, AMNESIA, EARTHQUAKE - db 31 - dw EXEGGCUTE - dw LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM + 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 db -1 ; end next_list_item ; COOLTRAINERM (12) db "BRIAN@", TRAINERTYPE_MOVES - db 35 + db 46 dw SANDSLASH - dw SAND_ATTACK, POISON_STING, SLASH, SWIFT + 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 db -1 ; end ; Previously unused, now Winner's Path @@ -1649,16 +1707,34 @@ CooltrainerMGroup: next_list_item ; COOLTRAINERM (19) db "ALLEN@", TRAINERTYPE_MOVES - db 27 + db 35 dw CHARMELEON - dw EMBER, SMOKESCREEN, RAGE, SCARY_FACE + 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 db -1 ; end next_list_item ; COOLTRAINERM (20) db "DARIN@", TRAINERTYPE_MOVES - db 37 - dw DRAGONAIR - dw WRAP, SURF, DRAGON_RAGE, SLAM + 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 -1 ; end next_list_item ; COOLTRAINERM (11) @@ -1704,16 +1780,18 @@ CooltrainerFGroup: next_list_item ; COOLTRAINERF (3) db "FRAN@", TRAINERTYPE_NORMAL - db 37 - dw SEADRA + db 43 + dw AMPHAROS + db 45 + dw GAVILLAIN db -1 ; end next_list_item ; COOLTRAINERF (4) db "LOLA@", TRAINERTYPE_NORMAL - db 34 - dw DRATINI - db 36 + db 44 dw DRAGONAIR + db 44 + dw COATL db -1 ; end next_list_item ; COOLTRAINERF (5) @@ -1734,52 +1812,73 @@ CooltrainerFGroup: next_list_item ; COOLTRAINERF (7) db "KELLY@", TRAINERTYPE_NORMAL - db 27 - dw MARILL - db 24 - dw WARTORTLE - db 24 - dw WARTORTLE + db 41 + dw AZUMARILL + db 40 + dw TOTARTLE + db 40 + dw BLASTOISE db -1 ; end next_list_item ; COOLTRAINERF (8) db "JOYCE@", TRAINERTYPE_MOVES - db 36 - dw PIKACHU - dw QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER - db 32 + db 46 dw BLASTOISE - dw BITE, CURSE, SURF, RAIN_DANCE + 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 db -1 ; end next_list_item ; COOLTRAINERF (9) db "BETH@", TRAINERTYPE_MOVES - db 36 + db 47 dw RAPIDASH - dw STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY + 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 db -1 ; end next_list_item ; COOLTRAINERF (10) db "REENA@", TRAINERTYPE_NORMAL - db 31 - dw STARMIE - db 33 + db 47 + dw MANTINE + db 46 + dw ARCANINE + db 48 dw NIDOQUEEN - db 31 - dw STARMIE db -1 ; end next_list_item ; COOLTRAINERF (11) db "MEGAN@", TRAINERTYPE_MOVES - db 32 - dw BULBASAUR - dw GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF - db 32 + db 44 dw IVYSAUR - dw GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF - db 32 + dw RAZOR_LEAF, LEECH_SEED, TOXIC, SYNTHESIS + db 46 dw VENUSAUR - dw BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT + 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 db -1 ; end next_list_item ; COOLTRAINERF (12) @@ -1815,12 +1914,18 @@ CooltrainerFGroup: next_list_item ; COOLTRAINERF (16) db "CYBIL@", TRAINERTYPE_MOVES - db 25 + db 35 + dw LEDIAN + dw LIGHT_SCREEN, REFLECT, SUPERSONIC, COMET_PUNCH + db 35 dw BUTTERFREE - dw CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST - db 25 + dw PSYBEAM, SLEEP_POWDER, WHIRLWIND, GUST + db 36 dw BELLOSSOM - dw ABSORB, STUN_SPORE, ACID, SOLARBEAM + dw SOLARBEAM, STUN_SPORE, ACID, MEGA_DRAIN + db 36 + dw SUNFLORA + dw SOLARBEAM, ENCORE, SYNTHESIS, SING db -1 ; end next_list_item ; COOLTRAINERF (17) @@ -1867,15 +1972,15 @@ CooltrainerFGroup: next_list_item ; COOLTRAINERF (21) db "CARA@", TRAINERTYPE_MOVES - db 33 + db 42 dw HORSEA dw SMOKESCREEN, LEER, WHIRLPOOL, TWISTER - db 33 - dw HORSEA - dw SMOKESCREEN, LEER, WHIRLPOOL, TWISTER - db 35 + db 42 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 @@ -2045,27 +2150,41 @@ PokemaniacGroup: next_list_item ; POKEMANIAC (4) db "SHANE@", TRAINERTYPE_NORMAL - db 16 + db 29 + dw JIGGLYPUFF + db 29 + dw CLEFAIRY + db 30 dw NIDORINA - db 16 + db 30 dw NIDORINO db -1 ; end next_list_item ; POKEMANIAC (5) db "BEN@", TRAINERTYPE_NORMAL - db 19 + db 31 + dw GORILLAIMO + db 32 + dw DISTURBAN + db 33 dw SLOWBRO db -1 ; end next_list_item ; POKEMANIAC (6) db "BRENT@", TRAINERTYPE_NORMAL - db 19 - dw LICKITUNG + db 32 + dw GAVILLAIN + db 32 + dw LICKILORD db -1 ; end next_list_item ; POKEMANIAC (7) db "RON@", TRAINERTYPE_NORMAL - db 19 + db 31 + dw HYPNO + db 30 + dw WEARLYCAN + db 33 dw NIDOKING db -1 ; end @@ -2095,8 +2214,9 @@ PokemaniacGroup: db 12 dw LICKITUNG dw LICK, SUPERSONIC, CUT, NO_MOVE - ; dw 12 - ; dw WARFURS + db 12 + dw WARFURS + dw SCRATCH, TAIL_WHIP, POWDER_SNOW, CUT db -1 ; end next_list_item ; POKEMANIAC (12) @@ -2109,8 +2229,10 @@ PokemaniacGroup: next_list_item ; POKEMANIAC (13) db "ZACH@", TRAINERTYPE_NORMAL - db 27 + db 38 dw RHYHORN + db 38 + dw TRAMPEL db -1 ; end next_list_item ; POKEMANIAC (14) @@ -2122,10 +2244,14 @@ PokemaniacGroup: next_list_item ; POKEMANIAC (15) db "MILLER@", TRAINERTYPE_NORMAL - db 17 + db 28 dw NIDOKING - db 17 + db 28 dw NIDOQUEEN + db 28 + dw NIDOREIGN + db 30 + dw KANGASKHAN db -1 ; end end_list_items @@ -2153,88 +2279,99 @@ GruntMGroup: next_list_item ; GRUNTM (3) db "GRUNT@", TRAINERTYPE_NORMAL - db 24 - dw RATICATE - db 24 + db 34 dw RATICATE + db 35 + dw ELECTRODE db -1 ; end next_list_item ; GRUNTM (4) db "GRUNT@", TRAINERTYPE_NORMAL - db 23 - dw GRIMER - db 23 - dw GRIMER - db 25 + db 32 + dw QWILFISH + db 33 + dw ARIADOS + db 35 dw MUK db -1 ; end next_list_item ; GRUNTM (5) db "GRUNT@", TRAINERTYPE_NORMAL - db 21 - dw RATTATA - db 21 - dw RATTATA - db 23 - dw RATTATA - db 23 - dw RATTATA - db 23 - dw RATTATA + db 29 + dw KOFFING + db 29 + dw KOFFING + db 29 + dw KOFFING + db 29 + dw KOFFING + db 32 + dw WEEZING db -1 ; end next_list_item ; GRUNTM (6) db "GRUNT@", TRAINERTYPE_NORMAL - db 26 - dw ZUBAT - db 26 - dw ZUBAT + db 30 + dw GOLBAT + db 31 + dw RATICATE + db 32 + dw GLOOM + db 32 + dw ELECTRODE db -1 ; end next_list_item ; GRUNTM (7) db "GRUNT@", TRAINERTYPE_NORMAL - db 23 + db 33 dw KOFFING - db 23 + db 33 dw GRIMER - db 23 - dw ZUBAT - db 23 - dw RATTATA + db 34 + dw VICTREEBEL db -1 ; end next_list_item ; GRUNTM (8) - db "GRUNT@", TRAINERTYPE_NORMAL - db 26 + db "GRUNT@", TRAINERTYPE_MOVES + db 33 + dw SNEASEL + dw THIEF, FURY_SWIPES, SCREECH, QUICK_ATTACK + db 32 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 24 - dw RATICATE - db 26 - dw KOFFING + db 35 + dw MURKROW + db 34 + dw GRAVELER + db 36 + dw GRANBULL db -1 ; end next_list_item ; GRUNTM (10) db "GRUNT@", TRAINERTYPE_NORMAL - db 22 - dw ZUBAT - db 24 + db 33 dw GOLBAT - db 22 - dw GRIMER + db 34 + dw SANDSLASH + db 35 + dw CROAKOZUNA db -1 ; end next_list_item ; GRUNTM (11) db "GRUNT@", TRAINERTYPE_NORMAL - db 23 + db 33 + dw TANGELA + db 33 + dw REROAD + db 36 dw MUK - db 23 - dw KOFFING - db 25 - dw RATTATA db -1 ; end next_list_item ; GRUNTM (12) @@ -2245,78 +2382,90 @@ GruntMGroup: next_list_item ; GRUNTM (13) db "GRUNT@", TRAINERTYPE_NORMAL - db 27 - dw RATTATA + db 34 + dw RATICATE + db 35 + dw FURRET + db 34 + dw DUNSPARCE db -1 ; end next_list_item ; GRUNTM (14) db "GRUNT@", TRAINERTYPE_NORMAL - db 24 - dw RATICATE - db 24 + db 34 + dw BELLEDAM + db 34 dw GOLBAT db -1 ; end next_list_item ; GRUNTM (15) db "GRUNT@", TRAINERTYPE_NORMAL - db 26 - dw GRIMER - db 23 + db 33 + dw RATICATE + db 33 + dw RATICATE ; Should be Alolan later + db 35 dw WEEZING db -1 ; end next_list_item ; GRUNTM (16) db "GRUNT@", TRAINERTYPE_NORMAL - db 16 - dw RATTATA - db 16 - dw RATTATA - db 16 - dw RATTATA - db 16 - dw RATTATA + db 26 + dw EKANS + db 27 + dw KOFFING + db 27 + dw GRIMER + db 28 + dw RATICATE db -1 ; end next_list_item ; GRUNTM (17) db "GRUNT@", TRAINERTYPE_NORMAL - db 18 + db 31 dw GOLBAT + db 31 + dw ARBOK db -1 ; end next_list_item ; GRUNTM (18) db "GRUNT@", TRAINERTYPE_NORMAL - db 17 - dw RATTATA - db 17 - dw ZUBAT - db 17 - dw RATTATA + db 29 + dw GRAVELER + db 29 + dw SLOWPOKE + db 31 + dw BELLEDAM db -1 ; end next_list_item ; GRUNTM (19) db "GRUNT@", TRAINERTYPE_NORMAL - db 18 - dw VENONAT - db 18 - dw VENONAT + db 30 + dw VENOMOTH + db 30 + dw BEEDRILL + db 30 + dw ONIYANMA db -1 ; end next_list_item ; GRUNTM (20) db "GRUNT@", TRAINERTYPE_NORMAL - db 17 - dw DROWZEE - db 19 - dw ZUBAT + db 25 + dw ARIADOS + db 24 + dw GOLBAT + db 26 + dw HYPNO db -1 ; end next_list_item ; GRUNTM (21) db "GRUNT@", TRAINERTYPE_NORMAL - db 16 - dw ZUBAT - db 17 + db 24 + dw RATICATE + db 23 dw GRIMER - db 18 - dw RATTATA + db 27 + dw ARBOK db -1 ; end next_list_item ; GRUNTM (22) @@ -2333,18 +2482,18 @@ GruntMGroup: next_list_item ; GRUNTM (24) db "GRUNT@", TRAINERTYPE_NORMAL - db 25 - dw KOFFING - db 25 - dw KOFFING + db 35 + dw VENOMOTH + db 35 + dw MACHOKE db -1 ; end next_list_item ; GRUNTM (25) db "GRUNT@", TRAINERTYPE_NORMAL - db 24 - dw KOFFING - db 24 - dw MUK + db 35 + dw SNUBULL + db 35 + dw WEEZING db -1 ; end next_list_item ; GRUNTM (26) @@ -2363,8 +2512,10 @@ GruntMGroup: next_list_item ; GRUNTM (28) db "GRUNT@", TRAINERTYPE_NORMAL - db 19 + db 32 dw RATICATE + db 32 + dw RATICATE ; Should be Alolan later db -1 ; end next_list_item ; GRUNTM (29) @@ -2437,14 +2588,16 @@ GentlemanGroup: SkierGroup: next_list_item ; SKIER (1) db "ROXANNE@", TRAINERTYPE_NORMAL - db 28 + db 33 dw JYNX + db 35 + dw BUU db -1 ; end next_list_item ; SKIER (2) db "CLARISSA@", TRAINERTYPE_NORMAL - db 28 - dw DEWGONG + db 37 + dw GLACEON db -1 ; end end_list_items @@ -2791,20 +2944,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 25 + db 29 + dw REROAD + db 30 + dw POLIWHIRL + db 32 dw GYARADOS db -1 ; end next_list_item ; FISHER (7) db "TULLY@", TRAINERTYPE_NORMAL - db 18 - dw QWILFISH + db 32 + dw JABETTA db -1 ; end next_list_item ; FISHER (8) @@ -2831,20 +2984,25 @@ FisherGroup: next_list_item ; FISHER (10) db "WILTON@", TRAINERTYPE_NORMAL - db 33 - dw MANTINE - db 35 - dw OCTILLERY + db 34 + dw SEAKING + db 36 + dw POLIWRATH + db 37 + dw POLITOED db -1 ; end next_list_item ; FISHER (11) db "EDGAR@", TRAINERTYPE_MOVES ; Unsure about this guy - db 25 - dw REMORAID - dw LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM - db 25 - dw REMORAID - dw LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM + 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 -1 ; end next_list_item ; FISHER (12) @@ -2931,12 +3089,12 @@ FisherGroup: next_list_item ; FISHER (21) db "SCOTT@", TRAINERTYPE_NORMAL - db 30 - dw QWILFISH - db 30 - dw QWILFISH - db 34 - dw SEAKING + db 47 + dw KAZAPPELIN + db 47 + dw QWILFATHER + db 47 + dw SEAKING ; OVERQWIL db -1 ; end next_list_item ; FISHER (22) @@ -3574,16 +3732,28 @@ SuperNerdGroup: next_list_item ; SUPER_NERD (13) db "HUGH@", TRAINERTYPE_MOVES - db 39 + db 42 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 19 - dw SLOWPOKE - dw CURSE, WATER_GUN, GROWL, STRENGTH + 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 -1 ; end end_list_items @@ -3791,60 +3961,68 @@ HikerGroup: next_list_item ; HIKER (6) db "BENJAMIN@", TRAINERTYPE_NORMAL - 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 30 + dw DONPHAN + db 29 + dw RHYHORN + db 30 + dw DUGTRIO db -1 ; end next_list_item ; HIKER (7) db "ERIK@", TRAINERTYPE_NORMAL ; outside blackthorn... - db 24 - dw PHANPY - db 27 - dw GRAVELER - db 32 + db 38 + dw RHYHORN + db 38 + dw MACHOKE + db 39 dw URSARING + db 40 + dw GOLEM db -1 ; end next_list_item ; HIKER (8) db "MICHAEL@", TRAINERTYPE_NORMAL - db 25 - dw MACHOP - db 27 - dw GLIGAR - db 32 - dw GOLEM + db 39 + dw GRAVELER + db 40 + dw SUDOWOODO + db 41 + dw RHYDON db -1 ; end next_list_item ; HIKER (9) db "PARRY@", TRAINERTYPE_NORMAL - db 35 + db 40 dw STEELIX - db 33 ; Bulbapedia says he doesn't have a Swinub? Cool tho. + db 39 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 27 - dw LARVITAR - db 32 + db 39 dw DUGTRIO + db 40 + dw DONPHAN + db 41 + dw GLISCOR db -1 ; end next_list_item ; HIKER (11) - 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 + db "BAILEY@", TRAINERTYPE_NORMAL + db 30 + dw GRAVELER + db 30 + dw GOLBAT + db 30 dw URSARING - db 38 - dw STEELIX + db 31 + dw DUNSPARCE + db 31 + dw WOBBUFFET db -1 ; end next_list_item ; HIKER (12) @@ -4068,20 +4246,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 23 - dw TRUSTAN - db 25 + db 32 + dw SLUGMA + db 33 + dw PERSIAN + db 35 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 26 + db 33 + dw HOUNDOUR + db 35 dw TRUSTAN - db 24 - dw FURRET db -1 ; end next_list_item ; BURGLAR (3) @@ -4305,28 +4483,39 @@ BlackbeltGroup: db -1 ; end next_list_item ; BLACKBELT_T (6) - db "KIYO@", TRAINERTYPE_NORMAL ; Boss fight who gives Tyrogue. - db 34 + 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 dw HITMONLEE - db 34 + dw HI_JUMP_KICK, FORESIGHT, MIND_READER, MEDITATE + db 45 dw HITMONCHAN - db 36 + dw MACH_PUNCH, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH + db 45 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 ; JABETTA - is that in the game yet? lol + dw JABETTA 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 34 + db 40 + dw HITMONTOP + db 41 dw MACHAMP db -1 ; end @@ -4342,44 +4531,53 @@ BlackbeltGroup: end_list_items -ExecutiveMGroup: ; Unsure which is which. Little help? +ExecutiveMGroup: next_list_item ; EXECUTIVEM (2) - db "EXECUTIVE@", TRAINERTYPE_MOVES - db 36 + 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 dw GOLBAT - dw LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + dw WING_ATTACK, THRASH, SCREECH, CONFUSE_RAY + db 41 + dw SLOWBRO ; Needs to be Galarian eventually + dw WATER_GUN, CONFUSION, HEADBUTT, CURSE db -1 ; end next_list_item ; EXECUTIVEM (3) - 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 + 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 dw WEEZING - dw TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN - db 30 - dw KOFFING - dw TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN - db 30 - dw KOFFING - dw TACKLE, SMOG, SLUDGE, SMOKESCREEN + dw SLUDGE_BOMB, SMOKESCREEN, HAZE, SELFDESTRUCT + db 40 + dw RATICATE ; Needs to be alolan eventually + dw SLASH, SUPER_FANG, SCREECH, FOCUS_ENERGY db -1 ; end next_list_item ; EXECUTIVEM (4) - db "EXECUTIVE@", TRAINERTYPE_NORMAL - db 22 - dw ZUBAT - db 24 + 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 dw RATICATE - db 22 - dw KOFFING + dw HYPER_FANG, SUPER_FANG, SCREECH, FOCUS_ENERGY db -1 ; end end_list_items @@ -4461,27 +4659,36 @@ PsychicGroup: next_list_item ; PSYCHIC_T (8) db "PHIL@", TRAINERTYPE_MOVES - db 28 - dw NATU - dw LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY - db 32 + db 35 + dw XATU + dw CONFUSION, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY + db 35 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 40 ; Kanto Route 47 + db 46 dw STARMIE - db 40 - dw EXEGGUTOR - db 44 + db 45 + dw XATU + db 48 dw FARIGIRAF db -1 ; end @@ -4583,11 +4790,13 @@ PicnickerGroup: db -1 ; end next_list_item ; PICNICKER (10) - 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 + db "ERIN@", TRAINERTYPE_NORMAL + db 32 dw RAPIDASH db 33 dw FURRET + db 33 + dw ZORRIEGO db -1 ; end next_list_item ; PICNICKER (11) @@ -4636,16 +4845,16 @@ PicnickerGroup: next_list_item ; PICNICKER (16) db "TIFFANY@", TRAINERTYPE_MOVES ; Route 43 - db 31 - dw CLEFAIRY - dw ENCORE, SING, DOUBLESLAP, MINIMIZE + db 34 + dw CLEFABLE + dw ENCORE, SING, DOUBLESLAP, FAIRY_WIND db -1 ; end next_list_item ; PICNICKER (17) db "TIFFANY@", TRAINERTYPE_MOVES - db 37 - dw CLEFAIRY - dw ENCORE, DOUBLESLAP, MINIMIZE, METRONOME + db 40 + dw CLEFABLE + dw ENCORE, DOUBLESLAP, FAIRY_WIND, METRONOME db -1 ; end next_list_item ; PICNICKER (18) @@ -4819,8 +5028,8 @@ CamperGroup: next_list_item ; CAMPER (11) db "TED@", TRAINERTYPE_NORMAL - db 17 - dw MANKEY + db 35 + dw PRIMEAPE db -1 ; end next_list_item ; CAMPER (12) @@ -4900,9 +5109,9 @@ CamperGroup: next_list_item ; CAMPER (19) db "SPENCER@", TRAINERTYPE_NORMAL ; Route 43 db 30 - dw SANDSHREW - db 30 dw SANDSLASH + db 30 + dw AMPHAROS db 32 dw GOLBAT db -1 ; end @@ -4937,12 +5146,12 @@ CamperGroup: next_list_item ; CAMPER (22) db "QUENTIN@", TRAINERTYPE_NORMAL ; Route 45 - 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 + db 40 + dw PRIMEAPE + db 40 dw TAUROS + db 40 + dw SKARMORY db -1 ; end end_list_items @@ -4950,38 +5159,37 @@ CamperGroup: ArianaGroup: ; Ariana next_list_item ; EXECUTIVEF (1) db "ARIANA@", TRAINERTYPE_MOVES ; Radio Tower - db 30 - dw BELLEDAM - dw PURSUIT, HEAL_BELL, LOVELY_KISS, FAINT_ATTACK - db 32 + db 41 dw ARBOK - 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 + 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 db -1 ; end next_list_item ; EXECUTIVEF (2) - db "ARIANA@", TRAINERTYPE_MOVES ; Rocket HQ - severely overtuned. consider revising. - db 32 - dw ARBOK - dw WRAP, POISON_STING, BITE, GLARE - db 32 + db "ARIANA@", TRAINERTYPE_MOVES ; Rocket HQ + db 37 + dw BELLEDAM + dw FAINT_ATTACK, GROWL, LOVELY_KISS, SWEET_KISS + db 36 dw VILEPLUME - dw ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID - db 32 + dw MEGA_DRAIN, ACID, SLEEP_POWDER, MOONLIGHT + db 36 + dw MUK + dw SLUDGE, MOONBLAST, SCREECH, DISABLE + db 37 + dw ARBOK + dw ACID, HEADBUTT, GLARE, SCREECH + db 39 dw HONCHKROW - 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. + dw WING_ATTACK, FAINT_ATTACK, SWAGGER, NIGHT_SHADE db -1 ; end next_list_item ; EXECUTIVEF (3) @@ -5076,19 +5284,19 @@ SageGroup: dw VINE_WHIP, GROWTH, FLASH, NO_MOVE db -1 ; end -; So these sages are in the Dragon's Den but end up being the Kimono Girls but again. +; So these sages are in the Bellchime Trail 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 42 - dw NOCTOWL - db 42 + db 45 + dw DODRIO + db 46 dw LEAFEON db -1 ; end next_list_item ; SAGE (10) db "MASA@", TRAINERTYPE_NORMAL - db 42 + db 4 dw NOCTOWL db 42 dw GLACEON @@ -5227,30 +5435,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 28 - dw SNEASEL - db 29 + db 33 + dw BUNICE + db 33 dw DEWGONG - db 30 - dw SEEL + db 34 + dw BUNDRA db -1 ; end next_list_item ; BOARDER (2) db "BRAD@", TRAINERTYPE_NORMAL - db 28 + db 34 dw SWINUB - db 28 - dw SWINUB ; WARFURS + db 34 + dw WEARLYCAN db -1 ; end next_list_item ; BOARDER (3) db "DOUGLAS@", TRAINERTYPE_NORMAL - db 27 - dw SHELLDER - db 30 + db 33 + dw SNEASEL + db 32 + dw BUNDRA + db 35 dw CLOYSTER - db 26 - dw BUU db -1 ; end end_list_items @@ -5624,38 +5832,43 @@ GruntFGroup: next_list_item ; GRUNTF (2) db "GRUNT@", TRAINERTYPE_NORMAL - db 26 + db 33 dw ARBOK + db 33 + dw HYPNO + db 34 + dw TENTACRUEL db -1 ; end next_list_item ; GRUNTF (3) db "GRUNT@", TRAINERTYPE_NORMAL - db 25 - dw GLOOM - db 25 + db 34 dw GLOOM + db 36 + dw BELLIGNAN db -1 ; end next_list_item ; GRUNTF (4) db "GRUNT@", TRAINERTYPE_NORMAL - db 21 - dw EKANS - db 23 - dw ODDISH - db 21 - dw EKANS - db 24 - dw GLOOM + db 34 + dw ARBOK + db 35 + dw VILEPLUME + db 36 + dw BELLOSSOM db -1 ; end next_list_item ; GRUNTF (5) db "GRUNT@", TRAINERTYPE_MOVES - db 18 - dw EKANS - dw WRAP, LEER, POISON_STING, BITE - db 18 - dw GLOOM - dw ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER + 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 -1 ; end end_list_items @@ -5671,7 +5884,7 @@ MysticalmanGroup: dw MEGA_DRAIN, SLEEP_POWDER, LEECH_SEED, FAIRY_WIND db 31 dw ELECTRODE - dw SCREECH, SONICBOOM, THUNDER, ROLLOUT + dw SCREECH, SONICBOOM, SPARK, 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 85ab1ae..e25d09a 100644 --- a/data/trainers/parties_new_classes.asm +++ b/data/trainers/parties_new_classes.asm @@ -668,15 +668,19 @@ KurtGroup: ArcherGroup: next_list_item - db "ARCHER@", TRAINERTYPE_NORMAL - db 33 + db "ARCHER@", TRAINERTYPE_MOVES + db 42 dw ELECTRODE - db 33 + dw THUNDER, ROLLOUT, THUNDER_WAVE, EXPLOSION + db 43 dw MAGMAR - db 33 + dw FLAMETHROWER, FAINT_ATTACK, SMOKESCREEN, CONFUSE_RAY + db 43 dw GOLBAT - db 35 + dw WING_ATTACK, THRASH, SCREECH, MEAN_LOOK + db 45 dw HOUNDOOM + dw FIRE_BLAST, FAINT_ATTACK, SLUDGE_BOMB, SCARY_FACE db -1 ; end db "ARCHER@", TRAINERTYPE_NORMAL @@ -858,20 +862,20 @@ TwinsGroup: next_list_item ; TWINS (9) db "LEA & PIA@", TRAINERTYPE_MOVES - db 35 + db 43 dw DRATINI dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT - db 35 - dw DRATINI - dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT + db 43 + dw SQUEAMATA + dw GLARE, DRAGONBREATH, ICE_BEAM, FURY_SWIPES db -1 ; end next_list_item ; TWINS (10) db "LEA & PIA@", TRAINERTYPE_MOVES - db 38 - dw DRATINI - dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT - db 38 + db 43 + dw SQUEAMATA + dw GLARE, DRAGONBREATH, ICE_BEAM, FURY_SWIPES + db 43 dw DRATINI dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT db -1 ; end diff --git a/gfx/footprints_johto.asm b/gfx/footprints_johto.asm index f72923f..47889ff 100644 --- a/gfx/footprints_johto.asm +++ b/gfx/footprints_johto.asm @@ -202,6 +202,7 @@ 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 ef1aadd..11e027e 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -1129,6 +1129,8 @@ 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 15c819a..2e8ce81 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -428,4 +428,5 @@ 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 58abafa..240a81e 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -427,4 +427,5 @@ 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 be196b2..00a9c20 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -429,4 +429,5 @@ 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 d3d8d06..46a85b5 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -427,4 +427,5 @@ 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 new file mode 100644 index 0000000..e859e93 --- /dev/null +++ b/gfx/pokemon/deoxys/anim.asm @@ -0,0 +1,12 @@ + 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 new file mode 100644 index 0000000..bffb357 --- /dev/null +++ b/gfx/pokemon/deoxys/anim_idle.asm @@ -0,0 +1,5 @@ + 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 new file mode 100644 index 0000000000000000000000000000000000000000..1ee95ce08047ae8c927253b3d34b6f8da3afcf02 GIT binary patch literal 780 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FvSEcy5B{yCHLpKE^fug_$!*zmoK z-{uBm`(5VU?32W9IBR4c`10v4v#xO69-r5`$3K627wuzM{+XfGes8Y3F87qy9o!5q zQ4crl?OLw?U@Fg%vy96!i&!fk6)d6A1;bHmu5+b!L6=IddGmIrQTE2Ehf|IZIyE^;8N^}Udk zXzKf9!vx0-SJzJC-_O+0WIJJZwL@{@73Qs_`{f#VH?VwM%useOJaDVZ`nB0#n@ji> z#8febZ1{JdIWuynSdwDHizks)zZPZit0>oLKHWNfw}{-vsO)?CksC#o)*gDmw4z}B z=111I6&KG9-#bC{ebs?;U&Cfxf3)~fX-QjnKI7((4xTpro0z5dUSJN;nr*ZAy0&(M z`n=im&P`8!ww?dgUf(la-|t0yY06>nIDd)b;T{_X*%wNs`^x$cefZO1F2=Cc?l9xD z4u%&F;j1L}PS#3TB%tkZ_SaH%J+5~r8GTc@*DMI^;B82+?O>02d+^cI`^OitCW`HR zad-RkQ~1)t9w=pL=9x3UWyX<` z_0Qc}=I)EjjJ$uEah@?#;Z^o84BQ9Yj%_&DsLYw8nCoY7KWF~OJpn8S6z@a`M|!WG zzGLsb3u&EyuW+qb-52h~Y}i5$jJgA8l2;t*)hasqVqidXtu}(4`Cu6@Kh__4C)Cuf`M1rbNB@ s%2yb7DeV5&n*ZMt4u^hEjH_dc?)}xTX|_*~fq{X+)78&qol`;+01aJec>n+a literal 0 HcmV?d00001 diff --git a/gfx/pokemon/deoxys/front.png b/gfx/pokemon/deoxys/front.png new file mode 100644 index 0000000000000000000000000000000000000000..9cbe04afa91ea9d2ca8357ae6f5984eb8d6b5cad GIT binary patch literal 2682 zcmeAS@N?(olHy`uVBq!ia0y~yV6b3dU<}}3V_;x-6}ERS0|NtNage(c!@6@aFBurP zOgvp2Ln`LHo$HetpTP+xqpVITPv{WPCJUOqDVX`}eDZ&f*P(88Rh;wc z)@{DHbLP%@yKWkIC;zunPUoLjx6VKQ+hLC>k&mVo8u>)7H~KXBo!lm;5G_^XUs8Ho zis$YTTY0&cNBY#))~S~qHZ+Er%&G5xW_vvGw%c>(^ny3}oUaU|f4fJVeEszN4es@t z&HMHrJKMvNd9ka=GtU3+8$+?`5GhS>JF!R8EP8ccKWg`D=zV%rS+ zE|g#RVaFfq3ooC0IoF%4Pi)?~k9Y6g2`{SGG;QKpyKpDps|!AY=`P!MOtX2s^!xe! z?wilYEcSmre_nX%$xq)km!3Tqd41FO{riu(%C1}LU*slL@_t2WMH|oaiTxt?^?5hj z#9h|VyxgpM$?ep!c4epb&7tB?KWDvAemE=VWYy8TXI?)4^~Cbu8Q$(cD^;&IUn|g7 zdwDeCy5Ofc-%#$rX>0N~`4!1dZrfY3%jJvBwI@E${H9xc>06YYu>0BjxTlV*Keb1> zYQ{<=`=56FRZy+hzWN<^yrFzeR*F;H6v@fP{h71o^$IIi{Ik7uL0A5Sa^BNDQ&RRdYnfvC^HIa?oWnZp2?+x=$b6R)4kE_s1Cq=f9-1WqdsB z@^@-!|I@3E+AhwHJdQ!qL&x5^6OcqcNQ}#ua-RV@Z??Rylzd~b-gN!?fuS{ zO+C2Hq%T8qmZ9_0()QCX%BB9LGv9rk(0fKwKHo@QMReKy_{V#0EU~XXY~#J@{nf+n z{;PSf+)FNO`<=*Brf)Rah-poujq18Pp1F@4U-D`@H*;*C@O@b(m*483Jv&YvxN+FI z)J0nF_=0(XfA;9;`)RwlT)uH%&hXpz{cGJn{r}2;Uwi$-=O@xn{;xj&IpmFFT&vpQ z$(!s>RV}Sw^E!3MDMhL3spb(+ZLXYRUcF=XgN@G~8VT~AKKQdxK}xe;D7#ei(uqn1 z$NssVrZ{7CQ>8@v4haCH&f8Ao76p$w|yU|qO*4C&npLwssr0sn)Yw8nVG6^U*^+1ABFOjjod4r z$t4z=FEmc{ElxW2a>JzC&y`C{#D2FGRrl_lZnXMDUW(p-KF7x%Eh$|VYn~YIaa){n zVD8(4x1!I8d@Ol0q50dQd#&d_CFGRE2QS>RER(A$&@JHW+s(Qux%tu0S#?C$o~&4X zKl+WxTHox=s@-8BDGA!8hOS5Du5d;(KN8!bRR_s`BqH5qZD7{XSea* zIo}OSz8Af6c+paD`Ho9R^rcH~X2*T6^!$x25LTV_?TGJ`2E{81<`;c0n?#l_{_PrS#Hw@9{ewui68og=d^F`8eT zw5mvW>lGFAM9uAA%8vRzX;Rw#T+PYdzU;7X%aLlqYX?hy?##?f+UFoMaSD6%+RcW# zMZzZ)SM?^BR#)D4@%SV$Ek^Ciz0+5tcW`Qc>oSd9IJZD}UE?nU{?4_!k+;_F&sX}j zjj8t8nWzlg|8kiD(zEC7*;~ymuu^cFKU>tXmtj+uPXFsvC2sz(ZH0;6mJ73urcTt| zaP8;!j7`E@pKS78b0a&@qoT%v^EyH;j@_i^4_-dkHSyQ@7U`0*W=PbHmuS1c4Lx>x3YOlLSn%~92D-`4*1?-&2!?o)1nTF1UW8IwjG?$tIZ_tv{VZ3 z=qzK&Q!-5~5YG2vzvJS~WS*E|b|FjQn#Fd_yhC0SBssMVwy5SMeOqAK_~c}+Us}=5 z&b7UNRIUnDd7V6?w}W$U=SiMbC;5sg>uCK6#aTrzKUU zej4{09nQ`-U9%?~i{xH&tztuI-XmoZxsA*(b3W+ZGvD}3q3ZML4uF8%xM zyKlwPwASnSQ=-40Hs=%9i2x% zgHpDKj|@1~mPCM3He=o*-^SS-9CuolhP_JaI^f&#MazGkCp08EK-wd??i}f6&1-_1 z;>*KoE;y<5+7)n~NM$k)R074yE6zJE9w2LNmLFgBG_pWAMZ)ue+8ZaOHREl8dv?~oWcZ?zrpZ2?F3=dU204YNDaIqn>ZeV``9lBc9pARP5TjY~v} zr$G4J_Z)*AoS)SSgx_-9amhOLK<(ZXz8#&@Sn>`D?BHZF-zc)9Q=Iz_3-=usP=c8) z!Ih_^@_NlmaC$k#lDEhOWd0T59i0A9{N81GN(dlMeXmNQ)QQ==WZ@#cF=B z{;2VW?7T!dkI8%?OJ36f-ycli#CqgWCCEe-H9k;kb+%dq zGM2&o;<5w2EG&74f Date: Sat, 25 Oct 2025 16:39:21 -0600 Subject: [PATCH 4/7] Did you know? Testing your code is good --- data/pokemon/dex_entries/deoxys.asm | 2 +- data/trainers/parties.asm | 10 +++++----- gfx/footprints/deoxys.png | Bin 0 -> 69 bytes layout.link | 3 ++- maps/DebugRoom.asm | 8 ++++---- 5 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 gfx/footprints/deoxys.png diff --git a/data/pokemon/dex_entries/deoxys.asm b/data/pokemon/dex_entries/deoxys.asm index d081dc5..2bcc822 100644 --- a/data/pokemon/dex_entries/deoxys.asm +++ b/data/pokemon/dex_entries/deoxys.asm @@ -5,6 +5,6 @@ next "mutated space" next "virus, the crystal" - db "in DEOXYS' chest" + page "in DEOXYS' chest" next "is actually its" next "brain.@" diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index b551309..9a86a25 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -336,7 +336,7 @@ Rival1Group: dw WING_ATTACK, RETURN, TOXIC, SCREECH db 51 dw PHANDARIN - dw SHADOW_BALL, PSYCHIC, THUNDERBOLT, SUBSTITUTE + dw SHADOW_BALL, PSYCHIC_M, THUNDERBOLT, SUBSTITUTE db 50 dw PUPITAR dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE @@ -358,7 +358,7 @@ Rival1Group: dw WING_ATTACK, RETURN, TOXIC, SCREECH db 51 dw PHANDARIN - dw SHADOW_BALL, PSYCHIC, THUNDERBOLT, SUBSTITUTE + dw SHADOW_BALL, PSYCHIC_M, THUNDERBOLT, SUBSTITUTE db 50 dw PUPITAR dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE @@ -380,7 +380,7 @@ Rival1Group: dw WING_ATTACK, RETURN, TOXIC, SCREECH db 51 dw PHANDARIN - dw SHADOW_BALL, PSYCHIC, THUNDERBOLT, SUBSTITUTE + dw SHADOW_BALL, PSYCHIC_M, THUNDERBOLT, SUBSTITUTE db 50 dw PUPITAR dw ROCK_SLIDE, CRUNCH, THRASH, SCARY_FACE @@ -2491,7 +2491,7 @@ GruntMGroup: next_list_item ; GRUNTM (25) db "GRUNT@", TRAINERTYPE_NORMAL db 35 - dw SNUBULL + dw SNUBBULL db 35 dw WEEZING db -1 ; end @@ -3737,7 +3737,7 @@ SuperNerdGroup: dw SMOKESCREEN, TWISTER, SURF, WATERFALL db 43 dw MUK - dw SLUDGE, SCREECH, ACID ARMOR, MINIMIZE + dw SLUDGE, SCREECH, ACID_ARMOR, MINIMIZE db 42 dw MAGNETON dw SPARK, TRI_ATTACK, LIGHT_SCREEN, SCREECH diff --git a/gfx/footprints/deoxys.png b/gfx/footprints/deoxys.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdCI$uuh60TpG7Jn1Jf1F&Ar-fh6Bg((Ffar# UFrGcD(gu?EboFyt=akR{0Fq`71ONa4 literal 0 HcmV?d00001 diff --git a/layout.link b/layout.link index 7c2ee5b..d4aa4b2 100644 --- a/layout.link +++ b/layout.link @@ -63,7 +63,6 @@ ROMX $0d "Effect Commands" ROMX $0e "Enemy Trainers" - "Enemy Trainer Parties 2" ROMX $0f "Battle Core" ROMX $10 @@ -319,6 +318,8 @@ 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 db0e584..6a33951 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -13,7 +13,7 @@ DebugPokemon1Script: playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke WEARLYCAN, 53, RARE_CANDY + givepoke WEARLYCAN, 53, MASTER_BALL closetext end @@ -39,11 +39,11 @@ DebugPokemon3Script: faceplayer opentext writetext DebugTextA - cry NIDOQUEEN + cry DEOXYS pause 15 closetext loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY - loadwildmon NIDOQUEEN, 10 + loadwildmon DEOXYS, 5 startbattle reloadmapafterbattle end @@ -60,7 +60,7 @@ DebugPokemon4Script: pause 15 closetext loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE - loadwildmon GOROCHU, 69 + loadwildmon DEOXYS, 70 startbattle reloadmapafterbattle end From 210180b20f05ec0219410f813509892ff86ab8c6 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 26 Oct 2025 12:41:44 -0600 Subject: [PATCH 5/7] Wild Data Updates Forgot to do this earlier, but NOW I think the first leg of the game is WAY better. The second leg will need a lot more groundwork still, but I'm really happy with how things are shaping up rn! --- data/wild/johto_grass.asm | 488 +++++++++++++++++++------------------- data/wild/johto_water.asm | 104 ++++---- data/wild/kanto_grass.asm | 170 ++++++------- data/wild/kanto_water.asm | 18 +- 4 files changed, 390 insertions(+), 390 deletions(-) diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index 21fc667..debf2bb 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, QATU + dbw 24, AERCROW dbw 27, QATU dbw 25, SMEARGLE dbw 25, GIRAFARIG @@ -396,7 +396,7 @@ JohtoGrassWildMons: ; day dbw 24, SMEARGLE dbw 26, QATU - dbw 24, QATU + dbw 24, AERCROW 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 19, RATTATA - dbw 22, KOTORA - dbw 18, MACHOP - dbw 21, KOTORA - dbw 19, GEODUDE - dbw 20, RATICATE - dbw 20, GRENMAR + dbw 27, RATICATE + dbw 27, KOTORA + dbw 26, MACHOP + dbw 28, GAOTORA + dbw 28, GRAVELER + dbw 29, RATICATE + dbw 28, GRENMAR ; day - dbw 19, RATTATA - dbw 22, KOTORA - dbw 18, MACHOP - dbw 21, KOTORA - dbw 19, GEODUDE - dbw 20, RATICATE - dbw 20, GRENMAR + dbw 27, RATICATE + dbw 27, KOTORA + dbw 26, MACHOP + dbw 28, GAOTORA + dbw 28, GRAVELER + dbw 29, RATICATE + dbw 28, GRENMAR ; nite - dbw 18, RATTATA - dbw 22, ZUBAT - dbw 21, MARILL - dbw 22, GOLBAT - dbw 19, GEODUDE - dbw 20, RATICATE - dbw 20, GRENMAR + dbw 27, RATICATE + dbw 27, GOLBAT + dbw 26, MARILL + dbw 29, GOLBAT + dbw 28, GRAVELER + dbw 29, RATICATE + dbw 28, 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 18, GEODUDE - dbw 19, RATTATA - dbw 20, MACHOP - dbw 20, GRENMAR - dbw 22, MARILL - dbw 22, LARVITAR - dbw 23, LARVITAR + dbw 27, GRAVELER + dbw 29, RATICATE + dbw 28, MACHOKE + dbw 29, GRENMAR + dbw 28, MARILL + dbw 25, LARVITAR + dbw 30, LARVITAR ; day - dbw 18, GEODUDE - dbw 19, RATTATA - dbw 20, MACHOP - dbw 20, GRENMAR - dbw 22, MARILL - dbw 22, LARVITAR - dbw 23, LARVITAR + dbw 27, GRAVELER + dbw 29, RATICATE + dbw 28, MACHOKE + dbw 29, GRENMAR + dbw 28, MARILL + dbw 25, LARVITAR + dbw 30, LARVITAR ; nite - dbw 18, GEODUDE - dbw 19, RATTATA - dbw 20, GRENMAR - dbw 22, ZUBAT - dbw 21, MARILL - dbw 22, GOLBAT - dbw 23, GOLBAT + dbw 27, GRAVELER + dbw 29, RATICATE + dbw 30, GRENMAR + dbw 29, ZUBAT + dbw 29, MARILL + dbw 30, MARILL + dbw 30, GOLBAT end_grass_wildmons def_grass_wildmons MOUNT_MORTAR_2F_INSIDE @@ -678,55 +678,55 @@ JohtoGrassWildMons: ; morn dbw 41, GRAVELER dbw 42, MACHOKE - dbw 41, GEODUDE - dbw 40, GRENMAR - dbw 48, MARILL - dbw 40, PUPITAR - dbw 40, PUPITAR + dbw 42, GRAVELER + dbw 41, GRENMAR + dbw 45, AZUMARILL + dbw 42, PUPITAR + dbw 43, PUPITAR ; day dbw 41, GRAVELER dbw 42, MACHOKE - dbw 41, GEODUDE - dbw 40, GRENMAR - dbw 48, MARILL - dbw 40, PUPITAR - dbw 40, PUPITAR + dbw 42, GRAVELER + dbw 41, GRENMAR + dbw 45, AZUMARILL + dbw 42, PUPITAR + dbw 43, PUPITAR ; nite dbw 41, GRAVELER - dbw 41, GEODUDE - dbw 40, GRENMAR - dbw 40, GOLBAT - dbw 48, AZUMARILL - dbw 42, GOLBAT + dbw 42, RATICATE + dbw 41, GRENMAR 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 19, ZUBAT - dbw 20, ZUBAT - dbw 23, GOLBAT - dbw 21, MARILL - dbw 20, GRENMAR - dbw 24, LARVITAR - dbw 24, LARVITAR + dbw 28, GRAVELER + dbw 29, GRAVELER + dbw 29, GOLBAT + dbw 31, AZUMARILL + dbw 30, GRENMAR + dbw 30, LARVITAR + dbw 31, LARVITAR ; day - dbw 19, ZUBAT - dbw 20, ZUBAT - dbw 23, GOLBAT - dbw 21, MARILL - dbw 20, GRENMAR - dbw 24, LARVITAR - dbw 24, LARVITAR + dbw 28, GRAVELER + dbw 29, GRAVELER + dbw 29, GOLBAT + dbw 31, AZUMARILL + dbw 30, GRENMAR + dbw 30, LARVITAR + dbw 31, LARVITAR ; nite - dbw 19, ZUBAT - dbw 20, ZUBAT - dbw 23, GOLBAT - dbw 21, MARILL - dbw 20, GRENMAR - dbw 24, LARVITAR - dbw 24, LARVITAR + dbw 28, GRAVELER + dbw 29, GRAVELER + dbw 29, GOLBAT + dbw 31, AZUMARILL + dbw 30, GRENMAR + dbw 30, LARVITAR + dbw 31, 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 31, SWINUB - dbw 32, SNEASEL - dbw 32, GOLBAT + dbw 34, SWINUB + dbw 35, BUNICE + dbw 36, GOLBAT dbw 33, SWINUB dbw 34, SNEASEL - dbw 32, GOLBAT - dbw 32, GOLBAT + dbw 35, SMOOCHUM + dbw 36, SMOOCHUM ; day - dbw 31, SWINUB - dbw 32, SNEASEL - dbw 32, GOLBAT + dbw 34, SWINUB + dbw 35, BUNICE + dbw 36, GOLBAT dbw 33, SWINUB dbw 34, SNEASEL - dbw 32, GOLBAT - dbw 32, GOLBAT + dbw 35, SMOOCHUM + dbw 36, SMOOCHUM ; nite - dbw 31, DELIBIRD - dbw 32, SNEASEL - dbw 32, GOLBAT - dbw 33, DELIBIRD + dbw 34, DELIBIRD + dbw 35, SNEASEL + dbw 36, GOLBAT + dbw 33, BUNICE dbw 34, SNEASEL - dbw 32, GOLBAT - dbw 32, GOLBAT + dbw 35, WARFURS + dbw 36, WARFURS 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, SNEASEL - dbw 33, GOLBAT - dbw 32, JYNX + dbw 35, BUNICE + dbw 36, GOLBAT + dbw 33, SWINUB + dbw 34, SNEASEL + dbw 35, SMOOCHUM + dbw 36, SMOOCHUM ; day - dbw 32, SWINUB - dbw 33, SNEASEL - dbw 33, GOLBAT dbw 34, SWINUB - dbw 35, SNEASEL - dbw 33, GOLBAT - dbw 32, JYNX + dbw 35, BUNICE + dbw 36, GOLBAT + dbw 33, SWINUB + dbw 34, SNEASEL + dbw 35, SMOOCHUM + dbw 36, SMOOCHUM ; nite - dbw 32, DELIBIRD - dbw 33, SNEASEL - dbw 33, GOLBAT dbw 34, DELIBIRD dbw 35, SNEASEL - dbw 33, GOLBAT - dbw 32, JYNX ; BUU + dbw 36, GOLBAT + dbw 33, BUNICE + dbw 34, SNEASEL + dbw 35, WARFURS + dbw 36, WARFURS 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 33, SWINUB - dbw 34, SNEASEL + dbw 34, SWINUB + dbw 35, SNEASEL dbw 34, GOLBAT - dbw 35, SWINUB + dbw 35, PILOSWINE dbw 36, SNEASEL - dbw 32, JYNX - dbw 34, JYNX + dbw 36, JYNX + dbw 37, JYNX ; day - dbw 33, SWINUB - dbw 34, SNEASEL + dbw 34, SWINUB + dbw 35, SNEASEL dbw 34, GOLBAT - dbw 35, SWINUB + dbw 35, PILOSWINE dbw 36, SNEASEL - dbw 32, JYNX - dbw 34, JYNX + dbw 36, JYNX + dbw 37, JYNX ; nite - dbw 33, DELIBIRD - dbw 34, SNEASEL + dbw 34, WARFURS + dbw 35, SNEASEL dbw 34, GOLBAT dbw 35, DELIBIRD dbw 36, SNEASEL - dbw 32, JYNX ; BUU - dbw 34, JYNX ; BUU + dbw 36, BUU + dbw 37, 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 33, SWINUB - dbw 34, SNEASEL + dbw 34, SWINUB + dbw 35, SNEASEL dbw 34, GOLBAT - dbw 35, SWINUB + dbw 35, PILOSWINE dbw 36, SNEASEL - dbw 32, JYNX - dbw 34, JYNX + dbw 36, JYNX + dbw 37, JYNX ; day - dbw 33, SWINUB - dbw 34, SNEASEL + dbw 34, SWINUB + dbw 35, SNEASEL dbw 34, GOLBAT - dbw 35, SWINUB + dbw 35, PILOSWINE dbw 36, SNEASEL - dbw 32, JYNX - dbw 34, JYNX + dbw 36, JYNX + dbw 37, JYNX ; nite - dbw 33, DELIBIRD - dbw 34, SNEASEL + dbw 34, WARFURS + dbw 35, SNEASEL dbw 34, GOLBAT dbw 35, DELIBIRD - dbw 36, GOLBAT - dbw 32, JYNX ; BUU - dbw 34, JYNX ; BUU + dbw 36, SNEASEL + dbw 36, BUU + dbw 37, 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, SWINUB + dbw 34, WARFURS dbw 35, SNEASEL dbw 35, GOLBAT - dbw 36, SWINUB - dbw 32, SNEASEL - dbw 34, JYNX + dbw 36, PILOSWINE + dbw 36, SNEASEL dbw 36, JYNX + dbw 37, JYNX ; day - dbw 34, SWINUB + dbw 34, WARFURS dbw 35, SNEASEL dbw 35, GOLBAT - dbw 36, SWINUB - dbw 32, SNEASEL - dbw 34, JYNX + dbw 36, PILOSWINE + dbw 36, SNEASEL dbw 36, JYNX + dbw 37, JYNX ; nite - dbw 34, DELIBIRD + dbw 34, WARFURS dbw 35, SNEASEL dbw 35, GOLBAT dbw 36, DELIBIRD - dbw 32, SNEASEL - dbw 34, JYNX ; BUU - dbw 36, JYNX ; BUU + dbw 36, SNEASEL + dbw 36, BUU + dbw 37, 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, SHELLDER ; DISTURBAN - dbw 44, SHELLDER ; DISTURBAN + dbw 45, DISTURBAN + dbw 44, DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -924,8 +924,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, SHELLDER ; DISTURBAN - dbw 44, SHELLDER ; DISTURBAN + dbw 45, DISTURBAN + dbw 44, DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -952,8 +952,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, SHELLDER ; DISTURBAN - dbw 44, SHELLDER ; DISTURBAN + dbw 45, DISTURBAN + dbw 44, DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -980,8 +980,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, SHELLDER ; DISTURBAN - dbw 44, SHELLDER ; DISTURBAN + dbw 45, DISTURBAN + dbw 44, DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -1008,8 +1008,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, SHELLDER ; DISTURBAN - dbw 44, SHELLDER ; DISTURBAN + dbw 45, DISTURBAN + dbw 44, DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -1036,8 +1036,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, SHELLDER ; DISTURBAN - dbw 44, SHELLDER ; DISTURBAN + dbw 45, DISTURBAN + dbw 44, DISTURBAN dbw 47, SLOWKING end_grass_wildmons @@ -1064,8 +1064,8 @@ JohtoGrassWildMons: dbw 42, GOLBAT dbw 43, CORSOLA dbw 44, QUAGSIRE - dbw 45, SHELLDER ; DISTURBAN - dbw 44, SHELLDER ; DISTURBAN + dbw 45, DISTURBAN + dbw 44, DISTURBAN dbw 44, SLOWKING end_grass_wildmons @@ -1092,8 +1092,8 @@ JohtoGrassWildMons: dbw 52, GOLBAT dbw 53, CORSOLA dbw 54, QUAGSIRE - dbw 55, SHELLDER ; DISTURBAN - dbw 54, SHELLDER ; DISTURBAN + dbw 55, DISTURBAN + dbw 54, 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 23, GEODUDE - dbw 23, ZUBAT - dbw 25, GRAVELER - dbw 25, URSARING - dbw 20, TEDDIURSA - dbw 23, GOLBAT - dbw 23, GOLBAT + dbw 31, DONPHAN + dbw 34, GOLBAT + dbw 33, DONPHAN + dbw 35, URSARING + dbw 34, URSARING + dbw 33, DUDUNSPARCE + dbw 34, DUDUNSPARCE ; day - dbw 23, GEODUDE - dbw 23, ZUBAT - dbw 25, GRAVELER - dbw 25, URSARING - dbw 30, URSARING - dbw 23, GOLBAT - dbw 23, GOLBAT + dbw 31, DONPHAN + dbw 34, GOLBAT + dbw 33, DONPHAN + dbw 35, URSARING + dbw 34, URSARING + dbw 33, DUDUNSPARCE + dbw 34, DUDUNSPARCE ; nite - dbw 23, GEODUDE - dbw 23, ZUBAT - dbw 25, GRAVELER - dbw 20, WOBBUFFET - dbw 25, WOBBUFFET - dbw 23, GOLBAT - dbw 23, GAVILLAIN + dbw 33, GRAVELER + dbw 31, GOLBAT + dbw 32, GRAVELER + dbw 33, WOBBUFFET + dbw 35, WOBBUFFET + dbw 33, DUDUNSPARCE + dbw 34, DUDUNSPARCE end_grass_wildmons def_grass_wildmons ROUTE_29 @@ -1298,17 +1298,17 @@ JohtoGrassWildMons: ; morn dbw 3, LEDYBA dbw 3, CATERPIE - dbw 4, CATERPIE + dbw 4, WEEDLE dbw 4, LEDYBA - dbw 3, WEEDLE + dbw 3, GENTLARVA dbw 4, HOPPIP dbw 5, HOPPIP ; day - dbw 3, LEDYBA + dbw 3, PIDGEY dbw 3, CATERPIE - dbw 4, CATERPIE - dbw 4, LEDYBA - dbw 3, WEEDLE + dbw 4, WEEDLE + dbw 4, PIDGEY + dbw 3, GENTLARVA dbw 4, HOPPIP dbw 5, HOPPIP ; nite @@ -1332,14 +1332,14 @@ JohtoGrassWildMons: dbw 4, CATERPIE dbw 6, LEDYBA dbw 4, LEDYBA - dbw 4, WEEDLE + dbw 4, CATERPIE dbw 5, BELLSPROUT dbw 5, HOPPIP ; day - dbw 5, LEDYBA - dbw 4, CATERPIE + dbw 5, PIDGEY + dbw 4, GENTLARVA dbw 5, BELLSPROUT - dbw 4, LEDYBA + dbw 4, PIDGEY 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, BITTYBAT + dbw 4, SPINARAK dbw 6, MOIBELLE dbw 5, MISDREAVUS end_grass_wildmons @@ -1386,7 +1386,7 @@ JohtoGrassWildMons: ; morn dbw 7, RATTATA dbw 8, SPEAROW - dbw 7, GEODUDE + dbw 7, SUNKERN dbw 9, SUNKERN dbw 8, EKANS dbw 8, AZURILL @@ -1394,7 +1394,7 @@ JohtoGrassWildMons: ; day dbw 7, RATTATA dbw 8, SPEAROW - dbw 7, GEODUDE + dbw 7, SUNKERN 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, GROWLITHE + dbw 16, ZORRIEGO dbw 18, STANTLER - dbw 17, PIDGEOTTO - dbw 17, GROWLITHE + dbw 17, AERCROW + dbw 17, ZORRIEGO dbw 15, BONSLY dbw 18, LEDIAN dbw 19, LEDIAN ; day - dbw 16, GROWLITHE + dbw 16, ZORRIEGO dbw 17, STANTLER - dbw 17, PIDGEOTTO - dbw 18, GROWLITHE + dbw 17, AERCROW + dbw 18, ZORRIEGO dbw 15, BONSLY dbw 17, KOLTA dbw 18, KOLTA ; nite - dbw 16, VULPIX + dbw 16, ZORRIEGO 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, FURRET + dbw 20, SNUBBULL dbw 21, MAGNEMITE dbw 22, FARFETCH_D dbw 23, MILTANK @@ -1538,7 +1538,7 @@ JohtoGrassWildMons: dbw 21, SNUBBULL ; day dbw 22, MEOWTH - dbw 20, FURRET + dbw 20, SNUBBULL dbw 21, MAGNEMITE dbw 22, FARFETCH_D dbw 23, MILTANK @@ -1589,7 +1589,7 @@ JohtoGrassWildMons: ; morn dbw 28, MANKEY dbw 28, ARBOK - dbw 28, FEAROW + dbw 28, MARILL dbw 29, FEAROW dbw 28, FLAAFFY dbw 29, FLAAFFY @@ -1597,7 +1597,7 @@ JohtoGrassWildMons: ; day dbw 28, MANKEY dbw 28, ARBOK - dbw 28, FEAROW + dbw 28, MARILL 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, FARFETCH_D ; LUXWAN + dbw 33, LUXWAN dbw 32, FURRET dbw 33, FURRET - dbw 32, FURRET + dbw 32, TANGELA dbw 34, TANGELA ; day dbw 31, FLAAFFY ; From Gold dbw 30, GIRAFARIG ; From Gold - dbw 33, FARFETCH_D ; LUXWAN + dbw 33, LUXWAN dbw 32, FURRET dbw 33, FURRET - dbw 32, FURRET + dbw 32, TANGELA dbw 34, TANGELA ; nite dbw 31, FLAAFFY ; From Gold @@ -1645,55 +1645,55 @@ JohtoGrassWildMons: ; morn dbw 33, TANGELA dbw 33, LICKITUNG - dbw 33, BELLSPROUT ; BUNICE + dbw 33, BUNICE dbw 34, WEEPINBELL dbw 32, LICKITUNG - dbw 33, LICKITUNG + dbw 32, BUNICE dbw 35, DELIBIRD ; day dbw 33, TANGELA dbw 33, LICKITUNG - dbw 33, BELLSPROUT ; BUNICE + dbw 33, BUNICE dbw 34, WEEPINBELL dbw 32, LICKITUNG - dbw 33, LICKITUNG + dbw 32, BUNICE dbw 35, DELIBIRD ; nite dbw 33, TANGELA dbw 33, POLIWHIRL - dbw 33, ODDISH ; WARFURS + dbw 33, BUNICE dbw 34, GLOOM dbw 32, POLIWHIRL - dbw 33, POLIWHIRL + dbw 32, BUNICE 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 33, PHANPY - dbw 33, GRAVELER - dbw 34, GLIGAR - dbw 35, DONPHAN - dbw 30, PHANPY - dbw 37, SKARMORY + dbw 36, DONPHAN + dbw 35, GRAVELER + dbw 35, GLIGAR + dbw 35, URSARING + dbw 36, GLIGAR dbw 37, SKARMORY + dbw 38, SKARMORY ; day - dbw 33, PHANPY - dbw 33, GRAVELER - dbw 34, GLIGAR - dbw 35, DONPHAN - dbw 30, DONPHAN - dbw 37, SKARMORY + dbw 36, DONPHAN + dbw 35, GRAVELER + dbw 35, GLIGAR + dbw 35, URSARING + dbw 36, GLIGAR dbw 37, SKARMORY + dbw 38, SKARMORY ; nite - dbw 33, GEODUDE - dbw 33, GRAVELER - dbw 34, GLIGAR - dbw 35, DUNSPARCE - dbw 37, DUNSPARCE - dbw 37, URSARING - dbw 37, URSARING + dbw 36, DONPHAN + dbw 35, GRAVELER + dbw 35, GLIGAR + dbw 35, URSARING + dbw 36, GLIGAR + dbw 37, SKARMORY + dbw 38, SKARMORY 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 ccaa1b1..919bbfc 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 15, WOOPER + dbw 20, WOOPER + dbw 23, QUAGSIRE dbw 20, QUAGSIRE - dbw 15, QUAGSIRE end_water_wildmons def_water_wildmons UNION_CAVE_1F db 2 percent ; encounter rate - dbw 15, WOOPER - dbw 20, QUAGSIRE - dbw 15, RIBBITO + dbw 20, WOOPER + dbw 23, QUAGSIRE + dbw 20, RIBBITO end_water_wildmons def_water_wildmons UNION_CAVE_B1F db 2 percent ; encounter rate - dbw 15, WOOPER - dbw 20, QUAGSIRE - dbw 15, RIBBITO + dbw 20, WOOPER + dbw 23, QUAGSIRE + dbw 20, RIBBITO end_water_wildmons def_water_wildmons UNION_CAVE_B2F db 4 percent ; encounter rate - dbw 15, TENTACOOL - dbw 20, QUAGSIRE - dbw 20, TENTACRUEL + dbw 23, RIBBITO + dbw 23, QUAGSIRE + dbw 25, TENTACRUEL end_water_wildmons def_water_wildmons SLOWPOKE_WELL_B1F db 2 percent ; encounter rate - dbw 15, SLOWPOKE dbw 20, SLOWPOKE - dbw 10, SHELLDER + dbw 23, SLOWPOKE + dbw 20, SHELLDER end_water_wildmons def_water_wildmons SLOWPOKE_WELL_B2F db 2 percent ; encounter rate - dbw 15, SLOWPOKE - dbw 20, DISTURBAN - dbw 20, SLOWBRO + dbw 23, SLOWPOKE + dbw 25, DISTURBAN + dbw 25, SLOWBRO end_water_wildmons def_water_wildmons ILEX_FOREST db 2 percent ; encounter rate dbw 20, PSYDUCK dbw 25, WEIRDUCK - dbw 35, GOLDUCK + dbw 30, 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 30, TENTACOOL ; MANTYKE - dbw 35, CHINCHOU - dbw 30, TENTACRUEL + dbw 20, MANTYKE + dbw 20, CHINCHOU + dbw 25, TENTACOOL end_water_wildmons def_water_wildmons ROUTE_30 db 2 percent ; encounter rate dbw 20, RIBBITO - dbw 15, POLIWAG - dbw 20, POLIWHIRL + dbw 20, POLIWAG + dbw 23, POLIWHIRL end_water_wildmons def_water_wildmons ROUTE_31 db 2 percent ; encounter rate dbw 20, RIBBITO - dbw 15, POLIWAG - dbw 20, POLIWHIRL + dbw 20, POLIWAG + dbw 23, POLIWHIRL end_water_wildmons def_water_wildmons ROUTE_32 db 6 percent ; encounter rate - dbw 15, TENTACOOL - dbw 20, QUAGSIRE - dbw 20, TENTACRUEL + dbw 20, TENTACOOL + dbw 23, QUAGSIRE + dbw 23, TENTACRUEL end_water_wildmons def_water_wildmons ROUTE_34 db 6 percent ; encounter rate dbw 20, MANTYKE - dbw 15, CHINCHOU + dbw 23, CHINCHOU dbw 20, TENTACOOL end_water_wildmons @@ -160,42 +160,42 @@ JohtoWaterWildMons: db 4 percent ; encounter rate dbw 20, MANTYKE dbw 25, WEIRDUCK - dbw 35, GOLDUCK + dbw 30, GOLDUCK end_water_wildmons def_water_wildmons ROUTE_40 db 6 percent ; encounter rate - dbw 22, TENTACOOL ; SAILWING - dbw 21, REMORAID + dbw 22, SAILWING + dbw 21, TENTACOOL dbw 23, CHINCHOU end_water_wildmons def_water_wildmons ROUTE_41 db 6 percent ; encounter rate - dbw 20, TENTACOOL ; SAILWING - dbw 20, REMORAID + dbw 20, SAILWING + dbw 20, CHINCHOU dbw 25, MANTINE end_water_wildmons def_water_wildmons ROUTE_42 db 4 percent ; encounter rate - dbw 30, GOLDEEN ; SAILWING - dbw 35, GOLDEEN + dbw 27, SAILWING + dbw 28, GOLDEEN dbw 30, SEAKING end_water_wildmons def_water_wildmons ROUTE_43 db 2 percent ; encounter rate - dbw 30, MAGIKARP - dbw 35, MAGIKARP - dbw 30, WOOPER + dbw 20, MAGIKARP + dbw 25, MAGIKARP + dbw 20, WOOPER end_water_wildmons def_water_wildmons ROUTE_44 db 2 percent ; encounter rate - dbw 35, SEEL dbw 30, SEEL - dbw 35, DEWGONG + dbw 32, SEEL + dbw 34, 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 30, GOLDEEN - dbw 31, GOLDEEN - dbw 35, SEAKING + dbw 20, GOLDEEN + dbw 22, GOLDEEN + dbw 25, SEAKING end_water_wildmons def_water_wildmons CIANWOOD_CITY db 6 percent ; encounter rate dbw 25, TENTACOOL dbw 20, CHINCHOU - dbw 25, TENTACRUEL + dbw 25, POLIWHIRL end_water_wildmons def_water_wildmons OLIVINE_CITY db 6 percent ; encounter rate - dbw 20, TENTACOOL - dbw 15, CHINCHOU - dbw 20, TENTACRUEL + dbw 20, MANTYKE + dbw 20, CHINCHOU + dbw 25, TENTACOOL end_water_wildmons def_water_wildmons ECRUTEAK_CITY db 2 percent ; encounter rate - dbw 31, GOLDEEN - dbw 32, GOLDEEN - dbw 35, SEAKING + dbw 20, GOLDEEN + dbw 22, GOLDEEN + dbw 25, SEAKING end_water_wildmons def_water_wildmons LAKE_OF_RAGE db 6 percent ; encounter rate + dbw 25, MAGIKARP dbw 20, MAGIKARP - dbw 20, MAGIKARP - dbw 21, GYARADOS + dbw 25, GYARADOS end_water_wildmons def_water_wildmons BLACKTHORN_CITY diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index 6c5a71b..8b056a4 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 + def_grass_wildmons VICTORY_ROAD ; all one map, needs separate encounter tables later db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 34, GRAVELER - dbw 32, RHYHORN - dbw 33, ONIX - dbw 34, GOLBAT - dbw 35, SANDSLASH - dbw 35, RHYDON - dbw 35, RHYDON + dbw 42, MACHOKE + dbw 43, RHYHORN + dbw 42, STEELIX + dbw 41, MAGCARGO + dbw 43, DONPHAN + dbw 41, TYROGUE + dbw 50, CHANSEY ; day - dbw 34, GRAVELER - dbw 32, RHYHORN - dbw 33, ONIX - dbw 34, GOLBAT - dbw 35, SANDSLASH - dbw 35, RHYDON - dbw 35, RHYDON + dbw 42, MACHOKE + dbw 43, RHYHORN + dbw 42, STEELIX + dbw 41, MAGCARGO + dbw 43, DONPHAN + dbw 41, TYROGUE + dbw 50, CHANSEY ; nite - dbw 34, GOLBAT - dbw 34, GRAVELER - dbw 32, ONIX - dbw 36, GRAVELER - dbw 38, GRAVELER - dbw 40, GRAVELER - dbw 40, GRAVELER + dbw 42, GOLBAT + dbw 43, URSARING + dbw 42, STEELIX + dbw 41, HOUNDOOM + dbw 43, GAVILLAIN + dbw 41, LARVITAR + dbw 42, LARVITAR end_grass_wildmons def_grass_wildmons TOHJO_FALLS db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 22, ZUBAT - dbw 22, RATICATE - dbw 24, GOLBAT - dbw 21, SLOWPOKE - dbw 20, RATTATA - dbw 23, SLOWPOKE - dbw 23, SLOWPOKE + dbw 38, GOLBAT + dbw 38, RATICATE + dbw 39, NIDORINA + dbw 39, NIDORINO + dbw 40, GOLBAT + dbw 40, PUPITAR + dbw 41, PUPITAR ; day - dbw 22, ZUBAT - dbw 22, RATICATE - dbw 24, GOLBAT - dbw 21, SLOWPOKE - dbw 20, RATTATA - dbw 23, SLOWPOKE - dbw 23, SLOWPOKE + dbw 38, GOLBAT + dbw 38, RATICATE + dbw 39, NIDORINA + dbw 39, NIDORINO + dbw 40, GOLBAT + dbw 40, PUPITAR + dbw 41, PUPITAR ; nite - dbw 22, ZUBAT - dbw 22, RATICATE - dbw 24, GOLBAT - dbw 21, SLOWPOKE - dbw 20, RATTATA - dbw 23, SLOWPOKE - dbw 23, SLOWPOKE + dbw 38, GOLBAT + dbw 38, RATICATE + dbw 39, NIDORINA + dbw 39, NIDORINO + dbw 40, GOLBAT + dbw 40, PUPITAR + dbw 41, PUPITAR 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 48, DODUO - dbw 48, SANDSLASH - dbw 52, PONYTA - dbw 50, RATICATE - dbw 50, DODUO - dbw 50, ARBOK - dbw 50, ARBOK + dbw 39, SANDSLASH + dbw 39, BALUMBA + dbw 42, PONYTA + dbw 41, BALUMBA + dbw 40, DODRIO + dbw 41, ARBOK + dbw 42, ARBOK ; day - dbw 48, DODUO - dbw 48, SANDSLASH - dbw 52, PONYTA - dbw 50, RATICATE - dbw 50, DODUO - dbw 50, ARBOK - dbw 50, ARBOK + dbw 39, SANDSLASH + dbw 39, BALUMBA + dbw 42, PONYTA + dbw 41, BALUMBA + dbw 40, DODRIO + dbw 41, ARBOK + dbw 42, ARBOK ; nite - dbw 48, NOCTOWL - dbw 48, RATICATE - dbw 52, NOCTOWL - dbw 50, RATICATE - dbw 50, QUAGSIRE - dbw 50, QUAGSIRE - dbw 50, QUAGSIRE + dbw 39, NOCTOWL + dbw 39, BALUMBA + dbw 41, NOCTOWL + dbw 40, RATICATE + dbw 41, QUAGSIRE + dbw 41, MAROWAK + dbw 42, MAROWAK end_grass_wildmons def_grass_wildmons ROUTE_27 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 48, DODUO - dbw 48, ARBOK - dbw 50, RATICATE - dbw 50, DODUO - dbw 52, PONYTA - dbw 50, DODRIO - dbw 50, DODRIO + dbw 38, DODUO + dbw 38, ARBOK + dbw 40, FURRET + dbw 40, DODUO + dbw 41, PONYTA + dbw 40, DODRIO + dbw 41, DODRIO ; day - dbw 48, DODUO - dbw 48, ARBOK - dbw 50, RATICATE - dbw 50, DODUO - dbw 52, PONYTA - dbw 50, DODRIO - dbw 50, DODRIO + dbw 38, DODUO + dbw 38, ARBOK + dbw 40, FURRET + dbw 40, DODUO + dbw 41, PONYTA + dbw 40, DODRIO + dbw 41, DODRIO ; nite - dbw 48, QUAGSIRE - dbw 48, NOCTOWL - dbw 50, RATICATE - dbw 50, QUAGSIRE - dbw 52, NOCTOWL - dbw 52, NOCTOWL - dbw 52, NOCTOWL + dbw 38, CUBONE + dbw 38, NOCTOWL + dbw 40, RATICATE + dbw 40, QUAGSIRE + dbw 41, NOCTOWL + dbw 40, MAROWAK + dbw 41, MAROWAK end_grass_wildmons def_grass_wildmons ROUTE_28 diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm index 5b09305..50d20db 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 20, GOLDEEN - dbw 20, SLOWPOKE - dbw 20, SEAKING + dbw 35, MAGIKARP + dbw 30, MANTINE + dbw 30, 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, TENTACOOL - dbw 25, TENTACOOL - dbw 30, TENTACRUEL + dbw 30, BLOTTLE + dbw 35, PENDRAKEN + dbw 35, TENTACRUEL end_water_wildmons def_water_wildmons ROUTE_27 db 6 percent ; encounter rate - dbw 20, TENTACOOL - dbw 15, TENTACOOL - dbw 20, TENTACRUEL + dbw 30, BLOTTLE + dbw 35, PENDRAKEN + dbw 35, TENTACRUEL end_water_wildmons def_water_wildmons ROUTE_28 From 8d7f62c0806f981101a12d2fe22210cf06d55f7b Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 26 Oct 2025 22:40:53 -0600 Subject: [PATCH 6/7] Update Deoxys Sprite embedded palettes --- gfx/pokemon/deoxys/back.png | Bin 780 -> 501 bytes gfx/pokemon/deoxys/front.png | Bin 2682 -> 1153 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/pokemon/deoxys/back.png b/gfx/pokemon/deoxys/back.png index 1ee95ce08047ae8c927253b3d34b6f8da3afcf02..6fcb9cb07d750f914d4f022aeca89c0b4369b699 100644 GIT binary patch delta 486 zcmeBS`^r2)vYwfNfg#}z=T-&=2FBtbcPGZ1Cw1x>7#LX69eo`c7&i8E|4C$JU|>*4 z_6YK2V5m}KU}$JzVEDzrz|io5fuYoZf#FpG1B2BJ1_tqhIlBUF7#J9M0(?ST|Ns9V zvEs*%2nGfQhIezzZh#C6_dd2CvAaAUOsGMm0|t#}JR>Z>M;QwHR=?Fqi(fHct%bNGrIn^UL<_FHN<} zx9tCY)SV$I^!!r;-`B(}bcnQRbj4e<(o3+}i&{rEa5 z_?77%VXh4__vgj)ebtH6d6K#$_?20A%+ap`4!Vo)wlF5WWU=7MV>rwIiX%pUPxOx) otL!*7optq=OezXJAgK9;U3Cik>|$r>-=GlpboFyt=akR{052rDdH?_b delta 767 zcmey$+`~3OvYw5BfgzmfXFCG}(`8Q=$B+!?w=>TMJvI<%c`RJHXRlzM&8>SU?p5q5 zFuK}SwpCp@bBQNMbn1Mk4NLw#yMNB){O6h<{p&N?D>i&D98_pV; z2flo|%d9J0x5wwT?(xsx-bMQumVahwwcnfTuFE~8bq6q4STzm>pz&vbL1@J zvdkjZ%18N(hCB=l@0D80u3Hl?+;3|XC&Bb#P0xFqk4rCX{IFQyFoVEqah9G4ducb# zhU@mzpZ?kZ{&H=X%YFC-juC3jmK5zECbJJ6wZRdZr z*Y`}<_j?gvnsOLC&R^nqxW|S;_JvaEzOw#9AO3Whi!p4qJIpw(gW-ik_$rCLleH2S z31~Z<{k2qGkL%q@M&A_fH46eecpK7dJJ@6D-yVGQ^#1WhtchYfU)=9>MTHwVTu;-Z0PROaJ1f}r7LtP!$O50dtUwg_2;Yc1hXkoZ@%&s#$5`#|F!1- iw}iu?-xK5Nn4)`s^=q2#(_>&@VDNPHb6Mw<&;$Tn&1zZz diff --git a/gfx/pokemon/deoxys/front.png b/gfx/pokemon/deoxys/front.png index 9cbe04afa91ea9d2ca8357ae6f5984eb8d6b5cad..fc4072bd6dc374a47b66242cd7c2bfa13ca48abb 100644 GIT binary patch delta 1143 zcmew*(#SbMvYwfNf#Gh4?|KFX2FBtbcPGZ1Cw1x>7#LX69eo`c7&i8E|4C$JU|>*4 z_6YK2V5m}KU}$JzVEDzrz|io5fuYoZf#FpG1B2BJ1_tqhIlBUF7#J9M0(?ST|Ns9V zvEs*%2nGfQhIezzZh#C6_dds(y(~?sf(S=1rb1jv*Dd-p;<=w?Ki%!Tb0B|9dWRD{yT|i%(moW_j!^fi3v;uVJ5RYWacv|3Ln>q*vl$`dAXJl*ktb3u!X ztb}L9o&|1~zP+qhn7`gJUt#U@mYu&kW*li+GG{`mfcAu)R?4DBirA;GVB2G{LgBxJ z27m8G*8_ZU`+27Po_0WcLe{$%6Fd&S<`>$yC|}{0M|;SjSspelG3TBM?>X_Sqhi(nta}AlZ|VqU-hONIq{O+Esq^nZ(F?No;FiN?gY`F>rzc8NS)|i z-FM{jhYBOF)x6q%7P2<{Z(rVNV>+I9bN(tbd-h20-`{Mu=Fan&6!P|R{~hI$W&R1i zs*mQ+YUFz7`EY?zYhsSFf>o1|Vf~p~PL*7qTulu^0n5Y^#e@7<&K7GLZ1+t*x8{ONN3Z-eee+gzR}e>PrOZkfPnyM5`7 zIjyX@hAq<{O=)oco5gv3)3i4J6yH~p7o7O!@}!D8Z3{ZXd;ML(n_R+Qg^*x8_<$D_Z-d{K??Rdvp?b2J>ZNIkb&b(~x zcD1wOxNoV_y^A64){C!O_iUa!=eBjq^o3{V%J*Kbw>C*Q&#=DS!$BhG_)A%?V|$&q z3Cr(!%=)FWJvZUdJ;m}*N3Gu}GT$?7>#1~CUwqGSlHvP|lpEFxdzF#k;o@oMt>whO zR2^RPtm?+y!YNh=_yRLt6zWStG2$}d-SF3x3V-7vFYU+KPrws@?g+=don`i9^=qsHR`|iE^fWjJLSH0&y?>~g6}g@I;+?_Lh3*E>B+_KVZLOIfORv= zpOlCFoEut~KJ|X&)AF#1@7Fvic>SC2$G3fp8(+#|gY`$Oe}$>Pkmc>Ea%aAbWEjHO te;wstZgEt(Gb{eDcdvrMSyRU=WqU_&krgBJYD@<);T3K0RZ_&3xogw literal 2682 zcmeAS@N?(olHy`uVBq!ia0y~yV6b3dU<}}3V_;x-6}ERS0|NtNage(c!@6@aFBurP zOgvp2Ln`LHo$HetpTP+xqpVITPv{WPCJUOqDVX`}eDZ&f*P(88Rh;wc z)@{DHbLP%@yKWkIC;zunPUoLjx6VKQ+hLC>k&mVo8u>)7H~KXBo!lm;5G_^XUs8Ho zis$YTTY0&cNBY#))~S~qHZ+Er%&G5xW_vvGw%c>(^ny3}oUaU|f4fJVeEszN4es@t z&HMHrJKMvNd9ka=GtU3+8$+?`5GhS>JF!R8EP8ccKWg`D=zV%rS+ zE|g#RVaFfq3ooC0IoF%4Pi)?~k9Y6g2`{SGG;QKpyKpDps|!AY=`P!MOtX2s^!xe! z?wilYEcSmre_nX%$xq)km!3Tqd41FO{riu(%C1}LU*slL@_t2WMH|oaiTxt?^?5hj z#9h|VyxgpM$?ep!c4epb&7tB?KWDvAemE=VWYy8TXI?)4^~Cbu8Q$(cD^;&IUn|g7 zdwDeCy5Ofc-%#$rX>0N~`4!1dZrfY3%jJvBwI@E${H9xc>06YYu>0BjxTlV*Keb1> zYQ{<=`=56FRZy+hzWN<^yrFzeR*F;H6v@fP{h71o^$IIi{Ik7uL0A5Sa^BNDQ&RRdYnfvC^HIa?oWnZp2?+x=$b6R)4kE_s1Cq=f9-1WqdsB z@^@-!|I@3E+AhwHJdQ!qL&x5^6OcqcNQ}#ua-RV@Z??Rylzd~b-gN!?fuS{ zO+C2Hq%T8qmZ9_0()QCX%BB9LGv9rk(0fKwKHo@QMReKy_{V#0EU~XXY~#J@{nf+n z{;PSf+)FNO`<=*Brf)Rah-poujq18Pp1F@4U-D`@H*;*C@O@b(m*483Jv&YvxN+FI z)J0nF_=0(XfA;9;`)RwlT)uH%&hXpz{cGJn{r}2;Uwi$-=O@xn{;xj&IpmFFT&vpQ z$(!s>RV}Sw^E!3MDMhL3spb(+ZLXYRUcF=XgN@G~8VT~AKKQdxK}xe;D7#ei(uqn1 z$NssVrZ{7CQ>8@v4haCH&f8Ao76p$w|yU|qO*4C&npLwssr0sn)Yw8nVG6^U*^+1ABFOjjod4r z$t4z=FEmc{ElxW2a>JzC&y`C{#D2FGRrl_lZnXMDUW(p-KF7x%Eh$|VYn~YIaa){n zVD8(4x1!I8d@Ol0q50dQd#&d_CFGRE2QS>RER(A$&@JHW+s(Qux%tu0S#?C$o~&4X zKl+WxTHox=s@-8BDGA!8hOS5Du5d;(KN8!bRR_s`BqH5qZD7{XSea* zIo}OSz8Af6c+paD`Ho9R^rcH~X2*T6^!$x25LTV_?TGJ`2E{81<`;c0n?#l_{_PrS#Hw@9{ewui68og=d^F`8eT zw5mvW>lGFAM9uAA%8vRzX;Rw#T+PYdzU;7X%aLlqYX?hy?##?f+UFoMaSD6%+RcW# zMZzZ)SM?^BR#)D4@%SV$Ek^Ciz0+5tcW`Qc>oSd9IJZD}UE?nU{?4_!k+;_F&sX}j zjj8t8nWzlg|8kiD(zEC7*;~ymuu^cFKU>tXmtj+uPXFsvC2sz(ZH0;6mJ73urcTt| zaP8;!j7`E@pKS78b0a&@qoT%v^EyH;j@_i^4_-dkHSyQ@7U`0*W=PbHmuS1c4Lx>x3YOlLSn%~92D-`4*1?-&2!?o)1nTF1UW8IwjG?$tIZ_tv{VZ3 z=qzK&Q!-5~5YG2vzvJS~WS*E|b|FjQn#Fd_yhC0SBssMVwy5SMeOqAK_~c}+Us}=5 z&b7UNRIUnDd7V6?w}W$U=SiMbC;5sg>uCK6#aTrzKUU zej4{09nQ`-U9%?~i{xH&tztuI-XmoZxsA*(b3W+ZGvD}3q3ZML4uF8%xM zyKlwPwASnSQ=-40Hs=%9i2x% zgHpDKj|@1~mPCM3He=o*-^SS-9CuolhP_JaI^f&#MazGkCp08EK-wd??i}f6&1-_1 z;>*KoE;y<5+7)n~NM$k)R074yE6zJE9w2LNmLFgBG_pWAMZ)ue+8ZaOHREl8dv?~oWcZ?zrpZ2?F3=dU204YNDaIqn>ZeV``9lBc9pARP5TjY~v} zr$G4J_Z)*AoS)SSgx_-9amhOLK<(ZXz8#&@Sn>`D?BHZF-zc)9Q=Iz_3-=usP=c8) z!Ih_^@_NlmaC$k#lDEhOWd0T59i0A9{N81GN(dlMeXmNQ)QQ==WZ@#cF=B z{;2VW?7T!dkI8%?OJ36f-ycli#CqgWCCEe-H9k;kb+%dq zGM2&o;<5w2EG&74f Date: Tue, 4 Nov 2025 15:30:00 +1100 Subject: [PATCH 7/7] fix pp and hp issue (maybe not but fingers crossed) --- engine/pokemon/move_mon.asm | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index c9a4f89..e4dc61f 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -87,6 +87,10 @@ 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] @@ -95,6 +99,7 @@ GeneratePartyMonStats: ld a, [wBaseSpecies] ld [de], a inc de + ; DE = wPartyMonXItem ; Copy the item if it's a wild mon ld a, [wBattleMode] @@ -105,9 +110,13 @@ 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] @@ -128,7 +137,7 @@ endr .randomlygeneratemoves xor a -rept NUM_MOVES - 1 +rept NUM_MOVES ld [hli], a endr ld [hl], a @@ -137,9 +146,11 @@ endr .next pop de + ; DE = wPartyMonXMoves rept NUM_MOVES inc de endr + ; DE = wPartyMonXID ; Initialize ID. ld a, [wPlayerID] @@ -148,6 +159,7 @@ endr ld a, [wPlayerID + 1] ld [de], a inc de + ; DE = wPartyMonXExp ; Initialize Exp. push de @@ -212,6 +224,8 @@ endr ld [de], a ; Set Shininess for New Dex Entry + push hl + push de dec de ld b, d ld c, e @@ -224,18 +238,19 @@ endr inc a .shinycont ld [wPokedexShinyToggle], a - ; Unclobber de - inc de - inc de + pop de + pop hl + inc de ; now at wPartyMonXPP ; Initialize PP. +.PPBugDebug push hl push de inc hl - inc hl + inc hl ; now at wPartyMonXMoves call FillPP pop de - pop hl + pop hl ; now at wPartyMonX rept NUM_MOVES inc de endr @@ -270,8 +285,10 @@ endr inc de ; Initialize HP. +.HPBugDebug ld bc, MON_STAT_EXP - 1 - add hl, bc + ;ld bc, 11 + add hl, bc ; now wPartyMonXHPExp ld a, 1 ld c, a ld b, FALSE @@ -391,11 +408,13 @@ endr ret FillPP: + ; HL = Mon Moves + ; DE = Mon PP push bc ld b, NUM_MOVES .loop ld a, [hli] - and a + and a ; test if A == 0 without changing A jr z, .next push hl push de