From 2be2b22589de437ae5f53df8e380533958da9e70 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Fri, 12 Jan 2018 21:24:21 -0600
Subject: decompile battle_intro.s

---
 src/battle/anim/battle_intro.c | 480 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 480 insertions(+)
 create mode 100644 src/battle/anim/battle_intro.c

(limited to 'src/battle/anim/battle_intro.c')

diff --git a/src/battle/anim/battle_intro.c b/src/battle/anim/battle_intro.c
new file mode 100644
index 000000000..46ea292bd
--- /dev/null
+++ b/src/battle/anim/battle_intro.c
@@ -0,0 +1,480 @@
+#include "global.h"
+#include "constants/battle_constants.h"
+#include "battle.h"
+#include "battle_anim.h"
+#include "battle_anim_80CA710.h"
+#include "data2.h"
+#include "ewram.h"
+#include "main.h"
+#include "rom_8077ABC.h"
+#include "scanline_effect.h"
+#include "task.h"
+#include "trig.h"
+
+extern u16 gBattleTypeFlags;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG2_X;
+extern u16 gBattle_BG2_Y;
+extern u16 gBattle_WIN0V;
+extern u16 gUnknown_02024DE8;
+extern u8 gBattleMonForms[];
+
+extern void sub_800FE20(struct Sprite *);
+
+static void task_battle_intro_80BC47C(u8);
+static void task00_battle_intro_80BC6C8(u8);
+static void task_battle_intro_anim(u8);
+static void sub_80E4C34(u8);
+
+static const TaskFunc gUnknown_083DB56C[] =
+{
+    task_battle_intro_80BC47C,
+    task_battle_intro_80BC47C,
+    task00_battle_intro_80BC6C8,
+    task00_battle_intro_80BC6C8,
+    task00_battle_intro_80BC6C8,
+    task_battle_intro_80BC47C,
+    task_battle_intro_80BC47C,
+    task_battle_intro_80BC47C,
+    task_battle_intro_anim,
+    task_battle_intro_anim,
+};
+
+void sub_80E43C0(u8 a)
+{
+    u8 taskId;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        taskId = CreateTask(sub_80E4C34, 0);
+    }
+    else if ((gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) && gGameVersion != VERSION_RUBY)
+    {
+        a = 3;
+        taskId = CreateTask(task00_battle_intro_80BC6C8, 0);
+    }
+    else
+    {
+        taskId = CreateTask(gUnknown_083DB56C[a], 0);
+    }
+
+    gTasks[taskId].data[0] = 0;
+    gTasks[taskId].data[1] = a;
+    gTasks[taskId].data[2] = 0;
+    gTasks[taskId].data[3] = 0;
+    gTasks[taskId].data[4] = 0;
+    gTasks[taskId].data[5] = 0;
+    gTasks[taskId].data[6] = 0;
+}
+
+static void sub_80E443C(u8 taskId)
+{
+    DestroyTask(taskId);
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    gBattle_BG2_X = 0;
+    gBattle_BG2_Y = 0;
+    REG_BLDCNT = 0;
+    REG_BLDALPHA = 0;
+    REG_BLDY = 0;
+    REG_WININ = WIN_RANGE(63, 63);
+    REG_WINOUT = WIN_RANGE(63, 63);
+}
+
+static void task_battle_intro_80BC47C(u8 taskId)
+{
+    s32 i;
+
+    gBattle_BG1_X += 6;
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            gTasks[taskId].data[2] = 16;
+            gTasks[taskId].data[0]++;
+        }
+        else
+        {
+            gTasks[taskId].data[2] = 1;
+            gTasks[taskId].data[0]++;
+        }
+        break;
+    case 1:
+        gTasks[taskId].data[2]--;
+        if (gTasks[taskId].data[2] == 0)
+        {
+            gTasks[taskId].data[0]++;
+            REG_WININ = 0x3F;
+        }
+        break;
+    case 2:
+        gBattle_WIN0V -= 255;
+        if ((gBattle_WIN0V & 0xFF00) == 0x3000)
+        {
+            gTasks[taskId].data[0]++;
+            gTasks[taskId].data[2] = DISPLAY_WIDTH;
+            gTasks[taskId].data[3] = 32;
+            gUnknown_02024DE8 &= ~1;
+        }
+        break;
+    case 3:
+        if (gTasks[taskId].data[3] != 0)
+        {
+            gTasks[taskId].data[3]--;
+        }
+        else if (gTasks[taskId].data[1] == 1)
+        {
+            if (gBattle_BG1_Y != 0xFFB0)
+                gBattle_BG1_Y -= 2;
+        }
+        else
+        {
+            if (gBattle_BG1_Y != 0xFFC8)
+                gBattle_BG1_Y -= 1;
+        }
+
+        if ((gBattle_WIN0V & 0xFF00) != 0)
+            gBattle_WIN0V -= 1020;
+
+        if (gTasks[taskId].data[2] != 0)
+            gTasks[taskId].data[2] -= 2;
+
+        // Set the x offset for the the top half of the screen.
+        for (i = 0; i < DISPLAY_HEIGHT / 2; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
+        // Set the x offset for the bottom half of the screen.
+        for (; i < DISPLAY_HEIGHT; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+
+        if (gTasks[taskId].data[2] == 0)
+        {
+            gScanlineEffect.state = 3;
+            gTasks[taskId].data[0]++;
+            CpuFill32(0, (void *)(VRAM + 0xE000), 0x800);
+            REG_BG1CNT = 0x9C00;
+            REG_BG2CNT = 0x5E00;
+        }
+        break;
+    case 4:
+        sub_80E443C(taskId);
+        break;
+    }
+}
+
+static void task00_battle_intro_80BC6C8(u8 taskId)
+{
+    s32 i;
+
+    switch (gTasks[taskId].data[1])
+    {
+    case 2:
+    case 4:
+        gBattle_BG1_X += 8;
+        break;
+    case 3:
+        gBattle_BG1_X += 6;
+        break;
+    }
+
+    if (gTasks[taskId].data[1] == 4)
+    {
+        gBattle_BG1_Y = Cos2(gTasks[taskId].data[6]) / 512 - 8;
+        if (gTasks[taskId].data[6] < 0xB4)
+            gTasks[taskId].data[6] += 4;
+        else
+            gTasks[taskId].data[6] += 6;
+        if (gTasks[taskId].data[6] == 0x168)
+            gTasks[taskId].data[6] = 0;
+    }
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        gTasks[taskId].data[4] = 16;
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            gTasks[taskId].data[2] = 16;
+            gTasks[taskId].data[0]++;
+        }
+        else
+        {
+            gTasks[taskId].data[2] = 1;
+            gTasks[taskId].data[0]++;
+        }
+        break;
+    case 1:
+        gTasks[taskId].data[2]--;
+        if (gTasks[taskId].data[2] == 0)
+        {
+            gTasks[taskId].data[0]++;
+            REG_WININ = 0x3F;
+        }
+        break;
+    case 2:
+        gBattle_WIN0V -= 255;
+        if ((gBattle_WIN0V & 0xFF00) == 0x3000)
+        {
+            gTasks[taskId].data[0]++;
+            gTasks[taskId].data[2] = 240;
+            gTasks[taskId].data[3] = 32;
+            gTasks[taskId].data[5] = 1;
+            gUnknown_02024DE8 &= ~1;
+        }
+        break;
+    case 3:
+        if (gTasks[taskId].data[3] != 0)
+        {
+            gTasks[taskId].data[3]--;
+            if (gTasks[taskId].data[3] == 0)
+            {
+                REG_BLDCNT = 0x1842;
+                REG_BLDALPHA = 0xF;
+                REG_BLDY = 0;
+            }
+        }
+        else
+        {
+            if ((gTasks[taskId].data[4] & 0x1F) && --gTasks[taskId].data[5] == 0)
+            {
+                gTasks[taskId].data[4] += 255;
+                gTasks[taskId].data[5] = 4;
+            }
+        }
+
+        if ((gBattle_WIN0V & 0xFF00) != 0)
+            gBattle_WIN0V -= 1020;
+
+        if (gTasks[taskId].data[2] != 0)
+            gTasks[taskId].data[2] -= 2;
+
+        // Set the x offset for the the top half of the screen.
+        for (i = 0; i < DISPLAY_HEIGHT / 2; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
+        // Set the x offset for the bottom half of the screen.
+        for (; i < DISPLAY_HEIGHT; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+
+        if (gTasks[taskId].data[2] == 0)
+        {
+            gScanlineEffect.state = 3;
+            gTasks[taskId].data[0]++;
+            CpuFill32(0, (void *)(VRAM + 0xE000), 0x800);
+            REG_BG1CNT = 0x9C00;
+            REG_BG2CNT = 0x5E00;
+        }
+        break;
+    case 4:
+        sub_80E443C(taskId);
+        break;
+    }
+
+    if (gTasks[taskId].data[0] != 4)
+        REG_BLDALPHA = gTasks[taskId].data[4];
+}
+
+static void task_battle_intro_anim(u8 taskId)
+{
+    s32 i;
+
+    gBattle_BG1_X += 8;
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        REG_BLDCNT = 0x1842;
+        REG_BLDALPHA = 0x0808;
+        REG_BLDY = 0;
+        gTasks[taskId].data[4] = 0x0808;
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            gTasks[taskId].data[2] = 16;
+            gTasks[taskId].data[0]++;
+        }
+        else
+        {
+            gTasks[taskId].data[2] = 1;
+            gTasks[taskId].data[0]++;
+        }
+        break;
+    case 1:
+        gTasks[taskId].data[2]--;
+        if (gTasks[taskId].data[2] == 0)
+        {
+            gTasks[taskId].data[0]++;
+            REG_WININ = 0x3F;
+        }
+        break;
+    case 2:
+        gBattle_WIN0V -= 255;
+        if ((gBattle_WIN0V & 0xFF00) == 0x3000)
+        {
+            gTasks[taskId].data[0]++;
+            gTasks[taskId].data[2] = 240;
+            gTasks[taskId].data[3] = 32;
+            gTasks[taskId].data[5] = 1;
+            gUnknown_02024DE8 &= ~1;
+        }
+        break;
+    case 3:
+       if (gTasks[taskId].data[3] != 0)
+        {
+            gTasks[taskId].data[3]--;
+        }
+        else if ((gTasks[taskId].data[4] & 0xF) && --gTasks[taskId].data[5] == 0)
+        {
+            gTasks[taskId].data[4] += 255;
+            gTasks[taskId].data[5] = 6;
+        }
+
+        if ((gBattle_WIN0V & 0xFF00) != 0)
+            gBattle_WIN0V -= 1020;
+
+        if (gTasks[taskId].data[2] != 0)
+            gTasks[taskId].data[2] -= 2;
+
+        // Set the x offset for the the top half of the screen.
+        for (i = 0; i < DISPLAY_HEIGHT / 2; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
+        // Set the x offset for the bottom half of the screen.
+        for (; i < DISPLAY_HEIGHT; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+
+        if (gTasks[taskId].data[2] == 0)
+        {
+            gScanlineEffect.state = 3;
+            gTasks[taskId].data[0]++;
+            CpuFill32(0, (void *)(VRAM + 0xE000), 0x800);
+            REG_BG1CNT = 0x9C00;
+            REG_BG2CNT = 0x5E00;
+        }
+        break;
+    case 4:
+        sub_80E443C(taskId);
+        break;
+    }
+
+    if (gTasks[taskId].data[0] != 4)
+        REG_BLDALPHA = gTasks[taskId].data[4];
+}
+
+static void sub_80E4C34(u8 taskId)
+{
+    s32 i;
+
+    if (gTasks[taskId].data[0] > 1 && gTasks[taskId].data[4] == 0)
+    {
+        if ((gBattle_BG1_X & 0x8000) || gBattle_BG1_X < 80)  // hmm...
+        {
+            gBattle_BG1_X += 3;
+            gBattle_BG2_X -= 3;
+        }
+        else
+        {
+            CpuFill32(0, (void *)(VRAM + 0xE000), 0x800);
+            CpuFill32(0, (void *)(VRAM + 0xF000), 0x800);
+            gTasks[taskId].data[4] = 1;
+        }
+    }
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        gTasks[taskId].data[2] = 16;
+        gTasks[taskId].data[0]++;
+        break;
+    case 1:
+        gTasks[taskId].data[2]--;
+        if (gTasks[taskId].data[2] == 0)
+        {
+            gTasks[taskId].data[0]++;
+            gSprites[ewram1608A].oam.objMode = 2;
+            gSprites[ewram1608A].callback = sub_800FE20;
+            gSprites[ewram1608B].oam.objMode = 2;
+            gSprites[ewram1608B].callback = sub_800FE20;
+            REG_WININ = 0x3F;
+            REG_WINOUT = 0x3F06;
+        }
+        break;
+    case 2:
+        gBattle_WIN0V -= 255;
+        if ((gBattle_WIN0V & 0xFF00) == 0x3000)
+        {
+            gTasks[taskId].data[0]++;
+            gTasks[taskId].data[2] = 240;
+            gTasks[taskId].data[3] = 32;
+            gUnknown_02024DE8 &= ~1;
+        }
+        break;
+    case 3:
+        if ((gBattle_WIN0V & 0xFF00) != 0)
+            gBattle_WIN0V -= 1020;
+
+        if (gTasks[taskId].data[2] != 0)
+            gTasks[taskId].data[2] -= 2;
+
+        // Set the x offset for the the top half of the screen.
+        for (i = 0; i < DISPLAY_HEIGHT / 2; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
+        // Set the x offset for the bottom half of the screen.
+        for (; i < DISPLAY_HEIGHT; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+
+        if (gTasks[taskId].data[2] == 0)
+        {
+            gScanlineEffect.state = 3;
+            gTasks[taskId].data[0]++;
+            REG_BG1CNT = 0x9C00;
+            REG_BG2CNT = 0x5E00;
+        }
+        break;
+    case 4:
+        sub_80E443C(taskId);
+        break;
+    }
+}
+
+void unref_sub_80E4EC8(u8 a, u8 b, u8 c, u8 d)
+{
+    sub_80E4EF8(a, b, c, d, 0x4000, 30, 1);
+}
+
+// draws some 8x8 tilemap
+void sub_80E4EF8(u8 left, u8 top, u8 c, u8 paletteNum, u16 e, u8 bgMap, u8 g)
+{
+    u32 tileNum;
+    s32 x;
+    s32 y;
+    u8 bank = GetBankByIdentity(c);
+
+    DmaCopy16(3, gUnknown_081FAF4C[c] + gBattleMonForms[bank] * 0x800, (void *)(VRAM + e), 0x800);
+    tileNum = e / 32 - g * 512;
+    for (y = top; y < top + 8; y++)
+    {
+        for (x = left; x < left + 8; x++)
+        {
+            *(u16 *)(VRAM + x * 2 + bgMap * 0x800 + y * 64) = tileNum | (paletteNum << 12);
+            tileNum++;
+        }
+    }
+}
+
+void unref_sub_80E4FDC(u8 left, u8 top, u8 c, u8 form, u8 paletteNum, u16 f, u8 bgMap, u8 h)
+{
+    u32 tileNum;
+    s32 x;
+    s32 y;
+
+    DmaCopy16(3, gUnknown_081FAF4C[c] + form * 0x800, (void *)(VRAM + f), 0x800);
+    tileNum = f / 32 - h * 512;
+    for (y = top; y < top + 8; y++)
+    {
+        for (x = left; x < left + 8; x++)
+        {
+            *(u16 *)(VRAM + x * 2 + bgMap * 0x800 + y * 64) = tileNum | (paletteNum << 12);
+            tileNum++;
+        }
+    }
+}
-- 
cgit v1.2.3


From 2e8f0cd4b33a7a3ea92b2b42742d78d98959d1e5 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sat, 13 Jan 2018 16:00:39 -0600
Subject: label battle_intro.c

---
 src/battle/anim/battle_intro.c | 281 ++++++++++++++++++++++-------------------
 1 file changed, 150 insertions(+), 131 deletions(-)

(limited to 'src/battle/anim/battle_intro.c')

diff --git a/src/battle/anim/battle_intro.c b/src/battle/anim/battle_intro.c
index 46ea292bd..01f823fa7 100644
--- a/src/battle/anim/battle_intro.c
+++ b/src/battle/anim/battle_intro.c
@@ -22,53 +22,57 @@ extern u8 gBattleMonForms[];
 
 extern void sub_800FE20(struct Sprite *);
 
-static void task_battle_intro_80BC47C(u8);
-static void task00_battle_intro_80BC6C8(u8);
-static void task_battle_intro_anim(u8);
-static void sub_80E4C34(u8);
+static void BattleIntroTask_ScrollScenery(u8);
+static void BattleIntroTask_FadeScenery(u8);
+static void BattleIntroTask_ScrollAndFadeScenery(u8);
+static void BattleIntroTask_80E4C34(u8);
 
-static const TaskFunc gUnknown_083DB56C[] =
+static const TaskFunc sBattleIntroTaskFuncs[] =
 {
-    task_battle_intro_80BC47C,
-    task_battle_intro_80BC47C,
-    task00_battle_intro_80BC6C8,
-    task00_battle_intro_80BC6C8,
-    task00_battle_intro_80BC6C8,
-    task_battle_intro_80BC47C,
-    task_battle_intro_80BC47C,
-    task_battle_intro_80BC47C,
-    task_battle_intro_anim,
-    task_battle_intro_anim,
+    BattleIntroTask_ScrollScenery,
+    BattleIntroTask_ScrollScenery,
+    BattleIntroTask_FadeScenery,
+    BattleIntroTask_FadeScenery,
+    BattleIntroTask_FadeScenery,
+    BattleIntroTask_ScrollScenery,
+    BattleIntroTask_ScrollScenery,
+    BattleIntroTask_ScrollScenery,
+    BattleIntroTask_ScrollAndFadeScenery,
+    BattleIntroTask_ScrollAndFadeScenery,
 };
 
-void sub_80E43C0(u8 a)
+#define tState data[0]
+#define tBgXOffset data[2]
+#define tFramesUntilBg1Slide data[3]
+
+void StartBattleIntroAnim(u8 a)
 {
     u8 taskId;
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
-        taskId = CreateTask(sub_80E4C34, 0);
+        taskId = CreateTask(BattleIntroTask_80E4C34, 0);
     }
     else if ((gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) && gGameVersion != VERSION_RUBY)
     {
         a = 3;
-        taskId = CreateTask(task00_battle_intro_80BC6C8, 0);
+        taskId = CreateTask(BattleIntroTask_FadeScenery, 0);
     }
     else
     {
-        taskId = CreateTask(gUnknown_083DB56C[a], 0);
+        taskId = CreateTask(sBattleIntroTaskFuncs[a], 0);
     }
 
-    gTasks[taskId].data[0] = 0;
+    gTasks[taskId].tState = 0;
     gTasks[taskId].data[1] = a;
-    gTasks[taskId].data[2] = 0;
-    gTasks[taskId].data[3] = 0;
+    gTasks[taskId].tBgXOffset = 0;
+    gTasks[taskId].tFramesUntilBg1Slide = 0;
     gTasks[taskId].data[4] = 0;
     gTasks[taskId].data[5] = 0;
     gTasks[taskId].data[6] = 0;
 }
 
-static void sub_80E443C(u8 taskId)
+static void EndBattleIntroTask(u8 taskId)
 {
     DestroyTask(taskId);
     gBattle_BG1_X = 0;
@@ -78,93 +82,98 @@ static void sub_80E443C(u8 taskId)
     REG_BLDCNT = 0;
     REG_BLDALPHA = 0;
     REG_BLDY = 0;
-    REG_WININ = WIN_RANGE(63, 63);
-    REG_WINOUT = WIN_RANGE(63, 63);
+    REG_WININ = 0x3F3F;
+    REG_WINOUT = 0x3F3F;
 }
 
-static void task_battle_intro_80BC47C(u8 taskId)
+static void BattleIntroTask_ScrollScenery(u8 taskId)
 {
     s32 i;
 
     gBattle_BG1_X += 6;
 
-    switch (gTasks[taskId].data[0])
+    switch (gTasks[taskId].tState)
     {
     case 0:
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         {
-            gTasks[taskId].data[2] = 16;
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tBgXOffset = 16;
+            gTasks[taskId].tState++;
         }
         else
         {
-            gTasks[taskId].data[2] = 1;
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tBgXOffset = 1;
+            gTasks[taskId].tState++;
         }
         break;
     case 1:
-        gTasks[taskId].data[2]--;
-        if (gTasks[taskId].data[2] == 0)
+        gTasks[taskId].tBgXOffset--;
+        if (gTasks[taskId].tBgXOffset == 0)
         {
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tState++;
             REG_WININ = 0x3F;
         }
         break;
     case 2:
-        gBattle_WIN0V -= 255;
+        // Open up the window
+        gBattle_WIN0V -= WIN_RANGE(1, 0);  // decrement min Y
+        gBattle_WIN0V += WIN_RANGE(0, 1);  // increment max Y
         if ((gBattle_WIN0V & 0xFF00) == 0x3000)
         {
-            gTasks[taskId].data[0]++;
-            gTasks[taskId].data[2] = DISPLAY_WIDTH;
-            gTasks[taskId].data[3] = 32;
+            gTasks[taskId].tState++;
+            gTasks[taskId].tBgXOffset = DISPLAY_WIDTH;
+            gTasks[taskId].tFramesUntilBg1Slide = 32;
             gUnknown_02024DE8 &= ~1;
         }
         break;
     case 3:
-        if (gTasks[taskId].data[3] != 0)
-        {
-            gTasks[taskId].data[3]--;
-        }
-        else if (gTasks[taskId].data[1] == 1)
+        if (gTasks[taskId].tFramesUntilBg1Slide != 0)
         {
-            if (gBattle_BG1_Y != 0xFFB0)
-                gBattle_BG1_Y -= 2;
+            gTasks[taskId].tFramesUntilBg1Slide--;
         }
         else
         {
-            if (gBattle_BG1_Y != 0xFFC8)
-                gBattle_BG1_Y -= 1;
+            if (gTasks[taskId].data[1] == 1)
+            {
+                if (gBattle_BG1_Y != 0xFFB0)
+                    gBattle_BG1_Y -= 2;
+            }
+            else
+            {
+                if (gBattle_BG1_Y != 0xFFC8)
+                    gBattle_BG1_Y -= 1;
+            }
         }
 
         if ((gBattle_WIN0V & 0xFF00) != 0)
             gBattle_WIN0V -= 1020;
 
-        if (gTasks[taskId].data[2] != 0)
-            gTasks[taskId].data[2] -= 2;
+        if (gTasks[taskId].tBgXOffset != 0)
+            gTasks[taskId].tBgXOffset -= 2;
 
-        // Set the x offset for the the top half of the screen.
+        // Slide in the top half of the BG from the left
         for (i = 0; i < DISPLAY_HEIGHT / 2; i++)
-            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
-        // Set the x offset for the bottom half of the screen.
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].tBgXOffset;
+        // Slide in the bottom half of the BG from the right
         for (; i < DISPLAY_HEIGHT; i++)
-            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].tBgXOffset;
 
-        if (gTasks[taskId].data[2] == 0)
+        if (gTasks[taskId].tBgXOffset == 0)
         {
             gScanlineEffect.state = 3;
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tState++;
             CpuFill32(0, (void *)(VRAM + 0xE000), 0x800);
             REG_BG1CNT = 0x9C00;
             REG_BG2CNT = 0x5E00;
         }
         break;
     case 4:
-        sub_80E443C(taskId);
+        EndBattleIntroTask(taskId);
         break;
     }
 }
 
-static void task00_battle_intro_80BC6C8(u8 taskId)
+static void BattleIntroTask_FadeScenery(u8 taskId)
 {
     s32 i;
 
@@ -190,45 +199,47 @@ static void task00_battle_intro_80BC6C8(u8 taskId)
             gTasks[taskId].data[6] = 0;
     }
 
-    switch (gTasks[taskId].data[0])
+    switch (gTasks[taskId].tState)
     {
     case 0:
         gTasks[taskId].data[4] = 16;
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         {
-            gTasks[taskId].data[2] = 16;
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tBgXOffset = 16;
+            gTasks[taskId].tState++;
         }
         else
         {
-            gTasks[taskId].data[2] = 1;
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tBgXOffset = 1;
+            gTasks[taskId].tState++;
         }
         break;
     case 1:
-        gTasks[taskId].data[2]--;
-        if (gTasks[taskId].data[2] == 0)
+        gTasks[taskId].tBgXOffset--;
+        if (gTasks[taskId].tBgXOffset == 0)
         {
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tState++;
             REG_WININ = 0x3F;
         }
         break;
     case 2:
-        gBattle_WIN0V -= 255;
+        // Open up window
+        gBattle_WIN0V -= WIN_RANGE(1, 0);  // decrement min Y
+        gBattle_WIN0V += WIN_RANGE(0, 1);  // increment max Y
         if ((gBattle_WIN0V & 0xFF00) == 0x3000)
         {
-            gTasks[taskId].data[0]++;
-            gTasks[taskId].data[2] = 240;
-            gTasks[taskId].data[3] = 32;
+            gTasks[taskId].tState++;
+            gTasks[taskId].tBgXOffset = DISPLAY_WIDTH;
+            gTasks[taskId].tFramesUntilBg1Slide = 32;
             gTasks[taskId].data[5] = 1;
             gUnknown_02024DE8 &= ~1;
         }
         break;
     case 3:
-        if (gTasks[taskId].data[3] != 0)
+        if (gTasks[taskId].tFramesUntilBg1Slide != 0)
         {
-            gTasks[taskId].data[3]--;
-            if (gTasks[taskId].data[3] == 0)
+            gTasks[taskId].tFramesUntilBg1Slide--;
+            if (gTasks[taskId].tFramesUntilBg1Slide == 0)
             {
                 REG_BLDCNT = 0x1842;
                 REG_BLDALPHA = 0xF;
@@ -247,41 +258,41 @@ static void task00_battle_intro_80BC6C8(u8 taskId)
         if ((gBattle_WIN0V & 0xFF00) != 0)
             gBattle_WIN0V -= 1020;
 
-        if (gTasks[taskId].data[2] != 0)
-            gTasks[taskId].data[2] -= 2;
+        if (gTasks[taskId].tBgXOffset != 0)
+            gTasks[taskId].tBgXOffset -= 2;
 
-        // Set the x offset for the the top half of the screen.
+        // Slide in the top half of the BG from the left
         for (i = 0; i < DISPLAY_HEIGHT / 2; i++)
-            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
-        // Set the x offset for the bottom half of the screen.
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].tBgXOffset;
+        // Slide in the bottom half of the BG from the right
         for (; i < DISPLAY_HEIGHT; i++)
-            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].tBgXOffset;
 
-        if (gTasks[taskId].data[2] == 0)
+        if (gTasks[taskId].tBgXOffset == 0)
         {
             gScanlineEffect.state = 3;
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tState++;
             CpuFill32(0, (void *)(VRAM + 0xE000), 0x800);
             REG_BG1CNT = 0x9C00;
             REG_BG2CNT = 0x5E00;
         }
         break;
     case 4:
-        sub_80E443C(taskId);
+        EndBattleIntroTask(taskId);
         break;
     }
 
-    if (gTasks[taskId].data[0] != 4)
+    if (gTasks[taskId].tState != 4)
         REG_BLDALPHA = gTasks[taskId].data[4];
 }
 
-static void task_battle_intro_anim(u8 taskId)
+static void BattleIntroTask_ScrollAndFadeScenery(u8 taskId)
 {
     s32 i;
 
     gBattle_BG1_X += 8;
 
-    switch (gTasks[taskId].data[0])
+    switch (gTasks[taskId].tState)
     {
     case 0:
         REG_BLDCNT = 0x1842;
@@ -290,81 +301,87 @@ static void task_battle_intro_anim(u8 taskId)
         gTasks[taskId].data[4] = 0x0808;
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         {
-            gTasks[taskId].data[2] = 16;
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tBgXOffset = 16;
+            gTasks[taskId].tState++;
         }
         else
         {
-            gTasks[taskId].data[2] = 1;
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tBgXOffset = 1;
+            gTasks[taskId].tState++;
         }
         break;
     case 1:
-        gTasks[taskId].data[2]--;
-        if (gTasks[taskId].data[2] == 0)
+        gTasks[taskId].tBgXOffset--;
+        if (gTasks[taskId].tBgXOffset == 0)
         {
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tState++;
             REG_WININ = 0x3F;
         }
         break;
     case 2:
-        gBattle_WIN0V -= 255;
+        // Open up window
+        gBattle_WIN0V -= WIN_RANGE(1, 0);  // decrement min Y
+        gBattle_WIN0V += WIN_RANGE(0, 1);  // increment max Y
         if ((gBattle_WIN0V & 0xFF00) == 0x3000)
         {
-            gTasks[taskId].data[0]++;
-            gTasks[taskId].data[2] = 240;
-            gTasks[taskId].data[3] = 32;
+            gTasks[taskId].tState++;
+            gTasks[taskId].tBgXOffset = DISPLAY_WIDTH;
+            gTasks[taskId].tFramesUntilBg1Slide = 32;
             gTasks[taskId].data[5] = 1;
             gUnknown_02024DE8 &= ~1;
         }
         break;
     case 3:
-       if (gTasks[taskId].data[3] != 0)
+        if (gTasks[taskId].tFramesUntilBg1Slide != 0)
         {
-            gTasks[taskId].data[3]--;
+            gTasks[taskId].tFramesUntilBg1Slide--;
         }
-        else if ((gTasks[taskId].data[4] & 0xF) && --gTasks[taskId].data[5] == 0)
+        else
         {
-            gTasks[taskId].data[4] += 255;
-            gTasks[taskId].data[5] = 6;
+            if ((gTasks[taskId].data[4] & 0xF) && --gTasks[taskId].data[5] == 0)
+            {
+                gTasks[taskId].data[4] += 255;
+                gTasks[taskId].data[5] = 6;
+            }
         }
 
         if ((gBattle_WIN0V & 0xFF00) != 0)
             gBattle_WIN0V -= 1020;
 
-        if (gTasks[taskId].data[2] != 0)
-            gTasks[taskId].data[2] -= 2;
+        if (gTasks[taskId].tBgXOffset != 0)
+            gTasks[taskId].tBgXOffset -= 2;
 
-        // Set the x offset for the the top half of the screen.
+        // Slide in the top half of the BG from the left
         for (i = 0; i < DISPLAY_HEIGHT / 2; i++)
-            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
-        // Set the x offset for the bottom half of the screen.
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].tBgXOffset;
+        // Slide in the bottom half of the BG from the right
         for (; i < DISPLAY_HEIGHT; i++)
-            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].tBgXOffset;
 
-        if (gTasks[taskId].data[2] == 0)
+        if (gTasks[taskId].tBgXOffset == 0)
         {
             gScanlineEffect.state = 3;
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tState++;
             CpuFill32(0, (void *)(VRAM + 0xE000), 0x800);
             REG_BG1CNT = 0x9C00;
             REG_BG2CNT = 0x5E00;
         }
         break;
     case 4:
-        sub_80E443C(taskId);
+        EndBattleIntroTask(taskId);
         break;
     }
 
-    if (gTasks[taskId].data[0] != 4)
+    if (gTasks[taskId].tState != 4)
         REG_BLDALPHA = gTasks[taskId].data[4];
 }
 
-static void sub_80E4C34(u8 taskId)
+// Seems to only be used for link battles. 
+static void BattleIntroTask_80E4C34(u8 taskId)
 {
     s32 i;
 
-    if (gTasks[taskId].data[0] > 1 && gTasks[taskId].data[4] == 0)
+    if (gTasks[taskId].tState > 1 && gTasks[taskId].data[4] == 0)
     {
         if ((gBattle_BG1_X & 0x8000) || gBattle_BG1_X < 80)  // hmm...
         {
@@ -379,17 +396,17 @@ static void sub_80E4C34(u8 taskId)
         }
     }
 
-    switch (gTasks[taskId].data[0])
+    switch (gTasks[taskId].tState)
     {
     case 0:
-        gTasks[taskId].data[2] = 16;
-        gTasks[taskId].data[0]++;
+        gTasks[taskId].tBgXOffset = 16;
+        gTasks[taskId].tState++;
         break;
     case 1:
-        gTasks[taskId].data[2]--;
-        if (gTasks[taskId].data[2] == 0)
+        gTasks[taskId].tBgXOffset--;
+        if (gTasks[taskId].tBgXOffset == 0)
         {
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tState++;
             gSprites[ewram1608A].oam.objMode = 2;
             gSprites[ewram1608A].callback = sub_800FE20;
             gSprites[ewram1608B].oam.objMode = 2;
@@ -399,12 +416,14 @@ static void sub_80E4C34(u8 taskId)
         }
         break;
     case 2:
-        gBattle_WIN0V -= 255;
+        // Open up window
+        gBattle_WIN0V -= WIN_RANGE(1, 0);  // decrement min Y
+        gBattle_WIN0V += WIN_RANGE(0, 1);  // increment max Y
         if ((gBattle_WIN0V & 0xFF00) == 0x3000)
         {
-            gTasks[taskId].data[0]++;
-            gTasks[taskId].data[2] = 240;
-            gTasks[taskId].data[3] = 32;
+            gTasks[taskId].tState++;
+            gTasks[taskId].tBgXOffset = DISPLAY_WIDTH;
+            gTasks[taskId].tFramesUntilBg1Slide = 32;
             gUnknown_02024DE8 &= ~1;
         }
         break;
@@ -412,26 +431,26 @@ static void sub_80E4C34(u8 taskId)
         if ((gBattle_WIN0V & 0xFF00) != 0)
             gBattle_WIN0V -= 1020;
 
-        if (gTasks[taskId].data[2] != 0)
-            gTasks[taskId].data[2] -= 2;
+        if (gTasks[taskId].tBgXOffset != 0)
+            gTasks[taskId].tBgXOffset -= 2;
 
-        // Set the x offset for the the top half of the screen.
+        // Slide in the top half of the BG from the left
         for (i = 0; i < DISPLAY_HEIGHT / 2; i++)
-            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
-        // Set the x offset for the bottom half of the screen.
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].tBgXOffset;
+        // Slide in the bottom half of the BG from the right
         for (; i < DISPLAY_HEIGHT; i++)
-            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].tBgXOffset;
 
-        if (gTasks[taskId].data[2] == 0)
+        if (gTasks[taskId].tBgXOffset == 0)
         {
             gScanlineEffect.state = 3;
-            gTasks[taskId].data[0]++;
+            gTasks[taskId].tState++;
             REG_BG1CNT = 0x9C00;
             REG_BG2CNT = 0x5E00;
         }
         break;
     case 4:
-        sub_80E443C(taskId);
+        EndBattleIntroTask(taskId);
         break;
     }
 }
-- 
cgit v1.2.3