From f8f4fc9afd92ce5df431714f4dfa4602dd84dd5b Mon Sep 17 00:00:00 2001
From: hedara90 <90hedara@gmail.com>
Date: Tue, 8 Oct 2024 14:02:31 +0200
Subject: [PATCH] Removed old checksum matching workaround (#5480)

Co-authored-by: Hedara <hedara90@gmail.com>
---
 .../rayquaza_scene/scene_3/rayquaza_tail.png    | Bin 264 -> 268 bytes
 graphics_file_rules.mk                          |   4 ----
 src/data/graphics/rayquaza_scene.h              |   4 +---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/graphics/rayquaza_scene/scene_3/rayquaza_tail.png b/graphics/rayquaza_scene/scene_3/rayquaza_tail.png
index 7e0577df15569122e3974c00edaa5557dc66d8ab..796548e56a83ff88119681c857cea9acb8eff7db 100644
GIT binary patch
delta 194
zcmV;z06qVR0*nHX7Z-pC0{{R3HA@)~00001b5ch_0Itp)>5(Bne~L*&K~zYI?UKm~
z!!Qg)wG7CY*8l&vRmdS)a%pKo3x3CkH4J8muEUIoIf`M7EQSjU0u1G0Nic92PjC@m
zlnY{o#7q|=Gd1H>%khXTxCuxVnnTY*+D$FeZlI4@#Iu!8HwI{|V%zt~Jbp}fq4v4>
w75->aZ9!BQM7jByAo$9rZkW_!u~@v#3z9qq5*qa2o&W#<07*qoM6N<$g7!vFSpWb4

delta 190
zcmV;v073tZ0*C^T7Yc|30{{R39O!m@kuE=flSxEDR5*=eU?35cGYCQ$6@`vaMx$c^
zm{B5P*bZfgcz}fpT|^)vh0YQXHNsBf5M9DbA0P}ysCf)5hEN70oZ$pxI71aPI14}-
z!U|A^h(3$~)5c;8Rn1}tw*#uJ#MvH9vx~IrgB?^1WSA3RPz%s5=-?s701Gh&5dm~5
s1|ocoU<@aiL9k#YE9geSC>Uq}09~Uhl5dDBXaE2J07*qoM6N<$f^IrL!T<mO

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 1b514b8ed3ed..06316ea6a98f 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -393,10 +393,6 @@ $(RAYQUAZAGFXDIR)/scene_2/bg.4bpp: %.4bpp: %.png
 $(RAYQUAZAGFXDIR)/scene_3/rayquaza.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 124 -Wnum_tiles
 
-$(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail.4bpp
-	cp $< $@
-	head -c 12 /dev/zero >> $@
-
 $(RAYQUAZAGFXDIR)/scene_4/streaks.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 19 -Wnum_tiles
 
diff --git a/src/data/graphics/rayquaza_scene.h b/src/data/graphics/rayquaza_scene.h
index 660f07416cb5..e999e947fb31 100644
--- a/src/data/graphics/rayquaza_scene.h
+++ b/src/data/graphics/rayquaza_scene.h
@@ -24,9 +24,7 @@ const u32 gRaySceneTakesFlight_Bg_Tilemap[]       = INCBIN_U32("graphics/rayquaz
 
 // Scene 3 (RAY_ANIM_DESCENDS)
 const u32 gRaySceneDescends_Rayquaza_Gfx[]     = INCBIN_U32("graphics/rayquaza_scene/scene_3/rayquaza.4bpp.lz");
-// for some reason there are an extra 0xC bytes at the end of the original rayquaza_tail.4bpp, so in order to produce the correct lz,
-// we have to cat the bytes at the end with a make rule. not sure why those bytes are there, it may have been a bug in Game Freak's software.
-const u32 gRaySceneDescends_RayquazaTail_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/rayquaza_tail_fix.4bpp.lz");
+const u32 gRaySceneDescends_RayquazaTail_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/rayquaza_tail.4bpp.lz");
 const u32 gRaySceneDescends_Bg_Gfx[]           = INCBIN_U32("graphics/rayquaza_scene/scene_3/bg.4bpp.lz");
 const u32 gRaySceneDescends_Light_Gfx[]        = INCBIN_U32("graphics/rayquaza_scene/scene_3/light.4bpp.lz"); // uses pal 2 of gRaySceneDescends_Bg_Pal
 const u32 gRaySceneDescends_Bg_Pal[]           = INCBIN_U32("graphics/rayquaza_scene/scene_3/bg.gbapal.lz");