Bug fixes, and some balance changes

Author: Dakorias

constants/event_flags.asm

@@ -516,7 +516,6 @@
 ; Swimmer F
 
 ; Bird Keeper
-	const EVENT_BEAT_BIRD_KEEPER_PERRY
 
 ; Boarder
 
@@ -629,6 +628,49 @@
 	const EVENT_BEAT_YOUNGSTER_DAVID
 ; Teacher
 
+; Breeder
+
+; BugManiac
+
+; Clown
+
+; Cyclist
+
+; Nurse
+
+; Engineer
+
+; HexManiac
+
+; MysteryMan
+
+; Painter
+
+; Ranger
+
+; RuinManiac
+
+; ScubaDiver
+
+; SuperTrainer
+
+; Surfer
+
+; RocketCapt
+
+; RocketSci
+
+; Tourist
+
+; Survivalist
+	const EVENT_BEAT_SURVIVALIST_PERRY
+
+; Farmer
+
+; Gardener
+
+; Dancer
+
 ; Elite Four and Champion
 	const EVENT_BEAT_ELITE_4_WILL
 	const EVENT_BEAT_ELITE_4_KOGA

constants/trainer_constants.asm

@@ -89,7 +89,6 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
 
 	trainerclass YOUNGSTER ; 16
 	const KEVIN
-	const JAMES
 	const ALEX
 	const DANNY1
 	const ALLEN
@@ -103,7 +102,6 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
 	trainerclass DETECTIVE ; 17
 
 	trainerclass BIRD_KEEPER ; 18
-	const PERRY
 
 	trainerclass LASS ; 19
 	const ALEXIS
@@ -136,6 +134,7 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
 	const SABRINA1
 
 	trainerclass BUG_CATCHER ; 24
+	const JAMES
 
 	trainerclass FISHER ; 25
 	const ARNOLD
@@ -263,6 +262,7 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
 	trainerclass TOURIST ; 56
 
 	trainerclass SURVIVALIST ; 57
+	const PERRY
 
 	trainerclass FARMER ; 58
 

data/icon_pointers.asm

@@ -4,8 +4,8 @@ IconPointers:
 	dw NullIcon
 	dw EkansIcon
 	dw ArbokIcon
-	dw HoundourIcon
-	dw HoundoomIcon
+	dw YanmaIcon
+	dw YanmegaIcon
 	dw BaltoyIcon
 	dw ClaydolIcon
 	dw BidoofIcon
@@ -74,8 +74,8 @@ IconPointers:
 	dw Nidoran_fIcon
 	dw NidorinaIcon
 	dw NidoqueenIcon
-	dw YanmaIcon
-	dw YanmegaIcon
+	dw HoundourIcon
+	dw HoundoomIcon
 	dw NumelIcon
 	dw CameruptIcon
 	dw DrifloonIcon

data/moves/moves.asm

@@ -1,6 +1,6 @@
 	db BUTTERFREE ; 022
 
-	db  60,  45,  50,  70,  80,  80
+	db  60,  65,  50,  75,  90,  75
 	;   hp  atk  def  spd  sat  sdf
 
 	db BUG, PSYCHIC_TYPE ; type

data/pokemon/base_stats/butterfree.asm

@@ -1,6 +1,6 @@
 	db CLAYDOL ; 006
 
-	db  70,  80,  100,  60,  80,  110
+	db  70,  75,  105,  55,  75,  120
 	;   hp  atk  def  spd  sat  sdf
 
 	db GROUND, PSYCHIC_TYPE ; type

data/pokemon/base_stats/claydol.asm

@@ -1,6 +1,6 @@
 	db FURRET ; 019
 
-	db  85,  76,  64,  90,  45,  55
+	db  85,  76,  64, 100,  45,  55
 	;   hp  atk  def  spd  sat  sdf
 
 	db NORMAL, NORMAL ; type

data/pokemon/base_stats/furret.asm

@@ -1,6 +1,6 @@
 	db KINGLER ; 121
 
-	db  55, 130, 115,  75,  50,  50
+	db  55, 130,  50,  85,  50, 105
 	;   hp  atk  def  spd  sat  sdf
 
 	db POISON, WATER ; type

data/pokemon/base_stats/kingler.asm

@@ -1,6 +1,6 @@
 	db KRABBY ; 120
 
-	db  30, 105,  90,  50,  25,  25
+	db  30, 105,  25,  60,  25,  85
 	;   hp  atk  def  spd  sat  sdf
 
 	db POISON, WATER ; type

data/pokemon/base_stats/krabby.asm

@@ -1,6 +1,6 @@
 	db PIDGEOT ; 014
 
-	db  83,  80,  75,  91,  70,  70
+	db  80,  85,  75, 100,  60,  90
 	;   hp  atk  def  spd  sat  sdf
 
 	db NORMAL, FLYING ; type

data/pokemon/base_stats/pidgeot.asm

@@ -1,6 +1,6 @@
 	db PIDGEOTTO ; 013
 
-	db  63,  60,  55,  71,  50,  50
+	db  63,  65,  55,  71,  50,  60
 	;   hp  atk  def  spd  sat  sdf
 
 	db NORMAL, FLYING ; type

data/pokemon/base_stats/pidgeotto.asm

@@ -1,6 +1,6 @@
 	db PIDGEY ; 012
 
-	db  40,  45,  40,  56,  35,  35
+	db  40,  55,  40,  56,  35,  45
 	;   hp  atk  def  spd  sat  sdf
 
 	db NORMAL, FLYING ; type

data/pokemon/base_stats/pidgey.asm

@@ -1,6 +1,6 @@
 	db SENTRET ; 018
 
-	db  35,  46,  34,  20,  35,  45
+	db  45,  56,  44,  30,  35,  55
 	;   hp  atk  def  spd  sat  sdf
 
 	db NORMAL, NORMAL ; type