Skip to content
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.

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

Permafix Rayquaza tail in cinematic #5480

Merged
merged 1 commit into from
Oct 8, 2024

Conversation

hedara90
Copy link
Collaborator

@hedara90 hedara90 commented Oct 7, 2024

Description

The Rayquaza tail sprite for the "Rayquaza descends" scene had a workaround for it to match the binary source. This removes the workaround.
To test this, apply this diff and run Debug Script 1:

diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc
index 12dc693fd0..83182d3548 100644
--- a/data/scripts/debug.inc
+++ b/data/scripts/debug.inc
@@ -138,6 +138,7 @@ Debug_EventScript_Text_DefensiveIVs:
        .string "HP IVs: {STR_VAR_1}, DEF IVs: {STR_VAR_2}, SPDEF IVs: {STR_VAR_3}$"
 
 Debug_EventScript_Script_1::
+       special Script_DoRayquazaScene
        release
        end
 
diff --git a/src/field_specials.c b/src/field_specials.c
index e00aa03803..6f14c6b361 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3717,7 +3717,7 @@ void Script_DoRayquazaScene(void)
     if (!gSpecialVar_0x8004)
     {
         // Groudon/Kyogre fight scene
-        DoRayquazaScene(0, TRUE, CB2_ReturnToFieldContinueScriptPlayMapMusic);
+        DoRayquazaScene(0, FALSE, CB2_ReturnToFieldContinueScriptPlayMapMusic);
     }
     else
     {

Issue(s) that this PR fixes

graphics/rayquaza_scene/scene_3/rayquaza_tail.4bpp being the only image not divisible by 64.

Discord contact info

hedara

@Bassoonian Bassoonian merged commit f8f4fc9 into rh-hideout:master Oct 8, 2024
1 check passed
@hedara90 hedara90 deleted the rayquaza-tail-permafix branch October 24, 2024 06:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants