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

Rename CookData and WeaponData fields #125

Merged
merged 1 commit into from
Mar 9, 2024
Merged

Rename CookData and WeaponData fields #125

merged 1 commit into from
Mar 9, 2024

Conversation

Pistonight
Copy link
Collaborator

@Pistonight Pistonight commented Mar 9, 2024 •
edited
Loading

Change

  • Renamed the following:
    • mStaminaRecoverX -> mHealthRecover
    • mStaminaRecoverY -> mEffectDuration
    • mCookEffect1 -> mSellPrice
    • mCookEffect0 -> mEffect
    • mAddValue -> mModifierValue
    • mAddType -> mModifier
  • Functions are also renamed accordingly
  • switch statement in getFoodSortKey is replaced with enum

I didn't rename the GDT flags since I don't know how they are generated (i.e. if "CookEffect0" is the actual flag name in the rom)

Validation

Check modified function match, or was non matching before and still is non matching

  • WeaponModifierInfo::fromItem
  • PouchItem::PouchItem
  • PauseMenuDataMgr::addToPouch (resetItem() inlined)
  • PauseMenuDataMgr::doLoadFromGameData
  • PauseMenuDataMgr::itemGet
  • PauseMenuDataMgr::saveToGameData
  • PauseMenuDataMgr::setCookDataOnLastAddedItem
  • PauseMenuDataMgr::getEquippedArrowType
  • PauseMenuDataMgr::countCookResults
  • PauseMenuDataMgr::removeCookResult
  • compareBow
  • compareWeapon
  • compareShield
  • compareFood

This change is Reviewable

@Pistonight Pistonight force-pushed the pmdm_cook_data_name branch from 83c28fe to 0d70920 Compare March 9, 2024 08:40
@Pistonight Pistonight force-pushed the pmdm_cook_data_name branch from 0d70920 to dd506b1 Compare March 9, 2024 08:45
@Pistonight Pistonight marked this pull request as ready for review March 9, 2024 08:45
leoetlino
leoetlino approved these changes Mar 9, 2024
View reviewed changes
Copy link
Collaborator

@leoetlino leoetlino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks!

@leoetlino leoetlino merged commit 72a0a82 into zeldaret:master Mar 9, 2024
3 checks passed
@Pistonight Pistonight deleted the pmdm_cook_data_name branch March 9, 2024 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leoetlino leoetlino leoetlino approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Pistonight @leoetlino