diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
| commit | 44abbae60b6a39e2a1432426005e1860be196abb (patch) | |
| tree | f2405db72863761afcdcda57a88cf6ab0346e4fd /data/graphics/field_objects | |
| parent | 039c9f4bd8ee6bfb299d4422372804c569eddebd (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
nerge with master, fix conflicts
Diffstat (limited to 'data/graphics/field_objects')
| -rw-r--r-- | data/graphics/field_objects/berry_tree_graphics_tables.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/graphics/field_objects/berry_tree_graphics_tables.inc b/data/graphics/field_objects/berry_tree_graphics_tables.inc index 52c8719fe..8d716d759 100644 --- a/data/graphics/field_objects/berry_tree_graphics_tables.inc +++ b/data/graphics/field_objects/berry_tree_graphics_tables.inc @@ -478,18 +478,18 @@ gFieldObjectPicTable_TamatoBerryTree:: @ 850C758 gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0 berry_tree_palette_slot_table 2 - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES .align 2 gBerryTreePicTablePointers:: @ 850C7B0 |