mirror of https://github.com/zeldaret/oot.git
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
This commit is contained in:
parent
fd299cc72b
commit
845d6458b0
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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[] = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
assets/code/fbdemo_circle/code.c
|
||||
assets/code/fbdemo_triforce/code.c
|
||||
assets/code/fbdemo_wipe1/code.c
|
||||
assets/misc/link_animetion/link_animetion.c
|
||||
assets/misc/z_select_static/z_select_static.c
|
||||
assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.c
|
||||
|
|
|
|||
Loading…
Reference in New Issue