summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-04-10 14:02:53 -0400
committerGitHub <noreply@github.com>2020-04-10 14:02:53 -0400
commit8188615db8e1e84dbd14bc74eb2ca096c69ea14b (patch)
tree31800c539b01f87076ffd6bd6c0dbc85e3079f4b /include
parent384a7cdef8800210f734208e39b0c32320e74079 (diff)
parente485857df303cde99b16e717132945631cbdcade (diff)
Merge pull request #1018 from GriffinRichards/sync-util
Sync link game util files
Diffstat (limited to 'include')
-rw-r--r--include/digit_obj_util.h26
-rw-r--r--include/minigame_countdown.h7
-rw-r--r--include/pokemon_jump.h2
-rw-r--r--include/rom_8034C54.h26
4 files changed, 33 insertions, 28 deletions
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