diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 19:11:48 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 19:11:48 -0500 |
| commit | aa9a45c16fbaee2fffc94e4741e0a1f203b244bc (patch) | |
| tree | 9bdd507453e9b51ff52216d9f04bda62ac799cfb /data/field_effect_misc.s | |
| parent | ed245b677addbb7f5c748193301507de7fed6ec4 (diff) | |
Rebrand 'map object' and 'field object' to 'event object'
Diffstat (limited to 'data/field_effect_misc.s')
| -rw-r--r-- | data/field_effect_misc.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/field_effect_misc.s b/data/field_effect_misc.s index ef73c3263..f1b28d906 100644 --- a/data/field_effect_misc.s +++ b/data/field_effect_misc.s @@ -27,7 +27,7 @@ gSpriteImage_858DB78:: @ 858DB78 .align 2 gFieldEffectObjectPalette7:: @ 858DC18 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal" + .incbin "graphics/event_objects/palettes/field_effect_object_palette_07.gbapal" .align 2 gSpriteImage_858DC38:: @ 858DC38 @@ -75,7 +75,7 @@ gSpriteImage_858E138:: @ 858E138 .align 2 gFieldEffectObjectPalette8:: @ 858E1B8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal" + .incbin "graphics/event_objects/palettes/field_effect_object_palette_08.gbapal" .align 2 gSpriteImage_858E1D8:: @ 858E1D8 @@ -240,5 +240,5 @@ gSpriteAnimTable_858E87C:: @ 858E87C .align 2 gUnknown_0858E880:: @ 858E880 - spr_template 0xffff, 0x1000, gFieldObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xffff, 0x1000, gEventObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy |