diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
commit | 455202eca00fd1b51e9ba8b75434d97ae5c750a8 (patch) | |
tree | 153b1b85ae6864fec7bf880d9dd90fe6ef9a55c6 /asm/item_use.s | |
parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) |
Merge branch 'master' into decompile_rom3
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 42b2d8bc0..d3c724166 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -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 |