Skip to content

Commit 01ae22f

Browse files
alicesim1alicesim1
committed
Merge branch 'Dialogo'
2 parents c18053b + 45038f5 commit 01ae22f

38 files changed

Lines changed: 1388 additions & 121 deletions

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
out/
2-
temp/

‎README.md‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ Plataforma: **SEGA Mega Drive/Genesis**
99
# Que está desarrollado: #
1010
**+Logos + Titulo + Música**
1111

12-
**+4 Zonas de pruebas** in game , aun en desarrollo:
1312

13+
**Sistema de cuadros de dialogos! Primera version Alpha Test**
14+
![Test Dialogo](https://raw.githubusercontent.com/alicesim1/Penguin-World/main/screenshot/testzone1-test-CuadroDiag.jpg)
15+
16+
17+
**+4 Zonas de pruebas** in game , aun en desarrollo:
1418
![Test Zone 2](https://raw.githubusercontent.com/alicesim1/Penguin-World/main/screenshot/Zona2.JPG)
1519
![Test Zone 4](https://raw.githubusercontent.com/alicesim1/Penguin-World/main/screenshot/Zona4.JPG)
1620

@@ -25,12 +29,20 @@ Zone 4 con paredes "semi" transparentes (matriz de pixeles pintados y no pintado
2529
Resolucion vertical a 240p para PAL 50Hrz, 224 para NTSC(EEUU/JAP) 60Hrz (Diferencia de 16pixeles)
2630

2731
## Botones: ##
28-
**A + Start = Hard-Reset**
2932

33+
**A = Test dialogo 1**
34+
**B = Test dialogo 2**
35+
**C = Test dialogo 3**
36+
**X = Test dialogo 4**
37+
**Y = Test dialogo 5**
38+
39+
**B = Cerrar dialogo
3040

3141
## SEGA Mouse##
32-
[[Puerto 2]] Opcionalmente!
33-
Se visualiza un cursor de color verde, que se puede controlar con el raton!
42+
43+
[[Puerto 2]] Opcionalmente!
44+
[Tambien compatible con PAD3/6 botones] Si esta conectado!
45+
Se visualiza un cursor de color verde, que se puede controlar con el raton!(o cruzeta)
3446
Por el momento no tiene interacion con nada... esta en desarrollo y estudio.
3547

3648
https://segaretro.org/Sega_Mouse
@@ -46,6 +58,9 @@ Creado con [SGDK de Stephane](https://github.com/Stephane-D/SGDK)
4658

4759

4860
Redes sociales:
61+
4962
https://twitter.com/Alice_Sim1
63+
5064
https://www.twitch.tv/AliceSim1
65+
5166
https://www.youtube.com/user/simulatorone/

‎inc/global.h‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
#ifndef _GLOBAL_H
22
#define _GLOBAL_H
33
//------------------------------------------------------------------------------------------
4+
<<<<<<< HEAD
45
#include "../res/basicos.h"//fuente, pinguno jug,
56
#include "../res/musica.h"
7+
=======
8+
#include "../res/basicos.h"//fuente, pinguno jug, cursor,
9+
#include "../res/musica.h" //toda coleccion de musicas vgm
10+
>>>>>>> Dialogo
611
//-----------------------------------------------
712

813
u8 ScreenY; //27/29
@@ -11,17 +16,17 @@ u8 ScreenTY; //224/240
1116
s8 fixAlturaY; //-24/-32
1217
u8 ScreTile8; //0/8
1318

14-
u8 padtipo; //JOY_getPortType(PORT_1);
15-
u8 pad6; //JOY_getJoypadType(JOY_1);
19+
u8 JoyType; //JOY_getJoypadType(JOY_1); //JOY_TYPE_PAD6
1620
u8 padraton; //JOY_getPortType(PORT_2);
21+
bool CursorON;
1722

18-
u16 BUTTONS[13];
19-
20-
s16 readedX;
21-
s16 readedY;
22-
Vect2D_s16 joypos;
2323

24+
u16 BUTTONS[20];
25+
bool gat;
2426

27+
Sprite* cursorsp;
28+
s16 readedX,readedY;
29+
Vect2D_s16 joypos;
2530
void _JOYsetXY ( s16 x, s16 y );
2631
void _JOYupdateMouse ();
2732

@@ -30,6 +35,10 @@ char char_salida[8];
3035
void VDP_drawInt(s32,u8,u8,u8);
3136

3237
void play_music(u8);
38+
<<<<<<< HEAD
39+
=======
40+
u8 old_musica;
41+
>>>>>>> Dialogo
3342

3443
u8 randU8(u8,u8);
3544

@@ -38,7 +47,15 @@ u16 paleta64[64];
3847
void TITUTLO();
3948
void ZoneMap();
4049

50+
<<<<<<< HEAD
4151
u8 old_musica;
52+
=======
53+
54+
#define diag_ind 200 //hex:4B0
55+
void dialogo(u16,u16,u8,u8);
56+
57+
58+
>>>>>>> Dialogo
4259
//-----------------------------------
4360
typedef struct {
4461
const bool const PlanA;

‎inc/zona1dat.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44

55
#define TOP_ZONAS 4
66

7-
const u8 const casillas_0[];
8-
const u16 const blxpri_0[];
97

108
const t_zona zona1dat[TOP_ZONAS];
119

12-
13-
1410
#endif

‎res/DiagBox1.png‎

168 Bytes
Loading

‎res/DiagBox2.png‎

176 Bytes
Loading

‎res/DiagBox3.png‎

158 Bytes
Loading

‎res/basicos.h‎

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

44
extern const TileSet font1;
5+
<<<<<<< HEAD
6+
=======
7+
extern const TileSet font16;
8+
>>>>>>> Dialogo
59
extern const SpriteDefinition penguin;
610
extern const SpriteDefinition cursor;
11+
extern const SpriteDefinition dig_marco1;
12+
extern const SpriteDefinition dig_marco2;
13+
extern const SpriteDefinition dig_marco3;
14+
extern const SpriteDefinition dig_marco4;
715

816
#endif // _RES_BASICOS_H_

‎res/basicos.res‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
TILESET font1 "font_1c.png" BEST NONE
2+
<<<<<<< HEAD
23
SPRITE penguin "pingu1.png" 3 4 BEST
3-
SPRITE cursor "cursor.png" 1 1 BEST
4+
SPRITE cursor "cursor.png" 1 1 BEST
5+
=======
6+
TILESET font16 "font8x16b.png" APLIB NONE
7+
SPRITE penguin "pingu1.png" 3 4 APLIB
8+
SPRITE cursor "cursor.png" 1 1 APLIB
9+
SPRITE dig_marco1 "DiagBox1.png" 1 1 APLIB
10+
SPRITE dig_marco2 "DiagBox2.png" 4 1 APLIB
11+
SPRITE dig_marco3 "DiagBox3.png" 1 4 APLIB
12+
SPRITE dig_marco4 "sombra-dirtering32.png" 4 4 BEST
13+
>>>>>>> Dialogo

‎res/cursor.png‎

-32 Bytes
Loading

0 commit comments

Comments
 (0)