diff --git a/src/game/bondgun.c b/src/game/bondgun.c index a89924242..67f9f1b1c 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -8233,7 +8233,7 @@ void bgun_render(Gfx **gdlptr) weaponnum = bgun_get_weapon_num2(handnum); if (hand->visible) { - gdl = beam_render(gdl, &hand->beam, 0, 0); + gdl = beam_render(gdl, &hand->beam, 0, TEX_BEAM_ORANGE); if (gset_has_weapon_flag(hand->gset.weaponnum, WEAPONFLAG_BRIGHTER)) { gSPSetLights1(gdl++, var80070090); diff --git a/src/game/chr.c b/src/game/chr.c index 58923e050..8a581e69a 100644 --- a/src/game/chr.c +++ b/src/game/chr.c @@ -5598,7 +5598,7 @@ Gfx *shieldhit_render_component(Gfx *gdl, struct shieldhit *hit, struct prop *pr } else { f32 shield; - tex_select(&gdl, &g_TexShieldConfigs[0], 4, 1, 2, true, NULL); + tex_select(&gdl, &g_TexShieldConfigs[TEX_SHIELD_00], 4, 1, 2, true, NULL); if (side >= 0) { shield = hit->shield; diff --git a/src/game/credits.c b/src/game/credits.c index 49a8df54b..8ee51a56f 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -330,18 +330,18 @@ struct creditsbgtype { }; struct creditsbgtype g_CreditsBgTypes[] = { - { 10000, 10000, -200, 0x04, 120, 0 }, - { 1000, 1000, -200, 0x05, 220, 0 }, - { 1000, 10000, -50, 0x06, 220, 0 }, - { 1000, 10000, -200, 0x26, 220, 0 }, - { 500, 10000, -200, 0x26, 520, 0 }, - { 1000, 20000, -50, 0x26, 120, 0 }, - { 10000, 10000, -200, 0x2a, 120, 0 }, - { 10000, 10000, -200, 0x2b, 80, 0 }, - { 10000, 3000, -200, 0x2b, 80, 0 }, - { 3000, 3000, -200, 0x2d, 120, 0 }, - { 10000, 10000, -200, 0x07, 80, 0 }, - { 10000, 1000, -200, 0x2d, 220, 0 }, + { 10000, 10000, -200, TEX_GENERAL_LASERDOT, 120, 0 }, + { 1000, 1000, -200, TEX_GENERAL_05, 220, 0 }, + { 1000, 10000, -50, TEX_GENERAL_MENURAY0, 220, 0 }, + { 1000, 10000, -200, TEX_GENERAL_38, 220, 0 }, + { 500, 10000, -200, TEX_GENERAL_38, 520, 0 }, + { 1000, 20000, -50, TEX_GENERAL_38, 120, 0 }, + { 10000, 10000, -200, TEX_GENERAL_42, 120, 0 }, + { 10000, 10000, -200, TEX_GENERAL_43, 80, 0 }, + { 10000, 3000, -200, TEX_GENERAL_43, 80, 0 }, + { 3000, 3000, -200, TEX_GENERAL_45, 120, 0 }, + { 10000, 10000, -200, TEX_GENERAL_07, 80, 0 }, + { 10000, 1000, -200, TEX_GENERAL_45, 220, 0 }, }; Gfx *credits_draw_background_layer(Gfx *gdl, u8 type, u8 layernum, f32 arg3, u32 alpha, s32 arg5) @@ -383,11 +383,11 @@ Gfx *credits_draw_background_layer(Gfx *gdl, u8 type, u8 layernum, f32 arg3, u32 credits_map_9_bg_vertices(vertices, pan, b, c, rotation, g_CreditsBgTypes[type].unk00, g_CreditsBgTypes[type].unk02); - if (g_CreditsBgTypes[type].texturenum == 4) { + if (g_CreditsBgTypes[type].texturenum == TEX_GENERAL_LASERDOT) { alpha = alpha * 2 / 3; } - if (g_CreditsBgTypes[type].texturenum == 0x26) { + if (g_CreditsBgTypes[type].texturenum == TEX_GENERAL_38) { alpha = alpha * 2 / 3; } @@ -524,8 +524,8 @@ struct g_CreditParticleConfigs { }; struct g_CreditParticleConfigs g_CreditParticleConfigs[] = { - { 0x2a, 0, 0, 32, 32 }, - { 0x2b, 0, 0, 32, 32 }, + { TEX_GENERAL_42, 0, 0, 32, 32 }, + { TEX_GENERAL_43, 0, 0, 32, 32 }, }; /** diff --git a/src/game/env.c b/src/game/env.c index 286876df1..2e15fa07b 100644 --- a/src/game/env.c +++ b/src/game/env.c @@ -48,84 +48,84 @@ struct sun suns_crashsite[] = { 1, RGB(0xffd7f2), 1900000, 300000, -1400000, 2 struct sun suns_airbase[] = { 1, RGB(0xffd7f2), -1200000, 200000, 150000, 30, 60 }; struct fogenvironment g_FogEnvironments[] = { - // |- distfade --| |- fog -| |---------- clouds ---------| |--------- water ---------| - // stage near far opa% xlu% ref min max sky colour e scale type colour e scale type colour clouds_height - { STAGE_CRASHSITE, 15, 10000, 0, 0, 0, 994, 1000, RGB(0x9b2d1e), SUNS(suns_crashsite), 1, 1500, 0, RGB(0xfafa00), 0, -5000, 0, RGB(0x000000), 0 }, - { STAGE_PELAGIC, 15, 15000, 3333, 4444, 600, 995, 1000, RGB(0x2d3e60), NO_SUNS, 1, 5000, 0, RGB(0xf0f0f0), 0, -2000, 0, RGB(0x14212b), 0 }, - { STAGE_VILLA, 15, 20000, 0, 0, 0, 981, 1047, RGB(0x46a0ff), SUNS(suns_villa), 1, 5000, 0, RGB(0xffffff), 0, -1850, 1, RGB(0x00ffff), 0 }, - { STAGE_PELAGIC + 900, 30, 15000, 3333, 4444, 600, 995, 1000, RGB(0x103060), NO_SUNS, 1, 5000, 0, RGB(0xffffff), 0, -1000, 0, RGB(0x000000), 0 }, - { STAGE_24, 2, 25000, 0, 0, 0, 996, 1000, RGB(0x000000), NO_SUNS, 1, 10000, 0, RGB(0xffffff), 0, 0, 1, RGB(0x00ffff), 7 }, - { STAGE_2B, 2, 2000, 2500, 3055, 750, 957, 1000, RGB(0x201010), NO_SUNS, 1, 5000, 0, RGB(0x3a1100), 0, -1000, 1, RGB(0x00ffff), 20 }, - { STAGE_2B + 900, 2, 8000, 6000, 8000, 800, 991, 1000, RGB(0x201010), NO_SUNS, 1, 5000, 0, RGB(0x3a1100), 0, -1000, 1, RGB(0x00ffff), 0 }, - { 238, 10, 6000, 0, 0, 0, 996, 1000, RGB(0x181818), NO_SUNS, 1, 10000, 0, RGB(0x787878), 0, -500, 0, RGB(0x000000), 0 }, - { 338, 10, 6000, 0, 0, 0, 996, 1000, RGB(0x181818), NO_SUNS, 1, 10000, 0, RGB(0x787878), 0, -500, 0, RGB(0x000000), 0 }, - { 438, 10, 6000, 0, 0, 0, 996, 1000, RGB(0x181818), NO_SUNS, 1, 10000, 0, RGB(0x787878), 0, -500, 0, RGB(0x000000), 0 }, - { 200, 10, 7500, 0, 0, 0, 996, 1000, RGB(0x000000), NO_SUNS, 0, 0, 0, RGB(0x000000), 0, 0, 0, RGB(0x000000), 0 }, - { 300, 10, 6000, 0, 0, 0, 996, 1000, RGB(0x000000), NO_SUNS, 0, 0, 0, RGB(0x000000), 0, 0, 0, RGB(0x000000), 0 }, - { 400, 10, 5000, 0, 0, 0, 996, 1000, RGB(0x000000), NO_SUNS, 0, 0, 0, RGB(0x000000), 0, 0, 0, RGB(0x000000), 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, 0, 0, RGB(0x000000), 0, 0, 0, RGB(0x000000), 0 }, + // |- distfade --| |- fog -| |-------------- clouds --------------| |--------------- water --------------| + // stage near far opa% xlu% ref min max sky colour e scale type colour e scale type colour clouds_height + { STAGE_CRASHSITE, 15, 10000, 0, 0, 0, 994, 1000, RGB(0x9b2d1e), SUNS(suns_crashsite), 1, 1500, TEX_ENV_00, RGB(0xfafa00), 0, -5000, TEX_ENV_00, RGB(0x000000), 0 }, + { STAGE_PELAGIC, 15, 15000, 3333, 4444, 600, 995, 1000, RGB(0x2d3e60), NO_SUNS, 1, 5000, TEX_ENV_00, RGB(0xf0f0f0), 0, -2000, TEX_ENV_00, RGB(0x14212b), 0 }, + { STAGE_VILLA, 15, 20000, 0, 0, 0, 981, 1047, RGB(0x46a0ff), SUNS(suns_villa), 1, 5000, TEX_ENV_00, RGB(0xffffff), 0, -1850, TEX_ENV_01, RGB(0x00ffff), 0 }, + { STAGE_PELAGIC + 900, 30, 15000, 3333, 4444, 600, 995, 1000, RGB(0x103060), NO_SUNS, 1, 5000, TEX_ENV_00, RGB(0xffffff), 0, -1000, TEX_ENV_00, RGB(0x000000), 0 }, + { STAGE_24, 2, 25000, 0, 0, 0, 996, 1000, RGB(0x000000), NO_SUNS, 1, 10000, TEX_ENV_00, RGB(0xffffff), 0, 0, TEX_ENV_01, RGB(0x00ffff), 7 }, + { STAGE_2B, 2, 2000, 2500, 3055, 750, 957, 1000, RGB(0x201010), NO_SUNS, 1, 5000, TEX_ENV_00, RGB(0x3a1100), 0, -1000, TEX_ENV_01, RGB(0x00ffff), 20 }, + { STAGE_2B + 900, 2, 8000, 6000, 8000, 800, 991, 1000, RGB(0x201010), NO_SUNS, 1, 5000, TEX_ENV_00, RGB(0x3a1100), 0, -1000, TEX_ENV_01, RGB(0x00ffff), 0 }, + { 238, 10, 6000, 0, 0, 0, 996, 1000, RGB(0x181818), NO_SUNS, 1, 10000, TEX_ENV_00, RGB(0x787878), 0, -500, TEX_ENV_00, RGB(0x000000), 0 }, + { 338, 10, 6000, 0, 0, 0, 996, 1000, RGB(0x181818), NO_SUNS, 1, 10000, TEX_ENV_00, RGB(0x787878), 0, -500, TEX_ENV_00, RGB(0x000000), 0 }, + { 438, 10, 6000, 0, 0, 0, 996, 1000, RGB(0x181818), NO_SUNS, 1, 10000, TEX_ENV_00, RGB(0x787878), 0, -500, TEX_ENV_00, RGB(0x000000), 0 }, + { 200, 10, 7500, 0, 0, 0, 996, 1000, RGB(0x000000), NO_SUNS, 0, 0, TEX_ENV_00, RGB(0x000000), 0, 0, TEX_ENV_00, RGB(0x000000), 0 }, + { 300, 10, 6000, 0, 0, 0, 996, 1000, RGB(0x000000), NO_SUNS, 0, 0, TEX_ENV_00, RGB(0x000000), 0, 0, TEX_ENV_00, RGB(0x000000), 0 }, + { 400, 10, 5000, 0, 0, 0, 996, 1000, RGB(0x000000), NO_SUNS, 0, 0, TEX_ENV_00, RGB(0x000000), 0, 0, TEX_ENV_00, RGB(0x000000), 0 }, + { 0 }, }; struct nofogenvironment g_NoFogEnvironments[] = { - // clouds_height - // |distfade | |--------- clouds ---------| |----------- water ----------| | transparency - // stage near far opa xlu ref sky colour e colour scale type e colour scale type | | - { -1, 15, 10000, 0, 0, 0, RGB(0x001040), NO_SUNS, 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 0 }, - { STAGE_RESCUE, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_MAIANSOS, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_ATTACKSHIP, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 0 }, - { STAGE_INFILTRATION, 15, 12000, 0, 0, 0, RGB(0x000000), SUNS(suns_area51), 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_ESCAPE, 15, 10000, 0, 0, 0, RGB(0x000000), SUNS(suns_area51), 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_TEST_ARCH, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 0 }, - { STAGE_DEEPSEA, 15, 10000, 0, 0, 0, RGB(0x050000), NO_SUNS, 0, RGB(0x9b9b9b), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 0 }, - { STAGE_TEST_DEST, 15, 10000, 0, 0, 0, RGB(0x103060), NO_SUNS, 1, RGB(0xe6e6e6), 3000, 0, 1, RGB(0xffff96), -150, 2, 0, 0 }, - { STAGE_TEST_LEN, 15, 10000, 0, 0, 0, RGB(0x304010), NO_SUNS, 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 0 }, - { STAGE_TEST_ASH, 15, 25000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_DEFENSE, 15, 10000, 0, 0, 0, RGB(0x65b2ff), SUNS(suns_ci), 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_CITRAINING, 15, 10000, 0, 0, 0, RGB(0x65b2ff), SUNS(suns_ci), 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_DUEL, 10, 10000, 0, 0, 0, RGB(0x65b2ff), SUNS(suns_ci), 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_RETAKING, 15, 10000, 0, 0, 0, RGB(0x65b2ff), SUNS(suns_ci), 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_DEFECTION, 10, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x3a1100), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_MBR, 10, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x3a1100), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_EXTRACTION, 10, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x3a1100), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_SKEDARRUINS, 15, 10000, 0, 0, 0, RGB(0x6565ff), SUNS(suns_skedar), 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_WAR, 15, 10000, 0, 0, 0, RGB(0x6565ff), SUNS(suns_skedar), 0, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_TEST_RUN, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x3a1100), 5000, 0, 0, RGB(0x000000), 0, 0, 0, 1 }, - { STAGE_MP_SKEDAR, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x3a1100), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 1 }, - { STAGE_TEST_SILO, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x3a1100), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 1 }, - { STAGE_CHICAGO, 10, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x50280a), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 1 }, - { STAGE_G5BUILDING, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x50280a), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 1 }, - { STAGE_AIRFORCEONE, 15, 20000, 0, 0, 0, RGB(0x001040), NO_SUNS, 1, RGB(0xffffff), 5000, 0, 1, RGB(0xffffff), -5000, 2, 0, 1 }, - { STAGE_MP_RAVINE, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x50280a), 5000, 0, 0, RGB(0x000000), -31000, 0, 0, 1 }, - { STAGE_AIRBASE, 15, 20000, 0, 0, 0, RGB(0x001040), SUNS(suns_airbase), 1, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 1 }, - { STAGE_INVESTIGATION, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 1 }, - { STAGE_MP_PIPES, 15, 10000, 0, 0, 0, RGB(0x000008), NO_SUNS, 1, RGB(0x46c7ba), 4500, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_MP_G5BUILDING, 15, 10000, 0, 0, 0, RGB(0x000008), NO_SUNS, 1, RGB(0x5a90a5), 4500, 0, 0, RGB(0x000000), -20000, 0, 0, 0 }, - { STAGE_MP_TEMPLE, 15, 10000, 0, 0, 0, RGB(0x001080), NO_SUNS, 1, RGB(0xffffff), 5000, 0, 0, RGB(0x00ffff), -1850, 1, 0, 1 }, - { STAGE_MP_COMPLEX, 15, 10000, 0, 0, 0, RGB(0x020000), NO_SUNS, 1, RGB(0x82aac8), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_UFF, 10, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_OLD, 15, 30000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_LAM, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_MP_BASE, 15, 20000, 0, 0, 0, RGB(0x040000), NO_SUNS, 1, RGB(0x82b464), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_MP2, 15, 20000, 0, 0, 0, RGB(0x000008), NO_SUNS, 1, RGB(0x46c7ba), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_MP_AREA52, 15, 10000, 0, 0, 0, RGB(0x000008), NO_SUNS, 1, RGB(0x46c7ba), 4500, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_MP_WAREHOUSE, 15, 10000, 0, 0, 0, RGB(0x020000), NO_SUNS, 1, RGB(0x82aac8), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_MP_CARPARK, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x64c886), 5500, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_MP6, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_MP7, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_MP8, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_MP_RUINS, 15, 10000, 0, 0, 0, RGB(0x030000), NO_SUNS, 1, RGB(0x82e6aa), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_MP_SEWERS, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x646464), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_MP_FELICITY, 10, 10000, 0, 0, 0, RGB(0x040500), NO_SUNS, 1, RGB(0x64d282), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_MP_FORTRESS, 15, 10000, 0, 0, 0, RGB(0x000008), NO_SUNS, 1, RGB(0x5a90a5), 5500, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_MP_VILLA, 15, 10000, 0, 0, 0, RGB(0x8888dc), NO_SUNS, 1, RGB(0xffaa2a), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_MP14, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_MP_GRID, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_MP16, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_MP17, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x64c886), 10000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_MP18, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_MP19, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 0 }, - { STAGE_TEST_MP20, 15, 20000, 0, 0, 0, RGB(0x00103c), NO_SUNS, 1, RGB(0xffffff), 5000, 0, 0, RGB(0x000000), -5000, 0, 0, 1 }, + // clouds_height + // |distfade | |-------------- clouds --------------| |------------ water ------------| | transparency + // stage near far opa xlu ref sky colour e colour scale type e colour scale type | | + { -1, 15, 10000, 0, 0, 0, RGB(0x001040), NO_SUNS, 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 0 }, + { STAGE_RESCUE, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_MAIANSOS, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_ATTACKSHIP, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 0 }, + { STAGE_INFILTRATION, 15, 12000, 0, 0, 0, RGB(0x000000), SUNS(suns_area51), 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_ESCAPE, 15, 10000, 0, 0, 0, RGB(0x000000), SUNS(suns_area51), 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_TEST_ARCH, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 0 }, + { STAGE_DEEPSEA, 15, 10000, 0, 0, 0, RGB(0x050000), NO_SUNS, 0, RGB(0x9b9b9b), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_DEST, 15, 10000, 0, 0, 0, RGB(0x103060), NO_SUNS, 1, RGB(0xe6e6e6), 3000, TEX_ENV_00, 1, RGB(0xffff96), -150, TEX_ENV_02, 0, 0 }, + { STAGE_TEST_LEN, 15, 10000, 0, 0, 0, RGB(0x304010), NO_SUNS, 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_ASH, 15, 25000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_DEFENSE, 15, 10000, 0, 0, 0, RGB(0x65b2ff), SUNS(suns_ci), 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_CITRAINING, 15, 10000, 0, 0, 0, RGB(0x65b2ff), SUNS(suns_ci), 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_DUEL, 10, 10000, 0, 0, 0, RGB(0x65b2ff), SUNS(suns_ci), 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_RETAKING, 15, 10000, 0, 0, 0, RGB(0x65b2ff), SUNS(suns_ci), 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_DEFECTION, 10, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x3a1100), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_MBR, 10, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x3a1100), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_EXTRACTION, 10, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x3a1100), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_SKEDARRUINS, 15, 10000, 0, 0, 0, RGB(0x6565ff), SUNS(suns_skedar), 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_WAR, 15, 10000, 0, 0, 0, RGB(0x6565ff), SUNS(suns_skedar), 0, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_TEST_RUN, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x3a1100), 5000, TEX_ENV_00, 0, RGB(0x000000), 0, TEX_ENV_00, 0, 1 }, + { STAGE_MP_SKEDAR, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x3a1100), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 1 }, + { STAGE_TEST_SILO, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x3a1100), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 1 }, + { STAGE_CHICAGO, 10, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x50280a), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 1 }, + { STAGE_G5BUILDING, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x50280a), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 1 }, + { STAGE_AIRFORCEONE, 15, 20000, 0, 0, 0, RGB(0x001040), NO_SUNS, 1, RGB(0xffffff), 5000, TEX_ENV_00, 1, RGB(0xffffff), -5000, TEX_ENV_02, 0, 1 }, + { STAGE_MP_RAVINE, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x50280a), 5000, TEX_ENV_00, 0, RGB(0x000000), -31000, TEX_ENV_00, 0, 1 }, + { STAGE_AIRBASE, 15, 20000, 0, 0, 0, RGB(0x001040), SUNS(suns_airbase), 1, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 1 }, + { STAGE_INVESTIGATION, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 1 }, + { STAGE_MP_PIPES, 15, 10000, 0, 0, 0, RGB(0x000008), NO_SUNS, 1, RGB(0x46c7ba), 4500, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_G5BUILDING, 15, 10000, 0, 0, 0, RGB(0x000008), NO_SUNS, 1, RGB(0x5a90a5), 4500, TEX_ENV_00, 0, RGB(0x000000), -20000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_TEMPLE, 15, 10000, 0, 0, 0, RGB(0x001080), NO_SUNS, 1, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x00ffff), -1850, TEX_ENV_01, 0, 1 }, + { STAGE_MP_COMPLEX, 15, 10000, 0, 0, 0, RGB(0x020000), NO_SUNS, 1, RGB(0x82aac8), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_UFF, 10, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_OLD, 15, 30000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_LAM, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_BASE, 15, 20000, 0, 0, 0, RGB(0x040000), NO_SUNS, 1, RGB(0x82b464), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_MP2, 15, 20000, 0, 0, 0, RGB(0x000008), NO_SUNS, 1, RGB(0x46c7ba), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_AREA52, 15, 10000, 0, 0, 0, RGB(0x000008), NO_SUNS, 1, RGB(0x46c7ba), 4500, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_WAREHOUSE, 15, 10000, 0, 0, 0, RGB(0x020000), NO_SUNS, 1, RGB(0x82aac8), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_CARPARK, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x64c886), 5500, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_MP6, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_MP7, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_MP8, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_RUINS, 15, 10000, 0, 0, 0, RGB(0x030000), NO_SUNS, 1, RGB(0x82e6aa), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_SEWERS, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x646464), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_FELICITY, 10, 10000, 0, 0, 0, RGB(0x040500), NO_SUNS, 1, RGB(0x64d282), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_FORTRESS, 15, 10000, 0, 0, 0, RGB(0x000008), NO_SUNS, 1, RGB(0x5a90a5), 5500, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_VILLA, 15, 10000, 0, 0, 0, RGB(0x8888dc), NO_SUNS, 1, RGB(0xffaa2a), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_MP14, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_MP_GRID, 15, 10000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_MP16, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_MP17, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 1, RGB(0x64c886), 10000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_MP18, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_MP19, 15, 20000, 0, 0, 0, RGB(0x000000), NO_SUNS, 0, RGB(0x1e1e1e), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 0 }, + { STAGE_TEST_MP20, 15, 20000, 0, 0, 0, RGB(0x00103c), NO_SUNS, 1, RGB(0xffffff), 5000, TEX_ENV_00, 0, RGB(0x000000), -5000, TEX_ENV_00, 0, 1 }, { 0 }, }; diff --git a/src/game/filemgr.c b/src/game/filemgr.c index f30c9b821..00789ca07 100644 --- a/src/game/filemgr.c +++ b/src/game/filemgr.c @@ -2602,7 +2602,7 @@ MenuItemHandlerResult filemgr_choose_agent_list_menu_handler(s32 operation, stru break; case MENUOP_RENDER: gdl = data->type19.gdl; - texturenum = 12; + texturenum = TEX_GENERAL_NEWAGENT; file = NULL; renderdata = data->type19.renderdata2; seconds = 0; @@ -2632,7 +2632,7 @@ MenuItemHandlerResult filemgr_choose_agent_list_menu_handler(s32 operation, stru difficulty = DIFF_PA; } - texturenum = stage + 12; + texturenum += stage; days = time / 1440; hours = (time - days * 1440) / 60; diff --git a/src/game/gunfx.c b/src/game/gunfx.c index 77e53023e..34f56586e 100644 --- a/src/game/gunfx.c +++ b/src/game/gunfx.c @@ -295,13 +295,13 @@ Gfx *beam_render_generic(Gfx *gdl, struct textureconfig *texconfig, return gdl; } -Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) +Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 texnum) { u32 stack; Mtxf *sp188; Mtxf sp148; - if (arg3 < 5 && beam->age >= 0) { + if (texnum <= TEX_BEAM_GREEN && beam->age >= 0) { Col *colours = gfx_allocate_colours(1); struct coord sp138; struct coord *campos = &g_Vars.currentplayer->cam_pos; @@ -314,7 +314,7 @@ Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) struct coord sp100 = {0, 0, 0}; struct coord spf4 = {0, 0, 0}; f32 spf0 = 1.4142f; - struct textureconfig *texconfig = &g_TexBeamConfigs[arg3]; + struct textureconfig *texconfig = &g_TexBeamConfigs[texnum]; s32 i; Mtxf *worldtoscreenmtx = cam_get_world_to_screen_mtxf(); s32 j; @@ -332,17 +332,17 @@ Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) switch (beam->weaponnum) { case WEAPON_CYCLONE: - texconfig = &g_TexBeamConfigs[1]; + texconfig = &g_TexBeamConfigs[TEX_BEAM_BLUE]; break; case WEAPON_TRANQUILIZER: - texconfig = &g_TexBeamConfigs[3]; + texconfig = &g_TexBeamConfigs[TEX_BEAM_YELLOW]; break; case WEAPON_MAULER: case WEAPON_PHOENIX: case WEAPON_CALLISTO: case WEAPON_REAPER: case WEAPON_FARSIGHT: - texconfig = &g_TexBeamConfigs[4]; + texconfig = &g_TexBeamConfigs[TEX_BEAM_GREEN]; break; } @@ -355,11 +355,11 @@ Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) if (beam->weaponnum == WEAPON_LASER) { // Laser primary sp130 = 50.0f; - texconfig = &g_TexLaserConfigs[0]; + texconfig = &g_TexLaserConfigs[TEX_LASER_00]; } else if (beam->weaponnum == -2) { // Laser secondary sp130 = 10.0f; - texconfig = &g_TexLaserConfigs[0]; + texconfig = &g_TexLaserConfigs[TEX_LASER_00]; colours[0].a = 150 + (random() % 50); @@ -373,7 +373,7 @@ Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) if (beam->weaponnum <= -3) { // Mauler sp130 = sp130 * ((beam->weaponnum + 3) * 2.0f + 1.0f); - texconfig = &g_TexBeamConfigs[4]; + texconfig = &g_TexBeamConfigs[TEX_BEAM_GREEN]; } sp138.f[0] = beam->from.f[0]; @@ -537,8 +537,8 @@ Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) vertices[4].x = spf4.f[0] + sp118.f[0] * spf0; vertices[4].y = spf4.f[1] + sp118.f[1] * spf0; vertices[4].z = spf4.f[2] + sp118.f[2] * spf0; - vertices[4].s = g_TexGroup03Configs[0].width * 32; - vertices[4].t = g_TexGroup03Configs[0].height * 32; + vertices[4].s = g_TexGroup03Configs[TEX_MUZZLE_LASER].width * 32; + vertices[4].t = g_TexGroup03Configs[TEX_MUZZLE_LASER].height * 32; vertices[4].colour = 0; vertices[5].x = spf4.f[0] - sp118.f[0] * spf0; @@ -552,13 +552,13 @@ Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) vertices[6].y = spf4.f[1] + sp10c.f[1] * spf0; vertices[6].z = spf4.f[2] + sp10c.f[2] * spf0; vertices[6].s = 0; - vertices[6].t = g_TexGroup03Configs[0].height * 32; + vertices[6].t = g_TexGroup03Configs[TEX_MUZZLE_LASER].height * 32; vertices[6].colour = 0; vertices[7].x = spf4.f[0] - sp10c.f[0] * spf0; vertices[7].y = spf4.f[1] - sp10c.f[1] * spf0; vertices[7].z = spf4.f[2] - sp10c.f[2] * spf0; - vertices[7].s = g_TexGroup03Configs[0].width * 32; + vertices[7].s = g_TexGroup03Configs[TEX_MUZZLE_LASER].width * 32; vertices[7].t = 0; vertices[7].colour = 0; } @@ -575,7 +575,7 @@ Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) gSPColor(gdl++, osVirtualToPhysical(colours), 1); if (beam->weaponnum == WEAPON_LASER) { - tex_select(&gdl, &g_TexGroup03Configs[0], 4, arg2, 2, true, NULL); + tex_select(&gdl, &g_TexGroup03Configs[TEX_MUZZLE_LASER], 4, arg2, 2, true, NULL); gSPVertex(gdl++, osVirtualToPhysical(vertices), 8, 0); gSPTri2(gdl++, 4, 5, 6, 4, 5, 7); @@ -980,7 +980,7 @@ Gfx *boltbeams_render(Gfx *gdl) for (i = 0; i < ARRAYCOUNT(g_BoltBeams); i++) { if (g_BoltBeams[i].unk00 != -1) { - gdl = beam_render_generic(gdl, g_TexLaserConfigs, 1, &g_BoltBeams[i].headpos, 0xafafff00, 2, &g_BoltBeams[i].tailpos, 0xafafff7f); + gdl = beam_render_generic(gdl, &g_TexLaserConfigs[TEX_LASER_00], 1, &g_BoltBeams[i].headpos, 0xafafff00, 2, &g_BoltBeams[i].tailpos, 0xafafff7f); } } @@ -1167,7 +1167,7 @@ Gfx *lasersight_render_dot(Gfx *gdl) } } - tex_select(&gdl, &g_TexGeneralConfigs[4], 4, 0, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_LASERDOT], 4, 0, 2, true, NULL); if (rot.f[0] == 0.0f && rot.f[2] == 0.0f) { spcc = 0.0f; @@ -1260,7 +1260,7 @@ Gfx *lasersight_render_beam(Gfx *gdl) gDPSetCombineMode(gdl++, G_CC_BLENDIA, G_CC_BLENDIA); gSPClearGeometryMode(gdl++, G_CULL_BOTH); - tex_select(&gdl, &g_TexGeneralConfigs[3], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_LASERBEAM], 4, 0, 2, 1, NULL); mtx4_load_identity(&sp14c); mtx00015be0(cam_get_world_to_screen_mtxf(), &sp14c); diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c index c54f2e43c..c01fc1659 100644 --- a/src/game/mainmenu.c +++ b/src/game/mainmenu.c @@ -1980,13 +1980,13 @@ MenuItemHandlerResult menuhandler_mission_list(s32 operation, struct menuitem *i gDPSetTextureConvert(gdl++, G_TC_FILT); #if VERSION >= VERSION_NTSC_1_0 - tex_select(&gdl, g_TexGeneralConfigs + 13 + stageindex, 2, 0, 2, true, NULL); + tex_select(&gdl, g_TexGeneralConfigs + TEX_GENERAL_DEFECTION + stageindex, 2, 0, 2, true, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_CUSTOM_00, G_CC_CUSTOM_00); gDPSetTextureFilter(gdl++, G_TF_POINT); gDPSetEnvColorViaWord(gdl++, 0xffffff00 | ((renderdata->colour & 0xff) * 255 / 256)); #else - tex_select(&gdl, g_TexGeneralConfigs + 13 + stageindex, 1, 0, 2, true, NULL); + tex_select(&gdl, g_TexGeneralConfigs + TEX_GENERAL_DEFECTION + stageindex, 1, 0, 2, true, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); gDPSetTextureFilter(gdl++, G_TF_POINT); @@ -2000,7 +2000,7 @@ MenuItemHandlerResult menuhandler_mission_list(s32 operation, struct menuitem *i if (g_MissionConfig.isanti) { // No stars } else if (g_MissionConfig.iscoop) { - tex_select(&gdl, &g_TexGeneralConfigs[36], 2, 0, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_SILVERSTAR], 2, 0, 2, true, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); @@ -2032,7 +2032,7 @@ MenuItemHandlerResult menuhandler_mission_list(s32 operation, struct menuitem *i G_TX_RENDERTILE, 0x0010, 0x01c0, 1024 / g_UiScaleX, -1024); } } else { - tex_select(&gdl, &g_TexGeneralConfigs[34], 2, 0, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_GOLDSTAR], 2, 0, 2, true, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); diff --git a/src/game/menu.c b/src/game/menu.c index d52fca1e3..884a62f6a 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -3735,26 +3735,26 @@ void menu_reset(void) g_MenuData.unk5d5_01 = false; - tex_load_from_config(&g_TexGeneralConfigs[1]); - tex_load_from_config(&g_TexGeneralConfigs[6]); - tex_load_from_config(&g_TexGeneralConfigs[51]); - tex_load_from_config(&g_TexGeneralConfigs[52]); - tex_load_from_config(&g_TexGeneralConfigs[53]); - tex_load_from_config(&g_TexGeneralConfigs[54]); - tex_load_from_config(&g_TexGeneralConfigs[55]); + tex_load_from_config(&g_TexGeneralConfigs[TEX_GENERAL_1PXWHITE]); + tex_load_from_config(&g_TexGeneralConfigs[TEX_GENERAL_MENURAY0]); + tex_load_from_config(&g_TexGeneralConfigs[TEX_GENERAL_CONTROLLER_TL]); + tex_load_from_config(&g_TexGeneralConfigs[TEX_GENERAL_CONTROLLER_TR]); + tex_load_from_config(&g_TexGeneralConfigs[TEX_GENERAL_CONTROLLER_BL]); + tex_load_from_config(&g_TexGeneralConfigs[TEX_GENERAL_CONTROLLER_BR]); + tex_load_from_config(&g_TexGeneralConfigs[TEX_GENERAL_CONTROLLER_LINE]); if (g_Vars.stagenum == STAGE_CITRAINING) { - for (i = 12; i < 34; i++) { + for (i = TEX_GENERAL_NEWAGENT; i <= TEX_GENERAL_DUEL; i++) { tex_load_from_config(&g_TexGeneralConfigs[i]); } - tex_load_from_config(&g_TexGeneralConfigs[34]); - tex_load_from_config(&g_TexGeneralConfigs[36]); - tex_load_from_config(&g_TexGeneralConfigs[35]); + tex_load_from_config(&g_TexGeneralConfigs[TEX_GENERAL_GOLDSTAR]); + tex_load_from_config(&g_TexGeneralConfigs[TEX_GENERAL_SILVERSTAR]); + tex_load_from_config(&g_TexGeneralConfigs[TEX_GENERAL_ENVSTAR]); } if (g_Vars.mplayerisrunning) { - tex_load_from_config(&g_TexGeneralConfigs[35]); + tex_load_from_config(&g_TexGeneralConfigs[TEX_GENERAL_ENVSTAR]); } for (i = 0; i < ARRAYCOUNT(g_Menus); i++) { diff --git a/src/game/menugfx.c b/src/game/menugfx.c index 904809758..5e8a376f5 100644 --- a/src/game/menugfx.c +++ b/src/game/menugfx.c @@ -305,7 +305,7 @@ Gfx *menugfx_render_bg_green_haze(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) gSPClearGeometryMode(gdl++, G_CULL_BOTH); gDPSetTextureFilter(gdl++, G_TF_BILERP); - tex_select(&gdl, &g_TexGeneralConfigs[6], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_MENURAY0], 2, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); @@ -1829,7 +1829,7 @@ Gfx *menugfx_render_bg_success(Gfx *gdl) gdl = func0f0d4c80(gdl); gdl = func0f0d49c8(gdl); - tex_select(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_1PXWHITE], 2, 1, 2, true, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_DISABLE); diff --git a/src/game/menuitem.c b/src/game/menuitem.c index 1793a15e4..270b5b43f 100644 --- a/src/game/menuitem.c +++ b/src/game/menuitem.c @@ -3955,7 +3955,7 @@ Gfx *menuitem_controller_render_lines(Gfx *gdl, struct menurendercontext *contex gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - tex_select(&gdl, &g_TexGeneralConfigs[55], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_CONTROLLER_LINE], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); @@ -4151,10 +4151,10 @@ Gfx *menuitem_controller_render_pad(Gfx *gdl, struct menurendercontext *context, s32 ry = context->y + pady + (VERSION == VERSION_JPN_FINAL ? 25 : 4); // The controller graphic is split into 4 textures - gdl = menuitem_controller_render_texture(gdl, rx, ry, 0x33, alpha); - gdl = menuitem_controller_render_texture(gdl, rx + 32, ry, 0x34, alpha); - gdl = menuitem_controller_render_texture(gdl, rx, ry + 32, 0x35, alpha); - gdl = menuitem_controller_render_texture(gdl, rx + 32, ry + 32, 0x36, alpha); + gdl = menuitem_controller_render_texture(gdl, rx, ry, TEX_GENERAL_CONTROLLER_TL, alpha); + gdl = menuitem_controller_render_texture(gdl, rx + 32, ry, TEX_GENERAL_CONTROLLER_TR, alpha); + gdl = menuitem_controller_render_texture(gdl, rx, ry + 32, TEX_GENERAL_CONTROLLER_BL, alpha); + gdl = menuitem_controller_render_texture(gdl, rx + 32, ry + 32, TEX_GENERAL_CONTROLLER_BR, alpha); #if VERSION >= VERSION_JPN_FINAL if (curmode >= CONTROLMODE_21) { diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index 6c6a49e28..a80634f93 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -661,7 +661,7 @@ MenuItemHandlerResult mp_awards_menu_handler(s32 operation, struct menuitem *ite gDPSetTextureConvert(gdl++, G_TC_FILT); gDPSetTextureFilter(gdl++, G_TF_POINT); - tex_select(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_ENVSTAR], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index 160f72f28..a78d45430 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -727,7 +727,7 @@ MenuItemHandlerResult mp_challenges_list_handler(s32 operation, struct menuitem gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - tex_select(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_ENVSTAR], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); @@ -960,7 +960,7 @@ MenuItemHandlerResult mp_medal_menu_handler(s32 operation, struct menuitem *item gDPSetTextureConvert(gdl++, G_TC_FILT); gDPSetTextureFilter(gdl++, G_TF_POINT); - tex_select(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_ENVSTAR], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -4536,7 +4536,7 @@ MenuItemHandlerResult mp_challenges_list_menu_handler(s32 operation, struct menu gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - tex_select(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_ENVSTAR], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); diff --git a/src/game/nbomb.c b/src/game/nbomb.c index 036d25ce7..06363db9e 100644 --- a/src/game/nbomb.c +++ b/src/game/nbomb.c @@ -141,7 +141,7 @@ Gfx *func0f0073ac(Gfx *gdl, struct coord *pos, f32 arg2) gSPMatrix(gdl++, osVirtualToPhysical(modelmtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - tex_select(&gdl, &g_TexGeneralConfigs[10], 2, 1, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_NBOMBDOME], 2, 1, 2, true, NULL); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -311,7 +311,7 @@ s32 nbomb_calculate_alpha(struct nbomb *nbomb) Gfx *nbomb_create_gdl(void) { Vtx *vertices; - u32 gdlsizes[] = { 0x0a30, 0x0330 }; // 1 player, 2+ players + u32 gdlsizes[] = { 326 * sizeof(Gfx), 102 * sizeof(Gfx) }; // 1 player, 2+ players Gfx *gdlstart; Gfx *gdl; s32 index = 0; @@ -324,7 +324,7 @@ Gfx *nbomb_create_gdl(void) gdl = gdlstart = gfx_allocate(gdlsizes[index]); - tex_select(&gdl, &g_TexGeneralConfigs[10], 2, 1, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_NBOMBDOME], 2, 1, 2, 1, NULL); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -843,7 +843,7 @@ Gfx *nbomb_render_overlay(Gfx *gdl) if (1); - tex_select(&gdl, &g_TexGeneralConfigs[10], 2, 1, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_NBOMBDOME], 2, 1, 2, true, NULL); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -1013,7 +1013,7 @@ Gfx *gas_render(Gfx *gdl) if (1); - tex_select(&gdl, &g_TexGeneralConfigs[6], 4, 1, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_MENURAY0], 4, 1, 2, true, NULL); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); diff --git a/src/game/player.c b/src/game/player.c index 4e71139d6..8d2e85265 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -4417,7 +4417,7 @@ Gfx *player_render_shield(Gfx *gdl) } f20 = 1 - g_Vars.currentplayer->shieldshowtime * (1.0f / 60.0f); - tex_select(&gdl, &g_TexShieldConfigs[0], 4, 1, 2, 1, NULL); + tex_select(&gdl, &g_TexShieldConfigs[TEX_SHIELD_00], 4, 1, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_2CYCLE); gDPSetRenderMode(gdl++, G_RM_PASS, G_RM_CLD_SURF2); @@ -4425,7 +4425,9 @@ Gfx *player_render_shield(Gfx *gdl) gDPSetPrimColor(gdl++, 0, 0, 0xff, 0xff, 0xff, (s32)(175 * f20 * f20)); gDPSetCombineMode(gdl++, G_CC_CUSTOM_00, G_CC_CUSTOM_01); - func0f0b2740(&gdl, sp90, sp88, g_TexShieldConfigs->width, g_TexShieldConfigs->height, + func0f0b2740(&gdl, sp90, sp88, + g_TexShieldConfigs[TEX_SHIELD_00].width, + g_TexShieldConfigs[TEX_SHIELD_00].height, (g_Vars.currentplayer->shieldshowrnd & 1) != 0, (g_Vars.currentplayer->shieldshowrnd & 2) != 0, (g_Vars.currentplayer->shieldshowrnd & 4) != 0, diff --git a/src/game/propobj.c b/src/game/propobj.c index 222bf564c..5ffb2dac0 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -11376,15 +11376,15 @@ Gfx *props_render_beams(Gfx *gdl) struct chrdata *chr = prop->chr; if (CHRRACE(chr) == RACE_ROBOT) { - gdl = beam_render(gdl, chr->unk348[0]->beam, true, true); - gdl = beam_render(gdl, chr->unk348[1]->beam, true, true); + gdl = beam_render(gdl, chr->unk348[0]->beam, true, TEX_BEAM_BLUE); + gdl = beam_render(gdl, chr->unk348[1]->beam, true, TEX_BEAM_BLUE); } else { if (chr->fireslots[0] >= 0) { - gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[0]].beam, true, false); + gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[0]].beam, true, TEX_BEAM_ORANGE); } if (chr->fireslots[1] >= 0) { - gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[1]].beam, true, false); + gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[1]].beam, true, TEX_BEAM_ORANGE); } } } else if (prop->type == PROPTYPE_OBJ) { @@ -11392,21 +11392,21 @@ Gfx *props_render_beams(Gfx *gdl) if (obj->type == OBJTYPE_AUTOGUN) { struct autogunobj *autogun = (struct autogunobj *)prop->obj; - gdl = beam_render(gdl, autogun->beam, true, false); + gdl = beam_render(gdl, autogun->beam, true, TEX_BEAM_ORANGE); } else if (obj->type == OBJTYPE_CHOPPER) { struct chopperobj *chopper = (struct chopperobj *)prop->obj; - gdl = beam_render(gdl, chopper->fireslotthing->beam, true, true); + gdl = beam_render(gdl, chopper->fireslotthing->beam, true, TEX_BEAM_BLUE); } } else if (prop->type == PROPTYPE_PLAYER) { if (prop->chr && playermgr_get_player_num_by_prop(prop) != g_Vars.currentplayernum) { struct chrdata *chr = prop->chr; if (chr->fireslots[0] >= 0) { - gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[0]].beam, true, false); + gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[0]].beam, true, TEX_BEAM_ORANGE); } if (chr->fireslots[1] >= 0) { - gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[1]].beam, true, false); + gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[1]].beam, true, TEX_BEAM_ORANGE); } } } @@ -11424,7 +11424,7 @@ void tvscreen_set_cmdlist(struct tvscreen *screen, u32 *cmdlist) } u32 g_TvCmdlistDefault[] = { - tvcmd_settexture(29), + tvcmd_settexture(TEX_SCREEN_TEXT), tvcmd_setcolour(0x008000ff, 1), tvcmd_scrollrely(-512, 80), tvcmd_pause(120), @@ -11441,7 +11441,7 @@ u32 g_TvCmdlistDefault[] = { u32 g_TvCmdlistSinewave1[] = { tvcmd_setcolour(0x202020ff, 1), - tvcmd_settexture(28), + tvcmd_settexture(TEX_SCREEN_SINEWAVE), tvcmd_scrollrelx(2048, 120), tvcmd_pause(120), tvcmd_scaleabsx(256, 1), @@ -11464,7 +11464,7 @@ u32 g_TvCmdlistSinewave1[] = { u32 g_TvCmdlistSinewave2[] = { tvcmd_setcolour(0x202020ff, 1), - tvcmd_settexture(28), + tvcmd_settexture(TEX_SCREEN_SINEWAVE), tvcmd_scaleabsx(128, 1), tvcmd_scaleabsy(2048, 60), tvcmd_scaleabsy(1024, 120), @@ -11475,7 +11475,7 @@ u32 g_TvCmdlistSinewave2[] = { }; u32 g_TvCmdlistScrollTextGreen[] = { - tvcmd_settexture(29), + tvcmd_settexture(TEX_SCREEN_TEXT), tvcmd_setcolour(0x008000ff, 1), tvcmd_scrollrely(-512, 80), tvcmd_pause(120), @@ -11491,7 +11491,7 @@ u32 g_TvCmdlistScrollTextGreen[] = { }; u32 g_TvCmdlistTransparent[] = { - tvcmd_settexture(50), + tvcmd_settexture(TEX_SCREEN_TRANSPARENT), tvcmd_setcolour(0x008000fe, 1), tvcmd_scrollrely(-512, 80), tvcmd_pause(120), @@ -11507,7 +11507,7 @@ u32 g_TvCmdlistTransparent[] = { }; u32 g_TvCmdlistScrollUpTextRed[] = { - tvcmd_settexture(29), + tvcmd_settexture(TEX_SCREEN_TEXT), tvcmd_setcolour(0x280000ff, 1), tvcmd_scrollrely(512, 80), tvcmd_pause(120), @@ -11526,7 +11526,7 @@ u32 g_TvCmdlistScrollUpTextRed[] = { }; u32 g_TvCmdlistScrollUpTextGreen[] = { - tvcmd_settexture(29), + tvcmd_settexture(TEX_SCREEN_TEXT), tvcmd_setcolour(0x003c00ff, 1), tvcmd_scrollrely(512, 80), tvcmd_pause(120), @@ -11544,7 +11544,7 @@ u32 g_TvCmdlistScrollUpTextGreen[] = { }; u32 g_TvCmdlistBarsYellow[] = { - tvcmd_settexture(30), + tvcmd_settexture(TEX_SCREEN_BARS), tvcmd_setcolour(0x404000ff, 1), tvcmd_scrollrelx(640, 1), tvcmd_pause(10), @@ -11552,7 +11552,7 @@ u32 g_TvCmdlistBarsYellow[] = { }; u32 g_TvCmdlistBarsTeal[] = { - tvcmd_settexture(30), + tvcmd_settexture(TEX_SCREEN_BARS), tvcmd_setcolour(0x004040ff, 1), tvcmd_scrollrelx(640, 1), tvcmd_pause(10), @@ -11560,7 +11560,7 @@ u32 g_TvCmdlistBarsTeal[] = { }; u32 g_TvCmdlistBarsGreen[] = { - tvcmd_settexture(30), + tvcmd_settexture(TEX_SCREEN_BARS), tvcmd_setcolour(0x008000ff, 1), tvcmd_scrollrelx(-640, 1), tvcmd_pause(10), @@ -11568,7 +11568,7 @@ u32 g_TvCmdlistBarsGreen[] = { }; u32 g_TvCmdlistPulseRed[] = { - tvcmd_settexture(49), + tvcmd_settexture(TEX_SCREEN_FILL), tvcmd_scaleabsx(512, 0), tvcmd_scaleabsy(512, 0), tvcmd_setcolour(0xdc2828ff, 60), @@ -11579,7 +11579,7 @@ u32 g_TvCmdlistPulseRed[] = { }; u32 g_TvCmdlistPulseGreen[] = { - tvcmd_settexture(49), + tvcmd_settexture(TEX_SCREEN_FILL), tvcmd_scaleabsx(512, 0), tvcmd_scaleabsy(512, 0), tvcmd_setcolour(0x32c832ff, 60), @@ -11590,7 +11590,7 @@ u32 g_TvCmdlistPulseGreen[] = { }; u32 g_TvCmdlistSolidGray[] = { - tvcmd_settexture(49), + tvcmd_settexture(TEX_SCREEN_FILL), tvcmd_scaleabsx(512, 0), tvcmd_scaleabsy(512, 0), tvcmd_setcolour(0x323232ff, 10), @@ -11599,7 +11599,7 @@ u32 g_TvCmdlistSolidGray[] = { }; u32 g_TvCmdlistSolidRed[] = { - tvcmd_settexture(49), + tvcmd_settexture(TEX_SCREEN_FILL), tvcmd_scaleabsx(512, 0), tvcmd_scaleabsy(512, 0), tvcmd_setcolour(0xdc2828ff, 10), @@ -11608,7 +11608,7 @@ u32 g_TvCmdlistSolidRed[] = { }; u32 g_TvCmdlistSolidGreen[] = { - tvcmd_settexture(49), + tvcmd_settexture(TEX_SCREEN_FILL), tvcmd_scaleabsx(512, 0), tvcmd_scaleabsy(512, 0), tvcmd_setcolour(0x32c832ff, 10), @@ -11617,49 +11617,49 @@ u32 g_TvCmdlistSolidGreen[] = { }; u32 g_TvCmdlistMaian[] = { - tvcmd_settexture(51), + tvcmd_settexture(TEX_SCREEN_MAIAN), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistBio[] = { - tvcmd_settexture(72), + tvcmd_settexture(TEX_SCREEN_BIO), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistJoHead[] = { - tvcmd_settexture(73), + tvcmd_settexture(TEX_SCREEN_JOHEAD), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistJoFrock[] = { - tvcmd_settexture(74), + tvcmd_settexture(TEX_SCREEN_JOFROCK), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistPlanet1[] = { - tvcmd_settexture(75), + tvcmd_settexture(TEX_SCREEN_PLANET1), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistPlanet2[] = { - tvcmd_settexture(76), + tvcmd_settexture(TEX_SCREEN_PLANET2), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistPlanet3[] = { - tvcmd_settexture(77), + tvcmd_settexture(TEX_SCREEN_PLANET3), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), @@ -11667,19 +11667,19 @@ u32 g_TvCmdlistPlanet3[] = { u32 g_TvCmdlistCyclePlanets[] = { tvcmd_setcolour(0x000000ff, 1), - tvcmd_settexture(75), + tvcmd_settexture(TEX_SCREEN_PLANET1), tvcmd_pause(1), tvcmd_setcolour(0xffffffff, 180), tvcmd_pause(360), tvcmd_setcolour(0x000000ff, 30), tvcmd_pause(30), - tvcmd_settexture(76), + tvcmd_settexture(TEX_SCREEN_PLANET2), tvcmd_pause(1), tvcmd_setcolour(0xffffffff, 180), tvcmd_pause(360), tvcmd_setcolour(0x000000ff, 30), tvcmd_pause(30), - tvcmd_settexture(77), + tvcmd_settexture(TEX_SCREEN_PLANET3), tvcmd_pause(1), tvcmd_setcolour(0xffffffff, 180), tvcmd_pause(360), @@ -11689,106 +11689,106 @@ u32 g_TvCmdlistCyclePlanets[] = { }; u32 g_TvCmdlistSkedar[] = { - tvcmd_settexture(78), + tvcmd_settexture(TEX_SCREEN_SKEDAR), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistWhiteCoat[] = { - tvcmd_settexture(52), + tvcmd_settexture(TEX_SCREEN_WHITECOAT_FRAME1), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(5), - tvcmd_settexture(53), + tvcmd_settexture(TEX_SCREEN_WHITECOAT_FRAME2), tvcmd_pause(5), - tvcmd_settexture(54), + tvcmd_settexture(TEX_SCREEN_WHITECOAT_FRAME3), tvcmd_pause(5), - tvcmd_settexture(55), + tvcmd_settexture(TEX_SCREEN_WHITECOAT_FRAME4), tvcmd_pause(5), tvcmd_restart(), }; u32 g_TvCmdlistStripedShirt[] = { - tvcmd_settexture(79), + tvcmd_settexture(TEX_SCREEN_STRIPEDSHIRT_FRAME1), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(5), - tvcmd_settexture(80), + tvcmd_settexture(TEX_SCREEN_STRIPEDSHIRT_FRAME2), tvcmd_pause(5), - tvcmd_settexture(81), + tvcmd_settexture(TEX_SCREEN_STRIPEDSHIRT_FRAME3), tvcmd_pause(5), - tvcmd_settexture(82), + tvcmd_settexture(TEX_SCREEN_STRIPEDSHIRT_FRAME4), tvcmd_pause(5), tvcmd_restart(), }; u32 g_TvCmdlistFinger[] = { - tvcmd_settexture(56), + tvcmd_settexture(TEX_SCREEN_FINGER_FRAME1), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), - tvcmd_settexture(57), + tvcmd_settexture(TEX_SCREEN_FINGER_FRAME2), tvcmd_pause(10), - tvcmd_settexture(58), + tvcmd_settexture(TEX_SCREEN_FINGER_FRAME3), tvcmd_pause(10), - tvcmd_settexture(59), + tvcmd_settexture(TEX_SCREEN_FINGER_FRAME4), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistFist[] = { - tvcmd_settexture(60), + tvcmd_settexture(TEX_SCREEN_FIST_FRAME1), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(15), - tvcmd_settexture(61), + tvcmd_settexture(TEX_SCREEN_FIST_FRAME2), tvcmd_pause(15), tvcmd_restart(), }; u32 g_TvCmdlistPatrol1[] = { - tvcmd_settexture(62), + tvcmd_settexture(TEX_SCREEN_PATROL1_FRAME1), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), - tvcmd_settexture(63), + tvcmd_settexture(TEX_SCREEN_PATROL1_FRAME2), tvcmd_pause(10), - tvcmd_settexture(64), + tvcmd_settexture(TEX_SCREEN_PATROL1_FRAME3), tvcmd_pause(10), - tvcmd_settexture(65), + tvcmd_settexture(TEX_SCREEN_PATROL1_FRAME4), tvcmd_pause(10), - tvcmd_settexture(66), + tvcmd_settexture(TEX_SCREEN_PATROL1_FRAME5), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistPatrol2[] = { - tvcmd_settexture(67), + tvcmd_settexture(TEX_SCREEN_PATROL2_FRAME1), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), - tvcmd_settexture(68), + tvcmd_settexture(TEX_SCREEN_PATROL2_FRAME2), tvcmd_pause(10), - tvcmd_settexture(69), + tvcmd_settexture(TEX_SCREEN_PATROL2_FRAME3), tvcmd_pause(10), - tvcmd_settexture(70), + tvcmd_settexture(TEX_SCREEN_PATROL2_FRAME4), tvcmd_pause(10), - tvcmd_settexture(71), + tvcmd_settexture(TEX_SCREEN_PATROL2_FRAME5), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistCassHead[] = { - tvcmd_settexture(83), + tvcmd_settexture(TEX_SCREEN_CASSHEAD), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistDiagram[] = { - tvcmd_settexture(84), + tvcmd_settexture(TEX_SCREEN_DIAGRAM), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistScrollGalaxy1Green[] = { - tvcmd_settexture(85), + tvcmd_settexture(TEX_SCREEN_GALAXY1), tvcmd_setcolour(0x008000ff, 1), tvcmd_scrollrely(-512, 80), tvcmd_pause(80), @@ -11796,7 +11796,7 @@ u32 g_TvCmdlistScrollGalaxy1Green[] = { }; u32 g_TvCmdlistScrollUpGalaxy1Blue[] = { - tvcmd_settexture(85), + tvcmd_settexture(TEX_SCREEN_GALAXY1), tvcmd_setcolour(0x0032c8ff, 1), tvcmd_scrollrely(512, 80), tvcmd_pause(80), @@ -11804,14 +11804,14 @@ u32 g_TvCmdlistScrollUpGalaxy1Blue[] = { }; u32 g_TvCmdlistStar[] = { - tvcmd_settexture(86), + tvcmd_settexture(TEX_SCREEN_STAR), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistScrollStar[] = { - tvcmd_settexture(86), + tvcmd_settexture(TEX_SCREEN_STAR), tvcmd_setcolour(0xffffffff, 1), tvcmd_scrollrely(-512, 80), tvcmd_pause(80), @@ -11819,7 +11819,7 @@ u32 g_TvCmdlistScrollStar[] = { }; u32 g_TvCmdlistScrollGalaxy2Green[] = { - tvcmd_settexture(87), + tvcmd_settexture(TEX_SCREEN_GALAXY2), tvcmd_setcolour(0x008000ff, 1), tvcmd_scrollrely(-512, 80), tvcmd_pause(80), @@ -11827,7 +11827,7 @@ u32 g_TvCmdlistScrollGalaxy2Green[] = { }; u32 g_TvCmdlistScrollUpGalaxy2Blue[] = { - tvcmd_settexture(87), + tvcmd_settexture(TEX_SCREEN_GALAXY2), tvcmd_setcolour(0x0032c8ff, 1), tvcmd_scrollrely(512, 80), tvcmd_pause(80), @@ -11835,14 +11835,14 @@ u32 g_TvCmdlistScrollUpGalaxy2Blue[] = { }; u32 g_TvCmdlistNebula[] = { - tvcmd_settexture(88), + tvcmd_settexture(TEX_SCREEN_NEBULA), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistScrollSymbolsGreen[] = { - tvcmd_settexture(89), + tvcmd_settexture(TEX_SCREEN_SYMBOLS), tvcmd_setcolour(0x007f00ff, 1), tvcmd_scrollrely(-512, 80), tvcmd_pause(120), @@ -11858,7 +11858,7 @@ u32 g_TvCmdlistScrollSymbolsGreen[] = { }; u32 g_TvCmdlistScrollUpSymbolsOrange[] = { - tvcmd_settexture(89), + tvcmd_settexture(TEX_SCREEN_SYMBOLS), tvcmd_setcolour(0xff7f00ff, 1), tvcmd_scrollrely(512, 80), tvcmd_pause(120), @@ -11874,21 +11874,21 @@ u32 g_TvCmdlistScrollUpSymbolsOrange[] = { }; u32 g_TvCmdlistGreenObject1[] = { - tvcmd_settexture(90), + tvcmd_settexture(TEX_SCREEN_GREENOBJECT1), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistGreenObject2[] = { - tvcmd_settexture(91), + tvcmd_settexture(TEX_SCREEN_GREENOBJECT2), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistGreenObject3[] = { - tvcmd_settexture(92), + tvcmd_settexture(TEX_SCREEN_GREENOBJECT3), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), @@ -11896,19 +11896,19 @@ u32 g_TvCmdlistGreenObject3[] = { u32 g_TvCmdlistCycleGreenObjects[] = { tvcmd_setcolour(0x000000ff, 1), - tvcmd_settexture(90), + tvcmd_settexture(TEX_SCREEN_GREENOBJECT1), tvcmd_pause(1), tvcmd_setcolour(0xffffffff, 180), tvcmd_pause(360), tvcmd_setcolour(0x000000ff, 30), tvcmd_pause(30), - tvcmd_settexture(91), + tvcmd_settexture(TEX_SCREEN_GREENOBJECT2), tvcmd_pause(1), tvcmd_setcolour(0xffffffff, 180), tvcmd_pause(360), tvcmd_setcolour(0x000000ff, 30), tvcmd_pause(30), - tvcmd_settexture(92), + tvcmd_settexture(TEX_SCREEN_GREENOBJECT3), tvcmd_pause(1), tvcmd_setcolour(0xffffffff, 180), tvcmd_pause(360), @@ -11918,28 +11918,28 @@ u32 g_TvCmdlistCycleGreenObjects[] = { }; u32 g_TvCmdlistPcStand[] = { - tvcmd_settexture(93), + tvcmd_settexture(TEX_SCREEN_PCSTAND), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistEarth[] = { - tvcmd_settexture(94), + tvcmd_settexture(TEX_SCREEN_EARTH), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistShrine[] = { - tvcmd_settexture(95), + tvcmd_settexture(TEX_SCREEN_SHRINE), tvcmd_setcolour(0xffffffff, 1), tvcmd_pause(10), tvcmd_restart(), }; u32 g_TvCmdlistSolidBlack[] = { - tvcmd_settexture(0), + tvcmd_settexture(TEX_SCREEN_BOND), tvcmd_setcolour(0x000000ff, 0), tvcmd_stop(), }; @@ -11955,7 +11955,7 @@ u32 g_TvCmdlistBondZoom[] = { }; u32 g_TvCmdlistBondPan[] = { - tvcmd_settexture(0), + tvcmd_settexture(TEX_SCREEN_BOND), tvcmd_scrollrelx(1024, 20), tvcmd_pause(20), tvcmd_scrollrely(1024, 20), @@ -13502,7 +13502,7 @@ Gfx *gfx_render_radial_shadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radi vertices = gfx_allocate_vertices(4); colours = gfx_allocate_colours(1); - tconfig = &g_TexShadowConfigs[0]; + tconfig = &g_TexShadowConfigs[TEX_SHADOW_00]; colours[0].word = colour; diff --git a/src/game/radar.c b/src/game/radar.c index 464c44066..85914ff7c 100644 --- a/src/game/radar.c +++ b/src/game/radar.c @@ -252,7 +252,7 @@ Gfx *radar_render(Gfx *gdl) u32 colour; s32 i; - tconfig = g_TexRadarConfigs; + tconfig = &g_TexRadarConfigs[TEX_RADAR_BG]; playernum = g_Vars.currentplayernum; playercount = PLAYERCOUNT(); diff --git a/src/game/savebuffer.c b/src/game/savebuffer.c index f3f04ed65..f17f53490 100644 --- a/src/game/savebuffer.c +++ b/src/game/savebuffer.c @@ -142,9 +142,9 @@ Gfx *func0f0d4a3c(Gfx *gdl, s32 arg1) gDPPipeSync(gdl++); if (arg1 == 0) { - tex_select(&gdl, &g_TexGeneralConfigs[6], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_MENURAY0], 2, 0, 2, 1, NULL); } else if (arg1 == 1) { - tex_select(&gdl, &g_TexGeneralConfigs[11], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_MENURAY1], 2, 0, 2, 1, NULL); } gDPPipeSync(gdl++); diff --git a/src/game/shards.c b/src/game/shards.c index f497df5e6..6b9e820b7 100644 --- a/src/game/shards.c +++ b/src/game/shards.c @@ -333,7 +333,7 @@ Gfx *shards_render_glass(Gfx *gdl) if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { tex_select(&gdl, NULL, 2, 1, 2, 1, NULL); } else { - tex_select(&gdl, &g_TexShardConfigs[1], 2, 1, 2, 1, NULL); + tex_select(&gdl, &g_TexShardConfigs[TEX_SHARD_01], 2, 1, 2, 1, NULL); } gSPTexture(gdl++, 0x0d80, 0x0d80, 2, G_TX_RENDERTILE, G_ON); diff --git a/src/game/sight.c b/src/game/sight.c index fbb2c95c4..ffa3c53b4 100644 --- a/src/game/sight.c +++ b/src/game/sight.c @@ -804,7 +804,7 @@ Gfx *sight_draw_default(Gfx *gdl, bool sighton) Gfx *sight_draw_classic(Gfx *gdl, bool sighton) { - struct textureconfig *tconfig = &g_TexGeCrosshairConfigs[0]; + struct textureconfig *tconfig = &g_TexGeCrosshairConfigs[TEX_GECROSSHAIR_00]; f32 spc4[2]; f32 spbc[2]; s32 x = g_Vars.currentplayer->crosspos[0]; diff --git a/src/game/sky.c b/src/game/sky.c index a315cbd17..82e5f3b48 100644 --- a/src/game/sky.c +++ b/src/game/sky.c @@ -2595,7 +2595,7 @@ Gfx *sky_render_suns(Gfx *gdl, bool xray) g_SunFlareTimers240[i] += g_Vars.lvupdate240; - tex_select(&gdl, &g_TexLightGlareConfigs[5], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexLightGlareConfigs[TEX_LIGHT_05], 4, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_DISABLE); @@ -2616,7 +2616,7 @@ Gfx *sky_render_suns(Gfx *gdl, bool xray) sp12c[0] = radius * 0.50f * xscale; sp12c[1] = radius * 0.50f; - func0f0b2150(&gdl, sp134, sp12c, g_TexLightGlareConfigs[5].width, g_TexLightGlareConfigs[5].height, 0, 1, 1, 1, 0, 1); + func0f0b2150(&gdl, sp134, sp12c, g_TexLightGlareConfigs[TEX_LIGHT_05].width, g_TexLightGlareConfigs[TEX_LIGHT_05].height, 0, 1, 1, 1, 0, 1); gDPPipeSync(gdl++); gDPSetColorDither(gdl++, G_CD_BAYER); @@ -2681,7 +2681,7 @@ Gfx *sky_render_flare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 f ydist = (y - vi_get_view_height() / 2.0f) * 0.01f; // Render the source artifact (eg. the artifact that is on top of the sun) - tex_select(&gdl, &g_TexLightGlareConfigs[6], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexLightGlareConfigs[TEX_LIGHT_06], 4, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_BAYER); @@ -2707,10 +2707,10 @@ Gfx *sky_render_flare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 f sp174[1] = f2 * 0.5f; sp174[0] = f2 * 0.5f * scale; - func0f0b2150(&gdl, sp17c, sp174, g_TexLightGlareConfigs[6].width, g_TexLightGlareConfigs[6].height, 0, 1, 1, 1, 0, 1); + func0f0b2150(&gdl, sp17c, sp174, g_TexLightGlareConfigs[TEX_LIGHT_06].width, g_TexLightGlareConfigs[TEX_LIGHT_06].height, 0, 1, 1, 1, 0, 1); // Render the other artifacts - tex_select(&gdl, &g_TexLightGlareConfigs[1], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexLightGlareConfigs[TEX_LIGHT_01], 4, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_BAYER); @@ -2764,7 +2764,7 @@ Gfx *sky_render_flare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 f sp174[1] = tmp * 0.5f; sp174[0] = tmp * 0.5f * scale; - func0f0b2150(&gdl, sp17c, sp174, g_TexLightGlareConfigs[1].width, g_TexLightGlareConfigs[1].height, 0, 0, 0, 0, 0, 1); + func0f0b2150(&gdl, sp17c, sp174, g_TexLightGlareConfigs[TEX_LIGHT_01].width, g_TexLightGlareConfigs[TEX_LIGHT_01].height, 0, 0, 0, 0, 0, 1); } // Check if the source is close to the center of the screen and create the bloom effect if so diff --git a/src/game/sparks.c b/src/game/sparks.c index db7b22f0c..aa0273420 100644 --- a/src/game/sparks.c +++ b/src/game/sparks.c @@ -302,7 +302,7 @@ Gfx *sparks_render(Gfx *gdl) axis = ABS(g_Vars.currentplayer->cam_look.z) > ABS(g_Vars.currentplayer->cam_look.x) ? 2 : 0; } - tex_select(&gdl, &g_TexSparkConfigs[0], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexSparkConfigs[TEX_SPARK_00], 4, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_DISABLE); diff --git a/src/game/stagetable.c b/src/game/stagetable.c index a5967421d..ef089f8a6 100644 --- a/src/game/stagetable.c +++ b/src/game/stagetable.c @@ -7,68 +7,68 @@ // When adding or removing items from this table you must also update the // STAGEINDEX constants in constants.h. struct stagetableentry g_Stages[61] = { - // id, ?, lia, liw, lih, ?, bg, tiles, pads, setup, mpsetp, ? 0x18, 0x1c, ?, ?, ?, 0x24, 0x28, ?, ?, ? ? - /*0x00*/ STAGE_MAIANSOS, 2, 255, 100, 100, 0, FILE_BG_LUE_SEG, FILE_BG_LUE_TILES, FILE_BG_SEV_PADS, FILE_USETUPSEV, FILE_UMP_SETUPSEV, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x01*/ STAGE_TEST_SILO, 2, 255, 100, 100, 0, FILE_BG_OAT_SEG, FILE_BG_OAT_TILES, FILE_BG_OAT_PADS, FILE_USETUPSILO, FILE_UMP_SETUPSILO, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, - /*0x02*/ STAGE_WAR, 2, 255, 100, 100, 0, FILE_BG_SHO_SEG, FILE_BG_SHO_TILES, FILE_BG_STAT_PADS, FILE_USETUPSTAT, FILE_UMP_SETUPSTAT, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x03*/ STAGE_MP_RAVINE, 2, 255, 100, 100, 0, FILE_BG_AREC_SEG, FILE_BG_AREC_TILES, FILE_BG_AREC_PADS, FILE_USETUPAREC, FILE_UMP_SETUPAREC, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, - /*0x04*/ STAGE_TEST_ARCH, 2, 255, 100, 100, 0, FILE_BG_ARCH_SEG, FILE_BG_ARCH_TILES, FILE_BG_ARCH_PADS, FILE_USETUPARCH, FILE_UMP_SETUPARCH, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x05*/ STAGE_ESCAPE, 2, 255, 100, 100, 0, FILE_BG_LUE_SEG, FILE_BG_LUE_TILES, FILE_BG_TRA_PADS, FILE_USETUPTRA, FILE_UMP_SETUPTRA, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x06*/ STAGE_TEST_DEST, 2, 255, 100, 100, 0, FILE_BG_DEST_SEG, FILE_BG_DEST_TILES, FILE_BG_DEST_PADS, FILE_USETUPDEST, FILE_UMP_SETUPDEST, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x07*/ STAGE_RETAKING, 2, 255, 100, 100, 0, FILE_BG_DISH_SEG, FILE_BG_DISH_TILES, FILE_BG_SEVB_PADS, FILE_USETUPSEVB, FILE_UMP_SETUPSEVB, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x08*/ STAGE_CRASHSITE, 2, 255, 100, 100, 0, FILE_BG_AZT_SEG, FILE_BG_AZT_TILES, FILE_BG_AZT_PADS, FILE_USETUPAZT, FILE_UMP_SETUPAZT, 1, 0.5, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x09*/ STAGE_CHICAGO, 2, 255, 100, 100, 0, FILE_BG_PETE_SEG, FILE_BG_PETE_TILES, FILE_BG_PETE_PADS, FILE_USETUPPETE, FILE_UMP_SETUPPETE, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x0a*/ STAGE_G5BUILDING, 2, 255, 100, 100, 0, FILE_BG_DEPO_SEG, FILE_BG_DEPO_TILES, FILE_BG_DEPO_PADS, FILE_USETUPDEPO, FILE_UMP_SETUPDEPO, 1, 1, 100, 0, 0, 20, 220, 0x3e19999a, -1, 400, 0, 1, - /*0x0b*/ STAGE_MP_COMPLEX, 2, 255, 100, 100, 0, FILE_BG_REF_SEG, FILE_BG_REF_TILES, FILE_BG_REF_PADS, FILE_USETUPREF, FILE_UMP_SETUPREF, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x0c*/ STAGE_MP_G5BUILDING, 2, 255, 100, 100, 0, FILE_BG_CRYP_SEG, FILE_BG_CRYP_TILES, FILE_BG_CRYP_PADS, FILE_USETUPCRYP, FILE_UMP_SETUPCRYP, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, - /*0x0d*/ STAGE_PELAGIC, 2, 255, 100, 100, 0, FILE_BG_DAM_SEG, FILE_BG_DAM_TILES, FILE_BG_DAM_PADS, FILE_USETUPDAM, FILE_UMP_SETUPDAM, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x0e*/ STAGE_EXTRACTION, 2, 255, 100, 100, 0, FILE_BG_AME_SEG, FILE_BG_AME_TILES, FILE_BG_ARK_PADS, FILE_USETUPARK, FILE_UMP_SETUPARK, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x0f*/ STAGE_TEST_RUN, 2, 255, 100, 100, 0, FILE_BG_RUN_SEG, FILE_BG_RUN_TILES, FILE_BG_RUN_PADS, FILE_USETUPRUN, FILE_UMP_SETUPRUN, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x10*/ STAGE_24, 2, 255, 100, 100, 0, FILE_BG_SEVX_SEG, FILE_BG_SEVX_TILES, FILE_BG_SEVX_PADS, FILE_USETUPSEVX, FILE_UMP_SETUPSEVX, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x11*/ STAGE_MP_TEMPLE, 2, 255, 100, 100, 0, FILE_BG_JUN_SEG, FILE_BG_JUN_TILES, FILE_BG_JUN_PADS, FILE_USETUPJUN, FILE_UMP_SETUPJUN, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, - /*0x12*/ STAGE_CITRAINING, 2, 255, 100, 100, 0, FILE_BG_DISH_SEG, FILE_BG_DISH_TILES, FILE_BG_DISH_PADS, FILE_USETUPDISH, FILE_UMP_SETUPDISH, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x13*/ STAGE_AIRBASE, 2, 255, 100, 100, 0, FILE_BG_CAVE_SEG, FILE_BG_CAVE_TILES, FILE_BG_CAVE_PADS, FILE_USETUPCAVE, FILE_UMP_SETUPCAVE, 1, 0.5, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x14*/ STAGE_28, 2, 255, 100, 100, 0, FILE_BG_CAT_SEG, FILE_BG_CAT_TILES, FILE_BG_CAT_PADS, FILE_USETUPCAT, FILE_UMP_SETUPCAT, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 200, 800, 400, 1, - /*0x15*/ STAGE_MP_PIPES, 2, 255, 100, 100, 0, FILE_BG_CRAD_SEG, FILE_BG_CRAD_TILES, FILE_BG_CRAD_PADS, FILE_USETUPCRAD, FILE_UMP_SETUPCRAD, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, - /*0x16*/ STAGE_SKEDARRUINS, 2, 255, 100, 100, 0, FILE_BG_SHO_SEG, FILE_BG_SHO_TILES, FILE_BG_SHO_PADS, FILE_USETUPSHO, FILE_UMP_SETUPSHO, 1, 1, 100, 0, 0, 20, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x17*/ STAGE_2B, 2, 255, 100, 100, 0, FILE_BG_SEVX_SEG, FILE_BG_SEVX_TILES, FILE_BG_SEVX_PADS, FILE_USETUPSEVX, FILE_UMP_SETUPSEVX, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x18*/ STAGE_VILLA, 2, 255, 100, 100, 0, FILE_BG_ELD_SEG, FILE_BG_ELD_TILES, FILE_BG_ELD_PADS, FILE_USETUPELD, FILE_UMP_SETUPELD, 1, 0.5, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x19*/ STAGE_DEFENSE, 2, 255, 100, 100, 0, FILE_BG_DISH_SEG, FILE_BG_DISH_TILES, FILE_BG_IMP_PADS, FILE_USETUPIMP, FILE_UMP_SETUPIMP, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x1a*/ STAGE_TEST_ASH, 2, 255, 100, 100, 0, FILE_BG_ASH_SEG, FILE_BG_ASH_TILES, FILE_BG_ASH_PADS, FILE_USETUPASH, FILE_UMP_SETUPASH, 1, 1, 100, 0, 0, -1, 500, 0x3e19999a, -1, 400, 0, 1, - /*0x1b*/ STAGE_INFILTRATION, 2, 255, 100, 100, 0, FILE_BG_LUE_SEG, FILE_BG_LUE_TILES, FILE_BG_LUE_PADS, FILE_USETUPLUE, FILE_UMP_SETUPLUE, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x1c*/ STAGE_DEFECTION, 2, 255, 100, 100, 0, FILE_BG_AME_SEG, FILE_BG_AME_TILES, FILE_BG_AME_PADS, FILE_USETUPAME, FILE_UMP_SETUPAME, 1, 1, 100, 0, 0, 40, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x1d*/ STAGE_AIRFORCEONE, 2, 255, 100, 100, 0, FILE_BG_RIT_SEG, FILE_BG_RIT_TILES, FILE_BG_RIT_PADS, FILE_USETUPRIT, FILE_UMP_SETUPRIT, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x1e*/ STAGE_MP_SKEDAR, 2, 255, 100, 100, 0, FILE_BG_OAT_SEG, FILE_BG_OAT_TILES, FILE_BG_OAT_PADS, FILE_USETUPOAT, FILE_UMP_SETUPOAT, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, - /*0x1f*/ STAGE_INVESTIGATION, 2, 255, 100, 100, 0, FILE_BG_EAR_SEG, FILE_BG_EAR_TILES, FILE_BG_EAR_PADS, FILE_USETUPEAR, FILE_UMP_SETUPEAR, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x20*/ STAGE_ATTACKSHIP, 2, 255, 100, 100, 0, FILE_BG_LEE_SEG, FILE_BG_LEE_TILES, FILE_BG_LEE_PADS, FILE_USETUPLEE, FILE_UMP_SETUPLEE, 1, 1, 100, 0, 0, 40, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x21*/ STAGE_RESCUE, 2, 255, 100, 100, 0, FILE_BG_LUE_SEG, FILE_BG_LUE_TILES, FILE_BG_LIP_PADS, FILE_USETUPLIP, FILE_UMP_SETUPLIP, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x22*/ STAGE_TEST_LEN, 2, 255, 100, 100, 0, FILE_BG_LEN_SEG, FILE_BG_LEN_TILES, FILE_BG_LEN_PADS, FILE_USETUPLEN, FILE_UMP_SETUPLEN, 0.10040000081062, 1, 6.6844921112061, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x23*/ STAGE_MBR, 2, 255, 100, 100, 0, FILE_BG_AME_SEG, FILE_BG_AME_TILES, FILE_BG_AME_PADS, FILE_USETUPWAX, FILE_UMP_SETUPWAX, 1, 1, 100, 0, 0, 40, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x24*/ STAGE_DEEPSEA, 8, 96, 80, 200, 0, FILE_BG_PAM_SEG, FILE_BG_PAM_TILES, FILE_BG_PAM_PADS, FILE_USETUPPAM, FILE_UMP_SETUPPAM, 1, 1, 100, 0, 0, 30, 255, 0x3e4ccccd, 300, 600, 0, 1, - /*0x25*/ STAGE_TEST_UFF, 2, 255, 100, 100, 0, FILE_BG_UFF_SEG, FILE_BG_UFF_TILES, FILE_BG_UFF_PADS, FILE_USETUPUFF, FILE_UMP_SETUPUFF, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x26*/ STAGE_TEST_OLD, 2, 255, 100, 100, 0, FILE_BG_OLD_SEG, FILE_BG_OLD_TILES, FILE_BG_OLD_PADS, FILE_USETUPOLD, FILE_UMP_SETUPOLD, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x27*/ STAGE_DUEL, 2, 255, 100, 100, 0, FILE_BG_DISH_SEG, FILE_BG_DISH_TILES, FILE_BG_ATE_PADS, FILE_USETUPATE, FILE_UMP_SETUPATE, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x28*/ STAGE_TEST_LAM, 2, 255, 100, 100, 0, FILE_BG_LAM_SEG, FILE_BG_LAM_TILES, FILE_BG_LAM_PADS, FILE_USETUPLAM, FILE_UMP_SETUPLAM, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x29*/ STAGE_MP_BASE, 2, 255, 100, 100, 0, FILE_BG_MP1_SEG, FILE_BG_MP1_TILES, FILE_BG_MP1_PADS, FILE_USETUPMP1, FILE_UMP_SETUPMP1, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x2a*/ STAGE_TEST_MP2, 2, 255, 100, 100, 0, FILE_BG_MP2_SEG, FILE_BG_MP2_TILES, FILE_BG_MP2_PADS, FILE_USETUPMP2, FILE_UMP_SETUPMP2, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x2b*/ STAGE_MP_AREA52, 2, 255, 100, 100, 0, FILE_BG_MP3_SEG, FILE_BG_MP3_TILES, FILE_BG_MP3_PADS, FILE_USETUPMP3, FILE_UMP_SETUPMP3, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x2c*/ STAGE_MP_WAREHOUSE, 2, 255, 100, 100, 0, FILE_BG_MP4_SEG, FILE_BG_MP4_TILES, FILE_BG_MP4_PADS, FILE_USETUPMP4, FILE_UMP_SETUPMP4, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x2d*/ STAGE_MP_CARPARK, 2, 255, 100, 100, 0, FILE_BG_MP5_SEG, FILE_BG_MP5_TILES, FILE_BG_MP5_PADS, FILE_USETUPMP5, FILE_UMP_SETUPMP5, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x2e*/ STAGE_TEST_MP6, 2, 255, 100, 100, 0, FILE_BG_MP6_SEG, FILE_BG_MP6_TILES, FILE_BG_MP6_PADS, FILE_USETUPMP6, FILE_UMP_SETUPMP6, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x2f*/ STAGE_TEST_MP7, 2, 255, 100, 100, 0, FILE_BG_MP7_SEG, FILE_BG_MP7_TILES, FILE_BG_MP7_PADS, FILE_USETUPMP7, FILE_UMP_SETUPMP7, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x30*/ STAGE_TEST_MP8, 2, 255, 100, 100, 0, FILE_BG_MP8_SEG, FILE_BG_MP8_TILES, FILE_BG_MP8_PADS, FILE_USETUPMP8, FILE_UMP_SETUPMP8, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x31*/ STAGE_MP_RUINS, 2, 255, 100, 100, 0, FILE_BG_MP9_SEG, FILE_BG_MP9_TILES, FILE_BG_MP9_PADS, FILE_USETUPMP9, FILE_UMP_SETUPMP9, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x32*/ STAGE_MP_SEWERS, 2, 255, 100, 100, 0, FILE_BG_MP10_SEG, FILE_BG_MP10_TILES, FILE_BG_MP10_PADS, FILE_USETUPMP10, FILE_UMP_SETUPMP10, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x33*/ STAGE_MP_FELICITY, 2, 255, 100, 100, 0, FILE_BG_MP11_SEG, FILE_BG_MP11_TILES, FILE_BG_MP11_PADS, FILE_USETUPMP11, FILE_UMP_SETUPMP11, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x34*/ STAGE_MP_FORTRESS, 2, 255, 100, 100, 0, FILE_BG_MP12_SEG, FILE_BG_MP12_TILES, FILE_BG_MP12_PADS, FILE_USETUPMP12, FILE_UMP_SETUPMP12, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x35*/ STAGE_MP_VILLA, 2, 255, 100, 100, 0, FILE_BG_MP13_SEG, FILE_BG_MP13_TILES, FILE_BG_MP13_PADS, FILE_USETUPMP13, FILE_UMP_SETUPMP13, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x36*/ STAGE_TEST_MP14, 2, 255, 100, 100, 0, FILE_BG_MP14_SEG, FILE_BG_MP14_TILES, FILE_BG_MP14_PADS, FILE_USETUPMP14, FILE_UMP_SETUPMP14, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x37*/ STAGE_MP_GRID, 2, 255, 100, 100, 0, FILE_BG_MP15_SEG, FILE_BG_MP15_TILES, FILE_BG_MP15_PADS, FILE_USETUPMP15, FILE_UMP_SETUPMP15, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x38*/ STAGE_TEST_MP16, 2, 255, 100, 100, 0, FILE_BG_MP16_SEG, FILE_BG_MP16_TILES, FILE_BG_MP16_PADS, FILE_USETUPMP16, FILE_UMP_SETUPMP16, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x39*/ STAGE_TEST_MP17, 2, 255, 100, 100, 0, FILE_BG_MP17_SEG, FILE_BG_MP17_TILES, FILE_BG_MP17_PADS, FILE_USETUPMP17, FILE_UMP_SETUPMP17, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x3a*/ STAGE_TEST_MP18, 2, 255, 100, 100, 0, FILE_BG_MP18_SEG, FILE_BG_MP18_TILES, FILE_BG_MP18_PADS, FILE_USETUPMP18, FILE_UMP_SETUPMP18, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x3b*/ STAGE_TEST_MP19, 2, 255, 100, 100, 0, FILE_BG_MP19_SEG, FILE_BG_MP19_TILES, FILE_BG_MP19_PADS, FILE_USETUPMP19, FILE_UMP_SETUPMP19, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, - /*0x3c*/ STAGE_TEST_MP20, 2, 255, 100, 100, 0, FILE_BG_MP20_SEG, FILE_BG_MP20_TILES, FILE_BG_MP20_PADS, FILE_USETUPMP20, FILE_UMP_SETUPMP20, 1, 0.5, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + // id, light_type, lia, liw, lih, ?, bg, tiles, pads, setup, mpsetp, ? 0x18, 0x1c, ?, ?, ?, 0x24, 0x28, ?, ?, ? ? + /*0x00*/ STAGE_MAIANSOS, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_LUE_SEG, FILE_BG_LUE_TILES, FILE_BG_SEV_PADS, FILE_USETUPSEV, FILE_UMP_SETUPSEV, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x01*/ STAGE_TEST_SILO, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_OAT_SEG, FILE_BG_OAT_TILES, FILE_BG_OAT_PADS, FILE_USETUPSILO, FILE_UMP_SETUPSILO, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, + /*0x02*/ STAGE_WAR, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_SHO_SEG, FILE_BG_SHO_TILES, FILE_BG_STAT_PADS, FILE_USETUPSTAT, FILE_UMP_SETUPSTAT, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x03*/ STAGE_MP_RAVINE, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_AREC_SEG, FILE_BG_AREC_TILES, FILE_BG_AREC_PADS, FILE_USETUPAREC, FILE_UMP_SETUPAREC, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, + /*0x04*/ STAGE_TEST_ARCH, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_ARCH_SEG, FILE_BG_ARCH_TILES, FILE_BG_ARCH_PADS, FILE_USETUPARCH, FILE_UMP_SETUPARCH, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x05*/ STAGE_ESCAPE, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_LUE_SEG, FILE_BG_LUE_TILES, FILE_BG_TRA_PADS, FILE_USETUPTRA, FILE_UMP_SETUPTRA, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x06*/ STAGE_TEST_DEST, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_DEST_SEG, FILE_BG_DEST_TILES, FILE_BG_DEST_PADS, FILE_USETUPDEST, FILE_UMP_SETUPDEST, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x07*/ STAGE_RETAKING, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_DISH_SEG, FILE_BG_DISH_TILES, FILE_BG_SEVB_PADS, FILE_USETUPSEVB, FILE_UMP_SETUPSEVB, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x08*/ STAGE_CRASHSITE, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_AZT_SEG, FILE_BG_AZT_TILES, FILE_BG_AZT_PADS, FILE_USETUPAZT, FILE_UMP_SETUPAZT, 1, 0.5, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x09*/ STAGE_CHICAGO, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_PETE_SEG, FILE_BG_PETE_TILES, FILE_BG_PETE_PADS, FILE_USETUPPETE, FILE_UMP_SETUPPETE, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x0a*/ STAGE_G5BUILDING, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_DEPO_SEG, FILE_BG_DEPO_TILES, FILE_BG_DEPO_PADS, FILE_USETUPDEPO, FILE_UMP_SETUPDEPO, 1, 1, 100, 0, 0, 20, 220, 0x3e19999a, -1, 400, 0, 1, + /*0x0b*/ STAGE_MP_COMPLEX, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_REF_SEG, FILE_BG_REF_TILES, FILE_BG_REF_PADS, FILE_USETUPREF, FILE_UMP_SETUPREF, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x0c*/ STAGE_MP_G5BUILDING, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_CRYP_SEG, FILE_BG_CRYP_TILES, FILE_BG_CRYP_PADS, FILE_USETUPCRYP, FILE_UMP_SETUPCRYP, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, + /*0x0d*/ STAGE_PELAGIC, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_DAM_SEG, FILE_BG_DAM_TILES, FILE_BG_DAM_PADS, FILE_USETUPDAM, FILE_UMP_SETUPDAM, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x0e*/ STAGE_EXTRACTION, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_AME_SEG, FILE_BG_AME_TILES, FILE_BG_ARK_PADS, FILE_USETUPARK, FILE_UMP_SETUPARK, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x0f*/ STAGE_TEST_RUN, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_RUN_SEG, FILE_BG_RUN_TILES, FILE_BG_RUN_PADS, FILE_USETUPRUN, FILE_UMP_SETUPRUN, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x10*/ STAGE_24, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_SEVX_SEG, FILE_BG_SEVX_TILES, FILE_BG_SEVX_PADS, FILE_USETUPSEVX, FILE_UMP_SETUPSEVX, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x11*/ STAGE_MP_TEMPLE, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_JUN_SEG, FILE_BG_JUN_TILES, FILE_BG_JUN_PADS, FILE_USETUPJUN, FILE_UMP_SETUPJUN, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, + /*0x12*/ STAGE_CITRAINING, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_DISH_SEG, FILE_BG_DISH_TILES, FILE_BG_DISH_PADS, FILE_USETUPDISH, FILE_UMP_SETUPDISH, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x13*/ STAGE_AIRBASE, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_CAVE_SEG, FILE_BG_CAVE_TILES, FILE_BG_CAVE_PADS, FILE_USETUPCAVE, FILE_UMP_SETUPCAVE, 1, 0.5, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x14*/ STAGE_28, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_CAT_SEG, FILE_BG_CAT_TILES, FILE_BG_CAT_PADS, FILE_USETUPCAT, FILE_UMP_SETUPCAT, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 200, 800, 400, 1, + /*0x15*/ STAGE_MP_PIPES, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_CRAD_SEG, FILE_BG_CRAD_TILES, FILE_BG_CRAD_PADS, FILE_USETUPCRAD, FILE_UMP_SETUPCRAD, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, + /*0x16*/ STAGE_SKEDARRUINS, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_SHO_SEG, FILE_BG_SHO_TILES, FILE_BG_SHO_PADS, FILE_USETUPSHO, FILE_UMP_SETUPSHO, 1, 1, 100, 0, 0, 20, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x17*/ STAGE_2B, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_SEVX_SEG, FILE_BG_SEVX_TILES, FILE_BG_SEVX_PADS, FILE_USETUPSEVX, FILE_UMP_SETUPSEVX, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x18*/ STAGE_VILLA, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_ELD_SEG, FILE_BG_ELD_TILES, FILE_BG_ELD_PADS, FILE_USETUPELD, FILE_UMP_SETUPELD, 1, 0.5, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x19*/ STAGE_DEFENSE, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_DISH_SEG, FILE_BG_DISH_TILES, FILE_BG_IMP_PADS, FILE_USETUPIMP, FILE_UMP_SETUPIMP, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x1a*/ STAGE_TEST_ASH, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_ASH_SEG, FILE_BG_ASH_TILES, FILE_BG_ASH_PADS, FILE_USETUPASH, FILE_UMP_SETUPASH, 1, 1, 100, 0, 0, -1, 500, 0x3e19999a, -1, 400, 0, 1, + /*0x1b*/ STAGE_INFILTRATION, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_LUE_SEG, FILE_BG_LUE_TILES, FILE_BG_LUE_PADS, FILE_USETUPLUE, FILE_UMP_SETUPLUE, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x1c*/ STAGE_DEFECTION, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_AME_SEG, FILE_BG_AME_TILES, FILE_BG_AME_PADS, FILE_USETUPAME, FILE_UMP_SETUPAME, 1, 1, 100, 0, 0, 40, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x1d*/ STAGE_AIRFORCEONE, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_RIT_SEG, FILE_BG_RIT_TILES, FILE_BG_RIT_PADS, FILE_USETUPRIT, FILE_UMP_SETUPRIT, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x1e*/ STAGE_MP_SKEDAR, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_OAT_SEG, FILE_BG_OAT_TILES, FILE_BG_OAT_PADS, FILE_USETUPOAT, FILE_UMP_SETUPOAT, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, 700, 800, 400, 1, + /*0x1f*/ STAGE_INVESTIGATION, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_EAR_SEG, FILE_BG_EAR_TILES, FILE_BG_EAR_PADS, FILE_USETUPEAR, FILE_UMP_SETUPEAR, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x20*/ STAGE_ATTACKSHIP, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_LEE_SEG, FILE_BG_LEE_TILES, FILE_BG_LEE_PADS, FILE_USETUPLEE, FILE_UMP_SETUPLEE, 1, 1, 100, 0, 0, 40, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x21*/ STAGE_RESCUE, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_LUE_SEG, FILE_BG_LUE_TILES, FILE_BG_LIP_PADS, FILE_USETUPLIP, FILE_UMP_SETUPLIP, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x22*/ STAGE_TEST_LEN, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_LEN_SEG, FILE_BG_LEN_TILES, FILE_BG_LEN_PADS, FILE_USETUPLEN, FILE_UMP_SETUPLEN, 0.10040000081062, 1, 6.6844921112061, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x23*/ STAGE_MBR, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_AME_SEG, FILE_BG_AME_TILES, FILE_BG_AME_PADS, FILE_USETUPWAX, FILE_UMP_SETUPWAX, 1, 1, 100, 0, 0, 40, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x24*/ STAGE_DEEPSEA, TEX_LIGHT_08, 96, 80, 200, 0, FILE_BG_PAM_SEG, FILE_BG_PAM_TILES, FILE_BG_PAM_PADS, FILE_USETUPPAM, FILE_UMP_SETUPPAM, 1, 1, 100, 0, 0, 30, 255, 0x3e4ccccd, 300, 600, 0, 1, + /*0x25*/ STAGE_TEST_UFF, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_UFF_SEG, FILE_BG_UFF_TILES, FILE_BG_UFF_PADS, FILE_USETUPUFF, FILE_UMP_SETUPUFF, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x26*/ STAGE_TEST_OLD, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_OLD_SEG, FILE_BG_OLD_TILES, FILE_BG_OLD_PADS, FILE_USETUPOLD, FILE_UMP_SETUPOLD, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x27*/ STAGE_DUEL, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_DISH_SEG, FILE_BG_DISH_TILES, FILE_BG_ATE_PADS, FILE_USETUPATE, FILE_UMP_SETUPATE, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x28*/ STAGE_TEST_LAM, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_LAM_SEG, FILE_BG_LAM_TILES, FILE_BG_LAM_PADS, FILE_USETUPLAM, FILE_UMP_SETUPLAM, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x29*/ STAGE_MP_BASE, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP1_SEG, FILE_BG_MP1_TILES, FILE_BG_MP1_PADS, FILE_USETUPMP1, FILE_UMP_SETUPMP1, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x2a*/ STAGE_TEST_MP2, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP2_SEG, FILE_BG_MP2_TILES, FILE_BG_MP2_PADS, FILE_USETUPMP2, FILE_UMP_SETUPMP2, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x2b*/ STAGE_MP_AREA52, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP3_SEG, FILE_BG_MP3_TILES, FILE_BG_MP3_PADS, FILE_USETUPMP3, FILE_UMP_SETUPMP3, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x2c*/ STAGE_MP_WAREHOUSE, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP4_SEG, FILE_BG_MP4_TILES, FILE_BG_MP4_PADS, FILE_USETUPMP4, FILE_UMP_SETUPMP4, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x2d*/ STAGE_MP_CARPARK, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP5_SEG, FILE_BG_MP5_TILES, FILE_BG_MP5_PADS, FILE_USETUPMP5, FILE_UMP_SETUPMP5, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x2e*/ STAGE_TEST_MP6, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP6_SEG, FILE_BG_MP6_TILES, FILE_BG_MP6_PADS, FILE_USETUPMP6, FILE_UMP_SETUPMP6, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x2f*/ STAGE_TEST_MP7, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP7_SEG, FILE_BG_MP7_TILES, FILE_BG_MP7_PADS, FILE_USETUPMP7, FILE_UMP_SETUPMP7, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x30*/ STAGE_TEST_MP8, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP8_SEG, FILE_BG_MP8_TILES, FILE_BG_MP8_PADS, FILE_USETUPMP8, FILE_UMP_SETUPMP8, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x31*/ STAGE_MP_RUINS, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP9_SEG, FILE_BG_MP9_TILES, FILE_BG_MP9_PADS, FILE_USETUPMP9, FILE_UMP_SETUPMP9, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x32*/ STAGE_MP_SEWERS, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP10_SEG, FILE_BG_MP10_TILES, FILE_BG_MP10_PADS, FILE_USETUPMP10, FILE_UMP_SETUPMP10, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x33*/ STAGE_MP_FELICITY, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP11_SEG, FILE_BG_MP11_TILES, FILE_BG_MP11_PADS, FILE_USETUPMP11, FILE_UMP_SETUPMP11, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x34*/ STAGE_MP_FORTRESS, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP12_SEG, FILE_BG_MP12_TILES, FILE_BG_MP12_PADS, FILE_USETUPMP12, FILE_UMP_SETUPMP12, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x35*/ STAGE_MP_VILLA, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP13_SEG, FILE_BG_MP13_TILES, FILE_BG_MP13_PADS, FILE_USETUPMP13, FILE_UMP_SETUPMP13, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x36*/ STAGE_TEST_MP14, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP14_SEG, FILE_BG_MP14_TILES, FILE_BG_MP14_PADS, FILE_USETUPMP14, FILE_UMP_SETUPMP14, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x37*/ STAGE_MP_GRID, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP15_SEG, FILE_BG_MP15_TILES, FILE_BG_MP15_PADS, FILE_USETUPMP15, FILE_UMP_SETUPMP15, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x38*/ STAGE_TEST_MP16, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP16_SEG, FILE_BG_MP16_TILES, FILE_BG_MP16_PADS, FILE_USETUPMP16, FILE_UMP_SETUPMP16, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x39*/ STAGE_TEST_MP17, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP17_SEG, FILE_BG_MP17_TILES, FILE_BG_MP17_PADS, FILE_USETUPMP17, FILE_UMP_SETUPMP17, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x3a*/ STAGE_TEST_MP18, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP18_SEG, FILE_BG_MP18_TILES, FILE_BG_MP18_PADS, FILE_USETUPMP18, FILE_UMP_SETUPMP18, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x3b*/ STAGE_TEST_MP19, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP19_SEG, FILE_BG_MP19_TILES, FILE_BG_MP19_PADS, FILE_USETUPMP19, FILE_UMP_SETUPMP19, 1, 1, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, + /*0x3c*/ STAGE_TEST_MP20, TEX_LIGHT_02, 255, 100, 100, 0, FILE_BG_MP20_SEG, FILE_BG_MP20_TILES, FILE_BG_MP20_PADS, FILE_USETUPMP20, FILE_UMP_SETUPMP20, 1, 0.5, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, }; struct stagetableentry *stage_get_current(void) diff --git a/src/game/title.c b/src/game/title.c index ddf17595a..16d6040bd 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -399,7 +399,7 @@ Gfx *title_render_legal(Gfx *gdl) gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - tex_select(&gdl, &g_TexGeneralConfigs[47], 1, 0, 2, 1, 0); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_DOLBYLOGO], 1, 0, 2, 1, 0); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -422,7 +422,7 @@ Gfx *title_render_legal(Gfx *gdl) gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - tex_select(&gdl, &g_TexGeneralConfigs[49], 1, 0, 2, 1, 0); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_RARELOGO], 1, 0, 2, 1, 0); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); diff --git a/src/game/trainingmenus.c b/src/game/trainingmenus.c index 9906e4e95..a36b9f098 100644 --- a/src/game/trainingmenus.c +++ b/src/game/trainingmenus.c @@ -166,7 +166,7 @@ MenuItemHandlerResult fr_weapon_list_menu_handler(s32 operation, struct menuitem gDPSetTextureConvert(gdl++, G_TC_FILT); gDPSetTextureFilter(gdl++, G_TF_POINT); - tex_select(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_ENVSTAR], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -577,7 +577,7 @@ MenuItemHandlerResult fr_scoring_menu_handler(s32 operation, struct menuitem *it s32 y; s32 textheight; s32 textwidth; - struct textureconfig *tconfig = &g_TexGeneralConfigs[50]; + struct textureconfig *tconfig = &g_TexGeneralConfigs[TEX_GENERAL_FRTARGET]; struct frdata *frdata = fr_get_data(); char text[128]; bool failed = frdata->menutype == FRMENUTYPE_FAILED; @@ -2545,7 +2545,22 @@ MenuItemHandlerResult ci_hangar_title_menu_handler(s32 operation, struct menuite if (index < NUM_BIO_LOCATIONS) { // Location bio - render texture - u8 texturenums[] = { 0x1b, 0x0d, 0x0e, 0x10, 0x11, 0x12, 0x13, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1c, 0x1d }; + u8 texturenums[] = { + TEX_GENERAL_DEFENSE, + TEX_GENERAL_DEFECTION, + TEX_GENERAL_INVESTIGATION, + TEX_GENERAL_VILLA, + TEX_GENERAL_CHICAGO, + TEX_GENERAL_G5BUILDING, + TEX_GENERAL_INFILTRATION, + TEX_GENERAL_AIRBASE, + TEX_GENERAL_AIRFORCEONE, + TEX_GENERAL_CRASHSITE, + TEX_GENERAL_PELAGIC, + TEX_GENERAL_DEEPSEA, + TEX_GENERAL_ATTACKSHIP, + TEX_GENERAL_SKEDARRUINS, + }; s32 texturenum = texturenums[index]; gDPPipeSync(gdl++); diff --git a/src/game/weather.c b/src/game/weather.c index 0ecdcde51..6f4138277 100644 --- a/src/game/weather.c +++ b/src/game/weather.c @@ -49,7 +49,7 @@ Gfx *weather_render(Gfx *gdl) gSPDisplayList(gdl++, &var80061380); if (weather->type == WEATHERTYPE_SNOW) { - tex_select(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_1PXWHITE], 2, 1, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_NOISE); @@ -822,7 +822,7 @@ Gfx *weather_render_rain(Gfx *gdl, struct weatherdata *weather, s32 arg2) timings1[i] = 0; } - tex_select(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_1PXWHITE], 2, 1, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_DISABLE); @@ -1401,7 +1401,7 @@ Gfx *weather_render_snow(Gfx *gdl, struct weatherdata *weather, s32 arg2) static u32 snowcol1 = 0x8888aaff; static u32 snowcol2 = 0xffffff7f; - tex_select(&gdl, &g_TexGeneralConfigs[0], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[TEX_GENERAL_SNOW], 4, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_DISABLE); diff --git a/src/include/constants.h b/src/include/constants.h index 96e9d2c58..63a7245d5 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -4114,6 +4114,200 @@ #define TELEPORTSTATE_WHITE 3 #define TELEPORTSTATE_EXITING 4 +#define TEX_BEAM_ORANGE 0 +#define TEX_BEAM_BLUE 1 +#define TEX_BEAM_RED 2 +#define TEX_BEAM_YELLOW 3 +#define TEX_BEAM_GREEN 4 + +#define TEX_ENV_00 0 +#define TEX_ENV_01 1 +#define TEX_ENV_02 2 + +#define TEX_GECROSSHAIR_00 0 + +#define TEX_GENERAL_SNOW 0 +#define TEX_GENERAL_1PXWHITE 1 +#define TEX_GENERAL_02 2 +#define TEX_GENERAL_LASERBEAM 3 +#define TEX_GENERAL_LASERDOT 4 +#define TEX_GENERAL_05 5 +#define TEX_GENERAL_MENURAY0 6 +#define TEX_GENERAL_07 7 +#define TEX_GENERAL_08 8 +#define TEX_GENERAL_09 9 +#define TEX_GENERAL_NBOMBDOME 10 +#define TEX_GENERAL_MENURAY1 11 +#define TEX_GENERAL_NEWAGENT 12 +#define TEX_GENERAL_DEFECTION 13 +#define TEX_GENERAL_INVESTIGATION 14 +#define TEX_GENERAL_EXTRACTION 15 +#define TEX_GENERAL_VILLA 16 +#define TEX_GENERAL_CHICAGO 17 +#define TEX_GENERAL_G5BUILDING 18 +#define TEX_GENERAL_INFILTRATION 19 +#define TEX_GENERAL_RESCUE 20 +#define TEX_GENERAL_ESCAPE 21 +#define TEX_GENERAL_AIRBASE 22 +#define TEX_GENERAL_AIRFORCEONE 23 +#define TEX_GENERAL_CRASHSITE 24 +#define TEX_GENERAL_PELAGIC 25 +#define TEX_GENERAL_DEEPSEA 26 +#define TEX_GENERAL_DEFENSE 27 +#define TEX_GENERAL_ATTACKSHIP 28 +#define TEX_GENERAL_SKEDARRUINS 29 +#define TEX_GENERAL_MBR 30 +#define TEX_GENERAL_MAIANSOS 31 +#define TEX_GENERAL_WAR 32 +#define TEX_GENERAL_DUEL 33 +#define TEX_GENERAL_GOLDSTAR 34 +#define TEX_GENERAL_ENVSTAR 35 +#define TEX_GENERAL_SILVERSTAR 36 +#define TEX_GENERAL_37 37 +#define TEX_GENERAL_38 38 +#define TEX_GENERAL_39 39 +#define TEX_GENERAL_40 40 +#define TEX_GENERAL_41 41 +#define TEX_GENERAL_42 42 +#define TEX_GENERAL_43 43 +#define TEX_GENERAL_44 44 +#define TEX_GENERAL_45 45 +#define TEX_GENERAL_46 46 +#define TEX_GENERAL_DOLBYLOGO 47 +#define TEX_GENERAL_48 48 +#define TEX_GENERAL_RARELOGO 49 +#define TEX_GENERAL_FRTARGET 50 +#define TEX_GENERAL_CONTROLLER_TL 51 +#define TEX_GENERAL_CONTROLLER_TR 52 +#define TEX_GENERAL_CONTROLLER_BL 53 +#define TEX_GENERAL_CONTROLLER_BR 54 +#define TEX_GENERAL_CONTROLLER_LINE 55 + +#define TEX_MUZZLE_LASER 0 + +#define TEX_LASER_00 0 + +#define TEX_LIGHT_00 0 +#define TEX_LIGHT_01 1 +#define TEX_LIGHT_02 2 +#define TEX_LIGHT_03 3 +#define TEX_LIGHT_04 4 +#define TEX_LIGHT_05 5 +#define TEX_LIGHT_06 6 +#define TEX_LIGHT_07 7 +#define TEX_LIGHT_08 8 +#define TEX_LIGHT_09 9 + +#define TEX_RADAR_BG 0 + +#define TEX_REDLINE_00 0 + +#define TEX_SCREEN_BOND 0 +#define TEX_SCREEN_NOKAYOH 1 +#define TEX_SCREEN_BENOH_APMEA 2 +#define TEX_SCREEN_TAPLET 3 +#define TEX_SCREEN_CEBEPHAEA 4 +#define TEX_SCREEN_NOPATYTAPLET 5 +#define TEX_SCREEN_BLACKBAR 6 +#define TEX_SCREEN_SPACEDEBRIS 7 +#define TEX_SCREEN_TEXTURETOOL 8 +#define TEX_SCREEN_WORLDMAP1 9 +#define TEX_SCREEN_3DSHAPE 10 +#define TEX_SCREEN_WINDOWS1 11 +#define TEX_SCREEN_COLOURPICKERS 12 +#define TEX_SCREEN_EGG 13 +#define TEX_SCREEN_WINDOWS2 14 +#define TEX_SCREEN_WINDOWS3 15 +#define TEX_SCREEN_WIREFRAME 16 +#define TEX_SCREEN_ROCKET1 17 +#define TEX_SCREEN_ROCKET2 18 +#define TEX_SCREEN_EARTH2 19 +#define TEX_SCREEN_EARTH3 20 +#define TEX_SCREEN_GALAXY3 21 +#define TEX_SCREEN_GALAXY4 22 +#define TEX_SCREEN_GALAXY5 23 +#define TEX_SCREEN_GALAXY6 24 +#define TEX_SCREEN_GALAXY7 25 +#define TEX_SCREEN_GALAXY8 26 +#define TEX_SCREEN_STATIC 27 +#define TEX_SCREEN_SINEWAVE 28 +#define TEX_SCREEN_TEXT 29 +#define TEX_SCREEN_BARS 30 +#define TEX_SCREEN_SQUARES 31 +#define TEX_SCREEN_COP_FRAME1 32 +#define TEX_SCREEN_COP_FRAME2 33 +#define TEX_SCREEN_COP_FRAME3 34 +#define TEX_SCREEN_COP_FRAME4 35 +#define TEX_SCREEN_SKATE_FRAME1 36 +#define TEX_SCREEN_SKATE_FRAME2 37 +#define TEX_SCREEN_SKATE_FRAME3 38 +#define TEX_SCREEN_SKATE_FRAME4 39 +#define TEX_SCREEN_KARL_FRAME1 40 +#define TEX_SCREEN_KARL_FRAME2 41 +#define TEX_SCREEN_KARL_FRAME3 42 +#define TEX_SCREEN_KARL_FRAME4 43 +#define TEX_SCREEN_WORLDMAP2 44 +#define TEX_SCREEN_CUBE_FRAME1 45 +#define TEX_SCREEN_CUBE_FRAME2 46 +#define TEX_SCREEN_CUBE_FRAME3 47 +#define TEX_SCREEN_CUBE_FRAME4 48 +#define TEX_SCREEN_FILL 49 +#define TEX_SCREEN_TRANSPARENT 50 +#define TEX_SCREEN_MAIAN 51 +#define TEX_SCREEN_WHITECOAT_FRAME1 52 +#define TEX_SCREEN_WHITECOAT_FRAME2 53 +#define TEX_SCREEN_WHITECOAT_FRAME3 54 +#define TEX_SCREEN_WHITECOAT_FRAME4 55 +#define TEX_SCREEN_FINGER_FRAME1 56 +#define TEX_SCREEN_FINGER_FRAME2 57 +#define TEX_SCREEN_FINGER_FRAME3 58 +#define TEX_SCREEN_FINGER_FRAME4 59 +#define TEX_SCREEN_FIST_FRAME1 60 +#define TEX_SCREEN_FIST_FRAME2 61 +#define TEX_SCREEN_PATROL1_FRAME1 62 +#define TEX_SCREEN_PATROL1_FRAME2 63 +#define TEX_SCREEN_PATROL1_FRAME3 64 +#define TEX_SCREEN_PATROL1_FRAME4 65 +#define TEX_SCREEN_PATROL1_FRAME5 66 +#define TEX_SCREEN_PATROL2_FRAME1 67 +#define TEX_SCREEN_PATROL2_FRAME2 68 +#define TEX_SCREEN_PATROL2_FRAME3 69 +#define TEX_SCREEN_PATROL2_FRAME4 70 +#define TEX_SCREEN_PATROL2_FRAME5 71 +#define TEX_SCREEN_BIO 72 +#define TEX_SCREEN_JOHEAD 73 +#define TEX_SCREEN_JOFROCK 74 +#define TEX_SCREEN_PLANET1 75 +#define TEX_SCREEN_PLANET2 76 +#define TEX_SCREEN_PLANET3 77 +#define TEX_SCREEN_SKEDAR 78 +#define TEX_SCREEN_STRIPEDSHIRT_FRAME1 79 +#define TEX_SCREEN_STRIPEDSHIRT_FRAME2 80 +#define TEX_SCREEN_STRIPEDSHIRT_FRAME3 81 +#define TEX_SCREEN_STRIPEDSHIRT_FRAME4 82 +#define TEX_SCREEN_CASSHEAD 83 +#define TEX_SCREEN_DIAGRAM 84 +#define TEX_SCREEN_GALAXY1 85 +#define TEX_SCREEN_STAR 86 +#define TEX_SCREEN_GALAXY2 87 +#define TEX_SCREEN_NEBULA 88 +#define TEX_SCREEN_SYMBOLS 89 +#define TEX_SCREEN_GREENOBJECT1 90 +#define TEX_SCREEN_GREENOBJECT2 91 +#define TEX_SCREEN_GREENOBJECT3 92 +#define TEX_SCREEN_PCSTAND 93 +#define TEX_SCREEN_EARTH 94 +#define TEX_SCREEN_SHRINE 95 + +#define TEX_SHADOW_00 0 + +#define TEX_SHARD_00 0 +#define TEX_SHARD_01 1 + +#define TEX_SHIELD_00 0 + +#define TEX_SPARK_00 0 + #define TEXCOMPMETHOD_UNCOMPRESSED0 0 #define TEXCOMPMETHOD_UNCOMPRESSED1 1 #define TEXCOMPMETHOD_HUFFMAN 2 diff --git a/src/include/game/gunfx.h b/src/include/game/gunfx.h index d64e58744..2866b1ac6 100644 --- a/src/include/game/gunfx.h +++ b/src/include/game/gunfx.h @@ -9,7 +9,7 @@ void lasersights_reset(void); void beam_create(struct beam *beam, s32 weaponnum, struct coord *from, struct coord *to); void beam_create_for_hand(s32 handnum); -Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3); +Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 texnum); void beam_tick(struct beam *beam); void casing_create_for_hand(s32 handnum, f32 ground, Mtxf *mtx); diff --git a/src/textureconfig.c b/src/textureconfig.c index 8df7bc9f1..e20e8322d 100644 --- a/src/textureconfig.c +++ b/src/textureconfig.c @@ -2,6 +2,7 @@ #include "data.h" #include "textureconfig.h" #include "types.h" +#include "textures.h" Gfx g_TcGdl1[] = { gsDPPipeSync(), @@ -11,7 +12,7 @@ Gfx g_TcGdl1[] = { gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), gsSPTexture(0xffff, 0xffff, 0, G_TX_RENDERTILE, G_ON), gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, 0xabcd002a), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, 0xabcd0000 | TEXTURE_002A), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1567, 0), gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 7, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD), @@ -43,7 +44,7 @@ Gfx g_TcGdl3[] = { gsDPSetTextureLOD(G_TL_TILE), gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), gsSPTexture(0xffff, 0xffff, 0, G_TX_RENDERTILE, G_ON), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, 0xabcd0002), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, 0xabcd0000 | TEXTURE_0002), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 511, 0), gsDPPipeSync(), @@ -54,271 +55,271 @@ Gfx g_TcGdl3[] = { }; struct texturepair g_TcExplosionTexturePairs[] = { - { 0x1e, 0x1f }, - { 0x20, 0x21 }, - { 0x22, 0x23 }, - { 0x24, 0x25 }, - { 0x26, 0x27 }, - { 0x28, 0x29 }, - { 0x2a, 0x2b }, - { 0x2c, 0x2d }, - { 0x2e, 0x2f }, - { 0x30, 0x31 }, - { 0x32, 0x33 }, - { 0x34, 0x35 }, - { 0x36, 0x37 }, - { 0x38, 0x39 }, - { 0x3a, 0x3b }, + { TEXTURE_001E, TEXTURE_001F }, + { TEXTURE_0020, TEXTURE_0021 }, + { TEXTURE_0022, TEXTURE_0023 }, + { TEXTURE_0024, TEXTURE_0025 }, + { TEXTURE_0026, TEXTURE_0027 }, + { TEXTURE_0028, TEXTURE_0029 }, + { TEXTURE_002A, TEXTURE_002B }, + { TEXTURE_002C, TEXTURE_002D }, + { TEXTURE_002E, TEXTURE_002F }, + { TEXTURE_0030, TEXTURE_0031 }, + { TEXTURE_0032, TEXTURE_0033 }, + { TEXTURE_0034, TEXTURE_0035 }, + { TEXTURE_0036, TEXTURE_0037 }, + { TEXTURE_0038, TEXTURE_0039 }, + { TEXTURE_003A, TEXTURE_003B }, }; struct textureconfig g_TcWallhitConfigs[] = { - /* 0*/ { 0x0003, 48, 48, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 1*/ { 0x0c27, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 2*/ { 0x0da5, 64, 48, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 3*/ { 0x0003, 48, 48, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 4*/ { 0x0003, 48, 48, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 5*/ { 0x0003, 48, 48, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 6*/ { 0x0004, 32, 32, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 7*/ { 0x0005, 54, 54, 3, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 8*/ { 0x0c28, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 9*/ { 0x0854, 48, 48, 5, G_IM_FMT_IA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*10*/ { 0x0855, 48, 48, 5, G_IM_FMT_IA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*11*/ { 0x0856, 48, 48, 5, G_IM_FMT_IA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*12*/ { 0x08f0, 24, 24, 5, G_IM_FMT_IA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*13*/ { 0x0b53, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*14*/ { 0x0b53, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*15*/ { 0x0b53, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*16*/ { 0x0d74, 32, 24, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, - /*17*/ { 0x0d72, 32, 24, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, + /* 0*/ { TEXTURE_0003, 48, 48, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 1*/ { TEXTURE_0C27, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 2*/ { TEXTURE_0DA5, 64, 48, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 3*/ { TEXTURE_0003, 48, 48, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 4*/ { TEXTURE_0003, 48, 48, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 5*/ { TEXTURE_0003, 48, 48, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 6*/ { TEXTURE_0004, 32, 32, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 7*/ { TEXTURE_0005, 54, 54, 3, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 8*/ { TEXTURE_0C28, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 9*/ { TEXTURE_0854, 48, 48, 5, G_IM_FMT_IA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*10*/ { TEXTURE_0855, 48, 48, 5, G_IM_FMT_IA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*11*/ { TEXTURE_0856, 48, 48, 5, G_IM_FMT_IA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*12*/ { TEXTURE_08F0, 24, 24, 5, G_IM_FMT_IA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*13*/ { TEXTURE_0B53, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*14*/ { TEXTURE_0B53, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*15*/ { TEXTURE_0B53, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*16*/ { TEXTURE_0D74, 32, 24, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, + /*17*/ { TEXTURE_0D72, 32, 24, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, }; struct textureconfig g_TcBeamConfigs[] = { - /*0*/ { 0x0006, 16, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, - /*1*/ { 0x0007, 16, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, - /*2*/ { 0x0008, 16, 32, 1, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, - /*3*/ { 0x0859, 16, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, - /*4*/ { 0x085a, 16, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, + /*0*/ { TEXTURE_0006, 16, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, + /*1*/ { TEXTURE_0007, 16, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, + /*2*/ { TEXTURE_0008, 16, 32, 1, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, + /*3*/ { TEXTURE_0859, 16, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, + /*4*/ { TEXTURE_085A, 16, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, }; struct textureconfig g_TcLaserConfigs[] = { - /*0*/ { 0x0009, 16, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, + /*0*/ { TEXTURE_0009, 16, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, }; struct textureconfig g_TcGroup03Configs[] = { - /*0*/ { 0x000a, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, + /*0*/ { TEXTURE_000A, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, }; struct textureconfig g_TcGeCrosshairConfigs[] = { - /*0*/ { 0x000b, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, + /*0*/ { TEXTURE_000B, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, }; struct textureconfig g_TcRedLineConfigs[] = { - /*0*/ { 0x0c31, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, + /*0*/ { TEXTURE_0C31, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, }; struct textureconfig g_TcShadowConfigs[] = { - /*0*/ { 0x000c, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*0*/ { TEXTURE_000C, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, }; struct textureconfig g_TcShieldConfigs[] = { - /*0*/ { 0x000d, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*0*/ { TEXTURE_000D, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, }; struct textureconfig g_TcShardConfigs[] = { - /*0*/ { 0x0c32, 32, 1, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*1*/ { 0x000e, 54, 54, 3, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*0*/ { TEXTURE_0C32, 32, 1, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*1*/ { TEXTURE_000E, 54, 54, 3, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, }; struct textureconfig g_TcScreenConfigs[] = { - /* 0*/ { 0x000f, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /* 1*/ { 0x0c33, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /* 2*/ { 0x0c34, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /* 3*/ { 0x0c35, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /* 4*/ { 0x0c36, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /* 5*/ { 0x0c37, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /* 6*/ { 0x0c38, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /* 7*/ { 0x0c39, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /* 8*/ { 0x0c3a, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /* 9*/ { 0x0c3b, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*10*/ { 0x0010, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*11*/ { 0x0c3c, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*12*/ { 0x0c3d, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*13*/ { 0x0c3e, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*14*/ { 0x0c3f, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*15*/ { 0x0c40, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*16*/ { 0x0c41, 16, 16, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*17*/ { 0x0c42, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*18*/ { 0x0c43, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*19*/ { 0x0c45, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*20*/ { 0x0c46, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*21*/ { 0x0c47, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*22*/ { 0x0c48, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*23*/ { 0x0c49, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*24*/ { 0x0c4a, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*25*/ { 0x0c4b, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*26*/ { 0x0c4c, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*27*/ { 0x0c4d, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*28*/ { 0x0c4e, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*29*/ { 0x0011, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*30*/ { 0x0012, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*31*/ { 0x0c4f, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*32*/ { 0x0c50, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*33*/ { 0x0c51, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*34*/ { 0x0c52, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*35*/ { 0x0c53, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*36*/ { 0x0c54, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*37*/ { 0x0c55, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*38*/ { 0x0c56, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*39*/ { 0x0c57, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*40*/ { 0x0c58, 32, 32, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*41*/ { 0x0c59, 32, 32, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*42*/ { 0x0c5a, 32, 32, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*43*/ { 0x0c5b, 32, 32, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*44*/ { 0x0c5c, 128, 48, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_CLAMP }, - /*45*/ { 0x0c5d, 16, 16, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*46*/ { 0x0c5e, 16, 16, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*47*/ { 0x0c5f, 16, 16, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*48*/ { 0x0c60, 54, 54, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*49*/ { 0x0c61, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*50*/ { 0x0c62, 32, 32, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*51*/ { 0x0c63, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*52*/ { 0x0c64, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*53*/ { 0x0c65, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*54*/ { 0x0c66, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*55*/ { 0x0c67, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*56*/ { 0x0c68, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*57*/ { 0x0c69, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*58*/ { 0x0c6c, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*59*/ { 0x0c6d, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*60*/ { 0x0c6a, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*61*/ { 0x0c6b, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*62*/ { 0x0c6e, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*63*/ { 0x0c6f, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*64*/ { 0x0c70, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*65*/ { 0x0c71, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*66*/ { 0x0c72, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*67*/ { 0x0c73, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*68*/ { 0x0c74, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*69*/ { 0x0c75, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*70*/ { 0x0c76, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*71*/ { 0x0c77, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*72*/ { 0x0c78, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*73*/ { 0x0c79, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*74*/ { 0x0c7a, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*75*/ { 0x0c7b, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*76*/ { 0x0c7c, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*77*/ { 0x0c7d, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*78*/ { 0x0c7e, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*79*/ { 0x0c7f, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*80*/ { 0x0c80, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*81*/ { 0x0c81, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*82*/ { 0x0c82, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*83*/ { 0x0c83, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*84*/ { 0x0c84, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*85*/ { 0x0c85, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*86*/ { 0x0c86, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*87*/ { 0x0c87, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*88*/ { 0x0c88, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*89*/ { 0x0c89, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*90*/ { 0x0c8a, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*91*/ { 0x0c8b, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*92*/ { 0x0c8c, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*93*/ { 0x0c8d, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*94*/ { 0x0c8e, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*95*/ { 0x0c8f, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /* 0*/ { TEXTURE_000F, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /* 1*/ { TEXTURE_0C33, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /* 2*/ { TEXTURE_0C34, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /* 3*/ { TEXTURE_0C35, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /* 4*/ { TEXTURE_0C36, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /* 5*/ { TEXTURE_0C37, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /* 6*/ { TEXTURE_0C38, 128, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /* 7*/ { TEXTURE_0C39, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /* 8*/ { TEXTURE_0C3A, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /* 9*/ { TEXTURE_0C3B, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*10*/ { TEXTURE_0010, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*11*/ { TEXTURE_0C3C, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*12*/ { TEXTURE_0C3D, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*13*/ { TEXTURE_0C3E, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*14*/ { TEXTURE_0C3F, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*15*/ { TEXTURE_0C40, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*16*/ { TEXTURE_0C41, 16, 16, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*17*/ { TEXTURE_0C42, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*18*/ { TEXTURE_0C43, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*19*/ { TEXTURE_0C45, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*20*/ { TEXTURE_0C46, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*21*/ { TEXTURE_0C47, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*22*/ { TEXTURE_0C48, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*23*/ { TEXTURE_0C49, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*24*/ { TEXTURE_0C4A, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*25*/ { TEXTURE_0C4B, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*26*/ { TEXTURE_0C4C, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*27*/ { TEXTURE_0C4D, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*28*/ { TEXTURE_0C4E, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*29*/ { TEXTURE_0011, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*30*/ { TEXTURE_0012, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*31*/ { TEXTURE_0C4F, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*32*/ { TEXTURE_0C50, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*33*/ { TEXTURE_0C51, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*34*/ { TEXTURE_0C52, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*35*/ { TEXTURE_0C53, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*36*/ { TEXTURE_0C54, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*37*/ { TEXTURE_0C55, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*38*/ { TEXTURE_0C56, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*39*/ { TEXTURE_0C57, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*40*/ { TEXTURE_0C58, 32, 32, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*41*/ { TEXTURE_0C59, 32, 32, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*42*/ { TEXTURE_0C5A, 32, 32, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*43*/ { TEXTURE_0C5B, 32, 32, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*44*/ { TEXTURE_0C5C, 128, 48, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_CLAMP }, + /*45*/ { TEXTURE_0C5D, 16, 16, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*46*/ { TEXTURE_0C5E, 16, 16, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*47*/ { TEXTURE_0C5F, 16, 16, 5, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*48*/ { TEXTURE_0C60, 54, 54, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*49*/ { TEXTURE_0C61, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*50*/ { TEXTURE_0C62, 32, 32, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*51*/ { TEXTURE_0C63, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*52*/ { TEXTURE_0C64, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*53*/ { TEXTURE_0C65, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*54*/ { TEXTURE_0C66, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*55*/ { TEXTURE_0C67, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*56*/ { TEXTURE_0C68, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*57*/ { TEXTURE_0C69, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*58*/ { TEXTURE_0C6C, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*59*/ { TEXTURE_0C6D, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*60*/ { TEXTURE_0C6A, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*61*/ { TEXTURE_0C6B, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*62*/ { TEXTURE_0C6E, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*63*/ { TEXTURE_0C6F, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*64*/ { TEXTURE_0C70, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*65*/ { TEXTURE_0C71, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*66*/ { TEXTURE_0C72, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*67*/ { TEXTURE_0C73, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*68*/ { TEXTURE_0C74, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*69*/ { TEXTURE_0C75, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*70*/ { TEXTURE_0C76, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*71*/ { TEXTURE_0C77, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*72*/ { TEXTURE_0C78, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*73*/ { TEXTURE_0C79, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*74*/ { TEXTURE_0C7A, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*75*/ { TEXTURE_0C7B, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*76*/ { TEXTURE_0C7C, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*77*/ { TEXTURE_0C7D, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*78*/ { TEXTURE_0C7E, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*79*/ { TEXTURE_0C7F, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*80*/ { TEXTURE_0C80, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*81*/ { TEXTURE_0C81, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*82*/ { TEXTURE_0C82, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*83*/ { TEXTURE_0C83, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*84*/ { TEXTURE_0C84, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*85*/ { TEXTURE_0C85, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*86*/ { TEXTURE_0C86, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*87*/ { TEXTURE_0C87, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*88*/ { TEXTURE_0C88, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*89*/ { TEXTURE_0C89, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*90*/ { TEXTURE_0C8A, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*91*/ { TEXTURE_0C8B, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*92*/ { TEXTURE_0C8C, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*93*/ { TEXTURE_0C8D, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*94*/ { TEXTURE_0C8E, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*95*/ { TEXTURE_0C8F, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, }; struct textureconfig g_TcSkyWaterConfigs[] = { - /*0*/ { 0x0013, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*1*/ { 0x0c90, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*2*/ { 0x0014, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*0*/ { TEXTURE_0013, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*1*/ { TEXTURE_0C90, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*2*/ { TEXTURE_0014, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, }; struct textureconfig g_TcGroup11Configs[] = { - /*0*/ { 0x0001, 32, 28, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_CLAMP }, - /*1*/ { 0x0001, 32, 28, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_CLAMP }, - /*2*/ { 0x0001, 122, 18, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*3*/ { 0x0001, 15, 15, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*4*/ { 0x0001, 20, 20, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*5*/ { 0x0c91, 16, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*0*/ { TEXTURE_0001, 32, 28, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_CLAMP }, + /*1*/ { TEXTURE_0001, 32, 28, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_CLAMP }, + /*2*/ { TEXTURE_0001, 122, 18, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*3*/ { TEXTURE_0001, 15, 15, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*4*/ { TEXTURE_0001, 20, 20, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*5*/ { TEXTURE_0C91, 16, 16, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, }; struct textureconfig g_TcLightGlareConfigs[] = { - /*0*/ { 0x0c92, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*1*/ { 0x0015, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*2*/ { 0x0016, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, - /*3*/ { 0x0c93, 16, 16, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_MIRROR, G_TX_MIRROR }, - /*4*/ { 0x0c94, 32, 128, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_WRAP }, - /*5*/ { 0x0017, 16, 16, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_MIRROR, G_TX_MIRROR }, - /*6*/ { 0x0018, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, - /*7*/ { 0x0c95, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, - /*8*/ { 0x0019, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, - /*9*/ { 0x0c96, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, + /*0*/ { TEXTURE_0C92, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*1*/ { TEXTURE_0015, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*2*/ { TEXTURE_0016, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, + /*3*/ { TEXTURE_0C93, 16, 16, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_MIRROR, G_TX_MIRROR }, + /*4*/ { TEXTURE_0C94, 32, 128, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_WRAP }, + /*5*/ { TEXTURE_0017, 16, 16, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_MIRROR, G_TX_MIRROR }, + /*6*/ { TEXTURE_0018, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, + /*7*/ { TEXTURE_0C95, 32, 32, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, + /*8*/ { TEXTURE_0019, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, + /*9*/ { TEXTURE_0C96, 64, 64, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, }; struct textureconfig g_TcSparkConfigs[] = { - /*0*/ { 0x001a, 8, 16, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*0*/ { TEXTURE_001A, 8, 16, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, }; struct textureconfig g_TcGeneralConfigs[] = { - /* 0*/ { 0x001b, 16, 16, 3, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 1*/ { 0x0001, 1, 1, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, - /* 2*/ { 0x0c97, 16, 16, 3, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 3*/ { 0x001c, 2, 8, 1, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /* 4*/ { 0x001d, 8, 8, 1, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, - /* 5*/ { 0x001c, 2, 8, 1, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /* 6*/ { 0x01e5, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /* 7*/ { 0x0c98, 8, 8, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /* 8*/ { 0x0c99, 2, 16, 1, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, - /* 9*/ { 0x0385, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*10*/ { 0x063b, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*11*/ { 0x0c9a, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*12*/ { 0x063c, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*13*/ { 0x0385, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*14*/ { 0x0617, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*15*/ { 0x0618, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*16*/ { 0x0619, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*17*/ { 0x061a, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*18*/ { 0x061b, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*19*/ { 0x061c, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*20*/ { 0x061d, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*21*/ { 0x061e, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*22*/ { 0x061f, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*23*/ { 0x0620, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*24*/ { 0x0621, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*25*/ { 0x0622, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*26*/ { 0x0623, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*27*/ { 0x0624, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*28*/ { 0x0625, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*29*/ { 0x0626, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*30*/ { 0x0b4f, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*31*/ { 0x0b52, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*32*/ { 0x0b50, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*33*/ { 0x0b51, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*34*/ { 0x0858, 14, 14, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*35*/ { 0x084e, 11, 11, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*36*/ { 0x08f4, 14, 14, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, - /*37*/ { 0x060a, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*38*/ { 0x0c9b, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*39*/ { 0x0112, 64, 64, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*40*/ { 0x0c9c, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*41*/ { 0x0c9d, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*42*/ { 0x0c9e, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*43*/ { 0x0c9f, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*44*/ { 0x0ca0, 64, 64, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, - /*45*/ { 0x0ca1, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*46*/ { 0x0ca2, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*47*/ { 0x0a9a, 64, 24, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*48*/ { 0x0ca3, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, - /*49*/ { 0x0b99, 32, 48, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, - /*50*/ { 0x0caf, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, - /*51*/ { 0x0da0, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, - /*52*/ { 0x0da1, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, - /*53*/ { 0x0da2, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, - /*54*/ { 0x0da3, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, - /*55*/ { 0x0da4, 4, 4, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /* 0*/ { TEXTURE_001B, 16, 16, 3, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 1*/ { TEXTURE_0001, 1, 1, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, + /* 2*/ { TEXTURE_0C97, 16, 16, 3, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 3*/ { TEXTURE_001C, 2, 8, 1, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /* 4*/ { TEXTURE_001D, 8, 8, 1, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, + /* 5*/ { TEXTURE_001C, 2, 8, 1, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /* 6*/ { TEXTURE_01E5, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /* 7*/ { TEXTURE_0C98, 8, 8, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /* 8*/ { TEXTURE_0C99, 2, 16, 1, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_WRAP, G_TX_WRAP }, + /* 9*/ { TEXTURE_0385, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*10*/ { TEXTURE_063B, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*11*/ { TEXTURE_0C9A, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*12*/ { TEXTURE_063C, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*13*/ { TEXTURE_0385, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*14*/ { TEXTURE_0617, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*15*/ { TEXTURE_0618, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*16*/ { TEXTURE_0619, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*17*/ { TEXTURE_061A, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*18*/ { TEXTURE_061B, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*19*/ { TEXTURE_061C, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*20*/ { TEXTURE_061D, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*21*/ { TEXTURE_061E, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*22*/ { TEXTURE_061F, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*23*/ { TEXTURE_0620, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*24*/ { TEXTURE_0621, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*25*/ { TEXTURE_0622, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*26*/ { TEXTURE_0623, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*27*/ { TEXTURE_0624, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*28*/ { TEXTURE_0625, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*29*/ { TEXTURE_0626, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*30*/ { TEXTURE_0B4F, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*31*/ { TEXTURE_0B52, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*32*/ { TEXTURE_0B50, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*33*/ { TEXTURE_0B51, 56, 36, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*34*/ { TEXTURE_0858, 14, 14, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*35*/ { TEXTURE_084E, 11, 11, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*36*/ { TEXTURE_08F4, 14, 14, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_CLAMP, G_TX_CLAMP }, + /*37*/ { TEXTURE_060A, 32, 32, 5, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*38*/ { TEXTURE_0C9B, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*39*/ { TEXTURE_0112, 64, 64, 5, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*40*/ { TEXTURE_0C9C, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*41*/ { TEXTURE_0C9D, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*42*/ { TEXTURE_0C9E, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*43*/ { TEXTURE_0C9F, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*44*/ { TEXTURE_0CA0, 64, 64, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, + /*45*/ { TEXTURE_0CA1, 64, 64, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*46*/ { TEXTURE_0CA2, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*47*/ { TEXTURE_0A9A, 64, 24, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*48*/ { TEXTURE_0CA3, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_MIRROR, G_TX_MIRROR }, + /*49*/ { TEXTURE_0B99, 32, 48, 0, G_IM_FMT_I, G_IM_SIZ_8b, G_TX_CLAMP, G_TX_CLAMP }, + /*50*/ { TEXTURE_0CAF, 32, 32, 0, G_IM_FMT_IA, G_IM_SIZ_8b, G_TX_WRAP, G_TX_WRAP }, + /*51*/ { TEXTURE_0DA0, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, + /*52*/ { TEXTURE_0DA1, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, + /*53*/ { TEXTURE_0DA2, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, + /*54*/ { TEXTURE_0DA3, 32, 32, 0, G_IM_FMT_RGBA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, + /*55*/ { TEXTURE_0DA4, 4, 4, 0, G_IM_FMT_RGBA, G_IM_SIZ_16b, G_TX_WRAP, G_TX_WRAP }, }; struct textureconfig g_TcRadarConfigs[] = { - /*0*/ { 0x003c, 64, 64, 1, G_IM_FMT_IA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, + /*0*/ { TEXTURE_003C, 64, 64, 1, G_IM_FMT_IA, G_IM_SIZ_32b, G_TX_CLAMP, G_TX_CLAMP }, };