thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-04-29 22:52:14 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: thorn:308701db036a002a6acb00defce490b57ca7a0e1
Branches Tags
thorn:master
thorn:map_stuff
thorn:nix-build
thorn:pc16-vanilla
..
compare: thorn:3c252b7ed8f73554d9d9a2524189795090699ade
Branches Tags
thorn:master
thorn:map_stuff
thorn:nix-build
thorn:pc16-vanilla

11 commits
308701db03 ... 3c252b7ed8

Author SHA1 Message Date
Thorn Avery
3c252b7ed8 fix pp and hp issue (maybe not but fingers crossed) 2025-11-04 15:30:00 +11:00
Misty
596343d493
Update Deoxys Sprite 
embedded palettes
 2025-10-26 22:41:36 -06:00
Misty
8d7f62c080 Update Deoxys Sprite 
embedded palettes
 2025-10-26 22:40:53 -06:00
Misty
cad1f0e0f4
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!
 2025-10-26 12:42:41 -06:00
Misty
210180b20f 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!
 2025-10-26 12:41:44 -06:00
Misty
d9d598ec90
The Great Trainer Overhaul (Part 2)... and...? 
Finishes the trainers of Johto, and a little something extra ;3
 2025-10-25 16:40:33 -06:00
Misty
8a3a578298 Did you know? 
Testing your code is good
 2025-10-25 16:39:21 -06:00
Misty
bb3fc104f8 The Great Trainer Overhaul (Part 2)... and...? 
Finishes the trainers of Johto, and a little something extra ;3
 2025-10-25 16:05:42 -06:00
Zeta_Null
429b390f3b couple of sprites, shiny nidoqueen fix based on beta palettes 2025-09-28 12:53:34 -04:00
Misty
811b67d040
SURPRISE EVOLOTTO 
This took like 10 minutes okay now I'm going to rest for at least a day
 2025-09-14 11:27:29 -06:00
Misty
5347a46208 SURPRISE EVOLOTTO 
This took like 10 minutes okay now I'm going to rest for at least a day
 2025-09-14 11:26:54 -06:00
53 changed files with 1394 additions and 1012 deletions
Download patch file Download diff file Expand all files Collapse all files

2
constants/pokemon_constants.asm
View file

@ -423,6 +423,7 @@ DEF JOHTO_POKEMON EQU const_value
const RUDDERNAUT const RUDDERNAUT
const PIXYTOP const PIXYTOP
const MAWTLE const MAWTLE
const EVOLOTTO
const XYLODON const XYLODON
const XYLOFIN const XYLOFIN
const DOKUROAR const DOKUROAR
@ -448,6 +449,7 @@ DEF JOHTO_POKEMON EQU const_value
const HYOSHU_YANG const HYOSHU_YANG
const HYOSHU_YIN const HYOSHU_YIN
const CELEBI ; fb const CELEBI ; fb
const DEOXYS
DEF NUM_POKEMON EQU const_value - 1 DEF NUM_POKEMON EQU const_value - 1
DEF EGG EQU -3 DEF EGG EQU -3

2
data/pokemon/base_stats.asm
View file

@ -428,6 +428,7 @@ INCLUDE "data/pokemon/base_stats/inoshika.asm"
INCLUDE "data/pokemon/base_stats/ruddernaut.asm" INCLUDE "data/pokemon/base_stats/ruddernaut.asm"
INCLUDE "data/pokemon/base_stats/pixytop.asm" INCLUDE "data/pokemon/base_stats/pixytop.asm"
INCLUDE "data/pokemon/base_stats/mawtle.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/xylodon.asm"
INCLUDE "data/pokemon/base_stats/xylofin.asm" INCLUDE "data/pokemon/base_stats/xylofin.asm"
INCLUDE "data/pokemon/base_stats/dokuroar.asm" INCLUDE "data/pokemon/base_stats/dokuroar.asm"
@ -453,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_yang.asm"
INCLUDE "data/pokemon/base_stats/hyoshu_yin.asm" INCLUDE "data/pokemon/base_stats/hyoshu_yin.asm"
INCLUDE "data/pokemon/base_stats/celebi.asm" INCLUDE "data/pokemon/base_stats/celebi.asm"
INCLUDE "data/pokemon/base_stats/deoxys.asm"
.IndirectEnd:: .IndirectEnd::

21
data/pokemon/base_stats/deoxys.asm Normal file
View file

@ -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

2
data/pokemon/cries.asm
View file

@ -407,6 +407,7 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 128 ; RUDDERNAUT mon_cry CRY_NIDORAN_M, 0, 128 ; RUDDERNAUT
mon_cry CRY_NIDORAN_M, 0, 0 ; PIXYTOP (incomplete) 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 ; 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 ; XYLODON
mon_cry CRY_NIDORAN_M, 0, 128 ; XYLOFIN mon_cry CRY_NIDORAN_M, 0, 128 ; XYLOFIN
mon_cry CRY_METAPOD, 766, 566 ; DOKUROAR mon_cry CRY_METAPOD, 766, 566 ; DOKUROAR
@ -432,4 +433,5 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 128 ; HYOSHU_YANG (placeholder) mon_cry CRY_NIDORAN_M, 0, 128 ; HYOSHU_YANG (placeholder)
mon_cry CRY_NIDORAN_M, 0, 128 ; HYOSHU_YIN (placeholder) mon_cry CRY_NIDORAN_M, 0, 128 ; HYOSHU_YIN (placeholder)
mon_cry CRY_ENTEI, 330, 273 ; CELEBI mon_cry CRY_ENTEI, 330, 273 ; CELEBI
mon_cry CRY_NIDORAN_M, 0, 0 ; DEOXYS (incomplete)
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

3
data/pokemon/dex_entries.asm
View file

@ -441,4 +441,5 @@ MagnetitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnetite.asm"
MagnezonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnezone.asm" MagnezonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnezone.asm"
GavillainPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gavillain.asm" GavillainPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gavillain.asm"
BuuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/buu.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"

10
data/pokemon/dex_entries/deoxys.asm Normal file
View file

@ -0,0 +1,10 @@
db "DNA@" ; species name
dw 507, 1340 ; height, weight
db "Born from a"
next "mutated space"
next "virus, the crystal"
page "in DEOXYS' chest"
next "is actually its"
next "brain.@"

2
data/pokemon/dex_entry_pointers.asm
View file

@ -402,6 +402,7 @@ PokedexDataPointerTable:
dba RuddernautPokedexEntry dba RuddernautPokedexEntry
dba PixytopPokedexEntry dba PixytopPokedexEntry
dba MawtlePokedexEntry dba MawtlePokedexEntry
dba EvolottoPokedexEntry
dba XylodonPokedexEntry dba XylodonPokedexEntry
dba XylofinPokedexEntry dba XylofinPokedexEntry
dba DokuroarPokedexEntry dba DokuroarPokedexEntry
@ -427,4 +428,5 @@ PokedexDataPointerTable:
dba HyoshuYangPokedexEntry dba HyoshuYangPokedexEntry
dba HyoshuYinPokedexEntry dba HyoshuYinPokedexEntry
dba CelebiPokedexEntry dba CelebiPokedexEntry
dba DeoxysPokedexEntry
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

2
data/pokemon/dex_order_alpha.asm
View file

@ -74,6 +74,7 @@ AlphabeticalPokedexOrder:
dw CYNDAQUIL dw CYNDAQUIL
dw DECILLA dw DECILLA
dw DELIBIRD dw DELIBIRD
dw DEOXYS
dw DEWGONG dw DEWGONG
dw DIGLETT dw DIGLETT
dw DISTURBAN dw DISTURBAN
@ -103,6 +104,7 @@ AlphabeticalPokedexOrder:
dw ENTEI dw ENTEI
dw ESPEON dw ESPEON
dw EUCALA dw EUCALA
dw EVOLOTTO
dw EXEGGCUTE dw EXEGGCUTE
dw EXEGGUTOR dw EXEGGUTOR
dw FARFETCH_D dw FARFETCH_D

2
data/pokemon/dex_order_new.asm
View file

@ -368,6 +368,7 @@ NewPokedexOrder:
dw RUDDERNAUT dw RUDDERNAUT
dw PIXYTOP dw PIXYTOP
dw MAWTLE dw MAWTLE
dw EVOLOTTO
dw XYLODON dw XYLODON
dw XYLOFIN dw XYLOFIN
dw DOKUROAR dw DOKUROAR
@ -428,4 +429,5 @@ NewPokedexOrder:
dw MELTAN dw MELTAN
dw MELMETAL dw MELMETAL
dw CELEBI dw CELEBI
dw DEOXYS
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

2
data/pokemon/egg_moves_johto.asm
View file

@ -177,6 +177,7 @@ EggMovePointers2::
dw RuddernautEggMoves dw RuddernautEggMoves
dw PixytopEggMoves dw PixytopEggMoves
dw MawtleEggMoves dw MawtleEggMoves
dw NoEggMoves2 ; Evolotto
dw XylodonEggMoves dw XylodonEggMoves
dw NoEggMoves2 dw NoEggMoves2
dw NoEggMoves2 ; Dokuroar dw NoEggMoves2 ; Dokuroar
@ -202,6 +203,7 @@ EggMovePointers2::
dw NoEggMoves2 dw NoEggMoves2
dw NoEggMoves2 dw NoEggMoves2
dw NoEggMoves2 dw NoEggMoves2
dw NoEggMoves2 ; Deoxys
.IndirectEnd:: .IndirectEnd::
ChikoritaEggMoves: ChikoritaEggMoves:

1
data/pokemon/evolution_moves.asm
View file

@ -400,6 +400,7 @@ EvolutionMoves::
dw NO_MOVE ;RUDDERNAUT dw NO_MOVE ;RUDDERNAUT
dw NO_MOVE ;PIXYTOP dw NO_MOVE ;PIXYTOP
dw NO_MOVE ;MAWTLE dw NO_MOVE ;MAWTLE
dw NO_MOVE ;EVOLOTTO
dw NO_MOVE ;XYLODON dw NO_MOVE ;XYLODON
dw NO_MOVE ;XYLOFIN dw NO_MOVE ;XYLOFIN
dw NO_MOVE ;DOKUROAR dw NO_MOVE ;DOKUROAR

37
data/pokemon/evos_attacks_johto.asm
View file

@ -176,6 +176,7 @@ EvosAttacksPointers2::
dw RuddernautEvosAttacks dw RuddernautEvosAttacks
dw PixytopEvosAttacks dw PixytopEvosAttacks
dw MawtleEvosAttacks dw MawtleEvosAttacks
dw EvolottoEvosAttacks
dw XylodonEvosAttacks dw XylodonEvosAttacks
dw XylofinEvosAttacks dw XylofinEvosAttacks
dw DokuroarEvosAttacks dw DokuroarEvosAttacks
@ -201,6 +202,7 @@ EvosAttacksPointers2::
dw HyoshuYangEvosAttacks dw HyoshuYangEvosAttacks
dw HyoshuYinEvosAttacks dw HyoshuYinEvosAttacks
dw CelebiEvosAttacks dw CelebiEvosAttacks
dw DeoxysEvosAttacks
.IndirectEnd:: .IndirectEnd::
ChikoritaEvosAttacks: ChikoritaEvosAttacks:
@ -1020,8 +1022,8 @@ HoppipEvosAttacks:
dbw 17, STUN_SPORE dbw 17, STUN_SPORE
dbw 18, SLEEP_POWDER dbw 18, SLEEP_POWDER
dbw 22, LEECH_SEED dbw 22, LEECH_SEED
dbw 25, SLAM ; SW97 dbw 25, MEGA_DRAIN
dbw 30, MEGA_DRAIN dbw 30, SLAM ; SW97
dbw 35, GROWTH ; SW97 dbw 35, GROWTH ; SW97
dbw 39, RAZOR_LEAF ; SW97 dbw 39, RAZOR_LEAF ; SW97
dbw 45, COTTON_SPORE dbw 45, COTTON_SPORE
@ -1041,8 +1043,8 @@ SkiploomEvosAttacks:
dbw 17, STUN_SPORE dbw 17, STUN_SPORE
dbw 18, SLEEP_POWDER dbw 18, SLEEP_POWDER
dbw 24, LEECH_SEED dbw 24, LEECH_SEED
dbw 27, SLAM ; SW97 dbw 27, MEGA_DRAIN
dbw 32, MEGA_DRAIN dbw 32, SLAM ; SW97
dbw 39, GROWTH ; SW97 dbw 39, GROWTH ; SW97
dbw 43, RAZOR_LEAF ; SW97 dbw 43, RAZOR_LEAF ; SW97
dbw 49, COTTON_SPORE dbw 49, COTTON_SPORE
@ -1061,8 +1063,8 @@ JumpluffEvosAttacks:
dbw 17, STUN_SPORE dbw 17, STUN_SPORE
dbw 18, SLEEP_POWDER dbw 18, SLEEP_POWDER
dbw 24, LEECH_SEED dbw 24, LEECH_SEED
dbw 27, SLAM ; SW97 dbw 27, MEGA_DRAIN
dbw 34, MEGA_DRAIN dbw 34, SLAM ; SW97
dbw 41, GROWTH ; SW97 dbw 41, GROWTH ; SW97
dbw 47, RAZOR_LEAF ; SW97 dbw 47, RAZOR_LEAF ; SW97
dbw 53, COTTON_SPORE dbw 53, COTTON_SPORE
@ -3030,6 +3032,12 @@ MawtleEvosAttacks:
dbw 60, SKULL_BASH dbw 60, SKULL_BASH
db 0 ; no more level-up moves 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: XylodonEvosAttacks:
dbbw EVOLVE_LEVEL, 40, XYLOFIN ; no more evolutions dbbw EVOLVE_LEVEL, 40, XYLOFIN ; no more evolutions
db 0 db 0
@ -3451,3 +3459,20 @@ CelebiEvosAttacks:
dbw 40, BATON_PASS dbw 40, BATON_PASS
dbw 50, PERISH_SONG dbw 50, PERISH_SONG
db 0 ; no more level-up moves 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

5
data/pokemon/evos_attacks_kanto.asm
View file

@ -2386,10 +2386,11 @@ KinglerEvosAttacks:
dbw 53, FLAIL ; FRLG dbw 53, FLAIL ; FRLG
db 0 ; no more level-up moves db 0 ; no more level-up moves
VoltorbEvosAttacks: ; spark and twave should be here somewhere VoltorbEvosAttacks:
dbbw EVOLVE_LEVEL, 30, ELECTRODE dbbw EVOLVE_LEVEL, 30, ELECTRODE
db 0 ; no more evolutions db 0 ; no more evolutions
dbw 1, TACKLE dbw 1, TACKLE
dbw 1, THUNDERSHOCK
dbw 7, SCREECH dbw 7, SCREECH
dbw 12, THUNDER_WAVE ; SW97 dbw 12, THUNDER_WAVE ; SW97
dbw 17, SONICBOOM dbw 17, SONICBOOM
@ -2406,6 +2407,7 @@ VoltorbEvosAttacks: ; spark and twave should be here somewhere
ElectrodeEvosAttacks: ElectrodeEvosAttacks:
db 0 ; no more evolutions db 0 ; no more evolutions
dbw 1, TACKLE dbw 1, TACKLE
dbw 1, THUNDERSHOCK
dbw 7, SCREECH dbw 7, SCREECH
dbw 12, THUNDER_WAVE ; SW97 dbw 12, THUNDER_WAVE ; SW97
dbw 17, SONICBOOM dbw 17, SONICBOOM
@ -3350,6 +3352,7 @@ EeveeEvosAttacks:
dbw 36, BATON_PASS dbw 36, BATON_PASS
dbw 42, TAKE_DOWN dbw 42, TAKE_DOWN
dbw 47, FOCUS_ENERGY ; RBY, GS dbw 47, FOCUS_ENERGY ; RBY, GS
dbw 52, SWIFT ; LGPE
db 0 ; no more level-up moves db 0 ; no more level-up moves
VaporeonEvosAttacks: VaporeonEvosAttacks:

2
data/pokemon/first_stages.asm
View file

@ -402,6 +402,7 @@ FirstEvoStages::
dw RUDDERNAUT dw RUDDERNAUT
dw PIXYTOP dw PIXYTOP
dw MAWTLE dw MAWTLE
dw EVOLOTTO
dw XYLODON dw XYLODON
dw XYLODON dw XYLODON
dw DOKUROAR dw DOKUROAR
@ -427,4 +428,5 @@ FirstEvoStages::
dw HYOSHU_YANG dw HYOSHU_YANG
dw HYOSHU_YIN dw HYOSHU_YIN
dw CELEBI dw CELEBI
dw DEOXYS
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

2
data/pokemon/menu_icons.asm
View file

@ -403,6 +403,7 @@ MonMenuIcons:
db ICON_LAPRAS ; RUDDERNAUT db ICON_LAPRAS ; RUDDERNAUT
db ICON_CLEFAIRY ; PIXYTOP db ICON_CLEFAIRY ; PIXYTOP
db ICON_SQUIRTLE ; MAWTLE db ICON_SQUIRTLE ; MAWTLE
db ICON_BLOB ; EVOLOTTO
db ICON_MONSTER ; XYLODON db ICON_MONSTER ; XYLODON
db ICON_MONSTER ; XYLOFIN db ICON_MONSTER ; XYLOFIN
db ICON_MONSTER ; DOKUROAR db ICON_MONSTER ; DOKUROAR
@ -428,4 +429,5 @@ MonMenuIcons:
db ICON_FOX ; HYOSHU_YANG db ICON_FOX ; HYOSHU_YANG
db ICON_FOX ; HYOSHU_YIN db ICON_FOX ; HYOSHU_YIN
db ICON_HUMANSHAPE ; CELEBI db ICON_HUMANSHAPE ; CELEBI
db ICON_HUMANSHAPE ; DEOXYS
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

2
data/pokemon/names.asm
View file

@ -406,6 +406,7 @@ PokemonNames::
db "RUDDERNAUT" db "RUDDERNAUT"
db "PIXYTOP@@@" db "PIXYTOP@@@"
db "MAWTLE@@@@" db "MAWTLE@@@@"
db "EVOLOTTO@@"
db "XYLODON@@@" db "XYLODON@@@"
db "XYLOFIN@@@" db "XYLOFIN@@@"
db "DOKUROAR@@" db "DOKUROAR@@"
@ -431,4 +432,5 @@ PokemonNames::
db "HYOSHU@@@@" db "HYOSHU@@@@"
db "HYOSHU@@@@" db "HYOSHU@@@@"
db "CELEBI@@@@" db "CELEBI@@@@"
db "DEOXYS@@@@"
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

4
data/pokemon/palettes.asm
View file

@ -836,6 +836,8 @@ INCBIN "gfx/pokemon/pixytop/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pixytop/shiny.pal" INCLUDE "gfx/pokemon/pixytop/shiny.pal"
INCBIN "gfx/pokemon/mawtle/front.gbcpal", middle_colors INCBIN "gfx/pokemon/mawtle/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/mawtle/shiny.pal" 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 INCBIN "gfx/pokemon/xylodon/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/xylodon/shiny.pal" INCLUDE "gfx/pokemon/xylodon/shiny.pal"
INCBIN "gfx/pokemon/xylofin/front.gbcpal", middle_colors INCBIN "gfx/pokemon/xylofin/front.gbcpal", middle_colors
@ -888,6 +890,8 @@ INCBIN "gfx/pokemon/hyoshu_yin/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/hyoshu_yin/shiny.pal" INCLUDE "gfx/pokemon/hyoshu_yin/shiny.pal"
INCBIN "gfx/pokemon/celebi/front.gbcpal", middle_colors INCBIN "gfx/pokemon/celebi/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/celebi/shiny.pal" 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 assert_table_length NUM_POKEMON + 1

4
data/pokemon/pic_pointers.asm
View file

@ -818,6 +818,8 @@ PokemonPicPointers::
dba PixytopBackpic dba PixytopBackpic
dba MawtleFrontpic dba MawtleFrontpic
dba MawtleBackpic dba MawtleBackpic
dba EvolottoFrontpic
dba EvolottoBackpic
dba XylodonFrontpic dba XylodonFrontpic
dba XylodonBackpic dba XylodonBackpic
dba XylofinFrontpic dba XylofinFrontpic
@ -868,4 +870,6 @@ PokemonPicPointers::
dba HyoshuYinBackpic dba HyoshuYinBackpic
dba CelebiFrontpic dba CelebiFrontpic
dba CelebiBackpic dba CelebiBackpic
dba DeoxysFrontpic
dba DeoxysBackpic
assert_table_length NUM_POKEMON + 1 assert_table_length NUM_POKEMON + 1

1335
data/trainers/parties.asm
View file

File diff suppressed because it is too large Load diff

30
data/trainers/parties_new_classes.asm
View file

@ -668,15 +668,19 @@ KurtGroup:
ArcherGroup: ArcherGroup:
next_list_item next_list_item
db "ARCHER@", TRAINERTYPE_NORMAL db "ARCHER@", TRAINERTYPE_MOVES
db 33 db 42
dw ELECTRODE dw ELECTRODE
db 33 dw THUNDER, ROLLOUT, THUNDER_WAVE, EXPLOSION
db 43
dw MAGMAR dw MAGMAR
db 33 dw FLAMETHROWER, FAINT_ATTACK, SMOKESCREEN, CONFUSE_RAY
db 43
dw GOLBAT dw GOLBAT
db 35 dw WING_ATTACK, THRASH, SCREECH, MEAN_LOOK
db 45
dw HOUNDOOM dw HOUNDOOM
dw FIRE_BLAST, FAINT_ATTACK, SLUDGE_BOMB, SCARY_FACE
db -1 ; end db -1 ; end
db "ARCHER@", TRAINERTYPE_NORMAL db "ARCHER@", TRAINERTYPE_NORMAL
@ -858,20 +862,20 @@ TwinsGroup:
next_list_item ; TWINS (9) next_list_item ; TWINS (9)
db "LEA & PIA@", TRAINERTYPE_MOVES db "LEA & PIA@", TRAINERTYPE_MOVES
db 35 db 43
dw DRATINI dw DRATINI
dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
db 35 db 43
dw DRATINI dw SQUEAMATA
dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT dw GLARE, DRAGONBREATH, ICE_BEAM, FURY_SWIPES
db -1 ; end db -1 ; end
next_list_item ; TWINS (10) next_list_item ; TWINS (10)
db "LEA & PIA@", TRAINERTYPE_MOVES db "LEA & PIA@", TRAINERTYPE_MOVES
db 38 db 43
dw DRATINI dw SQUEAMATA
dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT dw GLARE, DRAGONBREATH, ICE_BEAM, FURY_SWIPES
db 38 db 43
dw DRATINI dw DRATINI
dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
db -1 ; end db -1 ; end

488
data/wild/johto_grass.asm
View file

@ -388,7 +388,7 @@ JohtoGrassWildMons:
; morn ; morn
dbw 24, SMEARGLE dbw 24, SMEARGLE
dbw 26, QATU dbw 26, QATU
dbw 24, QATU dbw 24, AERCROW
dbw 27, QATU dbw 27, QATU
dbw 25, SMEARGLE dbw 25, SMEARGLE
dbw 25, GIRAFARIG dbw 25, GIRAFARIG
@ -396,7 +396,7 @@ JohtoGrassWildMons:
; day ; day
dbw 24, SMEARGLE dbw 24, SMEARGLE
dbw 26, QATU dbw 26, QATU
dbw 24, QATU dbw 24, AERCROW
dbw 27, QATU dbw 27, QATU
dbw 25, SMEARGLE dbw 25, SMEARGLE
dbw 25, GIRAFARIG dbw 25, GIRAFARIG
@ -618,29 +618,29 @@ JohtoGrassWildMons:
def_grass_wildmons MOUNT_MORTAR_1F_OUTSIDE def_grass_wildmons MOUNT_MORTAR_1F_OUTSIDE
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 19, RATTATA dbw 27, RATICATE
dbw 22, KOTORA dbw 27, KOTORA
dbw 18, MACHOP dbw 26, MACHOP
dbw 21, KOTORA dbw 28, GAOTORA
dbw 19, GEODUDE dbw 28, GRAVELER
dbw 20, RATICATE dbw 29, RATICATE
dbw 20, GRENMAR dbw 28, GRENMAR
; day ; day
dbw 19, RATTATA dbw 27, RATICATE
dbw 22, KOTORA dbw 27, KOTORA
dbw 18, MACHOP dbw 26, MACHOP
dbw 21, KOTORA dbw 28, GAOTORA
dbw 19, GEODUDE dbw 28, GRAVELER
dbw 20, RATICATE dbw 29, RATICATE
dbw 20, GRENMAR dbw 28, GRENMAR
; nite ; nite
dbw 18, RATTATA dbw 27, RATICATE
dbw 22, ZUBAT dbw 27, GOLBAT
dbw 21, MARILL dbw 26, MARILL
dbw 22, GOLBAT dbw 29, GOLBAT
dbw 19, GEODUDE dbw 28, GRAVELER
dbw 20, RATICATE dbw 29, RATICATE
dbw 20, GRENMAR dbw 28, GRENMAR
end_grass_wildmons end_grass_wildmons
; Also, Larvitar is available in the morning and daytime, unless it's B2F, wherein it's all-day. ; 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 def_grass_wildmons MOUNT_MORTAR_1F_INSIDE
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 18, GEODUDE dbw 27, GRAVELER
dbw 19, RATTATA dbw 29, RATICATE
dbw 20, MACHOP dbw 28, MACHOKE
dbw 20, GRENMAR dbw 29, GRENMAR
dbw 22, MARILL dbw 28, MARILL
dbw 22, LARVITAR dbw 25, LARVITAR
dbw 23, LARVITAR dbw 30, LARVITAR
; day ; day
dbw 18, GEODUDE dbw 27, GRAVELER
dbw 19, RATTATA dbw 29, RATICATE
dbw 20, MACHOP dbw 28, MACHOKE
dbw 20, GRENMAR dbw 29, GRENMAR
dbw 22, MARILL dbw 28, MARILL
dbw 22, LARVITAR dbw 25, LARVITAR
dbw 23, LARVITAR dbw 30, LARVITAR
; nite ; nite
dbw 18, GEODUDE dbw 27, GRAVELER
dbw 19, RATTATA dbw 29, RATICATE
dbw 20, GRENMAR dbw 30, GRENMAR
dbw 22, ZUBAT dbw 29, ZUBAT
dbw 21, MARILL dbw 29, MARILL
dbw 22, GOLBAT dbw 30, MARILL
dbw 23, GOLBAT dbw 30, GOLBAT
end_grass_wildmons end_grass_wildmons
def_grass_wildmons MOUNT_MORTAR_2F_INSIDE def_grass_wildmons MOUNT_MORTAR_2F_INSIDE
@ -678,55 +678,55 @@ JohtoGrassWildMons:
; morn ; morn
dbw 41, GRAVELER dbw 41, GRAVELER
dbw 42, MACHOKE dbw 42, MACHOKE
dbw 41, GEODUDE dbw 42, GRAVELER
dbw 40, GRENMAR dbw 41, GRENMAR
dbw 48, MARILL dbw 45, AZUMARILL
dbw 40, PUPITAR dbw 42, PUPITAR
dbw 40, PUPITAR dbw 43, PUPITAR
; day ; day
dbw 41, GRAVELER dbw 41, GRAVELER
dbw 42, MACHOKE dbw 42, MACHOKE
dbw 41, GEODUDE dbw 42, GRAVELER
dbw 40, GRENMAR dbw 41, GRENMAR
dbw 48, MARILL dbw 45, AZUMARILL
dbw 40, PUPITAR dbw 42, PUPITAR
dbw 40, PUPITAR dbw 43, PUPITAR
; nite ; nite
dbw 41, GRAVELER dbw 41, GRAVELER
dbw 41, GEODUDE dbw 42, RATICATE
dbw 40, GRENMAR dbw 41, GRENMAR
dbw 40, GOLBAT
dbw 48, AZUMARILL
dbw 42, GOLBAT
dbw 42, GOLBAT dbw 42, GOLBAT
dbw 45, AZUMARILL
dbw 43, GOLBAT
dbw 44, GOLBAT
end_grass_wildmons end_grass_wildmons
def_grass_wildmons MOUNT_MORTAR_B1F def_grass_wildmons MOUNT_MORTAR_B1F
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 19, ZUBAT dbw 28, GRAVELER
dbw 20, ZUBAT dbw 29, GRAVELER
dbw 23, GOLBAT dbw 29, GOLBAT
dbw 21, MARILL dbw 31, AZUMARILL
dbw 20, GRENMAR dbw 30, GRENMAR
dbw 24, LARVITAR dbw 30, LARVITAR
dbw 24, LARVITAR dbw 31, LARVITAR
; day ; day
dbw 19, ZUBAT dbw 28, GRAVELER
dbw 20, ZUBAT dbw 29, GRAVELER
dbw 23, GOLBAT dbw 29, GOLBAT
dbw 21, MARILL dbw 31, AZUMARILL
dbw 20, GRENMAR dbw 30, GRENMAR
dbw 24, LARVITAR dbw 30, LARVITAR
dbw 24, LARVITAR dbw 31, LARVITAR
; nite ; nite
dbw 19, ZUBAT dbw 28, GRAVELER
dbw 20, ZUBAT dbw 29, GRAVELER
dbw 23, GOLBAT dbw 29, GOLBAT
dbw 21, MARILL dbw 31, AZUMARILL
dbw 20, GRENMAR dbw 30, GRENMAR
dbw 24, LARVITAR dbw 30, LARVITAR
dbw 24, LARVITAR dbw 31, LARVITAR
end_grass_wildmons end_grass_wildmons
; Ice Path is very close to working. It just doesn't have good frequency in Johto encounters. ; 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 def_grass_wildmons ICE_PATH_1F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 31, SWINUB dbw 34, SWINUB
dbw 32, SNEASEL dbw 35, BUNICE
dbw 32, GOLBAT dbw 36, GOLBAT
dbw 33, SWINUB dbw 33, SWINUB
dbw 34, SNEASEL dbw 34, SNEASEL
dbw 32, GOLBAT dbw 35, SMOOCHUM
dbw 32, GOLBAT dbw 36, SMOOCHUM
; day ; day
dbw 31, SWINUB dbw 34, SWINUB
dbw 32, SNEASEL dbw 35, BUNICE
dbw 32, GOLBAT dbw 36, GOLBAT
dbw 33, SWINUB dbw 33, SWINUB
dbw 34, SNEASEL dbw 34, SNEASEL
dbw 32, GOLBAT dbw 35, SMOOCHUM
dbw 32, GOLBAT dbw 36, SMOOCHUM
; nite ; nite
dbw 31, DELIBIRD dbw 34, DELIBIRD
dbw 32, SNEASEL dbw 35, SNEASEL
dbw 32, GOLBAT dbw 36, GOLBAT
dbw 33, DELIBIRD dbw 33, BUNICE
dbw 34, SNEASEL dbw 34, SNEASEL
dbw 32, GOLBAT dbw 35, WARFURS
dbw 32, GOLBAT dbw 36, WARFURS
end_grass_wildmons end_grass_wildmons
def_grass_wildmons ICE_PATH_B1F def_grass_wildmons ICE_PATH_B1F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 32, SWINUB
dbw 33, SNEASEL
dbw 33, GOLBAT
dbw 34, SWINUB dbw 34, SWINUB
dbw 35, SNEASEL dbw 35, BUNICE
dbw 33, GOLBAT dbw 36, GOLBAT
dbw 32, JYNX dbw 33, SWINUB
dbw 34, SNEASEL
dbw 35, SMOOCHUM
dbw 36, SMOOCHUM
; day ; day
dbw 32, SWINUB
dbw 33, SNEASEL
dbw 33, GOLBAT
dbw 34, SWINUB dbw 34, SWINUB
dbw 35, SNEASEL dbw 35, BUNICE
dbw 33, GOLBAT dbw 36, GOLBAT
dbw 32, JYNX dbw 33, SWINUB
dbw 34, SNEASEL
dbw 35, SMOOCHUM
dbw 36, SMOOCHUM
; nite ; nite
dbw 32, DELIBIRD
dbw 33, SNEASEL
dbw 33, GOLBAT
dbw 34, DELIBIRD dbw 34, DELIBIRD
dbw 35, SNEASEL dbw 35, SNEASEL
dbw 33, GOLBAT dbw 36, GOLBAT
dbw 32, JYNX ; BUU dbw 33, BUNICE
dbw 34, SNEASEL
dbw 35, WARFURS
dbw 36, WARFURS
end_grass_wildmons end_grass_wildmons
def_grass_wildmons ICE_PATH_B2F_MAHOGANY_SIDE def_grass_wildmons ICE_PATH_B2F_MAHOGANY_SIDE
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 33, SWINUB dbw 34, SWINUB
dbw 34, SNEASEL dbw 35, SNEASEL
dbw 34, GOLBAT dbw 34, GOLBAT
dbw 35, SWINUB dbw 35, PILOSWINE
dbw 36, SNEASEL dbw 36, SNEASEL
dbw 32, JYNX dbw 36, JYNX
dbw 34, JYNX dbw 37, JYNX
; day ; day
dbw 33, SWINUB dbw 34, SWINUB
dbw 34, SNEASEL dbw 35, SNEASEL
dbw 34, GOLBAT dbw 34, GOLBAT
dbw 35, SWINUB dbw 35, PILOSWINE
dbw 36, SNEASEL dbw 36, SNEASEL
dbw 32, JYNX dbw 36, JYNX
dbw 34, JYNX dbw 37, JYNX
; nite ; nite
dbw 33, DELIBIRD dbw 34, WARFURS
dbw 34, SNEASEL dbw 35, SNEASEL
dbw 34, GOLBAT dbw 34, GOLBAT
dbw 35, DELIBIRD dbw 35, DELIBIRD
dbw 36, SNEASEL dbw 36, SNEASEL
dbw 32, JYNX ; BUU dbw 36, BUU
dbw 34, JYNX ; BUU dbw 37, BUU
end_grass_wildmons end_grass_wildmons
def_grass_wildmons ICE_PATH_B2F_BLACKTHORN_SIDE def_grass_wildmons ICE_PATH_B2F_BLACKTHORN_SIDE
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 33, SWINUB dbw 34, SWINUB
dbw 34, SNEASEL dbw 35, SNEASEL
dbw 34, GOLBAT dbw 34, GOLBAT
dbw 35, SWINUB dbw 35, PILOSWINE
dbw 36, SNEASEL dbw 36, SNEASEL
dbw 32, JYNX dbw 36, JYNX
dbw 34, JYNX dbw 37, JYNX
; day ; day
dbw 33, SWINUB dbw 34, SWINUB
dbw 34, SNEASEL dbw 35, SNEASEL
dbw 34, GOLBAT dbw 34, GOLBAT
dbw 35, SWINUB dbw 35, PILOSWINE
dbw 36, SNEASEL dbw 36, SNEASEL
dbw 32, JYNX dbw 36, JYNX
dbw 34, JYNX dbw 37, JYNX
; nite ; nite
dbw 33, DELIBIRD dbw 34, WARFURS
dbw 34, SNEASEL dbw 35, SNEASEL
dbw 34, GOLBAT dbw 34, GOLBAT
dbw 35, DELIBIRD dbw 35, DELIBIRD
dbw 36, GOLBAT dbw 36, SNEASEL
dbw 32, JYNX ; BUU dbw 36, BUU
dbw 34, JYNX ; BUU dbw 37, BUU
end_grass_wildmons end_grass_wildmons
def_grass_wildmons ICE_PATH_B3F def_grass_wildmons ICE_PATH_B3F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 34, SWINUB dbw 34, WARFURS
dbw 35, SNEASEL dbw 35, SNEASEL
dbw 35, GOLBAT dbw 35, GOLBAT
dbw 36, SWINUB dbw 36, PILOSWINE
dbw 32, SNEASEL dbw 36, SNEASEL
dbw 34, JYNX
dbw 36, JYNX dbw 36, JYNX
dbw 37, JYNX
; day ; day
dbw 34, SWINUB dbw 34, WARFURS
dbw 35, SNEASEL dbw 35, SNEASEL
dbw 35, GOLBAT dbw 35, GOLBAT
dbw 36, SWINUB dbw 36, PILOSWINE
dbw 32, SNEASEL dbw 36, SNEASEL
dbw 34, JYNX
dbw 36, JYNX dbw 36, JYNX
dbw 37, JYNX
; nite ; nite
dbw 34, DELIBIRD dbw 34, WARFURS
dbw 35, SNEASEL dbw 35, SNEASEL
dbw 35, GOLBAT dbw 35, GOLBAT
dbw 36, DELIBIRD dbw 36, DELIBIRD
dbw 32, SNEASEL dbw 36, SNEASEL
dbw 34, JYNX ; BUU dbw 36, BUU
dbw 36, JYNX ; BUU dbw 37, BUU
end_grass_wildmons end_grass_wildmons
def_grass_wildmons WHIRL_ISLAND_NW def_grass_wildmons WHIRL_ISLAND_NW
@ -896,8 +896,8 @@ JohtoGrassWildMons:
dbw 42, GOLBAT dbw 42, GOLBAT
dbw 43, CORSOLA dbw 43, CORSOLA
dbw 44, QUAGSIRE dbw 44, QUAGSIRE
dbw 45, SHELLDER ; DISTURBAN dbw 45, DISTURBAN
dbw 44, SHELLDER ; DISTURBAN dbw 44, DISTURBAN
dbw 44, SLOWKING dbw 44, SLOWKING
end_grass_wildmons end_grass_wildmons
@ -924,8 +924,8 @@ JohtoGrassWildMons:
dbw 42, GOLBAT dbw 42, GOLBAT
dbw 43, CORSOLA dbw 43, CORSOLA
dbw 44, QUAGSIRE dbw 44, QUAGSIRE
dbw 45, SHELLDER ; DISTURBAN dbw 45, DISTURBAN
dbw 44, SHELLDER ; DISTURBAN dbw 44, DISTURBAN
dbw 44, SLOWKING dbw 44, SLOWKING
end_grass_wildmons end_grass_wildmons
@ -952,8 +952,8 @@ JohtoGrassWildMons:
dbw 42, GOLBAT dbw 42, GOLBAT
dbw 43, CORSOLA dbw 43, CORSOLA
dbw 44, QUAGSIRE dbw 44, QUAGSIRE
dbw 45, SHELLDER ; DISTURBAN dbw 45, DISTURBAN
dbw 44, SHELLDER ; DISTURBAN dbw 44, DISTURBAN
dbw 44, SLOWKING dbw 44, SLOWKING
end_grass_wildmons end_grass_wildmons
@ -980,8 +980,8 @@ JohtoGrassWildMons:
dbw 42, GOLBAT dbw 42, GOLBAT
dbw 43, CORSOLA dbw 43, CORSOLA
dbw 44, QUAGSIRE dbw 44, QUAGSIRE
dbw 45, SHELLDER ; DISTURBAN dbw 45, DISTURBAN
dbw 44, SHELLDER ; DISTURBAN dbw 44, DISTURBAN
dbw 44, SLOWKING dbw 44, SLOWKING
end_grass_wildmons end_grass_wildmons
@ -1008,8 +1008,8 @@ JohtoGrassWildMons:
dbw 42, GOLBAT dbw 42, GOLBAT
dbw 43, CORSOLA dbw 43, CORSOLA
dbw 44, QUAGSIRE dbw 44, QUAGSIRE
dbw 45, SHELLDER ; DISTURBAN dbw 45, DISTURBAN
dbw 44, SHELLDER ; DISTURBAN dbw 44, DISTURBAN
dbw 44, SLOWKING dbw 44, SLOWKING
end_grass_wildmons end_grass_wildmons
@ -1036,8 +1036,8 @@ JohtoGrassWildMons:
dbw 42, GOLBAT dbw 42, GOLBAT
dbw 43, CORSOLA dbw 43, CORSOLA
dbw 44, QUAGSIRE dbw 44, QUAGSIRE
dbw 45, SHELLDER ; DISTURBAN dbw 45, DISTURBAN
dbw 44, SHELLDER ; DISTURBAN dbw 44, DISTURBAN
dbw 47, SLOWKING dbw 47, SLOWKING
end_grass_wildmons end_grass_wildmons
@ -1064,8 +1064,8 @@ JohtoGrassWildMons:
dbw 42, GOLBAT dbw 42, GOLBAT
dbw 43, CORSOLA dbw 43, CORSOLA
dbw 44, QUAGSIRE dbw 44, QUAGSIRE
dbw 45, SHELLDER ; DISTURBAN dbw 45, DISTURBAN
dbw 44, SHELLDER ; DISTURBAN dbw 44, DISTURBAN
dbw 44, SLOWKING dbw 44, SLOWKING
end_grass_wildmons end_grass_wildmons
@ -1092,8 +1092,8 @@ JohtoGrassWildMons:
dbw 52, GOLBAT dbw 52, GOLBAT
dbw 53, CORSOLA dbw 53, CORSOLA
dbw 54, QUAGSIRE dbw 54, QUAGSIRE
dbw 55, SHELLDER ; DISTURBAN dbw 55, DISTURBAN
dbw 54, SHELLDER ; DISTURBAN dbw 54, DISTURBAN
dbw 54, SLOWKING dbw 54, SLOWKING
end_grass_wildmons end_grass_wildmons
@ -1240,29 +1240,29 @@ JohtoGrassWildMons:
def_grass_wildmons DARK_CAVE_BLACKTHORN_ENTRANCE def_grass_wildmons DARK_CAVE_BLACKTHORN_ENTRANCE
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 23, GEODUDE dbw 31, DONPHAN
dbw 23, ZUBAT dbw 34, GOLBAT
dbw 25, GRAVELER dbw 33, DONPHAN
dbw 25, URSARING dbw 35, URSARING
dbw 20, TEDDIURSA dbw 34, URSARING
dbw 23, GOLBAT dbw 33, DUDUNSPARCE
dbw 23, GOLBAT dbw 34, DUDUNSPARCE
; day ; day
dbw 23, GEODUDE dbw 31, DONPHAN
dbw 23, ZUBAT dbw 34, GOLBAT
dbw 25, GRAVELER dbw 33, DONPHAN
dbw 25, URSARING dbw 35, URSARING
dbw 30, URSARING dbw 34, URSARING
dbw 23, GOLBAT dbw 33, DUDUNSPARCE
dbw 23, GOLBAT dbw 34, DUDUNSPARCE
; nite ; nite
dbw 23, GEODUDE dbw 33, GRAVELER
dbw 23, ZUBAT dbw 31, GOLBAT
dbw 25, GRAVELER dbw 32, GRAVELER
dbw 20, WOBBUFFET dbw 33, WOBBUFFET
dbw 25, WOBBUFFET dbw 35, WOBBUFFET
dbw 23, GOLBAT dbw 33, DUDUNSPARCE
dbw 23, GAVILLAIN dbw 34, DUDUNSPARCE
end_grass_wildmons end_grass_wildmons
def_grass_wildmons ROUTE_29 def_grass_wildmons ROUTE_29
@ -1298,17 +1298,17 @@ JohtoGrassWildMons:
; morn ; morn
dbw 3, LEDYBA dbw 3, LEDYBA
dbw 3, CATERPIE dbw 3, CATERPIE
dbw 4, CATERPIE dbw 4, WEEDLE
dbw 4, LEDYBA dbw 4, LEDYBA
dbw 3, WEEDLE dbw 3, GENTLARVA
dbw 4, HOPPIP dbw 4, HOPPIP
dbw 5, HOPPIP dbw 5, HOPPIP
; day ; day
dbw 3, LEDYBA dbw 3, PIDGEY
dbw 3, CATERPIE dbw 3, CATERPIE
dbw 4, CATERPIE dbw 4, WEEDLE
dbw 4, LEDYBA dbw 4, PIDGEY
dbw 3, WEEDLE dbw 3, GENTLARVA
dbw 4, HOPPIP dbw 4, HOPPIP
dbw 5, HOPPIP dbw 5, HOPPIP
; nite ; nite
@ -1332,14 +1332,14 @@ JohtoGrassWildMons:
dbw 4, CATERPIE dbw 4, CATERPIE
dbw 6, LEDYBA dbw 6, LEDYBA
dbw 4, LEDYBA dbw 4, LEDYBA
dbw 4, WEEDLE dbw 4, CATERPIE
dbw 5, BELLSPROUT dbw 5, BELLSPROUT
dbw 5, HOPPIP dbw 5, HOPPIP
; day ; day
dbw 5, LEDYBA dbw 5, PIDGEY
dbw 4, CATERPIE dbw 4, GENTLARVA
dbw 5, BELLSPROUT dbw 5, BELLSPROUT
dbw 4, LEDYBA dbw 4, PIDGEY
dbw 4, WEEDLE dbw 4, WEEDLE
dbw 6, BELLSPROUT dbw 6, BELLSPROUT
dbw 5, HOPPIP dbw 5, HOPPIP
@ -1348,7 +1348,7 @@ JohtoGrassWildMons:
dbw 4, POLIWAG dbw 4, POLIWAG
dbw 5, MOIBELLE dbw 5, MOIBELLE
dbw 5, HOOTHOOT dbw 5, HOOTHOOT
dbw 4, BITTYBAT dbw 4, SPINARAK
dbw 6, MOIBELLE dbw 6, MOIBELLE
dbw 5, MISDREAVUS dbw 5, MISDREAVUS
end_grass_wildmons end_grass_wildmons
@ -1386,7 +1386,7 @@ JohtoGrassWildMons:
; morn ; morn
dbw 7, RATTATA dbw 7, RATTATA
dbw 8, SPEAROW dbw 8, SPEAROW
dbw 7, GEODUDE dbw 7, SUNKERN
dbw 9, SUNKERN dbw 9, SUNKERN
dbw 8, EKANS dbw 8, EKANS
dbw 8, AZURILL dbw 8, AZURILL
@ -1394,7 +1394,7 @@ JohtoGrassWildMons:
; day ; day
dbw 7, RATTATA dbw 7, RATTATA
dbw 8, SPEAROW dbw 8, SPEAROW
dbw 7, GEODUDE dbw 7, SUNKERN
dbw 9, SUNKERN dbw 9, SUNKERN
dbw 8, EKANS dbw 8, EKANS
dbw 8, AZURILL dbw 8, AZURILL
@ -1499,23 +1499,23 @@ JohtoGrassWildMons:
def_grass_wildmons ROUTE_37 def_grass_wildmons ROUTE_37
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 16, GROWLITHE dbw 16, ZORRIEGO
dbw 18, STANTLER dbw 18, STANTLER
dbw 17, PIDGEOTTO dbw 17, AERCROW
dbw 17, GROWLITHE dbw 17, ZORRIEGO
dbw 15, BONSLY dbw 15, BONSLY
dbw 18, LEDIAN dbw 18, LEDIAN
dbw 19, LEDIAN dbw 19, LEDIAN
; day ; day
dbw 16, GROWLITHE dbw 16, ZORRIEGO
dbw 17, STANTLER dbw 17, STANTLER
dbw 17, PIDGEOTTO dbw 17, AERCROW
dbw 18, GROWLITHE dbw 18, ZORRIEGO
dbw 15, BONSLY dbw 15, BONSLY
dbw 17, KOLTA dbw 17, KOLTA
dbw 18, KOLTA dbw 18, KOLTA
; nite ; nite
dbw 16, VULPIX dbw 16, ZORRIEGO
dbw 18, STANTLER dbw 18, STANTLER
dbw 17, HOOTHOOT dbw 17, HOOTHOOT
dbw 16, MURKROW dbw 16, MURKROW
@ -1530,7 +1530,7 @@ JohtoGrassWildMons:
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 22, MEOWTH dbw 22, MEOWTH
dbw 20, FURRET dbw 20, SNUBBULL
dbw 21, MAGNEMITE dbw 21, MAGNEMITE
dbw 22, FARFETCH_D dbw 22, FARFETCH_D
dbw 23, MILTANK dbw 23, MILTANK
@ -1538,7 +1538,7 @@ JohtoGrassWildMons:
dbw 21, SNUBBULL dbw 21, SNUBBULL
; day ; day
dbw 22, MEOWTH dbw 22, MEOWTH
dbw 20, FURRET dbw 20, SNUBBULL
dbw 21, MAGNEMITE dbw 21, MAGNEMITE
dbw 22, FARFETCH_D dbw 22, FARFETCH_D
dbw 23, MILTANK dbw 23, MILTANK
@ -1589,7 +1589,7 @@ JohtoGrassWildMons:
; morn ; morn
dbw 28, MANKEY dbw 28, MANKEY
dbw 28, ARBOK dbw 28, ARBOK
dbw 28, FEAROW dbw 28, MARILL
dbw 29, FEAROW dbw 29, FEAROW
dbw 28, FLAAFFY dbw 28, FLAAFFY
dbw 29, FLAAFFY dbw 29, FLAAFFY
@ -1597,7 +1597,7 @@ JohtoGrassWildMons:
; day ; day
dbw 28, MANKEY dbw 28, MANKEY
dbw 28, ARBOK dbw 28, ARBOK
dbw 28, FEAROW dbw 28, MARILL
dbw 29, FEAROW dbw 29, FEAROW
dbw 28, FLAAFFY dbw 28, FLAAFFY
dbw 29, FLAAFFY dbw 29, FLAAFFY
@ -1617,18 +1617,18 @@ JohtoGrassWildMons:
; morn ; morn
dbw 31, FLAAFFY ; From Gold dbw 31, FLAAFFY ; From Gold
dbw 30, GIRAFARIG ; From Gold dbw 30, GIRAFARIG ; From Gold
dbw 33, FARFETCH_D ; LUXWAN dbw 33, LUXWAN
dbw 32, FURRET dbw 32, FURRET
dbw 33, FURRET dbw 33, FURRET
dbw 32, FURRET dbw 32, TANGELA
dbw 34, TANGELA dbw 34, TANGELA
; day ; day
dbw 31, FLAAFFY ; From Gold dbw 31, FLAAFFY ; From Gold
dbw 30, GIRAFARIG ; From Gold dbw 30, GIRAFARIG ; From Gold
dbw 33, FARFETCH_D ; LUXWAN dbw 33, LUXWAN
dbw 32, FURRET dbw 32, FURRET
dbw 33, FURRET dbw 33, FURRET
dbw 32, FURRET dbw 32, TANGELA
dbw 34, TANGELA dbw 34, TANGELA
; nite ; nite
dbw 31, FLAAFFY ; From Gold dbw 31, FLAAFFY ; From Gold
@ -1645,55 +1645,55 @@ JohtoGrassWildMons:
; morn ; morn
dbw 33, TANGELA dbw 33, TANGELA
dbw 33, LICKITUNG dbw 33, LICKITUNG
dbw 33, BELLSPROUT ; BUNICE dbw 33, BUNICE
dbw 34, WEEPINBELL dbw 34, WEEPINBELL
dbw 32, LICKITUNG dbw 32, LICKITUNG
dbw 33, LICKITUNG dbw 32, BUNICE
dbw 35, DELIBIRD dbw 35, DELIBIRD
; day ; day
dbw 33, TANGELA dbw 33, TANGELA
dbw 33, LICKITUNG dbw 33, LICKITUNG
dbw 33, BELLSPROUT ; BUNICE dbw 33, BUNICE
dbw 34, WEEPINBELL dbw 34, WEEPINBELL
dbw 32, LICKITUNG dbw 32, LICKITUNG
dbw 33, LICKITUNG dbw 32, BUNICE
dbw 35, DELIBIRD dbw 35, DELIBIRD
; nite ; nite
dbw 33, TANGELA dbw 33, TANGELA
dbw 33, POLIWHIRL dbw 33, POLIWHIRL
dbw 33, ODDISH ; WARFURS dbw 33, BUNICE
dbw 34, GLOOM dbw 34, GLOOM
dbw 32, POLIWHIRL dbw 32, POLIWHIRL
dbw 33, POLIWHIRL dbw 32, BUNICE
dbw 35, DELIBIRD dbw 35, DELIBIRD
end_grass_wildmons end_grass_wildmons
def_grass_wildmons ROUTE_45 def_grass_wildmons ROUTE_45
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 33, PHANPY dbw 36, DONPHAN
dbw 33, GRAVELER dbw 35, GRAVELER
dbw 34, GLIGAR dbw 35, GLIGAR
dbw 35, DONPHAN dbw 35, URSARING
dbw 30, PHANPY dbw 36, GLIGAR
dbw 37, SKARMORY
dbw 37, SKARMORY dbw 37, SKARMORY
dbw 38, SKARMORY
; day ; day
dbw 33, PHANPY dbw 36, DONPHAN
dbw 33, GRAVELER dbw 35, GRAVELER
dbw 34, GLIGAR dbw 35, GLIGAR
dbw 35, DONPHAN dbw 35, URSARING
dbw 30, DONPHAN dbw 36, GLIGAR
dbw 37, SKARMORY
dbw 37, SKARMORY dbw 37, SKARMORY
dbw 38, SKARMORY
; nite ; nite
dbw 33, GEODUDE dbw 36, DONPHAN
dbw 33, GRAVELER dbw 35, GRAVELER
dbw 34, GLIGAR dbw 35, GLIGAR
dbw 35, DUNSPARCE dbw 35, URSARING
dbw 37, DUNSPARCE dbw 36, GLIGAR
dbw 37, URSARING dbw 37, SKARMORY
dbw 37, URSARING dbw 38, SKARMORY
end_grass_wildmons end_grass_wildmons
; Buff Phanpy encounter rates to replace Geodude in the daytime, expanding on Crystal's work. ; Buff Phanpy encounter rates to replace Geodude in the daytime, expanding on Crystal's work.

104
data/wild/johto_water.asm
View file

@ -4,51 +4,51 @@ JohtoWaterWildMons:
def_water_wildmons RUINS_OF_ALPH_OUTSIDE def_water_wildmons RUINS_OF_ALPH_OUTSIDE
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 15, WOOPER dbw 20, WOOPER
dbw 23, QUAGSIRE
dbw 20, QUAGSIRE dbw 20, QUAGSIRE
dbw 15, QUAGSIRE
end_water_wildmons end_water_wildmons
def_water_wildmons UNION_CAVE_1F def_water_wildmons UNION_CAVE_1F
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 15, WOOPER dbw 20, WOOPER
dbw 20, QUAGSIRE dbw 23, QUAGSIRE
dbw 15, RIBBITO dbw 20, RIBBITO
end_water_wildmons end_water_wildmons
def_water_wildmons UNION_CAVE_B1F def_water_wildmons UNION_CAVE_B1F
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 15, WOOPER dbw 20, WOOPER
dbw 20, QUAGSIRE dbw 23, QUAGSIRE
dbw 15, RIBBITO dbw 20, RIBBITO
end_water_wildmons end_water_wildmons
def_water_wildmons UNION_CAVE_B2F def_water_wildmons UNION_CAVE_B2F
db 4 percent ; encounter rate db 4 percent ; encounter rate
dbw 15, TENTACOOL dbw 23, RIBBITO
dbw 20, QUAGSIRE dbw 23, QUAGSIRE
dbw 20, TENTACRUEL dbw 25, TENTACRUEL
end_water_wildmons end_water_wildmons
def_water_wildmons SLOWPOKE_WELL_B1F def_water_wildmons SLOWPOKE_WELL_B1F
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 15, SLOWPOKE
dbw 20, SLOWPOKE dbw 20, SLOWPOKE
dbw 10, SHELLDER dbw 23, SLOWPOKE
dbw 20, SHELLDER
end_water_wildmons end_water_wildmons
def_water_wildmons SLOWPOKE_WELL_B2F def_water_wildmons SLOWPOKE_WELL_B2F
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 15, SLOWPOKE dbw 23, SLOWPOKE
dbw 20, DISTURBAN dbw 25, DISTURBAN
dbw 20, SLOWBRO dbw 25, SLOWBRO
end_water_wildmons end_water_wildmons
def_water_wildmons ILEX_FOREST def_water_wildmons ILEX_FOREST
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 20, PSYDUCK dbw 20, PSYDUCK
dbw 25, WEIRDUCK dbw 25, WEIRDUCK
dbw 35, GOLDUCK dbw 30, GOLDUCK
end_water_wildmons end_water_wildmons
def_water_wildmons MOUNT_MORTAR_1F_OUTSIDE def_water_wildmons MOUNT_MORTAR_1F_OUTSIDE
@ -123,36 +123,36 @@ JohtoWaterWildMons:
def_water_wildmons OLIVINE_PORT def_water_wildmons OLIVINE_PORT
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 30, TENTACOOL ; MANTYKE dbw 20, MANTYKE
dbw 35, CHINCHOU dbw 20, CHINCHOU
dbw 30, TENTACRUEL dbw 25, TENTACOOL
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_30 def_water_wildmons ROUTE_30
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 20, RIBBITO dbw 20, RIBBITO
dbw 15, POLIWAG dbw 20, POLIWAG
dbw 20, POLIWHIRL dbw 23, POLIWHIRL
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_31 def_water_wildmons ROUTE_31
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 20, RIBBITO dbw 20, RIBBITO
dbw 15, POLIWAG dbw 20, POLIWAG
dbw 20, POLIWHIRL dbw 23, POLIWHIRL
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_32 def_water_wildmons ROUTE_32
db 6 percent ; encounter rate db 6 percent ; encounter rate
dbw 15, TENTACOOL dbw 20, TENTACOOL
dbw 20, QUAGSIRE dbw 23, QUAGSIRE
dbw 20, TENTACRUEL dbw 23, TENTACRUEL
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_34 def_water_wildmons ROUTE_34
db 6 percent ; encounter rate db 6 percent ; encounter rate
dbw 20, MANTYKE dbw 20, MANTYKE
dbw 15, CHINCHOU dbw 23, CHINCHOU
dbw 20, TENTACOOL dbw 20, TENTACOOL
end_water_wildmons end_water_wildmons
@ -160,42 +160,42 @@ JohtoWaterWildMons:
db 4 percent ; encounter rate db 4 percent ; encounter rate
dbw 20, MANTYKE dbw 20, MANTYKE
dbw 25, WEIRDUCK dbw 25, WEIRDUCK
dbw 35, GOLDUCK dbw 30, GOLDUCK
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_40 def_water_wildmons ROUTE_40
db 6 percent ; encounter rate db 6 percent ; encounter rate
dbw 22, TENTACOOL ; SAILWING dbw 22, SAILWING
dbw 21, REMORAID dbw 21, TENTACOOL
dbw 23, CHINCHOU dbw 23, CHINCHOU
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_41 def_water_wildmons ROUTE_41
db 6 percent ; encounter rate db 6 percent ; encounter rate
dbw 20, TENTACOOL ; SAILWING dbw 20, SAILWING
dbw 20, REMORAID dbw 20, CHINCHOU
dbw 25, MANTINE dbw 25, MANTINE
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_42 def_water_wildmons ROUTE_42
db 4 percent ; encounter rate db 4 percent ; encounter rate
dbw 30, GOLDEEN ; SAILWING dbw 27, SAILWING
dbw 35, GOLDEEN dbw 28, GOLDEEN
dbw 30, SEAKING dbw 30, SEAKING
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_43 def_water_wildmons ROUTE_43
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 30, MAGIKARP dbw 20, MAGIKARP
dbw 35, MAGIKARP dbw 25, MAGIKARP
dbw 30, WOOPER dbw 20, WOOPER
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_44 def_water_wildmons ROUTE_44
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 35, SEEL
dbw 30, SEEL dbw 30, SEEL
dbw 35, DEWGONG dbw 32, SEEL
dbw 34, DEWGONG
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_45 def_water_wildmons ROUTE_45
@ -221,37 +221,37 @@ JohtoWaterWildMons:
def_water_wildmons VIOLET_CITY def_water_wildmons VIOLET_CITY
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 30, GOLDEEN dbw 20, GOLDEEN
dbw 31, GOLDEEN dbw 22, GOLDEEN
dbw 35, SEAKING dbw 25, SEAKING
end_water_wildmons end_water_wildmons
def_water_wildmons CIANWOOD_CITY def_water_wildmons CIANWOOD_CITY
db 6 percent ; encounter rate db 6 percent ; encounter rate
dbw 25, TENTACOOL dbw 25, TENTACOOL
dbw 20, CHINCHOU dbw 20, CHINCHOU
dbw 25, TENTACRUEL dbw 25, POLIWHIRL
end_water_wildmons end_water_wildmons
def_water_wildmons OLIVINE_CITY def_water_wildmons OLIVINE_CITY
db 6 percent ; encounter rate db 6 percent ; encounter rate
dbw 20, TENTACOOL dbw 20, MANTYKE
dbw 15, CHINCHOU dbw 20, CHINCHOU
dbw 20, TENTACRUEL dbw 25, TENTACOOL
end_water_wildmons end_water_wildmons
def_water_wildmons ECRUTEAK_CITY def_water_wildmons ECRUTEAK_CITY
db 2 percent ; encounter rate db 2 percent ; encounter rate
dbw 31, GOLDEEN dbw 20, GOLDEEN
dbw 32, GOLDEEN dbw 22, GOLDEEN
dbw 35, SEAKING dbw 25, SEAKING
end_water_wildmons end_water_wildmons
def_water_wildmons LAKE_OF_RAGE def_water_wildmons LAKE_OF_RAGE
db 6 percent ; encounter rate db 6 percent ; encounter rate
dbw 25, MAGIKARP
dbw 20, MAGIKARP dbw 20, MAGIKARP
dbw 20, MAGIKARP dbw 25, GYARADOS
dbw 21, GYARADOS
end_water_wildmons end_water_wildmons
def_water_wildmons BLACKTHORN_CITY def_water_wildmons BLACKTHORN_CITY

170
data/wild/kanto_grass.asm
View file

@ -114,60 +114,60 @@ KantoGrassWildMons:
dbw 35, GOLBAT ; GAVILLAIN dbw 35, GOLBAT ; GAVILLAIN
end_grass_wildmons 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 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 34, GRAVELER dbw 42, MACHOKE
dbw 32, RHYHORN dbw 43, RHYHORN
dbw 33, ONIX dbw 42, STEELIX
dbw 34, GOLBAT dbw 41, MAGCARGO
dbw 35, SANDSLASH dbw 43, DONPHAN
dbw 35, RHYDON dbw 41, TYROGUE
dbw 35, RHYDON dbw 50, CHANSEY
; day ; day
dbw 34, GRAVELER dbw 42, MACHOKE
dbw 32, RHYHORN dbw 43, RHYHORN
dbw 33, ONIX dbw 42, STEELIX
dbw 34, GOLBAT dbw 41, MAGCARGO
dbw 35, SANDSLASH dbw 43, DONPHAN
dbw 35, RHYDON dbw 41, TYROGUE
dbw 35, RHYDON dbw 50, CHANSEY
; nite ; nite
dbw 34, GOLBAT dbw 42, GOLBAT
dbw 34, GRAVELER dbw 43, URSARING
dbw 32, ONIX dbw 42, STEELIX
dbw 36, GRAVELER dbw 41, HOUNDOOM
dbw 38, GRAVELER dbw 43, GAVILLAIN
dbw 40, GRAVELER dbw 41, LARVITAR
dbw 40, GRAVELER dbw 42, LARVITAR
end_grass_wildmons end_grass_wildmons
def_grass_wildmons TOHJO_FALLS def_grass_wildmons TOHJO_FALLS
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 22, ZUBAT dbw 38, GOLBAT
dbw 22, RATICATE dbw 38, RATICATE
dbw 24, GOLBAT dbw 39, NIDORINA
dbw 21, SLOWPOKE dbw 39, NIDORINO
dbw 20, RATTATA dbw 40, GOLBAT
dbw 23, SLOWPOKE dbw 40, PUPITAR
dbw 23, SLOWPOKE dbw 41, PUPITAR
; day ; day
dbw 22, ZUBAT dbw 38, GOLBAT
dbw 22, RATICATE dbw 38, RATICATE
dbw 24, GOLBAT dbw 39, NIDORINA
dbw 21, SLOWPOKE dbw 39, NIDORINO
dbw 20, RATTATA dbw 40, GOLBAT
dbw 23, SLOWPOKE dbw 40, PUPITAR
dbw 23, SLOWPOKE dbw 41, PUPITAR
; nite ; nite
dbw 22, ZUBAT dbw 38, GOLBAT
dbw 22, RATICATE dbw 38, RATICATE
dbw 24, GOLBAT dbw 39, NIDORINA
dbw 21, SLOWPOKE dbw 39, NIDORINO
dbw 20, RATTATA dbw 40, GOLBAT
dbw 23, SLOWPOKE dbw 40, PUPITAR
dbw 23, SLOWPOKE dbw 41, PUPITAR
end_grass_wildmons end_grass_wildmons
def_grass_wildmons ROUTE_1 def_grass_wildmons ROUTE_1
@ -763,57 +763,57 @@ KantoGrassWildMons:
def_grass_wildmons ROUTE_26 def_grass_wildmons ROUTE_26
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 48, DODUO dbw 39, SANDSLASH
dbw 48, SANDSLASH dbw 39, BALUMBA
dbw 52, PONYTA dbw 42, PONYTA
dbw 50, RATICATE dbw 41, BALUMBA
dbw 50, DODUO dbw 40, DODRIO
dbw 50, ARBOK dbw 41, ARBOK
dbw 50, ARBOK dbw 42, ARBOK
; day ; day
dbw 48, DODUO dbw 39, SANDSLASH
dbw 48, SANDSLASH dbw 39, BALUMBA
dbw 52, PONYTA dbw 42, PONYTA
dbw 50, RATICATE dbw 41, BALUMBA
dbw 50, DODUO dbw 40, DODRIO
dbw 50, ARBOK dbw 41, ARBOK
dbw 50, ARBOK dbw 42, ARBOK
; nite ; nite
dbw 48, NOCTOWL dbw 39, NOCTOWL
dbw 48, RATICATE dbw 39, BALUMBA
dbw 52, NOCTOWL dbw 41, NOCTOWL
dbw 50, RATICATE dbw 40, RATICATE
dbw 50, QUAGSIRE dbw 41, QUAGSIRE
dbw 50, QUAGSIRE dbw 41, MAROWAK
dbw 50, QUAGSIRE dbw 42, MAROWAK
end_grass_wildmons end_grass_wildmons
def_grass_wildmons ROUTE_27 def_grass_wildmons ROUTE_27
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 48, DODUO dbw 38, DODUO
dbw 48, ARBOK dbw 38, ARBOK
dbw 50, RATICATE dbw 40, FURRET
dbw 50, DODUO dbw 40, DODUO
dbw 52, PONYTA dbw 41, PONYTA
dbw 50, DODRIO dbw 40, DODRIO
dbw 50, DODRIO dbw 41, DODRIO
; day ; day
dbw 48, DODUO dbw 38, DODUO
dbw 48, ARBOK dbw 38, ARBOK
dbw 50, RATICATE dbw 40, FURRET
dbw 50, DODUO dbw 40, DODUO
dbw 52, PONYTA dbw 41, PONYTA
dbw 50, DODRIO dbw 40, DODRIO
dbw 50, DODRIO dbw 41, DODRIO
; nite ; nite
dbw 48, QUAGSIRE dbw 38, CUBONE
dbw 48, NOCTOWL dbw 38, NOCTOWL
dbw 50, RATICATE dbw 40, RATICATE
dbw 50, QUAGSIRE dbw 40, QUAGSIRE
dbw 52, NOCTOWL dbw 41, NOCTOWL
dbw 52, NOCTOWL dbw 40, MAROWAK
dbw 52, NOCTOWL dbw 41, MAROWAK
end_grass_wildmons end_grass_wildmons
def_grass_wildmons ROUTE_28 def_grass_wildmons ROUTE_28

18
data/wild/kanto_water.asm
View file

@ -4,9 +4,9 @@ KantoWaterWildMons:
def_water_wildmons TOHJO_FALLS def_water_wildmons TOHJO_FALLS
db 4 percent ; encounter rate db 4 percent ; encounter rate
dbw 20, GOLDEEN dbw 35, MAGIKARP
dbw 20, SLOWPOKE dbw 30, MANTINE
dbw 20, SEAKING dbw 30, SEAKING
end_water_wildmons end_water_wildmons
def_water_wildmons VERMILION_PORT def_water_wildmons VERMILION_PORT
@ -102,16 +102,16 @@ KantoWaterWildMons:
def_water_wildmons ROUTE_26 def_water_wildmons ROUTE_26
db 6 percent ; encounter rate db 6 percent ; encounter rate
dbw 30, TENTACOOL dbw 30, BLOTTLE
dbw 25, TENTACOOL dbw 35, PENDRAKEN
dbw 30, TENTACRUEL dbw 35, TENTACRUEL
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_27 def_water_wildmons ROUTE_27
db 6 percent ; encounter rate db 6 percent ; encounter rate
dbw 20, TENTACOOL dbw 30, BLOTTLE
dbw 15, TENTACOOL dbw 35, PENDRAKEN
dbw 20, TENTACRUEL dbw 35, TENTACRUEL
end_water_wildmons end_water_wildmons
def_water_wildmons ROUTE_28 def_water_wildmons ROUTE_28

35
engine/pokemon/move_mon.asm
View file

@ -87,6 +87,10 @@ GeneratePartyMonStats:
ld e, l ld e, l
ld d, h ld d, h
push hl push hl
; DE = wPartyMon Struct to fill
; HL = wPartyMon Struct to fill
; Stack:
; > wPartyMon Struct to fill
; Initialize the species ; Initialize the species
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
@ -95,6 +99,7 @@ GeneratePartyMonStats:
ld a, [wBaseSpecies] ld a, [wBaseSpecies]
ld [de], a ld [de], a
inc de inc de
; DE = wPartyMonXItem
; Copy the item if it's a wild mon ; Copy the item if it's a wild mon
ld a, [wBattleMode] ld a, [wBattleMode]
@ -105,9 +110,13 @@ GeneratePartyMonStats:
.skipitem .skipitem
ld [de], a ld [de], a
inc de inc de
; DE = wPartyMonXMoves
; Copy the moves if it's a wild mon ; Copy the moves if it's a wild mon
push de push de
; Stack:
; > wPartyMonX
; > wPartyMonXMoves
ld h, d ld h, d
ld l, e ld l, e
ld a, [wBattleMode] ld a, [wBattleMode]
@ -128,7 +137,7 @@ endr
.randomlygeneratemoves .randomlygeneratemoves
xor a xor a
rept NUM_MOVES - 1 rept NUM_MOVES
ld [hli], a ld [hli], a
endr endr
ld [hl], a ld [hl], a
@ -137,9 +146,11 @@ endr
.next .next
pop de pop de
; DE = wPartyMonXMoves
rept NUM_MOVES rept NUM_MOVES
inc de inc de
endr endr
; DE = wPartyMonXID
; Initialize ID. ; Initialize ID.
ld a, [wPlayerID] ld a, [wPlayerID]
@ -148,6 +159,7 @@ endr
ld a, [wPlayerID + 1] ld a, [wPlayerID + 1]
ld [de], a ld [de], a
inc de inc de
; DE = wPartyMonXExp
; Initialize Exp. ; Initialize Exp.
push de push de
@ -212,6 +224,8 @@ endr
ld [de], a ld [de], a
; Set Shininess for New Dex Entry ; Set Shininess for New Dex Entry
push hl
push de
dec de dec de
ld b, d ld b, d
ld c, e ld c, e
@ -224,18 +238,19 @@ endr
inc a inc a
.shinycont .shinycont
ld [wPokedexShinyToggle], a ld [wPokedexShinyToggle], a
; Unclobber de pop de
inc de pop hl
inc de inc de ; now at wPartyMonXPP
; Initialize PP. ; Initialize PP.
.PPBugDebug
push hl push hl
push de push de
inc hl inc hl
inc hl inc hl ; now at wPartyMonXMoves
call FillPP call FillPP
pop de pop de
pop hl pop hl ; now at wPartyMonX
rept NUM_MOVES rept NUM_MOVES
inc de inc de
endr endr
@ -270,8 +285,10 @@ endr
inc de inc de
; Initialize HP. ; Initialize HP.
.HPBugDebug
ld bc, MON_STAT_EXP - 1 ld bc, MON_STAT_EXP - 1
add hl, bc ;ld bc, 11
add hl, bc ; now wPartyMonXHPExp
ld a, 1 ld a, 1
ld c, a ld c, a
ld b, FALSE ld b, FALSE
@ -391,11 +408,13 @@ endr
ret ret
FillPP: FillPP:
; HL = Mon Moves
; DE = Mon PP
push bc push bc
ld b, NUM_MOVES ld b, NUM_MOVES
.loop .loop
ld a, [hli] ld a, [hli]
and a and a ; test if A == 0 without changing A
jr z, .next jr z, .next
push hl push hl
push de push de

BIN
gfx/footprints/deoxys.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

BIN
gfx/footprints/evolotto.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

2
gfx/footprints_johto.asm
View file

@ -176,6 +176,7 @@ INCBIN "gfx/footprints/inoshika.1bpp"
INCBIN "gfx/footprints/ruddernaut.1bpp" INCBIN "gfx/footprints/ruddernaut.1bpp"
INCBIN "gfx/footprints/pixytop.1bpp" INCBIN "gfx/footprints/pixytop.1bpp"
INCBIN "gfx/footprints/mawtle.1bpp" INCBIN "gfx/footprints/mawtle.1bpp"
INCBIN "gfx/footprints/evolotto.1bpp"
INCBIN "gfx/footprints/xylodon.1bpp" INCBIN "gfx/footprints/xylodon.1bpp"
INCBIN "gfx/footprints/xylofin.1bpp" INCBIN "gfx/footprints/xylofin.1bpp"
INCBIN "gfx/footprints/dokuroar.1bpp" INCBIN "gfx/footprints/dokuroar.1bpp"
@ -201,6 +202,7 @@ INCBIN "gfx/footprints/ho_oh.1bpp"
INCBIN "gfx/footprints/hyoshu_yang.1bpp" INCBIN "gfx/footprints/hyoshu_yang.1bpp"
INCBIN "gfx/footprints/hyoshu_yin.1bpp" INCBIN "gfx/footprints/hyoshu_yin.1bpp"
INCBIN "gfx/footprints/celebi.1bpp" INCBIN "gfx/footprints/celebi.1bpp"
INCBIN "gfx/footprints/deoxys.1bpp"
INCBIN "gfx/footprints/252.1bpp" INCBIN "gfx/footprints/252.1bpp"
INCBIN "gfx/footprints/253.1bpp" INCBIN "gfx/footprints/253.1bpp"
INCBIN "gfx/footprints/254.1bpp" INCBIN "gfx/footprints/254.1bpp"

38
gfx/pics.asm
View file

@ -880,22 +880,6 @@ ToedscruelFrontpic: INCBIN "gfx/pokemon/toedscruel/front.animated.2bpp.lz"
ToedscruelBackpic: INCBIN "gfx/pokemon/toedscruel/back.2bpp.lz" ToedscruelBackpic: INCBIN "gfx/pokemon/toedscruel/back.2bpp.lz"
BlottleFrontpic: INCBIN "gfx/pokemon/blottle/front.animated.2bpp.lz" BlottleFrontpic: INCBIN "gfx/pokemon/blottle/front.animated.2bpp.lz"
BlottleBackpic: INCBIN "gfx/pokemon/blottle/back.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 SECTION "Pics 23", ROMX
@ -1123,10 +1107,30 @@ PixytopFrontpic: INCBIN "gfx/pokemon/pixytop/front.animated.2bpp.lz"
PixytopBackpic: INCBIN "gfx/pokemon/pixytop/back.2bpp.lz" PixytopBackpic: INCBIN "gfx/pokemon/pixytop/back.2bpp.lz"
MawtleFrontpic: INCBIN "gfx/pokemon/mawtle/front.animated.2bpp.lz" MawtleFrontpic: INCBIN "gfx/pokemon/mawtle/front.animated.2bpp.lz"
MawtleBackpic: INCBIN "gfx/pokemon/mawtle/back.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" AlphalithFrontpic: INCBIN "gfx/pokemon/alphalith/front.animated.2bpp.lz"
AlphalithBackpic: INCBIN "gfx/pokemon/alphalith/back.2bpp.lz" AlphalithBackpic: INCBIN "gfx/pokemon/alphalith/back.2bpp.lz"
SECTION "Pics 29", ROMX
PendrakenFrontpic: INCBIN "gfx/pokemon/pendraken/front.animated.2bpp.lz"
PendrakenBackpic: INCBIN "gfx/pokemon/pendraken/back.2bpp.lz"
KoltaFrontpic: INCBIN "gfx/pokemon/kolta/front.animated.2bpp.lz"
KoltaBackpic: INCBIN "gfx/pokemon/kolta/back.2bpp.lz"
BalumbaFrontpic: INCBIN "gfx/pokemon/balumba/front.animated.2bpp.lz"
BalumbaBackpic: INCBIN "gfx/pokemon/balumba/back.2bpp.lz"
MagnetiteFrontpic: INCBIN "gfx/pokemon/magnetite/front.animated.2bpp.lz"
MagnetiteBackpic: INCBIN "gfx/pokemon/magnetite/back.2bpp.lz"
MagnezoneFrontpic: INCBIN "gfx/pokemon/magnezone/front.animated.2bpp.lz"
MagnezoneBackpic: INCBIN "gfx/pokemon/magnezone/back.2bpp.lz"
GavillainFrontpic: INCBIN "gfx/pokemon/gavillain/front.animated.2bpp.lz"
GavillainBackpic: INCBIN "gfx/pokemon/gavillain/back.2bpp.lz"
BuuFrontpic: INCBIN "gfx/pokemon/buu/front.animated.2bpp.lz"
BuuBackpic: INCBIN "gfx/pokemon/buu/back.2bpp.lz"
GrenmarFrontpic: INCBIN "gfx/pokemon/grenmar/front.animated.2bpp.lz"
GrenmarBackpic: INCBIN "gfx/pokemon/grenmar/back.2bpp.lz"
DeoxysFrontpic: INCBIN "gfx/pokemon/deoxys/front.animated.2bpp.lz"
DeoxysBackpic: INCBIN "gfx/pokemon/deoxys/back.2bpp.lz"
; spillover ; spillover
KabutopsFossilPic: INCBIN "gfx/trainers/kabutops.2bpp.lz" KabutopsFossilPic: INCBIN "gfx/trainers/kabutops.2bpp.lz"
AerodactylFossilPic: INCBIN "gfx/trainers/aerodactyl.2bpp.lz" AerodactylFossilPic: INCBIN "gfx/trainers/aerodactyl.2bpp.lz"

2
gfx/pokemon/anim_pointers.asm
View file

@ -402,6 +402,7 @@ AnimationPointers:
dw RuddernautAnimation dw RuddernautAnimation
dw PixytopAnimation dw PixytopAnimation
dw MawtleAnimation dw MawtleAnimation
dw EvolottoAnimation
dw XylodonAnimation dw XylodonAnimation
dw XylofinAnimation dw XylofinAnimation
dw DokuroarAnimation dw DokuroarAnimation
@ -427,4 +428,5 @@ AnimationPointers:
dw HyoshuYangAnimation dw HyoshuYangAnimation
dw HyoshuYinAnimation dw HyoshuYinAnimation
dw CelebiAnimation dw CelebiAnimation
dw DeoxysAnimation
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

2
gfx/pokemon/anims.asm
View file

@ -400,6 +400,7 @@ InoshikaAnimation: INCLUDE "gfx/pokemon/inoshika/anim.asm"
RuddernautAnimation: INCLUDE "gfx/pokemon/ruddernaut/anim.asm" RuddernautAnimation: INCLUDE "gfx/pokemon/ruddernaut/anim.asm"
PixytopAnimation: INCLUDE "gfx/pokemon/pixytop/anim.asm" PixytopAnimation: INCLUDE "gfx/pokemon/pixytop/anim.asm"
MawtleAnimation: INCLUDE "gfx/pokemon/mawtle/anim.asm" MawtleAnimation: INCLUDE "gfx/pokemon/mawtle/anim.asm"
EvolottoAnimation: INCLUDE "gfx/pokemon/evolotto/anim.asm"
XylodonAnimation: INCLUDE "gfx/pokemon/xylodon/anim.asm" XylodonAnimation: INCLUDE "gfx/pokemon/xylodon/anim.asm"
XylofinAnimation: INCLUDE "gfx/pokemon/xylofin/anim.asm" XylofinAnimation: INCLUDE "gfx/pokemon/xylofin/anim.asm"
DokuroarAnimation: INCLUDE "gfx/pokemon/dokuroar/anim.asm" DokuroarAnimation: INCLUDE "gfx/pokemon/dokuroar/anim.asm"
@ -426,4 +427,5 @@ HoOhAnimation: INCLUDE "gfx/pokemon/ho_oh/anim.asm"
HyoshuYangAnimation: INCLUDE "gfx/pokemon/hyoshu_yang/anim.asm" HyoshuYangAnimation: INCLUDE "gfx/pokemon/hyoshu_yang/anim.asm"
HyoshuYinAnimation: INCLUDE "gfx/pokemon/hyoshu_yin/anim.asm" HyoshuYinAnimation: INCLUDE "gfx/pokemon/hyoshu_yin/anim.asm"
CelebiAnimation: INCLUDE "gfx/pokemon/celebi/anim.asm" CelebiAnimation: INCLUDE "gfx/pokemon/celebi/anim.asm"
DeoxysAnimation: INCLUDE "gfx/pokemon/deoxys/anim.asm"
EggAnimation: INCLUDE "gfx/pokemon/egg/anim.asm" EggAnimation: INCLUDE "gfx/pokemon/egg/anim.asm"

2
gfx/pokemon/bitmask_pointers.asm
View file

@ -402,6 +402,7 @@ BitmasksPointers:
dw RuddernautBitmasks dw RuddernautBitmasks
dw PixytopBitmasks dw PixytopBitmasks
dw MawtleBitmasks dw MawtleBitmasks
dw EvolottoBitmasks
dw XylodonBitmasks dw XylodonBitmasks
dw XylofinBitmasks dw XylofinBitmasks
dw DokuroarBitmasks dw DokuroarBitmasks
@ -428,4 +429,5 @@ BitmasksPointers:
dw HyoshuYangBitmasks dw HyoshuYangBitmasks
dw HyoshuYinBitmasks dw HyoshuYinBitmasks
dw CelebiBitmasks dw CelebiBitmasks
dw DeoxysBitmasks
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

2
gfx/pokemon/bitmasks.asm
View file

@ -400,6 +400,7 @@ InoshikaBitmasks: INCLUDE "gfx/pokemon/inoshika/bitmask.asm"
RuddernautBitmasks: INCLUDE "gfx/pokemon/ruddernaut/bitmask.asm" RuddernautBitmasks: INCLUDE "gfx/pokemon/ruddernaut/bitmask.asm"
PixytopBitmasks: INCLUDE "gfx/pokemon/pixytop/bitmask.asm" PixytopBitmasks: INCLUDE "gfx/pokemon/pixytop/bitmask.asm"
MawtleBitmasks: INCLUDE "gfx/pokemon/mawtle/bitmask.asm" MawtleBitmasks: INCLUDE "gfx/pokemon/mawtle/bitmask.asm"
EvolottoBitmasks: INCLUDE "gfx/pokemon/evolotto/bitmask.asm"
XylodonBitmasks: INCLUDE "gfx/pokemon/xylodon/bitmask.asm" XylodonBitmasks: INCLUDE "gfx/pokemon/xylodon/bitmask.asm"
XylofinBitmasks: INCLUDE "gfx/pokemon/xylofin/bitmask.asm" XylofinBitmasks: INCLUDE "gfx/pokemon/xylofin/bitmask.asm"
DokuroarBitmasks: INCLUDE "gfx/pokemon/dokuroar/bitmask.asm" DokuroarBitmasks: INCLUDE "gfx/pokemon/dokuroar/bitmask.asm"
@ -426,4 +427,5 @@ HoOhBitmasks: INCLUDE "gfx/pokemon/ho_oh/bitmask.asm"
HyoshuYangBitmasks: INCLUDE "gfx/pokemon/hyoshu_yang/bitmask.asm" HyoshuYangBitmasks: INCLUDE "gfx/pokemon/hyoshu_yang/bitmask.asm"
HyoshuYinBitmasks: INCLUDE "gfx/pokemon/hyoshu_yin/bitmask.asm" HyoshuYinBitmasks: INCLUDE "gfx/pokemon/hyoshu_yin/bitmask.asm"
CelebiBitmasks: INCLUDE "gfx/pokemon/celebi/bitmask.asm" CelebiBitmasks: INCLUDE "gfx/pokemon/celebi/bitmask.asm"
DeoxysBitmasks: INCLUDE "gfx/pokemon/deoxys/bitmask.asm"
EggBitmasks: INCLUDE "gfx/pokemon/egg/bitmask.asm" EggBitmasks: INCLUDE "gfx/pokemon/egg/bitmask.asm"

12
gfx/pokemon/deoxys/anim.asm Normal file
View file

@ -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

5
gfx/pokemon/deoxys/anim_idle.asm Normal file
View file

@ -0,0 +1,5 @@
frame 1, 06
frame 2, 06
frame 1, 06
frame 2, 06
endanim

BIN
gfx/pokemon/deoxys/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 501 B

BIN
gfx/pokemon/deoxys/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

13
gfx/pokemon/deoxys/shiny.pal Normal file
View file

@ -0,0 +1,13 @@
RGB 08, 25, 11
RGB 31, 26, 07

1
gfx/pokemon/evolotto/anim.asm Normal file
View file

@ -0,0 +1 @@
endanim

1
gfx/pokemon/evolotto/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/evolotto/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

BIN
gfx/pokemon/evolotto/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

2
gfx/pokemon/evolotto/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 22, 22, 12
RGB 07, 15, 25

2
gfx/pokemon/frame_pointers.asm
View file

@ -402,6 +402,7 @@ FramesPointers:
dba RuddernautFrames dba RuddernautFrames
dba PixytopFrames dba PixytopFrames
dba MawtleFrames dba MawtleFrames
dba EvolottoFrames
dba XylodonFrames dba XylodonFrames
dba XylofinFrames dba XylofinFrames
dba DokuroarFrames dba DokuroarFrames
@ -428,4 +429,5 @@ FramesPointers:
dba HyoshuYangFrames dba HyoshuYangFrames
dba HyoshuYinFrames dba HyoshuYinFrames
dba CelebiFrames dba CelebiFrames
dba DeoxysFrames
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

BIN
gfx/pokemon/gorochu/front.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 633 B

Before After
Before After

4
gfx/pokemon/gorochu/shiny.pal
View file

@ -1,2 +1,2 @@
RGB 22, 22, 12 RGB 21, 16, 14
RGB 07, 15, 25 RGB 21, 04, 06

2
gfx/pokemon/idle_pointers.asm
View file

@ -402,6 +402,7 @@ AnimationIdlePointers:
dw RuddernautAnimationIdle dw RuddernautAnimationIdle
dw PixytopAnimationIdle dw PixytopAnimationIdle
dw MawtleAnimationIdle dw MawtleAnimationIdle
dw EvolottoAnimationIdle
dw XylodonAnimationIdle dw XylodonAnimationIdle
dw XylofinAnimationIdle dw XylofinAnimationIdle
dw DokuroarAnimationIdle dw DokuroarAnimationIdle
@ -427,4 +428,5 @@ AnimationIdlePointers:
dw HyoshuYangAnimationIdle dw HyoshuYangAnimationIdle
dw HyoshuYinAnimationIdle dw HyoshuYinAnimationIdle
dw CelebiAnimationIdle dw CelebiAnimationIdle
dw DeoxysAnimationIdle
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

2
gfx/pokemon/idles.asm
View file

@ -400,6 +400,7 @@ InoshikaAnimationIdle: INCLUDE "gfx/pokemon/inoshika/anim_idle.asm"
RuddernautAnimationIdle: INCLUDE "gfx/pokemon/ruddernaut/anim_idle.asm" RuddernautAnimationIdle: INCLUDE "gfx/pokemon/ruddernaut/anim_idle.asm"
PixytopAnimationIdle: INCLUDE "gfx/pokemon/pixytop/anim_idle.asm" PixytopAnimationIdle: INCLUDE "gfx/pokemon/pixytop/anim_idle.asm"
MawtleAnimationIdle: INCLUDE "gfx/pokemon/mawtle/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" XylodonAnimationIdle: INCLUDE "gfx/pokemon/xylodon/anim_idle.asm"
XylofinAnimationIdle: INCLUDE "gfx/pokemon/xylofin/anim_idle.asm" XylofinAnimationIdle: INCLUDE "gfx/pokemon/xylofin/anim_idle.asm"
DokuroarAnimationIdle: INCLUDE "gfx/pokemon/dokuroar/anim_idle.asm" DokuroarAnimationIdle: INCLUDE "gfx/pokemon/dokuroar/anim_idle.asm"
@ -426,4 +427,5 @@ HoOhAnimationIdle: INCLUDE "gfx/pokemon/ho_oh/anim_idle.asm"
HyoshuYangAnimationIdle: INCLUDE "gfx/pokemon/hyoshu_yang/anim_idle.asm" HyoshuYangAnimationIdle: INCLUDE "gfx/pokemon/hyoshu_yang/anim_idle.asm"
HyoshuYinAnimationIdle: INCLUDE "gfx/pokemon/hyoshu_yin/anim_idle.asm" HyoshuYinAnimationIdle: INCLUDE "gfx/pokemon/hyoshu_yin/anim_idle.asm"
CelebiAnimationIdle: INCLUDE "gfx/pokemon/celebi/anim_idle.asm" CelebiAnimationIdle: INCLUDE "gfx/pokemon/celebi/anim_idle.asm"
DeoxysAnimationIdle: INCLUDE "gfx/pokemon/deoxys/anim_idle.asm"
EggAnimationIdle: INCLUDE "gfx/pokemon/egg/anim_idle.asm" EggAnimationIdle: INCLUDE "gfx/pokemon/egg/anim_idle.asm"

2
gfx/pokemon/johto_frames.asm
View file

@ -176,6 +176,7 @@ InoshikaFrames: INCLUDE "gfx/pokemon/inoshika/frames.asm"
RuddernautFrames: INCLUDE "gfx/pokemon/ruddernaut/frames.asm" RuddernautFrames: INCLUDE "gfx/pokemon/ruddernaut/frames.asm"
PixytopFrames: INCLUDE "gfx/pokemon/pixytop/frames.asm" PixytopFrames: INCLUDE "gfx/pokemon/pixytop/frames.asm"
MawtleFrames: INCLUDE "gfx/pokemon/mawtle/frames.asm" MawtleFrames: INCLUDE "gfx/pokemon/mawtle/frames.asm"
EvolottoFrames: INCLUDE "gfx/pokemon/evolotto/frames.asm"
XylodonFrames: INCLUDE "gfx/pokemon/xylodon/frames.asm" XylodonFrames: INCLUDE "gfx/pokemon/xylodon/frames.asm"
XylofinFrames: INCLUDE "gfx/pokemon/xylofin/frames.asm" XylofinFrames: INCLUDE "gfx/pokemon/xylofin/frames.asm"
DokuroarFrames: INCLUDE "gfx/pokemon/dokuroar/frames.asm" DokuroarFrames: INCLUDE "gfx/pokemon/dokuroar/frames.asm"
@ -202,4 +203,5 @@ HoOhFrames: INCLUDE "gfx/pokemon/ho_oh/frames.asm"
HyoshuYangFrames: INCLUDE "gfx/pokemon/hyoshu_yang/frames.asm" HyoshuYangFrames: INCLUDE "gfx/pokemon/hyoshu_yang/frames.asm"
HyoshuYinFrames: INCLUDE "gfx/pokemon/hyoshu_yin/frames.asm" HyoshuYinFrames: INCLUDE "gfx/pokemon/hyoshu_yin/frames.asm"
CelebiFrames: INCLUDE "gfx/pokemon/celebi/frames.asm" CelebiFrames: INCLUDE "gfx/pokemon/celebi/frames.asm"
DeoxysFrames: INCLUDE "gfx/pokemon/deoxys/frames.asm"
EggFrames: INCLUDE "gfx/pokemon/egg/frames.asm" EggFrames: INCLUDE "gfx/pokemon/egg/frames.asm"

4
gfx/pokemon/nidoqueen/shiny.pal
View file

@ -1,4 +1,4 @@
RGB 31, 16, 31 RGB 26, 27, 17
RGB 11, 13, 08 RGB 28, 09, 24

BIN
gfx/pokemon/pendraken/front.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 784 B

Before After
Before After

3
layout.link
View file

@ -63,7 +63,6 @@ ROMX $0d
"Effect Commands" "Effect Commands"
ROMX $0e ROMX $0e
"Enemy Trainers" "Enemy Trainers"
"Enemy Trainer Parties 2"
ROMX $0f ROMX $0f
"Battle Core" "Battle Core"
ROMX $10 ROMX $10
@ -319,6 +318,8 @@ ROMX $80
"Pic Pointers" "Pic Pointers"
ROMX $81 ROMX $81
"Enemy Trainer Parties 4" "Enemy Trainer Parties 4"
ROMX $82
"Enemy Trainer Parties 2" ; moved up here, hope this doesn't break things
WRAM0 WRAM0
"Stack" "Stack"
"Audio RAM" "Audio RAM"

18
maps/DebugRoom.asm
View file

@ -8,23 +8,23 @@ DebugRoom_MapScripts:
DebugPokemon1Script: DebugPokemon1Script:
opentext opentext
getmonname STRING_BUFFER_3, WARFURS getmonname STRING_BUFFER_3, WEARLYCAN
writetext ReceivedDebugPokemonText writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON playsound SFX_CAUGHT_MON
waitsfx waitsfx
promptbutton promptbutton
givepoke WARFURS, 23, RARE_CANDY givepoke WEARLYCAN, 53, MASTER_BALL
closetext closetext
end end
DebugPokemon2Script: DebugPokemon2Script:
opentext opentext
getmonname STRING_BUFFER_3, FOLAGE getmonname STRING_BUFFER_3, EVOLOTTO
writetext ReceivedDebugPokemonText writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON playsound SFX_CAUGHT_MON
waitsfx waitsfx
promptbutton promptbutton
givepoke FOLAGE, 31, RARE_CANDY givepoke EVOLOTTO, 31, RARE_CANDY
closetext closetext
end end
@ -39,11 +39,11 @@ DebugPokemon3Script:
faceplayer faceplayer
opentext opentext
writetext DebugTextA writetext DebugTextA
cry BELLSPROUT cry DEOXYS
pause 15 pause 15
closetext closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_INVERSE loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY
loadwildmon BELLSPROUT, 10 loadwildmon DEOXYS, 5
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
end end
@ -56,11 +56,11 @@ DebugPokemon4Script:
faceplayer faceplayer
opentext opentext
writetext DebugTextB writetext DebugTextB
cry KLEAVOR cry GOROCHU
pause 15 pause 15
closetext closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE
loadwildmon KLEAVOR, 10 loadwildmon DEOXYS, 70
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
end end