From 3aeaace63a211bf99c9449be1581ee27e7495927 Mon Sep 17 00:00:00 2001
From: JailGamer <jailgamer@gmail.com>
Date: Sun, 15 Mar 2026 19:15:50 +0100
Subject: [PATCH] Intro funcional i alguns tiles en 'HD'

---
 data/intro.lua  |  56 +++++++++++++++++++++++++---------
 data/scenes.lua |  79 ++++++++++++++++++++++++------------------------
 data/tiles.gif  | Bin 10709 -> 10741 bytes
 3 files changed, 81 insertions(+), 54 deletions(-)

diff --git a/data/intro.lua b/data/intro.lua
index 590cf5d..55e097d 100644
--- a/data/intro.lua
+++ b/data/intro.lua
@@ -47,6 +47,20 @@ function intro_intro()
 
 end
 
+function draw_item_intro( name, flip )
+	local cw = arcade_config.character_width
+	local ch = arcade_config.character_height
+	if ( name == "abad" ) then
+		draw.surf(0,0,cw,ch,44*o2aX,24*o2aX,cw,ch,flip)
+	elseif (name == "batman" ) then
+		draw.surf(0,48*o2aX,cw,ch,82*o2aX,24*o2aX,cw,ch,flip)
+	elseif (name == "cacaus" ) then
+		draw.surf(112*o2aX,88*o2aX,cw,ch/2,76*o2aX,32*o2aX,cw,ch/2,flip)
+	elseif (name == "marc" ) then
+		draw.rect(15*o2aX,3*o2aX,99*o2aX,51*o2aX,2)
+	end
+end
+
 function intro_update()
     if key.press(key.ESCAPE) or pad.press(btnPause) then
         game_init(true)
@@ -55,12 +69,15 @@ function intro_update()
         intro_wait=1
     end
 	
+
     intro_wait=intro_wait-1
     if intro_wait==0 then
         if intro_step==0 then
 			print("STEP 0")
             surf.cls(16)
-            draw.rect(15*o2aX,3*o2aX,99*o2aX,51*o2aX,2)
+            -- draw.rect(15*o2aX,3*o2aX,99*o2aX,51*o2aX,2)
+			draw_item_intro("marc",false)
+			-- view.origin(16,4)
             view.origin(16*o2aX,4*o2aX)
             mapa_draw(10)
 			
@@ -69,9 +86,7 @@ function intro_update()
 			
 			-- Abad
             -- draw.surf(0,0,16,16,44,24,16,16,true)
-			local cw = arcade_config.character_width
-			local ch = arcade_config.character_height
-            draw.surf(0,0,cw,ch,44*o2aX,24*o2aX,cw,ch,true)
+            draw_item_intro("abad", true)
             view.origin(0,0)
             intro_step=intro_step+1
         elseif intro_step==1 then
@@ -81,11 +96,14 @@ function intro_update()
         elseif intro_step==2 then
 			print("STEP 2")
             surf.cls(16)
-            draw.rect(15,3,99,51,2)
-            view.origin(16,4)
+			-- draw.rect(15,3,99,51,2)
+            draw_item_intro("marc",false)
+            -- view.origin(16,4)
+			view.origin(16*o2aX,4*o2aX)
             mapa_draw(10)
             draw.rectf(73,24,7,16,16)
-            draw.surf(0,0,16,16,44,24,16,16,false)
+			-- draw.surf(0,0,16,16,44,24,16,16,false)
+            draw_item_intro("abad", false)
             view.origin(0,0)
             intro_step=intro_step+1
         elseif intro_step==3 then
@@ -93,13 +111,18 @@ function intro_update()
             intro_step=intro_step+1
         elseif intro_step==4 then
             surf.cls(16)
-            draw.rect(15,3,99,51,2)
-            view.origin(16,4)
+			-- draw.rect(15,3,99,51,2)
+            draw_item_intro("marc",false)
+            -- view.origin(16,4)
+			view.origin(16*o2aX,4*o2aX)
             mapa_draw(10)
             draw.rectf(73,24,7,16,16)
-            draw.surf(0,0,16,16,44,24,16,16,false)
-            draw.surf(112,88,16,8,76,32,16,8,true)
-            draw.surf(0,48,16,16,82,24,16,16,true)
+			-- draw.surf(0,0,16,16,44,24,16,16,false)
+            draw_item_intro("abad", false)
+            -- draw.surf(112,88,16,8,76,32,16,8,true)
+			draw_item_intro("cacaus", true)
+            -- draw.surf(0,48,16,16,82,24,16,16,true)
+			draw_item_intro("batman", true)
             view.origin(0,0)
             intro_step=intro_step+1
         elseif intro_step==5 then
@@ -107,11 +130,14 @@ function intro_update()
             intro_step=intro_step+1
         elseif intro_step==6 then
             surf.cls(16)
-            draw.rect(15,3,99,51,2)
-            view.origin(16,4)
+			-- draw.rect(15,3,99,51,2)
+            draw_item_intro("marc",false)
+            -- view.origin(16,4)
+			view.origin(16*o2aX,4*o2aX)
             mapa_draw(10)
             draw.rectf(73,24,7,16,16)
-            draw.surf(0,0,16,16,44,24,16,16,false)
+			-- draw.surf(0,0,16,16,44,24,16,16,false)
+            draw_item_intro("abad", false)
             view.origin(0,0)
             intro_step=intro_step+1
         elseif intro_step==7 then
diff --git a/data/scenes.lua b/data/scenes.lua
index ae876c7..f9b2f3e 100644
--- a/data/scenes.lua
+++ b/data/scenes.lua
@@ -6,6 +6,7 @@ local arcade_config = require("arcade_config")
 o2aX = arcade_config.org2arc_escala
 
 avatar_abad_x = 3*o2aX
+avatar_abad2_x = 4*o2aX
 avatar_abad_y = 0
 avatar_batman_x = 4*o2aX
 avatar_batman_y = 48*o2aX
@@ -32,99 +33,99 @@ scenes={
         {x=avatar_abad_x,y=avatar_abad_y,flip=false,audio="abad",text={"Serà mamó...","",""},die=20},
     },
     abad_inici={
-        {x=4,y=0,flip=false,audio="abad",text={"Se va a enterar eixe","imbècil de Batman","quan el pille..."}},
-        {x=4,y=0,flip=false,audio="abad",text={"Gonna per el GPS","per a trobarlo.",""}},
-        {x=4,y=0,flip=false,audio="abad",text={"I igual hi ha","algú més per ací","que em puga ajudar."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Se va a enterar eixe","imbècil de Batman","quan el pille..."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Gonna per el GPS","per a trobarlo.",""}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"I igual hi ha","algú més per ací","que em puga ajudar."}},
     },
     abad_corfes={
-        {x=4,y=0,flip=false,audio="abad",text={"Osti, està ple de","monstruacos.",""}},
-        {x=4,y=0,flip=false,audio="abad",text={"Pos al que s'acoste","s'endurà una corfa","de cacau al cap!"}},
-        {x=4,y=0,flip=false,audio="abad",text={"I si van altets","igual val la pena","ajupir-se..."}}
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Osti, està ple de","monstruacos.",""}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Pos al que s'acoste","s'endurà una corfa","de cacau al cap!"}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"I si van altets","igual val la pena","ajupir-se..."}}
     },
     abad_portes={
-        {x=4,y=0,flip=false,audio="abad",text={"Qui ha tancat totes","les portes?",""}},
-        {x=4,y=0,flip=false,audio="abad",text={"A saber on està","cada interruptor","per a obrir-les..."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Qui ha tancat totes","les portes?",""}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"A saber on està","cada interruptor","per a obrir-les..."}},
     },
     abad_porta_casa={
-        {x=4,y=0,flip=false,audio="abad",text={"Vaja, la porta de","casa també està","tancada."}},
-        {x=4,y=0,flip=false,audio="abad",text={"Però he de eixir!","Batman viu en la","casa de davant!"}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Vaja, la porta de","casa també està","tancada."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Però he de eixir!","Batman viu en la","casa de davant!"}},
     },
     abad_porta_batman={
-        {x=4,y=0,flip=false,audio="abad",text={"Be, era de esperar","que Batman tinguera","la porta tancada."}},
-        {x=4,y=0,flip=false,audio="abad",text={"Crec que hi havia","un passadis secret","del meu sotan al seu."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Be, era de esperar","que Batman tinguera","la porta tancada."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Crec que hi havia","un passadis secret","del meu sotan al seu."}},
     },
     gps_trobat={
-        {x=4,y=0,flip=false,audio="abad",text={"Ale, ja tinc el GPS.","Ara puc trobar tot","el que necessite..."}},
-        {x=4,y=0,flip=false,audio="abad",text={"polsant les tecles","de l'1 al 5",""}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Ale, ja tinc el GPS.","Ara puc trobar tot","el que necessite..."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"polsant les tecles","de l'1 al 5",""}},
     },
     premiere_intro={
-        {x=4,y=0,flip=false,audio="abad",musica=audio_song_premiere,text={"Premiere??","Qué fas per ma casa?",""}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_premiere,text={"Premiere??","Qué fas per ma casa?",""}},
         {x=69,y=20,flip=true,audio="premiere",text={"Porca miseria!!","l'uomo pipistrello!!","m'ha llevatto il gorro!"}},
-        {x=4,y=0,flip=false,audio="abad",text={"Pipistrello??","Això ques??",""}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Pipistrello??","Això ques??",""}},
         {x=69,y=20,flip=true,audio="premiere",text={"Il batmano!!","Incontrame il gorro","per l'amore d'un porco!"}},
-        {x=4,y=0,flip=false,audio="abad",text={"Tinc faena. A mi m'ha","furtat els cacaus i","he de trobarlos."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Tinc faena. A mi m'ha","furtat els cacaus i","he de trobarlos."}},
         {x=69,y=20,flip=true,audio="premiere",text={"Lei tenne in su quarto!","Io tengo micha clave!","Achudame i t'achudo!"}}
     },
     premiere_intro_gorro={
-        {x=4,y=0,flip=false,audio="abad",musica=audio_song_premiere,text={"Premiere??","Qué fas per ma casa?",""}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_premiere,text={"Premiere??","Qué fas per ma casa?",""}},
         {x=69,y=20,flip=true,audio="premiere",text={"Porca miseria!!","l'uomo pipistrello!!","m'ha llevatto il gorro!"}},
-        {x=4,y=0,flip=false,audio="abad",text={"Pipistrello??","Això... be, te igual","Ací el tens, atontat."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Pipistrello??","Això... be, te igual","Ací el tens, atontat."}},
         {x=69,y=20,flip=true,audio="premiere",text={"Per fortuna!","Grazie mille!","Come podo achudarte?"}},
-        {x=4,y=0,flip=false,audio="abad",text={"Pos Batman m'ha furtat","els cacaus. Supose que","els te amagats."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Pos Batman m'ha furtat","els cacaus. Supose que","els te amagats."}},
         {x=69,y=20,flip=true,audio="premiere",text={"In lo suo quarto!","Io tengo micha clave!","Tenne, tenne!!"}}
     },
     premiere_gorro={
-        {x=4,y=0,flip=false,audio="abad",musica=audio_song_premiere,text={"Tin, el ditxos gorro.","",""}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_premiere,text={"Tin, el ditxos gorro.","",""}},
         {x=69,y=20,flip=true,audio="premiere",text={"Bravissimo!","Che giornatta","fantastica! Figo!"}},
-        {x=4,y=0,flip=false,audio="abad",text={"Tu si que eres un","figo. On està eixa","mitja clau?"}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Tu si que eres un","figo. On està eixa","mitja clau?"}},
         {x=69,y=20,flip=true,audio="premiere",text={"Giusto! Aquí tenne!","Buona fortuna per","la tua avventura!"}},
         {x=69,y=20,flip=true,audio="premiere",text={"E NON TOCARE il","Batmano! Sei molto","poderoso!"}}
     },
     gorro_trobat_nointro={
-        {x=4,y=0,flip=false,audio="abad",text={"Mira, el gorro","de Premiere.","Millor l'agafe."}}
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Mira, el gorro","de Premiere.","Millor l'agafe."}}
     },
     gorro_trobat={
-        {x=4,y=0,flip=false,audio="abad",text={"Mira, el gorro","de Premiere.","A la saca."}}
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Mira, el gorro","de Premiere.","A la saca."}}
     },
     elalien_intro={
-        {x=4,y=0,flip=false,audio="abad",musica=audio_song_elalien,text={"Que passa alien?","A tu també t'ha","putejat el Batman?"}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_elalien,text={"Que passa alien?","A tu també t'ha","putejat el Batman?"}},
         {x=3,y=16,flip=true,audio="elalien",text={"CAGUEN L'OU!!","ESTAVA JO TAN TRANQUIL","PODANT AL MEU GOS..."}},
         {x=3,y=16,flip=true,audio="elalien",text={"...I QUAN NO MIRABA","M'HA FURTAT EL","MARANÀ!!!"}},
-        {x=4,y=0,flip=false,audio="abad",text={"Es...taves podant","a un gos...?",""}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Es...taves podant","a un gos...?",""}},
         {x=3,y=16,flip=true,audio="elalien",text={"EN JUPITER NO POTS","DEIXAR QUE LI CREIXEN","MES DE 12 PATES!!"}},
-        {x=4,y=0,flip=false,audio="abad",text={"Uh... clar...","A mi m'ha furtat","els cacaus."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Uh... clar...","A mi m'ha furtat","els cacaus."}},
         {x=3,y=16,flip=true,audio="elalien",text={"ELS TÉ EN LA SEUA","HABITACIÓ SEGUR.","TROBA EL BERENAR..."}},
         {x=3,y=16,flip=true,audio="elalien",text={"...I JO ET DONARÉ","LA MEITAT DE LA CLAU","PER A ENTRAR."}}
     },
     elalien_intro_peu={
-        {x=4,y=0,flip=false,audio="abad",musica=audio_song_elalien,text={"Que passa alien?","A tu també t'ha","putejat el Batman?"}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_elalien,text={"Que passa alien?","A tu també t'ha","putejat el Batman?"}},
         {x=3,y=16,flip=true,audio="elalien",text={"CAGUEN L'OU!!","ESTAVA JO TAN TRANQUIL","PODANT AL MEU GOS..."}},
         {x=3,y=16,flip=true,audio="elalien",text={"...I QUAN NO MIRABA","M'HA FURTAT EL","MARANÀ!!!"}},
-        {x=4,y=0,flip=false,audio="abad",text={"Podant...? be, te","igual. Açò deu ser","el teu berenar."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Podant...? be, te","igual. Açò deu ser","el teu berenar."}},
         {x=3,y=16,flip=true,audio="elalien",text={"OSTI QUE BÓ!!!","GRACIES AUELO!","A TU QUE T'HA FET?"}},
-        {x=4,y=0,flip=false,audio="abad",text={"M'ha furtat els cacaus.","Segur que els té","al seu quarto."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"M'ha furtat els cacaus.","Segur que els té","al seu quarto."}},
         {x=3,y=16,flip=true,audio="elalien",text={"SEGUR! PERO JO TINC","LA MEITAT DE LA CLAU.","TIN, I SORT!"}}
     },
     elalien_peu={
-        {x=4,y=0,flip=false,audio="abad",musica=audio_song_elalien,text={"Ací tens...","Uff, que peste fa...",""}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_elalien,text={"Ací tens...","Uff, que peste fa...",""}},
         {x=3,y=16,flip=true,audio="elalien",text={"GRACIES!!!","SÍ, EH? QUE","SUCOSET I BÓ."}},
-        {x=4,y=0,flip=false,audio="abad",text={"Clar...","Be, i eixa","mitja clau?"}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Clar...","Be, i eixa","mitja clau?"}},
         {x=3,y=16,flip=true,audio="elalien",text={"TIN! QUAN TINGUES","ELS CACAUS, PEGA-LI","CACAUÀ A BATMAN!"}},
     },
     peu_trobat_nointro={
-        {x=4,y=0,flip=false,audio="abad",text={"Un peu podrit??","Qué asco!! Segur","que és d'el alien."}}
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Un peu podrit??","Qué asco!! Segur","que és d'el alien."}}
     },
     peu_trobat={
-        {x=4,y=0,flip=false,audio="abad",text={"Joer, açò deu ser","el berenar d'el alien.","Ecs..."}}
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Joer, açò deu ser","el berenar d'el alien.","Ecs..."}}
     },
     habitacio_batman={
-        {x=4,y=0,flip=false,audio="abad",text={"L'habitació de Batman!","Segur que els cacaus","estàn ahí dins."}},
-        {x=4,y=0,flip=false,audio="abad",text={"Però necessite","una clau...",""}}
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"L'habitació de Batman!","Segur que els cacaus","estàn ahí dins."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Però necessite","una clau...",""}}
     },
     bol_trobat={
-        {x=4,y=0,flip=false,audio="abad",text={"PER FI, JA TINC","ELS MEUS CACAUS!!!","OLE!! OLE!!"}},
-        {x=4,y=0,flip=false,audio="abad",text={"Se va a enterar","Batman ara quan","el pille..."}},
-        {x=4,y=0,flip=false,audio="abad",text={"Ara si que li puc","pegar una bona","cacauà..."}}
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"PER FI, JA TINC","ELS MEUS CACAUS!!!","OLE!! OLE!!"}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Se va a enterar","Batman ara quan","el pille..."}},
+        {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Ara si que li puc","pegar una bona","cacauà..."}}
     },
     final= {
         {x=avatar_batman_x,y=avatar_batman_y,flip=true,audio="batman",musica=audio_song_batman,text={"AI!", "M'has fet mal!!!",""},die=20},
diff --git a/data/tiles.gif b/data/tiles.gif
index 9a95615a4b51d652b27946290b2362ee98a27230..1a65c8d50f26390cd99d420045c77db7bd7dfb3d 100644
GIT binary patch
delta 4436
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
a2${iZyzXjcL)^aJNNwIoz^;>k0028CzJN9W

delta 4404
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