diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_ai_script_commands.c | 3 | ||||
| -rw-r--r-- | src/battle_transition.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index e66fdb2af..f98922c28 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -270,9 +270,8 @@ void BattleAI_HandleItemUseBeforeAISetup(void) data[i] = 0; // Items are allowed to use in ONLY trainer battles. - // TODO: Use proper flags if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) - && (gTrainerBattleOpponent_A != 0x400) + && (gTrainerBattleOpponent_A != SECRET_BASE_OPPONENT) && !(gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_SAFARI | BATTLE_TYPE_LINK)) ) { diff --git a/src/battle_transition.c b/src/battle_transition.c index aa68ed278..463a3d930 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -15,6 +15,7 @@ #include "field_camera.h" #include "trainer_pokemon_sprites.h" #include "scanline_effect.h" +#include "event_object_movement.h" #include "constants/songs.h" typedef bool8 (*TransitionStateFunc)(struct Task *task); @@ -45,9 +46,6 @@ struct TransitionData static EWRAM_DATA struct TransitionData *sTransitionStructPtr = NULL; -// TODO: Move this declaration to include/event_object_movement.h -extern const struct OamData gObjectEventBaseOam_32x32; - static bool8 BT_Phase1_FadeOut(struct Task *task); static bool8 BT_Phase1_FadeIn(struct Task *task); static bool8 BT_Phase2BlackDoodles_Init(struct Task *task); |