diff --git a/data/dynos_mgr_builtin_externs.h b/data/dynos_mgr_builtin_externs.h index aacc419c6..0c40bb6af 100644 --- a/data/dynos_mgr_builtin_externs.h +++ b/data/dynos_mgr_builtin_externs.h @@ -1629,7 +1629,10 @@ extern ALIGNED8 const Texture mario_texture_metal_light[]; 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[]; @@ -1655,9 +1658,12 @@ 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 luigi_cap_seg3_texture_0301DF50[]; extern ALIGNED8 const Texture toad_player_texture_spots[]; extern ALIGNED8 const Texture toad_player_texture_hair[]; extern ALIGNED8 const Texture toad_player_texture_blush[]; diff --git a/data/dynos_mgr_builtin_tex.cpp b/data/dynos_mgr_builtin_tex.cpp index a184e4543..e71d4c28a 100644 --- a/data/dynos_mgr_builtin_tex.cpp +++ b/data/dynos_mgr_builtin_tex.cpp @@ -1061,7 +1061,10 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = { define_builtin_tex(mario_texture_yellow_button, "actors/mario/mario_overalls_button.rgba16.png", 32, 32, 16), define_builtin_tex(mario_texture_m_logo, "actors/mario/custom_mario_logo.rgba16.png", 32, 32, 16), define_builtin_tex(mario_texture_m_blend, "actors/mario/custom_mario_m_blend.rgba16.png", 32, 32, 16), - define_builtin_tex(mario_texture_hair_sideburn, "actors/mario/custom_mario_sideburn.rgba16.png", 32, 32, 16), + define_builtin_tex(mario_texture_m_cap, "actors/mario/custom_mario_cap.rgba16.png", 32, 32, 16), + define_builtin_tex(mario_texture_hair_sideburn, "actors/mario/custom_mario_sideburn.rgba32.png", 32, 32, 16), + define_builtin_tex(mario_texture_add_sideburn, "actors/mario/custom_mario_sideburn_add.rgba32.png", 32, 32, 16), + define_builtin_tex(mario_texture_skin_sideburn, "actors/mario/custom_mario_skin.rgba16.png", 32, 32, 16), define_builtin_tex(mario_texture_mustache, "actors/mario/mario_mustache.rgba16.png", 32, 32, 16), define_builtin_tex(mario_texture_eyes_front, "actors/mario/mario_eyes_center.rgba16.png", 32, 32, 16), define_builtin_tex(mario_texture_eyes_half_closed, "actors/mario/mario_eyes_half_closed.rgba16.png", 32, 32, 16), @@ -1075,7 +1078,7 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = { define_builtin_tex(mario_texture_wings_half_2, "actors/mario/mario_wing_tip.rgba16.png", 32, 64, 16), define_builtin_tex(mario_texture_metal_wings_half_1, "actors/mario/mario_metal_wing_unused.rgba16.png", 32, 64, 16), define_builtin_tex(mario_texture_metal_wings_half_2, "actors/mario/mario_metal_wing_tip_unused.rgba16.png", 32, 64, 16), - define_builtin_tex(mario_texture_cap_inside, "actors/mario/custom_mario_cap_inside.rgba16.png", 8, 8, 16), + define_builtin_tex(mario_texture_cap_inside, "actors/mario/custom_mario_cap_inside.rgba32.png", 8, 8, 16), define_builtin_tex(mario_cap_seg3_texture_0301CF50, "actors/mario_cap/mario_cap_metal.rgba16.png", 64, 32, 16), define_builtin_tex(mario_cap_seg3_texture_0301DF50, "actors/mario_cap/mario_cap_logo.rgba16.png", 32, 32, 16), define_builtin_tex(mario_cap_seg3_texture_0301E750, "actors/mario_cap/mario_cap_wing.rgba16.png", 32, 64, 16), @@ -1087,9 +1090,12 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = { define_builtin_tex(impact_smoke_seg6_texture_0605EA28, "actors/impact_smoke/impact_smoke_2.ia16.png", 64, 64, 16), define_builtin_tex(impact_smoke_seg6_texture_06060A28, "actors/impact_smoke/impact_smoke_3.ia16.png", 64, 64, 16), define_builtin_tex(luigi_texture_l_logo, "actors/luigi/custom_luigi_logo.rgba16.png", 32, 32, 16), - define_builtin_tex(luigi_texture_hair_sideburn, "actors/luigi/custom_luigi_sideburn.rgba16.png", 32, 32, 16), + define_builtin_tex(luigi_texture_l_blend, "actors/luigi/custom_luigi_l_blend.rgba16.png", 32, 32, 16), + define_builtin_tex(luigi_texture_l_cap, "actors/luigi/custom_luigi_cap.rgba16.png", 32, 32, 16), + define_builtin_tex(luigi_texture_hair_sideburn, "actors/luigi/custom_luigi_sideburn.rgba32.png", 32, 32, 16), + define_builtin_tex(luigi_texture_add_sideburn, "actors/luigi/custom_luigi_sideburn_add.rgba32.png", 32, 32, 16), + define_builtin_tex(luigi_texture_skin_sideburn, "actors/luigi/custom_luigi_skin.rgba16.png", 32, 32, 16), define_builtin_tex(luigi_texture_mustache, "actors/luigi/custom_luigi_mustache.rgba16.png", 32, 32, 16), - define_builtin_tex(luigi_cap_seg3_texture_0301DF50, "actors/luigi_cap/custom_luigi_cap_logo.rgba16.png", 32, 32, 16), define_builtin_tex(toad_player_texture_spots, "actors/toad_player/custom_toad_cap.ia16.png", 32, 32, 16), define_builtin_tex(toad_player_texture_hair, "actors/toad_player/custom_toad_hair.rgba16.png", 32, 32, 16), define_builtin_tex(toad_player_texture_blush, "actors/toad_player/custom_toad_blush.rgba16.png", 32, 32, 16),