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

ZAPD update: Gotta go fast! (#877)

Browse source 
* copy over the xml

* Rename anims

* A bunch of renames

* minor extract_assets fixes

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "820678b4e"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "820678b4e"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Change rgb5a1 to rgba16

* eye and eyebrows

* some dlists

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "6be9af65d"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "6be9af65d"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
This commit is contained in:
Anghelo Carvajal 2021-07-27 22:16:03 -04:00 • committed by GitHub
parent d1a5ea5110
commit 5c147e5e03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
226 changed files with 2350 additions and 1492 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tools/ZAPD/lib/libgfxd/uc_macrofn.c
View file

@ -1024,7 +1024,36 @@ UCFUNC int d_SP1Triangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo)
}
return ret;
}
#elif defined(F3DEX_GBI) || defined(F3DEX_GBI_2)
#elif defined(F3DEX_GBI)
UCFUNC int d_SP1Triangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo)
{
m->id = gfxd_SP1Triangle;
int n0 = getfield(lo, 8, 16);
int n1 = getfield(lo, 8, 8);
int n2 = getfield(lo, 8, 0);
argi(m, 0, "v0", n0 / 2, gfxd_Vtx);
argi(m, 1, "v1", n1 / 2, gfxd_Vtx);
argi(m, 2, "v2", n2 / 2, gfxd_Vtx);
argi(m, 3, "flag", 0, gfxd_Vtxflag);
int ret = 0;
if (n0 % 2 != 0)
{
badarg(m, 0);
ret = -1;
}
if (n1 % 2 != 0)
{
badarg(m, 1);
ret = -1;
}
if (n2 % 2 != 0)
{
badarg(m, 2);
ret = -1;
}
return ret;
}
#elif defined(F3DEX_GBI_2)
UCFUNC int d_SP1Triangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo)
{
m->id = gfxd_SP1Triangle;
@ -1053,7 +1082,9 @@ UCFUNC int d_SP1Triangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo)
}
return ret;
}
#endif
#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2)
UCFUNC int d_SP1Quadrangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo);
UCFUNC int d_SP2Triangles(gfxd_macro_t *m, uint32_t hi, uint32_t lo)
{
@ -2016,10 +2047,6 @@ UCFUNC int c_DPLoadTLUT(gfxd_macro_t *m, int n_macro)
return 0;
}
#ifdef _MSC_VER
#pragma warning(disable:4146)
#endif
#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2)
UCFUNC int d_BranchZ(gfxd_macro_t *m, uint32_t hi, uint32_t lo)
{