Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Hatch_*_STEPS constants #1121

Closed
wants to merge 4 commits into from
Closed

Add Hatch_*_STEPS constants #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
892d0af
Add hatch constants
etdv-thevoid May 10, 2024
324e363
Revert "Add hatch constants"
etdv-thevoid May 10, 2024
02ed2a7
missed a value!
etdv-thevoid May 10, 2024
ba1ca90
Rename constants and clarify intent
etdv-thevoid May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions constants/pokemon_data_constants.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,22 @@ DEF GENDER_F75 EQU 75 percent
DEF GENDER_F100 EQU 100 percent - 1
DEF GENDER_UNKNOWN EQU -1

; wBaseEggSteps values
; Values are the number of step cycles needed to hatch from an egg
; 256 steps = 1 step cycle
const_def 5, 5
const HATCH_1280_STEPS ; 5
const HATCH_2560_STEPS ; 10
const HATCH_3840_STEPS ; 15
const HATCH_5120_STEPS ; 20
const HATCH_6400_STEPS ; 25
const HATCH_7680_STEPS ; 30
const HATCH_8960_STEPS ; 35
const HATCH_10240_STEPS ; 40
DEF HATCH_LEGENDARY1 EQU 80 ; step cycles for legendary birds & beasts
DEF HATCH_LEGENDARY2 EQU 120 ; step cycles for box legendaries & mythicals
DEF NUM_HATCH_RATES EQU (const_value / const_inc) + 1

; 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
Open in desktop
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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_8960_STEPS ; 35 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_3840_STEPS ; 15 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
Open in desktop
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 ; 80 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_3840_STEPS ; 15 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_10240_STEPS ; 40 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_3840_STEPS ; 15 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
Open in desktop
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_3840_STEPS ; 15 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
Open in desktop
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 ; 120 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
Open in desktop
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_10240_STEPS ; 40 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_5120_STEPS ; 20 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
Open in desktop
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_2560_STEPS ; 10 step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/clefable/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
Expand Down
Loading