diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 16dc4382..f5a9dc21 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -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 diff --git a/scripts/CitrineRocketHouse.asm b/scripts/CitrineRocketHouse.asm index 199262dd..c928c9e9 100644 --- a/scripts/CitrineRocketHouse.asm +++ b/scripts/CitrineRocketHouse.asm @@ -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 diff --git a/text/CitrineRocketHouse.asm b/text/CitrineRocketHouse.asm index 0f88228a..f7c350d2 100644 --- a/text/CitrineRocketHouse.asm +++ b/text/CitrineRocketHouse.asm @@ -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::