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.

Sign up for GitHub

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

Jump to bottom

IV/EV Info on Summary Screen #6027

Open
wants to merge 51 commits into
base: upcoming
Choose a base branch
from
Open

IV/EV Info on Summary Screen #6027

wants to merge 51 commits into from

Conversation

khbsd
Copy link

@khbsd khbsd commented Jan 15, 2025 •
edited
Loading

Adds a setting to enable viewing IVs and EVs in the Summary Screen.

Description

  • repurposed the PSS_LABEL_WINDOW_PROMPT_CANCEL window to be a general-purpose utility prompt window, with logic implemented to display the correct prompt on each page. this takes over for PSS_LABEL_WINDOW_PROMPT_RENAME, PSS_LABEL_WINDOW_PROMPT_INFO, and PSS_LABEL_WINDOW_PROMPT_SWITCH as well.
  • adds an #if section in src/graphics.c that only loads the alternate tileset when the setting is enabled.
  • adds functions ChangeStatLabel(), ClearStatLabel(), and WriteToStatsTilemapBuffer() to control which label gets shown for each set of data.
  • removes use of PutWindowTilemap() and ClearWindowTilemap() for the utility prompt when not needed/handled by other code.
  • added SUMMARY_SKILLS_MODE_STATS, SUMMARY_SKILLS_MODE_IVS, SUMMARY_SKILLS_MODE_EVS as different modes for new PokemonSummaryScreenData member sMonSummaryScreen->skillsPageMode.
  • refactored the loading of data into the summary struct so specific pieces can be buffered and printed
  • the utility prompt is now handled by ShowUtilityPrompt() and ClearUtilityPrompt(). ShowUtilityPrompt() takes an argument to illustrate what it's doing.

Configurable options:

  • show only IVs or EVs
  • show IV values instead of letter grades
  • only useable in the storage pc
  • flaggable
  • allows vanilla tileset to be loaded instead of modified one

Images

pokeemerald-250114-222257

People who collaborated with me in this PR

Discord contact info and PR thread

khbsd and others added 30 commits January 9, 2025 01:59
@khbsd
prompt progress
6c9273c
@khbsd
re-ordered function call
c0c1df7
@khbsd
Merge branch 'rhh-upcoming_ivs_on_stat_page' of https://github.com/kh…
f0c6c42 
…bsd/pokeemerald-expansion-kaya into rhh-upcoming_ivs_on_stat_page
@khbsd
almost working!
cae5630
@khbsd
working, but really needs a refactor of what writes to the cancel prompt
f3c7e22
@khbsd
small refactor, may need more cleanup
a0859bf
@khbsd
may need more but added select sfx
76072b7
@khbsd
oops redundant!
b5dec45
@khbsd
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
529b23a 
…expansion into rhh-upcoming_ivs_on_stat_page
@khbsd
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
ba7c3f6 
…expansion into rhh-upcoming_ivs_on_stat_page
@khbsd
refactors
1dcae1b
@khbsd
aligned some text as well
36cd269
@khbsd
added mode reset to changing mons
be49a62
@khbsd
fix lag when switching from moves to skills
fe3b08c
@khbsd
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
e99f5ec 
…expansion into rhh-upcoming_ivs_on_stat_page
@khbsd
revert page_skills.bin changes
eb38bde
@khbsd
reorganize and clean up some personal changes not needed for the pr
6b7ac9c
@khbsd
more cleanup and small changes to args for statlabel funcs
2a2b1d8
@khbsd
rename P_SUMMARY_SCREEN_IV_INFO to P_SUMMARY_SCREEN_IV_EV_INFO and up…
de6a0b5 
…date comment accordingly
@khbsd
wip bugfix for relearner in box
523bf2e
@khbsd
potentially fixed, will bugfix more tomorrow
c53c8d2
@khbsd
restored unused window (PSS_LABEL_WINDOW_UNUSED1)
bc91e91
@khbsd
restored PSS_LABEL_WINDOW_PROMPT_INFO
5ea48f1
@khbsd
clarifying comments on unused windows
2802fd2
@khbsd
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
de46faf 
…expansion into rhh-upcoming_ivs_on_stat_page
@khbsd
remove redundant call to DynamicPlaceholderTextUtil_Reset()
a7e0c49
@khbsd
remove some unnecessary checks/logic
9bf53ba
@khbsd
fixed logic for showing info and switch prompts
0ddaba4
@khbsd
ShowCancelOrUtilityPrompt -> ShowUtilityPrompt, cleaned up prev unnee…
9f4cfae 
…ded changes
@khbsd
more cleanup of redundant code
0cb3c4b
khbsd added 18 commits January 14, 2025 21:09
@khbsd
final cleanup before submitting PR
4bb08dd
@khbsd
oops thought settings were false by default
00f69c3
@khbsd
revert out-of-scope relearner prompt changes
e10ec69
@khbsd
missed some elses
7be25bf
@khbsd
two more elses
45d2f91
@khbsd
couple more things
0f0d458
@khbsd
forgot debug woops
f465472
@khbsd
update comment next to pokemon.h setting
1015f6c
@khbsd
fix indentation @1770
81c24b6
@khbsd
remove unnecessary writes to sum->maxHP
06ef1f6
@khbsd
remove leftover condition in ExtractMonSkillEvData()
5c1a633
@khbsd
added configs and flag for tileset loading and box only
0126229
@khbsd
add letter grading functionality
03568a3
@khbsd
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
bc24a3d 
…expansion into rhh-upcoming_ivs_on_stat_page
@khbsd
clarify flag use
3b04847
@khbsd
moved some logic around in Task_ChangeSummaryMon to ensure reset on c…
6a96449 
…hanging mons, and added options for only showing IVs or only showing EVs
@khbsd
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
5ec3105 
…expansion into rhh-upcoming_ivs_on_stat_page
@khbsd
formattin
7030824
@Pawkkie Pawkkie added the new-feature Adds a feature label Jan 17, 2025
@khbsd khbsd marked this pull request as ready for review January 17, 2025 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
new-feature Adds a feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@khbsd @Pawkkie