diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-06 10:48:51 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-06 10:48:51 -0400 |
| commit | 1087d1c8227fbcdb768bc96b96c969dd2c9cb598 (patch) | |
| tree | c72ba738fc6cf4556b8016410b466edb5aef85a5 /asm/fldeff_emotion.s | |
| parent | f15191bfc28effef4155b26186bd4236182b88aa (diff) | |
GetFieldObjectIdByLocalIdAndMapInternal; rename gUnknown_02037350 to gMapObjects
Diffstat (limited to 'asm/fldeff_emotion.s')
| -rw-r--r-- | asm/fldeff_emotion.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/fldeff_emotion.s b/asm/fldeff_emotion.s index 845f5618f..f8b66da0d 100644 --- a/asm/fldeff_emotion.s +++ b/asm/fldeff_emotion.s @@ -167,7 +167,7 @@ _080B4756: bl FieldEffectStop b _080B47B2 _080B4764: - ldr r2, =gUnknown_02037350 + ldr r2, =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -274,7 +274,7 @@ sub_80B4808: @ 80B4808 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02037350 + ldr r1, =gMapObjects adds r0, r1 ldrb r0, [r0, 0x18] lsls r0, 28 @@ -301,7 +301,7 @@ _080B4870: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02037350 + ldr r1, =gMapObjects adds r0, r1 ldrb r0, [r0, 0x18] lsls r0, 28 |