summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-02-28 11:19:02 -0500
committerGitHub <noreply@github.com>2021-02-28 11:19:02 -0500
commitcbc7a72814c3425a5d0ad2b8c9a362320da0e8c2 (patch)
treeebbccf614490d0c04c126bb563ef75b51f87fd66 /include
parent6c07031c85e8911e36530d46b7721ef2bb063f60 (diff)
parent3f5936239785c8dae923e1f5c4bb91492e67cb5a (diff)
Merge pull request #1346 from GriffinRichards/doc-pokejump
Document pokemon jump
Diffstat (limited to 'include')
-rw-r--r--include/global.h10
-rw-r--r--include/pokemon_jump.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/include/global.h b/include/global.h
index 3d3ea0229..1992ff819 100644
--- a/include/global.h
+++ b/include/global.h
@@ -175,13 +175,13 @@ struct Pokedex
/*0x44*/ u8 seen[DEX_FLAGS_NO];
};
-struct PokemonJumpResults
+struct PokemonJumpRecords
{
u16 jumpsInRow;
- u16 field2;
+ u16 unused1; // Set to 0, never read
u16 excellentsInRow;
- u16 field6;
- u32 field8;
+ u16 gamesWithMaxPlayers;
+ u32 unused2; // Set to 0, never read
u32 bestJumpScore;
};
@@ -478,7 +478,7 @@ struct SaveBlock2
/*0xB0*/ struct PlayersApprentice playerApprentice;
/*0xDC*/ struct Apprentice apprentices[APPRENTICE_COUNT];
/*0x1EC*/ struct BerryCrush berryCrush;
- /*0x1FC*/ struct PokemonJumpResults pokeJump;
+ /*0x1FC*/ struct PokemonJumpRecords pokeJump;
/*0x20C*/ struct BerryPickingResults berryPick;
/*0x21C*/ struct RankingHall1P hallRecords1P[HALL_FACILITIES_COUNT][2][3]; // From record mixing.
/*0x57C*/ struct RankingHall2P hallRecords2P[2][3]; // From record mixing.
diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h
index 91733b385..3aaa4fafb 100644
--- a/include/pokemon_jump.h
+++ b/include/pokemon_jump.h
@@ -3,10 +3,10 @@
#include "main.h"
-void StartPokemonJump(u16 monId, MainCallback callback);
+void StartPokemonJump(u16 partyId, MainCallback exitCallback);
bool32 IsSpeciesAllowedInPokemonJump(u16 species);
void IsPokemonJumpSpeciesInParty(void);
-void ResetPokeJumpResults(void);
+void ResetPokemonJumpRecords(void);
void ShowPokemonJumpRecords(void);
#endif // GUARD_POKEMON_JUMP_H