Merge pull request #1018 from GriffinRichards/sync-util

Sync link game util files

17 files changed, 1191 insertions, 1152 deletions

diff --git a/graphics/link_games/pkmnjump_321start2.png b/graphics/link_games/321start.png
index 2823feb81..2823feb81 100644
--- a/graphics/link_games/pkmnjump_321start2.png
+++ b/graphics/link_games/321start.png
diff --git a/graphics/link_games/pkmnjump_321start1.png b/graphics/link_games/321start_2.png
index 343fd3e7d..343fd3e7d 100644
--- a/graphics/link_games/pkmnjump_321start1.png
+++ b/graphics/link_games/321start_2.png
diff --git a/include/digit_obj_util.h b/include/digit_obj_util.h
new file mode 100644
index 000000000..aca97e2c7
--- /dev/null
+++ b/include/digit_obj_util.h
@@ -0,0 +1,26 @@
+#ifndef GUARD_DIGIT_OBJ_UTIL_H
+#define GUARD_DIGIT_OBJ_UTIL_H
+
+struct DigitObjUtilTemplate
+{
+    u8 strConvMode:2;
+    u8 shape:2;
+    u8 size:2;
+    u8 priority:2;
+    u8 oamCount;
+    u8 xDelta;
+    s16 x;
+    s16 y;
+    const struct SpriteSheet *spriteSheet;
+    const struct SpritePalette *spritePal;
+};
+
+bool32 DigitObjUtil_Init(u32 count);
+void DigitObjUtil_Free(void);
+bool32 DigitObjUtil_CreatePrinter(u32 id, s32 num, const struct DigitObjUtilTemplate *template);
+void DigitObjUtil_PrintNumOn(u32 id, s32 arg1);
+void DigitObjUtil_DeletePrinter(u32 id);
+void DigitObjUtil_HideOrShow(u32 id, bool32 arg1);
+u8 GetTilesPerImage(u32 shape, u32 size);
+
+#endif // GUARD_DIGIT_OBJ_UTIL_H
diff --git a/include/minigame_countdown.h b/include/minigame_countdown.h
new file mode 100644
index 000000000..930205218
--- /dev/null
+++ b/include/minigame_countdown.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_MINIGAME_COUNTDOWN_H
+#define GUARD_MINIGAME_COUNTDOWN_H
+
+void StartMinigameCountdown(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority);
+bool32 IsMinigameCountdownRunning(void);
+
+#endif //GUARD_MINIGAME_COUNTDOWN_H
diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h
index dde59aac5..9cf65212f 100644
--- a/include/pokemon_jump.h
+++ b/include/pokemon_jump.h
@@ -8,7 +8,5 @@ bool32 IsSpeciesAllowedInPokemonJump(u16 species);
 void IsPokemonJumpSpeciesInParty(void);
 void ResetPokeJumpResults(void);
 void ShowPokemonJumpRecords(void);
-void sub_802EB24(s16 tileTag, s16 palTag, s16 x, s16 y, u8 subpriority);
-bool32 sub_802EB84(void);
 
 #endif // GUARD_POKEMON_JUMP_H
diff --git a/include/rom_8034C54.h b/include/rom_8034C54.h
deleted file mode 100644
index 4da324dd1..000000000
--- a/include/rom_8034C54.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef GUARD_ROM_8034C54_H
-#define GUARD_ROM_8034C54_H
-
-struct UnkStruct3
-{
-    u8 field_0_0:2;
-    u8 shape:2;
-    u8 size:2;
-    u8 priority:2;
-    u8 field_1;
-    u8 xDelta;
-    s16 x;
-    s16 y;
-    const struct SpriteSheet *spriteSheet;
-    const struct SpritePalette *spritePal;
-};
-
-bool32 sub_8034C54(u32 count);
-void sub_8034CC8(void);
-bool32 sub_8034D14(u32 id, s32 arg1, const struct UnkStruct3 *arg2);
-void sub_8035044(u32 id, s32 arg1);
-void sub_80353DC(u32 id);
-void sub_803547C(u32 id, bool32 arg1);
-u8 sub_80355F8(u32 shape, u32 size);
-
-#endif // GUARD_ROM_8034C54_H
diff --git a/ld_script.txt b/ld_script.txt
index 1c4db64cc..74d9f6ae6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -77,11 +77,12 @@ SECTIONS {
         src/berry_powder.o(.text);
         src/dodrio_berry_picking.o(.text);
         src/pokemon_jump.o(.text);
+        src/minigame_countdown.o(.text);
         src/rtc.o(.text);
         src/main_menu.o(.text);
         src/battle_controllers.o(.text);
         src/decompress.o(.text);
-        src/rom_8034C54.o(.text);
+        src/digit_obj_util.o(.text);
         src/battle_bg.o(.text);
         src/battle_main.o(.text);
         src/battle_util.o(.text);
@@ -460,10 +461,11 @@ SECTIONS {
         src/berry_powder.o(.rodata);
         src/dodrio_berry_picking.o(.rodata);
         src/pokemon_jump.o(.rodata);
+        src/minigame_countdown.o(.rodata);
         src/rtc.o(.rodata);
         src/main_menu.o(.rodata);
         src/battle_controllers.o(.rodata);
-        src/rom_8034C54.o(.rodata);
+        src/digit_obj_util.o(.rodata);
         src/data.o(.rodata);
         src/battle_bg.o(.rodata);
         src/battle_main.o(.rodata);
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 01d05e68d..00c504bfd 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -691,6 +691,25 @@ static const struct BattleBackground gBattleTerrainTable[] =
     },
 };
 
+static void sub_8035648(void);
+
+// Unused
+static void sub_8035608(void)
+{
+    u8 spriteId;
+
+    ResetSpriteData();
+    spriteId = CreateSprite(&gUnknown_0831AC88, 0, 0, 0);
+    gSprites[spriteId].invisible = TRUE;
+    SetMainCallback2(sub_8035648);
+}
+
+static void sub_8035648(void)
+{
+    AnimateSprites();
+    BuildOamBuffer();
+}
+
 void BattleInitBgsAndWindows(void)
 {
     ResetBgsAndClearDma3BusyFlags(0);
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 542888631..a67d1548e 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -19,9 +19,9 @@
 #include "menu.h"
 #include "overworld.h"
 #include "palette.h"
-#include "pokemon_jump.h"
+#include "minigame_countdown.h"
 #include "random.h"
-#include "rom_8034C54.h"
+#include "digit_obj_util.h"
 #include "save.h"
 #include "scanline_effect.h"
 #include "script.h"
@@ -714,14 +714,14 @@ static const struct SpriteTemplate gUnknown_082F436C =
     .callback = SpriteCallbackDummy
 };
 
-static const struct UnkStruct3 gUnknown_082F4384[] = 
+static const struct DigitObjUtilTemplate gUnknown_082F4384[] = 
 {
     {
-        .field_0_0 = 1,
+        .strConvMode = 1,
         .shape = 2,
         .size = 0,
         .priority = 0,
-        .field_1 = 2, 
+        .oamCount = 2, 
         .xDelta = 8, 
         .x = 156,
         .y = 0,
@@ -729,11 +729,11 @@ static const struct UnkStruct3 gUnknown_082F4384[] =
         .spritePal = gUnknown_082F422C,
     },
     {
-        .field_0_0 = 0,
+        .strConvMode = 0,
         .shape = 2,
         .size = 0,
         .priority = 0,
-        .field_1 = 2, 
+        .oamCount = 2, 
         .xDelta = 8, 
         .x = 180,
         .y = 0,
@@ -741,11 +741,11 @@ static const struct UnkStruct3 gUnknown_082F4384[] =
         .spritePal = gUnknown_082F422C,
     },
     {
-        .field_0_0 = 0,
+        .strConvMode = 0,
         .shape = 2,
         .size = 0,
         .priority = 0,
-        .field_1 = 2, 
+        .oamCount = 2, 
         .xDelta = 8, 
         .x = 204,
         .y = 0,
@@ -1036,7 +1036,7 @@ int sub_802104C(void)
     case 1:
         CpuFill16(0, (void *)OAM, OAM_SIZE);
         gReservedSpritePaletteCount = 0;
-        sub_8034C54(3);
+        DigitObjUtil_Init(3);
         break;
     case 2:
         ResetPaletteFade();
@@ -1165,7 +1165,7 @@ int sub_802130C(void)
     case 6:
         DestroyWirelessStatusIndicatorSprite();
         sub_8022960(var0);
-        sub_8034CC8();
+        DigitObjUtil_Free();
         break;
     case 7:
         var0->unkC = 0;
@@ -1701,18 +1701,18 @@ void ShowBerryCrushRankings(void)
 void sub_8022524(struct BerryCrushGame_138 *r4, u16 r1)
 {
     sub_8021944(r4, r1);
-    sub_8035044(0, r4->unk4);
-    sub_8035044(1, r4->unk6);
-    sub_8035044(2, r4->unk8);
+    DigitObjUtil_PrintNumOn(0, r4->unk4);
+    DigitObjUtil_PrintNumOn(1, r4->unk6);
+    DigitObjUtil_PrintNumOn(2, r4->unk8);
 }
 
 void sub_8022554(struct BerryCrushGame_138 *r0)
 {
     r0->unk78[0]->invisible = TRUE;
     r0->unk78[1]->invisible = TRUE;
-    sub_803547C(2, 1);
-    sub_803547C(1, 1);
-    sub_803547C(0, 1);
+    DigitObjUtil_HideOrShow(2, 1);
+    DigitObjUtil_HideOrShow(1, 1);
+    DigitObjUtil_HideOrShow(0, 1);
 }
 
 void sub_8022588(struct BerryCrushGame *r5)
@@ -1855,9 +1855,9 @@ void sub_8022730(struct BerryCrushGame *r6)
         r6->unk138.unk78[r5]->invisible = FALSE;
         r6->unk138.unk78[r5]->animPaused = FALSE;
     }
-    sub_8034D14(0, 0, &gUnknown_082F4384[0]);
-    sub_8034D14(1, 0, &gUnknown_082F4384[1]);
-    sub_8034D14(2, 0, &gUnknown_082F4384[2]);
+    DigitObjUtil_CreatePrinter(0, 0, &gUnknown_082F4384[0]);
+    DigitObjUtil_CreatePrinter(1, 0, &gUnknown_082F4384[1]);
+    DigitObjUtil_CreatePrinter(2, 0, &gUnknown_082F4384[2]);
     if (r6->unk12 == 1)
         sub_8022554(&r6->unk138);
 }
@@ -1875,9 +1875,9 @@ void sub_8022960(struct BerryCrushGame *r5)
     FreeSpritePaletteByTag(1);
     for (; r4 < ARRAY_COUNT(r5->unk138.unk78); ++r4)
         DestroySprite(r5->unk138.unk78[r4]);
-    sub_80353DC(2);
-    sub_80353DC(1);
-    sub_80353DC(0);
+    DigitObjUtil_DeletePrinter(2);
+    DigitObjUtil_DeletePrinter(1);
+    DigitObjUtil_DeletePrinter(0);
     for (r4 = 0; r4 < ARRAY_COUNT(r5->unk138.unk4C); ++r4)
         DestroySprite(r5->unk138.unk4C[r4]);
     for (r4 = 0; r4 < r5->unk9; ++r4)
@@ -2317,10 +2317,10 @@ static u32 sub_80232EC(struct BerryCrushGame *r4,  __attribute__((unused)) u8 *r
     case 1:
         if (!IsLinkTaskFinished())
             return 0;
-        sub_802EB24(0x1000, 0x1000, 120, 80, 0);
+        StartMinigameCountdown(0x1000, 0x1000, 120, 80, 0);
         break;
     case 2:
-        if (sub_802EB84())
+        if (IsMinigameCountdownRunning())
             return 0;
         // fallthrough
     case 0:
diff --git a/src/digit_obj_util.c b/src/digit_obj_util.c
new file mode 100644
index 000000000..fe5d49e69
--- /dev/null
+++ b/src/digit_obj_util.c
@@ -0,0 +1,450 @@
+#include "global.h"
+#include "digit_obj_util.h"
+#include "malloc.h"
+#include "decompress.h"
+#include "main.h"
+#include "battle_main.h"
+
+struct DigitPrinter
+{
+    bool8 isActive;
+    u8 firstOamId;
+    u8 strConvMode;
+    u8 oamCount;
+    u8 palTagIndex;
+    u8 size;
+    u8 shape;
+    u8 priority;
+    u8 xDelta;
+    u8 tilesPerImage;
+    u16 tileStart;
+    s16 x;
+    s16 y;
+    u16 tileTag;
+    u16 palTag;
+    u32 pow10;
+    s32 lastPrinted;
+};
+
+struct DigitPrinterAlloc
+{
+    u32 count;
+    struct DigitPrinter *array;
+};
+
+// this file's functions
+static u8 GetFirstOamId(u8 oamCount);;
+static void CopyWorkToOam(struct DigitPrinter *objWork);
+static void DrawNumObjsLeadingZeros(struct DigitPrinter *objWork, s32 num, bool32 sign);
+static void DrawNumObjsMinusInFront(struct DigitPrinter *objWork, s32 num, bool32 sign);
+static void DrawNumObjsMinusInBack(struct DigitPrinter *objWork, s32 num, bool32 sign);
+static bool32 SharesTileWithAnyActive(u32 id);
+static bool32 SharesPalWithAnyActive(u32 id);
+
+// ewram
+static EWRAM_DATA struct DigitPrinterAlloc *sOamWork = {0};
+
+// const rom data
+static const u8 sTilesPerImage[4][4] =
+{
+    [ST_OAM_SQUARE]      = {
+        [ST_OAM_SIZE_0] = 0x01, // SPRITE_SIZE_8x8
+        [ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_16x16
+        [ST_OAM_SIZE_2] = 0x10, // SPRITE_SIZE_32x32
+        [ST_OAM_SIZE_3] = 0x40  // SPRITE_SIZE_64x64
+    },
+    [ST_OAM_H_RECTANGLE] = {
+        [ST_OAM_SIZE_0] = 0x02, // SPRITE_SIZE_16x8
+        [ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_32x8
+        [ST_OAM_SIZE_2] = 0x08, // SPRITE_SIZE_32x16
+        [ST_OAM_SIZE_3] = 0x20  // SPRITE_SIZE_64x32
+    },
+    [ST_OAM_V_RECTANGLE] = {
+        [ST_OAM_SIZE_0] = 0x02, // SPRITE_SIZE_8x16
+        [ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_8x32
+        [ST_OAM_SIZE_2] = 0x08, // SPRITE_SIZE_16x32
+        [ST_OAM_SIZE_3] = 0x20  // SPRITE_SIZE_32x64
+    }
+};
+
+// code
+bool32 DigitObjUtil_Init(u32 count)
+{
+    u32 i;
+
+    if (sOamWork != NULL)
+        DigitObjUtil_Free();
+
+    sOamWork = Alloc(sizeof(*sOamWork));
+    if (sOamWork == NULL)
+        return FALSE;
+
+    sOamWork->array = Alloc(sizeof(struct DigitPrinter) * count);
+    if (sOamWork->array == NULL)
+    {
+        Free(sOamWork);
+        return FALSE;
+    }
+
+    sOamWork->count = count;
+    for (i = 0; i < count; i++)
+    {
+        sOamWork->array[i].isActive = FALSE;
+        sOamWork->array[i].firstOamId = 0xFF;
+    }
+
+    return TRUE;
+}
+
+void DigitObjUtil_Free(void)
+{
+    if (sOamWork != NULL)
+    {
+        if (sOamWork->array != NULL)
+        {
+            u32 i;
+
+            for (i = 0; i < sOamWork->count; i++)
+                DigitObjUtil_DeletePrinter(i);
+
+            Free(sOamWork->array);
+        }
+
+        FREE_AND_SET_NULL(sOamWork);
+    }
+}
+
+bool32 DigitObjUtil_CreatePrinter(u32 id, s32 num, const struct DigitObjUtilTemplate *template)
+{
+    u32 i;
+
+    if (sOamWork == NULL)
+        return FALSE;
+    if (sOamWork->array[id].isActive)
+        return FALSE;
+
+    sOamWork->array[id].firstOamId = GetFirstOamId(template->oamCount);
+    if (sOamWork->array[id].firstOamId == 0xFF)
+        return FALSE;
+
+    sOamWork->array[id].tileStart = GetSpriteTileStartByTag(template->spriteSheet->tag);
+    if (sOamWork->array[id].tileStart == 0xFFFF)
+    {
+        if (template->spriteSheet->size != 0)
+        {
+            sOamWork->array[id].tileStart = LoadSpriteSheet(template->spriteSheet);
+        }
+        else
+        {
+            struct CompressedSpriteSheet compSpriteSheet;
+
+            compSpriteSheet = *(struct CompressedSpriteSheet*)(template->spriteSheet);
+            compSpriteSheet.size = GetDecompressedDataSize(template->spriteSheet->data);
+            sOamWork->array[id].tileStart = LoadCompressedSpriteSheet(&compSpriteSheet);
+        }
+
+        if (sOamWork->array[id].tileStart == 0xFFFF)
+            return FALSE;
+    }
+
+    sOamWork->array[id].palTagIndex = IndexOfSpritePaletteTag(template->spritePal->tag);
+    if (sOamWork->array[id].palTagIndex == 0xFF)
+        sOamWork->array[id].palTagIndex = LoadSpritePalette(template->spritePal);
+
+    sOamWork->array[id].strConvMode = template->strConvMode;
+    sOamWork->array[id].oamCount = template->oamCount;
+    sOamWork->array[id].x = template->x;
+    sOamWork->array[id].y = template->y;
+    sOamWork->array[id].shape = template->shape;
+    sOamWork->array[id].size = template->size;
+    sOamWork->array[id].priority = template->priority;
+    sOamWork->array[id].xDelta = template->xDelta;
+    sOamWork->array[id].tilesPerImage = GetTilesPerImage(template->shape, template->size);
+    sOamWork->array[id].tileTag = template->spriteSheet->tag;
+    sOamWork->array[id].palTag = template->spritePal->tag;
+    sOamWork->array[id].isActive = TRUE;
+
+    // Decimal left shift
+    sOamWork->array[id].pow10 = 1;
+    for (i = 1; i < template->oamCount; i++)
+        sOamWork->array[id].pow10 *= 10;
+
+    CopyWorkToOam(&sOamWork->array[id]);
+    DigitObjUtil_PrintNumOn(id, num);
+
+    return TRUE;
+}
+
+static void CopyWorkToOam(struct DigitPrinter *objWork)
+{
+    u32 i;
+    u32 oamId = objWork->firstOamId;
+    u32 x = objWork->x;
+    u32 oamCount = objWork->oamCount + 1;
+
+    CpuFill16(0, &gMain.oamBuffer[oamId], sizeof(struct OamData) * oamCount);
+    for (i = 0, oamId = objWork->firstOamId; i < oamCount; i++, oamId++)
+    {
+        gMain.oamBuffer[oamId].y = objWork->y;
+        gMain.oamBuffer[oamId].x = x;
+        gMain.oamBuffer[oamId].shape = objWork->shape;
+        gMain.oamBuffer[oamId].size = objWork->size;
+        gMain.oamBuffer[oamId].tileNum = objWork->tileStart;
+        gMain.oamBuffer[oamId].priority = objWork->priority;
+        gMain.oamBuffer[oamId].paletteNum = objWork->palTagIndex;
+
+        x += objWork->xDelta;
+    }
+
+    oamId--;
+    gMain.oamBuffer[oamId].x = objWork->x - objWork->xDelta;
+    gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+    gMain.oamBuffer[oamId].tileNum = objWork->tileStart + (objWork->tilesPerImage * 10);
+}
+
+void DigitObjUtil_PrintNumOn(u32 id, s32 num)
+{
+    bool32 sign;
+
+    if (sOamWork == NULL)
+        return;
+    if (!sOamWork->array[id].isActive)
+        return;
+
+    sOamWork->array[id].lastPrinted = num;
+    if (num < 0)
+    {
+        sign = TRUE;
+        num *= -1;
+    }
+    else
+    {
+        sign = FALSE;
+    }
+
+    switch (sOamWork->array[id].strConvMode)
+    {
+    case 0:
+    default:
+        DrawNumObjsLeadingZeros(&sOamWork->array[id], num, sign);
+        break;
+    case 1:
+        DrawNumObjsMinusInFront(&sOamWork->array[id], num, sign);
+        break;
+    case 2:
+        DrawNumObjsMinusInBack(&sOamWork->array[id], num, sign);
+        break;
+    }
+}
+
+static void DrawNumObjsLeadingZeros(struct DigitPrinter *objWork, s32 num, bool32 sign)
+{
+    u32 pow10 = objWork->pow10;
+    u32 oamId = objWork->firstOamId;
+
+    while (pow10 != 0)
+    {
+        u32 digit = num / pow10;
+        num -= (digit * pow10);
+        pow10 /= 10;
+
+        gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
+        oamId++;
+    }
+
+    if (sign)
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+    else
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+}
+
+static void DrawNumObjsMinusInFront(struct DigitPrinter *objWork, s32 num, bool32 sign)
+{
+    u32 pow10 = objWork->pow10;
+    static int oamId;
+    static int curDigit;
+    static int firstDigit;
+
+    oamId = objWork->firstOamId;
+    curDigit = 0;
+    firstDigit = -1;
+
+    while (pow10 != 0)
+    {
+        u32 digit = num / pow10;
+        num -= (digit * pow10);
+        pow10 /= 10;
+
+        if (digit != 0 || firstDigit != -1 || pow10 == 0)
+        {
+            gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+
+            if (firstDigit == -1)
+                firstDigit = curDigit;
+        }
+        else
+        {
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+        }
+
+        oamId++;
+        curDigit++;
+    }
+
+    if (sign)
+    {
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+        gMain.oamBuffer[oamId].x = objWork->x + ((firstDigit - 1) * objWork->xDelta);
+    }
+    else
+    {
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+    }
+}
+
+static void DrawNumObjsMinusInBack(struct DigitPrinter *objWork, s32 num, bool32 sign)
+{
+    u32 pow10 = objWork->pow10;
+    u32 oamId = objWork->firstOamId;
+    bool32 printingDigits = FALSE;
+    s32 nsprites = 0;
+
+    while (pow10 != 0)
+    {
+        u32 digit = num / pow10;
+        num -= (digit * pow10);
+        pow10 /= 10;
+
+        if (digit != 0 || printingDigits || pow10 == 0)
+        {
+            printingDigits = TRUE;
+            gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+
+            oamId++;
+            nsprites++;
+        }
+    }
+
+    while (nsprites < objWork->oamCount)
+    {
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+        oamId++;
+        nsprites++;
+    }
+
+    if (sign)
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+    else
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+}
+
+void DigitObjUtil_DeletePrinter(u32 id)
+{
+    s32 oamId, oamCount, i;
+
+    if (sOamWork == NULL)
+        return;
+    if (!sOamWork->array[id].isActive)
+        return;
+
+    oamCount = sOamWork->array[id].oamCount + 1;
+    oamId = sOamWork->array[id].firstOamId;
+
+    for (i = 0; i < oamCount; i++, oamId++)
+        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+
+    if (!SharesTileWithAnyActive(id))
+        FreeSpriteTilesByTag(sOamWork->array[id].tileTag);
+    if (!SharesPalWithAnyActive(id))
+        FreeSpritePaletteByTag(sOamWork->array[id].palTag);
+
+    sOamWork->array[id].isActive = FALSE;
+}
+
+void DigitObjUtil_HideOrShow(u32 id, bool32 hide)
+{
+    s32 oamId, oamCount, i;
+
+    if (sOamWork == NULL)
+        return;
+    if (!sOamWork->array[id].isActive)
+        return;
+
+    oamCount = sOamWork->array[id].oamCount + 1;
+    oamId = sOamWork->array[id].firstOamId;
+    if (hide)
+    {
+        for (i = 0; i < oamCount; i++, oamId++)
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+    }
+    else
+    {
+        for (i = 0; i < oamCount; i++, oamId++)
+            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+
+        DigitObjUtil_PrintNumOn(id, sOamWork->array[id].lastPrinted);
+    }
+}
+
+static u8 GetFirstOamId(u8 oamCount)
+{
+    u32 i;
+    u16 firstOamId = 64;
+
+    for (i = 0; i < sOamWork->count; i++)
+    {
+        if (!sOamWork->array[i].isActive)
+        {
+            if (sOamWork->array[i].firstOamId != 0xFF && sOamWork->array[i].oamCount <= oamCount)
+                return sOamWork->array[i].firstOamId;
+        }
+        else
+        {
+            firstOamId += 1 + sOamWork->array[i].oamCount;
+        }
+    }
+
+    if (firstOamId + oamCount + 1 > 128)
+        return 0xFF;
+    else
+        return firstOamId;
+}
+
+static bool32 SharesTileWithAnyActive(u32 id)
+{
+    u32 i;
+
+    for (i = 0; i < sOamWork->count; i++)
+    {
+        if (sOamWork->array[i].isActive && i != id
+            && sOamWork->array[i].tileTag == sOamWork->array[id].tileTag)
+        {
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+static bool32 SharesPalWithAnyActive(u32 id)
+{
+    u32 i;
+
+    for (i = 0; i < sOamWork->count; i++)
+    {
+        if (sOamWork->array[i].isActive && i != id
+            && sOamWork->array[i].palTag == sOamWork->array[id].palTag)
+        {
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+u8 GetTilesPerImage(u32 shape, u32 size)
+{
+    return sTilesPerImage[shape][size];
+}
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 40074e0af..936c1828f 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -12,7 +12,7 @@
 #include "m4a.h"
 #include "main.h"
 #include "palette.h"
-#include "pokemon_jump.h"
+#include "minigame_countdown.h"
 #include "random.h"
 #include "save.h"
 #include "script.h"
@@ -667,7 +667,7 @@ static void sub_8024E38(void)
     switch (gUnknown_02022C98->unk10)
     {
     case 0:
-        sub_802EB24(7, 8, 120, 80, 0);
+        StartMinigameCountdown(7, 8, 120, 80, 0);
         gUnknown_02022C98->unk10++;
         break;
     case 1:
@@ -682,7 +682,7 @@ static void sub_8024E38(void)
         }
         break;
     case 3:
-        if (!sub_802EB84())
+        if (!IsMinigameCountdownRunning())
         {
             gUnknown_02022C98->unk10++;
         }
diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c
new file mode 100644
index 000000000..be1c42e29
--- /dev/null
+++ b/src/minigame_countdown.c
@@ -0,0 +1,636 @@
+#include "global.h"
+#include "decompress.h"
+#include "link.h"
+#include "link_rfu.h"
+#include "sound.h"
+#include "task.h"
+#include "trig.h"
+#include "constants/songs.h"
+
+extern const struct OamData gOamData_AffineOff_ObjNormal_32x32;
+
+static void sub_802E6D0(u8 taskId);
+static void sub_802E83C(u8 taskId);
+static void sub_802E8C8(u8 taskId);
+static void sub_802EA50(u8 taskId);
+static void sub_802EAB0(u8 taskId);
+static void sub_802EB98(u8 taskId);
+static void Task_MinigameCountdown(u8 taskId);
+static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId);
+static bool32 IsStartGraphicAnimRunning(u8 spriteId);
+static void Load321StartGfx(u16 tileTag, u16 palTag);
+static u8 CreateNumberSprite(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority);
+static void CreateStartSprite(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 *spriteId1, s16 *spriteId2);
+static void InitStartGraphic(u8 spriteId1, u8 spriteId2, u8 spriteId3);
+static void SpriteCB_Start(struct Sprite *sprite);
+
+static const u16 sSpritePal_321Start_2[] = INCBIN_U16("graphics/link_games/321start_2.gbapal");
+static const u32 sSpriteSheet_321Start_2[] = INCBIN_U32("graphics/link_games/321start_2.4bpp.lz");
+
+static const struct CompressedSpriteSheet gUnknown_082FE6C8[] =
+{
+    {sSpriteSheet_321Start_2, 0xC00, 0x2000},
+    {},
+};
+
+static const struct SpritePalette gUnknown_082FE6D8[] =
+{
+    {sSpritePal_321Start_2, 0x2000},
+    {},
+};
+
+static const union AnimCmd sSpriteAnim_82FE6E8[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82FE6F0[] =
+{
+    ANIMCMD_FRAME(16, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82FE6F8[] =
+{
+    ANIMCMD_FRAME(32, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82FE700[] =
+{
+    ANIMCMD_FRAME(64, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82FE708[] =
+{
+    ANIMCMD_FRAME(48, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82FE710[] =
+{
+    ANIMCMD_FRAME(80, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_82FE718[] =
+{
+    sSpriteAnim_82FE6E8,
+    sSpriteAnim_82FE6F0,
+    sSpriteAnim_82FE6F8,
+    sSpriteAnim_82FE700,
+    sSpriteAnim_82FE708,
+    sSpriteAnim_82FE710
+};
+
+static const struct SpriteTemplate gUnknown_082FE730[] =
+{
+    {
+        .tileTag = 0x2000,
+        .paletteTag = 0x2000,
+        .oam = &gOamData_AffineOff_ObjNormal_32x32,
+        .anims = sSpriteAnimTable_82FE718,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = SpriteCallbackDummy,
+    },
+};
+
+static const TaskFunc gUnknown_082FE748[][4] =
+{
+    {
+        sub_802E83C,
+        sub_802E8C8,
+        sub_802EA50,
+        sub_802EAB0
+    },
+};
+
+static const u16 sSpritePal_321Start[] = INCBIN_U16("graphics/link_games/321start.gbapal");
+static const u32 sSpriteSheet_321Start[] = INCBIN_U32("graphics/link_games/321start.4bpp.lz");
+
+// Unused
+static u32 sub_802E63C(u8 funcSetId, u8 taskPriority)
+{
+    u8 taskId = CreateTask(sub_802E6D0, taskPriority);
+    struct Task *task = &gTasks[taskId];
+
+    task->data[0] = 1;
+    task->data[1] = funcSetId;
+    gUnknown_082FE748[funcSetId][0](taskId);
+    return taskId;
+}
+
+static bool32 sub_802E688(void)
+{
+    u8 taskId = FindTaskIdByFunc(sub_802E6D0);
+    if (taskId == 0xFF)
+        return FALSE;
+
+    gTasks[taskId].data[0] = 2;
+    return TRUE;
+}
+
+static bool32 sub_802E6BC(void)
+{
+    return FuncIsActiveTask(sub_802E6D0);
+}
+
+static void sub_802E6D0(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    switch (data[0])
+    {
+    case 2:
+        gUnknown_082FE748[data[1]][2](taskId);
+        data[0] = 3;
+        break;
+    case 3:
+        gUnknown_082FE748[data[1]][3](taskId);
+        break;
+    case 4:
+        gUnknown_082FE748[data[1]][1](taskId);
+        DestroyTask(taskId);
+        break;
+    }
+}
+
+static void sub_802E75C(u8 taskId, s16 *data)
+{
+    u8 i;
+    struct Sprite *sprite;
+
+    LoadCompressedSpriteSheet(&gUnknown_082FE6C8[data[3]]);
+    LoadSpritePalette(&gUnknown_082FE6D8[data[4]]);
+    for (i = 0; i < data[8]; i++)
+        data[13 + i] = CreateSprite(&gUnknown_082FE730[data[2]], data[9], data[10], data[7]);
+    for (i = 0; i < data[8]; i++)
+    {
+        sprite = &gSprites[data[13 + i]];
+        sprite->oam.priority = data[6];
+        sprite->invisible = TRUE;
+        sprite->data[1] = data[5];
+        sprite->data[3] = taskId;
+        sprite->data[4] = i;
+        sprite->data[5] = data[13];
+    }
+}
+
+static void sub_802E83C(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    data[2] = 0;
+    data[3] = 0;
+    data[4] = 0;
+    data[5] = 60;
+    data[6] = 0;
+    data[7] = 0;
+    data[8] = 3;
+    data[9] = 120;
+    data[10] = 88;
+    sub_802E75C(taskId, data);
+
+    StartSpriteAnim(&gSprites[data[14]], 4);
+    gSprites[data[14]].pos2.x = -32;
+
+    StartSpriteAnim(&gSprites[data[15]], 5);
+    gSprites[data[15]].pos2.x = 32;
+}
+
+static void sub_802E8C8(u8 taskId)
+{
+    u8 i = 0;
+    s16 *data = gTasks[taskId].data;
+
+    for (i = 0; i < data[8]; i++)
+        DestroySprite(&gSprites[data[13 + i]]);
+    FreeSpriteTilesByTag(gUnknown_082FE6C8[data[3]].tag);
+    FreeSpritePaletteByTag(gUnknown_082FE6D8[data[4]].tag);
+}
+
+static void sub_802E938(struct Sprite *sprite)
+{
+    s16 *data = gTasks[sprite->data[3]].data;
+
+    if (data[11] % data[5] != 0)
+        return;
+    if (data[11] == data[10])
+        return;
+
+    data[10] = data[11];
+    switch (sprite->data[2])
+    {
+    case 0:
+        sprite->invisible = FALSE;
+    case 1:
+    case 2:
+        PlaySE(SE_KON);
+        StartSpriteAnim(sprite, sprite->data[2]);
+        break;
+    case 3:
+        PlaySE(SE_PIN);
+        StartSpriteAnim(sprite, sprite->data[2]);
+        gSprites[data[14]].invisible = FALSE;
+        gSprites[data[15]].invisible = FALSE;
+        break;
+    case 4:
+        sprite->invisible = TRUE;
+        gSprites[data[14]].invisible = TRUE;
+        gSprites[data[15]].invisible = TRUE;
+        data[0] = 4;
+        return;
+    }
+    sprite->data[2]++;
+}
+
+static void sub_802EA50(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    PlaySE(SE_KON);
+    gSprites[data[13]].callback = sub_802E938;
+    gSprites[data[13]].invisible = FALSE;
+    gTasks[taskId].data[0] = 3;
+}
+
+static void sub_802EAB0(u8 taskId)
+{
+    u16 packet[6];
+    s16 *data = gTasks[taskId].data;
+
+    if (gReceivedRemoteLinkPlayers != 0)
+    {
+        if (gRecvCmds[0][1] == 0x7FFF)
+            data[11] = gRecvCmds[0][2];
+        if (GetMultiplayerId() == 0)
+        {
+            data[12]++;
+            memset(packet, 0, sizeof(packet));
+            packet[0] = 0x7FFF;
+            packet[1] = data[12];
+            sub_800FE50(packet);
+        }
+    }
+    else
+    {
+        data[11]++;
+    }
+}
+
+#define tState       data[0]
+#define tTilesTag    data[2]
+#define tPalTag      data[3]
+#define tX           data[4]
+#define tY           data[5]
+#define tSubpriority data[6]
+#define tSpriteId1   data[7]
+#define tSpriteId2   data[8]
+#define tSpriteId3   data[9]
+
+void StartMinigameCountdown(s16 tilesTag, s16 palTag, s16 x, s16 y, u8 subpriority)
+{
+    u8 taskId = CreateTask(Task_MinigameCountdown, 80);
+    gTasks[taskId].tTilesTag = tilesTag;
+    gTasks[taskId].tPalTag = palTag;
+    gTasks[taskId].tX = x;
+    gTasks[taskId].tY = y;
+    gTasks[taskId].tSubpriority = subpriority;
+}
+
+bool32 IsMinigameCountdownRunning(void)
+{
+    return FuncIsActiveTask(Task_MinigameCountdown);
+}
+
+static void Task_MinigameCountdown(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    switch (tState)
+    {
+    case 0:
+        Load321StartGfx(tTilesTag, tPalTag);
+        tSpriteId1 = CreateNumberSprite(tTilesTag, tPalTag, tX, tY, tSubpriority);
+        CreateStartSprite(tTilesTag, tPalTag, tX, tY, tSubpriority, &tSpriteId2, &tSpriteId3);
+        tState++;
+        break;
+    case 1:
+        if (!RunMinigameCountdownDigitsAnim(tSpriteId1))
+        {
+            InitStartGraphic(tSpriteId1, tSpriteId2, tSpriteId3);
+            FreeSpriteOamMatrix(&gSprites[tSpriteId1]);
+            DestroySprite(&gSprites[tSpriteId1]);
+            tState++;
+        }
+        break;
+    case 2:
+        if (!IsStartGraphicAnimRunning(tSpriteId2))
+        {
+            DestroySprite(&gSprites[tSpriteId2]);
+            DestroySprite(&gSprites[tSpriteId3]);
+            FreeSpriteTilesByTag(tTilesTag);
+            FreeSpritePaletteByTag(tPalTag);
+            DestroyTask(taskId);
+        }
+        break;
+    }
+}
+
+static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId)
+{
+    struct Sprite *sprite = &gSprites[spriteId];
+
+    switch (sprite->data[0])
+    {
+    case 0:
+        sub_8007E18(sprite, 0x800, 0x1A);
+        sprite->data[0]++;
+        // fallthrough
+    case 1:
+        if (sprite->data[2] == 0)
+            PlaySE(SE_KON2);
+        if (++sprite->data[2] >= 20)
+        {
+            sprite->data[2] = 0;
+            StartSpriteAffineAnim(sprite, 1);
+            sprite->data[0]++;
+        }
+        break;
+    case 2:
+        if (sprite->affineAnimEnded)
+            sprite->data[0]++;
+        break;
+    case 3:
+        if (++sprite->data[2] >= 4)
+        {
+            sprite->data[2] = 0;
+            sprite->data[0]++;
+            StartSpriteAffineAnim(sprite, 2);
+        }
+        break;
+    case 4:
+        sprite->pos1.y -= 4;
+        if (++sprite->data[2] >= 8)
+        {
+            if (sprite->data[4] <= 1)
+            {
+                StartSpriteAnim(sprite, sprite->data[4] + 1);
+                sprite->data[2] = 0;
+                sprite->data[0]++;
+            }
+            else
+            {
+                sprite->data[0] = 7;
+                return FALSE;
+            }
+        }
+        break;
+    case 5:
+        sprite->pos1.y += 4;
+        if (++sprite->data[2] >= 8)
+        {
+            sprite->data[2] = 0;
+            StartSpriteAffineAnim(sprite, 3);
+            sprite->data[0]++;
+        }
+        break;
+    case 6:
+        if (sprite->affineAnimEnded)
+        {
+            sprite->data[4]++;
+            sprite->data[0] = 1;
+        }
+        break;
+    case 7:
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+// First argument is unused.
+static void InitStartGraphic(u8 spriteId1, u8 spriteId2, u8 spriteId3)
+{
+    gSprites[spriteId2].pos2.y = -40;
+    gSprites[spriteId3].pos2.y = -40;
+    gSprites[spriteId2].invisible = FALSE;
+    gSprites[spriteId3].invisible = FALSE;
+    gSprites[spriteId2].callback = SpriteCB_Start;
+    gSprites[spriteId3].callback = SpriteCB_Start;
+}
+
+static bool32 IsStartGraphicAnimRunning(u8 spriteId)
+{
+    return gSprites[spriteId].callback == SpriteCB_Start;
+}
+
+static void SpriteCB_Start(struct Sprite *sprite)
+{
+    int y;
+    s16 *data = sprite->data;
+
+    switch (data[0])
+    {
+    case 0:
+        data[4] = 64;
+        data[5] = sprite->pos2.y << 4;
+        data[0]++;
+    case 1:
+        data[5] += data[4];
+        data[4]++;
+        sprite->pos2.y = data[5] >> 4;
+        if (sprite->pos2.y >= 0)
+        {
+            PlaySE(SE_KON2);
+            sprite->pos2.y = 0;
+            data[0]++;
+        }
+        break;
+    case 2:
+        data[1] += 12;
+        if (data[1] >= 128)
+        {
+            PlaySE(SE_KON2);
+            data[1] = 0;
+            data[0]++;
+        }
+        y = gSineTable[data[1]];
+        sprite->pos2.y = -(y >> 4);
+        break;
+    case 3:
+        data[1] += 16;
+        if (data[1] >= 128)
+        {
+            PlaySE(SE_KON2);
+            data[1] = 0;
+            data[0]++;
+        }
+        sprite->pos2.y = -(gSineTable[data[1]] >> 5);
+        break;
+    case 4:
+        if (++data[1] > 40)
+            sprite->callback = SpriteCallbackDummy;
+        break;
+    }
+}
+
+static void Load321StartGfx(u16 tileTag, u16 palTag)
+{
+    struct CompressedSpriteSheet spriteSheet = {sSpriteSheet_321Start, 0xE00, 0};
+    struct SpritePalette spritePalette = {sSpritePal_321Start, 0};
+
+    spriteSheet.tag = tileTag;
+    spritePalette.tag = palTag;
+
+    LoadCompressedSpriteSheet(&spriteSheet);
+    LoadSpritePalette(&spritePalette);
+}
+
+static const struct OamData sOamData_Numbers =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(32x32),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct OamData sOamData_Start =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(64x32),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(64x32),
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const union AnimCmd sAnim_Numbers_Three[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sAnim_Numbers_Two[] =
+{
+    ANIMCMD_FRAME(16, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sAnim_Numbers_One[] =
+{
+    ANIMCMD_FRAME(32, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sAnimTable_Numbers[] =
+{
+    sAnim_Numbers_Three,
+    sAnim_Numbers_Two,
+    sAnim_Numbers_One
+};
+
+static const union AnimCmd sAnim_StartLeft[] =
+{
+    ANIMCMD_FRAME(48, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sAnim_StartRight[] =
+{
+    ANIMCMD_FRAME(80, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sAnimTable_Start[] =
+{
+    sAnim_StartLeft,
+    sAnim_StartRight
+};
+
+static const union AffineAnimCmd sAffineAnim_Numbers_0[] =
+{
+    AFFINEANIMCMD_FRAME(256, 256, 0, 0),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sAffineAnim_Numbers_1[] =
+{
+    AFFINEANIMCMD_FRAME(256, 256, 0, 0),
+    AFFINEANIMCMD_FRAME(16, -16, 0, 8),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sAffineAnim_Numbers_2[] =
+{
+    AFFINEANIMCMD_FRAME(-18, 18, 0, 8),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sAffineAnim_Numbers_3[] =
+{
+    AFFINEANIMCMD_FRAME(  6,  -6, 0, 8),
+    AFFINEANIMCMD_FRAME( -4,   4, 0, 8),
+    AFFINEANIMCMD_FRAME(256, 256, 0, 0),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd *const sAffineAnimTable_Numbers[] =
+{
+    sAffineAnim_Numbers_0,
+    sAffineAnim_Numbers_1,
+    sAffineAnim_Numbers_2,
+    sAffineAnim_Numbers_3
+};
+
+static u8 CreateNumberSprite(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority)
+{
+    struct SpriteTemplate spriteTemplate =
+    {
+        .oam = &sOamData_Numbers,
+        .anims = sAnimTable_Numbers,
+        .affineAnims = sAffineAnimTable_Numbers,
+        .callback = SpriteCallbackDummy,
+    };
+
+    spriteTemplate.tileTag = tileTag;
+    spriteTemplate.paletteTag = palTag;
+    return CreateSprite(&spriteTemplate, x, y, subpriority);
+}
+
+static void CreateStartSprite(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 *spriteId1, s16 *spriteId2)
+{
+    struct SpriteTemplate spriteTemplate =
+    {
+        .oam = &sOamData_Start,
+        .anims = sAnimTable_Start,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = SpriteCallbackDummy,
+    };
+
+    spriteTemplate.tileTag = tileTag;
+    spriteTemplate.paletteTag = palTag;
+    *spriteId1 = CreateSprite(&spriteTemplate, x - 32, y, subpriority);
+    *spriteId2 = CreateSprite(&spriteTemplate, x + 32, y, subpriority);
+
+    gSprites[*spriteId1].invisible = TRUE;
+    gSprites[*spriteId2].invisible = TRUE;
+    StartSpriteAnim(&gSprites[*spriteId2], 1);
+}
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index 6c76b15a6..f2f416c35 100755
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -12,9 +12,10 @@
 #include "link_rfu.h"
 #include "main.h"
 #include "menu.h"
+#include "minigame_countdown.h"
 #include "palette.h"
 #include "random.h"
-#include "rom_8034C54.h"
+#include "digit_obj_util.h"
 #include "save.h"
 #include "script.h"
 #include "sound.h"
@@ -289,21 +290,8 @@ static void sub_802D5E4(void);
 static void sub_802D72C(void);
 static void sub_802D688(void);
 static void Task_ShowPokemonJumpRecords(u8 taskId);
-static void sub_802E6D0(u8 taskId);
-static void sub_802EB98(u8 taskId);
 static void sub_802E500(u16 windowId, int width);
 static void TruncateToFirstWordOnly(u8 *str);
-static void sub_802EF50(u16 tileTag, u16 palTag);
-static u8 sub_802EFA8(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority);
-static void sub_802EFFC(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 *spriteId1, s16 *spriteId2);
-static bool32 sub_802EC98(u8 spriteId);
-static bool32 sub_802EE30(u8 spriteId);
-static void sub_802EDCC(u8 spriteId1, u8 spriteId2, u8 spriteId3);
-static void sub_802EE5C(struct Sprite *sprite);
-static void sub_802E83C(u8 taskId);
-static void sub_802E8C8(u8 taskId);
-static void sub_802EA50(u8 taskId);
-static void sub_802EAB0(u8 taskId);
 
 EWRAM_DATA static struct PokemonJump1 *gUnknown_02022CFC = NULL;
 EWRAM_DATA static struct PokemonJump2 *gUnknown_02022D00 = NULL;
@@ -2807,13 +2795,13 @@ static void sub_802CF50(struct PokemonJump2 *arg0, int arg1)
 
 static void sub_802D044(struct PokemonJump2 *arg0)
 {
-    sub_802EB24(9, 7, 120, 80, 0);
+    StartMinigameCountdown(9, 7, 120, 80, 0);
     sub_802CD3C(arg0);
 }
 
 static bool32 sub_802D068(void)
 {
-    return sub_802EB84();
+    return IsMinigameCountdownRunning();
 }
 
 static void sub_802D074(struct PokemonJump2 *arg0)
@@ -2831,7 +2819,7 @@ static void sub_802D074(struct PokemonJump2 *arg0)
 static void sub_802D0AC(void)
 {
     FreeAllWindowBuffers();
-    sub_8034CC8();
+    DigitObjUtil_Free();
 }
 
 static void sub_802D0BC(struct PokemonJump2 *arg0)
@@ -3515,37 +3503,37 @@ static int sub_802DCCC(u8 flags)
 
 static void sub_802DD08(void)
 {
-    struct UnkStruct3 unkStruct;
-    struct UnkStruct3 *ptr = &unkStruct; // This temp variable is needed to match, don't ask me why.
+    struct DigitObjUtilTemplate template;
+    struct DigitObjUtilTemplate *ptr = &template; // This temp variable is needed to match, don't ask me why.
 
     ptr->shape = SPRITE_SHAPE(8x8);
     ptr->size = SPRITE_SIZE(8x8);
-    ptr->field_0_0 = 0;
+    ptr->strConvMode = 0;
     ptr->priority = 1;
-    ptr->field_1 = 5;
+    ptr->oamCount = 5;
     ptr->xDelta = 8;
     ptr->x = 108;
     ptr->y = 6;
     ptr->spriteSheet = (void*) &gUnknown_082FE1EC;
     ptr->spritePal = &gUnknown_082FE1F4;
 
-    sub_8034C54(2);
-    sub_8034D14(0, 0, ptr);
+    DigitObjUtil_Init(2);
+    DigitObjUtil_CreatePrinter(0, 0, ptr);
 
-    unkStruct.field_1 = 4;
-    unkStruct.x = 30;
-    unkStruct.y = 6;
-    sub_8034D14(1, 0, &unkStruct);
+    template.oamCount = 4;
+    template.x = 30;
+    template.y = 6;
+    DigitObjUtil_CreatePrinter(1, 0, &template);
 }
 
 static void sub_802DD64(int arg0)
 {
-    sub_8035044(0, arg0);
+    DigitObjUtil_PrintNumOn(0, arg0);
 }
 
 static void sub_802DD74(u16 arg0)
 {
-    sub_8035044(1, arg0);
+    DigitObjUtil_PrintNumOn(1, arg0);
 }
 
 static void sub_802DD88(u8 multiplayerId)
@@ -3987,611 +3975,3 @@ static void TruncateToFirstWordOnly(u8 *str)
         }
     }
 }
-
-static const u16 gPkmnJump321StartPal1[] = INCBIN_U16("graphics/link_games/pkmnjump_321start1.gbapal");
-static const u32 gPkmnJump321StartGfx1[] = INCBIN_U32("graphics/link_games/pkmnjump_321start1.4bpp.lz");
-
-static const struct CompressedSpriteSheet gUnknown_082FE6C8[] =
-{
-    {gPkmnJump321StartGfx1, 0xC00, 0x2000},
-    {},
-};
-
-static const struct SpritePalette gUnknown_082FE6D8[] =
-{
-    {gPkmnJump321StartPal1, 0x2000},
-    {},
-};
-
-static const union AnimCmd sSpriteAnim_82FE6E8[] =
-{
-    ANIMCMD_FRAME(0, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FE6F0[] =
-{
-    ANIMCMD_FRAME(16, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FE6F8[] =
-{
-    ANIMCMD_FRAME(32, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FE700[] =
-{
-    ANIMCMD_FRAME(64, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FE708[] =
-{
-    ANIMCMD_FRAME(48, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FE710[] =
-{
-    ANIMCMD_FRAME(80, 0),
-    ANIMCMD_END
-};
-
-static const union AnimCmd *const sSpriteAnimTable_82FE718[] =
-{
-    sSpriteAnim_82FE6E8,
-    sSpriteAnim_82FE6F0,
-    sSpriteAnim_82FE6F8,
-    sSpriteAnim_82FE700,
-    sSpriteAnim_82FE708,
-    sSpriteAnim_82FE710
-};
-
-static const struct SpriteTemplate gUnknown_082FE730[] =
-{
-    {
-        .tileTag = 0x2000,
-        .paletteTag = 0x2000,
-        .oam = &gOamData_AffineOff_ObjNormal_32x32,
-        .anims = sSpriteAnimTable_82FE718,
-        .images = NULL,
-        .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = SpriteCallbackDummy,
-    },
-};
-
-static const TaskFunc gUnknown_082FE748[][4] =
-{
-    {
-        sub_802E83C,
-        sub_802E8C8,
-        sub_802EA50,
-        sub_802EAB0
-    },
-};
-
-// There's only set of task functions.
-static u32 sub_802E63C(u8 funcSetId, u8 taskPriority)
-{
-    u8 taskId = CreateTask(sub_802E6D0, taskPriority);
-    struct Task *task = &gTasks[taskId];
-
-    task->data[0] = 1;
-    task->data[1] = funcSetId;
-    gUnknown_082FE748[funcSetId][0](taskId);
-    return taskId;
-}
-
-static bool32 sub_802E688(void)
-{
-    u8 taskId = FindTaskIdByFunc(sub_802E6D0);
-    if (taskId == 0xFF)
-        return FALSE;
-
-    gTasks[taskId].data[0] = 2;
-    return TRUE;
-}
-
-static bool32 sub_802E6BC(void)
-{
-    return FuncIsActiveTask(sub_802E6D0);
-}
-
-static void sub_802E6D0(u8 taskId)
-{
-    s16 *data = gTasks[taskId].data;
-
-    switch (data[0])
-    {
-    case 2:
-        gUnknown_082FE748[data[1]][2](taskId);
-        data[0] = 3;
-        break;
-    case 3:
-        gUnknown_082FE748[data[1]][3](taskId);
-        break;
-    case 4:
-        gUnknown_082FE748[data[1]][1](taskId);
-        DestroyTask(taskId);
-        break;
-    }
-}
-
-static void sub_802E75C(u8 taskId, s16 *data)
-{
-    u8 i;
-    struct Sprite *sprite;
-
-    LoadCompressedSpriteSheet(&gUnknown_082FE6C8[data[3]]);
-    LoadSpritePalette(&gUnknown_082FE6D8[data[4]]);
-    for (i = 0; i < data[8]; i++)
-        data[13 + i] = CreateSprite(&gUnknown_082FE730[data[2]], data[9], data[10], data[7]);
-    for (i = 0; i < data[8]; i++)
-    {
-        sprite = &gSprites[data[13 + i]];
-        sprite->oam.priority = data[6];
-        sprite->invisible = TRUE;
-        sprite->data[1] = data[5];
-        sprite->data[3] = taskId;
-        sprite->data[4] = i;
-        sprite->data[5] = data[13];
-    }
-}
-
-static void sub_802E83C(u8 taskId)
-{
-    s16 *data = gTasks[taskId].data;
-    data[2] = 0;
-    data[3] = 0;
-    data[4] = 0;
-    data[5] = 60;
-    data[6] = 0;
-    data[7] = 0;
-    data[8] = 3;
-    data[9] = 120;
-    data[10] = 88;
-    sub_802E75C(taskId, data);
-
-    StartSpriteAnim(&gSprites[data[14]], 4);
-    gSprites[data[14]].pos2.x = -32;
-
-    StartSpriteAnim(&gSprites[data[15]], 5);
-    gSprites[data[15]].pos2.x = 32;
-}
-
-static void sub_802E8C8(u8 taskId)
-{
-    u8 i = 0;
-    s16 *data = gTasks[taskId].data;
-
-    for (i = 0; i < data[8]; i++)
-        DestroySprite(&gSprites[data[13 + i]]);
-    FreeSpriteTilesByTag(gUnknown_082FE6C8[data[3]].tag);
-    FreeSpritePaletteByTag(gUnknown_082FE6D8[data[4]].tag);
-}
-
-static void sub_802E938(struct Sprite *sprite)
-{
-    s16 *data = gTasks[sprite->data[3]].data;
-
-    if (data[11] % data[5] != 0)
-        return;
-    if (data[11] == data[10])
-        return;
-
-    data[10] = data[11];
-    switch (sprite->data[2])
-    {
-    case 0:
-        sprite->invisible = FALSE;
-    case 1:
-    case 2:
-        PlaySE(SE_KON);
-        StartSpriteAnim(sprite, sprite->data[2]);
-        break;
-    case 3:
-        PlaySE(SE_PIN);
-        StartSpriteAnim(sprite, sprite->data[2]);
-        gSprites[data[14]].invisible = FALSE;
-        gSprites[data[15]].invisible = FALSE;
-        break;
-    case 4:
-        sprite->invisible = TRUE;
-        gSprites[data[14]].invisible = TRUE;
-        gSprites[data[15]].invisible = TRUE;
-        data[0] = 4;
-        return;
-    }
-    sprite->data[2]++;
-}
-
-static void sub_802EA50(u8 taskId)
-{
-    s16 *data = gTasks[taskId].data;
-    PlaySE(SE_KON);
-    gSprites[data[13]].callback = sub_802E938;
-    gSprites[data[13]].invisible = FALSE;
-    gTasks[taskId].data[0] = 3;
-}
-
-static void sub_802EAB0(u8 taskId)
-{
-    u16 packet[6];
-    s16 *data = gTasks[taskId].data;
-
-    if (gReceivedRemoteLinkPlayers != 0)
-    {
-        if (gRecvCmds[0][1] == 0x7FFF)
-            data[11] = gRecvCmds[0][2];
-        if (GetMultiplayerId() == 0)
-        {
-            data[12]++;
-            memset(packet, 0, sizeof(packet));
-            packet[0] = 0x7FFF;
-            packet[1] = data[12];
-            sub_800FE50(packet);
-        }
-    }
-    else
-    {
-        data[11]++;
-    }
-}
-
-void sub_802EB24(s16 tileTag, s16 palTag, s16 x, s16 y, u8 subpriority)
-{
-    u8 taskId = CreateTask(sub_802EB98, 0x50);
-    gTasks[taskId].data[2] = tileTag;
-    gTasks[taskId].data[3] = palTag;
-    gTasks[taskId].data[4] = x;
-    gTasks[taskId].data[5] = y;
-    gTasks[taskId].data[6] = subpriority;
-}
-
-bool32 sub_802EB84(void)
-{
-    return FuncIsActiveTask(sub_802EB98);
-}
-
-static void sub_802EB98(u8 taskId)
-{
-    s16 *data = gTasks[taskId].data;
-
-    switch (data[0])
-    {
-    case 0:
-        sub_802EF50(data[2], data[3]);
-        data[7] = sub_802EFA8(data[2], data[3], data[4], data[5], data[6]);
-        sub_802EFFC(data[2], data[3], data[4], data[5], data[6], &data[8], &data[9]);
-        data[0]++;
-        break;
-    case 1:
-        if (!sub_802EC98(data[7]))
-        {
-            sub_802EDCC(data[7], data[8], data[9]);
-            FreeSpriteOamMatrix(&gSprites[data[7]]);
-            DestroySprite(&gSprites[data[7]]);
-            data[0]++;
-        }
-        break;
-    case 2:
-        if (!sub_802EE30(data[8]))
-        {
-            DestroySprite(&gSprites[data[8]]);
-            DestroySprite(&gSprites[data[9]]);
-            FreeSpriteTilesByTag(data[2]);
-            FreeSpritePaletteByTag(data[3]);
-            DestroyTask(taskId);
-        }
-        break;
-    }
-}
-
-static bool32 sub_802EC98(u8 spriteId)
-{
-    struct Sprite *sprite = &gSprites[spriteId];
-
-    switch (sprite->data[0])
-    {
-    case 0:
-        sub_8007E18(sprite, 0x800, 0x1A);
-        sprite->data[0]++;
-    case 1:
-        if (sprite->data[2] == 0)
-            PlaySE(SE_KON2);
-        if (++sprite->data[2] >= 20)
-        {
-            sprite->data[2] = 0;
-            StartSpriteAffineAnim(sprite, 1);
-            sprite->data[0]++;
-        }
-        break;
-    case 2:
-        if (sprite->affineAnimEnded)
-            sprite->data[0]++;
-        break;
-    case 3:
-        if (++sprite->data[2] >= 4)
-        {
-            sprite->data[2] = 0;
-            sprite->data[0]++;
-            StartSpriteAffineAnim(sprite, 2);
-        }
-        break;
-    case 4:
-        sprite->pos1.y -= 4;
-        if (++sprite->data[2] >= 8)
-        {
-            if (sprite->data[4] <= 1)
-            {
-                StartSpriteAnim(sprite, sprite->data[4] + 1);
-                sprite->data[2] = 0;
-                sprite->data[0]++;
-            }
-            else
-            {
-                sprite->data[0] = 7;
-                return FALSE;
-            }
-        }
-        break;
-    case 5:
-        sprite->pos1.y += 4;
-        if (++sprite->data[2] >= 8)
-        {
-            sprite->data[2] = 0;
-            StartSpriteAffineAnim(sprite, 3);
-            sprite->data[0]++;
-        }
-        break;
-    case 6:
-        if (sprite->affineAnimEnded)
-        {
-            sprite->data[4]++;
-            sprite->data[0] = 1;
-        }
-        break;
-    case 7:
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-// First argument is unused.
-static void sub_802EDCC(u8 spriteId1, u8 spriteId2, u8 spriteId3)
-{
-    gSprites[spriteId2].pos2.y = -40;
-    gSprites[spriteId3].pos2.y = -40;
-    gSprites[spriteId2].invisible = FALSE;
-    gSprites[spriteId3].invisible = FALSE;
-    gSprites[spriteId2].callback = sub_802EE5C;
-    gSprites[spriteId3].callback = sub_802EE5C;
-}
-
-static bool32 sub_802EE30(u8 spriteId)
-{
-    return (gSprites[spriteId].callback == sub_802EE5C);
-}
-
-static void sub_802EE5C(struct Sprite *sprite)
-{
-    int y;
-    s16 *data = sprite->data;
-
-    switch (data[0])
-    {
-    case 0:
-        data[4] = 64;
-        data[5] = sprite->pos2.y << 4;
-        data[0]++;
-    case 1:
-        data[5] += data[4];
-        data[4]++;
-        sprite->pos2.y = data[5] >> 4;
-        if (sprite->pos2.y >= 0)
-        {
-            PlaySE(SE_KON2);
-            sprite->pos2.y = 0;
-            data[0]++;
-        }
-        break;
-    case 2:
-        data[1] += 12;
-        if (data[1] >= 128)
-        {
-            PlaySE(SE_KON2);
-            data[1] = 0;
-            data[0]++;
-        }
-        y = gSineTable[data[1]];
-        sprite->pos2.y = -(y >> 4);
-        break;
-    case 3:
-        data[1] += 16;
-        if (data[1] >= 128)
-        {
-            PlaySE(SE_KON2);
-            data[1] = 0;
-            data[0]++;
-        }
-        sprite->pos2.y = -(gSineTable[data[1]] >> 5);
-        break;
-    case 4:
-        if (++data[1] > 40)
-            sprite->callback = SpriteCallbackDummy;
-        break;
-    }
-}
-
-static const u16 gPkmnJump321StartPal2[] = INCBIN_U16("graphics/link_games/pkmnjump_321start2.gbapal");
-static const u32 gPkmnJump321StartGfx2[] = INCBIN_U32("graphics/link_games/pkmnjump_321start2.4bpp.lz");
-
-static void sub_802EF50(u16 tileTag, u16 palTag)
-{
-    struct CompressedSpriteSheet sprSheet = {gPkmnJump321StartGfx2, 0xE00, 0};
-    struct SpritePalette sprPal = {gPkmnJump321StartPal2, 0};
-
-    sprSheet.tag = tileTag;
-    sprPal.tag = palTag;
-
-    LoadCompressedSpriteSheet(&sprSheet);
-    LoadSpritePalette(&sprPal);
-}
-
-static const struct OamData sOamData_82FEBDC =
-{
-    .y = 0,
-    .affineMode = ST_OAM_AFFINE_DOUBLE,
-    .objMode = ST_OAM_OBJ_NORMAL,
-    .mosaic = 0,
-    .bpp = ST_OAM_4BPP,
-    .shape = SPRITE_SHAPE(32x32),
-    .x = 0,
-    .matrixNum = 0,
-    .size = SPRITE_SIZE(32x32),
-    .tileNum = 0,
-    .priority = 0,
-    .paletteNum = 0,
-    .affineParam = 0
-};
-
-static const struct OamData sOamData_82FEBE4 =
-{
-    .y = 0,
-    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = ST_OAM_OBJ_NORMAL,
-    .mosaic = 0,
-    .bpp = ST_OAM_4BPP,
-    .shape = SPRITE_SHAPE(64x32),
-    .x = 0,
-    .matrixNum = 0,
-    .size = SPRITE_SIZE(64x32),
-    .tileNum = 0,
-    .priority = 0,
-    .paletteNum = 0,
-    .affineParam = 0
-};
-
-static const union AnimCmd sSpriteAnim_82FEBEC[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FEBF4[] =
-{
-    ANIMCMD_FRAME(16, 1),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FEBFC[] =
-{
-    ANIMCMD_FRAME(32, 1),
-    ANIMCMD_END
-};
-
-static const union AnimCmd *const sSpriteAnimTable_82FEC04[] =
-{
-    sSpriteAnim_82FEBEC,
-    sSpriteAnim_82FEBF4,
-    sSpriteAnim_82FEBFC
-};
-
-static const union AnimCmd sSpriteAnim_82FEC10[] =
-{
-    ANIMCMD_FRAME(48, 1),
-    ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FEC18[] =
-{
-    ANIMCMD_FRAME(80, 1),
-    ANIMCMD_END
-};
-
-static const union AnimCmd *const sSpriteAnimTable_82FEC20[] =
-{
-    sSpriteAnim_82FEC10,
-    sSpriteAnim_82FEC18
-};
-
-static const union AffineAnimCmd sSpriteAffineAnim_82FEC28[] =
-{
-    AFFINEANIMCMD_FRAME(256, 256, 0, 0),
-    AFFINEANIMCMD_END
-};
-
-static const union AffineAnimCmd sSpriteAffineAnim_82FEC38[] =
-{
-    AFFINEANIMCMD_FRAME(256, 256, 0, 0),
-    AFFINEANIMCMD_FRAME(16, -16, 0, 8),
-    AFFINEANIMCMD_END
-};
-
-static const union AffineAnimCmd sSpriteAffineAnim_82FEC50[] =
-{
-    AFFINEANIMCMD_FRAME(-18, 18, 0, 8),
-    AFFINEANIMCMD_END
-};
-
-static const union AffineAnimCmd sSpriteAffineAnim_82FEC60[] =
-{
-    AFFINEANIMCMD_FRAME(6, -6, 0, 8),
-    AFFINEANIMCMD_FRAME(-4, 4, 0, 8),
-    AFFINEANIMCMD_FRAME(256, 256, 0, 0),
-    AFFINEANIMCMD_END
-};
-
-static const union AffineAnimCmd *const sSpriteAffineAnimTable_82FEC80[] =
-{
-    sSpriteAffineAnim_82FEC28,
-    sSpriteAffineAnim_82FEC38,
-    sSpriteAffineAnim_82FEC50,
-    sSpriteAffineAnim_82FEC60
-};
-
-static u8 sub_802EFA8(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority)
-{
-    u8 spriteId;
-    struct SpriteTemplate sprTemplate =
-    {
-        .tileTag = 0,
-        .paletteTag = 0,
-        .oam = &sOamData_82FEBDC,
-        .anims = sSpriteAnimTable_82FEC04,
-        .images = NULL,
-        .affineAnims = sSpriteAffineAnimTable_82FEC80,
-        .callback = SpriteCallbackDummy,
-    };
-
-    sprTemplate.tileTag = tileTag;
-    sprTemplate.paletteTag = palTag;
-    spriteId = CreateSprite(&sprTemplate, x, y, subpriority);
-    return spriteId;
-}
-
-static void sub_802EFFC(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 *spriteId1, s16 *spriteId2)
-{
-    struct SpriteTemplate sprTemplate =
-    {
-        .tileTag = 0,
-        .paletteTag = 0,
-        .oam = &sOamData_82FEBE4,
-        .anims = sSpriteAnimTable_82FEC20,
-        .images = NULL,
-        .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = SpriteCallbackDummy,
-    };
-
-    sprTemplate.tileTag = tileTag;
-    sprTemplate.paletteTag = palTag;
-    *spriteId1 = CreateSprite(&sprTemplate, x - 32, y, subpriority);
-    *spriteId2 = CreateSprite(&sprTemplate, x + 32, y, subpriority);
-
-    gSprites[*spriteId1].invisible = TRUE;
-    gSprites[*spriteId2].invisible = TRUE;
-    StartSpriteAnim(&gSprites[*spriteId2], 1);
-}
diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c
deleted file mode 100644
index 029696526..000000000
--- a/src/rom_8034C54.c
+++ /dev/null
@@ -1,453 +0,0 @@
-#include "global.h"
-#include "rom_8034C54.h"
-#include "malloc.h"
-#include "decompress.h"
-#include "main.h"
-#include "battle_main.h"
-
-struct UnkStruct2
-{
-    bool8 isActive;
-    u8 firstOamId;
-    u8 field_2;
-    u8 oamCount;
-    u8 palTagIndex;
-    u8 size;
-    u8 shape;
-    u8 priority;
-    u8 xDelta;
-    u8 field_9;
-    u16 tileStart;
-    s16 x;
-    s16 y;
-    u16 tileTag;
-    u16 palTag;
-    u32 field_14;
-    s32 field_18;
-};
-
-struct UnkStruct1
-{
-    u32 count;
-    struct UnkStruct2 *array;
-};
-
-// this file's functions
-static u8 sub_8035518(u8 arg0);;
-static void sub_8034EFC(struct UnkStruct2 *arg0);
-static void sub_80350B0(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
-static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
-static void sub_80352C0(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
-static bool32 SharesTileWithAnyActive(u32 id);
-static bool32 SharesPalWithAnyActive(u32 id);
-static void sub_8035648(void);
-
-// iwram
-static s32 gUnknown_03000DD4;
-static s32 gUnknown_03000DD8;
-static s32 gUnknown_03000DDC;
-
-// ewram
-static EWRAM_DATA struct UnkStruct1 *gUnknown_02022E10 = {0};
-
-// const rom data
-static const u8 gUnknown_082FF1C8[][4] =
-{
-    {0x01, 0x04, 0x10, 0x40},
-    {0x02, 0x04, 0x08, 0x20},
-    {0x02, 0x04, 0x08, 0x20},
-    {0x00, 0x00, 0x00, 0x00}
-};
-
-// code
-bool32 sub_8034C54(u32 count)
-{
-    u32 i;
-
-    if (gUnknown_02022E10 != NULL)
-        sub_8034CC8();
-
-    gUnknown_02022E10 = Alloc(sizeof(*gUnknown_02022E10));
-    if (gUnknown_02022E10 == NULL)
-        return FALSE;
-
-    gUnknown_02022E10->array = Alloc(sizeof(struct UnkStruct2) * count);
-    if (gUnknown_02022E10->array == NULL)
-    {
-        Free(gUnknown_02022E10);
-        return FALSE;
-    }
-
-    gUnknown_02022E10->count = count;
-    for (i = 0; i < count; i++)
-    {
-        gUnknown_02022E10->array[i].isActive = FALSE;
-        gUnknown_02022E10->array[i].firstOamId = 0xFF;
-    }
-
-    return TRUE;
-}
-
-void sub_8034CC8(void)
-{
-    if (gUnknown_02022E10 != NULL)
-    {
-        if (gUnknown_02022E10->array != NULL)
-        {
-            u32 i;
-
-            for (i = 0; i < gUnknown_02022E10->count; i++)
-                sub_80353DC(i);
-
-            Free(gUnknown_02022E10->array);
-        }
-
-        FREE_AND_SET_NULL(gUnknown_02022E10);
-    }
-}
-
-bool32 sub_8034D14(u32 id, s32 arg1, const struct UnkStruct3 *arg2)
-{
-    u32 i;
-
-    if (gUnknown_02022E10 == NULL)
-        return FALSE;
-    if (gUnknown_02022E10->array[id].isActive)
-        return FALSE;
-
-    gUnknown_02022E10->array[id].firstOamId = sub_8035518(arg2->field_1);
-    if (gUnknown_02022E10->array[id].firstOamId == 0xFF)
-        return FALSE;
-
-    gUnknown_02022E10->array[id].tileStart = GetSpriteTileStartByTag(arg2->spriteSheet->tag);
-    if (gUnknown_02022E10->array[id].tileStart == 0xFFFF)
-    {
-        if (arg2->spriteSheet->size != 0)
-        {
-            gUnknown_02022E10->array[id].tileStart = LoadSpriteSheet(arg2->spriteSheet);
-        }
-        else
-        {
-            struct CompressedSpriteSheet compSpriteSheet;
-
-            compSpriteSheet = *(struct CompressedSpriteSheet*)(arg2->spriteSheet);
-            compSpriteSheet.size = GetDecompressedDataSize(arg2->spriteSheet->data);
-            gUnknown_02022E10->array[id].tileStart = LoadCompressedSpriteSheet(&compSpriteSheet);
-        }
-
-        if (gUnknown_02022E10->array[id].tileStart == 0xFFFF)
-            return FALSE;
-    }
-
-    gUnknown_02022E10->array[id].palTagIndex = IndexOfSpritePaletteTag(arg2->spritePal->tag);
-    if (gUnknown_02022E10->array[id].palTagIndex == 0xFF)
-        gUnknown_02022E10->array[id].palTagIndex = LoadSpritePalette(arg2->spritePal);
-
-    gUnknown_02022E10->array[id].field_2 = arg2->field_0_0;
-    gUnknown_02022E10->array[id].oamCount = arg2->field_1;
-    gUnknown_02022E10->array[id].x = arg2->x;
-    gUnknown_02022E10->array[id].y = arg2->y;
-    gUnknown_02022E10->array[id].shape = arg2->shape;
-    gUnknown_02022E10->array[id].size = arg2->size;
-    gUnknown_02022E10->array[id].priority = arg2->priority;
-    gUnknown_02022E10->array[id].xDelta = arg2->xDelta;
-    gUnknown_02022E10->array[id].field_9 = sub_80355F8(arg2->shape, arg2->size);
-    gUnknown_02022E10->array[id].tileTag = arg2->spriteSheet->tag;
-    gUnknown_02022E10->array[id].palTag = arg2->spritePal->tag;
-    gUnknown_02022E10->array[id].isActive = TRUE;
-    gUnknown_02022E10->array[id].field_14 = 1;
-
-    for (i = 1; i < arg2->field_1; i++)
-        gUnknown_02022E10->array[id].field_14 *= 10;
-
-    sub_8034EFC(&gUnknown_02022E10->array[id]);
-    sub_8035044(id, arg1);
-
-    return TRUE;
-}
-
-static void sub_8034EFC(struct UnkStruct2 *arg0)
-{
-    u32 i;
-    u32 oamId = arg0->firstOamId;
-    u32 x = arg0->x;
-    u32 oamCount = arg0->oamCount + 1;
-
-    CpuFill16(0, &gMain.oamBuffer[oamId], sizeof(struct OamData) * oamCount);
-    for (i = 0, oamId = arg0->firstOamId; i < oamCount; i++, oamId++)
-    {
-        gMain.oamBuffer[oamId].y = arg0->y;
-        gMain.oamBuffer[oamId].x = x;
-        gMain.oamBuffer[oamId].shape = arg0->shape;
-        gMain.oamBuffer[oamId].size = arg0->size;
-        gMain.oamBuffer[oamId].tileNum = arg0->tileStart;
-        gMain.oamBuffer[oamId].priority = arg0->priority;
-        gMain.oamBuffer[oamId].paletteNum = arg0->palTagIndex;
-
-        x += arg0->xDelta;
-    }
-
-    oamId--;
-    gMain.oamBuffer[oamId].x = arg0->x - arg0->xDelta;
-    gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
-    gMain.oamBuffer[oamId].tileNum = arg0->tileStart + (arg0->field_9 * 10);
-}
-
-void sub_8035044(u32 id, s32 arg1)
-{
-    bool32 r2;
-
-    if (gUnknown_02022E10 == NULL)
-        return;
-    if (!gUnknown_02022E10->array[id].isActive)
-        return;
-
-    gUnknown_02022E10->array[id].field_18 = arg1;
-    if (arg1 < 0)
-    {
-        r2 = TRUE;
-        arg1 *= -1;
-    }
-    else
-    {
-        r2 = FALSE;
-    }
-
-    switch (gUnknown_02022E10->array[id].field_2)
-    {
-    case 0:
-    default:
-        sub_80350B0(&gUnknown_02022E10->array[id], arg1, r2);
-        break;
-    case 1:
-        sub_8035164(&gUnknown_02022E10->array[id], arg1, r2);
-        break;
-    case 2:
-        sub_80352C0(&gUnknown_02022E10->array[id], arg1, r2);
-        break;
-    }
-}
-
-static void sub_80350B0(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
-{
-    u32 r5 = arg0->field_14;
-    u32 oamId = arg0->firstOamId;
-
-    while (r5 != 0)
-    {
-        u32 r4 = arg1 / r5;
-        arg1 -= (r4 * r5);
-        r5 /= 10;
-
-        gMain.oamBuffer[oamId].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
-        oamId++;
-    }
-
-    if (arg2)
-        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
-    else
-        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
-}
-
-static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
-{
-    u32 r5 = arg0->field_14;
-    gUnknown_03000DD4 = arg0->firstOamId;
-    gUnknown_03000DD8 = 0;
-    gUnknown_03000DDC = -1;
-
-    while (r5 != 0)
-    {
-        u32 r4 = arg1 / r5;
-        arg1 -= (r4 * r5);
-        r5 /= 10;
-
-        if (r4 != 0 || gUnknown_03000DDC != -1 || r5 == 0)
-        {
-            gMain.oamBuffer[gUnknown_03000DD4].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
-            gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_OFF;
-
-            if (gUnknown_03000DDC == -1)
-                gUnknown_03000DDC = gUnknown_03000DD8;
-        }
-        else
-        {
-            gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_ERASE;
-        }
-
-        gUnknown_03000DD4++;
-        gUnknown_03000DD8++;
-    }
-
-    if (arg2)
-    {
-        gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_OFF;
-        gMain.oamBuffer[gUnknown_03000DD4].x = arg0->x + ((gUnknown_03000DDC - 1) * arg0->xDelta);
-    }
-    else
-    {
-        gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_ERASE;
-    }
-}
-
-static void sub_80352C0(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
-{
-    u32 r5 = arg0->field_14;
-    u32 oamId = arg0->firstOamId;
-    u32 var_28 = 0;
-    s32 r9 = 0;
-
-    while (r5 != 0)
-    {
-        u32 r4 = arg1 / r5;
-        arg1 -= (r4 * r5);
-        r5 /= 10;
-
-        if (r4 != 0 || var_28 != 0 || r5 == 0)
-        {
-            var_28 = 1;
-            gMain.oamBuffer[oamId].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
-            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
-
-            oamId++;
-            r9++;
-        }
-    }
-
-    while (r9 < arg0->oamCount)
-    {
-        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
-        oamId++;
-        r9++;
-    }
-
-    if (arg2)
-        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
-    else
-        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
-}
-
-void sub_80353DC(u32 id)
-{
-    s32 oamId, oamCount, i;
-
-    if (gUnknown_02022E10 == NULL)
-        return;
-    if (!gUnknown_02022E10->array[id].isActive)
-        return;
-
-    oamCount = gUnknown_02022E10->array[id].oamCount + 1;
-    oamId = gUnknown_02022E10->array[id].firstOamId;
-
-    for (i = 0; i < oamCount; i++, oamId++)
-        gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
-
-    if (!SharesTileWithAnyActive(id))
-        FreeSpriteTilesByTag(gUnknown_02022E10->array[id].tileTag);
-    if (!SharesPalWithAnyActive(id))
-        FreeSpritePaletteByTag(gUnknown_02022E10->array[id].palTag);
-
-    gUnknown_02022E10->array[id].isActive = FALSE;
-}
-
-void sub_803547C(u32 id, bool32 arg1)
-{
-    s32 oamId, oamCount, i;
-
-    if (gUnknown_02022E10 == NULL)
-        return;
-    if (!gUnknown_02022E10->array[id].isActive)
-        return;
-
-    oamCount = gUnknown_02022E10->array[id].oamCount + 1;
-    oamId = gUnknown_02022E10->array[id].firstOamId;
-    if (arg1)
-    {
-        for (i = 0; i < oamCount; i++, oamId++)
-            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
-    }
-    else
-    {
-        for (i = 0; i < oamCount; i++, oamId++)
-            gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
-
-        sub_8035044(id, gUnknown_02022E10->array[id].field_18);
-    }
-}
-
-static u8 sub_8035518(u8 arg0)
-{
-    u32 i;
-    u16 oamCount = 64;
-
-    for (i = 0; i < gUnknown_02022E10->count; i++)
-    {
-        if (!gUnknown_02022E10->array[i].isActive)
-        {
-            if (gUnknown_02022E10->array[i].firstOamId != 0xFF && gUnknown_02022E10->array[i].oamCount <= arg0)
-                return gUnknown_02022E10->array[i].firstOamId;
-        }
-        else
-        {
-            oamCount += 1 + gUnknown_02022E10->array[i].oamCount;
-        }
-    }
-
-    if (oamCount + arg0 + 1 > 128)
-        return 0xFF;
-    else
-        return oamCount;
-}
-
-static bool32 SharesTileWithAnyActive(u32 id)
-{
-    u32 i;
-
-    for (i = 0; i < gUnknown_02022E10->count; i++)
-    {
-        if (gUnknown_02022E10->array[i].isActive && i != id
-            && gUnknown_02022E10->array[i].tileTag == gUnknown_02022E10->array[id].tileTag)
-        {
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
-static bool32 SharesPalWithAnyActive(u32 id)
-{
-    u32 i;
-
-    for (i = 0; i < gUnknown_02022E10->count; i++)
-    {
-        if (gUnknown_02022E10->array[i].isActive && i != id
-            && gUnknown_02022E10->array[i].palTag == gUnknown_02022E10->array[id].palTag)
-        {
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
-u8 sub_80355F8(u32 shape, u32 size)
-{
-    return gUnknown_082FF1C8[shape][size];
-}
-
-static void sub_8035608(void)
-{
-    u8 spriteId;
-
-    ResetSpriteData();
-    spriteId = CreateSprite(&gUnknown_0831AC88, 0, 0, 0);
-    gSprites[spriteId].invisible = TRUE;
-    SetMainCallback2(sub_8035648);
-}
-
-static void sub_8035648(void)
-{
-    AnimateSprites();
-    BuildOamBuffer();
-}
diff --git a/src/rom_81520A8.c b/src/rom_81520A8.c
index f6d14d49c..8b10d44d0 100644
--- a/src/rom_81520A8.c
+++ b/src/rom_81520A8.c
@@ -2,7 +2,7 @@
 #include "rom_81520A8.h"
 #include "malloc.h"
 #include "main.h"
-#include "rom_8034C54.h"
+#include "digit_obj_util.h"
 
 static EWRAM_DATA struct
 {
@@ -138,7 +138,7 @@ static bool32 sub_81523F4(struct UnkStruct_81520A8 *structPtr, u8 arg1)
         return FALSE;
 
     structPtr->unk18 = arg1;
-    structPtr->tileNum = (sub_80355F8(structPtr->oam.shape, structPtr->oam.size) * arg1) + tileStart;
+    structPtr->tileNum = (GetTilesPerImage(structPtr->oam.shape, structPtr->oam.size) * arg1) + tileStart;
     return TRUE;
 }
 
diff --git a/sym_bss.txt b/sym_bss.txt
index 1c58146f6..aad8c8f14 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -14,7 +14,7 @@
 	.include "src/dodrio_berry_picking.o"
 	.include "src/rtc.o"
 	.include "src/main_menu.o"
-	.include "src/rom_8034C54.o"
+	.include "src/digit_obj_util.o"
 	.include "src/egg_hatch.o"
 	.include "src/berry_blender.o"
 	.include "src/play_time.o"
diff --git a/sym_ewram.txt b/sym_ewram.txt
index c5cb123c5..d00f7953c 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -23,7 +23,7 @@
 	.include "src/pokemon_jump.o"
 	.include "src/main_menu.o"
 	.include "src/battle_controllers.o"
-	.include "src/rom_8034C54.o"
+	.include "src/digit_obj_util.o"
 	.include "src/battle_main.o"
 	.include "src/pokemon.o"
 	.include "src/random.o"