merge

1 files changed, 12 insertions, 12 deletions

diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c
index 1cacb8857..53d32d03a 100644
--- a/src/battle/battle_transition.c
+++ b/src/battle/battle_transition.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle_transition.h"
 #include "main.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "task.h"
 #include "palette.h"
 #include "trig.h"
@@ -530,13 +530,13 @@ static const u16 sMugshotsTilemap[] = INCBIN_U16("graphics/battle_transitions/el
 
 // actual code starts here
 
-void sub_811AABC(u8 transitionID)
+void BattleTransition_StartOnField(u8 transitionID)
 {
-    gMain.callback2 = sub_8054398;
+    gMain.callback2 = CB2_OverworldBasic;
     LaunchBattleTransitionTask(transitionID);
 }
 
-void sub_811AAD8(u8 transitionID)
+void BattleTransition_Start(u8 transitionID)
 {
     LaunchBattleTransitionTask(transitionID);
 }
@@ -994,10 +994,10 @@ static bool8 Phase2_Transition_PokeballsTrail_Func2(struct Task* task)
     rand = Random() & 1;
     for (i = 0; i <= 4; i++, rand ^= 1)
     {
-        gUnknown_0202FF84[0] = arr0[rand];      // x
-        gUnknown_0202FF84[1] = (i * 32) + 16;   // y
-        gUnknown_0202FF84[2] = rand;
-        gUnknown_0202FF84[3] = arr1[i];
+        gFieldEffectArguments[0] = arr0[rand];      // x
+        gFieldEffectArguments[1] = (i * 32) + 16;   // y
+        gFieldEffectArguments[2] = rand;
+        gFieldEffectArguments[3] = arr1[i];
         FieldEffectStart(FLDEFF_POKEBALL);
     }
 
@@ -1017,14 +1017,14 @@ static bool8 Phase2_Transition_PokeballsTrail_Func3(struct Task* task)
 
 bool8 FldEff_Pokeball(void)
 {
-    u8 spriteID = CreateSpriteAtEnd(&sSpriteTemplate_83FD98C, gUnknown_0202FF84[0], gUnknown_0202FF84[1], 0);
+    u8 spriteID = CreateSpriteAtEnd(&sSpriteTemplate_83FD98C, gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
     gSprites[spriteID].oam.priority = 0;
     gSprites[spriteID].oam.affineMode = 1;
-    gSprites[spriteID].data0 = gUnknown_0202FF84[2];
-    gSprites[spriteID].data1 = gUnknown_0202FF84[3];
+    gSprites[spriteID].data0 = gFieldEffectArguments[2];
+    gSprites[spriteID].data1 = gFieldEffectArguments[3];
     gSprites[spriteID].data2 = -1;
     InitSpriteAffineAnim(&gSprites[spriteID]);
-    StartSpriteAffineAnim(&gSprites[spriteID], gUnknown_0202FF84[2]);
+    StartSpriteAffineAnim(&gSprites[spriteID], gFieldEffectArguments[2]);
     return FALSE;
 }