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/mystery_event_script.s | |
| parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
| parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/mystery_event_script.s')
| -rw-r--r-- | asm/mystery_event_script.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index d544f689f..ce8591981 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -46,7 +46,7 @@ sub_8153804: @ 8153804 ldr r1, =gUnknown_08674C86 bl StringExpandPlaceholders movs r0, 0x3 - bl sub_81538C4 + bl SetMysteryEventScriptStatus pop {r0} bx r0 .pool @@ -140,13 +140,13 @@ _081538AC: .pool thumb_func_end sub_81538A0 - thumb_func_start sub_81538C4 -sub_81538C4: @ 81538C4 + thumb_func_start SetMysteryEventScriptStatus +SetMysteryEventScriptStatus: @ 81538C4 ldr r1, =gUnknown_0203BBC0 str r0, [r1, 0x6C] bx lr .pool - thumb_func_end sub_81538C4 + thumb_func_end SetMysteryEventScriptStatus thumb_func_start sub_81538D0 sub_81538D0: @ 81538D0 |