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

256
src/code/z_collision_check.c
View file

@ -1243,38 +1243,38 @@ void func_8005DFAC(GlobalContext* globalCtx, Collider* collider, Vec3f* v) {
D_8015D8A0.position.z = (s32)v->z;
D_8015D8A0.uDiv = 5;
D_8015D8A0.vDiv = 5;
D_8015D8A0.colorStart[0].r = 0x0A;
D_8015D8A0.colorStart[0].g = 0x0A;
D_8015D8A0.colorStart[0].b = 0xC8;
D_8015D8A0.colorStart[0].a = 0xFF;
D_8015D8A0.colorStart[1].r = 0x00;
D_8015D8A0.colorStart[1].g = 0x00;
D_8015D8A0.colorStart[1].b = 0x80;
D_8015D8A0.colorStart[1].a = 0xFF;
D_8015D8A0.colorStart[2].r = 0x00;
D_8015D8A0.colorStart[2].g = 0x00;
D_8015D8A0.colorStart[2].b = 0x80;
D_8015D8A0.colorStart[2].a = 0xFF;
D_8015D8A0.colorStart[3].r = 0x00;
D_8015D8A0.colorStart[3].g = 0x00;
D_8015D8A0.colorStart[3].b = 0x80;
D_8015D8A0.colorStart[3].a = 0xFF;
D_8015D8A0.colorEnd[0].r = 0x00;
D_8015D8A0.colorEnd[0].g = 0x00;
D_8015D8A0.colorEnd[0].b = 0x20;
D_8015D8A0.colorEnd[0].a = 0x00;
D_8015D8A0.colorEnd[1].r = 0x00;
D_8015D8A0.colorEnd[1].g = 0x00;
D_8015D8A0.colorEnd[1].b = 0x20;
D_8015D8A0.colorEnd[1].a = 0x00;
D_8015D8A0.colorEnd[2].r = 0x00;
D_8015D8A0.colorEnd[2].g = 0x00;
D_8015D8A0.colorEnd[2].b = 0x40;
D_8015D8A0.colorEnd[2].a = 0x00;
D_8015D8A0.colorEnd[3].r = 0x00;
D_8015D8A0.colorEnd[3].g = 0x00;
D_8015D8A0.colorEnd[3].b = 0x40;
D_8015D8A0.colorEnd[3].a = 0x00;
D_8015D8A0.colorStart[0].r = 10;
D_8015D8A0.colorStart[0].g = 10;
D_8015D8A0.colorStart[0].b = 200;
D_8015D8A0.colorStart[0].a = 255;
D_8015D8A0.colorStart[1].r = 0;
D_8015D8A0.colorStart[1].g = 0;
D_8015D8A0.colorStart[1].b = 128;
D_8015D8A0.colorStart[1].a = 255;
D_8015D8A0.colorStart[2].r = 0;
D_8015D8A0.colorStart[2].g = 0;
D_8015D8A0.colorStart[2].b = 128;
D_8015D8A0.colorStart[2].a = 255;
D_8015D8A0.colorStart[3].r = 0;
D_8015D8A0.colorStart[3].g = 0;
D_8015D8A0.colorStart[3].b = 128;
D_8015D8A0.colorStart[3].a = 255;
D_8015D8A0.colorEnd[0].r = 0;
D_8015D8A0.colorEnd[0].g = 0;
D_8015D8A0.colorEnd[0].b = 32;
D_8015D8A0.colorEnd[0].a = 0;
D_8015D8A0.colorEnd[1].r = 0;
D_8015D8A0.colorEnd[1].g = 0;
D_8015D8A0.colorEnd[1].b = 32;
D_8015D8A0.colorEnd[1].a = 0;
D_8015D8A0.colorEnd[2].r = 0;
D_8015D8A0.colorEnd[2].g = 0;
D_8015D8A0.colorEnd[2].b = 64;
D_8015D8A0.colorEnd[2].a = 0;
D_8015D8A0.colorEnd[3].r = 0;
D_8015D8A0.colorEnd[3].g = 0;
D_8015D8A0.colorEnd[3].b = 64;
D_8015D8A0.colorEnd[3].a = 0;
D_8015D8A0.timer = 0;
D_8015D8A0.duration = 16;
D_8015D8A0.speed = 8.0f;
@ -1299,38 +1299,38 @@ void func_8005E10C(GlobalContext* globalCtx, Collider* collider, Vec3f* v) {
D_8015DD68.position.z = (s32)v->z;
D_8015DD68.uDiv = 5;
D_8015DD68.vDiv = 5;
D_8015DD68.colorStart[0].r = 0x0A;
D_8015DD68.colorStart[0].g = 0xC8;
D_8015DD68.colorStart[0].b = 0x0A;
D_8015DD68.colorStart[0].a = 0xFF;
D_8015DD68.colorStart[1].r = 0x00;
D_8015DD68.colorStart[1].g = 0x80;
D_8015DD68.colorStart[1].b = 0x00;
D_8015DD68.colorStart[1].a = 0xFF;
D_8015DD68.colorStart[2].r = 0x00;
D_8015DD68.colorStart[2].g = 0x80;
D_8015DD68.colorStart[2].b = 0x00;
D_8015DD68.colorStart[2].a = 0xFF;
D_8015DD68.colorStart[3].r = 0x00;
D_8015DD68.colorStart[3].g = 0x80;
D_8015DD68.colorStart[3].b = 0x00;
D_8015DD68.colorStart[3].a = 0xFF;
D_8015DD68.colorEnd[0].r = 0x00;
D_8015DD68.colorEnd[0].g = 0x20;
D_8015DD68.colorEnd[0].b = 0x00;
D_8015DD68.colorEnd[0].a = 0x00;
D_8015DD68.colorEnd[1].r = 0x00;
D_8015DD68.colorEnd[1].g = 0x20;
D_8015DD68.colorEnd[1].b = 0x00;
D_8015DD68.colorEnd[1].a = 0x00;
D_8015DD68.colorEnd[2].r = 0x00;
D_8015DD68.colorEnd[2].g = 0x40;
D_8015DD68.colorEnd[2].b = 0x00;
D_8015DD68.colorEnd[2].a = 0x00;
D_8015DD68.colorEnd[3].r = 0x00;
D_8015DD68.colorEnd[3].g = 0x40;
D_8015DD68.colorEnd[3].b = 0x00;
D_8015DD68.colorEnd[3].a = 0x00;
D_8015DD68.colorStart[0].r = 10;
D_8015DD68.colorStart[0].g = 200;
D_8015DD68.colorStart[0].b = 10;
D_8015DD68.colorStart[0].a = 255;
D_8015DD68.colorStart[1].r = 0;
D_8015DD68.colorStart[1].g = 128;
D_8015DD68.colorStart[1].b = 0;
D_8015DD68.colorStart[1].a = 255;
D_8015DD68.colorStart[2].r = 0;
D_8015DD68.colorStart[2].g = 128;
D_8015DD68.colorStart[2].b = 0;
D_8015DD68.colorStart[2].a = 255;
D_8015DD68.colorStart[3].r = 0;
D_8015DD68.colorStart[3].g = 128;
D_8015DD68.colorStart[3].b = 0;
D_8015DD68.colorStart[3].a = 255;
D_8015DD68.colorEnd[0].r = 0;
D_8015DD68.colorEnd[0].g = 32;
D_8015DD68.colorEnd[0].b = 0;
D_8015DD68.colorEnd[0].a = 0;
D_8015DD68.colorEnd[1].r = 0;
D_8015DD68.colorEnd[1].g = 32;
D_8015DD68.colorEnd[1].b = 0;
D_8015DD68.colorEnd[1].a = 0;
D_8015DD68.colorEnd[2].r = 0;
D_8015DD68.colorEnd[2].g = 64;
D_8015DD68.colorEnd[2].b = 0;
D_8015DD68.colorEnd[2].a = 0;
D_8015DD68.colorEnd[3].r = 0;
D_8015DD68.colorEnd[3].g = 64;
D_8015DD68.colorEnd[3].b = 0;
D_8015DD68.colorEnd[3].a = 0;
D_8015DD68.timer = 0;
D_8015DD68.duration = 16;
D_8015DD68.speed = 8.0f;
@ -2949,38 +2949,38 @@ void func_80062A28(GlobalContext* globalCtx, Vec3f* v) {
D_8015CF10.position.z = (s32)v->z;
D_8015CF10.uDiv = 5;
D_8015CF10.vDiv = 5;
D_8015CF10.colorStart[0].r = 0x80;
D_8015CF10.colorStart[0].g = 0x00;
D_8015CF10.colorStart[0].b = 0x40;
D_8015CF10.colorStart[0].a = 0xFF;
D_8015CF10.colorStart[1].r = 0x80;
D_8015CF10.colorStart[1].g = 0x00;
D_8015CF10.colorStart[1].b = 0x40;
D_8015CF10.colorStart[1].a = 0xFF;
D_8015CF10.colorStart[2].r = 0xFF;
D_8015CF10.colorStart[2].g = 0x80;
D_8015CF10.colorStart[2].b = 0x00;
D_8015CF10.colorStart[2].a = 0xFF;
D_8015CF10.colorStart[3].r = 0xFF;
D_8015CF10.colorStart[3].g = 0x80;
D_8015CF10.colorStart[3].b = 0x00;
D_8015CF10.colorStart[3].a = 0xFF;
D_8015CF10.colorEnd[0].r = 0x40;
D_8015CF10.colorEnd[0].g = 0x00;
D_8015CF10.colorEnd[0].b = 0x20;
D_8015CF10.colorEnd[0].a = 0x00;
D_8015CF10.colorEnd[1].r = 0x40;
D_8015CF10.colorEnd[1].g = 0x00;
D_8015CF10.colorEnd[1].b = 0x20;
D_8015CF10.colorEnd[1].a = 0x00;
D_8015CF10.colorEnd[2].r = 0x80;
D_8015CF10.colorEnd[2].g = 0x00;
D_8015CF10.colorEnd[2].b = 0x40;
D_8015CF10.colorEnd[2].a = 0x00;
D_8015CF10.colorEnd[3].r = 0x80;
D_8015CF10.colorEnd[3].g = 0x00;
D_8015CF10.colorEnd[3].b = 0x40;
D_8015CF10.colorEnd[3].a = 0x00;
D_8015CF10.colorStart[0].r = 128;
D_8015CF10.colorStart[0].g = 0;
D_8015CF10.colorStart[0].b = 64;
D_8015CF10.colorStart[0].a = 255;
D_8015CF10.colorStart[1].r = 128;
D_8015CF10.colorStart[1].g = 0;
D_8015CF10.colorStart[1].b = 64;
D_8015CF10.colorStart[1].a = 255;
D_8015CF10.colorStart[2].r = 255;
D_8015CF10.colorStart[2].g = 128;
D_8015CF10.colorStart[2].b = 0;
D_8015CF10.colorStart[2].a = 255;
D_8015CF10.colorStart[3].r = 255;
D_8015CF10.colorStart[3].g = 128;
D_8015CF10.colorStart[3].b = 0;
D_8015CF10.colorStart[3].a = 255;
D_8015CF10.colorEnd[0].r = 64;
D_8015CF10.colorEnd[0].g = 0;
D_8015CF10.colorEnd[0].b = 32;
D_8015CF10.colorEnd[0].a = 0;
D_8015CF10.colorEnd[1].r = 64;
D_8015CF10.colorEnd[1].g = 0;
D_8015CF10.colorEnd[1].b = 32;
D_8015CF10.colorEnd[1].a = 0;
D_8015CF10.colorEnd[2].r = 128;
D_8015CF10.colorEnd[2].g = 0;
D_8015CF10.colorEnd[2].b = 64;
D_8015CF10.colorEnd[2].a = 0;
D_8015CF10.colorEnd[3].r = 128;
D_8015CF10.colorEnd[3].g = 0;
D_8015CF10.colorEnd[3].b = 64;
D_8015CF10.colorEnd[3].a = 0;
D_8015CF10.timer = 0;
D_8015CF10.duration = 16;
D_8015CF10.speed = 8.0f;
@ -3004,38 +3004,38 @@ void func_80062B80(GlobalContext* globalCtx, Vec3f* v) {
D_8015D3D8.position.z = (s32)v->z;
D_8015D3D8.uDiv = 5;
D_8015D3D8.vDiv = 5;
D_8015D3D8.colorStart[0].r = 0xFF;
D_8015D3D8.colorStart[0].g = 0xFF;
D_8015D3D8.colorStart[0].b = 0xFF;
D_8015D3D8.colorStart[0].a = 0xFF;
D_8015D3D8.colorStart[1].r = 0x64;
D_8015D3D8.colorStart[1].g = 0x64;
D_8015D3D8.colorStart[1].b = 0x64;
D_8015D3D8.colorStart[1].a = 0x64;
D_8015D3D8.colorStart[2].r = 0x64;
D_8015D3D8.colorStart[2].g = 0x64;
D_8015D3D8.colorStart[2].b = 0x64;
D_8015D3D8.colorStart[2].a = 0x64;
D_8015D3D8.colorStart[3].r = 0x64;
D_8015D3D8.colorStart[3].g = 0x64;
D_8015D3D8.colorStart[3].b = 0x64;
D_8015D3D8.colorStart[3].a = 0x64;
D_8015D3D8.colorEnd[0].r = 0x32;
D_8015D3D8.colorEnd[0].g = 0x32;
D_8015D3D8.colorEnd[0].b = 0x32;
D_8015D3D8.colorEnd[0].a = 0x32;
D_8015D3D8.colorEnd[1].r = 0x32;
D_8015D3D8.colorEnd[1].g = 0x32;
D_8015D3D8.colorEnd[1].b = 0x32;
D_8015D3D8.colorEnd[1].a = 0x32;
D_8015D3D8.colorEnd[2].r = 0x32;
D_8015D3D8.colorEnd[2].g = 0x32;
D_8015D3D8.colorEnd[2].b = 0x32;
D_8015D3D8.colorEnd[2].a = 0x32;
D_8015D3D8.colorEnd[3].r = 0x00;
D_8015D3D8.colorEnd[3].g = 0x00;
D_8015D3D8.colorEnd[3].b = 0x00;
D_8015D3D8.colorEnd[3].a = 0x00;
D_8015D3D8.colorStart[0].r = 255;
D_8015D3D8.colorStart[0].g = 255;
D_8015D3D8.colorStart[0].b = 255;
D_8015D3D8.colorStart[0].a = 255;
D_8015D3D8.colorStart[1].r = 100;
D_8015D3D8.colorStart[1].g = 100;
D_8015D3D8.colorStart[1].b = 100;
D_8015D3D8.colorStart[1].a = 100;
D_8015D3D8.colorStart[2].r = 100;
D_8015D3D8.colorStart[2].g = 100;
D_8015D3D8.colorStart[2].b = 100;
D_8015D3D8.colorStart[2].a = 100;
D_8015D3D8.colorStart[3].r = 100;
D_8015D3D8.colorStart[3].g = 100;
D_8015D3D8.colorStart[3].b = 100;
D_8015D3D8.colorStart[3].a = 100;
D_8015D3D8.colorEnd[0].r = 50;
D_8015D3D8.colorEnd[0].g = 50;
D_8015D3D8.colorEnd[0].b = 50;
D_8015D3D8.colorEnd[0].a = 50;
D_8015D3D8.colorEnd[1].r = 50;
D_8015D3D8.colorEnd[1].g = 50;
D_8015D3D8.colorEnd[1].b = 50;
D_8015D3D8.colorEnd[1].a = 50;
D_8015D3D8.colorEnd[2].r = 50;
D_8015D3D8.colorEnd[2].g = 50;
D_8015D3D8.colorEnd[2].b = 50;
D_8015D3D8.colorEnd[2].a = 50;
D_8015D3D8.colorEnd[3].r = 0;
D_8015D3D8.colorEnd[3].g = 0;
D_8015D3D8.colorEnd[3].b = 0;
D_8015D3D8.colorEnd[3].a = 0;
D_8015D3D8.timer = 0;
D_8015D3D8.duration = 16;
D_8015D3D8.speed = 8.0f;