pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #680 from Rangi42/master

Browse Source 
Miscellaneous fixes for #676
This commit is contained in:
Rangi 2020-02-04 11:17:14 -05:00 committed by GitHub
commit ed44d1cdb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
257 changed files with 279 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
constants/pokemon_data_constants.asm
View File

@ -19,7 +19,8 @@ BASE_UNKNOWN_1 EQUS "(wBaseUnknown1 - wCurBaseData)"
BASE_EGG_STEPS EQUS "(wBaseEggSteps - wCurBaseData)"
BASE_UNKNOWN_2 EQUS "(wBaseUnknown2 - wCurBaseData)"
BASE_PIC_SIZE EQUS "(wBasePicSize - wCurBaseData)"
BASE_PADDING EQUS "(wBasePadding - wCurBaseData)"
BASE_FRONTPIC EQUS "(wBaseUnusedFrontpic - wCurBaseData)"
BASE_BACKPIC EQUS "(wBaseUnusedBackpic - wCurBaseData)"
BASE_GROWTH_RATE EQUS "(wBaseGrowthRate - wCurBaseData)"
BASE_EGG_GROUPS EQUS "(wBaseEggGroups - wCurBaseData)"
BASE_TMHM EQUS "(wBaseTMHM - wCurBaseData)"

1
constants/script_constants.asm
View File

@ -138,6 +138,7 @@ OBJECT_EVENT_SIZE EQU 13 ; object_event
; command queue members
CMDQUEUE_TYPE EQU 0
CMDQUEUE_ADDR EQU 1
CMDQUEUE_02 EQU 2
CMDQUEUE_03 EQU 3
CMDQUEUE_04 EQU 4
CMDQUEUE_05 EQU 5

2
data/pokemon/base_stats/abra.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/abra/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups

2
data/pokemon/base_stats/aerodactyl.asm
View File

@ -12,7 +12,7 @@
db 35 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/aerodactyl/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_FLYING, EGG_FLYING ; egg groups

2
data/pokemon/base_stats/aipom.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/aipom/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_FAST ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups

2
data/pokemon/base_stats/alakazam.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/alakazam/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups

2
data/pokemon/base_stats/ampharos.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/ampharos/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_MONSTER, EGG_GROUND ; egg groups

2
data/pokemon/base_stats/arbok.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/arbok/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_GROUND, EGG_DRAGON ; egg groups

2
data/pokemon/base_stats/arcanine.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/arcanine/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups

2
data/pokemon/base_stats/ariados.asm
View File

@ -12,7 +12,7 @@
db 15 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/ariados/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_FAST ; growth rate
dn EGG_BUG, EGG_BUG ; egg groups

2
data/pokemon/base_stats/articuno.asm
View File

@ -12,7 +12,7 @@
db 80 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/articuno/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_NONE, EGG_NONE ; egg groups

2
data/pokemon/base_stats/azumarill.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/azumarill/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_FAST ; growth rate
dn EGG_WATER_1, EGG_FAIRY ; egg groups

2
data/pokemon/base_stats/bayleef.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/bayleef/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_MONSTER, EGG_PLANT ; egg groups

2
data/pokemon/base_stats/beedrill.asm
View File

@ -12,7 +12,7 @@
db 15 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/beedrill/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_BUG, EGG_BUG ; egg groups

2
data/pokemon/base_stats/bellossom.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/bellossom/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_PLANT, EGG_PLANT ; egg groups

2
data/pokemon/base_stats/bellsprout.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/bellsprout/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_PLANT, EGG_PLANT ; egg groups

2
data/pokemon/base_stats/blastoise.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/blastoise/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_MONSTER, EGG_WATER_1 ; egg groups

2
data/pokemon/base_stats/blissey.asm
View File

@ -12,7 +12,7 @@
db 40 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/blissey/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_FAST ; growth rate
dn EGG_FAIRY, EGG_FAIRY ; egg groups

2
data/pokemon/base_stats/bulbasaur.asm
View File

@ -12,7 +12,7 @@
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/bulbasaur/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_MONSTER, EGG_PLANT ; egg groups

2
data/pokemon/base_stats/butterfree.asm
View File

@ -12,7 +12,7 @@
db 15 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/butterfree/front.dimensions"
db 0, 0, 0, 0 ; padding
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_BUG, EGG_BUG ; egg groups

Some files were not shown because too many files have changed in this diff Show More