diff options
| author | Paul Sander <nintendo6496@googlemail.com> | 2018-12-17 16:26:00 +0100 |
|---|---|---|
| committer | Paul Sander <nintendo6496@googlemail.com> | 2018-12-17 16:26:00 +0100 |
| commit | 478c7b5421f596ac9c1e6f4faedfe3faec6a68cf (patch) | |
| tree | 255fa2842f0020dbcd498d87ba8f61456fc804a9 /asm/fldeff_strength.s | |
| parent | fc1fd9c983b0ea35414f699ab6c4b4fdd617e8d0 (diff) | |
| parent | 4cd02d59b4dfef1129f0e2f23e6409e75848af24 (diff) | |
Merge remote-tracking branch 'upstream/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 0c70bdf36..778f2c916 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -23,7 +23,7 @@ _080D0808: movs r0, 0 b _080D0826 _080D080C: - ldr r4, _080D082C @ =gUnknown_20370D0 + ldr r4, _080D082C @ =gSpecialVar_Result bl GetCursorSelectionMonId lsls r0, 24 lsrs r0, 24 @@ -40,7 +40,7 @@ _080D0826: pop {r1} bx r1 .align 2, 0 -_080D082C: .4byte gUnknown_20370D0 +_080D082C: .4byte gSpecialVar_Result _080D0830: .4byte gUnknown_3005024 _080D0834: .4byte hm_add_c3_launch_phase_2 _080D0838: .4byte gUnknown_203B0C4 |