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/OaksLab.asm | |
| parent | Identify starter pikachu happiness boost medicine check (#72) (diff) | |
| parent | Use ~X instead of $ff ^ X (diff) | |
| download | pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.gz pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.xz pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.zip | |
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'scripts/OaksLab.asm')
| -rw-r--r-- | scripts/OaksLab.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 70f00d94..84faa0cd 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -231,7 +231,7 @@ OaksLabScript9: ld a, EEVEE ld [wd11e], a call GetMonName - ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, $11 ldh [hSpriteIndexOrTextID], a @@ -378,7 +378,7 @@ OaksLabScript14: ld a, b ld [wRivalStarter], a - ld a, $ff ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a @@ -435,7 +435,7 @@ OaksLabScript16: ld a, [wd730] bit 0, a jr nz, .checkRivalPosition - ld a, $ff ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, HS_OAKS_LAB_RIVAL ld [wMissableObjectIndex], a @@ -539,7 +539,7 @@ OaksLabScript20: ret nz call EnableAutoTextBoxDrawing call PlayDefaultMusic - ld a, $ff ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a call OaksLabScript_1c78e ld a, $14 |