diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/billshouse.asm | 2 | ||||
| -rwxr-xr-x | scripts/billshouse2.asm | 2 | ||||
| -rwxr-xr-x | scripts/fanclub.asm | 2 | ||||
| -rwxr-xr-x | scripts/mtmoon3.asm | 2 | ||||
| -rwxr-xr-x | scripts/oakslab.asm | 2 | ||||
| -rwxr-xr-x | scripts/pallettown.asm | 4 | ||||
| -rwxr-xr-x | scripts/pokemontower7.asm | 2 | ||||
| -rwxr-xr-x | scripts/rockethideout4.asm | 2 | ||||
| -rwxr-xr-x | scripts/silphco11.asm | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index c7fd74f9..02183977 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -171,7 +171,7 @@ BillsHouseScript5: call ApplyPikachuMovementData ld a, $f ld [wEmotionBubbleSpriteIndex], a - ld a, $0 + ld a, EXCLAMATION_BUBBLE ld [wWhichEmotionBubble], a predef EmotionBubble callab InitializePikachuTextID diff --git a/scripts/billshouse2.asm b/scripts/billshouse2.asm index 87016aa8..9d3b4364 100755 --- a/scripts/billshouse2.asm +++ b/scripts/billshouse2.asm @@ -117,7 +117,7 @@ Func_f24d5: call ApplyPikachuMovementData ld a, $f ; pikachu ld [wEmotionBubbleSpriteIndex], a - ld a, $1 + ld a, QUESTION_BUBBLE ld [wWhichEmotionBubble], a predef EmotionBubble call DisablePikachuFollowingPlayer diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm index 01d6269b..7bb1bc86 100755 --- a/scripts/fanclub.asm +++ b/scripts/fanclub.asm @@ -44,7 +44,7 @@ FanClubScript_59a44: ld [wPlayerMovingDirection], a call UpdateSprites call UpdateSprites - ld a, $0 + ld a, EXCLAMATION_BUBBLE ld [wWhichEmotionBubble], a ld a, $f ; Pikachu ld [wEmotionBubbleSpriteIndex], a diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index b8d14bd5..e86d6d37 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -467,7 +467,7 @@ MtMoon3Text12: ld [wPlayerMovingDirection], a ld a, $0 ld [wEmotionBubbleSpriteIndex], a - ld a, $0 + ld a, EXCLAMATION_BUBBLE ld [wWhichEmotionBubble], a predef EmotionBubble ld c, 20 diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 55b58b39..d3082256 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -797,7 +797,7 @@ OaksLabText_1c9a7: OaksLabScript_1c9ac: ld a, $1 ld [wEmotionBubbleSpriteIndex], a - xor a + xor a ; EXCLAMATION_BUBBLE ld [wWhichEmotionBubble], a predef EmotionBubble ld a, $8 diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index 803aa4f3..49546a44 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -260,8 +260,8 @@ OakAppearsText: ld [wPlayerMovingDirection], a ld a, 0 ld [wEmotionBubbleSpriteIndex], a ; player's sprite - ld a, 0 - ld [wWhichEmotionBubble], a ; EXCLAMATION_BUBBLE + ld a, EXCLAMATION_BUBBLE + ld [wWhichEmotionBubble], a predef EmotionBubble jp TextScriptEnd diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 9a016d84..6a2cdad5 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -269,7 +269,7 @@ PokemonTower7Text4: ld [wPlayerMovingDirection], a ld a, $0 ld [wEmotionBubbleSpriteIndex], a - ld a, $0 + ld a, EXCLAMATION_BUBBLE ld [wWhichEmotionBubble], a predef EmotionBubble ld c, 20 diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 2b3e0e89..1781b12e 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -322,7 +322,7 @@ RocketHideout4Text10: ld [wPlayerMovingDirection], a ld a, $0 ld [wEmotionBubbleSpriteIndex], a - ld a, $0 + ld a, EXCLAMATION_BUBBLE ld [wWhichEmotionBubble], a predef EmotionBubble ld c, 20 diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 1ef7dbaf..cb922453 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -498,7 +498,7 @@ SilphCo11Text8: ld [wPlayerMovingDirection], a ld a, $0 ld [wEmotionBubbleSpriteIndex], a - ld a, $0 + ld a, EXCLAMATION_BUBBLE ld [wWhichEmotionBubble], a predef EmotionBubble ld c, 20 |