falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove assets from automatic includes (#1683)

This commit is contained in:
Derek Hensley 2024-09-10 12:16:56 -06:00 committed by GitHub
parent 19da273ca0
commit b9ea1c19ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
642 changed files with 836 additions and 838 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -114,7 +114,7 @@ NM := $(MIPS_BINUTILS_PREFIX)nm
OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy
OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump
IINC := -Iinclude -Iinclude/libc -Isrc -Iassets -I$(BUILD_DIR) -I.
IINC := -Iinclude -Iinclude/libc -Isrc -I$(BUILD_DIR) -I.
ifeq ($(KEEP_MDEBUG),0)
RM_MDEBUG = $(OBJCOPY) --remove-section .mdebug $@

2
assets/xml/scenes/Z2_00KEIKOKU/Z2_00KEIKOKU.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
<ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="assets/misc/scene_texture_08/"/>
<File Name="Z2_00KEIKOKU" Segment="2" Game="MM">
<Scene Name="Z2_00KEIKOKU" Offset="0x0"/>
<Cutscene Name="gTerminaFieldClockTowerOpeningCs" Offset="0x9D8"/> <!-- Original name is "clock_t_change" -->

2
assets/xml/scenes/Z2_10YUKIYAMANOMURA/Z2_10YUKIYAMANOMURA.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
<File Name="Z2_10YUKIYAMANOMURA" Segment="2" Game="MM">
<Scene Name="Z2_10YUKIYAMANOMURA" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_10YUKIYAMANOMURA2/Z2_10YUKIYAMANOMURA2.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
<File Name="Z2_10YUKIYAMANOMURA2" Segment="2" Game="MM">
<Scene Name="Z2_10YUKIYAMANOMURA2" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_11GORONNOSATO/Z2_11GORONNOSATO.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
<File Name="Z2_11GORONNOSATO" Segment="2" Game="MM">
<Scene Name="Z2_11GORONNOSATO" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_11GORONNOSATO2/Z2_11GORONNOSATO2.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
<File Name="Z2_11GORONNOSATO2" Segment="2" Game="MM">
<Scene Name="Z2_11GORONNOSATO2" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_12HAKUGINMAE/Z2_12HAKUGINMAE.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
<File Name="Z2_12HAKUGINMAE" Segment="2" Game="MM">
<Scene Name="Z2_12HAKUGINMAE" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_14YUKIDAMANOMITI/Z2_14YUKIDAMANOMITI.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
<File Name="Z2_14YUKIDAMANOMITI" Segment="2" Game="MM">
<Scene Name="Z2_14YUKIDAMANOMITI" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_17SETUGEN/Z2_17SETUGEN.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
<File Name="Z2_17SETUGEN" Segment="2" Game="MM">
<Scene Name="Z2_17SETUGEN" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_17SETUGEN2/Z2_17SETUGEN2.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="misc/scene_texture_04/"/>
<ExternalFile XmlPath="misc/scene_texture_04.xml" OutPath="assets/misc/scene_texture_04/"/>
<File Name="Z2_17SETUGEN2" Segment="2" Game="MM">
<Scene Name="Z2_17SETUGEN2" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_20SICHITAI/Z2_20SICHITAI.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
<ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="assets/misc/scene_texture_06/"/>
<File Name="Z2_20SICHITAI" Segment="2" Game="MM">
<Scene Name="Z2_20SICHITAI" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_20SICHITAI2/Z2_20SICHITAI2.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
<ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="assets/misc/scene_texture_06/"/>
<File Name="Z2_20SICHITAI2" Segment="2" Game="MM">
<Scene Name="Z2_20SICHITAI2" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_22DEKUCITY/Z2_22DEKUCITY.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
<ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="assets/misc/scene_texture_06/"/>
<File Name="Z2_22DEKUCITY" Segment="2" Game="MM">
<Scene Name="Z2_22DEKUCITY" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_24KEMONOMITI/Z2_24KEMONOMITI.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
<ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="assets/misc/scene_texture_08/"/>
<File Name="Z2_24KEMONOMITI" Segment="2" Game="MM">
<Scene Name="Z2_24KEMONOMITI" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_26SARUNOMORI/Z2_26SARUNOMORI.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="misc/scene_texture_06/"/>
<ExternalFile XmlPath="misc/scene_texture_06.xml" OutPath="assets/misc/scene_texture_06/"/>
<File Name="Z2_26SARUNOMORI" Segment="2" Game="MM">
<Scene Name="Z2_26SARUNOMORI" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_30GYOSON/Z2_30GYOSON.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
<ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="assets/misc/scene_texture_05/"/>
<File Name="Z2_30GYOSON" Segment="2" Game="MM">
<Scene Name="Z2_30GYOSON" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_31MISAKI/Z2_31MISAKI.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
<ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="assets/misc/scene_texture_05/"/>
<File Name="Z2_31MISAKI" Segment="2" Game="MM">
<Scene Name="Z2_31MISAKI" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_AYASHIISHOP/Z2_AYASHIISHOP.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="misc/scene_texture_02/"/>
<ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="assets/misc/scene_texture_02/"/>
<File Name="Z2_AYASHIISHOP" Segment="2" Game="MM">
<Scene Name="Z2_AYASHIISHOP" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_DOUJOU/Z2_DOUJOU.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
<ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="assets/misc/scene_texture_01/"/>
<File Name="Z2_DOUJOU" Segment="2" Game="MM">
<Scene Name="Z2_DOUJOU" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_KAJIYA/Z2_KAJIYA.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="misc/scene_texture_02/"/>
<ExternalFile XmlPath="misc/scene_texture_02.xml" OutPath="assets/misc/scene_texture_02/"/>
<File Name="Z2_KAJIYA" Segment="2" Game="MM">
<Scene Name="Z2_KAJIYA" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_ROMANYMAE/Z2_ROMANYMAE.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="misc/scene_texture_08/"/>
<ExternalFile XmlPath="misc/scene_texture_08.xml" OutPath="assets/misc/scene_texture_08/"/>
<File Name="Z2_ROMANYMAE" Segment="2" Game="MM">
<Scene Name="Z2_ROMANYMAE" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_SINKAI/Z2_SINKAI.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
<ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="assets/misc/scene_texture_05/"/>
<File Name="Z2_SINKAI" Segment="2" Game="MM">
<Scene Name="Z2_SINKAI" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_SONCHONOIE/Z2_SONCHONOIE.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
<ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="assets/misc/scene_texture_01/"/>
<File Name="Z2_SONCHONOIE" Segment="2" Game="MM">
<Scene Name="Z2_SONCHONOIE" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_TORIDE/Z2_TORIDE.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="misc/scene_texture_05/"/>
<ExternalFile XmlPath="misc/scene_texture_05.xml" OutPath="assets/misc/scene_texture_05/"/>
<File Name="Z2_TORIDE" Segment="2" Game="MM">
<Scene Name="Z2_TORIDE" Offset="0x0"/>
</File>

2
assets/xml/scenes/Z2_YADOYA/Z2_YADOYA.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="misc/scene_texture_01/"/>
<ExternalFile XmlPath="misc/scene_texture_01.xml" OutPath="assets/misc/scene_texture_01/"/>
<File Name="Z2_YADOYA" Segment="2" Game="MM">
<Scene Name="Z2_YADOYA" Offset="0x0"/>
</File>

1
docs/tutorial/vscode.md
View File

@ -49,7 +49,6 @@ You can create a `.vscode/c_cpp_properties.json` file with `C/C++: Edit Configur
"include",
"include/libc",
"src",
"assets",
"build/n64-us/",
"${workspaceFolder}"
],

2
include/z64subs.h
View File

@ -4,7 +4,7 @@
#include "z64actor.h"
#include "z64scene.h"
#include "code/sub_s/sub_s.h"
#include "assets/code/sub_s/sub_s.h"
extern Vec3f gOneVec3f;

4
src/code/sys_initial_check.c
View File

@ -14,8 +14,8 @@
#include "fault.h"
#include "segment_symbols.h"
#include "misc/locerrmsg/locerrmsg.h"
#include "misc/memerrmsg/memerrmsg.h"
#include "assets/misc/locerrmsg/locerrmsg.h"
#include "assets/misc/memerrmsg/memerrmsg.h"
#define LOCERRMSG_WIDTH 208
#define LOCERRMSG_HEIGHT 16

6
src/code/z_actor.c
View File

@ -42,9 +42,9 @@ struct Actor* D_801ED920; // 2 funcs. 1 out of z_actor
#include "overlays/actors/ovl_En_Part/z_en_part.h"
#include "overlays/actors/ovl_En_Box/z_en_box.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"
#define ACTOR_AUDIO_FLAG_SFX_ACTOR_POS_1 (1 << 0)
#define ACTOR_AUDIO_FLAG_SFX_ACTOR_POS_2 (1 << 1) // identical behavior to ACTOR_AUDIO_FLAG_SFX_ACTOR_POS_1

2
src/code/z_debug_display.c
View File

@ -43,7 +43,7 @@ DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX,
return sDebugObjectListHead;
}
#include "code/debug_display/debug_display.c"
#include "assets/code/debug_display/debug_display.c"
DebugDispObjectDrawFunc sDebugObjectDrawFuncTable[] = { DebugDisplay_DrawSpriteI8, DebugDisplay_DrawPolygon };

2
src/code/z_eff_blure.c
View File

@ -7,7 +7,7 @@
#include "z64effect_ss.h"
#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;

2
src/code/z_eff_shield_particle.c
View File

@ -5,7 +5,7 @@
#include "vt.h"
#include "assets/code/eff_shield_particle/eff_shield_particle.c"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
void EffectShieldParticle_Init(void* thisx, void* initParamsx) {
EffectShieldParticle* this = (EffectShieldParticle*)thisx;

2
src/code/z_eff_spark.c
View File

@ -1,7 +1,7 @@
#include "z64eff_spark.h"
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
void EffectSpark_Init(void* thisx, void* initParamsx) {
EffectSpark* this = (EffectSpark*)thisx;

2
src/code/z_eff_tire_mark.c
View File

@ -1,7 +1,7 @@
#include "z64eff_tire_mark.h"
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
void func_800AE930(CollisionContext* colCtx, EffectTireMark* this, Vec3f* pos, f32 arg3, s16 angle,
CollisionPoly* colPoly, s32 bgId) {

10
src/code/z_en_hy_code.c
View File

@ -5,11 +5,11 @@
#include "z_en_hy_code.h"
#include "overlays/actors/ovl_En_Door/z_en_door.h"
#include "objects/object_aob/object_aob.h"
#include "objects/object_bba/object_bba.h"
#include "objects/object_bji/object_bji.h"
#include "objects/object_boj/object_boj.h"
#include "objects/object_os_anime/object_os_anime.h"
#include "assets/objects/object_aob/object_aob.h"
#include "assets/objects/object_bba/object_bba.h"
#include "assets/objects/object_bji/object_bji.h"
#include "assets/objects/object_boj/object_boj.h"
#include "assets/objects/object_os_anime/object_os_anime.h"
static AnimationInfoS sAnimationInfo[ENHY_ANIM_MAX] = {
{ &gMamamuYanUnusedIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENHY_ANIM_AOB_0

4
src/code/z_en_item00.c
View File

@ -1,7 +1,7 @@
#include "global.h"
#include "overlays/actors/ovl_En_Elforg/z_en_elforg.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_gi_hearts/object_gi_hearts.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/object_gi_hearts/object_gi_hearts.h"
#include "overlays/actors/ovl_En_Elf/z_en_elf.h"
#include "overlays/actors/ovl_En_Elforg/z_en_elforg.h"

2
src/code/z_fireobj.c
View File

@ -1,6 +1,6 @@
#include "z_fireobj.h"
#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
ColliderCylinderInit sFireObjCollisionInit = {
{

6
src/code/z_inventory.c
View File

@ -9,9 +9,9 @@
#include "z64save.h"
#include "z64scene.h"
#include "interface/parameter_static/parameter_static.h"
#include "archives/icon_item_static/icon_item_static_yar.h"
#include "archives/icon_item_24_static/icon_item_24_static_yar.h"
#include "assets/interface/parameter_static/parameter_static.h"
#include "assets/archives/icon_item_static/icon_item_static_yar.h"
#include "assets/archives/icon_item_24_static/icon_item_24_static_yar.h"
// Bit Flag array in which gBitFlags[n] is (1 << n)
u32 gBitFlags[] = {

4
src/code/z_kankyo.c
View File

@ -66,8 +66,8 @@ Gfx* sSkyboxStarsDList;
#include "string.h"
#include "sys_cfb.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"
// Data
f32 sSandstormLerpScale = 0.0f;

2
src/code/z_lifemeter.c
View File

@ -5,7 +5,7 @@
#include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
#include "interface/parameter_static/parameter_static.h"
#include "assets/interface/parameter_static/parameter_static.h"
s16 sHeartsPrimColors[3][3] = { { 255, 70, 50 }, { 255, 190, 0 }, { 100, 100, 255 } };
s16 sHeartsEnvColors[3][3] = { { 50, 40, 60 }, { 255, 0, 0 }, { 0, 0, 255 } };

2
src/code/z_lights.c
View File

@ -5,7 +5,7 @@
#include "z64.h"
#include "functions.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
LightsBuffer sLightsBuffer;

2
src/code/z_message.c
View File

@ -13,7 +13,7 @@
#include "z64shrink_window.h"
#include "z64save.h"
#include "interface/parameter_static/parameter_static.h"
#include "assets/interface/parameter_static/parameter_static.h"
u8 D_801C6A70 = 0;
s16 sOcarinaButtonIndexBufPos = 0;

8
src/code/z_parameter.c
View File

@ -9,10 +9,10 @@
#include "z64view.h"
#include "z64voice.h"
#include "archives/icon_item_static/icon_item_static_yar.h"
#include "interface/parameter_static/parameter_static.h"
#include "interface/do_action_static/do_action_static.h"
#include "misc/story_static/story_static.h"
#include "assets/archives/icon_item_static/icon_item_static_yar.h"
#include "assets/interface/parameter_static/parameter_static.h"
#include "assets/interface/do_action_static/do_action_static.h"
#include "assets/misc/story_static/story_static.h"
#include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
#include "overlays/actors/ovl_En_Mm3/z_en_mm3.h"

4
src/code/z_play_hireso.c
View File

@ -4,8 +4,8 @@
#include "z64bombers_notebook.h"
#include "z64malloc.h"
#include "interface/schedule_static/schedule_static.h"
#include "archives/schedule_dma_static/schedule_dma_static_yar.h"
#include "assets/interface/schedule_static/schedule_static.h"
#include "assets/archives/schedule_dma_static/schedule_dma_static_yar.h"
#define BOMBERS_NOTEBOOK_ENTRY_SIZE 3
#define BOMBERS_NOTEBOOK_ENTRY_MAX 10

60
src/code/z_player_lib.c
View File

@ -6,40 +6,40 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
// Assets for each player form
#include "objects/object_link_boy/object_link_boy.h"
#include "objects/object_link_goron/object_link_goron.h"
#include "objects/object_link_zora/object_link_zora.h"
#include "objects/object_link_nuts/object_link_nuts.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_goron/object_link_goron.h"
#include "assets/objects/object_link_zora/object_link_zora.h"
#include "assets/objects/object_link_nuts/object_link_nuts.h"
#include "assets/objects/object_link_child/object_link_child.h"
// Assets for each mask
#include "objects/object_mask_truth/object_mask_truth.h"
#include "objects/object_mask_kerfay/object_mask_kerfay.h"
#include "objects/object_mask_yofukasi/object_mask_yofukasi.h"
#include "objects/object_mask_rabit/object_mask_rabit.h"
#include "objects/object_mask_ki_tan/object_mask_ki_tan.h"
#include "objects/object_mask_json/object_mask_json.h"
#include "objects/object_mask_romerny/object_mask_romerny.h"
#include "objects/object_mask_zacho/object_mask_zacho.h"
#include "objects/object_mask_posthat/object_mask_posthat.h"
#include "objects/object_mask_meoto/object_mask_meoto.h"
#include "objects/object_mask_bigelf/object_mask_bigelf.h"
#include "objects/object_mask_gibudo/object_mask_gibudo.h"
#include "objects/object_mask_gero/object_mask_gero.h"
#include "objects/object_mask_dancer/object_mask_dancer.h"
#include "objects/object_mask_skj/object_mask_skj.h"
#include "objects/object_mask_stone/object_mask_stone.h"
#include "objects/object_mask_bree/object_mask_bree.h"
#include "objects/object_mask_bakuretu/object_mask_bakuretu.h"
#include "objects/object_mask_bu_san/object_mask_bu_san.h"
#include "objects/object_mask_kyojin/object_mask_kyojin.h"
#include "objects/object_mask_boy/object_mask_boy.h"
#include "objects/object_mask_goron/object_mask_goron.h"
#include "objects/object_mask_zora/object_mask_zora.h"
#include "objects/object_mask_nuts/object_mask_nuts.h"
#include "assets/objects/object_mask_truth/object_mask_truth.h"
#include "assets/objects/object_mask_kerfay/object_mask_kerfay.h"
#include "assets/objects/object_mask_yofukasi/object_mask_yofukasi.h"
#include "assets/objects/object_mask_rabit/object_mask_rabit.h"
#include "assets/objects/object_mask_ki_tan/object_mask_ki_tan.h"
#include "assets/objects/object_mask_json/object_mask_json.h"
#include "assets/objects/object_mask_romerny/object_mask_romerny.h"
#include "assets/objects/object_mask_zacho/object_mask_zacho.h"
#include "assets/objects/object_mask_posthat/object_mask_posthat.h"
#include "assets/objects/object_mask_meoto/object_mask_meoto.h"
#include "assets/objects/object_mask_bigelf/object_mask_bigelf.h"
#include "assets/objects/object_mask_gibudo/object_mask_gibudo.h"
#include "assets/objects/object_mask_gero/object_mask_gero.h"
#include "assets/objects/object_mask_dancer/object_mask_dancer.h"
#include "assets/objects/object_mask_skj/object_mask_skj.h"
#include "assets/objects/object_mask_stone/object_mask_stone.h"
#include "assets/objects/object_mask_bree/object_mask_bree.h"
#include "assets/objects/object_mask_bakuretu/object_mask_bakuretu.h"
#include "assets/objects/object_mask_bu_san/object_mask_bu_san.h"
#include "assets/objects/object_mask_kyojin/object_mask_kyojin.h"
#include "assets/objects/object_mask_boy/object_mask_boy.h"
#include "assets/objects/object_mask_goron/object_mask_goron.h"
#include "assets/objects/object_mask_zora/object_mask_zora.h"
#include "assets/objects/object_mask_nuts/object_mask_nuts.h"
// Assets for other actors
#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"

2
src/code/z_sub_s.c
View File

@ -8,7 +8,7 @@
s16 sPathDayFlags[] = { 0x40, 0x20, 0x10, 8, 4, 2, 1, 0 };
#include "code/sub_s/sub_s.c"
#include "assets/code/sub_s/sub_s.c"
Vec3f gOneVec3f = { 1.0f, 1.0f, 1.0f };

4
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View File

@ -5,8 +5,8 @@
*/
#include "z_arms_hook.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"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
View File

@ -19,7 +19,7 @@ void ArrowFire_Draw(Actor* thisx, PlayState* play);
void FireArrow_ChargeAndWait(ArrowFire* this, PlayState* play);
void FireArrow_Fly(ArrowFire* this, PlayState* play);
#include "overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c"
#include "assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c"
ActorInit Arrow_Fire_InitVars = {
/**/ ACTOR_ARROW_FIRE,

2
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View File

@ -19,7 +19,7 @@ void ArrowIce_Draw(Actor* thisx, PlayState* play);
void ArrowIce_Charge(ArrowIce* this, PlayState* play);
void ArrowIce_Fly(ArrowIce* this, PlayState* play);
#include "overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c"
#include "assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c"
static s32 sBssPad;

2
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View File

@ -19,7 +19,7 @@ void ArrowLight_Draw(Actor* thisx, PlayState* play);
void ArrowLight_Charge(ArrowLight* this, PlayState* play);
void ArrowLight_Fly(ArrowLight* this, PlayState* play);
#include "overlays/ovl_Arrow_Light/ovl_Arrow_Light.c"
#include "assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.c"
ActorInit Arrow_Light_InitVars = {
/**/ ACTOR_ARROW_LIGHT,

2
src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_astr_bombwall.h"
#include "objects/object_astr_obj/object_astr_obj.h"
#include "assets/objects/object_astr_obj/object_astr_obj.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_botihasira.h"
#include "objects/object_botihasira/object_botihasira.h"
#include "assets/objects/object_botihasira/object_botihasira.h"
#define FLAGS 0x00000000

18
src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
View File

@ -5,15 +5,15 @@
*/
#include "z_bg_breakwall.h"
#include "objects/object_omoya_obj/object_omoya_obj.h"
#include "objects/object_yukimura_obj/object_yukimura_obj.h"
#include "objects/object_keikoku_obj/object_keikoku_obj.h"
#include "objects/object_posthouse_obj/object_posthouse_obj.h"
#include "objects/object_kumo30/object_kumo30.h"
#include "objects/object_mnk/object_mnk.h"
#include "objects/object_ikninside_obj/object_ikninside_obj.h"
#include "objects/object_kaizoku_obj/object_kaizoku_obj.h"
#include "objects/object_spot11_obj/object_spot11_obj.h"
#include "assets/objects/object_omoya_obj/object_omoya_obj.h"
#include "assets/objects/object_yukimura_obj/object_yukimura_obj.h"
#include "assets/objects/object_keikoku_obj/object_keikoku_obj.h"
#include "assets/objects/object_posthouse_obj/object_posthouse_obj.h"
#include "assets/objects/object_kumo30/object_kumo30.h"
#include "assets/objects/object_mnk/object_mnk.h"
#include "assets/objects/object_ikninside_obj/object_ikninside_obj.h"
#include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h"
#include "assets/objects/object_spot11_obj/object_spot11_obj.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_ctower_gear.h"
#include "objects/object_ctower_rot/object_ctower_rot.h"
#include "assets/objects/object_ctower_rot/object_ctower_rot.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_ctower_rot.h"
#include "objects/object_ctower_rot/object_ctower_rot.h"
#include "assets/objects/object_ctower_rot/object_ctower_rot.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c
View File

@ -6,7 +6,7 @@
#include "z_bg_danpei_movebg.h"
#include "objects/object_d_lift/object_d_lift.h"
#include "assets/objects/object_d_lift/object_d_lift.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_dblue_balance.h"
#include "objects/object_dblue_object/object_dblue_object.h"
#include "assets/objects/object_dblue_object/object_dblue_object.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_dblue_elevator.h"
#include "objects/object_dblue_object/object_dblue_object.h"
#include "assets/objects/object_dblue_object/object_dblue_object.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_dblue_movebg.h"
#include "objects/object_dblue_object/object_dblue_object.h"
#include "assets/objects/object_dblue_object/object_dblue_object.h"
#include "overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_dblue_waterfall.h"
#include "objects/object_dblue_object/object_dblue_object.h"
#include "assets/objects/object_dblue_object/object_dblue_object.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
View File

@ -3,7 +3,7 @@
#include "global.h"
#include "overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h"
#include "objects/object_dy_obj/object_dy_obj.h"
#include "assets/objects/object_dy_obj/object_dy_obj.h"
struct BgDyYoseizo;

2
src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_f40_block.h"
#include "objects/object_f40_obj/object_f40_obj.h"
#include "assets/objects/object_f40_obj/object_f40_obj.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_f40_flift.h"
#include "objects/object_f40_obj/object_f40_obj.h"
#include "assets/objects/object_f40_obj/object_f40_obj.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c
View File

@ -6,7 +6,7 @@
#include "prevent_bss_reordering.h"
#include "z_bg_f40_switch.h"
#include "z64rumble.h"
#include "objects/object_f40_switch/object_f40_switch.h"
#include "assets/objects/object_f40_switch/object_f40_switch.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_f40_swlift.h"
#include "objects/object_f40_obj/object_f40_obj.h"
#include "assets/objects/object_f40_obj/object_f40_obj.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_fire_wall.h"
#include "objects/object_fwall/object_fwall.h"
#include "assets/objects/object_fwall/object_fwall.h"
#include "overlays/actors/ovl_En_Encount4/z_en_encount4.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_fu_kaiten.h"
#include "objects/object_fu_kaiten/object_fu_kaiten.h"
#include "assets/objects/object_fu_kaiten/object_fu_kaiten.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_fu_mizu.h"
#include "objects/object_fu_kaiten/object_fu_kaiten.h"
#include "assets/objects/object_fu_kaiten/object_fu_kaiten.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_goron_oyu.h"
#include "objects/object_oyu/object_oyu.h"
#include "assets/objects/object_oyu/object_oyu.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_haka_bombwall.h"
#include "objects/object_haka_obj/object_haka_obj.h"
#include "assets/objects/object_haka_obj/object_haka_obj.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_haka_curtain.h"
#include "objects/object_haka_obj/object_haka_obj.h"
#include "assets/objects/object_haka_obj/object_haka_obj.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_haka_tomb.h"
#include "objects/object_haka_obj/object_haka_obj.h"
#include "assets/objects/object_haka_obj/object_haka_obj.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_hakugin_bombwall.h"
#include "objects/object_hakugin_obj/object_hakugin_obj.h"
#include "assets/objects/object_hakugin_obj/object_hakugin_obj.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_hakugin_elvpole.h"
#include "objects/object_hakugin_obj/object_hakugin_obj.h"
#include "assets/objects/object_hakugin_obj/object_hakugin_obj.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
View File

@ -7,7 +7,7 @@
#include "z_bg_hakugin_post.h"
#include "z64quake.h"
#include "z64rumble.h"
#include "objects/object_hakugin_obj/object_hakugin_obj.h"
#include "assets/objects/object_hakugin_obj/object_hakugin_obj.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c
View File

@ -7,7 +7,7 @@
#include "prevent_bss_reordering.h"
#include "z_bg_hakugin_switch.h"
#include "z64rumble.h"
#include "objects/object_goronswitch/object_goronswitch.h"
#include "assets/objects/object_goronswitch/object_goronswitch.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_icefloe.h"
#include "objects/object_icefloe/object_icefloe.h"
#include "assets/objects/object_icefloe/object_icefloe.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_icicle.h"
#include "objects/object_icicle/object_icicle.h"
#include "assets/objects/object_icicle/object_icicle.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_ikana_block.h"
#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_ikana_bombwall.h"
#include "objects/object_ikana_obj/object_ikana_obj.h"
#include "assets/objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS (ACTOR_FLAG_10000000)

2
src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c
View File

@ -10,7 +10,7 @@
*/
#include "z_bg_ikana_mirror.h"
#include "objects/object_ikana_obj/object_ikana_obj.h"
#include "assets/objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_ikana_ray.h"
#include "objects/object_ikana_obj/object_ikana_obj.h"
#include "assets/objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c
View File

@ -9,7 +9,7 @@
#include "overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h"
#include "overlays/actors/ovl_En_Torch2/z_en_torch2.h"
#include "overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h"
#include "objects/object_ikana_obj/object_ikana_obj.h"
#include "assets/objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c
View File

@ -6,7 +6,7 @@
#include "z_bg_ikana_shutter.h"
#include "z64quake.h"
#include "objects/object_ikana_obj/object_ikana_obj.h"
#include "assets/objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c
View File

@ -7,7 +7,7 @@
#include "z_bg_iknin_susceil.h"
#include "z64quake.h"
#include "z64rumble.h"
#include "objects/object_ikninside_obj/object_ikninside_obj.h"
#include "assets/objects/object_ikninside_obj/object_ikninside_obj.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_ikninside.h"
#include "objects/object_ikninside_obj/object_ikninside_obj.h"
#include "assets/objects/object_ikninside_obj/object_ikninside_obj.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_iknv_doukutu.h"
#include "objects/object_iknv_obj/object_iknv_obj.h"
#include "assets/objects/object_iknv_obj/object_iknv_obj.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_iknv_obj.h"
#include "objects/object_iknv_obj/object_iknv_obj.h"
#include "assets/objects/object_iknv_obj/object_iknv_obj.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_ingate.h"
#include "objects/object_sichitai_obj/object_sichitai_obj.h"
#include "assets/objects/object_sichitai_obj/object_sichitai_obj.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_inibs_movebg.h"
#include "objects/object_inibs_object/object_inibs_object.h"
#include "assets/objects/object_inibs_object/object_inibs_object.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)

2
src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_keikoku_saku.h"
#include "objects/object_keikoku_obj/object_keikoku_obj.h"
#include "assets/objects/object_keikoku_obj/object_keikoku_obj.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_keikoku_spr.h"
#include "objects/object_keikoku_obj/object_keikoku_obj.h"
#include "assets/objects/object_keikoku_obj/object_keikoku_obj.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
View File

@ -4,7 +4,7 @@
* Description: Ocean Spider House - Bombable Wall
*/
#include "z_bg_kin2_bombwall.h"
#include "objects/object_kin2_obj/object_kin2_obj.h"
#include "assets/objects/object_kin2_obj/object_kin2_obj.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_10000000)

2
src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_kin2_fence.h"
#include "objects/object_kin2_obj/object_kin2_obj.h"
#include "assets/objects/object_kin2_obj/object_kin2_obj.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_kin2_shelf.h"
#include "objects/object_kin2_obj/object_kin2_obj.h"
#include "assets/objects/object_kin2_obj/object_kin2_obj.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_ladder.h"
#include "objects/object_ladder/object_ladder.h"
#include "assets/objects/object_ladder/object_ladder.h"
#define FLAGS (ACTOR_FLAG_10)

2
src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h
View File

@ -2,7 +2,7 @@
#define Z_BG_LAST_BWALL_H
#include "global.h"
#include "objects/object_last_obj/object_last_obj.h"
#include "assets/objects/object_last_obj/object_last_obj.h"
struct BgLastBwall;

2
src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_lbfshot.h"
#include "objects/object_lbfshot/object_lbfshot.h"
#include "assets/objects/object_lbfshot/object_lbfshot.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
View File

@ -1,5 +1,5 @@
#include "z_bg_lotus.h"
#include "objects/object_lotus/object_lotus.h"
#include "assets/objects/object_lotus/object_lotus.h"
#define FLAGS 0x00000000

2
src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c
View File

@ -5,7 +5,7 @@
*/
#include "z_bg_market_step.h"
#include "objects/object_market_obj/object_market_obj.h"
#include "assets/objects/object_market_obj/object_market_obj.h"
#define FLAGS (ACTOR_FLAG_20 | ACTOR_FLAG_10000000)

Some files were not shown because too many files have changed in this diff Show More