This commit is contained in:
MementoMartha 2022-10-01 15:55:30 +01:00
parent d048beca12
commit e2198dd402
16 changed files with 55 additions and 27 deletions

View file

@ -51,6 +51,7 @@ INCLUDE "data/pokemon/base_stats/oddish.asm"
INCLUDE "data/pokemon/base_stats/gloom.asm"
INCLUDE "data/pokemon/base_stats/vileplume.asm"
INCLUDE "data/pokemon/base_stats/bellossom.asm"
INCLUDE "data/pokemon/base_stats/para.asm"
INCLUDE "data/pokemon/base_stats/paras.asm"
INCLUDE "data/pokemon/base_stats/parasect.asm"
INCLUDE "data/pokemon/base_stats/venonat.asm"

View file

@ -3,7 +3,7 @@
db 20, 55, 40, 10, 40
; hp atk def spd spc
db BUG, GRASS ; type
db BUG, BUG ; type
db 255 ; catch rate
db 53 ; base exp

View file

@ -221,7 +221,7 @@ CryData::
mon_cry SFX_CRY_00, $00, $00 ; Slowking
mon_cry SFX_CRY_00, $00, $00 ; Electivire
mon_cry SFX_CRY_00, $00, $00 ; Magmortar
; mon_cry SFX_CRY_1E, $79, $40 ; Para
mon_cry SFX_CRY_1E, $79, $40 ; Para
; mon_cry SFX_CRY_00, $00, $00 ; Hinaazu
; mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
; mon_cry SFX_CRY_00, $00, $00 ; Magnezone

View file

@ -215,6 +215,7 @@ PokedexEntryPointers:
dw SlowkingDexEntry
dw ElectivireDexEntry
dw MagmortarDexEntry
dw ParaDexEntry
assert_table_length NUM_POKEMON_INDEXES
; string: species name
@ -1712,4 +1713,10 @@ MagmortarDexEntry:
dw 1500
text_far _MagmortarDexEntry
text_end
ParaDexEntry:
db "MUSHROOM@"
db 0,8
dw 40
text_far _ParaDexEntry
text_end

View file

@ -215,4 +215,5 @@ PokedexOrder:
db DEX_SLOWKING
db DEX_ELECTIVIRE
db DEX_MAGMORTAR
db DEX_PARA
assert_table_length NUM_POKEMON_INDEXES

View file

@ -218,6 +218,7 @@ EvosMovesPointerTable:
dw SlowkingEvosMoves
dw ElectivireEvosMoves
dw MagmortarEvosMoves
dw ParaEvosMoves
assert_table_length NUM_POKEMON_INDEXES
RhydonEvosMoves:
@ -2759,4 +2760,17 @@ MagmortarEvosMoves:
db 52, SMOG
db 55, FLAMETHROWER
db 0
ParaEvosMoves:
; Evolutions
db EV_LEVEL, 12, PARAS
db 0
; Learnset
db 3, STUN_SPORE
db 6, LEECH_LIFE
db 10, POISONPOWDER
db 15, FURY_SWIPES
db 21, SPORE
db 25, GROWTH
db 29, SLASH
db 0

View file

@ -51,6 +51,7 @@ MonPartyData:
nybble ICON_GRASS ; Gloom
nybble ICON_GRASS ; Vileplume
nybble ICON_GRASS ; Bellossom
nybble ICON_BUG ; Para
nybble ICON_BUG ; Paras
nybble ICON_BUG ; Parasect
nybble ICON_BUG ; Venonat

View file

@ -215,5 +215,6 @@ MonsterNames::
db "SLOWKING@@"
db "ELECTIVIRE"
db "MAGMORTAR@"
db "PARA@@@@@@"
assert_table_length NUM_POKEMON_INDEXES

View file

@ -389,13 +389,13 @@ _MonjaDexEntry::
dex
_ParaDexEntry::
text "This is a newly"
next "discovered"
next "#MON. It is"
text "It's always born"
next "planted inside"
next "of a mushroom."
page "currently under"
next "investigation. No"
next "info is available"
page "The mushroom will"
next "stay with it for"
next "its whole life"
dex
_HinaazuDexEntry::

View file

@ -52,6 +52,7 @@ MonsterPalettes:
db PAL_REDMON ; GLOOM
db PAL_REDMON ; VILEPLUME
db PAL_PURPLEMON ; BELLOSSOM
db PAL_REDMON ; PARA
db PAL_REDMON ; PARAS
db PAL_REDMON ; PARASECT
db PAL_PURPLEMON ; VENONAT