-
Notifications
You must be signed in to change notification settings - Fork 599
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
Some cleanup/doc on the item icons #1263
Conversation
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.
IMO this is a big improvement to readability, although again it conflicts with the AP macros I've been working on :( . I do have a few quibbles over names.
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.
These are all the other ones that stick out as inconsistent.
gQuestIconZoraSapphireTex, // ITEM_SPSTONE_ZORA_SAPPHIRE | ||
gQuestIconStoneOfAgonyTex, // ITEM_STONE_OF_AGONY | ||
gQuestIconGerudosCardTex, // ITEM_GERUDOS_CARD | ||
gQuestIconGoldSkulltulaTex, // ITEM_SKULL_TOKEN |
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.
One of these should definitely change.
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.
Well I have a dilemma here, because ITEM_SKULL_TOKEN
is the token item, but gQuestIconGoldSkulltulaTex
is a gold skulltula icon that looks nothing like the token
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 think it can still be an icon for it even if it doesn't look the same. The heart piece indicator doesn't look anything like the ones you pick up, for example.
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.
Note I didn't touch the gHeartPieceIcon*Tex
names, they indeed probably shouldn't be called "icon" (any suggestion? as well as for the gItemIcons
array),
but the (unused) gQuestIconHeartPieceTex
does look like the in-game heart piece
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 suppose the heart piece one is a gauge/meter, albeit an unconventional layout.
At the end of the day it does still look like a gold skulltula.
(gQuestIconSpidersSquishedTex
)
src/code/code_80097A00.c
Outdated
gQuestIconDungeonBossKeyTex, // ITEM_DUNGEON_BOSS_KEY | ||
gQuestIconDungeonMapTex, // ITEM_DUNGEON_COMPASS (swapped with map?) | ||
gQuestIconDungeonCompassTex, // ITEM_DUNGEON_MAP | ||
gQuestIconDungeonBossKeyTex, // ITEM_SMALL_KEY |
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.
Huh, it uses boss key for both, or...?
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 can't tell if any of these 4 actually uses this array to get the icon, it doesn't seem like it but idk. At least ITEM_SMALL_KEY
I think is never used in pause?
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.
Added comments on the three odd item->texture mappings (map, compass, small key)
It's inconsequential for all three (as gItemIcons
isn't accessed for those items)
I'm stuck on understanding what each biggoron sword/giant knife -related item is
See the |
I would also update the |
With #1376 having been merged this PR is back in business 🎉 |
@@ -99,7 +99,7 @@ | |||
#define R_TEXTBOX_HEIGHT YREG(23) | |||
#define R_TEXTBOX_ICON_XPOS YREG(71) | |||
#define R_TEXTBOX_ICON_YPOS YREG(72) | |||
#define R_TEXTBOX_ICON_SIZE YREG(75) | |||
#define R_TEXTBOX_ICON_DIMENSION YREG(75) |
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'd probably prefer Length
over Dimension
, but it seems fine as is.
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.
possibly, though to me length makes it sound like its only for that one side. while this is trying to convey that its the same number for length and width. but yeah i guess its not that clear either way
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'm keeping "dimension" until someone else says they prefer "length"
* Some cleanup/doc on the item enum and icons * `gItemIconBigBottlePoeTex` -> `gItemIconBottleBigPoeTex` * Biggoron sword / giant knife items (?) * `SPSTONE_` -> `SPIRITUAL_` ? * `gItemIconBrokenBiggoronSwordTex` -> `gItemIconBrokenGoronsSwordTex` * `gQuestIcon...MedallionTex` -> `gQuestIconMedallion...Tex` * `ITEM_MAGIC_` -> `ITEM_MAGIC_JAR_`small/big * `ITEM_BOW_ARROW_` -> `ITEM_BOW_` * `MASK_BUNNY` -> `MASK_BUNNY_HOOD` * Update `GID_` enum from `ITEM_` enum * ITEM/GID`_ARROW_`small/medium/large -> 5/10/30 * Run formatter * . * fix regressions and revert bad ideas * chicken * obey the newline police and also prevent the range police from intervening * fixups * dimensions -> dimension (singular) * Note on inconsequential oddities about the `gItemIcons` mapping
Main things:
gItemIcons
incode_80097A00.c
: format and some commentsz64interface.h
to replace magic numbers refering toicon_item_static
/icon_item_24_static
assets ("item icons" and "quest icons")