diff options
| -rw-r--r-- | include/battle.h | 96 | ||||
| -rw-r--r-- | src/battle_2.c | 2 | ||||
| -rw-r--r-- | src/battle_ai.c | 188 |
3 files changed, 143 insertions, 143 deletions
diff --git a/include/battle.h b/include/battle.h index 05016b8c3..006e4e6fe 100644 --- a/include/battle.h +++ b/include/battle.h @@ -58,7 +58,7 @@ #define STATUS3_UNDERGROUND 0x80 #define STATUS3_MINIMIZED 0x100 #define STATUS3_CHARGED_UP 0x200 -#define STATUS3_ROOTED 0x400 +#define STATUS3_ROOTED 0x400 #define STATUS3_GRUDGE 0x4000 #define STATUS3_CANT_SCORE_A_CRIT 0x8000 #define STATUS3_MUDSPORT 0x10000 @@ -77,7 +77,7 @@ #define HITMARKER_IGNORE_ON_AIR 0x0010000 #define HITMARKER_IGNORE_UNDERGROUND 0x0020000 #define HITMARKER_IGNORE_UNDERWATER 0x0040000 -#define HITMARKER_x80000 0x0080000 +#define HITMARKER_x80000 0x0080000 #define HITMARKER_x100000 0x0100000 #define HITMARKER_x400000 0x0400000 #define HITMARKER_x800000 0x0800000 @@ -164,16 +164,16 @@ struct BattleStruct /* 0x2000000 */ u8 filler0[0x15DDE]; /*0x15DDE*/ u8 unk15DDE; /*0x15DDF*/ u8 unk15DDF; - /*0x15DE0*/ u8 filler15DE0[0x222]; - /*0x16002*/ u8 AnimTurn; - /*0x16003*/ u8 ScriptingActive; - /*0x16004*/ u8 WrappedMove1[4]; - /*0x16008*/ u8 WrappedMove2[4]; - /*0x1600C*/ u8 cmd49StateTracker; - /*0x1600D*/ u8 unk1600D; - /*0x1600E*/ u8 unk1600E; - /*0x1600F*/ u8 atk23StateTracker; - /*0x16010*/ u8 unk16010; + /*0x15DE0*/ u8 filler15DE0[0x222]; + /*0x16002*/ u8 AnimTurn; + /*0x16003*/ u8 ScriptingActive; + /*0x16004*/ u8 WrappedMove1[4]; + /*0x16008*/ u8 WrappedMove2[4]; + /*0x1600C*/ u8 cmd49StateTracker; + /*0x1600D*/ u8 unk1600D; + /*0x1600E*/ u8 unk1600E; + /*0x1600F*/ u8 atk23StateTracker; + /*0x16010*/ u8 unk16010; /*0x16011*/ u8 unk16011; /*0x16012*/ u8 unk16012; /*0x16013*/ u8 unk16013; @@ -185,10 +185,10 @@ struct BattleStruct /* 0x2000000 */ /*0x16019*/ u8 unk16019; /*0x1601A*/ u8 unk1601A; /*0x1601B*/ u8 wildVictorySong; - /*0x1601C*/ u8 DynamicMoveType; - /*0x1601D*/ u8 unk1601D; - /*0x1601E*/ u8 statChanger; - /*0x1601F*/ u8 DmgMultiplier; + /*0x1601C*/ u8 DynamicMoveType; + /*0x1601D*/ u8 unk1601D; + /*0x1601E*/ u8 statChanger; + /*0x1601F*/ u8 DmgMultiplier; /*0x16020*/ u8 WrappedBy[4]; /*0x16024*/ u8 unk16024; /*0x16025*/ u8 unk16025; @@ -323,7 +323,7 @@ struct BattleStruct /* 0x2000000 */ /*0x160AD*/ u8 unk160AD; /*0x160AE*/ u8 unk160AE; /*0x160AF*/ u8 unk160AF; - /*0x160B0*/ u8 unk160B0; + /*0x160B0*/ u8 unk160B0; /*0x160B1*/ u8 unk160B1; /*0x160B2*/ u8 unk160B2; /*0x160B3*/ u8 unk160B3; @@ -339,7 +339,7 @@ struct BattleStruct /* 0x2000000 */ /*0x160BD*/ u8 unk160BD; /*0x160BE*/ u8 unk160BE; /*0x160BF*/ u8 unk160BF; - /*0x160C0*/ u8 unk160C0; + /*0x160C0*/ u8 unk160C0; /*0x160C1*/ u8 unk160C1; /*0x160C2*/ u8 unk160C2; /*0x160C3*/ u8 unk160C3; @@ -381,25 +381,25 @@ struct DisableStruct struct BattleResults { - u8 PlayerFaintCounter; //0x0 - u8 OpponentFaintCounter; //0x1 - u8 unk2; //0x2 - u8 unk3; //0x3 - u8 unk4; //0x4 - u8 unk5_0:1; //0x5 - u8 unk5_1:1; //0x5 - u16 Poke1Species; //0x6 - u8 PokeString1[10]; //0x8 + u8 PlayerFaintCounter; // 0x0 + u8 OpponentFaintCounter; // 0x1 + u8 unk2; // 0x2 + u8 unk3; // 0x3 + u8 unk4; // 0x4 + u8 unk5_0:1; // 0x5 + u8 unk5_1:1; // 0x5 + u16 Poke1Species; // 0x6 + u8 PokeString1[10]; // 0x8 u8 unk12; - u8 BattleTurnCounter; //0x13 - u8 PokeString2[10]; //0x14 + u8 BattleTurnCounter; // 0x13 + u8 PokeString2[10]; // 0x14 u8 filler1E[2]; - u16 LastOpponentSpecies; //0x20 - u16 LastUsedMove; //0x22 - u16 OpponentMove; //0x24 - u16 OpponentSpecies; //0x26 - u16 CaughtPoke; //0x28 - u8 CaughtNick[10]; //0x2A + u16 LastOpponentSpecies; // 0x20 + u16 LastUsedMove; // 0x22 + u16 OpponentMove; // 0x24 + u16 OpponentSpecies; // 0x26 + u16 CaughtPoke; // 0x28 + u8 CaughtNick[10]; // 0x2A u8 filler34[2]; u8 unk36[10]; }; @@ -446,7 +446,7 @@ struct Struct2017840 struct ProtectStruct { - /*field0*/ + /*field0*/ u32 Protected:1; u32 Endured:1; u32 OnlyStruggle:1; @@ -455,7 +455,7 @@ struct ProtectStruct u32 StealMove:1; u32 Flag0Unknown:1; u32 PrlzImmobility:1; - /*field1*/ + /*field1*/ u32 ConfusionSelfDmg:1; u32 NotEffective:1; u32 ChargingTurn:1; @@ -463,24 +463,24 @@ struct ProtectStruct u32 UsedImprisionedMove:1; u32 LoveImmobility:1; u32 UsedDisabledMove:1; - /*field2*/ + /*field2*/ u32 UsedTauntedMove:1; u32 Flag2Unknown:1; u32 FlinchImmobility:1; u32 NotFirstStrike:1; - u32 Free : 4; - /*field3*/ - u32 field3 : 8; - u32 PhysicalDmg; - u32 SpecialDmg; - u8 PhysicalBank; - u8 SpecialBank; - u16 fieldE; + u32 Free : 4; + /*field3*/ + u32 field3 : 8; + u32 PhysicalDmg; + u32 SpecialDmg; + u8 PhysicalBank; + u8 SpecialBank; + u16 fieldE; }; struct SpecialStatus { - u8 statLowered : 1; + u8 statLowered : 1; u8 lightningRodRedirected : 1; u8 restoredBankSprite: 1; u8 intimidatedPoke : 1; @@ -495,7 +495,7 @@ struct SpecialStatus u8 moveturnPhysicalBank; u8 moveturnSpecialBank; u8 field12; - u8 field13; + u8 field13; }; struct sideTimer diff --git a/src/battle_2.c b/src/battle_2.c index 64df97f00..d08f2b8df 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -1654,7 +1654,7 @@ void sub_8010874(void) ewram160C9 = 6; ewram16113 = 0; for (i = 0; i < 11; i++) - gBattleResults.unk36[i] = 0; + gBattleResults.unk36[i] = 0; gBattleResults.BattleTurnCounter = 0; gBattleResults.PlayerFaintCounter = 0; gBattleResults.OpponentFaintCounter = 0; diff --git a/src/battle_ai.c b/src/battle_ai.c index b31df7ba0..9f95d23f3 100644 --- a/src/battle_ai.c +++ b/src/battle_ai.c @@ -139,100 +139,100 @@ typedef void (*BattleAICmdFunc)(void); static const BattleAICmdFunc sBattleAICmdTable[] = { - BattleAICmd_if_random_less_than, //0x0 - BattleAICmd_if_random_greater_than, //0x1 - BattleAICmd_if_random_equal, //0x2 - BattleAICmd_if_random_not_equal, //0x3 - BattleAICmd_score, //0x4 - BattleAICmd_if_hp_less_than, //0x5 - BattleAICmd_if_hp_more_than, //0x6 - BattleAICmd_if_hp_equal, //0x7 - BattleAICmd_if_hp_not_equal, //0x8 - BattleAICmd_if_status, //0x9 - BattleAICmd_if_not_status, //0xA - BattleAICmd_if_status2, //0xB - BattleAICmd_if_not_status2, //0xC - BattleAICmd_if_status3, //0xD - BattleAICmd_if_not_status3, //0xE - BattleAICmd_if_status4, //0xF - BattleAICmd_if_not_status4, //0x10 - BattleAICmd_if_less_than, //0x11 - BattleAICmd_if_more_than, //0x12 - BattleAICmd_if_equal, //0x13 - BattleAICmd_if_not_equal, //0x14 - BattleAICmd_if_less_than_32, //0x15 - BattleAICmd_if_more_than_32, //0x16 - BattleAICmd_if_equal_32, //0x17 - BattleAICmd_if_not_equal_32, //0x18 - BattleAICmd_if_move, //0x19 - BattleAICmd_if_not_move, //0x1A - BattleAICmd_if_in_bytes, //0x1B - BattleAICmd_if_not_in_bytes, //0x1C - BattleAICmd_if_in_words, //0x1D - BattleAICmd_if_not_in_words, //0x1E - BattleAICmd_if_user_can_damage, //0x1F - BattleAICmd_if_user_cant_damage, //0x20 - BattleAICmd_get_turn_count, //0x21 - BattleAICmd_get_type, //0x22 - BattleAICmd_get_move_power, //0x23 - BattleAICmd_is_most_powerful_move, //0x24 - BattleAICmd_get_move, //0x25 - BattleAICmd_if_arg_equal, //0x26 - BattleAICmd_if_arg_not_equal, //0x27 - BattleAICmd_if_would_go_first, //0x28 - BattleAICmd_if_would_not_go_first, //0x29 - BattleAICmd_nullsub_2A, //0x2A - BattleAICmd_nullsub_2B, //0x2B - BattleAICmd_count_alive_pokemon, //0x2C - BattleAICmd_get_considered_move, //0x2D - BattleAICmd_get_considered_move_effect, //0x2E - BattleAICmd_get_ability, //0x2F - BattleAICmd_get_highest_possible_damage, //0x30 - BattleAICmd_if_damage_bonus, //0x31 - BattleAICmd_nullsub_32, //0x32 - BattleAICmd_nullsub_33, //0x33 - BattleAICmd_if_status_in_party, //0x34 - BattleAICmd_if_status_not_in_party, //0x35 - BattleAICmd_get_weather, //0x36 - BattleAICmd_if_effect, //0x37 - BattleAICmd_if_not_effect, //0x38 - BattleAICmd_if_stat_level_less_than, //0x39 - BattleAICmd_if_stat_level_more_than, //0x3A - BattleAICmd_if_stat_level_equal, //0x3B - BattleAICmd_if_stat_level_not_equal, //0x3C - BattleAICmd_if_can_faint, //0x3D - BattleAICmd_if_cant_faint, //0x3E - BattleAICmd_if_has_move, //0x3F - BattleAICmd_if_dont_have_move, //0x40 - BattleAICmd_if_move_effect, //0x41 - BattleAICmd_if_not_move_effect, //0x42 - BattleAICmd_if_last_move_did_damage, //0x43 - BattleAICmd_if_encored, //0x44 - BattleAICmd_flee, //0x45 - BattleAICmd_if_random_100, //0x46 - BattleAICmd_watch, //0x47 - BattleAICmd_get_hold_effect, //0x48 - BattleAICmd_get_gender, //0x49 - BattleAICmd_is_first_turn, //0x4A - BattleAICmd_get_stockpile_count, //0x4B - BattleAICmd_is_double_battle, //0x4C - BattleAICmd_get_used_item, //0x4D - BattleAICmd_get_move_type_from_result, - BattleAICmd_get_move_power_from_result, - BattleAICmd_get_move_effect_from_result, - BattleAICmd_get_protect_count, - BattleAICmd_nullsub_52, - BattleAICmd_nullsub_53, - BattleAICmd_nullsub_54, - BattleAICmd_nullsub_55, - BattleAICmd_nullsub_56, - BattleAICmd_nullsub_57, - BattleAICmd_call, - BattleAICmd_jump, - BattleAICmd_end, - BattleAICmd_if_level_compare, - BattleAICmd_if_taunted, - BattleAICmd_if_not_taunted, + BattleAICmd_if_random_less_than, // 0x0 + BattleAICmd_if_random_greater_than, // 0x1 + BattleAICmd_if_random_equal, // 0x2 + BattleAICmd_if_random_not_equal, // 0x3 + BattleAICmd_score, // 0x4 + BattleAICmd_if_hp_less_than, // 0x5 + BattleAICmd_if_hp_more_than, // 0x6 + BattleAICmd_if_hp_equal, // 0x7 + BattleAICmd_if_hp_not_equal, // 0x8 + BattleAICmd_if_status, // 0x9 + BattleAICmd_if_not_status, // 0xA + BattleAICmd_if_status2, // 0xB + BattleAICmd_if_not_status2, // 0xC + BattleAICmd_if_status3, // 0xD + BattleAICmd_if_not_status3, // 0xE + BattleAICmd_if_status4, // 0xF + BattleAICmd_if_not_status4, // 0x10 + BattleAICmd_if_less_than, // 0x11 + BattleAICmd_if_more_than, // 0x12 + BattleAICmd_if_equal, // 0x13 + BattleAICmd_if_not_equal, // 0x14 + BattleAICmd_if_less_than_32, // 0x15 + BattleAICmd_if_more_than_32, // 0x16 + BattleAICmd_if_equal_32, // 0x17 + BattleAICmd_if_not_equal_32, // 0x18 + BattleAICmd_if_move, // 0x19 + BattleAICmd_if_not_move, // 0x1A + BattleAICmd_if_in_bytes, // 0x1B + BattleAICmd_if_not_in_bytes, // 0x1C + BattleAICmd_if_in_words, // 0x1D + BattleAICmd_if_not_in_words, // 0x1E + BattleAICmd_if_user_can_damage, // 0x1F + BattleAICmd_if_user_cant_damage, // 0x20 + BattleAICmd_get_turn_count, // 0x21 + BattleAICmd_get_type, // 0x22 + BattleAICmd_get_move_power, // 0x23 + BattleAICmd_is_most_powerful_move, // 0x24 + BattleAICmd_get_move, // 0x25 + BattleAICmd_if_arg_equal, // 0x26 + BattleAICmd_if_arg_not_equal, // 0x27 + BattleAICmd_if_would_go_first, // 0x28 + BattleAICmd_if_would_not_go_first, // 0x29 + BattleAICmd_nullsub_2A, // 0x2A + BattleAICmd_nullsub_2B, // 0x2B + BattleAICmd_count_alive_pokemon, // 0x2C + BattleAICmd_get_considered_move, // 0x2D + BattleAICmd_get_considered_move_effect, // 0x2E + BattleAICmd_get_ability, // 0x2F + BattleAICmd_get_highest_possible_damage, // 0x30 + BattleAICmd_if_damage_bonus, // 0x31 + BattleAICmd_nullsub_32, // 0x32 + BattleAICmd_nullsub_33, // 0x33 + BattleAICmd_if_status_in_party, // 0x34 + BattleAICmd_if_status_not_in_party, // 0x35 + BattleAICmd_get_weather, // 0x36 + BattleAICmd_if_effect, // 0x37 + BattleAICmd_if_not_effect, // 0x38 + BattleAICmd_if_stat_level_less_than, // 0x39 + BattleAICmd_if_stat_level_more_than, // 0x3A + BattleAICmd_if_stat_level_equal, // 0x3B + BattleAICmd_if_stat_level_not_equal, // 0x3C + BattleAICmd_if_can_faint, // 0x3D + BattleAICmd_if_cant_faint, // 0x3E + BattleAICmd_if_has_move, // 0x3F + BattleAICmd_if_dont_have_move, // 0x40 + BattleAICmd_if_move_effect, // 0x41 + BattleAICmd_if_not_move_effect, // 0x42 + BattleAICmd_if_last_move_did_damage, // 0x43 + BattleAICmd_if_encored, // 0x44 + BattleAICmd_flee, // 0x45 + BattleAICmd_if_random_100, // 0x46 + BattleAICmd_watch, // 0x47 + BattleAICmd_get_hold_effect, // 0x48 + BattleAICmd_get_gender, // 0x49 + BattleAICmd_is_first_turn, // 0x4A + BattleAICmd_get_stockpile_count, // 0x4B + BattleAICmd_is_double_battle, // 0x4C + BattleAICmd_get_used_item, // 0x4D + BattleAICmd_get_move_type_from_result, // 0x4E + BattleAICmd_get_move_power_from_result, // 0x4F + BattleAICmd_get_move_effect_from_result, // 0x50 + BattleAICmd_get_protect_count, // 0x51 + BattleAICmd_nullsub_52, // 0x52 + BattleAICmd_nullsub_53, // 0x53 + BattleAICmd_nullsub_54, // 0x54 + BattleAICmd_nullsub_55, // 0x55 + BattleAICmd_nullsub_56, // 0x56 + BattleAICmd_nullsub_57, // 0x57 + BattleAICmd_call, // 0x58 + BattleAICmd_jump, // 0x59 + BattleAICmd_end, // 0x5A + BattleAICmd_if_level_compare, // 0x5B + BattleAICmd_if_taunted, // 0x5C + BattleAICmd_if_not_taunted, // 0x5D }; #ifdef NONMATCHING |