diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/m4a_1.s | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/asm/m4a_1.s b/asm/m4a_1.s index 3f079d0ec..2b548cacc 100644 --- a/asm/m4a_1.s +++ b/asm/m4a_1.s @@ -1549,24 +1549,24 @@ ply_note: ldr r1, =gClockTable adds r0, r1 ldrb r0, [r0] - strb r0, [r5, 0x4] + strb r0, [r5, o_MusicPlayerTrack_gateTime] ldr r3, [r5, o_MusicPlayerTrack_cmdPtr] ldrb r0, [r3] cmp r0, 0x80 - bcs _081DDB46 + bhs _081DDB46 strb r0, [r5, o_MusicPlayerTrack_key] adds r3, 0x1 ldrb r0, [r3] cmp r0, 0x80 - bcs _081DDB44 - strb r0, [r5, 0x6] + bhs _081DDB44 + strb r0, [r5, o_MusicPlayerTrack_velocity] adds r3, 0x1 ldrb r0, [r3] cmp r0, 0x80 - bcs _081DDB44 - ldrb r1, [r5, 0x4] + bhs _081DDB44 + ldrb r1, [r5, o_MusicPlayerTrack_gateTime] adds r1, r0 - strb r1, [r5, 0x4] + strb r1, [r5, o_MusicPlayerTrack_gateTime] adds r3, 0x1 _081DDB44: str r3, [r5, o_MusicPlayerTrack_cmdPtr] @@ -1574,16 +1574,16 @@ _081DDB46: movs r0, 0 str r0, [sp, 0x14] adds r4, r5, 0 - adds r4, 0x24 + adds r4, o_MusicPlayerTrack_ToneData_type ldrb r2, [r4] - movs r0, 0xC0 + movs r0, TONEDATA_TYPE_RHY | TONEDATA_TYPE_SPL tst r0, r2 beq _081DDB98 - ldrb r3, [r5, 0x5] - movs r0, 0x40 + ldrb r3, [r5, o_MusicPlayerTrack_key] + movs r0, TONEDATA_TYPE_SPL tst r0, r2 beq _081DDB66 - ldr r1, [r5, 0x2C] + ldr r1, [r5, o_MusicPlayerTrack_ToneData_keySplitTable] adds r1, r3 ldrb r0, [r1] b _081DDB68 @@ -1593,7 +1593,7 @@ _081DDB68: lsls r1, r0, 1 adds r1, r0 lsls r1, 2 - ldr r0, [r5, 0x28] + ldr r0, [r5, o_MusicPlayerTrack_ToneData_wav] adds r1, r0 mov r9, r1 mov r6, r9 |