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/PalletTown.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/PalletTown.asm')
| -rw-r--r-- | scripts/PalletTown.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index e7cc1f7a..3a80739e 100644 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -51,7 +51,7 @@ PalletTownScript0: ret PalletTownScript1: - ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a xor a ld [wcf0d], a @@ -105,7 +105,7 @@ PalletTownScript3: ld a, [wd730] bit 0, a ret nz - ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, 1 ld [wcf0d], a @@ -135,7 +135,7 @@ PalletTownScript3: PalletTownScript4: ; start the pikachu battle - ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a xor a ld [wListScrollOffset], a |