diff options
Diffstat (limited to 'scripts/redshouse1f.asm')
| -rwxr-xr-x | scripts/redshouse1f.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index 7b3f1f87..cbfb35c8 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -1,12 +1,12 @@ -RedsHouse1FScript: ; 48168 (12:4168) +RedsHouse1FScript: jp EnableAutoTextBoxDrawing -RedsHouse1FTextPointers: ; 4816b (12:416b) +RedsHouse1FTextPointers: dw RedsHouse1FText1 dw RedsHouse1FText2 -RedsHouse1FText1: ; 4816f (12:416f) ; 416F Mom - db 8 +RedsHouse1FText1: ; Mom + TX_ASM ld a, [wd72e] bit 3, a jr nz, .heal ; if player has received a Pokémon from Oak, heal team @@ -18,52 +18,52 @@ RedsHouse1FText1: ; 4816f (12:416f) ; 416F Mom .done jp TextScriptEnd -MomWakeUpText: ; 48185 (12:4185) +MomWakeUpText: TX_FAR _MomWakeUpText db "@" -MomHealPokemon: ; 4818a (12:418a) +MomHealPokemon: ld hl, MomHealText1 call PrintText call GBFadeOutToWhite call ReloadMapData predef HealParty ld a, MUSIC_PKMN_HEALED - ld [wc0ee], a - call PlaySound ; play sound? + ld [wNewSoundID], a + call PlaySound .next - ld a, [wc026] + ld a, [wChannelSoundIDs] cp MUSIC_PKMN_HEALED jr z, .next - ld a, [wd35b] - ld [wc0ee], a + ld a, [wMapMusicSoundID] + ld [wNewSoundID], a call PlaySound call GBFadeInFromWhite ld hl, MomHealText2 jp PrintText -MomHealText1: ; 481bc (12:41bc) +MomHealText1: TX_FAR _MomHealText1 db "@" -MomHealText2: ; 481c1 (12:41c1) +MomHealText2: TX_FAR _MomHealText2 db "@" -RedsHouse1FText2: ; 0x481c6 TV - db 8 +RedsHouse1FText2: ; TV + TX_ASM ld a,[wSpriteStateData1 + 9] - cp 4 + cp SPRITE_FACING_UP ld hl,TVWrongSideText - jr nz,.done ; if player is not facing up + jr nz,.notUp ld hl,StandByMeText -.done +.notUp call PrintText jp TextScriptEnd -StandByMeText: ; 481da (12:41da) +StandByMeText: TX_FAR _StandByMeText db "@" -TVWrongSideText: ; 481df (12:41df) +TVWrongSideText: TX_FAR _TVWrongSideText db "@" |