From b20753f0c0ae324c709c31ae7a45cb6c0d97c4af Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Fri, 5 Jul 2024 22:46:16 -0400 Subject: [PATCH] Change METAL back to CAP --- actors/luigi/model.inc.c | 10 +++++----- actors/luigi_cap/model.inc.c | 8 ++++---- actors/mario/model.inc.c | 10 +++++----- actors/mario_cap/model.inc.c | 8 ++++---- actors/toad_cap/model.inc.c | 6 +++--- actors/toad_player/model.inc.c | 8 ++++---- actors/waluigi/model.inc.c | 10 +++++----- actors/waluigi_cap/model.inc.c | 8 ++++---- actors/wario/model.inc.c | 10 +++++----- actors/wario_cap/model.inc.c | 8 ++++---- autogen/lua_definitions/constants.lua | 2 +- docs/lua/constants.md | 2 +- src/game/player_palette.h | 2 +- src/pc/lua/smlua_constants_autogen.c | 2 +- 14 files changed, 47 insertions(+), 47 deletions(-) diff --git a/actors/luigi/model.inc.c b/actors/luigi/model.inc.c index b63a37af..2a7a9d8a 100644 --- a/actors/luigi/model.inc.c +++ b/actors/luigi/model.inc.c @@ -257,7 +257,7 @@ const Gfx luigi_metal_butt[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&luigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -727,7 +727,7 @@ const Gfx luigi_metal_left_thigh[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&luigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -3243,7 +3243,7 @@ const Gfx luigi_right_hand_cap_metal_wings_intial_dl[] = { gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&luigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsSPEndDisplayList(), }; @@ -3546,7 +3546,7 @@ const Gfx luigi_metal_cap_wings[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&luigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), @@ -3583,7 +3583,7 @@ const Gfx luigi_metal_cap_wings_transparent[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&luigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), diff --git a/actors/luigi_cap/model.inc.c b/actors/luigi_cap/model.inc.c index 20bc2273..78da57c6 100644 --- a/actors/luigi_cap/model.inc.c +++ b/actors/luigi_cap/model.inc.c @@ -159,7 +159,7 @@ const Gfx luigi_cap_seg3_dl_03022ED8_metal[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&luigi_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsSPEndDisplayList(), }; @@ -231,7 +231,7 @@ const Gfx luigi_cap_seg3_dl_03022FF8[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&luigi_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -335,7 +335,7 @@ const Gfx luigi_cap_seg3_dl_03023298[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&luigi_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -355,7 +355,7 @@ const Gfx luigi_cap_seg3_dl_03023298[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&luigi_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), diff --git a/actors/mario/model.inc.c b/actors/mario/model.inc.c index 5e2f6149..6e5ce691 100644 --- a/actors/mario/model.inc.c +++ b/actors/mario/model.inc.c @@ -213,7 +213,7 @@ const Gfx mario_metal_butt[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&mario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -530,7 +530,7 @@ const Gfx mario_metal_left_thigh[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&mario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -2223,7 +2223,7 @@ const Gfx mario_right_hand_cap_metal_wings_intial_dl[] = { gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&mario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsSPEndDisplayList(), }; @@ -2531,7 +2531,7 @@ const Gfx mario_metal_cap_wings[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&mario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), @@ -2568,7 +2568,7 @@ const Gfx mario_metal_cap_wings_transparent[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&mario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), diff --git a/actors/mario_cap/model.inc.c b/actors/mario_cap/model.inc.c index dec06789..12e9d2a8 100644 --- a/actors/mario_cap/model.inc.c +++ b/actors/mario_cap/model.inc.c @@ -194,7 +194,7 @@ const Gfx mario_cap_seg3_dl_03022ED8_metal[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&mario_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsSPEndDisplayList(), }; @@ -266,7 +266,7 @@ const Gfx mario_cap_seg3_dl_03022FF8[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&mario_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -370,7 +370,7 @@ const Gfx mario_cap_seg3_dl_03023298[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&mario_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -390,7 +390,7 @@ const Gfx mario_cap_seg3_dl_03023298[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&mario_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), diff --git a/actors/toad_cap/model.inc.c b/actors/toad_cap/model.inc.c index 70ffa463..d52414e8 100644 --- a/actors/toad_cap/model.inc.c +++ b/actors/toad_cap/model.inc.c @@ -357,7 +357,7 @@ Gfx mat_toad_cap_metal[] = { gsSPGeometryMode(0, G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&toad_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -456,7 +456,7 @@ Gfx mat_toad_cap_metal_wing[] = { gsSPClearGeometryMode(G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&toad_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), @@ -482,7 +482,7 @@ Gfx mat_toad_cap_metal_wing_tip[] = { gsSPClearGeometryMode(G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&toad_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_wings_half_2_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), diff --git a/actors/toad_player/model.inc.c b/actors/toad_player/model.inc.c index 2b6eee20..1df2a5a0 100644 --- a/actors/toad_player/model.inc.c +++ b/actors/toad_player/model.inc.c @@ -1951,7 +1951,7 @@ Gfx mat_toad_player_metal[] = { gsSPGeometryMode(0, G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&toad_player_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -1978,7 +1978,7 @@ Gfx mat_toad_player_metal_vest[] = { gsSPGeometryMode(G_CULL_BACK, 0), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&toad_player_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -2289,7 +2289,7 @@ Gfx mat_toad_player_metal_wing[] = { gsSPClearGeometryMode(G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&toad_player_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), @@ -2315,7 +2315,7 @@ Gfx mat_toad_player_metal_wing_tip[] = { gsSPClearGeometryMode(G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&toad_player_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_texture_metal_wings_half_2_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), diff --git a/actors/waluigi/model.inc.c b/actors/waluigi/model.inc.c index f5c8a4da..2a953636 100644 --- a/actors/waluigi/model.inc.c +++ b/actors/waluigi/model.inc.c @@ -291,7 +291,7 @@ const Gfx waluigi_metal_butt[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&waluigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -762,7 +762,7 @@ const Gfx waluigi_metal_left_thigh[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&waluigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -3409,7 +3409,7 @@ const Gfx waluigi_right_hand_cap_metal_wings_intial_dl[] = { gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&waluigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsSPEndDisplayList(), }; @@ -3711,7 +3711,7 @@ const Gfx waluigi_metal_cap_wings[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&waluigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), @@ -3748,7 +3748,7 @@ const Gfx waluigi_metal_cap_wings_transparent[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&waluigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), diff --git a/actors/waluigi_cap/model.inc.c b/actors/waluigi_cap/model.inc.c index 02794e49..bf88d5ba 100644 --- a/actors/waluigi_cap/model.inc.c +++ b/actors/waluigi_cap/model.inc.c @@ -159,7 +159,7 @@ const Gfx waluigi_cap_seg3_dl_03022ED8_metal[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&waluigi_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsSPEndDisplayList(), }; @@ -231,7 +231,7 @@ const Gfx waluigi_cap_seg3_dl_03022FF8[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&waluigi_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -335,7 +335,7 @@ const Gfx waluigi_cap_seg3_dl_03023298[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&waluigi_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -355,7 +355,7 @@ const Gfx waluigi_cap_seg3_dl_03023298[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&waluigi_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, waluigi_cap_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), diff --git a/actors/wario/model.inc.c b/actors/wario/model.inc.c index 31114363..e61f9178 100644 --- a/actors/wario/model.inc.c +++ b/actors/wario/model.inc.c @@ -293,7 +293,7 @@ const Gfx wario_metal_butt[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&wario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -763,7 +763,7 @@ const Gfx wario_metal_left_thigh[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&wario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -3614,7 +3614,7 @@ const Gfx wario_right_hand_cap_metal_wings_intial_dl[] = { gsSPClearGeometryMode(G_TEXTURE_GEN | G_CULL_BACK), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&wario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsSPEndDisplayList(), }; @@ -3916,7 +3916,7 @@ const Gfx wario_metal_cap_wings[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&wario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), @@ -3953,7 +3953,7 @@ const Gfx wario_metal_cap_wings_transparent[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&wario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), diff --git a/actors/wario_cap/model.inc.c b/actors/wario_cap/model.inc.c index 3dc5c9bf..f8756f35 100644 --- a/actors/wario_cap/model.inc.c +++ b/actors/wario_cap/model.inc.c @@ -159,7 +159,7 @@ const Gfx wario_cap_seg3_dl_03022ED8_metal[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&wario_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsSPEndDisplayList(), }; @@ -231,7 +231,7 @@ const Gfx wario_cap_seg3_dl_03022FF8[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&wario_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -335,7 +335,7 @@ const Gfx wario_cap_seg3_dl_03023298[] = { gsSPSetGeometryMode(G_TEXTURE_GEN), gsSPTexture(4032, 1984, 0, 0, 1), gsSPLight(&wario_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 128), @@ -355,7 +355,7 @@ const Gfx wario_cap_seg3_dl_03023298[] = { gsDPSetCombineLERP(TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, SHADE, TEXEL1, TEXEL0, 0, ENVIRONMENT, 0), gsSPTexture(65535, 65535, 0, 0, 1), gsSPLight(&wario_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 17), + gsSPCopyLightEXT(2, 15), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_wings_half_1_shade), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadBlock(7, 0, 0, 2047, 256), diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua index f9ab4f86..820d9ff0 100644 --- a/autogen/lua_definitions/constants.lua +++ b/autogen/lua_definitions/constants.lua @@ -7780,7 +7780,7 @@ EMBLEM = 7 PLAYER_PART_MAX = 8 --- @type PlayerPart -METAL = EMBLEM +METAL = CAP --- @type integer EEPROM_SIZE = 0x200 diff --git a/docs/lua/constants.md b/docs/lua/constants.md index 92ed9549..d6f2ffb1 100644 --- a/docs/lua/constants.md +++ b/docs/lua/constants.md @@ -2774,7 +2774,7 @@ | CAP | 6 | | EMBLEM | 7 | | PLAYER_PART_MAX | 8 | -| METAL | EMBLEM | +| METAL | CAP | [:arrow_up_small:](#) diff --git a/src/game/player_palette.h b/src/game/player_palette.h index 5de0fa6b..139e2bbf 100644 --- a/src/game/player_palette.h +++ b/src/game/player_palette.h @@ -7,7 +7,7 @@ #define MAX_PRESET_PALETTES 128 enum PlayerPart { - PANTS, SHIRT, GLOVES, SHOES, HAIR, SKIN, CAP, EMBLEM, PLAYER_PART_MAX, METAL = EMBLEM + PANTS, SHIRT, GLOVES, SHOES, HAIR, SKIN, CAP, EMBLEM, PLAYER_PART_MAX, METAL = CAP }; #pragma pack(1) diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index 71049e81..6cd533ef 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -2814,7 +2814,7 @@ char gSmluaConstants[] = "" "CAP = 6\n" "EMBLEM = 7\n" "PLAYER_PART_MAX = 8\n" -"METAL = EMBLEM\n" +"METAL = CAP\n" "EEPROM_SIZE = 0x200\n" "NUM_SAVE_FILES = 4\n" "SAVE_FILE_A = 0\n"