diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-16 23:27:57 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-16 23:27:57 -0500 |
| commit | 40ea6a5f757bbbfdb4296e5acf644f6679a03a14 (patch) | |
| tree | 2f7957bfa877ce974ad185684f037ba5b6cdfccd /scripts/route22.asm | |
| parent | Swap trade center and battle center (diff) | |
| parent | Merge pull request #101 from YamaArashi/master (diff) | |
| download | pokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.tar.gz pokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.tar.xz pokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.zip | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Diffstat (limited to 'scripts/route22.asm')
| -rwxr-xr-x | scripts/route22.asm | 12 |
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 |