diff options
Diffstat (limited to 'asm/field_effect.s')
-rw-r--r-- | asm/field_effect.s | 478 |
1 files changed, 239 insertions, 239 deletions
diff --git a/asm/field_effect.s b/asm/field_effect.s index df8562b04..4245e711b 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -218,38 +218,38 @@ _080835B4: .4byte gUnknown_2036E28 _080835B8: adds r4, 0x10 lsls r0, r4, 5 - ldr r1, _080835C8 @ =gUnknown_20371F8 + ldr r1, _080835C8 @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_GrayScale b _080835F6 .align 2, 0 -_080835C8: .4byte gUnknown_20371F8 +_080835C8: .4byte gPlttBufferUnfaded _080835CC: adds r4, 0x10 lsls r0, r4, 5 - ldr r1, _080835DC @ =gUnknown_20371F8 + ldr r1, _080835DC @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_SepiaTone b _080835F6 .align 2, 0 -_080835DC: .4byte gUnknown_20371F8 +_080835DC: .4byte gPlttBufferUnfaded _080835E0: adds r4, 0x10 lsls r0, r4, 4 movs r1, 0x10 bl sub_8111F38 lsls r0, r4, 5 - ldr r1, _0808360C @ =gUnknown_20371F8 + ldr r1, _0808360C @ =gPlttBufferUnfaded adds r0, r1 movs r1, 0x10 bl TintPalette_GrayScale _080835F6: lsls r1, r4, 5 - ldr r0, _0808360C @ =gUnknown_20371F8 + ldr r0, _0808360C @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _08083610 @ =gUnknown_20375F8 + ldr r2, _08083610 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -258,8 +258,8 @@ _08083606: pop {r0} bx r0 .align 2, 0 -_0808360C: .4byte gUnknown_20371F8 -_08083610: .4byte gUnknown_20375F8 +_0808360C: .4byte gPlttBufferUnfaded +_08083610: .4byte gPlttBufferFaded thumb_func_end sub_8083598 thumb_func_start sub_8083614 @@ -873,7 +873,7 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _08083B0C @ =gUnknown_20371F8 + ldr r4, _08083B0C @ =gPlttBufferUnfaded lsrs r0, 15 adds r4, r0, r4 ldrh r4, [r4] @@ -918,7 +918,7 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 lsls r4, 26 orrs r4, r6 lsrs r4, 16 - ldr r1, _08083B10 @ =gUnknown_20375F8 + ldr r1, _08083B10 @ =gPlttBufferFaded adds r0, r1 strh r4, [r0] pop {r3,r4} @@ -928,8 +928,8 @@ MultiplyInvertedPaletteRGBComponents: @ 8083A88 pop {r0} bx r0 .align 2, 0 -_08083B0C: .4byte gUnknown_20371F8 -_08083B10: .4byte gUnknown_20375F8 +_08083B0C: .4byte gPlttBufferUnfaded +_08083B10: .4byte gPlttBufferFaded thumb_func_end MultiplyInvertedPaletteRGBComponents thumb_func_start MultiplyPaletteRGBComponents @@ -944,7 +944,7 @@ MultiplyPaletteRGBComponents: @ 8083B14 lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _08083B84 @ =gUnknown_20371F8 + ldr r4, _08083B84 @ =gPlttBufferUnfaded lsrs r0, 15 adds r4, r0, r4 ldrh r4, [r4] @@ -981,7 +981,7 @@ MultiplyPaletteRGBComponents: @ 8083B14 lsls r4, 26 orrs r4, r5 lsrs r4, 16 - ldr r1, _08083B88 @ =gUnknown_20375F8 + ldr r1, _08083B88 @ =gPlttBufferFaded adds r0, r1 strh r4, [r0] pop {r3} @@ -990,8 +990,8 @@ MultiplyPaletteRGBComponents: @ 8083B14 pop {r0} bx r0 .align 2, 0 -_08083B84: .4byte gUnknown_20371F8 -_08083B88: .4byte gUnknown_20375F8 +_08083B84: .4byte gPlttBufferUnfaded +_08083B88: .4byte gPlttBufferFaded thumb_func_end MultiplyPaletteRGBComponents thumb_func_start sub_8083B8C @@ -2067,8 +2067,8 @@ mapldr_08084390: @ 8084390 ldr r0, _080843E8 @ =c3_080843F8 movs r1, 0 bl CreateTask - ldr r4, _080843EC @ =gUnknown_2036E38 - ldr r3, _080843F0 @ =gUnknown_2037078 + ldr r4, _080843EC @ =gMapObjects + ldr r3, _080843F0 @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2101,8 +2101,8 @@ _080843D2: bx r0 .align 2, 0 _080843E8: .4byte c3_080843F8 -_080843EC: .4byte gUnknown_2036E38 -_080843F0: .4byte gUnknown_2037078 +_080843EC: .4byte gMapObjects +_080843F0: .4byte gPlayerAvatar _080843F4: .4byte gUnknown_3005020 thumb_func_end mapldr_08084390 @@ -2121,7 +2121,7 @@ c3_080843F8: @ 80843F8 ldrsh r0, [r4, r1] cmp r0, 0 bne _0808442A - ldr r0, _08084450 @ =gUnknown_2037AB8 + ldr r0, _08084450 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2148,7 +2148,7 @@ _08084444: bx r0 .align 2, 0 _0808444C: .4byte gTasks -_08084450: .4byte gUnknown_2037AB8 +_08084450: .4byte gPaletteFade thumb_func_end c3_080843F8 thumb_func_start sub_8084454 @@ -2209,12 +2209,12 @@ sub_80844BC: @ 80844BC mov r5, r8 push {r5,r6} mov r9, r0 - ldr r6, _08084558 @ =gUnknown_2037078 + ldr r6, _08084558 @ =gPlayerAvatar ldrb r0, [r6, 0x5] lsls r5, r0, 3 adds r5, r0 lsls r5, 2 - ldr r0, _0808455C @ =gUnknown_2036E38 + ldr r0, _0808455C @ =gMapObjects mov r8, r0 add r5, r8 ldrb r0, [r6, 0x4] @@ -2278,8 +2278,8 @@ sub_80844BC: @ 80844BC pop {r1} bx r1 .align 2, 0 -_08084558: .4byte gUnknown_2037078 -_0808455C: .4byte gUnknown_2036E38 +_08084558: .4byte gPlayerAvatar +_0808455C: .4byte gMapObjects _08084560: .4byte gSprites thumb_func_end sub_80844BC @@ -2305,7 +2305,7 @@ _08084578: sub_8084580: @ 8084580 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _080845E4 @ =gUnknown_2037078 + ldr r6, _080845E4 @ =gPlayerAvatar ldrb r0, [r6, 0x4] lsls r2, r0, 4 adds r2, r0 @@ -2331,7 +2331,7 @@ sub_8084580: @ 8084580 movs r0, 0x1 strh r0, [r5, 0xA] strh r1, [r5, 0xC] - ldr r2, _080845F0 @ =gUnknown_2036E38 + ldr r2, _080845F0 @ =gMapObjects ldrb r0, [r6, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -2352,22 +2352,22 @@ sub_8084580: @ 8084580 pop {r1} bx r1 .align 2, 0 -_080845E4: .4byte gUnknown_2037078 +_080845E4: .4byte gPlayerAvatar _080845E8: .4byte gSprites _080845EC: .4byte gSpriteCoordOffsetY -_080845F0: .4byte gUnknown_2036E38 +_080845F0: .4byte gMapObjects thumb_func_end sub_8084580 thumb_func_start sub_80845F4 sub_80845F4: @ 80845F4 push {r4-r6,lr} adds r4, r0, 0 - ldr r2, _080846A0 @ =gUnknown_2037078 + ldr r2, _080846A0 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080846A4 @ =gUnknown_2036E38 + ldr r1, _080846A4 @ =gMapObjects adds r6, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -2449,8 +2449,8 @@ _08084698: pop {r1} bx r1 .align 2, 0 -_080846A0: .4byte gUnknown_2037078 -_080846A4: .4byte gUnknown_2036E38 +_080846A0: .4byte gPlayerAvatar +_080846A4: .4byte gMapObjects _080846A8: .4byte gSprites thumb_func_end sub_80845F4 @@ -2511,7 +2511,7 @@ _080846FE: sub_8084708: @ 8084708 push {r4,lr} sub sp, 0x4 - ldr r1, _08084778 @ =gUnknown_2037078 + ldr r1, _08084778 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -2528,7 +2528,7 @@ sub_8084708: @ 8084708 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 bl sub_8055B38 @@ -2555,7 +2555,7 @@ _08084760: pop {r1} bx r1 .align 2, 0 -_08084778: .4byte gUnknown_2037078 +_08084778: .4byte gPlayerAvatar _0808477C: .4byte 0x00004001 _08084780: .4byte sub_8084484 thumb_func_end sub_8084708 @@ -2645,12 +2645,12 @@ sub_80847F8: @ 80847F8 sub_8084820: @ 8084820 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084888 @ =gUnknown_2037078 + ldr r0, _08084888 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808488C @ =gUnknown_2036E38 + ldr r1, _0808488C @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -2692,8 +2692,8 @@ _0808487E: pop {r1} bx r1 .align 2, 0 -_08084888: .4byte gUnknown_2037078 -_0808488C: .4byte gUnknown_2036E38 +_08084888: .4byte gPlayerAvatar +_0808488C: .4byte gMapObjects thumb_func_end sub_8084820 thumb_func_start sub_8084890 @@ -2760,7 +2760,7 @@ sub_80848E8: @ 80848E8 sub_80848F8: @ 80848F8 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0808493C @ =gUnknown_2037078 + ldr r0, _0808493C @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -2792,7 +2792,7 @@ _08084936: pop {r0} bx r0 .align 2, 0 -_0808493C: .4byte gUnknown_2037078 +_0808493C: .4byte gPlayerAvatar _08084940: .4byte gSprites thumb_func_end sub_80848F8 @@ -2800,7 +2800,7 @@ _08084940: .4byte gSprites sub_8084944: @ 8084944 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084988 @ =gUnknown_2037078 + ldr r0, _08084988 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -2832,7 +2832,7 @@ _08084982: pop {r0} bx r0 .align 2, 0 -_08084988: .4byte gUnknown_2037078 +_08084988: .4byte gPlayerAvatar _0808498C: .4byte gSprites thumb_func_end sub_8084944 @@ -2848,7 +2848,7 @@ sub_8084990: @ 8084990 thumb_func_start sub_80849A0 sub_80849A0: @ 80849A0 push {lr} - ldr r0, _080849E0 @ =gUnknown_2037AB8 + ldr r0, _080849E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2875,7 +2875,7 @@ _080849DC: pop {r0} bx r0 .align 2, 0 -_080849E0: .4byte gUnknown_2037AB8 +_080849E0: .4byte gPaletteFade _080849E4: .4byte gUnknown_3005020 _080849E8: .4byte sub_80849F4 _080849EC: .4byte sub_805671C @@ -2939,12 +2939,12 @@ sub_8084A5C: @ 8084A5C sub sp, 0x4 adds r5, r0, 0 bl CameraObjectReset2 - ldr r0, _08084ABC @ =gUnknown_2037078 + ldr r0, _08084ABC @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08084AC0 @ =gUnknown_2036E38 + ldr r0, _08084AC0 @ =gMapObjects adds r4, r0 movs r0, 0x4 bl sub_8063EB8 @@ -2963,7 +2963,7 @@ sub_8084A5C: @ 8084A5C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r1, r0, 24 ldrh r0, [r5, 0x8] @@ -2978,8 +2978,8 @@ sub_8084A5C: @ 8084A5C strh r0, [r5, 0x8] b _08084AC6 .align 2, 0 -_08084ABC: .4byte gUnknown_2037078 -_08084AC0: .4byte gUnknown_2036E38 +_08084ABC: .4byte gPlayerAvatar +_08084AC0: .4byte gMapObjects _08084AC4: movs r1, 0 _08084AC6: @@ -2996,7 +2996,7 @@ _08084AC6: sub_8084AD8: @ 8084AD8 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084B10 @ =gUnknown_2037078 + ldr r0, _08084B10 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -3021,7 +3021,7 @@ sub_8084AD8: @ 8084AD8 pop {r1} bx r1 .align 2, 0 -_08084B10: .4byte gUnknown_2037078 +_08084B10: .4byte gPlayerAvatar _08084B14: .4byte gSprites thumb_func_end sub_8084AD8 @@ -3029,7 +3029,7 @@ _08084B14: .4byte gSprites sub_8084B18: @ 8084B18 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _08084B70 @ =gUnknown_2037078 + ldr r0, _08084B70 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -3071,7 +3071,7 @@ _08084B66: pop {r1} bx r1 .align 2, 0 -_08084B70: .4byte gUnknown_2037078 +_08084B70: .4byte gPlayerAvatar _08084B74: .4byte gSprites thumb_func_end sub_8084B18 @@ -3079,7 +3079,7 @@ _08084B74: .4byte gSprites sub_8084B78: @ 8084B78 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08084BB0 @ =gUnknown_2037078 + ldr r0, _08084BB0 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 @@ -3104,7 +3104,7 @@ sub_8084B78: @ 8084B78 pop {r1} bx r1 .align 2, 0 -_08084BB0: .4byte gUnknown_2037078 +_08084BB0: .4byte gPlayerAvatar _08084BB4: .4byte gSprites thumb_func_end sub_8084B78 @@ -3112,7 +3112,7 @@ _08084BB4: .4byte gSprites sub_8084BB8: @ 8084BB8 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _08084C10 @ =gUnknown_2037078 + ldr r0, _08084C10 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -3155,7 +3155,7 @@ _08084C08: pop {r1} bx r1 .align 2, 0 -_08084C10: .4byte gUnknown_2037078 +_08084C10: .4byte gPlayerAvatar _08084C14: .4byte gSprites thumb_func_end sub_8084BB8 @@ -3184,12 +3184,12 @@ _08084C36: thumb_func_start sub_8084C3C sub_8084C3C: @ 8084C3C push {r4,lr} - ldr r0, _08084C94 @ =gUnknown_2037078 + ldr r0, _08084C94 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08084C98 @ =gUnknown_2036E38 + ldr r1, _08084C98 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -3219,8 +3219,8 @@ _08084C8A: pop {r1} bx r1 .align 2, 0 -_08084C94: .4byte gUnknown_2037078 -_08084C98: .4byte gUnknown_2036E38 +_08084C94: .4byte gPlayerAvatar +_08084C98: .4byte gMapObjects _08084C9C: .4byte sub_8084A24 thumb_func_end sub_8084C3C @@ -3268,12 +3268,12 @@ _08084CEA: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _08084D1C @ =gUnknown_2037078 + ldr r0, _08084D1C @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08084D20 @ =gUnknown_2036E38 + ldr r0, _08084D20 @ =gMapObjects adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3287,8 +3287,8 @@ _08084CEA: .align 2, 0 _08084D14: .4byte gUnknown_83CC084 _08084D18: .4byte gTasks -_08084D1C: .4byte gUnknown_2037078 -_08084D20: .4byte gUnknown_2036E38 +_08084D1C: .4byte gPlayerAvatar +_08084D20: .4byte gMapObjects thumb_func_end sub_8084CD8 thumb_func_start sub_8084D24 @@ -3296,7 +3296,7 @@ sub_8084D24: @ 8084D24 push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _08084D40 @ =gUnknown_2037078 + ldr r1, _08084D40 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -3307,7 +3307,7 @@ sub_8084D24: @ 8084D24 pop {r1} bx r1 .align 2, 0 -_08084D40: .4byte gUnknown_2037078 +_08084D40: .4byte gPlayerAvatar thumb_func_end sub_8084D24 thumb_func_start waterfall_1_do_anim_probably @@ -3404,7 +3404,7 @@ _08084DE2: cmp r4, 0 bne _08084E18 bl ScriptContext2_Disable - ldr r0, _08084E10 @ =gUnknown_2037078 + ldr r0, _08084E10 @ =gPlayerAvatar strb r4, [r0, 0x6] ldr r0, _08084E14 @ =sub_8084CD8 bl FindTaskIdByFunc @@ -3416,7 +3416,7 @@ _08084DE2: movs r0, 0 b _08084E1E .align 2, 0 -_08084E10: .4byte gUnknown_2037078 +_08084E10: .4byte gPlayerAvatar _08084E14: .4byte sub_8084CD8 _08084E18: movs r0, 0x3 @@ -3490,7 +3490,7 @@ _08084E94: .4byte gTasks thumb_func_start dive_1_lock dive_1_lock: @ 8084E98 - ldr r2, _08084EA8 @ =gUnknown_2037078 + ldr r2, _08084EA8 @ =gPlayerAvatar movs r1, 0x1 strb r1, [r2, 0x6] ldrh r1, [r0, 0x8] @@ -3499,7 +3499,7 @@ dive_1_lock: @ 8084E98 movs r0, 0 bx lr .align 2, 0 -_08084EA8: .4byte gUnknown_2037078 +_08084EA8: .4byte gPlayerAvatar thumb_func_end dive_1_lock thumb_func_start dive_2_unknown @@ -3537,8 +3537,8 @@ dive_3_unknown: @ 8084ED4 lsls r0, 24 cmp r0, 0 bne _08084F18 - ldr r2, _08084F20 @ =gUnknown_2036E38 - ldr r0, _08084F24 @ =gUnknown_2037078 + ldr r2, _08084F20 @ =gMapObjects + ldr r0, _08084F24 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -3560,8 +3560,8 @@ _08084F18: pop {r1} bx r1 .align 2, 0 -_08084F20: .4byte gUnknown_2036E38 -_08084F24: .4byte gUnknown_2037078 +_08084F20: .4byte gMapObjects +_08084F24: .4byte gPlayerAvatar _08084F28: .4byte sub_8084E60 thumb_func_end dive_3_unknown @@ -3586,7 +3586,7 @@ sub_8084F44: @ 8084F44 lsrs r0, 24 ldr r6, _08084F8C @ =gUnknown_83CC0A4 ldr r2, _08084F90 @ =gTasks - ldr r5, _08084F94 @ =gUnknown_2037078 + ldr r5, _08084F94 @ =gPlayerAvatar lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3600,7 +3600,7 @@ _08084F58: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08084F98 @ =gUnknown_2036E38 + ldr r0, _08084F98 @ =gMapObjects adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 @@ -3620,8 +3620,8 @@ _08084F58: .align 2, 0 _08084F8C: .4byte gUnknown_83CC0A4 _08084F90: .4byte gTasks -_08084F94: .4byte gUnknown_2037078 -_08084F98: .4byte gUnknown_2036E38 +_08084F94: .4byte gPlayerAvatar +_08084F98: .4byte gMapObjects _08084F9C: .4byte gSprites thumb_func_end sub_8084F44 @@ -3634,7 +3634,7 @@ sub_8084FA0: @ 8084FA0 bl CameraObjectReset2 movs r0, 0 bl SetCameraPanningCallback - ldr r0, _08084FD4 @ =gUnknown_2037078 + ldr r0, _08084FD4 @ =gPlayerAvatar movs r2, 0x1 strb r2, [r0, 0x6] ldrb r0, [r5, 0x3] @@ -3650,7 +3650,7 @@ sub_8084FA0: @ 8084FA0 pop {r1} bx r1 .align 2, 0 -_08084FD4: .4byte gUnknown_2037078 +_08084FD4: .4byte gPlayerAvatar thumb_func_end sub_8084FA0 thumb_func_start sub_8084FD8 @@ -3872,7 +3872,7 @@ sub_808514C: @ 808514C thumb_func_start sub_8085168 sub_8085168: @ 8085168 push {lr} - ldr r0, _080851A8 @ =gUnknown_2037AB8 + ldr r0, _080851A8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3899,7 +3899,7 @@ _080851A0: pop {r1} bx r1 .align 2, 0 -_080851A8: .4byte gUnknown_2037AB8 +_080851A8: .4byte gPaletteFade _080851AC: .4byte gUnknown_3005020 _080851B0: .4byte mapldr_080851BC _080851B4: .4byte sub_805671C @@ -3932,7 +3932,7 @@ sub_80851E8: @ 80851E8 lsrs r0, 24 ldr r6, _08085230 @ =gUnknown_83CC0BC ldr r2, _08085234 @ =gTasks - ldr r5, _08085238 @ =gUnknown_2037078 + ldr r5, _08085238 @ =gPlayerAvatar lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3946,7 +3946,7 @@ _080851FC: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0808523C @ =gUnknown_2036E38 + ldr r0, _0808523C @ =gMapObjects adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 @@ -3966,8 +3966,8 @@ _080851FC: .align 2, 0 _08085230: .4byte gUnknown_83CC0BC _08085234: .4byte gTasks -_08085238: .4byte gUnknown_2037078 -_0808523C: .4byte gUnknown_2036E38 +_08085238: .4byte gPlayerAvatar +_0808523C: .4byte gMapObjects _08085240: .4byte gSprites thumb_func_end sub_80851E8 @@ -3978,7 +3978,7 @@ sub_8085244: @ 8085244 adds r4, r1, 0 bl CameraObjectReset2 bl player_bitmagic - ldr r1, _08085270 @ =gUnknown_2037078 + ldr r1, _08085270 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrb r0, [r4, 0x1] @@ -3993,7 +3993,7 @@ sub_8085244: @ 8085244 pop {r1} bx r1 .align 2, 0 -_08085270: .4byte gUnknown_2037078 +_08085270: .4byte gPlayerAvatar thumb_func_end sub_8085244 thumb_func_start sub_8085274 @@ -4088,7 +4088,7 @@ sub_8085314: @ 8085314 lsls r0, 24 cmp r0, 0 beq _0808533E - ldr r1, _08085344 @ =gUnknown_2037078 + ldr r1, _08085344 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -4103,7 +4103,7 @@ _0808533E: pop {r1} bx r1 .align 2, 0 -_08085344: .4byte gUnknown_2037078 +_08085344: .4byte gPlayerAvatar _08085348: .4byte sub_80851E8 thumb_func_end sub_8085314 @@ -4195,7 +4195,7 @@ sub_80853E4: @ 80853E4 lsrs r0, 24 ldr r6, _0808542C @ =gUnknown_83CC0CC ldr r2, _08085430 @ =gTasks - ldr r5, _08085434 @ =gUnknown_2037078 + ldr r5, _08085434 @ =gPlayerAvatar lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4209,7 +4209,7 @@ _080853F8: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08085438 @ =gUnknown_2036E38 + ldr r0, _08085438 @ =gMapObjects adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 @@ -4229,8 +4229,8 @@ _080853F8: .align 2, 0 _0808542C: .4byte gUnknown_83CC0CC _08085430: .4byte gTasks -_08085434: .4byte gUnknown_2037078 -_08085438: .4byte gUnknown_2036E38 +_08085434: .4byte gPlayerAvatar +_08085438: .4byte gMapObjects _0808543C: .4byte gSprites thumb_func_end sub_80853E4 @@ -4241,7 +4241,7 @@ sub_8085440: @ 8085440 adds r4, r1, 0 bl player_bitmagic bl CameraObjectReset2 - ldr r1, _0808546C @ =gUnknown_2037078 + ldr r1, _0808546C @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrb r0, [r4, 0x3] @@ -4256,7 +4256,7 @@ sub_8085440: @ 8085440 pop {r1} bx r1 .align 2, 0 -_0808546C: .4byte gUnknown_2037078 +_0808546C: .4byte gPlayerAvatar thumb_func_end sub_8085440 thumb_func_start sub_8085470 @@ -4377,7 +4377,7 @@ _08085542: thumb_func_start sub_808554C sub_808554C: @ 808554C push {lr} - ldr r0, _0808558C @ =gUnknown_2037AB8 + ldr r0, _0808558C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4404,7 +4404,7 @@ _08085584: pop {r1} bx r1 .align 2, 0 -_0808558C: .4byte gUnknown_2037AB8 +_0808558C: .4byte gPaletteFade _08085590: .4byte gUnknown_3005020 _08085594: .4byte sub_8084454 _08085598: .4byte sub_805671C @@ -4541,12 +4541,12 @@ sub_808566C: @ 808566C sub_8085690: @ 8085690 push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _080856D4 @ =gUnknown_2037078 + ldr r0, _080856D4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080856D8 @ =gUnknown_2036E38 + ldr r1, _080856D8 @ =gMapObjects adds r6, r0, r1 adds r4, r5, 0 adds r4, 0x8 @@ -4571,8 +4571,8 @@ sub_8085690: @ 8085690 bl PlaySE b _08085702 .align 2, 0 -_080856D4: .4byte gUnknown_2037078 -_080856D8: .4byte gUnknown_2036E38 +_080856D4: .4byte gPlayerAvatar +_080856D8: .4byte gMapObjects _080856DC: movs r1, 0x8 ldrsh r0, [r4, r1] @@ -4595,7 +4595,7 @@ _08085702: ldrsh r0, [r4, r2] cmp r0, 0x1 bne _08085750 - ldr r0, _08085758 @ =gUnknown_2037AB8 + ldr r0, _08085758 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4628,7 +4628,7 @@ _08085750: pop {r0} bx r0 .align 2, 0 -_08085758: .4byte gUnknown_2037AB8 +_08085758: .4byte gPaletteFade _0808575C: .4byte gUnknown_3005020 _08085760: .4byte sub_80859D4 _08085764: .4byte sub_805671C @@ -4973,8 +4973,8 @@ sub_80859D4: @ 80859D4 ldr r1, _08085A14 @ =gUnknown_3005020 movs r0, 0 str r0, [r1] - ldr r2, _08085A18 @ =gUnknown_2036E38 - ldr r0, _08085A1C @ =gUnknown_2037078 + ldr r2, _08085A18 @ =gMapObjects + ldr r0, _08085A1C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4991,8 +4991,8 @@ sub_80859D4: @ 80859D4 bx r0 .align 2, 0 _08085A14: .4byte gUnknown_3005020 -_08085A18: .4byte gUnknown_2036E38 -_08085A1C: .4byte gUnknown_2037078 +_08085A18: .4byte gMapObjects +_08085A1C: .4byte gPlayerAvatar _08085A20: .4byte sub_8085A24 thumb_func_end sub_80859D4 @@ -5051,12 +5051,12 @@ sub_8085A80: @ 8085A80 adds r4, r0, 0 adds r5, r4, 0 adds r5, 0x8 - ldr r0, _08085AD4 @ =gUnknown_2037078 + ldr r0, _08085AD4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085AD8 @ =gUnknown_2036E38 + ldr r1, _08085AD8 @ =gMapObjects adds r6, r0, r1 adds r1, r4, 0 adds r1, 0xA @@ -5087,8 +5087,8 @@ sub_8085A80: @ 8085A80 strh r0, [r5, 0xC] b _08085B10 .align 2, 0 -_08085AD4: .4byte gUnknown_2037078 -_08085AD8: .4byte gUnknown_2036E38 +_08085AD4: .4byte gPlayerAvatar +_08085AD8: .4byte gMapObjects _08085ADC: movs r2, 0xE ldrsh r0, [r5, r2] @@ -5221,12 +5221,12 @@ sub_8085BD0: @ 8085BD0 mov r0, sp movs r2, 0x5 bl memcpy - ldr r0, _08085C58 @ =gUnknown_2037078 + ldr r0, _08085C58 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085C5C @ =gUnknown_2036E38 + ldr r1, _08085C5C @ =gMapObjects adds r5, r0, r1 ldrh r1, [r4, 0xA] movs r2, 0xA @@ -5281,8 +5281,8 @@ _08085C4A: bx r0 .align 2, 0 _08085C54: .4byte gUnknown_83CC108 -_08085C58: .4byte gUnknown_2037078 -_08085C5C: .4byte gUnknown_2036E38 +_08085C58: .4byte gPlayerAvatar +_08085C5C: .4byte gMapObjects thumb_func_end sub_8085BD0 thumb_func_start sub_8085C60 @@ -5294,12 +5294,12 @@ sub_8085C60: @ 8085C60 mov r0, sp movs r2, 0x5 bl memcpy - ldr r2, _08085D28 @ =gUnknown_2037078 + ldr r2, _08085D28 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085D2C @ =gUnknown_2036E38 + ldr r1, _08085D2C @ =gMapObjects adds r3, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -5386,15 +5386,15 @@ _08085D1A: bx r0 .align 2, 0 _08085D24: .4byte gUnknown_83CC108 -_08085D28: .4byte gUnknown_2037078 -_08085D2C: .4byte gUnknown_2036E38 +_08085D28: .4byte gPlayerAvatar +_08085D2C: .4byte gMapObjects _08085D30: .4byte gSprites thumb_func_end sub_8085C60 thumb_func_start sub_8085D34 sub_8085D34: @ 8085D34 push {lr} - ldr r0, _08085D74 @ =gUnknown_2037AB8 + ldr r0, _08085D74 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5421,7 +5421,7 @@ _08085D70: pop {r0} bx r0 .align 2, 0 -_08085D74: .4byte gUnknown_2037AB8 +_08085D74: .4byte gPaletteFade _08085D78: .4byte sub_805671C _08085D7C: .4byte gUnknown_3005020 _08085D80: .4byte mapldr_08085D88 @@ -5439,8 +5439,8 @@ mapldr_08085D88: @ 8085D88 ldr r1, _08085DCC @ =gUnknown_3005020 movs r0, 0 str r0, [r1] - ldr r2, _08085DD0 @ =gUnknown_2036E38 - ldr r0, _08085DD4 @ =gUnknown_2037078 + ldr r2, _08085DD0 @ =gMapObjects + ldr r0, _08085DD4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5458,8 +5458,8 @@ mapldr_08085D88: @ 8085D88 bx r0 .align 2, 0 _08085DCC: .4byte gUnknown_3005020 -_08085DD0: .4byte gUnknown_2036E38 -_08085DD4: .4byte gUnknown_2037078 +_08085DD0: .4byte gMapObjects +_08085DD4: .4byte gPlayerAvatar _08085DD8: .4byte sub_8085DDC thumb_func_end mapldr_08085D88 @@ -5496,7 +5496,7 @@ sub_8085E0C: @ 8085E0C lsls r0, 24 cmp r0, 0 beq _08085E82 - ldr r5, _08085E88 @ =gUnknown_2037078 + ldr r5, _08085E88 @ =gPlayerAvatar ldrb r0, [r5, 0x4] lsls r2, r0, 4 adds r2, r0 @@ -5518,7 +5518,7 @@ sub_8085E0C: @ 8085E0C adds r0, r1 negs r0, r0 strh r0, [r2, 0x26] - ldr r3, _08085E94 @ =gUnknown_2036E38 + ldr r3, _08085E94 @ =gMapObjects ldrb r0, [r5, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -5551,10 +5551,10 @@ _08085E82: pop {r0} bx r0 .align 2, 0 -_08085E88: .4byte gUnknown_2037078 +_08085E88: .4byte gPlayerAvatar _08085E8C: .4byte gSprites _08085E90: .4byte gSpriteCoordOffsetY -_08085E94: .4byte gUnknown_2036E38 +_08085E94: .4byte gMapObjects thumb_func_end sub_8085E0C thumb_func_start sub_8085E98 @@ -5566,12 +5566,12 @@ sub_8085E98: @ 8085E98 mov r0, sp movs r2, 0x5 bl memcpy - ldr r2, _08085F04 @ =gUnknown_2037078 + ldr r2, _08085F04 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08085F08 @ =gUnknown_2036E38 + ldr r1, _08085F08 @ =gMapObjects adds r6, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -5612,8 +5612,8 @@ sub_8085E98: @ 8085E98 b _08085F36 .align 2, 0 _08085F00: .4byte gUnknown_83CC108 -_08085F04: .4byte gUnknown_2037078 -_08085F08: .4byte gUnknown_2036E38 +_08085F04: .4byte gPlayerAvatar +_08085F08: .4byte gMapObjects _08085F0C: .4byte gSprites _08085F10: ldrb r1, [r5, 0x5] @@ -5699,12 +5699,12 @@ sub_8085F9C: @ 8085F9C mov r0, sp movs r2, 0x5 bl memcpy - ldr r0, _0808601C @ =gUnknown_2037078 + ldr r0, _0808601C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086020 @ =gUnknown_2036E38 + ldr r1, _08086020 @ =gMapObjects adds r5, r0, r1 ldrh r0, [r4, 0xA] subs r0, 0x1 @@ -5750,8 +5750,8 @@ _08086010: bx r0 .align 2, 0 _08086018: .4byte gUnknown_83CC108 -_0808601C: .4byte gUnknown_2037078 -_08086020: .4byte gUnknown_2036E38 +_0808601C: .4byte gPlayerAvatar +_08086020: .4byte gMapObjects _08086024: .4byte sub_8085DDC thumb_func_end sub_8085F9C @@ -7001,7 +7001,7 @@ sub_80869C0: @ 80869C0 adds r4, r0, 0 bl ScriptContext2_Enable bl player_bitmagic - ldr r5, _08086A18 @ =gUnknown_2037078 + ldr r5, _08086A18 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r5, 0x6] movs r0, 0x8 @@ -7014,7 +7014,7 @@ sub_80869C0: @ 80869C0 adds r0, r6, 0 mov r1, r8 bl PlayerGetDestCoords - ldr r2, _08086A1C @ =gUnknown_2036E38 + ldr r2, _08086A1C @ =gMapObjects ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -7034,20 +7034,20 @@ sub_80869C0: @ 80869C0 pop {r0} bx r0 .align 2, 0 -_08086A18: .4byte gUnknown_2037078 -_08086A1C: .4byte gUnknown_2036E38 +_08086A18: .4byte gPlayerAvatar +_08086A1C: .4byte gMapObjects thumb_func_end sub_80869C0 thumb_func_start sub_8086A20 sub_8086A20: @ 8086A20 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08086A64 @ =gUnknown_2037078 + ldr r0, _08086A64 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086A68 @ =gUnknown_2036E38 + ldr r1, _08086A68 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -7072,20 +7072,20 @@ _08086A5C: pop {r0} bx r0 .align 2, 0 -_08086A64: .4byte gUnknown_2037078 -_08086A68: .4byte gUnknown_2036E38 +_08086A64: .4byte gPlayerAvatar +_08086A68: .4byte gMapObjects thumb_func_end sub_8086A20 thumb_func_start sub_8086A6C sub_8086A6C: @ 8086A6C push {r4,lr} adds r4, r0, 0 - ldr r0, _08086AA8 @ =gUnknown_2037078 + ldr r0, _08086AA8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086AAC @ =gUnknown_2036E38 + ldr r1, _08086AAC @ =gMapObjects adds r0, r1 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 @@ -7108,8 +7108,8 @@ _08086AA2: pop {r0} bx r0 .align 2, 0 -_08086AA8: .4byte gUnknown_2037078 -_08086AAC: .4byte gUnknown_2036E38 +_08086AA8: .4byte gPlayerAvatar +_08086AAC: .4byte gMapObjects _08086AB0: .4byte gUnknown_20386E0 thumb_func_end sub_8086A6C @@ -7122,12 +7122,12 @@ sub_8086AB4: @ 8086AB4 lsls r0, 24 cmp r0, 0 bne _08086B1E - ldr r5, _08086B24 @ =gUnknown_2037078 + ldr r5, _08086B24 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08086B28 @ =gUnknown_2036E38 + ldr r0, _08086B28 @ =gMapObjects adds r4, r0 movs r0, 0x2 bl sub_805C808 @@ -7166,20 +7166,20 @@ _08086B1E: pop {r0} bx r0 .align 2, 0 -_08086B24: .4byte gUnknown_2037078 -_08086B28: .4byte gUnknown_2036E38 +_08086B24: .4byte gPlayerAvatar +_08086B28: .4byte gMapObjects _08086B2C: .4byte gUnknown_20386E0 thumb_func_end sub_8086AB4 thumb_func_start sub_8086B30 sub_8086B30: @ 8086B30 push {r4,r5,lr} - ldr r5, _08086B9C @ =gUnknown_2037078 + ldr r5, _08086B9C @ =gPlayerAvatar ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086BA0 @ =gUnknown_2036E38 + ldr r1, _08086BA0 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -7219,8 +7219,8 @@ _08086B96: pop {r0} bx r0 .align 2, 0 -_08086B9C: .4byte gUnknown_2037078 -_08086BA0: .4byte gUnknown_2036E38 +_08086B9C: .4byte gPlayerAvatar +_08086BA0: .4byte gMapObjects _08086BA4: .4byte sub_8086990 thumb_func_end sub_8086B30 @@ -7277,7 +7277,7 @@ sub_8086C00: @ 8086C00 adds r4, r0, 0 bl ScriptContext2_Enable bl player_bitmagic - ldr r1, _08086C20 @ =gUnknown_2037078 + ldr r1, _08086C20 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -7287,19 +7287,19 @@ sub_8086C00: @ 8086C00 pop {r0} bx r0 .align 2, 0 -_08086C20: .4byte gUnknown_2037078 +_08086C20: .4byte gPlayerAvatar thumb_func_end sub_8086C00 thumb_func_start sub_8086C24 sub_8086C24: @ 8086C24 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08086C68 @ =gUnknown_2037078 + ldr r0, _08086C68 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086C6C @ =gUnknown_2036E38 + ldr r1, _08086C6C @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -7324,20 +7324,20 @@ _08086C60: pop {r0} bx r0 .align 2, 0 -_08086C68: .4byte gUnknown_2037078 -_08086C6C: .4byte gUnknown_2036E38 +_08086C68: .4byte gPlayerAvatar +_08086C6C: .4byte gMapObjects thumb_func_end sub_8086C24 thumb_func_start sub_8086C70 sub_8086C70: @ 8086C70 push {r4-r6,lr} adds r6, r0, 0 - ldr r5, _08086C9C @ =gUnknown_2037078 + ldr r5, _08086C9C @ =gPlayerAvatar ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086CA0 @ =gUnknown_2036E38 + ldr r1, _08086CA0 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -7352,8 +7352,8 @@ sub_8086C70: @ 8086C70 movs r0, 0x1 b _08086CAE .align 2, 0 -_08086C9C: .4byte gUnknown_2037078 -_08086CA0: .4byte gUnknown_2036E38 +_08086C9C: .4byte gPlayerAvatar +_08086CA0: .4byte gMapObjects _08086CA4: movs r0, 0x8 ands r0, r1 @@ -7398,12 +7398,12 @@ _08086CEE: thumb_func_start sub_8086CF4 sub_8086CF4: @ 8086CF4 push {r4,lr} - ldr r4, _08086D2C @ =gUnknown_2037078 + ldr r4, _08086D2C @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086D30 @ =gUnknown_2036E38 + ldr r1, _08086D30 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 @@ -7423,8 +7423,8 @@ _08086D26: pop {r0} bx r0 .align 2, 0 -_08086D2C: .4byte gUnknown_2037078 -_08086D30: .4byte gUnknown_2036E38 +_08086D2C: .4byte gPlayerAvatar +_08086D30: .4byte gMapObjects _08086D34: .4byte sub_8086BD0 thumb_func_end sub_8086CF4 @@ -7591,12 +7591,12 @@ _08086E6C: .4byte gTasks sub_8086E70: @ 8086E70 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _08086EC0 @ =gUnknown_2037078 + ldr r6, _08086EC0 @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086EC4 @ =gUnknown_2036E38 + ldr r1, _08086EC4 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -7626,20 +7626,20 @@ _08086EB8: pop {r0} bx r0 .align 2, 0 -_08086EC0: .4byte gUnknown_2037078 -_08086EC4: .4byte gUnknown_2036E38 +_08086EC0: .4byte gPlayerAvatar +_08086EC4: .4byte gMapObjects thumb_func_end sub_8086E70 thumb_func_start sub_8086EC8 sub_8086EC8: @ 8086EC8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08086F00 @ =gUnknown_2037078 + ldr r0, _08086F00 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086F04 @ =gUnknown_2036E38 + ldr r1, _08086F04 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 @@ -7659,8 +7659,8 @@ _08086EF8: pop {r0} bx r0 .align 2, 0 -_08086F00: .4byte gUnknown_2037078 -_08086F04: .4byte gUnknown_2036E38 +_08086F00: .4byte gPlayerAvatar +_08086F04: .4byte gMapObjects _08086F08: .4byte gUnknown_20386E0 thumb_func_end sub_8086EC8 @@ -7673,12 +7673,12 @@ sub_8086F0C: @ 8086F0C lsls r0, 24 cmp r0, 0 bne _08086F54 - ldr r0, _08086F5C @ =gUnknown_2037078 + ldr r0, _08086F5C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086F60 @ =gUnknown_2036E38 + ldr r1, _08086F60 @ =gMapObjects adds r5, r0, r1 ldrh r1, [r4, 0x26] movs r0, 0x8 @@ -7704,8 +7704,8 @@ _08086F54: pop {r0} bx r0 .align 2, 0 -_08086F5C: .4byte gUnknown_2037078 -_08086F60: .4byte gUnknown_2036E38 +_08086F5C: .4byte gPlayerAvatar +_08086F60: .4byte gMapObjects thumb_func_end sub_8086F0C thumb_func_start sub_8086F64 @@ -7724,12 +7724,12 @@ sub_8086F64: @ 8086F64 strh r0, [r4, 0xC] movs r0, 0x1 bl SetPlayerAvatarTransitionFlags - ldr r0, _08086FA0 @ =gUnknown_2037078 + ldr r0, _08086FA0 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086FA4 @ =gUnknown_2036E38 + ldr r1, _08086FA4 @ =gMapObjects adds r0, r1 movs r1, 0x2 bl sub_8063CA4 @@ -7738,20 +7738,20 @@ _08086F98: pop {r0} bx r0 .align 2, 0 -_08086FA0: .4byte gUnknown_2037078 -_08086FA4: .4byte gUnknown_2036E38 +_08086FA0: .4byte gPlayerAvatar +_08086FA4: .4byte gMapObjects thumb_func_end sub_8086F64 thumb_func_start sub_8086FA8 sub_8086FA8: @ 8086FA8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08086FF4 @ =gUnknown_2037078 + ldr r0, _08086FF4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08086FF8 @ =gUnknown_2036E38 + ldr r1, _08086FF8 @ =gMapObjects adds r2, r0, r1 ldrh r1, [r4, 0xC] movs r3, 0xC @@ -7781,8 +7781,8 @@ _08086FEC: pop {r0} bx r0 .align 2, 0 -_08086FF4: .4byte gUnknown_2037078 -_08086FF8: .4byte gUnknown_2036E38 +_08086FF4: .4byte gPlayerAvatar +_08086FF8: .4byte gMapObjects thumb_func_end sub_8086FA8 thumb_func_start sub_8086FFC @@ -7796,12 +7796,12 @@ sub_8086FFC: @ 8086FFC asrs r0, 16 cmp r0, 0x7 ble _0808705A - ldr r0, _08087060 @ =gUnknown_2037078 + ldr r0, _08087060 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08087064 @ =gUnknown_2036E38 + ldr r0, _08087064 @ =gMapObjects adds r4, r0 movs r0, 0x2 bl sub_805C808 @@ -7835,8 +7835,8 @@ _0808705A: pop {r0} bx r0 .align 2, 0 -_08087060: .4byte gUnknown_2037078 -_08087064: .4byte gUnknown_2036E38 +_08087060: .4byte gPlayerAvatar +_08087064: .4byte gMapObjects _08087068: .4byte gSprites thumb_func_end sub_8086FFC @@ -7851,12 +7851,12 @@ sub_808706C: @ 808706C asrs r0, 16 cmp r0, 0x9 ble _080870FC - ldr r0, _08087104 @ =gUnknown_2037078 + ldr r0, _08087104 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08087108 @ =gUnknown_2036E38 + ldr r0, _08087108 @ =gMapObjects adds r4, r0 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimActive @@ -7914,8 +7914,8 @@ _080870FC: pop {r0} bx r0 .align 2, 0 -_08087104: .4byte gUnknown_2037078 -_08087108: .4byte gUnknown_2036E38 +_08087104: .4byte gPlayerAvatar +_08087108: .4byte gMapObjects _0808710C: .4byte gSprites _08087110: .4byte gSaveBlock2Ptr _08087114: .4byte sub_8087828 @@ -7943,7 +7943,7 @@ _08087132: thumb_func_start sub_8087138 sub_8087138: @ 8087138 push {lr} - ldr r0, _08087160 @ =gUnknown_2037AB8 + ldr r0, _08087160 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7960,7 +7960,7 @@ _0808715A: pop {r0} bx r0 .align 2, 0 -_08087160: .4byte gUnknown_2037AB8 +_08087160: .4byte gPaletteFade _08087164: .4byte sub_8086E40 thumb_func_end sub_8087138 @@ -8425,12 +8425,12 @@ _080874C4: .4byte gTasks sub_80874C8: @ 80874C8 push {r4-r6,lr} adds r6, r0, 0 - ldr r4, _080875B4 @ =gUnknown_2037078 + ldr r4, _080875B4 @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080875B8 @ =gUnknown_2036E38 + ldr r1, _080875B8 @ =gMapObjects adds r5, r0, r1 adds r0, r5, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -8531,8 +8531,8 @@ _080875AE: pop {r0} bx r0 .align 2, 0 -_080875B4: .4byte gUnknown_2037078 -_080875B8: .4byte gUnknown_2036E38 +_080875B4: .4byte gPlayerAvatar +_080875B8: .4byte gMapObjects _080875BC: .4byte gSprites _080875C0: .4byte gSaveBlock2Ptr _080875C4: .4byte sub_8087828 @@ -8561,12 +8561,12 @@ sub_80875C8: @ 80875C8 cmp r0, 0 bne _08087630 _080875F2: - ldr r0, _0808763C @ =gUnknown_2037078 + ldr r0, _0808763C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087640 @ =gUnknown_2036E38 + ldr r1, _08087640 @ =gMapObjects adds r0, r1 ldrb r0, [r0, 0x4] lsls r4, r0, 4 @@ -8597,8 +8597,8 @@ _08087630: bx r0 .align 2, 0 _08087638: .4byte gSprites -_0808763C: .4byte gUnknown_2037078 -_08087640: .4byte gUnknown_2036E38 +_0808763C: .4byte gPlayerAvatar +_08087640: .4byte gMapObjects thumb_func_end sub_80875C8 thumb_func_start sub_8087644 @@ -8610,7 +8610,7 @@ sub_8087644: @ 8087644 mov r0, sp movs r2, 0x24 bl memcpy - ldr r0, _08087690 @ =gUnknown_2037078 + ldr r0, _08087690 @ =gPlayerAvatar ldrb r0, [r0, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -8640,7 +8640,7 @@ _08087682: bx r0 .align 2, 0 _0808768C: .4byte gUnknown_83CC1F0 -_08087690: .4byte gUnknown_2037078 +_08087690: .4byte gPlayerAvatar _08087694: .4byte gSprites thumb_func_end sub_8087644 @@ -8653,12 +8653,12 @@ sub_8087698: @ 8087698 lsls r0, 24 cmp r0, 0 beq _080876FC - ldr r0, _08087704 @ =gUnknown_2037078 + ldr r0, _08087704 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r5, r0, 3 adds r5, r0 lsls r5, 2 - ldr r0, _08087708 @ =gUnknown_2036E38 + ldr r0, _08087708 @ =gMapObjects adds r5, r0 ldrb r0, [r5, 0x4] lsls r4, r0, 4 @@ -8697,8 +8697,8 @@ _080876FC: pop {r0} bx r0 .align 2, 0 -_08087704: .4byte gUnknown_2037078 -_08087708: .4byte gUnknown_2036E38 +_08087704: .4byte gPlayerAvatar +_08087708: .4byte gMapObjects _0808770C: .4byte gSprites thumb_func_end sub_8087698 @@ -8706,12 +8706,12 @@ _0808770C: .4byte gSprites sub_8087710: @ 8087710 push {r4,lr} adds r4, r0, 0 - ldr r0, _08087740 @ =gUnknown_2037078 + ldr r0, _08087740 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087744 @ =gUnknown_2036E38 + ldr r1, _08087744 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 @@ -8727,8 +8727,8 @@ _08087738: pop {r0} bx r0 .align 2, 0 -_08087740: .4byte gUnknown_2037078 -_08087744: .4byte gUnknown_2036E38 +_08087740: .4byte gPlayerAvatar +_08087744: .4byte gMapObjects thumb_func_end sub_8087710 thumb_func_start sub_8087748 @@ -8771,12 +8771,12 @@ fishE: @ 8087780 lsls r0, 16 cmp r0, 0 bne _080877EA - ldr r6, _080877F0 @ =gUnknown_2037078 + ldr r6, _080877F0 @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080877F4 @ =gUnknown_2036E38 + ldr r1, _080877F4 @ =gMapObjects adds r4, r0, r1 movs r7, 0 ldrh r1, [r5, 0x26] @@ -8815,8 +8815,8 @@ _080877EA: pop {r0} bx r0 .align 2, 0 -_080877F0: .4byte gUnknown_2037078 -_080877F4: .4byte gUnknown_2036E38 +_080877F0: .4byte gPlayerAvatar +_080877F4: .4byte gMapObjects _080877F8: .4byte sub_8087498 thumb_func_end fishE @@ -8991,7 +8991,7 @@ sub_8087924: @ 8087924 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080879C8 @ =gUnknown_2036E38 + ldr r0, _080879C8 @ =gMapObjects adds r4, r0 movs r0, 0x10 ldrsh r5, [r4, r0] @@ -9055,7 +9055,7 @@ _080879BA: bx r1 .align 2, 0 _080879C4: .4byte gUnknown_20386E0 -_080879C8: .4byte gUnknown_2036E38 +_080879C8: .4byte gMapObjects _080879CC: .4byte sub_80879D8 _080879D0: .4byte gTasks _080879D4: .4byte gSprites @@ -9148,7 +9148,7 @@ _08087A78: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08087AB0 @ =gUnknown_2036E38 + ldr r0, _08087AB0 @ =gMapObjects adds r4, r0 ldrh r0, [r5, 0x4] strh r0, [r6, 0x20] @@ -9169,7 +9169,7 @@ _08087AA8: pop {r0} bx r0 .align 2, 0 -_08087AB0: .4byte gUnknown_2036E38 +_08087AB0: .4byte gMapObjects thumb_func_end sub_80879D8 thumb_func_start sub_8087AB4 @@ -9381,7 +9381,7 @@ sub_8087C2C: @ 8087C2C asrs r0, 16 cmp r0, 0x78 ble _08087C9A - ldr r2, _08087CA4 @ =gUnknown_2036E38 + ldr r2, _08087CA4 @ =gMapObjects movs r1, 0x4 ldrsh r0, [r7, r1] lsls r1, r0, 3 @@ -9427,7 +9427,7 @@ _08087C9A: pop {r0} bx r0 .align 2, 0 -_08087CA4: .4byte gUnknown_2036E38 +_08087CA4: .4byte gMapObjects _08087CA8: .4byte gSprites _08087CAC: .4byte 0x0000ffff _08087CB0: .4byte 0x00007fff @@ -9439,7 +9439,7 @@ sub_8087CB4: @ 8087CB4 adds r4, r0, 0 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _08087CF4 @ =gUnknown_2037AB8 + ldr r0, _08087CF4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9464,7 +9464,7 @@ _08087CEE: pop {r0} bx r0 .align 2, 0 -_08087CF4: .4byte gUnknown_2037AB8 +_08087CF4: .4byte gPaletteFade _08087CF8: .4byte sub_8087B14 thumb_func_end sub_8087CB4 @@ -9616,7 +9616,7 @@ sub_8087E00: @ 8087E00 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08087E24 @ =gUnknown_2037AB8 + ldr r0, _08087E24 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9631,7 +9631,7 @@ _08087E1E: pop {r0} bx r0 .align 2, 0 -_08087E24: .4byte gUnknown_2037AB8 +_08087E24: .4byte gPaletteFade thumb_func_end sub_8087E00 thumb_func_start sub_8087E28 |