battle_controller_pokedude remaining stuff

src/battle_setup.c

@@ -13,7 +13,6 @@
 #include "strings.h"
 #include "string_util.h"
 #include "event_data.h"
-#include "unk_8159F40.h"
 #include "map_obj_80688E4.h"
 #include "metatile_behavior.h"
 #include "event_scripts.h"
@@ -28,6 +27,7 @@
 #include "battle.h"
 #include "battle_setup.h"
 #include "battle_transition.h"
+#include "battle_controllers.h"
 #include "constants/battle_setup.h"
 #include "constants/flags.h"
 #include "constants/items.h"

src/quest_log.c

@@ -31,10 +31,10 @@
 #include "wild_encounter.h"
 #include "help_system.h"
 #include "party_menu.h"
-#include "unk_8159F40.h"
 #include "pokemon_storage_system.h"
 #include "save.h"
 #include "link.h"
+#include "quest_log_815A008.h"
 #include "quest_log_8150454.h"
 #include "quest_log.h"
 #include "new_menu_helpers.h"

src/quest_log_815A008.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "battle.h"
 #include "event_data.h"
 #include "quest_log.h"
 #include "fieldmap.h"
@@ -7,59 +6,6 @@
 #include "metatile_behavior.h"
 #include "link.h"
 #include "link_rfu.h"
-#include "constants/species.h"
-#include "constants/moves.h"
-#include "constants/pokemon.h"
-
-// Don't forget to delete these move the function to battle_controller_pokedude.c
-// and headers
-// currently I need these for building
-struct PokedudeBattlePartyInfo
-{
-    u8 side;
-    u8 level;
-    u16 species;
-    u16 moves[4];
-    u8 nature;
-    u8 gender;
-};
-extern const struct PokedudeBattlePartyInfo *const sPokedudeBattlePartyPointers[];
-void InitPokedudePartyAndOpponent(void)
-{
-    s32 i, j;
-    struct Pokemon * mon;
-    s32 myIdx = 0;
-    s32 opIdx = 0;
-    const struct PokedudeBattlePartyInfo * data;
-
-    gBattleTypeFlags = BATTLE_TYPE_POKEDUDE;
-    ZeroPlayerPartyMons();
-    ZeroEnemyPartyMons();
-    data = sPokedudeBattlePartyPointers[gSpecialVar_0x8004];
-
-    i = 0;
-    do
-    {
-        if (data[i].side == 0)
-        {
-            mon = &gPlayerParty[myIdx];
-            myIdx++;
-        }
-        else
-        {
-            mon = &gEnemyParty[opIdx];
-            opIdx++;
-        }
-        CreateMonWithGenderNatureLetter(mon, data[i].species, data[i].level, 0, data[i].gender, data[i].nature, 0);
-        for (j = 0; j < 4; j++)
-        {
-            SetMonMoveSlot(mon, data[i].moves[j], j);
-        }
-        i++;
-    } while (data[i].side != 0xFF);
-}
-
-// file boundary?
 
 void sub_815A008(struct QuestLog * questLog)
 {

src/teachy_tv.c

@@ -25,11 +25,11 @@
 #include "battle_transition.h"
 #include "battle_main.h"
 #include "battle.h"
+#include "battle_controllers.h"
 #include "global.fieldmap.h"
 #include "teachy_tv.h"
 #include "help_system.h"
 #include "overworld.h"
-#include "unk_8159F40.h"
 #include "graphics.h"
 #include "fieldmap.h"
 #include "strings.h"