diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-06 13:59:20 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-06 13:59:20 -0500 |
| commit | ccb5c0f324e2b9002a687c9111b2675bc6bd101d (patch) | |
| tree | 84d587d63154d9a8da3e9983aae2042f09767737 /asm/field_effect.s | |
| parent | 498ad1e6af6b219aa54b827e59325b6fbcb54343 (diff) | |
| parent | 26f7ba482384ad4f63063797a527b7fb33572aa1 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into region_map
Diffstat (limited to 'asm/field_effect.s')
| -rw-r--r-- | asm/field_effect.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/field_effect.s b/asm/field_effect.s index bc2a2fceb..2f1aa5e61 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -2854,7 +2854,7 @@ sub_80849A0: @ 80849A0 ands r0, r1 cmp r0, 0 bne _080849DC - bl sub_8055FC4 + bl BGMusicStopped lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3878,7 +3878,7 @@ sub_8085168: @ 8085168 ands r0, r1 cmp r0, 0 bne _080851A0 - bl sub_8055FC4 + bl BGMusicStopped lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4383,7 +4383,7 @@ sub_808554C: @ 808554C ands r0, r1 cmp r0, 0 bne _08085584 - bl sub_8055FC4 + bl BGMusicStopped lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4601,7 +4601,7 @@ _08085702: ands r0, r1 cmp r0, 0 bne _08085750 - bl sub_8055FC4 + bl BGMusicStopped lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -5400,7 +5400,7 @@ sub_8085D34: @ 8085D34 ands r0, r1 cmp r0, 0 bne _08085D70 - bl sub_8055FC4 + bl BGMusicStopped lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 |