From 388389714b7809a49385b46e4a3c6b417a306738 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sun, 30 Mar 2025 10:52:24 +0200 Subject: [PATCH] Rename removelishtscreenreflect to removescreens (#6495) --- asm/macros/battle_script.inc | 2 +- data/battle_scripts_1.s | 2 +- src/battle_script_commands.c | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 8c1c9fc929..f3d8f5000f 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1269,7 +1269,7 @@ .byte 0xed .endm - .macro removelightscreenreflect + .macro removescreens .byte 0xee .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index bc2b37466a..93873871f9 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -5072,7 +5072,7 @@ BattleScript_EffectBrickBreak:: attackstring ppreduce typecalc - removelightscreenreflect + removescreens critcalc damagecalc adjustdamage diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 1c0e470cde..da25d9672f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -585,7 +585,7 @@ static void Cmd_tryrecycleitem(void); static void Cmd_settypetoterrain(void); static void Cmd_pursuitdoubles(void); static void Cmd_snatchsetbattlers(void); -static void Cmd_removelightscreenreflect(void); +static void Cmd_removescreens(void); static void Cmd_handleballthrow(void); static void Cmd_givecaughtmon(void); static void Cmd_trysetcaughtmondexflags(void); @@ -844,7 +844,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = Cmd_settypetoterrain, //0xEB Cmd_pursuitdoubles, //0xEC Cmd_snatchsetbattlers, //0xED - Cmd_removelightscreenreflect, //0xEE + Cmd_removescreens, //0xEE Cmd_handleballthrow, //0xEF Cmd_givecaughtmon, //0xF0 Cmd_trysetcaughtmondexflags, //0xF1 @@ -15782,8 +15782,7 @@ static void Cmd_snatchsetbattlers(void) gBattlescriptCurrInstr = cmd->nextInstr; } -// Brick Break -static void Cmd_removelightscreenreflect(void) +static void Cmd_removescreens(void) { CMD_ARGS();