mirror of
https://github.com/bryanthaboi/gen1recomp
synced 2026-10-25 14:38:42 -04:00
Update Gen3Compat.lua
This commit is contained in:
@@ -2159,14 +2159,14 @@ local function blankIcon(vanilla)
|
||||
return hit
|
||||
end
|
||||
|
||||
local function hookedIcon(species, mon, vanilla, shiny) -- shiny added by stahl
|
||||
local function hookedIcon(species, mon, vanilla) -- shiny added by stahl
|
||||
if not Runtime.wantsHook("pokemon.icon") then return vanilla end
|
||||
local path = "data/generated/gba/pokemon/icons/" .. species .. ".rgba"
|
||||
local g = live()
|
||||
local ctx = { data = g and dataProxy(g.data), species = Gen3Compat.speciesName(species),
|
||||
gen3Species = species, mon = mon, kind = "icon", trueColor = true,
|
||||
path = path,
|
||||
shiny = shiny -- shiny added by stahl
|
||||
--shiny = shiny -- shiny added by stahl
|
||||
}
|
||||
local hooked = Runtime.call("pokemon.icon", samePath, path, ctx)
|
||||
if hooked == nil or hooked == false then return blankIcon(vanilla) end
|
||||
@@ -2182,7 +2182,7 @@ local function wrapIcons(P)
|
||||
P.icon = function(species)
|
||||
local entry = iconOrig(species)
|
||||
local sp = tonumber(species)
|
||||
if sp and sp >= 1 then return hookedIcon(sp, nil, entry, shiny) end -- shiny added by stahl
|
||||
if sp and sp >= 1 then return hookedIcon(sp, nil, entry) end -- shiny added by stahl
|
||||
return entry
|
||||
end
|
||||
end
|
||||
@@ -2190,7 +2190,7 @@ local function wrapIcons(P)
|
||||
P.monIcon = function(mon)
|
||||
local sp = tonumber(P.monPicSpecies(mon))
|
||||
local entry = iconOrig(sp)
|
||||
if sp and sp >= 1 then return hookedIcon(sp, mon, entry, shiny) end -- shiny added by stahl
|
||||
if sp and sp >= 1 then return hookedIcon(sp, mon, entry) end -- shiny added by stahl
|
||||
return entry
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user