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/MtMoonB2F.asm | |
parent | 70baa4f3e80bceedd00cafbbab219665eb189225 (diff) | |
parent | 09e92c554c7563b52a9484b26d96d903c7635b0d (diff) |
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'scripts/MtMoonB2F.asm')
-rw-r--r-- | scripts/MtMoonB2F.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index 83601218..491ecae3 100644 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -234,7 +234,7 @@ MtMoon3Script_49e15: 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_MT_MOON_B2F_JESSIE call MtMoon3Script_49f84 @@ -319,7 +319,7 @@ MtMoon3Script11: ld a, SPRITE_FACING_LEFT ld [wSprite06StateData1FacingDirection], a call Delay3 - ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, $d ldh [hSpriteIndexOrTextID], a @@ -355,7 +355,7 @@ MtMoon3Script13: xor a ld [wSprite02StateData1FacingDirection], a ld [wSprite06StateData1FacingDirection], a - ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a |