mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-11 03:39:59 +00:00
Fixed descriptions of Zelda's Lullaby, Song of Time, and Scarecrow's Song effect actors (#579)
* Fixed descriptions of Zelda's Lullaby, Song of Time, and Scarecrow's Song effect actors * Added enums for song types * fixes Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
parent
ed4d8af39e
commit
447c6514b9
4 changed files with 19 additions and 4 deletions
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* File: z_oceff_wipe.c
|
||||
* Overlay: ovl_Oceff_Wipe
|
||||
* Description: Zelda's Lullaby Effect
|
||||
* Description: Zelda's Lullaby and Song of Time Ocarina Effect
|
||||
*/
|
||||
|
||||
#include "z_oceff_wipe.h"
|
||||
|
@ -37,6 +37,7 @@ u8 sOceffWipeAlphaIndices[] = {
|
|||
|
||||
void OceffWipe_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
OceffWipe* this = THIS;
|
||||
|
||||
Actor_SetScale(&this->actor, 0.1f);
|
||||
this->counter = 0;
|
||||
this->actor.posRot.pos = ACTIVE_CAM->eye;
|
||||
|
@ -55,6 +56,7 @@ void OceffWipe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
|||
|
||||
void OceffWipe_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
OceffWipe* this = THIS;
|
||||
|
||||
this->actor.posRot.pos = ACTIVE_CAM->eye;
|
||||
if (this->counter < 100) {
|
||||
this->counter++;
|
||||
|
@ -111,7 +113,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
|||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 375),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
if (this->actor.params) {
|
||||
if (this->actor.params != OCEFF_WIPE_ZL) {
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 170, 255, 255, 255);
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, 0, 150, 255, 128);
|
||||
} else {
|
||||
|
|
|
@ -4,6 +4,11 @@
|
|||
#include "ultra64.h"
|
||||
#include "global.h"
|
||||
|
||||
typedef enum {
|
||||
/* 0x00 */ OCEFF_WIPE_ZL,
|
||||
/* 0x01 */ OCEFF_WIPE_SOT
|
||||
} OceffWipeType;
|
||||
|
||||
struct OceffWipe;
|
||||
|
||||
typedef struct OceffWipe {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* File: z_oceff_wipe4.c
|
||||
* Overlay: ovl_Oceff_Wipe4
|
||||
* Description: Song of Time effect
|
||||
* Description: Scarecrow's Song and an unused Ocarina Effect
|
||||
*/
|
||||
|
||||
#include "z_oceff_wipe4.h"
|
||||
|
@ -32,6 +32,7 @@ const ActorInit Oceff_Wipe4_InitVars = {
|
|||
|
||||
void OceffWipe4_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
OceffWipe4* this = THIS;
|
||||
|
||||
Actor_SetScale(&this->actor, 0.1f);
|
||||
this->counter = 0;
|
||||
this->actor.posRot.pos = ACTIVE_CAM->eye;
|
||||
|
@ -40,11 +41,13 @@ void OceffWipe4_Init(Actor* thisx, GlobalContext* globalCtx) {
|
|||
|
||||
void OceffWipe4_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
OceffWipe4* this = THIS;
|
||||
|
||||
func_800876C8(globalCtx);
|
||||
}
|
||||
|
||||
void OceffWipe4_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
OceffWipe4* this = THIS;
|
||||
|
||||
this->actor.posRot.pos = ACTIVE_CAM->eye;
|
||||
if (this->counter < 50) {
|
||||
this->counter++;
|
||||
|
@ -94,7 +97,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
|||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe4.c", 324),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
if (this->actor.params == 1) {
|
||||
if (this->actor.params == OCEFF_WIPE4_UNUSED) {
|
||||
gSPDisplayList(POLY_XLU_DISP++, sTextureDL1);
|
||||
} else {
|
||||
gSPDisplayList(POLY_XLU_DISP++, sTextureDL0);
|
||||
|
|
|
@ -4,6 +4,11 @@
|
|||
#include "ultra64.h"
|
||||
#include "global.h"
|
||||
|
||||
typedef enum {
|
||||
/* 0x00 */ OCEFF_WIPE4_SCARECROWS,
|
||||
/* 0x01 */ OCEFF_WIPE4_UNUSED
|
||||
} OceffWipe4Type;
|
||||
|
||||
struct OceffWipe4;
|
||||
|
||||
typedef struct OceffWipe4 {
|
||||
|
|
Loading…
Reference in a new issue