clean up

src/battle_ai_script_commands.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "battle.h"
-#include "battle_main.h"
+#include "battle_anim.h"
 #include "util.h"
 #include "item.h"
 #include "random.h"

src/battle_main.c

@@ -1107,7 +1107,7 @@ static void CB2_PreInitMultiBattle(void)
     s32 i;
     u8 playerMultiplierId;
     u8 r4 = 0xF;
-    u16 *savedBattleTypeFlags; // ???
+    u16 *savedBattleTypeFlags;
     void (**savedCallback)(void);
 
     playerMultiplierId = GetMultiplayerId();

src/battle_setup.c

@@ -850,7 +850,7 @@ u16 sub_80803D8(void)
     return gUnknown_20386CC;
 }
 
-u16 GetTrainerFlag(void)
+u16 ScrSpecial_HasTrainerBeenFought(void)
 {
     return FlagGet(GetTrainerAFlag());
 }
@@ -993,7 +993,7 @@ void ScrSpecial_ShowTrainerNonBattlingSpeech(void)
     ShowFieldMessage(GetTrainerCantBattleSpeech());
 }
 
-void SetUpTrainerEncounterMusic(void)
+void PlayTrainerEncounterMusic(void)
 {
     u16 music;
 
@@ -1003,19 +1003,19 @@ void SetUpTrainerEncounterMusic(void)
     {
         switch (GetTrainerEncounterMusicId(gTrainerBattleOpponent_A))
         {
-        case 1: // TODO: replace these with enums
-        case 2:
-        case 9:
+        case TRAINER_ENCOUNTER_MUSIC_FEMALE:
+        case TRAINER_ENCOUNTER_MUSIC_GIRL:
+        case TRAINER_ENCOUNTER_MUSIC_TWINS:
             music = MUS_SHOUJO;
             break;
-        case 0:
-        case 4:
-        case 5:
-        case 8:
-        case 10:
-        case 11:
-        case 12:
-        case 13:
+        case TRAINER_ENCOUNTER_MUSIC_MALE:
+        case TRAINER_ENCOUNTER_MUSIC_INTENSE:
+        case TRAINER_ENCOUNTER_MUSIC_COOL:
+        case TRAINER_ENCOUNTER_MUSIC_SWIMMER:
+        case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR:
+        case TRAINER_ENCOUNTER_MUSIC_HIKER:
+        case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER:
+        case TRAINER_ENCOUNTER_MUSIC_RICH:
             music = MUS_SHOUNEN;
             break;
         default:

src/battle_transition.c

@@ -3175,7 +3175,7 @@ static bool8 BT_Phase2WhiteFadeInStripes_Stop(struct Task *task)
     DmaStop(0);
     SetVBlankCallback(NULL);
     SetHBlankCallback(NULL);
-    sTransitionStructPtr->win0H = 240;
+    sTransitionStructPtr->win0H = WIN_RANGE(0, 240);
     sTransitionStructPtr->bldY = 0;
     sTransitionStructPtr->bldCnt = BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN;
     sTransitionStructPtr->winIn = WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WININ_WIN0_CLR;

src/battle_util2.c

@@ -1,6 +1,7 @@
 #include "global.h"
 #include "bg.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "pokemon.h"
 #include "malloc.h"
 #include "trainer_tower.h"

src/pokemon.c

@@ -8,7 +8,7 @@
 #include "data.h"
 #include "string_util.h"
 #include "battle.h"
-#include "battle_main.h"
+#include "battle_anim.h"
 #include "item.h"
 #include "event_data.h"
 #include "util.h"

src/quest_log_battle.c

@@ -2,6 +2,7 @@
 #include "constants/species.h"
 #include "malloc.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "link.h"
 #include "overworld.h"
 #include "quest_log.h"
@@ -22,7 +23,7 @@ struct QuestLogStruct_WildBattleRecord
     u8 v4;
 };
 
-void sub_812C334(s32 *, s32 *);
+static void sub_812C334(s32 *, s32 *);
 
 void sub_812BFDC(void)
 {
@@ -38,18 +39,18 @@ void sub_812BFDC(void)
         {
             switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
             {
-                case 0x54:
-                    questLogMessageType = 30;
-                    break;
-                case 0x5a:
-                    questLogMessageType = 33;
-                    break;
-                case 0x57:
-                    questLogMessageType = 32;
-                    break;
-                default:
-                    questLogMessageType = 34;
-                    break;
+            case 0x54:
+                questLogMessageType = 30;
+                break;
+            case 0x5a:
+                questLogMessageType = 33;
+                break;
+            case 0x57:
+                questLogMessageType = 32;
+                break;
+            default:
+                questLogMessageType = 34;
+                break;
             }
             questLogTrainerBattleRecord->v0 = gTrainerBattleOpponent_A;
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -149,7 +150,7 @@ void sub_812C224(void)
     }
 }
 
-void sub_812C334(s32 * a0, s32 * a1)
+static void sub_812C334(s32 * a0, s32 * a1)
 {
     s32 r5;
     s32 _optimized_out = 0;