Adding Glaceon test

An example to show adding a second new Pokemon and a new evolution item in pokered

10 files changed, 53 insertions, 5 deletions

diff --git a/data/baseStats/glaceon.asm b/data/baseStats/glaceon.asm
new file mode 100755
index 00000000..e61c1d60
--- /dev/null
+++ b/data/baseStats/glaceon.asm
@@ -0,0 +1,28 @@
+db DEX_GLACEON ; pokedex id
+db 130 ; base hp
+db 65 ; base attack
+db 60 ; base defense
+db 65 ; base speed
+db 110 ; base special
+db ICE ; species type 1
+db ICE ; species type 2
+db 45 ; catch rate
+db 196 ; base exp yield
+INCBIN "pic/bmon/glaceon.pic",0,1 ; 77, sprite dimensions
+dw GlaceonPicFront
+dw GlaceonPicBack
+; attacks known at lvl 0
+db TACKLE
+db SAND_ATTACK
+db QUICK_ATTACK
+db ICE_BEAM
+db 0 ; growth rate
+; learnset
+	tmlearn 6,8
+	tmlearn 9,10,11,12,13,14,15
+	tmlearn 20
+	tmlearn 31,32
+	tmlearn 33,34,39,40
+	tmlearn 44
+	tmlearn 50,53
+db 0 ; padding
diff --git a/data/base_stats.asm b/data/base_stats.asm
index f3774118..4ca36dd3 100755
--- a/data/base_stats.asm
+++ b/data/base_stats.asm
@@ -150,3 +150,4 @@ INCLUDE "data/baseStats/dragonite.asm"
 INCLUDE "data/baseStats/mewtwo.asm"
 INCLUDE "data/baseStats/mew.asm"
 INCLUDE "data/baseStats/leafeon.asm"
+INCLUDE "data/baseStats/glaceon.asm"
diff --git a/data/cries.asm b/data/cries.asm
index 1a1e68fe..b048c002 100755
--- a/data/cries.asm
+++ b/data/cries.asm
@@ -31,7 +31,7 @@ CryData:
 	db $14, $00, $80; Pinsir
 	db $12, $00, $80; Tangela
 	db $1A, $AA, $FF; Leafeon
-	db $00, $00, $00; MissingNo.
+	db $1A, $AA, $FF; Glaceon
 	db $1F, $20, $40; Growlithe
 	db $17, $FF, $C0; Onix
 	db $18, $40, $A0; Fearow
diff --git a/data/evos_moves.asm b/data/evos_moves.asm
index 38f2e63d..ff3e86a4 100755
--- a/data/evos_moves.asm
+++ b/data/evos_moves.asm
@@ -30,7 +30,7 @@ EvosMovesPointerTable:
 	dw Mon127_EvosMoves
 	dw Mon114_EvosMoves
 	dw Mon152_EvosMoves
-	dw Mon153_EvosMoves ;MissingNo
+	dw Mon153_EvosMoves
 	dw Mon058_EvosMoves
 	dw Mon095_EvosMoves
 	dw Mon022_EvosMoves
@@ -580,10 +580,16 @@ Mon152_EvosMoves:
 	db 0
 
 Mon153_EvosMoves:
-;MISSINGNO
+;GLACEON
 ;Evolutions
 	db 0
 ;Learnset
+	db 27,QUICK_ATTACK
+	db 31,AURORA_BEAM
+	db 37,TAIL_WHIP
+	db 40,BITE
+	db 48,MIST
+	db 54,BLIZZARD
 	db 0
 
 Mon058_EvosMoves:
@@ -1348,6 +1354,7 @@ Mon040_EvosMoves:
 Mon133_EvosMoves:
 ;EEVEE
 ;Evolutions
+	db EV_ITEM,ICE_STONE,1,GLACEON
 	db EV_ITEM,LEAF_STONE,1,LEAFEON
 	db EV_ITEM,FIRE_STONE,1,FLAREON
 	db EV_ITEM,THUNDER_STONE,1,JOLTEON
diff --git a/data/item_prices.asm b/data/item_prices.asm
index 15a1bd34..4198ccff 100755
--- a/data/item_prices.asm
+++ b/data/item_prices.asm
@@ -96,3 +96,4 @@ ItemPrices:
 	money 0     ; FLOOR_10F
 	money 0     ; FLOOR_11F
 	money 0     ; FLOOR_B4F
+	money 2100  ; ICE_STONE
diff --git a/data/key_items.asm b/data/key_items.asm
index afa586af..8e1c89f7 100755
--- a/data/key_items.asm
+++ b/data/key_items.asm
@@ -10,3 +10,5 @@ KeyItemBitfield:
 	db %11110000
 	db %00111011
 	db %00000000
+	db %00000000
+	db %00000000
diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm
index 7bbea1fd..31fbf81c 100755
--- a/data/mon_palettes.asm
+++ b/data/mon_palettes.asm
@@ -152,3 +152,4 @@ MonsterPalettes:
 	db PAL_MEWMON    ; MEWTWO
 	db PAL_MEWMON    ; MEW
 	db PAL_GREENMON  ; LEAFEON
+	db PAL_CYANMON   ; GLACEON
diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm
index 1535d25a..76ccaecd 100755
--- a/data/mon_party_sprites.asm
+++ b/data/mon_party_sprites.asm
@@ -75,3 +75,4 @@ MonPartyData:
 	dn SPRITE_SNAKE, SPRITE_SNAKE           ;Dratini/Dragonair
 	dn SPRITE_SNAKE, SPRITE_MON             ;Dragonite/Mewtwo
 	dn SPRITE_MON, SPRITE_QUADRUPED         ;Mew/Leafeon
+	dn SPRITE_QUADRUPED, 0                  ;Glaceon/Padding
diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm
index 3af53f3a..98a9bb2e 100755
--- a/data/pokedex_entries.asm
+++ b/data/pokedex_entries.asm
@@ -30,7 +30,7 @@ PokedexEntryPointers:
 	dw PinsirDexEntry
 	dw TangelaDexEntry
 	dw LeafeonDexEntry
-	dw MissingNoDexEntry
+	dw GlaceonDexEntry
 	dw GrowlitheDexEntry
 	dw OnixDexEntry
 	dw FearowDexEntry
@@ -412,6 +412,13 @@ LeafeonDexEntry:
 	TX_FAR _LeafeonDexEntry
 	db "@"
 
+GlaceonDexEntry:
+	db "ICE@"
+	db 3,3
+	dw 640
+	TX_FAR _GlaceonDexEntry
+	db "@"
+
 GrowlitheDexEntry:
 	db "PUPPY@"
 	db 2,4
diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm
index 79cd933e..dc4d36eb 100755
--- a/data/pokedex_order.asm
+++ b/data/pokedex_order.asm
@@ -30,7 +30,7 @@ PokedexOrder:
 	db DEX_PINSIR
 	db DEX_TANGELA
 	db DEX_LEAFEON
-	db 0 ; MISSINGNO.
+	db DEX_GLACEON
 	db DEX_GROWLITHE
 	db DEX_ONIX
 	db DEX_FEAROW