-
Notifications
You must be signed in to change notification settings - Fork 611
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
Restructure event flags in z64save.h (4/?): Haggling Townsfolk #2395
base: main
Are you sure you want to change the base?
Conversation
include/z64save.h
Outdated
#define ENMU_GET_TALK_FLAGS() \ | ||
gSaveContext.eventInf[EVENTINF_INDEX_HAGGLING_TOWNSFOLK] & EVENTINF_HAGGLING_TOWNSFOLK_MASK | ||
|
||
#define ENMU_SET_TALK_FLAGS(talkFlags) \ | ||
gSaveContext.eventInf[EVENTINF_INDEX_HAGGLING_TOWNSFOLK] |= (talkFlags); | ||
|
||
#define ENMU_RESET_TALK_FLAGS() \ | ||
gSaveContext.eventInf[EVENTINF_INDEX_HAGGLING_TOWNSFOLK] &= ~(EVENTINF_HAGGLING_TOWNSFOLK_MASK); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should these justbe local en_mu defines? the system name at the front of the macro suggests so
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dunno but fwiw, there is currently ENDAIKU_IS_CARPENTER_RESCUED
and similar currently in z64save.h that works on carpenterType
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can keep going like this for now, but to me they do kinda make sense in the actor headers (or C file, idk)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess I should say that part of the original plan was to move all uses eventInf and similar (except for like flg_set) into z64save so that all access is done through z64save macros, but i'm less confident on doing so anymore.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I dont think I care too much either way right now, but if they are going to be grouped all together in here, I would prefer if the naming convention was EVENTINF_THING consistently (replace the flag table name in the front for which ever it corresponds to, ofc)
Contributions made in this pr are licensed under CC0
Continuation of #2303