diff options
author | Stephen Simpson <megazig@gmail.com> | 2011-10-10 23:38:41 -0500 |
---|---|---|
committer | Stephen Simpson <megazig@gmail.com> | 2011-10-10 23:38:41 -0500 |
commit | a3b964eca0b1acbb52396c7ed1d5ed4abdd0a39d (patch) | |
tree | 5757f05177ea939d534bb63397a7ee2b34e30cb5 | |
parent | b0a9caf3826730be56c57d76abc1a689e104357b (diff) | |
download | kamek-a3b964eca0b1acbb52396c7ed1d5ed4abdd0a39d.tar.gz kamek-a3b964eca0b1acbb52396c7ed1d5ed4abdd0a39d.zip |
fixed offset for Sound Class in soundPlayer.S
-rw-r--r-- | kamek_pal.x | 2 | ||||
-rw-r--r-- | src/soundPlayer.S | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/kamek_pal.x b/kamek_pal.x index 2c46371..8e8b34c 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -1087,6 +1087,8 @@ SECTIONS { SomeWipeClass = 0x8042A720; QueryGlobal5758 = 0x800B3B50; + BufferToCheckIfPlaying = 0x8042a768; + GetHermiteCurveValue = 0x8017d660; GetHermiteCurveValue__FfP10HermiteKeyUi = 0x8017d660; diff --git a/src/soundPlayer.S b/src/soundPlayer.S index 0fa028a..5304330 100644 --- a/src/soundPlayer.S +++ b/src/soundPlayer.S @@ -20,6 +20,7 @@ .extern YetAnotherSoundPlayer .extern CheckIfPlayingSound .extern StopSound +.extern BufferToCheckIfPlaying .align 4 @@ -49,8 +50,9 @@ PlaySound: bl ConvertStagePositionIntoScreenPosition__Maybe # Checks if the passed sound is already playing - lis r4, 0x8043 - lwz r3, 0xA768(r4) + lis r4, BufferToCheckIfPlaying@h + ori r4, r4, BufferToCheckIfPlaying@l + lwz r3, 0(r4) mr r4, r20 bl CheckIfPlayingSound @@ -82,4 +84,4 @@ StopSound: lwz r3, 0xA768(r13) b StopSound -
\ No newline at end of file + |