Fix Mt. Moon Crater and Oak team choices

This commit is contained in:
May Evans 2022-12-14 20:03:55 +00:00
parent d883c40fff
commit 99fa5a27b9
3 changed files with 8 additions and 15 deletions

View file

@ -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

Binary file not shown.

View file

@ -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