aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/SilphCo11F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/SilphCo11F.asm')
-rw-r--r--scripts/SilphCo11F.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm
index 778283c5..9caf2a70 100644
--- a/scripts/SilphCo11F.asm
+++ b/scripts/SilphCo11F.asm
@@ -236,8 +236,8 @@ SilphCo11FGiovanniAfterBattleScript:
jp SilphCo11FSetCurScript
SilphCo11FGiovanniBattleFacingScript:
- ld a, [wd730]
- bit 0, a
+ ld a, [wStatusFlags5]
+ bit BIT_SCRIPTED_NPC_MOVEMENT, a
ret nz
ld a, SILPHCO11F_GIOVANNI
ldh [hSpriteIndex], a
@@ -258,9 +258,9 @@ SilphCo11FGiovanniBattleFacingScript:
jp SilphCo11FSetCurScript
SilphCo11FGiovanniStartBattleScript:
- ld hl, wd72d
- set 6, [hl]
- set 7, [hl]
+ ld hl, wStatusFlags3
+ set BIT_TALKED_TO_TRAINER, [hl]
+ set BIT_PRINT_END_BATTLE_TEXT, [hl]
ld hl, SilphCo10FGiovanniILostAgainText
ld de, SilphCo10FGiovanniILostAgainText
call SaveEndBattleTextPointers