diff options
Diffstat (limited to 'scripts/RedsHouse1F.asm')
| -rw-r--r-- | scripts/RedsHouse1F.asm | 60 |
1 files changed, 4 insertions, 56 deletions
diff --git a/scripts/RedsHouse1F.asm b/scripts/RedsHouse1F.asm index bdeb96d7..4af4a2e6 100644 --- a/scripts/RedsHouse1F.asm +++ b/scripts/RedsHouse1F.asm @@ -1,5 +1,6 @@ RedsHouse1F_Script: - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret RedsHouse1F_TextPointers: dw RedsHouse1FMomText @@ -7,63 +8,10 @@ RedsHouse1F_TextPointers: RedsHouse1FMomText: text_asm - ld a, [wd72e] - bit 3, a ; received a Pokémon from Oak? - jr nz, .heal - ld hl, MomWakeUpText - call PrintText - jr .done -.heal - call MomHealPokemon -.done + callfar Func_f1b73 jp TextScriptEnd -MomWakeUpText: - text_far _MomWakeUpText - text_end - -MomHealPokemon: - ld hl, MomHealText1 - call PrintText - call GBFadeOutToWhite - call ReloadMapData - predef HealParty - ld a, MUSIC_PKMN_HEALED - ld [wNewSoundID], a - call PlaySound -.next - ld a, [wChannelSoundIDs] - cp MUSIC_PKMN_HEALED - jr z, .next - ld a, [wMapMusicSoundID] - ld [wNewSoundID], a - call PlaySound - call GBFadeInFromWhite - ld hl, MomHealText2 - jp PrintText - -MomHealText1: - text_far _MomHealText1 - text_end -MomHealText2: - text_far _MomHealText2 - text_end - RedsHouse1FTVText: text_asm - ld a, [wSpritePlayerStateData1FacingDirection] - cp SPRITE_FACING_UP - ld hl, TVWrongSideText - jr nz, .got_text - ld hl, StandByMeText -.got_text - call PrintText + callfar Func_f1bc4 jp TextScriptEnd - -StandByMeText: - text_far _StandByMeText - text_end - -TVWrongSideText: - text_far _TVWrongSideText - text_end |