diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2013-06-01 23:00:54 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2013-06-01 23:00:54 -0500 |
| commit | b88f46245671234de40dbab625d28a965d0470d7 (patch) | |
| tree | cc70a72f33acd60cb48430a0ca1f5791a7dadf99 /src | |
| parent | bf744bbb77f1d7a6a2346cbee9dd135d77a26bbb (diff) | |
| download | kamek-b88f46245671234de40dbab625d28a965d0470d7.tar.gz kamek-b88f46245671234de40dbab625d28a965d0470d7.zip | |
updated version of release, fixed critical samurshai bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/bossSamurshai.cpp | 3 | ||||
| -rw-r--r-- | src/prolog.S | 2 | ||||
| -rw-r--r-- | src/randomcrap.S | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/bossSamurshai.cpp b/src/bossSamurshai.cpp index ba871cd..5edb17d 100644 --- a/src/bossSamurshai.cpp +++ b/src/bossSamurshai.cpp @@ -110,7 +110,8 @@ daSamurshai *daSamurshai::build() { //////////////////////// void ChucksAndKnucks(ActivePhysics *apThis, ActivePhysics *apOther) { - ((dEn_c*)apThis->owner)->_vf220(apOther->owner); + if (((dEn_c*)apOther->owner)->name == PLAYER) + ((dEn_c*)apThis->owner)->_vf220(apOther->owner); } void daSamurshai::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) { diff --git a/src/prolog.S b/src/prolog.S index ffeaf92..83abdc6 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 08 - v1012\n.ctors: %p - %p\n" + .string "Newer Super Mario Bros. Wii - Hacks by Treeki and Tempus 2009-2013\nNewer v1.0.0\n.ctors: %p - %p\n" PMsg2: .string "%d inits called\n" diff --git a/src/randomcrap.S b/src/randomcrap.S index 18dffa5..3e5909e 100644 --- a/src/randomcrap.S +++ b/src/randomcrap.S @@ -581,7 +581,7 @@ ReplaceExceptionOccurred: #.long CRAPPYALLOC .data NewExceptionOccurred: -.string "Whoops! Newer has crashed. Please take a screenshot\nof the info below and send it to butts@butts.com.\nYou can scroll through this report using the D-Pad.\n" +.string "Whoops! Newer 1.0.0 has crashed.\nPlease take a screenshot of the info below\nand send it to newer@newerteam.com.\nYou can scroll through this report using the D-Pad.\n" UniLogStr: .string "[ULog] returning %8x to: %x > %x > %x > %x > %x > %x\n" #WillAlloc: .string "[AH] Will allocate %x bytes aligned by %x\n" #Alloced: .string "[AH] Allocated %p\n" |