mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

z_scene_table, z_view, and z_fbdemo_fade OK (#561)

Browse source 
* fbdemo

* the view is clear

* more matchings

* scene table doesn't want to be nice

* small thing in view

* can do

* accidentally a value
This commit is contained in:
petrie911 2020-12-25 15:19:52 -06:00 • committed by GitHub
parent 09ddf4f71e
commit a8ae9f48b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 49 additions and 898 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
View file

@ -11,8 +11,8 @@
#define THIS ((BgRelayObjects*)thisx)
typedef enum {
WINDMILL_ROTATING_GEAR,
WINDMILL_DAMPE_STONE_DOOR
/* 0 */ WINDMILL_ROTATING_GEAR,
/* 1 */ WINDMILL_DAMPE_STONE_DOOR
} WindmillSetpiecesMode;
void BgRelayObjects_Init(Actor* thisx, GlobalContext* globalCtx);

4
src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
View file

@ -381,7 +381,6 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
temp_a0 += phi_v0;
phi_v1 = (s16)(temp_a0 - phi_a1);
if (((this->unk_25C[idx] * phi_v0) <= 0) && (phi_v1 > -100) && (phi_v1 < 100)) {
temp_a0 = phi_a1;
phi_v0 = 0;
@ -430,7 +429,8 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) {
if (animCurrentFrame <= 42.0f) {
phi_v1_2 = phi_a1 - 2000;
} else {
phi_v1_2 = (s32)((((animCurrentFrame - 42.0f) * 6200.0f) / (unk_3F4 - 42.0f)) + -2000.0f) + phi_a1;
phi_v1_2 =
(s32)((((animCurrentFrame - 42.0f) * 6200.0f) / (unk_3F4 - 42.0f)) + -2000.0f) + phi_a1;
}
if (phi_v1_2 >= temp_a0) {

28
src/overlays/actors/ovl_En_Zo/z_en_zo.c
View file

@ -14,7 +14,7 @@ typedef enum {
/* 0 */ ENZO_EFFECT_NONE,
/* 1 */ ENZO_EFFECT_RIPPLE,
/* 2 */ ENZO_EFFECT_SPLASH,
/* 3 */ ENZO_EFFECT_BUBBLE,
/* 3 */ ENZO_EFFECT_BUBBLE
} EnZoEffectType;
void EnZo_Init(Actor* thisx, GlobalContext* globalCtx);
@ -82,7 +82,7 @@ void EnZo_Bubble(EnZo* this, Vec3f* pos) {
effect->scale = ((Math_Rand_ZeroOne() - 0.5f) * 0.02f) + 0.12f;
break;
}
}
}
effect++;
}
}
@ -103,7 +103,7 @@ void EnZo_Splash(EnZo* this, Vec3f* pos, Vec3f* vel, f32 scale) {
effect->color.a = (Math_Rand_ZeroOne() * 100.0f) + 100.0f;
effect->scale = scale;
break;
}
}
effect++;
}
}
@ -241,7 +241,7 @@ void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) {
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 281),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06002350);
}
effect++;
@ -273,7 +273,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) {
func_800D1FD4(&globalCtx->mf_11DA0);
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 325),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06002510);
}
@ -292,14 +292,12 @@ void EnZo_TreadWaterRipples(EnZo* this, f32 scale, f32 targetScale, u8 alpha) {
}
static ColliderCylinderInit sCylinderInit = {
{ COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER, },
{ COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER },
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 },
{ 0x1A, 0x40, 0, { 0, 0, 0 } },
};
static CollisionCheckInfoInit2 sColChkInit = {
0x00, 0x0000, 0x0000, 0x0000, 0xFF,
};
static CollisionCheckInfoInit2 sColChkInit = { 0, 0, 0, 0, 0xFF };
const ActorInit En_Zo_InitVars = {
ACTOR_EN_ZO,
@ -314,14 +312,10 @@ const ActorInit En_Zo_InitVars = {
};
static struct_80034EC0_Entry sAnimations[] = {
{ &D_06002FE8, 1.0f, 0.0f, -1.0f, 0, -8.0f, },
{ &D_06002FE8, 1.0f, 0.0f, -1.0f, 0, 0.0f, },
{ &D_06002F10, 0.0f, 1.0f, 1.0f, 2, 0.0f, },
{ &D_06002F10, 1.0f, 1.0f, -1.0f, 0, -8.0f, },
{ &D_06002F10, 1.0f, 8.0f, -1.0f, 0, -8.0f, },
{ &D_0600219C, 1.0f, 0.0f, -1.0f, 0, -8.0f, },
{ &D_06000598, 1.0f, 0.0f, -1.0f, 0, -8.0f, },
{ &D_06000D48, 1.0f, 0.0f, -1.0f, 0, -8.0f, },
{ &D_06002FE8, 1.0f, 0.0f, -1.0f, 0, -8.0f }, { &D_06002FE8, 1.0f, 0.0f, -1.0f, 0, 0.0f },
{ &D_06002F10, 0.0f, 1.0f, 1.0f, 2, 0.0f }, { &D_06002F10, 1.0f, 1.0f, -1.0f, 0, -8.0f },
{ &D_06002F10, 1.0f, 8.0f, -1.0f, 0, -8.0f }, { &D_0600219C, 1.0f, 0.0f, -1.0f, 0, -8.0f },
{ &D_06000598, 1.0f, 0.0f, -1.0f, 0, -8.0f }, { &D_06000D48, 1.0f, 0.0f, -1.0f, 0, -8.0f },
};
void EnZo_SpawnSplashes(EnZo* this) {