mirror of
https://github.com/n64decomp/mk64
synced 2026-08-02 00:14:00 -04:00
Add some more asset make and json files (#322)
Course outlines, course previews, unused traffic light, and character portraits Signed-off-by: Taggerung <tyler.taggerung@email.com>
This commit is contained in:
Tyler McGavran
+36
-31
@@ -2497,93 +2497,98 @@ s8 D_0D01A2D8[] = {
|
||||
|
||||
// 1A4D8 mario tlut
|
||||
s8 gTLUTPortraitMario[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitMario.rgba16.ci8.tlut.inc.c"
|
||||
#include "assets/character_portraits/gTLUTPortraitMario.inc.c"
|
||||
};
|
||||
|
||||
// 1A6D8 luigi tlut
|
||||
s8 gTLUTPortraitLuigi[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitLuigi.rgba16.ci8.tlut.inc.c"
|
||||
#include "assets/character_portraits/gTLUTPortraitLuigi.inc.c"
|
||||
};
|
||||
|
||||
// 1A8D8 peach tlut
|
||||
s8 gTLUTPortraitPeach[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitPeach.rgba16.ci8.tlut.inc.c"
|
||||
#include "assets/character_portraits/gTLUTPortraitPeach.inc.c"
|
||||
};
|
||||
|
||||
// 1AAD8 toad tlut
|
||||
s8 gTLUTPortraitToad[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitToad.rgba16.ci8.tlut.inc.c"
|
||||
#include "assets/character_portraits/gTLUTPortraitToad.inc.c"
|
||||
};
|
||||
|
||||
// 1ACD8 yoshi tlut
|
||||
s8 gTLUTPortraitYoshi[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitYoshi.rgba16.ci8.tlut.inc.c"
|
||||
#include "assets/character_portraits/gTLUTPortraitYoshi.inc.c"
|
||||
};
|
||||
|
||||
// 1AED8 dk tlut
|
||||
s8 gTLUTPortraitDonkeyKong[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitDonkeyKong.rgba16.ci8.tlut.inc.c"
|
||||
#include "assets/character_portraits/gTLUTPortraitDonkeyKong.inc.c"
|
||||
};
|
||||
|
||||
// 1B0D8 wario tlut
|
||||
s8 gTLUTPortraitWario[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitWario.rgba16.ci8.tlut.inc.c"
|
||||
#include "assets/character_portraits/gTLUTPortraitWario.inc.c"
|
||||
};
|
||||
|
||||
// 1B2D8 bowser tlut
|
||||
s8 gTLUTPortraitBowser[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitBowser.rgba16.ci8.tlut.inc.c"
|
||||
#include "assets/character_portraits/gTLUTPortraitBowser.inc.c"
|
||||
};
|
||||
|
||||
// 1B4D8 bob-omb tlut and question mark?
|
||||
s8 gTLUTPortraitBombKartAndQuestionMark[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitBombKartAndQuestionMark.rgba16.ci8.tlut.inc.c"
|
||||
#include "assets/character_portraits/gTLUTPortraitBombKartAndQuestionMark.inc.c"
|
||||
};
|
||||
|
||||
|
||||
// Mario
|
||||
s8 gTexturePortraitMario[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitMario.rgba16.ci8.inc.c"
|
||||
#include "assets/character_portraits/gTexturePortraitMario.inc.c"
|
||||
};
|
||||
|
||||
// Luigi
|
||||
s8 gTexturePortraitLuigi[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitLuigi.rgba16.ci8.inc.c"
|
||||
#include "assets/character_portraits/gTexturePortraitLuigi.inc.c"
|
||||
};
|
||||
|
||||
// Peach
|
||||
s8 gTexturePortraitPeach[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitPeach.rgba16.ci8.inc.c"
|
||||
#include "assets/character_portraits/gTexturePortraitPeach.inc.c"
|
||||
};
|
||||
|
||||
// Toad
|
||||
s8 gTexturePortraitToad[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitToad.rgba16.ci8.inc.c"
|
||||
#include "assets/character_portraits/gTexturePortraitToad.inc.c"
|
||||
};
|
||||
|
||||
// Yoshi
|
||||
s8 gTexturePortraitYoshi[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitYoshi.rgba16.ci8.inc.c"
|
||||
#include "assets/character_portraits/gTexturePortraitYoshi.inc.c"
|
||||
};
|
||||
|
||||
// Donkey Kong
|
||||
s8 gTexturePortraitDonkeyKong[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitDonkeyKong.rgba16.ci8.inc.c"
|
||||
#include "assets/character_portraits/gTexturePortraitDonkeyKong.inc.c"
|
||||
};
|
||||
|
||||
// Wario
|
||||
s8 gTexturePortraitWario[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitWario.rgba16.ci8.inc.c"
|
||||
#include "assets/character_portraits/gTexturePortraitWario.inc.c"
|
||||
};
|
||||
|
||||
// Bowser
|
||||
s8 gTexturePortraitBowser[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitBowser.rgba16.ci8.inc.c"
|
||||
#include "assets/character_portraits/gTexturePortraitBowser.inc.c"
|
||||
};
|
||||
|
||||
// Mini Bomb Kart & Question Mark
|
||||
s8 gTexturePortraitBombKartAndQuestionMark[] = {
|
||||
#include "textures/common/tlut/gTexturePortraitBombKartAndQuestionMark.rgba16.ci8.inc.c"
|
||||
// Mini Bomb Kart
|
||||
s8 gTexturePortraitBombKart[] = {
|
||||
#include "assets/character_portraits/gTexturePortraitBombKart.inc.c"
|
||||
};
|
||||
|
||||
// Question Mark
|
||||
s8 gTexturePortraitQuestionMark[] = {
|
||||
#include "assets/character_portraits/gTexturePortraitQuestionMark.inc.c"
|
||||
};
|
||||
|
||||
// 1DED8 tlut item frames
|
||||
@@ -2758,49 +2763,49 @@ u8 gTLUTLakituFishing[] = {
|
||||
|
||||
// unused traffic light tlut
|
||||
UNUSED s8 D_0D025ED8[] = {
|
||||
#include "textures/132B50_25ED8_tlut.rgba16.inc.c"
|
||||
#include "assets/unused_traffic_light/gTLUTUnusedTrafficLight.inc.c"
|
||||
};
|
||||
|
||||
// unused traffic light textures
|
||||
|
||||
UNUSED s8 D_0D0260D8[] = {
|
||||
#include "textures/132B50_260D8.rgba16.ci8.inc.c"
|
||||
#include "assets/unused_traffic_light/gTextureUnusedTrafficLight01.inc.c"
|
||||
};
|
||||
|
||||
UNUSED s8 D_0D026558[] = {
|
||||
#include "textures/132B50_26558.rgba16.ci8.inc.c"
|
||||
#include "assets/unused_traffic_light/gTextureUnusedTrafficLight02.inc.c"
|
||||
};
|
||||
|
||||
UNUSED s8 D_0D0269D8[] = {
|
||||
#include "textures/132B50_269D8.rgba16.ci8.inc.c"
|
||||
#include "assets/unused_traffic_light/gTextureUnusedTrafficLight03.inc.c"
|
||||
};
|
||||
|
||||
UNUSED s8 D_0D026E58[] = {
|
||||
#include "textures/132B50_26E58.rgba16.ci8.inc.c"
|
||||
#include "assets/unused_traffic_light/gTextureUnusedTrafficLight04.inc.c"
|
||||
};
|
||||
|
||||
UNUSED s8 D_0D0272D8[] = {
|
||||
#include "textures/132B50_272D8.rgba16.ci8.inc.c"
|
||||
#include "assets/unused_traffic_light/gTextureUnusedTrafficLight05.inc.c"
|
||||
};
|
||||
|
||||
UNUSED s8 D_0D027758[] = {
|
||||
#include "textures/132B50_27758.rgba16.ci8.inc.c"
|
||||
#include "assets/unused_traffic_light/gTextureUnusedTrafficLight06.inc.c"
|
||||
};
|
||||
|
||||
UNUSED s8 D_0D027BD8[] = {
|
||||
#include "textures/132B50_27BD8.rgba16.ci8.inc.c"
|
||||
#include "assets/unused_traffic_light/gTextureUnusedTrafficLight07.inc.c"
|
||||
};
|
||||
|
||||
UNUSED s8 D_0D028058[] = {
|
||||
#include "textures/132B50_28058.rgba16.ci8.inc.c"
|
||||
#include "assets/unused_traffic_light/gTextureUnusedTrafficLight08.inc.c"
|
||||
};
|
||||
|
||||
UNUSED s8 D_0D0284D8[] = {
|
||||
#include "textures/132B50_284D8.rgba16.ci8.inc.c"
|
||||
#include "assets/unused_traffic_light/gTextureUnusedTrafficLight09.inc.c"
|
||||
};
|
||||
|
||||
UNUSED s8 D_0D028958[] = {
|
||||
#include "textures/132B50_28958.rgba16.ci8.inc.c"
|
||||
#include "assets/unused_traffic_light/gTextureUnusedTrafficLight10.inc.c"
|
||||
};
|
||||
|
||||
// leaf
|
||||
|
||||
+20
-20
@@ -738,26 +738,26 @@ extern MkAnimation D_02007598[21];
|
||||
extern MkAnimation D_02007640[2];
|
||||
|
||||
/* Texture data arrays, defined in include/texture_data_2.s */
|
||||
extern u64 gCoursePreviewBansheeBoardwalk[];
|
||||
extern u64 gCoursePreviewBigDonut[];
|
||||
extern u64 gCoursePreviewBlockFort[];
|
||||
extern u64 gCoursePreviewBowsersCastle[];
|
||||
extern u64 gCoursePreviewChocoMountain[];
|
||||
extern u64 gCoursePreviewDksJungleParkway[];
|
||||
extern u64 gCoursePreviewDoubleDeck[];
|
||||
extern u64 gCoursePreviewFrappeSnowland[];
|
||||
extern u64 gCoursePreviewKalimariDesert[];
|
||||
extern u64 gCoursePreviewKoopaTroopaBeach[];
|
||||
extern u64 gCoursePreviewLuigiRaceway[];
|
||||
extern u64 gCoursePreviewMarioRaceway[];
|
||||
extern u64 gCoursePreviewMooMooFarm[];
|
||||
extern u64 gCoursePreviewRainbowRoad[];
|
||||
extern u64 gCoursePreviewRoyalRaceway[];
|
||||
extern u64 gCoursePreviewSherbetLand[];
|
||||
extern u64 gCoursePreviewSkyscraper[];
|
||||
extern u64 gCoursePreviewToadsTurnpike[];
|
||||
extern u64 gCoursePreviewWarioStadium[];
|
||||
extern u64 gCoursePreviewYoshiValley[];
|
||||
extern u64 gTextureCoursePreviewBansheeBoardwalk[];
|
||||
extern u64 gTextureCoursePreviewBigDonut[];
|
||||
extern u64 gTextureCoursePreviewBlockFort[];
|
||||
extern u64 gTextureCoursePreviewBowsersCastle[];
|
||||
extern u64 gTextureCoursePreviewChocoMountain[];
|
||||
extern u64 gTextureCoursePreviewDksJungleParkway[];
|
||||
extern u64 gTextureCoursePreviewDoubleDeck[];
|
||||
extern u64 gTextureCoursePreviewFrappeSnowland[];
|
||||
extern u64 gTextureCoursePreviewKalimariDesert[];
|
||||
extern u64 gTextureCoursePreviewKoopaTroopaBeach[];
|
||||
extern u64 gTextureCoursePreviewLuigiRaceway[];
|
||||
extern u64 gTextureCoursePreviewMarioRaceway[];
|
||||
extern u64 gTextureCoursePreviewMooMooFarm[];
|
||||
extern u64 gTextureCoursePreviewRainbowRoad[];
|
||||
extern u64 gTextureCoursePreviewRoyalRaceway[];
|
||||
extern u64 gTextureCoursePreviewSherbetLand[];
|
||||
extern u64 gTextureCoursePreviewSkyscraper[];
|
||||
extern u64 gTextureCoursePreviewToadsTurnpike[];
|
||||
extern u64 gTextureCoursePreviewWarioStadium[];
|
||||
extern u64 gTextureCoursePreviewYoshiValley[];
|
||||
extern u64 gTexture7E56E4[];
|
||||
extern u64 gTexture7ED058[];
|
||||
extern u64 gTexture7ED290[];
|
||||
|
||||
+21
-21
@@ -873,102 +873,102 @@ MkTexture D_02001B04[2] = {
|
||||
};
|
||||
|
||||
MkTexture D_02001B2C[2] = {
|
||||
{0, 0, gCoursePreviewMarioRaceway, 128, 78, 0, 0, 0x3157, 0},
|
||||
{0, 0, gTextureCoursePreviewMarioRaceway, 128, 78, 0, 0, 0x3157, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001B54[2] = {
|
||||
{0, 0, gCoursePreviewChocoMountain, 128, 78, 0, 0, 0x2a24, 0},
|
||||
{0, 0, gTextureCoursePreviewChocoMountain, 128, 78, 0, 0, 0x2a24, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001B7C[2] = {
|
||||
{0, 0, gCoursePreviewBowsersCastle, 128, 78, 0, 0, 0x30de, 0},
|
||||
{0, 0, gTextureCoursePreviewBowsersCastle, 128, 78, 0, 0, 0x30de, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001BA4[2] = {
|
||||
{0, 0, gCoursePreviewBansheeBoardwalk, 128, 78, 0, 0, 0x26ad, 0},
|
||||
{0, 0, gTextureCoursePreviewBansheeBoardwalk, 128, 78, 0, 0, 0x26ad, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001BCC[2] = {
|
||||
{0, 0, gCoursePreviewYoshiValley, 128, 78, 0, 0, 0x3a41, 0},
|
||||
{0, 0, gTextureCoursePreviewYoshiValley, 128, 78, 0, 0, 0x3a41, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001BF4[2] = {
|
||||
{0, 0, gCoursePreviewFrappeSnowland, 128, 78, 0, 0, 0x2409, 0},
|
||||
{0, 0, gTextureCoursePreviewFrappeSnowland, 128, 78, 0, 0, 0x2409, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001C1C[2] = {
|
||||
{0, 0, gCoursePreviewKoopaTroopaBeach, 128, 78, 0, 0, 0x2323, 0},
|
||||
{0, 0, gTextureCoursePreviewKoopaTroopaBeach, 128, 78, 0, 0, 0x2323, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001C44[2] = {
|
||||
{0, 0, gCoursePreviewRoyalRaceway, 128, 78, 0, 0, 0x2821, 0},
|
||||
{0, 0, gTextureCoursePreviewRoyalRaceway, 128, 78, 0, 0, 0x2821, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001C6C[2] = {
|
||||
{0, 0, gCoursePreviewLuigiRaceway, 128, 78, 0, 0, 0x2d74, 0},
|
||||
{0, 0, gTextureCoursePreviewLuigiRaceway, 128, 78, 0, 0, 0x2d74, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001C94[2] = {
|
||||
{0, 0, gCoursePreviewMooMooFarm, 128, 78, 0, 0, 0x25c7, 0},
|
||||
{0, 0, gTextureCoursePreviewMooMooFarm, 128, 78, 0, 0, 0x25c7, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001CBC[2] = {
|
||||
{0, 0, gCoursePreviewToadsTurnpike, 128, 78, 0, 0, 0x299a, 0},
|
||||
{0, 0, gTextureCoursePreviewToadsTurnpike, 128, 78, 0, 0, 0x299a, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001CE4[2] = {
|
||||
{0, 0, gCoursePreviewKalimariDesert, 128, 78, 0, 0, 0x280a, 0},
|
||||
{0, 0, gTextureCoursePreviewKalimariDesert, 128, 78, 0, 0, 0x280a, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001D0C[2] = {
|
||||
{0, 0, gCoursePreviewSherbetLand, 128, 78, 0, 0, 0x300e, 0},
|
||||
{0, 0, gTextureCoursePreviewSherbetLand, 128, 78, 0, 0, 0x300e, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001D34[2] = {
|
||||
{0, 0, gCoursePreviewRainbowRoad, 128, 78, 0, 0, 0x2824, 0},
|
||||
{0, 0, gTextureCoursePreviewRainbowRoad, 128, 78, 0, 0, 0x2824, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001D5C[2] = {
|
||||
{0, 0, gCoursePreviewWarioStadium, 128, 78, 0, 0, 0x32d3, 0},
|
||||
{0, 0, gTextureCoursePreviewWarioStadium, 128, 78, 0, 0, 0x32d3, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001D84[2] = {
|
||||
{0, 0, gCoursePreviewBlockFort, 128, 78, 0, 0, 0x2528, 0},
|
||||
{0, 0, gTextureCoursePreviewBlockFort, 128, 78, 0, 0, 0x2528, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001DAC[2] = {
|
||||
{0, 0, gCoursePreviewSkyscraper, 128, 78, 0, 0, 0x26f0, 0},
|
||||
{0, 0, gTextureCoursePreviewSkyscraper, 128, 78, 0, 0, 0x26f0, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001DD4[2] = {
|
||||
{0, 0, gCoursePreviewDoubleDeck, 128, 78, 0, 0, 0x28f7, 0},
|
||||
{0, 0, gTextureCoursePreviewDoubleDeck, 128, 78, 0, 0, 0x28f7, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001DFC[2] = {
|
||||
{0, 0, gCoursePreviewDksJungleParkway, 128, 78, 0, 0, 0x3ee4, 0},
|
||||
{0, 0, gTextureCoursePreviewDksJungleParkway, 128, 78, 0, 0, 0x3ee4, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
MkTexture D_02001E24[2] = {
|
||||
{0, 0, gCoursePreviewBigDonut, 128, 78, 0, 0, 0x2f5c, 0},
|
||||
{0, 0, gTextureCoursePreviewBigDonut, 128, 78, 0, 0, 0x2f5c, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
@@ -2514,7 +2514,7 @@ MkTexture D_02004C3C[2] = {
|
||||
};
|
||||
|
||||
MkTexture D_02004C64[2] = {
|
||||
{0, 0, gCoursePreviewMarioRaceway, 128, 78, 23, 112, 0x1e3d, 0},
|
||||
{0, 0, gTextureCoursePreviewMarioRaceway, 128, 78, 23, 112, 0x1e3d, 0},
|
||||
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user