mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-10-15 11:44:17 +13:00
Small bug fixes
- Oak no longer appears in the lab prematurely you can all stop reporting that now - Added some text warning about only needing to do Hyper Training once. The function as-is is really weird to add a conditional to and I'm a bit too tired to pull it off.
This commit is contained in:
parent
6afb824b54
commit
fe45fe99c1
|
@ -341,7 +341,7 @@ OaksLabHS:
|
|||
db OAKS_LAB, $02, SHOW ; HS_STARTER_BALL_1
|
||||
db OAKS_LAB, $03, SHOW ; HS_STARTER_BALL_2
|
||||
db OAKS_LAB, $04, SHOW ; HS_STARTER_BALL_3
|
||||
db OAKS_LAB, $05, SHOW ; HS_OAKS_LAB_OAK_1
|
||||
db OAKS_LAB, $05, HIDE ; HS_OAKS_LAB_OAK_1
|
||||
db OAKS_LAB, $07, SHOW ; HS_STARTER_BALL_4
|
||||
db OAKS_LAB, $08, SHOW ; HS_STARTER_BALL_5
|
||||
db OAKS_LAB, $06, HIDE ; HS_OAKS_LAB_OAK_2
|
||||
|
|
|
@ -71,6 +71,7 @@ JamesText:
|
|||
; Thanks to Vimescarrot for giving me pointers on this!
|
||||
ld a, [wWhichPokemon] ; Find the Pokemon's position in party.
|
||||
ld hl, wPartyMon1DVs ; Load DVs into hl
|
||||
|
||||
ld bc, wPartyMon2 - wPartyMon1 ; This gets to the right slot for DVs
|
||||
call AddNTimes ; Gets us there
|
||||
ld a, %11111111 ; Load FFFF FFFF, perfect 15s
|
||||
|
@ -98,10 +99,13 @@ JamesText:
|
|||
ld hl, JamesNoCap
|
||||
call PrintText
|
||||
jr .done
|
||||
.alreadyTrained
|
||||
ld hl, JamesAlreadyTrained
|
||||
call PrintText
|
||||
jr .done
|
||||
.refused
|
||||
ld hl, JamesNo
|
||||
call PrintText
|
||||
jr .done
|
||||
.done
|
||||
jp TextScriptEnd
|
||||
|
||||
|
@ -196,3 +200,10 @@ JamesNo:
|
|||
JamesDone:
|
||||
text_far _JamesDone
|
||||
text_end
|
||||
|
||||
JamesAlreadyTrained:
|
||||
text "That #MON is"
|
||||
line "strong enough"
|
||||
cont "already!"
|
||||
done
|
||||
text_end
|
||||
|
|
|
@ -85,6 +85,9 @@ _JamesSeesBottleCap::
|
|||
cont "I'll make your"
|
||||
cont "#MON a little"
|
||||
cont "stronger!"
|
||||
|
||||
para "You'll only need"
|
||||
line "to do it once!"
|
||||
done
|
||||
|
||||
_JamesYes::
|
||||
|
|
Loading…
Reference in a new issue