Merge pull request #198 from jiangzhengwenjz/clean_up

misc. clean up

include/easy_chat.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_EASYCHAT_H
-#define GUARD_EASYCHAT_H
+#ifndef GUARD_EASY_CHAT_H
+#define GUARD_EASY_CHAT_H
 
 #include "global.h"
 #include "constants/easy_chat.h"
@@ -45,6 +45,6 @@ u16 GetDisplayedWordByIndex(u16 index);
 u16 GetNumDisplayedWords(void);
 const u8 *GetEasyChatWordGroupName(u8);
 u8 *CopyEasyChatWordPadded(u8 *, u16, u16);
-void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback); // TODO: currently in link_rfu.s. further file split needed? 
+void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback);
 
-#endif // GUARD_EASYCHAT_H
+#endif // GUARD_EASY_CHAT_H

include/event_object_movement.h

@@ -104,5 +104,6 @@ void sub_8069058(u8, u8);
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 extern const struct SpritePalette gUnknown_83A5348;
 extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[];
+extern const struct OamData gObjectEventBaseOam_32x32;
 
 #endif // GUARD_EVENT_OBJECT_MOVEMENT_H

include/rom_818CFC8.h

@@ -1,13 +0,0 @@
-//
-// Created by Scott Norton on 9/6/17.
-//
-
-#ifndef GUARD_ROM_818CFC8_H
-#define GUARD_ROM_818CFC8_H
-
-#include "global.h"
-
-bool8 InBattlePyramid(void);
-u8 sub_81AAA40(void);
-
-#endif //GUARD_ROM_818CFC8_H

include/rom_81BE66C.h

@@ -1,14 +0,0 @@
-//
-// Created by Scott Norton on 9/6/17.
-//
-
-#ifndef GUARD_ROM_81BE66C_H
-#define GUARD_ROM_81BE66C_H
-
-#include "global.h"
-
-bool32 InTrainerHill(void);
-bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *);
-u32 sub_81D427C(void);
-
-#endif //GUARD_ROM_81BE66C_H

include/trade.h

@@ -11,7 +11,7 @@ extern u8 gSelectedTradeMonPositions[2];
 extern const u16 gUnknown_826601C[];
 void CB2_ReturnFromLinkTrade(void);
 s32 sub_804FB34(void);
-s32 CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet); // TODO: currently in link_rfu_2.s. further file split needed? 
+s32 CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet);
 s32 GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, struct UnkLinkRfuStruct_02022B14Substruct rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isObedientBitSet);
 
 #endif //GUARD_TRADE_H

ld_script.txt

@@ -227,6 +227,7 @@ SECTIONS {
         src/map_preview_screen.o(.text);
         asm/link_rfu_2.o(.text);
         asm/link_rfu.o(.text);
+        asm/easy_chat_2.o(.text);
         src/pokedex_screen.o(.text);
         asm/pokedex_screen.o(.text);
         src/list_menu.o(.text);

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))
         )
     {

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);