izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add enum for tatl hint id (#993)

Browse Source 
* 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
This commit is contained in:
Parker Burnett
2022-09-14 14:01:06 -03:00
committed by GitHub
parent 6451bcf158
commit 2c6816ba77
58 changed files with 211 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64actor.h
+105
View File
@@ -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
src/code/z_actor.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_Boss_02/z_boss_02.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_Boss_03/z_boss_03.c
+2 -2
View File
@@ -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;
src/overlays/actors/ovl_Boss_04/z_boss_04.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_En_Am/z_en_am.c
+1 -1
View File
@@ -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),
};
src/overlays/actors/ovl_En_Baguo/z_en_baguo.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_En_Bat/z_en_bat.c
+1 -1
View File
@@ -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),
src/overlays/actors/ovl_En_Bb/z_en_bb.c
+1 -1
View File
@@ -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),
};
src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c
+1 -1
View File
@@ -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),
};
src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
+1 -1
View File
@@ -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),
};
src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
+2 -2
View File
@@ -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;
}
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+3 -3
View File
@@ -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);
}
}
src/overlays/actors/ovl_En_Crow/z_en_crow.c
+1 -1
View File
@@ -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),
};
src/overlays/actors/ovl_En_Death/z_en_death.c
+1 -1
View File
@@ -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),
};
src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
+1 -1
View File
@@ -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),
};
src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c
+1 -1
View File
@@ -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),
};
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+1 -1
View File
@@ -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),
};
src/overlays/actors/ovl_En_Dragon/z_en_dragon.c
+1 -1
View File
@@ -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;
src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c
+1 -1
View File
@@ -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;

Some files were not shown because too many files have changed in this diff Show More