mirror of
https://github.com/zeldaret/tmc
synced 2026-08-20 14:15:10 -04:00
Add fade flags enum
This commit is contained in:
+2
-2
@@ -358,7 +358,7 @@ void Enemy64_Action4_SubAction4(Enemy64Entity* this) {
|
||||
sub_08049998(this, ((0x100 - super->direction) & 0xff) << 8);
|
||||
if (--super->timer == 0) {
|
||||
super->subAction = 5;
|
||||
SetFade(5, 0x10);
|
||||
SetFade(FADE_IN_OUT | FADE_INSTANT, 0x10);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -382,7 +382,7 @@ void Enemy64_Action4_SubAction5(Enemy64Entity* this) {
|
||||
entity->y.HALF.HI = gRoomControls.origin_y + 0x80;
|
||||
entity->animationState = 0;
|
||||
sub_080809D4();
|
||||
SetFade(4, 4);
|
||||
SetFade(FADE_INSTANT, 4);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -126,7 +126,7 @@ void Gleerok_OnDeath(GleerokEntity* this) {
|
||||
void sub_0802D158(GleerokEntity* this) {
|
||||
super->action = 1;
|
||||
gPauseMenuOptions.disabled = 1;
|
||||
SetFade(7, 8);
|
||||
SetFade(FADE_IN_OUT | FADE_BLACK_WHITE | FADE_INSTANT, 8);
|
||||
}
|
||||
|
||||
void sub_0802D170(GleerokEntity* this) {
|
||||
@@ -143,7 +143,7 @@ void sub_0802D170(GleerokEntity* this) {
|
||||
gPlayerEntity.animationState = 0;
|
||||
RestorePrevTileEntity(COORD_TO_TILE(&gPlayerEntity), 2);
|
||||
gRoomControls.camera_target = super;
|
||||
SetFade(6, 8);
|
||||
SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 8);
|
||||
}
|
||||
} else {
|
||||
super->action = 3;
|
||||
|
||||
@@ -666,7 +666,7 @@ void sub_08041D84(Entity* this) {
|
||||
ChangeObjPalette(this->child, gUnk_080D0E80[(this->subtimer - 0xb8) >> 3]);
|
||||
}
|
||||
if (this->subtimer == 0xe6) {
|
||||
SetFade(7, 4);
|
||||
SetFade(FADE_IN_OUT | FADE_BLACK_WHITE | FADE_INSTANT, 4);
|
||||
}
|
||||
} else {
|
||||
this->subAction = 4;
|
||||
|
||||
Reference in New Issue
Block a user