diff --git a/data/maps/headers/FightingDojo.asm b/data/maps/headers/FightingDojo.asm
index 7702279a..867fe9d1 100644
--- a/data/maps/headers/FightingDojo.asm
+++ b/data/maps/headers/FightingDojo.asm
@@ -1,2 +1,2 @@
-	map_header FightingDojo, FIGHTING_DOJO, DOJO, 0
+	map_header FightingDojo, FIGHTING_DOJO, PREGYM, 0
 	end_map_header
diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm
index c6e17c7e..b6f10f77 100644
--- a/data/maps/objects/FightingDojo.asm
+++ b/data/maps/objects/FightingDojo.asm
@@ -8,12 +8,12 @@ FightingDojo_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  5,  3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1 ; koichi
+	object_event  6,  3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1 ; koichi
 	object_event  3,  4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 9
 	object_event  3,  6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 10
-	object_event  5,  5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 11
-	object_event  5,  7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 12
-	object_event  4,  1, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
-	object_event  5,  1, SPRITE_POKE_BALL, STAY, NONE, 7 ; person
+	object_event  6,  5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 11
+	object_event  6,  8, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 12
+	object_event  5,  1, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
+	object_event  7,  1, SPRITE_POKE_BALL, STAY, NONE, 7 ; person
 
 	def_warps_to FIGHTING_DOJO
diff --git a/gfx/blocksets/pregym.bst b/gfx/blocksets/pregym.bst
index 4addd9b5..bcbb36ea 100644
Binary files a/gfx/blocksets/pregym.bst and b/gfx/blocksets/pregym.bst differ
diff --git a/maps/FightingDojo.blk b/maps/FightingDojo.blk
index 3b13cc90..e2f1d142 100644
--- a/maps/FightingDojo.blk
+++ b/maps/FightingDojo.blk
@@ -1 +1 @@
-IJgIJKQPLKLKLK21LRFFo
\ No newline at end of file
+3+,)54
%*'
&*%#
\ No newline at end of file