From 990f43865b07cff56973d1bd0a9ce39a94b0d70c Mon Sep 17 00:00:00 2001 From: Jordan Moore Date: Wed, 25 Dec 2024 05:23:40 -0500 Subject: [PATCH] Rename checkcurl to checkrollout --- data/battle/effect_command_pointers.asm | 2 +- data/moves/effects.asm | 2 +- engine/battle/move_effects/rollout.asm | 2 +- macros/scripts/battle_commands.asm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index 7239e8150..d34ea2f0a 100644 --- a/data/battle/effect_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm @@ -95,7 +95,7 @@ BattleCommandPointers: dw BattleCommand_PerishSong dw BattleCommand_StartSandstorm dw BattleCommand_Endure - dw BattleCommand_CheckCurl + dw BattleCommand_CheckRollout dw BattleCommand_RolloutPower dw BattleCommand_Unused5D dw BattleCommand_FuryCutter diff --git a/data/moves/effects.asm b/data/moves/effects.asm index 02305d809..3ea6451ca 100644 --- a/data/moves/effects.asm +++ b/data/moves/effects.asm @@ -1536,7 +1536,7 @@ Endure: endmove Rollout: - checkcurl + checkrollout checkobedience doturn usedmovetext diff --git a/engine/battle/move_effects/rollout.asm b/engine/battle/move_effects/rollout.asm index c7582eeec..1cdd9a798 100644 --- a/engine/battle/move_effects/rollout.asm +++ b/engine/battle/move_effects/rollout.asm @@ -1,6 +1,6 @@ DEF MAX_ROLLOUT_COUNT EQU 5 -BattleCommand_CheckCurl: +BattleCommand_CheckRollout: ld de, wPlayerRolloutCount ldh a, [hBattleTurn] and a diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index 180ff8575..da7797c70 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -95,7 +95,7 @@ ENDM command perishsong ; 58 command startsandstorm ; 59 command endure ; 5a - command checkcurl ; 5b + command checkrollout ; 5b command rolloutpower ; 5c command effect0x5d ; 5d command furycutter ; 5e