From 2377815c02d63212de13ba2182b95485c1b13ad6 Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Sun, 20 Oct 2024 19:38:28 +0200
Subject: [PATCH] =?UTF-8?q?Amb=20les=20textures=20en=20memoria=20i=20compa?=
 =?UTF-8?q?rtides=20ja=20no=20puc=20fer=20el=20trick=20de=20canvi=20de=20p?=
 =?UTF-8?q?aleta=20per=20a=20la=20flama=20del=20segon=20jugador=20tal=20i?=
 =?UTF-8?q?=20com=20est=C3=A0=20plantejat=20el=20codi.=20Arreglat=20creant?=
 =?UTF-8?q?=20una=20segona=20textura?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/gfx/player/player1_power.png             | Bin 0 -> 929 bytes
 data/gfx/player/player2_power.png             | Bin 0 -> 941 bytes
 data/gfx/player/player_power.gif              | Bin 944 -> 0 bytes
 data/gfx/player/player_power_blue_palette.pal | Bin 84 -> 0 bytes
 source/director.cpp                           | 158 +++++++++++-------
 source/game.cpp                               |   6 +-
 source/player.cpp                             |   1 -
 source/resource.cpp                           |   4 -
 8 files changed, 96 insertions(+), 73 deletions(-)
 create mode 100644 data/gfx/player/player1_power.png
 create mode 100644 data/gfx/player/player2_power.png
 delete mode 100644 data/gfx/player/player_power.gif
 delete mode 100644 data/gfx/player/player_power_blue_palette.pal

diff --git a/data/gfx/player/player1_power.png b/data/gfx/player/player1_power.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f7ce2756667da9d86074facdb555f2964333d0e
GIT binary patch
literal 929
zcmV;S177@zP)<h;3K|Lk000e1NJLTq005i-001lq0{{R3r>r3g00001b5ch_0Itp)
z=>Px#4^T{0MF0Q*|FZ!9paB1m0RL|Q*Ym2U00005bW%=J0RR90{~XXJQUCx0FG)l}
zR9J<rSlhO%FbFi@|9|tT;hNOIbg$z}T}p@HPQ0$T#>hYCYnVjbwErmHeZk88`WNTc
zs2qc)#IT#Q^5K6uvP+gy*zCwF+0S!*aX|bC@B{M*GMyxs=MMR8MYhzzh=^8h^59X;
zDo?NML_mH;GHgyduRutUOXS`xozzTx^T+dZ-*Ts>WU*j>O+l5Uom>jSbtT9wn0ULT
zLXvOZ9XIK^$_UzO?3CCg*}|J*W%jOup>*<BFy}w9<Zg4^=Mhby`7(k=BjFj$B6+W7
zh==UO0-4CsZmD8vJhH9wmgl?Y&V!c8B|oU7D&NRaj(dh=TAaIbazi#aL%Qu^w;)v-
zxoIKE$%-gWev@2`5a(JLOj~$4cRGVwuQgFJxg_JJdb-cQoB%!Bau~9qsy2GXi_-5z
zc_-&etv0nn3T|4Skz$LXs+K(O4m#IFd6XaJ+{KpNM=|d&M^mR-Zpq!buphjVTPAmu
zvu68<p9Q@QTlYF%W`q~>t5UvOa^eyrcc0*r&TCYzTgg>QZ-88sY^g9s%X{nJ$%zxR
zEPA~SSQ-(tFiORdbCptUPshaE$RX~qsalgOdf_H_PRtDsafc0GBsY;X=`2tanhchW
z#m8y~2ayBZYgJRlRodZz;ouyGVt+L?$Yi@P0{39`<lxxLep9j2ZU_}2)NT;Zxd}~&
z0JB6!)2J;~3w|Kibci3wO*30^K((sIzC(EYTXtmLE7|!#Z#2fTUuz9BN;y4kHBB8T
zSKA_?4xv?zHIwr;7eW9z^21N3Q5PnRTr)J0UgBHi4@(Ku>YAa6tq18NL6@5s&<{-(
z?5?e)_}rIc5S{nszyo!H>s&Wl<BI_I0RuL9PZFSimB#8w0z4AU9~cliOZxq*#*?{^
zkW)K=9x>ElB%SIqWM;Ui<D*d_Mb=)+1dhSqB>+ke*sYi-eOoHg#BtQbAKR<hzkzns
zi+ViS4fPxZxVZ1Y;OPrl4{d{x?}145Lt8(zz945l%MoxyfO8H#2zT=<MpJ(pZP}rM
zn1jRAz76+q3GF`^yPy@{wuq2;g-&E3{s?y@r<wT=8RAIXllYnC00000NkvXXu0mjf
Dt|z$g

literal 0
HcmV?d00001

diff --git a/data/gfx/player/player2_power.png b/data/gfx/player/player2_power.png
new file mode 100644
index 0000000000000000000000000000000000000000..d204c5461b86700757b051433e30649c10dddb8c
GIT binary patch
literal 941
zcmV;e15*5nP)<h;3K|Lk000e1NJLTq005i-001lq0{{R3r>r3g00001b5ch_0Itp)
z=>Px#7*I@9MF0Q*0N?)r)c*j;{{W`{00000000000FO7!SpWb42y{|TQvm<}|NsC0
z|JBM=G5`PrFG)l}R9J<rSlhO%FbFi@|9|tT;hNOIbg$z}T}p@HPQ0$T#>hYCYnVjb
zwErmHeZk88`WNTcs2qc)#IT#Q^5K6uvP+gy*zCwF+0S!*aX|bC@B{M*GMyxs=MMR8
zMYhzzh=^8h^59X;Do?NML_mH;GHgyduRutUOXS`xozzTx^T+dZ-*Ts>WU*j>O+l5U
zom>jSbtT9wn0ULTLXvOZ9XIK^$_UzO?3CCg*}|J*W%jOup>*<BFy}w9<Zg4^=Mhby
z`7(k=BjFj$B6+W7h==UO0-4CsZmD8vJhH9wmgl?Y&V!c8B|oU7D&NRaj(dh=TAaIb
zazi#aL%Qu^w;)v-xoIKE$%-gWev@2`5a(JLOj~$4cRGVwuQgFJxg_JJdb-cQoB%!B
zau~9qsy2GXi_-5zc_-&etv0nn3T|4Skz$LXs+K(O4m#IFd6XaJ+{KpNM=|d&M^mR-
zZpq!buphjVTPAmuvu68<p9Q@QTlYF%W`q~>t5UvOa^eyrcc0*r&TCYzTgg>QZ-88s
zY^g9s%X{nJ$%zxREPA~SSQ-(tFiORdbCptUPshaE$RX~qsalgOdf_H_PRtDsafc0G
zBsY;X=`2tanhchW#m8y~2ayBZYgJRlRodZz;ouyGVt+L?$Yi@P0{39`<lxxLep9j2
zZU_}2)NT;Zxd}~&0JB6!)2J;~3w|Kibci3wO*30^K((sIzC(EYTXtmLE7|!#Z#2fT
zUuz9BN;y4kHBB8TSKA_?4xv?zHIwr;7eW9z^21N3Q5PnRTr)J0UgBHi4@(Ku>YAa6
ztq18NL6@5s&<{-(?5?e)_}rIc5S{nszyo!H>s&Wl<BI_I0RuL9PZFSimB#8w0z4AU
z9~cliOZxq*#*?{^kW)K=9x>ElB%SIqWM;Ui<D*d_Mb=)+1dhSqB>+ke*sYi-eOoHg
z#BtQbAKR<hzkznsi+ViS4fPxZxVZ1Y;OPrl4{d{x?}145Lt8(zz945l%MoxyfO8H#
z2zT=<MpJ(pZP}rMn1jRAz76+q3GF`^yPy@{wuq2;g-&E3{s?y@r<wT=8RAIXllYnC
P00000NkvXXu0mjf(_g$=

literal 0
HcmV?d00001

diff --git a/data/gfx/player/player_power.gif b/data/gfx/player/player_power.gif
deleted file mode 100644
index 53f84aa705f794517a6595e1a1bbacdbb8cb978f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 944
zcmV;h15f-%Nk%v~VVnRg0HOc@00030vjG2~0RN8w|8D>Q0000000000A^!_bMO0Hm
zK~P09E-(WD0000X`2-0H0000i00000oB%8U00aLBx(pHRwMlD~7e>pw)1C)r)`M}U
zVvcH92Eu8^Z0a(sYTx+&#FG`Rvs(Oy#+~ao0Dc65=E%gG+F;1!?I$~0vCv!u>SRhm
zFr_FeRk6=HXDF3Mv$NDnH(JKFKYnm8d=N|o1Z^{NYAsI#iBX4$Kwe9GWs#GGSYkRx
zcN#E{iGi9#poWKMev6$Sj+&{lqJNDSeT1^BgnAgFroXdns#z3fF;D}Nv2RFe#uC9&
z$;)SvwLYA%)5?<8k8)$1*EG^JnZ#2;nN5$&#OQy|>oeVx?$yZM*g2w<@#wr!tJUM*
zzH|1tz2mno;k#<~fQ6|sF(9Ic#1i(olFR>MM2P9MI0!THV6b!n;S?G35hKQ31V<ut
z`7&Q9k~j!iq`7dTn{ohKw(BY6%1NFNzs2Nq6e-as8)@xyYU;_&Z`E81J%`hQo0e4J
zDO(z5YFL;X*@aD7PFu;DYkPt+@-=Q!lT-MBJqr|EC|Py|9+7v)?AlRy#_bJEkXB%u
zzvKaaJgM1LM2qb<zD)V)r_6lWr3HP~WZlkeyF@drIb2i9_<*Hh&3F;*xPpGdMI9?A
z>DH@<^7agCc-7Aehm-w{8&hoKAwL_>U01mBa3!Iq<E*_Z_s+RFGpD+|JGR@k{}u<|
z))#u<UQbWQ^ZszFLiK4jA>+KeY_I>Xv6t6)<k2Stfm$K<-Fzzq2i+>tY1bGTlc7c!
zf=KPsV1D|w72$)ffx;nA7n;Wv7XhYMhkVzek)3rd{xu?r$pBU1WBZlJ;3oL(V`3=T
zndjF?H{uxHjH%7gqkp{tlA?wG=p$i>7{0_6B~QZEN{~OkRb__*f;bnKJ0?+&e~>&E
zqi+)WCF7S#=5*kc4$_InnRK$bW(#0YlP8%i7L;Xr1;M$U4n2<YV>E->M+cr|#@A?u
z?HR=6Dhp~^gpx%P>ItB=@n`9xc}(h*H4WB*BvE(HY2heok~&YPj@l^Gs>I3UYM`d_
zb%bq(3UuOnyoKilt&T2fB86glDz~3AxZ338TYd&g>~z%iO5S<F3WlO1Y6@sax2fGi
zu3$+-D{NQDCR^yD4cXbOv&DdlBX-w9DMq`#nhT;5+FIG*yL-lKt-r<Ao35eYOvKW`
S&_qk!yqcnb>$6TI0028S?8{gH

diff --git a/data/gfx/player/player_power_blue_palette.pal b/data/gfx/player/player_power_blue_palette.pal
deleted file mode 100644
index 4f501f19c83db266ba6a218928797717ce1777cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 84
zcmZ?wbh9u|<X~WASi}GZ_y03o`Ok3TKf|*B5CI^m_@CR)H6+;CF~HSG&w!Z`B=nPo
Yg9}LOfE0nWGcdDpC_1OAGcs5M07MxOBLDyZ

diff --git a/source/director.cpp b/source/director.cpp
index 57bb455..c73e83f 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -371,85 +371,113 @@ void Director::setFileList()
 	Asset::get()->add(prefix + "/data/shaders/crtpi.glsl", AssetType::DATA);
 
 	// Texturas
-	Asset::get()->add(prefix + "/data/gfx/controllers/controllers.png", AssetType::BITMAP);
 
-	Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.ani", AssetType::ANIMATION);
-	Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.ani", AssetType::ANIMATION);
-	Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.ani", AssetType::ANIMATION);
-	Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.ani", AssetType::ANIMATION);
+	{ // Controllers
+		Asset::get()->add(prefix + "/data/gfx/controllers/controllers.png", AssetType::BITMAP);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.ani", AssetType::ANIMATION);
-	Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.ani", AssetType::ANIMATION);
-	Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.ani", AssetType::ANIMATION);
-	Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.ani", AssetType::ANIMATION);
+	{ // Balloons
+		Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/balloon/balloon1.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/balloon/balloon2.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/balloon/balloon3.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/balloon/balloon4.ani", AssetType::ANIMATION);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/balloon/powerball.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/balloon/powerball.ani", AssetType::ANIMATION);
+	{ // Explosions
+		Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/balloon/explosion1.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/balloon/explosion2.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/balloon/explosion3.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/balloon/explosion4.ani", AssetType::ANIMATION);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/bullet/bullet.png", AssetType::BITMAP);
+	{ // Power Ball
+		Asset::get()->add(prefix + "/data/gfx/balloon/powerball.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/balloon/powerball.ani", AssetType::ANIMATION);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/game/game_buildings.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/game/game_clouds1.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/game/game_clouds2.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/game/game_grass.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/game/game_power_meter.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/game/game_sky_colors.png", AssetType::BITMAP);
+	{ // Bala
+		Asset::get()->add(prefix + "/data/gfx/bullet/bullet.png", AssetType::BITMAP);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/game_text/game_text_1000_points.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/game_text/game_text_2500_points.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/game_text/game_text_5000_points.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/game_text/game_text_powerup.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/game_text/game_text_one_hit.png", AssetType::BITMAP);
+	{ // Juego
+		Asset::get()->add(prefix + "/data/gfx/game/game_buildings.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/game/game_clouds1.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/game/game_clouds2.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/game/game_grass.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/game/game_power_meter.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/game/game_sky_colors.png", AssetType::BITMAP);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/intro/intro.png", AssetType::BITMAP);
+	{ // Game Text
+		Asset::get()->add(prefix + "/data/gfx/game_text/game_text_1000_points.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/game_text/game_text_2500_points.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/game_text/game_text_5000_points.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/game_text/game_text_powerup.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/game_text/game_text_one_hit.png", AssetType::BITMAP);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames_mini.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/logo/logo_since_1998.png", AssetType::BITMAP);
+	{ // Intro
+		Asset::get()->add(prefix + "/data/gfx/intro/intro.png", AssetType::BITMAP);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.ani", AssetType::ANIMATION);
-	Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.ani", AssetType::ANIMATION);
-	Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.ani", AssetType::ANIMATION);
-	Asset::get()->add(prefix + "/data/gfx/item/item_clock.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/item/item_clock.ani", AssetType::ANIMATION);
-	Asset::get()->add(prefix + "/data/gfx/item/item_coffee.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/item/item_coffee.ani", AssetType::ANIMATION);
-	Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.ani", AssetType::ANIMATION);
+	{ // Logo
+		Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/logo/logo_jailgames_mini.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/logo/logo_since_1998.png", AssetType::BITMAP);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/title/title_bg_tile.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/title/title_coffee.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/title/title_crisis.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/title/title_arcade_edition.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/title/title_dust.png", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/title/title_dust.ani", AssetType::ANIMATION);
+	{ // Items
+		Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/item/item_points1_disk.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/item/item_points2_gavina.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/item/item_points3_pacmar.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/item/item_clock.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/item/item_clock.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/item/item_coffee.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/item/item_coffee.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/item/item_coffee_machine.ani", AssetType::ANIMATION);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/player/player1.gif", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/player/player1_one_coffee_palette.pal", AssetType::PALETTE);
-	Asset::get()->add(prefix + "/data/gfx/player/player1_two_coffee_palette.pal", AssetType::PALETTE);
-	Asset::get()->add(prefix + "/data/gfx/player/player1_all_white_palette.pal", AssetType::PALETTE);
+	{ // Titulo
+		Asset::get()->add(prefix + "/data/gfx/title/title_bg_tile.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/title/title_coffee.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/title/title_crisis.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/title/title_arcade_edition.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/title/title_dust.png", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/title/title_dust.ani", AssetType::ANIMATION);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/player/player2.gif", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/player/player2_one_coffee_palette.pal", AssetType::PALETTE);
-	Asset::get()->add(prefix + "/data/gfx/player/player2_two_coffee_palette.pal", AssetType::PALETTE);
-	Asset::get()->add(prefix + "/data/gfx/player/player2_all_white_palette.pal", AssetType::PALETTE);
+	{ // Jugador 1
+		Asset::get()->add(prefix + "/data/gfx/player/player1.gif", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/player/player1_one_coffee_palette.pal", AssetType::PALETTE);
+		Asset::get()->add(prefix + "/data/gfx/player/player1_two_coffee_palette.pal", AssetType::PALETTE);
+		Asset::get()->add(prefix + "/data/gfx/player/player1_all_white_palette.pal", AssetType::PALETTE);
+		Asset::get()->add(prefix + "/data/gfx/player/player1_power.png", AssetType::BITMAP);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/player/player.ani", AssetType::ANIMATION);
+	{ // Jugador 2
+		Asset::get()->add(prefix + "/data/gfx/player/player2.gif", AssetType::BITMAP);
+		Asset::get()->add(prefix + "/data/gfx/player/player2_one_coffee_palette.pal", AssetType::PALETTE);
+		Asset::get()->add(prefix + "/data/gfx/player/player2_two_coffee_palette.pal", AssetType::PALETTE);
+		Asset::get()->add(prefix + "/data/gfx/player/player2_all_white_palette.pal", AssetType::PALETTE);
+		Asset::get()->add(prefix + "/data/gfx/player/player2_power.png", AssetType::BITMAP);
+	}
 
-	Asset::get()->add(prefix + "/data/gfx/player/player_power.gif", AssetType::BITMAP);
-	Asset::get()->add(prefix + "/data/gfx/player/player_power_blue_palette.pal", AssetType::PALETTE);
-	Asset::get()->add(prefix + "/data/gfx/player/player_power.ani", AssetType::ANIMATION);
+	{ // Animaciones del jugador
+		Asset::get()->add(prefix + "/data/gfx/player/player.ani", AssetType::ANIMATION);
+		Asset::get()->add(prefix + "/data/gfx/player/player_power.ani", AssetType::ANIMATION);
+	}
 
 	// Fuentes de texto
 	Asset::get()->add(prefix + "/data/font/8bithud.png", AssetType::BITMAP);
diff --git a/source/game.cpp b/source/game.cpp
index b053e0b..f285947 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -347,7 +347,7 @@ void Game::loadMedia()
 	{
 		std::vector<std::shared_ptr<Texture>> player_texture;
 		player_texture.emplace_back(Resource::get()->getTexture("player1.gif"));
-		player_texture.emplace_back(Resource::get()->getTexture("player_power.gif"));
+		player_texture.emplace_back(Resource::get()->getTexture("player1_power.png"));
 		player_textures_.push_back(player_texture);
 	}
 
@@ -355,7 +355,7 @@ void Game::loadMedia()
 	{
 		std::vector<std::shared_ptr<Texture>> player_texture;
 		player_texture.emplace_back(Resource::get()->getTexture("player2.gif"));
-		player_texture.emplace_back(Resource::get()->getTexture("player_power.gif"));
+		player_texture.emplace_back(Resource::get()->getTexture("player2_power.png"));
 		player_textures_.push_back(player_texture);
 	}
 
@@ -1193,7 +1193,7 @@ void Game::renderItems()
 ItemType Game::dropItem()
 {
 	return ItemType::COFFEE_MACHINE;
-	
+
 	const auto lucky_number = rand() % 100;
 	const auto item = rand() % 6;
 
diff --git a/source/player.cpp b/source/player.cpp
index 450c331..9da0ba9 100644
--- a/source/player.cpp
+++ b/source/player.cpp
@@ -621,7 +621,6 @@ void Player::updatePowerUp()
 	{
 		--power_up_counter_;
 		power_up_ = power_up_counter_ > 0;
-		power_sprite_->getTexture()->setPalette(id_ - 1);
 	}
 }
 
diff --git a/source/resource.cpp b/source/resource.cpp
index ba5b7d9..af76e8d 100644
--- a/source/resource.cpp
+++ b/source/resource.cpp
@@ -240,10 +240,6 @@ void Resource::addPalettes()
     getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_two_coffee_palette.pal"));
     getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_all_white_palette.pal"));
 
-    // Player_power
-    std::cout << "\n>> PLAYER_POWER" << std::endl;
-    getTexture("player_power.gif")->addPaletteFromFile(Asset::get()->get("player_power_blue_palette.pal"));
-
     // Fuentes
     std::cout << "\n>> FONTS" << std::endl;
     getTexture("smb2.gif")->addPaletteFromFile(Asset::get()->get("smb2_palette1.pal"));