From f608ae9f7014d734d6c9bf955218ab82763fbda1 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 2 Jun 2020 13:30:05 +0200
Subject: [PATCH 1/2] make battle transition OK ok Ok oK

---
 graphics_file_rules.mk  |  2 +-
 src/battle_transition.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index c53033f4c7..d56dec32ca 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -489,7 +489,7 @@ $(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \
 									$(ROULETTEGFXDIR)/makuhita.4bpp
 	@cat $^ >$@
 
-$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png
+$(BATTRANSGFXDIR)/regis.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 53
 
 $(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png
diff --git a/src/battle_transition.c b/src/battle_transition.c
index ea9ac1e892..e76a3a34c2 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -278,15 +278,15 @@ static const u32 sEliteFour_Tileset[] = INCBIN_U32("graphics/battle_transitions/
 static const u8 sUnusedBrendan_Gfx[] = INCBIN_U8("graphics/battle_transitions/unused_brendan.4bpp");
 static const u8 sUnusedLass_Gfx[] = INCBIN_U8("graphics/battle_transitions/unused_lass.4bpp");
 static const u32 sShrinkingBoxTileset[] = INCBIN_U32("graphics/battle_transitions/shrinking_box.4bpp");
-static const u32 sEvilTeam_Palette[] = INCBIN_U32("graphics/battle_transitions/evil_team.gbapal");
+static const u16 sEvilTeam_Palette[] = INCBIN_U16("graphics/battle_transitions/evil_team.gbapal");
 static const u32 sTeamAqua_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_aqua.4bpp.lz");
 static const u32 sTeamAqua_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_aqua.bin.lz");
 static const u32 sTeamMagma_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_magma.4bpp.lz");
 static const u32 sTeamMagma_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_magma.bin.lz");
 static const u32 sRegis_Tileset[] = INCBIN_U32("graphics/battle_transitions/regis.4bpp");
-static const u32 sRegice_Palette[] = INCBIN_U32("graphics/battle_transitions/regice.gbapal");
-static const u32 sRegisteel_Palette[] = INCBIN_U32("graphics/battle_transitions/registeel.gbapal");
-static const u32 sRegirock_Palette[] = INCBIN_U32("graphics/battle_transitions/regirock.gbapal");
+static const u16 sRegice_Palette[] = INCBIN_U16("graphics/battle_transitions/regice.gbapal");
+static const u16 sRegisteel_Palette[] = INCBIN_U16("graphics/battle_transitions/registeel.gbapal");
+static const u16 sRegirock_Palette[] = INCBIN_U16("graphics/battle_transitions/regirock.gbapal");
 static const u32 sRegice_Tilemap[] = INCBIN_U32("graphics/battle_transitions/regice.bin");
 static const u32 sRegisteel_Tilemap[] = INCBIN_U32("graphics/battle_transitions/registeel.bin");
 static const u32 sRegirock_Tilemap[] = INCBIN_U32("graphics/battle_transitions/regirock.bin");
@@ -302,10 +302,10 @@ static const u16 sGroudon2_Palette[] = INCBIN_U16("graphics/battle_transitions/g
 static const u16 sRayquaza_Palette[] = INCBIN_U16("graphics/battle_transitions/rayquaza.gbapal");
 static const u32 sRayquaza_Tileset[] = INCBIN_U32("graphics/battle_transitions/rayquaza.4bpp");
 static const u32 sRayquaza_Tilemap[] = INCBIN_U32("graphics/battle_transitions/rayquaza.bin");
-static const u32 gUnknown_085C7BE0[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.gbapal");
+static const u16 gUnknown_085C7BE0[] = INCBIN_U16("graphics/battle_transitions/frontier_brain.gbapal");
 static const u32 gUnknown_085C7C00[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.4bpp.lz");
 static const u32 gUnknown_085C828C[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.bin.lz");
-static const u32 gUnknown_085C8578[] = INCBIN_U32("graphics/battle_transitions/frontier_squares_blanktiles.gbapal");
+static const u16 gUnknown_085C8578[] = INCBIN_U16("graphics/battle_transitions/frontier_squares_blanktiles.gbapal");
 static const u32 gUnknown_085C8598[] = INCBIN_U32("graphics/battle_transitions/frontier_square_1.4bpp.lz");
 static const u32 gUnknown_085C86F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_2.4bpp.lz");
 static const u32 gUnknown_085C87F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_3.4bpp.lz");

From 0690abd5a4325811937d88019d728a4fcbe71b50 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 2 Jun 2020 17:28:47 +0200
Subject: [PATCH 2/2] its time to ddddddduel

---
 include/battle_transition.h | 2 +-
 src/unk_transition.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/battle_transition.h b/include/battle_transition.h
index db06a56386..0f583b1019 100644
--- a/include/battle_transition.h
+++ b/include/battle_transition.h
@@ -7,7 +7,7 @@ void BattleTransition_Start(u8 transitionId);
 bool8 IsBattleTransitionDone(void);
 bool8 FldEff_Pokeball(void);
 void TransitionPhase1_Task_RunFuncs(u8 taskId);
-void sub_8149F58(u16 **a0, u16 **a1);
+void GetBg0TilesDst(u16 **tilemap, u16 **tileset);
 
 extern const struct SpritePalette gFieldEffectObjectPaletteInfo10;
 
diff --git a/src/unk_transition.c b/src/unk_transition.c
index 09e194be33..dff165bc9e 100644
--- a/src/unk_transition.c
+++ b/src/unk_transition.c
@@ -187,7 +187,7 @@ static void sub_81DA700(void)
 {
     u16 *dst1, *dst2;
 
-    sub_8149F58(&dst1, &dst2);
+    GetBg0TilesDst(&dst1, &dst2);
     LZ77UnCompVram(gUnknown_0862AD54, dst2);
     LZ77UnCompVram(gUnknown_0862AF30, dst1);
     LoadPalette(gUnknown_0862B53C, 0xF0, 0x20);