diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-14 08:08:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-14 08:08:51 -0500 |
| commit | bebcea402921d23232f7657fcfdab810f8699399 (patch) | |
| tree | a59ea431d486bf23cde76e35ca789d1a0d113f3e /data/field_effect_misc.s | |
| parent | f810c9ecade3d793a139f67cd8f63effc5644b99 (diff) | |
| parent | e01dd90bb36f850fe88f2b1edae65c74b3bc48b1 (diff) | |
Merge pull request #263 from huderlem/event_object_movement
Sync event object movement with pokeruby
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 |