Para!

constants/pokedex_constants.asm

@@ -55,7 +55,7 @@
 	const DEX_GLOOM      ; 44
 	const DEX_VILEPLUME  ; 45
 	const DEX_BELLOSSOM
-	; const DEX_PARA
+	const DEX_PARA
 	const DEX_PARAS      ; 46
 	const DEX_PARASECT   ; 47
 	const DEX_VENONAT    ; 48

constants/pokemon_constants.asm

@@ -222,7 +222,7 @@
 	const SLOWKING           ; $D5
 	const ELECTIVIRE         ; $D6
 	const MAGMORTAR          ; $D7
-	; const PARA               ; $D8
+	const PARA               ; $D8
 	; const HINAAZU            ; $D9
 	; const BETOBEBII          ; $DA
 	; const MAGNEZONE          ; $DB

data/pokemon/base_stats.asm

@@ -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"

data/pokemon/base_stats/para.asm

@@ -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
 

data/pokemon/cries.asm

@@ -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

data/pokemon/dex_entries.asm

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

data/pokemon/dex_order.asm

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

data/pokemon/evos_moves.asm

@@ -218,6 +218,7 @@ EvosMovesPointerTable:
 	dw SlowkingEvosMoves
 	dw ElectivireEvosMoves
 	dw MagmortarEvosMoves
+	dw ParaEvosMoves
 	assert_table_length NUM_POKEMON_INDEXES
 
 RhydonEvosMoves:
@@ -2760,3 +2761,16 @@ MagmortarEvosMoves:
 	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

data/pokemon/menu_icons.asm

@@ -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

data/pokemon/names.asm

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

data/pokemon/new_dex_text.asm

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

data/pokemon/palettes.asm

@@ -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

data/trainers/parties.asm

@@ -81,15 +81,15 @@ YoungsterData:
 BugCatcherData:
 ; Viridian Forest
 	db 6, WEEDLE, CATERPIE, 0
-	db 7, WEEDLE, KAKUNA, WEEDLE, 0
+	db 7, CATERPIE, KAKUNA, PARA, 0
-	db 9, WEEDLE, 0
+	db 9, WEEDLE, PARA, 0
 ; Route 3
-	db 10, CATERPIE, WEEDLE, CATERPIE, 0
+	db 10, CATERPIE, WEEDLE, PARA, 0
 	db 9, WEEDLE, KAKUNA, CATERPIE, METAPOD, 0
 	db 11, CATERPIE, METAPOD, 0
 ; Mt. Moon 1F
-	db 11, WEEDLE, KAKUNA, 0
+	db 11, PARA, PARAS, 0
-	db 10, CATERPIE, METAPOD, CATERPIE, 0
+	db 10, CATERPIE, METAPOD, PARA, 0
 ; Route 24
 	db 14, CATERPIE, WEEDLE, 0
 ; Route 6

data/wild/maps/Route2.asm

@@ -4,12 +4,12 @@ Route2WildMons:
 	db  5, PIDGEY
 	db  4, PIDGEY
 	db  4, RATTATA
-	db  5, MONJA
+	db  5, PARA
 	db  4, WEEDLE
-	db  3, RATTATA
+	db  3, PARA
-	db  5, RATTATA
 	db  5, CATERPIE
-	db  6, CATERPIE
+	db  5, MONJA
+	db  6, MONJA
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/ViridianForest.asm

@@ -1,13 +1,13 @@
 ViridianForestWildMons:
 	def_grass_wildmons 8 ; encounter rate
 	db  6, CATERPIE
-	db  9, METAPOD
-	db  6, CATERPIE
-	db  6, CATERPIE
-	db  5, MONJA
-	db  9, METAPOD
-	db  9, KAKUNA
 	db  6, WEEDLE
+	db  6, CATERPIE
+	db  5, PARA
+	db  6, MONJA
+	db  6, PARA
+	db  8, KAKUNA
+	db  8, METAPOD
 	db  5, PIKACHU
 	db 10, BUTTERFREE
 	end_grass_wildmons

gfx/pics.asm

@@ -506,3 +506,5 @@ ElectivirePicFront::   INCBIN "gfx/pokemon/front/electivire.pic"
 ElectivirePicBack::    INCBIN "gfx/pokemon/back/electivireb.pic"
 MagmortarPicFront::    INCBIN "gfx/pokemon/front/magmortar.pic"
 MagmortarPicBack::     INCBIN "gfx/pokemon/back/magmortarb.pic"
+ParaPicFront::    INCBIN "gfx/pokemon/front/para.pic"
+ParaPicBack::     INCBIN "gfx/pokemon/back/parab.pic"