Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate various macro (#8092)

Browse Source
This commit is contained in:
Alex 2025-11-03 15:03:25 +01:00 committed by GitHub
parent 5b738edd4b
commit 8613d2587e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/battle_script.inc
View File

@ -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

13
src/battle_script_commands.c
View File

@ -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)