diff options
| author | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
| commit | b65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch) | |
| tree | 151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/overworld/healing_machine.asm | |
| parent | rename hJoyHeldLast -> hJoyLast (diff) | |
| parent | Rename some labels (diff) | |
| download | pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.gz pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.xz pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/overworld/healing_machine.asm')
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 53174630..90d306c3 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -48,7 +48,7 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld [wc0ee], a call PlaySound ld d, $28 - call Func_704f3 + call FlashSprite8Times .asm_704a2 ld a, [wc026] cp MUSIC_PKMN_HEALED @@ -74,16 +74,17 @@ PokeCenterOAMData: ; 704d7 (1c:44d7) db $35,$30,$7D,$10 db $35,$38,$7D,$30 -Func_704f3: ; 704f3 (1c:44f3) - ld b, $8 -.asm_704f5 - ld a, [rOBP1] ; $ff49 +; d = value to xor with palette +FlashSprite8Times: ; 704f3 (1c:44f3) + ld b, 8 +.loop + ld a, [rOBP1] xor d - ld [rOBP1], a ; $ff49 - ld c, $a + ld [rOBP1], a + ld c, 10 call DelayFrames dec b - jr nz, .asm_704f5 + jr nz, .loop ret Func_70503: ; 70503 (1c:4503) |