mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-23 07:21:19 +00:00
Match En actors D-G (#1889)
* 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:
parent
c86bf5011b
commit
1da87b1e7f
24 changed files with 160 additions and 98 deletions
|
@ -472,11 +472,11 @@ void EnFish_Dropped_FlopOnGround(EnFish* this, PlayState* play) {
|
|||
|
||||
void EnFish_Dropped_SetupSwimAway(EnFish* this) {
|
||||
this->actor.home.pos = this->actor.world.pos;
|
||||
this->actor.flags |= ACTOR_FLAG_4;
|
||||
this->timer = 200;
|
||||
this->actor.gravity = 0.0f;
|
||||
this->actor.minVelocityY = 0.0f;
|
||||
this->actor.shape.yOffset = 0.0f;
|
||||
this->actor.flags |= ACTOR_FLAG_4;
|
||||
this->timer = 200;
|
||||
EnFish_SetInWaterAnimation(this);
|
||||
this->actionFunc = EnFish_Dropped_SwimAway;
|
||||
this->unk_250 = UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2;
|
||||
|
@ -624,6 +624,8 @@ void EnFish_UpdateCutscene(EnFish* this, PlayState* play) {
|
|||
f32 lerp;
|
||||
s32 bgId;
|
||||
|
||||
if (play) {}
|
||||
|
||||
if (cue == NULL) {
|
||||
// "Warning : DEMO ended without dousa (action) 3 termination being called"
|
||||
PRINTF("Warning : dousa 3 消滅 が呼ばれずにデモが終了した(%s %d)(arg_data 0x%04x)\n", "../z_en_sakana.c", 1169,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue