1 files changed, 539 insertions, 3 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index e84969b4f..e05578c31 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -2,8 +2,16 @@
 #include "battle_anim_81258BC.h"
 #include "battle.h"
 #include "battle_message.h"
+#include "data2.h"
+#include "link.h"
+#include "main.h"
 #include "menu_cursor.h"
+#include "palette.h"
+#include "rom3.h"
+#include "songs.h"
+#include "sound.h"
 #include "text.h"
+#include "util.h"
 
 extern struct Window gUnknown_03004210;
 extern u8 gDisplayedStringBattle[];
@@ -16,6 +24,32 @@ extern const u8 gUnknown_08400D15[];
 extern void *gBattleBankFunc[];
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
+extern u8 gBattleBufferA[][0x200];
+extern bool8 gDoingBattleAnim;
+extern u8 gObjectBankIDs[];
+extern struct SpriteTemplate gUnknown_02024E8C;
+extern u16 gBattleTypeFlags;
+extern u32 gBattleExecBuffer;
+extern u16 gScriptItemId;
+extern MainCallback gPreBattleCallback1;
+extern u8 gBankInMenu;
+extern u8 gHealthboxIDs[];
+extern u16 gBattlePartyID[];
+extern u16 gUnknown_02024DE8;
+extern u8 gBattleOutcome;
+
+extern u8 GetBankSide(u8);
+extern u8 GetBankByPlayerAI(u8);
+extern u8 GetBankIdentity(u8);
+extern void LoadPlayerTrainerBankSprite();
+extern u8 sub_8079E90();
+extern void sub_80313A0(struct Sprite *);
+extern void sub_810BADC(void);
+extern void sub_8045A5C();
+extern void sub_80E43C0();
+extern void sub_804777C();
+extern void sub_8043DFC();
+extern bool8 move_anim_start_t3();
 
 #if ENGLISH
 #define SUB_812BB10_TILE_DATA_OFFSET 440
@@ -146,7 +180,292 @@ const BattleBufferCmd gSafariBufferCommands[] =
 };
 // code
 
-void SafariHandlecmd18(void) {
+void SafariBufferExecCompleted(void);
+void bx_wait_t6(void);
+void sub_812B65C(void);
+void SafariBufferRunCommand(void);
+void sub_812B758(void);
+
+void unref_sub_812B464(void)
+{
+}
+
+void SetBankFuncToSafariBufferRunCommand(void)
+{
+    gBattleBankFunc[gActiveBank] = SafariBufferRunCommand;
+}
+
+void SafariBufferRunCommand(void)
+{
+    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    {
+        if (gBattleBufferA[gActiveBank][0] < 0x39)
+            gSafariBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        else
+            SafariBufferExecCompleted();
+    }
+}
+
+void bx_battle_menu_t6_2(void)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        DestroyMenuCursor();
+
+        // Useless switch statement.
+        switch (gActionSelectionCursor[gActiveBank])
+        {
+        case 0:
+            Emitcmd33(1, 5, 0);
+            break;
+        case 1:
+            Emitcmd33(1, 6, 0);
+            break;
+        case 2:
+            Emitcmd33(1, 7, 0);
+            break;
+        case 3:
+            Emitcmd33(1, 8, 0);
+            break;
+        }
+        SafariBufferExecCompleted();
+    }
+    else if (gMain.newKeys & DPAD_LEFT)
+    {
+        if (gActionSelectionCursor[gActiveBank] & 1)
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 1;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+    else if (gMain.newKeys & DPAD_RIGHT)
+    {
+        if (!(gActionSelectionCursor[gActiveBank] & 1))
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 1;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+    else if (gMain.newKeys & DPAD_UP)
+    {
+        if (gActionSelectionCursor[gActiveBank] & 2)
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 2;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        if (!(gActionSelectionCursor[gActiveBank] & 2))
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 2;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+}
+
+void sub_812B65C(void)
+{
+    if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+        SafariBufferExecCompleted();
+}
+
+void sub_812B694(void)
+{
+    if (gUnknown_03004210.state == 0)
+        SafariBufferExecCompleted();
+}
+
+void sub_812B6AC(void)
+{
+    if (!gPaletteFade.active)
+    {
+        gMain.inBattle = FALSE;
+        gMain.callback1 = gPreBattleCallback1;
+        SetMainCallback2(gMain.savedCallback);
+    }
+}
+
+void bx_wait_t6(void)
+{
+    if (!gDoingBattleAnim || !ewram17810[gActiveBank].unk0_6)
+        SafariBufferExecCompleted();
+}
+
+void sub_812B724(void)
+{
+    if (!gPaletteFade.active)
+    {
+        gBattleBankFunc[gActiveBank] = sub_812B758;
+        sub_810BADC();
+    }
+}
+
+void sub_812B758(void)
+{
+    if (gMain.callback2 == sub_800F808 && !gPaletteFade.active)
+    {
+        Emitcmd35(1, gScriptItemId);
+        SafariBufferExecCompleted();
+    }
+}
+
+void sub_812B794(void)
+{
+    if (!ewram17810[gActiveBank].unk0_5)
+        SafariBufferExecCompleted();
+}
+
+void SafariBufferExecCompleted(void)
+{
+    gBattleBankFunc[gActiveBank] = SafariBufferRunCommand;
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        u8 playerId = GetMultiplayerId();
+
+        PrepareBufferDataTransferLink(2, 4, &playerId);
+        gBattleBufferA[gActiveBank][0] = 0x38;
+    }
+    else
+    {
+        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+    }
+}
+
+void unref_sub_812B838(void)
+{
+    if (!ewram17810[gActiveBank].unk0_4)
+        SafariBufferExecCompleted();
+}
+
+void SafariHandleGetAttributes(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd1(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleSetAttributes(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd3(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleLoadPokeSprite(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleSendOutPoke(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleReturnPokeToBall(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleTrainerThrow(void)
+{
+    LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
+    GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
+    gObjectBankIDs[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]].data0 = -2;
+    gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBank] = sub_812B65C;
+}
+
+void SafariHandleTrainerSlide(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleTrainerSlideBack(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd10(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd11(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd12(void)
+{
+    ewram17840.unk8 = 4;
+    gDoingBattleAnim = 1;
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4);
+    gBattleBankFunc[gActiveBank] = bx_wait_t6;
+}
+
+void SafariHandleBallThrow(void)
+{
+    u8 var = gBattleBufferA[gActiveBank][1];
+
+    ewram17840.unk8 = var;
+    gDoingBattleAnim = 1;
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4);
+    gBattleBankFunc[gActiveBank] = bx_wait_t6;
+}
+
+// TODO: spell Pause correctly
+void SafariHandlePuase(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleMoveAnimation(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlePrintString(void)
+{
+    gUnknown_030042A4 = 0;
+    gUnknown_030042A0 = 0;
+    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
+    sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+    gBattleBankFunc[gActiveBank] = sub_812B694;
+}
+
+void SafariHandlePrintStringPlayerOnly(void)
+{
+    if (GetBankSide(gActiveBank) == 0)
+        SafariHandlePrintString();
+    else
+        SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd18(void)
+{
     int i;
 
     gUnknown_030042A4 = 0;
@@ -161,9 +480,7 @@ void SafariHandlecmd18(void) {
     sub_814A5C0(0, 0xFFFF, 12, 11679, 0);
 
     for (i = 0; i < 4; i++)
-    {
         nullsub_8(i);
-    }
 
     sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
     StrCpyDecodeToDisplayedStringBattle((u8 *) gUnknown_08400CBB);
@@ -171,3 +488,222 @@ void SafariHandlecmd18(void) {
     InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_812BB10_TILE_DATA_OFFSET, 2, 35);
     sub_8002F44(&gUnknown_03004210);
 }
+
+void SafariHandlecmd19(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd20(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleOpenBag(void)
+{
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+    gBattleBankFunc[gActiveBank] = sub_812B724;
+    gBankInMenu = gActiveBank;
+}
+
+void SafariHandlecmd22(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd23(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleHealthBarUpdate(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleExpBarUpdate(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleStatusIconUpdate(void)
+{
+    sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 11);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleStatusAnimation(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleStatusXor(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd29(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleDMATransfer(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd31(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd32(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd33(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd34(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd35(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd36(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd37(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd38(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd39(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd40(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleHitAnimation(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd42(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleEffectivenessSound(void)
+{
+    s8 pan;
+
+    if (GetBankSide(gActiveBank) == 0)
+        pan = -64;
+    else
+        pan = 63;
+    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd44(void)
+{
+    PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleFaintingCry(void)
+{
+    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+
+    PlayCry1(species, 25);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleIntroSlide(void)
+{
+    sub_80E43C0(gBattleBufferA[gActiveBank][1]);
+    gUnknown_02024DE8 |= 1;
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleTrainerBallThrow(void)
+{
+    sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 10);
+    sub_804777C(gActiveBank);
+    sub_8043DFC(gHealthboxIDs[gActiveBank]);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd48(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd49(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd50(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleSpriteInvisibility(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleBattleAnimation(void)
+{
+    u8 r3 = gBattleBufferA[gActiveBank][1];
+    u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+
+    if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, r3, r4) != 0)
+        SafariBufferExecCompleted();
+    else
+        gBattleBankFunc[gActiveBank] = sub_812B794;
+}
+
+void SafariHandleLinkStandbyMsg(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleResetActionMoveSelection(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd55(void)
+{
+    gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    FadeOutMapMusic(5);
+    BeginFastPaletteFade(3);
+    SafariBufferExecCompleted();
+    if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_WILD))
+        gBattleBankFunc[gActiveBank] = sub_812B6AC;
+}
+
+void SafariHandlecmd56(void)
+{
+}