diff options
Diffstat (limited to 'asm/shop.s')
| -rw-r--r-- | asm/shop.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/shop.s b/asm/shop.s index bc5eccd64..ca92ff4b7 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -291,7 +291,7 @@ sub_809ACD4: @ 809ACD4 ldr r2, _0809ACEC @ =CB2_ReturnToField movs r0, 0x2 movs r1, 0x3 - bl sub_8107DB4 + bl GoToBagMenu ldr r1, _0809ACF0 @ =gFieldCallback ldr r0, _0809ACF4 @ =sub_809AD74 str r0, [r1] @@ -386,7 +386,7 @@ sub_809AD8C: @ 809AD8C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -793,7 +793,7 @@ _0809B118: movs r1, 0 movs r2, 0xE movs r3, 0x1E - bl SetBgRectPal + bl SetBgTilemapPalette b _0809B14E .align 2, 0 _0809B138: .4byte gUnknown_2039934 @@ -805,7 +805,7 @@ _0809B13C: movs r1, 0 movs r2, 0xC movs r3, 0x1E - bl SetBgRectPal + bl SetBgTilemapPalette _0809B14E: movs r0, 0x1 bl ScheduleBgCopyTilemapToVram |