diff --git a/P3D/Content/Data/Scripts/kolben/elevator.dat b/P3D/Content/Data/Scripts/kolben/elevator.dat
index 2dc4f91eb..be8826e74 100644
--- a/P3D/Content/Data/Scripts/kolben/elevator.dat
+++ b/P3D/Content/Data/Scripts/kolben/elevator.dat
@@ -3,7 +3,7 @@ version=2
 @player.move(1)
 @player.turnto(2)
 @text.show(Which floor would~you like to go to?)
-@Options.show(1 - Pkmn Center,2 - Lounge,3 - Staff Offices,4 - Dev. Offices,B6 - Basement)
+@Options.show(1 - Pkmn Center,2 - Lounge,3 - Staff Offices,4 - Ass. Offices,5 - Dev. Offices,B6 - Basement)
 	:when:1 - Pkmn Center
 		@text.show(...)
 		@player.move(1)
@@ -25,7 +25,14 @@ version=2
 		@level.update
 		@player.move(1)
 		:end
-	:when:4 - Dev. Offices
+	:when:4 - Ass. Offices
+		@text.show(...)
+		@player.move(1)
+		@player.warp(kolben\assoffices.dat,9,0.1,-1,0)
+		@level.update
+		@player.move(1)
+		:end
+	:when:5 - Dev. Offices
 		@text.show(...)
 		@player.move(1)
 		@player.warp(kolben\devoffices.dat,9,0.1,-1,0)
@@ -39,13 +46,6 @@ version=2
 		@level.update
 		@player.move(1)
 		:end
-	:when:5 - Penthouse
-		@text.show(...)
-		@player.move(1)
-		@player.warp(kolben\center.dat,12,0.1,-1,0)
-		@level.update
-		@player.move(1)
-		:end
 :endwhen
 :end
 	
\ No newline at end of file
diff --git a/P3D/Content/Data/Scripts/vermilion/dockhand3.dat b/P3D/Content/Data/Scripts/vermilion/dockhand3.dat
index b5ae7ebeb..a29b1ed1e 100644
--- a/P3D/Content/Data/Scripts/vermilion/dockhand3.dat
+++ b/P3D/Content/Data/Scripts/vermilion/dockhand3.dat
@@ -73,7 +73,7 @@ version=2
 		:end
 	:endif
 	
-	if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=false
+	:if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=false
 		@options.show(Open Sea,Quit)
 			:when:Open Sea
 				@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
@@ -87,7 +87,7 @@ version=2
 		:end
 	:endif
 	
-	if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=false <and> <register.registered(libertypasstonav)>=true
+	:if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=false <and> <register.registered(libertypasstonav)>=true
 		@options.show(Liberty Garden,Quit)
 			:when:Liberty Garden
 				@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
@@ -101,7 +101,7 @@ version=2
 		:end
 	:endif
 	
-	if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=false
+	:if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=false
 		@options.show(Faraway Island,Open Sea,Quit)
 			:when:Faraway Island
 				@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
@@ -122,7 +122,7 @@ version=2
 		:end
 	:endif
 	
-	if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=true
+	:if:<register.registered(oldseamaptonav)>=false <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=true
 		@options.show(Open Sea,Liberty Garden,Quit)
 			:when:Open Sea
 				@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
@@ -144,7 +144,7 @@ version=2
 		:end	
 	:endif
 	
-	if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=false <and> <register.registered(libertypasstonav)>=true
+	:if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=false <and> <register.registered(libertypasstonav)>=true
 		@options.show(Faraway Island,Liberty Garden,Quit)
 			:when:Faraway Island
 				@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
@@ -165,7 +165,7 @@ version=2
 		:end
 	:endif
 	
-	if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=true
+	:if:<register.registered(oldseamaptonav)>=true <and> <register.registered(emptyseamaptonav)>=true <and> <register.registered(libertypasstonav)>=true
 		@options.show(Faraway Island,Open Sea,Liberty Garden,Quit)
 			:when:Faraway Island
 				@text.show(All right!*All aboard the~Seagallop Hi-Speed 11!)
diff --git a/P3D/Content/Pokemon/Data/133.dat b/P3D/Content/Pokemon/Data/133.dat
index c51294b00..66748ec81 100644
--- a/P3D/Content/Pokemon/Data/133.dat
+++ b/P3D/Content/Pokemon/Data/133.dat
@@ -62,5 +62,5 @@ EvolutionCondition|196,daytime,1;2,level
 EvolutionCondition|196,friendship,220,level
 EvolutionCondition|470,location,Ilex Forest,level
 EvolutionCondition|471,location,Ice Path,level
-EvolutionCondition|700,holditem,104,level
+EvolutionCondition|700,inpartytype,fairy,level
 EvolutionCondition|700,friendship,220,level
\ No newline at end of file
diff --git a/P3D/Content/Pokemon/Data/172_spiky-eared.dat b/P3D/Content/Pokemon/Data/172_spiky-eared.dat
new file mode 100644
index 000000000..7f2655c11
--- /dev/null
+++ b/P3D/Content/Pokemon/Data/172_spiky-eared.dat
@@ -0,0 +1,45 @@
+Name|Spiky-Eared Pichu
+Number|172
+ExperienceType|1
+BaseExperience|41
+Type1|Electric
+Type2|
+CatchRate|190
+BaseFriendship|70
+EggGroup1|None
+EggGroup2|None
+BaseEggSteps|2805
+EggPokemon|0
+IsGenderLess|0
+CanBreed|0
+Devolution|0
+IsMale|0
+Ability1|9
+Ability2|Nothing
+HiddenAbility|31
+EggMoves|516,117,268,574,3,227,203,252,175,381,217,179,9,321,273,6
+Machines|29,174,205,92,192,237,173,63,182,240,203,218,231,87,216,189,104,207,214,129,111,197,156,213,5,25,34,36,68,69,99,85,102,117,86,164,113,351,263,290,374,451,416,445,363,447,496,497,521,528,590,148
+BaseHP|20
+BaseAttack|40
+BaseDefense|15
+BaseSpAttack|35
+BaseSpDefense|35
+BaseSpeed|60
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|1
+CanFly|0
+CanSwim|0
+Pokedex|It is not yet skilled at storing electricity. It may send out a jolt if amused or startled.\Tiny Mouse Pokémon\2\0.3\0,148,0
+Scale|0.7
+Move|1,84
+Move|1,204
+Move|5,39
+Move|10,186
+Move|13,86
+Move|18,417
+TradeValue|100
+Item|50,2006