diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-28 20:03:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-28 20:03:24 -0400 |
| commit | 975e28c01e70c63587c8633ffc3c50b7d1759dec (patch) | |
| tree | 361d94f24acc207803afb8bff6ed7887dbbf391e /asm/item_use.s | |
| parent | d160ca467920d97245c012b8dd0cb8be6d06620a (diff) | |
| parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) | |
Merge branch 'master' into easy_chat
Diffstat (limited to 'asm/item_use.s')
| -rw-r--r-- | asm/item_use.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/item_use.s b/asm/item_use.s index 200b0e62f..d3c724166 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -464,7 +464,7 @@ _080FD3EC: _080FD40C: lsls r0, r6, 24 lsrs r0, 24 - bl sub_8089510 + bl MetatileBehavior_8089510 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2215,7 +2215,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234 ldr r0, =0x000008ad bl FlagSet ldr r0, =0x000008ae - bl FlagReset + bl FlagClear ldr r0, =gStringVar4 ldr r1, =gText_UsedVar2WildLured bl StringExpandPlaceholders @@ -2225,7 +2225,7 @@ _080FE278: ldr r0, =0x000008ae bl FlagSet ldr r0, =0x000008ad - bl FlagReset + bl FlagClear ldr r0, =gStringVar4 ldr r1, =gText_UsedVar2WildRepelled bl StringExpandPlaceholders |