summaryrefslogtreecommitdiff
path: root/data/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'data/graphics')
-rw-r--r--data/graphics/field_objects/berry_tree_graphics_tables.inc20
-rw-r--r--data/graphics/pokemon/animation_delay_table.inc2
-rw-r--r--data/graphics/pokemon/front_anim_ids_table.inc2
3 files changed, 12 insertions, 12 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
diff --git a/data/graphics/pokemon/animation_delay_table.inc b/data/graphics/pokemon/animation_delay_table.inc
index 55d602bab..be517649b 100644
--- a/data/graphics/pokemon/animation_delay_table.inc
+++ b/data/graphics/pokemon/animation_delay_table.inc
@@ -81,7 +81,7 @@ gMonAnimationDelayTable:: @ 8329B87
.byte 0x00 @ SPECIES_SLOWBRO
.byte 0x00 @ SPECIES_MAGNEMITE
.byte 0x00 @ SPECIES_MAGNETON
- .byte 0x00 @ SPECIES_FARFETCH_D
+ .byte 0x00 @ SPECIES_FARFETCHD
.byte 0x00 @ SPECIES_DODUO
.byte 0x00 @ SPECIES_DODRIO
.byte 0x00 @ SPECIES_SEEL
diff --git a/data/graphics/pokemon/front_anim_ids_table.inc b/data/graphics/pokemon/front_anim_ids_table.inc
index 6e2d7fe0e..4f225348a 100644
--- a/data/graphics/pokemon/front_anim_ids_table.inc
+++ b/data/graphics/pokemon/front_anim_ids_table.inc
@@ -81,7 +81,7 @@ gMonFrontAnimIdsTable:: @ 83299EC
.byte 0x0b @ SPECIES_SLOWBRO
.byte 0x54 @ SPECIES_MAGNEMITE
.byte 0x2c @ SPECIES_MAGNETON
- .byte 0x48 @ SPECIES_FARFETCH_D
+ .byte 0x48 @ SPECIES_FARFETCHD
.byte 0x4c @ SPECIES_DODUO
.byte 0x41 @ SPECIES_DODRIO
.byte 0x0b @ SPECIES_SEEL