Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f346b7f
Commit and split gameplay_keep
Thar0 Jun 7, 2025
6664dfe
Remove debugging bits
Thar0 Jun 7, 2025
92c0782
format
Dragorn421 Jun 8, 2025
294aeb3
bss
Dragorn421 Jun 8, 2025
4455eaa
Merge branch 'main' into split-gameplay-keep
Dragorn421 Jun 8, 2025
e94e89d
merge gameplay_keep_0x400 into link_textures
Dragorn421 Jun 8, 2025
a326042
Name some unused NTSC stuff
Dragorn421 Jun 8, 2025
b2c0bc8
Rename files for some of the newly named unused NTSC stuff
Dragorn421 Jun 8, 2025
7edccae
name more gkeep files
Dragorn421 Jun 8, 2025
17dce8c
format
Dragorn421 Jun 8, 2025
432d977
spin_attack
Dragorn421 Jun 8, 2025
10b4447
name fish anims files
Dragorn421 Jun 8, 2025
d02d71a
name some eff_ files
Dragorn421 Jun 8, 2025
1ceb996
name a bunch more files
Dragorn421 Jun 8, 2025
824f3c7
Merge branch 'main' into split-gameplay-keep
Dragorn421 Jun 9, 2025
f9b0000
Add underscore in not-final names
Dragorn421 Jun 9, 2025
83bd21c
cleanup limb enum names (remove g prefix)
Dragorn421 Jun 9, 2025
c62cb43
split gameplay_keep_0x34020.c into gBugCrawlAnim.c + bug_skel.c
Dragorn421 Jun 9, 2025
7ed8b19
door.h -> door_skel.h
Dragorn421 Jun 9, 2025
8cc9dc9
gArrowNAnim -> gArrowN_Anim
Dragorn421 Jun 9, 2025
6e908a3
split arrow_anims into gArrow1_Anim + gArrow2_Anim
Dragorn421 Jun 9, 2025
3748c40
Merge branch 'main' into split-gameplay-keep
Dragorn421 Jun 9, 2025
4b12ae0
fix merge
Dragorn421 Jun 9, 2025
c6ba436
bss
Dragorn421 Jun 9, 2025
903f0fa
Merge branch 'main' into split-gameplay-keep
Dragorn421 Jun 13, 2025
0b5243e
bss
Dragorn421 Jun 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
52 changes: 52 additions & 0 deletions assets/objects/gameplay_keep/arrow_skel.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#include "arrow_skel.h"
#include "hilite_textures.h"
#include "array_count.h"
#include "gfx.h"

u64 gArrowShaftTex[TEX_LEN(u64, gArrowShaftTex_WIDTH, gArrowShaftTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gArrowShaftTex.rgba16.inc.c"
};

u64 gArrowFletchingTex[TEX_LEN(u64, gArrowFletchingTex_WIDTH, gArrowFletchingTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gArrowFletchingTex.rgba16.inc.c"
};

Vtx gArrowNearVtx[] = {
#include "assets/objects/gameplay_keep/gArrowNearVtx.inc.c"
};

Gfx gArrowNearDL[60] = {
#include "assets/objects/gameplay_keep/gArrowNearDL.inc.c"
};

Vtx gArrowFarVtx[] = {
#include "assets/objects/gameplay_keep/gArrowFarVtx.inc.c"
};

Gfx gArrowFarDL[52] = {
#include "assets/objects/gameplay_keep/gArrowFarDL.inc.c"
};

LodLimb gArrowSkelLimb_0 = {
#include "assets/objects/gameplay_keep/gArrowSkelLimb_0.inc.c"
};

LodLimb gArrowSkelLimb_1 = {
#include "assets/objects/gameplay_keep/gArrowSkelLimb_1.inc.c"
};

LodLimb gArrowSkelLimb_2 = {
#include "assets/objects/gameplay_keep/gArrowSkelLimb_2.inc.c"
};

LodLimb gArrowSkelLimb_3 = {
#include "assets/objects/gameplay_keep/gArrowSkelLimb_3.inc.c"
};

void* gArrowLimbs[] = {
#include "assets/objects/gameplay_keep/gArrowLimbs.inc.c"
};

SkeletonHeader gArrowSkel = {
#include "assets/objects/gameplay_keep/gArrowSkel.inc.c"
};
32 changes: 32 additions & 0 deletions assets/objects/gameplay_keep/arrow_skel.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#ifndef GAMEPLAY_KEEP_ARROW_SKEL_H
#define GAMEPLAY_KEEP_ARROW_SKEL_H

#include "tex_len.h"
#include "animation.h"

#define gArrowShaftTex_WIDTH 16
#define gArrowShaftTex_HEIGHT 128
extern u64 gArrowShaftTex[TEX_LEN(u64, gArrowShaftTex_WIDTH, gArrowShaftTex_HEIGHT, 16)];
#define gArrowFletchingTex_WIDTH 32
#define gArrowFletchingTex_HEIGHT 16
extern u64 gArrowFletchingTex[TEX_LEN(u64, gArrowFletchingTex_WIDTH, gArrowFletchingTex_HEIGHT, 16)];
extern Vtx gArrowNearVtx[];
extern Gfx gArrowNearDL[60];
extern Vtx gArrowFarVtx[];
extern Gfx gArrowFarDL[52];
extern LodLimb gArrowSkelLimb_0;
extern LodLimb gArrowSkelLimb_1;
extern LodLimb gArrowSkelLimb_2;
extern LodLimb gArrowSkelLimb_3;
extern void* gArrowLimbs[];
typedef enum ArrowSkelLimb {
/* 0 */ ARROW_LIMB_NONE,
/* 1 */ ARROW_LIMB_0,
/* 2 */ ARROW_LIMB_1,
/* 3 */ ARROW_LIMB_2,
/* 4 */ ARROW_LIMB_3,
/* 5 */ ARROW_LIMB_MAX
} ArrowSkelLimb;
extern SkeletonHeader gArrowSkel;

#endif
14 changes: 14 additions & 0 deletions assets/objects/gameplay_keep/bomb_body.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#include "bomb_body.h"
#include "gfx.h"

u64 gBombBodyTex[TEX_LEN(u64, gBombBodyTex_WIDTH, gBombBodyTex_HEIGHT, 8)] = {
#include "assets/objects/gameplay_keep/gBombBodyTex.ia8.inc.c"
};

Vtx gBombBodyVtx[] = {
#include "assets/objects/gameplay_keep/gBombBodyVtx.inc.c"
};

Gfx gBombBodyDL[17] = {
#include "assets/objects/gameplay_keep/gBombBodyDL.inc.c"
};
13 changes: 13 additions & 0 deletions assets/objects/gameplay_keep/bomb_body.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#ifndef GAMEPLAY_KEEP_BOMB_BODY_H
#define GAMEPLAY_KEEP_BOMB_BODY_H

#include "tex_len.h"
#include "ultra64.h"

#define gBombBodyTex_WIDTH 64
#define gBombBodyTex_HEIGHT 64
extern u64 gBombBodyTex[TEX_LEN(u64, gBombBodyTex_WIDTH, gBombBodyTex_HEIGHT, 8)];
extern Vtx gBombBodyVtx[];
extern Gfx gBombBodyDL[17];

#endif
14 changes: 14 additions & 0 deletions assets/objects/gameplay_keep/bomb_cap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#include "bomb_cap.h"
#include "gfx.h"

u64 gBombCapTex[TEX_LEN(u64, gBombCapTex_WIDTH, gBombCapTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gBombCapTex.rgba16.inc.c"
};

Vtx gBombCapVtx[] = {
#include "assets/objects/gameplay_keep/gBombCapVtx.inc.c"
};

Gfx gBombCapDL[24] = {
#include "assets/objects/gameplay_keep/gBombCapDL.inc.c"
};
13 changes: 13 additions & 0 deletions assets/objects/gameplay_keep/bomb_cap.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#ifndef GAMEPLAY_KEEP_BOMB_CAP_H
#define GAMEPLAY_KEEP_BOMB_CAP_H

#include "tex_len.h"
#include "ultra64.h"

#define gBombCapTex_WIDTH 8
#define gBombCapTex_HEIGHT 8
extern u64 gBombCapTex[TEX_LEN(u64, gBombCapTex_WIDTH, gBombCapTex_HEIGHT, 16)];
extern Vtx gBombCapVtx[];
extern Gfx gBombCapDL[24];

#endif
14 changes: 14 additions & 0 deletions assets/objects/gameplay_keep/bombchu_body.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#include "bombchu_body.h"
#include "gfx.h"

u64 gBombchuBodyTex[TEX_LEN(u64, gBombchuBodyTex_WIDTH, gBombchuBodyTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gBombchuBodyTex.rgba16.inc.c"
};

Vtx gBombchuVtx[] = {
#include "assets/objects/gameplay_keep/gBombchuVtx.inc.c"
};

Gfx gBombchuDL[45] = {
#include "assets/objects/gameplay_keep/gBombchuDL.inc.c"
};
13 changes: 13 additions & 0 deletions assets/objects/gameplay_keep/bombchu_body.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#ifndef GAMEPLAY_KEEP_BOMBCHU_BODY_H
#define GAMEPLAY_KEEP_BOMBCHU_BODY_H

#include "tex_len.h"
#include "ultra64.h"

#define gBombchuBodyTex_WIDTH 8
#define gBombchuBodyTex_HEIGHT 8
extern u64 gBombchuBodyTex[TEX_LEN(u64, gBombchuBodyTex_WIDTH, gBombchuBodyTex_HEIGHT, 16)];
extern Vtx gBombchuVtx[];
extern Gfx gBombchuDL[45];

#endif
20 changes: 20 additions & 0 deletions assets/objects/gameplay_keep/boomerang.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#include "boomerang.h"
#include "gameplay_keep_0x16A50.h"
#include "hilite_textures.h"
#include "gfx.h"

Vtx gBoomerangVtx[] = {
#include "assets/objects/gameplay_keep/gBoomerangVtx.inc.c"
};

Gfx gUnknownBlankDL[1] = {
#include "assets/objects/gameplay_keep/gUnknownBlankDL.inc.c"
};

Gfx gBoomerangDL[46] = {
#include "assets/objects/gameplay_keep/gBoomerangDL.inc.c"
};

Gfx gBoomerangRefDL[2] = {
#include "assets/objects/gameplay_keep/gBoomerangRefDL.inc.c"
};
11 changes: 11 additions & 0 deletions assets/objects/gameplay_keep/boomerang.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#ifndef GAMEPLAY_KEEP_BOOMERANG_H
#define GAMEPLAY_KEEP_BOOMERANG_H

#include "ultra64.h"

extern Vtx gBoomerangVtx[];
extern Gfx gUnknownBlankDL[1];
extern Gfx gBoomerangDL[46];
extern Gfx gBoomerangRefDL[2];

#endif
Loading