Adding Leafeon test

An example to show adding a new Pokemon in pokered

16 files changed, 79 insertions, 10 deletions

diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm
index 036426ed..d6041957 100644
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -151,5 +151,6 @@ const_value = 1
 	const DEX_DRAGONITE  ; 149
 	const DEX_MEWTWO     ; 150
 	const DEX_MEW        ; 151
+	const DEX_LEAFEON    ; 152
 
-NUM_POKEMON    EQU 151
+NUM_POKEMON    EQU 152
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 255d601a..2630f43b 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -30,7 +30,7 @@ const_value = 1
 	const BLASTOISE    ; $1C
 	const PINSIR       ; $1D
 	const TANGELA      ; $1E
-	const MISSINGNO_1F ; $1F
+	const LEAFEON      ; $1F
 	const MISSINGNO_20 ; $20
 	const GROWLITHE    ; $21
 	const ONIX         ; $22
diff --git a/data/baseStats/leafeon.asm b/data/baseStats/leafeon.asm
new file mode 100755
index 00000000..31165942
--- /dev/null
+++ b/data/baseStats/leafeon.asm
@@ -0,0 +1,29 @@
+LeafeonBaseStats: ; 3926a (e:526a)
+db DEX_LEAFEON ; pokedex id
+db 130 ; base hp
+db 65 ; base attack
+db 60 ; base defense
+db 65 ; base speed
+db 110 ; base special
+db GRASS ; species type 1
+db GRASS ; species type 2
+db 45 ; catch rate
+db 196 ; base exp yield
+INCBIN "pic/bmon/leafeon.pic",0,1 ; 77, sprite dimensions
+dw LeafeonPicFront
+dw LeafeonPicBack
+; attacks known at lvl 0
+db TACKLE
+db SAND_ATTACK
+db QUICK_ATTACK
+db RAZOR_LEAF
+db 0 ; growth rate
+; learnset
+	tmlearn 3,6,8
+	tmlearn 9,10,15
+	tmlearn 20,21,22
+	tmlearn 31,32
+	tmlearn 33,34
+	tmlearn 44
+	tmlearn 50,51
+db 0 ; padding
diff --git a/data/base_stats.asm b/data/base_stats.asm
index d7d26533..15554780 100755
--- a/data/base_stats.asm
+++ b/data/base_stats.asm
@@ -148,3 +148,5 @@ INCLUDE "data/baseStats/dratini.asm"
 INCLUDE "data/baseStats/dragonair.asm"
 INCLUDE "data/baseStats/dragonite.asm"
 INCLUDE "data/baseStats/mewtwo.asm"
+INCLUDE "data/baseStats/mew.asm"
+INCLUDE "data/baseStats/leafeon.asm"
diff --git a/data/cries.asm b/data/cries.asm
index 7d03b831..c14dd6ab 100755
--- a/data/cries.asm
+++ b/data/cries.asm
@@ -30,7 +30,7 @@ CryData: ; 39446 (e:5446)
 	db $13, $00, $80; Blastoise
 	db $14, $00, $80; Pinsir
 	db $12, $00, $80; Tangela
-	db $00, $00, $00; MissingNo.
+	db $1A, $AA, $FF; Leafeon
 	db $00, $00, $00; MissingNo.
 	db $1F, $20, $40; Growlithe
 	db $17, $FF, $C0; Onix
diff --git a/data/evos_moves.asm b/data/evos_moves.asm
index 6bdf2524..140adce2 100755
--- a/data/evos_moves.asm
+++ b/data/evos_moves.asm
@@ -29,7 +29,7 @@ EvosMovesPointerTable: ; 3b05c (e:705c)
 	dw Mon009_EvosMoves
 	dw Mon127_EvosMoves
 	dw Mon114_EvosMoves
-	dw Mon152_EvosMoves	;MissingNo
+	dw Mon152_EvosMoves
 	dw Mon153_EvosMoves	;MissingNo
 	dw Mon058_EvosMoves
 	dw Mon095_EvosMoves
@@ -566,10 +566,17 @@ Mon114_EvosMoves: ; 3b362 (e:7362)
 	db 0
 
 Mon152_EvosMoves: ; 3b370 (e:7370)
-;MISSINGNO
+;LEAFEON
 ;Evolutions
 	db 0
 ;Learnset
+	db 7,LEECH_SEED
+	db 13,VINE_WHIP
+	db 22,POISONPOWDER
+	db 30,RAZOR_LEAF
+	db 43,GROWTH
+	db 55,SLEEP_POWDER
+	db 65,SOLARBEAM
 	db 0
 
 Mon153_EvosMoves: ; 3b372 (e:7372)
@@ -1341,6 +1348,7 @@ Mon040_EvosMoves: ; 3b642 (e:7642)
 Mon133_EvosMoves: ; 3b644 (e:7644)
 ;EEVEE
 ;Evolutions
+	db EV_ITEM,LEAF_STONE,1,LEAFEON
 	db EV_ITEM,FIRE_STONE,1,FLAREON
 	db EV_ITEM,THUNDER_STONE,1,JOLTEON
 	db EV_ITEM,WATER_STONE,1,VAPOREON
diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm
index f6763d7d..98fdff08 100755
--- a/data/mon_palettes.asm
+++ b/data/mon_palettes.asm
@@ -151,3 +151,4 @@ MonsterPalettes: ; 725c8 (1c:65c8)
 	db PAL_BROWNMON  ; DRAGONITE
 	db PAL_MEWMON    ; MEWTWO
 	db PAL_MEWMON    ; MEW
+	db PAL_GREENMON  ; LEAFEON
diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm
index 7e434dce..296ead2e 100755
--- a/data/mon_party_sprites.asm
+++ b/data/mon_party_sprites.asm
@@ -74,4 +74,4 @@ MonPartyData: ; 7190d (1c:590d)
 	dn SPRITE_BIRD_M, SPRITE_BIRD_M			;Zapdos/Moltres
 	dn SPRITE_SNAKE, SPRITE_SNAKE			;Dratini/Dragonair
 	dn SPRITE_SNAKE, SPRITE_MON				;Dragonite/Mewtwo
-	dn SPRITE_MON, 0						;Mew/Padding
+	dn SPRITE_MON, SPRITE_QUADRUPED			;Mew/Leafeon
diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm
index 6f06d699..f15cda8c 100755
--- a/data/pokedex_entries.asm
+++ b/data/pokedex_entries.asm
@@ -29,7 +29,7 @@ PokedexEntryPointers: ; 4047e (10:447e)
 	dw BlastoiseDexEntry
 	dw PinsirDexEntry
 	dw TangelaDexEntry
-	dw MissingNoDexEntry
+	dw LeafeonDexEntry
 	dw MissingNoDexEntry
 	dw GrowlitheDexEntry
 	dw OnixDexEntry
@@ -405,6 +405,13 @@ TangelaDexEntry: ; 407e8 (10:47e8)
 	TX_FAR _TangelaDexEntry
 	db "@"
 
+LeafeonDexEntry:
+	db "LEAF@"
+	db 3,3
+	dw 640
+	TX_FAR _LeafeonDexEntry
+	db "@"
+
 GrowlitheDexEntry: ; 407f6 (10:47f6)
 	db "PUPPY@"
 	db 2,4
diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm
index 46a1717a..5fa4700c 100755
--- a/data/pokedex_order.asm
+++ b/data/pokedex_order.asm
@@ -29,7 +29,7 @@ PokedexOrder: ; 41024 (10:5024)
 	db DEX_BLASTOISE
 	db DEX_PINSIR
 	db DEX_TANGELA
-	db 0 ; MISSINGNO.
+	db DEX_LEAFEON
 	db 0 ; MISSINGNO.
 	db DEX_GROWLITHE
 	db DEX_ONIX
diff --git a/home.asm b/home.asm
index 0d7c5271..1a024524 100644
--- a/home.asm
+++ b/home.asm
@@ -738,6 +738,10 @@ UncompressMonSprite:: ; 1627 (0:1627)
 	ld a,BANK(MewPicFront)
 	jr z,.GotBank
 	ld a,b
+	cp LEAFEON
+	ld a,BANK(LeafeonPicFront)
+	jr z,.GotBank
+	ld a,b
 	cp FOSSIL_KABUTOPS
 	ld a,BANK(FossilKabutopsPic)
 	jr z,.GotBank
diff --git a/main.asm b/main.asm
index c87cd1f0..a6c552ff 100755
--- a/main.asm
+++ b/main.asm
@@ -10,6 +10,7 @@ PICS_2 EQU $A
 PICS_3 EQU $B
 PICS_4 EQU $C
 PICS_5 EQU $D
+PICS_6 EQU $2D
 
 
 INCLUDE "home.asm"
@@ -69,7 +70,6 @@ ResetStatusAndHalveMoneyOnBlackout::
 
 MewPicFront:: INCBIN "pic/bmon/mew.pic"
 MewPicBack::  INCBIN "pic/monback/mewb.pic"
-INCLUDE "data/baseStats/mew.asm"
 
 INCLUDE "engine/battle/safari_zone.asm"
 
@@ -6712,6 +6712,13 @@ INCLUDE "engine/overworld/elevator.asm"
 
 INCLUDE "engine/items/tm_prices.asm"
 
+
+SECTION "Pics 6", ROMX, BANK[PICS_6]
+
+LeafeonPicFront::    INCBIN "pic/bmon/leafeon.pic"
+LeafeonPicBack::     INCBIN "pic/monback/leafeonb.pic"
+
+
 IF DEF(_OPTION_BEACH_HOUSE)
 SECTION "bank3C",ROMX[$4314],BANK[$3C]
 
diff --git a/pic/bmon/leafeon.png b/pic/bmon/leafeon.png
new file mode 100755
index 00000000..374e9ef0
--- /dev/null
+++ b/pic/bmon/leafeon.png
diff --git a/pic/monback/leafeonb.png b/pic/monback/leafeonb.png
new file mode 100755
index 00000000..436444df
--- /dev/null
+++ b/pic/monback/leafeonb.png
diff --git a/text/monster_names.asm b/text/monster_names.asm
index c7e0226f..056de440 100755
--- a/text/monster_names.asm
+++ b/text/monster_names.asm
@@ -29,7 +29,7 @@ MonsterNames: ; 1c21e (7:421e)
 	db "BLASTOISE@"
 	db "PINSIR@@@@"
 	db "TANGELA@@@"
-	db "MISSINGNO."
+	db "LEAFEON@@@"
 	db "MISSINGNO."
 	db "GROWLITHE@"
 	db "ONIX@@@@@@"
diff --git a/text/pokedex.asm b/text/pokedex.asm
index 65f3d89d..a777b9d8 100644
--- a/text/pokedex.asm
+++ b/text/pokedex.asm
@@ -298,6 +298,16 @@ _TangelaDexEntry::
 	next "shake as it walks"
 	dex
 
+_LeafeonDexEntry::
+	text "LEAFEON is always"
+	next "surrounded by"
+	next "fresh clean air"
+
+	page "because it uses"
+	next "photosynthesis"
+	next "just like a plant"
+	dex
+
 _GrowlitheDexEntry::
 	text "Very protective"
 	next "of its territory."