diff options
Diffstat (limited to 'scripts/CinnabarGym.asm')
| -rw-r--r-- | scripts/CinnabarGym.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index 17ac1ac1..a7608a4f 100644 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -81,8 +81,8 @@ MovementNpcToLeft: db -1 ; end CinnabarGymGetOpponentTextScript: - ld a, [wd730] - bit 0, a + ld a, [wStatusFlags5] + bit BIT_SCRIPTED_NPC_MOVEMENT, a ret nz xor a ld [wJoyIgnore], a @@ -194,9 +194,9 @@ CinnabarGymStartBattleScript: ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters - 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 a, [wSpriteIndex] cp CINNABARGYM_BLAINE jr z, .blaine |