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

PlayState Rename (#1231)

Browse source 
* global context -> play

* fix PlayState* PlayState
This commit is contained in:
fig02 2022-05-21 14:23:43 -04:00 • committed by GitHub
parent 154f44b6da
commit 2e6279bc8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
912 changed files with 40489 additions and 41078 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
View file

@ -12,9 +12,9 @@
#define rScoreIdx regs[2]
#define rScale regs[3]
u32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);
void EffectSsExtra_Update(GlobalContext* globalCtx, u32 index, EffectSs* this);
u32 EffectSsExtra_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
void EffectSsExtra_Draw(PlayState* play, u32 index, EffectSs* this);
void EffectSsExtra_Update(PlayState* play, u32 index, EffectSs* this);
static s16 sScores[] = { 30, 60, 100 };
@ -23,17 +23,17 @@ EffectSsInit Effect_Ss_Extra_InitVars = {
EffectSsExtra_Init,
};
u32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
u32 EffectSsExtra_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) {
EffectSsExtraInitParams* initParams = (EffectSsExtraInitParams*)initParamsx;
s32 pad;
s32 objBankIndex;
u32 oldSeg6;
objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_YABUSAME_POINT);
objBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_YABUSAME_POINT);
if ((objBankIndex >= 0) && Object_IsLoaded(&globalCtx->objectCtx, objBankIndex)) {
if ((objBankIndex >= 0) && Object_IsLoaded(&play->objectCtx, objBankIndex)) {
oldSeg6 = gSegments[6];
gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[objBankIndex].segment);
gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[objBankIndex].segment);
this->pos = initParams->pos;
this->velocity = initParams->velocity;
this->accel = initParams->accel;
@ -58,28 +58,28 @@ static void* sTextures[] = {
object_yabusame_point_Tex_000900,
};
void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
void EffectSsExtra_Draw(PlayState* play, u32 index, EffectSs* this) {
s32 pad;
f32 scale = this->rScale / 100.0f;
void* object = globalCtx->objectCtx.status[this->rObjBankIdx].segment;
void* object = play->objectCtx.status[this->rObjBankIdx].segment;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 168);
OPEN_DISPS(play->state.gfxCtx, "../z_eff_ss_extra.c", 168);
gSegments[6] = VIRTUAL_TO_PHYSICAL(object);
gSPSegment(POLY_XLU_DISP++, 0x06, object);
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
func_80093D84(globalCtx->state.gfxCtx);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 186),
func_80093D84(play->state.gfxCtx);
Matrix_ReplaceRotation(&play->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, "../z_eff_ss_extra.c", 186),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rScoreIdx]));
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_yabusame_point_DL_000DC0));
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 194);
CLOSE_DISPS(play->state.gfxCtx, "../z_eff_ss_extra.c", 194);
}
void EffectSsExtra_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {
void EffectSsExtra_Update(PlayState* play, u32 index, EffectSs* this) {
if (this->rTimer != 0) {
this->rTimer -= 1;
} else {
@ -87,6 +87,6 @@ void EffectSsExtra_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {
}
if (this->rTimer == 1) {
globalCtx->interfaceCtx.unk_23C = sScores[this->rScoreIdx];
play->interfaceCtx.unk_23C = sScores[this->rScoreIdx];
}
}