falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`ovl_En_Ma4` matched and mostly documented (#199) 

* First pass

* limbdraw

* another one

* lots of stuff

* stuff

* big one

* func_80ABEB6C

* The NON_MATCHING that matches in reality

* "Fix" some cases

* Fix merge issues

* fix func_80ABF254

* match a pair

* func_80ABF7C8

* func_80ABE1C4

* func_80ABF354

* func_80ABF534

* Import data

* Limb fixes

* Minor renames

* Fix merge issues

* A few renames

* Rename half the functions

* More renames

* More renaming

* documentation finished

* Format

* fix typo

* whoops

* Fix merge issues

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update variables names

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
This commit is contained in:
Anghelo Carvajal 2021-07-13 21:49:05 -04:00 committed by GitHub
parent 5453731f4e
commit 5fcd494a7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 1246 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/functions.h
View File

@ -1617,7 +1617,7 @@ void func_800EDE34(Actor* actor, GlobalContext* globalCtx, s32 param_3);
void func_800EDF24(Actor* actor, GlobalContext* globalCtx, u32 arg2);
void func_800EDF78(Actor* actor, GlobalContext* globalCtx, s32 iParm3);
void func_800EE0CC(Actor* actor, GlobalContext* globalCtx, s32 iParm3);
// void func_800EE1D8(void);
s32 func_800EE1D8(GlobalContext* globalCtx);
u32 func_800EE200(GlobalContext* globalCtx, u32 uParm2);
u32 func_800EE29C(GlobalContext* globalCtx, u32 uParm2);
u32 func_800EE2F4(GlobalContext* globalCtx);
@ -2133,7 +2133,7 @@ f32 func_8010C36C(f32 a, f32 b);
// void func_8010DE38(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
// void func_8010E028(void);
// void func_8010E968(void);
// void func_8010E9F0(void);
void func_8010E9F0(s16 arg0, s16 arg1);
// void func_8010EA9C(void);
// void func_8010EB50(void);
// void func_8010EBA0(void);
@ -2146,7 +2146,7 @@ void Interface_ChangeAlpha(u16 param_1);
// void func_80110038(void);
// void func_80111CB4(void);
// void func_801129E4(void);
// void func_80112AFC(void);
void func_80112AFC(GlobalContext* globalCtx);
// void func_80112B40(void);
// void func_80112BE4(void);
// void func_80112C0C(void);
@ -3856,7 +3856,7 @@ void func_8019F128(u16 sfxId);
// void func_8019F170(void);
void func_8019F1C0(Vec3f* pos, u16 sfxId);
void func_8019F208(void);
void func_8019F230(void);
void func_8019F230(void); // Plays "No" sound
// void func_8019F258(void);
// void func_8019F300(void);
// void func_8019F420(void);
@ -4027,7 +4027,7 @@ void func_801A7794(u32 param_1, u32 param_2, u32 param_3);
// void func_801A7B10(void);
// void func_801A7D04(void);
// void func_801A7D84(void);
// void func_801A89A8(UNK_TYPE arg0);
void func_801A89A8(s32 arg0);
// void func_801A89D0(void);
s32 func_801A8A50(s32 param1);
// void func_801A8ABC(void);

2
include/sfx.h
View File

@ -1055,7 +1055,7 @@
#define NA_SE_EV_ZORA_KIDS_SWIM_2 0x29BC
#define NA_SE_EV_DARUMA_VANISH 0x29BD
#define NA_SE_EV_IKANA_SOUL_TRANSFORM 0x29BE
#define NA_SE_EV_ROMANY_BOW_FLICK 0x29BF
#define NA_SE_EV_ROMANI_BOW_FLICK 0x29BF
#define NA_SE_EV_WHITE_FAIRY_SHOT_DASH 0x29C0
#define NA_SE_EV_BLACK_FAIRY_SHOT_DASH 0x29C1
#define NA_SE_EV_SWORD_FORGE 0x29C2

20
include/z64.h
View File

@ -749,8 +749,8 @@ typedef struct {
/* 0x220 */ s16 unk_220;
/* 0x222 */ s16 unk_222;
/* 0x224 */ s16 unk_224;
/* 0x226 */ s16 unk_226;
/* 0x228 */ s16 unk_228;
/* 0x226 */ s16 lifeColorChange;
/* 0x228 */ s16 lifeColorChangeDirection;
/* 0x22A */ s16 beatingHeartPrim[3];
/* 0x230 */ s16 beatingHeartEnv[3];
/* 0x236 */ s16 heartsPrimR[2];
@ -761,8 +761,8 @@ typedef struct {
/* 0x24A */ s16 heartsEnvB[2];
/* 0x24E */ s16 unk_24E;
/* 0x250 */ s16 unk_250;
/* 0x252 */ s16 unk_252;
/* 0x254 */ s16 beatingHeartState; // 1 means shrinking, 0 growing
/* 0x252 */ s16 lifeSizeChange;
/* 0x254 */ s16 lifeSizeChangeDirection; // 1 means shrinking, 0 growing
/* 0x256 */ s16 unk_256;
/* 0x258 */ s16 unk_258;
/* 0x25A */ u8 numHorseBoosts;
@ -986,7 +986,11 @@ typedef struct {
/* 0x12070 */ UNK_TYPE1 pad12070[0x8];
/* 0x12078 */ s32 bankRupeesSelected;
/* 0x1207C */ s32 bankRupees;
/* 0x12080 */ UNK_TYPE1 pad12080[0x60];
/* 0x12080 */ UNK_TYPE1 pad12080[0x30];
/* 0x120B0 */ UNK_TYPE1 pad120B0[0x1];
/* 0x120B1 */ u8 unk_120B1;
/* 0x120B2 */ UNK_TYPE1 pad120B2[0x2];
/* 0x120B4 */ UNK_TYPE1 pad120B4[0x2C];
} MessageContext; // size = 0x120E0
typedef struct ActorBgMbarChair ActorBgMbarChair;
@ -1576,7 +1580,11 @@ struct ActorContext {
/* 0x250 */ void* unk250; // allocation of 0x20f0 bytes?
/* 0x254 */ u32 unk254[5];
/* 0x268 */ u8 unk268;
/* 0x269 */ UNK_TYPE1 pad269[0x1B];
/* 0x269 */ UNK_TYPE1 pad269[0x3];
/* 0x26C */ UNK_TYPE1 pad26C[0xC];
/* 0x278 */ u16 unk278;
/* 0x27A */ UNK_TYPE1 pad27A[0x2];
/* 0x27C */ UNK_TYPE1 pad27C[0x8];
}; // size = 0x284
typedef struct {

2
include/z64actor.h
View File

@ -39,7 +39,7 @@ typedef struct {
/* 0x04 */ s16 cylHeight;
/* 0x06 */ s16 cylYShift;
/* 0x08 */ u8 mass;
} CollisionCheckInfoInit2;
} CollisionCheckInfoInit2; // size = 0xC
typedef struct {
/* 0x00 */ DamageTable* damageTable;

4
linker_scripts/code_script.txt
View File

@ -5618,9 +5618,9 @@ SECTIONS
ovl_En_Ma4 : AT(RomLocation)
{
build/src/overlays/actors/ovl_En_Ma4/z_en_ma4.o(.text)
build/asm/overlays/ovl_En_Ma4_data.o(.data)
build/src/overlays/actors/ovl_En_Ma4/z_en_ma4.o(.data)
build/src/overlays/actors/ovl_En_Ma4/z_en_ma4.o(.rodata)
build/asm/overlays/ovl_En_Ma4_rodata.o(.rodata)
build/src/overlays/actors/ovl_En_Ma4/z_en_ma4_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;

26
linker_scripts/object_script.txt
View File

@ -437,6 +437,32 @@ D_04048DF0 = 0x04048DF0;
D_04057B10 = 0x04057B10;
D_04089070 = 0x04089070;
/* z_en_ma4 */
D_060003B0 = 0x060003B0;
D_06007328 = 0x06007328;
D_06002A8C = 0x06002A8C;
D_06015B7C = 0x06015B7C;
D_06013928 = 0x06013928;
D_0600FFC8 = 0x0600FFC8;
D_060107C8 = 0x060107C8;
D_06010FC8 = 0x06010FC8;
D_060117C8 = 0x060117C8;
D_06011FC8 = 0x06011FC8;
D_060127C8 = 0x060127C8;
D_06012BC8 = 0x06012BC8;
D_06012FC8 = 0x06012FC8;
D_060133C8 = 0x060133C8;
D_06009E58 = 0x06009E58;
D_06002A8C = 0x06002A8C;
D_06018948 = 0x06018948;
D_0601B76C = 0x0601B76C;
D_06007328 = 0x06007328;
D_06014088 = 0x06014088;
D_06015B7C = 0x06015B7C;
D_06007D98 = 0x06007D98;
D_0600852C = 0x0600852C;
D_06008F6C = 0x06008F6C;
/* z_en_toto */
D_06000C80 = 0x06000C80;
D_06001324 = 0x06001324;

2
src/code/z_scene.c
View File

@ -316,7 +316,7 @@ void Scene_HeaderCmdLightList(GlobalContext* globalCtx, SceneCmd* cmd) {
// SceneTableEntry Header Command 0x0D: Path List
void Scene_HeaderCmdPathList(GlobalContext* globalCtx, SceneCmd* cmd) {
globalCtx->setupPathList = (void*)Lib_SegmentedToVirtual(cmd->pathList.segment);
globalCtx->setupPathList = (Path*)Lib_SegmentedToVirtual(cmd->pathList.segment);
}
// SceneTableEntry Header Command 0x0E: Transition Actor List

2
src/code/z_vr_box.c
View File

@ -39,7 +39,7 @@ void func_80143148(SkyboxContext* skyboxCtx, s32 arg1) {
#ifdef NON_MATCHING
// Matches besides rodata, since rodata is not merged into the asm in code files yet.
void func_801431E8(GameState* gamestate, SkyboxContext* skyboxCtx, s16 skyType) {
GlobalContext* globalCtx = (GlobalContext*)state;
GlobalContext* globalCtx = (GlobalContext*)gamestate;
u32 size;
void* offset;
s32 pad;

1084
src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
View File

File diff suppressed because it is too large Load Diff

30
src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
View File

@ -2,15 +2,37 @@
#define Z_EN_MA4_H
#include <global.h>
#include "overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h"
struct EnMa4;
typedef void (*EnMa4ActionFunc)(struct EnMa4*, GlobalContext*);
typedef struct EnMa4 {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x1F4];
/* 0x338 */ s16 unk338; // modified by EnPoFusen
/* 0x33A */ char unk33A[0x6];
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ EnMa4ActionFunc actionFunc;
/* 0x18C */ ColliderCylinder collider;
/* 0x1D8 */ struct_800BD888_arg1 unk_1D8;
/* 0x200 */ Vec3s* pathPoints;
/* 0x204 */ Vec3s limbDrawTable[MA1_LIMB_MAX];
/* 0x28E */ UNK_TYPE1 unk28E[0x6];
/* 0x294 */ Vec3s transitionDrawTable[MA1_LIMB_MAX];
/* 0x31E */ UNK_TYPE1 unk31E[0x6];
/* 0x324 */ s16 pathIndex;
/* 0x326 */ s16 pathPointsCount;
/* 0x328 */ UNK_TYPE1 unk_328[0x2];
/* 0x32A */ s16 blinkTimer;
/* 0x33C */ s16 overrideEyeTexIndex;
/* 0x32E */ s16 eyeTexIndex;
/* 0x330 */ s16 mouthTexIndex;
/* 0x332 */ s16 type;
/* 0x334 */ u16 unk_334; // set but not used
/* 0x336 */ s16 state;
/* 0x338 */ s16 poppedBalloonCounter; // modified by EnPoFusen
/* 0x33A */ s16 hasBow;
/* 0x33C */ s16 animTimer;
/* 0x33E */ u16 textId;
} EnMa4; // size = 0x340
extern const ActorInit En_Ma4_InitVars;

79
src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
View File

@ -1,6 +1,6 @@
/*
* File: z_en_ma_yto.c
* Overlay: ovl_En_Ma_Yto
* File: z_en_ma_yts.c
* Overlay: ovl_En_Ma_Yts
* Description: Romani. As oposed as EnMa4, this actor is used in conjunction of another actor, like EnMaYto.
*/
@ -111,17 +111,26 @@ static CollisionCheckInfoInit2 sColChkInfoInit2 = {
0, 0, 0, 0, MASS_IMMOVABLE,
};
static struct_80B8E1A8 D_80B8E1A8[] = {
{ &D_06009E58, 1.0f, 0, 0.0f }, { &D_06009E58, 1.0f, 0, -6.0f }, { &D_06018948, 1.0f, 2, 0.0f },
{ &D_06018948, 1.0f, 2, -6.0f }, { &D_0601B76C, 1.0f, 0, 0.0f }, { &D_0601B76C, 1.0f, 0, -6.0f },
{ &D_06007328, 1.0f, 0, 0.0f }, { &D_06007328, 1.0f, 0, -6.0f }, { &D_06014088, 1.0f, 0, 0.0f },
{ &D_06014088, 1.0f, 0, -6.0f }, { &D_06002A8C, 1.0f, 0, 0.0f }, { &D_06002A8C, 1.0f, 0, -6.0f },
{ &D_06015B7C, 1.0f, 0, 0.0f }, { &D_06015B7C, 1.0f, 0, -6.0f }, { &D_06007D98, 1.0f, 0, 0.0f },
{ &D_06007D98, 1.0f, 0, -6.0f }, { &D_0600852C, 1.0f, 0, 0.0f }, { &D_0600852C, 1.0f, 0, -6.0f },
{ &D_06008F6C, 1.0f, 0, 0.0f }, { &D_06008F6C, 1.0f, 0, -6.0f }, { &D_060180DC, 1.0f, 2, 0.0f },
{ &D_060180DC, 1.0f, 2, -6.0f },
static struct_80B8E1A8 sAnimationInfo[] = {
{ &D_06009E58, 1.0f, 0, 0.0f }, { &D_06009E58, 1.0f, 0, -6.0f }, // Idle anim
{ &D_06018948, 1.0f, 2, 0.0f }, { &D_06018948, 1.0f, 2, -6.0f }, // Starts holding hands anim
{ &D_0601B76C, 1.0f, 0, 0.0f }, { &D_0601B76C, 1.0f, 0, -6.0f }, // Holnding hands anim
{ &D_06007328, 1.0f, 0, 0.0f }, { &D_06007328, 1.0f, 0, -6.0f }, // Walking anim
{ &D_06014088, 1.0f, 0, 0.0f }, { &D_06014088, 1.0f, 0, -6.0f }, //
{ &D_06002A8C, 1.0f, 0, 0.0f }, { &D_06002A8C, 1.0f, 0, -6.0f }, // Looking around anim
{ &D_06015B7C, 1.0f, 0, 0.0f }, { &D_06015B7C, 1.0f, 0, -6.0f }, // Shoot arrow anim
{ &D_06007D98, 1.0f, 0, 0.0f }, { &D_06007D98, 1.0f, 0, -6.0f }, // Sitting anim
{ &D_0600852C, 1.0f, 0, 0.0f }, { &D_0600852C, 1.0f, 0, -6.0f }, // Sitting traumatized anim
{ &D_06008F6C, 1.0f, 0, 0.0f }, { &D_06008F6C, 1.0f, 0, -6.0f }, // Sitting sad anim
{ &D_060180DC, 1.0f, 2, 0.0f }, { &D_060180DC, 1.0f, 2, -6.0f }, // Turns around anim
};
void EnMaYts_ChangeAnim(EnMaYts* this, s32 index) {
SkelAnime_ChangeAnim(&this->skelAnime, sAnimationInfo[index].animationSeg, 1.0f, 0.0f,
SkelAnime_GetFrameCount(&sAnimationInfo[index].animationSeg->common),
sAnimationInfo[index].mode, sAnimationInfo[index].transitionRate);
}
static void* sMouthTextures[] = {
D_060127C8,
D_06012BC8,
@ -133,14 +142,6 @@ static void* sEyeTextures[] = {
D_0600FFC8, D_060107C8, D_06010FC8, D_060117C8, D_06011FC8,
};
static u16 D_80B8E32C = 99;
void EnMaYts_ChangeAnim(EnMaYts* this, s32 index) {
SkelAnime_ChangeAnim(&this->skelAnime, D_80B8E1A8[index].animationSeg, 1.0f, 0.0f,
SkelAnime_GetFrameCount(&D_80B8E1A8[index].animationSeg->common), D_80B8E1A8[index].mode,
D_80B8E1A8[index].transitionRate);
}
void func_80B8D12C(EnMaYts* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
s16 flag = this->unk_32C == 2 ? true : false;
@ -158,12 +159,12 @@ void func_80B8D12C(EnMaYts* this, GlobalContext* globalCtx) {
void EnMaYts_InitAnimation(EnMaYts* this, GlobalContext* globalCtx) {
switch (this->type) {
case EN_NA_YTS_TYPE_BARN:
case MA_YTS_TYPE_BARN:
this->actor.targetMode = 0;
EnMaYts_ChangeAnim(this, 0);
break;
case EN_NA_YTS_TYPE_SITTING:
case MA_YTS_TYPE_SITTING:
this->actor.targetMode = 6;
// Day 1 or "Winning" the alien invasion
if (CURRENT_DAY == 1 || (gSaveContext.weekEventReg[0x16] & 1)) {
@ -173,13 +174,13 @@ void EnMaYts_InitAnimation(EnMaYts* this, GlobalContext* globalCtx) {
}
break;
case EN_NA_YTS_TYPE_SLEEPING:
case MA_YTS_TYPE_SLEEPING:
this->actor.targetMode = 0;
this->actor.draw = EnMaYts_DrawSleeping;
EnMaYts_ChangeAnim(this, 0);
break;
case EN_NA_YTS_TYPE_ENDCREDITS:
case MA_YTS_TYPE_ENDCREDITS:
this->actor.targetMode = 0;
EnMaYts_ChangeAnim(this, 0);
break;
@ -192,7 +193,7 @@ void EnMaYts_InitAnimation(EnMaYts* this, GlobalContext* globalCtx) {
s32 EnMaYts_CheckValidSpawn(EnMaYts* this, GlobalContext* globalCtx) {
switch (this->type) {
case EN_NA_YTS_TYPE_SITTING:
case MA_YTS_TYPE_SITTING:
switch (CURRENT_DAY) {
case 1:
break;
@ -213,7 +214,7 @@ s32 EnMaYts_CheckValidSpawn(EnMaYts* this, GlobalContext* globalCtx) {
}
break;
case EN_NA_YTS_TYPE_BARN:
case MA_YTS_TYPE_BARN:
// Failing the alien invasion
if (!(gSaveContext.weekEventReg[0x16] & 1)) {
return false;
@ -222,14 +223,14 @@ s32 EnMaYts_CheckValidSpawn(EnMaYts* this, GlobalContext* globalCtx) {
}
break;
case EN_NA_YTS_TYPE_SLEEPING:
case MA_YTS_TYPE_SLEEPING:
// "Winning" the alien invasion
if (gSaveContext.weekEventReg[0x16] & 1) {
return false;
}
break;
case EN_NA_YTS_TYPE_ENDCREDITS:
case MA_YTS_TYPE_ENDCREDITS:
break;
}
@ -246,14 +247,14 @@ void EnMaYts_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, func_800B3FC0, 18.0f);
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06013928, NULL, this->limbDrawTbl, this->transitionDrawTbl,
OBJECT_MA1_LIMB_TABLE_COUNT);
MA1_LIMB_MAX);
EnMaYts_InitAnimation(this, globalCtx);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(0x16), &sColChkInfoInit2);
if (this->type == EN_NA_YTS_TYPE_SLEEPING) {
if (this->type == MA_YTS_TYPE_SLEEPING) {
this->collider.dim.radius = 40;
}
@ -264,7 +265,7 @@ void EnMaYts_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_200 = 0;
this->blinkTimer = 0;
if (this->type == EN_NA_YTS_TYPE_ENDCREDITS) {
if (this->type == MA_YTS_TYPE_ENDCREDITS) {
this->hasBow = true;
} else {
this->hasBow = false;
@ -282,7 +283,7 @@ void EnMaYts_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_32C = 2;
}
if (this->type == EN_NA_YTS_TYPE_ENDCREDITS) {
if (this->type == MA_YTS_TYPE_ENDCREDITS) {
this->overrideEyeTexIndex = 0;
this->eyeTexIndex = 0;
this->mouthTexIndex = 0;
@ -317,7 +318,7 @@ void EnMaYts_StartDialogue(EnMaYts* this, GlobalContext* globalCtx) {
s16 sp26 = this->actor.shape.rot.y - this->actor.yawTowardsPlayer;
if (func_800B84D0(&this->actor, globalCtx)) { // if (Actor_IsTalking)
if (!(gSaveContext.playerForm == 4)) { // PLAYER_FORM != HUMAN_FORM
if (!(gSaveContext.playerForm == PLAYER_FORM_HUMAN)) {
if (!(gSaveContext.weekEventReg[0x41] & 0x80)) {
// Saying to non-human Link: "Cremia went to town."
gSaveContext.weekEventReg[0x41] |= 0x80;
@ -399,11 +400,11 @@ void EnMaYts_SetupEndCreditsHandler(EnMaYts* this) {
this->actionFunc = EnMaYts_EndCreditsHandler;
}
static u16 D_80B8E32C = 99;
void EnMaYts_EndCreditsHandler(EnMaYts* this, GlobalContext* globalCtx) {
u32 actionIndex;
if (func_800EE29C(globalCtx, 0x78) != 0) {
actionIndex = func_800EE200(globalCtx, 0x78);
u32 actionIndex = func_800EE200(globalCtx, 0x78);
if (globalCtx->csCtx.frames == globalCtx->csCtx.npcActions[actionIndex]->startFrame) {
if (globalCtx->csCtx.npcActions[actionIndex]->unk0 != D_80B8E32C) {
D_80B8E32C = globalCtx->csCtx.npcActions[actionIndex]->unk0;
@ -526,13 +527,13 @@ s32 EnMaYts_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
EnMaYts* this = THIS;
Vec3s sp4;
if (limbIndex == OBJECT_MA1_LIMB_HAIR_TOP) {
if (limbIndex == MA1_LIMB_HEAD) {
sp4 = this->unk_1D8.unk_08;
rot->x += sp4.y;
if ((this->skelAnime.animCurrentSeg == &D_06009E58) || (this->skelAnime.animCurrentSeg == &D_06007D98)) {
rot->z += sp4.x;
}
} else if (limbIndex == OBJECT_MA1_LIMB_HEAD) {
} else if (limbIndex == MA1_LIMB_TORSO) {
sp4 = this->unk_1D8.unk_0E;
rot->x += sp4.y;
rot->z += sp4.x;
@ -544,9 +545,9 @@ s32 EnMaYts_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
void EnMaYts_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
EnMaYts* this = THIS;
if (limbIndex == OBJECT_MA1_LIMB_HAIR_TOP) {
if (limbIndex == MA1_LIMB_HEAD) {
SysMatrix_GetStateTranslation(&this->actor.focus.pos);
} else if (limbIndex == OBJECT_MA1_LIMB_ARM_RIGHT) {
} else if (limbIndex == MA1_LIMB_HAND_LEFT) {
if (this->hasBow == true) {
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, D_060003B0);

69
src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h
View File

@ -8,30 +8,31 @@ struct EnMaYts;
typedef void (*EnMaYtsActionFunc)(struct EnMaYts*, GlobalContext*);
// Limbs of OBJECT_MA1
#define OBJECT_MA1_LIMB_TABLE_COUNT 23
typedef enum {
/* 00 */ OBJECT_MA1_LIMB_00,
/* 01 */ OBJECT_MA1_LIMB_PELVIS,
/* 02 */ OBJECT_MA1_LIMB_TIGHT_LEFT,
/* 03 */ OBJECT_MA1_LIMB_LEG_LEFT,
/* 04 */ OBJECT_MA1_LIMB_FOOT_LEFT,
/* 05 */ OBJECT_MA1_LIMB_TIGHT_RIGHT,
/* 06 */ OBJECT_MA1_LIMB_LEG_RIGHT,
/* 07 */ OBJECT_MA1_LIMB_FOOT_RIGHT,
/* 08 */ OBJECT_MA1_LIMB_DRESS_0,
/* 09 */ OBJECT_MA1_LIMB_DRESS_1,
/* 10 */ OBJECT_MA1_LIMB_DRESS_2,
/* 11 */ OBJECT_MA1_LIMB_DRESS_3,
/* 12 */ OBJECT_MA1_LIMB_TORSO,
/* 13 */ OBJECT_MA1_LIMB_HEAD,
/* 14 */ OBJECT_MA1_LIMB_HAIR_TOP,
/* 15 */ OBJECT_MA1_LIMB_HAIR_BOTTOM,
/* 16 */ OBJECT_MA1_LIMB_ARM_LEFT,
/* 17 */ OBJECT_MA1_LIMB_FOREARM_LEFT,
/* 18 */ OBJECT_MA1_LIMB_HAND_LEFT,
/* 19 */ OBJECT_MA1_LIMB_ARM_RIGHT,
/* 20 */ OBJECT_MA1_LIMB_FOREARM_RIGHT,
/* 21 */ OBJECT_MA1_LIMB_HAND_RIGHT
/* 00 */ MA1_LIMB_NONE,
/* 01 */ MA1_LIMB_ROOT,
/* 02 */ MA1_LIMB_PELVIS,
/* 03 */ MA1_LIMB_TIGHT_LEFT,
/* 04 */ MA1_LIMB_LEG_LEFT,
/* 05 */ MA1_LIMB_FOOT_LEFT,
/* 06 */ MA1_LIMB_TIGHT_RIGHT,
/* 07 */ MA1_LIMB_LEG_RIGHT,
/* 08 */ MA1_LIMB_FOOT_RIGHT,
/* 09 */ MA1_LIMB_DRESS_0,
/* 00 */ MA1_LIMB_DRESS_1,
/* 11 */ MA1_LIMB_DRESS_2,
/* 12 */ MA1_LIMB_DRESS_3,
/* 13 */ MA1_LIMB_TORSO,
/* 14 */ MA1_LIMB_HEAD,
/* 15 */ MA1_LIMB_HAIR_TOP,
/* 16 */ MA1_LIMB_HAIR_BOTTOM,
/* 17 */ MA1_LIMB_ARM_LEFT,
/* 18 */ MA1_LIMB_FOREARM_LEFT,
/* 19 */ MA1_LIMB_HAND_LEFT,
/* 20 */ MA1_LIMB_ARM_RIGHT,
/* 21 */ MA1_LIMB_FOREARM_RIGHT,
/* 22 */ MA1_LIMB_HAND_RIGHT,
/* 23 */ MA1_LIMB_MAX
} ObjectMa1Limbs;
typedef struct EnMaYts {
@ -41,9 +42,9 @@ typedef struct EnMaYts {
/* 0x18C */ ColliderCylinder collider;
/* 0x1D8 */ struct_800BD888_arg1 unk_1D8;
/* 0x200 */ s32 unk_200; // Set, but not used
/* 0x204 */ Vec3s limbDrawTbl[OBJECT_MA1_LIMB_TABLE_COUNT];
/* 0x204 */ Vec3s limbDrawTbl[MA1_LIMB_MAX];
/* 0x28E */ char unk_28E[0x6];
/* 0x294 */ Vec3s transitionDrawTbl[OBJECT_MA1_LIMB_TABLE_COUNT];
/* 0x294 */ Vec3s transitionDrawTbl[MA1_LIMB_MAX];
/* 0x31E */ char unk_31E[0x8];
/* 0x326 */ s16 blinkTimer;
/* 0x328 */ s16 overrideEyeTexIndex; // If non-zero, then this index will be used instead of eyeTexIndex
@ -60,20 +61,20 @@ typedef struct EnMaYts {
extern const ActorInit En_Ma_Yts_InitVars;
typedef enum {
/* 0 */ EN_NA_YTS_TYPE_BARN,
/* 1 */ EN_NA_YTS_TYPE_SITTING,
/* 2 */ EN_NA_YTS_TYPE_SLEEPING,
/* 3 */ EN_NA_YTS_TYPE_ENDCREDITS
/* 0 */ MA_YTS_TYPE_BARN,
/* 1 */ MA_YTS_TYPE_SITTING,
/* 2 */ MA_YTS_TYPE_SLEEPING,
/* 3 */ MA_YTS_TYPE_ENDCREDITS
} EnMaYtsType;
#define EN_MA_YTS_PARSE_TYPE(actor) (((actor->params)&0xF000) >> 12)
#define EN_MA_YTS_PARSE_TYPE(actor) ((((actor)->params)&0xF000) >> 12)
#define EN_MA_YTS_PARAM(enMaYtsType) ((enMaYtsType) << 12)
/**
* EN_NA_YTS_TYPE_BARN: In the barn, accompanying Cremia. Cremia's actor will handle her dialogue if spoken to.
* EN_NA_YTS_TYPE_SITTING: Having dinner or looking after the ranch.
* EN_NA_YTS_TYPE_SLEEPING: Sleeping. Can be seen in the second night in her house if the player failed the alien invasion.
* EN_NA_YTS_TYPE_ENDCREDITS: Used in the end credits sequence.
* MA_YTS_TYPE_BARN: In the barn, accompanying Cremia. Cremia's actor will handle her dialogue if spoken to.
* MA_YTS_TYPE_SITTING: Having dinner or looking after the ranch.
* MA_YTS_TYPE_SLEEPING: Sleeping. Can be seen in the second night in her house if the player failed the alien invasion.
* MA_YTS_TYPE_ENDCREDITS: Used in the end credits sequence.
*/
#endif // Z_EN_MA_YTS_H

24
src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c
View File

@ -1,3 +1,9 @@
/*
* File: z_en_po_fusen.c
* Overlay: ovl_En_Po_Fusen
* Description: Romani Ranch - Poe Balloon
*/
#include "z_en_po_fusen.h"
#include "overlays/actors/ovl_En_Ma4/z_en_ma4.h"
@ -66,7 +72,7 @@ void EnPoFusen_Init(Actor* thisx, GlobalContext* globalCtx) {
EnPoFusen* this = THIS;
f32 heightTemp;
this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 0.00700000021607;
this->actor.scale.x = this->actor.scale.y = this->actor.scale.z = 0.007f;
this->actor.targetMode = 6;
this->actor.colChkInfo.damageTable = &sDamageTable;
@ -133,7 +139,7 @@ u16 EnPoFusen_CheckParent(EnPoFusen* this, GlobalContext* globalCtx) {
}
u16 EnPoFusen_CheckCollision(EnPoFusen* this, GlobalContext* globalCtx) {
if ((u32)this->actionFunc == (u32)EnPoFusen_IdleFuse) {
if (this->actionFunc == EnPoFusen_IdleFuse) {
return 0;
}
@ -191,13 +197,13 @@ void EnPoFusen_Idle(EnPoFusen* this, GlobalContext* globalCtx) {
this->actor.shape.shadowAlpha = (shadowAlphaTmp > f255) ? (u8)f255 : (u8)shadowAlphaTmp;
}
void EnPoFusen_IncrementMalonPop(EnPoFusen* this) {
void EnPoFusen_IncrementRomaniPop(EnPoFusen* this) {
Actor* parent = this->actor.parent;
EnMa4* romani;
if ((parent != 0) && (parent->id == ACTOR_EN_MA4)) {
if ((parent != NULL) && (parent->id == ACTOR_EN_MA4)) {
romani = (EnMa4*)parent;
romani->unk338++;
romani->poppedBalloonCounter++;
}
this->actor.draw = NULL;
@ -222,7 +228,7 @@ void EnPoFusen_InitFuse(EnPoFusen* this) {
void EnPoFusen_IdleFuse(EnPoFusen* this, GlobalContext* globalCtx) {
EnPoFusen_Idle(this, globalCtx);
if (this->fuse-- == 0) {
EnPoFusen_IncrementMalonPop(this);
EnPoFusen_IncrementRomaniPop(this);
}
}
@ -230,7 +236,7 @@ void EnPoFusen_Update(Actor* thisx, GlobalContext* globalCtx) {
EnPoFusen* this = THIS;
this->actionFunc(this, globalCtx);
if (EnPoFusen_CheckCollision(this, globalCtx) != 0) {
EnPoFusen_IncrementMalonPop(this);
EnPoFusen_IncrementRomaniPop(this);
}
}
@ -246,10 +252,10 @@ s32 EnPoFusen_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL
s16 xRot;
if (limbIndex == 2) {
zScale = (Math_CosS(this->randScaleChange) * 0.0799999982119f) + 1.0f;
zScale = (Math_CosS(this->randScaleChange) * 0.08f) + 1.0f;
xScale = zScale;
if (!zScale) {}
yScale = (Math_SinS(this->randScaleChange) * 0.0799999982119f) + 1.0f;
yScale = (Math_SinS(this->randScaleChange) * 0.08f) + 1.0f;
yScale = yScale * yScale;
xRot = ((Math_SinS(this->randXZRotChange) * 2730.0f));
zRot = ((Math_CosS(this->randXZRotChange) * 2730.0f));

62
tables/functions.txt
View File

@ -11852,41 +11852,41 @@
0x80ABDB98:("BgHakuginElvpole_Update",),
0x80ABDBBC:("BgHakuginElvpole_Draw",),
0x80ABDCA0:("func_80ABDCA0",),
0x80ABDD2C:("func_80ABDD2C",),
0x80ABDD2C:("EnMa4_ChangeAnim",),
0x80ABDD9C:("func_80ABDD9C",),
0x80ABDE60:("func_80ABDE60",),
0x80ABDE60:("EnMa4_InitPath",),
0x80ABDF70:("EnMa4_Init",),
0x80ABE188:("EnMa4_Destroy",),
0x80ABE1C4:("func_80ABE1C4",),
0x80ABE4A4:("func_80ABE4A4",),
0x80ABE560:("func_80ABE560",),
0x80ABE6C8:("func_80ABE6C8",),
0x80ABEB6C:("func_80ABEB6C",),
0x80ABEF34:("func_80ABEF34",),
0x80ABEF8C:("func_80ABEF8C",),
0x80ABF070:("func_80ABF070",),
0x80ABF084:("func_80ABF084",),
0x80ABF0D8:("func_80ABF0D8",),
0x80ABF160:("func_80ABF160",),
0x80ABF198:("func_80ABF198",),
0x80ABF218:("func_80ABF218",),
0x80ABF254:("func_80ABF254",),
0x80ABF2FC:("func_80ABF2FC",),
0x80ABF354:("func_80ABF354",),
0x80ABF494:("func_80ABF494",),
0x80ABF4A8:("func_80ABF4A8",),
0x80ABF51C:("func_80ABF51C",),
0x80ABF534:("func_80ABF534",),
0x80ABF69C:("func_80ABF69C",),
0x80ABF6B0:("func_80ABF6B0",),
0x80ABF760:("func_80ABF760",),
0x80ABF774:("func_80ABF774",),
0x80ABF7C8:("func_80ABF7C8",),
0x80ABFCAC:("func_80ABFCAC",),
0x80ABFCD4:("func_80ABFCD4",),
0x80ABE1C4:("EnMa4_RunInCircles",),
0x80ABE4A4:("EnMa4_SetupWait",),
0x80ABE560:("EnMa4_Wait",),
0x80ABE6C8:("EnMa4_HandlePlayerChoice",),
0x80ABEB6C:("EnMa4_ChooseNextDialogue",),
0x80ABEF34:("EnMa4_SetupDialogueHandler",),
0x80ABEF8C:("EnMa4_DialogueHandler",),
0x80ABF070:("EnMa4_SetupBeginHorsebackGame",),
0x80ABF084:("EnMa4_BeginHorsebackGame",),
0x80ABF0D8:("EnMa4_HorsebackGameCheckPlayerInteractions",),
0x80ABF160:("EnMa4_HorsebackGameTalking",),
0x80ABF198:("EnMa4_InitHorsebackGame",),
0x80ABF218:("EnMa4_SetupHorsebackGameWait",),
0x80ABF254:("EnMa4_HorsebackGameWait",),
0x80ABF2FC:("EnMa4_SetupHorsebackGameEnd",),
0x80ABF354:("EnMa4_HorsebackGameEnd",),
0x80ABF494:("EnMa4_SetupBeginEponasSongCs",),
0x80ABF4A8:("EnMa4_BeginEponasSongCs",),
0x80ABF51C:("EnMa4_SetupEponasSongCs",),
0x80ABF534:("EnMa4_EponasSongCs",),
0x80ABF69C:("EnMa4_SetupEndEponasSongCs",),
0x80ABF6B0:("EnMa4_EndEponasSongCs",),
0x80ABF760:("EnMa4_SetupBeginDescribeThemCs",),
0x80ABF774:("EnMa4_BeginDescribeThemCs",),
0x80ABF7C8:("EnMa4_StartDialogue",),
0x80ABFCAC:("EnMa4_SetFaceExpression",),
0x80ABFCD4:("EnMa4_InitFaceExpression",),
0x80ABFD18:("EnMa4_Update",),
0x80ABFD9C:("func_80ABFD9C",),
0x80ABFE48:("func_80ABFE48",),
0x80ABFD9C:("EnMa4_OverrideLimbDraw",),
0x80ABFE48:("EnMa4_PostLimbDraw",),
0x80ABFEF4:("EnMa4_Draw",),
0x80AC0830:("EnTwig_Init",),
0x80AC0A20:("EnTwig_Destroy",),

19
tables/variables.txt
View File

@ -14190,24 +14190,6 @@
0x80ABDC84:("bgHakuginElvpoleOverlayRelocations","u32","[6]",0x18),
0x80ABDC9C:("bgHakuginElvpoleOverlayInfoOffset","u32","",0x4),
0x80AC0090:("En_Ma4_InitVars","UNK_TYPE1","",0x1),
0x80AC00B0:("D_80AC00B0","UNK_TYPE1","",0x1),
0x80AC00DC:("D_80AC00DC","UNK_TYPE1","",0x1),
0x80AC00E8:("D_80AC00E8","UNK_TYPE1","",0x1),
0x80AC00FC:("D_80AC00FC","UNK_TYPE1","",0x1),
0x80AC010C:("D_80AC010C","UNK_TYPE1","",0x1),
0x80AC024C:("D_80AC024C","UNK_TYPE4","",0x4),
0x80AC0250:("D_80AC0250","UNK_TYPE4","",0x4),
0x80AC0254:("D_80AC0254","UNK_TYPE2","",0x2),
0x80AC0258:("D_80AC0258","UNK_TYPE2","",0x2),
0x80AC025C:("D_80AC025C","UNK_TYPE4","",0x4),
0x80AC0260:("D_80AC0260","UNK_TYPE2","",0x2),
0x80AC0264:("D_80AC0264","UNK_TYPE4","",0x4),
0x80AC0270:("D_80AC0270","f32","",0x4),
0x80AC0274:("D_80AC0274","f32","",0x4),
0x80AC0278:("D_80AC0278","f32","",0x4),
0x80AC027C:("jtbl_D_80AC027C","UNK_PTR","",0x4),
0x80AC0300:("jtbl_D_80AC0300","UNK_PTR","",0x4),
0x80AC03E4:("jtbl_D_80AC03E4","UNK_PTR","",0x4),
0x80AC0400:("enMa4OverlayInfo","OverlayRelocationSection","",0x14),
0x80AC0414:("enMa4OverlayRelocations","u32","[262]",0x418),
0x80AC082C:("enMa4OverlayInfoOffset","u32","",0x4),
@ -16958,7 +16940,6 @@
0x80B8E150:("En_Ma_Yts_InitVars","UNK_TYPE1","",0x1),
0x80B8E170:("D_80B8E170","ColliderCylinderInit","",0x2C),
0x80B8E19C:("D_80B8E19C","CollisionCheckInfoInit2","",0xC),
0x80B8E1A8:("D_80B8E1A8","UNK_TYPE1","",0x1),
0x80B8E308:("D_80B8E308","void*","",0x4),
0x80B8E318:("D_80B8E318","UNK_TYPE1","",0x1),
0x80B8E32C:("D_80B8E32C","UNK_TYPE2","",0x2),

3
tools/actorfixer.py
View File

@ -12,6 +12,9 @@ animdict ={
"Matrix_Push": "SysMatrix_StatePush",
"Matrix_Init": "SysMatrix_StateAlloc",
"Matrix_Put": "SysMatrix_SetCurrentState",
"func_800B78B8": "Actor_UpdateBgCheckInfo",
"func_8012403C": "Player_GetMask",
"func_8012404c": "Player_RemoveMask",
}
def replace_anim(file):