mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +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

2
src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
View file

@ -399,7 +399,7 @@ void BgYdanSp_WallWebIdle(BgYdanSp* this, PlayState* play) {
if (Flags_GetSwitch(play, this->burnSwitchFlag) || (this->trisCollider.base.acFlags & AC_HIT)) {
this->dyna.actor.home.pos.y = this->dyna.actor.world.pos.y + 80.0f;
BgYdanSp_BurnWeb(this, play);
} else if (player->heldItemAction == PLAYER_IA_STICK && player->unk_860 != 0) {
} else if (player->heldItemAction == PLAYER_IA_DEKU_STICK && player->unk_860 != 0) {
func_8002DBD0(&this->dyna.actor, &sp30, &player->meleeWeaponInfo[0].tip);
if (fabsf(sp30.x) < 100.0f && sp30.z < 1.0f && sp30.y < 200.0f) {
OnePointCutscene_Init(play, 3020, 40, &this->dyna.actor, CAM_ID_MAIN);

2
src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
View file

@ -577,7 +577,7 @@ void func_80996B0C(DoorShutter* this, PlayState* play) {
if (this->unlockTimer != 0) {
if (this->doorType == SHUTTER_BOSS) {
if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, gSaveContext.mapIndex)) {
if (!CHECK_DUNGEON_ITEM(DUNGEON_BOSS_KEY, gSaveContext.mapIndex)) {
player->naviTextId = -0x204;
return;
}

5
src/overlays/actors/ovl_En_Butte/z_en_butte.c
View file

@ -268,7 +268,8 @@ void EnButte_FlyAround(EnButte* this, PlayState* play) {
EnButte_SelectFlightParams(this, &sFlyAroundParams[this->flightParamsIdx]);
}
if (((this->actor.params & 1) == 1) && (player->heldItemAction == PLAYER_IA_STICK) && (this->swordDownTimer <= 0) &&
if (((this->actor.params & 1) == 1) && (player->heldItemAction == PLAYER_IA_DEKU_STICK) &&
(this->swordDownTimer <= 0) &&
((Math3D_Dist2DSq(player->actor.world.pos.x, player->actor.world.pos.z, this->actor.home.pos.x,
this->actor.home.pos.z) < SQ(120.0f)) ||
(this->actor.xzDistToPlayer < 60.0f))) {
@ -333,7 +334,7 @@ void EnButte_FollowLink(EnButte* this, PlayState* play) {
distSqFromHome = Math3D_Dist2DSq(this->actor.world.pos.x, this->actor.world.pos.z, this->actor.home.pos.x,
this->actor.home.pos.z);
if (!((player->heldItemAction == PLAYER_IA_STICK) && (fabsf(player->actor.speedXZ) < 1.8f) &&
if (!((player->heldItemAction == PLAYER_IA_DEKU_STICK) && (fabsf(player->actor.speedXZ) < 1.8f) &&
(this->swordDownTimer <= 0) && (distSqFromHome < SQ(320.0f)))) {
EnButte_SetupFlyAround(this);
} else if (distSqFromHome > SQ(240.0f)) {

2
src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
View file

@ -1020,7 +1020,7 @@ void EnDekubaba_DeadStickDrop(EnDekubaba* this, PlayState* play) {
return;
}
func_8002F554(&this->actor, play, GI_STICKS_1);
func_8002F554(&this->actor, play, GI_DEKU_STICKS_1);
}
// Update and associated functions

38
src/overlays/actors/ovl_En_Dns/z_en_dns.c
View file

@ -87,27 +87,27 @@ static char* D_809F0424[] = {
"緑のくすり売り ", "デクの棒持てる数を増やす", "デクの実持てる数を増やす",
};
static DnsItemEntry D_809F0450 = { 20, 5, GI_NUTS_5_2, func_809EF5A4, func_809EFA28 };
static DnsItemEntry D_809F0450 = { 20, 5, GI_DEKU_NUTS_5_2, func_809EF5A4, func_809EFA28 };
static DnsItemEntry D_809F0460 = { 15, 1, GI_STICKS_1, func_809EF658, func_809EF9F8 };
static DnsItemEntry D_809F0460 = { 15, 1, GI_DEKU_STICKS_1, func_809EF658, func_809EF9F8 };
static DnsItemEntry D_809F0470 = { 10, 1, GI_HEART_PIECE, func_809EF70C, func_809EFA58 };
static DnsItemEntry D_809F0480 = { 40, 30, GI_SEEDS_30, func_809EF73C, func_809EF9F8 };
static DnsItemEntry D_809F0480 = { 40, 30, GI_DEKU_SEEDS_30, func_809EF73C, func_809EF9F8 };
static DnsItemEntry D_809F0490 = { 50, 1, GI_SHIELD_DEKU, func_809EF800, func_809EF9F8 };
static DnsItemEntry D_809F04A0 = { 40, 5, GI_BOMBS_5, func_809EF854, func_809EFA9C };
static DnsItemEntry D_809F04B0 = { 70, 20, GI_ARROWS_LARGE, func_809EF8F4, func_809EFACC };
static DnsItemEntry D_809F04B0 = { 70, 20, GI_ARROWS_30, func_809EF8F4, func_809EFACC };
static DnsItemEntry D_809F04C0 = { 40, 1, GI_POTION_RED, func_809EF9A4, func_809EF9F8 };
static DnsItemEntry D_809F04C0 = { 40, 1, GI_BOTTLE_POTION_RED, func_809EF9A4, func_809EF9F8 };
static DnsItemEntry D_809F04D0 = { 40, 1, GI_POTION_GREEN, func_809EF9A4, func_809EF9F8 };
static DnsItemEntry D_809F04D0 = { 40, 1, GI_BOTTLE_POTION_GREEN, func_809EF9A4, func_809EF9F8 };
static DnsItemEntry D_809F04E0 = { 40, 1, GI_STICK_UPGRADE_20, func_809EF70C, func_809EFAFC };
static DnsItemEntry D_809F04E0 = { 40, 1, GI_DEKU_STICK_UPGRADE_20, func_809EF70C, func_809EFAFC };
static DnsItemEntry D_809F04F0 = { 40, 1, GI_NUT_UPGRADE_30, func_809EF70C, func_809EFB40 };
static DnsItemEntry D_809F04F0 = { 40, 1, GI_DEKU_NUT_UPGRADE_30, func_809EF70C, func_809EFB40 };
static DnsItemEntry* sItemEntries[] = {
&D_809F0450, &D_809F0460, &D_809F0470, &D_809F0480, &D_809F0490, &D_809F04A0,
@ -185,26 +185,26 @@ void EnDns_ChangeAnim(EnDns* this, u8 index) {
/* Item give checking functions */
u32 func_809EF5A4(EnDns* this) {
if ((CUR_CAPACITY(UPG_NUTS) != 0) && (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS))) {
if ((CUR_CAPACITY(UPG_DEKU_NUTS) != 0) && (AMMO(ITEM_DEKU_NUT) >= CUR_CAPACITY(UPG_DEKU_NUTS))) {
return 1;
}
if (gSaveContext.rupees < this->dnsItemEntry->itemPrice) {
return 0;
}
if (Item_CheckObtainability(ITEM_NUT) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_DEKU_NUT) == ITEM_NONE) {
return 2;
}
return 4;
}
u32 func_809EF658(EnDns* this) {
if ((CUR_CAPACITY(UPG_STICKS) != 0) && (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS))) {
if ((CUR_CAPACITY(UPG_DEKU_STICKS) != 0) && (AMMO(ITEM_DEKU_STICK) >= CUR_CAPACITY(UPG_DEKU_STICKS))) {
return 1;
}
if (gSaveContext.rupees < this->dnsItemEntry->itemPrice) {
return 0;
}
if (Item_CheckObtainability(ITEM_STICK) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_DEKU_STICK) == ITEM_NONE) {
return 2;
}
return 4;
@ -227,7 +227,7 @@ u32 func_809EF73C(EnDns* this) {
if (gSaveContext.rupees < this->dnsItemEntry->itemPrice) {
return 0;
}
if (Item_CheckObtainability(ITEM_SEEDS) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_DEKU_SEEDS) == ITEM_NONE) {
return 2;
}
return 4;
@ -369,16 +369,16 @@ void EnDns_Talk(EnDns* this, PlayState* play) {
void func_809EFDD0(EnDns* this, PlayState* play) {
if (this->actor.params == 0x9) {
if (CUR_UPG_VALUE(UPG_STICKS) < 2) {
func_8002F434(&this->actor, play, GI_STICK_UPGRADE_20, 130.0f, 100.0f);
if (CUR_UPG_VALUE(UPG_DEKU_STICKS) < 2) {
func_8002F434(&this->actor, play, GI_DEKU_STICK_UPGRADE_20, 130.0f, 100.0f);
} else {
func_8002F434(&this->actor, play, GI_STICK_UPGRADE_30, 130.0f, 100.0f);
func_8002F434(&this->actor, play, GI_DEKU_STICK_UPGRADE_30, 130.0f, 100.0f);
}
} else if (this->actor.params == 0xA) {
if (CUR_UPG_VALUE(UPG_NUTS) < 2) {
func_8002F434(&this->actor, play, GI_NUT_UPGRADE_30, 130.0f, 100.0f);
if (CUR_UPG_VALUE(UPG_DEKU_NUTS) < 2) {
func_8002F434(&this->actor, play, GI_DEKU_NUT_UPGRADE_30, 130.0f, 100.0f);
} else {
func_8002F434(&this->actor, play, GI_NUT_UPGRADE_40, 130.0f, 100.0f);
func_8002F434(&this->actor, play, GI_DEKU_NUT_UPGRADE_40, 130.0f, 100.0f);
}
} else {
func_8002F434(&this->actor, play, this->dnsItemEntry->getItemId, 130.0f, 100.0f);

14
src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
View file

@ -184,10 +184,10 @@ void EnDntJiji_Walk(EnDntJiji* this, PlayState* play) {
this->actor.speedXZ = 3.0f;
}
if (this->actor.xzDistToPlayer < 100.0f) {
if (CUR_UPG_VALUE(UPG_STICKS) == 1) {
this->getItemId = GI_STICK_UPGRADE_20;
if (CUR_UPG_VALUE(UPG_DEKU_STICKS) == 1) {
this->getItemId = GI_DEKU_STICK_UPGRADE_20;
} else {
this->getItemId = GI_STICK_UPGRADE_30;
this->getItemId = GI_DEKU_STICK_UPGRADE_30;
}
this->actor.textId = 0x104D;
Message_StartTextbox(play, this->actor.textId, NULL);
@ -216,10 +216,10 @@ void EnDntJiji_SetupCower(EnDntJiji* this, PlayState* play) {
EffectSsHahen_SpawnBurst(play, &this->actor.world.pos, 3.0f, 0, 9, 3, 10, HAHEN_OBJECT_DEFAULT, 10, NULL);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_NUTS_UP);
if ((CUR_UPG_VALUE(UPG_NUTS) == 1) || (CUR_UPG_VALUE(UPG_NUTS) == 0)) {
this->getItemId = GI_NUT_UPGRADE_30;
if ((CUR_UPG_VALUE(UPG_DEKU_NUTS) == 1) || (CUR_UPG_VALUE(UPG_DEKU_NUTS) == 0)) {
this->getItemId = GI_DEKU_NUT_UPGRADE_30;
} else {
this->getItemId = GI_NUT_UPGRADE_40;
this->getItemId = GI_DEKU_NUT_UPGRADE_40;
}
this->actor.flags |= ACTOR_FLAG_0;
this->actor.textId = 0x10DB;
@ -272,7 +272,7 @@ void EnDntJiji_SetupGivePrize(EnDntJiji* this, PlayState* play) {
void EnDntJiji_GivePrize(EnDntJiji* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
if ((this->getItemId == GI_NUT_UPGRADE_30) || (this->getItemId == GI_NUT_UPGRADE_40)) {
if ((this->getItemId == GI_DEKU_NUT_UPGRADE_30) || (this->getItemId == GI_DEKU_NUT_UPGRADE_40)) {
// "nut"
osSyncPrintf("実 \n");
osSyncPrintf("実 \n");

4
src/overlays/actors/ovl_En_Ds/z_en_ds.c
View file

@ -170,7 +170,7 @@ void EnDs_GiveBluePotion(EnDs* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = EnDs_Talk;
} else {
func_8002F434(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
func_8002F434(&this->actor, play, GI_BOTTLE_POTION_BLUE, 10000.0f, 50.0f);
}
}
@ -189,7 +189,7 @@ void EnDs_OfferBluePotion(EnDs* this, PlayState* play) {
case 2: // have 100 rupees and empty bottle
Rupees_ChangeBy(-100);
this->actor.flags &= ~ACTOR_FLAG_16;
func_8002F434(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
func_8002F434(&this->actor, play, GI_BOTTLE_POTION_BLUE, 10000.0f, 50.0f);
this->actionFunc = EnDs_GiveBluePotion;
return;
}

2
src/overlays/actors/ovl_En_Du/z_en_du.c
View file

@ -522,7 +522,7 @@ void func_809FEC70(EnDu* this, PlayState* play) {
} else {
f32 xzRange = this->actor.xzDistToPlayer + 1.0f;
func_8002F434(&this->actor, play, GI_BRACELET, xzRange, fabsf(this->actor.yDistToPlayer) + 1.0f);
func_8002F434(&this->actor, play, GI_GORONS_BRACELET, xzRange, fabsf(this->actor.yDistToPlayer) + 1.0f);
}
}

14
src/overlays/actors/ovl_En_Gb/z_en_gb.c
View file

@ -285,11 +285,11 @@ void func_80A2F83C(EnGb* this, PlayState* play) {
func_80A2F180(this);
this->actionFunc = func_80A2F94C;
break;
case EXCH_ITEM_POE:
case EXCH_ITEM_BOTTLE_POE:
player->actor.textId = 0x70F6;
this->actionFunc = func_80A2F9C0;
break;
case EXCH_ITEM_BIG_POE:
case EXCH_ITEM_BOTTLE_BIG_POE:
player->actor.textId = 0x70F7;
this->actionFunc = func_80A2FA50;
break;
@ -297,7 +297,7 @@ void func_80A2F83C(EnGb* this, PlayState* play) {
return;
}
if (this->dyna.actor.xzDistToPlayer < 100.0f) {
func_8002F298(&this->dyna.actor, play, 100.0f, EXCH_ITEM_POE);
func_8002F298(&this->dyna.actor, play, 100.0f, EXCH_ITEM_BOTTLE_POE);
}
}
@ -317,7 +317,7 @@ void func_80A2F9C0(EnGb* this, PlayState* play) {
SET_INFTABLE(INFTABLE_B6);
}
func_80A2F180(this);
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE);
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE_EMPTY, PLAYER_IA_BOTTLE);
Rupees_ChangeBy(10);
this->actionFunc = func_80A2F83C;
}
@ -329,7 +329,7 @@ void func_80A2FA50(EnGb* this, PlayState* play) {
SET_INFTABLE(INFTABLE_B6);
}
func_80A2F180(this);
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE);
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE_EMPTY, PLAYER_IA_BOTTLE);
Rupees_ChangeBy(50);
HIGH_SCORE(HS_POE_POINTS) += 100;
if (HIGH_SCORE(HS_POE_POINTS) != 1000) {
@ -350,7 +350,7 @@ void func_80A2FA50(EnGb* this, PlayState* play) {
void func_80A2FB40(EnGb* this, PlayState* play) {
if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE && Message_ShouldAdvance(play)) {
func_8002F434(&this->dyna.actor, play, GI_BOTTLE, 100.0f, 10.0f);
func_8002F434(&this->dyna.actor, play, GI_BOTTLE_EMPTY, 100.0f, 10.0f);
this->actionFunc = func_80A2FBB0;
}
}
@ -360,7 +360,7 @@ void func_80A2FBB0(EnGb* this, PlayState* play) {
this->dyna.actor.parent = NULL;
this->actionFunc = func_80A2FC0C;
} else {
func_8002F434(&this->dyna.actor, play, GI_BOTTLE, 100.0f, 10.0f);
func_8002F434(&this->dyna.actor, play, GI_BOTTLE_EMPTY, 100.0f, 10.0f);
}
}

2
src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
View file

@ -389,7 +389,7 @@ void EnGe1_RefuseOpenNoCard_GTGGuard(EnGe1* this, PlayState* play) {
}
void EnGe1_CheckForCard_GTGGuard(EnGe1* this, PlayState* play) {
if (CHECK_QUEST_ITEM(QUEST_GERUDO_CARD)) {
if (CHECK_QUEST_ITEM(QUEST_GERUDOS_CARD)) {
EnGe1_SetTalkAction(this, play, 0x6014, 100.0f, EnGe1_OfferOpen_GTGGuard);
} else {
//! @bug This outcome is inaccessible in normal gameplay since this function it is unreachable without

4
src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
View file

@ -451,7 +451,7 @@ void EnGe2_WaitTillCardGiven(EnGe2* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = EnGe2_SetActionAfterTalk;
} else {
func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
func_8002F434(&this->actor, play, GI_GERUDOS_CARD, 10000.0f, 50.0f);
}
}
@ -460,7 +460,7 @@ void EnGe2_GiveCard(EnGe2* this, PlayState* play) {
Message_CloseTextbox(play);
this->actor.flags &= ~ACTOR_FLAG_16;
this->actionFunc = EnGe2_WaitTillCardGiven;
func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
func_8002F434(&this->actor, play, GI_GERUDOS_CARD, 10000.0f, 50.0f);
}
}

4
src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
View file

@ -141,7 +141,7 @@ void EnGe3_WaitTillCardGiven(EnGe3* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = EnGe3_Wait;
} else {
func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
func_8002F434(&this->actor, play, GI_GERUDOS_CARD, 10000.0f, 50.0f);
}
}
@ -150,7 +150,7 @@ void EnGe3_GiveCard(EnGe3* this, PlayState* play) {
Message_CloseTextbox(play);
this->actor.flags &= ~ACTOR_FLAG_16;
this->actionFunc = EnGe3_WaitTillCardGiven;
func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
func_8002F434(&this->actor, play, GI_GERUDOS_CARD, 10000.0f, 50.0f);
}
}

118
src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View file

@ -133,7 +133,7 @@ static char* sShopItemDescriptions[] = {
};
static s16 sMaskShopItems[8] = {
ITEM_MASK_KEATON, ITEM_MASK_SPOOKY, ITEM_MASK_SKULL, ITEM_MASK_BUNNY,
ITEM_MASK_KEATON, ITEM_MASK_SPOOKY, ITEM_MASK_SKULL, ITEM_MASK_BUNNY_HOOD,
ITEM_MASK_TRUTH, ITEM_MASK_ZORA, ITEM_MASK_GORON, ITEM_MASK_GERUDO,
};
@ -155,40 +155,40 @@ typedef struct {
static ShopItemEntry shopItemEntries[] = {
// SI_DEKU_NUTS_5
{ OBJECT_GI_NUTS, GID_NUTS, func_8002ED80, 15, 5, 0x00B2, 0x007F, GI_NUTS_5_2, EnGirlA_CanBuy_DekuNuts,
{ OBJECT_GI_NUTS, GID_DEKU_NUTS, func_8002ED80, 15, 5, 0x00B2, 0x007F, GI_DEKU_NUTS_5_2, EnGirlA_CanBuy_DekuNuts,
EnGirlA_ItemGive_DekuNuts, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_ARROWS_30 */
{ OBJECT_GI_ARROW, GID_ARROWS_MEDIUM, func_8002EBCC, 60, 30, 0x00C1, 0x009B, GI_ARROWS_MEDIUM,
EnGirlA_CanBuy_Arrows, EnGirlA_ItemGive_Arrows, EnGirlA_BuyEvent_ShieldDiscount },
{ OBJECT_GI_ARROW, GID_ARROWS_10, func_8002EBCC, 60, 30, 0x00C1, 0x009B, GI_ARROWS_10, EnGirlA_CanBuy_Arrows,
EnGirlA_ItemGive_Arrows, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_ARROWS_50 */
{ OBJECT_GI_ARROW, GID_ARROWS_LARGE, func_8002EBCC, 90, 50, 0x00B0, 0x007D, GI_ARROWS_LARGE, EnGirlA_CanBuy_Arrows,
{ OBJECT_GI_ARROW, GID_ARROWS_30, func_8002EBCC, 90, 50, 0x00B0, 0x007D, GI_ARROWS_30, EnGirlA_CanBuy_Arrows,
EnGirlA_ItemGive_Arrows, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_BOMBS_5_R25 */
{ OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 25, 5, 0x00A3, 0x008B, GI_BOMBS_5, EnGirlA_CanBuy_Bombs,
EnGirlA_ItemGive_Bombs, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_DEKU_NUTS_10 */
{ OBJECT_GI_NUTS, GID_NUTS, func_8002ED80, 30, 10, 0x00A2, 0x0087, GI_NUTS_10, EnGirlA_CanBuy_DekuNuts,
{ OBJECT_GI_NUTS, GID_DEKU_NUTS, func_8002ED80, 30, 10, 0x00A2, 0x0087, GI_DEKU_NUTS_10, EnGirlA_CanBuy_DekuNuts,
EnGirlA_ItemGive_DekuNuts, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_DEKU_STICK */
{ OBJECT_GI_STICK, GID_STICK, NULL, 10, 1, 0x00A1, 0x0088, GI_STICKS_1, EnGirlA_CanBuy_DekuSticks,
{ OBJECT_GI_STICK, GID_DEKU_STICK, NULL, 10, 1, 0x00A1, 0x0088, GI_DEKU_STICKS_1, EnGirlA_CanBuy_DekuSticks,
EnGirlA_ItemGive_DekuSticks, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_BOMBS_10 */
{ OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 50, 10, 0x00B1, 0x007C, GI_BOMBS_10, EnGirlA_CanBuy_Bombs,
EnGirlA_ItemGive_Bombs, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_FISH */
{ OBJECT_GI_FISH, GID_FISH, func_8002ED80, 200, 1, 0x00B3, 0x007E, GI_FISH, EnGirlA_CanBuy_Fish, NULL,
{ OBJECT_GI_FISH, GID_FISH, func_8002ED80, 200, 1, 0x00B3, 0x007E, GI_BOTTLE_FISH, EnGirlA_CanBuy_Fish, NULL,
EnGirlA_BuyEvent_ShieldDiscount },
/* SI_RED_POTION_R30 */
{ OBJECT_GI_LIQUID, GID_POTION_RED, func_8002EBCC, 30, 1, 0x00A5, 0x008E, GI_POTION_RED, EnGirlA_CanBuy_RedPotion,
EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
{ OBJECT_GI_LIQUID, GID_BOTTLE_POTION_RED, func_8002EBCC, 30, 1, 0x00A5, 0x008E, GI_BOTTLE_POTION_RED,
EnGirlA_CanBuy_RedPotion, EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_GREEN_POTION */
{ OBJECT_GI_LIQUID, GID_POTION_GREEN, func_8002EBCC, 30, 1, 0x00A6, 0x008F, GI_POTION_GREEN,
{ OBJECT_GI_LIQUID, GID_BOTTLE_POTION_GREEN, func_8002EBCC, 30, 1, 0x00A6, 0x008F, GI_BOTTLE_POTION_GREEN,
EnGirlA_CanBuy_GreenPotion, EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_BLUE_POTION */
{ OBJECT_GI_LIQUID, GID_POTION_BLUE, func_8002EBCC, 60, 1, 0x00A7, 0x0090, GI_POTION_BLUE,
{ OBJECT_GI_LIQUID, GID_BOTTLE_POTION_BLUE, func_8002EBCC, 60, 1, 0x00A7, 0x0090, GI_BOTTLE_POTION_BLUE,
EnGirlA_CanBuy_BluePotion, EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_LONGSWORD */
{ OBJECT_GI_LONGSWORD, GID_SWORD_BGS, func_8002EBCC, 1000, 1, 0x00A8, 0x0091, GI_SWORD_KNIFE,
{ OBJECT_GI_LONGSWORD, GID_SWORD_BIGGORON, func_8002EBCC, 1000, 1, 0x00A8, 0x0091, GI_SWORD_KNIFE,
EnGirlA_CanBuy_Longsword, EnGirlA_ItemGive_Longsword, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_HYLIAN_SHIELD */
{ OBJECT_GI_SHIELD_2, GID_SHIELD_HYLIAN, func_8002EBCC, 80, 1, 0x00A9, 0x0092, GI_SHIELD_HYLIAN,
@ -206,13 +206,13 @@ static ShopItemEntry shopItemEntries[] = {
{ OBJECT_GI_HEART, GID_RECOVERY_HEART, NULL, 10, 16, 0x00AC, 0x0095, GI_RECOVERY_HEART,
EnGirlA_CanBuy_RecoveryHeart, EnGirlA_ItemGive_Health, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_MILK_BOTTLE */
{ OBJECT_GI_MILK, GID_MILK, func_80A3C498, 100, 1, 0x00AD, 0x0097, GI_MILK_BOTTLE, EnGirlA_CanBuy_MilkBottle,
EnGirlA_ItemGive_MilkBottle, EnGirlA_BuyEvent_ShieldDiscount },
{ OBJECT_GI_MILK, GID_BOTTLE_MILK_FULL, func_80A3C498, 100, 1, 0x00AD, 0x0097, GI_BOTTLE_MILK_FULL,
EnGirlA_CanBuy_MilkBottle, EnGirlA_ItemGive_MilkBottle, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_WEIRD_EGG */
{ OBJECT_GI_EGG, GID_EGG, func_8002EBCC, 100, 1, 0x00AE, 0x0099, GI_WEIRD_EGG, EnGirlA_CanBuy_WeirdEgg,
EnGirlA_ItemGive_WeirdEgg, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_19 */
{ OBJECT_GI_MILK, GID_MILK, func_80A3C498, 10000, 1, 0x00B4, 0x0085, GI_NONE, EnGirlA_CanBuy_Unk19,
{ OBJECT_GI_MILK, GID_BOTTLE_MILK_FULL, func_80A3C498, 10000, 1, 0x00B4, 0x0085, GI_NONE, EnGirlA_CanBuy_Unk19,
EnGirlA_ItemGive_Unk19, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_20 */
{ OBJECT_GI_EGG, GID_EGG, func_8002EBCC, 10000, 1, 0x00B5, 0x0085, GI_NONE, EnGirlA_CanBuy_Unk20,
@ -242,7 +242,7 @@ static ShopItemEntry shopItemEntries[] = {
{ OBJECT_GI_BOMB_2, GID_BOMBCHU, func_8002EBCC, 100, 10, 0x00BC, 0x008C, GI_BOMBCHUS_10, EnGirlA_CanBuy_Bombchus,
NULL, EnGirlA_BuyEvent_ObtainBombchuPack },
/* SI_DEKU_SEEDS_30 */
{ OBJECT_GI_SEED, GID_SEEDS, func_8002EBCC, 30, 30, 0x00DF, 0x00DE, GI_SEEDS_30, EnGirlA_CanBuy_DekuSeeds,
{ OBJECT_GI_SEED, GID_DEKU_SEEDS, func_8002EBCC, 30, 30, 0x00DF, 0x00DE, GI_DEKU_SEEDS_30, EnGirlA_CanBuy_DekuSeeds,
EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_KEATON_MASK */
{ OBJECT_GI_KI_TAN_MASK, GID_MASK_KEATON, func_8002EBCC, 0, 1, 0x70B2, 0x70BE, GI_MASK_KEATON,
@ -254,7 +254,7 @@ static ShopItemEntry shopItemEntries[] = {
{ OBJECT_GI_SKJ_MASK, GID_MASK_SKULL, func_8002EBCC, 0, 1, 0x70B0, 0x70BC, GI_MASK_SKULL, EnGirlA_CanBuy_DekuSeeds,
EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_BUNNY_HOOD */
{ OBJECT_GI_RABIT_MASK, GID_MASK_BUNNY, func_8002EBCC, 0, 1, 0x70B3, 0x70BF, GI_MASK_BUNNY,
{ OBJECT_GI_RABIT_MASK, GID_MASK_BUNNY_HOOD, func_8002EBCC, 0, 1, 0x70B3, 0x70BF, GI_MASK_BUNNY_HOOD,
EnGirlA_CanBuy_DekuSeeds, EnGirlA_ItemGive_DekuSeeds, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_MASK_OF_TRUTH */
{ OBJECT_GI_TRUTH_MASK, GID_MASK_TRUTH, func_80A3C498, 0, 1, 0x70AF, 0x70C3, GI_MASK_TRUTH,
@ -272,22 +272,22 @@ static ShopItemEntry shopItemEntries[] = {
{ OBJECT_GI_SOLDOUT, GID_SOLDOUT, func_8002EBCC, 0, 0, 0x00BD, 0x70C2, GI_MASK_GERUDO, EnGirlA_CanBuy_SoldOut, NULL,
NULL },
/* SI_BLUE_FIRE */
{ OBJECT_GI_FIRE, GID_BLUE_FIRE, func_8002EBCC, 300, 1, 0x00B9, 0x00B8, GI_BLUE_FIRE, EnGirlA_CanBuy_BlueFire,
EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
{ OBJECT_GI_FIRE, GID_BLUE_FIRE, func_8002EBCC, 300, 1, 0x00B9, 0x00B8, GI_BOTTLE_BLUE_FIRE,
EnGirlA_CanBuy_BlueFire, EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_BUGS */
{ OBJECT_GI_INSECT, GID_BUG, func_80A3C498, 50, 1, 0x00BB, 0x00BA, GI_BUGS, EnGirlA_CanBuy_Bugs,
{ OBJECT_GI_INSECT, GID_BUG, func_80A3C498, 50, 1, 0x00BB, 0x00BA, GI_BOTTLE_BUGS, EnGirlA_CanBuy_Bugs,
EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_BIG_POE */
{ OBJECT_GI_GHOST, GID_BIG_POE, func_80A3C498, 50, 1, 0x506F, 0x5070, GI_BIG_POE, EnGirlA_CanBuy_Poe,
{ OBJECT_GI_GHOST, GID_BIG_POE, func_80A3C498, 50, 1, 0x506F, 0x5070, GI_BOTTLE_BIG_POE, EnGirlA_CanBuy_Poe,
EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_POE */
{ OBJECT_GI_GHOST, GID_POE, func_80A3C498, 30, 1, 0x506D, 0x506E, GI_POE, EnGirlA_CanBuy_Poe,
{ OBJECT_GI_GHOST, GID_POE, func_80A3C498, 30, 1, 0x506D, 0x506E, GI_BOTTLE_POE, EnGirlA_CanBuy_Poe,
EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_FAIRY */
{ OBJECT_GI_SOUL, GID_FAIRY, func_80A3C498, 50, 1, 0x00B7, 0x00B6, GI_FAIRY, EnGirlA_CanBuy_Fairy,
{ OBJECT_GI_SOUL, GID_FAIRY, func_80A3C498, 50, 1, 0x00B7, 0x00B6, GI_BOTTLE_FAIRY, EnGirlA_CanBuy_Fairy,
EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_ARROWS_10 */
{ OBJECT_GI_ARROW, GID_ARROWS_SMALL, func_8002EBCC, 20, 10, 0x00A0, 0x008A, GI_ARROWS_SMALL, EnGirlA_CanBuy_Arrows,
{ OBJECT_GI_ARROW, GID_ARROWS_5, func_8002EBCC, 20, 10, 0x00A0, 0x008A, GI_ARROWS_5, EnGirlA_CanBuy_Arrows,
EnGirlA_ItemGive_Arrows, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_BOMBS_20 */
{ OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 80, 20, 0x001C, 0x0006, GI_BOMBS_20, EnGirlA_CanBuy_Bombs,
@ -299,11 +299,11 @@ static ShopItemEntry shopItemEntries[] = {
{ OBJECT_GI_BOMB_1, GID_BOMB, func_8002EBCC, 35, 5, 0x00CB, 0x00CA, GI_BOMBS_5, EnGirlA_CanBuy_Bombs,
EnGirlA_ItemGive_Bombs, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_RED_POTION_R40 */
{ OBJECT_GI_LIQUID, GID_POTION_RED, func_8002EBCC, 40, 1, 0x0064, 0x0062, GI_POTION_RED, EnGirlA_CanBuy_RedPotion,
EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
{ OBJECT_GI_LIQUID, GID_BOTTLE_POTION_RED, func_8002EBCC, 40, 1, 0x0064, 0x0062, GI_BOTTLE_POTION_RED,
EnGirlA_CanBuy_RedPotion, EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_RED_POTION_R50 */
{ OBJECT_GI_LIQUID, GID_POTION_RED, func_8002EBCC, 50, 1, 0x0065, 0x0063, GI_POTION_RED, EnGirlA_CanBuy_RedPotion,
EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount }
{ OBJECT_GI_LIQUID, GID_BOTTLE_POTION_RED, func_8002EBCC, 50, 1, 0x0065, 0x0063, GI_BOTTLE_POTION_RED,
EnGirlA_CanBuy_RedPotion, EnGirlA_ItemGive_BottledItem, EnGirlA_BuyEvent_ShieldDiscount }
};
// Defines the Hylian Shield discount amount
@ -445,26 +445,26 @@ s32 EnGirlA_CanBuy_Bombs(PlayState* play, EnGirlA* this) {
}
s32 EnGirlA_CanBuy_DekuNuts(PlayState* play, EnGirlA* this) {
if ((CUR_CAPACITY(UPG_NUTS) != 0) && (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS))) {
if ((CUR_CAPACITY(UPG_DEKU_NUTS) != 0) && (AMMO(ITEM_DEKU_NUT) >= CUR_CAPACITY(UPG_DEKU_NUTS))) {
return CANBUY_RESULT_CANT_GET_NOW;
}
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_NUT) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_DEKU_NUT) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
}
s32 EnGirlA_CanBuy_DekuSticks(PlayState* play, EnGirlA* this) {
if ((CUR_CAPACITY(UPG_STICKS) != 0) && (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS))) {
if ((CUR_CAPACITY(UPG_DEKU_STICKS) != 0) && (AMMO(ITEM_DEKU_STICK) >= CUR_CAPACITY(UPG_DEKU_STICKS))) {
return CANBUY_RESULT_CANT_GET_NOW;
}
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_STICK) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_DEKU_STICK) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -477,7 +477,7 @@ s32 EnGirlA_CanBuy_Fish(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_FISH) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_BOTTLE_FISH) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -490,7 +490,7 @@ s32 EnGirlA_CanBuy_RedPotion(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_POTION_RED) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_BOTTLE_POTION_RED) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -503,7 +503,7 @@ s32 EnGirlA_CanBuy_GreenPotion(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_POTION_GREEN) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_BOTTLE_POTION_GREEN) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -516,7 +516,7 @@ s32 EnGirlA_CanBuy_BluePotion(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_POTION_BLUE) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_BOTTLE_POTION_BLUE) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -530,7 +530,7 @@ s32 EnGirlA_CanBuy_Longsword(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_SWORD_BGS) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_SWORD_BIGGORON) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -608,7 +608,7 @@ s32 EnGirlA_CanBuy_MilkBottle(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_MILK_BOTTLE) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_BOTTLE_MILK_FULL) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -618,7 +618,7 @@ s32 EnGirlA_CanBuy_WeirdEgg(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_LETTER_ZELDA) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_ZELDAS_LETTER) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -652,7 +652,7 @@ s32 EnGirlA_CanBuy_DekuSeeds(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_SEEDS) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_DEKU_SEEDS) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -669,7 +669,7 @@ s32 EnGirlA_CanBuy_BlueFire(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_BLUE_FIRE) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_BOTTLE_BLUE_FIRE) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -682,7 +682,7 @@ s32 EnGirlA_CanBuy_Bugs(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_BUG) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_BOTTLE_BUG) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -695,7 +695,7 @@ s32 EnGirlA_CanBuy_Poe(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_POE) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_BOTTLE_POE) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -708,7 +708,7 @@ s32 EnGirlA_CanBuy_Fairy(PlayState* play, EnGirlA* this) {
if (gSaveContext.rupees < this->basePrice) {
return CANBUY_RESULT_NEED_RUPEES;
}
if (Item_CheckObtainability(ITEM_FAIRY) == ITEM_NONE) {
if (Item_CheckObtainability(ITEM_BOTTLE_FAIRY) == ITEM_NONE) {
return CANBUY_RESULT_SUCCESS_FANFARE;
}
return CANBUY_RESULT_SUCCESS;
@ -740,17 +740,17 @@ void EnGirlA_ItemGive_Bombs(PlayState* play, EnGirlA* this) {
void EnGirlA_ItemGive_DekuNuts(PlayState* play, EnGirlA* this) {
switch (this->itemCount) {
case 5:
Item_Give(play, ITEM_NUTS_5);
Item_Give(play, ITEM_DEKU_NUTS_5);
break;
case 10:
Item_Give(play, ITEM_NUTS_10);
Item_Give(play, ITEM_DEKU_NUTS_10);
break;
}
Rupees_ChangeBy(-this->basePrice);
}
void EnGirlA_ItemGive_DekuSticks(PlayState* play, EnGirlA* this) {
Item_Give(play, ITEM_STICK);
Item_Give(play, ITEM_DEKU_STICK);
Rupees_ChangeBy(-this->basePrice);
}
@ -786,7 +786,7 @@ void EnGirlA_ItemGive_Health(PlayState* play, EnGirlA* this) {
}
void EnGirlA_ItemGive_MilkBottle(PlayState* play, EnGirlA* this) {
Item_Give(play, ITEM_MILK_BOTTLE);
Item_Give(play, ITEM_BOTTLE_MILK_FULL);
Rupees_ChangeBy(-this->basePrice);
}
@ -804,38 +804,38 @@ void EnGirlA_ItemGive_Unk20(PlayState* play, EnGirlA* this) {
}
void EnGirlA_ItemGive_DekuSeeds(PlayState* play, EnGirlA* this) {
Item_Give(play, ITEM_SEEDS_30);
Item_Give(play, ITEM_DEKU_SEEDS_30);
Rupees_ChangeBy(-this->basePrice);
}
void EnGirlA_ItemGive_BottledItem(PlayState* play, EnGirlA* this) {
switch (this->actor.params) {
case SI_FISH:
Item_Give(play, ITEM_FISH);
Item_Give(play, ITEM_BOTTLE_FISH);
break;
case SI_RED_POTION_R30:
Item_Give(play, ITEM_POTION_RED);
Item_Give(play, ITEM_BOTTLE_POTION_RED);
break;
case SI_GREEN_POTION:
Item_Give(play, ITEM_POTION_GREEN);
Item_Give(play, ITEM_BOTTLE_POTION_GREEN);
break;
case SI_BLUE_POTION:
Item_Give(play, ITEM_POTION_BLUE);
Item_Give(play, ITEM_BOTTLE_POTION_BLUE);
break;
case SI_BLUE_FIRE:
Item_Give(play, ITEM_BLUE_FIRE);
Item_Give(play, ITEM_BOTTLE_BLUE_FIRE);
break;
case SI_BUGS:
Item_Give(play, ITEM_BUG);
Item_Give(play, ITEM_BOTTLE_BUG);
break;
case SI_BIG_POE:
Item_Give(play, ITEM_BIG_POE);
Item_Give(play, ITEM_BOTTLE_BIG_POE);
break;
case SI_POE:
Item_Give(play, ITEM_POE);
Item_Give(play, ITEM_BOTTLE_POE);
break;
case SI_FAIRY:
Item_Give(play, ITEM_FAIRY);
Item_Give(play, ITEM_BOTTLE_FAIRY);
break;
}
Rupees_ChangeBy(-this->basePrice);

22
src/overlays/actors/ovl_En_Go/z_en_go.c
View file

@ -101,13 +101,13 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
} else {
return 0x305D;
}
} else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_EYEDROPS) {
player->exchangeItemId = EXCH_ITEM_EYEDROPS;
} else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_EYE_DROPS) {
player->exchangeItemId = EXCH_ITEM_EYE_DROPS;
return 0x3059;
} else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_PRESCRIPTION) {
return 0x3058;
} else {
player->exchangeItemId = EXCH_ITEM_SWORD_BROKEN;
player->exchangeItemId = EXCH_ITEM_BROKEN_GORONS_SWORD;
return 0x3053;
}
case 0x00:
@ -593,8 +593,8 @@ void func_80A3F908(EnGo* this, PlayState* play) {
}
if (((this->actor.params & 0xF0) == 0x90) && (isUnkCondition == true)) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_SWORD_BROKEN) {
if (func_8002F368(play) == EXCH_ITEM_SWORD_BROKEN) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_BROKEN_GORONS_SWORD) {
if (func_8002F368(play) == EXCH_ITEM_BROKEN_GORONS_SWORD) {
if (GET_INFTABLE(INFTABLE_B4)) {
this->actor.textId = 0x3055;
} else {
@ -606,8 +606,8 @@ void func_80A3F908(EnGo* this, PlayState* play) {
player->actor.textId = this->actor.textId;
}
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYEDROPS) {
if (func_8002F368(play) == EXCH_ITEM_EYEDROPS) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYE_DROPS) {
if (func_8002F368(play) == EXCH_ITEM_EYE_DROPS) {
this->actor.textId = 0x3059;
} else {
this->actor.textId = 0x3058;
@ -859,7 +859,7 @@ void EnGo_BiggoronActionFunc(EnGo* this, PlayState* play) {
if (gSaveContext.bgsFlag) {
this->unk_1E0.unk_00 = 0;
} else {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYEDROPS) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYE_DROPS) {
EnGo_ChangeAnim(this, ENGO_ANIM_2);
this->unk_21E = 100;
this->unk_1E0.unk_00 = 0;
@ -954,13 +954,13 @@ void EnGo_GetItem(EnGo* this, PlayState* play) {
this->unk_20C = 0;
if ((this->actor.params & 0xF0) == 0x90) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK) {
getItemId = GI_SWORD_BGS;
getItemId = GI_SWORD_BIGGORON;
this->unk_20C = 1;
}
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYEDROPS) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYE_DROPS) {
getItemId = GI_CLAIM_CHECK;
}
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_SWORD_BROKEN) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_BROKEN_GORONS_SWORD) {
getItemId = GI_PRESCRIPTION;
}
}

23
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -569,10 +569,10 @@ u16 EnGo2_GetTextIdGoronDmtBiggoron(PlayState* play, EnGo2* this) {
player->exchangeItemId = EXCH_ITEM_CLAIM_CHECK;
return 0x305E;
} else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_PRESCRIPTION) {
player->exchangeItemId = EXCH_ITEM_EYEDROPS;
player->exchangeItemId = EXCH_ITEM_EYE_DROPS;
return 0x3058;
} else {
player->exchangeItemId = EXCH_ITEM_SWORD_BROKEN;
player->exchangeItemId = EXCH_ITEM_BROKEN_GORONS_SWORD;
return 0x3053;
}
}
@ -585,7 +585,7 @@ s16 EnGo2_GetStateGoronDmtBiggoron(PlayState* play, EnGo2* this) {
case TEXT_STATE_DONE:
if (this->actor.textId == 0x305E) {
if (!gSaveContext.bgsFlag) {
EnGo2_GetItem(this, play, GI_SWORD_BGS);
EnGo2_GetItem(this, play, GI_SWORD_BIGGORON);
this->actionFunc = EnGo2_SetupGetItem;
return 2;
} else {
@ -1056,7 +1056,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
} else if ((INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_PRESCRIPTION) &&
(INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_CLAIM_CHECK)) {
if (func_8002F368(play) == EXCH_ITEM_EYEDROPS) {
if (func_8002F368(play) == EXCH_ITEM_EYE_DROPS) {
this->actor.textId = 0x3059;
} else {
this->actor.textId = 0x3058;
@ -1066,8 +1066,8 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
}
player->actor.textId = this->actor.textId;
} else if (INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_SWORD_BROKEN) {
if (func_8002F368(play) == EXCH_ITEM_SWORD_BROKEN) {
} else if (INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_BROKEN_GORONS_SWORD) {
if (func_8002F368(play) == EXCH_ITEM_BROKEN_GORONS_SWORD) {
if (GET_INFTABLE(INFTABLE_B4)) {
textId = 0x3055;
} else {
@ -1132,7 +1132,8 @@ void func_80A454CC(EnGo2* this) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_9);
break;
case GORON_DMT_BIGGORON:
if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_SWORD_BROKEN && INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_EYEDROPS) {
if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_BROKEN_GORONS_SWORD &&
INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_EYE_DROPS) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_4);
break;
}
@ -1498,7 +1499,7 @@ void EnGo2_GoronFireClearCamera(EnGo2* this, PlayState* play) {
}
void EnGo2_BiggoronAnimation(EnGo2* this) {
if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_SWORD_BROKEN && INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_EYEDROPS &&
if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_BROKEN_GORONS_SWORD && INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_EYE_DROPS &&
(this->actor.params & 0x1F) == GORON_DMT_BIGGORON && this->unk_194.unk_00 == 0) {
if (DECR(this->animTimer) == 0) {
this->animTimer = Rand_S16Offset(30, 30);
@ -1597,8 +1598,8 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
case GORON_DMT_BIGGORON:
this->actor.shape.shadowDraw = NULL;
this->actor.flags &= ~ACTOR_FLAG_0;
if ((INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_SWORD_BROKEN) &&
(INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_EYEDROPS)) {
if ((INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_BROKEN_GORONS_SWORD) &&
(INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_EYE_DROPS)) {
this->eyeMouthTexState = 1;
}
this->collider.base.acFlags = AC_NONE;
@ -1805,7 +1806,7 @@ void EnGo2_SetGetItem(EnGo2* this, PlayState* play) {
SET_INFTABLE(INFTABLE_109);
EnGo2_GetItemAnimation(this, play);
return;
case GI_SWORD_BGS:
case GI_SWORD_BIGGORON:
gSaveContext.bgsFlag = true;
break;
case GI_BOMB_BAG_30:

4
src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
View file

@ -403,7 +403,7 @@ void func_80A53AD4(EnHeishi2* this, PlayState* play) {
this->unk_300 = TEXT_STATE_DONE;
if (Actor_ProcessTalkRequest(&this->actor, play)) {
exchangeItemId = func_8002F368(play);
if (exchangeItemId == EXCH_ITEM_LETTER_ZELDA) {
if (exchangeItemId == EXCH_ITEM_ZELDAS_LETTER) {
func_80078884(NA_SE_SY_CORRECT_CHIME);
player->actor.textId = 0x2010;
this->unk_300 = TEXT_STATE_EVENT;
@ -415,7 +415,7 @@ void func_80A53AD4(EnHeishi2* this, PlayState* play) {
yawDiffTemp = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
yawDiff = ABS(yawDiffTemp);
if (!(120.0f < this->actor.xzDistToPlayer) && (yawDiff < 0x4300)) {
func_8002F298(&this->actor, play, 100.0f, EXCH_ITEM_LETTER_ZELDA);
func_8002F298(&this->actor, play, 100.0f, EXCH_ITEM_ZELDAS_LETTER);
}
}
}

24
src/overlays/actors/ovl_En_Hy/z_en_hy.c
View file

@ -421,7 +421,7 @@ u16 func_80A6F810(PlayState* play, Actor* thisx) {
if (textId != 0) {
if ((this->actor.params & 0x7F) == ENHY_TYPE_BOJ_5) {
player->exchangeItemId = EXCH_ITEM_BLUE_FIRE;
player->exchangeItemId = EXCH_ITEM_BOTTLE_BLUE_FIRE;
}
return textId;
}
@ -473,7 +473,7 @@ u16 func_80A6F810(PlayState* play, Actor* thisx) {
case ENHY_TYPE_AHG_4:
return GET_EVENTCHKINF(EVENTCHKINF_80) ? 0x704B : (GET_INFTABLE(INFTABLE_C5) ? 0x7024 : 0x7023);
case ENHY_TYPE_BOJ_5:
player->exchangeItemId = EXCH_ITEM_BLUE_FIRE;
player->exchangeItemId = EXCH_ITEM_BOTTLE_BLUE_FIRE;
return 0x700C;
case ENHY_TYPE_BBA:
return GET_EVENTCHKINF(EVENTCHKINF_80) ? 0x704A : (GET_INFTABLE(INFTABLE_C6) ? 0x7022 : 0x7021);
@ -554,7 +554,7 @@ u16 func_80A6F810(PlayState* play, Actor* thisx) {
s16 func_80A70058(PlayState* play, Actor* thisx) {
EnHy* this = (EnHy*)thisx;
s16 beggarItems[] = { ITEM_BLUE_FIRE, ITEM_FISH, ITEM_BUG, ITEM_FAIRY };
s16 beggarItems[] = { ITEM_BOTTLE_BLUE_FIRE, ITEM_BOTTLE_FISH, ITEM_BOTTLE_BUG, ITEM_BOTTLE_FAIRY };
s16 beggarRewards[] = { 150, 100, 50, 25 };
switch (Message_GetState(&play->msgCtx)) {
@ -596,7 +596,7 @@ s16 func_80A70058(PlayState* play, Actor* thisx) {
case 0x70F3:
Rupees_ChangeBy(beggarRewards[this->actor.textId - 0x70F0]);
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENHY_ANIM_17);
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_IA_BOTTLE);
Player_UpdateBottleHeld(play, GET_PLAYER(play), ITEM_BOTTLE_EMPTY, PLAYER_IA_BOTTLE);
break;
case 0x7016:
SET_INFTABLE(INFTABLE_C0);
@ -723,12 +723,12 @@ void func_80A70834(EnHy* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if ((this->actor.params & 0x7F) == ENHY_TYPE_BOJ_5) {
if (!Inventory_HasSpecificBottle(ITEM_BLUE_FIRE) && !Inventory_HasSpecificBottle(ITEM_BUG) &&
!Inventory_HasSpecificBottle(ITEM_FISH)) {
if (!Inventory_HasSpecificBottle(ITEM_BOTTLE_BLUE_FIRE) && !Inventory_HasSpecificBottle(ITEM_BOTTLE_BUG) &&
!Inventory_HasSpecificBottle(ITEM_BOTTLE_FISH)) {
switch (func_8002F368(play)) {
case EXCH_ITEM_POE:
case EXCH_ITEM_BIG_POE:
case EXCH_ITEM_LETTER_RUTO:
case EXCH_ITEM_BOTTLE_POE:
case EXCH_ITEM_BOTTLE_BIG_POE:
case EXCH_ITEM_BOTTLE_RUTOS_LETTER:
this->actor.textId = 0x70EF;
break;
default:
@ -739,13 +739,13 @@ void func_80A70834(EnHy* this, PlayState* play) {
}
} else {
switch (func_8002F368(play)) {
case EXCH_ITEM_BLUE_FIRE:
case EXCH_ITEM_BOTTLE_BLUE_FIRE:
this->actor.textId = 0x70F0;
break;
case EXCH_ITEM_FISH:
case EXCH_ITEM_BOTTLE_FISH:
this->actor.textId = 0x70F1;
break;
case EXCH_ITEM_BUG:
case EXCH_ITEM_BOTTLE_BUG:
this->actor.textId = 0x70F2;
break;
default:

2
src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
View file

@ -362,7 +362,7 @@ void EnKarebaba_DeadItemDrop(EnKarebaba* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play) || this->actor.params == 0) {
EnKarebaba_SetupDead(this);
} else {
func_8002F554(&this->actor, play, GI_STICKS_1);
func_8002F554(&this->actor, play, GI_DEKU_STICKS_1);
}
}

2
src/overlays/actors/ovl_En_Ko/z_en_ko.c
View file

@ -1198,7 +1198,7 @@ void func_80A99504(EnKo* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = func_80A99560;
} else {
func_8002F434(&this->actor, play, GI_SAW, 120.0f, 10.0f);
func_8002F434(&this->actor, play, GI_POACHERS_SAW, 120.0f, 10.0f);
}
}

12
src/overlays/actors/ovl_En_Kz/z_en_kz.c
View file

@ -76,7 +76,7 @@ u16 EnKz_GetTextNoMaskChild(PlayState* play, EnKz* this) {
} else if (GET_EVENTCHKINF(EVENTCHKINF_33)) {
return 0x401C;
} else {
player->exchangeItemId = EXCH_ITEM_LETTER_RUTO;
player->exchangeItemId = EXCH_ITEM_BOTTLE_RUTOS_LETTER;
return 0x401A;
}
}
@ -84,7 +84,7 @@ u16 EnKz_GetTextNoMaskChild(PlayState* play, EnKz* this) {
u16 EnKz_GetTextNoMaskAdult(PlayState* play, EnKz* this) {
Player* player = GET_PLAYER(play);
if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_FROG) {
if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_EYEBALL_FROG) {
if (!GET_INFTABLE(INFTABLE_139)) {
if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_ZORA)) {
return 0x401F;
@ -237,7 +237,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
if (func_80A9C95C(play, this, &this->unk_1E0.unk_00, 340.0f, EnKz_GetText, func_80A9C6C0)) {
if ((this->actor.textId == 0x401A) && !GET_EVENTCHKINF(EVENTCHKINF_33)) {
if (func_8002F368(play) == EXCH_ITEM_LETTER_RUTO) {
if (func_8002F368(play) == EXCH_ITEM_BOTTLE_RUTOS_LETTER) {
this->actor.textId = 0x401B;
this->sfxPlayed = false;
} else {
@ -394,7 +394,7 @@ void EnKz_Mweep(EnKz* this, PlayState* play) {
Play_CameraSetAtEye(play, this->subCamId, &subCamAt, &subCamEye);
if ((EnKz_FollowPath(this, play) == 1) && (this->waypoint == 0)) {
Animation_ChangeByInfo(&this->skelanime, sAnimationInfo, ENKZ_ANIM_1);
Inventory_ReplaceItem(play, ITEM_LETTER_RUTO, ITEM_BOTTLE);
Inventory_ReplaceItem(play, ITEM_BOTTLE_RUTOS_LETTER, ITEM_BOTTLE_EMPTY);
EnKz_SetMovedPos(this, play);
SET_EVENTCHKINF(EVENTCHKINF_33);
this->actor.speedXZ = 0.0;
@ -431,7 +431,7 @@ void EnKz_SetupGetItem(EnKz* this, PlayState* play) {
this->unk_1E0.unk_00 = 1;
this->actionFunc = EnKz_StartTimer;
} else {
getItemId = this->isTrading == true ? GI_FROG : GI_TUNIC_ZORA;
getItemId = this->isTrading == true ? GI_EYEBALL_FROG : GI_TUNIC_ZORA;
yRange = fabsf(this->actor.yDistToPlayer) + 1.0f;
xzRange = this->actor.xzDistToPlayer + 1.0f;
func_8002F434(&this->actor, play, getItemId, xzRange, yRange);
@ -440,7 +440,7 @@ void EnKz_SetupGetItem(EnKz* this, PlayState* play) {
void EnKz_StartTimer(EnKz* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_FROG) {
if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYEBALL_FROG) {
func_80088AA0(180); // start timer2 with 3 minutes
CLEAR_EVENTINF(EVENTINF_10);
}

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;
}
}

4
src/overlays/actors/ovl_En_Ms/z_en_ms.c
View file

@ -128,7 +128,7 @@ void EnMs_Talk(EnMs* this, PlayState* play) {
Message_ContinueTextbox(play, 0x4069); // not enough rupees text
return;
}
func_8002F434(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
func_8002F434(&this->actor, play, GI_MAGIC_BEAN, 90.0f, 10.0f);
this->actionFunc = EnMs_Sell;
return;
case 1: // no
@ -145,7 +145,7 @@ void EnMs_Sell(EnMs* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = EnMs_TalkAfterPurchase;
} else {
func_8002F434(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
func_8002F434(&this->actor, play, GI_MAGIC_BEAN, 90.0f, 10.0f);
}
}

4
src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
View file

@ -308,8 +308,8 @@ void func_80ABA654(EnNiwLady* this, PlayState* play) {
this->unk_26E = 0xB;
if (!GET_ITEMGETINF(ITEMGETINF_0C)) {
this->actor.parent = NULL;
this->getItemId = GI_BOTTLE;
func_8002F434(&this->actor, play, GI_BOTTLE, 100.0f, 50.0f);
this->getItemId = GI_BOTTLE_EMPTY;
func_8002F434(&this->actor, play, GI_BOTTLE_EMPTY, 100.0f, 50.0f);
this->actionFunc = func_80ABAC00;
return;
}

4
src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
View file

@ -698,11 +698,11 @@ void EnPoField_SoulInteract(EnPoField* this, PlayState* play) {
if (Inventory_HasEmptyBottle()) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PO_BIG_GET);
if (this->actor.params == 0) {
Item_Give(play, ITEM_POE);
Item_Give(play, ITEM_BOTTLE_POE);
this->actor.textId = 0x5008;
} else {
this->actor.textId = 0x508F;
Item_Give(play, ITEM_BIG_POE);
Item_Give(play, ITEM_BOTTLE_BIG_POE);
Flags_SetSwitch(play, sSpawnSwitchFlags[this->spawnFlagIndex]);
}
} else {

2
src/overlays/actors/ovl_En_Poh/z_en_poh.c
View file

@ -816,7 +816,7 @@ void EnPoh_TalkRegular(EnPoh* this, PlayState* play) {
if (play->msgCtx.choiceIndex == 0) {
if (Inventory_HasEmptyBottle()) {
this->actor.textId = 0x5008;
Item_Give(play, ITEM_POE);
Item_Give(play, ITEM_BOTTLE_POE);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_PO_BIG_GET);
} else {
this->actor.textId = 0x5006;

2
src/overlays/actors/ovl_En_Skj/z_en_skj.c
View file

@ -397,7 +397,7 @@ void EnSkj_Init(Actor* thisx, PlayState* play2) {
default:
this->actor.params = type;
if (((this->actor.params != 0) && (this->actor.params != 1)) && (this->actor.params != 2)) {
if (INV_CONTENT(ITEM_TRADE_ADULT) < ITEM_SAW) {
if (INV_CONTENT(ITEM_TRADE_ADULT) < ITEM_POACHERS_SAW) {
Actor_Kill(&this->actor);
return;
}

4
src/overlays/actors/ovl_En_Ta/z_en_ta.c
View file

@ -947,7 +947,7 @@ void EnTa_GiveItemInLonLonHouse(EnTa* this, PlayState* play) {
} else if (this->stateFlags & TALON_STATE_FLAG_GIVING_MILK_REFILL) {
func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
} else {
func_8002F434(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
func_8002F434(&this->actor, play, GI_BOTTLE_MILK_FULL, 10000.0f, 50.0f);
}
this->stateFlags |= TALON_STATE_FLAG_TRACKING_PLAYER;
}
@ -957,7 +957,7 @@ void EnTa_TalkAfterCuccoGameFirstWon(EnTa* this, PlayState* play) {
Message_CloseTextbox(play);
this->stateFlags &= ~TALON_STATE_FLAG_GIVING_MILK_REFILL;
EnTa_SetupAction(this, EnTa_GiveItemInLonLonHouse, EnTa_AnimRunToEnd);
func_8002F434(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
func_8002F434(&this->actor, play, GI_BOTTLE_MILK_FULL, 10000.0f, 50.0f);
}
}

4
src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
View file

@ -311,7 +311,7 @@ void func_80B20768(EnToryo* this, PlayState* play) {
this->actor.parent = NULL;
this->unk_1E4 = 5;
} else {
func_8002F434(&this->actor, play, GI_SWORD_BROKEN, 100.0f, 10.0f);
func_8002F434(&this->actor, play, GI_BROKEN_GORONS_SWORD, 100.0f, 10.0f);
}
return;
}
@ -330,7 +330,7 @@ void func_80B20768(EnToryo* this, PlayState* play) {
Actor_GetScreenPos(play, &this->actor, &sp32, &sp30);
if ((sp32 >= 0) && (sp32 < 0x141) && (sp30 >= 0) && (sp30 < 0xF1)) {
this->actor.textId = func_80B206A0(this, play);
func_8002F298(&this->actor, play, 100.0f, EXCH_ITEM_SAW);
func_8002F298(&this->actor, play, 100.0f, EXCH_ITEM_POACHERS_SAW);
}
}
}

4
src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
View file

@ -511,7 +511,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) {
if ((Message_GetState(msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
this->actor.textId = 0xFFFF;
play->talkWithPlayer(play, &this->actor);
func_8002F434(&this->actor, play, GI_LETTER_ZELDA, 120.0f, 10.0f);
func_8002F434(&this->actor, play, GI_ZELDAS_LETTER, 120.0f, 10.0f);
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
play->msgCtx.stateTimer = 4;
this->unk_1E2++;
@ -526,7 +526,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) {
this->actor.parent = NULL;
this->unk_1E2++;
} else {
func_8002F434(&this->actor, play, GI_LETTER_ZELDA, 120.0f, 10.0f);
func_8002F434(&this->actor, play, GI_ZELDAS_LETTER, 120.0f, 10.0f);
}
break;
case 3:

4
src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
View file

@ -1114,7 +1114,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
Camera_ChangeSetting(GET_ACTIVE_CAM(play), CAM_SET_NORMAL0);
this->talkState = 7;
play->talkWithPlayer(play, &this->actor);
func_8002F434(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
func_8002F434(&this->actor, play, GI_ZELDAS_LETTER, fabsf(this->actor.xzDistToPlayer) + 1.0f,
fabsf(this->actor.yDistToPlayer) + 1.0f);
play->msgCtx.stateTimer = 4;
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
@ -1125,7 +1125,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0);
this->talkState++;
} else {
func_8002F434(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
func_8002F434(&this->actor, play, GI_ZELDAS_LETTER, fabsf(this->actor.xzDistToPlayer) + 1.0f,
fabsf(this->actor.yDistToPlayer) + 1.0f);
}
// no break here is required for matching

4
src/overlays/actors/ovl_Fishing/z_fishing.c
View file

@ -4982,7 +4982,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
} else {
if ((D_80B7E078 >= 60.0f) && !(HIGH_SCORE(HS_FISHING) & 0x800)) {
HIGH_SCORE(HS_FISHING) |= 0x800;
getItemId = GI_SCALE_GOLD;
getItemId = GI_SCALE_GOLDEN;
sSinkingLureLocation = (u8)Rand_ZeroFloat(3.999f) + 1;
}
}
@ -5043,7 +5043,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->unk_15C = 24;
} else {
func_8002F434(&this->actor, play, GI_SCALE_GOLD, 2000.0f, 1000.0f);
func_8002F434(&this->actor, play, GI_SCALE_GOLDEN, 2000.0f, 1000.0f);
}
break;

56
src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
View file

@ -53,37 +53,37 @@ static s16 sObjectIds[] = {
// Indices passed to the item table in z_draw.c
static s16 sDrawItemIndices[] = {
GID_BOTTLE, // ITEM_ETC_BOTTLE
GID_LETTER_RUTO, // ITEM_ETC_LETTER
GID_SHIELD_HYLIAN, // ITEM_ETC_SHIELD_HYLIAN
GID_QUIVER_40, // ITEM_ETC_QUIVER
GID_SCALE_SILVER, // ITEM_ETC_SCALE_SILVER
GID_SCALE_GOLDEN, // ITEM_ETC_SCALE_GOLD
GID_KEY_SMALL, // ITEM_ETC_KEY_SMALL
GID_ARROW_FIRE, // ITEM_ETC_ARROW_FIRE
GID_RUPEE_GREEN, // ITEM_ETC_RUPEE_GREEN_CHEST_GAME
GID_RUPEE_BLUE, // ITEM_ETC_RUPEE_BLUE_CHEST_GAME
GID_RUPEE_RED, // ITEM_ETC_RUPEE_RED_CHEST_GAME
GID_RUPEE_PURPLE, // ITEM_ETC_RUPEE_PURPLE_CHEST_GAME
GID_HEART_PIECE, // ITEM_ETC_HEART_PIECE_CHEST_GAME
GID_KEY_SMALL, // ITEM_ETC_KEY_SMALL_CHEST_GAME
GID_BOTTLE_EMPTY, // ITEM_ETC_BOTTLE
GID_BOTTLE_RUTOS_LETTER, // ITEM_ETC_LETTER
GID_SHIELD_HYLIAN, // ITEM_ETC_SHIELD_HYLIAN
GID_QUIVER_40, // ITEM_ETC_QUIVER
GID_SCALE_SILVER, // ITEM_ETC_SCALE_SILVER
GID_SCALE_GOLDEN, // ITEM_ETC_SCALE_GOLD
GID_SMALL_KEY, // ITEM_ETC_KEY_SMALL
GID_ARROW_FIRE, // ITEM_ETC_ARROW_FIRE
GID_RUPEE_GREEN, // ITEM_ETC_RUPEE_GREEN_CHEST_GAME
GID_RUPEE_BLUE, // ITEM_ETC_RUPEE_BLUE_CHEST_GAME
GID_RUPEE_RED, // ITEM_ETC_RUPEE_RED_CHEST_GAME
GID_RUPEE_PURPLE, // ITEM_ETC_RUPEE_PURPLE_CHEST_GAME
GID_HEART_PIECE, // ITEM_ETC_HEART_PIECE_CHEST_GAME
GID_SMALL_KEY, // ITEM_ETC_KEY_SMALL_CHEST_GAME
};
static s16 sGetItemIds[] = {
GI_BOTTLE, // ITEM_ETC_BOTTLE
GI_LETTER_RUTO, // ITEM_ETC_LETTER
GI_SHIELD_HYLIAN, // ITEM_ETC_SHIELD_HYLIAN
GI_QUIVER_40, // ITEM_ETC_QUIVER
GI_SCALE_SILVER, // ITEM_ETC_SCALE_SILVER
GI_SCALE_GOLD, // ITEM_ETC_SCALE_GOLD
GI_KEY_SMALL, // ITEM_ETC_KEY_SMALL
GI_ARROW_FIRE, // ITEM_ETC_ARROW_FIRE
GI_NONE, // ITEM_ETC_RUPEE_GREEN_CHEST_GAME
GI_NONE, // ITEM_ETC_RUPEE_BLUE_CHEST_GAME
GI_NONE, // ITEM_ETC_RUPEE_RED_CHEST_GAME
GI_NONE, // ITEM_ETC_RUPEE_PURPLE_CHEST_GAME
GI_NONE, // ITEM_ETC_HEART_PIECE_CHEST_GAME
GI_NONE, // ITEM_ETC_KEY_SMALL_CHEST_GAME
GI_BOTTLE_EMPTY, // ITEM_ETC_BOTTLE
GI_BOTTLE_RUTOS_LETTER, // ITEM_ETC_LETTER
GI_SHIELD_HYLIAN, // ITEM_ETC_SHIELD_HYLIAN
GI_QUIVER_40, // ITEM_ETC_QUIVER
GI_SCALE_SILVER, // ITEM_ETC_SCALE_SILVER
GI_SCALE_GOLDEN, // ITEM_ETC_SCALE_GOLD
GI_SMALL_KEY, // ITEM_ETC_KEY_SMALL
GI_ARROW_FIRE, // ITEM_ETC_ARROW_FIRE
GI_NONE, // ITEM_ETC_RUPEE_GREEN_CHEST_GAME
GI_NONE, // ITEM_ETC_RUPEE_BLUE_CHEST_GAME
GI_NONE, // ITEM_ETC_RUPEE_RED_CHEST_GAME
GI_NONE, // ITEM_ETC_RUPEE_PURPLE_CHEST_GAME
GI_NONE, // ITEM_ETC_HEART_PIECE_CHEST_GAME
GI_NONE, // ITEM_ETC_KEY_SMALL_CHEST_GAME
};
void ItemEtcetera_SetupAction(ItemEtcetera* this, ItemEtceteraActionFunc actionFunc) {

4
src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
View file

@ -180,7 +180,7 @@ void ItemOcarina_WaitInWater(ItemOcarina* this, PlayState* play) {
this->actionFunc = ItemOcarina_StartSoTCutscene;
this->actor.draw = NULL;
} else {
func_8002F434(&this->actor, play, GI_OCARINA_OOT, 30.0f, 50.0f);
func_8002F434(&this->actor, play, GI_OCARINA_OF_TIME, 30.0f, 50.0f);
if ((play->gameplayFrames & 13) == 0) {
EffectSsBubble_Spawn(play, &this->actor.world.pos, 0.0f, 0.0f, 10.0f, 0.13f);
@ -199,5 +199,5 @@ void ItemOcarina_Draw(Actor* thisx, PlayState* play) {
func_8002EBCC(thisx, play, 0);
func_8002ED80(thisx, play, 0);
GetItem_Draw(play, GID_OCARINA_TIME);
GetItem_Draw(play, GID_OCARINA_OF_TIME);
}

4
src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
View file

@ -538,12 +538,12 @@ void ObjBean_SetupWaitForBean(ObjBean* this) {
void ObjBean_WaitForBean(ObjBean* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->dyna.actor, play)) {
if (func_8002F368(play) == EXCH_ITEM_BEAN) {
if (func_8002F368(play) == EXCH_ITEM_MAGIC_BEAN) {
func_80B8FE00(this);
Flags_SetSwitch(play, this->dyna.actor.params & 0x3F);
}
} else {
func_8002F298(&this->dyna.actor, play, 40.0f, EXCH_ITEM_BEAN);
func_8002F298(&this->dyna.actor, play, 40.0f, EXCH_ITEM_MAGIC_BEAN);
}
}

2
src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
View file

@ -175,7 +175,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) {
if (dmgFlags & (DMG_FIRE | DMG_ARROW_NORMAL)) {
interactionType = 1;
}
} else if (player->heldItemAction == PLAYER_IA_STICK) {
} else if (player->heldItemAction == PLAYER_IA_DEKU_STICK) {
Math_Vec3f_Diff(&player->meleeWeaponInfo[0].tip, &this->actor.world.pos, &tipToFlame);
tipToFlame.y -= 67.0f;
if ((SQ(tipToFlame.x) + SQ(tipToFlame.y) + SQ(tipToFlame.z)) < SQ(20.0f)) {

433
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -495,8 +495,8 @@ static u16 D_8085361C[] = {
static GetItemEntry sGetItemTable[] = {
// GI_BOMBS_5
GET_ITEM(ITEM_BOMBS_5, OBJECT_GI_BOMB_1, GID_BOMB, 0x32, 0x59, CHEST_ANIM_SHORT),
// GI_NUTS_5
GET_ITEM(ITEM_NUTS_5, OBJECT_GI_NUTS, GID_NUTS, 0x34, 0x0C, CHEST_ANIM_SHORT),
// GI_DEKU_NUTS_5
GET_ITEM(ITEM_DEKU_NUTS_5, OBJECT_GI_NUTS, GID_DEKU_NUTS, 0x34, 0x0C, CHEST_ANIM_SHORT),
// GI_BOMBCHUS_10
GET_ITEM(ITEM_BOMBCHU, OBJECT_GI_BOMB_2, GID_BOMBCHU, 0x33, 0x80, CHEST_ANIM_SHORT),
// GI_BOW
@ -505,74 +505,74 @@ static GetItemEntry sGetItemTable[] = {
GET_ITEM(ITEM_SLINGSHOT, OBJECT_GI_PACHINKO, GID_SLINGSHOT, 0x30, 0x80, CHEST_ANIM_LONG),
// GI_BOOMERANG
GET_ITEM(ITEM_BOOMERANG, OBJECT_GI_BOOMERANG, GID_BOOMERANG, 0x35, 0x80, CHEST_ANIM_LONG),
// GI_STICKS_1
GET_ITEM(ITEM_STICK, OBJECT_GI_STICK, GID_STICK, 0x37, 0x0D, CHEST_ANIM_SHORT),
// GI_DEKU_STICKS_1
GET_ITEM(ITEM_DEKU_STICK, OBJECT_GI_STICK, GID_DEKU_STICK, 0x37, 0x0D, CHEST_ANIM_SHORT),
// GI_HOOKSHOT
GET_ITEM(ITEM_HOOKSHOT, OBJECT_GI_HOOKSHOT, GID_HOOKSHOT, 0x36, 0x80, CHEST_ANIM_LONG),
// GI_LONGSHOT
GET_ITEM(ITEM_LONGSHOT, OBJECT_GI_HOOKSHOT, GID_LONGSHOT, 0x4F, 0x80, CHEST_ANIM_LONG),
// GI_LENS
GET_ITEM(ITEM_LENS, OBJECT_GI_GLASSES, GID_LENS, 0x39, 0x80, CHEST_ANIM_LONG),
// GI_LETTER_ZELDA
GET_ITEM(ITEM_LETTER_ZELDA, OBJECT_GI_LETTER, GID_LETTER_ZELDA, 0x69, 0x80, CHEST_ANIM_LONG),
// GI_OCARINA_OOT
GET_ITEM(ITEM_OCARINA_TIME, OBJECT_GI_OCARINA, GID_OCARINA_TIME, 0x3A, 0x80, CHEST_ANIM_LONG),
// GI_LENS_OF_TRUTH
GET_ITEM(ITEM_LENS_OF_TRUTH, OBJECT_GI_GLASSES, GID_LENS_OF_TRUTH, 0x39, 0x80, CHEST_ANIM_LONG),
// GI_ZELDAS_LETTER
GET_ITEM(ITEM_ZELDAS_LETTER, OBJECT_GI_LETTER, GID_ZELDAS_LETTER, 0x69, 0x80, CHEST_ANIM_LONG),
// GI_OCARINA_OF_TIME
GET_ITEM(ITEM_OCARINA_OF_TIME, OBJECT_GI_OCARINA, GID_OCARINA_OF_TIME, 0x3A, 0x80, CHEST_ANIM_LONG),
// GI_HAMMER
GET_ITEM(ITEM_HAMMER, OBJECT_GI_HAMMER, GID_HAMMER, 0x38, 0x80, CHEST_ANIM_LONG),
// GI_COJIRO
GET_ITEM(ITEM_COJIRO, OBJECT_GI_NIWATORI, GID_COJIRO, 0x02, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE
GET_ITEM(ITEM_BOTTLE, OBJECT_GI_BOTTLE, GID_BOTTLE, 0x42, 0x80, CHEST_ANIM_LONG),
// GI_POTION_RED
GET_ITEM(ITEM_POTION_RED, OBJECT_GI_LIQUID, GID_POTION_RED, 0x43, 0x80, CHEST_ANIM_LONG),
// GI_POTION_GREEN
GET_ITEM(ITEM_POTION_GREEN, OBJECT_GI_LIQUID, GID_POTION_GREEN, 0x44, 0x80, CHEST_ANIM_LONG),
// GI_POTION_BLUE
GET_ITEM(ITEM_POTION_BLUE, OBJECT_GI_LIQUID, GID_POTION_BLUE, 0x45, 0x80, CHEST_ANIM_LONG),
// GI_FAIRY
GET_ITEM(ITEM_FAIRY, OBJECT_GI_BOTTLE, GID_BOTTLE, 0x46, 0x80, CHEST_ANIM_LONG),
// GI_MILK_BOTTLE
GET_ITEM(ITEM_MILK_BOTTLE, OBJECT_GI_MILK, GID_MILK, 0x98, 0x80, CHEST_ANIM_LONG),
// GI_LETTER_RUTO
GET_ITEM(ITEM_LETTER_RUTO, OBJECT_GI_BOTTLE_LETTER, GID_LETTER_RUTO, 0x99, 0x80, CHEST_ANIM_LONG),
// GI_BEAN
GET_ITEM(ITEM_BEAN, OBJECT_GI_BEAN, GID_BEAN, 0x48, 0x80, CHEST_ANIM_SHORT),
// GI_BOTTLE_EMPTY
GET_ITEM(ITEM_BOTTLE_EMPTY, OBJECT_GI_BOTTLE, GID_BOTTLE_EMPTY, 0x42, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE_POTION_RED
GET_ITEM(ITEM_BOTTLE_POTION_RED, OBJECT_GI_LIQUID, GID_BOTTLE_POTION_RED, 0x43, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE_POTION_GREEN
GET_ITEM(ITEM_BOTTLE_POTION_GREEN, OBJECT_GI_LIQUID, GID_BOTTLE_POTION_GREEN, 0x44, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE_POTION_BLUE
GET_ITEM(ITEM_BOTTLE_POTION_BLUE, OBJECT_GI_LIQUID, GID_BOTTLE_POTION_BLUE, 0x45, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE_FAIRY
GET_ITEM(ITEM_BOTTLE_FAIRY, OBJECT_GI_BOTTLE, GID_BOTTLE_EMPTY, 0x46, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE_MILK_FULL
GET_ITEM(ITEM_BOTTLE_MILK_FULL, OBJECT_GI_MILK, GID_BOTTLE_MILK_FULL, 0x98, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE_RUTOS_LETTER
GET_ITEM(ITEM_BOTTLE_RUTOS_LETTER, OBJECT_GI_BOTTLE_LETTER, GID_BOTTLE_RUTOS_LETTER, 0x99, 0x80, CHEST_ANIM_LONG),
// GI_MAGIC_BEAN
GET_ITEM(ITEM_MAGIC_BEAN, OBJECT_GI_BEAN, GID_MAGIC_BEAN, 0x48, 0x80, CHEST_ANIM_SHORT),
// GI_MASK_SKULL
GET_ITEM(ITEM_MASK_SKULL, OBJECT_GI_SKJ_MASK, GID_MASK_SKULL, 0x10, 0x80, CHEST_ANIM_LONG),
// GI_MASK_SPOOKY
GET_ITEM(ITEM_MASK_SPOOKY, OBJECT_GI_REDEAD_MASK, GID_MASK_SPOOKY, 0x11, 0x80, CHEST_ANIM_LONG),
// GI_CHICKEN
GET_ITEM(ITEM_CHICKEN, OBJECT_GI_NIWATORI, GID_CHICKEN, 0x48, 0x80, CHEST_ANIM_LONG),
GET_ITEM(ITEM_CHICKEN, OBJECT_GI_NIWATORI, GID_CUCCO, 0x48, 0x80, CHEST_ANIM_LONG),
// GI_MASK_KEATON
GET_ITEM(ITEM_MASK_KEATON, OBJECT_GI_KI_TAN_MASK, GID_MASK_KEATON, 0x12, 0x80, CHEST_ANIM_LONG),
// GI_MASK_BUNNY
GET_ITEM(ITEM_MASK_BUNNY, OBJECT_GI_RABIT_MASK, GID_MASK_BUNNY, 0x13, 0x80, CHEST_ANIM_LONG),
// GI_MASK_BUNNY_HOOD
GET_ITEM(ITEM_MASK_BUNNY_HOOD, OBJECT_GI_RABIT_MASK, GID_MASK_BUNNY_HOOD, 0x13, 0x80, CHEST_ANIM_LONG),
// GI_MASK_TRUTH
GET_ITEM(ITEM_MASK_TRUTH, OBJECT_GI_TRUTH_MASK, GID_MASK_TRUTH, 0x17, 0x80, CHEST_ANIM_LONG),
// GI_POCKET_EGG
GET_ITEM(ITEM_POCKET_EGG, OBJECT_GI_EGG, GID_EGG, 0x01, 0x80, CHEST_ANIM_LONG),
// GI_POCKET_CUCCO
GET_ITEM(ITEM_POCKET_CUCCO, OBJECT_GI_NIWATORI, GID_CHICKEN, 0x48, 0x80, CHEST_ANIM_LONG),
GET_ITEM(ITEM_POCKET_CUCCO, OBJECT_GI_NIWATORI, GID_CUCCO, 0x48, 0x80, CHEST_ANIM_LONG),
// GI_ODD_MUSHROOM
GET_ITEM(ITEM_ODD_MUSHROOM, OBJECT_GI_MUSHROOM, GID_ODD_MUSHROOM, 0x03, 0x80, CHEST_ANIM_LONG),
// GI_ODD_POTION
GET_ITEM(ITEM_ODD_POTION, OBJECT_GI_POWDER, GID_ODD_POTION, 0x04, 0x80, CHEST_ANIM_LONG),
// GI_SAW
GET_ITEM(ITEM_SAW, OBJECT_GI_SAW, GID_SAW, 0x05, 0x80, CHEST_ANIM_LONG),
// GI_SWORD_BROKEN
GET_ITEM(ITEM_SWORD_BROKEN, OBJECT_GI_BROKENSWORD, GID_SWORD_BROKEN, 0x08, 0x80, CHEST_ANIM_LONG),
// GI_POACHERS_SAW
GET_ITEM(ITEM_POACHERS_SAW, OBJECT_GI_SAW, GID_POACHERS_SAW, 0x05, 0x80, CHEST_ANIM_LONG),
// GI_BROKEN_GORONS_SWORD
GET_ITEM(ITEM_BROKEN_GORONS_SWORD, OBJECT_GI_BROKENSWORD, GID_BROKEN_GORONS_SWORD, 0x08, 0x80, CHEST_ANIM_LONG),
// GI_PRESCRIPTION
GET_ITEM(ITEM_PRESCRIPTION, OBJECT_GI_PRESCRIPTION, GID_PRESCRIPTION, 0x09, 0x80, CHEST_ANIM_LONG),
// GI_FROG
GET_ITEM(ITEM_FROG, OBJECT_GI_FROG, GID_FROG, 0x0D, 0x80, CHEST_ANIM_LONG),
// GI_EYEDROPS
GET_ITEM(ITEM_EYEDROPS, OBJECT_GI_EYE_LOTION, GID_EYEDROPS, 0x0E, 0x80, CHEST_ANIM_LONG),
// GI_EYEBALL_FROG
GET_ITEM(ITEM_EYEBALL_FROG, OBJECT_GI_FROG, GID_EYEBALL_FROG, 0x0D, 0x80, CHEST_ANIM_LONG),
// GI_EYE_DROPS
GET_ITEM(ITEM_EYE_DROPS, OBJECT_GI_EYE_LOTION, GID_EYE_DROPS, 0x0E, 0x80, CHEST_ANIM_LONG),
// GI_CLAIM_CHECK
GET_ITEM(ITEM_CLAIM_CHECK, OBJECT_GI_TICKETSTONE, GID_CLAIM_CHECK, 0x0A, 0x80, CHEST_ANIM_LONG),
// GI_SWORD_KOKIRI
GET_ITEM(ITEM_SWORD_KOKIRI, OBJECT_GI_SWORD_1, GID_SWORD_KOKIRI, 0xA4, 0x80, CHEST_ANIM_LONG),
// GI_SWORD_KNIFE
GET_ITEM(ITEM_SWORD_BGS, OBJECT_GI_LONGSWORD, GID_SWORD_BGS, 0x4B, 0x80, CHEST_ANIM_LONG),
GET_ITEM(ITEM_SWORD_BIGGORON, OBJECT_GI_LONGSWORD, GID_SWORD_BIGGORON, 0x4B, 0x80, CHEST_ANIM_LONG),
// GI_SHIELD_DEKU
GET_ITEM(ITEM_SHIELD_DEKU, OBJECT_GI_SHIELD_1, GID_SHIELD_DEKU, 0x4C, 0xA0, CHEST_ANIM_SHORT),
// GI_SHIELD_HYLIAN
@ -597,52 +597,52 @@ static GetItemEntry sGetItemTable[] = {
GET_ITEM(ITEM_BOMB_BAG_30, OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_30, 0x59, 0x80, CHEST_ANIM_LONG),
// GI_BOMB_BAG_40
GET_ITEM(ITEM_BOMB_BAG_40, OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_40, 0x5A, 0x80, CHEST_ANIM_LONG),
// GI_GAUNTLETS_SILVER
GET_ITEM(ITEM_GAUNTLETS_SILVER, OBJECT_GI_GLOVES, GID_GAUNTLETS_SILVER, 0x5B, 0x80, CHEST_ANIM_LONG),
// GI_GAUNTLETS_GOLD
GET_ITEM(ITEM_GAUNTLETS_GOLD, OBJECT_GI_GLOVES, GID_GAUNTLETS_GOLD, 0x5C, 0x80, CHEST_ANIM_LONG),
// GI_SILVER_GAUNTLETS
GET_ITEM(ITEM_STRENGTH_SILVER_GAUNTLETS, OBJECT_GI_GLOVES, GID_SILVER_GAUNTLETS, 0x5B, 0x80, CHEST_ANIM_LONG),
// GI_GOLD_GAUNTLETS
GET_ITEM(ITEM_STRENGTH_GOLD_GAUNTLETS, OBJECT_GI_GLOVES, GID_GOLD_GAUNTLETS, 0x5C, 0x80, CHEST_ANIM_LONG),
// GI_SCALE_SILVER
GET_ITEM(ITEM_SCALE_SILVER, OBJECT_GI_SCALE, GID_SCALE_SILVER, 0xCD, 0x80, CHEST_ANIM_LONG),
// GI_SCALE_GOLD
// GI_SCALE_GOLDEN
GET_ITEM(ITEM_SCALE_GOLDEN, OBJECT_GI_SCALE, GID_SCALE_GOLDEN, 0xCE, 0x80, CHEST_ANIM_LONG),
// GI_STONE_OF_AGONY
GET_ITEM(ITEM_STONE_OF_AGONY, OBJECT_GI_MAP, GID_STONE_OF_AGONY, 0x68, 0x80, CHEST_ANIM_LONG),
// GI_GERUDO_CARD
GET_ITEM(ITEM_GERUDO_CARD, OBJECT_GI_GERUDO, GID_GERUDO_CARD, 0x7B, 0x80, CHEST_ANIM_LONG),
// GI_GERUDOS_CARD
GET_ITEM(ITEM_GERUDOS_CARD, OBJECT_GI_GERUDO, GID_GERUDOS_CARD, 0x7B, 0x80, CHEST_ANIM_LONG),
// GI_OCARINA_FAIRY
GET_ITEM(ITEM_OCARINA_FAIRY, OBJECT_GI_OCARINA_0, GID_OCARINA_FAIRY, 0x3A, 0x80, CHEST_ANIM_LONG),
// GI_SEEDS_5
GET_ITEM(ITEM_SEEDS, OBJECT_GI_SEED, GID_SEEDS, 0xDC, 0x50, CHEST_ANIM_SHORT),
// GI_DEKU_SEEDS_5
GET_ITEM(ITEM_DEKU_SEEDS, OBJECT_GI_SEED, GID_DEKU_SEEDS, 0xDC, 0x50, CHEST_ANIM_SHORT),
// GI_HEART_CONTAINER
GET_ITEM(ITEM_HEART_CONTAINER, OBJECT_GI_HEARTS, GID_HEART_CONTAINER, 0xC6, 0x80, CHEST_ANIM_LONG),
// GI_HEART_PIECE
GET_ITEM(ITEM_HEART_PIECE_2, OBJECT_GI_HEARTS, GID_HEART_PIECE, 0xC2, 0x80, CHEST_ANIM_LONG),
// GI_KEY_BOSS
GET_ITEM(ITEM_KEY_BOSS, OBJECT_GI_BOSSKEY, GID_KEY_BOSS, 0xC7, 0x80, CHEST_ANIM_LONG),
// GI_BOSS_KEY
GET_ITEM(ITEM_DUNGEON_BOSS_KEY, OBJECT_GI_BOSSKEY, GID_BOSS_KEY, 0xC7, 0x80, CHEST_ANIM_LONG),
// GI_COMPASS
GET_ITEM(ITEM_COMPASS, OBJECT_GI_COMPASS, GID_COMPASS, 0x67, 0x80, CHEST_ANIM_LONG),
// GI_MAP
GET_ITEM(ITEM_DUNGEON_COMPASS, OBJECT_GI_COMPASS, GID_COMPASS, 0x67, 0x80, CHEST_ANIM_LONG),
// GI_DUNGEON_MAP
GET_ITEM(ITEM_DUNGEON_MAP, OBJECT_GI_MAP, GID_DUNGEON_MAP, 0x66, 0x80, CHEST_ANIM_LONG),
// GI_KEY_SMALL
GET_ITEM(ITEM_KEY_SMALL, OBJECT_GI_KEY, GID_KEY_SMALL, 0x60, 0x80, CHEST_ANIM_SHORT),
// GI_MAGIC_SMALL
GET_ITEM(ITEM_MAGIC_SMALL, OBJECT_GI_MAGICPOT, GID_MAGIC_SMALL, 0x52, 0x6F, CHEST_ANIM_SHORT),
// GI_MAGIC_LARGE
GET_ITEM(ITEM_MAGIC_LARGE, OBJECT_GI_MAGICPOT, GID_MAGIC_LARGE, 0x52, 0x6E, CHEST_ANIM_SHORT),
// GI_SMALL_KEY
GET_ITEM(ITEM_SMALL_KEY, OBJECT_GI_KEY, GID_SMALL_KEY, 0x60, 0x80, CHEST_ANIM_SHORT),
// GI_MAGIC_JAR_SMALL
GET_ITEM(ITEM_MAGIC_JAR_SMALL, OBJECT_GI_MAGICPOT, GID_MAGIC_JAR_SMALL, 0x52, 0x6F, CHEST_ANIM_SHORT),
// GI_MAGIC_JAR_LARGE
GET_ITEM(ITEM_MAGIC_JAR_BIG, OBJECT_GI_MAGICPOT, GID_MAGIC_JAR_LARGE, 0x52, 0x6E, CHEST_ANIM_SHORT),
// GI_WALLET_ADULT
GET_ITEM(ITEM_WALLET_ADULT, OBJECT_GI_PURSE, GID_WALLET_ADULT, 0x5E, 0x80, CHEST_ANIM_LONG),
GET_ITEM(ITEM_ADULTS_WALLET, OBJECT_GI_PURSE, GID_WALLET_ADULT, 0x5E, 0x80, CHEST_ANIM_LONG),
// GI_WALLET_GIANT
GET_ITEM(ITEM_WALLET_GIANT, OBJECT_GI_PURSE, GID_WALLET_GIANT, 0x5F, 0x80, CHEST_ANIM_LONG),
GET_ITEM(ITEM_GIANTS_WALLET, OBJECT_GI_PURSE, GID_WALLET_GIANT, 0x5F, 0x80, CHEST_ANIM_LONG),
// GI_WEIRD_EGG
GET_ITEM(ITEM_WEIRD_EGG, OBJECT_GI_EGG, GID_EGG, 0x9A, 0x80, CHEST_ANIM_LONG),
// GI_RECOVERY_HEART
GET_ITEM(ITEM_RECOVERY_HEART, OBJECT_GI_HEART, GID_RECOVERY_HEART, 0x55, 0x80, CHEST_ANIM_LONG),
// GI_ARROWS_SMALL
GET_ITEM(ITEM_ARROWS_SMALL, OBJECT_GI_ARROW, GID_ARROWS_SMALL, 0xE6, 0x48, CHEST_ANIM_SHORT),
// GI_ARROWS_MEDIUM
GET_ITEM(ITEM_ARROWS_MEDIUM, OBJECT_GI_ARROW, GID_ARROWS_MEDIUM, 0xE6, 0x49, CHEST_ANIM_SHORT),
// GI_ARROWS_LARGE
GET_ITEM(ITEM_ARROWS_LARGE, OBJECT_GI_ARROW, GID_ARROWS_LARGE, 0xE6, 0x4A, CHEST_ANIM_SHORT),
// GI_ARROWS_5
GET_ITEM(ITEM_ARROWS_5, OBJECT_GI_ARROW, GID_ARROWS_5, 0xE6, 0x48, CHEST_ANIM_SHORT),
// GI_ARROWS_10
GET_ITEM(ITEM_ARROWS_10, OBJECT_GI_ARROW, GID_ARROWS_10, 0xE6, 0x49, CHEST_ANIM_SHORT),
// GI_ARROWS_30
GET_ITEM(ITEM_ARROWS_30, OBJECT_GI_ARROW, GID_ARROWS_30, 0xE6, 0x4A, CHEST_ANIM_SHORT),
// GI_RUPEE_GREEN
GET_ITEM(ITEM_RUPEE_GREEN, OBJECT_GI_RUPY, GID_RUPEE_GREEN, 0x6F, 0x00, CHEST_ANIM_SHORT),
// GI_RUPEE_BLUE
@ -652,21 +652,21 @@ static GetItemEntry sGetItemTable[] = {
// GI_HEART_CONTAINER_2
GET_ITEM(ITEM_HEART_CONTAINER, OBJECT_GI_HEARTS, GID_HEART_CONTAINER, 0xC6, 0x80, CHEST_ANIM_LONG),
// GI_MILK
GET_ITEM(ITEM_MILK, OBJECT_GI_MILK, GID_MILK, 0x98, 0x80, CHEST_ANIM_LONG),
GET_ITEM(ITEM_MILK, OBJECT_GI_MILK, GID_BOTTLE_MILK_FULL, 0x98, 0x80, CHEST_ANIM_LONG),
// GI_MASK_GORON
GET_ITEM(ITEM_MASK_GORON, OBJECT_GI_GOLONMASK, GID_MASK_GORON, 0x14, 0x80, CHEST_ANIM_LONG),
// GI_MASK_ZORA
GET_ITEM(ITEM_MASK_ZORA, OBJECT_GI_ZORAMASK, GID_MASK_ZORA, 0x15, 0x80, CHEST_ANIM_LONG),
// GI_MASK_GERUDO
GET_ITEM(ITEM_MASK_GERUDO, OBJECT_GI_GERUDOMASK, GID_MASK_GERUDO, 0x16, 0x80, CHEST_ANIM_LONG),
// GI_BRACELET
GET_ITEM(ITEM_BRACELET, OBJECT_GI_BRACELET, GID_BRACELET, 0x79, 0x80, CHEST_ANIM_LONG),
// GI_GORONS_BRACELET
GET_ITEM(ITEM_STRENGTH_GORONS_BRACELET, OBJECT_GI_BRACELET, GID_GORONS_BRACELET, 0x79, 0x80, CHEST_ANIM_LONG),
// GI_RUPEE_PURPLE
GET_ITEM(ITEM_RUPEE_PURPLE, OBJECT_GI_RUPY, GID_RUPEE_PURPLE, 0xF1, 0x14, CHEST_ANIM_SHORT),
// GI_RUPEE_GOLD
GET_ITEM(ITEM_RUPEE_GOLD, OBJECT_GI_RUPY, GID_RUPEE_GOLD, 0xF2, 0x13, CHEST_ANIM_SHORT),
// GI_SWORD_BGS
GET_ITEM(ITEM_SWORD_BGS, OBJECT_GI_LONGSWORD, GID_SWORD_BGS, 0x0C, 0x80, CHEST_ANIM_LONG),
// GI_SWORD_BIGGORON
GET_ITEM(ITEM_SWORD_BIGGORON, OBJECT_GI_LONGSWORD, GID_SWORD_BIGGORON, 0x0C, 0x80, CHEST_ANIM_LONG),
// GI_ARROW_FIRE
GET_ITEM(ITEM_ARROW_FIRE, OBJECT_GI_M_ARROW, GID_ARROW_FIRE, 0x70, 0x80, CHEST_ANIM_LONG),
// GI_ARROW_ICE
@ -685,14 +685,14 @@ static GetItemEntry sGetItemTable[] = {
GET_ITEM(ITEM_BULLET_BAG_30, OBJECT_GI_DEKUPOUCH, GID_BULLET_BAG, 0x07, 0x80, CHEST_ANIM_LONG),
// GI_BULLET_BAG_40
GET_ITEM(ITEM_BULLET_BAG_40, OBJECT_GI_DEKUPOUCH, GID_BULLET_BAG, 0x07, 0x80, CHEST_ANIM_LONG),
// GI_STICKS_5
GET_ITEM(ITEM_STICKS_5, OBJECT_GI_STICK, GID_STICK, 0x37, 0x0D, CHEST_ANIM_SHORT),
// GI_STICKS_10
GET_ITEM(ITEM_STICKS_10, OBJECT_GI_STICK, GID_STICK, 0x37, 0x0D, CHEST_ANIM_SHORT),
// GI_NUTS_5_2
GET_ITEM(ITEM_NUTS_5, OBJECT_GI_NUTS, GID_NUTS, 0x34, 0x0C, CHEST_ANIM_SHORT),
// GI_NUTS_10
GET_ITEM(ITEM_NUTS_10, OBJECT_GI_NUTS, GID_NUTS, 0x34, 0x0C, CHEST_ANIM_SHORT),
// GI_DEKU_STICKS_5
GET_ITEM(ITEM_DEKU_STICKS_5, OBJECT_GI_STICK, GID_DEKU_STICK, 0x37, 0x0D, CHEST_ANIM_SHORT),
// GI_DEKU_STICKS_10
GET_ITEM(ITEM_DEKU_STICKS_10, OBJECT_GI_STICK, GID_DEKU_STICK, 0x37, 0x0D, CHEST_ANIM_SHORT),
// GI_DEKU_NUTS_5_2
GET_ITEM(ITEM_DEKU_NUTS_5, OBJECT_GI_NUTS, GID_DEKU_NUTS, 0x34, 0x0C, CHEST_ANIM_SHORT),
// GI_DEKU_NUTS_10
GET_ITEM(ITEM_DEKU_NUTS_10, OBJECT_GI_NUTS, GID_DEKU_NUTS, 0x34, 0x0C, CHEST_ANIM_SHORT),
// GI_BOMBS_1
GET_ITEM(ITEM_BOMB, OBJECT_GI_BOMB_1, GID_BOMB, 0x32, 0x59, CHEST_ANIM_SHORT),
// GI_BOMBS_10
@ -701,24 +701,24 @@ static GetItemEntry sGetItemTable[] = {
GET_ITEM(ITEM_BOMBS_20, OBJECT_GI_BOMB_1, GID_BOMB, 0x32, 0x59, CHEST_ANIM_SHORT),
// GI_BOMBS_30
GET_ITEM(ITEM_BOMBS_30, OBJECT_GI_BOMB_1, GID_BOMB, 0x32, 0x59, CHEST_ANIM_SHORT),
// GI_SEEDS_30
GET_ITEM(ITEM_SEEDS_30, OBJECT_GI_SEED, GID_SEEDS, 0xDC, 0x50, CHEST_ANIM_SHORT),
// GI_DEKU_SEEDS_30
GET_ITEM(ITEM_DEKU_SEEDS_30, OBJECT_GI_SEED, GID_DEKU_SEEDS, 0xDC, 0x50, CHEST_ANIM_SHORT),
// GI_BOMBCHUS_5
GET_ITEM(ITEM_BOMBCHUS_5, OBJECT_GI_BOMB_2, GID_BOMBCHU, 0x33, 0x80, CHEST_ANIM_SHORT),
// GI_BOMBCHUS_20
GET_ITEM(ITEM_BOMBCHUS_20, OBJECT_GI_BOMB_2, GID_BOMBCHU, 0x33, 0x80, CHEST_ANIM_SHORT),
// GI_FISH
GET_ITEM(ITEM_FISH, OBJECT_GI_FISH, GID_FISH, 0x47, 0x80, CHEST_ANIM_LONG),
// GI_BUGS
GET_ITEM(ITEM_BUG, OBJECT_GI_INSECT, GID_BUG, 0x7A, 0x80, CHEST_ANIM_LONG),
// GI_BLUE_FIRE
GET_ITEM(ITEM_BLUE_FIRE, OBJECT_GI_FIRE, GID_BLUE_FIRE, 0x5D, 0x80, CHEST_ANIM_LONG),
// GI_POE
GET_ITEM(ITEM_POE, OBJECT_GI_GHOST, GID_POE, 0x97, 0x80, CHEST_ANIM_LONG),
// GI_BIG_POE
GET_ITEM(ITEM_BIG_POE, OBJECT_GI_GHOST, GID_BIG_POE, 0xF9, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE_FISH
GET_ITEM(ITEM_BOTTLE_FISH, OBJECT_GI_FISH, GID_FISH, 0x47, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE_BUGS
GET_ITEM(ITEM_BOTTLE_BUG, OBJECT_GI_INSECT, GID_BUG, 0x7A, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE_BLUE_FIRE
GET_ITEM(ITEM_BOTTLE_BLUE_FIRE, OBJECT_GI_FIRE, GID_BLUE_FIRE, 0x5D, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE_POE
GET_ITEM(ITEM_BOTTLE_POE, OBJECT_GI_GHOST, GID_POE, 0x97, 0x80, CHEST_ANIM_LONG),
// GI_BOTTLE_BIG_POE
GET_ITEM(ITEM_BOTTLE_BIG_POE, OBJECT_GI_GHOST, GID_BIG_POE, 0xF9, 0x80, CHEST_ANIM_LONG),
// GI_DOOR_KEY
GET_ITEM(ITEM_KEY_SMALL, OBJECT_GI_KEY, GID_KEY_SMALL, 0xF3, 0x80, CHEST_ANIM_SHORT),
GET_ITEM(ITEM_SMALL_KEY, OBJECT_GI_KEY, GID_SMALL_KEY, 0xF3, 0x80, CHEST_ANIM_SHORT),
// GI_RUPEE_GREEN_LOSE
GET_ITEM(ITEM_RUPEE_GREEN, OBJECT_GI_RUPY, GID_RUPEE_GREEN, 0xF4, 0x00, CHEST_ANIM_SHORT),
// GI_RUPEE_BLUE_LOSE
@ -729,14 +729,14 @@ static GetItemEntry sGetItemTable[] = {
GET_ITEM(ITEM_RUPEE_PURPLE, OBJECT_GI_RUPY, GID_RUPEE_PURPLE, 0xF7, 0x14, CHEST_ANIM_SHORT),
// GI_HEART_PIECE_WIN
GET_ITEM(ITEM_HEART_PIECE_2, OBJECT_GI_HEARTS, GID_HEART_PIECE, 0xFA, 0x80, CHEST_ANIM_LONG),
// GI_STICK_UPGRADE_20
GET_ITEM(ITEM_STICK_UPGRADE_20, OBJECT_GI_STICK, GID_STICK, 0x90, 0x80, CHEST_ANIM_SHORT),
// GI_STICK_UPGRADE_30
GET_ITEM(ITEM_STICK_UPGRADE_30, OBJECT_GI_STICK, GID_STICK, 0x91, 0x80, CHEST_ANIM_SHORT),
// GI_NUT_UPGRADE_30
GET_ITEM(ITEM_NUT_UPGRADE_30, OBJECT_GI_NUTS, GID_NUTS, 0xA7, 0x80, CHEST_ANIM_SHORT),
// GI_NUT_UPGRADE_40
GET_ITEM(ITEM_NUT_UPGRADE_40, OBJECT_GI_NUTS, GID_NUTS, 0xA8, 0x80, CHEST_ANIM_SHORT),
// GI_DEKU_STICK_UPGRADE_20
GET_ITEM(ITEM_DEKU_STICK_UPGRADE_20, OBJECT_GI_STICK, GID_DEKU_STICK, 0x90, 0x80, CHEST_ANIM_SHORT),
// GI_DEKU_STICK_UPGRADE_30
GET_ITEM(ITEM_DEKU_STICK_UPGRADE_30, OBJECT_GI_STICK, GID_DEKU_STICK, 0x91, 0x80, CHEST_ANIM_SHORT),
// GI_DEKU_NUT_UPGRADE_30
GET_ITEM(ITEM_DEKU_NUT_UPGRADE_30, OBJECT_GI_NUTS, GID_DEKU_NUTS, 0xA7, 0x80, CHEST_ANIM_SHORT),
// GI_DEKU_NUT_UPGRADE_40
GET_ITEM(ITEM_DEKU_NUT_UPGRADE_40, OBJECT_GI_NUTS, GID_DEKU_NUTS, 0xA8, 0x80, CHEST_ANIM_SHORT),
// GI_BULLET_BAG_50
GET_ITEM(ITEM_BULLET_BAG_50, OBJECT_GI_DEKUPOUCH, GID_BULLET_BAG_50, 0x6C, 0x80, CHEST_ANIM_LONG),
// GI_ICE_TRAP
@ -1151,46 +1151,46 @@ static u8 D_80853E7C[] = {
// Used to map item IDs to item actions
static s8 sItemActions[] = {
PLAYER_IA_STICK, // ITEM_STICK
PLAYER_IA_NUT, // ITEM_NUT
PLAYER_IA_DEKU_STICK, // ITEM_DEKU_STICK
PLAYER_IA_DEKU_NUT, // ITEM_DEKU_NUT
PLAYER_IA_BOMB, // ITEM_BOMB
PLAYER_IA_BOW, // ITEM_BOW
PLAYER_IA_BOW_FIRE, // ITEM_ARROW_FIRE
PLAYER_IA_DINS_FIRE, // ITEM_DINS_FIRE
PLAYER_IA_SLINGSHOT, // ITEM_SLINGSHOT
PLAYER_IA_OCARINA_FAIRY, // ITEM_OCARINA_FAIRY
PLAYER_IA_OCARINA_TIME, // ITEM_OCARINA_TIME
PLAYER_IA_OCARINA_OF_TIME, // ITEM_OCARINA_OF_TIME
PLAYER_IA_BOMBCHU, // ITEM_BOMBCHU
PLAYER_IA_HOOKSHOT, // ITEM_HOOKSHOT
PLAYER_IA_LONGSHOT, // ITEM_LONGSHOT
PLAYER_IA_BOW_ICE, // ITEM_ARROW_ICE
PLAYER_IA_FARORES_WIND, // ITEM_FARORES_WIND
PLAYER_IA_BOOMERANG, // ITEM_BOOMERANG
PLAYER_IA_LENS, // ITEM_LENS
PLAYER_IA_BEAN, // ITEM_BEAN
PLAYER_IA_LENS_OF_TRUTH, // ITEM_LENS_OF_TRUTH
PLAYER_IA_MAGIC_BEAN, // ITEM_MAGIC_BEAN
PLAYER_IA_HAMMER, // ITEM_HAMMER
PLAYER_IA_BOW_LIGHT, // ITEM_ARROW_LIGHT
PLAYER_IA_NAYRUS_LOVE, // ITEM_NAYRUS_LOVE
PLAYER_IA_BOTTLE, // ITEM_BOTTLE
PLAYER_IA_BOTTLE_POTION_RED, // ITEM_POTION_RED
PLAYER_IA_BOTTLE_POTION_GREEN, // ITEM_POTION_GREEN
PLAYER_IA_BOTTLE_POTION_BLUE, // ITEM_POTION_BLUE
PLAYER_IA_BOTTLE_FAIRY, // ITEM_FAIRY
PLAYER_IA_BOTTLE_FISH, // ITEM_FISH
PLAYER_IA_BOTTLE_MILK, // ITEM_MILK_BOTTLE
PLAYER_IA_BOTTLE_LETTER, // ITEM_LETTER_RUTO
PLAYER_IA_BOTTLE_FIRE, // ITEM_BLUE_FIRE
PLAYER_IA_BOTTLE_BUG, // ITEM_BUG
PLAYER_IA_BOTTLE_BIG_POE, // ITEM_BIG_POE
PLAYER_IA_BOTTLE_MILK_HALF, // ITEM_MILK_HALF
PLAYER_IA_BOTTLE_POE, // ITEM_POE
PLAYER_IA_BOTTLE, // ITEM_BOTTLE_EMPTY
PLAYER_IA_BOTTLE_POTION_RED, // ITEM_BOTTLE_POTION_RED
PLAYER_IA_BOTTLE_POTION_GREEN, // ITEM_BOTTLE_POTION_GREEN
PLAYER_IA_BOTTLE_POTION_BLUE, // ITEM_BOTTLE_POTION_BLUE
PLAYER_IA_BOTTLE_FAIRY, // ITEM_BOTTLE_FAIRY
PLAYER_IA_BOTTLE_FISH, // ITEM_BOTTLE_FISH
PLAYER_IA_BOTTLE_MILK_FULL, // ITEM_BOTTLE_MILK_FULL
PLAYER_IA_BOTTLE_RUTOS_LETTER, // ITEM_BOTTLE_RUTOS_LETTER
PLAYER_IA_BOTTLE_FIRE, // ITEM_BOTTLE_BLUE_FIRE
PLAYER_IA_BOTTLE_BUG, // ITEM_BOTTLE_BUG
PLAYER_IA_BOTTLE_BIG_POE, // ITEM_BOTTLE_BIG_POE
PLAYER_IA_BOTTLE_MILK_HALF, // ITEM_BOTTLE_MILK_HALF
PLAYER_IA_BOTTLE_POE, // ITEM_BOTTLE_POE
PLAYER_IA_WEIRD_EGG, // ITEM_WEIRD_EGG
PLAYER_IA_CHICKEN, // ITEM_CHICKEN
PLAYER_IA_LETTER_ZELDA, // ITEM_LETTER_ZELDA
PLAYER_IA_ZELDAS_LETTER, // ITEM_ZELDAS_LETTER
PLAYER_IA_MASK_KEATON, // ITEM_MASK_KEATON
PLAYER_IA_MASK_SKULL, // ITEM_MASK_SKULL
PLAYER_IA_MASK_SPOOKY, // ITEM_MASK_SPOOKY
PLAYER_IA_MASK_BUNNY, // ITEM_MASK_BUNNY
PLAYER_IA_MASK_BUNNY_HOOD, // ITEM_MASK_BUNNY_HOOD
PLAYER_IA_MASK_GORON, // ITEM_MASK_GORON
PLAYER_IA_MASK_ZORA, // ITEM_MASK_ZORA
PLAYER_IA_MASK_GERUDO, // ITEM_MASK_GERUDO
@ -1201,18 +1201,18 @@ static s8 sItemActions[] = {
PLAYER_IA_COJIRO, // ITEM_COJIRO
PLAYER_IA_ODD_MUSHROOM, // ITEM_ODD_MUSHROOM
PLAYER_IA_ODD_POTION, // ITEM_ODD_POTION
PLAYER_IA_SAW, // ITEM_SAW
PLAYER_IA_SWORD_BROKEN, // ITEM_SWORD_BROKEN
PLAYER_IA_POACHERS_SAW, // ITEM_POACHERS_SAW
PLAYER_IA_BROKEN_GORONS_SWORD, // ITEM_BROKEN_GORONS_SWORD
PLAYER_IA_PRESCRIPTION, // ITEM_PRESCRIPTION
PLAYER_IA_FROG, // ITEM_FROG
PLAYER_IA_EYEDROPS, // ITEM_EYEDROPS
PLAYER_IA_FROG, // ITEM_EYEBALL_FROG
PLAYER_IA_EYEDROPS, // ITEM_EYE_DROPS
PLAYER_IA_CLAIM_CHECK, // ITEM_CLAIM_CHECK
PLAYER_IA_BOW_FIRE, // ITEM_BOW_ARROW_FIRE
PLAYER_IA_BOW_ICE, // ITEM_BOW_ARROW_ICE
PLAYER_IA_BOW_LIGHT, // ITEM_BOW_ARROW_LIGHT
PLAYER_IA_BOW_FIRE, // ITEM_BOW_FIRE
PLAYER_IA_BOW_ICE, // ITEM_BOW_ICE
PLAYER_IA_BOW_LIGHT, // ITEM_BOW_LIGHT
PLAYER_IA_SWORD_KOKIRI, // ITEM_SWORD_KOKIRI
PLAYER_IA_SWORD_MASTER, // ITEM_SWORD_MASTER
PLAYER_IA_SWORD_BGS, // ITEM_SWORD_BGS
PLAYER_IA_SWORD_BGS, // ITEM_SWORD_BIGGORON
};
static s32 (*D_80853EDC[])(Player* this, PlayState* play) = {
@ -1222,7 +1222,7 @@ static s32 (*D_80853EDC[])(Player* this, PlayState* play) = {
func_808349DC, // PLAYER_IA_SWORD_MASTER
func_808349DC, // PLAYER_IA_SWORD_KOKIRI
func_808349DC, // PLAYER_IA_SWORD_BGS
func_8083485C, // PLAYER_IA_STICK
func_8083485C, // PLAYER_IA_DEKU_STICK
func_8083485C, // PLAYER_IA_HAMMER
func_8083501C, // PLAYER_IA_BOW
func_8083501C, // PLAYER_IA_BOW_FIRE
@ -1243,33 +1243,33 @@ static s32 (*D_80853EDC[])(Player* this, PlayState* play) = {
func_8083485C, // PLAYER_IA_FARORES_WIND
func_8083485C, // PLAYER_IA_NAYRUS_LOVE
func_8083485C, // PLAYER_IA_DINS_FIRE
func_8083485C, // PLAYER_IA_NUT
func_8083485C, // PLAYER_IA_DEKU_NUT
func_8083485C, // PLAYER_IA_OCARINA_FAIRY
func_8083485C, // PLAYER_IA_OCARINA_TIME
func_8083485C, // PLAYER_IA_OCARINA_OF_TIME
func_8083485C, // PLAYER_IA_BOTTLE
func_8083485C, // PLAYER_IA_BOTTLE_FISH
func_8083485C, // PLAYER_IA_BOTTLE_FIRE
func_8083485C, // PLAYER_IA_BOTTLE_BUG
func_8083485C, // PLAYER_IA_BOTTLE_POE
func_8083485C, // PLAYER_IA_BOTTLE_BIG_POE
func_8083485C, // PLAYER_IA_BOTTLE_LETTER
func_8083485C, // PLAYER_IA_BOTTLE_RUTOS_LETTER
func_8083485C, // PLAYER_IA_BOTTLE_POTION_RED
func_8083485C, // PLAYER_IA_BOTTLE_POTION_BLUE
func_8083485C, // PLAYER_IA_BOTTLE_POTION_GREEN
func_8083485C, // PLAYER_IA_BOTTLE_MILK
func_8083485C, // PLAYER_IA_BOTTLE_MILK_FULL
func_8083485C, // PLAYER_IA_BOTTLE_MILK_HALF
func_8083485C, // PLAYER_IA_BOTTLE_FAIRY
func_8083485C, // PLAYER_IA_LETTER_ZELDA
func_8083485C, // PLAYER_IA_ZELDAS_LETTER
func_8083485C, // PLAYER_IA_WEIRD_EGG
func_8083485C, // PLAYER_IA_CHICKEN
func_8083485C, // PLAYER_IA_BEAN
func_8083485C, // PLAYER_IA_MAGIC_BEAN
func_8083485C, // PLAYER_IA_POCKET_EGG
func_8083485C, // PLAYER_IA_POCKET_CUCCO
func_8083485C, // PLAYER_IA_COJIRO
func_8083485C, // PLAYER_IA_ODD_MUSHROOM
func_8083485C, // PLAYER_IA_ODD_POTION
func_8083485C, // PLAYER_IA_SAW
func_8083485C, // PLAYER_IA_SWORD_BROKEN
func_8083485C, // PLAYER_IA_POACHERS_SAW
func_8083485C, // PLAYER_IA_BROKEN_GORONS_SWORD
func_8083485C, // PLAYER_IA_PRESCRIPTION
func_8083485C, // PLAYER_IA_FROG
func_8083485C, // PLAYER_IA_EYEDROPS
@ -1277,12 +1277,12 @@ static s32 (*D_80853EDC[])(Player* this, PlayState* play) = {
func_8083485C, // PLAYER_IA_MASK_KEATON
func_8083485C, // PLAYER_IA_MASK_SKULL
func_8083485C, // PLAYER_IA_MASK_SPOOKY
func_8083485C, // PLAYER_IA_MASK_BUNNY
func_8083485C, // PLAYER_IA_MASK_BUNNY_HOOD
func_8083485C, // PLAYER_IA_MASK_GORON
func_8083485C, // PLAYER_IA_MASK_ZORA
func_8083485C, // PLAYER_IA_MASK_GERUDO
func_8083485C, // PLAYER_IA_MASK_TRUTH
func_8083485C, // PLAYER_IA_LENS
func_8083485C, // PLAYER_IA_LENS_OF_TRUTH
};
static void (*D_80853FE8[])(PlayState* play, Player* this) = {
@ -1292,7 +1292,7 @@ static void (*D_80853FE8[])(PlayState* play, Player* this) = {
func_80833770, // PLAYER_IA_SWORD_MASTER
func_80833770, // PLAYER_IA_SWORD_KOKIRI
func_80833770, // PLAYER_IA_SWORD_BGS
func_8083377C, // PLAYER_IA_STICK
func_8083377C, // PLAYER_IA_DEKU_STICK
func_80833790, // PLAYER_IA_HAMMER
func_8083379C, // PLAYER_IA_BOW
func_8083379C, // PLAYER_IA_BOW_FIRE
@ -1313,33 +1313,33 @@ static void (*D_80853FE8[])(PlayState* play, Player* this) = {
func_80833770, // PLAYER_IA_FARORES_WIND
func_80833770, // PLAYER_IA_NAYRUS_LOVE
func_80833770, // PLAYER_IA_DINS_FIRE
func_80833770, // PLAYER_IA_NUT
func_80833770, // PLAYER_IA_DEKU_NUT
func_80833770, // PLAYER_IA_OCARINA_FAIRY
func_80833770, // PLAYER_IA_OCARINA_TIME
func_80833770, // PLAYER_IA_OCARINA_OF_TIME
func_80833770, // PLAYER_IA_BOTTLE
func_80833770, // PLAYER_IA_BOTTLE_FISH
func_80833770, // PLAYER_IA_BOTTLE_FIRE
func_80833770, // PLAYER_IA_BOTTLE_BUG
func_80833770, // PLAYER_IA_BOTTLE_POE
func_80833770, // PLAYER_IA_BOTTLE_BIG_POE
func_80833770, // PLAYER_IA_BOTTLE_LETTER
func_80833770, // PLAYER_IA_BOTTLE_RUTOS_LETTER
func_80833770, // PLAYER_IA_BOTTLE_POTION_RED
func_80833770, // PLAYER_IA_BOTTLE_POTION_BLUE
func_80833770, // PLAYER_IA_BOTTLE_POTION_GREEN
func_80833770, // PLAYER_IA_BOTTLE_MILK
func_80833770, // PLAYER_IA_BOTTLE_MILK_FULL
func_80833770, // PLAYER_IA_BOTTLE_MILK_HALF
func_80833770, // PLAYER_IA_BOTTLE_FAIRY
func_80833770, // PLAYER_IA_LETTER_ZELDA
func_80833770, // PLAYER_IA_ZELDAS_LETTER
func_80833770, // PLAYER_IA_WEIRD_EGG
func_80833770, // PLAYER_IA_CHICKEN
func_80833770, // PLAYER_IA_BEAN
func_80833770, // PLAYER_IA_MAGIC_BEAN
func_80833770, // PLAYER_IA_POCKET_EGG
func_80833770, // PLAYER_IA_POCKET_CUCCO
func_80833770, // PLAYER_IA_COJIRO
func_80833770, // PLAYER_IA_ODD_MUSHROOM
func_80833770, // PLAYER_IA_ODD_POTION
func_80833770, // PLAYER_IA_SAW
func_80833770, // PLAYER_IA_SWORD_BROKEN
func_80833770, // PLAYER_IA_POACHERS_SAW
func_80833770, // PLAYER_IA_BROKEN_GORONS_SWORD
func_80833770, // PLAYER_IA_PRESCRIPTION
func_80833770, // PLAYER_IA_FROG
func_80833770, // PLAYER_IA_EYEDROPS
@ -1347,12 +1347,12 @@ static void (*D_80853FE8[])(PlayState* play, Player* this) = {
func_80833770, // PLAYER_IA_MASK_KEATON
func_80833770, // PLAYER_IA_MASK_SKULL
func_80833770, // PLAYER_IA_MASK_SPOOKY
func_80833770, // PLAYER_IA_MASK_BUNNY
func_80833770, // PLAYER_IA_MASK_BUNNY_HOOD
func_80833770, // PLAYER_IA_MASK_GORON
func_80833770, // PLAYER_IA_MASK_ZORA
func_80833770, // PLAYER_IA_MASK_GERUDO
func_80833770, // PLAYER_IA_MASK_TRUTH
func_80833770, // PLAYER_IA_LENS
func_80833770, // PLAYER_IA_LENS_OF_TRUTH
};
typedef enum {
@ -3147,13 +3147,13 @@ void func_80835F44(PlayState* play, Player* this, s32 item) {
((itemAction == PLAYER_IA_HOOKSHOT) || (itemAction == PLAYER_IA_LONGSHOT)))) {
if ((play->bombchuBowlingStatus == 0) &&
(((itemAction == PLAYER_IA_STICK) && (AMMO(ITEM_STICK) == 0)) ||
((itemAction == PLAYER_IA_BEAN) && (AMMO(ITEM_BEAN) == 0)) ||
(((itemAction == PLAYER_IA_DEKU_STICK) && (AMMO(ITEM_DEKU_STICK) == 0)) ||
((itemAction == PLAYER_IA_MAGIC_BEAN) && (AMMO(ITEM_MAGIC_BEAN) == 0)) ||
(temp = Player_ActionToExplosive(this, itemAction),
((temp >= 0) && ((AMMO(sExplosiveInfos[temp].itemId) == 0) ||
(play->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length >= 3)))))) {
func_80078884(NA_SE_SY_ERROR);
} else if (itemAction == PLAYER_IA_LENS) {
} else if (itemAction == PLAYER_IA_LENS_OF_TRUTH) {
if (Magic_RequestChange(play, 0, MAGIC_CONSUME_LENS)) {
if (play->actorCtx.lensActive) {
Actor_DisableLens(play);
@ -3165,8 +3165,8 @@ void func_80835F44(PlayState* play, Player* this, s32 item) {
} else {
func_80078884(NA_SE_SY_ERROR);
}
} else if (itemAction == PLAYER_IA_NUT) {
if (AMMO(ITEM_NUT) != 0) {
} else if (itemAction == PLAYER_IA_DEKU_NUT) {
if (AMMO(ITEM_DEKU_NUT) != 0) {
func_8083C61C(play, this);
} else {
func_80078884(NA_SE_SY_ERROR);
@ -3188,7 +3188,7 @@ void func_80835F44(PlayState* play, Player* this, s32 item) {
}
func_808328EC(this, NA_SE_PL_CHANGE_ARMS);
} else if (((itemAction >= PLAYER_IA_OCARINA_FAIRY) && (itemAction <= PLAYER_IA_OCARINA_TIME)) ||
} else if (((itemAction >= PLAYER_IA_OCARINA_FAIRY) && (itemAction <= PLAYER_IA_OCARINA_OF_TIME)) ||
(itemAction >= PLAYER_IA_BOTTLE_FISH)) {
if (!func_8008E9C4(this) ||
((itemAction >= PLAYER_IA_BOTTLE_POTION_RED) && (itemAction <= PLAYER_IA_BOTTLE_FAIRY))) {
@ -3644,7 +3644,7 @@ s32 func_808375D8(Player* this) {
s8 temp2;
s32 i;
if ((this->heldItemAction == PLAYER_IA_STICK) || Player_HoldsBrokenKnife(this)) {
if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) || Player_HoldsBrokenKnife(this)) {
return 0;
}
@ -3735,7 +3735,7 @@ s32 func_80837818(Player* this) {
}
}
}
if (this->heldItemAction == PLAYER_IA_STICK) {
if (this->heldItemAction == PLAYER_IA_DEKU_STICK) {
sp18 = PLAYER_MWA_FORWARD_SLASH_1H;
}
}
@ -5167,35 +5167,35 @@ void func_8083B010(Player* this) {
}
static u8 D_80854528[] = {
GI_LETTER_ZELDA, // EXCH_ITEM_LETTER_ZELDA
GI_WEIRD_EGG, // EXCH_ITEM_WEIRD_EGG
GI_CHICKEN, // EXCH_ITEM_CHICKEN
GI_BEAN, // EXCH_ITEM_BEAN
GI_POCKET_EGG, // EXCH_ITEM_POCKET_EGG
GI_POCKET_CUCCO, // EXCH_ITEM_POCKET_CUCCO
GI_COJIRO, // EXCH_ITEM_COJIRO
GI_ODD_MUSHROOM, // EXCH_ITEM_ODD_MUSHROOM
GI_ODD_POTION, // EXCH_ITEM_ODD_POTION
GI_SAW, // EXCH_ITEM_SAW
GI_SWORD_BROKEN, // EXCH_ITEM_SWORD_BROKEN
GI_PRESCRIPTION, // EXCH_ITEM_PRESCRIPTION
GI_FROG, // EXCH_ITEM_FROG
GI_EYEDROPS, // EXCH_ITEM_EYEDROPS
GI_CLAIM_CHECK, // EXCH_ITEM_CLAIM_CHECK
GI_MASK_SKULL, // EXCH_ITEM_MASK_SKULL
GI_MASK_SPOOKY, // EXCH_ITEM_MASK_SPOOKY
GI_MASK_KEATON, // EXCH_ITEM_MASK_KEATON
GI_MASK_BUNNY, // EXCH_ITEM_MASK_BUNNY
GI_MASK_TRUTH, // EXCH_ITEM_MASK_TRUTH
GI_MASK_GORON, // EXCH_ITEM_MASK_GORON
GI_MASK_ZORA, // EXCH_ITEM_MASK_ZORA
GI_MASK_GERUDO, // EXCH_ITEM_MASK_GERUDO
GI_LETTER_RUTO, // EXCH_ITEM_FISH
GI_LETTER_RUTO, // EXCH_ITEM_BLUE_FIRE
GI_LETTER_RUTO, // EXCH_ITEM_BUG
GI_LETTER_RUTO, // EXCH_ITEM_POE
GI_LETTER_RUTO, // EXCH_ITEM_BIG_POE
GI_LETTER_RUTO, // EXCH_ITEM_LETTER_RUTO
GI_ZELDAS_LETTER, // EXCH_ITEM_ZELDAS_LETTER
GI_WEIRD_EGG, // EXCH_ITEM_WEIRD_EGG
GI_CHICKEN, // EXCH_ITEM_CHICKEN
GI_MAGIC_BEAN, // EXCH_ITEM_MAGIC_BEAN
GI_POCKET_EGG, // EXCH_ITEM_POCKET_EGG
GI_POCKET_CUCCO, // EXCH_ITEM_POCKET_CUCCO
GI_COJIRO, // EXCH_ITEM_COJIRO
GI_ODD_MUSHROOM, // EXCH_ITEM_ODD_MUSHROOM
GI_ODD_POTION, // EXCH_ITEM_ODD_POTION
GI_POACHERS_SAW, // EXCH_ITEM_POACHERS_SAW
GI_BROKEN_GORONS_SWORD, // EXCH_ITEM_BROKEN_GORONS_SWORD
GI_PRESCRIPTION, // EXCH_ITEM_PRESCRIPTION
GI_EYEBALL_FROG, // EXCH_ITEM_EYEBALL_FROG
GI_EYE_DROPS, // EXCH_ITEM_EYE_DROPS
GI_CLAIM_CHECK, // EXCH_ITEM_CLAIM_CHECK
GI_MASK_SKULL, // EXCH_ITEM_MASK_SKULL
GI_MASK_SPOOKY, // EXCH_ITEM_MASK_SPOOKY
GI_MASK_KEATON, // EXCH_ITEM_MASK_KEATON
GI_MASK_BUNNY_HOOD, // EXCH_ITEM_MASK_BUNNY_HOOD
GI_MASK_TRUTH, // EXCH_ITEM_MASK_TRUTH
GI_MASK_GORON, // EXCH_ITEM_MASK_GORON
GI_MASK_ZORA, // EXCH_ITEM_MASK_ZORA
GI_MASK_GERUDO, // EXCH_ITEM_MASK_GERUDO
GI_BOTTLE_RUTOS_LETTER, // EXCH_ITEM_BOTTLE_FISH
GI_BOTTLE_RUTOS_LETTER, // EXCH_ITEM_BOTTLE_BLUE_FIRE
GI_BOTTLE_RUTOS_LETTER, // EXCH_ITEM_BOTTLE_BUG
GI_BOTTLE_RUTOS_LETTER, // EXCH_ITEM_BOTTLE_POE
GI_BOTTLE_RUTOS_LETTER, // EXCH_ITEM_BOTTLE_BIG_POE
GI_BOTTLE_RUTOS_LETTER, // EXCH_ITEM_BOTTLE_RUTOS_LETTER
};
static LinkAnimationHeader* D_80854548[] = {
@ -5230,14 +5230,14 @@ s32 func_8083B040(Player* this, PlayState* play) {
return 1;
}
sp2C = this->itemAction - PLAYER_IA_LETTER_ZELDA;
sp2C = this->itemAction - PLAYER_IA_ZELDAS_LETTER;
if ((sp2C >= 0) ||
(sp28 = Player_ActionToBottle(this, this->itemAction) - 1,
((sp28 >= 0) && (sp28 < 6) &&
((this->itemAction > PLAYER_IA_BOTTLE_POE) ||
((this->targetActor != NULL) &&
(((this->itemAction == PLAYER_IA_BOTTLE_POE) && (this->exchangeItemId == EXCH_ITEM_POE)) ||
(this->exchangeItemId == EXCH_ITEM_BLUE_FIRE))))))) {
((this->targetActor != NULL) && (((this->itemAction == PLAYER_IA_BOTTLE_POE) &&
(this->exchangeItemId == EXCH_ITEM_BOTTLE_POE)) ||
(this->exchangeItemId == EXCH_ITEM_BOTTLE_BLUE_FIRE))))))) {
if ((play->actorCtx.titleCtx.delayTimer == 0) && (play->actorCtx.titleCtx.alpha == 0)) {
func_80835DE4(play, this, func_8084F104, 0);
@ -5258,14 +5258,15 @@ s32 func_8083B040(Player* this, PlayState* play) {
targetActor = this->targetActor;
if ((targetActor != NULL) &&
((this->exchangeItemId == sp2C) || (this->exchangeItemId == EXCH_ITEM_BLUE_FIRE) ||
((this->exchangeItemId == EXCH_ITEM_POE) &&
((this->exchangeItemId == sp2C) || (this->exchangeItemId == EXCH_ITEM_BOTTLE_BLUE_FIRE) ||
((this->exchangeItemId == EXCH_ITEM_BOTTLE_POE) &&
(this->itemAction == PLAYER_IA_BOTTLE_BIG_POE)) ||
((this->exchangeItemId == EXCH_ITEM_BEAN) &&
((this->exchangeItemId == EXCH_ITEM_MAGIC_BEAN) &&
(this->itemAction == PLAYER_IA_BOTTLE_BUG))) &&
((this->exchangeItemId != EXCH_ITEM_BEAN) || (this->itemAction == PLAYER_IA_BEAN))) {
if (this->exchangeItemId == EXCH_ITEM_BEAN) {
Inventory_ChangeAmmo(ITEM_BEAN, -1);
((this->exchangeItemId != EXCH_ITEM_MAGIC_BEAN) ||
(this->itemAction == PLAYER_IA_MAGIC_BEAN))) {
if (this->exchangeItemId == EXCH_ITEM_MAGIC_BEAN) {
Inventory_ChangeAmmo(ITEM_MAGIC_BEAN, -1);
func_80835DE4(play, this, func_8084279C, 0);
this->stateFlags1 |= PLAYER_STATE1_29;
this->unk_850 = 0x50;
@ -5273,7 +5274,7 @@ s32 func_8083B040(Player* this, PlayState* play) {
}
targetActor->flags |= ACTOR_FLAG_8;
this->unk_664 = this->targetActor;
} else if (sp2C == EXCH_ITEM_LETTER_RUTO) {
} else if (sp2C == EXCH_ITEM_BOTTLE_RUTOS_LETTER) {
this->unk_84F = 1;
this->actor.textId = 0x4005;
func_80835EA4(play, 1);
@ -5697,7 +5698,7 @@ void func_8083C50C(Player* this) {
s32 func_8083C544(Player* this, PlayState* play) {
if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) {
if (!(this->stateFlags1 & PLAYER_STATE1_22) && (Player_GetMeleeWeaponHeld(this) != 0) && (this->unk_844 == 1) &&
(this->heldItemAction != PLAYER_IA_STICK)) {
(this->heldItemAction != PLAYER_IA_DEKU_STICK)) {
if ((this->heldItemAction != PLAYER_IA_SWORD_BGS) || (gSaveContext.swordHealth > 0.0f)) {
func_808377DC(play, this);
return 1;
@ -5712,7 +5713,7 @@ s32 func_8083C544(Player* this, PlayState* play) {
s32 func_8083C61C(PlayState* play, Player* this) {
if ((play->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_2) &&
(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && (AMMO(ITEM_NUT) != 0)) {
(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && (AMMO(ITEM_DEKU_NUT) != 0)) {
func_80835C58(play, this, func_8084E604, 0);
func_80832264(play, this, &gPlayerAnim_link_normal_light_bom);
this->unk_6AD = 0;
@ -7989,13 +7990,13 @@ void func_80842A28(PlayState* play, Player* this) {
}
void func_80842A88(PlayState* play, Player* this) {
Inventory_ChangeAmmo(ITEM_STICK, -1);
Inventory_ChangeAmmo(ITEM_DEKU_STICK, -1);
func_80835F44(play, this, ITEM_NONE);
}
s32 func_80842AC4(PlayState* play, Player* this) {
if ((this->heldItemAction == PLAYER_IA_STICK) && (this->unk_85C > 0.5f)) {
if (AMMO(ITEM_STICK) != 0) {
if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_85C > 0.5f)) {
if (AMMO(ITEM_DEKU_STICK) != 0) {
EffectSsStick_Spawn(play, &this->bodyPartsPos[PLAYER_BODYPART_R_HAND], this->actor.shape.rot.y + 0x8000);
this->unk_85C = 0.5f;
func_80842A88(play, this);
@ -10317,7 +10318,7 @@ void func_80848A04(PlayState* play, Player* this) {
temp = 1.0f;
if (DECR(this->unk_860) == 0) {
Inventory_ChangeAmmo(ITEM_STICK, -1);
Inventory_ChangeAmmo(ITEM_DEKU_STICK, -1);
this->unk_860 = 1;
temp = 0.0f;
this->unk_85C = temp;
@ -10500,7 +10501,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
func_808473D4(play, this);
func_80836BEC(this, play);
if ((this->heldItemAction == PLAYER_IA_STICK) && (this->unk_860 != 0)) {
if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_860 != 0)) {
func_80848A04(play, this);
} else if ((this->heldItemAction == PLAYER_IA_FISHING_POLE) && (this->unk_860 < 0)) {
this->unk_860++;
@ -11284,7 +11285,7 @@ s32 func_8084B3CC(PlayState* play, Player* this) {
void func_8084B498(Player* this) {
this->itemAction =
(INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_FAIRY) ? PLAYER_IA_OCARINA_FAIRY : PLAYER_IA_OCARINA_TIME;
(INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_FAIRY) ? PLAYER_IA_OCARINA_FAIRY : PLAYER_IA_OCARINA_OF_TIME;
}
s32 func_8084B4D4(PlayState* play, Player* this) {
@ -12435,7 +12436,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
}
} else {
if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
if (this->getItemId == GI_GAUNTLETS_SILVER) {
if (this->getItemId == GI_SILVER_GAUNTLETS) {
play->nextEntranceIndex = ENTR_SPOT11_0;
play->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.nextCutsceneIndex = 0xFFF1;
@ -12556,7 +12557,7 @@ void func_8084E604(Player* this, PlayState* play) {
if (LinkAnimation_Update(play, &this->skelAnime)) {
func_8083A098(this, &gPlayerAnim_link_normal_light_bom_end, play);
} else if (LinkAnimation_OnFrame(&this->skelAnime, 3.0f)) {
Inventory_ChangeAmmo(ITEM_NUT, -1);
Inventory_ChangeAmmo(ITEM_DEKU_NUT, -1);
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ARROW, this->bodyPartsPos[PLAYER_BODYPART_R_HAND].x,
this->bodyPartsPos[PLAYER_BODYPART_R_HAND].y, this->bodyPartsPos[PLAYER_BODYPART_R_HAND].z, 4000,
this->actor.shape.rot.y, 0, ARROW_NUT);
@ -12730,7 +12731,7 @@ void func_8084EAC0(Player* this, PlayState* play) {
if ((gSaveContext.healthAccumulator == 0) && (gSaveContext.magicState != MAGIC_STATE_FILL)) {
func_80832B78(play, this, &gPlayerAnim_link_bottle_drink_demo_end);
this->unk_850 = 2;
Player_UpdateBottleHeld(play, this, ITEM_BOTTLE, PLAYER_IA_BOTTLE);
Player_UpdateBottleHeld(play, this, ITEM_BOTTLE_EMPTY, PLAYER_IA_BOTTLE);
}
func_80832698(this, NA_SE_VO_LI_DRINK - SFX_FLAG);
} else if ((this->unk_850 == 2) && LinkAnimation_OnFrame(&this->skelAnime, 29.0f)) {
@ -12739,10 +12740,10 @@ void func_8084EAC0(Player* this, PlayState* play) {
}
static BottleCatchInfo sBottleCatchInfos[] = {
{ ACTOR_EN_ELF, ITEM_FAIRY, PLAYER_IA_BOTTLE_FAIRY, 0x46 },
{ ACTOR_EN_FISH, ITEM_FISH, PLAYER_IA_BOTTLE_FISH, 0x47 },
{ ACTOR_EN_ICE_HONO, ITEM_BLUE_FIRE, PLAYER_IA_BOTTLE_FIRE, 0x5D },
{ ACTOR_EN_INSECT, ITEM_BUG, PLAYER_IA_BOTTLE_BUG, 0x7A },
{ ACTOR_EN_ELF, ITEM_BOTTLE_FAIRY, PLAYER_IA_BOTTLE_FAIRY, 0x46 },
{ ACTOR_EN_FISH, ITEM_BOTTLE_FISH, PLAYER_IA_BOTTLE_FISH, 0x47 },
{ ACTOR_EN_ICE_HONO, ITEM_BOTTLE_BLUE_FIRE, PLAYER_IA_BOTTLE_FIRE, 0x5D },
{ ACTOR_EN_INSECT, ITEM_BOTTLE_BUG, PLAYER_IA_BOTTLE_BUG, 0x7A },
};
void func_8084ECA4(Player* this, PlayState* play) {
@ -12821,7 +12822,7 @@ void func_8084EED8(Player* this, PlayState* play) {
if (LinkAnimation_OnFrame(&this->skelAnime, 37.0f)) {
Player_SpawnFairy(play, this, &this->leftHandPos, &D_80854A1C, FAIRY_REVIVE_BOTTLE);
Player_UpdateBottleHeld(play, this, ITEM_BOTTLE, PLAYER_IA_BOTTLE);
Player_UpdateBottleHeld(play, this, ITEM_BOTTLE_EMPTY, PLAYER_IA_BOTTLE);
func_8002F7DC(&this->actor, NA_SE_EV_BOTTLE_CAP_OPEN);
func_8002F7DC(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG);
} else if (LinkAnimation_OnFrame(&this->skelAnime, 47.0f)) {
@ -12857,7 +12858,7 @@ void func_8084EFC0(Player* this, PlayState* play) {
(Math_CosS(this->actor.shape.rot.y) * 5.0f) + this->leftHandPos.z, 0x4000, this->actor.shape.rot.y,
0, dropInfo->actorParams);
Player_UpdateBottleHeld(play, this, ITEM_BOTTLE, PLAYER_IA_BOTTLE);
Player_UpdateBottleHeld(play, this, ITEM_BOTTLE_EMPTY, PLAYER_IA_BOTTLE);
return;
}
@ -12886,7 +12887,7 @@ void func_8084F104(Player* this, PlayState* play) {
} else {
GetItemEntry* giEntry = &sGetItemTable[D_80854528[this->exchangeItemId - 1] - 1];
if (this->itemAction >= PLAYER_IA_LETTER_ZELDA) {
if (this->itemAction >= PLAYER_IA_ZELDAS_LETTER) {
this->unk_862 = ABS(giEntry->gi);
}

4
src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View file

@ -1503,8 +1503,8 @@ void FileSelect_LoadGame(GameState* thisx) {
if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI) &&
(gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER) &&
(gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS) &&
(gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KNIFE)) {
(gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BIGGORON) &&
(gSaveContext.equips.buttonItems[0] != ITEM_GIANTS_KNIFE)) {
gSaveContext.equips.buttonItems[0] = ITEM_NONE;
swordEquipValue = (gEquipMasks[EQUIP_TYPE_SWORD] & gSaveContext.equips.equipment) >> (EQUIP_TYPE_SWORD * 4);

35
src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
View file

@ -29,9 +29,9 @@ static u8 sMaxUpgradeValues[] = {
// 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,
ITEM_SLINGSHOT, ITEM_OCARINA_FAIRY, ITEM_BOMBCHU, ITEM_HOOKSHOT, ITEM_ARROW_ICE, ITEM_FARORES_WIND,
ITEM_BOOMERANG, ITEM_LENS, ITEM_BEAN, ITEM_HAMMER, ITEM_ARROW_LIGHT, ITEM_NAYRUS_LOVE,
ITEM_DEKU_STICK, ITEM_DEKU_NUT, ITEM_BOMB, ITEM_BOW, ITEM_ARROW_FIRE, ITEM_DINS_FIRE,
ITEM_SLINGSHOT, ITEM_OCARINA_FAIRY, ITEM_BOMBCHU, ITEM_HOOKSHOT, ITEM_ARROW_ICE, ITEM_FARORES_WIND,
ITEM_BOOMERANG, ITEM_LENS_OF_TRUTH, ITEM_MAGIC_BEAN, ITEM_HAMMER, ITEM_ARROW_LIGHT, ITEM_NAYRUS_LOVE,
};
void KaleidoScope_DrawDebugEditorText(Gfx** gfxp) {
@ -192,7 +192,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) {
for (j = 0, x = 78; j < 6; j++, slot++, x += 26) {
spD8[2] = 0;
if ((slot <= SLOT_BOW) || (slot == SLOT_SLINGSHOT) || (slot == SLOT_BOMBCHU) || (slot == SLOT_BEAN)) {
if ((slot <= SLOT_BOW) || (slot == SLOT_SLINGSHOT) || (slot == SLOT_BOMBCHU) || (slot == SLOT_MAGIC_BEAN)) {
spD8[3] = AMMO(gAmmoItems[slot]);
} else if (slot == SLOT_OCARINA) {
spD8[3] = gSaveContext.inventory.items[slot];
@ -408,7 +408,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) {
default:
if (curSection < 0x1B) {
i = curSection - 3;
if ((i <= SLOT_BOW) || (i == SLOT_SLINGSHOT) || (i == SLOT_BOMBCHU) || (i == SLOT_BEAN)) {
if ((i <= SLOT_BOW) || (i == SLOT_SLINGSHOT) || (i == SLOT_BOMBCHU) || (i == SLOT_MAGIC_BEAN)) {
if (CHECK_BTN_ALL(input->press.button, BTN_CUP)) {
Inventory_DeleteItem(gAmmoItems[i], SLOT(gAmmoItems[i]));
AMMO(gAmmoItems[i]) = 0;
@ -435,14 +435,14 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) {
if (gSaveContext.inventory.items[i] == ITEM_NONE) {
gSaveContext.inventory.items[i] = ITEM_OCARINA_FAIRY;
} else if ((gSaveContext.inventory.items[i] >= ITEM_OCARINA_FAIRY) &&
(gSaveContext.inventory.items[i] < ITEM_OCARINA_TIME)) {
(gSaveContext.inventory.items[i] < ITEM_OCARINA_OF_TIME)) {
gSaveContext.inventory.items[i]++;
}
} else if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
if (gSaveContext.inventory.items[i] == ITEM_NONE) {
gSaveContext.inventory.items[i] = ITEM_OCARINA_TIME;
gSaveContext.inventory.items[i] = ITEM_OCARINA_OF_TIME;
} else if ((gSaveContext.inventory.items[i] > ITEM_OCARINA_FAIRY) &&
(gSaveContext.inventory.items[i] <= ITEM_OCARINA_TIME)) {
(gSaveContext.inventory.items[i] <= ITEM_OCARINA_OF_TIME)) {
gSaveContext.inventory.items[i]--;
}
}
@ -502,19 +502,20 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) {
}
} else if ((i >= SLOT_BOTTLE_1) && (i <= SLOT_BOTTLE_4)) {
if (CHECK_BTN_ALL(input->press.button, BTN_CUP)) {
Inventory_DeleteItem(ITEM_BOTTLE + i - SLOT_BOTTLE_1, SLOT(ITEM_BOTTLE) + i - SLOT_BOTTLE_1);
Inventory_DeleteItem(ITEM_BOTTLE_EMPTY + i - SLOT_BOTTLE_1,
SLOT(ITEM_BOTTLE_EMPTY) + i - SLOT_BOTTLE_1);
} else if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) {
if (gSaveContext.inventory.items[i] == ITEM_NONE) {
gSaveContext.inventory.items[i] = ITEM_BOTTLE;
} else if ((gSaveContext.inventory.items[i] >= ITEM_BOTTLE) &&
(gSaveContext.inventory.items[i] <= ITEM_MILK_HALF)) {
gSaveContext.inventory.items[i] = ITEM_BOTTLE_EMPTY;
} else if ((gSaveContext.inventory.items[i] >= ITEM_BOTTLE_EMPTY) &&
(gSaveContext.inventory.items[i] <= ITEM_BOTTLE_MILK_HALF)) {
gSaveContext.inventory.items[i]++;
}
} else if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
if (gSaveContext.inventory.items[i] == ITEM_NONE) {
gSaveContext.inventory.items[i] = ITEM_POE;
} else if ((gSaveContext.inventory.items[i] >= ITEM_POTION_RED) &&
(gSaveContext.inventory.items[i] <= ITEM_POE)) {
gSaveContext.inventory.items[i] = ITEM_BOTTLE_POE;
} else if ((gSaveContext.inventory.items[i] >= ITEM_BOTTLE_POTION_RED) &&
(gSaveContext.inventory.items[i] <= ITEM_BOTTLE_POE)) {
gSaveContext.inventory.items[i]--;
}
}
@ -524,9 +525,9 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) {
CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
if (i == SLOT_TRADE_ADULT) {
if (gSaveContext.inventory.items[i] == ITEM_NONE) {
gSaveContext.inventory.items[i] = ITEM_BEAN;
gSaveContext.inventory.items[i] = ITEM_MAGIC_BEAN;
} else {
Inventory_DeleteItem(ITEM_BEAN, SLOT(ITEM_BEAN));
Inventory_DeleteItem(ITEM_MAGIC_BEAN, SLOT(ITEM_MAGIC_BEAN));
}
} else {
j = sSlotItems[i];

19
src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View file

@ -5,8 +5,10 @@
static u8 sChildUpgrades[] = { UPG_BULLET_BAG, UPG_BOMB_BAG, UPG_STRENGTH, UPG_SCALE };
static u8 sAdultUpgrades[] = { UPG_QUIVER, UPG_BOMB_BAG, UPG_STRENGTH, UPG_SCALE };
static u8 sChildUpgradeItemBases[] = { ITEM_BULLET_BAG_30, ITEM_BOMB_BAG_20, ITEM_BRACELET, ITEM_SCALE_SILVER };
static u8 sAdultUpgradeItemBases[] = { ITEM_QUIVER_30, ITEM_BOMB_BAG_20, ITEM_BRACELET, ITEM_SCALE_SILVER };
static u8 sChildUpgradeItemBases[] = { ITEM_BULLET_BAG_30, ITEM_BOMB_BAG_20, ITEM_STRENGTH_GORONS_BRACELET,
ITEM_SCALE_SILVER };
static u8 sAdultUpgradeItemBases[] = { ITEM_QUIVER_30, ITEM_BOMB_BAG_20, ITEM_STRENGTH_GORONS_BRACELET,
ITEM_SCALE_SILVER };
static u8 sUpgradeItemOffsets[] = { 0x00, 0x03, 0x06, 0x09 };
@ -426,7 +428,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
if (gSaveContext.bgsFlag != 0) {
cursorItem = ITEM_HEART_PIECE_2;
} else if (CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE)) {
cursorItem = ITEM_SWORD_KNIFE;
cursorItem = ITEM_GIANTS_KNIFE;
}
}
@ -443,7 +445,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
pauseCtx->nameColorSet = 1;
}
if (pauseCtx->cursorItem[PAUSE_EQUIP] == ITEM_BRACELET) {
if (pauseCtx->cursorItem[PAUSE_EQUIP] == ITEM_STRENGTH_GORONS_BRACELET) {
if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
pauseCtx->nameColorSet = 0;
} else {
@ -479,15 +481,16 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
gSaveContext.equips.buttonItems[0] = cursorItem;
if ((pauseCtx->cursorX[PAUSE_EQUIP] == 3) && (gSaveContext.bgsFlag != 0)) {
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BIGGORON;
gSaveContext.swordHealth = 8;
} else {
if (gSaveContext.equips.buttonItems[0] == ITEM_HEART_PIECE_2) {
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BIGGORON;
}
if ((gSaveContext.equips.buttonItems[0] == ITEM_SWORD_BGS) && (gSaveContext.bgsFlag == 0) &&
if ((gSaveContext.equips.buttonItems[0] == ITEM_SWORD_BIGGORON) &&
(gSaveContext.bgsFlag == 0) &&
CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE)) {
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE;
gSaveContext.equips.buttonItems[0] = ITEM_GIANTS_KNIFE;
}
}

90
src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View file

@ -2,8 +2,8 @@
#include "assets/textures/parameter_static/parameter_static.h"
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,
ITEM_BOMBCHU, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_MAGIC_BEAN, ITEM_NONE,
};
static s16 sEquipState = 0;
@ -34,9 +34,9 @@ void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx,
} else if ((item == ITEM_BOMB && AMMO(item) == CUR_CAPACITY(UPG_BOMB_BAG)) ||
(item == ITEM_BOW && AMMO(item) == CUR_CAPACITY(UPG_QUIVER)) ||
(item == ITEM_SLINGSHOT && AMMO(item) == CUR_CAPACITY(UPG_BULLET_BAG)) ||
(item == ITEM_STICK && AMMO(item) == CUR_CAPACITY(UPG_STICKS)) ||
(item == ITEM_NUT && AMMO(item) == CUR_CAPACITY(UPG_NUTS)) || (item == ITEM_BOMBCHU && ammo == 50) ||
(item == ITEM_BEAN && ammo == 15)) {
(item == ITEM_DEKU_STICK && AMMO(item) == CUR_CAPACITY(UPG_DEKU_STICKS)) ||
(item == ITEM_DEKU_NUT && AMMO(item) == CUR_CAPACITY(UPG_DEKU_NUTS)) ||
(item == ITEM_BOMBCHU && ammo == 50) || (item == ITEM_MAGIC_BEAN && ammo == 15)) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 120, 255, 0, pauseCtx->alpha);
}
}
@ -513,7 +513,7 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
D_8082A488--;
if (D_8082A488 == 0) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_ARROW_FIRE;
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
sEquipMoveTimer = 6;
WREG(90) = 320;
@ -590,9 +590,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if (gSaveContext.equips.buttonItems[1] != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xBF) && (pauseCtx->equipTargetItem <= 0xC1) &&
((gSaveContext.equips.buttonItems[1] == ITEM_BOW) ||
((gSaveContext.equips.buttonItems[1] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[1] <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_ARROW_FIRE;
((gSaveContext.equips.buttonItems[1] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[1] <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
gSaveContext.equips.buttonItems[2] = gSaveContext.equips.buttonItems[1];
@ -607,9 +607,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if (gSaveContext.equips.buttonItems[1] != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xBF) && (pauseCtx->equipTargetItem <= 0xC1) &&
((gSaveContext.equips.buttonItems[1] == ITEM_BOW) ||
((gSaveContext.equips.buttonItems[1] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[1] <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_ARROW_FIRE;
((gSaveContext.equips.buttonItems[1] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[1] <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
gSaveContext.equips.buttonItems[3] = gSaveContext.equips.buttonItems[1];
@ -624,19 +624,19 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if ((pauseCtx->equipTargetItem >= 0xBF) && (pauseCtx->equipTargetItem <= 0xC1)) {
if ((gSaveContext.equips.buttonItems[1] == ITEM_BOW) ||
((gSaveContext.equips.buttonItems[1] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[1] <= ITEM_BOW_ARROW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_ARROW_FIRE;
((gSaveContext.equips.buttonItems[1] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[1] <= ITEM_BOW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
}
} else if (pauseCtx->equipTargetItem == ITEM_BOW) {
if ((gSaveContext.equips.buttonItems[2] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[2] <= ITEM_BOW_ARROW_LIGHT)) {
if ((gSaveContext.equips.buttonItems[2] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[2] <= ITEM_BOW_LIGHT)) {
gSaveContext.equips.buttonItems[2] = gSaveContext.equips.buttonItems[1];
gSaveContext.equips.cButtonSlots[1] = gSaveContext.equips.cButtonSlots[0];
Interface_LoadItemIcon2(play, 2);
} else if ((gSaveContext.equips.buttonItems[3] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[3] <= ITEM_BOW_ARROW_LIGHT)) {
} else if ((gSaveContext.equips.buttonItems[3] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[3] <= ITEM_BOW_LIGHT)) {
gSaveContext.equips.buttonItems[3] = gSaveContext.equips.buttonItems[1];
gSaveContext.equips.cButtonSlots[2] = gSaveContext.equips.cButtonSlots[0];
Interface_LoadItemIcon2(play, 3);
@ -665,9 +665,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if (gSaveContext.equips.buttonItems[2] != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xBF) && (pauseCtx->equipTargetItem <= 0xC1) &&
((gSaveContext.equips.buttonItems[2] == ITEM_BOW) ||
((gSaveContext.equips.buttonItems[2] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[2] <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_ARROW_FIRE;
((gSaveContext.equips.buttonItems[2] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[2] <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
gSaveContext.equips.buttonItems[1] = gSaveContext.equips.buttonItems[2];
@ -682,9 +682,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if (gSaveContext.equips.buttonItems[2] != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xBF) && (pauseCtx->equipTargetItem <= 0xC1) &&
((gSaveContext.equips.buttonItems[2] == ITEM_BOW) ||
((gSaveContext.equips.buttonItems[2] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[2] <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_ARROW_FIRE;
((gSaveContext.equips.buttonItems[2] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[2] <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
gSaveContext.equips.buttonItems[3] = gSaveContext.equips.buttonItems[2];
@ -699,18 +699,18 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if ((pauseCtx->equipTargetItem >= 0xBF) && (pauseCtx->equipTargetItem <= 0xC1)) {
if ((gSaveContext.equips.buttonItems[2] == ITEM_BOW) ||
((gSaveContext.equips.buttonItems[2] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[2] <= ITEM_BOW_ARROW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_ARROW_FIRE;
((gSaveContext.equips.buttonItems[2] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[2] <= ITEM_BOW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
}
} else if (pauseCtx->equipTargetItem == ITEM_BOW) {
if ((gSaveContext.equips.buttonItems[1] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[1] <= ITEM_BOW_ARROW_LIGHT)) {
if ((gSaveContext.equips.buttonItems[1] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[1] <= ITEM_BOW_LIGHT)) {
gSaveContext.equips.buttonItems[1] = gSaveContext.equips.buttonItems[2];
Interface_LoadItemIcon2(play, 1);
} else if ((gSaveContext.equips.buttonItems[3] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[3] <= ITEM_BOW_ARROW_LIGHT)) {
} else if ((gSaveContext.equips.buttonItems[3] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[3] <= ITEM_BOW_LIGHT)) {
gSaveContext.equips.buttonItems[3] = gSaveContext.equips.buttonItems[2];
Interface_LoadItemIcon2(play, 3);
}
@ -738,9 +738,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if (gSaveContext.equips.buttonItems[3] != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xBF) && (pauseCtx->equipTargetItem <= 0xC1) &&
((gSaveContext.equips.buttonItems[3] == ITEM_BOW) ||
((gSaveContext.equips.buttonItems[3] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[3] <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_ARROW_FIRE;
((gSaveContext.equips.buttonItems[3] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[3] <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
gSaveContext.equips.buttonItems[1] = gSaveContext.equips.buttonItems[3];
@ -755,9 +755,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if (gSaveContext.equips.buttonItems[3] != ITEM_NONE) {
if ((pauseCtx->equipTargetItem >= 0xBF) && (pauseCtx->equipTargetItem <= 0xC1) &&
((gSaveContext.equips.buttonItems[3] == ITEM_BOW) ||
((gSaveContext.equips.buttonItems[3] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[3] <= ITEM_BOW_ARROW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_ARROW_FIRE;
((gSaveContext.equips.buttonItems[3] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[3] <= ITEM_BOW_LIGHT)))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
} else {
gSaveContext.equips.buttonItems[2] = gSaveContext.equips.buttonItems[3];
@ -772,18 +772,18 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
if ((pauseCtx->equipTargetItem >= 0xBF) && (pauseCtx->equipTargetItem <= 0xC1)) {
if ((gSaveContext.equips.buttonItems[3] == ITEM_BOW) ||
((gSaveContext.equips.buttonItems[3] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[3] <= ITEM_BOW_ARROW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_ARROW_FIRE;
((gSaveContext.equips.buttonItems[3] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[3] <= ITEM_BOW_LIGHT))) {
pauseCtx->equipTargetItem -= 0xBF - ITEM_BOW_FIRE;
pauseCtx->equipTargetSlot = SLOT_BOW;
}
} else if (pauseCtx->equipTargetItem == ITEM_BOW) {
if ((gSaveContext.equips.buttonItems[1] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[1] <= ITEM_BOW_ARROW_LIGHT)) {
if ((gSaveContext.equips.buttonItems[1] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[1] <= ITEM_BOW_LIGHT)) {
gSaveContext.equips.buttonItems[1] = gSaveContext.equips.buttonItems[3];
Interface_LoadItemIcon2(play, 1);
} else if ((gSaveContext.equips.buttonItems[2] >= ITEM_BOW_ARROW_FIRE) &&
(gSaveContext.equips.buttonItems[2] <= ITEM_BOW_ARROW_LIGHT)) {
} else if ((gSaveContext.equips.buttonItems[2] >= ITEM_BOW_FIRE) &&
(gSaveContext.equips.buttonItems[2] <= ITEM_BOW_LIGHT)) {
gSaveContext.equips.buttonItems[2] = gSaveContext.equips.buttonItems[3];
Interface_LoadItemIcon2(play, 2);
}

6
src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
View file

@ -57,7 +57,7 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
} else {
pauseCtx->cursorX[PAUSE_MAP] = 1;
pauseCtx->cursorPoint[PAUSE_MAP] = 0;
if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, gSaveContext.mapIndex)) {
if (!CHECK_DUNGEON_ITEM(DUNGEON_BOSS_KEY, gSaveContext.mapIndex)) {
pauseCtx->cursorPoint[PAUSE_MAP]++;
if (!CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, gSaveContext.mapIndex)) {
pauseCtx->cursorPoint[PAUSE_MAP]++;
@ -154,7 +154,7 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
pauseCtx->cursorSpecialPos = 0;
pauseCtx->cursorX[PAUSE_MAP] = 1;
pauseCtx->cursorPoint[PAUSE_MAP] = 0;
if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, gSaveContext.mapIndex)) {
if (!CHECK_DUNGEON_ITEM(DUNGEON_BOSS_KEY, gSaveContext.mapIndex)) {
pauseCtx->cursorPoint[PAUSE_MAP]++;
if (!CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, gSaveContext.mapIndex)) {
pauseCtx->cursorPoint[PAUSE_MAP]++;
@ -189,7 +189,7 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
if (pauseCtx->cursorSpecialPos == 0) {
if (pauseCtx->cursorPoint[PAUSE_MAP] < 3) {
pauseCtx->cursorItem[PAUSE_MAP] = ITEM_KEY_BOSS + pauseCtx->cursorPoint[PAUSE_MAP];
pauseCtx->cursorItem[PAUSE_MAP] = ITEM_DUNGEON_BOSS_KEY + pauseCtx->cursorPoint[PAUSE_MAP];
} else {
pauseCtx->cursorItem[PAUSE_MAP] = PAUSE_ITEM_NONE;
}

14
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View file

@ -2656,7 +2656,7 @@ void KaleidoScope_Update(PlayState* play) {
pauseCtx->worldMapPoints[i] = 0;
}
if (CHECK_QUEST_ITEM(QUEST_GERUDO_CARD)) {
if (CHECK_QUEST_ITEM(QUEST_GERUDOS_CARD)) {
pauseCtx->worldMapPoints[0] = 2;
}
@ -2668,7 +2668,7 @@ void KaleidoScope_Update(PlayState* play) {
pauseCtx->worldMapPoints[1] = 2;
}
if (CHECK_QUEST_ITEM(QUEST_GERUDO_CARD)) {
if (CHECK_QUEST_ITEM(QUEST_GERUDOS_CARD)) {
pauseCtx->worldMapPoints[1] = 1;
}
@ -2680,7 +2680,7 @@ void KaleidoScope_Update(PlayState* play) {
pauseCtx->worldMapPoints[2] = 2;
}
if (CHECK_QUEST_ITEM(QUEST_GERUDO_CARD)) {
if (CHECK_QUEST_ITEM(QUEST_GERUDOS_CARD)) {
pauseCtx->worldMapPoints[2] = 1;
}
@ -2724,7 +2724,7 @@ void KaleidoScope_Update(PlayState* play) {
pauseCtx->worldMapPoints[5] = 1;
}
if (INV_CONTENT(ITEM_OCARINA_TIME) == ITEM_OCARINA_TIME) {
if (INV_CONTENT(ITEM_OCARINA_OF_TIME) == ITEM_OCARINA_OF_TIME) {
pauseCtx->worldMapPoints[5] = 2;
}
@ -2856,16 +2856,16 @@ void KaleidoScope_Update(PlayState* play) {
if ((i == ITEM_COJIRO) || (i == ITEM_ODD_POTION)) {
pauseCtx->tradeQuestLocation = 9;
}
if (i == ITEM_SAW) {
if (i == ITEM_POACHERS_SAW) {
pauseCtx->tradeQuestLocation = 2;
}
if ((i == ITEM_SWORD_BROKEN) || (i == ITEM_EYEDROPS)) {
if ((i == ITEM_BROKEN_GORONS_SWORD) || (i == ITEM_EYE_DROPS)) {
pauseCtx->tradeQuestLocation = 7;
}
if (i == ITEM_PRESCRIPTION) {
pauseCtx->tradeQuestLocation = 11;
}
if (i == ITEM_FROG) {
if (i == ITEM_EYEBALL_FROG) {
pauseCtx->tradeQuestLocation = 3;
}
if ((i == ITEM_CLAIM_CHECK) && (gSaveContext.bgsFlag == 0)) {