diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 00:54:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 00:54:49 -0700 |
| commit | bcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (patch) | |
| tree | 2ffb3b9c8eca5fc4e2be2fc8aaf4965f64a13296 /engine/overworld/emotion_bubbles.asm | |
| parent | Merge pull request #13 from YamaArashi/master (diff) | |
| parent | more syncing with pokered (diff) | |
| download | pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.gz pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.tar.xz pokeyellow-bcf0bd960b03720a02669ed2b6d3a22df60cf0b2.zip | |
Merge pull request #16 from YamaArashi/master
sync engine code with 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 |