Skip to content

Commit

Permalink
Merge pull request #178 from suloku/master
Browse files Browse the repository at this point in the history 
Corrected bugs, breeding and completable dex
  • Loading branch information
@PiaCarrot
PiaCarrot authored Apr 30, 2024
2 parents f549b44 + 1ca0278 commit b2b8c74
Show file tree
Hide file tree
Showing 47 changed files with 606 additions and 131 deletions.
2 changes: 1 addition & 1 deletion constants/map_constants.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ const_value = -1
const SPAWN_ASCORBIA
const SPAWN_KUMQUAT
const SPAWN_PUMMELO
const SPAWN_HAMLIN
const SPAWN_TARROCO
const SPAWN_SHAMOUTI
const SPAWN_VERMILION
NUM_SPAWNS EQU const_value
Expand Down
4 changes: 2 additions & 2 deletions data/base_stats/electabuzz.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

db ELECTRIC, ELECTRIC
db 45 ; catch rate
db NO_ITEM ; item 1
db NO_ITEM ; item 2
db ELECTIRIZER ; item 1
db ELECTIRIZER ; item 2
db FEMALE_25 ; gender
db 25 ; step cycles to hatch
dn 6, 6 ; frontpic dimensions
Expand Down
4 changes: 2 additions & 2 deletions data/base_stats/elekid.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

db ELECTRIC, ELECTRIC
db 45 ; catch rate
db NO_ITEM ; item 1
db NO_ITEM ; item 2
db ELECTIRIZER ; item 1
db ELECTIRIZER ; item 2
db FEMALE_25 ; gender
db 25 ; step cycles to hatch
dn 6, 6 ; frontpic dimensions
Expand Down
4 changes: 2 additions & 2 deletions data/base_stats/igglybuff.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

db NORMAL, FAIRY
db 170 ; catch rate
db NO_ITEM ; item 1
db NO_ITEM ; item 2
db MOON_STONE ; item 1
db MOON_STONE ; item 2
db FEMALE_75 ; gender
db 10 ; step cycles to hatch
dn 5, 5 ; frontpic dimensions
Expand Down
4 changes: 2 additions & 2 deletions data/base_stats/jigglypuff.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

db NORMAL, FAIRY
db 170 ; catch rate
db NO_ITEM ; item 1
db NO_ITEM ; item 2
db MOON_STONE ; item 1
db MOON_STONE ; item 2
db FEMALE_75 ; gender
db 10 ; step cycles to hatch
dn 5, 5 ; frontpic dimensions
Expand Down
4 changes: 2 additions & 2 deletions data/base_stats/kangaskhan.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

db NORMAL, NORMAL
db 45 ; catch rate
db NO_ITEM ; item 1
db NO_ITEM ; item 2
db TRADE_STONE ; item 1
db TRADE_STONE ; item 2
db ALL_FEMALE ; gender
db 20 ; step cycles to hatch
dn 7, 7 ; frontpic dimensions
Expand Down
4 changes: 2 additions & 2 deletions data/base_stats/magby.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

db FIRE, FIRE
db 45 ; catch rate
db BURNT_BERRY ; item 1
db BURNT_BERRY ; item 2
db MAGMARIZER ; item 1
db MAGMARIZER ; item 2
db FEMALE_25 ; gender
db 25 ; step cycles to hatch
dn 6, 6 ; frontpic dimensions
Expand Down
4 changes: 2 additions & 2 deletions data/base_stats/magmar.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

db FIRE, FIRE
db 45 ; catch rate
db BURNT_BERRY ; item 1
db BURNT_BERRY ; item 2
db MAGMARIZER ; item 1
db MAGMARIZER ; item 2
db FEMALE_25 ; gender
db 25 ; step cycles to hatch
dn 6, 6 ; frontpic dimensions
Expand Down
4 changes: 2 additions & 2 deletions data/base_stats/porygon.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

db NORMAL, NORMAL
db 45 ; catch rate
db NO_ITEM ; item 1
db NO_ITEM ; item 2
db UP_GRADE ; item 1
db DUBIOUS_DISC ; item 2
db GENDERLESS ; gender
db 20 ; step cycles to hatch
dn 6, 6 ; frontpic dimensions
Expand Down
4 changes: 2 additions & 2 deletions data/base_stats/rhydon.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

db GROUND, ROCK
db 60 ; catch rate
db NO_ITEM ; item 1
db NO_ITEM ; item 2
db PROTECTOR ; item 1
db PROTECTOR ; item 2
db FEMALE_50 ; gender
db 20 ; step cycles to hatch
dn 7, 7 ; frontpic dimensions
Expand Down
4 changes: 2 additions & 2 deletions data/base_stats/rhyhorn.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

db GROUND, ROCK
db 120 ; catch rate
db NO_ITEM ; item 1
db NO_ITEM ; item 2
db PROTECTOR ; item 1
db PROTECTOR ; item 2
db FEMALE_50 ; gender
db 20 ; step cycles to hatch
dn 7, 7 ; frontpic dimensions
Expand Down
4 changes: 2 additions & 2 deletions data/base_stats/wigglytuff.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

db NORMAL, FAIRY
db 50 ; catch rate
db NO_ITEM ; item 1
db NO_ITEM ; item 2
db MOON_STONE ; item 1
db MOON_STONE ; item 2
db FEMALE_75 ; gender
db 10 ; step cycles to hatch
dn 6, 6 ; frontpic dimensions
Expand Down
2 changes: 2 additions & 0 deletions data/evos_attacks.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2245,6 +2245,8 @@ EeveeEvosAttacks:
db EVOLVE_ITEM, WATER_STONE, VAPOREON
db EVOLVE_ITEM, FIRE_STONE, FLAREON
db EVOLVE_ITEM, SHINY_STONE, SYLVEON
db EVOLVE_ITEM, LEAF_STONE, LEAFEON
db EVOLVE_ITEM, ICE_STONE, GLACEON
db EVOLVE_HAPPINESS, TR_MORNDAY, ESPEON
db EVOLVE_HAPPINESS, TR_NITE, UMBREON
db EVOLVE_MAP, GROUP_MT_NAVEL_ICE_ROCK, MAP_MT_NAVEL_ICE_ROCK, GLACEON
Expand Down
143 changes: 112 additions & 31 deletions data/wild/johto_grass.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,34 @@
db 23, TRAPINCH
db 24, TRAPINCH
db 24, CUBONE

map SUNRAY_CAVE_MANDARIN_DESERT_1F
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 22, SANDYGAST
db 22, SLUGMA
db 22, MAGNEMITE
db 23, CUBONE
db 23, SLUGMA
db 24, CLEFAIRY
db 24, CLEFABLE
; day
db 22, SANDYGAST
db 22, SLUGMA
db 22, MAGNEMITE
db 23, CUBONE
db 23, SLUGMA
db 24, CLEFAIRY
db 24, CLEFABLE
; nite
db 22, SANDYGAST
db 22, SLUGMA
db 22, MAGNEMITE
db 23, CUBONE
db 23, SLUGMA
db 24, CLEFAIRY
db 24, CLEFABLE

map TROVITOPOLIS_SEWER
db 7 percent, 7 percent, 7 percent
;morn
Expand Down Expand Up @@ -1462,54 +1489,54 @@
db 6 percent, 6 percent, 6 percent
;morn
db 42, ELEKID
db 42, BUTTERFREE
db 42, VOLTORB
db 41, PIKACHU
db 42, ELECTABUZZ
db 42, ELEKID
db 41, ELECTABUZZ
db 41, JOLTEON
db 44, BULBASAUR
;day
db 42, ELEKID
db 42, BUTTERFREE
db 42, VOLTORB
db 42, PIKACHU
db 41, ELECTABUZZ
db 41, ELEKID
db 42, ELECTABUZZ
db 42, JOLTEON
db 44, BULBASAUR
;nite
db 42, ELEKID
db 41, VENOMOTH
db 41, VOLTORB
db 42, PIKACHU
db 41, ELECTABUZZ
db 41, ELEKID
db 42, ELECTABUZZ
db 42, JOLTEON
db 44, BULBASAUR

map FIRE_ISLAND
db 6 percent, 6 percent, 6 percent
;morn
db 42, MAGBY
db 42, BUTTERFREE
db 42, MAGCARGO
db 41, VULPIX
db 42, MAGMAR
db 42, MAGBY
db 41, TURTONATOR
db 42, TURTONATOR
db 41, FLAREON
db 44, CHARMANDER
;day
db 42, MAGBY
db 42, BUTTERFREE
db 42, SLUGMA
db 42, VULPIX
db 41, MAGMAR
db 41, MAGBY
db 42, TURTONATOR
db 41, TURTONATOR
db 42, FLAREON
db 44, CHARMANDER
;nite
db 42, MAGBY
db 41, VENOMOTH
db 41, SLUGMA
db 42, VULPIX
db 41, MAGMAR
db 41, MAGBY
db 42, TURTONATOR
db 41, TURTONATOR
db 42, FLAREON
db 44, CHARMANDER

map ICE_ISLAND
Expand All @@ -1520,23 +1547,23 @@
db 41, SMOOCHUM
db 42, JYNX
db 42, SMOOCHUM
db 41, JYNX
db 41, VAPOREON
db 44, SQUIRTLE
;day
db 42, SMOOCHUM
db 42, SEEL
db 42, SMOOCHUM
db 41, JYNX
db 41, SMOOCHUM
db 42, JYNX
db 42, VAPOREON
db 44, SQUIRTLE
;nite
db 42, SMOOCHUM
db 41, SEEL
db 42, SMOOCHUM
db 41, JYNX
db 41, SMOOCHUM
db 42, JYNX
db 42, VAPOREON
db 44, SQUIRTLE

map SHAMOUTI_CAVE
Expand Down Expand Up @@ -1571,26 +1598,26 @@
;morn
db 42, MACHOP
db 42, TYROGUE
db 41, GOLBAT
db 42, MACHOP
db 42, TYROGUE
db 41, MACHOKE
db 41, TYROGUE
db 42, VOLTORB
db 42, MACHOKE
db 41, ELECTRODE
db 44, MACHAMP
;day
db 42, MACHOP
db 42, TYROGUE
db 41, GOLBAT
db 42, MACHOP
db 42, TYROGUE
db 41, MACHOKE
db 41, TYROGUE
db 42, VOLTORB
db 42, MACHOKE
db 41, ELECTRODE
db 44, MACHAMP
;nite
db 42, MACHOP
db 42, TYROGUE
db 41, GOLBAT
db 42, MACHOP
db 42, TYROGUE
db 41, MACHOKE
db 41, TYROGUE
db 42, VOLTORB
db 42, MACHOKE
db 41, ELECTRODE
db 44, MACHAMP
map AIRSHIP_OUTSIDE
Expand Down Expand Up @@ -1620,4 +1647,58 @@
db 46, PIDGEOTTO
db 48, PIDGEOT

map ROUTE_70
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 46, EEVEE
db 46, TOUCANNON
db 46, TOGETIC
db 46, LYCANROC
db 46, CLEFAIRY
db 46, KANGASKHAN
db 48, ESPEON
; day
db 46, EEVEE
db 46, TOUCANNON
db 46, TOGETIC
db 46, LYCANROC
db 46, CLEFAIRY
db 46, KANGASKHAN
db 48, SYLVEON
; nite
db 46, EEVEE
db 46, TOUCANNON
db 46, TOGETIC
db 46, LYCANROC
db 46, CLEFAIRY
db 46, KANGASKHAN
db 48, UMBREON

map TARROCO_ISLAND
db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
; morn
db 46, EEVEE
db 46, TOUCANNON
db 46, TOGETIC
db 46, LYCANROC
db 46, CLEFAIRY
db 46, KANGASKHAN
db 48, ESPEON
; day
db 46, EEVEE
db 46, TOUCANNON
db 46, TOGETIC
db 46, LYCANROC
db 46, CLEFAIRY
db 46, KANGASKHAN
db 48, SYLVEON
; nite
db 46, EEVEE
db 46, TOUCANNON
db 46, TOGETIC
db 46, LYCANROC
db 46, CLEFAIRY
db 46, KANGASKHAN
db 48, UMBREON

db -1 ; end
5 changes: 5 additions & 0 deletions data/wild/johto_water.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,5 +378,10 @@
db 40, CARVANHA
db 48, WAILORD

map ROUTE_70
db 1 percent
db 40, QWILFISH
db 40, LANTURN
db 48, DEWGONG

db -1 ; end
Loading

0 comments on commit b2b8c74

Please sign in to comment.