diff options
| author | yenatch <yenatch@gmail.com> | 2017-09-03 18:11:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-03 18:11:57 -0400 |
| commit | 7ea0d462c49360351006f246f0a300aaa765a843 (patch) | |
| tree | c930fe4733b8ae2bc02940ae6a35fbf73f933aca /asm/field_tasks.s | |
| parent | cbe13acff18405e99827df7c4a772d20b851f33b (diff) | |
| parent | 5afd2d5bfb1ec117d80898d9ad1c2529d28a091c (diff) | |
Merge pull request #22 from DizzyEggg/clean_up
bring pokeemerald to usable state
Diffstat (limited to 'asm/field_tasks.s')
| -rw-r--r-- | asm/field_tasks.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 7368eed85..5f9a49f94 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -697,7 +697,7 @@ _0809DDAE: cmp r0, 0 beq _0809DE1E movs r0, 0x46 - bl audio_play + bl PlaySE b _0809DE1E _0809DDDC: ldrh r0, [r4, 0xC] @@ -973,7 +973,7 @@ _0809DFF4: bne _0809E008 _0809E002: movs r0, 0x47 - bl audio_play + bl PlaySE _0809E008: cmp r7, 0 beq _0809E044 @@ -1373,7 +1373,7 @@ _0809E306: ldrh r0, [r5, 0xA] strh r0, [r4] movs r0, 0x2A - bl audio_play + bl PlaySE mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -1418,7 +1418,7 @@ _0809E370: ldrh r0, [r5, 0xA] strh r0, [r4] movs r0, 0x29 - bl audio_play + bl PlaySE mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -1521,7 +1521,7 @@ _0809E456: movs r0, 0x87 lsls r0, 1 movs r1, 0x1 - bl sub_80D6724 + bl CheckBagHasItem lsls r0, 24 cmp r0, 0 beq _0809E47A |