Merge branch 'master' into pokedex_2

src/diploma.c

@@ -35,7 +35,7 @@ static void DiplomaBgInit(void);
 static void DiplomaPrintText(void);
 static u8 DiplomaLoadGfx(void);
 static void DiplomaVblankHandler(void);
-static void CB2_DiplomaInit(void);
+static void CB2_Diploma(void);
 static void Task_WaitForExit(u8);
 static void Task_DiplomaInit(u8);
 static void Task_DiplomaReturnToOverworld(u8);
@@ -101,10 +101,10 @@ void CB2_ShowDiploma(void)
     gDiploma->callbackStep = 0;
     DiplomaBgInit();
     CreateTask(Task_DiplomaInit, 0);
-    SetMainCallback2(CB2_DiplomaInit);
+    SetMainCallback2(CB2_Diploma);
 }
 
-static void CB2_DiplomaInit(void)
+static void CB2_Diploma(void)
 {
     RunTasks();
     AnimateSprites();
@@ -134,7 +134,7 @@ static void Task_DiplomaInit(u8 taskId)
     case 4:
         if (HasAllMons())
         {
-            SetGpuReg(REG_OFFSET_BG1HOFS, 0x80 << 1);
+            SetGpuReg(REG_OFFSET_BG1HOFS, 0x100);
         }
         else
         {

src/pokemon.c

@@ -1621,7 +1621,7 @@ const u16 gLinkPlayerFacilityClasses[] =
     FACILITY_CLASS_BEAUTY_2, FACILITY_CLASS_AQUA_LEADER,
 };
 
-const static struct OamData sOakSpeechNidoranFDummyOamData = 
+static const struct OamData sOakSpeechNidoranFDummyOamData = 
 {
     .y = 0,
     .affineMode = 0,
@@ -1637,7 +1637,7 @@ const static struct OamData sOakSpeechNidoranFDummyOamData =
     .paletteNum = 0,
 };
 
-const struct SpriteTemplate sOakSpeechNidoranFDummyTemplate = 
+static const struct SpriteTemplate sOakSpeechNidoranFDummyTemplate = 
 {
     .tileTag = SPRITE_INVALID_TAG,
     .paletteTag = SPRITE_INVALID_TAG,

src/teachy_tv.c

@@ -1208,11 +1208,11 @@ static void TeachyTvPreBattleAnimAndSetBattleCallback(u8 taskId)
     switch (data[7])
     {
     case 0:
-        sub_80D08B8(data[6]);
+        BT_StartOnField(data[6]);
         ++data[7];
         break;
     case 1:
-        if (sub_80D08F8())
+        if (BT_IsDone())
         {
             SetMainCallback2(sub_800FD9C);
             DestroyTask(taskId);

src/trainer_tower.c

@@ -1111,7 +1111,7 @@ void sub_815E114(void)
 
 void sub_815E124(u8 taskId)
 {
-    if (sub_80D08F8() == TRUE)
+    if (BT_IsDone() == TRUE)
     {
         gMain.savedCallback = sub_815E114;
         CleanupOverworldWindowsAndTilemaps();
@@ -1129,7 +1129,7 @@ void sub_815E160(void)
     sub_815E9FC();
     CreateTask(sub_815E124, 1);
     PlayMapChosenOrBattleBGM(0);
-    sub_80D08B8(sub_8080060());
+    BT_StartOnField(sub_8080060());
 }
 
 void sub_815E1C0(void)

src/vs_seeker.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "task.h"
 #include "malloc.h"
@@ -22,7 +23,6 @@
 #include "map_obj_8097404.h"
 #include "unk_810c3a4.h"
 #include "constants/movement_commands.h"
-#include "constants/songs.h"
 #include "vs_seeker.h"
 
 typedef enum