Gerudo objects #757
Merged
Gerudo objects #757
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
louist103
suggested changes
Apr 6, 2021
Comment on lines
+10
to
+34
| /* 0x00 */ GELDB_LIMB_NONE, | ||
| /* 0x01 */ GELDB_LIMB_ROOT, | ||
| /* 0x02 */ GELDB_LIMB_TORSO, | ||
| /* 0x03 */ GELDB_LIMB_NECK, | ||
| /* 0x04 */ GELDB_LIMB_PONYTAIL, | ||
| /* 0x05 */ GELDB_LIMB_VEIL, | ||
| /* 0x06 */ GELDB_LIMB_HEAD, | ||
| /* 0x07 */ GELDB_LIMB_R_UPPER_ARM, | ||
| /* 0x08 */ GELDB_LIMB_R_FOREARM, | ||
| /* 0x09 */ GELDB_LIMB_R_WRIST, | ||
| /* 0x0A */ GELDB_LIMB_R_HAND, | ||
| /* 0x0B */ GELDB_LIMB_R_SWORD, | ||
| /* 0x0C */ GELDB_LIMB_L_UPPER_ARM, | ||
| /* 0x0D */ GELDB_LIMB_L_FOREARM, | ||
| /* 0x0E */ GELDB_LIMB_L_WRIST, | ||
| /* 0x0F */ GELDB_LIMB_L_HAND, | ||
| /* 0x10 */ GELDB_LIMB_L_SWORD, | ||
| /* 0x11 */ GELDB_LIMB_L_THIGH, | ||
| /* 0x12 */ GELDB_LIMB_L_SHIN, | ||
| /* 0x13 */ GELDB_LIMB_L_FOOT, | ||
| /* 0x14 */ GELDB_LIMB_R_THIGH, | ||
| /* 0x15 */ GELDB_LIMB_R_SHIN, | ||
| /* 0x16 */ GELDB_LIMB_R_FOOT, | ||
| /* 0x17 */ GELDB_LIMB_WAIST, | ||
| /* 0x18 */ GELDB_LIMB_MAX |
There was a problem hiding this comment.
Limbs should decimal IMO but if someone said to use hex leave it.
There was a problem hiding this comment.
I asked in Discord and @Roman971 said all enums in hex if possible: https://discord.com/channels/688807550715560050/688851317593997489/828722876801613895
AngheloAlf
approved these changes
Apr 7, 2021
louist103
approved these changes
Apr 7, 2021
fig02
approved these changes
Apr 9, 2021
Roman971
approved these changes
Apr 10, 2021
mzxrules
pushed a commit
to mzxrules/oot
that referenced
this pull request
Jul 19, 2021
* object_ge1 * more stuff named * object_gla OK, symbols added to C * eff fire fix in gameplay_keep * object_nb OK, fixed gameplay_keep * replaced symbols in EnNb, limb enums * Change EnGeldB limb enums to hex * Use enum in header too * Add descriptions to EnGe2 and EnNb, rearrange xml * Reorder xml * review changes
louist103
pushed a commit
to louist103/oot
that referenced
this pull request
Jan 3, 2023
* object_ge1 * more stuff named * object_gla OK, symbols added to C * eff fire fix in gameplay_keep * object_nb OK, fixed gameplay_keep * replaced symbols in EnNb, limb enums * Change EnGeldB limb enums to hex * Use enum in header too * Add descriptions to EnGe2 and EnNb, rearrange xml * Reorder xml * review changes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Decompiled
object_ge1,object_glaandobject_nbcompletely and add symbols to their respective actors. Ge1 is also used inDemoEc, but all of the actor symbols inDemoEcshould be done in one pass imo. Added limb enums to EnNb since several are used. Also one rename in gameplay_keep per @Zelllll 's suggestion, and changed the limb enum in GeldB to use hex as recommended by @Roman971 .Some of the animation names are a bit verbose, but I think it's mostly worth it for the sake of clarity, especially while the actor is not completely documented.
Will probably document EnNb properly at some point, but have more urgent things to do now.