diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-07-10 12:08:46 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-07-10 12:08:46 -0500 |
| commit | ab412589662152c99c1653be980136912bcde4f3 (patch) | |
| tree | fe62baa7e559d84978bfaea19c1683391c3a5982 /src | |
| parent | 91cc1c2dd9d9c5ec8ca1ac54580f77376d2c0424 (diff) | |
| download | kamek-ab412589662152c99c1653be980136912bcde4f3.tar.gz kamek-ab412589662152c99c1653be980136912bcde4f3.zip | |
Some more small changes to music hack and nullsub
Diffstat (limited to 'src')
| -rw-r--r-- | src/bossCaptainBowser.cpp | 2 | ||||
| -rw-r--r-- | src/music.cpp | 34 | ||||
| -rw-r--r-- | src/nullsub.S | 4 |
3 files changed, 20 insertions, 20 deletions
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 |