From 2c6816ba7791c6e6e8043d2a0e6598234588d4cf Mon Sep 17 00:00:00 2001 From: Parker Burnett Date: Wed, 14 Sep 2022 10:01:06 -0700 Subject: [PATCH] Add enum for tatl hint id (#993) * first round, need to investigate the others * naming the remainder * changed my mind on the name * foooooormat * fixing a number * ...another one... * names galore * PR feedback * fixing * fixes * 4mat * adding "POE_SISTER" * forgot a rename --- include/z64actor.h | 105 ++++++++++++++++++ src/code/z_actor.c | 2 +- src/overlays/actors/ovl_Boss_02/z_boss_02.c | 2 +- src/overlays/actors/ovl_Boss_03/z_boss_03.c | 4 +- src/overlays/actors/ovl_Boss_04/z_boss_04.c | 2 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 2 +- src/overlays/actors/ovl_En_Baguo/z_en_baguo.c | 2 +- src/overlays/actors/ovl_En_Bat/z_en_bat.c | 2 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 2 +- .../actors/ovl_En_Bbfall/z_en_bbfall.c | 2 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 2 +- src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c | 4 +- .../actors/ovl_En_Bigslime/z_en_bigslime.c | 6 +- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 2 +- src/overlays/actors/ovl_En_Death/z_en_death.c | 2 +- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 2 +- .../actors/ovl_En_Dinofos/z_en_dinofos.c | 2 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 2 +- .../actors/ovl_En_Dragon/z_en_dragon.c | 2 +- .../actors/ovl_En_Elfbub/z_en_elfbub.c | 2 +- src/overlays/actors/ovl_En_Famos/z_en_famos.c | 2 +- .../actors/ovl_En_Firefly/z_en_firefly.c | 10 +- .../actors/ovl_En_Floormas/z_en_floormas.c | 2 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 2 +- .../actors/ovl_En_Hint_Skb/z_en_hint_skb.c | 6 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 2 +- src/overlays/actors/ovl_En_Kame/z_en_kame.c | 2 +- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 4 +- .../actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c | 2 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 2 +- .../actors/ovl_En_Pametfrog/z_en_pametfrog.c | 4 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 4 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 2 +- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 4 +- src/overlays/actors/ovl_En_Pr/z_en_pr.c | 2 +- src/overlays/actors/ovl_En_Pr2/z_en_pr2.c | 2 +- src/overlays/actors/ovl_En_Prz/z_en_prz.c | 2 +- .../actors/ovl_En_Rail_Skb/z_en_rail_skb.c | 8 +- .../actors/ovl_En_Railgibud/z_en_railgibud.c | 10 +- src/overlays/actors/ovl_En_Rat/z_en_rat.c | 2 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 34 +++--- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 2 +- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 2 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 12 +- .../actors/ovl_En_Snowman/z_en_snowman.c | 2 +- src/overlays/actors/ovl_En_St/z_en_st.c | 2 +- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 4 +- .../ovl_En_Syateki_Crow/z_en_syateki_crow.c | 2 +- .../z_en_syateki_dekunuts.c | 2 +- .../ovl_En_Syateki_Okuta/z_en_syateki_okuta.c | 2 +- .../ovl_En_Syateki_Wf/z_en_syateki_wf.c | 2 +- .../ovl_En_Talk_Gibud/z_en_talk_gibud.c | 10 +- .../actors/ovl_En_Thiefbird/z_en_thiefbird.c | 2 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 2 +- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 2 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 2 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 4 +- .../actors/ovl_Obj_Kinoko/z_obj_kinoko.c | 4 +- 58 files changed, 211 insertions(+), 106 deletions(-) diff --git a/include/z64actor.h b/include/z64actor.h index 4c35399018..925a9975f4 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -1188,4 +1188,109 @@ typedef enum { /* 0xC8 */ CLEAR_TAG_SMOKE = 200 } ClearTagType; +typedef enum { + /* 0x00 */ TATL_HINT_ID_DEFAULT, + /* 0x01 */ TATL_HINT_ID_SNAPPER, + /* 0x02 */ TATL_HINT_ID_MINI_BABA, + /* 0x03 */ TATL_HINT_ID_MAD_JELLY, + /* 0x04 */ TATL_HINT_ID_SKULLTULA, + /* 0x05 */ TATL_HINT_ID_RED_CHUCHU, + /* 0x06 */ TATL_HINT_ID_BLUE_CHUCHU, + /* 0x07 */ TATL_HINT_ID_DEKU_BABA, + /* 0x08 */ TATL_HINT_ID_BIO_DEKU_BABA, + /* 0x09 */ TATL_HINT_ID_WILTED_DEKU_BABA, + /* 0x0A */ TATL_HINT_ID_DEXIHAND, + /* 0x0B */ TATL_HINT_ID_NEJIRON, + /* 0x0C */ TATL_HINT_ID_GIANT_BEE, + /* 0x0D */ TATL_HINT_ID_DODONGO, + /* 0x0E */ TATL_HINT_ID_DEEP_PYTHON, + /* 0x0F */ TATL_HINT_ID_DEATH_ARMOS, + /* 0x10 */ TATL_HINT_ID_DINOLFOS, + /* 0x11 */ TATL_HINT_ID_FIRE_KEESE, + /* 0x12 */ TATL_HINT_ID_KEESE, + /* 0x13 */ TATL_HINT_ID_ARMOS, + /* 0x14 */ TATL_HINT_ID_EENO, + /* 0x15 */ TATL_HINT_ID_DRAGONFLY, + /* 0x16 */ TATL_HINT_ID_IGOS_DU_IKANA, + /* 0x17 */ TATL_HINT_ID_GARO, + /* 0x18 */ TATL_HINT_ID_GARO_MASTER, + /* 0x19 */ TATL_HINT_ID_WART, + /* 0x1A */ TATL_HINT_ID_GOMESS, + /* 0x1B */ TATL_HINT_ID_GOHT, + /* 0x1C */ TATL_HINT_ID_BLUE_BUBBLE, + /* 0x1D */ TATL_HINT_ID_KINGS_LACKEYS_DARK_ROOM, + /* 0x1E */ TATL_HINT_ID_KINGS_LACKEYS_LIGHT_ROOM, + /* 0x1F */ TATL_HINT_ID_SKULLWALLTULA, + /* 0x20 */ TATL_HINT_ID_GOLD_SKULLTULA, // Only in JP Ver. + /* 0x21 */ TATL_HINT_ID_CAPTAIN_KEETA, + /* 0x22 */ TATL_HINT_ID_YELLOW_CHUCHU, + /* 0x23 */ TATL_HINT_ID_TAKKURI, + /* 0x24 */ TATL_HINT_ID_RED_BUBBLE, + /* 0x25 */ TATL_HINT_ID_HIPLOOP, + /* 0x26 */ TATL_HINT_ID_MASKED_HIPLOOP, + /* 0x27 */ TATL_HINT_ID_SHELLBLADE, + /* 0x28 */ TATL_HINT_ID_GYORG, // "if you go near, you'll be eaten!" + /* 0x29 */ TATL_HINT_ID_GYORG_STUNNED, // "Jump in and attack it!" + /* 0x2A */ TATL_HINT_ID_REDEAD, + /* 0x2B */ TATL_HINT_ID_2B, + /* 0x2C */ TATL_HINT_ID_BLACK_BOE, + /* 0x2D */ TATL_HINT_ID_GIBDO, + /* 0x2E */ TATL_HINT_ID_TWINMOLD, + /* 0x2F */ TATL_HINT_ID_WEARING_GIANTS_MASK, // Twinmold, JP Ver. only + /* 0x30 */ TATL_HINT_ID_WALLMASTER, + /* 0x31 */ TATL_HINT_ID_FLOORMASTER, + /* 0x32 */ TATL_HINT_ID_MAJORAS_MASK, + /* 0x33 */ TATL_HINT_ID_MAJORAS_INCARNATION, + /* 0x34 */ TATL_HINT_ID_MAJORAS_WRATH, + /* 0x35 */ TATL_HINT_ID_IRON_KNUCKLE, + /* 0x36 */ TATL_HINT_ID_36, // Empty + /* 0x37 */ TATL_HINT_ID_LIKE_LIKE, + /* 0x38 */ TATL_HINT_ID_38, // Empty + /* 0x39 */ TATL_HINT_ID_BEAMOS, + /* 0x3A */ TATL_HINT_ID_3A, // Empty + /* 0x3B */ TATL_HINT_ID_FREEZARD, + /* 0x3C */ TATL_HINT_ID_WHITE_BOE, + /* 0x3D */ TATL_HINT_ID_3D, // Empty + /* 0x3E */ TATL_HINT_ID_3E, // Empty + /* 0x3F */ TATL_HINT_ID_3F, // Empty + /* 0x40 */ TATL_HINT_ID_40, // Empty + /* 0x41 */ TATL_HINT_ID_41, // Empty + /* 0x42 */ TATL_HINT_ID_OCTOROK, + /* 0x43 */ TATL_HINT_ID_43, // Empty + /* 0x44 */ TATL_HINT_ID_POE, + /* 0x45 */ TATL_HINT_ID_GEKKO_SNAPPER, + /* 0x46 */ TATL_HINT_ID_BLUE_TEKTITE, + /* 0x47 */ TATL_HINT_ID_LEEVER, + /* 0x48 */ TATL_HINT_ID_PEAHAT, + /* 0x49 */ TATL_HINT_ID_PEAHAT_LARVA, + /* 0x4A */ TATL_HINT_ID_EYEGORE, + /* 0x4B */ TATL_HINT_ID_WIZROBE, + /* 0x4C */ TATL_HINT_ID_WOLFOS, + /* 0x4D */ TATL_HINT_ID_MAD_SCRUB, + /* 0x4E */ TATL_HINT_ID_4E, // Empty + /* 0x4F */ TATL_HINT_ID_4F, // Empty + /* 0x50 */ TATL_HINT_ID_POE_SISTER_MEG, + /* 0x51 */ TATL_HINT_ID_POE_SISTER_JO, + /* 0x52 */ TATL_HINT_ID_POE_SISTER_BETH, + /* 0x53 */ TATL_HINT_ID_POE_SISTER_AMY, + /* 0x54 */ TATL_HINT_ID_PIRATE, + /* 0x55 */ TATL_HINT_ID_STALCHILD, + /* 0x56 */ TATL_HINT_ID_ICE_KEESE, + /* 0x57 */ TATL_HINT_ID_WHITE_WOLFOS, + /* 0x58 */ TATL_HINT_ID_GUAY, + /* 0x59 */ TATL_HINT_ID_BIG_OCTO, + /* 0x5A */ TATL_HINT_ID_BIG_POE, + /* 0x5B */ TATL_HINT_ID_SKULLFISH, + /* 0x5C */ TATL_HINT_ID_DESBREKO, + /* 0x5D */ TATL_HINT_ID_GREEN_CHUCHU, + /* 0x5E */ TATL_HINT_ID_ODOLWA_1, + /* 0x5F */ TATL_HINT_ID_GEKKO_GIANT_SLIME, + /* 0x60 */ TATL_HINT_ID_BAD_BAT, + /* 0x61 */ TATL_HINT_ID_REAL_BOMBCHU, + /* 0x62 */ TATL_HINT_ID_ODOLWA_2, + /* 0x63 */ TATL_HINT_ID_ODOLWA_3, + /* 0x64 */ TATL_HINT_ID_MUSHROOM, + /* 0xFF */ TATL_HINT_ID_NONE = 0xFF +} TatlHintId; + #endif diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 1b2d02b665..3669dd1367 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1076,7 +1076,7 @@ void Actor_Init(Actor* actor, PlayState* play) { actor->uncullZoneScale = 350.0f; actor->uncullZoneDownward = 700.0f; - actor->hintId = 255; + actor->hintId = TATL_HINT_ID_NONE; CollisionCheck_InitInfo(&actor->colChkInfo); actor->floorBgId = BGCHECK_SCENE; diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c index d1fb0a3bda..9808e68a40 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -577,7 +577,7 @@ void Boss02_Init(Actor* thisx, PlayState* play) { } else if (this->actor.params == TWINMOLD_TAIL) { this->actor.update = Boss02_Tail_Update; this->actor.draw = NULL; - this->actor.hintId = 0x2E; + this->actor.hintId = TATL_HINT_ID_TWINMOLD; } else { if (this->actor.params != TWINMOLD_BLUE) { this->actor.params = TWINMOLD_RED; diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index 75378de784..84987a9f5c 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -1762,7 +1762,7 @@ void Boss03_SetupStunned(Boss03* this, PlayState* play) { } void Boss03_Stunned(Boss03* this, PlayState* play) { - this->actor.hintId = 0x29; + this->actor.hintId = TATL_HINT_ID_GYORG_STUNNED; if (this->unk_240 >= 16) { Boss03_PlayUnderwaterSfx(&this->actor.projectedPos, NA_SE_EN_COMMON_WEAKENED - SFX_FLAG); @@ -1955,7 +1955,7 @@ void Boss03_Update(Actor* thisx, PlayState* play2) { s16 j; f32 yRot; - this->actor.hintId = 0x28; + this->actor.hintId = TATL_HINT_ID_GYORG; if (!D_809E9842 && (player->actor.world.pos.y < (PLATFORM_HEIGHT + 5.0f))) { D_809E9842 = true; diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.c b/src/overlays/actors/ovl_Boss_04/z_boss_04.c index 3524efa53c..e7d96d205e 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -163,7 +163,7 @@ void Boss04_Init(Actor* thisx, PlayState* play2) { this->actor.params = 0x64; Actor_SetScale(&this->actor, 0.1f); this->actor.targetMode = 5; - this->actor.hintId = 0x19; + this->actor.hintId = TATL_HINT_ID_WART; this->actor.colChkInfo.health = 20; this->actor.colChkInfo.damageTable = &sDamageTable; this->unk_700 = 1.0f; diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 5b1b488cb9..eda01c2545 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -128,7 +128,7 @@ static CollisionCheckInfoInit sColChkInfoInit = { 1, 23, 98, MASS_HEAVY }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 14, ICHAIN_CONTINUE), - ICHAIN_S8(hintId, 19, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_ARMOS, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -4000, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c index a0954943b6..e2496e18ed 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -126,7 +126,7 @@ void EnBaguo_Init(Actor* thisx, PlayState* play) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f); SkelAnime_Init(play, &this->skelAnime, &gNejironSkel, NULL, this->jointTable, this->morphTable, NEJIRON_LIMB_MAX); - this->actor.hintId = 0xB; + this->actor.hintId = TATL_HINT_ID_NEJIRON; this->maxDistanceFromHome = 240.0f; this->maxDistanceFromHome += this->actor.world.rot.z * 40.0f; this->actor.world.rot.z = 0; diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.c b/src/overlays/actors/ovl_En_Bat/z_en_bat.c index e816087210..fe1eb9fd84 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -107,7 +107,7 @@ static DamageTable sDamageTable = { static CollisionCheckInfoInit sColChkInfoInit = { 1, 15, 30, 10 }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 96, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_BAD_BAT, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_STOP), diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 488ed04822..a66c28a893 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -114,7 +114,7 @@ static DamageTable sDamageTable = { static CollisionCheckInfoInit sColChkInfoInit = { 2, 20, 40, 50 }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 28, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_BLUE_BUBBLE, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 10, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c index 2193203fe3..b1e4db445a 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -143,7 +143,7 @@ static DamageTable sDamageTable = { static CollisionCheckInfoInit sColChkInfoInit = { 2, 20, 40, 50 }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 36, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_RED_BUBBLE, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 10, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index bb3f28bee6..047567b98f 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -88,7 +88,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneForward, 2500, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_CONTINUE), ICHAIN_U8(targetMode, 2, ICHAIN_CONTINUE), - ICHAIN_S8(hintId, 89, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_BIG_OCTO, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 33, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c index 8121db9e21..0be5ad0b47 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -154,7 +154,7 @@ static DamageTable sDamageTable = { }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 90, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_BIG_POE, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 3200, ICHAIN_STOP), }; @@ -671,7 +671,7 @@ void EnBigpo_SetupDeath(EnBigpo* this) { this->idleTimer = 0; this->actor.speedXZ = 0.0f; this->actor.world.rot.y = this->actor.shape.rot.y; - this->actor.hintId = 0xFF; + this->actor.hintId = TATL_HINT_ID_NONE; this->collider.base.ocFlags1 &= ~OC1_ON; this->actionFunc = EnBigpo_BurnAwayDeath; } diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c index 12076537e6..392f9a441f 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -303,7 +303,7 @@ static AnimationHeader* sGekkoAttackAnimations[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 95, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_GEKKO_GIANT_SLIME, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(targetArrowOffset, -13221, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_U8(targetMode, 5, ICHAIN_STOP), @@ -765,7 +765,7 @@ void EnBigslime_BreakIntoMinislime(EnBigslime* this, PlayState* play) { this->actor.colChkInfo.mass = 50; this->actor.flags &= ~(ACTOR_FLAG_1 | ACTOR_FLAG_400); this->actor.flags |= ACTOR_FLAG_200; - this->actor.hintId = 95; + this->actor.hintId = TATL_HINT_ID_GEKKO_GIANT_SLIME; this->gekkoRot.x = 0; this->gekkoRot.y = 0; this->actor.bgCheckFlags &= ~1; @@ -2308,7 +2308,7 @@ void EnBigslime_FormBigslime(EnBigslime* this, PlayState* play) { if (this->minislimeCounter == MINISLIME_NUM_SPAWN) { this->minislimeState = MINISLIME_INACTIVE_STATE; - this->actor.hintId = 3; + this->actor.hintId = TATL_HINT_ID_MAD_JELLY; EnBigslime_SetupMoveOnCeiling(this); } } diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index e6980ba4f1..c04462c44b 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -118,7 +118,7 @@ static s32 sDeadCount = 0; static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_S8(hintId, 88, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_GUAY, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.c b/src/overlays/actors/ovl_En_Death/z_en_death.c index edc240cd53..b0f03af7cb 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.c +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -131,7 +131,7 @@ static CollisionCheckInfoInit2 D_808C9A30 = { 20, 28, 90, 20, 100 }; // static InitChainEntry sInitChain[] = { static InitChainEntry D_808C9A60[] = { ICHAIN_VEC3F(scale, 0, ICHAIN_CONTINUE), - ICHAIN_S8(hintId, 26, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_GOMESS, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 6000, ICHAIN_CONTINUE), ICHAIN_U8(targetMode, 5, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 15ae675a16..0f37266e20 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -109,7 +109,7 @@ static DamageTable sDamageTable = { }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 77, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_MAD_SCRUB, ICHAIN_CONTINUE), ICHAIN_F32(gravity, -1, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 2600, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c index eb77191503..65c11e0352 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -253,7 +253,7 @@ static s32 D_8089E350 = 0; static InitChainEntry sInitChain[] = { ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_CONTINUE), - ICHAIN_S8(hintId, 16, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_DINOLFOS, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 15, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 45311b83f2..65e5417f33 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -273,7 +273,7 @@ static DamageTable sDamageTable = { static CollisionCheckInfoInit sColChkInfoInit = { 3, 100, 100, 80 }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 13, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_DODONGO, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -1000, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 1400, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c index 901efc0d2c..5bc260ccc6 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -242,7 +242,7 @@ void EnDragon_Init(Actor* thisx, PlayState* play) { this->pythonIndex = EN_DRAGON_GET_PYTHON_INDEX(&this->actor); this->actor.colChkInfo.mass = MASS_IMMOVABLE; this->action = DEEP_PYTHON_ACTION_IDLE; - this->actor.hintId = 0xE; + this->actor.hintId = TATL_HINT_ID_DEEP_PYTHON; this->scale = 0.5f; this->actor.flags &= ~ACTOR_FLAG_8000000; diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c index 287ca85e1f..4b091efc32 100644 --- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c @@ -62,7 +62,7 @@ void EnElfbub_Init(Actor* thisx, PlayState* play) { } ActorShape_Init(&this->actor.shape, 16.0f, ActorShadow_DrawCircle, 0.2f); - this->actor.hintId = 0x16; + this->actor.hintId = TATL_HINT_ID_IGOS_DU_IKANA; Actor_SetScale(&this->actor, 1.25f); this->actionFunc = EnElfbub_Idle; diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index cc447a1a16..b6b93aded4 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -154,7 +154,7 @@ static AnimatedMaterial* sEmblemAnimatedMats[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 15, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_DEATH_ARMOS, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 3500, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index e91d04c48e..3ac02d9c94 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -149,19 +149,19 @@ void EnFirefly_Init(Actor* thisx, PlayState* play) { this->auraType = KEESE_AURA_FIRE; this->timer = Rand_S16Offset(20, 60); this->actor.shape.rot.x = 0x1554; - this->actor.hintId = 0x11; // Fire Keese + this->actor.hintId = TATL_HINT_ID_FIRE_KEESE; this->maxAltitude = this->actor.home.pos.y; this->actionFunc = EnFirefly_FlyIdle; } else if (this->actor.params == KEESE_ICE_FLY) { this->auraType = KEESE_AURA_ICE; this->collider.info.toucher.effect = 2; // Freeze - this->actor.hintId = 0x56; // Ice Keese + this->actor.hintId = TATL_HINT_ID_ICE_KEESE; this->maxAltitude = this->actor.home.pos.y + 100.0f; this->actionFunc = EnFirefly_FlyIdle; } else { this->auraType = KEESE_AURA_NONE; this->collider.info.toucher.effect = 0; // Nothing - this->actor.hintId = 0x12; // Keese + this->actor.hintId = TATL_HINT_ID_KEESE; this->maxAltitude = this->actor.home.pos.y + 100.0f; this->actionFunc = EnFirefly_Perch; } @@ -188,7 +188,7 @@ void EnFirefly_Extinguish(EnFirefly* this) { this->currentType = KEESE_NORMAL; this->collider.info.toucher.effect = 0; // Nothing this->auraType = KEESE_AURA_NONE; - this->actor.hintId = 0x12; // Keese + this->actor.hintId = TATL_HINT_ID_KEESE; } void EnFirefly_Ignite(EnFirefly* this) { @@ -196,7 +196,7 @@ void EnFirefly_Ignite(EnFirefly* this) { this->currentType = KEESE_FIRE; this->collider.info.toucher.effect = 1; // Fire this->auraType = KEESE_AURA_FIRE; - this->actor.hintId = 0x11; // Fire Keese + this->actor.hintId = TATL_HINT_ID_FIRE_KEESE; } } diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index c5e7b24f14..411d837121 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -129,7 +129,7 @@ static DamageTable sDamageTable = { }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 49, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_FLOORMASTER, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 5500, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 00c47b1119..198166b007 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -156,7 +156,7 @@ static DamageTable sDamageTable = { }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 59, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_FREEZARD, ICHAIN_CONTINUE), ICHAIN_U8(targetMode, 2, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 30, ICHAIN_STOP), diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c index 3664fcede9..46a52a9faf 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -158,7 +158,7 @@ void EnHintSkb_Init(Actor* thisx, PlayState* play) { Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->colliderElement); CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); Actor_ProcessInitChain(&this->actor, sInitChain); - this->actor.hintId = 0x55; + this->actor.hintId = TATL_HINT_ID_STALCHILD; this->unk_3E4 = 0; this->unk_3DE = 0; this->unk_3E0 = 0; @@ -587,7 +587,7 @@ void func_80C20D64(EnHintSkb* this, PlayState* play) { if (Player_GetMask(play) == PLAYER_MASK_CAPTAIN) { this->actor.flags &= ~(ACTOR_FLAG_1 | ACTOR_FLAG_4); this->actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_8); - this->actor.hintId = 255; + this->actor.hintId = TATL_HINT_ID_NONE; this->actor.textId = 0; if (this->actionFunc == func_80C1FE80) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 12); @@ -597,7 +597,7 @@ void func_80C20D64(EnHintSkb* this, PlayState* play) { } else if (Player_GetMask(play) != PLAYER_MASK_CAPTAIN) { this->actor.flags &= ~(ACTOR_FLAG_1 | ACTOR_FLAG_8); this->actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_4); - this->actor.hintId = 0x55; + this->actor.hintId = TATL_HINT_ID_STALCHILD; this->actor.textId = 0; if (this->skelAnime.animation == &object_skb_Anim_00697C) { func_80C1FE0C(this); diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index a1c33264eb..d71e4c1935 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -388,7 +388,7 @@ void EnIk_Idle(EnIk* this, PlayState* play) { } else if (this->colliderCylinder.base.acFlags & AC_HIT) { Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IRONNACK_ARMOR_HIT); func_801A2E54(NA_BGM_MINI_BOSS); - this->actor.hintId = 0x35; + this->actor.hintId = TATL_HINT_ID_IRON_KNUCKLE; this->colliderCylinder.base.acFlags &= ~AC_HIT; this->invincibilityFrames = 12; EnIk_SetupWalk(this); diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c index b6edc7778f..c1ea3ae461 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -114,7 +114,7 @@ static TexturePtr D_80AD8E34[] = { object_tl_Tex_0055A0, object_tl_Tex_0057A0, o object_tl_Tex_0057A0 }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 1, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_SNAPPER, ICHAIN_CONTINUE), ICHAIN_F32(gravity, -1, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 3500, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 5412065f52..46a1adfd5d 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -154,9 +154,9 @@ void EnKarebaba_Init(Actor* thisx, PlayState* play) { this->unk_22C = NULL; if (this->actor.params == ENKAREBABA_2) { - this->actor.hintId = 2; + this->actor.hintId = TATL_HINT_ID_MINI_BABA; } else { - this->actor.hintId = 9; + this->actor.hintId = TATL_HINT_ID_WILTED_DEKU_BABA; } if (this->actor.params == ENKAREBABA_0) { diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index bd56373e57..bf91c75161 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -134,7 +134,7 @@ void EnNeoReeba_Init(Actor* thisx, PlayState* play) { this->actor.colChkInfo.damageTable = &sDamageTable; this->actor.targetMode = 2; - this->actor.hintId = 0x47; + this->actor.hintId = TATL_HINT_ID_LEEVER; this->actor.gravity = -0.5f; this->targetPos = gZeroVec3f; diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index a0de8cc484..938696e881 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -95,7 +95,7 @@ static DamageTable D_80870900 = { // static InitChainEntry sInitChain[] = { static InitChainEntry D_80870920[] = { - ICHAIN_S8(hintId, 66, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_OCTOROK, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 6500, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c index 5feb502459..2ff9d814e0 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -163,7 +163,7 @@ static ColliderJntSphInit sJntSphInit = { static CollisionCheckInfoInit sColChkInit = { 3, 30, 60, 50 }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 69, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_GEKKO_SNAPPER, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(targetArrowOffset, -13221, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 7, ICHAIN_CONTINUE), @@ -1191,7 +1191,7 @@ void EnPametfrog_SetupCallSnapper(EnPametfrog* this, PlayState* play) { // Zooms in on Gekko Play_SetCameraAtEye(play, this->subCamId, &subCamAt, &subCamEye); this->timer = 0; - this->actor.hintId = 0x5F; + this->actor.hintId = TATL_HINT_ID_GEKKO_GIANT_SLIME; this->actionFunc = EnPametfrog_CallSnapper; } diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index d0598ce79b..f7e943957e 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -194,7 +194,7 @@ void EnPeehat_Init(Actor* thisx, PlayState* play) { this->actor.shape.yOffset = -1000.0f; } Actor_SetScale(&this->actor, 0.036f); - this->actor.hintId = 0x48; + this->actor.hintId = TATL_HINT_ID_PEAHAT; func_80897498(this); } else { CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit2); @@ -205,7 +205,7 @@ void EnPeehat_Init(Actor* thisx, PlayState* play) { this->colliderCylinder.dim.radius = 20; this->colliderCylinder.dim.height = 15; this->colliderCylinder.dim.yShift = -5; - this->actor.hintId = 0x49; + this->actor.hintId = TATL_HINT_ID_PEAHAT_LARVA; this->colliderCylinder.base.ocFlags1 &= ~OC1_ON; func_80897A34(this); diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index b9afa5229d..57e32a5541 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -177,7 +177,7 @@ void EnPoSisters_Init(Actor* thisx, PlayState* play) { Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); this->type = ENPOSISTERS_GET_TYPE(thisx); - this->actor.hintId = this->type + 80; + this->actor.hintId = this->type + TATL_HINT_ID_POE_SISTER_MEG; this->megCloneId = ENPOSISTERS_GET_MEG_CLONE_ID(thisx); this->floatingBobbingTimer = 32; this->zTargetTimer = 20; diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 9d1dca75ef..dde6236b52 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -143,7 +143,7 @@ static DamageTable sDamageTable = { static CollisionCheckInfoInit sColChkInfoInit = { 3, 25, 50, 50 }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 68, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_POE, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 3200, ICHAIN_STOP), }; @@ -388,7 +388,7 @@ void func_80B2D2C0(EnPoh* this) { this->actor.speedXZ = 0.0f; this->actor.world.rot.y = this->actor.shape.rot.y; this->unk_18E = 0; - this->actor.hintId = 0xFF; + this->actor.hintId = TATL_HINT_ID_NONE; this->actor.flags &= ~ACTOR_FLAG_1; this->actionFunc = func_80B2D300; } diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.c b/src/overlays/actors/ovl_En_Pr/z_en_pr.c index c7fae7c884..724b2c19fe 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -118,7 +118,7 @@ void EnPr_Init(Actor* thisx, PlayState* play2) { this->actor.colChkInfo.health = 3; this->actor.colChkInfo.mass = 50; - this->actor.hintId = 0x5C; + this->actor.hintId = TATL_HINT_ID_DESBREKO; Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit); diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c index 2454639c5b..4564c679f0 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -109,7 +109,7 @@ void EnPr2_Init(Actor* thisx, PlayState* play) { EnPr2* this = THIS; this->actor.targetMode = 3; - this->actor.hintId = 0x5B; + this->actor.hintId = TATL_HINT_ID_SKULLFISH; this->unk_1EC = 255; this->actor.colChkInfo.health = 1; this->actor.colChkInfo.damageTable = &sDamageTable; diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c index 6fc5ea24a2..e5c6115783 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -110,7 +110,7 @@ void EnPrz_Init(Actor* thisx, PlayState* play) { this->actor.targetMode = 3; this->unk_1E8 = 255; - this->actor.hintId = 0x5B; + this->actor.hintId = TATL_HINT_ID_SKULLFISH; this->actor.colChkInfo.damageTable = &sDamageTable; this->actor.colChkInfo.health = 1; diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c index 095ee3feca..56201271b4 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -282,7 +282,7 @@ void EnRailSkb_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); this->actor.speedXZ = 1.6f; - this->actor.hintId = 0x55; + this->actor.hintId = TATL_HINT_ID_STALCHILD; this->unk_3F2 = 0; this->unk_2E4 = -1; this->unk_3FC = 0; @@ -825,7 +825,7 @@ void func_80B723F8(EnRailSkb* this) { this->actor.flags &= ~(ACTOR_FLAG_1 | ACTOR_FLAG_4); this->actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_8); this->actor.flags |= ACTOR_FLAG_100000; - this->actor.hintId = 0xFF; + this->actor.hintId = TATL_HINT_ID_NONE; this->actor.textId = 0; } @@ -926,7 +926,7 @@ void func_80B72880(EnRailSkb* this, PlayState* play) { this->actor.flags &= ~(ACTOR_FLAG_1 | ACTOR_FLAG_4); this->actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_8); this->actor.flags |= ACTOR_FLAG_100000; - this->actor.hintId = 0xFF; + this->actor.hintId = TATL_HINT_ID_NONE; this->actor.textId = 0; func_80B71650(this); } @@ -934,7 +934,7 @@ void func_80B72880(EnRailSkb* this, PlayState* play) { this->actor.flags &= ~(ACTOR_FLAG_1 | ACTOR_FLAG_8); this->actor.flags &= ~ACTOR_FLAG_100000; this->actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_4); - this->actor.hintId = 0x55; + this->actor.hintId = TATL_HINT_ID_STALCHILD; this->actor.textId = 0; func_80B70FA0(this); } diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c index 10bbf2f83a..58ab51cf83 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -246,7 +246,7 @@ void EnRailgibud_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); this->actor.targetMode = 0; - this->actor.hintId = 0x2D; + this->actor.hintId = TATL_HINT_ID_GIBDO; this->actor.textId = 0; if (ENRAILGIBUD_IS_CUTSCENE_TYPE(&this->actor)) { EnRailgibud_InitCutsceneGibdo(this, play); @@ -580,7 +580,7 @@ void EnRailgibud_Damage(EnRailgibud* this, PlayState* play) { this->actor.world.rot.y = this->actor.shape.rot.y; if ((this->drawDmgEffTimer > 0) && (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FIRE) && (this->type == EN_RAILGIBUD_TYPE_GIBDO)) { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; SkelAnime_InitFlex(play, &this->skelAnime, &gRedeadSkel, NULL, this->jointTable, this->morphTable, GIBDO_LIMB_MAX); this->type = EN_RAILGIBUD_TYPE_REDEAD; @@ -933,7 +933,7 @@ void EnRailgibud_CheckForGibdoMask(EnRailgibud* this, PlayState* play) { if (Player_GetMask(play) == PLAYER_MASK_GIBDO) { this->actor.flags &= ~(ACTOR_FLAG_4 | ACTOR_FLAG_1); this->actor.flags |= (ACTOR_FLAG_8 | ACTOR_FLAG_1); - this->actor.hintId = 0xFF; + this->actor.hintId = TATL_HINT_ID_NONE; this->actor.textId = 0; if ((this->actionFunc != EnRailgibud_WalkInCircles) && (this->actionFunc != EnRailgibud_WalkToHome)) { EnRailgibud_SetupWalkToHome(this); @@ -943,9 +943,9 @@ void EnRailgibud_CheckForGibdoMask(EnRailgibud* this, PlayState* play) { this->actor.flags &= ~(ACTOR_FLAG_8 | ACTOR_FLAG_1); this->actor.flags |= (ACTOR_FLAG_4 | ACTOR_FLAG_1); if (this->type == EN_RAILGIBUD_TYPE_REDEAD) { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; } else { - this->actor.hintId = 0x2D; + this->actor.hintId = TATL_HINT_ID_GIBDO; } this->actor.textId = 0; } diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c index 1054876aab..cc98c05e1c 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -118,7 +118,7 @@ static TexturePtr sSparkTextures[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 97, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_REAL_BOMBCHU, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 15, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 5000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 1f4c102817..0092189c5c 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -223,7 +223,7 @@ void EnRd_Init(Actor* thisx, PlayState* play) { if (!EnRd_ShouldNotDance(play)) { EnRd_SetupSquattingDance(this); } else { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; EnRd_SetupIdle(this); } this->setupDanceFunc = EnRd_SetupSquattingDance; @@ -233,7 +233,7 @@ void EnRd_Init(Actor* thisx, PlayState* play) { if (!EnRd_ShouldNotDance(play)) { EnRd_SetupClappingDance(this); } else { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; EnRd_SetupIdle(this); } this->setupDanceFunc = EnRd_SetupClappingDance; @@ -243,7 +243,7 @@ void EnRd_Init(Actor* thisx, PlayState* play) { if (!EnRd_ShouldNotDance(play)) { EnRd_SetupPirouette(this); } else { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; EnRd_SetupIdle(this); } this->setupDanceFunc = EnRd_SetupPirouette; @@ -251,9 +251,9 @@ void EnRd_Init(Actor* thisx, PlayState* play) { default: if (EN_RD_GET_TYPE(&this->actor) == EN_RD_TYPE_GIBDO) { - this->actor.hintId = 0x2D; + this->actor.hintId = TATL_HINT_ID_GIBDO; } else { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; } EnRd_SetupIdle(this); this->setupDanceFunc = EnRd_SetupIdle; @@ -436,9 +436,9 @@ void EnRd_SquattingDance(EnRd* this, PlayState* play) { this->isMourning = false; if ((this->actor.xzDistToPlayer <= 150.0f) && EnRd_ShouldNotDance(play) && func_800B715C(play)) { if (EN_RD_GET_TYPE(&this->actor) == EN_RD_TYPE_GIBDO) { - this->actor.hintId = 0x2D; + this->actor.hintId = TATL_HINT_ID_GIBDO; } else { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; } Animation_Change(&this->skelAnime, &gGibdoRedeadLookBackAnim, 0.0f, 0.0f, 19.0f, ANIMMODE_ONCE, -10.0f); this->actionFunc = EnRd_EndClappingOrSquattingDanceWhenPlayerIsClose; @@ -446,9 +446,9 @@ void EnRd_SquattingDance(EnRd* this, PlayState* play) { if (EnRd_ShouldNotDance(play)) { if (EN_RD_GET_TYPE(&this->actor) == EN_RD_TYPE_GIBDO) { - this->actor.hintId = 0x2D; + this->actor.hintId = TATL_HINT_ID_GIBDO; } else { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; } EnRd_SetupIdle(this); } @@ -480,9 +480,9 @@ void EnRd_ClappingDance(EnRd* this, PlayState* play) { this->isMourning = false; if ((this->actor.xzDistToPlayer <= 150.0f) && EnRd_ShouldNotDance(play) && func_800B715C(play)) { if (EN_RD_GET_TYPE(&this->actor) == EN_RD_TYPE_GIBDO) { - this->actor.hintId = 0x2D; + this->actor.hintId = TATL_HINT_ID_GIBDO; } else { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; } Animation_Change(&this->skelAnime, &gGibdoRedeadLookBackAnim, 0.0f, 0.0f, 19.0f, ANIMMODE_ONCE, -10.0f); this->actionFunc = EnRd_EndClappingOrSquattingDanceWhenPlayerIsClose; @@ -490,9 +490,9 @@ void EnRd_ClappingDance(EnRd* this, PlayState* play) { if (EnRd_ShouldNotDance(play)) { if (EN_RD_GET_TYPE(&this->actor) == EN_RD_TYPE_GIBDO) { - this->actor.hintId = 0x2D; + this->actor.hintId = TATL_HINT_ID_GIBDO; } else { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; } EnRd_SetupIdle(this); } @@ -541,18 +541,18 @@ void EnRd_Pirouette(EnRd* this, PlayState* play) { this->isMourning = false; if ((this->actor.xzDistToPlayer <= 150.0f) && EnRd_ShouldNotDance(play) && func_800B715C(play)) { if (EN_RD_GET_TYPE(&this->actor) == EN_RD_TYPE_GIBDO) { - this->actor.hintId = 0x2D; + this->actor.hintId = TATL_HINT_ID_GIBDO; } else { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; } this->actionFunc = EnRd_EndPirouetteWhenPlayerIsClose; } if (EnRd_ShouldNotDance(play)) { if (EN_RD_GET_TYPE(&this->actor) == EN_RD_TYPE_GIBDO) { - this->actor.hintId = 0x2D; + this->actor.hintId = TATL_HINT_ID_GIBDO; } else { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; } EnRd_SetupIdle(this); } diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 8fc202dddc..4a61e62b9c 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -118,7 +118,7 @@ static DamageTable sDamageTable = { static CollisionCheckInfoInit sColChkInfoInit = { 3, 45, 60, 250 }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 55, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_LIKE_LIKE, ICHAIN_CONTINUE), ICHAIN_U8(targetMode, 2, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -400, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index acd645d63a..adcb781150 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -92,7 +92,7 @@ static DamageTable sDamageTable = { }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 39, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_SHELLBLADE, ICHAIN_CONTINUE), ICHAIN_U8(targetMode, 2, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 30, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index e3c5b17306..62cb638d94 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -249,7 +249,7 @@ void EnSkb_Init(Actor* thisx, PlayState* play) { default: this->actor.flags &= ~ACTOR_FLAG_100000; - this->actor.hintId = 0x55; + this->actor.hintId = TATL_HINT_ID_STALCHILD; func_8099495C(this, play); break; } @@ -353,7 +353,7 @@ void func_80995068(EnSkb* this, PlayState* play) { } else if (Player_GetMask(play) != PLAYER_MASK_CAPTAIN) { this->actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_4); this->actor.flags &= ~(ACTOR_FLAG_1 | ACTOR_FLAG_8); - this->actor.hintId = 0x55; + this->actor.hintId = TATL_HINT_ID_STALCHILD; this->actor.colChkInfo.mass = MASS_HEAVY; func_80995A30(this); } else if (!(this->collider.base.acFlags & AC_HIT)) { @@ -427,7 +427,7 @@ void func_8099533C(EnSkb* this, PlayState* play) { this->actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_8); func_80994F7C(this, play); } else if (Actor_IsFacingPlayer(&this->actor, 0x2AAA) && (this->actor.xzDistToPlayer < 200.0f)) { - this->actor.hintId = 0x55; + this->actor.hintId = TATL_HINT_ID_STALCHILD; this->actor.colChkInfo.mass = MASS_HEAVY; func_8099571C(this); } @@ -449,7 +449,7 @@ void func_8099544C(EnSkb* this, PlayState* play) { this->actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_8); func_80994F7C(this, play); } else if (Actor_IsFacingPlayer(&this->actor, 0x2AAA) && (this->actor.xzDistToPlayer < 200.0f)) { - this->actor.hintId = 0x55; + this->actor.hintId = TATL_HINT_ID_STALCHILD; this->actor.colChkInfo.mass = MASS_HEAVY; func_8099571C(this); } @@ -487,7 +487,7 @@ void func_8099556C(EnSkb* this, PlayState* play) { func_80994F7C(this, play); } else if (Actor_IsFacingPlayer(&this->actor, 0x2AAA) && (this->actor.xzDistToPlayer < 200.0f) && (this->skelAnime.curFrame > 24.0f) && (this->skelAnime.curFrame < 28.0f)) { - this->actor.hintId = 0x55; + this->actor.hintId = TATL_HINT_ID_STALCHILD; this->actor.colChkInfo.mass = MASS_HEAVY; this->actor.targetArrowOffset = 2000.0f; func_8099571C(this); @@ -571,7 +571,7 @@ void func_80995A8C(EnSkb* this, PlayState* play) { if (Player_GetMask(play) == PLAYER_MASK_CAPTAIN) { this->actor.flags &= ~(ACTOR_FLAG_1 | ACTOR_FLAG_4); this->actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_8); - this->actor.hintId = 0xFF; + this->actor.hintId = TATL_HINT_ID_NONE; this->actor.colChkInfo.mass = MASS_HEAVY; Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 12); func_8099504C(this); diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c index b07a1667e8..e2dd8b54b7 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -178,7 +178,7 @@ static Gfx* sSnowballFragmentDLs[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 20, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_EENO, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 3000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index b3c353f1f3..7d0dcbf114 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -704,7 +704,7 @@ void func_808A6A78(EnSt* this, PlayState* play) { Actor_SetScale(&this->actor, 0.04f); this->actor.draw = func_808A7478; - this->actor.hintId = 4; + this->actor.hintId = TATL_HINT_ID_SKULLTULA; this->actor.gravity = 0.0f; func_808A63E8(this); this->unk_18C = 0; diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index a69cbe213b..fc3aff029b 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -1144,11 +1144,11 @@ void EnSw_Init(Actor* thisx, PlayState* play) { Collider_InitAndSetSphere(play, &this->collider, &this->actor, &sSphereInit); if (!ENSW_GET_3(&this->actor)) { - this->actor.hintId = 0x1F; + this->actor.hintId = TATL_HINT_ID_SKULLWALLTULA; CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); this->collider.info.toucher.damage = 8; } else { - this->actor.hintId = 0x20; + this->actor.hintId = TATL_HINT_ID_GOLD_SKULLTULA; CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable2, &sColChkInfoInit2); this->collider.info.toucher.damage = 16; } diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c index a8d76a7a8e..ef89732958 100644 --- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c @@ -67,7 +67,7 @@ static ColliderJntSphInit sJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneScale, 3000, ICHAIN_CONTINUE), - ICHAIN_S8(hintId, 88, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_GUAY, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c index fcb1e83305..51a941b284 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -79,7 +79,7 @@ static AnimationInfo sAnimationInfo[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 77, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_MAD_SCRUB, ICHAIN_CONTINUE), ICHAIN_F32(gravity, 0, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 2600, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c index 9077b38c45..f631439bd9 100644 --- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c @@ -72,7 +72,7 @@ static AnimationInfo sAnimationInfo[] = { #include "assets/overlays/ovl_En_Syateki_Okuta/ovl_En_Syateki_Okuta.c" static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 66, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_OCTOROK, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 6500, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c index d15859a749..647b211829 100644 --- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c @@ -186,7 +186,7 @@ void EnSyatekiWf_Init(Actor* thisx, PlayState* play) { SkelAnime_InitFlex(play, &this->skelAnime, &gWolfosNormalSkel, &gWolfosWaitingAnim, this->jointTable, this->morphTable, WOLFOS_NORMAL_LIMB_MAX); Actor_SetScale(&this->actor, 0.01f); - this->actor.hintId = 0x4C; + this->actor.hintId = TATL_HINT_ID_WOLFOS; func_80A201CC(this); } diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c index f1268e1e01..393caa1d9f 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c @@ -229,7 +229,7 @@ void EnTalkGibud_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); this->actor.targetMode = 0; - this->actor.hintId = 0x2D; + this->actor.hintId = TATL_HINT_ID_GIBDO; this->actor.textId = 0; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 28.0f); @@ -566,7 +566,7 @@ void EnTalkGibud_Damage(EnTalkGibud* this, PlayState* play) { this->actor.world.rot.y = this->actor.shape.rot.y; if ((this->drawDmgEffTimer > 0) && (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FIRE) && (this->type == EN_TALK_GIBUD_TYPE_GIBDO)) { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; this->actor.flags &= ~(ACTOR_FLAG_8 | ACTOR_FLAG_1); this->actor.flags |= (ACTOR_FLAG_4 | ACTOR_FLAG_1); SkelAnime_InitFlex(play, &this->skelAnime, &gRedeadSkel, NULL, this->jointTable, this->morphTable, @@ -926,7 +926,7 @@ void EnTalkGibud_CheckForGibdoMask(EnTalkGibud* this, PlayState* play) { if (Player_GetMask(play) == PLAYER_MASK_GIBDO) { this->actor.flags &= ~(ACTOR_FLAG_4 | ACTOR_FLAG_1); this->actor.flags |= (ACTOR_FLAG_8 | ACTOR_FLAG_1); - this->actor.hintId = 0xFF; + this->actor.hintId = TATL_HINT_ID_NONE; this->actor.textId = 0; EnTalkGibud_SetupPassiveIdle(this); } @@ -934,9 +934,9 @@ void EnTalkGibud_CheckForGibdoMask(EnTalkGibud* this, PlayState* play) { this->actor.flags &= ~(ACTOR_FLAG_8 | ACTOR_FLAG_1); this->actor.flags |= (ACTOR_FLAG_4 | ACTOR_FLAG_1); if (this->type == EN_TALK_GIBUD_TYPE_REDEAD) { - this->actor.hintId = 0x2A; + this->actor.hintId = TATL_HINT_ID_REDEAD; } else { - this->actor.hintId = 0x2D; + this->actor.hintId = TATL_HINT_ID_GIBDO; } this->actor.textId = 0; EnTalkGibud_SetupWalkToHome(this); diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c index 03c7d0e1da..dd4890d537 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -136,7 +136,7 @@ static s16 D_80C13664[] = { ITEM00_ARROWS_10, ITEM00_BOMBS_B, ITEM00_RUPEE_GR static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_S8(hintId, 35, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_TAKKURI, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 500, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 2b13859651..b912f6f38d 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -125,7 +125,7 @@ static Color_RGBA8 D_80896B40 = { 180, 180, 180, 255 }; static Vec3f D_80896B44 = { 0.0f, 0.45f, 0.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 70, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_BLUE_TEKTITE, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_CONTINUE), ICHAIN_F32(terminalVelocity, -40, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -1000, ICHAIN_STOP), diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 4e7e851470..5ce0f0286a 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -151,7 +151,7 @@ TexturePtr D_808CD58C[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 14, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 1000, ICHAIN_CONTINUE), - ICHAIN_S8(hintId, 57, ICHAIN_STOP), + ICHAIN_S8(hintId, TATL_HINT_ID_BEAMOS, ICHAIN_STOP), }; s32 D_808CD5B8 = false; diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 16cfa6a4b3..9dca3642f3 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -123,7 +123,7 @@ static DamageTable sDamageTable = { static CollisionCheckInfoInit sColChkInfoInit = { 3, 30, 40, 150 }; static InitChainEntry sInitChain[] = { - ICHAIN_S8(hintId, 48, ICHAIN_CONTINUE), + ICHAIN_S8(hintId, TATL_HINT_ID_WALLMASTER, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 5500, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -1500, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index 8a5da16c5f..811f828a8b 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -319,7 +319,7 @@ void EnWf_Init(Actor* thisx, PlayState* play) { if (this->actor.params == 0) { SkelAnime_InitFlex(play, &this->skelAnime, &gWolfosNormalSkel, &gWolfosWaitingAnim, this->jointTable, this->morphTable, WOLFOS_NORMAL_LIMB_MAX); - this->actor.hintId = 0x4C; + this->actor.hintId = TATL_HINT_ID_WOLFOS; CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable2, &sColChkInfoInit); this->collider1.elements[0].info.toucher.damage = 8; this->collider1.elements[1].info.toucher.damage = 8; @@ -327,7 +327,7 @@ void EnWf_Init(Actor* thisx, PlayState* play) { } else { SkelAnime_InitFlex(play, &this->skelAnime, &gWolfosWhiteSkel, &gWolfosWaitingAnim, this->jointTable, this->morphTable, WOLFOS_WHITE_LIMB_MAX); - this->actor.hintId = 0x57; + this->actor.hintId = TATL_HINT_ID_WHITE_WOLFOS; CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable1, &sColChkInfoInit); } diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c index deb315bc42..24597e4aa1 100644 --- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c @@ -41,11 +41,11 @@ void ObjKinoko_Update(Actor* thisx, PlayState* play) { if (player->currentMask != PLAYER_MASK_SCENTS) { thisx->draw = NULL; - thisx->hintId = 0xFF; + thisx->hintId = TATL_HINT_ID_NONE; thisx->flags &= ~ACTOR_FLAG_1; } else { thisx->draw = ObjKinoko_Draw; - thisx->hintId = 0x64; + thisx->hintId = TATL_HINT_ID_MUSHROOM; thisx->flags |= ACTOR_FLAG_1; if (Actor_HasParent(thisx, play)) { Flags_SetCollectible(play, OBJ_KINOKO_GET_FLAG(thisx));