ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-25 13:45:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1044 from DizzyEggg/sss

Browse Source 
Document pokemon summary screen
This commit is contained in:
PikalaxALT 2020-05-19 13:30:42 -04:00 committed by GitHub
commit 3c4b9dfacc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 805 additions and 867 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/interface/unk_tilemap.bin → graphics/interface/appealjam_tilemap.bin
View File

0
graphics/interface/unk_tilemap2.bin → graphics/interface/status_tilemap.bin
View File

6
include/graphics.h
View File

@ -4048,11 +4048,11 @@ extern const u32 gMoveTypes_Pal[];
extern const u32 gStatusScreenBitmap[]; extern const u32 gStatusScreenBitmap[];
extern const u16 gSummaryScreenPowAcc_Tilemap[]; extern const u16 gSummaryScreenPowAcc_Tilemap[];
extern const u16 gUnknown_08DC3C34[]; extern const u16 gSummaryScreenAppealJam_Tilemap[];
extern const u32 gMoveTypes_Gfx[]; extern const u32 gMoveTypes_Gfx[];
extern const u32 gMoveSelectorBitmap[]; extern const u32 gSummaryMoveSelect_Gfx[];
extern const u32 gUnknown_08D97CF4[]; extern const u32 gSummaryMoveSelect_Pal[];
extern const u32 gStatusGfx_Icons[]; extern const u32 gStatusGfx_Icons[];
extern const u32 gStatusPal_Icons[]; extern const u32 gStatusPal_Icons[];

3
include/pokemon_summary_screen.h
View File

@ -20,7 +20,7 @@ void SummaryScreen_DestroyUnknownTask(void);
enum PokemonSummaryScreenMode enum PokemonSummaryScreenMode
{ {
PSS_MODE_NORMAL, PSS_MODE_NORMAL,
PSS_MODE_UNK1, PSS_MODE_LOCK_MOVES,
PSS_MODE_BOX, PSS_MODE_BOX,
PSS_MODE_SELECT_MOVE, PSS_MODE_SELECT_MOVE,
}; };
@ -31,6 +31,7 @@ enum PokemonSummaryScreenPage
PSS_PAGE_SKILLS, PSS_PAGE_SKILLS,
PSS_PAGE_BATTLE_MOVES, PSS_PAGE_BATTLE_MOVES,
PSS_PAGE_CONTEST_MOVES, PSS_PAGE_CONTEST_MOVES,
PSS_PAGE_COUNT,
}; };
#endif // GUARD_POKEMON_SUMMARY_SCREEN_H #endif // GUARD_POKEMON_SUMMARY_SCREEN_H

9
src/graphics.c
View File

@ -1144,13 +1144,12 @@ const u32 gStatusPal_Icons[] = INCBIN_U32("graphics/interface/status_icons.gbapa
const u32 gMoveTypes_Gfx[] = INCBIN_U32("graphics/types/move_types.4bpp.lz"); const u32 gMoveTypes_Gfx[] = INCBIN_U32("graphics/types/move_types.4bpp.lz");
const u32 gMoveTypes_Pal[] = INCBIN_U32("graphics/types/move_types.gbapal.lz"); const u32 gMoveTypes_Pal[] = INCBIN_U32("graphics/types/move_types.gbapal.lz");
const u32 gMoveSelectorBitmap[] = INCBIN_U32("graphics/interface/summary_frames.4bpp.lz"); const u32 gSummaryMoveSelect_Gfx[] = INCBIN_U32("graphics/interface/summary_frames.4bpp.lz");
const u32 gUnknown_08D97CF4[] = INCBIN_U32("graphics/interface/summary_frames.gbapal.lz"); const u32 gSummaryMoveSelect_Pal[] = INCBIN_U32("graphics/interface/summary_frames.gbapal.lz");
const u32 gStatusScreenBitmap[] = INCBIN_U32("graphics/interface/status_screen.4bpp.lz"); const u32 gStatusScreenBitmap[] = INCBIN_U32("graphics/interface/status_screen.4bpp.lz");
const u32 gStatusScreenPalette[] = INCBIN_U32("graphics/interface/status_screen.gbapal.lz"); const u32 gStatusScreenPalette[] = INCBIN_U32("graphics/interface/status_screen.gbapal.lz");
const u32 gPageInfoTilemap[] = INCBIN_U32("graphics/interface/status_screen.bin.lz"); const u32 gPageInfoTilemap[] = INCBIN_U32("graphics/interface/status_screen.bin.lz");
const u32 gPageSkillsTilemap[] = INCBIN_U32("graphics/interface/status_tilemap1.bin.lz"); const u32 gPageSkillsTilemap[] = INCBIN_U32("graphics/interface/status_tilemap1.bin.lz");
const u32 gPageBattleMovesTilemap[] = INCBIN_U32("graphics/interface/status_tilemap2.bin.lz"); const u32 gPageBattleMovesTilemap[] = INCBIN_U32("graphics/interface/status_tilemap2.bin.lz");
const u32 gPageContestMovesTilemap[] = INCBIN_U32("graphics/interface/status_tilemap3.bin.lz"); const u32 gPageContestMovesTilemap[] = INCBIN_U32("graphics/interface/status_tilemap3.bin.lz");
@ -1280,9 +1279,7 @@ const u32 gPokedexSearchMenuNational_Tilemap[] = INCBIN_U32("graphics/pokedex/se
const u32 gPokedexSearchMenuHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/search_menu_hoenn.bin.lz"); const u32 gPokedexSearchMenuHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/search_menu_hoenn.bin.lz");
const u16 gSummaryScreenPowAcc_Tilemap[] = INCBIN_U16("graphics/interface/powacc_tilemap.bin"); const u16 gSummaryScreenPowAcc_Tilemap[] = INCBIN_U16("graphics/interface/powacc_tilemap.bin");
const u16 gSummaryScreenAppealJam_Tilemap[] = INCBIN_U16("graphics/interface/appealjam_tilemap.bin");
const u16 gUnknown_08DC3C34[] = INCBIN_U16("graphics/interface/unk_tilemap.bin"); // probably trade summary screen related?
const u16 gSummaryScreenWindow_Tilemap[] = INCBIN_U16("graphics/interface/summary.bin"); const u16 gSummaryScreenWindow_Tilemap[] = INCBIN_U16("graphics/interface/summary.bin");
const u16 gIntroCopyright_Pal[] = INCBIN_U16("graphics/intro/copyright.gbapal"); const u16 gIntroCopyright_Pal[] = INCBIN_U16("graphics/intro/copyright.gbapal");

2
src/party_menu.c
View File

@ -2708,7 +2708,7 @@ static void CB2_ShowPokemonSummaryScreen(void)
if (gPartyMenu.menuType == PARTY_MENU_TYPE_IN_BATTLE) if (gPartyMenu.menuType == PARTY_MENU_TYPE_IN_BATTLE)
{ {
UpdatePartyToBattleOrder(); UpdatePartyToBattleOrder();
ShowPokemonSummaryScreen(PSS_MODE_UNK1, gPlayerParty, gPartyMenu.slotId, gPlayerPartyCount - 1, CB2_ReturnToPartyMenuFromSummaryScreen); ShowPokemonSummaryScreen(PSS_MODE_LOCK_MOVES, gPlayerParty, gPartyMenu.slotId, gPlayerPartyCount - 1, CB2_ReturnToPartyMenuFromSummaryScreen);
} }
else else
{ {

1216
src/pokemon_summary_screen.c
View File

File diff suppressed because it is too large Load Diff

4
src/trade.c
View File

@ -1464,10 +1464,10 @@ static void TradeMenuShowMonSummaryScreen(void)
{ {
// Player's party // Player's party
if (sTradeMenuData->cursorPosition < PARTY_SIZE) if (sTradeMenuData->cursorPosition < PARTY_SIZE)
ShowPokemonSummaryScreen(PSS_MODE_UNK1, gPlayerParty, sTradeMenuData->cursorPosition, sTradeMenuData->partyCounts[TRADE_PLAYER] - 1, CB2_ReturnToTradeMenu); ShowPokemonSummaryScreen(PSS_MODE_LOCK_MOVES, gPlayerParty, sTradeMenuData->cursorPosition, sTradeMenuData->partyCounts[TRADE_PLAYER] - 1, CB2_ReturnToTradeMenu);
// Partner's party // Partner's party
else else
ShowPokemonSummaryScreen(PSS_MODE_UNK1, gEnemyParty, sTradeMenuData->cursorPosition - PARTY_SIZE, sTradeMenuData->partyCounts[TRADE_PARTNER] - 1, CB2_ReturnToTradeMenu); ShowPokemonSummaryScreen(PSS_MODE_LOCK_MOVES, gEnemyParty, sTradeMenuData->cursorPosition - PARTY_SIZE, sTradeMenuData->partyCounts[TRADE_PARTNER] - 1, CB2_ReturnToTradeMenu);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
} }
} }