mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-18 21:10:19 +00:00
Even more objects (#913)
* malon adult limbs and enum * malon adult animations * Malon Adult textures * Object_ma2 OK * Cleanup undefined syms file * more cleanup * object_in OK * change * Object_TA limbs and Limb DLs ok * Textures in DLs OK * Object TA animations OK * Object TA OK * clean up the xml * almost done with impa textures * name impa draw funcs * fix globalCtx2 in talon_init * more progress in impa * eye texture stuff * impa OK * remove files * fix messed up merge * Switch MA2 blink timer from hex * Name a function * Fix skelanime fixer * Missing malon adult TLUT * add some missing symbols in DemoEc * Fix conflicts, part2 * Clean up TLUT related stuff and some minor things * Remove unused externs from z_demo_ec * Remove unused symbols from undefined_syms.txt * PR fixes (Dragorn) * Dragorn fixes * Fix various texture-related issues in object_link_child * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_ta.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/objects/object_in.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix ingo and the rest of Dragorns fix * impa fixes * fix ingo again * fix windmill man missing TLUT * Fix impa in viewer * Roman's fixes * Add limb * Missed an animation Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103
GitHub
parent
0f58b15b27
commit
665283432b
86 changed files with 1568 additions and 1452 deletions
|
|
@ -8,7 +8,12 @@
|
|||
#include "vt.h"
|
||||
#include "objects/object_zo/object_zo.h"
|
||||
#include "objects/object_ec/object_ec.h"
|
||||
#include "objects/object_ma2/object_ma2.h"
|
||||
#include "objects/object_in/object_in.h"
|
||||
#include "objects/object_ge1/object_ge1.h"
|
||||
#include "objects/object_fu/object_fu.h"
|
||||
#include "objects/object_fish/object_fish.h"
|
||||
#include "objects/object_ta/object_ta.h"
|
||||
#include "objects/object_oF1d_map/object_oF1d_map.h"
|
||||
#include "objects/object_ma2/object_ma2.h"
|
||||
#include "objects/object_in/object_in.h"
|
||||
|
|
@ -258,12 +263,12 @@ void DemoEc_DrawSkeleton(DemoEc* this, GlobalContext* globalCtx, void* eyeTextur
|
|||
|
||||
func_80093D18(gfxCtx);
|
||||
|
||||
if (eyeTexture != 0) {
|
||||
if (eyeTexture != NULL) {
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture));
|
||||
}
|
||||
|
||||
if (arg3 != 0) {
|
||||
if (arg3 != NULL) {
|
||||
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(arg3));
|
||||
}
|
||||
|
||||
|
|
@ -353,7 +358,7 @@ void DemoEc_SetNpcActionPosRot(DemoEc* this, GlobalContext* globalCtx, s32 actio
|
|||
|
||||
void DemoEc_InitIngo(DemoEc* this, GlobalContext* globalCtx) {
|
||||
DemoEc_UseDrawObject(this, globalCtx);
|
||||
DemoEc_InitSkelAnime(this, globalCtx, &object_in_Skel_013B88);
|
||||
DemoEc_InitSkelAnime(this, globalCtx, &gIngoSkel);
|
||||
DemoEc_UseAnimationObject(this, globalCtx);
|
||||
DemoEc_ChangeAnimation(this, &gDemoEcIngoAnim, 0, 0.0f, false);
|
||||
func_8096D64C(this, globalCtx);
|
||||
|
|
@ -369,12 +374,12 @@ void DemoEc_UpdateIngo(DemoEc* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
void DemoEc_DrawIngo(DemoEc* this, GlobalContext* globalCtx) {
|
||||
DemoEc_DrawSkeleton(this, globalCtx, &object_in_Tex_004390, &object_in_Tex_004350, 0, 0);
|
||||
DemoEc_DrawSkeleton(this, globalCtx, &gIngoEyeClosed2Tex, &gIngoRedTex, 0, 0);
|
||||
}
|
||||
|
||||
void DemoEc_InitTalon(DemoEc* this, GlobalContext* globalCtx) {
|
||||
DemoEc_UseDrawObject(this, globalCtx);
|
||||
DemoEc_InitSkelAnime(this, globalCtx, &object_ta_Skel_00B7B8);
|
||||
DemoEc_InitSkelAnime(this, globalCtx, &gTalonSkel);
|
||||
DemoEc_UseAnimationObject(this, globalCtx);
|
||||
DemoEc_ChangeAnimation(this, &gDemoEcTalonAnim, 0, 0.0f, false);
|
||||
func_8096D64C(this, globalCtx);
|
||||
|
|
@ -390,7 +395,7 @@ void DemoEc_UpdateTalon(DemoEc* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
void DemoEc_DrawTalon(DemoEc* this, GlobalContext* globalCtx) {
|
||||
DemoEc_DrawSkeleton(this, globalCtx, &object_ta_Tex_0076C0, &object_ta_Tex_007AC0, NULL, NULL);
|
||||
DemoEc_DrawSkeleton(this, globalCtx, &gTalonEyeClosed2Tex, &gTalonRedTex, NULL, NULL);
|
||||
}
|
||||
|
||||
void DemoEc_InitWindmillMan(DemoEc* this, GlobalContext* globalCtx) {
|
||||
|
|
@ -673,7 +678,7 @@ Gfx* DemoEc_GetCarpenterPostLimbDList(DemoEc* this) {
|
|||
return object_daiku_DL_005880;
|
||||
default:
|
||||
osSyncPrintf(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST);
|
||||
return 0;
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1143,9 +1148,9 @@ void DemoEc_DrawGorons(DemoEc* this, GlobalContext* globalCtx) {
|
|||
|
||||
void DemoEc_InitMalon(DemoEc* this, GlobalContext* globalCtx) {
|
||||
DemoEc_UseDrawObject(this, globalCtx);
|
||||
DemoEc_InitSkelAnime(this, globalCtx, &object_ma2_Skel_008D90);
|
||||
DemoEc_InitSkelAnime(this, globalCtx, &gMalonAdultSkel);
|
||||
DemoEc_UseAnimationObject(this, globalCtx);
|
||||
DemoEc_ChangeAnimation(this, &object_ma2_Anim_009EE0, 0, 0.0f, false);
|
||||
DemoEc_ChangeAnimation(this, &gMalonAdultSingAnim, 0, 0.0f, false);
|
||||
func_8096D5D4(this, globalCtx);
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
|
||||
this->updateMode = EC_UPDATE_MALON;
|
||||
|
|
@ -1160,11 +1165,11 @@ void DemoEc_UpdateMalon(DemoEc* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
void DemoEc_DrawMalon(DemoEc* this, GlobalContext* globalCtx) {
|
||||
static void* eyeTextures[] = { object_ma2_Tex_002570, object_ma2_Tex_002C70, object_ma2_Tex_003070 };
|
||||
static void* eyeTextures[] = { gMalonAdultEyeOpenTex, gMalonAdultEyeHalfTex, gMalonAdultEyeClosedTex };
|
||||
s32 eyeTexIndex = this->eyeTexIndex;
|
||||
void* eyeTexture = eyeTextures[eyeTexIndex];
|
||||
|
||||
DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, &object_ma2_Tex_003770, NULL, NULL);
|
||||
DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, gMalonAdultMouthHappyTex, NULL, NULL);
|
||||
}
|
||||
|
||||
static DemoEcInitFunc sInitFuncs[] = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue