diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2020-06-02 13:32:30 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2020-06-02 13:32:30 +0200 |
commit | 754266cb0fae59b503176a02d77841ac2bdd57d0 (patch) | |
tree | 6ef765fb770fb5d721afd6291a09d5813bc3880a | |
parent | f608ae9f7014d734d6c9bf955218ab82763fbda1 (diff) | |
parent | 8c54454923e3f6d2dbadd9dd4b4bf80430156390 (diff) |
battle transitions
-rw-r--r-- | include/battle_transition.h | 2 | ||||
-rw-r--r-- | src/unk_transition.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/battle_transition.h b/include/battle_transition.h index 0f583b101..db06a5638 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 GetBg0TilesDst(u16 **tilemap, u16 **tileset); +void sub_8149F58(u16 **a0, u16 **a1); extern const struct SpritePalette gFieldEffectObjectPaletteInfo10; diff --git a/src/unk_transition.c b/src/unk_transition.c index b485ef350..09e194be3 100644 --- a/src/unk_transition.c +++ b/src/unk_transition.c @@ -185,11 +185,11 @@ static const TransitionStateFunc sPhase2_41_Funcs[] = // code static void sub_81DA700(void) { - u16 *tilemap, *tileset; + u16 *dst1, *dst2; - GetBg0TilesDst(&tilemap, &tileset); - LZ77UnCompVram(gUnknown_0862AD54, tileset); - LZ77UnCompVram(gUnknown_0862AF30, tilemap); + sub_8149F58(&dst1, &dst2); + LZ77UnCompVram(gUnknown_0862AD54, dst2); + LZ77UnCompVram(gUnknown_0862AF30, dst1); LoadPalette(gUnknown_0862B53C, 0xF0, 0x20); LoadCompressedSpriteSheet(&sUnknown_0862B724); LoadSpritePalette(&sUnknown_0862B72C); |