diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-02 16:03:53 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-02 16:03:53 +0200 |
| commit | 2089dd0f86559d8cbbfba1e3effec22ad538662f (patch) | |
| tree | 48e6a1da748f538b9f5a28a18620127c9a121eec /asm/berry_blender.s | |
| parent | 84240b1a5a445ff4efe21580c22051323a954fba (diff) | |
start labelling, decompiling sound.s
Diffstat (limited to 'asm/berry_blender.s')
| -rw-r--r-- | asm/berry_blender.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/berry_blender.s b/asm/berry_blender.s index 09e9aa951..83a0b477a 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -1550,13 +1550,13 @@ _08080508: str r2, [r0] ldr r0, =sub_8081898 bl SetMainCallback2 - bl current_map_music_get + bl GetCurrentMapMusic lsls r0, 16 lsrs r0, 16 ldr r4, =0x00000193 cmp r0, r4 beq _08080540 - bl current_map_music_get + bl GetCurrentMapMusic ldr r1, [r5] movs r2, 0xAA lsls r2, 1 @@ -1564,7 +1564,7 @@ _08080508: strh r0, [r1] _08080540: adds r0, r4, 0 - bl song_play_for_text + bl PlayBGM _08080546: ldr r0, =gUnknown_020322A4 ldr r1, [r0] @@ -2523,13 +2523,13 @@ _08080D5A: cmp r4, r0 blt _08080D5A _08080D80: - bl current_map_music_get + bl GetCurrentMapMusic lsls r0, 16 lsrs r0, 16 ldr r4, =0x00000193 cmp r0, r4 beq _08080D9E - bl current_map_music_get + bl GetCurrentMapMusic ldr r1, =gUnknown_020322A4 ldr r1, [r1] movs r5, 0xAA @@ -2538,7 +2538,7 @@ _08080D80: strh r0, [r1] _08080D9E: adds r0, r4, 0 - bl song_play_for_text + bl PlayBGM movs r0, 0x35 bl audio_play bl sub_807F738 @@ -8460,12 +8460,12 @@ sub_8083F3C: @ 8083F3C cmp r0, 0 bne _08083F62 ldr r0, =0x0000016f - bl fanfare_play + bl PlayFanfare ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] _08083F62: - bl task_is_not_running_overworld_fanfare + bl IsFanfareTaskInactive lsls r0, 24 cmp r0, 0 beq _08083F82 @@ -8475,7 +8475,7 @@ _08083F62: lsls r1, 1 adds r0, r1 ldrh r0, [r0] - bl song_play_for_text + bl PlayBGM adds r0, r5, 0 bl DestroyTask _08083F82: |