diff --git a/bin/custom_textures.c b/bin/custom_textures.c index 8e9bb1a79..e8efda4d9 100644 --- a/bin/custom_textures.c +++ b/bin/custom_textures.c @@ -23,14 +23,14 @@ ALIGNED8 const Texture texture_shadow_spike_ext[] = { #include "textures/segment2/shadow_spike_custom.ia8.inc.c" }; -ALIGNED8 u8 texture_selectionbox_back_icon[] = { +ALIGNED8 const Texture texture_selectionbox_back_icon[] = { #include "textures/segment2/custom_selectionbox_back_icon.rgba16.inc.c" }; -ALIGNED8 u8 texture_selectionbox_forward_icon[] = { +ALIGNED8 const Texture texture_selectionbox_forward_icon[] = { #include "textures/segment2/custom_selectionbox_forward_icon.rgba16.inc.c" }; -ALIGNED8 u8 texture_coopdx_logo[] = { +ALIGNED8 const Texture texture_coopdx_logo[] = { #include "textures/segment2/custom_coopdx_logo.rgba32.inc.c" }; diff --git a/data/dynos_mgr_builtin_externs.h b/data/dynos_mgr_builtin_externs.h index 08b0efe97..b344d3c54 100644 --- a/data/dynos_mgr_builtin_externs.h +++ b/data/dynos_mgr_builtin_externs.h @@ -1543,6 +1543,8 @@ extern ALIGNED8 const Texture texture_font_aliased[]; extern ALIGNED8 const Texture texture_font_title[]; extern ALIGNED8 const Texture texture_font_hud[]; extern ALIGNED8 const Texture texture_font_hud_recolor[]; +extern ALIGNED8 const Texture texture_selectionbox_back_icon[]; +extern ALIGNED8 const Texture texture_selectionbox_forward_icon[]; extern ALIGNED8 const Texture texture_coopdx_logo[]; extern ALIGNED8 const Texture pss_seg7_texture_07000000[]; extern ALIGNED8 const Texture pss_seg7_texture_07000800[]; @@ -2305,3 +2307,52 @@ extern ALIGNED8 const Texture bits_skybox_texture_0003C[]; extern ALIGNED8 const Texture bits_skybox_texture_0003D[]; extern ALIGNED8 const Texture bits_skybox_texture_0003E[]; extern ALIGNED8 const Texture bits_skybox_texture_0003F[]; + +extern ALIGNED8 const Texture cake_end_texture_0[]; +extern ALIGNED8 const Texture cake_end_texture_1[]; +extern ALIGNED8 const Texture cake_end_texture_2[]; +extern ALIGNED8 const Texture cake_end_texture_3[]; +extern ALIGNED8 const Texture cake_end_texture_4[]; +extern ALIGNED8 const Texture cake_end_texture_5[]; +extern ALIGNED8 const Texture cake_end_texture_6[]; +extern ALIGNED8 const Texture cake_end_texture_7[]; +extern ALIGNED8 const Texture cake_end_texture_8[]; +extern ALIGNED8 const Texture cake_end_texture_9[]; +extern ALIGNED8 const Texture cake_end_texture_10[]; +extern ALIGNED8 const Texture cake_end_texture_11[]; +extern ALIGNED8 const Texture cake_end_texture_12[]; +extern ALIGNED8 const Texture cake_end_texture_13[]; +extern ALIGNED8 const Texture cake_end_texture_14[]; +extern ALIGNED8 const Texture cake_end_texture_15[]; +extern ALIGNED8 const Texture cake_end_texture_16[]; +extern ALIGNED8 const Texture cake_end_texture_17[]; +extern ALIGNED8 const Texture cake_end_texture_18[]; +extern ALIGNED8 const Texture cake_end_texture_19[]; +extern ALIGNED8 const Texture cake_end_texture_20[]; +extern ALIGNED8 const Texture cake_end_texture_21[]; +extern ALIGNED8 const Texture cake_end_texture_22[]; +extern ALIGNED8 const Texture cake_end_texture_23[]; +extern ALIGNED8 const Texture cake_end_texture_24[]; +extern ALIGNED8 const Texture cake_end_texture_25[]; +extern ALIGNED8 const Texture cake_end_texture_26[]; +extern ALIGNED8 const Texture cake_end_texture_27[]; +extern ALIGNED8 const Texture cake_end_texture_28[]; +extern ALIGNED8 const Texture cake_end_texture_29[]; +extern ALIGNED8 const Texture cake_end_texture_30[]; +extern ALIGNED8 const Texture cake_end_texture_31[]; +extern ALIGNED8 const Texture cake_end_texture_32[]; +extern ALIGNED8 const Texture cake_end_texture_33[]; +extern ALIGNED8 const Texture cake_end_texture_34[]; +extern ALIGNED8 const Texture cake_end_texture_35[]; +extern ALIGNED8 const Texture cake_end_texture_36[]; +extern ALIGNED8 const Texture cake_end_texture_37[]; +extern ALIGNED8 const Texture cake_end_texture_38[]; +extern ALIGNED8 const Texture cake_end_texture_39[]; +extern ALIGNED8 const Texture cake_end_texture_40[]; +extern ALIGNED8 const Texture cake_end_texture_41[]; +extern ALIGNED8 const Texture cake_end_texture_42[]; +extern ALIGNED8 const Texture cake_end_texture_43[]; +extern ALIGNED8 const Texture cake_end_texture_44[]; +extern ALIGNED8 const Texture cake_end_texture_45[]; +extern ALIGNED8 const Texture cake_end_texture_46[]; +extern ALIGNED8 const Texture cake_end_texture_47[]; diff --git a/data/dynos_mgr_builtin_tex.cpp b/data/dynos_mgr_builtin_tex.cpp index 9c70fb4e1..2d67392a5 100644 --- a/data/dynos_mgr_builtin_tex.cpp +++ b/data/dynos_mgr_builtin_tex.cpp @@ -1138,14 +1138,14 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = { define_builtin_tex(waluigi_texture_eyes_up, "actors/waluigi/custom_waluigi_eyes_up_unused.rgba16.png", 64, 32, 16), define_builtin_tex(waluigi_texture_eyes_down, "actors/waluigi/custom_waluigi_eyes_down_unused.rgba16.png", 64, 32, 16), define_builtin_tex(waluigi_texture_eyes_dead, "actors/waluigi/custom_waluigi_eyes_dead.rgba16.png", 64, 32, 16), - // Fonts + // DJUI define_builtin_tex(texture_font_normal, "textures/custom_font/custom_font_normal.rgba32.png", 256, 128, 32), define_builtin_tex(texture_font_aliased, "textures/custom_font/custom_font_aliased.rgba32.png", 512, 256, 32), define_builtin_tex(texture_font_title, "textures/custom_font/custom_font_title.rgba32.png", 1024, 512, 32), define_builtin_tex(texture_font_hud, "textures/custom_font/custom_font_normal.rgba32.png", 512, 512, 32), define_builtin_tex(texture_font_hud_recolor, "textures/custom_font/custom_font_aliased.rgba32.png", 512, 512, 32), - - // Logo + define_builtin_tex(texture_selectionbox_back_icon, "textures/segment2/custom_selectionbox_back_icon.rgba16.png", 16, 16, 16), + define_builtin_tex(texture_selectionbox_forward_icon, "textures/segment2/custom_selectionbox_forward_icon.rgba16.png", 16, 16, 16), define_builtin_tex(texture_coopdx_logo, "textures/segment2/custom_coopdx_logo.rgba32.png", 2048, 1024, 32), // Goddard @@ -2133,6 +2133,55 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = { define_builtin_tex(bits_skybox_texture_0003E, "textures/skybox_tiles/bits.62.rgba16.png", 32, 32, 16), define_builtin_tex(bits_skybox_texture_0003F, "textures/skybox_tiles/bits.63.rgba16.png", 32, 32, 16), + define_builtin_tex(cake_end_texture_0, "levels/ending/cake_end_texture_0.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_1, "levels/ending/cake_end_texture_1.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_2, "levels/ending/cake_end_texture_2.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_3, "levels/ending/cake_end_texture_3.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_4, "levels/ending/cake_end_texture_4.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_5, "levels/ending/cake_end_texture_5.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_6, "levels/ending/cake_end_texture_6.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_7, "levels/ending/cake_end_texture_7.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_8, "levels/ending/cake_end_texture_8.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_9, "levels/ending/cake_end_texture_9.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_10, "levels/ending/cake_end_texture_10.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_11, "levels/ending/cake_end_texture_11.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_12, "levels/ending/cake_end_texture_12.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_13, "levels/ending/cake_end_texture_13.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_14, "levels/ending/cake_end_texture_14.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_15, "levels/ending/cake_end_texture_15.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_16, "levels/ending/cake_end_texture_16.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_17, "levels/ending/cake_end_texture_17.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_18, "levels/ending/cake_end_texture_18.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_19, "levels/ending/cake_end_texture_19.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_20, "levels/ending/cake_end_texture_20.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_21, "levels/ending/cake_end_texture_21.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_22, "levels/ending/cake_end_texture_22.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_23, "levels/ending/cake_end_texture_23.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_24, "levels/ending/cake_end_texture_24.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_25, "levels/ending/cake_end_texture_25.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_26, "levels/ending/cake_end_texture_26.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_27, "levels/ending/cake_end_texture_27.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_28, "levels/ending/cake_end_texture_28.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_29, "levels/ending/cake_end_texture_29.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_30, "levels/ending/cake_end_texture_30.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_31, "levels/ending/cake_end_texture_31.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_32, "levels/ending/cake_end_texture_32.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_33, "levels/ending/cake_end_texture_33.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_34, "levels/ending/cake_end_texture_34.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_35, "levels/ending/cake_end_texture_35.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_36, "levels/ending/cake_end_texture_36.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_37, "levels/ending/cake_end_texture_37.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_38, "levels/ending/cake_end_texture_38.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_39, "levels/ending/cake_end_texture_39.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_40, "levels/ending/cake_end_texture_40.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_41, "levels/ending/cake_end_texture_41.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_42, "levels/ending/cake_end_texture_42.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_43, "levels/ending/cake_end_texture_43.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_44, "levels/ending/cake_end_texture_44.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_45, "levels/ending/cake_end_texture_45.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_46, "levels/ending/cake_end_texture_46.png", 80, 20, 16), + define_builtin_tex(cake_end_texture_47, "levels/ending/cake_end_texture_47.png", 80, 20, 16), + #if defined(VERSION_JP) define_builtin_tex(texture_menu_font_char_jp_0, "levels/menu/main_menu_seg7.0AC48.ia8.png", 8, 8, 8), define_builtin_tex(texture_menu_font_char_jp_1, "levels/menu/main_menu_seg7.0AC88.ia8.png", 8, 8, 8),