merge main into dev

src/battle/BattleState.lua

@@ -188,6 +188,36 @@ local function namedPalette(data, name)
   return { name = key, colors = colors }
 end
 
+-- Custom trainer portraits can opt into the same Advanced OBJ palette source
+-- as their overworld walker. Vanilla trainers preserve the hardware-faithful
+-- MEWMON fallback used during the battle introduction.
+function BattleState.trainerPalette(data, trainer)
+  local source = trainer and trainer.paletteSource
+  if source then
+    local PaletteFX = require("src.render.PaletteFX")
+    local colors, group = PaletteFX.spriteObp({ paletteSource = source }, trainer.id)
+    if colors then
+      return { name = "trainer:" .. source .. ":" .. tostring(group), colors = colors }
+    end
+  end
+  return namedPalette(data, "MEWMON")
+end
+
+-- Yellow only: ROCKET with wTrainerNo >= $2a is Jessie & James, who share
+-- the class and the name "ROCKET" but battle behind their own pic
+-- (home/trainers2.asm IsFightingJessieJames).  picJessieJames exists only
+-- in a Yellow cache extracted after #439, so an older cache keeps the
+-- grunt pic until it is re-imported.
+function BattleState.trainerPicPath(data, trainer, oppClass, partyIndex)
+  if oppClass == "OPP_ROCKET" and (partyIndex or 1) >= 42
+     and trainer and trainer.picJessieJames then
+    return trainer.picJessieJames
+  end
+  if trainer and trainer.pic then return trainer.pic end
+  local base = trainer and trainer.basePic and data.trainers[trainer.basePic]
+  return base and base.pic or nil
+end
+
 -- The battle-BGP fade variant of a pic (AnimationFlashScreen and the
 -- SetAnimationBGPalette effects remap the four BG shades; on the SGB
 -- the colorizer then colors the REMAPPED shade, so a faded pic shows
@@ -547,19 +577,6 @@ local function applySpecialMoves(data, oppClass, partyIndex, party)
   end
 end
 
--- Yellow only: ROCKET with wTrainerNo >= $2a is Jessie & James, who share
--- the class and the name "ROCKET" but battle behind their own pic
--- (home/trainers2.asm IsFightingJessieJames).  picJessieJames exists only
--- in a Yellow cache extracted after #439, so an older cache keeps the
--- grunt pic until it is re-imported.
-function BattleState.trainerPicPath(trainer, oppClass, partyIndex)
-  if oppClass == "OPP_ROCKET" and (partyIndex or 1) >= 42
-     and trainer.picJessieJames then
-    return trainer.picJessieJames
-  end
-  return trainer.pic
-end
-
 function BattleState.newTrainer(game, oppClass, partyIndex)
   local self = newBattle(game)
   self.kind = "trainer"
@@ -622,8 +639,8 @@ function BattleState.newTrainer(game, oppClass, partyIndex)
   -- wEnemyMonSpecies2 before the intro's SET_PAL_BATTLE
   -- (engine/battle/core.asm:6682, engine/gfx/palettes.asm SetPal_Battle)
   self.trainerPic = getImage(
-    BattleState.trainerPicPath(self.trainer, oppClass, partyIndex),
-    namedPalette(game.data, "MEWMON"))
+    BattleState.trainerPicPath(game.data, self.trainer, oppClass, partyIndex),
+    BattleState.trainerPalette(game.data, self.trainer))
   self.introText = Strings("%s wants\nto fight!", self.trainer.name)
   return self
 end