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

merge gameplay_keep_0x400 into link_textures

This commit is contained in:
Dragorn421 2025-06-08 17:25:57 +02:00
parent 4455eaa528
commit e94e89d8b9
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
6 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@
#define GAMEPLAY_KEEP_H
#include "hilite_textures.h"
#include "gameplay_keep_0x400.h"
#include "link_textures.h"
#include "player_pause_joint_tables.h"
#include "player_anim_headers.h"

17
assets/objects/gameplay_keep/gameplay_keep_0x400.c
View File

@ -1,17 +0,0 @@
#include "gameplay_keep_0x400.h"
u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gHylianShieldDesignTex.rgba16.inc.c"
};
u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gOcarinaofTimeDesignTex.rgba16.inc.c"
};
u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gBottleGlassTex.rgba16.inc.c"
};
u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)] = {
#include "assets/objects/gameplay_keep/gDekuStickTex.i8.inc.c"
};

20
assets/objects/gameplay_keep/gameplay_keep_0x400.h
View File

@ -1,20 +0,0 @@
#ifndef GAMEPLAY_KEEP_0x400_H
#define GAMEPLAY_KEEP_0x400_H
#include "tex_len.h"
#include "ultra64.h"
#define gHylianShieldDesignTex_WIDTH 32
#define gHylianShieldDesignTex_HEIGHT 64
extern u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)];
#define gOcarinaofTimeDesignTex_WIDTH 32
#define gOcarinaofTimeDesignTex_HEIGHT 16
extern u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)];
#define gBottleGlassTex_WIDTH 16
#define gBottleGlassTex_HEIGHT 16
extern u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)];
#define gDekuStickTex_WIDTH 8
#define gDekuStickTex_HEIGHT 8
extern u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)];
#endif

16
assets/objects/gameplay_keep/link_textures.c
View File

@ -1,5 +1,21 @@
#include "link_textures.h"
u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gHylianShieldDesignTex.rgba16.inc.c"
};
u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gOcarinaofTimeDesignTex.rgba16.inc.c"
};
u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gBottleGlassTex.rgba16.inc.c"
};
u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)] = {
#include "assets/objects/gameplay_keep/gDekuStickTex.i8.inc.c"
};
u64 gLinkHairTex[TEX_LEN(u64, gLinkHairTex_WIDTH, gLinkHairTex_HEIGHT, 16)] = {
#include "assets/objects/gameplay_keep/gLinkHairTex.rgba16.inc.c"
};

12
assets/objects/gameplay_keep/link_textures.h
View File

@ -4,6 +4,18 @@
#include "tex_len.h"
#include "ultra64.h"
#define gHylianShieldDesignTex_WIDTH 32
#define gHylianShieldDesignTex_HEIGHT 64
extern u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)];
#define gOcarinaofTimeDesignTex_WIDTH 32
#define gOcarinaofTimeDesignTex_HEIGHT 16
extern u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)];
#define gBottleGlassTex_WIDTH 16
#define gBottleGlassTex_HEIGHT 16
extern u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)];
#define gDekuStickTex_WIDTH 8
#define gDekuStickTex_HEIGHT 8
extern u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)];
#define gLinkHairTex_WIDTH 16
#define gLinkHairTex_HEIGHT 16
extern u64 gLinkHairTex[TEX_LEN(u64, gLinkHairTex_WIDTH, gLinkHairTex_HEIGHT, 16)];

1
spec/spec
View File

@ -998,7 +998,6 @@ beginseg
compress
romalign 0x1000
include "$(BUILD_DIR)/assets/objects/gameplay_keep/hilite_textures.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x400.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/link_textures.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_pause_joint_tables.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_anim_headers.o"