From 1f57257315a6c2b64911a733f1554ef887aebc14 Mon Sep 17 00:00:00 2001
From: emaskyesmogon <79380228+emaskyesmogon@users.noreply.github.com>
Date: Thu, 29 Sep 2022 15:52:28 -0600
Subject: [PATCH] Pokemon Tower Shortened

Added wild mons to floor 2
---
 data/maps/objects/PokemonTower2F.asm |  2 +-
 data/maps/objects/PokemonTower6F.asm |  2 +-
 data/wild/maps/PokemonTower2F.asm    | 12 +++++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm
index e0635b68..e6d36931 100644
--- a/data/maps/objects/PokemonTower2F.asm
+++ b/data/maps/objects/PokemonTower2F.asm
@@ -2,7 +2,7 @@ PokemonTower2F_Object:
 	db $1 ; border block
 
 	def_warp_events
-	warp_event  3,  9, POKEMON_TOWER_3F, 1
+	warp_event  3,  9, POKEMON_TOWER_6F, 1
 	warp_event 18,  9, POKEMON_TOWER_1F, 3
 
 	def_bg_events
diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm
index fa828b16..fb1d2465 100644
--- a/data/maps/objects/PokemonTower6F.asm
+++ b/data/maps/objects/PokemonTower6F.asm
@@ -2,7 +2,7 @@ PokemonTower6F_Object:
 	db $1 ; border block
 
 	def_warp_events
-	warp_event 18,  9, POKEMON_TOWER_5F, 2
+	warp_event 18,  9, POKEMON_TOWER_2F, 2
 	warp_event  9, 16, POKEMON_TOWER_7F, 1
 
 	def_bg_events
diff --git a/data/wild/maps/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm
index f958e167..7476d226 100644
--- a/data/wild/maps/PokemonTower2F.asm
+++ b/data/wild/maps/PokemonTower2F.asm
@@ -1,5 +1,15 @@
 PokemonTower2FWildMons:
-	def_grass_wildmons 0 ; encounter rate
+	def_grass_wildmons 10 ; encounter rate
+	db 20, GASTLY
+	db 21, GASTLY
+	db 22, GASTLY
+	db 15, MIKON
+	db 16, MIKON
+	db 18, VULPIX
+	db 24, VULPIX
+	db 20, CUBONE
+	db 22, CUBONE
+	db 25, HAUNTER
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate