thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-07-13 09:51:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge aca2075a46 into c4538e9d41

Browse source
This commit is contained in:
FluffaMario 2026-06-29 18:58:27 -05:00 • committed by GitHub
commit f761eb9d90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
88 changed files with 2752 additions and 2236 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
actors/luigi/custom_luigi_cap.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 276 B

BIN
actors/luigi/custom_luigi_logo.ia16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 722 B

BIN
actors/luigi/custom_luigi_logo.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 276 B

BIN
actors/luigi/custom_luigi_logo_blend.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 372 B

BIN
actors/luigi/custom_luigi_sideburn.ia16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 891 B

BIN
actors/luigi/custom_luigi_sideburn.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 603 B

BIN
actors/luigi/custom_luigi_sideburn_add.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 352 B

BIN
actors/luigi/custom_luigi_skin.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 305 B

154
actors/luigi/geo.inc.c
View file

@ -1,46 +1,34 @@
#include "geo_header.h"
// Normal Mario Geo
// Normal Luigi Geo
// 0x170002E0
const GeoLayout luigi_geo_face_and_wings[] = {
GEO_ASM(0, geo_mario_head_rotation),
GEO_ROTATION_NODE(0x00, 0, 0, 0),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_cap_on_off),
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_l_logo_decal),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_hair_sideburn_decal_cap_on),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_front),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_dead),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_front),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_on_eyes_dead),
GEO_CLOSE_NODE(),
GEO_NODE_START(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_hair_sideburn_decal_cap_off),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_front),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_dead),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_front),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_off_eyes_dead),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_TRANSLATE_ROTATE(0, 140, -45, -110, 22, -40, -135),
@ -63,6 +51,7 @@ const GeoLayout luigi_geo_face_and_wings[] = {
GEO_RETURN(),
};
// 0x1700041C
const GeoLayout luigi_geo_left_hand[] = {
GEO_SWITCH_CASE(1, geo_switch_mario_hand),
GEO_OPEN_NODE(),
@ -82,6 +71,7 @@ const GeoLayout luigi_geo_left_hand[] = {
GEO_RETURN(),
};
// 0x17000494
const GeoLayout luigi_geo_right_hand[] = {
GEO_SWITCH_CASE(0, geo_switch_mario_hand),
GEO_OPEN_NODE(),
@ -100,12 +90,8 @@ const GeoLayout luigi_geo_right_hand[] = {
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 65, 0, 0, luigi_right_hand_peace), // here we go hand
GEO_ANIMATED_PART(LAYER_OPAQUE, 65, 0, 0, luigi_right_hand_cap),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_right_hand_cap_decal),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 65, 0, 0, luigi_right_hand_cap),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_right_hand_cap_decal),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_right_hand_cap_wings),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
@ -114,6 +100,7 @@ const GeoLayout luigi_geo_right_hand[] = {
// The body loads all the parts with some shared dls to apply the solid color of the dl that has it, the same rule applies to the medium and low poly geos
// 0x1700053C
const GeoLayout luigi_geo_body[] = {
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 22, 0, NULL),
GEO_OPEN_NODE(),
@ -183,48 +170,36 @@ const GeoLayout luigi_geo_body[] = {
GEO_RETURN(),
};
// Vanish Mario Geo
// Vanish Luigi Geo
// 0x17000DEC
const GeoLayout luigi_vanish_geo_face_and_wings[] = {
GEO_ASM(0, geo_mario_head_rotation),
GEO_ROTATION_NODE(0x00, 0, 0, 0),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_cap_on_off),
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_l_logo_decal),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_hair_sideburn_decal_cap_on),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_front),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_closed),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_dead),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_front_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_half_closed_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_closed_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_right_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_left_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_up_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_down_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_on_eyes_dead_transparent),
GEO_CLOSE_NODE(),
GEO_NODE_START(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_hair_sideburn_decal_cap_off),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_front),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_closed),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_dead),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_front_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_half_closed_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_closed_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_right_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_left_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_up_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_down_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_off_eyes_dead_transparent),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_TRANSLATE_ROTATE(0, 140, -45, -110, 22, -40, -135),
@ -247,6 +222,7 @@ const GeoLayout luigi_vanish_geo_face_and_wings[] = {
GEO_RETURN(),
};
// 0x17000F28
const GeoLayout luigi_vanish_geo_left_hand[] = {
GEO_SWITCH_CASE(1, geo_switch_mario_hand),
GEO_OPEN_NODE(),
@ -266,6 +242,7 @@ const GeoLayout luigi_vanish_geo_left_hand[] = {
GEO_RETURN(),
};
// 0x17000FA0
const GeoLayout luigi_vanish_geo_right_hand[] = {
GEO_SWITCH_CASE(0, geo_switch_mario_hand),
GEO_OPEN_NODE(),
@ -284,20 +261,17 @@ const GeoLayout luigi_vanish_geo_right_hand[] = {
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 65, 0, 0, luigi_right_hand_peace), // here we go hand
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 65, 0, 0, luigi_right_hand_cap),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_right_hand_cap_decal),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 65, 0, 0, luigi_right_hand_cap),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_right_hand_cap_decal),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_right_hand_cap_wings_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_right_hand_cap_wings),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
// Same rule body as Normal Mario
// Same rule body as Normal Luigi
// 0x17001048
const GeoLayout luigi_vanish_geo_body[] = {
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 22, 0, NULL),
GEO_OPEN_NODE(),
@ -367,8 +341,9 @@ const GeoLayout luigi_vanish_geo_body[] = {
GEO_RETURN(),
};
// Metal Mario Geo
// Metal Luigi Geo
// 0x170018F8
const GeoLayout luigi_metal_geo_face_and_wings[] = {
GEO_ASM(0, geo_mario_head_rotation),
GEO_ROTATION_NODE(0x00, 0, 0, 0),
@ -398,6 +373,7 @@ const GeoLayout luigi_metal_geo_face_and_wings[] = {
GEO_RETURN(),
};
// 0x170019A4
const GeoLayout luigi_metal_geo_left_hand[] = {
GEO_SWITCH_CASE(1, geo_switch_mario_hand),
GEO_OPEN_NODE(),
@ -417,6 +393,7 @@ const GeoLayout luigi_metal_geo_left_hand[] = {
GEO_RETURN(),
};
// 0x17001A1C
const GeoLayout luigi_metal_geo_right_hand[] = {
GEO_SWITCH_CASE(0, geo_switch_mario_hand),
GEO_OPEN_NODE(),
@ -443,8 +420,9 @@ const GeoLayout luigi_metal_geo_right_hand[] = {
GEO_RETURN(),
};
// A difference from Normal Mario is that the dls after the butt and left thigh shares the metal texture of it, same rule applies to the medium and low poly geos
// A difference from Normal Luigi is that the dls after the butt and left thigh shares the metal texture of it, same rule applies to the medium and low poly geos
// 0x17001AC4
const GeoLayout luigi_metal_geo_body[] = {
GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 22, 0, NULL),
GEO_OPEN_NODE(),
@ -514,8 +492,9 @@ const GeoLayout luigi_metal_geo_body[] = {
GEO_RETURN(),
};
// Metal Vanish Mario Geo
// Metal Vanish Luigi Geo
// 0x170022E4
const GeoLayout luigi_metal_vanish_geo_face_and_wings[] = {
GEO_ASM(0, geo_mario_head_rotation),
GEO_ROTATION_NODE(0x00, 0, 0, 0),
@ -545,6 +524,7 @@ const GeoLayout luigi_metal_vanish_geo_face_and_wings[] = {
GEO_RETURN(),
};
// 0x17002390
const GeoLayout luigi_metal_vanish_geo_left_hand[] = {
GEO_SWITCH_CASE(0, geo_switch_mario_hand),
GEO_OPEN_NODE(),
@ -564,6 +544,7 @@ const GeoLayout luigi_metal_vanish_geo_left_hand[] = {
GEO_RETURN(),
};
// 0x17002408
const GeoLayout luigi_metal_vanish_geo_right_hand[] = {
GEO_SWITCH_CASE(0, geo_switch_mario_hand),
GEO_OPEN_NODE(),
@ -584,14 +565,15 @@ const GeoLayout luigi_metal_vanish_geo_right_hand[] = {
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 65, 0, 0, luigi_metal_right_hand_cap_shared_dl),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 65, 0, 0, luigi_metal_right_hand_cap_shared_dl),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_metal_right_hand_cap_shared_dl_wings_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_metal_right_hand_cap_shared_dl_wings),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
// Same rules as Metal Mario
// Same rules as Metal Luigi
// 0x170024B0
const GeoLayout luigi_metal_vanish_geo_body[] = {
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 22, 0, NULL),
GEO_OPEN_NODE(),
@ -661,8 +643,7 @@ const GeoLayout luigi_metal_vanish_geo_body[] = {
GEO_RETURN(),
};
// High Poly
// 0x17002CE0
const GeoLayout luigi_geo_load_body[] = {
GEO_SWITCH_CASE(0, geo_switch_mario_cap_effect),
GEO_OPEN_NODE(),
@ -674,8 +655,9 @@ const GeoLayout luigi_geo_load_body[] = {
GEO_RETURN(),
};
// This last geo is used to load all of Mario Geo in the Level Scripts
// This last geo is used to load all of Luigi Geo in the Level Scripts
// 0x17002DD4
const GeoLayout luigi_geo[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
@ -684,23 +666,31 @@ const GeoLayout luigi_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE << 2, geo_mirror_mario_backface_culling),
GEO_ASM(LAYER_OPAQUE_DECAL << 2, geo_mirror_mario_backface_culling),
GEO_ASM(LAYER_ALPHA << 2, geo_mirror_mario_backface_culling),
GEO_ASM(LAYER_TRANSPARENT << 2, geo_mirror_mario_backface_culling),
GEO_ASM(LAYER_TRANSPARENT_DECAL << 2, geo_mirror_mario_backface_culling),
GEO_ASM(0, geo_mirror_mario_set_alpha),
GEO_OPEN_NODE(),
GEO_BRANCH(1, luigi_geo_load_body),
GEO_CLOSE_NODE(),
GEO_ASM((LAYER_OPAQUE << 2) | 1, geo_mirror_mario_backface_culling),
GEO_ASM((LAYER_OPAQUE_DECAL << 2) | 1, geo_mirror_mario_backface_culling),
GEO_ASM((LAYER_ALPHA << 2) | 1, geo_mirror_mario_backface_culling),
GEO_ASM((LAYER_TRANSPARENT << 2) | 1, geo_mirror_mario_backface_culling),
GEO_ASM((LAYER_TRANSPARENT_DECAL << 2) | 1, geo_mirror_mario_backface_culling),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_OPAQUE_DECAL, luigi_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT_DECAL, luigi_material_revert_render_settings),
GEO_CLOSE_NODE(),
GEO_END(),
};

26
actors/luigi/geo_header.h
View file

@ -55,8 +55,6 @@ extern const Gfx luigi_mustache_cap_on_dl[];
extern const Gfx luigi_face_part_cap_on_dl[];
extern const Gfx luigi_face_cap_dl[];
extern const Gfx luigi_face_back_hair_cap_on_dl[];
extern const Gfx luigi_hair_sideburn_decal_cap_on[];
extern const Gfx luigi_l_logo_decal[];
extern const Gfx luigi_face_cap_on_dl[];
extern const Gfx luigi_cap_on_eyes_front[];
extern const Gfx luigi_cap_on_eyes_half_closed[];
@ -66,13 +64,20 @@ extern const Gfx luigi_cap_on_eyes_left[];
extern const Gfx luigi_cap_on_eyes_up[];
extern const Gfx luigi_cap_on_eyes_down[];
extern const Gfx luigi_cap_on_eyes_dead[];
extern const Gfx luigi_cap_on_eyes_front_transparent[];
extern const Gfx luigi_cap_on_eyes_half_closed_transparent[];
extern const Gfx luigi_cap_on_eyes_closed_transparent[];
extern const Gfx luigi_cap_on_eyes_right_transparent[];
extern const Gfx luigi_cap_on_eyes_left_transparent[];
extern const Gfx luigi_cap_on_eyes_up_transparent[];
extern const Gfx luigi_cap_on_eyes_down_transparent[];
extern const Gfx luigi_cap_on_eyes_dead_transparent[];
extern const Gfx luigi_metal_cap_on_shared_dl[];
extern const Gfx luigi_eyes_cap_off_dl[];
extern const Gfx luigi_mustache_cap_off_dl[];
extern const Gfx luigi_hair_sideburn_cap_off_dl[];
extern const Gfx luigi_face_part_cap_off_dl[];
extern const Gfx luigi_face_hair_cap_off_dl[];
extern const Gfx luigi_hair_sideburn_decal_cap_off[];
extern const Gfx luigi_face_cap_off_dl[];
extern const Gfx luigi_cap_off_eyes_front[];
extern const Gfx luigi_cap_off_eyes_half_closed[];
@ -82,6 +87,14 @@ extern const Gfx luigi_cap_off_eyes_left[];
extern const Gfx luigi_cap_off_eyes_up[];
extern const Gfx luigi_cap_off_eyes_down[];
extern const Gfx luigi_cap_off_eyes_dead[];
extern const Gfx luigi_cap_off_eyes_front_transparent[];
extern const Gfx luigi_cap_off_eyes_half_closed_transparent[];
extern const Gfx luigi_cap_off_eyes_closed_transparent[];
extern const Gfx luigi_cap_off_eyes_right_transparent[];
extern const Gfx luigi_cap_off_eyes_left_transparent[];
extern const Gfx luigi_cap_off_eyes_up_transparent[];
extern const Gfx luigi_cap_off_eyes_down_transparent[];
extern const Gfx luigi_cap_off_eyes_dead_transparent[];
extern const Gfx luigi_metal_cap_off_shared_dl[];
extern const Gfx luigi_left_hand_open_shared_dl[];
extern const Gfx luigi_left_hand_open[];
@ -92,20 +105,15 @@ extern const Gfx luigi_right_hand_cap_l_logo_dl[];
extern const Gfx luigi_right_hand_cap_top_dl[];
extern const Gfx luigi_right_hand_cap_hand_position_dl[];
extern const Gfx luigi_right_hand_cap_bottom_dl[];
extern const Gfx luigi_right_hand_cap_decal[];
extern const Gfx luigi_right_hand_cap_dl[];
extern const Gfx luigi_right_hand_cap_wings_half_1_dl[];
extern const Gfx luigi_right_hand_cap_wings_half_2_dl[];
extern const Gfx luigi_right_hand_cap_wings_intial_dl[];
extern const Gfx luigi_right_hand_cap_wings_transparent_intial_dl[];
extern const Gfx luigi_right_hand_cap_metal_wings_intial_dl[];
extern const Gfx luigi_right_hand_cap_wings_initial_dl[];
extern const Gfx luigi_right_hand_cap_wings_end_dl[];
extern const Gfx luigi_right_hand_cap[];
extern const Gfx luigi_right_hand_cap_wings[];
extern const Gfx luigi_right_hand_cap_wings_transparent[];
extern const Gfx luigi_metal_right_hand_cap_shared_dl[];
extern const Gfx luigi_metal_right_hand_cap_shared_dl_wings[];
extern const Gfx luigi_metal_right_hand_cap_shared_dl_wings_transparent[];
extern const Gfx luigi_right_hand_peace_shared_dl[];
extern const Gfx luigi_right_hand_peace[];
extern const Gfx luigi_wings_half_1_dl[];

4
actors/luigi/luigi_externs.h
View file

@ -1,7 +1,3 @@
extern ALIGNED8 const Texture luigi_texture_l_logo[];
extern ALIGNED8 const Texture luigi_texture_l_blend[];
extern ALIGNED8 const Texture luigi_texture_l_cap[];
extern ALIGNED8 const Texture luigi_texture_hair_sideburn[];
extern ALIGNED8 const Texture luigi_texture_add_sideburn[];
extern ALIGNED8 const Texture luigi_texture_skin_sideburn[];
extern ALIGNED8 const Texture luigi_texture_mustache[];

2655
actors/luigi/model.inc.c
View file

File diff suppressed because it is too large Load diff

30
actors/luigi_cap/geo.inc.c
View file

@ -8,27 +8,23 @@ const GeoLayout luigis_cap_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(10, geo_update_layer_transparency),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_cap_l_logo_decal),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_seg3_dl_03022F48),
GEO_CLOSE_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_l_logo_decal),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_seg3_dl_03022F48),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_seg3_dl_03022F48),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_seg3_dl_03022F48),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_OPAQUE_DECAL, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT_DECAL, luigi_cap_material_revert_render_settings),
GEO_CLOSE_NODE(),
GEO_END(),
};
@ -42,8 +38,10 @@ const GeoLayout luigis_metal_cap_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(10, geo_update_layer_transparency),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
@ -53,8 +51,10 @@ const GeoLayout luigis_metal_cap_geo[] = {
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_OPAQUE_DECAL, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT_DECAL, luigi_cap_material_revert_render_settings),
GEO_CLOSE_NODE(),
GEO_END(),
};
@ -68,28 +68,30 @@ const GeoLayout luigis_wing_cap_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(10, geo_update_layer_transparency),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_cap_l_logo_decal),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_seg3_dl_03022F48),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_cap_seg3_dl_030230B0),
GEO_CLOSE_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_l_logo_decal),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_seg3_dl_03023160),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_OPAQUE_DECAL, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT_DECAL, luigi_cap_material_revert_render_settings),
GEO_CLOSE_NODE(),
GEO_END(),
};
@ -103,8 +105,10 @@ const GeoLayout luigis_winged_metal_cap_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(10, geo_update_layer_transparency),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
@ -121,8 +125,10 @@ const GeoLayout luigis_winged_metal_cap_geo[] = {
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_OPAQUE_DECAL, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_ALPHA, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, luigi_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT_DECAL, luigi_cap_material_revert_render_settings),
GEO_CLOSE_NODE(),
GEO_END(),
};

2
actors/luigi_cap/geo_header.h
View file

@ -9,9 +9,7 @@ extern const Gfx luigi_cap_seg3_dl_03022D10[];
extern const Gfx luigi_cap_seg3_dl_03022E78[];
extern const Gfx luigi_cap_seg3_dl_03022EA8[];
extern const Gfx luigi_cap_seg3_dl_03022ED8[];
extern const Gfx luigi_cap_seg3_dl_03022ED8_metal[];
extern const Gfx luigi_cap_seg3_dl_03022F20[];
extern const Gfx luigi_cap_l_logo_decal[];
extern const Gfx luigi_cap_seg3_dl_03022F48[];
extern const Gfx luigi_cap_seg3_dl_03022FF8[];
extern const Gfx luigi_cap_seg3_dl_030230B0[];

225
actors/luigi_cap/model.inc.c
View file

@ -1,24 +1,32 @@
#include "pc/rom_assets.h"
// Mario Cap (Normal Cap, Metal, Winged, etc)
// Luigi Cap (Normal Cap, Metal, Winged, etc)
static const Lights1 luigi_cap_black_lights_group = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
// 0x0301CF08
static const Lights1 luigi_cap_seg3_lights_0301CF08 = gdSPDefLights1(
0x00, 0x39, 0x00,
0x00, 0x73, 0x00, 0x28, 0x28, 0x28
);
// 0x0301CF20
static const Lights1 luigi_cap_seg3_lights_0301CF20 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0301CF38
static const Lights1 luigi_cap_seg3_lights_0301CF38 = gdSPDefLights1(
0x00, 0x7f, 0x00,
0x00, 0xff, 0x00, 0x28, 0x28, 0x28
);
#include "actors/mario/mario_externs.h"
#include "actors/luigi/luigi_externs.h"
#define luigi_cap_texture_metal_shade mario_texture_metal_shade
#define luigi_cap_texture_metal_light mario_texture_metal_light
#define luigi_cap_texture_l_logo luigi_texture_l_logo
#define luigi_cap_texture_l_blend luigi_texture_l_blend
#define luigi_cap_texture_l_cap luigi_texture_l_cap
#define luigi_cap_texture_wings_half_1 mario_texture_wings_half_1
#define luigi_cap_texture_wings_half_2 mario_texture_wings_half_2
#define luigi_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
#define luigi_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
#define luigi_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
#define luigi_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
#define luigi_cap_texture_metal mario_texture_metal
#define luigi_cap_texture_l_logo luigi_texture_l_logo
#define luigi_cap_texture_wings_half_1 mario_texture_wings_half_1
#define luigi_cap_texture_wings_half_2 mario_texture_wings_half_2
#define luigi_cap_texture_metal_wings_half_1 mario_texture_metal_wings_half_1
#define luigi_cap_texture_metal_wings_half_2 mario_texture_metal_wings_half_2
// 0x03022750
ROM_ASSET_LOAD_VTX(luigi_cap_seg3_vertex_03022750, 0x00114750, 78432, 0x0001bf50, 112);
@ -153,100 +161,88 @@ const Gfx luigi_cap_seg3_dl_03022ED8[] = {
gsSPEndDisplayList(),
};
const Gfx luigi_cap_seg3_dl_03022ED8_metal[] = {
gsDPPipeSync(),
gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
gsSPTexture(65535, 65535, 0, 0, 1),
gsSPLight(&luigi_cap_black_lights_group.l, 1),
gsSPCopyLightEXT(2, 15),
gsSPEndDisplayList(),
};
// 0x03022F20 - 0x03022F48
const Gfx luigi_cap_seg3_dl_03022F20[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCycleType(G_CYC_1CYCLE),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
gsSPEndDisplayList(),
};
const Gfx luigi_cap_l_logo_decal[] = {
gsDPPipeSync(),
gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0),
gsSPTexture(65535, 65535, 0, 0, 1),
gsSPLight(&luigi_cap_black_lights_group.l, 1),
gsSPCopyLightEXT(2, 17),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_l_logo),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 124),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_l_blend),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 124),
gsSPDisplayList(luigi_cap_seg3_dl_03022B30),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0),
gsSPTexture(65535, 65535, 0, 0, 1),
gsSPCopyLightsPlayerPart(CAP),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_l_logo),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 124),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_l_cap),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 124),
gsSPDisplayList(luigi_cap_seg3_dl_03022B30),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
};
// 0x03022F48 - 0x03022FF8
const Gfx luigi_cap_seg3_dl_03022F48[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPCopyLightsPlayerPart(CAP),
gsDPSetCombineLERP(1, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, ENVIRONMENT, COMBINED, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 255, 0, 0, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 7, 0),
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_l_logo),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 124),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 124),
gsSPDisplayList(luigi_cap_seg3_dl_03022B30),
gsDPSetCycleType(G_CYC_1CYCLE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPDisplayList(luigi_cap_seg3_dl_03022D10),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsDPSetAlphaCompare(G_AC_NONE),
gsDPSetEnvColor(255, 255, 255, 255),
gsDPPipeSync(),
gsSPSetGeometryMode(G_LIGHTING),
gsSPClearGeometryMode(G_TEXTURE_GEN),
gsDPSetCycleType(G_CYC_1CYCLE),
gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
gsSPTexture(65535, 65535, 0, 0, 0),
gsDPSetEnvColor(255, 255, 255, 255),
gsDPSetAlphaCompare(G_AC_NONE),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, 0),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 124),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, 0),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 124),
gsSPEndDisplayList(),
};
// 0x03022FF8 - 0x030230B0
const Gfx luigi_cap_seg3_dl_03022FF8[] = {
gsDPPipeSync(),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
gsSPSetGeometryMode(G_TEXTURE_GEN),
gsDPSetCombineLERP(TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL1, 0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(4032, 1984, 0, 0, 1),
gsSPLight(&luigi_cap_black_lights_group.l, 1),
gsSPCopyLightEXT(2, 15),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_shade),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 6, 0),
gsDPSetEnvRGB(127, 127, 127),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 128),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
gsDPSetTileSize(0, 0, 0, 252, 124),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 128),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
gsDPSetTileSize(1, 0, 0, 252, 124),
gsSPDisplayList(luigi_cap_seg3_dl_03022B30),
gsSPDisplayList(luigi_cap_seg3_dl_03022B68),
gsSPDisplayList(luigi_cap_seg3_dl_03022CC8),
gsDPPipeSync(),
gsSPClearGeometryMode(G_TEXTURE_GEN),
gsDPSetCycleType(G_CYC_1CYCLE),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF),
gsDPSetAlphaCompare(G_AC_NONE),
@ -271,28 +267,25 @@ const Gfx luigi_cap_seg3_dl_030230B0[] = {
// 0x03023108 - 0x03023160
const Gfx luigi_cap_seg3_dl_03023108[] = {
gsSPDisplayList(luigi_cap_seg3_dl_03022ED8_metal),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_1_shade),
gsDPPipeSync(),
gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
gsDPSetCombineLERP(TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL1, 0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 6, 0),
gsDPSetEnvRGB(127, 127, 127),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_1),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 252),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_1_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 252),
gsSPDisplayList(luigi_cap_seg3_dl_03022E78),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_2_shade),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_2),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 252),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_2_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 252),
gsSPDisplayList(luigi_cap_seg3_dl_03022EA8),
gsSPDisplayList(luigi_cap_seg3_dl_03022F20),
gsSPEndDisplayList(),
@ -300,9 +293,25 @@ const Gfx luigi_cap_seg3_dl_03023108[] = {
// 0x03023160 - 0x03023298
const Gfx luigi_cap_seg3_dl_03023160[] = {
gsDPPipeSync(),
gsSPCopyLightsPlayerPart(CAP),
gsDPSetCombineLERP(1, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, ENVIRONMENT, COMBINED, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 255, 0, 0, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 7, 0),
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_l_logo),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 124),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 124),
gsSPDisplayList(luigi_cap_seg3_dl_03022B30),
gsDPSetCycleType(G_CYC_1CYCLE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&luigi_cap_seg3_lights_0301CF38.a, 2),
gsSPDisplayList(luigi_cap_seg3_dl_03022D10),
gsDPPipeSync(),
gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
@ -331,55 +340,46 @@ const Gfx luigi_cap_seg3_dl_03023160[] = {
// 0x03023298 - 0x030233D0
const Gfx luigi_cap_seg3_dl_03023298[] = {
gsDPPipeSync(),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
gsSPSetGeometryMode(G_TEXTURE_GEN),
gsDPSetCombineLERP(TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL1, 0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(4032, 1984, 0, 0, 1),
gsSPLight(&luigi_cap_black_lights_group.l, 1),
gsSPCopyLightEXT(2, 15),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_shade),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 6, 0),
gsDPSetEnvRGB(127, 127, 127),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 128),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
gsDPSetTileSize(0, 0, 0, 252, 124),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 128),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
gsDPSetTileSize(1, 0, 0, 252, 124),
gsSPDisplayList(luigi_cap_seg3_dl_03022B30),
gsSPDisplayList(luigi_cap_seg3_dl_03022B68),
gsSPDisplayList(luigi_cap_seg3_dl_03022CC8),
gsDPSetCycleType(G_CYC_1CYCLE),
gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
gsDPSetCombineLERP(TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL1, 0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(65535, 65535, 0, 0, 1),
gsSPLight(&luigi_cap_black_lights_group.l, 1),
gsSPCopyLightEXT(2, 15),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_1_shade),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 6, 0),
gsDPSetEnvRGB(127, 127, 127),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_1),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 252),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_1_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 252),
gsSPDisplayList(luigi_cap_seg3_dl_03022E78),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_2_shade),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_2),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 252),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_2_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 252),
gsSPDisplayList(luigi_cap_seg3_dl_03022EA8),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCycleType(G_CYC_1CYCLE),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
gsDPSetAlphaCompare(G_AC_NONE),
@ -391,6 +391,7 @@ const Gfx luigi_cap_material_revert_render_settings[] = {
gsDPPipeSync(),
gsSPSetGeometryMode(G_LIGHTING),
gsSPClearGeometryMode(G_TEXTURE_GEN),
gsDPSetCycleType(G_CYC_1CYCLE),
gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
gsSPTexture(65535, 65535, 0, 0, 0),
gsDPSetEnvColor(255, 255, 255, 255),

BIN
actors/mario/custom_mario_cap.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 268 B

BIN
actors/mario/custom_mario_logo.ia16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 793 B

BIN
actors/mario/custom_mario_logo.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 269 B

BIN
actors/mario/custom_mario_logo_blend.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 621 B

BIN
actors/mario/custom_mario_metal_light.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
actors/mario/custom_mario_metal_shade.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
actors/mario/custom_mario_metal_wing_light.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
actors/mario/custom_mario_metal_wing_shade.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
actors/mario/custom_mario_metal_wing_tip_light.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
actors/mario/custom_mario_metal_wing_tip_shade.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
actors/mario/custom_mario_sideburn.ia16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 939 B

BIN
actors/mario/custom_mario_sideburn.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 655 B

BIN
actors/mario/custom_mario_sideburn_add.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 426 B

BIN
actors/mario/custom_mario_skin.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 293 B

118
actors/mario/geo.inc.c
View file

@ -8,40 +8,27 @@ const GeoLayout mario_geo_face_and_wings[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_cap_on_off),
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_m_logo_decal),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_hair_sideburn_decal_cap_on),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_front),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_dead),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_front),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_on_eyes_dead),
GEO_CLOSE_NODE(),
GEO_NODE_START(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_hair_sideburn_decal_cap_off),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_front),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_dead),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_front),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_closed),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_off_eyes_dead),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_TRANSLATE_ROTATE(0, 142, -51, -126, 22, -40, -135),
@ -103,12 +90,8 @@ const GeoLayout mario_geo_right_hand[] = {
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 60, 0, 0, mario_right_hand_peace), // here we go hand
GEO_ANIMATED_PART(LAYER_OPAQUE, 60, 0, 0, mario_right_hand_cap),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_right_hand_cap_decal),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_OPAQUE, 60, 0, 0, mario_right_hand_cap),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_right_hand_cap_decal),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_right_hand_cap_wings),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
@ -196,40 +179,27 @@ const GeoLayout mario_vanish_geo_face_and_wings[] = {
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_cap_on_off),
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_m_logo_decal),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_hair_sideburn_decal_cap_on),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_front),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_closed),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_dead),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_front_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_half_closed_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_closed_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_right_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_left_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_up_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_down_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_on_eyes_dead_transparent),
GEO_CLOSE_NODE(),
GEO_NODE_START(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_hair_sideburn_decal_cap_off),
GEO_OPEN_NODE(),
GEO_SWITCH_CASE(0, geo_switch_mario_eyes),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_front),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_half_closed),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_closed),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_right), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_left), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_up), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_down), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_dead),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_front_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_half_closed_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_closed_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_right_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_left_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_up_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_down_transparent), // unused
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_off_eyes_dead_transparent),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_TRANSLATE_ROTATE(0, 142, -51, -126, 22, -40, -135),
@ -291,13 +261,9 @@ const GeoLayout mario_vanish_geo_right_hand[] = {
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 60, 0, 0, mario_right_hand_peace), // here we go hand
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 60, 0, 0, mario_right_hand_cap),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_right_hand_cap_decal),
GEO_CLOSE_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 60, 0, 0, mario_right_hand_cap),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_right_hand_cap_decal),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_right_hand_cap_wings_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_right_hand_cap_wings),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_RETURN(),
@ -599,7 +565,7 @@ const GeoLayout mario_metal_vanish_geo_right_hand[] = {
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 60, 0, 0, mario_metal_right_hand_cap_shared_dl),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 60, 0, 0, mario_metal_right_hand_cap_shared_dl),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_metal_right_hand_cap_shared_dl_wings_transparent),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_metal_right_hand_cap_shared_dl_wings),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_RETURN(),
@ -700,23 +666,31 @@ const GeoLayout mario_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE << 2, geo_mirror_mario_backface_culling),
GEO_ASM(LAYER_OPAQUE_DECAL << 2, geo_mirror_mario_backface_culling),
GEO_ASM(LAYER_ALPHA << 2, geo_mirror_mario_backface_culling),
GEO_ASM(LAYER_TRANSPARENT << 2, geo_mirror_mario_backface_culling),
GEO_ASM(LAYER_TRANSPARENT_DECAL << 2, geo_mirror_mario_backface_culling),
GEO_ASM(0, geo_mirror_mario_set_alpha),
GEO_OPEN_NODE(),
GEO_BRANCH(1, mario_geo_load_body),
GEO_CLOSE_NODE(),
GEO_ASM((LAYER_OPAQUE << 2) | 1, geo_mirror_mario_backface_culling),
GEO_ASM((LAYER_OPAQUE_DECAL << 2) | 1, geo_mirror_mario_backface_culling),
GEO_ASM((LAYER_ALPHA << 2) | 1, geo_mirror_mario_backface_culling),
GEO_ASM((LAYER_TRANSPARENT << 2) | 1, geo_mirror_mario_backface_culling),
GEO_ASM((LAYER_TRANSPARENT_DECAL << 2) | 1, geo_mirror_mario_backface_culling),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_OPAQUE_DECAL, mario_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT_DECAL, mario_material_revert_render_settings),
GEO_CLOSE_NODE(),
GEO_END(),
};

26
actors/mario/geo_header.h
View file

@ -55,8 +55,6 @@ extern const Gfx mario_mustache_cap_on_dl[];
extern const Gfx mario_face_part_cap_on_dl[];
extern const Gfx mario_face_cap_dl[];
extern const Gfx mario_face_back_hair_cap_on_dl[];
extern const Gfx mario_hair_sideburn_decal_cap_on[];
extern const Gfx mario_m_logo_decal[];
extern const Gfx mario_face_cap_on_dl[];
extern const Gfx mario_cap_on_eyes_front[];
extern const Gfx mario_cap_on_eyes_half_closed[];
@ -66,13 +64,20 @@ extern const Gfx mario_cap_on_eyes_left[];
extern const Gfx mario_cap_on_eyes_up[];
extern const Gfx mario_cap_on_eyes_down[];
extern const Gfx mario_cap_on_eyes_dead[];
extern const Gfx mario_cap_on_eyes_front_transparent[];
extern const Gfx mario_cap_on_eyes_half_closed_transparent[];
extern const Gfx mario_cap_on_eyes_closed_transparent[];
extern const Gfx mario_cap_on_eyes_right_transparent[];
extern const Gfx mario_cap_on_eyes_left_transparent[];
extern const Gfx mario_cap_on_eyes_up_transparent[];
extern const Gfx mario_cap_on_eyes_down_transparent[];
extern const Gfx mario_cap_on_eyes_dead_transparent[];
extern const Gfx mario_metal_cap_on_shared_dl[];
extern const Gfx mario_eyes_cap_off_dl[];
extern const Gfx mario_mustache_cap_off_dl[];
extern const Gfx mario_hair_sideburn_cap_off_dl[];
extern const Gfx mario_face_part_cap_off_dl[];
extern const Gfx mario_face_hair_cap_off_dl[];
extern const Gfx mario_hair_sideburn_decal_cap_off[];
extern const Gfx mario_face_cap_off_dl[];
extern const Gfx mario_cap_off_eyes_front[];
extern const Gfx mario_cap_off_eyes_half_closed[];
@ -82,6 +87,14 @@ extern const Gfx mario_cap_off_eyes_left[];
extern const Gfx mario_cap_off_eyes_up[];
extern const Gfx mario_cap_off_eyes_down[];
extern const Gfx mario_cap_off_eyes_dead[];
extern const Gfx mario_cap_off_eyes_front_transparent[];
extern const Gfx mario_cap_off_eyes_half_closed_transparent[];
extern const Gfx mario_cap_off_eyes_closed_transparent[];
extern const Gfx mario_cap_off_eyes_right_transparent[];
extern const Gfx mario_cap_off_eyes_left_transparent[];
extern const Gfx mario_cap_off_eyes_up_transparent[];
extern const Gfx mario_cap_off_eyes_down_transparent[];
extern const Gfx mario_cap_off_eyes_dead_transparent[];
extern const Gfx mario_metal_cap_off_shared_dl[];
extern const Gfx mario_left_hand_open_shared_dl[];
extern const Gfx mario_left_hand_open[];
@ -92,20 +105,15 @@ extern const Gfx mario_right_hand_cap_m_logo_dl[];
extern const Gfx mario_right_hand_cap_top_dl[];
extern const Gfx mario_right_hand_cap_hand_position_dl[];
extern const Gfx mario_right_hand_cap_bottom_dl[];
extern const Gfx mario_right_hand_cap_decal[];
extern const Gfx mario_right_hand_cap_dl[];
extern const Gfx mario_right_hand_cap_wings_half_1_dl[];
extern const Gfx mario_right_hand_cap_wings_half_2_dl[];
extern const Gfx mario_right_hand_cap_wings_intial_dl[];
extern const Gfx mario_right_hand_cap_wings_transparent_intial_dl[];
extern const Gfx mario_right_hand_cap_metal_wings_intial_dl[];
extern const Gfx mario_right_hand_cap_wings_initial_dl[];
extern const Gfx mario_right_hand_cap_wings_end_dl[];
extern const Gfx mario_right_hand_cap[];
extern const Gfx mario_right_hand_cap_wings[];
extern const Gfx mario_right_hand_cap_wings_transparent[];
extern const Gfx mario_metal_right_hand_cap_shared_dl[];
extern const Gfx mario_metal_right_hand_cap_shared_dl_wings[];
extern const Gfx mario_metal_right_hand_cap_shared_dl_wings_transparent[];
extern const Gfx mario_right_hand_peace_shared_dl[];
extern const Gfx mario_right_hand_peace[];
extern const Gfx mario_wings_half_1_dl[];

13
actors/mario/mario_externs.h
View file

@ -1,12 +1,7 @@
extern ALIGNED8 const Texture mario_texture_metal_shade[];
extern ALIGNED8 const Texture mario_texture_metal_light[];
extern ALIGNED8 const Texture mario_texture_metal[];
extern ALIGNED8 const Texture mario_texture_yellow_button[];
extern ALIGNED8 const Texture mario_texture_m_logo[];
extern ALIGNED8 const Texture mario_texture_m_blend[];
extern ALIGNED8 const Texture mario_texture_m_cap[];
extern ALIGNED8 const Texture mario_texture_hair_sideburn[];
extern ALIGNED8 const Texture mario_texture_add_sideburn[];
extern ALIGNED8 const Texture mario_texture_skin_sideburn[];
extern ALIGNED8 const Texture mario_texture_mustache[];
extern ALIGNED8 const Texture mario_texture_eyes_front[];
extern ALIGNED8 const Texture mario_texture_eyes_half_closed[];
@ -18,7 +13,5 @@ extern ALIGNED8 const Texture mario_texture_eyes_down[];
extern ALIGNED8 const Texture mario_texture_eyes_dead[];
extern ALIGNED8 const Texture mario_texture_wings_half_1[];
extern ALIGNED8 const Texture mario_texture_wings_half_2[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_1_shade[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_1_light[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_2_shade[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_2_light[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_1[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_2[];

1219
actors/mario/model.inc.c
View file

File diff suppressed because it is too large Load diff

30
actors/mario_cap/geo.inc.c
View file

@ -8,27 +8,23 @@ const GeoLayout marios_cap_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(10, geo_update_layer_transparency),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_cap_m_logo_decal),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_seg3_dl_03022F48),
GEO_CLOSE_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_m_logo_decal),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_seg3_dl_03022F48),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_seg3_dl_03022F48),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_seg3_dl_03022F48),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_OPAQUE_DECAL, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT_DECAL, mario_cap_material_revert_render_settings),
GEO_CLOSE_NODE(),
GEO_END(),
};
@ -42,8 +38,10 @@ const GeoLayout marios_metal_cap_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(10, geo_update_layer_transparency),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
@ -53,8 +51,10 @@ const GeoLayout marios_metal_cap_geo[] = {
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_OPAQUE_DECAL, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT_DECAL, mario_cap_material_revert_render_settings),
GEO_CLOSE_NODE(),
GEO_END(),
};
@ -68,28 +68,30 @@ const GeoLayout marios_wing_cap_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(10, geo_update_layer_transparency),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_cap_m_logo_decal),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_seg3_dl_03022F48),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_cap_seg3_dl_030230B0),
GEO_CLOSE_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_m_logo_decal),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_seg3_dl_03023160),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_OPAQUE_DECAL, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT_DECAL, mario_cap_material_revert_render_settings),
GEO_CLOSE_NODE(),
GEO_END(),
};
@ -103,8 +105,10 @@ const GeoLayout marios_winged_metal_cap_geo[] = {
GEO_SCALE(0x00, 16384),
GEO_OPEN_NODE(),
GEO_ASM(LAYER_OPAQUE + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_OPAQUE_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_ALPHA + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT + 3, geo_mario_set_player_colors),
GEO_ASM(LAYER_TRANSPARENT_DECAL + 3, geo_mario_set_player_colors),
GEO_ASM(10, geo_update_layer_transparency),
GEO_SWITCH_CASE(2, geo_switch_anim_state),
GEO_OPEN_NODE(),
@ -121,8 +125,10 @@ const GeoLayout marios_winged_metal_cap_geo[] = {
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_OPAQUE_DECAL, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_material_revert_render_settings),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT_DECAL, mario_cap_material_revert_render_settings),
GEO_CLOSE_NODE(),
GEO_END(),
};

2
actors/mario_cap/geo_header.h
View file

@ -9,9 +9,7 @@ extern const Gfx mario_cap_seg3_dl_03022D10[];
extern const Gfx mario_cap_seg3_dl_03022E78[];
extern const Gfx mario_cap_seg3_dl_03022EA8[];
extern const Gfx mario_cap_seg3_dl_03022ED8[];
extern const Gfx mario_cap_seg3_dl_03022ED8_metal[];
extern const Gfx mario_cap_seg3_dl_03022F20[];
extern const Gfx mario_cap_m_logo_decal[];
extern const Gfx mario_cap_seg3_dl_03022F48[];
extern const Gfx mario_cap_seg3_dl_03022FF8[];
extern const Gfx mario_cap_seg3_dl_030230B0[];

209
actors/mario_cap/model.inc.c
View file

@ -19,23 +19,13 @@ static const Lights1 mario_cap_seg3_lights_0301CF38 = gdSPDefLights1(
0xff, 0x00, 0x00, 0x28, 0x28, 0x28
);
static const Lights1 mario_cap_black_lights_group = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
#include "actors/mario/mario_externs.h"
#define mario_cap_texture_metal_shade mario_texture_metal_shade
#define mario_cap_texture_metal_light mario_texture_metal_light
#define mario_cap_texture_m_logo mario_texture_m_logo
#define mario_cap_texture_m_blend mario_texture_m_blend
#define mario_cap_texture_m_cap mario_texture_m_cap
#define mario_cap_texture_wings_half_1 mario_texture_wings_half_1
#define mario_cap_texture_wings_half_2 mario_texture_wings_half_2
#define mario_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
#define mario_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
#define mario_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
#define mario_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
#define mario_cap_texture_metal mario_texture_metal
#define mario_cap_texture_m_logo mario_texture_m_logo
#define mario_cap_texture_wings_half_1 mario_texture_wings_half_1
#define mario_cap_texture_wings_half_2 mario_texture_wings_half_2
#define mario_cap_texture_metal_wings_half_1 mario_texture_metal_wings_half_1
#define mario_cap_texture_metal_wings_half_2 mario_texture_metal_wings_half_2
// 0x0301CF50
ROM_ASSET_LOAD_TEXTURE(mario_cap_seg3_texture_0301CF50, "actors/mario_cap/mario_cap_metal.rgba16.inc.c", 0x00114750, 78432, 0x00000090, 4096);
@ -188,100 +178,88 @@ const Gfx mario_cap_seg3_dl_03022ED8[] = {
gsSPEndDisplayList(),
};
const Gfx mario_cap_seg3_dl_03022ED8_metal[] = {
gsDPPipeSync(),
gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
gsSPTexture(65535, 65535, 0, 0, 1),
gsSPLight(&mario_cap_black_lights_group.l, 1),
gsSPCopyLightEXT(2, 15),
gsSPEndDisplayList(),
};
// 0x03022F20 - 0x03022F48
const Gfx mario_cap_seg3_dl_03022F20[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCycleType(G_CYC_1CYCLE),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
gsSPEndDisplayList(),
};
const Gfx mario_cap_m_logo_decal[] = {
gsDPPipeSync(),
gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL1, SHADE, TEXEL0, 0, ENVIRONMENT, 0),
gsSPTexture(65535, 65535, 0, 0, 1),
gsSPLight(&mario_cap_black_lights_group.l, 1),
gsSPCopyLightEXT(2, 17),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_m_logo),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 124),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_m_blend),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 124),
gsSPDisplayList(mario_cap_seg3_dl_03022B30),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, TEXEL1, 0, ENVIRONMENT, 0),
gsSPTexture(65535, 65535, 0, 0, 1),
gsSPCopyLightsPlayerPart(CAP),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_m_logo),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 124),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_m_cap),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 124),
gsSPDisplayList(mario_cap_seg3_dl_03022B30),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
};
// 0x03022F48 - 0x03022FF8
const Gfx mario_cap_seg3_dl_03022F48[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPCopyLightsPlayerPart(CAP),
gsDPSetCombineLERP(1, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, ENVIRONMENT, COMBINED, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 255, 0, 0, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 7, 0),
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_m_logo),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 124),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 124),
gsSPDisplayList(mario_cap_seg3_dl_03022B30),
gsDPSetCycleType(G_CYC_1CYCLE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPDisplayList(mario_cap_seg3_dl_03022D10),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsDPSetAlphaCompare(G_AC_NONE),
gsDPSetEnvColor(255, 255, 255, 255),
gsDPPipeSync(),
gsSPSetGeometryMode(G_LIGHTING),
gsSPClearGeometryMode(G_TEXTURE_GEN),
gsDPSetCycleType(G_CYC_1CYCLE),
gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
gsSPTexture(65535, 65535, 0, 0, 0),
gsDPSetEnvColor(255, 255, 255, 255),
gsDPSetAlphaCompare(G_AC_NONE),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, 0),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 124),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, 0),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 256, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 256, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 124),
gsSPEndDisplayList(),
};
// 0x03022FF8 - 0x030230B0
const Gfx mario_cap_seg3_dl_03022FF8[] = {
gsDPPipeSync(),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
gsSPSetGeometryMode(G_TEXTURE_GEN),
gsDPSetCombineLERP(TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL1, 0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(4032, 1984, 0, 0, 1),
gsSPLight(&mario_cap_black_lights_group.l, 1),
gsSPCopyLightEXT(2, 15),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_shade),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 6, 0),
gsDPSetEnvRGB(127, 127, 127),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 128),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
gsDPSetTileSize(0, 0, 0, 252, 124),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 128),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
gsDPSetTileSize(1, 0, 0, 252, 124),
gsSPDisplayList(mario_cap_seg3_dl_03022B30),
gsSPDisplayList(mario_cap_seg3_dl_03022B68),
gsSPDisplayList(mario_cap_seg3_dl_03022CC8),
gsDPPipeSync(),
gsSPClearGeometryMode(G_TEXTURE_GEN),
gsDPSetCycleType(G_CYC_1CYCLE),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF),
gsDPSetAlphaCompare(G_AC_NONE),
@ -306,28 +284,25 @@ const Gfx mario_cap_seg3_dl_030230B0[] = {
// 0x03023108 - 0x03023160
const Gfx mario_cap_seg3_dl_03023108[] = {
gsSPDisplayList(mario_cap_seg3_dl_03022ED8_metal),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_1_shade),
gsDPPipeSync(),
gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
gsDPSetCombineLERP(TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL1, 0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 6, 0),
gsDPSetEnvRGB(127, 127, 127),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_1),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 252),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_1_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 252),
gsSPDisplayList(mario_cap_seg3_dl_03022E78),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_2_shade),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_2),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 252),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_2_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 252),
gsSPDisplayList(mario_cap_seg3_dl_03022EA8),
gsSPDisplayList(mario_cap_seg3_dl_03022F20),
gsSPEndDisplayList(),
@ -335,9 +310,25 @@ const Gfx mario_cap_seg3_dl_03023108[] = {
// 0x03023160 - 0x03023298
const Gfx mario_cap_seg3_dl_03023160[] = {
gsDPPipeSync(),
gsSPCopyLightsPlayerPart(CAP),
gsDPSetCombineLERP(1, PRIMITIVE, TEXEL0, PRIMITIVE, 0, 0, 0, ENVIRONMENT, COMBINED, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 255, 0, 0, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 7, 0),
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_m_logo),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 1023, 256),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 124),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 124),
gsSPDisplayList(mario_cap_seg3_dl_03022B30),
gsDPSetCycleType(G_CYC_1CYCLE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsSPCopyLightsPlayerPart(CAP), //gsSPLight(&mario_cap_seg3_lights_0301CF38.a, 2),
gsSPDisplayList(mario_cap_seg3_dl_03022D10),
gsDPPipeSync(),
gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK),
@ -366,55 +357,46 @@ const Gfx mario_cap_seg3_dl_03023160[] = {
// 0x03023298 - 0x030233D0
const Gfx mario_cap_seg3_dl_03023298[] = {
gsDPPipeSync(),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, SHADE, TEXEL1, 0, 0, 0, ENVIRONMENT),
gsSPSetGeometryMode(G_TEXTURE_GEN),
gsDPSetCombineLERP(TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL1, 0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(4032, 1984, 0, 0, 1),
gsSPLight(&mario_cap_black_lights_group.l, 1),
gsSPCopyLightEXT(2, 15),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_shade),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 6, 0),
gsDPSetEnvRGB(127, 127, 127),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 128),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
gsDPSetTileSize(0, 0, 0, 252, 124),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 128),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0),
gsDPSetTileSize(1, 0, 0, 252, 124),
gsSPDisplayList(mario_cap_seg3_dl_03022B30),
gsSPDisplayList(mario_cap_seg3_dl_03022B68),
gsSPDisplayList(mario_cap_seg3_dl_03022CC8),
gsDPSetCycleType(G_CYC_1CYCLE),
gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0),
gsDPSetCombineLERP(TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, ENVIRONMENT, 0, TEXEL1, 0, PRIMITIVE, COMBINED, 0, 0, 0, COMBINED),
gsDPSetCycleType(G_CYC_2CYCLE),
gsSPTexture(65535, 65535, 0, 0, 1),
gsSPLight(&mario_cap_black_lights_group.l, 1),
gsSPCopyLightEXT(2, 15),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_1_shade),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPCopyPlayerPartToColor(G_COL_PRIM, 6, 0),
gsDPSetEnvRGB(127, 127, 127),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_1),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 252),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_1_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 252),
gsSPDisplayList(mario_cap_seg3_dl_03022E78),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_2_shade),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_2),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(7, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(0, 0, 0, 124, 252),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_2_light),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 512, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
gsDPLoadBlock(6, 0, 0, 2047, 256),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 512, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
gsDPSetTileSize(1, 0, 0, 124, 252),
gsSPDisplayList(mario_cap_seg3_dl_03022EA8),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCycleType(G_CYC_1CYCLE),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
gsDPSetAlphaCompare(G_AC_NONE),
@ -426,6 +408,7 @@ const Gfx mario_cap_material_revert_render_settings[] = {
gsDPPipeSync(),
gsSPSetGeometryMode(G_LIGHTING),
gsSPClearGeometryMode(G_TEXTURE_GEN),
gsDPSetCycleType(G_CYC_1CYCLE),
gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
gsSPTexture(65535, 65535, 0, 0, 0),
gsDPSetEnvColor(255, 255, 255, 255),

7
actors/snowman/geo.inc.c
View file

@ -28,9 +28,10 @@ const GeoLayout mr_blizzard_hidden_geo[] = {
GEO_OPEN_NODE(),
GEO_SCALE(0x00, 65536),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_mario_set_player_colors),
GEO_TRANSLATE_ROTATE_WITH_DL(LAYER_ALPHA, 490, 14, 43, 305, 0, 248, mario_cap_m_logo_decal),
GEO_TRANSLATE_ROTATE_WITH_DL(LAYER_OPAQUE, 490, 14, 43, 305, 0, 248, mario_cap_seg3_dl_03022F48),
GEO_TRANSLATE_ROTATE(LAYER_OPAQUE, 490, 14, 43, 305, 0, 248),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_mario_cap_display_list),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

12
actors/toad_cap/model.inc.c
View file

@ -5,16 +5,16 @@ static const Lights1 toad_cap_black_lights_group = gdSPDefLights1(
#include "actors/mario/mario_externs.h"
#include "actors/toad_player/toad_player_externs.h"
#define toad_cap_texture_metal_shade mario_texture_metal_shade
#define toad_cap_texture_metal_light mario_texture_metal_light
#define toad_cap_texture_metal_shade mario_texture_metal
#define toad_cap_texture_metal_light mario_texture_metal
#define toad_cap_texture_cap toad_player_texture_cap
#define toad_cap_texture_spots toad_player_texture_spots
#define toad_cap_texture_wings_half_1 mario_texture_wings_half_1
#define toad_cap_texture_wings_half_2 mario_texture_wings_half_2
#define toad_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
#define toad_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
#define toad_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
#define toad_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
#define toad_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1
#define toad_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1
#define toad_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2
#define toad_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2
Vtx toad_cap_mesh_layer_1_vtx_0[94] = {
{{ {-175, 118, 0}, 0, {-418, 482}, {134, 35, 0, 0} }},

BIN
actors/toad_player/custom_toad_cap.ia16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 267 B

BIN
actors/toad_player/custom_toad_eyes_center.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
actors/toad_player/custom_toad_eyes_closed.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
actors/toad_player/custom_toad_eyes_dead.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
actors/toad_player/custom_toad_eyes_down.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
actors/toad_player/custom_toad_eyes_half_closed.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
actors/toad_player/custom_toad_eyes_left.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
actors/toad_player/custom_toad_eyes_right.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
actors/toad_player/custom_toad_eyes_up.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
actors/toad_player/custom_toad_face_dead.rgba32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 819 B

BIN
actors/toad_player/custom_toad_face_neutral.rgba32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 792 B

BIN
actors/toad_player/custom_toad_head.ia16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 808 B

BIN
actors/toad_player/custom_toad_spots.ia16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 269 B

20
actors/toad_player/model.inc.c
View file

@ -31,21 +31,21 @@ static const Lights1 toad_player_black_lights_group = gdSPDefLights1(
0x00, 0x00, 0x00, 0x28, 0x28, 0x28);
#include "actors/mario/mario_externs.h"
#define toad_player_texture_metal_shade mario_texture_metal_shade
#define toad_player_texture_metal_light mario_texture_metal_light
#define toad_player_texture_metal_shade mario_texture_metal
#define toad_player_texture_metal_light mario_texture_metal
#define toad_player_texture_wings_half_1 mario_texture_wings_half_1
#define toad_player_texture_wings_half_2 mario_texture_wings_half_2
#define toad_player_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
#define toad_player_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
#define toad_player_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
#define toad_player_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
#define toad_player_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1
#define toad_player_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1
#define toad_player_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2
#define toad_player_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2
ALIGNED8 const Texture toad_player_texture_cap[] = {
#include "actors/toad_player/custom_toad_cap.ia16.inc.c"
#include "actors/toad_player/custom_toad_head.ia16.inc.c"
};
ALIGNED8 const Texture toad_player_texture_spots[] = {
#include "actors/toad_player/custom_toad_spots.ia16.inc.c"
#include "actors/toad_player/custom_toad_head.ia16.inc.c"
};
ALIGNED8 const Texture toad_player_texture_hair[] = {
@ -53,11 +53,11 @@ ALIGNED8 const Texture toad_player_texture_hair[] = {
};
ALIGNED8 const Texture toad_player_texture_face_neutral[] = {
#include "actors/toad_player/custom_toad_face_neutral.rgba32.inc.c"
#include "actors/toad_player/custom_toad_eyes_center.rgba32.inc.c"
};
ALIGNED8 const Texture toad_player_texture_face_dead[] = {
#include "actors/toad_player/custom_toad_face_dead.rgba32.inc.c"
#include "actors/toad_player/custom_toad_eyes_dead.rgba32.inc.c"
};
ALIGNED8 const Texture toad_player_texture_eyes_front[] = {

BIN
actors/waluigi/custom_waluigi_cap.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 279 B

BIN
actors/waluigi/custom_waluigi_logo.ia16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 552 B

BIN
actors/waluigi/custom_waluigi_logo.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 278 B

BIN
actors/waluigi/custom_waluigi_logo_blend.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 312 B

BIN
actors/waluigi/custom_waluigi_sideburn.ia16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 860 B

BIN
actors/waluigi/custom_waluigi_sideburn.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 596 B

BIN
actors/waluigi/custom_waluigi_sideburn_add.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 390 B

BIN
actors/waluigi/custom_waluigi_skin.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 290 B

24
actors/waluigi/model.inc.c
View file

@ -42,38 +42,38 @@ static const Lights1 waluigi_black_lights_group = gdSPDefLights1(
);
#include "actors/mario/mario_externs.h"
#define waluigi_texture_metal_shade mario_texture_metal_shade
#define waluigi_texture_metal_light mario_texture_metal_light
#define waluigi_texture_metal_shade mario_texture_metal
#define waluigi_texture_metal_light mario_texture_metal
#define waluigi_texture_yellow_button mario_texture_yellow_button
#define waluigi_texture_wings_half_1 mario_texture_wings_half_1
#define waluigi_texture_wings_half_2 mario_texture_wings_half_2
#define waluigi_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
#define waluigi_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
#define waluigi_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
#define waluigi_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
#define waluigi_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1
#define waluigi_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1
#define waluigi_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2
#define waluigi_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2
ALIGNED8 const Texture waluigi_texture_r_logo[] = {
#include "actors/waluigi/custom_waluigi_logo.rgba16.inc.c"
#include "actors/waluigi/custom_waluigi_logo.ia16.inc.c"
};
ALIGNED8 const Texture waluigi_texture_r_blend[] = {
#include "actors/waluigi/custom_waluigi_logo_blend.rgba16.inc.c"
#include "actors/waluigi/custom_waluigi_logo.ia16.inc.c"
};
ALIGNED8 const Texture waluigi_texture_r_cap[] = {
#include "actors/waluigi/custom_waluigi_cap.rgba16.inc.c"
#include "actors/waluigi/custom_waluigi_logo.ia16.inc.c"
};
ALIGNED8 const Texture waluigi_texture_hair_sideburn[] = {
#include "actors/waluigi/custom_waluigi_sideburn.rgba16.inc.c"
#include "actors/waluigi/custom_waluigi_sideburn.ia16.inc.c"
};
ALIGNED8 const Texture waluigi_texture_add_sideburn[] = {
#include "actors/waluigi/custom_waluigi_sideburn_add.rgba16.inc.c"
#include "actors/waluigi/custom_waluigi_sideburn.ia16.inc.c"
};
ALIGNED8 const Texture waluigi_texture_skin_sideburn[] = {
#include "actors/waluigi/custom_waluigi_skin.rgba16.inc.c"
#include "actors/waluigi/custom_waluigi_sideburn.ia16.inc.c"
};
ALIGNED8 const Texture waluigi_texture_mouth[] = {

16
actors/waluigi_cap/model.inc.c
View file

@ -8,17 +8,17 @@ static const Lights1 waluigi_cap_black_lights_group = gdSPDefLights1(
#include "actors/mario/mario_externs.h"
#include "actors/waluigi/waluigi_externs.h"
#define waluigi_cap_texture_metal_shade mario_texture_metal_shade
#define waluigi_cap_texture_metal_light mario_texture_metal_light
#define waluigi_cap_texture_metal_shade mario_texture_metal
#define waluigi_cap_texture_metal_light mario_texture_metal
#define waluigi_cap_texture_r_logo waluigi_texture_r_logo
#define waluigi_cap_texture_r_blend waluigi_texture_r_blend
#define waluigi_cap_texture_r_cap waluigi_texture_r_cap
#define waluigi_cap_texture_r_blend waluigi_texture_r_logo
#define waluigi_cap_texture_r_cap waluigi_texture_r_logo
#define waluigi_cap_texture_wings_half_1 mario_texture_wings_half_1
#define waluigi_cap_texture_wings_half_2 mario_texture_wings_half_2
#define waluigi_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
#define waluigi_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
#define waluigi_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
#define waluigi_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
#define waluigi_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1
#define waluigi_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1
#define waluigi_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2
#define waluigi_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2
// 0x03022750
ROM_ASSET_LOAD_VTX(waluigi_cap_seg3_vertex_03022750, 0x00114750, 78432, 0x0001bf50, 112);

BIN
actors/wario/custom_wario_cap.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 267 B

BIN
actors/wario/custom_wario_eyes_center.rgba16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 997 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
actors/wario/custom_wario_eyes_closed.rgba16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 733 B

After

Width:  |  Height:  |  Size: 1 KiB

BIN
actors/wario/custom_wario_eyes_dead.rgba16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1,001 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
actors/wario/custom_wario_eyes_down_unused.rgba16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 974 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
actors/wario/custom_wario_eyes_half_closed.rgba16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 965 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
actors/wario/custom_wario_eyes_left_unused.rgba16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 991 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
actors/wario/custom_wario_eyes_right_unused.rgba16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 993 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
actors/wario/custom_wario_eyes_up_unused.rgba16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 985 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
actors/wario/custom_wario_logo.ia16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 815 B

BIN
actors/wario/custom_wario_logo.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 269 B

BIN
actors/wario/custom_wario_logo_blend.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 476 B

BIN
actors/wario/custom_wario_mouth.rgba16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 930 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
actors/wario/custom_wario_mouth_dead.rgba16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 1 KiB

BIN
actors/wario/custom_wario_nose.rgba16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 528 B

BIN
actors/wario/custom_wario_sideburn.ia16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 936 B

BIN
actors/wario/custom_wario_sideburn.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 642 B

BIN
actors/wario/custom_wario_sideburn_add.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 436 B

BIN
actors/wario/custom_wario_skin.rgba16.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 299 B

24
actors/wario/model.inc.c
View file

@ -42,41 +42,41 @@ static const Lights1 wario_black_lights_group = gdSPDefLights1(
);
#include "actors/mario/mario_externs.h"
#define wario_texture_metal_shade mario_texture_metal_shade
#define wario_texture_metal_light mario_texture_metal_light
#define wario_texture_metal_shade mario_texture_metal
#define wario_texture_metal_light mario_texture_metal
#define wario_texture_wings_half_1 mario_texture_wings_half_1
#define wario_texture_wings_half_2 mario_texture_wings_half_2
#define wario_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
#define wario_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
#define wario_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
#define wario_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
#define wario_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1
#define wario_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1
#define wario_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2
#define wario_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2
ALIGNED8 const Texture wario_texture_white_button[] = {
#include "actors/wario/custom_wario_overalls_button.rgba16.inc.c"
};
ALIGNED8 const Texture wario_texture_w_logo[] = {
#include "actors/wario/custom_wario_logo.rgba16.inc.c"
#include "actors/wario/custom_wario_logo.ia16.inc.c"
};
ALIGNED8 const Texture wario_texture_w_blend[] = {
#include "actors/wario/custom_wario_logo_blend.rgba16.inc.c"
#include "actors/wario/custom_wario_logo.ia16.inc.c"
};
ALIGNED8 const Texture wario_texture_w_cap[] = {
#include "actors/wario/custom_wario_cap.rgba16.inc.c"
#include "actors/wario/custom_wario_logo.ia16.inc.c"
};
ALIGNED8 const Texture wario_texture_hair_sideburn[] = {
#include "actors/wario/custom_wario_sideburn.rgba16.inc.c"
#include "actors/wario/custom_wario_sideburn.ia16.inc.c"
};
ALIGNED8 const Texture wario_texture_add_sideburn[] = {
#include "actors/wario/custom_wario_sideburn_add.rgba16.inc.c"
#include "actors/wario/custom_wario_sideburn.ia16.inc.c"
};
ALIGNED8 const Texture wario_texture_skin_sideburn[] = {
#include "actors/wario/custom_wario_skin.rgba16.inc.c"
#include "actors/wario/custom_wario_sideburn.ia16.inc.c"
};
ALIGNED8 const Texture wario_texture_mouth[] = {

16
actors/wario_cap/model.inc.c
View file

@ -8,17 +8,17 @@ static const Lights1 wario_cap_black_lights_group = gdSPDefLights1(
#include "actors/mario/mario_externs.h"
#include "actors/wario/wario_externs.h"
#define wario_cap_texture_metal_shade mario_texture_metal_shade
#define wario_cap_texture_metal_light mario_texture_metal_light
#define wario_cap_texture_metal_shade mario_texture_metal
#define wario_cap_texture_metal_light mario_texture_metal
#define wario_cap_texture_w_logo wario_texture_w_logo
#define wario_cap_texture_w_blend wario_texture_w_blend
#define wario_cap_texture_w_cap wario_texture_w_cap
#define wario_cap_texture_w_blend wario_texture_w_logo
#define wario_cap_texture_w_cap wario_texture_w_logo
#define wario_cap_texture_wings_half_1 mario_texture_wings_half_1
#define wario_cap_texture_wings_half_2 mario_texture_wings_half_2
#define wario_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1_shade
#define wario_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1_light
#define wario_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2_shade
#define wario_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2_light
#define wario_cap_texture_metal_wings_half_1_shade mario_texture_metal_wings_half_1
#define wario_cap_texture_metal_wings_half_1_light mario_texture_metal_wings_half_1
#define wario_cap_texture_metal_wings_half_2_shade mario_texture_metal_wings_half_2
#define wario_cap_texture_metal_wings_half_2_light mario_texture_metal_wings_half_2
// 0x03022750
ROM_ASSET_LOAD_VTX(wario_cap_seg3_vertex_03022750, 0x00114750, 78432, 0x0001bf50, 112);

1
data/dynos_mgr_builtin.cpp
View file

@ -374,6 +374,7 @@ static const void *sDynosBuiltinActors[] = {
define_builtin(toads_cap_geo),
define_builtin(toads_metal_cap_geo),
define_builtin(toads_wing_cap_geo),
define_builtin(toads_winged_metal_cap_geo),
define_builtin(waluigi_geo),
define_builtin(waluigis_cap_geo),
define_builtin(waluigis_metal_cap_geo),

29
data/dynos_mgr_builtin_externs.h
View file

@ -1645,16 +1645,10 @@ extern ALIGNED8 Texture gd_texture_sparkle_2[];
extern ALIGNED8 Texture gd_texture_sparkle_3[];
extern ALIGNED8 Texture gd_texture_sparkle_4[];
extern ALIGNED8 Texture gd_texture_sparkle_5[];
extern ALIGNED8 const Texture mario_texture_metal_shade[];
extern ALIGNED8 const Texture mario_texture_metal_light[];
extern ALIGNED8 const Texture mario_texture_metal[];
extern ALIGNED8 const Texture mario_texture_yellow_button[];
extern ALIGNED8 const Texture mario_texture_m_logo[];
extern ALIGNED8 const Texture mario_texture_m_blend[];
extern ALIGNED8 const Texture mario_texture_m_cap[];
extern ALIGNED8 const Texture mario_texture_hair_sideburn[];
extern ALIGNED8 const Texture mario_texture_add_sideburn[];
extern ALIGNED8 const Texture mario_texture_skin_sideburn[];
extern ALIGNED8 const Texture mario_texture_mustache[];
extern ALIGNED8 const Texture mario_texture_eyes_front[];
extern ALIGNED8 const Texture mario_texture_eyes_half_closed[];
@ -1666,10 +1660,8 @@ extern ALIGNED8 const Texture mario_texture_eyes_down[];
extern ALIGNED8 const Texture mario_texture_eyes_dead[];
extern ALIGNED8 const Texture mario_texture_wings_half_1[];
extern ALIGNED8 const Texture mario_texture_wings_half_2[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_1_shade[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_1_light[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_2_shade[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_2_light[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_1[];
extern ALIGNED8 const Texture mario_texture_metal_wings_half_2[];
extern ALIGNED8 const Texture mario_cap_seg3_texture_0301CF50[];
extern ALIGNED8 const Texture mario_cap_seg3_texture_0301DF50[];
extern ALIGNED8 const Texture mario_cap_seg3_texture_0301E750[];
@ -1681,14 +1673,9 @@ extern ALIGNED8 const Texture impact_smoke_seg6_texture_0605CA28[];
extern ALIGNED8 const Texture impact_smoke_seg6_texture_0605EA28[];
extern ALIGNED8 const Texture impact_smoke_seg6_texture_06060A28[];
extern ALIGNED8 const Texture luigi_texture_l_logo[];
extern ALIGNED8 const Texture luigi_texture_l_blend[];
extern ALIGNED8 const Texture luigi_texture_l_cap[];
extern ALIGNED8 const Texture luigi_texture_hair_sideburn[];
extern ALIGNED8 const Texture luigi_texture_add_sideburn[];
extern ALIGNED8 const Texture luigi_texture_skin_sideburn[];
extern ALIGNED8 const Texture luigi_texture_mustache[];
extern ALIGNED8 const Texture toad_player_texture_cap[];
extern ALIGNED8 const Texture toad_player_texture_spots[];
extern ALIGNED8 const Texture toad_player_texture_head[];
extern ALIGNED8 const Texture toad_player_texture_hair[];
extern ALIGNED8 const Texture toad_player_texture_face_neutral[];
extern ALIGNED8 const Texture toad_player_texture_face_dead[];
@ -1702,11 +1689,7 @@ extern ALIGNED8 const Texture toad_player_texture_eyes_down[];
extern ALIGNED8 const Texture toad_player_texture_eyes_dead[];
extern ALIGNED8 const Texture wario_texture_white_button[];
extern ALIGNED8 const Texture wario_texture_w_logo[];
extern ALIGNED8 const Texture wario_texture_w_blend[];
extern ALIGNED8 const Texture wario_texture_w_cap[];
extern ALIGNED8 const Texture wario_texture_hair_sideburn[];
extern ALIGNED8 const Texture wario_texture_add_sideburn[];
extern ALIGNED8 const Texture wario_texture_skin_sideburn[];
extern ALIGNED8 const Texture wario_texture_mouth[];
extern ALIGNED8 const Texture wario_texture_mouth_dead[];
extern ALIGNED8 const Texture wario_texture_eyes_front[];
@ -1718,11 +1701,7 @@ extern ALIGNED8 const Texture wario_texture_eyes_up[];
extern ALIGNED8 const Texture wario_texture_eyes_down[];
extern ALIGNED8 const Texture wario_texture_eyes_dead[];
extern ALIGNED8 const Texture waluigi_texture_r_logo[];
extern ALIGNED8 const Texture waluigi_texture_r_blend[];
extern ALIGNED8 const Texture waluigi_texture_r_cap[];
extern ALIGNED8 const Texture waluigi_texture_hair_sideburn[];
extern ALIGNED8 const Texture waluigi_texture_add_sideburn[];
extern ALIGNED8 const Texture waluigi_texture_skin_sideburn[];
extern ALIGNED8 const Texture waluigi_texture_mouth[];
extern ALIGNED8 const Texture waluigi_texture_mouth_dead[];
extern ALIGNED8 const Texture waluigi_texture_eyes_front[];

46
data/dynos_mgr_builtin_tex.cpp
View file

@ -1077,15 +1077,10 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
define_builtin_tex(wmotr_seg7_texture_07000C00, "levels/wmotr/2.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wmotr_seg7_texture_07001400, "levels/wmotr/3.rgba16.png", 32, 8, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wmotr_seg7_texture_07001600, "levels/wmotr/4.rgba16.png", 8, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_metal_shade, "actors/mario/custom_mario_metal_shade.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_metal_light, "actors/mario/custom_mario_metal_light.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_metal, "actors/mario/mario_metal.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_yellow_button, "actors/mario/mario_overalls_button.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_m_logo, "actors/mario/custom_mario_logo.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_m_blend, "actors/mario/custom_mario_logo_blend.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_m_cap, "actors/mario/custom_mario_cap.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_hair_sideburn, "actors/mario/custom_mario_sideburn.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_add_sideburn, "actors/mario/custom_mario_sideburn_add.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_skin_sideburn, "actors/mario/custom_mario_skin.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_m_logo, "actors/mario/custom_mario_logo.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_hair_sideburn, "actors/mario/custom_mario_sideburn.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_mustache, "actors/mario/mario_mustache.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_eyes_front, "actors/mario/mario_eyes_center.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_eyes_half_closed, "actors/mario/mario_eyes_half_closed.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
@ -1097,10 +1092,8 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
define_builtin_tex(mario_texture_eyes_dead, "actors/mario/mario_eyes_dead.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_wings_half_1, "actors/mario/mario_wing.rgba16.png", 32, 64, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_wings_half_2, "actors/mario/mario_wing_tip.rgba16.png", 32, 64, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_metal_wings_half_1_shade, "actors/mario/custom_mario_metal_wing_shade.rgba16.png", 32, 64, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_metal_wings_half_1_light, "actors/mario/custom_mario_metal_wing_light.rgba16.png", 32, 64, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_metal_wings_half_2_shade, "actors/mario/custom_mario_metal_wing_tip_shade.rgba16.png", 32, 64, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_metal_wings_half_2_light, "actors/mario/custom_mario_metal_wing_tip_light.rgba16.png", 32, 64, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_metal_wings_half_1, "actors/mario/mario_metal_wing_unused.rgba16.png", 32, 64, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_texture_metal_wings_half_2, "actors/mario/mario_metal_wing_tip_unused.rgba16.png", 32, 64, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_cap_seg3_texture_0301CF50, "actors/mario_cap/mario_cap_metal.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_cap_seg3_texture_0301DF50, "actors/mario_cap/mario_cap_logo.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(mario_cap_seg3_texture_0301E750, "actors/mario_cap/mario_cap_wing.rgba16.png", 32, 64, G_IM_FMT_RGBA, G_IM_SIZ_16b),
@ -1111,18 +1104,11 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
define_builtin_tex(impact_smoke_seg6_texture_0605CA28, "actors/impact_smoke/impact_smoke_1.ia16.png", 64, 64, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(impact_smoke_seg6_texture_0605EA28, "actors/impact_smoke/impact_smoke_2.ia16.png", 64, 64, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(impact_smoke_seg6_texture_06060A28, "actors/impact_smoke/impact_smoke_3.ia16.png", 64, 64, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(luigi_texture_l_logo, "actors/luigi/custom_luigi_logo.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(luigi_texture_l_blend, "actors/luigi/custom_luigi_logo_blend.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(luigi_texture_l_cap, "actors/luigi/custom_luigi_cap.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(luigi_texture_hair_sideburn, "actors/luigi/custom_luigi_sideburn.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(luigi_texture_add_sideburn, "actors/luigi/custom_luigi_sideburn_add.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(luigi_texture_skin_sideburn, "actors/luigi/custom_luigi_skin.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(luigi_texture_l_logo, "actors/luigi/custom_luigi_logo.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(luigi_texture_hair_sideburn, "actors/luigi/custom_luigi_sideburn.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(luigi_texture_mustache, "actors/luigi/custom_luigi_mustache.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(toad_player_texture_cap, "actors/toad_player/custom_toad_cap.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(toad_player_texture_spots, "actors/toad_player/custom_toad_spots.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
// define_builtin_tex(toad_player_texture_head, "actors/toad_player/custom_toad_head.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(toad_player_texture_hair, "actors/toad_player/custom_toad_hair.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(toad_player_texture_face_neutral, "actors/toad_player/custom_toad_face_neutral.rgba32.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b),
define_builtin_tex(toad_player_texture_face_dead, "actors/toad_player/custom_toad_face_dead.rgba32.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b),
define_builtin_tex(toad_player_texture_eyes_front, "actors/toad_player/custom_toad_eyes_center.rgba32.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b),
define_builtin_tex(toad_player_texture_eyes_half_closed, "actors/toad_player/custom_toad_eyes_half_closed.rgba32.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b),
define_builtin_tex(toad_player_texture_eyes_closed, "actors/toad_player/custom_toad_eyes_closed.rgba32.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b),
@ -1132,12 +1118,8 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
define_builtin_tex(toad_player_texture_eyes_down, "actors/toad_player/custom_toad_eyes_down.rgba32.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b),
define_builtin_tex(toad_player_texture_eyes_dead, "actors/toad_player/custom_toad_eyes_dead.rgba32.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b),
define_builtin_tex(wario_texture_white_button, "actors/wario/custom_wario_overalls_button.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_w_logo, "actors/wario/custom_wario_logo.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_w_blend, "actors/wario/custom_wario_logo_blend.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_w_cap, "actors/wario/custom_wario_cap.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_hair_sideburn, "actors/wario/custom_wario_sideburn.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_add_sideburn, "actors/wario/custom_wario_sideburn_add.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_skin_sideburn, "actors/wario/custom_wario_skin.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_w_logo, "actors/wario/custom_wario_logo.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_hair_sideburn, "actors/wario/custom_wario_sideburn.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_mouth, "actors/wario/custom_wario_mouth.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_mouth_dead, "actors/wario/custom_wario_mouth_dead.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_eyes_front, "actors/wario/custom_wario_eyes_center.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
@ -1148,12 +1130,8 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
define_builtin_tex(wario_texture_eyes_up, "actors/wario/custom_wario_eyes_up_unused.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_eyes_down, "actors/wario/custom_wario_eyes_down_unused.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(wario_texture_eyes_dead, "actors/wario/custom_wario_eyes_dead.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(waluigi_texture_r_logo, "actors/waluigi/custom_waluigi_logo.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(waluigi_texture_r_blend, "actors/waluigi/custom_waluigi_logo_blend.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(waluigi_texture_r_cap, "actors/waluigi/custom_waluigi_cap.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(waluigi_texture_hair_sideburn, "actors/waluigi/custom_waluigi_sideburn.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(waluigi_texture_add_sideburn, "actors/waluigi/custom_waluigi_sideburn_add.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(waluigi_texture_skin_sideburn, "actors/waluigi/custom_waluigi_skin.rgba16.png", 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(waluigi_texture_r_logo, "actors/waluigi/custom_waluigi_logo.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(waluigi_texture_hair_sideburn, "actors/waluigi/custom_waluigi_sideburn.ia16.png", 32, 32, G_IM_FMT_IA, G_IM_SIZ_16b),
define_builtin_tex(waluigi_texture_mouth, "actors/waluigi/custom_waluigi_mouth.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(waluigi_texture_mouth_dead, "actors/waluigi/custom_waluigi_mouth_dead.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),
define_builtin_tex(waluigi_texture_eyes_front, "actors/waluigi/custom_waluigi_eyes_center.rgba16.png", 64, 32, G_IM_FMT_RGBA, G_IM_SIZ_16b),

56
include/display_lists.inl
View file

@ -1255,7 +1255,6 @@ DISPLAY_LIST(lll_seg7_dl_07025BD8)
DISPLAY_LIST(lll_seg7_dl_07025EC0)
DISPLAY_LIST(luigi_butt)
DISPLAY_LIST(luigi_butt_dl)
DISPLAY_LIST(luigi_cap_l_logo_decal)
DISPLAY_LIST(luigi_cap_material_revert_render_settings)
DISPLAY_LIST(luigi_cap_off_eyes_closed)
DISPLAY_LIST(luigi_cap_off_eyes_dead)
@ -1265,6 +1264,14 @@ DISPLAY_LIST(luigi_cap_off_eyes_half_closed)
DISPLAY_LIST(luigi_cap_off_eyes_left)
DISPLAY_LIST(luigi_cap_off_eyes_right)
DISPLAY_LIST(luigi_cap_off_eyes_up)
DISPLAY_LIST(luigi_cap_off_eyes_closed_transparent)
DISPLAY_LIST(luigi_cap_off_eyes_dead_transparent)
DISPLAY_LIST(luigi_cap_off_eyes_down_transparent)
DISPLAY_LIST(luigi_cap_off_eyes_front_transparent)
DISPLAY_LIST(luigi_cap_off_eyes_half_closed_transparent)
DISPLAY_LIST(luigi_cap_off_eyes_left_transparent)
DISPLAY_LIST(luigi_cap_off_eyes_right_transparent)
DISPLAY_LIST(luigi_cap_off_eyes_up_transparent)
DISPLAY_LIST(luigi_cap_on_eyes_closed)
DISPLAY_LIST(luigi_cap_on_eyes_dead)
DISPLAY_LIST(luigi_cap_on_eyes_down)
@ -1273,6 +1280,14 @@ DISPLAY_LIST(luigi_cap_on_eyes_half_closed)
DISPLAY_LIST(luigi_cap_on_eyes_left)
DISPLAY_LIST(luigi_cap_on_eyes_right)
DISPLAY_LIST(luigi_cap_on_eyes_up)
DISPLAY_LIST(luigi_cap_on_eyes_closed_transparent)
DISPLAY_LIST(luigi_cap_on_eyes_dead_transparent)
DISPLAY_LIST(luigi_cap_on_eyes_down_transparent)
DISPLAY_LIST(luigi_cap_on_eyes_front_transparent)
DISPLAY_LIST(luigi_cap_on_eyes_half_closed_transparent)
DISPLAY_LIST(luigi_cap_on_eyes_left_transparent)
DISPLAY_LIST(luigi_cap_on_eyes_right_transparent)
DISPLAY_LIST(luigi_cap_on_eyes_up_transparent)
DISPLAY_LIST(luigi_cap_seg3_dl_03022B30)
DISPLAY_LIST(luigi_cap_seg3_dl_03022B68)
DISPLAY_LIST(luigi_cap_seg3_dl_03022CC8)
@ -1280,7 +1295,6 @@ DISPLAY_LIST(luigi_cap_seg3_dl_03022D10)
DISPLAY_LIST(luigi_cap_seg3_dl_03022E78)
DISPLAY_LIST(luigi_cap_seg3_dl_03022EA8)
DISPLAY_LIST(luigi_cap_seg3_dl_03022ED8)
DISPLAY_LIST(luigi_cap_seg3_dl_03022ED8_metal)
DISPLAY_LIST(luigi_cap_seg3_dl_03022F20)
DISPLAY_LIST(luigi_cap_seg3_dl_03022F48)
DISPLAY_LIST(luigi_cap_seg3_dl_03022FF8)
@ -1301,9 +1315,6 @@ DISPLAY_LIST(luigi_face_part_cap_off_dl)
DISPLAY_LIST(luigi_face_part_cap_on_dl)
DISPLAY_LIST(luigi_hair_sideburn_cap_off_dl)
DISPLAY_LIST(luigi_hair_sideburn_cap_on_dl)
DISPLAY_LIST(luigi_hair_sideburn_decal_cap_off)
DISPLAY_LIST(luigi_hair_sideburn_decal_cap_on)
DISPLAY_LIST(luigi_l_logo_decal)
DISPLAY_LIST(luigi_l_logo_dl)
DISPLAY_LIST(luigi_left_arm)
DISPLAY_LIST(luigi_left_arm_shared_dl)
@ -1327,7 +1338,6 @@ DISPLAY_LIST(luigi_metal_left_thigh)
DISPLAY_LIST(luigi_metal_right_foot)
DISPLAY_LIST(luigi_metal_right_hand_cap_shared_dl)
DISPLAY_LIST(luigi_metal_right_hand_cap_shared_dl_wings)
DISPLAY_LIST(luigi_metal_right_hand_cap_shared_dl_wings_transparent)
DISPLAY_LIST(luigi_metal_right_hand_closed)
DISPLAY_LIST(luigi_metal_right_hand_open)
DISPLAY_LIST(luigi_metal_torso_shared_dl)
@ -1341,19 +1351,15 @@ DISPLAY_LIST(luigi_right_foot_dl)
DISPLAY_LIST(luigi_right_forearm_shared_dl)
DISPLAY_LIST(luigi_right_hand_cap)
DISPLAY_LIST(luigi_right_hand_cap_bottom_dl)
DISPLAY_LIST(luigi_right_hand_cap_decal)
DISPLAY_LIST(luigi_right_hand_cap_dl)
DISPLAY_LIST(luigi_right_hand_cap_hand_position_dl)
DISPLAY_LIST(luigi_right_hand_cap_l_logo_dl)
DISPLAY_LIST(luigi_right_hand_cap_metal_wings_intial_dl)
DISPLAY_LIST(luigi_right_hand_cap_top_dl)
DISPLAY_LIST(luigi_right_hand_cap_wings)
DISPLAY_LIST(luigi_right_hand_cap_wings_end_dl)
DISPLAY_LIST(luigi_right_hand_cap_wings_half_1_dl)
DISPLAY_LIST(luigi_right_hand_cap_wings_half_2_dl)
DISPLAY_LIST(luigi_right_hand_cap_wings_intial_dl)
DISPLAY_LIST(luigi_right_hand_cap_wings_transparent)
DISPLAY_LIST(luigi_right_hand_cap_wings_transparent_intial_dl)
DISPLAY_LIST(luigi_right_hand_cap_wings_initial_dl)
DISPLAY_LIST(luigi_right_hand_closed)
DISPLAY_LIST(luigi_right_hand_closed_dl)
DISPLAY_LIST(luigi_right_hand_open)
@ -1421,7 +1427,6 @@ DISPLAY_LIST(manta_seg5_dl_05006B70)
DISPLAY_LIST(manta_seg5_dl_05006C08)
DISPLAY_LIST(mario_butt)
DISPLAY_LIST(mario_butt_dl)
DISPLAY_LIST(mario_cap_m_logo_decal)
DISPLAY_LIST(mario_cap_material_revert_render_settings)
DISPLAY_LIST(mario_cap_off_eyes_closed)
DISPLAY_LIST(mario_cap_off_eyes_dead)
@ -1431,6 +1436,14 @@ DISPLAY_LIST(mario_cap_off_eyes_half_closed)
DISPLAY_LIST(mario_cap_off_eyes_left)
DISPLAY_LIST(mario_cap_off_eyes_right)
DISPLAY_LIST(mario_cap_off_eyes_up)
DISPLAY_LIST(mario_cap_off_eyes_closed_transparent)
DISPLAY_LIST(mario_cap_off_eyes_dead_transparent)
DISPLAY_LIST(mario_cap_off_eyes_down_transparent)
DISPLAY_LIST(mario_cap_off_eyes_front_transparent)
DISPLAY_LIST(mario_cap_off_eyes_half_closed_transparent)
DISPLAY_LIST(mario_cap_off_eyes_left_transparent)
DISPLAY_LIST(mario_cap_off_eyes_right_transparent)
DISPLAY_LIST(mario_cap_off_eyes_up_transparent)
DISPLAY_LIST(mario_cap_on_eyes_closed)
DISPLAY_LIST(mario_cap_on_eyes_dead)
DISPLAY_LIST(mario_cap_on_eyes_down)
@ -1439,6 +1452,14 @@ DISPLAY_LIST(mario_cap_on_eyes_half_closed)
DISPLAY_LIST(mario_cap_on_eyes_left)
DISPLAY_LIST(mario_cap_on_eyes_right)
DISPLAY_LIST(mario_cap_on_eyes_up)
DISPLAY_LIST(mario_cap_on_eyes_closed_transparent)
DISPLAY_LIST(mario_cap_on_eyes_dead_transparent)
DISPLAY_LIST(mario_cap_on_eyes_down_transparent)
DISPLAY_LIST(mario_cap_on_eyes_front_transparent)
DISPLAY_LIST(mario_cap_on_eyes_half_closed_transparent)
DISPLAY_LIST(mario_cap_on_eyes_left_transparent)
DISPLAY_LIST(mario_cap_on_eyes_right_transparent)
DISPLAY_LIST(mario_cap_on_eyes_up_transparent)
DISPLAY_LIST(mario_cap_seg3_dl_03022B30)
DISPLAY_LIST(mario_cap_seg3_dl_03022B68)
DISPLAY_LIST(mario_cap_seg3_dl_03022CC8)
@ -1446,7 +1467,6 @@ DISPLAY_LIST(mario_cap_seg3_dl_03022D10)
DISPLAY_LIST(mario_cap_seg3_dl_03022E78)
DISPLAY_LIST(mario_cap_seg3_dl_03022EA8)
DISPLAY_LIST(mario_cap_seg3_dl_03022ED8)
DISPLAY_LIST(mario_cap_seg3_dl_03022ED8_metal)
DISPLAY_LIST(mario_cap_seg3_dl_03022F20)
DISPLAY_LIST(mario_cap_seg3_dl_03022F48)
DISPLAY_LIST(mario_cap_seg3_dl_03022FF8)
@ -1467,8 +1487,6 @@ DISPLAY_LIST(mario_face_part_cap_off_dl)
DISPLAY_LIST(mario_face_part_cap_on_dl)
DISPLAY_LIST(mario_hair_sideburn_cap_off_dl)
DISPLAY_LIST(mario_hair_sideburn_cap_on_dl)
DISPLAY_LIST(mario_hair_sideburn_decal_cap_off)
DISPLAY_LIST(mario_hair_sideburn_decal_cap_on)
DISPLAY_LIST(mario_left_arm)
DISPLAY_LIST(mario_left_arm_shared_dl)
DISPLAY_LIST(mario_left_foot)
@ -1481,7 +1499,6 @@ DISPLAY_LIST(mario_left_hand_open_shared_dl)
DISPLAY_LIST(mario_left_leg_shared_dl)
DISPLAY_LIST(mario_left_thigh)
DISPLAY_LIST(mario_left_thigh_dl)
DISPLAY_LIST(mario_m_logo_decal)
DISPLAY_LIST(mario_m_logo_dl)
DISPLAY_LIST(mario_material_revert_render_settings)
DISPLAY_LIST(mario_metal_butt)
@ -1493,7 +1510,6 @@ DISPLAY_LIST(mario_metal_left_thigh)
DISPLAY_LIST(mario_metal_right_foot)
DISPLAY_LIST(mario_metal_right_hand_cap_shared_dl)
DISPLAY_LIST(mario_metal_right_hand_cap_shared_dl_wings)
DISPLAY_LIST(mario_metal_right_hand_cap_shared_dl_wings_transparent)
DISPLAY_LIST(mario_metal_right_hand_closed)
DISPLAY_LIST(mario_metal_right_hand_open)
DISPLAY_LIST(mario_metal_torso_shared_dl)
@ -1507,19 +1523,15 @@ DISPLAY_LIST(mario_right_foot_dl)
DISPLAY_LIST(mario_right_forearm_shared_dl)
DISPLAY_LIST(mario_right_hand_cap)
DISPLAY_LIST(mario_right_hand_cap_bottom_dl)
DISPLAY_LIST(mario_right_hand_cap_decal)
DISPLAY_LIST(mario_right_hand_cap_dl)
DISPLAY_LIST(mario_right_hand_cap_hand_position_dl)
DISPLAY_LIST(mario_right_hand_cap_m_logo_dl)
DISPLAY_LIST(mario_right_hand_cap_metal_wings_intial_dl)
DISPLAY_LIST(mario_right_hand_cap_top_dl)
DISPLAY_LIST(mario_right_hand_cap_wings)
DISPLAY_LIST(mario_right_hand_cap_wings_end_dl)
DISPLAY_LIST(mario_right_hand_cap_wings_half_1_dl)
DISPLAY_LIST(mario_right_hand_cap_wings_half_2_dl)
DISPLAY_LIST(mario_right_hand_cap_wings_intial_dl)
DISPLAY_LIST(mario_right_hand_cap_wings_transparent)
DISPLAY_LIST(mario_right_hand_cap_wings_transparent_intial_dl)
DISPLAY_LIST(mario_right_hand_cap_wings_initial_dl)
DISPLAY_LIST(mario_right_hand_closed)
DISPLAY_LIST(mario_right_hand_closed_dl)
DISPLAY_LIST(mario_right_hand_open)

24
src/game/characters.c
View file

@ -14,15 +14,11 @@
#include "pc/lua/smlua.h"
extern Gfx mario_cap_seg3_dl_03022F48[];
extern Gfx mario_cap_m_logo_decal[];
extern Gfx luigi_cap_seg3_dl_03022F48[];
extern Gfx luigi_cap_l_logo_decal[];
extern Gfx toad_cap_mesh_layer_1[];
extern Gfx toad_cap_mesh_layer_5[];
extern Gfx waluigi_cap_seg3_dl_03022F48[];
extern Gfx waluigi_cap_r_logo_decal[];
extern Gfx wario_cap_seg3_dl_03022F48[];
extern Gfx wario_cap_w_logo_decal[];
extern ALIGNED8 const u8 texture_hud_char_mario_head[];
extern ALIGNED8 const u8 texture_hud_char_luigi_head[];
@ -42,9 +38,9 @@ struct Character gCharacters[CT_MAX] = {
.capMetalModelId = MODEL_MARIOS_METAL_CAP,
.capWingModelId = MODEL_MARIOS_WING_CAP,
.capMetalWingModelId = MODEL_MARIOS_WINGED_METAL_CAP,
.capEnemyLayer = LAYER_ALPHA,
.capEnemyLayer = LAYER_OPAQUE,
.capEnemyGfx = mario_cap_seg3_dl_03022F48,
.capEnemyDecalGfx = mario_cap_m_logo_decal,
.capEnemyDecalGfx = NULL,
.torsoRotMult = 1.0f,
// anim
.animOffsetEnabled = false,
@ -108,9 +104,9 @@ struct Character gCharacters[CT_MAX] = {
.capMetalModelId = MODEL_LUIGIS_METAL_CAP,
.capWingModelId = MODEL_LUIGIS_WING_CAP,
.capMetalWingModelId = MODEL_LUIGIS_WINGED_METAL_CAP,
.capEnemyLayer = LAYER_ALPHA,
.capEnemyLayer = LAYER_OPAQUE,
.capEnemyGfx = luigi_cap_seg3_dl_03022F48,
.capEnemyDecalGfx = luigi_cap_l_logo_decal,
.capEnemyDecalGfx = NULL,
.torsoRotMult = 1.0f,
// anim
.animOffsetEnabled = false,
@ -174,9 +170,9 @@ struct Character gCharacters[CT_MAX] = {
.capMetalModelId = MODEL_TOADS_METAL_CAP,
.capWingModelId = MODEL_TOADS_WING_CAP,
.capMetalWingModelId = MODEL_TOADS_WINGED_METAL_CAP,
.capEnemyLayer = LAYER_ALPHA,
.capEnemyLayer = LAYER_OPAQUE,
.capEnemyGfx = toad_cap_mesh_layer_1,
.capEnemyDecalGfx = toad_cap_mesh_layer_5,
.capEnemyDecalGfx = NULL,
.torsoRotMult = 1.0f,
// anim
.animOffsetEnabled = false,
@ -240,9 +236,9 @@ struct Character gCharacters[CT_MAX] = {
.capMetalModelId = MODEL_WALUIGIS_METAL_CAP,
.capWingModelId = MODEL_WALUIGIS_WING_CAP,
.capMetalWingModelId = MODEL_WALUIGIS_WINGED_METAL_CAP,
.capEnemyLayer = LAYER_ALPHA,
.capEnemyLayer = LAYER_OPAQUE,
.capEnemyGfx = waluigi_cap_seg3_dl_03022F48,
.capEnemyDecalGfx = waluigi_cap_r_logo_decal,
.capEnemyDecalGfx = NULL,
.torsoRotMult = 1.0f,
// anim
.animOffsetEnabled = false,
@ -306,9 +302,9 @@ struct Character gCharacters[CT_MAX] = {
.capMetalModelId = MODEL_WARIOS_METAL_CAP,
.capWingModelId = MODEL_WARIOS_WING_CAP,
.capMetalWingModelId = MODEL_WARIOS_WINGED_METAL_CAP,
.capEnemyLayer = LAYER_ALPHA,
.capEnemyLayer = LAYER_OPAQUE,
.capEnemyGfx = wario_cap_seg3_dl_03022F48,
.capEnemyDecalGfx = wario_cap_w_logo_decal,
.capEnemyDecalGfx = NULL,
.torsoRotMult = 1.0f,
// anim
.animOffsetEnabled = false,