From 9ad91da4235d036b079de29d4ce7eb807a2c6d4f Mon Sep 17 00:00:00 2001 From: MysterD Date: Sun, 7 Aug 2022 15:13:51 -0700 Subject: [PATCH] Revert custom palette changes to built in mods --- mods/arena/arena-player.lua | 6 +++--- mods/football.lua | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/arena/arena-player.lua b/mods/arena/arena-player.lua index 815d0ef4..9ace5ce9 100644 --- a/mods/arena/arena-player.lua +++ b/mods/arena/arena-player.lua @@ -372,11 +372,11 @@ function mario_update(m) -- update palette if s.team == 2 then - np.overridePalette = gPalettePresets[7] + np.overridePaletteIndex = 7 elseif s.team == 1 then - np.overridePalette = gPalettePresets[15] + np.overridePaletteIndex = 15 else - np.overridePalette = np.palette + np.overridePaletteIndex = np.paletteIndex end -- set metal diff --git a/mods/football.lua b/mods/football.lua index 61030f8d..29aca154 100644 --- a/mods/football.lua +++ b/mods/football.lua @@ -1262,13 +1262,13 @@ function mario_update(m) local s = gPlayerSyncTable[m.playerIndex] local np = gNetworkPlayers[m.playerIndex] if s.team == 2 then - np.overridePalette = gPalettePresets[7] + np.overridePaletteIndex = 7 m.marioBodyState.modelState = 0 elseif s.team == 1 then - np.overridePalette = gPalettePresets[15] + np.overridePaletteIndex = 15 m.marioBodyState.modelState = 0 else - np.overridePalette = np.palette + np.overridePaletteIndex = np.paletteIndex m.marioBodyState.modelState = MODEL_STATE_NOISE_ALPHA end m.health = 0x880