diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /scripts/redshouse1f.asm | |
| parent | 15427f532085846ab6b51719be687951a094cb6c (diff) | |
| parent | 9f29f21d9d43baa7124991dcf3b093fc6c615706 (diff) | |
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'scripts/redshouse1f.asm')
| -rwxr-xr-x | scripts/redshouse1f.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index b787669e..0e3e331b 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -7,7 +7,7 @@ RedsHouse1FTextPointers: ; 4816b (12:416b) RedsHouse1FText1: ; 4816f (12:416f) ; 416F Mom db 8 - ld a, [$D72E] + ld a, [wd72e] bit 3, a jr nz, .heal ; if player has received a Pokémon from Oak, heal team ld hl, MomWakeUpText @@ -27,16 +27,16 @@ MomHealPokemon: ; 4818a (12:418a) call PrintText call GBFadeOut2 call ReloadMapData - PREDEF HealPartyPredef + predef HealParty ld a, MUSIC_PKMN_HEALED - ld [$C0EE], a + ld [wc0ee], a call PlaySound ; play sound? .next - ld a, [$C026] + ld a, [wc026] cp MUSIC_PKMN_HEALED jr z, .next - ld a, [$D35B] - ld [$C0EE], a + ld a, [wd35b] + ld [wc0ee], a call PlaySound call GBFadeIn2 ld hl, MomHealText2 @@ -51,7 +51,7 @@ MomHealText2: ; 481c1 (12:41c1) RedsHouse1FText2: ; 0x481c6 TV db 8 - ld a,[$C109] + ld a,[wSpriteStateData1 + 9] cp 4 ld hl,TVWrongSideText jr nz,.done ; if player is not facing up |