name more gkeep files

assets/objects/gameplay_keep/door.c

@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xE770.h"
+#include "door.h"
 #include "array_count.h"
 #include "gfx.h"
 

assets/objects/gameplay_keep/door.h

@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xE770_H
+#ifndef GAMEPLAY_KEEP_DOOR_H
-#define GAMEPLAY_KEEP_0xE770_H
+#define GAMEPLAY_KEEP_DOOR_H
 
 #include "tex_len.h"
 #include "ultra64.h"

assets/objects/gameplay_keep/eff_fragments_1.c

@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xC0A0.h"
+#include "eff_fragments_1.h"
 #include "gfx.h"
 
 Vtx gEffFragments1Vtx[] = {

assets/objects/gameplay_keep/eff_fragments_1.h

@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xC0A0_H
+#ifndef GAMEPLAY_KEEP_EFF_FRAGMENTS_1_H
-#define GAMEPLAY_KEEP_0xC0A0_H
+#define GAMEPLAY_KEEP_EFF_FRAGMENTS_1_H
 
 #include "tex_len.h"
 #include "ultra64.h"

assets/objects/gameplay_keep/eff_fragments_2_model.c

@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xCCC0.h"
+#include "eff_fragments_2_model.h"
 #include "gfx.h"
 
 Vtx gEffFragments2Vtx[] = {

assets/objects/gameplay_keep/eff_fragments_2_model.h

@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xCCC0_H
+#ifndef GAMEPLAY_KEEP_EFF_FRAGMENTS_2_MODEL_H
-#define GAMEPLAY_KEEP_0xCCC0_H
+#define GAMEPLAY_KEEP_EFF_FRAGMENTS_2_MODEL_H
 
 #include "ultra64.h"
 

assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.c

@@ -0,0 +1,13 @@
+#include "gDoorAdultOpeningLeftAnim.h"
+
+s16 gDoorAdultOpeningLeftFrameData[] = {
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftFrameData.inc.c"
+};
+
+JointIndex gDoorAdultOpeningLeftJointIndices[] = {
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftJointIndices.inc.c"
+};
+
+AnimationHeader gDoorAdultOpeningLeftAnim = {
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.inc.c"
+};

assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.h

@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_GDOORADULTOPENINGLEFTANIM_H
+#define GAMEPLAY_KEEP_GDOORADULTOPENINGLEFTANIM_H
+
+#include "animation.h"
+
+extern s16 gDoorAdultOpeningLeftFrameData[];
+extern JointIndex gDoorAdultOpeningLeftJointIndices[];
+extern AnimationHeader gDoorAdultOpeningLeftAnim;
+
+#endif

assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.c

@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xFF80.h"
+#include "gDoorAdultOpeningRightAnim.h"
 
 s16 gDoorAdultOpeningRightFrameData[] = {
 #include "assets/objects/gameplay_keep/gDoorAdultOpeningRightFrameData.inc.c"

assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.h

@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xFF80_H
+#ifndef GAMEPLAY_KEEP_DOOR_ADULT_OPENING_RIGHT_ANIM_H
-#define GAMEPLAY_KEEP_0xFF80_H
+#define GAMEPLAY_KEEP_DOOR_ADULT_OPENING_RIGHT_ANIM_H
 
 #include "animation.h"
 

assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.c

@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xE4E0.h"
+#include "gDoorChildOpeningLeftAnim.h"
 
 s16 gDoorChildOpeningLeftFrameData[] = {
 #include "assets/objects/gameplay_keep/gDoorChildOpeningLeftFrameData.inc.c"

assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.h

@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xE4E0_H
+#ifndef GAMEPLAY_KEEP_DOOR_CHILD_OPENING_LEFT_ANIM_H
-#define GAMEPLAY_KEEP_0xE4E0_H
+#define GAMEPLAY_KEEP_DOOR_CHILD_OPENING_LEFT_ANIM_H
 
 #include "animation.h"
 

assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.c

@@ -0,0 +1,13 @@
+#include "gDoorChildOpeningRightAnim.h"
+
+s16 gDoorChildOpeningRightFrameData[] = {
+#include "assets/objects/gameplay_keep/gDoorChildOpeningRightFrameData.inc.c"
+};
+
+JointIndex gDoorChildOpeningRightJointIndices[] = {
+#include "assets/objects/gameplay_keep/gDoorChildOpeningRightJointIndices.inc.c"
+};
+
+AnimationHeader gDoorChildOpeningRightAnim = {
+#include "assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.inc.c"
+};

assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.h

@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_GDOORCHILDOPENINGRIGHTANIM_H
+#define GAMEPLAY_KEEP_GDOORCHILDOPENINGRIGHTANIM_H
+
+#include "animation.h"
+
+extern s16 gDoorChildOpeningRightFrameData[];
+extern JointIndex gDoorChildOpeningRightJointIndices[];
+extern AnimationHeader gDoorChildOpeningRightAnim;
+
+#endif

assets/objects/gameplay_keep/gameplay_keep.h

@@ -13,7 +13,7 @@
 #include "bomb_cap.h"
 #include "bombchu_body.h"
 #include "eff_bomb_explosion.h"
-#include "gameplay_keep_0xC0A0.h"
+#include "eff_fragments_1.h"
 #include "boomerang.h"
 #include "compass_arrow.h"
 #if OOT_REGION != REGION_EU
@@ -21,17 +21,17 @@
 #endif
 #include "lock_on_arrow.h"
 #include "hilite3_tex.h"
-#include "gameplay_keep_0xCCC0.h"
+#include "eff_fragments_2_model.h"
 #if OOT_REGION != REGION_EU
 #include "gameplay_keep_ntsc_0xCE60.h"
 #endif
-#include "gameplay_keep_0xCDC0.h"
+#include "shopkeeper_controls_tex.h"
-#include "gameplay_keep_0xD0C0.h"
+#include "rock_fragments_model.h"
-#include "gameplay_keep_0xD4E0.h"
+#include "rock_fragments_tex.h"
-#include "gameplay_keep_0xE4E0.h"
+#include "gDoorChildOpeningLeftAnim.h"
-#include "gameplay_keep_0xE5D0.h"
+#include "gDoorChildOpeningRightAnim.h"
-#include "gameplay_keep_0xE770.h"
+#include "door.h"
-#include "gameplay_keep_0xFF80.h"
+#include "gDoorAdultOpeningRightAnim.h"
 #include "eff_dust.h"
 #include "eff_flash.h"
 #include "gameplay_keep_0x11230.h"

assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c

@@ -1,25 +0,0 @@
-#include "gameplay_keep_0xE5D0.h"
-
-s16 gDoorChildOpeningRightFrameData[] = {
-#include "assets/objects/gameplay_keep/gDoorChildOpeningRightFrameData.inc.c"
-};
-
-JointIndex gDoorChildOpeningRightJointIndices[] = {
-#include "assets/objects/gameplay_keep/gDoorChildOpeningRightJointIndices.inc.c"
-};
-
-AnimationHeader gDoorChildOpeningRightAnim = {
-#include "assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.inc.c"
-};
-
-s16 gDoorAdultOpeningLeftFrameData[] = {
-#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftFrameData.inc.c"
-};
-
-JointIndex gDoorAdultOpeningLeftJointIndices[] = {
-#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftJointIndices.inc.c"
-};
-
-AnimationHeader gDoorAdultOpeningLeftAnim = {
-#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.inc.c"
-};

assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h

@@ -1,13 +0,0 @@
-#ifndef GAMEPLAY_KEEP_0xE5D0_H
-#define GAMEPLAY_KEEP_0xE5D0_H
-
-#include "animation.h"
-
-extern s16 gDoorChildOpeningRightFrameData[];
-extern JointIndex gDoorChildOpeningRightJointIndices[];
-extern AnimationHeader gDoorChildOpeningRightAnim;
-extern s16 gDoorAdultOpeningLeftFrameData[];
-extern JointIndex gDoorAdultOpeningLeftJointIndices[];
-extern AnimationHeader gDoorAdultOpeningLeftAnim;
-
-#endif

assets/objects/gameplay_keep/rock_fragments_model.c

@@ -1,5 +1,5 @@
-#include "gameplay_keep_0xD0C0.h"
+#include "rock_fragments_model.h"
-#include "gameplay_keep_0xD4E0.h"
+#include "rock_fragments_tex.h"
 #include "gfx.h"
 
 Vtx gUnusedRockFragmentVtx[] = {

assets/objects/gameplay_keep/rock_fragments_model.h

@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xD0C0_H
+#ifndef GAMEPLAY_KEEP_ROCK_FRAGMENTS_MODEL_H
-#define GAMEPLAY_KEEP_0xD0C0_H
+#define GAMEPLAY_KEEP_ROCK_FRAGMENTS_MODEL_H
 
 #include "ultra64.h"
 

assets/objects/gameplay_keep/rock_fragments_tex.c

@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xD4E0.h"
+#include "rock_fragments_tex.h"
 
 u64 gRockFragment1Tex[TEX_LEN(u64, gRockFragment1Tex_WIDTH, gRockFragment1Tex_HEIGHT, 16)] = {
 #include "assets/objects/gameplay_keep/gRockFragment1Tex.rgba16.inc.c"

assets/objects/gameplay_keep/rock_fragments_tex.h

@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xD4E0_H
+#ifndef GAMEPLAY_KEEP_ROCK_FRAGMENTS_TEX_H
-#define GAMEPLAY_KEEP_0xD4E0_H
+#define GAMEPLAY_KEEP_ROCK_FRAGMENTS_TEX_H
 
 #include "tex_len.h"
 #include "ultra64.h"

assets/objects/gameplay_keep/shopkeeper_controls_tex.c

@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xCDC0.h"
+#include "shopkeeper_controls_tex.h"
 #include "region.h"
 
 u64 gSelectionCursorTex[TEX_LEN(u64, gSelectionCursorTex_WIDTH, gSelectionCursorTex_HEIGHT, 4)] = {

assets/objects/gameplay_keep/shopkeeper_controls_tex.h

@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xCDC0_H
+#ifndef GAMEPLAY_KEEP_SHOPKEEPER_CONTROLS_TEX_H
-#define GAMEPLAY_KEEP_0xCDC0_H
+#define GAMEPLAY_KEEP_SHOPKEEPER_CONTROLS_TEX_H
 
 #include "tex_len.h"
 #include "ultra64.h"

spec/spec

@@ -1009,7 +1009,7 @@ beginseg
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/bomb_cap.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/bombchu_body.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_bomb_explosion.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_fragments_1.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/boomerang.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/compass_arrow.o"
 #if OOT_REGION != REGION_EU
@@ -1017,17 +1017,18 @@ beginseg
 #endif
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/lock_on_arrow.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/hilite3_tex.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_fragments_2_model.o"
 #if OOT_REGION != REGION_EU
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.o"
 #endif
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/shopkeeper_controls_tex.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/rock_fragments_model.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/rock_fragments_tex.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE770.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xFF80.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/door.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"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x11230.o"

src/code/z_en_a_keep.c

@@ -17,7 +17,7 @@
 #include "assets/objects/gameplay_keep/tree_stump_model.h"
 #include "assets/objects/gameplay_keep/rectangular_sign_model.h"
 #include "assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h"
+#include "assets/objects/gameplay_keep/rock_fragments_model.h"
 #include "assets/objects/object_d_hsblock/object_d_hsblock.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c

@@ -17,7 +17,7 @@
 #include "effect.h"
 #include "play_state.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h"
+#include "assets/objects/gameplay_keep/eff_fragments_2_model.h"
 #include "assets/objects/gameplay_keep/gameplay_keep_0x173D0.h"
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 

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/gameplay_keep_0xE770.h"
+#include "assets/objects/gameplay_keep/door.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"

src/overlays/actors/ovl_En_Door/z_en_door.c

@@ -18,10 +18,11 @@
 #include "player.h"
 #include "save.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h"
+#include "assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h"
+#include "assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xFF80.h"
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xE770.h"
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.h"
+#include "assets/objects/gameplay_keep/door.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"

src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c

@@ -23,7 +23,7 @@
 #include "play_state.h"
 #include "player.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h"
+#include "assets/objects/gameplay_keep/rock_fragments_model.h"
 #include "assets/objects/object_goroiwa/object_goroiwa.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

@@ -19,7 +19,7 @@
 #include "player.h"
 #include "save.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h"
+#include "assets/objects/gameplay_keep/shopkeeper_controls_tex.h"
 #include "assets/objects/object_ossan/object_ossan.h"
 #include "assets/objects/object_oF1d_map/object_oF1d_map.h"
 #include "assets/objects/object_os/object_os.h"

src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c

@@ -15,8 +15,8 @@
 #include "play_state.h"
 #include "player.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h"
+#include "assets/objects/gameplay_keep/eff_fragments_1.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h"
+#include "assets/objects/gameplay_keep/eff_fragments_2_model.h"
 
 #define rPitch regs[0]
 #define rYaw regs[1]