diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
| commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
| tree | 70220c06025360d7089011f5d80239b61ac183af /asm/trainer_rematch.s | |
| parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
| parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/trainer_rematch.s')
| -rwxr-xr-x | asm/trainer_rematch.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/trainer_rematch.s b/asm/trainer_rematch.s index 0c30cfea9..b814934a3 100755 --- a/asm/trainer_rematch.s +++ b/asm/trainer_rematch.s @@ -185,7 +185,7 @@ _081DA6D4: adds r0, r1 adds r0, r6 ldrh r0, [r0] - bl trainer_flag_check + bl HasTrainerAlreadyBeenFought lsls r0, 24 cmp r0, 0 bne _081DA6F0 |