diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-01-07 18:39:27 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-01-07 18:39:27 -0500 |
| commit | f7eef0735bb70a7fed17b6fabb15f30c092209bc (patch) | |
| tree | 17f9256f07ff23163cf13af85fdc36847549cbbe /asm/field_effect_helpers.s | |
| parent | f50bc217ae5daeb2c2788f502f604e3684249256 (diff) | |
| parent | 8f7400809626c0f72dfe751665126f94181fd7c1 (diff) | |
Merge branch 'master' into trainer_tower
Diffstat (limited to 'asm/field_effect_helpers.s')
| -rw-r--r-- | asm/field_effect_helpers.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index ed746de25..be79c3b21 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -845,7 +845,7 @@ unc_grass_normal: @ 80DB3EC lsrs r4, r0, 8 lsls r0, 24 lsrs r7, r0, 24 - ldr r3, _080DB498 @ =gUnknown_2036E18 + ldr r3, _080DB498 @ =gCamera ldrb r1, [r3] movs r0, 0x1 ands r0, r1 @@ -921,7 +921,7 @@ _080DB48C: bl FieldEffectStop b _080DB4E4 .align 2, 0 -_080DB498: .4byte gUnknown_2036E18 +_080DB498: .4byte gCamera _080DB49C: .4byte gSaveBlock1Ptr _080DB4A0: mov r0, sp @@ -1196,7 +1196,7 @@ unc_grass_tall: @ 80DB69C lsrs r7, r0, 8 lsls r0, 24 lsrs r6, r0, 24 - ldr r3, _080DB748 @ =gUnknown_2036E18 + ldr r3, _080DB748 @ =gCamera ldrb r1, [r3] movs r0, 0x1 ands r0, r1 @@ -1272,7 +1272,7 @@ _080DB73C: bl FieldEffectStop b _080DB786 .align 2, 0 -_080DB748: .4byte gUnknown_2036E18 +_080DB748: .4byte gCamera _080DB74C: .4byte gSaveBlock1Ptr _080DB750: mov r0, sp |