diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2020-10-23 20:47:10 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2020-10-23 20:47:10 -0400 |
| commit | 90211248af2f02aa696b38fbf77ddfd2d2950312 (patch) | |
| tree | b1ce12bab66495bfc8fcd6ad1e53683bb615d572 /include | |
| parent | 64ba8c806111ab6baa6bde485f64925c07378f89 (diff) | |
re-match Cmd_unknown_24 (from #1140)
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 18 | ||||
| -rw-r--r-- | include/constants/battle.h | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/battle.h b/include/battle.h index 6dddfd197..5284040f1 100644 --- a/include/battle.h +++ b/include/battle.h @@ -132,14 +132,14 @@ struct ProtectStruct struct SpecialStatus { - u8 statLowered:1; - u8 lightningRodRedirected:1; - u8 restoredBattlerSprite: 1; - u8 intimidatedMon:1; - u8 traced:1; - u8 ppNotAffectedByPressure:1; - u8 flag40:1; - u8 focusBanded:1; + u32 statLowered:1; + u32 lightningRodRedirected:1; + u32 restoredBattlerSprite: 1; + u32 intimidatedMon:1; + u32 traced:1; + u32 ppNotAffectedByPressure:1; + u32 flag40:1; + u32 focusBanded:1; s32 dmg; s32 physicalDmg; s32 specialDmg; @@ -254,7 +254,7 @@ struct BattleResults u16 playerMon2Species; // 0x26 u16 caughtMonSpecies; // 0x28 u8 caughtMonNick[POKEMON_NAME_LENGTH + 1]; // 0x2A - u8 filler35[1]; // 0x35 + u8 filler35; // 0x35 u8 catchAttempts[11]; // 0x36 }; diff --git a/include/constants/battle.h b/include/constants/battle.h index 8b860e384..fa8f422c4 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -186,7 +186,7 @@ #define HITMARKER_x4000000 (1 << 26) #define HITMARKER_CHARGING (1 << 27) #define HITMARKER_FAINTED(battler) (gBitTable[battler] << 28) -#define HITMARKER_FAINTED2(battler) (1 << (28 + battler)) +#define HITMARKER_FAINTED2(battler) ((1 << 28) << battler) // Per-side statuses that affect an entire party #define SIDE_STATUS_REFLECT (1 << 0) |