diff --git a/assets/ymls/jp/bin/effect.yml b/assets/ymls/jp/bin/effect.yml new file mode 100644 index 00000000..4d464407 --- /dev/null +++ b/assets/ymls/jp/bin/effect.yml @@ -0,0 +1,33 @@ +:config: + autopads: false + external_files: + - 'assets/ymls/jp/textures/effect.yml' + compression: + offset: 0x36DAD0 + segments: + - [ 0xB, 0x36DAD0 ] + +tiny_bubble_dl_0B006A50: + type: GFX + offset: 0x6A50 + symbol: tiny_bubble_dl_0B006A50 + +tiny_bubble_dl_0B006AB0: + type: GFX + offset: 0x6AB0 + symbol: tiny_bubble_dl_0B006AB0 + +tiny_bubble_dl_0B006CD8: + type: GFX + offset: 0x6CD8 + symbol: tiny_bubble_dl_0B006CD8 + +tiny_bubble_dl_0B006D38: + type: GFX + offset: 0x6D38 + symbol: tiny_bubble_dl_0B006D38 + +tiny_bubble_dl_0B006D68: + type: GFX + offset: 0x6D68 + symbol: tiny_bubble_dl_0B006D68 \ No newline at end of file diff --git a/assets/ymls/jp/bin/segment2.yml b/assets/ymls/jp/bin/segment2.yml index a3a5b8c6..38d220e4 100644 --- a/assets/ymls/jp/bin/segment2.yml +++ b/assets/ymls/jp/bin/segment2.yml @@ -334,3 +334,17 @@ dl_paintings_draw_ripples: type: GFX offset: 0x14A30 symbol: dl_paintings_draw_ripples + +seg2_painting_triangle_mesh: + type: ARRAY + offset: 0x14A60 + array_type: s16 + count: 1265 + symbol: seg2_painting_triangle_mesh + +seg2_painting_mesh_neighbor_tris: + type: ARRAY + offset: 0x15444 + array_type: s16 + count: 949 + symbol: seg2_painting_mesh_neighbor_tris \ No newline at end of file diff --git a/assets/ymls/jp/bin/title_screen_bg.yml b/assets/ymls/jp/bin/title_screen_bg.yml index 4cf01814..b622c131 100644 --- a/assets/ymls/jp/bin/title_screen_bg.yml +++ b/assets/ymls/jp/bin/title_screen_bg.yml @@ -4,6 +4,9 @@ offset: 0x26EA40 segments: - [ 0xA, 0x26EA40 ] + header: + header: + - '#include "sm64.h"' title_screen_bg_vertex_0A000000: type: VTX diff --git a/assets/ymls/us/bin/effect.yml b/assets/ymls/us/bin/effect.yml new file mode 100644 index 00000000..3f9ea0a5 --- /dev/null +++ b/assets/ymls/us/bin/effect.yml @@ -0,0 +1,33 @@ +:config: + autopads: false + external_files: + - 'assets/ymls/us/textures/effect.yml' + compression: + offset: 0x36F530 + segments: + - [ 0xB, 0x36F530 ] + +tiny_bubble_dl_0B006A50: + type: GFX + offset: 0x6A50 + symbol: tiny_bubble_dl_0B006A50 + +tiny_bubble_dl_0B006AB0: + type: GFX + offset: 0x6AB0 + symbol: tiny_bubble_dl_0B006AB0 + +tiny_bubble_dl_0B006CD8: + type: GFX + offset: 0x6CD8 + symbol: tiny_bubble_dl_0B006CD8 + +tiny_bubble_dl_0B006D38: + type: GFX + offset: 0x6D38 + symbol: tiny_bubble_dl_0B006D38 + +tiny_bubble_dl_0B006D68: + type: GFX + offset: 0x6D68 + symbol: tiny_bubble_dl_0B006D68 \ No newline at end of file diff --git a/assets/ymls/us/bin/segment2.yml b/assets/ymls/us/bin/segment2.yml index 7b7393fe..c069bc0b 100644 --- a/assets/ymls/us/bin/segment2.yml +++ b/assets/ymls/us/bin/segment2.yml @@ -286,3 +286,17 @@ dl_paintings_draw_ripples: type: GFX offset: 0x17890 symbol: dl_paintings_draw_ripples + +seg2_painting_triangle_mesh: + type: ARRAY + offset: 0x178C0 + array_type: s16 + count: 1265 + symbol: seg2_painting_triangle_mesh + +seg2_painting_mesh_neighbor_tris: + type: ARRAY + offset: 0x182A4 + array_type: s16 + count: 949 + symbol: seg2_painting_mesh_neighbor_tris \ No newline at end of file diff --git a/assets/ymls/us/bin/title_screen_bg.yml b/assets/ymls/us/bin/title_screen_bg.yml index beb9f8c8..e8400ffc 100644 --- a/assets/ymls/us/bin/title_screen_bg.yml +++ b/assets/ymls/us/bin/title_screen_bg.yml @@ -4,6 +4,9 @@ offset: 0x2708C0 segments: - [ 0xA, 0x2708C0 ] + header: + header: + - '#include "sm64.h"' title_screen_bg_vertex_0A000000: type: VTX diff --git a/assets/ymls/us/textures/effect.yml b/assets/ymls/us/textures/effect.yml index 9857d2b8..5701bdc8 100644 --- a/assets/ymls/us/textures/effect.yml +++ b/assets/ymls/us/textures/effect.yml @@ -41,6 +41,14 @@ flower.01808: format: RGBA16 symbol: effect_0B001808 +flower_bubbles_textures_ptr_0B002008: + type: ASSET_ARRAY + assetType: TEXTURE + factoryType: TEXTURE + offset: 0x2008 + count: 5 + symbol: flower_bubbles_textures_ptr_0B002008 + lava_bubble.02020: type: TEXTURE size: 2048 @@ -113,6 +121,14 @@ lava_bubble.05820: format: RGBA16 symbol: effect_0B005820 +lava_bubble_ptr_0B006020: + type: ASSET_ARRAY + assetType: TEXTURE + factoryType: TEXTURE + offset: 0x6020 + count: 10 + symbol: lava_bubble_ptr_0B006020 + bubble.06048: type: TEXTURE size: 2048 @@ -122,6 +138,14 @@ bubble.06048: format: RGBA16 symbol: effect_0B006048 +bubble_ptr_0B006848: + type: ASSET_ARRAY + assetType: TEXTURE + factoryType: TEXTURE + offset: 0x6848 + count: 1 + symbol: bubble_ptr_0B006848 + tiny_bubble.0684C: type: TEXTURE size: 512 diff --git a/bin/cave.c b/bin/cave.c deleted file mode 100644 index 9560d5ab..00000000 --- a/bin/cave.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture cave_09000000[] = "__OTR__textures/cave/hmc_textures.00000"; - -// 0x09001000 -ALIGNED8 const Texture cave_09001000[] = "__OTR__textures/cave/hmc_textures.01000"; - -// 0x09001800 -ALIGNED8 const Texture cave_09001800[] = "__OTR__textures/cave/hmc_textures.01800"; - -// 0x09002800 -ALIGNED8 const Texture cave_09002800[] = "__OTR__textures/cave/hmc_textures.02800"; - -// 0x09003000 -ALIGNED8 const Texture cave_09003000[] = "__OTR__textures/cave/hmc_textures.03000"; - -// 0x09003800 -ALIGNED8 const Texture cave_09003800[] = "__OTR__textures/cave/hmc_textures.03800"; - -// 0x09004800 -ALIGNED8 const Texture cave_09004800[] = "__OTR__textures/cave/hmc_textures.04800"; - -// 0x09005800 -ALIGNED8 const Texture cave_09005800[] = "__OTR__textures/cave/hmc_textures.05800"; - -// 0x09006800 -ALIGNED8 const Texture cave_09006800[] = "__OTR__textures/cave/hmc_textures.06800"; - -// 0x09007000 -ALIGNED8 const Texture cave_09007000[] = "__OTR__textures/cave/hmc_textures.07000"; - -// 0x09007800 -ALIGNED8 const Texture cave_09007800[] = "__OTR__textures/cave/hmc_textures.07800"; - -// 0x09008800 -ALIGNED8 const Texture cave_09008800[] = "__OTR__textures/cave/hmc_textures.08800"; - -// 0x09009800 -ALIGNED8 const Texture cave_09009800[] = "__OTR__textures/cave/hmc_textures.09800"; - -// 0x0900A000 -ALIGNED8 const Texture cave_0900A000[] = "__OTR__textures/cave/hmc_textures.0A000"; - -// 0x0900A800 -ALIGNED8 const Texture cave_0900A800[] = "__OTR__textures/cave/hmc_textures.0A800"; - -// 0x0900B800 -ALIGNED8 const Texture cave_0900B800[] = "__OTR__textures/cave/hmc_textures.0B800"; - -// 0x0900C000 -ALIGNED8 const Texture cave_0900C000[] = "__OTR__textures/cave/hmc_textures.0C000"; diff --git a/bin/effect.c b/bin/effect.c deleted file mode 100644 index 09a5f34d..00000000 --- a/bin/effect.c +++ /dev/null @@ -1,148 +0,0 @@ -#include -#include - -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -UNUSED static const u64 effect_unused_0 = 0; - -// Flower (Unused) -// 0x0B000008 -ALIGNED8 static const Texture effect_0B000008[] = "__OTR__textures/effect/flower.00008"; - -// 0x0B000808 -ALIGNED8 static const Texture effect_0B000808[] = "__OTR__textures/effect/flower.00808"; - -// 0x0B001008 -ALIGNED8 static const Texture effect_0B001008[] = "__OTR__textures/effect/flower.01008"; - -// 0x0B001808 -ALIGNED8 static const Texture effect_0B001808[] = "__OTR__textures/effect/flower.01808"; - -// 0x0B002008 -const Texture *const flower_bubbles_textures_ptr_0B002008[] = { - effect_0B000008, - effect_0B000808, - effect_0B001008, - effect_0B001808, - effect_0B001008, - effect_0B000808, -}; - -// Lava Bubble -// 0x0B002020 -ALIGNED8 static const Texture effect_0B002020[] = "__OTR__textures/effect/lava_bubble.02020"; - -// 0x0B002820 -ALIGNED8 static const Texture effect_0B002820[] = "__OTR__textures/effect/lava_bubble.02820"; - -// 0x0B003020 -ALIGNED8 static const Texture effect_0B003020[] = "__OTR__textures/effect/lava_bubble.03020"; - -// 0x0B003820 -ALIGNED8 static const Texture effect_0B003820[] = "__OTR__textures/effect/lava_bubble.03820"; - -// 0x0B004020 -ALIGNED8 static const Texture effect_0B004020[] = "__OTR__textures/effect/lava_bubble.04020"; - -// 0x0B004820 -ALIGNED8 static const Texture effect_0B004820[] = "__OTR__textures/effect/lava_bubble.04820"; - -// 0x0B005020 -ALIGNED8 static const Texture effect_0B005020[] = "__OTR__textures/effect/lava_bubble.05020"; - -// 0x0B005820 -ALIGNED8 static const Texture effect_0B005820[] = "__OTR__textures/effect/lava_bubble.05820"; - -// 0x0B006020 -const Texture *const lava_bubble_ptr_0B006020[] = { - effect_0B002020, - effect_0B002820, - effect_0B003020, - effect_0B003020, - effect_0B003020, - effect_0B003820, - effect_0B004020, - effect_0B004820, - effect_0B005020, - effect_0B005820, -}; - -// Bubble -// 0x0B006048 -ALIGNED8 static const Texture effect_0B006048[] = "__OTR__textures/effect/bubble.06048"; - -// 0x0B006848 -const Texture *const bubble_ptr_0B006848[] = { - effect_0B006048, -}; - -// Tiny Bubble -// 0x0B00684C -ALIGNED8 const Texture effect_0B00684C[] = "__OTR__textures/effect/tiny_bubble.0684C"; - -// 0x0B006A50 - 0x0B006AB0 -const Gfx tiny_bubble_dl_0B006A50[] = { - gsDPPipeSync(), - gsSPClearGeometryMode(G_LIGHTING | G_CULL_BACK | G_SHADING_SMOOTH), - gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON), - gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), - gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, effect_0B00684C), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 4, G_TX_NOLOD), - gsDPSetTileSize(0, 0, 0, (16 - 1) << G_TEXTURE_IMAGE_FRAC, (16 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPEndDisplayList(), -}; - -// 0x0B006AB0 - 0x0B006AD8 -const Gfx tiny_bubble_dl_0B006AB0[] = { - gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), - gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), - gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), - gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK | G_SHADING_SMOOTH), - gsSPEndDisplayList(), -}; - -// 0x0B006AD8 -ALIGNED8 static const Texture effect_0B006AD8[] = "__OTR__textures/effect/tiny_bubble.06AD8"; - -// 0x0B006CD8 - 0x0B006D38 -const Gfx tiny_bubble_dl_0B006CD8[] = { - gsDPPipeSync(), - gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, effect_0B006AD8), - gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), - gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), - gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), - gsDPSetTileSize(0, 0, 0, (16 - 1) << G_TEXTURE_IMAGE_FRAC, (16 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPEndDisplayList(), -}; - -// 0x0B006D38 - 0x0B006D68 -const Gfx tiny_bubble_dl_0B006D38[] = { - gsDPPipeSync(), - gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), - gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), - gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsSPEndDisplayList(), -}; - -// 0x0B006D68 - 0x0B006D98 -const Gfx tiny_bubble_dl_0B006D68[] = { - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), - gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPEndDisplayList(), -}; diff --git a/bin/fire.c b/bin/fire.c deleted file mode 100644 index 746d3365..00000000 --- a/bin/fire.c +++ /dev/null @@ -1,76 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture fire_09000000[] = "__OTR__textures/fire/lll_textures.00000"; - -// 0x09000800 -ALIGNED8 const Texture fire_09000800[] = "__OTR__textures/fire/lll_textures.00800"; - -// 0x09001000 -ALIGNED8 const Texture fire_09001000[] = "__OTR__textures/fire/lll_textures.01000"; - -// 0x09001800 -ALIGNED8 const Texture fire_09001800[] = "__OTR__textures/fire/lll_textures.01800"; - -// 0x09002000 -ALIGNED8 const Texture fire_09002000[] = "__OTR__textures/fire/lll_textures.02000"; - -// 0x09002800 -ALIGNED8 const Texture fire_09002800[] = "__OTR__textures/fire/lll_textures.02800"; - -// 0x09003000 -ALIGNED8 const Texture fire_09003000[] = "__OTR__textures/fire/lll_textures.03000"; - -// 0x09003800 -ALIGNED8 const Texture fire_09003800[] = "__OTR__textures/fire/lll_textures.03800"; - -// 0x09004000 -ALIGNED8 const Texture fire_09004000[] = "__OTR__textures/fire/lll_textures.04000"; - -// 0x09004800 -ALIGNED8 const Texture fire_09004800[] = "__OTR__textures/fire/lll_textures.04800"; - -// 0x09005000 -ALIGNED8 const Texture fire_09005000[] = "__OTR__textures/fire/lll_textures.05000"; - -// 0x09005800 -ALIGNED8 const Texture fire_09005800[] = "__OTR__textures/fire/lll_textures.05800"; - -// 0x09006000 -ALIGNED8 const Texture fire_09006000[] = "__OTR__textures/fire/lll_textures.06000"; - -// 0x09006800 -ALIGNED8 const Texture fire_09006800[] = "__OTR__textures/fire/lll_textures.06800"; - -// 0x09007000 -ALIGNED8 const Texture fire_09007000[] = "__OTR__textures/fire/lll_textures.07000"; - -// 0x09007800 -ALIGNED8 const Texture fire_09007800[] = "__OTR__textures/fire/lll_textures.07800"; - -// 0x09008000 -ALIGNED8 const Texture fire_09008000[] = "__OTR__textures/fire/lll_textures.08000"; - -// 0x09008800 -ALIGNED8 const Texture fire_09008800[] = "__OTR__textures/fire/lll_textures.08800"; - -// 0x09009000 -ALIGNED8 const Texture fire_09009000[] = "__OTR__textures/fire/lll_textures.09000"; - -// 0x09009800 -ALIGNED8 const Texture fire_09009800[] = "__OTR__textures/fire/lll_textures.09800"; - -// 0x0900A000 -ALIGNED8 const Texture fire_0900A000[] = "__OTR__textures/fire/lll_textures.0A000"; - -// 0x0900A800 -ALIGNED8 const Texture fire_0900A800[] = "__OTR__textures/fire/lll_textures.0A800"; - -// 0x0900B000 -ALIGNED8 const Texture fire_0900B000[] = "__OTR__textures/fire/lll_textures.0B000"; - -// 0x0900B800 -ALIGNED8 const Texture fire_0900B800[] = "__OTR__textures/fire/lll_textures.0B800"; diff --git a/bin/generic.c b/bin/generic.c deleted file mode 100644 index db792062..00000000 --- a/bin/generic.c +++ /dev/null @@ -1,70 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture generic_09000000[] = "__OTR__textures/generic/bob_textures.00000"; - -// 0x09000800 -ALIGNED8 const Texture generic_09000800[] = "__OTR__textures/generic/bob_textures.00800"; - -// 0x09001000 -ALIGNED8 const Texture generic_09001000[] = "__OTR__textures/generic/bob_textures.01000"; - -// 0x09001800 -ALIGNED8 const Texture generic_09001800[] = "__OTR__textures/generic/bob_textures.01800"; - -// 0x09002000 -ALIGNED8 const Texture generic_09002000[] = "__OTR__textures/generic/bob_textures.02000"; - -// 0x09002800 -ALIGNED8 const Texture generic_09002800[] = "__OTR__textures/generic/bob_textures.02800"; - -// 0x09003000 -ALIGNED8 const Texture generic_09003000[] = "__OTR__textures/generic/bob_textures.03000"; - -// 0x09003800 -ALIGNED8 const Texture generic_09003800[] = "__OTR__textures/generic/bob_textures.03800"; - -// 0x09004000 -ALIGNED8 const Texture generic_09004000[] = "__OTR__textures/generic/bob_textures.04000"; - -// 0x09004800 -ALIGNED8 const Texture generic_09004800[] = "__OTR__textures/generic/bob_textures.04800"; - -// 0x09005000 -ALIGNED8 const Texture generic_09005000[] = "__OTR__textures/generic/bob_textures.05000"; - -// 0x09005800 -ALIGNED8 const Texture generic_09005800[] = "__OTR__textures/generic/bob_textures.05800"; - -// 0x09006000 -ALIGNED8 const Texture generic_09006000[] = "__OTR__textures/generic/bob_textures.06000"; - -// 0x09007000 -ALIGNED8 const Texture generic_09007000[] = "__OTR__textures/generic/bob_textures.07000"; - -// 0x09007800 -ALIGNED8 const Texture generic_09007800[] = "__OTR__textures/generic/bob_textures.07800"; - -// 0x09008000 -ALIGNED8 const Texture generic_09008000[] = "__OTR__textures/generic/bob_textures.08000"; - -// 0x09008800 -ALIGNED8 const Texture generic_09008800[] = "__OTR__textures/generic/bob_textures.08800"; - -// 0x09009000 -ALIGNED8 const Texture generic_09009000[] = "__OTR__textures/generic/bob_textures.09000"; - -// 0x09009800 -ALIGNED8 const Texture generic_09009800[] = "__OTR__textures/generic/bob_textures.09800"; - -// 0x0900A000 -ALIGNED8 const Texture generic_0900A000[] = "__OTR__textures/generic/bob_textures.0A000"; - -// 0x0900A800 -ALIGNED8 const Texture generic_0900A800[] = "__OTR__textures/generic/bob_textures.0A800"; - -// 0x0900B000 -ALIGNED8 const Texture generic_0900B000[] = "__OTR__textures/generic/bob_textures.0B000"; diff --git a/bin/grass.c b/bin/grass.c deleted file mode 100644 index d81e1024..00000000 --- a/bin/grass.c +++ /dev/null @@ -1,76 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture grass_09000000[] = "__OTR__textures/grass/wf_textures.00000"; - -// 0x09000800 -ALIGNED8 const Texture grass_09000800[] = "__OTR__textures/grass/wf_textures.00800"; - -// 0x09001000 -ALIGNED8 const Texture grass_09001000[] = "__OTR__textures/grass/wf_textures.01000"; - -// 0x09001800 -ALIGNED8 const Texture grass_09001800[] = "__OTR__textures/grass/wf_textures.01800"; - -// 0x09002000 -ALIGNED8 const Texture grass_09002000[] = "__OTR__textures/grass/wf_textures.02000"; - -// 0x09002800 -ALIGNED8 const Texture grass_09002800[] = "__OTR__textures/grass/wf_textures.02800"; - -// 0x09003000 -ALIGNED8 const Texture grass_09003000[] = "__OTR__textures/grass/wf_textures.03000"; - -// 0x09003800 -ALIGNED8 const Texture grass_09003800[] = "__OTR__textures/grass/wf_textures.03800"; - -// 0x09004000 -ALIGNED8 const Texture grass_09004000[] = "__OTR__textures/grass/wf_textures.04000"; - -// 0x09004800 -ALIGNED8 const Texture grass_09004800[] = "__OTR__textures/grass/wf_textures.04800"; - -// 0x09005000 -ALIGNED8 const Texture grass_09005000[] = "__OTR__textures/grass/wf_textures.05000"; - -// 0x09005800 -ALIGNED8 const Texture grass_09005800[] = "__OTR__textures/grass/wf_textures.05800"; - -// 0x09006000 -ALIGNED8 const Texture grass_09006000[] = "__OTR__textures/grass/wf_textures.06000"; - -// 0x09006800 -ALIGNED8 const Texture grass_09006800[] = "__OTR__textures/grass/wf_textures.06800"; - -// 0x09007000 -ALIGNED8 const Texture grass_09007000[] = "__OTR__textures/grass/wf_textures.07000"; - -// 0x09007800 -ALIGNED8 const Texture grass_09007800[] = "__OTR__textures/grass/wf_textures.07800"; - -// 0x09008000 -ALIGNED8 const Texture grass_09008000[] = "__OTR__textures/grass/wf_textures.08000"; - -// 0x09008800 -ALIGNED8 const Texture grass_09008800[] = "__OTR__textures/grass/wf_textures.08800"; - -// 0x09009000 -ALIGNED8 const Texture grass_09009000[] = "__OTR__textures/grass/wf_textures.09000"; - -// 0x09009800 -ALIGNED8 const Texture grass_09009800[] = "__OTR__textures/grass/wf_textures.09800"; - -// 0x0900A000 -ALIGNED8 const Texture grass_0900A000[] = "__OTR__textures/grass/wf_textures.0A000"; - -// 0x0900A800 -ALIGNED8 const Texture grass_0900A800[] = "__OTR__textures/grass/wf_textures.0A800"; - -// 0x0900B000 -ALIGNED8 const Texture grass_0900B000[] = "__OTR__textures/grass/wf_textures.0B000"; - -// 0x0900B800 -ALIGNED8 const Texture grass_0900B800[] = "__OTR__textures/grass/wf_textures.0B800"; diff --git a/bin/inside.c b/bin/inside.c deleted file mode 100644 index 0f2bf58d..00000000 --- a/bin/inside.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture inside_09000000[] = "__OTR__textures/inside/inside_castle_textures.00000"; - -// 0x09001000 -ALIGNED8 const Texture inside_09001000[] = "__OTR__textures/inside/inside_castle_textures.01000"; - -// 0x09002000 -ALIGNED8 const Texture inside_09002000[] = "__OTR__textures/inside/inside_castle_textures.02000"; - -// 0x09003000 -ALIGNED8 const Texture inside_09003000[] = "__OTR__textures/inside/inside_castle_textures.03000"; - -// 0x09003800 -ALIGNED8 const Texture inside_09003800[] = "__OTR__textures/inside/inside_castle_textures.03800"; - -// 0x09004000 -ALIGNED8 const Texture inside_09004000[] = "__OTR__textures/inside/inside_castle_textures.04000"; - -// 0x09004800 -ALIGNED8 const Texture inside_09004800[] = "__OTR__textures/inside/inside_castle_textures.04800"; - -// 0x09005000 -ALIGNED8 const Texture inside_09005000[] = "__OTR__textures/inside/inside_castle_textures.05000"; - -// 0x09005800 -ALIGNED8 const Texture inside_09005800[] = "__OTR__textures/inside/inside_castle_textures.05800"; - -// 0x09006000 -ALIGNED8 const Texture inside_09006000[] = "__OTR__textures/inside/inside_castle_textures.06000"; - -// 0x09007000 -ALIGNED8 const Texture inside_09007000[] = "__OTR__textures/inside/inside_castle_textures.07000"; - -// 0x09008000 -ALIGNED8 const Texture inside_09008000[] = "__OTR__textures/inside/inside_castle_textures.08000"; - -// 0x09008800 -ALIGNED8 const Texture inside_09008800[] = "__OTR__textures/inside/inside_castle_textures.08800"; - -// 0x09009000 -ALIGNED8 const Texture inside_09009000[] = "__OTR__textures/inside/inside_castle_textures.09000"; - -// 0x0900A000 -ALIGNED8 const Texture inside_0900A000[] = "__OTR__textures/inside/inside_castle_textures.0A000"; - -// 0x0900B000 -ALIGNED8 const Texture inside_0900B000[] = "__OTR__textures/inside/inside_castle_textures.0B000"; - -// 0x0900B800 -ALIGNED8 const Texture inside_0900B800[] = "__OTR__textures/inside/inside_castle_textures.0B800"; diff --git a/bin/machine.c b/bin/machine.c deleted file mode 100644 index 44b3c84c..00000000 --- a/bin/machine.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture machine_09000000[] = "__OTR__textures/machine/ttc_textures.00000"; - -// 0x09000800 -ALIGNED8 const Texture machine_09000800[] = "__OTR__textures/machine/ttc_textures.00800"; - -// 0x09001000 -ALIGNED8 const Texture machine_09001000[] = "__OTR__textures/machine/ttc_textures.01000"; - -// 0x09001800 -ALIGNED8 const Texture machine_09001800[] = "__OTR__textures/machine/ttc_textures.01800"; - -// 0x09002000 -ALIGNED8 const Texture machine_09002000[] = "__OTR__textures/machine/ttc_textures.02000"; - -// 0x09002800 -ALIGNED8 const Texture machine_09002800[] = "__OTR__textures/machine/ttc_textures.02800"; - -// 0x09003000 -ALIGNED8 const Texture machine_09003000[] = "__OTR__textures/machine/ttc_textures.03000"; - -// 0x09003800 -ALIGNED8 const Texture machine_09003800[] = "__OTR__textures/machine/ttc_textures.03800"; - -// 0x09004000 -ALIGNED8 const Texture machine_09004000[] = "__OTR__textures/machine/ttc_textures.04000"; - -// 0x09005000 -ALIGNED8 const Texture machine_09005000[] = "__OTR__textures/machine/ttc_textures.05000"; - -// 0x09005800 -ALIGNED8 const Texture machine_09005800[] = "__OTR__textures/machine/ttc_textures.05800"; - -// 0x09006000 -ALIGNED8 const Texture machine_09006000[] = "__OTR__textures/machine/ttc_textures.06000"; - -// 0x09006800 -ALIGNED8 const Texture machine_09006800[] = "__OTR__textures/machine/ttc_textures.06800"; - -// 0x09007000 -ALIGNED8 const Texture machine_09007000[] = "__OTR__textures/machine/ttc_textures.07000"; - -// 0x09007800 -ALIGNED8 const Texture machine_09007800[] = "__OTR__textures/machine/ttc_textures.07800"; - -// 0x09008000 -ALIGNED8 const Texture machine_09008000[] = "__OTR__textures/machine/ttc_textures.08000"; - -// 0x09008400 -ALIGNED8 const Texture machine_09008400[] = "__OTR__textures/machine/ttc_textures.08400"; diff --git a/bin/mountain.c b/bin/mountain.c deleted file mode 100644 index 6d799612..00000000 --- a/bin/mountain.c +++ /dev/null @@ -1,67 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture mountain_09000000[] = "__OTR__textures/mountain/ttm_textures.00000"; - -// 0x09000800 -ALIGNED8 const Texture mountain_09000800[] = "__OTR__textures/mountain/ttm_textures.00800"; - -// 0x09001800 -ALIGNED8 const Texture mountain_09001800[] = "__OTR__textures/mountain/ttm_textures.01800"; - -// 0x09002800 -ALIGNED8 const Texture mountain_09002800[] = "__OTR__textures/mountain/ttm_textures.02800"; - -// 0x09003000 -ALIGNED8 const Texture mountain_09003000[] = "__OTR__textures/mountain/ttm_textures.03000"; - -// 0x09003800 -ALIGNED8 const Texture mountain_09003800[] = "__OTR__textures/mountain/ttm_textures.03800"; - -// 0x09004000 -ALIGNED8 const Texture mountain_09004000[] = "__OTR__textures/mountain/ttm_textures.04000"; - -// 0x09004800 -ALIGNED8 const Texture mountain_09004800[] = "__OTR__textures/mountain/ttm_textures.04800"; - -// 0x09005000 -ALIGNED8 const Texture mountain_09005000[] = "__OTR__textures/mountain/ttm_textures.05000"; - -// 0x09005800 -ALIGNED8 const Texture mountain_09005800[] = "__OTR__textures/mountain/ttm_textures.05800"; - -// 0x09006800 -ALIGNED8 const Texture mountain_09006800[] = "__OTR__textures/mountain/ttm_textures.06800"; - -// 0x09007000 -ALIGNED8 const Texture mountain_09007000[] = "__OTR__textures/mountain/ttm_textures.07000"; - -// 0x09007800 -ALIGNED8 const Texture mountain_09007800[] = "__OTR__textures/mountain/ttm_textures.07800"; - -// 0x09008000 -ALIGNED8 const Texture mountain_09008000[] = "__OTR__textures/mountain/ttm_textures.08000"; - -// 0x09008800 -ALIGNED8 const Texture mountain_09008800[] = "__OTR__textures/mountain/ttm_textures.08800"; - -// 0x09009800 -ALIGNED8 const Texture mountain_09009800[] = "__OTR__textures/mountain/ttm_textures.09800"; - -// 0x0900A000 -ALIGNED8 const Texture mountain_0900A000[] = "__OTR__textures/mountain/ttm_textures.0A000"; - -// 0x0900A800 -ALIGNED8 const Texture mountain_0900A800[] = "__OTR__textures/mountain/ttm_textures.0A800"; - -// 0x0900B000 -ALIGNED8 const Texture mountain_0900B000[] = "__OTR__textures/mountain/ttm_textures.0B000"; - -// 0x0900B800 -ALIGNED8 const Texture mountain_0900B800[] = "__OTR__textures/mountain/ttm_textures.0B800"; - -// 0x0900C000 -ALIGNED8 const Texture mountain_0900C000[] = "__OTR__textures/mountain/ttm_textures.0C000"; diff --git a/bin/outside.c b/bin/outside.c deleted file mode 100644 index 03d03d7f..00000000 --- a/bin/outside.c +++ /dev/null @@ -1,67 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture outside_09000000[] = "__OTR__textures/outside/castle_grounds_textures.00000"; - -// 0x09000800 -ALIGNED8 const Texture outside_09000800[] = "__OTR__textures/outside/castle_grounds_textures.00800"; - -// 0x09001000 -ALIGNED8 const Texture outside_09001000[] = "__OTR__textures/outside/castle_grounds_textures.01000"; - -// 0x09002000 -ALIGNED8 const Texture outside_09002000[] = "__OTR__textures/outside/castle_grounds_textures.02000"; - -// 0x09003000 -ALIGNED8 const Texture outside_09003000[] = "__OTR__textures/outside/castle_grounds_textures.03000"; - -// 0x09003800 -ALIGNED8 const Texture outside_09003800[] = "__OTR__textures/outside/castle_grounds_textures.03800"; - -// 0x09004000 -ALIGNED8 const Texture outside_09004000[] = "__OTR__textures/outside/castle_grounds_textures.04000"; - -// 0x09004800 -ALIGNED8 const Texture outside_09004800[] = "__OTR__textures/outside/castle_grounds_textures.04800"; - -// 0x09005800 -ALIGNED8 const Texture outside_09005800[] = "__OTR__textures/outside/castle_grounds_textures.05800"; - -// 0x09006000 -ALIGNED8 const Texture outside_09006000[] = "__OTR__textures/outside/castle_grounds_textures.06000"; - -// 0x09006800 -ALIGNED8 const Texture outside_09006800[] = "__OTR__textures/outside/castle_grounds_textures.06800"; - -// 0x09007800 -ALIGNED8 const Texture outside_09007800[] = "__OTR__textures/outside/castle_grounds_textures.07800"; - -// 0x09008000 -ALIGNED8 const Texture outside_09008000[] = "__OTR__textures/outside/castle_grounds_textures.08000"; - -// 0x09008800 -ALIGNED8 const Texture outside_09008800[] = "__OTR__textures/outside/castle_grounds_textures.08800"; - -// 0x09009000 -ALIGNED8 const Texture outside_09009000[] = "__OTR__textures/outside/castle_grounds_textures.09000"; - -// 0x09009800 -ALIGNED8 const Texture outside_09009800[] = "__OTR__textures/outside/castle_grounds_textures.09800"; - -// 0x0900A000 -ALIGNED8 const Texture outside_0900A000[] = "__OTR__textures/outside/castle_grounds_textures.0A000"; - -// 0x0900A800 -ALIGNED8 const Texture outside_0900A800[] = "__OTR__textures/outside/castle_grounds_textures.0A800"; - -// 0x0900B000 -ALIGNED8 const Texture outside_0900B000[] = "__OTR__textures/outside/castle_grounds_textures.0B000"; - -// 0x0900B400 -ALIGNED8 const Texture outside_0900B400[] = "__OTR__textures/outside/castle_grounds_textures.0B400"; - -// 0x0900BC00 -ALIGNED8 const Texture outside_0900BC00[] = "__OTR__textures/outside/castle_grounds_textures.0BC00"; diff --git a/bin/segment2.c b/bin/segment2.c deleted file mode 100644 index a8e2a474..00000000 --- a/bin/segment2.c +++ /dev/null @@ -1,611 +0,0 @@ -#include -#include - -#include "config.h" -#include "macros.h" -#include "types.h" -#include "game/ingame_menu.h" - -#include "make_const_nonconst.h" - -// SM64 (US/JP/EU/SH) Segment 02 -#include "assets/textures/segment2.h" - -// 14A60: triangle mesh -// 0x02014A60 -const s16 seg2_painting_triangle_mesh[] = { - 157, // numVtx - // format: - // 2D point (x, y), ripple (0 or 1) - 614, 583, 0, // 0 - 614, 614, 0, // 1 - 562, 614, 0, // 2 - 562, 553, 1, // 3 - 614, 522, 0, // 4 - 511, 583, 1, // 5 - 511, 614, 0, // 6 - 307, 614, 0, // 7 - 307, 583, 1, // 8 - 358, 614, 0, // 9 - 256, 614, 0, // 10 - 256, 553, 1, // 11 - 307, 522, 1, // 12 - 358, 553, 1, // 13 - 409, 583, 1, // 14 - 460, 614, 0, // 15 - 511, 522, 1, // 16 - 460, 553, 1, // 17 - 409, 522, 1, // 18 - 562, 307, 1, // 19 - 614, 338, 0, // 20 - 562, 430, 1, // 21 - 614, 399, 0, // 22 - 562, 368, 1, // 23 - 511, 338, 1, // 24 - 460, 307, 1, // 25 - 460, 430, 1, // 26 - 511, 399, 1, // 27 - 511, 460, 1, // 28 - 409, 338, 1, // 29 - 460, 368, 1, // 30 - 358, 307, 1, // 31 - 409, 460, 1, // 32 - 358, 430, 1, // 33 - 409, 399, 1, // 34 - 358, 368, 1, // 35 - 307, 338, 1, // 36 - 256, 307, 1, // 37 - 307, 399, 1, // 38 - 256, 430, 1, // 39 - 307, 460, 1, // 40 - 614, 460, 0, // 41 - 562, 491, 1, // 42 - 460, 491, 1, // 43 - 358, 491, 1, // 44 - 256, 491, 1, // 45 - 409, 276, 1, // 46 - 511, 276, 1, // 47 - 307, 276, 1, // 48 - 614, 31, 0, // 49 - 614, 0, 0, // 50 - 562, 0, 0, // 51 - 562, 123, 1, // 52 - 614, 92, 0, // 53 - 511, 31, 1, // 54 - 562, 61, 1, // 55 - 460, 0, 0, // 56 - 511, 0, 0, // 57 - 460, 123, 1, // 58 - 511, 92, 1, // 59 - 511, 153, 1, // 60 - 409, 31, 1, // 61 - 460, 61, 1, // 62 - 358, 0, 0, // 63 - 409, 0, 0, // 64 - 409, 92, 1, // 65 - 358, 123, 1, // 66 - 409, 153, 1, // 67 - 307, 31, 1, // 68 - 358, 61, 1, // 69 - 256, 0, 0, // 70 - 307, 0, 0, // 71 - 256, 123, 1, // 72 - 307, 92, 1, // 73 - 307, 153, 1, // 74 - 614, 153, 0, // 75 - 562, 246, 1, // 76 - 614, 215, 0, // 77 - 562, 184, 1, // 78 - 460, 246, 1, // 79 - 511, 215, 1, // 80 - 460, 184, 1, // 81 - 358, 246, 1, // 82 - 409, 215, 1, // 83 - 358, 184, 1, // 84 - 256, 246, 1, // 85 - 307, 215, 1, // 86 - 205, 583, 1, // 87 - 0, 614, 0, // 88 - 0, 583, 0, // 89 - 51, 614, 0, // 90 - 51, 553, 1, // 91 - 102, 583, 1, // 92 - 205, 522, 1, // 93 - 153, 553, 1, // 94 - 153, 614, 0, // 95 - 102, 522, 1, // 96 - 256, 368, 1, // 97 - 205, 338, 1, // 98 - 153, 307, 1, // 99 - 153, 430, 1, // 100 - 205, 399, 1, // 101 - 205, 460, 1, // 102 - 153, 368, 1, // 103 - 102, 338, 1, // 104 - 51, 307, 1, // 105 - 51, 430, 1, // 106 - 102, 399, 1, // 107 - 102, 460, 1, // 108 - 51, 368, 1, // 109 - 0, 338, 0, // 110 - 0, 460, 0, // 111 - 153, 491, 1, // 112 - 51, 491, 1, // 113 - 153, 246, 1, // 114 - 102, 276, 1, // 115 - 205, 276, 1, // 116 - 0, 276, 0, // 117 - 51, 246, 1, // 118 - 205, 31, 1, // 119 - 256, 61, 1, // 120 - 205, 0, 0, // 121 - 153, 0, 0, // 122 - 205, 153, 1, // 123 - 205, 92, 1, // 124 - 153, 123, 1, // 125 - 102, 31, 1, // 126 - 153, 61, 1, // 127 - 102, 0, 0, // 128 - 51, 0, 0, // 129 - 51, 123, 1, // 130 - 102, 92, 1, // 131 - 102, 153, 1, // 132 - 0, 31, 0, // 133 - 51, 61, 1, // 134 - 0, 153, 0, // 135 - 256, 184, 1, // 136 - 205, 215, 1, // 137 - 153, 184, 1, // 138 - 102, 215, 1, // 139 - 51, 184, 1, // 140 - 409, 614, 0, // 141 - 614, 307, 0, // 142 - 614, 276, 0, // 143 - 511, 307, 1, // 144 - 409, 307, 1, // 145 - 307, 307, 1, // 146 - 205, 614, 0, // 147 - 0, 522, 0, // 148 - 102, 614, 0, // 149 - 205, 307, 1, // 150 - 102, 307, 1, // 151 - 0, 399, 0, // 152 - 0, 307, 0, // 153 - 0, 215, 0, // 154 - 0, 92, 0, // 155 - 0, 0, 0, // 156 - // triangles - 264, - 8, 12, 13, // 0 - 0, 1, 2, // 1 - 3, 0, 2, // 2 - 4, 0, 3, // 3 - 5, 2, 6, // 4 - 2, 5, 3, // 5 - 7, 8, 9, // 6 - 8, 7, 10, // 7 - 11, 8, 10, // 8 - 12, 8, 11, // 9 - 9, 8, 13, // 10 - 13, 14, 9, // 11 - 14, 141, 9, // 12 - 5, 6, 15, // 13 - 5, 16, 3, // 14 - 16, 5, 17, // 15 - 17, 5, 15, // 16 - 14, 15, 141, // 17 - 15, 14, 17, // 18 - 18, 14, 13, // 19 - 14, 18, 17, // 20 - 19, 142, 20, // 21 - 19, 20, 23, // 22 - 28, 27, 21, // 23 - 21, 23, 22, // 24 - 22, 41, 21, // 25 - 20, 22, 23, // 26 - 23, 24, 19, // 27 - 21, 27, 23, // 28 - 24, 23, 27, // 29 - 25, 144, 24, // 30 - 19, 24, 144, // 31 - 24, 27, 30, // 32 - 25, 24, 30, // 33 - 26, 30, 27, // 34 - 27, 28, 26, // 35 - 36, 38, 97, // 36 - 26, 34, 30, // 37 - 29, 30, 34, // 38 - 30, 29, 25, // 39 - 25, 29, 145, // 40 - 31, 145, 29, // 41 - 31, 29, 35, // 42 - 29, 34, 35, // 43 - 32, 34, 26, // 44 - 33, 35, 34, // 45 - 34, 32, 33, // 46 - 33, 38, 35, // 47 - 35, 36, 31, // 48 - 36, 35, 38, // 49 - 37, 36, 97, // 50 - 37, 146, 36, // 51 - 31, 36, 146, // 52 - 28, 16, 43, // 53 - 38, 40, 39, // 54 - 39, 97, 38, // 55 - 40, 38, 33, // 56 - 21, 41, 42, // 57 - 41, 4, 42, // 58 - 3, 42, 4, // 59 - 42, 28, 21, // 60 - 28, 42, 16, // 61 - 3, 16, 42, // 62 - 26, 28, 43, // 63 - 17, 43, 16, // 64 - 43, 32, 26, // 65 - 32, 43, 18, // 66 - 17, 18, 43, // 67 - 33, 32, 44, // 68 - 32, 18, 44, // 69 - 13, 44, 18, // 70 - 44, 40, 33, // 71 - 13, 12, 44, // 72 - 40, 44, 12, // 73 - 39, 40, 45, // 74 - 40, 12, 45, // 75 - 48, 31, 146, // 76 - 11, 45, 12, // 77 - 25, 47, 144, // 78 - 46, 25, 145, // 79 - 47, 19, 144, // 80 - 19, 143, 142, // 81 - 31, 46, 145, // 82 - 60, 59, 52, // 83 - 49, 53, 55, // 84 - 50, 49, 51, // 85 - 51, 49, 55, // 86 - 52, 55, 53, // 87 - 53, 75, 52, // 88 - 54, 55, 59, // 89 - 52, 59, 55, // 90 - 55, 54, 51, // 91 - 54, 59, 62, // 92 - 56, 54, 62, // 93 - 57, 54, 56, // 94 - 54, 57, 51, // 95 - 58, 62, 59, // 96 - 59, 60, 58, // 97 - 68, 71, 63, // 98 - 61, 62, 65, // 99 - 58, 65, 62, // 100 - 62, 61, 56, // 101 - 61, 65, 69, // 102 - 63, 61, 69, // 103 - 64, 61, 63, // 104 - 61, 64, 56, // 105 - 65, 67, 66, // 106 - 66, 69, 65, // 107 - 67, 65, 58, // 108 - 68, 69, 73, // 109 - 69, 68, 63, // 110 - 66, 73, 69, // 111 - 68, 73, 120, // 112 - 70, 68, 120, // 113 - 71, 68, 70, // 114 - 72, 120, 73, // 115 - 73, 74, 72, // 116 - 74, 73, 66, // 117 - 75, 77, 78, // 118 - 52, 75, 78, // 119 - 76, 78, 77, // 120 - 77, 143, 76, // 121 - 76, 80, 78, // 122 - 60, 78, 80, // 123 - 78, 60, 52, // 124 - 46, 83, 79, // 125 - 58, 60, 81, // 126 - 60, 80, 81, // 127 - 79, 81, 80, // 128 - 80, 47, 79, // 129 - 47, 80, 76, // 130 - 81, 67, 58, // 131 - 67, 81, 83, // 132 - 79, 83, 81, // 133 - 66, 67, 84, // 134 - 67, 83, 84, // 135 - 82, 84, 83, // 136 - 83, 46, 82, // 137 - 84, 74, 66, // 138 - 82, 86, 84, // 139 - 74, 84, 86, // 140 - 74, 86, 136, // 141 - 72, 74, 136, // 142 - 85, 136, 86, // 143 - 86, 48, 85, // 144 - 48, 86, 82, // 145 - 25, 46, 79, // 146 - 79, 47, 25, // 147 - 82, 46, 31, // 148 - 19, 47, 76, // 149 - 76, 143, 19, // 150 - 31, 48, 82, // 151 - 37, 48, 146, // 152 - 85, 48, 37, // 153 - 10, 87, 11, // 154 - 87, 10, 147, // 155 - 92, 95, 149, // 156 - 88, 89, 90, // 157 - 89, 148, 91, // 158 - 90, 89, 91, // 159 - 91, 92, 90, // 160 - 92, 149, 90, // 161 - 93, 87, 94, // 162 - 87, 93, 11, // 163 - 94, 87, 95, // 164 - 87, 147, 95, // 165 - 95, 92, 94, // 166 - 96, 92, 91, // 167 - 92, 96, 94, // 168 - 39, 101, 97, // 169 - 97, 98, 37, // 170 - 98, 97, 101, // 171 - 99, 98, 103, // 172 - 99, 150, 98, // 173 - 37, 98, 150, // 174 - 98, 101, 103, // 175 - 100, 103, 101, // 176 - 101, 102, 100, // 177 - 102, 101, 39, // 178 - 100, 107, 103, // 179 - 103, 104, 99, // 180 - 104, 103, 107, // 181 - 105, 104, 109, // 182 - 105, 151, 104, // 183 - 99, 104, 151, // 184 - 104, 107, 109, // 185 - 106, 109, 107, // 186 - 107, 108, 106, // 187 - 108, 107, 100, // 188 - 109, 110, 105, // 189 - 106, 152, 109, // 190 - 110, 109, 152, // 191 - 105, 110, 153, // 192 - 111, 152, 106, // 193 - 11, 93, 45, // 194 - 102, 45, 93, // 195 - 45, 102, 39, // 196 - 102, 93, 112, // 197 - 100, 102, 112, // 198 - 94, 112, 93, // 199 - 112, 108, 100, // 200 - 108, 112, 96, // 201 - 94, 96, 112, // 202 - 106, 108, 113, // 203 - 108, 96, 113, // 204 - 91, 113, 96, // 205 - 91, 148, 113, // 206 - 113, 111, 106, // 207 - 111, 113, 148, // 208 - 114, 116, 99, // 209 - 99, 115, 114, // 210 - 115, 99, 151, // 211 - 99, 116, 150, // 212 - 72, 124, 120, // 213 - 116, 37, 150, // 214 - 37, 116, 85, // 215 - 117, 105, 153, // 216 - 105, 115, 151, // 217 - 105, 117, 118, // 218 - 118, 115, 105, // 219 - 119, 120, 124, // 220 - 120, 119, 70, // 221 - 119, 124, 127, // 222 - 119, 121, 70, // 223 - 121, 119, 122, // 224 - 122, 119, 127, // 225 - 123, 124, 72, // 226 - 124, 123, 125, // 227 - 125, 127, 124, // 228 - 126, 127, 131, // 229 - 127, 126, 122, // 230 - 125, 131, 127, // 231 - 126, 131, 134, // 232 - 128, 126, 129, // 233 - 129, 126, 134, // 234 - 126, 128, 122, // 235 - 136, 123, 72, // 236 - 130, 134, 131, // 237 - 131, 132, 130, // 238 - 132, 131, 125, // 239 - 133, 134, 155, // 240 - 134, 133, 129, // 241 - 130, 155, 134, // 242 - 133, 156, 129, // 243 - 135, 155, 130, // 244 - 123, 136, 137, // 245 - 85, 137, 136, // 246 - 139, 115, 118, // 247 - 123, 137, 138, // 248 - 125, 123, 138, // 249 - 114, 138, 137, // 250 - 137, 116, 114, // 251 - 116, 137, 85, // 252 - 114, 139, 138, // 253 - 132, 138, 139, // 254 - 138, 132, 125, // 255 - 132, 139, 140, // 256 - 130, 132, 140, // 257 - 115, 139, 114, // 258 - 118, 140, 139, // 259 - 135, 140, 154, // 260 - 118, 154, 140, // 261 - 140, 135, 130, // 262 - 117, 154, 118, // 263 -}; - -/* 0x02015444: seg2_painting_mesh_neighbor_tris - * Lists the neighboring triangles for each vertex in the mesh. - * Used when applying gouraud shading to the generated ripple mesh - * - * Format: - * num neighbors, neighbor0, neighbor1, ... - * The nth entry corresponds to the nth vertex in seg2_painting_triangle_mesh - */ -const s16 seg2_painting_mesh_neighbor_tris[] = { - 3, 1, 2, 3, - 1, 1, - 4, 1, 2, 4, 5, - 6, 2, 3, 5, 14, 59, 62, - 3, 3, 58, 59, - 6, 4, 5, 13, 14, 15, 16, - 2, 4, 13, - 2, 6, 7, - 6, 0, 6, 7, 8, 9, 10, - 4, 6, 10, 11, 12, - 4, 7, 8, 154, 155, - 6, 8, 9, 77, 154, 163, 194, - 6, 0, 9, 72, 73, 75, 77, - 6, 0, 10, 11, 19, 70, 72, - 6, 11, 12, 17, 18, 19, 20, - 4, 13, 16, 17, 18, - 6, 14, 15, 53, 61, 62, 64, - 6, 15, 16, 18, 20, 64, 67, - 6, 19, 20, 66, 67, 69, 70, - 8, 21, 22, 27, 31, 80, 81, 149, 150, - 3, 21, 22, 26, - 6, 23, 24, 25, 28, 57, 60, - 3, 24, 25, 26, - 6, 22, 24, 26, 27, 28, 29, - 6, 27, 29, 30, 31, 32, 33, - 8, 30, 33, 39, 40, 78, 79, 146, 147, - 6, 34, 35, 37, 44, 63, 65, - 6, 23, 28, 29, 32, 34, 35, - 6, 23, 35, 53, 60, 61, 63, - 6, 38, 39, 40, 41, 42, 43, - 6, 32, 33, 34, 37, 38, 39, - 8, 41, 42, 48, 52, 76, 82, 148, 151, - 6, 44, 46, 65, 66, 68, 69, - 6, 45, 46, 47, 56, 68, 71, - 6, 37, 38, 43, 44, 45, 46, - 6, 42, 43, 45, 47, 48, 49, - 6, 36, 48, 49, 50, 51, 52, - 8, 50, 51, 152, 153, 170, 174, 214, 215, - 6, 36, 47, 49, 54, 55, 56, - 6, 54, 55, 74, 169, 178, 196, - 6, 54, 56, 71, 73, 74, 75, - 3, 25, 57, 58, - 6, 57, 58, 59, 60, 61, 62, - 6, 53, 63, 64, 65, 66, 67, - 6, 68, 69, 70, 71, 72, 73, - 6, 74, 75, 77, 194, 195, 196, - 6, 79, 82, 125, 137, 146, 148, - 6, 78, 80, 129, 130, 147, 149, - 6, 76, 144, 145, 151, 152, 153, - 3, 84, 85, 86, - 1, 85, - 4, 85, 86, 91, 95, - 6, 83, 87, 88, 90, 119, 124, - 3, 84, 87, 88, - 6, 89, 91, 92, 93, 94, 95, - 6, 84, 86, 87, 89, 90, 91, - 4, 93, 94, 101, 105, - 2, 94, 95, - 6, 96, 97, 100, 108, 126, 131, - 6, 83, 89, 90, 92, 96, 97, - 6, 83, 97, 123, 124, 126, 127, - 6, 99, 101, 102, 103, 104, 105, - 6, 92, 93, 96, 99, 100, 101, - 4, 98, 103, 104, 110, - 2, 104, 105, - 6, 99, 100, 102, 106, 107, 108, - 6, 106, 107, 111, 117, 134, 138, - 6, 106, 108, 131, 132, 134, 135, - 6, 98, 109, 110, 112, 113, 114, - 6, 102, 103, 107, 109, 110, 111, - 4, 113, 114, 221, 223, - 2, 98, 114, - 6, 115, 116, 142, 213, 226, 236, - 6, 109, 111, 112, 115, 116, 117, - 6, 116, 117, 138, 140, 141, 142, - 3, 88, 118, 119, - 6, 120, 121, 122, 130, 149, 150, - 3, 118, 120, 121, - 6, 118, 119, 120, 122, 123, 124, - 6, 125, 128, 129, 133, 146, 147, - 6, 122, 123, 127, 128, 129, 130, - 6, 126, 127, 128, 131, 132, 133, - 6, 136, 137, 139, 145, 148, 151, - 6, 125, 132, 133, 135, 136, 137, - 6, 134, 135, 136, 138, 139, 140, - 6, 143, 144, 153, 215, 246, 252, - 6, 139, 140, 141, 143, 144, 145, - 6, 154, 155, 162, 163, 164, 165, - 1, 157, - 3, 157, 158, 159, - 4, 157, 159, 160, 161, - 6, 158, 159, 160, 167, 205, 206, - 6, 156, 160, 161, 166, 167, 168, - 6, 162, 163, 194, 195, 197, 199, - 6, 162, 164, 166, 168, 199, 202, - 4, 156, 164, 165, 166, - 6, 167, 168, 201, 202, 204, 205, - 6, 36, 50, 55, 169, 170, 171, - 6, 170, 171, 172, 173, 174, 175, - 8, 172, 173, 180, 184, 209, 210, 211, 212, - 6, 176, 177, 179, 188, 198, 200, - 6, 169, 171, 175, 176, 177, 178, - 6, 177, 178, 195, 196, 197, 198, - 6, 172, 175, 176, 179, 180, 181, - 6, 180, 181, 182, 183, 184, 185, - 8, 182, 183, 189, 192, 216, 217, 218, 219, - 6, 186, 187, 190, 193, 203, 207, - 6, 179, 181, 185, 186, 187, 188, - 6, 187, 188, 200, 201, 203, 204, - 6, 182, 185, 186, 189, 190, 191, - 3, 189, 191, 192, - 3, 193, 207, 208, - 6, 197, 198, 199, 200, 201, 202, - 6, 203, 204, 205, 206, 207, 208, - 6, 209, 210, 250, 251, 253, 258, - 6, 210, 211, 217, 219, 247, 258, - 6, 209, 212, 214, 215, 251, 252, - 3, 216, 218, 263, - 6, 218, 219, 247, 259, 261, 263, - 6, 220, 221, 222, 223, 224, 225, - 6, 112, 113, 115, 213, 220, 221, - 2, 223, 224, - 4, 224, 225, 230, 235, - 6, 226, 227, 236, 245, 248, 249, - 6, 213, 220, 222, 226, 227, 228, - 6, 227, 228, 231, 239, 249, 255, - 6, 229, 230, 232, 233, 234, 235, - 6, 222, 225, 228, 229, 230, 231, - 2, 233, 235, - 4, 233, 234, 241, 243, - 6, 237, 238, 242, 244, 257, 262, - 6, 229, 231, 232, 237, 238, 239, - 6, 238, 239, 254, 255, 256, 257, - 3, 240, 241, 243, - 6, 232, 234, 237, 240, 241, 242, - 3, 244, 260, 262, - 6, 141, 142, 143, 236, 245, 246, - 6, 245, 246, 248, 250, 251, 252, - 6, 248, 249, 250, 253, 254, 255, - 6, 247, 253, 254, 256, 258, 259, - 6, 256, 257, 259, 260, 261, 262, - 2, 12, 17, - 2, 21, 81, - 3, 81, 121, 150, - 4, 30, 31, 78, 80, - 4, 40, 41, 79, 82, - 4, 51, 52, 76, 152, - 2, 155, 165, - 3, 158, 206, 208, - 2, 156, 161, - 4, 173, 174, 212, 214, - 4, 183, 184, 211, 217, - 3, 190, 191, 193, - 2, 192, 216, - 3, 260, 261, 263, - 3, 240, 242, 244, - 1, 243, -}; diff --git a/bin/sky.c b/bin/sky.c deleted file mode 100644 index 54892603..00000000 --- a/bin/sky.c +++ /dev/null @@ -1,48 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture sky_09000000[] = "__OTR__textures/sky/rr_textures.00000"; - -// 0x09000800 -ALIGNED8 const Texture sky_09000800[] = "__OTR__textures/sky/rr_textures.00800"; - -// 0x09001000 -ALIGNED8 const Texture sky_09001000[] = "__OTR__textures/sky/rr_textures.01000"; - -// 0x09001800 -ALIGNED8 const Texture sky_09001800[] = "__OTR__textures/sky/rr_textures.01800"; - -// 0x09002000 -ALIGNED8 const Texture sky_09002000[] = "__OTR__textures/sky/rr_textures.02000"; - -// 0x09003000 -ALIGNED8 const Texture sky_09003000[] = "__OTR__textures/sky/rr_textures.03000"; - -// 0x09003800 -ALIGNED8 const Texture sky_09003800[] = "__OTR__textures/sky/rr_textures.03800"; - -// 0x09004800 -ALIGNED8 const Texture sky_09004800[] = "__OTR__textures/sky/rr_textures.04800"; - -// 0x09005000 -ALIGNED8 const Texture sky_09005000[] = "__OTR__textures/sky/rr_textures.05000"; - -// 0x09005800 -ALIGNED8 const Texture sky_09005800[] = "__OTR__textures/sky/rr_textures.05800"; - -// 0x09006000 -ALIGNED8 const Texture sky_09006000[] = "__OTR__textures/sky/rr_textures.06000"; - -ALIGNED8 const Texture texture_metal_hole[] = "__OTR__textures/sky/metal_hole"; - -// 0x09007000 -ALIGNED8 const Texture sky_09007000[] = "__OTR__textures/sky/rr_textures.07000"; - -// 0x09007800 -ALIGNED8 const Texture sky_09007800[] = "__OTR__textures/sky/rr_textures.07800"; - -// 0x09008000 -ALIGNED8 const Texture sky_09008000[] = "__OTR__textures/sky/rr_textures.08000"; diff --git a/bin/snow.c b/bin/snow.c deleted file mode 100644 index 3510d8b7..00000000 --- a/bin/snow.c +++ /dev/null @@ -1,58 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture snow_09000000[] = "__OTR__textures/snow/ccm_textures.00000"; - -// 0x09000800 -ALIGNED8 const Texture snow_09000800[] = "__OTR__textures/snow/ccm_textures.00800"; - -// 0x09001000 -ALIGNED8 const Texture snow_09001000[] = "__OTR__textures/snow/ccm_textures.01000"; - -// 0x09002000 -ALIGNED8 const Texture snow_09002000[] = "__OTR__textures/snow/ccm_textures.02000"; - -// 0x09002800 -ALIGNED8 const Texture snow_09002800[] = "__OTR__textures/snow/ccm_textures.02800"; - -// 0x09003000 -ALIGNED8 const Texture snow_09003000[] = "__OTR__textures/snow/ccm_textures.03000"; - -// 0x09003800 -ALIGNED8 const Texture snow_09003800[] = "__OTR__textures/snow/ccm_textures.03800"; - -// 0x09004000 -ALIGNED8 const Texture snow_09004000[] = "__OTR__textures/snow/ccm_textures.04000"; - -// 0x09004800 -ALIGNED8 const Texture snow_09004800[] = "__OTR__textures/snow/ccm_textures.04800"; - -// 0x09005000 -ALIGNED8 const Texture snow_09005000[] = "__OTR__textures/snow/ccm_textures.05000"; - -// 0x09005800 -ALIGNED8 const Texture snow_09005800[] = "__OTR__textures/snow/ccm_textures.05800"; - -// 0x09006000 -ALIGNED8 const Texture snow_09006000[] = "__OTR__textures/snow/ccm_textures.06000"; - -// 0x09006800 -ALIGNED8 const Texture snow_09006800[] = "__OTR__textures/snow/ccm_textures.06800"; - -// 0x09007000 -ALIGNED8 const Texture snow_09007000[] = "__OTR__textures/snow/ccm_textures.07000"; - -// 0x09008000 -ALIGNED8 const Texture snow_09008000[] = "__OTR__textures/snow/ccm_textures.08000"; - -// 0x09008800 -ALIGNED8 const Texture snow_09008800[] = "__OTR__textures/snow/ccm_textures.08800"; - -// 0x09009000 -ALIGNED8 const Texture snow_09009000[] = "__OTR__textures/snow/ccm_textures.09000"; - -// 0x09009800 -ALIGNED8 const Texture snow_09009800[] = "__OTR__textures/snow/ccm_textures.09800"; diff --git a/bin/spooky.c b/bin/spooky.c deleted file mode 100644 index 01fb5142..00000000 --- a/bin/spooky.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture spooky_09000000[] = "__OTR__textures/spooky/bbh_textures.00000"; - -// 0x09000800 -ALIGNED8 const Texture spooky_09000800[] = "__OTR__textures/spooky/bbh_textures.00800"; - -// 0x09001800 -ALIGNED8 const Texture spooky_09001800[] = "__OTR__textures/spooky/bbh_textures.01800"; - -// 0x09002800 -ALIGNED8 const Texture spooky_09002800[] = "__OTR__textures/spooky/bbh_textures.02800"; - -// 0x09003800 -ALIGNED8 const Texture spooky_09003800[] = "__OTR__textures/spooky/bbh_textures.03800"; - -// 0x09004800 -ALIGNED8 const Texture spooky_09004800[] = "__OTR__textures/spooky/bbh_textures.04800"; - -// 0x09005000 -ALIGNED8 const Texture spooky_09005000[] = "__OTR__textures/spooky/bbh_textures.05000"; - -// 0x09006000 -ALIGNED8 const Texture spooky_09006000[] = "__OTR__textures/spooky/bbh_textures.06000"; - -// 0x09006800 -ALIGNED8 const Texture spooky_09006800[] = "__OTR__textures/spooky/bbh_textures.06800"; - -// 0x09007000 -ALIGNED8 const Texture spooky_09007000[] = "__OTR__textures/spooky/bbh_textures.07000"; - -// 0x09008000 -ALIGNED8 const Texture spooky_09008000[] = "__OTR__textures/spooky/bbh_textures.08000"; - -// 0x09008800 -ALIGNED8 const Texture spooky_09008800[] = "__OTR__textures/spooky/bbh_textures.08800"; - -// 0x09009000 -ALIGNED8 const Texture spooky_09009000[] = "__OTR__textures/spooky/bbh_textures.09000"; - -// 0x0900A000 -ALIGNED8 const Texture spooky_0900A000[] = "__OTR__textures/spooky/bbh_textures.0A000"; - -// 0x0900A800 -ALIGNED8 const Texture spooky_0900A800[] = "__OTR__textures/spooky/bbh_textures.0A800"; - -// 0x0900B000 -ALIGNED8 const Texture spooky_0900B000[] = "__OTR__textures/spooky/bbh_textures.0B000"; - -// 0x0900B800 -ALIGNED8 const Texture spooky_0900B800[] = "__OTR__textures/spooky/bbh_textures.0B800"; - diff --git a/bin/title_screen_bg.c b/bin/title_screen_bg.c deleted file mode 100644 index 7382968b..00000000 --- a/bin/title_screen_bg.c +++ /dev/null @@ -1,147 +0,0 @@ -#include -#include "sm64.h" - -#include "make_const_nonconst.h" - -// 0x0A000000 - 0x0A000100 -static const Vtx title_screen_bg_vertex_0A000000[] = { - {{{ 0, 60, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 60, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 80, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 80, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 40, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 40, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 60, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 60, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 20, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 20, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 40, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 40, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 0, -1}, 0, { 0, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 0, -1}, 0, { 2528, 608}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 80, 20, -1}, 0, { 2528, 0}, {0xff, 0xff, 0xff, 0xff}}}, - {{{ 0, 20, -1}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xff}}}, -}; - -// 0x0A000100 - 0x0A000118 -const Gfx title_screen_bg_dl_0A000100[] = { - gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB), - gsDPSetRenderMode(G_RM_AA_OPA_SURF, G_RM_AA_OPA_SURF2), - gsSPEndDisplayList(), -}; - -// 0x0A000118 - 0x0A000130 -const Gfx title_screen_bg_dl_0A000118[] = { - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsSPVertex(title_screen_bg_vertex_0A000000, 16, 0), - gsSPEndDisplayList(), -}; - -// 0x0A000130 - 0x0A000148 -const Gfx title_screen_bg_dl_0A000130[] = { - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPEndDisplayList(), -}; - -// 0x0A000148 - 0x0A000160 -const Gfx title_screen_bg_dl_0A000148[] = { - gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPEndDisplayList(), -}; - -// 0x0A000160 - 0x0A000178 -const Gfx title_screen_bg_dl_0A000160[] = { - gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), - gsSPEndDisplayList(), -}; - -// 0x0A000178 - 0x0A000190 -const Gfx title_screen_bg_dl_0A000178[] = { - gsSP2Triangles(12, 13, 14, 0x0, 12, 14, 15, 0x0), - gsSPEndDisplayList(), -}; - -// 0x0A000190 - 0x0A0001C0 -const Gfx title_screen_bg_dl_0A000190[] = { - gsDPPipeSync(), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), - gsSPSetGeometryMode(G_LIGHTING), - gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), - gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), - gsSPEndDisplayList(), -}; - -// 0x0A0001C0 -ALIGNED8 static const Texture title_texture_0A0001C0[] = "__OTR__textures/title_screen_bg/title_screen_bg.001C0"; - -// 0x0A000E40 -ALIGNED8 static const Texture title_texture_0A000E40[] = "__OTR__textures/title_screen_bg/title_screen_bg.00E40"; - -// 0x0A001AC0 -ALIGNED8 static const Texture title_texture_0A001AC0[] = "__OTR__textures/title_screen_bg/title_screen_bg.01AC0"; - -// 0x0A002740 -ALIGNED8 static const Texture title_texture_0A002740[] = "__OTR__textures/title_screen_bg/title_screen_bg.02740"; - -// 0x0A0033C0 -ALIGNED8 static const Texture title_texture_0A0033C0[] = "__OTR__textures/title_screen_bg/title_screen_bg.033C0"; - -// 0x0A004040 -ALIGNED8 static const Texture title_texture_0A004040[] = "__OTR__textures/title_screen_bg/title_screen_bg.04040"; - -// 0x0A004CC0 -ALIGNED8 static const Texture title_texture_0A004CC0[] = "__OTR__textures/title_screen_bg/title_screen_bg.04CC0"; - -// 0x0A005940 -ALIGNED8 static const Texture title_texture_0A005940[] = "__OTR__textures/title_screen_bg/title_screen_bg.05940"; - -// 0x0A0065C0 -const Texture *const mario_title_texture_table[] = { - title_texture_0A0001C0, title_texture_0A000E40, title_texture_0A001AC0, title_texture_0A002740, -}; - -// 0x0A0065D0 -const Texture *const game_over_texture_table[] = { - title_texture_0A0033C0, title_texture_0A004040, title_texture_0A004CC0, title_texture_0A005940, -}; - -UNUSED static const u64 title_screen_bg_unused_0 = 0; - -#ifdef VERSION_SH -const Gfx title_screen_bg_dl_0A0065E8[] = { - gsDPPipeSync(), - gsDPSetCycleType(G_CYC_COPY), - gsDPSetTexturePersp(G_TP_NONE), - gsDPSetTextureFilter(G_TF_POINT), - gsDPSetRenderMode(G_RM_NOOP, G_RM_NOOP2), - gsSPEndDisplayList(), -}; - -const Gfx title_screen_bg_dl_0A006618[] = { - gsDPPipeSync(), - gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetTexturePersp(G_TP_PERSP), - gsDPSetTextureFilter(G_TF_BILERP), - gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), - gsSPEndDisplayList(), -}; - -ALIGNED8 static const u8 title_texture_rumble_pak[] = "__OTR__textures/title_screen_bg/title_screen_bg.06648"; - -const Gfx title_screen_bg_dl_0A007548[] = { - gsDPPipeSync(), - gsDPSetCycleType(G_CYC_COPY), - gsDPSetTexturePersp(G_TP_NONE), - gsDPSetTextureFilter(G_TF_POINT), - gsDPSetRenderMode(G_RM_NOOP, G_RM_NOOP2), - gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, 319, 239), - gsDPLoadTextureTile(title_texture_rumble_pak, G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 0, 0, 0, 79, 23, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 7, 5, G_TX_NOLOD, G_TX_NOLOD), - gsSPTextureRectangle(220 << 2, 200 << 2, 299 << 2, 223 << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10), - gsDPPipeSync(), - gsDPSetCycleType(G_CYC_1CYCLE), - gsDPSetTexturePersp(G_TP_PERSP), - gsDPSetTextureFilter(G_TF_BILERP), - gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), - gsSPEndDisplayList(), -}; -#endif diff --git a/bin/water.c b/bin/water.c deleted file mode 100644 index cbe57b86..00000000 --- a/bin/water.c +++ /dev/null @@ -1,49 +0,0 @@ -#include "macros.h" -#include "types.h" - -#include "make_const_nonconst.h" - -// 0x09000000 -ALIGNED8 const Texture water_09000000[] = "__OTR__textures/water/jrb_textures.00000"; - -// 0x09000800 -ALIGNED8 const Texture water_09000800[] = "__OTR__textures/water/jrb_textures.00800"; - -// 0x09001800 -ALIGNED8 const Texture water_09001800[] = "__OTR__textures/water/jrb_textures.01800"; - -// 0x09002800 -ALIGNED8 const Texture water_09002800[] = "__OTR__textures/water/jrb_textures.02800"; - -// 0x09003800 -ALIGNED8 const Texture water_09003800[] = "__OTR__textures/water/jrb_textures.03800"; - -// 0x09004800 -ALIGNED8 const Texture water_09004800[] = "__OTR__textures/water/jrb_textures.04800"; - -// 0x09005800 -ALIGNED8 const Texture water_09005800[] = "__OTR__textures/water/jrb_textures.05800"; - -// 0x09006000 -ALIGNED8 const Texture water_09006000[] = "__OTR__textures/water/jrb_textures.06000"; - -// 0x09006800 -ALIGNED8 const Texture water_09006800[] = "__OTR__textures/water/jrb_textures.06800"; - -// 0x09007800 -ALIGNED8 const Texture water_09007800[] = "__OTR__textures/water/jrb_textures.07800"; - -// 0x09008800 -ALIGNED8 const Texture water_09008800[] = "__OTR__textures/water/jrb_textures.08800"; - -// 0x09009000 -ALIGNED8 const Texture water_09009000[] = "__OTR__textures/water/jrb_textures.09000"; - -// 0x0900A000 -ALIGNED8 const Texture water_0900A000[] = "__OTR__textures/water/jrb_textures.0A000"; - -// 0x0900A800 -ALIGNED8 const Texture water_0900A800[] = "__OTR__textures/water/jrb_textures.0A800"; - -// 0x0900B800 -ALIGNED8 const Texture water_0900B800[] = "__OTR__textures/water/jrb_textures.0B800"; diff --git a/include/assets/actors/boo.h b/include/assets/actors/boo.h index 895ac167..cde0ef98 100644 --- a/include/assets/actors/boo.h +++ b/include/assets/actors/boo.h @@ -11,6 +11,30 @@ static const ALIGN_ASSET(2) char boo_seg5_texture_0500AB40[] = "__OTR__actors/bo static const ALIGN_ASSET(2) char boo_seg5_vertex_0500B340[] = "__OTR__actors/boo/boo_seg5_vertex_0500B340"; +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500B400[] = "__OTR__actors/boo/boo_seg5_vertex_0500B400"; + +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500B4C0[] = "__OTR__actors/boo/boo_seg5_vertex_0500B4C0"; + +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500B5B0[] = "__OTR__actors/boo/boo_seg5_vertex_0500B5B0"; + +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500B6A0[] = "__OTR__actors/boo/boo_seg5_vertex_0500B6A0"; + +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500B790[] = "__OTR__actors/boo/boo_seg5_vertex_0500B790"; + +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500B880[] = "__OTR__actors/boo/boo_seg5_vertex_0500B880"; + +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500B970[] = "__OTR__actors/boo/boo_seg5_vertex_0500B970"; + +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500BA60[] = "__OTR__actors/boo/boo_seg5_vertex_0500BA60"; + +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500BB50[] = "__OTR__actors/boo/boo_seg5_vertex_0500BB50"; + +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500BC40[] = "__OTR__actors/boo/boo_seg5_vertex_0500BC40"; + +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500BD30[] = "__OTR__actors/boo/boo_seg5_vertex_0500BD30"; + +static const ALIGN_ASSET(2) char boo_seg5_vertex_0500BE20[] = "__OTR__actors/boo/boo_seg5_vertex_0500BE20"; + static const ALIGN_ASSET(2) char boo_seg5_dl_0500BEE0[] = "__OTR__actors/boo/boo_seg5_dl_0500BEE0"; static const ALIGN_ASSET(2) char boo_seg5_dl_0500BF48[] = "__OTR__actors/boo/boo_seg5_dl_0500BF48"; diff --git a/include/assets/bin/effect.h b/include/assets/bin/effect.h new file mode 100644 index 00000000..7c1f40a4 --- /dev/null +++ b/include/assets/bin/effect.h @@ -0,0 +1,12 @@ +#pragma once + +static const ALIGN_ASSET(2) char tiny_bubble_dl_0B006A50[] = "__OTR__bin/effect/tiny_bubble_dl_0B006A50"; + +static const ALIGN_ASSET(2) char tiny_bubble_dl_0B006AB0[] = "__OTR__bin/effect/tiny_bubble_dl_0B006AB0"; + +static const ALIGN_ASSET(2) char tiny_bubble_dl_0B006CD8[] = "__OTR__bin/effect/tiny_bubble_dl_0B006CD8"; + +static const ALIGN_ASSET(2) char tiny_bubble_dl_0B006D38[] = "__OTR__bin/effect/tiny_bubble_dl_0B006D38"; + +static const ALIGN_ASSET(2) char tiny_bubble_dl_0B006D68[] = "__OTR__bin/effect/tiny_bubble_dl_0B006D68"; + diff --git a/include/assets/bin/segment2.h b/include/assets/bin/segment2.h index 0e39f1dc..6b050745 100644 --- a/include/assets/bin/segment2.h +++ b/include/assets/bin/segment2.h @@ -118,3 +118,7 @@ static const ALIGN_ASSET(2) char dl_paintings_env_mapped_end[] = "__OTR__bin/seg static const ALIGN_ASSET(2) char dl_paintings_draw_ripples[] = "__OTR__bin/segment2/dl_paintings_draw_ripples"; +static const ALIGN_ASSET(2) char seg2_painting_triangle_mesh[] = "__OTR__bin/segment2/seg2_painting_triangle_mesh"; + +static const ALIGN_ASSET(2) char seg2_painting_mesh_neighbor_tris[] = "__OTR__bin/segment2/seg2_painting_mesh_neighbor_tris"; + diff --git a/include/assets/bin/title_screen_bg.h b/include/assets/bin/title_screen_bg.h index 6d8e7671..d3d53aa7 100644 --- a/include/assets/bin/title_screen_bg.h +++ b/include/assets/bin/title_screen_bg.h @@ -1,5 +1,7 @@ #pragma once +#include "sm64.h" + static const ALIGN_ASSET(2) char title_screen_bg_vertex_0A000000[] = "__OTR__bin/title_screen_bg/title_screen_bg_vertex_0A000000"; static const ALIGN_ASSET(2) char title_screen_bg_dl_0A000100[] = "__OTR__bin/title_screen_bg/title_screen_bg_dl_0A000100"; diff --git a/include/assets/levels/intro.h b/include/assets/levels/intro.h index 54d25710..a33d2093 100644 --- a/include/assets/levels/intro.h +++ b/include/assets/levels/intro.h @@ -126,10 +126,174 @@ static const ALIGN_ASSET(2) char intro_seg7_vtx_33C0[] = "__OTR__levels/intro/in static const ALIGN_ASSET(2) char intro_seg7_vtx_34A0[] = "__OTR__levels/intro/intro_seg7_vtx_34A0"; +static const ALIGN_ASSET(2) char intro_seg7_vtx_3500[] = "__OTR__levels/intro/intro_seg7_vtx_3500"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_35F0[] = "__OTR__levels/intro/intro_seg7_vtx_35F0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_36D0[] = "__OTR__levels/intro/intro_seg7_vtx_36D0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_37D0[] = "__OTR__levels/intro/intro_seg7_vtx_37D0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_38B0[] = "__OTR__levels/intro/intro_seg7_vtx_38B0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_39A0[] = "__OTR__levels/intro/intro_seg7_vtx_39A0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_3A90[] = "__OTR__levels/intro/intro_seg7_vtx_3A90"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_3B90[] = "__OTR__levels/intro/intro_seg7_vtx_3B90"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_3C70[] = "__OTR__levels/intro/intro_seg7_vtx_3C70"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_3D60[] = "__OTR__levels/intro/intro_seg7_vtx_3D60"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_3E50[] = "__OTR__levels/intro/intro_seg7_vtx_3E50"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_3F40[] = "__OTR__levels/intro/intro_seg7_vtx_3F40"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_4020[] = "__OTR__levels/intro/intro_seg7_vtx_4020"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_4120[] = "__OTR__levels/intro/intro_seg7_vtx_4120"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_4200[] = "__OTR__levels/intro/intro_seg7_vtx_4200"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_42E0[] = "__OTR__levels/intro/intro_seg7_vtx_42E0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_43E0[] = "__OTR__levels/intro/intro_seg7_vtx_43E0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_44C0[] = "__OTR__levels/intro/intro_seg7_vtx_44C0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_45B0[] = "__OTR__levels/intro/intro_seg7_vtx_45B0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_46B0[] = "__OTR__levels/intro/intro_seg7_vtx_46B0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_47A0[] = "__OTR__levels/intro/intro_seg7_vtx_47A0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_4880[] = "__OTR__levels/intro/intro_seg7_vtx_4880"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_4970[] = "__OTR__levels/intro/intro_seg7_vtx_4970"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_4A60[] = "__OTR__levels/intro/intro_seg7_vtx_4A60"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_4B50[] = "__OTR__levels/intro/intro_seg7_vtx_4B50"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_4C40[] = "__OTR__levels/intro/intro_seg7_vtx_4C40"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_4D30[] = "__OTR__levels/intro/intro_seg7_vtx_4D30"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_4E30[] = "__OTR__levels/intro/intro_seg7_vtx_4E30"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_4F20[] = "__OTR__levels/intro/intro_seg7_vtx_4F20"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_5010[] = "__OTR__levels/intro/intro_seg7_vtx_5010"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_5100[] = "__OTR__levels/intro/intro_seg7_vtx_5100"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_5200[] = "__OTR__levels/intro/intro_seg7_vtx_5200"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_5300[] = "__OTR__levels/intro/intro_seg7_vtx_5300"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_5400[] = "__OTR__levels/intro/intro_seg7_vtx_5400"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_54E0[] = "__OTR__levels/intro/intro_seg7_vtx_54E0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_55C0[] = "__OTR__levels/intro/intro_seg7_vtx_55C0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_56B0[] = "__OTR__levels/intro/intro_seg7_vtx_56B0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_57A0[] = "__OTR__levels/intro/intro_seg7_vtx_57A0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_58A0[] = "__OTR__levels/intro/intro_seg7_vtx_58A0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_59A0[] = "__OTR__levels/intro/intro_seg7_vtx_59A0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_5A80[] = "__OTR__levels/intro/intro_seg7_vtx_5A80"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_5B80[] = "__OTR__levels/intro/intro_seg7_vtx_5B80"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_5C60[] = "__OTR__levels/intro/intro_seg7_vtx_5C60"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_5D50[] = "__OTR__levels/intro/intro_seg7_vtx_5D50"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_5E30[] = "__OTR__levels/intro/intro_seg7_vtx_5E30"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_5F20[] = "__OTR__levels/intro/intro_seg7_vtx_5F20"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6010[] = "__OTR__levels/intro/intro_seg7_vtx_6010"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6100[] = "__OTR__levels/intro/intro_seg7_vtx_6100"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_61E0[] = "__OTR__levels/intro/intro_seg7_vtx_61E0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_62D0[] = "__OTR__levels/intro/intro_seg7_vtx_62D0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_63C0[] = "__OTR__levels/intro/intro_seg7_vtx_63C0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_64B0[] = "__OTR__levels/intro/intro_seg7_vtx_64B0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_65B0[] = "__OTR__levels/intro/intro_seg7_vtx_65B0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6690[] = "__OTR__levels/intro/intro_seg7_vtx_6690"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6770[] = "__OTR__levels/intro/intro_seg7_vtx_6770"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6850[] = "__OTR__levels/intro/intro_seg7_vtx_6850"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6940[] = "__OTR__levels/intro/intro_seg7_vtx_6940"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6A30[] = "__OTR__levels/intro/intro_seg7_vtx_6A30"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6AC0[] = "__OTR__levels/intro/intro_seg7_vtx_6AC0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6BC0[] = "__OTR__levels/intro/intro_seg7_vtx_6BC0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6CC0[] = "__OTR__levels/intro/intro_seg7_vtx_6CC0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6DC0[] = "__OTR__levels/intro/intro_seg7_vtx_6DC0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6EB0[] = "__OTR__levels/intro/intro_seg7_vtx_6EB0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_6FB0[] = "__OTR__levels/intro/intro_seg7_vtx_6FB0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_70B0[] = "__OTR__levels/intro/intro_seg7_vtx_70B0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_71A0[] = "__OTR__levels/intro/intro_seg7_vtx_71A0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7280[] = "__OTR__levels/intro/intro_seg7_vtx_7280"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7370[] = "__OTR__levels/intro/intro_seg7_vtx_7370"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7470[] = "__OTR__levels/intro/intro_seg7_vtx_7470"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7560[] = "__OTR__levels/intro/intro_seg7_vtx_7560"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7650[] = "__OTR__levels/intro/intro_seg7_vtx_7650"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7740[] = "__OTR__levels/intro/intro_seg7_vtx_7740"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7830[] = "__OTR__levels/intro/intro_seg7_vtx_7830"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7920[] = "__OTR__levels/intro/intro_seg7_vtx_7920"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7A20[] = "__OTR__levels/intro/intro_seg7_vtx_7A20"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7B20[] = "__OTR__levels/intro/intro_seg7_vtx_7B20"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7C10[] = "__OTR__levels/intro/intro_seg7_vtx_7C10"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7CF0[] = "__OTR__levels/intro/intro_seg7_vtx_7CF0"; + +static const ALIGN_ASSET(2) char intro_seg7_vtx_7DF0[] = "__OTR__levels/intro/intro_seg7_vtx_7DF0"; + static const ALIGN_ASSET(2) char intro_seg7_texture_07007EA0[] = "__OTR__levels/intro/0"; static const ALIGN_ASSET(2) char intro_seg7_texture_070086A0[] = "__OTR__levels/intro/1"; +static const ALIGN_ASSET(2) char intro_seg7_dl_07008EA0[] = "__OTR__levels/intro/intro_seg7_dl_07008EA0"; + +static const ALIGN_ASSET(2) char intro_seg7_dl_07009E38[] = "__OTR__levels/intro/intro_seg7_dl_07009E38"; + +static const ALIGN_ASSET(2) char intro_seg7_gfx_ADC0[] = "__OTR__levels/intro/intro_seg7_gfx_ADC0"; + static const ALIGN_ASSET(2) char intro_seg7_dl_0700B3A0[] = "__OTR__levels/intro/intro_seg7_dl_0700B3A0"; static const ALIGN_ASSET(2) char intro_seg7_vtx_B420[] = "__OTR__levels/intro/intro_seg7_vtx_B420"; diff --git a/include/assets/textures/effect.h b/include/assets/textures/effect.h index a7b23e85..bad2a79b 100644 --- a/include/assets/textures/effect.h +++ b/include/assets/textures/effect.h @@ -8,6 +8,8 @@ static const ALIGN_ASSET(2) char effect_0B001008[] = "__OTR__textures/effect/flo static const ALIGN_ASSET(2) char effect_0B001808[] = "__OTR__textures/effect/flower.01808"; +static const char flower_bubbles_textures_ptr_0B002008[] = "__OTR__textures/effect/flower_bubbles_textures_ptr_0B002008"; + static const ALIGN_ASSET(2) char effect_0B002020[] = "__OTR__textures/effect/lava_bubble.02020"; static const ALIGN_ASSET(2) char effect_0B002820[] = "__OTR__textures/effect/lava_bubble.02820"; @@ -24,8 +26,12 @@ static const ALIGN_ASSET(2) char effect_0B005020[] = "__OTR__textures/effect/lav static const ALIGN_ASSET(2) char effect_0B005820[] = "__OTR__textures/effect/lava_bubble.05820"; +static const char lava_bubble_ptr_0B006020[] = "__OTR__textures/effect/lava_bubble_ptr_0B006020"; + static const ALIGN_ASSET(2) char effect_0B006048[] = "__OTR__textures/effect/bubble.06048"; +static const char bubble_ptr_0B006848[] = "__OTR__textures/effect/bubble_ptr_0B006848"; + static const ALIGN_ASSET(2) char effect_0B00684C[] = "__OTR__textures/effect/tiny_bubble.0684C"; static const ALIGN_ASSET(2) char effect_0B006AD8[] = "__OTR__textures/effect/tiny_bubble.06AD8"; diff --git a/include/assets/textures/title_screen_bg.h b/include/assets/textures/title_screen_bg.h index bb2c3760..4b2559f5 100644 --- a/include/assets/textures/title_screen_bg.h +++ b/include/assets/textures/title_screen_bg.h @@ -16,3 +16,7 @@ static const ALIGN_ASSET(2) char title_texture_0A004CC0[] = "__OTR__textures/tit static const ALIGN_ASSET(2) char title_texture_0A005940[] = "__OTR__textures/title_screen_bg/title_screen_bg.05940"; +static const char mario_title_texture_table[] = "__OTR__textures/title_screen_bg/mario_title_texture_table"; + +static const char game_over_texture_table[] = "__OTR__textures/title_screen_bg/game_over_texture_table"; + diff --git a/include/textures.h b/include/textures.h index 771f164e..7089b0a9 100644 --- a/include/textures.h +++ b/include/textures.h @@ -5,277 +5,47 @@ #include // cave -extern const u8 cave_09000000[]; -extern const u8 cave_09001000[]; -extern const u8 cave_09001800[]; -extern const u8 cave_09002800[]; -extern const u8 cave_09003000[]; -extern const u8 cave_09003800[]; -extern const u8 cave_09004800[]; -extern const u8 cave_09005800[]; -extern const u8 cave_09006800[]; -extern const u8 cave_09007000[]; -extern const u8 cave_09007800[]; -extern const u8 cave_09008800[]; -extern const u8 cave_09009800[]; -extern const u8 cave_0900A000[]; -extern const u8 cave_0900A800[]; -extern const u8 cave_0900B800[]; -extern const u8 cave_0900C000[]; +#include "assets/textures/cave.h" // fire -extern const u8 fire_09000000[]; -extern const u8 fire_09000800[]; -extern const u8 fire_09001000[]; -extern const u8 fire_09001800[]; -extern const u8 fire_09002000[]; -extern const u8 fire_09002800[]; -extern const u8 fire_09003000[]; -extern const u8 fire_09003800[]; -extern const u8 fire_09004000[]; -extern const u8 fire_09004800[]; -extern const u8 fire_09005000[]; -extern const u8 fire_09005800[]; -extern const u8 fire_09006000[]; -extern const u8 fire_09006800[]; -extern const u8 fire_09007000[]; -extern const u8 fire_09007800[]; -extern const u8 fire_09008000[]; -extern const u8 fire_09008800[]; -extern const u8 fire_09009000[]; -extern const u8 fire_09009800[]; -extern const u8 fire_0900A000[]; -extern const u8 fire_0900A800[]; -extern const u8 fire_0900B000[]; -extern const u8 fire_0900B800[]; +#include "assets/textures/fire.h" // generic -extern const u8 generic_09000000[]; -extern const u8 generic_09000800[]; -extern const u8 generic_09001000[]; -extern const u8 generic_09001800[]; -extern const u8 generic_09002000[]; -extern const u8 generic_09002800[]; -extern const u8 generic_09003000[]; -extern const u8 generic_09003800[]; -extern const u8 generic_09004000[]; -extern const u8 generic_09004800[]; -extern const u8 generic_09005000[]; -extern const u8 generic_09005800[]; -extern const u8 generic_09006000[]; -extern const u8 generic_09007000[]; -extern const u8 generic_09007800[]; -extern const u8 generic_09008000[]; -extern const u8 generic_09008800[]; -extern const u8 generic_09009000[]; -extern const u8 generic_09009800[]; -extern const u8 generic_0900A000[]; -extern const u8 generic_0900A800[]; -extern const u8 generic_0900B000[]; +#include "assets/textures/generic.h" // grass -extern const u8 grass_09000000[]; -extern const u8 grass_09000800[]; -extern const u8 grass_09001000[]; -extern const u8 grass_09001800[]; -extern const u8 grass_09002000[]; -extern const u8 grass_09002800[]; -extern const u8 grass_09003000[]; -extern const u8 grass_09003800[]; -extern const u8 grass_09004000[]; -extern const u8 grass_09004800[]; -extern const u8 grass_09005000[]; -extern const u8 grass_09005800[]; -extern const u8 grass_09006000[]; -extern const u8 grass_09006800[]; -extern const u8 grass_09007000[]; -extern const u8 grass_09007800[]; -extern const u8 grass_09008000[]; -extern const u8 grass_09008800[]; -extern const u8 grass_09009000[]; -extern const u8 grass_09009800[]; -extern const u8 grass_0900A000[]; -extern const u8 grass_0900A800[]; -extern const u8 grass_0900B000[]; -extern const u8 grass_0900B800[]; +#include "assets/textures/grass.h" // inside -extern const u8 inside_09000000[]; -extern const u8 inside_09001000[]; -extern const u8 inside_09002000[]; -extern const u8 inside_09003000[]; -extern const u8 inside_09003800[]; -extern const u8 inside_09004000[]; -extern const u8 inside_09004800[]; -extern const u8 inside_09005000[]; -extern const u8 inside_09005800[]; -extern const u8 inside_09006000[]; -extern const u8 inside_09007000[]; -extern const u8 inside_09008000[]; -extern const u8 inside_09008800[]; -extern const u8 inside_09009000[]; -extern const u8 inside_0900A000[]; -extern const u8 inside_0900B000[]; -extern const u8 inside_0900B800[]; +#include "assets/textures/inside.h" // machine -extern const u8 machine_09000000[]; -extern const u8 machine_09000800[]; -extern const u8 machine_09001000[]; -extern const u8 machine_09001800[]; -extern const u8 machine_09002000[]; -extern const u8 machine_09002800[]; -extern const u8 machine_09003000[]; -extern const u8 machine_09003800[]; -extern const u8 machine_09004000[]; -extern const u8 machine_09005000[]; -extern const u8 machine_09005800[]; -extern const u8 machine_09006000[]; -extern const u8 machine_09006800[]; -extern const u8 machine_09007000[]; -extern const u8 machine_09007800[]; -extern const u8 machine_09008000[]; -extern const u8 machine_09008400[]; +#include "assets/textures/machine.h" // mountain -extern const u8 mountain_09000000[]; -extern const u8 mountain_09000800[]; -extern const u8 mountain_09001800[]; -extern const u8 mountain_09002800[]; -extern const u8 mountain_09003000[]; -extern const u8 mountain_09003800[]; -extern const u8 mountain_09004000[]; -extern const u8 mountain_09004800[]; -extern const u8 mountain_09005000[]; -extern const u8 mountain_09005800[]; -extern const u8 mountain_09006800[]; -extern const u8 mountain_09007000[]; -extern const u8 mountain_09007800[]; -extern const u8 mountain_09008000[]; -extern const u8 mountain_09008800[]; -extern const u8 mountain_09009800[]; -extern const u8 mountain_0900A000[]; -extern const u8 mountain_0900A800[]; -extern const u8 mountain_0900B000[]; -extern const u8 mountain_0900B800[]; -extern const u8 mountain_0900C000[]; +#include "assets/textures/mountain.h" // outside -extern const u8 outside_09000000[]; -extern const u8 outside_09000800[]; -extern const u8 outside_09001000[]; -extern const u8 outside_09002000[]; -extern const u8 outside_09003000[]; -extern const u8 outside_09003800[]; -extern const u8 outside_09004000[]; -extern const u8 outside_09004800[]; -extern const u8 outside_09005800[]; -extern const u8 outside_09006000[]; -extern const u8 outside_09006800[]; -extern const u8 outside_09007800[]; -extern const u8 outside_09008000[]; -extern const u8 outside_09008800[]; -extern const u8 outside_09009000[]; -extern const u8 outside_09009800[]; -extern const u8 outside_0900A000[]; -extern const u8 outside_0900A800[]; -extern const u8 outside_0900B000[]; -extern const u8 outside_0900B400[]; -extern const u8 outside_0900BC00[]; +#include "assets/textures/outside.h" // sky -extern const u8 sky_09000000[]; -extern const u8 sky_09000800[]; -extern const u8 sky_09001000[]; -extern const u8 sky_09001800[]; -extern const u8 sky_09002000[]; -extern const u8 sky_09003000[]; -extern const u8 sky_09003800[]; -extern const u8 sky_09004800[]; -extern const u8 sky_09005000[]; -extern const u8 sky_09005800[]; -extern const u8 sky_09006000[]; -extern const u8 texture_metal_hole[]; -extern const u8 sky_09007000[]; -extern const u8 sky_09007800[]; -extern const u8 sky_09008000[]; +#include "assets/textures/sky.h" // snow -extern const u8 snow_09000000[]; -extern const u8 snow_09000800[]; -extern const u8 snow_09001000[]; -extern const u8 snow_09002000[]; -extern const u8 snow_09002800[]; -extern const u8 snow_09003000[]; -extern const u8 snow_09003800[]; -extern const u8 snow_09004000[]; -extern const u8 snow_09004800[]; -extern const u8 snow_09005000[]; -extern const u8 snow_09005800[]; -extern const u8 snow_09006000[]; -extern const u8 snow_09006800[]; -extern const u8 snow_09007000[]; -extern const u8 snow_09008000[]; -extern const u8 snow_09008800[]; -extern const u8 snow_09009000[]; -extern const u8 snow_09009800[]; +#include "assets/textures/snow.h" // spooky -extern const u8 spooky_09000000[]; -extern const u8 spooky_09000800[]; -extern const u8 spooky_09001000[]; -extern const u8 spooky_09001800[]; -extern const u8 spooky_09002800[]; -extern const u8 spooky_09003800[]; -extern const u8 spooky_09004800[]; -extern const u8 spooky_09005000[]; -extern const u8 spooky_09006000[]; -extern const u8 spooky_09006800[]; -extern const u8 spooky_09007000[]; -extern const u8 spooky_09008000[]; -extern const u8 spooky_09008800[]; -extern const u8 spooky_09009000[]; -extern const u8 spooky_0900A000[]; -extern const u8 spooky_0900A800[]; -extern const u8 spooky_0900B000[]; -extern const u8 spooky_0900B800[]; +#include "assets/textures/spooky.h" // water -extern const u8 water_09000000[]; -extern const u8 water_09000800[]; -extern const u8 water_09001800[]; -extern const u8 water_09002800[]; -extern const u8 water_09003800[]; -extern const u8 water_09004800[]; -extern const u8 water_09005800[]; -extern const u8 water_09006000[]; -extern const u8 water_09006800[]; -extern const u8 water_09007800[]; -extern const u8 water_09008800[]; -extern const u8 water_09009000[]; -extern const u8 water_0900A000[]; -extern const u8 water_0900A800[]; -extern const u8 water_0900B800[]; +#include "assets/textures/water.h" // effect -extern const u8 *const flower_bubbles_textures_ptr_0B002008[]; -extern const u8 *const lava_bubble_ptr_0B006020[]; -extern const u8 *const bubble_ptr_0B006848[]; -extern const Gfx tiny_bubble_dl_0B006A50[]; -extern const Gfx tiny_bubble_dl_0B006AB0[]; -extern const Gfx tiny_bubble_dl_0B006CD8[]; -extern const Gfx tiny_bubble_dl_0B006D38[]; -extern const Gfx tiny_bubble_dl_0B006D68[]; +#include "assets/textures/effect.h" +#include "assets/bin/effect.h" // title_screen_bg -extern const Gfx title_screen_bg_dl_0A000100[]; -extern const Gfx title_screen_bg_dl_0A000118[]; -extern const Gfx title_screen_bg_dl_0A000130[]; -extern const Gfx title_screen_bg_dl_0A000148[]; -extern const Gfx title_screen_bg_dl_0A000160[]; -extern const Gfx title_screen_bg_dl_0A000178[]; -extern const Gfx title_screen_bg_dl_0A000190[]; -extern const u8 *const mario_title_texture_table[]; -extern const u8 *const game_over_texture_table[]; +#include "assets/textures/title_screen_bg.h" +#include "assets/bin/title_screen_bg.h" #endif // TEXTURES_H diff --git a/src/engine/behavior_script.c b/src/engine/behavior_script.c index f71022e7..c7093b9e 100644 --- a/src/engine/behavior_script.c +++ b/src/engine/behavior_script.c @@ -525,7 +525,7 @@ static s32 bhv_cmd_load_animations(void) { u8 field = BHV_CMD_GET_2ND_U8(0); void* anims = BHV_CMD_GET_VPTR(1); - cur_obj_set_vptr(field, LOAD_ASSET(anims)); + cur_obj_set_vptr(field, segmented_to_virtual(anims)); gCurBhvCommand += 2; return BHV_PROC_CONTINUE; @@ -731,7 +731,7 @@ static s32 bhv_cmd_set_int_random_from_table(void) { // Command 0x2A: Loads collision data for the object. // Usage: LOAD_COLLISION_DATA(collisionData) static s32 bhv_cmd_load_collision_data(void) { - u32 *collisionData = LOAD_ASSET(BHV_CMD_GET_VPTR(1)); + u32 *collisionData = segmented_to_virtual(BHV_CMD_GET_VPTR(1)); gCurrentObject->collisionData = collisionData; diff --git a/src/engine/level_script.c b/src/engine/level_script.c index 9f835eb8..3f5ce113 100644 --- a/src/engine/level_script.c +++ b/src/engine/level_script.c @@ -94,7 +94,7 @@ static void level_cmd_load_and_execute(void) { *sStackTop++ = (uintptr_t) sStackBase; sStackBase = sStackTop; - sCurrentCmd = LOAD_ASSET(CMD_GET(void *, 12)); + sCurrentCmd = segmented_to_virtual(CMD_GET(void *, 12)); } static void level_cmd_exit_and_execute(void) { @@ -107,7 +107,7 @@ static void level_cmd_exit_and_execute(void) { MEMORY_POOL_LEFT); sStackTop = sStackBase; - sCurrentCmd = LOAD_ASSET(targetAddr); + sCurrentCmd = segmented_to_virtual(targetAddr); } static void level_cmd_exit(void) { @@ -141,12 +141,12 @@ static void level_cmd_sleep2(void) { } static void level_cmd_jump(void) { - sCurrentCmd = LOAD_ASSET(CMD_GET(void *, 4)); + sCurrentCmd = segmented_to_virtual(CMD_GET(void *, 4)); } static void level_cmd_jump_and_link(void) { *sStackTop++ = (uintptr_t) NEXT_CMD; - sCurrentCmd = LOAD_ASSET(CMD_GET(void *, 4)); + sCurrentCmd = segmented_to_virtual(CMD_GET(void *, 4)); } static void level_cmd_return(void) { @@ -190,7 +190,7 @@ static void level_cmd_loop_until(void) { static void level_cmd_jump_if(void) { if (eval_script_op(CMD_GET(u8, 2), CMD_GET(s32, 4)) != 0) { - sCurrentCmd = LOAD_ASSET(CMD_GET(void *, 8)); + sCurrentCmd = segmented_to_virtual(CMD_GET(void *, 8)); } else { sCurrentCmd = CMD_NEXT; } @@ -199,7 +199,7 @@ static void level_cmd_jump_if(void) { static void level_cmd_jump_and_link_if(void) { if (eval_script_op(CMD_GET(u8, 2), CMD_GET(s32, 4)) != 0) { *sStackTop++ = (uintptr_t) NEXT_CMD; - sCurrentCmd = LOAD_ASSET(CMD_GET(void *, 8)); + sCurrentCmd = segmented_to_virtual(CMD_GET(void *, 8)); } else { sCurrentCmd = CMD_NEXT; } @@ -610,7 +610,7 @@ static void level_cmd_set_terrain_data(void) { static void level_cmd_set_rooms(void) { if (sCurrAreaIndex != -1) { - gAreas[sCurrAreaIndex].surfaceRooms = LOAD_ASSET(CMD_GET(void *, 4)); + gAreas[sCurrAreaIndex].surfaceRooms = segmented_to_virtual(CMD_GET(void *, 4)); } sCurrentCmd = CMD_NEXT; } diff --git a/src/engine/math_util.c b/src/engine/math_util.c index 86782b7e..0cc9df02 100644 --- a/src/engine/math_util.c +++ b/src/engine/math_util.c @@ -312,7 +312,7 @@ void mtxf_rotate_zxy_and_translate(Mat4 dest, Vec3f translate, Vec3s rotate) { */ void mtxf_rotate_xyz_and_translate(Mat4 dest, Vec3f b, Vec3s c) { // TODO: FrameInterpolation is broken, fix it - // FrameInterpolation_RecordMatrixPosRotXYZ(dest, b, c); + FrameInterpolation_RecordMatrixPosRotXYZ(dest, b, c); register f32 sx = sins(c[0]); register f32 cx = coss(c[0]); @@ -500,7 +500,7 @@ void mtxf_align_terrain_triangle(Mat4 mtx, Vec3f pos, s16 yaw, f32 radius) { */ void mtxf_mul(Mat4 dest, Mat4 a, Mat4 b) { // TODO: FrameInterpolation is broken, fix it - // FrameInterpolation_RecordMatrixMult(dest, dest, 0); + FrameInterpolation_RecordMatrixMult(dest, dest, 0); Mat4 temp; register f32 entry0; register f32 entry1; diff --git a/src/engine/surface_load.c b/src/engine/surface_load.c index 861399aa..8deed46e 100644 --- a/src/engine/surface_load.c +++ b/src/engine/surface_load.c @@ -761,7 +761,7 @@ void load_object_collision_model(void) { UNUSED u8 filler[4]; s16 vertexData[600]; - s16 *collisionData = LOAD_ASSET(gCurrentObject->collisionData); + s16 *collisionData = segmented_to_virtual(gCurrentObject->collisionData); f32 marioDist = gCurrentObject->oDistanceToMario; f32 tangibleDist = gCurrentObject->oCollisionDistance; diff --git a/src/game/behaviors/platform_on_track.inc.c b/src/game/behaviors/platform_on_track.inc.c index 41aaef9a..51007e62 100644 --- a/src/game/behaviors/platform_on_track.inc.c +++ b/src/game/behaviors/platform_on_track.inc.c @@ -64,9 +64,9 @@ void bhv_platform_on_track_init(void) { o->oPlatformOnTrackIsNotSkiLift = o->oPlatformOnTrackType - PLATFORM_ON_TRACK_TYPE_SKI_LIFT; o->collisionData = - LOAD_ASSET(sPlatformOnTrackCollisionModels[o->oPlatformOnTrackType]); + segmented_to_virtual(sPlatformOnTrackCollisionModels[o->oPlatformOnTrackType]); - o->oPlatformOnTrackStartWaypoint = LOAD_ASSET(sPlatformOnTrackPaths[pathIndex]); + o->oPlatformOnTrackStartWaypoint = segmented_to_virtual(sPlatformOnTrackPaths[pathIndex]); o->oPlatformOnTrackIsNotHMC = pathIndex - 4; diff --git a/src/game/envfx_bubbles.c b/src/game/envfx_bubbles.c index 0ed7a49f..8ee78687 100644 --- a/src/game/envfx_bubbles.c +++ b/src/game/envfx_bubbles.c @@ -458,8 +458,7 @@ void envfx_set_bubble_texture(s32 mode, s16 index) { } gDPSetTextureImage(sGfxCursor++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, *(imageArr + frame)); - // TORCH-TODO: Export and fix this - gSPDisplayList(sGfxCursor++, &tiny_bubble_dl_0B006D68); + gSPDisplayList(sGfxCursor++, tiny_bubble_dl_0B006D68); } /** @@ -486,8 +485,7 @@ Gfx *envfx_update_bubble_particles(s32 mode, UNUSED Vec3s marioPos, Vec3s camFro envfx_bubbles_update_switch(mode, camTo, vertex1, vertex2, vertex3); rotate_triangle_vertices(vertex1, vertex2, vertex3, pitch, yaw); - // TORCH-TODO: Export and fix this - gSPDisplayList(sGfxCursor++, &tiny_bubble_dl_0B006D38); + gSPDisplayList(sGfxCursor++, tiny_bubble_dl_0B006D38); for (i = 0; i < sBubbleParticleMaxCount; i += 5) { gDPPipeSync(sGfxCursor++); @@ -500,8 +498,7 @@ Gfx *envfx_update_bubble_particles(s32 mode, UNUSED Vec3s marioPos, Vec3s camFro gSP1Triangle(sGfxCursor++, 12, 13, 14, 0); } - // TORCH-TODO: Export and fix this - gSPDisplayList(sGfxCursor++, &tiny_bubble_dl_0B006AB0); + gSPDisplayList(sGfxCursor++, tiny_bubble_dl_0B006AB0); gSPEndDisplayList(sGfxCursor++); return gfxStart; diff --git a/src/game/envfx_snow.c b/src/game/envfx_snow.c index 62361c60..1c0ba2d1 100644 --- a/src/game/envfx_snow.c +++ b/src/game/envfx_snow.c @@ -12,6 +12,7 @@ #include "engine/behavior_script.h" #include "audio/external.h" #include "obj_behaviors.h" +#include "assets/bin/effect.h" /** * This file contains the function that handles 'environment effects', @@ -51,10 +52,6 @@ struct SnowFlakeVertex gSnowFlakeVertex1 = { -5, 5, 0 }; struct SnowFlakeVertex gSnowFlakeVertex2 = { -5, -5, 0 }; struct SnowFlakeVertex gSnowFlakeVertex3 = { 5, 5, 0 }; -extern void *tiny_bubble_dl_0B006AB0; -extern void *tiny_bubble_dl_0B006A50; -extern void *tiny_bubble_dl_0B006CD8; - /** * Initialize snow particles by allocating a buffer for storing their state * and setting a start amount. @@ -442,9 +439,9 @@ Gfx *envfx_update_snow(s32 snowMode, Vec3s marioPos, Vec3s camFrom, Vec3s camTo) rotate_triangle_vertices((f32 *) &vertex1, (f32 *) &vertex2, (f32 *) &vertex3, pitch, yaw); if (snowMode == ENVFX_SNOW_NORMAL || snowMode == ENVFX_SNOW_BLIZZARD) { - gSPDisplayList(gfx++, &tiny_bubble_dl_0B006A50); // snowflake with gray edge + gSPDisplayList(gfx++, tiny_bubble_dl_0B006A50); // snowflake with gray edge } else if (snowMode == ENVFX_SNOW_WATER) { - gSPDisplayList(gfx++, &tiny_bubble_dl_0B006CD8); // snowflake with blue edge + gSPDisplayList(gfx++, tiny_bubble_dl_0B006CD8); // snowflake with blue edge } for (i = 0; i < gSnowParticleCount; i += 5) { @@ -457,8 +454,7 @@ Gfx *envfx_update_snow(s32 snowMode, Vec3s marioPos, Vec3s camFrom, Vec3s camTo) gSP1Triangle(gfx++, 12, 13, 14, 0); } - // TORCH-TODO: Export and fix this - gSPDisplayList(gfx++, &tiny_bubble_dl_0B006AB0); + gSPDisplayList(gfx++, tiny_bubble_dl_0B006AB0); gSPEndDisplayList(gfx++); return gfxStart; diff --git a/src/game/moving_texture.c b/src/game/moving_texture.c index 2af14fd9..88c83a53 100644 --- a/src/game/moving_texture.c +++ b/src/game/moving_texture.c @@ -449,10 +449,10 @@ Gfx *movtex_gen_from_quad(s16 y, struct MovtexQuad *quad) { if (textureId != gMovetexLastTextureId) { switch (textureId) { case TEXTURE_MIST: // an ia16 texture - gLoadBlockTexture(gfx++, 32, 32, G_IM_FMT_IA, LOAD_ASSET(gMovtexIdToTexture[textureId])); + gLoadBlockTexture(gfx++, 32, 32, G_IM_FMT_IA, segmented_to_virtual(gMovtexIdToTexture[textureId])); break; default: // any rgba16 texture - gLoadBlockTexture(gfx++, 32, 32, G_IM_FMT_RGBA, LOAD_ASSET(gMovtexIdToTexture[textureId])); + gLoadBlockTexture(gfx++, 32, 32, G_IM_FMT_RGBA, segmented_to_virtual(gMovtexIdToTexture[textureId])); break; } gMovetexLastTextureId = textureId; @@ -470,7 +470,7 @@ Gfx *movtex_gen_from_quad(s16 y, struct MovtexQuad *quad) { * is the number of entries, followed by that number of MovtexQuad structs. */ Gfx *movtex_gen_from_quad_array(s16 y, void *quadArrSegmented) { - s16 *quadArr = LOAD_ASSET(quadArrSegmented); + s16 *quadArr = segmented_to_virtual(quadArrSegmented); s16 numLists = quadArr[0]; Gfx *gfxHead = alloc_display_list((numLists + 1) * sizeof(*gfxHead)); Gfx *gfx = gfxHead; @@ -501,7 +501,7 @@ Gfx *movtex_gen_from_quad_array(s16 y, void *quadArrSegmented) { * that will be searched. */ Gfx *movtex_gen_quads_id(s16 id, s16 y, void *movetexQuadsSegmented) { - struct MovtexQuadCollection *collection = LOAD_ASSET(movetexQuadsSegmented); + struct MovtexQuadCollection *collection = segmented_to_virtual(movetexQuadsSegmented); s32 i = 0; while (collection[i].id != -1) { @@ -848,7 +848,7 @@ Gfx *geo_movtex_draw_nocolor(s32 callContext, struct GraphNode *node, UNUSED Mat if (gMovtexNonColored[i].geoId == asGenerated->parameter) { asGenerated->fnNode.node.flags = (asGenerated->fnNode.node.flags & 0xFF) | (gMovtexNonColored[i].layer << 8); - movtexVerts = LOAD_ASSET(gMovtexNonColored[i].movtexVerts); + movtexVerts = segmented_to_virtual(gMovtexNonColored[i].movtexVerts); update_moving_texture_offset(movtexVerts, MOVTEX_ATTR_NOCOLOR_S); gfx = movtex_gen_list(movtexVerts, &gMovtexNonColored[i], MOVTEX_LAYOUT_NOCOLOR); // no perVertex colors @@ -876,7 +876,7 @@ Gfx *geo_movtex_draw_colored(s32 callContext, struct GraphNode *node, UNUSED Mat if (gMovtexColored[i].geoId == asGenerated->parameter) { asGenerated->fnNode.node.flags = (asGenerated->fnNode.node.flags & 0xFF) | (gMovtexColored[i].layer << 8); - movtexVerts = LOAD_ASSET(gMovtexColored[i].movtexVerts); + movtexVerts = segmented_to_virtual(gMovtexColored[i].movtexVerts); update_moving_texture_offset(movtexVerts, MOVTEX_ATTR_COLORED_S); gfx = movtex_gen_list(movtexVerts, &gMovtexColored[i], MOVTEX_LAYOUT_COLORED); break; @@ -907,7 +907,7 @@ Gfx *geo_movtex_draw_colored_no_update(s32 callContext, struct GraphNode *node, if (gMovtexColored[i].geoId == asGenerated->parameter) { asGenerated->fnNode.node.flags = (asGenerated->fnNode.node.flags & 0xFF) | (gMovtexColored[i].layer << 8); - movtexVerts = LOAD_ASSET(gMovtexColored[i].movtexVerts); + movtexVerts = segmented_to_virtual(gMovtexColored[i].movtexVerts); gfx = movtex_gen_list(movtexVerts, &gMovtexColored[i], MOVTEX_LAYOUT_COLORED); break; } @@ -934,7 +934,7 @@ Gfx *geo_movtex_draw_colored_2_no_update(s32 callContext, struct GraphNode *node if (gMovtexColored2[i].geoId == asGenerated->parameter) { asGenerated->fnNode.node.flags = (asGenerated->fnNode.node.flags & 0xFF) | (gMovtexColored2[i].layer << 8); - movtexVerts = LOAD_ASSET(gMovtexColored2[i].movtexVerts); + movtexVerts = segmented_to_virtual(gMovtexColored2[i].movtexVerts); gfx = movtex_gen_list(movtexVerts, &gMovtexColored2[i], MOVTEX_LAYOUT_COLORED); break; } diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c index b88bec68..d1289dfc 100644 --- a/src/game/object_helpers.c +++ b/src/game/object_helpers.c @@ -706,25 +706,25 @@ void cur_obj_scale(f32 scale) { } void cur_obj_init_animation(s32 animIndex) { - struct Animation **anims = LOAD_ASSET(o->oAnimations); + struct Animation **anims = segmented_to_virtual(o->oAnimations); geo_obj_init_animation(&o->header.gfx, &anims[animIndex]); } void cur_obj_init_animation_with_sound(s32 animIndex) { - struct Animation **anims = LOAD_ASSET(o->oAnimations); + struct Animation **anims = segmented_to_virtual(o->oAnimations); geo_obj_init_animation(&o->header.gfx, &anims[animIndex]); o->oSoundStateID = animIndex; } void cur_obj_init_animation_with_accel_and_sound(s32 animIndex, f32 accel) { - struct Animation **anims = LOAD_ASSET(o->oAnimations); + struct Animation **anims = segmented_to_virtual(o->oAnimations); s32 animAccel = (s32)(accel * 65536.0f); geo_obj_init_animation_accel(&o->header.gfx, &anims[animIndex], animAccel); o->oSoundStateID = animIndex; } void obj_init_animation_with_sound(struct Object *obj, const struct Animation * const* animations, s32 animIndex) { - struct Animation **anims = (struct Animation **)LOAD_ASSET(animations); + struct Animation **anims = (struct Animation **)segmented_to_virtual(animations); obj->oAnimations = (struct Animation **)animations; geo_obj_init_animation(&obj->header.gfx, &anims[animIndex]); obj->oSoundStateID = animIndex; diff --git a/src/game/paintings.c b/src/game/paintings.c index dc9cf5e0..9f3c7d8d 100644 --- a/src/game/paintings.c +++ b/src/game/paintings.c @@ -198,7 +198,7 @@ void stop_other_paintings(s16 *idptr, struct Painting *paintingGroup[]) { index = 0; while (paintingGroup[index] != NULL) { - struct Painting *painting = LOAD_ASSET(paintingGroup[index]); + struct Painting *painting = segmented_to_virtual(paintingGroup[index]); // stop all rippling except for the selected painting if (painting->id != id) { @@ -979,8 +979,8 @@ Gfx *painting_ripple_env_mapped(struct Painting *painting) { s16 *textureMap; s16 tWidth = painting->textureWidth; s16 tHeight = painting->textureHeight; - s16 **textureMaps = LOAD_ASSET(painting->textureMaps); - u8 **tArray = LOAD_ASSET(painting->textureArray); + s16 **textureMaps = segmented_to_virtual(painting->textureMaps); + u8 **tArray = segmented_to_virtual(painting->textureArray); Gfx *dlist = alloc_display_list(7 * sizeof(Gfx)); Gfx *gfx = dlist; @@ -993,7 +993,7 @@ Gfx *painting_ripple_env_mapped(struct Painting *painting) { gSPDisplayList(gfx++, painting->rippleDisplayList); // Map the image to the mesh's vertices - textureMap = LOAD_ASSET(textureMaps[0]); + textureMap = segmented_to_virtual(textureMaps[0]); meshVerts = textureMap[0]; meshTris = textureMap[meshVerts * 3 + 1]; gSPDisplayList(gfx++, render_painting(tArray[0], tWidth, tHeight, textureMap, meshVerts, meshTris, painting->alpha)); @@ -1012,8 +1012,8 @@ Gfx *painting_ripple_env_mapped(struct Painting *painting) { * The mesh and vertex normals are regenerated and freed every frame. */ Gfx *display_painting_rippling(struct Painting *painting) { - s16 *mesh = LOAD_ASSET(seg2_painting_triangle_mesh); - s16 *neighborTris = LOAD_ASSET(seg2_painting_mesh_neighbor_tris); + s16 *mesh = segmented_to_virtual(seg2_painting_triangle_mesh); + s16 *neighborTris = segmented_to_virtual(seg2_painting_mesh_neighbor_tris); s16 numVtx = mesh[0]; s16 numTris = mesh[numVtx * 3 + 1]; Gfx *dlist; @@ -1080,7 +1080,7 @@ void reset_painting(struct Painting *painting) { painting->rippleTimer = 0.0f; painting->rippleX = 0.0f; painting->rippleY = 0.0f; - if (painting == LOAD_ASSET(ddd_painting)) { + if (painting == segmented_to_virtual(ddd_painting)) { // Move DDD painting to initial position, in case the animation // that moves the painting stops during level unload. painting->posX = 3456.0f; @@ -1225,7 +1225,7 @@ Gfx *geo_painting_draw(s32 callContext, struct GraphNode *node, UNUSED void *con s32 id = gen->parameter & 0xFF; Gfx *paintingDlist = NULL; struct Painting **paintingGroup = sPaintingGroups[group]; - struct Painting *painting = LOAD_ASSET(paintingGroup[id]); + struct Painting *painting = segmented_to_virtual(paintingGroup[id]); if (callContext != GEO_CONTEXT_RENDER) { reset_painting(painting); diff --git a/src/game/segment2.h b/src/game/segment2.h index 01667a07..8559b094 100644 --- a/src/game/segment2.h +++ b/src/game/segment2.h @@ -7,7 +7,4 @@ #include "assets/bin/segment2.h" #include "assets/textures/segment2.h" -extern u8 seg2_painting_triangle_mesh[]; -extern u8 seg2_painting_mesh_neighbor_tris[]; - #endif // SEGMENT2_H diff --git a/src/menu/intro_geo.c b/src/menu/intro_geo.c index 78043897..a4a2b871 100644 --- a/src/menu/intro_geo.c +++ b/src/menu/intro_geo.c @@ -13,6 +13,7 @@ #include "audio/external.h" #include "gfx_dimensions.h" #include "game/rendering_graph_node.h" +#include "assets/bin/title_screen_bg.h" // frame counts for the zoom in, hold, and zoom out of title model #define INTRO_STEPS_ZOOM_IN 20 @@ -153,14 +154,12 @@ static Gfx *intro_backdrop_one_image(s32 index, s8 *backgroundTable) { Mtx *mtx = alloc_display_list(sizeof(*mtx)); Gfx *displayList = alloc_display_list(36 * sizeof(*displayList)); Gfx *displayListIter = displayList; - // TODO: Fix this for gameover screen - // TORCH-TODO: Export and fix this const u8 *const *vIntroBgTable = segmented_to_virtual(textureTables[backgroundTable[0]]); s32 i; guTranslate(mtx, ((index % num_tiles_h) * 80) + xOffset, (index/num_tiles_h) * 80, 0.0f); gSPMatrix(displayListIter++, mtx, G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_PUSH); - gSPDisplayList(displayListIter++, &title_screen_bg_dl_0A000118); + gSPDisplayList(displayListIter++, title_screen_bg_dl_0A000118); for (i = 0; i < 4; ++i) { gDPLoadTextureBlock(displayListIter++, vIntroBgTable[i], G_IM_FMT_RGBA, G_IM_SIZ_16b, 80, 20, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 6, G_TX_NOLOD, G_TX_NOLOD); @@ -199,12 +198,11 @@ Gfx *geo_intro_regular_backdrop(s32 state, struct GraphNode *node, UNUSED void * dlIter = dl; graphNode->node.flags = (graphNode->node.flags & 0xFF) | (LAYER_OPAQUE << 8); gSPDisplayList(dlIter++, dl_proj_mtx_fullscreen); - // TORCH-TODO: Export and fix this - gSPDisplayList(dlIter++, &title_screen_bg_dl_0A000100); + gSPDisplayList(dlIter++, title_screen_bg_dl_0A000100); for (i = 0; i < num_tiles_h; ++i) { gSPDisplayList(dlIter++, intro_backdrop_one_image(i, backgroundTable)); } - gSPDisplayList(dlIter++, &title_screen_bg_dl_0A000190); + gSPDisplayList(dlIter++, title_screen_bg_dl_0A000190); gSPEndDisplayList(dlIter); } return dl; @@ -258,12 +256,10 @@ Gfx *geo_intro_gameover_backdrop(s32 state, struct GraphNode *node, UNUSED void // draw all the tiles gSPDisplayList(dlIter++, dl_proj_mtx_fullscreen); - // TORCH-TODO: Export and fix this - gSPDisplayList(dlIter++, &title_screen_bg_dl_0A000100); + gSPDisplayList(dlIter++, title_screen_bg_dl_0A000100); for (j = 0; j < ARRAY_COUNT(gameOverBackgroundTable); ++j) gSPDisplayList(dlIter++, intro_backdrop_one_image(j, gameOverBackgroundTable)); - // TORCH-TODO: Export and fix this - gSPDisplayList(dlIter++, &title_screen_bg_dl_0A000190); + gSPDisplayList(dlIter++, title_screen_bg_dl_0A000190); gSPEndDisplayList(dlIter); } return dl; @@ -451,8 +447,7 @@ Gfx *geo_intro_rumble_pak_graphic(s32 state, struct GraphNode *node, UNUSED void dl = alloc_display_list(3 * sizeof(*dl)); if (dl != NULL) { dlIter = dl; - // TORCH-TODO: Export and fix this - gSPDisplayList(dlIter++, &title_screen_bg_dl_0A007548); + gSPDisplayList(dlIter++, title_screen_bg_dl_0A007548); gSPEndDisplayList(dlIter); } } else {