summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2013-05-11 12:37:59 -0500
committerColin Noga <Tempus@chronometry.ca>2013-05-11 12:37:59 -0500
commitb223c0f472becf62c1c31e19af7561059b03e867 (patch)
tree48798df4a10fb05eaf9ad2fc9c182ce0adbe4f86
parentbaaad3ec09e17d745c1081755b824ead065b8ce5 (diff)
downloadkamek-b223c0f472becf62c1c31e19af7561059b03e867.tar.gz
kamek-b223c0f472becf62c1c31e19af7561059b03e867.zip
Minor fixes
-rwxr-xr-xmakeNewerBeta2
-rwxr-xr-xmakeNewerBetaLite2
-rw-r--r--src/koopatlas/core.cpp2
-rw-r--r--src/prolog.S2
-rw-r--r--src/shyguy.cpp2
5 files changed, 6 insertions, 4 deletions
diff --git a/makeNewerBeta b/makeNewerBeta
index 013cbf5..0a6a1dc 100755
--- a/makeNewerBeta
+++ b/makeNewerBeta
@@ -24,7 +24,7 @@ zip -d TestPackAssetsRC$1.zip *.DS_Store __MACOSX*
popd
-for i in {1..11}
+for i in {1..12}
do
remove_files EU_1
diff --git a/makeNewerBetaLite b/makeNewerBetaLite
index 8ccdbc7..6082a4f 100755
--- a/makeNewerBetaLite
+++ b/makeNewerBetaLite
@@ -19,7 +19,7 @@ rm -r ~/Dropbox/Public/NewerBeta/TestPackBuildRC*
cp -R ~/Dropbox/NEWERsmbw/Test\ Pack/NewerSMBW/NewerRes ~/Dropbox/Public/NewerBeta/NewerRes
-for i in {1..11}
+for i in {1..12}
do
remove_files EU_1
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp
index 444c2a0..6618650 100644
--- a/src/koopatlas/core.cpp
+++ b/src/koopatlas/core.cpp
@@ -1083,7 +1083,7 @@ void dScKoopatlas_c::showSaveWindow() {
static const wchar_t *completionMsgs[] = {
L"The most erudite of Buttocks",
- L"You've collected all of\nthe \x0B\x014F\xBEEF Star Coins in",
+ L"You've collected all of\nthe \x0B\x014F\xBEEF Star Coins in\n",
L"You have gotten every \x0B\x013B\xBEEF exit\nin",
L"You have gotten everything\nin",
L"You have collected all the\nnecessary \x0B\x014F\xBEEF coins to enter\nthe Special World!",
diff --git a/src/prolog.S b/src/prolog.S
index 09aaa78..7d7e40b 100644
--- a/src/prolog.S
+++ b/src/prolog.S
@@ -61,7 +61,7 @@ startLoop:
.data
PMsg:
- .string "Newer Super Mario Bros. Wii - Hacks by Treeki and Tempus 2009-2013\nNewer Release Candidate 04 - v1011\n.ctors: %p - %p\n"
+ .string "Newer Super Mario Bros. Wii - Hacks by Treeki and Tempus 2009-2013\nNewer Release Candidate 05 - v1012\n.ctors: %p - %p\n"
PMsg2:
.string "%d inits called\n"
diff --git a/src/shyguy.cpp b/src/shyguy.cpp
index cd412b9..c13b13e 100644
--- a/src/shyguy.cpp
+++ b/src/shyguy.cpp
@@ -1014,6 +1014,7 @@ void daShyGuy::updateModelMatrices() {
this->timer = 0;
}
void daShyGuy::executeState_Judo() {
+ calculateTileCollisions();
// chargin 476? 673? 760? 768? 808? 966?
if (this->timer == 0) { bindAnimChr_and_setUpdateRate("c18_OB_IDLE_R", 1, 0.0, 1.0); }
@@ -1094,6 +1095,7 @@ void daShyGuy::updateModelMatrices() {
spikeTurn = 0;
}
void daShyGuy::executeState_Spike() {
+ calculateTileCollisions();
if (this->timer == 0) { bindAnimChr_and_setUpdateRate("c18_OB_IDLE_R", 1, 0.0, 1.0); }