1 files changed, 19 insertions, 7 deletions
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index 068c9a145..45745cc5a 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "battle_anim_81258BC.h"
 #include "battle.h"
+#include "battle_interface.h"
 #include "battle_message.h"
 #include "data2.h"
 #include "link.h"
@@ -25,7 +26,7 @@ extern const u8 BattleText_MenuOptionsSafari[];
 extern void *gBattleBankFunc[];
 extern u8 gBattleBufferA[][0x200];
 extern bool8 gDoingBattleAnim;
-extern u8 gObjectBankIDs[];
+extern u8 gBankSpriteIds[];
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern u16 gBattleTypeFlags;
 extern u32 gBattleExecBuffer;
@@ -270,11 +271,22 @@ void bx_battle_menu_t6_2(void)
             sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
         }
     }
+#if DEBUG
+    else if (gMain.newKeys & R_BUTTON)
+    {
+        if (!ewram17810[gActiveBank].unk0_5)
+            move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, 4, 0);
+    }
+    else if (gMain.newKeys & START_BUTTON)
+    {
+        sub_804454C();
+    }
+#endif
 }
 
 void sub_812B65C(void)
 {
-    if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
         SafariBufferExecCompleted();
 }
 
@@ -385,15 +397,15 @@ void SafariHandleTrainerThrow(void)
 {
     LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
     GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
-    gObjectBankIDs[gActiveBank] = CreateSprite(
+    gBankSpriteIds[gActiveBank] = CreateSprite(
       &gUnknown_02024E8C,
       80,
       (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
       30);
-    gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240;
-    gSprites[gObjectBankIDs[gActiveBank]].data[0] = -2;
-    gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
+    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80313A0;
     gBattleBankFunc[gActiveBank] = sub_812B65C;
 }