mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-25 21:45:12 +00:00
2a52b4af4e
Updated Luigi and Wario's models to their latest revision. Mario, Luigi and Wario's sideburns now match the color of the rest of their hair with the player's palette. Mario and Luigi's Logos were made into IA16 textures and are now shaded to look a bit better with the rest of the cap. Cap inside was made a darker variant of the regular cap color across both the held and item caps. Fixed an oversight with the cap wings, though mostly so that they're more consistent. Removed Mario's unused model data since none of it is ever getting used as far as I'm aware.
95 lines
3.3 KiB
C
95 lines
3.3 KiB
C
// 0x16000CA4
|
|
const GeoLayout marios_cap_geo[] = {
|
|
GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
|
|
GEO_OPEN_NODE(),
|
|
GEO_SCALE(0x00, 16384),
|
|
GEO_OPEN_NODE(),
|
|
GEO_ASM(1, 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_TRANSPARENT, mario_cap_m_logo_decal_dl),
|
|
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_dl),
|
|
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_seg3_dl_03022F48),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_END(),
|
|
};
|
|
|
|
// 0x16000CF0
|
|
const GeoLayout marios_metal_cap_geo[] = {
|
|
GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
|
|
GEO_OPEN_NODE(),
|
|
GEO_SCALE(0x00, 16384),
|
|
GEO_OPEN_NODE(),
|
|
GEO_ASM(1, geo_mario_set_player_colors),
|
|
GEO_ASM(10, geo_update_layer_transparency),
|
|
GEO_SWITCH_CASE(2, geo_switch_anim_state),
|
|
GEO_OPEN_NODE(),
|
|
GEO_DISPLAY_LIST(LAYER_OPAQUE, mario_cap_seg3_dl_03022FF8),
|
|
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_seg3_dl_03022FF8),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_END(),
|
|
};
|
|
|
|
// 0x16000D3C
|
|
const GeoLayout marios_wing_cap_geo[] = {
|
|
GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
|
|
GEO_OPEN_NODE(),
|
|
GEO_SCALE(0x00, 16384),
|
|
GEO_OPEN_NODE(),
|
|
GEO_ASM(1, 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_TRANSPARENT, mario_cap_m_logo_decal_dl),
|
|
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_dl),
|
|
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_seg3_dl_03023160),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_END(),
|
|
};
|
|
|
|
// 0x16000DA8
|
|
const GeoLayout marios_winged_metal_cap_geo[] = {
|
|
GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 75),
|
|
GEO_OPEN_NODE(),
|
|
GEO_SCALE(0x00, 16384),
|
|
GEO_OPEN_NODE(),
|
|
GEO_ASM(1, 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_OPAQUE, mario_cap_seg3_dl_03022FF8),
|
|
GEO_DISPLAY_LIST(LAYER_ALPHA, mario_cap_seg3_dl_03023108),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_NODE_START(),
|
|
GEO_OPEN_NODE(),
|
|
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, mario_cap_seg3_dl_03023298),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_CLOSE_NODE(),
|
|
GEO_END(),
|
|
};
|