mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-25 06:19:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add fade flags enum

Browse Source
This commit is contained in:
Tal Hayon
2022-04-05 22:56:37 +03:00
parent 55213bc9a4
commit d3c5ce50f0
30 changed files with 176 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/fourElements.c
+1 -1
View File
@@ -98,7 +98,7 @@ void FourElements_Action2(FourElementsEntity* this) {
gScreen.controls.alphaBlend = 0;
InitItemGetSequence(super->type, 0, 1);
sub_0808C650(super, 1);
SetFade(6, 2);
SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 2);
SoundReq(SFX_F8);
SoundReq(SFX_148);
SoundReq(BGM_ELEMENT_GET);
src/object/greatFairy.c
+1 -1
View File
@@ -119,7 +119,7 @@ void GreatFairy_SpawningUpdate(Entity* this) {
mini = GreatFairy_CreateForm(this, WAKE, 0); //???
if (mini != NULL) {
CopyPosition(this, mini);
SetFade(6, 4);
SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 4);
SoundReq(SFX_145);
this->action = 4;
this->timer = 60;
src/object/gyorgBossObject.c
+1 -1
View File
@@ -252,7 +252,7 @@ void GyorgBossObject_FightEnd(GyorgBossObjectEntity* this) {
return;
}
if (super->subtimer == 0x3C) {
SetFade(7, 4);
SetFade(FADE_IN_OUT | FADE_BLACK_WHITE | FADE_INSTANT, 4);
}
return;
}
src/object/object3D.c
+1 -1
View File
@@ -76,7 +76,7 @@ void Object3D_Action1(Object3DEntity* this) {
super->spriteRendering.b0 = 3;
SetAffineInfo(super, 0x100, 0x100, 0);
gArea.field_0x10 = 1;
SetFade(5, 8);
SetFade(FADE_IN_OUT | FADE_INSTANT, 8);
}
}
src/object/object6A.c
+2 -2
View File
@@ -1305,11 +1305,11 @@ void sub_0809629C(Object6AEntity* this, u32 type) {
}
void sub_080962D8(Object6AEntity* this) {
SetFade(6, 0x100);
SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 0x100);
}
void sub_080962E8(Object6AEntity* this) {
SetFade(7, 0x100);
SetFade(FADE_IN_OUT | FADE_BLACK_WHITE | FADE_INSTANT, 0x100);
}
void sub_080962F8(Object6AEntity* this, ScriptExecutionContext* ctx) {
src/object/object8E.c
+1 -1
View File
@@ -253,7 +253,7 @@ void Object8E_Type3(Object8EEntity* this) {
if (sub_0809BE78(this)) {
if (super->timer != 0) {
if (--super->timer == 0) {
SetFade(6, 8);
SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 8);
sub_0805AAF0(3);
gScreen.lcd.displayControl = (gScreen.lcd.displayControl & 0xbfff) | 0x2800;
}