Document pokemon jump

This commit is contained in:
GriffinR 2021-02-25 04:37:25 -05:00
parent 06ae5a37e2
commit 117b90a261
19 changed files with 2088 additions and 1824 deletions

View File

Before

Width:  |  Height:  |  Size: 532 B

After

Width:  |  Height:  |  Size: 532 B

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 318 B

View File

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 309 B

View File

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 325 B

View File

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 243 B

View File

@ -346,7 +346,7 @@ $(FONTGFXDIR)/keypad_icons.4bpp: %.4bpp: %.png
graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
$(GFX) $< $@ -num_colors 224 $(GFX) $< $@ -num_colors 224
graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 63 $(GFX) $< $@ -num_tiles 63
graphics/pokenav/region_map.8bpp: %.8bpp: %.png graphics/pokenav/region_map.8bpp: %.8bpp: %.png

View File

@ -175,13 +175,13 @@ struct Pokedex
/*0x44*/ u8 seen[DEX_FLAGS_NO]; /*0x44*/ u8 seen[DEX_FLAGS_NO];
}; };
struct PokemonJumpResults struct PokemonJumpRecords
{ {
u16 jumpsInRow; u16 jumpsInRow;
u16 field2; u16 unused1; // Set to 0, never read
u16 excellentsInRow; u16 excellentsInRow;
u16 field6; u16 gamesWithMaxPlayers;
u32 field8; u32 unused2; // Set to 0, never read
u32 bestJumpScore; u32 bestJumpScore;
}; };
@ -478,7 +478,7 @@ struct SaveBlock2
/*0xB0*/ struct PlayersApprentice playerApprentice; /*0xB0*/ struct PlayersApprentice playerApprentice;
/*0xDC*/ struct Apprentice apprentices[APPRENTICE_COUNT]; /*0xDC*/ struct Apprentice apprentices[APPRENTICE_COUNT];
/*0x1EC*/ struct BerryCrush berryCrush; /*0x1EC*/ struct BerryCrush berryCrush;
/*0x1FC*/ struct PokemonJumpResults pokeJump; /*0x1FC*/ struct PokemonJumpRecords pokeJump;
/*0x20C*/ struct BerryPickingResults berryPick; /*0x20C*/ struct BerryPickingResults berryPick;
/*0x21C*/ struct RankingHall1P hallRecords1P[HALL_FACILITIES_COUNT][2][3]; // From record mixing. /*0x21C*/ struct RankingHall1P hallRecords1P[HALL_FACILITIES_COUNT][2][3]; // From record mixing.
/*0x57C*/ struct RankingHall2P hallRecords2P[2][3]; // From record mixing. /*0x57C*/ struct RankingHall2P hallRecords2P[2][3]; // From record mixing.

View File

@ -3,10 +3,10 @@
#include "main.h" #include "main.h"
void StartPokemonJump(u16 monId, MainCallback callback); void StartPokemonJump(u16 partyId, MainCallback exitCallback);
bool32 IsSpeciesAllowedInPokemonJump(u16 species); bool32 IsSpeciesAllowedInPokemonJump(u16 species);
void IsPokemonJumpSpeciesInParty(void); void IsPokemonJumpSpeciesInParty(void);
void ResetPokeJumpResults(void); void ResetPokemonJumpRecords(void);
void ShowPokemonJumpRecords(void); void ShowPokemonJumpRecords(void);
#endif // GUARD_POKEMON_JUMP_H #endif // GUARD_POKEMON_JUMP_H

View File

@ -51,7 +51,7 @@ extern const u8 EventScript_ResetAllMapFlags[];
// this file's functions // this file's functions
static void ClearFrontierRecord(void); static void ClearFrontierRecord(void);
static void WarpToTruck(void); static void WarpToTruck(void);
static void ResetMiniGamesResults(void); static void ResetMiniGamesRecords(void);
// EWRAM vars // EWRAM vars
EWRAM_DATA bool8 gDifferentSaveFile = FALSE; EWRAM_DATA bool8 gDifferentSaveFile = FALSE;
@ -196,7 +196,7 @@ void NewGameInitData(void)
ResetLotteryCorner(); ResetLotteryCorner();
WarpToTruck(); WarpToTruck();
ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags); ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags);
ResetMiniGamesResults(); ResetMiniGamesRecords();
InitUnionRoomChatRegisteredTexts(); InitUnionRoomChatRegisteredTexts();
InitLilycoveLady(); InitLilycoveLady();
ResetAllApprenticeData(); ResetAllApprenticeData();
@ -208,10 +208,10 @@ void NewGameInitData(void)
ResetContestLinkResults(); ResetContestLinkResults();
} }
static void ResetMiniGamesResults(void) static void ResetMiniGamesRecords(void)
{ {
CpuFill16(0, &gSaveBlock2Ptr->berryCrush, sizeof(struct BerryCrush)); CpuFill16(0, &gSaveBlock2Ptr->berryCrush, sizeof(struct BerryCrush));
SetBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount, 0); SetBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount, 0);
ResetPokeJumpResults(); ResetPokemonJumpRecords();
CpuFill16(0, &gSaveBlock2Ptr->berryPick, sizeof(struct BerryPickingResults)); CpuFill16(0, &gSaveBlock2Ptr->berryPick, sizeof(struct BerryPickingResults));
} }

File diff suppressed because it is too large Load Diff