diff options
| author | Stephen Simpson <megazig@gmail.com> | 2011-10-15 19:45:54 -0500 |
|---|---|---|
| committer | Stephen Simpson <megazig@gmail.com> | 2011-10-15 19:45:54 -0500 |
| commit | 85e0eb418a06e751653a4977464ff5ed92561768 (patch) | |
| tree | 15a76fba669bdcd93be0fca3e4ae8d37707d3355 /src/soundPlayer.S | |
| parent | 41e9d139fb839ad35ad61c57dfc239d648265980 (diff) | |
| parent | d287567cb54f4ba68633e3580e5e39a38a533604 (diff) | |
| download | kamek-85e0eb418a06e751653a4977464ff5ed92561768.tar.gz kamek-85e0eb418a06e751653a4977464ff5ed92561768.zip | |
Merge branch 'level-select' of ssh://treeki.shacknet.nu:30000/Kamek into level-select
Diffstat (limited to 'src/soundPlayer.S')
| -rw-r--r-- | src/soundPlayer.S | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/soundPlayer.S b/src/soundPlayer.S index 04f29f8..645af31 100644 --- a/src/soundPlayer.S +++ b/src/soundPlayer.S @@ -20,8 +20,9 @@ .extern YetAnotherSoundPlayer .extern CheckIfPlayingSound .extern StopSoundBasic -.extern BufferToCheckIfPlaying +.extern StopSoundRelated .extern SoundClassRelated +.extern BufferToCheckIfPlaying .align 4 @@ -85,7 +86,15 @@ GoAwaySoundGuy: .global StopSound StopSound: + stwu r1, -0x10(r1) + mtlr r0 + stw r0, 0x14(r1) + mr r4, r3 lwz r3, -0x5218(r13) - b StopSoundBasic + bl StopSoundBasic + lwz r0, 0x14(r1) + mflr r0 + + blr |