Skip to content

Commit 923d35d

Browse files
committed
removed intro, modified splash screen
1 parent 51ffc48 commit 923d35d

8 files changed

+38
-48
lines changed

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
/.vscode/*
2-
/.vscode
1+
./.vscode/*
2+
./.vscode
33
*.sav

.vscode/c_cpp_properties.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"configurations": [
3+
{
4+
"name": "Win32",
5+
"includePath": [
6+
"${workspaceFolder}/**", "C:/Game_Boy_Dev_Tools/gbdk/include", "C:/hUGETracker_1_0b9/hUGEDriver/include"
7+
],
8+
"defines": [
9+
"_DEBUG",
10+
"UNICODE",
11+
"_UNICODE"
12+
],
13+
"windowsSdkVersion": "10.0.16299.0",
14+
"compilerPath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Tools\\MSVC\\14.16.27023\\bin\\Hostx64\\x64\\cl.exe",
15+
"cStandard": "c17",
16+
"cppStandard": "c++17",
17+
"intelliSenseMode": "windows-msvc-x64"
18+
}
19+
],
20+
"version": 4
21+
}

.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"cmake.configureOnOpen": true
3+
}

main.c

+2-40
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ unsigned char rounddispl[9] = {0x1E, 0x1B, 0x21, 0x1A, 0x10, 0x00, 0x00, 0x00, 0
5151
unsigned char numtiles[3]; // Tiles for 3 digit numbers for reuse
5252
const unsigned char presst[11] = {0x1C, 0x1E, 0x11, 0x1F, 0x1F, 0x00, 0x1F, 0x20, 0x0D, 0x1E, 0x20};
5353
const UINT8 menuentriesx[10] = {42, 42, 18, 18, 18, 18, 18, 18, 18, 66};
54-
const UINT8 menuentriesy[10] = {112, 128, 24, 40, 56, 72, 88, 104, 128, 144};
54+
const UINT8 menuentriesy[10] = {104, 120, 24, 40, 56, 72, 88, 104, 128, 144};
5555
UINT8 crntmenuentry; // Tracks currently selected option in the menu
5656
const unsigned char normoption[4] = {0x1A, 0x1B, 0x1E, 0x19};
5757
const unsigned char easyoption[4] = {0x11, 0x0D, 0x1F, 0x25};
@@ -110,7 +110,6 @@ UBYTE is_round_over();
110110
void incr_frame_counter(UINT8 framelimit);
111111
void begin_round();
112112
void start_game();
113-
void intro_screen();
114113
void animate_coin_spin();
115114
void move_coin_cursor(INT8 direction, UINT8 fstmenuind, UINT8 lastmenuind);
116115
void main_menu();
@@ -522,43 +521,6 @@ void start_game() {
522521
}
523522

524523

525-
void intro_screen() {
526-
fill_bkg_rect(0, 0, 20, 18, blanktile);
527-
set_bkg_tiles(6, 3, 7, 1, introcreated);
528-
set_bkg_tiles(9, 5, 2, 1, introby);
529-
set_sprite_data(0, 36, speedpfonttiles);
530-
move_sprite(0, 168, 80);
531-
532-
for(i = 0; i < 16; i++) {
533-
set_sprite_tile(i, intronamesprites[i]);
534-
set_sprite_prop(i, 0x20);
535-
if(i < 10) {
536-
move_sprite(i, 168, 80);
537-
j = i + 5;
538-
} else {
539-
move_sprite(i, 168, 96);
540-
j = i - 3;
541-
}
542-
543-
while(j < 20) {
544-
scroll_sprite(i, -8, 0);
545-
wait_vbl_done();
546-
j++;
547-
}
548-
}
549-
for(k = 0; k < 16; k++) {
550-
set_sprite_prop(k, 0x00);
551-
custom_delay(4);
552-
}
553-
554-
custom_delay(20);
555-
set_bkg_tiles(8, 14, 4, 1, introyear);
556-
custom_delay(60);
557-
fade_to_black();
558-
clear_sprite_tiles();
559-
}
560-
561-
562524
void animate_coin_spin() {
563525
if(framecnt == coinspinframe) {
564526
cointile += cointileincr;
@@ -983,6 +945,7 @@ void stop_song() {
983945

984946

985947
void main() {
948+
BGP_REG = 0xFF;
986949
DISPLAY_ON;
987950
SHOW_BKG;
988951
SHOW_SPRITES;
@@ -992,7 +955,6 @@ void main() {
992955
NR50_REG = 0x77; // Max level, left and right
993956

994957
set_game_font();
995-
intro_screen();
996958
default_settings();
997959

998960
while(1) {

make.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lcc -Iinclude -o speedp.gb main.c hUGEDriver.obj.o speedptitlesong.c speedpwinsong.c speedplosesong.c speedproundsong.c
1+
lcc include -o speedp.gb main.c hUGEDriver.obj.o speedptitlesong.c speedpwinsong.c speedplosesong.c speedproundsong.c

speedp.gb

0 Bytes
Binary file not shown.

speedptitlescreenmap.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Section :
99
Bank : 0
1010
Map size : 20 x 18
11-
Tile set : C:\Game_Boy_Dev_Tools\gbtd22\Tiles\SpeedPFont_and_SpeedPTitleScreen.gbr
11+
Tile set : F:\Projects\Game Boy Projects\Tiles_Maps_Assets\Tiles\SpeedPFont_and_SpeedPTitleScreen.gbr
1212
Plane count : 1 plane (8 bits)
1313
Plane order : Tiles are continues
1414
Tile offset : 0
@@ -28,8 +28,6 @@ const unsigned char speedptitlescreenmap[] =
2828
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
2929
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
3030
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
31-
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
32-
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
3331
0x00,0x5B,0x5B,0x5B,0x5B,0x5B,0x5B,0x5B,0x5B,0x5B,
3432
0x5B,0x5B,0x5B,0x5B,0x5B,0x5B,0x5B,0x5B,0x5B,0x00,
3533
0x00,0x2A,0x2B,0x2C,0x33,0x34,0x35,0x3B,0x3C,0x3D,
@@ -58,6 +56,8 @@ const unsigned char speedptitlescreenmap[] =
5856
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
5957
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
6058
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
59+
0x00,0x00,0x05,0x03,0x05,0x04,0x00,0x17,0x1A,0x1F,
60+
0x00,0x10,0x1B,0x0E,0x1E,0x11,0x22,0x00,0x00,0x00,
6161
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
6262
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
6363
};

speedptitlescreenmap.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Section :
99
Bank : 0
1010
Map size : 20 x 18
11-
Tile set : C:\Game_Boy_Dev_Tools\gbtd22\Tiles\SpeedPFont_and_SpeedPTitleScreen.gbr
11+
Tile set : F:\Projects\Game Boy Projects\Tiles_Maps_Assets\Tiles\SpeedPFont_and_SpeedPTitleScreen.gbr
1212
Plane count : 1 plane (8 bits)
1313
Plane order : Tiles are continues
1414
Tile offset : 0
@@ -17,11 +17,15 @@
1717
This file was generated by GBMB v1.8
1818
1919
*/
20+
#ifndef __speedptitlescreenmap_h_INCLUDE
21+
#define __speedptitlescreenmap_h_INCLUDE
2022

2123
#define speedptitlescreenmapWidth 20
2224
#define speedptitlescreenmapHeight 18
2325
#define speedptitlescreenmapBank 0
2426

25-
extern unsigned char speedptitlescreenmap[];
27+
extern const unsigned char speedptitlescreenmap[];
28+
29+
#endif
2630

2731
/* End of SPEEDPTITLESCREENMAP.H */

0 commit comments

Comments
 (0)