Update z64item.h with names from decomp#3200
Update z64item.h with names from decomp#3200garrettjoecox wants to merge 1 commit intoHarbourMasters:developfrom
Conversation
be74ef2 to
79ffaa7
Compare
79ffaa7 to
f406491
Compare
|
Looks good! Will need some updating due to the other docs but otherwise just a couple things from me: Do we want to keep the rename script in the repo? Considering the way we use the enums, i think we shouldnt rename these: i.e. just keep them as ITEM_SINGLE_MAGIC etc. in the repo |
f406491 to
a48a5ad
Compare
I think just leaving the link to it in the PR is fine IMO
I removed these from the rename for now, but due to how our tables for rando are set up now, I don't think we actually use these any more, and if we are we shouldn't be, I'll create a ticket to verify and remove usage of them. |
|
inspectredc
left a comment
There was a problem hiding this comment.
LGTM pending merge conflicts! I noticed that decomp has an UPG_MAX for the upgradetype which is used for some array sizes, would it be possible to get that in this too?
| GID_BOTTLE, GID_LETTER_RUTO, GID_SHIELD_HYLIAN, GID_QUIVER_40, GID_SCALE_SILVER, | ||
| GID_SCALE_GOLDEN, GID_KEY_SMALL, GID_ARROW_FIRE, GID_RUPEE_GREEN, GID_RUPEE_BLUE, | ||
| GID_RUPEE_RED, GID_RUPEE_PURPLE, GID_HEART_PIECE, GID_KEY_SMALL, | ||
| GID_BOTTLE_EMPTY, GID_BOTTLE_RUTOS_LETTER, GID_SHIELD_HYLIAN, GID_QUIVER_40, GID_SCALE_SILVER, |
| GI_FROG, GI_EYEDROPS, GI_CLAIM_CHECK, GI_MASK_SKULL, GI_MASK_SPOOKY, GI_MASK_KEATON, | ||
| GI_MASK_BUNNY, GI_MASK_TRUTH, GI_MASK_GORON, GI_MASK_ZORA, GI_MASK_GERUDO, GI_LETTER_RUTO, | ||
| GI_LETTER_RUTO, GI_LETTER_RUTO, GI_LETTER_RUTO, GI_LETTER_RUTO, GI_LETTER_RUTO, | ||
| GI_ZELDAS_LETTER, GI_WEIRD_EGG, GI_CHICKEN, GI_MAGIC_BEAN, GI_POCKET_EGG, GI_POCKET_CUCCO, |
Pepper0ni
left a comment
There was a problem hiding this comment.
LGTM for the most part, just some ruined structures where the legnth of variables changed. Will wait for conflict fix before approving
|
|
||
| static ItemData itemData[88] = { | ||
| {CREATE_SPRITE_32(dgItemIconDekuStickTex, 1), ITEM_STICK, INV_IC_POS(0, 0), SIZE_NORMAL}, | ||
| {CREATE_SPRITE_32(dgItemIconDekuNutTex, 0), ITEM_NUT, INV_IC_POS(1, 0), SIZE_NORMAL}, |
There was a problem hiding this comment.
More spacing problems here, not critical but we may as well be clean.
|
|
||
| // Item ID corresponding to each slot, aside from bottles and trade items | ||
| static s16 sSlotItems[] = { | ||
| ITEM_STICK, ITEM_NUT, ITEM_BOMB, ITEM_BOW, ITEM_ARROW_FIRE, ITEM_DINS_FIRE, |
| u8 gAmmoItems[] = { | ||
| ITEM_STICK, ITEM_NUT, ITEM_BOMB, ITEM_BOW, ITEM_NONE, ITEM_NONE, ITEM_SLINGSHOT, ITEM_NONE, | ||
| ITEM_BOMBCHU, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_BEAN, ITEM_NONE, | ||
| ITEM_DEKU_STICK, ITEM_DEKU_NUT, ITEM_BOMB, ITEM_BOW, ITEM_NONE, ITEM_NONE, ITEM_SLINGSHOT, ITEM_NONE, |
|
Is this even up to date with decomp anymore?... |
|
Probably not, we can re-use the script when we get around to it but I’ll close this for now |
Ran this script https://gist.github.com/garrettjoecox/76e6eec7badb5e3f4551c0e8a0c07f50
All changes come from decomp's current z64item.h
Build Artifacts