diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-12 03:01:20 -0500 |
| commit | ce3ec76762d9e2f0c560e2ea7868678418883143 (patch) | |
| tree | 13bd307196f870d59157ab803c858c205eba6921 /engine/overworld/emotion_bubbles.asm | |
| parent | 604eb493c42b457f9e006e2cf67f29c15e0d1d0b (diff) | |
| parent | bcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow into merge-pokeredmerge-pokered
Diffstat (limited to 'engine/overworld/emotion_bubbles.asm')
| -rwxr-xr-x | engine/overworld/emotion_bubbles.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index 7c7f5e7d..3b02fd55 100755 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -3,7 +3,7 @@ EmotionBubble: and $f swap a ld c, a - ld b, $0 + ld b, 0 ld hl, EmotionBubbles add hl, bc ; each emotion bubble is 16 bytes, so calculate the offset directly instead of with a pointer table add hl, bc @@ -64,7 +64,7 @@ EmotionBubble: call DelayFrame call UpdateSprites ret - ; jp UpdateSprites + EmotionBubblesOAM: db $F8,$00,$F9,$00 |