From 99fa5a27b9fce262f3b930d40bb2bec89300059f Mon Sep 17 00:00:00 2001
From: May Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Wed, 14 Dec 2022 20:03:55 +0000
Subject: [PATCH] Fix Mt. Moon Crater and Oak team choices

---
 data/maps/objects/MtMoonCrater.asm |   6 +++---
 maps/MtMoonCrater.blk              | Bin 625 -> 625 bytes
 scripts/Route1.asm                 |  17 +++++------------
 3 files changed, 8 insertions(+), 15 deletions(-)

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 ec8f76c8831148a46b89294530c94cf6a311d439..672ece001765f43aa1700934a2b12c01d7fcee8e 100644
GIT binary patch
literal 625
zcmZ{h%}c{T5XG4#O-<4^AMK$qcu{&Nq^Sz62>r-zYYHt0#giiV2YAwh2O<9LzS*_f
zgU+FJ^V|34&8*h{)#~=IT54@nQFA_tx|D@P)MlyA5+JvKiN@nNBrlSaVgdI1O^_yv
z;zoyuIOpG>H=7^V0>~-)rM3~!Q3@VC3shdNs=BUuE%}z(P!m_RfoW-qBpu{W`~Cj4
z1PB6WH7pHhD&@z~=zYEwMbiN&_$)i;x0lh!23GCp2p}T!#pP8dR^3Px1;*JSqT)gF
zoDx9L>KvLQVsGfCkski309E+7#r+%yTL3WBrqh7X_}6X>Oj1z>LkMH>^@C|)x5h(C
zNm<aefP#r#AAZPz_KASd^Sr5(2w7ts4qK(({jPU0yGu##a*k9-WiXYpfPeDHcJHh8
prh*;{MjZRTsvwdHv^<Xh_ZjOaijz{_tO7i=U8n~oOW7LN?+ftebBq80

literal 625
zcmZ{hK}*9x5QS%!G;I=-G-(dKc=QlRQW2^MHtnuep#?SIMeyRE@F3`K_swovBIvtp
zcE8MfGrL;<r`x-~wAR|F=8LLjG~+yE=9om^8-U7wGA|Zs$X+BnMFQ;kb&yRJr=x^Q
z?5iFWH>;sqAXhQRG7vlp3skky@5k2G+VEI@H89=Sq)NSYU59TD0%uiX16({m)gP;!
zRE!<yE9NhC{rLc^I2r<sb6(dMxme92sc8BPMQ6+z3z#G}T;?=Xlx`Zy@J|J(#uqS0
z(@p>|)Fv6B(D+xh?Ps~?9EK=Nu^2yCB1}{wNLerz5PIIF14QgVJOS7bZ}E|Ni*YDC
zIm8~)GZqu7(A6*PTV(+q`;oTr+G31xh|rFGU)3<n1Wxj__89leoKBD6&`+ygm0ZfM
GFZcl?c4^oE

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