8 files changed, 38 insertions, 32 deletions
diff --git a/include/constants/global.h b/include/constants/global.h
index 7c96de511..c7063d71c 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -67,6 +67,7 @@
 #define FRONTIER_DOUBLES_PARTY_SIZE 4
 #define FRONTIER_MULTI_PARTY_SIZE   2
 #define MAX_FRONTIER_PARTY_SIZE     FRONTIER_DOUBLES_PARTY_SIZE
+#define UNION_ROOM_PARTY_SIZE       2
 
 // string lengths
 #define ITEM_NAME_LENGTH 14
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/field_player_avatar.h b/include/field_player_avatar.h
index 5e5a2361f..1dbe171bc 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -48,7 +48,7 @@ bool8 PartyHasMonWithSurf(void);
 bool8 IsPlayerFacingSurfableFishableWater(void);
 bool8 IsPlayerSurfingNorth(void);
 void sub_808C228(u8 direction);
-u8 sub_808BCD0(void);
+u8 GetPlayerAvatarFlags(void);
 void sub_808B578(void);
 u8 GetFRLGAvatarGraphicsIdByGender(u8);
 u8 GetRSAvatarGraphicsIdByGender(u8);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index af2be9c77..2e451a368 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -304,7 +304,7 @@ enum
 struct PlayerAvatar
 {
     /*0x00*/ u8 flags;
-    /*0x01*/ u8 unk1; // used to be named bike, but its definitely not that. seems to be some transition flags
+    /*0x01*/ u8 transitionFlags; // used to be named bike, but its definitely not that. seems to be some transition flags
     /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
     /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
     /*0x04*/ u8 spriteId;
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/party_menu.h b/include/party_menu.h
index 126931762..7f51d08c9 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -24,8 +24,8 @@ extern struct PartyMenu gPartyMenu;
 extern bool8 gPartyMenuUseExitCallback;
 extern u8 gSelectedMonPartyId;
 extern MainCallback gPostMenuFieldCallback;
-extern u8 gSelectedOrderFromParty[4];
-extern u8 gBattlePartyCurrentOrder[3];
+extern u8 gSelectedOrderFromParty[MAX_FRONTIER_PARTY_SIZE];
+extern u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2];
 
 extern void (*gItemUseCB)(u8, TaskFunc);
 
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