mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-01 15:26:01 +00:00
Code Issues Projects Releases Wiki Activity

Match ntsc-1.2 z_skelanime.c, z_view.c, z_viszbuf.c (#2041)

Browse source
This commit is contained in:
cadmic 2024-08-15 00:54:06 -07:00 committed by GitHub
parent 70716be96d
commit 7fb9fbb4a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/code/z_skelanime.c
View file

@ -41,8 +41,6 @@ void SkelAnime_DrawLimbLod(PlayState* play, s32 limbIndex, void** skeleton, Vec3
} }
} }
if (1) {}
if (postLimbDraw != NULL) { if (postLimbDraw != NULL) {
postLimbDraw(play, limbIndex, &dList, &rot, arg); postLimbDraw(play, limbIndex, &dList, &rot, arg);
} }
@ -261,8 +259,6 @@ void SkelAnime_DrawLimbOpa(PlayState* play, s32 limbIndex, void** skeleton, Vec3
} }
} }
if (1) {}
if (postLimbDraw != NULL) { if (postLimbDraw != NULL) {
postLimbDraw(play, limbIndex, &dList, &rot, arg); postLimbDraw(play, limbIndex, &dList, &rot, arg);
} }
@ -855,9 +851,14 @@ AnimTask* AnimTaskQueue_NewTask(AnimTaskQueue* animTaskQueue, s32 type) {
return task; return task;
} }
#if PLATFORM_N64
#define LINK_ANIMATION_OFFSET(addr, offset) \
(((uintptr_t)_link_animetionSegmentRomStart) + SEGMENT_OFFSET(addr) + (offset))
#else
#define LINK_ANIMATION_OFFSET(addr, offset) \ #define LINK_ANIMATION_OFFSET(addr, offset) \
(((uintptr_t)_link_animetionSegmentRomStart) + ((uintptr_t)(addr)) - ((uintptr_t)_link_animetionSegmentStart) + \ (((uintptr_t)_link_animetionSegmentRomStart) + ((uintptr_t)(addr)) - ((uintptr_t)_link_animetionSegmentStart) + \
(offset)) (offset))
#endif
/** /**
* Creates a task which will load a single frame of animation data from the link_animetion file. * Creates a task which will load a single frame of animation data from the link_animetion file.

4
src/code/z_view.c
View file

@ -142,8 +142,8 @@ void View_GetViewport(View* view, Viewport* viewport) {
void View_ApplyLetterbox(View* view) { void View_ApplyLetterbox(View* view) {
GraphicsContext* gfxCtx = view->gfxCtx; GraphicsContext* gfxCtx = view->gfxCtx;
s32 letterboxSize;
s32 pillarboxSize; s32 pillarboxSize;
s32 letterboxSize;
s32 ulx; s32 ulx;
s32 uly; s32 uly;
s32 lrx; s32 lrx;
@ -400,9 +400,9 @@ s32 View_ApplyPerspective(View* view) {
} }
s32 View_ApplyOrtho(View* view) { s32 View_ApplyOrtho(View* view) {
GraphicsContext* gfxCtx = view->gfxCtx;
Vp* vp; Vp* vp;
Mtx* projection; Mtx* projection;
GraphicsContext* gfxCtx = view->gfxCtx;
OPEN_DISPS(gfxCtx, "../z_view.c", 726); OPEN_DISPS(gfxCtx, "../z_view.c", 726);

1
src/code/z_viszbuf.c
View file

@ -66,6 +66,7 @@ void VisZBuf_Destroy(VisZBuf* this) {
void VisZBuf_Draw(VisZBuf* this, Gfx** gfxP) { void VisZBuf_Draw(VisZBuf* this, Gfx** gfxP) {
Gfx* gfx = *gfxP; Gfx* gfx = *gfxP;
s32 pad;
u16* zbufFrag = D_0E000000; u16* zbufFrag = D_0E000000;
s32 fmt; s32 fmt;
s32 y; s32 y;