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

data/pokemon/base_stats/gyopin.asm

@@ -20,5 +20,5 @@
 	     SUBSTITUTE,   SURF
 	; end
 
-	ddb BANK(GyopinPicFront)
+	db BANK(GyopinPicFront)
 	assert BANK(GyopinPicFront) == BANK(GyopinPicBack)

data/pokemon/base_stats/purakkusu.asm

@@ -20,5 +20,5 @@
 	     REST,         SUBSTITUTE,   CUT,          STRENGTH
 	; end
 
-	ddb BANK(PurakkusuPicFront)
+	db BANK(PurakkusuPicFront)
 	assert BANK(PurakkusuPicFront) == BANK(PurakkusuPicBack)

data/wild/maps/PokemonTower3F.asm

@@ -5,8 +5,8 @@ PokemonTower3FWildMons:
 	db 22, GASTLY
 	db 23, GASTLY
 	db 19, GASTLY
-	db 18, GASTLY
+	db 18, VULPIX
-	db 24, GASTLY
+	db 24, VULPIX
 	db 20, CUBONE
 	db 22, CUBONE
 	db 25, HAUNTER

data/wild/maps/PokemonTower4F.asm

@@ -5,11 +5,11 @@ PokemonTower4FWildMons:
 	db 22, GASTLY
 	db 23, GASTLY
 	db 19, GASTLY
-	db 18, GASTLY
+	db 23, VULPIX
 	db 25, HAUNTER
 	db 20, CUBONE
 	db 22, CUBONE
-	db 24, GASTLY
+	db 24, VULPIX
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/PokemonTower5F.asm

@@ -4,12 +4,12 @@ PokemonTower5FWildMons:
 	db 21, GASTLY
 	db 22, GASTLY
 	db 23, GASTLY
-	db 19, GASTLY
+	db 23, VULPIX
-	db 18, GASTLY
+	db 24, VULPIX
 	db 25, HAUNTER
 	db 20, CUBONE
 	db 22, CUBONE
-	db 24, GASTLY
+	db 24, VULPIX
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/PokemonTower6F.asm

@@ -4,8 +4,8 @@ PokemonTower6FWildMons:
 	db 22, GASTLY
 	db 23, GASTLY
 	db 24, GASTLY
-	db 20, GASTLY
+	db 23, VULPIX
-	db 19, GASTLY
+	db 24, VULPIX
 	db 26, HAUNTER
 	db 22, CUBONE
 	db 24, CUBONE

data/wild/maps/PokemonTower7F.asm

@@ -3,13 +3,13 @@ PokemonTower7FWildMons:
 	db 21, GASTLY
 	db 22, GASTLY
 	db 23, GASTLY
-	db 24, GASTLY
+	db 24, VULPIX
-	db 20, GASTLY
+	db 25, VULPIX
 	db 28, HAUNTER
 	db 22, CUBONE
 	db 24, CUBONE
 	db 28, HAUNTER
-	db 30, HAUNTER
+	db 30, GENGAR
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/RockTunnel1F.asm

@@ -5,8 +5,8 @@ RockTunnel1FWildMons:
 	db 17, GEODUDE
 	db 15, MACHOP
 	db 16, GEODUDE
-	db 18, ZUBAT
+	db 18, CHARMANDER
-	db 15, ZUBAT
+	db 15, BITTYBAT
 	db 17, MACHOP
 	db 13, ONIX
 	db 15, ONIX

data/wild/maps/RockTunnelB1F.asm

@@ -2,14 +2,14 @@ RockTunnelB1FWildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 16, ZUBAT
 	db 17, ZUBAT
-	db 17, GEODUDE
+	db 17, RIBBITO
 	db 15, MACHOP
-	db 16, GEODUDE
+	db 16, SLOWPOKE
-	db 18, ZUBAT
+	db 18, BITTYBAT
 	db 17, MACHOP
-	db 17, ONIX
+	db 17, PSYDUCK
-	db 13, ONIX
+	db 13, CROCKY
-	db 18, GEODUDE
+	db 18, CROCKY
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route10.asm

@@ -1,25 +1,25 @@
 Route10WildMons:
 	def_grass_wildmons 15 ; encounter rate
-	db 16, VOLTORB
+	db 16, MAGNEMITE
-	db 16, SPEAROW
+	db 16, KOTORA
 	db 14, VOLTORB
 IF DEF(_RED)
 	db 11, EKANS
 	db 13, SPEAROW
 	db 15, EKANS
-	db 17, VOLTORB
+	db 17, BETOBEBII
-	db 17, SPEAROW
+	db 20, FEAROW
-	db 13, EKANS
+	db 13, SANDSHREW
-	db 17, EKANS
+	db 17, SANDSHREW
 ENDC
 IF DEF(_BLUE)
 	db 11, SANDSHREW
 	db 13, SPEAROW
 	db 15, SANDSHREW
-	db 17, VOLTORB
+	db 17, BETOBEBII
-	db 17, SPEAROW
+	db 20, FEAROW
-	db 13, SANDSHREW
+	db 13, EKANS
-	db 17, SANDSHREW
+	db 17, EKANS
 ENDC
 	end_grass_wildmons
 

data/wild/maps/Route12.asm

@@ -2,25 +2,25 @@ Route12WildMons:
 	def_grass_wildmons 15 ; encounter rate
 IF DEF(_RED)
 	db 24, ODDISH
-	db 25, PIDGEY
+	db 25, PIDGEOTTO
-	db 23, PIDGEY
+	db 23, BLASTYKE
-	db 24, VENONAT
+	db 24, BELLSPROUT
-	db 22, ODDISH
+	db 22, SQUIRTLE
-	db 26, VENONAT
+	db 26, BARUNDA
-	db 26, ODDISH
+	db 26, WEEPINBELL
-	db 27, PIDGEY
+	db 27, FARFETCHD
 	db 28, GLOOM
 	db 30, GLOOM
 ENDC
 IF DEF(_BLUE)
 	db 24, BELLSPROUT
-	db 25, PIDGEY
+	db 25, PIDGEOTTO
-	db 23, PIDGEY
+	db 23, BLASTYKE
-	db 24, VENONAT
+	db 24, ODDISH
-	db 22, BELLSPROUT
+	db 22, SQUIRTLE
-	db 26, VENONAT
+	db 26, BARUNDA
-	db 26, BELLSPROUT
+	db 26, GLOOM
-	db 27, PIDGEY
+	db 27, FARFETCHD
 	db 28, WEEPINBELL
 	db 30, WEEPINBELL
 ENDC

data/wild/maps/Route13.asm

@@ -2,24 +2,24 @@ Route13WildMons:
 	def_grass_wildmons 20 ; encounter rate
 IF DEF(_RED)
 	db 24, ODDISH
-	db 25, PIDGEY
+	db 25, FARFETCHD
-	db 27, PIDGEY
+	db 27, PIDGEOTTO
 	db 24, VENONAT
 	db 22, ODDISH
-	db 26, VENONAT
+	db 26, KRABBY
-	db 26, ODDISH
+	db 26, BELLSPROUT
 	db 25, DITTO
 	db 28, GLOOM
 	db 30, GLOOM
 ENDC
 IF DEF(_BLUE)
 	db 24, BELLSPROUT
-	db 25, PIDGEY
+	db 25, FARFETCHD
-	db 27, PIDGEY
+	db 27, PIDGEOTTO
 	db 24, VENONAT
 	db 22, BELLSPROUT
-	db 26, VENONAT
+	db 26, KRABBY
-	db 26, BELLSPROUT
+	db 26, ODDISH
 	db 25, DITTO
 	db 28, WEEPINBELL
 	db 30, WEEPINBELL

data/wild/maps/Route14.asm

@@ -1,27 +1,29 @@
 Route14WildMons:
 	def_grass_wildmons 15 ; encounter rate
 IF DEF(_RED)
-	db 24, ODDISH
-	db 26, PIDGEY
-	db 23, DITTO
-	db 24, VENONAT
-	db 22, ODDISH
-	db 26, VENONAT
 	db 26, ODDISH
-	db 30, GLOOM
+	db 28, PIDGEOTTO
+	db 25, DITTO
+	db 26, TANGELA
+	db 24, BELLSPROUT
+	db 28, VENOMOTH
+	db 28, GLOOM
+	db 32, WEEPINBELL
+	db 30, PIDGEOTTO
+	db 32, SCYTHER
 ENDC
 IF DEF(_BLUE)
-	db 24, BELLSPROUT
-	db 26, PIDGEY
-	db 23, DITTO
-	db 24, VENONAT
-	db 22, BELLSPROUT
-	db 26, VENONAT
 	db 26, BELLSPROUT
-	db 30, WEEPINBELL
-ENDC
 	db 28, PIDGEOTTO
+	db 25, DITTO
+	db 26, TANGELA
+	db 24, ODDISH
+	db 28, VENOMOTH
+	db 28, WEEPINBELL
+	db 32, GLOOM
 	db 30, PIDGEOTTO
+	db 32, PINSIR
+ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route15.asm

@@ -3,25 +3,25 @@ Route15WildMons:
 IF DEF(_RED)
 	db 24, ODDISH
 	db 26, DITTO
-	db 23, PIDGEY
+	db 23, PIDGEOTTO
 	db 26, VENONAT
 	db 22, ODDISH
-	db 28, VENONAT
+	db 28, DEER
-	db 26, ODDISH
+	db 26, BELLSPROUT
 	db 30, GLOOM
 ENDC
 IF DEF(_BLUE)
 	db 24, BELLSPROUT
 	db 26, DITTO
-	db 23, PIDGEY
+	db 23, PIDGEOTTO
 	db 26, VENONAT
 	db 22, BELLSPROUT
-	db 28, VENONAT
+	db 28, DEER
-	db 26, BELLSPROUT
+	db 26, ODDISH
 	db 30, WEEPINBELL
 ENDC
-	db 28, PIDGEOTTO
+	db 28, GAOTORA
-	db 30, PIDGEOTTO
+	db 30, GAOTORA
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route16.asm

@@ -1,13 +1,13 @@
 Route16WildMons:
 	def_grass_wildmons 25 ; encounter rate
 	db 20, SPEAROW
-	db 22, SPEAROW
+	db 22, FEAROW
-	db 18, RATTATA
+	db 18, GRIMER
 	db 20, DODUO
-	db 20, RATTATA
+	db 20, GRIMER
 	db 18, DODUO
 	db 22, DODUO
-	db 22, RATTATA
+	db 22, RATICATE
 	db 23, RATICATE
 	db 25, RATICATE
 	end_grass_wildmons

data/wild/maps/Route17.asm

@@ -1,15 +1,15 @@
 Route17WildMons:
 	def_grass_wildmons 25 ; encounter rate
-	db 20, SPEAROW
+	db 25, FEAROW
-	db 22, SPEAROW
+	db 27, RATICATE
 	db 25, RATICATE
-	db 24, DODUO
+	db 24, PUCHIKOON
 	db 27, RATICATE
 	db 26, DODUO
 	db 28, DODUO
-	db 29, RATICATE
+	db 29, GRIMER
-	db 25, FEAROW
+	db 25, EEVEE
-	db 27, FEAROW
+	db 27, DODRIO
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route18.asm

@@ -1,15 +1,15 @@
 Route18WildMons:
 	def_grass_wildmons 25 ; encounter rate
-	db 20, SPEAROW
+	db 27, FEAROW
-	db 22, SPEAROW
+	db 29, FEAROW
 	db 25, RATICATE
-	db 24, DODUO
+	db 24, GRIMER
-	db 25, FEAROW
+	db 25, GRIMER
 	db 26, DODUO
 	db 28, DODUO
 	db 29, RATICATE
-	db 27, FEAROW
+	db 27, GAOTORA
-	db 29, FEAROW
+	db 29, GAOTORA
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route21.asm

@@ -1,26 +1,26 @@
 Route21WildMons:
 	def_grass_wildmons 25 ; encounter rate
-	db 21, RATTATA
+	db 21, RATICATE
-	db 23, PIDGEY
+	db 23, PIDGEOTTO
-	db 30, RATICATE
+	db 30, BARUNDA
-	db 23, RATTATA
+	db 30, MR. MIME
-	db 21, PIDGEY
+	db 29, MR. MIME
-	db 30, PIDGEOTTO
+	db 29, GLOOM
-	db 32, PIDGEOTTO
+	db 29, WEEPINBELL
 	db 28, TANGELA
 	db 30, TANGELA
 	db 32, TANGELA
 	end_grass_wildmons
 
 	def_water_wildmons 5 ; encounter rate
-	db  5, TENTACOOL
-	db 10, TENTACOOL
-	db 15, TENTACOOL
-	db  5, TENTACOOL
-	db 10, TENTACOOL
-	db 15, TENTACOOL
-	db 20, TENTACOOL
 	db 30, TENTACOOL
-	db 35, TENTACOOL
+	db 30, TENTACOOL
-	db 40, TENTACOOL
+	db 35, BLOTTLE
+	db 35, BLOTTLE
+	db 30, TENTACOOL
+	db 35, BARUNDA
+	db 30, TENTACOOL
+	db 35, TENTACRUEL
+	db 35, PENDRAKEN
+	db 40, PENDRAKEN
 	end_water_wildmons

data/wild/maps/Route23.asm

@@ -1,25 +1,25 @@
 Route23WildMons:
 	def_grass_wildmons 10 ; encounter rate
-IF DEF(_RED)
-	db 26, EKANS
-ENDC
-IF DEF(_BLUE)
-	db 26, SANDSHREW
-ENDC
-	db 33, DITTO
-	db 26, SPEAROW
-	db 38, FEAROW
-	db 38, DITTO
-	db 38, FEAROW
 IF DEF(_RED)
 	db 41, ARBOK
 ENDC
 IF DEF(_BLUE)
 	db 41, SANDSLASH
 ENDC
-	db 43, DITTO
+	db 43, ANIMON
-	db 41, FEAROW
+	db 38, FEAROW
-	db 43, FEAROW
+	db 38, RHYHORN
+	db 38, EXEGGCUTE
+	db 40, PRIMEAPE
+IF DEF(_RED)
+	db 41, SCYTHER
+ENDC
+IF DEF(_BLUE)
+	db 41, PINSIR
+ENDC
+	db 43, EXEGGCUTE
+	db 41, ZUDUCK
+	db 38, TAUROS
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route7.asm

@@ -1,27 +1,27 @@
 Route7WildMons:
 	def_grass_wildmons 15 ; encounter rate
-	db 19, PIDGEY
+	db 22, PIDGEOTTO
 IF DEF(_RED)
 	db 19, ODDISH
 	db 17, MANKEY
-	db 22, ODDISH
+	db 22, BELLSPROUT
-	db 22, PIDGEY
+	db 19, HINAAZU
-	db 18, MANKEY
+	db 18, MEOWTH
 	db 18, GROWLITHE
 	db 20, GROWLITHE
-	db 19, MANKEY
+	db 19, VULPIX
-	db 20, MANKEY
+	db 20, VULPIX
 ENDC
 IF DEF(_BLUE)
 	db 19, BELLSPROUT
 	db 17, MEOWTH
-	db 22, BELLSPROUT
+	db 22, ODDISH
-	db 22, PIDGEY
+	db 19, HINAAZU
-	db 18, MEOWTH
+	db 18, MANKEY
 	db 18, VULPIX
 	db 20, VULPIX
-	db 19, MEOWTH
+	db 19, GROWLITHE
-	db 20, MEOWTH
+	db 20, GROWLITHE
 ENDC
 	end_grass_wildmons
 

data/wild/maps/Route8.asm

@@ -1,27 +1,27 @@
 Route8WildMons:
 	def_grass_wildmons 15 ; encounter rate
-	db 18, PIDGEY
+	db 20, PIDGEOTTO
 IF DEF(_RED)
 	db 18, MANKEY
 	db 17, EKANS
 	db 16, GROWLITHE
-	db 20, PIDGEY
+	db 18, BULBASAUR
-	db 20, MANKEY
+	db 20, SANDSHREW
 	db 19, EKANS
-	db 17, GROWLITHE
+	db 17, VULPIX
-	db 15, GROWLITHE
+	db 18, VULPIX
-	db 18, GROWLITHE
+	db 15, KADABRA
 ENDC
 IF DEF(_BLUE)
 	db 18, MEOWTH
 	db 17, SANDSHREW
 	db 16, VULPIX
-	db 20, PIDGEY
+	db 18, BULBASAUR
-	db 20, MEOWTH
+	db 20, EKANS
-	db 19, SANDSHREW
+	db 19, MANKEY
-	db 17, VULPIX
+	db 17, GROWLITHE
-	db 15, VULPIX
+	db 18, GROWLITHE
-	db 18, VULPIX
+	db 15, KADABRA
 ENDC
 	end_grass_wildmons
 

data/wild/maps/Route9.asm

@@ -5,21 +5,21 @@ Route9WildMons:
 	db 14, RATTATA
 IF DEF(_RED)
 	db 11, EKANS
-	db 13, SPEAROW
+	db 13, CUBONE
-	db 15, EKANS
+	db 15, CACTUS
-	db 17, RATTATA
+	db 17, RATICATE
-	db 17, SPEAROW
+	db 20, FEAROW
-	db 13, EKANS
+	db 13, SANDSHREW
-	db 17, EKANS
+	db 17, SANDSHREW
 ENDC
 IF DEF(_BLUE)
 	db 11, SANDSHREW
-	db 13, SPEAROW
+	db 13, CUBONE
-	db 15, SANDSHREW
+	db 15, CACTUS
-	db 17, RATTATA
+	db 17, RATICATE
-	db 17, SPEAROW
+	db 20, FEAROW
-	db 13, SANDSHREW
+	db 13, EKANS
-	db 17, SANDSHREW
+	db 17, EKANS
 ENDC
 	end_grass_wildmons
 

data/wild/maps/SeaRoutes.asm

@@ -3,14 +3,14 @@ SeaRoutesWildMons:
 	end_grass_wildmons
 
 	def_water_wildmons 5 ; encounter rate
-	db  5, TENTACOOL
+	db 25, TENTACOOL
-	db 10, TENTACOOL
-	db 15, TENTACOOL
-	db  5, TENTACOOL
-	db 10, TENTACOOL
-	db 15, TENTACOOL
-	db 20, TENTACOOL
 	db 30, TENTACOOL
-	db 35, TENTACOOL
+	db 35, BLOTTLE
-	db 40, TENTACOOL
+	db 35, BLOTTLE
+	db 30, CHEEP
+	db 30, CHEEP
+	db 30, TENTACRUEL
+	db 35, TENTACRUEL
+	db 35, PENDRAKEN
+	db 40, PENDRAKEN
 	end_water_wildmons