diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
| commit | 9ee9a20152694f456841eb890b986d42f3c50e26 (patch) | |
| tree | 2998678c0f3db391b080318633bc506248542ecb /asm/item_use.s | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/item_use.s')
| -rw-r--r-- | asm/item_use.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/item_use.s b/asm/item_use.s index f3086ae5f..200b0e62f 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -2510,7 +2510,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8 lsls r0, 24 cmp r0, 0 bne _080FE518 - ldr r2, =gUnknown_085E96F6 + ldr r2, =gText_WontHaveEffect ldr r3, =bag_menu_inits_lists_menu adds r0, r4, 0 movs r1, 0x1 @@ -2518,7 +2518,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8 b _080FE53C .pool _080FE518: - ldr r1, =gUnknown_085E96F6 + ldr r1, =gText_WontHaveEffect ldr r2, =sub_81C6714 adds r0, r4, 0 bl DisplayItemMessageInBattlePyramid |