diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-11-15 01:01:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 01:01:06 -0600 |
| commit | 055a419830c0725a629f971b0299c89082c192fd (patch) | |
| tree | 07d1e496a653dc2c6584022cb977bbdf273858aa /asm/fldeff_strength.s | |
| parent | 3fb2a488f99d4d8499a2b0247f73f45837b07156 (diff) | |
| parent | ce0e5cbfe4439a9767134a670868f65cc9920e65 (diff) | |
Merge pull request #101 from Diegoisawesome/dump_maps
Dump maps
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 947517ed5..3001ca259 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 brm_get_pokemon_selection 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 |