diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-15 00:08:48 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-15 00:08:48 -0600 |
| commit | e3c366df6489c92a6ac5778b458b815cc8eab75d (patch) | |
| tree | 89c80f554da617d89641af8a707ccf9c96d5707c /data/graphics/field_objects/berry_tree_graphics_tables.inc | |
| parent | 8e9428c482d33ac59b5c29d89db0bd5a2e6fdef3 (diff) | |
| parent | c9f196cdfea08eefffd39ebc77a150f197e1250e (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'data/graphics/field_objects/berry_tree_graphics_tables.inc')
| -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 |