diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-21 17:10:02 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-21 17:10:02 +0200 |
| commit | 092462d83dcbbacf21c03252d760732617d45da5 (patch) | |
| tree | 19e8620b02fccaa9f5c4b9693d2103761e438959 /asm/field_control_avatar.s | |
| parent | e396bcdb7229645f4a4893b8e3c1d364a0e7930c (diff) | |
| parent | 26ca9acfa5858f1caaa67f2a5e0509a6b47ee644 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index c4551463d..6df9717eb 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1160,7 +1160,7 @@ _0806D17A: ldr r0, [r5, 0x8] movs r1, 0 bl sub_80CC44C - ldr r1, _0806D1C4 @ =gUnknown_20370C2 + ldr r1, _0806D1C4 @ =gSpecialVar_0x8005 strh r0, [r1] ldr r0, [r5, 0x8] movs r1, 0x1 @@ -1183,7 +1183,7 @@ _0806D17A: ldr r0, _0806D1D4 @ =gUnknown_81A6843 b _0806D1E6 .align 2, 0 -_0806D1C4: .4byte gUnknown_20370C2 +_0806D1C4: .4byte gSpecialVar_0x8005 _0806D1C8: .4byte gUnknown_20370C0 _0806D1CC: .4byte gUnknown_20370C4 _0806D1D0: .4byte gUnknown_20370D4 |