diff options
| author | Archez <Archez@users.noreply.github.com> | 2024-08-14 11:38:56 -0400 |
|---|---|---|
| committer | Archez <Archez@users.noreply.github.com> | 2024-08-14 11:38:56 -0400 |
| commit | 35b4da74cb90f12463c663c611bb7c3b29604a6b (patch) | |
| tree | 5be48b79e72342bc2740155cf6cde960af5cbd79 /soh/include/functions.h | |
| parent | f4d951aab8966add4e19a4151b41ff53d746d9f6 (diff) | |
| parent | 86580fc79fd174a2dba29c18caf88a46d6bf8c05 (diff) | |
Merge remote-tracking branch 'origin/develop' into develop->develop-rando
Diffstat (limited to 'soh/include/functions.h')
| -rw-r--r-- | soh/include/functions.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/soh/include/functions.h b/soh/include/functions.h index f6f3aedac..82b03e637 100644 --- a/soh/include/functions.h +++ b/soh/include/functions.h @@ -22,12 +22,10 @@ extern "C" void gSPSegment(void* value, int segNum, uintptr_t target); void gSPSegmentLoadRes(void* value, int segNum, uintptr_t target); -void gDPSetTextureImage(Gfx* pkt, u32 f, u32 s, u32 w, uintptr_t i); void gSPDisplayList(Gfx* pkt, Gfx* dl); void gSPDisplayListOffset(Gfx* pkt, Gfx* dl, int offset); void gSPVertex(Gfx* pkt, uintptr_t v, int n, int v0); void gSPInvalidateTexCache(Gfx* pkt, uintptr_t texAddr); -void gDPSetTextureImageFB(Gfx* pkt, u32 format, u32 size, u32 width, int fb); void cleararena(void); @@ -1261,6 +1259,8 @@ void SkelAnime_DrawFlexLod(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListIndex); void SkelAnime_DrawSkeletonOpa(PlayState* play, SkelAnime* skelAnime, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg); +Gfx* SkelAnime_DrawSkeleton2(PlayState* play, SkelAnime* skelAnime, OverrideLimbDrawOpa overrideLimbDraw, + PostLimbDrawOpa postLimbDraw, void* arg, Gfx* gfx); void SkelAnime_DrawOpa(PlayState* play, void** skeleton, Vec3s* jointTable, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg); void SkelAnime_DrawFlexOpa(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, @@ -2466,6 +2466,8 @@ void Message_DrawText(PlayState* play, Gfx** gfxP); void Interface_CreateQuadVertexGroup(Vtx* vtxList, s32 xStart, s32 yStart, s32 width, s32 height, u8 flippedH); void Interface_RandoRestoreSwordless(void); +s32 Ship_CalcShouldDrawAndUpdate(PlayState* play, Actor* actor, Vec3f* projectedPos, f32 projectedW, bool* shouldDraw, + bool* shouldUpdate); //Pause Warp void PauseWarp_HandleSelection(); |