diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/animations.asm | 2 | ||||
| -rw-r--r-- | engine/events/poison.asm | 4 | ||||
| -rw-r--r-- | engine/events/prize_menu.asm | 6 | ||||
| -rw-r--r-- | engine/items/town_map.asm | 2 | ||||
| -rw-r--r-- | engine/link/cable_club.asm | 2 | ||||
| -rw-r--r-- | engine/menus/main_menu.asm | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 3ccbf7c4..c0835680 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2409,7 +2409,7 @@ FallingObjects_UpdateOAMEntry: sub b ld [hli], a ; X inc hl - ld a, (1 << OAM_X_FLIP) + ld a, 1 << OAM_X_FLIP .next2 ld [hl], a ; attribute ret diff --git a/engine/events/poison.asm b/engine/events/poison.asm index bd79ad16..c0b4a18f 100644 --- a/engine/events/poison.asm +++ b/engine/events/poison.asm @@ -15,7 +15,7 @@ ApplyOutOfBattlePoisonDamage: ld de, wPartySpecies .applyDamageLoop ld a, [hl] - and (1 << PSN) + and 1 << PSN jr z, .nextMon2 ; not poisoned dec hl dec hl @@ -79,7 +79,7 @@ ApplyOutOfBattlePoisonDamage: ld e, 0 .countPoisonedLoop ld a, [hl] - and (1 << PSN) + and 1 << PSN or e ld e, a ld bc, wPartyMon2 - wPartyMon1 diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm index 816637bf..f2b24a3f 100644 --- a/engine/events/prize_menu.asm +++ b/engine/events/prize_menu.asm @@ -129,15 +129,15 @@ GetPrizeMenuId: ; reg. c: ; [low nybble] number of bytes ; [bits 765 = %100] space-padding (not zero-padding) - ld c, (1 << 7 | 2) + ld c, (1 << 7) | 2 call PrintBCDNumber ld de, wPrize2Price hlcoord 13, 7 - ld c, (1 << 7 | 2) + ld c, (1 << 7) | 2 call PrintBCDNumber ld de, wPrize3Price hlcoord 13, 9 - ld c, (1 << 7 | 2) + ld c, (1 << 7) | 2 jp PrintBCDNumber INCLUDE "data/events/prizes.asm" diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index 6f2c050c..9c8aea39 100644 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm @@ -511,7 +511,7 @@ WriteSymmetricMonPartySpriteOAM: ld [hli], a ; tile ld a, [wSymmetricSpriteOAMAttributes] ld [hli], a ; attributes - xor (1 << OAM_X_FLIP) + xor 1 << OAM_X_FLIP ld [wSymmetricSpriteOAMAttributes], a inc d ld a, 8 diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index 8ae192b8..92a1b596 100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm @@ -119,7 +119,7 @@ CableClub_DoBattleOrTradeAgain: ldh [rSC], a .skipSendingTwoZeroBytes call Delay3 - ld a, (1 << SERIAL) + ld a, 1 << SERIAL ldh [rIE], a ld hl, wSerialRandomNumberListBlock ld de, wSerialOtherGameboyRandomNumberListBlock diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 8bd6f05e..60bcfcbd 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -231,7 +231,7 @@ LinkMenu: ld c, " " ld d, "▷" ld a, [wLinkMenuSelectionSendBuffer] - and (B_BUTTON << 2) ; was B button pressed? + and B_BUTTON << 2 ; was B button pressed? jr nz, .updateCursorPosition ; A button was pressed ld a, [wCurrentMenuItem] @@ -254,7 +254,7 @@ LinkMenu: call DelayFrames call LoadScreenTilesFromBuffer1 ld a, [wLinkMenuSelectionSendBuffer] - and (B_BUTTON << 2) ; was B button pressed? + and B_BUTTON << 2 ; was B button pressed? jr nz, .choseCancel ; cancel if B pressed ld a, [wCurrentMenuItem] cp $2 |