Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IV/EV Info on Summary Screen #6027

Open
wants to merge 52 commits into
base: upcoming
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
6c9273c
prompt progress
khbsd Jan 9, 2025
c0c1df7
re-ordered function call
khbsd Jan 9, 2025
f0c6c42
Merge branch 'rhh-upcoming_ivs_on_stat_page' of https://github.com/kh…
khbsd Jan 9, 2025
cae5630
almost working!
khbsd Jan 10, 2025
f3c7e22
working, but really needs a refactor of what writes to the cancel prompt
khbsd Jan 11, 2025
a0859bf
small refactor, may need more cleanup
khbsd Jan 11, 2025
76072b7
may need more but added select sfx
khbsd Jan 11, 2025
b5dec45
oops redundant!
khbsd Jan 11, 2025
529b23a
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
khbsd Jan 11, 2025
ba7c3f6
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
khbsd Jan 12, 2025
1dcae1b
refactors
khbsd Jan 12, 2025
36cd269
aligned some text as well
khbsd Jan 12, 2025
be49a62
added mode reset to changing mons
khbsd Jan 12, 2025
fe3b08c
fix lag when switching from moves to skills
khbsd Jan 12, 2025
e99f5ec
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
khbsd Jan 13, 2025
eb38bde
revert page_skills.bin changes
khbsd Jan 14, 2025
6b7ac9c
reorganize and clean up some personal changes not needed for the pr
khbsd Jan 14, 2025
2a2b1d8
more cleanup and small changes to args for statlabel funcs
khbsd Jan 14, 2025
de6a0b5
rename P_SUMMARY_SCREEN_IV_INFO to P_SUMMARY_SCREEN_IV_EV_INFO and up…
khbsd Jan 14, 2025
523bf2e
wip bugfix for relearner in box
khbsd Jan 14, 2025
c53c8d2
potentially fixed, will bugfix more tomorrow
khbsd Jan 14, 2025
bc91e91
restored unused window (PSS_LABEL_WINDOW_UNUSED1)
khbsd Jan 15, 2025
5ea48f1
restored PSS_LABEL_WINDOW_PROMPT_INFO
khbsd Jan 15, 2025
2802fd2
clarifying comments on unused windows
khbsd Jan 15, 2025
de46faf
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
khbsd Jan 15, 2025
a7e0c49
remove redundant call to DynamicPlaceholderTextUtil_Reset()
khbsd Jan 15, 2025
9bf53ba
remove some unnecessary checks/logic
khbsd Jan 15, 2025
0ddaba4
fixed logic for showing info and switch prompts
khbsd Jan 15, 2025
9f4cfae
ShowCancelOrUtilityPrompt -> ShowUtilityPrompt, cleaned up prev unnee…
khbsd Jan 15, 2025
0cb3c4b
more cleanup of redundant code
khbsd Jan 15, 2025
4bb08dd
final cleanup before submitting PR
khbsd Jan 15, 2025
00f69c3
oops thought settings were false by default
khbsd Jan 15, 2025
e10ec69
revert out-of-scope relearner prompt changes
khbsd Jan 15, 2025
7be25bf
missed some elses
khbsd Jan 15, 2025
45d2f91
two more elses
khbsd Jan 15, 2025
0f0d458
couple more things
khbsd Jan 15, 2025
f465472
forgot debug woops
khbsd Jan 15, 2025
1015f6c
update comment next to pokemon.h setting
khbsd Jan 15, 2025
81c24b6
fix indentation @1770
khbsd Jan 15, 2025
06ef1f6
remove unnecessary writes to sum->maxHP
khbsd Jan 15, 2025
5c1a633
remove leftover condition in ExtractMonSkillEvData()
khbsd Jan 15, 2025
0126229
added configs and flag for tileset loading and box only
khbsd Jan 15, 2025
03568a3
add letter grading functionality
khbsd Jan 15, 2025
bc24a3d
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
khbsd Jan 15, 2025
3b04847
clarify flag use
khbsd Jan 15, 2025
6a96449
moved some logic around in Task_ChangeSummaryMon to ensure reset on c…
khbsd Jan 16, 2025
5ec3105
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
khbsd Jan 16, 2025
7030824
formattin
khbsd Jan 16, 2025
2cdc871
saner defaults and a letter grade guide that links to the stats judge…
khbsd Jan 17, 2025
76861b9
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
khbsd Jan 17, 2025
2505785
off by default
khbsd Jan 17, 2025
7090765
address a couple comments
khbsd Jan 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added graphics/summary_screen/iv_ev_tiles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 25 additions & 4 deletions include/config/pokemon.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,39 @@
#define P_ONLY_OBTAINABLE_SHINIES FALSE // If TRUE, Pokémon encountered in the Battle Pyramid won't be shiny.
#define P_NO_SHINIES_WITHOUT_POKEBALLS FALSE // If TRUE, Pokémon encountered when the player is out of Poké Balls won't be shiny
#define P_SHOW_DYNAMIC_TYPES FALSE // If TRUE, all moves with dynamic type changes will be reflected as their current type in battle/summary screens instead of just select ones like in vanilla.
#define P_SUMMARY_SCREEN_MOVE_RELEARNER TRUE // If TRUE, shows an option for Pokémon to relearn moves on the summary screen moves page.
#define P_SUMMARY_MOVE_RELEARNER_FULL_PP TRUE // If TRUE, the move relearner in the summary screen restores relearned moves' PP to full.
#define P_SUMMARY_SCREEN_RENAME TRUE // If TRUE, an option to change Pokémon nicknames replaces the cancel prompt on the summary screen info page.

// Summary screen settings
#define P_SUMMARY_SCREEN_MOVE_RELEARNER TRUE // If TRUE, shows an option for Pokémon to relearn moves on the summary screen moves page.
#define P_SUMMARY_MOVE_RELEARNER_FULL_PP TRUE // If TRUE, the move relearner in the summary screen restores relearned moves' PP to full.
#define P_SUMMARY_SCREEN_RENAME TRUE // If TRUE, an option to change Pokémon nicknames replaces the cancel prompt on the summary screen info page.
#define P_SUMMARY_SCREEN_IV_EV_INFO FALSE // If TRUE, will allow player to cycle through the Stats, IVs, and EVs in the summary screen skills page.
#define P_SUMMARY_SCREEN_IV_EV_BOX_ONLY FALSE // If TRUE, will allow player to cycle through the Stats, IVs, and EVs in the summary screen skills page, but only in the PC storage box.
#define P_SUMMARY_SCREEN_IV_EV_TILESET FALSE // If TRUE, loads an alternate tileset to allow changing the "STATS" label in the summary screen skills page. Note: if it's still loading the alternate tileset after changing this and recompiling, you may need a `make clean` before compilation.
#define P_SUMMARY_SCREEN_IV_EV_VALUES FALSE // If TRUE, will show the actual IV value instead of the letter grade.
khbsd marked this conversation as resolved.
Show resolved Hide resolved
/*
LETTER GRADE GUIDE:

F = 0
D = 1 - 15
C = 16 - 25
B = 26 - 29
A = 30
S = 31

Info taken from https://bulbapedia.bulbagarden.net/wiki/Stats_judge.
*/
#define P_SUMMARY_SCREEN_IV_ONLY FALSE // If TRUE, will only show IV info in the summary screen.
#define P_SUMMARY_SCREEN_EV_ONLY FALSE // If TRUE, will only show EV info in the summary screen.

// Learnset helper toggles
#define P_LEARNSET_HELPER_TEACHABLE TRUE // If TRUE, teachable_learnsets.h will be populated by tools/learnset_helpers/teachable.py using the included JSON files based on available TMs and tutors.
#define P_LEARNSET_HELPER_TEACHABLE TRUE // If TRUE, teachable_learnsets.h will be populated by tools/learnset_helpers/teachable.py using the included JSON files based on available TMs and tutors.

// Flag settings
// To use the following features in scripting, replace the 0s with the flag ID you're assigning it to.
// Eg: Replace with FLAG_UNUSED_0x264 so you can use that flag to toggle the feature.
#define P_FLAG_FORCE_SHINY 0 // If this flag is set, all wild and gift Pokémon will forced into being Shiny.
#define P_FLAG_FORCE_NO_SHINY 0 // If this flag is set, all wild and gift Pokémon will forced into NOT being Shiny.
#define P_FLAG_IV_EV_INFO 0 // If this flag is set, will allow player to cycle through the Stats, IVs, and EVs in the summary screen skills page. Note: if P_SUMMARY_SCREEN_IV_EV_INFO is TRUE, this flag does nothing.

// Go here if you want to disable specific families of Pokémon.
#include "config/species_enabled.h"
Expand Down
7 changes: 7 additions & 0 deletions include/pokemon_summary_screen.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,11 @@ enum PokemonSummaryScreenPage
PSS_PAGE_COUNT,
};

enum PokemonSummarySkillsMode
{
SUMMARY_SKILLS_MODE_STATS,
SUMMARY_SKILLS_MODE_IVS,
SUMMARY_SKILLS_MODE_EVS,
};

#endif // GUARD_POKEMON_SUMMARY_SCREEN_H
4 changes: 4 additions & 0 deletions src/graphics.c
Original file line number Diff line number Diff line change
Expand Up @@ -1683,7 +1683,11 @@ const u32 gMoveTypes_Pal[] = INCBIN_U32("graphics/types/move_types.gbapal.lz");
const u32 gSummaryMoveSelect_Gfx[] = INCBIN_U32("graphics/summary_screen/move_select.4bpp.lz");
const u32 gSummaryMoveSelect_Pal[] = INCBIN_U32("graphics/summary_screen/move_select.gbapal.lz");

#if P_SUMMARY_SCREEN_IV_EV_TILESET
const u32 gSummaryScreen_Gfx[] = INCBIN_U32("graphics/summary_screen/iv_ev_tiles.4bpp.lz");
#else
const u32 gSummaryScreen_Gfx[] = INCBIN_U32("graphics/summary_screen/tiles.4bpp.lz");
#endif // P_SUMMARY_SCREEN_IV_EV_TILESET
const u32 gSummaryScreen_Pal[] = INCBIN_U32("graphics/summary_screen/tiles.gbapal.lz");
const u32 gSummaryPage_Info_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_info.bin.lz");
const u32 gSummaryPage_Skills_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_skills.bin.lz");
Expand Down
Loading
Loading