diff --git a/data/maps/objects/MtMoonCrater.asm b/data/maps/objects/MtMoonCrater.asm
index 71c66d43..ee69e444 100644
--- a/data/maps/objects/MtMoonCrater.asm
+++ b/data/maps/objects/MtMoonCrater.asm
@@ -1,9 +1,9 @@
 MtMoonCrater_Object:
-	db $0 ; border block
+	db $03 ; border block
 
 	def_warp_events
-	warp_event 23, 49, 10, LAST_MAP
-	warp_event 22, 49, 10, LAST_MAP
+	warp_event 23, 49, MT_MOON_B1F, 10
+	warp_event 22, 49, MT_MOON_B1F, 10
 
 	def_bg_events
 
diff --git a/maps/MtMoonCrater.blk b/maps/MtMoonCrater.blk
index ec8f76c8..672ece00 100644
Binary files a/maps/MtMoonCrater.blk and b/maps/MtMoonCrater.blk differ
diff --git a/scripts/Route1.asm b/scripts/Route1.asm
index bd866bd5..dafa2053 100644
--- a/scripts/Route1.asm
+++ b/scripts/Route1.asm
@@ -82,16 +82,16 @@ Route1OakText:
 	; select which team to use during the encounter
 	ld a, [wRivalStarter]
 	cp STARTER2
-	jr nz, .NotSquirtle
-	ld a, $3
+	jr nz, .NotSquirtle 
+	ld a, $2 ; If Charmander, Venusaur
 	jr .done
 .NotSquirtle
 	cp STARTER3
 	jr nz, .Charmander
-	ld a, $1
+	ld a, $3 ; If Bulbasaur, Totartle
 	jr .done
 .Charmander
-	ld a, $2
+	ld a, $1 ; If Squirtle, Charizard
 .done
 	ld [wTrainerNo], a
 	ld a, 1
@@ -123,11 +123,4 @@ OakYes:
 
 OakNo:
 	text_far _OakNo
-	text_end
-
-; useful thing
-StarterMons_Oak:
-; starter the rival picked, oak trainer number. way easier than storing oak's "choice"
-	db STARTER1, 2 ; Venusaur
-	db STARTER2, 3 ; Charizard
-	db STARTER3, 1 ; Totartle
+	text_end
\ No newline at end of file