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

z_En_Ossan and dependencies (#824)

Browse source 
* fix colliderinit typo

* fix initchain

* reloc

* progress

* progress

* Pick off a few easy functions, reduce number of warnings

* more tough OKs

* Getting closer to all OK, fix en_girla header

* some hard OKs, 7 to go

* two funcs remaining

* func_80AC7094 OK!

* Fix warnings, begin documentation

* get most of object_ossan documented, document some of en_ossan

* improve en_girla function names

* more EnOssan documentation

* more documentation

* en_tana basically complete, en_girla vars all named, en_ossan documentation improvements

* delete TIME ITSELF

* object_oF1d_map OK

* more names, fixed a poition typo

* Nearly all en_ossan functions named, all variables named

* format.sh

* forgot to delete data

* implement pr changes

* EnOssan OK! implement most of Roman's suggestions

* ugh

* implement figs suggestions

* implement roman's suggestion

* Can't tell my left from my other left

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
mzxrules 2021-07-04 11:23:18 -04:00 • committed by GitHub
parent 7446e5eb80
commit 3fd05c9147
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
134 changed files with 3479 additions and 7998 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
View file

@ -8,6 +8,7 @@
#include "vt.h"
#include "objects/object_zo/object_zo.h"
#include "objects/object_ec/object_ec.h"
#include "objects/object_oF1d_map/object_oF1d_map.h"
#define FLAGS 0x00000010
@ -139,9 +140,6 @@ extern FlexSkeletonHeader D_060085F8;
// Object_RS
extern FlexSkeletonHeader D_06004868;
// Object_OF1D_MAP
extern FlexSkeletonHeader D_0600FEF0;
// Object_MA2
extern FlexSkeletonHeader D_06008D90;
@ -158,7 +156,6 @@ extern u8 D_06007AC0[];
extern u8 D_06006920[];
extern u8 D_060004C8[];
extern u8 D_060035D8[];
extern u8 D_0600DE80[];
extern u8 D_06003770[];
// PostLimbDraw display lists
@ -1114,7 +1111,7 @@ void DemoEc_InitGorons(DemoEc* this, GlobalContext* globalCtx) {
Vec3f* scale = &this->actor.scale;
DemoEc_UseDrawObject(this, globalCtx);
DemoEc_InitSkelAnime(this, globalCtx, &D_0600FEF0);
DemoEc_InitSkelAnime(this, globalCtx, &gGoronSkel);
DemoEc_UseAnimationObject(this, globalCtx);
if (this->actor.params == 30) {
@ -1151,11 +1148,11 @@ void DemoEc_UpdateGorons(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawGorons(DemoEc* this, GlobalContext* globalCtx) {
static void* eyeTextures[] = { 0x0600CE80, 0x0600D280, 0x0600D680 };
static void* eyeTextures[] = { gGoronCsEyeOpenTex, gGoronCsEyeHalfTex, gGoronCsEyeClosedTex };
s32 eyeTexIndex = this->eyeTexIndex;
void* eyeTexture = eyeTextures[eyeTexIndex];
DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, &D_0600DE80, NULL, NULL);
DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, &gGoronCsMouthNeutralTex, NULL, NULL);
}
void DemoEc_InitMalon(DemoEc* this, GlobalContext* globalCtx) {