Skip to content

Commit

Permalink
Adding S1 drowning and Chaos Emerald tracks.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MainMemory
MainMemory committed Jan 13, 2015
1 parent 5fe5715 commit 2ffd6b5
Show file tree
Hide file tree
Showing 8 changed files with 83 additions and 47 deletions.
Binary file added SMPSOUT/Data/Sonic 1/12 Drowning.smp
View file
Binary file not shown.
Binary file added SMPSOUT/Data/Sonic 1/13 Chaos Emerald.smp
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions SMPSOUT/Data/opts.ini
View file
Expand Up @@ -308,6 +308,8 @@ S1=S11Up
Name=Chaos Emerald
EnableByZone=True
EnableByCharacter=True
S3K=ChaosEmerald
S1=S1ChaosEmerald
[InvincibilityTrack]
Name=Invincibility
EnableByZone=True
Expand Down Expand Up @@ -352,6 +354,8 @@ S2Beta=S2FinalBossBeta
Name=Drowning
EnableByZone=True
EnableByCharacter=True
S3K=Drowning
S1=S1Drowning
[AllClearTrack]
Name=All Clear
EnableByCharacter=True
Expand Down
8 changes: 8 additions & 0 deletions SMPSOUT/Data/songs.ini
View file
Expand Up @@ -407,6 +407,14 @@ File=.\\Data\\Sonic 1\\10 Continue Screen.smp
Type=S1
Offset=0000
File=.\\Data\\Sonic 1\\11 Credits.smp
[S1Drowning]
Type=S1
Offset=0000
File=.\\Data\\Sonic 1\\12 Drowning.smp
[S1ChaosEmerald]
Type=S1
Offset=0000
File=.\\Data\\Sonic 1\\13 Chaos Emerald.smp
[CasinoNight2P]
Type=S2
Offset=1380
Expand Down
98 changes: 53 additions & 45 deletions SMPSOUT/SMPSOUT.gen.rc
View file
Expand Up @@ -412,182 +412,190 @@ IDR_MUSIC_102 MUSIC ".\\Data\\Sonic 1\\11 Credits.smp"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_103 MUSIC ".\\Data\\Sonic 2\\2-00 Casino Night Zone (2P).sm2"
IDR_MUSIC_103 MUSIC ".\\Data\\Sonic 1\\12 Drowning.smp"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_104 MUSIC ".\\Data\\Sonic 2\\2-01 Emerald Hill Zone.sm2"
IDR_MUSIC_104 MUSIC ".\\Data\\Sonic 1\\13 Chaos Emerald.smp"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_105 MUSIC ".\\Data\\Sonic 2\\2-02 Metropolis Zone.sm2"
IDR_MUSIC_105 MUSIC ".\\Data\\Sonic 2\\2-00 Casino Night Zone (2P).sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_106 MUSIC ".\\Data\\Sonic 2\\2-03 Casino Night Zone.sm2"
IDR_MUSIC_106 MUSIC ".\\Data\\Sonic 2\\2-01 Emerald Hill Zone.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_107 MUSIC ".\\Data\\Sonic 2\\2-04 Mystic Cave Zone.1380.sm2"
IDR_MUSIC_107 MUSIC ".\\Data\\Sonic 2\\2-02 Metropolis Zone.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_108 MUSIC ".\\Data\\Sonic 2\\2-05 Mystic Cave Zone (2P).1380.sm2"
IDR_MUSIC_108 MUSIC ".\\Data\\Sonic 2\\2-03 Casino Night Zone.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_109 MUSIC ".\\Data\\Sonic 2\\2-06 Aquatic Ruin Zone.1380.sm2"
IDR_MUSIC_109 MUSIC ".\\Data\\Sonic 2\\2-04 Mystic Cave Zone.1380.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_110 MUSIC ".\\Data\\Sonic 2\\2-07 Death Egg Zone.sm2"
IDR_MUSIC_110 MUSIC ".\\Data\\Sonic 2\\2-05 Mystic Cave Zone (2P).1380.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_111 MUSIC ".\\Data\\Sonic 2\\2-08 Special Stage.sm2"
IDR_MUSIC_111 MUSIC ".\\Data\\Sonic 2\\2-06 Aquatic Ruin Zone.1380.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_112 MUSIC ".\\Data\\Sonic 2\\2-09 Option Screen.sm2"
IDR_MUSIC_112 MUSIC ".\\Data\\Sonic 2\\2-07 Death Egg Zone.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_113 MUSIC ".\\Data\\Sonic 2\\2-0A Sweet Sweet Sweet (Ending).sm2"
IDR_MUSIC_113 MUSIC ".\\Data\\Sonic 2\\2-08 Special Stage.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_114 MUSIC ".\\Data\\Sonic 2\\2-0B Final Boss.sm2"
IDR_MUSIC_114 MUSIC ".\\Data\\Sonic 2\\2-09 Option Screen.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_115 MUSIC ".\\Data\\Sonic 2\\2-0C Chemical Plant Zone.sm2"
IDR_MUSIC_115 MUSIC ".\\Data\\Sonic 2\\2-0A Sweet Sweet Sweet (Ending).sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_116 MUSIC ".\\Data\\Sonic 2\\2-0D Boss.sm2"
IDR_MUSIC_116 MUSIC ".\\Data\\Sonic 2\\2-0B Final Boss.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_117 MUSIC ".\\Data\\Sonic 2\\2-0E Sky Chase Zone.sm2"
IDR_MUSIC_117 MUSIC ".\\Data\\Sonic 2\\2-0C Chemical Plant Zone.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_118 MUSIC ".\\Data\\Sonic 2\\2-0F Oil Ocean Zone.sm2"
IDR_MUSIC_118 MUSIC ".\\Data\\Sonic 2\\2-0D Boss.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_119 MUSIC ".\\Data\\Sonic 2\\2-10 Wing Fortress Zone.sm2"
IDR_MUSIC_119 MUSIC ".\\Data\\Sonic 2\\2-0E Sky Chase Zone.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_120 MUSIC ".\\Data\\Sonic 2\\2-11 Emerald Hill Zone (2P).sm2"
IDR_MUSIC_120 MUSIC ".\\Data\\Sonic 2\\2-0F Oil Ocean Zone.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_121 MUSIC ".\\Data\\Sonic 2\\2-12 2P Results Screen.sm2"
IDR_MUSIC_121 MUSIC ".\\Data\\Sonic 2\\2-10 Wing Fortress Zone.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_122 MUSIC ".\\Data\\Sonic 2\\2-13 Super Sonic.sm2"
IDR_MUSIC_122 MUSIC ".\\Data\\Sonic 2\\2-11 Emerald Hill Zone (2P).sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_123 MUSIC ".\\Data\\Sonic 2\\2-14 Hill Top Zone.sm2"
IDR_MUSIC_123 MUSIC ".\\Data\\Sonic 2\\2-12 2P Results Screen.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_124 MUSIC ".\\Data\\Sonic 2\\2-16 Title Screen.sm2"
IDR_MUSIC_124 MUSIC ".\\Data\\Sonic 2\\2-13 Super Sonic.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_125 MUSIC ".\\Data\\Sonic 2\\2-19 Invincibility.sm2"
IDR_MUSIC_125 MUSIC ".\\Data\\Sonic 2\\2-14 Hill Top Zone.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_126 MUSIC ".\\Data\\Sonic 2\\2-1B Hidden Palace Zone.sm2"
IDR_MUSIC_126 MUSIC ".\\Data\\Sonic 2\\2-16 Title Screen.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_127 MUSIC ".\\Data\\Sonic 2\\2-1D Credits.sm2"
IDR_MUSIC_127 MUSIC ".\\Data\\Sonic 2\\2-19 Invincibility.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_128 MUSIC ".\\Data\\Sonic 2 Beta\\2-00 Casino Night Zone (2P).s2b"
IDR_MUSIC_128 MUSIC ".\\Data\\Sonic 2\\2-1B Hidden Palace Zone.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_129 MUSIC ".\\Data\\Sonic 2 Beta\\2-01 Emerald Hill Zone.s2b"
IDR_MUSIC_129 MUSIC ".\\Data\\Sonic 2\\2-1D Credits.sm2"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_130 MUSIC ".\\Data\\Sonic 2 Beta\\2-02 Metropolis Zone.s2b"
IDR_MUSIC_130 MUSIC ".\\Data\\Sonic 2 Beta\\2-00 Casino Night Zone (2P).s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_131 MUSIC ".\\Data\\Sonic 2 Beta\\2-03 Casino Night Zone.s2b"
IDR_MUSIC_131 MUSIC ".\\Data\\Sonic 2 Beta\\2-01 Emerald Hill Zone.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_132 MUSIC ".\\Data\\Sonic 2 Beta\\2-04 Mystic Cave Zone.9DEE.s2b"
IDR_MUSIC_132 MUSIC ".\\Data\\Sonic 2 Beta\\2-02 Metropolis Zone.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_133 MUSIC ".\\Data\\Sonic 2 Beta\\2-05 Mystic Cave Zone (2P).A49E.s2b"
IDR_MUSIC_133 MUSIC ".\\Data\\Sonic 2 Beta\\2-03 Casino Night Zone.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_134 MUSIC ".\\Data\\Sonic 2 Beta\\2-06 Aquatic Ruin Zone.s2b"
IDR_MUSIC_134 MUSIC ".\\Data\\Sonic 2 Beta\\2-04 Mystic Cave Zone.9DEE.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_135 MUSIC ".\\Data\\Sonic 2 Beta\\2-07 Death Egg Zone.s2b"
IDR_MUSIC_135 MUSIC ".\\Data\\Sonic 2 Beta\\2-05 Mystic Cave Zone (2P).A49E.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_136 MUSIC ".\\Data\\Sonic 2 Beta\\2-08 Special Stage.s2b"
IDR_MUSIC_136 MUSIC ".\\Data\\Sonic 2 Beta\\2-06 Aquatic Ruin Zone.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_137 MUSIC ".\\Data\\Sonic 2 Beta\\2-09 Option Screen.s2b"
IDR_MUSIC_137 MUSIC ".\\Data\\Sonic 2 Beta\\2-07 Death Egg Zone.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_138 MUSIC ".\\Data\\Sonic 2 Beta\\2-0B Final Boss.s2b"
IDR_MUSIC_138 MUSIC ".\\Data\\Sonic 2 Beta\\2-08 Special Stage.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_139 MUSIC ".\\Data\\Sonic 2 Beta\\2-0C Chemical Plant Zone.s2b"
IDR_MUSIC_139 MUSIC ".\\Data\\Sonic 2 Beta\\2-09 Option Screen.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_140 MUSIC ".\\Data\\Sonic 2 Beta\\2-0D Boss.s2b"
IDR_MUSIC_140 MUSIC ".\\Data\\Sonic 2 Beta\\2-0B Final Boss.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_141 MUSIC ".\\Data\\Sonic 2 Beta\\2-0E Sky Chase Zone.s2b"
IDR_MUSIC_141 MUSIC ".\\Data\\Sonic 2 Beta\\2-0C Chemical Plant Zone.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_142 MUSIC ".\\Data\\Sonic 2 Beta\\2-0F Oil Ocean Zone.s2b"
IDR_MUSIC_142 MUSIC ".\\Data\\Sonic 2 Beta\\2-0D Boss.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_143 MUSIC ".\\Data\\Sonic 2 Beta\\2-10 Wing Fortress Zone.s2b"
IDR_MUSIC_143 MUSIC ".\\Data\\Sonic 2 Beta\\2-0E Sky Chase Zone.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_144 MUSIC ".\\Data\\Sonic 2 Beta\\2-11 Emerald Hill Zone (2P).s2b"
IDR_MUSIC_144 MUSIC ".\\Data\\Sonic 2 Beta\\2-0F Oil Ocean Zone.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_145 MUSIC ".\\Data\\Sonic 2 Beta\\2-12 2P Results Screen.s2b"
IDR_MUSIC_145 MUSIC ".\\Data\\Sonic 2 Beta\\2-10 Wing Fortress Zone.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_146 MUSIC ".\\Data\\Sonic 2 Beta\\2-13 Super Sonic.s2b"
IDR_MUSIC_146 MUSIC ".\\Data\\Sonic 2 Beta\\2-11 Emerald Hill Zone (2P).s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_147 MUSIC ".\\Data\\Sonic 2 Beta\\2-14 Hill Top Zone.s2b"
IDR_MUSIC_147 MUSIC ".\\Data\\Sonic 2 Beta\\2-12 2P Results Screen.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_148 MUSIC ".\\Data\\Sonic 2 Beta\\2-13 Super Sonic.s2b"


LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDR_MUSIC_149 MUSIC ".\\Data\\Sonic 2 Beta\\2-14 Hill Top Zone.s2b"


2 changes: 2 additions & 0 deletions SMPSOUT/musicid.gen.h
View file
Expand Up @@ -103,6 +103,8 @@ enum MusicID {
MusicID_S1GameOver,
MusicID_S1Continue,
MusicID_S1Credits,
MusicID_S1Drowning,
MusicID_S1ChaosEmerald,
MusicID_CasinoNight2P,
MusicID_EmeraldHill,
MusicID_Metropolis,
Expand Down
2 changes: 2 additions & 0 deletions SMPSOUT/resource.gen.h
View file
Expand Up @@ -147,3 +147,5 @@
#define IDR_MUSIC_145 444
#define IDR_MUSIC_146 445
#define IDR_MUSIC_147 446
#define IDR_MUSIC_148 447
#define IDR_MUSIC_149 448
16 changes: 14 additions & 2 deletions SMPSOUT/songinfo.gen.cpp
View file
Expand Up @@ -106,6 +106,8 @@ const musicentry MusicFiles[] = {
{ 0x0000, TrackMode_S1 },
{ 0x0000, TrackMode_S1 },
{ 0x0000, TrackMode_S1 },
{ 0x0000, TrackMode_S1 },
{ 0x0000, TrackMode_S1 },
{ 0x1380, TrackMode_S2 },
{ 0x1380, TrackMode_S2 },
{ 0x1380, TrackMode_S2 },
Expand Down Expand Up @@ -448,6 +450,11 @@ const trackoption OneUpTrackOptions[] = {
{ "S1", MusicID_S11Up },
};

const trackoption ChaosEmeraldTrackOptions[] = {
{ "S3K", MusicID_ChaosEmerald },
{ "S1", MusicID_S1ChaosEmerald },
};

const trackoption InvincibilityTrackOptions[] = {
{ "S3", MusicID_S3Invincibility },
{ "S&K", MusicID_SKInvincibility },
Expand Down Expand Up @@ -486,6 +493,11 @@ const trackoption FinalBossTrackOptions[] = {
{ "S2Beta", MusicID_S2FinalBossBeta },
};

const trackoption DrowningTrackOptions[] = {
{ "S3K", MusicID_Drowning },
{ "S1", MusicID_S1Drowning },
};

const trackoption AllClearTrackOptions[] = {
{ "S3", MusicID_S3AllClear },
{ "S&K", MusicID_SKAllClear },
Expand Down Expand Up @@ -611,13 +623,13 @@ const tracknameoptions TrackOptions[] = {
trackoptdef(ContinueTrack),
trackoptdef(ActClearTrack),
trackoptdef(OneUpTrack),
{ "ChaosEmeraldTrack" },
trackoptdef(ChaosEmeraldTrack),
trackoptdef(InvincibilityTrack),
trackoptdef(CompetitionMenuTrack),
{ "UnusedTrack" },
trackoptdef(LevelSelectTrack),
trackoptdef(FinalBossTrack),
{ "DrowningTrack" },
trackoptdef(DrowningTrack),
trackoptdef(AllClearTrack),
trackoptdef(CreditsTrack),
trackoptdef(KnucklesTrack),
Expand Down

0 comments on commit 2ffd6b5

Please sign in to comment.