fix nombre sin espacios en Musicas + fix API PAL_setColors + PAL_setPalette for DMA, compatible para SGDK main actual

alicesim1 · alicesim1 · commit 781fe8dd0050 · 2021-06-14T12:40:35.000+02:00
diff --git a/res/Musicas/18-Riddle,_Darkness_World.vgm b/res/Musicas/18-Riddle,_Darkness_World.vgm
diff --git a/res/Musicas/20-Zombie_World.vgm b/res/Musicas/20-Zombie_World.vgm
diff --git a/res/musica.res b/res/musica.res
@@ -1,2 +1,2 @@
-XGM M_titulo "Musicas/20 - Zombie World.vgm"
-XGM M_zone1 "Musicas/18 - Riddle, Darkness World.vgm"
+XGM M_titulo Musicas/20-Zombie_World.vgm
+XGM M_zone1 Musicas/18-Riddle,_Darkness_World.vgm
diff --git a/src/boot/rom_head.c b/src/boot/rom_head.c
@@ -12,7 +12,7 @@ const ROMHeader rom_header = {
     "PENGUIN WORLD - ALPHA DEVOLOPER                 ",
     "GM 00000000-00",
     0x000,
-    "J6              ",
+    "J6M             ",
     0x00000000,
 #if (ENABLE_BANK_SWITCH != 0)
     0x003FFFFF,
diff --git a/src/logos-titulo.c b/src/logos-titulo.c
@@ -75,9 +75,9 @@ void TITUTLO(){
 	for(num_lin=9;num_lin<120;num_lin+=2) VDP_setHorizontalScrollLine(BG_A,num_lin,vectorB,2,CPU);
 	if(BUTTONS[0]>9){
 		PAL_interruptFade();
-		PAL_setColors(0,&paleta64[0],64);//restaura las paletas
+		PAL_setColors(0,&paleta64[0],64,DMA);//restaura las paletas
 	}
-	PAL_setPalette(2,palette_black);
+	PAL_setPalette(2,palette_black,DMA);
 	
 	VDP_drawImageEx(BG_B,&titush,TILE_ATTR_FULL(PAL2,FALSE,FALSE,FALSE,ind),3,0,FALSE,TRUE);
 	ind+=titulo.tileset->numTile;
@@ -155,7 +155,7 @@ static void SEGALOGO(){
 	
 	u16 paleta16or[16];
 	memcpy(&paleta16or[0],logosega.palette->data, 16 * 2);
-	PAL_setPalette(0,palette_black);
+	PAL_setPalette(0,palette_black,DMA);
 	
 	VDP_drawImageEx(BG_B,&logosega,1,20-6,14-2,FALSE,TRUE);
 	
@@ -167,7 +167,7 @@ static void SEGALOGO(){
 	PAL_fadeIn(14,15,&paleta16or[14],15,TRUE);
 	
 	if(BUTTONS[0]==0)JOY_waitPressBtnTime(900);
-	else PAL_setPalette(PAL0,logosega.palette->data);
+	else PAL_setPalette(PAL0,logosega.palette->data,DMA);
 	
 	PAL_fadeOutAll(20,FALSE);
 	VDP_clearPlane(BG_B,TRUE);
@@ -179,13 +179,13 @@ static void SGDKlogo(){
 	
 	u16 paleta16or[16];
 	memcpy(&paleta16or[0],sgdklogo.palette->data, 16 * 2);
-	PAL_setPalette(0,palette_black);
+	PAL_setPalette(0,palette_black,DMA);
 	
 	VDP_drawImageEx(BG_B,&sgdklogo,1,20-4,14-4,FALSE,TRUE);
 	PAL_fadeIn(0,15,&paleta16or[0],10,TRUE);
 	
 	if(BUTTONS[0]==0)JOY_waitPressBtnTime(750);
-	else PAL_setPalette(PAL0,sgdklogo.palette->data);
+	else PAL_setPalette(PAL0,sgdklogo.palette->data,DMA);
 	
 	PAL_fadeOutAll(20,FALSE);
 	VDP_clearPlane(BG_B,TRUE);
@@ -199,8 +199,8 @@ static void ALICESIM1(){
 	u16 paleta16or[16];
 	
 	memcpy(&paleta16or[0],alicesim1.palette->data, 16 * 2);
-	PAL_setPalette(0,palette_black);
-	PAL_setPalette(1,palette_grey);
+	PAL_setPalette(0,palette_black,DMA);
+	PAL_setPalette(1,palette_grey,DMA);
 	VDP_setTextPalette(PAL1);
 	
 	VDP_drawImageEx(BG_B,&alicesim1,1,20-11,14-4,FALSE,TRUE);
@@ -223,7 +223,7 @@ static void ALICESIM1(){
 	}
 	
 	if(BUTTONS[0]==0)JOY_waitPressBtnTime(750);
-	else PAL_setPalette(0,paleta16or);
+	else PAL_setPalette(0,paleta16or,DMA);
 	
 	PAL_fadeOutAll(20,FALSE);
 	
diff --git a/src/zone-jugpri.c b/src/zone-jugpri.c
@@ -83,7 +83,7 @@ void ZoneMap(){
 	VDP_setWindowVPos(1,25);// 27max vertical Windows
 	VDP_setTextPlane(WINDOW);//Textos "normales SGDK" se pintan en Window es temporal
 	
-	PAL_setColors(0,palette_black,64);
+	PAL_setColors(0,palette_black,64,DMA);
 	
 	memcpy(&paleta64[16],penguin.palette->data,8*2);//16+8
 	
@@ -130,10 +130,10 @@ void ZoneMap(){
 		
 		loadzona();
 		
-		KLog("start");
+		/*KLog("start");
 		KLog_U2("PX:", PX," PY:", PY);
 		KLog_S2("posX:", posX," posY:", posY);
-		KLog("----");
+		KLog("----");*/
 		if(zona1dat[ZONA_NUM].musica!=old_musica){
 			old_musica=zona1dat[ZONA_NUM].musica;
 			play_music(zona1dat[ZONA_NUM].musica);
@@ -188,7 +188,7 @@ void ZoneMap(){
 				VDP_drawInt(joypos.y,3,35,25);
 			}
 			
-			//VDP_drawInt(SYS_getCPULoad(),2,38,27);
+			VDP_drawInt(SYS_getCPULoad(),2,38,27);
 			
 			//if(SPR_Pinta){  SPR_Pinta=FALSE;
 				SPR_update();
@@ -197,11 +197,11 @@ void ZoneMap(){
 			
 			
 			
-			//if(BUTTONS[8] && BUTTONS[5]) SYS_hardReset();
+			if(BUTTONS[8] && BUTTONS[5]) SYS_hardReset();
 			
 			
 			
-		}while(1);//!BUTTONS[7] || gat);
+		}while(!BUTTONS[7] || gat);
 		
 		gat=TRUE;
 		
@@ -228,13 +228,6 @@ void ZoneMap(){
 
 
 
-static void pintarAB(){	
-	//VDP_drawInt(posX,3,5,26);VDP_drawInt(posY,3,5,27);
-	MAP_scrollTo(bgb,posX,posY);
-	
-	if(zona1dat[ZONA_NUM].PlanA) MAP_scrollTo(bga,posX,posY);
-}
-
 static void SPR_PRIORITY(){
 	
 	//-----------------------------------------------------------
@@ -386,29 +379,37 @@ static void jugpenguin(){
 }
 
 
+static void pintarAB(){	
+	//VDP_drawInt(posX,3,5,26);VDP_drawInt(posY,3,5,27);
+	MAP_scrollTo(bgb,posX,posY);
+	
+	if(zona1dat[ZONA_NUM].PlanA) MAP_scrollTo(bga,posX,posY);
+}
+
 static void loadzona(){
 	
 	VDP_clearPlane(BG_B,TRUE);	VDP_clearPlane(BG_A,TRUE);
 	
 	SYS_doVBlankProcess();
 	
 	memcpy(&paleta64[0],zona1[ZONA_NUM]->palette->data,16*2);
-	paleta64[0]=0;//colro de fondo 100% negro
+	paleta64[0]=0;//colro de fondo 100% -Negro
 	paleta64[15]=0xFFF;//color 15 (texo...) Blanco
 	
-	VDP_loadTileSet(zona1[ZONA_NUM]->tileset,1,DMA);
+	VDP_loadTileSet(zona1[ZONA_NUM]->tileset,1,CPU);
 	bgb=MAP_create(zona1[ZONA_NUM],BG_B,1);
 	
-	if(zona1dat[ZONA_NUM].PlanA){ u8 ind;
+	if(zona1dat[ZONA_NUM].PlanA){ 
+		u8 ind;
 		ind=1+zona1[ZONA_NUM]->tileset->numTile;
-		VDP_loadTileSet(zona1b[ZONA_NUM]->tileset,ind,DMA);
+		VDP_loadTileSet(zona1b[ZONA_NUM]->tileset,ind,CPU);
 		bga=MAP_create(zona1b[ZONA_NUM],BG_A,TILE_ATTR_FULL(0,1,0,0,ind));//PLANO A SIEMPRE PRIORIDAD ALTA!
 		//ind+=zona1b[ZONA_NUM]->tileset->numTile;
 	}
 	
+	//SYS_doVBlankProcess();
 	posX=posY=0;
 	pintarAB();
-	
 	SYS_doVBlankProcess();
 	
 	jug2diso();
