izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

EnAz and EnTwig (Beaver bros and the minigame rings) (#999)

Browse Source 
* leave it to beavers

* match

* merge

* catchup part 2

* fix warnings

* I accidentally the xml

* hopefully that's all of them

* lol merge

* linked object

* now with more enums

* Update src/overlays/actors/ovl_En_Az/z_en_az.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* more fixes

* limbs and maths

* stuff

* more macro management

* last enum?

* more fixes

* fixed

* entrances

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
petrie911
2022-09-14 12:51:10 -03:00
committed by GitHub
co-authored by petrie911 petrie911 petrie911 engineer124
parent 3d430a5733
commit bf26065867
7 changed files with 2014 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64actor.h
+1 -1
View File
@@ -83,7 +83,7 @@ typedef struct {
typedef struct {
/* 0x0 */ s16 unk_0; // frame?
/* 0x2 */ Vec3s unk_2; // pos?
/* 0x2 */ Vec3s unk_2; // scale
} struct_80124618; // size = 0x8
typedef struct {
include/z64math.h
+3
View File
@@ -101,6 +101,9 @@ typedef struct {
#define BINANG_LERPIMP(v0, v1, t) ((v0) + (s16)(BINANG_SUB((v1), (v0)) * (t)))
#define BINANG_LERPIMPINV(v0, v1, t) ((v0) + BINANG_SUB((v1), (v0)) / (t))
#define LERPWEIGHT(val, prev, next) (((val) - (prev)) / ((next) - (prev)))
#define F32_LERPWEIGHT(val, prev, next) (((f32)(val) - (f32)(prev)) / ((f32)(next) - (f32)(prev)))
#define VEC3F_LERPIMPDST(dst, v0, v1, t){ \
(dst)->x = (v0)->x + (((v1)->x - (v0)->x) * t); \
(dst)->y = (v0)->y + (((v1)->y - (v0)->y) * t); \