diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_ai_script_commands.c | 3 | ||||
| -rw-r--r-- | src/battle_transition.c | 4 | ||||
| -rw-r--r-- | src/braille_text.c | 1 | ||||
| -rw-r--r-- | src/link.c | 2 | ||||
| -rw-r--r-- | src/pokedex_screen.c | 12 |
5 files changed, 9 insertions, 13 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); diff --git a/src/braille_text.c b/src/braille_text.c index c95cf64b2..4a06cd319 100644 --- a/src/braille_text.c +++ b/src/braille_text.c @@ -6,7 +6,6 @@ extern u8 gGlyphInfo[]; -ALIGNED(4) static const u8 gUnknown_846FB08[] = {1, 2, 4}; static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont"); diff --git a/src/link.c b/src/link.c index dfbc9fcb2..bdaa48cdf 100644 --- a/src/link.c +++ b/src/link.c @@ -163,7 +163,7 @@ static void DoSend(void); static void StopTimer(void); static void SendRecvDone(void); -ALIGNED(4) static const u16 sWirelessLinkDisplayPal[] = INCBIN_U16("graphics/interface/wireless_link_display.gbapal"); +static const u16 sWirelessLinkDisplayPal[] = INCBIN_U16("graphics/interface/wireless_link_display.gbapal"); static const u16 sWirelessLinkDisplay4bpp[] = INCBIN_U16("graphics/interface/wireless_link_display.4bpp.lz"); static const u16 sWirelessLinkDisplayBin[] = INCBIN_U16("graphics/interface/wireless_link_display.bin.lz"); static const u16 sLinkTestFontPal[] = INCBIN_U16("graphics/interface/link_test_font.gbapal"); diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index b67f9a514..ea6df71be 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -115,12 +115,12 @@ void sub_8105594(u8 a0, u8 a1); void sub_8105E1C(u8 a0); void sub_8106014(void); void sub_810603C(void); -bool8 sub_8106838(u8 a0, u8 a1); +bool8 sub_8106838(u8 category, u8 a1); u8 sub_81068A0(u8 a0); -void sub_810699C(u8 a0); +void sub_810699C(u8 category); bool8 sub_8106A20(u16 a0); void sub_81067C0(void); -void sub_81068DC(u8 a0, u8 a1); +void sub_81068DC(u8 category, u8 a1); u8 sub_8106AF8(u16 a0); void sub_8106B34(void); void sub_8106E78(const u8 *a0, s32 a1); @@ -157,7 +157,7 @@ extern const struct WindowTemplate gUnknown_84521C4; extern const struct WindowTemplate gUnknown_84521CC; extern const u16 gUnknown_845228C[]; extern const u8 (*const gUnknown_8452334[])[4]; -extern const u8 *const gUnknown_8452344[]; +extern const u8 *const gDexCategoryNamePtrs[]; extern const u8 gUnknown_8452388[][30]; extern const struct ScrollArrowsTemplate gUnknown_84524B4; extern const struct CursorStruct gUnknown_84524C4; @@ -1855,11 +1855,11 @@ bool8 sub_8104F0C(bool8 a0) FillWindowPixelBuffer(0, PIXEL_FILL(15)); if (a0) { - sub_8106E78(gUnknown_8452344[gUnknown_203ACF0->field_28], 1); + sub_8106E78(gDexCategoryNamePtrs[gUnknown_203ACF0->field_28], 1); } else { - sub_8106E78(gUnknown_8452344[gUnknown_203ACF0->field_28], 0); + sub_8106E78(gDexCategoryNamePtrs[gUnknown_203ACF0->field_28], 0); sub_8104EC0(0, sub_8106AF8(gUnknown_203ACF0->field_2B), sub_8106AF8(gUnknown_203ACF0->field_2A - 1), 160, 2); } CopyWindowToVram(0, 2); |