diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/BillsHouse.asm | 2 | ||||
| -rw-r--r-- | scripts/MtMoonB2F.asm | 6 | ||||
| -rw-r--r-- | scripts/OaksLab.asm | 8 | ||||
| -rw-r--r-- | scripts/PalletTown.asm | 6 | ||||
| -rw-r--r-- | scripts/PokemonTower7F.asm | 6 | ||||
| -rw-r--r-- | scripts/ViridianCity.asm | 2 | ||||
| -rw-r--r-- | scripts/ViridianCity2.asm | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm index 8559c0b1..a19317d5 100644 --- a/scripts/BillsHouse.asm +++ b/scripts/BillsHouse.asm @@ -212,7 +212,7 @@ BillsHouseScript7: ld [wPlayerMovingDirection], a ld a, SPRITE_FACING_UP ld [wSpritePlayerStateData1FacingDirection], a - ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld a, ~(A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld de, RLE_1e219 ld hl, wSimulatedJoypadStatesEnd 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 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 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 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 diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index d960b9cb..44d7b780 100644 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -33,7 +33,7 @@ ViridianCityScript_1905b: CheckEvent EVENT_VIRIDIAN_GYM_OPEN ret nz ld a, [wObtainedBadges] - cp $ff ^ (1 << BIT_EARTHBADGE) + cp ~(1 << BIT_EARTHBADGE) jr nz, .gym_closed SetEvent EVENT_VIRIDIAN_GYM_OPEN ret diff --git a/scripts/ViridianCity2.asm b/scripts/ViridianCity2.asm index c2e8254e..55f1a79d 100644 --- a/scripts/ViridianCity2.asm +++ b/scripts/ViridianCity2.asm @@ -10,7 +10,7 @@ ViridianCityText_f18c2: Func_f18c7:: ld hl, ViridianCityText_19127 ld a, [wObtainedBadges] - cp $ff ^ (1 << BIT_EARTHBADGE) + cp ~(1 << BIT_EARTHBADGE) jr z, .done CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI jr nz, .done |