diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-23 21:19:29 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-23 21:19:29 -0500 |
| commit | 7574e186e7505e237efc3ab0969fed60bec6eb9d (patch) | |
| tree | 527ec48412989e98cca7827c5e31d89cdf742b05 /scripts/PokemonTower7F.asm | |
| parent | 70baa4f3e80bceedd00cafbbab219665eb189225 (diff) | |
| parent | 09e92c554c7563b52a9484b26d96d903c7635b0d (diff) | |
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'scripts/PokemonTower7F.asm')
| -rw-r--r-- | scripts/PokemonTower7F.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm index 984322b6..c9da74f7 100644 --- a/scripts/PokemonTower7F.asm +++ b/scripts/PokemonTower7F.asm @@ -54,7 +54,7 @@ PokemonTower7Script_60d2a: call PlayMusic xor a ldh [hJoyHeld], a - ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, HS_POKEMON_TOWER_7F_JESSIE call PokemonTower7Script_60eaf @@ -141,7 +141,7 @@ PokemonTower7Script6: ld [wSprite02StateData1FacingDirection], a .asm_60dff call Delay3 - ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, $5 ldh [hSpriteIndexOrTextID], a @@ -176,7 +176,7 @@ PokemonTower7Script8: xor a ld [wSprite01StateData1FacingDirection], a ld [wSprite02StateData1FacingDirection], a - ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a |