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

Matched func_8012EF0C and correct D_801C2380 (#227) 

* Match func_8012EF0C and correct D_801C2380

* format

* Review suggestions
This commit is contained in:
EllipticEllipsis 2021-07-26 21:30:29 +01:00 committed by GitHub
parent ade921a2c0
commit 930d605c5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
src/code/code_0x8012EC80.c
View File

@ -229,132 +229,67 @@ s32 func_8012EE34(s16 arg0) {
return 0;
}
/* static */ u16 D_801C2380[12][6] = {
{
SCENE_00KEIKOKU,
SCENE_BOTI,
SCENE_13HUBUKINOMITI,
SCENE_24KEMONOMITI,
SCENE_IKANAMAE,
SCENE_TOWN,
},
{
SCENE_ICHIBA,
SCENE_BACKTOWN,
SCENE_CLOCKTOWER,
SCENE_ALLEY,
-1,
},
{
SCENE_20SICHITAI,
SCENE_20SICHITAI2,
SCENE_21MITURINMAE,
SCENE_22DEKUCITY,
SCENE_DEKU_KING,
SCENE_KINSTA1,
},
{ -1 },
{
SCENE_10YUKIYAMANOMURA,
SCENE_10YUKIYAMANOMURA2,
SCENE_11GORONNOSATO,
SCENE_11GORONNOSATO2,
SCENE_16GORON_HOUSE,
SCENE_12HAKUGINMAE,
},
{
SCENE_14YUKIDAMANOMITI,
SCENE_GORONRACE,
SCENE_17SETUGEN,
SCENE_17SETUGEN2,
-1,
},
{
SCENE_F01,
SCENE_ROMANYMAE,
SCENE_OMOYA,
SCENE_F01C,
SCENE_F01_B,
SCENE_KOEPONARACE,
},
{ -1 },
{
SCENE_30GYOSON,
SCENE_SINKAI,
SCENE_31MISAKI,
SCENE_TORIDE,
SCENE_KAIZOKU,
SCENE_33ZORACITY,
},
{
SCENE_35TAKI,
-1,
},
{
SCENE_F40,
SCENE_F41,
SCENE_CASTLE,
SCENE_IKANA,
SCENE_REDEAD,
-1,
},
static u16 D_801C2380[6][12] = {
{ SCENE_00KEIKOKU, SCENE_BOTI, SCENE_13HUBUKINOMITI, SCENE_24KEMONOMITI, SCENE_IKANAMAE, SCENE_TOWN, SCENE_ICHIBA,
SCENE_BACKTOWN, SCENE_CLOCKTOWER, SCENE_ALLEY, -1 },
{ SCENE_20SICHITAI, SCENE_20SICHITAI2, SCENE_21MITURINMAE, SCENE_22DEKUCITY, SCENE_DEKU_KING, SCENE_KINSTA1, -1 },
{ SCENE_10YUKIYAMANOMURA, SCENE_10YUKIYAMANOMURA2, SCENE_11GORONNOSATO, SCENE_11GORONNOSATO2, SCENE_16GORON_HOUSE,
SCENE_12HAKUGINMAE, SCENE_14YUKIDAMANOMITI, SCENE_GORONRACE, SCENE_17SETUGEN, SCENE_17SETUGEN2, -1 },
{ SCENE_F01, SCENE_ROMANYMAE, SCENE_OMOYA, SCENE_F01C, SCENE_F01_B, SCENE_KOEPONARACE, -1 },
{ SCENE_30GYOSON, SCENE_SINKAI, SCENE_31MISAKI, SCENE_TORIDE, SCENE_KAIZOKU, SCENE_33ZORACITY, SCENE_35TAKI, -1 },
{ SCENE_F40, SCENE_F41, SCENE_CASTLE, SCENE_IKANA, SCENE_REDEAD, -1 },
};
#ifdef NON_EQUIVALENT
// loop seems wrong?
void func_8012EF0C(s16 arg0) {
s16 i;
s16 num;
s16 sceneIndex;
s16 phi_v0 = 0;
s16 phi_v1 = 0;
u16(*new_var)[] = &D_801C2380[arg0];
if ((arg0 >= 0) && (arg0 < ARRAY_COUNT(D_801C2380))) {
i = 0;
num = 0;
sceneIndex = D_801C2380[arg0][i];
while (sceneIndex != 0xFFFF) {
sceneIndex = D_801C2380[arg0][i];
if (sceneIndex < 0x20) {
num = 0;
} else if (sceneIndex < 0x40) {
num = 1;
} else if (sceneIndex < 0x60) {
num = 2;
} else if (sceneIndex < 0x80) {
num = 3;
} else if (sceneIndex < 0xA0) {
num = 4;
} else if (sceneIndex < 0xC0) {
num = 5;
} else if (sceneIndex < 0xE0) {
num = 6;
if ((arg0 >= 0) && (arg0 < 6)) {
while (true) {
if ((*new_var)[phi_v0] == 0xFFFF) {
break;
}
gSaveContext.roomInf[125][sceneIndex] |= gBitFlags[(-(num << 7)) + num];
i++;
if (((s16)(*new_var)[phi_v0]) < 0x20) {
phi_v1 = 0;
} else if (((s16)(*new_var)[phi_v0]) < 0x40) {
phi_v1 = 1;
} else if (((s16)(*new_var)[phi_v0]) < 0x60) {
phi_v1 = 2;
} else if (((s16)(*new_var)[phi_v0]) < 0x80) {
phi_v1 = 3;
} else if (((s16)(*new_var)[phi_v0]) < 0xA0) {
phi_v1 = 4;
} else if (((s16)(*new_var)[phi_v0]) < 0xC0) {
phi_v1 = 5;
} else if (((s16)(*new_var)[phi_v0]) < 0xE0) {
phi_v1 = 6;
}
// Required to match
gSaveContext.roomInf[125][phi_v1] =
gSaveContext.roomInf[125][phi_v1] | gBitFlags[(s16)(*new_var)[phi_v0] - (phi_v1 << 5)];
phi_v0++;
}
if (i == 0) {
if ((*new_var) == D_801C2380[0]) {
gSaveContext.unk_F60 |= 3;
} else if (i == 1) {
} else if ((*new_var) == D_801C2380[1]) {
gSaveContext.unk_F60 |= 0x1C;
} else if (i == 2) {
} else if ((*new_var) == D_801C2380[2]) {
gSaveContext.unk_F60 |= 0xE0;
} else if (i == 3) {
} else if ((*new_var) == D_801C2380[3]) {
gSaveContext.unk_F60 |= 0x100;
} else if (i == 4) {
} else if ((*new_var) == D_801C2380[4]) {
gSaveContext.unk_F60 |= 0x1E00;
} else if (i == 5) {
} else if ((*new_var) == D_801C2380[5]) {
gSaveContext.unk_F60 |= 0x6000;
}
}
dREG(82) = 0;
XREG(95) = 0;
}
#else
void func_8012EF0C(s16 arg0);
#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x8012EC80/func_8012EF0C.asm")
#endif
void func_8012F0EC(s16 arg0);
#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x8012EC80/func_8012F0EC.asm")

27
src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
View File

@ -9,16 +9,16 @@ void EnBji01_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnBji01_Update(Actor* thisx, GlobalContext* globalCtx);
void EnBji01_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_809CCE98(EnBji01* this, GlobalContext* globalCtx); /* Level 1 */
void func_809CCEE8(EnBji01* this, GlobalContext* globalCtx); /* Level 2 */
void func_809CD028(EnBji01* this, GlobalContext* globalCtx); /* Level 3 */
void EnBji01_DialogueHandler(EnBji01* this, GlobalContext* globalCtx); /* Level 4 */
void func_809CCDE0(EnBji01* this, GlobalContext* globalCtx); /* Level 5 */
void func_809CD634(EnBji01* this, GlobalContext* globalCtx); /* Level 5 */
void EnBji01_DoNothing(EnBji01* this, GlobalContext* globalCtx); /* Level 6 */
void func_809CD6C0(EnBji01* this, GlobalContext* globalCtx); /* Level 3 */
void func_809CD70C(EnBji01* this, GlobalContext* globalCtx); /* Level 4 */
void func_809CD77C(EnBji01* this, GlobalContext* globalCtx); /* Level 5 */
void func_809CCE98(EnBji01* this, GlobalContext* globalCtx);
void func_809CCEE8(EnBji01* this, GlobalContext* globalCtx);
void func_809CD028(EnBji01* this, GlobalContext* globalCtx);
void EnBji01_DialogueHandler(EnBji01* this, GlobalContext* globalCtx);
void func_809CCDE0(EnBji01* this, GlobalContext* globalCtx);
void func_809CD634(EnBji01* this, GlobalContext* globalCtx);
void EnBji01_DoNothing(EnBji01* this, GlobalContext* globalCtx);
void func_809CD6C0(EnBji01* this, GlobalContext* globalCtx);
void func_809CD70C(EnBji01* this, GlobalContext* globalCtx);
void func_809CD77C(EnBji01* this, GlobalContext* globalCtx);
s32 EnBji01_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
Actor* actor);
@ -278,7 +278,7 @@ void EnBji01_DialogueHandler(EnBji01* this, GlobalContext* globalCtx) {
case 0x5F7:
case 0x5F8:
func_801477B4(globalCtx);
this->actor.flags &= ~0x10000;;
this->actor.flags &= ~0x10000;
this->actor.params = ENBJI01_PARAMS_FINISHED_CONVERSATION;
func_809CCE98(this, globalCtx);
break;
@ -287,7 +287,7 @@ void EnBji01_DialogueHandler(EnBji01* this, GlobalContext* globalCtx) {
break;
case 6:
this->actor.params = ENBJI01_PARAMS_FINISHED_CONVERSATION;
this->actor.flags &= ~0x10000;;
this->actor.flags &= ~0x10000;
func_809CCE98(this, globalCtx);
break;
}
@ -333,7 +333,8 @@ void EnBji01_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBji01* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, func_800B3FC0, 30.0f);
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600578C, &D_06000FDC, this->jointTable, this->morphTable, BJI_LIMB_MAX);
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600578C, &D_06000FDC, this->jointTable, this->morphTable,
BJI_LIMB_MAX);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;

6
src/overlays/actors/ovl_En_Niw/z_en_niw.c
View File

@ -1007,15 +1007,13 @@ void EnNiw_DrawFeathers(EnNiw* this, GlobalContext* globalCtx) {
isMaterialApplied++;
}
SysMatrix_InsertTranslation(feather->pos.x, feather->pos.y, feather->pos.z,
MTXMODE_NEW);
SysMatrix_InsertTranslation(feather->pos.x, feather->pos.y, feather->pos.z, MTXMODE_NEW);
SysMatrix_NormalizeXYZ(&globalCtx->mf_187FC);
Matrix_Scale(feather->scale, feather->scale, 1.0f, MTXMODE_APPLY);
SysMatrix_InsertZRotation_f(feather->zRot, MTXMODE_APPLY);
SysMatrix_InsertTranslation(0.0f, -1000.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06002428);
}