diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/battle.h | 70 | ||||
-rw-r--r-- | include/battle_util.h | 6 | ||||
-rw-r--r-- | include/global.tv.h | 4 |
3 files changed, 40 insertions, 40 deletions
diff --git a/include/battle.h b/include/battle.h index 73caed16f..0ed09caad 100644 --- a/include/battle.h +++ b/include/battle.h @@ -128,36 +128,36 @@ struct UnknownFlags struct DisableStruct { - u32 transformedMonPersonality; - u16 disabledMove; - u16 encoredMove; - u8 protectUses; - u8 stockpileCounter; - u8 substituteHP; - u8 disableTimer:4; - u8 disableTimerStartValue:4; - u8 encoredMovePos; - u8 filler_D; // Unused field. - u8 encoreTimer:4; - u8 encoreTimerStartValue:4; - u8 perishSongTimer:4; - u8 perishSongTimerStartValue:4; - u8 furyCutterCounter; - u8 rolloutTimer:4; - u8 rolloutTimerStartValue:4; - u8 chargeTimer:4; - u8 chargeTimerStartValue:4; - u8 tauntTimer:4; - u8 tauntTimer2:4; - u8 battlerPreventingEscape; - u8 battlerWithSureHit; - u8 isFirstTurn; - u8 unk17; - u8 truantCounter:1; - u8 truantUnknownBit:1; - u8 unk18_a_2:2; - u8 unk18_b:4; - u8 rechargeTimer; + u32 transformedMonPersonality; + u16 disabledMove; + u16 encoredMove; + u8 protectUses; + u8 stockpileCounter; + u8 substituteHP; + u8 disableTimer:4; + u8 disableTimerStartValue:4; + u8 encoredMovePos; + u8 filler_D; // Unused field. + u8 encoreTimer:4; + u8 encoreTimerStartValue:4; + u8 perishSongTimer:4; + u8 perishSongTimerStartValue:4; + u8 furyCutterCounter; + u8 rolloutTimer:4; + u8 rolloutTimerStartValue:4; + u8 chargeTimer:4; + u8 chargeTimerStartValue:4; + u8 tauntTimer:4; + u8 tauntTimer2:4; + u8 battlerPreventingEscape; + u8 battlerWithSureHit; + u8 isFirstTurn; + u8 filler_17; // Unused field. + u8 truantCounter:1; + u8 truantSwitchInHack:1; + u8 filler_18_2:2; // Unused field. + u8 mimickedMoves:4; + u8 rechargeTimer; }; struct ProtectStruct @@ -181,7 +181,7 @@ struct ProtectStruct u32 flag2Unknown:1; u32 flinchImmobility:1; u32 notFirstStrike:1; - u32 flag_x10:1; + u32 palaceAbleToUseMove:1; u32 physicalDmg; u32 specialDmg; u8 physicalBattlerId; @@ -300,8 +300,8 @@ struct BattleResults u8 playerFaintCounter; // 0x0 u8 opponentFaintCounter; // 0x1 u8 playerSwitchesCounter; // 0x2 - u8 unk3; // 0x3 - u8 unk4; // 0x4 + u8 numHealingItemsUsed; // 0x3 + u8 numRevivesUsed; // 0x4 u8 playerMonWasDamaged:1; // 0x5 u8 usedMasterBall:1; // 0x5 u8 caughtMonBall:4; // 0x5 @@ -441,8 +441,8 @@ struct BattleStruct u8 safariPkblThrowCounter; u8 safariEscapeFactor; u8 safariCatchFactor; - u8 field_7D; // unknown spriteId - u8 field_7E; // unknown spriteId + u8 linkBattleVsSpriteId_V; // The letter "V" + u8 linkBattleVsSpriteId_S; // The letter "S" u8 formToChangeInto; u8 chosenMovePositions[MAX_BATTLERS_COUNT]; u8 stateIdAfterSelScript[MAX_BATTLERS_COUNT]; diff --git a/include/battle_util.h b/include/battle_util.h index b3fff196e..71bb22a00 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -42,9 +42,9 @@ #define WEATHER_HAS_EFFECT2 ((!ABILITY_ON_FIELD2(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD2(ABILITY_AIR_LOCK))) u8 GetBattlerForBattleScript(u8 caseId); -void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move); -void PressurePPLoseOnUsingPerishSong(u8 bankAtk); -void PressurePPLoseOnUsingImprision(u8 bankAtk); +void PressurePPLose(u8 target, u8 attacker, u16 move); +void PressurePPLoseOnUsingPerishSong(u8 attacker); +void PressurePPLoseOnUsingImprision(u8 attacker); void MarkAllBattlersForControllerExec(void); // unused void MarkBattlerForControllerExec(u8 battlerId); void sub_803F850(u8 arg0); diff --git a/include/global.tv.h b/include/global.tv.h index 61f014984..aa151a75c 100644 --- a/include/global.tv.h +++ b/include/global.tv.h @@ -521,13 +521,13 @@ struct GabbyAndTyData /*2bad*/ u8 battleNum; /*2bae*/ u8 battleTookMoreThanOneTurn:1; /*2bae*/ u8 playerLostAMon:1; - /*2bae*/ u8 playerUsedAnItem:1; + /*2bae*/ u8 playerUsedHealingItem:1; /*2bae*/ u8 playerThrewABall:1; /*2bae*/ u8 onAir:1; /*2bae*/ u8 valA_5:3; /*2baf*/ u8 battleTookMoreThanOneTurn2:1; /*2baf*/ u8 playerLostAMon2:1; - /*2baf*/ u8 playerUsedAnItem2:1; + /*2baf*/ u8 playerUsedHealingItem2:1; /*2baf*/ u8 playerThrewABall2:1; /*2baf*/ u8 valB_4:4; }; |