Skip to content

Commit 7f0702a

Browse files
alicesim1alicesim1
committed
Fix puntal y actualizado para SGDK 1.65
1 parent 6acca96 commit 7f0702a

10 files changed

Lines changed: 10 additions & 826 deletions

File tree

‎inc/global.h‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
#ifndef _GLOBAL_H
22
#define _GLOBAL_H
33
//------------------------------------------------------------------------------------------
4-
<<<<<<< HEAD
5-
#include "../res/basicos.h"//fuente, pinguno jug,
6-
#include "../res/musica.h"
7-
=======
84
#include "../res/basicos.h"//fuente, pinguno jug, cursor,
95
#include "../res/musica.h" //toda coleccion de musicas vgm
10-
>>>>>>> Dialogo
6+
117
//-----------------------------------------------
128

139
u8 ScreenY; //27/29
@@ -35,10 +31,8 @@ char char_salida[8];
3531
void VDP_drawInt(s32,u8,u8,u8);
3632

3733
void play_music(u8);
38-
<<<<<<< HEAD
39-
=======
4034
u8 old_musica;
41-
>>>>>>> Dialogo
35+
4236

4337
u8 randU8(u8,u8);
4438

@@ -47,15 +41,11 @@ u16 paleta64[64];
4741
void TITUTLO();
4842
void ZoneMap();
4943

50-
<<<<<<< HEAD
51-
u8 old_musica;
52-
=======
5344

5445
#define diag_ind 200 //hex:4B0
5546
void dialogo(u16,u16,u8,u8);
5647

5748

58-
>>>>>>> Dialogo
5949
//-----------------------------------
6050
typedef struct {
6151
const bool const PlanA;

‎res/basicos.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
#define _RES_BASICOS_H_
33

44
extern const TileSet font1;
5-
<<<<<<< HEAD
6-
=======
75
extern const TileSet font16;
8-
>>>>>>> Dialogo
96
extern const SpriteDefinition penguin;
107
extern const SpriteDefinition cursor;
118
extern const SpriteDefinition dig_marco1;

‎res/basicos.res‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
TILESET font1 "font_1c.png" BEST NONE
2-
<<<<<<< HEAD
3-
SPRITE penguin "pingu1.png" 3 4 BEST
4-
SPRITE cursor "cursor.png" 1 1 BEST
5-
=======
62
TILESET font16 "font8x16b.png" APLIB NONE
73
SPRITE penguin "pingu1.png" 3 4 APLIB
84
SPRITE cursor "cursor.png" 1 1 APLIB
95
SPRITE dig_marco1 "DiagBox1.png" 1 1 APLIB
106
SPRITE dig_marco2 "DiagBox2.png" 4 1 APLIB
117
SPRITE dig_marco3 "DiagBox3.png" 1 4 APLIB
12-
SPRITE dig_marco4 "sombra-dirtering32.png" 4 4 BEST
13-
>>>>>>> Dialogo
8+
SPRITE dig_marco4 "sombra-dirtering32.png" 4 4 BEST

‎res/logos-titulo.c‎

Lines changed: 0 additions & 240 deletions
This file was deleted.

‎res/logos.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33

44
extern const Image disclaimer;
55
extern const Image logosega;
6-
<<<<<<< HEAD
7-
extern const Image sgdklogo;
8-
=======
9-
>>>>>>> Dialogo
106
extern const Image alicesim1;
117

128
#endif // _RES_LOGOS_H_

‎res/logos.res‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
IMAGE disclaimer "Logos/disclaimer.png" BEST
22
IMAGE logosega "Logos/logo_Sega.png" BEST
3-
<<<<<<< HEAD
4-
IMAGE sgdklogo "Logos/sgdk_logo.png" BEST
5-
=======
6-
>>>>>>> Dialogo
73
IMAGE alicesim1 "Logos/AliceSim1.png" BEST

‎src/logos-titulo.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,14 @@ static void SEGALOGO(){
185185
static void SGDKlogo(){
186186

187187
u16 paleta16or[16];
188-
memcpy(&paleta16or[0],sgdklogo.palette->data, 16 * 2);
188+
memcpy(&paleta16or[0],sgdk_logo.palette->data, 16 * 2);
189189
PAL_setPalette(0,palette_black,DMA);
190190

191-
VDP_drawImageEx(BG_B,&sgdklogo,1,20-4,14-4+IS_PALSYSTEM,FALSE,TRUE);
191+
VDP_drawBitmapEx(BG_B,&sgdk_logo,1,20-4,14-4+IS_PALSYSTEM,FALSE);
192192
PAL_fadeIn(0,15,&paleta16or[0],10,TRUE);
193193

194194
if(BUTTONS[0]==0)JOY_waitPressBtnTime(750);
195-
else PAL_setPalette(PAL0,sgdklogo.palette->data,DMA);
195+
else PAL_setPalette(PAL0,sgdk_logo.palette->data,DMA);
196196

197197
PAL_fadeOutAll(20,FALSE);
198198
VDP_clearPlane(BG_B,TRUE);

‎src/main.c‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@ void main(u16 hard){
3030
}
3131
ScreenTY=8+(ScreenY*8);//224/240
3232
ScreenMY=ScreenTY/2;//112/120
33-
<<<<<<< HEAD
3433
fixAlturaY=-24-ScreTile8;//-24/-32
3534

3635
//KLog_U1("ScreenTY:",ScreenTY);
3736
//KLog_U1("ScreenMY:",ScreenMY);
38-
=======
39-
>>>>>>> Dialogo
37+
4038
//--------------------------------------
4139
JoyType=JOY_getJoypadType(JOY_1);
4240

@@ -49,34 +47,24 @@ void main(u16 hard){
4947
JOY_setEventHandler(&inputHandler);
5048

5149
TITUTLO();
52-
<<<<<<< HEAD
53-
=======
54-
55-
50+
5651
//VDP_setWindowVPos(1,ScreenY);// 27max vertical Windows
5752
//VDP_setTextPlane(WINDOW);//Textos "normales SGDK" se pintan en Window es temporal
5853
//PAL_setColors(0,palette_black,64,CPU);//para iniciacion Debug
59-
>>>>>>> Dialogo
6054

6155
ZoneMap();
6256

6357
}
6458

65-
<<<<<<< HEAD
6659

67-
=======
68-
>>>>>>> Dialogo
6960
void play_music(u8 indice){
7061
switch(indice){
7162
case 1:XGM_startPlay(M_titulo);break;
7263
case 2:XGM_startPlay(M_zone1);break;
7364
default: XGM_stopPlay();
7465
}
7566
}
76-
<<<<<<< HEAD
77-
=======
7867

79-
>>>>>>> Dialogo
8068

8169
//https://github.com/diegomtassis/yamd-library/blob/master/src/fwk/commons.c#L40
8270
u8 randU8(u8 lower, u8 higher) {

0 commit comments

Comments
 (0)