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/decoration.s | |
| parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
| parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/decoration.s')
| -rw-r--r-- | asm/decoration.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/decoration.s b/asm/decoration.s index 89bfbe3bf..0798e3165 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -2094,7 +2094,7 @@ sub_8127B04: @ 8127B04 lsls r4, 24 asrs r4, 24 str r4, [sp] - bl warp1_set + bl Overworld_SetWarpDestination bl warp_in add sp, 0x4 pop {r4,r5} @@ -2490,7 +2490,7 @@ _08127E34: cmp r0, 0x1 bne _08127F1C adds r0, r4, 0 - bl FlagReset + bl FlagClear movs r2, 0 ldr r0, [r7, 0x4] ldrb r4, [r0] |