From 49421a41b2b28c167f6fca8287361f23e6bd00a9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 12 Feb 2020 17:32:51 -0600 Subject: [PATCH] Move field effects data and graphics into own directory, and cleanup naming for object events --- .../palettes/00.pal} | 0 .../palettes/01.pal} | 0 .../palettes/02.pal} | 0 .../palettes/03.pal} | 0 .../palettes/04.pal} | 0 .../palettes/05.pal} | 0 .../palettes/06.pal} | 0 .../palettes/07.pal} | 0 .../palettes/08.pal} | 0 .../palettes/10.pal} | 0 .../effects => field_effects/pics}/arrow.png | Bin .../effects => field_effects/pics}/ash.png | Bin .../pics}/berry_tree_growth_sparkle.png | Bin .../pics}/bike_hop_big_splash.png | Bin .../pics}/bike_hop_small_splash.png | Bin .../pics}/bike_hop_tall_grass.png | Bin .../pics}/bike_tire_tracks.png | Bin .../effects => field_effects/pics}/bird.png | Bin .../pics}/bubbles.png | Bin .../pics}/cut_grass.png | Bin .../pics}/deep_sand_footprints.png | Bin .../pics}/ground_impact_dust.png | Bin .../pics}/hot_springs_water.png | Bin .../pics}/jump_out_of_ash.png | Bin .../pics}/lavaridge_gym_warp.png | Bin .../pics}/long_grass.png | Bin .../pics}/mountain_disguise.png | Bin .../effects => field_effects/pics}/ripple.png | Bin .../pics}/sand_disguise_placeholder.png | Bin .../pics}/sand_footprints.png | Bin .../pics}/shadow_extra_large.png | Bin .../pics}/shadow_large.png | Bin .../pics}/shadow_medium.png | Bin .../pics}/shadow_small.png | Bin .../pics}/short_grass.png | Bin .../effects => field_effects/pics}/splash.png | Bin .../pics}/surf_blob.png | Bin .../pics}/tall_grass.png | Bin .../pics}/tree_disguise.png | Bin .../pics}/unknown_16.png | Bin .../pics}/unknown_17.png | Bin .../pics}/unknown_18.png | Bin .../pics}/unknown_19.png | Bin .../pics}/unknown_20.png | Bin .../pics}/unknown_29.png | Bin .../pics}/unknown_35.png | Bin .../pics}/unused_grass.png | Bin .../{event_object_palette_00.pal => 00.pal} | 0 .../{event_object_palette_01.pal => 01.pal} | 0 .../{event_object_palette_02.pal => 02.pal} | 0 .../{event_object_palette_03.pal => 03.pal} | 0 .../{event_object_palette_04.pal => 04.pal} | 0 .../{event_object_palette_05.pal => 05.pal} | 0 .../{event_object_palette_06.pal => 06.pal} | 0 .../{event_object_palette_07.pal => 07.pal} | 0 .../{event_object_palette_08.pal => 08.pal} | 0 .../{event_object_palette_09.pal => 09.pal} | 0 .../{event_object_palette_10.pal => 10.pal} | 0 .../{event_object_palette_11.pal => 11.pal} | 0 .../{event_object_palette_12.pal => 12.pal} | 0 .../{event_object_palette_13.pal => 13.pal} | 0 .../{event_object_palette_14.pal => 14.pal} | 0 .../{event_object_palette_15.pal => 15.pal} | 0 .../{event_object_palette_16.pal => 16.pal} | 0 .../{event_object_palette_17.pal => 17.pal} | 0 .../{event_object_palette_18.pal => 18.pal} | 0 .../{event_object_palette_19.pal => 19.pal} | 0 .../{event_object_palette_20.pal => 20.pal} | 0 .../{event_object_palette_21.pal => 21.pal} | 0 .../{event_object_palette_22.pal => 22.pal} | 0 .../{event_object_palette_23.pal => 23.pal} | 0 .../{event_object_palette_24.pal => 24.pal} | 0 .../{event_object_palette_25.pal => 25.pal} | 0 .../{event_object_palette_26.pal => 26.pal} | 0 .../{event_object_palette_27.pal => 27.pal} | 0 .../{event_object_palette_28.pal => 28.pal} | 0 .../{event_object_palette_29.pal => 29.pal} | 0 .../{event_object_palette_30.pal => 30.pal} | 0 .../{event_object_palette_31.pal => 31.pal} | 0 .../{event_object_palette_32.pal => 32.pal} | 0 .../{event_object_palette_33.pal => 33.pal} | 0 .../{event_object_palette_34.pal => 34.pal} | 0 src/battle_transition.c | 2 +- .../field_effect_object_template_pointers.h | 0 .../field_effect_objects.h | 0 .../base_oam.h | 0 .../berry_tree_graphics_tables.h | 0 .../movement_action_func_tables.h | 0 .../movement_type_func_tables.h | 0 .../object_event_anims.h} | 0 .../object_event_graphics.h} | 156 +++++++++--------- .../object_event_graphics_info.h} | 0 .../object_event_graphics_info_pointers.h} | 0 .../object_event_pic_tables.h} | 0 .../object_event_subsprites.h} | 0 src/event_object_movement.c | 24 +-- src/field_effect.c | 4 +- src/fldeff_misc.c | 6 +- 98 files changed, 96 insertions(+), 96 deletions(-) rename graphics/{object_events/palettes/field_effect_object_palette_00.pal => field_effects/palettes/00.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_01.pal => field_effects/palettes/01.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_02.pal => field_effects/palettes/02.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_03.pal => field_effects/palettes/03.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_04.pal => field_effects/palettes/04.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_05.pal => field_effects/palettes/05.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_06.pal => field_effects/palettes/06.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_07.pal => field_effects/palettes/07.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_08.pal => field_effects/palettes/08.pal} (100%) rename graphics/{object_events/palettes/field_effect_object_palette_10.pal => field_effects/palettes/10.pal} (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/arrow.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/ash.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/berry_tree_growth_sparkle.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bike_hop_big_splash.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bike_hop_small_splash.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bike_hop_tall_grass.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bike_tire_tracks.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bird.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/bubbles.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/cut_grass.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/deep_sand_footprints.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/ground_impact_dust.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/hot_springs_water.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/jump_out_of_ash.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/lavaridge_gym_warp.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/long_grass.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/mountain_disguise.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/ripple.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/sand_disguise_placeholder.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/sand_footprints.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_extra_large.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_large.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_medium.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/shadow_small.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/short_grass.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/splash.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/surf_blob.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/tall_grass.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/tree_disguise.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_16.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_17.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_18.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_19.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_20.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_29.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unknown_35.png (100%) rename graphics/{object_events/pics/effects => field_effects/pics}/unused_grass.png (100%) rename graphics/object_events/palettes/{event_object_palette_00.pal => 00.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_01.pal => 01.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_02.pal => 02.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_03.pal => 03.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_04.pal => 04.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_05.pal => 05.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_06.pal => 06.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_07.pal => 07.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_08.pal => 08.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_09.pal => 09.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_10.pal => 10.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_11.pal => 11.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_12.pal => 12.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_13.pal => 13.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_14.pal => 14.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_15.pal => 15.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_16.pal => 16.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_17.pal => 17.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_18.pal => 18.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_19.pal => 19.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_20.pal => 20.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_21.pal => 21.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_22.pal => 22.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_23.pal => 23.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_24.pal => 24.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_25.pal => 25.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_26.pal => 26.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_27.pal => 27.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_28.pal => 28.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_29.pal => 29.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_30.pal => 30.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_31.pal => 31.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_32.pal => 32.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_33.pal => 33.pal} (100%) rename graphics/object_events/palettes/{event_object_palette_34.pal => 34.pal} (100%) rename src/data/{object_event => field_effects}/field_effect_object_template_pointers.h (100%) rename src/data/{object_event => field_effects}/field_effect_objects.h (100%) rename src/data/{object_event => object_events}/base_oam.h (100%) rename src/data/{object_event => object_events}/berry_tree_graphics_tables.h (100%) rename src/data/{object_event => object_events}/movement_action_func_tables.h (100%) rename src/data/{object_event => object_events}/movement_type_func_tables.h (100%) rename src/data/{object_event/event_object_anims.h => object_events/object_event_anims.h} (100%) rename src/data/{object_event/event_object_graphics.h => object_events/object_event_graphics.h} (87%) rename src/data/{object_event/event_object_graphics_info.h => object_events/object_event_graphics_info.h} (100%) rename src/data/{object_event/event_object_graphics_info_pointers.h => object_events/object_event_graphics_info_pointers.h} (100%) rename src/data/{object_event/event_object_pic_tables.h => object_events/object_event_pic_tables.h} (100%) rename src/data/{object_event/event_object_subsprites.h => object_events/object_event_subsprites.h} (100%) diff --git a/graphics/object_events/palettes/field_effect_object_palette_00.pal b/graphics/field_effects/palettes/00.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_00.pal rename to graphics/field_effects/palettes/00.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_01.pal b/graphics/field_effects/palettes/01.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_01.pal rename to graphics/field_effects/palettes/01.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_02.pal b/graphics/field_effects/palettes/02.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_02.pal rename to graphics/field_effects/palettes/02.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_03.pal b/graphics/field_effects/palettes/03.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_03.pal rename to graphics/field_effects/palettes/03.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_04.pal b/graphics/field_effects/palettes/04.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_04.pal rename to graphics/field_effects/palettes/04.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_05.pal b/graphics/field_effects/palettes/05.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_05.pal rename to graphics/field_effects/palettes/05.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_06.pal b/graphics/field_effects/palettes/06.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_06.pal rename to graphics/field_effects/palettes/06.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_07.pal b/graphics/field_effects/palettes/07.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_07.pal rename to graphics/field_effects/palettes/07.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_08.pal b/graphics/field_effects/palettes/08.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_08.pal rename to graphics/field_effects/palettes/08.pal diff --git a/graphics/object_events/palettes/field_effect_object_palette_10.pal b/graphics/field_effects/palettes/10.pal similarity index 100% rename from graphics/object_events/palettes/field_effect_object_palette_10.pal rename to graphics/field_effects/palettes/10.pal diff --git a/graphics/object_events/pics/effects/arrow.png b/graphics/field_effects/pics/arrow.png similarity index 100% rename from graphics/object_events/pics/effects/arrow.png rename to graphics/field_effects/pics/arrow.png diff --git a/graphics/object_events/pics/effects/ash.png b/graphics/field_effects/pics/ash.png similarity index 100% rename from graphics/object_events/pics/effects/ash.png rename to graphics/field_effects/pics/ash.png diff --git a/graphics/object_events/pics/effects/berry_tree_growth_sparkle.png b/graphics/field_effects/pics/berry_tree_growth_sparkle.png similarity index 100% rename from graphics/object_events/pics/effects/berry_tree_growth_sparkle.png rename to graphics/field_effects/pics/berry_tree_growth_sparkle.png diff --git a/graphics/object_events/pics/effects/bike_hop_big_splash.png b/graphics/field_effects/pics/bike_hop_big_splash.png similarity index 100% rename from graphics/object_events/pics/effects/bike_hop_big_splash.png rename to graphics/field_effects/pics/bike_hop_big_splash.png diff --git a/graphics/object_events/pics/effects/bike_hop_small_splash.png b/graphics/field_effects/pics/bike_hop_small_splash.png similarity index 100% rename from graphics/object_events/pics/effects/bike_hop_small_splash.png rename to graphics/field_effects/pics/bike_hop_small_splash.png diff --git a/graphics/object_events/pics/effects/bike_hop_tall_grass.png b/graphics/field_effects/pics/bike_hop_tall_grass.png similarity index 100% rename from graphics/object_events/pics/effects/bike_hop_tall_grass.png rename to graphics/field_effects/pics/bike_hop_tall_grass.png diff --git a/graphics/object_events/pics/effects/bike_tire_tracks.png b/graphics/field_effects/pics/bike_tire_tracks.png similarity index 100% rename from graphics/object_events/pics/effects/bike_tire_tracks.png rename to graphics/field_effects/pics/bike_tire_tracks.png diff --git a/graphics/object_events/pics/effects/bird.png b/graphics/field_effects/pics/bird.png similarity index 100% rename from graphics/object_events/pics/effects/bird.png rename to graphics/field_effects/pics/bird.png diff --git a/graphics/object_events/pics/effects/bubbles.png b/graphics/field_effects/pics/bubbles.png similarity index 100% rename from graphics/object_events/pics/effects/bubbles.png rename to graphics/field_effects/pics/bubbles.png diff --git a/graphics/object_events/pics/effects/cut_grass.png b/graphics/field_effects/pics/cut_grass.png similarity index 100% rename from graphics/object_events/pics/effects/cut_grass.png rename to graphics/field_effects/pics/cut_grass.png diff --git a/graphics/object_events/pics/effects/deep_sand_footprints.png b/graphics/field_effects/pics/deep_sand_footprints.png similarity index 100% rename from graphics/object_events/pics/effects/deep_sand_footprints.png rename to graphics/field_effects/pics/deep_sand_footprints.png diff --git a/graphics/object_events/pics/effects/ground_impact_dust.png b/graphics/field_effects/pics/ground_impact_dust.png similarity index 100% rename from graphics/object_events/pics/effects/ground_impact_dust.png rename to graphics/field_effects/pics/ground_impact_dust.png diff --git a/graphics/object_events/pics/effects/hot_springs_water.png b/graphics/field_effects/pics/hot_springs_water.png similarity index 100% rename from graphics/object_events/pics/effects/hot_springs_water.png rename to graphics/field_effects/pics/hot_springs_water.png diff --git a/graphics/object_events/pics/effects/jump_out_of_ash.png b/graphics/field_effects/pics/jump_out_of_ash.png similarity index 100% rename from graphics/object_events/pics/effects/jump_out_of_ash.png rename to graphics/field_effects/pics/jump_out_of_ash.png diff --git a/graphics/object_events/pics/effects/lavaridge_gym_warp.png b/graphics/field_effects/pics/lavaridge_gym_warp.png similarity index 100% rename from graphics/object_events/pics/effects/lavaridge_gym_warp.png rename to graphics/field_effects/pics/lavaridge_gym_warp.png diff --git a/graphics/object_events/pics/effects/long_grass.png b/graphics/field_effects/pics/long_grass.png similarity index 100% rename from graphics/object_events/pics/effects/long_grass.png rename to graphics/field_effects/pics/long_grass.png diff --git a/graphics/object_events/pics/effects/mountain_disguise.png b/graphics/field_effects/pics/mountain_disguise.png similarity index 100% rename from graphics/object_events/pics/effects/mountain_disguise.png rename to graphics/field_effects/pics/mountain_disguise.png diff --git a/graphics/object_events/pics/effects/ripple.png b/graphics/field_effects/pics/ripple.png similarity index 100% rename from graphics/object_events/pics/effects/ripple.png rename to graphics/field_effects/pics/ripple.png diff --git a/graphics/object_events/pics/effects/sand_disguise_placeholder.png b/graphics/field_effects/pics/sand_disguise_placeholder.png similarity index 100% rename from graphics/object_events/pics/effects/sand_disguise_placeholder.png rename to graphics/field_effects/pics/sand_disguise_placeholder.png diff --git a/graphics/object_events/pics/effects/sand_footprints.png b/graphics/field_effects/pics/sand_footprints.png similarity index 100% rename from graphics/object_events/pics/effects/sand_footprints.png rename to graphics/field_effects/pics/sand_footprints.png diff --git a/graphics/object_events/pics/effects/shadow_extra_large.png b/graphics/field_effects/pics/shadow_extra_large.png similarity index 100% rename from graphics/object_events/pics/effects/shadow_extra_large.png rename to graphics/field_effects/pics/shadow_extra_large.png diff --git a/graphics/object_events/pics/effects/shadow_large.png b/graphics/field_effects/pics/shadow_large.png similarity index 100% rename from graphics/object_events/pics/effects/shadow_large.png rename to graphics/field_effects/pics/shadow_large.png diff --git a/graphics/object_events/pics/effects/shadow_medium.png b/graphics/field_effects/pics/shadow_medium.png similarity index 100% rename from graphics/object_events/pics/effects/shadow_medium.png rename to graphics/field_effects/pics/shadow_medium.png diff --git a/graphics/object_events/pics/effects/shadow_small.png b/graphics/field_effects/pics/shadow_small.png similarity index 100% rename from graphics/object_events/pics/effects/shadow_small.png rename to graphics/field_effects/pics/shadow_small.png diff --git a/graphics/object_events/pics/effects/short_grass.png b/graphics/field_effects/pics/short_grass.png similarity index 100% rename from graphics/object_events/pics/effects/short_grass.png rename to graphics/field_effects/pics/short_grass.png diff --git a/graphics/object_events/pics/effects/splash.png b/graphics/field_effects/pics/splash.png similarity index 100% rename from graphics/object_events/pics/effects/splash.png rename to graphics/field_effects/pics/splash.png diff --git a/graphics/object_events/pics/effects/surf_blob.png b/graphics/field_effects/pics/surf_blob.png similarity index 100% rename from graphics/object_events/pics/effects/surf_blob.png rename to graphics/field_effects/pics/surf_blob.png diff --git a/graphics/object_events/pics/effects/tall_grass.png b/graphics/field_effects/pics/tall_grass.png similarity index 100% rename from graphics/object_events/pics/effects/tall_grass.png rename to graphics/field_effects/pics/tall_grass.png diff --git a/graphics/object_events/pics/effects/tree_disguise.png b/graphics/field_effects/pics/tree_disguise.png similarity index 100% rename from graphics/object_events/pics/effects/tree_disguise.png rename to graphics/field_effects/pics/tree_disguise.png diff --git a/graphics/object_events/pics/effects/unknown_16.png b/graphics/field_effects/pics/unknown_16.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_16.png rename to graphics/field_effects/pics/unknown_16.png diff --git a/graphics/object_events/pics/effects/unknown_17.png b/graphics/field_effects/pics/unknown_17.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_17.png rename to graphics/field_effects/pics/unknown_17.png diff --git a/graphics/object_events/pics/effects/unknown_18.png b/graphics/field_effects/pics/unknown_18.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_18.png rename to graphics/field_effects/pics/unknown_18.png diff --git a/graphics/object_events/pics/effects/unknown_19.png b/graphics/field_effects/pics/unknown_19.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_19.png rename to graphics/field_effects/pics/unknown_19.png diff --git a/graphics/object_events/pics/effects/unknown_20.png b/graphics/field_effects/pics/unknown_20.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_20.png rename to graphics/field_effects/pics/unknown_20.png diff --git a/graphics/object_events/pics/effects/unknown_29.png b/graphics/field_effects/pics/unknown_29.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_29.png rename to graphics/field_effects/pics/unknown_29.png diff --git a/graphics/object_events/pics/effects/unknown_35.png b/graphics/field_effects/pics/unknown_35.png similarity index 100% rename from graphics/object_events/pics/effects/unknown_35.png rename to graphics/field_effects/pics/unknown_35.png diff --git a/graphics/object_events/pics/effects/unused_grass.png b/graphics/field_effects/pics/unused_grass.png similarity index 100% rename from graphics/object_events/pics/effects/unused_grass.png rename to graphics/field_effects/pics/unused_grass.png diff --git a/graphics/object_events/palettes/event_object_palette_00.pal b/graphics/object_events/palettes/00.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_00.pal rename to graphics/object_events/palettes/00.pal diff --git a/graphics/object_events/palettes/event_object_palette_01.pal b/graphics/object_events/palettes/01.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_01.pal rename to graphics/object_events/palettes/01.pal diff --git a/graphics/object_events/palettes/event_object_palette_02.pal b/graphics/object_events/palettes/02.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_02.pal rename to graphics/object_events/palettes/02.pal diff --git a/graphics/object_events/palettes/event_object_palette_03.pal b/graphics/object_events/palettes/03.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_03.pal rename to graphics/object_events/palettes/03.pal diff --git a/graphics/object_events/palettes/event_object_palette_04.pal b/graphics/object_events/palettes/04.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_04.pal rename to graphics/object_events/palettes/04.pal diff --git a/graphics/object_events/palettes/event_object_palette_05.pal b/graphics/object_events/palettes/05.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_05.pal rename to graphics/object_events/palettes/05.pal diff --git a/graphics/object_events/palettes/event_object_palette_06.pal b/graphics/object_events/palettes/06.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_06.pal rename to graphics/object_events/palettes/06.pal diff --git a/graphics/object_events/palettes/event_object_palette_07.pal b/graphics/object_events/palettes/07.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_07.pal rename to graphics/object_events/palettes/07.pal diff --git a/graphics/object_events/palettes/event_object_palette_08.pal b/graphics/object_events/palettes/08.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_08.pal rename to graphics/object_events/palettes/08.pal diff --git a/graphics/object_events/palettes/event_object_palette_09.pal b/graphics/object_events/palettes/09.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_09.pal rename to graphics/object_events/palettes/09.pal diff --git a/graphics/object_events/palettes/event_object_palette_10.pal b/graphics/object_events/palettes/10.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_10.pal rename to graphics/object_events/palettes/10.pal diff --git a/graphics/object_events/palettes/event_object_palette_11.pal b/graphics/object_events/palettes/11.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_11.pal rename to graphics/object_events/palettes/11.pal diff --git a/graphics/object_events/palettes/event_object_palette_12.pal b/graphics/object_events/palettes/12.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_12.pal rename to graphics/object_events/palettes/12.pal diff --git a/graphics/object_events/palettes/event_object_palette_13.pal b/graphics/object_events/palettes/13.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_13.pal rename to graphics/object_events/palettes/13.pal diff --git a/graphics/object_events/palettes/event_object_palette_14.pal b/graphics/object_events/palettes/14.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_14.pal rename to graphics/object_events/palettes/14.pal diff --git a/graphics/object_events/palettes/event_object_palette_15.pal b/graphics/object_events/palettes/15.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_15.pal rename to graphics/object_events/palettes/15.pal diff --git a/graphics/object_events/palettes/event_object_palette_16.pal b/graphics/object_events/palettes/16.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_16.pal rename to graphics/object_events/palettes/16.pal diff --git a/graphics/object_events/palettes/event_object_palette_17.pal b/graphics/object_events/palettes/17.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_17.pal rename to graphics/object_events/palettes/17.pal diff --git a/graphics/object_events/palettes/event_object_palette_18.pal b/graphics/object_events/palettes/18.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_18.pal rename to graphics/object_events/palettes/18.pal diff --git a/graphics/object_events/palettes/event_object_palette_19.pal b/graphics/object_events/palettes/19.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_19.pal rename to graphics/object_events/palettes/19.pal diff --git a/graphics/object_events/palettes/event_object_palette_20.pal b/graphics/object_events/palettes/20.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_20.pal rename to graphics/object_events/palettes/20.pal diff --git a/graphics/object_events/palettes/event_object_palette_21.pal b/graphics/object_events/palettes/21.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_21.pal rename to graphics/object_events/palettes/21.pal diff --git a/graphics/object_events/palettes/event_object_palette_22.pal b/graphics/object_events/palettes/22.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_22.pal rename to graphics/object_events/palettes/22.pal diff --git a/graphics/object_events/palettes/event_object_palette_23.pal b/graphics/object_events/palettes/23.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_23.pal rename to graphics/object_events/palettes/23.pal diff --git a/graphics/object_events/palettes/event_object_palette_24.pal b/graphics/object_events/palettes/24.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_24.pal rename to graphics/object_events/palettes/24.pal diff --git a/graphics/object_events/palettes/event_object_palette_25.pal b/graphics/object_events/palettes/25.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_25.pal rename to graphics/object_events/palettes/25.pal diff --git a/graphics/object_events/palettes/event_object_palette_26.pal b/graphics/object_events/palettes/26.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_26.pal rename to graphics/object_events/palettes/26.pal diff --git a/graphics/object_events/palettes/event_object_palette_27.pal b/graphics/object_events/palettes/27.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_27.pal rename to graphics/object_events/palettes/27.pal diff --git a/graphics/object_events/palettes/event_object_palette_28.pal b/graphics/object_events/palettes/28.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_28.pal rename to graphics/object_events/palettes/28.pal diff --git a/graphics/object_events/palettes/event_object_palette_29.pal b/graphics/object_events/palettes/29.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_29.pal rename to graphics/object_events/palettes/29.pal diff --git a/graphics/object_events/palettes/event_object_palette_30.pal b/graphics/object_events/palettes/30.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_30.pal rename to graphics/object_events/palettes/30.pal diff --git a/graphics/object_events/palettes/event_object_palette_31.pal b/graphics/object_events/palettes/31.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_31.pal rename to graphics/object_events/palettes/31.pal diff --git a/graphics/object_events/palettes/event_object_palette_32.pal b/graphics/object_events/palettes/32.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_32.pal rename to graphics/object_events/palettes/32.pal diff --git a/graphics/object_events/palettes/event_object_palette_33.pal b/graphics/object_events/palettes/33.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_33.pal rename to graphics/object_events/palettes/33.pal diff --git a/graphics/object_events/palettes/event_object_palette_34.pal b/graphics/object_events/palettes/34.pal similarity index 100% rename from graphics/object_events/palettes/event_object_palette_34.pal rename to graphics/object_events/palettes/34.pal diff --git a/src/battle_transition.c b/src/battle_transition.c index bf1ced2f86..23182e976e 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -817,7 +817,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EBC = .callback = sub_8148380 }; -static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_10.gbapal"); +static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/field_effects/palettes/10.gbapal"); const struct SpritePalette gFieldEffectObjectPaletteInfo10 = { diff --git a/src/data/object_event/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h similarity index 100% rename from src/data/object_event/field_effect_object_template_pointers.h rename to src/data/field_effects/field_effect_object_template_pointers.h diff --git a/src/data/object_event/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h similarity index 100% rename from src/data/object_event/field_effect_objects.h rename to src/data/field_effects/field_effect_objects.h diff --git a/src/data/object_event/base_oam.h b/src/data/object_events/base_oam.h similarity index 100% rename from src/data/object_event/base_oam.h rename to src/data/object_events/base_oam.h diff --git a/src/data/object_event/berry_tree_graphics_tables.h b/src/data/object_events/berry_tree_graphics_tables.h similarity index 100% rename from src/data/object_event/berry_tree_graphics_tables.h rename to src/data/object_events/berry_tree_graphics_tables.h diff --git a/src/data/object_event/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h similarity index 100% rename from src/data/object_event/movement_action_func_tables.h rename to src/data/object_events/movement_action_func_tables.h diff --git a/src/data/object_event/movement_type_func_tables.h b/src/data/object_events/movement_type_func_tables.h similarity index 100% rename from src/data/object_event/movement_type_func_tables.h rename to src/data/object_events/movement_type_func_tables.h diff --git a/src/data/object_event/event_object_anims.h b/src/data/object_events/object_event_anims.h similarity index 100% rename from src/data/object_event/event_object_anims.h rename to src/data/object_events/object_event_anims.h diff --git a/src/data/object_event/event_object_graphics.h b/src/data/object_events/object_event_graphics.h similarity index 87% rename from src/data/object_event/event_object_graphics.h rename to src/data/object_events/object_event_graphics.h index 0629e8c465..769a6bb0a1 100755 --- a/src/data/object_event/event_object_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -1,9 +1,9 @@ const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/brendan/walking.4bpp"); const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/brendan/running.4bpp"); -const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_08.gbapal"); +const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/08.gbapal"); const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp"); const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp"); -const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_33.gbapal"); +const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/object_events/palettes/33.gbapal"); const u16 gObjectEventPaletteNull1[16] = {}; const u16 gObjectEventPaletteNull2[16] = {}; const u16 gObjectEventPaletteNull3[16] = {}; @@ -19,8 +19,8 @@ const u16 gObjectEventPaletteNull12[16] = {}; const u16 gObjectEventPaletteNull13[16] = {}; const u16 gObjectEventPaletteNull14[16] = {}; const u16 gObjectEventPaletteNull15[16] = {}; -const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_09.gbapal"); -const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_10.gbapal"); +const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/09.gbapal"); +const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal"); const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/brendan/field_move.4bpp"); const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/surfing.4bpp"); const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/mach_bike.4bpp"); @@ -31,14 +31,14 @@ const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/object_even const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/object_events/pics/people/may/decorating.4bpp"); const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/brendan/underwater.4bpp"); const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/may/underwater.4bpp"); -const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_11.gbapal"); +const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/object_events/pics/people/may/walking.4bpp"); const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/object_events/pics/people/may/running.4bpp"); -const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_17.gbapal"); -const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_18.gbapal"); +const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/object_events/palettes/17.gbapal"); +const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/object_events/palettes/18.gbapal"); const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/walking.4bpp"); const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/running.4bpp"); -const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_34.gbapal"); +const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/object_events/palettes/34.gbapal"); const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/object_events/palettes/unused_palette.gbapal"); const u16 gObjectEventPaletteNull16[16] = {}; const u16 gObjectEventPaletteNull17[16] = {}; @@ -60,14 +60,14 @@ const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/object_events/pics const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/may/field_move.4bpp"); const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/object_events/pics/people/may/fishing.4bpp"); const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/object_events/pics/people/may/watering.4bpp"); -const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_00.gbapal"); -const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_01.gbapal"); -const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_02.gbapal"); -const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_03.gbapal"); -const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_04.gbapal"); -const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_05.gbapal"); -const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_06.gbapal"); -const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_07.gbapal"); +const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/object_events/palettes/00.gbapal"); +const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/object_events/palettes/01.gbapal"); +const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/object_events/palettes/02.gbapal"); +const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/object_events/palettes/03.gbapal"); +const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/object_events/palettes/04.gbapal"); +const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/object_events/palettes/05.gbapal"); +const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/object_events/palettes/06.gbapal"); +const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/object_events/palettes/07.gbapal"); const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/object_events/pics/people/ninja_boy.4bpp"); const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/object_events/pics/people/twin.4bpp"); const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/object_events/pics/people/boy_1.4bpp"); @@ -177,10 +177,10 @@ const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/object_events/pics/po const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_swimming.4bpp"); const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/object_events/pics/pokemon/azurill.4bpp"); const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/object_events/pics/people/mom.4bpp"); -const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_22.gbapal"); -const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_23.gbapal"); -const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_24.gbapal"); -const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_25.gbapal"); +const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/object_events/palettes/22.gbapal"); +const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/object_events/palettes/23.gbapal"); +const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/object_events/palettes/24.gbapal"); +const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/object_events/palettes/25.gbapal"); const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_natu_doll.4bpp"); const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_magnemite_doll.4bpp"); const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_squirtle_doll.4bpp"); @@ -238,21 +238,21 @@ const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/object_events const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/object_events/pics/misc/mr_brineys_boat.4bpp"); const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/object_events/pics/misc/fossil.4bpp"); const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/object_events/pics/misc/submarine_shadow.4bpp"); -const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_26.gbapal"); +const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/object_events/palettes/26.gbapal"); const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/object_events/pics/misc/truck.4bpp"); -const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_14.gbapal"); +const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/object_events/palettes/14.gbapal"); const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/object_events/pics/pokemon/vigoroth.4bpp"); -const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_15.gbapal"); +const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/object_events/palettes/15.gbapal"); const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/object_events/pics/misc/birchs_bag.4bpp"); const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon/enemy_zigzagoon.4bpp"); -const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_16.gbapal"); +const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/object_events/palettes/16.gbapal"); const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/object_events/pics/pokemon/poochyena.4bpp"); -const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_27.gbapal"); +const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/object_events/palettes/27.gbapal"); const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/misc/cable_car.4bpp"); -const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_20.gbapal"); +const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/object_events/pics/misc/ss_tidal.4bpp"); -const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_21.gbapal"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/object_events/pics/effects/berry_tree_growth_sparkle.4bpp"); +const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effects/pics/berry_tree_growth_sparkle.4bpp"); const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/object_events/pics/berry_trees/dirt_pile.4bpp"); const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sprout.4bpp"); const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp"); @@ -285,52 +285,52 @@ const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/object_events/ const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lansat.4bpp"); const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/durin.4bpp"); const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/tamato.4bpp"); -const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/object_events/pics/effects/surf_blob.4bpp"); +const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/field_effects/pics/surf_blob.4bpp"); const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/object_events/pics/people/quinty_plump.4bpp"); -const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_12.gbapal"); -const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_13.gbapal"); -const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp"); -const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp"); -const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp"); -const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); +const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); +const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/object_events/palettes/13.gbapal"); +const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/field_effects/pics/shadow_small.4bpp"); +const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/field_effects/pics/shadow_medium.4bpp"); +const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_large.4bpp"); +const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_extra_large.4bpp"); const u32 filler_8368A08[0x48] = {}; -const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/object_events/pics/effects/cut_grass.4bpp"); -const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/object_events/pics/effects/cut_grass.4bpp"); -const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_06.gbapal"); -const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/object_events/pics/effects/ripple.4bpp"); -const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/object_events/pics/effects/ash.4bpp"); -const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/object_events/pics/effects/arrow.4bpp"); -const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_00.gbapal"); -const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_01.gbapal"); -const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/object_events/pics/effects/ground_impact_dust.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_tall_grass.4bpp"); -const u32 gUnusedGrass[] = INCBIN_U32("graphics/object_events/pics/effects/unused_grass.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_16.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_17.4bpp"); -const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_18.4bpp"); -const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/object_events/pics/effects/long_grass.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/tall_grass.4bpp"); -const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/object_events/pics/effects/short_grass.4bpp"); -const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/sand_footprints.4bpp"); -const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/deep_sand_footprints.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/object_events/pics/effects/bike_tire_tracks.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_19.4bpp"); -const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_29.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_big_splash.4bpp"); -const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/object_events/pics/effects/splash.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_small_splash.4bpp"); -const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_20.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/tree_disguise.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/mountain_disguise.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/object_events/pics/effects/sand_disguise_placeholder.4bpp"); -const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/object_events/pics/effects/hot_springs_water.4bpp"); -const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_02.gbapal"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/object_events/pics/effects/jump_out_of_ash.4bpp"); -const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/object_events/pics/effects/lavaridge_gym_warp.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/object_events/pics/effects/bubbles.4bpp"); -const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_35.4bpp"); -const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_03.gbapal"); -const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/object_events/pics/effects/bird.4bpp"); +const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/field_effects/pics/cut_grass.4bpp"); +const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/field_effects/pics/cut_grass.4bpp"); +const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/field_effects/palettes/06.gbapal"); +const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/field_effects/pics/ripple.4bpp"); +const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/field_effects/pics/ash.4bpp"); +const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/field_effects/pics/arrow.4bpp"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/00.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/01.gbapal"); +const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/field_effects/pics/ground_impact_dust.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_tall_grass.4bpp"); +const u32 gUnusedGrass[] = INCBIN_U32("graphics/field_effects/pics/unused_grass.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/field_effects/pics/unknown_16.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/field_effects/pics/unknown_17.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/field_effects/pics/unknown_18.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/field_effects/pics/long_grass.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/field_effects/pics/tall_grass.4bpp"); +const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/field_effects/pics/short_grass.4bpp"); +const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/field_effects/pics/sand_footprints.4bpp"); +const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/field_effects/pics/deep_sand_footprints.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/field_effects/pics/bike_tire_tracks.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/field_effects/pics/unknown_19.4bpp"); +const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/field_effects/pics/unknown_29.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_big_splash.4bpp"); +const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/field_effects/pics/splash.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_small_splash.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/field_effects/pics/unknown_20.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/field_effects/pics/tree_disguise.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/field_effects/pics/mountain_disguise.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/field_effects/pics/sand_disguise_placeholder.4bpp"); +const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effects/pics/hot_springs_water.4bpp"); +const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effects/palettes/02.gbapal"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/field_effects/pics/jump_out_of_ash.4bpp"); +const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/field_effects/pics/lavaridge_gym_warp.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/field_effects/pics/bubbles.4bpp"); +const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/field_effects/pics/unknown_35.4bpp"); +const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effects/palettes/03.gbapal"); +const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/field_effects/pics/bird.4bpp"); const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/juan.4bpp"); const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/object_events/pics/people/scott.4bpp"); const u32 gObjectEventPic_Statue[] = INCBIN_U32("graphics/object_events/pics/misc/statue.4bpp"); @@ -339,15 +339,15 @@ const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/object_events/pics/p const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/object_events/pics/people/mystery_event_deliveryman.4bpp"); const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/object_events/pics/people/union_room_attendant.4bpp"); const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/object_events/pics/misc/moving_box.4bpp"); -const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_19.gbapal"); +const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/object_events/pics/pokemon/sudowoodo.4bpp"); const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/object_events/pics/pokemon/mew.4bpp"); -const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_28.gbapal"); +const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/object_events/palettes/28.gbapal"); const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/object_events/pics/people/red.4bpp"); const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/object_events/pics/people/leaf.4bpp"); -const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_30.gbapal"); +const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/object_events/palettes/30.gbapal"); const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/object_events/pics/misc/birth_island_stone.4bpp"); -const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_29.gbapal"); +const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/object_events/palettes/29.gbapal"); const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys.4bpp"); const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/anabel.4bpp"); const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/tucker.4bpp"); @@ -357,6 +357,6 @@ const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/object_events/pics/peo const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/lucy.4bpp"); const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/brandon.4bpp"); const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/object_events/pics/pokemon/lugia.4bpp"); -const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_32.gbapal"); +const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/object_events/palettes/32.gbapal"); const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/object_events/pics/pokemon/ho_oh.4bpp"); -const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_31.gbapal"); +const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/object_events/palettes/31.gbapal"); diff --git a/src/data/object_event/event_object_graphics_info.h b/src/data/object_events/object_event_graphics_info.h similarity index 100% rename from src/data/object_event/event_object_graphics_info.h rename to src/data/object_events/object_event_graphics_info.h diff --git a/src/data/object_event/event_object_graphics_info_pointers.h b/src/data/object_events/object_event_graphics_info_pointers.h similarity index 100% rename from src/data/object_event/event_object_graphics_info_pointers.h rename to src/data/object_events/object_event_graphics_info_pointers.h diff --git a/src/data/object_event/event_object_pic_tables.h b/src/data/object_events/object_event_pic_tables.h similarity index 100% rename from src/data/object_event/event_object_pic_tables.h rename to src/data/object_events/object_event_pic_tables.h diff --git a/src/data/object_event/event_object_subsprites.h b/src/data/object_events/object_event_subsprites.h similarity index 100% rename from src/data/object_event/event_object_subsprites.h rename to src/data/object_events/object_event_subsprites.h diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 572db3352f..464e6acecd 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -140,7 +140,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_2, }; -#include "data/object_event/event_object_graphics.h" +#include "data/object_events/object_event_graphics.h" // movement type callbacks static void (*const sMovementTypeCallbacks[])(struct Sprite *) = @@ -433,13 +433,13 @@ const u8 gInitialMovementTypeFacingDirections[] = { #define OBJ_EVENT_PAL_TAG_34 0x1123 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF -#include "data/object_event/event_object_graphics_info_pointers.h" -#include "data/object_event/field_effect_object_template_pointers.h" -#include "data/object_event/event_object_pic_tables.h" -#include "data/object_event/event_object_anims.h" -#include "data/object_event/base_oam.h" -#include "data/object_event/event_object_subsprites.h" -#include "data/object_event/event_object_graphics_info.h" +#include "data/object_events/object_event_graphics_info_pointers.h" +#include "data/field_effects/field_effect_object_template_pointers.h" +#include "data/object_events/object_event_pic_tables.h" +#include "data/object_events/object_event_anims.h" +#include "data/object_events/base_oam.h" +#include "data/object_events/object_event_subsprites.h" +#include "data/object_events/object_event_graphics_info.h" const struct SpritePalette sObjectEventSpritePalettes[] = { {gObjectEventPalette0, OBJ_EVENT_PAL_TAG_0}, @@ -661,14 +661,14 @@ const u16 *const gObjectPaletteTagSets[] = { gObjectPaletteTags3, }; -#include "data/object_event/berry_tree_graphics_tables.h" -#include "data/object_event/field_effect_objects.h" +#include "data/object_events/berry_tree_graphics_tables.h" +#include "data/field_effects/field_effect_objects.h" const s16 gMovementDelaysMedium[] = {32, 64, 96, 128}; const s16 gMovementDelaysLong[] = {32, 64, 128, 192}; const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; -#include "data/object_event/movement_type_func_tables.h" +#include "data/object_events/movement_type_func_tables.h" const u8 gFaceDirectionAnimNums[] = { [DIR_NONE] = 0, @@ -1089,7 +1089,7 @@ const u8 gUnknown_0850DC3F[][4] = { {3, 4, 2, 1} }; -#include "data/object_event/movement_action_func_tables.h" +#include "data/object_events/movement_action_func_tables.h" // Code diff --git a/src/field_effect.c b/src/field_effect.c index b89000cc32..7195f3f4a3 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -245,12 +245,12 @@ const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp"); const u32 gUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp"); const u16 gNewGameBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal"); const u32 gSpriteImage_855A970[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp"); -const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_04.gbapal"); +const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/field_effects/palettes/04.gbapal"); const u32 gSpriteImage_855A9B0[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp"); const u32 gSpriteImage_855AA70[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp"); const u32 gSpriteImage_855AB30[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp"); const u8 gSpriteImage_855AD30[] = INCBIN_U8("graphics/misc/small_hof_monitor.4bpp"); -const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_05.gbapal"); +const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/field_effects/palettes/05.gbapal"); // Graphics for the lights streaking past your Pokemon when it uses a field move. const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp"); diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index 95c7123b3f..60d1ea0724 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -72,7 +72,7 @@ static const u8 gSpriteImage_858DB78[] = INCBIN_U8("graphics/unknown/858E588/4.4 static const u8 gUnusedEmptySpace_858DBF8[32] = {0}; -static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_07.gbapal"); +static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/field_effects/palettes/07.gbapal"); static const u8 gSpriteImage_858DC38[] = INCBIN_U8("graphics/unknown/858E5D8/0.4bpp"); static const u8 gSpriteImage_858DCB8[] = INCBIN_U8("graphics/unknown/858E5D8/1.4bpp"); static const u8 gSpriteImage_858DD38[] = INCBIN_U8("graphics/unknown/858E5D8/2.4bpp"); @@ -84,7 +84,7 @@ static const u8 gSpriteImage_858DFB8[] = INCBIN_U8("graphics/unknown/858E5B0/2.4 static const u8 gSpriteImage_858E038[] = INCBIN_U8("graphics/unknown/858E5B0/3.4bpp"); static const u8 gSpriteImage_858E0B8[] = INCBIN_U8("graphics/unknown/858E5B0/4.4bpp"); static const u8 gSpriteImage_858E138[] = INCBIN_U8("graphics/unknown/858E5B0/5.4bpp"); -static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_08.gbapal"); +static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/field_effects/palettes/08.gbapal"); static const u8 gSpriteImage_858E1D8[] = INCBIN_U8("graphics/unknown/858E674/0.4bpp"); static const u8 gSpriteImage_858E2D8[] = INCBIN_U8("graphics/unknown/858E674/1.4bpp"); static const u8 gSpriteImage_858E3D8[] = INCBIN_U8("graphics/unknown/858E674/2.4bpp"); @@ -285,7 +285,7 @@ static const struct SpriteTemplate gUnknown_0858E68C = .callback = SpriteCB_SandPillar_0, }; -// This uses one of the secret base palettes, so there is no "field_effect_object_palette_09.pal" file. +// This uses one of the secret base palettes, so there is no "graphics/field_effects/palettes/09.pal" file. const struct SpritePalette gFieldEffectObjectPaletteInfo9 = {gTilesetPalettes_SecretBase[5], 0x100E}; static const u8 gSpriteImage_858E6AC[] = INCBIN_U8("graphics/unknown/858E84C/0.4bpp");