diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
| commit | 1e79d53d2f913c65295b2547549d2c4ed849122b (patch) | |
| tree | de6e74a23a65f5d7ebc7e4a7305742b08b6e71c0 /asm/fldeff_strength.s | |
| parent | 0310be30079c657f3a21da64683bdf9ac1d4d394 (diff) | |
| parent | 055a419830c0725a629f971b0299c89082c192fd (diff) | |
merge daycare with master
Diffstat (limited to 'asm/fldeff_strength.s')
| -rw-r--r-- | asm/fldeff_strength.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index 6fc839e2d..53a088aa3 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -17,7 +17,7 @@ hm_prepare_rocksmash: @ 8145DC4 movs r0, 0 b _08145DF2 _08145DD8: - ldr r4, =gScriptResult + ldr r4, =gSpecialVar_Result bl GetCursorSelectionMonId lsls r0, 24 lsrs r0, 24 @@ -44,7 +44,7 @@ sub_8145E0C: @ 8145E0C lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r0, =gUnknown_082908FD + ldr r0, =FieryPath_EventScript_2908FD bl ScriptContext1_SetupScript pop {r0} bx r0 |