diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-12 02:06:19 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-12 02:06:19 -0500 |
| commit | f1b6358047dff266db01545d4a5927047e6756df (patch) | |
| tree | 3905d3988e4c47acc33bbd984002d9fb767ac8ab /asm/link.s | |
| parent | 8914645231c9301579ed39bdd9200ad50e5296d0 (diff) | |
Port/decomp scrcmd
Diffstat (limited to 'asm/link.s')
| -rw-r--r-- | asm/link.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/link.s b/asm/link.s index fb20b1fb2..19d88b570 100644 --- a/asm/link.s +++ b/asm/link.s @@ -21117,7 +21117,7 @@ sub_8014290: @ 8014290 asrs r5, 24 str r5, [sp] adds r3, r4, 0 - bl warp1_set + bl Overworld_SetWarpDestination ldr r0, [r6] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -21182,7 +21182,7 @@ sub_8014304: @ 8014304 adds r0, r4, 0 adds r1, r5, 0 mov r3, r8 - bl warp1_set + bl Overworld_SetWarpDestination bl warp_in add sp, 0x4 pop {r3} @@ -28312,7 +28312,7 @@ _080181BC: sub_80181CC: @ 80181CC push {lr} bl ScriptContext2_Enable - bl sub_80983E8 + bl ScriptFreezeMapObjects pop {r0} bx r0 thumb_func_end sub_80181CC @@ -31292,7 +31292,7 @@ flag_clear_x63: @ 8019A64 adds r0, r1 lsls r0, 16 lsrs r0, 16 - bl FlagReset + bl FlagClear pop {r0} bx r0 .pool |