mirror of
https://github.com/HarbourMasters/2ship2harkinian.git
synced 2025-02-21 14:50:39 +00:00
En_shn OK (#638)
* Building on Macs * Add Mac building documentation * Review * Update for new z64compress * Review * getting some matching done * gettting some more matches * actor fixer * almost OK * Shn OK * fixing data and warnings * finishing touches * forgot to update spec * dang comments not being formatted * this should fix things * fixing feedback and other fixes * fixing things * fixing things * addressing PR * format and minor fix * actorfixer * fixing actor * fixing enum * yay format Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
Parker Burnett
GitHub
parent
10a1ef8f1d
commit
4a18f3ca4d
@ -50,7 +50,7 @@
|
||||
<Texture Name="object_shn_Tex_00A418" OutName="tex_00A418" Format="ci8" Width="32" Height="32" Offset="0xA418" />
|
||||
<Texture Name="object_shn_Tex_00A818" OutName="tex_00A818" Format="ci8" Width="8" Height="8" Offset="0xA818" />
|
||||
<DList Name="object_shn_DL_00B730" Offset="0xB730" />
|
||||
<DList Name="object_shn_DL_00B738" Offset="0xB738" />
|
||||
<DList Name="gObjectShnSwampGuideHead" Offset="0xB738" />
|
||||
<Texture Name="object_shn_TLUT_00BCD8" OutName="tlut_00BCD8" Format="rgba16" Width="16" Height="16" Offset="0xBCD8" />
|
||||
<Texture Name="object_shn_TLUT_00BED8" OutName="tlut_00BED8" Format="rgba16" Width="16" Height="16" Offset="0xBED8" />
|
||||
<Texture Name="object_shn_Tex_00C0D8" OutName="tex_00C0D8" Format="ci8" Width="8" Height="8" Offset="0xC0D8" />
|
||||
@ -66,22 +66,22 @@
|
||||
<Animation Name="object_shn_Anim_00D9D0" Offset="0xD9D0" />
|
||||
<Animation Name="object_shn_Anim_00DFEC" Offset="0xDFEC" />
|
||||
<Animation Name="object_shn_Anim_00E6C4" Offset="0xE6C4" />
|
||||
<Limb Name="object_shn_Standardlimb_00E6E0" Type="Standard" Offset="0xE6E0" />
|
||||
<Limb Name="object_shn_Standardlimb_00E6EC" Type="Standard" Offset="0xE6EC" />
|
||||
<Limb Name="object_shn_Standardlimb_00E6F8" Type="Standard" Offset="0xE6F8" />
|
||||
<Limb Name="object_shn_Standardlimb_00E704" Type="Standard" Offset="0xE704" />
|
||||
<Limb Name="object_shn_Standardlimb_00E710" Type="Standard" Offset="0xE710" />
|
||||
<Limb Name="object_shn_Standardlimb_00E71C" Type="Standard" Offset="0xE71C" />
|
||||
<Limb Name="object_shn_Standardlimb_00E728" Type="Standard" Offset="0xE728" />
|
||||
<Limb Name="object_shn_Standardlimb_00E734" Type="Standard" Offset="0xE734" />
|
||||
<Limb Name="object_shn_Standardlimb_00E740" Type="Standard" Offset="0xE740" />
|
||||
<Limb Name="object_shn_Standardlimb_00E74C" Type="Standard" Offset="0xE74C" />
|
||||
<Limb Name="object_shn_Standardlimb_00E758" Type="Standard" Offset="0xE758" />
|
||||
<Limb Name="object_shn_Standardlimb_00E764" Type="Standard" Offset="0xE764" />
|
||||
<Limb Name="object_shn_Standardlimb_00E770" Type="Standard" Offset="0xE770" />
|
||||
<Limb Name="object_shn_Standardlimb_00E77C" Type="Standard" Offset="0xE77C" />
|
||||
<Limb Name="object_shn_Standardlimb_00E788" Type="Standard" Offset="0xE788" />
|
||||
<Skeleton Name="object_shn_Skel_00E7D0" Type="Flex" LimbType="Standard" Offset="0xE7D0" />
|
||||
<Limb Name="gObjectShnLimbWaist" Type="Standard" EnumName="OBJECT_SHN_LIMB_WAIST" Offset="0xE6E0" />
|
||||
<Limb Name="gObjectShnLimbLegLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_LEG_LEFT" Offset="0xE6EC" />
|
||||
<Limb Name="gObjectShnLimbShinLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHIN_LEFT" Offset="0xE6F8" />
|
||||
<Limb Name="gObjectShnLimbFootLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOOT_LEFT" Offset="0xE704" />
|
||||
<Limb Name="gObjectShnLimbLegRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_LEG_RIGHT" Offset="0xE710" />
|
||||
<Limb Name="gObjectShnLimbShinRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHIN_RIGHT" Offset="0xE71C" />
|
||||
<Limb Name="gObjectShnLimbFootRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOOT_RIGHT" Offset="0xE728" />
|
||||
<Limb Name="gObjectShnLimbTorso" Type="Standard" EnumName="OBJECT_SHN_LIMB_TORSO" Offset="0xE734" />
|
||||
<Limb Name="gObjectShnLimbShoulderLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHOULDER_LEFT" Offset="0xE740" />
|
||||
<Limb Name="gObjectShnLimbForearmLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOREARM_LEFT" Offset="0xE74C" />
|
||||
<Limb Name="gObjectShnLimbHandLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_HAND_LEFT" Offset="0xE758" />
|
||||
<Limb Name="gObjectShnLimbShoulderRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHOULDER_RIGHT" Offset="0xE764" />
|
||||
<Limb Name="gObjectShnLimbForearmRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOREARM_RIGHT" Offset="0xE770" />
|
||||
<Limb Name="gObjectShnLimbHandRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_HAND_RIGHT" Offset="0xE77C" />
|
||||
<Limb Name="gObjectShnLimbHead" Type="Standard" EnumName="OBJECT_SHN_LIMB_HEAD" Offset="0xE788" />
|
||||
<Skeleton Name="gObjectShnSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_SHN_LIMB_NONE" LimbMax="OBJECT_SHN_LIMB_MAX" EnumName="ObjectShnLimbs" Offset="0xE7D0" />
|
||||
<DList Name="object_shn_DL_00F2D0" Offset="0xF2D0" />
|
||||
<Texture Name="object_shn_TLUT_00F790" OutName="tlut_00F790" Format="rgba16" Width="16" Height="16" Offset="0xF790" />
|
||||
<Texture Name="object_shn_TLUT_00F990" OutName="tlut_00F990" Format="rgba16" Width="16" Height="16" Offset="0xF990" />
|
||||
|
||||
@ -391,6 +391,7 @@ typedef enum {
|
||||
typedef enum {
|
||||
/* -1 */ EXCH_ITEM_MINUS1 = -1, // Unknown usage or function
|
||||
/* 0x00 */ EXCH_ITEM_NONE,
|
||||
/* 0x13 */ EXCH_ITEM_13 = 0x13,
|
||||
/* 0x1E */ EXCH_ITEM_1E = 0x1E, // BOTTLE_MUSHROOM
|
||||
/* 0x2A */ EXCH_ITEM_2A = 0x2A, // MOON_TEAR?
|
||||
/* 0x2E */ EXCH_ITEM_2E = 0x2E
|
||||
|
||||
3
spec
3
spec
@ -3657,8 +3657,7 @@ beginseg
|
||||
name "ovl_En_Shn"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_En_Shn/z_en_shn.o"
|
||||
include "build/data/ovl_En_Shn/ovl_En_Shn.data.o"
|
||||
include "build/data/ovl_En_Shn/ovl_En_Shn.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Shn/ovl_En_Shn_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
* File: z_en_shn.c
|
||||
* Overlay: ovl_En_Shn
|
||||
* Description: Swamp Tourist Center Guide
|
||||
* Shashin(Shn) ~ Photo
|
||||
*/
|
||||
|
||||
#include "z_en_shn.h"
|
||||
@ -14,11 +15,42 @@ void EnShn_Init(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnShn_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnShn_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnShn_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
void func_80AE69E8(EnShn* this, GlobalContext* globalCtx);
|
||||
void func_80AE6A64(EnShn* this, GlobalContext* globalCtx);
|
||||
s32 func_80AE6704(EnShn* this, GlobalContext* globalCtx);
|
||||
|
||||
// Could be something related to text/dialogue?
|
||||
static UNK_TYPE D_80AE6F00[] = {
|
||||
0x00170800, 0x0B0E09C4, 0x0C0F09C5, 0x0C111708, 0x03018C04, 0x018E1901, 0x860F00FF, 0x1E001300, 0x00011501,
|
||||
0x47280012, 0x28001928, 0x002D2800, 0x5D280093, 0x28003319, 0x00472C09, 0xE70C2F00, 0x000C1210, 0x2C09CB0C,
|
||||
0x2F00000C, 0x0F09CC0C, 0x0F09CD0C, 0x0500A500, 0xCB00CB2C, 0x09D10C2F, 0x00000C0F, 0x09D20C19, 0xFFE62C09,
|
||||
0xD30C2F00, 0x000C0F09, 0xD40C0F09, 0xD50C0500, 0x9200B200, 0xB22C09D9, 0x0C2F0000, 0x0C0F09DA, 0x0C102C09,
|
||||
0xE80C2F00, 0x000C0F09, 0xE90C0F09, 0xEA0C0057, 0x04001712, 0x06000C00, 0x0013000C, 0x0C115704, 0x0700000E,
|
||||
0x09EB0C12, 0x16101206, 0x00060000, 0x1300060C, 0x07FFEC2C, 0x09EC0C2F, 0x00000C0F, 0x09ED0C0F, 0x09EE0C00,
|
||||
0x57040017, 0x1206000C, 0x00001300, 0x0C0C1157, 0x04070000, 0x0E09EF0C, 0x12161012, 0x06000600, 0x00130006,
|
||||
0x0C07FFEC, 0x12060004, 0x00001300, 0x040C0700, 0x000E09CE, 0x0C161012, 0x06000200, 0x00130002, 0x0C070000,
|
||||
0x0E09D80C, 0x16100C0F, 0x09CF0C1C, 0x05011509, 0x0000100E, 0x09D60C19, 0xFFF10037, 0x40001C2C, 0x09DB0C2F,
|
||||
0x00000C0F, 0x09DC0C0F, 0x09DD0C0F, 0x09DE0C0F, 0x09DF0C11, 0x3740102C, 0x09E00C2F, 0x00000C0F, 0x09E10C0F,
|
||||
0x09E20C10, 0x00374000, 0x180E09DB, 0x0C0F09DC, 0x0C0F09DD, 0x0C0F09DE, 0x0C0F09DF, 0x0C113740, 0x100E09E0,
|
||||
0x0C0F09E1, 0x0C0F09E2, 0x0C100E09, 0xC90C0F09, 0xCA0C100E, 0x09C60C10, 0x001402FF, 0xED0E09C8, 0x0C19FE69
|
||||
};
|
||||
|
||||
static UNK_TYPE D_80AE70B0[] = { 0x0E09D00C, 0x16100000 };
|
||||
|
||||
static UNK_TYPE D_80AE70B8[] = {
|
||||
0x28001228, 0x00152800, 0x28280055, 0x28008A28, 0x002D1900, 0x402C09E7, 0x0C12102C, 0x09CB2F00, 0x000C0F09,
|
||||
0xCC0C0F09, 0xCD0C0500, 0xA000C600, 0xC62C09D1, 0x2F00000C, 0x0F09D20C, 0x19FFE72C, 0x09D32F00, 0x000C0F09,
|
||||
0xD40C0F09, 0xD50C0500, 0x8F00AF00, 0xAF2C09D9, 0x2F00000C, 0x0F09DA0C, 0x102C09E8, 0x2F00000C, 0x0F09E90C,
|
||||
0x0F09EA0C, 0x00570400, 0x17120600, 0x0C000013, 0x000C0C11, 0x57040700, 0x000E09EB, 0x0C121610, 0x12060006,
|
||||
0x00001300, 0x060C07FF, 0xEC2C09EC, 0x2F00000C, 0x0F09ED0C, 0x0F09EE0C, 0x00570800, 0x17120600, 0x0C000013,
|
||||
0x000C0C11, 0x57080700, 0x000E09EF, 0x0C121610, 0x12060006, 0x00001300, 0x060C07FF, 0xEC120600, 0x04000013,
|
||||
0x00040C07, 0x00000E09, 0xCE0C1610, 0x12060002, 0x00001300, 0x020C0700, 0x000E09D8, 0x0C16100C, 0x0F09CF0C,
|
||||
0x1C050115, 0x09000010, 0x0E09D60C, 0x19FFF100,
|
||||
};
|
||||
|
||||
static UNK_TYPE D_80AE71C4[] = { 0x00374000, 0x1C2C09DB, 0x0C2F0000, 0x0C0F09DC, 0x0C0F09DD, 0x0C0F09DE, 0x0C0F09DF,
|
||||
0x0C113740, 0x102C09E0, 0x0C2F0000, 0x0C0F09E1, 0x0C0F09E2, 0x0C100000 };
|
||||
|
||||
#if 0
|
||||
const ActorInit En_Shn_InitVars = {
|
||||
ACTOR_EN_SHN,
|
||||
ACTORCAT_NPC,
|
||||
@ -31,47 +63,379 @@ const ActorInit En_Shn_InitVars = {
|
||||
(ActorFunc)EnShn_Draw,
|
||||
};
|
||||
|
||||
#endif
|
||||
static AnimationInfoS sAnimations[] = {
|
||||
{ &object_shn_Anim_00D9D0, 1.0f, 0, -1, 0, 0 },
|
||||
{ &object_shn_Anim_00D9D0, 1.0f, 0, -1, 0, -4 },
|
||||
{ &object_shn_Anim_00E6C4, 1.0f, 0, -1, 0, 0 },
|
||||
{ &object_shn_Anim_00E6C4, 1.0f, 0, -1, 0, -4 },
|
||||
};
|
||||
|
||||
extern UNK_TYPE D_0600B738;
|
||||
extern UNK_TYPE D_0600E7D0;
|
||||
static s32 D_80AE7258[] = { 0, 2, 3, 8, 10, 1 };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE6130.s")
|
||||
void func_80AE6130(EnShn* this) {
|
||||
this->skelAnime.playSpeed = this->playSpeed;
|
||||
SkelAnime_Update(&this->skelAnime);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE615C.s")
|
||||
s32 func_80AE615C(EnShn* this, s32 arg1) {
|
||||
s32 phi_v0 = 0;
|
||||
s32 phi_v1 = 0;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE61C0.s")
|
||||
if (arg1 != this->unk_2E8) {
|
||||
phi_v0 = 1;
|
||||
}
|
||||
if (phi_v0 != 0) {
|
||||
this->unk_2E8 = arg1;
|
||||
phi_v1 = SubS_ChangeAnimationByInfoS(&this->skelAnime, sAnimations, arg1);
|
||||
this->playSpeed = this->skelAnime.playSpeed;
|
||||
}
|
||||
return phi_v1;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE625C.s")
|
||||
s32 EnShn_IsFacingPlayer(EnShn* this) {
|
||||
s16 phi_v1;
|
||||
f32 range;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE626C.s")
|
||||
if (this->unk_2C8 == 0) {
|
||||
phi_v1 = 0;
|
||||
} else {
|
||||
this->unk_2C8--;
|
||||
phi_v1 = this->unk_2C8;
|
||||
}
|
||||
if (phi_v1 == 0) {
|
||||
this->unk_2EC ^= 1;
|
||||
this->unk_2C8 = Rand_S16Offset(0x1E, 0x1E);
|
||||
}
|
||||
if (this->unk_2EC != 0) {
|
||||
range = 120.0f;
|
||||
} else {
|
||||
range = 80.0f;
|
||||
}
|
||||
return Actor_IsFacingAndNearPlayer(&this->actor, range, 0x238C);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE63A8.s")
|
||||
Player* EnShn_GetPlayer(EnShn* this, GlobalContext* globalCtx) {
|
||||
return GET_PLAYER(globalCtx);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE6488.s")
|
||||
void func_80AE626C(EnShn* this) {
|
||||
s32 topPad;
|
||||
Vec3f playerPos;
|
||||
Vec3f shnPos;
|
||||
s32 bottomPad;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE65F4.s")
|
||||
Math_Vec3f_Copy(&playerPos, &this->shnPlayerRef->actor.world.pos);
|
||||
Math_Vec3f_Copy(&shnPos, &this->actor.world.pos);
|
||||
Math_ApproachS(&this->unk_2BC, (Math_Vec3f_Yaw(&shnPos, &playerPos) - this->actor.shape.rot.y), 4, 0x2AA8);
|
||||
this->unk_2BC = CLAMP(this->unk_2BC, -0x1FFE, 0x1FFE);
|
||||
Math_Vec3f_Copy(&shnPos, &this->actor.focus.pos);
|
||||
if (this->shnPlayerRef->actor.id == ACTOR_PLAYER) {
|
||||
playerPos.y = this->shnPlayerRef->bodyPartsPos[7].y + 3.0f;
|
||||
} else {
|
||||
Math_Vec3f_Copy(&playerPos, &this->shnPlayerRef->actor.focus.pos);
|
||||
}
|
||||
Math_ApproachS(&this->unk_2BA, Math_Vec3f_Pitch(&shnPos, &playerPos), 4, 0x2AA8);
|
||||
this->unk_2BA = CLAMP(this->unk_2BA, -0x1554, 0x1554);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE6704.s")
|
||||
void func_80AE63A8(EnShn* this, GlobalContext* globalCtx) {
|
||||
s16 phi_v1;
|
||||
s16 phi_v1_2;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE6880.s")
|
||||
this->shnPlayerRef = EnShn_GetPlayer(this, globalCtx);
|
||||
if ((this->unk_1D8 & 8) && (this->shnPlayerRef != NULL)) {
|
||||
if (this->unk_2CA == 0) {
|
||||
phi_v1 = 0;
|
||||
} else {
|
||||
this->unk_2CA--;
|
||||
phi_v1 = this->unk_2CA;
|
||||
}
|
||||
if (phi_v1 == 0) {
|
||||
func_80AE626C(this);
|
||||
this->unk_1D8 &= ~0x20;
|
||||
this->unk_1D8 |= 0x10;
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (this->unk_1D8 & 0x10) {
|
||||
this->unk_1D8 &= ~0x10;
|
||||
this->unk_2BA = 0;
|
||||
this->unk_2BC = 0;
|
||||
this->unk_2CA = 20;
|
||||
return;
|
||||
}
|
||||
if (this->unk_2CA == 0) {
|
||||
phi_v1_2 = 0;
|
||||
} else {
|
||||
this->unk_2CA--;
|
||||
phi_v1_2 = this->unk_2CA;
|
||||
}
|
||||
if (phi_v1_2 == 0) {
|
||||
this->unk_1D8 |= 0x20;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE68F0.s")
|
||||
void func_80AE6488(EnShn* this, GlobalContext* globalCtx) {
|
||||
Player* player = GET_PLAYER(globalCtx);
|
||||
s32 tempMsgState;
|
||||
f32 phi_f0_2;
|
||||
f32 phi_f0;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE69E8.s")
|
||||
tempMsgState = Message_GetState(&globalCtx->msgCtx);
|
||||
this->unk_2D4 += (this->unk_2D0 != 0.0f) ? 40.0f : -40.0f;
|
||||
this->unk_2D4 = CLAMP(this->unk_2D4, 0.0f, 80.0f);
|
||||
Matrix_InsertTranslation(this->unk_2D4, 0.0f, 0.0f, 1);
|
||||
if ((&this->actor == player->targetActor) &&
|
||||
((globalCtx->msgCtx.unk11F04 < 0xFF) || (globalCtx->msgCtx.unk11F04 >= 0x201)) && (tempMsgState == 3) &&
|
||||
(this->msgState == 3)) {
|
||||
if (globalCtx->state.frames % 2 == 0) {
|
||||
if (this->unk_2D0 != 0.0f) {
|
||||
this->unk_2D0 = 0.0f;
|
||||
} else {
|
||||
this->unk_2D0 = 1.0f;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
this->unk_2D0 = 0.0f;
|
||||
}
|
||||
this->msgState = tempMsgState;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE6A64.s")
|
||||
s32 func_80AE65F4(EnShn* this, GlobalContext* globalCtx) {
|
||||
Player* player = GET_PLAYER(globalCtx);
|
||||
u16 temp = globalCtx->msgCtx.unk11F04;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/EnShn_Init.s")
|
||||
if (player->stateFlags1 & 0x40) {
|
||||
if (this->unk_1DA != temp) {
|
||||
if ((this->unk_1D8 & 0x80) || (this->unk_1D8 & 0x100)) {
|
||||
this->unk_1D8 |= 8;
|
||||
func_80AE615C(this, 1);
|
||||
}
|
||||
if (temp == 0x9C5) {
|
||||
if (1) {}
|
||||
this->unk_1D8 |= 8;
|
||||
func_80AE615C(this, 1);
|
||||
}
|
||||
}
|
||||
this->unk_1DA = temp;
|
||||
this->unk_1D8 |= 0x40;
|
||||
} else if (this->unk_1D8 & 0x40) {
|
||||
if (!(gSaveContext.weekEventReg[23] & 8)) {
|
||||
func_80AE615C(this, 3);
|
||||
}
|
||||
this->unk_1DA = 0;
|
||||
this->unk_1D8 &= ~0x40;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/EnShn_Destroy.s")
|
||||
s32 func_80AE6704(EnShn* thisx, GlobalContext* globalCtx) {
|
||||
EnShn* this = THIS;
|
||||
s32 ret = 0;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/EnShn_Update.s")
|
||||
switch (this->unk_2C6) {
|
||||
case 0:
|
||||
if (!CHECK_QUEST_ITEM(QUEST_UNK_19)) {
|
||||
this->unk_2C6 = 6;
|
||||
ret = 1;
|
||||
} else {
|
||||
this->unk_2C6++;
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
case 2:
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
if (func_8013A4C4(D_80AE7258[this->unk_2C6])) {
|
||||
this->unk_2C6 = 6;
|
||||
ret = 1;
|
||||
REMOVE_QUEST_ITEM(QUEST_UNK_19);
|
||||
} else {
|
||||
this->unk_2C6++;
|
||||
}
|
||||
break;
|
||||
case 6:
|
||||
gSaveContext.weekEventReg[90] &= (u8)~0x40;
|
||||
func_800B7298(globalCtx, &this->actor, 7);
|
||||
globalCtx->nextEntranceIndex = 0x8460;
|
||||
gSaveContext.nextCutsceneIndex = 0;
|
||||
globalCtx->sceneLoadFlag = 0x14;
|
||||
globalCtx->unk_1887F = 3;
|
||||
gSaveContext.nextTransition = 7;
|
||||
this->unk_2C6++;
|
||||
break;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE6CF0.s")
|
||||
UNK_TYPE* func_80AE6880(EnShn* this, GlobalContext* globalCtx) {
|
||||
if (this->unk_2BE != 0) {
|
||||
return D_80AE70B0;
|
||||
}
|
||||
if (this->unk_1D8 & 0x80) {
|
||||
this->unk_2D8 = func_80AE6704;
|
||||
return D_80AE70B8;
|
||||
}
|
||||
if (this->unk_1D8 & 0x100) {
|
||||
return D_80AE71C4;
|
||||
}
|
||||
this->unk_2D8 = func_80AE6704;
|
||||
return D_80AE6F00;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE6D40.s")
|
||||
s32 func_80AE68F0(EnShn* this, GlobalContext* globalCtx) {
|
||||
Player* player = GET_PLAYER(globalCtx);
|
||||
s32 ret = 0;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/func_80AE6D90.s")
|
||||
if (this->unk_1D8 & 7) {
|
||||
if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
|
||||
this->unk_1D8 &= ~0x180;
|
||||
if (player->exchangeItemId == EXCH_ITEM_13) {
|
||||
this->unk_1D8 |= 0x80;
|
||||
this->unk_2E4 = player->exchangeItemId;
|
||||
} else if (player->exchangeItemId != EXCH_ITEM_NONE) {
|
||||
this->unk_1D8 |= 0x100;
|
||||
this->unk_2E4 = player->exchangeItemId;
|
||||
}
|
||||
SubS_UpdateFlags(&this->unk_1D8, 0, 7);
|
||||
this->unk_1DC = func_80AE6880(this, globalCtx);
|
||||
this->unk_2C6 = 0;
|
||||
if (gSaveContext.weekEventReg[23] & 8) {
|
||||
this->unk_1D8 |= 8;
|
||||
}
|
||||
this->actionFunc = func_80AE6A64;
|
||||
ret = 1;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Shn/EnShn_Draw.s")
|
||||
void func_80AE69E8(EnShn* this, GlobalContext* globalCtx) {
|
||||
Math_ApproachS(&this->actor.shape.rot.y, this->actor.world.rot.y, 3, 0x2AA8);
|
||||
if ((gSaveContext.weekEventReg[23] & 8) && EnShn_IsFacingPlayer(this)) {
|
||||
this->unk_1D8 |= 8;
|
||||
} else {
|
||||
this->unk_1D8 &= ~0x8;
|
||||
}
|
||||
}
|
||||
|
||||
void func_80AE6A64(EnShn* this, GlobalContext* globalCtx) {
|
||||
s16 yawBetweenActors;
|
||||
Vec3f playerPos;
|
||||
Vec3f shnPos;
|
||||
|
||||
if (func_8010BF58(&this->actor, globalCtx, this->unk_1DC, this->unk_2D8, &this->unk_1E0)) {
|
||||
SubS_UpdateFlags(&this->unk_1D8, 3, 7);
|
||||
this->unk_1D8 &= ~8;
|
||||
this->unk_1D8 |= 0x20;
|
||||
this->unk_2CA = 20;
|
||||
this->unk_1E0 = 0;
|
||||
this->unk_2BE = 0;
|
||||
this->actionFunc = func_80AE69E8;
|
||||
} else if (this->shnPlayerRef != 0) {
|
||||
Math_Vec3f_Copy(&playerPos, &this->shnPlayerRef->actor.world.pos);
|
||||
Math_Vec3f_Copy(&shnPos, &this->actor.world.pos);
|
||||
yawBetweenActors = Math_Vec3f_Yaw(&shnPos, &playerPos);
|
||||
Math_ApproachS(&this->actor.shape.rot.y, yawBetweenActors, 4, 0x2AA8);
|
||||
}
|
||||
}
|
||||
|
||||
void EnShn_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnShn* this = THIS;
|
||||
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
|
||||
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gObjectShnSkel, NULL, this->jointTable, this->morphTable,
|
||||
OBJECT_SHN_LIMB_MAX);
|
||||
this->unk_2E8 = -1;
|
||||
if (gSaveContext.weekEventReg[23] & 8) {
|
||||
func_80AE615C(this, 0);
|
||||
} else {
|
||||
func_80AE615C(this, 2);
|
||||
}
|
||||
this->actor.targetMode = 6;
|
||||
Actor_SetScale(&this->actor, 0.01f);
|
||||
this->unk_2E0 = 0;
|
||||
this->unk_2D8 = 0;
|
||||
this->unk_1D8 = 0;
|
||||
if (gSaveContext.entranceIndex != 0xA820) {
|
||||
SubS_UpdateFlags(&this->unk_1D8, 3, 7);
|
||||
this->unk_2BE = 0;
|
||||
} else {
|
||||
SubS_UpdateFlags(&this->unk_1D8, 4, 7);
|
||||
this->unk_2BE = 1;
|
||||
}
|
||||
this->actionFunc = func_80AE69E8;
|
||||
}
|
||||
|
||||
void EnShn_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
void EnShn_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnShn* this = THIS;
|
||||
|
||||
func_80AE68F0(this, globalCtx);
|
||||
this->actionFunc(this, globalCtx);
|
||||
func_80AE65F4(this, globalCtx);
|
||||
func_80AE6130(this);
|
||||
func_80AE63A8(this, globalCtx);
|
||||
this->unk_2E0 = 0;
|
||||
func_8013C964(&this->actor, globalCtx, 120.0f, 40.0f, 0, this->unk_1D8 & 7);
|
||||
}
|
||||
|
||||
s32 EnShn_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
|
||||
EnShn* this = THIS;
|
||||
|
||||
if (limbIndex == OBJECT_SHN_LIMB_HEAD) {
|
||||
func_80AE6488(this, globalCtx);
|
||||
*dList = gObjectShnSwampGuideHead;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
Vec3f D_80AE7270 = { 1200.0f, 0.0f, 0.0f };
|
||||
void EnShn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
|
||||
if (limbIndex == OBJECT_SHN_LIMB_HEAD) {
|
||||
Matrix_MultiplyVector3fByState(&D_80AE7270, &thisx->focus.pos);
|
||||
Math_Vec3s_Copy(&thisx->focus.rot, &thisx->world.rot);
|
||||
}
|
||||
}
|
||||
|
||||
void EnShn_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thisx) {
|
||||
EnShn* this = THIS;
|
||||
s32 phi_v0;
|
||||
s32 phi_v1;
|
||||
|
||||
if (!(this->unk_1D8 & 0x20)) {
|
||||
if (this->unk_1D8 & 0x10) {
|
||||
phi_v1 = 1;
|
||||
} else {
|
||||
phi_v1 = 0;
|
||||
}
|
||||
phi_v0 = 1;
|
||||
} else {
|
||||
phi_v1 = 0;
|
||||
phi_v0 = 0;
|
||||
}
|
||||
|
||||
if (limbIndex == OBJECT_SHN_LIMB_HEAD) {
|
||||
func_8013AD9C((this->unk_2BA + 0x4000), (this->unk_2BC + this->actor.shape.rot.y + 0x4000), &this->unk_1E8,
|
||||
&this->unk_1F4, phi_v0, phi_v1);
|
||||
Matrix_StatePop();
|
||||
Matrix_InsertTranslation(this->unk_1E8.x, this->unk_1E8.y, this->unk_1E8.z, 0);
|
||||
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, 1);
|
||||
Matrix_RotateY(this->unk_1F4.y, 1);
|
||||
Matrix_InsertXRotation_s(this->unk_1F4.x, 1);
|
||||
Matrix_InsertZRotation_s(this->unk_1F4.z, 1);
|
||||
Matrix_StatePush();
|
||||
}
|
||||
}
|
||||
|
||||
void EnShn_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnShn* this = THIS;
|
||||
|
||||
func_8012C5B0(globalCtx->state.gfxCtx);
|
||||
SkelAnime_DrawTransformFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
|
||||
this->skelAnime.dListCount, EnShn_OverrideLimbDraw, EnShn_PostLimbDraw,
|
||||
EnShn_TransformLimbDraw, &this->actor);
|
||||
}
|
||||
|
||||
@ -2,15 +2,44 @@
|
||||
#define Z_EN_SHN_H
|
||||
|
||||
#include "global.h"
|
||||
#include "objects/object_shn/object_shn.h"
|
||||
|
||||
struct EnShn;
|
||||
|
||||
typedef void (*EnShnActionFunc)(struct EnShn*, GlobalContext*);
|
||||
|
||||
typedef struct EnShn {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x0144 */ EnShnActionFunc actionFunc;
|
||||
/* 0x0148 */ char unk_148[0x1A8];
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ EnShnActionFunc actionFunc;
|
||||
/* 0x148 */ SkelAnime skelAnime;
|
||||
/* 0x18C */ UNK_TYPE1 pad_18C[0x4C];
|
||||
/* 0x1D8 */ u16 unk_1D8;
|
||||
/* 0x1DA */ u16 unk_1DA;
|
||||
/* 0x1DC */ UNK_TYPE* unk_1DC;
|
||||
/* 0x1E0 */ s32 unk_1E0;
|
||||
/* 0x1E4 */ Player* shnPlayerRef;
|
||||
/* 0x1E8 */ Vec3f unk_1E8;
|
||||
/* 0x1F4 */ Vec3s unk_1F4;
|
||||
/* 0x1FA */ Vec3s jointTable[OBJECT_SHN_LIMB_MAX];
|
||||
/* 0x25A */ Vec3s morphTable[OBJECT_SHN_LIMB_MAX];
|
||||
/* 0x2BA */ s16 unk_2BA;
|
||||
/* 0x2BC */ s16 unk_2BC;
|
||||
/* 0x2BE */ s16 unk_2BE;
|
||||
/* 0x2C0 */ s16 unk_2C0;
|
||||
/* 0x2C2 */ s16 unk_2C2;
|
||||
/* 0x2C4 */ s16 unk_2C4;
|
||||
/* 0x2C6 */ s16 unk_2C6;
|
||||
/* 0x2C8 */ s16 unk_2C8;
|
||||
/* 0x2CA */ s16 unk_2CA;
|
||||
/* 0x2CC */ f32 playSpeed;
|
||||
/* 0x2D0 */ f32 unk_2D0;
|
||||
/* 0x2D4 */ f32 unk_2D4;
|
||||
/* 0x2D8 */ s32 unk_2D8;
|
||||
/* 0x2DC */ s32 msgState;
|
||||
/* 0x2E0 */ s32 unk_2E0;
|
||||
/* 0x2E4 */ s32 unk_2E4;
|
||||
/* 0x2E8 */ s32 unk_2E8;
|
||||
/* 0x2EC */ s32 unk_2EC;
|
||||
} EnShn; // size = 0x2F0
|
||||
|
||||
extern const ActorInit En_Shn_InitVars;
|
||||
|
||||
@ -132,11 +132,11 @@ void EnSyatekiMan_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
this->actor.targetMode = 1;
|
||||
Actor_SetScale(&this->actor, 0.01f);
|
||||
if (globalCtx->sceneNum == SCENE_SYATEKI_MORI) {
|
||||
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_shn_Skel_00E7D0, &object_shn_Anim_00DFEC,
|
||||
this->jointTable, this->morphTable, 16);
|
||||
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gObjectShnSkel, &object_shn_Anim_00DFEC, this->jointTable,
|
||||
this->morphTable, OBJECT_SHN_LIMB_MAX);
|
||||
} else {
|
||||
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_shn_Skel_00E7D0, &object_shn_Anim_00D9D0,
|
||||
this->jointTable, this->morphTable, 16);
|
||||
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gObjectShnSkel, &object_shn_Anim_00D9D0, this->jointTable,
|
||||
this->morphTable, OBJECT_SHN_LIMB_MAX);
|
||||
}
|
||||
|
||||
this->actor.colChkInfo.cylRadius = 100;
|
||||
|
||||
@ -12461,8 +12461,8 @@
|
||||
0x80AE5990:("EnFsn_Draw",),
|
||||
0x80AE6130:("func_80AE6130",),
|
||||
0x80AE615C:("func_80AE615C",),
|
||||
0x80AE61C0:("func_80AE61C0",),
|
||||
0x80AE625C:("func_80AE625C",),
|
||||
0x80AE61C0:("EnShn_IsFacingPlayer",),
|
||||
0x80AE625C:("EnShn_GetPlayer",),
|
||||
0x80AE626C:("func_80AE626C",),
|
||||
0x80AE63A8:("func_80AE63A8",),
|
||||
0x80AE6488:("func_80AE6488",),
|
||||
@ -12475,9 +12475,9 @@
|
||||
0x80AE6B30:("EnShn_Init",),
|
||||
0x80AE6C4C:("EnShn_Destroy",),
|
||||
0x80AE6C5C:("EnShn_Update",),
|
||||
0x80AE6CF0:("func_80AE6CF0",),
|
||||
0x80AE6D40:("func_80AE6D40",),
|
||||
0x80AE6D90:("func_80AE6D90",),
|
||||
0x80AE6CF0:("EnShn_OverrideLimbDraw",),
|
||||
0x80AE6D40:("EnShn_PostLimbDraw",),
|
||||
0x80AE6D90:("EnShn_TransformLimbDraw",),
|
||||
0x80AE6E8C:("EnShn_Draw",),
|
||||
0x80AE73A0:("EnStopheishi_Init",),
|
||||
0x80AE74E0:("EnStopheishi_Destroy",),
|
||||
|
||||
@ -1713,11 +1713,6 @@ D_0600D8D8 = 0x0600D8D8;
|
||||
D_060000F0 = 0x060000F0;
|
||||
D_060010C0 = 0x060010C0;
|
||||
|
||||
// ovl_En_Shn
|
||||
|
||||
D_0600B738 = 0x0600B738;
|
||||
D_0600E7D0 = 0x0600E7D0;
|
||||
|
||||
// ovl_En_Slime
|
||||
|
||||
D_060004C0 = 0x060004C0;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user