From 6fe79e23bd32c52b038bc1da91ccd6a979f4883e Mon Sep 17 00:00:00 2001 From: cawtds Date: Sun, 19 May 2024 01:38:06 +0200 Subject: [PATCH] fixed state change shift, removed unused --- include/battle.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/battle.h b/include/battle.h index 6beeed90b..12158b711 100644 --- a/include/battle.h +++ b/include/battle.h @@ -733,9 +733,6 @@ extern struct BattleStruct *gBattleStruct; #define IS_MOVE_RECOIL(move)(gMovesInfo[move].recoil > 0 || gMovesInfo[move].effect == EFFECT_RECOIL_IF_MISS) -#define IS_TYPE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY) // TODO: remove -#define IS_TYPE_SPECIAL(moveType)(moveType > TYPE_MYSTERY) // TODO: remove - #define BATTLER_MAX_HP(battlerId)(gBattleMons[battlerId].hp == gBattleMons[battlerId].maxHP) #define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0) || (gBattleStruct->enduredDamage & gBitTable[gBattlerTarget])) #define BATTLER_TURN_DAMAGED(battlerId) ((gSpecialStatuses[battlerId].physicalDmg != 0 || gSpecialStatuses[battlerId].specialDmg != 0) || (gBattleStruct->enduredDamage & gBitTable[battler])) @@ -777,9 +774,8 @@ extern struct BattleStruct *gBattleStruct; #define SET_STAT_BUFF_VALUE(n)((((n) << 3) & 0xF8)) -#define SET_STATCHANGER(statId, stage, goesDown)(gBattleScripting.statChanger = (statId) + (stage << 4) + (goesDown << 7)) +#define SET_STATCHANGER(statId, stage, goesDown)(gBattleScripting.statChanger = (statId) + ((stage) << 3) + (goesDown << 7)) #define SET_STATCHANGER2(dst, statId, stage, goesDown)(dst = (statId) + ((stage) << 3) + (goesDown << 7)) -// TODO: change in battle script(?) from stage << 4 to stage << 3 // NOTE: The members of this struct have hard-coded offsets // in include/constants/battle_script_commands.h