Skip to content

[F] SetFade festa type not working on 1.65 #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clansty merged 1 commit into from
Apr 23, 2026
Merged

[F] SetFade festa type not working on 1.65 #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions AquaMai.Mods/Fancy/SetFade.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using Process;
using UnityEngine;
using UnityEngine.UI;
using System.Reflection;
using System;
using MelonLoader;

Expand Down Expand Up @@ -44,20 +43,21 @@ private static void SetFade_Initialize()
bool areSubBGsValid;
bool isFadeTypeValid;

if (GameInfo.GameVersion != 26000)
{
subBGs[0] = Resources.Load<Sprite>("Process/ChangeScreen/Sprites/Sub_01");
subBGs[1] = Resources.Load<Sprite>("Process/ChangeScreen/Sprites/Sub_02");
areSubBGsValid = subBGs[0] != null && subBGs[1] != null;
isFadeTypeValid = FadeType == 0 || FadeType == 1;
}
else
subBGs[0] = Resources.Load<Sprite>("Process/ChangeScreen/Sprites/Sub_01");
subBGs[1] = Resources.Load<Sprite>("Process/ChangeScreen/Sprites/Sub_02");
areSubBGsValid = subBGs[0] != null && subBGs[1] != null;
isFadeTypeValid = FadeType == 0 || FadeType == 1;

// make it future proof maybe?
if (GameInfo.GameVersion >= 26000)
{
subBGs[0] = Resources.Load<Sprite>("Process/ChangeScreen/Sprites/Sub_01");
subBGs[1] = Resources.Load<Sprite>("Process/ChangeScreen/Sprites/Sub_02");
subBGs[2] = Resources.Load<Sprite>("Process/ChangeScreen/Sprites/Sub_03");
areSubBGsValid = subBGs[0] != null && subBGs[1] != null && subBGs[2] != null;
isFadeTypeValid = FadeType == 0 || FadeType == 1 || FadeType == 2;
var festaSubBG = Resources.Load<Sprite>("Process/ChangeScreen/Sprites/Sub_03");
if (festaSubBG != null)
{
subBGs[2] = festaSubBG;
areSubBGsValid = areSubBGsValid && subBGs[2] != null;
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This line is redundant. Since the code is inside an if (festaSubBG != null) block and subBGs[2] was just assigned festaSubBG, subBGs[2] is guaranteed to be non-null here. Additionally, areSubBGsValid was already checked for subBGs[0] and subBGs[1] on line 48.

isFadeTypeValid = isFadeTypeValid || FadeType == 2;
}
}

if (!areSubBGsValid)
Expand Down
Loading