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

split arrow_anims into gArrow1_Anim + gArrow2_Anim

This commit is contained in:
Dragorn421 2025-06-09 09:27:51 +02:00
parent 8cc9dc919a
commit 6e908a3b42
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
9 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
assets/objects/gameplay_keep/arrow_anims.c
View File

@ -1,25 +0,0 @@
#include "arrow_anims.h"
s16 gArrow1_FrameData[] = {
#include "assets/objects/gameplay_keep/gArrow1_FrameData.inc.c"
};
JointIndex gArrow1_JointIndices[] = {
#include "assets/objects/gameplay_keep/gArrow1_JointIndices.inc.c"
};
AnimationHeader gArrow1_Anim = {
#include "assets/objects/gameplay_keep/gArrow1_Anim.inc.c"
};
s16 gArrow2_FrameData[] = {
#include "assets/objects/gameplay_keep/gArrow2_FrameData.inc.c"
};
JointIndex gArrow2_JointIndices[] = {
#include "assets/objects/gameplay_keep/gArrow2_JointIndices.inc.c"
};
AnimationHeader gArrow2_Anim = {
#include "assets/objects/gameplay_keep/gArrow2_Anim.inc.c"
};

13
assets/objects/gameplay_keep/arrow_anims.h
View File

@ -1,13 +0,0 @@
#ifndef GAMEPLAY_KEEP_ARROW_ANIMS_H
#define GAMEPLAY_KEEP_ARROW_ANIMS_H
#include "animation.h"
extern s16 gArrow1_FrameData[];
extern JointIndex gArrow1_JointIndices[];
extern AnimationHeader gArrow1_Anim;
extern s16 gArrow2_FrameData[];
extern JointIndex gArrow2_JointIndices[];
extern AnimationHeader gArrow2_Anim;
#endif

13
assets/objects/gameplay_keep/gArrow1_Anim.c Normal file
View File

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

10
assets/objects/gameplay_keep/gArrow1_Anim.h Normal file
View File

@ -0,0 +1,10 @@
#ifndef GAMEPLAY_KEEP_GARROW1_ANIM_H
#define GAMEPLAY_KEEP_GARROW1_ANIM_H
#include "animation.h"
extern s16 gArrow1_FrameData[];
extern JointIndex gArrow1_JointIndices[];
extern AnimationHeader gArrow1_Anim;
#endif

13
assets/objects/gameplay_keep/gArrow2_Anim.c Normal file
View File

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

10
assets/objects/gameplay_keep/gArrow2_Anim.h Normal file
View File

@ -0,0 +1,10 @@
#ifndef GAMEPLAY_KEEP_GARROW2_ANIM_H
#define GAMEPLAY_KEEP_GARROW2_ANIM_H
#include "animation.h"
extern s16 gArrow2_FrameData[];
extern JointIndex gArrow2_JointIndices[];
extern AnimationHeader gArrow2_Anim;
#endif

3
assets/objects/gameplay_keep/gameplay_keep.h
View File

@ -6,7 +6,8 @@
#include "player_pause_joint_tables.h"
#include "player_anim_headers.h"
#include "debug_models.h"
#include "arrow_anims.h"
#include "gArrow1_Anim.h"
#include "gArrow2_Anim.h"
#include "arrow_skel.h"
#include "unk_eff_blure_tex.h"
#include "bomb_body.h"

3
spec/spec
View File

@ -1002,7 +1002,8 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_pause_joint_tables.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_anim_headers.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/debug_models.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/arrow_anims.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gArrow1_Anim.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gArrow2_Anim.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/arrow_skel.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/unk_eff_blure_tex.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/bomb_body.o"

3
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
View File

@ -21,7 +21,8 @@
#include "play_state.h"
#include "assets/objects/gameplay_keep/arrow_skel.h"
#include "assets/objects/gameplay_keep/arrow_anims.h"
#include "assets/objects/gameplay_keep/gArrow1_Anim.h"
#include "assets/objects/gameplay_keep/gArrow2_Anim.h"
#include "assets/objects/gameplay_keep/eff_sparkles.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)