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

Match InitDynaPoly actors (#1733)

Browse source 
* Match InitDynaPoly actors

* Change BgJyaBombiwa_SetupDynaPoly pads to s32

* kzIceScale -> sKingZoraRedIceScale
This commit is contained in:
cadmic 2024-02-07 15:58:46 -08:00 • committed by GitHub
parent 0ba8cb38a7
commit 53b0114464
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 137 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
View file

@ -192,17 +192,20 @@ void ObjSwitch_RotateY(Vec3f* dest, Vec3f* src, s16 rotY) {
void ObjSwitch_InitDynaPoly(ObjSwitch* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) {
s32 pad;
CollisionHeader* colHeader = NULL;
s32 pad2;
DynaPolyActor_Init(&this->dyna, moveFlag);
CollisionHeader_GetVirtual(collision, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
#if OOT_DEBUG
if (this->dyna.bgId == BG_ACTOR_MAX) {
s32 pad2;
// "Warning : move BG registration failure"
PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_switch.c", 531,
this->dyna.actor.id, this->dyna.actor.params);
}
#endif
}
void ObjSwitch_InitJntSphCollider(ObjSwitch* this, PlayState* play, ColliderJntSphInit* colliderJntSphInit) {