From ab412589662152c99c1653be980136912bcde4f3 Mon Sep 17 00:00:00 2001
From: Colin Noga <Tempus@chronometry.ca>
Date: Tue, 10 Jul 2012 12:08:46 -0500
Subject: Some more small changes to music hack and nullsub

---
 src/bossCaptainBowser.cpp |  2 +-
 src/music.cpp             | 34 +++++++++++++++++-----------------
 src/nullsub.S             |  4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/bossCaptainBowser.cpp b/src/bossCaptainBowser.cpp
index bd6a53f..af02c3c 100644
--- a/src/bossCaptainBowser.cpp
+++ b/src/bossCaptainBowser.cpp
@@ -211,7 +211,7 @@ int daCaptainBowser::onCreate() {
 	this->playerCount = GetActivePlayerCount();
 	this->maxDamage = (10 * this->playerCount) + 10;
 
-	pos.z = 3300.0;
+	pos.z = 8000.0;
 	this->scale = (Vec){0.57, 0.57, 0.57};
 	this->homingBillCountdown = 270;
 	this->homingBillSlot = 0;	
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]);
 
diff --git a/src/nullsub.S b/src/nullsub.S
index afdeed9..d46e8a4 100644
--- a/src/nullsub.S
+++ b/src/nullsub.S
@@ -1,7 +1,7 @@
 .text
 
-.global Return
-Return:
+.global ReturnNone
+ReturnNone:
 	blr
 
 .global ReturnTrue
-- 
cgit v1.2.3