Adding Glaceon test

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

24 files changed, 95 insertions, 10 deletions

diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index d0ad12e6..e73a389a 100755
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -99,6 +99,7 @@ SAFARI_ROCK           EQU $16 ; overload
 	const FLOOR_10F     ; $5F
 	const FLOOR_11F     ; $60
 	const FLOOR_B4F     ; $61
+	const ICE_STONE     ; $62
 
 const_value = $C4
 
diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm
index d6041957..5352a7c6 100644
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -152,5 +152,6 @@ const_value = 1
 	const DEX_MEWTWO     ; 150
 	const DEX_MEW        ; 151
 	const DEX_LEAFEON    ; 152
+	const DEX_GLACEON    ; 153
 
-NUM_POKEMON    EQU 152
+NUM_POKEMON    EQU 153
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 2630f43b..05e6df87 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -31,7 +31,7 @@ const_value = 1
 	const PINSIR       ; $1D
 	const TANGELA      ; $1E
 	const LEAFEON      ; $1F
-	const MISSINGNO_20 ; $20
+	const GLACEON      ; $20
 	const GROWLITHE    ; $21
 	const ONIX         ; $22
 	const FEAROW       ; $23
diff --git a/data/baseStats/glaceon.asm b/data/baseStats/glaceon.asm
new file mode 100755
index 00000000..fbc06d0c
--- /dev/null
+++ b/data/baseStats/glaceon.asm
@@ -0,0 +1,29 @@
+GlaceonBaseStats: ; 3926a (e:526a)
+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 15554780..815a0fad 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 c14dd6ab..09177477 100755
--- a/data/cries.asm
+++ b/data/cries.asm
@@ -31,7 +31,7 @@ CryData: ; 39446 (e:5446)
 	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 140adce2..5816cf35 100755
--- a/data/evos_moves.asm
+++ b/data/evos_moves.asm
@@ -30,7 +30,7 @@ EvosMovesPointerTable: ; 3b05c (e:705c)
 	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: ; 3b370 (e:7370)
 	db 0
 
 Mon153_EvosMoves: ; 3b372 (e:7372)
-;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: ; 3b374 (e:7374)
@@ -1348,6 +1354,7 @@ Mon040_EvosMoves: ; 3b642 (e:7642)
 Mon133_EvosMoves: ; 3b644 (e:7644)
 ;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 aa5cb21e..a261363c 100755
--- a/data/item_prices.asm
+++ b/data/item_prices.asm
@@ -96,3 +96,4 @@ ItemPrices: ; 4608 (1:4608)
 	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 9e2d16fe..e6c44229 100755
--- a/data/key_items.asm
+++ b/data/key_items.asm
@@ -10,3 +10,5 @@ KeyItemBitfield: ; e799 (3:6799)
 	db %11110000
 	db %00111011
 	db %00000000
+	db %00000000
+	db %00000000
diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm
index 98fdff08..d9d3ab8c 100755
--- a/data/mon_palettes.asm
+++ b/data/mon_palettes.asm
@@ -152,3 +152,4 @@ MonsterPalettes: ; 725c8 (1c:65c8)
 	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 296ead2e..02232468 100755
--- a/data/mon_party_sprites.asm
+++ b/data/mon_party_sprites.asm
@@ -75,3 +75,4 @@ MonPartyData: ; 7190d (1c:590d)
 	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 f15cda8c..e232eddc 100755
--- a/data/pokedex_entries.asm
+++ b/data/pokedex_entries.asm
@@ -30,7 +30,7 @@ PokedexEntryPointers: ; 4047e (10:447e)
 	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: ; 407f6 (10:47f6)
 	db "PUPPY@"
 	db 2,4
diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm
index 5fa4700c..2511f5e7 100755
--- a/data/pokedex_order.asm
+++ b/data/pokedex_order.asm
@@ -30,7 +30,7 @@ PokedexOrder: ; 41024 (10:5024)
 	db DEX_PINSIR
 	db DEX_TANGELA
 	db DEX_LEAFEON
-	db 0 ; MISSINGNO.
+	db DEX_GLACEON
 	db DEX_GROWLITHE
 	db DEX_ONIX
 	db DEX_FEAROW
diff --git a/engine/items/items.asm b/engine/items/items.asm
index f0666587..c996ba96 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -99,6 +99,21 @@ ItemUsePtrTable: ; d5e1 (3:55e1)
 	dw ItemUsePPRestore  ; MAX_ETHER
 	dw ItemUsePPRestore  ; ELIXER
 	dw ItemUsePPRestore  ; MAX_ELIXER
+	dw UnusableItem      ; FLOOR_B2F
+	dw UnusableItem      ; FLOOR_B1F
+	dw UnusableItem      ; FLOOR_1F
+	dw UnusableItem      ; FLOOR_2F
+	dw UnusableItem      ; FLOOR_3F
+	dw UnusableItem      ; FLOOR_4F
+	dw UnusableItem      ; FLOOR_5F
+	dw UnusableItem      ; FLOOR_6F
+	dw UnusableItem      ; FLOOR_7F
+	dw UnusableItem      ; FLOOR_8F
+	dw UnusableItem      ; FLOOR_9F
+	dw UnusableItem      ; FLOOR_10F
+	dw UnusableItem      ; FLOOR_11F
+	dw UnusableItem      ; FLOOR_B4F
+	dw ItemUseEvoStone   ; ICE_STONE
 
 ItemUseBall: ; d687 (3:5687)
 	ld a,[W_ISINBATTLE]
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index f3e1a138..fb07766d 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -148,11 +148,11 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
 	ld a,[hli]
 	ld h,[hl]
 	ld l,a
-	ld de,wcd6d
+	ld de,wEvolutionData
 	ld a,BANK(EvosMovesPointerTable)
 	ld bc,Mon133_EvosEnd - Mon133_EvosMoves
 	call FarCopyData
-	ld hl,wcd6d
+	ld hl,wEvolutionData
 	ld de,.notAbleToEvolveText
 ; loop through the pokemon's evolution entries
 .checkEvolutionsLoop
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index ab8c8756..e1dc5d98 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -484,6 +484,7 @@ UsableItems_PartyMenu: ; 13434 (4:7434)
 	db MAX_ETHER
 	db ELIXER
 	db MAX_ELIXER
+	db ICE_STONE
 	db $ff
 
 ; items which close the item menu when used
diff --git a/home.asm b/home.asm
index 1a024524..445af131 100644
--- a/home.asm
+++ b/home.asm
@@ -742,6 +742,10 @@ UncompressMonSprite:: ; 1627 (0:1627)
 	ld a,BANK(LeafeonPicFront)
 	jr z,.GotBank
 	ld a,b
+	cp GLACEON
+	ld a,BANK(GlaceonPicFront)
+	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 a6c552ff..983d7586 100755
--- a/main.asm
+++ b/main.asm
@@ -6717,6 +6717,8 @@ SECTION "Pics 6", ROMX, BANK[PICS_6]
 
 LeafeonPicFront::    INCBIN "pic/bmon/leafeon.pic"
 LeafeonPicBack::     INCBIN "pic/monback/leafeonb.pic"
+GlaceonPicFront::    INCBIN "pic/bmon/glaceon.pic"
+GlaceonPicBack::     INCBIN "pic/monback/glaceonb.pic"
 
 
 IF DEF(_OPTION_BEACH_HOUSE)
diff --git a/pic/bmon/glaceon.png b/pic/bmon/glaceon.png
new file mode 100755
index 00000000..c81ebeea
--- /dev/null
+++ b/pic/bmon/glaceon.png
diff --git a/pic/monback/glaceonb.png b/pic/monback/glaceonb.png
new file mode 100755
index 00000000..35fa1857
--- /dev/null
+++ b/pic/monback/glaceonb.png
diff --git a/text/item_names.asm b/text/item_names.asm
index 3c0f4c49..105196fb 100755
--- a/text/item_names.asm
+++ b/text/item_names.asm
@@ -96,3 +96,4 @@ ItemNames: ; 472b (1:472b)
 	db "10F@"
 	db "11F@"
 	db "B4F@"
+	db "ICE STONE@"
diff --git a/text/monster_names.asm b/text/monster_names.asm
index 056de440..79d86dcd 100755
--- a/text/monster_names.asm
+++ b/text/monster_names.asm
@@ -30,7 +30,7 @@ MonsterNames: ; 1c21e (7:421e)
 	db "PINSIR@@@@"
 	db "TANGELA@@@"
 	db "LEAFEON@@@"
-	db "MISSINGNO."
+	db "GLACEON@@@"
 	db "GROWLITHE@"
 	db "ONIX@@@@@@"
 	db "FEAROW@@@@"
diff --git a/text/pokedex.asm b/text/pokedex.asm
index a777b9d8..3598f785 100644
--- a/text/pokedex.asm
+++ b/text/pokedex.asm
@@ -308,6 +308,16 @@ _LeafeonDexEntry::
 	next "just like a plant"
 	dex
 
+_GlaceonDexEntry::
+	text "The Fresh Snow"
+	next "#MON. It can"
+	next "freeze the fur on"
+
+	page "its body, and make"
+	next "it stick out like"
+	next "sharp needles"
+	dex
+
 _GrowlitheDexEntry::
 	text "Very protective"
 	next "of its territory."
diff --git a/wram.asm b/wram.asm
index cfa4cc51..dcbd8e4d 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2841,6 +2841,7 @@ W_ROUTE18GATECURSCRIPT:: ; d669
 	ds 78
 wGameProgressFlagsEnd::
 
+wEvolutionData::
 	ds 56
 
 wObtainedHiddenItemsFlags::