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

Cleanup Store code #7424

Draft
wants to merge 18 commits into
base: master
Choose a base branch
from
Draft

Conversation

kphoenix137
Copy link
Collaborator

No description provided.

@kphoenix137
Copy link
Collaborator Author

I think I'll submit a PR separately that changes the variable names found in stores.cpp so this PR is much easier to review.

@AJenbo
Copy link
Member

AJenbo commented Sep 19, 2024

I think you should, this one already has conflicts despite being the latest

@AJenbo
Copy link
Member

AJenbo commented Sep 20, 2024

Do your self a favor and merge master rather then rebase on it with the commits you have.

@kphoenix137 kphoenix137 force-pushed the stores-cleanup branch 2 times, most recently from 508bfa3 to 4f8819a Compare September 20, 2024 23:36
Update

Refactor Smith menu

Clean up the smith main menu with helper functions, and prevent utilizing the line number to figure out what functions to call.

Clean up Main Menu more

Separate strings

Refactor and general fns

Note: There is a bug where wirt's item can only be clicked on the item name

Consolidate Sell functions

Consolidate canselltotowner

Fix bad rebase

Fix accidental change

Add IsPlayerInStore()

Rename/organize

Update stores.cpp

Update stores.h

Rename playerItemIdx

Renames and fix

IsPlayerInStore()

RestoreResource()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants