mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 08:50:23 +00:00
Code Issues Projects Releases Wiki Activity

En_Arrow OK (#648)

Browse source 
* fix colliderinit typo

* fix initchain

* start init

* match init

* progress

* progress

* more funcs

* match func_809B3DD8

* progress

* last func almost done

* enum

* name some more types

* progress

* all but one

* fix warning

* remove undefined syms

* match arrows

* review

* spec

* remove asm
This commit is contained in:
fig02 2021-02-02 20:30:21 -05:00 • committed by GitHub
parent 6221723aad
commit dff2dfef0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 513 additions and 1609 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/overlays/actors/ovl_Demo_Im/z_demo_im.c
View file

@ -5,7 +5,7 @@
*/
#include "z_demo_im.h"
#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
#include "vt.h"
#define FLAGS 0x00000011
@ -750,7 +750,7 @@ void func_809865F8(DemoIm* this, GlobalContext* globalCtx, s32 arg2) {
f32 spawnPosZ = thisPos->z + (Math_CosS(shapeRotY) * 30.0f);
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ARROW, spawnPosX, spawnPosY, spawnPosZ, 0xFA0,
this->actor.shape.rot.y, 0, 0xFFF6);
this->actor.shape.rot.y, 0, ARROW_CS_NUT);
this->unk_27C = 1;
}
} else {
@ -1160,18 +1160,17 @@ s32 DemoIm_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
}
}
if (*unk_2D0 != 0) {
if (limbIndex == 15) {
*dList = D_0600EDE8;
}
if ((*unk_2D0 != 0) && (limbIndex == 15)) {
*dList = D_0600EDE8;
}
return false;
}
void DemoIm_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
DemoIm* this = THIS;
if (limbIndex == 0x10) {
if (limbIndex == 16) {
Vec3f sp28 = D_809887D8;
Vec3f dest;