mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-07 06:40:15 +00:00
en_fu OK (#126)
* 1 function left * 1 function left * en_fu OK, still need to document * en_fu OK * spec comment * remove asm files * clang and final fixes * fix floormas formatting things * pr suggestions * pr suggestions 2
This commit is contained in:
fig02
GitHub
parent
08d9fee6e4
commit
2a7bdc5c28
26 changed files with 305 additions and 929 deletions
|
|
@ -52,10 +52,10 @@ const ActorInit En_Floormas_InitVars = {
|
|||
FLAGS,
|
||||
OBJECT_WALLMASTER,
|
||||
sizeof(EnFloormas),
|
||||
EnFloormas_Init,
|
||||
EnFloormas_Destroy,
|
||||
EnFloormas_Update,
|
||||
EnFloormas_Draw,
|
||||
(ActorFunc)EnFloormas_Init,
|
||||
(ActorFunc)EnFloormas_Destroy,
|
||||
(ActorFunc)EnFloormas_Update,
|
||||
(ActorFunc)EnFloormas_Draw,
|
||||
};
|
||||
|
||||
static ColliderCylinderInit cylinderInit = {
|
||||
|
|
@ -92,7 +92,7 @@ static Vec3f D_80A1A4DC = {
|
|||
static Vec3f dustPos = {
|
||||
0.0f,
|
||||
0.0f,
|
||||
0.0f
|
||||
0.0f,
|
||||
};
|
||||
|
||||
static Color_RGBA8 mergeColor = {
|
||||
|
|
@ -128,8 +128,8 @@ void EnFloormas_Init(Actor* thisx, GlobalContext* globalCtx) {
|
|||
|
||||
Actor_ProcessInitChain(&this->actor, initChain);
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 50.0f);
|
||||
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06008FB0, &D_06009DB0, &this->limbDrawTable, &this->transitionDrawTable,
|
||||
25);
|
||||
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06008FB0, &D_06009DB0, &this->limbDrawTable,
|
||||
&this->transitionDrawTable, 25);
|
||||
Collider_InitCylinder(globalCtx, &this->collider);
|
||||
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &cylinderInit);
|
||||
func_80061ED4(&this->actor.colChkInfo, &damageTable, &colCheckInfoInit);
|
||||
|
|
@ -137,7 +137,7 @@ void EnFloormas_Init(Actor* thisx, GlobalContext* globalCtx) {
|
|||
invisble = this->actor.params & SPAWN_INVISIBLE;
|
||||
|
||||
// s16 cast needed
|
||||
this->actor.params &= (s16)~(SPAWN_INVISIBLE);
|
||||
this->actor.params &= (s16) ~(SPAWN_INVISIBLE);
|
||||
if (invisble) {
|
||||
this->actor.flags |= 0x80;
|
||||
this->actor.draw = EnFloormas_DrawHighlighted;
|
||||
|
|
|
|||
|
|
@ -10,12 +10,24 @@
|
|||
|
||||
#define THIS ((EnFu*)thisx)
|
||||
|
||||
#define FU_RESET_LOOK_ANGLE (1 << 0)
|
||||
#define FU_WAIT (1 << 1)
|
||||
|
||||
void EnFu_Init(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnFu_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnFu_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnFu_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
void EnFu_WaitChild(EnFu* this, GlobalContext* globalCtx);
|
||||
void func_80A1DA04(EnFu* this, GlobalContext* globalCtx);
|
||||
|
||||
void EnFu_WaitAdult(EnFu* this, GlobalContext* globalCtx);
|
||||
void EnFu_TeachSong(EnFu* this, GlobalContext* globalCtx);
|
||||
void EnFu_WaitForPlayback(EnFu* this, GlobalContext* globalCtx);
|
||||
void func_80A1DBA0(EnFu* this, GlobalContext* globalCtx);
|
||||
void func_80A1DBD4(EnFu* this, GlobalContext* globalCtx);
|
||||
void func_80A1DB60(EnFu* this, GlobalContext* globalCtx);
|
||||
|
||||
const ActorInit En_Fu_InitVars = {
|
||||
ACTOR_EN_FU,
|
||||
ACTORTYPE_NPC,
|
||||
|
|
@ -27,33 +39,274 @@ const ActorInit En_Fu_InitVars = {
|
|||
(ActorFunc)EnFu_Update,
|
||||
(ActorFunc)EnFu_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Destroy.s")
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
{ COLTYPE_UNK10, 0x00, 0x11, 0x39, 0x10, COLSHAPE_CYLINDER },
|
||||
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 },
|
||||
{ 30, 40, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1D94C.s")
|
||||
static Vec3f sMtxSrc = {
|
||||
700.0f,
|
||||
700.0f,
|
||||
0.0f,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA04.s")
|
||||
static UNK_PTR sEyesSegments[] = {
|
||||
0x06005F20,
|
||||
0x06006320,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s")
|
||||
static UNK_PTR sMouthSegments[] = {
|
||||
0x06006720,
|
||||
0x06006920,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DB60.s")
|
||||
extern AnimationHeader D_0600057C;
|
||||
extern AnimationHeader D_06000B04;
|
||||
extern SkeletonHeader D_06006C90;
|
||||
extern UNK_TYPE D_0200E080;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBA0.s")
|
||||
typedef enum {
|
||||
/* 0x00 */ FU_FACE_CALM,
|
||||
/* 0x01 */ FU_FACE_MAD,
|
||||
} EnFuFace;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DBD4.s")
|
||||
void EnFu_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnFu* this = THIS;
|
||||
s32 pad;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DD44.s")
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 36.0f);
|
||||
SkelAnime_InitSV(globalCtx, &this->skelanime, &D_06006C90, &D_06000B04, this->limbDrawTable,
|
||||
this->transitionDrawTable, 16);
|
||||
SkelAnime_ChangeAnimDefaultRepeat(&this->skelanime, &D_06000B04);
|
||||
Collider_InitCylinder(globalCtx, &this->collider);
|
||||
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
|
||||
this->actor.colChkInfo.mass = 0xFF;
|
||||
Actor_SetScale(&this->actor, 0.01f);
|
||||
if (LINK_IS_CHILD) {
|
||||
this->actionFunc = EnFu_WaitChild;
|
||||
this->facialExpression = FU_FACE_CALM;
|
||||
} else {
|
||||
this->actionFunc = EnFu_WaitAdult;
|
||||
this->facialExpression = FU_FACE_MAD;
|
||||
this->skelanime.animPlaybackSpeed = 2.0f;
|
||||
}
|
||||
this->behaviorFlags = 0;
|
||||
this->actor.unk_1F = 6;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DDA8.s")
|
||||
void EnFu_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnFu* this = THIS;
|
||||
Collider_DestroyCylinder(globalCtx, &this->collider);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DE24.s")
|
||||
s32 func_80A1D94C(EnFu* this, GlobalContext* globalCtx, u16 textID, EnFuActionFunc actionFunc) {
|
||||
s16 yawDiff;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s")
|
||||
// func_8002F194 returns 1 if actor flags & 0x100 is set and unsets it
|
||||
if (func_8002F194(&this->actor, globalCtx)) {
|
||||
this->actionFunc = actionFunc;
|
||||
return true;
|
||||
}
|
||||
this->actor.textId = textID;
|
||||
yawDiff = this->actor.rotTowardsLinkY - this->actor.shape.rot.y;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1E110.s")
|
||||
if ((ABS(yawDiff) < 0x2301) && (this->actor.xzDistanceFromLink < 100.0f)) {
|
||||
func_8002F2CC(&this->actor, globalCtx, 100.0f);
|
||||
} else {
|
||||
this->behaviorFlags |= FU_RESET_LOOK_ANGLE;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1E26C.s")
|
||||
void func_80A1DA04(EnFu* this, GlobalContext* globalCtx) {
|
||||
if (func_8002F334(&this->actor, globalCtx) != 0) {
|
||||
this->behaviorFlags &= ~FU_WAIT;
|
||||
this->actionFunc = EnFu_WaitChild;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s")
|
||||
if (this->skelanime.animCurrentSeg == &D_0600057C) {
|
||||
SkelAnime_ChangeAnim(&this->skelanime, &D_06000B04, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06000B04), 2,
|
||||
-4.0f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnFu_WaitChild(EnFu* this, GlobalContext* globalCtx) {
|
||||
u16 textID;
|
||||
|
||||
textID = Text_GetFaceReaction(globalCtx, 0xB);
|
||||
if (textID == 0) {
|
||||
textID = (gSaveContext.eventChkInf[6] & 0x80) ? 0x5033 : 0x5032;
|
||||
// 0x5032: "Go around!..I'm so happy!..I'm trying to come up with a musical theme inspired by this windmill..."
|
||||
// 0x5033: "Go around, go around, go around... What? It's going way too fast!"
|
||||
}
|
||||
|
||||
// if actor flags & 0x100 is set and textID is 0x5033, change animation
|
||||
// if func_80A1D94C returns 1, actionFunc is set to func_80A1DA04
|
||||
if (func_80A1D94C(this, globalCtx, textID, func_80A1DA04)) {
|
||||
if (textID == 0x5033) {
|
||||
SkelAnime_ChangeAnim(&this->skelanime, &D_0600057C, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_0600057C), 2,
|
||||
-4.0f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A1DB60(EnFu* this, GlobalContext* globalCtx) {
|
||||
if (globalCtx->csCtx.state == 0) {
|
||||
this->actionFunc = EnFu_WaitAdult;
|
||||
gSaveContext.eventChkInf[5] |= 0x800;
|
||||
globalCtx->msgCtx.unk_E3EE = 4;
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A1DBA0(EnFu* this, GlobalContext* globalCtx) {
|
||||
// if dialog state is 2 set action to WaitAdult
|
||||
if (func_8002F334(this, globalCtx)) {
|
||||
this->actionFunc = EnFu_WaitAdult;
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A1DBD4(EnFu* this, GlobalContext* globalCtx) {
|
||||
Player* player = PLAYER;
|
||||
|
||||
if (globalCtx->msgCtx.unk_E3EE >= 4) {
|
||||
this->actionFunc = EnFu_WaitAdult;
|
||||
globalCtx->msgCtx.unk_E3EE = 4;
|
||||
this->actor.flags &= ~0x10000;
|
||||
} else if (globalCtx->msgCtx.unk_E3EE == 3) {
|
||||
func_80078884(NA_SE_SY_CORRECT_CHIME);
|
||||
this->actionFunc = func_80A1DB60;
|
||||
this->actor.flags &= ~0x10000;
|
||||
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_0200E080);
|
||||
gSaveContext.cutsceneTrigger = 1;
|
||||
Item_Give(globalCtx, ITEM_SONG_STORMS);
|
||||
globalCtx->msgCtx.unk_E3EE = 0;
|
||||
gSaveContext.eventChkInf[6] |= 0x20;
|
||||
} else if (globalCtx->msgCtx.unk_E3EE == 2) {
|
||||
player->stateFlags2 &= ~0x1000000;
|
||||
this->actionFunc = EnFu_WaitAdult;
|
||||
} else if (globalCtx->msgCtx.unk_E3EE == 1) {
|
||||
player->stateFlags2 |= 0x800000;
|
||||
}
|
||||
}
|
||||
|
||||
void EnFu_WaitForPlayback(EnFu* this, GlobalContext* globalCtx) {
|
||||
Player* player = PLAYER;
|
||||
player->stateFlags2 |= 0x800000;
|
||||
// if dialog state is 7, player has played back the song
|
||||
if (func_8010BDBC(&globalCtx->msgCtx) == 7) {
|
||||
func_8010BD58(globalCtx, 0x1A);
|
||||
this->actionFunc = func_80A1DBD4;
|
||||
}
|
||||
}
|
||||
|
||||
void EnFu_TeachSong(EnFu* this, GlobalContext* globalCtx) {
|
||||
Player* player = PLAYER;
|
||||
player->stateFlags2 |= 0x800000;
|
||||
// if dialog state is 2, start song demonstration
|
||||
if (func_8010BDBC(&globalCtx->msgCtx) == 2) {
|
||||
this->behaviorFlags &= ~FU_WAIT;
|
||||
func_800ED858(4); // seems to be related to setting instrument type
|
||||
func_8010BD58(globalCtx, 0xD); // play song demonstration, song 0xD = SoS
|
||||
this->actionFunc = EnFu_WaitForPlayback;
|
||||
}
|
||||
}
|
||||
|
||||
void EnFu_WaitAdult(EnFu* this, GlobalContext* globalCtx) {
|
||||
static s16 yawDiff;
|
||||
Player* player = PLAYER;
|
||||
|
||||
yawDiff = this->actor.rotTowardsLinkY - this->actor.shape.rot.y;
|
||||
if ((gSaveContext.eventChkInf[5] & 0x800)) {
|
||||
func_80A1D94C(this, globalCtx, 0x508E, func_80A1DBA0);
|
||||
} else if (player->stateFlags2 & 0x1000000) {
|
||||
this->actor.textId = 0x5035;
|
||||
func_8010B680(globalCtx, this->actor.textId, 0);
|
||||
this->actionFunc = EnFu_TeachSong;
|
||||
this->behaviorFlags |= FU_WAIT;
|
||||
} else if (func_8002F194(&this->actor, globalCtx) != 0) {
|
||||
this->actionFunc = func_80A1DBA0;
|
||||
} else if (ABS(yawDiff) < 0x2301) {
|
||||
if (this->actor.xzDistanceFromLink < 100.0f) {
|
||||
this->actor.textId = 0x5034;
|
||||
func_8002F2CC(&this->actor, globalCtx, 100.0f);
|
||||
player->stateFlags2 |= 0x800000;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnFu_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnFu* this = THIS;
|
||||
s32 pad;
|
||||
|
||||
Collider_CylinderUpdate(&this->actor, &this->collider);
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider);
|
||||
Actor_MoveForward(&this->actor);
|
||||
func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
|
||||
if ((!(this->behaviorFlags & FU_WAIT)) && (SkelAnime_FrameUpdateMatrix(&this->skelanime) != 0)) {
|
||||
SkelAnime_ChangeAnim(&this->skelanime, this->skelanime.animCurrentSeg, 1.0f, 0.0f,
|
||||
SkelAnime_GetFrameCount(this->skelanime.animCurrentSeg), 2, 0.0f);
|
||||
}
|
||||
this->actionFunc(this, globalCtx);
|
||||
if ((this->behaviorFlags & FU_RESET_LOOK_ANGLE)) {
|
||||
Math_SmoothScaleMaxMinS(&this->lookAngleOffset.x, 0, 6, 6200, 100);
|
||||
Math_SmoothScaleMaxMinS(&this->lookAngleOffset.y, 0, 6, 6200, 100);
|
||||
Math_SmoothScaleMaxMinS(&this->unk_2A2.x, 0, 6, 6200, 100);
|
||||
Math_SmoothScaleMaxMinS(&this->unk_2A2.y, 0, 6, 6200, 100);
|
||||
this->behaviorFlags &= ~FU_RESET_LOOK_ANGLE;
|
||||
} else {
|
||||
func_80038290(globalCtx, &this->actor, &this->lookAngleOffset, &this->unk_2A2, this->actor.posRot2.pos);
|
||||
}
|
||||
}
|
||||
|
||||
s32 EnFu_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
|
||||
EnFu* this = THIS;
|
||||
s32 pad1;
|
||||
|
||||
if (limbIndex == 10) {
|
||||
return 0;
|
||||
}
|
||||
switch (limbIndex) {
|
||||
case 14:
|
||||
rot->x += this->lookAngleOffset.y;
|
||||
rot->z += this->lookAngleOffset.x;
|
||||
break;
|
||||
case 8:
|
||||
break;
|
||||
}
|
||||
|
||||
if (!(this->behaviorFlags & FU_WAIT)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (limbIndex == 8) {
|
||||
rot->y += (Math_Sins((globalCtx->state.frames * (limbIndex * 50 + 0x814))) * 200.0f);
|
||||
rot->z += (Math_Coss((globalCtx->state.frames * (limbIndex * 50 + 0x940))) * 200.0f);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void EnFu_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
|
||||
EnFu* this = THIS;
|
||||
|
||||
if (limbIndex == 14) {
|
||||
Matrix_MultVec3f(&sMtxSrc, &this->actor.posRot2.pos);
|
||||
}
|
||||
}
|
||||
|
||||
void EnFu_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
EnFu* this = THIS;
|
||||
GraphicsContext* gfxCtx;
|
||||
Gfx* dispRefs[4];
|
||||
|
||||
gfxCtx = globalCtx->state.gfxCtx;
|
||||
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_fu.c", 773);
|
||||
func_800943C8(globalCtx->state.gfxCtx);
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->facialExpression]));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthSegments[this->facialExpression]));
|
||||
SkelAnime_DrawSV(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, this->skelanime.dListCount,
|
||||
EnFu_OverrideLimbDraw, EnFu_PostLimbDraw, &this->actor);
|
||||
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_fu.c", 791);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,19 @@
|
|||
|
||||
struct EnFu;
|
||||
|
||||
typedef void (*EnFuActionFunc)(struct EnFu*, GlobalContext*);
|
||||
|
||||
typedef struct EnFu {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x164];
|
||||
/* 0x014C */ ColliderCylinder collider;
|
||||
/* 0x0198 */ SkelAnime skelanime;
|
||||
/* 0x01DC */ Vec3s limbDrawTable[16];
|
||||
/* 0x023C */ Vec3s transitionDrawTable[16];
|
||||
/* 0x029C */ Vec3s lookAngleOffset; // offset applied to neck rotation to look at link when he is close
|
||||
/* 0x02A2 */ Vec3s unk_2A2;
|
||||
/* 0x02A8 */ u16 behaviorFlags;
|
||||
/* 0x02AA */ u16 facialExpression;
|
||||
/* 0x02AC */ EnFuActionFunc actionFunc;
|
||||
} EnFu; // size = 0x02B0
|
||||
|
||||
extern const ActorInit En_Fu_InitVars;
|
||||
|
|
|
|||
|
|
@ -87,8 +87,9 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
|||
alpha = 0xFF;
|
||||
}
|
||||
|
||||
vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] = vtxPtr[11].v.cn[3] =
|
||||
vtxPtr[13].v.cn[3] = vtxPtr[15].v.cn[3] = vtxPtr[16].v.cn[3] = vtxPtr[18].v.cn[3] = vtxPtr[20].v.cn[3] = alpha;
|
||||
vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] =
|
||||
vtxPtr[11].v.cn[3] = vtxPtr[13].v.cn[3] = vtxPtr[15].v.cn[3] = vtxPtr[16].v.cn[3] = vtxPtr[18].v.cn[3] =
|
||||
vtxPtr[20].v.cn[3] = alpha;
|
||||
|
||||
gfxCtx = globalCtx->state.gfxCtx;
|
||||
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_oceff_wipe2.c", 390);
|
||||
|
|
|
|||
|
|
@ -89,8 +89,9 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
|||
alpha = 0xFF;
|
||||
}
|
||||
|
||||
vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] = vtxPtr[11].v.cn[3] =
|
||||
vtxPtr[13].v.cn[3] = vtxPtr[15].v.cn[3] = vtxPtr[17].v.cn[3] = vtxPtr[19].v.cn[3] = vtxPtr[21].v.cn[3] = alpha;
|
||||
vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] =
|
||||
vtxPtr[11].v.cn[3] = vtxPtr[13].v.cn[3] = vtxPtr[15].v.cn[3] = vtxPtr[17].v.cn[3] = vtxPtr[19].v.cn[3] =
|
||||
vtxPtr[21].v.cn[3] = alpha;
|
||||
|
||||
gfxCtx = globalCtx->state.gfxCtx;
|
||||
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 343);
|
||||
|
|
|
|||
|
|
@ -83,8 +83,9 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
|||
alpha = 0xFF;
|
||||
}
|
||||
|
||||
vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] = vtxPtr[11].v.cn[3] =
|
||||
vtxPtr[13].v.cn[3] = vtxPtr[15].v.cn[3] = vtxPtr[17].v.cn[3] = vtxPtr[19].v.cn[3] = vtxPtr[21].v.cn[3] = alpha;
|
||||
vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] =
|
||||
vtxPtr[11].v.cn[3] = vtxPtr[13].v.cn[3] = vtxPtr[15].v.cn[3] = vtxPtr[17].v.cn[3] = vtxPtr[19].v.cn[3] =
|
||||
vtxPtr[21].v.cn[3] = alpha;
|
||||
|
||||
gfxCtx = globalCtx->state.gfxCtx;
|
||||
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_oceff_wipe4.c", 314);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue