aboutsummaryrefslogtreecommitdiffstats
path: root/engine
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2022-07-26 00:01:21 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2022-07-26 00:01:21 -0400
commit498da6ab0921a280507b3d96e7faac1b305959bd (patch)
tree3b2bacb3b4f7ed58626e83c5e42c4e8ccdb5b027 /engine
parentBasic Issue Template with Discord Link (#377) (diff)
downloadpokeyellow-498da6ab0921a280507b3d96e7faac1b305959bd.tar.gz
pokeyellow-498da6ab0921a280507b3d96e7faac1b305959bd.tar.xz
pokeyellow-498da6ab0921a280507b3d96e7faac1b305959bd.zip
Clarify how Metronome picks a move
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/core.asm5
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 62813eb4..44c657ee 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -5144,12 +5144,13 @@ MetronomePickMove:
; values for enemy turn
ld de, wEnemyMoveNum
ld hl, wEnemySelectedMove
-; loop to pick a random number in the range [1, $a5) to be the move used by Metronome
+; loop to pick a random number in the range of valid moves used by Metronome
.pickMoveLoop
call BattleRandom
and a
jr z, .pickMoveLoop
- cp NUM_ATTACKS ; max move number (including Struggle)
+ cp STRUGGLE
+ assert NUM_ATTACKS == STRUGGLE ; random numbers greater than STRUGGLE are not moves
jr nc, .pickMoveLoop
cp METRONOME
jr z, .pickMoveLoop