mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +00:00
Code Issues Projects Releases Wiki Activity

Update item names (#1376)

Browse source 
* Reevaluate item names (`ItemID` enum)

* format

* Carry `ItemID` changes to `ExchangeItemID`

* format

* Add item enum comments on items to slots array

* Rename slots according to current item enum names

* Add item enum comments on items to PlayerItemAction array

* Rename PlayerItemAction enum names according to current item enum names

* gi, gid names...

* `QUEST_GERUDO_CARD` -> `QUEST_GERUDOS_CARD`

* `DUNGEON_KEY_BOSS` -> `DUNGEON_BOSS_KEY`

* `UPG_` sticks/nuts : +deku

* Fixed remove array enum comments in `sDebugSaveEquips`

* "magic beans" -> "magic bean" (singular)

* cucco -> chicken (the one from weird egg, "alarm clock bird" from literal japanese translation)
This commit is contained in:
Dragorn421 2022-11-16 19:23:27 +01:00 • committed by GitHub
parent acc077a24c
commit cc2409606e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 1049 additions and 1042 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Mk/z_en_mk.c
View file

@ -95,14 +95,14 @@ void func_80AACA94(EnMk* this, PlayState* play) {
func_80088AA0(240);
CLEAR_EVENTINF(EVENTINF_10);
} else {
func_8002F434(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
func_8002F434(&this->actor, play, GI_EYE_DROPS, 10000.0f, 50.0f);
}
}
void func_80AACB14(EnMk* this, PlayState* play) {
if (Actor_TextboxIsClosing(&this->actor, play)) {
this->actionFunc = func_80AACA94;
func_8002F434(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
func_8002F434(&this->actor, play, GI_EYE_DROPS, 10000.0f, 50.0f);
}
}
@ -222,7 +222,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) {
player->actor.textId = this->actor.textId;
this->actionFunc = func_80AACA40;
} else {
if (INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYEDROPS) {
if (INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_EYE_DROPS) {
player->actor.textId = 0x4032;
this->actionFunc = func_80AACA40;
} else {
@ -247,7 +247,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) {
}
}
break;
case EXCH_ITEM_FROG:
case EXCH_ITEM_EYEBALL_FROG:
player->actor.textId = 0x4019;
this->actionFunc = func_80AACEE8;
Animation_Change(&this->skelAnime, &object_mk_Anim_000368, 1.0f, 0.0f,
@ -273,7 +273,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) {
angle = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
if ((ABS(angle) < 0x2151) && (this->actor.xzDistToPlayer < 100.0f)) {
func_8002F298(&this->actor, play, 100.0f, EXCH_ITEM_FROG);
func_8002F298(&this->actor, play, 100.0f, EXCH_ITEM_EYEBALL_FROG);
this->flags |= 1;
}
}