aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/emotion_bubbles.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-07-03 14:37:53 -0500
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-07-03 14:37:53 -0500
commitcd649184f556db777d592671a7274bfa4a8423d7 (patch)
treedca56b6c0accb03b4256268faaee2705d373b933 /engine/overworld/emotion_bubbles.asm
parentMention Jap grammar (diff)
downloadpokeyellow-cd649184f556db777d592671a7274bfa4a8423d7.tar.gz
pokeyellow-cd649184f556db777d592671a7274bfa4a8423d7.tar.xz
pokeyellow-cd649184f556db777d592671a7274bfa4a8423d7.zip
Rename/organize part 1 of 4
rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
Diffstat (limited to 'engine/overworld/emotion_bubbles.asm')
-rwxr-xr-xengine/overworld/emotion_bubbles.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm
index 7106063b..01b3ae85 100755
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
@@ -2,7 +2,7 @@ EmotionBubble: ; 17c47 (5:7c47)
ld a, [wcd50]
ld c, a
ld b, $0
- ld hl, EmotionBubblesPointerTable ; $7caf
+ ld hl, EmotionBubblesPointerTable
add hl, bc
add hl, bc
ld e, [hl]
@@ -45,10 +45,10 @@ EmotionBubble: ; 17c47 (5:7c47)
ld a, [hl]
add $8
ld c, a
- ld de, EmotionBubblesOAM ; $7cb5
+ ld de, EmotionBubblesOAM
xor a
call WriteOAMBlock
- ld c, $3c
+ ld c, 60
call DelayFrames
pop af
ld [wUpdateSpritesEnabled], a