summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWimmer <71473855+Wimmerrad@users.noreply.github.com>2023-10-23 00:43:57 +0200
committerGitHub <noreply@github.com>2023-10-22 19:43:57 -0300
commit002f5ba6de4f6eaa96d7201d6eec09d23d85d71f (patch)
tree749ee0ffbe40e02c3edf5231ac92ef89b66a12a6 /src
parent3569ef97ade41e6ca219fb731bc108c92fd527f8 (diff)
obj_oyu (#1436)
* object_oyu object_oyu.xml / z_bg_goron_oyu.c updated * Hot Spring Water Update * updated comments * GoronGraveyard prefix * Update object_oyu.xml
Diffstat (limited to 'src')
-rw-r--r--src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
index 27023756b..9577b832a 100644
--- a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
+++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
@@ -153,7 +153,7 @@ void BgGoronOyu_Init(Actor* thisx, PlayState* play) {
Actor_SetScale(&this->dyna.actor, 0.1f);
DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS);
- CollisionHeader_GetVirtual(&object_oyu_Colheader_000988, &colHeader);
+ CollisionHeader_GetVirtual(&gGoronGraveyardHotSpringWaterCol, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
@@ -185,10 +185,10 @@ void BgGoronOyu_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
- AnimatedMat_Draw(play, Lib_SegmentedToVirtual(object_oyu_Matanimheader_000968));
+ AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gGoronGraveyardHotSpringWaterTexAnim));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, &object_oyu_DL_000158);
- gSPDisplayList(POLY_XLU_DISP++, &object_oyu_DL_000080);
+ gSPDisplayList(POLY_XLU_DISP++, &gGoronGraveyardHotSpringWaterEmptyDL);
+ gSPDisplayList(POLY_XLU_DISP++, &gGoronGraveyardHotSpringWaterDL);
CLOSE_DISPS(play->state.gfxCtx);
}