diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-09-16 13:58:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-16 13:58:46 -0500 |
| commit | 1220a139db46c41356f8f5edb6c5a5f55d6340e3 (patch) | |
| tree | ef4ad6691736bc4cc918dea80e4b2ed3c9fe693c /asm/battle_controller_player.s | |
| parent | 78009a835f840864b3d30af00c65a745f75b80fa (diff) | |
| parent | b1e90c1d5011ea19a50cacbb36bda39e436b1e56 (diff) | |
Merge pull request #29 from DizzyEggg/decomp_berry
decompile berry
Diffstat (limited to 'asm/battle_controller_player.s')
| -rw-r--r-- | asm/battle_controller_player.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 5854d5e47..2d1f6de7f 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -4127,7 +4127,7 @@ sub_80598E0: @ 80598E0 ands r0, r1 cmp r0, 0 bne _08059906 - ldr r0, =gUnknown_0203CE7C + ldr r0, =gScriptItemId ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 |