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: MtMoonCrater_Object:
db $0 ; border block db $03 ; border block
def_warp_events def_warp_events
warp_event 23, 49, 10, LAST_MAP warp_event 23, 49, MT_MOON_B1F, 10
warp_event 22, 49, 10, LAST_MAP warp_event 22, 49, MT_MOON_B1F, 10
def_bg_events def_bg_events

Binary file not shown.

View file

@ -83,15 +83,15 @@ Route1OakText:
ld a, [wRivalStarter] ld a, [wRivalStarter]
cp STARTER2 cp STARTER2
jr nz, .NotSquirtle jr nz, .NotSquirtle
ld a, $3 ld a, $2 ; If Charmander, Venusaur
jr .done jr .done
.NotSquirtle .NotSquirtle
cp STARTER3 cp STARTER3
jr nz, .Charmander jr nz, .Charmander
ld a, $1 ld a, $3 ; If Bulbasaur, Totartle
jr .done jr .done
.Charmander .Charmander
ld a, $2 ld a, $1 ; If Squirtle, Charizard
.done .done
ld [wTrainerNo], a ld [wTrainerNo], a
ld a, 1 ld a, 1
@ -124,10 +124,3 @@ OakYes:
OakNo: OakNo:
text_far _OakNo text_far _OakNo
text_end 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