mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-21 22:52:15 +13:00
Rework CeladonU Trainers
This refactors the Celadon University trainers to ensure that they process properly without the odd memory leak-y thing I did before. Overall works the same, just works for the intended purpose. I also applied what I learned to Professor Oak, giving a Yes/No prompt and adding some pre-battle music as I originally intended.
This commit is contained in:
parent
c9b01f2c64
commit
c759efdeea
4 changed files with 185 additions and 47 deletions
|
|
@ -63,14 +63,16 @@ Route1OakText:
|
|||
ld hl, OakBeforeBattleText
|
||||
call PrintText
|
||||
|
||||
; call YesNoChoice ; this whole bit doesn't work for some reason
|
||||
; ld a, [wCurrentMenuItem]
|
||||
; and a
|
||||
; ld hl, OakYes
|
||||
; jr nz, .got_text
|
||||
; ld hl, OakNo
|
||||
;.got_text
|
||||
call YesNoChoice ; this whole bit doesn't work for some reason
|
||||
ld a, [wCurrentMenuItem]
|
||||
and a
|
||||
jr nz, .refused
|
||||
|
||||
ld hl, OakYes
|
||||
call PrintText
|
||||
ld c, BANK(Music_MeetMaleTrainer)
|
||||
ld a, MUSIC_MEET_MALE_TRAINER
|
||||
call PlayMusic
|
||||
ld hl, wd72d
|
||||
set 6, [hl]
|
||||
set 7, [hl]
|
||||
|
|
@ -103,6 +105,10 @@ Route1OakText:
|
|||
.Eevee
|
||||
ld a, $5 ; If Eevee, Gorochu
|
||||
jr .done
|
||||
.refused
|
||||
ld hl, OakNo
|
||||
call PrintText
|
||||
jp TextScriptEnd
|
||||
.done
|
||||
ld [wTrainerNo], a
|
||||
ld a, 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue