mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-10 19:20:13 +00:00
781d497264
* remove fake match * Fire and Ice arrows * Light arrows * Ganon otyuka and end title * Oceff_Spot * Add missing Vtx to arrows * Update assets/xml/overlays/ovl_Arrow_Ice.xml Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Update assets/xml/overlays/ovl_Arrow_Light.xml Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Fix fire arrows * Update assets/xml/overlays/ovl_Arrow_Fire.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update ovl_Bg_Ganon_Otyuka.xml * Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Change a comment and rename a DList * rename DList * Jya cobra * shd and elf_msg * elf msg 2 * En Bili * Remove extern form ice piece * remove some externs * en holl * kanban * make * sda * ssh and some cleanup * replace undefined sym in en_kusa * st * oceff wipe 3 * oceff wipe * oceff spot * oceff spot * oceff wipe 4 * Update VTXDIS * update VTXDIS again * fix sun song * magic dark * magic wind and oceff wipe 2 * magic fire and oceff storm * Update src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/overlays/ovl_En_Sth.xml.ignore Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/overlays/ovl_Elf_Msg.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/overlays/ovl_Magic_Wind.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix emptyDL, run formatter on en_ssh * run formatter * Update format.sh * update to VTXDIS * small change * textureDL -> materialDL, vtxDL -> modelDL * upper CASE * setupDL -> materialDL * GeometryDL->ModelDL and VisualDL->MaterialDL * revert rcp.c * revert holl.c * another revert in rcp.c * some u32 DL -> Gfx* DL * the rest of dragorns comments * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "3e9ed72e2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "3e9ed72e2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * start updating overlays with static * en sth OK * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "d0cd6b397" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "d0cd6b397" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * fix names of the overlays * remove segment 128, add gameplay keep to global config file * Fix end title and remove hex mode from VTXdis.c * add code assets Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
78 lines
2 KiB
C
78 lines
2 KiB
C
#ifndef Z64TRANSITION_H
|
|
#define Z64TRANSITION_H
|
|
|
|
#include "ultra64.h"
|
|
#include "color.h"
|
|
|
|
typedef struct {
|
|
f32 unk_0;
|
|
f32 unk_4;
|
|
} TransitionUnkData;
|
|
|
|
typedef struct {
|
|
/* 0x00 */ s32 row;
|
|
/* 0x04 */ s32 col;
|
|
/* 0x08 */ s32 frame;
|
|
/* 0x0C */ TransitionUnkData* unk_0C;
|
|
/* 0x10 */ Vtx* vtxFrame1;
|
|
/* 0x14 */ Vtx* vtxFrame2;
|
|
/* 0x18 */ Mtx projection;
|
|
/* 0x58 */ Mtx modelView;
|
|
/* 0x98 */ Mtx unk_98;
|
|
/* 0xD8 */ Gfx* gfx; // "gfxtbl"
|
|
/* 0xDC */ u16* zBuffer;
|
|
} TransitionUnk; // size = 0xE0
|
|
|
|
typedef struct {
|
|
/* 0x000 */ Color_RGBA8_u32 color;
|
|
/* 0x004 */ Color_RGBA8_u32 envColor;
|
|
/* 0x008 */ u8 direction;
|
|
/* 0x009 */ u8 frame;
|
|
/* 0x00A */ u8 isDone;
|
|
/* 0x00C */ u16 texX;
|
|
/* 0x00E */ u16 texY;
|
|
/* 0x010 */ u16 normal;
|
|
/* 0x018 */ Mtx projection;
|
|
/* 0x058 */ Mtx lookAt;
|
|
/* 0x098 */ Mtx modelView[2][3];
|
|
} TransitionWipe; // size = 0x218
|
|
|
|
typedef struct {
|
|
/* 0x000 */ u8 fadeType;
|
|
/* 0x001 */ u8 isDone;
|
|
/* 0x002 */ u8 fadeDirection;
|
|
/* 0x004 */ Color_RGBA8_u32 fadeColor;
|
|
/* 0x008 */ u16 fadeTimer;
|
|
} TransitionFade; // size = 0xC
|
|
|
|
typedef struct {
|
|
/* 0x000 */ Color_RGBA8_u32 color;
|
|
/* 0x004 */ Color_RGBA8_u32 envColor;
|
|
/* 0x008 */ s32 texX;
|
|
/* 0x00C */ s32 texY;
|
|
/* 0x010 */ s32 step;
|
|
/* 0x014 */ u8 unk_14;
|
|
/* 0x015 */ u8 typeColor;
|
|
/* 0x016 */ u8 speed;
|
|
/* 0x017 */ u8 effect;
|
|
/* 0x018 */ u8 isDone;
|
|
/* 0x019 */ u8 frame;
|
|
/* 0x01A */ u16 normal;
|
|
/* 0x020 */ Mtx projection;
|
|
/* 0x060 */ Mtx lookAt;
|
|
/* 0x0A0 */ void* texture;
|
|
/* 0x0A8 */ Mtx modelView[2][3];
|
|
} TransitionCircle; // size = 0x228;
|
|
|
|
typedef struct {
|
|
/* 0x000 */ Color_RGBA8_u32 color;
|
|
/* 0x004 */ f32 transPos;
|
|
/* 0x008 */ f32 step;
|
|
/* 0x00C */ s32 state;
|
|
/* 0x010 */ s32 fadeDirection;
|
|
/* 0x018 */ Mtx projection;
|
|
/* 0x058 */ s32 frame;
|
|
/* 0x060 */ Mtx modelView[2][3];
|
|
} TransitionTriforce; // size = 0x1E0;
|
|
|
|
#endif
|