From 5fd26a5f68d59803712c0eb58dd8cc5727d65c3c Mon Sep 17 00:00:00 2001 From: David Joslin Date: Wed, 15 Nov 2023 19:29:56 -0800 Subject: [PATCH] Update Mario & Luigi models, provided by FluffaMario --- actors/luigi/geo.inc.c | 1 + actors/luigi_cap/geo.inc.c | 1 + actors/mario/geo.inc.c | 1 + actors/mario_cap/geo.inc.c | 1 + actors/mario_cap/mario_cap_externs.h | 1 - actors/mario_cap/model.inc.c | 2 +- 6 files changed, 5 insertions(+), 2 deletions(-) diff --git a/actors/luigi/geo.inc.c b/actors/luigi/geo.inc.c index c6a5ad4e..be9b7259 100644 --- a/actors/luigi/geo.inc.c +++ b/actors/luigi/geo.inc.c @@ -1,3 +1,4 @@ +#include "geo_header.h" // Normal Mario Geo const GeoLayout luigi_geo_face_and_wings[] = { diff --git a/actors/luigi_cap/geo.inc.c b/actors/luigi_cap/geo.inc.c index 0283df73..ad6e7dd3 100644 --- a/actors/luigi_cap/geo.inc.c +++ b/actors/luigi_cap/geo.inc.c @@ -1,3 +1,4 @@ +#include "geo_header.h" // 0x16000CA4 const GeoLayout luigis_cap_geo[] = { GEO_NODE_START(), diff --git a/actors/mario/geo.inc.c b/actors/mario/geo.inc.c index 9cefb37c..9a6ea4d6 100644 --- a/actors/mario/geo.inc.c +++ b/actors/mario/geo.inc.c @@ -1,3 +1,4 @@ +#include "geo_header.h" // Normal Mario Geo // 0x170002E0 diff --git a/actors/mario_cap/geo.inc.c b/actors/mario_cap/geo.inc.c index 942509ef..37546c41 100644 --- a/actors/mario_cap/geo.inc.c +++ b/actors/mario_cap/geo.inc.c @@ -1,3 +1,4 @@ +#include "geo_header.h" // 0x16000CA4 const GeoLayout marios_cap_geo[] = { GEO_NODE_START(), diff --git a/actors/mario_cap/mario_cap_externs.h b/actors/mario_cap/mario_cap_externs.h index 664ee3ea..538e3af0 100644 --- a/actors/mario_cap/mario_cap_externs.h +++ b/actors/mario_cap/mario_cap_externs.h @@ -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_03020750[]; extern ALIGNED8 const Texture mario_cap_seg3_texture_03021750[]; -extern ALIGNED8 const Texture mario_cap_texture_cap_inside[]; diff --git a/actors/mario_cap/model.inc.c b/actors/mario_cap/model.inc.c index 40cf822e..f5d19528 100644 --- a/actors/mario_cap/model.inc.c +++ b/actors/mario_cap/model.inc.c @@ -203,7 +203,7 @@ const Gfx mario_cap_seg3_dl_03022D10[] = { 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), 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(), 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),