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

Remove two unused bits from battle structs (#7835)

Browse Source
This commit is contained in:
Bassoonian 2025-10-02 15:54:46 +02:00 committed by GitHub
parent 2156651313
commit 168e421033
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/battle.h
View File

@ -149,7 +149,7 @@ struct ProtectStruct
u32 chargingTurn:1;
u32 fleeType:2; // 0: Normal, 1: FLEE_ITEM, 2: FLEE_ABILITY
u32 unableToUseMove:1; // Not to be confused with HITMARKER_UNABLE_TO_USE_MOVE (It is questionable though if there is a difference. Needs further research)
u32 notFirstStrike:1;
u32 laggingTail:1;
u32 palaceUnableToUseMove:1;
u32 statRaised:1;
u32 usedCustapBerry:1; // also quick claw
@ -168,8 +168,7 @@ struct ProtectStruct
u16 lashOutAffected:1;
u16 assuranceDoubled:1;
u16 myceliumMight:1;
u16 laggingTail:1;
u16 padding:9;
u16 padding:10;
// End of 16-bit bitfield
u16 physicalDmg;
u16 specialDmg;
@ -187,10 +186,10 @@ struct SpecialStatus
u8 abilityRedirected:1;
u8 restoredBattlerSprite: 1;
u8 faintedHasReplacement:1;
u8 preventLifeOrbDamage:1; // So that Life Orb doesn't activate various effects.
u8 afterYou:1;
u8 enduredDamage:1;
u8 dancerUsedMove:1;
u8 padding:1;
// End of byte
u8 switchInAbilityDone:1;
u8 switchInItemDone:1;

1
src/battle_main.c
View File

@ -3333,7 +3333,6 @@ const u8* FaintClearSetData(u32 battler)
gProtectStructs[battler].confusionSelfDmg = FALSE;
gProtectStructs[battler].chargingTurn = FALSE;
gProtectStructs[battler].fleeType = 0;
gProtectStructs[battler].notFirstStrike = FALSE;
gProtectStructs[battler].statRaised = FALSE;
gProtectStructs[battler].pranksterElevated = FALSE;

2
src/battle_util.c
View File

@ -2477,8 +2477,6 @@ static enum MoveCanceller CancellerPPDeduction(struct BattleContext *ctx)
ppToDeduct++;
}
gProtectStructs[ctx->battlerAtk].notFirstStrike = TRUE;
// For item Metronome, echoed voice
if (ctx->currentMove != gLastResultingMoves[ctx->battlerAtk] || WasUnableToUseMove(ctx->battlerAtk))
gBattleStruct->sameMoveTurns[ctx->battlerAtk] = 0;