Merge branch 'master' of https://github.com/plaguevonkarma/kep-hack

README.md

@@ -28,6 +28,7 @@ Improved areas
 
 QoL Enhancements
 ====
+- DVs are erased and replaced with perfect 15s. 
 - PC added to Celadon Hotel where the invisible event usually is. Why not?
 - Artificial Save Delay has been removed.
 - Japanese event moves can now be taught via TM/HM;

constants/battle_constants.asm

@@ -66,9 +66,9 @@ DEF SLP_MASK EQU %111 ; 0-7 turns
 
 DEF MAX_STAT_VALUE EQU 999
 
-; trainer dvs
+; trainer dvs, these should be set to 15.
-DEF ATKDEFDV_TRAINER EQU $98
+DEF ATKDEFDV_TRAINER EQU $FF
-DEF SPDSPCDV_TRAINER EQU $88
+DEF SPDSPCDV_TRAINER EQU $FF
 
 ; wPlayerBattleStatus1 or wEnemyBattleStatus1 bit flags
 	const_def

constants/pokedex_constants.asm

@@ -165,7 +165,7 @@
 	const DEX_BLISSEY
 	const DEX_MONJA
 	const DEX_TANGELA    ; 114 
-	const DEX_TANGROWTH
+	;const DEX_TANGROWTH
 	const DEX_DECILLA   
 	const DEX_GYAOON     
 	const DEX_OMEGA      
@@ -185,7 +185,7 @@
 	const DEX_MR_MIME    ; 122
 	const DEX_SCYTHER    ; 123
 	const DEX_SCIZOR
-	const DEX_KLEAVOR
+	;const DEX_KLEAVOR
 	const DEX_PINSIR     ; 127
 	const DEX_PURAKKUSU
 	;const DEX_SMOOCHUM	
@@ -193,10 +193,10 @@
 	const DEX_BUU
 	;const DEX_ELEKID
 	const DEX_ELECTABUZZ ; 125
-	const DEX_ELECTIVIRE
+	;const DEX_ELECTIVIRE
 	;const DEX_MAGBY
 	const DEX_MAGMAR     ; 126
-	const DEX_MAGMORTAR
+	;const DEX_MAGMORTAR
 	const DEX_TRAMPEL    ; 
 	const DEX_TAUROS     ; 128
 	const DEX_MAGIKARP   ; 129
@@ -215,7 +215,7 @@
 	const DEX_SYLVEON
 	const DEX_PORYGON    ; 137
 	const DEX_PORYGON2
-	const DEX_PORYGONZ
+	;const DEX_PORYGONZ
 	const DEX_OMANYTE    ; 138
 	const DEX_OMASTAR    ; 139
 	const DEX_KABUTO     ; 140

constants/pokemon_constants.asm

@@ -222,11 +222,11 @@
 	const KINGDRA            ; $D5
 	const LICKILICKY         ; $D3
 	const MAGNEZONE          ; $D4
-	const TANGROWTH          ; $D6
+	;const TANGROWTH          ; $D6
-	const ELECTIVIRE         ; $D8
+	;const ELECTIVIRE         ; $D8
-	const MAGMORTAR          ; $D9
+	;const MAGMORTAR          ; $D9
-	const PORYGONZ          ; $DB
+	;const PORYGONZ           ; $DB
-	const KLEAVOR            ; $DC
+	;const KLEAVOR            ; $DC
 ;	const SIRFETCHD          ; $DD
 ;	const MR_RIME            ; $DE
 ;	const PERRSERKER         ; $DF

data/pokemon/base_stats.asm

@@ -43,7 +43,7 @@ INCLUDE "data/pokemon/base_stats/clefable.asm"
 INCLUDE "data/pokemon/base_stats/mikon.asm"
 INCLUDE "data/pokemon/base_stats/vulpix.asm"
 INCLUDE "data/pokemon/base_stats/ninetales.asm"
-INCLUDE "data/pokemon/base_stats/igglybuff.asm"
+;INCLUDE "data/pokemon/base_stats/igglybuff.asm"
 INCLUDE "data/pokemon/base_stats/jigglypuff.asm"
 INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
 INCLUDE "data/pokemon/base_stats/bittybat.asm"
@@ -145,7 +145,7 @@ INCLUDE "data/pokemon/base_stats/cubone.asm"
 INCLUDE "data/pokemon/base_stats/marowak.asm"
 INCLUDE "data/pokemon/base_stats/guardia.asm"
 INCLUDE "data/pokemon/base_stats/kangaskhan.asm"
-INCLUDE "data/pokemon/base_stats/tyrogue.asm"
+;INCLUDE "data/pokemon/base_stats/tyrogue.asm"
 INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
 INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
 INCLUDE "data/pokemon/base_stats/hitmontop.asm"
@@ -156,12 +156,12 @@ INCLUDE "data/pokemon/base_stats/weezing.asm"
 INCLUDE "data/pokemon/base_stats/rhyhorn.asm"
 INCLUDE "data/pokemon/base_stats/rhydon.asm"
 INCLUDE "data/pokemon/base_stats/rhyperior.asm"
-INCLUDE "data/pokemon/base_stats/happiny.asm"
+;INCLUDE "data/pokemon/base_stats/happiny.asm"
 INCLUDE "data/pokemon/base_stats/chansey.asm"
 INCLUDE "data/pokemon/base_stats/blissey.asm"
 INCLUDE "data/pokemon/base_stats/monja.asm"
 INCLUDE "data/pokemon/base_stats/tangela.asm"
-INCLUDE "data/pokemon/base_stats/tangrowth.asm"
+;INCLUDE "data/pokemon/base_stats/tangrowth.asm"
 INCLUDE "data/pokemon/base_stats/decilla.asm"
 INCLUDE "data/pokemon/base_stats/gyaoon.asm"
 INCLUDE "data/pokemon/base_stats/omega.asm"
@@ -177,22 +177,22 @@ INCLUDE "data/pokemon/base_stats/cryithan.asm"
 INCLUDE "data/pokemon/base_stats/staryu.asm"
 INCLUDE "data/pokemon/base_stats/starmie.asm"
 INCLUDE "data/pokemon/base_stats/jagg.asm"
-INCLUDE "data/pokemon/base_stats/mimejr.asm"
+;INCLUDE "data/pokemon/base_stats/mimejr.asm"
 INCLUDE "data/pokemon/base_stats/mrmime.asm"
 INCLUDE "data/pokemon/base_stats/scyther.asm"
 INCLUDE "data/pokemon/base_stats/scizor.asm"
-INCLUDE "data/pokemon/base_stats/kleavor.asm"
+;INCLUDE "data/pokemon/base_stats/kleavor.asm"
 INCLUDE "data/pokemon/base_stats/pinsir.asm"
 INCLUDE "data/pokemon/base_stats/purakkusu.asm"
-INCLUDE "data/pokemon/base_stats/smoochum.asm"
+;INCLUDE "data/pokemon/base_stats/smoochum.asm"
 INCLUDE "data/pokemon/base_stats/jynx.asm"
 INCLUDE "data/pokemon/base_stats/buu.asm"
 ;INCLUDE "data/pokemon/base_stats/elekid.asm"
 INCLUDE "data/pokemon/base_stats/electabuzz.asm"
-INCLUDE "data/pokemon/base_stats/electivire.asm"
+;INCLUDE "data/pokemon/base_stats/electivire.asm"
 ;INCLUDE "data/pokemon/base_stats/magby.asm"
 INCLUDE "data/pokemon/base_stats/magmar.asm"
-INCLUDE "data/pokemon/base_stats/magmortar.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"
@@ -211,7 +211,7 @@ INCLUDE "data/pokemon/base_stats/glaceon.asm"
 INCLUDE "data/pokemon/base_stats/sylveon.asm"
 INCLUDE "data/pokemon/base_stats/porygon.asm"
 INCLUDE "data/pokemon/base_stats/porygon2.asm"
-INCLUDE "data/pokemon/base_stats/porygonz.asm"
+;INCLUDE "data/pokemon/base_stats/porygonz.asm"
 INCLUDE "data/pokemon/base_stats/omanyte.asm"
 INCLUDE "data/pokemon/base_stats/omastar.asm"
 INCLUDE "data/pokemon/base_stats/kabuto.asm"

data/pokemon/base_stats/blissey.asm

@@ -1,14 +1,14 @@
 	db DEX_BLISSEY ; pokedex id
 
-	db 250,   5,   5,  50, 105
+	db 255,  10,  10,  55, 135
 	;   hp  atk  def  spd  spc
 
 	db NORMAL, NORMAL ; type
 	db 30 ; catch rate
 	db 255 ; base exp
 
-	INCBIN "gfx/pokemon/front/chansey.pic", 0, 1 ; sprite dimensions
+	INCBIN "gfx/pokemon/front/blissey.pic", 0, 1 ; sprite dimensions
-	dw ChanseyPicFront, ChanseyPicBack
+	dw BlisseyPicFront, BlisseyPicBack
 
 	db POUND, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_FAST ; growth rate
@@ -24,5 +24,5 @@
 	     FLASH
 	; end
 
-	db BANK(ChanseyPicFront)
+	db BANK(BlisseyPicFront)
-	assert BANK(ChanseyPicFront) == BANK(ChanseyPicBack)
+	assert BANK(BlisseyPicFront) == BANK(BlisseyPicBack)

data/pokemon/base_stats/crobat.asm

@@ -1,14 +1,14 @@
 	db DEX_CROBAT ; pokedex id
 
-	db  75,  80,  70,  90,  75
+	db  85,  90,  80, 130,  80
 	;   hp  atk  def  spd  spc
 
 	db POISON, FLYING ; type
 	db 90 ; catch rate
-	db 171 ; base exp
+	db 204 ; base exp
 
-	INCBIN "gfx/pokemon/front/golbat.pic", 0, 1 ; sprite dimensions
+	INCBIN "gfx/pokemon/front/crobat.pic", 0, 1 ; sprite dimensions
-	dw GolbatPicFront, GolbatPicBack
+	dw CrobatPicFront, CrobatPicBack
 
 	db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -16,8 +16,9 @@
 	; tm/hm learnset
 	tmhm RAZOR_WIND,   WHIRLWIND,    TOXIC,        TAKE_DOWN,    DOUBLE_EDGE,  \
 	     HYPER_BEAM,   RAGE,         MEGA_DRAIN,   MIMIC,        DOUBLE_TEAM,  \
-	     BIDE,         SWIFT,        REST,         SUBSTITUTE
+	     BIDE,         SWIFT,        SKY_ATTACK,   REST,         SUBSTITUTE,   \
+	     FLY
 	; end
 
-	db BANK(GolbatPicFront)
+	db BANK(CrobatPicFront)
-	assert BANK(GolbatPicFront) == BANK(GolbatPicBack)
+	assert BANK(CrobatPicFront) == BANK(CrobatPicBack)

data/pokemon/base_stats/hitmontop.asm

@@ -1,24 +1,24 @@
 	db DEX_HITMONTOP ; pokedex id
 
-	db  50, 120,  53,  87,  35
+	db  50,  95,  95,  70,  35
 	;   hp  atk  def  spd  spc
 
 	db FIGHTING, FIGHTING ; type
 	db 45 ; catch rate
-	db 139 ; base exp
+	db 138 ; base exp
 
-	INCBIN "gfx/pokemon/front/hitmonlee.pic", 0, 1 ; sprite dimensions
+	INCBIN "gfx/pokemon/front/hitmontop.pic", 0, 1 ; sprite dimensions
-	dw HitmonleePicFront, HitmonleePicBack
+	dw HitmontopPicFront, HitmontopPicBack
 
-	db DOUBLE_KICK, MEDITATE, NO_MOVE, NO_MOVE ; level 1 learnset
+	db ROLLING_KICK, 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,  SUBMISSION,   COUNTER,      SEISMIC_TOSS, RAGE,         \
-	     MIMIC,        DOUBLE_TEAM,  BIDE,         METRONOME,    SWIFT,        \
+	     DIG,          MIMIC,        DOUBLE_TEAM,  BIDE,         METRONOME,    \
-	     SKULL_BASH,   REST,         SUBSTITUTE,   STRENGTH
+	     SWIFT,        SKULL_BASH,   REST,         SUBSTITUTE,   STRENGTH
 	; end
 
-	db BANK(HitmonleePicFront)
+	db BANK(HitmontopPicFront)
-	assert BANK(HitmonleePicFront) == BANK(HitmonleePicBack)
+	assert BANK(HitmontopPicFront) == BANK(HitmontopPicBack)

data/pokemon/base_stats/politoed.asm

@@ -1,16 +1,16 @@
 	db DEX_POLITOED ; pokedex id
 
-	db  90,  85,  95,  70,  70
+	db  90,  75,  75,  70,  90
 	;   hp  atk  def  spd  spc
 
-	db WATER, FIGHTING ; type
+	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 185 ; base exp
 
-	INCBIN "gfx/pokemon/front/poliwrath.pic", 0, 1 ; sprite dimensions
+	INCBIN "gfx/pokemon/front/politoed.pic", 0, 1 ; sprite dimensions
-	dw PoliwrathPicFront, PoliwrathPicBack
+	dw PolitoedPicFront, PolitoedPicBack
 
-	db HYPNOSIS, WATER_GUN, DOUBLESLAP, BODY_SLAM ; level 1 learnset
+	db HYPNOSIS, WATER_GUN, BUBBLE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_SLOW ; growth rate
 
 	; tm/hm learnset
@@ -22,5 +22,5 @@
 	     SUBSTITUTE,   SURF,         STRENGTH
 	; end
 
-	db BANK(PoliwrathPicFront)
+	db BANK(PolitoedPicFront)
-	assert BANK(PoliwrathPicFront) == BANK(PoliwrathPicBack)
+	assert BANK(PolitoedPicFront) == BANK(PolitoedPicBack)

data/pokemon/base_stats/slowking.asm

@@ -1,14 +1,14 @@
 	db DEX_SLOWKING ; pokedex id
 
-	db  95,  75, 110,  30,  80
+	db  95,  75,  80,  30, 100
 	;   hp  atk  def  spd  spc
 
 	db WATER, PSYCHIC_TYPE ; type
-	db 75 ; catch rate
+	db 70 ; catch rate
 	db 164 ; base exp
 
-	INCBIN "gfx/pokemon/front/slowbro.pic", 0, 1 ; sprite dimensions
+	INCBIN "gfx/pokemon/front/slowking.pic", 0, 1 ; sprite dimensions
-	dw SlowbroPicFront, SlowbroPicBack
+	dw SlowkingPicFront, SlowkingPicBack
 
 	db CONFUSION, DISABLE, HEADBUTT, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
@@ -24,5 +24,5 @@
 	     FLASH
 	; end
 
-	db BANK(SlowbroPicFront)
+	db BANK(SlowkingPicFront)
-	assert BANK(SlowbroPicFront) == BANK(SlowbroPicBack)
+	assert BANK(SlowkingPicFront) == BANK(SlowkingPicBack)

data/pokemon/base_stats/steelix.asm

@@ -1,24 +1,25 @@
 	db DEX_STEELIX ; pokedex id
 
-	db  35,  45, 160,  70,  30
+	db  75,  85, 200,  30,  65
 	;   hp  atk  def  spd  spc
 
-	db ROCK, GROUND ; type
+	db STEEL, GROUND ; type
-	db 45 ; catch rate
+	db 25 ; catch rate
-	db 108 ; base exp
+	db 196 ; base exp
 
-	INCBIN "gfx/pokemon/front/onix.pic", 0, 1 ; sprite dimensions
+	INCBIN "gfx/pokemon/front/steelix.pic", 0, 1 ; sprite dimensions
-	dw OnixPicFront, OnixPicBack
+	dw SteelixPicFront, SteelixPicBack
 
 	db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset
 	db GROWTH_MEDIUM_FAST ; growth rate
 
 	; tm/hm learnset
-	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  RAGE,         \
+	tmhm TOXIC,        BODY_SLAM,    TAKE_DOWN,    DOUBLE_EDGE,  HYPER_BEAM,   \
-	     EARTHQUAKE,   FISSURE,      DIG,          MIMIC,        DOUBLE_TEAM,  \
+	     RAGE,         DRAGON_RAGE,  EARTHQUAKE,   FISSURE,      DIG,          \
-	     BIDE,         SELFDESTRUCT, SKULL_BASH,   REST,         EXPLOSION,    \
+	     MIMIC,        DOUBLE_TEAM,  BIDE,         SELFDESTRUCT, SKULL_BASH,   \
-	     ROCK_SLIDE,   SUBSTITUTE,   STRENGTH
+	     REST,         EXPLOSION,    ROCK_SLIDE,   SUBSTITUTE,   CUT,		   \
+	     STRENGTH
 	; end
 
-	db BANK(OnixPicFront)
+	db BANK(SteelixPicFront)
-	assert BANK(OnixPicFront) == BANK(OnixPicBack)
+	assert BANK(SteelixPicFront) == BANK(SteelixPicBack)

data/pokemon/cries.asm

@@ -221,11 +221,11 @@ CryData::
 	mon_cry SFX_CRY_00, $00, $00 ; Kingdra
 	mon_cry SFX_CRY_00, $00, $00 ; Lickilicky
 	mon_cry SFX_CRY_00, $00, $00 ; Magnezone
-	mon_cry SFX_CRY_00, $00, $00 ; Tangrowth
+	;mon_cry SFX_CRY_00, $00, $00 ; Tangrowth
-	mon_cry SFX_CRY_00, $00, $00 ; Electivire
+	;mon_cry SFX_CRY_00, $00, $00 ; Electivire
-	mon_cry SFX_CRY_00, $00, $00 ; Magmortar
+	;mon_cry SFX_CRY_00, $00, $00 ; Magmortar
-	mon_cry SFX_CRY_00, $00, $00 ; PorygonZ
+	;mon_cry SFX_CRY_00, $00, $00 ; PorygonZ
-	mon_cry SFX_CRY_00, $00, $00 ; Kleavor
+	;mon_cry SFX_CRY_00, $00, $00 ; Kleavor
 	;mon_cry SFX_CRY_00, $00, $00 ; Sirfetchd
 	;mon_cry SFX_CRY_00, $00, $00 ; Mr. Rime
 	;mon_cry SFX_CRY_00, $00, $00 ; Perrserker

data/pokemon/dex_entries.asm

@@ -215,11 +215,11 @@ PokedexEntryPointers:
 	dw KingdraDexEntry
 	dw LickilickyDexEntry
 	dw MagnezoneDexEntry
-	dw TangrowthDexEntry
+	;dw TangrowthDexEntry
-	dw ElectivireDexEntry
+	;dw ElectivireDexEntry
-	dw MagmortarDexEntry
+	;dw MagmortarDexEntry
-	dw PorygonZDexEntry
+	;dw PorygonZDexEntry
-	dw KleavorDexEntry
+	;dw KleavorDexEntry
 ; dw SirfetchdDexEntry
 ; dw MrRimeDexEntry
 ; dw PerrserkerDexEntry
@@ -233,7 +233,6 @@ PokedexEntryPointers:
 ; dw MimeJrDexEntry
 ; dw PichuDexEntry
 ; dw TyrogueDexEntry
-
 	assert_table_length NUM_POKEMON_INDEXES
 
 ; string: species name
@@ -1630,69 +1629,104 @@ SylveonDexEntry:
 CrobatDexEntry:
     db "BAT@"
 	db 5,11
-	dw 1653
+	dw 1650
 	text_far _CrobatDexEntry
 	text_end 
 	
 PolitoedDexEntry:
     db "FROG@"
 	db 3,7
-	dw 747
+	dw 750
 	text_far _PolitoedDexEntry
 	text_end 
 	
 SlowkingDexEntry:
     db "ROYAL@"
 	db 6,7
-	dw 1753
+	dw 1750
 	text_far _SlowkingDexEntry
 	text_end 
 	
 SteelixDexEntry:
     db "IRON SNAKE@"
 	db 30,2
-	dw 8818
+	dw 8820
 	text_far _SteelixDexEntry
 	text_end 
 	
 HitmontopDexEntry:
-    db "HANDSTAND@"
+    db "HEADSTAND@"
 	db 4,7
-	dw 1058
+	dw 1060
 	text_far _HitmontopDexEntry
 	text_end 
 
 BlisseyDexEntry:
-    db "HANDSTAND@"
+    db "HAPPINESS@"
-	db 4,7
+	db 4,11
-	dw 1058
+	dw 1030
 	text_far _BlisseyDexEntry
 	text_end
 
 Porygon2DexEntry:
-    db "HANDSTAND@"
+    db "VIRTUAL@"
-	db 4,7
+	db 2,0
-	dw 1058
+	dw 720
 	text_far _Porygon2DexEntry
 	text_end
 	
 KingdraDexEntry:
-    db "HANDSTAND@"
+    db "DRAGON@"
-	db 4,7
+	db 5,11
-	dw 1058
+	dw 3350
 	text_far _KingdraDexEntry
 	text_end
 	
 LickilickyDexEntry:
-    db "HANDSTAND@"
+    db "LICKING@"
-	db 4,7
+	db 5,7
-	dw 1058
+	dw 3090
 	text_far _LickilickyDexEntry
 	text_end
 	
 MagnezoneDexEntry:
-    db "HANDSTAND@"
+    db "MAGNETAREA@"
-	db 4,7
+	db 3,11
-	dw 1058
+	dw 3970
 	text_far _MagnezoneDexEntry
 	text_end
+
+;TangrowthDexEntry:
+    ;db "VINE@"
+	;db 6,7
+	;dw 2840
+	;text_far _TangrowthDexEntry
+	;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
+	
+;PorygonZDexEntry:
+    ;db "VIRTUAL@"
+	;db 2,11
+	;dw 750
+	;text_far _PorygonZDexEntry
+	;text_end
+	
+;KleavorDexEntry:
+    ;db "AXE@"
+	;db 5,11
+	;dw 1960
+	;text_far _KleavorDexEntry
+	;text_end

data/pokemon/dex_order.asm

@@ -215,11 +215,11 @@ PokedexOrder:
 	db DEX_KINGDRA
 	db DEX_LICKILICKY
 	db DEX_MAGNEZONE
-	db DEX_TANGROWTH
+	;db DEX_TANGROWTH
-	db DEX_ELECTIVIRE
+	;db DEX_ELECTIVIRE
-	db DEX_MAGMORTAR
+	;db DEX_MAGMORTAR
-	db DEX_PORYGONZ
+	;db DEX_PORYGONZ
-	db DEX_KLEAVOR
+	;db DEX_KLEAVOR
 	;db DEX_SIRFETCHD
 	;db DEX_MRRIME
 	;db DEX_PERRSERKER

data/pokemon/evos_moves.asm

@@ -218,11 +218,11 @@ EvosMovesPointerTable:
 	dw KingdraEvosMoves
 	dw LickilickyEvosMoves
 	dw MagnezoneEvosMoves
-	dw TangrowthEvosMoves
+	;dw TangrowthEvosMoves
-	dw ElectivireEvosMoves
+	;dw ElectivireEvosMoves
-	dw MagmortarEvosMoves
+	;dw MagmortarEvosMoves
-	dw PorygonZEvosMoves
+	;dw PorygonZEvosMoves
-	dw KleavorEvosMoves
+	;dw KleavorEvosMoves
 	;dw SirfetchdEvosMoves
 	;dw MrRimeEvosMoves
 	;dw PerrserkerEvosMoves
@@ -361,6 +361,7 @@ ExeggutorEvosMoves:
 
 LickitungEvosMoves:
 ; Evolutions
+	db EV_LEVEL, 37, LICKILICKY
 	db 0
 ; Learnset
 	db 7, STOMP
@@ -536,6 +537,7 @@ GastlyEvosMoves:
 ScytherEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 41, SCIZOR
+	;db EV_ITEM, MOON_STONE, 1, KLEAVOR
 	db 0
 ; Learnset
 	db 17, LEER
@@ -589,6 +591,7 @@ PinsirEvosMoves:
 
 TangelaEvosMoves:
 ; Evolutions
+	;db EV_LEVEL, 34, TANGROWTH
 	db 0
 ; Learnset
 	db 24, BIND
@@ -632,6 +635,7 @@ GrowlitheEvosMoves:
 
 OnixEvosMoves:
 ; Evolutions
+	db EV_LEVEL, 30, STEELIX
 	db 0
 ; Learnset
 	db 15, BIND
@@ -668,6 +672,7 @@ PidgeyEvosMoves:
 SlowpokeEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 37, SLOWBRO
+	db EV_ITEM, WATER_STONE, 1, SLOWKING
 	db 0
 ; Learnset
 	db 18, DISABLE
@@ -706,6 +711,7 @@ GravelerEvosMoves:
 
 ChanseyEvosMoves:
 ; Evolutions
+	db EV_LEVEL, 40, BLISSEY
 	db 0
 ; Learnset
 	db 12, DOUBLESLAP
@@ -833,6 +839,7 @@ BarundaEvosMoves:
 
 MagmarEvosMoves:
 ; Evolutions
+	;db EV_ITEM, FIRE_STONE, 1, MAGMORTAR
 	db 0
 ; Learnset
 	db 36, LEER
@@ -856,6 +863,7 @@ BuuEvosMoves:
 
 ElectabuzzEvosMoves:
 ; Evolutions
+	;db EV_ITEM, THUNDER_STONE, 1, ELECTIVIRE
 	db 0
 ; Learnset
 	db 34, THUNDERSHOCK
@@ -867,6 +875,7 @@ ElectabuzzEvosMoves:
 
 MagnetonEvosMoves:
 ; Evolutions
+	db EV_ITEM, THUNDER_STONE, 1, MAGNEZONE
 	db 0
 ; Learnset
 	db 21, SONICBOOM
@@ -1349,6 +1358,7 @@ HorseaEvosMoves:
 
 SeadraEvosMoves:
 ; Evolutions
+	db EV_LEVEL, 43, KINGDRA
 	db 0
 ; Learnset
 	db 19, SMOKESCREEN
@@ -1558,6 +1568,7 @@ ParasEvosMoves:
 PoliwhirlEvosMoves:
 ; Evolutions
 	db EV_ITEM, WATER_STONE, 1, POLIWRATH
+	db EV_ITEM, SUN_STONE, 1, POLITOED
 	db 0
 ; Learnset
 	db 16, HYPNOSIS
@@ -1780,6 +1791,7 @@ HypnoEvosMoves:
 
 GolbatEvosMoves:
 ; Evolutions
+	db EV_ITEM, MOON_STONE, 1, CROBAT
 	db 0
 ; Learnset
 	db 10, SUPERSONIC
@@ -2235,6 +2247,7 @@ GeodudeEvosMoves:
 
 PorygonEvosMoves:
 ; Evolutions	
+	db EV_LEVEL, 30, PORYGON2
 	db 0
 ; Learnset
 	db 23, PSYBEAM
@@ -2731,6 +2744,7 @@ BlisseyEvosMoves:
 	
 Porygon2EvosMoves:
 ; Evolutions
+	;db EV_LEVEL, 45, PORYGONZ
 	db 0
 ; Learnset
 	db 23, PSYBEAM

data/pokemon/menu_icons.asm

@@ -161,7 +161,7 @@ MonPartyData:
 	nybble ICON_FAIRY     ; Blissey
 	nybble ICON_GRASS     ; Monja
 	nybble ICON_GRASS     ; Tangela
-	nybble ICON_GRASS     ; Tangrowth
+	;nybble ICON_GRASS     ; Tangrowth
 	nybble ICON_MON	    ; Decilla
 	nybble ICON_MON	    ; Gyaoon
 	nybble ICON_MON	    ; Omega
@@ -181,7 +181,7 @@ MonPartyData:
 	nybble ICON_MON       ; Mr.Mime
 	nybble ICON_BUG       ; Scyther
 	nybble ICON_BUG       ; Scizor
-	nybble ICON_BUG       ; Kleavor
+	;nybble ICON_BUG       ; Kleavor
 	nybble ICON_BUG       ; Pinsir
 	nybble ICON_BUG       ; Purakkusu
 	;nybble ICON_FAIRY     ; Smoochum
@@ -189,10 +189,10 @@ MonPartyData:
 	nybble ICON_MON       ; Buu
 	;nybble ICON_FAIRY     ; Elekid
 	nybble ICON_MON       ; Electabuzz
-	nybble ICON_MON       ; Electivire
+	;nybble ICON_MON       ; Electivire
 	;nybble ICON_FAIRY     ; Magby
 	nybble ICON_MON       ; Magmar
-	nybble ICON_MON       ; Magmortar
+	;nybble ICON_MON       ; Magmortar
 	nybble ICON_MON       ; Trampel
 	nybble ICON_QUADRUPED ; Tauros
 	nybble ICON_WATER     ; Magikarp
@@ -211,7 +211,7 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Sylveon
 	nybble ICON_MON       ; Porygon
 	nybble ICON_MON       ; Porygon2
-	nybble ICON_BIRD      ; PorygonZ
+	;nybble ICON_MON       ; PorygonZ
 	nybble ICON_HELIX     ; Omanyte
 	nybble ICON_HELIX     ; Omastar
 	nybble ICON_HELIX     ; Kabuto

data/pokemon/names.asm

@@ -215,11 +215,11 @@ MonsterNames::
 	db "KINGDRA@@@"
 	db "LICKILICKY"
 	db "MAGNEZONE@"
-	db "TANGROWTH@"
+	;db "TANGROWTH@"
-	db "ELECTIVIRE"
+	;db "ELECTIVIRE"
-	db "MAGMORTAR@"
+	;db "MAGMORTAR@"
-	db "PORYGONZ@@"
+	;db "PORYGONZ@@"
-	db "KLEAVOR@@@"
+	;db "KLEAVOR@@@"
 	;db "SIRFETCH'D"
 	;db "MR.RIME@@@"
 	;db "PERRSERKER"

data/pokemon/new_dex_text.asm

@@ -539,23 +539,23 @@ _SlowkingDexEntry::
 	dex
 
 _SteelixDexEntry::
-	text "The many small"
+	text "The iron that it"
-	next "metal particles"
+	next "ingested with the"
-	next "that love this"
+	next "soil it swallowed"
 
-	page "@MON's body"
+	page "transformed its"
-	next "reflect bright"
+	next "body, making it"
-	next "light well"
+	next "incredibly tough"
 	dex
 
 _HitmontopDexEntry::
-	text "After doing a"
+	text "It fights while"
-	next "handstand to"
+	next "spinning around"
-	next "throw off the"
+	next "at high speed."
 
-	page "opponent's timing"
+	page "If it spins too"
-	next "it presents its"
+	next "fast, it may bore"
-	next "fancy kick moves"
+	next "into the ground"
 	dex
 	
 _BlisseyDexEntry::
@@ -563,49 +563,99 @@ _BlisseyDexEntry::
 	next "a bite of its"
 	next "egg becomes"
 
-	page "unfaillingly"
+	page "unfailingly"
 	next "caring and"
 	next "pleasant to all"
 	dex
 
 _Porygon2DexEntry::
-	text "This is a newly"
+	text "It was upgraded to"
-	next "discovered"
+	next "function in space."
-	next "#MON. It is"
+	next "PORYGON2 possesses"
 
-	page "currently under"
+	page "AI, which allows"
-	next "investigation. No"
+	next "it to learn and"
-	next "info is available"
+	next "develop itself"
 	dex
 	
 _KingdraDexEntry::
-	text "This is a newly"
+	text "Lives in caves on"
-	next "discovered"
+	next "the seafloor. A"
-	next "#MON. It is"
+	next "simple yawn from"
 
-	page "currently under"
+	page "this #MON is"
-	next "investigation. No"
+	next "enough to create"
-	next "info is available"
+	next "a huge whirlpool"
 	dex
 	
 _LickilickyDexEntry::
-	text "This is a newly"
+	text "It uses its long"
-	next "discovered"
+	next "tongue to wrap"
-	next "#MON. It is"
+	next "up an enemy,"
 
-	page "currently under"
+	page "leaving it soaked"
-	next "investigation. No"
+	next "in a saliva that"
-	next "info is available"
+	next "causes numbness"
 	dex
 	
 _MagnezoneDexEntry::
-	text "This is a newly"
+	text "It evolved from"
-	next "discovered"
+	next "exposure to a"
-	next "#MON. It is"
+	next "special magnetic"
 
-	page "currently under"
+	page "field. Its three"
-	next "investigation. No"
+	next "units generate"
-	next "info is available"
+	next "strong magnetism"
+	dex
+
+_TangrowthDexEntry::
+	text "It ensnares prey"
+	next "by extending its"
+	next "arms, which are"
+
+	page "made of vines."
+	next "They regenerate"
+	next "quickly if cut"
+	dex
+
+_ElectivireDexEntry::
+	text "It pushes the"
+	next "tips of its tails"
+	next "against a foe,"
+
+	page "before unleashing"
+	next "over 20,000 volts"
+	next "of electricity"
+	dex
+	
+_MagmortarDexEntry::
+	text "Blasts fireballs"
+	next "of over 3,600"
+	next "degrees Fahrenheit"
+
+	page "out of its arms."
+	next "It avoids this"
+	next "when hunting prey"
+	dex
+	
+_PorygonZDexEntry::
+	text "Corrupted by the"
+	next "faulty update"
+	next "added to it, this"
+
+	page "#MON exhibits"
+	next "strange behaviour"
+	next "and movements"
+	dex
+	
+_KleavorDexEntry::
+	text "The axes on its"
+	next "forearms are not"
+	next "only tough, but"
+
+	page "sharp enough to"
+	next "fall huge trees"
+	next "in a single slice"
 	dex
 
 _MissingNoDexEntry::
@@ -617,3 +667,4 @@ _MissingNoDexEntry::
 	next "investigation. No"
 	next "info is available"
 	dex
+

data/pokemon/palettes.asm

@@ -50,7 +50,7 @@ MonsterPalettes:
 	db PAL_BLUEMON   ; BITTYBAT
 	db PAL_BLUEMON   ; ZUBAT
 	db PAL_BLUEMON   ; GOLBAT
-	db PAL_BLUEMON   ; CROBAT
+	db PAL_PURPLEMON ; CROBAT
 	db PAL_GREENMON  ; ODDISH
 	db PAL_REDMON    ; GLOOM
 	db PAL_REDMON    ; VILEPLUME
@@ -69,6 +69,7 @@ MonsterPalettes:
 	db PAL_YELLOWMON ; KONYA
 	db PAL_YELLOWMON ; MEOWTH
 	db PAL_YELLOWMON ; PERSIAN
+	;db PAL_GREYMON   ; PERRSERKER
 	db PAL_YELLOWMON ; PSYDUCK
 	db PAL_GREENMON  ; WEIRDUCK
 	db PAL_CYANMON   ; GOLDUCK
@@ -111,6 +112,7 @@ MonsterPalettes:
 	db PAL_PINKMON   ; BARUNDA
 	db PAL_BROWNMON  ; FARFETCHD
 	db PAL_BROWNMON  ; MADAAMU
+	;db PAL_GREENMON  ; SIRFETCHD
 	db PAL_CYANMON   ; BLASTYKE
 	db PAL_CYANMON   ; BLASTOISE
 	db PAL_BROWNMON  ; HINAAZU
@@ -162,7 +164,7 @@ MonsterPalettes:
 	db PAL_PINKMON   ; BLISSEY
 	db PAL_BLUEMON   ; MONJA
 	db PAL_BLUEMON   ; TANGELA
-	db PAL_BLUEMON   ; TANGROWTH
+	;db PAL_BLUEMON   ; TANGROWTH
 	db PAL_GREENMON  ; DECILLA
 	db PAL_GREENMON  ; GYAOON
 	db PAL_GREYMON   ; OMEGA
@@ -178,22 +180,23 @@ MonsterPalettes:
 	db PAL_REDMON    ; STARYU
 	db PAL_PURPLEMON ; STARMIE
 	db PAL_BLUEMON   ; JAGG
-	;db PAL_BLUEMON   ; MIME JR
+	;db PAL_PINKMON   ; MIME JR
 	db PAL_PINKMON   ; MR_MIME
+	;db PAL_BLUEMON  ; MR_RIME
 	db PAL_GREENMON  ; SCYTHER
 	db PAL_GREENMON  ; SCIZOR
-	db PAL_BROWNMON  ; KLEAVOR
+	;db PAL_BROWNMON  ; KLEAVOR
 	db PAL_BROWNMON  ; PINSIR
 	db PAL_BROWNMON  ; PURAKKUSU
-	;db PAL_BLUEMON   ; SMOOCHUM
+	;db PAL_MEWMON    ; SMOOCHUM
-	db PAL_REDMON    ; JYNX
+	db PAL_REDBAR    ; JYNX
 	db PAL_BLUEMON   ; BUU
 	;db PAL_YELLOWMON  ; ELEKID
 	db PAL_YELLOWMON ; ELECTABUZZ
-	db PAL_YELLOWMON ; ELECTIVIRE
+	;db PAL_YELLOWMON ; ELECTIVIRE
 	;db PAL_REDMON    ; MAGBY
 	db PAL_REDMON    ; MAGMAR
-	db PAL_REDMON    ; MAGMORTAR
+	;db PAL_REDMON    ; MAGMORTAR
 	db PAL_GREYMON   ; TRAMPEL
 	db PAL_BROWNMON  ; TAUROS
 	db PAL_REDMON    ; MAGIKARP
@@ -212,7 +215,7 @@ MonsterPalettes:
 	db PAL_MEWMON    ; SYLVEON
 	db PAL_MEWMON    ; PORYGON
 	db PAL_MEWMON    ; PORYGON2
-	db PAL_MEWMON    ; PORYGONZ
+	;db PAL_MEWMON    ; PORYGONZ
 	db PAL_BLUEMON   ; OMANYTE
 	db PAL_BLUEMON   ; OMASTAR
 	db PAL_BROWNMON  ; KABUTO
@@ -220,9 +223,6 @@ MonsterPalettes:
 	db PAL_GREYMON   ; AERODACTYL
 	;db PAL_MEWMON    ; MUNCHLAX
 	db PAL_MEWMON    ; SNORLAX
-	;db PAL_GREENMON  ; PERRSERKER
-	;db PAL_REDMON    ; SIRFETCHD
-	;db PAL_CYANMON   ; MR. RIME
 	db PAL_BLUEMON   ; ARTICUNO
 	db PAL_YELLOWMON ; ZAPDOS
 	db PAL_REDMON    ; MOLTRES

data/trainers/special_moves.asm

@@ -4,14 +4,19 @@
 ;	db 0
 
 SpecialTrainerMoves:
-	db BUG_CATCHER, 15
+	; db BUG_CATCHER, 15
-	db 2, 2, TACKLE
+	; db 2, 2, TACKLE
-	db 2, 3, STRING_SHOT
+	; db 2, 3, STRING_SHOT
-	db 0
+	; db 0
 
-	db YOUNGSTER, 14
+; commenting the Bug Catcher and Youngster out as they don't exist in R/B
-	db 1, 4, FISSURE
+
-	db 0
+	; db YOUNGSTER, 14
+	; db 1, 4, FISSURE
+	; db 0
+
+
+; NOTE: update this to match their new teams
 
 	db BROCK, 1
 	db 2, 3, BIND

engine/battle/core.asm

@@ -6150,10 +6150,9 @@ LoadEnemyMonData:
 	ld b, SPDSPCDV_TRAINER
 	jr z, .storeDVs
 ; random DVs for wild mon
-	call BattleRandom
+	ld a, ATKDEFDV_TRAINER
-	ld b, a
+	ld b, SPDSPCDV_TRAINER
-	call BattleRandom
+	jr z, .storeDVs
-.storeDVs
 	ld hl, wEnemyMonDVs
 	ld [hli], a
 	ld [hl], b

gfx/pics.asm

@@ -486,3 +486,15 @@ GlaceonPicFront::      INCBIN "gfx/pokemon/front/glaceon.pic"
 GlaceonPicBack::       INCBIN "gfx/pokemon/back/glaceonb.pic"
 SylveonPicFront::      INCBIN "gfx/pokemon/front/sylveon.pic"
 SylveonPicBack::       INCBIN "gfx/pokemon/back/sylveonb.pic"
+CrobatPicFront::       INCBIN "gfx/pokemon/front/crobat.pic"
+CrobatPicBack::        INCBIN "gfx/pokemon/back/crobatb.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"
+SteelixPicFront::      INCBIN "gfx/pokemon/front/steelix.pic"
+SteelixPicBack::       INCBIN "gfx/pokemon/back/steelixb.pic"
+HitmontopPicFront::    INCBIN "gfx/pokemon/front/hitmontop.pic"
+HitmontopPicBack::     INCBIN "gfx/pokemon/back/hitmontopb.pic"
+BlisseyPicFront::      INCBIN "gfx/pokemon/front/blissey.pic"
+BlisseyPicBack::       INCBIN "gfx/pokemon/back/blisseyb.pic"

ram/wram.asm

@@ -2328,5 +2328,5 @@ wBoxDataEnd::
 SECTION "Stack", WRAM0
 
 ; the stack grows downward
-	ds $7D5 - 1
+	ds $FE - 1
 wStack:: db