diff --git a/assets/objects/gameplay_keep/door.c b/assets/objects/gameplay_keep/door_skel.c similarity index 98% rename from assets/objects/gameplay_keep/door.c rename to assets/objects/gameplay_keep/door_skel.c index 6d370fbd19..ab71076772 100644 --- a/assets/objects/gameplay_keep/door.c +++ b/assets/objects/gameplay_keep/door_skel.c @@ -1,4 +1,4 @@ -#include "door.h" +#include "door_skel.h" #include "array_count.h" #include "gfx.h" diff --git a/assets/objects/gameplay_keep/door.h b/assets/objects/gameplay_keep/door_skel.h similarity index 92% rename from assets/objects/gameplay_keep/door.h rename to assets/objects/gameplay_keep/door_skel.h index c41c9ee2b6..9319ffad76 100644 --- a/assets/objects/gameplay_keep/door.h +++ b/assets/objects/gameplay_keep/door_skel.h @@ -1,5 +1,5 @@ -#ifndef GAMEPLAY_KEEP_DOOR_H -#define GAMEPLAY_KEEP_DOOR_H +#ifndef GAMEPLAY_KEEP_DOOR_SKEL_H +#define GAMEPLAY_KEEP_DOOR_SKEL_H #include "tex_len.h" #include "ultra64.h" diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h index 0cae382843..6702db24d8 100644 --- a/assets/objects/gameplay_keep/gameplay_keep.h +++ b/assets/objects/gameplay_keep/gameplay_keep.h @@ -30,7 +30,7 @@ #include "rock_fragments_tex.h" #include "gDoorChildOpeningLeftAnim.h" #include "gDoorChildOpeningRightAnim.h" -#include "door.h" +#include "door_skel.h" #include "gDoorAdultOpeningRightAnim.h" #include "eff_dust.h" #include "eff_flash.h" diff --git a/spec/spec b/spec/spec index efd880762c..52db392dac 100644 --- a/spec/spec +++ b/spec/spec @@ -1027,7 +1027,7 @@ beginseg include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.o" - include "$(BUILD_DIR)/assets/objects/gameplay_keep/door.o" + include "$(BUILD_DIR)/assets/objects/gameplay_keep/door_skel.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_dust.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_flash.o" diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 447cbcb14f..0fbabb357a 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -17,7 +17,7 @@ #include "play_state.h" #include "player.h" -#include "assets/objects/gameplay_keep/door.h" +#include "assets/objects/gameplay_keep/door_skel.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #include "assets/objects/object_haka_door/object_haka_door.h" diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 1ee57f687f..ed44df927b 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -22,7 +22,7 @@ #include "assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.h" #include "assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.h" #include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.h" -#include "assets/objects/gameplay_keep/door.h" +#include "assets/objects/gameplay_keep/door_skel.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h"