diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 12 | ||||
| -rw-r--r-- | include/battle_arena.h | 14 | ||||
| -rw-r--r-- | include/battle_scripts.h | 2 | ||||
| -rw-r--r-- | include/constants/battle_script_commands.h | 7 |
4 files changed, 28 insertions, 7 deletions
diff --git a/include/battle.h b/include/battle.h index 5f925b925..90bef24ac 100644 --- a/include/battle.h +++ b/include/battle.h @@ -498,12 +498,12 @@ struct BattleStruct struct BattleTv tv; u8 notSureWhatFieldLol[0x28]; u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT]; - s8 field_298[2]; - s8 field_29A[2]; - u16 field_29C[2]; - u8 field_2A0; - u8 field_2A1; - u8 field_2A2; + s8 arenaMindPoints[2]; + s8 arenaSkillPoints[2]; + u16 arenaStartHp[2]; + u8 arenaLostPlayerMons; // Bits for party member, lost as in referee's decision, not by fainting. + u8 arenaLostOpponentMons; + u8 alreadyStatusedMoveAttempt; // As bits for battlers; For example when using Thunder Wave on an already paralyzed pokemon. }; #define GET_MOVE_TYPE(move, typeArg) \ diff --git a/include/battle_arena.h b/include/battle_arena.h new file mode 100644 index 000000000..bf305ea4e --- /dev/null +++ b/include/battle_arena.h @@ -0,0 +1,14 @@ +#ifndef GUARD_BATTLE_ARENA_H +#define GUARD_BATTLE_ARENA_H + +void CallBattleArenaFunction(void); +u8 BattleArena_ShowJudgmentWindow(u8 *state); +void BattleArena_InitPoints(void); +void BattleArena_AddMindPoints(u8 battler); +void BattleArena_AddSkillPoints(u8 battler); +void BattleArena_DeductMindPoints(u8 battler, u16 stringId); +void sub_81A586C(u8 battler); +void sub_81A5BF8(void); +void sub_81A5D44(void); + +#endif //GUARD_BATTLE_ARENA_H diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 9c4537363..a23fa6948 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -206,7 +206,7 @@ extern const u8 BattleScript_BerryFocusEnergyEnd2[]; extern const u8 BattleScript_ActionSelectionItemsCantBeUsed[]; extern const u8 BattleScript_ArenaTurnBeginning[]; extern const u8 BattleScript_82DB881[]; -extern const u8 BattleScript_82DB8F3[]; +extern const u8 BattleScript_ArenaDoJudgment[]; extern const u8 BattleScript_82DAA0B[]; extern const u8 BattleScript_AskIfWantsToForfeitMatch[]; extern const u8 BattleScript_PrintPlayerForfeited[]; diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index dc07fda6e..e8a2980a5 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -68,12 +68,19 @@ #define VARIOUS_GET_MOVE_TARGET 3 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6 +#define VARIOUS_ARENA_JUDGMENT_WINDOW 9 +#define VARIOUS_ARENA_OPPONENT_MON_LOST 10 +#define VARIOUS_ARENA_PLAYER_MON_LOST 11 +#define VARIOUS_ARENA_BOTH_MONS_LOST 12 #define VARIOUS_EMIT_YESNOBOX 13 +#define VARIOUS_ARENA_JUDGMENT_STRING 16 +#define VARIOUS_ARENA_WAIT_STRING 17 #define VARIOUS_WAIT_CRY 18 #define VARIOUS_RETURN_OPPONENT_MON1 19 #define VARIOUS_RETURN_OPPONENT_MON2 20 #define VARIOUS_VOLUME_DOWN 21 #define VARIOUS_VOLUME_UP 22 +#define VARIOUS_SET_ALREADY_STATUS_MOVE_ATTEMPT 23 #define VARIOUS_SET_TELEPORT_OUTCOME 25 #define VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC 26 |