[Scummvm-git-logs] scummvm master -> ddfbb2dd0c9022e440475acc8eac3937c03f0455

[neuromancer]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
ea8004daba FRESCAPE: info menu for castle amiga
ddfbb2dd0c FREESCAPE: added background in castle amiga


Commit: ea8004dabaa8924ac1e4df4c64a980b36e2f428c
    https://github.com/scummvm/scummvm/commit/ea8004dabaa8924ac1e4df4c64a980b36e2f428c
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-03-04T16:35:26+01:00

Commit Message:
FRESCAPE: info menu for castle amiga

Changed paths:
    engines/freescape/games/castle/amiga.cpp


diff --git a/engines/freescape/games/castle/amiga.cpp b/engines/freescape/games/castle/amiga.cpp
index 7526481f599..b954ac9a7ac 100644
--- a/engines/freescape/games/castle/amiga.cpp
+++ b/engines/freescape/games/castle/amiga.cpp
@@ -177,11 +177,19 @@ void CastleEngine::loadAssetsAmigaDemo() {
 	_border = loadFrameFromPlanesVertical(&file, 160, 200);
 	_border->convertToInPlace(_gfx->_texturePixelFormat, (byte *)kAmigaCastlePalette, 16);
 
-	// Menu background: 224x54 interleaved 4-plane (memory 0x36B9A, file 0x36BB6)
-	file.seek(0x36bb6);
-	_menu = loadFrameFromPlanesInterleaved(&file, 14, 54);
+	// Menu image used by drawInfoMenu:
+	// Assembly at ~0x1AE0 copies from mem 0x350CA in a 14-word x 116-row loop.
+	// File offset = mem + 0x1C header => 0x350E6.
+	file.seek(0x350e6);
+	_menu = loadFrameFromPlanesInterleaved(&file, 14, 116);
 	_menu->convertToInPlace(_gfx->_texturePixelFormat, (byte *)kAmigaCastlePalette, 16);
 
+	// Additional 224x54 menu-related block (memory 0x36B9A, file 0x36BB6).
+	// Kept as a separate parsed surface for future use.
+	file.seek(0x36bb6);
+	_menuButtons = loadFrameFromPlanesInterleaved(&file, 14, 54);
+	_menuButtons->convertToInPlace(_gfx->_texturePixelFormat, (byte *)kAmigaCastlePalette, 16);
+
 	file.seek(0x38952); // Spirit meter indicator background (memory 0x38936)
 	_spiritsMeterIndicatorBackgroundFrame = loadFrameFromPlanesInterleaved(&file, 5, 10);
 	_spiritsMeterIndicatorBackgroundFrame->convertToInPlace(_gfx->_texturePixelFormat, (byte *)kAmigaCastlePalette, 16);


Commit: ddfbb2dd0c9022e440475acc8eac3937c03f0455
    https://github.com/scummvm/scummvm/commit/ddfbb2dd0c9022e440475acc8eac3937c03f0455
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-03-04T16:35:26+01:00

Commit Message:
FREESCAPE: added background in castle amiga

Changed paths:
    engines/freescape/games/castle/amiga.cpp


diff --git a/engines/freescape/games/castle/amiga.cpp b/engines/freescape/games/castle/amiga.cpp
index b954ac9a7ac..e8399d42666 100644
--- a/engines/freescape/games/castle/amiga.cpp
+++ b/engines/freescape/games/castle/amiga.cpp
@@ -177,6 +177,12 @@ void CastleEngine::loadAssetsAmigaDemo() {
 	_border = loadFrameFromPlanesVertical(&file, 160, 200);
 	_border->convertToInPlace(_gfx->_texturePixelFormat, (byte *)kAmigaCastlePalette, 16);
 
+	// Mountains skybox panorama used by FUN_3E38.
+	// Source at memory 0x406A (file 0x4086), 63 words x 22 rows, interleaved 4-plane.
+	file.seek(0x4086);
+	_background = loadFrameFromPlanesInterleaved(&file, 63, 22);
+	_background->convertToInPlace(_gfx->_texturePixelFormat, (byte *)kAmigaCastlePalette, 16);
+
 	// Menu image used by drawInfoMenu:
 	// Assembly at ~0x1AE0 copies from mem 0x350CA in a 14-word x 116-row loop.
 	// File offset = mem + 0x1C header => 0x350E6.