summaryrefslogtreecommitdiff
path: root/scripts/route22.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-07-14 14:32:49 -0700
committerYamaArashi <shadow962@live.com>2015-07-14 14:32:49 -0700
commit01631a2e5910b5334ba0f7cc534bc5d7e5b60ccc (patch)
tree845122ead069a7f4de89062434501727767d2ef2 /scripts/route22.asm
parentb1cb3788938fa981e65619f022a41f1c1d91ae3b (diff)
player animations, emotion bubbles, etc.
Diffstat (limited to 'scripts/route22.asm')
-rwxr-xr-xscripts/route22.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/route22.asm b/scripts/route22.asm
index 7d70924b..68b3a4b9 100755
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -79,9 +79,9 @@ Route22Script0: ; 50f00 (14:4f00)
.firstRivalBattle
ld a, $1
- ld [wcd4f], a
- xor a
- ld [wcd50], a
+ ld [wEmotionBubbleSpriteIndex], a
+ xor a ; EXCLAMATION_BUBBLE
+ ld [wWhichEmotionBubble], a
predef EmotionBubble
ld a, [wWalkBikeSurfState]
and a
@@ -218,9 +218,9 @@ Route22Script3: ; 5102a (14:502a)
Route22Script_5104e: ; 5104e (14:504e)
ld a, $2
- ld [wcd4f], a
- xor a
- ld [wcd50], a
+ ld [wEmotionBubbleSpriteIndex], a
+ xor a ; EXCLAMATION_BUBBLE
+ ld [wWhichEmotionBubble], a
predef EmotionBubble
ld a, [wWalkBikeSurfState]
and a