From 8613d2587eb454d358fcf2066949a7926814d3fc Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Mon, 3 Nov 2025 15:03:25 +0100 Subject: [PATCH] Deprecate various macro (#8092) --- asm/macros/battle_script.inc | 4 +--- src/battle_script_commands.c | 13 +++---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 9de7fa763a..1fa2d99653 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -679,10 +679,8 @@ .byte 0x75 .endm - .macro various battler:req, id:req + .macro unused_0x78 .byte 0x76 - .byte \battler - .byte \id .endm .macro setprotectlike diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6b428ded15..7dc6c81e1a 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -455,7 +455,7 @@ static void Cmd_jumpifplayerran(void); static void Cmd_hpthresholds(void); static void Cmd_hpthresholds2(void); static void Cmd_useitemonopponent(void); -static void Cmd_various(void); +static void Cmd_unused_0x78(void); static void Cmd_setprotectlike(void); static void Cmd_tryexplosion(void); static void Cmd_setatkhptozero(void); @@ -714,7 +714,7 @@ void (*const gBattleScriptingCommandsTable[])(void) = Cmd_hpthresholds, //0x73 Cmd_hpthresholds2, //0x74 Cmd_useitemonopponent, //0x75 - Cmd_various, //0x76 + Cmd_unused_0x78, //0x76 Cmd_setprotectlike, //0x77 Cmd_tryexplosion, //0x78 Cmd_setatkhptozero, //0x79 @@ -9599,15 +9599,8 @@ static bool32 ChangeOrderTargetAfterAttacker(void) return TRUE; } -// will be deprecated next release cycle -static void Cmd_various(void) +static void Cmd_unused_0x78(void) { - CMD_ARGS(u8 battler, u8 id); - - if (gBattleControllerExecFlags) - return; - - gBattlescriptCurrInstr = cmd->nextInstr; } static void TryResetProtectUseCounter(u32 battler)