diff options
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/fourElements.c | 2 | ||||
| -rw-r--r-- | src/object/greatFairy.c | 2 | ||||
| -rw-r--r-- | src/object/gyorgBossObject.c | 2 | ||||
| -rw-r--r-- | src/object/object3D.c | 2 | ||||
| -rw-r--r-- | src/object/object6A.c | 4 | ||||
| -rw-r--r-- | src/object/object8E.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/object/fourElements.c b/src/object/fourElements.c index fb26c54b..24141d89 100644 --- a/src/object/fourElements.c +++ b/src/object/fourElements.c @@ -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); diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c index fdc16d3e..b8cf0c60 100644 --- a/src/object/greatFairy.c +++ b/src/object/greatFairy.c @@ -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; diff --git a/src/object/gyorgBossObject.c b/src/object/gyorgBossObject.c index 047c9a40..910498aa 100644 --- a/src/object/gyorgBossObject.c +++ b/src/object/gyorgBossObject.c @@ -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; } diff --git a/src/object/object3D.c b/src/object/object3D.c index 79a1aa16..82213ab0 100644 --- a/src/object/object3D.c +++ b/src/object/object3D.c @@ -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); } } diff --git a/src/object/object6A.c b/src/object/object6A.c index 6fdfce59..67ccf719 100644 --- a/src/object/object6A.c +++ b/src/object/object6A.c @@ -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) { diff --git a/src/object/object8E.c b/src/object/object8E.c index 5a4956c3..c987b2e8 100644 --- a/src/object/object8E.c +++ b/src/object/object8E.c @@ -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; } |
