I'm fed up w/ trying to make the intro work, so I'll just remove it

This commit is contained in:
Lucas S. Vieira 2024-11-06 18:13:34 -03:00
parent a1d7bf3633
commit 08657621ee
4 changed files with 4 additions and 17 deletions

Binary file not shown.

View file

@ -258,11 +258,6 @@
source="${PROJECT_SOURCE_DIR}/assets/bgm/EVENT001.XA" />
</dir>
<dummy sectors="1024"/>
<file name="INTRO.STR"
type="mixed"
source="${PROJECT_SOURCE_DIR}/assets/fmv/INTRO.STR" />
<dummy sectors="1024"/>
<file name="SONICT.STR"
type="mixed"

View file

@ -17,9 +17,8 @@
#define CHOICE_MODELTEST 7
#define CHOICE_TITLE 8
#define CHOICE_SONICT 9
#define CHOICE_INTRO 10
#define CHOICE_SOON 11
#define CHOICE_CREDITS 12
#define CHOICE_SOON 10
#define CHOICE_CREDITS 11
#define MAX_LEVELS (CHOICE_CREDITS + 1)
extern uint32_t level_score_count;
@ -49,11 +48,11 @@ static const char *menutext[] = {
"\n",
"\n",
"\n",
"\n",
"MODELTEST",
"TITLESCREEN",
"SONICTEAM",
"INTRO",
"COMINGSOON",
"CREDITS",
NULL,
@ -150,10 +149,6 @@ screen_levelselect_update(void *d)
if(pad_pressed(PAD_START) || pad_pressed(PAD_CROSS)) {
if(data->menu_choice == CHOICE_TITLE) {
scene_change(SCREEN_TITLE);
} else if(data->menu_choice == CHOICE_INTRO) {
screen_fmv_set_next(SCREEN_LEVELSELECT);
screen_fmv_enqueue("\\INTRO.STR;1");
scene_change(SCREEN_FMV);
} else if(data->menu_choice == CHOICE_SONICT) {
screen_fmv_set_next(SCREEN_LEVELSELECT);
screen_fmv_enqueue("\\SONICT.STR;1");

View file

@ -12,7 +12,6 @@
#include "timer.h"
#include "basic_font.h"
#include "screens/fmv.h"
#include "screens/level.h"
extern int debug_mode;
@ -187,9 +186,7 @@ screen_title_update(void *d)
//screen_level_setlevel(0);
// Start at Green Hill Zone 1
screen_level_setlevel(4);
screen_fmv_set_next(SCREEN_LEVEL);
screen_fmv_enqueue("\\INTRO.STR;1");
data->next_scene = SCREEN_FMV;
data->next_scene = SCREEN_LEVEL;
level_score_count = 0;
break;
case 3: // Level Select