mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 20:35:13 +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

14
src/code/z_fbdemo_circle.c
View file

@ -304,18 +304,18 @@ void TransitionCircle_Start(TransitionCircle* this) {
}
if (this->typeColor == 0) {
this->color.rgba = RGBA8(0x00, 0x00, 0x00, 0xFF);
this->color.rgba = RGBA8(0, 0, 0, 255);
} else if (this->typeColor == 1) {
this->color.rgba = RGBA8(0xA0, 0xA0, 0xA0, 0xFF);
this->color.rgba = RGBA8(160, 160, 160, 255);
} else if (this->typeColor == 2) {
// yes, really.
this->color.r = 0x64;
this->color.g = 0x64;
this->color.b = 0x64;
this->color.a = 0xFF;
this->color.r = 100;
this->color.g = 100;
this->color.b = 100;
this->color.a = 255;
} else {
this->step = 0x28;
this->color.rgba = this->effect == 1 ? RGBA8(0x00, 0x00, 0x00, 0xFF) : RGBA8(0xA0, 0xA0, 0xA0, 0xFF);
this->color.rgba = this->effect == 1 ? RGBA8(0, 0, 0, 255) : RGBA8(160, 160, 160, 255);
}
if (this->unk_14 != 0) {
this->texY = 0;