diff options
| author | huderlem <huderlem@gmail.com> | 2020-02-12 18:34:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 18:34:19 -0600 |
| commit | 204c431993dad29661a9ff47326787cd0cf381e6 (patch) | |
| tree | bda0c76fa20f0cc9e679985d8f7286ad95dd38c4 /src/battle_transition.c | |
| parent | 66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff) | |
| parent | 6b966d20e5d3866117fc9f1c0616654f2dfc415e (diff) | |
Merge pull request #910 from GriffinRichards/fix-eventobj
Standardize Object Event naming
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 9e66b8938..23182e976 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -750,7 +750,7 @@ static const struct SpriteTemplate gUnknown_085C8E68 = { .tileTag = 0xFFFF, .paletteTag = 4105, - .oam = &gEventObjectBaseOam_32x32, + .oam = &gObjectEventBaseOam_32x32, .anims = sSpriteAnimTable_85C8E3C, .images = sSpriteImageTable_85C8E2C, .affineAnims = sSpriteAffineAnimTable_85C8E60, @@ -817,7 +817,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EBC = .callback = sub_8148380 }; -static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_10.gbapal"); +static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/field_effects/palettes/10.gbapal"); const struct SpritePalette gFieldEffectObjectPaletteInfo10 = { |