summaryrefslogtreecommitdiff
path: root/src/music.cpp
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-07-10 12:08:46 -0500
committerColin Noga <Tempus@chronometry.ca>2012-07-10 12:08:46 -0500
commitab412589662152c99c1653be980136912bcde4f3 (patch)
treefe62baa7e559d84978bfaea19c1683391c3a5982 /src/music.cpp
parent91cc1c2dd9d9c5ec8ca1ac54580f77376d2c0424 (diff)
downloadkamek-ab412589662152c99c1653be980136912bcde4f3.tar.gz
kamek-ab412589662152c99c1653be980136912bcde4f3.zip
Some more small changes to music hack and nullsub
Diffstat (limited to '')
-rw-r--r--src/music.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/music.cpp b/src/music.cpp
index 669a775..6e658f7 100644
--- a/src/music.cpp
+++ b/src/music.cpp
@@ -36,8 +36,8 @@ const char* SongNameList [] = {
"SEWER",
"SPACE",
"BOWSER",
- "",
- "",
+ "BONUS",
+ "AMBUSH",
"",
"",
"",
@@ -60,8 +60,8 @@ const char* SongNameList [] = {
"",
"",
"",
- "",
- "",
+ "MINIGAME",
+ "BONUS_AREA",
"CHALLENGE",
"",
"",
@@ -72,18 +72,18 @@ const char* SongNameList [] = {
"",
"",
"",
- "YOSHI ISLAND MAP",
- "GOLDWOOD MAP",
- "SEWER MAP",
- "FULLMAP FRONT",
- "FULLMAP REAR",
- "MINIMEGA MAP",
- "FF VOLCANO MAP",
- "CRYSTAL CAVE MAP",
- "SPACE MAP",
- "SKY CITY MAP",
- "KOOPA PLANET MAP",
- "KOOPA CORE MAP",
+ "MAP_YOSHIISLAND",
+ "MAP_GOLDWOOD",
+ "MAP_SEWER",
+ "FULLMAP_FRONT",
+ "FULLMAP_REAR",
+ "MAP_MINIMEGA",
+ "MAP_FF_VOLCANO",
+ "MAP_CRYSTAL_CAVE",
+ "MAP_SPACE",
+ "MAP_SKYCITY",
+ "MAP_KOOPA_PLANET",
+ "MAP_KOOPA_CORE",
NULL
};
@@ -147,7 +147,7 @@ extern "C" u8 after_course_getMusicForZone(u8 realThemeID) {
HijackedStream *stream = &hj->stream[hj->currentStream];
OSReport("%d", realThemeID);
- OSReport("%s", SongNameList[realThemeID-99]);
+ OSReport("%s", SongNameList[realThemeID-100]);
sprintf(BrsarInfoOffset(stream->stringOffset), "new/%s.er", SongNameList[realThemeID-100]);
sprintf(BrsarInfoOffset(stream->stringOffsetFast), "new/%s_F.er", SongNameList[realThemeID-100]);