Merge pull request #1067 from DizzyEggg/transitions

Transitions

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

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;
 

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);