From 79cb1f8d5c4eda6657f4fed7c3ec003a7628861f Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Thu, 14 Jul 2022 16:26:10 -0400 Subject: [PATCH] Misc Cleanup/Docs (#1315) * Misc Cleanup * More cleanup --- assets/xml/objects/object_st.xml | 4 +- include/z64actor.h | 2 +- include/z64item.h | 6 +- src/code/z_draw.c | 2 +- src/code/z_en_item00.c | 122 +++++++++--------- src/code/z_parameter.c | 6 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 2 +- .../ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c | 2 +- src/overlays/actors/ovl_En_Box/z_en_box.c | 2 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 2 +- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 12 +- src/overlays/actors/ovl_En_GirlA/z_en_girla.h | 2 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 2 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 18 +-- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 4 +- .../ovl_En_Wonder_Item/z_en_wonder_item.c | 6 +- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 2 +- .../actors/ovl_player_actor/z_player.c | 4 +- tools/disasm_elf_msg.py | 2 +- 19 files changed, 101 insertions(+), 101 deletions(-) diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml index 8c5ab10e90..8b0cc71bff 100644 --- a/assets/xml/objects/object_st.xml +++ b/assets/xml/objects/object_st.xml @@ -34,8 +34,8 @@ - - + + diff --git a/include/z64actor.h b/include/z64actor.h index 572ab9054a..620aa099a3 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -288,7 +288,7 @@ typedef enum { /* 0x00 */ ITEM00_RUPEE_GREEN, /* 0x01 */ ITEM00_RUPEE_BLUE, /* 0x02 */ ITEM00_RUPEE_RED, - /* 0x03 */ ITEM00_HEART, + /* 0x03 */ ITEM00_RECOVERY_HEART, /* 0x04 */ ITEM00_BOMBS_A, /* 0x05 */ ITEM00_ARROWS_SINGLE, /* 0x06 */ ITEM00_HEART_PIECE, diff --git a/include/z64item.h b/include/z64item.h index 3bb1014b41..4e7c11dea0 100644 --- a/include/z64item.h +++ b/include/z64item.h @@ -276,7 +276,7 @@ typedef enum { /* 0x80 */ ITEM_INVALID_6, /* 0x81 */ ITEM_INVALID_7, /* 0x82 */ ITEM_MILK, - /* 0x83 */ ITEM_HEART, + /* 0x83 */ ITEM_RECOVERY_HEART, /* 0x84 */ ITEM_RUPEE_GREEN, /* 0x85 */ ITEM_RUPEE_BLUE, /* 0x86 */ ITEM_RUPEE_RED, @@ -383,7 +383,7 @@ typedef enum { /* 0x45 */ GI_WALLET_ADULT, /* 0x46 */ GI_WALLET_GIANT, /* 0x47 */ GI_WEIRD_EGG, - /* 0x48 */ GI_HEART, + /* 0x48 */ GI_RECOVERY_HEART, /* 0x49 */ GI_ARROWS_SMALL, // amount changes depending on context /* 0x4A */ GI_ARROWS_MEDIUM, // amount changes depending on context /* 0x4B */ GI_ARROWS_LARGE, // amount changes depending on context @@ -449,7 +449,7 @@ typedef enum { /* 0x05 */ GID_SONG_REQUIEM, /* 0x06 */ GID_SONG_NOCTURNE, /* 0x07 */ GID_SONG_PRELUDE, - /* 0x08 */ GID_HEART, + /* 0x08 */ GID_RECOVERY_HEART, /* 0x09 */ GID_KEY_BOSS, /* 0x0A */ GID_COMPASS, /* 0x0B */ GID_MEDALLION_FOREST, diff --git a/src/code/z_draw.c b/src/code/z_draw.c index 0b541ec17e..4343e52507 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -366,7 +366,7 @@ DrawItemTableEntry sDrawItemTable[] = { // kokiri sword, OBJECT_GI_SWORD_1 { GetItem_DrawOpa0, { gGiKokiriSwordDL } }, // gold skulltula token, OBJECT_ST - { GetItem_DrawSkullToken, { object_st_DL_004DB0, object_st_DL_004EB8 } }, + { GetItem_DrawSkullToken, { gSkulltulaTokenDL, gSkulltulaTokenFlameDL } }, }; /** diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index e4d09def76..01304c5fda 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -72,54 +72,54 @@ static void* sItemDropTex[] = { }; static u8 sItemDropIds[] = { - ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NONE, ITEM00_NONE, ITEM00_RUPEE_BLUE, - ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_HEART, ITEM00_HEART, ITEM00_NONE, - ITEM00_MAGIC_SMALL, ITEM00_FLEXIBLE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_RUPEE_BLUE, ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, - ITEM00_HEART, ITEM00_NONE, ITEM00_HEART, ITEM00_NONE, ITEM00_FLEXIBLE, - ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_NONE, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, - ITEM00_NONE, ITEM00_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_HEART, - ITEM00_NONE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, ITEM00_BOMBS_A, - ITEM00_NONE, ITEM00_FLEXIBLE, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, - ITEM00_NUTS, ITEM00_NONE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NUTS, - ITEM00_HEART, ITEM00_HEART, ITEM00_SEEDS, ITEM00_NONE, ITEM00_FLEXIBLE, - ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_RUPEE_GREEN, - ITEM00_RUPEE_GREEN, ITEM00_SEEDS, ITEM00_BOMBS_A, ITEM00_MAGIC_SMALL, ITEM00_BOMBS_A, - ITEM00_NONE, ITEM00_NONE, ITEM00_HEART, ITEM00_NONE, ITEM00_NONE, - ITEM00_HEART, ITEM00_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_SMALL, - ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_NONE, ITEM00_RUPEE_BLUE, - ITEM00_NONE, ITEM00_NONE, ITEM00_HEART, ITEM00_NONE, ITEM00_NONE, - ITEM00_HEART, ITEM00_FLEXIBLE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NONE, ITEM00_RUPEE_GREEN, - ITEM00_NONE, ITEM00_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_BOMBS_A, - ITEM00_ARROWS_SMALL, ITEM00_NONE, ITEM00_ARROWS_MEDIUM, ITEM00_MAGIC_SMALL, ITEM00_FLEXIBLE, - ITEM00_NONE, ITEM00_MAGIC_LARGE, ITEM00_RUPEE_GREEN, ITEM00_NONE, ITEM00_RUPEE_BLUE, - ITEM00_NONE, ITEM00_RUPEE_GREEN, ITEM00_HEART, ITEM00_FLEXIBLE, ITEM00_BOMBS_A, - ITEM00_ARROWS_SMALL, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_SMALL, - ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_LARGE, ITEM00_ARROWS_LARGE, ITEM00_ARROWS_MEDIUM, - ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, ITEM00_FLEXIBLE, ITEM00_ARROWS_SMALL, - ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, - ITEM00_ARROWS_SMALL, ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_LARGE, ITEM00_ARROWS_LARGE, ITEM00_MAGIC_LARGE, - ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, - ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL, - ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, - ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_BOMBS_A, - ITEM00_FLEXIBLE, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_NONE, - ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, - ITEM00_BOMBS_A, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, - ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, - ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, - ITEM00_HEART, ITEM00_HEART, ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, - ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, - ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, - ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_SEEDS, ITEM00_NONE, - ITEM00_NUTS, ITEM00_NONE, ITEM00_STICK, ITEM00_NONE, ITEM00_NONE, - ITEM00_SEEDS, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_NUTS, - ITEM00_NONE, ITEM00_NUTS, ITEM00_HEART, ITEM00_SEEDS, ITEM00_HEART, - ITEM00_NONE, ITEM00_SEEDS, ITEM00_NONE, ITEM00_HEART, ITEM00_NONE, - ITEM00_NONE, ITEM00_HEART, ITEM00_HEART, ITEM00_NONE, ITEM00_NONE, - ITEM00_HEART, ITEM00_NONE, ITEM00_HEART, ITEM00_SEEDS, ITEM00_FLEXIBLE, + ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NONE, ITEM00_NONE, ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_NONE, + ITEM00_MAGIC_SMALL, ITEM00_FLEXIBLE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, + ITEM00_RUPEE_BLUE, ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, + ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_FLEXIBLE, + ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_SEEDS, ITEM00_NONE, + ITEM00_NONE, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, + ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_RECOVERY_HEART, + ITEM00_NONE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, ITEM00_BOMBS_A, + ITEM00_NONE, ITEM00_FLEXIBLE, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, + ITEM00_NUTS, ITEM00_NONE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NUTS, + ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_SEEDS, ITEM00_NONE, ITEM00_FLEXIBLE, + ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_GREEN, ITEM00_SEEDS, ITEM00_BOMBS_A, ITEM00_MAGIC_SMALL, ITEM00_BOMBS_A, + ITEM00_NONE, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, + ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_SMALL, + ITEM00_RUPEE_GREEN, ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_NONE, ITEM00_RUPEE_BLUE, + ITEM00_NONE, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, + ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE, ITEM00_SEEDS, ITEM00_SEEDS, ITEM00_NONE, + ITEM00_MAGIC_SMALL, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NONE, ITEM00_RUPEE_GREEN, + ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, ITEM00_BOMBS_A, + ITEM00_ARROWS_SMALL, ITEM00_NONE, ITEM00_ARROWS_MEDIUM, ITEM00_MAGIC_SMALL, ITEM00_FLEXIBLE, + ITEM00_NONE, ITEM00_MAGIC_LARGE, ITEM00_RUPEE_GREEN, ITEM00_NONE, ITEM00_RUPEE_BLUE, + ITEM00_NONE, ITEM00_RUPEE_GREEN, ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE, ITEM00_BOMBS_A, + ITEM00_ARROWS_SMALL, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_SMALL, + ITEM00_NONE, ITEM00_NONE, ITEM00_MAGIC_LARGE, ITEM00_ARROWS_LARGE, ITEM00_ARROWS_MEDIUM, + ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, ITEM00_FLEXIBLE, ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_SMALL, ITEM00_ARROWS_SMALL, + ITEM00_ARROWS_SMALL, ITEM00_ARROWS_MEDIUM, ITEM00_ARROWS_LARGE, ITEM00_ARROWS_LARGE, ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, + ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, ITEM00_BOMBS_A, + ITEM00_FLEXIBLE, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_NONE, + ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_BOMBS_A, ITEM00_NONE, + ITEM00_BOMBS_A, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, + ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, + ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, + ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_SEEDS, ITEM00_NONE, + ITEM00_NUTS, ITEM00_NONE, ITEM00_STICK, ITEM00_NONE, ITEM00_NONE, + ITEM00_SEEDS, ITEM00_NONE, ITEM00_NONE, ITEM00_NONE, ITEM00_NUTS, + ITEM00_NONE, ITEM00_NUTS, ITEM00_RECOVERY_HEART, ITEM00_SEEDS, ITEM00_RECOVERY_HEART, + ITEM00_NONE, ITEM00_SEEDS, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_NONE, + ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_NONE, + ITEM00_RECOVERY_HEART, ITEM00_NONE, ITEM00_RECOVERY_HEART, ITEM00_SEEDS, ITEM00_FLEXIBLE, }; static u8 sDropQuantities[] = { @@ -180,7 +180,7 @@ void EnItem00_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->actor, 0.02f); this->scale = 0.02f; break; - case ITEM00_HEART: + case ITEM00_RECOVERY_HEART: this->actor.home.rot.z = Rand_CenteredFloat(65535.0f); yOffset = 430.0f; Actor_SetScale(&this->actor, 0.02f); @@ -300,8 +300,8 @@ void EnItem00_Init(Actor* thisx, PlayState* play) { case ITEM00_RUPEE_ORANGE: Item_Give(play, ITEM_RUPEE_GOLD); break; - case ITEM00_HEART: - Item_Give(play, ITEM_HEART); + case ITEM00_RECOVERY_HEART: + Item_Give(play, ITEM_RECOVERY_HEART); break; case ITEM00_FLEXIBLE: Health_ChangeBy(play, 0x70); @@ -366,7 +366,7 @@ void EnItem00_Destroy(Actor* thisx, PlayState* play) { void func_8001DFC8(EnItem00* this, PlayState* play) { if ((this->actor.params <= ITEM00_RUPEE_RED) || - ((this->actor.params == ITEM00_HEART) && (this->despawnTimer < 0)) || + ((this->actor.params == ITEM00_RECOVERY_HEART) && (this->despawnTimer < 0)) || (this->actor.params == ITEM00_HEART_PIECE)) { this->actor.shape.rot.y += 960; } else { @@ -446,7 +446,7 @@ void func_8001E304(EnItem00* this, PlayState* play) { this->despawnTimer++; - if (this->actor.params == ITEM00_HEART) { + if (this->actor.params == ITEM00_RECOVERY_HEART) { if (this->actor.velocity.y < 0.0f) { this->actor.speedXZ = 0.0f; this->actor.gravity = -0.4f; @@ -514,7 +514,7 @@ void EnItem00_Collected(EnItem00* this, PlayState* play) { if (this->actor.params <= ITEM00_RUPEE_RED) { this->actor.shape.rot.y += 960; - } else if (this->actor.params == ITEM00_HEART) { + } else if (this->actor.params == ITEM00_RECOVERY_HEART) { this->actor.shape.rot.y = 0; } @@ -637,8 +637,8 @@ void EnItem00_Update(Actor* thisx, PlayState* play) { case ITEM00_NUTS: getItemId = GI_NUTS_5; break; - case ITEM00_HEART: - Item_Give(play, ITEM_HEART); + case ITEM00_RECOVERY_HEART: + Item_Give(play, ITEM_RECOVERY_HEART); break; case ITEM00_FLEXIBLE: Health_ChangeBy(play, 0x70); @@ -762,7 +762,7 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) { case ITEM00_HEART_CONTAINER: EnItem00_DrawHeartContainer(this, play); break; - case ITEM00_HEART: + case ITEM00_RECOVERY_HEART: if (this->despawnTimer < 0) { if (this->despawnTimer == -1) { s8 bankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GI_HEART); @@ -775,7 +775,7 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) { } else { mtxScale = 16.0f; Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY); - GetItem_Draw(play, GID_HEART); + GetItem_Draw(play, GID_RECOVERY_HEART); } break; } @@ -935,7 +935,7 @@ s16 func_8001F404(s16 dropId) { return -1; } - if (dropId == ITEM00_HEART && gSaveContext.healthCapacity == gSaveContext.health) { + if (dropId == ITEM00_RECOVERY_HEART && gSaveContext.healthCapacity == gSaveContext.health) { return ITEM00_RUPEE_GREEN; } @@ -1075,11 +1075,11 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP } else if (gSaveContext.health <= 0x30) { // 3 hearts or less params = 0xB * 0x10; dropTableIndex = 0x0; - dropId = ITEM00_HEART; + dropId = ITEM00_RECOVERY_HEART; } else if (gSaveContext.health <= 0x50) { // 5 hearts or less params = 0xA * 0x10; dropTableIndex = 0x0; - dropId = ITEM00_HEART; + dropId = ITEM00_RECOVERY_HEART; } else if ((gSaveContext.magicLevel != 0) && (gSaveContext.magic == 0)) { // Empty magic meter params = 0xA * 0x10; dropTableIndex = 0x0; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 2e9af7c2dc..98330e27ef 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1691,7 +1691,7 @@ u8 Item_Give(PlayState* play, u8 item) { gSaveContext.healthCapacity += 0x10; gSaveContext.health += 0x10; return ITEM_NONE; - } else if (item == ITEM_HEART) { + } else if (item == ITEM_RECOVERY_HEART) { osSyncPrintf("回復ハート回復ハート回復ハート\n"); // "Recovery Heart" Health_ChangeBy(play, 0x10); return item; @@ -1898,8 +1898,8 @@ u8 Item_CheckObtainability(u8 item) { return ITEM_NONE; } else if (item == ITEM_HEART_CONTAINER) { return ITEM_NONE; - } else if (item == ITEM_HEART) { - return ITEM_HEART; + } else if (item == ITEM_RECOVERY_HEART) { + return ITEM_RECOVERY_HEART; } else if ((item == ITEM_MAGIC_SMALL) || (item == ITEM_MAGIC_LARGE)) { // "Magic Pot Get_Inf_Table( 25, 0x0100)=%d" osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", GET_INFTABLE(INFTABLE_198)); diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 4e7ea78857..9b6167a6d8 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -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 diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index e096cfd046..d5a0ef749e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -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); diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 274bbf71da..ae8f96e8f0 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -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); } diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 9e14fef5b8..f7b4f6edd0 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -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); diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index fc08569055..d1243950b1 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -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; } diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h index e829696544..29d5d66822 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h @@ -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, diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index 091b36db14..91c83982a3 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -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; } diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index d7fc9bb700..2b70d4e60d 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -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 }, diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 3a32f4ca3c..8d8593deb9 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -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: diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index 9c4191277b..cad7c85841 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -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; diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index cbed9c5109..57eeeb457b 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -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) { diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index d95f299b69..d8db8597f1 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -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 { diff --git a/tools/disasm_elf_msg.py b/tools/disasm_elf_msg.py index 840cf81c8b..19ef491ddc 100644 --- a/tools/disasm_elf_msg.py +++ b/tools/disasm_elf_msg.py @@ -134,7 +134,7 @@ item_ids = { 0x80 : "ITEM_INVALID_6", 0x81 : "ITEM_INVALID_7", 0x82 : "ITEM_MILK", - 0x83 : "ITEM_HEART", + 0x83 : "ITEM_RECOVERY_HEART", 0x84 : "ITEM_RUPEE_GREEN", 0x85 : "ITEM_RUPEE_BLUE", 0x86 : "ITEM_RUPEE_RED",