mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 23:10:22 +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

8
src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c
View file

@ -1,6 +1,6 @@
#include "global.h"
Vtx sCylinderVtx[] = {
static Vtx sCylinderVtx[] = {
VTX(0, 0, -6000, 1024, 2048, 0xFF, 0xFF, 0xFF, 0xFF),
VTX(-4243, 12800, -4243, 1280, 0, 0xFF, 0xFF, 0xFF, 0x00),
VTX(0, 12800, -6000, 1024, 0, 0xFF, 0xFF, 0xFF, 0x00),
@ -41,7 +41,7 @@ Vtx sCylinderVtx[] = {
VTX(0, 0, 6000, 2048, 2048, 0xFF, 0xFF, 0xFF, 0xFF),
};
char sWindEffTexture[] = {
static char sWindEffTexture[] = {
0x06, 0x19, 0x28, 0x43, 0x66, 0x82, 0xA0, 0xAE, 0xA3, 0x93, 0x76, 0x56, 0x32, 0x12, 0x00, 0x00, 0x03, 0x15, 0x25,
0x39, 0x57, 0x81, 0xAD, 0xBC, 0xA4, 0x7B, 0x5D, 0x45, 0x33, 0x20, 0x24, 0x38, 0x33, 0x1F, 0x26, 0x4F, 0x71, 0x8C,
0xB2, 0xC9, 0xC7, 0xAE, 0x87, 0x57, 0x33, 0x24, 0x11, 0x00, 0x00, 0x05, 0x1C, 0x3B, 0x5E, 0x7D, 0x90, 0x93, 0x85,
@ -260,7 +260,7 @@ char sWindEffTexture[] = {
0x78, 0x8C, 0x8F, 0x86, 0x73, 0x72, 0x82, 0x83, 0x4E, 0x12, 0x00,
};
Gfx sInnerCylinderDList[] = {
static Gfx sInnerCylinderDList[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@ -287,7 +287,7 @@ Gfx sInnerCylinderDList[] = {
gsSPEndDisplayList(),
};
Gfx sOuterCylinderDList[] = {
static Gfx sOuterCylinderDList[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),