diff options
| author | garak <garakmon@gmail.com> | 2019-12-17 18:49:34 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-12-17 18:49:34 -0500 |
| commit | ddaa88390e53665c6ac73af5e1a2f519dbddb5c6 (patch) | |
| tree | 858be7225887b625817074966666d467ef5f716b /src/battle_transition.c | |
| parent | 47d9fbef9339004364d65861ac661c1bd20419c8 (diff) | |
eventobject -> objectevent take 3
Diffstat (limited to 'src/battle_transition.c')
| -rw-r--r-- | src/battle_transition.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index a5b6f369c..aa68ed278 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -46,7 +46,7 @@ struct TransitionData static EWRAM_DATA struct TransitionData *sTransitionStructPtr = NULL; // TODO: Move this declaration to include/event_object_movement.h -extern const struct OamData gEventObjectBaseOam_32x32; +extern const struct OamData gObjectEventBaseOam_32x32; static bool8 BT_Phase1_FadeOut(struct Task *task); static bool8 BT_Phase1_FadeIn(struct Task *task); @@ -470,7 +470,7 @@ static const struct SpriteTemplate sSpriteTemplate_SlidingPokeball = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = 0x1009, - .oam = &gEventObjectBaseOam_32x32, + .oam = &gObjectEventBaseOam_32x32, .anims = sSpriteAnimTable_SlidingPokeball, .images = sSpriteImageTable_SlidingPokeball, .affineAnims = sSpriteAffineAnimTable_SlidingPokeball, |