From 65bfab1a3818d81a62c23f8ddcc412ff2a085dc0 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 16 Dec 2023 09:48:41 +0100 Subject: [PATCH] rename Cmd_jumpifaffectedbyprotect --- asm/macros/battle_script.inc | 5 ----- src/battle_script_commands.c | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index a29b5f62e8..de509588bc 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -362,11 +362,6 @@ .byte 0x3f .endm - .macro jumpifaffectedbyprotect failInstr:req - .byte 0x40 - .4byte \failInstr - .endm - .macro call instr:req .byte 0x41 .4byte \instr diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 519dc51577..a82825ff06 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -418,7 +418,7 @@ static void Cmd_return(void); static void Cmd_end(void); static void Cmd_end2(void); static void Cmd_end3(void); -static void Cmd_jumpifaffectedbyprotect(void); +static void Cmd_unused5(void); static void Cmd_call(void); static void Cmd_setroost(void); static void Cmd_jumpifabilitypresent(void); @@ -677,7 +677,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = Cmd_end, //0x3D Cmd_end2, //0x3E Cmd_end3, //0x3F - Cmd_jumpifaffectedbyprotect, //0x40 + Cmd_unused5, //0x40 Cmd_call, //0x41 Cmd_setroost, //0x42 Cmd_jumpifabilitypresent, //0x43 @@ -1507,7 +1507,7 @@ static bool32 JumpIfMoveFailed(u8 adder, u16 move) return FALSE; } -static void Cmd_jumpifaffectedbyprotect(void) +static void Cmd_unused5(void) { CMD_ARGS(const u8 *failInstr);