summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/global.h7
-rw-r--r--include/graphics.h5
-rw-r--r--include/pokemon_jump.h9
-rw-r--r--include/pokenav.h2
-rw-r--r--include/sprite.h1
-rw-r--r--include/strings.h9
6 files changed, 24 insertions, 9 deletions
diff --git a/include/global.h b/include/global.h
index a76d6e4e3..eb18682e9 100644
--- a/include/global.h
+++ b/include/global.h
@@ -163,18 +163,17 @@ struct Pokedex
/*0x44*/ u8 seen[DEX_FLAGS_NO];
};
-struct PokemonJumpResults // possibly used in the game itself?
+struct PokemonJumpResults
{
u16 jumpsInRow;
u16 field2;
u16 excellentsInRow;
u16 field6;
- u16 field8;
- u16 fieldA;
+ u32 field8;
u32 bestJumpScore;
};
-struct BerryPickingResults // possibly used in the game itself? Size may be wrong as well
+struct BerryPickingResults
{
u32 bestScore;
u16 berriesPicked;
diff --git a/include/graphics.h b/include/graphics.h
index bbb70590d..c39ad60b0 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4030,6 +4030,9 @@ extern const u32 gPokenavLeftHeaderBeauty_Gfx[];
extern const u32 gPokenavLeftHeaderCute_Gfx[];
extern const u32 gPokenavLeftHeaderSmart_Gfx[];
extern const u32 gPokenavLeftHeaderTough_Gfx[];
+extern const u16 gUnknown_08DDE010[];
+extern const u32 gUnknown_08DDE030[];
+extern const u32 gUnknown_08DDE12C[];
extern const u32 gPageInfoTilemap[];
extern const u32 gUnknown_08D98CC8[];
@@ -4083,7 +4086,7 @@ extern const u32 gContestConfetti_Pal[];
extern const u32 gUnknown_08C093F0[];
extern const u32 gSubstituteDollTilemap[];
extern const u32 gSubstituteDollGfx[];
-extern const u16 gSubstituteDollPal[];
+extern const u32 gSubstituteDollPal[];
extern const u32 gHealthboxSinglesPlayerGfx[];
extern const u32 gHealthboxSinglesOpponentGfx[];
extern const u32 gHealthboxDoublesPlayerGfx[];
diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h
index d137c37b2..28b19f9b1 100644
--- a/include/pokemon_jump.h
+++ b/include/pokemon_jump.h
@@ -3,9 +3,12 @@
#include "main.h"
-void sub_802EB24(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4);
-bool32 sub_802EB84(void);
void sub_802A9A8(u16 monId, MainCallback callback);
bool32 sub_802C908(u16 species);
+void sub_802C920(void);
+void ResetPokeJumpResults(void);
+void sub_802E3C4(void);
+void sub_802EB24(s16 tileTag, s16 palTag, s16 x, s16 y, u8 subpriority);
+bool32 sub_802EB84(void);
-#endif //GUARD_POKEMON_JUMP_H
+#endif // GUARD_POKEMON_JUMP_H
diff --git a/include/pokenav.h b/include/pokenav.h
index 69a9f1f58..380e61dda 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -11,7 +11,7 @@ struct PokenavSub18
{
u16 unk0;
u16 unk2;
- struct
+ struct PokenavMonList
{
u8 boxId;
u8 monId;
diff --git a/include/sprite.h b/include/sprite.h
index 32bdd9c55..9753837fd 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -275,6 +275,7 @@ void FreeSpriteOamMatrix(struct Sprite *sprite);
void DestroySpriteAndFreeResources(struct Sprite *sprite);
void sub_800142C(u32 a1, u32 a2, u16 *a3, u16 a4, u32 a5);
void AnimateSprite(struct Sprite *sprite);
+void sub_8007E18(struct Sprite* sprite, s16 a2, s16 a3);
void StartSpriteAnim(struct Sprite *sprite, u8 animNum);
void StartSpriteAnimIfDifferent(struct Sprite *sprite, u8 animNum);
void SeekSpriteAnim(struct Sprite *sprite, u8 animCmdIndex);
diff --git a/include/strings.h b/include/strings.h
index d1a90cfaa..97285b051 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2737,6 +2737,12 @@ extern const u8 gText_CommunicationStandby4[];
extern const u8 gText_AwesomeWonF701F700[];
extern const u8 gText_FilledStorageSpace2[];
extern const u8 gText_CantHoldMore[];
+extern const u8 gText_SpacePoints2[];
+extern const u8 gText_SpaceTimes3[];
+extern const u8 gText_PkmnJumpRecords[];
+extern const u8 gText_JumpsInARow[];
+extern const u8 gText_BestScore2[];
+extern const u8 gText_ExcellentsInARow[];
// Pokenav Match Call
extern const u8 gText_CallCantBeMadeHere[];
@@ -2766,6 +2772,9 @@ extern const u8 gUnknown_085EC017[];
extern const u8 gUnknown_085EC01C[];
extern const u8 gUnknown_085EC022[];
+// pokenav_unk_10
+extern const u8 gText_RibbonsF700[];
+
// use_pokeblock
extern const u8 gText_Coolness[];
extern const u8 gText_Toughness[];