Electivire & Magmortar!

constants/pokedex_constants.asm

@@ -55,6 +55,7 @@
 	const DEX_GLOOM      ; 44
 	const DEX_VILEPLUME  ; 45
 	const DEX_BELLOSSOM
+	; const DEX_PARA
 	const DEX_PARAS      ; 46
 	const DEX_PARASECT   ; 47
 	const DEX_VENONAT    ; 48
@@ -68,6 +69,7 @@
 	const DEX_KONYA 
 	const DEX_MEOWTH     ; 52
 	const DEX_PERSIAN    ; 53
+	; const DEX_PERRSERKER
 	const DEX_PSYDUCK    ; 54
 	const DEX_WEIRDUCK   
 	const DEX_GOLDUCK    ; 55
@@ -106,15 +108,19 @@
 	const DEX_MAGNEMITE  ; 81
 	const DEX_MAGNETITE
 	const DEX_MAGNETON   ; 82
+	; const DEX_MAGNEZONE
 	const DEX_BARUNDA 
 	const DEX_FARFETCHD  ; 83 
 	const DEX_MADAAMU    
+	; const DEX_SIRFETCHD
 	const DEX_BLASTYKE  
 	const DEX_BLASTOISE 
+	; const DEX_HINAAZU
 	const DEX_DODUO      ; 84
 	const DEX_DODRIO     ; 85 
 	const DEX_SEEL       ; 86
 	const DEX_DEWGONG    ; 87
+	; const DEX_BETOBEBII 
 	const DEX_GRIMER     ; 88
 	const DEX_MUK        ; 89
 	const DEX_SHELLDER   ; 90
@@ -173,6 +179,7 @@
 	const DEX_STARMIE    ; 121
 	const DEX_JAGG
 	const DEX_MR_MIME    ; 122
+	; const DEX_MR_RIME
 	const DEX_SCYTHER    ; 123
 	const DEX_SCIZOR
 	const DEX_KLEAVOR
@@ -181,7 +188,9 @@
 	const DEX_JYNX       ; 124
 	const DEX_BUU
 	const DEX_ELECTABUZZ ; 125
+	const DEX_ELECTIVIRE
 	const DEX_MAGMAR     ; 126
+	const DEX_MAGMORTAR
 	const DEX_TRAMPEL    ; 
 	const DEX_TAUROS     ; 128
 	const DEX_MAGIKARP   ; 129
@@ -200,6 +209,7 @@
 	const DEX_SYLVEON
 	const DEX_PORYGON    ; 137
 	const DEX_PORYGON2
+	; const DEX_PORYGONZ
 	const DEX_OMANYTE    ; 138
 	const DEX_OMASTAR    ; 139
 	const DEX_KABUTO     ; 140

constants/pokemon_constants.asm

@@ -220,12 +220,12 @@
 	const KINGDRA            ; $D3
 	const POLITOED           ; $D4
 	const SLOWKING           ; $D5
-	; const PARA               ; $D6
-	; const HINAAZU            ; $D7
-	; const BETOBEBII          ; $D8
-	; const MAGNEZONE          ; $D9
-	; const ELECTIVIRE         ; $DA
-	; const MAGMORTAR          ; $DB
+	const ELECTIVIRE         ; $D6
+	const MAGMORTAR          ; $D7
+	; const PARA               ; $D8
+	; const HINAAZU            ; $D9
+	; const BETOBEBII          ; $DA
+	; const MAGNEZONE          ; $DB
 	; const PORYGONZ           ; $DC
 	; const PERRSERKER         ; $DD
 	; const SIRFETCHD          ; $DE

data/pokemon/base_stats.asm

@@ -177,7 +177,9 @@ INCLUDE "data/pokemon/base_stats/purakkusu.asm"
 INCLUDE "data/pokemon/base_stats/jynx.asm"
 INCLUDE "data/pokemon/base_stats/buu.asm"
 INCLUDE "data/pokemon/base_stats/electabuzz.asm"
+INCLUDE "data/pokemon/base_stats/electivire.asm"
 INCLUDE "data/pokemon/base_stats/magmar.asm"
+INCLUDE "data/pokemon/base_stats/magmortar.asm"
 INCLUDE "data/pokemon/base_stats/trampel.asm"
 INCLUDE "data/pokemon/base_stats/tauros.asm"
 INCLUDE "data/pokemon/base_stats/magikarp.asm"

data/pokemon/base_stats/electivire.asm

@@ -0,0 +1,27 @@
+	db DEX_ELECTIVIRE ; pokedex id
+
+	db  75,  123, 67,  95,  85
+	;   hp  atk  def  spd  spc
+
+	db ELECTRIC, ELECTRIC ; type
+	db 30 ; catch rate
+	db 199 ; base exp
+
+	INCBIN "gfx/pokemon/front/electivire.pic", 0, 1 ; sprite dimensions
+	dw ElectivirePicFront, ElectivirePicBack
+
+	db QUICK_ATTACK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  HYPER_BEAM,   SUBMISSION,   COUNTER,      SEISMIC_TOSS, \
+	     RAGE,         THUNDERBOLT,  THUNDER,      EARTHQUAKE,   FISSURE,      \
+	     PSYCHIC_M,    TELEPORT,     MIMIC,        DOUBLE_TEAM,  REFLECT,      \
+	     BIDE,         METRONOME,    SWIFT,        SKULL_BASH,   REST,         \
+	     THUNDER_WAVE, PSYWAVE,      ROCK_SLIDE,   SUBSTITUTE,   STRENGTH,	   \
+		 FLASH
+	; end
+
+	db BANK(ElectivirePicFront)
+	assert BANK(ElectivirePicFront) == BANK(ElectivirePicBack)

data/pokemon/base_stats/magmortar.asm

@@ -0,0 +1,26 @@
+	db DEX_MAGMORTAR ; pokedex id
+
+	db  75,  95,  67,  83, 125
+	;   hp  atk  def  spd  spc
+
+	db FIRE, FIRE ; type
+	db 30 ; catch rate
+	db 199 ; base exp
+
+	INCBIN "gfx/pokemon/front/magmortar.pic", 0, 1 ; sprite dimensions
+	dw MagmortarPicFront, MagmortarPicBack
+
+	db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db GROWTH_MEDIUM_FAST ; growth rate
+
+	; tm/hm learnset
+	tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+	     DOUBLE_EDGE,  HYPER_BEAM,   SUBMISSION,   COUNTER,      SEISMIC_TOSS, \
+	     RAGE,         THUNDERBOLT,  THUNDER,      EARTHQUAKE,   FISSURE,      \
+	     PSYCHIC_M,    TELEPORT,     MIMIC,        DOUBLE_TEAM,  BIDE,         \
+	     METRONOME,    FIRE_BLAST,   SKULL_BASH,   REST,         PSYWAVE,	   \      
+		 ROCK_SLIDE,   SUBSTITUTE,   STRENGTH
+	; end
+
+	db BANK(MagmortarPicFront)
+	assert BANK(MagmortarPicFront) == BANK(MagmortarPicBack)

data/pokemon/cries.asm

@@ -219,12 +219,12 @@ CryData::
 	mon_cry SFX_CRY_00, $00, $00 ; Kingdra
 	mon_cry SFX_CRY_00, $00, $00 ; Politoed
 	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_00, $00, $00 ; Hinaazu
 	; mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
 	; mon_cry SFX_CRY_00, $00, $00 ; Magnezone
-	; mon_cry SFX_CRY_00, $00, $00 ; Electivire
-	; mon_cry SFX_CRY_00, $00, $00 ; Magmortar
 	; mon_cry SFX_CRY_00, $00, $00 ; Porygon-Z
 	; mon_cry SFX_CRY_00, $00, $00 ; Perrserker
 	; mon_cry SFX_CRY_00, $00, $00 ; Sirfetch'd

data/pokemon/dex_entries.asm

@@ -213,6 +213,8 @@ PokedexEntryPointers:
 	dw KingdraDexEntry
 	dw PolitoedDexEntry
 	dw SlowkingDexEntry
+	dw ElectivireDexEntry
+	dw MagmortarDexEntry
 	assert_table_length NUM_POKEMON_INDEXES
 
 ; string: species name
@@ -1696,4 +1698,18 @@ SlowkingDexEntry:
 	dw 1750
 	text_far _SlowkingDexEntry
 	text_end 
+	
+ElectivireDexEntry:
+    db "THUNDER@"
+	db 5,11
+	dw 3060
+	text_far _ElectivireDexEntry
+	text_end
+	
+MagmortarDexEntry:
+    db "BLAST@"
+	db 5,3
+	dw 1500
+	text_far _MagmortarDexEntry
+	text_end
 	

data/pokemon/dex_order.asm

@@ -213,4 +213,6 @@ PokedexOrder:
 	db DEX_KINGDRA
 	db DEX_POLITOED
 	db DEX_SLOWKING
+	db DEX_ELECTIVIRE
+	db DEX_MAGMORTAR
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/evos_moves.asm

@@ -216,6 +216,8 @@ EvosMovesPointerTable:
 	dw KingdraEvosMoves
 	dw PolitoedEvosMoves
 	dw SlowkingEvosMoves
+	dw ElectivireEvosMoves
+	dw MagmortarEvosMoves
 	assert_table_length NUM_POKEMON_INDEXES
 
 RhydonEvosMoves:
@@ -820,7 +822,7 @@ BarundaEvosMoves:
 
 MagmarEvosMoves:
 ; Evolutions
-	;db EV_ITEM, FIRE_STONE, 1, MAGMORTAR
+	db EV_ITEM, FIRE_STONE, 1, MAGMORTAR
 	db 0
 ; Learnset
 	db 36, LEER
@@ -844,7 +846,7 @@ BuuEvosMoves:
 
 ElectabuzzEvosMoves:
 ; Evolutions
-	;db EV_ITEM, THUNDER_STONE, 1, ELECTIVIRE
+	db EV_ITEM, THUNDER_STONE, 1, ELECTIVIRE
 	db 0
 ; Learnset
 	db 34, THUNDERSHOCK
@@ -2740,3 +2742,28 @@ SlowkingEvosMoves:
 	db 44, AMNESIA
 	db 55, PSYCHIC_M
 	db 0
+
+ElectivireEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 34, THUNDERSHOCK
+	db 37, SCREECH
+	db 42, THUNDERPUNCH
+	db 49, LIGHT_SCREEN
+	db 54, THUNDER
+	db 58, LOW_KICK
+	db 0
+	
+MagmortarEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 36, LEER
+	db 39, CONFUSE_RAY
+	db 43, FIRE_PUNCH
+	db 48, SMOKESCREEN
+	db 52, SMOG
+	db 55, FLAMETHROWER
+	db 0
+	

data/pokemon/menu_icons.asm

@@ -177,7 +177,9 @@ MonPartyData:
 	nybble ICON_MON       ; Jynx
 	nybble ICON_MON       ; Buu
 	nybble ICON_MON       ; Electabuzz
+	nybble ICON_MON       ; Electivire
 	nybble ICON_MON       ; Magmar
+	nybble ICON_MON       ; Magmortar
 	nybble ICON_MON       ; Trampel
 	nybble ICON_QUADRUPED ; Tauros
 	nybble ICON_WATER     ; Magikarp

data/pokemon/names.asm

@@ -213,5 +213,7 @@ MonsterNames::
 	db "KINGDRA@@@"
 	db "POLITOED@@"
 	db "SLOWKING@@"
+	db "ELECTIVIRE"
+	db "MAGMORTAR@"
 	
 	assert_table_length NUM_POKEMON_INDEXES

data/pokemon/palettes.asm

@@ -178,7 +178,9 @@ MonsterPalettes:
 	db PAL_REDBAR    ; JYNX
 	db PAL_BLUEMON   ; BUU
 	db PAL_YELLOWMON ; ELECTABUZZ
+	db PAL_YELLOWMON ; ELECTIVIRE
 	db PAL_REDMON    ; MAGMAR
+	db PAL_REDMON    ; MAGMORTAR
 	db PAL_GREYMON   ; TRAMPEL
 	db PAL_BROWNMON  ; TAUROS
 	db PAL_REDMON    ; MAGIKARP

data/sgb/sgb_palettes.asm

@@ -27,10 +27,10 @@ SuperPalettes:
 	RGB 31,31,31, 31,15,18, 31,00,06, 03,03,03 ; PAL_PINKMON
 	RGB 31,31,31, 31,31,00, 28,14,00, 03,03,03 ; PAL_YELLOWMON
 	RGB 31,31,31, 18,18,19, 10,10,10, 03,03,03 ; PAL_GREYMON
-	RGB 31,31,31, 21,12,15, 21,14,00, 03,03,03 ; PAL_SLOTS1
-	RGB 31,31,31, 31,31,00, 09,05,30, 03,03,03 ; PAL_SLOTS2
-	RGB 31,31,31, 03,31,09, 09,05,30, 03,03,03 ; PAL_SLOTS3
-	RGB 31,31,31, 20,08,15, 09,05,30, 03,03,03 ; PAL_SLOTS4
+	RGB 31,31,31, 25,01,31, 31,00,00, 03,03,03 ; PAL_SLOTS1
+	RGB 31,31,31, 31,04,19, 31,31,00, 03,03,03 ; PAL_SLOTS2
+	RGB 31,31,31, 08,31,00, 31,31,00, 03,03,03 ; PAL_SLOTS3
+	RGB 31,31,31, 00,31,31, 31,31,00, 03,03,03 ; PAL_SLOTS4
 	RGB 31,31,31, 03,03,03, 03,03,03, 03,03,03 ; PAL_BLACK
 	RGB 31,31,31, 31,31,00, 00,31,00, 03,03,03 ; PAL_GREENBAR
 	RGB 31,31,31, 31,31,00, 31,18,00, 03,03,03 ; PAL_YELLOWBAR

data/trainers/parties.asm

@@ -653,7 +653,7 @@ MistyData:
 LtSurgeData:
 	db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNEMITE, 23, ELECTABUZZ, 24, GOROCHU, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, ELECTABUZZ, 67, GOROTORA, 67, ELECTRODE, 66, JOLTEON, 67, GOROCHU, 70, ZAPDOS, 0
+	; db $FF, 66, ELECTRODE, 67, GOROTORA, 67, ELECTIVIRE, 66, JOLTEON, 67, GOROCHU, 70, ZAPDOS, 0
 
 ErikaData:
 	db $FF, 28, WEEPINBELL, 28, GLOOM, 29, CACTUS, 28, PARASECT, 31, TANGROWTH, 0
@@ -666,9 +666,9 @@ KogaData:
 	; db $FF, 66, TENTACRUEL, 67, MUK, 67, WEEZING, 66, VENOMOTH, 67, TSUBOMITTO, 70, CROBAT, 0
 
 BlaineData:
-	db $FF, 45, MAGMAR, 44, NINETALES, 45, RAPIDASH, 44, FLAREON, 47, ARCANINE, 0
+	db $FF, 45, RAPIDASH, 44, NINETALES, 45, ARCANINE, 44, FLAREON, 47, MAGMORTAR, 0
 ; post-game rematch team (currently unused)
-	; db $FF, 66, MAGMAR, 67, NINETALES, 67, RAPIDASH, 66, FLAREON, 67, ARCANINE, 70, MOLTRES,  0
+	; db $FF, 66, NINETALES, 67, ARCANINE, 67, RAPIDASH, 66, FLAREON, 67, MAGMORTAR, 70, MOLTRES,  0
 
 SabrinaData:
 	db $FF, 39, JYNX, 40, MR_MIME, 39, SLOWKING, 40, HYPNO, 43, ALAKAZAM, 0

engine/debug/debug_party.asm

@@ -21,17 +21,17 @@ SetIshiharaTeam:
 	jr .loop
 
 IshiharaTeam:
-	db CROBAT, 90
+	db KINGDRA, 90
 IF DEF(_DEBUG)
-	db BLISSEY, 5
+	db ANIMON, 50
 ELSE
-	db BLISSEY, 20
+	db ANIMON, 20
 ENDC
-	db HITMONTOP, 56
-	db TSUBOMITTO, 56
-	db STEELIX, 57
+	db MAGMORTAR, 56
+	db ELECTIVIRE, 56
+	db PORYGON2, 57
 IF DEF(_DEBUG)
-	db KADABRA, 16 ; to test trade evos @ celadon uni - PvK
+	db POLIWHIRL, 16 ; to test trade evos @ celadon uni - PvK
 ENDC
 	db -1 ; end
 

gfx/pics.asm

@@ -464,9 +464,9 @@ RhyperiorPicBack::     INCBIN "gfx/pokemon/back/rhyperiorb.pic"
 KleavorPicFront::      INCBIN "gfx/pokemon/front/kleavor.pic"
 KleavorPicBack::       INCBIN "gfx/pokemon/back/kleavorb.pic"
 
-FossilKabutopsPic::   INCBIN "gfx/pokemon/front/fossilkabutops.pic"
-FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic"
-GhostPic::            INCBIN "gfx/battle/ghost.pic"
+FossilKabutopsPic::    INCBIN "gfx/pokemon/front/fossilkabutops.pic"
+FossilAerodactylPic::  INCBIN "gfx/pokemon/front/fossilaerodactyl.pic"
+GhostPic::             INCBIN "gfx/battle/ghost.pic"
 
 SECTION "Pics 9", ROMX
 
@@ -494,11 +494,15 @@ AnimonPicFront::       INCBIN "gfx/pokemon/front/animon.pic"
 AnimonPicBack::        INCBIN "gfx/pokemon/back/animonb.pic"
 BellossomPicFront::    INCBIN "gfx/pokemon/front/bellossom.pic"
 BellossomPicBack::     INCBIN "gfx/pokemon/back/bellossomb.pic"
-Porygon2PicFront::    INCBIN "gfx/pokemon/front/porygon2.pic"
-Porygon2PicBack::     INCBIN "gfx/pokemon/back/porygon2b.pic"
-KingdraPicFront::    INCBIN "gfx/pokemon/front/kingdra.pic"
-KingdraPicBack::     INCBIN "gfx/pokemon/back/kingdrab.pic"
+Porygon2PicFront::     INCBIN "gfx/pokemon/front/porygon2.pic"
+Porygon2PicBack::      INCBIN "gfx/pokemon/back/porygon2b.pic"
+KingdraPicFront::      INCBIN "gfx/pokemon/front/kingdra.pic"
+KingdraPicBack::       INCBIN "gfx/pokemon/back/kingdrab.pic"
 PolitoedPicFront::     INCBIN "gfx/pokemon/front/politoed.pic"
 PolitoedPicBack::      INCBIN "gfx/pokemon/back/politoedb.pic"
 SlowkingPicFront::     INCBIN "gfx/pokemon/front/slowking.pic"
 SlowkingPicBack::      INCBIN "gfx/pokemon/back/slowkingb.pic"
+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"