diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
| commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
| tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /asm/fldeff_cut.s | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'asm/fldeff_cut.s')
| -rwxr-xr-x | asm/fldeff_cut.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index e31bf22e2..5e2a99d18 100755 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -425,7 +425,7 @@ sub_80D3A9C: @ 80D3A9C lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r0, =gUnknown_08290705 + ldr r0, =Route103_EventScript_290705 bl ScriptContext1_SetupScript pop {r0} bx r0 @@ -1323,7 +1323,7 @@ _080D41D4: lsrs r0, 24 cmp r0, 0x1 bne _080D422A - ldr r0, =gUnknown_08267EDB + ldr r0, =FarawayIsland_Interior_EventScript_267EDB bl ScriptContext1_SetupScript _080D422A: pop {r4-r6} |