mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +00:00
Code Issues Projects Releases Wiki Activity

Misc Cleanup/Docs (#1315)

Browse source 
* Misc Cleanup

* More cleanup
This commit is contained in:
engineer124 2022-07-14 16:26:10 -04:00 • committed by GitHub
parent cf52184766
commit 79cb1f8d5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 101 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
View file

@ -193,7 +193,7 @@ void BgHakaTubo_DropCollectible(BgHakaTubo* this, PlayState* play) {
}
} else if (Flags_GetCollectible(play, this->dyna.actor.params) != 0) {
// If small key already collected, drop recovery heart instead
collectibleParams = ITEM00_HEART;
collectibleParams = ITEM00_RECOVERY_HEART;
func_80078884(NA_SE_SY_TRE_BOX_APPEAR);
} else {
// Drops a small key and sets a collect flag

2
src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c
View file

@ -253,7 +253,7 @@ void func_808992E8(BgJyaIronobj* this, PlayState* play) {
dropPos.y = this->dyna.actor.world.pos.y + 20.0f;
dropPos.z = this->dyna.actor.world.pos.z;
for (i = 0; i < 3; i++) {
Item_DropCollectible(play, &dropPos, ITEM00_HEART);
Item_DropCollectible(play, &dropPos, ITEM00_RECOVERY_HEART);
dropPos.y += 18.0f;
}
Actor_Kill(&this->dyna.actor);

2
src/overlays/actors/ovl_En_Box/z_en_box.c
View file

@ -537,7 +537,7 @@ void EnBox_Update(Actor* thisx, PlayState* play) {
Actor_SetFocus(&this->dyna.actor, 40.0f);
}
if ((this->dyna.actor.params >> 5 & 0x7F) == 0x7C && this->actionFunc == EnBox_Open &&
if ((this->dyna.actor.params >> 5 & 0x7F) == GI_ICE_TRAP && this->actionFunc == EnBox_Open &&
this->skelanime.curFrame > 45 && this->iceSmokeTimer < 100) {
EnBox_SpawnIceSmoke(this, play);
}

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

@ -464,7 +464,7 @@ void EnDns_Burrow(EnDns* this, PlayState* play) {
initPos.y = this->yInitPos;
initPos.z = this->actor.world.pos.z;
for (i = 0; i < 3; i++) {
Item_DropCollectible(play, &initPos, ITEM00_HEART);
Item_DropCollectible(play, &initPos, ITEM00_RECOVERY_HEART);
}
}
Actor_Kill(&this->actor);

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

@ -33,7 +33,7 @@ s32 EnGirlA_CanBuy_HylianShield(PlayState* play, EnGirlA* this);
s32 EnGirlA_CanBuy_DekuShield(PlayState* play, EnGirlA* this);
s32 EnGirlA_CanBuy_GoronTunic(PlayState* play, EnGirlA* this);
s32 EnGirlA_CanBuy_ZoraTunic(PlayState* play, EnGirlA* this);
s32 EnGirlA_CanBuy_Health(PlayState* play, EnGirlA* this);
s32 EnGirlA_CanBuy_RecoveryHeart(PlayState* play, EnGirlA* this);
s32 EnGirlA_CanBuy_MilkBottle(PlayState* play, EnGirlA* this);
s32 EnGirlA_CanBuy_WeirdEgg(PlayState* play, EnGirlA* this);
s32 EnGirlA_CanBuy_Unk19(PlayState* play, EnGirlA* this);
@ -202,9 +202,9 @@ static ShopItemEntry shopItemEntries[] = {
/* SI_ZORA_TUNIC */
{ OBJECT_GI_CLOTHES, GID_TUNIC_ZORA, NULL, 300, 1, 0x00AB, 0x0094, GI_TUNIC_ZORA, EnGirlA_CanBuy_ZoraTunic,
EnGirlA_ItemGive_ZoraTunic, EnGirlA_BuyEvent_ZoraTunic },
/* SI_HEART */
{ OBJECT_GI_HEART, GID_HEART, NULL, 10, 16, 0x00AC, 0x0095, GI_HEART, EnGirlA_CanBuy_Health,
EnGirlA_ItemGive_Health, EnGirlA_BuyEvent_ShieldDiscount },
/* SI_RECOVERY_HEART */
{ 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 },
@ -317,7 +317,7 @@ s32 EnGirlA_TryChangeShopItem(EnGirlA* this) {
switch (this->actor.params) {
case SI_MILK_BOTTLE:
if (GET_ITEMGETINF(ITEMGETINF_02)) {
this->actor.params = SI_HEART;
this->actor.params = SI_RECOVERY_HEART;
return true;
}
break;
@ -594,7 +594,7 @@ s32 EnGirlA_CanBuy_ZoraTunic(PlayState* play, EnGirlA* this) {
return CANBUY_RESULT_SUCCESS;
}
s32 EnGirlA_CanBuy_Health(PlayState* play, EnGirlA* this) {
s32 EnGirlA_CanBuy_RecoveryHeart(PlayState* play, EnGirlA* this) {
if (gSaveContext.healthCapacity == gSaveContext.health) {
return CANBUY_RESULT_CANT_GET_NOW;
}

2
src/overlays/actors/ovl_En_GirlA/z_en_girla.h
View file

@ -52,7 +52,7 @@ typedef enum {
/* 0x0D */ SI_DEKU_SHIELD,
/* 0x0E */ SI_GORON_TUNIC,
/* 0x0F */ SI_ZORA_TUNIC,
/* 0x10 */ SI_HEART,
/* 0x10 */ SI_RECOVERY_HEART,
/* 0x11 */ SI_MILK_BOTTLE,
/* 0x12 */ SI_WEIRD_EGG,
/* 0x13 */ SI_19,

2
src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
View file

@ -140,7 +140,7 @@ void EnKusa_DropCollectible(EnKusa* this, PlayState* play) {
if (Rand_ZeroOne() < 0.5f) {
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_SEEDS);
} else {
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_HEART);
Item_DropCollectible(play, &this->actor.world.pos, ITEM00_RECOVERY_HEART);
}
break;
}

18
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View file

@ -201,7 +201,7 @@ static ShopItem sShopkeeperStores[][8] = {
{ SI_DEKU_SEEDS_30, -50, 52, -20 },
{ SI_ARROWS_10, -50, 76, -20 },
{ SI_ARROWS_30, -80, 52, -3 },
{ SI_HEART, -80, 76, -3 } },
{ SI_RECOVERY_HEART, -80, 76, -3 } },
{ { SI_GREEN_POTION, 50, 52, -20 },
{ SI_BLUE_FIRE, 50, 76, -20 },
@ -233,7 +233,7 @@ static ShopItem sShopkeeperStores[][8] = {
{ { SI_HYLIAN_SHIELD, 50, 52, -20 },
{ SI_BOMBS_5_R35, 50, 76, -20 },
{ SI_DEKU_NUTS_5, 80, 52, -3 },
{ SI_HEART, 80, 76, -3 },
{ SI_RECOVERY_HEART, 80, 76, -3 },
{ SI_ARROWS_10, -50, 52, -20 },
{ SI_ARROWS_50, -50, 76, -20 },
{ SI_DEKU_STICK, -80, 52, -3 },
@ -242,7 +242,7 @@ static ShopItem sShopkeeperStores[][8] = {
{ { SI_HYLIAN_SHIELD, 50, 52, -20 },
{ SI_BOMBS_5_R25, 50, 76, -20 },
{ SI_DEKU_NUTS_5, 80, 52, -3 },
{ SI_HEART, 80, 76, -3 },
{ SI_RECOVERY_HEART, 80, 76, -3 },
{ SI_ARROWS_10, -50, 52, -20 },
{ SI_ARROWS_50, -50, 76, -20 },
{ SI_DEKU_STICK, -80, 52, -3 },
@ -251,15 +251,15 @@ static ShopItem sShopkeeperStores[][8] = {
{ { SI_MILK_BOTTLE, 50, 52, -20 },
{ SI_DEKU_NUTS_5, 50, 76, -20 },
{ SI_DEKU_NUTS_10, 80, 52, -3 },
{ SI_HEART, 80, 76, -3 },
{ SI_RECOVERY_HEART, 80, 76, -3 },
{ SI_WEIRD_EGG, -50, 52, -20 },
{ SI_DEKU_STICK, -50, 76, -20 },
{ SI_HEART, -80, 52, -3 },
{ SI_HEART, -80, 76, -3 } },
{ SI_RECOVERY_HEART, -80, 52, -3 },
{ SI_RECOVERY_HEART, -80, 76, -3 } },
{ { SI_ZORA_TUNIC, 50, 52, -20 },
{ SI_ARROWS_10, 50, 76, -20 },
{ SI_HEART, 80, 52, -3 },
{ SI_RECOVERY_HEART, 80, 52, -3 },
{ SI_ARROWS_30, 80, 76, -3 },
{ SI_DEKU_NUTS_5, -50, 52, -20 },
{ SI_ARROWS_50, -50, 76, -20 },
@ -271,9 +271,9 @@ static ShopItem sShopkeeperStores[][8] = {
{ SI_BOMBS_20, 80, 52, -3 },
{ SI_BOMBS_30, 80, 76, -3 },
{ SI_GORON_TUNIC, -50, 52, -20 },
{ SI_HEART, -50, 76, -20 },
{ SI_RECOVERY_HEART, -50, 76, -20 },
{ SI_RED_POTION_R40, -80, 52, -3 },
{ SI_HEART, -80, 76, -3 } },
{ SI_RECOVERY_HEART, -80, 76, -3 } },
{ { SI_19, 50, 52, -20 },
{ SI_19, 50, 76, -20 },

4
src/overlays/actors/ovl_En_Owl/z_en_owl.c
View file

@ -55,7 +55,7 @@ typedef enum {
/* 0x07 */ OWL_HYLIA_SHORTCUT,
/* 0x08 */ OWL_DEATH_MOUNTAIN,
/* 0x09 */ OWL_DEATH_MOUNTAIN2,
/* 0x0A */ OWL_DESSERT_COLOSSUS,
/* 0x0A */ OWL_DESERT_COLOSSUS,
/* 0x0B */ OWL_LOST_WOODS_PRESARIA,
/* 0x0C */ OWL_LOST_WOODS_POSTSARIA
} EnOwlType;
@ -199,7 +199,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
case OWL_DEATH_MOUNTAIN2:
this->actionFunc = EnOwl_WaitDeathMountainShortcut;
break;
case OWL_DESSERT_COLOSSUS:
case OWL_DESERT_COLOSSUS:
this->actionFunc = func_80ACB3E0;
break;
case OWL_LOST_WOODS_PRESARIA:

6
src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
View file

@ -67,9 +67,9 @@ void EnWonderItem_Destroy(Actor* thisx, PlayState* play) {
void EnWonderItem_DropCollectible(EnWonderItem* this, PlayState* play, s32 autoCollect) {
static s16 dropTable[] = {
ITEM00_NUTS, ITEM00_HEART_PIECE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL,
ITEM00_HEART, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_LARGE,
ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_FLEXIBLE,
ITEM00_NUTS, ITEM00_HEART_PIECE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL,
ITEM00_RECOVERY_HEART, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_LARGE,
ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_FLEXIBLE,
};
s32 i;
s32 randomDrop;

2
src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
View file

@ -133,7 +133,7 @@ void func_80B5357C(EnZl3* this, PlayState* play) {
sp20.x = thisPos->x + ((Rand_ZeroOne() - 0.5f) * 10.0f);
sp20.y = thisPos->y;
sp20.z = thisPos->z + ((Rand_ZeroOne() - 0.5f) * 10.0f);
Item_DropCollectible(play, &sp20, ITEM00_HEART);
Item_DropCollectible(play, &sp20, ITEM00_RECOVERY_HEART);
}
void func_80B53614(EnZl3* this, PlayState* play) {

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

@ -568,7 +568,7 @@ static GetItemEntry sGetItemTable[] = {
GET_ITEM(ITEM_WALLET_ADULT, OBJECT_GI_PURSE, GID_WALLET_ADULT, 0x5E, 0x80, CHEST_ANIM_LONG),
GET_ITEM(ITEM_WALLET_GIANT, OBJECT_GI_PURSE, GID_WALLET_GIANT, 0x5F, 0x80, CHEST_ANIM_LONG),
GET_ITEM(ITEM_WEIRD_EGG, OBJECT_GI_EGG, GID_EGG, 0x9A, 0x80, CHEST_ANIM_LONG),
GET_ITEM(ITEM_HEART, OBJECT_GI_HEART, GID_HEART, 0x55, 0x80, CHEST_ANIM_LONG),
GET_ITEM(ITEM_RECOVERY_HEART, OBJECT_GI_HEART, GID_RECOVERY_HEART, 0x55, 0x80, CHEST_ANIM_LONG),
GET_ITEM(ITEM_ARROWS_SMALL, OBJECT_GI_ARROW, GID_ARROWS_SMALL, 0xE6, 0x48, CHEST_ANIM_SHORT),
GET_ITEM(ITEM_ARROWS_MEDIUM, OBJECT_GI_ARROW, GID_ARROWS_MEDIUM, 0xE6, 0x49, CHEST_ANIM_SHORT),
GET_ITEM(ITEM_ARROWS_LARGE, OBJECT_GI_ARROW, GID_ARROWS_LARGE, 0xE6, 0x4A, CHEST_ANIM_SHORT),
@ -12063,7 +12063,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
if (((this->getItemId >= GI_RUPEE_GREEN) && (this->getItemId <= GI_RUPEE_RED)) ||
((this->getItemId >= GI_RUPEE_PURPLE) && (this->getItemId <= GI_RUPEE_GOLD)) ||
((this->getItemId >= GI_RUPEE_GREEN_LOSE) && (this->getItemId <= GI_RUPEE_PURPLE_LOSE)) ||
(this->getItemId == GI_HEART)) {
(this->getItemId == GI_RECOVERY_HEART)) {
Audio_PlaySoundGeneral(NA_SE_SY_GET_BOXITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
} else {