mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-14 19:10:25 +00:00
Code Issues Projects Releases Wiki Activity

Big cleanup (#775)

Browse source 
* Adult and child2 macros OK

* ICHAIN cleanup

* almost all overlay data

* format.sh

* func_8002FBAC NON_EQUIVALENT

* PR fixes (MZXrules)

* fix

* change //@ bug to //! @bug

* merge master and missed a //@bug

* fix ruto

* some more cleanup (#2)

* more `! @bug` formatting cleanup

* parenthesis cleanup

* hex naviEnemyId

* run formatter

* replace `IS_NOT_` macros with `!IS_`

* run formatter

* run formatter

* PR fixes (fig)

* Missed something

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103 2021-08-21 19:12:57 -04:00 • committed by GitHub
parent 17c79a8f60
commit 556cdad7eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
177 changed files with 902 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/overlays/actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c
View file

@ -1,7 +1,7 @@
#include "ultra64.h"
#include "global.h"
UNK_TYPE D_80991680[] = {
static UNK_TYPE D_80991680[] = {
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
@ -61,7 +61,7 @@ UNK_TYPE D_80991680[] = {
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
};
UNK_TYPE D_80991E80[] = {
static UNK_TYPE D_80991E80[] = {
0x2F3E56AB, 0xA4582102, 0x10417AB0, 0x805C312A, 0x32376DD4, 0xA2633907, 0x0B387DA2, 0x6D81470C, 0x3C5C60AC,
0xA5571801, 0x154C97B9, 0x68533236, 0x304276D6, 0x9B533108, 0x154A96B7, 0x7C9B400B, 0x3E756FAE, 0xAF5D1301,
0x1D59B4BF, 0x53432C38, 0x2F487DCC, 0x8A4A2406, 0x1F5DB0C8, 0x90B55110, 0x408B7FAA, 0xB76D1503, 0x286ACCBE,
@ -121,7 +121,7 @@ UNK_TYPE D_80991E80[] = {
0x242B4FB8, 0xB66A2E06, 0x0D3E66AA, 0x9B663322, 0x3B2D6CDD, 0xB47B450A, 0x062B6E9C, 0x6E705D17,
};
Vtx D_80992680[] = {
static Vtx D_80992680[] = {
VTX(405, 1572, -1643, 401, -3470, 0x00, 0x78, 0x00, 0xFF),
VTX(470, 1488, -1799, 512, -3755, 0x00, 0x78, 0x00, 0xFF),
VTX(207, 1312, -1162, 251, -3368, 0x00, 0x78, 0x00, 0xFF),
@ -156,7 +156,7 @@ Vtx D_80992680[] = {
VTX(1915, 295, 1153, 410, 2901, 0x00, 0x78, 0x00, 0xFF),
};
Vtx D_80992880[] = {
static Vtx D_80992880[] = {
VTX(1905, 295, 1026, 410, 2617, 0x00, 0x78, 0x00, 0xFF), VTX(1940, 295, 1047, 512, 2674, 0x00, 0x78, 0x00, 0xFF),
VTX(1905, 220, 1026, 396, 2481, 0x00, 0x78, 0x00, 0xFF), VTX(1940, 220, 1047, 512, 2560, 0x00, 0x78, 0x00, 0xFF),
VTX(1658, 220, 1169, 101, 2487, 0x00, 0x78, 0x00, 0xFF), VTX(1658, 220, 1215, 0, 2560, 0x00, 0x78, 0x00, 0xFF),
@ -175,7 +175,7 @@ Vtx D_80992880[] = {
VTX(1915, -200, 1153, 410, 4096, 0x00, 0x78, 0x00, 0xFF), VTX(1968, -200, 1172, 512, 4096, 0x00, 0x78, 0x00, 0xFF),
};
Vtx D_80992A80[] = {
static Vtx D_80992A80[] = {
VTX(1915, 295, 1153, 410, 2901, 0x00, 0x78, 0x00, 0xFF),
VTX(1968, -200, 1172, 512, 4096, 0x00, 0x78, 0x00, 0xFF),
VTX(1968, 295, 1172, 512, 2958, 0x00, 0x78, 0x00, 0xFF),
@ -204,13 +204,13 @@ Vtx D_80992A80[] = {
VTX(-76, 820, -1633, 0, -4096, 0x00, 0x78, 0x00, 0xFF),
};
Vtx D_80992C20[] = {
static Vtx D_80992C20[] = {
VTX(1658, 295, 1169, 205, 1308, 0x00, 0x78, 0x00, 0xFF),
VTX(1763, 295, 1241, 205, 1451, 0x00, 0x78, 0x00, 0xFF),
VTX(1915, 295, 1153, 819, 1451, 0x00, 0x78, 0x00, 0xFF),
};
Vtx D_80992C50[] = {
static Vtx D_80992C50[] = {
VTX(-389, 800, -1884, 102, 4096, 0x2E, 0x00, 0x92, 0xFF),
VTX(-989, 800, -2131, 512, 4096, 0x2E, 0x00, 0x92, 0xFF),
VTX(-389, 1312, -1884, 102, 3589, 0x2B, 0x29, 0x98, 0xFF),
@ -245,7 +245,7 @@ Vtx D_80992C50[] = {
VTX(112, 20, 1211, 256, -12288, 0x00, 0x78, 0x00, 0xFF),
};
Vtx D_80992E50[] = {
static Vtx D_80992E50[] = {
VTX(-1481, 1314, -1874, 512, 2676, 0x4D, 0x56, 0x1F, 0xFF),
VTX(-2157, 1810, -1555, 512, 1661, 0x49, 0x56, 0x28, 0xFF),
VTX(-1708, 1312, -1303, 181, 2088, 0x47, 0x53, 0x31, 0xFF),
@ -278,7 +278,7 @@ Vtx D_80992E50[] = {
VTX(-2717, 2160, -1291, 512, 850, 0x48, 0x55, 0x2A, 0xFF),
};
Vtx D_80993030[] = {
static Vtx D_80993030[] = {
VTX(-5196, 1149, 2080, 512, -2955, 0x00, 0x78, 0x00, 0xFF),
VTX(-5194, 351, 2079, 512, -3868, 0x00, 0x78, 0x00, 0xFF),
VTX(-4653, 291, 1728, 0, -3868, 0x00, 0x78, 0x00, 0xFF),
@ -312,7 +312,7 @@ Vtx D_80993030[] = {
VTX(-4488, 1519, 3360, 512, -6384, 0x00, 0x78, 0x00, 0xFF),
};
Vtx D_80993220[] = {
static Vtx D_80993220[] = {
VTX(-4488, 1519, 3360, 512, -6384, 0x00, 0x78, 0x00, 0xFF),
VTX(-3980, 1539, 3206, 512, -6678, 0x00, 0x78, 0x00, 0xFF),
VTX(-4281, 1193, 2801, 0, -6531, 0x00, 0x78, 0x00, 0xFF),
@ -323,13 +323,13 @@ Vtx D_80993220[] = {
VTX(-4183, 1090, 2614, 0, -7266, 0x00, 0x78, 0x00, 0xFF),
};
Vtx D_809932A0[] = {
static Vtx D_809932A0[] = {
VTX(117, 20, 1458, 1024, -6144, 0x00, 0x78, 0x00, 0xFF),
VTX(112, 20, 1211, 512, -6144, 0x00, 0x78, 0x00, 0xFF),
VTX(-261, 20, 1460, 1024, -5941, 0x00, 0x78, 0x00, 0xFF),
};
Gfx D_809932D0[] = {
static Gfx D_809932D0[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(65535, 65535, 0, G_TX_RENDERTILE, G_ON),
@ -347,7 +347,7 @@ Gfx D_809932D0[] = {
gsSPEndDisplayList(),
};
Gfx D_80993390[] = {
static Gfx D_80993390[] = {
gsSPVertex(D_80992680, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
gsSP2Triangles(4, 6, 5, 0, 7, 8, 9, 0),
@ -387,7 +387,7 @@ Gfx D_80993390[] = {
gsSPEndDisplayList(),
};
Gfx D_809934B8[] = {
static Gfx D_809934B8[] = {
gsSPVertex(D_80992C50, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
gsSP2Triangles(4, 5, 3, 0, 5, 6, 3, 0),