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

Change Colors To Decimal (#260)

Browse source 
* fix colliderinit typo

* convert as many colors i can find to decimal

* fix GPACK_RGBA5551, merge fhgFire

* fix remaining colors

* remove unwanted file

* alpha as 1
This commit is contained in:
fig02 2020-07-16 21:37:53 -04:00 • committed by GitHub
parent bc14f6d93e
commit 24ab14f748
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 771 additions and 743 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

@ -272,8 +272,8 @@ Gfx sInnerCylinderDList[] = {
ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2),
gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR),
gsDPSetPrimColor(0, 0x80, 0xFF, 0xFF, 0xAA, 0xFF),
gsDPSetEnvColor(0x96, 0xFF, 0x00, 0x00),
gsDPSetPrimColor(0, 0x80, 255, 255, 170, 255),
gsDPSetEnvColor(150, 255, 0, 0),
gsSPDisplayList(0x08000000),
gsSPVertex(&sCylinderVtx[0], 18, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
@ -299,8 +299,8 @@ Gfx sOuterCylinderDList[] = {
ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2),
gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR),
gsDPSetPrimColor(0, 0x80, 0xFF, 0xFF, 0xAA, 0xFF),
gsDPSetEnvColor(0x00, 0x96, 0x00, 0x00),
gsDPSetPrimColor(0, 0x80, 255, 255, 170, 255),
gsDPSetEnvColor(0, 150, 0, 0),
gsSPDisplayList(0x09000000),
gsSPVertex(&sCylinderVtx[18], 18, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),