diff --git a/Makefile b/Makefile index 66d38f9063..6a6f8eed89 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,7 @@ OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump EMULATOR = mupen64plus EMU_FLAGS = --noosd -INC := -Iinclude -Isrc -Iassets -Ibuild -I. +INC := -Iinclude -Isrc -Ibuild -I. # Check code syntax with host compiler CHECK_WARNINGS := -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -Wno-unused-parameter -Wno-unused-variable -Wno-missing-braces -Wno-int-conversion diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml index 590f8e3748..2be5a95a76 100644 --- a/assets/xml/objects/gameplay_keep.xml +++ b/assets/xml/objects/gameplay_keep.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_bdoor.xml b/assets/xml/objects/object_bdoor.xml index 644c06ea86..eb22cfea35 100644 --- a/assets/xml/objects/object_bdoor.xml +++ b/assets/xml/objects/object_bdoor.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_demo_6k.xml b/assets/xml/objects/object_demo_6k.xml index 2e8db238f9..f64a0898b6 100644 --- a/assets/xml/objects/object_demo_6k.xml +++ b/assets/xml/objects/object_demo_6k.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_demo_kekkai.xml b/assets/xml/objects/object_demo_kekkai.xml index d1ac785b5e..0c26063c9e 100644 --- a/assets/xml/objects/object_demo_kekkai.xml +++ b/assets/xml/objects/object_demo_kekkai.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_efc_erupc.xml b/assets/xml/objects/object_efc_erupc.xml index 4ce96a48a1..866ca1117c 100644 --- a/assets/xml/objects/object_efc_erupc.xml +++ b/assets/xml/objects/object_efc_erupc.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_fish.xml b/assets/xml/objects/object_fish.xml index 2555f69b00..62a86c0e9d 100644 --- a/assets/xml/objects/object_fish.xml +++ b/assets/xml/objects/object_fish.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_fz.xml b/assets/xml/objects/object_fz.xml index 02f6b31076..5f3a5095ba 100644 --- a/assets/xml/objects/object_fz.xml +++ b/assets/xml/objects/object_fz.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_arrow.xml b/assets/xml/objects/object_gi_arrow.xml index 2520338cf9..b2db5f16c5 100644 --- a/assets/xml/objects/object_gi_arrow.xml +++ b/assets/xml/objects/object_gi_arrow.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_arrowcase.xml b/assets/xml/objects/object_gi_arrowcase.xml index 51c1af83ad..5c635b57fe 100644 --- a/assets/xml/objects/object_gi_arrowcase.xml +++ b/assets/xml/objects/object_gi_arrowcase.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_bean.xml b/assets/xml/objects/object_gi_bean.xml index 2091fb3362..59159e1180 100644 --- a/assets/xml/objects/object_gi_bean.xml +++ b/assets/xml/objects/object_gi_bean.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_bomb_1.xml b/assets/xml/objects/object_gi_bomb_1.xml index 13188d0bba..6293a8af0f 100644 --- a/assets/xml/objects/object_gi_bomb_1.xml +++ b/assets/xml/objects/object_gi_bomb_1.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_bomb_2.xml b/assets/xml/objects/object_gi_bomb_2.xml index 35cad2512b..cebc04d078 100644 --- a/assets/xml/objects/object_gi_bomb_2.xml +++ b/assets/xml/objects/object_gi_bomb_2.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_bombpouch.xml b/assets/xml/objects/object_gi_bombpouch.xml index 09cfdea364..e478078195 100644 --- a/assets/xml/objects/object_gi_bombpouch.xml +++ b/assets/xml/objects/object_gi_bombpouch.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_boomerang.xml b/assets/xml/objects/object_gi_boomerang.xml index df0b013d31..5c5d7301c3 100644 --- a/assets/xml/objects/object_gi_boomerang.xml +++ b/assets/xml/objects/object_gi_boomerang.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_boots_2.xml b/assets/xml/objects/object_gi_boots_2.xml index 02884d5b5d..9cca688c39 100644 --- a/assets/xml/objects/object_gi_boots_2.xml +++ b/assets/xml/objects/object_gi_boots_2.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_bosskey.xml b/assets/xml/objects/object_gi_bosskey.xml index 5c986e3dbb..c737de1dd9 100644 --- a/assets/xml/objects/object_gi_bosskey.xml +++ b/assets/xml/objects/object_gi_bosskey.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_bottle.xml b/assets/xml/objects/object_gi_bottle.xml index 809ba8a67f..2221b13aa2 100644 --- a/assets/xml/objects/object_gi_bottle.xml +++ b/assets/xml/objects/object_gi_bottle.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_bottle_letter.xml b/assets/xml/objects/object_gi_bottle_letter.xml index 27cfb67681..c0fa7e8143 100644 --- a/assets/xml/objects/object_gi_bottle_letter.xml +++ b/assets/xml/objects/object_gi_bottle_letter.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_bow.xml b/assets/xml/objects/object_gi_bow.xml index 2ae89e04c5..0c740f3033 100644 --- a/assets/xml/objects/object_gi_bow.xml +++ b/assets/xml/objects/object_gi_bow.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_bracelet.xml b/assets/xml/objects/object_gi_bracelet.xml index 4b18e3f796..4fa21e3455 100644 --- a/assets/xml/objects/object_gi_bracelet.xml +++ b/assets/xml/objects/object_gi_bracelet.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_brokensword.xml b/assets/xml/objects/object_gi_brokensword.xml index 4c907e9778..d77475f1b8 100644 --- a/assets/xml/objects/object_gi_brokensword.xml +++ b/assets/xml/objects/object_gi_brokensword.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_butterfly.xml b/assets/xml/objects/object_gi_butterfly.xml index aa7cc59c78..4574be9d19 100644 --- a/assets/xml/objects/object_gi_butterfly.xml +++ b/assets/xml/objects/object_gi_butterfly.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_coin.xml b/assets/xml/objects/object_gi_coin.xml index a8eecbad11..fc2660d095 100644 --- a/assets/xml/objects/object_gi_coin.xml +++ b/assets/xml/objects/object_gi_coin.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_compass.xml b/assets/xml/objects/object_gi_compass.xml index 1e7c5cf758..a0e0ce6966 100644 --- a/assets/xml/objects/object_gi_compass.xml +++ b/assets/xml/objects/object_gi_compass.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_dekupouch.xml b/assets/xml/objects/object_gi_dekupouch.xml index dc8469e750..30db99967c 100644 --- a/assets/xml/objects/object_gi_dekupouch.xml +++ b/assets/xml/objects/object_gi_dekupouch.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_egg.xml b/assets/xml/objects/object_gi_egg.xml index 370cd82a5c..e9b4909f62 100644 --- a/assets/xml/objects/object_gi_egg.xml +++ b/assets/xml/objects/object_gi_egg.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_eye_lotion.xml b/assets/xml/objects/object_gi_eye_lotion.xml index 3cd8c16b81..8f3f89ae8f 100644 --- a/assets/xml/objects/object_gi_eye_lotion.xml +++ b/assets/xml/objects/object_gi_eye_lotion.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_fire.xml b/assets/xml/objects/object_gi_fire.xml index 671bf3362d..64588486c6 100644 --- a/assets/xml/objects/object_gi_fire.xml +++ b/assets/xml/objects/object_gi_fire.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_fish.xml b/assets/xml/objects/object_gi_fish.xml index 8b932135f7..c701eaf2cd 100644 --- a/assets/xml/objects/object_gi_fish.xml +++ b/assets/xml/objects/object_gi_fish.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_frog.xml b/assets/xml/objects/object_gi_frog.xml index 577f1dd0b6..c9a9f3cf3a 100644 --- a/assets/xml/objects/object_gi_frog.xml +++ b/assets/xml/objects/object_gi_frog.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_gerudo.xml b/assets/xml/objects/object_gi_gerudo.xml index 72b320aeb4..ae80fe88b0 100644 --- a/assets/xml/objects/object_gi_gerudo.xml +++ b/assets/xml/objects/object_gi_gerudo.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_gerudomask.xml b/assets/xml/objects/object_gi_gerudomask.xml index 9debfa88f1..57da5cb619 100644 --- a/assets/xml/objects/object_gi_gerudomask.xml +++ b/assets/xml/objects/object_gi_gerudomask.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_ghost.xml b/assets/xml/objects/object_gi_ghost.xml index 786b50521b..3b2830c5ed 100644 --- a/assets/xml/objects/object_gi_ghost.xml +++ b/assets/xml/objects/object_gi_ghost.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_glasses.xml b/assets/xml/objects/object_gi_glasses.xml index 756fce9090..ec7744a5fd 100644 --- a/assets/xml/objects/object_gi_glasses.xml +++ b/assets/xml/objects/object_gi_glasses.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_gloves.xml b/assets/xml/objects/object_gi_gloves.xml index 2e87b97f7e..5dd9887123 100644 --- a/assets/xml/objects/object_gi_gloves.xml +++ b/assets/xml/objects/object_gi_gloves.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_goddess.xml b/assets/xml/objects/object_gi_goddess.xml index f45faa4245..072a32ecdd 100644 --- a/assets/xml/objects/object_gi_goddess.xml +++ b/assets/xml/objects/object_gi_goddess.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_grass.xml b/assets/xml/objects/object_gi_grass.xml index 3d2ee3bd61..5e7b6c92d8 100644 --- a/assets/xml/objects/object_gi_grass.xml +++ b/assets/xml/objects/object_gi_grass.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_hammer.xml b/assets/xml/objects/object_gi_hammer.xml index d592e6b4ba..95448b01e5 100644 --- a/assets/xml/objects/object_gi_hammer.xml +++ b/assets/xml/objects/object_gi_hammer.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_heart.xml b/assets/xml/objects/object_gi_heart.xml index b861897573..2db6b8396a 100644 --- a/assets/xml/objects/object_gi_heart.xml +++ b/assets/xml/objects/object_gi_heart.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_hearts.xml b/assets/xml/objects/object_gi_hearts.xml index 569d814982..29463b10b6 100644 --- a/assets/xml/objects/object_gi_hearts.xml +++ b/assets/xml/objects/object_gi_hearts.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_hookshot.xml b/assets/xml/objects/object_gi_hookshot.xml index d8a2bacae1..f568f10a2c 100644 --- a/assets/xml/objects/object_gi_hookshot.xml +++ b/assets/xml/objects/object_gi_hookshot.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_hoverboots.xml b/assets/xml/objects/object_gi_hoverboots.xml index 78a96c353c..138e6848e8 100644 --- a/assets/xml/objects/object_gi_hoverboots.xml +++ b/assets/xml/objects/object_gi_hoverboots.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_insect.xml b/assets/xml/objects/object_gi_insect.xml index 4bd5cca1c0..5923d4351e 100644 --- a/assets/xml/objects/object_gi_insect.xml +++ b/assets/xml/objects/object_gi_insect.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_jewel.xml b/assets/xml/objects/object_gi_jewel.xml index c433207657..e0c3a0a3a0 100644 --- a/assets/xml/objects/object_gi_jewel.xml +++ b/assets/xml/objects/object_gi_jewel.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_key.xml b/assets/xml/objects/object_gi_key.xml index be1af7f8d4..18c6c41584 100644 --- a/assets/xml/objects/object_gi_key.xml +++ b/assets/xml/objects/object_gi_key.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_ki_tan_mask.xml b/assets/xml/objects/object_gi_ki_tan_mask.xml index 85565241e8..36b24288b2 100644 --- a/assets/xml/objects/object_gi_ki_tan_mask.xml +++ b/assets/xml/objects/object_gi_ki_tan_mask.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_liquid.xml b/assets/xml/objects/object_gi_liquid.xml index b91c58cd9f..8f859495fa 100644 --- a/assets/xml/objects/object_gi_liquid.xml +++ b/assets/xml/objects/object_gi_liquid.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_longsword.xml b/assets/xml/objects/object_gi_longsword.xml index 360a678449..bbf33aae74 100644 --- a/assets/xml/objects/object_gi_longsword.xml +++ b/assets/xml/objects/object_gi_longsword.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_m_arrow.xml b/assets/xml/objects/object_gi_m_arrow.xml index 774e73f8f1..2155c96e35 100644 --- a/assets/xml/objects/object_gi_m_arrow.xml +++ b/assets/xml/objects/object_gi_m_arrow.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_magicpot.xml b/assets/xml/objects/object_gi_magicpot.xml index feeda1510a..dd54e80c49 100644 --- a/assets/xml/objects/object_gi_magicpot.xml +++ b/assets/xml/objects/object_gi_magicpot.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_map.xml b/assets/xml/objects/object_gi_map.xml index 6812dbe518..6f1e3f5685 100644 --- a/assets/xml/objects/object_gi_map.xml +++ b/assets/xml/objects/object_gi_map.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_medal.xml b/assets/xml/objects/object_gi_medal.xml index 2c10c57508..dbb508ed96 100644 --- a/assets/xml/objects/object_gi_medal.xml +++ b/assets/xml/objects/object_gi_medal.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_melody.xml b/assets/xml/objects/object_gi_melody.xml index c91a293863..9908dc2030 100644 --- a/assets/xml/objects/object_gi_melody.xml +++ b/assets/xml/objects/object_gi_melody.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_milk.xml b/assets/xml/objects/object_gi_milk.xml index 5c976cd4ff..ea6908bcbb 100644 --- a/assets/xml/objects/object_gi_milk.xml +++ b/assets/xml/objects/object_gi_milk.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_mushroom.xml b/assets/xml/objects/object_gi_mushroom.xml index 8cb47aa1cc..759e12dfa4 100644 --- a/assets/xml/objects/object_gi_mushroom.xml +++ b/assets/xml/objects/object_gi_mushroom.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_niwatori.xml b/assets/xml/objects/object_gi_niwatori.xml index 73e1e5bb33..2a18453e4c 100644 --- a/assets/xml/objects/object_gi_niwatori.xml +++ b/assets/xml/objects/object_gi_niwatori.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_nuts.xml b/assets/xml/objects/object_gi_nuts.xml index 03d4fcd86f..1ff8cf9a9e 100644 --- a/assets/xml/objects/object_gi_nuts.xml +++ b/assets/xml/objects/object_gi_nuts.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_ocarina.xml b/assets/xml/objects/object_gi_ocarina.xml index 5473b323ad..40a8827f62 100644 --- a/assets/xml/objects/object_gi_ocarina.xml +++ b/assets/xml/objects/object_gi_ocarina.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_ocarina_0.xml b/assets/xml/objects/object_gi_ocarina_0.xml index a17d7e5b82..89f8e89643 100644 --- a/assets/xml/objects/object_gi_ocarina_0.xml +++ b/assets/xml/objects/object_gi_ocarina_0.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_pachinko.xml b/assets/xml/objects/object_gi_pachinko.xml index 806f15c103..9a17048a8e 100644 --- a/assets/xml/objects/object_gi_pachinko.xml +++ b/assets/xml/objects/object_gi_pachinko.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_powder.xml b/assets/xml/objects/object_gi_powder.xml index a0a261b80d..835b4152b7 100644 --- a/assets/xml/objects/object_gi_powder.xml +++ b/assets/xml/objects/object_gi_powder.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_prescription.xml b/assets/xml/objects/object_gi_prescription.xml index e0ef1fc1ff..b7119e329f 100644 --- a/assets/xml/objects/object_gi_prescription.xml +++ b/assets/xml/objects/object_gi_prescription.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_rabit_mask.xml b/assets/xml/objects/object_gi_rabit_mask.xml index 838b032c78..215c8869d6 100644 --- a/assets/xml/objects/object_gi_rabit_mask.xml +++ b/assets/xml/objects/object_gi_rabit_mask.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_redead_mask.xml b/assets/xml/objects/object_gi_redead_mask.xml index 1b663c9b78..1ee2dc9dcb 100644 --- a/assets/xml/objects/object_gi_redead_mask.xml +++ b/assets/xml/objects/object_gi_redead_mask.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_rupy.xml b/assets/xml/objects/object_gi_rupy.xml index 815e4bf3f9..dd14ed8805 100644 --- a/assets/xml/objects/object_gi_rupy.xml +++ b/assets/xml/objects/object_gi_rupy.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_saw.xml b/assets/xml/objects/object_gi_saw.xml index 2bc5e11730..3cf6582472 100644 --- a/assets/xml/objects/object_gi_saw.xml +++ b/assets/xml/objects/object_gi_saw.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_scale.xml b/assets/xml/objects/object_gi_scale.xml index 3b227756ee..9c798dc364 100644 --- a/assets/xml/objects/object_gi_scale.xml +++ b/assets/xml/objects/object_gi_scale.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_seed.xml b/assets/xml/objects/object_gi_seed.xml index 9159d8dda0..fa02c2adcc 100644 --- a/assets/xml/objects/object_gi_seed.xml +++ b/assets/xml/objects/object_gi_seed.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_shield_1.xml b/assets/xml/objects/object_gi_shield_1.xml index 0bff097641..1957b4bb82 100644 --- a/assets/xml/objects/object_gi_shield_1.xml +++ b/assets/xml/objects/object_gi_shield_1.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_shield_2.xml b/assets/xml/objects/object_gi_shield_2.xml index eeff7a3dd0..69a09a2705 100644 --- a/assets/xml/objects/object_gi_shield_2.xml +++ b/assets/xml/objects/object_gi_shield_2.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_shield_3.xml b/assets/xml/objects/object_gi_shield_3.xml index 1411bf0f15..8fbb6e4fae 100644 --- a/assets/xml/objects/object_gi_shield_3.xml +++ b/assets/xml/objects/object_gi_shield_3.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_skj_mask.xml b/assets/xml/objects/object_gi_skj_mask.xml index eec3493c3d..d310c2cc87 100644 --- a/assets/xml/objects/object_gi_skj_mask.xml +++ b/assets/xml/objects/object_gi_skj_mask.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_soul.xml b/assets/xml/objects/object_gi_soul.xml index 5fa19ad992..6191e465e4 100644 --- a/assets/xml/objects/object_gi_soul.xml +++ b/assets/xml/objects/object_gi_soul.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_stick.xml b/assets/xml/objects/object_gi_stick.xml index 84e2cdd8c3..590ad27210 100644 --- a/assets/xml/objects/object_gi_stick.xml +++ b/assets/xml/objects/object_gi_stick.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_sutaru.xml b/assets/xml/objects/object_gi_sutaru.xml index 87169b9c19..cf4cb816cc 100644 --- a/assets/xml/objects/object_gi_sutaru.xml +++ b/assets/xml/objects/object_gi_sutaru.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_sword_1.xml b/assets/xml/objects/object_gi_sword_1.xml index 341bf77b1e..a8cda5689e 100644 --- a/assets/xml/objects/object_gi_sword_1.xml +++ b/assets/xml/objects/object_gi_sword_1.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_ticketstone.xml b/assets/xml/objects/object_gi_ticketstone.xml index d1059ed0a6..cef11b25ab 100644 --- a/assets/xml/objects/object_gi_ticketstone.xml +++ b/assets/xml/objects/object_gi_ticketstone.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_gi_truth_mask.xml b/assets/xml/objects/object_gi_truth_mask.xml index 140b182597..522d9712a7 100644 --- a/assets/xml/objects/object_gi_truth_mask.xml +++ b/assets/xml/objects/object_gi_truth_mask.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_god_lgt.xml b/assets/xml/objects/object_god_lgt.xml index 98fbd9f370..6feb5f0bb5 100644 --- a/assets/xml/objects/object_god_lgt.xml +++ b/assets/xml/objects/object_god_lgt.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_kanban.xml b/assets/xml/objects/object_kanban.xml index faa7f7ce38..c2f47a155d 100644 --- a/assets/xml/objects/object_kanban.xml +++ b/assets/xml/objects/object_kanban.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_kusa.xml b/assets/xml/objects/object_kusa.xml index 3b9ee43c6c..5385cb7325 100644 --- a/assets/xml/objects/object_kusa.xml +++ b/assets/xml/objects/object_kusa.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_link_boy.xml b/assets/xml/objects/object_link_boy.xml index ed113ef732..63135000b8 100644 --- a/assets/xml/objects/object_link_boy.xml +++ b/assets/xml/objects/object_link_boy.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml index 3d4c48fdc0..fcb630e179 100644 --- a/assets/xml/objects/object_link_child.xml +++ b/assets/xml/objects/object_link_child.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_medal.xml b/assets/xml/objects/object_medal.xml index badeb05323..2e6a1548a4 100644 --- a/assets/xml/objects/object_medal.xml +++ b/assets/xml/objects/object_medal.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_nwc.xml b/assets/xml/objects/object_nwc.xml index e93aa22c08..2b77e2f818 100644 --- a/assets/xml/objects/object_nwc.xml +++ b/assets/xml/objects/object_nwc.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_ny.xml b/assets/xml/objects/object_ny.xml index 631db9c505..4501e06494 100644 --- a/assets/xml/objects/object_ny.xml +++ b/assets/xml/objects/object_ny.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_po_composer.xml b/assets/xml/objects/object_po_composer.xml index 1e1d79c73f..b02f73dbe4 100644 --- a/assets/xml/objects/object_po_composer.xml +++ b/assets/xml/objects/object_po_composer.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_po_field.xml b/assets/xml/objects/object_po_field.xml index 542c387bcf..ab12826578 100644 --- a/assets/xml/objects/object_po_field.xml +++ b/assets/xml/objects/object_po_field.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_poh.xml b/assets/xml/objects/object_poh.xml index 96c7e08182..90a57ae1cb 100644 --- a/assets/xml/objects/object_poh.xml +++ b/assets/xml/objects/object_poh.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_ps.xml b/assets/xml/objects/object_ps.xml index c37b898653..723024f541 100644 --- a/assets/xml/objects/object_ps.xml +++ b/assets/xml/objects/object_ps.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_sb.xml b/assets/xml/objects/object_sb.xml index 0df0f4de30..22ec621b55 100644 --- a/assets/xml/objects/object_sb.xml +++ b/assets/xml/objects/object_sb.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_siofuki.xml b/assets/xml/objects/object_siofuki.xml index 5b4764d9cf..2e4f9a00d3 100644 --- a/assets/xml/objects/object_siofuki.xml +++ b/assets/xml/objects/object_siofuki.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_sst.xml b/assets/xml/objects/object_sst.xml index 378351b220..aa3c7d7d17 100644 --- a/assets/xml/objects/object_sst.xml +++ b/assets/xml/objects/object_sst.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml index 3d8617116d..8c5ab10e90 100644 --- a/assets/xml/objects/object_st.xml +++ b/assets/xml/objects/object_st.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_stream.xml b/assets/xml/objects/object_stream.xml index cd9ab07636..6cbd11c46d 100644 --- a/assets/xml/objects/object_stream.xml +++ b/assets/xml/objects/object_stream.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_syokudai.xml b/assets/xml/objects/object_syokudai.xml index c1670edece..11af7e9a3a 100644 --- a/assets/xml/objects/object_syokudai.xml +++ b/assets/xml/objects/object_syokudai.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_toki_objects.xml b/assets/xml/objects/object_toki_objects.xml index fe22dcca08..562eba17bf 100644 --- a/assets/xml/objects/object_toki_objects.xml +++ b/assets/xml/objects/object_toki_objects.xml @@ -1,5 +1,5 @@  - + diff --git a/assets/xml/objects/object_trap.xml b/assets/xml/objects/object_trap.xml index 5c462a3127..fdb127735c 100644 --- a/assets/xml/objects/object_trap.xml +++ b/assets/xml/objects/object_trap.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_wood02.xml b/assets/xml/objects/object_wood02.xml index 47ec342caa..5dd80a17b6 100644 --- a/assets/xml/objects/object_wood02.xml +++ b/assets/xml/objects/object_wood02.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_ydan_objects.xml b/assets/xml/objects/object_ydan_objects.xml index 5c2c27a05a..a245165d2e 100644 --- a/assets/xml/objects/object_ydan_objects.xml +++ b/assets/xml/objects/object_ydan_objects.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_zf.xml b/assets/xml/objects/object_zf.xml index c5c79c7cca..7779fa2e1f 100644 --- a/assets/xml/objects/object_zf.xml +++ b/assets/xml/objects/object_zf.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml index e362c45f77..3cfcde6fd7 100644 --- a/assets/xml/objects/object_zo.xml +++ b/assets/xml/objects/object_zo.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_Boss_Ganon.xml b/assets/xml/overlays/ovl_Boss_Ganon.xml index 953ecbac46..ea546035a7 100644 --- a/assets/xml/overlays/ovl_Boss_Ganon.xml +++ b/assets/xml/overlays/ovl_Boss_Ganon.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_Boss_Ganon2.xml b/assets/xml/overlays/ovl_Boss_Ganon2.xml index cbb8389968..66fd5bbf6f 100644 --- a/assets/xml/overlays/ovl_Boss_Ganon2.xml +++ b/assets/xml/overlays/ovl_Boss_Ganon2.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_Magic_Dark.xml b/assets/xml/overlays/ovl_Magic_Dark.xml index b7247fefba..874150ab35 100644 --- a/assets/xml/overlays/ovl_Magic_Dark.xml +++ b/assets/xml/overlays/ovl_Magic_Dark.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_Oceff_Storm.xml b/assets/xml/overlays/ovl_Oceff_Storm.xml index 59aaaf6ad6..5893b6f8e8 100644 --- a/assets/xml/overlays/ovl_Oceff_Storm.xml +++ b/assets/xml/overlays/ovl_Oceff_Storm.xml @@ -1,5 +1,5 @@ - + diff --git a/assets/xml/overlays/ovl_Oceff_Wipe4.xml b/assets/xml/overlays/ovl_Oceff_Wipe4.xml index 07a3e8fbc4..b2be9073a4 100644 --- a/assets/xml/overlays/ovl_Oceff_Wipe4.xml +++ b/assets/xml/overlays/ovl_Oceff_Wipe4.xml @@ -1,5 +1,5 @@ - + diff --git a/docs/tutorial/object_decomp.md b/docs/tutorial/object_decomp.md index a386d8d962..480e00cd2f 100644 --- a/docs/tutorial/object_decomp.md +++ b/docs/tutorial/object_decomp.md @@ -128,7 +128,7 @@ number 6 Now, add ```c -#include "objects/object_name/object_name.h" +#include "assets/objects/object_name/object_name.h" ``` to every actor that uses the file, to tell it about the new symbols you have defined. diff --git a/include/message_data_static.h b/include/message_data_static.h index 2d16f0dbab..20427197fe 100644 --- a/include/message_data_static.h +++ b/include/message_data_static.h @@ -38,7 +38,7 @@ typedef struct { #define DEFINE_MESSAGE(textId, type, yPos, staffMessage) \ extern const char _message_##textId##_staff[]; -#include "text/message_data_staff.h" +#include "assets/text/message_data_staff.h" #undef DEFINE_MESSAGE @@ -47,7 +47,7 @@ typedef struct { extern const char _message_##textId##_ger[]; \ extern const char _message_##textId##_fra[]; -#include "text/message_data.h" +#include "assets/text/message_data.h" extern const char _message_0xFFFC_nes[]; #undef DEFINE_MESSAGE diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c index 68c51e7e2a..4acd8b4b8b 100644 --- a/src/code/code_80097A00.c +++ b/src/code/code_80097A00.c @@ -1,7 +1,7 @@ #include "global.h" -#include "textures/icon_item_static/icon_item_static.h" -#include "textures/icon_item_24_static/icon_item_24_static.h" -#include "textures/parameter_static/parameter_static.h" +#include "assets/textures/icon_item_static/icon_item_static.h" +#include "assets/textures/icon_item_24_static/icon_item_24_static.h" +#include "assets/textures/parameter_static/parameter_static.h" // Bit Flag array in which gBitFlags[n] is literally (1 << n) u32 gBitFlags[] = { diff --git a/src/code/z_actor.c b/src/code/z_actor.c index b3d0cdbd85..f8253699d3 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3,9 +3,9 @@ #include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h" #include "overlays/actors/ovl_En_Part/z_en_part.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#include "objects/object_bdoor/object_bdoor.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/object_bdoor/object_bdoor.h" static CollisionPoly* sCurCeilingPoly; static s32 sCurCeilingBgId; diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index cc9932d90b..62c52acbd8 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -1,5 +1,5 @@ #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" typedef struct { /* 0x00 */ s16 drawType; // indicates which draw function to use when displaying the object diff --git a/src/code/z_demo.c b/src/code/z_demo.c index f5b730a0e8..33cc69b971 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1,33 +1,33 @@ #include "global.h" #include "z64camera.h" -#include "scenes/indoors/tokinoma/tokinoma_scene.h" -#include "scenes/overworld/spot00/spot00_scene.h" -#include "scenes/overworld/spot01/spot01_scene.h" -#include "scenes/overworld/spot02/spot02_scene.h" -#include "scenes/overworld/spot04/spot04_scene.h" -#include "scenes/overworld/spot05/spot05_scene.h" -#include "scenes/overworld/spot06/spot06_scene.h" -#include "scenes/overworld/spot07/spot07_scene.h" -#include "scenes/overworld/spot08/spot08_scene.h" -#include "scenes/overworld/spot09/spot09_scene.h" -#include "scenes/overworld/spot11/spot11_scene.h" -#include "scenes/overworld/spot12/spot12_scene.h" -#include "scenes/overworld/spot15/spot15_scene.h" -#include "scenes/overworld/spot16/spot16_scene.h" -#include "scenes/overworld/spot17/spot17_scene.h" -#include "scenes/overworld/spot18/spot18_scene.h" -#include "scenes/overworld/spot20/spot20_scene.h" +#include "assets/scenes/indoors/tokinoma/tokinoma_scene.h" +#include "assets/scenes/overworld/spot00/spot00_scene.h" +#include "assets/scenes/overworld/spot01/spot01_scene.h" +#include "assets/scenes/overworld/spot02/spot02_scene.h" +#include "assets/scenes/overworld/spot04/spot04_scene.h" +#include "assets/scenes/overworld/spot05/spot05_scene.h" +#include "assets/scenes/overworld/spot06/spot06_scene.h" +#include "assets/scenes/overworld/spot07/spot07_scene.h" +#include "assets/scenes/overworld/spot08/spot08_scene.h" +#include "assets/scenes/overworld/spot09/spot09_scene.h" +#include "assets/scenes/overworld/spot11/spot11_scene.h" +#include "assets/scenes/overworld/spot12/spot12_scene.h" +#include "assets/scenes/overworld/spot15/spot15_scene.h" +#include "assets/scenes/overworld/spot16/spot16_scene.h" +#include "assets/scenes/overworld/spot17/spot17_scene.h" +#include "assets/scenes/overworld/spot18/spot18_scene.h" +#include "assets/scenes/overworld/spot20/spot20_scene.h" -#include "scenes/dungeons/bdan/bdan_scene.h" -#include "scenes/dungeons/ddan/ddan_scene.h" -#include "scenes/dungeons/ydan/ydan_scene.h" -#include "scenes/dungeons/ganontika/ganontika_scene.h" -#include "scenes/dungeons/ganon_tou/ganon_tou_scene.h" -#include "scenes/dungeons/jyasinboss/jyasinboss_scene.h" -#include "scenes/dungeons/ice_doukutu/ice_doukutu_scene.h" +#include "assets/scenes/dungeons/bdan/bdan_scene.h" +#include "assets/scenes/dungeons/ddan/ddan_scene.h" +#include "assets/scenes/dungeons/ydan/ydan_scene.h" +#include "assets/scenes/dungeons/ganontika/ganontika_scene.h" +#include "assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h" +#include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h" +#include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h" -#include "scenes/misc/hakaana_ouke/hakaana_ouke_scene.h" +#include "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h" u16 D_8011E1C0 = 0; u16 D_8011E1C4 = 0; diff --git a/src/code/z_draw.c b/src/code/z_draw.c index b3e2d2a8d9..0b541ec17e 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -1,82 +1,82 @@ #include "global.h" -#include "objects/object_gi_key/object_gi_key.h" -#include "objects/object_gi_jewel/object_gi_jewel.h" -#include "objects/object_gi_melody/object_gi_melody.h" -#include "objects/object_gi_heart/object_gi_heart.h" -#include "objects/object_gi_compass/object_gi_compass.h" -#include "objects/object_gi_bosskey/object_gi_bosskey.h" -#include "objects/object_gi_medal/object_gi_medal.h" -#include "objects/object_gi_nuts/object_gi_nuts.h" -#include "objects/object_gi_hearts/object_gi_hearts.h" -#include "objects/object_gi_arrowcase/object_gi_arrowcase.h" -#include "objects/object_gi_bombpouch/object_gi_bombpouch.h" -#include "objects/object_gi_bottle/object_gi_bottle.h" -#include "objects/object_gi_stick/object_gi_stick.h" -#include "objects/object_gi_map/object_gi_map.h" -#include "objects/object_gi_shield_1/object_gi_shield_1.h" -#include "objects/object_gi_magicpot/object_gi_magicpot.h" -#include "objects/object_gi_bomb_1/object_gi_bomb_1.h" -#include "objects/object_gi_purse/object_gi_purse.h" -#include "objects/object_gi_gerudo/object_gi_gerudo.h" -#include "objects/object_gi_arrow/object_gi_arrow.h" -#include "objects/object_gi_bomb_2/object_gi_bomb_2.h" -#include "objects/object_gi_egg/object_gi_egg.h" -#include "objects/object_gi_scale/object_gi_scale.h" -#include "objects/object_gi_shield_2/object_gi_shield_2.h" -#include "objects/object_gi_hookshot/object_gi_hookshot.h" -#include "objects/object_gi_ocarina/object_gi_ocarina.h" -#include "objects/object_gi_milk/object_gi_milk.h" -#include "objects/object_gi_pachinko/object_gi_pachinko.h" -#include "objects/object_gi_boomerang/object_gi_boomerang.h" -#include "objects/object_gi_bow/object_gi_bow.h" -#include "objects/object_gi_glasses/object_gi_glasses.h" -#include "objects/object_gi_liquid/object_gi_liquid.h" -#include "objects/object_gi_shield_3/object_gi_shield_3.h" -#include "objects/object_gi_letter/object_gi_letter.h" -#include "objects/object_gi_clothes/object_gi_clothes.h" -#include "objects/object_gi_bean/object_gi_bean.h" -#include "objects/object_gi_fish/object_gi_fish.h" -#include "objects/object_gi_saw/object_gi_saw.h" -#include "objects/object_gi_hammer/object_gi_hammer.h" -#include "objects/object_gi_grass/object_gi_grass.h" -#include "objects/object_gi_longsword/object_gi_longsword.h" -#include "objects/object_gi_niwatori/object_gi_niwatori.h" -#include "objects/object_gi_bottle_letter/object_gi_bottle_letter.h" -#include "objects/object_gi_ocarina_0/object_gi_ocarina_0.h" -#include "objects/object_gi_boots_2/object_gi_boots_2.h" -#include "objects/object_gi_seed/object_gi_seed.h" -#include "objects/object_gi_gloves/object_gi_gloves.h" -#include "objects/object_gi_coin/object_gi_coin.h" -#include "objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h" -#include "objects/object_gi_redead_mask/object_gi_redead_mask.h" -#include "objects/object_gi_skj_mask/object_gi_skj_mask.h" -#include "objects/object_gi_rabit_mask/object_gi_rabit_mask.h" -#include "objects/object_gi_truth_mask/object_gi_truth_mask.h" -#include "objects/object_gi_eye_lotion/object_gi_eye_lotion.h" -#include "objects/object_gi_powder/object_gi_powder.h" -#include "objects/object_gi_mushroom/object_gi_mushroom.h" -#include "objects/object_gi_ticketstone/object_gi_ticketstone.h" -#include "objects/object_gi_brokensword/object_gi_brokensword.h" -#include "objects/object_gi_prescription/object_gi_prescription.h" -#include "objects/object_gi_bracelet/object_gi_bracelet.h" -#include "objects/object_gi_soldout/object_gi_soldout.h" -#include "objects/object_gi_frog/object_gi_frog.h" -#include "objects/object_gi_golonmask/object_gi_golonmask.h" -#include "objects/object_gi_zoramask/object_gi_zoramask.h" -#include "objects/object_gi_gerudomask/object_gi_gerudomask.h" -#include "objects/object_gi_hoverboots/object_gi_hoverboots.h" -#include "objects/object_gi_m_arrow/object_gi_m_arrow.h" -#include "objects/object_gi_sutaru/object_gi_sutaru.h" -#include "objects/object_gi_goddess/object_gi_goddess.h" -#include "objects/object_gi_fire/object_gi_fire.h" -#include "objects/object_gi_insect/object_gi_insect.h" -#include "objects/object_gi_butterfly/object_gi_butterfly.h" -#include "objects/object_gi_ghost/object_gi_ghost.h" -#include "objects/object_gi_soul/object_gi_soul.h" -#include "objects/object_gi_dekupouch/object_gi_dekupouch.h" -#include "objects/object_gi_rupy/object_gi_rupy.h" -#include "objects/object_gi_sword_1/object_gi_sword_1.h" -#include "objects/object_st/object_st.h" +#include "assets/objects/object_gi_key/object_gi_key.h" +#include "assets/objects/object_gi_jewel/object_gi_jewel.h" +#include "assets/objects/object_gi_melody/object_gi_melody.h" +#include "assets/objects/object_gi_heart/object_gi_heart.h" +#include "assets/objects/object_gi_compass/object_gi_compass.h" +#include "assets/objects/object_gi_bosskey/object_gi_bosskey.h" +#include "assets/objects/object_gi_medal/object_gi_medal.h" +#include "assets/objects/object_gi_nuts/object_gi_nuts.h" +#include "assets/objects/object_gi_hearts/object_gi_hearts.h" +#include "assets/objects/object_gi_arrowcase/object_gi_arrowcase.h" +#include "assets/objects/object_gi_bombpouch/object_gi_bombpouch.h" +#include "assets/objects/object_gi_bottle/object_gi_bottle.h" +#include "assets/objects/object_gi_stick/object_gi_stick.h" +#include "assets/objects/object_gi_map/object_gi_map.h" +#include "assets/objects/object_gi_shield_1/object_gi_shield_1.h" +#include "assets/objects/object_gi_magicpot/object_gi_magicpot.h" +#include "assets/objects/object_gi_bomb_1/object_gi_bomb_1.h" +#include "assets/objects/object_gi_purse/object_gi_purse.h" +#include "assets/objects/object_gi_gerudo/object_gi_gerudo.h" +#include "assets/objects/object_gi_arrow/object_gi_arrow.h" +#include "assets/objects/object_gi_bomb_2/object_gi_bomb_2.h" +#include "assets/objects/object_gi_egg/object_gi_egg.h" +#include "assets/objects/object_gi_scale/object_gi_scale.h" +#include "assets/objects/object_gi_shield_2/object_gi_shield_2.h" +#include "assets/objects/object_gi_hookshot/object_gi_hookshot.h" +#include "assets/objects/object_gi_ocarina/object_gi_ocarina.h" +#include "assets/objects/object_gi_milk/object_gi_milk.h" +#include "assets/objects/object_gi_pachinko/object_gi_pachinko.h" +#include "assets/objects/object_gi_boomerang/object_gi_boomerang.h" +#include "assets/objects/object_gi_bow/object_gi_bow.h" +#include "assets/objects/object_gi_glasses/object_gi_glasses.h" +#include "assets/objects/object_gi_liquid/object_gi_liquid.h" +#include "assets/objects/object_gi_shield_3/object_gi_shield_3.h" +#include "assets/objects/object_gi_letter/object_gi_letter.h" +#include "assets/objects/object_gi_clothes/object_gi_clothes.h" +#include "assets/objects/object_gi_bean/object_gi_bean.h" +#include "assets/objects/object_gi_fish/object_gi_fish.h" +#include "assets/objects/object_gi_saw/object_gi_saw.h" +#include "assets/objects/object_gi_hammer/object_gi_hammer.h" +#include "assets/objects/object_gi_grass/object_gi_grass.h" +#include "assets/objects/object_gi_longsword/object_gi_longsword.h" +#include "assets/objects/object_gi_niwatori/object_gi_niwatori.h" +#include "assets/objects/object_gi_bottle_letter/object_gi_bottle_letter.h" +#include "assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h" +#include "assets/objects/object_gi_boots_2/object_gi_boots_2.h" +#include "assets/objects/object_gi_seed/object_gi_seed.h" +#include "assets/objects/object_gi_gloves/object_gi_gloves.h" +#include "assets/objects/object_gi_coin/object_gi_coin.h" +#include "assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h" +#include "assets/objects/object_gi_redead_mask/object_gi_redead_mask.h" +#include "assets/objects/object_gi_skj_mask/object_gi_skj_mask.h" +#include "assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h" +#include "assets/objects/object_gi_truth_mask/object_gi_truth_mask.h" +#include "assets/objects/object_gi_eye_lotion/object_gi_eye_lotion.h" +#include "assets/objects/object_gi_powder/object_gi_powder.h" +#include "assets/objects/object_gi_mushroom/object_gi_mushroom.h" +#include "assets/objects/object_gi_ticketstone/object_gi_ticketstone.h" +#include "assets/objects/object_gi_brokensword/object_gi_brokensword.h" +#include "assets/objects/object_gi_prescription/object_gi_prescription.h" +#include "assets/objects/object_gi_bracelet/object_gi_bracelet.h" +#include "assets/objects/object_gi_soldout/object_gi_soldout.h" +#include "assets/objects/object_gi_frog/object_gi_frog.h" +#include "assets/objects/object_gi_golonmask/object_gi_golonmask.h" +#include "assets/objects/object_gi_zoramask/object_gi_zoramask.h" +#include "assets/objects/object_gi_gerudomask/object_gi_gerudomask.h" +#include "assets/objects/object_gi_hoverboots/object_gi_hoverboots.h" +#include "assets/objects/object_gi_m_arrow/object_gi_m_arrow.h" +#include "assets/objects/object_gi_sutaru/object_gi_sutaru.h" +#include "assets/objects/object_gi_goddess/object_gi_goddess.h" +#include "assets/objects/object_gi_fire/object_gi_fire.h" +#include "assets/objects/object_gi_insect/object_gi_insect.h" +#include "assets/objects/object_gi_butterfly/object_gi_butterfly.h" +#include "assets/objects/object_gi_ghost/object_gi_ghost.h" +#include "assets/objects/object_gi_soul/object_gi_soul.h" +#include "assets/objects/object_gi_dekupouch/object_gi_dekupouch.h" +#include "assets/objects/object_gi_rupy/object_gi_rupy.h" +#include "assets/objects/object_gi_sword_1/object_gi_sword_1.h" +#include "assets/objects/object_st/object_st.h" // "Get Item" Model Draw Functions void GetItem_DrawMaskOrBombchu(PlayState* play, s16 drawId); diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index fabc53e4de..89cbe5d7e6 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -1,5 +1,5 @@ #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 ae38df8deb..29a9e677c2 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -1,6 +1,6 @@ #include "global.h" #include "vt.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 8e1ea4325d..ad147c4288 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -1,5 +1,5 @@ #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 53cae48d77..e7243473b3 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -1,6 +1,6 @@ #include "global.h" #include "vt.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index f1fa31fca1..862b7c7eac 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1,6 +1,6 @@ #include "global.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #define FLAGS 0 diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c index 1fd6cabe27..4057d71d18 100644 --- a/src/code/z_fbdemo_circle.c +++ b/src/code/z_fbdemo_circle.c @@ -5,7 +5,7 @@ Gfx sCircleEmptyDList[] = { gsSPEndDisplayList(), }; -#include "code/fbdemo_circle/z_fbdemo_circle.c" +#include "assets/code/fbdemo_circle/z_fbdemo_circle.c" Gfx sCircleDList[] = { gsDPPipeSync(), diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c index 22cbf6c18c..fe7068f26b 100644 --- a/src/code/z_fbdemo_triforce.c +++ b/src/code/z_fbdemo_triforce.c @@ -1,6 +1,6 @@ #include "global.h" -#include "code/fbdemo_triforce/z_fbdemo_triforce.c" +#include "assets/code/fbdemo_triforce/z_fbdemo_triforce.c" void TransitionTriforce_Start(void* thisx) { TransitionTriforce* this = (TransitionTriforce*)thisx; diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c index 2acb836068..6a4d094477 100644 --- a/src/code/z_fbdemo_wipe1.c +++ b/src/code/z_fbdemo_wipe1.c @@ -1,6 +1,6 @@ #include "global.h" -#include "code/fbdemo_wipe1/z_fbdemo_wipe1.c" +#include "assets/code/fbdemo_wipe1/z_fbdemo_wipe1.c" Gfx sWipeDList[] = { gsDPPipeSync(), diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 72a21b76d5..45b7b58543 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -1,8 +1,8 @@ #include "global.h" #include "ultra64.h" #include "vt.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" typedef enum { /* 0x00 */ LIGHTNING_BOLT_START, diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 67b3a9103e..0614d6fc5d 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -1,5 +1,5 @@ #include "global.h" -#include "textures/parameter_static/parameter_static.h" +#include "assets/textures/parameter_static/parameter_static.h" static s16 sHeartsPrimColors[3][3] = { { HEARTS_PRIM_R, HEARTS_PRIM_G, HEARTS_PRIM_B }, diff --git a/src/code/z_lights.c b/src/code/z_lights.c index 18967a89de..3767e19dae 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -1,5 +1,5 @@ #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define LIGHTS_BUFFER_SIZE 32 diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index e14e1a870b..cd826c6e57 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -1,7 +1,7 @@ #include "global.h" #include "vt.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "textures/parameter_static/parameter_static.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/textures/parameter_static/parameter_static.h" MapData* gMapData; diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 1cc055a036..a267f7e567 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -1,6 +1,6 @@ #include "global.h" #include "vt.h" -#include "textures/parameter_static/parameter_static.h" +#include "assets/textures/parameter_static/parameter_static.h" typedef struct { /* 0x00 */ void* texture; diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index e29883ae53..23bef7df94 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -1,7 +1,7 @@ #include "global.h" #include "message_data_static.h" #include "vt.h" -#include "textures/parameter_static/parameter_static.h" +#include "assets/textures/parameter_static/parameter_static.h" s16 sTextFade = false; // original name: key_off_flag ? @@ -31,7 +31,7 @@ MessageTableEntry sNesMessageEntryTable[] = { #define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) \ { textId, (_SHIFTL(type, 4, 8) | _SHIFTL(yPos, 0, 8)), _message_##textId##_nes }, #define DEFINE_MESSAGE_FFFC -#include "text/message_data.h" +#include "assets/text/message_data.h" #undef DEFINE_MESSAGE_FFFC #undef DEFINE_MESSAGE { 0xFFFF, 0, NULL }, @@ -39,14 +39,14 @@ MessageTableEntry sNesMessageEntryTable[] = { const char* sGerMessageEntryTable[] = { #define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) _message_##textId##_ger, -#include "text/message_data.h" +#include "assets/text/message_data.h" #undef DEFINE_MESSAGE NULL, }; const char* sFraMessageEntryTable[] = { #define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) _message_##textId##_fra, -#include "text/message_data.h" +#include "assets/text/message_data.h" #undef DEFINE_MESSAGE NULL, }; @@ -54,7 +54,7 @@ const char* sFraMessageEntryTable[] = { MessageTableEntry sStaffMessageEntryTable[] = { #define DEFINE_MESSAGE(textId, type, yPos, staffMessage) \ { textId, (_SHIFTL(type, 4, 8) | _SHIFTL(yPos, 0, 8)), _message_##textId##_staff }, -#include "text/message_data_staff.h" +#include "assets/text/message_data_staff.h" #undef DEFINE_MESSAGE { 0xFFFF, 0, NULL }, }; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 9e4ba5d4ba..4ec18010da 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1,8 +1,8 @@ #include "global.h" #include "vt.h" -#include "textures/parameter_static/parameter_static.h" -#include "textures/do_action_static/do_action_static.h" -#include "textures/icon_item_static/icon_item_static.h" +#include "assets/textures/parameter_static/parameter_static.h" +#include "assets/textures/do_action_static/do_action_static.h" +#include "assets/textures/icon_item_static/icon_item_static.h" // TODO extract this information from the texture definitions themselves #define DO_ACTION_TEX_WIDTH 48 diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 9b04c8a587..118df8d660 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1,7 +1,7 @@ #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_link_boy/object_link_boy.h" -#include "objects/object_link_child/object_link_child.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_link_boy/object_link_boy.h" +#include "assets/objects/object_link_child/object_link_child.h" typedef struct { /* 0x00 */ u8 flag; diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index e6d9b4992c..1477c6d5ff 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -1,25 +1,25 @@ #include "global.h" -#include "scenes/overworld/spot00/spot00_scene.h" -#include "scenes/overworld/spot00/spot00_room_0.h" -#include "scenes/overworld/spot01/spot01_scene.h" -#include "scenes/overworld/spot07/spot07_scene.h" -#include "scenes/overworld/spot12/spot12_scene.h" -#include "scenes/overworld/spot16/spot16_scene.h" -#include "scenes/overworld/spot16/spot16_room_0.h" -#include "scenes/overworld/spot18/spot18_scene.h" -#include "scenes/overworld/spot20/spot20_scene.h" -#include "scenes/overworld/souko/souko_scene.h" +#include "assets/scenes/overworld/spot00/spot00_scene.h" +#include "assets/scenes/overworld/spot00/spot00_room_0.h" +#include "assets/scenes/overworld/spot01/spot01_scene.h" +#include "assets/scenes/overworld/spot07/spot07_scene.h" +#include "assets/scenes/overworld/spot12/spot12_scene.h" +#include "assets/scenes/overworld/spot16/spot16_scene.h" +#include "assets/scenes/overworld/spot16/spot16_room_0.h" +#include "assets/scenes/overworld/spot18/spot18_scene.h" +#include "assets/scenes/overworld/spot20/spot20_scene.h" +#include "assets/scenes/overworld/souko/souko_scene.h" -#include "scenes/dungeons/men/men_scene.h" -#include "scenes/dungeons/ddan/ddan_scene.h" -#include "scenes/dungeons/ydan/ydan_scene.h" -#include "scenes/dungeons/Bmori1/Bmori1_scene.h" -#include "scenes/dungeons/MIZUsin/MIZUsin_scene.h" -#include "scenes/dungeons/gerudoway/gerudoway_scene.h" -#include "scenes/dungeons/jyasinzou/jyasinzou_scene.h" -#include "scenes/indoors/miharigoya/miharigoya_scene.h" -#include "scenes/dungeons/ice_doukutu/ice_doukutu_scene.h" +#include "assets/scenes/dungeons/men/men_scene.h" +#include "assets/scenes/dungeons/ddan/ddan_scene.h" +#include "assets/scenes/dungeons/ydan/ydan_scene.h" +#include "assets/scenes/dungeons/Bmori1/Bmori1_scene.h" +#include "assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h" +#include "assets/scenes/dungeons/gerudoway/gerudoway_scene.h" +#include "assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h" +#include "assets/scenes/indoors/miharigoya/miharigoya_scene.h" +#include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h" #include "overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h" diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 40aee11dc2..01e8e6ea5f 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -1,5 +1,5 @@ #include "z_arms_hook.h" -#include "objects/object_link_boy/object_link_boy.h" +#include "assets/objects/object_link_boy/object_link_boy.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 52b9106955..410412c10c 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -18,7 +18,7 @@ void ArrowFire_Charge(ArrowFire* this, PlayState* play); void ArrowFire_Fly(ArrowFire* this, PlayState* play); void ArrowFire_Hit(ArrowFire* this, PlayState* play); -#include "overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c" +#include "assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c" const ActorInit Arrow_Fire_InitVars = { ACTOR_ARROW_FIRE, diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 03e54e7899..039fb69db0 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -19,7 +19,7 @@ void ArrowIce_Charge(ArrowIce* this, PlayState* play); void ArrowIce_Fly(ArrowIce* this, PlayState* play); void ArrowIce_Hit(ArrowIce* this, PlayState* play); -#include "overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c" +#include "assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c" const ActorInit Arrow_Ice_InitVars = { ACTOR_ARROW_ICE, diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index b1fa8c3e54..ab7bbf8533 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -19,7 +19,7 @@ void ArrowLight_Charge(ArrowLight* this, PlayState* play); void ArrowLight_Fly(ArrowLight* this, PlayState* play); void ArrowLight_Hit(ArrowLight* this, PlayState* play); -#include "overlays/ovl_Arrow_Light/ovl_Arrow_Light.c" +#include "assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.c" const ActorInit Arrow_Light_InitVars = { ACTOR_ARROW_LIGHT, diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 95a94a0210..271c012dc7 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -5,7 +5,7 @@ */ #include "z_bg_bdan_objects.h" -#include "objects/object_bdan_objects/object_bdan_objects.h" +#include "assets/objects/object_bdan_objects/object_bdan_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index 7b83409035..ca99d6376d 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -5,7 +5,7 @@ */ #include "z_bg_bdan_switch.h" -#include "objects/object_bdan_objects/object_bdan_objects.h" +#include "assets/objects/object_bdan_objects/object_bdan_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index 5af6850e5f..39c597f49c 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -6,7 +6,7 @@ #include "z_bg_bom_guard.h" #include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h" -#include "objects/object_bowl/object_bowl.h" +#include "assets/objects/object_bowl/object_bowl.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index a14c079143..22404a818e 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -5,7 +5,7 @@ */ #include "z_bg_bombwall.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS ACTOR_FLAG_22 diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index 8649691deb..35ef40e940 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -7,7 +7,7 @@ #include "z_bg_bowl_wall.h" #include "overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/object_bowl/object_bowl.h" +#include "assets/objects/object_bowl/object_bowl.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index 021a9abf50..6e34546e27 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -5,9 +5,9 @@ */ #include "z_bg_breakwall.h" -#include "scenes/dungeons/ddan/ddan_scene.h" -#include "objects/object_bwall/object_bwall.h" -#include "objects/object_kingdodongo/object_kingdodongo.h" +#include "assets/scenes/dungeons/ddan/ddan_scene.h" +#include "assets/objects/object_bwall/object_bwall.h" +#include "assets/objects/object_kingdodongo/object_kingdodongo.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index 36cc15538d..f5d84f45a2 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -5,7 +5,7 @@ */ #include "z_bg_ddan_jd.h" -#include "objects/object_ddan_objects/object_ddan_objects.h" +#include "assets/objects/object_ddan_objects/object_ddan_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index ea6d212fdb..bc77673f66 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -5,7 +5,7 @@ */ #include "z_bg_ddan_kd.h" -#include "objects/object_ddan_objects/object_ddan_objects.h" +#include "assets/objects/object_ddan_objects/object_ddan_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 424757045f..043d4dd68f 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -6,7 +6,7 @@ #include "z_bg_dodoago.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/object_ddan_objects/object_ddan_objects.h" +#include "assets/objects/object_ddan_objects/object_ddan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 0f7386a8a3..bcce86d943 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -5,11 +5,11 @@ */ #include "z_bg_dy_yoseizo.h" -#include "objects/object_dy_obj/object_dy_obj.h" +#include "assets/objects/object_dy_obj/object_dy_obj.h" #include "vt.h" #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" -#include "scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h" -#include "scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h" +#include "assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h" +#include "assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index 848340c3bc..0ddc5be0a3 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -63,7 +63,7 @@ static Vec3f sSideCenters[] = { static f32 sSideAngles[] = { M_PI / 2, -M_PI / 2, 0.0f, M_PI }; -#include "overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.c" +#include "assets/overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.c" void BgGanonOtyuka_Init(Actor* thisx, PlayState* play2) { BgGanonOtyuka* this = (BgGanonOtyuka*)thisx; diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index cfdce52a7a..f1ade5dc20 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -5,7 +5,7 @@ */ #include "z_bg_gate_shutter.h" -#include "objects/object_spot01_matoyab/object_spot01_matoyab.h" +#include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h" #include "vt.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 0a21481187..5418669f37 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -5,8 +5,8 @@ */ #include "z_bg_gjyo_bridge.h" -#include "objects/object_gjyo_objects/object_gjyo_objects.h" -#include "scenes/dungeons/ganon_tou/ganon_tou_scene.h" +#include "assets/objects/object_gjyo_objects/object_gjyo_objects.h" +#include "assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index 4621d2d615..c1ccffb60b 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -5,7 +5,7 @@ */ #include "z_bg_gnd_darkmeiro.h" -#include "objects/object_demo_kekkai/object_demo_kekkai.h" +#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index 24f96d9328..3df86910cf 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -5,7 +5,7 @@ */ #include "z_bg_gnd_firemeiro.h" -#include "objects/object_demo_kekkai/object_demo_kekkai.h" +#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index 36f70a7e7e..98e7404aa9 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -5,7 +5,7 @@ */ #include "z_bg_gnd_iceblock.h" -#include "objects/object_demo_kekkai/object_demo_kekkai.h" +#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c index 60fc8a4b3a..0e910ebcca 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c @@ -5,7 +5,7 @@ */ #include "z_bg_gnd_nisekabe.h" -#include "objects/object_demo_kekkai/object_demo_kekkai.h" +#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 1cf73cc659..ea30922849 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -5,7 +5,7 @@ */ #include "z_bg_gnd_soulmeiro.h" -#include "objects/object_demo_kekkai/object_demo_kekkai.h" +#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" #include "global.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index a4007711ae..0c84019793 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -5,7 +5,7 @@ */ #include "z_bg_haka.h" -#include "objects/object_haka/object_haka.h" +#include "assets/objects/object_haka/object_haka.h" #define FLAGS 0 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 a04ac943b5..b8fe94a57d 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 @@ -5,8 +5,8 @@ */ #include "z_bg_haka_gate.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_haka_objects/object_haka_objects.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_haka_objects/object_haka_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c index 08ce5d4d5d..3408efe8ff 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c @@ -5,7 +5,7 @@ */ #include "z_bg_haka_huta.h" -#include "objects/object_hakach_objects/object_hakach_objects.h" +#include "assets/objects/object_hakach_objects/object_hakach_objects.h" #include "overlays/actors/ovl_En_Rd/z_en_rd.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index 9b885bd9d1..e3230b5aed 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -5,8 +5,8 @@ */ #include "z_bg_haka_megane.h" -#include "objects/object_hakach_objects/object_hakach_objects.h" -#include "objects/object_haka_objects/object_haka_objects.h" +#include "assets/objects/object_hakach_objects/object_hakach_objects.h" +#include "assets/objects/object_haka_objects/object_haka_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_7) diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 012549d9e8..3942b8adbf 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -5,7 +5,7 @@ */ #include "z_bg_haka_meganebg.h" -#include "objects/object_haka_objects/object_haka_objects.h" +#include "assets/objects/object_haka_objects/object_haka_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index ece790a049..019662dd48 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -5,8 +5,8 @@ */ #include "z_bg_haka_sgami.h" -#include "objects/object_haka_objects/object_haka_objects.h" -#include "objects/object_ice_objects/object_ice_objects.h" +#include "assets/objects/object_haka_objects/object_haka_objects.h" +#include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index 585cd581fa..644be1d0b7 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -5,7 +5,7 @@ */ #include "z_bg_haka_ship.h" -#include "objects/object_haka_objects/object_haka_objects.h" +#include "assets/objects/object_haka_objects/object_haka_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 3d11fa6399..45b5651df5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -5,7 +5,7 @@ */ #include "z_bg_haka_trap.h" -#include "objects/object_haka_objects/object_haka_objects.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 cdb5a0a247..4e7ea78857 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 @@ -5,8 +5,8 @@ */ #include "z_bg_haka_tubo.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_haka_objects/object_haka_objects.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_haka_objects/object_haka_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index 43faef3f54..6c1a7bdadd 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -5,7 +5,7 @@ */ #include "z_bg_haka_water.h" -#include "objects/object_hakach_objects/object_hakach_objects.h" +#include "assets/objects/object_hakach_objects/object_hakach_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index fc49e86f2f..3b64228ef8 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -5,8 +5,8 @@ */ #include "z_bg_haka_zou.h" -#include "objects/object_hakach_objects/object_hakach_objects.h" -#include "objects/object_haka_objects/object_haka_objects.h" +#include "assets/objects/object_hakach_objects/object_hakach_objects.h" +#include "assets/objects/object_haka_objects/object_haka_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index aa80ed9777..4e0649851b 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -5,7 +5,7 @@ */ #include "z_bg_heavy_block.h" -#include "objects/object_heavy_object/object_heavy_object.h" +#include "assets/objects/object_heavy_object/object_heavy_object.h" #include "vt.h" #define FLAGS 0 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 4a05bfcd7c..39802b5c5d 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 @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_curtain.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 6cb7741214..3b82395192 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_dalm.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index b3078a0bde..ebe407b191 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_firewall.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index 2fac89c60a..c68fe952c1 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_fslift.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS ACTOR_FLAG_4 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 86ac056d20..6f03f1a3de 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 @@ -6,8 +6,8 @@ */ #include "z_bg_hidan_fwbig.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index 89145494d4..36e7c643b2 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_hamstep.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c index b4636e0e8a..87952bba82 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_hrock.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index c5e9af26a3..89b616a7e7 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_kousi.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 35e9176d5e..4d718685f0 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -5,9 +5,9 @@ */ #include "z_bg_hidan_kowarerukabe.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index a9de38d358..ec73887597 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_rock.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index c56f1e172c..9aab264ccb 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_rsekizou.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index c986155969..3d71454c4e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_sekizou.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index a3ed6ebe5c..82355a4e3b 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_sima.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index ee4dafc802..5f59183fd0 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -5,7 +5,7 @@ */ #include "z_bg_hidan_syoku.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index 8addc43f5c..66bf6fb509 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -5,7 +5,7 @@ */ #include "z_bg_ice_objects.h" -#include "objects/object_ice_objects/object_ice_objects.h" +#include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index c44ad87f65..9d78b421ce 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -1,5 +1,5 @@ #include "z_bg_ice_shelter.h" -#include "objects/object_ice_objects/object_ice_objects.h" +#include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index 1965df4f80..09999d827f 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -5,7 +5,7 @@ */ #include "z_bg_ice_shutter.h" -#include "objects/object_ice_objects/object_ice_objects.h" +#include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index e48893f446..0854e2dfc1 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -5,7 +5,7 @@ */ #include "z_bg_ice_turara.h" -#include "objects/object_ice_objects/object_ice_objects.h" +#include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 5d3e669d8d..c9c77e5e2a 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -5,7 +5,7 @@ */ #include "z_bg_ingate.h" -#include "objects/object_ingate/object_ingate.h" +#include "assets/objects/object_ingate/object_ingate.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index e5c54dddf3..0229d84741 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -5,7 +5,7 @@ */ #include "z_bg_jya_1flift.h" -#include "objects/object_jya_obj/object_jya_obj.h" +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index c73e937290..084f0b1b36 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -5,7 +5,7 @@ */ #include "z_bg_jya_amishutter.h" -#include "objects/object_jya_obj/object_jya_obj.h" +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index 8787aec0a4..7ea9d2e6ff 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -5,7 +5,7 @@ */ #include "z_bg_jya_bigmirror.h" -#include "objects/object_jya_obj/object_jya_obj.h" +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index e4ece738e5..03512650da 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -5,7 +5,7 @@ */ #include "z_bg_jya_block.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 2450111f37..f9f52bc889 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -1,6 +1,6 @@ #include "z_bg_jya_bombchuiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/object_jya_obj/object_jya_obj.h" +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_0 void BgJyaBombchuiwa_Init(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index 30cc6f7ea3..2eb87acb55 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -6,7 +6,7 @@ #include "z_bg_jya_bombiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/object_jya_obj/object_jya_obj.h" +#include "assets/objects/object_jya_obj/object_jya_obj.h" #include "vt.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 23f1b14e97..4d625fca85 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -1,7 +1,7 @@ #include "z_bg_jya_cobra.h" #include "overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h" #include "overlays/actors/ovl_Mir_Ray/z_mir_ray.h" -#include "objects/object_jya_obj/object_jya_obj.h" +#include "assets/objects/object_jya_obj/object_jya_obj.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 @@ -16,7 +16,7 @@ void func_80896950(BgJyaCobra* this, PlayState* play); void func_808969F8(BgJyaCobra* this, PlayState* play); void func_80896ABC(BgJyaCobra* this, PlayState* play); -#include "overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.c" +#include "assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.c" const ActorInit Bg_Jya_Cobra_InitVars = { ACTOR_BG_JYA_COBRA, diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 12adf766e4..718d8e1012 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -6,7 +6,7 @@ */ #include "z_bg_jya_goroiwa.h" -#include "objects/object_goroiwa/object_goroiwa.h" +#include "assets/objects/object_goroiwa/object_goroiwa.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 10a093c726..88cc8753c0 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -6,7 +6,7 @@ #include "z_bg_jya_haheniron.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/object_jya_iron/object_jya_iron.h" +#include "assets/objects/object_jya_iron/object_jya_iron.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index e55f47295f..b6845dc979 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -5,7 +5,7 @@ */ #include "z_bg_jya_ironobj.h" -#include "objects/object_jya_iron/object_jya_iron.h" +#include "assets/objects/object_jya_iron/object_jya_iron.h" #include "overlays/actors/ovl_En_Ik/z_en_ik.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 802a1868c9..ff740731d9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -5,7 +5,7 @@ */ #include "z_bg_jya_kanaami.h" -#include "objects/object_jya_obj/object_jya_obj.h" +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index bf2ee1fa9e..eb6dc61e52 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -5,7 +5,7 @@ */ #include "z_bg_jya_lift.h" -#include "objects/object_jya_obj/object_jya_obj.h" +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index c53aa9a223..def39665a8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -6,7 +6,7 @@ #include "z_bg_jya_megami.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/object_jya_obj/object_jya_obj.h" +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index 9f81471337..3e6a7458f8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -5,7 +5,7 @@ */ #include "z_bg_jya_zurerukabe.h" -#include "objects/object_jya_obj/object_jya_obj.h" +#include "assets/objects/object_jya_obj/object_jya_obj.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index c4efc1605d..18950ecb1e 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -5,7 +5,7 @@ */ #include "z_bg_menkuri_eye.h" -#include "objects/object_menkuri_objects/object_menkuri_objects.h" +#include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS ACTOR_FLAG_5 diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index fef12a3c06..9eac1418fb 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -5,7 +5,7 @@ */ #include "z_bg_menkuri_kaiten.h" -#include "objects/object_menkuri_objects/object_menkuri_objects.h" +#include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c index 6965a3f08c..dc61af22d9 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c @@ -5,7 +5,7 @@ */ #include "z_bg_menkuri_nisekabe.h" -#include "objects/object_menkuri_objects/object_menkuri_objects.h" +#include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 2c48ac98ec..61ec553942 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -6,7 +6,7 @@ #include "z_bg_mizu_bwall.h" #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h" -#include "objects/object_mizu_objects/object_mizu_objects.h" +#include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index a2998405c3..45ed58506e 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -6,7 +6,7 @@ #include "z_bg_mizu_movebg.h" #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h" -#include "objects/object_mizu_objects/object_mizu_objects.h" +#include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index 5c5e2f3ab1..b885460ab1 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -1,5 +1,5 @@ #include "z_bg_mizu_shutter.h" -#include "objects/object_mizu_objects/object_mizu_objects.h" +#include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index 9d405c6899..92349ca1cc 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -5,7 +5,7 @@ */ #include "z_bg_mizu_uzu.h" -#include "objects/object_mizu_objects/object_mizu_objects.h" +#include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index cd909f3ffb..ab73a8b905 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -5,7 +5,7 @@ */ #include "z_bg_mizu_water.h" -#include "objects/object_mizu_objects/object_mizu_objects.h" +#include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index 53e37a699b..2c611f6a91 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -5,14 +5,14 @@ */ #include "z_bg_mjin.h" -#include "objects/object_mjin/object_mjin.h" -#include "objects/object_mjin_wind/object_mjin_wind.h" -#include "objects/object_mjin_soul/object_mjin_soul.h" -#include "objects/object_mjin_dark/object_mjin_dark.h" -#include "objects/object_mjin_ice/object_mjin_ice.h" -#include "objects/object_mjin_flame/object_mjin_flame.h" -#include "objects/object_mjin_flash/object_mjin_flash.h" -#include "objects/object_mjin_oka/object_mjin_oka.h" +#include "assets/objects/object_mjin/object_mjin.h" +#include "assets/objects/object_mjin_wind/object_mjin_wind.h" +#include "assets/objects/object_mjin_soul/object_mjin_soul.h" +#include "assets/objects/object_mjin_dark/object_mjin_dark.h" +#include "assets/objects/object_mjin_ice/object_mjin_ice.h" +#include "assets/objects/object_mjin_flame/object_mjin_flame.h" +#include "assets/objects/object_mjin_flash/object_mjin_flash.h" +#include "assets/objects/object_mjin_oka/object_mjin_oka.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index 7053528421..e5d5e323c2 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -5,7 +5,7 @@ */ #include "z_bg_mori_bigst.h" -#include "objects/object_mori_objects/object_mori_objects.h" +#include "assets/objects/object_mori_objects/object_mori_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index eefc0eaa21..eb45301314 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -1,5 +1,5 @@ #include "z_bg_mori_elevator.h" -#include "objects/object_mori_objects/object_mori_objects.h" +#include "assets/objects/object_mori_objects/object_mori_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index f71565ca10..812e8c79c6 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -5,7 +5,7 @@ */ #include "z_bg_mori_hashigo.h" -#include "objects/object_mori_objects/object_mori_objects.h" +#include "assets/objects/object_mori_objects/object_mori_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index 7e7a79a4bc..f2df07d496 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -5,7 +5,7 @@ */ #include "z_bg_mori_hashira4.h" -#include "objects/object_mori_objects/object_mori_objects.h" +#include "assets/objects/object_mori_objects/object_mori_objects.h" #define FLAGS ACTOR_FLAG_4 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 ed5d1d0168..bb00444f88 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 @@ -5,13 +5,13 @@ */ #include "z_bg_mori_hineri.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_box/object_box.h" -#include "objects/object_mori_hineri1/object_mori_hineri1.h" -#include "objects/object_mori_hineri1a/object_mori_hineri1a.h" -#include "objects/object_mori_hineri2/object_mori_hineri2.h" -#include "objects/object_mori_hineri2a/object_mori_hineri2a.h" -#include "objects/object_mori_tex/object_mori_tex.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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" +#include "assets/objects/object_mori_hineri2/object_mori_hineri2.h" +#include "assets/objects/object_mori_hineri2a/object_mori_hineri2a.h" +#include "assets/objects/object_mori_tex/object_mori_tex.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index 29bffa87cf..1e01c5b5ab 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -5,7 +5,7 @@ */ #include "z_bg_mori_idomizu.h" -#include "objects/object_mori_objects/object_mori_objects.h" +#include "assets/objects/object_mori_objects/object_mori_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index c2fdc52674..d20f778886 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -5,7 +5,7 @@ */ #include "z_bg_mori_kaitenkabe.h" -#include "objects/object_mori_objects/object_mori_objects.h" +#include "assets/objects/object_mori_objects/object_mori_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 13fa5fdd4c..d2c542b9ee 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -5,7 +5,7 @@ */ #include "z_bg_mori_rakkatenjo.h" -#include "objects/object_mori_objects/object_mori_objects.h" +#include "assets/objects/object_mori_objects/object_mori_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 3cce787d94..d569c7e35b 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -5,7 +5,7 @@ */ #include "z_bg_po_event.h" -#include "objects/object_po_sisters/object_po_sisters.h" +#include "assets/objects/object_po_sisters/object_po_sisters.h" #define FLAGS 0 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 782b20bf92..8700d03e72 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 @@ -5,8 +5,8 @@ */ #include "z_bg_po_syokudai.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_syokudai/object_syokudai.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_syokudai/object_syokudai.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index ac4d407bac..10b2d2de37 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -5,7 +5,7 @@ */ #include "z_bg_pushbox.h" -#include "objects/object_pu_box/object_pu_box.h" +#include "assets/objects/object_pu_box/object_pu_box.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 30d9757852..3d7cd495b8 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -5,7 +5,7 @@ */ #include "z_bg_relay_objects.h" -#include "objects/object_relay_objects/object_relay_objects.h" +#include "assets/objects/object_relay_objects/object_relay_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index 4884a3d04e..ef99a66d4f 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot00_break.h" -#include "objects/object_spot00_break/object_spot00_break.h" +#include "assets/objects/object_spot00_break/object_spot00_break.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 03750c0c96..e594e36e79 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 @@ -5,8 +5,8 @@ */ #include "z_bg_spot00_hanebasi.h" -#include "objects/object_spot00_objects/object_spot00_objects.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_spot00_objects/object_spot00_objects.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index 5381bd181b..aa93672c9b 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot01_fusya.h" -#include "objects/object_spot01_objects/object_spot01_objects.h" +#include "assets/objects/object_spot01_objects/object_spot01_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index 2eae463757..c298f1f060 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot01_idohashira.h" -#include "objects/object_spot01_objects/object_spot01_objects.h" +#include "assets/objects/object_spot01_objects/object_spot01_objects.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index af2f85a704..fddd8ce659 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot01_idomizu.h" -#include "objects/object_spot01_objects/object_spot01_objects.h" +#include "assets/objects/object_spot01_objects/object_spot01_objects.h" #define FLAGS ACTOR_FLAG_5 diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 350b7246fb..a73f028288 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot01_idosoko.h" -#include "objects/object_spot01_matoya/object_spot01_matoya.h" +#include "assets/objects/object_spot01_matoya/object_spot01_matoya.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index f536501b8b..6444b24ac2 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -5,8 +5,8 @@ */ #include "z_bg_spot01_objects2.h" -#include "objects/object_spot01_matoya/object_spot01_matoya.h" -#include "objects/object_spot01_matoyab/object_spot01_matoyab.h" +#include "assets/objects/object_spot01_matoya/object_spot01_matoya.h" +#include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 6b9bfe18a0..7694548a71 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot02_objects.h" -#include "objects/object_spot02_objects/object_spot02_objects.h" +#include "assets/objects/object_spot02_objects/object_spot02_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index 361fc99b05..74377c1973 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot03_taki.h" -#include "objects/object_spot03_object/object_spot03_object.h" +#include "assets/objects/object_spot03_object/object_spot03_object.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index b0ceadc4aa..d6bd8824cd 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot05_soko.h" -#include "objects/object_spot05_objects/object_spot05_objects.h" +#include "assets/objects/object_spot05_objects/object_spot05_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index a9acac95a4..d603eaab65 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot06_objects.h" -#include "objects/object_spot06_objects/object_spot06_objects.h" +#include "assets/objects/object_spot06_objects/object_spot06_objects.h" #define FLAGS ACTOR_FLAG_9 diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index f1d83f8d59..37fc793165 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot07_taki.h" -#include "objects/object_spot07_object/object_spot07_object.h" +#include "assets/objects/object_spot07_object/object_spot07_object.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index 018e455235..4c023b3391 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -5,9 +5,9 @@ */ #include "z_bg_spot08_bakudankabe.h" -#include "objects/object_spot08_obj/object_spot08_obj.h" +#include "assets/objects/object_spot08_obj/object_spot08_obj.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS ACTOR_FLAG_22 diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 3e923a2dd3..10e28eff2b 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot08_iceblock.h" -#include "objects/object_spot08_obj/object_spot08_obj.h" +#include "assets/objects/object_spot08_obj/object_spot08_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 7a5b39f2f0..19de02b588 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot09_obj.h" -#include "objects/object_spot09_obj/object_spot09_obj.h" +#include "assets/objects/object_spot09_obj/object_spot09_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index cf4ca5f010..de547753f8 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -6,8 +6,8 @@ #include "z_bg_spot11_bakudankabe.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/object_spot11_obj/object_spot11_obj.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/object_spot11_obj/object_spot11_obj.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 911d80bc58..5b5bad82ae 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -6,7 +6,7 @@ #include "z_bg_spot11_oasis.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#include "objects/object_spot11_obj/object_spot11_obj.h" +#include "assets/objects/object_spot11_obj/object_spot11_obj.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 99d669ffac..d8cf6331df 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot12_gate.h" -#include "objects/object_spot12_obj/object_spot12_obj.h" +#include "assets/objects/object_spot12_obj/object_spot12_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index e47aa300f9..1a3dfe511b 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot12_saku.h" -#include "objects/object_spot12_obj/object_spot12_obj.h" +#include "assets/objects/object_spot12_obj/object_spot12_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index a45cce6e30..b5ef416397 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot15_rrbox.h" -#include "objects/object_spot15_obj/object_spot15_obj.h" +#include "assets/objects/object_spot15_obj/object_spot15_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index c3ad06c4ed..3cad81c90e 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot15_saku.h" -#include "objects/object_spot15_obj/object_spot15_obj.h" +#include "assets/objects/object_spot15_obj/object_spot15_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 02e50f03f1..d9e50a1f2c 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -1,6 +1,6 @@ #include "z_bg_spot16_bombstone.h" -#include "objects/object_spot16_obj/object_spot16_obj.h" -#include "objects/object_bombiwa/object_bombiwa.h" +#include "assets/objects/object_spot16_obj/object_spot16_obj.h" +#include "assets/objects/object_bombiwa/object_bombiwa.h" #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index a6520c18d5..5ab34704da 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot16_doughnut.h" -#include "objects/object_efc_doughnut/object_efc_doughnut.h" +#include "assets/objects/object_efc_doughnut/object_efc_doughnut.h" #include "vt.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index a210a083bf..17f014a822 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -6,8 +6,8 @@ #include "z_bg_spot17_bakudankabe.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/object_spot17_obj/object_spot17_obj.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/object_spot17_obj/object_spot17_obj.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index beb6295bb1..9ca92f8a6c 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot17_funen.h" -#include "objects/object_spot17_obj/object_spot17_obj.h" +#include "assets/objects/object_spot17_obj/object_spot17_obj.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index e353ee4734..1e81a2d013 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -1,5 +1,5 @@ #include "z_bg_spot18_basket.h" -#include "objects/object_spot18_obj/object_spot18_obj.h" +#include "assets/objects/object_spot18_obj/object_spot18_obj.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index 4ed0daa938..8404e1565f 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot18_futa.h" -#include "objects/object_spot18_obj/object_spot18_obj.h" +#include "assets/objects/object_spot18_obj/object_spot18_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 1dd32d05aa..772b38daf6 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -6,7 +6,7 @@ */ #include "z_bg_spot18_obj.h" -#include "objects/object_spot18_obj/object_spot18_obj.h" +#include "assets/objects/object_spot18_obj/object_spot18_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index 962d0a8716..edaa45269f 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot18_shutter.h" -#include "objects/object_spot18_obj/object_spot18_obj.h" +#include "assets/objects/object_spot18_obj/object_spot18_obj.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index 49b1de8dbd..5d376e1316 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -5,7 +5,7 @@ */ #include "z_bg_sst_floor.h" -#include "objects/object_sst/object_sst.h" +#include "assets/objects/object_sst/object_sst.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index a54e2d066e..2b4cc10539 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -5,7 +5,7 @@ */ #include "z_bg_toki_hikari.h" -#include "objects/object_toki_objects/object_toki_objects.h" +#include "assets/objects/object_toki_objects/object_toki_objects.h" #define FLAGS ACTOR_FLAG_5 diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index 2e670e6e13..e3ebec645e 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -5,7 +5,7 @@ */ #include "z_bg_toki_swd.h" -#include "objects/object_toki_objects/object_toki_objects.h" +#include "assets/objects/object_toki_objects/object_toki_objects.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 0b4c8a3104..733b4ec7df 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -5,7 +5,7 @@ */ #include "z_bg_treemouth.h" -#include "objects/object_spot04_objects/object_spot04_objects.h" +#include "assets/objects/object_spot04_objects/object_spot04_objects.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index 39ffd018c5..5f3d2d366d 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -5,7 +5,7 @@ */ #include "z_bg_umajump.h" -#include "objects/object_umajump/object_umajump.h" +#include "assets/objects/object_umajump/object_umajump.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c index 1ba0cb3404..911dcc87de 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c @@ -5,7 +5,7 @@ */ #include "z_bg_vb_sima.h" -#include "objects/object_fd/object_fd.h" +#include "assets/objects/object_fd/object_fd.h" #include "overlays/actors/ovl_Boss_Fd/z_boss_fd.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index 5007ce0f98..f1f291a337 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -5,7 +5,7 @@ */ #include "z_bg_ydan_hasi.h" -#include "objects/object_ydan_objects/object_ydan_objects.h" +#include "assets/objects/object_ydan_objects/object_ydan_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index 05345a5703..8a8668d092 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -5,7 +5,7 @@ */ #include "z_bg_ydan_maruta.h" -#include "objects/object_ydan_objects/object_ydan_objects.h" +#include "assets/objects/object_ydan_objects/object_ydan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index 03dc556cc4..e347f28802 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -5,7 +5,7 @@ */ #include "z_bg_ydan_sp.h" -#include "objects/object_ydan_objects/object_ydan_objects.h" +#include "assets/objects/object_ydan_objects/object_ydan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index 4b23a66942..f896282373 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -5,7 +5,7 @@ */ #include "z_bg_zg.h" -#include "objects/object_zg/object_zg.h" +#include "assets/objects/object_zg/object_zg.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 9bc1ae44b1..794b26bf0f 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -1,7 +1,7 @@ #include "z_boss_dodongo.h" -#include "objects/object_kingdodongo/object_kingdodongo.h" +#include "assets/objects/object_kingdodongo/object_kingdodongo.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#include "scenes/dungeons/ddan_boss/ddan_boss_room_1.h" +#include "assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.c index c31efd621a..3a62ce5333 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.c @@ -237,4 +237,4 @@ static ColliderJntSphInit sJntSphInit = { static Vec3f sUnkZeroVec = { 0.0f, 0.0f, 0.0f }; -#include "overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.c" +#include "assets/overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.c" 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 3f2c6097d2..83e22e0b9e 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -5,12 +5,12 @@ */ #include "z_boss_fd.h" -#include "objects/object_fd/object_fd.h" +#include "assets/objects/object_fd/object_fd.h" #include "overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h" #include "overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h" #include "overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index edaa4f1f8a..85d10dcc54 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -5,7 +5,7 @@ */ #include "z_boss_fd2.h" -#include "objects/object_fd2/object_fd2.h" +#include "assets/objects/object_fd2/object_fd2.h" #include "overlays/actors/ovl_Boss_Fd/z_boss_fd.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "vt.h" diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 815003702d..bc6d2fd122 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -1,5 +1,5 @@ #include "z_boss_ganon.h" -#include "overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h" +#include "assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h" #include "overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h" #include "overlays/actors/ovl_En_Zl3/z_en_zl3.h" #include "overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h" @@ -5006,4 +5006,4 @@ void BossGanon_DrawEffects(PlayState* play) { CLOSE_DISPS(gfxCtx, "../z_boss_ganon.c", 11255); } -#include "overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.c" +#include "assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.c" 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 60710ae9a9..9bd4c09050 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -1,10 +1,10 @@ #include "z_boss_ganon2.h" #include "overlays/actors/ovl_Demo_Gj/z_demo_gj.h" #include "overlays/actors/ovl_En_Zl3/z_en_zl3.h" -#include "objects/object_ganon/object_ganon.h" -#include "objects/object_ganon2/object_ganon2.h" -#include "objects/object_ganon_anime3/object_ganon_anime3.h" -#include "objects/object_geff/object_geff.h" +#include "assets/objects/object_ganon/object_ganon.h" +#include "assets/objects/object_ganon2/object_ganon2.h" +#include "assets/objects/object_ganon_anime3/object_ganon_anime3.h" +#include "assets/objects/object_geff/object_geff.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c index 46b6fb5089..b65404695a 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c @@ -1,6 +1,6 @@ #include "z_boss_ganon2.h" #include "overlays/actors/ovl_En_Zl3/z_en_zl3.h" -#include "objects/object_ganon2/object_ganon2.h" +#include "assets/objects/object_ganon2/object_ganon2.h" #define BOSS_GANON2_EFFECT_COUNT 100 @@ -331,7 +331,7 @@ static u8 D_809071EC[] = { 3, 2, 2, 1, 3, 3, 1, 3, 3, 1, 0, 3, 1, 0, 3 }; // padding static u32 D_809071FC[2] = { 0 }; -#include "overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.c" +#include "assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.c" static Vec3f D_8090EB20; diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 806103be2b..c4e7a24728 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -5,7 +5,7 @@ */ #include "z_boss_ganondrof.h" -#include "objects/object_gnd/object_gnd.h" +#include "assets/objects/object_gnd/object_gnd.h" #include "overlays/actors/ovl_En_fHG/z_en_fhg.h" #include "overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index 1f17d96364..f081adcf12 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -1,5 +1,5 @@ #include "z_boss_goma.h" -#include "objects/object_goma/object_goma.h" +#include "assets/objects/object_goma/object_goma.h" #include "overlays/actors/ovl_En_Goma/z_en_goma.h" #include "overlays/actors/ovl_Door_Shutter/z_door_shutter.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" 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 908b954599..0f3da3e550 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -5,9 +5,9 @@ */ #include "z_boss_mo.h" -#include "objects/object_mo/object_mo.h" +#include "assets/objects/object_mo/object_mo.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) 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 efff37d94d..b31e044254 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -5,8 +5,8 @@ */ #include "z_boss_sst.h" -#include "objects/object_sst/object_sst.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_sst/object_sst.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" @@ -186,7 +186,7 @@ void BossSst_SpawnIceCrystal(BossSst* this, s32 index); void BossSst_SpawnIceShard(BossSst* this); void BossSst_IceShatter(BossSst* this); -#include "overlays/ovl_Boss_Sst/ovl_Boss_Sst.c" +#include "assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.c" static BossSst* sHead; static BossSst* sHands[2]; 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 d7049fd704..e27340fb19 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -1,6 +1,6 @@ #include "z_boss_tw.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_tw/object_tw.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_tw/object_tw.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) 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 940fd85c8b..7ed2de3c36 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -5,9 +5,9 @@ */ #include "z_boss_va.h" -#include "objects/object_bv/object_bv.h" +#include "assets/objects/object_bv/object_bv.h" #include "overlays/actors/ovl_En_Boom/z_en_boom.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) 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 d62a9a0318..fbf41fba52 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -6,9 +6,9 @@ #include "z_demo_6k.h" #include "vt.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_demo_6k/object_demo_6k.h" -#include "objects/object_gnd_magic/object_gnd_magic.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_demo_6k/object_demo_6k.h" +#include "assets/objects/object_gnd_magic/object_gnd_magic.h" #include "overlays/actors/ovl_Eff_Dust/z_eff_dust.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index e8eab23175..9f09442bc2 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -1,5 +1,5 @@ #include "z_demo_du.h" -#include "objects/object_du/object_du.h" +#include "assets/objects/object_du/object_du.h" #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "vt.h" diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index d1e3bd53c8..3de5fa63a7 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -6,36 +6,36 @@ #include "z_demo_ec.h" #include "vt.h" -#include "objects/object_zo/object_zo.h" -#include "objects/object_ec/object_ec.h" -#include "objects/object_ma2/object_ma2.h" -#include "objects/object_in/object_in.h" -#include "objects/object_ge1/object_ge1.h" -#include "objects/object_fu/object_fu.h" -#include "objects/object_fish/object_fish.h" -#include "objects/object_ta/object_ta.h" -#include "objects/object_oF1d_map/object_oF1d_map.h" -#include "objects/object_ma2/object_ma2.h" -#include "objects/object_in/object_in.h" -#include "objects/object_ta/object_ta.h" -#include "objects/object_fu/object_fu.h" -#include "objects/object_toryo/object_toryo.h" -#include "objects/object_daiku/object_daiku.h" -#include "objects/object_ge1/object_ge1.h" -#include "objects/object_kz/object_kz.h" -#include "objects/object_md/object_md.h" -#include "objects/object_niw/object_niw.h" -#include "objects/object_ds2/object_ds2.h" -#include "objects/object_os/object_os.h" -#include "objects/object_rs/object_rs.h" -#include "objects/object_gm/object_gm.h" -#include "objects/object_km1/object_km1.h" -#include "objects/object_kw1/object_kw1.h" -#include "objects/object_bji/object_bji.h" -#include "objects/object_ahg/object_ahg.h" -#include "objects/object_bob/object_bob.h" -#include "objects/object_bba/object_bba.h" -#include "objects/object_ane/object_ane.h" +#include "assets/objects/object_zo/object_zo.h" +#include "assets/objects/object_ec/object_ec.h" +#include "assets/objects/object_ma2/object_ma2.h" +#include "assets/objects/object_in/object_in.h" +#include "assets/objects/object_ge1/object_ge1.h" +#include "assets/objects/object_fu/object_fu.h" +#include "assets/objects/object_fish/object_fish.h" +#include "assets/objects/object_ta/object_ta.h" +#include "assets/objects/object_oF1d_map/object_oF1d_map.h" +#include "assets/objects/object_ma2/object_ma2.h" +#include "assets/objects/object_in/object_in.h" +#include "assets/objects/object_ta/object_ta.h" +#include "assets/objects/object_fu/object_fu.h" +#include "assets/objects/object_toryo/object_toryo.h" +#include "assets/objects/object_daiku/object_daiku.h" +#include "assets/objects/object_ge1/object_ge1.h" +#include "assets/objects/object_kz/object_kz.h" +#include "assets/objects/object_md/object_md.h" +#include "assets/objects/object_niw/object_niw.h" +#include "assets/objects/object_ds2/object_ds2.h" +#include "assets/objects/object_os/object_os.h" +#include "assets/objects/object_rs/object_rs.h" +#include "assets/objects/object_gm/object_gm.h" +#include "assets/objects/object_km1/object_km1.h" +#include "assets/objects/object_kw1/object_kw1.h" +#include "assets/objects/object_bji/object_bji.h" +#include "assets/objects/object_ahg/object_ahg.h" +#include "assets/objects/object_bob/object_bob.h" +#include "assets/objects/object_bba/object_bba.h" +#include "assets/objects/object_ane/object_ane.h" #define FLAGS ACTOR_FLAG_4 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 0e0ecf45dd..c757a0e880 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1,14 +1,14 @@ #include "z_demo_effect.h" #include "vt.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_efc_crystal_light/object_efc_crystal_light.h" -#include "objects/object_efc_fire_ball/object_efc_fire_ball.h" -#include "objects/object_efc_lgt_shower/object_efc_lgt_shower.h" -#include "objects/object_god_lgt/object_god_lgt.h" -#include "objects/object_light_ring/object_light_ring.h" -#include "objects/object_triforce_spot/object_triforce_spot.h" -#include "objects/object_efc_tw/object_efc_tw.h" -#include "objects/object_gi_jewel/object_gi_jewel.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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" +#include "assets/objects/object_god_lgt/object_god_lgt.h" +#include "assets/objects/object_light_ring/object_light_ring.h" +#include "assets/objects/object_triforce_spot/object_triforce_spot.h" +#include "assets/objects/object_efc_tw/object_efc_tw.h" +#include "assets/objects/object_gi_jewel/object_gi_jewel.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index 16efac2121..780168c190 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -6,7 +6,7 @@ #include "z_demo_ext.h" #include "vt.h" -#include "objects/object_fhg/object_fhg.h" +#include "assets/objects/object_fhg/object_fhg.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index a9faf5a54c..3b9b61a6ee 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -5,7 +5,7 @@ */ #include "z_demo_geff.h" -#include "objects/object_geff/object_geff.h" +#include "assets/objects/object_geff/object_geff.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index dc7a72feb5..d350ac8582 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -5,7 +5,7 @@ */ #include "z_demo_gj.h" -#include "objects/object_gj/object_gj.h" +#include "assets/objects/object_gj/object_gj.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 1624a81a39..7cc11aa099 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -5,7 +5,7 @@ */ #include "z_demo_go.h" -#include "objects/object_oF1d_map/object_oF1d_map.h" +#include "assets/objects/object_oF1d_map/object_oF1d_map.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index e7241db92f..7e91cd8f45 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -1,6 +1,6 @@ #include "z_demo_gt.h" -#include "objects/object_gt/object_gt.h" -#include "objects/object_geff/object_geff.h" +#include "assets/objects/object_gt/object_gt.h" +#include "assets/objects/object_geff/object_geff.h" #include "vt.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index cba7916208..5ed9b3216b 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -1,6 +1,6 @@ #include "z_demo_ik.h" #include "vt.h" -#include "objects/object_ik/object_ik.h" +#include "assets/objects/object_ik/object_ik.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 2c03df4b61..7db7903455 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -7,8 +7,8 @@ #include "z_demo_im.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#include "scenes/indoors/nakaniwa/nakaniwa_scene.h" -#include "objects/object_im/object_im.h" +#include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h" +#include "assets/objects/object_im/object_im.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4) 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 f3dd726855..58ef03bf66 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -1,8 +1,8 @@ #include "z_demo_kankyo.h" #include "z64cutscene_commands.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_efc_star_field/object_efc_star_field.h" -#include "objects/object_toki_objects/object_toki_objects.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_efc_star_field/object_efc_star_field.h" +#include "assets/objects/object_toki_objects/object_toki_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 4d2fb705c4..9a9d2692d2 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -5,8 +5,8 @@ */ #include "z_demo_kekkai.h" -#include "objects/object_demo_kekkai/object_demo_kekkai.h" -#include "scenes/dungeons/ganontika/ganontika_scene.h" +#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" +#include "assets/scenes/dungeons/ganontika/ganontika_scene.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index b12bc77ea3..3461f8acc7 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -7,7 +7,7 @@ #include "z_demo_sa.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#include "objects/object_sa/object_sa.h" +#include "assets/objects/object_sa/object_sa.h" #include "vt.h" diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 8f80844d73..ab341b403c 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -27,7 +27,7 @@ const ActorInit Demo_Shd_InitVars = { (ActorFunc)DemoShd_Draw, }; -#include "overlays/ovl_Demo_Shd/ovl_Demo_Shd.c" +#include "assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.c" void DemoShd_SetupAction(DemoShd* this, DemoShdActionFunc actionFunc) { this->actionFunc = actionFunc; diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index 8e7f161f44..db2921ba28 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -1,6 +1,6 @@ #include "z_demo_tre_lgt.h" #include "overlays/actors/ovl_En_Box/z_en_box.h" -#include "objects/object_box/object_box.h" +#include "assets/objects/object_box/object_box.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 4ff4f506db..36afd889f2 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -5,7 +5,7 @@ */ #include "z_door_ana.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS ACTOR_FLAG_25 diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index bf58e00b14..aee6f349f5 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -5,7 +5,7 @@ */ #include "z_door_gerudo.h" -#include "objects/object_door_gerudo/object_door_gerudo.h" +#include "assets/objects/object_door_gerudo/object_door_gerudo.h" #define FLAGS 0 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 cf9ac2cbfe..751c249b14 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -5,11 +5,11 @@ */ #include "z_door_killer.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" -#include "objects/object_mizu_objects/object_mizu_objects.h" -#include "objects/object_haka_door/object_haka_door.h" -#include "objects/object_door_killer/object_door_killer.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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" +#include "assets/objects/object_door_killer/object_door_killer.h" #define FLAGS ACTOR_FLAG_4 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 ba360cd313..cf7cda1a5f 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -7,22 +7,22 @@ #include "z_door_shutter.h" #include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h" -#include "objects/object_gnd/object_gnd.h" -#include "objects/object_goma/object_goma.h" -#include "objects/object_ydan_objects/object_ydan_objects.h" -#include "objects/object_ddan_objects/object_ddan_objects.h" -#include "objects/object_bdan_objects/object_bdan_objects.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_bdoor/object_bdoor.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" -#include "objects/object_ganon_objects/object_ganon_objects.h" -#include "objects/object_jya_door/object_jya_door.h" -#include "objects/object_mizu_objects/object_mizu_objects.h" -#include "objects/object_haka_door/object_haka_door.h" -#include "objects/object_ice_objects/object_ice_objects.h" -#include "objects/object_menkuri_objects/object_menkuri_objects.h" -#include "objects/object_demo_kekkai/object_demo_kekkai.h" -#include "objects/object_ouke_haka/object_ouke_haka.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" +#include "assets/objects/object_ddan_objects/object_ddan_objects.h" +#include "assets/objects/object_bdan_objects/object_bdan_objects.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_bdoor/object_bdoor.h" +#include "assets/objects/object_hidan_objects/object_hidan_objects.h" +#include "assets/objects/object_ganon_objects/object_ganon_objects.h" +#include "assets/objects/object_jya_door/object_jya_door.h" +#include "assets/objects/object_mizu_objects/object_mizu_objects.h" +#include "assets/objects/object_haka_door/object_haka_door.h" +#include "assets/objects/object_ice_objects/object_ice_objects.h" +#include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" +#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" +#include "assets/objects/object_ouke_haka/object_ouke_haka.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index 2091d67396..9e5bbf6306 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c @@ -5,7 +5,7 @@ */ #include "z_door_toki.h" -#include "objects/object_toki_objects/object_toki_objects.h" +#include "assets/objects/object_toki_objects/object_toki_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 91dfa38f6f..4621934a12 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -1,5 +1,5 @@ #include "z_door_warp1.h" -#include "objects/object_warp1/object_warp1.h" +#include "assets/objects/object_warp1/object_warp1.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 61121b4b37..19be1612aa 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -1,5 +1,5 @@ #include "z_efc_erupc.h" -#include "objects/object_efc_erupc/object_efc_erupc.h" +#include "assets/objects/object_efc_erupc/object_efc_erupc.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) 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 bf631bc543..0d8c480d5b 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -5,7 +5,7 @@ */ #include "z_eff_dust.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index 3510629bd6..25700a4fe1 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -163,7 +163,7 @@ void ElfMsg_Update(Actor* thisx, PlayState* play) { } } -#include "overlays/ovl_Elf_Msg/ovl_Elf_Msg.c" +#include "assets/overlays/ovl_Elf_Msg/ovl_Elf_Msg.c" void ElfMsg_Draw(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_elf_msg.c", 436); diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index 00b1864600..26cfed8ca4 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -147,7 +147,7 @@ void ElfMsg2_Update(Actor* thisx, PlayState* play) { } } -#include "overlays/ovl_Elf_Msg2/ovl_Elf_Msg2.c" +#include "assets/overlays/ovl_Elf_Msg2/ovl_Elf_Msg2.c" void ElfMsg2_Draw(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_elf_msg2.c", 355); diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 329369b00d..a0fad6cc7d 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -5,7 +5,7 @@ */ #include "z_en_am.h" -#include "objects/object_am/object_am.h" +#include "assets/objects/object_am/object_am.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_26) diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 59cf4bdd01..fbc3480229 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -5,7 +5,7 @@ */ #include "z_en_ani.h" -#include "objects/object_ani/object_ani.h" +#include "assets/objects/object_ani/object_ani.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index a388d797b9..09b79234b4 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -5,7 +5,7 @@ */ #include "z_en_anubice.h" -#include "objects/object_anubice/object_anubice.h" +#include "assets/objects/object_anubice/object_anubice.h" #include "overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h" #include "overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h" #include "vt.h" 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 5dc0e6ed53..c758d48be2 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 @@ -5,8 +5,8 @@ */ #include "z_en_anubice_fire.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_anubice/object_anubice.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_anubice/object_anubice.h" #define FLAGS ACTOR_FLAG_4 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 f0aa35a92c..411edcd259 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -5,7 +5,7 @@ */ #include "z_en_arrow.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index 4e81a39e3e..f1544067bb 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -5,7 +5,7 @@ */ #include "z_en_attack_niw.h" -#include "objects/object_niw/object_niw.h" +#include "assets/objects/object_niw/object_niw.h" #include "overlays/actors/ovl_En_Niw/z_en_niw.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index f617f77690..711327f138 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -5,7 +5,7 @@ */ #include "z_en_ba.h" -#include "objects/object_bxa/object_bxa.h" +#include "assets/objects/object_bxa/object_bxa.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) 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 1bf433ca91..bf99d9f8fa 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -5,8 +5,8 @@ */ #include "z_en_bb.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_Bb/object_Bb.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_Bb/object_Bb.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_24) diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index 793c063f51..6731fee916 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -5,7 +5,7 @@ */ #include "z_en_bdfire.h" -#include "objects/object_kingdodongo/object_kingdodongo.h" +#include "assets/objects/object_kingdodongo/object_kingdodongo.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index ae885195b0..583877ba18 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -1,5 +1,5 @@ #include "z_en_bigokuta.h" -#include "objects/object_bigokuta/object_bigokuta.h" +#include "assets/objects/object_bigokuta/object_bigokuta.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 42b2ae8b16..124580b99a 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -5,7 +5,7 @@ */ #include "z_en_bili.h" -#include "objects/object_bl/object_bl.h" +#include "assets/objects/object_bl/object_bl.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_12 | ACTOR_FLAG_14) @@ -746,7 +746,7 @@ static void* sTentaclesTextures[] = { gBiriTentacles4Tex, gBiriTentacles5Tex, gBiriTentacles6Tex, gBiriTentacles7Tex, }; -#include "overlays/ovl_En_Bili/ovl_En_Bili.c" +#include "assets/overlays/ovl_En_Bili/ovl_En_Bili.c" void EnBili_Draw(Actor* thisx, PlayState* play) { EnBili* this = (EnBili*)thisx; diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.c b/src/overlays/actors/ovl_En_Bird/z_en_bird.c index 192e600afb..e445ca091a 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c @@ -5,7 +5,7 @@ */ #include "z_en_bird.h" -#include "objects/object_bird/object_bird.h" +#include "assets/objects/object_bird/object_bird.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index 866ba3f105..7378c8ef3d 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -5,7 +5,7 @@ */ #include "z_en_blkobj.h" -#include "objects/object_blkobj/object_blkobj.h" +#include "assets/objects/object_blkobj/object_blkobj.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) 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 1c295f37d6..87b37cca06 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -6,7 +6,7 @@ #include "z_en_bom.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 3bbee2c799..e66683d974 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -2,7 +2,7 @@ #include "vt.h" #include "overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h" #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" -#include "objects/object_bg/object_bg.h" +#include "assets/objects/object_bg/object_bg.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_27) 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 eb967246ba..263468e941 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 @@ -1,6 +1,6 @@ #include "z_en_bom_chu.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index d688cfde08..a5b05d10b0 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -5,7 +5,7 @@ */ #include "z_en_bombf.h" -#include "objects/object_bombf/object_bombf.h" +#include "assets/objects/object_bombf/object_bombf.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4) 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 cdb7dd8079..2d2fdd40c2 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -5,7 +5,7 @@ */ #include "z_en_boom.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 2285c7414e..c54f9ec303 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -1,5 +1,5 @@ #include "z_en_box.h" -#include "objects/object_box/object_box.h" +#include "assets/objects/object_box/object_box.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index f30cda77f7..e183979129 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -5,7 +5,7 @@ */ #include "z_en_brob.h" -#include "objects/object_brob/object_brob.h" +#include "assets/objects/object_brob/object_brob.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 1e0debda58..8b0ae2e190 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -1,5 +1,5 @@ #include "z_en_bubble.h" -#include "objects/object_bubble/object_bubble.h" +#include "assets/objects/object_bubble/object_bubble.h" #define FLAGS ACTOR_FLAG_0 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 4b2f0831c5..26287ae06c 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -6,8 +6,8 @@ #include "z_en_butte.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 2ef3870e87..799020d62c 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -5,8 +5,8 @@ */ #include "z_en_bw.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_bw/object_bw.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_bw/object_bw.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index 6d25a3f0a5..3a45a56b09 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -5,7 +5,7 @@ */ #include "z_en_bx.h" -#include "objects/object_bxa/object_bxa.h" +#include "assets/objects/object_bxa/object_bxa.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index 003ee5f7c7..15554acf1e 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -79,7 +79,7 @@ static UNK_TYPE4 D_809D5C9C = 0; // unused static EnClearTagEffect sEffects[CLEAR_TAG_EFFECT_COUNT]; -#include "overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.c" +#include "assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.c" /** * Creates a debris effect. diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 070848777c..a3370b54ee 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -5,7 +5,7 @@ */ #include "z_en_cow.h" -#include "objects/object_cow/object_cow.h" +#include "assets/objects/object_cow/object_cow.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index f0f1a0117f..b216014e58 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -1,5 +1,5 @@ #include "z_en_crow.h" -#include "objects/object_crow/object_crow.h" +#include "assets/objects/object_crow/object_crow.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_12 | ACTOR_FLAG_14) diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 2027c83aa8..4c1281a70c 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -1,6 +1,6 @@ #include "z_en_cs.h" -#include "objects/object_cs/object_cs.h" -#include "objects/object_link_child/object_link_child.h" +#include "assets/objects/object_cs/object_cs.h" +#include "assets/objects/object_link_child/object_link_child.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 66736a11ae..5b673d02e6 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -1,6 +1,6 @@ #include "z_en_daiku.h" #include "overlays/actors/ovl_En_GeldB/z_en_geldb.h" -#include "objects/object_daiku/object_daiku.h" +#include "assets/objects/object_daiku/object_daiku.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index bd06056be0..41a669f023 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -5,7 +5,7 @@ */ #include "z_en_daiku_kakariko.h" -#include "objects/object_daiku/object_daiku.h" +#include "assets/objects/object_daiku/object_daiku.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) 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 6343e17e6c..3696b0a152 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -1,6 +1,6 @@ #include "z_en_dekubaba.h" -#include "objects/object_dekubaba/object_dekubaba.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_dekubaba/object_dekubaba.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 311f4b104e..6ade12dbea 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -6,7 +6,7 @@ #include "z_en_dekunuts.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/object_dekunuts/object_dekunuts.h" +#include "assets/objects/object_dekunuts/object_dekunuts.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 5a194e86ca..f5705a6f0a 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -1,5 +1,5 @@ #include "z_en_dh.h" -#include "objects/object_dh/object_dh.h" +#include "assets/objects/object_dh/object_dh.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 33309a78d8..c1464a7153 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -6,7 +6,7 @@ #include "z_en_dha.h" #include "overlays/actors/ovl_En_Dh/z_en_dh.h" -#include "objects/object_dh/object_dh.h" +#include "assets/objects/object_dh/object_dh.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 0860859c9f..568e57a1d1 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -6,7 +6,7 @@ #include "z_en_diving_game.h" #include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h" -#include "objects/object_zo/object_zo.h" +#include "assets/objects/object_zo/object_zo.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 6f998822aa..9e14fef5b8 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -5,7 +5,7 @@ */ #include "z_en_dns.h" -#include "objects/object_shopnuts/object_shopnuts.h" +#include "assets/objects/object_shopnuts/object_shopnuts.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 2ad80a11b3..71af59183a 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -5,7 +5,7 @@ */ #include "z_en_dnt_jiji.h" -#include "objects/object_dns/object_dns.h" +#include "assets/objects/object_dns/object_dns.h" #include "overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "vt.h" diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 327affa713..7c992aa09f 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -5,12 +5,12 @@ */ #include "z_en_dnt_nomal.h" -#include "objects/object_dnk/object_dnk.h" +#include "assets/objects/object_dnk/object_dnk.h" #include "overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h" #include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h" #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/object_hintnuts/object_hintnuts.h" +#include "assets/objects/object_hintnuts/object_hintnuts.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index cd826ae35b..9827a90a49 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -6,7 +6,7 @@ #include "z_en_dodojr.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/object_dodojr/object_dodojr.h" +#include "assets/objects/object_dodojr/object_dodojr.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 52d35c0ee8..1b3a1fc79b 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -1,7 +1,7 @@ #include "z_en_dodongo.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h" -#include "objects/object_dodongo/object_dodongo.h" +#include "assets/objects/object_dodongo/object_dodongo.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index c9f7408500..afd70c7dd0 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -5,7 +5,7 @@ */ #include "z_en_dog.h" -#include "objects/object_dog/object_dog.h" +#include "assets/objects/object_dog/object_dog.h" #define FLAGS 0 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 083888e949..17291606bd 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -5,11 +5,11 @@ */ #include "z_en_door.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" -#include "objects/object_hidan_objects/object_hidan_objects.h" -#include "objects/object_mizu_objects/object_mizu_objects.h" -#include "objects/object_haka_door/object_haka_door.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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" +#include "assets/objects/object_haka_door/object_haka_door.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index 556cf0b3f8..332402db2c 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -5,7 +5,7 @@ */ #include "z_en_ds.h" -#include "objects/object_ds/object_ds.h" +#include "assets/objects/object_ds/object_ds.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index ae61f5595c..c50a99b140 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -1,6 +1,6 @@ #include "z_en_du.h" -#include "objects/object_du/object_du.h" -#include "scenes/overworld/spot18/spot18_scene.h" +#include "assets/objects/object_du/object_du.h" +#include "assets/scenes/overworld/spot18/spot18_scene.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index c6aecdd405..333559abfb 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -5,7 +5,7 @@ */ #include "z_en_dy_extra.h" -#include "objects/object_dy_obj/object_dy_obj.h" +#include "assets/objects/object_dy_obj/object_dy_obj.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index 914eaa4595..201d43237c 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -1,5 +1,5 @@ #include "z_en_eiyer.h" -#include "objects/object_ei/object_ei.h" +#include "assets/objects/object_ei/object_ei.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) 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 9baa671dbc..ada3c07758 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -5,7 +5,7 @@ */ #include "z_en_elf.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index db3acc1c4d..71c52b8f38 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -1,7 +1,7 @@ #include "z_en_encount2.h" #include "overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h" #include "vt.h" -#include "objects/object_efc_star_field/object_efc_star_field.h" +#include "assets/objects/object_efc_star_field/object_efc_star_field.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) 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 6be1ad31be..428c83e21d 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 @@ -6,7 +6,7 @@ #include "z_en_ex_item.h" #include "overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) 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 f9a5ed853b..3f586eecda 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 @@ -1,7 +1,7 @@ #include "z_en_ex_ruppy.h" #include "vt.h" #include "../ovl_En_Diving_Game/z_en_diving_game.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS ACTOR_FLAG_4 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 49e4a051b6..ee6129effa 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -5,8 +5,8 @@ */ #include "z_en_fd.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_fw/object_fw.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_fw/object_fw.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_9) 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 af1d0cd7a7..dd21184ae5 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 @@ -1,5 +1,5 @@ #include "z_en_fd_fire.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) 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 4b0a014fa3..51b260a62b 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 @@ -5,8 +5,8 @@ */ #include "z_en_fhg_fire.h" -#include "objects/object_fhg/object_fhg.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_fhg/object_fhg.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h" #include "overlays/actors/ovl_En_fHG/z_en_fhg.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index 6f1eeb9e99..d6ae2420df 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -1,7 +1,7 @@ #include "z_en_fire_rock.h" #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h" #include "vt.h" -#include "objects/object_efc_star_field/object_efc_star_field.h" +#include "assets/objects/object_efc_star_field/object_efc_star_field.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index cdc47ba743..c3887af5db 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -5,7 +5,7 @@ */ #include "z_en_firefly.h" -#include "objects/object_firefly/object_firefly.h" +#include "assets/objects/object_firefly/object_firefly.h" #include "overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_12 | ACTOR_FLAG_14) 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 e3641abb07..113d035530 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -5,7 +5,7 @@ */ #include "z_en_fish.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "vt.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 7745027e07..8596628266 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -5,7 +5,7 @@ */ #include "z_en_floormas.h" -#include "objects/object_wallmaster/object_wallmaster.h" +#include "assets/objects/object_wallmaster/object_wallmaster.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 70c1a6dfc7..9a9e9b1add 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -1,7 +1,7 @@ #include "z_en_fr.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "vt.h" -#include "objects/object_fr/object_fr.h" +#include "assets/objects/object_fr/object_fr.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 3338f5fe89..c95d288926 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -5,8 +5,8 @@ */ #include "z_en_fu.h" -#include "objects/object_fu/object_fu.h" -#include "scenes/indoors/hakasitarelay/hakasitarelay_scene.h" +#include "assets/objects/object_fu/object_fu.h" +#include "assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_25) 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 d6f3793e91..149c0fd00d 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -5,9 +5,9 @@ */ #include "z_en_fw.h" -#include "objects/object_fw/object_fw.h" +#include "assets/objects/object_fw/object_fw.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_9) diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 428503b8f1..561b1e6d71 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -1,5 +1,5 @@ #include "z_en_fz.h" -#include "objects/object_fz/object_fz.h" +#include "assets/objects/object_fz/object_fz.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_10) 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 e3e633cc37..058a80a5d8 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 @@ -9,8 +9,8 @@ #include "overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_tsubo/object_tsubo.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_tsubo/object_tsubo.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index eb528338b6..24c5953582 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -97,7 +97,7 @@ static u16 sVerticesMap[GANON_MANT_NUM_STRANDS * GANON_MANT_NUM_JOINTS] = { static u64 sForceAlignment = 0; -#include "overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.c" +#include "assets/overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.c" void EnGanonMant_Init(Actor* thisx, PlayState* play) { EnGanonMant* this = (EnGanonMant*)thisx; diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index 40c9406580..295477cb4f 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -28,7 +28,7 @@ const ActorInit En_Ganon_Organ_InitVars = { static u64 sForceAlignment = 0; -#include "overlays/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ.c" +#include "assets/overlays/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ.c" void EnGanonOrgan_Init(Actor* thisx, PlayState* play) { thisx->flags &= ~ACTOR_FLAG_0; diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index e15c6bb22e..27f0751de3 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -5,7 +5,7 @@ */ #include "z_en_gb.h" -#include "objects/object_ps/object_ps.h" +#include "assets/objects/object_ps/object_ps.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index bef864cb4c..b9e649daf5 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -6,7 +6,7 @@ #include "z_en_ge1.h" #include "vt.h" -#include "objects/object_ge1/object_ge1.h" +#include "assets/objects/object_ge1/object_ge1.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 4a23ba7486..7b0ebc43c8 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -6,7 +6,7 @@ #include "z_en_ge2.h" #include "vt.h" -#include "objects/object_gla/object_gla.h" +#include "assets/objects/object_gla/object_gla.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 950fa1a4f5..6e1112982f 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -5,7 +5,7 @@ */ #include "z_en_ge3.h" -#include "objects/object_geldb/object_geldb.h" +#include "assets/objects/object_geldb/object_geldb.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 456317a218..9271920133 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -5,7 +5,7 @@ */ #include "z_en_geldb.h" -#include "objects/object_geldb/object_geldb.h" +#include "assets/objects/object_geldb/object_geldb.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index a7b3d31b34..d6377f8151 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -5,8 +5,8 @@ */ #include "z_en_gm.h" -#include "objects/object_oF1d_map/object_oF1d_map.h" -#include "objects/object_gm/object_gm.h" +#include "assets/objects/object_oF1d_map/object_oF1d_map.h" +#include "assets/objects/object_gm/object_gm.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) 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 7982a40278..de9f51e090 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -1,7 +1,7 @@ #include "z_en_go.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_oF1d_map/object_oF1d_map.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_oF1d_map/object_oF1d_map.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_5) 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 be2fb481e8..cd988eb622 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -1,7 +1,7 @@ #include "z_en_go2.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_oF1d_map/object_oF1d_map.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_oF1d_map/object_oF1d_map.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 0e4c2dea15..ebb4ce4012 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -1,6 +1,6 @@ #include "z_en_goma.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#include "objects/object_gol/object_gol.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/object_gol/object_gol.h" #include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.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 da912d1c49..3f63560b9d 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -6,8 +6,8 @@ #include "z_en_goroiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_goroiwa/object_goroiwa.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_goroiwa/object_goroiwa.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 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 df9051f100..fa17e59b70 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -5,9 +5,9 @@ */ #include "z_en_gs.h" -#include "objects/object_gs/object_gs.h" +#include "assets/objects/object_gs/object_gs.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index d3e23b1b77..0051c1bf11 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -5,8 +5,8 @@ */ #include "z_en_guest.h" -#include "objects/object_os_anime/object_os_anime.h" -#include "objects/object_boj/object_boj.h" +#include "assets/objects/object_os_anime/object_os_anime.h" +#include "assets/objects/object_boj/object_boj.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index e34357db59..a6219d6898 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -5,7 +5,7 @@ */ #include "z_en_hata.h" -#include "objects/object_hata/object_hata.h" +#include "assets/objects/object_hata/object_hata.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 4df3541415..3a72e12a15 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -5,7 +5,7 @@ */ #include "z_en_heishi1.h" -#include "objects/object_sd/object_sd.h" +#include "assets/objects/object_sd/object_sd.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index a62f2630b8..e7c199911c 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -6,8 +6,8 @@ #include "vt.h" #include "z_en_heishi2.h" -#include "objects/object_sd/object_sd.h" -#include "objects/object_link_child/object_link_child.h" +#include "assets/objects/object_sd/object_sd.h" +#include "assets/objects/object_link_child/object_link_child.h" #include "overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h" diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 557b8ab91d..f058f77aa7 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -5,7 +5,7 @@ */ #include "z_en_heishi3.h" -#include "objects/object_sd/object_sd.h" +#include "assets/objects/object_sd/object_sd.h" #include "vt.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index b81229a7fb..877baef7b0 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -1,5 +1,5 @@ #include "z_en_heishi4.h" -#include "objects/object_sd/object_sd.h" +#include "assets/objects/object_sd/object_sd.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index fb180b101e..5a1836045f 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -5,7 +5,7 @@ */ #include "z_en_hintnuts.h" -#include "objects/object_hintnuts/object_hintnuts.h" +#include "assets/objects/object_hintnuts/object_hintnuts.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index 2c6e8471bb..56108c017c 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -319,7 +319,7 @@ void EnHoll_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); } -#include "overlays/ovl_En_Holl/ovl_En_Holl.c" +#include "assets/overlays/ovl_En_Holl/ovl_En_Holl.c" void EnHoll_Draw(Actor* thisx, PlayState* play) { EnHoll* this = (EnHoll*)thisx; 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 06905b1070..902be6f05b 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -5,8 +5,8 @@ */ #include "z_en_honotrap.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index a2fceb1013..6243618a4b 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -6,9 +6,9 @@ #include "z_en_horse.h" #include "overlays/actors/ovl_En_In/z_en_in.h" -#include "objects/object_horse/object_horse.h" -#include "objects/object_hni/object_hni.h" -#include "scenes/overworld/spot09/spot09_scene.h" +#include "assets/objects/object_horse/object_horse.h" +#include "assets/objects/object_hni/object_hni.h" +#include "assets/scenes/overworld/spot09/spot09_scene.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index 5631718668..210a38a320 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -5,7 +5,7 @@ */ #include "z_en_horse_ganon.h" -#include "objects/object_horse_ganon/object_horse_ganon.h" +#include "assets/objects/object_horse_ganon/object_horse_ganon.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 99e39e1446..1134276472 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -5,7 +5,7 @@ */ #include "z_en_horse_link_child.h" -#include "objects/object_horse_link_child/object_horse_link_child.h" +#include "assets/objects/object_horse_link_child/object_horse_link_child.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_25) 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 6a16fbbda7..aa3c7e3bab 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 @@ -5,8 +5,8 @@ */ #include "z_en_horse_normal.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_horse_normal/object_horse_normal.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_horse_normal/object_horse_normal.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index e5f2c328f9..15d81de394 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -5,7 +5,7 @@ */ #include "z_en_horse_zelda.h" -#include "objects/object_horse_zelda/object_horse_zelda.h" +#include "assets/objects/object_horse_zelda/object_horse_zelda.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index cd17ab5518..46a135312c 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -6,7 +6,7 @@ #include "z_en_hs.h" #include "vt.h" -#include "objects/object_hs/object_hs.h" +#include "assets/objects/object_hs/object_hs.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 7d54d3997b..2a681bc731 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -6,7 +6,7 @@ #include "z_en_hs2.h" #include "vt.h" -#include "objects/object_hs/object_hs.h" +#include "assets/objects/object_hs/object_hs.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 196c9c96ac..e763ddf2ae 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -5,15 +5,15 @@ */ #include "z_en_hy.h" -#include "objects/object_aob/object_aob.h" -#include "objects/object_ahg/object_ahg.h" -#include "objects/object_bob/object_bob.h" -#include "objects/object_boj/object_boj.h" -#include "objects/object_bba/object_bba.h" -#include "objects/object_bji/object_bji.h" -#include "objects/object_cne/object_cne.h" -#include "objects/object_cob/object_cob.h" -#include "objects/object_os_anime/object_os_anime.h" +#include "assets/objects/object_aob/object_aob.h" +#include "assets/objects/object_ahg/object_ahg.h" +#include "assets/objects/object_bob/object_bob.h" +#include "assets/objects/object_boj/object_boj.h" +#include "assets/objects/object_bba/object_bba.h" +#include "assets/objects/object_bji/object_bji.h" +#include "assets/objects/object_cne/object_cne.h" +#include "assets/objects/object_cob/object_cob.h" +#include "assets/objects/object_os_anime/object_os_anime.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) 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 9408ad1f13..83cba8a6f6 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 @@ -5,7 +5,7 @@ */ #include "z_en_ice_hono.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 277bd694e1..9c56d5b5ac 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -5,8 +5,8 @@ */ #include "z_en_ik.h" -#include "scenes/dungeons/jyasinboss/jyasinboss_scene.h" -#include "objects/object_ik/object_ik.h" +#include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h" +#include "assets/objects/object_ik/object_ik.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 9e02512f7e..c804c3bd3c 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -1,6 +1,6 @@ #include "z_en_in.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" -#include "objects/object_in/object_in.h" +#include "assets/objects/object_in/object_in.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) 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 446350761e..eff54a9dd8 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -6,7 +6,7 @@ #include "z_en_insect.h" #include "vt.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 5d63201fdb..711a1c115c 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -7,7 +7,7 @@ #include "z_en_ishi.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "vt.h" diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index cdbb12975b..b8caa43b42 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -5,7 +5,7 @@ */ #include "z_en_jj.h" -#include "objects/object_jj/object_jj.h" +#include "assets/objects/object_jj/object_jj.h" #include "overlays/actors/ovl_Eff_Dust/z_eff_dust.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index d466fdfd4c..5d75699a00 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -5,7 +5,7 @@ */ #include "z_en_js.h" -#include "objects/object_js/object_js.h" +#include "assets/objects/object_js/object_js.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index 7521cf79af..c516bfd750 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -33,7 +33,7 @@ static Vec3s D_80A8EE10[0x90]; static s32 sUnused[2] = { 0, 0 }; -#include "overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.c" +#include "assets/overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.c" void EnJsjutan_Init(Actor* thisx, PlayState* play) { EnJsjutan* this = (EnJsjutan*)thisx; diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index d607639801..d17e8ad0b9 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -6,7 +6,7 @@ #include "z_en_kakasi.h" #include "vt.h" -#include "objects/object_ka/object_ka.h" +#include "assets/objects/object_ka/object_ka.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index e303dee4fb..c13a51dab5 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -6,7 +6,7 @@ #include "z_en_kakasi2.h" #include "vt.h" -#include "objects/object_ka/object_ka.h" +#include "assets/objects/object_ka/object_ka.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index 23283a871b..e9ad97ef0e 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -6,7 +6,7 @@ #include "z_en_kakasi3.h" #include "vt.h" -#include "objects/object_ka/object_ka.h" +#include "assets/objects/object_ka/object_ka.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_25) 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 531bfc25a9..82dc41bde4 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -5,8 +5,8 @@ */ #include "z_en_kanban.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_kanban/object_kanban.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_kanban/object_kanban.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) @@ -797,7 +797,7 @@ static f32 sCutAngles[] = { static s32 sUnused[] = { 0, 0, 0 }; // Unused zero vector? -#include "overlays/ovl_En_Kanban/ovl_En_Kanban.c" +#include "assets/overlays/ovl_En_Kanban/ovl_En_Kanban.c" void EnKanban_Draw(Actor* thisx, PlayState* play) { EnKanban* this = (EnKanban*)thisx; 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 5d89c35762..36e287ea8e 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -5,8 +5,8 @@ */ #include "z_en_karebaba.h" -#include "objects/object_dekubaba/object_dekubaba.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_dekubaba/object_dekubaba.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 7862e98e43..0726fad1b2 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -5,10 +5,10 @@ */ #include "z_en_ko.h" -#include "objects/object_fa/object_fa.h" -#include "objects/object_os_anime/object_os_anime.h" -#include "objects/object_km1/object_km1.h" -#include "objects/object_kw1/object_kw1.h" +#include "assets/objects/object_fa/object_fa.h" +#include "assets/objects/object_os_anime/object_os_anime.h" +#include "assets/objects/object_km1/object_km1.h" +#include "assets/objects/object_kw1/object_kw1.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) 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 ebccfefcbe..e6c08e10f2 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -7,9 +7,9 @@ #include "z_en_kusa.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" -#include "objects/object_kusa/object_kusa.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/object_kusa/object_kusa.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_23) diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index c10e64badd..2d9afe326e 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -5,7 +5,7 @@ */ #include "z_en_kz.h" -#include "objects/object_kz/object_kz.h" +#include "assets/objects/object_kz/object_kz.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) 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 a23e942382..38e11640a0 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -5,8 +5,8 @@ */ #include "z_en_light.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index 7a7aee10c5..77f807521a 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -5,7 +5,7 @@ */ #include "z_en_lightbox.h" -#include "objects/object_lightbox/object_lightbox.h" +#include "assets/objects/object_lightbox/object_lightbox.h" #define FLAGS ACTOR_FLAG_4 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 63496dfc49..bf15a3de85 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 @@ -1,5 +1,5 @@ #include "z_en_m_thunder.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index 07d8cac96c..d7c3b91ec1 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -5,7 +5,7 @@ */ #include "z_en_ma1.h" -#include "objects/object_ma1/object_ma1.h" +#include "assets/objects/object_ma1/object_ma1.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index e9f22693d2..c7fb5bf9f9 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -1,5 +1,5 @@ #include "z_en_ma2.h" -#include "objects/object_ma2/object_ma2.h" +#include "assets/objects/object_ma2/object_ma2.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 73ac943015..8897339f0f 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -5,7 +5,7 @@ */ #include "z_en_ma3.h" -#include "objects/object_ma2/object_ma2.h" +#include "assets/objects/object_ma2/object_ma2.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index e4d13b97a4..232e05def6 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -5,7 +5,7 @@ */ #include "z_en_mag.h" -#include "objects/object_mag/object_mag.h" +#include "assets/objects/object_mag/object_mag.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 2f319994b0..ac835e4a18 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -5,7 +5,7 @@ */ #include "z_en_mb.h" -#include "objects/object_mb/object_mb.h" +#include "assets/objects/object_mb/object_mb.h" /* * This actor can have three behaviors: diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index ffecef5402..dfddbc35ac 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -5,7 +5,7 @@ */ #include "z_en_md.h" -#include "objects/object_md/object_md.h" +#include "assets/objects/object_md/object_md.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 9b6cd0f4c0..257c567cb5 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -5,7 +5,7 @@ */ #include "z_en_mk.h" -#include "objects/object_mk/object_mk.h" +#include "assets/objects/object_mk/object_mk.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 7b148c4771..dbe2ad1f3b 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -5,8 +5,8 @@ */ #include "z_en_mm.h" -#include "objects/object_mm/object_mm.h" -#include "objects/object_link_child/object_link_child.h" +#include "assets/objects/object_mm/object_mm.h" +#include "assets/objects/object_link_child/object_link_child.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 49b9950842..f488e76729 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -6,7 +6,7 @@ #include "z_en_mm2.h" #include "vt.h" -#include "objects/object_mm/object_mm.h" +#include "assets/objects/object_mm/object_mm.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index f89c2188f3..97f584e59b 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -5,7 +5,7 @@ */ #include "z_en_ms.h" -#include "objects/object_ms/object_ms.h" +#include "assets/objects/object_ms/object_ms.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 25b395d96a..cd474241b0 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -5,7 +5,7 @@ */ #include "z_en_mu.h" -#include "objects/object_mu/object_mu.h" +#include "assets/objects/object_mu/object_mu.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 6747711015..f1cf345ef1 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -6,7 +6,7 @@ #include "z_en_nb.h" #include "vt.h" -#include "objects/object_nb/object_nb.h" +#include "assets/objects/object_nb/object_nb.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 361d442fcd..031a57ae08 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -5,7 +5,7 @@ */ #include "z_en_niw.h" -#include "objects/object_niw/object_niw.h" +#include "assets/objects/object_niw/object_niw.h" #include "overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h" #include "vt.h" diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 1aa1aafe15..69cedb5e55 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -5,7 +5,7 @@ */ #include "z_en_niw_girl.h" -#include "objects/object_gr/object_gr.h" +#include "assets/objects/object_gr/object_gr.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index e4f92c4dc5..e19d1bc2ff 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -1,6 +1,6 @@ #include "z_en_niw_lady.h" -#include "objects/object_ane/object_ane.h" -#include "objects/object_os_anime/object_os_anime.h" +#include "assets/objects/object_ane/object_ane.h" +#include "assets/objects/object_os_anime/object_os_anime.h" #include "overlays/actors/ovl_En_Niw/z_en_niw.h" #include "vt.h" diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 83d9cf39d4..d1cb883abf 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -6,11 +6,11 @@ #include "z_en_nutsball.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/object_dekunuts/object_dekunuts.h" -#include "objects/object_hintnuts/object_hintnuts.h" -#include "objects/object_shopnuts/object_shopnuts.h" -#include "objects/object_dns/object_dns.h" -#include "objects/object_dnk/object_dnk.h" +#include "assets/objects/object_dekunuts/object_dekunuts.h" +#include "assets/objects/object_hintnuts/object_hintnuts.h" +#include "assets/objects/object_shopnuts/object_shopnuts.h" +#include "assets/objects/object_dns/object_dns.h" +#include "assets/objects/object_dnk/object_dnk.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index 1715e2a97b..f04a4d3a2d 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -5,7 +5,7 @@ */ #include "z_en_nwc.h" -#include "objects/object_nwc/object_nwc.h" +#include "assets/objects/object_nwc/object_nwc.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index 689749ca4b..c99aa7954e 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -1,5 +1,5 @@ #include "z_en_ny.h" -#include "objects/object_ny/object_ny.h" +#include "assets/objects/object_ny/object_ny.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 8b2925f1bd..3ef0699fcd 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -5,8 +5,8 @@ */ #include "z_en_okarina_tag.h" -#include "scenes/misc/hakaana_ouke/hakaana_ouke_scene.h" -#include "scenes/overworld/spot02/spot02_scene.h" +#include "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h" +#include "assets/scenes/overworld/spot02/spot02_scene.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 1649e5a305..50fed43d5a 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -1,5 +1,5 @@ #include "z_en_okuta.h" -#include "objects/object_okuta/object_okuta.h" +#include "assets/objects/object_okuta/object_okuta.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) 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 9b05d8bc3d..3448f85daa 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -1,18 +1,18 @@ #include "z_en_ossan.h" #include "vt.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_ossan/object_ossan.h" -#include "objects/object_oF1d_map/object_oF1d_map.h" -#include "objects/object_os/object_os.h" -#include "objects/object_zo/object_zo.h" -#include "objects/object_rs/object_rs.h" -#include "objects/object_ds2/object_ds2.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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" +#include "assets/objects/object_zo/object_zo.h" +#include "assets/objects/object_rs/object_rs.h" +#include "assets/objects/object_ds2/object_ds2.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#include "objects/object_masterkokiri/object_masterkokiri.h" -#include "objects/object_km1/object_km1.h" -#include "objects/object_mastergolon/object_mastergolon.h" -#include "objects/object_masterzoora/object_masterzoora.h" -#include "objects/object_masterkokirihead/object_masterkokirihead.h" +#include "assets/objects/object_masterkokiri/object_masterkokiri.h" +#include "assets/objects/object_km1/object_km1.h" +#include "assets/objects/object_mastergolon/object_mastergolon.h" +#include "assets/objects/object_masterzoora/object_masterzoora.h" +#include "assets/objects/object_masterkokirihead/object_masterkokirihead.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index b812bb4a94..7063c52d21 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -5,9 +5,9 @@ */ #include "z_en_owl.h" -#include "objects/object_owl/object_owl.h" -#include "scenes/overworld/spot06/spot06_scene.h" -#include "scenes/overworld/spot16/spot16_scene.h" +#include "assets/objects/object_owl/object_owl.h" +#include "assets/scenes/overworld/spot06/spot06_scene.h" +#include "assets/scenes/overworld/spot16/spot16_scene.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 30399d9e1e..11c9069389 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -5,8 +5,8 @@ */ #include "z_en_part.h" -#include "objects/object_tite/object_tite.h" -#include "objects/object_ik/object_ik.h" +#include "assets/objects/object_tite/object_tite.h" +#include "assets/objects/object_ik/object_ik.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index f4b022b608..a26f2db372 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -1,5 +1,5 @@ #include "z_en_peehat.h" -#include "objects/object_peehat/object_peehat.h" +#include "assets/objects/object_peehat/object_peehat.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index 5c46ba4a40..86b74b3ed5 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -5,7 +5,7 @@ */ #include "z_en_po_desert.h" -#include "objects/object_po_field/object_po_field.h" +#include "assets/objects/object_po_field/object_po_field.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_7 | ACTOR_FLAG_12) 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 5e7f738d94..8c2f7ae37a 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 @@ -5,8 +5,8 @@ */ #include "z_en_po_field.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_po_field/object_po_field.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_po_field/object_po_field.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_12) diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 4a622c1cf8..8d2dbdcf09 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -6,7 +6,7 @@ #include "z_en_po_relay.h" #include "overlays/actors/ovl_En_Honotrap/z_en_honotrap.h" -#include "objects/object_tk/object_tk.h" +#include "assets/objects/object_tk/object_tk.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_12 | ACTOR_FLAG_16) 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 322af40760..849fdd038c 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 @@ -5,8 +5,8 @@ */ #include "z_en_po_sisters.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_po_sisters/object_po_sisters.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_po_sisters/object_po_sisters.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_9 | ACTOR_FLAG_12 | ACTOR_FLAG_14) diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index fb8c1204c2..29707a407f 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -5,8 +5,8 @@ */ #include "z_en_poh.h" -#include "objects/object_poh/object_poh.h" -#include "objects/object_po_composer/object_po_composer.h" +#include "assets/objects/object_poh/object_poh.h" +#include "assets/objects/object_po_composer/object_po_composer.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_12) diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index b21f3814d6..01a2dca178 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -5,7 +5,7 @@ */ #include "z_en_pu_box.h" -#include "objects/object_pu_box/object_pu_box.h" +#include "assets/objects/object_pu_box/object_pu_box.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index fafce6e758..cde8a3f689 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -1,5 +1,5 @@ #include "z_en_rd.h" -#include "objects/object_rd/object_rd.h" +#include "assets/objects/object_rd/object_rd.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 0088574977..da5ecc4f3e 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -8,7 +8,7 @@ #include "z_en_reeba.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "vt.h" -#include "objects/object_reeba/object_reeba.h" +#include "assets/objects/object_reeba/object_reeba.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index 805bb29b4c..a5e4cca852 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -6,7 +6,7 @@ #include "z_en_rl.h" #include "vt.h" -#include "objects/object_rl/object_rl.h" +#include "assets/objects/object_rl/object_rl.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 3f86582be2..3ae66adfc5 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -5,7 +5,7 @@ */ #include "z_en_rr.h" -#include "objects/object_rr/object_rr.h" +#include "assets/objects/object_rr/object_rr.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index e5e1618104..4eb0235aee 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -5,7 +5,7 @@ */ #include "z_en_ru1.h" -#include "objects/object_ru1/object_ru1.h" +#include "assets/objects/object_ru1/object_ru1.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4 | ACTOR_FLAG_26) diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index e4142cfcea..21d51afec7 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -5,7 +5,7 @@ */ #include "z_en_ru2.h" -#include "objects/object_ru2/object_ru2.h" +#include "assets/objects/object_ru2/object_ru2.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "vt.h" diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 60ea172815..0fb7c78355 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -1,8 +1,8 @@ #include "z_en_sa.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#include "objects/object_sa/object_sa.h" -#include "scenes/overworld/spot04/spot04_scene.h" -#include "scenes/overworld/spot05/spot05_scene.h" +#include "assets/objects/object_sa/object_sa.h" +#include "assets/scenes/overworld/spot04/spot04_scene.h" +#include "assets/scenes/overworld/spot05/spot05_scene.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index da7aa51d32..ba1d0e5b1c 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -6,7 +6,7 @@ #include "z_en_sb.h" #include "vt.h" -#include "objects/object_sb/object_sb.h" +#include "assets/objects/object_sb/object_sb.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index 14ee20119c..c41272b6ef 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -84,7 +84,7 @@ static Vec3f D_80AFA288[] = { static u32 D_80AFA390[] = { 0, 0 }; -#include "overlays/ovl_En_Sda/ovl_En_Sda.c" +#include "assets/overlays/ovl_En_Sda/ovl_En_Sda.c" static Vec3f D_80AFA660[16]; diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index ea3dfa2b07..5431729ece 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -1,5 +1,5 @@ #include "z_en_shopnuts.h" -#include "objects/object_shopnuts/object_shopnuts.h" +#include "assets/objects/object_shopnuts/object_shopnuts.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 44b535e8b8..aee324cfff 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -5,7 +5,7 @@ */ #include "z_en_siofuki.h" -#include "objects/object_siofuki/object_siofuki.h" +#include "assets/objects/object_siofuki/object_siofuki.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 2e14f6eab0..f5a2eaa879 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -1,6 +1,6 @@ #include "z_en_skb.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" -#include "objects/object_skb/object_skb.h" +#include "assets/objects/object_skb/object_skb.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 3ba2a3efea..ff565fabb6 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -1,6 +1,6 @@ #include "z_en_skj.h" #include "overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h" -#include "objects/object_skj/object_skj.h" +#include "assets/objects/object_skj/object_skj.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index c23880d029..e8c29dcb88 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -5,7 +5,7 @@ */ #include "z_en_skjneedle.h" -#include "objects/object_skj/object_skj.h" +#include "assets/objects/object_skj/object_skj.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_9) diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index e5d9be8389..6faf9661fe 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -1,5 +1,5 @@ #include "z_en_ssh.h" -#include "objects/object_ssh/object_ssh.h" +#include "assets/objects/object_ssh/object_ssh.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) @@ -28,7 +28,7 @@ void EnSsh_Drop(EnSsh* this, PlayState* play); void EnSsh_Return(EnSsh* this, PlayState* play); void EnSsh_Start(EnSsh* this, PlayState* play); -#include "overlays/ovl_En_Ssh/ovl_En_Ssh.c" +#include "assets/overlays/ovl_En_Ssh/ovl_En_Ssh.c" const ActorInit En_Ssh_InitVars = { ACTOR_EN_SSH, diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index b2e235a0bd..e0d654cc03 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -5,7 +5,7 @@ */ #include "z_en_st.h" -#include "objects/object_st/object_st.h" +#include "assets/objects/object_st/object_st.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) @@ -21,7 +21,7 @@ void EnSt_Die(EnSt* this, PlayState* play); void EnSt_BounceAround(EnSt* this, PlayState* play); void EnSt_FinishBouncing(EnSt* this, PlayState* play); -#include "overlays/ovl_En_St/ovl_En_St.c" +#include "assets/overlays/ovl_En_St/ovl_En_St.c" const ActorInit En_St_InitVars = { ACTOR_EN_ST, diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 81906d61c1..a62c1be0db 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -6,8 +6,8 @@ #include "vt.h" #include "z_en_sth.h" -#include "objects/object_ahg/object_ahg.h" -#include "objects/object_boj/object_boj.h" +#include "assets/objects/object_ahg/object_ahg.h" +#include "assets/objects/object_boj/object_boj.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) @@ -34,7 +34,7 @@ const ActorInit En_Sth_InitVars = { NULL, }; -#include "overlays/ovl_En_Sth/ovl_En_Sth.c" +#include "assets/overlays/ovl_En_Sth/ovl_En_Sth.c" static ColliderCylinderInit sCylinderInit = { { diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index d188e41072..9934941fd5 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -5,7 +5,7 @@ */ #include "z_en_stream.h" -#include "objects/object_stream/object_stream.h" +#include "assets/objects/object_stream/object_stream.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index cad5d8425d..a55498d3a1 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -1,5 +1,5 @@ #include "z_en_sw.h" -#include "objects/object_st/object_st.h" +#include "assets/objects/object_st/object_st.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 293acdcffa..ccc3bc509e 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -1,7 +1,7 @@ #include "z_en_syateki_man.h" #include "vt.h" #include "overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h" -#include "objects/object_ossan/object_ossan.h" +#include "assets/objects/object_ossan/object_ossan.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index a022e79d55..857c51810f 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -5,7 +5,7 @@ */ #include "z_en_syateki_niw.h" -#include "objects/object_niw/object_niw.h" +#include "assets/objects/object_niw/object_niw.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index ad77a18e2d..3145dc8c11 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -6,7 +6,7 @@ #include "z_en_ta.h" #include "vt.h" -#include "objects/object_ta/object_ta.h" +#include "assets/objects/object_ta/object_ta.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 8221383e8e..0f5e7b6c54 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -6,7 +6,7 @@ #include "z_en_takara_man.h" #include "vt.h" -#include "objects/object_ts/object_ts.h" +#include "assets/objects/object_ts/object_ts.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index 1b9a36648b..197154e007 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -5,7 +5,7 @@ */ #include "z_en_tana.h" -#include "objects/object_shop_dungen/object_shop_dungen.h" +#include "assets/objects/object_shop_dungen/object_shop_dungen.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index 89d7dbf6e9..64cfc04b33 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -5,7 +5,7 @@ */ #include "z_en_test.h" -#include "objects/object_sk2/object_sk2.h" +#include "assets/objects/object_sk2/object_sk2.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index 29bd66bb98..eac43e717b 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -5,7 +5,7 @@ */ #include "z_en_tg.h" -#include "objects/object_mu/object_mu.h" +#include "assets/objects/object_mu/object_mu.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 1338d7ea3f..b047206d92 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #include "vt.h" -#include "objects/object_tite/object_tite.h" +#include "assets/objects/object_tite/object_tite.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) 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 3581e263ef..473f3d9e66 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -5,8 +5,8 @@ */ #include "z_en_tk.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_tk/object_tk.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_tk/object_tk.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 0ef24cf0cf..60be6d4643 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -5,7 +5,7 @@ */ #include "z_en_torch2.h" -#include "objects/object_torch2/object_torch2.h" +#include "assets/objects/object_torch2/object_torch2.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index 786a1b5704..86651bac21 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -5,7 +5,7 @@ */ #include "z_en_toryo.h" -#include "objects/object_toryo/object_toryo.h" +#include "assets/objects/object_toryo/object_toryo.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 92535ef226..7a96042515 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -5,7 +5,7 @@ */ #include "z_en_tp.h" -#include "objects/object_tp/object_tp.h" +#include "assets/objects/object_tp/object_tp.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index b57f10f871..5d0b633454 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -5,7 +5,7 @@ */ #include "z_en_tr.h" -#include "objects/object_tr/object_tr.h" +#include "assets/objects/object_tr/object_tr.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 7f08a1cb5d..2df3f1e891 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -5,7 +5,7 @@ */ #include "z_en_trap.h" -#include "objects/object_trap/object_trap.h" +#include "assets/objects/object_trap/object_trap.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 4d025aa4cb..f47c91b277 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -5,7 +5,7 @@ */ #include "z_en_tubo_trap.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "vt.h" diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index ceb7517819..405fd4136f 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -5,7 +5,7 @@ */ #include "z_en_vali.h" -#include "objects/object_vali/object_vali.h" +#include "assets/objects/object_vali/object_vali.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_12) diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.c b/src/overlays/actors/ovl_En_Vase/z_en_vase.c index 40c0c27060..b8a7483990 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c @@ -5,7 +5,7 @@ */ #include "z_en_vase.h" -#include "objects/object_vase/object_vase.h" +#include "assets/objects/object_vase/object_vase.h" #define FLAGS ACTOR_FLAG_4 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 9a2dce2d25..563b4dd20c 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 @@ -5,8 +5,8 @@ */ #include "z_en_vb_ball.h" -#include "objects/object_fd/object_fd.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_fd/object_fd.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_Boss_Fd/z_boss_fd.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) 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 f7377ca630..629ec18f4d 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -6,14 +6,14 @@ #include "z_en_viewer.h" #include "overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h" -#include "objects/object_zl4/object_zl4.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_horse_zelda/object_horse_zelda.h" -#include "objects/object_horse_ganon/object_horse_ganon.h" -#include "objects/object_im/object_im.h" -#include "objects/object_gndd/object_gndd.h" -#include "objects/object_ganon/object_ganon.h" -#include "objects/object_opening_demo1/object_opening_demo1.h" +#include "assets/objects/object_zl4/object_zl4.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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" +#include "assets/objects/object_gndd/object_gndd.h" +#include "assets/objects/object_ganon/object_ganon.h" +#include "assets/objects/object_opening_demo1/object_opening_demo1.h" #define FLAGS ACTOR_FLAG_4 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 a06844278f..408fc65ecf 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -5,9 +5,9 @@ */ #include "z_en_vm.h" -#include "objects/object_vm/object_vm.h" +#include "assets/objects/object_vm/object_vm.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4) 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 04d1e65e32..304e83a677 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -5,8 +5,8 @@ */ #include "z_en_wallmas.h" -#include "objects/object_wallmaster/object_wallmaster.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_wallmaster/object_wallmaster.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 61782ce9e5..24bd6293fe 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -5,7 +5,7 @@ */ #include "z_en_weiyer.h" -#include "objects/object_ei/object_ei.h" +#include "assets/objects/object_ei/object_ei.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2) diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index a1c4713423..2aef3c07dc 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -7,7 +7,7 @@ #include "z_en_wf.h" #include "vt.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" -#include "objects/object_wf/object_wf.h" +#include "assets/objects/object_wf/object_wf.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index a7f3f5f054..3ab251c789 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -5,7 +5,7 @@ */ #include "z_en_wood02.h" -#include "objects/object_wood02/object_wood02.h" +#include "assets/objects/object_wood02/object_wood02.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index ec7d574562..3694d7f9c9 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -7,11 +7,11 @@ #include "z_en_xc.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#include "objects/object_xc/object_xc.h" -#include "scenes/overworld/spot05/spot05_scene.h" -#include "scenes/overworld/spot17/spot17_scene.h" -#include "scenes/indoors/tokinoma/tokinoma_scene.h" -#include "scenes/dungeons/ice_doukutu/ice_doukutu_scene.h" +#include "assets/objects/object_xc/object_xc.h" +#include "assets/scenes/overworld/spot05/spot05_scene.h" +#include "assets/scenes/overworld/spot17/spot17_scene.h" +#include "assets/scenes/indoors/tokinoma/tokinoma_scene.h" +#include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 0cdc72e32b..19e1356de0 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -5,7 +5,7 @@ */ #include "z_en_yukabyun.h" -#include "objects/object_yukabyun/object_yukabyun.h" +#include "assets/objects/object_yukabyun/object_yukabyun.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 36bc897116..a94eb15903 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -5,7 +5,7 @@ */ #include "z_en_zf.h" -#include "objects/object_zf/object_zf.h" +#include "assets/objects/object_zf/object_zf.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index a181876354..37e4305a81 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -5,7 +5,7 @@ */ #include "z_en_zl1.h" -#include "objects/object_zl1/object_zl1.h" +#include "assets/objects/object_zl1/object_zl1.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index c09a7d3092..a7492d3d73 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -8,8 +8,8 @@ #include "vt.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#include "objects/object_zl2/object_zl2.h" -#include "objects/object_zl2_anime1/object_zl2_anime1.h" +#include "assets/objects/object_zl2/object_zl2.h" +#include "assets/objects/object_zl2_anime1/object_zl2_anime1.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 5d658c1a33..cbed9c5109 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -9,8 +9,8 @@ #include "vt.h" #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#include "objects/object_zl2/object_zl2.h" -#include "objects/object_zl2_anime2/object_zl2_anime2.h" +#include "assets/objects/object_zl2/object_zl2.h" +#include "assets/objects/object_zl2_anime2/object_zl2_anime2.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index bc97c44216..d32098232f 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -5,8 +5,8 @@ */ #include "z_en_zl4.h" -#include "objects/object_zl4/object_zl4.h" -#include "scenes/indoors/nakaniwa/nakaniwa_scene.h" +#include "assets/objects/object_zl4/object_zl4.h" +#include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index ad7e110154..73160159d3 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -5,7 +5,7 @@ */ #include "z_en_zo.h" -#include "objects/object_zo/object_zo.h" +#include "assets/objects/object_zo/object_zo.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index d6955ea884..65fbf75ef2 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -5,7 +5,7 @@ */ #include "z_en_fhg.h" -#include "objects/object_fhg/object_fhg.h" +#include "assets/objects/object_fhg/object_fhg.h" #include "overlays/actors/ovl_Door_Shutter/z_door_shutter.h" #include "overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h" #include "overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h" diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index 13577be9b9..5ca553bf22 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -26,7 +26,7 @@ const ActorInit End_Title_InitVars = { (ActorFunc)EndTitle_DrawFull, }; -#include "overlays/ovl_End_Title/ovl_End_Title.c" +#include "assets/overlays/ovl_End_Title/ovl_End_Title.c" void EndTitle_Init(Actor* thisx, PlayState* play) { EndTitle* this = (EndTitle*)thisx; diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 93b8f49914..71edd623af 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -7,7 +7,7 @@ #include "z_fishing.h" #include "overlays/actors/ovl_En_Kanban/z_en_kanban.h" -#include "objects/object_fish/object_fish.h" +#include "assets/objects/object_fish/object_fish.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index f50b09eb5b..0c2a52e348 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -5,7 +5,7 @@ */ #include "z_item_b_heart.h" -#include "objects/object_gi_hearts/object_gi_hearts.h" +#include "assets/objects/object_gi_hearts/object_gi_hearts.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 9ea386ff6b..532f7626fc 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -5,7 +5,7 @@ */ #include "z_item_ocarina.h" -#include "scenes/overworld/spot00/spot00_scene.h" +#include "assets/scenes/overworld/spot00/spot00_scene.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index e3a07fcd1d..b72b644f59 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -6,7 +6,7 @@ #include "vt.h" #include "z_item_shield.h" -#include "objects/object_link_child/object_link_child.h" +#include "assets/objects/object_link_child/object_link_child.h" #define FLAGS ACTOR_FLAG_4 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 d451ebc2eb..c866610e56 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -5,7 +5,7 @@ */ #include "z_magic_dark.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_25) @@ -30,7 +30,7 @@ const ActorInit Magic_Dark_InitVars = { (ActorFunc)MagicDark_OrbDraw, }; -#include "overlays/ovl_Magic_Dark/ovl_Magic_Dark.c" +#include "assets/overlays/ovl_Magic_Dark/ovl_Magic_Dark.c" // unused static Color_RGBA8 D_80B88B10[] = { { 50, 100, 150, 200 }, { 255, 200, 150, 100 } }; diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index 747c6a9539..5ba26203e1 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -42,7 +42,7 @@ const ActorInit Magic_Fire_InitVars = { (ActorFunc)MagicFire_Draw, }; -#include "overlays/ovl_Magic_Fire/ovl_Magic_Fire.c" +#include "assets/overlays/ovl_Magic_Fire/ovl_Magic_Fire.c" static ColliderCylinderInit sCylinderInit = { { diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index afb9007bd0..340405a785 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -31,7 +31,7 @@ const ActorInit Magic_Wind_InitVars = { (ActorFunc)MagicWind_Draw, }; -#include "overlays/ovl_Magic_Wind/ovl_Magic_Wind.c" +#include "assets/overlays/ovl_Magic_Wind/ovl_Magic_Wind.c" static u8 sAlphaUpdVals[] = { 0x00, 0x03, 0x04, 0x07, 0x09, 0x0A, 0x0D, 0x0F, 0x11, 0x12, 0x15, 0x16, 0x19, 0x1B, 0x1C, 0x1F, 0x21, 0x23, diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 809f6ce68d..e163fb1101 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -5,7 +5,7 @@ */ #include "z_mir_ray.h" -#include "objects/object_mir_ray/object_mir_ray.h" +#include "assets/objects/object_mir_ray/object_mir_ray.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) 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 a0a4dbeb51..941763d556 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -5,8 +5,8 @@ */ #include "z_obj_bean.h" -#include "objects/object_mamenoki/object_mamenoki.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_mamenoki/object_mamenoki.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "vt.h" #define FLAGS ACTOR_FLAG_22 diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index c05e9692bd..5252b521aa 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -6,7 +6,7 @@ #include "z_obj_bombiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/object_bombiwa/object_bombiwa.h" +#include "assets/objects/object_bombiwa/object_bombiwa.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index ab09a1fe24..2b7d564222 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -6,7 +6,7 @@ #include "z_obj_comb.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index c4aae3319c..307ad2f323 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -5,7 +5,7 @@ */ #include "z_obj_dekujr.h" -#include "objects/object_dekujr/object_dekujr.h" +#include "assets/objects/object_dekujr/object_dekujr.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index 131b7ac791..0e89e791cd 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -5,7 +5,7 @@ */ #include "z_obj_elevator.h" -#include "objects/object_d_elevator/object_d_elevator.h" +#include "assets/objects/object_d_elevator/object_d_elevator.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index cff27c5cf3..ded88b9a87 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -5,7 +5,7 @@ */ #include "z_obj_hamishi.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index 1247640c05..4468077c2d 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -5,7 +5,7 @@ */ #include "z_obj_hana.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index e1a1c5f1e3..c7a6882092 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -5,7 +5,7 @@ */ #include "z_obj_hsblock.h" -#include "objects/object_d_hsblock/object_d_hsblock.h" +#include "assets/objects/object_d_hsblock/object_d_hsblock.h" #define FLAGS 0 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 0311ad67d0..24989fa383 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 @@ -5,7 +5,7 @@ */ #include "z_obj_ice_poly.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 4d47cff56e..fa40e59ff6 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -5,7 +5,7 @@ */ #include "z_obj_kibako.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_26) diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 6fc45b0c04..9ab64070aa 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -5,7 +5,7 @@ */ #include "z_obj_kibako2.h" -#include "objects/object_kibako2/object_kibako2.h" +#include "assets/objects/object_kibako2/object_kibako2.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 10d2ae4282..81907ea4dd 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -5,7 +5,7 @@ */ #include "z_obj_lift.h" -#include "objects/object_d_lift/object_d_lift.h" +#include "assets/objects/object_d_lift/object_d_lift.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 6d22faac17..cf8da35b49 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -7,7 +7,7 @@ #include "z_obj_lightswitch.h" #include "vt.h" #include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" -#include "objects/object_lightswitch/object_lightswitch.h" +#include "assets/objects/object_lightswitch/object_lightswitch.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 7600dbd489..76c0e9f77e 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -6,7 +6,7 @@ #include "z_obj_oshihiki.h" #include "overlays/actors/ovl_Obj_Switch/z_obj_switch.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index 86c30a075e..72cbd9a800 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -5,7 +5,7 @@ */ #include "z_obj_switch.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "vt.h" #define FLAGS ACTOR_FLAG_4 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 0b63558c04..a0b7bc505d 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -6,8 +6,8 @@ #include "z_obj_syokudai.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_syokudai/object_syokudai.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_syokudai/object_syokudai.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index ed9c7fe41b..3436cd2158 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -5,7 +5,7 @@ */ #include "z_obj_timeblock.h" -#include "objects/object_timeblock/object_timeblock.h" +#include "assets/objects/object_timeblock/object_timeblock.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4 | ACTOR_FLAG_25 | ACTOR_FLAG_27) diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index bab28ce5e6..c71254ef72 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -6,8 +6,8 @@ #include "z_obj_tsubo.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#include "objects/object_tsubo/object_tsubo.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/object_tsubo/object_tsubo.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_23) diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index e0de00886e..9376019d64 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -5,7 +5,7 @@ */ #include "z_obj_warp2block.h" -#include "objects/object_timeblock/object_timeblock.h" +#include "assets/objects/object_timeblock/object_timeblock.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4 | ACTOR_FLAG_25 | ACTOR_FLAG_27) 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 991b14a024..72b57d52c7 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -5,9 +5,9 @@ */ #include "z_object_kankyo.h" -#include "objects/object_demo_kekkai/object_demo_kekkai.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_spot02_objects/object_spot02_objects.h" +#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_spot02_objects/object_spot02_objects.h" #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25) diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index c5c11880a3..287499b09b 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -28,7 +28,7 @@ const ActorInit Oceff_Spot_InitVars = { (ActorFunc)OceffSpot_Draw, }; -#include "overlays/ovl_Oceff_Spot/ovl_Oceff_Spot.c" +#include "assets/overlays/ovl_Oceff_Spot/ovl_Oceff_Spot.c" static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE), diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index 593358a15e..8c51b619d2 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -120,7 +120,7 @@ void OceffStorm_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); } -#include "overlays/ovl_Oceff_Storm/ovl_Oceff_Storm.c" +#include "assets/overlays/ovl_Oceff_Storm/ovl_Oceff_Storm.c" void OceffStorm_Draw2(Actor* thisx, PlayState* play) { u32 scroll = play->state.frames & 0xFFF; diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 2c7deffcef..c437e427f7 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -56,7 +56,7 @@ void OceffWipe_Update(Actor* thisx, PlayState* play) { } } -#include "overlays/ovl_Oceff_Wipe/ovl_Oceff_Wipe.c" +#include "assets/overlays/ovl_Oceff_Wipe/ovl_Oceff_Wipe.c" static u8 sAlphaIndices[] = { 0x01, 0x10, 0x22, 0x01, 0x20, 0x12, 0x01, 0x20, 0x12, 0x01, diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index e2959545b4..3fa035cd91 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -56,7 +56,7 @@ void OceffWipe2_Update(Actor* thisx, PlayState* play) { } } -#include "overlays/ovl_Oceff_Wipe2/ovl_Oceff_Wipe2.c" +#include "assets/overlays/ovl_Oceff_Wipe2/ovl_Oceff_Wipe2.c" void OceffWipe2_Draw(Actor* thisx, PlayState* play) { u32 scroll = play->state.frames & 0xFF; diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 7dfaf9c46c..4ca72297a5 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -26,7 +26,7 @@ const ActorInit Oceff_Wipe3_InitVars = { (ActorFunc)OceffWipe3_Draw, }; -#include "overlays/ovl_Oceff_Wipe3/ovl_Oceff_Wipe3.c" +#include "assets/overlays/ovl_Oceff_Wipe3/ovl_Oceff_Wipe3.c" void OceffWipe3_Init(Actor* thisx, PlayState* play) { OceffWipe3* this = (OceffWipe3*)thisx; diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 53b5fadd13..70469e21b9 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -52,7 +52,7 @@ void OceffWipe4_Update(Actor* thisx, PlayState* play) { } } -#include "overlays/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.c" +#include "assets/overlays/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.c" void OceffWipe4_Draw(Actor* thisx, PlayState* play) { u32 scroll = play->state.frames & 0xFFF; diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 9b80174380..868e753b79 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -6,7 +6,7 @@ #include "z_shot_sun.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#include "scenes/overworld/spot06/spot06_scene.h" +#include "assets/scenes/overworld/spot06/spot06_scene.h" #include "vt.h" #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 536aa99280..dd58a8c955 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -18,8 +18,8 @@ #include "overlays/actors/ovl_En_Horse/z_en_horse.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_link_child/object_link_child.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_link_child/object_link_child.h" typedef struct { /* 0x00 */ u8 itemId; 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 38750682a9..071f5046ae 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_blast.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] #define rPrimColorG 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 bcd780af1b..e64c991d21 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_bomb.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] #define rTexIdx regs[1] 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 570982b29b..03f5a02f94 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_bomb2.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] #define rTexIdx 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 8e326bf2db..b0ba7b668c 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_bubble.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index 012369d0cb..8d949c9e5b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_d_fire.h" -#include "objects/object_dodongo/object_dodongo.h" +#include "assets/objects/object_dodongo/object_dodongo.h" #define rScale regs[0] #define rTexIdx regs[1] 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 7697ae9aee..ed85786d91 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_dead_db.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 e94c4c4c01..955697d1d3 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_dead_dd.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 a9d2af3ef5..0ac1b73e02 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_dead_ds.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 89fd2b645a..cb9a4dd983 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_dt_bubble.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 87a83c7339..2c264d7eb6 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_dust.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 89c0deef83..addd4e8bea 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_en_fire.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 029fcf4f7b..038cb3755c 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_en_ice.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rLifespan regs[0] #define rYaw regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index a6e385f1a9..651b6c5704 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_extra.h" -#include "objects/object_yabusame_point/object_yabusame_point.h" +#include "assets/objects/object_yabusame_point/object_yabusame_point.h" #define rObjBankIdx regs[0] #define rTimer 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 43090551ad..ebe3213e6c 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_fcircle.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rUnused regs[3] // probably supposed to be an alpha #define rRadius regs[8] diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index 89228baad8..26d1e75696 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -6,7 +6,7 @@ #include "z_eff_ss_fhg_flash.h" #include "overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h" -#include "objects/object_fhg/object_fhg.h" +#include "assets/objects/object_fhg/object_fhg.h" #define rAlpha regs[0] #define rObjBankIdx regs[2] 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 8a7977c5cf..df915ca025 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_fire_tail.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 f094b5405d..d82c9cb417 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_g_fire.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 f7459fc247..4e9dc378af 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_g_magma.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index d908a74191..1469e74ce3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_g_magma2.h" -#include "objects/object_kingdodongo/object_kingdodongo.h" +#include "assets/objects/object_kingdodongo/object_kingdodongo.h" #define rPrimColorR regs[0] #define rPrimColorG regs[1] 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 2174da9f7c..4e7cf3138b 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_g_ripple.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 6dab7072bf..f2858afd78 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_g_spk.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 1b3bb43061..32477114b1 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_g_splash.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" //! @bug the reuse of regs[11] means that EffectSs_DrawGEffect will treat the type as an object bank index // 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 8d4847ba46..a07d924829 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_hahen.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 4f832b81c5..75b11bd271 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_hitmark.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rTexIdx 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 823ba4b3ec..cf5c0de759 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_ice_piece.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rLifespan regs[0] #define rYaw regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index 38474002a3..7e18c2a7ae 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_ice_smoke.h" -#include "objects/object_fz/object_fz.h" +#include "assets/objects/object_fz/object_fz.h" #define rObjBankIdx regs[0] #define rAlpha 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 ca3e078956..b5666bf040 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_k_fire.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 491ae23e43..632072003c 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_kirakira.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 5df4c18856..17c6c1260b 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_lightning.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 b19d0fdb34..9fdba62b39 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_sibuki.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.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 06fb7cd1a9..77ccaf49af 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_sibuki2.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] #define rPrimColorG regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index 5cf110a2e0..b2d36a4b73 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -5,8 +5,8 @@ */ #include "z_eff_ss_stick.h" -#include "objects/object_link_boy/object_link_boy.h" -#include "objects/object_link_child/object_link_child.h" +#include "assets/objects/object_link_boy/object_link_boy.h" +#include "assets/objects/object_link_child/object_link_child.h" #define rObjBankIdx regs[0] #define rYaw 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 b842d6463f..db2bbafe7d 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 @@ -5,7 +5,7 @@ */ #include "z_eff_ss_stone1.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rReg0 regs[0] diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index c6ca92942c..b55d5fe8d4 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -1,6 +1,6 @@ #include "file_choose.h" -#include "textures/title_static/title_static.h" -#include "textures/parameter_static/parameter_static.h" +#include "assets/textures/title_static/title_static.h" +#include "assets/textures/parameter_static/parameter_static.h" static s16 sUnused = 106; diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c index 04862a5adf..5a4adc438a 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c @@ -1,5 +1,5 @@ #include "file_choose.h" -#include "textures/title_static/title_static.h" +#include "assets/textures/title_static/title_static.h" #include "assets/overlays/ovl_File_Choose/ovl_file_choose.h" static s16 D_808124C0[] = { diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 68e8e571ef..0c195c2aa2 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -6,7 +6,7 @@ #include "global.h" #include "alloca.h" -#include "textures/nintendo_rogo_static/nintendo_rogo_static.h" +#include "assets/textures/nintendo_rogo_static/nintendo_rogo_static.h" void Title_PrintBuildInfo(Gfx** gfxp) { Gfx* g; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index bd0c094e82..6892743754 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -1,6 +1,6 @@ #include "z_kaleido_scope.h" -#include "textures/parameter_static/parameter_static.h" -#include "textures/icon_item_static/icon_item_static.h" +#include "assets/textures/parameter_static/parameter_static.h" +#include "assets/textures/icon_item_static/icon_item_static.h" void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { static s16 D_8082A070[][4] = { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c index 144f0b044c..ef47e9d34d 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -1,5 +1,5 @@ #include "z_kaleido_scope.h" -#include "textures/parameter_static/parameter_static.h" +#include "assets/textures/parameter_static/parameter_static.h" // Positions of each input section in the editor static u16 sSectionPositions[][2] = { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index bf445a5637..9775c142cb 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -1,6 +1,6 @@ #include "z_kaleido_scope.h" -#include "textures/icon_item_static/icon_item_static.h" -#include "textures/parameter_static/parameter_static.h" +#include "assets/textures/icon_item_static/icon_item_static.h" +#include "assets/textures/parameter_static/parameter_static.h" static u8 sChildUpgrades[] = { UPG_BULLET_BAG, UPG_BOMB_BAG, UPG_STRENGTH, UPG_SCALE }; static u8 sAdultUpgrades[] = { UPG_QUIVER, UPG_BOMB_BAG, UPG_STRENGTH, UPG_SCALE }; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 19e4061d6e..b2ddd1eb28 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -1,5 +1,5 @@ #include "z_kaleido_scope.h" -#include "textures/parameter_static/parameter_static.h" +#include "assets/textures/parameter_static/parameter_static.h" u8 gAmmoItems[] = { ITEM_STICK, ITEM_NUT, ITEM_BOMB, ITEM_BOW, ITEM_NONE, ITEM_NONE, ITEM_SLINGSHOT, ITEM_NONE, diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c index 4db164bd98..65a7df5e57 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c @@ -1,11 +1,11 @@ #include "z_kaleido_scope.h" -#include "textures/icon_item_24_static/icon_item_24_static.h" -#include "textures/icon_item_nes_static/icon_item_nes_static.h" -#include "textures/icon_item_ger_static/icon_item_ger_static.h" -#include "textures/icon_item_fra_static/icon_item_fra_static.h" -#include "textures/icon_item_field_static/icon_item_field_static.h" -#include "textures/icon_item_dungeon_static/icon_item_dungeon_static.h" -#include "textures/icon_item_nes_static/icon_item_nes_static.h" +#include "assets/textures/icon_item_24_static/icon_item_24_static.h" +#include "assets/textures/icon_item_nes_static/icon_item_nes_static.h" +#include "assets/textures/icon_item_ger_static/icon_item_ger_static.h" +#include "assets/textures/icon_item_fra_static/icon_item_fra_static.h" +#include "assets/textures/icon_item_field_static/icon_item_field_static.h" +#include "assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.h" +#include "assets/textures/icon_item_nes_static/icon_item_nes_static.h" void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) { static void* dungeonItemTexs[] = { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 3cb1ca6387..c92d02e238 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -1,10 +1,10 @@ #include "z_kaleido_scope.h" -#include "textures/icon_item_static/icon_item_static.h" -#include "textures/icon_item_24_static/icon_item_24_static.h" -#include "textures/icon_item_nes_static/icon_item_nes_static.h" -#include "textures/icon_item_ger_static/icon_item_ger_static.h" -#include "textures/icon_item_fra_static/icon_item_fra_static.h" -#include "textures/icon_item_gameover_static/icon_item_gameover_static.h" +#include "assets/textures/icon_item_static/icon_item_static.h" +#include "assets/textures/icon_item_24_static/icon_item_24_static.h" +#include "assets/textures/icon_item_nes_static/icon_item_nes_static.h" +#include "assets/textures/icon_item_ger_static/icon_item_ger_static.h" +#include "assets/textures/icon_item_fra_static/icon_item_fra_static.h" +#include "assets/textures/icon_item_gameover_static/icon_item_gameover_static.h" #include "vt.h" static void* sEquipmentFRATexs[] = { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c index 88f6f231a7..ce19d3fe3c 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c @@ -1,5 +1,5 @@ #include "z_kaleido_scope.h" -#include "textures/parameter_static/parameter_static.h" +#include "assets/textures/parameter_static/parameter_static.h" typedef struct { /* 0x00 */ void* texture; diff --git a/tools/m2ctx.py b/tools/m2ctx.py index a3dad5974f..e8846b2fc1 100755 --- a/tools/m2ctx.py +++ b/tools/m2ctx.py @@ -27,7 +27,7 @@ def get_c_file(directory): def import_c_file(in_file): in_file = os.path.relpath(in_file, root_dir) - cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Iassets", "-Isrc", "-undef", "-D__sgi", "-D_LANGUAGE_C", + cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Isrc", "-undef", "-D__sgi", "-D_LANGUAGE_C", "-DNON_MATCHING", "-D_Static_assert(x, y)=", "-D__attribute__(x)=", in_file] try: return subprocess.check_output(cpp_command, cwd=root_dir, encoding="utf-8")