thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-22 18:41:35 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small bug fixes

Browse source 
- 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:
Llinos Evans 2023-08-10 23:15:57 +01:00
parent 6afb824b54
commit fe45fe99c1
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/maps/hide_show_data.asm
View file

@ -341,7 +341,7 @@ OaksLabHS:
db OAKS_LAB, $02, SHOW ; HS_STARTER_BALL_1 db OAKS_LAB, $02, SHOW ; HS_STARTER_BALL_1
db OAKS_LAB, $03, SHOW ; HS_STARTER_BALL_2 db OAKS_LAB, $03, SHOW ; HS_STARTER_BALL_2
db OAKS_LAB, $04, SHOW ; HS_STARTER_BALL_3 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, $07, SHOW ; HS_STARTER_BALL_4
db OAKS_LAB, $08, SHOW ; HS_STARTER_BALL_5 db OAKS_LAB, $08, SHOW ; HS_STARTER_BALL_5
db OAKS_LAB, $06, HIDE ; HS_OAKS_LAB_OAK_2 db OAKS_LAB, $06, HIDE ; HS_OAKS_LAB_OAK_2

13
scripts/CitrineRocketHouse.asm
View file

@ -71,6 +71,7 @@ JamesText:
; Thanks to Vimescarrot for giving me pointers on this! ; Thanks to Vimescarrot for giving me pointers on this!
ld a, [wWhichPokemon] ; Find the Pokemon's position in party. ld a, [wWhichPokemon] ; Find the Pokemon's position in party.
ld hl, wPartyMon1DVs ; Load DVs into hl ld hl, wPartyMon1DVs ; Load DVs into hl
ld bc, wPartyMon2 - wPartyMon1 ; This gets to the right slot for DVs ld bc, wPartyMon2 - wPartyMon1 ; This gets to the right slot for DVs
call AddNTimes ; Gets us there call AddNTimes ; Gets us there
ld a, %11111111 ; Load FFFF FFFF, perfect 15s ld a, %11111111 ; Load FFFF FFFF, perfect 15s
@ -98,10 +99,13 @@ JamesText:
ld hl, JamesNoCap ld hl, JamesNoCap
call PrintText call PrintText
jr .done jr .done
.alreadyTrained
ld hl, JamesAlreadyTrained
call PrintText
jr .done
.refused .refused
ld hl, JamesNo ld hl, JamesNo
call PrintText call PrintText
jr .done
.done .done
jp TextScriptEnd jp TextScriptEnd
@ -196,3 +200,10 @@ JamesNo:
JamesDone: JamesDone:
text_far _JamesDone text_far _JamesDone
text_end text_end
JamesAlreadyTrained:
text "That #MON is"
line "strong enough"
cont "already!"
done
text_end

3
text/CitrineRocketHouse.asm
View file

@ -85,6 +85,9 @@ _JamesSeesBottleCap::
cont "I'll make your" cont "I'll make your"
cont "#MON a little" cont "#MON a little"
cont "stronger!" cont "stronger!"
para "You'll only need"
line "to do it once!"
done done
_JamesYes:: _JamesYes::