Update Mario & Luigi models, provided by FluffaMario

This commit is contained in:
David Joslin 2023-11-15 19:29:56 -08:00 committed by Agent X
parent c2c846f650
commit 5fd26a5f68
6 changed files with 5 additions and 2 deletions

View file

@ -1,3 +1,4 @@
#include "geo_header.h"
// Normal Mario Geo // Normal Mario Geo
const GeoLayout luigi_geo_face_and_wings[] = { const GeoLayout luigi_geo_face_and_wings[] = {

View file

@ -1,3 +1,4 @@
#include "geo_header.h"
// 0x16000CA4 // 0x16000CA4
const GeoLayout luigis_cap_geo[] = { const GeoLayout luigis_cap_geo[] = {
GEO_NODE_START(), GEO_NODE_START(),

View file

@ -1,3 +1,4 @@
#include "geo_header.h"
// Normal Mario Geo // Normal Mario Geo
// 0x170002E0 // 0x170002E0

View file

@ -1,3 +1,4 @@
#include "geo_header.h"
// 0x16000CA4 // 0x16000CA4
const GeoLayout marios_cap_geo[] = { const GeoLayout marios_cap_geo[] = {
GEO_NODE_START(), GEO_NODE_START(),

View file

@ -4,4 +4,3 @@ extern ALIGNED8 const Texture mario_cap_seg3_texture_0301E750[];
extern ALIGNED8 const Texture mario_cap_seg3_texture_0301F750[]; extern ALIGNED8 const Texture mario_cap_seg3_texture_0301F750[];
extern ALIGNED8 const Texture mario_cap_seg3_texture_03020750[]; extern ALIGNED8 const Texture mario_cap_seg3_texture_03020750[];
extern ALIGNED8 const Texture mario_cap_seg3_texture_03021750[]; extern ALIGNED8 const Texture mario_cap_seg3_texture_03021750[];
extern ALIGNED8 const Texture mario_cap_texture_cap_inside[];

View file

@ -203,7 +203,7 @@ const Gfx mario_cap_seg3_dl_03022D10[] = {
gsDPTileSync(), gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(0, 0, 0, (8 - 1) << G_TEXTURE_IMAGE_FRAC, (8 - 1) << G_TEXTURE_IMAGE_FRAC), gsDPSetTileSize(0, 0, 0, (8 - 1) << G_TEXTURE_IMAGE_FRAC, (8 - 1) << G_TEXTURE_IMAGE_FRAC),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_cap_texture_cap_inside), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_cap_inside),
gsDPLoadSync(), gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_16b_BYTES)), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 8 * 8 - 1, CALC_DXT(8, G_IM_SIZ_16b_BYTES)),
gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&mario_cap_seg3_lights_0301CF08.a, 2), gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&mario_cap_seg3_lights_0301CF08.a, 2),