diff --git a/data/maps/objects/CinnabarVolcanoFloors.asm b/data/maps/objects/CinnabarVolcanoFloors.asm
index 6844ef0f..c8219bc7 100644
--- a/data/maps/objects/CinnabarVolcanoFloors.asm
+++ b/data/maps/objects/CinnabarVolcanoFloors.asm
@@ -2,13 +2,13 @@ CinnabarVolcanoFloors_Object:
 	db $03 ; border block
 
 	def_warp_events
-	warp_event  3, 17, LAST_MAP, 6
-	warp_event  2, 17, LAST_MAP, 6
-	warp_event  2,  2, CINNABAR_VOLCANO_FLOORS, 4
+	warp_event 25, 39, LAST_MAP, 6
+	warp_event 24, 39, LAST_MAP, 6
+	warp_event 24, 24, CINNABAR_VOLCANO_FLOORS, 4
 	warp_event 25,  3, CINNABAR_VOLCANO_FLOORS, 3
 	warp_event 27, 12, CINNABAR_VOLCANO_FLOORS, 6
-	warp_event 25, 37, CINNABAR_VOLCANO_FLOORS, 5
-	warp_event 25, 25, CINNABAR_VOLCANO_FLOORS, 8
+	warp_event  5, 13, CINNABAR_VOLCANO_FLOORS, 5
+	warp_event  3,  3, CINNABAR_VOLCANO_FLOORS, 8
 	warp_event  3, 25, CINNABAR_VOLCANO_FLOORS, 7
 	warp_event 15, 25, CINNABAR_VOLCANO, 1
 
diff --git a/gfx/pokemon/front/electivire.png b/gfx/pokemon/front/electivire.png
index 4264e713..729d34e9 100644
Binary files a/gfx/pokemon/front/electivire.png and b/gfx/pokemon/front/electivire.png differ
diff --git a/gfx/pokemon/front/glaceon.png b/gfx/pokemon/front/glaceon.png
index 8d5b465e..e2c32bd9 100644
Binary files a/gfx/pokemon/front/glaceon.png and b/gfx/pokemon/front/glaceon.png differ
diff --git a/maps/CinnabarVolcanoFloors.blk b/maps/CinnabarVolcanoFloors.blk
index dd235c5a..72a28268 100644
--- a/maps/CinnabarVolcanoFloors.blk
+++ b/maps/CinnabarVolcanoFloors.blk
@@ -1,2 +1,4 @@
-,€€€€€€€+,€€€€€€€+#b
zx,
-i
vvvvvvvvvvvvvvvvfvvvvv
fvvvv)yv
	

jkkkk
L$,€€€€€€€+,€€€€€€€+|‚< "€€€€+vvv)vvvv-vvv

vvvv-v "

vvvv--
tƒƒƒƒ{
h


^=
\ No newline at end of file
+,€€€€€€€+,€€€€€€€+< "b
z+
+vvvvfvvvvvvvv-vvvvfvvvv-v|)yv
	
L,€€€€€€€+,€€€€€€€+|‚'€€€+
+vvv)
vvvvvvv
vvvvv "vvvv-t
fvvvv
+


^


	___$
\ No newline at end of file