summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorPepe20129 <72659707+Pepe20129@users.noreply.github.com>2026-01-28 00:23:36 +0100
committerGitHub <noreply@github.com>2026-01-27 23:23:36 +0000
commit845d6458b02549b2c05fff8590bcc9b4cfbdf270 (patch)
tree654ba46b2ac5ca230466da84d9a7bf88486440bc /src/code
parentfd299cc72b88a3d3a7dd5caa31c5738ec6e08fe1 (diff)
Commit code assets (#2691)
* Commit code assets * Have different ifdefs * Move to code files * Missed an include * Prevent code assets from having their source unnecessarily written
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_fbdemo_circle.c33
-rw-r--r--src/code/z_fbdemo_triforce.c9
-rw-r--r--src/code/z_fbdemo_wipe1.c15
3 files changed, 54 insertions, 3 deletions
diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c
index eb66a2fab..a83e7ed45 100644
--- a/src/code/z_fbdemo_circle.c
+++ b/src/code/z_fbdemo_circle.c
@@ -3,6 +3,7 @@
#include "color.h"
#include "gfx.h"
#include "sfx.h"
+#include "tex_len.h"
#include "transition.h"
typedef enum TransitionCircleDirection {
@@ -15,7 +16,37 @@ Gfx sTransCircleEmptyDL[] = {
gsSPEndDisplayList(),
};
-#include "assets/code/fbdemo_circle/code.c"
+#define sTransCircleNormalTex_WIDTH 16
+#define sTransCircleNormalTex_HEIGHT 64
+u64 sTransCircleNormalTex[TEX_LEN(u64, sTransCircleNormalTex_WIDTH, sTransCircleNormalTex_HEIGHT, 8)] = {
+#include "assets/code/fbdemo_circle/sTransCircleNormalTex.i8.inc.c"
+};
+
+#define sTransCircleWaveTex_WIDTH 16
+#define sTransCircleWaveTex_HEIGHT 64
+u64 sTransCircleWaveTex[TEX_LEN(u64, sTransCircleWaveTex_WIDTH, sTransCircleWaveTex_HEIGHT, 8)] = {
+#include "assets/code/fbdemo_circle/sTransCircleWaveTex.i8.inc.c"
+};
+
+#define sTransCircleRippleTex_WIDTH 16
+#define sTransCircleRippleTex_HEIGHT 64
+u64 sTransCircleRippleTex[TEX_LEN(u64, sTransCircleRippleTex_WIDTH, sTransCircleRippleTex_HEIGHT, 8)] = {
+#include "assets/code/fbdemo_circle/sTransCircleRippleTex.i8.inc.c"
+};
+
+#define sTransCircleStarburstTex_WIDTH 16
+#define sTransCircleStarburstTex_HEIGHT 64
+u64 sTransCircleStarburstTex[TEX_LEN(u64, sTransCircleStarburstTex_WIDTH, sTransCircleStarburstTex_HEIGHT, 8)] = {
+#include "assets/code/fbdemo_circle/sTransCircleStarburstTex.i8.inc.c"
+};
+
+Vtx sTransCircleVtx[34] = {
+#include "assets/code/fbdemo_circle/sTransCircleVtx.inc.c"
+};
+
+Gfx sTransCircleDL[26] = {
+#include "assets/code/fbdemo_circle/sTransCircleDL.inc.c"
+};
void TransitionCircle_Start(void* thisx) {
TransitionCircle* this = (TransitionCircle*)thisx;
diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c
index b1a5b2e67..efcf214d5 100644
--- a/src/code/z_fbdemo_triforce.c
+++ b/src/code/z_fbdemo_triforce.c
@@ -1,10 +1,17 @@
#include "transition_triforce.h"
+#include "gfx.h"
#include "printf.h"
#include "z_math.h"
#include "transition_instances.h"
-#include "assets/code/fbdemo_triforce/code.c"
+Gfx sTransTriforceDL[6] = {
+#include "assets/code/fbdemo_triforce/sTransTriforceDL.inc.c"
+};
+
+Vtx sTransTriforceVtx[10] = {
+#include "assets/code/fbdemo_triforce/sTransTriforceVtx.inc.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 6a5dd62e5..f8c38d117 100644
--- a/src/code/z_fbdemo_wipe1.c
+++ b/src/code/z_fbdemo_wipe1.c
@@ -2,6 +2,7 @@
#include "gfx.h"
#include "save.h"
+#include "tex_len.h"
#include "transition_instances.h"
typedef enum TransitionWipeDirection {
@@ -9,7 +10,19 @@ typedef enum TransitionWipeDirection {
/* 1 */ TRANS_WIPE_DIR_OUT
} TransitionWipeDirection;
-#include "assets/code/fbdemo_wipe1/code.c"
+Vtx sTransWipeVtx[25] = {
+#include "assets/code/fbdemo_wipe1/sTransWipeVtx.inc.c"
+};
+
+#define sTransWipeTex_WIDTH 64
+#define sTransWipeTex_HEIGHT 64
+u64 sTransWipeTex[TEX_LEN(u64, sTransWipeTex_WIDTH, sTransWipeTex_HEIGHT, 4)] = {
+#include "assets/code/fbdemo_wipe1/sTransWipeTex.i4.inc.c"
+};
+
+Gfx sTransWipeDL[31] = {
+#include "assets/code/fbdemo_wipe1/sTransWipeDL.inc.c"
+};
// unused.
Gfx sTransWipeSyncDL[] = {