diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-06-10 17:36:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-10 17:36:43 -0400 |
commit | a9a427c6f268e04468c8e30242f3ed4f96036848 (patch) | |
tree | 6bab63e3bd983d393f7182bcc271c3e0ab2d3b93 /include/battle_transition.h | |
parent | 2859900ea9aa6f381006976fa94b95e6a4cad0b7 (diff) | |
parent | a7815857ad8af1a35e69692e6eee3e854421b790 (diff) |
Merge branch 'master' into doc-link
Diffstat (limited to 'include/battle_transition.h')
-rw-r--r-- | include/battle_transition.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_transition.h b/include/battle_transition.h index db06a5638..0f583b101 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; |