aboutsummaryrefslogtreecommitdiff
path: root/sky/cd_intro.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sky/cd_intro.cpp')
-rw-r--r--sky/cd_intro.cpp168
1 files changed, 84 insertions, 84 deletions
diff --git a/sky/cd_intro.cpp b/sky/cd_intro.cpp
index 52d64f15c0..b4561b9456 100644
--- a/sky/cd_intro.cpp
+++ b/sky/cd_intro.cpp
@@ -192,8 +192,8 @@
#define START_VOICE ( delay(200), _sound->playVoice(vocBuffer, loadedVocSize) )
#define START_BG ( _sound->playBgSound(bgVocBuffer, bgVocSize) )
-#define LOAD_NEW_VOICE(num) ( free (vocBuffer), vocBuffer = loadFile(num, NULL), loadedVocSize = _lastLoadedFileSize )
-#define LOAD_NEW_BG(num) ( free (bgVocBuffer), bgVocBuffer = loadFile(num, NULL), bgVocSize = _lastLoadedFileSize )
+#define LOAD_NEW_VOICE(num) ( free (vocBuffer), vocBuffer = _skyDisk->loadFile(num, NULL), loadedVocSize = _skyDisk->_lastLoadedFileSize )
+#define LOAD_NEW_BG(num) ( free (bgVocBuffer), bgVocBuffer = _skyDisk->loadFile(num, NULL), bgVocSize = _skyDisk->_lastLoadedFileSize )
#define WAIT_VOICE while (_sound->_voiceHandle != 0) { delay(50); }
#define WAIT_SEQUENCE while (_tseqFrames != 0) { delay(50); }
#define WAIT_RELATIVE(x) ( delay(20 * (x)) )
@@ -204,17 +204,17 @@ void SkyState::doCDIntro() {
uint32 loadedVocSize, bgVocSize;
byte *vocBuffer, *bgVocBuffer, *cd2_seq_data_1, *cd2_seq_data_2;
- assert(_isCDVersion);
+ assert(isCDVersion(_gameVersion));
- vocBuffer = loadFile(cdv_00, NULL);
- loadedVocSize = _lastLoadedFileSize;
+ vocBuffer = _skyDisk->loadFile(cdv_00, NULL);
+ loadedVocSize = _skyDisk->_lastLoadedFileSize;
- _tempPal = loadFile(cd_pal, NULL);
- _workScreen = loadFile(cd_1_log, NULL);
+ _tempPal = _skyDisk->loadFile(cd_pal, NULL);
+ _workScreen = _skyDisk->loadFile(cd_1_log, NULL);
- cd2_seq_data_1 = loadFile(cd_1, NULL);
- bgVocBuffer = loadFile(59499, NULL);
- bgVocSize = _lastLoadedFileSize;
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_1, NULL);
+ bgVocBuffer = _skyDisk->loadFile(59499, NULL);
+ bgVocSize = _skyDisk->_lastLoadedFileSize;
delay(2000); //keep gibbons screen up for 2 seconds
fnFadeDown(0); //and fade out
@@ -223,8 +223,8 @@ void SkyState::doCDIntro() {
START_BG;
free (vocBuffer);
- vocBuffer = loadFile(cdv_01, NULL);
- loadedVocSize = _lastLoadedFileSize;
+ vocBuffer = _skyDisk->loadFile(cdv_01, NULL);
+ loadedVocSize = _skyDisk->_lastLoadedFileSize;
WAIT_VOICE; //wait for the voice to finish
START_VOICE;
@@ -236,7 +236,7 @@ void SkyState::doCDIntro() {
WAIT_VOICE;
START_VOICE;
START_BG;
- cd2_seq_data_2 = loadFile(cd_2, NULL); //load seq 2 while 1 is playing
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_2, NULL); //load seq 2 while 1 is playing
LOAD_NEW_VOICE(cdv_03);
//WAIT_SEQUENCE;
WAIT_VOICE;
@@ -251,7 +251,7 @@ void SkyState::doCDIntro() {
START_BG;
free(cd2_seq_data_1);
- cd2_seq_data_1 = loadFile(cd_3, NULL);
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_3, NULL);
LOAD_NEW_VOICE(cdv_05);
WAIT_SEQUENCE; //2
@@ -269,7 +269,7 @@ void SkyState::doCDIntro() {
START_BG;
free (cd2_seq_data_2);
- cd2_seq_data_2 = loadFile(cd_5, NULL);
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_5, NULL);
LOAD_NEW_VOICE(cdv_07);
WAIT_SEQUENCE; //3
@@ -289,7 +289,7 @@ void SkyState::doCDIntro() {
START_BG;
free (cd2_seq_data_1);
- cd2_seq_data_1 = loadFile(cd_7, NULL);
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_7, NULL);
LOAD_NEW_VOICE(cdv_10);
WAIT_SEQUENCE; //5
@@ -299,10 +299,10 @@ void SkyState::doCDIntro() {
startTimerSequence(cd2_seq_data_1); //7
START_BG;
- loadFile(cd_11_pal, _tempPal);
- byte *workScreen2 = loadFile(cd_11_log, NULL); //need an extra screen or else the sequence will get messed up
+ _skyDisk->loadFile(cd_11_pal, _tempPal);
+ byte *workScreen2 = _skyDisk->loadFile(cd_11_log, NULL); //need an extra screen or else the sequence will get messed up
free (cd2_seq_data_2);
- cd2_seq_data_2 = loadFile(cd_11, NULL);
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_11, NULL);
LOAD_NEW_VOICE(cdv_11);
WAIT_VOICE; //10
@@ -329,7 +329,7 @@ void SkyState::doCDIntro() {
START_BG;
free(cd2_seq_data_1);
- cd2_seq_data_1 = loadFile(cd_13, NULL);
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_13, NULL);
LOAD_NEW_VOICE(cdv_14);
LOAD_NEW_BG(59498);
@@ -342,8 +342,8 @@ void SkyState::doCDIntro() {
START_BG;
LOAD_NEW_VOICE(cdv_15);
- loadFile(cd_15_pal, _tempPal);
- loadFile(cd_15_log, workScreen2);
+ _skyDisk->loadFile(cd_15_pal, _tempPal);
+ _skyDisk->loadFile(cd_15_log, workScreen2);
WAIT_SEQUENCE; //13
WAIT_VOICE; //14
@@ -360,9 +360,9 @@ void SkyState::doCDIntro() {
START_VOICE; //16
START_BG;
- loadFile(cd_17_log, workScreen2);
+ _skyDisk->loadFile(cd_17_log, workScreen2);
free (cd2_seq_data_2);
- cd2_seq_data_2 = loadFile(cd_17, NULL);
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_17, NULL);
LOAD_NEW_VOICE(cdv_17);
WAIT_VOICE; //16
@@ -381,8 +381,8 @@ void SkyState::doCDIntro() {
START_BG;
LOAD_NEW_VOICE(cdv_19);
- loadFile(cd_19_pal, _tempPal);
- loadFile(cd_19_log, workScreen2);
+ _skyDisk->loadFile(cd_19_pal, _tempPal);
+ _skyDisk->loadFile(cd_19_log, workScreen2);
START_BG;
LOAD_NEW_BG(59496); //loud heli to quiet
@@ -397,7 +397,7 @@ void SkyState::doCDIntro() {
START_VOICE; //19
START_BG;
LOAD_NEW_VOICE(cdv_20);
- loadFile(cd_20_log, workScreen2);
+ _skyDisk->loadFile(cd_20_log, workScreen2);
LOAD_NEW_BG(59496); //quiet heli
WAIT_VOICE; //19
@@ -410,7 +410,7 @@ void SkyState::doCDIntro() {
paletteFadeUp(_tempPal);
LOAD_NEW_VOICE(cdv_21);
- loadFile(cd_21_log, workScreen2);
+ _skyDisk->loadFile(cd_21_log, workScreen2);
START_BG;
WAIT_SEQUENCE; //19
@@ -435,8 +435,8 @@ void SkyState::doCDIntro() {
START_VOICE; //23
fnFadeDown(0);
- loadFile(cd_23_pal, _tempPal);
- loadFile(cd_24_log, workScreen2);
+ _skyDisk->loadFile(cd_23_pal, _tempPal);
+ _skyDisk->loadFile(cd_24_log, workScreen2);
LOAD_NEW_VOICE(cdv_24);
WAIT_VOICE; //23
@@ -453,10 +453,10 @@ void SkyState::doCDIntro() {
START_VOICE; //26
free (cd2_seq_data_1);
- cd2_seq_data_1 = loadFile(cd_27, NULL);
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_27, NULL);
LOAD_NEW_VOICE(cdv_27);
- loadFile(cd_27_pal, _tempPal);
- loadFile(cd_27_log, workScreen2);
+ _skyDisk->loadFile(cd_27_pal, _tempPal);
+ _skyDisk->loadFile(cd_27_log, workScreen2);
WAIT_VOICE; //26
fnFadeDown(0);
COPY_SCREEN;
@@ -488,10 +488,10 @@ void SkyState::doCDIntro() {
START_VOICE; //35
free (cd2_seq_data_2);
- cd2_seq_data_2 = loadFile(cd_35, NULL);
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_35, NULL);
LOAD_NEW_VOICE(cdv_36);
- loadFile(cd_35_pal, _tempPal);
- loadFile(cd_35_log, workScreen2);
+ _skyDisk->loadFile(cd_35_pal, _tempPal);
+ _skyDisk->loadFile(cd_35_log, workScreen2);
WAIT_VOICE; //35
START_VOICE; //36
fnFadeDown(0);
@@ -505,7 +505,7 @@ void SkyState::doCDIntro() {
START_VOICE; //37
free (cd2_seq_data_1);
- cd2_seq_data_1 = loadFile(cd_37, NULL);
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_37, NULL);
LOAD_NEW_VOICE(cdv_38);
WAIT_SEQUENCE; //35
@@ -518,8 +518,8 @@ void SkyState::doCDIntro() {
START_VOICE; //39
LOAD_NEW_VOICE(cdv_40);
- loadFile(cd_40_pal, _tempPal);
- loadFile(cd_40_log, workScreen2);
+ _skyDisk->loadFile(cd_40_pal, _tempPal);
+ _skyDisk->loadFile(cd_40_log, workScreen2);
WAIT_VOICE; //39
fnFadeDown(0);
COPY_SCREEN;
@@ -535,8 +535,8 @@ void SkyState::doCDIntro() {
START_VOICE; //42
LOAD_NEW_VOICE(cdv_43);
- loadFile(cd_43_pal, _tempPal);
- loadFile(cd_43_log, workScreen2);
+ _skyDisk->loadFile(cd_43_pal, _tempPal);
+ _skyDisk->loadFile(cd_43_log, workScreen2);
WAIT_VOICE; //42
fnFadeDown(0);
@@ -546,12 +546,12 @@ void SkyState::doCDIntro() {
START_VOICE; //43
free (cd2_seq_data_2);
- cd2_seq_data_2 = loadFile(cd_43, NULL);
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_43, NULL);
WAIT_VOICE; //43
startTimerSequence(cd2_seq_data_2);
LOAD_NEW_VOICE(cdv_45);
- loadFile(cd_45_pal, _tempPal);
- loadFile(cd_45_log, workScreen2);
+ _skyDisk->loadFile(cd_45_pal, _tempPal);
+ _skyDisk->loadFile(cd_45_log, workScreen2);
WAIT_SEQUENCE; //43
START_VOICE; //45
fnFadeDown(0);
@@ -559,15 +559,15 @@ void SkyState::doCDIntro() {
showScreen();
paletteFadeUp(_tempPal);
free (cd2_seq_data_1);
- cd2_seq_data_1 = loadFile(cd_45, NULL);
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_45, NULL);
LOAD_NEW_VOICE(cdv_46);
WAIT_VOICE; //45
startTimerSequence(cd2_seq_data_1);
START_VOICE; //46
LOAD_NEW_VOICE(cdv_47);
- loadFile(cd_47_pal, _tempPal);
- loadFile(cd_47_log, workScreen2);
+ _skyDisk->loadFile(cd_47_pal, _tempPal);
+ _skyDisk->loadFile(cd_47_log, workScreen2);
WAIT_SEQUENCE; //45
WAIT_VOICE; //46
@@ -578,8 +578,8 @@ void SkyState::doCDIntro() {
paletteFadeUp(_tempPal);
START_VOICE; //47
LOAD_NEW_VOICE(cdv_48);
- loadFile(cd_48_pal, _tempPal);
- loadFile(cd_48_log, workScreen2);
+ _skyDisk->loadFile(cd_48_pal, _tempPal);
+ _skyDisk->loadFile(cd_48_log, workScreen2);
WAIT_VOICE; //47
START_VOICE; //48
fnFadeDown(0);
@@ -588,7 +588,7 @@ void SkyState::doCDIntro() {
paletteFadeUp(_tempPal);
free (cd2_seq_data_2);
- cd2_seq_data_2 = loadFile(cd_48, NULL);
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_48, NULL);
LOAD_NEW_VOICE(cdv_49);
WAIT_VOICE; //48
startTimerSequence(cd2_seq_data_2);
@@ -597,7 +597,7 @@ void SkyState::doCDIntro() {
WAIT_VOICE; //49
START_VOICE; //50
free (cd2_seq_data_1);
- cd2_seq_data_1 = loadFile(cd_49, NULL);
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_49, NULL);
LOAD_NEW_VOICE(cdv_51);
WAIT_SEQUENCE; //48
WAIT_VOICE; //50
@@ -611,7 +611,7 @@ void SkyState::doCDIntro() {
START_VOICE; //53
LOAD_NEW_VOICE(cdv_54);
free (cd2_seq_data_2);
- cd2_seq_data_2 = loadFile(cd_50, NULL);
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_50, NULL);
WAIT_VOICE; //53
WAIT_SEQUENCE; //49
@@ -622,8 +622,8 @@ void SkyState::doCDIntro() {
WAIT_VOICE; //54
START_VOICE; //55
- loadFile(cd_55_pal, _tempPal);
- loadFile(cd_55_log, workScreen2);
+ _skyDisk->loadFile(cd_55_pal, _tempPal);
+ _skyDisk->loadFile(cd_55_log, workScreen2);
LOAD_NEW_VOICE(cdv_56);
WAIT_VOICE; //55
START_VOICE; //56
@@ -638,8 +638,8 @@ void SkyState::doCDIntro() {
START_VOICE; //57
LOAD_NEW_VOICE(cdv_58);
- loadFile(cd_58_pal, _tempPal);
- loadFile(cd_58_log, workScreen2);
+ _skyDisk->loadFile(cd_58_pal, _tempPal);
+ _skyDisk->loadFile(cd_58_log, workScreen2);
WAIT_VOICE; //57
fnFadeDown(0);
@@ -651,7 +651,7 @@ void SkyState::doCDIntro() {
WAIT_VOICE; //48
START_VOICE; //59
free (cd2_seq_data_1);
- cd2_seq_data_1 = loadFile(cd_58, NULL);
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_58, NULL);
WAIT_VOICE; //59
LOAD_NEW_VOICE(cdv_60);
START_VOICE; //60
@@ -674,8 +674,8 @@ void SkyState::doCDIntro() {
START_VOICE; //65
fnFadeDown(0);
LOAD_NEW_VOICE(cdv_66);
- loadFile(cd_66_pal, _tempPal);
- loadFile(cd_66_log, _workScreen);
+ _skyDisk->loadFile(cd_66_pal, _tempPal);
+ _skyDisk->loadFile(cd_66_log, _workScreen);
WAIT_VOICE; //65
showScreen();
paletteFadeUp(_tempPal);
@@ -683,8 +683,8 @@ void SkyState::doCDIntro() {
LOAD_NEW_VOICE(cdv_67);
WAIT_VOICE; //66
START_VOICE; //67
- loadFile(cd_67_pal, _tempPal);
- loadFile(cd_67_log, workScreen2);
+ _skyDisk->loadFile(cd_67_pal, _tempPal);
+ _skyDisk->loadFile(cd_67_log, workScreen2);
fnFadeDown(0);
COPY_SCREEN;
showScreen();
@@ -693,10 +693,10 @@ void SkyState::doCDIntro() {
WAIT_VOICE; //67
START_VOICE; //68
free (cd2_seq_data_2);
- cd2_seq_data_2 = loadFile(cd_69, NULL);
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_69, NULL);
LOAD_NEW_VOICE(cdv_69);
- loadFile(cd_69_pal, _tempPal);
- loadFile(cd_69_log, workScreen2);
+ _skyDisk->loadFile(cd_69_pal, _tempPal);
+ _skyDisk->loadFile(cd_69_log, workScreen2);
WAIT_VOICE; //68
START_VOICE; //69
fnFadeDown(0);
@@ -711,16 +711,16 @@ void SkyState::doCDIntro() {
WAIT_VOICE; //70
fnFadeDown(0);
START_VOICE; //71
- loadFile(cd_72_pal, _tempPal);
- loadFile(cd_72_log, _workScreen);
+ _skyDisk->loadFile(cd_72_pal, _tempPal);
+ _skyDisk->loadFile(cd_72_log, _workScreen);
WAIT_VOICE; //71
showScreen();
paletteFadeUp(_tempPal);
LOAD_NEW_VOICE(cdv_72);
START_VOICE; //72
- loadFile(cd_73_pal, _tempPal);
- loadFile(cd_73_log, _workScreen);
+ _skyDisk->loadFile(cd_73_pal, _tempPal);
+ _skyDisk->loadFile(cd_73_log, _workScreen);
LOAD_NEW_VOICE(cdv_73);
WAIT_VOICE; //72
fnFadeDown(0);
@@ -733,9 +733,9 @@ void SkyState::doCDIntro() {
LOAD_NEW_VOICE(cdv_75);
WAIT_VOICE; //74
START_VOICE; //75
- loadFile(cd_76_pal, _tempPal);
+ _skyDisk->loadFile(cd_76_pal, _tempPal);
free (workScreen2);
- workScreen2 = loadFile(cd_76_log, NULL);
+ workScreen2 = _skyDisk->loadFile(cd_76_log, NULL);
fnFadeDown(0);
COPY_SCREEN;
showScreen();
@@ -749,10 +749,10 @@ void SkyState::doCDIntro() {
START_VOICE; //77
free (cd2_seq_data_1);
- cd2_seq_data_1 = loadFile(cd_100, NULL);
- loadFile(cd_78_pal, _tempPal);
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_100, NULL);
+ _skyDisk->loadFile(cd_78_pal, _tempPal);
free (workScreen2);
- workScreen2 = loadFile(cd_78_log, NULL);
+ workScreen2 = _skyDisk->loadFile(cd_78_log, NULL);
LOAD_NEW_VOICE(cdv_78);
WAIT_VOICE; //77
fnFadeDown(0);
@@ -775,9 +775,9 @@ void SkyState::doCDIntro() {
START_VOICE; //82
LOAD_NEW_VOICE(cdv_83);
WAIT_VOICE; //82
- loadFile(cd_101_log, workScreen2);
+ _skyDisk->loadFile(cd_101_log, workScreen2);
free (cd2_seq_data_2);
- cd2_seq_data_2 = loadFile(cd_101, NULL);
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_101, NULL);
WAIT_SEQUENCE; //100
COPY_SCREEN;
showScreen();
@@ -793,20 +793,20 @@ void SkyState::doCDIntro() {
WAIT_VOICE; //85
free (workScreen2);
- workScreen2 = loadFile(cd_102_log, NULL);
+ workScreen2 = _skyDisk->loadFile(cd_102_log, NULL);
free (cd2_seq_data_1);
- cd2_seq_data_1 = loadFile(cd_102, NULL);
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_102, NULL);
WAIT_SEQUENCE; //101
COPY_SCREEN;
showScreen();
startTimerSequence(cd2_seq_data_1);
START_VOICE; //86
LOAD_NEW_VOICE(cdv_87);
- loadFile(cd_103_pal, _tempPal);
+ _skyDisk->loadFile(cd_103_pal, _tempPal);
free (workScreen2);
- workScreen2 = loadFile(cd_103_log, NULL);
+ workScreen2 = _skyDisk->loadFile(cd_103_log, NULL);
free (cd2_seq_data_2);
- cd2_seq_data_2 = loadFile(cd_103, NULL);
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_103, NULL);
WAIT_SEQUENCE; //102
fnFadeDown(0);
COPY_SCREEN;
@@ -815,11 +815,11 @@ void SkyState::doCDIntro() {
startTimerSequence(cd2_seq_data_2);
WAIT_VOICE; //86
START_VOICE; //87
- loadFile(cd_104_pal, _tempPal);
+ _skyDisk->loadFile(cd_104_pal, _tempPal);
free (workScreen2);
- workScreen2 = loadFile(cd_104_log, NULL);
+ workScreen2 = _skyDisk->loadFile(cd_104_log, NULL);
free (cd2_seq_data_1);
- cd2_seq_data_1 = loadFile(cd_104, NULL);
+ cd2_seq_data_1 = _skyDisk->loadFile(cd_104, NULL);
WAIT_SEQUENCE; //103
//fn_start_music(2);
@@ -829,7 +829,7 @@ void SkyState::doCDIntro() {
paletteFadeUp(_tempPal);
startTimerSequence(cd2_seq_data_1);
free (cd2_seq_data_2);
- cd2_seq_data_2 = loadFile(cd_105, NULL);
+ cd2_seq_data_2 = _skyDisk->loadFile(cd_105, NULL);
WAIT_SEQUENCE; //104
startTimerSequence(cd2_seq_data_2);
WAIT_SEQUENCE; //105
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 08:57:34 +0000