mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 22:44:30 +00:00
Code Issues Projects Releases Wiki Activity

Tutorial docs (#715)

Browse source 
* Move tutorial into docs folder

* Merge remote-tracking branch 'upstream/master' into tutorial_docs

* Object decomp added

* contents and intro updates

* mention object decomp in beginning

* Addressed Fig's review

* Update EnSkb to jointTable and morphTable

* minor table tweak

* typo

* Alter to say ZAPD makes the object output folder

* Apply suggestions from code review

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* More review changes

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
EllipticEllipsis 2021-03-24 00:15:35 +00:00 • committed by GitHub
parent 5562b2ef6f
commit effd4256c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 3936 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Skb/z_en_skb.c
View file

@ -160,8 +160,8 @@ void EnSkb_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.colChkInfo.mass = 0xFE;
this->actor.colChkInfo.health = 2;
this->actor.shape.yOffset = -8000.0f;
SkelAnime_Init(globalCtx, &this->skelAnime, &D_060041F8, &D_06001854, this->limbDrawTable,
this->transitionDrawTable, 20);
SkelAnime_Init(globalCtx, &this->skelAnime, &D_060041F8, &D_06001854, this->jointTable,
this->morphTable, 20);
this->actor.naviEnemyId = 0x55;
Collider_InitJntSph(globalCtx, &this->collider);

4
src/overlays/actors/ovl_En_Skb/z_en_skb.h
View file

@ -11,8 +11,8 @@ typedef void (*EnSkbActionFunc)(struct EnSkb*, GlobalContext*);
typedef struct EnSkb {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s limbDrawTable[20];
/* 0x0208 */ Vec3s transitionDrawTable[20];
/* 0x0190 */ Vec3s jointTable[20];
/* 0x0208 */ Vec3s morphTable[20];
/* 0x0280 */ u8 unk_280;
/* 0x0281 */ u8 unk_281;
/* 0x0282 */ u8 unk_282;