diff --git a/battle/battle.tscn b/battle/battle.tscn
index e37365bce66793cd1af98f7b36ae7339dd20ff7e..104a1b8e965cd9f21b36be394d666e279d02b609 100644
--- a/battle/battle.tscn
+++ b/battle/battle.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=2]
+[gd_scene load_steps=14 format=2]
 
 [ext_resource path="res://trainer/king/king.tres" type="Resource" id=1]
 [ext_resource path="res://battle/graphic.gd" type="Script" id=2]
@@ -14,23 +14,11 @@
 [ext_resource path="res://widgets/tween_ex.gd" type="Script" id=17]
 [ext_resource path="res://widgets/pokemon_menu.tscn" type="PackedScene" id=18]
 
-[sub_resource type="StyleBoxFlat" id=1]
-content_margin_left = 1.0
-content_margin_right = 1.0
-content_margin_top = 1.0
-content_margin_bottom = 1.0
-
-[sub_resource type="StyleBoxFlat" id=2]
-content_margin_left = 1.0
-content_margin_right = 1.0
-content_margin_top = 1.0
-content_margin_bottom = 1.0
-
 [node name="battle" type="ColorRect"]
 anchor_right = 1.0
 anchor_bottom = 1.0
 theme = ExtResource( 3 )
-color = Color( 0.6, 0.6, 0.6, 1 )
+color = Color( 0.113725, 0.368627, 0.482353, 1 )
 script = ExtResource( 8 )
 __meta__ = {
 "_edit_use_anchors_": false
@@ -74,7 +62,6 @@ margin_right = 160.283
 margin_bottom = 144.051
 rect_min_size = Vector2( 0, 48 )
 size_flags_vertical = 10
-custom_styles/panel = SubResource( 1 )
 script = ExtResource( 12 )
 __meta__ = {
 "_edit_use_anchors_": false
@@ -82,10 +69,8 @@ __meta__ = {
 menu_items = [ NodePath("m/m/rows/col_1/fight"), NodePath("m/m/rows/col_1/item"), NodePath("m/m/rows/col_2/pokemon"), NodePath("m/m/rows/col_2/run") ]
 
 [node name="m" type="NinePatchRect" parent="action_menu"]
-margin_left = 1.0
-margin_top = 1.0
-margin_right = 98.9998
-margin_bottom = 47.0
+margin_right = 99.9998
+margin_bottom = 48.0
 texture = ExtResource( 11 )
 patch_margin_left = 8
 patch_margin_top = 8
@@ -106,12 +91,12 @@ __meta__ = {
 [node name="rows" type="HBoxContainer" parent="action_menu/m/m"]
 margin_left = 6.0
 margin_top = 6.0
-margin_right = 91.0
-margin_bottom = 40.0
+margin_right = 93.0
+margin_bottom = 42.0
 
 [node name="col_1" type="VBoxContainer" parent="action_menu/m/m/rows"]
 margin_right = 47.0
-margin_bottom = 34.0
+margin_bottom = 36.0
 
 [node name="fight" parent="action_menu/m/m/rows/col_1" instance=ExtResource( 7 )]
 capitalize = true
@@ -127,12 +112,12 @@ text = "item"
 [node name="col_2" type="VBoxContainer" parent="action_menu/m/m/rows"]
 margin_left = 51.0
 margin_right = 84.0
-margin_bottom = 34.0
+margin_bottom = 36.0
 
 [node name="pokemon" parent="action_menu/m/m/rows/col_2" instance=ExtResource( 7 )]
 margin_right = 33.0
 capitalize = true
-text = "pkm"
+text = "hat"
 
 [node name="run" parent="action_menu/m/m/rows/col_2" instance=ExtResource( 7 )]
 margin_top = 17.0
@@ -149,17 +134,14 @@ margin_right = 160.0
 margin_bottom = 144.0
 rect_min_size = Vector2( 0, 48 )
 size_flags_vertical = 10
-custom_styles/panel = SubResource( 2 )
 script = ExtResource( 12 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="m" type="NinePatchRect" parent="fight_menu"]
-margin_left = 1.0
-margin_top = 1.0
-margin_right = 125.0
-margin_bottom = 47.0
+margin_right = 126.0
+margin_bottom = 48.0
 texture = ExtResource( 11 )
 patch_margin_left = 8
 patch_margin_top = 8
@@ -180,8 +162,8 @@ __meta__ = {
 [node name="col_1" type="VBoxContainer" parent="fight_menu/m/m"]
 margin_left = 6.0
 margin_top = 4.0
-margin_right = 118.0
-margin_bottom = 40.0
+margin_right = 120.0
+margin_bottom = 42.0
 custom_constants/separation = -5
 
 [node name="yes_no_menu" type="PanelContainer" parent="."]
@@ -190,7 +172,6 @@ margin_top = 61.0
 margin_right = 46.0
 margin_bottom = 97.0
 size_flags_vertical = 10
-custom_styles/panel = SubResource( 2 )
 script = ExtResource( 12 )
 __meta__ = {
 "_edit_use_anchors_": false
@@ -247,7 +228,6 @@ margin_right = 160.0
 margin_bottom = 104.0
 rect_min_size = Vector2( 0, 48 )
 size_flags_vertical = 10
-custom_styles/panel = SubResource( 1 )
 script = ExtResource( 12 )
 __meta__ = {
 "_edit_use_anchors_": false
diff --git a/church.kra b/church.kra
new file mode 100644
index 0000000000000000000000000000000000000000..e25b2f7c97c5cd1683a8f48cc5d3ea9ad0d12ae1
Binary files /dev/null and b/church.kra differ
diff --git a/crybaby.png b/crybaby.png
index 8737656ee65531b76603b3beabb9890dc26fad69..0d345f4998dc28dea7c35a5e26bbf36929eb3a4d 100644
Binary files a/crybaby.png and b/crybaby.png differ
diff --git a/game.tscn b/game.tscn
index b4c7af705b1235fec26e9720386fd13ce725f09a..e3c2e29f2b7b73dbc8c3af4b1c49293214f7749f 100644
--- a/game.tscn
+++ b/game.tscn
@@ -5,7 +5,7 @@
 [ext_resource path="res://game.gd" type="Script" id=3]
 [ext_resource path="res://music/mars.mp3" type="AudioStream" id=4]
 [ext_resource path="res://trainer/red/red.tres" type="Resource" id=5]
-[ext_resource path="res://trainer/skull/skull.tres" type="Resource" id=6]
+[ext_resource path="res://trainer/rude_man/skull.tres" type="Resource" id=6]
 
 [node name="Node2D" type="Node2D"]
 script = ExtResource( 3 )
diff --git a/moves/cut/cut_graphic.tscn b/moves/cut/cut_graphic.tscn
index a88be9431f6560fca4f942b8cbb2510ebfd80a73..358bd95cd2b640968fdda9b4868610cf4db8762b 100644
--- a/moves/cut/cut_graphic.tscn
+++ b/moves/cut/cut_graphic.tscn
@@ -25,6 +25,7 @@ animations = [ {
 script = ExtResource( 11 )
 
 [node name="c" type="CanvasLayer" parent="."]
+layer = 2
 
 [node name="shader" parent="c" instance=ExtResource( 1 )]
 
@@ -32,7 +33,7 @@ script = ExtResource( 11 )
 position = Vector2( 80, 71 )
 scale = Vector2( 0.5, 0.5 )
 frames = SubResource( 1 )
-frame = 1
+frame = 6
 playing = true
 
 [node name="audio" type="AudioStreamPlayer" parent="."]
diff --git a/moves/electric/thunderbolt_graphic.tscn b/moves/electric/thunderbolt_graphic.tscn
index c74cd507fd9e1875a8d0abcbef9c5a0b279d751c..0608d8af97593c1418d3aa1c258bcc38617eeebd 100644
--- a/moves/electric/thunderbolt_graphic.tscn
+++ b/moves/electric/thunderbolt_graphic.tscn
@@ -25,6 +25,7 @@ animations = [ {
 script = ExtResource( 11 )
 
 [node name="c" type="CanvasLayer" parent="."]
+layer = 2
 
 [node name="shader" parent="c" instance=ExtResource( 5 )]
 rect_min_size = Vector2( 160, 144 )
@@ -32,7 +33,7 @@ rect_min_size = Vector2( 160, 144 )
 [node name="sprite" type="AnimatedSprite" parent="."]
 scale = Vector2( 0.25, 0.25 )
 frames = SubResource( 1 )
-frame = 1
+frame = 5
 playing = true
 
 [node name="audio" type="AudioStreamPlayer" parent="."]
diff --git a/moves/horn/horn_graphic.tscn b/moves/horn/horn_graphic.tscn
index 66154836dacd1f6d9a65e68f3e738756c56c56a4..9c1ca08f0ddcfb5f4997c5357cd9d947ccfabcb2 100644
--- a/moves/horn/horn_graphic.tscn
+++ b/moves/horn/horn_graphic.tscn
@@ -25,6 +25,7 @@ animations = [ {
 script = ExtResource( 11 )
 
 [node name="c" type="CanvasLayer" parent="."]
+layer = 2
 
 [node name="shader" parent="c" instance=ExtResource( 1 )]
 
@@ -32,7 +33,7 @@ script = ExtResource( 11 )
 position = Vector2( 80, 71 )
 scale = Vector2( 0.5, 0.5 )
 frames = SubResource( 1 )
-frame = 3
+frame = 1
 playing = true
 
 [node name="audio" type="AudioStreamPlayer" parent="."]
diff --git a/player.gd b/player.gd
index 90aebfe4d92a6e9b045d7057055dc76645621b6f..bc9373be81f6296373b249eed4e4d8cdef7d0d99 100644
--- a/player.gd
+++ b/player.gd
@@ -46,15 +46,18 @@ func _process(delta:float):
 		ray_.rotation = moves_.front().angle()
 		ray_.force_raycast_update()
 		if ray_.is_colliding():
-			$animation.animation = animation_[moves_.front()]
+			#$animation.animation = animation_[moves_.front()]
 			moves_.pop_front()
 		else:
 			moving_to_ = floor_vec2(global_position) + moves_.front() * tile_size
 
 	if not moves_.empty():
-		$animation.animation = animation_[moves_.front()]
+		#$animation.animation = animation_[moves_.front()]
 		global_position = global_position.move_toward(moving_to_, delta * 20.0)
 		if global_position.distance_to(moving_to_) <= 0.1:
 			global_position = moving_to_
 			moving_to_ = null
 			moves_.pop_front()
+
+		
+		
diff --git a/pokemon/wizard_hat/front.png b/pokemon/wizard_hat/front.png
index a615e3668acffdaaac32eeda52976655065318a2..3dec8a1a2792af764def213f5de3d709dd4d2c94 100644
Binary files a/pokemon/wizard_hat/front.png and b/pokemon/wizard_hat/front.png differ
diff --git a/trainer/blue/blue_trainer_graphic.tscn b/trainer/blue/blue_trainer_graphic.tscn
index 885cbe303f64847829ebfa8a33447e863571a359..9cc74692288aa914a9818fa89ecba14b589f66ce 100644
--- a/trainer/blue/blue_trainer_graphic.tscn
+++ b/trainer/blue/blue_trainer_graphic.tscn
@@ -1,9 +1,10 @@
 [gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://trainer/trainer_graphic.gd" type="Script" id=1]
-[ext_resource path="res://trainer/blue/char04_0006.png" type="Texture" id=2]
 [ext_resource path="res://pokemon/horns/back.png" type="Texture" id=3]
 
+[sub_resource type="StreamTexture" id=1]
+
 [node name="blue_trainer_graphic" type="Node2D"]
 script = ExtResource( 1 )
 
@@ -12,18 +13,13 @@ visible = false
 use_parent_material = true
 position = Vector2( 138, 30 )
 scale = Vector2( 0.642857, 0.642857 )
-texture = ExtResource( 2 )
+texture = SubResource( 1 )
 
 [node name="back" type="Sprite" parent="."]
 use_parent_material = true
-position = Vector2( 31, 81 )
+position = Vector2( 31, 82 )
+rotation = -0.15708
 scale = Vector2( 0.696429, 0.696429 )
-texture = ExtResource( 2 )
-
-[node name="Back" type="Sprite" parent="back"]
-use_parent_material = true
-position = Vector2( -2.87179, -48.8205 )
-scale = Vector2( 0.743139, 0.743139 )
 texture = ExtResource( 3 )
 
 [node name="enter" type="AudioStreamPlayer" parent="."]
diff --git a/trainer/blue/char04_0000.png b/trainer/blue/char04_0000.png
new file mode 100644
index 0000000000000000000000000000000000000000..2128c69697d3ced8988cc057db7a45efadf91aac
Binary files /dev/null and b/trainer/blue/char04_0000.png differ
diff --git a/trainer/king/char01_0000.png.import b/trainer/blue/char04_0000.png.import
similarity index 70%
rename from trainer/king/char01_0000.png.import
rename to trainer/blue/char04_0000.png.import
index 5b0a364a8fc317635c798da39ddba69860d5321f..5124d8f5d008ff502554c5244ce0051e25955c2b 100644
--- a/trainer/king/char01_0000.png.import
+++ b/trainer/blue/char04_0000.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/char01_0000.png-4bf886a24c320370ac22f4e9ceff8890.stex"
+path="res://.import/char04_0000.png-879843dbf5a496045839620484d8ebdb.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://trainer/king/char01_0000.png"
-dest_files=[ "res://.import/char01_0000.png-4bf886a24c320370ac22f4e9ceff8890.stex" ]
+source_file="res://trainer/blue/char04_0000.png"
+dest_files=[ "res://.import/char04_0000.png-879843dbf5a496045839620484d8ebdb.stex" ]
 
 [params]
 
diff --git a/trainer/blue/char04_0001.png b/trainer/blue/char04_0001.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a934b5964550ad0b14ec9078e64247c878b9968
Binary files /dev/null and b/trainer/blue/char04_0001.png differ
diff --git a/trainer/skull/char02_0000.png.import b/trainer/blue/char04_0001.png.import
similarity index 70%
rename from trainer/skull/char02_0000.png.import
rename to trainer/blue/char04_0001.png.import
index 126216712bd0596a41d696294066e322e146e09f..71e7b0bdc7ec7e47bb1ee3d6e2dbf27a77f06af3 100644
--- a/trainer/skull/char02_0000.png.import
+++ b/trainer/blue/char04_0001.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/char02_0000.png-fc920a2c1e5d67899ddcf1e0a5a4dd59.stex"
+path="res://.import/char04_0001.png-2100bf2fe3aa877c9bfa307e28fc113b.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://trainer/skull/char02_0000.png"
-dest_files=[ "res://.import/char02_0000.png-fc920a2c1e5d67899ddcf1e0a5a4dd59.stex" ]
+source_file="res://trainer/blue/char04_0001.png"
+dest_files=[ "res://.import/char04_0001.png-2100bf2fe3aa877c9bfa307e28fc113b.stex" ]
 
 [params]
 
diff --git a/trainer/blue/char04_0002.png b/trainer/blue/char04_0002.png
new file mode 100644
index 0000000000000000000000000000000000000000..15b1a4ee6e0d84bab1e757ec72bf2e11a5913952
Binary files /dev/null and b/trainer/blue/char04_0002.png differ
diff --git a/trainer/skull/groundSpike02_0007.png.import b/trainer/blue/char04_0002.png.import
similarity index 68%
rename from trainer/skull/groundSpike02_0007.png.import
rename to trainer/blue/char04_0002.png.import
index c032a24741d7a7b6f4e62a5a020c2cf5f925855e..835b4f2e846aaa1a5f20f7e9bc3bcda8ebf059e7 100644
--- a/trainer/skull/groundSpike02_0007.png.import
+++ b/trainer/blue/char04_0002.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/groundSpike02_0007.png-7acd591d9cca8881daf778e569f27f1d.stex"
+path="res://.import/char04_0002.png-fe8fb8bff7cb7fb7f2e71d8c736479be.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://trainer/skull/groundSpike02_0007.png"
-dest_files=[ "res://.import/groundSpike02_0007.png-7acd591d9cca8881daf778e569f27f1d.stex" ]
+source_file="res://trainer/blue/char04_0002.png"
+dest_files=[ "res://.import/char04_0002.png-fe8fb8bff7cb7fb7f2e71d8c736479be.stex" ]
 
 [params]
 
diff --git a/trainer/blue/char04_0003.png b/trainer/blue/char04_0003.png
new file mode 100644
index 0000000000000000000000000000000000000000..574e24b81ff4e7464f8c06db876ded36d0b16471
Binary files /dev/null and b/trainer/blue/char04_0003.png differ
diff --git a/trainer/blue/char04_0003.png.import b/trainer/blue/char04_0003.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..fd1bacb078c10694cbea70205472212ad94fa9c4
--- /dev/null
+++ b/trainer/blue/char04_0003.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/char04_0003.png-d26a492dc4aefcbd31104cc062f3e774.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/blue/char04_0003.png"
+dest_files=[ "res://.import/char04_0003.png-d26a492dc4aefcbd31104cc062f3e774.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/blue/char04_0004.png b/trainer/blue/char04_0004.png
new file mode 100644
index 0000000000000000000000000000000000000000..066bbaa5a871771a6eae5fc869b5f82daf8fe6af
Binary files /dev/null and b/trainer/blue/char04_0004.png differ
diff --git a/trainer/blue/char04_0004.png.import b/trainer/blue/char04_0004.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..406d0df6a389485b1440ba36258e11ddcebb30a1
--- /dev/null
+++ b/trainer/blue/char04_0004.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/char04_0004.png-7d40a9cf744a061b3518e9b61694fb66.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/blue/char04_0004.png"
+dest_files=[ "res://.import/char04_0004.png-7d40a9cf744a061b3518e9b61694fb66.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/blue/char04_0005.png b/trainer/blue/char04_0005.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e37d8dcdf325a076cf7f0363886406bad8d8b03
Binary files /dev/null and b/trainer/blue/char04_0005.png differ
diff --git a/trainer/blue/char04_0005.png.import b/trainer/blue/char04_0005.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..2dc92e6bb43ab774c07e7d3e2436fe940286441b
--- /dev/null
+++ b/trainer/blue/char04_0005.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/char04_0005.png-db53629d0f9264572d090b24e9a5e3f6.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/blue/char04_0005.png"
+dest_files=[ "res://.import/char04_0005.png-db53629d0f9264572d090b24e9a5e3f6.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/blue/char04_0007.png b/trainer/blue/char04_0007.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a49634a505bab36e421b82dc024e7405eeb0262
Binary files /dev/null and b/trainer/blue/char04_0007.png differ
diff --git a/trainer/blue/char04_0007.png.import b/trainer/blue/char04_0007.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..8db88f06a5a726f4a7d1761e9019f57fa4811d28
--- /dev/null
+++ b/trainer/blue/char04_0007.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/char04_0007.png-b0b52dd9829cf2b7c9356a0082e4c6eb.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/blue/char04_0007.png"
+dest_files=[ "res://.import/char04_0007.png-b0b52dd9829cf2b7c9356a0082e4c6eb.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/blue/pug.kra b/trainer/blue/pug.kra
new file mode 100644
index 0000000000000000000000000000000000000000..fe7f6d3bb4cb20a47c4d54a6a4ac73ea99bdb582
Binary files /dev/null and b/trainer/blue/pug.kra differ
diff --git a/trainer/blue/pug.png b/trainer/blue/pug.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ab64c6cf4c86e12fbec0fa942d64a4efdd01c8f
Binary files /dev/null and b/trainer/blue/pug.png differ
diff --git a/trainer/skull/skull0000.png.import b/trainer/blue/pug.png.import
similarity index 71%
rename from trainer/skull/skull0000.png.import
rename to trainer/blue/pug.png.import
index 3b497984ad3af00a9167057fbb74a33b514e6e56..eb957f5fdf783308f8f89bc8bd24b0bb95c9e0ed 100644
--- a/trainer/skull/skull0000.png.import
+++ b/trainer/blue/pug.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/skull0000.png-08819f686d257e95a6d5acebd6593579.stex"
+path="res://.import/pug.png-86adfd12688112cb584c73a7aa58afb0.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://trainer/skull/skull0000.png"
-dest_files=[ "res://.import/skull0000.png-08819f686d257e95a6d5acebd6593579.stex" ]
+source_file="res://trainer/blue/pug.png"
+dest_files=[ "res://.import/pug.png-86adfd12688112cb584c73a7aa58afb0.stex" ]
 
 [params]
 
diff --git a/trainer/blue/pug2.png b/trainer/blue/pug2.png
new file mode 100644
index 0000000000000000000000000000000000000000..afbbafabed16cc1c094cc5c5162a870c7417da6b
Binary files /dev/null and b/trainer/blue/pug2.png differ
diff --git a/trainer/blue/pug2.png.import b/trainer/blue/pug2.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..4900bbf99dd2e0fc94ab51cfaed3964b610c42d4
--- /dev/null
+++ b/trainer/blue/pug2.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/pug2.png-7cd55a34d82a82426ad821be9d902032.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/blue/pug2.png"
+dest_files=[ "res://.import/pug2.png-7cd55a34d82a82426ad821be9d902032.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/church.png b/trainer/church.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fb26f674e267e5e3c25aca781fe4a5ca0c5bf3c
Binary files /dev/null and b/trainer/church.png differ
diff --git a/trainer/church.png.import b/trainer/church.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..7820fc43be9e44b752d6d06f62d3a607f89c2371
--- /dev/null
+++ b/trainer/church.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/church.png-c7bf809ae49e1ef1b487836c8da0a743.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/church.png"
+dest_files=[ "res://.import/church.png-c7bf809ae49e1ef1b487836c8da0a743.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/king/char01_0000.png b/trainer/king/char01_0000.png
deleted file mode 100644
index 0cbf175a7a008ffbd6f9f2fcab594d8d7d6a803c..0000000000000000000000000000000000000000
Binary files a/trainer/king/char01_0000.png and /dev/null differ
diff --git a/trainer/king/king_trainer_graphic.tscn b/trainer/king/king_trainer_graphic.tscn
index d03553b93ed7ec7e48b863c6d2059e7426c2d031..64abc2cd6119e61d83abc69bbb42dbf798d960c5 100644
--- a/trainer/king/king_trainer_graphic.tscn
+++ b/trainer/king/king_trainer_graphic.tscn
@@ -3,7 +3,7 @@
 [ext_resource path="res://trainer/trainer_graphic.gd" type="Script" id=1]
 [ext_resource path="res://trainer/sounds/battle_begin.wav" type="AudioStream" id=2]
 [ext_resource path="res://trainer/red/char02_0000.png" type="Texture" id=3]
-[ext_resource path="res://trainer/king/char01_0000.png" type="Texture" id=4]
+[ext_resource path="res://trainer/rude_man/char01_0000.png" type="Texture" id=4]
 [ext_resource path="res://trainer/king/crown0003.png" type="Texture" id=5]
 
 [node name="king_trainer_graphic" type="Node2D"]
diff --git a/trainer/red/f1.png b/trainer/red/f1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3fef3abfb7c52a78e1f5e4dfc8b584f0405c0b0
Binary files /dev/null and b/trainer/red/f1.png differ
diff --git a/trainer/red/f1.png.import b/trainer/red/f1.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..d9d5e54fcb6902df08715dc88d982df969d253d4
--- /dev/null
+++ b/trainer/red/f1.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/f1.png-014e559a30ed8a21023a3d444480d5b5.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/red/f1.png"
+dest_files=[ "res://.import/f1.png-014e559a30ed8a21023a3d444480d5b5.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/red/f2.png b/trainer/red/f2.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc692a6b1f7983e1bc8955b1e62fcdeea545b76c
Binary files /dev/null and b/trainer/red/f2.png differ
diff --git a/trainer/red/f2.png.import b/trainer/red/f2.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..f4d7b0a6272cfc93e1e90791b3638e25a1b0e267
--- /dev/null
+++ b/trainer/red/f2.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/f2.png-25e32755b1a0823828266abb27905886.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/red/f2.png"
+dest_files=[ "res://.import/f2.png-25e32755b1a0823828266abb27905886.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/rude_man/char01_0000.png b/trainer/rude_man/char01_0000.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9373bff1fd479a33a885b377803f165afa2d82e
Binary files /dev/null and b/trainer/rude_man/char01_0000.png differ
diff --git a/trainer/rude_man/char01_0000.png.import b/trainer/rude_man/char01_0000.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..60a55da810031cb16d26aa9668285d24297cb638
--- /dev/null
+++ b/trainer/rude_man/char01_0000.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/char01_0000.png-371fbc6fd4a56e5b62626a98a90011c5.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/rude_man/char01_0000.png"
+dest_files=[ "res://.import/char01_0000.png-371fbc6fd4a56e5b62626a98a90011c5.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/rude_man/f1.png b/trainer/rude_man/f1.png
new file mode 100644
index 0000000000000000000000000000000000000000..00f61dc9c92339bb9f5e027e24bbe02634c0be9c
Binary files /dev/null and b/trainer/rude_man/f1.png differ
diff --git a/trainer/rude_man/f1.png.import b/trainer/rude_man/f1.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..ba5ab333bcda6f16665cf65e49f6f0c1583de05b
--- /dev/null
+++ b/trainer/rude_man/f1.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/f1.png-f71795b08b59ce2b1d2bd060f0dee344.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/rude_man/f1.png"
+dest_files=[ "res://.import/f1.png-f71795b08b59ce2b1d2bd060f0dee344.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/rude_man/f2.png b/trainer/rude_man/f2.png
new file mode 100644
index 0000000000000000000000000000000000000000..df2450c9b3216ece96497ebe32ba362fadb02e64
Binary files /dev/null and b/trainer/rude_man/f2.png differ
diff --git a/trainer/rude_man/f2.png.import b/trainer/rude_man/f2.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..020d89d1a5426cb073d0a881e810c21954db4a07
--- /dev/null
+++ b/trainer/rude_man/f2.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/f2.png-1f33484c1e4094d299f9aac0480cb994.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/rude_man/f2.png"
+dest_files=[ "res://.import/f2.png-1f33484c1e4094d299f9aac0480cb994.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/rude_man/f3.png b/trainer/rude_man/f3.png
new file mode 100644
index 0000000000000000000000000000000000000000..5118a1dd0c0f7af57385be8522913da793e80727
Binary files /dev/null and b/trainer/rude_man/f3.png differ
diff --git a/trainer/rude_man/f3.png.import b/trainer/rude_man/f3.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..3b3b1bbe164a139934f76ff22b3b97ed00ba8272
--- /dev/null
+++ b/trainer/rude_man/f3.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/f3.png-7977a9755973f0d18bca0050647bc465.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/rude_man/f3.png"
+dest_files=[ "res://.import/f3.png-7977a9755973f0d18bca0050647bc465.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/skull/groundSpike02_0007.png b/trainer/rude_man/groundSpike02_0007.png
similarity index 100%
rename from trainer/skull/groundSpike02_0007.png
rename to trainer/rude_man/groundSpike02_0007.png
diff --git a/trainer/rude_man/groundSpike02_0007.png.import b/trainer/rude_man/groundSpike02_0007.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..c39616d01c0c14e1c87aa5dba8fcd120cd32f5bb
--- /dev/null
+++ b/trainer/rude_man/groundSpike02_0007.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/groundSpike02_0007.png-010857248779cfcecab9401340f2f4a2.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/rude_man/groundSpike02_0007.png"
+dest_files=[ "res://.import/groundSpike02_0007.png-010857248779cfcecab9401340f2f4a2.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/skull/skull.tres b/trainer/rude_man/skull.tres
similarity index 82%
rename from trainer/skull/skull.tres
rename to trainer/rude_man/skull.tres
index 616c283e839ecebae9771f3a2aa7b7f7be77b462..e2df33b420b4d80883a9d444fd3d2447af2666f9 100644
--- a/trainer/skull/skull.tres
+++ b/trainer/rude_man/skull.tres
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://trainer/trainer_model.gd" type="Script" id=1]
 [ext_resource path="res://pokemon/spikey/spikey.tres" type="Resource" id=2]
-[ext_resource path="res://trainer/skull/skull_trainer_graphic.tscn" type="PackedScene" id=5]
+[ext_resource path="res://trainer/rude_man/skull_trainer_graphic.tscn" type="PackedScene" id=5]
 
 [resource]
 script = ExtResource( 1 )
diff --git a/trainer/skull/skull0000.png b/trainer/rude_man/skull0000.png
similarity index 100%
rename from trainer/skull/skull0000.png
rename to trainer/rude_man/skull0000.png
diff --git a/trainer/rude_man/skull0000.png.import b/trainer/rude_man/skull0000.png.import
new file mode 100644
index 0000000000000000000000000000000000000000..da94e4d09afd85b05a2869359d98cc5c56d68da0
--- /dev/null
+++ b/trainer/rude_man/skull0000.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/skull0000.png-bde9884ea7e45a7a8cf4335b9092eb63.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://trainer/rude_man/skull0000.png"
+dest_files=[ "res://.import/skull0000.png-bde9884ea7e45a7a8cf4335b9092eb63.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/trainer/skull/skull_trainer_graphic.tscn b/trainer/rude_man/skull_trainer_graphic.tscn
similarity index 65%
rename from trainer/skull/skull_trainer_graphic.tscn
rename to trainer/rude_man/skull_trainer_graphic.tscn
index 0e288d8c8903e8ab400b6bbfb30852110dbb8f9b..f7e30e1d7f36e5fa0078e570da0bd2bba36425e4 100644
--- a/trainer/skull/skull_trainer_graphic.tscn
+++ b/trainer/rude_man/skull_trainer_graphic.tscn
@@ -3,27 +3,20 @@
 [ext_resource path="res://trainer/sounds/battle_begin.wav" type="AudioStream" id=1]
 [ext_resource path="res://trainer/red/char02_0000.png" type="Texture" id=2]
 [ext_resource path="res://trainer/trainer_graphic.gd" type="Script" id=3]
-[ext_resource path="res://trainer/skull/groundSpike02_0007.png" type="Texture" id=4]
-[ext_resource path="res://trainer/skull/skull0000.png" type="Texture" id=5]
+[ext_resource path="res://trainer/rude_man/groundSpike02_0007.png" type="Texture" id=4]
+[ext_resource path="res://trainer/rude_man/char01_0000.png" type="Texture" id=5]
 
 [node name="blue_trainer_graphic" type="Node2D"]
 script = ExtResource( 3 )
 
 [node name="front" type="Sprite" parent="."]
-self_modulate = Color( 0.0588235, 0.701961, 0.807843, 1 )
 use_parent_material = true
-position = Vector2( 137, 49 )
+position = Vector2( 137, 38 )
 scale = Vector2( 0.642857, 0.642857 )
-texture = ExtResource( 2 )
-
-[node name="Skull0000" type="Sprite" parent="front"]
-position = Vector2( -1.55556, -23.3333 )
-rotation = 0.167552
-scale = Vector2( 0.770153, 0.770153 )
 texture = ExtResource( 5 )
 
 [node name="GroundSpike020007" type="Sprite" parent="front"]
-position = Vector2( 3.11115, -51.3333 )
+position = Vector2( -1.55554, -37.3333 )
 scale = Vector2( 0.411111, 0.411111 )
 texture = ExtResource( 4 )
 
diff --git a/trainer/skull/char02_0000.png b/trainer/skull/char02_0000.png
deleted file mode 100644
index 3b0849f3b347d1e08dd3f1010fd07dc632e69f34..0000000000000000000000000000000000000000
Binary files a/trainer/skull/char02_0000.png and /dev/null differ
diff --git a/widgets/info_box.tscn b/widgets/info_box.tscn
index 4cdc2f3efff3e80d10633d42f324b780b2cac236..f463012019620ea33c1f9f42aa72eb6086606b9b 100644
--- a/widgets/info_box.tscn
+++ b/widgets/info_box.tscn
@@ -1,16 +1,18 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://widgets/info_box.gd" type="Script" id=1]
 [ext_resource path="res://widgets/sprites/panel.png" type="Texture" id=2]
 [ext_resource path="res://widgets/tween_ex.gd" type="Script" id=3]
 [ext_resource path="res://widgets/sprites/arrow.png" type="Texture" id=4]
 [ext_resource path="res://widgets/sounds/activate.wav" type="AudioStream" id=5]
+[ext_resource path="res://widgets/theme.tres" type="Theme" id=6]
 
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 1.0
 content_margin_right = 1.0
 content_margin_top = 1.0
 content_margin_bottom = 1.0
+bg_color = Color( 0.113725, 0.368627, 0.482353, 1 )
 
 [node name="info" type="PanelContainer"]
 margin_top = 96.0
@@ -18,6 +20,7 @@ margin_right = 160.0
 margin_bottom = 144.0
 rect_min_size = Vector2( 0, 48 )
 size_flags_vertical = 10
+theme = ExtResource( 6 )
 custom_styles/panel = SubResource( 1 )
 script = ExtResource( 1 )
 __meta__ = {
diff --git a/widgets/menu_button.tscn b/widgets/menu_button.tscn
index d31dc85ef7edd7dc5a06de1b38a433b22abf8825..5f37b5762b528b2e9188879e04a1d8139fb28f8c 100644
--- a/widgets/menu_button.tscn
+++ b/widgets/menu_button.tscn
@@ -24,4 +24,3 @@ stretch_mode = 4
 margin_left = 8.0
 margin_right = 8.0
 margin_bottom = 14.0
-custom_colors/font_color = Color( 0, 0, 0, 1 )
diff --git a/widgets/pokemon_info_enemy.tscn b/widgets/pokemon_info_enemy.tscn
index b0b0c663dfb1d1e5a943a2bb95db14dab3c40072..8f5cfd034be1f435f89f76f4a5b7b916aa6354ec 100644
--- a/widgets/pokemon_info_enemy.tscn
+++ b/widgets/pokemon_info_enemy.tscn
@@ -28,7 +28,6 @@ margin_top = 52.0
 margin_right = 233.0
 margin_bottom = 78.0
 theme = ExtResource( 1 )
-custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "BULBASAUR"
 __meta__ = {
 "_edit_use_anchors_": false
@@ -40,7 +39,6 @@ margin_top = 60.0
 margin_right = 264.0
 margin_bottom = 86.0
 theme = ExtResource( 1 )
-custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "5"
 __meta__ = {
 "_edit_use_anchors_": false
@@ -81,4 +79,4 @@ texture = ExtResource( 6 )
 position = Vector2( -24, 0 )
 points = PoolVector2Array( 0, 0, 48, 0 )
 width = 2.0
-default_color = Color( 0.133333, 0.494118, 0.192157, 1 )
+default_color = Color( 0.545098, 0.168627, 0.164706, 1 )
diff --git a/widgets/pokemon_info_player.tscn b/widgets/pokemon_info_player.tscn
index fcea57d3bf583002f80a3e3f17b46bc12e7ca8ec..93b75f828b7a1855a94ff6421936e66bd225e4a7 100644
--- a/widgets/pokemon_info_player.tscn
+++ b/widgets/pokemon_info_player.tscn
@@ -19,7 +19,7 @@ margin_left = -9.0
 margin_top = -17.0
 margin_right = 72.0
 margin_bottom = 26.0
-color = Color( 0.6, 0.6, 0.6, 1 )
+color = Color( 0.113725, 0.368627, 0.482353, 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -37,7 +37,6 @@ margin_top = -20.0
 margin_right = 159.954
 margin_bottom = 6.0
 theme = ExtResource( 1 )
-custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "BULBASAUR"
 __meta__ = {
 "_edit_use_anchors_": false
@@ -54,7 +53,6 @@ margin_top = 4.0
 margin_right = 73.0
 margin_bottom = 30.0
 theme = ExtResource( 1 )
-custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "20/ 20"
 __meta__ = {
 "_edit_use_anchors_": false
@@ -72,7 +70,7 @@ texture = ExtResource( 5 )
 position = Vector2( -24, 0 )
 points = PoolVector2Array( 0, 0, 48, 0 )
 width = 2.0
-default_color = Color( 0.133333, 0.494118, 0.192157, 1 )
+default_color = Color( 0.545098, 0.168627, 0.164706, 1 )
 
 [node name="level" type="Label" parent="."]
 margin_left = 40.0
@@ -80,7 +78,6 @@ margin_top = -12.0
 margin_right = 200.0
 margin_bottom = 14.0
 theme = ExtResource( 1 )
-custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "5"
 __meta__ = {
 "_edit_use_anchors_": false
diff --git a/widgets/sprites/arrow.png b/widgets/sprites/arrow.png
index 6288ad2267b22edb65c3574dc98b3b83278259b0..86b907899f1c15aa358a31d362a08b1af6630585 100644
Binary files a/widgets/sprites/arrow.png and b/widgets/sprites/arrow.png differ
diff --git a/widgets/sprites/hp.png b/widgets/sprites/hp.png
index b28595db897df16827094c1aaa9bc92808256bf7..7bce7fa27dc8ee0d188779efe220c153365c25bc 100644
Binary files a/widgets/sprites/hp.png and b/widgets/sprites/hp.png differ
diff --git a/widgets/sprites/l.png b/widgets/sprites/l.png
index cb184b556afec38c1168a23f8d62b2aedfb2ce26..f68546e186e6fde61c49243e4989e59f27523ed1 100644
Binary files a/widgets/sprites/l.png and b/widgets/sprites/l.png differ
diff --git a/widgets/sprites/line (copy 1).png b/widgets/sprites/line (copy 1).png
index a24a6ae8e4fb8778a9269a42a06f9b0598f9a2a7..27f040ff3ef974b631ed273757fe6dbfa9cb6555 100644
Binary files a/widgets/sprites/line (copy 1).png and b/widgets/sprites/line (copy 1).png differ
diff --git a/widgets/sprites/line.png b/widgets/sprites/line.png
index 8c65e54c670c14648232bbb17ef08750a1b10579..5591d0b2c4ead18552f49cba386d4eb4a6a2d2e7 100644
Binary files a/widgets/sprites/line.png and b/widgets/sprites/line.png differ
diff --git a/widgets/sprites/panel.png b/widgets/sprites/panel.png
index 8d4283a6d0834264b5d074ae036f8b5361d4450f..c3cc6efd23c1f9444b56e1d5a01c57f040ff825d 100644
Binary files a/widgets/sprites/panel.png and b/widgets/sprites/panel.png differ
diff --git a/widgets/sprites/progress.png b/widgets/sprites/progress.png
index 68f6d55c008125a753668395b700303495f802c9..d12e3fe90973af1e863fb9fa12b3d05fc66496c2 100644
Binary files a/widgets/sprites/progress.png and b/widgets/sprites/progress.png differ
diff --git a/widgets/theme.tres b/widgets/theme.tres
index 238c91fa9b0cc20f5631679ea7228c9a48949a06..6cc5f2cdee84cc6f6cc3b15d24b957c5553984d0 100644
--- a/widgets/theme.tres
+++ b/widgets/theme.tres
@@ -2,7 +2,8 @@
 
 [ext_resource path="res://widgets/Pokemon Classic.ttf" type="DynamicFontData" id=1]
 
-[sub_resource type="StyleBoxEmpty" id=2]
+[sub_resource type="StyleBoxFlat" id=2]
+bg_color = Color( 0.113725, 0.368627, 0.482353, 1 )
 
 [sub_resource type="DynamicFont" id=1]
 size = 8
@@ -12,5 +13,6 @@ font_data = ExtResource( 1 )
 
 [resource]
 default_font = SubResource( 1 )
+Label/colors/font_color = Color( 0.0392157, 0.0980392, 0.152941, 1 )
 PanelContainer/styles/panel = SubResource( 2 )
-RichTextLabel/colors/default_color = Color( 0, 0, 0, 1 )
+RichTextLabel/colors/default_color = Color( 0.0392157, 0.0980392, 0.152941, 1 )
diff --git a/widgets/transition.tscn b/widgets/transition.tscn
index 3daeac14b6790d2ce387db8b0f79cdcb11ddc33f..38f31bf060fdb28cc54bec77cfec8302203d82a0 100644
--- a/widgets/transition.tscn
+++ b/widgets/transition.tscn
@@ -10,7 +10,7 @@ script = ExtResource( 1 )
 margin_left = 160.0
 margin_right = 176.0
 margin_bottom = 16.0
-color = Color( 0, 0, 0, 1 )
+color = Color( 0.113725, 0.368627, 0.482353, 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
diff --git a/widgets/tween_ex.gd b/widgets/tween_ex.gd
index d6da5d7ba48163a08ce1be12047964410ec04344..5d71b188255438e4ffad044b6820a025ae4ebbde 100644
--- a/widgets/tween_ex.gd
+++ b/widgets/tween_ex.gd
@@ -7,7 +7,7 @@ func _ready() -> void:
 	set_process_unhandled_input(false)
 
 func block() -> Tween:
-	connect("tween_all_completed", self, "_on_tween_all_completed", [], CONNECT_ONESHOT | CONNECT_REFERENCE_COUNTED)
+	connect("tween_all_completed", self, "_on_tween_all_completed", [], CONNECT_DEFERRED | CONNECT_ONESHOT | CONNECT_REFERENCE_COUNTED)
 	start()
 	call_deferred("set_process_unhandled_input", true)
 	return self
diff --git a/world.gd b/world.gd
index 0d5ee1490cab081b905b4eb54e2a13b162f3db5d..4cc06d35dd509181e8199a8842012a2bb6054e90 100644
--- a/world.gd
+++ b/world.gd
@@ -16,11 +16,21 @@ func battle_transition_() -> Node:
 	return transition
 
 func _on_encounter(trainer) -> void:
+	if trainer.name == "cry_baby":
+		_on_encounter_cry_baby(trainer)
+	elif trainer.name == "spikey":
+		_on_encounter_spikey(trainer)
+		
+func _on_encounter_cry_baby(trainer) -> void:
 	$player.pause_controls = true
 	
-	var move_to = floor_vec2($player.position) + $player.position.direction_to(trainer.position) * 16.0
+	trainer.get_node("spot").visible = true
+	trainer.get_node("spot_audio").play()
+	
+	var move_to = floor_vec2($player.position) + $player.position.direction_to(trainer.position) * 20.0
 	tween_.interpolate_property(trainer, "position", null, move_to, 3.0, Tween.TRANS_LINEAR, Tween.EASE_IN, 1.0)
 	yield(tween_.block(), "done")
+	trainer.get_node("spot").visible = false
 	info_box_.visible = true
 	yield(info_box_.set_text_for_confirm("This is a funeral little dog."), "done")
 	tween_.wait(0.1)
@@ -40,6 +50,48 @@ func _on_encounter(trainer) -> void:
 	yield(battle_transition_(), "done")
 	$music.play()
 
+	var battle = preload("res://battle/battle.tscn").instance()
+	battle.enemy = trainer.trainer
+	$c.add_child(battle)
+	$info_box.clear_text()
+	yield(battle, "done")
+	$music.stop()
+	battle.queue_free()
+	yield(info_box_.set_text_for_confirm("No! Don't steal my Wizard Hat!"), "done")
+	yield(info_box_.set_text_for_confirm("I can't loose my son AND my hat!"), "done")
+	yield(info_box_.set_text_for_confirm("... please... *sobs."), "done")
+	yield(info_box_.set_text_for_confirm("... please... *sobs."), "done")
+	yield(info_box_.set_text_for_confirm("... please don't take my Wizard Hat..."), "done")
+	$info_box.visible = false
+	yield(tween_.wait(5.0), "done")
+	$info_box.visible = true
+	
+	$success.play()
+	trainer.get_node("hat").visible = false
+	yield(info_box_.set_text_for_confirm("You took the Wizard Hat!"), "done")
+
+	trainer.monitoring = false
+	$player.pause_controls = false
+	$info_box.clear_text()
+	$info_box.visible = false
+	
+func _on_encounter_spikey(trainer) -> void:
+	$player.pause_controls = true
+	
+	trainer.get_node("spot").visible = true
+	trainer.get_node("spot_audio").play()
+	
+	var move_to = floor_vec2($player.position) + $player.position.direction_to(trainer.position) * 16.0
+	tween_.interpolate_property(trainer, "position", null, move_to, 3.0, Tween.TRANS_LINEAR, Tween.EASE_IN, 1.0)
+	yield(tween_.block(), "done")
+	trainer.get_node("spot").visible = false
+	info_box_.visible = true
+	yield(info_box_.set_text_for_confirm("Please everyone is so sad. Just leave."), "done")
+	tween_.wait(0.1)
+
+	yield(battle_transition_(), "done")
+	$music.play()
+
 	var battle = preload("res://battle/battle.tscn").instance()
 	battle.enemy = trainer.trainer
 	$c.add_child(battle)
@@ -50,12 +102,15 @@ func _on_encounter(trainer) -> void:
 	yield(info_box_.set_text_for_confirm("No! Don't steal my Wizard Hat!"), "done")
 	yield(info_box_.set_text_for_confirm("I can't loose both my son AND my hat!"), "done")
 	yield(info_box_.set_text_for_confirm("... please... *sobs."), "done")
+	yield(info_box_.set_text_for_confirm("... please... *sobs."), "done")
+	yield(info_box_.set_text_for_confirm("... please... *sobs."), "done")
 	$info_box.visible = false
 	yield(tween_.wait(5.0), "done")
 	$info_box.visible = true
 	
 	$success.play()
-	yield(info_box_.set_text_for_confirm("You collected Wizard Hat!"), "done")
+	trainer.get_node("hat").visible = false 
+	yield(info_box_.set_text_for_confirm("You stole the Wizard Hat!"), "done")
 
 	trainer.monitoring = false
 	$player.pause_controls = false
diff --git a/world.tscn b/world.tscn
index 779f302f231b81930453b340d2370d7d2c926912..db98f01d7e624bc85555cb6b55cbcdae0404e8e8 100644
--- a/world.tscn
+++ b/world.tscn
@@ -1,9 +1,9 @@
-[gd_scene load_steps=53 format=2]
+[gd_scene load_steps=27 format=2]
 
-[ext_resource path="res://gameboy_rpg_v09(2).png" type="Texture" id=1]
-[ext_resource path="res://dog.png" type="Texture" id=2]
+[ext_resource path="res://trainer/church.png" type="Texture" id=1]
+[ext_resource path="res://trainer/blue/pug.png" type="Texture" id=2]
 [ext_resource path="res://player.gd" type="Script" id=3]
-[ext_resource path="res://crybaby.png" type="Texture" id=4]
+[ext_resource path="res://trainer/red/char02_0000.png" type="Texture" id=4]
 [ext_resource path="res://world.gd" type="Script" id=5]
 [ext_resource path="res://man.gd" type="Script" id=6]
 [ext_resource path="res://widgets/tween_ex.gd" type="Script" id=7]
@@ -12,404 +12,61 @@
 [ext_resource path="res://trainer/red/red.tres" type="Resource" id=10]
 [ext_resource path="res://music/mars.mp3" type="AudioStream" id=11]
 [ext_resource path="res://pokemon/horns/level_up.wav" type="AudioStream" id=12]
-
-[sub_resource type="ConvexPolygonShape2D" id=22]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=23]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=24]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=25]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=26]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=27]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=28]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=29]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=30]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=31]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=32]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=33]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=34]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=35]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=36]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=37]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=38]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=39]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=40]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=41]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="TileSet" id=1]
-0/name = "gameboy_rpg_v09(2).png 0"
-0/texture = ExtResource( 1 )
-0/tex_offset = Vector2( 0, 0 )
-0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 288, 32, 32, 32 )
-0/tile_mode = 0
-0/occluder_offset = Vector2( 0, 0 )
-0/navigation_offset = Vector2( 0, 0 )
-0/shape_offset = Vector2( 0, 0 )
-0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-0/shape_one_way = false
-0/shape_one_way_margin = 0.0
-0/shapes = [  ]
-0/z_index = 0
-1/name = "gameboy_rpg_v09(2).png 1"
-1/texture = ExtResource( 1 )
-1/tex_offset = Vector2( 0, 0 )
-1/modulate = Color( 1, 1, 1, 1 )
-1/region = Rect2( 288, 160, 128, 96 )
-1/tile_mode = 2
-1/autotile/icon_coordinate = Vector2( 0, 0 )
-1/autotile/tile_size = Vector2( 16, 16 )
-1/autotile/spacing = 0
-1/autotile/occluder_map = [  ]
-1/autotile/navpoly_map = [  ]
-1/autotile/priority_map = [  ]
-1/autotile/z_index_map = [  ]
-1/occluder_offset = Vector2( 0, 0 )
-1/navigation_offset = Vector2( 0, 0 )
-1/shape_offset = Vector2( 0, 0 )
-1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-1/shape_one_way = false
-1/shape_one_way_margin = 0.0
-1/shapes = [  ]
-1/z_index = 0
-2/name = "gameboy_rpg_v09(2).png 2"
-2/texture = ExtResource( 1 )
-2/tex_offset = Vector2( 0, 0 )
-2/modulate = Color( 1, 1, 1, 1 )
-2/region = Rect2( 368, 0, 384, 64 )
-2/tile_mode = 2
-2/autotile/icon_coordinate = Vector2( 0, 0 )
-2/autotile/tile_size = Vector2( 16, 16 )
-2/autotile/spacing = 0
-2/autotile/occluder_map = [  ]
-2/autotile/navpoly_map = [  ]
-2/autotile/priority_map = [  ]
-2/autotile/z_index_map = [  ]
-2/occluder_offset = Vector2( 0, 0 )
-2/navigation_offset = Vector2( 0, 0 )
-2/shape_offset = Vector2( 0, 0 )
-2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-2/shape_one_way = false
-2/shape_one_way_margin = 0.0
-2/shapes = [  ]
-2/z_index = 0
-3/name = "gameboy_rpg_v09(2).png 3"
-3/texture = ExtResource( 1 )
-3/tex_offset = Vector2( 0, 0 )
-3/modulate = Color( 1, 1, 1, 1 )
-3/region = Rect2( 416, 176, 192, 80 )
-3/tile_mode = 2
-3/autotile/icon_coordinate = Vector2( 0, 0 )
-3/autotile/tile_size = Vector2( 16, 16 )
-3/autotile/spacing = 0
-3/autotile/occluder_map = [  ]
-3/autotile/navpoly_map = [  ]
-3/autotile/priority_map = [  ]
-3/autotile/z_index_map = [  ]
-3/occluder_offset = Vector2( 0, 0 )
-3/navigation_offset = Vector2( 0, 0 )
-3/shape_offset = Vector2( 0, 0 )
-3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-3/shape = SubResource( 22 )
-3/shape_one_way = false
-3/shape_one_way_margin = 1.0
-3/shapes = [ {
-"autotile_coord": Vector2( 0, 4 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 22 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 1, 4 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 23 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 2, 4 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 24 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 3, 4 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 25 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 4, 4 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 26 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 5, 4 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 27 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 8, 4 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 28 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 9, 4 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 29 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 10, 4 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 30 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 11, 4 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 31 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 0, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 32 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 0, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 33 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 0, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 34 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 1, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 35 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-} ]
-3/z_index = 0
-4/name = "gameboy_rpg_v09(2).png 4"
-4/texture = ExtResource( 1 )
-4/tex_offset = Vector2( 0, 0 )
-4/modulate = Color( 1, 1, 1, 1 )
-4/region = Rect2( 272, 0, 96, 80 )
-4/tile_mode = 2
-4/autotile/icon_coordinate = Vector2( 0, 0 )
-4/autotile/tile_size = Vector2( 16, 16 )
-4/autotile/spacing = 0
-4/autotile/occluder_map = [  ]
-4/autotile/navpoly_map = [  ]
-4/autotile/priority_map = [  ]
-4/autotile/z_index_map = [  ]
-4/occluder_offset = Vector2( 0, 0 )
-4/navigation_offset = Vector2( 0, 0 )
-4/shape_offset = Vector2( 0, 0 )
-4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-4/shape = SubResource( 36 )
-4/shape_one_way = false
-4/shape_one_way_margin = 1.0
-4/shapes = [ {
-"autotile_coord": Vector2( 1, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 36 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 0, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 37 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 2, 1 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 38 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 4, 3 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 39 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 5, 3 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 40 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-}, {
-"autotile_coord": Vector2( 1, 4 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 41 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+[ext_resource path="res://pokemon/horns/learn.wav" type="AudioStream" id=13]
+[ext_resource path="res://pokemon/wizard_hat/front.png" type="Texture" id=14]
+[ext_resource path="res://trainer/rude_man/f1.png" type="Texture" id=15]
+[ext_resource path="res://trainer/rude_man/f2.png" type="Texture" id=16]
+[ext_resource path="res://trainer/rude_man/skull.tres" type="Resource" id=17]
+[ext_resource path="res://trainer/rude_man/f3.png" type="Texture" id=18]
+[ext_resource path="res://trainer/blue/pug2.png" type="Texture" id=19]
+[ext_resource path="res://trainer/red/f2.png" type="Texture" id=22]
+[ext_resource path="res://trainer/red/f1.png" type="Texture" id=23]
+
+[sub_resource type="SpriteFrames" id=45]
+animations = [ {
+"frames": [ ExtResource( 19 ), ExtResource( 2 ) ],
+"loop": true,
+"name": "default",
+"speed": 5.0
 } ]
-4/z_index = 0
 
 [sub_resource type="CircleShape2D" id=21]
 
-[sub_resource type="AtlasTexture" id=13]
-atlas = ExtResource( 2 )
-region = Rect2( 0, 0, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=5]
-atlas = ExtResource( 2 )
-region = Rect2( 112, 32, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=6]
-atlas = ExtResource( 2 )
-region = Rect2( 128, 32, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=9]
-atlas = ExtResource( 2 )
-region = Rect2( 112, 16, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=10]
-atlas = ExtResource( 2 )
-region = Rect2( 128, 16, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=7]
-atlas = ExtResource( 2 )
-region = Rect2( 112, 0, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=8]
-atlas = ExtResource( 2 )
-region = Rect2( 128, 0, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=11]
-atlas = ExtResource( 2 )
-region = Rect2( 112, 48, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=12]
-atlas = ExtResource( 2 )
-region = Rect2( 128, 48, 16, 16 )
+[sub_resource type="RayShape2D" id=42]
+length = 64.0
 
-[sub_resource type="SpriteFrames" id=4]
+[sub_resource type="SpriteFrames" id=43]
 animations = [ {
-"frames": [ SubResource( 13 ) ],
-"loop": true,
-"name": "idle",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 5 ), SubResource( 6 ) ],
-"loop": true,
-"name": "east",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 9 ), SubResource( 10 ) ],
-"loop": true,
-"name": "north",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 7 ), SubResource( 8 ) ],
+"frames": [ ExtResource( 23 ), ExtResource( 22 ) ],
 "loop": true,
-"name": "south",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 11 ), SubResource( 12 ) ],
-"loop": true,
-"name": "west",
+"name": "default",
 "speed": 5.0
 } ]
 
-[sub_resource type="AtlasTexture" id=14]
-atlas = ExtResource( 4 )
-region = Rect2( 0, 112, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=15]
-atlas = ExtResource( 4 )
-region = Rect2( 16, 112, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=16]
-atlas = ExtResource( 4 )
-region = Rect2( 32, 112, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=17]
-atlas = ExtResource( 4 )
-region = Rect2( 48, 112, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=18]
-atlas = ExtResource( 4 )
-region = Rect2( 64, 112, 16, 16 )
-
-[sub_resource type="AtlasTexture" id=19]
-atlas = ExtResource( 4 )
-region = Rect2( 80, 112, 16, 16 )
-
-[sub_resource type="SpriteFrames" id=20]
+[sub_resource type="SpriteFrames" id=44]
 animations = [ {
-"frames": [ SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 17 ), SubResource( 18 ), SubResource( 19 ) ],
+"frames": [ ExtResource( 15 ), ExtResource( 16 ), ExtResource( 15 ), ExtResource( 18 ) ],
 "loop": true,
 "name": "default",
 "speed": 5.0
 } ]
 
-[sub_resource type="RayShape2D" id=42]
-length = 64.0
-
 [node name="Node2D" type="Node2D"]
 script = ExtResource( 5 )
 
-[node name="TileMap" type="TileMap" parent="."]
-position = Vector2( -8, -8 )
-tile_set = SubResource( 1 )
-cell_size = Vector2( 16, 16 )
-format = 1
-tile_data = PoolIntArray( -262143, 1, 3, -262142, 1, 3, -262141, 1, 3, -262140, 1, 3, -262139, 1, 3, -262138, 1, 3, -262137, 1, 3, -262136, 1, 3, -262135, 1, 3, -262134, 1, 3, -262133, 1, 3, -262132, 1, 3, -262131, 1, 3, -196608, 1, 3, -196607, 1, 3, -196606, 1, 3, -196605, 1, 3, -196604, 1, 3, -196603, 1, 3, -196602, 1, 3, -196601, 1, 3, -196600, 1, 3, -196599, 1, 3, -196598, 1, 3, -196597, 1, 3, -196596, 1, 3, -196595, 1, 3, -131072, 1, 3, -131071, 1, 3, -131070, 1, 3, -131069, 1, 3, -131068, 1, 3, -131067, 1, 3, -131066, 1, 3, -131065, 1, 3, -131064, 1, 3, -131063, 1, 3, -131062, 1, 3, -131061, 1, 3, -131060, 1, 3, -131059, 1, 3, -65536, 1, 3, -65535, 1, 3, -65534, 1, 3, -65533, 1, 131075, -65532, 1, 3, -65531, 1, 3, -65530, 2, 65554, -65529, 2, 65555, -65528, 2, 65556, -65527, 1, 3, -65526, 1, 3, -65525, 1, 3, -65524, 1, 3, -65523, 1, 3, 0, 1, 3, 1, 1, 3, 2, 1, 196612, 3, 1, 3, 4, 1, 3, 5, 1, 3, 6, 2, 131090, 7, 2, 131091, 8, 2, 131092, 9, 1, 3, 10, 1, 131075, 11, 1, 3, 12, 1, 3, 13, 1, 3, 65536, 1, 3, 65537, 1, 262148, 65538, 1, 3, 65539, 1, 3, 65540, 1, 131075, 65541, 1, 3, 65542, 2, 196626, 65543, 2, 196618, 65544, 2, 196628, 65545, 1, 3, 65546, 1, 3, 65547, 1, 3, 65548, 1, 3, 65549, 1, 3, 131072, 1, 131075, 131073, 1, 3, 131074, 1, 3, 131075, 1, 3, 131076, 1, 131075, 131077, 1, 3, 131078, 1, 3, 131079, 1, 65540, 131080, 1, 3, 131081, 1, 3, 131082, 1, 3, 131083, 1, 3, 131084, 1, 3, 131085, 1, 3, 196608, 1, 65540, 196609, 1, 65540, 196610, 1, 65540, 196611, 1, 65540, 196612, 1, 65540, 196613, 1, 65540, 196614, 1, 65540, 196615, 1, 65540, 196616, 1, 65540, 196617, 1, 65540, 196618, 1, 65540, 196619, 1, 3, 196620, 1, 3, 196621, 1, 3, 262144, 1, 196610, 262145, 1, 196610, 262146, 1, 196610, 262147, 1, 196610, 262148, 1, 131075, 262149, 1, 0, 262150, 1, 1, 262151, 1, 1, 262152, 1, 2, 262153, 1, 3, 262154, 1, 3, 262155, 1, 3, 262156, 1, 3, 262157, 1, 3, 327680, 1, 196610, 327681, 1, 196610, 327682, 1, 196610, 327683, 1, 196610, 327684, 1, 3, 327685, 1, 65536, 327686, 1, 65537, 327687, 1, 65537, 327688, 1, 65538, 327689, 1, 3, 327690, 1, 196612, 327691, 1, 3, 327692, 1, 3, 327693, 1, 3, 393216, 1, 196610, 393217, 1, 196610, 393218, 1, 196610, 393219, 1, 196610, 393220, 1, 131075, 393221, 1, 65536, 393222, 1, 65537, 393223, 1, 65537, 393224, 1, 65538, 393225, 1, 196612, 393226, 1, 3, 393227, 1, 3, 393228, 1, 3, 393229, 1, 3, 458752, 1, 196610, 458753, 1, 196610, 458754, 1, 196610, 458755, 1, 196610, 458756, 1, 196612, 458757, 1, 65536, 458758, 1, 65537, 458759, 1, 65537, 458760, 1, 65538, 458761, 1, 3, 458762, 1, 3, 458763, 1, 3, 458764, 1, 3, 458765, 1, 3, 524288, 1, 196610, 524289, 1, 196610, 524290, 1, 196610, 524291, 1, 196610, 524292, 1, 131075, 524293, 1, 65536, 524294, 1, 65537, 524295, 1, 65537, 524296, 1, 65538, 524297, 1, 196612, 524298, 1, 3, 524299, 1, 3, 524300, 1, 3, 524301, 1, 3, 589824, 1, 196610, 589825, 1, 196610, 589826, 1, 196610, 589827, 1, 196610, 589828, 1, 131075, 589829, 1, 131072, 589830, 1, 131073, 589831, 1, 131073, 589832, 1, 131074, 589833, 1, 3, 589834, 1, 196612, 589835, 1, 3, 589836, 1, 3, 589837, 1, 3, 655360, 1, 131075, 655361, 1, 196612, 655362, 1, 131075, 655363, 1, 131075, 655364, 1, 131075, 655365, 1, 131075, 655366, 1, 3, 655367, 1, 3, 655368, 1, 262148, 655369, 1, 262148, 655370, 1, 262148, 655371, 1, 3, 655372, 1, 3, 655373, 1, 3, 720896, 1, 262148, 720897, 1, 3, 720898, 1, 3, 720899, 1, 131075, 720900, 1, 3, 720901, 1, 3, 720902, 1, 131075, 720903, 1, 3, 720904, 1, 3, 720905, 1, 3, 720906, 1, 262148, 720907, 1, 3, 720908, 1, 3, 720909, 1, 3, 786432, 1, 262148, 786433, 1, 3, 786434, 1, 3, 786435, 1, 262148, 786436, 1, 131075, 786437, 1, 3, 786438, 1, 3, 786439, 1, 262148, 786440, 1, 262148, 786441, 1, 262148, 786442, 1, 262148, 786443, 1, 3, 786444, 1, 3, 786445, 1, 3 )
+[node name="Church" type="Sprite" parent="."]
+position = Vector2( 80, 72 )
+scale = Vector2( 0.129863, 0.129968 )
+texture = ExtResource( 1 )
 
 [node name="player" type="Area2D" parent="."]
-position = Vector2( 80, 48 )
+position = Vector2( 149, 80 )
 script = ExtResource( 3 )
 
+[node name="Pug" type="AnimatedSprite" parent="player"]
+frames = SubResource( 45 )
+playing = true
+
 [node name="CollisionShape2D" type="CollisionShape2D" parent="player"]
 shape = SubResource( 21 )
 
@@ -417,43 +74,88 @@ shape = SubResource( 21 )
 cast_to = Vector2( 16, 0 )
 
 [node name="tween" type="Tween" parent="player"]
+repeat = true
+playback/repeat = true
 
-[node name="animation" type="AnimatedSprite" parent="player"]
-position = Vector2( -8, -4 )
-frames = SubResource( 4 )
-animation = "idle"
-playing = true
-centered = false
-offset = Vector2( 0, -4 )
-
-[node name="TileMap2" type="TileMap" parent="."]
-position = Vector2( -8, -8 )
-tile_set = SubResource( 1 )
-cell_size = Vector2( 16, 16 )
-cell_y_sort = true
-format = 1
-tile_data = PoolIntArray( -262144, 3, 196616, -262143, 3, 196617, -262142, 3, 196612, -262141, 3, 196613, -196608, 3, 262154, -196607, 3, 262155, -196606, 3, 262154, -196605, 3, 262155, -65536, 3, 196618, -65535, 3, 196619, -65534, 3, 196616, -65533, 3, 196617, -65532, 4, 131073, -65531, 4, 131073, -65530, 2, 65554, -65529, 2, 65555, -65528, 2, 65556, -65526, 3, 131072, -65525, 3, 131073, 0, 3, 262152, 1, 3, 262153, 2, 3, 262154, 3, 3, 262155, 4, 4, 131073, 5, 4, 131073, 6, 2, 131090, 7, 2, 131091, 8, 2, 131092, 9, 4, 65541, 10, 3, 65538, 11, 3, 65540, 65537, 3, 196612, 65538, 3, 196613, 65540, 4, 131073, 65541, 4, 131073, 65542, 2, 196626, 65543, 2, 196618, 65544, 2, 196628, 65545, 4, 131077, 65546, 3, 65536, 65547, 3, 65537, 65548, 3, 196610, 65549, 3, 196611, 131073, 3, 262154, 131074, 3, 262155, 131078, 4, 65538, 131081, 4, 196612, 131084, 3, 262148, 131085, 3, 262149, 327689, 4, 262145 )
-
-[node name="trainer" type="Area2D" parent="." groups=["trainer"]]
-position = Vector2( 0, 48 )
+[node name="tween" type="Tween" parent="."]
+script = ExtResource( 7 )
+
+[node name="cry_baby" type="Area2D" parent="." groups=["trainer"]]
+position = Vector2( 60, 79 )
 script = ExtResource( 6 )
 trainer = ExtResource( 10 )
 
-[node name="AnimatedSprite2" type="AnimatedSprite" parent="trainer"]
-frames = SubResource( 20 )
-frame = 2
-playing = true
+[node name="body" type="Sprite" parent="cry_baby"]
+visible = false
+scale = Vector2( 0.2, 0.2 )
+texture = ExtResource( 4 )
+
+[node name="hat" type="Sprite" parent="cry_baby"]
+visible = false
+position = Vector2( 3.05176e-05, -10 )
+scale = Vector2( 0.109649, 0.109649 )
+texture = ExtResource( 14 )
+
+[node name="spot" type="Label" parent="cry_baby"]
+visible = false
+margin_left = 1.0
+margin_top = -20.0
+margin_right = 7.0
+margin_bottom = -6.0
+theme = ExtResource( 9 )
+custom_colors/font_color = Color( 1, 1, 1, 1 )
+text = "!"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="spot_audio" type="AudioStreamPlayer" parent="cry_baby"]
+stream = ExtResource( 13 )
+pitch_scale = 0.8
+bus = "fx"
 
-[node name="los" type="CollisionShape2D" parent="trainer"]
+[node name="los" type="CollisionShape2D" parent="cry_baby"]
 rotation = -1.5708
 shape = SubResource( 42 )
 
-[node name="tween" type="Tween" parent="."]
-script = ExtResource( 7 )
+[node name="World" type="AnimatedSprite" parent="cry_baby"]
+position = Vector2( 2, 0 )
+frames = SubResource( 43 )
+playing = true
 
-[node name="info_box" parent="." instance=ExtResource( 8 )]
+[node name="spikey" type="Area2D" parent="." groups=["trainer"]]
+position = Vector2( 43.5, 45 )
+script = ExtResource( 6 )
+trainer = ExtResource( 17 )
+
+[node name="F1" type="AnimatedSprite" parent="spikey"]
+frames = SubResource( 44 )
+frame = 1
+playing = true
+
+[node name="spot" type="Label" parent="spikey"]
 visible = false
+modulate = Color( 0, 0, 0, 1 )
+margin_left = -2.0
+margin_top = -19.0
+margin_right = 38.0
+margin_bottom = -5.0
 theme = ExtResource( 9 )
+text = "!"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="spot_audio" type="AudioStreamPlayer" parent="spikey"]
+stream = ExtResource( 13 )
+pitch_scale = 0.8
+bus = "fx"
+
+[node name="los" type="CollisionShape2D" parent="spikey"]
+shape = SubResource( 42 )
+
+[node name="info_box" parent="." instance=ExtResource( 8 )]
+visible = false
 
 [node name="c" type="CanvasLayer" parent="."]
 follow_viewport_enable = true
@@ -466,6 +168,7 @@ stream = ExtResource( 11 )
 [node name="success" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 12 )
 pitch_scale = 1.5
+bus = "fx"
 
 [node name="blinders" type="CanvasLayer" parent="."]
 follow_viewport_enable = true
@@ -473,7 +176,7 @@ follow_viewport_enable = true
 [node name="ColorRect" type="ColorRect" parent="blinders"]
 margin_left = -93.0
 margin_bottom = 144.0
-color = Color( 0.6, 0.6, 0.6, 1 )
+color = Color( 0.113725, 0.368627, 0.482353, 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -482,7 +185,7 @@ __meta__ = {
 margin_left = 160.0
 margin_right = 253.0
 margin_bottom = 144.0
-color = Color( 0.6, 0.6, 0.6, 1 )
+color = Color( 0.113725, 0.368627, 0.482353, 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -491,7 +194,7 @@ __meta__ = {
 margin_left = -93.0
 margin_top = -144.0
 margin_right = 253.0
-color = Color( 0.6, 0.6, 0.6, 1 )
+color = Color( 0.113725, 0.368627, 0.482353, 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -501,9 +204,10 @@ margin_left = -93.0
 margin_top = 144.0
 margin_right = 253.0
 margin_bottom = 288.0
-color = Color( 0.6, 0.6, 0.6, 1 )
+color = Color( 0.113725, 0.368627, 0.482353, 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[connection signal="area_entered" from="trainer" to="trainer" method="_on_area_entered"]
+[connection signal="area_entered" from="cry_baby" to="cry_baby" method="_on_area_entered"]
+[connection signal="area_entered" from="spikey" to="spikey" method="_on_area_entered"]