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

Match En actors D-G (#1889)

Browse source 
* Match entity actors D-G

* Remove SET_EN_GOROIWA_SPEED

* Actually match z_en_elf.c

* GET_EN_GOROIWA_SPEED -> EN_GOROIWA_SPEED
This commit is contained in:
cadmic 2024-02-26 18:55:30 -08:00 • committed by GitHub
parent c86bf5011b
commit 1da87b1e7f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 160 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
View file

@ -112,8 +112,8 @@ void EnGe2_ChangeAction(EnGe2* this, s32 i) {
}
void EnGe2_Init(Actor* thisx, PlayState* play) {
s32 pad;
EnGe2* this = (EnGe2*)thisx;
s16 params = this->actor.params;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &gGerudoPurpleSkel, NULL, this->jointTable, this->morphTable, 22);
@ -133,7 +133,7 @@ void EnGe2_Init(Actor* thisx, PlayState* play) {
this->actor.world.rot.z = 0;
this->actor.shape.rot.z = 0;
switch (this->actor.params & 0xFF) {
switch (thisx->params & 0xFF) {
case GE2_TYPE_PATROLLING:
EnGe2_ChangeAction(this, GE2_ACTION_WALK);
if (EnGe2_CheckCarpentersFreed()) {
@ -156,6 +156,7 @@ void EnGe2_Init(Actor* thisx, PlayState* play) {
break;
default:
ASSERT(0, "0", "../z_en_ge2.c", 418);
break;
}
this->stateFlags = 0;
@ -165,7 +166,7 @@ void EnGe2_Init(Actor* thisx, PlayState* play) {
this->actor.minVelocityY = -4.0f;
this->actor.gravity = -1.0f;
this->walkDirection = this->actor.world.rot.y;
this->walkDuration = ((this->actor.params & 0xFF00) >> 8) * 10;
this->walkDuration = ((thisx->params & 0xFF00) >> 8) * 10;
}
void EnGe2_Destroy(Actor* thisx, PlayState* play) {