diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-16 17:27:50 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-16 17:27:50 -0500 |
| commit | 7b3de85a06e81d14ac0c73e8f9e1ab8e4a474beb (patch) | |
| tree | 6ffeacd670c9ff66a951550a15a0e990f88ab75d /engine/battle | |
| parent | 80480821142d7a7b16dd2b1a98a213e7b389af0f (diff) | |
Avoid "+- 1" at every maskbits
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/ai/move.asm | 2 | ||||
| -rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
| -rw-r--r-- | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle/effect_commands.asm | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/ai/move.asm b/engine/battle/ai/move.asm index 27a8ad5a5..7ccb20972 100755 --- a/engine/battle/ai/move.asm +++ b/engine/battle/ai/move.asm @@ -186,7 +186,7 @@ AIChooseMove: ; 440ce .ChooseMove: ld hl, Buffer1 call Random - maskbits NUM_MOVES +- 1 + maskbits NUM_MOVES ld c, a ld b, 0 add hl, bc diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 1409ddc37..452339e81 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -640,7 +640,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) .cgb ld hl, .daypals ld a, [TimeOfDayPal] - maskbits NUM_DAYTIMES +- 1 + maskbits NUM_DAYTIMES cp DARKNESS_F jr nz, .daytime ld hl, .nightpals diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 5d79f5fd5..e1c5f331f 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6031,7 +6031,7 @@ ParseEnemyAction: ; 3e7c1 .loop2 ld hl, EnemyMonMoves call BattleRandom - maskbits NUM_MOVES +- 1 + maskbits NUM_MOVES ld c, a ld b, 0 add hl, bc diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 801ce211e..c1bc3752a 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -932,7 +932,7 @@ BattleCommand_CheckObedience: ; 343db .RandomMove: call BattleRandom - maskbits NUM_MOVES +- 1 + maskbits NUM_MOVES cp b jr nc, .RandomMove @@ -4387,7 +4387,7 @@ BattleCommand_SleepTalk: ; 35b33 .sample_move push hl call BattleRandom - maskbits NUM_MOVES +- 1 + maskbits NUM_MOVES ld c, a ld b, 0 add hl, bc @@ -8204,7 +8204,7 @@ BattleCommand_Conversion: ; 3707f .done .loop3 call BattleRandom - maskbits NUM_MOVES +- 1 + maskbits NUM_MOVES ld c, a ld b, 0 ld hl, StringBuffer1 |