diff options
| author | Stephen Simpson <megazig@gmail.com> | 2011-10-11 00:00:45 -0500 |
|---|---|---|
| committer | Stephen Simpson <megazig@gmail.com> | 2011-10-11 00:00:45 -0500 |
| commit | 10cf77e8d624b18d8e9be7f6fd4c6b207da3f432 (patch) | |
| tree | 923306cf050927bb4499cdaea23bcdd9b47e219b | |
| parent | a3b964eca0b1acbb52396c7ed1d5ed4abdd0a39d (diff) | |
| download | kamek-10cf77e8d624b18d8e9be7f6fd4c6b207da3f432.tar.gz kamek-10cf77e8d624b18d8e9be7f6fd4c6b207da3f432.zip | |
Fixed StopSound and renamed to StopSoundBasic for linker
Diffstat (limited to '')
| -rw-r--r-- | kamek_pal.x | 2 | ||||
| -rw-r--r-- | src/soundPlayer.S | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kamek_pal.x b/kamek_pal.x index 8e8b34c..7ef8799 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -43,7 +43,7 @@ SECTIONS { AnotherSoundRelatedFunction = 0x80198040; YetAnotherSoundPlayer = 0x80199100; CheckIfPlayingSound = 0x80196740; - StopSound = 0x801955E0; + StopSoundBasic = 0x801955E0; RelatedToPlayingSoundsAlongsideAnims = 0x80105350; diff --git a/src/soundPlayer.S b/src/soundPlayer.S index 5304330..0eb165a 100644 --- a/src/soundPlayer.S +++ b/src/soundPlayer.S @@ -27,7 +27,6 @@ # PlaySound(dActor_c *, int soundID) -# There's somehardcoding in here, might need to fix that for NTSC versions. .global PlaySound @@ -79,9 +78,12 @@ GoAwaySoundGuy: blr +# StopSound(int soundID) + .global StopSound StopSound: + mr r4, r3 lwz r3, 0xA768(r13) - b StopSound + b StopSoundBasic |