@@ -30,9 +30,7 @@ bool PUERTA_SAL;
3030
3131u16 STARTXT ;
3232
33- #define diag_ind 200 //hex:4B0
3433
35- static void dialogo (u16 ,u16 ,u8 ,u8 );
3634//---------------------------------------------------------
3735// DATA
3836//---------------------------------------------------------
@@ -65,10 +63,9 @@ void ZoneMap(){
6563 //PX=32*0;PY=32*0;
6664
6765 //----------------------------------------------
68- VDP_loadFont (& font2 ,CPU );VDP_setTextPalette (2 );
66+ // VDP_loadFont(&font2,CPU);VDP_setTextPalette(2);
6967
7068 memcpy (& paleta64 [16 ],penguin .palette -> data ,8 * 2 );//16+8
71- memcpy (& paleta64 [32 ],dig_marco1 .palette -> data ,8 * 2 );//16+8
7269
7370 //PAL_setColors(32,dig_marco1.palette->data,8,CPU);
7471 //memcpy(&paleta64[32],&palette_green, 16 * 2);
@@ -82,8 +79,7 @@ void ZoneMap(){
8279 panim = 3 ;
8380 jugpri = jugpricpy = TRUE;
8481
85- penguinsp = SPR_addSpriteEx (& penguin ,160 - 12 ,ScreenMY - 18 ,TILE_ATTR (1 ,jugpri ,FALSE,FALSE),
86- 0 ,SPR_FLAG_AUTO_VRAM_ALLOC | SPR_FLAG_AUTO_SPRITE_ALLOC | SPR_FLAG_AUTO_TILE_UPLOAD );
82+ penguinsp = SPR_addSpriteEx (& penguin ,160 - 12 ,ScreenMY - 18 ,TILE_ATTR (1 ,jugpri ,FALSE,FALSE),0 ,SPR_FLAG_AUTO_VRAM_ALLOC | SPR_FLAG_AUTO_SPRITE_ALLOC | SPR_FLAG_AUTO_TILE_UPLOAD );
8783 SPR_setVisibility (penguinsp ,VISIBLE );
8884
8985 //pdirc=pdircm=1;//up+>>
@@ -102,21 +98,13 @@ void ZoneMap(){
10298
10399
104100 if (CursorON ){
105- cursorsp = SPR_addSpriteEx (& cursor ,160 ,ScreenMY ,TILE_ATTR (0 ,TRUE,FALSE,FALSE),
106- 0 ,SPR_FLAG_AUTO_VRAM_ALLOC | SPR_FLAG_AUTO_SPRITE_ALLOC | SPR_FLAG_AUTO_TILE_UPLOAD | SPR_FLAG_INSERT_HEAD );
101+ cursorsp = SPR_addSpriteEx (& cursor ,0 ,0 ,TILE_ATTR (0 ,TRUE,FALSE,FALSE),0 ,SPR_FLAG_AUTO_VRAM_ALLOC | SPR_FLAG_AUTO_SPRITE_ALLOC | SPR_FLAG_AUTO_TILE_UPLOAD | SPR_FLAG_INSERT_HEAD );
107102 SPR_setVisibility (cursorsp ,HIDDEN );
108103 _JOYsetXY (160 ,ScreenMY );
109104 }
110105
111106
112107 //--------------------------------------------------
113- Sprite * SPRITE_TEMP [3 ];
114- SPRITE_TEMP [0 ]= SPR_addSpriteEx (& dig_marco1 ,0 ,0 ,TILE_ATTR_FULL (2 ,TRUE,FALSE,FALSE,diag_ind ),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC | SPR_FLAG_AUTO_TILE_UPLOAD );
115- SPRITE_TEMP [1 ]= SPR_addSpriteEx (& dig_marco2 ,0 ,0 ,TILE_ATTR_FULL (2 ,TRUE,FALSE,FALSE,diag_ind + 1 ),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC | SPR_FLAG_AUTO_TILE_UPLOAD );
116- SPRITE_TEMP [2 ]= SPR_addSpriteEx (& dig_marco3 ,0 ,0 ,TILE_ATTR_FULL (2 ,TRUE,FALSE,FALSE,diag_ind + 1 + 4 ),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC | SPR_FLAG_AUTO_TILE_UPLOAD );
117- SPR_update ();//SPR_FLAG_AUTO_TILE_UPLOAD FUNCIONE! Volvado automatico de tileset de los sprites a la VRAM
118- for (u8 i = 0 ;i < 3 ;i ++ ) SPR_releaseSprite (SPRITE_TEMP [i ]);
119- SYS_doVBlankProcess ();//Evita sobre carga DMA SPRITES
120108
121109 //--------------------------------------------------
122110
@@ -136,7 +124,7 @@ void ZoneMap(){
136124 SYS_doVBlankProcess ();//Evita sobre carga DMA SPRITES
137125 SPR_update ();
138126
139- PAL_fadeInAll (paleta64 ,20 ,TRUE );
127+ PAL_fadeInAll (paleta64 ,20 ,FALSE );
140128
141129 gat = TRUE;
142130 PUERTA_SAL = FALSE;
@@ -181,7 +169,7 @@ void ZoneMap(){
181169 }
182170 }
183171
184- VDP_drawInt (SYS_getCPULoad (),2 ,38 ,ScreenY );
172+ // VDP_drawInt(SYS_getCPULoad(),2,38,ScreenY);
185173 SPR_update ();
186174 SYS_doVBlankProcess (); // Renderizamos la pantalla
187175
@@ -196,81 +184,6 @@ void ZoneMap(){
196184 }
197185}
198186
199-
200- static void dialogo (u16 x ,u16 y ,u8 ancho , u8 alto ){
201-
202- u8 i ;
203- Sprite * dig_marcoE [4 ];
204- Sprite * dig_marcoH [ancho ];//superior
205- Sprite * dig_marcoV [alto ];//izquierdaq
206-
207- Sprite * dig_marcoHd [ancho ];//abajo
208- Sprite * dig_marcoVd [alto ];//derecho
209-
210- //-----------------------------------------------------------------
211- dig_marcoE [0 ]= SPR_addSpriteEx (& dig_marco1 ,x ,y ,TILE_ATTR_FULL (2 ,TRUE,FALSE,FALSE,diag_ind ),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC );
212- dig_marcoE [1 ]= SPR_addSpriteEx (& dig_marco1 ,x + 8 + (32 * ancho ),y ,TILE_ATTR_FULL (2 ,TRUE,FALSE,TRUE,diag_ind ),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC );
213- dig_marcoE [2 ]= SPR_addSpriteEx (& dig_marco1 ,x ,y + 8 + (32 * alto ),TILE_ATTR_FULL (2 ,TRUE,TRUE,FALSE,diag_ind ),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC );
214- dig_marcoE [3 ]= SPR_addSpriteEx (& dig_marco1 ,x + 8 + (32 * ancho ),y + 8 + (32 * alto ),TILE_ATTR_FULL (2 ,TRUE,TRUE,TRUE,diag_ind ),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC );
215- for (i = 0 ;i < 4 ;i ++ ){
216- SPR_setVisibility (dig_marcoE [i ],VISIBLE );SPR_setDepth (dig_marcoE [i ],SPR_MIN_DEPTH + 2 );//-32766
217- }
218-
219- u16 x2 ;
220- u16 y2 = y + 8 + (32 * alto );
221-
222- for (i = 0 ;i < ancho ;i ++ ){
223- x2 = x + 8 + (32 * i );
224- dig_marcoH [i ]= SPR_addSpriteEx (& dig_marco2 ,x2 ,y ,TILE_ATTR_FULL (2 ,TRUE,FALSE,FALSE,diag_ind + 1 ),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC );
225- dig_marcoHd [i ]= SPR_addSpriteEx (& dig_marco2 ,x2 ,y2 ,TILE_ATTR_FULL (2 ,TRUE,TRUE ,FALSE,diag_ind + 1 ),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC );
226- SPR_setVisibility (dig_marcoH [i ],VISIBLE );SPR_setDepth (dig_marcoH [i ],SPR_MIN_DEPTH + 2 );//-32766
227- SPR_setVisibility (dig_marcoHd [i ],VISIBLE );SPR_setDepth (dig_marcoHd [i ],SPR_MIN_DEPTH + 2 );//-32766
228- }
229-
230- x2 = x + 8 + (32 * ancho );
231- for (i = 0 ;i < alto ;i ++ ){
232- y2 = y + 8 + (32 * i );
233- dig_marcoV [i ]= SPR_addSpriteEx (& dig_marco3 ,x ,y2 ,TILE_ATTR_FULL (2 ,TRUE,FALSE,FALSE,diag_ind + 1 + 4 ),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC );
234- dig_marcoVd [i ]= SPR_addSpriteEx (& dig_marco3 ,x2 ,y2 ,TILE_ATTR_FULL (2 ,TRUE,FALSE,TRUE ,diag_ind + 1 + 4 ),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC );
235- SPR_setVisibility (dig_marcoV [i ],VISIBLE );SPR_setDepth (dig_marcoV [i ],SPR_MIN_DEPTH + 2 );//-32766
236- SPR_setVisibility (dig_marcoVd [i ],VISIBLE );SPR_setDepth (dig_marcoVd [i ],SPR_MIN_DEPTH + 2 );//-32766
237- }
238-
239- Sprite * dig_lienzo [ancho * alto ];
240- u8 p = 0 ;
241- for (u8 h = 0 ;h < ancho ;h ++ ){
242- for (u8 v = 0 ;v < alto ;v ++ ){
243- dig_lienzo [p ]= SPR_addSpriteEx (& dig_marco4 ,x + 8 + (32 * h ),y + 8 + (32 * v ),TILE_ATTR_FULL (2 ,TRUE,FALSE,FALSE,diag_ind + 1 + 4 + 4 + (16 * p )),0 ,SPR_FLAG_AUTO_SPRITE_ALLOC | SPR_FLAG_AUTO_TILE_UPLOAD );
244- SPR_setVisibility (dig_lienzo [p ],VISIBLE );SPR_setDepth (dig_lienzo [p ],SPR_MIN_DEPTH + 2 );//-32766
245- p ++ ;
246- //--------------------------------------------------------------------
247- }
248- }
249-
250- SPR_update ();
251- do {
252- if (gat && !BUTTONS [6 ]) gat = FALSE;
253- if (CursorON ){
254- _JOYupdateMouse ();
255- SPR_update ();
256- }
257- VDP_drawInt (SYS_getCPULoad (),2 ,38 ,ScreenY );
258-
259- SYS_doVBlankProcess ();
260- }while (!BUTTONS [6 ] || gat ); gat = TRUE;
261-
262- for (i = 0 ;i < 4 ;i ++ ) SPR_releaseSprite (dig_marcoE [i ]);
263-
264- for (i = 0 ;i < ancho ;i ++ )SPR_releaseSprite (dig_marcoH [i ]);
265- for (i = 0 ;i < ancho ;i ++ )SPR_releaseSprite (dig_marcoHd [i ]);
266- for (i = 0 ;i < alto ;i ++ ) SPR_releaseSprite (dig_marcoV [i ]);
267- for (i = 0 ;i < alto ;i ++ ) SPR_releaseSprite (dig_marcoVd [i ]);
268-
269- for (i = 0 ;i < p ;i ++ ) SPR_releaseSprite (dig_lienzo [i ]);
270-
271- }
272-
273-
274187static void pintarAB (){ //ingame al movernos con el jugador
275188 MAP_scrollTo (bgb ,posX ,posY );
276189 if (zona1dat [ZONA_NUM ].PlanA ) MAP_scrollTo (bga ,posX ,posY );
@@ -297,7 +210,7 @@ static void loadzona(){
297210
298211 memcpy (& paleta64 [0 ],zona1 [ZONA_NUM ]-> palette -> data ,16 * 2 );
299212 paleta64 [0 ]= 0 ;//colro de fondo 100% -Negro
300- // paleta64[15]=0xFFF;//color 15 (texo...) Blanco
213+ paleta64 [15 ]= 0xFFF ;//color 15 (texo...) Blanco
301214
302215 //u16 ind=TILE_USERINDEX;
303216 VDP_loadTileSet (zona1 [ZONA_NUM ]-> tileset ,0 ,CPU );
0 commit comments