Skip to content

Commit

Permalink
Add hatch constants
Browse files Browse the repository at this point in the history
  • Loading branch information
@etdv-thevoid
etdv-thevoid committed May 10, 2024
1 parent 4432df0 commit 892d0af
Show file tree
Hide file tree
Showing 253 changed files with 278 additions and 265 deletions.
13 changes: 13 additions & 0 deletions constants/pokemon_data_constants.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,19 @@ DEF GENDER_F75 EQU 75 percent
DEF GENDER_F100 EQU 100 percent - 1
DEF GENDER_UNKNOWN EQU -1

; wBaseEggSteps values
const_def 5, 5
const HATCH_FASTEST ; 5
const HATCH_FASTER ; 10
const HATCH_FAST ; 15
const HATCH_MEDIUM ; 20
const HATCH_SLOW ; 25
const HATCH_SLOWER ; 30
const HATCH_SLOWEST ; 35
DEF HATCH_LEGENDARY1 EQU 80
DEF HATCH_LEGENDARY2 EQU 120
DEF NUM_HATCH_RATES EQU (const_value / const_inc) + 2

; wBaseGrowthRate values
; GrowthRates indexes (see data/growth_rates.asm)
const_def
Expand Down
28 changes: 14 additions & 14 deletions data/events/odd_eggs.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ OddEggs:
bigdw 0
dn 0, 0, 0, 0 ; DVs
db 30, 20, 10, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -75,7 +75,7 @@ OddEggs:
bigdw 0
dn 2, 10, 10, 10 ; DVs
db 30, 20, 10, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -101,7 +101,7 @@ OddEggs:
bigdw 0
dn 0, 0, 0, 0 ; DVs
db 35, 20, 10, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -127,7 +127,7 @@ OddEggs:
bigdw 0
dn 2, 10, 10, 10 ; DVs
db 35, 20, 10, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -153,7 +153,7 @@ OddEggs:
bigdw 0
dn 0, 0, 0, 0 ; DVs
db 15, 20, 10, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -179,7 +179,7 @@ OddEggs:
bigdw 0
dn 2, 10, 10, 10 ; DVs
db 15, 20, 10, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -205,7 +205,7 @@ OddEggs:
bigdw 0
dn 0, 0, 0, 0 ; DVs
db 35, 30, 10, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -231,7 +231,7 @@ OddEggs:
bigdw 0
dn 2, 10, 10, 10 ; DVs
db 35, 30, 10, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -257,7 +257,7 @@ OddEggs:
bigdw 0
dn 0, 0, 0, 0 ; DVs
db 25, 10, 0, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -283,7 +283,7 @@ OddEggs:
bigdw 0
dn 2, 10, 10, 10 ; DVs
db 25, 10, 0, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -309,7 +309,7 @@ OddEggs:
bigdw 0
dn 0, 0, 0, 0 ; DVs
db 30, 30, 10, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -335,7 +335,7 @@ OddEggs:
bigdw 0
dn 2, 10, 10, 10 ; DVs
db 30, 30, 10, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -361,7 +361,7 @@ OddEggs:
bigdw 0
dn 0, 0, 0, 0 ; DVs
db 35, 10, 0, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand All @@ -387,7 +387,7 @@ OddEggs:
bigdw 0
dn 2, 10, 10, 10 ; DVs
db 35, 10, 0, 0 ; PP
db 20 ; Step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 0, 0, 0 ; Pokerus, Caught data
db 5 ; Level
db 0, 0 ; Status
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/abra.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F25 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/abra/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/aerodactyl.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 35 ; step cycles to hatch
db HATCH_SLOWEST ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/aerodactyl/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/aipom.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/aipom/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/alakazam.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F25 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/alakazam/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/ampharos.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/ampharos/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/arbok.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/arbok/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/arcanine.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db BURNT_BERRY, BURNT_BERRY ; items
db GENDER_F25 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/arcanine/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/ariados.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 15 ; step cycles to hatch
db HATCH_FAST ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/ariados/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/articuno.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_UNKNOWN ; gender ratio
db 100 ; unknown 1
db 80 ; step cycles to hatch
db HATCH_LEGENDARY1 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/articuno/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/azumarill.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/azumarill/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/bayleef.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/bayleef/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/beedrill.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, POISON_BARB ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 15 ; step cycles to hatch
db HATCH_FAST ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/beedrill/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/bellossom.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/bellossom/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/bellsprout.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/bellsprout/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/blastoise.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/blastoise/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/blissey.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, LUCKY_EGG ; items
db GENDER_F100 ; gender ratio
db 100 ; unknown 1
db 40 ; step cycles to hatch
db HATCH_SLOWEST ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/blissey/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/bulbasaur.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/bulbasaur/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/butterfree.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, SILVERPOWDER ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 15 ; step cycles to hatch
db HATCH_FAST ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/butterfree/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/caterpie.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 15 ; step cycles to hatch
db HATCH_FAST ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/caterpie/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/celebi.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, MIRACLEBERRY ; items
db GENDER_UNKNOWN ; gender ratio
db 100 ; unknown 1
db 120 ; step cycles to hatch
db HATCH_LEGENDARY2 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/celebi/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/chansey.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, LUCKY_EGG ; items
db GENDER_F100 ; gender ratio
db 100 ; unknown 1
db 40 ; step cycles to hatch
db HATCH_SLOWEST ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/chansey/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/charizard.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/charizard/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/charmander.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/charmander/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/charmeleon.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/charmeleon/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/chikorita.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/chikorita/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/chinchou.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db HATCH_MEDIUM ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/chinchou/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/clefable.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db MYSTERYBERRY, MOON_STONE ; items
db GENDER_F75 ; gender ratio
db 100 ; unknown 1
db 10 ; step cycles to hatch
db HATCH_FASTER ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/clefable/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/clefairy.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
db MYSTERYBERRY, MOON_STONE ; items
db GENDER_F75 ; gender ratio
db 100 ; unknown 1
db 10 ; step cycles to hatch
db HATCH_FASTER ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/clefairy/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down

0 comments on commit 892d0af

Please sign in to comment.