diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-11 20:49:56 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-10-12 01:14:17 -0400 |
| commit | b0598b1aef16815272187adf84a999b6f190c8ba (patch) | |
| tree | f553592609a866b428822bf72ebf909533e10296 /include | |
| parent | f23e0beebac9aa983620c024d691690fedc4e784 (diff) | |
Clean up recorded_battle, add MOVE_IS_PERMANENT
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 5 | ||||
| -rw-r--r-- | include/recorded_battle.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h index 5ccff8ce3..f793c779f 100644 --- a/include/battle.h +++ b/include/battle.h @@ -17,6 +17,11 @@ #define GET_BATTLER_SIDE(battler) (GetBattlerPosition(battler) & BIT_SIDE) #define GET_BATTLER_SIDE2(battler) (GET_BATTLER_POSITION(battler) & BIT_SIDE) +// Used to exclude moves learned temporarily by Transform or Mimic +#define MOVE_IS_PERMANENT(battler, moveSlot) \ + (!(gBattleMons[battler].status2 & STATUS2_TRANSFORMED) \ + && !(gDisableStructs[battler].mimickedMoves & gBitTable[moveSlot])) + // Battle Actions // These determine what each battler will do in a turn #define B_ACTION_USE_MOVE 0 diff --git a/include/recorded_battle.h b/include/recorded_battle.h index 8ea392774..9b8939403 100644 --- a/include/recorded_battle.h +++ b/include/recorded_battle.h @@ -8,7 +8,7 @@ extern u8 gRecordedBattleMultiplayerId; #define B_RECORD_MODE_RECORDING 1 #define B_RECORD_MODE_PLAYBACK 2 -void RecordedBattle_Init(u8 arg0); +void RecordedBattle_Init(u8 mode); void RecordedBattle_SetTrainerInfo(void); void RecordedBattle_SetBattlerAction(u8 battlerId, u8 action); void RecordedBattle_ClearBattlerAction(u8 battlerId, u8 bytesToClear); @@ -23,12 +23,12 @@ u8 GetRecordedBattleFronterBrainSymbol(void); void RecordedBattle_SaveParties(void); u8 GetActiveBattlerLinkPlayerGender(void); void RecordedBattle_ClearFrontierPassFlag(void); -void RecordedBattle_SetFrontierPassFlagFromHword(u16 arg0); +void RecordedBattle_SetFrontierPassFlagFromHword(u16 flags); u8 RecordedBattle_GetFrontierPassFlag(void); u8 GetBattleSceneInRecordedBattle(void); u8 GetTextSpeedInRecordedBattle(void); void RecordedBattle_CopyBattlerMoves(void); -void sub_818603C(u8 arg0); +void RecordedBattle_CheckMovesetChanges(u8 mode); u32 GetAiScriptsInRecordedBattle(void); void RecordedBattle_SetPlaybackFinished(void); bool8 RecordedBattle_CanStopPlayback(void); |