From ddaa88390e53665c6ac73af5e1a2f519dbddb5c6 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 17 Dec 2019 18:49:34 -0500 Subject: eventobject -> objectevent take 3 --- src/battle_transition.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_transition.c') 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, -- cgit v1.2.3