summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/bg.h14
-rw-r--r--include/global.h26
-rw-r--r--include/graphics.h12
-rw-r--r--include/pokemon_jump.h9
-rw-r--r--include/pokenav.h11
-rw-r--r--include/sprite.h1
-rw-r--r--include/strings.h10
-rw-r--r--include/trainer_hill.h2
8 files changed, 62 insertions, 23 deletions
diff --git a/include/bg.h b/include/bg.h
index ad5acd0ae..3c7eee292 100644
--- a/include/bg.h
+++ b/include/bg.h
@@ -27,13 +27,13 @@ enum
struct BgTemplate
{
- u32 bg:2; // 0x1, 0x2 -> 0x3
- u32 charBaseIndex:2; // 0x4, 0x8 -> 0xC
- u32 mapBaseIndex:5; // 0x10, 0x20, 0x40, 0x80, 0x100 -> 0x1F0
- u32 screenSize:2; // 0x200, 0x400 -> 0x600
- u32 paletteMode:1; // 0x800
- u32 priority:2; // 0x1000, 0x2000 > 0x3000
- u32 baseTile:10;
+ u16 bg:2; // 0x1, 0x2 -> 0x3
+ u16 charBaseIndex:2; // 0x4, 0x8 -> 0xC
+ u16 mapBaseIndex:5; // 0x10, 0x20, 0x40, 0x80, 0x100 -> 0x1F0
+ u16 screenSize:2; // 0x200, 0x400 -> 0x600
+ u16 paletteMode:1; // 0x800
+ u16 priority:2; // 0x1000, 0x2000 > 0x3000
+ u16 baseTile:10;
};
void ResetBgs(void);
diff --git a/include/global.h b/include/global.h
index a76d6e4e3..14377d8bb 100644
--- a/include/global.h
+++ b/include/global.h
@@ -19,16 +19,23 @@
#if defined (__APPLE__) || defined (__CYGWIN__) || defined (_MSC_VER)
#define _(x) x
#define __(x) x
-#define INCBIN_U8 {0}
-#define INCBIN_U16 {0}
-#define INCBIN_U32 {0}
-#define INCBIN_S8 {0}
-#define INCBIN_S16 {0}
-#define INCBIN_S32 {0}
+
+// Fool CLion IDE
+#define INCBIN(x) {0}
+#define INCBIN_U8 INCBIN
+#define INCBIN_U16 INCBIN
+#define INCBIN_U32 INCBIN
+#define INCBIN_S8 INCBIN
+#define INCBIN_S16 INCBIN
+#define INCBIN_S32 INCBIN
#endif // IDE support
#define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0]))
+// GameFreak used a macro called "NELEMS", as evidenced by
+// AgbAssert calls.
+#define NELEMS(arr) (sizeof(arr)/sizeof(*(arr)))
+
#define SWAP(a, b, temp) \
{ \
temp = a; \
@@ -163,18 +170,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..d1d99cc8f 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[];
@@ -4947,4 +4950,11 @@ extern const u16 gUsePokeblockCondition_Pal[];
extern const u32 gUnknown_08DE34B8[];
extern const u16 gUnknown_08DE3398[];
+// Pokenav
+extern const u32 gPokenavMessageBox_Gfx[];
+extern const u32 gPokenavMessageBox_Tilemap[];
+extern const u16 gPokenavMessageBox_Pal[];
+extern const u32 gPokenavOptions_Gfx[];
+extern const u16 gPokenavOptions_Pal[];
+
#endif //GUARD_GRAPHICS_H
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..31cb5cb17 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;
@@ -138,6 +138,8 @@ void sub_81C7B40(void);
struct Sprite *PauseSpinningPokenavSprite(void);
void ResumeSpinningPokenavSprite(void);
void sub_81C7E14(u32 arg0);
+void sub_81C7FC4(u32 arg0, bool32 arg1);
+void sub_81C7880(void);
void sub_81C7990(u32 a0, u16 a1);
// pokenav_unk_1.c
@@ -150,8 +152,15 @@ u32 sub_81C941C(void);
void sub_81C9430(void);
int sub_81C9894(void);
const u8 *sub_81CAF78(int index, u8 *arg1);
+int sub_81C98A4(void);
+int sub_81C98B4(void);
+u16 sub_81C98C4(void);
// pokenav_unk_2.c
+bool32 sub_81C9924(void);
+bool32 sub_81C9940(void);
+void sub_81C9990(s32 ltIdx);
+bool32 sub_81C99C0(void);
void sub_81C99D4(void);
void sub_81CAADC(void);
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..f2d3f23ad 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[];
@@ -2760,12 +2766,16 @@ extern const u8 gUnknown_085EBE06[];
extern const u8 gUnknown_085EBE19[];
extern const u8 gUnknown_085EBE2D[];
extern const u8 gUnknown_085EBE41[];
+extern const u8 gText_NoRibbonWinners[];
// pokenav_unk_4
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[];
diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index ad2713316..e605ac654 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -24,7 +24,7 @@ const struct WarpEvent* sub_81D6134(u8 warpEventId);
u16 LocalIdToHillTrainerId(u8 localId);
bool8 GetHillTrainerFlag(u8 eventObjectId);
void SetHillTrainerFlag(void);
-const u8 *sub_81D62AC(void);
+const u8 *GetTrainerHillTrainerScript(void);
void FillHillTrainerParty(void);
void FillHillTrainersParties(void);
u32 sub_81D63C4(void);
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 10:19:04 +0000