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

Implement shop_master_common #454

Merged
merged 2 commits into from
Dec 27, 2024
Merged

Conversation

colbyaustinbrown
Copy link
Contributor

No description provided.

Copy link
Collaborator

@Cuyler36 Cuyler36 left a comment

Choose a reason for hiding this comment

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

Firstly thanks so much for doing this!! This is a huge amount of progress since it's duplicated across every Nook actor! I've pointed out the most obvious things to me however I'll do a more thorough review when these are resolved and all the data is present!

include/ac_npc_shop_master.h Show resolved Hide resolved
aNSC_MSG_PSWD_BAD = 0x144,
aNSC_MSG_PSWD_FOREIGN = 0x141,
aNSC_MSG_GIFT_OUT = 0x143,
aNSC_MSG_TAKE_OFF_HANDS= 0x108a,
Copy link
Collaborator

Choose a reason for hiding this comment

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

This one appears to be the literal message ID instead of a relative value. It shouldn't be in this enum. You can add a definition for it in m_string_data.h if you'd like.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They sort of are relative values; IDs 0-99 have one offset, IDs 100-199 are another, etc. (See https://github.com/colbyaustinbrown/ac-decomp/blob/1b4d4894b325ff1193276b6896d2701b4437a3bf/src/actor/npc/ac_npc_shop_master.c#L895). I can move them if you like, but thought I would give the extra context before I do.

src/actor/npc/ac_npc_shop_master.c Outdated Show resolved Hide resolved
src/actor/npc/ac_npc_shop_master.c Outdated Show resolved Hide resolved
src/actor/npc/ac_npc_shop_master.c Outdated Show resolved Hide resolved
src/actor/npc/ac_npc_shop_master.c Outdated Show resolved Hide resolved
src/actor/npc/ac_npc_shop_master.c Outdated Show resolved Hide resolved
src/actor/npc/ac_npc_shop_master.c Outdated Show resolved Hide resolved
src/actor/npc/ac_npc_shop_master.c Outdated Show resolved Hide resolved
src/actor/npc/ac_npc_shop_master.c Outdated Show resolved Hide resolved
@Cuyler36
Copy link
Collaborator

Forgot to mention this earlier, but you should also run clang-format on the file!

@Cuyler36 Cuyler36 merged commit 94b0d3e into ACreTeam:master Dec 27, 2024
1 check passed
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