diff options
| author | Paul Sander <nintendo6496@googlemail.com> | 2018-12-17 16:26:00 +0100 |
|---|---|---|
| committer | Paul Sander <nintendo6496@googlemail.com> | 2018-12-17 16:26:00 +0100 |
| commit | 478c7b5421f596ac9c1e6f4faedfe3faec6a68cf (patch) | |
| tree | 255fa2842f0020dbcd498d87ba8f61456fc804a9 /asm/battle_controller_player.s | |
| parent | fc1fd9c983b0ea35414f699ab6c4b4fdd617e8d0 (diff) | |
| parent | 4cd02d59b4dfef1129f0e2f23e6409e75848af24 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/battle_controller_player.s')
| -rw-r--r-- | asm/battle_controller_player.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index c009baf03..477f73144 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -4435,7 +4435,7 @@ CompleteWhenChoseItem: @ 803073C ands r0, r1 cmp r0, 0 bne _08030762 - ldr r0, _08030774 @ =gUnknown_203AD30 + ldr r0, _08030774 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -4447,7 +4447,7 @@ _08030762: _08030768: .4byte gMain _0803076C: .4byte sub_8011100 _08030770: .4byte gPaletteFade -_08030774: .4byte gUnknown_203AD30 +_08030774: .4byte gSpecialVar_ItemId thumb_func_end CompleteWhenChoseItem thumb_func_start CompleteOnSpecialAnimDone |