From f346b7fb6a9ee4e44013dfc0f0354831f9ceb1d2 Mon Sep 17 00:00:00 2001
From: Tharo <17233964+Thar0@users.noreply.github.com>
Date: Sat, 7 Jun 2025 20:45:10 +0100
Subject: [PATCH 01/22] Commit and split gameplay_keep
---
assets/objects/gameplay_keep/arrow_anims.c | 25 +
assets/objects/gameplay_keep/arrow_anims.h | 13 +
assets/objects/gameplay_keep/arrow_skel.c | 52 +
assets/objects/gameplay_keep/arrow_skel.h | 32 +
assets/objects/gameplay_keep/bomb_body.c | 14 +
assets/objects/gameplay_keep/bomb_body.h | 13 +
assets/objects/gameplay_keep/bomb_cap.c | 14 +
assets/objects/gameplay_keep/bomb_cap.h | 13 +
assets/objects/gameplay_keep/bombchu_body.c | 14 +
assets/objects/gameplay_keep/bombchu_body.h | 13 +
assets/objects/gameplay_keep/boomerang.c | 20 +
assets/objects/gameplay_keep/boomerang.h | 11 +
.../gameplay_keep/circle_glow_textures.c | 17 +
.../gameplay_keep/circle_glow_textures.h | 20 +
assets/objects/gameplay_keep/compass_arrow.c | 10 +
assets/objects/gameplay_keep/compass_arrow.h | 9 +
assets/objects/gameplay_keep/debug_models.c | 62 +
assets/objects/gameplay_keep/debug_models.h | 33 +
.../gameplay_keep/drop_recovery_heart_tex.c | 5 +
.../gameplay_keep/drop_recovery_heart_tex.h | 11 +
assets/objects/gameplay_keep/dust_textures.c | 33 +
assets/objects/gameplay_keep/dust_textures.h | 32 +
.../gameplay_keep/eff_bomb_explosion.c | 50 +
.../gameplay_keep/eff_bomb_explosion.h | 36 +
assets/objects/gameplay_keep/eff_bubble.c | 10 +
assets/objects/gameplay_keep/eff_bubble.h | 9 +
assets/objects/gameplay_keep/eff_dust.c | 10 +
assets/objects/gameplay_keep/eff_dust.h | 9 +
.../gameplay_keep/eff_enemy_death_flame.c | 50 +
.../gameplay_keep/eff_enemy_death_flame.h | 40 +
assets/objects/gameplay_keep/eff_fire.c | 22 +
assets/objects/gameplay_keep/eff_fire.h | 17 +
.../gameplay_keep/eff_fire_footprint.c | 42 +
.../gameplay_keep/eff_fire_footprint.h | 34 +
assets/objects/gameplay_keep/eff_flash.c | 18 +
assets/objects/gameplay_keep/eff_flash.h | 14 +
assets/objects/gameplay_keep/eff_hitmark.c | 106 +
assets/objects/gameplay_keep/eff_hitmark.h | 82 +
.../objects/gameplay_keep/eff_ice_fragments.c | 15 +
.../objects/gameplay_keep/eff_ice_fragments.h | 10 +
assets/objects/gameplay_keep/eff_lightning.c | 42 +
assets/objects/gameplay_keep/eff_lightning.h | 34 +
assets/objects/gameplay_keep/eff_shockwave.c | 14 +
assets/objects/gameplay_keep/eff_shockwave.h | 13 +
.../objects/gameplay_keep/eff_spark_model.c | 10 +
.../objects/gameplay_keep/eff_spark_model.h | 9 +
.../gameplay_keep/eff_spark_textures.c | 17 +
.../gameplay_keep/eff_spark_textures.h | 20 +
assets/objects/gameplay_keep/fairy_anim.c | 13 +
assets/objects/gameplay_keep/fairy_anim.h | 10 +
assets/objects/gameplay_keep/fairy_skel.c | 129 +
assets/objects/gameplay_keep/fairy_skel.h | 62 +
.../objects/gameplay_keep/flat_block_model.c | 11 +
.../objects/gameplay_keep/flat_block_model.h | 9 +
assets/objects/gameplay_keep/gameplay_keep.h | 144 ++
.../gameplay_keep/gameplay_keep_0x11230.c | 58 +
.../gameplay_keep/gameplay_keep_0x11230.h | 30 +
.../gameplay_keep/gameplay_keep_0x13700.c | 18 +
.../gameplay_keep/gameplay_keep_0x13700.h | 16 +
.../gameplay_keep/gameplay_keep_0x16A50.c | 9 +
.../gameplay_keep/gameplay_keep_0x16A50.h | 14 +
.../gameplay_keep/gameplay_keep_0x173D0.c | 18 +
.../gameplay_keep/gameplay_keep_0x173D0.h | 16 +
.../gameplay_keep/gameplay_keep_0x185A0.c | 13 +
.../gameplay_keep/gameplay_keep_0x185A0.h | 10 +
.../gameplay_keep/gameplay_keep_0x18610.c | 67 +
.../gameplay_keep/gameplay_keep_0x18610.h | 39 +
.../gameplay_keep/gameplay_keep_0x18FF0.c | 13 +
.../gameplay_keep/gameplay_keep_0x18FF0.h | 10 +
.../gameplay_keep/gameplay_keep_0x21810.c | 13 +
.../gameplay_keep/gameplay_keep_0x21810.h | 17 +
.../gameplay_keep/gameplay_keep_0x23810.c | 42 +
.../gameplay_keep/gameplay_keep_0x23810.h | 34 +
.../gameplay_keep/gameplay_keep_0x244B0.c | 14 +
.../gameplay_keep/gameplay_keep_0x244B0.h | 13 +
.../gameplay_keep/gameplay_keep_0x255F0.c | 42 +
.../gameplay_keep/gameplay_keep_0x255F0.h | 34 +
.../gameplay_keep/gameplay_keep_0x27E90.c | 42 +
.../gameplay_keep/gameplay_keep_0x27E90.h | 34 +
.../gameplay_keep/gameplay_keep_0x32090.c | 17 +
.../gameplay_keep/gameplay_keep_0x32090.h | 20 +
.../gameplay_keep/gameplay_keep_0x33090.c | 5 +
.../gameplay_keep/gameplay_keep_0x33090.h | 11 +
.../gameplay_keep/gameplay_keep_0x33910.c | 11 +
.../gameplay_keep/gameplay_keep_0x33910.h | 9 +
.../gameplay_keep/gameplay_keep_0x34020.c | 267 ++
.../gameplay_keep/gameplay_keep_0x34020.h | 106 +
.../gameplay_keep/gameplay_keep_0x355A0.c | 26 +
.../gameplay_keep/gameplay_keep_0x355A0.h | 18 +
.../gameplay_keep/gameplay_keep_0x37840.c | 14 +
.../gameplay_keep/gameplay_keep_0x37840.h | 13 +
.../gameplay_keep/gameplay_keep_0x38FB0.c | 5 +
.../gameplay_keep/gameplay_keep_0x38FB0.h | 11 +
.../gameplay_keep/gameplay_keep_0x393B0.c | 24 +
.../gameplay_keep/gameplay_keep_0x393B0.h | 12 +
.../gameplay_keep/gameplay_keep_0x39710.c | 11 +
.../gameplay_keep/gameplay_keep_0x39710.h | 9 +
.../gameplay_keep/gameplay_keep_0x39940.c | 24 +
.../gameplay_keep/gameplay_keep_0x39940.h | 12 +
.../gameplay_keep/gameplay_keep_0x39CC0.c | 24 +
.../gameplay_keep/gameplay_keep_0x39CC0.h | 12 +
.../gameplay_keep/gameplay_keep_0x39DF0.c | 11 +
.../gameplay_keep/gameplay_keep_0x39DF0.h | 9 +
.../gameplay_keep/gameplay_keep_0x3A150.c | 11 +
.../gameplay_keep/gameplay_keep_0x3A150.h | 9 +
.../gameplay_keep/gameplay_keep_0x3A380.c | 23 +
.../gameplay_keep/gameplay_keep_0x3A380.h | 12 +
.../gameplay_keep/gameplay_keep_0x3AC30.c | 5 +
.../gameplay_keep/gameplay_keep_0x3AC30.h | 11 +
.../gameplay_keep/gameplay_keep_0x3B1E0.c | 21 +
.../gameplay_keep/gameplay_keep_0x3B1E0.h | 11 +
.../gameplay_keep/gameplay_keep_0x3C2E0.c | 11 +
.../gameplay_keep/gameplay_keep_0x3C2E0.h | 9 +
.../gameplay_keep/gameplay_keep_0x3C870.c | 21 +
.../gameplay_keep/gameplay_keep_0x3C870.h | 20 +
.../gameplay_keep/gameplay_keep_0x3F140.c | 26 +
.../gameplay_keep/gameplay_keep_0x3F140.h | 26 +
.../gameplay_keep/gameplay_keep_0x400.c | 17 +
.../gameplay_keep/gameplay_keep_0x400.h | 20 +
.../gameplay_keep/gameplay_keep_0x42530.c | 9 +
.../gameplay_keep/gameplay_keep_0x42530.h | 14 +
.../gameplay_keep/gameplay_keep_0x43530.c | 9 +
.../gameplay_keep/gameplay_keep_0x43530.h | 14 +
.../gameplay_keep/gameplay_keep_0x44530.c | 5 +
.../gameplay_keep/gameplay_keep_0x44530.h | 11 +
.../gameplay_keep/gameplay_keep_0x45530.c | 5 +
.../gameplay_keep/gameplay_keep_0x45530.h | 11 +
.../gameplay_keep/gameplay_keep_0x45D30.c | 5 +
.../gameplay_keep/gameplay_keep_0x45D30.h | 11 +
.../gameplay_keep/gameplay_keep_0x48130.c | 10 +
.../gameplay_keep/gameplay_keep_0x48130.h | 9 +
.../gameplay_keep/gameplay_keep_0x49F20.c | 11 +
.../gameplay_keep/gameplay_keep_0x49F20.h | 9 +
.../gameplay_keep/gameplay_keep_0x4A090.c | 18 +
.../gameplay_keep/gameplay_keep_0x4A090.h | 16 +
.../gameplay_keep/gameplay_keep_0x4D160.c | 24 +
.../gameplay_keep/gameplay_keep_0x4D160.h | 12 +
.../gameplay_keep/gameplay_keep_0x4E660.c | 38 +
.../gameplay_keep/gameplay_keep_0x4E660.h | 16 +
.../gameplay_keep/gameplay_keep_0x515B0.c | 5 +
.../gameplay_keep/gameplay_keep_0x515B0.h | 11 +
.../gameplay_keep/gameplay_keep_0x55DB0.c | 9 +
.../gameplay_keep/gameplay_keep_0x55DB0.h | 14 +
.../gameplay_keep/gameplay_keep_0xC0A0.c | 14 +
.../gameplay_keep/gameplay_keep_0xC0A0.h | 13 +
.../gameplay_keep/gameplay_keep_0xCCC0.c | 10 +
.../gameplay_keep/gameplay_keep_0xCCC0.h | 9 +
.../gameplay_keep/gameplay_keep_0xCDC0.c | 14 +
.../gameplay_keep/gameplay_keep_0xCDC0.h | 17 +
.../gameplay_keep/gameplay_keep_0xD0C0.c | 19 +
.../gameplay_keep/gameplay_keep_0xD0C0.h | 11 +
.../gameplay_keep/gameplay_keep_0xD4E0.c | 9 +
.../gameplay_keep/gameplay_keep_0xD4E0.h | 14 +
.../gameplay_keep/gameplay_keep_0xE4E0.c | 13 +
.../gameplay_keep/gameplay_keep_0xE4E0.h | 10 +
.../gameplay_keep/gameplay_keep_0xE5D0.c | 25 +
.../gameplay_keep/gameplay_keep_0xE5D0.h | 13 +
.../gameplay_keep/gameplay_keep_0xE770.c | 55 +
.../gameplay_keep/gameplay_keep_0xE770.h | 32 +
.../gameplay_keep/gameplay_keep_0xFF80.c | 13 +
.../gameplay_keep/gameplay_keep_0xFF80.h | 10 +
.../gameplay_keep_ntsc_0x39850.c | 12 +
.../gameplay_keep_ntsc_0x39850.h | 12 +
.../gameplay_keep_ntsc_0x39970.c | 11 +
.../gameplay_keep_ntsc_0x39970.h | 12 +
.../gameplay_keep_ntsc_0x39A40.c | 11 +
.../gameplay_keep_ntsc_0x39A40.h | 12 +
.../gameplay_keep_ntsc_0x39B10.c | 11 +
.../gameplay_keep_ntsc_0x39B10.h | 12 +
.../gameplay_keep_ntsc_0x3C610.c | 20 +
.../gameplay_keep_ntsc_0x3C610.h | 14 +
.../gameplay_keep_ntsc_0x3D220.c | 11 +
.../gameplay_keep_ntsc_0x3D220.h | 12 +
.../gameplay_keep_ntsc_0x3FD80.c | 9 +
.../gameplay_keep_ntsc_0x3FD80.h | 17 +
.../gameplay_keep_ntsc_0x41580.c | 5 +
.../gameplay_keep_ntsc_0x41580.h | 14 +
.../gameplay_keep_ntsc_0x46A40.c | 13 +
.../gameplay_keep_ntsc_0x46A40.h | 17 +
.../gameplay_keep/gameplay_keep_ntsc_0xC880.c | 12 +
.../gameplay_keep/gameplay_keep_ntsc_0xC880.h | 12 +
.../gameplay_keep/gameplay_keep_ntsc_0xCE60.c | 5 +
.../gameplay_keep/gameplay_keep_ntsc_0xCE60.h | 14 +
.../gameplay_keep/grass_blades_model.c | 11 +
.../gameplay_keep/grass_blades_model.h | 9 +
.../heart_piece_interior_model.c | 12 +
.../heart_piece_interior_model.h | 9 +
assets/objects/gameplay_keep/hilite3_tex.c | 6 +
assets/objects/gameplay_keep/hilite3_tex.h | 11 +
assets/objects/gameplay_keep/hilite4_tex.c | 5 +
assets/objects/gameplay_keep/hilite4_tex.h | 11 +
.../objects/gameplay_keep/hilite_textures.c | 9 +
.../objects/gameplay_keep/hilite_textures.h | 14 +
.../gameplay_keep/hover_boots_circle.c | 18 +
.../gameplay_keep/hover_boots_circle.h | 16 +
assets/objects/gameplay_keep/item_drop_dl.c | 11 +
assets/objects/gameplay_keep/item_drop_dl.h | 9 +
.../objects/gameplay_keep/item_drops_ntsc.c | 13 +
.../objects/gameplay_keep/item_drops_ntsc.h | 20 +
assets/objects/gameplay_keep/lens_flare.c | 22 +
assets/objects/gameplay_keep/lens_flare.h | 17 +
assets/objects/gameplay_keep/lens_mask_tex.c | 5 +
assets/objects/gameplay_keep/lens_mask_tex.h | 11 +
.../gameplay_keep/liftable_rock_model.c | 11 +
.../gameplay_keep/liftable_rock_model.h | 9 +
assets/objects/gameplay_keep/link_textures.c | 17 +
assets/objects/gameplay_keep/link_textures.h | 20 +
assets/objects/gameplay_keep/lock_on_arrow.c | 11 +
assets/objects/gameplay_keep/lock_on_arrow.h | 9 +
.../objects/gameplay_keep/lock_on_reticle.c | 10 +
.../objects/gameplay_keep/lock_on_reticle.h | 9 +
assets/objects/gameplay_keep/moon.c | 14 +
assets/objects/gameplay_keep/moon.h | 13 +
.../gameplay_keep/player_anim_headers.c | 2294 +++++++++++++++++
.../gameplay_keep/player_anim_headers.h | 580 +++++
.../gameplay_keep/player_pause_joint_tables.c | 21 +
.../gameplay_keep/player_pause_joint_tables.h | 12 +
.../gameplay_keep/rectangular_sign_model.c | 11 +
.../gameplay_keep/rectangular_sign_model.h | 9 +
assets/objects/gameplay_keep/rupee.c | 35 +
assets/objects/gameplay_keep/rupee.h | 29 +
.../gameplay_keep/rupee_light_red_tex.c | 5 +
.../gameplay_keep/rupee_light_red_tex.h | 12 +
assets/objects/gameplay_keep/shadow_circle.c | 14 +
assets/objects/gameplay_keep/shadow_circle.h | 13 +
assets/objects/gameplay_keep/shadow_foot.c | 14 +
assets/objects/gameplay_keep/shadow_foot.h | 13 +
assets/objects/gameplay_keep/shadow_horse.c | 14 +
assets/objects/gameplay_keep/shadow_horse.h | 13 +
assets/objects/gameplay_keep/sign_textures.c | 17 +
assets/objects/gameplay_keep/sign_textures.h | 20 +
assets/objects/gameplay_keep/small_cube_col.c | 23 +
assets/objects/gameplay_keep/small_cube_col.h | 12 +
.../objects/gameplay_keep/small_cube_model.c | 11 +
.../objects/gameplay_keep/small_cube_model.h | 9 +
.../gameplay_keep/small_flat_block_col.c | 23 +
.../gameplay_keep/small_flat_block_col.h | 12 +
.../gameplay_keep/sun_evening_textures.c | 15 +
.../gameplay_keep/sun_evening_textures.h | 17 +
assets/objects/gameplay_keep/sun_textures.c | 15 +
assets/objects/gameplay_keep/sun_textures.h | 17 +
.../objects/gameplay_keep/tree_stump_model.c | 11 +
.../objects/gameplay_keep/tree_stump_model.h | 9 +
.../objects/gameplay_keep/unk_eff_blure_tex.c | 5 +
.../objects/gameplay_keep/unk_eff_blure_tex.h | 11 +
assets/objects/gameplay_keep/unused_bubbles.c | 42 +
assets/objects/gameplay_keep/unused_bubbles.h | 34 +
assets/xml/objects/gameplay_keep.xml | 116 +-
assets/xml/objects/gameplay_keep_pal.xml | 105 +-
spec/spec | 143 +
src/code/z_actor.c | 8 +-
src/code/z_debug_display.c | 2 +-
src/code/z_eff_blure.c | 2 +-
src/code/z_eff_shield_particle.c | 2 +-
src/code/z_eff_spark.c | 2 +-
src/code/z_en_a_keep.c | 13 +-
src/code/z_en_item00.c | 8 +-
src/code/z_kankyo.c | 15 +-
src/code/z_lights.c | 2 +-
src/code/z_map_exp.c | 2 +-
src/code/z_player_lib.c | 3 +-
.../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 2 +-
.../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 3 +-
.../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 2 +-
.../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 2 +-
.../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 2 +-
.../ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c | 2 +-
.../z_bg_spot00_hanebasi.c | 2 +-
src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 2 +-
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 5 +-
src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 2 +-
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 6 +-
src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 2 +-
src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 3 +-
.../actors/ovl_Demo_Effect/z_demo_effect.c | 2 +-
.../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 4 +-
.../actors/ovl_Door_Killer/z_door_killer.c | 2 +-
.../actors/ovl_Door_Shutter/z_door_shutter.c | 3 +-
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 2 +-
.../ovl_En_Anubice_Fire/z_en_anubice_fire.c | 2 +-
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 4 +-
src/overlays/actors/ovl_En_Bb/z_en_bb.c | 2 +-
src/overlays/actors/ovl_En_Bom/z_en_bom.c | 3 +-
.../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 2 +-
src/overlays/actors/ovl_En_Boom/z_en_boom.c | 2 +-
src/overlays/actors/ovl_En_Butte/z_en_butte.c | 2 +-
src/overlays/actors/ovl_En_Bw/z_en_bw.c | 2 +-
.../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 2 +-
src/overlays/actors/ovl_En_Door/z_en_door.c | 5 +-
src/overlays/actors/ovl_En_Elf/z_en_elf.c | 3 +-
.../actors/ovl_En_Ex_Item/z_en_ex_item.c | 4 +-
.../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 2 +-
src/overlays/actors/ovl_En_Fd/z_en_fd.c | 2 +-
.../actors/ovl_En_Fd_Fire/z_en_fd_fire.c | 2 +-
.../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 2 +-
src/overlays/actors/ovl_En_Fish/z_en_fish.c | 4 +-
src/overlays/actors/ovl_En_Fw/z_en_fw.c | 2 +-
.../actors/ovl_En_G_Switch/z_en_g_switch.c | 2 +-
src/overlays/actors/ovl_En_Go/z_en_go.c | 2 +-
src/overlays/actors/ovl_En_Go2/z_en_go2.c | 2 +-
.../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 2 +-
src/overlays/actors/ovl_En_Gs/z_en_gs.c | 2 +-
.../actors/ovl_En_Honotrap/z_en_honotrap.c | 2 +-
.../ovl_En_Horse_Normal/z_en_horse_normal.c | 2 +-
.../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 2 +-
.../actors/ovl_En_Insect/z_en_insect.c | 2 +-
.../actors/ovl_En_Kanban/z_en_kanban.c | 2 +-
.../actors/ovl_En_Karebaba/z_en_karebaba.c | 2 +-
src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 2 +-
src/overlays/actors/ovl_En_Light/z_en_light.c | 2 +-
.../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 2 +-
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 2 +-
.../actors/ovl_En_Po_Field/z_en_po_field.c | 2 +-
.../ovl_En_Po_Sisters/z_en_po_sisters.c | 2 +-
src/overlays/actors/ovl_En_Tk/z_en_tk.c | 2 +-
.../actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 2 +-
.../actors/ovl_En_Viewer/z_en_viewer.c | 2 +-
src/overlays/actors/ovl_En_Vm/z_en_vm.c | 2 +-
.../actors/ovl_En_Wallmas/z_en_wallmas.c | 2 +-
.../actors/ovl_Magic_Dark/z_magic_dark.c | 2 +-
src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 2 +-
.../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 2 +-
.../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 2 +-
.../ovl_Object_Kankyo/z_object_kankyo.c | 6 +-
.../actors/ovl_player_actor/z_player.c | 8 +-
.../ovl_Effect_Ss_Blast/z_eff_ss_blast.c | 2 +-
.../ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c | 2 +-
.../ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c | 2 +-
.../ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c | 3 +-
.../ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c | 2 +-
.../ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c | 2 +-
.../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c | 2 +-
.../z_eff_ss_dt_bubble.c | 3 +-
.../ovl_Effect_Ss_Dust/z_eff_ss_dust.c | 3 +-
.../ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c | 2 +-
.../ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c | 2 +-
.../ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c | 2 +-
.../z_eff_ss_fire_tail.c | 2 +-
.../ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c | 2 +-
.../ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c | 2 +-
.../z_eff_ss_g_ripple.c | 2 +-
.../ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c | 3 +-
.../z_eff_ss_g_splash.c | 2 +-
.../ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c | 3 +-
.../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c | 2 +-
.../z_eff_ss_ice_piece.c | 2 +-
.../ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c | 2 +-
.../z_eff_ss_kirakira.c | 2 +-
.../z_eff_ss_lightning.c | 2 +-
.../ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c | 3 +-
.../ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c | 2 +-
.../ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c | 2 +-
tools/assets/extract/extase/__init__.py | 7 +-
353 files changed, 8176 insertions(+), 221 deletions(-)
create mode 100644 assets/objects/gameplay_keep/arrow_anims.c
create mode 100644 assets/objects/gameplay_keep/arrow_anims.h
create mode 100644 assets/objects/gameplay_keep/arrow_skel.c
create mode 100644 assets/objects/gameplay_keep/arrow_skel.h
create mode 100644 assets/objects/gameplay_keep/bomb_body.c
create mode 100644 assets/objects/gameplay_keep/bomb_body.h
create mode 100644 assets/objects/gameplay_keep/bomb_cap.c
create mode 100644 assets/objects/gameplay_keep/bomb_cap.h
create mode 100644 assets/objects/gameplay_keep/bombchu_body.c
create mode 100644 assets/objects/gameplay_keep/bombchu_body.h
create mode 100644 assets/objects/gameplay_keep/boomerang.c
create mode 100644 assets/objects/gameplay_keep/boomerang.h
create mode 100644 assets/objects/gameplay_keep/circle_glow_textures.c
create mode 100644 assets/objects/gameplay_keep/circle_glow_textures.h
create mode 100644 assets/objects/gameplay_keep/compass_arrow.c
create mode 100644 assets/objects/gameplay_keep/compass_arrow.h
create mode 100644 assets/objects/gameplay_keep/debug_models.c
create mode 100644 assets/objects/gameplay_keep/debug_models.h
create mode 100644 assets/objects/gameplay_keep/drop_recovery_heart_tex.c
create mode 100644 assets/objects/gameplay_keep/drop_recovery_heart_tex.h
create mode 100644 assets/objects/gameplay_keep/dust_textures.c
create mode 100644 assets/objects/gameplay_keep/dust_textures.h
create mode 100644 assets/objects/gameplay_keep/eff_bomb_explosion.c
create mode 100644 assets/objects/gameplay_keep/eff_bomb_explosion.h
create mode 100644 assets/objects/gameplay_keep/eff_bubble.c
create mode 100644 assets/objects/gameplay_keep/eff_bubble.h
create mode 100644 assets/objects/gameplay_keep/eff_dust.c
create mode 100644 assets/objects/gameplay_keep/eff_dust.h
create mode 100644 assets/objects/gameplay_keep/eff_enemy_death_flame.c
create mode 100644 assets/objects/gameplay_keep/eff_enemy_death_flame.h
create mode 100644 assets/objects/gameplay_keep/eff_fire.c
create mode 100644 assets/objects/gameplay_keep/eff_fire.h
create mode 100644 assets/objects/gameplay_keep/eff_fire_footprint.c
create mode 100644 assets/objects/gameplay_keep/eff_fire_footprint.h
create mode 100644 assets/objects/gameplay_keep/eff_flash.c
create mode 100644 assets/objects/gameplay_keep/eff_flash.h
create mode 100644 assets/objects/gameplay_keep/eff_hitmark.c
create mode 100644 assets/objects/gameplay_keep/eff_hitmark.h
create mode 100644 assets/objects/gameplay_keep/eff_ice_fragments.c
create mode 100644 assets/objects/gameplay_keep/eff_ice_fragments.h
create mode 100644 assets/objects/gameplay_keep/eff_lightning.c
create mode 100644 assets/objects/gameplay_keep/eff_lightning.h
create mode 100644 assets/objects/gameplay_keep/eff_shockwave.c
create mode 100644 assets/objects/gameplay_keep/eff_shockwave.h
create mode 100644 assets/objects/gameplay_keep/eff_spark_model.c
create mode 100644 assets/objects/gameplay_keep/eff_spark_model.h
create mode 100644 assets/objects/gameplay_keep/eff_spark_textures.c
create mode 100644 assets/objects/gameplay_keep/eff_spark_textures.h
create mode 100644 assets/objects/gameplay_keep/fairy_anim.c
create mode 100644 assets/objects/gameplay_keep/fairy_anim.h
create mode 100644 assets/objects/gameplay_keep/fairy_skel.c
create mode 100644 assets/objects/gameplay_keep/fairy_skel.h
create mode 100644 assets/objects/gameplay_keep/flat_block_model.c
create mode 100644 assets/objects/gameplay_keep/flat_block_model.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x11230.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x11230.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x13700.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x13700.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x16A50.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x16A50.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x173D0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x173D0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x185A0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x185A0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x18610.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x18610.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x18FF0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x18FF0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x21810.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x21810.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x23810.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x23810.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x244B0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x244B0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x255F0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x255F0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x27E90.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x27E90.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x32090.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x32090.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x33090.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x33090.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x33910.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x33910.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x34020.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x34020.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x355A0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x355A0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x37840.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x37840.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x38FB0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x38FB0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x393B0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x393B0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x39710.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x39710.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x39940.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x39940.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x39CC0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x39CC0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x39DF0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x39DF0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3A150.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3A150.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3A380.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3A380.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3AC30.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3AC30.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3C870.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3C870.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3F140.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x3F140.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x400.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x400.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x42530.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x42530.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x43530.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x43530.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x44530.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x44530.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x45530.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x45530.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x45D30.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x45D30.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x48130.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x48130.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x49F20.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x49F20.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x4A090.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x4A090.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x4D160.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x4D160.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x4E660.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x4E660.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x515B0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x515B0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x55DB0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x55DB0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xC0A0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xCCC0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xCDC0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xD0C0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xD4E0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xD4E0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xE4E0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xE770.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xE770.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xFF80.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xFF80.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.h
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.c
create mode 100644 assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.h
create mode 100644 assets/objects/gameplay_keep/grass_blades_model.c
create mode 100644 assets/objects/gameplay_keep/grass_blades_model.h
create mode 100644 assets/objects/gameplay_keep/heart_piece_interior_model.c
create mode 100644 assets/objects/gameplay_keep/heart_piece_interior_model.h
create mode 100644 assets/objects/gameplay_keep/hilite3_tex.c
create mode 100644 assets/objects/gameplay_keep/hilite3_tex.h
create mode 100644 assets/objects/gameplay_keep/hilite4_tex.c
create mode 100644 assets/objects/gameplay_keep/hilite4_tex.h
create mode 100644 assets/objects/gameplay_keep/hilite_textures.c
create mode 100644 assets/objects/gameplay_keep/hilite_textures.h
create mode 100644 assets/objects/gameplay_keep/hover_boots_circle.c
create mode 100644 assets/objects/gameplay_keep/hover_boots_circle.h
create mode 100644 assets/objects/gameplay_keep/item_drop_dl.c
create mode 100644 assets/objects/gameplay_keep/item_drop_dl.h
create mode 100644 assets/objects/gameplay_keep/item_drops_ntsc.c
create mode 100644 assets/objects/gameplay_keep/item_drops_ntsc.h
create mode 100644 assets/objects/gameplay_keep/lens_flare.c
create mode 100644 assets/objects/gameplay_keep/lens_flare.h
create mode 100644 assets/objects/gameplay_keep/lens_mask_tex.c
create mode 100644 assets/objects/gameplay_keep/lens_mask_tex.h
create mode 100644 assets/objects/gameplay_keep/liftable_rock_model.c
create mode 100644 assets/objects/gameplay_keep/liftable_rock_model.h
create mode 100644 assets/objects/gameplay_keep/link_textures.c
create mode 100644 assets/objects/gameplay_keep/link_textures.h
create mode 100644 assets/objects/gameplay_keep/lock_on_arrow.c
create mode 100644 assets/objects/gameplay_keep/lock_on_arrow.h
create mode 100644 assets/objects/gameplay_keep/lock_on_reticle.c
create mode 100644 assets/objects/gameplay_keep/lock_on_reticle.h
create mode 100644 assets/objects/gameplay_keep/moon.c
create mode 100644 assets/objects/gameplay_keep/moon.h
create mode 100644 assets/objects/gameplay_keep/player_anim_headers.c
create mode 100644 assets/objects/gameplay_keep/player_anim_headers.h
create mode 100644 assets/objects/gameplay_keep/player_pause_joint_tables.c
create mode 100644 assets/objects/gameplay_keep/player_pause_joint_tables.h
create mode 100644 assets/objects/gameplay_keep/rectangular_sign_model.c
create mode 100644 assets/objects/gameplay_keep/rectangular_sign_model.h
create mode 100644 assets/objects/gameplay_keep/rupee.c
create mode 100644 assets/objects/gameplay_keep/rupee.h
create mode 100644 assets/objects/gameplay_keep/rupee_light_red_tex.c
create mode 100644 assets/objects/gameplay_keep/rupee_light_red_tex.h
create mode 100644 assets/objects/gameplay_keep/shadow_circle.c
create mode 100644 assets/objects/gameplay_keep/shadow_circle.h
create mode 100644 assets/objects/gameplay_keep/shadow_foot.c
create mode 100644 assets/objects/gameplay_keep/shadow_foot.h
create mode 100644 assets/objects/gameplay_keep/shadow_horse.c
create mode 100644 assets/objects/gameplay_keep/shadow_horse.h
create mode 100644 assets/objects/gameplay_keep/sign_textures.c
create mode 100644 assets/objects/gameplay_keep/sign_textures.h
create mode 100644 assets/objects/gameplay_keep/small_cube_col.c
create mode 100644 assets/objects/gameplay_keep/small_cube_col.h
create mode 100644 assets/objects/gameplay_keep/small_cube_model.c
create mode 100644 assets/objects/gameplay_keep/small_cube_model.h
create mode 100644 assets/objects/gameplay_keep/small_flat_block_col.c
create mode 100644 assets/objects/gameplay_keep/small_flat_block_col.h
create mode 100644 assets/objects/gameplay_keep/sun_evening_textures.c
create mode 100644 assets/objects/gameplay_keep/sun_evening_textures.h
create mode 100644 assets/objects/gameplay_keep/sun_textures.c
create mode 100644 assets/objects/gameplay_keep/sun_textures.h
create mode 100644 assets/objects/gameplay_keep/tree_stump_model.c
create mode 100644 assets/objects/gameplay_keep/tree_stump_model.h
create mode 100644 assets/objects/gameplay_keep/unk_eff_blure_tex.c
create mode 100644 assets/objects/gameplay_keep/unk_eff_blure_tex.h
create mode 100644 assets/objects/gameplay_keep/unused_bubbles.c
create mode 100644 assets/objects/gameplay_keep/unused_bubbles.h
diff --git a/assets/objects/gameplay_keep/arrow_anims.c b/assets/objects/gameplay_keep/arrow_anims.c
new file mode 100644
index 0000000000..9152c4f123
--- /dev/null
+++ b/assets/objects/gameplay_keep/arrow_anims.c
@@ -0,0 +1,25 @@
+#include "arrow_anims.h"
+
+s16 gArrow1FrameData[] = {
+#include "assets/objects/gameplay_keep/gArrow1FrameData.inc.c"
+};
+
+JointIndex gArrow1JointIndices[] = {
+#include "assets/objects/gameplay_keep/gArrow1JointIndices.inc.c"
+};
+
+AnimationHeader gArrow1Anim = {
+#include "assets/objects/gameplay_keep/gArrow1Anim.inc.c"
+};
+
+s16 gArrow2FrameData[] = {
+#include "assets/objects/gameplay_keep/gArrow2FrameData.inc.c"
+};
+
+JointIndex gArrow2JointIndices[] = {
+#include "assets/objects/gameplay_keep/gArrow2JointIndices.inc.c"
+};
+
+AnimationHeader gArrow2Anim = {
+#include "assets/objects/gameplay_keep/gArrow2Anim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/arrow_anims.h b/assets/objects/gameplay_keep/arrow_anims.h
new file mode 100644
index 0000000000..c6c451a237
--- /dev/null
+++ b/assets/objects/gameplay_keep/arrow_anims.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_ARROW_ANIMS_H
+#define GAMEPLAY_KEEP_ARROW_ANIMS_H
+
+#include "animation.h"
+
+extern s16 gArrow1FrameData[];
+extern JointIndex gArrow1JointIndices[];
+extern AnimationHeader gArrow1Anim;
+extern s16 gArrow2FrameData[];
+extern JointIndex gArrow2JointIndices[];
+extern AnimationHeader gArrow2Anim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/arrow_skel.c b/assets/objects/gameplay_keep/arrow_skel.c
new file mode 100644
index 0000000000..b11cf8786a
--- /dev/null
+++ b/assets/objects/gameplay_keep/arrow_skel.c
@@ -0,0 +1,52 @@
+#include "arrow_skel.h"
+#include "hilite_textures.h"
+#include "array_count.h"
+#include "gfx.h"
+
+u64 gArrowShaftTex[TEX_LEN(u64, gArrowShaftTex_WIDTH, gArrowShaftTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gArrowShaftTex.rgba16.inc.c"
+};
+
+u64 gArrowFletchingTex[TEX_LEN(u64, gArrowFletchingTex_WIDTH, gArrowFletchingTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gArrowFletchingTex.rgba16.inc.c"
+};
+
+Vtx gArrowNearVtx[] = {
+#include "assets/objects/gameplay_keep/gArrowNearVtx.inc.c"
+};
+
+Gfx gArrowNearDL[60] = {
+#include "assets/objects/gameplay_keep/gArrowNearDL.inc.c"
+};
+
+Vtx gArrowFarVtx[] = {
+#include "assets/objects/gameplay_keep/gArrowFarVtx.inc.c"
+};
+
+Gfx gArrowFarDL[52] = {
+#include "assets/objects/gameplay_keep/gArrowFarDL.inc.c"
+};
+
+LodLimb gArrowSkelLimb0 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb0.inc.c"
+};
+
+LodLimb gArrowSkelLimb1 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb1.inc.c"
+};
+
+LodLimb gArrowSkelLimb2 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb2.inc.c"
+};
+
+LodLimb gArrowSkelLimb3 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb3.inc.c"
+};
+
+void* gArrowLimbs[] = {
+#include "assets/objects/gameplay_keep/gArrowLimbs.inc.c"
+};
+
+SkeletonHeader gArrowSkel = {
+#include "assets/objects/gameplay_keep/gArrowSkel.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/arrow_skel.h b/assets/objects/gameplay_keep/arrow_skel.h
new file mode 100644
index 0000000000..e7d3ab020f
--- /dev/null
+++ b/assets/objects/gameplay_keep/arrow_skel.h
@@ -0,0 +1,32 @@
+#ifndef GAMEPLAY_KEEP_ARROW_SKEL_H
+#define GAMEPLAY_KEEP_ARROW_SKEL_H
+
+#include "tex_len.h"
+#include "animation.h"
+
+#define gArrowShaftTex_WIDTH 16
+#define gArrowShaftTex_HEIGHT 128
+extern u64 gArrowShaftTex[TEX_LEN(u64, gArrowShaftTex_WIDTH, gArrowShaftTex_HEIGHT, 16)];
+#define gArrowFletchingTex_WIDTH 32
+#define gArrowFletchingTex_HEIGHT 16
+extern u64 gArrowFletchingTex[TEX_LEN(u64, gArrowFletchingTex_WIDTH, gArrowFletchingTex_HEIGHT, 16)];
+extern Vtx gArrowNearVtx[];
+extern Gfx gArrowNearDL[60];
+extern Vtx gArrowFarVtx[];
+extern Gfx gArrowFarDL[52];
+extern LodLimb gArrowSkelLimb0;
+extern LodLimb gArrowSkelLimb1;
+extern LodLimb gArrowSkelLimb2;
+extern LodLimb gArrowSkelLimb3;
+extern void* gArrowLimbs[];
+typedef enum gArrowSkelLimb {
+ /* 0 */ ARROW_LIMB_NONE,
+ /* 1 */ ARROW_LIMB_0,
+ /* 2 */ ARROW_LIMB_1,
+ /* 3 */ ARROW_LIMB_2,
+ /* 4 */ ARROW_LIMB_3,
+ /* 5 */ ARROW_LIMB_MAX
+} gArrowSkelLimb;
+extern SkeletonHeader gArrowSkel;
+
+#endif
diff --git a/assets/objects/gameplay_keep/bomb_body.c b/assets/objects/gameplay_keep/bomb_body.c
new file mode 100644
index 0000000000..ad3a24b9c2
--- /dev/null
+++ b/assets/objects/gameplay_keep/bomb_body.c
@@ -0,0 +1,14 @@
+#include "bomb_body.h"
+#include "gfx.h"
+
+u64 gBombBodyTex[TEX_LEN(u64, gBombBodyTex_WIDTH, gBombBodyTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gBombBodyTex.ia8.inc.c"
+};
+
+Vtx gBombBodyVtx[] = {
+#include "assets/objects/gameplay_keep/gBombBodyVtx.inc.c"
+};
+
+Gfx gBombBodyDL[17] = {
+#include "assets/objects/gameplay_keep/gBombBodyDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/bomb_body.h b/assets/objects/gameplay_keep/bomb_body.h
new file mode 100644
index 0000000000..e7e91cc486
--- /dev/null
+++ b/assets/objects/gameplay_keep/bomb_body.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_BOMB_BODY_H
+#define GAMEPLAY_KEEP_BOMB_BODY_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gBombBodyTex_WIDTH 64
+#define gBombBodyTex_HEIGHT 64
+extern u64 gBombBodyTex[TEX_LEN(u64, gBombBodyTex_WIDTH, gBombBodyTex_HEIGHT, 8)];
+extern Vtx gBombBodyVtx[];
+extern Gfx gBombBodyDL[17];
+
+#endif
diff --git a/assets/objects/gameplay_keep/bomb_cap.c b/assets/objects/gameplay_keep/bomb_cap.c
new file mode 100644
index 0000000000..965a39b870
--- /dev/null
+++ b/assets/objects/gameplay_keep/bomb_cap.c
@@ -0,0 +1,14 @@
+#include "bomb_cap.h"
+#include "gfx.h"
+
+u64 gBombCapTex[TEX_LEN(u64, gBombCapTex_WIDTH, gBombCapTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gBombCapTex.rgba16.inc.c"
+};
+
+Vtx gBombCapVtx[] = {
+#include "assets/objects/gameplay_keep/gBombCapVtx.inc.c"
+};
+
+Gfx gBombCapDL[24] = {
+#include "assets/objects/gameplay_keep/gBombCapDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/bomb_cap.h b/assets/objects/gameplay_keep/bomb_cap.h
new file mode 100644
index 0000000000..e0c59b12e8
--- /dev/null
+++ b/assets/objects/gameplay_keep/bomb_cap.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_BOMB_CAP_H
+#define GAMEPLAY_KEEP_BOMB_CAP_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gBombCapTex_WIDTH 8
+#define gBombCapTex_HEIGHT 8
+extern u64 gBombCapTex[TEX_LEN(u64, gBombCapTex_WIDTH, gBombCapTex_HEIGHT, 16)];
+extern Vtx gBombCapVtx[];
+extern Gfx gBombCapDL[24];
+
+#endif
diff --git a/assets/objects/gameplay_keep/bombchu_body.c b/assets/objects/gameplay_keep/bombchu_body.c
new file mode 100644
index 0000000000..f0517de9e1
--- /dev/null
+++ b/assets/objects/gameplay_keep/bombchu_body.c
@@ -0,0 +1,14 @@
+#include "bombchu_body.h"
+#include "gfx.h"
+
+u64 gBombchuBodyTex[TEX_LEN(u64, gBombchuBodyTex_WIDTH, gBombchuBodyTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gBombchuBodyTex.rgba16.inc.c"
+};
+
+Vtx gBombchuVtx[] = {
+#include "assets/objects/gameplay_keep/gBombchuVtx.inc.c"
+};
+
+Gfx gBombchuDL[45] = {
+#include "assets/objects/gameplay_keep/gBombchuDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/bombchu_body.h b/assets/objects/gameplay_keep/bombchu_body.h
new file mode 100644
index 0000000000..ebd4b6a26d
--- /dev/null
+++ b/assets/objects/gameplay_keep/bombchu_body.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_BOMBCHU_BODY_H
+#define GAMEPLAY_KEEP_BOMBCHU_BODY_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gBombchuBodyTex_WIDTH 8
+#define gBombchuBodyTex_HEIGHT 8
+extern u64 gBombchuBodyTex[TEX_LEN(u64, gBombchuBodyTex_WIDTH, gBombchuBodyTex_HEIGHT, 16)];
+extern Vtx gBombchuVtx[];
+extern Gfx gBombchuDL[45];
+
+#endif
diff --git a/assets/objects/gameplay_keep/boomerang.c b/assets/objects/gameplay_keep/boomerang.c
new file mode 100644
index 0000000000..ccc4243e10
--- /dev/null
+++ b/assets/objects/gameplay_keep/boomerang.c
@@ -0,0 +1,20 @@
+#include "boomerang.h"
+#include "gameplay_keep_0x16A50.h"
+#include "hilite_textures.h"
+#include "gfx.h"
+
+Vtx gBoomerangVtx[] = {
+#include "assets/objects/gameplay_keep/gBoomerangVtx.inc.c"
+};
+
+Gfx gUnknownBlankDL[1] = {
+#include "assets/objects/gameplay_keep/gUnknownBlankDL.inc.c"
+};
+
+Gfx gBoomerangDL[46] = {
+#include "assets/objects/gameplay_keep/gBoomerangDL.inc.c"
+};
+
+Gfx gBoomerangRefDL[2] = {
+#include "assets/objects/gameplay_keep/gBoomerangRefDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/boomerang.h b/assets/objects/gameplay_keep/boomerang.h
new file mode 100644
index 0000000000..d288b7986c
--- /dev/null
+++ b/assets/objects/gameplay_keep/boomerang.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_BOOMERANG_H
+#define GAMEPLAY_KEEP_BOOMERANG_H
+
+#include "ultra64.h"
+
+extern Vtx gBoomerangVtx[];
+extern Gfx gUnknownBlankDL[1];
+extern Gfx gBoomerangDL[46];
+extern Gfx gBoomerangRefDL[2];
+
+#endif
diff --git a/assets/objects/gameplay_keep/circle_glow_textures.c b/assets/objects/gameplay_keep/circle_glow_textures.c
new file mode 100644
index 0000000000..0914f13e0e
--- /dev/null
+++ b/assets/objects/gameplay_keep/circle_glow_textures.c
@@ -0,0 +1,17 @@
+#include "circle_glow_textures.h"
+
+u64 gCircleGlowLTex[TEX_LEN(u64, gCircleGlowLTex_WIDTH, gCircleGlowLTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gCircleGlowLTex.i8.inc.c"
+};
+
+u64 gCircleGlowRTex[TEX_LEN(u64, gCircleGlowRTex_WIDTH, gCircleGlowRTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gCircleGlowRTex.i8.inc.c"
+};
+
+u64 gCircleGlowSLTex[TEX_LEN(u64, gCircleGlowSLTex_WIDTH, gCircleGlowSLTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gCircleGlowSLTex.i8.inc.c"
+};
+
+u64 gCircleGlowSRTex[TEX_LEN(u64, gCircleGlowSRTex_WIDTH, gCircleGlowSRTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gCircleGlowSRTex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/circle_glow_textures.h b/assets/objects/gameplay_keep/circle_glow_textures.h
new file mode 100644
index 0000000000..d326d1b456
--- /dev/null
+++ b/assets/objects/gameplay_keep/circle_glow_textures.h
@@ -0,0 +1,20 @@
+#ifndef GAMEPLAY_KEEP_CIRCLE_GLOW_TEXTURES_H
+#define GAMEPLAY_KEEP_CIRCLE_GLOW_TEXTURES_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gCircleGlowLTex_WIDTH 32
+#define gCircleGlowLTex_HEIGHT 64
+extern u64 gCircleGlowLTex[TEX_LEN(u64, gCircleGlowLTex_WIDTH, gCircleGlowLTex_HEIGHT, 8)];
+#define gCircleGlowRTex_WIDTH 32
+#define gCircleGlowRTex_HEIGHT 64
+extern u64 gCircleGlowRTex[TEX_LEN(u64, gCircleGlowRTex_WIDTH, gCircleGlowRTex_HEIGHT, 8)];
+#define gCircleGlowSLTex_WIDTH 32
+#define gCircleGlowSLTex_HEIGHT 64
+extern u64 gCircleGlowSLTex[TEX_LEN(u64, gCircleGlowSLTex_WIDTH, gCircleGlowSLTex_HEIGHT, 8)];
+#define gCircleGlowSRTex_WIDTH 32
+#define gCircleGlowSRTex_HEIGHT 64
+extern u64 gCircleGlowSRTex[TEX_LEN(u64, gCircleGlowSRTex_WIDTH, gCircleGlowSRTex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/compass_arrow.c b/assets/objects/gameplay_keep/compass_arrow.c
new file mode 100644
index 0000000000..b41eb184e9
--- /dev/null
+++ b/assets/objects/gameplay_keep/compass_arrow.c
@@ -0,0 +1,10 @@
+#include "compass_arrow.h"
+#include "gfx.h"
+
+Gfx gCompassArrowDL[5] = {
+#include "assets/objects/gameplay_keep/gCompassArrowDL.inc.c"
+};
+
+Vtx gCompassArrowVtx[] = {
+#include "assets/objects/gameplay_keep/gCompassArrowVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/compass_arrow.h b/assets/objects/gameplay_keep/compass_arrow.h
new file mode 100644
index 0000000000..4d3b5f3d4a
--- /dev/null
+++ b/assets/objects/gameplay_keep/compass_arrow.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_COMPASS_ARROW_H
+#define GAMEPLAY_KEEP_COMPASS_ARROW_H
+
+#include "ultra64.h"
+
+extern Gfx gCompassArrowDL[5];
+extern Vtx gCompassArrowVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/debug_models.c b/assets/objects/gameplay_keep/debug_models.c
new file mode 100644
index 0000000000..fb718214ab
--- /dev/null
+++ b/assets/objects/gameplay_keep/debug_models.c
@@ -0,0 +1,62 @@
+#include "debug_models.h"
+#include "gfx.h"
+
+Vtx gDebugPyramidVtx[] = {
+#include "assets/objects/gameplay_keep/gDebugPyramidVtx.inc.c"
+};
+
+Gfx gDebugPyramidDL[6] = {
+#include "assets/objects/gameplay_keep/gDebugPyramidDL.inc.c"
+};
+
+u64 gDebugCircleTex[TEX_LEN(u64, gDebugCircleTex_WIDTH, gDebugCircleTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDebugCircleTex.i8.inc.c"
+};
+
+u64 gDebugBallTex[TEX_LEN(u64, gDebugBallTex_WIDTH, gDebugBallTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDebugBallTex.i8.inc.c"
+};
+
+u64 gDebugCursorTex[TEX_LEN(u64, gDebugCursorTex_WIDTH, gDebugCursorTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDebugCursorTex.i8.inc.c"
+};
+
+u64 gDebugCrossTex[TEX_LEN(u64, gDebugCrossTex_WIDTH, gDebugCrossTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDebugCrossTex.i8.inc.c"
+};
+
+Gfx gDebugArrowDL[12] = {
+#include "assets/objects/gameplay_keep/gDebugArrowDL.inc.c"
+};
+
+Vtx gDebugArrowVtx[] = {
+#include "assets/objects/gameplay_keep/gDebugArrowVtx.inc.c"
+};
+
+Gfx gDebugCameraDL[15] = {
+#include "assets/objects/gameplay_keep/gDebugCameraDL.inc.c"
+};
+
+Vtx gDebugCameraVtx[] = {
+#include "assets/objects/gameplay_keep/gDebugCameraVtx.inc.c"
+};
+
+Vtx gDebugCheckeredFloorVtx[] = {
+#include "assets/objects/gameplay_keep/gDebugCheckeredFloorVtx.inc.c"
+};
+
+Gfx gDebugCheckeredFloorDL[18] = {
+#include "assets/objects/gameplay_keep/gDebugCheckeredFloorDL.inc.c"
+};
+
+u64 gDebugCheckeredFloorTex[TEX_LEN(u64, gDebugCheckeredFloorTex_WIDTH, gDebugCheckeredFloorTex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gDebugCheckeredFloorTex.ia4.inc.c"
+};
+
+Vtx gDebugSpriteVtx[] = {
+#include "assets/objects/gameplay_keep/gDebugSpriteVtx.inc.c"
+};
+
+Gfx gDebugSpriteDL[3] = {
+#include "assets/objects/gameplay_keep/gDebugSpriteDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/debug_models.h b/assets/objects/gameplay_keep/debug_models.h
new file mode 100644
index 0000000000..52da352443
--- /dev/null
+++ b/assets/objects/gameplay_keep/debug_models.h
@@ -0,0 +1,33 @@
+#ifndef GAMEPLAY_KEEP_DEBUG_MODELS_H
+#define GAMEPLAY_KEEP_DEBUG_MODELS_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+extern Vtx gDebugPyramidVtx[];
+extern Gfx gDebugPyramidDL[6];
+#define gDebugCircleTex_WIDTH 16
+#define gDebugCircleTex_HEIGHT 16
+extern u64 gDebugCircleTex[TEX_LEN(u64, gDebugCircleTex_WIDTH, gDebugCircleTex_HEIGHT, 8)];
+#define gDebugBallTex_WIDTH 16
+#define gDebugBallTex_HEIGHT 16
+extern u64 gDebugBallTex[TEX_LEN(u64, gDebugBallTex_WIDTH, gDebugBallTex_HEIGHT, 8)];
+#define gDebugCursorTex_WIDTH 16
+#define gDebugCursorTex_HEIGHT 16
+extern u64 gDebugCursorTex[TEX_LEN(u64, gDebugCursorTex_WIDTH, gDebugCursorTex_HEIGHT, 8)];
+#define gDebugCrossTex_WIDTH 16
+#define gDebugCrossTex_HEIGHT 16
+extern u64 gDebugCrossTex[TEX_LEN(u64, gDebugCrossTex_WIDTH, gDebugCrossTex_HEIGHT, 8)];
+extern Gfx gDebugArrowDL[12];
+extern Vtx gDebugArrowVtx[];
+extern Gfx gDebugCameraDL[15];
+extern Vtx gDebugCameraVtx[];
+extern Vtx gDebugCheckeredFloorVtx[];
+extern Gfx gDebugCheckeredFloorDL[18];
+#define gDebugCheckeredFloorTex_WIDTH 32
+#define gDebugCheckeredFloorTex_HEIGHT 32
+extern u64 gDebugCheckeredFloorTex[TEX_LEN(u64, gDebugCheckeredFloorTex_WIDTH, gDebugCheckeredFloorTex_HEIGHT, 4)];
+extern Vtx gDebugSpriteVtx[];
+extern Gfx gDebugSpriteDL[3];
+
+#endif
diff --git a/assets/objects/gameplay_keep/drop_recovery_heart_tex.c b/assets/objects/gameplay_keep/drop_recovery_heart_tex.c
new file mode 100644
index 0000000000..347a7714fb
--- /dev/null
+++ b/assets/objects/gameplay_keep/drop_recovery_heart_tex.c
@@ -0,0 +1,5 @@
+#include "drop_recovery_heart_tex.h"
+
+u64 gDropRecoveryHeartTex[TEX_LEN(u64, gDropRecoveryHeartTex_WIDTH, gDropRecoveryHeartTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gDropRecoveryHeartTex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/drop_recovery_heart_tex.h b/assets/objects/gameplay_keep/drop_recovery_heart_tex.h
new file mode 100644
index 0000000000..ecaba29d26
--- /dev/null
+++ b/assets/objects/gameplay_keep/drop_recovery_heart_tex.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_DROP_RECOVERY_HEART_TEX_H
+#define GAMEPLAY_KEEP_DROP_RECOVERY_HEART_TEX_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gDropRecoveryHeartTex_WIDTH 32
+#define gDropRecoveryHeartTex_HEIGHT 32
+extern u64 gDropRecoveryHeartTex[TEX_LEN(u64, gDropRecoveryHeartTex_WIDTH, gDropRecoveryHeartTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/dust_textures.c b/assets/objects/gameplay_keep/dust_textures.c
new file mode 100644
index 0000000000..2dccdd6668
--- /dev/null
+++ b/assets/objects/gameplay_keep/dust_textures.c
@@ -0,0 +1,33 @@
+#include "dust_textures.h"
+
+u64 gDust1Tex[TEX_LEN(u64, gDust1Tex_WIDTH, gDust1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDust1Tex.i8.inc.c"
+};
+
+u64 gDust2Tex[TEX_LEN(u64, gDust2Tex_WIDTH, gDust2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDust2Tex.i8.inc.c"
+};
+
+u64 gDust3Tex[TEX_LEN(u64, gDust3Tex_WIDTH, gDust3Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDust3Tex.i8.inc.c"
+};
+
+u64 gDust4Tex[TEX_LEN(u64, gDust4Tex_WIDTH, gDust4Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDust4Tex.i8.inc.c"
+};
+
+u64 gDust5Tex[TEX_LEN(u64, gDust5Tex_WIDTH, gDust5Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDust5Tex.i8.inc.c"
+};
+
+u64 gDust6Tex[TEX_LEN(u64, gDust6Tex_WIDTH, gDust6Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDust6Tex.i8.inc.c"
+};
+
+u64 gDust7Tex[TEX_LEN(u64, gDust7Tex_WIDTH, gDust7Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDust7Tex.i8.inc.c"
+};
+
+u64 gDust8Tex[TEX_LEN(u64, gDust8Tex_WIDTH, gDust8Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDust8Tex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/dust_textures.h b/assets/objects/gameplay_keep/dust_textures.h
new file mode 100644
index 0000000000..b771929189
--- /dev/null
+++ b/assets/objects/gameplay_keep/dust_textures.h
@@ -0,0 +1,32 @@
+#ifndef GAMEPLAY_KEEP_DUST_TEXTURES_H
+#define GAMEPLAY_KEEP_DUST_TEXTURES_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gDust1Tex_WIDTH 32
+#define gDust1Tex_HEIGHT 32
+extern u64 gDust1Tex[TEX_LEN(u64, gDust1Tex_WIDTH, gDust1Tex_HEIGHT, 8)];
+#define gDust2Tex_WIDTH 32
+#define gDust2Tex_HEIGHT 32
+extern u64 gDust2Tex[TEX_LEN(u64, gDust2Tex_WIDTH, gDust2Tex_HEIGHT, 8)];
+#define gDust3Tex_WIDTH 32
+#define gDust3Tex_HEIGHT 32
+extern u64 gDust3Tex[TEX_LEN(u64, gDust3Tex_WIDTH, gDust3Tex_HEIGHT, 8)];
+#define gDust4Tex_WIDTH 32
+#define gDust4Tex_HEIGHT 32
+extern u64 gDust4Tex[TEX_LEN(u64, gDust4Tex_WIDTH, gDust4Tex_HEIGHT, 8)];
+#define gDust5Tex_WIDTH 32
+#define gDust5Tex_HEIGHT 32
+extern u64 gDust5Tex[TEX_LEN(u64, gDust5Tex_WIDTH, gDust5Tex_HEIGHT, 8)];
+#define gDust6Tex_WIDTH 32
+#define gDust6Tex_HEIGHT 32
+extern u64 gDust6Tex[TEX_LEN(u64, gDust6Tex_WIDTH, gDust6Tex_HEIGHT, 8)];
+#define gDust7Tex_WIDTH 32
+#define gDust7Tex_HEIGHT 32
+extern u64 gDust7Tex[TEX_LEN(u64, gDust7Tex_WIDTH, gDust7Tex_HEIGHT, 8)];
+#define gDust8Tex_WIDTH 32
+#define gDust8Tex_HEIGHT 32
+extern u64 gDust8Tex[TEX_LEN(u64, gDust8Tex_WIDTH, gDust8Tex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_bomb_explosion.c b/assets/objects/gameplay_keep/eff_bomb_explosion.c
new file mode 100644
index 0000000000..cb17bb5af3
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_bomb_explosion.c
@@ -0,0 +1,50 @@
+#include "eff_bomb_explosion.h"
+#include "gfx.h"
+
+u64 gEffBombExplosion1Tex[TEX_LEN(u64, gEffBombExplosion1Tex_WIDTH, gEffBombExplosion1Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosion1Tex.ia16.inc.c"
+};
+
+u64 gEffBombExplosion2Tex[TEX_LEN(u64, gEffBombExplosion2Tex_WIDTH, gEffBombExplosion2Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosion2Tex.ia16.inc.c"
+};
+
+u64 gEffBombExplosion3Tex[TEX_LEN(u64, gEffBombExplosion3Tex_WIDTH, gEffBombExplosion3Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosion3Tex.ia16.inc.c"
+};
+
+u64 gEffBombExplosion4Tex[TEX_LEN(u64, gEffBombExplosion4Tex_WIDTH, gEffBombExplosion4Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosion4Tex.ia16.inc.c"
+};
+
+u64 gEffBombExplosion5Tex[TEX_LEN(u64, gEffBombExplosion5Tex_WIDTH, gEffBombExplosion5Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosion5Tex.ia16.inc.c"
+};
+
+u64 gEffBombExplosion6Tex[TEX_LEN(u64, gEffBombExplosion6Tex_WIDTH, gEffBombExplosion6Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosion6Tex.ia16.inc.c"
+};
+
+u64 gEffBombExplosion7Tex[TEX_LEN(u64, gEffBombExplosion7Tex_WIDTH, gEffBombExplosion7Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosion7Tex.ia16.inc.c"
+};
+
+u64 gEffBombExplosion8Tex[TEX_LEN(u64, gEffBombExplosion8Tex_WIDTH, gEffBombExplosion8Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosion8Tex.ia16.inc.c"
+};
+
+Gfx gEffBombExplosion1DL[13] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosion1DL.inc.c"
+};
+
+Gfx gEffBombExplosion2DL[11] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosion2DL.inc.c"
+};
+
+Gfx gEffBombExplosion3DL[3] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosion3DL.inc.c"
+};
+
+Vtx gEffBombExplosionVtx[] = {
+#include "assets/objects/gameplay_keep/gEffBombExplosionVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_bomb_explosion.h b/assets/objects/gameplay_keep/eff_bomb_explosion.h
new file mode 100644
index 0000000000..46d8957426
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_bomb_explosion.h
@@ -0,0 +1,36 @@
+#ifndef GAMEPLAY_KEEP_EFF_BOMB_EXPLOSION_H
+#define GAMEPLAY_KEEP_EFF_BOMB_EXPLOSION_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffBombExplosion1Tex_WIDTH 32
+#define gEffBombExplosion1Tex_HEIGHT 32
+extern u64 gEffBombExplosion1Tex[TEX_LEN(u64, gEffBombExplosion1Tex_WIDTH, gEffBombExplosion1Tex_HEIGHT, 16)];
+#define gEffBombExplosion2Tex_WIDTH 32
+#define gEffBombExplosion2Tex_HEIGHT 32
+extern u64 gEffBombExplosion2Tex[TEX_LEN(u64, gEffBombExplosion2Tex_WIDTH, gEffBombExplosion2Tex_HEIGHT, 16)];
+#define gEffBombExplosion3Tex_WIDTH 32
+#define gEffBombExplosion3Tex_HEIGHT 32
+extern u64 gEffBombExplosion3Tex[TEX_LEN(u64, gEffBombExplosion3Tex_WIDTH, gEffBombExplosion3Tex_HEIGHT, 16)];
+#define gEffBombExplosion4Tex_WIDTH 32
+#define gEffBombExplosion4Tex_HEIGHT 32
+extern u64 gEffBombExplosion4Tex[TEX_LEN(u64, gEffBombExplosion4Tex_WIDTH, gEffBombExplosion4Tex_HEIGHT, 16)];
+#define gEffBombExplosion5Tex_WIDTH 32
+#define gEffBombExplosion5Tex_HEIGHT 32
+extern u64 gEffBombExplosion5Tex[TEX_LEN(u64, gEffBombExplosion5Tex_WIDTH, gEffBombExplosion5Tex_HEIGHT, 16)];
+#define gEffBombExplosion6Tex_WIDTH 32
+#define gEffBombExplosion6Tex_HEIGHT 32
+extern u64 gEffBombExplosion6Tex[TEX_LEN(u64, gEffBombExplosion6Tex_WIDTH, gEffBombExplosion6Tex_HEIGHT, 16)];
+#define gEffBombExplosion7Tex_WIDTH 32
+#define gEffBombExplosion7Tex_HEIGHT 32
+extern u64 gEffBombExplosion7Tex[TEX_LEN(u64, gEffBombExplosion7Tex_WIDTH, gEffBombExplosion7Tex_HEIGHT, 16)];
+#define gEffBombExplosion8Tex_WIDTH 32
+#define gEffBombExplosion8Tex_HEIGHT 32
+extern u64 gEffBombExplosion8Tex[TEX_LEN(u64, gEffBombExplosion8Tex_WIDTH, gEffBombExplosion8Tex_HEIGHT, 16)];
+extern Gfx gEffBombExplosion1DL[13];
+extern Gfx gEffBombExplosion2DL[11];
+extern Gfx gEffBombExplosion3DL[3];
+extern Vtx gEffBombExplosionVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_bubble.c b/assets/objects/gameplay_keep/eff_bubble.c
new file mode 100644
index 0000000000..b21219d869
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_bubble.c
@@ -0,0 +1,10 @@
+#include "eff_bubble.h"
+#include "gfx.h"
+
+Gfx gEffBubbleDL[15] = {
+#include "assets/objects/gameplay_keep/gEffBubbleDL.inc.c"
+};
+
+Vtx gEffBubbleVtx[] = {
+#include "assets/objects/gameplay_keep/gEffBubbleVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_bubble.h b/assets/objects/gameplay_keep/eff_bubble.h
new file mode 100644
index 0000000000..1994b91d2d
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_bubble.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_EFF_BUBBLE_H
+#define GAMEPLAY_KEEP_EFF_BUBBLE_H
+
+#include "ultra64.h"
+
+extern Gfx gEffBubbleDL[15];
+extern Vtx gEffBubbleVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_dust.c b/assets/objects/gameplay_keep/eff_dust.c
new file mode 100644
index 0000000000..ca78eeca3f
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_dust.c
@@ -0,0 +1,10 @@
+#include "eff_dust.h"
+#include "gfx.h"
+
+Gfx gEffDustDL[11] = {
+#include "assets/objects/gameplay_keep/gEffDustDL.inc.c"
+};
+
+Vtx gEffDustVtx[] = {
+#include "assets/objects/gameplay_keep/gEffDustVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_dust.h b/assets/objects/gameplay_keep/eff_dust.h
new file mode 100644
index 0000000000..6d314e8221
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_dust.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_EFF_DUST_H
+#define GAMEPLAY_KEEP_EFF_DUST_H
+
+#include "ultra64.h"
+
+extern Gfx gEffDustDL[11];
+extern Vtx gEffDustVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_enemy_death_flame.c b/assets/objects/gameplay_keep/eff_enemy_death_flame.c
new file mode 100644
index 0000000000..3ee36d87ce
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_enemy_death_flame.c
@@ -0,0 +1,50 @@
+#include "eff_enemy_death_flame.h"
+#include "gfx.h"
+
+u64 gEffEnemyDeathFlame1Tex[TEX_LEN(u64, gEffEnemyDeathFlame1Tex_WIDTH, gEffEnemyDeathFlame1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlame1Tex.i8.inc.c"
+};
+
+u64 gEffEnemyDeathFlame2Tex[TEX_LEN(u64, gEffEnemyDeathFlame2Tex_WIDTH, gEffEnemyDeathFlame2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlame2Tex.i8.inc.c"
+};
+
+u64 gEffEnemyDeathFlame3Tex[TEX_LEN(u64, gEffEnemyDeathFlame3Tex_WIDTH, gEffEnemyDeathFlame3Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlame3Tex.i8.inc.c"
+};
+
+u64 gEffEnemyDeathFlame4Tex[TEX_LEN(u64, gEffEnemyDeathFlame4Tex_WIDTH, gEffEnemyDeathFlame4Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlame4Tex.i8.inc.c"
+};
+
+u64 gEffEnemyDeathFlame5Tex[TEX_LEN(u64, gEffEnemyDeathFlame5Tex_WIDTH, gEffEnemyDeathFlame5Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlame5Tex.i8.inc.c"
+};
+
+u64 gEffEnemyDeathFlame6Tex[TEX_LEN(u64, gEffEnemyDeathFlame6Tex_WIDTH, gEffEnemyDeathFlame6Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlame6Tex.i8.inc.c"
+};
+
+u64 gEffEnemyDeathFlame7Tex[TEX_LEN(u64, gEffEnemyDeathFlame7Tex_WIDTH, gEffEnemyDeathFlame7Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlame7Tex.i8.inc.c"
+};
+
+u64 gEffEnemyDeathFlame8Tex[TEX_LEN(u64, gEffEnemyDeathFlame8Tex_WIDTH, gEffEnemyDeathFlame8Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlame8Tex.i8.inc.c"
+};
+
+u64 gEffEnemyDeathFlame9Tex[TEX_LEN(u64, gEffEnemyDeathFlame9Tex_WIDTH, gEffEnemyDeathFlame9Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlame9Tex.i8.inc.c"
+};
+
+u64 gEffEnemyDeathFlame10Tex[TEX_LEN(u64, gEffEnemyDeathFlame10Tex_WIDTH, gEffEnemyDeathFlame10Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlame10Tex.i8.inc.c"
+};
+
+Gfx gEffEnemyDeathFlameDL[13] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlameDL.inc.c"
+};
+
+Vtx gEffEnemyDeathFlameVtx[] = {
+#include "assets/objects/gameplay_keep/gEffEnemyDeathFlameVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_enemy_death_flame.h b/assets/objects/gameplay_keep/eff_enemy_death_flame.h
new file mode 100644
index 0000000000..4b731c34cf
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_enemy_death_flame.h
@@ -0,0 +1,40 @@
+#ifndef GAMEPLAY_KEEP_EFF_ENEMY_DEATH_FLAME_H
+#define GAMEPLAY_KEEP_EFF_ENEMY_DEATH_FLAME_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffEnemyDeathFlame1Tex_WIDTH 32
+#define gEffEnemyDeathFlame1Tex_HEIGHT 64
+extern u64 gEffEnemyDeathFlame1Tex[TEX_LEN(u64, gEffEnemyDeathFlame1Tex_WIDTH, gEffEnemyDeathFlame1Tex_HEIGHT, 8)];
+#define gEffEnemyDeathFlame2Tex_WIDTH 32
+#define gEffEnemyDeathFlame2Tex_HEIGHT 64
+extern u64 gEffEnemyDeathFlame2Tex[TEX_LEN(u64, gEffEnemyDeathFlame2Tex_WIDTH, gEffEnemyDeathFlame2Tex_HEIGHT, 8)];
+#define gEffEnemyDeathFlame3Tex_WIDTH 32
+#define gEffEnemyDeathFlame3Tex_HEIGHT 64
+extern u64 gEffEnemyDeathFlame3Tex[TEX_LEN(u64, gEffEnemyDeathFlame3Tex_WIDTH, gEffEnemyDeathFlame3Tex_HEIGHT, 8)];
+#define gEffEnemyDeathFlame4Tex_WIDTH 32
+#define gEffEnemyDeathFlame4Tex_HEIGHT 64
+extern u64 gEffEnemyDeathFlame4Tex[TEX_LEN(u64, gEffEnemyDeathFlame4Tex_WIDTH, gEffEnemyDeathFlame4Tex_HEIGHT, 8)];
+#define gEffEnemyDeathFlame5Tex_WIDTH 32
+#define gEffEnemyDeathFlame5Tex_HEIGHT 64
+extern u64 gEffEnemyDeathFlame5Tex[TEX_LEN(u64, gEffEnemyDeathFlame5Tex_WIDTH, gEffEnemyDeathFlame5Tex_HEIGHT, 8)];
+#define gEffEnemyDeathFlame6Tex_WIDTH 32
+#define gEffEnemyDeathFlame6Tex_HEIGHT 64
+extern u64 gEffEnemyDeathFlame6Tex[TEX_LEN(u64, gEffEnemyDeathFlame6Tex_WIDTH, gEffEnemyDeathFlame6Tex_HEIGHT, 8)];
+#define gEffEnemyDeathFlame7Tex_WIDTH 32
+#define gEffEnemyDeathFlame7Tex_HEIGHT 64
+extern u64 gEffEnemyDeathFlame7Tex[TEX_LEN(u64, gEffEnemyDeathFlame7Tex_WIDTH, gEffEnemyDeathFlame7Tex_HEIGHT, 8)];
+#define gEffEnemyDeathFlame8Tex_WIDTH 32
+#define gEffEnemyDeathFlame8Tex_HEIGHT 64
+extern u64 gEffEnemyDeathFlame8Tex[TEX_LEN(u64, gEffEnemyDeathFlame8Tex_WIDTH, gEffEnemyDeathFlame8Tex_HEIGHT, 8)];
+#define gEffEnemyDeathFlame9Tex_WIDTH 32
+#define gEffEnemyDeathFlame9Tex_HEIGHT 64
+extern u64 gEffEnemyDeathFlame9Tex[TEX_LEN(u64, gEffEnemyDeathFlame9Tex_WIDTH, gEffEnemyDeathFlame9Tex_HEIGHT, 8)];
+#define gEffEnemyDeathFlame10Tex_WIDTH 32
+#define gEffEnemyDeathFlame10Tex_HEIGHT 64
+extern u64 gEffEnemyDeathFlame10Tex[TEX_LEN(u64, gEffEnemyDeathFlame10Tex_WIDTH, gEffEnemyDeathFlame10Tex_HEIGHT, 8)];
+extern Gfx gEffEnemyDeathFlameDL[13];
+extern Vtx gEffEnemyDeathFlameVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_fire.c b/assets/objects/gameplay_keep/eff_fire.c
new file mode 100644
index 0000000000..7d95baaae4
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_fire.c
@@ -0,0 +1,22 @@
+#include "eff_fire.h"
+#include "gfx.h"
+
+Vtx gEffFireVtx[] = {
+#include "assets/objects/gameplay_keep/gEffFireVtx.inc.c"
+};
+
+Gfx gEffFire1DL[24] = {
+#include "assets/objects/gameplay_keep/gEffFire1DL.inc.c"
+};
+
+Gfx gEffFire2DL[24] = {
+#include "assets/objects/gameplay_keep/gEffFire2DL.inc.c"
+};
+
+u64 gDecorativeFlameMaskTex[TEX_LEN(u64, gDecorativeFlameMaskTex_WIDTH, gDecorativeFlameMaskTex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gDecorativeFlameMaskTex.i4.inc.c"
+};
+
+u64 gDecorativeFlameTex[TEX_LEN(u64, gDecorativeFlameTex_WIDTH, gDecorativeFlameTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDecorativeFlameTex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_fire.h b/assets/objects/gameplay_keep/eff_fire.h
new file mode 100644
index 0000000000..cf3aee7eb5
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_fire.h
@@ -0,0 +1,17 @@
+#ifndef GAMEPLAY_KEEP_EFF_FIRE_H
+#define GAMEPLAY_KEEP_EFF_FIRE_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+extern Vtx gEffFireVtx[];
+extern Gfx gEffFire1DL[24];
+extern Gfx gEffFire2DL[24];
+#define gDecorativeFlameMaskTex_WIDTH 32
+#define gDecorativeFlameMaskTex_HEIGHT 128
+extern u64 gDecorativeFlameMaskTex[TEX_LEN(u64, gDecorativeFlameMaskTex_WIDTH, gDecorativeFlameMaskTex_HEIGHT, 4)];
+#define gDecorativeFlameTex_WIDTH 32
+#define gDecorativeFlameTex_HEIGHT 64
+extern u64 gDecorativeFlameTex[TEX_LEN(u64, gDecorativeFlameTex_WIDTH, gDecorativeFlameTex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_fire_footprint.c b/assets/objects/gameplay_keep/eff_fire_footprint.c
new file mode 100644
index 0000000000..10d8a2ca98
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_fire_footprint.c
@@ -0,0 +1,42 @@
+#include "eff_fire_footprint.h"
+#include "gfx.h"
+
+u64 gEffFireFootprint1Tex[TEX_LEN(u64, gEffFireFootprint1Tex_WIDTH, gEffFireFootprint1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffFireFootprint1Tex.ia8.inc.c"
+};
+
+u64 gEffFireFootprint2Tex[TEX_LEN(u64, gEffFireFootprint2Tex_WIDTH, gEffFireFootprint2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffFireFootprint2Tex.ia8.inc.c"
+};
+
+u64 gEffFireFootprint3Tex[TEX_LEN(u64, gEffFireFootprint3Tex_WIDTH, gEffFireFootprint3Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffFireFootprint3Tex.ia8.inc.c"
+};
+
+u64 gEffFireFootprint4Tex[TEX_LEN(u64, gEffFireFootprint4Tex_WIDTH, gEffFireFootprint4Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffFireFootprint4Tex.ia8.inc.c"
+};
+
+u64 gEffFireFootprint5Tex[TEX_LEN(u64, gEffFireFootprint5Tex_WIDTH, gEffFireFootprint5Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffFireFootprint5Tex.ia8.inc.c"
+};
+
+u64 gEffFireFootprint6Tex[TEX_LEN(u64, gEffFireFootprint6Tex_WIDTH, gEffFireFootprint6Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffFireFootprint6Tex.ia8.inc.c"
+};
+
+u64 gEffFireFootprint7Tex[TEX_LEN(u64, gEffFireFootprint7Tex_WIDTH, gEffFireFootprint7Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffFireFootprint7Tex.ia8.inc.c"
+};
+
+u64 gEffFireFootprint8Tex[TEX_LEN(u64, gEffFireFootprint8Tex_WIDTH, gEffFireFootprint8Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffFireFootprint8Tex.ia8.inc.c"
+};
+
+Gfx gEffFireFootprintDL[12] = {
+#include "assets/objects/gameplay_keep/gEffFireFootprintDL.inc.c"
+};
+
+Vtx gEffFireFootprintVtx[] = {
+#include "assets/objects/gameplay_keep/gEffFireFootprintVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_fire_footprint.h b/assets/objects/gameplay_keep/eff_fire_footprint.h
new file mode 100644
index 0000000000..9a19d0ceae
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_fire_footprint.h
@@ -0,0 +1,34 @@
+#ifndef GAMEPLAY_KEEP_EFF_FIRE_FOOTPRINT_H
+#define GAMEPLAY_KEEP_EFF_FIRE_FOOTPRINT_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffFireFootprint1Tex_WIDTH 32
+#define gEffFireFootprint1Tex_HEIGHT 32
+extern u64 gEffFireFootprint1Tex[TEX_LEN(u64, gEffFireFootprint1Tex_WIDTH, gEffFireFootprint1Tex_HEIGHT, 8)];
+#define gEffFireFootprint2Tex_WIDTH 32
+#define gEffFireFootprint2Tex_HEIGHT 32
+extern u64 gEffFireFootprint2Tex[TEX_LEN(u64, gEffFireFootprint2Tex_WIDTH, gEffFireFootprint2Tex_HEIGHT, 8)];
+#define gEffFireFootprint3Tex_WIDTH 32
+#define gEffFireFootprint3Tex_HEIGHT 32
+extern u64 gEffFireFootprint3Tex[TEX_LEN(u64, gEffFireFootprint3Tex_WIDTH, gEffFireFootprint3Tex_HEIGHT, 8)];
+#define gEffFireFootprint4Tex_WIDTH 32
+#define gEffFireFootprint4Tex_HEIGHT 32
+extern u64 gEffFireFootprint4Tex[TEX_LEN(u64, gEffFireFootprint4Tex_WIDTH, gEffFireFootprint4Tex_HEIGHT, 8)];
+#define gEffFireFootprint5Tex_WIDTH 32
+#define gEffFireFootprint5Tex_HEIGHT 32
+extern u64 gEffFireFootprint5Tex[TEX_LEN(u64, gEffFireFootprint5Tex_WIDTH, gEffFireFootprint5Tex_HEIGHT, 8)];
+#define gEffFireFootprint6Tex_WIDTH 32
+#define gEffFireFootprint6Tex_HEIGHT 32
+extern u64 gEffFireFootprint6Tex[TEX_LEN(u64, gEffFireFootprint6Tex_WIDTH, gEffFireFootprint6Tex_HEIGHT, 8)];
+#define gEffFireFootprint7Tex_WIDTH 32
+#define gEffFireFootprint7Tex_HEIGHT 32
+extern u64 gEffFireFootprint7Tex[TEX_LEN(u64, gEffFireFootprint7Tex_WIDTH, gEffFireFootprint7Tex_HEIGHT, 8)];
+#define gEffFireFootprint8Tex_WIDTH 32
+#define gEffFireFootprint8Tex_HEIGHT 32
+extern u64 gEffFireFootprint8Tex[TEX_LEN(u64, gEffFireFootprint8Tex_WIDTH, gEffFireFootprint8Tex_HEIGHT, 8)];
+extern Gfx gEffFireFootprintDL[12];
+extern Vtx gEffFireFootprintVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_flash.c b/assets/objects/gameplay_keep/eff_flash.c
new file mode 100644
index 0000000000..6100286e5a
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_flash.c
@@ -0,0 +1,18 @@
+#include "eff_flash.h"
+#include "gfx.h"
+
+Vtx gEffFlashVtx[] = {
+#include "assets/objects/gameplay_keep/gEffFlashVtx.inc.c"
+};
+
+Gfx gEffFlash1DL[15] = {
+#include "assets/objects/gameplay_keep/gEffFlash1DL.inc.c"
+};
+
+Gfx gEffFlash2DL[16] = {
+#include "assets/objects/gameplay_keep/gEffFlash2DL.inc.c"
+};
+
+u64 gFlashTex[TEX_LEN(u64, gFlashTex_WIDTH, gFlashTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gFlashTex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_flash.h b/assets/objects/gameplay_keep/eff_flash.h
new file mode 100644
index 0000000000..a9b2db8c2a
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_flash.h
@@ -0,0 +1,14 @@
+#ifndef GAMEPLAY_KEEP_EFF_FLASH_H
+#define GAMEPLAY_KEEP_EFF_FLASH_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+extern Vtx gEffFlashVtx[];
+extern Gfx gEffFlash1DL[15];
+extern Gfx gEffFlash2DL[16];
+#define gFlashTex_WIDTH 64
+#define gFlashTex_HEIGHT 64
+extern u64 gFlashTex[TEX_LEN(u64, gFlashTex_WIDTH, gFlashTex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_hitmark.c b/assets/objects/gameplay_keep/eff_hitmark.c
new file mode 100644
index 0000000000..09b18b726a
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_hitmark.c
@@ -0,0 +1,106 @@
+#include "eff_hitmark.h"
+#include "gfx.h"
+
+u64 gEffHitMark1Tex[TEX_LEN(u64, gEffHitMark1Tex_WIDTH, gEffHitMark1Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark1Tex.i4.inc.c"
+};
+
+u64 gEffHitMark2Tex[TEX_LEN(u64, gEffHitMark2Tex_WIDTH, gEffHitMark2Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark2Tex.i4.inc.c"
+};
+
+u64 gEffHitMark3Tex[TEX_LEN(u64, gEffHitMark3Tex_WIDTH, gEffHitMark3Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark3Tex.i4.inc.c"
+};
+
+u64 gEffHitMark4Tex[TEX_LEN(u64, gEffHitMark4Tex_WIDTH, gEffHitMark4Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark4Tex.i4.inc.c"
+};
+
+u64 gEffHitMark5Tex[TEX_LEN(u64, gEffHitMark5Tex_WIDTH, gEffHitMark5Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark5Tex.i4.inc.c"
+};
+
+u64 gEffHitMark6Tex[TEX_LEN(u64, gEffHitMark6Tex_WIDTH, gEffHitMark6Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark6Tex.i4.inc.c"
+};
+
+u64 gEffHitMark7Tex[TEX_LEN(u64, gEffHitMark7Tex_WIDTH, gEffHitMark7Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark7Tex.i4.inc.c"
+};
+
+u64 gEffHitMark8Tex[TEX_LEN(u64, gEffHitMark8Tex_WIDTH, gEffHitMark8Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark8Tex.i4.inc.c"
+};
+
+u64 gEffHitMark9Tex[TEX_LEN(u64, gEffHitMark9Tex_WIDTH, gEffHitMark9Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark9Tex.i4.inc.c"
+};
+
+u64 gEffHitMark10Tex[TEX_LEN(u64, gEffHitMark10Tex_WIDTH, gEffHitMark10Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark10Tex.i4.inc.c"
+};
+
+u64 gEffHitMark11Tex[TEX_LEN(u64, gEffHitMark11Tex_WIDTH, gEffHitMark11Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark11Tex.i4.inc.c"
+};
+
+u64 gEffHitMark12Tex[TEX_LEN(u64, gEffHitMark12Tex_WIDTH, gEffHitMark12Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark12Tex.i4.inc.c"
+};
+
+u64 gEffHitMark13Tex[TEX_LEN(u64, gEffHitMark13Tex_WIDTH, gEffHitMark13Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark13Tex.i4.inc.c"
+};
+
+u64 gEffHitMark14Tex[TEX_LEN(u64, gEffHitMark14Tex_WIDTH, gEffHitMark14Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark14Tex.i4.inc.c"
+};
+
+u64 gEffHitMark15Tex[TEX_LEN(u64, gEffHitMark15Tex_WIDTH, gEffHitMark15Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark15Tex.i4.inc.c"
+};
+
+u64 gEffHitMark16Tex[TEX_LEN(u64, gEffHitMark16Tex_WIDTH, gEffHitMark16Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark16Tex.i4.inc.c"
+};
+
+u64 gEffHitMark17Tex[TEX_LEN(u64, gEffHitMark17Tex_WIDTH, gEffHitMark17Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark17Tex.i4.inc.c"
+};
+
+u64 gEffHitMark18Tex[TEX_LEN(u64, gEffHitMark18Tex_WIDTH, gEffHitMark18Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark18Tex.i4.inc.c"
+};
+
+u64 gEffHitMark19Tex[TEX_LEN(u64, gEffHitMark19Tex_WIDTH, gEffHitMark19Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark19Tex.i4.inc.c"
+};
+
+u64 gEffHitMark20Tex[TEX_LEN(u64, gEffHitMark20Tex_WIDTH, gEffHitMark20Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark20Tex.i4.inc.c"
+};
+
+u64 gEffHitMark21Tex[TEX_LEN(u64, gEffHitMark21Tex_WIDTH, gEffHitMark21Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark21Tex.i4.inc.c"
+};
+
+u64 gEffHitMark22Tex[TEX_LEN(u64, gEffHitMark22Tex_WIDTH, gEffHitMark22Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark22Tex.i4.inc.c"
+};
+
+u64 gEffHitMark23Tex[TEX_LEN(u64, gEffHitMark23Tex_WIDTH, gEffHitMark23Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark23Tex.i4.inc.c"
+};
+
+u64 gEffHitMark24Tex[TEX_LEN(u64, gEffHitMark24Tex_WIDTH, gEffHitMark24Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffHitMark24Tex.i4.inc.c"
+};
+
+Gfx gEffHitMarkDL[11] = {
+#include "assets/objects/gameplay_keep/gEffHitMarkDL.inc.c"
+};
+
+Vtx gEffHitMarkVtx[] = {
+#include "assets/objects/gameplay_keep/gEffHitMarkVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_hitmark.h b/assets/objects/gameplay_keep/eff_hitmark.h
new file mode 100644
index 0000000000..7a5e072053
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_hitmark.h
@@ -0,0 +1,82 @@
+#ifndef GAMEPLAY_KEEP_EFF_HITMARK_H
+#define GAMEPLAY_KEEP_EFF_HITMARK_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffHitMark1Tex_WIDTH 32
+#define gEffHitMark1Tex_HEIGHT 24
+extern u64 gEffHitMark1Tex[TEX_LEN(u64, gEffHitMark1Tex_WIDTH, gEffHitMark1Tex_HEIGHT, 4)];
+#define gEffHitMark2Tex_WIDTH 32
+#define gEffHitMark2Tex_HEIGHT 24
+extern u64 gEffHitMark2Tex[TEX_LEN(u64, gEffHitMark2Tex_WIDTH, gEffHitMark2Tex_HEIGHT, 4)];
+#define gEffHitMark3Tex_WIDTH 32
+#define gEffHitMark3Tex_HEIGHT 24
+extern u64 gEffHitMark3Tex[TEX_LEN(u64, gEffHitMark3Tex_WIDTH, gEffHitMark3Tex_HEIGHT, 4)];
+#define gEffHitMark4Tex_WIDTH 32
+#define gEffHitMark4Tex_HEIGHT 24
+extern u64 gEffHitMark4Tex[TEX_LEN(u64, gEffHitMark4Tex_WIDTH, gEffHitMark4Tex_HEIGHT, 4)];
+#define gEffHitMark5Tex_WIDTH 32
+#define gEffHitMark5Tex_HEIGHT 24
+extern u64 gEffHitMark5Tex[TEX_LEN(u64, gEffHitMark5Tex_WIDTH, gEffHitMark5Tex_HEIGHT, 4)];
+#define gEffHitMark6Tex_WIDTH 32
+#define gEffHitMark6Tex_HEIGHT 24
+extern u64 gEffHitMark6Tex[TEX_LEN(u64, gEffHitMark6Tex_WIDTH, gEffHitMark6Tex_HEIGHT, 4)];
+#define gEffHitMark7Tex_WIDTH 32
+#define gEffHitMark7Tex_HEIGHT 24
+extern u64 gEffHitMark7Tex[TEX_LEN(u64, gEffHitMark7Tex_WIDTH, gEffHitMark7Tex_HEIGHT, 4)];
+#define gEffHitMark8Tex_WIDTH 32
+#define gEffHitMark8Tex_HEIGHT 24
+extern u64 gEffHitMark8Tex[TEX_LEN(u64, gEffHitMark8Tex_WIDTH, gEffHitMark8Tex_HEIGHT, 4)];
+#define gEffHitMark9Tex_WIDTH 32
+#define gEffHitMark9Tex_HEIGHT 24
+extern u64 gEffHitMark9Tex[TEX_LEN(u64, gEffHitMark9Tex_WIDTH, gEffHitMark9Tex_HEIGHT, 4)];
+#define gEffHitMark10Tex_WIDTH 32
+#define gEffHitMark10Tex_HEIGHT 24
+extern u64 gEffHitMark10Tex[TEX_LEN(u64, gEffHitMark10Tex_WIDTH, gEffHitMark10Tex_HEIGHT, 4)];
+#define gEffHitMark11Tex_WIDTH 32
+#define gEffHitMark11Tex_HEIGHT 24
+extern u64 gEffHitMark11Tex[TEX_LEN(u64, gEffHitMark11Tex_WIDTH, gEffHitMark11Tex_HEIGHT, 4)];
+#define gEffHitMark12Tex_WIDTH 32
+#define gEffHitMark12Tex_HEIGHT 24
+extern u64 gEffHitMark12Tex[TEX_LEN(u64, gEffHitMark12Tex_WIDTH, gEffHitMark12Tex_HEIGHT, 4)];
+#define gEffHitMark13Tex_WIDTH 32
+#define gEffHitMark13Tex_HEIGHT 24
+extern u64 gEffHitMark13Tex[TEX_LEN(u64, gEffHitMark13Tex_WIDTH, gEffHitMark13Tex_HEIGHT, 4)];
+#define gEffHitMark14Tex_WIDTH 32
+#define gEffHitMark14Tex_HEIGHT 24
+extern u64 gEffHitMark14Tex[TEX_LEN(u64, gEffHitMark14Tex_WIDTH, gEffHitMark14Tex_HEIGHT, 4)];
+#define gEffHitMark15Tex_WIDTH 32
+#define gEffHitMark15Tex_HEIGHT 24
+extern u64 gEffHitMark15Tex[TEX_LEN(u64, gEffHitMark15Tex_WIDTH, gEffHitMark15Tex_HEIGHT, 4)];
+#define gEffHitMark16Tex_WIDTH 32
+#define gEffHitMark16Tex_HEIGHT 24
+extern u64 gEffHitMark16Tex[TEX_LEN(u64, gEffHitMark16Tex_WIDTH, gEffHitMark16Tex_HEIGHT, 4)];
+#define gEffHitMark17Tex_WIDTH 32
+#define gEffHitMark17Tex_HEIGHT 24
+extern u64 gEffHitMark17Tex[TEX_LEN(u64, gEffHitMark17Tex_WIDTH, gEffHitMark17Tex_HEIGHT, 4)];
+#define gEffHitMark18Tex_WIDTH 32
+#define gEffHitMark18Tex_HEIGHT 24
+extern u64 gEffHitMark18Tex[TEX_LEN(u64, gEffHitMark18Tex_WIDTH, gEffHitMark18Tex_HEIGHT, 4)];
+#define gEffHitMark19Tex_WIDTH 32
+#define gEffHitMark19Tex_HEIGHT 24
+extern u64 gEffHitMark19Tex[TEX_LEN(u64, gEffHitMark19Tex_WIDTH, gEffHitMark19Tex_HEIGHT, 4)];
+#define gEffHitMark20Tex_WIDTH 32
+#define gEffHitMark20Tex_HEIGHT 24
+extern u64 gEffHitMark20Tex[TEX_LEN(u64, gEffHitMark20Tex_WIDTH, gEffHitMark20Tex_HEIGHT, 4)];
+#define gEffHitMark21Tex_WIDTH 32
+#define gEffHitMark21Tex_HEIGHT 24
+extern u64 gEffHitMark21Tex[TEX_LEN(u64, gEffHitMark21Tex_WIDTH, gEffHitMark21Tex_HEIGHT, 4)];
+#define gEffHitMark22Tex_WIDTH 32
+#define gEffHitMark22Tex_HEIGHT 24
+extern u64 gEffHitMark22Tex[TEX_LEN(u64, gEffHitMark22Tex_WIDTH, gEffHitMark22Tex_HEIGHT, 4)];
+#define gEffHitMark23Tex_WIDTH 32
+#define gEffHitMark23Tex_HEIGHT 24
+extern u64 gEffHitMark23Tex[TEX_LEN(u64, gEffHitMark23Tex_WIDTH, gEffHitMark23Tex_HEIGHT, 4)];
+#define gEffHitMark24Tex_WIDTH 32
+#define gEffHitMark24Tex_HEIGHT 24
+extern u64 gEffHitMark24Tex[TEX_LEN(u64, gEffHitMark24Tex_WIDTH, gEffHitMark24Tex_HEIGHT, 4)];
+extern Gfx gEffHitMarkDL[11];
+extern Vtx gEffHitMarkVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_ice_fragments.c b/assets/objects/gameplay_keep/eff_ice_fragments.c
new file mode 100644
index 0000000000..d852fda39b
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_ice_fragments.c
@@ -0,0 +1,15 @@
+#include "eff_ice_fragments.h"
+#include "gameplay_keep_0x32090.h"
+#include "gfx.h"
+
+Vtx gEffIceFragmentVtx[] = {
+#include "assets/objects/gameplay_keep/gEffIceFragmentVtx.inc.c"
+};
+
+Gfx gEffIceFragment1DL[31] = {
+#include "assets/objects/gameplay_keep/gEffIceFragment1DL.inc.c"
+};
+
+Gfx gEffIceFragment2DL[30] = {
+#include "assets/objects/gameplay_keep/gEffIceFragment2DL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_ice_fragments.h b/assets/objects/gameplay_keep/eff_ice_fragments.h
new file mode 100644
index 0000000000..856769aca5
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_ice_fragments.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_EFF_ICE_FRAGMENTS_H
+#define GAMEPLAY_KEEP_EFF_ICE_FRAGMENTS_H
+
+#include "ultra64.h"
+
+extern Vtx gEffIceFragmentVtx[];
+extern Gfx gEffIceFragment1DL[31];
+extern Gfx gEffIceFragment2DL[30];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_lightning.c b/assets/objects/gameplay_keep/eff_lightning.c
new file mode 100644
index 0000000000..a9a41f6be2
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_lightning.c
@@ -0,0 +1,42 @@
+#include "eff_lightning.h"
+#include "gfx.h"
+
+u64 gEffLightning1Tex[TEX_LEN(u64, gEffLightning1Tex_WIDTH, gEffLightning1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffLightning1Tex.i8.inc.c"
+};
+
+u64 gEffLightning2Tex[TEX_LEN(u64, gEffLightning2Tex_WIDTH, gEffLightning2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffLightning2Tex.i8.inc.c"
+};
+
+u64 gEffLightning3Tex[TEX_LEN(u64, gEffLightning3Tex_WIDTH, gEffLightning3Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffLightning3Tex.i8.inc.c"
+};
+
+u64 gEffLightning4Tex[TEX_LEN(u64, gEffLightning4Tex_WIDTH, gEffLightning4Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffLightning4Tex.i8.inc.c"
+};
+
+u64 gEffLightning5Tex[TEX_LEN(u64, gEffLightning5Tex_WIDTH, gEffLightning5Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffLightning5Tex.i8.inc.c"
+};
+
+u64 gEffLightning6Tex[TEX_LEN(u64, gEffLightning6Tex_WIDTH, gEffLightning6Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffLightning6Tex.i8.inc.c"
+};
+
+u64 gEffLightning7Tex[TEX_LEN(u64, gEffLightning7Tex_WIDTH, gEffLightning7Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffLightning7Tex.i8.inc.c"
+};
+
+u64 gEffLightning8Tex[TEX_LEN(u64, gEffLightning8Tex_WIDTH, gEffLightning8Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffLightning8Tex.i8.inc.c"
+};
+
+Gfx gEffLightningDL[13] = {
+#include "assets/objects/gameplay_keep/gEffLightningDL.inc.c"
+};
+
+Vtx gEffLightningVtx[] = {
+#include "assets/objects/gameplay_keep/gEffLightningVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_lightning.h b/assets/objects/gameplay_keep/eff_lightning.h
new file mode 100644
index 0000000000..4fb96dce75
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_lightning.h
@@ -0,0 +1,34 @@
+#ifndef GAMEPLAY_KEEP_EFF_LIGHTNING_H
+#define GAMEPLAY_KEEP_EFF_LIGHTNING_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffLightning1Tex_WIDTH 16
+#define gEffLightning1Tex_HEIGHT 96
+extern u64 gEffLightning1Tex[TEX_LEN(u64, gEffLightning1Tex_WIDTH, gEffLightning1Tex_HEIGHT, 8)];
+#define gEffLightning2Tex_WIDTH 16
+#define gEffLightning2Tex_HEIGHT 96
+extern u64 gEffLightning2Tex[TEX_LEN(u64, gEffLightning2Tex_WIDTH, gEffLightning2Tex_HEIGHT, 8)];
+#define gEffLightning3Tex_WIDTH 16
+#define gEffLightning3Tex_HEIGHT 96
+extern u64 gEffLightning3Tex[TEX_LEN(u64, gEffLightning3Tex_WIDTH, gEffLightning3Tex_HEIGHT, 8)];
+#define gEffLightning4Tex_WIDTH 16
+#define gEffLightning4Tex_HEIGHT 96
+extern u64 gEffLightning4Tex[TEX_LEN(u64, gEffLightning4Tex_WIDTH, gEffLightning4Tex_HEIGHT, 8)];
+#define gEffLightning5Tex_WIDTH 16
+#define gEffLightning5Tex_HEIGHT 96
+extern u64 gEffLightning5Tex[TEX_LEN(u64, gEffLightning5Tex_WIDTH, gEffLightning5Tex_HEIGHT, 8)];
+#define gEffLightning6Tex_WIDTH 16
+#define gEffLightning6Tex_HEIGHT 96
+extern u64 gEffLightning6Tex[TEX_LEN(u64, gEffLightning6Tex_WIDTH, gEffLightning6Tex_HEIGHT, 8)];
+#define gEffLightning7Tex_WIDTH 16
+#define gEffLightning7Tex_HEIGHT 96
+extern u64 gEffLightning7Tex[TEX_LEN(u64, gEffLightning7Tex_WIDTH, gEffLightning7Tex_HEIGHT, 8)];
+#define gEffLightning8Tex_WIDTH 16
+#define gEffLightning8Tex_HEIGHT 96
+extern u64 gEffLightning8Tex[TEX_LEN(u64, gEffLightning8Tex_WIDTH, gEffLightning8Tex_HEIGHT, 8)];
+extern Gfx gEffLightningDL[13];
+extern Vtx gEffLightningVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_shockwave.c b/assets/objects/gameplay_keep/eff_shockwave.c
new file mode 100644
index 0000000000..e6ab55b7c3
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_shockwave.c
@@ -0,0 +1,14 @@
+#include "eff_shockwave.h"
+#include "gfx.h"
+
+u64 gEffShockwaveTex[TEX_LEN(u64, gEffShockwaveTex_WIDTH, gEffShockwaveTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffShockwaveTex.i8.inc.c"
+};
+
+Gfx gEffShockwaveDL[14] = {
+#include "assets/objects/gameplay_keep/gEffShockwaveDL.inc.c"
+};
+
+Vtx gGameplayKeepVtx_01A120[] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepVtx_01A120.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_shockwave.h b/assets/objects/gameplay_keep/eff_shockwave.h
new file mode 100644
index 0000000000..4aaaa64b68
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_shockwave.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_EFF_SHOCKWAVE_H
+#define GAMEPLAY_KEEP_EFF_SHOCKWAVE_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffShockwaveTex_WIDTH 64
+#define gEffShockwaveTex_HEIGHT 64
+extern u64 gEffShockwaveTex[TEX_LEN(u64, gEffShockwaveTex_WIDTH, gEffShockwaveTex_HEIGHT, 8)];
+extern Gfx gEffShockwaveDL[14];
+extern Vtx gGameplayKeepVtx_01A120[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_spark_model.c b/assets/objects/gameplay_keep/eff_spark_model.c
new file mode 100644
index 0000000000..cc11ec3f9b
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_spark_model.c
@@ -0,0 +1,10 @@
+#include "eff_spark_model.h"
+#include "gfx.h"
+
+Gfx gEffSparkDL[12] = {
+#include "assets/objects/gameplay_keep/gEffSparkDL.inc.c"
+};
+
+Vtx gEffSparkVtx[] = {
+#include "assets/objects/gameplay_keep/gEffSparkVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_spark_model.h b/assets/objects/gameplay_keep/eff_spark_model.h
new file mode 100644
index 0000000000..6b86819a89
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_spark_model.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_EFF_SPARK_MODEL_H
+#define GAMEPLAY_KEEP_EFF_SPARK_MODEL_H
+
+#include "ultra64.h"
+
+extern Gfx gEffSparkDL[12];
+extern Vtx gEffSparkVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/eff_spark_textures.c b/assets/objects/gameplay_keep/eff_spark_textures.c
new file mode 100644
index 0000000000..251f900ab9
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_spark_textures.c
@@ -0,0 +1,17 @@
+#include "eff_spark_textures.h"
+
+u64 gEffSpark1Tex[TEX_LEN(u64, gEffSpark1Tex_WIDTH, gEffSpark1Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffSpark1Tex.i4.inc.c"
+};
+
+u64 gEffSpark2Tex[TEX_LEN(u64, gEffSpark2Tex_WIDTH, gEffSpark2Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffSpark2Tex.i4.inc.c"
+};
+
+u64 gEffSpark3Tex[TEX_LEN(u64, gEffSpark3Tex_WIDTH, gEffSpark3Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffSpark3Tex.i4.inc.c"
+};
+
+u64 gEffSpark4Tex[TEX_LEN(u64, gEffSpark4Tex_WIDTH, gEffSpark4Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffSpark4Tex.i4.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/eff_spark_textures.h b/assets/objects/gameplay_keep/eff_spark_textures.h
new file mode 100644
index 0000000000..1b1f0528d3
--- /dev/null
+++ b/assets/objects/gameplay_keep/eff_spark_textures.h
@@ -0,0 +1,20 @@
+#ifndef GAMEPLAY_KEEP_EFF_SPARK_TEXTURES_H
+#define GAMEPLAY_KEEP_EFF_SPARK_TEXTURES_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffSpark1Tex_WIDTH 32
+#define gEffSpark1Tex_HEIGHT 32
+extern u64 gEffSpark1Tex[TEX_LEN(u64, gEffSpark1Tex_WIDTH, gEffSpark1Tex_HEIGHT, 4)];
+#define gEffSpark2Tex_WIDTH 32
+#define gEffSpark2Tex_HEIGHT 32
+extern u64 gEffSpark2Tex[TEX_LEN(u64, gEffSpark2Tex_WIDTH, gEffSpark2Tex_HEIGHT, 4)];
+#define gEffSpark3Tex_WIDTH 32
+#define gEffSpark3Tex_HEIGHT 32
+extern u64 gEffSpark3Tex[TEX_LEN(u64, gEffSpark3Tex_WIDTH, gEffSpark3Tex_HEIGHT, 4)];
+#define gEffSpark4Tex_WIDTH 32
+#define gEffSpark4Tex_HEIGHT 32
+extern u64 gEffSpark4Tex[TEX_LEN(u64, gEffSpark4Tex_WIDTH, gEffSpark4Tex_HEIGHT, 4)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/fairy_anim.c b/assets/objects/gameplay_keep/fairy_anim.c
new file mode 100644
index 0000000000..9c95ce50dc
--- /dev/null
+++ b/assets/objects/gameplay_keep/fairy_anim.c
@@ -0,0 +1,13 @@
+#include "fairy_anim.h"
+
+s16 gFairyFrameData[] = {
+#include "assets/objects/gameplay_keep/gFairyFrameData.inc.c"
+};
+
+JointIndex gFairyJointIndices[] = {
+#include "assets/objects/gameplay_keep/gFairyJointIndices.inc.c"
+};
+
+AnimationHeader gFairyAnim = {
+#include "assets/objects/gameplay_keep/gFairyAnim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/fairy_anim.h b/assets/objects/gameplay_keep/fairy_anim.h
new file mode 100644
index 0000000000..b12979445c
--- /dev/null
+++ b/assets/objects/gameplay_keep/fairy_anim.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_FAIRY_ANIM_H
+#define GAMEPLAY_KEEP_FAIRY_ANIM_H
+
+#include "animation.h"
+
+extern s16 gFairyFrameData[];
+extern JointIndex gFairyJointIndices[];
+extern AnimationHeader gFairyAnim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/fairy_skel.c b/assets/objects/gameplay_keep/fairy_skel.c
new file mode 100644
index 0000000000..ae8a84d19a
--- /dev/null
+++ b/assets/objects/gameplay_keep/fairy_skel.c
@@ -0,0 +1,129 @@
+#include "fairy_skel.h"
+#include "circle_glow_textures.h"
+#include "animation.h"
+#include "array_count.h"
+#include "gfx.h"
+
+u64 gFairyWingTex[TEX_LEN(u64, gFairyWingTex_WIDTH, gFairyWingTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gFairyWingTex.i8.inc.c"
+};
+
+Vtx gFairyWing1Vtx[] = {
+#include "assets/objects/gameplay_keep/gFairyWing1Vtx.inc.c"
+};
+
+Gfx gFairyWing1DL[17] = {
+#include "assets/objects/gameplay_keep/gFairyWing1DL.inc.c"
+};
+
+Vtx gFairyWing2Vtx[] = {
+#include "assets/objects/gameplay_keep/gFairyWing2Vtx.inc.c"
+};
+
+Gfx gFairyWing2DL[17] = {
+#include "assets/objects/gameplay_keep/gFairyWing2DL.inc.c"
+};
+
+Vtx gFairyWing3Vtx[] = {
+#include "assets/objects/gameplay_keep/gFairyWing3Vtx.inc.c"
+};
+
+Gfx gFairyWing3DL[17] = {
+#include "assets/objects/gameplay_keep/gFairyWing3DL.inc.c"
+};
+
+Vtx gFairyWing4Vtx[] = {
+#include "assets/objects/gameplay_keep/gFairyWing4Vtx.inc.c"
+};
+
+Gfx gFairyWing4DL[17] = {
+#include "assets/objects/gameplay_keep/gFairyWing4DL.inc.c"
+};
+
+Vtx gGlowCircleVtx[] = {
+#include "assets/objects/gameplay_keep/gGlowCircleVtx.inc.c"
+};
+
+Gfx gGlowCircleTextureLoadDL[8] = {
+#include "assets/objects/gameplay_keep/gGlowCircleTextureLoadDL.inc.c"
+};
+
+Gfx gGlowCircleDL[4] = {
+#include "assets/objects/gameplay_keep/gGlowCircleDL.inc.c"
+};
+
+Gfx gGlowCircleSmallDL[45] = {
+#include "assets/objects/gameplay_keep/gGlowCircleSmallDL.inc.c"
+};
+
+Vtx gGlowCircleSmallVtx[] = {
+#include "assets/objects/gameplay_keep/gGlowCircleSmallVtx.inc.c"
+};
+
+u64 gUnusedFairyWingTex[TEX_LEN(u64, gUnusedFairyWingTex_WIDTH, gUnusedFairyWingTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedFairyWingTex.rgba16.inc.c"
+};
+
+StandardLimb gFairySkelLimb0 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb0.inc.c"
+};
+
+StandardLimb gFairySkelLimb1 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb1.inc.c"
+};
+
+StandardLimb gFairySkelLimb2 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb2.inc.c"
+};
+
+StandardLimb gFairySkelLimb3 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb3.inc.c"
+};
+
+StandardLimb gFairySkelLimb4 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb4.inc.c"
+};
+
+StandardLimb gFairySkelLimb5 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb5.inc.c"
+};
+
+StandardLimb gFairySkelLimb6 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb6.inc.c"
+};
+
+StandardLimb gFairySkelLimb7 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb7.inc.c"
+};
+
+StandardLimb gFairySkelLimb8 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb8.inc.c"
+};
+
+StandardLimb gFairySkelLimb9 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb9.inc.c"
+};
+
+StandardLimb gFairySkelLimb10 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb10.inc.c"
+};
+
+StandardLimb gFairySkelLimb11 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb11.inc.c"
+};
+
+StandardLimb gFairySkelLimb12 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb12.inc.c"
+};
+
+StandardLimb gFairySkelLimb13 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb13.inc.c"
+};
+
+void* gFairyLimbs[] = {
+#include "assets/objects/gameplay_keep/gFairyLimbs.inc.c"
+};
+
+SkeletonHeader gFairySkel = {
+#include "assets/objects/gameplay_keep/gFairySkel.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/fairy_skel.h b/assets/objects/gameplay_keep/fairy_skel.h
new file mode 100644
index 0000000000..cb5e5356bc
--- /dev/null
+++ b/assets/objects/gameplay_keep/fairy_skel.h
@@ -0,0 +1,62 @@
+#ifndef GAMEPLAY_KEEP_FAIRY_SKEL_H
+#define GAMEPLAY_KEEP_FAIRY_SKEL_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+#include "animation.h"
+
+#define gFairyWingTex_WIDTH 32
+#define gFairyWingTex_HEIGHT 64
+extern u64 gFairyWingTex[TEX_LEN(u64, gFairyWingTex_WIDTH, gFairyWingTex_HEIGHT, 8)];
+extern Vtx gFairyWing1Vtx[];
+extern Gfx gFairyWing1DL[17];
+extern Vtx gFairyWing2Vtx[];
+extern Gfx gFairyWing2DL[17];
+extern Vtx gFairyWing3Vtx[];
+extern Gfx gFairyWing3DL[17];
+extern Vtx gFairyWing4Vtx[];
+extern Gfx gFairyWing4DL[17];
+extern Vtx gGlowCircleVtx[];
+extern Gfx gGlowCircleTextureLoadDL[8];
+extern Gfx gGlowCircleDL[4];
+extern Gfx gGlowCircleSmallDL[45];
+extern Vtx gGlowCircleSmallVtx[];
+#define gUnusedFairyWingTex_WIDTH 32
+#define gUnusedFairyWingTex_HEIGHT 64
+extern u64 gUnusedFairyWingTex[TEX_LEN(u64, gUnusedFairyWingTex_WIDTH, gUnusedFairyWingTex_HEIGHT, 16)];
+extern StandardLimb gFairySkelLimb0;
+extern StandardLimb gFairySkelLimb1;
+extern StandardLimb gFairySkelLimb2;
+extern StandardLimb gFairySkelLimb3;
+extern StandardLimb gFairySkelLimb4;
+extern StandardLimb gFairySkelLimb5;
+extern StandardLimb gFairySkelLimb6;
+extern StandardLimb gFairySkelLimb7;
+extern StandardLimb gFairySkelLimb8;
+extern StandardLimb gFairySkelLimb9;
+extern StandardLimb gFairySkelLimb10;
+extern StandardLimb gFairySkelLimb11;
+extern StandardLimb gFairySkelLimb12;
+extern StandardLimb gFairySkelLimb13;
+extern void* gFairyLimbs[];
+typedef enum gFairySkelLimb {
+ /* 0 */ FAIRY_LIMB_NONE,
+ /* 1 */ FAIRY_LIMB_0,
+ /* 2 */ FAIRY_LIMB_1,
+ /* 3 */ FAIRY_LIMB_2,
+ /* 4 */ FAIRY_LIMB_3,
+ /* 5 */ FAIRY_LIMB_4,
+ /* 6 */ FAIRY_LIMB_5,
+ /* 7 */ FAIRY_LIMB_6,
+ /* 8 */ FAIRY_LIMB_7,
+ /* 9 */ FAIRY_LIMB_8,
+ /* 10 */ FAIRY_LIMB_9,
+ /* 11 */ FAIRY_LIMB_10,
+ /* 12 */ FAIRY_LIMB_11,
+ /* 13 */ FAIRY_LIMB_12,
+ /* 14 */ FAIRY_LIMB_13,
+ /* 15 */ FAIRY_LIMB_MAX
+} gFairySkelLimb;
+extern SkeletonHeader gFairySkel;
+
+#endif
diff --git a/assets/objects/gameplay_keep/flat_block_model.c b/assets/objects/gameplay_keep/flat_block_model.c
new file mode 100644
index 0000000000..e85f66b5cb
--- /dev/null
+++ b/assets/objects/gameplay_keep/flat_block_model.c
@@ -0,0 +1,11 @@
+#include "flat_block_model.h"
+#include "gameplay_keep_0x42530.h"
+#include "gfx.h"
+
+Vtx gFlatBlockVtx[] = {
+#include "assets/objects/gameplay_keep/gFlatBlockVtx.inc.c"
+};
+
+Gfx gFlatBlockDL[23] = {
+#include "assets/objects/gameplay_keep/gFlatBlockDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/flat_block_model.h b/assets/objects/gameplay_keep/flat_block_model.h
new file mode 100644
index 0000000000..4673479aab
--- /dev/null
+++ b/assets/objects/gameplay_keep/flat_block_model.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_FLAT_BLOCK_MODEL_H
+#define GAMEPLAY_KEEP_FLAT_BLOCK_MODEL_H
+
+#include "ultra64.h"
+
+extern Vtx gFlatBlockVtx[];
+extern Gfx gFlatBlockDL[23];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
new file mode 100644
index 0000000000..8115d2f474
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -0,0 +1,144 @@
+#ifndef GAMEPLAY_KEEP_H
+#define GAMEPLAY_KEEP_H
+
+#include "hilite_textures.h"
+#include "gameplay_keep_0x400.h"
+#include "link_textures.h"
+#include "player_pause_joint_tables.h"
+#include "player_anim_headers.h"
+#include "debug_models.h"
+#include "arrow_anims.h"
+#include "arrow_skel.h"
+#include "unk_eff_blure_tex.h"
+#include "bomb_body.h"
+#include "bomb_cap.h"
+#include "bombchu_body.h"
+#include "eff_bomb_explosion.h"
+#include "gameplay_keep_0xC0A0.h"
+#include "boomerang.h"
+#include "compass_arrow.h"
+#if OOT_REGION != REGION_EU
+#include "gameplay_keep_ntsc_0xC880.h"
+#endif
+#include "lock_on_arrow.h"
+#include "hilite3_tex.h"
+#include "gameplay_keep_0xCCC0.h"
+#if OOT_REGION != REGION_EU
+#include "gameplay_keep_ntsc_0xCE60.h"
+#endif
+#include "gameplay_keep_0xCDC0.h"
+#include "gameplay_keep_0xD0C0.h"
+#include "gameplay_keep_0xD4E0.h"
+#include "gameplay_keep_0xE4E0.h"
+#include "gameplay_keep_0xE5D0.h"
+#include "gameplay_keep_0xE770.h"
+#include "gameplay_keep_0xFF80.h"
+#include "eff_dust.h"
+#include "eff_flash.h"
+#include "gameplay_keep_0x11230.h"
+#include "gameplay_keep_0x13700.h"
+#include "fairy_anim.h"
+#include "fairy_skel.h"
+#include "gameplay_keep_0x16A50.h"
+#include "hilite4_tex.h"
+#include "gameplay_keep_0x173D0.h"
+#include "gameplay_keep_0x185A0.h"
+#include "gameplay_keep_0x18610.h"
+#include "gameplay_keep_0x18FF0.h"
+#include "eff_shockwave.h"
+#include "eff_bubble.h"
+#include "eff_fire_footprint.h"
+#include "unused_bubbles.h"
+#include "lens_mask_tex.h"
+#include "eff_hitmark.h"
+#include "gameplay_keep_0x21810.h"
+#include "gameplay_keep_0x23810.h"
+#include "gameplay_keep_0x244B0.h"
+#include "eff_spark_model.h"
+#include "gameplay_keep_0x255F0.h"
+#include "gameplay_keep_0x27E90.h"
+#include "eff_lightning.h"
+#include "eff_enemy_death_flame.h"
+#include "gameplay_keep_0x32090.h"
+#include "gameplay_keep_0x33090.h"
+#include "eff_ice_fragments.h"
+#include "gameplay_keep_0x33910.h"
+#include "gameplay_keep_0x34020.h"
+#include "gameplay_keep_0x355A0.h"
+#include "lens_flare.h"
+#include "gameplay_keep_0x37840.h"
+#include "hover_boots_circle.h"
+#include "moon.h"
+#include "gameplay_keep_0x38FB0.h"
+#if OOT_REGION != REGION_EU
+#include "gameplay_keep_ntsc_0x39850.h"
+#include "gameplay_keep_ntsc_0x39970.h"
+#include "gameplay_keep_ntsc_0x39A40.h"
+#include "gameplay_keep_ntsc_0x39B10.h"
+#endif
+#include "gameplay_keep_0x393B0.h"
+#include "liftable_rock_model.h"
+#include "gameplay_keep_0x39710.h"
+#include "gameplay_keep_0x39940.h"
+#include "flat_block_model.h"
+#include "gameplay_keep_0x39CC0.h"
+#include "gameplay_keep_0x39DF0.h"
+#include "small_flat_block_col.h"
+#include "gameplay_keep_0x3A150.h"
+#include "gameplay_keep_0x3A380.h"
+#include "small_cube_model.h"
+#include "small_cube_col.h"
+#include "tree_stump_model.h"
+#include "grass_blades_model.h"
+#include "gameplay_keep_0x3AC30.h"
+#include "heart_piece_interior_model.h"
+#include "gameplay_keep_0x3B1E0.h"
+#if OOT_REGION != REGION_EU
+#include "gameplay_keep_ntsc_0x3C610.h"
+#include "gameplay_keep_ntsc_0x3D220.h"
+#endif
+#include "rectangular_sign_model.h"
+#include "gameplay_keep_0x3C2E0.h"
+#include "gameplay_keep_0x3C870.h"
+#if OOT_REGION != REGION_EU
+#include "gameplay_keep_ntsc_0x3FD80.h"
+#endif
+#include "drop_recovery_heart_tex.h"
+#if OOT_REGION != REGION_EU
+#include "gameplay_keep_ntsc_0x41580.h"
+#endif
+#include "item_drop_dl.h"
+#include "gameplay_keep_0x3F140.h"
+#include "rupee.h"
+#if OOT_REGION != REGION_EU
+#include "item_drops_ntsc.h"
+#endif
+#include "rupee_light_red_tex.h"
+#if OOT_REGION != REGION_EU
+#include "gameplay_keep_ntsc_0x46A40.h"
+#endif
+#include "gameplay_keep_0x42530.h"
+#include "gameplay_keep_0x43530.h"
+#include "gameplay_keep_0x44530.h"
+#include "gameplay_keep_0x45530.h"
+#include "gameplay_keep_0x45D30.h"
+#include "sign_textures.h"
+#include "gameplay_keep_0x48130.h"
+#include "shadow_foot.h"
+#include "shadow_circle.h"
+#include "shadow_horse.h"
+#include "gameplay_keep_0x49F20.h"
+#include "gameplay_keep_0x4A090.h"
+#include "sun_textures.h"
+#include "sun_evening_textures.h"
+#include "gameplay_keep_0x4D160.h"
+#include "lock_on_reticle.h"
+#include "eff_fire.h"
+#include "gameplay_keep_0x4E660.h"
+#include "gameplay_keep_0x515B0.h"
+#include "dust_textures.h"
+#include "circle_glow_textures.h"
+#include "gameplay_keep_0x55DB0.h"
+#include "eff_spark_textures.h"
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x11230.c b/assets/objects/gameplay_keep/gameplay_keep_0x11230.c
new file mode 100644
index 0000000000..001dfc2bb4
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x11230.c
@@ -0,0 +1,58 @@
+#include "gameplay_keep_0x11230.h"
+#include "gfx.h"
+
+u64 gTorchFlameTex[TEX_LEN(u64, gTorchFlameTex_WIDTH, gTorchFlameTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gTorchFlameTex.i8.inc.c"
+};
+
+u64 gEffUnknown1Tex[TEX_LEN(u64, gEffUnknown1Tex_WIDTH, gEffUnknown1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown1Tex.i8.inc.c"
+};
+
+Vtx gSpinAttack1Vtx[] = {
+#include "assets/objects/gameplay_keep/gSpinAttack1Vtx.inc.c"
+};
+
+Vtx gSpinAttack2Vtx[] = {
+#include "assets/objects/gameplay_keep/gSpinAttack2Vtx.inc.c"
+};
+
+Gfx gSpinAttack1DL[36] = {
+#include "assets/objects/gameplay_keep/gSpinAttack1DL.inc.c"
+};
+
+Gfx gSpinAttack2DL[36] = {
+#include "assets/objects/gameplay_keep/gSpinAttack2DL.inc.c"
+};
+
+Vtx gSpinAttack3Vtx[] = {
+#include "assets/objects/gameplay_keep/gSpinAttack3Vtx.inc.c"
+};
+
+Vtx gSpinAttack4Vtx[] = {
+#include "assets/objects/gameplay_keep/gSpinAttack4Vtx.inc.c"
+};
+
+Gfx gSpinAttack3DL[36] = {
+#include "assets/objects/gameplay_keep/gSpinAttack3DL.inc.c"
+};
+
+Gfx gSpinAttack4DL[36] = {
+#include "assets/objects/gameplay_keep/gSpinAttack4DL.inc.c"
+};
+
+u64 gFlameWall1Tex[TEX_LEN(u64, gFlameWall1Tex_WIDTH, gFlameWall1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gFlameWall1Tex.i8.inc.c"
+};
+
+u64 gFlameWall2Tex[TEX_LEN(u64, gFlameWall2Tex_WIDTH, gFlameWall2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gFlameWall2Tex.i8.inc.c"
+};
+
+Vtx gSpinAttackChargingVtx[] = {
+#include "assets/objects/gameplay_keep/gSpinAttackChargingVtx.inc.c"
+};
+
+Gfx gSpinAttackChargingDL[29] = {
+#include "assets/objects/gameplay_keep/gSpinAttackChargingDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x11230.h b/assets/objects/gameplay_keep/gameplay_keep_0x11230.h
new file mode 100644
index 0000000000..6273d83f12
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x11230.h
@@ -0,0 +1,30 @@
+#ifndef GAMEPLAY_KEEP_0x11230_H
+#define GAMEPLAY_KEEP_0x11230_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gTorchFlameTex_WIDTH 64
+#define gTorchFlameTex_HEIGHT 32
+extern u64 gTorchFlameTex[TEX_LEN(u64, gTorchFlameTex_WIDTH, gTorchFlameTex_HEIGHT, 8)];
+#define gEffUnknown1Tex_WIDTH 64
+#define gEffUnknown1Tex_HEIGHT 32
+extern u64 gEffUnknown1Tex[TEX_LEN(u64, gEffUnknown1Tex_WIDTH, gEffUnknown1Tex_HEIGHT, 8)];
+extern Vtx gSpinAttack1Vtx[];
+extern Vtx gSpinAttack2Vtx[];
+extern Gfx gSpinAttack1DL[36];
+extern Gfx gSpinAttack2DL[36];
+extern Vtx gSpinAttack3Vtx[];
+extern Vtx gSpinAttack4Vtx[];
+extern Gfx gSpinAttack3DL[36];
+extern Gfx gSpinAttack4DL[36];
+#define gFlameWall1Tex_WIDTH 32
+#define gFlameWall1Tex_HEIGHT 32
+extern u64 gFlameWall1Tex[TEX_LEN(u64, gFlameWall1Tex_WIDTH, gFlameWall1Tex_HEIGHT, 8)];
+#define gFlameWall2Tex_WIDTH 32
+#define gFlameWall2Tex_HEIGHT 32
+extern u64 gFlameWall2Tex[TEX_LEN(u64, gFlameWall2Tex_WIDTH, gFlameWall2Tex_HEIGHT, 8)];
+extern Vtx gSpinAttackChargingVtx[];
+extern Gfx gSpinAttackChargingDL[29];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x13700.c b/assets/objects/gameplay_keep/gameplay_keep_0x13700.c
new file mode 100644
index 0000000000..ce20bdb126
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x13700.c
@@ -0,0 +1,18 @@
+#include "gameplay_keep_0x13700.h"
+#include "gfx.h"
+
+u64 gEffUnknown2Tex[TEX_LEN(u64, gEffUnknown2Tex_WIDTH, gEffUnknown2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown2Tex.i8.inc.c"
+};
+
+u64 gEffUnknown3Tex[TEX_LEN(u64, gEffUnknown3Tex_WIDTH, gEffUnknown3Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown3Tex.i8.inc.c"
+};
+
+Vtx gUnusedBeamBladeVtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedBeamBladeVtx.inc.c"
+};
+
+Gfx gUnusedBeamBladeDL[37] = {
+#include "assets/objects/gameplay_keep/gUnusedBeamBladeDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x13700.h b/assets/objects/gameplay_keep/gameplay_keep_0x13700.h
new file mode 100644
index 0000000000..0be46d522f
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x13700.h
@@ -0,0 +1,16 @@
+#ifndef GAMEPLAY_KEEP_0x13700_H
+#define GAMEPLAY_KEEP_0x13700_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffUnknown2Tex_WIDTH 32
+#define gEffUnknown2Tex_HEIGHT 64
+extern u64 gEffUnknown2Tex[TEX_LEN(u64, gEffUnknown2Tex_WIDTH, gEffUnknown2Tex_HEIGHT, 8)];
+#define gEffUnknown3Tex_WIDTH 32
+#define gEffUnknown3Tex_HEIGHT 64
+extern u64 gEffUnknown3Tex[TEX_LEN(u64, gEffUnknown3Tex_WIDTH, gEffUnknown3Tex_HEIGHT, 8)];
+extern Vtx gUnusedBeamBladeVtx[];
+extern Gfx gUnusedBeamBladeDL[37];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x16A50.c b/assets/objects/gameplay_keep/gameplay_keep_0x16A50.c
new file mode 100644
index 0000000000..97a2ab7565
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x16A50.c
@@ -0,0 +1,9 @@
+#include "gameplay_keep_0x16A50.h"
+
+u64 gUnknownCircle3Tex[TEX_LEN(u64, gUnknownCircle3Tex_WIDTH, gUnknownCircle3Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gUnknownCircle3Tex.i4.inc.c"
+};
+
+u64 gUnknownCircle4Tex[TEX_LEN(u64, gUnknownCircle4Tex_WIDTH, gUnknownCircle4Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownCircle4Tex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x16A50.h b/assets/objects/gameplay_keep/gameplay_keep_0x16A50.h
new file mode 100644
index 0000000000..f776aa9415
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x16A50.h
@@ -0,0 +1,14 @@
+#ifndef GAMEPLAY_KEEP_0x16A50_H
+#define GAMEPLAY_KEEP_0x16A50_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gUnknownCircle3Tex_WIDTH 16
+#define gUnknownCircle3Tex_HEIGHT 16
+extern u64 gUnknownCircle3Tex[TEX_LEN(u64, gUnknownCircle3Tex_WIDTH, gUnknownCircle3Tex_HEIGHT, 4)];
+#define gUnknownCircle4Tex_WIDTH 16
+#define gUnknownCircle4Tex_HEIGHT 16
+extern u64 gUnknownCircle4Tex[TEX_LEN(u64, gUnknownCircle4Tex_WIDTH, gUnknownCircle4Tex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x173D0.c b/assets/objects/gameplay_keep/gameplay_keep_0x173D0.c
new file mode 100644
index 0000000000..6d4fe6f8c6
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x173D0.c
@@ -0,0 +1,18 @@
+#include "gameplay_keep_0x173D0.h"
+#include "gfx.h"
+
+u64 gEffUnknown4Tex[TEX_LEN(u64, gEffUnknown4Tex_WIDTH, gEffUnknown4Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown4Tex.i8.inc.c"
+};
+
+u64 gEffUnknown5Tex[TEX_LEN(u64, gEffUnknown5Tex_WIDTH, gEffUnknown5Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown5Tex.i8.inc.c"
+};
+
+Vtx gEffFireCircleVtx[] = {
+#include "assets/objects/gameplay_keep/gEffFireCircleVtx.inc.c"
+};
+
+Gfx gEffFireCircleDL[30] = {
+#include "assets/objects/gameplay_keep/gEffFireCircleDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x173D0.h b/assets/objects/gameplay_keep/gameplay_keep_0x173D0.h
new file mode 100644
index 0000000000..b619eceaba
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x173D0.h
@@ -0,0 +1,16 @@
+#ifndef GAMEPLAY_KEEP_0x173D0_H
+#define GAMEPLAY_KEEP_0x173D0_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffUnknown4Tex_WIDTH 32
+#define gEffUnknown4Tex_HEIGHT 64
+extern u64 gEffUnknown4Tex[TEX_LEN(u64, gEffUnknown4Tex_WIDTH, gEffUnknown4Tex_HEIGHT, 8)];
+#define gEffUnknown5Tex_WIDTH 32
+#define gEffUnknown5Tex_HEIGHT 64
+extern u64 gEffUnknown5Tex[TEX_LEN(u64, gEffUnknown5Tex_WIDTH, gEffUnknown5Tex_HEIGHT, 8)];
+extern Vtx gEffFireCircleVtx[];
+extern Gfx gEffFireCircleDL[30];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x185A0.c b/assets/objects/gameplay_keep/gameplay_keep_0x185A0.c
new file mode 100644
index 0000000000..8282def3c0
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x185A0.c
@@ -0,0 +1,13 @@
+#include "gameplay_keep_0x185A0.h"
+
+s16 gFishOutOfWaterFrameData[] = {
+#include "assets/objects/gameplay_keep/gFishOutOfWaterFrameData.inc.c"
+};
+
+JointIndex gFishOutOfWaterJointIndices[] = {
+#include "assets/objects/gameplay_keep/gFishOutOfWaterJointIndices.inc.c"
+};
+
+AnimationHeader gFishOutOfWaterAnim = {
+#include "assets/objects/gameplay_keep/gFishOutOfWaterAnim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x185A0.h b/assets/objects/gameplay_keep/gameplay_keep_0x185A0.h
new file mode 100644
index 0000000000..38e851fd5e
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x185A0.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_0x185A0_H
+#define GAMEPLAY_KEEP_0x185A0_H
+
+#include "animation.h"
+
+extern s16 gFishOutOfWaterFrameData[];
+extern JointIndex gFishOutOfWaterJointIndices[];
+extern AnimationHeader gFishOutOfWaterAnim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18610.c b/assets/objects/gameplay_keep/gameplay_keep_0x18610.c
new file mode 100644
index 0000000000..5755cb6a8b
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x18610.c
@@ -0,0 +1,67 @@
+#include "gameplay_keep_0x18610.h"
+#include "array_count.h"
+#include "gfx.h"
+
+Vtx gameplay_keep_Vtx_018610[] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_018610.inc.c"
+};
+
+Vtx gameplay_keep_Vtx_018650[] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_018650.inc.c"
+};
+
+Vtx gameplay_keep_Vtx_018750[] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_018750.inc.c"
+};
+
+Gfx gameplay_keep_0188B0_DL[20] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_0188B0_DL.inc.c"
+};
+
+Gfx gameplay_keep_018950_DL[35] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_018950_DL.inc.c"
+};
+
+Gfx gameplay_keep_018A68_DL[35] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_018A68_DL.inc.c"
+};
+
+u64 gFishTailTex[TEX_LEN(u64, gFishTailTex_WIDTH, gFishTailTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gFishTailTex.rgba16.inc.c"
+};
+
+u64 gFishBodyTex[TEX_LEN(u64, gFishBodyTex_WIDTH, gFishBodyTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gFishBodyTex.rgba16.inc.c"
+};
+
+StandardLimb gFishSkelLimb0 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb0.inc.c"
+};
+
+StandardLimb gFishSkelLimb1 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb1.inc.c"
+};
+
+StandardLimb gFishSkelLimb2 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb2.inc.c"
+};
+
+StandardLimb gFishSkelLimb3 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb3.inc.c"
+};
+
+StandardLimb gFishSkelLimb4 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb4.inc.c"
+};
+
+StandardLimb gFishSkelLimb5 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb5.inc.c"
+};
+
+void* gFishLimbs[] = {
+#include "assets/objects/gameplay_keep/gFishLimbs.inc.c"
+};
+
+FlexSkeletonHeader gFishSkel = {
+#include "assets/objects/gameplay_keep/gFishSkel.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18610.h b/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
new file mode 100644
index 0000000000..4f9195201a
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
@@ -0,0 +1,39 @@
+#ifndef GAMEPLAY_KEEP_0x18610_H
+#define GAMEPLAY_KEEP_0x18610_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+#include "animation.h"
+
+extern Vtx gameplay_keep_Vtx_018610[];
+extern Vtx gameplay_keep_Vtx_018650[];
+extern Vtx gameplay_keep_Vtx_018750[];
+extern Gfx gameplay_keep_0188B0_DL[20];
+extern Gfx gameplay_keep_018950_DL[35];
+extern Gfx gameplay_keep_018A68_DL[35];
+#define gFishTailTex_WIDTH 16
+#define gFishTailTex_HEIGHT 16
+extern u64 gFishTailTex[TEX_LEN(u64, gFishTailTex_WIDTH, gFishTailTex_HEIGHT, 16)];
+#define gFishBodyTex_WIDTH 32
+#define gFishBodyTex_HEIGHT 8
+extern u64 gFishBodyTex[TEX_LEN(u64, gFishBodyTex_WIDTH, gFishBodyTex_HEIGHT, 16)];
+extern StandardLimb gFishSkelLimb0;
+extern StandardLimb gFishSkelLimb1;
+extern StandardLimb gFishSkelLimb2;
+extern StandardLimb gFishSkelLimb3;
+extern StandardLimb gFishSkelLimb4;
+extern StandardLimb gFishSkelLimb5;
+extern void* gFishLimbs[];
+typedef enum gFishSkelLimb {
+ /* 0 */ FISH_LIMB_NONE,
+ /* 1 */ FISH_LIMB_0,
+ /* 2 */ FISH_LIMB_1,
+ /* 3 */ FISH_LIMB_2,
+ /* 4 */ FISH_LIMB_3,
+ /* 5 */ FISH_LIMB_4,
+ /* 6 */ FISH_LIMB_5,
+ /* 7 */ FISH_LIMB_MAX
+} gFishSkelLimb;
+extern FlexSkeletonHeader gFishSkel;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.c b/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.c
new file mode 100644
index 0000000000..38408cf098
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.c
@@ -0,0 +1,13 @@
+#include "gameplay_keep_0x18FF0.h"
+
+s16 gFishInWaterFrameData[] = {
+#include "assets/objects/gameplay_keep/gFishInWaterFrameData.inc.c"
+};
+
+JointIndex gFishInWaterJointIndices[] = {
+#include "assets/objects/gameplay_keep/gFishInWaterJointIndices.inc.c"
+};
+
+AnimationHeader gFishInWaterAnim = {
+#include "assets/objects/gameplay_keep/gFishInWaterAnim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.h b/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.h
new file mode 100644
index 0000000000..33a6ce61f1
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_0x18FF0_H
+#define GAMEPLAY_KEEP_0x18FF0_H
+
+#include "animation.h"
+
+extern s16 gFishInWaterFrameData[];
+extern JointIndex gFishInWaterJointIndices[];
+extern AnimationHeader gFishInWaterAnim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x21810.c b/assets/objects/gameplay_keep/gameplay_keep_0x21810.c
new file mode 100644
index 0000000000..104dc63ce1
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x21810.c
@@ -0,0 +1,13 @@
+#include "gameplay_keep_0x21810.h"
+
+u64 gEffUnknown6Tex[TEX_LEN(u64, gEffUnknown6Tex_WIDTH, gEffUnknown6Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown6Tex.i8.inc.c"
+};
+
+u64 gEffFleckTex[TEX_LEN(u64, gEffFleckTex_WIDTH, gEffFleckTex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffFleckTex.i4.inc.c"
+};
+
+u64 gEffUnknown8Tex[TEX_LEN(u64, gEffUnknown8Tex_WIDTH, gEffUnknown8Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown8Tex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x21810.h b/assets/objects/gameplay_keep/gameplay_keep_0x21810.h
new file mode 100644
index 0000000000..f105776ebd
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x21810.h
@@ -0,0 +1,17 @@
+#ifndef GAMEPLAY_KEEP_0x21810_H
+#define GAMEPLAY_KEEP_0x21810_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffUnknown6Tex_WIDTH 32
+#define gEffUnknown6Tex_HEIGHT 64
+extern u64 gEffUnknown6Tex[TEX_LEN(u64, gEffUnknown6Tex_WIDTH, gEffUnknown6Tex_HEIGHT, 8)];
+#define gEffFleckTex_WIDTH 64
+#define gEffFleckTex_HEIGHT 64
+extern u64 gEffFleckTex[TEX_LEN(u64, gEffFleckTex_WIDTH, gEffFleckTex_HEIGHT, 4)];
+#define gEffUnknown8Tex_WIDTH 64
+#define gEffUnknown8Tex_HEIGHT 64
+extern u64 gEffUnknown8Tex[TEX_LEN(u64, gEffUnknown8Tex_WIDTH, gEffUnknown8Tex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x23810.c b/assets/objects/gameplay_keep/gameplay_keep_0x23810.c
new file mode 100644
index 0000000000..74666a6494
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x23810.c
@@ -0,0 +1,42 @@
+#include "gameplay_keep_0x23810.h"
+#include "gfx.h"
+
+u64 gEffMagmaBubble1Tex[TEX_LEN(u64, gEffMagmaBubble1Tex_WIDTH, gEffMagmaBubble1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffMagmaBubble1Tex.ia8.inc.c"
+};
+
+u64 gEffMagmaBubble2Tex[TEX_LEN(u64, gEffMagmaBubble2Tex_WIDTH, gEffMagmaBubble2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffMagmaBubble2Tex.ia8.inc.c"
+};
+
+u64 gEffMagmaBubble3Tex[TEX_LEN(u64, gEffMagmaBubble3Tex_WIDTH, gEffMagmaBubble3Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffMagmaBubble3Tex.ia8.inc.c"
+};
+
+u64 gEffMagmaBubble4Tex[TEX_LEN(u64, gEffMagmaBubble4Tex_WIDTH, gEffMagmaBubble4Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffMagmaBubble4Tex.ia8.inc.c"
+};
+
+u64 gEffMagmaBubble5Tex[TEX_LEN(u64, gEffMagmaBubble5Tex_WIDTH, gEffMagmaBubble5Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffMagmaBubble5Tex.ia8.inc.c"
+};
+
+u64 gEffMagmaBubble6Tex[TEX_LEN(u64, gEffMagmaBubble6Tex_WIDTH, gEffMagmaBubble6Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffMagmaBubble6Tex.ia8.inc.c"
+};
+
+u64 gEffMagmaBubble7Tex[TEX_LEN(u64, gEffMagmaBubble7Tex_WIDTH, gEffMagmaBubble7Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffMagmaBubble7Tex.ia8.inc.c"
+};
+
+u64 gEffMagmaBubble8Tex[TEX_LEN(u64, gEffMagmaBubble8Tex_WIDTH, gEffMagmaBubble8Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffMagmaBubble8Tex.ia8.inc.c"
+};
+
+Gfx gEffMagmaBubbleDL[12] = {
+#include "assets/objects/gameplay_keep/gEffMagmaBubbleDL.inc.c"
+};
+
+Vtx gEffMagmaBubbleVtx[] = {
+#include "assets/objects/gameplay_keep/gEffMagmaBubbleVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x23810.h b/assets/objects/gameplay_keep/gameplay_keep_0x23810.h
new file mode 100644
index 0000000000..da31e96296
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x23810.h
@@ -0,0 +1,34 @@
+#ifndef GAMEPLAY_KEEP_0x23810_H
+#define GAMEPLAY_KEEP_0x23810_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffMagmaBubble1Tex_WIDTH 16
+#define gEffMagmaBubble1Tex_HEIGHT 24
+extern u64 gEffMagmaBubble1Tex[TEX_LEN(u64, gEffMagmaBubble1Tex_WIDTH, gEffMagmaBubble1Tex_HEIGHT, 8)];
+#define gEffMagmaBubble2Tex_WIDTH 16
+#define gEffMagmaBubble2Tex_HEIGHT 24
+extern u64 gEffMagmaBubble2Tex[TEX_LEN(u64, gEffMagmaBubble2Tex_WIDTH, gEffMagmaBubble2Tex_HEIGHT, 8)];
+#define gEffMagmaBubble3Tex_WIDTH 16
+#define gEffMagmaBubble3Tex_HEIGHT 24
+extern u64 gEffMagmaBubble3Tex[TEX_LEN(u64, gEffMagmaBubble3Tex_WIDTH, gEffMagmaBubble3Tex_HEIGHT, 8)];
+#define gEffMagmaBubble4Tex_WIDTH 16
+#define gEffMagmaBubble4Tex_HEIGHT 24
+extern u64 gEffMagmaBubble4Tex[TEX_LEN(u64, gEffMagmaBubble4Tex_WIDTH, gEffMagmaBubble4Tex_HEIGHT, 8)];
+#define gEffMagmaBubble5Tex_WIDTH 16
+#define gEffMagmaBubble5Tex_HEIGHT 24
+extern u64 gEffMagmaBubble5Tex[TEX_LEN(u64, gEffMagmaBubble5Tex_WIDTH, gEffMagmaBubble5Tex_HEIGHT, 8)];
+#define gEffMagmaBubble6Tex_WIDTH 16
+#define gEffMagmaBubble6Tex_HEIGHT 24
+extern u64 gEffMagmaBubble6Tex[TEX_LEN(u64, gEffMagmaBubble6Tex_WIDTH, gEffMagmaBubble6Tex_HEIGHT, 8)];
+#define gEffMagmaBubble7Tex_WIDTH 16
+#define gEffMagmaBubble7Tex_HEIGHT 24
+extern u64 gEffMagmaBubble7Tex[TEX_LEN(u64, gEffMagmaBubble7Tex_WIDTH, gEffMagmaBubble7Tex_HEIGHT, 8)];
+#define gEffMagmaBubble8Tex_WIDTH 16
+#define gEffMagmaBubble8Tex_HEIGHT 24
+extern u64 gEffMagmaBubble8Tex[TEX_LEN(u64, gEffMagmaBubble8Tex_WIDTH, gEffMagmaBubble8Tex_HEIGHT, 8)];
+extern Gfx gEffMagmaBubbleDL[12];
+extern Vtx gEffMagmaBubbleVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x244B0.c b/assets/objects/gameplay_keep/gameplay_keep_0x244B0.c
new file mode 100644
index 0000000000..4de9421ba0
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x244B0.c
@@ -0,0 +1,14 @@
+#include "gameplay_keep_0x244B0.h"
+#include "gfx.h"
+
+u64 gEffWaterRippleTex[TEX_LEN(u64, gEffWaterRippleTex_WIDTH, gEffWaterRippleTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffWaterRippleTex.i8.inc.c"
+};
+
+Gfx gEffWaterRippleDL[12] = {
+#include "assets/objects/gameplay_keep/gEffWaterRippleDL.inc.c"
+};
+
+Vtx gEffWaterRippleVtx[] = {
+#include "assets/objects/gameplay_keep/gEffWaterRippleVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x244B0.h b/assets/objects/gameplay_keep/gameplay_keep_0x244B0.h
new file mode 100644
index 0000000000..91b8b4e29c
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x244B0.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_0x244B0_H
+#define GAMEPLAY_KEEP_0x244B0_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffWaterRippleTex_WIDTH 64
+#define gEffWaterRippleTex_HEIGHT 64
+extern u64 gEffWaterRippleTex[TEX_LEN(u64, gEffWaterRippleTex_WIDTH, gEffWaterRippleTex_HEIGHT, 8)];
+extern Gfx gEffWaterRippleDL[12];
+extern Vtx gEffWaterRippleVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x255F0.c b/assets/objects/gameplay_keep/gameplay_keep_0x255F0.c
new file mode 100644
index 0000000000..5f518dde8d
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x255F0.c
@@ -0,0 +1,42 @@
+#include "gameplay_keep_0x255F0.h"
+#include "gfx.h"
+
+u64 gEffWaterSplash1Tex[TEX_LEN(u64, gEffWaterSplash1Tex_WIDTH, gEffWaterSplash1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffWaterSplash1Tex.i8.inc.c"
+};
+
+u64 gEffWaterSplash2Tex[TEX_LEN(u64, gEffWaterSplash2Tex_WIDTH, gEffWaterSplash2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffWaterSplash2Tex.i8.inc.c"
+};
+
+u64 gEffWaterSplash3Tex[TEX_LEN(u64, gEffWaterSplash3Tex_WIDTH, gEffWaterSplash3Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffWaterSplash3Tex.i8.inc.c"
+};
+
+u64 gEffWaterSplash4Tex[TEX_LEN(u64, gEffWaterSplash4Tex_WIDTH, gEffWaterSplash4Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffWaterSplash4Tex.i8.inc.c"
+};
+
+u64 gEffWaterSplash5Tex[TEX_LEN(u64, gEffWaterSplash5Tex_WIDTH, gEffWaterSplash5Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffWaterSplash5Tex.i8.inc.c"
+};
+
+u64 gEffWaterSplash6Tex[TEX_LEN(u64, gEffWaterSplash6Tex_WIDTH, gEffWaterSplash6Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffWaterSplash6Tex.i8.inc.c"
+};
+
+u64 gEffWaterSplash7Tex[TEX_LEN(u64, gEffWaterSplash7Tex_WIDTH, gEffWaterSplash7Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffWaterSplash7Tex.i8.inc.c"
+};
+
+u64 gEffWaterSplash8Tex[TEX_LEN(u64, gEffWaterSplash8Tex_WIDTH, gEffWaterSplash8Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffWaterSplash8Tex.i8.inc.c"
+};
+
+Gfx gEffWaterSplashDL[12] = {
+#include "assets/objects/gameplay_keep/gEffWaterSplashDL.inc.c"
+};
+
+Vtx gEffWaterSplashVtx[] = {
+#include "assets/objects/gameplay_keep/gEffWaterSplashVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x255F0.h b/assets/objects/gameplay_keep/gameplay_keep_0x255F0.h
new file mode 100644
index 0000000000..00d02bc90d
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x255F0.h
@@ -0,0 +1,34 @@
+#ifndef GAMEPLAY_KEEP_0x255F0_H
+#define GAMEPLAY_KEEP_0x255F0_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffWaterSplash1Tex_WIDTH 32
+#define gEffWaterSplash1Tex_HEIGHT 40
+extern u64 gEffWaterSplash1Tex[TEX_LEN(u64, gEffWaterSplash1Tex_WIDTH, gEffWaterSplash1Tex_HEIGHT, 8)];
+#define gEffWaterSplash2Tex_WIDTH 32
+#define gEffWaterSplash2Tex_HEIGHT 40
+extern u64 gEffWaterSplash2Tex[TEX_LEN(u64, gEffWaterSplash2Tex_WIDTH, gEffWaterSplash2Tex_HEIGHT, 8)];
+#define gEffWaterSplash3Tex_WIDTH 32
+#define gEffWaterSplash3Tex_HEIGHT 40
+extern u64 gEffWaterSplash3Tex[TEX_LEN(u64, gEffWaterSplash3Tex_WIDTH, gEffWaterSplash3Tex_HEIGHT, 8)];
+#define gEffWaterSplash4Tex_WIDTH 32
+#define gEffWaterSplash4Tex_HEIGHT 40
+extern u64 gEffWaterSplash4Tex[TEX_LEN(u64, gEffWaterSplash4Tex_WIDTH, gEffWaterSplash4Tex_HEIGHT, 8)];
+#define gEffWaterSplash5Tex_WIDTH 32
+#define gEffWaterSplash5Tex_HEIGHT 40
+extern u64 gEffWaterSplash5Tex[TEX_LEN(u64, gEffWaterSplash5Tex_WIDTH, gEffWaterSplash5Tex_HEIGHT, 8)];
+#define gEffWaterSplash6Tex_WIDTH 32
+#define gEffWaterSplash6Tex_HEIGHT 40
+extern u64 gEffWaterSplash6Tex[TEX_LEN(u64, gEffWaterSplash6Tex_WIDTH, gEffWaterSplash6Tex_HEIGHT, 8)];
+#define gEffWaterSplash7Tex_WIDTH 32
+#define gEffWaterSplash7Tex_HEIGHT 40
+extern u64 gEffWaterSplash7Tex[TEX_LEN(u64, gEffWaterSplash7Tex_WIDTH, gEffWaterSplash7Tex_HEIGHT, 8)];
+#define gEffWaterSplash8Tex_WIDTH 32
+#define gEffWaterSplash8Tex_HEIGHT 40
+extern u64 gEffWaterSplash8Tex[TEX_LEN(u64, gEffWaterSplash8Tex_WIDTH, gEffWaterSplash8Tex_HEIGHT, 8)];
+extern Gfx gEffWaterSplashDL[12];
+extern Vtx gEffWaterSplashVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x27E90.c b/assets/objects/gameplay_keep/gameplay_keep_0x27E90.c
new file mode 100644
index 0000000000..555e5c95c8
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x27E90.c
@@ -0,0 +1,42 @@
+#include "gameplay_keep_0x27E90.h"
+#include "gfx.h"
+
+u64 gUnknownEffStone1Tex[TEX_LEN(u64, gUnknownEffStone1Tex_WIDTH, gUnknownEffStone1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownEffStone1Tex.ia8.inc.c"
+};
+
+u64 gUnknownEffStone2Tex[TEX_LEN(u64, gUnknownEffStone2Tex_WIDTH, gUnknownEffStone2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownEffStone2Tex.ia8.inc.c"
+};
+
+u64 gUnknownEffStone3Tex[TEX_LEN(u64, gUnknownEffStone3Tex_WIDTH, gUnknownEffStone3Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownEffStone3Tex.ia8.inc.c"
+};
+
+u64 gUnknownEffStone4Tex[TEX_LEN(u64, gUnknownEffStone4Tex_WIDTH, gUnknownEffStone4Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownEffStone4Tex.ia8.inc.c"
+};
+
+u64 gUnknownEffStone5Tex[TEX_LEN(u64, gUnknownEffStone5Tex_WIDTH, gUnknownEffStone5Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownEffStone5Tex.ia8.inc.c"
+};
+
+u64 gUnknownEffStone6Tex[TEX_LEN(u64, gUnknownEffStone6Tex_WIDTH, gUnknownEffStone6Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownEffStone6Tex.ia8.inc.c"
+};
+
+u64 gUnknownEffStone7Tex[TEX_LEN(u64, gUnknownEffStone7Tex_WIDTH, gUnknownEffStone7Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownEffStone7Tex.ia8.inc.c"
+};
+
+u64 gUnknownEffStone8Tex[TEX_LEN(u64, gUnknownEffStone8Tex_WIDTH, gUnknownEffStone8Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownEffStone8Tex.ia8.inc.c"
+};
+
+Gfx gUnknownEffStoneDL[12] = {
+#include "assets/objects/gameplay_keep/gUnknownEffStoneDL.inc.c"
+};
+
+Vtx gUnknownEffStoneVtx[] = {
+#include "assets/objects/gameplay_keep/gUnknownEffStoneVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x27E90.h b/assets/objects/gameplay_keep/gameplay_keep_0x27E90.h
new file mode 100644
index 0000000000..bb56e05472
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x27E90.h
@@ -0,0 +1,34 @@
+#ifndef GAMEPLAY_KEEP_0x27E90_H
+#define GAMEPLAY_KEEP_0x27E90_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gUnknownEffStone1Tex_WIDTH 32
+#define gUnknownEffStone1Tex_HEIGHT 32
+extern u64 gUnknownEffStone1Tex[TEX_LEN(u64, gUnknownEffStone1Tex_WIDTH, gUnknownEffStone1Tex_HEIGHT, 8)];
+#define gUnknownEffStone2Tex_WIDTH 32
+#define gUnknownEffStone2Tex_HEIGHT 32
+extern u64 gUnknownEffStone2Tex[TEX_LEN(u64, gUnknownEffStone2Tex_WIDTH, gUnknownEffStone2Tex_HEIGHT, 8)];
+#define gUnknownEffStone3Tex_WIDTH 32
+#define gUnknownEffStone3Tex_HEIGHT 32
+extern u64 gUnknownEffStone3Tex[TEX_LEN(u64, gUnknownEffStone3Tex_WIDTH, gUnknownEffStone3Tex_HEIGHT, 8)];
+#define gUnknownEffStone4Tex_WIDTH 32
+#define gUnknownEffStone4Tex_HEIGHT 32
+extern u64 gUnknownEffStone4Tex[TEX_LEN(u64, gUnknownEffStone4Tex_WIDTH, gUnknownEffStone4Tex_HEIGHT, 8)];
+#define gUnknownEffStone5Tex_WIDTH 32
+#define gUnknownEffStone5Tex_HEIGHT 32
+extern u64 gUnknownEffStone5Tex[TEX_LEN(u64, gUnknownEffStone5Tex_WIDTH, gUnknownEffStone5Tex_HEIGHT, 8)];
+#define gUnknownEffStone6Tex_WIDTH 32
+#define gUnknownEffStone6Tex_HEIGHT 32
+extern u64 gUnknownEffStone6Tex[TEX_LEN(u64, gUnknownEffStone6Tex_WIDTH, gUnknownEffStone6Tex_HEIGHT, 8)];
+#define gUnknownEffStone7Tex_WIDTH 32
+#define gUnknownEffStone7Tex_HEIGHT 32
+extern u64 gUnknownEffStone7Tex[TEX_LEN(u64, gUnknownEffStone7Tex_WIDTH, gUnknownEffStone7Tex_HEIGHT, 8)];
+#define gUnknownEffStone8Tex_WIDTH 32
+#define gUnknownEffStone8Tex_HEIGHT 32
+extern u64 gUnknownEffStone8Tex[TEX_LEN(u64, gUnknownEffStone8Tex_WIDTH, gUnknownEffStone8Tex_HEIGHT, 8)];
+extern Gfx gUnknownEffStoneDL[12];
+extern Vtx gUnknownEffStoneVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x32090.c b/assets/objects/gameplay_keep/gameplay_keep_0x32090.c
new file mode 100644
index 0000000000..532d5b3f22
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x32090.c
@@ -0,0 +1,17 @@
+#include "gameplay_keep_0x32090.h"
+
+u64 gEffUnknown9Tex[TEX_LEN(u64, gEffUnknown9Tex_WIDTH, gEffUnknown9Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown9Tex.i8.inc.c"
+};
+
+u64 gEffUnknown10Tex[TEX_LEN(u64, gEffUnknown10Tex_WIDTH, gEffUnknown10Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown10Tex.i8.inc.c"
+};
+
+u64 gEffUnknown11Tex[TEX_LEN(u64, gEffUnknown11Tex_WIDTH, gEffUnknown11Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown11Tex.i8.inc.c"
+};
+
+u64 gEffUnknown12Tex[TEX_LEN(u64, gEffUnknown12Tex_WIDTH, gEffUnknown12Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown12Tex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x32090.h b/assets/objects/gameplay_keep/gameplay_keep_0x32090.h
new file mode 100644
index 0000000000..d3b6472e8e
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x32090.h
@@ -0,0 +1,20 @@
+#ifndef GAMEPLAY_KEEP_0x32090_H
+#define GAMEPLAY_KEEP_0x32090_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffUnknown9Tex_WIDTH 32
+#define gEffUnknown9Tex_HEIGHT 32
+extern u64 gEffUnknown9Tex[TEX_LEN(u64, gEffUnknown9Tex_WIDTH, gEffUnknown9Tex_HEIGHT, 8)];
+#define gEffUnknown10Tex_WIDTH 32
+#define gEffUnknown10Tex_HEIGHT 32
+extern u64 gEffUnknown10Tex[TEX_LEN(u64, gEffUnknown10Tex_WIDTH, gEffUnknown10Tex_HEIGHT, 8)];
+#define gEffUnknown11Tex_WIDTH 32
+#define gEffUnknown11Tex_HEIGHT 32
+extern u64 gEffUnknown11Tex[TEX_LEN(u64, gEffUnknown11Tex_WIDTH, gEffUnknown11Tex_HEIGHT, 8)];
+#define gEffUnknown12Tex_WIDTH 32
+#define gEffUnknown12Tex_HEIGHT 32
+extern u64 gEffUnknown12Tex[TEX_LEN(u64, gEffUnknown12Tex_WIDTH, gEffUnknown12Tex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x33090.c b/assets/objects/gameplay_keep/gameplay_keep_0x33090.c
new file mode 100644
index 0000000000..637fb4e8c7
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x33090.c
@@ -0,0 +1,5 @@
+#include "gameplay_keep_0x33090.h"
+
+u64 gUnknownWoodBoardTex[TEX_LEN(u64, gUnknownWoodBoardTex_WIDTH, gUnknownWoodBoardTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownWoodBoardTex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x33090.h b/assets/objects/gameplay_keep/gameplay_keep_0x33090.h
new file mode 100644
index 0000000000..9057495b6d
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x33090.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_0x33090_H
+#define GAMEPLAY_KEEP_0x33090_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gUnknownWoodBoardTex_WIDTH 32
+#define gUnknownWoodBoardTex_HEIGHT 32
+extern u64 gUnknownWoodBoardTex[TEX_LEN(u64, gUnknownWoodBoardTex_WIDTH, gUnknownWoodBoardTex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x33910.c b/assets/objects/gameplay_keep/gameplay_keep_0x33910.c
new file mode 100644
index 0000000000..6600ba78b1
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x33910.c
@@ -0,0 +1,11 @@
+#include "gameplay_keep_0x33910.h"
+#include "gameplay_keep_0x32090.h"
+#include "gfx.h"
+
+Vtx gEffIceFragment3Vtx[] = {
+#include "assets/objects/gameplay_keep/gEffIceFragment3Vtx.inc.c"
+};
+
+Gfx gEffIceFragment3DL[46] = {
+#include "assets/objects/gameplay_keep/gEffIceFragment3DL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x33910.h b/assets/objects/gameplay_keep/gameplay_keep_0x33910.h
new file mode 100644
index 0000000000..f72f68ce8e
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x33910.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_0x33910_H
+#define GAMEPLAY_KEEP_0x33910_H
+
+#include "ultra64.h"
+
+extern Vtx gEffIceFragment3Vtx[];
+extern Gfx gEffIceFragment3DL[46];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.c b/assets/objects/gameplay_keep/gameplay_keep_0x34020.c
new file mode 100644
index 0000000000..d16c4bd9c9
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x34020.c
@@ -0,0 +1,267 @@
+#include "gameplay_keep_0x34020.h"
+#include "array_count.h"
+#include "gfx.h"
+
+s16 gBugCrawlFrameData[] = {
+#include "assets/objects/gameplay_keep/gBugCrawlFrameData.inc.c"
+};
+
+JointIndex gBugCrawlJointIndices[] = {
+#include "assets/objects/gameplay_keep/gBugCrawlJointIndices.inc.c"
+};
+
+AnimationHeader gBugCrawlAnim = {
+#include "assets/objects/gameplay_keep/gBugCrawlAnim.inc.c"
+};
+
+Gfx gBugLimb1DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb1DL.inc.c"
+};
+
+Gfx gBugLimb1WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb1WrapperDL.inc.c"
+};
+
+Gfx gBugLimb1WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb1WrapperWrapperDL.inc.c"
+};
+
+Vtx gBugLimb1Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb1Vtx.inc.c"
+};
+
+Gfx gBugLimb2DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb2DL.inc.c"
+};
+
+Gfx gBugLimb2WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb2WrapperDL.inc.c"
+};
+
+Gfx gBugLimb2WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb2WrapperWrapperDL.inc.c"
+};
+
+Vtx gBugLimb2Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb2Vtx.inc.c"
+};
+
+Gfx gBugLimb3DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb3DL.inc.c"
+};
+
+Gfx gBugLimb3WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb3WrapperDL.inc.c"
+};
+
+Gfx gBugLimb3WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb3WrapperWrapperDL.inc.c"
+};
+
+Vtx gBugLimb3Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb3Vtx.inc.c"
+};
+
+Gfx gBugLimb4DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb4DL.inc.c"
+};
+
+Gfx gBugLimb4WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb4WrapperDL.inc.c"
+};
+
+Gfx gBugLimb4WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb4WrapperWrapperDL.inc.c"
+};
+
+Vtx gBugLimb4Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb4Vtx.inc.c"
+};
+
+Gfx gBugLimb5DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb5DL.inc.c"
+};
+
+Gfx gBugLimb5WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb5WrapperDL.inc.c"
+};
+
+Gfx gBugLimb5WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb5WrapperWrapperDL.inc.c"
+};
+
+Vtx gBugLimb5Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb5Vtx.inc.c"
+};
+
+Gfx gBugLimb6DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb6DL.inc.c"
+};
+
+Gfx gBugLimb6WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb6WrapperDL.inc.c"
+};
+
+Gfx gBugLimb6WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb6WrapperWrapperDL.inc.c"
+};
+
+Vtx gBugLimb6Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb6Vtx.inc.c"
+};
+
+Gfx gBugLimb7DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb7DL.inc.c"
+};
+
+Gfx gBugLimb7WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb7WrapperDL.inc.c"
+};
+
+Gfx gBugLimb7WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb7WrapperWrapperDL.inc.c"
+};
+
+Vtx gBugLimb7Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb7Vtx.inc.c"
+};
+
+Gfx gBugLimb8DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb8DL.inc.c"
+};
+
+Gfx gBugLimb8WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb8WrapperDL.inc.c"
+};
+
+Gfx gBugLimb8WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb8WrapperWrapperDL.inc.c"
+};
+
+Vtx gBugLimb8Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb8Vtx.inc.c"
+};
+
+Gfx gBugLimb9DL[22] = {
+#include "assets/objects/gameplay_keep/gBugLimb9DL.inc.c"
+};
+
+Gfx gBugLimb9WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb9WrapperDL.inc.c"
+};
+
+Gfx gBugLimb9WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb9WrapperWrapperDL.inc.c"
+};
+
+Vtx gBugLimb9Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb9Vtx.inc.c"
+};
+
+u64 gBugBodyTex[TEX_LEN(u64, gBugBodyTex_WIDTH, gBugBodyTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gBugBodyTex.rgba16.inc.c"
+};
+
+u64 gBugLegTex[TEX_LEN(u64, gBugLegTex_WIDTH, gBugLegTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gBugLegTex.rgba16.inc.c"
+};
+
+StandardLimb gBugSkelLimb0 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb0.inc.c"
+};
+
+StandardLimb gBugSkelLimb1 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb1.inc.c"
+};
+
+StandardLimb gBugSkelLimb2 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb2.inc.c"
+};
+
+StandardLimb gBugSkelLimb3 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb3.inc.c"
+};
+
+StandardLimb gBugSkelLimb4 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb4.inc.c"
+};
+
+StandardLimb gBugSkelLimb5 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb5.inc.c"
+};
+
+StandardLimb gBugSkelLimb6 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb6.inc.c"
+};
+
+StandardLimb gBugSkelLimb7 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb7.inc.c"
+};
+
+StandardLimb gBugSkelLimb8 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb8.inc.c"
+};
+
+StandardLimb gBugSkelLimb9 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb9.inc.c"
+};
+
+StandardLimb gBugSkelLimb10 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb10.inc.c"
+};
+
+StandardLimb gBugSkelLimb11 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb11.inc.c"
+};
+
+StandardLimb gBugSkelLimb12 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb12.inc.c"
+};
+
+StandardLimb gBugSkelLimb13 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb13.inc.c"
+};
+
+StandardLimb gBugSkelLimb14 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb14.inc.c"
+};
+
+StandardLimb gBugSkelLimb15 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb15.inc.c"
+};
+
+StandardLimb gBugSkelLimb16 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb16.inc.c"
+};
+
+StandardLimb gBugSkelLimb17 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb17.inc.c"
+};
+
+StandardLimb gBugSkelLimb18 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb18.inc.c"
+};
+
+StandardLimb gBugSkelLimb19 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb19.inc.c"
+};
+
+StandardLimb gBugSkelLimb20 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb20.inc.c"
+};
+
+StandardLimb gBugSkelLimb21 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb21.inc.c"
+};
+
+StandardLimb gBugSkelLimb22 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb22.inc.c"
+};
+
+void* gBugLimbs[] = {
+#include "assets/objects/gameplay_keep/gBugLimbs.inc.c"
+};
+
+SkeletonHeader gBugSkel = {
+#include "assets/objects/gameplay_keep/gBugSkel.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h b/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
new file mode 100644
index 0000000000..e2d4a72f7b
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
@@ -0,0 +1,106 @@
+#ifndef GAMEPLAY_KEEP_0x34020_H
+#define GAMEPLAY_KEEP_0x34020_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+#include "animation.h"
+
+extern s16 gBugCrawlFrameData[];
+extern JointIndex gBugCrawlJointIndices[];
+extern AnimationHeader gBugCrawlAnim;
+extern Gfx gBugLimb1DL[20];
+extern Gfx gBugLimb1WrapperDL[2];
+extern Gfx gBugLimb1WrapperWrapperDL[2];
+extern Vtx gBugLimb1Vtx[];
+extern Gfx gBugLimb2DL[20];
+extern Gfx gBugLimb2WrapperDL[2];
+extern Gfx gBugLimb2WrapperWrapperDL[2];
+extern Vtx gBugLimb2Vtx[];
+extern Gfx gBugLimb3DL[20];
+extern Gfx gBugLimb3WrapperDL[2];
+extern Gfx gBugLimb3WrapperWrapperDL[2];
+extern Vtx gBugLimb3Vtx[];
+extern Gfx gBugLimb4DL[20];
+extern Gfx gBugLimb4WrapperDL[2];
+extern Gfx gBugLimb4WrapperWrapperDL[2];
+extern Vtx gBugLimb4Vtx[];
+extern Gfx gBugLimb5DL[20];
+extern Gfx gBugLimb5WrapperDL[2];
+extern Gfx gBugLimb5WrapperWrapperDL[2];
+extern Vtx gBugLimb5Vtx[];
+extern Gfx gBugLimb6DL[20];
+extern Gfx gBugLimb6WrapperDL[2];
+extern Gfx gBugLimb6WrapperWrapperDL[2];
+extern Vtx gBugLimb6Vtx[];
+extern Gfx gBugLimb7DL[20];
+extern Gfx gBugLimb7WrapperDL[2];
+extern Gfx gBugLimb7WrapperWrapperDL[2];
+extern Vtx gBugLimb7Vtx[];
+extern Gfx gBugLimb8DL[20];
+extern Gfx gBugLimb8WrapperDL[2];
+extern Gfx gBugLimb8WrapperWrapperDL[2];
+extern Vtx gBugLimb8Vtx[];
+extern Gfx gBugLimb9DL[22];
+extern Gfx gBugLimb9WrapperDL[2];
+extern Gfx gBugLimb9WrapperWrapperDL[2];
+extern Vtx gBugLimb9Vtx[];
+#define gBugBodyTex_WIDTH 16
+#define gBugBodyTex_HEIGHT 64
+extern u64 gBugBodyTex[TEX_LEN(u64, gBugBodyTex_WIDTH, gBugBodyTex_HEIGHT, 16)];
+#define gBugLegTex_WIDTH 8
+#define gBugLegTex_HEIGHT 16
+extern u64 gBugLegTex[TEX_LEN(u64, gBugLegTex_WIDTH, gBugLegTex_HEIGHT, 16)];
+extern StandardLimb gBugSkelLimb0;
+extern StandardLimb gBugSkelLimb1;
+extern StandardLimb gBugSkelLimb2;
+extern StandardLimb gBugSkelLimb3;
+extern StandardLimb gBugSkelLimb4;
+extern StandardLimb gBugSkelLimb5;
+extern StandardLimb gBugSkelLimb6;
+extern StandardLimb gBugSkelLimb7;
+extern StandardLimb gBugSkelLimb8;
+extern StandardLimb gBugSkelLimb9;
+extern StandardLimb gBugSkelLimb10;
+extern StandardLimb gBugSkelLimb11;
+extern StandardLimb gBugSkelLimb12;
+extern StandardLimb gBugSkelLimb13;
+extern StandardLimb gBugSkelLimb14;
+extern StandardLimb gBugSkelLimb15;
+extern StandardLimb gBugSkelLimb16;
+extern StandardLimb gBugSkelLimb17;
+extern StandardLimb gBugSkelLimb18;
+extern StandardLimb gBugSkelLimb19;
+extern StandardLimb gBugSkelLimb20;
+extern StandardLimb gBugSkelLimb21;
+extern StandardLimb gBugSkelLimb22;
+extern void* gBugLimbs[];
+typedef enum gBugSkelLimb {
+ /* 0 */ BUG_LIMB_NONE,
+ /* 1 */ BUG_LIMB_0,
+ /* 2 */ BUG_LIMB_1,
+ /* 3 */ BUG_LIMB_2,
+ /* 4 */ BUG_LIMB_3,
+ /* 5 */ BUG_LIMB_4,
+ /* 6 */ BUG_LIMB_5,
+ /* 7 */ BUG_LIMB_6,
+ /* 8 */ BUG_LIMB_7,
+ /* 9 */ BUG_LIMB_8,
+ /* 10 */ BUG_LIMB_9,
+ /* 11 */ BUG_LIMB_10,
+ /* 12 */ BUG_LIMB_11,
+ /* 13 */ BUG_LIMB_12,
+ /* 14 */ BUG_LIMB_13,
+ /* 15 */ BUG_LIMB_14,
+ /* 16 */ BUG_LIMB_15,
+ /* 17 */ BUG_LIMB_16,
+ /* 18 */ BUG_LIMB_17,
+ /* 19 */ BUG_LIMB_18,
+ /* 20 */ BUG_LIMB_19,
+ /* 21 */ BUG_LIMB_20,
+ /* 22 */ BUG_LIMB_21,
+ /* 23 */ BUG_LIMB_22,
+ /* 24 */ BUG_LIMB_MAX
+} gBugSkelLimb;
+extern SkeletonHeader gBugSkel;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x355A0.c b/assets/objects/gameplay_keep/gameplay_keep_0x355A0.c
new file mode 100644
index 0000000000..c8ed7fd4df
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x355A0.c
@@ -0,0 +1,26 @@
+#include "gameplay_keep_0x355A0.h"
+#include "gfx.h"
+
+Vtx gCuttableShrubStalkVtx[] = {
+#include "assets/objects/gameplay_keep/gCuttableShrubStalkVtx.inc.c"
+};
+
+Gfx gCuttableShrubStalkDL[18] = {
+#include "assets/objects/gameplay_keep/gCuttableShrubStalkDL.inc.c"
+};
+
+Vtx gCuttableShrubTipVtx[] = {
+#include "assets/objects/gameplay_keep/gCuttableShrubTipVtx.inc.c"
+};
+
+Gfx gCuttableShrubTipDL[18] = {
+#include "assets/objects/gameplay_keep/gCuttableShrubTipDL.inc.c"
+};
+
+u64 gCuttableShrubLeafTFragmentTex[TEX_LEN(u64, gCuttableShrubLeafTFragmentTex_WIDTH, gCuttableShrubLeafTFragmentTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gCuttableShrubLeafTFragmentTex.rgba16.inc.c"
+};
+
+u64 gCuttableShrubTex[TEX_LEN(u64, gCuttableShrubTex_WIDTH, gCuttableShrubTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gCuttableShrubTex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x355A0.h b/assets/objects/gameplay_keep/gameplay_keep_0x355A0.h
new file mode 100644
index 0000000000..59808bb161
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x355A0.h
@@ -0,0 +1,18 @@
+#ifndef GAMEPLAY_KEEP_0x355A0_H
+#define GAMEPLAY_KEEP_0x355A0_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+extern Vtx gCuttableShrubStalkVtx[];
+extern Gfx gCuttableShrubStalkDL[18];
+extern Vtx gCuttableShrubTipVtx[];
+extern Gfx gCuttableShrubTipDL[18];
+#define gCuttableShrubLeafTFragmentTex_WIDTH 32
+#define gCuttableShrubLeafTFragmentTex_HEIGHT 32
+extern u64 gCuttableShrubLeafTFragmentTex[TEX_LEN(u64, gCuttableShrubLeafTFragmentTex_WIDTH, gCuttableShrubLeafTFragmentTex_HEIGHT, 16)];
+#define gCuttableShrubTex_WIDTH 32
+#define gCuttableShrubTex_HEIGHT 32
+extern u64 gCuttableShrubTex[TEX_LEN(u64, gCuttableShrubTex_WIDTH, gCuttableShrubTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x37840.c b/assets/objects/gameplay_keep/gameplay_keep_0x37840.c
new file mode 100644
index 0000000000..f2c70d6ecd
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x37840.c
@@ -0,0 +1,14 @@
+#include "gameplay_keep_0x37840.h"
+#include "gfx.h"
+
+Vtx gEffSparklesVtx[] = {
+#include "assets/objects/gameplay_keep/gEffSparklesVtx.inc.c"
+};
+
+Gfx gEffSparklesDL[12] = {
+#include "assets/objects/gameplay_keep/gEffSparklesDL.inc.c"
+};
+
+u64 gEffSparklesTex[TEX_LEN(u64, gEffSparklesTex_WIDTH, gEffSparklesTex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffSparklesTex.i4.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x37840.h b/assets/objects/gameplay_keep/gameplay_keep_0x37840.h
new file mode 100644
index 0000000000..c331f3cf7d
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x37840.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_0x37840_H
+#define GAMEPLAY_KEEP_0x37840_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+extern Vtx gEffSparklesVtx[];
+extern Gfx gEffSparklesDL[12];
+#define gEffSparklesTex_WIDTH 16
+#define gEffSparklesTex_HEIGHT 16
+extern u64 gEffSparklesTex[TEX_LEN(u64, gEffSparklesTex_WIDTH, gEffSparklesTex_HEIGHT, 4)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.c b/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.c
new file mode 100644
index 0000000000..eaa26e0fa4
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.c
@@ -0,0 +1,5 @@
+#include "gameplay_keep_0x38FB0.h"
+
+u64 gUnknownCircle6Tex[TEX_LEN(u64, gUnknownCircle6Tex_WIDTH, gUnknownCircle6Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownCircle6Tex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.h b/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.h
new file mode 100644
index 0000000000..4b5e741557
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_0x38FB0_H
+#define GAMEPLAY_KEEP_0x38FB0_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gUnknownCircle6Tex_WIDTH 32
+#define gUnknownCircle6Tex_HEIGHT 32
+extern u64 gUnknownCircle6Tex[TEX_LEN(u64, gUnknownCircle6Tex_WIDTH, gUnknownCircle6Tex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x393B0.c b/assets/objects/gameplay_keep/gameplay_keep_0x393B0.c
new file mode 100644
index 0000000000..e35cbb1273
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x393B0.c
@@ -0,0 +1,24 @@
+#include "gameplay_keep_0x393B0.h"
+#include "array_count.h"
+#include "camera.h"
+#include "bgcheck.h"
+
+BgCamInfo gLargerCubeBgCamList[] = {
+#include "assets/objects/gameplay_keep/gLargerCubeBgCamList.inc.c"
+};
+
+SurfaceType gLargerCubeSurfaceTypes[] = {
+#include "assets/objects/gameplay_keep/gLargerCubeSurfaceTypes.inc.c"
+};
+
+CollisionPoly gLargerCubePolyList[] = {
+#include "assets/objects/gameplay_keep/gLargerCubePolyList.inc.c"
+};
+
+Vec3s gLargerCubeVtxList[] = {
+#include "assets/objects/gameplay_keep/gLargerCubeVtxList.inc.c"
+};
+
+CollisionHeader gLargerCubeCol = {
+#include "assets/objects/gameplay_keep/gLargerCubeCol.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x393B0.h b/assets/objects/gameplay_keep/gameplay_keep_0x393B0.h
new file mode 100644
index 0000000000..71f66a38aa
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x393B0.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_0x393B0_H
+#define GAMEPLAY_KEEP_0x393B0_H
+
+#include "bgcheck.h"
+
+extern BgCamInfo gLargerCubeBgCamList[];
+extern SurfaceType gLargerCubeSurfaceTypes[];
+extern CollisionPoly gLargerCubePolyList[];
+extern Vec3s gLargerCubeVtxList[];
+extern CollisionHeader gLargerCubeCol;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39710.c b/assets/objects/gameplay_keep/gameplay_keep_0x39710.c
new file mode 100644
index 0000000000..d24bda1fe3
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x39710.c
@@ -0,0 +1,11 @@
+#include "gameplay_keep_0x39710.h"
+#include "gameplay_keep_0x42530.h"
+#include "gfx.h"
+
+Vtx gUnusedRockRectangularPrism1Vtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedRockRectangularPrism1Vtx.inc.c"
+};
+
+Gfx gUnusedRockRectangularPrism1DL[22] = {
+#include "assets/objects/gameplay_keep/gUnusedRockRectangularPrism1DL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39710.h b/assets/objects/gameplay_keep/gameplay_keep_0x39710.h
new file mode 100644
index 0000000000..86d446b897
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x39710.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_0x39710_H
+#define GAMEPLAY_KEEP_0x39710_H
+
+#include "ultra64.h"
+
+extern Vtx gUnusedRockRectangularPrism1Vtx[];
+extern Gfx gUnusedRockRectangularPrism1DL[22];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39940.c b/assets/objects/gameplay_keep/gameplay_keep_0x39940.c
new file mode 100644
index 0000000000..94efa4a973
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x39940.c
@@ -0,0 +1,24 @@
+#include "gameplay_keep_0x39940.h"
+#include "array_count.h"
+#include "camera.h"
+#include "bgcheck.h"
+
+BgCamInfo gWideTallBlockBgCamList[] = {
+#include "assets/objects/gameplay_keep/gWideTallBlockBgCamList.inc.c"
+};
+
+SurfaceType gWideTallBlockSurfaceTypes[] = {
+#include "assets/objects/gameplay_keep/gWideTallBlockSurfaceTypes.inc.c"
+};
+
+CollisionPoly gWideTallBlockPolyList[] = {
+#include "assets/objects/gameplay_keep/gWideTallBlockPolyList.inc.c"
+};
+
+Vec3s gWideTallBlockVtxList[] = {
+#include "assets/objects/gameplay_keep/gWideTallBlockVtxList.inc.c"
+};
+
+CollisionHeader gWideTallBlockCol = {
+#include "assets/objects/gameplay_keep/gWideTallBlockCol.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39940.h b/assets/objects/gameplay_keep/gameplay_keep_0x39940.h
new file mode 100644
index 0000000000..f02cce59eb
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x39940.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_0x39940_H
+#define GAMEPLAY_KEEP_0x39940_H
+
+#include "bgcheck.h"
+
+extern BgCamInfo gWideTallBlockBgCamList[];
+extern SurfaceType gWideTallBlockSurfaceTypes[];
+extern CollisionPoly gWideTallBlockPolyList[];
+extern Vec3s gWideTallBlockVtxList[];
+extern CollisionHeader gWideTallBlockCol;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.c b/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.c
new file mode 100644
index 0000000000..61386cce5b
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.c
@@ -0,0 +1,24 @@
+#include "gameplay_keep_0x39CC0.h"
+#include "bgcheck.h"
+#include "array_count.h"
+#include "camera.h"
+
+BgCamInfo gTallBlockBgCamList[] = {
+#include "assets/objects/gameplay_keep/gTallBlockBgCamList.inc.c"
+};
+
+SurfaceType gTallBlockSurfaceTypes[] = {
+#include "assets/objects/gameplay_keep/gTallBlockSurfaceTypes.inc.c"
+};
+
+CollisionPoly gTallBlockPolyList[] = {
+#include "assets/objects/gameplay_keep/gTallBlockPolyList.inc.c"
+};
+
+Vec3s gTallBlockVtxList[] = {
+#include "assets/objects/gameplay_keep/gTallBlockVtxList.inc.c"
+};
+
+CollisionHeader gTallBlockCol = {
+#include "assets/objects/gameplay_keep/gTallBlockCol.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.h b/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.h
new file mode 100644
index 0000000000..53324943c8
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_0x39CC0_H
+#define GAMEPLAY_KEEP_0x39CC0_H
+
+#include "bgcheck.h"
+
+extern BgCamInfo gTallBlockBgCamList[];
+extern SurfaceType gTallBlockSurfaceTypes[];
+extern CollisionPoly gTallBlockPolyList[];
+extern Vec3s gTallBlockVtxList[];
+extern CollisionHeader gTallBlockCol;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39DF0.c b/assets/objects/gameplay_keep/gameplay_keep_0x39DF0.c
new file mode 100644
index 0000000000..2feba37bf0
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x39DF0.c
@@ -0,0 +1,11 @@
+#include "gameplay_keep_0x39DF0.h"
+#include "gameplay_keep_0x42530.h"
+#include "gfx.h"
+
+Vtx gUnusedRockRectangularPrism3Vtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedRockRectangularPrism3Vtx.inc.c"
+};
+
+Gfx gUnusedRockRectangularPrism3DL[22] = {
+#include "assets/objects/gameplay_keep/gUnusedRockRectangularPrism3DL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39DF0.h b/assets/objects/gameplay_keep/gameplay_keep_0x39DF0.h
new file mode 100644
index 0000000000..6838727fe6
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x39DF0.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_0x39DF0_H
+#define GAMEPLAY_KEEP_0x39DF0_H
+
+#include "ultra64.h"
+
+extern Vtx gUnusedRockRectangularPrism3Vtx[];
+extern Gfx gUnusedRockRectangularPrism3DL[22];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3A150.c b/assets/objects/gameplay_keep/gameplay_keep_0x3A150.c
new file mode 100644
index 0000000000..42dfbd1db4
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3A150.c
@@ -0,0 +1,11 @@
+#include "gameplay_keep_0x3A150.h"
+#include "gameplay_keep_0x42530.h"
+#include "gfx.h"
+
+Vtx gFlatRotBlockVtx[] = {
+#include "assets/objects/gameplay_keep/gFlatRotBlockVtx.inc.c"
+};
+
+Gfx gFlatRotBlockDL[22] = {
+#include "assets/objects/gameplay_keep/gFlatRotBlockDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3A150.h b/assets/objects/gameplay_keep/gameplay_keep_0x3A150.h
new file mode 100644
index 0000000000..fd8bcd1e2b
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3A150.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_0x3A150_H
+#define GAMEPLAY_KEEP_0x3A150_H
+
+#include "ultra64.h"
+
+extern Vtx gFlatRotBlockVtx[];
+extern Gfx gFlatRotBlockDL[22];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3A380.c b/assets/objects/gameplay_keep/gameplay_keep_0x3A380.c
new file mode 100644
index 0000000000..a69e31b233
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3A380.c
@@ -0,0 +1,23 @@
+#include "gameplay_keep_0x3A380.h"
+#include "array_count.h"
+#include "camera.h"
+
+BgCamInfo gLargerFlatBlockBgCamList[] = {
+#include "assets/objects/gameplay_keep/gLargerFlatBlockBgCamList.inc.c"
+};
+
+SurfaceType gLargerFlatBlockSurfaceTypes[] = {
+#include "assets/objects/gameplay_keep/gLargerFlatBlockSurfaceTypes.inc.c"
+};
+
+CollisionPoly gLargerFlatBlockPolyList[] = {
+#include "assets/objects/gameplay_keep/gLargerFlatBlockPolyList.inc.c"
+};
+
+Vec3s gLargerFlatBlockVtxList[] = {
+#include "assets/objects/gameplay_keep/gLargerFlatBlockVtxList.inc.c"
+};
+
+CollisionHeader gLargerFlatBlockCol = {
+#include "assets/objects/gameplay_keep/gLargerFlatBlockCol.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3A380.h b/assets/objects/gameplay_keep/gameplay_keep_0x3A380.h
new file mode 100644
index 0000000000..64b6952236
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3A380.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_0x3A380_H
+#define GAMEPLAY_KEEP_0x3A380_H
+
+#include "bgcheck.h"
+
+extern BgCamInfo gLargerFlatBlockBgCamList[];
+extern SurfaceType gLargerFlatBlockSurfaceTypes[];
+extern CollisionPoly gLargerFlatBlockPolyList[];
+extern Vec3s gLargerFlatBlockVtxList[];
+extern CollisionHeader gLargerFlatBlockCol;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3AC30.c b/assets/objects/gameplay_keep/gameplay_keep_0x3AC30.c
new file mode 100644
index 0000000000..9efe6e3c21
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3AC30.c
@@ -0,0 +1,5 @@
+#include "gameplay_keep_0x3AC30.h"
+
+u64 gHeartShapeTex[TEX_LEN(u64, gHeartShapeTex_WIDTH, gHeartShapeTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gHeartShapeTex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3AC30.h b/assets/objects/gameplay_keep/gameplay_keep_0x3AC30.h
new file mode 100644
index 0000000000..e9311fb9cb
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3AC30.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_0x3AC30_H
+#define GAMEPLAY_KEEP_0x3AC30_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gHeartShapeTex_WIDTH 16
+#define gHeartShapeTex_HEIGHT 16
+extern u64 gHeartShapeTex[TEX_LEN(u64, gHeartShapeTex_WIDTH, gHeartShapeTex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.c b/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.c
new file mode 100644
index 0000000000..cba3fbd614
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.c
@@ -0,0 +1,21 @@
+#include "gameplay_keep_0x3B1E0.h"
+#include "rupee.h"
+#include "rupee_light_red_tex.h"
+#include "hilite_textures.h"
+#include "gfx.h"
+
+Vtx gHeartPieceExteriorVtx[] = {
+#include "assets/objects/gameplay_keep/gHeartPieceExteriorVtx.inc.c"
+};
+
+Vtx gHeartContainerInteriorVtx[] = {
+#include "assets/objects/gameplay_keep/gHeartContainerInteriorVtx.inc.c"
+};
+
+Gfx gHeartPieceExteriorDL[39] = {
+#include "assets/objects/gameplay_keep/gHeartPieceExteriorDL.inc.c"
+};
+
+Gfx gHeartContainerInteriorDL[33] = {
+#include "assets/objects/gameplay_keep/gHeartContainerInteriorDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.h b/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.h
new file mode 100644
index 0000000000..4ab9f3d1e1
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_0x3B1E0_H
+#define GAMEPLAY_KEEP_0x3B1E0_H
+
+#include "ultra64.h"
+
+extern Vtx gHeartPieceExteriorVtx[];
+extern Vtx gHeartContainerInteriorVtx[];
+extern Gfx gHeartPieceExteriorDL[39];
+extern Gfx gHeartContainerInteriorDL[33];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.c b/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.c
new file mode 100644
index 0000000000..637afdd35c
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.c
@@ -0,0 +1,11 @@
+#include "gameplay_keep_0x3C2E0.h"
+#include "sign_textures.h"
+#include "gfx.h"
+
+Vtx gSignDirectionalVtx[] = {
+#include "assets/objects/gameplay_keep/gSignDirectionalVtx.inc.c"
+};
+
+Gfx gSignDirectionalDL[88] = {
+#include "assets/objects/gameplay_keep/gSignDirectionalDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.h b/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.h
new file mode 100644
index 0000000000..9e5ed79452
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_0x3C2E0_H
+#define GAMEPLAY_KEEP_0x3C2E0_H
+
+#include "ultra64.h"
+
+extern Vtx gSignDirectionalVtx[];
+extern Gfx gSignDirectionalDL[88];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3C870.c b/assets/objects/gameplay_keep/gameplay_keep_0x3C870.c
new file mode 100644
index 0000000000..d06eb72b68
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3C870.c
@@ -0,0 +1,21 @@
+#include "gameplay_keep_0x3C870.h"
+
+u64 gDropArrows2Tex[TEX_LEN(u64, gDropArrows2Tex_WIDTH, gDropArrows2Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gDropArrows2Tex.rgba16.inc.c"
+};
+
+u64 gDropArrows1Tex[TEX_LEN(u64, gDropArrows1Tex_WIDTH, gDropArrows1Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gDropArrows1Tex.rgba16.inc.c"
+};
+
+u64 gDropArrows3Tex[TEX_LEN(u64, gDropArrows3Tex_WIDTH, gDropArrows3Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gDropArrows3Tex.rgba16.inc.c"
+};
+
+u64 gDropBombTex[TEX_LEN(u64, gDropBombTex_WIDTH, gDropBombTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gDropBombTex.rgba16.inc.c"
+};
+
+
+
+
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3C870.h b/assets/objects/gameplay_keep/gameplay_keep_0x3C870.h
new file mode 100644
index 0000000000..0a8518db03
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3C870.h
@@ -0,0 +1,20 @@
+#ifndef GAMEPLAY_KEEP_0x3C870_H
+#define GAMEPLAY_KEEP_0x3C870_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gDropArrows2Tex_WIDTH 32
+#define gDropArrows2Tex_HEIGHT 32
+extern u64 gDropArrows2Tex[TEX_LEN(u64, gDropArrows2Tex_WIDTH, gDropArrows2Tex_HEIGHT, 16)];
+#define gDropArrows1Tex_WIDTH 32
+#define gDropArrows1Tex_HEIGHT 32
+extern u64 gDropArrows1Tex[TEX_LEN(u64, gDropArrows1Tex_WIDTH, gDropArrows1Tex_HEIGHT, 16)];
+#define gDropArrows3Tex_WIDTH 32
+#define gDropArrows3Tex_HEIGHT 32
+extern u64 gDropArrows3Tex[TEX_LEN(u64, gDropArrows3Tex_WIDTH, gDropArrows3Tex_HEIGHT, 16)];
+#define gDropBombTex_WIDTH 32
+#define gDropBombTex_HEIGHT 32
+extern u64 gDropBombTex[TEX_LEN(u64, gDropBombTex_WIDTH, gDropBombTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3F140.c b/assets/objects/gameplay_keep/gameplay_keep_0x3F140.c
new file mode 100644
index 0000000000..a0f8b9a363
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3F140.c
@@ -0,0 +1,26 @@
+#include "gameplay_keep_0x3F140.h"
+#include "gfx.h"
+
+u64 gDropKeySmallTex[TEX_LEN(u64, gDropKeySmallTex_WIDTH, gDropKeySmallTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gDropKeySmallTex.rgba16.inc.c"
+};
+
+u64 gDropMagicSmallTex[TEX_LEN(u64, gDropMagicSmallTex_WIDTH, gDropMagicSmallTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gDropMagicSmallTex.rgba16.inc.c"
+};
+
+u64 gDropDekuNutTex[TEX_LEN(u64, gDropDekuNutTex_WIDTH, gDropDekuNutTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gDropDekuNutTex.rgba16.inc.c"
+};
+
+u64 gDropDekuSeedsTex[TEX_LEN(u64, gDropDekuSeedsTex_WIDTH, gDropDekuSeedsTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gDropDekuSeedsTex.rgba16.inc.c"
+};
+
+u64 gDropDekuStickTex[TEX_LEN(u64, gDropDekuStickTex_WIDTH, gDropDekuStickTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gDropDekuStickTex.rgba16.inc.c"
+};
+
+u64 gDropMagicLargeTex[TEX_LEN(u64, gDropMagicLargeTex_WIDTH, gDropMagicLargeTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gDropMagicLargeTex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3F140.h b/assets/objects/gameplay_keep/gameplay_keep_0x3F140.h
new file mode 100644
index 0000000000..4c991fef37
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3F140.h
@@ -0,0 +1,26 @@
+#ifndef GAMEPLAY_KEEP_0x3F140_H
+#define GAMEPLAY_KEEP_0x3F140_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gDropKeySmallTex_WIDTH 32
+#define gDropKeySmallTex_HEIGHT 32
+extern u64 gDropKeySmallTex[TEX_LEN(u64, gDropKeySmallTex_WIDTH, gDropKeySmallTex_HEIGHT, 16)];
+#define gDropMagicSmallTex_WIDTH 32
+#define gDropMagicSmallTex_HEIGHT 32
+extern u64 gDropMagicSmallTex[TEX_LEN(u64, gDropMagicSmallTex_WIDTH, gDropMagicSmallTex_HEIGHT, 16)];
+#define gDropDekuNutTex_WIDTH 32
+#define gDropDekuNutTex_HEIGHT 32
+extern u64 gDropDekuNutTex[TEX_LEN(u64, gDropDekuNutTex_WIDTH, gDropDekuNutTex_HEIGHT, 16)];
+#define gDropDekuSeedsTex_WIDTH 32
+#define gDropDekuSeedsTex_HEIGHT 32
+extern u64 gDropDekuSeedsTex[TEX_LEN(u64, gDropDekuSeedsTex_WIDTH, gDropDekuSeedsTex_HEIGHT, 16)];
+#define gDropDekuStickTex_WIDTH 32
+#define gDropDekuStickTex_HEIGHT 32
+extern u64 gDropDekuStickTex[TEX_LEN(u64, gDropDekuStickTex_WIDTH, gDropDekuStickTex_HEIGHT, 16)];
+#define gDropMagicLargeTex_WIDTH 32
+#define gDropMagicLargeTex_HEIGHT 32
+extern u64 gDropMagicLargeTex[TEX_LEN(u64, gDropMagicLargeTex_WIDTH, gDropMagicLargeTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x400.c b/assets/objects/gameplay_keep/gameplay_keep_0x400.c
new file mode 100644
index 0000000000..07e7831070
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x400.c
@@ -0,0 +1,17 @@
+#include "gameplay_keep_0x400.h"
+
+u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gHylianShieldDesignTex.rgba16.inc.c"
+};
+
+u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gOcarinaofTimeDesignTex.rgba16.inc.c"
+};
+
+u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gBottleGlassTex.rgba16.inc.c"
+};
+
+u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDekuStickTex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x400.h b/assets/objects/gameplay_keep/gameplay_keep_0x400.h
new file mode 100644
index 0000000000..8978cd1983
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x400.h
@@ -0,0 +1,20 @@
+#ifndef GAMEPLAY_KEEP_0x400_H
+#define GAMEPLAY_KEEP_0x400_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gHylianShieldDesignTex_WIDTH 32
+#define gHylianShieldDesignTex_HEIGHT 64
+extern u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)];
+#define gOcarinaofTimeDesignTex_WIDTH 32
+#define gOcarinaofTimeDesignTex_HEIGHT 16
+extern u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)];
+#define gBottleGlassTex_WIDTH 16
+#define gBottleGlassTex_HEIGHT 16
+extern u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)];
+#define gDekuStickTex_WIDTH 8
+#define gDekuStickTex_HEIGHT 8
+extern u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x42530.c b/assets/objects/gameplay_keep/gameplay_keep_0x42530.c
new file mode 100644
index 0000000000..775c03fd9b
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x42530.c
@@ -0,0 +1,9 @@
+#include "gameplay_keep_0x42530.h"
+
+u64 gUnknownStone1Tex[TEX_LEN(u64, gUnknownStone1Tex_WIDTH, gUnknownStone1Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnknownStone1Tex.rgba16.inc.c"
+};
+
+u64 gUnknownStone2Tex[TEX_LEN(u64, gUnknownStone2Tex_WIDTH, gUnknownStone2Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnknownStone2Tex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x42530.h b/assets/objects/gameplay_keep/gameplay_keep_0x42530.h
new file mode 100644
index 0000000000..c5148c83f7
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x42530.h
@@ -0,0 +1,14 @@
+#ifndef GAMEPLAY_KEEP_0x42530_H
+#define GAMEPLAY_KEEP_0x42530_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gUnknownStone1Tex_WIDTH 32
+#define gUnknownStone1Tex_HEIGHT 32
+extern u64 gUnknownStone1Tex[TEX_LEN(u64, gUnknownStone1Tex_WIDTH, gUnknownStone1Tex_HEIGHT, 16)];
+#define gUnknownStone2Tex_WIDTH 32
+#define gUnknownStone2Tex_HEIGHT 32
+extern u64 gUnknownStone2Tex[TEX_LEN(u64, gUnknownStone2Tex_WIDTH, gUnknownStone2Tex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x43530.c b/assets/objects/gameplay_keep/gameplay_keep_0x43530.c
new file mode 100644
index 0000000000..1dbdda90ce
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x43530.c
@@ -0,0 +1,9 @@
+#include "gameplay_keep_0x43530.h"
+
+u64 gUnusedTreeStumpTopTex[TEX_LEN(u64, gUnusedTreeStumpTopTex_WIDTH, gUnusedTreeStumpTopTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedTreeStumpTopTex.rgba16.inc.c"
+};
+
+u64 gUnusedTreeStumpBarkTex[TEX_LEN(u64, gUnusedTreeStumpBarkTex_WIDTH, gUnusedTreeStumpBarkTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedTreeStumpBarkTex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x43530.h b/assets/objects/gameplay_keep/gameplay_keep_0x43530.h
new file mode 100644
index 0000000000..7905c51c0b
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x43530.h
@@ -0,0 +1,14 @@
+#ifndef GAMEPLAY_KEEP_0x43530_H
+#define GAMEPLAY_KEEP_0x43530_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gUnusedTreeStumpTopTex_WIDTH 32
+#define gUnusedTreeStumpTopTex_HEIGHT 32
+extern u64 gUnusedTreeStumpTopTex[TEX_LEN(u64, gUnusedTreeStumpTopTex_WIDTH, gUnusedTreeStumpTopTex_HEIGHT, 16)];
+#define gUnusedTreeStumpBarkTex_WIDTH 32
+#define gUnusedTreeStumpBarkTex_HEIGHT 32
+extern u64 gUnusedTreeStumpBarkTex[TEX_LEN(u64, gUnusedTreeStumpBarkTex_WIDTH, gUnusedTreeStumpBarkTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x44530.c b/assets/objects/gameplay_keep/gameplay_keep_0x44530.c
new file mode 100644
index 0000000000..9fdc083942
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x44530.c
@@ -0,0 +1,5 @@
+#include "gameplay_keep_0x44530.h"
+
+u64 gUnusedGrassBladesTex[TEX_LEN(u64, gUnusedGrassBladesTex_WIDTH, gUnusedGrassBladesTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedGrassBladesTex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x44530.h b/assets/objects/gameplay_keep/gameplay_keep_0x44530.h
new file mode 100644
index 0000000000..71c276bd0a
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x44530.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_0x44530_H
+#define GAMEPLAY_KEEP_0x44530_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gUnusedGrassBladesTex_WIDTH 64
+#define gUnusedGrassBladesTex_HEIGHT 32
+extern u64 gUnusedGrassBladesTex[TEX_LEN(u64, gUnusedGrassBladesTex_WIDTH, gUnusedGrassBladesTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x45530.c b/assets/objects/gameplay_keep/gameplay_keep_0x45530.c
new file mode 100644
index 0000000000..976f09c95f
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x45530.c
@@ -0,0 +1,5 @@
+#include "gameplay_keep_0x45530.h"
+
+u64 gUnusedStoneHookshotTargetTex[TEX_LEN(u64, gUnusedStoneHookshotTargetTex_WIDTH, gUnusedStoneHookshotTargetTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedStoneHookshotTargetTex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x45530.h b/assets/objects/gameplay_keep/gameplay_keep_0x45530.h
new file mode 100644
index 0000000000..9c5ecb6db5
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x45530.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_0x45530_H
+#define GAMEPLAY_KEEP_0x45530_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gUnusedStoneHookshotTargetTex_WIDTH 32
+#define gUnusedStoneHookshotTargetTex_HEIGHT 32
+extern u64 gUnusedStoneHookshotTargetTex[TEX_LEN(u64, gUnusedStoneHookshotTargetTex_WIDTH, gUnusedStoneHookshotTargetTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x45D30.c b/assets/objects/gameplay_keep/gameplay_keep_0x45D30.c
new file mode 100644
index 0000000000..201bbb7bab
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x45D30.c
@@ -0,0 +1,5 @@
+#include "gameplay_keep_0x45D30.h"
+
+u64 gUnknownStone3Tex[TEX_LEN(u64, gUnknownStone3Tex_WIDTH, gUnknownStone3Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnknownStone3Tex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x45D30.h b/assets/objects/gameplay_keep/gameplay_keep_0x45D30.h
new file mode 100644
index 0000000000..b5bd9d9a17
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x45D30.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_0x45D30_H
+#define GAMEPLAY_KEEP_0x45D30_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gUnknownStone3Tex_WIDTH 32
+#define gUnknownStone3Tex_HEIGHT 32
+extern u64 gUnknownStone3Tex[TEX_LEN(u64, gUnknownStone3Tex_WIDTH, gUnknownStone3Tex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x48130.c b/assets/objects/gameplay_keep/gameplay_keep_0x48130.c
new file mode 100644
index 0000000000..1277a3fbb7
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x48130.c
@@ -0,0 +1,10 @@
+#include "gameplay_keep_0x48130.h"
+#include "gfx.h"
+
+Vtx gRaindropVtx[] = {
+#include "assets/objects/gameplay_keep/gRaindropVtx.inc.c"
+};
+
+Gfx gRaindropDL[4] = {
+#include "assets/objects/gameplay_keep/gRaindropDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x48130.h b/assets/objects/gameplay_keep/gameplay_keep_0x48130.h
new file mode 100644
index 0000000000..0ccecfea53
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x48130.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_0x48130_H
+#define GAMEPLAY_KEEP_0x48130_H
+
+#include "ultra64.h"
+
+extern Vtx gRaindropVtx[];
+extern Gfx gRaindropDL[4];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x49F20.c b/assets/objects/gameplay_keep/gameplay_keep_0x49F20.c
new file mode 100644
index 0000000000..0da1c074a1
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x49F20.c
@@ -0,0 +1,11 @@
+#include "gameplay_keep_0x49F20.h"
+#include "gameplay_keep_0x4A090.h"
+#include "gfx.h"
+
+Vtx gDungeonDoorVtx[] = {
+#include "assets/objects/gameplay_keep/gDungeonDoorVtx.inc.c"
+};
+
+Gfx gDungeonDoorDL[21] = {
+#include "assets/objects/gameplay_keep/gDungeonDoorDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x49F20.h b/assets/objects/gameplay_keep/gameplay_keep_0x49F20.h
new file mode 100644
index 0000000000..4cca482c7b
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x49F20.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_0x49F20_H
+#define GAMEPLAY_KEEP_0x49F20_H
+
+#include "ultra64.h"
+
+extern Vtx gDungeonDoorVtx[];
+extern Gfx gDungeonDoorDL[21];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x4A090.c b/assets/objects/gameplay_keep/gameplay_keep_0x4A090.c
new file mode 100644
index 0000000000..719f0d5054
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x4A090.c
@@ -0,0 +1,18 @@
+#include "gameplay_keep_0x4A090.h"
+#include "gfx.h"
+
+u64 gDoorMetalBarsTex[TEX_LEN(u64, gDoorMetalBarsTex_WIDTH, gDoorMetalBarsTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDoorMetalBarsTex.ia8.inc.c"
+};
+
+Vtx gDoorMetalBarsVtx[] = {
+#include "assets/objects/gameplay_keep/gDoorMetalBarsVtx.inc.c"
+};
+
+Gfx gDoorMetalBarsDL[18] = {
+#include "assets/objects/gameplay_keep/gDoorMetalBarsDL.inc.c"
+};
+
+u64 gGenericDungeonDoorTex[TEX_LEN(u64, gGenericDungeonDoorTex_WIDTH, gGenericDungeonDoorTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gGenericDungeonDoorTex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x4A090.h b/assets/objects/gameplay_keep/gameplay_keep_0x4A090.h
new file mode 100644
index 0000000000..532ccd4089
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x4A090.h
@@ -0,0 +1,16 @@
+#ifndef GAMEPLAY_KEEP_0x4A090_H
+#define GAMEPLAY_KEEP_0x4A090_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gDoorMetalBarsTex_WIDTH 32
+#define gDoorMetalBarsTex_HEIGHT 128
+extern u64 gDoorMetalBarsTex[TEX_LEN(u64, gDoorMetalBarsTex_WIDTH, gDoorMetalBarsTex_HEIGHT, 8)];
+extern Vtx gDoorMetalBarsVtx[];
+extern Gfx gDoorMetalBarsDL[18];
+#define gGenericDungeonDoorTex_WIDTH 32
+#define gGenericDungeonDoorTex_HEIGHT 64
+extern u64 gGenericDungeonDoorTex[TEX_LEN(u64, gGenericDungeonDoorTex_WIDTH, gGenericDungeonDoorTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x4D160.c b/assets/objects/gameplay_keep/gameplay_keep_0x4D160.c
new file mode 100644
index 0000000000..24daaeefe5
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x4D160.c
@@ -0,0 +1,24 @@
+#include "gameplay_keep_0x4D160.h"
+#include "sun_textures.h"
+#include "sun_evening_textures.h"
+#include "gfx.h"
+
+Gfx gKokiriDustMoteMaterialDL[9] = {
+#include "assets/objects/gameplay_keep/gKokiriDustMoteMaterialDL.inc.c"
+};
+
+Gfx gKokiriDustMoteModelDL[3] = {
+#include "assets/objects/gameplay_keep/gKokiriDustMoteModelDL.inc.c"
+};
+
+Gfx gSunDL[49] = {
+#include "assets/objects/gameplay_keep/gSunDL.inc.c"
+};
+
+Vtx gSunVtx[] = {
+#include "assets/objects/gameplay_keep/gSunVtx.inc.c"
+};
+
+Vtx gKokiriDustMoteModelVtx[] = {
+#include "assets/objects/gameplay_keep/gKokiriDustMoteModelVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x4D160.h b/assets/objects/gameplay_keep/gameplay_keep_0x4D160.h
new file mode 100644
index 0000000000..9f5c5c52de
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x4D160.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_0x4D160_H
+#define GAMEPLAY_KEEP_0x4D160_H
+
+#include "ultra64.h"
+
+extern Gfx gKokiriDustMoteMaterialDL[9];
+extern Gfx gKokiriDustMoteModelDL[3];
+extern Gfx gSunDL[49];
+extern Vtx gSunVtx[];
+extern Vtx gKokiriDustMoteModelVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x4E660.c b/assets/objects/gameplay_keep/gameplay_keep_0x4E660.c
new file mode 100644
index 0000000000..e028802748
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x4E660.c
@@ -0,0 +1,38 @@
+#include "gameplay_keep_0x4E660.h"
+#include "gfx.h"
+
+Vtx gUnusedUnknownShape1Vtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedUnknownShape1Vtx.inc.c"
+};
+
+Gfx gUnusedUnknownShape1DL[112] = {
+#include "assets/objects/gameplay_keep/gUnusedUnknownShape1DL.inc.c"
+};
+
+Gfx gUnusedUnknownShape1RefDL[2] = {
+#include "assets/objects/gameplay_keep/gUnusedUnknownShape1RefDL.inc.c"
+};
+
+Vtx gUnusedUnknownShape2Vtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedUnknownShape2Vtx.inc.c"
+};
+
+Gfx gUnusedUnknownShape2DL[100] = {
+#include "assets/objects/gameplay_keep/gUnusedUnknownShape2DL.inc.c"
+};
+
+Gfx gUnusedUnknownShape2RefDL[2] = {
+#include "assets/objects/gameplay_keep/gUnusedUnknownShape2RefDL.inc.c"
+};
+
+Vtx gUnusedUnknownShape3Vtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedUnknownShape3Vtx.inc.c"
+};
+
+Gfx gUnusedUnknownShape3DL[99] = {
+#include "assets/objects/gameplay_keep/gUnusedUnknownShape3DL.inc.c"
+};
+
+Gfx gUnusedUnknownShape3RefDL[2] = {
+#include "assets/objects/gameplay_keep/gUnusedUnknownShape3RefDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x4E660.h b/assets/objects/gameplay_keep/gameplay_keep_0x4E660.h
new file mode 100644
index 0000000000..d90bbf1c00
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x4E660.h
@@ -0,0 +1,16 @@
+#ifndef GAMEPLAY_KEEP_0x4E660_H
+#define GAMEPLAY_KEEP_0x4E660_H
+
+#include "ultra64.h"
+
+extern Vtx gUnusedUnknownShape1Vtx[];
+extern Gfx gUnusedUnknownShape1DL[112];
+extern Gfx gUnusedUnknownShape1RefDL[2];
+extern Vtx gUnusedUnknownShape2Vtx[];
+extern Gfx gUnusedUnknownShape2DL[100];
+extern Gfx gUnusedUnknownShape2RefDL[2];
+extern Vtx gUnusedUnknownShape3Vtx[];
+extern Gfx gUnusedUnknownShape3DL[99];
+extern Gfx gUnusedUnknownShape3RefDL[2];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x515B0.c b/assets/objects/gameplay_keep/gameplay_keep_0x515B0.c
new file mode 100644
index 0000000000..d441d4f625
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x515B0.c
@@ -0,0 +1,5 @@
+#include "gameplay_keep_0x515B0.h"
+
+u64 gUnusedUpsideDownZeldaTex[TEX_LEN(u64, gUnusedUpsideDownZeldaTex_WIDTH, gUnusedUpsideDownZeldaTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnusedUpsideDownZeldaTex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x515B0.h b/assets/objects/gameplay_keep/gameplay_keep_0x515B0.h
new file mode 100644
index 0000000000..d98229fdb2
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x515B0.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_0x515B0_H
+#define GAMEPLAY_KEEP_0x515B0_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gUnusedUpsideDownZeldaTex_WIDTH 64
+#define gUnusedUpsideDownZeldaTex_HEIGHT 32
+extern u64 gUnusedUpsideDownZeldaTex[TEX_LEN(u64, gUnusedUpsideDownZeldaTex_WIDTH, gUnusedUpsideDownZeldaTex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x55DB0.c b/assets/objects/gameplay_keep/gameplay_keep_0x55DB0.c
new file mode 100644
index 0000000000..c235d0902b
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x55DB0.c
@@ -0,0 +1,9 @@
+#include "gameplay_keep_0x55DB0.h"
+
+u64 gEffBubble1Tex[TEX_LEN(u64, gEffBubble1Tex_WIDTH, gEffBubble1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffBubble1Tex.i8.inc.c"
+};
+
+u64 gEffBubble2Tex[TEX_LEN(u64, gEffBubble2Tex_WIDTH, gEffBubble2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffBubble2Tex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x55DB0.h b/assets/objects/gameplay_keep/gameplay_keep_0x55DB0.h
new file mode 100644
index 0000000000..5295437347
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x55DB0.h
@@ -0,0 +1,14 @@
+#ifndef GAMEPLAY_KEEP_0x55DB0_H
+#define GAMEPLAY_KEEP_0x55DB0_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffBubble1Tex_WIDTH 16
+#define gEffBubble1Tex_HEIGHT 16
+extern u64 gEffBubble1Tex[TEX_LEN(u64, gEffBubble1Tex_WIDTH, gEffBubble1Tex_HEIGHT, 8)];
+#define gEffBubble2Tex_WIDTH 16
+#define gEffBubble2Tex_HEIGHT 16
+extern u64 gEffBubble2Tex[TEX_LEN(u64, gEffBubble2Tex_WIDTH, gEffBubble2Tex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.c b/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.c
new file mode 100644
index 0000000000..c0eecbc7c5
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.c
@@ -0,0 +1,14 @@
+#include "gameplay_keep_0xC0A0.h"
+#include "gfx.h"
+
+Vtx gEffFragments1Vtx[] = {
+#include "assets/objects/gameplay_keep/gEffFragments1Vtx.inc.c"
+};
+
+Gfx gEffFragments1DL[18] = {
+#include "assets/objects/gameplay_keep/gEffFragments1DL.inc.c"
+};
+
+u64 gWitheredLeafTex[TEX_LEN(u64, gWitheredLeafTex_WIDTH, gWitheredLeafTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gWitheredLeafTex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h b/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h
new file mode 100644
index 0000000000..a648c7e5b5
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_0xC0A0_H
+#define GAMEPLAY_KEEP_0xC0A0_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+extern Vtx gEffFragments1Vtx[];
+extern Gfx gEffFragments1DL[18];
+#define gWitheredLeafTex_WIDTH 16
+#define gWitheredLeafTex_HEIGHT 16
+extern u64 gWitheredLeafTex[TEX_LEN(u64, gWitheredLeafTex_WIDTH, gWitheredLeafTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.c b/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.c
new file mode 100644
index 0000000000..4f3bff7c85
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.c
@@ -0,0 +1,10 @@
+#include "gameplay_keep_0xCCC0.h"
+#include "gfx.h"
+
+Vtx gEffFragments2Vtx[] = {
+#include "assets/objects/gameplay_keep/gEffFragments2Vtx.inc.c"
+};
+
+Gfx gEffFragments2DL[7] = {
+#include "assets/objects/gameplay_keep/gEffFragments2DL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h b/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h
new file mode 100644
index 0000000000..ea687ce12a
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_0xCCC0_H
+#define GAMEPLAY_KEEP_0xCCC0_H
+
+#include "ultra64.h"
+
+extern Vtx gEffFragments2Vtx[];
+extern Gfx gEffFragments2DL[7];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.c b/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.c
new file mode 100644
index 0000000000..e2978a14c8
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.c
@@ -0,0 +1,14 @@
+#include "gameplay_keep_0xCDC0.h"
+#include "region.h"
+
+u64 gSelectionCursorTex[TEX_LEN(u64, gSelectionCursorTex_WIDTH, gSelectionCursorTex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gSelectionCursorTex.ia4.inc.c"
+};
+
+u64 gControlStickTex[TEX_LEN(u64, gControlStickTex_WIDTH, gControlStickTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gControlStickTex.ia8.inc.c"
+};
+
+u64 gArrowCursorTex[TEX_LEN(u64, gArrowCursorTex_WIDTH, gArrowCursorTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gArrowCursorTex.ia8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h b/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h
new file mode 100644
index 0000000000..f3c14722d5
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h
@@ -0,0 +1,17 @@
+#ifndef GAMEPLAY_KEEP_0xCDC0_H
+#define GAMEPLAY_KEEP_0xCDC0_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gSelectionCursorTex_WIDTH 16
+#define gSelectionCursorTex_HEIGHT 16
+extern u64 gSelectionCursorTex[TEX_LEN(u64, gSelectionCursorTex_WIDTH, gSelectionCursorTex_HEIGHT, 4)];
+#define gControlStickTex_WIDTH 16
+#define gControlStickTex_HEIGHT 16
+extern u64 gControlStickTex[TEX_LEN(u64, gControlStickTex_WIDTH, gControlStickTex_HEIGHT, 8)];
+#define gArrowCursorTex_WIDTH 16
+#define gArrowCursorTex_HEIGHT 24
+extern u64 gArrowCursorTex[TEX_LEN(u64, gArrowCursorTex_WIDTH, gArrowCursorTex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.c b/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.c
new file mode 100644
index 0000000000..b3b9561f08
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.c
@@ -0,0 +1,19 @@
+#include "gameplay_keep_0xD0C0.h"
+#include "gameplay_keep_0xD4E0.h"
+#include "gfx.h"
+
+Vtx gUnusedRockFragmentVtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedRockFragmentVtx.inc.c"
+};
+
+Gfx gUnusedRockFragmentDL[32] = {
+#include "assets/objects/gameplay_keep/gUnusedRockFragmentDL.inc.c"
+};
+
+Gfx gBoulderFragmentsDL[27] = {
+#include "assets/objects/gameplay_keep/gBoulderFragmentsDL.inc.c"
+};
+
+Vtx gBoulderFragmentsVtx[] = {
+#include "assets/objects/gameplay_keep/gBoulderFragmentsVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h b/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h
new file mode 100644
index 0000000000..985d260519
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_0xD0C0_H
+#define GAMEPLAY_KEEP_0xD0C0_H
+
+#include "ultra64.h"
+
+extern Vtx gUnusedRockFragmentVtx[];
+extern Gfx gUnusedRockFragmentDL[32];
+extern Gfx gBoulderFragmentsDL[27];
+extern Vtx gBoulderFragmentsVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.c b/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.c
new file mode 100644
index 0000000000..aa6d252e46
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.c
@@ -0,0 +1,9 @@
+#include "gameplay_keep_0xD4E0.h"
+
+u64 gRockFragment1Tex[TEX_LEN(u64, gRockFragment1Tex_WIDTH, gRockFragment1Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gRockFragment1Tex.rgba16.inc.c"
+};
+
+u64 gRockFragment2Tex[TEX_LEN(u64, gRockFragment2Tex_WIDTH, gRockFragment2Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gRockFragment2Tex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.h b/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.h
new file mode 100644
index 0000000000..48cad24571
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.h
@@ -0,0 +1,14 @@
+#ifndef GAMEPLAY_KEEP_0xD4E0_H
+#define GAMEPLAY_KEEP_0xD4E0_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gRockFragment1Tex_WIDTH 32
+#define gRockFragment1Tex_HEIGHT 32
+extern u64 gRockFragment1Tex[TEX_LEN(u64, gRockFragment1Tex_WIDTH, gRockFragment1Tex_HEIGHT, 16)];
+#define gRockFragment2Tex_WIDTH 32
+#define gRockFragment2Tex_HEIGHT 32
+extern u64 gRockFragment2Tex[TEX_LEN(u64, gRockFragment2Tex_WIDTH, gRockFragment2Tex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.c b/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.c
new file mode 100644
index 0000000000..98dde2a17e
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.c
@@ -0,0 +1,13 @@
+#include "gameplay_keep_0xE4E0.h"
+
+s16 gDoorChildOpeningLeftFrameData[] = {
+#include "assets/objects/gameplay_keep/gDoorChildOpeningLeftFrameData.inc.c"
+};
+
+JointIndex gDoorChildOpeningLeftJointIndices[] = {
+#include "assets/objects/gameplay_keep/gDoorChildOpeningLeftJointIndices.inc.c"
+};
+
+AnimationHeader gDoorChildOpeningLeftAnim = {
+#include "assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h b/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h
new file mode 100644
index 0000000000..9dc1ff7c21
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_0xE4E0_H
+#define GAMEPLAY_KEEP_0xE4E0_H
+
+#include "animation.h"
+
+extern s16 gDoorChildOpeningLeftFrameData[];
+extern JointIndex gDoorChildOpeningLeftJointIndices[];
+extern AnimationHeader gDoorChildOpeningLeftAnim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c b/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c
new file mode 100644
index 0000000000..6e8fabe309
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c
@@ -0,0 +1,25 @@
+#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"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h b/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h
new file mode 100644
index 0000000000..ddbefc6bc5
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h
@@ -0,0 +1,13 @@
+#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
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE770.c b/assets/objects/gameplay_keep/gameplay_keep_0xE770.c
new file mode 100644
index 0000000000..baeaf9a7c0
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xE770.c
@@ -0,0 +1,55 @@
+#include "gameplay_keep_0xE770.h"
+#include "array_count.h"
+#include "gfx.h"
+
+Vtx gDoorLeftVtx[] = {
+#include "assets/objects/gameplay_keep/gDoorLeftVtx.inc.c"
+};
+
+Vtx gDoorRightVtx[] = {
+#include "assets/objects/gameplay_keep/gDoorRightVtx.inc.c"
+};
+
+Vtx gDoorFrameVtx[] = {
+#include "assets/objects/gameplay_keep/gDoorFrameVtx.inc.c"
+};
+
+Gfx gDoorFrameDL[17] = {
+#include "assets/objects/gameplay_keep/gDoorFrameDL.inc.c"
+};
+
+Gfx gDoorLeftDL[41] = {
+#include "assets/objects/gameplay_keep/gDoorLeftDL.inc.c"
+};
+
+Gfx gDoorRightDL[39] = {
+#include "assets/objects/gameplay_keep/gDoorRightDL.inc.c"
+};
+
+u64 gWoodenDoorTex[TEX_LEN(u64, gWoodenDoorTex_WIDTH, gWoodenDoorTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gWoodenDoorTex.rgba16.inc.c"
+};
+
+StandardLimb gDoorSkelLimb0 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb0.inc.c"
+};
+
+StandardLimb gDoorSkelLimb1 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb1.inc.c"
+};
+
+StandardLimb gDoorSkelLimb2 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb2.inc.c"
+};
+
+StandardLimb gDoorSkelLimb3 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb3.inc.c"
+};
+
+void* gDoorLimbs[] = {
+#include "assets/objects/gameplay_keep/gDoorLimbs.inc.c"
+};
+
+SkeletonHeader gDoorSkel = {
+#include "assets/objects/gameplay_keep/gDoorSkel.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE770.h b/assets/objects/gameplay_keep/gameplay_keep_0xE770.h
new file mode 100644
index 0000000000..048c0b298a
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xE770.h
@@ -0,0 +1,32 @@
+#ifndef GAMEPLAY_KEEP_0xE770_H
+#define GAMEPLAY_KEEP_0xE770_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+#include "animation.h"
+
+extern Vtx gDoorLeftVtx[];
+extern Vtx gDoorRightVtx[];
+extern Vtx gDoorFrameVtx[];
+extern Gfx gDoorFrameDL[17];
+extern Gfx gDoorLeftDL[41];
+extern Gfx gDoorRightDL[39];
+#define gWoodenDoorTex_WIDTH 32
+#define gWoodenDoorTex_HEIGHT 64
+extern u64 gWoodenDoorTex[TEX_LEN(u64, gWoodenDoorTex_WIDTH, gWoodenDoorTex_HEIGHT, 16)];
+extern StandardLimb gDoorSkelLimb0;
+extern StandardLimb gDoorSkelLimb1;
+extern StandardLimb gDoorSkelLimb2;
+extern StandardLimb gDoorSkelLimb3;
+extern void* gDoorLimbs[];
+typedef enum gDoorSkelLimb {
+ /* 0 */ DOOR_LIMB_NONE,
+ /* 1 */ DOOR_LIMB_0,
+ /* 2 */ DOOR_LIMB_1,
+ /* 3 */ DOOR_LIMB_2,
+ /* 4 */ DOOR_LIMB_3,
+ /* 5 */ DOOR_LIMB_MAX
+} gDoorSkelLimb;
+extern SkeletonHeader gDoorSkel;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xFF80.c b/assets/objects/gameplay_keep/gameplay_keep_0xFF80.c
new file mode 100644
index 0000000000..93d8617465
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xFF80.c
@@ -0,0 +1,13 @@
+#include "gameplay_keep_0xFF80.h"
+
+s16 gDoorAdultOpeningRightFrameData[] = {
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningRightFrameData.inc.c"
+};
+
+JointIndex gDoorAdultOpeningRightJointIndices[] = {
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningRightJointIndices.inc.c"
+};
+
+AnimationHeader gDoorAdultOpeningRightAnim = {
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xFF80.h b/assets/objects/gameplay_keep/gameplay_keep_0xFF80.h
new file mode 100644
index 0000000000..c538156999
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_0xFF80.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_0xFF80_H
+#define GAMEPLAY_KEEP_0xFF80_H
+
+#include "animation.h"
+
+extern s16 gDoorAdultOpeningRightFrameData[];
+extern JointIndex gDoorAdultOpeningRightJointIndices[];
+extern AnimationHeader gDoorAdultOpeningRightAnim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.c
new file mode 100644
index 0000000000..05beb5200d
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.c
@@ -0,0 +1,12 @@
+#include "gameplay_keep_ntsc_0x39850.h"
+#include "gameplay_keep_0x32090.h"
+#include "gameplay_keep_0x38FB0.h"
+#include "gfx.h"
+
+Vtx gameplay_keep_Vtx_039850[] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039850.inc.c"
+};
+
+Gfx gGameplayKeepDL_39890[27] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepDL_39890.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.h
new file mode 100644
index 0000000000..7afb06908a
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_NTSC_0x39850_H
+#define GAMEPLAY_KEEP_NTSC_0x39850_H
+
+#include "ultra64.h"
+#include "region.h"
+
+#if OOT_REGION != REGION_EU
+extern Vtx gameplay_keep_Vtx_039850[];
+extern Gfx gGameplayKeepDL_39890[27];
+#endif
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
new file mode 100644
index 0000000000..b1f4b856fd
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
@@ -0,0 +1,11 @@
+#include "gameplay_keep_ntsc_0x39970.h"
+#include "item_drops_ntsc.h"
+#include "gfx.h"
+
+Vtx gameplay_keep_Vtx_039970[] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039970.inc.c"
+};
+
+Gfx gGameplayKeepDL_399B0[17] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepDL_399B0.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
new file mode 100644
index 0000000000..2c652a06a3
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_NTSC_0x39970_H
+#define GAMEPLAY_KEEP_NTSC_0x39970_H
+
+#include "ultra64.h"
+#include "region.h"
+
+#if OOT_REGION != REGION_EU
+extern Vtx gameplay_keep_Vtx_039970[];
+extern Gfx gGameplayKeepDL_399B0[17];
+#endif
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
new file mode 100644
index 0000000000..2639baf8b8
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
@@ -0,0 +1,11 @@
+#include "gameplay_keep_ntsc_0x39A40.h"
+#include "item_drops_ntsc.h"
+#include "gfx.h"
+
+Vtx gameplay_keep_Vtx_039A40[] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039A40.inc.c"
+};
+
+Gfx gGameplayKeepDL_39A80[17] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepDL_39A80.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
new file mode 100644
index 0000000000..1526f1e101
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_NTSC_0x39A40_H
+#define GAMEPLAY_KEEP_NTSC_0x39A40_H
+
+#include "ultra64.h"
+#include "region.h"
+
+#if OOT_REGION != REGION_EU
+extern Vtx gameplay_keep_Vtx_039A40[];
+extern Gfx gGameplayKeepDL_39A80[17];
+#endif
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
new file mode 100644
index 0000000000..29dede5c82
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
@@ -0,0 +1,11 @@
+#include "gameplay_keep_ntsc_0x39B10.h"
+#include "item_drops_ntsc.h"
+#include "gfx.h"
+
+Vtx gameplay_keep_Vtx_039B10[] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039B10.inc.c"
+};
+
+Gfx gGameplayKeepDL_39B50[17] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepDL_39B50.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
new file mode 100644
index 0000000000..c90445eee2
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_NTSC_0x39B10
+#define GAMEPLAY_KEEP_NTSC_0x39B10
+
+#include "ultra64.h"
+#include "region.h"
+
+#if OOT_REGION != REGION_EU
+extern Vtx gameplay_keep_Vtx_039B10[];
+extern Gfx gGameplayKeepDL_39B50[17];
+#endif
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.c
new file mode 100644
index 0000000000..e15374a1cc
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.c
@@ -0,0 +1,20 @@
+#include "gameplay_keep_ntsc_0x3C610.h"
+#include "gameplay_keep_ntsc_0x46A40.h"
+#include "hilite_textures.h"
+#include "gfx.h"
+
+Vtx gameplay_keep_Vtx_03C610[] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_03C610.inc.c"
+};
+
+Vtx gameplay_keep_Vtx_03CB10[] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_03CB10.inc.c"
+};
+
+Gfx gGameplayKeepDL_3CFD0[39] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepDL_3CFD0.inc.c"
+};
+
+Gfx gGameplayKeepDL_3D108[34] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepDL_3D108.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.h
new file mode 100644
index 0000000000..51465e8b1c
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.h
@@ -0,0 +1,14 @@
+#ifndef GAMEPLAY_KEEP_NTSC_0x3C610_H
+#define GAMEPLAY_KEEP_NTSC_0x3C610_H
+
+#include "ultra64.h"
+#include "region.h"
+
+#if OOT_REGION != REGION_EU
+extern Vtx gameplay_keep_Vtx_03C610[];
+extern Vtx gameplay_keep_Vtx_03CB10[];
+extern Gfx gGameplayKeepDL_3CFD0[39];
+extern Gfx gGameplayKeepDL_3D108[34];
+#endif
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
new file mode 100644
index 0000000000..d038f02985
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
@@ -0,0 +1,11 @@
+#include "gameplay_keep_ntsc_0x3D220.h"
+#include "gameplay_keep_ntsc_0x46A40.h"
+#include "gfx.h"
+
+Vtx gameplay_keep_Vtx_03D220[] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_03D220.inc.c"
+};
+
+Gfx gGameplayKeepDL_3D260[17] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepDL_3D260.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
new file mode 100644
index 0000000000..692252d098
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_NTSC_0x3D220_H
+#define GAMEPLAY_KEEP_NTSC_0x3D220_H
+
+#include "ultra64.h"
+#include "region.h"
+
+#if OOT_REGION != REGION_EU
+extern Vtx gameplay_keep_Vtx_03D220[];
+extern Gfx gGameplayKeepDL_3D260[17];
+#endif
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c
new file mode 100644
index 0000000000..32e5231747
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c
@@ -0,0 +1,9 @@
+#include "gameplay_keep_ntsc_0x3FD80.h"
+
+u64 gGameplayKeepTex_3FD80[TEX_LEN(u64, gGameplayKeepTex_3FD80_WIDTH, gGameplayKeepTex_3FD80_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepTex_3FD80.rgba16.inc.c"
+};
+
+u64 gGameplayKeepTex_40580[TEX_LEN(u64, gGameplayKeepTex_40580_WIDTH, gGameplayKeepTex_40580_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepTex_40580.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h
new file mode 100644
index 0000000000..db26e01d76
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h
@@ -0,0 +1,17 @@
+#ifndef GAMEPLAY_KEEP_NTSC_0x3FD80_H
+#define GAMEPLAY_KEEP_NTSC_0x3FD80_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+#include "region.h"
+
+#if OOT_REGION != REGION_EU
+#define gGameplayKeepTex_3FD80_WIDTH 32
+#define gGameplayKeepTex_3FD80_HEIGHT 32
+extern u64 gGameplayKeepTex_3FD80[TEX_LEN(u64, gGameplayKeepTex_3FD80_WIDTH, gGameplayKeepTex_3FD80_HEIGHT, 16)];
+#define gGameplayKeepTex_40580_WIDTH 32
+#define gGameplayKeepTex_40580_HEIGHT 32
+extern u64 gGameplayKeepTex_40580[TEX_LEN(u64, gGameplayKeepTex_40580_WIDTH, gGameplayKeepTex_40580_HEIGHT, 16)];
+#endif
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
new file mode 100644
index 0000000000..08a7e1db21
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
@@ -0,0 +1,5 @@
+#include "gameplay_keep_ntsc_0x41580.h"
+
+u64 gGameplayKeepTex_41580[TEX_LEN(u64, gGameplayKeepTex_41580_WIDTH, gGameplayKeepTex_41580_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepTex_41580.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
new file mode 100644
index 0000000000..5400c4f488
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
@@ -0,0 +1,14 @@
+#ifndef GAMEPLAY_KEEP_NTSC_0x41580_H
+#define GAMEPLAY_KEEP_NTSC_0x41580_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+#include "region.h"
+
+#if OOT_REGION != REGION_EU
+#define gGameplayKeepTex_41580_WIDTH 32
+#define gGameplayKeepTex_41580_HEIGHT 32
+extern u64 gGameplayKeepTex_41580[TEX_LEN(u64, gGameplayKeepTex_41580_WIDTH, gGameplayKeepTex_41580_HEIGHT, 16)];
+#endif
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
new file mode 100644
index 0000000000..6b4a6d8749
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
@@ -0,0 +1,13 @@
+#include "gameplay_keep_ntsc_0x46A40.h"
+
+u64 gGameplayKeepTex_46A40[TEX_LEN(u64, gGameplayKeepTex_46A40_WIDTH, gGameplayKeepTex_46A40_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepTex_46A40.rgba16.inc.c"
+};
+
+u64 gGameplayKeepTex_46A60[TEX_LEN(u64, gGameplayKeepTex_46A60_WIDTH, gGameplayKeepTex_46A60_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepTex_46A60.rgba16.inc.c"
+};
+
+u64 gGameplayKeepTex_47260[TEX_LEN(u64, gGameplayKeepTex_47260_WIDTH, gGameplayKeepTex_47260_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepTex_47260.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h
new file mode 100644
index 0000000000..670e335b0c
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h
@@ -0,0 +1,17 @@
+#ifndef GAMEPLAY_KEEP_NTSC_0x46A40
+#define GAMEPLAY_KEEP_NTSC_0x46A40
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gGameplayKeepTex_46A40_WIDTH 4
+#define gGameplayKeepTex_46A40_HEIGHT 4
+extern u64 gGameplayKeepTex_46A40[TEX_LEN(u64, gGameplayKeepTex_46A40_WIDTH, gGameplayKeepTex_46A40_HEIGHT, 16)];
+#define gGameplayKeepTex_46A60_WIDTH 32
+#define gGameplayKeepTex_46A60_HEIGHT 32
+extern u64 gGameplayKeepTex_46A60[TEX_LEN(u64, gGameplayKeepTex_46A60_WIDTH, gGameplayKeepTex_46A60_HEIGHT, 16)];
+#define gGameplayKeepTex_47260_WIDTH 32
+#define gGameplayKeepTex_47260_HEIGHT 32
+extern u64 gGameplayKeepTex_47260[TEX_LEN(u64, gGameplayKeepTex_47260_WIDTH, gGameplayKeepTex_47260_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.c
new file mode 100644
index 0000000000..5c716135bf
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.c
@@ -0,0 +1,12 @@
+#include "gameplay_keep_ntsc_0xC880.h"
+#include "gameplay_keep_ntsc_0xCE60.h"
+#include "gfx.h"
+#include "region.h"
+
+Vtx gameplay_keep_Vtx_00C880[] = {
+#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_00C880.inc.c"
+};
+
+Gfx gGameplayKeepDL_C8B0[14] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepDL_C8B0.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.h
new file mode 100644
index 0000000000..1d265d2953
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_NTSC_0xC880
+#define GAMEPLAY_KEEP_NTSC_0xC880
+
+#include "ultra64.h"
+#include "region.h"
+
+#if OOT_REGION != REGION_EU
+extern Vtx gameplay_keep_Vtx_00C880[];
+extern Gfx gGameplayKeepDL_C8B0[14];
+#endif
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.c
new file mode 100644
index 0000000000..6b67fe0dba
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.c
@@ -0,0 +1,5 @@
+#include "gameplay_keep_ntsc_0xCE60.h"
+
+u64 gGameplayKeepTex_CE60[TEX_LEN(u64, gGameplayKeepTex_CE60_WIDTH, gGameplayKeepTex_CE60_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepTex_CE60.ia8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.h
new file mode 100644
index 0000000000..a1b1f276d4
--- /dev/null
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.h
@@ -0,0 +1,14 @@
+#ifndef GAMEPLAY_KEEP_NTSC_0xCE60
+#define GAMEPLAY_KEEP_NTSC_0xCE60
+
+#include "tex_len.h"
+#include "ultra64.h"
+#include "region.h"
+
+#if OOT_REGION != REGION_EU
+#define gGameplayKeepTex_CE60_WIDTH 32
+#define gGameplayKeepTex_CE60_HEIGHT 32
+extern u64 gGameplayKeepTex_CE60[TEX_LEN(u64, gGameplayKeepTex_CE60_WIDTH, gGameplayKeepTex_CE60_HEIGHT, 8)];
+#endif
+
+#endif
diff --git a/assets/objects/gameplay_keep/grass_blades_model.c b/assets/objects/gameplay_keep/grass_blades_model.c
new file mode 100644
index 0000000000..1109349caa
--- /dev/null
+++ b/assets/objects/gameplay_keep/grass_blades_model.c
@@ -0,0 +1,11 @@
+#include "grass_blades_model.h"
+#include "gameplay_keep_0x44530.h"
+#include "gfx.h"
+
+Vtx gGrassBladesVtx[] = {
+#include "assets/objects/gameplay_keep/gGrassBladesVtx.inc.c"
+};
+
+Gfx gGrassBladesDL[21] = {
+#include "assets/objects/gameplay_keep/gGrassBladesDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/grass_blades_model.h b/assets/objects/gameplay_keep/grass_blades_model.h
new file mode 100644
index 0000000000..5f3e48d26f
--- /dev/null
+++ b/assets/objects/gameplay_keep/grass_blades_model.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_GRASS_BLADES_MODEL_H
+#define GAMEPLAY_KEEP_GRASS_BLADES_MODEL_H
+
+#include "ultra64.h"
+
+extern Vtx gGrassBladesVtx[];
+extern Gfx gGrassBladesDL[21];
+
+#endif
diff --git a/assets/objects/gameplay_keep/heart_piece_interior_model.c b/assets/objects/gameplay_keep/heart_piece_interior_model.c
new file mode 100644
index 0000000000..6ecaa3145b
--- /dev/null
+++ b/assets/objects/gameplay_keep/heart_piece_interior_model.c
@@ -0,0 +1,12 @@
+#include "heart_piece_interior_model.h"
+#include "gameplay_keep_0x3AC30.h"
+#include "gameplay_keep_0x32090.h"
+#include "gfx.h"
+
+Vtx gHeartPieceInteriorVtx[] = {
+#include "assets/objects/gameplay_keep/gHeartPieceInteriorVtx.inc.c"
+};
+
+Gfx gHeartPieceInteriorDL[53] = {
+#include "assets/objects/gameplay_keep/gHeartPieceInteriorDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/heart_piece_interior_model.h b/assets/objects/gameplay_keep/heart_piece_interior_model.h
new file mode 100644
index 0000000000..30f8ca44b4
--- /dev/null
+++ b/assets/objects/gameplay_keep/heart_piece_interior_model.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_HEART_PIECE_INTERIOR_MODEL_H
+#define GAMEPLAY_KEEP_HEART_PIECE_INTERIOR_MODEL_H
+
+#include "ultra64.h"
+
+extern Vtx gHeartPieceInteriorVtx[];
+extern Gfx gHeartPieceInteriorDL[53];
+
+#endif
diff --git a/assets/objects/gameplay_keep/hilite3_tex.c b/assets/objects/gameplay_keep/hilite3_tex.c
new file mode 100644
index 0000000000..d2b5e6ec43
--- /dev/null
+++ b/assets/objects/gameplay_keep/hilite3_tex.c
@@ -0,0 +1,6 @@
+#include "hilite3_tex.h"
+#include "gfx.h"
+
+u64 gHilite3Tex[TEX_LEN(u64, gHilite3Tex_WIDTH, gHilite3Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gHilite3Tex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/hilite3_tex.h b/assets/objects/gameplay_keep/hilite3_tex.h
new file mode 100644
index 0000000000..959892dde4
--- /dev/null
+++ b/assets/objects/gameplay_keep/hilite3_tex.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_HILITE3_TEX_H
+#define GAMEPLAY_KEEP_HILITE3_TEX_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gHilite3Tex_WIDTH 8
+#define gHilite3Tex_HEIGHT 8
+extern u64 gHilite3Tex[TEX_LEN(u64, gHilite3Tex_WIDTH, gHilite3Tex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/hilite4_tex.c b/assets/objects/gameplay_keep/hilite4_tex.c
new file mode 100644
index 0000000000..499a2b5b98
--- /dev/null
+++ b/assets/objects/gameplay_keep/hilite4_tex.c
@@ -0,0 +1,5 @@
+#include "hilite4_tex.h"
+
+u64 gHilite4Tex[TEX_LEN(u64, gHilite4Tex_WIDTH, gHilite4Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gHilite4Tex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/hilite4_tex.h b/assets/objects/gameplay_keep/hilite4_tex.h
new file mode 100644
index 0000000000..5725ada2cb
--- /dev/null
+++ b/assets/objects/gameplay_keep/hilite4_tex.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_HILITE4_TEX_H
+#define GAMEPLAY_KEEP_HILITE4_TEX_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gHilite4Tex_WIDTH 32
+#define gHilite4Tex_HEIGHT 32
+extern u64 gHilite4Tex[TEX_LEN(u64, gHilite4Tex_WIDTH, gHilite4Tex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/hilite_textures.c b/assets/objects/gameplay_keep/hilite_textures.c
new file mode 100644
index 0000000000..1d047357e1
--- /dev/null
+++ b/assets/objects/gameplay_keep/hilite_textures.c
@@ -0,0 +1,9 @@
+#include "hilite_textures.h"
+
+u64 gHilite1Tex[TEX_LEN(u64, gHilite1Tex_WIDTH, gHilite1Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gHilite1Tex.rgba16.inc.c"
+};
+
+u64 gHilite2Tex[TEX_LEN(u64, gHilite2Tex_WIDTH, gHilite2Tex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gHilite2Tex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/hilite_textures.h b/assets/objects/gameplay_keep/hilite_textures.h
new file mode 100644
index 0000000000..d3f070cd7d
--- /dev/null
+++ b/assets/objects/gameplay_keep/hilite_textures.h
@@ -0,0 +1,14 @@
+#ifndef GAMEPLAY_KEEP_HILITE_TEXTURES_H
+#define GAMEPLAY_KEEP_HILITE_TEXTURES_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gHilite1Tex_WIDTH 16
+#define gHilite1Tex_HEIGHT 16
+extern u64 gHilite1Tex[TEX_LEN(u64, gHilite1Tex_WIDTH, gHilite1Tex_HEIGHT, 16)];
+#define gHilite2Tex_WIDTH 16
+#define gHilite2Tex_HEIGHT 16
+extern u64 gHilite2Tex[TEX_LEN(u64, gHilite2Tex_WIDTH, gHilite2Tex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/hover_boots_circle.c b/assets/objects/gameplay_keep/hover_boots_circle.c
new file mode 100644
index 0000000000..37f68fd298
--- /dev/null
+++ b/assets/objects/gameplay_keep/hover_boots_circle.c
@@ -0,0 +1,18 @@
+#include "hover_boots_circle.h"
+#include "gfx.h"
+
+u64 gEffUnknown13Tex[TEX_LEN(u64, gEffUnknown13Tex_WIDTH, gEffUnknown13Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown13Tex.i8.inc.c"
+};
+
+u64 gEffUnknown14Tex[TEX_LEN(u64, gEffUnknown14Tex_WIDTH, gEffUnknown14Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnknown14Tex.i8.inc.c"
+};
+
+Vtx gHoverBootsCircleVtx[] = {
+#include "assets/objects/gameplay_keep/gHoverBootsCircleVtx.inc.c"
+};
+
+Gfx gHoverBootsCircleDL[26] = {
+#include "assets/objects/gameplay_keep/gHoverBootsCircleDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/hover_boots_circle.h b/assets/objects/gameplay_keep/hover_boots_circle.h
new file mode 100644
index 0000000000..16db4a2ac6
--- /dev/null
+++ b/assets/objects/gameplay_keep/hover_boots_circle.h
@@ -0,0 +1,16 @@
+#ifndef GAMEPLAY_KEEP_HOVER_BOOTS_CIRCLE_H
+#define GAMEPLAY_KEEP_HOVER_BOOTS_CIRCLE_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffUnknown13Tex_WIDTH 16
+#define gEffUnknown13Tex_HEIGHT 32
+extern u64 gEffUnknown13Tex[TEX_LEN(u64, gEffUnknown13Tex_WIDTH, gEffUnknown13Tex_HEIGHT, 8)];
+#define gEffUnknown14Tex_WIDTH 16
+#define gEffUnknown14Tex_HEIGHT 32
+extern u64 gEffUnknown14Tex[TEX_LEN(u64, gEffUnknown14Tex_WIDTH, gEffUnknown14Tex_HEIGHT, 8)];
+extern Vtx gHoverBootsCircleVtx[];
+extern Gfx gHoverBootsCircleDL[26];
+
+#endif
diff --git a/assets/objects/gameplay_keep/item_drop_dl.c b/assets/objects/gameplay_keep/item_drop_dl.c
new file mode 100644
index 0000000000..88808e66f1
--- /dev/null
+++ b/assets/objects/gameplay_keep/item_drop_dl.c
@@ -0,0 +1,11 @@
+#include "item_drop_dl.h"
+#include "gfx.h"
+#include "region.h"
+
+Gfx gItemDropDL[17] = {
+#include "assets/objects/gameplay_keep/gItemDropDL.inc.c"
+};
+
+Vtx gItemDropVtx[] = {
+#include "assets/objects/gameplay_keep/gItemDropVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/item_drop_dl.h b/assets/objects/gameplay_keep/item_drop_dl.h
new file mode 100644
index 0000000000..6caaa6863b
--- /dev/null
+++ b/assets/objects/gameplay_keep/item_drop_dl.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_ITEM_DROP_DL_H
+#define GAMEPLAY_KEEP_ITEM_DROP_DL_H
+
+#include "ultra64.h"
+
+extern Gfx gItemDropDL[17];
+extern Vtx gItemDropVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/item_drops_ntsc.c b/assets/objects/gameplay_keep/item_drops_ntsc.c
new file mode 100644
index 0000000000..3857482745
--- /dev/null
+++ b/assets/objects/gameplay_keep/item_drops_ntsc.c
@@ -0,0 +1,13 @@
+#include "item_drops_ntsc.h"
+
+u64 gGameplayKeepTex_45220[TEX_LEN(u64, gGameplayKeepTex_45220_WIDTH, gGameplayKeepTex_45220_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepTex_45220.rgba16.inc.c"
+};
+
+u64 gGameplayKeepTex_45A20[TEX_LEN(u64, gGameplayKeepTex_45A20_WIDTH, gGameplayKeepTex_45A20_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepTex_45A20.rgba16.inc.c"
+};
+
+u64 gGameplayKeepTex_46220[TEX_LEN(u64, gGameplayKeepTex_46220_WIDTH, gGameplayKeepTex_46220_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gGameplayKeepTex_46220.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/item_drops_ntsc.h b/assets/objects/gameplay_keep/item_drops_ntsc.h
new file mode 100644
index 0000000000..50bd638430
--- /dev/null
+++ b/assets/objects/gameplay_keep/item_drops_ntsc.h
@@ -0,0 +1,20 @@
+#ifndef GAMEPLAY_KEEP_ITEM_DROPS_NTSC_H
+#define GAMEPLAY_KEEP_ITEM_DROPS_NTSC_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+#include "region.h"
+
+#if OOT_REGION != REGION_EU
+#define gGameplayKeepTex_45220_WIDTH 32
+#define gGameplayKeepTex_45220_HEIGHT 32
+extern u64 gGameplayKeepTex_45220[TEX_LEN(u64, gGameplayKeepTex_45220_WIDTH, gGameplayKeepTex_45220_HEIGHT, 16)];
+#define gGameplayKeepTex_45A20_WIDTH 32
+#define gGameplayKeepTex_45A20_HEIGHT 32
+extern u64 gGameplayKeepTex_45A20[TEX_LEN(u64, gGameplayKeepTex_45A20_WIDTH, gGameplayKeepTex_45A20_HEIGHT, 16)];
+#define gGameplayKeepTex_46220_WIDTH 32
+#define gGameplayKeepTex_46220_HEIGHT 32
+extern u64 gGameplayKeepTex_46220[TEX_LEN(u64, gGameplayKeepTex_46220_WIDTH, gGameplayKeepTex_46220_HEIGHT, 16)];
+#endif
+
+#endif
diff --git a/assets/objects/gameplay_keep/lens_flare.c b/assets/objects/gameplay_keep/lens_flare.c
new file mode 100644
index 0000000000..dce719ed30
--- /dev/null
+++ b/assets/objects/gameplay_keep/lens_flare.c
@@ -0,0 +1,22 @@
+#include "lens_flare.h"
+#include "gfx.h"
+
+u64 gLensFlareCircleTex[TEX_LEN(u64, gLensFlareCircleTex_WIDTH, gLensFlareCircleTex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gLensFlareCircleTex.i4.inc.c"
+};
+
+u64 gLensFlareRingTex[TEX_LEN(u64, gLensFlareRingTex_WIDTH, gLensFlareRingTex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gLensFlareRingTex.i4.inc.c"
+};
+
+Gfx gLensFlareCircleDL[13] = {
+#include "assets/objects/gameplay_keep/gLensFlareCircleDL.inc.c"
+};
+
+Gfx gLensFlareRingDL[13] = {
+#include "assets/objects/gameplay_keep/gLensFlareRingDL.inc.c"
+};
+
+Vtx gLensFlareVtx[] = {
+#include "assets/objects/gameplay_keep/gLensFlareVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/lens_flare.h b/assets/objects/gameplay_keep/lens_flare.h
new file mode 100644
index 0000000000..7c1fb6bab9
--- /dev/null
+++ b/assets/objects/gameplay_keep/lens_flare.h
@@ -0,0 +1,17 @@
+#ifndef GAMEPLAY_KEEP_LENS_FLARE_H
+#define GAMEPLAY_KEEP_LENS_FLARE_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gLensFlareCircleTex_WIDTH 64
+#define gLensFlareCircleTex_HEIGHT 64
+extern u64 gLensFlareCircleTex[TEX_LEN(u64, gLensFlareCircleTex_WIDTH, gLensFlareCircleTex_HEIGHT, 4)];
+#define gLensFlareRingTex_WIDTH 64
+#define gLensFlareRingTex_HEIGHT 64
+extern u64 gLensFlareRingTex[TEX_LEN(u64, gLensFlareRingTex_WIDTH, gLensFlareRingTex_HEIGHT, 4)];
+extern Gfx gLensFlareCircleDL[13];
+extern Gfx gLensFlareRingDL[13];
+extern Vtx gLensFlareVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/lens_mask_tex.c b/assets/objects/gameplay_keep/lens_mask_tex.c
new file mode 100644
index 0000000000..a59ddbbdbc
--- /dev/null
+++ b/assets/objects/gameplay_keep/lens_mask_tex.c
@@ -0,0 +1,5 @@
+#include "lens_mask_tex.h"
+
+u64 gLensOfTruthMaskTex[TEX_LEN(u64, gLensOfTruthMaskTex_WIDTH, gLensOfTruthMaskTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gLensOfTruthMaskTex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/lens_mask_tex.h b/assets/objects/gameplay_keep/lens_mask_tex.h
new file mode 100644
index 0000000000..18a48d4b20
--- /dev/null
+++ b/assets/objects/gameplay_keep/lens_mask_tex.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_LENS_MASK_TEX_H
+#define GAMEPLAY_KEEP_LENS_MASK_TEX_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gLensOfTruthMaskTex_WIDTH 64
+#define gLensOfTruthMaskTex_HEIGHT 64
+extern u64 gLensOfTruthMaskTex[TEX_LEN(u64, gLensOfTruthMaskTex_WIDTH, gLensOfTruthMaskTex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/liftable_rock_model.c b/assets/objects/gameplay_keep/liftable_rock_model.c
new file mode 100644
index 0000000000..d48dda9552
--- /dev/null
+++ b/assets/objects/gameplay_keep/liftable_rock_model.c
@@ -0,0 +1,11 @@
+#include "liftable_rock_model.h"
+#include "gameplay_keep_0x42530.h"
+#include "gfx.h"
+
+Vtx gLiftableRockVtx[] = {
+#include "assets/objects/gameplay_keep/gLiftableRockVtx.inc.c"
+};
+
+Gfx gLiftableRockDL[22] = {
+#include "assets/objects/gameplay_keep/gLiftableRockDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/liftable_rock_model.h b/assets/objects/gameplay_keep/liftable_rock_model.h
new file mode 100644
index 0000000000..3d7499a55a
--- /dev/null
+++ b/assets/objects/gameplay_keep/liftable_rock_model.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_LIFTABLE_ROCK_MODEL_H
+#define GAMEPLAY_KEEP_LIFTABLE_ROCK_MODEL_H
+
+#include "ultra64.h"
+
+extern Vtx gLiftableRockVtx[];
+extern Gfx gLiftableRockDL[22];
+
+#endif
diff --git a/assets/objects/gameplay_keep/link_textures.c b/assets/objects/gameplay_keep/link_textures.c
new file mode 100644
index 0000000000..472f1eb2ee
--- /dev/null
+++ b/assets/objects/gameplay_keep/link_textures.c
@@ -0,0 +1,17 @@
+#include "link_textures.h"
+
+u64 gLinkHairTex[TEX_LEN(u64, gLinkHairTex_WIDTH, gLinkHairTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gLinkHairTex.rgba16.inc.c"
+};
+
+u64 gLinkTunic1Tex[TEX_LEN(u64, gLinkTunic1Tex_WIDTH, gLinkTunic1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gLinkTunic1Tex.i8.inc.c"
+};
+
+u64 gLinkTunic2Tex[TEX_LEN(u64, gLinkTunic2Tex_WIDTH, gLinkTunic2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gLinkTunic2Tex.i8.inc.c"
+};
+
+u64 gLinkTunic3Tex[TEX_LEN(u64, gLinkTunic3Tex_WIDTH, gLinkTunic3Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gLinkTunic3Tex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/link_textures.h b/assets/objects/gameplay_keep/link_textures.h
new file mode 100644
index 0000000000..459f32a46a
--- /dev/null
+++ b/assets/objects/gameplay_keep/link_textures.h
@@ -0,0 +1,20 @@
+#ifndef GAMEPLAY_KEEP_LINK_TEXTURES_H
+#define GAMEPLAY_KEEP_LINK_TEXTURES_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gLinkHairTex_WIDTH 16
+#define gLinkHairTex_HEIGHT 16
+extern u64 gLinkHairTex[TEX_LEN(u64, gLinkHairTex_WIDTH, gLinkHairTex_HEIGHT, 16)];
+#define gLinkTunic1Tex_WIDTH 16
+#define gLinkTunic1Tex_HEIGHT 16
+extern u64 gLinkTunic1Tex[TEX_LEN(u64, gLinkTunic1Tex_WIDTH, gLinkTunic1Tex_HEIGHT, 8)];
+#define gLinkTunic2Tex_WIDTH 16
+#define gLinkTunic2Tex_HEIGHT 32
+extern u64 gLinkTunic2Tex[TEX_LEN(u64, gLinkTunic2Tex_WIDTH, gLinkTunic2Tex_HEIGHT, 8)];
+#define gLinkTunic3Tex_WIDTH 16
+#define gLinkTunic3Tex_HEIGHT 16
+extern u64 gLinkTunic3Tex[TEX_LEN(u64, gLinkTunic3Tex_WIDTH, gLinkTunic3Tex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/lock_on_arrow.c b/assets/objects/gameplay_keep/lock_on_arrow.c
new file mode 100644
index 0000000000..32c1e1345a
--- /dev/null
+++ b/assets/objects/gameplay_keep/lock_on_arrow.c
@@ -0,0 +1,11 @@
+#include "lock_on_arrow.h"
+#include "hilite3_tex.h"
+#include "gfx.h"
+
+Vtx gLockOnArrowVtx[] = {
+#include "assets/objects/gameplay_keep/gLockOnArrowVtx.inc.c"
+};
+
+Gfx gLockOnArrowDL[34] = {
+#include "assets/objects/gameplay_keep/gLockOnArrowDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/lock_on_arrow.h b/assets/objects/gameplay_keep/lock_on_arrow.h
new file mode 100644
index 0000000000..2cadbdaaed
--- /dev/null
+++ b/assets/objects/gameplay_keep/lock_on_arrow.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_LOCK_ON_ARROW_H
+#define GAMEPLAY_KEEP_LOCK_ON_ARROW_H
+
+#include "ultra64.h"
+
+extern Vtx gLockOnArrowVtx[];
+extern Gfx gLockOnArrowDL[34];
+
+#endif
diff --git a/assets/objects/gameplay_keep/lock_on_reticle.c b/assets/objects/gameplay_keep/lock_on_reticle.c
new file mode 100644
index 0000000000..df6b21361b
--- /dev/null
+++ b/assets/objects/gameplay_keep/lock_on_reticle.c
@@ -0,0 +1,10 @@
+#include "lock_on_reticle.h"
+#include "gfx.h"
+
+Gfx gLockOnReticleTriangleDL[3] = {
+#include "assets/objects/gameplay_keep/gLockOnReticleTriangleDL.inc.c"
+};
+
+Vtx gLockOnReticleTriangleVtx[] = {
+#include "assets/objects/gameplay_keep/gLockOnReticleTriangleVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/lock_on_reticle.h b/assets/objects/gameplay_keep/lock_on_reticle.h
new file mode 100644
index 0000000000..d4bc12a9dd
--- /dev/null
+++ b/assets/objects/gameplay_keep/lock_on_reticle.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_LOCK_ON_RETICLE_H
+#define GAMEPLAY_KEEP_LOCK_ON_RETICLE_H
+
+#include "ultra64.h"
+
+extern Gfx gLockOnReticleTriangleDL[3];
+extern Vtx gLockOnReticleTriangleVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/moon.c b/assets/objects/gameplay_keep/moon.c
new file mode 100644
index 0000000000..124e9733df
--- /dev/null
+++ b/assets/objects/gameplay_keep/moon.c
@@ -0,0 +1,14 @@
+#include "moon.h"
+#include "gfx.h"
+
+u64 gMoonTex[TEX_LEN(u64, gMoonTex_WIDTH, gMoonTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gMoonTex.ia8.inc.c"
+};
+
+Gfx gMoonDL[14] = {
+#include "assets/objects/gameplay_keep/gMoonDL.inc.c"
+};
+
+Vtx gMoonVtx[] = {
+#include "assets/objects/gameplay_keep/gMoonVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/moon.h b/assets/objects/gameplay_keep/moon.h
new file mode 100644
index 0000000000..5adc4755b4
--- /dev/null
+++ b/assets/objects/gameplay_keep/moon.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_MOON_H
+#define GAMEPLAY_KEEP_MOON_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gMoonTex_WIDTH 64
+#define gMoonTex_HEIGHT 64
+extern u64 gMoonTex[TEX_LEN(u64, gMoonTex_WIDTH, gMoonTex_HEIGHT, 8)];
+extern Gfx gMoonDL[14];
+extern Vtx gMoonVtx[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/player_anim_headers.c b/assets/objects/gameplay_keep/player_anim_headers.c
new file mode 100644
index 0000000000..2fa2072a3d
--- /dev/null
+++ b/assets/objects/gameplay_keep/player_anim_headers.c
@@ -0,0 +1,2294 @@
+#include "player_anim_headers.h"
+#include "assets/misc/link_animetion/link_animetion.h"
+
+LinkAnimationHeader gPlayerAnim_clink_demo_DDbox_open = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_DDbox_open.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_Tbox_open = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_Tbox_open.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_atozusari = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_atozusari.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_bashi = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_bashi.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_doorA_link = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_doorA_link.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_doorB_link = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_doorB_link.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_futtobi = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_futtobi.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_get1 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_get1.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_get2 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_get2.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_get3 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_get3.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_goto_future = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_goto_future.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_koutai = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_koutai.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_koutai_kennuki = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_koutai_kennuki.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_koutai_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_koutai_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_mimawasi = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_mimawasi.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_mimawasi_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_mimawasi_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_miokuri = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_miokuri.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_miokuri_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_miokuri_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_nozoki = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_nozoki.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_return_to_future = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_return_to_future.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_standup = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_standup.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_demo_standup_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_demo_standup_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_normal_climb_endAL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_normal_climb_endAL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_normal_climb_endAR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_normal_climb_endAR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_normal_climb_endBL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_normal_climb_endBL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_normal_climb_endBR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_normal_climb_endBR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_normal_climb_startA = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_normal_climb_startA.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_normal_climb_startB = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_normal_climb_startB.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_normal_climb_upL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_normal_climb_upL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_normal_climb_upR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_normal_climb_upR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_normal_defense_ALL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_normal_defense_ALL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_op3_negaeri = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_op3_negaeri.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_op3_okiagari = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_op3_okiagari.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_op3_tatiagari = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_op3_tatiagari.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_op3_wait1 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_op3_wait1.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_op3_wait2 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_op3_wait2.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_clink_op3_wait3 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_clink_op3_wait3.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_d_link_imanodare = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_d_link_imanodare.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_d_link_orooro = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_d_link_orooro.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_d_link_orowait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_d_link_orowait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_demo_link_nwait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_demo_link_nwait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_demo_link_orosuu = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_demo_link_orosuu.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_demo_link_tewatashi = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_demo_link_tewatashi.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_demo_link_twait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_demo_link_twait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_kolink_odoroki_demo = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_kolink_odoroki_demo.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_LLside_kiru_endL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_LLside_kiru_endL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_LLside_kiru_finsh_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_LLside_kiru_finsh_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_LRside_kiru_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_LRside_kiru_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_LRside_kiru_finsh_endL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_LRside_kiru_finsh_endL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_Lnormal_kiru_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_Lnormal_kiru_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_Lpierce_kiru_endL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_Lpierce_kiru_endL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_Lrolling_kiru_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_Lrolling_kiru_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_Lside_kiru_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_Lside_kiru_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_Lside_kiru_finsh_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_Lside_kiru_finsh_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_Rside_kiru_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_Rside_kiru_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_Rside_kiru_finsh_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_Rside_kiru_finsh_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_anchor2fighter = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_anchor2fighter.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_back_brake = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_back_brake.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_back_hitR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_back_hitR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_back_walk = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_back_walk.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_bom_side_walkL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_bom_side_walkL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_bom_side_walkR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_bom_side_walkR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_defense_hit = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_defense_hit.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_defense_long_hitL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_defense_long_hitL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_defense_long_hitR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_defense_long_hitR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_front_hitR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_front_hitR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_jump_kiru_finsh_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_jump_kiru_finsh_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_landingR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_landingR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_normal_kiru_finsh_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_normal_kiru_finsh_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_pierce_kiru_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_pierce_kiru_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_pierce_kiru_finsh_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_pierce_kiru_finsh_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_power_kiru_wait_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_power_kiru_wait_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_rolling_kiru_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_rolling_kiru_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_side_walkL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_side_walkL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_side_walkR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_side_walkR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_002578 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_002578.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitL2defense = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitL2defense.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitL2defense_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitL2defense_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitL_defense = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitL_defense.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitL_defense_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitL_defense_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_0025A8 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_0025A8.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitL_pierce_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitL_pierce_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_0025B8 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_0025B8.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitR2defense = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitR2defense.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitR2defense_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitR2defense_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitR_defense = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitR_defense.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitR_defense_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitR_defense_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_0025E8 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_0025E8.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_anchor_waitR_pierce_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_anchor_waitR_pierce_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_boom_catch = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_boom_catch.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_boom_throwL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_boom_throwL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_boom_throwR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_boom_throwR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_002610 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_002610.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_boom_throw_side_walkL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_boom_throw_side_walkL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_boom_throw_side_walkR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_boom_throw_side_walkR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_boom_throw_wait2waitR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_boom_throw_wait2waitR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_boom_throw_waitL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_boom_throw_waitL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_boom_throw_waitR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_boom_throw_waitR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_bug_in = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_bug_in.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_bug_miss = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_bug_miss.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_bug_out = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_bug_out.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_drink_demo = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_drink_demo.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_drink_demo_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_drink_demo_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_drink_demo_start = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_drink_demo_start.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_drink_demo_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_drink_demo_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_fish_in = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_fish_in.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_fish_miss = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_fish_miss.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_fish_out = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_fish_out.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_read = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_read.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bottle_read_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bottle_read_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bow_bow_ready = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bow_bow_ready.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bow_bow_shoot = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bow_bow_shoot.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bow_bow_shoot_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bow_bow_shoot_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bow_bow_shoot_next = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bow_bow_shoot_next.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bow_bow_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bow_bow_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bow_defense = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bow_defense.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bow_defense_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bow_defense_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bow_side_runL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bow_side_runL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bow_side_runR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bow_side_runR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bow_side_walk = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bow_side_walk.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_bow_walk2ready = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_bow_walk2ready.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_child_tunnel_door = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_child_tunnel_door.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_child_tunnel_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_child_tunnel_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_child_tunnel_start = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_child_tunnel_start.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_DDbox_open = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_DDbox_open.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_Tbox_open = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_Tbox_open.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_back_to_past = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_back_to_past.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_baru_op1 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_baru_op1.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_baru_op2 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_baru_op2.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_baru_op3 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_baru_op3.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_bikkuri = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_bikkuri.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_doorA_link = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_doorA_link.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_doorA_link_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_doorA_link_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_doorB_link = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_doorB_link.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_doorB_link_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_doorB_link_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_furimuki2 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_furimuki2.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_furimuki2_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_furimuki2_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_furimuki = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_furimuki.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_get_itemA = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_get_itemA.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_get_itemB = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_get_itemB.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_goma_furimuki = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_goma_furimuki.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_gurad = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_gurad.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_gurad_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_gurad_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_jibunmiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_jibunmiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kakeyori = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kakeyori.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kakeyori_mimawasi = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kakeyori_mimawasi.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kakeyori_miokuri = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kakeyori_miokuri.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kakeyori_miokuri_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kakeyori_miokuri_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kakeyori_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kakeyori_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kaoage = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kaoage.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kaoage_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kaoage_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kenmiru1 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kenmiru1.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kenmiru1_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kenmiru1_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kenmiru2 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kenmiru2.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kenmiru2_modori = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kenmiru2_modori.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kenmiru2_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kenmiru2_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_kousan = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_kousan.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_look_hand = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_look_hand.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_look_hand_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_look_hand_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_nozokikomi = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_nozokikomi.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_nozokikomi_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_nozokikomi_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_return_to_past = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_return_to_past.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_002840 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_002840.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_sita_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_sita_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_ue = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_ue.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_ue_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_ue_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_warp = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_warp.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_zeldamiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_zeldamiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_demo_zeldamiru_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_demo_zeldamiru_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_derth_rebirth = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_derth_rebirth.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_LLside_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_LLside_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_LLside_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_LLside_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_LLside_kiru_finsh = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_LLside_kiru_finsh.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_LLside_kiru_finsh_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_LLside_kiru_finsh_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_LRside_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_LRside_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_LRside_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_LRside_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_LRside_kiru_finsh = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_LRside_kiru_finsh.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_LRside_kiru_finsh_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_LRside_kiru_finsh_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lnormal_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lnormal_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lnormal_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lnormal_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lnormal_kiru_finsh = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lnormal_kiru_finsh.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpierce_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpierce_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpierce_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpierce_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpierce_kiru_finsh = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpierce_kiru_finsh.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_jump_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpower_jump_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_jump_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpower_jump_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_jump_kiru_hit = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpower_jump_kiru_hit.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_kiru_side_walk = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpower_kiru_side_walk.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_kiru_start = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpower_kiru_start.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_kiru_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpower_kiru_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_kiru_wait_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpower_kiru_wait_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_kiru_walk = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lpower_kiru_walk.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lrolling_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lrolling_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lrolling_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lrolling_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lside_jump = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lside_jump.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lside_jump_endL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lside_jump_endL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lside_jump_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lside_jump_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lside_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lside_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lside_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lside_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lside_kiru_finsh = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lside_kiru_finsh.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Lside_kiru_finsh_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Lside_kiru_finsh_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Rside_jump = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Rside_jump.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Rside_jump_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Rside_jump_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Rside_jump_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Rside_jump_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Rside_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Rside_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Rside_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Rside_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Rside_kiru_finsh = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Rside_kiru_finsh.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Rside_kiru_finsh_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Rside_kiru_finsh_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Wrolling_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Wrolling_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_Wrolling_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_Wrolling_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_backturn_jump = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_backturn_jump.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_backturn_jump_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_backturn_jump_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_backturn_jump_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_backturn_jump_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_damage_run = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_damage_run.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_damage_run_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_damage_run_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_defense = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_defense.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_defense_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_defense_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_defense_long_hit = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_defense_long_hit.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_defense_long_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_defense_long_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_defense_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_defense_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_fighter2long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_fighter2long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_front_jump = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_front_jump.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_front_jump_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_front_jump_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_front_jump_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_front_jump_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_heavy_run_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_heavy_run_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_jump_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_jump_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_jump_kiru_finsh = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_jump_kiru_finsh.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_jump_kiru_finsh_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_jump_kiru_finsh_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_jump_rollkiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_jump_rollkiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_landing_roll_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_landing_roll_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_normal2fighter = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_normal2fighter.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_002A78 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_002A78.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_normal_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_normal_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_normal_kiru_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_normal_kiru_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_normal_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_normal_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_normal_kiru_finsh = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_normal_kiru_finsh.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_normal_kiru_finsh_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_normal_kiru_finsh_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_pierce_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_pierce_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_pierce_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_pierce_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_pierce_kiru_finsh = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_pierce_kiru_finsh.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_pierce_kiru_finsh_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_pierce_kiru_finsh_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_power_jump_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_power_jump_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_002AD0 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_002AD0.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_side_walk = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_power_kiru_side_walk.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_startL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_power_kiru_startL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_start = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_power_kiru_start.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_power_kiru_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_wait_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_power_kiru_wait_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_walk = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_power_kiru_walk.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_reboundR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_reboundR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_rebound = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_rebound.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_rebound_longR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_rebound_longR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_rebound_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_rebound_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_rolling_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_rolling_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_rolling_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_rolling_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_run = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_run.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_run_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_run_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_002B48 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_002B48.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_002B50 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_002B50.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_side_walkL_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_side_walkL_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_side_walkR_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_side_walkR_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_side_walk_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_side_walk_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_turn_kiruL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_turn_kiruL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_turn_kiruL_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_turn_kiruL_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_turn_kiruR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_turn_kiruR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_turn_kiruR_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_turn_kiruR_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_upper_kiruR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_upper_kiruR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_upper_pierce_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_upper_pierce_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_upper_pierce_kiru_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_upper_pierce_kiru_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_wait2waitL_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_wait2waitL_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_wait2waitR_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_wait2waitR_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_waitL2wait_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_waitL2wait_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_waitL_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_waitL_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_waitR2wait_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_waitR2wait_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_waitR_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_waitR_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_002BD8 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_002BD8.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_wait_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_wait_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_walk_endL_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_walk_endL_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_walk_endR_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_walk_endR_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fighter_walk_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fighter_walk_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fishing_fish_catch = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fishing_fish_catch.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fishing_fish_catch_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fishing_fish_catch_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fishing_reel_down = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fishing_reel_down.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fishing_reel_left = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fishing_reel_left.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fishing_reel_right = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fishing_reel_right.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fishing_reel_up = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fishing_reel_up.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fishing_throw = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fishing_throw.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_fishing_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_fishing_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hammer_hit = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hammer_hit.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hammer_hit_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hammer_hit_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hammer_hit_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hammer_hit_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hammer_long2free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hammer_long2free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hammer_long2long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hammer_long2long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hammer_normal2long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hammer_normal2long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hammer_side_hit = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hammer_side_hit.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hammer_side_hit_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hammer_side_hit_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hammer_side_hit_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hammer_side_hit_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hatto_demo = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hatto_demo.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hook_fly_start = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hook_fly_start.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hook_fly_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hook_fly_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hook_shot_ready = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hook_shot_ready.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hook_side_runL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hook_side_runL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hook_side_runR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hook_side_runR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hook_side_walk = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hook_side_walk.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hook_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hook_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_hook_walk2ready = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_hook_walk2ready.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_last_hit_motion1 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_last_hit_motion1.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_last_hit_motion2 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_last_hit_motion2.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_magic_honoo1 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_magic_honoo1.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_magic_honoo2 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_magic_honoo2.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_magic_honoo3 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_magic_honoo3.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_magic_kaze1 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_magic_kaze1.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_magic_kaze2 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_magic_kaze2.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_magic_kaze3 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_magic_kaze3.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_magic_tamashii1 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_magic_tamashii1.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_magic_tamashii2 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_magic_tamashii2.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_magic_tamashii3 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_magic_tamashii3.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_magic_tame = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_magic_tame.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_magic_tame_kaijyo = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_magic_tame_kaijyo.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_100step_up = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_100step_up.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_150step_up = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_150step_up.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_250jump_start = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_250jump_start.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_002D50 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_002D50.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_45_turn = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_45_turn.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_45_turn_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_45_turn_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_hold2upL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_Fclimb_hold2upL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_sideL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_Fclimb_sideL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_sideR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_Fclimb_sideR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_startA = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_Fclimb_startA.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_startB = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_Fclimb_startB.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_upL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_Fclimb_upL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_upR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_Fclimb_upR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_back_brake = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_back_brake.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_back_brake_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_back_brake_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_back_downA = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_back_downA.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_back_downB = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_back_downB.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_back_down_wake = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_back_down_wake.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_back_hit = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_back_hit.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_back_run = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_back_run.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_back_shitR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_back_shitR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_back_shit = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_back_shit.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_back_walk = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_back_walk.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_backspace = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_backspace.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_box_kick = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_box_kick.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_carryB = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_carryB.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_carryB_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_carryB_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_carryB_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_carryB_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_check = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_check.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_check_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_check_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_check_end_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_check_end_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_check_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_check_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_check_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_check_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_check_wait_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_check_wait_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_climb_down = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_climb_down.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_climb_endAL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_climb_endAL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_climb_endAR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_climb_endAR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_climb_endBL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_climb_endBL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_climb_endBR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_climb_endBR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_climb_startA = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_climb_startA.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_climb_startB = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_climb_startB.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_climb_upL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_climb_upL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_climb_upR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_climb_upR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_climb_up = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_climb_up.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_damage_run_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_damage_run_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_defense = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_defense.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_defense_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_defense_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_defense_end_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_defense_end_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_defense_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_defense_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_defense_hit = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_defense_hit.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_defense_kiru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_defense_kiru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_defense_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_defense_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_defense_wait_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_defense_wait_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_down_slope_slip = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_down_slope_slip.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_down_slope_slip_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_down_slope_slip_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_down_slope_slip_end_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_down_slope_slip_end_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_down_slope_slip_end_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_down_slope_slip_end_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_electric_shock = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_electric_shock.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_electric_shock_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_electric_shock_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_fall = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_fall.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_fall_up = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_fall_up.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_fall_up_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_fall_up_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_fall_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_fall_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_fighter2free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_fighter2free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_free2bom = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_free2bom.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_free2fighter_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_free2fighter_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_free2freeB = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_free2freeB.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_free2free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_free2free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_front_downA = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_front_downA.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_front_downB = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_front_downB.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_front_down_wake = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_front_down_wake.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_front_hit = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_front_hit.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_front_shitR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_front_shitR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_front_shit = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_front_shit.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_give_other = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_give_other.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_hang_up_down = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_hang_up_down.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_heavy_carry = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_heavy_carry.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_heavy_carry_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_heavy_carry_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_heavy_run = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_heavy_run.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_heavy_run_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_heavy_run_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_hip_down = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_hip_down.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_hip_down_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_hip_down_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_hip_down_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_hip_down_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_ice_down = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_ice_down.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_jump2landing = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_jump2landing.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_jump = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_jump.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_hold = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_jump_climb_hold.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_hold_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_jump_climb_hold_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_up = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_jump_climb_up.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_up_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_jump_climb_up_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_jump_climb_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_wait_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_jump_climb_wait_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_jump_up = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_jump_up.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_landing = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_landing.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_landing_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_landing_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_landing_roll = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_landing_roll.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_landing_roll_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_landing_roll_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_landing_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_landing_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_light_bom = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_light_bom.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_light_bom_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_light_bom_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_long2bom = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_long2bom.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_nocarry_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_nocarry_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_nocarry_free_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_nocarry_free_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_nocarry_free_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_nocarry_free_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_normal2bom = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_normal2bom.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_normal2fighter = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_normal2fighter.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_normal2fighter_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_normal2fighter_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_normal2free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_normal2free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_okarina_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_okarina_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_okarina_start = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_okarina_start.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_okarina_swing = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_okarina_swing.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_pull_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_pull_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_pull_end_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_pull_end_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_pull_start = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_pull_start.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_pull_start_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_pull_start_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_pulling = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_pulling.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_pulling_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_pulling_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_push_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_push_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_push_fall = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_push_fall.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_push_start = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_push_start.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_push_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_push_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_push_wait_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_push_wait_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_pushing = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_pushing.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_put = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_put.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_put_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_put_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_re_dead_attack = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_re_dead_attack.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_re_dead_attack_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_re_dead_attack_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_rebound = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_rebound.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_run = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_run.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_run_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_run_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_run_jump = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_run_jump.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_run_jump_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_run_jump_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_run_jump_water_fall = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_run_jump_water_fall.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_run_jump_water_fall_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_run_jump_water_fall_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_short_landing = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_short_landing.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_short_landing_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_short_landing_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_side_walkL_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_side_walkL_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_side_walkR_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_side_walkR_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_side_walk = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_side_walk.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_side_walk_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_side_walk_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_take_out = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_take_out.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_talk_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_talk_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_talk_free_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_talk_free_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_talk_navi = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_talk_navi.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_talk_navi_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_talk_navi_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_throw = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_throw.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_throw_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_throw_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_up_slope_slip = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_up_slope_slip.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_up_slope_slip_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_up_slope_slip_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_up_slope_slip_end_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_up_slope_slip_end_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_up_slope_slip_end_long = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_up_slope_slip_end_long.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_wait2waitL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_wait2waitL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_wait2waitR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_wait2waitR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_waitF_typeA_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_waitF_typeA_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_waitF_typeB_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_waitF_typeB_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_waitF_typeC_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_waitF_typeC_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_waitL2wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_waitL2wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_waitL_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_waitL_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_waitR2wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_waitR2wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_waitR_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_waitR_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_wait_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_wait_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_wait_typeA_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_wait_typeA_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_wait_typeB_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_wait_typeB_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_wait_typeC_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_wait_typeC_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_wakeup = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_wakeup.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_walk = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_walk.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_walk_endL = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_walk_endL.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_walk_endL_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_walk_endL_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_walk_endR = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_walk_endR.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_walk_endR_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_walk_endR_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_normal_walk_free = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_normal_walk_free.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_okarina_warp_goal = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_okarina_warp_goal.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_okiru_demo = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_okiru_demo.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_shagamu_demo = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_shagamu_demo.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_silver_carry = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_silver_carry.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_silver_throw = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_silver_throw.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_silver_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_silver_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_Lside_swim = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_Lside_swim.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_Rside_swim = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_Rside_swim.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_back_swim = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_back_swim.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_land2swim_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_land2swim_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_swim_15step_up = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_swim_15step_up.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_swim = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_swim.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_swim_dead = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_swim_dead.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_swim_deep_end = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_swim_deep_end.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_swim_deep_start = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_swim_deep_start.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_swim_down = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_swim_down.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_swim_get = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_swim_get.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_swim_hit = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_swim_hit.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_swim_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_swim_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_swimer_wait2swim_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_swimer_wait2swim_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_anim_fastrun = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_anim_fastrun.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_anim_fastrun_muti = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_anim_fastrun_muti.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_anim_jump100 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_anim_jump100.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_anim_jump200 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_anim_jump200.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_anim_slowrun = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_anim_slowrun.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_anim_slowrun_muti = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_anim_slowrun_muti.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_anim_stand = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_anim_stand.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_anim_stop = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_anim_stop.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_anim_walk2 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_anim_walk2.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_anim_walk = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_anim_walk.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_anim_walk_muti = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_anim_walk_muti.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_left_down = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_left_down.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_left_up = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_left_up.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_right_down = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_right_down.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_right_up = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_right_up.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_stop_muti = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_stop_muti.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_wait_1 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_wait_1.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_wait_2 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_wait_2.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_uma_wait_3 = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_uma_wait_3.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_waitF_heat1_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_waitF_heat1_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_waitF_heat2_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_waitF_heat2_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_waitF_itemA_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_waitF_itemA_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_waitF_itemB_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_waitF_itemB_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_waitF_typeD_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_waitF_typeD_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_wait_heat1_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_wait_heat1_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_wait_heat2_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_wait_heat2_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_wait_itemA_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_wait_itemA_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_wait_itemB_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_wait_itemB_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_wait_itemC_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_wait_itemC_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_wait_itemD1_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_wait_itemD1_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_wait_itemD2_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_wait_itemD2_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_link_wait_typeD_20f = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_link_wait_typeD_20f.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_lkt_nwait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_lkt_nwait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_nw_modoru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_nw_modoru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_o_get_ato = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_o_get_ato.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_o_get_mae = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_o_get_mae.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_om_get = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_om_get.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_om_get_mae = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_om_get_mae.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_sude_nwait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_sude_nwait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_L_1kyoro = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_L_1kyoro.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_L_2kyoro = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_L_2kyoro.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_L_bouzen = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_L_bouzen.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_L_hajikareru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_L_hajikareru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_L_kamaeru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_L_kamaeru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_L_ken_miru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_L_ken_miru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_L_kennasi_w = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_L_kennasi_w.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_L_kw = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_L_kw.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_L_mukinaoru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_L_mukinaoru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_L_okarina_get = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_L_okarina_get.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_L_sagaru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_L_sagaru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_Link_ha = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_Link_ha.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_Link_m_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_Link_m_wait.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_Link_miageru = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_Link_miageru.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_Link_muku = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_Link_muku.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_Link_otituku_w = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_Link_otituku_w.inc.c"
+};
+
+LinkAnimationHeader gPlayerAnim_Link_ue_wait = {
+#include "assets/objects/gameplay_keep/gPlayerAnim_Link_ue_wait.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/player_anim_headers.h b/assets/objects/gameplay_keep/player_anim_headers.h
new file mode 100644
index 0000000000..6ae47645fa
--- /dev/null
+++ b/assets/objects/gameplay_keep/player_anim_headers.h
@@ -0,0 +1,580 @@
+#ifndef GAMEPLAY_KEEP_PLAYER_ANIM_HEADERS_H
+#define GAMEPLAY_KEEP_PLAYER_ANIM_HEADERS_H
+
+#include "animation.h"
+
+extern LinkAnimationHeader gPlayerAnim_clink_demo_DDbox_open;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_Tbox_open;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_atozusari;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_bashi;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_doorA_link;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_doorB_link;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_futtobi;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_get1;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_get2;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_get3;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_goto_future;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_koutai;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_koutai_kennuki;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_koutai_wait;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_mimawasi;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_mimawasi_wait;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_miokuri;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_miokuri_wait;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_nozoki;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_return_to_future;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_standup;
+extern LinkAnimationHeader gPlayerAnim_clink_demo_standup_wait;
+extern LinkAnimationHeader gPlayerAnim_clink_normal_climb_endAL;
+extern LinkAnimationHeader gPlayerAnim_clink_normal_climb_endAR;
+extern LinkAnimationHeader gPlayerAnim_clink_normal_climb_endBL;
+extern LinkAnimationHeader gPlayerAnim_clink_normal_climb_endBR;
+extern LinkAnimationHeader gPlayerAnim_clink_normal_climb_startA;
+extern LinkAnimationHeader gPlayerAnim_clink_normal_climb_startB;
+extern LinkAnimationHeader gPlayerAnim_clink_normal_climb_upL;
+extern LinkAnimationHeader gPlayerAnim_clink_normal_climb_upR;
+extern LinkAnimationHeader gPlayerAnim_clink_normal_defense_ALL;
+extern LinkAnimationHeader gPlayerAnim_clink_op3_negaeri;
+extern LinkAnimationHeader gPlayerAnim_clink_op3_okiagari;
+extern LinkAnimationHeader gPlayerAnim_clink_op3_tatiagari;
+extern LinkAnimationHeader gPlayerAnim_clink_op3_wait1;
+extern LinkAnimationHeader gPlayerAnim_clink_op3_wait2;
+extern LinkAnimationHeader gPlayerAnim_clink_op3_wait3;
+extern LinkAnimationHeader gPlayerAnim_d_link_imanodare;
+extern LinkAnimationHeader gPlayerAnim_d_link_orooro;
+extern LinkAnimationHeader gPlayerAnim_d_link_orowait;
+extern LinkAnimationHeader gPlayerAnim_demo_link_nwait;
+extern LinkAnimationHeader gPlayerAnim_demo_link_orosuu;
+extern LinkAnimationHeader gPlayerAnim_demo_link_tewatashi;
+extern LinkAnimationHeader gPlayerAnim_demo_link_twait;
+extern LinkAnimationHeader gPlayerAnim_kolink_odoroki_demo;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_LLside_kiru_endL;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_LLside_kiru_finsh_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_LRside_kiru_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_LRside_kiru_finsh_endL;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_Lnormal_kiru_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_Lpierce_kiru_endL;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_Lrolling_kiru_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_Lside_kiru_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_Lside_kiru_finsh_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_Rside_kiru_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_Rside_kiru_finsh_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_anchor2fighter;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_back_brake;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_back_hitR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_back_walk;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_bom_side_walkL;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_bom_side_walkR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_defense_hit;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_defense_long_hitL;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_defense_long_hitR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_front_hitR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_jump_kiru_finsh_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_landingR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_normal_kiru_finsh_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_pierce_kiru_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_pierce_kiru_finsh_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_power_kiru_wait_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_rolling_kiru_endR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_side_walkL;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_side_walkR;
+extern LinkAnimationHeader gPlayerAnim_002578;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitL2defense;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitL2defense_long;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitL;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitL_defense;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitL_defense_wait;
+extern LinkAnimationHeader gPlayerAnim_0025A8;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitL_pierce_kiru;
+extern LinkAnimationHeader gPlayerAnim_0025B8;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitR2defense;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitR2defense_long;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitR;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitR_defense;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitR_defense_wait;
+extern LinkAnimationHeader gPlayerAnim_0025E8;
+extern LinkAnimationHeader gPlayerAnim_link_anchor_waitR_pierce_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_boom_catch;
+extern LinkAnimationHeader gPlayerAnim_link_boom_throwL;
+extern LinkAnimationHeader gPlayerAnim_link_boom_throwR;
+extern LinkAnimationHeader gPlayerAnim_002610;
+extern LinkAnimationHeader gPlayerAnim_link_boom_throw_side_walkL;
+extern LinkAnimationHeader gPlayerAnim_link_boom_throw_side_walkR;
+extern LinkAnimationHeader gPlayerAnim_link_boom_throw_wait2waitR;
+extern LinkAnimationHeader gPlayerAnim_link_boom_throw_waitL;
+extern LinkAnimationHeader gPlayerAnim_link_boom_throw_waitR;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_bug_in;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_bug_miss;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_bug_out;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_drink_demo;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_drink_demo_end;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_drink_demo_start;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_drink_demo_wait;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_fish_in;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_fish_miss;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_fish_out;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_read;
+extern LinkAnimationHeader gPlayerAnim_link_bottle_read_end;
+extern LinkAnimationHeader gPlayerAnim_link_bow_bow_ready;
+extern LinkAnimationHeader gPlayerAnim_link_bow_bow_shoot;
+extern LinkAnimationHeader gPlayerAnim_link_bow_bow_shoot_end;
+extern LinkAnimationHeader gPlayerAnim_link_bow_bow_shoot_next;
+extern LinkAnimationHeader gPlayerAnim_link_bow_bow_wait;
+extern LinkAnimationHeader gPlayerAnim_link_bow_defense;
+extern LinkAnimationHeader gPlayerAnim_link_bow_defense_wait;
+extern LinkAnimationHeader gPlayerAnim_link_bow_side_runL;
+extern LinkAnimationHeader gPlayerAnim_link_bow_side_runR;
+extern LinkAnimationHeader gPlayerAnim_link_bow_side_walk;
+extern LinkAnimationHeader gPlayerAnim_link_bow_walk2ready;
+extern LinkAnimationHeader gPlayerAnim_link_child_tunnel_door;
+extern LinkAnimationHeader gPlayerAnim_link_child_tunnel_end;
+extern LinkAnimationHeader gPlayerAnim_link_child_tunnel_start;
+extern LinkAnimationHeader gPlayerAnim_link_demo_DDbox_open;
+extern LinkAnimationHeader gPlayerAnim_link_demo_Tbox_open;
+extern LinkAnimationHeader gPlayerAnim_link_demo_back_to_past;
+extern LinkAnimationHeader gPlayerAnim_link_demo_baru_op1;
+extern LinkAnimationHeader gPlayerAnim_link_demo_baru_op2;
+extern LinkAnimationHeader gPlayerAnim_link_demo_baru_op3;
+extern LinkAnimationHeader gPlayerAnim_link_demo_bikkuri;
+extern LinkAnimationHeader gPlayerAnim_link_demo_doorA_link;
+extern LinkAnimationHeader gPlayerAnim_link_demo_doorA_link_free;
+extern LinkAnimationHeader gPlayerAnim_link_demo_doorB_link;
+extern LinkAnimationHeader gPlayerAnim_link_demo_doorB_link_free;
+extern LinkAnimationHeader gPlayerAnim_link_demo_furimuki2;
+extern LinkAnimationHeader gPlayerAnim_link_demo_furimuki2_wait;
+extern LinkAnimationHeader gPlayerAnim_link_demo_furimuki;
+extern LinkAnimationHeader gPlayerAnim_link_demo_get_itemA;
+extern LinkAnimationHeader gPlayerAnim_link_demo_get_itemB;
+extern LinkAnimationHeader gPlayerAnim_link_demo_goma_furimuki;
+extern LinkAnimationHeader gPlayerAnim_link_demo_gurad;
+extern LinkAnimationHeader gPlayerAnim_link_demo_gurad_wait;
+extern LinkAnimationHeader gPlayerAnim_link_demo_jibunmiru;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kakeyori;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kakeyori_mimawasi;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kakeyori_miokuri;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kakeyori_miokuri_wait;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kakeyori_wait;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kaoage;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kaoage_wait;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kenmiru1;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kenmiru1_wait;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kenmiru2;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kenmiru2_modori;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kenmiru2_wait;
+extern LinkAnimationHeader gPlayerAnim_link_demo_kousan;
+extern LinkAnimationHeader gPlayerAnim_link_demo_look_hand;
+extern LinkAnimationHeader gPlayerAnim_link_demo_look_hand_wait;
+extern LinkAnimationHeader gPlayerAnim_link_demo_nozokikomi;
+extern LinkAnimationHeader gPlayerAnim_link_demo_nozokikomi_wait;
+extern LinkAnimationHeader gPlayerAnim_link_demo_return_to_past;
+extern LinkAnimationHeader gPlayerAnim_002840;
+extern LinkAnimationHeader gPlayerAnim_link_demo_sita_wait;
+extern LinkAnimationHeader gPlayerAnim_link_demo_ue;
+extern LinkAnimationHeader gPlayerAnim_link_demo_ue_wait;
+extern LinkAnimationHeader gPlayerAnim_link_demo_warp;
+extern LinkAnimationHeader gPlayerAnim_link_demo_zeldamiru;
+extern LinkAnimationHeader gPlayerAnim_link_demo_zeldamiru_wait;
+extern LinkAnimationHeader gPlayerAnim_link_derth_rebirth;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_LLside_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_LLside_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_LLside_kiru_finsh;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_LLside_kiru_finsh_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_LRside_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_LRside_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_LRside_kiru_finsh;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_LRside_kiru_finsh_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lnormal_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lnormal_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lnormal_kiru_finsh;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpierce_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpierce_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpierce_kiru_finsh;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_jump_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_jump_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_jump_kiru_hit;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_kiru_side_walk;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_kiru_start;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_kiru_wait;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_kiru_wait_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lpower_kiru_walk;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lrolling_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lrolling_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lside_jump;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lside_jump_endL;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lside_jump_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lside_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lside_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lside_kiru_finsh;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Lside_kiru_finsh_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Rside_jump;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Rside_jump_endR;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Rside_jump_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Rside_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Rside_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Rside_kiru_finsh;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Rside_kiru_finsh_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Wrolling_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_Wrolling_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_backturn_jump;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_backturn_jump_endR;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_backturn_jump_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_damage_run;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_damage_run_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_defense;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_defense_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_defense_long_hit;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_defense_long_wait;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_defense_wait;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_fighter2long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_front_jump;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_front_jump_endR;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_front_jump_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_heavy_run_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_jump_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_jump_kiru_finsh;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_jump_kiru_finsh_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_jump_rollkiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_landing_roll_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_normal2fighter;
+extern LinkAnimationHeader gPlayerAnim_002A78;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_normal_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_normal_kiru_endR;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_normal_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_normal_kiru_finsh;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_normal_kiru_finsh_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_pierce_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_pierce_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_pierce_kiru_finsh;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_pierce_kiru_finsh_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_power_jump_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_002AD0;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_side_walk;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_startL;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_start;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_wait;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_wait_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_power_kiru_walk;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_reboundR;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_rebound;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_rebound_longR;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_rebound_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_rolling_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_rolling_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_run;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_run_long;
+extern LinkAnimationHeader gPlayerAnim_002B48;
+extern LinkAnimationHeader gPlayerAnim_002B50;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_side_walkL_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_side_walkR_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_side_walk_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_turn_kiruL;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_turn_kiruL_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_turn_kiruR;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_turn_kiruR_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_upper_kiruR;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_upper_pierce_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_upper_pierce_kiru_end;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_wait2waitL_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_wait2waitR_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_waitL2wait_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_waitL_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_waitR2wait_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_waitR_long;
+extern LinkAnimationHeader gPlayerAnim_002BD8;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_wait_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_walk_endL_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_walk_endR_long;
+extern LinkAnimationHeader gPlayerAnim_link_fighter_walk_long;
+extern LinkAnimationHeader gPlayerAnim_link_fishing_fish_catch;
+extern LinkAnimationHeader gPlayerAnim_link_fishing_fish_catch_end;
+extern LinkAnimationHeader gPlayerAnim_link_fishing_reel_down;
+extern LinkAnimationHeader gPlayerAnim_link_fishing_reel_left;
+extern LinkAnimationHeader gPlayerAnim_link_fishing_reel_right;
+extern LinkAnimationHeader gPlayerAnim_link_fishing_reel_up;
+extern LinkAnimationHeader gPlayerAnim_link_fishing_throw;
+extern LinkAnimationHeader gPlayerAnim_link_fishing_wait;
+extern LinkAnimationHeader gPlayerAnim_link_hammer_hit;
+extern LinkAnimationHeader gPlayerAnim_link_hammer_hit_endR;
+extern LinkAnimationHeader gPlayerAnim_link_hammer_hit_end;
+extern LinkAnimationHeader gPlayerAnim_link_hammer_long2free;
+extern LinkAnimationHeader gPlayerAnim_link_hammer_long2long;
+extern LinkAnimationHeader gPlayerAnim_link_hammer_normal2long;
+extern LinkAnimationHeader gPlayerAnim_link_hammer_side_hit;
+extern LinkAnimationHeader gPlayerAnim_link_hammer_side_hit_endR;
+extern LinkAnimationHeader gPlayerAnim_link_hammer_side_hit_end;
+extern LinkAnimationHeader gPlayerAnim_link_hatto_demo;
+extern LinkAnimationHeader gPlayerAnim_link_hook_fly_start;
+extern LinkAnimationHeader gPlayerAnim_link_hook_fly_wait;
+extern LinkAnimationHeader gPlayerAnim_link_hook_shot_ready;
+extern LinkAnimationHeader gPlayerAnim_link_hook_side_runL;
+extern LinkAnimationHeader gPlayerAnim_link_hook_side_runR;
+extern LinkAnimationHeader gPlayerAnim_link_hook_side_walk;
+extern LinkAnimationHeader gPlayerAnim_link_hook_wait;
+extern LinkAnimationHeader gPlayerAnim_link_hook_walk2ready;
+extern LinkAnimationHeader gPlayerAnim_link_last_hit_motion1;
+extern LinkAnimationHeader gPlayerAnim_link_last_hit_motion2;
+extern LinkAnimationHeader gPlayerAnim_link_magic_honoo1;
+extern LinkAnimationHeader gPlayerAnim_link_magic_honoo2;
+extern LinkAnimationHeader gPlayerAnim_link_magic_honoo3;
+extern LinkAnimationHeader gPlayerAnim_link_magic_kaze1;
+extern LinkAnimationHeader gPlayerAnim_link_magic_kaze2;
+extern LinkAnimationHeader gPlayerAnim_link_magic_kaze3;
+extern LinkAnimationHeader gPlayerAnim_link_magic_tamashii1;
+extern LinkAnimationHeader gPlayerAnim_link_magic_tamashii2;
+extern LinkAnimationHeader gPlayerAnim_link_magic_tamashii3;
+extern LinkAnimationHeader gPlayerAnim_link_magic_tame;
+extern LinkAnimationHeader gPlayerAnim_link_magic_tame_kaijyo;
+extern LinkAnimationHeader gPlayerAnim_link_normal_100step_up;
+extern LinkAnimationHeader gPlayerAnim_link_normal_150step_up;
+extern LinkAnimationHeader gPlayerAnim_link_normal_250jump_start;
+extern LinkAnimationHeader gPlayerAnim_002D50;
+extern LinkAnimationHeader gPlayerAnim_link_normal_45_turn;
+extern LinkAnimationHeader gPlayerAnim_link_normal_45_turn_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_hold2upL;
+extern LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_sideL;
+extern LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_sideR;
+extern LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_startA;
+extern LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_startB;
+extern LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_upL;
+extern LinkAnimationHeader gPlayerAnim_link_normal_Fclimb_upR;
+extern LinkAnimationHeader gPlayerAnim_link_normal_back_brake;
+extern LinkAnimationHeader gPlayerAnim_link_normal_back_brake_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_back_downA;
+extern LinkAnimationHeader gPlayerAnim_link_normal_back_downB;
+extern LinkAnimationHeader gPlayerAnim_link_normal_back_down_wake;
+extern LinkAnimationHeader gPlayerAnim_link_normal_back_hit;
+extern LinkAnimationHeader gPlayerAnim_link_normal_back_run;
+extern LinkAnimationHeader gPlayerAnim_link_normal_back_shitR;
+extern LinkAnimationHeader gPlayerAnim_link_normal_back_shit;
+extern LinkAnimationHeader gPlayerAnim_link_normal_back_walk;
+extern LinkAnimationHeader gPlayerAnim_link_normal_backspace;
+extern LinkAnimationHeader gPlayerAnim_link_normal_box_kick;
+extern LinkAnimationHeader gPlayerAnim_link_normal_carryB;
+extern LinkAnimationHeader gPlayerAnim_link_normal_carryB_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_carryB_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_check;
+extern LinkAnimationHeader gPlayerAnim_link_normal_check_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_check_end_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_check_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_check_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_check_wait_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_climb_down;
+extern LinkAnimationHeader gPlayerAnim_link_normal_climb_endAL;
+extern LinkAnimationHeader gPlayerAnim_link_normal_climb_endAR;
+extern LinkAnimationHeader gPlayerAnim_link_normal_climb_endBL;
+extern LinkAnimationHeader gPlayerAnim_link_normal_climb_endBR;
+extern LinkAnimationHeader gPlayerAnim_link_normal_climb_startA;
+extern LinkAnimationHeader gPlayerAnim_link_normal_climb_startB;
+extern LinkAnimationHeader gPlayerAnim_link_normal_climb_upL;
+extern LinkAnimationHeader gPlayerAnim_link_normal_climb_upR;
+extern LinkAnimationHeader gPlayerAnim_link_normal_climb_up;
+extern LinkAnimationHeader gPlayerAnim_link_normal_damage_run_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_defense;
+extern LinkAnimationHeader gPlayerAnim_link_normal_defense_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_defense_end_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_defense_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_defense_hit;
+extern LinkAnimationHeader gPlayerAnim_link_normal_defense_kiru;
+extern LinkAnimationHeader gPlayerAnim_link_normal_defense_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_defense_wait_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_down_slope_slip;
+extern LinkAnimationHeader gPlayerAnim_link_normal_down_slope_slip_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_down_slope_slip_end_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_down_slope_slip_end_long;
+extern LinkAnimationHeader gPlayerAnim_link_normal_electric_shock;
+extern LinkAnimationHeader gPlayerAnim_link_normal_electric_shock_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_fall;
+extern LinkAnimationHeader gPlayerAnim_link_normal_fall_up;
+extern LinkAnimationHeader gPlayerAnim_link_normal_fall_up_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_fall_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_fighter2free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_free2bom;
+extern LinkAnimationHeader gPlayerAnim_link_normal_free2fighter_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_free2freeB;
+extern LinkAnimationHeader gPlayerAnim_link_normal_free2free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_front_downA;
+extern LinkAnimationHeader gPlayerAnim_link_normal_front_downB;
+extern LinkAnimationHeader gPlayerAnim_link_normal_front_down_wake;
+extern LinkAnimationHeader gPlayerAnim_link_normal_front_hit;
+extern LinkAnimationHeader gPlayerAnim_link_normal_front_shitR;
+extern LinkAnimationHeader gPlayerAnim_link_normal_front_shit;
+extern LinkAnimationHeader gPlayerAnim_link_normal_give_other;
+extern LinkAnimationHeader gPlayerAnim_link_normal_hang_up_down;
+extern LinkAnimationHeader gPlayerAnim_link_normal_heavy_carry;
+extern LinkAnimationHeader gPlayerAnim_link_normal_heavy_carry_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_heavy_run;
+extern LinkAnimationHeader gPlayerAnim_link_normal_heavy_run_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_hip_down;
+extern LinkAnimationHeader gPlayerAnim_link_normal_hip_down_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_hip_down_long;
+extern LinkAnimationHeader gPlayerAnim_link_normal_ice_down;
+extern LinkAnimationHeader gPlayerAnim_link_normal_jump2landing;
+extern LinkAnimationHeader gPlayerAnim_link_normal_jump;
+extern LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_hold;
+extern LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_hold_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_up;
+extern LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_up_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_jump_climb_wait_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_jump_up;
+extern LinkAnimationHeader gPlayerAnim_link_normal_landing;
+extern LinkAnimationHeader gPlayerAnim_link_normal_landing_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_landing_roll;
+extern LinkAnimationHeader gPlayerAnim_link_normal_landing_roll_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_landing_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_light_bom;
+extern LinkAnimationHeader gPlayerAnim_link_normal_light_bom_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_long2bom;
+extern LinkAnimationHeader gPlayerAnim_link_normal_nocarry_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_nocarry_free_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_nocarry_free_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_normal2bom;
+extern LinkAnimationHeader gPlayerAnim_link_normal_normal2fighter;
+extern LinkAnimationHeader gPlayerAnim_link_normal_normal2fighter_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_normal2free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_okarina_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_okarina_start;
+extern LinkAnimationHeader gPlayerAnim_link_normal_okarina_swing;
+extern LinkAnimationHeader gPlayerAnim_link_normal_pull_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_pull_end_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_pull_start;
+extern LinkAnimationHeader gPlayerAnim_link_normal_pull_start_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_pulling;
+extern LinkAnimationHeader gPlayerAnim_link_normal_pulling_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_push_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_push_fall;
+extern LinkAnimationHeader gPlayerAnim_link_normal_push_start;
+extern LinkAnimationHeader gPlayerAnim_link_normal_push_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_push_wait_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_pushing;
+extern LinkAnimationHeader gPlayerAnim_link_normal_put;
+extern LinkAnimationHeader gPlayerAnim_link_normal_put_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_re_dead_attack;
+extern LinkAnimationHeader gPlayerAnim_link_normal_re_dead_attack_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_rebound;
+extern LinkAnimationHeader gPlayerAnim_link_normal_run;
+extern LinkAnimationHeader gPlayerAnim_link_normal_run_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_run_jump;
+extern LinkAnimationHeader gPlayerAnim_link_normal_run_jump_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_run_jump_water_fall;
+extern LinkAnimationHeader gPlayerAnim_link_normal_run_jump_water_fall_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_short_landing;
+extern LinkAnimationHeader gPlayerAnim_link_normal_short_landing_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_side_walkL_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_side_walkR_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_side_walk;
+extern LinkAnimationHeader gPlayerAnim_link_normal_side_walk_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_take_out;
+extern LinkAnimationHeader gPlayerAnim_link_normal_talk_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_talk_free_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_talk_navi;
+extern LinkAnimationHeader gPlayerAnim_link_normal_talk_navi_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_throw;
+extern LinkAnimationHeader gPlayerAnim_link_normal_throw_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_up_slope_slip;
+extern LinkAnimationHeader gPlayerAnim_link_normal_up_slope_slip_end;
+extern LinkAnimationHeader gPlayerAnim_link_normal_up_slope_slip_end_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_up_slope_slip_end_long;
+extern LinkAnimationHeader gPlayerAnim_link_normal_wait2waitL;
+extern LinkAnimationHeader gPlayerAnim_link_normal_wait2waitR;
+extern LinkAnimationHeader gPlayerAnim_link_normal_waitF_typeA_20f;
+extern LinkAnimationHeader gPlayerAnim_link_normal_waitF_typeB_20f;
+extern LinkAnimationHeader gPlayerAnim_link_normal_waitF_typeC_20f;
+extern LinkAnimationHeader gPlayerAnim_link_normal_waitL2wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_waitL_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_waitR2wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_waitR_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_wait;
+extern LinkAnimationHeader gPlayerAnim_link_normal_wait_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_wait_typeA_20f;
+extern LinkAnimationHeader gPlayerAnim_link_normal_wait_typeB_20f;
+extern LinkAnimationHeader gPlayerAnim_link_normal_wait_typeC_20f;
+extern LinkAnimationHeader gPlayerAnim_link_normal_wakeup;
+extern LinkAnimationHeader gPlayerAnim_link_normal_walk;
+extern LinkAnimationHeader gPlayerAnim_link_normal_walk_endL;
+extern LinkAnimationHeader gPlayerAnim_link_normal_walk_endL_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_walk_endR;
+extern LinkAnimationHeader gPlayerAnim_link_normal_walk_endR_free;
+extern LinkAnimationHeader gPlayerAnim_link_normal_walk_free;
+extern LinkAnimationHeader gPlayerAnim_link_okarina_warp_goal;
+extern LinkAnimationHeader gPlayerAnim_link_okiru_demo;
+extern LinkAnimationHeader gPlayerAnim_link_shagamu_demo;
+extern LinkAnimationHeader gPlayerAnim_link_silver_carry;
+extern LinkAnimationHeader gPlayerAnim_link_silver_throw;
+extern LinkAnimationHeader gPlayerAnim_link_silver_wait;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_Lside_swim;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_Rside_swim;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_back_swim;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_land2swim_wait;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_swim_15step_up;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_swim;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_swim_dead;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_swim_deep_end;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_swim_deep_start;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_swim_down;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_swim_get;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_swim_hit;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_swim_wait;
+extern LinkAnimationHeader gPlayerAnim_link_swimer_wait2swim_wait;
+extern LinkAnimationHeader gPlayerAnim_link_uma_anim_fastrun;
+extern LinkAnimationHeader gPlayerAnim_link_uma_anim_fastrun_muti;
+extern LinkAnimationHeader gPlayerAnim_link_uma_anim_jump100;
+extern LinkAnimationHeader gPlayerAnim_link_uma_anim_jump200;
+extern LinkAnimationHeader gPlayerAnim_link_uma_anim_slowrun;
+extern LinkAnimationHeader gPlayerAnim_link_uma_anim_slowrun_muti;
+extern LinkAnimationHeader gPlayerAnim_link_uma_anim_stand;
+extern LinkAnimationHeader gPlayerAnim_link_uma_anim_stop;
+extern LinkAnimationHeader gPlayerAnim_link_uma_anim_walk2;
+extern LinkAnimationHeader gPlayerAnim_link_uma_anim_walk;
+extern LinkAnimationHeader gPlayerAnim_link_uma_anim_walk_muti;
+extern LinkAnimationHeader gPlayerAnim_link_uma_left_down;
+extern LinkAnimationHeader gPlayerAnim_link_uma_left_up;
+extern LinkAnimationHeader gPlayerAnim_link_uma_right_down;
+extern LinkAnimationHeader gPlayerAnim_link_uma_right_up;
+extern LinkAnimationHeader gPlayerAnim_link_uma_stop_muti;
+extern LinkAnimationHeader gPlayerAnim_link_uma_wait_1;
+extern LinkAnimationHeader gPlayerAnim_link_uma_wait_2;
+extern LinkAnimationHeader gPlayerAnim_link_uma_wait_3;
+extern LinkAnimationHeader gPlayerAnim_link_waitF_heat1_20f;
+extern LinkAnimationHeader gPlayerAnim_link_waitF_heat2_20f;
+extern LinkAnimationHeader gPlayerAnim_link_waitF_itemA_20f;
+extern LinkAnimationHeader gPlayerAnim_link_waitF_itemB_20f;
+extern LinkAnimationHeader gPlayerAnim_link_waitF_typeD_20f;
+extern LinkAnimationHeader gPlayerAnim_link_wait_heat1_20f;
+extern LinkAnimationHeader gPlayerAnim_link_wait_heat2_20f;
+extern LinkAnimationHeader gPlayerAnim_link_wait_itemA_20f;
+extern LinkAnimationHeader gPlayerAnim_link_wait_itemB_20f;
+extern LinkAnimationHeader gPlayerAnim_link_wait_itemC_20f;
+extern LinkAnimationHeader gPlayerAnim_link_wait_itemD1_20f;
+extern LinkAnimationHeader gPlayerAnim_link_wait_itemD2_20f;
+extern LinkAnimationHeader gPlayerAnim_link_wait_typeD_20f;
+extern LinkAnimationHeader gPlayerAnim_lkt_nwait;
+extern LinkAnimationHeader gPlayerAnim_nw_modoru;
+extern LinkAnimationHeader gPlayerAnim_o_get_ato;
+extern LinkAnimationHeader gPlayerAnim_o_get_mae;
+extern LinkAnimationHeader gPlayerAnim_om_get;
+extern LinkAnimationHeader gPlayerAnim_om_get_mae;
+extern LinkAnimationHeader gPlayerAnim_sude_nwait;
+extern LinkAnimationHeader gPlayerAnim_L_1kyoro;
+extern LinkAnimationHeader gPlayerAnim_L_2kyoro;
+extern LinkAnimationHeader gPlayerAnim_L_bouzen;
+extern LinkAnimationHeader gPlayerAnim_L_hajikareru;
+extern LinkAnimationHeader gPlayerAnim_L_kamaeru;
+extern LinkAnimationHeader gPlayerAnim_L_ken_miru;
+extern LinkAnimationHeader gPlayerAnim_L_kennasi_w;
+extern LinkAnimationHeader gPlayerAnim_L_kw;
+extern LinkAnimationHeader gPlayerAnim_L_mukinaoru;
+extern LinkAnimationHeader gPlayerAnim_L_okarina_get;
+extern LinkAnimationHeader gPlayerAnim_L_sagaru;
+extern LinkAnimationHeader gPlayerAnim_Link_ha;
+extern LinkAnimationHeader gPlayerAnim_Link_m_wait;
+extern LinkAnimationHeader gPlayerAnim_Link_miageru;
+extern LinkAnimationHeader gPlayerAnim_Link_muku;
+extern LinkAnimationHeader gPlayerAnim_Link_otituku_w;
+extern LinkAnimationHeader gPlayerAnim_Link_ue_wait;
+
+#endif
diff --git a/assets/objects/gameplay_keep/player_pause_joint_tables.c b/assets/objects/gameplay_keep/player_pause_joint_tables.c
new file mode 100644
index 0000000000..79873a0016
--- /dev/null
+++ b/assets/objects/gameplay_keep/player_pause_joint_tables.c
@@ -0,0 +1,21 @@
+#include "player_pause_joint_tables.h"
+
+Vec3s gLinkPauseChildJointTable[] = {
+#include "assets/objects/gameplay_keep/gLinkPauseChildJointTable.inc.c"
+};
+
+Vec3s gLinkPauseChildDekuShieldJointTable[] = {
+#include "assets/objects/gameplay_keep/gLinkPauseChildDekuShieldJointTable.inc.c"
+};
+
+Vec3s gLinkPauseAdultBgsJointTable[] = {
+#include "assets/objects/gameplay_keep/gLinkPauseAdultBgsJointTable.inc.c"
+};
+
+Vec3s gLinkPauseAdultJointTable[] = {
+#include "assets/objects/gameplay_keep/gLinkPauseAdultJointTable.inc.c"
+};
+
+Vec3s gLinkPauseAdultShieldJointTable[] = {
+#include "assets/objects/gameplay_keep/gLinkPauseAdultShieldJointTable.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/player_pause_joint_tables.h b/assets/objects/gameplay_keep/player_pause_joint_tables.h
new file mode 100644
index 0000000000..42cbb16c3e
--- /dev/null
+++ b/assets/objects/gameplay_keep/player_pause_joint_tables.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_PLAYER_PAUSE_JOINT_TABLES_H
+#define GAMEPLAY_KEEP_PLAYER_PAUSE_JOINT_TABLES_H
+
+#include "z_math.h"
+
+extern Vec3s gLinkPauseChildJointTable[];
+extern Vec3s gLinkPauseChildDekuShieldJointTable[];
+extern Vec3s gLinkPauseAdultBgsJointTable[];
+extern Vec3s gLinkPauseAdultJointTable[];
+extern Vec3s gLinkPauseAdultShieldJointTable[];
+
+#endif
diff --git a/assets/objects/gameplay_keep/rectangular_sign_model.c b/assets/objects/gameplay_keep/rectangular_sign_model.c
new file mode 100644
index 0000000000..abcb5ff760
--- /dev/null
+++ b/assets/objects/gameplay_keep/rectangular_sign_model.c
@@ -0,0 +1,11 @@
+#include "rectangular_sign_model.h"
+#include "sign_textures.h"
+#include "gfx.h"
+
+Vtx gSignRectangularVtx[] = {
+#include "assets/objects/gameplay_keep/gSignRectangularVtx.inc.c"
+};
+
+Gfx gSignRectangularDL[81] = {
+#include "assets/objects/gameplay_keep/gSignRectangularDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/rectangular_sign_model.h b/assets/objects/gameplay_keep/rectangular_sign_model.h
new file mode 100644
index 0000000000..4d21377bdc
--- /dev/null
+++ b/assets/objects/gameplay_keep/rectangular_sign_model.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_RECTANGULAR_SIGN_MODEL_H
+#define GAMEPLAY_KEEP_RECTANGULAR_SIGN_MODEL_H
+
+#include "ultra64.h"
+
+extern Vtx gSignRectangularVtx[];
+extern Gfx gSignRectangularDL[81];
+
+#endif
diff --git a/assets/objects/gameplay_keep/rupee.c b/assets/objects/gameplay_keep/rupee.c
new file mode 100644
index 0000000000..12cc880d93
--- /dev/null
+++ b/assets/objects/gameplay_keep/rupee.c
@@ -0,0 +1,35 @@
+#include "rupee.h"
+#include "gfx.h"
+#include "region.h"
+
+u64 gRupeeGreenTex[TEX_LEN(u64, gRupeeGreenTex_WIDTH, gRupeeGreenTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gRupeeGreenTex.rgba16.inc.c"
+};
+
+u64 gRupeeBlueTex[TEX_LEN(u64, gRupeeBlueTex_WIDTH, gRupeeBlueTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gRupeeBlueTex.rgba16.inc.c"
+};
+
+u64 gRupeeRedTex[TEX_LEN(u64, gRupeeRedTex_WIDTH, gRupeeRedTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gRupeeRedTex.rgba16.inc.c"
+};
+
+u64 gRupeeOrangeTex[TEX_LEN(u64, gRupeeOrangeTex_WIDTH, gRupeeOrangeTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gRupeeOrangeTex.rgba16.inc.c"
+};
+
+u64 gRupeePinkTex[TEX_LEN(u64, gRupeePinkTex_WIDTH, gRupeePinkTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gRupeePinkTex.rgba16.inc.c"
+};
+
+u64 gRupeeSilverTex[TEX_LEN(u64, gRupeeSilverTex_WIDTH, gRupeeSilverTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gRupeeSilverTex.rgba16.inc.c"
+};
+
+Vtx gRupeeVtx[] = {
+#include "assets/objects/gameplay_keep/gRupeeVtx.inc.c"
+};
+
+Gfx gRupeeDL[26] = {
+#include "assets/objects/gameplay_keep/gRupeeDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/rupee.h b/assets/objects/gameplay_keep/rupee.h
new file mode 100644
index 0000000000..0502b50071
--- /dev/null
+++ b/assets/objects/gameplay_keep/rupee.h
@@ -0,0 +1,29 @@
+#ifndef GAMEPLAY_KEEP_RUPEE_H
+#define GAMEPLAY_KEEP_RUPEE_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+#include "region.h"
+
+#define gRupeeGreenTex_WIDTH 4
+#define gRupeeGreenTex_HEIGHT 4
+extern u64 gRupeeGreenTex[TEX_LEN(u64, gRupeeGreenTex_WIDTH, gRupeeGreenTex_HEIGHT, 16)];
+#define gRupeeBlueTex_WIDTH 4
+#define gRupeeBlueTex_HEIGHT 4
+extern u64 gRupeeBlueTex[TEX_LEN(u64, gRupeeBlueTex_WIDTH, gRupeeBlueTex_HEIGHT, 16)];
+#define gRupeeRedTex_WIDTH 4
+#define gRupeeRedTex_HEIGHT 4
+extern u64 gRupeeRedTex[TEX_LEN(u64, gRupeeRedTex_WIDTH, gRupeeRedTex_HEIGHT, 16)];
+#define gRupeeOrangeTex_WIDTH 4
+#define gRupeeOrangeTex_HEIGHT 4
+extern u64 gRupeeOrangeTex[TEX_LEN(u64, gRupeeOrangeTex_WIDTH, gRupeeOrangeTex_HEIGHT, 16)];
+#define gRupeePinkTex_WIDTH 4
+#define gRupeePinkTex_HEIGHT 4
+extern u64 gRupeePinkTex[TEX_LEN(u64, gRupeePinkTex_WIDTH, gRupeePinkTex_HEIGHT, 16)];
+#define gRupeeSilverTex_WIDTH 4
+#define gRupeeSilverTex_HEIGHT 4
+extern u64 gRupeeSilverTex[TEX_LEN(u64, gRupeeSilverTex_WIDTH, gRupeeSilverTex_HEIGHT, 16)];
+extern Vtx gRupeeVtx[];
+extern Gfx gRupeeDL[26];
+
+#endif
diff --git a/assets/objects/gameplay_keep/rupee_light_red_tex.c b/assets/objects/gameplay_keep/rupee_light_red_tex.c
new file mode 100644
index 0000000000..a3210af872
--- /dev/null
+++ b/assets/objects/gameplay_keep/rupee_light_red_tex.c
@@ -0,0 +1,5 @@
+#include "rupee_light_red_tex.h"
+
+u64 gRupeeLightRedTex[TEX_LEN(u64, gRupeeLightRedTex_WIDTH, gRupeeLightRedTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gRupeeLightRedTex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/rupee_light_red_tex.h b/assets/objects/gameplay_keep/rupee_light_red_tex.h
new file mode 100644
index 0000000000..e668f72e80
--- /dev/null
+++ b/assets/objects/gameplay_keep/rupee_light_red_tex.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_RUPEE_LIGHT_RED_TEX_H
+#define GAMEPLAY_KEEP_RUPEE_LIGHT_RED_TEX_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+#include "region.h"
+
+#define gRupeeLightRedTex_WIDTH 4
+#define gRupeeLightRedTex_HEIGHT 4
+extern u64 gRupeeLightRedTex[TEX_LEN(u64, gRupeeLightRedTex_WIDTH, gRupeeLightRedTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/shadow_circle.c b/assets/objects/gameplay_keep/shadow_circle.c
new file mode 100644
index 0000000000..a8bb184cd4
--- /dev/null
+++ b/assets/objects/gameplay_keep/shadow_circle.c
@@ -0,0 +1,14 @@
+#include "shadow_circle.h"
+#include "gfx.h"
+
+Gfx gCircleShadowDL[10] = {
+#include "assets/objects/gameplay_keep/gCircleShadowDL.inc.c"
+};
+
+Vtx gCircleShadowVtx[] = {
+#include "assets/objects/gameplay_keep/gCircleShadowVtx.inc.c"
+};
+
+u64 gCircleShadowTex[TEX_LEN(u64, gCircleShadowTex_WIDTH, gCircleShadowTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gCircleShadowTex.ia16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/shadow_circle.h b/assets/objects/gameplay_keep/shadow_circle.h
new file mode 100644
index 0000000000..c7ee59b6e5
--- /dev/null
+++ b/assets/objects/gameplay_keep/shadow_circle.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_SHADOW_CIRCLE_H
+#define GAMEPLAY_KEEP_SHADOW_CIRCLE_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+extern Gfx gCircleShadowDL[10];
+extern Vtx gCircleShadowVtx[];
+#define gCircleShadowTex_WIDTH 32
+#define gCircleShadowTex_HEIGHT 32
+extern u64 gCircleShadowTex[TEX_LEN(u64, gCircleShadowTex_WIDTH, gCircleShadowTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/shadow_foot.c b/assets/objects/gameplay_keep/shadow_foot.c
new file mode 100644
index 0000000000..85209d0bf4
--- /dev/null
+++ b/assets/objects/gameplay_keep/shadow_foot.c
@@ -0,0 +1,14 @@
+#include "shadow_foot.h"
+#include "gfx.h"
+
+Gfx gFootShadowDL[12] = {
+#include "assets/objects/gameplay_keep/gFootShadowDL.inc.c"
+};
+
+Vtx gFootShadowVtx[] = {
+#include "assets/objects/gameplay_keep/gFootShadowVtx.inc.c"
+};
+
+u64 gFootShadowTex[TEX_LEN(u64, gFootShadowTex_WIDTH, gFootShadowTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gFootShadowTex.ia16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/shadow_foot.h b/assets/objects/gameplay_keep/shadow_foot.h
new file mode 100644
index 0000000000..f6f10f3a43
--- /dev/null
+++ b/assets/objects/gameplay_keep/shadow_foot.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_SHADOW_FOOT_H
+#define GAMEPLAY_KEEP_SHADOW_FOOT_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+extern Gfx gFootShadowDL[12];
+extern Vtx gFootShadowVtx[];
+#define gFootShadowTex_WIDTH 32
+#define gFootShadowTex_HEIGHT 64
+extern u64 gFootShadowTex[TEX_LEN(u64, gFootShadowTex_WIDTH, gFootShadowTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/shadow_horse.c b/assets/objects/gameplay_keep/shadow_horse.c
new file mode 100644
index 0000000000..0b79b2c212
--- /dev/null
+++ b/assets/objects/gameplay_keep/shadow_horse.c
@@ -0,0 +1,14 @@
+#include "shadow_horse.h"
+#include "gfx.h"
+
+Vtx gHorseShadowVtx[] = {
+#include "assets/objects/gameplay_keep/gHorseShadowVtx.inc.c"
+};
+
+Gfx gHorseShadowDL[10] = {
+#include "assets/objects/gameplay_keep/gHorseShadowDL.inc.c"
+};
+
+u64 gHorseShadowTex[TEX_LEN(u64, gHorseShadowTex_WIDTH, gHorseShadowTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gHorseShadowTex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/shadow_horse.h b/assets/objects/gameplay_keep/shadow_horse.h
new file mode 100644
index 0000000000..1bfe1416d7
--- /dev/null
+++ b/assets/objects/gameplay_keep/shadow_horse.h
@@ -0,0 +1,13 @@
+#ifndef GAMEPLAY_KEEP_SHADOW_HORSE_H
+#define GAMEPLAY_KEEP_SHADOW_HORSE_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+extern Vtx gHorseShadowVtx[];
+extern Gfx gHorseShadowDL[10];
+#define gHorseShadowTex_WIDTH 16
+#define gHorseShadowTex_HEIGHT 64
+extern u64 gHorseShadowTex[TEX_LEN(u64, gHorseShadowTex_WIDTH, gHorseShadowTex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/sign_textures.c b/assets/objects/gameplay_keep/sign_textures.c
new file mode 100644
index 0000000000..ec64664725
--- /dev/null
+++ b/assets/objects/gameplay_keep/sign_textures.c
@@ -0,0 +1,17 @@
+#include "sign_textures.h"
+
+u64 gSignRectangularSideTex[TEX_LEN(u64, gSignRectangularSideTex_WIDTH, gSignRectangularSideTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gSignRectangularSideTex.rgba16.inc.c"
+};
+
+u64 gSignRectangularFrontTex[TEX_LEN(u64, gSignRectangularFrontTex_WIDTH, gSignRectangularFrontTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gSignRectangularFrontTex.rgba16.inc.c"
+};
+
+u64 gSignPostWoodTex[TEX_LEN(u64, gSignPostWoodTex_WIDTH, gSignPostWoodTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gSignPostWoodTex.rgba16.inc.c"
+};
+
+u64 gSignLetteringTex[TEX_LEN(u64, gSignLetteringTex_WIDTH, gSignLetteringTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gSignLetteringTex.rgba16.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/sign_textures.h b/assets/objects/gameplay_keep/sign_textures.h
new file mode 100644
index 0000000000..e8137083b5
--- /dev/null
+++ b/assets/objects/gameplay_keep/sign_textures.h
@@ -0,0 +1,20 @@
+#ifndef GAMEPLAY_KEEP_SIGN_TEXTURES_H
+#define GAMEPLAY_KEEP_SIGN_TEXTURES_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gSignRectangularSideTex_WIDTH 32
+#define gSignRectangularSideTex_HEIGHT 16
+extern u64 gSignRectangularSideTex[TEX_LEN(u64, gSignRectangularSideTex_WIDTH, gSignRectangularSideTex_HEIGHT, 16)];
+#define gSignRectangularFrontTex_WIDTH 32
+#define gSignRectangularFrontTex_HEIGHT 16
+extern u64 gSignRectangularFrontTex[TEX_LEN(u64, gSignRectangularFrontTex_WIDTH, gSignRectangularFrontTex_HEIGHT, 16)];
+#define gSignPostWoodTex_WIDTH 64
+#define gSignPostWoodTex_HEIGHT 8
+extern u64 gSignPostWoodTex[TEX_LEN(u64, gSignPostWoodTex_WIDTH, gSignPostWoodTex_HEIGHT, 16)];
+#define gSignLetteringTex_WIDTH 64
+#define gSignLetteringTex_HEIGHT 32
+extern u64 gSignLetteringTex[TEX_LEN(u64, gSignLetteringTex_WIDTH, gSignLetteringTex_HEIGHT, 16)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/small_cube_col.c b/assets/objects/gameplay_keep/small_cube_col.c
new file mode 100644
index 0000000000..8f590f0037
--- /dev/null
+++ b/assets/objects/gameplay_keep/small_cube_col.c
@@ -0,0 +1,23 @@
+#include "small_cube_col.h"
+#include "array_count.h"
+#include "camera.h"
+
+BgCamInfo gSmallerCubeBgCamList[] = {
+#include "assets/objects/gameplay_keep/gSmallerCubeBgCamList.inc.c"
+};
+
+SurfaceType gSmallerCubeSurfaceTypes[] = {
+#include "assets/objects/gameplay_keep/gSmallerCubeSurfaceTypes.inc.c"
+};
+
+CollisionPoly gSmallerCubePolyList[] = {
+#include "assets/objects/gameplay_keep/gSmallerCubePolyList.inc.c"
+};
+
+Vec3s gSmallerCubeVtxList[] = {
+#include "assets/objects/gameplay_keep/gSmallerCubeVtxList.inc.c"
+};
+
+CollisionHeader gSmallerCubeCol = {
+#include "assets/objects/gameplay_keep/gSmallerCubeCol.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/small_cube_col.h b/assets/objects/gameplay_keep/small_cube_col.h
new file mode 100644
index 0000000000..2988eaa6fd
--- /dev/null
+++ b/assets/objects/gameplay_keep/small_cube_col.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_SMALL_CUBE_COL_H
+#define GAMEPLAY_KEEP_SMALL_CUBE_COL_H
+
+#include "bgcheck.h"
+
+extern BgCamInfo gSmallerCubeBgCamList[];
+extern SurfaceType gSmallerCubeSurfaceTypes[];
+extern CollisionPoly gSmallerCubePolyList[];
+extern Vec3s gSmallerCubeVtxList[];
+extern CollisionHeader gSmallerCubeCol;
+
+#endif
diff --git a/assets/objects/gameplay_keep/small_cube_model.c b/assets/objects/gameplay_keep/small_cube_model.c
new file mode 100644
index 0000000000..364c3398ef
--- /dev/null
+++ b/assets/objects/gameplay_keep/small_cube_model.c
@@ -0,0 +1,11 @@
+#include "small_cube_model.h"
+#include "gameplay_keep_0x42530.h"
+#include "gfx.h"
+
+Vtx gSmallCubeVtx[] = {
+#include "assets/objects/gameplay_keep/gSmallCubeVtx.inc.c"
+};
+
+Gfx gSmallCubeDL[23] = {
+#include "assets/objects/gameplay_keep/gSmallCubeDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/small_cube_model.h b/assets/objects/gameplay_keep/small_cube_model.h
new file mode 100644
index 0000000000..be45b4e476
--- /dev/null
+++ b/assets/objects/gameplay_keep/small_cube_model.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_SMALL_CUBE_MODEL_H
+#define GAMEPLAY_KEEP_SMALL_CUBE_MODEL_H
+
+#include "ultra64.h"
+
+extern Vtx gSmallCubeVtx[];
+extern Gfx gSmallCubeDL[23];
+
+#endif
diff --git a/assets/objects/gameplay_keep/small_flat_block_col.c b/assets/objects/gameplay_keep/small_flat_block_col.c
new file mode 100644
index 0000000000..63ed9b2ebb
--- /dev/null
+++ b/assets/objects/gameplay_keep/small_flat_block_col.c
@@ -0,0 +1,23 @@
+#include "small_flat_block_col.h"
+#include "array_count.h"
+#include "camera.h"
+
+BgCamInfo gSmallerFlatBlockBgCamList[] = {
+#include "assets/objects/gameplay_keep/gSmallerFlatBlockBgCamList.inc.c"
+};
+
+SurfaceType gSmallerFlatBlockSurfaceTypes[] = {
+#include "assets/objects/gameplay_keep/gSmallerFlatBlockSurfaceTypes.inc.c"
+};
+
+CollisionPoly gSmallerFlatBlockPolyList[] = {
+#include "assets/objects/gameplay_keep/gSmallerFlatBlockPolyList.inc.c"
+};
+
+Vec3s gSmallerFlatBlockVtxList[] = {
+#include "assets/objects/gameplay_keep/gSmallerFlatBlockVtxList.inc.c"
+};
+
+CollisionHeader gSmallerFlatBlockCol = {
+#include "assets/objects/gameplay_keep/gSmallerFlatBlockCol.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/small_flat_block_col.h b/assets/objects/gameplay_keep/small_flat_block_col.h
new file mode 100644
index 0000000000..6d91254950
--- /dev/null
+++ b/assets/objects/gameplay_keep/small_flat_block_col.h
@@ -0,0 +1,12 @@
+#ifndef GAMEPLAY_KEEP_SMALL_FLAT_BLOCK_COL_H
+#define GAMEPLAY_KEEP_SMALL_FLAT_BLOCK_COL_H
+
+#include "bgcheck.h"
+
+extern BgCamInfo gSmallerFlatBlockBgCamList[];
+extern SurfaceType gSmallerFlatBlockSurfaceTypes[];
+extern CollisionPoly gSmallerFlatBlockPolyList[];
+extern Vec3s gSmallerFlatBlockVtxList[];
+extern CollisionHeader gSmallerFlatBlockCol;
+
+#endif
diff --git a/assets/objects/gameplay_keep/sun_evening_textures.c b/assets/objects/gameplay_keep/sun_evening_textures.c
new file mode 100644
index 0000000000..1d8791c927
--- /dev/null
+++ b/assets/objects/gameplay_keep/sun_evening_textures.c
@@ -0,0 +1,15 @@
+#include "sun_evening_textures.h"
+
+u64 gSunEvening1Tex[TEX_LEN(u64, gSunEvening1Tex_WIDTH, gSunEvening1Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gSunEvening1Tex.i4.inc.c"
+};
+
+u64 gSunEvening2Tex[TEX_LEN(u64, gSunEvening2Tex_WIDTH, gSunEvening2Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gSunEvening2Tex.i4.inc.c"
+};
+
+u64 gSunEvening3Tex[TEX_LEN(u64, gSunEvening3Tex_WIDTH, gSunEvening3Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gSunEvening3Tex.i4.inc.c"
+};
+
+u8 gameplay_keep_zeros_04D140[32] = { 0 };
diff --git a/assets/objects/gameplay_keep/sun_evening_textures.h b/assets/objects/gameplay_keep/sun_evening_textures.h
new file mode 100644
index 0000000000..bfc5525a11
--- /dev/null
+++ b/assets/objects/gameplay_keep/sun_evening_textures.h
@@ -0,0 +1,17 @@
+#ifndef GAMEPLAY_KEEP_SUN_EVENING_TEXTURES_H
+#define GAMEPLAY_KEEP_SUN_EVENING_TEXTURES_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gSunEvening1Tex_WIDTH 64
+#define gSunEvening1Tex_HEIGHT 31
+extern u64 gSunEvening1Tex[TEX_LEN(u64, gSunEvening1Tex_WIDTH, gSunEvening1Tex_HEIGHT, 4)];
+#define gSunEvening2Tex_WIDTH 64
+#define gSunEvening2Tex_HEIGHT 16
+extern u64 gSunEvening2Tex[TEX_LEN(u64, gSunEvening2Tex_WIDTH, gSunEvening2Tex_HEIGHT, 4)];
+#define gSunEvening3Tex_WIDTH 64
+#define gSunEvening3Tex_HEIGHT 16
+extern u64 gSunEvening3Tex[TEX_LEN(u64, gSunEvening3Tex_WIDTH, gSunEvening3Tex_HEIGHT, 4)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/sun_textures.c b/assets/objects/gameplay_keep/sun_textures.c
new file mode 100644
index 0000000000..3e07774fb5
--- /dev/null
+++ b/assets/objects/gameplay_keep/sun_textures.c
@@ -0,0 +1,15 @@
+#include "sun_textures.h"
+
+u64 gSun1Tex[TEX_LEN(u64, gSun1Tex_WIDTH, gSun1Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gSun1Tex.i4.inc.c"
+};
+
+u64 gSun2Tex[TEX_LEN(u64, gSun2Tex_WIDTH, gSun2Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gSun2Tex.i4.inc.c"
+};
+
+u64 gSun3Tex[TEX_LEN(u64, gSun3Tex_WIDTH, gSun3Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gSun3Tex.i4.inc.c"
+};
+
+u8 gameplay_keep_zeros_04C940[32] = { 0 };
diff --git a/assets/objects/gameplay_keep/sun_textures.h b/assets/objects/gameplay_keep/sun_textures.h
new file mode 100644
index 0000000000..4c4e61823d
--- /dev/null
+++ b/assets/objects/gameplay_keep/sun_textures.h
@@ -0,0 +1,17 @@
+#ifndef GAMEPLAY_KEEP_SUN_TEXTURES_H
+#define GAMEPLAY_KEEP_SUN_TEXTURES_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gSun1Tex_WIDTH 64
+#define gSun1Tex_HEIGHT 31
+extern u64 gSun1Tex[TEX_LEN(u64, gSun1Tex_WIDTH, gSun1Tex_HEIGHT, 4)];
+#define gSun2Tex_WIDTH 64
+#define gSun2Tex_HEIGHT 16
+extern u64 gSun2Tex[TEX_LEN(u64, gSun2Tex_WIDTH, gSun2Tex_HEIGHT, 4)];
+#define gSun3Tex_WIDTH 64
+#define gSun3Tex_HEIGHT 16
+extern u64 gSun3Tex[TEX_LEN(u64, gSun3Tex_WIDTH, gSun3Tex_HEIGHT, 4)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/tree_stump_model.c b/assets/objects/gameplay_keep/tree_stump_model.c
new file mode 100644
index 0000000000..a3456d62c7
--- /dev/null
+++ b/assets/objects/gameplay_keep/tree_stump_model.c
@@ -0,0 +1,11 @@
+#include "tree_stump_model.h"
+#include "gameplay_keep_0x43530.h"
+#include "gfx.h"
+
+Vtx gTreeStumpVtx[] = {
+#include "assets/objects/gameplay_keep/gTreeStumpVtx.inc.c"
+};
+
+Gfx gTreeStumpDL[34] = {
+#include "assets/objects/gameplay_keep/gTreeStumpDL.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/tree_stump_model.h b/assets/objects/gameplay_keep/tree_stump_model.h
new file mode 100644
index 0000000000..818baf4cad
--- /dev/null
+++ b/assets/objects/gameplay_keep/tree_stump_model.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPLAY_KEEP_TREE_STUMP_MODEL_H
+#define GAMEPLAY_KEEP_TREE_STUMP_MODEL_H
+
+#include "ultra64.h"
+
+extern Vtx gTreeStumpVtx[];
+extern Gfx gTreeStumpDL[34];
+
+#endif
diff --git a/assets/objects/gameplay_keep/unk_eff_blure_tex.c b/assets/objects/gameplay_keep/unk_eff_blure_tex.c
new file mode 100644
index 0000000000..e6443d1bd5
--- /dev/null
+++ b/assets/objects/gameplay_keep/unk_eff_blure_tex.c
@@ -0,0 +1,5 @@
+#include "unk_eff_blure_tex.h"
+
+u64 gUnknownEffBlureTex[TEX_LEN(u64, gUnknownEffBlureTex_WIDTH, gUnknownEffBlureTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gUnknownEffBlureTex.i8.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/unk_eff_blure_tex.h b/assets/objects/gameplay_keep/unk_eff_blure_tex.h
new file mode 100644
index 0000000000..6734cceb31
--- /dev/null
+++ b/assets/objects/gameplay_keep/unk_eff_blure_tex.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_UNK_EFF_BLURE_TEX_H
+#define GAMEPLAY_KEEP_UNK_EFF_BLURE_TEX_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gUnknownEffBlureTex_WIDTH 64
+#define gUnknownEffBlureTex_HEIGHT 32
+extern u64 gUnknownEffBlureTex[TEX_LEN(u64, gUnknownEffBlureTex_WIDTH, gUnknownEffBlureTex_HEIGHT, 8)];
+
+#endif
diff --git a/assets/objects/gameplay_keep/unused_bubbles.c b/assets/objects/gameplay_keep/unused_bubbles.c
new file mode 100644
index 0000000000..dcedf4f5e6
--- /dev/null
+++ b/assets/objects/gameplay_keep/unused_bubbles.c
@@ -0,0 +1,42 @@
+#include "unused_bubbles.h"
+#include "gfx.h"
+
+u64 gEffUnusedBubbles1Tex[TEX_LEN(u64, gEffUnusedBubbles1Tex_WIDTH, gEffUnusedBubbles1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnusedBubbles1Tex.ia8.inc.c"
+};
+
+u64 gEffUnusedBubbles2Tex[TEX_LEN(u64, gEffUnusedBubbles2Tex_WIDTH, gEffUnusedBubbles2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnusedBubbles2Tex.ia8.inc.c"
+};
+
+u64 gEffUnusedBubbles3Tex[TEX_LEN(u64, gEffUnusedBubbles3Tex_WIDTH, gEffUnusedBubbles3Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnusedBubbles3Tex.ia8.inc.c"
+};
+
+u64 gEffUnusedBubbles4Tex[TEX_LEN(u64, gEffUnusedBubbles4Tex_WIDTH, gEffUnusedBubbles4Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnusedBubbles4Tex.ia8.inc.c"
+};
+
+u64 gEffUnusedBubbles5Tex[TEX_LEN(u64, gEffUnusedBubbles5Tex_WIDTH, gEffUnusedBubbles5Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnusedBubbles5Tex.ia8.inc.c"
+};
+
+u64 gEffUnusedBubbles6Tex[TEX_LEN(u64, gEffUnusedBubbles6Tex_WIDTH, gEffUnusedBubbles6Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnusedBubbles6Tex.ia8.inc.c"
+};
+
+u64 gEffUnusedBubbles7Tex[TEX_LEN(u64, gEffUnusedBubbles7Tex_WIDTH, gEffUnusedBubbles7Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnusedBubbles7Tex.ia8.inc.c"
+};
+
+u64 gEffUnusedBubbles8Tex[TEX_LEN(u64, gEffUnusedBubbles8Tex_WIDTH, gEffUnusedBubbles8Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffUnusedBubbles8Tex.ia8.inc.c"
+};
+
+Gfx gEffUnusedBubblesDL[14] = {
+#include "assets/objects/gameplay_keep/gEffUnusedBubblesDL.inc.c"
+};
+
+Vtx gEffUnusedBubblesVtx[] = {
+#include "assets/objects/gameplay_keep/gEffUnusedBubblesVtx.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/unused_bubbles.h b/assets/objects/gameplay_keep/unused_bubbles.h
new file mode 100644
index 0000000000..6f28bc1f90
--- /dev/null
+++ b/assets/objects/gameplay_keep/unused_bubbles.h
@@ -0,0 +1,34 @@
+#ifndef GAMEPLAY_KEEP_UNUSED_BUBBLES_H
+#define GAMEPLAY_KEEP_UNUSED_BUBBLES_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gEffUnusedBubbles1Tex_WIDTH 32
+#define gEffUnusedBubbles1Tex_HEIGHT 32
+extern u64 gEffUnusedBubbles1Tex[TEX_LEN(u64, gEffUnusedBubbles1Tex_WIDTH, gEffUnusedBubbles1Tex_HEIGHT, 8)];
+#define gEffUnusedBubbles2Tex_WIDTH 32
+#define gEffUnusedBubbles2Tex_HEIGHT 32
+extern u64 gEffUnusedBubbles2Tex[TEX_LEN(u64, gEffUnusedBubbles2Tex_WIDTH, gEffUnusedBubbles2Tex_HEIGHT, 8)];
+#define gEffUnusedBubbles3Tex_WIDTH 32
+#define gEffUnusedBubbles3Tex_HEIGHT 32
+extern u64 gEffUnusedBubbles3Tex[TEX_LEN(u64, gEffUnusedBubbles3Tex_WIDTH, gEffUnusedBubbles3Tex_HEIGHT, 8)];
+#define gEffUnusedBubbles4Tex_WIDTH 32
+#define gEffUnusedBubbles4Tex_HEIGHT 32
+extern u64 gEffUnusedBubbles4Tex[TEX_LEN(u64, gEffUnusedBubbles4Tex_WIDTH, gEffUnusedBubbles4Tex_HEIGHT, 8)];
+#define gEffUnusedBubbles5Tex_WIDTH 32
+#define gEffUnusedBubbles5Tex_HEIGHT 32
+extern u64 gEffUnusedBubbles5Tex[TEX_LEN(u64, gEffUnusedBubbles5Tex_WIDTH, gEffUnusedBubbles5Tex_HEIGHT, 8)];
+#define gEffUnusedBubbles6Tex_WIDTH 32
+#define gEffUnusedBubbles6Tex_HEIGHT 32
+extern u64 gEffUnusedBubbles6Tex[TEX_LEN(u64, gEffUnusedBubbles6Tex_WIDTH, gEffUnusedBubbles6Tex_HEIGHT, 8)];
+#define gEffUnusedBubbles7Tex_WIDTH 32
+#define gEffUnusedBubbles7Tex_HEIGHT 32
+extern u64 gEffUnusedBubbles7Tex[TEX_LEN(u64, gEffUnusedBubbles7Tex_WIDTH, gEffUnusedBubbles7Tex_HEIGHT, 8)];
+#define gEffUnusedBubbles8Tex_WIDTH 32
+#define gEffUnusedBubbles8Tex_HEIGHT 32
+extern u64 gEffUnusedBubbles8Tex[TEX_LEN(u64, gEffUnusedBubbles8Tex_WIDTH, gEffUnusedBubbles8Tex_HEIGHT, 8)];
+extern Gfx gEffUnusedBubblesDL[14];
+extern Vtx gEffUnusedBubblesVtx[];
+
+#endif
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index ce2c7fb7d4..aa52b535ac 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -640,11 +640,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -737,10 +737,10 @@
-
-
-
-
+
+
+
+
@@ -811,20 +811,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -836,26 +836,26 @@
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1066,29 +1066,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml
index 9e792020bf..5d3ff079a2 100644
--- a/assets/xml/objects/gameplay_keep_pal.xml
+++ b/assets/xml/objects/gameplay_keep_pal.xml
@@ -640,11 +640,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -687,6 +687,7 @@
+
@@ -728,10 +729,10 @@
-
-
-
-
+
+
+
+
@@ -802,20 +803,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -841,12 +842,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1057,29 +1058,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/spec/spec b/spec/spec
index 60437c4bf9..f38e7fe006 100644
--- a/spec/spec
+++ b/spec/spec
@@ -3,6 +3,7 @@
*/
#include "include/versions.h"
+#include "include/region.h"
beginseg
name "makerom"
@@ -996,7 +997,149 @@ beginseg
name "gameplay_keep"
compress
romalign 0x1000
+#if 0
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep.o"
+#else
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/hilite_textures.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x400.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/link_textures.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_pause_joint_tables.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_anim_headers.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/debug_models.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/arrow_anims.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/arrow_skel.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/unk_eff_blure_tex.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/bomb_body.o"
+ 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/boomerang.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/compass_arrow.o"
+#if OOT_REGION != REGION_EU
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.o"
+#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"
+#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/gameplay_keep_0xD0C0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE770.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xFF80.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"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x13700.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/fairy_anim.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/fairy_skel.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x16A50.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/hilite4_tex.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x173D0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x185A0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x18610.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_shockwave.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_bubble.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_fire_footprint.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_bubbles.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/lens_mask_tex.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_hitmark.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x21810.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x23810.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x244B0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_spark_model.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x255F0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x27E90.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_lightning.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_enemy_death_flame.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x32090.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x33090.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_ice_fragments.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x33910.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x34020.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x355A0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/lens_flare.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x37840.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/hover_boots_circle.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/moon.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.o"
+#if OOT_REGION != REGION_EU
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.o"
+#endif
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x393B0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/liftable_rock_model.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x39710.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x39940.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/flat_block_model.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x39DF0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/small_flat_block_col.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3A150.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3A380.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/small_cube_model.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/small_cube_col.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/tree_stump_model.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/grass_blades_model.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3AC30.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/heart_piece_interior_model.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.o"
+#if OOT_REGION != REGION_EU
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.o"
+#endif
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/rectangular_sign_model.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3C870.o"
+#if OOT_REGION != REGION_EU
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.o"
+#endif
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/drop_recovery_heart_tex.o"
+#if OOT_REGION != REGION_EU
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.o"
+#endif
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/item_drop_dl.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3F140.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/rupee.o"
+#if OOT_REGION != REGION_EU
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/item_drops_ntsc.o"
+#endif
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/rupee_light_red_tex.o"
+#if OOT_REGION != REGION_EU
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.o"
+#endif
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x42530.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x43530.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x44530.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x45530.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x45D30.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/sign_textures.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x48130.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/shadow_foot.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/shadow_circle.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/shadow_horse.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x49F20.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x4A090.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/sun_textures.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/sun_evening_textures.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x4D160.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/lock_on_reticle.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_fire.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x4E660.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x515B0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/dust_textures.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/circle_glow_textures.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x55DB0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_spark_textures.o"
+#endif
number 4
endseg
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 5a0fe9b1c3..0d0982e5bd 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -31,7 +31,13 @@
#include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h"
#include "overlays/actors/ovl_En_Part/z_en_part.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/shadow_circle.h"
+#include "assets/objects/gameplay_keep/shadow_horse.h"
+#include "assets/objects/gameplay_keep/shadow_foot.h"
+#include "assets/objects/gameplay_keep/lock_on_reticle.h"
+#include "assets/objects/gameplay_keep/lock_on_arrow.h"
+#include "assets/objects/gameplay_keep/eff_flash.h"
+#include "assets/objects/gameplay_keep/lens_mask_tex.h"
#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "assets/objects/object_bdoor/object_bdoor.h"
diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c
index 1481e22fe7..5f2131262e 100644
--- a/src/code/z_debug_display.c
+++ b/src/code/z_debug_display.c
@@ -4,7 +4,7 @@
#include "play_state.h"
#include "debug_display.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/debug_models.h"
typedef struct DebugDispObjectInfo {
/* 0x00 */ s16 drawType; // indicates which draw function to use when displaying the object
diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c
index a5df803229..fffef14751 100644
--- a/src/code/z_eff_blure.c
+++ b/src/code/z_eff_blure.c
@@ -9,7 +9,7 @@
#include "effect.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/unk_eff_blure_tex.h"
void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
EffectBlureElement* elem;
diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c
index 051731fd87..f81d7d56c8 100644
--- a/src/code/z_eff_shield_particle.c
+++ b/src/code/z_eff_shield_particle.c
@@ -10,7 +10,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x38FB0.h"
static Vtx sVertices[5] = {
VTX(-32, -32, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF),
diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c
index ae6a84c47d..9e02cbf4f8 100644
--- a/src/code/z_eff_spark.c
+++ b/src/code/z_eff_spark.c
@@ -9,7 +9,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x38FB0.h"
// original name: "spark"
void EffectSpark_Init(void* thisx, void* initParamsx) {
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c
index 12d31b4f0a..f51a388ae1 100644
--- a/src/code/z_en_a_keep.c
+++ b/src/code/z_en_a_keep.c
@@ -6,7 +6,18 @@
#include "z_lib.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x393B0.h"
+#include "assets/objects/gameplay_keep/small_flat_block_col.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x3A380.h"
+#include "assets/objects/gameplay_keep/small_cube_col.h"
+#include "assets/objects/gameplay_keep/flat_block_model.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x3A150.h"
+#include "assets/objects/gameplay_keep/small_cube_model.h"
+#include "assets/objects/gameplay_keep/grass_blades_model.h"
+#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/object_d_hsblock/object_d_hsblock.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index 43668baebb..a2e0023cf8 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -19,7 +19,13 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/rupee.h"
+#include "assets/objects/gameplay_keep/drop_recovery_heart_tex.h"
+#include "assets/objects/gameplay_keep/item_drop_dl.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x3C870.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x3F140.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.h"
+#include "assets/objects/gameplay_keep/heart_piece_interior_model.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-eu-mq-dbg:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128" \
"gc-us-mq:128 ique-cn:128 ntsc-1.0:128 ntsc-1.2:128"
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 83699c82f3..8b641ed722 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -1,5 +1,5 @@
-#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
- "ique-cn:128 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0" \
+ "ique-cn:0 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
#include "libc64/qrand.h"
#include "libu64/gfxprint.h"
@@ -32,7 +32,12 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_lightning.h"
+#include "assets/objects/gameplay_keep/eff_shockwave.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x48130.h"
+#include "assets/objects/gameplay_keep/lens_flare.h"
+#include "assets/objects/gameplay_keep/moon.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x4D160.h"
#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
typedef enum LightningBoltState {
@@ -238,8 +243,8 @@ s16 sLightningFlashAlpha;
s16 sSunDepthTestX;
s16 sSunDepthTestY;
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
- "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \
+ "ique-cn:224 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1:192"
LightNode* sNGameOverLightNode;
LightInfo sNGameOverLightInfo;
diff --git a/src/code/z_lights.c b/src/code/z_lights.c
index 4059faacaa..a2f3b39aa7 100644
--- a/src/code/z_lights.c
+++ b/src/code/z_lights.c
@@ -6,7 +6,7 @@
#include "light.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/fairy_skel.h"
#define LIGHTS_BUFFER_SIZE 32
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index ba6cb77f0a..7cc7bef3dd 100644
--- a/src/code/z_map_exp.c
+++ b/src/code/z_map_exp.c
@@ -17,7 +17,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/compass_arrow.h"
#include "assets/textures/parameter_static/parameter_static.h"
MapData* gMapData;
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 7358db96d5..aa927c5e01 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -13,7 +13,8 @@
#include "save.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/player_pause_joint_tables.h"
+#include "assets/objects/gameplay_keep/player_anim_headers.h"
#include "assets/objects/object_link_boy/object_link_boy.h"
#include "assets/objects/object_link_child/object_link_child.h"
diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
index cdda12ba15..f81b757a33 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
@@ -17,7 +17,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/object_haka_objects/object_haka_objects.h"
#define FLAGS 0
diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
index d4b20752d5..7b92a74806 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
@@ -17,7 +17,8 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x173D0.h"
#include "assets/objects/object_haka_objects/object_haka_objects.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
index 7abcc1f912..338e747455 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
@@ -18,7 +18,7 @@
#include "play_state.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x173D0.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
index 0a01e35dcd..8ed63482fa 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
@@ -19,7 +19,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x173D0.h"
#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
index e06abd1114..613a1bf2ca 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
@@ -18,7 +18,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x49F20.h"
#include "assets/objects/object_box/object_box.h"
#include "assets/objects/object_mori_hineri1/object_mori_hineri1.h"
#include "assets/objects/object_mori_hineri1a/object_mori_hineri1a.h"
diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
index cf9c454583..7ed851eb39 100644
--- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
+++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
@@ -15,7 +15,7 @@
#include "light.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/object_syokudai/object_syokudai.h"
#define FLAGS 0
diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
index 8b6ab5ac96..c5138df70c 100644
--- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
+++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
@@ -19,7 +19,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/object_spot00_objects/object_spot00_objects.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
index 5643da5d98..2d9035abf3 100644
--- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
+++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
@@ -30,7 +30,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
#include "assets/objects/object_fd/object_fd.h"
#define FLAGS \
diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
index 4a1b0acbba..d69d968181 100644
--- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
@@ -35,7 +35,10 @@
#include "save.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/shadow_circle.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x244B0.h"
+#include "assets/objects/gameplay_keep/eff_shockwave.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
#include "assets/objects/object_mo/object_mo.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
index e0c2239361..f071b34fd0 100644
--- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
+++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
@@ -30,7 +30,7 @@
#include "skin_matrix.h"
#include "assets/objects/object_sst/object_sst.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x173D0.h"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
"ique-cn:128 pal-1.0:128 pal-1.1:128"
diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
index 79eb682a76..f74b5a9514 100644
--- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
+++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
@@ -23,11 +23,11 @@
#include "save.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/shadow_circle.h"
#include "assets/objects/object_tw/object_tw.h"
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
- "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0" \
+ "ique-cn:0 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
index 7cbbff4c3e..028f533cb2 100644
--- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
+++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
@@ -26,7 +26,7 @@
#include "play_state.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x55DB0.h"
#include "assets/objects/object_bv/object_bv.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:0" \
diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
index 076c395093..bbc13c849b 100644
--- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
+++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
@@ -23,7 +23,8 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_flash.h"
+#include "assets/objects/gameplay_keep/fairy_skel.h"
#include "assets/objects/object_demo_6k/object_demo_6k.h"
#include "assets/objects/object_gnd_magic/object_gnd_magic.h"
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
index b0594e2e53..0cfdf5835a 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@@ -24,7 +24,7 @@
#include "play_state.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_flash.h"
#include "assets/objects/object_efc_crystal_light/object_efc_crystal_light.h"
#include "assets/objects/object_efc_fire_ball/object_efc_fire_ball.h"
#include "assets/objects/object_efc_lgt_shower/object_efc_lgt_shower.h"
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
index 60d023f6b8..7068a97ca7 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@@ -18,7 +18,9 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
+#include "assets/objects/gameplay_keep/eff_dust.h"
+#include "assets/objects/gameplay_keep/eff_flash.h"
#include "assets/objects/object_efc_star_field/object_efc_star_field.h"
#include "assets/objects/object_toki_objects/object_toki_objects.h"
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 dc016d34b6..7010fc24f7 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/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0xE770.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_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
index 3d0b9603dd..abbab207bc 100644
--- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
@@ -25,7 +25,8 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x49F20.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x4A090.h"
#include "assets/objects/object_gnd/object_gnd.h"
#include "assets/objects/object_goma/object_goma.h"
#include "assets/objects/object_ydan_objects/object_ydan_objects.h"
diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
index 10875e547b..7682aa7a7d 100644
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
+++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
@@ -17,7 +17,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x37840.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
index 39cc72c383..3020716893 100644
--- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
+++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
@@ -18,7 +18,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
#include "assets/objects/object_anubice/object_anubice.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index c4a90bec05..62e300df80 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -20,7 +20,9 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/arrow_skel.h"
+#include "assets/objects/gameplay_keep/arrow_anims.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x37840.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
index 0c055c9be9..73dc69f101 100644
--- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c
+++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
@@ -21,7 +21,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/object_Bb/object_Bb.h"
#define FLAGS \
diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c
index bf1c9ee479..273a27ea6d 100644
--- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c
+++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c
@@ -18,7 +18,8 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/bomb_cap.h"
+#include "assets/objects/gameplay_keep/bomb_body.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
index 6e9dc91695..5dddbe7775 100644
--- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
+++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
@@ -15,7 +15,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/bombchu_body.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c
index d70422b1d0..1ae2c53cf9 100644
--- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c
+++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c
@@ -15,7 +15,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/boomerang.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c
index 58a5392306..7458b16107 100644
--- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c
+++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c
@@ -21,7 +21,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_flash.h"
#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
#define FLAGS 0
diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c
index 7f6b4ae99e..4c7f01fb6f 100644
--- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c
+++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c
@@ -23,7 +23,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/object_bw/object_bw.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
index d30784b4c1..37f3b99c99 100644
--- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
+++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
@@ -14,7 +14,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/shadow_circle.h"
#include "assets/objects/object_dekubaba/object_dekubaba.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
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 b4bdd073f4..5d70adc24a 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.c
@@ -18,7 +18,10 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0xFF80.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0xE770.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"
diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
index b40e670140..c882e0e973 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
@@ -27,7 +27,8 @@
#include "quest_hint.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/fairy_skel.h"
+#include "assets/objects/gameplay_keep/fairy_anim.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index 6c232529e7..95bdbd2ee2 100644
--- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -22,7 +22,9 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/item_drop_dl.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x3C870.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x3F140.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
index c9dd249402..99dc439ff4 100644
--- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
+++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
@@ -17,7 +17,7 @@
#include "play_state.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/rupee.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c
index 8050aef560..b4747e233a 100644
--- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c
+++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c
@@ -20,7 +20,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
#include "assets/objects/object_fw/object_fw.h"
#define FLAGS \
diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
index a26b54a64a..263834c400 100644
--- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
+++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
@@ -9,7 +9,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
index 793f6a5e82..e2910d9ae3 100644
--- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
+++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
@@ -26,7 +26,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
#include "assets/objects/object_fhg/object_fhg.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index ce2cb23937..0c9649720e 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -19,7 +19,9 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x18FF0.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x185A0.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x18610.h"
#define FLAGS 0
diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c
index 9d8b9e5aa3..0306f34b6e 100644
--- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c
+++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c
@@ -19,7 +19,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
#include "assets/objects/object_fw/object_fw.h"
#define FLAGS \
diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
index bc8c75c255..12414d28c1 100644
--- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
+++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
@@ -29,7 +29,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/rupee.h"
#include "assets/objects/object_tsubo/object_tsubo.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c
index aa911c2f19..32d0ed919d 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.c
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.c
@@ -15,7 +15,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
#include "assets/objects/object_oF1d_map/object_oF1d_map.h"
#define FLAGS \
diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
index d437df1c08..0cf6fd3b94 100644
--- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -20,7 +20,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
#include "assets/objects/object_oF1d_map/object_oF1d_map.h"
#define FLAGS \
diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
index 06e1dae817..b028dd2ec6 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+++ b/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.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h"
#include "assets/objects/object_goroiwa/object_goroiwa.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
index 77db13b027..8357725063 100644
--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
@@ -20,7 +20,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/object_gs/object_gs.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_DURING_OCARINA)
diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
index 2fa5d13382..adcc2d30aa 100644
--- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
+++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
@@ -21,7 +21,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
index c3713febb6..7d8f165624 100644
--- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
+++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
@@ -22,7 +22,7 @@
#include "skin.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/shadow_horse.h"
#include "assets/objects/object_horse_normal/object_horse_normal.h"
#define FLAGS 0
diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
index 86e86a8065..fcb1f03cff 100644
--- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
+++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
@@ -20,7 +20,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#define FLAGS 0
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
index dd215680c9..7950e2d38d 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
@@ -22,7 +22,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x34020.h"
#define FLAGS 0
diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
index a7cc77a262..413c79f14a 100644
--- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
+++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
@@ -25,7 +25,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/rectangular_sign_model.h"
#include "assets/objects/object_kanban/object_kanban.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
index 3a128a5b12..5ea7c60bf7 100644
--- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
+++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
@@ -19,7 +19,7 @@
#include "save.h"
#include "assets/objects/object_dekubaba/object_dekubaba.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/shadow_circle.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
index 9a5a41119f..ee51acfab0 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
@@ -21,7 +21,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x355A0.h"
#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
#include "assets/objects/object_kusa/object_kusa.h"
diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c
index 8d9640a2ad..a2f2ace152 100644
--- a/src/overlays/actors/ovl_En_Light/z_en_light.c
+++ b/src/overlays/actors/ovl_En_Light/z_en_light.c
@@ -16,7 +16,7 @@
#include "play_state.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#define FLAGS 0
diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
index 1a64d485d3..0e9692b77f 100644
--- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
+++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
@@ -12,7 +12,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x11230.h"
#define FLAGS 0
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index ab3c142984..4f055f1012 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/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.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0xCDC0.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"
diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
index 2989292f7f..d35d4bb190 100644
--- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
+++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
@@ -20,7 +20,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/object_po_field/object_po_field.h"
#define FLAGS \
diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
index fcd5a3ce27..d6ef77b2f5 100644
--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
@@ -23,7 +23,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/object_po_sisters/object_po_sisters.h"
#define FLAGS \
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
index a802541986..ff309246dc 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@@ -21,7 +21,7 @@
#include "play_state.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
#include "assets/objects/object_tk/object_tk.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c
index 826d7f0ebe..e5187f17f3 100644
--- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c
+++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c
@@ -19,7 +19,7 @@
#include "player.h"
#include "assets/objects/object_fd/object_fd.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/shadow_circle.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
index ce7ea7e2c9..c0d3f07508 100644
--- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
+++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
@@ -26,7 +26,7 @@
#include "skin.h"
#include "assets/objects/object_zl4/object_zl4.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/object_horse_zelda/object_horse_zelda.h"
#include "assets/objects/object_horse_ganon/object_horse_ganon.h"
#include "assets/objects/object_im/object_im.h"
diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c
index 128a0af5f4..8729325a01 100644
--- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c
+++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c
@@ -22,7 +22,7 @@
#include "player.h"
#include "assets/objects/object_vm/object_vm.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_enemy_death_flame.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
index 7373f441a6..80827f4407 100644
--- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
+++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
@@ -19,7 +19,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/shadow_circle.h"
#include "assets/objects/object_wallmaster/object_wallmaster.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
index 21827f32c0..5930e1a3e9 100644
--- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
+++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
@@ -16,7 +16,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_flash.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
index 7ccb70299d..5a4599aa01 100644
--- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
+++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
@@ -24,7 +24,7 @@
#include "play_state.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x355A0.h"
#include "assets/objects/object_mamenoki/object_mamenoki.h"
#define FLAGS ACTOR_FLAG_IGNORE_POINT_LIGHTS
diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
index 3dac2d7fe4..29ec55f5c6 100644
--- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
+++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
@@ -16,7 +16,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x33910.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
index 9409ee0a52..2874bb430d 100644
--- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
+++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
@@ -17,7 +17,7 @@
#include "z_lib.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#include "assets/objects/object_syokudai/object_syokudai.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
index 5f8f580e4e..568f211473 100644
--- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
+++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
@@ -22,7 +22,11 @@
#include "save.h"
#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_lightning.h"
+#include "assets/objects/gameplay_keep/sun_textures.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x4D160.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
+#include "assets/objects/gameplay_keep/eff_dust.h"
#include "assets/objects/object_spot02_objects/object_spot02_objects.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index e6e017490a..67b1ee435e 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -51,7 +51,9 @@
#include "save.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/player_anim_headers.h"
+#include "assets/objects/gameplay_keep/hover_boots_circle.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x33910.h"
#include "assets/objects/object_link_child/object_link_child.h"
// Some player animations are played at this reduced speed, for reasons yet unclear.
@@ -362,8 +364,8 @@ void Player_Action_CsAction(Player* this, PlayState* play);
// .bss part 1
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:0" \
- "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
+#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64 ique-cn:64" \
+ "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
static s32 D_80858AA0;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
index aa9ae498eb..7ae5d611d1 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
@@ -14,7 +14,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_shockwave.h"
#define rInnerColorR regs[0]
#define rInnerColorG regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c
index f78c1e2f56..54cfc4e2fd 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c
@@ -17,7 +17,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_bomb_explosion.h"
#define EFFSSBOMB_LIFESPAN 20
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
index 176f68acc1..ea6652aff9 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
@@ -15,7 +15,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_bomb_explosion.h"
#define rScale regs[0]
#define rTexIndex regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
index 49f3ace0c1..bf25e04fee 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
@@ -15,7 +15,8 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x55DB0.h"
+#include "assets/objects/gameplay_keep/eff_bubble.h"
#define rScale regs[0]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
index b75a7077c8..92ef1600d7 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
@@ -14,7 +14,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_enemy_death_flame.h"
#define rScale regs[0]
#define rTextIdx regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
index 7bc0936907..a325828d3b 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
@@ -15,7 +15,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/lens_flare.h"
#define rScale regs[0]
#define rPrimColorR regs[2]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
index 5f6da1295f..39e625cbd4 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
@@ -12,7 +12,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/lens_flare.h"
#define rScale regs[0]
#define rTimer regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
index 1e7e3ca2ed..c07859177e 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
@@ -15,7 +15,8 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x55DB0.h"
+#include "assets/objects/gameplay_keep/eff_bubble.h"
#define rPrimColorR regs[0]
#define rPrimColorG regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
index f06b5f3031..ab94be61db 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
@@ -16,7 +16,8 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_dust.h"
+#include "assets/objects/gameplay_keep/dust_textures.h"
#define rPrimColorR regs[0]
#define rPrimColorG regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
index d632dfaa52..6ca632c689 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
@@ -14,7 +14,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#define rScaleMax regs[0]
#define rScale regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
index d4b07ef730..0c49b89466 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
@@ -18,7 +18,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_ice_fragments.h"
#define rLifespan regs[0]
#define rYaw regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
index c9bfbe981a..d2a0a31327 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
@@ -13,7 +13,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x173D0.h"
#define rUnused regs[3] // probably supposed to be an alpha
#define rRadius regs[8]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
index 8a5e416a6a..ba906e0e05 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
@@ -14,7 +14,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#define rScale regs[0]
#define rLifespan regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c
index 9fc9d920dd..862f7c020e 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c
@@ -10,7 +10,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire_footprint.h"
u32 EffectSsGFire_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
void EffectSsGFire_Draw(PlayState* play, u32 index, EffectSs* this);
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
index b37136a18c..a1091f7d20 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
@@ -11,7 +11,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x23810.h"
u32 EffectSsGMagma_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
void EffectSsGMagma_Draw(PlayState* play, u32 index, EffectSs* this);
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
index ef0565c8f8..37abad09c6 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
@@ -14,7 +14,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x244B0.h"
#define rWaterBoxNum regs[0]
#define rRadius regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c
index 783224c9e0..3ee210f5ba 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c
@@ -15,7 +15,8 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_spark_model.h"
+#include "assets/objects/gameplay_keep/eff_spark_textures.h"
#define rPrimColorR regs[0]
#define rPrimColorG regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
index 5995c1b563..cc22fd0a3c 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
@@ -10,7 +10,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x255F0.h"
//! @bug the reuse of regs[11] means that EffectSs_DrawGEffect will treat the type as an object slot (`rgObjectSlot`)
// this ends up having no effect because the texture provided does not use segment 6
diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
index 550c4a08d3..5bcdc45023 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
@@ -15,7 +15,8 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h"
#define rPitch regs[0]
#define rYaw regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
index e1fa2a982e..9e36117534 100644
--- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
+++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
@@ -14,7 +14,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_hitmark.h"
#define rTexIndex regs[0]
#define rType regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
index 4bad83b5f0..fa73d60db9 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
@@ -14,7 +14,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_ice_fragments.h"
#define rLifespan regs[0]
#define rYaw regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
index ce06859168..3b79d44a0b 100644
--- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
@@ -13,7 +13,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_fire.h"
#define rAlpha regs[0]
#define rScroll regs[2]
diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
index a4093ead1b..e7a65d0187 100644
--- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
+++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
@@ -17,7 +17,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x37840.h"
#define rRotSpeed regs[0]
#define rYaw regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
index 5e2ff3aaf0..60a119ca64 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
@@ -16,7 +16,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/eff_lightning.h"
#define rPrimColorR regs[0]
#define rPrimColorG regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
index aecdd6c936..7cf282647e 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
@@ -17,7 +17,8 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x55DB0.h"
+#include "assets/objects/gameplay_keep/eff_bubble.h"
#define rPrimColorR regs[0]
#define rPrimColorG regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
index 24e484c1ee..dcba6caa14 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
@@ -13,7 +13,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/unused_bubbles.h"
#define rPrimColorR regs[0]
#define rPrimColorG regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
index bdd99e1e31..55a5af975c 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
@@ -16,7 +16,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x27E90.h"
#define rReg0 regs[0]
diff --git a/tools/assets/extract/extase/__init__.py b/tools/assets/extract/extase/__init__.py
index 029b20d214..066fdf7b0b 100644
--- a/tools/assets/extract/extase/__init__.py
+++ b/tools/assets/extract/extase/__init__.py
@@ -641,6 +641,11 @@ class File:
self.source_h_path = source_path / f"{file_name}.h"
def write_source(self):
+ def strip_extracted_prefix(path : Path) -> Path:
+ parts = path.parts
+ if parts[0] == "extracted":
+ return Path(*parts[2:]) # Skip first two parts
+ return path # Return original path if condition not met
assert hasattr(
self, "source_c_path"
), "set_source_path must be called before write_source"
@@ -660,7 +665,7 @@ class File:
referenced_file,
)
assert hasattr(referenced_file, "source_h_path")
- file_include_paths_complete.append(referenced_file.source_h_path)
+ file_include_paths_complete.append(strip_extracted_prefix(referenced_file.source_h_path))
# Same as file_include_paths_complete,
# but paths that can be are made relative to the source C.
From 6664dfed6dca3138658e8385e4305a0f1d2e0ebd Mon Sep 17 00:00:00 2001
From: Tharo <17233964+Thar0@users.noreply.github.com>
Date: Sat, 7 Jun 2025 20:45:32 +0100
Subject: [PATCH 02/22] Remove debugging bits
---
spec/spec | 4 ----
tools/assets/extract/write_source.txt | 1 -
2 files changed, 5 deletions(-)
diff --git a/spec/spec b/spec/spec
index f38e7fe006..04a226269f 100644
--- a/spec/spec
+++ b/spec/spec
@@ -997,9 +997,6 @@ beginseg
name "gameplay_keep"
compress
romalign 0x1000
-#if 0
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep.o"
-#else
include "$(BUILD_DIR)/assets/objects/gameplay_keep/hilite_textures.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x400.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/link_textures.o"
@@ -1139,7 +1136,6 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/circle_glow_textures.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x55DB0.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_spark_textures.o"
-#endif
number 4
endseg
diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt
index 5d19b2a10a..34cec7cdda 100644
--- a/tools/assets/extract/write_source.txt
+++ b/tools/assets/extract/write_source.txt
@@ -5,7 +5,6 @@ assets/misc/link_animetion/link_animetion.c
assets/misc/z_select_static/z_select_static.c
assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.c
assets/objects/gameplay_field_keep/gameplay_field_keep.c
-assets/objects/gameplay_keep/gameplay_keep.c
assets/objects/object_ahg/object_ahg.c
assets/objects/object_am/object_am.c
assets/objects/object_ane/object_ane.c
From 92c0782bd3908f40f3b1e5bbbc08206ceeabfd40 Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Sun, 8 Jun 2025 09:20:13 +0200
Subject: [PATCH 03/22] format
---
assets/objects/gameplay_keep/gameplay_keep_0x355A0.c | 3 ++-
assets/objects/gameplay_keep/gameplay_keep_0x3C870.c | 4 ----
assets/objects/gameplay_keep/gameplay_keep_0x45530.c | 3 ++-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x355A0.c b/assets/objects/gameplay_keep/gameplay_keep_0x355A0.c
index c8ed7fd4df..3ff20933a3 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x355A0.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x355A0.c
@@ -17,7 +17,8 @@ Gfx gCuttableShrubTipDL[18] = {
#include "assets/objects/gameplay_keep/gCuttableShrubTipDL.inc.c"
};
-u64 gCuttableShrubLeafTFragmentTex[TEX_LEN(u64, gCuttableShrubLeafTFragmentTex_WIDTH, gCuttableShrubLeafTFragmentTex_HEIGHT, 16)] = {
+u64 gCuttableShrubLeafTFragmentTex[TEX_LEN(u64, gCuttableShrubLeafTFragmentTex_WIDTH,
+ gCuttableShrubLeafTFragmentTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gCuttableShrubLeafTFragmentTex.rgba16.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3C870.c b/assets/objects/gameplay_keep/gameplay_keep_0x3C870.c
index d06eb72b68..b50544a93b 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x3C870.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x3C870.c
@@ -15,7 +15,3 @@ u64 gDropArrows3Tex[TEX_LEN(u64, gDropArrows3Tex_WIDTH, gDropArrows3Tex_HEIGHT,
u64 gDropBombTex[TEX_LEN(u64, gDropBombTex_WIDTH, gDropBombTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gDropBombTex.rgba16.inc.c"
};
-
-
-
-
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x45530.c b/assets/objects/gameplay_keep/gameplay_keep_0x45530.c
index 976f09c95f..e63b71579f 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x45530.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x45530.c
@@ -1,5 +1,6 @@
#include "gameplay_keep_0x45530.h"
-u64 gUnusedStoneHookshotTargetTex[TEX_LEN(u64, gUnusedStoneHookshotTargetTex_WIDTH, gUnusedStoneHookshotTargetTex_HEIGHT, 16)] = {
+u64 gUnusedStoneHookshotTargetTex[TEX_LEN(u64, gUnusedStoneHookshotTargetTex_WIDTH,
+ gUnusedStoneHookshotTargetTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gUnusedStoneHookshotTargetTex.rgba16.inc.c"
};
From 294aeb32163e9ec692fcc04a71d53449d6642375 Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Sun, 8 Jun 2025 09:20:23 +0200
Subject: [PATCH 04/22] bss
---
src/code/z_kankyo.c | 6 +++---
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 8b641ed722..3b89ddecfb 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -1,5 +1,5 @@
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0" \
- "ique-cn:0 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
+#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:240 gc-jp-ce:240 gc-jp-mq:240 gc-us:240 gc-us-mq:240" \
+ "ique-cn:224 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:240 pal-1.1:240"
#include "libc64/qrand.h"
#include "libu64/gfxprint.h"
@@ -244,7 +244,7 @@ s16 sSunDepthTestX;
s16 sSunDepthTestY;
#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \
- "ique-cn:224 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1:192"
+ "ique-cn:224 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1:224"
LightNode* sNGameOverLightNode;
LightInfo sNGameOverLightInfo;
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
index 7068a97ca7..6c0c44bdc4 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@@ -24,8 +24,8 @@
#include "assets/objects/object_efc_star_field/object_efc_star_field.h"
#include "assets/objects/object_toki_objects/object_toki_objects.h"
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
- "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:0 pal-1.1:0"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:0" \
+ "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:0 pal-1.1:0"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
From e94e89d8b978e86b8d352c84fe75df22307f4957 Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Sun, 8 Jun 2025 17:25:57 +0200
Subject: [PATCH 05/22] merge gameplay_keep_0x400 into link_textures
---
assets/objects/gameplay_keep/gameplay_keep.h | 1 -
.../gameplay_keep/gameplay_keep_0x400.c | 17 ----------------
.../gameplay_keep/gameplay_keep_0x400.h | 20 -------------------
assets/objects/gameplay_keep/link_textures.c | 16 +++++++++++++++
assets/objects/gameplay_keep/link_textures.h | 12 +++++++++++
spec/spec | 1 -
6 files changed, 28 insertions(+), 39 deletions(-)
delete mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x400.c
delete mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x400.h
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index 8115d2f474..4cf7c9635b 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -2,7 +2,6 @@
#define GAMEPLAY_KEEP_H
#include "hilite_textures.h"
-#include "gameplay_keep_0x400.h"
#include "link_textures.h"
#include "player_pause_joint_tables.h"
#include "player_anim_headers.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x400.c b/assets/objects/gameplay_keep/gameplay_keep_0x400.c
deleted file mode 100644
index 07e7831070..0000000000
--- a/assets/objects/gameplay_keep/gameplay_keep_0x400.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "gameplay_keep_0x400.h"
-
-u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gHylianShieldDesignTex.rgba16.inc.c"
-};
-
-u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gOcarinaofTimeDesignTex.rgba16.inc.c"
-};
-
-u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gBottleGlassTex.rgba16.inc.c"
-};
-
-u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)] = {
-#include "assets/objects/gameplay_keep/gDekuStickTex.i8.inc.c"
-};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x400.h b/assets/objects/gameplay_keep/gameplay_keep_0x400.h
deleted file mode 100644
index 8978cd1983..0000000000
--- a/assets/objects/gameplay_keep/gameplay_keep_0x400.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef GAMEPLAY_KEEP_0x400_H
-#define GAMEPLAY_KEEP_0x400_H
-
-#include "tex_len.h"
-#include "ultra64.h"
-
-#define gHylianShieldDesignTex_WIDTH 32
-#define gHylianShieldDesignTex_HEIGHT 64
-extern u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)];
-#define gOcarinaofTimeDesignTex_WIDTH 32
-#define gOcarinaofTimeDesignTex_HEIGHT 16
-extern u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)];
-#define gBottleGlassTex_WIDTH 16
-#define gBottleGlassTex_HEIGHT 16
-extern u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)];
-#define gDekuStickTex_WIDTH 8
-#define gDekuStickTex_HEIGHT 8
-extern u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)];
-
-#endif
diff --git a/assets/objects/gameplay_keep/link_textures.c b/assets/objects/gameplay_keep/link_textures.c
index 472f1eb2ee..3564006310 100644
--- a/assets/objects/gameplay_keep/link_textures.c
+++ b/assets/objects/gameplay_keep/link_textures.c
@@ -1,5 +1,21 @@
#include "link_textures.h"
+u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gHylianShieldDesignTex.rgba16.inc.c"
+};
+
+u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gOcarinaofTimeDesignTex.rgba16.inc.c"
+};
+
+u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gBottleGlassTex.rgba16.inc.c"
+};
+
+u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gDekuStickTex.i8.inc.c"
+};
+
u64 gLinkHairTex[TEX_LEN(u64, gLinkHairTex_WIDTH, gLinkHairTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gLinkHairTex.rgba16.inc.c"
};
diff --git a/assets/objects/gameplay_keep/link_textures.h b/assets/objects/gameplay_keep/link_textures.h
index 459f32a46a..1b69ed135c 100644
--- a/assets/objects/gameplay_keep/link_textures.h
+++ b/assets/objects/gameplay_keep/link_textures.h
@@ -4,6 +4,18 @@
#include "tex_len.h"
#include "ultra64.h"
+#define gHylianShieldDesignTex_WIDTH 32
+#define gHylianShieldDesignTex_HEIGHT 64
+extern u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)];
+#define gOcarinaofTimeDesignTex_WIDTH 32
+#define gOcarinaofTimeDesignTex_HEIGHT 16
+extern u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)];
+#define gBottleGlassTex_WIDTH 16
+#define gBottleGlassTex_HEIGHT 16
+extern u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)];
+#define gDekuStickTex_WIDTH 8
+#define gDekuStickTex_HEIGHT 8
+extern u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)];
#define gLinkHairTex_WIDTH 16
#define gLinkHairTex_HEIGHT 16
extern u64 gLinkHairTex[TEX_LEN(u64, gLinkHairTex_WIDTH, gLinkHairTex_HEIGHT, 16)];
diff --git a/spec/spec b/spec/spec
index 04a226269f..d8cc630766 100644
--- a/spec/spec
+++ b/spec/spec
@@ -998,7 +998,6 @@ beginseg
compress
romalign 0x1000
include "$(BUILD_DIR)/assets/objects/gameplay_keep/hilite_textures.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x400.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/link_textures.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_pause_joint_tables.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_anim_headers.o"
From a3260425819027aa8289928c147dade17c052faa Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Sun, 8 Jun 2025 18:03:46 +0200
Subject: [PATCH 06/22] Name some unused NTSC stuff
---
.../gameplay_keep_ntsc_0x39970.c | 8 ++---
.../gameplay_keep_ntsc_0x39970.h | 4 +--
.../gameplay_keep_ntsc_0x39A40.c | 8 ++---
.../gameplay_keep_ntsc_0x39A40.h | 4 +--
.../gameplay_keep_ntsc_0x39B10.c | 8 ++---
.../gameplay_keep_ntsc_0x39B10.h | 4 +--
.../gameplay_keep_ntsc_0x3D220.c | 8 ++---
.../gameplay_keep_ntsc_0x3D220.h | 4 +--
.../gameplay_keep_ntsc_0x3FD80.c | 4 +--
.../gameplay_keep_ntsc_0x3FD80.h | 6 ++--
.../gameplay_keep_ntsc_0x41580.c | 4 +--
.../gameplay_keep_ntsc_0x41580.h | 6 ++--
.../gameplay_keep_ntsc_0x46A40.c | 8 ++---
.../gameplay_keep_ntsc_0x46A40.h | 12 ++++----
.../objects/gameplay_keep/item_drops_ntsc.c | 12 ++++----
.../objects/gameplay_keep/item_drops_ntsc.h | 18 +++++------
assets/xml/objects/gameplay_keep.xml | 30 +++++++++----------
17 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
index b1f4b856fd..fff2944433 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
@@ -2,10 +2,10 @@
#include "item_drops_ntsc.h"
#include "gfx.h"
-Vtx gameplay_keep_Vtx_039970[] = {
-#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039970.inc.c"
+Vtx gUnusedBombIconVtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedBombIconVtx.inc.c"
};
-Gfx gGameplayKeepDL_399B0[17] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepDL_399B0.inc.c"
+Gfx gUnusedBombIconDL[17] = {
+#include "assets/objects/gameplay_keep/gUnusedBombIconDL.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
index 2c652a06a3..7e15d2a83e 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
@@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-extern Vtx gameplay_keep_Vtx_039970[];
-extern Gfx gGameplayKeepDL_399B0[17];
+extern Vtx gUnusedBombIconVtx[];
+extern Gfx gUnusedBombIconDL[17];
#endif
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
index 2639baf8b8..11e34a2128 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
@@ -2,10 +2,10 @@
#include "item_drops_ntsc.h"
#include "gfx.h"
-Vtx gameplay_keep_Vtx_039A40[] = {
-#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039A40.inc.c"
+Vtx gUnusedHeartIconVtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartIconVtx.inc.c"
};
-Gfx gGameplayKeepDL_39A80[17] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepDL_39A80.inc.c"
+Gfx gUnusedHeartIconDL[17] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartIconDL.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
index 1526f1e101..f691e80501 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
@@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-extern Vtx gameplay_keep_Vtx_039A40[];
-extern Gfx gGameplayKeepDL_39A80[17];
+extern Vtx gUnusedHeartIconVtx[];
+extern Gfx gUnusedHeartIconDL[17];
#endif
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
index 29dede5c82..f078ca357b 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
@@ -2,10 +2,10 @@
#include "item_drops_ntsc.h"
#include "gfx.h"
-Vtx gameplay_keep_Vtx_039B10[] = {
-#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_039B10.inc.c"
+Vtx gUnusedArrowIconVtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedArrowIconVtx.inc.c"
};
-Gfx gGameplayKeepDL_39B50[17] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepDL_39B50.inc.c"
+Gfx gUnusedArrowIconDL[17] = {
+#include "assets/objects/gameplay_keep/gUnusedArrowIconDL.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
index c90445eee2..c02feb79af 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
@@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-extern Vtx gameplay_keep_Vtx_039B10[];
-extern Gfx gGameplayKeepDL_39B50[17];
+extern Vtx gUnusedArrowIconVtx[];
+extern Gfx gUnusedArrowIconDL[17];
#endif
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
index d038f02985..6e2e217858 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
@@ -2,10 +2,10 @@
#include "gameplay_keep_ntsc_0x46A40.h"
#include "gfx.h"
-Vtx gameplay_keep_Vtx_03D220[] = {
-#include "assets/objects/gameplay_keep/gameplay_keep_Vtx_03D220.inc.c"
+Vtx gUnusedHeartContainerIconVtx[] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartContainerIconVtx.inc.c"
};
-Gfx gGameplayKeepDL_3D260[17] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepDL_3D260.inc.c"
+Gfx gUnusedHeartContainerIconDL[17] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartContainerIconDL.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
index 692252d098..481bd6747d 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
@@ -5,8 +5,8 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-extern Vtx gameplay_keep_Vtx_03D220[];
-extern Gfx gGameplayKeepDL_3D260[17];
+extern Vtx gUnusedHeartContainerIconVtx[];
+extern Gfx gUnusedHeartContainerIconDL[17];
#endif
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c
index 32e5231747..0d5a5aad53 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.c
@@ -1,7 +1,7 @@
#include "gameplay_keep_ntsc_0x3FD80.h"
-u64 gGameplayKeepTex_3FD80[TEX_LEN(u64, gGameplayKeepTex_3FD80_WIDTH, gGameplayKeepTex_3FD80_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_3FD80.rgba16.inc.c"
+u64 gUnusedBombchuIconTex[TEX_LEN(u64, gUnusedBombchuIconTex_WIDTH, gUnusedBombchuIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedBombchuIconTex.rgba16.inc.c"
};
u64 gGameplayKeepTex_40580[TEX_LEN(u64, gGameplayKeepTex_40580_WIDTH, gGameplayKeepTex_40580_HEIGHT, 16)] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h
index db26e01d76..d9cadcb861 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h
@@ -6,9 +6,9 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-#define gGameplayKeepTex_3FD80_WIDTH 32
-#define gGameplayKeepTex_3FD80_HEIGHT 32
-extern u64 gGameplayKeepTex_3FD80[TEX_LEN(u64, gGameplayKeepTex_3FD80_WIDTH, gGameplayKeepTex_3FD80_HEIGHT, 16)];
+#define gUnusedBombchuIconTex_WIDTH 32
+#define gUnusedBombchuIconTex_HEIGHT 32
+extern u64 gUnusedBombchuIconTex[TEX_LEN(u64, gUnusedBombchuIconTex_WIDTH, gUnusedBombchuIconTex_HEIGHT, 16)];
#define gGameplayKeepTex_40580_WIDTH 32
#define gGameplayKeepTex_40580_HEIGHT 32
extern u64 gGameplayKeepTex_40580[TEX_LEN(u64, gGameplayKeepTex_40580_WIDTH, gGameplayKeepTex_40580_HEIGHT, 16)];
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
index 08a7e1db21..48cfc3618a 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
@@ -1,5 +1,5 @@
#include "gameplay_keep_ntsc_0x41580.h"
-u64 gGameplayKeepTex_41580[TEX_LEN(u64, gGameplayKeepTex_41580_WIDTH, gGameplayKeepTex_41580_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_41580.rgba16.inc.c"
+u64 gUnusedHeartPieceIconTex[TEX_LEN(u64, gUnusedHeartPieceIconTex_WIDTH, gUnusedHeartPieceIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartPieceIconTex.rgba16.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
index 5400c4f488..8a0b3d2f96 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
@@ -6,9 +6,9 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-#define gGameplayKeepTex_41580_WIDTH 32
-#define gGameplayKeepTex_41580_HEIGHT 32
-extern u64 gGameplayKeepTex_41580[TEX_LEN(u64, gGameplayKeepTex_41580_WIDTH, gGameplayKeepTex_41580_HEIGHT, 16)];
+#define gUnusedHeartPieceIconTex_WIDTH 32
+#define gUnusedHeartPieceIconTex_HEIGHT 32
+extern u64 gUnusedHeartPieceIconTex[TEX_LEN(u64, gUnusedHeartPieceIconTex_WIDTH, gUnusedHeartPieceIconTex_HEIGHT, 16)];
#endif
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
index 6b4a6d8749..cae4d61fb5 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
@@ -4,10 +4,10 @@ u64 gGameplayKeepTex_46A40[TEX_LEN(u64, gGameplayKeepTex_46A40_WIDTH, gGameplayK
#include "assets/objects/gameplay_keep/gGameplayKeepTex_46A40.rgba16.inc.c"
};
-u64 gGameplayKeepTex_46A60[TEX_LEN(u64, gGameplayKeepTex_46A60_WIDTH, gGameplayKeepTex_46A60_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_46A60.rgba16.inc.c"
+u64 gUnusedHeartContainerIconTex[TEX_LEN(u64, gUnusedHeartContainerIconTex_WIDTH, gUnusedHeartContainerIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartContainerIconTex.rgba16.inc.c"
};
-u64 gGameplayKeepTex_47260[TEX_LEN(u64, gGameplayKeepTex_47260_WIDTH, gGameplayKeepTex_47260_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_47260.rgba16.inc.c"
+u64 gUnusedTreeBarkTex[TEX_LEN(u64, gUnusedTreeBarkTex_WIDTH, gUnusedTreeBarkTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedTreeBarkTex.rgba16.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h
index 670e335b0c..7b8e2d5c1e 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.h
@@ -7,11 +7,11 @@
#define gGameplayKeepTex_46A40_WIDTH 4
#define gGameplayKeepTex_46A40_HEIGHT 4
extern u64 gGameplayKeepTex_46A40[TEX_LEN(u64, gGameplayKeepTex_46A40_WIDTH, gGameplayKeepTex_46A40_HEIGHT, 16)];
-#define gGameplayKeepTex_46A60_WIDTH 32
-#define gGameplayKeepTex_46A60_HEIGHT 32
-extern u64 gGameplayKeepTex_46A60[TEX_LEN(u64, gGameplayKeepTex_46A60_WIDTH, gGameplayKeepTex_46A60_HEIGHT, 16)];
-#define gGameplayKeepTex_47260_WIDTH 32
-#define gGameplayKeepTex_47260_HEIGHT 32
-extern u64 gGameplayKeepTex_47260[TEX_LEN(u64, gGameplayKeepTex_47260_WIDTH, gGameplayKeepTex_47260_HEIGHT, 16)];
+#define gUnusedHeartContainerIconTex_WIDTH 32
+#define gUnusedHeartContainerIconTex_HEIGHT 32
+extern u64 gUnusedHeartContainerIconTex[TEX_LEN(u64, gUnusedHeartContainerIconTex_WIDTH, gUnusedHeartContainerIconTex_HEIGHT, 16)];
+#define gUnusedTreeBarkTex_WIDTH 32
+#define gUnusedTreeBarkTex_HEIGHT 32
+extern u64 gUnusedTreeBarkTex[TEX_LEN(u64, gUnusedTreeBarkTex_WIDTH, gUnusedTreeBarkTex_HEIGHT, 16)];
#endif
diff --git a/assets/objects/gameplay_keep/item_drops_ntsc.c b/assets/objects/gameplay_keep/item_drops_ntsc.c
index 3857482745..ad409fd0c6 100644
--- a/assets/objects/gameplay_keep/item_drops_ntsc.c
+++ b/assets/objects/gameplay_keep/item_drops_ntsc.c
@@ -1,13 +1,13 @@
#include "item_drops_ntsc.h"
-u64 gGameplayKeepTex_45220[TEX_LEN(u64, gGameplayKeepTex_45220_WIDTH, gGameplayKeepTex_45220_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_45220.rgba16.inc.c"
+u64 gUnusedHeartIconTex[TEX_LEN(u64, gUnusedHeartIconTex_WIDTH, gUnusedHeartIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedHeartIconTex.rgba16.inc.c"
};
-u64 gGameplayKeepTex_45A20[TEX_LEN(u64, gGameplayKeepTex_45A20_WIDTH, gGameplayKeepTex_45A20_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_45A20.rgba16.inc.c"
+u64 gUnusedBombIconTex[TEX_LEN(u64, gUnusedBombIconTex_WIDTH, gUnusedBombIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedBombIconTex.rgba16.inc.c"
};
-u64 gGameplayKeepTex_46220[TEX_LEN(u64, gGameplayKeepTex_46220_WIDTH, gGameplayKeepTex_46220_HEIGHT, 16)] = {
-#include "assets/objects/gameplay_keep/gGameplayKeepTex_46220.rgba16.inc.c"
+u64 gUnusedArrowIconTex[TEX_LEN(u64, gUnusedArrowIconTex_WIDTH, gUnusedArrowIconTex_HEIGHT, 16)] = {
+#include "assets/objects/gameplay_keep/gUnusedArrowIconTex.rgba16.inc.c"
};
diff --git a/assets/objects/gameplay_keep/item_drops_ntsc.h b/assets/objects/gameplay_keep/item_drops_ntsc.h
index 50bd638430..15e90e0809 100644
--- a/assets/objects/gameplay_keep/item_drops_ntsc.h
+++ b/assets/objects/gameplay_keep/item_drops_ntsc.h
@@ -6,15 +6,15 @@
#include "region.h"
#if OOT_REGION != REGION_EU
-#define gGameplayKeepTex_45220_WIDTH 32
-#define gGameplayKeepTex_45220_HEIGHT 32
-extern u64 gGameplayKeepTex_45220[TEX_LEN(u64, gGameplayKeepTex_45220_WIDTH, gGameplayKeepTex_45220_HEIGHT, 16)];
-#define gGameplayKeepTex_45A20_WIDTH 32
-#define gGameplayKeepTex_45A20_HEIGHT 32
-extern u64 gGameplayKeepTex_45A20[TEX_LEN(u64, gGameplayKeepTex_45A20_WIDTH, gGameplayKeepTex_45A20_HEIGHT, 16)];
-#define gGameplayKeepTex_46220_WIDTH 32
-#define gGameplayKeepTex_46220_HEIGHT 32
-extern u64 gGameplayKeepTex_46220[TEX_LEN(u64, gGameplayKeepTex_46220_WIDTH, gGameplayKeepTex_46220_HEIGHT, 16)];
+#define gUnusedHeartIconTex_WIDTH 32
+#define gUnusedHeartIconTex_HEIGHT 32
+extern u64 gUnusedHeartIconTex[TEX_LEN(u64, gUnusedHeartIconTex_WIDTH, gUnusedHeartIconTex_HEIGHT, 16)];
+#define gUnusedBombIconTex_WIDTH 32
+#define gUnusedBombIconTex_HEIGHT 32
+extern u64 gUnusedBombIconTex[TEX_LEN(u64, gUnusedBombIconTex_WIDTH, gUnusedBombIconTex_HEIGHT, 16)];
+#define gUnusedArrowIconTex_WIDTH 32
+#define gUnusedArrowIconTex_HEIGHT 32
+extern u64 gUnusedArrowIconTex[TEX_LEN(u64, gUnusedArrowIconTex_WIDTH, gUnusedArrowIconTex_HEIGHT, 16)];
#endif
#endif
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index aa52b535ac..24990118e3 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -1129,18 +1129,18 @@
-
+
-
-
+
+
-
-
+
+
-
+
@@ -1205,10 +1205,10 @@
-
+
-
+
@@ -1223,12 +1223,12 @@
-
+
-
+
@@ -1251,15 +1251,15 @@
-
-
-
+
+
+
-
-
+
+
From b2c0bc85250a6c0290c8d510e9f51162544a6505 Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Sun, 8 Jun 2025 18:13:20 +0200
Subject: [PATCH 07/22] Rename files for some of the newly named unused NTSC
stuff
---
assets/objects/gameplay_keep/gameplay_keep.h | 10 +++++-----
...p_ntsc_0x39B10.c => unused_arrow_icon_model_ntsc.c} | 2 +-
...p_ntsc_0x39B10.h => unused_arrow_icon_model_ntsc.h} | 4 ++--
...ep_ntsc_0x39970.c => unused_bomb_icon_model_ntsc.c} | 2 +-
...ep_ntsc_0x39970.h => unused_bomb_icon_model_ntsc.h} | 4 ++--
...D220.c => unused_heart_container_icon_model_ntsc.c} | 2 +-
...D220.h => unused_heart_container_icon_model_ntsc.h} | 4 ++--
...p_ntsc_0x39A40.c => unused_heart_icon_model_ntsc.c} | 2 +-
...p_ntsc_0x39A40.h => unused_heart_icon_model_ntsc.h} | 4 ++--
...sc_0x41580.c => unused_heart_piece_icon_tex_ntsc.c} | 2 +-
...sc_0x41580.h => unused_heart_piece_icon_tex_ntsc.h} | 4 ++--
spec/spec | 10 +++++-----
12 files changed, 25 insertions(+), 25 deletions(-)
rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39B10.c => unused_arrow_icon_model_ntsc.c} (85%)
rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39B10.h => unused_arrow_icon_model_ntsc.h} (59%)
rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39970.c => unused_bomb_icon_model_ntsc.c} (85%)
rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39970.h => unused_bomb_icon_model_ntsc.h} (59%)
rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x3D220.c => unused_heart_container_icon_model_ntsc.c} (84%)
rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x3D220.h => unused_heart_container_icon_model_ntsc.h} (57%)
rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39A40.c => unused_heart_icon_model_ntsc.c} (85%)
rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x39A40.h => unused_heart_icon_model_ntsc.h} (59%)
rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x41580.c => unused_heart_piece_icon_tex_ntsc.c} (81%)
rename assets/objects/gameplay_keep/{gameplay_keep_ntsc_0x41580.h => unused_heart_piece_icon_tex_ntsc.h} (73%)
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index 4cf7c9635b..c7e05bde21 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -71,9 +71,9 @@
#include "gameplay_keep_0x38FB0.h"
#if OOT_REGION != REGION_EU
#include "gameplay_keep_ntsc_0x39850.h"
-#include "gameplay_keep_ntsc_0x39970.h"
-#include "gameplay_keep_ntsc_0x39A40.h"
-#include "gameplay_keep_ntsc_0x39B10.h"
+#include "unused_bomb_icon_model_ntsc.h"
+#include "unused_heart_icon_model_ntsc.h"
+#include "unused_arrow_icon_model_ntsc.h"
#endif
#include "gameplay_keep_0x393B0.h"
#include "liftable_rock_model.h"
@@ -94,7 +94,7 @@
#include "gameplay_keep_0x3B1E0.h"
#if OOT_REGION != REGION_EU
#include "gameplay_keep_ntsc_0x3C610.h"
-#include "gameplay_keep_ntsc_0x3D220.h"
+#include "unused_heart_container_icon_model_ntsc.h"
#endif
#include "rectangular_sign_model.h"
#include "gameplay_keep_0x3C2E0.h"
@@ -104,7 +104,7 @@
#endif
#include "drop_recovery_heart_tex.h"
#if OOT_REGION != REGION_EU
-#include "gameplay_keep_ntsc_0x41580.h"
+#include "unused_heart_piece_icon_tex_ntsc.h"
#endif
#include "item_drop_dl.h"
#include "gameplay_keep_0x3F140.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c b/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.c
similarity index 85%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
rename to assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.c
index f078ca357b..bf1ec33d42 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.c
+++ b/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_ntsc_0x39B10.h"
+#include "unused_arrow_icon_model_ntsc.h"
#include "item_drops_ntsc.h"
#include "gfx.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h b/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.h
similarity index 59%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
rename to assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.h
index c02feb79af..3a98bdfc86 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.h
+++ b/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_NTSC_0x39B10
-#define GAMEPLAY_KEEP_NTSC_0x39B10
+#ifndef GAMEPLAY_KEEP_UNUSED_ARROW_ICON_MODEL_NTSC_H
+#define GAMEPLAY_KEEP_UNUSED_ARROW_ICON_MODEL_NTSC_H
#include "ultra64.h"
#include "region.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c b/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.c
similarity index 85%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
rename to assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.c
index fff2944433..a2382e6ea6 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.c
+++ b/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_ntsc_0x39970.h"
+#include "unused_bomb_icon_model_ntsc.h"
#include "item_drops_ntsc.h"
#include "gfx.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h b/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.h
similarity index 59%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
rename to assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.h
index 7e15d2a83e..c811b1c727 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.h
+++ b/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_NTSC_0x39970_H
-#define GAMEPLAY_KEEP_NTSC_0x39970_H
+#ifndef GAMEPLAY_KEEP_UNUSED_BOMB_ICON_MODEL_NTSC_H
+#define GAMEPLAY_KEEP_UNUSED_BOMB_ICON_MODEL_NTSC_H
#include "ultra64.h"
#include "region.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c b/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.c
similarity index 84%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
rename to assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.c
index 6e2e217858..0299b05ca9 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.c
+++ b/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_ntsc_0x3D220.h"
+#include "unused_heart_container_icon_model_ntsc.h"
#include "gameplay_keep_ntsc_0x46A40.h"
#include "gfx.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h b/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.h
similarity index 57%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
rename to assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.h
index 481bd6747d..4bc380b34a 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.h
+++ b/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_NTSC_0x3D220_H
-#define GAMEPLAY_KEEP_NTSC_0x3D220_H
+#ifndef GAMEPLAY_KEEP_UNUSED_HEART_CONTAINER_ICON_MODEL_NTSC_H
+#define GAMEPLAY_KEEP_UNUSED_HEART_CONTAINER_ICON_MODEL_NTSC_H
#include "ultra64.h"
#include "region.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c b/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.c
similarity index 85%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
rename to assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.c
index 11e34a2128..018bb9de95 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.c
+++ b/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_ntsc_0x39A40.h"
+#include "unused_heart_icon_model_ntsc.h"
#include "item_drops_ntsc.h"
#include "gfx.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h b/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.h
similarity index 59%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
rename to assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.h
index f691e80501..657a8f24ba 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.h
+++ b/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_NTSC_0x39A40_H
-#define GAMEPLAY_KEEP_NTSC_0x39A40_H
+#ifndef GAMEPLAY_KEEP_UNUSED_HEART_ICON_MODEL_NTSC_H
+#define GAMEPLAY_KEEP_UNUSED_HEART_ICON_MODEL_NTSC_H
#include "ultra64.h"
#include "region.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c b/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.c
similarity index 81%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
rename to assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.c
index 48cfc3618a..9b34ac2b27 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.c
+++ b/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_ntsc_0x41580.h"
+#include "unused_heart_piece_icon_tex_ntsc.h"
u64 gUnusedHeartPieceIconTex[TEX_LEN(u64, gUnusedHeartPieceIconTex_WIDTH, gUnusedHeartPieceIconTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gUnusedHeartPieceIconTex.rgba16.inc.c"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h b/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.h
similarity index 73%
rename from assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
rename to assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.h
index 8a0b3d2f96..ed4e24f0b2 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.h
+++ b/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_NTSC_0x41580_H
-#define GAMEPLAY_KEEP_NTSC_0x41580_H
+#ifndef GAMEPLAY_KEEP_UNUSED_HEART_PIECE_ICON_TEX_NTSC_H
+#define GAMEPLAY_KEEP_UNUSED_HEART_PIECE_ICON_TEX_NTSC_H
#include "tex_len.h"
#include "ultra64.h"
diff --git a/spec/spec b/spec/spec
index d8cc630766..87d7229e45 100644
--- a/spec/spec
+++ b/spec/spec
@@ -1067,9 +1067,9 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.o"
#if OOT_REGION != REGION_EU
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39970.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39A40.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39B10.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.o"
#endif
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x393B0.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/liftable_rock_model.o"
@@ -1090,7 +1090,7 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.o"
#if OOT_REGION != REGION_EU
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3D220.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.o"
#endif
include "$(BUILD_DIR)/assets/objects/gameplay_keep/rectangular_sign_model.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.o"
@@ -1100,7 +1100,7 @@ beginseg
#endif
include "$(BUILD_DIR)/assets/objects/gameplay_keep/drop_recovery_heart_tex.o"
#if OOT_REGION != REGION_EU
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x41580.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.o"
#endif
include "$(BUILD_DIR)/assets/objects/gameplay_keep/item_drop_dl.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3F140.o"
From 7edccaef75a55e8f13e52a0491264531bc24918e Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Sun, 8 Jun 2025 18:32:50 +0200
Subject: [PATCH 08/22] name more gkeep files
---
.../{gameplay_keep_0xE770.c => door.c} | 2 +-
.../{gameplay_keep_0xE770.h => door.h} | 4 +--
...meplay_keep_0xC0A0.c => eff_fragments_1.c} | 2 +-
...meplay_keep_0xC0A0.h => eff_fragments_1.h} | 4 +--
..._keep_0xCCC0.c => eff_fragments_2_model.c} | 2 +-
..._keep_0xCCC0.h => eff_fragments_2_model.h} | 4 +--
.../gameplay_keep/gDoorAdultOpeningLeftAnim.c | 13 ++++++++++
.../gameplay_keep/gDoorAdultOpeningLeftAnim.h | 10 ++++++++
..._0xFF80.c => gDoorAdultOpeningRightAnim.c} | 2 +-
..._0xFF80.h => gDoorAdultOpeningRightAnim.h} | 4 +--
...p_0xE4E0.c => gDoorChildOpeningLeftAnim.c} | 2 +-
...p_0xE4E0.h => gDoorChildOpeningLeftAnim.h} | 4 +--
.../gDoorChildOpeningRightAnim.c | 13 ++++++++++
.../gDoorChildOpeningRightAnim.h | 10 ++++++++
assets/objects/gameplay_keep/gameplay_keep.h | 18 ++++++-------
.../gameplay_keep/gameplay_keep_0xE5D0.c | 25 -------------------
.../gameplay_keep/gameplay_keep_0xE5D0.h | 13 ----------
...y_keep_0xD0C0.c => rock_fragments_model.c} | 4 +--
...y_keep_0xD0C0.h => rock_fragments_model.h} | 4 +--
...lay_keep_0xD4E0.c => rock_fragments_tex.c} | 2 +-
...lay_keep_0xD4E0.h => rock_fragments_tex.h} | 4 +--
...eep_0xCDC0.c => shopkeeper_controls_tex.c} | 2 +-
...eep_0xCDC0.h => shopkeeper_controls_tex.h} | 4 +--
spec/spec | 19 +++++++-------
src/code/z_en_a_keep.c | 2 +-
.../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 2 +-
.../actors/ovl_Door_Killer/z_door_killer.c | 2 +-
src/overlays/actors/ovl_En_Door/z_en_door.c | 9 ++++---
.../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 2 +-
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 2 +-
.../ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c | 4 +--
31 files changed, 102 insertions(+), 92 deletions(-)
rename assets/objects/gameplay_keep/{gameplay_keep_0xE770.c => door.c} (97%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xE770.h => door.h} (92%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xC0A0.c => eff_fragments_1.c} (91%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xC0A0.h => eff_fragments_1.h} (77%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xCCC0.c => eff_fragments_2_model.c} (85%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xCCC0.h => eff_fragments_2_model.h} (50%)
create mode 100644 assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.c
create mode 100644 assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.h
rename assets/objects/gameplay_keep/{gameplay_keep_0xFF80.c => gDoorAdultOpeningRightAnim.c} (90%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xFF80.h => gDoorAdultOpeningRightAnim.h} (63%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xE4E0.c => gDoorChildOpeningLeftAnim.c} (90%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xE4E0.h => gDoorChildOpeningLeftAnim.h} (63%)
create mode 100644 assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.c
create mode 100644 assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.h
delete mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c
delete mode 100644 assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h
rename assets/objects/gameplay_keep/{gameplay_keep_0xD0C0.c => rock_fragments_model.c} (86%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xD0C0.h => rock_fragments_model.h} (66%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xD4E0.c => rock_fragments_tex.c} (90%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xD4E0.h => rock_fragments_tex.h} (82%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xCDC0.c => shopkeeper_controls_tex.c} (93%)
rename assets/objects/gameplay_keep/{gameplay_keep_0xCDC0.h => shopkeeper_controls_tex.h} (85%)
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE770.c b/assets/objects/gameplay_keep/door.c
similarity index 97%
rename from assets/objects/gameplay_keep/gameplay_keep_0xE770.c
rename to assets/objects/gameplay_keep/door.c
index baeaf9a7c0..1bcb9f0a75 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE770.c
+++ b/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"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE770.h b/assets/objects/gameplay_keep/door.h
similarity index 92%
rename from assets/objects/gameplay_keep/gameplay_keep_0xE770.h
rename to assets/objects/gameplay_keep/door.h
index 048c0b298a..7e210f7b09 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE770.h
+++ b/assets/objects/gameplay_keep/door.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xE770_H
-#define GAMEPLAY_KEEP_0xE770_H
+#ifndef GAMEPLAY_KEEP_DOOR_H
+#define GAMEPLAY_KEEP_DOOR_H
#include "tex_len.h"
#include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.c b/assets/objects/gameplay_keep/eff_fragments_1.c
similarity index 91%
rename from assets/objects/gameplay_keep/gameplay_keep_0xC0A0.c
rename to assets/objects/gameplay_keep/eff_fragments_1.c
index c0eecbc7c5..784e363ef9 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.c
+++ b/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[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h b/assets/objects/gameplay_keep/eff_fragments_1.h
similarity index 77%
rename from assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h
rename to assets/objects/gameplay_keep/eff_fragments_1.h
index a648c7e5b5..74a1e61870 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h
+++ b/assets/objects/gameplay_keep/eff_fragments_1.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xC0A0_H
-#define GAMEPLAY_KEEP_0xC0A0_H
+#ifndef GAMEPLAY_KEEP_EFF_FRAGMENTS_1_H
+#define GAMEPLAY_KEEP_EFF_FRAGMENTS_1_H
#include "tex_len.h"
#include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.c b/assets/objects/gameplay_keep/eff_fragments_2_model.c
similarity index 85%
rename from assets/objects/gameplay_keep/gameplay_keep_0xCCC0.c
rename to assets/objects/gameplay_keep/eff_fragments_2_model.c
index 4f3bff7c85..f0104dbb6b 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.c
+++ b/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[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h b/assets/objects/gameplay_keep/eff_fragments_2_model.h
similarity index 50%
rename from assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h
rename to assets/objects/gameplay_keep/eff_fragments_2_model.h
index ea687ce12a..7ebe54340c 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h
+++ b/assets/objects/gameplay_keep/eff_fragments_2_model.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xCCC0_H
-#define GAMEPLAY_KEEP_0xCCC0_H
+#ifndef GAMEPLAY_KEEP_EFF_FRAGMENTS_2_MODEL_H
+#define GAMEPLAY_KEEP_EFF_FRAGMENTS_2_MODEL_H
#include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.c b/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.c
new file mode 100644
index 0000000000..4d5db4d36c
--- /dev/null
+++ b/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"
+};
diff --git a/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.h b/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.h
new file mode 100644
index 0000000000..8bab724e4e
--- /dev/null
+++ b/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
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xFF80.c b/assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.c
similarity index 90%
rename from assets/objects/gameplay_keep/gameplay_keep_0xFF80.c
rename to assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.c
index 93d8617465..c5e171b86a 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xFF80.c
+++ b/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"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xFF80.h b/assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.h
similarity index 63%
rename from assets/objects/gameplay_keep/gameplay_keep_0xFF80.h
rename to assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.h
index c538156999..b444b93ff0 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xFF80.h
+++ b/assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xFF80_H
-#define GAMEPLAY_KEEP_0xFF80_H
+#ifndef GAMEPLAY_KEEP_DOOR_ADULT_OPENING_RIGHT_ANIM_H
+#define GAMEPLAY_KEEP_DOOR_ADULT_OPENING_RIGHT_ANIM_H
#include "animation.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.c b/assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.c
similarity index 90%
rename from assets/objects/gameplay_keep/gameplay_keep_0xE4E0.c
rename to assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.c
index 98dde2a17e..e2b340858a 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.c
+++ b/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"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h b/assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.h
similarity index 63%
rename from assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h
rename to assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.h
index 9dc1ff7c21..295b87edd1 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h
+++ b/assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xE4E0_H
-#define GAMEPLAY_KEEP_0xE4E0_H
+#ifndef GAMEPLAY_KEEP_DOOR_CHILD_OPENING_LEFT_ANIM_H
+#define GAMEPLAY_KEEP_DOOR_CHILD_OPENING_LEFT_ANIM_H
#include "animation.h"
diff --git a/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.c b/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.c
new file mode 100644
index 0000000000..79af410047
--- /dev/null
+++ b/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"
+};
diff --git a/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.h b/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.h
new file mode 100644
index 0000000000..6476396339
--- /dev/null
+++ b/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
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index c7e05bde21..51e0d4bf74 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/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 "gameplay_keep_0xD0C0.h"
-#include "gameplay_keep_0xD4E0.h"
-#include "gameplay_keep_0xE4E0.h"
-#include "gameplay_keep_0xE5D0.h"
-#include "gameplay_keep_0xE770.h"
-#include "gameplay_keep_0xFF80.h"
+#include "shopkeeper_controls_tex.h"
+#include "rock_fragments_model.h"
+#include "rock_fragments_tex.h"
+#include "gDoorChildOpeningLeftAnim.h"
+#include "gDoorChildOpeningRightAnim.h"
+#include "door.h"
+#include "gDoorAdultOpeningRightAnim.h"
#include "eff_dust.h"
#include "eff_flash.h"
#include "gameplay_keep_0x11230.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c b/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c
deleted file mode 100644
index 6e8fabe309..0000000000
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c
+++ /dev/null
@@ -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"
-};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h b/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h
deleted file mode 100644
index ddbefc6bc5..0000000000
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h
+++ /dev/null
@@ -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
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.c b/assets/objects/gameplay_keep/rock_fragments_model.c
similarity index 86%
rename from assets/objects/gameplay_keep/gameplay_keep_0xD0C0.c
rename to assets/objects/gameplay_keep/rock_fragments_model.c
index b3b9561f08..7498e7b560 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.c
+++ b/assets/objects/gameplay_keep/rock_fragments_model.c
@@ -1,5 +1,5 @@
-#include "gameplay_keep_0xD0C0.h"
-#include "gameplay_keep_0xD4E0.h"
+#include "rock_fragments_model.h"
+#include "rock_fragments_tex.h"
#include "gfx.h"
Vtx gUnusedRockFragmentVtx[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h b/assets/objects/gameplay_keep/rock_fragments_model.h
similarity index 66%
rename from assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h
rename to assets/objects/gameplay_keep/rock_fragments_model.h
index 985d260519..70e1c70df8 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h
+++ b/assets/objects/gameplay_keep/rock_fragments_model.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xD0C0_H
-#define GAMEPLAY_KEEP_0xD0C0_H
+#ifndef GAMEPLAY_KEEP_ROCK_FRAGMENTS_MODEL_H
+#define GAMEPLAY_KEEP_ROCK_FRAGMENTS_MODEL_H
#include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.c b/assets/objects/gameplay_keep/rock_fragments_tex.c
similarity index 90%
rename from assets/objects/gameplay_keep/gameplay_keep_0xD4E0.c
rename to assets/objects/gameplay_keep/rock_fragments_tex.c
index aa6d252e46..c548202352 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.c
+++ b/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"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.h b/assets/objects/gameplay_keep/rock_fragments_tex.h
similarity index 82%
rename from assets/objects/gameplay_keep/gameplay_keep_0xD4E0.h
rename to assets/objects/gameplay_keep/rock_fragments_tex.h
index 48cad24571..3f32acc42c 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.h
+++ b/assets/objects/gameplay_keep/rock_fragments_tex.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xD4E0_H
-#define GAMEPLAY_KEEP_0xD4E0_H
+#ifndef GAMEPLAY_KEEP_ROCK_FRAGMENTS_TEX_H
+#define GAMEPLAY_KEEP_ROCK_FRAGMENTS_TEX_H
#include "tex_len.h"
#include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.c b/assets/objects/gameplay_keep/shopkeeper_controls_tex.c
similarity index 93%
rename from assets/objects/gameplay_keep/gameplay_keep_0xCDC0.c
rename to assets/objects/gameplay_keep/shopkeeper_controls_tex.c
index e2978a14c8..b6a072accc 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.c
+++ b/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)] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h b/assets/objects/gameplay_keep/shopkeeper_controls_tex.h
similarity index 85%
rename from assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h
rename to assets/objects/gameplay_keep/shopkeeper_controls_tex.h
index f3c14722d5..65b7403588 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h
+++ b/assets/objects/gameplay_keep/shopkeeper_controls_tex.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xCDC0_H
-#define GAMEPLAY_KEEP_0xCDC0_H
+#ifndef GAMEPLAY_KEEP_SHOPKEEPER_CONTROLS_TEX_H
+#define GAMEPLAY_KEEP_SHOPKEEPER_CONTROLS_TEX_H
#include "tex_len.h"
#include "ultra64.h"
diff --git a/spec/spec b/spec/spec
index 87d7229e45..bfd201683d 100644
--- a/spec/spec
+++ b/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/gameplay_keep_0xD0C0.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE770.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xFF80.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/shopkeeper_controls_tex.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/rock_fragments_model.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/rock_fragments_tex.o"
+ 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/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"
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c
index f51a388ae1..20c019335e 100644
--- a/src/code/z_en_a_keep.c
+++ b/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
diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
index 7b92a74806..1d2cfd63f1 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
+++ b/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"
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 7010fc24f7..447cbcb14f 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/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"
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 5d70adc24a..1ee57f687f 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/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/gameplay_keep_0xE4E0.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xFF80.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xE770.h"
+#include "assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.h"
+#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_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"
diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
index b028dd2ec6..e5a63a4676 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+++ b/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
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index 4f055f1012..0a42d8ae71 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/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"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
index 5bcdc45023..278f2693f0 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
+++ b/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/gameplay_keep_0xCCC0.h"
+#include "assets/objects/gameplay_keep/eff_fragments_1.h"
+#include "assets/objects/gameplay_keep/eff_fragments_2_model.h"
#define rPitch regs[0]
#define rYaw regs[1]
From 17dce8c6069bf3ad5fb8a3ea7c8a31cdd3e081dd Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Sun, 8 Jun 2025 18:36:25 +0200
Subject: [PATCH 09/22] format
---
assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
index cae4d61fb5..815a904ff5 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.c
@@ -4,7 +4,8 @@ u64 gGameplayKeepTex_46A40[TEX_LEN(u64, gGameplayKeepTex_46A40_WIDTH, gGameplayK
#include "assets/objects/gameplay_keep/gGameplayKeepTex_46A40.rgba16.inc.c"
};
-u64 gUnusedHeartContainerIconTex[TEX_LEN(u64, gUnusedHeartContainerIconTex_WIDTH, gUnusedHeartContainerIconTex_HEIGHT, 16)] = {
+u64 gUnusedHeartContainerIconTex[TEX_LEN(u64, gUnusedHeartContainerIconTex_WIDTH, gUnusedHeartContainerIconTex_HEIGHT,
+ 16)] = {
#include "assets/objects/gameplay_keep/gUnusedHeartContainerIconTex.rgba16.inc.c"
};
From 432d977cb11e6074bb1ea945ef8a866e62479b7c Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Sun, 8 Jun 2025 21:03:02 +0200
Subject: [PATCH 10/22] spin_attack
---
assets/objects/gameplay_keep/gameplay_keep.h | 2 +-
.../gameplay_keep/gameplay_keep_0x11230.h | 30 -------------------
...{gameplay_keep_0x11230.c => spin_attack.c} | 18 +++++------
assets/objects/gameplay_keep/spin_attack.h | 30 +++++++++++++++++++
assets/xml/objects/gameplay_keep.xml | 8 ++---
assets/xml/objects/gameplay_keep_pal.xml | 8 ++---
spec/spec | 2 +-
.../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 2 +-
8 files changed, 50 insertions(+), 50 deletions(-)
delete mode 100644 assets/objects/gameplay_keep/gameplay_keep_0x11230.h
rename assets/objects/gameplay_keep/{gameplay_keep_0x11230.c => spin_attack.c} (57%)
create mode 100644 assets/objects/gameplay_keep/spin_attack.h
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index 51e0d4bf74..62f263231c 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -34,7 +34,7 @@
#include "gDoorAdultOpeningRightAnim.h"
#include "eff_dust.h"
#include "eff_flash.h"
-#include "gameplay_keep_0x11230.h"
+#include "spin_attack.h"
#include "gameplay_keep_0x13700.h"
#include "fairy_anim.h"
#include "fairy_skel.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x11230.h b/assets/objects/gameplay_keep/gameplay_keep_0x11230.h
deleted file mode 100644
index 6273d83f12..0000000000
--- a/assets/objects/gameplay_keep/gameplay_keep_0x11230.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef GAMEPLAY_KEEP_0x11230_H
-#define GAMEPLAY_KEEP_0x11230_H
-
-#include "tex_len.h"
-#include "ultra64.h"
-
-#define gTorchFlameTex_WIDTH 64
-#define gTorchFlameTex_HEIGHT 32
-extern u64 gTorchFlameTex[TEX_LEN(u64, gTorchFlameTex_WIDTH, gTorchFlameTex_HEIGHT, 8)];
-#define gEffUnknown1Tex_WIDTH 64
-#define gEffUnknown1Tex_HEIGHT 32
-extern u64 gEffUnknown1Tex[TEX_LEN(u64, gEffUnknown1Tex_WIDTH, gEffUnknown1Tex_HEIGHT, 8)];
-extern Vtx gSpinAttack1Vtx[];
-extern Vtx gSpinAttack2Vtx[];
-extern Gfx gSpinAttack1DL[36];
-extern Gfx gSpinAttack2DL[36];
-extern Vtx gSpinAttack3Vtx[];
-extern Vtx gSpinAttack4Vtx[];
-extern Gfx gSpinAttack3DL[36];
-extern Gfx gSpinAttack4DL[36];
-#define gFlameWall1Tex_WIDTH 32
-#define gFlameWall1Tex_HEIGHT 32
-extern u64 gFlameWall1Tex[TEX_LEN(u64, gFlameWall1Tex_WIDTH, gFlameWall1Tex_HEIGHT, 8)];
-#define gFlameWall2Tex_WIDTH 32
-#define gFlameWall2Tex_HEIGHT 32
-extern u64 gFlameWall2Tex[TEX_LEN(u64, gFlameWall2Tex_WIDTH, gFlameWall2Tex_HEIGHT, 8)];
-extern Vtx gSpinAttackChargingVtx[];
-extern Gfx gSpinAttackChargingDL[29];
-
-#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x11230.c b/assets/objects/gameplay_keep/spin_attack.c
similarity index 57%
rename from assets/objects/gameplay_keep/gameplay_keep_0x11230.c
rename to assets/objects/gameplay_keep/spin_attack.c
index 001dfc2bb4..0151e94750 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x11230.c
+++ b/assets/objects/gameplay_keep/spin_attack.c
@@ -1,12 +1,12 @@
-#include "gameplay_keep_0x11230.h"
+#include "spin_attack.h"
#include "gfx.h"
-u64 gTorchFlameTex[TEX_LEN(u64, gTorchFlameTex_WIDTH, gTorchFlameTex_HEIGHT, 8)] = {
-#include "assets/objects/gameplay_keep/gTorchFlameTex.i8.inc.c"
+u64 gSpinAttackFireTex[TEX_LEN(u64, gSpinAttackFireTex_WIDTH, gSpinAttackFireTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gSpinAttackFireTex.i8.inc.c"
};
-u64 gEffUnknown1Tex[TEX_LEN(u64, gEffUnknown1Tex_WIDTH, gEffUnknown1Tex_HEIGHT, 8)] = {
-#include "assets/objects/gameplay_keep/gEffUnknown1Tex.i8.inc.c"
+u64 gSpinAttackMagicTex[TEX_LEN(u64, gSpinAttackMagicTex_WIDTH, gSpinAttackMagicTex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gSpinAttackMagicTex.i8.inc.c"
};
Vtx gSpinAttack1Vtx[] = {
@@ -41,12 +41,12 @@ Gfx gSpinAttack4DL[36] = {
#include "assets/objects/gameplay_keep/gSpinAttack4DL.inc.c"
};
-u64 gFlameWall1Tex[TEX_LEN(u64, gFlameWall1Tex_WIDTH, gFlameWall1Tex_HEIGHT, 8)] = {
-#include "assets/objects/gameplay_keep/gFlameWall1Tex.i8.inc.c"
+u64 gSpinAttackCharging1Tex[TEX_LEN(u64, gSpinAttackCharging1Tex_WIDTH, gSpinAttackCharging1Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gSpinAttackCharging1Tex.i8.inc.c"
};
-u64 gFlameWall2Tex[TEX_LEN(u64, gFlameWall2Tex_WIDTH, gFlameWall2Tex_HEIGHT, 8)] = {
-#include "assets/objects/gameplay_keep/gFlameWall2Tex.i8.inc.c"
+u64 gSpinAttackCharging2Tex[TEX_LEN(u64, gSpinAttackCharging2Tex_WIDTH, gSpinAttackCharging2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gSpinAttackCharging2Tex.i8.inc.c"
};
Vtx gSpinAttackChargingVtx[] = {
diff --git a/assets/objects/gameplay_keep/spin_attack.h b/assets/objects/gameplay_keep/spin_attack.h
new file mode 100644
index 0000000000..39fc727cd3
--- /dev/null
+++ b/assets/objects/gameplay_keep/spin_attack.h
@@ -0,0 +1,30 @@
+#ifndef GAMEPLAY_KEEP_SPIN_ATTACK_H
+#define GAMEPLAY_KEEP_SPIN_ATTACK_H
+
+#include "tex_len.h"
+#include "ultra64.h"
+
+#define gSpinAttackFireTex_WIDTH 64
+#define gSpinAttackFireTex_HEIGHT 32
+extern u64 gSpinAttackFireTex[TEX_LEN(u64, gSpinAttackFireTex_WIDTH, gSpinAttackFireTex_HEIGHT, 8)];
+#define gSpinAttackMagicTex_WIDTH 64
+#define gSpinAttackMagicTex_HEIGHT 32
+extern u64 gSpinAttackMagicTex[TEX_LEN(u64, gSpinAttackMagicTex_WIDTH, gSpinAttackMagicTex_HEIGHT, 8)];
+extern Vtx gSpinAttack1Vtx[];
+extern Vtx gSpinAttack2Vtx[];
+extern Gfx gSpinAttack1DL[36];
+extern Gfx gSpinAttack2DL[36];
+extern Vtx gSpinAttack3Vtx[];
+extern Vtx gSpinAttack4Vtx[];
+extern Gfx gSpinAttack3DL[36];
+extern Gfx gSpinAttack4DL[36];
+#define gSpinAttackCharging1Tex_WIDTH 32
+#define gSpinAttackCharging1Tex_HEIGHT 32
+extern u64 gSpinAttackCharging1Tex[TEX_LEN(u64, gSpinAttackCharging1Tex_WIDTH, gSpinAttackCharging1Tex_HEIGHT, 8)];
+#define gSpinAttackCharging2Tex_WIDTH 32
+#define gSpinAttackCharging2Tex_HEIGHT 32
+extern u64 gSpinAttackCharging2Tex[TEX_LEN(u64, gSpinAttackCharging2Tex_WIDTH, gSpinAttackCharging2Tex_HEIGHT, 8)];
+extern Vtx gSpinAttackChargingVtx[];
+extern Gfx gSpinAttackChargingDL[29];
+
+#endif
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index 24990118e3..5dba196989 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -753,8 +753,8 @@
-
-
+
+
@@ -771,8 +771,8 @@
-
-
+
+
diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml
index 5d3ff079a2..c2a8d54c4a 100644
--- a/assets/xml/objects/gameplay_keep_pal.xml
+++ b/assets/xml/objects/gameplay_keep_pal.xml
@@ -745,8 +745,8 @@
-
-
+
+
@@ -763,8 +763,8 @@
-
-
+
+
diff --git a/spec/spec b/spec/spec
index bfd201683d..ac6ebe31cc 100644
--- a/spec/spec
+++ b/spec/spec
@@ -1031,7 +1031,7 @@ beginseg
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"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/spin_attack.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x13700.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/fairy_anim.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/fairy_skel.o"
diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
index 0e9692b77f..ab0c7f57e4 100644
--- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
+++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
@@ -12,7 +12,7 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x11230.h"
+#include "assets/objects/gameplay_keep/spin_attack.h"
#define FLAGS 0
From 10b44470473e259b2704dcb789239b11f5000e27 Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Sun, 8 Jun 2025 21:16:31 +0200
Subject: [PATCH 11/22] name fish anims files
---
.../{gameplay_keep_0x18FF0.c => gFishInWaterAnim.c} | 2 +-
.../{gameplay_keep_0x18FF0.h => gFishInWaterAnim.h} | 4 ++--
.../{gameplay_keep_0x185A0.c => gFishOutOfWaterAnim.c} | 2 +-
.../{gameplay_keep_0x185A0.h => gFishOutOfWaterAnim.h} | 4 ++--
assets/objects/gameplay_keep/gameplay_keep.h | 4 ++--
spec/spec | 4 ++--
src/overlays/actors/ovl_En_Fish/z_en_fish.c | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
rename assets/objects/gameplay_keep/{gameplay_keep_0x18FF0.c => gFishInWaterAnim.c} (90%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x18FF0.h => gFishInWaterAnim.h} (65%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x185A0.c => gFishOutOfWaterAnim.c} (90%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x185A0.h => gFishOutOfWaterAnim.h} (65%)
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.c b/assets/objects/gameplay_keep/gFishInWaterAnim.c
similarity index 90%
rename from assets/objects/gameplay_keep/gameplay_keep_0x18FF0.c
rename to assets/objects/gameplay_keep/gFishInWaterAnim.c
index 38408cf098..10c6afb9f1 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.c
+++ b/assets/objects/gameplay_keep/gFishInWaterAnim.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x18FF0.h"
+#include "gFishInWaterAnim.h"
s16 gFishInWaterFrameData[] = {
#include "assets/objects/gameplay_keep/gFishInWaterFrameData.inc.c"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.h b/assets/objects/gameplay_keep/gFishInWaterAnim.h
similarity index 65%
rename from assets/objects/gameplay_keep/gameplay_keep_0x18FF0.h
rename to assets/objects/gameplay_keep/gFishInWaterAnim.h
index 33a6ce61f1..956d54c2ba 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.h
+++ b/assets/objects/gameplay_keep/gFishInWaterAnim.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x18FF0_H
-#define GAMEPLAY_KEEP_0x18FF0_H
+#ifndef GAMEPLAY_KEEP_GFISHINWATERANIM_H
+#define GAMEPLAY_KEEP_GFISHINWATERANIM_H
#include "animation.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x185A0.c b/assets/objects/gameplay_keep/gFishOutOfWaterAnim.c
similarity index 90%
rename from assets/objects/gameplay_keep/gameplay_keep_0x185A0.c
rename to assets/objects/gameplay_keep/gFishOutOfWaterAnim.c
index 8282def3c0..7579f0ca93 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x185A0.c
+++ b/assets/objects/gameplay_keep/gFishOutOfWaterAnim.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x185A0.h"
+#include "gFishOutOfWaterAnim.h"
s16 gFishOutOfWaterFrameData[] = {
#include "assets/objects/gameplay_keep/gFishOutOfWaterFrameData.inc.c"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x185A0.h b/assets/objects/gameplay_keep/gFishOutOfWaterAnim.h
similarity index 65%
rename from assets/objects/gameplay_keep/gameplay_keep_0x185A0.h
rename to assets/objects/gameplay_keep/gFishOutOfWaterAnim.h
index 38e851fd5e..e96f710391 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x185A0.h
+++ b/assets/objects/gameplay_keep/gFishOutOfWaterAnim.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x185A0_H
-#define GAMEPLAY_KEEP_0x185A0_H
+#ifndef GAMEPLAY_KEEP_GFISHOUTOFWATERANIM_H
+#define GAMEPLAY_KEEP_GFISHOUTOFWATERANIM_H
#include "animation.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index 62f263231c..f14195f047 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -41,9 +41,9 @@
#include "gameplay_keep_0x16A50.h"
#include "hilite4_tex.h"
#include "gameplay_keep_0x173D0.h"
-#include "gameplay_keep_0x185A0.h"
+#include "gFishOutOfWaterAnim.h"
#include "gameplay_keep_0x18610.h"
-#include "gameplay_keep_0x18FF0.h"
+#include "gFishInWaterAnim.h"
#include "eff_shockwave.h"
#include "eff_bubble.h"
#include "eff_fire_footprint.h"
diff --git a/spec/spec b/spec/spec
index ac6ebe31cc..0ee35e5ed8 100644
--- a/spec/spec
+++ b/spec/spec
@@ -1038,9 +1038,9 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x16A50.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/hilite4_tex.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x173D0.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x185A0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gFishOutOfWaterAnim.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x18610.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x18FF0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gFishInWaterAnim.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_shockwave.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_bubble.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_fire_footprint.o"
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index 0c9649720e..75b27cef59 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -19,8 +19,8 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x18FF0.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x185A0.h"
+#include "assets/objects/gameplay_keep/gFishInWaterAnim.h"
+#include "assets/objects/gameplay_keep/gFishOutOfWaterAnim.h"
#include "assets/objects/gameplay_keep/gameplay_keep_0x18610.h"
#define FLAGS 0
From d02d71aea22380932ff7999fa17ae335e0518428 Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Sun, 8 Jun 2025 21:26:37 +0200
Subject: [PATCH 12/22] name some eff_ files
---
.../{gameplay_keep_0x23810.c => eff_magma_bubble.c} | 2 +-
.../{gameplay_keep_0x23810.h => eff_magma_bubble.h} | 4 ++--
.../{gameplay_keep_0x244B0.c => eff_water_ripple.c} | 2 +-
.../{gameplay_keep_0x244B0.h => eff_water_ripple.h} | 4 ++--
.../{gameplay_keep_0x255F0.c => eff_water_splash.c} | 2 +-
.../{gameplay_keep_0x255F0.h => eff_water_splash.h} | 4 ++--
assets/objects/gameplay_keep/gameplay_keep.h | 8 ++++----
.../{gameplay_keep_0x27E90.c => unknown_eff_stone.c} | 2 +-
.../{gameplay_keep_0x27E90.h => unknown_eff_stone.h} | 4 ++--
spec/spec | 8 ++++----
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 2 +-
.../effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c | 2 +-
.../effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c | 2 +-
.../effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c | 2 +-
.../effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c | 2 +-
15 files changed, 25 insertions(+), 25 deletions(-)
rename assets/objects/gameplay_keep/{gameplay_keep_0x23810.c => eff_magma_bubble.c} (97%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x23810.h => eff_magma_bubble.h} (94%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x244B0.c => eff_water_ripple.c} (91%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x244B0.h => eff_water_ripple.h} (78%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x255F0.c => eff_water_splash.c} (97%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x255F0.h => eff_water_splash.h} (94%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x27E90.c => unknown_eff_stone.c} (97%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x27E90.h => unknown_eff_stone.h} (94%)
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x23810.c b/assets/objects/gameplay_keep/eff_magma_bubble.c
similarity index 97%
rename from assets/objects/gameplay_keep/gameplay_keep_0x23810.c
rename to assets/objects/gameplay_keep/eff_magma_bubble.c
index 74666a6494..da8c144251 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x23810.c
+++ b/assets/objects/gameplay_keep/eff_magma_bubble.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x23810.h"
+#include "eff_magma_bubble.h"
#include "gfx.h"
u64 gEffMagmaBubble1Tex[TEX_LEN(u64, gEffMagmaBubble1Tex_WIDTH, gEffMagmaBubble1Tex_HEIGHT, 8)] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x23810.h b/assets/objects/gameplay_keep/eff_magma_bubble.h
similarity index 94%
rename from assets/objects/gameplay_keep/gameplay_keep_0x23810.h
rename to assets/objects/gameplay_keep/eff_magma_bubble.h
index da31e96296..0752bcbb2d 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x23810.h
+++ b/assets/objects/gameplay_keep/eff_magma_bubble.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x23810_H
-#define GAMEPLAY_KEEP_0x23810_H
+#ifndef GAMEPLAY_KEEP_EFF_MAGMA_BUBBLE_H
+#define GAMEPLAY_KEEP_EFF_MAGMA_BUBBLE_H
#include "tex_len.h"
#include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x244B0.c b/assets/objects/gameplay_keep/eff_water_ripple.c
similarity index 91%
rename from assets/objects/gameplay_keep/gameplay_keep_0x244B0.c
rename to assets/objects/gameplay_keep/eff_water_ripple.c
index 4de9421ba0..da79dd9158 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x244B0.c
+++ b/assets/objects/gameplay_keep/eff_water_ripple.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x244B0.h"
+#include "eff_water_ripple.h"
#include "gfx.h"
u64 gEffWaterRippleTex[TEX_LEN(u64, gEffWaterRippleTex_WIDTH, gEffWaterRippleTex_HEIGHT, 8)] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x244B0.h b/assets/objects/gameplay_keep/eff_water_ripple.h
similarity index 78%
rename from assets/objects/gameplay_keep/gameplay_keep_0x244B0.h
rename to assets/objects/gameplay_keep/eff_water_ripple.h
index 91b8b4e29c..50c5342481 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x244B0.h
+++ b/assets/objects/gameplay_keep/eff_water_ripple.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x244B0_H
-#define GAMEPLAY_KEEP_0x244B0_H
+#ifndef GAMEPLAY_KEEP_EFF_WATER_RIPPLE_H
+#define GAMEPLAY_KEEP_EFF_WATER_RIPPLE_H
#include "tex_len.h"
#include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x255F0.c b/assets/objects/gameplay_keep/eff_water_splash.c
similarity index 97%
rename from assets/objects/gameplay_keep/gameplay_keep_0x255F0.c
rename to assets/objects/gameplay_keep/eff_water_splash.c
index 5f518dde8d..5fddbc952b 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x255F0.c
+++ b/assets/objects/gameplay_keep/eff_water_splash.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x255F0.h"
+#include "eff_water_splash.h"
#include "gfx.h"
u64 gEffWaterSplash1Tex[TEX_LEN(u64, gEffWaterSplash1Tex_WIDTH, gEffWaterSplash1Tex_HEIGHT, 8)] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x255F0.h b/assets/objects/gameplay_keep/eff_water_splash.h
similarity index 94%
rename from assets/objects/gameplay_keep/gameplay_keep_0x255F0.h
rename to assets/objects/gameplay_keep/eff_water_splash.h
index 00d02bc90d..4d058c8de0 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x255F0.h
+++ b/assets/objects/gameplay_keep/eff_water_splash.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x255F0_H
-#define GAMEPLAY_KEEP_0x255F0_H
+#ifndef GAMEPLAY_KEEP_EFF_WATER_SPLASH_H
+#define GAMEPLAY_KEEP_EFF_WATER_SPLASH_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 f14195f047..b8e4cf0ba5 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -51,11 +51,11 @@
#include "lens_mask_tex.h"
#include "eff_hitmark.h"
#include "gameplay_keep_0x21810.h"
-#include "gameplay_keep_0x23810.h"
-#include "gameplay_keep_0x244B0.h"
+#include "eff_magma_bubble.h"
+#include "eff_water_ripple.h"
#include "eff_spark_model.h"
-#include "gameplay_keep_0x255F0.h"
-#include "gameplay_keep_0x27E90.h"
+#include "eff_water_splash.h"
+#include "unknown_eff_stone.h"
#include "eff_lightning.h"
#include "eff_enemy_death_flame.h"
#include "gameplay_keep_0x32090.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x27E90.c b/assets/objects/gameplay_keep/unknown_eff_stone.c
similarity index 97%
rename from assets/objects/gameplay_keep/gameplay_keep_0x27E90.c
rename to assets/objects/gameplay_keep/unknown_eff_stone.c
index 555e5c95c8..30c5487a79 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x27E90.c
+++ b/assets/objects/gameplay_keep/unknown_eff_stone.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x27E90.h"
+#include "unknown_eff_stone.h"
#include "gfx.h"
u64 gUnknownEffStone1Tex[TEX_LEN(u64, gUnknownEffStone1Tex_WIDTH, gUnknownEffStone1Tex_HEIGHT, 8)] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x27E90.h b/assets/objects/gameplay_keep/unknown_eff_stone.h
similarity index 94%
rename from assets/objects/gameplay_keep/gameplay_keep_0x27E90.h
rename to assets/objects/gameplay_keep/unknown_eff_stone.h
index bb56e05472..78deb0f9e8 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x27E90.h
+++ b/assets/objects/gameplay_keep/unknown_eff_stone.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x27E90_H
-#define GAMEPLAY_KEEP_0x27E90_H
+#ifndef GAMEPLAY_KEEP_UNKNOWN_EFF_STONE_H
+#define GAMEPLAY_KEEP_UNKNOWN_EFF_STONE_H
#include "tex_len.h"
#include "ultra64.h"
diff --git a/spec/spec b/spec/spec
index 0ee35e5ed8..fd31c4b1e8 100644
--- a/spec/spec
+++ b/spec/spec
@@ -1048,11 +1048,11 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/lens_mask_tex.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_hitmark.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x21810.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x23810.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x244B0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_magma_bubble.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_water_ripple.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_spark_model.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x255F0.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x27E90.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_water_splash.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/unknown_eff_stone.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_lightning.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_enemy_death_flame.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x32090.o"
diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
index d69d968181..245b5cdf59 100644
--- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
@@ -36,7 +36,7 @@
#include "skin_matrix.h"
#include "assets/objects/gameplay_keep/shadow_circle.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x244B0.h"
+#include "assets/objects/gameplay_keep/eff_water_ripple.h"
#include "assets/objects/gameplay_keep/eff_shockwave.h"
#include "assets/objects/gameplay_keep/dust_textures.h"
#include "assets/objects/object_mo/object_mo.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
index a1091f7d20..cae8127d76 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
@@ -11,7 +11,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x23810.h"
+#include "assets/objects/gameplay_keep/eff_magma_bubble.h"
u32 EffectSsGMagma_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
void EffectSsGMagma_Draw(PlayState* play, u32 index, EffectSs* this);
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
index 37abad09c6..8822faadb4 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
@@ -14,7 +14,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x244B0.h"
+#include "assets/objects/gameplay_keep/eff_water_ripple.h"
#define rWaterBoxNum regs[0]
#define rRadius regs[1]
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
index cc22fd0a3c..606d49f0b7 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
@@ -10,7 +10,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x255F0.h"
+#include "assets/objects/gameplay_keep/eff_water_splash.h"
//! @bug the reuse of regs[11] means that EffectSs_DrawGEffect will treat the type as an object slot (`rgObjectSlot`)
// this ends up having no effect because the texture provided does not use segment 6
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
index 55a5af975c..8d5605e763 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
@@ -16,7 +16,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x27E90.h"
+#include "assets/objects/gameplay_keep/unknown_eff_stone.h"
#define rReg0 regs[0]
From 1ceb996c3c960d1578d4bdf6b422d0a7fb524a5e Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Sun, 8 Jun 2025 21:41:30 +0200
Subject: [PATCH 13/22] name a bunch more files
---
...ameplay_keep_0x355A0.c => cuttable_shrub.c} | 2 +-
...ameplay_keep_0x355A0.h => cuttable_shrub.h} | 4 ++--
...keep_0x3C2E0.c => directional_sign_model.c} | 2 +-
...keep_0x3C2E0.h => directional_sign_model.h} | 4 ++--
...{gameplay_keep_0x37840.c => eff_sparkles.c} | 2 +-
...{gameplay_keep_0x37840.h => eff_sparkles.h} | 4 ++--
...y_keep_0x3A150.c => flat_rot_block_model.c} | 2 +-
...y_keep_0x3A150.h => flat_rot_block_model.h} | 4 ++--
...ameplay_keep_0x393B0.c => gLargerCubeCol.c} | 2 +-
...ameplay_keep_0x393B0.h => gLargerCubeCol.h} | 4 ++--
...ay_keep_0x3A380.c => gLargerFlatBlockCol.c} | 2 +-
...ay_keep_0x3A380.h => gLargerFlatBlockCol.h} | 4 ++--
...gameplay_keep_0x39CC0.c => gTallBlockCol.c} | 2 +-
...gameplay_keep_0x39CC0.h => gTallBlockCol.h} | 4 ++--
...play_keep_0x39940.c => gWideTallBlockCol.c} | 2 +-
...play_keep_0x39940.h => gWideTallBlockCol.h} | 4 ++--
assets/objects/gameplay_keep/gameplay_keep.h | 18 +++++++++---------
...ameplay_keep_0x48130.c => raindrop_model.c} | 2 +-
...ameplay_keep_0x48130.h => raindrop_model.h} | 4 ++--
spec/spec | 18 +++++++++---------
src/code/z_en_a_keep.c | 8 ++++----
src/code/z_kankyo.c | 2 +-
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 2 +-
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 2 +-
src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 2 +-
src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 2 +-
.../ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c | 2 +-
27 files changed, 55 insertions(+), 55 deletions(-)
rename assets/objects/gameplay_keep/{gameplay_keep_0x355A0.c => cuttable_shrub.c} (96%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x355A0.h => cuttable_shrub.h} (88%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x3C2E0.c => directional_sign_model.c} (87%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x3C2E0.h => directional_sign_model.h} (51%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x37840.c => eff_sparkles.c} (91%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x37840.h => eff_sparkles.h} (78%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x3A150.c => flat_rot_block_model.c} (87%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x3A150.h => flat_rot_block_model.h} (51%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x393B0.c => gLargerCubeCol.c} (94%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x393B0.h => gLargerCubeCol.h} (75%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x3A380.c => gLargerFlatBlockCol.c} (94%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x3A380.h => gLargerFlatBlockCol.h} (74%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x39CC0.c => gTallBlockCol.c} (94%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x39CC0.h => gTallBlockCol.h} (75%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x39940.c => gWideTallBlockCol.c} (94%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x39940.h => gWideTallBlockCol.h} (74%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x48130.c => raindrop_model.c} (84%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x48130.h => raindrop_model.h} (52%)
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x355A0.c b/assets/objects/gameplay_keep/cuttable_shrub.c
similarity index 96%
rename from assets/objects/gameplay_keep/gameplay_keep_0x355A0.c
rename to assets/objects/gameplay_keep/cuttable_shrub.c
index 3ff20933a3..4d25fba68d 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x355A0.c
+++ b/assets/objects/gameplay_keep/cuttable_shrub.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x355A0.h"
+#include "cuttable_shrub.h"
#include "gfx.h"
Vtx gCuttableShrubStalkVtx[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x355A0.h b/assets/objects/gameplay_keep/cuttable_shrub.h
similarity index 88%
rename from assets/objects/gameplay_keep/gameplay_keep_0x355A0.h
rename to assets/objects/gameplay_keep/cuttable_shrub.h
index 59808bb161..977fa363c6 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x355A0.h
+++ b/assets/objects/gameplay_keep/cuttable_shrub.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x355A0_H
-#define GAMEPLAY_KEEP_0x355A0_H
+#ifndef GAMEPLAY_KEEP_CUTTABLE_SHRUB_H
+#define GAMEPLAY_KEEP_CUTTABLE_SHRUB_H
#include "tex_len.h"
#include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.c b/assets/objects/gameplay_keep/directional_sign_model.c
similarity index 87%
rename from assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.c
rename to assets/objects/gameplay_keep/directional_sign_model.c
index 637afdd35c..716ad861ec 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.c
+++ b/assets/objects/gameplay_keep/directional_sign_model.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x3C2E0.h"
+#include "directional_sign_model.h"
#include "sign_textures.h"
#include "gfx.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.h b/assets/objects/gameplay_keep/directional_sign_model.h
similarity index 51%
rename from assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.h
rename to assets/objects/gameplay_keep/directional_sign_model.h
index 9e5ed79452..9ba0dc8600 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.h
+++ b/assets/objects/gameplay_keep/directional_sign_model.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x3C2E0_H
-#define GAMEPLAY_KEEP_0x3C2E0_H
+#ifndef GAMEPLAY_KEEP_DIRECTIONAL_SIGN_MODEL_H
+#define GAMEPLAY_KEEP_DIRECTIONAL_SIGN_MODEL_H
#include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x37840.c b/assets/objects/gameplay_keep/eff_sparkles.c
similarity index 91%
rename from assets/objects/gameplay_keep/gameplay_keep_0x37840.c
rename to assets/objects/gameplay_keep/eff_sparkles.c
index f2c70d6ecd..9f5751498b 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x37840.c
+++ b/assets/objects/gameplay_keep/eff_sparkles.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x37840.h"
+#include "eff_sparkles.h"
#include "gfx.h"
Vtx gEffSparklesVtx[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x37840.h b/assets/objects/gameplay_keep/eff_sparkles.h
similarity index 78%
rename from assets/objects/gameplay_keep/gameplay_keep_0x37840.h
rename to assets/objects/gameplay_keep/eff_sparkles.h
index c331f3cf7d..b112b24e82 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x37840.h
+++ b/assets/objects/gameplay_keep/eff_sparkles.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x37840_H
-#define GAMEPLAY_KEEP_0x37840_H
+#ifndef GAMEPLAY_KEEP_EFF_SPARKLES_H
+#define GAMEPLAY_KEEP_EFF_SPARKLES_H
#include "tex_len.h"
#include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3A150.c b/assets/objects/gameplay_keep/flat_rot_block_model.c
similarity index 87%
rename from assets/objects/gameplay_keep/gameplay_keep_0x3A150.c
rename to assets/objects/gameplay_keep/flat_rot_block_model.c
index 42dfbd1db4..4b561aefe2 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x3A150.c
+++ b/assets/objects/gameplay_keep/flat_rot_block_model.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x3A150.h"
+#include "flat_rot_block_model.h"
#include "gameplay_keep_0x42530.h"
#include "gfx.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3A150.h b/assets/objects/gameplay_keep/flat_rot_block_model.h
similarity index 51%
rename from assets/objects/gameplay_keep/gameplay_keep_0x3A150.h
rename to assets/objects/gameplay_keep/flat_rot_block_model.h
index fd8bcd1e2b..bae717a341 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x3A150.h
+++ b/assets/objects/gameplay_keep/flat_rot_block_model.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x3A150_H
-#define GAMEPLAY_KEEP_0x3A150_H
+#ifndef GAMEPLAY_KEEP_FLAT_ROT_BLOCK_MODEL_H
+#define GAMEPLAY_KEEP_FLAT_ROT_BLOCK_MODEL_H
#include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x393B0.c b/assets/objects/gameplay_keep/gLargerCubeCol.c
similarity index 94%
rename from assets/objects/gameplay_keep/gameplay_keep_0x393B0.c
rename to assets/objects/gameplay_keep/gLargerCubeCol.c
index e35cbb1273..24477a8607 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x393B0.c
+++ b/assets/objects/gameplay_keep/gLargerCubeCol.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x393B0.h"
+#include "gLargerCubeCol.h"
#include "array_count.h"
#include "camera.h"
#include "bgcheck.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x393B0.h b/assets/objects/gameplay_keep/gLargerCubeCol.h
similarity index 75%
rename from assets/objects/gameplay_keep/gameplay_keep_0x393B0.h
rename to assets/objects/gameplay_keep/gLargerCubeCol.h
index 71f66a38aa..765f5be9f1 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x393B0.h
+++ b/assets/objects/gameplay_keep/gLargerCubeCol.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x393B0_H
-#define GAMEPLAY_KEEP_0x393B0_H
+#ifndef GAMEPLAY_KEEP_GLARGERCUBECOL_H
+#define GAMEPLAY_KEEP_GLARGERCUBECOL_H
#include "bgcheck.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3A380.c b/assets/objects/gameplay_keep/gLargerFlatBlockCol.c
similarity index 94%
rename from assets/objects/gameplay_keep/gameplay_keep_0x3A380.c
rename to assets/objects/gameplay_keep/gLargerFlatBlockCol.c
index a69e31b233..e154764934 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x3A380.c
+++ b/assets/objects/gameplay_keep/gLargerFlatBlockCol.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x3A380.h"
+#include "gLargerFlatBlockCol.h"
#include "array_count.h"
#include "camera.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x3A380.h b/assets/objects/gameplay_keep/gLargerFlatBlockCol.h
similarity index 74%
rename from assets/objects/gameplay_keep/gameplay_keep_0x3A380.h
rename to assets/objects/gameplay_keep/gLargerFlatBlockCol.h
index 64b6952236..c03b2084fa 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x3A380.h
+++ b/assets/objects/gameplay_keep/gLargerFlatBlockCol.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x3A380_H
-#define GAMEPLAY_KEEP_0x3A380_H
+#ifndef GAMEPLAY_KEEP_GLARGERFLATBLOCKCOL_H
+#define GAMEPLAY_KEEP_GLARGERFLATBLOCKCOL_H
#include "bgcheck.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.c b/assets/objects/gameplay_keep/gTallBlockCol.c
similarity index 94%
rename from assets/objects/gameplay_keep/gameplay_keep_0x39CC0.c
rename to assets/objects/gameplay_keep/gTallBlockCol.c
index 61386cce5b..2ba1f5f92c 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.c
+++ b/assets/objects/gameplay_keep/gTallBlockCol.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x39CC0.h"
+#include "gTallBlockCol.h"
#include "bgcheck.h"
#include "array_count.h"
#include "camera.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.h b/assets/objects/gameplay_keep/gTallBlockCol.h
similarity index 75%
rename from assets/objects/gameplay_keep/gameplay_keep_0x39CC0.h
rename to assets/objects/gameplay_keep/gTallBlockCol.h
index 53324943c8..ca3b6031d2 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.h
+++ b/assets/objects/gameplay_keep/gTallBlockCol.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x39CC0_H
-#define GAMEPLAY_KEEP_0x39CC0_H
+#ifndef GAMEPLAY_KEEP_GTALLBLOCKCOL_H
+#define GAMEPLAY_KEEP_GTALLBLOCKCOL_H
#include "bgcheck.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39940.c b/assets/objects/gameplay_keep/gWideTallBlockCol.c
similarity index 94%
rename from assets/objects/gameplay_keep/gameplay_keep_0x39940.c
rename to assets/objects/gameplay_keep/gWideTallBlockCol.c
index 94efa4a973..4176c4c4fb 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x39940.c
+++ b/assets/objects/gameplay_keep/gWideTallBlockCol.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x39940.h"
+#include "gWideTallBlockCol.h"
#include "array_count.h"
#include "camera.h"
#include "bgcheck.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x39940.h b/assets/objects/gameplay_keep/gWideTallBlockCol.h
similarity index 74%
rename from assets/objects/gameplay_keep/gameplay_keep_0x39940.h
rename to assets/objects/gameplay_keep/gWideTallBlockCol.h
index f02cce59eb..b272034885 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x39940.h
+++ b/assets/objects/gameplay_keep/gWideTallBlockCol.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x39940_H
-#define GAMEPLAY_KEEP_0x39940_H
+#ifndef GAMEPLAY_KEEP_GWIDETALLBLOCKCOL_H
+#define GAMEPLAY_KEEP_GWIDETALLBLOCKCOL_H
#include "bgcheck.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index b8e4cf0ba5..6d25257c92 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -63,9 +63,9 @@
#include "eff_ice_fragments.h"
#include "gameplay_keep_0x33910.h"
#include "gameplay_keep_0x34020.h"
-#include "gameplay_keep_0x355A0.h"
+#include "cuttable_shrub.h"
#include "lens_flare.h"
-#include "gameplay_keep_0x37840.h"
+#include "eff_sparkles.h"
#include "hover_boots_circle.h"
#include "moon.h"
#include "gameplay_keep_0x38FB0.h"
@@ -75,16 +75,16 @@
#include "unused_heart_icon_model_ntsc.h"
#include "unused_arrow_icon_model_ntsc.h"
#endif
-#include "gameplay_keep_0x393B0.h"
+#include "gLargerCubeCol.h"
#include "liftable_rock_model.h"
#include "gameplay_keep_0x39710.h"
-#include "gameplay_keep_0x39940.h"
+#include "gWideTallBlockCol.h"
#include "flat_block_model.h"
-#include "gameplay_keep_0x39CC0.h"
+#include "gTallBlockCol.h"
#include "gameplay_keep_0x39DF0.h"
#include "small_flat_block_col.h"
-#include "gameplay_keep_0x3A150.h"
-#include "gameplay_keep_0x3A380.h"
+#include "flat_rot_block_model.h"
+#include "gLargerFlatBlockCol.h"
#include "small_cube_model.h"
#include "small_cube_col.h"
#include "tree_stump_model.h"
@@ -97,7 +97,7 @@
#include "unused_heart_container_icon_model_ntsc.h"
#endif
#include "rectangular_sign_model.h"
-#include "gameplay_keep_0x3C2E0.h"
+#include "directional_sign_model.h"
#include "gameplay_keep_0x3C870.h"
#if OOT_REGION != REGION_EU
#include "gameplay_keep_ntsc_0x3FD80.h"
@@ -122,7 +122,7 @@
#include "gameplay_keep_0x45530.h"
#include "gameplay_keep_0x45D30.h"
#include "sign_textures.h"
-#include "gameplay_keep_0x48130.h"
+#include "raindrop_model.h"
#include "shadow_foot.h"
#include "shadow_circle.h"
#include "shadow_horse.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x48130.c b/assets/objects/gameplay_keep/raindrop_model.c
similarity index 84%
rename from assets/objects/gameplay_keep/gameplay_keep_0x48130.c
rename to assets/objects/gameplay_keep/raindrop_model.c
index 1277a3fbb7..5e70ebe832 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x48130.c
+++ b/assets/objects/gameplay_keep/raindrop_model.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0x48130.h"
+#include "raindrop_model.h"
#include "gfx.h"
Vtx gRaindropVtx[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x48130.h b/assets/objects/gameplay_keep/raindrop_model.h
similarity index 52%
rename from assets/objects/gameplay_keep/gameplay_keep_0x48130.h
rename to assets/objects/gameplay_keep/raindrop_model.h
index 0ccecfea53..d5ef914b46 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x48130.h
+++ b/assets/objects/gameplay_keep/raindrop_model.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0x48130_H
-#define GAMEPLAY_KEEP_0x48130_H
+#ifndef GAMEPLAY_KEEP_RAINDROP_MODEL_H
+#define GAMEPLAY_KEEP_RAINDROP_MODEL_H
#include "ultra64.h"
diff --git a/spec/spec b/spec/spec
index fd31c4b1e8..0642cbb72e 100644
--- a/spec/spec
+++ b/spec/spec
@@ -1060,9 +1060,9 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_ice_fragments.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x33910.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x34020.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x355A0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/cuttable_shrub.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/lens_flare.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x37840.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_sparkles.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/hover_boots_circle.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/moon.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.o"
@@ -1072,16 +1072,16 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.o"
#endif
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x393B0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gLargerCubeCol.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/liftable_rock_model.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x39710.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x39940.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gWideTallBlockCol.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/flat_block_model.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x39CC0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gTallBlockCol.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x39DF0.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/small_flat_block_col.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3A150.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3A380.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/flat_rot_block_model.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gLargerFlatBlockCol.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/small_cube_model.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/small_cube_col.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/tree_stump_model.o"
@@ -1094,7 +1094,7 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.o"
#endif
include "$(BUILD_DIR)/assets/objects/gameplay_keep/rectangular_sign_model.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/directional_sign_model.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3C870.o"
#if OOT_REGION != REGION_EU
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.o"
@@ -1119,7 +1119,7 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x45530.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x45D30.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/sign_textures.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x48130.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/raindrop_model.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/shadow_foot.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/shadow_circle.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/shadow_horse.o"
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c
index 20c019335e..9c314588cb 100644
--- a/src/code/z_en_a_keep.c
+++ b/src/code/z_en_a_keep.c
@@ -6,17 +6,17 @@
#include "z_lib.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x393B0.h"
+#include "assets/objects/gameplay_keep/gLargerCubeCol.h"
#include "assets/objects/gameplay_keep/small_flat_block_col.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x3A380.h"
+#include "assets/objects/gameplay_keep/gLargerFlatBlockCol.h"
#include "assets/objects/gameplay_keep/small_cube_col.h"
#include "assets/objects/gameplay_keep/flat_block_model.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x3A150.h"
+#include "assets/objects/gameplay_keep/flat_rot_block_model.h"
#include "assets/objects/gameplay_keep/small_cube_model.h"
#include "assets/objects/gameplay_keep/grass_blades_model.h"
#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/directional_sign_model.h"
#include "assets/objects/gameplay_keep/rock_fragments_model.h"
#include "assets/objects/object_d_hsblock/object_d_hsblock.h"
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 3b89ddecfb..b050abce62 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -34,7 +34,7 @@
#include "assets/objects/gameplay_keep/eff_lightning.h"
#include "assets/objects/gameplay_keep/eff_shockwave.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x48130.h"
+#include "assets/objects/gameplay_keep/raindrop_model.h"
#include "assets/objects/gameplay_keep/lens_flare.h"
#include "assets/objects/gameplay_keep/moon.h"
#include "assets/objects/gameplay_keep/gameplay_keep_0x4D160.h"
diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
index 7682aa7a7d..be6296eda3 100644
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
+++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
@@ -17,7 +17,7 @@
#include "play_state.h"
#include "player.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x37840.h"
+#include "assets/objects/gameplay_keep/eff_sparkles.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index 385b1d3dab..6e1d9741f2 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -22,7 +22,7 @@
#include "assets/objects/gameplay_keep/arrow_skel.h"
#include "assets/objects/gameplay_keep/arrow_anims.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x37840.h"
+#include "assets/objects/gameplay_keep/eff_sparkles.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
index ee51acfab0..2a7e47c0a8 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
@@ -21,7 +21,7 @@
#include "effect.h"
#include "play_state.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x355A0.h"
+#include "assets/objects/gameplay_keep/cuttable_shrub.h"
#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
#include "assets/objects/object_kusa/object_kusa.h"
diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
index 5a4599aa01..523a5dde42 100644
--- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
+++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
@@ -24,7 +24,7 @@
#include "play_state.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x355A0.h"
+#include "assets/objects/gameplay_keep/cuttable_shrub.h"
#include "assets/objects/object_mamenoki/object_mamenoki.h"
#define FLAGS ACTOR_FLAG_IGNORE_POINT_LIGHTS
diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
index e7a65d0187..4587968419 100644
--- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
+++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
@@ -17,7 +17,7 @@
#include "play_state.h"
#include "skin_matrix.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x37840.h"
+#include "assets/objects/gameplay_keep/eff_sparkles.h"
#define rRotSpeed regs[0]
#define rYaw regs[1]
From f9b0000e70899802f2442495150110ba30910432 Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Mon, 9 Jun 2025 09:05:56 +0200
Subject: [PATCH 14/22] Add underscore in not-final names
---
assets/objects/gameplay_keep/arrow_skel.c | 16 +-
assets/objects/gameplay_keep/arrow_skel.h | 8 +-
assets/objects/gameplay_keep/door.c | 16 +-
assets/objects/gameplay_keep/door.h | 8 +-
assets/objects/gameplay_keep/fairy_skel.c | 56 ++---
assets/objects/gameplay_keep/fairy_skel.h | 28 +--
.../gameplay_keep/gameplay_keep_0x18610.c | 24 +-
.../gameplay_keep/gameplay_keep_0x18610.h | 12 +-
.../gameplay_keep/gameplay_keep_0x34020.c | 236 +++++++++---------
.../gameplay_keep/gameplay_keep_0x34020.h | 118 ++++-----
assets/xml/objects/gameplay_keep.xml | 174 ++++++-------
assets/xml/objects/gameplay_keep_pal.xml | 174 ++++++-------
12 files changed, 435 insertions(+), 435 deletions(-)
diff --git a/assets/objects/gameplay_keep/arrow_skel.c b/assets/objects/gameplay_keep/arrow_skel.c
index b11cf8786a..493728e9c4 100644
--- a/assets/objects/gameplay_keep/arrow_skel.c
+++ b/assets/objects/gameplay_keep/arrow_skel.c
@@ -27,20 +27,20 @@ Gfx gArrowFarDL[52] = {
#include "assets/objects/gameplay_keep/gArrowFarDL.inc.c"
};
-LodLimb gArrowSkelLimb0 = {
-#include "assets/objects/gameplay_keep/gArrowSkelLimb0.inc.c"
+LodLimb gArrowSkelLimb_0 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb_0.inc.c"
};
-LodLimb gArrowSkelLimb1 = {
-#include "assets/objects/gameplay_keep/gArrowSkelLimb1.inc.c"
+LodLimb gArrowSkelLimb_1 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb_1.inc.c"
};
-LodLimb gArrowSkelLimb2 = {
-#include "assets/objects/gameplay_keep/gArrowSkelLimb2.inc.c"
+LodLimb gArrowSkelLimb_2 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb_2.inc.c"
};
-LodLimb gArrowSkelLimb3 = {
-#include "assets/objects/gameplay_keep/gArrowSkelLimb3.inc.c"
+LodLimb gArrowSkelLimb_3 = {
+#include "assets/objects/gameplay_keep/gArrowSkelLimb_3.inc.c"
};
void* gArrowLimbs[] = {
diff --git a/assets/objects/gameplay_keep/arrow_skel.h b/assets/objects/gameplay_keep/arrow_skel.h
index e7d3ab020f..268c1cf559 100644
--- a/assets/objects/gameplay_keep/arrow_skel.h
+++ b/assets/objects/gameplay_keep/arrow_skel.h
@@ -14,10 +14,10 @@ extern Vtx gArrowNearVtx[];
extern Gfx gArrowNearDL[60];
extern Vtx gArrowFarVtx[];
extern Gfx gArrowFarDL[52];
-extern LodLimb gArrowSkelLimb0;
-extern LodLimb gArrowSkelLimb1;
-extern LodLimb gArrowSkelLimb2;
-extern LodLimb gArrowSkelLimb3;
+extern LodLimb gArrowSkelLimb_0;
+extern LodLimb gArrowSkelLimb_1;
+extern LodLimb gArrowSkelLimb_2;
+extern LodLimb gArrowSkelLimb_3;
extern void* gArrowLimbs[];
typedef enum gArrowSkelLimb {
/* 0 */ ARROW_LIMB_NONE,
diff --git a/assets/objects/gameplay_keep/door.c b/assets/objects/gameplay_keep/door.c
index 1bcb9f0a75..6d370fbd19 100644
--- a/assets/objects/gameplay_keep/door.c
+++ b/assets/objects/gameplay_keep/door.c
@@ -30,20 +30,20 @@ u64 gWoodenDoorTex[TEX_LEN(u64, gWoodenDoorTex_WIDTH, gWoodenDoorTex_HEIGHT, 16)
#include "assets/objects/gameplay_keep/gWoodenDoorTex.rgba16.inc.c"
};
-StandardLimb gDoorSkelLimb0 = {
-#include "assets/objects/gameplay_keep/gDoorSkelLimb0.inc.c"
+StandardLimb gDoorSkelLimb_0 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb_0.inc.c"
};
-StandardLimb gDoorSkelLimb1 = {
-#include "assets/objects/gameplay_keep/gDoorSkelLimb1.inc.c"
+StandardLimb gDoorSkelLimb_1 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb_1.inc.c"
};
-StandardLimb gDoorSkelLimb2 = {
-#include "assets/objects/gameplay_keep/gDoorSkelLimb2.inc.c"
+StandardLimb gDoorSkelLimb_2 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb_2.inc.c"
};
-StandardLimb gDoorSkelLimb3 = {
-#include "assets/objects/gameplay_keep/gDoorSkelLimb3.inc.c"
+StandardLimb gDoorSkelLimb_3 = {
+#include "assets/objects/gameplay_keep/gDoorSkelLimb_3.inc.c"
};
void* gDoorLimbs[] = {
diff --git a/assets/objects/gameplay_keep/door.h b/assets/objects/gameplay_keep/door.h
index 7e210f7b09..5d7477a848 100644
--- a/assets/objects/gameplay_keep/door.h
+++ b/assets/objects/gameplay_keep/door.h
@@ -14,10 +14,10 @@ extern Gfx gDoorRightDL[39];
#define gWoodenDoorTex_WIDTH 32
#define gWoodenDoorTex_HEIGHT 64
extern u64 gWoodenDoorTex[TEX_LEN(u64, gWoodenDoorTex_WIDTH, gWoodenDoorTex_HEIGHT, 16)];
-extern StandardLimb gDoorSkelLimb0;
-extern StandardLimb gDoorSkelLimb1;
-extern StandardLimb gDoorSkelLimb2;
-extern StandardLimb gDoorSkelLimb3;
+extern StandardLimb gDoorSkelLimb_0;
+extern StandardLimb gDoorSkelLimb_1;
+extern StandardLimb gDoorSkelLimb_2;
+extern StandardLimb gDoorSkelLimb_3;
extern void* gDoorLimbs[];
typedef enum gDoorSkelLimb {
/* 0 */ DOOR_LIMB_NONE,
diff --git a/assets/objects/gameplay_keep/fairy_skel.c b/assets/objects/gameplay_keep/fairy_skel.c
index ae8a84d19a..cb39f8a715 100644
--- a/assets/objects/gameplay_keep/fairy_skel.c
+++ b/assets/objects/gameplay_keep/fairy_skel.c
@@ -64,60 +64,60 @@ u64 gUnusedFairyWingTex[TEX_LEN(u64, gUnusedFairyWingTex_WIDTH, gUnusedFairyWing
#include "assets/objects/gameplay_keep/gUnusedFairyWingTex.rgba16.inc.c"
};
-StandardLimb gFairySkelLimb0 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb0.inc.c"
+StandardLimb gFairySkelLimb_0 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_0.inc.c"
};
-StandardLimb gFairySkelLimb1 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb1.inc.c"
+StandardLimb gFairySkelLimb_1 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_1.inc.c"
};
-StandardLimb gFairySkelLimb2 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb2.inc.c"
+StandardLimb gFairySkelLimb_2 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_2.inc.c"
};
-StandardLimb gFairySkelLimb3 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb3.inc.c"
+StandardLimb gFairySkelLimb_3 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_3.inc.c"
};
-StandardLimb gFairySkelLimb4 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb4.inc.c"
+StandardLimb gFairySkelLimb_4 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_4.inc.c"
};
-StandardLimb gFairySkelLimb5 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb5.inc.c"
+StandardLimb gFairySkelLimb_5 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_5.inc.c"
};
-StandardLimb gFairySkelLimb6 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb6.inc.c"
+StandardLimb gFairySkelLimb_6 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_6.inc.c"
};
-StandardLimb gFairySkelLimb7 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb7.inc.c"
+StandardLimb gFairySkelLimb_7 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_7.inc.c"
};
-StandardLimb gFairySkelLimb8 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb8.inc.c"
+StandardLimb gFairySkelLimb_8 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_8.inc.c"
};
-StandardLimb gFairySkelLimb9 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb9.inc.c"
+StandardLimb gFairySkelLimb_9 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_9.inc.c"
};
-StandardLimb gFairySkelLimb10 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb10.inc.c"
+StandardLimb gFairySkelLimb_10 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_10.inc.c"
};
-StandardLimb gFairySkelLimb11 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb11.inc.c"
+StandardLimb gFairySkelLimb_11 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_11.inc.c"
};
-StandardLimb gFairySkelLimb12 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb12.inc.c"
+StandardLimb gFairySkelLimb_12 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_12.inc.c"
};
-StandardLimb gFairySkelLimb13 = {
-#include "assets/objects/gameplay_keep/gFairySkelLimb13.inc.c"
+StandardLimb gFairySkelLimb_13 = {
+#include "assets/objects/gameplay_keep/gFairySkelLimb_13.inc.c"
};
void* gFairyLimbs[] = {
diff --git a/assets/objects/gameplay_keep/fairy_skel.h b/assets/objects/gameplay_keep/fairy_skel.h
index cb5e5356bc..dcdf2f22e3 100644
--- a/assets/objects/gameplay_keep/fairy_skel.h
+++ b/assets/objects/gameplay_keep/fairy_skel.h
@@ -24,20 +24,20 @@ extern Vtx gGlowCircleSmallVtx[];
#define gUnusedFairyWingTex_WIDTH 32
#define gUnusedFairyWingTex_HEIGHT 64
extern u64 gUnusedFairyWingTex[TEX_LEN(u64, gUnusedFairyWingTex_WIDTH, gUnusedFairyWingTex_HEIGHT, 16)];
-extern StandardLimb gFairySkelLimb0;
-extern StandardLimb gFairySkelLimb1;
-extern StandardLimb gFairySkelLimb2;
-extern StandardLimb gFairySkelLimb3;
-extern StandardLimb gFairySkelLimb4;
-extern StandardLimb gFairySkelLimb5;
-extern StandardLimb gFairySkelLimb6;
-extern StandardLimb gFairySkelLimb7;
-extern StandardLimb gFairySkelLimb8;
-extern StandardLimb gFairySkelLimb9;
-extern StandardLimb gFairySkelLimb10;
-extern StandardLimb gFairySkelLimb11;
-extern StandardLimb gFairySkelLimb12;
-extern StandardLimb gFairySkelLimb13;
+extern StandardLimb gFairySkelLimb_0;
+extern StandardLimb gFairySkelLimb_1;
+extern StandardLimb gFairySkelLimb_2;
+extern StandardLimb gFairySkelLimb_3;
+extern StandardLimb gFairySkelLimb_4;
+extern StandardLimb gFairySkelLimb_5;
+extern StandardLimb gFairySkelLimb_6;
+extern StandardLimb gFairySkelLimb_7;
+extern StandardLimb gFairySkelLimb_8;
+extern StandardLimb gFairySkelLimb_9;
+extern StandardLimb gFairySkelLimb_10;
+extern StandardLimb gFairySkelLimb_11;
+extern StandardLimb gFairySkelLimb_12;
+extern StandardLimb gFairySkelLimb_13;
extern void* gFairyLimbs[];
typedef enum gFairySkelLimb {
/* 0 */ FAIRY_LIMB_NONE,
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18610.c b/assets/objects/gameplay_keep/gameplay_keep_0x18610.c
index 5755cb6a8b..07aad27e6c 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x18610.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x18610.c
@@ -34,28 +34,28 @@ u64 gFishBodyTex[TEX_LEN(u64, gFishBodyTex_WIDTH, gFishBodyTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gFishBodyTex.rgba16.inc.c"
};
-StandardLimb gFishSkelLimb0 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb0.inc.c"
+StandardLimb gFishSkelLimb_0 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_0.inc.c"
};
-StandardLimb gFishSkelLimb1 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb1.inc.c"
+StandardLimb gFishSkelLimb_1 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_1.inc.c"
};
-StandardLimb gFishSkelLimb2 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb2.inc.c"
+StandardLimb gFishSkelLimb_2 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_2.inc.c"
};
-StandardLimb gFishSkelLimb3 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb3.inc.c"
+StandardLimb gFishSkelLimb_3 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_3.inc.c"
};
-StandardLimb gFishSkelLimb4 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb4.inc.c"
+StandardLimb gFishSkelLimb_4 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_4.inc.c"
};
-StandardLimb gFishSkelLimb5 = {
-#include "assets/objects/gameplay_keep/gFishSkelLimb5.inc.c"
+StandardLimb gFishSkelLimb_5 = {
+#include "assets/objects/gameplay_keep/gFishSkelLimb_5.inc.c"
};
void* gFishLimbs[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18610.h b/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
index 4f9195201a..edba23e871 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
@@ -17,12 +17,12 @@ extern u64 gFishTailTex[TEX_LEN(u64, gFishTailTex_WIDTH, gFishTailTex_HEIGHT, 16
#define gFishBodyTex_WIDTH 32
#define gFishBodyTex_HEIGHT 8
extern u64 gFishBodyTex[TEX_LEN(u64, gFishBodyTex_WIDTH, gFishBodyTex_HEIGHT, 16)];
-extern StandardLimb gFishSkelLimb0;
-extern StandardLimb gFishSkelLimb1;
-extern StandardLimb gFishSkelLimb2;
-extern StandardLimb gFishSkelLimb3;
-extern StandardLimb gFishSkelLimb4;
-extern StandardLimb gFishSkelLimb5;
+extern StandardLimb gFishSkelLimb_0;
+extern StandardLimb gFishSkelLimb_1;
+extern StandardLimb gFishSkelLimb_2;
+extern StandardLimb gFishSkelLimb_3;
+extern StandardLimb gFishSkelLimb_4;
+extern StandardLimb gFishSkelLimb_5;
extern void* gFishLimbs[];
typedef enum gFishSkelLimb {
/* 0 */ FISH_LIMB_NONE,
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.c b/assets/objects/gameplay_keep/gameplay_keep_0x34020.c
index d16c4bd9c9..89710ca7a1 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x34020.c
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x34020.c
@@ -14,148 +14,148 @@ AnimationHeader gBugCrawlAnim = {
#include "assets/objects/gameplay_keep/gBugCrawlAnim.inc.c"
};
-Gfx gBugLimb1DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb1DL.inc.c"
+Gfx gBugLimb_1DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_1DL.inc.c"
};
-Gfx gBugLimb1WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb1WrapperDL.inc.c"
+Gfx gBugLimb_1WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_1WrapperDL.inc.c"
};
-Gfx gBugLimb1WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb1WrapperWrapperDL.inc.c"
+Gfx gBugLimb_1WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_1WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb1Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb1Vtx.inc.c"
+Vtx gBugLimb_1Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_1Vtx.inc.c"
};
-Gfx gBugLimb2DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb2DL.inc.c"
+Gfx gBugLimb_2DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_2DL.inc.c"
};
-Gfx gBugLimb2WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb2WrapperDL.inc.c"
+Gfx gBugLimb_2WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_2WrapperDL.inc.c"
};
-Gfx gBugLimb2WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb2WrapperWrapperDL.inc.c"
+Gfx gBugLimb_2WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_2WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb2Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb2Vtx.inc.c"
+Vtx gBugLimb_2Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_2Vtx.inc.c"
};
-Gfx gBugLimb3DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb3DL.inc.c"
+Gfx gBugLimb_3DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_3DL.inc.c"
};
-Gfx gBugLimb3WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb3WrapperDL.inc.c"
+Gfx gBugLimb_3WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_3WrapperDL.inc.c"
};
-Gfx gBugLimb3WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb3WrapperWrapperDL.inc.c"
+Gfx gBugLimb_3WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_3WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb3Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb3Vtx.inc.c"
+Vtx gBugLimb_3Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_3Vtx.inc.c"
};
-Gfx gBugLimb4DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb4DL.inc.c"
+Gfx gBugLimb_4DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_4DL.inc.c"
};
-Gfx gBugLimb4WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb4WrapperDL.inc.c"
+Gfx gBugLimb_4WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_4WrapperDL.inc.c"
};
-Gfx gBugLimb4WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb4WrapperWrapperDL.inc.c"
+Gfx gBugLimb_4WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_4WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb4Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb4Vtx.inc.c"
+Vtx gBugLimb_4Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_4Vtx.inc.c"
};
-Gfx gBugLimb5DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb5DL.inc.c"
+Gfx gBugLimb_5DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_5DL.inc.c"
};
-Gfx gBugLimb5WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb5WrapperDL.inc.c"
+Gfx gBugLimb_5WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_5WrapperDL.inc.c"
};
-Gfx gBugLimb5WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb5WrapperWrapperDL.inc.c"
+Gfx gBugLimb_5WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_5WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb5Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb5Vtx.inc.c"
+Vtx gBugLimb_5Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_5Vtx.inc.c"
};
-Gfx gBugLimb6DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb6DL.inc.c"
+Gfx gBugLimb_6DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_6DL.inc.c"
};
-Gfx gBugLimb6WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb6WrapperDL.inc.c"
+Gfx gBugLimb_6WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_6WrapperDL.inc.c"
};
-Gfx gBugLimb6WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb6WrapperWrapperDL.inc.c"
+Gfx gBugLimb_6WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_6WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb6Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb6Vtx.inc.c"
+Vtx gBugLimb_6Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_6Vtx.inc.c"
};
-Gfx gBugLimb7DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb7DL.inc.c"
+Gfx gBugLimb_7DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_7DL.inc.c"
};
-Gfx gBugLimb7WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb7WrapperDL.inc.c"
+Gfx gBugLimb_7WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_7WrapperDL.inc.c"
};
-Gfx gBugLimb7WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb7WrapperWrapperDL.inc.c"
+Gfx gBugLimb_7WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_7WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb7Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb7Vtx.inc.c"
+Vtx gBugLimb_7Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_7Vtx.inc.c"
};
-Gfx gBugLimb8DL[20] = {
-#include "assets/objects/gameplay_keep/gBugLimb8DL.inc.c"
+Gfx gBugLimb_8DL[20] = {
+#include "assets/objects/gameplay_keep/gBugLimb_8DL.inc.c"
};
-Gfx gBugLimb8WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb8WrapperDL.inc.c"
+Gfx gBugLimb_8WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_8WrapperDL.inc.c"
};
-Gfx gBugLimb8WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb8WrapperWrapperDL.inc.c"
+Gfx gBugLimb_8WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_8WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb8Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb8Vtx.inc.c"
+Vtx gBugLimb_8Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_8Vtx.inc.c"
};
-Gfx gBugLimb9DL[22] = {
-#include "assets/objects/gameplay_keep/gBugLimb9DL.inc.c"
+Gfx gBugLimb_9DL[22] = {
+#include "assets/objects/gameplay_keep/gBugLimb_9DL.inc.c"
};
-Gfx gBugLimb9WrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb9WrapperDL.inc.c"
+Gfx gBugLimb_9WrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_9WrapperDL.inc.c"
};
-Gfx gBugLimb9WrapperWrapperDL[2] = {
-#include "assets/objects/gameplay_keep/gBugLimb9WrapperWrapperDL.inc.c"
+Gfx gBugLimb_9WrapperWrapperDL[2] = {
+#include "assets/objects/gameplay_keep/gBugLimb_9WrapperWrapperDL.inc.c"
};
-Vtx gBugLimb9Vtx[] = {
-#include "assets/objects/gameplay_keep/gBugLimb9Vtx.inc.c"
+Vtx gBugLimb_9Vtx[] = {
+#include "assets/objects/gameplay_keep/gBugLimb_9Vtx.inc.c"
};
u64 gBugBodyTex[TEX_LEN(u64, gBugBodyTex_WIDTH, gBugBodyTex_HEIGHT, 16)] = {
@@ -166,96 +166,96 @@ u64 gBugLegTex[TEX_LEN(u64, gBugLegTex_WIDTH, gBugLegTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gBugLegTex.rgba16.inc.c"
};
-StandardLimb gBugSkelLimb0 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb0.inc.c"
+StandardLimb gBugSkelLimb_0 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_0.inc.c"
};
-StandardLimb gBugSkelLimb1 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb1.inc.c"
+StandardLimb gBugSkelLimb_1 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_1.inc.c"
};
-StandardLimb gBugSkelLimb2 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb2.inc.c"
+StandardLimb gBugSkelLimb_2 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_2.inc.c"
};
-StandardLimb gBugSkelLimb3 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb3.inc.c"
+StandardLimb gBugSkelLimb_3 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_3.inc.c"
};
-StandardLimb gBugSkelLimb4 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb4.inc.c"
+StandardLimb gBugSkelLimb_4 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_4.inc.c"
};
-StandardLimb gBugSkelLimb5 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb5.inc.c"
+StandardLimb gBugSkelLimb_5 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_5.inc.c"
};
-StandardLimb gBugSkelLimb6 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb6.inc.c"
+StandardLimb gBugSkelLimb_6 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_6.inc.c"
};
-StandardLimb gBugSkelLimb7 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb7.inc.c"
+StandardLimb gBugSkelLimb_7 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_7.inc.c"
};
-StandardLimb gBugSkelLimb8 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb8.inc.c"
+StandardLimb gBugSkelLimb_8 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_8.inc.c"
};
-StandardLimb gBugSkelLimb9 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb9.inc.c"
+StandardLimb gBugSkelLimb_9 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_9.inc.c"
};
-StandardLimb gBugSkelLimb10 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb10.inc.c"
+StandardLimb gBugSkelLimb_10 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_10.inc.c"
};
-StandardLimb gBugSkelLimb11 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb11.inc.c"
+StandardLimb gBugSkelLimb_11 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_11.inc.c"
};
-StandardLimb gBugSkelLimb12 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb12.inc.c"
+StandardLimb gBugSkelLimb_12 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_12.inc.c"
};
-StandardLimb gBugSkelLimb13 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb13.inc.c"
+StandardLimb gBugSkelLimb_13 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_13.inc.c"
};
-StandardLimb gBugSkelLimb14 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb14.inc.c"
+StandardLimb gBugSkelLimb_14 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_14.inc.c"
};
-StandardLimb gBugSkelLimb15 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb15.inc.c"
+StandardLimb gBugSkelLimb_15 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_15.inc.c"
};
-StandardLimb gBugSkelLimb16 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb16.inc.c"
+StandardLimb gBugSkelLimb_16 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_16.inc.c"
};
-StandardLimb gBugSkelLimb17 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb17.inc.c"
+StandardLimb gBugSkelLimb_17 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_17.inc.c"
};
-StandardLimb gBugSkelLimb18 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb18.inc.c"
+StandardLimb gBugSkelLimb_18 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_18.inc.c"
};
-StandardLimb gBugSkelLimb19 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb19.inc.c"
+StandardLimb gBugSkelLimb_19 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_19.inc.c"
};
-StandardLimb gBugSkelLimb20 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb20.inc.c"
+StandardLimb gBugSkelLimb_20 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_20.inc.c"
};
-StandardLimb gBugSkelLimb21 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb21.inc.c"
+StandardLimb gBugSkelLimb_21 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_21.inc.c"
};
-StandardLimb gBugSkelLimb22 = {
-#include "assets/objects/gameplay_keep/gBugSkelLimb22.inc.c"
+StandardLimb gBugSkelLimb_22 = {
+#include "assets/objects/gameplay_keep/gBugSkelLimb_22.inc.c"
};
void* gBugLimbs[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h b/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
index e2d4a72f7b..37d742e869 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
@@ -8,71 +8,71 @@
extern s16 gBugCrawlFrameData[];
extern JointIndex gBugCrawlJointIndices[];
extern AnimationHeader gBugCrawlAnim;
-extern Gfx gBugLimb1DL[20];
-extern Gfx gBugLimb1WrapperDL[2];
-extern Gfx gBugLimb1WrapperWrapperDL[2];
-extern Vtx gBugLimb1Vtx[];
-extern Gfx gBugLimb2DL[20];
-extern Gfx gBugLimb2WrapperDL[2];
-extern Gfx gBugLimb2WrapperWrapperDL[2];
-extern Vtx gBugLimb2Vtx[];
-extern Gfx gBugLimb3DL[20];
-extern Gfx gBugLimb3WrapperDL[2];
-extern Gfx gBugLimb3WrapperWrapperDL[2];
-extern Vtx gBugLimb3Vtx[];
-extern Gfx gBugLimb4DL[20];
-extern Gfx gBugLimb4WrapperDL[2];
-extern Gfx gBugLimb4WrapperWrapperDL[2];
-extern Vtx gBugLimb4Vtx[];
-extern Gfx gBugLimb5DL[20];
-extern Gfx gBugLimb5WrapperDL[2];
-extern Gfx gBugLimb5WrapperWrapperDL[2];
-extern Vtx gBugLimb5Vtx[];
-extern Gfx gBugLimb6DL[20];
-extern Gfx gBugLimb6WrapperDL[2];
-extern Gfx gBugLimb6WrapperWrapperDL[2];
-extern Vtx gBugLimb6Vtx[];
-extern Gfx gBugLimb7DL[20];
-extern Gfx gBugLimb7WrapperDL[2];
-extern Gfx gBugLimb7WrapperWrapperDL[2];
-extern Vtx gBugLimb7Vtx[];
-extern Gfx gBugLimb8DL[20];
-extern Gfx gBugLimb8WrapperDL[2];
-extern Gfx gBugLimb8WrapperWrapperDL[2];
-extern Vtx gBugLimb8Vtx[];
-extern Gfx gBugLimb9DL[22];
-extern Gfx gBugLimb9WrapperDL[2];
-extern Gfx gBugLimb9WrapperWrapperDL[2];
-extern Vtx gBugLimb9Vtx[];
+extern Gfx gBugLimb_1DL[20];
+extern Gfx gBugLimb_1WrapperDL[2];
+extern Gfx gBugLimb_1WrapperWrapperDL[2];
+extern Vtx gBugLimb_1Vtx[];
+extern Gfx gBugLimb_2DL[20];
+extern Gfx gBugLimb_2WrapperDL[2];
+extern Gfx gBugLimb_2WrapperWrapperDL[2];
+extern Vtx gBugLimb_2Vtx[];
+extern Gfx gBugLimb_3DL[20];
+extern Gfx gBugLimb_3WrapperDL[2];
+extern Gfx gBugLimb_3WrapperWrapperDL[2];
+extern Vtx gBugLimb_3Vtx[];
+extern Gfx gBugLimb_4DL[20];
+extern Gfx gBugLimb_4WrapperDL[2];
+extern Gfx gBugLimb_4WrapperWrapperDL[2];
+extern Vtx gBugLimb_4Vtx[];
+extern Gfx gBugLimb_5DL[20];
+extern Gfx gBugLimb_5WrapperDL[2];
+extern Gfx gBugLimb_5WrapperWrapperDL[2];
+extern Vtx gBugLimb_5Vtx[];
+extern Gfx gBugLimb_6DL[20];
+extern Gfx gBugLimb_6WrapperDL[2];
+extern Gfx gBugLimb_6WrapperWrapperDL[2];
+extern Vtx gBugLimb_6Vtx[];
+extern Gfx gBugLimb_7DL[20];
+extern Gfx gBugLimb_7WrapperDL[2];
+extern Gfx gBugLimb_7WrapperWrapperDL[2];
+extern Vtx gBugLimb_7Vtx[];
+extern Gfx gBugLimb_8DL[20];
+extern Gfx gBugLimb_8WrapperDL[2];
+extern Gfx gBugLimb_8WrapperWrapperDL[2];
+extern Vtx gBugLimb_8Vtx[];
+extern Gfx gBugLimb_9DL[22];
+extern Gfx gBugLimb_9WrapperDL[2];
+extern Gfx gBugLimb_9WrapperWrapperDL[2];
+extern Vtx gBugLimb_9Vtx[];
#define gBugBodyTex_WIDTH 16
#define gBugBodyTex_HEIGHT 64
extern u64 gBugBodyTex[TEX_LEN(u64, gBugBodyTex_WIDTH, gBugBodyTex_HEIGHT, 16)];
#define gBugLegTex_WIDTH 8
#define gBugLegTex_HEIGHT 16
extern u64 gBugLegTex[TEX_LEN(u64, gBugLegTex_WIDTH, gBugLegTex_HEIGHT, 16)];
-extern StandardLimb gBugSkelLimb0;
-extern StandardLimb gBugSkelLimb1;
-extern StandardLimb gBugSkelLimb2;
-extern StandardLimb gBugSkelLimb3;
-extern StandardLimb gBugSkelLimb4;
-extern StandardLimb gBugSkelLimb5;
-extern StandardLimb gBugSkelLimb6;
-extern StandardLimb gBugSkelLimb7;
-extern StandardLimb gBugSkelLimb8;
-extern StandardLimb gBugSkelLimb9;
-extern StandardLimb gBugSkelLimb10;
-extern StandardLimb gBugSkelLimb11;
-extern StandardLimb gBugSkelLimb12;
-extern StandardLimb gBugSkelLimb13;
-extern StandardLimb gBugSkelLimb14;
-extern StandardLimb gBugSkelLimb15;
-extern StandardLimb gBugSkelLimb16;
-extern StandardLimb gBugSkelLimb17;
-extern StandardLimb gBugSkelLimb18;
-extern StandardLimb gBugSkelLimb19;
-extern StandardLimb gBugSkelLimb20;
-extern StandardLimb gBugSkelLimb21;
-extern StandardLimb gBugSkelLimb22;
+extern StandardLimb gBugSkelLimb_0;
+extern StandardLimb gBugSkelLimb_1;
+extern StandardLimb gBugSkelLimb_2;
+extern StandardLimb gBugSkelLimb_3;
+extern StandardLimb gBugSkelLimb_4;
+extern StandardLimb gBugSkelLimb_5;
+extern StandardLimb gBugSkelLimb_6;
+extern StandardLimb gBugSkelLimb_7;
+extern StandardLimb gBugSkelLimb_8;
+extern StandardLimb gBugSkelLimb_9;
+extern StandardLimb gBugSkelLimb_10;
+extern StandardLimb gBugSkelLimb_11;
+extern StandardLimb gBugSkelLimb_12;
+extern StandardLimb gBugSkelLimb_13;
+extern StandardLimb gBugSkelLimb_14;
+extern StandardLimb gBugSkelLimb_15;
+extern StandardLimb gBugSkelLimb_16;
+extern StandardLimb gBugSkelLimb_17;
+extern StandardLimb gBugSkelLimb_18;
+extern StandardLimb gBugSkelLimb_19;
+extern StandardLimb gBugSkelLimb_20;
+extern StandardLimb gBugSkelLimb_21;
+extern StandardLimb gBugSkelLimb_22;
extern void* gBugLimbs[];
typedef enum gBugSkelLimb {
/* 0 */ BUG_LIMB_NONE,
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index 5dba196989..0021e84479 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -640,10 +640,10 @@
-
-
-
-
+
+
+
+
@@ -737,10 +737,10 @@
-
-
-
-
+
+
+
+
@@ -811,20 +811,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -850,12 +850,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1010,85 +1010,85 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml
index c2a8d54c4a..9fc248ee5c 100644
--- a/assets/xml/objects/gameplay_keep_pal.xml
+++ b/assets/xml/objects/gameplay_keep_pal.xml
@@ -640,10 +640,10 @@
-
-
-
-
+
+
+
+
@@ -729,10 +729,10 @@
-
-
-
-
+
+
+
+
@@ -803,20 +803,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -842,12 +842,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1002,85 +1002,85 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 83bd21cc8282c4230fd230ccae80d0c27d10287c Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Mon, 9 Jun 2025 09:08:01 +0200
Subject: [PATCH 15/22] cleanup limb enum names (remove g prefix)
---
assets/objects/gameplay_keep/arrow_skel.h | 4 ++--
assets/objects/gameplay_keep/door.h | 4 ++--
assets/objects/gameplay_keep/fairy_skel.h | 4 ++--
assets/objects/gameplay_keep/gameplay_keep_0x18610.h | 4 ++--
assets/objects/gameplay_keep/gameplay_keep_0x34020.h | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/assets/objects/gameplay_keep/arrow_skel.h b/assets/objects/gameplay_keep/arrow_skel.h
index 268c1cf559..f695bffaf6 100644
--- a/assets/objects/gameplay_keep/arrow_skel.h
+++ b/assets/objects/gameplay_keep/arrow_skel.h
@@ -19,14 +19,14 @@ extern LodLimb gArrowSkelLimb_1;
extern LodLimb gArrowSkelLimb_2;
extern LodLimb gArrowSkelLimb_3;
extern void* gArrowLimbs[];
-typedef enum gArrowSkelLimb {
+typedef enum ArrowSkelLimb {
/* 0 */ ARROW_LIMB_NONE,
/* 1 */ ARROW_LIMB_0,
/* 2 */ ARROW_LIMB_1,
/* 3 */ ARROW_LIMB_2,
/* 4 */ ARROW_LIMB_3,
/* 5 */ ARROW_LIMB_MAX
-} gArrowSkelLimb;
+} ArrowSkelLimb;
extern SkeletonHeader gArrowSkel;
#endif
diff --git a/assets/objects/gameplay_keep/door.h b/assets/objects/gameplay_keep/door.h
index 5d7477a848..c41c9ee2b6 100644
--- a/assets/objects/gameplay_keep/door.h
+++ b/assets/objects/gameplay_keep/door.h
@@ -19,14 +19,14 @@ extern StandardLimb gDoorSkelLimb_1;
extern StandardLimb gDoorSkelLimb_2;
extern StandardLimb gDoorSkelLimb_3;
extern void* gDoorLimbs[];
-typedef enum gDoorSkelLimb {
+typedef enum DoorSkelLimb {
/* 0 */ DOOR_LIMB_NONE,
/* 1 */ DOOR_LIMB_0,
/* 2 */ DOOR_LIMB_1,
/* 3 */ DOOR_LIMB_2,
/* 4 */ DOOR_LIMB_3,
/* 5 */ DOOR_LIMB_MAX
-} gDoorSkelLimb;
+} DoorSkelLimb;
extern SkeletonHeader gDoorSkel;
#endif
diff --git a/assets/objects/gameplay_keep/fairy_skel.h b/assets/objects/gameplay_keep/fairy_skel.h
index dcdf2f22e3..6b5816eeca 100644
--- a/assets/objects/gameplay_keep/fairy_skel.h
+++ b/assets/objects/gameplay_keep/fairy_skel.h
@@ -39,7 +39,7 @@ extern StandardLimb gFairySkelLimb_11;
extern StandardLimb gFairySkelLimb_12;
extern StandardLimb gFairySkelLimb_13;
extern void* gFairyLimbs[];
-typedef enum gFairySkelLimb {
+typedef enum FairySkelLimb {
/* 0 */ FAIRY_LIMB_NONE,
/* 1 */ FAIRY_LIMB_0,
/* 2 */ FAIRY_LIMB_1,
@@ -56,7 +56,7 @@ typedef enum gFairySkelLimb {
/* 13 */ FAIRY_LIMB_12,
/* 14 */ FAIRY_LIMB_13,
/* 15 */ FAIRY_LIMB_MAX
-} gFairySkelLimb;
+} FairySkelLimb;
extern SkeletonHeader gFairySkel;
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18610.h b/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
index edba23e871..fe2edbc658 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
@@ -24,7 +24,7 @@ extern StandardLimb gFishSkelLimb_3;
extern StandardLimb gFishSkelLimb_4;
extern StandardLimb gFishSkelLimb_5;
extern void* gFishLimbs[];
-typedef enum gFishSkelLimb {
+typedef enum FishSkelLimb {
/* 0 */ FISH_LIMB_NONE,
/* 1 */ FISH_LIMB_0,
/* 2 */ FISH_LIMB_1,
@@ -33,7 +33,7 @@ typedef enum gFishSkelLimb {
/* 5 */ FISH_LIMB_4,
/* 6 */ FISH_LIMB_5,
/* 7 */ FISH_LIMB_MAX
-} gFishSkelLimb;
+} FishSkelLimb;
extern FlexSkeletonHeader gFishSkel;
#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h b/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
index 37d742e869..39cb24611d 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
@@ -74,7 +74,7 @@ extern StandardLimb gBugSkelLimb_20;
extern StandardLimb gBugSkelLimb_21;
extern StandardLimb gBugSkelLimb_22;
extern void* gBugLimbs[];
-typedef enum gBugSkelLimb {
+typedef enum BugSkelLimb {
/* 0 */ BUG_LIMB_NONE,
/* 1 */ BUG_LIMB_0,
/* 2 */ BUG_LIMB_1,
@@ -100,7 +100,7 @@ typedef enum gBugSkelLimb {
/* 22 */ BUG_LIMB_21,
/* 23 */ BUG_LIMB_22,
/* 24 */ BUG_LIMB_MAX
-} gBugSkelLimb;
+} BugSkelLimb;
extern SkeletonHeader gBugSkel;
#endif
From c62cb43fc0591153bf4f5185c206ea590ac8bb5f Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Mon, 9 Jun 2025 09:14:08 +0200
Subject: [PATCH 16/22] split gameplay_keep_0x34020.c into gBugCrawlAnim.c +
bug_skel.c
---
.../{gameplay_keep_0x34020.c => bug_skel.c} | 14 +-------------
.../{gameplay_keep_0x34020.h => bug_skel.h} | 7 ++-----
assets/objects/gameplay_keep/gBugCrawlAnim.c | 13 +++++++++++++
assets/objects/gameplay_keep/gBugCrawlAnim.h | 11 +++++++++++
assets/objects/gameplay_keep/gameplay_keep.h | 3 ++-
spec/spec | 3 ++-
src/overlays/actors/ovl_En_Insect/z_en_insect.c | 3 ++-
7 files changed, 33 insertions(+), 21 deletions(-)
rename assets/objects/gameplay_keep/{gameplay_keep_0x34020.c => bug_skel.c} (94%)
rename assets/objects/gameplay_keep/{gameplay_keep_0x34020.h => bug_skel.h} (94%)
create mode 100644 assets/objects/gameplay_keep/gBugCrawlAnim.c
create mode 100644 assets/objects/gameplay_keep/gBugCrawlAnim.h
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.c b/assets/objects/gameplay_keep/bug_skel.c
similarity index 94%
rename from assets/objects/gameplay_keep/gameplay_keep_0x34020.c
rename to assets/objects/gameplay_keep/bug_skel.c
index 89710ca7a1..25bb27e0aa 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x34020.c
+++ b/assets/objects/gameplay_keep/bug_skel.c
@@ -1,19 +1,7 @@
-#include "gameplay_keep_0x34020.h"
+#include "bug_skel.h"
#include "array_count.h"
#include "gfx.h"
-s16 gBugCrawlFrameData[] = {
-#include "assets/objects/gameplay_keep/gBugCrawlFrameData.inc.c"
-};
-
-JointIndex gBugCrawlJointIndices[] = {
-#include "assets/objects/gameplay_keep/gBugCrawlJointIndices.inc.c"
-};
-
-AnimationHeader gBugCrawlAnim = {
-#include "assets/objects/gameplay_keep/gBugCrawlAnim.inc.c"
-};
-
Gfx gBugLimb_1DL[20] = {
#include "assets/objects/gameplay_keep/gBugLimb_1DL.inc.c"
};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h b/assets/objects/gameplay_keep/bug_skel.h
similarity index 94%
rename from assets/objects/gameplay_keep/gameplay_keep_0x34020.h
rename to assets/objects/gameplay_keep/bug_skel.h
index 39cb24611d..d742254c94 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
+++ b/assets/objects/gameplay_keep/bug_skel.h
@@ -1,13 +1,10 @@
-#ifndef GAMEPLAY_KEEP_0x34020_H
-#define GAMEPLAY_KEEP_0x34020_H
+#ifndef GAMEPLAY_KEEP_BUG_SKEL_H
+#define GAMEPLAY_KEEP_BUG_SKEL_H
#include "tex_len.h"
#include "ultra64.h"
#include "animation.h"
-extern s16 gBugCrawlFrameData[];
-extern JointIndex gBugCrawlJointIndices[];
-extern AnimationHeader gBugCrawlAnim;
extern Gfx gBugLimb_1DL[20];
extern Gfx gBugLimb_1WrapperDL[2];
extern Gfx gBugLimb_1WrapperWrapperDL[2];
diff --git a/assets/objects/gameplay_keep/gBugCrawlAnim.c b/assets/objects/gameplay_keep/gBugCrawlAnim.c
new file mode 100644
index 0000000000..1c34abcd9f
--- /dev/null
+++ b/assets/objects/gameplay_keep/gBugCrawlAnim.c
@@ -0,0 +1,13 @@
+#include "gBugCrawlAnim.h"
+
+s16 gBugCrawlFrameData[] = {
+#include "assets/objects/gameplay_keep/gBugCrawlFrameData.inc.c"
+};
+
+JointIndex gBugCrawlJointIndices[] = {
+#include "assets/objects/gameplay_keep/gBugCrawlJointIndices.inc.c"
+};
+
+AnimationHeader gBugCrawlAnim = {
+#include "assets/objects/gameplay_keep/gBugCrawlAnim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gBugCrawlAnim.h b/assets/objects/gameplay_keep/gBugCrawlAnim.h
new file mode 100644
index 0000000000..554e80178a
--- /dev/null
+++ b/assets/objects/gameplay_keep/gBugCrawlAnim.h
@@ -0,0 +1,11 @@
+#ifndef GAMEPLAY_KEEP_GBUGCRAWLANIM_H
+#define GAMEPLAY_KEEP_GBUGCRAWLANIM_H
+
+#include "ultra64.h"
+#include "animation.h"
+
+extern s16 gBugCrawlFrameData[];
+extern JointIndex gBugCrawlJointIndices[];
+extern AnimationHeader gBugCrawlAnim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index 6d25257c92..0cae382843 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -62,7 +62,8 @@
#include "gameplay_keep_0x33090.h"
#include "eff_ice_fragments.h"
#include "gameplay_keep_0x33910.h"
-#include "gameplay_keep_0x34020.h"
+#include "gBugCrawlAnim.h"
+#include "bug_skel.h"
#include "cuttable_shrub.h"
#include "lens_flare.h"
#include "eff_sparkles.h"
diff --git a/spec/spec b/spec/spec
index 0642cbb72e..efd880762c 100644
--- a/spec/spec
+++ b/spec/spec
@@ -1059,7 +1059,8 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x33090.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_ice_fragments.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x33910.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x34020.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gBugCrawlAnim.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/bug_skel.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/cuttable_shrub.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/lens_flare.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_sparkles.o"
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
index 7950e2d38d..ff279a98e3 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
@@ -22,7 +22,8 @@
#include "player.h"
#include "save.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0x34020.h"
+#include "assets/objects/gameplay_keep/bug_skel.h"
+#include "assets/objects/gameplay_keep/gBugCrawlAnim.h"
#define FLAGS 0
From 7ed8b19f5ce74a94c33ecb6519d3494b3d7d0c8e Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Mon, 9 Jun 2025 09:17:41 +0200
Subject: [PATCH 17/22] door.h -> door_skel.h
---
assets/objects/gameplay_keep/{door.c => door_skel.c} | 2 +-
assets/objects/gameplay_keep/{door.h => door_skel.h} | 4 ++--
assets/objects/gameplay_keep/gameplay_keep.h | 2 +-
spec/spec | 2 +-
src/overlays/actors/ovl_Door_Killer/z_door_killer.c | 2 +-
src/overlays/actors/ovl_En_Door/z_en_door.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
rename assets/objects/gameplay_keep/{door.c => door_skel.c} (98%)
rename assets/objects/gameplay_keep/{door.h => door_skel.h} (92%)
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"
From 8cc9dc919a8f0fa70c3372e0f6a9d8a79fd4160a Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Mon, 9 Jun 2025 09:21:57 +0200
Subject: [PATCH 18/22] gArrowNAnim -> gArrowN_Anim
---
assets/objects/gameplay_keep/arrow_anims.c | 24 +++++++++----------
assets/objects/gameplay_keep/arrow_anims.h | 12 +++++-----
assets/xml/objects/gameplay_keep.xml | 4 ++--
assets/xml/objects/gameplay_keep_pal.xml | 4 ++--
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 6 ++---
5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/assets/objects/gameplay_keep/arrow_anims.c b/assets/objects/gameplay_keep/arrow_anims.c
index 9152c4f123..38d81eba79 100644
--- a/assets/objects/gameplay_keep/arrow_anims.c
+++ b/assets/objects/gameplay_keep/arrow_anims.c
@@ -1,25 +1,25 @@
#include "arrow_anims.h"
-s16 gArrow1FrameData[] = {
-#include "assets/objects/gameplay_keep/gArrow1FrameData.inc.c"
+s16 gArrow1_FrameData[] = {
+#include "assets/objects/gameplay_keep/gArrow1_FrameData.inc.c"
};
-JointIndex gArrow1JointIndices[] = {
-#include "assets/objects/gameplay_keep/gArrow1JointIndices.inc.c"
+JointIndex gArrow1_JointIndices[] = {
+#include "assets/objects/gameplay_keep/gArrow1_JointIndices.inc.c"
};
-AnimationHeader gArrow1Anim = {
-#include "assets/objects/gameplay_keep/gArrow1Anim.inc.c"
+AnimationHeader gArrow1_Anim = {
+#include "assets/objects/gameplay_keep/gArrow1_Anim.inc.c"
};
-s16 gArrow2FrameData[] = {
-#include "assets/objects/gameplay_keep/gArrow2FrameData.inc.c"
+s16 gArrow2_FrameData[] = {
+#include "assets/objects/gameplay_keep/gArrow2_FrameData.inc.c"
};
-JointIndex gArrow2JointIndices[] = {
-#include "assets/objects/gameplay_keep/gArrow2JointIndices.inc.c"
+JointIndex gArrow2_JointIndices[] = {
+#include "assets/objects/gameplay_keep/gArrow2_JointIndices.inc.c"
};
-AnimationHeader gArrow2Anim = {
-#include "assets/objects/gameplay_keep/gArrow2Anim.inc.c"
+AnimationHeader gArrow2_Anim = {
+#include "assets/objects/gameplay_keep/gArrow2_Anim.inc.c"
};
diff --git a/assets/objects/gameplay_keep/arrow_anims.h b/assets/objects/gameplay_keep/arrow_anims.h
index c6c451a237..a4f6064047 100644
--- a/assets/objects/gameplay_keep/arrow_anims.h
+++ b/assets/objects/gameplay_keep/arrow_anims.h
@@ -3,11 +3,11 @@
#include "animation.h"
-extern s16 gArrow1FrameData[];
-extern JointIndex gArrow1JointIndices[];
-extern AnimationHeader gArrow1Anim;
-extern s16 gArrow2FrameData[];
-extern JointIndex gArrow2JointIndices[];
-extern AnimationHeader gArrow2Anim;
+extern s16 gArrow1_FrameData[];
+extern JointIndex gArrow1_JointIndices[];
+extern AnimationHeader gArrow1_Anim;
+extern s16 gArrow2_FrameData[];
+extern JointIndex gArrow2_JointIndices[];
+extern AnimationHeader gArrow2_Anim;
#endif
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index 0021e84479..b8e20ab429 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -628,8 +628,8 @@
-
-
+
+
diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml
index 9fc248ee5c..04387392fb 100644
--- a/assets/xml/objects/gameplay_keep_pal.xml
+++ b/assets/xml/objects/gameplay_keep_pal.xml
@@ -628,8 +628,8 @@
-
-
+
+
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index 6e1d9741f2..abbab230bf 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -109,7 +109,7 @@ void EnArrow_Init(Actor* thisx, PlayState* play) {
if (this->actor.params <= ARROW_SEED) {
if (this->actor.params <= ARROW_0E) {
- SkelAnime_Init(play, &this->skelAnime, &gArrowSkel, &gArrow2Anim, NULL, NULL, 0);
+ SkelAnime_Init(play, &this->skelAnime, &gArrowSkel, &gArrow2_Anim, NULL, NULL, 0);
}
if (this->actor.params <= ARROW_NORMAL) {
@@ -212,7 +212,7 @@ void EnArrow_Shoot(EnArrow* this, PlayState* play) {
void func_809B3CEC(PlayState* play, EnArrow* this) {
EnArrow_SetupAction(this, func_809B4640);
- Animation_PlayOnce(&this->skelAnime, &gArrow1Anim);
+ Animation_PlayOnce(&this->skelAnime, &gArrow1_Anim);
this->actor.world.rot.y += (s32)(24576.0f * (Rand_ZeroOne() - 0.5f)) + 0x8000;
this->actor.velocity.y += (this->actor.speed * (0.4f + (0.4f * Rand_ZeroOne())));
this->actor.speed *= (0.04f + 0.3f * Rand_ZeroOne());
@@ -326,7 +326,7 @@ void EnArrow_Fly(EnArrow* this, PlayState* play) {
}
} else if (this->touchedPoly) {
EnArrow_SetupAction(this, func_809B45E0);
- Animation_PlayOnce(&this->skelAnime, &gArrow2Anim);
+ Animation_PlayOnce(&this->skelAnime, &gArrow2_Anim);
if (this->actor.params >= ARROW_NORMAL_LIT) {
this->timer = 60;
From 6e908a3b4220a0aa6aacfa4b3afdd4ce24094b44 Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Mon, 9 Jun 2025 09:27:51 +0200
Subject: [PATCH 19/22] split arrow_anims into gArrow1_Anim + gArrow2_Anim
---
assets/objects/gameplay_keep/arrow_anims.c | 25 -------------------
assets/objects/gameplay_keep/arrow_anims.h | 13 ----------
assets/objects/gameplay_keep/gArrow1_Anim.c | 13 ++++++++++
assets/objects/gameplay_keep/gArrow1_Anim.h | 10 ++++++++
assets/objects/gameplay_keep/gArrow2_Anim.c | 13 ++++++++++
assets/objects/gameplay_keep/gArrow2_Anim.h | 10 ++++++++
assets/objects/gameplay_keep/gameplay_keep.h | 3 ++-
spec/spec | 3 ++-
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 3 ++-
9 files changed, 52 insertions(+), 41 deletions(-)
delete mode 100644 assets/objects/gameplay_keep/arrow_anims.c
delete mode 100644 assets/objects/gameplay_keep/arrow_anims.h
create mode 100644 assets/objects/gameplay_keep/gArrow1_Anim.c
create mode 100644 assets/objects/gameplay_keep/gArrow1_Anim.h
create mode 100644 assets/objects/gameplay_keep/gArrow2_Anim.c
create mode 100644 assets/objects/gameplay_keep/gArrow2_Anim.h
diff --git a/assets/objects/gameplay_keep/arrow_anims.c b/assets/objects/gameplay_keep/arrow_anims.c
deleted file mode 100644
index 38d81eba79..0000000000
--- a/assets/objects/gameplay_keep/arrow_anims.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "arrow_anims.h"
-
-s16 gArrow1_FrameData[] = {
-#include "assets/objects/gameplay_keep/gArrow1_FrameData.inc.c"
-};
-
-JointIndex gArrow1_JointIndices[] = {
-#include "assets/objects/gameplay_keep/gArrow1_JointIndices.inc.c"
-};
-
-AnimationHeader gArrow1_Anim = {
-#include "assets/objects/gameplay_keep/gArrow1_Anim.inc.c"
-};
-
-s16 gArrow2_FrameData[] = {
-#include "assets/objects/gameplay_keep/gArrow2_FrameData.inc.c"
-};
-
-JointIndex gArrow2_JointIndices[] = {
-#include "assets/objects/gameplay_keep/gArrow2_JointIndices.inc.c"
-};
-
-AnimationHeader gArrow2_Anim = {
-#include "assets/objects/gameplay_keep/gArrow2_Anim.inc.c"
-};
diff --git a/assets/objects/gameplay_keep/arrow_anims.h b/assets/objects/gameplay_keep/arrow_anims.h
deleted file mode 100644
index a4f6064047..0000000000
--- a/assets/objects/gameplay_keep/arrow_anims.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef GAMEPLAY_KEEP_ARROW_ANIMS_H
-#define GAMEPLAY_KEEP_ARROW_ANIMS_H
-
-#include "animation.h"
-
-extern s16 gArrow1_FrameData[];
-extern JointIndex gArrow1_JointIndices[];
-extern AnimationHeader gArrow1_Anim;
-extern s16 gArrow2_FrameData[];
-extern JointIndex gArrow2_JointIndices[];
-extern AnimationHeader gArrow2_Anim;
-
-#endif
diff --git a/assets/objects/gameplay_keep/gArrow1_Anim.c b/assets/objects/gameplay_keep/gArrow1_Anim.c
new file mode 100644
index 0000000000..1d501954a4
--- /dev/null
+++ b/assets/objects/gameplay_keep/gArrow1_Anim.c
@@ -0,0 +1,13 @@
+#include "gArrow1_Anim.h"
+
+s16 gArrow1_FrameData[] = {
+#include "assets/objects/gameplay_keep/gArrow1_FrameData.inc.c"
+};
+
+JointIndex gArrow1_JointIndices[] = {
+#include "assets/objects/gameplay_keep/gArrow1_JointIndices.inc.c"
+};
+
+AnimationHeader gArrow1_Anim = {
+#include "assets/objects/gameplay_keep/gArrow1_Anim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gArrow1_Anim.h b/assets/objects/gameplay_keep/gArrow1_Anim.h
new file mode 100644
index 0000000000..2d9577baf5
--- /dev/null
+++ b/assets/objects/gameplay_keep/gArrow1_Anim.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_GARROW1_ANIM_H
+#define GAMEPLAY_KEEP_GARROW1_ANIM_H
+
+#include "animation.h"
+
+extern s16 gArrow1_FrameData[];
+extern JointIndex gArrow1_JointIndices[];
+extern AnimationHeader gArrow1_Anim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gArrow2_Anim.c b/assets/objects/gameplay_keep/gArrow2_Anim.c
new file mode 100644
index 0000000000..bb341136db
--- /dev/null
+++ b/assets/objects/gameplay_keep/gArrow2_Anim.c
@@ -0,0 +1,13 @@
+#include "gArrow2_Anim.h"
+
+s16 gArrow2_FrameData[] = {
+#include "assets/objects/gameplay_keep/gArrow2_FrameData.inc.c"
+};
+
+JointIndex gArrow2_JointIndices[] = {
+#include "assets/objects/gameplay_keep/gArrow2_JointIndices.inc.c"
+};
+
+AnimationHeader gArrow2_Anim = {
+#include "assets/objects/gameplay_keep/gArrow2_Anim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gArrow2_Anim.h b/assets/objects/gameplay_keep/gArrow2_Anim.h
new file mode 100644
index 0000000000..ab0442ce39
--- /dev/null
+++ b/assets/objects/gameplay_keep/gArrow2_Anim.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_GARROW2_ANIM_H
+#define GAMEPLAY_KEEP_GARROW2_ANIM_H
+
+#include "animation.h"
+
+extern s16 gArrow2_FrameData[];
+extern JointIndex gArrow2_JointIndices[];
+extern AnimationHeader gArrow2_Anim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index 6702db24d8..b3cd325f0c 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -6,7 +6,8 @@
#include "player_pause_joint_tables.h"
#include "player_anim_headers.h"
#include "debug_models.h"
-#include "arrow_anims.h"
+#include "gArrow1_Anim.h"
+#include "gArrow2_Anim.h"
#include "arrow_skel.h"
#include "unk_eff_blure_tex.h"
#include "bomb_body.h"
diff --git a/spec/spec b/spec/spec
index 52db392dac..1ae6def863 100644
--- a/spec/spec
+++ b/spec/spec
@@ -1002,7 +1002,8 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_pause_joint_tables.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_anim_headers.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/debug_models.o"
- include "$(BUILD_DIR)/assets/objects/gameplay_keep/arrow_anims.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gArrow1_Anim.o"
+ include "$(BUILD_DIR)/assets/objects/gameplay_keep/gArrow2_Anim.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/arrow_skel.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/unk_eff_blure_tex.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/bomb_body.o"
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index abbab230bf..3ff5c29be8 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -21,7 +21,8 @@
#include "play_state.h"
#include "assets/objects/gameplay_keep/arrow_skel.h"
-#include "assets/objects/gameplay_keep/arrow_anims.h"
+#include "assets/objects/gameplay_keep/gArrow1_Anim.h"
+#include "assets/objects/gameplay_keep/gArrow2_Anim.h"
#include "assets/objects/gameplay_keep/eff_sparkles.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
From 4b12ae04454671910a7a8eca642743bb196e59fc Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Mon, 9 Jun 2025 14:12:29 +0200
Subject: [PATCH 20/22] fix merge
---
src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
index 68eb13d2b8..0368bba58d 100644
--- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
+++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
@@ -18,6 +18,7 @@
#include "save.h"
#include "assets/objects/gameplay_keep/eff_flash.h"
+#include "assets/objects/gameplay_keep/gameplay_keep_0x32090.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
From c6ba4368cf2998f0ffb9a6c662a4550c7971369d Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Mon, 9 Jun 2025 14:12:35 +0200
Subject: [PATCH 21/22] bss
---
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
index 3c19bf8eab..2f7764b1c2 100644
--- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
+++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
@@ -32,7 +32,7 @@
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
- "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+ "ique-cn:0 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
From 0b5243e936da764f8cb083b8d26528ce22ea7bff Mon Sep 17 00:00:00 2001
From: Dragorn421
Date: Fri, 13 Jun 2025 15:38:43 +0200
Subject: [PATCH 22/22] bss
---
src/code/z_kankyo.c | 2 +-
src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 2 +-
src/overlays/actors/ovl_player_actor/z_player.c | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index b050abce62..189139aefd 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -244,7 +244,7 @@ s16 sSunDepthTestX;
s16 sSunDepthTestY;
#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \
- "ique-cn:224 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1:224"
+ "ique-cn:224 ntsc-1.0:208 ntsc-1.1:208 ntsc-1.2:208 pal-1.0:224 pal-1.1:224"
LightNode* sNGameOverLightNode;
LightInfo sNGameOverLightInfo;
diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
index bf0ec281c3..f4cb18d303 100644
--- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
+++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
@@ -33,7 +33,7 @@
#include "assets/objects/gameplay_keep/gameplay_keep_0x173D0.h"
#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
- "ique-cn:128 pal-1.0:0 pal-1.1:0"
+ "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index 7b276a661d..01fcc5970a 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -364,22 +364,22 @@ void Player_Action_CsAction(Player* this, PlayState* play);
// .bss part 1
-#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64 ique-cn:64" \
- "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
+#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64" \
+ "ique-cn:128 ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
static s32 D_80858AA0;
// TODO: There's probably a way to match BSS ordering with less padding by spreading the variables out and moving
// data around. It would be easier if we had more options for controlling BSS ordering in debug.
#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
- "ique-cn:192 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
+ "ique-cn:128 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
static s32 sSavedCurrentMask;
static Vec3f sInteractWallCheckResult;
static Input* sControlInput;
#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
- "ique-cn:160 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+ "ique-cn:192 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
// .data