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

Update ZAPD (#1001)

Browse source 
* remove fake match

* 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"

* new extraction script and a hack to make clear tag work

* fix clear tag again

* remove static from clear tag DLists

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "e7a8a48cf"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "e7a8a48cf"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "e243634e5"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "e243634e5"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* 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"

* Update ovl_En_Clear_Tag.xml
This commit is contained in:
louist103 2021-10-17 07:32:09 -04:00 • committed by GitHub
parent ed487b4bb8
commit 750c0cab35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
272 changed files with 7790 additions and 58414 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1467,7 +1467,29 @@ UCFUNC int d_SPLine3D(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_SPLine3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo)
{
m->id = gfxd_SPLine3D;
int n0 = getfield(lo, 8, 16);
int n1 = getfield(lo, 8, 8);
argi(m, 0, "v0", n0 / 2, gfxd_Vtx);
argi(m, 1, "v1", n1 / 2, gfxd_Vtx);
argi(m, 2, "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;
}
return ret;
}
#elif defined(F3DEX_GBI_2)
UCFUNC int d_SPLine3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo)
{
m->id = gfxd_SPLine3D;
@ -2055,7 +2077,7 @@ UCFUNC int d_BranchZ(gfxd_macro_t *m, uint32_t hi, uint32_t lo)
int nb = getfield(hi, 12, 0);
int32_t zval;
if (lo > 0x7FFFFFFF)
zval = -0x80000000 + (int32_t)(lo & 0x7FFFFFFF);
zval = INT32_MIN + (int32_t)(lo & 0x7FFFFFFF);
else
zval = lo;
argi(m, 0, "vtx", nb / 2, gfxd_Vtx);