diff options
137 files changed, 4354 insertions, 6980 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index e93a714eb..b91c32c7d 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -228,7 +228,7 @@ sub_800F380: @ 800F380 movs r1, 0x22 movs r2, 0x10 bl sub_815001C - ldr r4, _0800F3F0 @ =gUnknown_20371F8 + ldr r4, _0800F3F0 @ =gPlttBufferUnfaded adds r0, r4, 0 adds r0, 0xB8 ldr r1, _0800F3F4 @ =0x00002529 @@ -242,7 +242,7 @@ sub_800F380: @ 800F380 adds r2, 0x2 ldr r1, _0800F3FC @ =0x0000675a strh r1, [r2] - ldr r5, _0800F400 @ =gUnknown_20376B0 + ldr r5, _0800F400 @ =gPlttBufferFaded + 0xB8 adds r1, r5, 0 movs r2, 0x4 bl CpuSet @@ -271,11 +271,11 @@ _0800F3EA: pop {r0} bx r0 .align 2, 0 -_0800F3F0: .4byte gUnknown_20371F8 +_0800F3F0: .4byte gPlttBufferUnfaded _0800F3F4: .4byte 0x00002529 _0800F3F8: .4byte 0x00007fff _0800F3FC: .4byte 0x0000675a -_0800F400: .4byte gUnknown_20376B0 +_0800F400: .4byte gPlttBufferFaded + 0xB8 _0800F404: .4byte gBattleTypeFlags _0800F408: .4byte 0x00010010 thumb_func_end sub_800F380 @@ -838,12 +838,12 @@ _0800F850: ldr r0, _0800F8CC @ =0x00002710 bl AllocSpritePalette lsls r0, 24 - ldr r2, _0800F8D0 @ =gUnknown_20371F8 + ldr r2, _0800F8D0 @ =gPlttBufferUnfaded lsrs r0, 19 ldr r3, _0800F8D4 @ =0x0000021e adds r0, r3 adds r2, r0, r2 - ldr r1, _0800F8D8 @ =gUnknown_20375F8 + ldr r1, _0800F8D8 @ =gPlttBufferFaded adds r0, r1 ldr r1, _0800F8DC @ =0x00007fff strh r1, [r0] @@ -895,9 +895,9 @@ _0800F850: b _0800FAC4 .align 2, 0 _0800F8CC: .4byte 0x00002710 -_0800F8D0: .4byte gUnknown_20371F8 +_0800F8D0: .4byte gPlttBufferUnfaded _0800F8D4: .4byte 0x0000021e -_0800F8D8: .4byte gUnknown_20375F8 +_0800F8D8: .4byte gPlttBufferFaded _0800F8DC: .4byte 0x00007fff _0800F8E0: .4byte gUnknown_82482E8 _0800F8E4: .4byte gBattleStruct diff --git a/asm/battle_2.s b/asm/battle_2.s index 92d797561..4daca575b 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -1620,7 +1620,7 @@ _08010AF0: .4byte gMain _08010AF4: .4byte gBattleTypeFlags _08010AF8: .4byte sub_80109C8 _08010AFC: - ldr r0, _08010B1C @ =gUnknown_2037AB8 + ldr r0, _08010B1C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1635,7 +1635,7 @@ _08010AFC: bl sub_800AB9C b _08010B82 .align 2, 0 -_08010B1C: .4byte gUnknown_2037AB8 +_08010B1C: .4byte gPaletteFade _08010B20: .4byte gUnknown_3003F3C _08010B24: bl sub_800AAC0 @@ -2439,7 +2439,7 @@ _080111B8: .4byte 0x00000439 CB2_QuitRecordedBattle: @ 80111BC push {lr} bl UpdatePaletteFade - ldr r0, _080111E4 @ =gUnknown_2037AB8 + ldr r0, _080111E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2454,7 +2454,7 @@ _080111DE: pop {r0} bx r0 .align 2, 0 -_080111E4: .4byte gUnknown_2037AB8 +_080111E4: .4byte gPaletteFade _080111E8: .4byte gMain thumb_func_end CB2_QuitRecordedBattle @@ -3726,7 +3726,7 @@ _08011C08: strb r0, [r4] b _08011C34 _08011C10: - ldr r0, _08011C3C @ =gUnknown_2037AB8 + ldr r0, _08011C3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3745,7 +3745,7 @@ _08011C34: pop {r0} bx r0 .align 2, 0 -_08011C3C: .4byte gUnknown_2037AB8 +_08011C3C: .4byte gPaletteFade _08011C40: .4byte gMain thumb_func_end sub_8011BB0 @@ -11485,7 +11485,7 @@ _08015A2C: .4byte gUnknown_2023D74 thumb_func_start sub_8015A30 sub_8015A30: @ 8015A30 push {lr} - ldr r0, _08015A58 @ =gUnknown_2037AB8 + ldr r0, _08015A58 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11505,7 +11505,7 @@ _08015A52: ldr r0, _08015A68 @ =ReturnFromBattleToOverworld b _08015A70 .align 2, 0 -_08015A58: .4byte gUnknown_2037AB8 +_08015A58: .4byte gPaletteFade _08015A5C: .4byte gUnknown_3004FD4 _08015A60: .4byte gUnknown_2023E8A _08015A64: .4byte gUnknown_3004F84 diff --git a/asm/battle_anim.s b/asm/battle_anim.s index 7f9d4d26e..085b11f09 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -1307,7 +1307,7 @@ _08072E5E: movs r0, 0x16 bl SetGpuReg lsls r4, r7, 5 - ldr r0, _08072F7C @ =gUnknown_20373F8 + ldr r0, _08072F7C @ =gPlttBufferUnfaded + 0x200 adds r4, r0 add r0, sp, 0x10 ldrb r1, [r0, 0x8] @@ -1353,7 +1353,7 @@ _08072F6C: .4byte gUnknown_2023D44 _08072F70: .4byte gUnknown_2022978 _08072F74: .4byte gSprites _08072F78: .4byte gUnknown_202297A -_08072F7C: .4byte gUnknown_20373F8 +_08072F7C: .4byte gPlttBufferUnfaded + 0x200 _08072F80: .4byte 0x04000008 _08072F84: ldr r1, _08073094 @ =0x06006000 @@ -1440,7 +1440,7 @@ _08072F84: movs r0, 0x1A bl SetGpuReg lsls r4, r7, 5 - ldr r0, _080730B4 @ =gUnknown_20373F8 + ldr r0, _080730B4 @ =gPlttBufferUnfaded + 0x200 adds r4, r0 adds r0, r4, 0 movs r1, 0x90 @@ -1487,7 +1487,7 @@ _080730A4: .4byte gUnknown_2023D44 _080730A8: .4byte gUnknown_202297C _080730AC: .4byte gSprites _080730B0: .4byte gUnknown_202297E -_080730B4: .4byte gUnknown_20373F8 +_080730B4: .4byte gPlttBufferUnfaded + 0x200 _080730B8: .4byte 0x05000120 _080730BC: .4byte 0x04000008 thumb_func_end sub_8072E48 @@ -1640,7 +1640,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174 adds r0, r5 strh r0, [r1] lsls r0, r6, 5 - ldr r2, _08073200 @ =gUnknown_20377F8 + ldr r2, _08073200 @ =gPlttBufferFaded + 0x200 adds r0, r2 mov r1, sp ldrb r1, [r1, 0x8] @@ -1656,7 +1656,7 @@ _080731F0: .4byte gTasks _080731F4: .4byte gSprites _080731F8: .4byte gUnknown_2022978 _080731FC: .4byte gUnknown_202297A -_08073200: .4byte gUnknown_20377F8 +_08073200: .4byte gPlttBufferFaded + 0x200 _08073204: .4byte 0xfffffe00 _08073208: .4byte 0x04000008 _0807320C: @@ -1673,7 +1673,7 @@ _0807320C: adds r0, r5 strh r0, [r1] lsls r0, r6, 5 - ldr r1, _08073244 @ =gUnknown_20377F8 + ldr r1, _08073244 @ =gPlttBufferFaded + 0x200 adds r0, r1 subs r1, 0xE0 ldr r2, _08073248 @ =0x04000008 @@ -1686,7 +1686,7 @@ _08073232: .align 2, 0 _0807323C: .4byte gUnknown_202297C _08073240: .4byte gUnknown_202297E -_08073244: .4byte gUnknown_20377F8 +_08073244: .4byte gPlttBufferFaded + 0x200 _08073248: .4byte 0x04000008 thumb_func_end task_pA_ma0A_obj_to_bg_pal @@ -2536,7 +2536,7 @@ sub_8073850: @ 8073850 .align 2, 0 _08073884: .4byte gTasks _08073888: - ldr r2, _080738A4 @ =gUnknown_2037AB8 + ldr r2, _080738A4 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -2551,7 +2551,7 @@ _08073888: strb r0, [r1] b _080738F0 .align 2, 0 -_080738A4: .4byte gUnknown_2037AB8 +_080738A4: .4byte gPaletteFade _080738A8: .4byte gUnknown_2037F17 _080738AC: cmp r3, 0x2 diff --git a/asm/battle_anim_8074480.s b/asm/battle_anim_8074480.s index 1881e7a8f..b900ba15a 100644 --- a/asm/battle_anim_8074480.s +++ b/asm/battle_anim_8074480.s @@ -3149,8 +3149,8 @@ sub_8075B48: @ 8075B48 lsrs r0, 16 cmp r1, 0 bne _08075BC4 - ldr r2, _08075BB8 @ =gUnknown_20371F8 - ldr r1, _08075BBC @ =gUnknown_20375F8 + ldr r2, _08075BB8 @ =gPlttBufferUnfaded + ldr r1, _08075BBC @ =gPlttBufferFaded lsls r0, 1 adds r4, r0, r1 adds r5, r0, r2 @@ -3200,14 +3200,14 @@ _08075B60: bge _08075B60 b _08075BD4 .align 2, 0 -_08075BB8: .4byte gUnknown_20371F8 -_08075BBC: .4byte gUnknown_20375F8 +_08075BB8: .4byte gPlttBufferUnfaded +_08075BBC: .4byte gPlttBufferFaded _08075BC0: .4byte 0xfffffc1f _08075BC4: lsls r1, r0, 1 - ldr r0, _08075BDC @ =gUnknown_20371F8 + ldr r0, _08075BDC @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _08075BE0 @ =gUnknown_20375F8 + ldr r2, _08075BE0 @ =gPlttBufferFaded adds r1, r2 ldr r2, _08075BE4 @ =0x04000008 bl CpuSet @@ -3216,8 +3216,8 @@ _08075BD4: pop {r0} bx r0 .align 2, 0 -_08075BDC: .4byte gUnknown_20371F8 -_08075BE0: .4byte gUnknown_20375F8 +_08075BDC: .4byte gPlttBufferUnfaded +_08075BE0: .4byte gPlttBufferFaded _08075BE4: .4byte 0x04000008 thumb_func_end sub_8075B48 @@ -5967,10 +5967,10 @@ _080770D4: _080770D6: strh r0, [r5, 0x14] lsls r0, r4, 1 - ldr r1, _08077104 @ =gUnknown_20371F8 + ldr r1, _08077104 @ =gPlttBufferUnfaded adds r0, r1 lsls r1, r6, 1 - ldr r2, _08077108 @ =gUnknown_20375F8 + ldr r2, _08077108 @ =gPlttBufferFaded adds r1, r2 ldr r2, _0807710C @ =0x04000008 bl CpuSet @@ -5986,8 +5986,8 @@ _080770D6: pop {r0} bx r0 .align 2, 0 -_08077104: .4byte gUnknown_20371F8 -_08077108: .4byte gUnknown_20375F8 +_08077104: .4byte gPlttBufferUnfaded +_08077108: .4byte gPlttBufferFaded _0807710C: .4byte 0x04000008 _08077110: .4byte gUnknown_2037F02 _08077114: .4byte sub_8077118 diff --git a/asm/battle_anim_8078178.s b/asm/battle_anim_8078178.s index e4f15971d..1080351b3 100644 --- a/asm/battle_anim_8078178.s +++ b/asm/battle_anim_8078178.s @@ -505,7 +505,7 @@ sub_8078528: @ 8078528 asrs r0, 16 cmp r0, 0x3 bne _080785B8 - ldr r3, _080785C8 @ =gUnknown_20375F8 + ldr r3, _080785C8 @ =gPlttBufferFaded lsls r2, 4 mov r12, r2 ldr r1, _080785CC @ =0x0000010d @@ -555,7 +555,7 @@ _080785B8: .align 2, 0 _080785C0: .4byte 0x0000271a _080785C4: .4byte gTasks -_080785C8: .4byte gUnknown_20375F8 +_080785C8: .4byte gPlttBufferFaded _080785CC: .4byte 0x0000010d _080785D0: .4byte 0x0000010f _080785D4: .4byte sub_80785D8 diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index 2c5feb2f1..2a178832f 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -5084,7 +5084,7 @@ sub_80A49D4: @ 80A49D4 ble _080A4A32 movs r0, 0 strh r0, [r4, 0x30] - ldr r1, _080A4A7C @ =gUnknown_20375F8 + ldr r1, _080A4A7C @ =gPlttBufferFaded movs r2, 0x32 ldrsh r0, [r4, r2] adds r0, 0x1 @@ -5153,7 +5153,7 @@ _080A4A6C: strh r0, [r4, 0x2E] b _080A4AC2 .align 2, 0 -_080A4A7C: .4byte gUnknown_20375F8 +_080A4A7C: .4byte gPlttBufferFaded _080A4A80: ldrh r0, [r4, 0x3A] adds r0, 0x1 @@ -6117,7 +6117,7 @@ _080A51A4: ldrb r1, [r4, 0x5] lsrs r1, 4 lsls r0, r1, 5 - ldr r2, _080A5204 @ =gUnknown_2037408 + ldr r2, _080A5204 @ =gPlttBufferUnfaded + 0x210 adds r0, r2 lsls r1, 4 ldr r3, _080A5208 @ =0x00000101 @@ -6135,7 +6135,7 @@ _080A51A4: b _080A5214 .align 2, 0 _080A5200: .4byte 0x00007fff -_080A5204: .4byte gUnknown_2037408 +_080A5204: .4byte gPlttBufferUnfaded + 0x210 _080A5208: .4byte 0x00000101 _080A520C: cmp r0, 0 @@ -8192,7 +8192,7 @@ _080A614C: cmp r0, 0 beq _080A6178 movs r1, 0x1 - ldr r2, _080A6190 @ =gUnknown_20375F8 + ldr r2, _080A6190 @ =gPlttBufferFaded _080A6164: adds r0, r3, r1 lsls r0, 1 @@ -8216,9 +8216,9 @@ _080A6178: b _080A6232 .align 2, 0 _080A618C: .4byte 0x00007fbb -_080A6190: .4byte gUnknown_20375F8 +_080A6190: .4byte gPlttBufferFaded _080A6194: - ldr r0, _080A61DC @ =gUnknown_2037AB8 + ldr r0, _080A61DC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -8257,7 +8257,7 @@ _080A61CA: strh r0, [r4, 0xA] b _080A6214 .align 2, 0 -_080A61DC: .4byte gUnknown_2037AB8 +_080A61DC: .4byte gPaletteFade _080A61E0: .4byte gSprites _080A61E4: .4byte gUnknown_83E3734 _080A61E8: .4byte gUnknown_83E3764 @@ -8288,7 +8288,7 @@ _080A6214: .align 2, 0 _080A621C: .4byte 0x00007fbb _080A6220: - ldr r0, _080A6240 @ =gUnknown_2037AB8 + ldr r0, _080A6240 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -8304,7 +8304,7 @@ _080A6232: pop {r0} bx r0 .align 2, 0 -_080A6240: .4byte gUnknown_2037AB8 +_080A6240: .4byte gPaletteFade thumb_func_end sub_80A60A8 thumb_func_start sub_80A6244 @@ -8534,7 +8534,7 @@ sub_80A63B4: @ 80A63B4 adds r0, 0x10 lsls r4, r0, 4 movs r5, 0x1 - ldr r2, _080A6450 @ =gUnknown_20371F8 + ldr r2, _080A6450 @ =gPlttBufferUnfaded _080A640C: adds r1, r3, r5 lsls r1, 1 @@ -8566,7 +8566,7 @@ _080A640C: _080A6444: .4byte gTasks _080A6448: .4byte 0x00002771 _080A644C: .4byte gSprites -_080A6450: .4byte gUnknown_20371F8 +_080A6450: .4byte gPlttBufferUnfaded _080A6454: lsls r2, r0, 4 adds r2, r0 @@ -8796,7 +8796,7 @@ sub_80A65E8: @ 80A65E8 adds r0, r1 lsrs r3, r0, 16 movs r2, 0x1 - ldr r5, _080A669C @ =gUnknown_20375F8 + ldr r5, _080A669C @ =gPlttBufferFaded _080A6614: adds r1, r3, r2 lsls r1, 1 @@ -8834,7 +8834,7 @@ _080A6632: adds r0, r1 lsrs r3, r0, 16 movs r2, 0x1 - ldr r7, _080A669C @ =gUnknown_20375F8 + ldr r7, _080A669C @ =gPlttBufferFaded ldr r6, _080A6698 @ =gUnknown_83E3898 adds r4, r5, 0 _080A6660: @@ -8867,7 +8867,7 @@ _080A667A: bx r0 .align 2, 0 _080A6698: .4byte gUnknown_83E3898 -_080A669C: .4byte gUnknown_20375F8 +_080A669C: .4byte gPlttBufferFaded thumb_func_end sub_80A65E8 thumb_func_start sub_80A66A0 @@ -11414,7 +11414,7 @@ sub_80A7A18: @ 80A7A18 movs r0, 0 strh r0, [r4, 0x30] ldrh r5, [r4, 0x2E] - ldr r1, _080A7A84 @ =gUnknown_20375F8 + ldr r1, _080A7A84 @ =gPlttBufferFaded adds r0, r5, 0 adds r0, 0x8 lsls r0, 1 @@ -11457,7 +11457,7 @@ _080A7A7C: pop {r0} bx r0 .align 2, 0 -_080A7A84: .4byte gUnknown_20375F8 +_080A7A84: .4byte gPlttBufferFaded thumb_func_end sub_80A7A18 thumb_func_start sub_80A7A88 @@ -18331,7 +18331,7 @@ sub_80AAFA4: @ 80AAFA4 adds r0, 0x1 lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _080AB020 @ =gUnknown_20375F8 + ldr r1, _080AB020 @ =gPlttBufferFaded lsls r0, r5, 1 adds r0, r1 ldrh r6, [r0] @@ -18373,7 +18373,7 @@ _080AB016: bx r0 .align 2, 0 _080AB01C: .4byte gTasks -_080AB020: .4byte gUnknown_20375F8 +_080AB020: .4byte gPlttBufferFaded thumb_func_end sub_80AAFA4 thumb_func_start sub_80AB024 @@ -19110,7 +19110,7 @@ sub_80AB5C8: @ 80AB5C8 asrs r0, 16 cmp r0, 0x4 bne _080AB65C - ldr r1, _080AB700 @ =gUnknown_20375F8 + ldr r1, _080AB700 @ =gPlttBufferFaded mov r0, sp ldrb r0, [r0, 0x8] lsls r0, 4 @@ -19236,7 +19236,7 @@ _080AB6EC: _080AB6F4: .4byte gUnknown_2022978 _080AB6F8: .4byte gUnknown_202297A _080AB6FC: .4byte gTasks -_080AB700: .4byte gUnknown_20375F8 +_080AB700: .4byte gPlttBufferFaded _080AB704: .4byte sub_80AB708 thumb_func_end sub_80AB5C8 @@ -32037,7 +32037,7 @@ sub_80B198C: @ 80B198C movs r0, 0 strh r0, [r3, 0x1C] ldrb r0, [r3, 0xC] - ldr r2, _080B1A10 @ =gUnknown_20375F8 + ldr r2, _080B1A10 @ =gPlttBufferFaded lsls r0, 4 movs r3, 0x84 lsls r3, 1 @@ -32083,7 +32083,7 @@ _080B1A04: bx r0 .align 2, 0 _080B1A0C: .4byte gTasks -_080B1A10: .4byte gUnknown_20375F8 +_080B1A10: .4byte gPlttBufferFaded _080B1A14: .4byte 0x00000107 _080B1A18: .4byte 0x00000101 thumb_func_end sub_80B198C @@ -35026,7 +35026,7 @@ sub_80B3044: @ 80B3044 movs r0, 0 strh r0, [r3, 0x30] ldrh r4, [r3, 0x2E] - ldr r1, _080B30A8 @ =gUnknown_20375F8 + ldr r1, _080B30A8 @ =gPlttBufferFaded adds r0, r4, 0 adds r0, 0x8 lsls r0, 1 @@ -35067,7 +35067,7 @@ _080B30A2: pop {r0} bx r0 .align 2, 0 -_080B30A8: .4byte gUnknown_20375F8 +_080B30A8: .4byte gPlttBufferFaded _080B30AC: .4byte sub_80B30B0 thumb_func_end sub_80B3044 @@ -40643,12 +40643,12 @@ _080B5C2C: movs r2, 0x10 ldrsh r0, [r5, r2] lsls r0, 1 - ldr r1, _080B5C60 @ =gUnknown_20371F8 + ldr r1, _080B5C60 @ =gPlttBufferUnfaded adds r0, r1 movs r2, 0x24 ldrsh r1, [r5, r2] lsls r1, 1 - ldr r2, _080B5C64 @ =gUnknown_20375F8 + ldr r2, _080B5C64 @ =gPlttBufferFaded adds r1, r2 ldr r2, _080B5C68 @ =0x04000008 bl CpuSet @@ -40659,8 +40659,8 @@ _080B5C2C: bl BlendPalette b _080B5D22 .align 2, 0 -_080B5C60: .4byte gUnknown_20371F8 -_080B5C64: .4byte gUnknown_20375F8 +_080B5C60: .4byte gPlttBufferUnfaded +_080B5C64: .4byte gPlttBufferFaded _080B5C68: .4byte 0x04000008 _080B5C6C: .4byte 0x00003c0d _080B5C70: @@ -41851,7 +41851,7 @@ sub_80B65F0: @ 80B65F0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080B663C @ =gUnknown_2037AB8 + ldr r0, _080B663C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -41883,7 +41883,7 @@ _080B6636: pop {r0} bx r0 .align 2, 0 -_080B663C: .4byte gUnknown_2037AB8 +_080B663C: .4byte gPaletteFade _080B6640: .4byte gUnknown_2022984 _080B6644: .4byte gUnknown_2022986 _080B6648: .4byte 0x00003f3f @@ -48522,7 +48522,7 @@ sub_80B9A14: @ 80B9A14 sub_80B9A5C: @ 80B9A5C push {lr} adds r2, r0, 0 - ldr r0, _080B9A78 @ =gUnknown_2037AB8 + ldr r0, _080B9A78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48534,7 +48534,7 @@ _080B9A72: pop {r0} bx r0 .align 2, 0 -_080B9A78: .4byte gUnknown_2037AB8 +_080B9A78: .4byte gPaletteFade thumb_func_end sub_80B9A5C thumb_func_start sub_80B9A7C @@ -48592,7 +48592,7 @@ sub_80B9AD0: @ 80B9AD0 strh r0, [r4, 0x2E] b _080B9B54 _080B9AE4: - ldr r0, _080B9B00 @ =gUnknown_2037AB8 + ldr r0, _080B9B00 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48606,7 +48606,7 @@ _080B9AE4: str r0, [r4, 0x1C] b _080B9B54 .align 2, 0 -_080B9B00: .4byte gUnknown_2037AB8 +_080B9B00: .4byte gPaletteFade _080B9B04: .4byte sub_80B9B5C _080B9B08: movs r2, 0x3C @@ -48656,7 +48656,7 @@ _080B9B54: sub_80B9B5C: @ 80B9B5C push {r4,lr} adds r4, r0, 0 - ldr r0, _080B9B88 @ =gUnknown_2037AB8 + ldr r0, _080B9B88 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48675,7 +48675,7 @@ _080B9B82: pop {r0} bx r0 .align 2, 0 -_080B9B88: .4byte gUnknown_2037AB8 +_080B9B88: .4byte gPaletteFade thumb_func_end sub_80B9B5C thumb_func_start sub_80B9B8C @@ -48806,7 +48806,7 @@ sub_80B9C7C: @ 80B9C7C lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _080B9CB4 @ =gUnknown_2037AB8 + ldr r0, _080B9CB4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -48831,7 +48831,7 @@ sub_80B9C7C: @ 80B9C7C ldrb r2, [r3, 0x10] b _080B9CC0 .align 2, 0 -_080B9CB4: .4byte gUnknown_2037AB8 +_080B9CB4: .4byte gPaletteFade _080B9CB8: .4byte gTasks _080B9CBC: ldrb r1, [r3, 0x10] @@ -49001,7 +49001,7 @@ sub_80B9DF0: @ 80B9DF0 lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _080B9E28 @ =gUnknown_2037AB8 + ldr r0, _080B9E28 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49026,7 +49026,7 @@ sub_80B9DF0: @ 80B9DF0 ldrb r2, [r3, 0x10] b _080B9E34 .align 2, 0 -_080B9E28: .4byte gUnknown_2037AB8 +_080B9E28: .4byte gPaletteFade _080B9E2C: .4byte gTasks _080B9E30: ldrb r1, [r3, 0x10] @@ -49146,7 +49146,7 @@ sub_80B9F04: @ 80B9F04 lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _080B9F3C @ =gUnknown_2037AB8 + ldr r0, _080B9F3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49171,7 +49171,7 @@ sub_80B9F04: @ 80B9F04 ldrb r2, [r3, 0x10] b _080B9F48 .align 2, 0 -_080B9F3C: .4byte gUnknown_2037AB8 +_080B9F3C: .4byte gPaletteFade _080B9F40: .4byte gTasks _080B9F44: ldrb r1, [r3, 0x10] @@ -49274,7 +49274,7 @@ sub_80B9FD8: @ 80B9FD8 .align 2, 0 _080B9FFC: .4byte gTasks _080BA000: - ldr r0, _080BA01C @ =gUnknown_2037AB8 + ldr r0, _080BA01C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49288,7 +49288,7 @@ _080BA000: str r0, [r4] b _080BA084 .align 2, 0 -_080BA01C: .4byte gUnknown_2037AB8 +_080BA01C: .4byte gPaletteFade _080BA020: .4byte sub_80BA090 _080BA024: ldrh r0, [r4, 0x16] @@ -49353,7 +49353,7 @@ sub_80BA090: @ 80BA090 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BA0E0 @ =gUnknown_2037AB8 + ldr r0, _080BA0E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -49387,7 +49387,7 @@ _080BA0D6: pop {r0} bx r0 .align 2, 0 -_080BA0E0: .4byte gUnknown_2037AB8 +_080BA0E0: .4byte gPaletteFade _080BA0E4: .4byte gTasks thumb_func_end sub_80BA090 @@ -50765,7 +50765,7 @@ sub_80BAB78: @ 80BAB78 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BAB94 @ =gUnknown_2037AB8 + ldr r0, _080BAB94 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -50777,7 +50777,7 @@ _080BAB90: pop {r0} bx r0 .align 2, 0 -_080BAB94: .4byte gUnknown_2037AB8 +_080BAB94: .4byte gPaletteFade thumb_func_end sub_80BAB78 thumb_func_start sub_80BAB98 @@ -52261,7 +52261,7 @@ _080BB79A: adds r0, 0x10 cmp r2, r0 bge _080BB7C6 - ldr r1, _080BB7D8 @ =gUnknown_20375F8 + ldr r1, _080BB7D8 @ =gPlttBufferFaded adds r3, r0, 0 _080BB7B6: lsls r0, r2, 1 @@ -52282,7 +52282,7 @@ _080BB7C6: pop {r0} bx r0 .align 2, 0 -_080BB7D8: .4byte gUnknown_20375F8 +_080BB7D8: .4byte gPlttBufferFaded thumb_func_end sub_80BB790 thumb_func_start sub_80BB7DC @@ -53173,7 +53173,7 @@ _080BBEC8: lsls r0, 5 adds r0, r1 lsls r1, r4, 5 - ldr r2, _080BBF04 @ =gUnknown_20371F8 + ldr r2, _080BBF04 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x20 bl memcpy @@ -53187,7 +53187,7 @@ _080BBEC8: _080BBEF8: .4byte gUnknown_2037F1B _080BBEFC: .4byte gMonSpritesGfxPtr _080BBF00: .4byte gUnknown_2037F02 -_080BBF04: .4byte gUnknown_20371F8 +_080BBF04: .4byte gPlttBufferUnfaded thumb_func_end sub_80BBE6C thumb_func_start sub_80BBF08 @@ -53243,7 +53243,7 @@ _080BBF5E: adds r4, 0x10 _080BBF64: lsls r0, r4, 5 - ldr r1, _080BBF98 @ =gUnknown_20371F8 + ldr r1, _080BBF98 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, _080BBF9C @ =gMonSpritesGfxPtr ldr r2, [r1] @@ -53266,7 +53266,7 @@ _080BBF64: bx r0 .align 2, 0 _080BBF94: .4byte gUnknown_2037F1B -_080BBF98: .4byte gUnknown_20371F8 +_080BBF98: .4byte gPlttBufferUnfaded _080BBF9C: .4byte gMonSpritesGfxPtr _080BBFA0: .4byte gUnknown_2037F02 thumb_func_end sub_80BBF08 @@ -53324,9 +53324,9 @@ _080BBFFA: adds r4, 0x10 _080BC000: lsls r1, r4, 5 - ldr r0, _080BC024 @ =gUnknown_20371F8 + ldr r0, _080BC024 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _080BC028 @ =gUnknown_20375F8 + ldr r2, _080BC028 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x20 bl memcpy @@ -53338,8 +53338,8 @@ _080BC000: bx r0 .align 2, 0 _080BC020: .4byte gUnknown_2037F1B -_080BC024: .4byte gUnknown_20371F8 -_080BC028: .4byte gUnknown_20375F8 +_080BC024: .4byte gPlttBufferUnfaded +_080BC028: .4byte gPlttBufferFaded thumb_func_end sub_80BBFA4 thumb_func_start sub_80BC02C diff --git a/asm/battle_anim_80DE2C0.s b/asm/battle_anim_80DE2C0.s index 9b56509a2..55f77ef92 100644 --- a/asm/battle_anim_80DE2C0.s +++ b/asm/battle_anim_80DE2C0.s @@ -606,7 +606,7 @@ sub_80DE718: @ 80DE718 asrs r0, 16 cmp r0, 0x4 bne _080DE788 - ldr r0, _080DE7A8 @ =gUnknown_20375F8 + ldr r0, _080DE7A8 @ =gPlttBufferFaded lsls r2, r6, 4 adds r1, r2, 0 adds r1, 0xB @@ -658,7 +658,7 @@ _080DE798: bx r0 .align 2, 0 _080DE7A4: .4byte gTasks -_080DE7A8: .4byte gUnknown_20375F8 +_080DE7A8: .4byte gPlttBufferFaded _080DE7AC: .4byte gUnknown_2037F02 _080DE7B0: .4byte 0x0000ffff thumb_func_end sub_80DE718 @@ -711,7 +711,7 @@ sub_80DE7DC: @ 80DE7DC asrs r0, 16 cmp r0, 0x4 bne _080DE87E - ldr r0, _080DE8A0 @ =gUnknown_20375F8 + ldr r0, _080DE8A0 @ =gPlttBufferFaded lsls r2, r7, 4 adds r1, r2, 0 adds r1, 0xB @@ -722,7 +722,7 @@ sub_80DE7DC: @ 80DE7DC mov r10, r3 mov r9, r0 adds r5, r2, 0 - ldr r2, _080DE8A4 @ =gUnknown_20371F8 + ldr r2, _080DE8A4 @ =gPlttBufferUnfaded mov r12, r2 lsls r0, r7, 5 add r0, r9 @@ -787,8 +787,8 @@ _080DE88E: bx r0 .align 2, 0 _080DE89C: .4byte gTasks -_080DE8A0: .4byte gUnknown_20375F8 -_080DE8A4: .4byte gUnknown_20371F8 +_080DE8A0: .4byte gPlttBufferFaded +_080DE8A4: .4byte gPlttBufferUnfaded _080DE8A8: .4byte gUnknown_2037F02 _080DE8AC: .4byte 0x0000ffff thumb_func_end sub_80DE7DC diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index bb6d8d8d8..170bb06dc 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -495,7 +495,7 @@ sub_80EEFC8: @ 80EEFC8 lsls r4, 4 orrs r4, r3 lsls r0, 1 - ldr r1, _080EF0B0 @ =gUnknown_20371F8 + ldr r1, _080EF0B0 @ =gPlttBufferUnfaded mov r8, r1 add r0, r8 mov r2, r9 @@ -557,7 +557,7 @@ _080EF0A0: .4byte gUnknown_3004FF0 _080EF0A4: .4byte gSprites _080EF0A8: .4byte 0x0000d709 _080EF0AC: .4byte 0x0000d70a -_080EF0B0: .4byte gUnknown_20371F8 +_080EF0B0: .4byte gPlttBufferUnfaded thumb_func_end sub_80EEFC8 thumb_func_start sub_80EF0B4 @@ -2684,7 +2684,7 @@ _080F014E: strh r0, [r4, 0x2E] b _080F017C _080F0156: - ldr r0, _080F0184 @ =gUnknown_2037AB8 + ldr r0, _080F0184 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2707,7 +2707,7 @@ _080F017C: pop {r0} bx r0 .align 2, 0 -_080F0184: .4byte gUnknown_2037AB8 +_080F0184: .4byte gPaletteFade _080F0188: .4byte sub_80F018C thumb_func_end sub_80F00A4 @@ -4953,7 +4953,7 @@ sub_80F12E0: @ 80F12E0 _080F1330: .4byte gTasks _080F1334: .4byte gUnknown_840C1C4 _080F1338: - ldr r0, _080F1368 @ =gUnknown_2037AB8 + ldr r0, _080F1368 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4977,7 +4977,7 @@ _080F1360: pop {r0} bx r0 .align 2, 0 -_080F1368: .4byte gUnknown_2037AB8 +_080F1368: .4byte gPaletteFade _080F136C: .4byte 0x00007fff thumb_func_end sub_80F12E0 @@ -4987,7 +4987,7 @@ sub_80F1370: @ 80F1370 sub sp, 0x4 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F13B0 @ =gUnknown_2037AB8 + ldr r0, _080F13B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5016,7 +5016,7 @@ _080F13A8: pop {r0} bx r0 .align 2, 0 -_080F13B0: .4byte gUnknown_2037AB8 +_080F13B0: .4byte gPaletteFade _080F13B4: .4byte gTasks _080F13B8: .4byte 0x00007fff _080F13BC: .4byte sub_80F13C0 diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s index 16fb18cdf..94a49dd4e 100644 --- a/asm/battle_controller_oak.s +++ b/asm/battle_controller_oak.s @@ -464,7 +464,7 @@ _080E792A: thumb_func_start sub_80E7930 sub_80E7930: @ 80E7930 push {lr} - ldr r0, _080E7960 @ =gUnknown_2037AB8 + ldr r0, _080E7960 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -487,7 +487,7 @@ _080E795A: pop {r0} bx r0 .align 2, 0 -_080E7960: .4byte gUnknown_2037AB8 +_080E7960: .4byte gPaletteFade _080E7964: .4byte gMain _080E7968: .4byte 0x00000439 _080E796C: .4byte gUnknown_3004F80 @@ -536,7 +536,7 @@ _080E79B4: .4byte gActiveBattler thumb_func_start sub_80E79B8 sub_80E79B8: @ 80E79B8 push {r4,lr} - ldr r0, _080E79FC @ =gUnknown_2037AB8 + ldr r0, _080E79FC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -568,7 +568,7 @@ _080E79F6: pop {r0} bx r0 .align 2, 0 -_080E79FC: .4byte gUnknown_2037AB8 +_080E79FC: .4byte gPaletteFade _080E7A00: .4byte gUnknown_3004FE0 _080E7A04: .4byte gActiveBattler _080E7A08: .4byte sub_80E7A14 @@ -584,7 +584,7 @@ sub_80E7A14: @ 80E7A14 ldr r0, _080E7A48 @ =sub_8011100 cmp r1, r0 bne _080E7A6A - ldr r0, _080E7A4C @ =gUnknown_2037AB8 + ldr r0, _080E7A4C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -603,7 +603,7 @@ sub_80E7A14: @ 80E7A14 .align 2, 0 _080E7A44: .4byte gMain _080E7A48: .4byte sub_8011100 -_080E7A4C: .4byte gUnknown_2037AB8 +_080E7A4C: .4byte gPaletteFade _080E7A50: .4byte gUnknown_203B0C0 _080E7A54: .4byte gUnknown_203B0C1 _080E7A58: .4byte gUnknown_203B0DC @@ -622,7 +622,7 @@ _080E7A6A: thumb_func_start sub_80E7A70 sub_80E7A70: @ 80E7A70 push {lr} - ldr r0, _080E7AA8 @ =gUnknown_2037AB8 + ldr r0, _080E7AA8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -646,7 +646,7 @@ sub_80E7A70: @ 80E7A70 bl sub_8107ECC b _080E7AC0 .align 2, 0 -_080E7AA8: .4byte gUnknown_2037AB8 +_080E7AA8: .4byte gPaletteFade _080E7AAC: .4byte gUnknown_3004FE0 _080E7AB0: .4byte gActiveBattler _080E7AB4: .4byte sub_80E7AC4 @@ -666,7 +666,7 @@ sub_80E7AC4: @ 80E7AC4 ldr r0, _080E7B18 @ =sub_8011100 cmp r1, r0 bne _080E7B42 - ldr r0, _080E7B1C @ =gUnknown_2037AB8 + ldr r0, _080E7B1C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -700,7 +700,7 @@ sub_80E7AC4: @ 80E7AC4 .align 2, 0 _080E7B14: .4byte gMain _080E7B18: .4byte sub_8011100 -_080E7B1C: .4byte gUnknown_2037AB8 +_080E7B1C: .4byte gPaletteFade _080E7B20: .4byte gUnknown_203AD30 _080E7B24: .4byte gBattleTypeFlags _080E7B28: .4byte gUnknown_3004FE0 @@ -1731,7 +1731,7 @@ _080E8384: .4byte _080E8500 .4byte _080E8530 _080E83A8: - ldr r0, _080E83EC @ =gUnknown_2037AB8 + ldr r0, _080E83EC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1763,9 +1763,9 @@ _080E83BA: ldr r1, [r7] b _080E8522 .align 2, 0 -_080E83EC: .4byte gUnknown_2037AB8 +_080E83EC: .4byte gPaletteFade _080E83F0: - ldr r0, _080E8404 @ =gUnknown_2037AB8 + ldr r0, _080E8404 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1776,7 +1776,7 @@ _080E83FE: bl sub_80EB30C b _080E851E .align 2, 0 -_080E8404: .4byte gUnknown_2037AB8 +_080E8404: .4byte gPaletteFade _080E8408: ldr r0, _080E8418 @ =gUnknown_83FDAE2 bl BattleStringExpandPlaceholdersToDisplayedString @@ -1823,7 +1823,7 @@ _080E8430: _080E8460: .4byte gBitTable _080E8464: .4byte gBattleStruct _080E8468: - ldr r0, _080E8484 @ =gUnknown_2037AB8 + ldr r0, _080E8484 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1836,7 +1836,7 @@ _080E8468: bl sub_80D87BC b _080E851E .align 2, 0 -_080E8484: .4byte gUnknown_2037AB8 +_080E8484: .4byte gPaletteFade _080E8488: .4byte gUnknown_83FDB92 _080E848C: .4byte gDisplayedStringBattle _080E8490: @@ -1873,7 +1873,7 @@ _080E8490: _080E84D0: .4byte gBitTable _080E84D4: .4byte gBattleStruct _080E84D8: - ldr r0, _080E84F4 @ =gUnknown_2037AB8 + ldr r0, _080E84F4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1886,7 +1886,7 @@ _080E84D8: bl sub_80D87BC b _080E851E .align 2, 0 -_080E84F4: .4byte gUnknown_2037AB8 +_080E84F4: .4byte gPaletteFade _080E84F8: .4byte gUnknown_83FDBEF _080E84FC: .4byte gDisplayedStringBattle _080E8500: @@ -1915,7 +1915,7 @@ _080E8522: .align 2, 0 _080E852C: .4byte gBattleStruct _080E8530: - ldr r0, _080E8568 @ =gUnknown_2037AB8 + ldr r0, _080E8568 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1940,7 +1940,7 @@ _080E855E: pop {r0} bx r0 .align 2, 0 -_080E8568: .4byte gUnknown_2037AB8 +_080E8568: .4byte gPaletteFade _080E856C: .4byte gBattleStruct thumb_func_end sub_80E835C @@ -2070,7 +2070,7 @@ _080E8634: ldr r1, [r5] b _080E86A6 _080E865A: - ldr r0, _080E866C @ =gUnknown_2037AB8 + ldr r0, _080E866C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2079,7 +2079,7 @@ _080E865A: bl sub_80EB30C b _080E86A2 .align 2, 0 -_080E866C: .4byte gUnknown_2037AB8 +_080E866C: .4byte gPaletteFade _080E8670: adds r0, r2, 0 bl BattleStringExpandPlaceholdersToDisplayedString @@ -2115,7 +2115,7 @@ _080E86A6: .align 2, 0 _080E86B0: .4byte gBattleStruct _080E86B4: - ldr r0, _080E86D8 @ =gUnknown_2037AB8 + ldr r0, _080E86D8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2131,7 +2131,7 @@ _080E86B4: bl WallyBufferExecCompleted b _080E86E4 .align 2, 0 -_080E86D8: .4byte gUnknown_2037AB8 +_080E86D8: .4byte gPaletteFade _080E86DC: .4byte gActiveBattler _080E86E0: bl OpponentBufferExecCompleted @@ -2184,7 +2184,7 @@ _080E872C: .4byte _080E8848 .4byte _080E8880 _080E8748: - ldr r0, _080E8780 @ =gUnknown_2037AB8 + ldr r0, _080E8780 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2211,10 +2211,10 @@ _080E875A: ldr r1, [r5] b _080E886C .align 2, 0 -_080E8780: .4byte gUnknown_2037AB8 +_080E8780: .4byte gPaletteFade _080E8784: .4byte gActiveBattler _080E8788: - ldr r0, _080E87C8 @ =gUnknown_2037AB8 + ldr r0, _080E87C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2247,10 +2247,10 @@ _080E879A: ldr r1, [r5] b _080E886C .align 2, 0 -_080E87C8: .4byte gUnknown_2037AB8 +_080E87C8: .4byte gPaletteFade _080E87CC: .4byte gBitTable _080E87D0: - ldr r0, _080E87E4 @ =gUnknown_2037AB8 + ldr r0, _080E87E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2259,7 +2259,7 @@ _080E87D0: bl sub_80EB30C b _080E8868 .align 2, 0 -_080E87E4: .4byte gUnknown_2037AB8 +_080E87E4: .4byte gPaletteFade _080E87E8: ldr r0, _080E87F8 @ =gUnknown_83FDCD2 bl BattleStringExpandPlaceholdersToDisplayedString @@ -2304,7 +2304,7 @@ _080E8800: _080E8840: .4byte gBitTable _080E8844: .4byte gBattleStruct _080E8848: - ldr r0, _080E8878 @ =gUnknown_2037AB8 + ldr r0, _080E8878 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2329,10 +2329,10 @@ _080E886C: strb r0, [r1] b _080E88AA .align 2, 0 -_080E8878: .4byte gUnknown_2037AB8 +_080E8878: .4byte gPaletteFade _080E887C: .4byte gBattleStruct _080E8880: - ldr r0, _080E88B4 @ =gUnknown_2037AB8 + ldr r0, _080E88B4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2356,7 +2356,7 @@ _080E88AA: pop {r0} bx r0 .align 2, 0 -_080E88B4: .4byte gUnknown_2037AB8 +_080E88B4: .4byte gPaletteFade _080E88B8: .4byte gUnknown_203AD30 _080E88BC: .4byte gBattleStruct thumb_func_end sub_80E8704 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 1ae03fe5e..89f98fc35 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -2396,7 +2396,7 @@ _0802F6A4: .4byte sub_8011A1C thumb_func_start sub_802F6A8 sub_802F6A8: @ 802F6A8 push {lr} - ldr r0, _0802F6D0 @ =gUnknown_2037AB8 + ldr r0, _0802F6D0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2415,7 +2415,7 @@ sub_802F6A8: @ 802F6A8 bl sub_800AAC0 b _0802F6E0 .align 2, 0 -_0802F6D0: .4byte gUnknown_2037AB8 +_0802F6D0: .4byte gPaletteFade _0802F6D4: .4byte gBattleTypeFlags _0802F6D8: .4byte gUnknown_3003F3C _0802F6DC: @@ -4293,7 +4293,7 @@ _08030622: thumb_func_start sub_8030628 sub_8030628: @ 8030628 push {r4,lr} - ldr r0, _0803066C @ =gUnknown_2037AB8 + ldr r0, _0803066C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4325,7 +4325,7 @@ _08030666: pop {r0} bx r0 .align 2, 0 -_0803066C: .4byte gUnknown_2037AB8 +_0803066C: .4byte gPaletteFade _08030670: .4byte gUnknown_3004FE0 _08030674: .4byte gActiveBattler _08030678: .4byte sub_8030684 @@ -4341,7 +4341,7 @@ sub_8030684: @ 8030684 ldr r0, _080306B8 @ =sub_8011100 cmp r1, r0 bne _080306F4 - ldr r0, _080306BC @ =gUnknown_2037AB8 + ldr r0, _080306BC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4360,7 +4360,7 @@ sub_8030684: @ 8030684 .align 2, 0 _080306B4: .4byte gMain _080306B8: .4byte sub_8011100 -_080306BC: .4byte gUnknown_2037AB8 +_080306BC: .4byte gPaletteFade _080306C0: .4byte gUnknown_203B0C0 _080306C4: .4byte gUnknown_203B0C1 _080306C8: .4byte gUnknown_203B0DC @@ -4395,7 +4395,7 @@ _080306FC: .4byte gActiveBattler thumb_func_start sub_8030700 sub_8030700: @ 8030700 push {lr} - ldr r0, _0803072C @ =gUnknown_2037AB8 + ldr r0, _0803072C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4415,7 +4415,7 @@ _08030728: pop {r0} bx r0 .align 2, 0 -_0803072C: .4byte gUnknown_2037AB8 +_0803072C: .4byte gPaletteFade _08030730: .4byte gUnknown_3004FE0 _08030734: .4byte gActiveBattler _08030738: .4byte CompleteWhenChoseItem @@ -4429,7 +4429,7 @@ CompleteWhenChoseItem: @ 803073C ldr r0, _0803076C @ =sub_8011100 cmp r1, r0 bne _08030762 - ldr r0, _08030770 @ =gUnknown_2037AB8 + ldr r0, _08030770 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4446,7 +4446,7 @@ _08030762: .align 2, 0 _08030768: .4byte gMain _0803076C: .4byte sub_8011100 -_08030770: .4byte gUnknown_2037AB8 +_08030770: .4byte gPaletteFade _08030774: .4byte gUnknown_203AD30 thumb_func_end CompleteWhenChoseItem diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s index 5c3c0ebf0..36b4f62d9 100644 --- a/asm/battle_controller_pokedude.s +++ b/asm/battle_controller_pokedude.s @@ -227,7 +227,7 @@ _0815624E: thumb_func_start sub_8156254 sub_8156254: @ 8156254 push {lr} - ldr r0, _08156284 @ =gUnknown_2037AB8 + ldr r0, _08156284 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -250,7 +250,7 @@ _0815627E: pop {r0} bx r0 .align 2, 0 -_08156284: .4byte gUnknown_2037AB8 +_08156284: .4byte gPaletteFade _08156288: .4byte gMain _0815628C: .4byte 0x00000439 _08156290: .4byte gUnknown_3004F80 @@ -550,7 +550,7 @@ sub_81564E4: @ 81564E4 thumb_func_start sub_81564F0 sub_81564F0: @ 81564F0 push {lr} - ldr r0, _08156524 @ =gUnknown_2037AB8 + ldr r0, _08156524 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -574,7 +574,7 @@ _08156520: pop {r0} bx r0 .align 2, 0 -_08156524: .4byte gUnknown_2037AB8 +_08156524: .4byte gPaletteFade _08156528: .4byte gUnknown_3004FE0 _0815652C: .4byte gActiveBattler _08156530: .4byte sub_8156538 @@ -589,7 +589,7 @@ sub_8156538: @ 8156538 ldr r0, _0815656C @ =sub_8011100 cmp r1, r0 bne _0815658E - ldr r0, _08156570 @ =gUnknown_2037AB8 + ldr r0, _08156570 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -608,7 +608,7 @@ sub_8156538: @ 8156538 .align 2, 0 _08156568: .4byte gMain _0815656C: .4byte sub_8011100 -_08156570: .4byte gUnknown_2037AB8 +_08156570: .4byte gPaletteFade _08156574: .4byte gUnknown_203B0C0 _08156578: .4byte gUnknown_203B0C1 _0815657C: .4byte gUnknown_203B0DC @@ -627,7 +627,7 @@ _0815658E: thumb_func_start sub_8156594 sub_8156594: @ 8156594 push {lr} - ldr r0, _081565C8 @ =gUnknown_2037AB8 + ldr r0, _081565C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -652,7 +652,7 @@ _081565C4: movs r0, 0x7 b _081565DE .align 2, 0 -_081565C8: .4byte gUnknown_2037AB8 +_081565C8: .4byte gPaletteFade _081565CC: .4byte gUnknown_3004FE0 _081565D0: .4byte gActiveBattler _081565D4: .4byte sub_81565E8 @@ -674,7 +674,7 @@ sub_81565E8: @ 81565E8 ldr r0, _08156618 @ =sub_8011100 cmp r1, r0 bne _0815660E - ldr r0, _0815661C @ =gUnknown_2037AB8 + ldr r0, _0815661C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -691,7 +691,7 @@ _0815660E: .align 2, 0 _08156614: .4byte gMain _08156618: .4byte sub_8011100 -_0815661C: .4byte gUnknown_2037AB8 +_0815661C: .4byte gPaletteFade _08156620: .4byte gUnknown_203AD30 thumb_func_end sub_81565E8 @@ -7222,7 +7222,7 @@ _08159BDC: .4byte _08159C64 .4byte _08159CB4 _08159BF0: - ldr r0, _08159C10 @ =gUnknown_2037AB8 + ldr r0, _08159C10 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7238,9 +7238,9 @@ _08159BF0: movs r3, 0x8 b _08159C90 .align 2, 0 -_08159C10: .4byte gUnknown_2037AB8 +_08159C10: .4byte gPaletteFade _08159C14: - ldr r0, _08159C3C @ =gUnknown_2037AB8 + ldr r0, _08159C3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7259,7 +7259,7 @@ _08159C14: adds r0, r5 b _08159C9E .align 2, 0 -_08159C3C: .4byte gUnknown_2037AB8 +_08159C3C: .4byte gPaletteFade _08159C40: .4byte gUnknown_2022976 _08159C44: ldr r1, _08159C5C @ =gUnknown_2022976 @@ -7314,7 +7314,7 @@ _08159CA8: .4byte gMain _08159CAC: .4byte gUnknown_3005EE0 _08159CB0: .4byte gActiveBattler _08159CB4: - ldr r0, _08159CF8 @ =gUnknown_2037AB8 + ldr r0, _08159CF8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7346,7 +7346,7 @@ _08159CEE: pop {r0} bx r0 .align 2, 0 -_08159CF8: .4byte gUnknown_2037AB8 +_08159CF8: .4byte gPaletteFade _08159CFC: .4byte 0x00000137 _08159D00: .4byte gUnknown_2022976 thumb_func_end sub_8159BA8 @@ -7386,7 +7386,7 @@ _08159D34: .4byte _08159E64 .4byte _08159EA4 _08159D50: - ldr r0, _08159D90 @ =gUnknown_2037AB8 + ldr r0, _08159D90 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7417,10 +7417,10 @@ _08159D62: movs r3, 0x8 b _08159E80 .align 2, 0 -_08159D90: .4byte gUnknown_2037AB8 +_08159D90: .4byte gPaletteFade _08159D94: .4byte gBattleStruct _08159D98: - ldr r0, _08159DD0 @ =gUnknown_2037AB8 + ldr r0, _08159DD0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7449,11 +7449,11 @@ _08159DAA: str r3, [sp] b _08159E7A .align 2, 0 -_08159DD0: .4byte gUnknown_2037AB8 +_08159DD0: .4byte gPaletteFade _08159DD4: .4byte gBitTable _08159DD8: .4byte gBattleStruct _08159DDC: - ldr r0, _08159DF0 @ =gUnknown_2037AB8 + ldr r0, _08159DF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7464,7 +7464,7 @@ _08159DEA: bl sub_80EB30C b _08159E84 .align 2, 0 -_08159DF0: .4byte gUnknown_2037AB8 +_08159DF0: .4byte gPaletteFade _08159DF4: bl sub_8159EF0 bl BattleStringExpandPlaceholdersToDisplayedString @@ -7515,7 +7515,7 @@ _08159E58: .4byte gMain _08159E5C: .4byte gBitTable _08159E60: .4byte gBattleStruct _08159E64: - ldr r0, _08159E98 @ =gUnknown_2037AB8 + ldr r0, _08159E98 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7544,11 +7544,11 @@ _08159E84: strb r0, [r1, 0x2] b _08159EDE .align 2, 0 -_08159E98: .4byte gUnknown_2037AB8 +_08159E98: .4byte gPaletteFade _08159E9C: .4byte gUnknown_3005EE0 _08159EA0: .4byte gActiveBattler _08159EA4: - ldr r0, _08159EE8 @ =gUnknown_2037AB8 + ldr r0, _08159EE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7578,7 +7578,7 @@ _08159EDE: pop {r0} bx r0 .align 2, 0 -_08159EE8: .4byte gUnknown_2037AB8 +_08159EE8: .4byte gPaletteFade _08159EEC: .4byte 0x00000137 thumb_func_end sub_8159D04 diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index e221fe8e9..10e702da5 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -330,7 +330,7 @@ _080DD7AC: .4byte SpriteCallbackDummy thumb_func_start sub_80DD7B0 sub_80DD7B0: @ 80DD7B0 push {lr} - ldr r0, _080DD7E0 @ =gUnknown_2037AB8 + ldr r0, _080DD7E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -353,7 +353,7 @@ _080DD7DA: pop {r0} bx r0 .align 2, 0 -_080DD7E0: .4byte gUnknown_2037AB8 +_080DD7E0: .4byte gPaletteFade _080DD7E4: .4byte gMain _080DD7E8: .4byte 0x00000439 _080DD7EC: .4byte gUnknown_3004F80 @@ -394,7 +394,7 @@ _080DD828: .4byte gActiveBattler thumb_func_start sub_80DD82C sub_80DD82C: @ 80DD82C push {lr} - ldr r0, _080DD84C @ =gUnknown_2037AB8 + ldr r0, _080DD84C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -411,7 +411,7 @@ _080DD848: pop {r0} bx r0 .align 2, 0 -_080DD84C: .4byte gUnknown_2037AB8 +_080DD84C: .4byte gPaletteFade _080DD850: .4byte gUnknown_3004FE0 _080DD854: .4byte gActiveBattler _080DD858: .4byte CompleteWhenChosePokeblock @@ -425,7 +425,7 @@ CompleteWhenChosePokeblock: @ 80DD85C ldr r0, _080DD88C @ =sub_8011100 cmp r1, r0 bne _080DD882 - ldr r0, _080DD890 @ =gUnknown_2037AB8 + ldr r0, _080DD890 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -442,7 +442,7 @@ _080DD882: .align 2, 0 _080DD888: .4byte gMain _080DD88C: .4byte sub_8011100 -_080DD890: .4byte gUnknown_2037AB8 +_080DD890: .4byte gPaletteFade _080DD894: .4byte gUnknown_203AD30 thumb_func_end CompleteWhenChosePokeblock diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index dd319645e..868883bab 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -854,9 +854,9 @@ _0803443C: movs r2, 0x6 bl BlendPalette lsls r1, r7, 1 - ldr r0, _0803448C @ =gUnknown_20375F8 + ldr r0, _0803448C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034490 @ =gUnknown_20371F8 + ldr r2, _08034490 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034494 @ =0x04000008 bl CpuSet @@ -875,8 +875,8 @@ _0803447C: .4byte gBattleStruct _08034480: .4byte gBattleMonForms _08034484: .4byte gUnknown_2024018 _08034488: .4byte 0x00007fff -_0803448C: .4byte gUnknown_20375F8 -_08034490: .4byte gUnknown_20371F8 +_0803448C: .4byte gPlttBufferFaded +_08034490: .4byte gPlttBufferUnfaded _08034494: .4byte 0x04000008 thumb_func_end BattleLoadOpponentMonSpriteGfx @@ -1059,9 +1059,9 @@ _080345FC: movs r2, 0x6 bl BlendPalette lsls r1, r7, 1 - ldr r0, _0803464C @ =gUnknown_20375F8 + ldr r0, _0803464C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034650 @ =gUnknown_20371F8 + ldr r2, _08034650 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034654 @ =0x04000008 bl CpuSet @@ -1080,8 +1080,8 @@ _0803463C: .4byte gBattleStruct _08034640: .4byte gBattleMonForms _08034644: .4byte gUnknown_2024018 _08034648: .4byte 0x00007fff -_0803464C: .4byte gUnknown_20375F8 -_08034650: .4byte gUnknown_20371F8 +_0803464C: .4byte gPlttBufferFaded +_08034650: .4byte gPlttBufferUnfaded _08034654: .4byte 0x04000008 thumb_func_end sub_8034498 @@ -2029,9 +2029,9 @@ _08034D88: bl BlendPalette mov r3, r10 lsls r1, r3, 1 - ldr r0, _08034E40 @ =gUnknown_20375F8 + ldr r0, _08034E40 @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _08034E44 @ =gUnknown_20371F8 + ldr r2, _08034E44 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _08034E48 @ =0x04000008 bl CpuSet @@ -2054,8 +2054,8 @@ _08034E30: .4byte gUnknown_2024018 _08034E34: .4byte gBattleStruct _08034E38: .4byte gBattleMonForms _08034E3C: .4byte 0x00007fff -_08034E40: .4byte gUnknown_20375F8 -_08034E44: .4byte gUnknown_20371F8 +_08034E40: .4byte gPlttBufferFaded +_08034E44: .4byte gPlttBufferUnfaded _08034E48: .4byte 0x04000008 _08034E4C: mov r0, r9 @@ -2263,9 +2263,9 @@ _08034FFC: bl BlendPalette mov r2, r10 lsls r1, r2, 1 - ldr r0, _080350AC @ =gUnknown_20375F8 + ldr r0, _080350AC @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _080350B0 @ =gUnknown_20371F8 + ldr r2, _080350B0 @ =gPlttBufferUnfaded adds r1, r2 ldr r2, _080350B4 @ =0x04000008 bl CpuSet @@ -2327,8 +2327,8 @@ _0803509C: .4byte 0x00000181 _080350A0: .4byte gBattleStruct _080350A4: .4byte gBattleMonForms _080350A8: .4byte 0x00007fff -_080350AC: .4byte gUnknown_20375F8 -_080350B0: .4byte gUnknown_20371F8 +_080350AC: .4byte gPlttBufferFaded +_080350B0: .4byte gPlttBufferUnfaded _080350B4: .4byte 0x04000008 _080350B8: .4byte gUnknown_2024018 thumb_func_end sub_8034BF4 diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 85c9e4af9..3a27c29ea 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -4066,7 +4066,7 @@ _08049AF4: movs r2, 0x2 bl FillPalette lsls r4, 1 - ldr r0, _08049BCC @ =gUnknown_20373F8 + ldr r0, _08049BCC @ =gPlttBufferUnfaded + 0x200 adds r0, r4, r0 ldr r1, _08049BD0 @ =0x05000200 adds r4, r1 @@ -4145,7 +4145,7 @@ _08049BB6: .align 2, 0 _08049BC4: .4byte gSprites _08049BC8: .4byte gUnknown_826055A -_08049BCC: .4byte gUnknown_20373F8 +_08049BCC: .4byte gPlttBufferUnfaded + 0x200 _08049BD0: .4byte 0x05000200 _08049BD4: .4byte 0x06010000 _08049BD8: .4byte 0x04000018 diff --git a/asm/battle_message.s b/asm/battle_message.s index 47dbf0870..c3d9dd018 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -2958,7 +2958,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC ldrb r1, [r1] bl GetCurrentPpToMaxPpState lsls r0, 24 - ldr r5, _080D8A48 @ =gUnknown_20371F8 + ldr r5, _080D8A48 @ =gPlttBufferUnfaded lsrs r0, 22 adds r0, r4 ldrh r1, [r0] @@ -2968,7 +2968,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC ldrh r0, [r0, 0x2] adds r5, 0xB6 strh r0, [r5] - ldr r4, _080D8A4C @ =gUnknown_20376B0 + ldr r4, _080D8A4C @ =gPlttBufferFaded + 0xB8 adds r0, r2, 0 adds r1, r4, 0 movs r2, 0x1 @@ -2986,8 +2986,8 @@ _080D8A38: .4byte gActiveBattler _080D8A3C: .4byte gUnknown_2022BC8 _080D8A40: .4byte gUnknown_8D2FBB4 _080D8A44: .4byte gUnknown_2023FFC -_080D8A48: .4byte gUnknown_20371F8 -_080D8A4C: .4byte gUnknown_20376B0 +_080D8A48: .4byte gPlttBufferUnfaded +_080D8A4C: .4byte gPlttBufferFaded + 0xB8 thumb_func_end SetPpNumbersPaletteInMoveSelection thumb_func_start GetCurrentPpToMaxPpState diff --git a/asm/battle_records.s b/asm/battle_records.s index 4a134cd0c..bd847561c 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -189,7 +189,7 @@ sub_80CD3B8: @ 80CD3B8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080CD3DC @ =gUnknown_2037AB8 + ldr r0, _080CD3DC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -206,7 +206,7 @@ _080CD3D8: pop {r0} bx r0 .align 2, 0 -_080CD3DC: .4byte gUnknown_2037AB8 +_080CD3DC: .4byte gPaletteFade _080CD3E0: .4byte gTasks _080CD3E4: .4byte sub_80CD3E8 thumb_func_end sub_80CD3B8 @@ -281,7 +281,7 @@ sub_80CD460: @ 80CD460 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080CD498 @ =gUnknown_2037AB8 + ldr r0, _080CD498 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -302,7 +302,7 @@ _080CD490: pop {r0} bx r0 .align 2, 0 -_080CD498: .4byte gUnknown_2037AB8 +_080CD498: .4byte gPaletteFade _080CD49C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _080CD4A0: .4byte gUnknown_2039A1C thumb_func_end sub_80CD460 diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index 29dcfecca..1e99186bc 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -15654,7 +15654,7 @@ _0802549C: .align 2, 0 _080254A4: .4byte gBattleScripting _080254A8: - ldr r0, _080254E4 @ =gUnknown_2037AB8 + ldr r0, _080254E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -15684,7 +15684,7 @@ _080254D8: strb r0, [r1, 0x1F] b _080256D0 .align 2, 0 -_080254E4: .4byte gUnknown_2037AB8 +_080254E4: .4byte gPaletteFade _080254E8: .4byte gPlayerParty _080254EC: .4byte gBattleStruct _080254F0: .4byte gPlayerPartyCount @@ -15692,7 +15692,7 @@ _080254F4: .4byte sub_8077764 _080254F8: .4byte gMoveToLearn _080254FC: .4byte gBattleScripting _08025500: - ldr r0, _0802552C @ =gUnknown_2037AB8 + ldr r0, _0802552C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -15716,7 +15716,7 @@ _0802551A: strb r5, [r0, 0x1F] b _080256D0 .align 2, 0 -_0802552C: .4byte gUnknown_2037AB8 +_0802552C: .4byte gPaletteFade _08025530: .4byte gMain _08025534: .4byte sub_8011100 _08025538: .4byte gBattleScripting @@ -32443,7 +32443,7 @@ _0802DA24: .align 2, 0 _0802DA38: .4byte 0x00007fff _0802DA3C: - ldr r0, _0802DA5C @ =gUnknown_2037AB8 + ldr r0, _0802DA5C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -32458,10 +32458,10 @@ _0802DA4A: strb r0, [r1, 0x1] b _0802DB36 .align 2, 0 -_0802DA5C: .4byte gUnknown_2037AB8 +_0802DA5C: .4byte gPaletteFade _0802DA60: .4byte gUnknown_2023E82 _0802DA64: - ldr r0, _0802DAAC @ =gUnknown_2037AB8 + ldr r0, _0802DAAC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -32497,7 +32497,7 @@ _0802DA72: strb r0, [r4] b _0802DB6C .align 2, 0 -_0802DAAC: .4byte gUnknown_2037AB8 +_0802DAAC: .4byte gPaletteFade _0802DAB0: .4byte gMain _0802DAB4: .4byte sub_8011100 _0802DAB8: .4byte gTasks @@ -32539,7 +32539,7 @@ _0802DAE0: bl sub_810C1CC str r4, [sp, 0x14] add r0, sp, 0x14 - ldr r1, _0802DB48 @ =gUnknown_20375F8 + ldr r1, _0802DB48 @ =gPlttBufferFaded ldr r2, _0802DB4C @ =0x05000080 bl CpuSet ldr r0, _0802DB50 @ =0x0001ffff @@ -32562,12 +32562,12 @@ _0802DB36: .align 2, 0 _0802DB40: .4byte gBattleMons _0802DB44: .4byte 0x0000ffff -_0802DB48: .4byte gUnknown_20375F8 +_0802DB48: .4byte gPlttBufferFaded _0802DB4C: .4byte 0x05000080 _0802DB50: .4byte 0x0001ffff _0802DB54: .4byte gUnknown_2023E82 _0802DB58: - ldr r0, _0802DB74 @ =gUnknown_2037AB8 + ldr r0, _0802DB74 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -32583,7 +32583,7 @@ _0802DB6C: pop {r0} bx r0 .align 2, 0 -_0802DB74: .4byte gUnknown_2037AB8 +_0802DB74: .4byte gPaletteFade _0802DB78: .4byte gUnknown_2023D74 thumb_func_end sub_802D9D8 @@ -32946,7 +32946,7 @@ _0802DE36: .align 2, 0 _0802DE3C: .4byte gUnknown_2023E82 _0802DE40: - ldr r0, _0802DEFC @ =gUnknown_2037AB8 + ldr r0, _0802DEFC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -33035,7 +33035,7 @@ _0802DE4E: strb r0, [r1] b _0802DFA6 .align 2, 0 -_0802DEFC: .4byte gUnknown_2037AB8 +_0802DEFC: .4byte gPaletteFade _0802DF00: .4byte gBattlerPartyIndexes _0802DF04: .4byte sBattler_AI _0802DF08: .4byte gEnemyParty @@ -33048,7 +33048,7 @@ _0802DF18: ldr r0, _0802DF58 @ =sub_8011100 cmp r1, r0 bne _0802DFA6 - ldr r0, _0802DF5C @ =gUnknown_2037AB8 + ldr r0, _0802DF5C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -33075,7 +33075,7 @@ _0802DF18: .align 2, 0 _0802DF54: .4byte gMain _0802DF58: .4byte sub_8011100 -_0802DF5C: .4byte gUnknown_2037AB8 +_0802DF5C: .4byte gPaletteFade _0802DF60: .4byte gBattlerPartyIndexes _0802DF64: .4byte sBattler_AI _0802DF68: .4byte gEnemyParty diff --git a/asm/battle_setup.s b/asm/battle_setup.s index d9c84dcc4..128aa459f 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -757,7 +757,7 @@ sub_807FC5C: @ 807FC5C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r5, r0, 16 lsls r0, r5, 24 @@ -907,7 +907,7 @@ GetBattleTransitionTypeByMap: @ 807FD90 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 bl sav1_get_flash_used_on_map @@ -1650,7 +1650,7 @@ TrainerWantsBattle: @ 8080334 ldr r2, _08080368 @ =gUnknown_3005074 strb r0, [r2] ldr r4, _0808036C @ =gUnknown_20370D2 - ldr r3, _08080370 @ =gUnknown_2036E38 + ldr r3, _08080370 @ =gMapObjects lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -1669,7 +1669,7 @@ TrainerWantsBattle: @ 8080334 .align 2, 0 _08080368: .4byte gUnknown_3005074 _0808036C: .4byte gUnknown_20370D2 -_08080370: .4byte gUnknown_2036E38 +_08080370: .4byte gMapObjects _08080374: .4byte gUnknown_81A4EB4 thumb_func_end TrainerWantsBattle @@ -1698,7 +1698,7 @@ sub_8080398: @ 8080398 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080803C8 @ =gUnknown_2036E38 + ldr r0, _080803C8 @ =gMapObjects adds r4, r0 ldrb r0, [r4, 0x18] lsls r0, 28 @@ -1714,7 +1714,7 @@ sub_8080398: @ 8080398 bx r0 .align 2, 0 _080803C4: .4byte gUnknown_3005074 -_080803C8: .4byte gUnknown_2036E38 +_080803C8: .4byte gMapObjects thumb_func_end sub_8080398 thumb_func_start sub_80803CC diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 921482d16..931c7788c 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -138,8 +138,8 @@ Transition_Phase1: @ 80D09B0 push {r4,lr} adds r4, r0, 0 bl sub_807B05C - ldr r0, _080D09DC @ =gUnknown_20375F8 - ldr r1, _080D09E0 @ =gUnknown_20371F8 + ldr r0, _080D09DC @ =gPlttBufferFaded + ldr r1, _080D09E0 @ =gPlttBufferUnfaded ldr r2, _080D09E4 @ =0x04000100 bl CpuSet ldr r1, _080D09E8 @ =gUnknown_83FA320 @@ -155,8 +155,8 @@ Transition_Phase1: @ 80D09B0 movs r0, 0x1 b _080D09FA .align 2, 0 -_080D09DC: .4byte gUnknown_20375F8 -_080D09E0: .4byte gUnknown_20371F8 +_080D09DC: .4byte gPlttBufferFaded +_080D09E0: .4byte gPlttBufferUnfaded _080D09E4: .4byte 0x04000100 _080D09E8: .4byte gUnknown_83FA320 _080D09EC: @@ -407,7 +407,7 @@ _080D0B9E: thumb_func_start sub_80D0BA8 sub_80D0BA8: @ 80D0BA8 push {lr} - ldr r0, _080D0BCC @ =gUnknown_2037AB8 + ldr r0, _080D0BCC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -423,7 +423,7 @@ _080D0BC4: pop {r1} bx r1 .align 2, 0 -_080D0BCC: .4byte gUnknown_2037AB8 +_080D0BCC: .4byte gPaletteFade _080D0BD0: .4byte sub_80D0ADC thumb_func_end sub_80D0BA8 @@ -533,7 +533,7 @@ sub_80D0C78: @ 80D0C78 adds r0, r3, 0 movs r3, 0x2 bl sub_80D3E74 - ldr r0, _080D0CE8 @ =gUnknown_2037AB8 + ldr r0, _080D0CE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -558,7 +558,7 @@ _080D0CCA: .align 2, 0 _080D0CE0: .4byte gUnknown_2039A2C _080D0CE4: .4byte gUnknown_2038700 -_080D0CE8: .4byte gUnknown_2037AB8 +_080D0CE8: .4byte gPaletteFade _080D0CEC: .4byte sub_80D0BD4 thumb_func_end sub_80D0C78 @@ -733,7 +733,7 @@ _080D0E18: lsrs r4, r0, 16 cmp r5, 0x9F bls _080D0E18 - ldr r0, _080D0E78 @ =gUnknown_2037AB8 + ldr r0, _080D0E78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -757,7 +757,7 @@ _080D0E5E: .align 2, 0 _080D0E70: .4byte gUnknown_2039A2C _080D0E74: .4byte gUnknown_2038700 -_080D0E78: .4byte gUnknown_2037AB8 +_080D0E78: .4byte gPaletteFade _080D0E7C: .4byte sub_80D0D54 thumb_func_end sub_80D0DF0 @@ -2559,7 +2559,7 @@ _080D1C78: ldrsh r0, [r6, r5] cmp r0, 0 beq _080D1C9A - ldr r0, _080D1CC0 @ =gUnknown_2037AB8 + ldr r0, _080D1CC0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2588,7 +2588,7 @@ _080D1C9A: _080D1CB4: .4byte gUnknown_2039A2C _080D1CB8: .4byte 0x1fff0000 _080D1CBC: .4byte gUnknown_2038700 -_080D1CC0: .4byte gUnknown_2037AB8 +_080D1CC0: .4byte gPaletteFade _080D1CC4: .4byte sub_80D1B58 thumb_func_end sub_80D1BE8 diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index a9523846e..d4d16e15e 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -362,7 +362,7 @@ sub_813D048: @ 813D048 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0813D074 @ =gUnknown_2037AB8 + ldr r0, _0813D074 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -379,7 +379,7 @@ _0813D06C: pop {r0} bx r0 .align 2, 0 -_0813D074: .4byte gUnknown_2037AB8 +_0813D074: .4byte gPaletteFade _0813D078: .4byte gUnknown_203F370 thumb_func_end sub_813D048 @@ -1399,7 +1399,7 @@ sub_813D844: @ 813D844 lsls r0, 3 ldr r1, _0813D87C @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _0813D880 @ =gUnknown_2037AB8 + ldr r0, _0813D880 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1419,7 +1419,7 @@ sub_813D844: @ 813D844 b _0813D896 .align 2, 0 _0813D87C: .4byte gTasks+0x8 -_0813D880: .4byte gUnknown_2037AB8 +_0813D880: .4byte gPaletteFade _0813D884: .4byte gUnknown_203F37A _0813D888: .4byte gUnknown_203F36C _0813D88C: @@ -1669,7 +1669,7 @@ sub_813DA68: @ 813DA68 lsls r0, 3 ldr r1, _0813DAD8 @ =gTasks+0x8 adds r7, r0, r1 - ldr r0, _0813DADC @ =gUnknown_2037AB8 + ldr r0, _0813DADC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1714,7 +1714,7 @@ _0813DA9E: b _0813DB48 .align 2, 0 _0813DAD8: .4byte gTasks+0x8 -_0813DADC: .4byte gUnknown_2037AB8 +_0813DADC: .4byte gPaletteFade _0813DAE0: .4byte gUnknown_203F37A _0813DAE4: .4byte gMain _0813DAE8: .4byte gUnknown_203AD30 diff --git a/asm/bike.s b/asm/bike.s index 2a1219968..fcce5ca66 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -42,7 +42,7 @@ sub_80BD0D4: @ 80BD0D4 lsls r2, 16 lsrs r2, 16 ldr r4, _080BD0F8 @ =gUnknown_83E7D10 - ldr r3, _080BD0FC @ =gUnknown_2037078 + ldr r3, _080BD0FC @ =gPlayerAvatar ldrb r3, [r3, 0x8] lsls r3, 2 adds r3, r4 @@ -55,7 +55,7 @@ sub_80BD0D4: @ 80BD0D4 bx r1 .align 2, 0 _080BD0F8: .4byte gUnknown_83E7D10 -_080BD0FC: .4byte gUnknown_2037078 +_080BD0FC: .4byte gPlayerAvatar thumb_func_end sub_80BD0D4 thumb_func_start sub_80BD100 @@ -72,12 +72,12 @@ sub_80BD100: @ 80BD100 lsls r2, 16 lsrs r2, 16 mov r9, r2 - ldr r5, _080BD15C @ =gUnknown_2037078 + ldr r5, _080BD15C @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080BD160 @ =gUnknown_2036E38 + ldr r0, _080BD160 @ =gMapObjects adds r4, r0 bl player_get_direction_upper_nybble lsls r0, 24 @@ -105,8 +105,8 @@ sub_80BD100: @ 80BD100 movs r0, 0x3 b _080BD1B6 .align 2, 0 -_080BD15C: .4byte gUnknown_2037078 -_080BD160: .4byte gUnknown_2036E38 +_080BD15C: .4byte gPlayerAvatar +_080BD160: .4byte gMapObjects _080BD164: .4byte gMain _080BD168: ldrb r0, [r6] @@ -124,11 +124,11 @@ _080BD176: bne _080BD18C _080BD17E: strb r7, [r6] - ldr r1, _080BD188 @ =gUnknown_2037078 + ldr r1, _080BD188 @ =gPlayerAvatar movs r0, 0 b _080BD1B4 .align 2, 0 -_080BD188: .4byte gUnknown_2037078 +_080BD188: .4byte gPlayerAvatar _080BD18C: cmp r0, r7 beq _080BD1B0 @@ -148,7 +148,7 @@ _080BD18C: lsrs r0, 24 b _080BD1B6 _080BD1B0: - ldr r1, _080BD1C4 @ =gUnknown_2037078 + ldr r1, _080BD1C4 @ =gPlayerAvatar movs r0, 0x2 _080BD1B4: strb r0, [r1, 0x2] @@ -161,13 +161,13 @@ _080BD1B6: pop {r1} bx r1 .align 2, 0 -_080BD1C4: .4byte gUnknown_2037078 +_080BD1C4: .4byte gPlayerAvatar thumb_func_end sub_80BD100 thumb_func_start sub_80BD1C8 sub_80BD1C8: @ 80BD1C8 push {lr} - ldr r2, _080BD1E4 @ =gUnknown_2037078 + ldr r2, _080BD1E4 @ =gPlayerAvatar ldrb r1, [r2, 0x9] strb r1, [r0] movs r1, 0 @@ -179,7 +179,7 @@ sub_80BD1C8: @ 80BD1C8 pop {r1} bx r1 .align 2, 0 -_080BD1E4: .4byte gUnknown_2037078 +_080BD1E4: .4byte gPlayerAvatar thumb_func_end sub_80BD1C8 thumb_func_start sub_80BD1E8 @@ -199,12 +199,12 @@ sub_80BD1E8: @ 80BD1E8 lsls r0, 24 lsrs r5, r0, 24 adds r7, r5, 0 - ldr r4, _080BD240 @ =gUnknown_2037078 + ldr r4, _080BD240 @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080BD244 @ =gUnknown_2036E38 + ldr r1, _080BD244 @ =gMapObjects adds r0, r1 ldrb r0, [r0, 0x1E] bl sub_805A1DC @@ -226,8 +226,8 @@ sub_80BD1E8: @ 80BD1E8 lsrs r0, 24 b _080BD270 .align 2, 0 -_080BD240: .4byte gUnknown_2037078 -_080BD244: .4byte gUnknown_2036E38 +_080BD240: .4byte gPlayerAvatar +_080BD244: .4byte gMapObjects _080BD248: movs r0, 0x2 strb r0, [r4, 0x2] @@ -276,12 +276,12 @@ sub_80BD28C: @ 80BD28C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BD2C0 @ =gUnknown_2037078 + ldr r0, _080BD2C0 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080BD2C4 @ =gUnknown_2036E38 + ldr r1, _080BD2C4 @ =gMapObjects adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -298,8 +298,8 @@ _080BD2B2: pop {r0} bx r0 .align 2, 0 -_080BD2C0: .4byte gUnknown_2037078 -_080BD2C4: .4byte gUnknown_2036E38 +_080BD2C0: .4byte gPlayerAvatar +_080BD2C4: .4byte gMapObjects thumb_func_end sub_80BD28C thumb_func_start sub_80BD2C8 @@ -308,12 +308,12 @@ sub_80BD2C8: @ 80BD2C8 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r0, _080BD2F8 @ =gUnknown_2037078 + ldr r0, _080BD2F8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080BD2FC @ =gUnknown_2036E38 + ldr r1, _080BD2FC @ =gMapObjects adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -326,8 +326,8 @@ sub_80BD2C8: @ 80BD2C8 bl sub_80BD27C b _080BD350 .align 2, 0 -_080BD2F8: .4byte gUnknown_2037078 -_080BD2FC: .4byte gUnknown_2036E38 +_080BD2F8: .4byte gPlayerAvatar +_080BD2FC: .4byte gMapObjects _080BD300: adds r0, r4, 0 bl sub_80BD3A0 @@ -420,12 +420,12 @@ sub_80BD3A0: @ 80BD3A0 adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _080BD404 @ =gUnknown_2037078 + ldr r0, _080BD404 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080BD408 @ =gUnknown_2036E38 + ldr r0, _080BD408 @ =gMapObjects adds r4, r0 ldrh r1, [r4, 0x10] add r0, sp, 0x4 @@ -443,7 +443,7 @@ sub_80BD3A0: @ 80BD3A0 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 add r1, sp, 0x4 @@ -462,8 +462,8 @@ sub_80BD3A0: @ 80BD3A0 pop {r1} bx r1 .align 2, 0 -_080BD404: .4byte gUnknown_2037078 -_080BD408: .4byte gUnknown_2036E38 +_080BD404: .4byte gPlayerAvatar +_080BD408: .4byte gMapObjects thumb_func_end sub_80BD3A0 thumb_func_start sub_80BD40C @@ -645,7 +645,7 @@ _080BD538: sub_80BD540: @ 80BD540 push {r4,lr} sub sp, 0x4 - ldr r0, _080BD57C @ =gUnknown_2037078 + ldr r0, _080BD57C @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x18 ands r0, r1 @@ -661,7 +661,7 @@ sub_80BD540: @ 80BD540 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_80BD4B8 @@ -671,7 +671,7 @@ sub_80BD540: @ 80BD540 movs r0, 0 b _080BD582 .align 2, 0 -_080BD57C: .4byte gUnknown_2037078 +_080BD57C: .4byte gPlayerAvatar _080BD580: movs r0, 0x1 _080BD582: @@ -689,8 +689,8 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C lsls r0, 24 cmp r0, 0 beq _080BD5C0 - ldr r2, _080BD5B8 @ =gUnknown_2036E38 - ldr r0, _080BD5BC @ =gUnknown_2037078 + ldr r2, _080BD5B8 @ =gMapObjects + ldr r0, _080BD5BC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -704,8 +704,8 @@ player_should_look_direction_be_enforced_upon_movement: @ 80BD58C movs r0, 0 b _080BD5C2 .align 2, 0 -_080BD5B8: .4byte gUnknown_2036E38 -_080BD5BC: .4byte gUnknown_2037078 +_080BD5B8: .4byte gMapObjects +_080BD5BC: .4byte gPlayerAvatar _080BD5C0: movs r0, 0x1 _080BD5C2: @@ -721,7 +721,7 @@ sub_80BD5C8: @ 80BD5C8 ldr r1, _080BD5F0 @ =gUnknown_2036E2C movs r0, 0 strb r0, [r1] - ldr r0, _080BD5F4 @ =gUnknown_2037078 + ldr r0, _080BD5F4 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -734,7 +734,7 @@ sub_80BD5C8: @ 80BD5C8 b _080BD618 .align 2, 0 _080BD5F0: .4byte gUnknown_2036E2C -_080BD5F4: .4byte gUnknown_2037078 +_080BD5F4: .4byte gPlayerAvatar _080BD5F8: adds r0, r2, 0 bl SetPlayerAvatarTransitionFlags @@ -757,7 +757,7 @@ _080BD618: thumb_func_start sub_80BD620 sub_80BD620: @ 80BD620 push {lr} - ldr r2, _080BD64C @ =gUnknown_2037078 + ldr r2, _080BD64C @ =gPlayerAvatar movs r3, 0 strb r3, [r2, 0x8] strb r3, [r2, 0x9] @@ -779,32 +779,32 @@ _080BD638: pop {r0} bx r0 .align 2, 0 -_080BD64C: .4byte gUnknown_2037078 +_080BD64C: .4byte gPlayerAvatar thumb_func_end sub_80BD620 thumb_func_start Bike_UpdateBikeCounterSpeed Bike_UpdateBikeCounterSpeed: @ 80BD650 lsls r0, 24 lsrs r0, 24 - ldr r2, _080BD660 @ =gUnknown_2037078 + ldr r2, _080BD660 @ =gPlayerAvatar strb r0, [r2, 0xA] lsrs r1, r0, 1 adds r0, r1 strb r0, [r2, 0xB] bx lr .align 2, 0 -_080BD660: .4byte gUnknown_2037078 +_080BD660: .4byte gPlayerAvatar thumb_func_end Bike_UpdateBikeCounterSpeed thumb_func_start sub_80BD664 sub_80BD664: @ 80BD664 - ldr r1, _080BD670 @ =gUnknown_2037078 + ldr r1, _080BD670 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0xA] strb r0, [r1, 0xB] bx lr .align 2, 0 -_080BD670: .4byte gUnknown_2037078 +_080BD670: .4byte gPlayerAvatar thumb_func_end sub_80BD664 thumb_func_start GetPlayerSpeed @@ -815,7 +815,7 @@ GetPlayerSpeed: @ 80BD674 mov r0, sp movs r2, 0x6 bl memcpy - ldr r2, _080BD6A0 @ =gUnknown_2037078 + ldr r2, _080BD6A0 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -829,7 +829,7 @@ GetPlayerSpeed: @ 80BD674 b _080BD6BE .align 2, 0 _080BD69C: .4byte gUnknown_83E7D1C -_080BD6A0: .4byte gUnknown_2037078 +_080BD6A0: .4byte gPlayerAvatar _080BD6A4: movs r0, 0x4 ands r0, r1 @@ -856,7 +856,7 @@ _080BD6BE: Bike_HandleBumpySlopeJump: @ 80BD6C4 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080BD714 @ =gUnknown_2037078 + ldr r5, _080BD714 @ =gPlayerAvatar ldrb r1, [r5] movs r0, 0x4 ands r0, r1 @@ -872,7 +872,7 @@ Bike_HandleBumpySlopeJump: @ 80BD6C4 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_805A20C @@ -891,7 +891,7 @@ _080BD70C: pop {r0} bx r0 .align 2, 0 -_080BD714: .4byte gUnknown_2037078 +_080BD714: .4byte gPlayerAvatar thumb_func_end Bike_HandleBumpySlopeJump .align 2, 0 @ Don't pad with nop. diff --git a/asm/blend_palette.s b/asm/blend_palette.s index 5ef3cf070..7c95f18e9 100644 --- a/asm/blend_palette.s +++ b/asm/blend_palette.s @@ -26,9 +26,9 @@ BlendPalette: @ 8045274 movs r6, 0 cmp r6, r12 bcs _080452FA - ldr r0, _0804530C @ =gUnknown_20371F8 + ldr r0, _0804530C @ =gPlttBufferUnfaded mov r10, r0 - ldr r1, _08045310 @ =gUnknown_20375F8 + ldr r1, _08045310 @ =gPlttBufferFaded mov r9, r1 _080452A2: mov r0, r8 @@ -85,8 +85,8 @@ _080452FA: pop {r0} bx r0 .align 2, 0 -_0804530C: .4byte gUnknown_20371F8 -_08045310: .4byte gUnknown_20375F8 +_0804530C: .4byte gPlttBufferUnfaded +_08045310: .4byte gPlttBufferFaded thumb_func_end BlendPalette thumb_func_start sub_8045314 diff --git a/asm/cable_club.s b/asm/cable_club.s index e60a206bc..d67a8db6e 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -1547,13 +1547,13 @@ _0808135C: _08081374: .4byte gUnknown_202271A _08081378: .4byte 0x00002211 _0808137C: - ldr r0, _08081388 @ =gUnknown_2037AB8 + ldr r0, _08081388 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 b _080813A6 .align 2, 0 -_08081388: .4byte gUnknown_2037AB8 +_08081388: .4byte gPaletteFade _0808138C: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -1706,7 +1706,7 @@ _080814A0: _080814BC: .4byte gUnknown_202271A _080814C0: .4byte 0x00002211 _080814C4: - ldr r0, _080814D8 @ =gUnknown_2037AB8 + ldr r0, _080814D8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1718,7 +1718,7 @@ _080814D2: strh r0, [r6] b _0808160A .align 2, 0 -_080814D8: .4byte gUnknown_2037AB8 +_080814D8: .4byte gPaletteFade _080814DC: ldr r1, _080814EC @ =gUnknown_2022720 movs r0, 0 @@ -2183,7 +2183,7 @@ _08081882: bl sub_800A068 b _080818B8 _08081894: - ldr r0, _080818A4 @ =gUnknown_2037AB8 + ldr r0, _080818A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2191,7 +2191,7 @@ _08081894: bne _080818D8 b _080818B8 .align 2, 0 -_080818A4: .4byte gUnknown_2037AB8 +_080818A4: .4byte gPaletteFade _080818A8: ldr r1, _080818C0 @ =gUnknown_2031DA4 movs r0, 0 @@ -2259,7 +2259,7 @@ _0808191A: bl sub_80F985C b _08081950 _0808192C: - ldr r0, _0808193C @ =gUnknown_2037AB8 + ldr r0, _0808193C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2267,7 +2267,7 @@ _0808192C: bne _08081970 b _08081950 .align 2, 0 -_0808193C: .4byte gUnknown_2037AB8 +_0808193C: .4byte gPaletteFade _08081940: ldr r1, _08081958 @ =gUnknown_2031DA4 movs r0, 0 diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index c5381bbf2..84dd082f6 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -91,7 +91,7 @@ _080F5618: bl BeginNormalPaletteFade b _080F56E2 _080F562A: - ldr r0, _080F5640 @ =gUnknown_2037AB8 + ldr r0, _080F5640 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -101,7 +101,7 @@ _080F562A: bl SetVBlankCallback b _080F56E2 .align 2, 0 -_080F5640: .4byte gUnknown_2037AB8 +_080F5640: .4byte gPaletteFade _080F5644: bl sub_80F5820 b _080F56E2 @@ -296,7 +296,7 @@ _080F57B8: .align 2, 0 _080F57D0: .4byte 0x0000ffff _080F57D4: - ldr r0, _080F5808 @ =gUnknown_2037AB8 + ldr r0, _080F5808 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -318,7 +318,7 @@ _080F57FE: pop {r0} bx r0 .align 2, 0 -_080F5808: .4byte gUnknown_2037AB8 +_080F5808: .4byte gPaletteFade thumb_func_end sub_80F579C thumb_func_start sub_80F580C diff --git a/asm/credits.s b/asm/credits.s index 6d9921366..bf8c5eeac 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -242,13 +242,13 @@ _080F3B5E: bl sub_80F3AA4 movs r0, 0xF0 bl sub_80F77CC - ldr r0, _080F3BC8 @ =gUnknown_20371F8 + ldr r0, _080F3BC8 @ =gPlttBufferUnfaded movs r2, 0xFF lsls r2, 1 adds r0, r2 movs r1, 0 strh r1, [r0] - ldr r0, _080F3BCC @ =gUnknown_20375F8 + ldr r0, _080F3BCC @ =gPlttBufferFaded adds r0, r2 strh r1, [r0] movs r0, 0x1 @@ -261,8 +261,8 @@ _080F3BB8: .4byte gUnknown_2031DD8 _080F3BBC: .4byte gUnknown_203AB40 _080F3BC0: .4byte gUnknown_8414588 _080F3BC4: .4byte 0x0000247c -_080F3BC8: .4byte gUnknown_20371F8 -_080F3BCC: .4byte gUnknown_20375F8 +_080F3BC8: .4byte gPlttBufferUnfaded +_080F3BCC: .4byte gPlttBufferFaded thumb_func_end sub_80F3B2C thumb_func_start sub_80F3BD0 @@ -326,13 +326,13 @@ _080F3C64: bl sub_80F3AC4 movs r0, 0xF0 bl sub_80F77CC - ldr r0, _080F3C8C @ =gUnknown_20371F8 + ldr r0, _080F3C8C @ =gPlttBufferUnfaded movs r2, 0xFF lsls r2, 1 adds r0, r2 movs r1, 0 strh r1, [r0] - ldr r0, _080F3C90 @ =gUnknown_20375F8 + ldr r0, _080F3C90 @ =gPlttBufferFaded adds r0, r2 strh r1, [r0] ldr r0, _080F3C94 @ =gUnknown_203AB40 @@ -340,8 +340,8 @@ _080F3C64: movs r0, 0x2 b _080F413C .align 2, 0 -_080F3C8C: .4byte gUnknown_20371F8 -_080F3C90: .4byte gUnknown_20375F8 +_080F3C8C: .4byte gPlttBufferUnfaded +_080F3C90: .4byte gPlttBufferFaded _080F3C94: .4byte gUnknown_203AB40 _080F3C98: movs r0, 0x44 @@ -606,7 +606,7 @@ _080F3E94: _080F3EAC: .4byte gUnknown_203AB40 _080F3EB0: .4byte gUnknown_8410CF4 _080F3EB4: - ldr r0, _080F3F14 @ =gUnknown_2037AB8 + ldr r0, _080F3F14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -654,7 +654,7 @@ _080F3EB4: movs r0, 0x8 b _080F3FB8 .align 2, 0 -_080F3F14: .4byte gUnknown_2037AB8 +_080F3F14: .4byte gPaletteFade _080F3F18: .4byte gUnknown_84145BC _080F3F1C: .4byte gUnknown_8410CF4 _080F3F20: .4byte gUnknown_8410E00 @@ -738,7 +738,7 @@ _080F3FBA: .align 2, 0 _080F3FC0: .4byte gUnknown_8410CF4 _080F3FC4: - ldr r0, _080F3FE8 @ =gUnknown_2037AB8 + ldr r0, _080F3FE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -756,7 +756,7 @@ _080F3FD6: movs r0, 0xB b _080F413C .align 2, 0 -_080F3FE8: .4byte gUnknown_2037AB8 +_080F3FE8: .4byte gPaletteFade _080F3FEC: .4byte gUnknown_203AB40 _080F3FF0: ldr r0, [r7] @@ -773,7 +773,7 @@ _080F3FFE: movs r0, 0x6 b _080F413C _080F400A: - ldr r0, _080F4050 @ =gUnknown_2037AB8 + ldr r0, _080F4050 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -810,7 +810,7 @@ _080F404A: movs r0, 0x1 b _080F4068 .align 2, 0 -_080F4050: .4byte gUnknown_2037AB8 +_080F4050: .4byte gPaletteFade _080F4054: .4byte gUnknown_203AB40 _080F4058: add r1, sp, 0x14 @@ -838,7 +838,7 @@ _080F4068: .align 2, 0 _080F4080: .4byte gUnknown_203AB40 _080F4084: - ldr r0, _080F40B0 @ =gUnknown_2037AB8 + ldr r0, _080F40B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -859,7 +859,7 @@ _080F4096: movs r0, 0xE b _080F413C .align 2, 0 -_080F40B0: .4byte gUnknown_2037AB8 +_080F40B0: .4byte gPaletteFade _080F40B4: .4byte gUnknown_203AB40 _080F40B8: bl sub_80F4328 @@ -874,7 +874,7 @@ _080F40C2: .align 2, 0 _080F40CC: .4byte gUnknown_203AB40 _080F40D0: - ldr r0, _080F40F8 @ =gUnknown_2037AB8 + ldr r0, _080F40F8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -894,7 +894,7 @@ _080F40E2: movs r0, 0x10 b _080F413C .align 2, 0 -_080F40F8: .4byte gUnknown_2037AB8 +_080F40F8: .4byte gPaletteFade _080F40FC: .4byte gUnknown_203AB40 _080F4100: bl sub_80F4674 @@ -953,7 +953,7 @@ _080F4156: .align 2, 0 _080F416C: .4byte 0x00007fff _080F4170: - ldr r0, _080F418C @ =gUnknown_2037AB8 + ldr r0, _080F418C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -968,7 +968,7 @@ _080F4182: pop {r1} bx r1 .align 2, 0 -_080F418C: .4byte gUnknown_2037AB8 +_080F418C: .4byte gPaletteFade thumb_func_end sub_80F3BD0 thumb_func_start sub_80F4190 @@ -1382,7 +1382,7 @@ _080F4530: bne _080F45DE b _080F4630 _080F453A: - ldr r0, _080F4554 @ =gUnknown_2037AB8 + ldr r0, _080F4554 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1397,7 +1397,7 @@ _080F4548: strh r0, [r1, 0xE] b _080F4630 .align 2, 0 -_080F4554: .4byte gUnknown_2037AB8 +_080F4554: .4byte gPaletteFade _080F4558: ldr r1, [r4] ldrh r0, [r1, 0xC] @@ -1511,7 +1511,7 @@ _080F4630: strb r0, [r1, 0x1] b _080F4668 _080F4638: - ldr r0, _080F4660 @ =gUnknown_2037AB8 + ldr r0, _080F4660 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1529,7 +1529,7 @@ _080F4638: movs r0, 0x1 b _080F466A .align 2, 0 -_080F4660: .4byte gUnknown_2037AB8 +_080F4660: .4byte gPaletteFade _080F4664: .4byte gUnknown_203AB40 _080F4668: movs r0, 0 @@ -1697,7 +1697,7 @@ _080F47C2: .align 2, 0 _080F47CC: .4byte gUnknown_203AB40 _080F47D0: - ldr r0, _080F47E8 @ =gUnknown_2037AB8 + ldr r0, _080F47E8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1709,7 +1709,7 @@ _080F47D0: movs r0, 0x1 b _080F47EE .align 2, 0 -_080F47E8: .4byte gUnknown_2037AB8 +_080F47E8: .4byte gPaletteFade _080F47EC: movs r0, 0 _080F47EE: diff --git a/asm/diploma.s b/asm/diploma.s index 4ff605295..d0b652619 100644 --- a/asm/diploma.s +++ b/asm/diploma.s @@ -147,7 +147,7 @@ _080F4D22: .align 2, 0 _080F4D2C: .4byte sub_80F4BFC _080F4D30: - ldr r0, _080F4D64 @ =gUnknown_2037AB8 + ldr r0, _080F4D64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -174,7 +174,7 @@ _080F4D5A: pop {r0} bx r0 .align 2, 0 -_080F4D64: .4byte gUnknown_2037AB8 +_080F4D64: .4byte gPaletteFade _080F4D68: .4byte gTasks _080F4D6C: .4byte sub_80F4D74 _080F4D70: .4byte gUnknown_203AB48 @@ -245,7 +245,7 @@ sub_80F4DE0: @ 80F4DE0 push {r4,r5,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F4E18 @ =gUnknown_2037AB8 + ldr r0, _080F4E18 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -267,7 +267,7 @@ _080F4E10: pop {r0} bx r0 .align 2, 0 -_080F4E18: .4byte gUnknown_2037AB8 +_080F4E18: .4byte gPaletteFade _080F4E1C: .4byte gUnknown_203AB48 _080F4E20: .4byte sub_80568FC thumb_func_end sub_80F4DE0 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 02d8f123f..24fb7c61b 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -499,7 +499,7 @@ sub_8047004: @ 8047004 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08047034 @ =gUnknown_2037AB8 + ldr r0, _08047034 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -518,7 +518,7 @@ _0804702C: pop {r0} bx r0 .align 2, 0 -_08047034: .4byte gUnknown_2037AB8 +_08047034: .4byte gPaletteFade _08047038: .4byte CB2_EggHatch_0 _0804703C: .4byte gUnknown_3005020 _08047040: .4byte sub_807DD24 @@ -912,7 +912,7 @@ _080473D8: .4byte gUnknown_8260134 _080473DC: .4byte gUnknown_3000E74 _080473E0: .4byte sub_80472E4 _080473E4: - ldr r0, _08047408 @ =gUnknown_2037AB8 + ldr r0, _08047408 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -931,7 +931,7 @@ _080473F6: ldr r1, [r5] b _08047648 .align 2, 0 -_08047408: .4byte gUnknown_2037AB8 +_08047408: .4byte gPaletteFade _0804740C: ldr r1, [r5] ldrb r0, [r1, 0x3] @@ -1205,7 +1205,7 @@ _08047648: .align 2, 0 _08047650: .4byte gUnknown_3000E74 _08047654: - ldr r0, _080476A8 @ =gUnknown_2037AB8 + ldr r0, _080476A8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1238,7 +1238,7 @@ _08047684: pop {r0} bx r0 .align 2, 0 -_080476A8: .4byte gUnknown_2037AB8 +_080476A8: .4byte gPaletteFade _080476AC: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_8047338 @@ -1489,7 +1489,7 @@ _0804788C: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - ldr r0, _080478C8 @ =gUnknown_2037AB8 + ldr r0, _080478C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1515,7 +1515,7 @@ _080478BA: bx r0 .align 2, 0 _080478C4: .4byte 0x0000ffff -_080478C8: .4byte gUnknown_2037AB8 +_080478C8: .4byte gPaletteFade _080478CC: .4byte SpriteCB_Egg_5 thumb_func_end SpriteCB_Egg_4 diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s index 671d52e6c..1dafc92ea 100644 --- a/asm/evolution_graphics.s +++ b/asm/evolution_graphics.s @@ -997,8 +997,8 @@ sub_80F6080: @ 80F6080 movs r0, 0 strh r0, [r5, 0x26] bl sub_80D0474 - ldr r0, _080F60D0 @ =gUnknown_2037638 - ldr r1, _080F60D4 @ =gUnknown_2037238 + ldr r0, _080F60D0 @ =gPlttBufferFaded + 0x40 + ldr r1, _080F60D4 @ =gPlttBufferUnfaded + 0x40 movs r2, 0x30 bl CpuSet ldr r0, _080F60D8 @ =0xfff90f1c @@ -1018,8 +1018,8 @@ sub_80F6080: @ 80F6080 bx r0 .align 2, 0 _080F60CC: .4byte gTasks -_080F60D0: .4byte gUnknown_2037638 -_080F60D4: .4byte gUnknown_2037238 +_080F60D0: .4byte gPlttBufferFaded + 0x40 +_080F60D4: .4byte gPlttBufferUnfaded + 0x40 _080F60D8: .4byte 0xfff90f1c _080F60DC: .4byte 0x00007fff _080F60E0: .4byte sub_80F60E4 @@ -1103,7 +1103,7 @@ sub_80F6170: @ 80F6170 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F618C @ =gUnknown_2037AB8 + ldr r0, _080F618C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1115,7 +1115,7 @@ _080F6188: pop {r0} bx r0 .align 2, 0 -_080F618C: .4byte gUnknown_2037AB8 +_080F618C: .4byte gPaletteFade thumb_func_end sub_80F6170 thumb_func_start sub_80F6190 @@ -1159,8 +1159,8 @@ sub_80F61C0: @ 80F61C0 movs r0, 0 strh r0, [r5, 0x26] bl sub_80D0474 - ldr r0, _080F6210 @ =gUnknown_2037638 - ldr r1, _080F6214 @ =gUnknown_2037238 + ldr r0, _080F6210 @ =gPlttBufferFaded + 0x40 + ldr r1, _080F6214 @ =gPlttBufferUnfaded + 0x40 movs r2, 0x30 bl CpuSet ldr r0, _080F6218 @ =0xfff90f00 @@ -1180,8 +1180,8 @@ sub_80F61C0: @ 80F61C0 bx r0 .align 2, 0 _080F620C: .4byte gTasks -_080F6210: .4byte gUnknown_2037638 -_080F6214: .4byte gUnknown_2037238 +_080F6210: .4byte gPlttBufferFaded + 0x40 +_080F6214: .4byte gPlttBufferUnfaded + 0x40 _080F6218: .4byte 0xfff90f00 _080F621C: .4byte 0x00007fff _080F6220: .4byte sub_80F6224 @@ -1369,7 +1369,7 @@ _080F62CE: ldrb r1, [r2, 0x5] lsrs r1, 4 lsls r1, 5 - ldr r0, _080F63FC @ =gUnknown_20377F8 + ldr r0, _080F63FC @ =gPlttBufferFaded + 0x200 mov r10, r0 add r1, r10 add r0, sp, 0x4 @@ -1422,7 +1422,7 @@ _080F63EC: .4byte 0x00007fff _080F63F0: .4byte gTasks _080F63F4: .4byte gSprites _080F63F8: .4byte nullsub_86 -_080F63FC: .4byte gUnknown_20377F8 +_080F63FC: .4byte gPlttBufferFaded + 0x200 thumb_func_end sub_80F62B4 thumb_func_start sub_80F6400 diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 4ee374bed..4aa868a77 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -48,7 +48,7 @@ _080CDD50: strh r0, [r6, 0x8] b _080CDD98 _080CDD68: - ldr r0, _080CDDA0 @ =gUnknown_2037AB8 + ldr r0, _080CDDA0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -76,7 +76,7 @@ _080CDD98: pop {r0} bx r0 .align 2, 0 -_080CDDA0: .4byte gUnknown_2037AB8 +_080CDDA0: .4byte gPaletteFade _080CDDA4: .4byte gPlayerParty thumb_func_end Task_BeginEvolutionScene @@ -375,7 +375,7 @@ EvolutionScene: @ 80CDDF4 strh r2, [r0, 0x1C] ldr r1, _080CE0A8 @ =gUnknown_2039A20 ldr r0, [r1] - ldr r1, _080CE0D8 @ =gUnknown_2037238 + ldr r1, _080CE0D8 @ =gPlttBufferUnfaded + 0x40 adds r0, 0x4 movs r2, 0x60 bl memcpy @@ -423,7 +423,7 @@ _080CE0C8: .4byte gSprites _080CE0CC: .4byte nullsub_10 _080CE0D0: .4byte sub_80CE8DC _080CE0D4: .4byte gTasks -_080CE0D8: .4byte gUnknown_2037238 +_080CE0D8: .4byte gPlttBufferUnfaded + 0x40 _080CE0DC: .4byte nullsub_76 _080CE0E0: .4byte sub_80D0050 _080CE0E4: .4byte sub_80CE710 @@ -1483,7 +1483,7 @@ _080CEA84: .4byte gSprites _080CEA88: .4byte gUnknown_2039A20 _080CEA8C: .4byte gTasks _080CEA90: - ldr r0, _080CEAC0 @ =gUnknown_2037AB8 + ldr r0, _080CEAC0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1505,7 +1505,7 @@ _080CEAA0: adds r1, r0 b _080CEFDE .align 2, 0 -_080CEAC0: .4byte gUnknown_2037AB8 +_080CEAC0: .4byte gPaletteFade _080CEAC4: .4byte gStringVar4 _080CEAC8: .4byte gUnknown_83FE672 _080CEACC: .4byte gTasks @@ -1572,7 +1572,7 @@ _080CEB28: .align 2, 0 _080CEB54: .4byte gTasks _080CEB58: - ldr r0, _080CEB84 @ =gUnknown_2037AB8 + ldr r0, _080CEB84 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1593,7 +1593,7 @@ _080CEB68: adds r1, r0 b _080CEFDE .align 2, 0 -_080CEB84: .4byte gUnknown_2037AB8 +_080CEB84: .4byte gPaletteFade _080CEB88: .4byte gUnknown_2023E82 _080CEB8C: .4byte gTasks _080CEB90: @@ -1748,7 +1748,7 @@ _080CECC0: bl _080CF528 _080CECCE: bl m4aMPlayAllStop - ldr r0, _080CED00 @ =gUnknown_2037238 + ldr r0, _080CED00 @ =gPlttBufferUnfaded + 0x40 ldr r1, _080CED04 @ =gUnknown_2039A20 ldr r1, [r1] adds r1, 0x4 @@ -1769,11 +1769,11 @@ _080CECCE: adds r1, r0 b _080CEFDE .align 2, 0 -_080CED00: .4byte gUnknown_2037238 +_080CED00: .4byte gPlttBufferUnfaded + 0x40 _080CED04: .4byte gUnknown_2039A20 _080CED08: .4byte gTasks _080CED0C: - ldr r0, _080CED28 @ =gUnknown_2037AB8 + ldr r0, _080CED28 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1788,7 +1788,7 @@ _080CED1C: ldrh r0, [r4, 0xC] b _080CEF28 .align 2, 0 -_080CED28: .4byte gUnknown_2037AB8 +_080CED28: .4byte gPaletteFade _080CED2C: bl IsCryFinished lsls r0, 24 @@ -1922,7 +1922,7 @@ _080CEE40: .align 2, 0 _080CEE5C: .4byte gTasks _080CEE60: - ldr r0, _080CEEC4 @ =gUnknown_2037AB8 + ldr r0, _080CEEC4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r2, 0x80 adds r0, r2, 0 @@ -1967,7 +1967,7 @@ _080CEEA0: bl SetMainCallback2 b _080CF528 .align 2, 0 -_080CEEC4: .4byte gUnknown_2037AB8 +_080CEEC4: .4byte gPaletteFade _080CEEC8: .4byte gUnknown_2039A20 _080CEECC: .4byte gUnknown_300537C _080CEED0: @@ -2000,7 +2000,7 @@ _080CEF04: .4byte gUnknown_2023E82 _080CEF08: .4byte 0x0006001c _080CEF0C: .4byte 0x00007fff _080CEF10: - ldr r0, _080CEF38 @ =gUnknown_2037AB8 + ldr r0, _080CEF38 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2023,7 +2023,7 @@ _080CEF2E: strh r0, [r4, 0x8] b _080CF528 .align 2, 0 -_080CEF38: .4byte gUnknown_2037AB8 +_080CEF38: .4byte gPaletteFade _080CEF3C: bl IsCryFinished lsls r0, 24 @@ -2424,7 +2424,7 @@ _080CF284: _080CF2AC: .4byte gTasks _080CF2B0: .4byte gMain _080CF2B4: - ldr r0, _080CF2F4 @ =gUnknown_2037AB8 + ldr r0, _080CF2F4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2455,14 +2455,14 @@ _080CF2C2: strh r0, [r5, 0x14] b _080CF528 .align 2, 0 -_080CF2F4: .4byte gUnknown_2037AB8 +_080CF2F4: .4byte gPaletteFade _080CF2F8: .4byte gPlayerParty _080CF2FC: .4byte gTasks _080CF300: .4byte gPlayerPartyCount _080CF304: .4byte CB2_EvolutionSceneLoadGraphics _080CF308: .4byte gMoveToLearn _080CF30C: - ldr r0, _080CF340 @ =gUnknown_2037AB8 + ldr r0, _080CF340 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2489,7 +2489,7 @@ _080CF324: movs r0, 0xA b _080CF526 .align 2, 0 -_080CF340: .4byte gUnknown_2037AB8 +_080CF340: .4byte gPaletteFade _080CF344: .4byte sub_80CE710 _080CF348: .4byte gTasks _080CF34C: @@ -2887,7 +2887,7 @@ _080CF6AC: .align 2, 0 _080CF6CC: .4byte gTasks _080CF6D0: - ldr r0, _080CF724 @ =gUnknown_2037AB8 + ldr r0, _080CF724 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2925,7 +2925,7 @@ _080CF6E0: bl SetGpuReg bl _080D003A .align 2, 0 -_080CF724: .4byte gUnknown_2037AB8 +_080CF724: .4byte gPaletteFade _080CF728: .4byte gSprites _080CF72C: .4byte gUnknown_2039A20 _080CF730: .4byte gUnknown_2023E82 @@ -3085,7 +3085,7 @@ _080CF86E: ldrh r0, [r4, 0xC] movs r1, 0 bl PlayCry1 - ldr r0, _080CF894 @ =gUnknown_2037238 + ldr r0, _080CF894 @ =gPlttBufferUnfaded + 0x40 ldr r1, _080CF898 @ =gUnknown_2039A20 ldr r1, [r1] adds r1, 0x4 @@ -3094,7 +3094,7 @@ _080CF86E: b _080CFA90 .align 2, 0 _080CF890: .4byte gTasks -_080CF894: .4byte gUnknown_2037238 +_080CF894: .4byte gPlttBufferUnfaded + 0x40 _080CF898: .4byte gUnknown_2039A20 _080CF89C: bl IsCryFinished @@ -3305,7 +3305,7 @@ _080CFA68: .4byte gUnknown_2039A20 _080CFA6C: .4byte 0x0004001c _080CFA70: .4byte 0x00007fff _080CFA74: - ldr r0, _080CFA98 @ =gUnknown_2037AB8 + ldr r0, _080CFA98 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3326,7 +3326,7 @@ _080CFA90: strh r0, [r4, 0x8] b _080D003A .align 2, 0 -_080CFA98: .4byte gUnknown_2037AB8 +_080CFA98: .4byte gPaletteFade _080CFA9C: bl IsCryFinished lsls r0, 24 @@ -3679,7 +3679,7 @@ _080CFDA0: .4byte gUnknown_83FDF3C _080CFDA4: .4byte gDisplayedStringBattle _080CFDA8: .4byte gTasks _080CFDAC: - ldr r0, _080CFE14 @ =gUnknown_2037AB8 + ldr r0, _080CFE14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3724,7 +3724,7 @@ _080CFDC6: strh r0, [r5, 0x14] b _080D003A .align 2, 0 -_080CFE14: .4byte gUnknown_2037AB8 +_080CFE14: .4byte gPaletteFade _080CFE18: .4byte gUnknown_3003F3C _080CFE1C: .4byte gPlayerParty _080CFE20: .4byte gTasks @@ -3732,7 +3732,7 @@ _080CFE24: .4byte gPlayerPartyCount _080CFE28: .4byte CB2_TradeEvolutionSceneLoadGraphics _080CFE2C: .4byte gMoveToLearn _080CFE30: - ldr r0, _080CFE64 @ =gUnknown_2037AB8 + ldr r0, _080CFE64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3759,7 +3759,7 @@ _080CFE4A: movs r0, 0x9 b _080D0038 .align 2, 0 -_080CFE64: .4byte gUnknown_2037AB8 +_080CFE64: .4byte gPaletteFade _080CFE68: .4byte gMain _080CFE6C: .4byte sub_80CE72C _080CFE70: .4byte gTasks diff --git a/asm/fame_checker.s b/asm/fame_checker.s index d86263801..b6fbea82f 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -322,7 +322,7 @@ sub_812C664: @ 812C664 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0812C688 @ =gUnknown_2037AB8 + ldr r0, _0812C688 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -339,7 +339,7 @@ _0812C684: pop {r0} bx r0 .align 2, 0 -_0812C688: .4byte gUnknown_2037AB8 +_0812C688: .4byte gPaletteFade _0812C68C: .4byte gTasks _0812C690: .4byte sub_812C694 thumb_func_end sub_812C664 @@ -1455,7 +1455,7 @@ sub_812CF7C: @ 812CF7C push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0812D074 @ =gUnknown_2037AB8 + ldr r0, _0812D074 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1556,7 +1556,7 @@ _0812D06C: pop {r0} bx r0 .align 2, 0 -_0812D074: .4byte gUnknown_2037AB8 +_0812D074: .4byte gPaletteFade _0812D078: .4byte gUnknown_203B0FC _0812D07C: .4byte gTasks _0812D080: .4byte gSprites diff --git a/asm/field_camera.s b/asm/field_camera.s index 6228b9435..3d4ca0025 100644 --- a/asm/field_camera.s +++ b/asm/field_camera.s @@ -1222,7 +1222,7 @@ CameraPanningCB_PanAhead: @ 805AE74 .align 2, 0 _0805AE84: .4byte gUnknown_2036E2C _0805AE88: - ldr r0, _0805AEA0 @ =gUnknown_2037078 + ldr r0, _0805AEA0 @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x1 bne _0805AEA8 @@ -1235,7 +1235,7 @@ _0805AE88: beq _0805AF10 b _0805AEAE .align 2, 0 -_0805AEA0: .4byte gUnknown_2037078 +_0805AEA0: .4byte gPlayerAvatar _0805AEA4: .4byte gUnknown_3000E9C _0805AEA8: ldr r1, _0805AED0 @ =gUnknown_3000E9C diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index bcd3a10e9..41bcd05c1 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -34,8 +34,8 @@ sub_806C888: @ 806C888 bx r0 thumb_func_end sub_806C888 - thumb_func_start sub_806C8BC -sub_806C8BC: @ 806C8BC + thumb_func_start FieldGetPlayerInput +FieldGetPlayerInput: @ 806C8BC push {r4-r7,lr} mov r7, r8 push {r7} @@ -46,14 +46,14 @@ sub_806C8BC: @ 806C8BC mov r4, sp adds r4, 0x2 strh r2, [r4] - ldr r0, _0806CA14 @ =gUnknown_2037078 + ldr r0, _0806CA14 @ =gPlayerAvatar ldrb r1, [r0, 0x2] mov r8, r1 ldrb r6, [r0, 0x3] bl cur_mapdata_block_role_at_player_pos lsls r0, 24 lsrs r0, 24 - bl sub_8059D70 + bl MetatileBehavior_IsMoveTile lsls r0, 24 lsrs r7, r0, 24 bl ScriptContext1_IsScriptSetUp @@ -89,7 +89,7 @@ _0806C914: ands r0, r1 cmp r0, 0 beq _0806C940 - ldr r0, _0806CA14 @ =gUnknown_2037078 + ldr r0, _0806CA14 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -107,7 +107,7 @@ _0806C940: lsrs r0, 24 cmp r0, 0x1 bls _0806C9D0 - ldr r0, _0806CA14 @ =gUnknown_2037078 + ldr r0, _0806CA14 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -213,7 +213,7 @@ _0806C9F6: movs r0, 0x2 b _0806CA3E .align 2, 0 -_0806CA14: .4byte gUnknown_2037078 +_0806CA14: .4byte gPlayerAvatar _0806CA18: .4byte gUnknown_203ADFA _0806CA1C: movs r0, 0x80 @@ -244,7 +244,7 @@ _0806CA40: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_806C8BC + thumb_func_end FieldGetPlayerInput thumb_func_start sub_806CA4C sub_806CA4C: @ 806CA4C @@ -339,7 +339,7 @@ sub_806CAC8: @ 806CAC8 ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 ldr r7, _0806CB70 @ =gUnknown_3005078 @@ -347,7 +347,7 @@ sub_806CAC8: @ 806CAC8 bl sub_806C888 ldrb r0, [r5, 0x2] strb r0, [r7, 0x2] - bl sub_8081B30 + bl CheckForTrainersWantingBattle lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -406,7 +406,7 @@ _0806CB88: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r7, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 mov r0, sp @@ -431,7 +431,7 @@ _0806CBC0: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r7, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 _0806CBD8: @@ -441,7 +441,7 @@ _0806CBD8: cmp r0, 0 beq _0806CBFC mov r0, r8 - bl sub_806D7F4 + bl is_it_battle_time_3 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -464,7 +464,7 @@ _0806CBFC: mov r0, sp adds r1, r4, 0 adds r2, r6, 0 - bl sub_806D964 + bl mapheader_run_first_tag2_script_list_match_conditionally lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -484,7 +484,7 @@ _0806CC2C: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 ldrb r1, [r5] @@ -541,7 +541,7 @@ _0806CC9C: mov r0, sp adds r1, r4, 0 adds r2, r6, 0 - bl sub_806DCD0 + bl map_warp_consider_2_to_inside lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -567,7 +567,7 @@ _0806CCCC: bl FlagSet movs r0, 0x6 bl PlaySE - bl sub_806F258 + bl ShowStartMenu b _0806CB6C .align 2, 0 _0806CCF4: .4byte gUnknown_3005078 @@ -577,7 +577,7 @@ _0806CCFC: ands r0, r1 cmp r0, 0 beq _0806CD20 - bl sub_810AD10 + bl UseRegisteredKeyItemOnField lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -708,7 +708,7 @@ sub_806CDF8: @ 806CDF8 bne _0806CE18 movs r0, 0x6 bl PlaySE - bl sub_806F258 + bl ShowStartMenu adds r0, r4, 0 bl DestroyTask _0806CE18: @@ -775,7 +775,7 @@ cur_mapdata_block_role_at_player_pos: @ 806CE74 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 add sp, 0x4 @@ -873,7 +873,7 @@ sub_806CF38: @ 806CF38 ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsCounter @@ -906,7 +906,7 @@ _0806CF7E: lsrs r3, r0, 24 cmp r3, 0x10 beq _0806CF9E - ldr r1, _0806CFA8 @ =gUnknown_2036E38 + ldr r1, _0806CFA8 @ =gMapObjects lsls r2, r3, 3 adds r0, r2, r3 lsls r0, 2 @@ -920,7 +920,7 @@ _0806CF9E: b _0806CFDE .align 2, 0 _0806CFA4: .4byte gUnknown_826D2D8 -_0806CFA8: .4byte gUnknown_2036E38 +_0806CFA8: .4byte gMapObjects _0806CFAC: movs r4, 0 ldr r1, _0806CFE4 @ =gUnknown_2031DEC @@ -978,7 +978,7 @@ sub_806CFF4: @ 806CFF4 lsrs r5, r0, 24 cmp r5, 0x10 beq _0806D02A - ldr r2, _0806D098 @ =gUnknown_2036E38 + ldr r2, _0806D098 @ =gMapObjects lsls r1, r5, 3 adds r0, r1, r5 lsls r0, 2 @@ -1016,7 +1016,7 @@ _0806D02A: lsrs r5, r0, 24 cmp r5, 0x10 beq _0806D092 - ldr r2, _0806D098 @ =gUnknown_2036E38 + ldr r2, _0806D098 @ =gMapObjects lsls r1, r5, 3 adds r0, r1, r5 lsls r0, 2 @@ -1031,7 +1031,7 @@ _0806D078: bne _0806D0A0 adds r0, r6, r5 lsls r0, 2 - ldr r1, _0806D098 @ =gUnknown_2036E38 + ldr r1, _0806D098 @ =gMapObjects adds r0, r1 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 @@ -1041,13 +1041,13 @@ _0806D092: movs r0, 0 b _0806D0C8 .align 2, 0 -_0806D098: .4byte gUnknown_2036E38 +_0806D098: .4byte gMapObjects _0806D09C: .4byte gUnknown_826D2D8 _0806D0A0: ldr r0, _0806D0D4 @ =gUnknown_3005074 strb r5, [r0] ldr r4, _0806D0D8 @ =gUnknown_20370D2 - ldr r1, _0806D0DC @ =gUnknown_2036E38 + ldr r1, _0806D0DC @ =gMapObjects adds r0, r6, r5 lsls r0, 2 adds r0, r1 @@ -1071,7 +1071,7 @@ _0806D0C8: .align 2, 0 _0806D0D4: .4byte gUnknown_3005074 _0806D0D8: .4byte gUnknown_20370D2 -_0806D0DC: .4byte gUnknown_2036E38 +_0806D0DC: .4byte gMapObjects _0806D0E0: .4byte gUnknown_20370D4 thumb_func_end sub_806CFF4 @@ -1713,7 +1713,7 @@ sub_806D5E8: @ 806D5E8 lsrs r0, 24 cmp r0, 0x1 beq _0806D650 - ldr r0, _0806D654 @ =gUnknown_2037078 + ldr r0, _0806D654 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -1721,7 +1721,7 @@ sub_806D5E8: @ 806D5E8 bne _0806D658 lsls r0, r6, 24 lsrs r0, 24 - bl sub_8059D70 + bl MetatileBehavior_IsMoveTile lsls r0, 24 cmp r0, 0 bne _0806D658 @@ -1734,7 +1734,7 @@ _0806D650: movs r0, 0x1 b _0806D65A .align 2, 0 -_0806D654: .4byte gUnknown_2037078 +_0806D654: .4byte gPlayerAvatar _0806D658: movs r0, 0 _0806D65A: @@ -1792,7 +1792,7 @@ sub_806D698: @ 806D698 cmp r0, 0x2 beq _0806D72C bl AdjustFriendship_step - ldr r0, _0806D6E4 @ =gUnknown_2037078 + ldr r0, _0806D6E4 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -1800,7 +1800,7 @@ sub_806D698: @ 806D698 bne _0806D720 lsls r0, r4, 24 lsrs r0, 24 - bl sub_8059D70 + bl MetatileBehavior_IsMoveTile lsls r0, 24 cmp r0, 0 bne _0806D720 @@ -1814,7 +1814,7 @@ sub_806D698: @ 806D698 b _0806D730 .align 2, 0 _0806D6E0: .4byte gUnknown_203ADFA -_0806D6E4: .4byte gUnknown_2037078 +_0806D6E4: .4byte gPlayerAvatar _0806D6E8: .4byte gUnknown_81A8CED _0806D6EC: bl overworld_poison_step @@ -1961,15 +1961,15 @@ sub_806D7E8: @ 806D7E8 bx r0 thumb_func_end sub_806D7E8 - thumb_func_start sub_806D7F4 -sub_806D7F4: @ 806D7F4 + thumb_func_start is_it_battle_time_3 +is_it_battle_time_3: @ 806D7F4 push {lr} bl sub_80833B0 lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_806D7F4 + thumb_func_end is_it_battle_time_3 thumb_func_start sub_806D804 sub_806D804: @ 806D804 @@ -2159,8 +2159,8 @@ _0806D958: _0806D960: .4byte gUnknown_81C555B thumb_func_end sub_806D928 - thumb_func_start sub_806D964 -sub_806D964: @ 806D964 + thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally +mapheader_run_first_tag2_script_list_match_conditionally: @ 806D964 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2209,7 +2209,7 @@ _0806D9BC: cmp r0, 0x1 bne _0806DA00 movs r4, 0 - ldr r0, _0806D9FC @ =gUnknown_2037078 + ldr r0, _0806D9FC @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -2230,7 +2230,7 @@ _0806D9E2: movs r0, 0x1 b _0806DA02 .align 2, 0 -_0806D9FC: .4byte gUnknown_2037078 +_0806D9FC: .4byte gPlayerAvatar _0806DA00: movs r0, 0 _0806DA02: @@ -2241,7 +2241,7 @@ _0806DA02: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_806D964 + thumb_func_end mapheader_run_first_tag2_script_list_match_conditionally thumb_func_start sub_806DA10 sub_806DA10: @ 806DA10 @@ -2600,8 +2600,8 @@ _0806DCC4: _0806DCCC: .4byte gSaveBlock1Ptr thumb_func_end sub_806DC54 - thumb_func_start sub_806DCD0 -sub_806DCD0: @ 806DCD0 + thumb_func_start map_warp_consider_2_to_inside +map_warp_consider_2_to_inside: @ 806DCD0 push {r4-r7,lr} adds r6, r0, 0 lsls r1, 16 @@ -2649,7 +2649,7 @@ _0806DD32: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_806DCD0 + thumb_func_end map_warp_consider_2_to_inside thumb_func_start map_warp_check map_warp_check: @ 806DD38 @@ -2799,7 +2799,7 @@ sub_806DE28: @ 806DE28 ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r0, 0x66 bne _0806DE64 movs r0, 0x25 @@ -2839,7 +2839,7 @@ sub_806DE70: @ 806DE70 asrs r0, 16 lsrs r6, r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r0, 0x20 bne _0806DEB8 cmp r5, 0 @@ -3017,7 +3017,7 @@ sub_806DFB8: @ 806DFB8 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r5, r0, 24 ldr r0, _0806E010 @ =gMapHeader @@ -3095,7 +3095,7 @@ GetFieldObjectScriptPointerForComparison: @ 806E050 ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3121,7 +3121,7 @@ SetCableClubWarp: @ 806E08C ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt ldr r4, _0806E0CC @ =gMapHeader adds r0, r4, 0 mov r1, sp diff --git a/asm/field_door.s b/asm/field_door.s index 398b27c55..431189e98 100644 --- a/asm/field_door.s +++ b/asm/field_door.s @@ -487,7 +487,7 @@ sub_805B268: @ 805B268 asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059BDC @@ -515,7 +515,7 @@ sub_805B29C: @ 805B29C asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059BDC @@ -543,7 +543,7 @@ sub_805B2D0: @ 805B2D0 asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059BDC @@ -577,7 +577,7 @@ sub_805B310: @ 805B310 asrs r0, 16 lsls r1, r5, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059BDC 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 diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index a26978dfd..9e416b83a 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -253,7 +253,7 @@ sub_80DAF50: @ 80DAF50 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DAF98 @ =gUnknown_2036E38 + ldr r1, _080DAF98 @ =gMapObjects adds r7, r0, r1 ldrb r1, [r7, 0x4] lsls r0, r1, 4 @@ -281,7 +281,7 @@ _080DAF88: strb r0, [r2] b _080DB0AE .align 2, 0 -_080DAF98: .4byte gUnknown_2036E38 +_080DAF98: .4byte gMapObjects _080DAF9C: .4byte gSprites _080DAFA0: .4byte 0x00020001 _080DAFA4: @@ -587,7 +587,7 @@ oei_shadow: @ 80DB1DC bl GetFieldObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 - ldr r2, _080DB26C @ =gUnknown_2036E38 + ldr r2, _080DB26C @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -649,7 +649,7 @@ _080DB260: bx r1 .align 2, 0 _080DB268: .4byte gUnknown_20386E0 -_080DB26C: .4byte gUnknown_2036E38 +_080DB26C: .4byte gMapObjects _080DB270: .4byte gUnknown_83A0010 _080DB274: .4byte gUnknown_83FECD2 _080DB278: .4byte gSprites @@ -685,7 +685,7 @@ _080DB2AE: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DB33C @ =gUnknown_2036E38 + ldr r1, _080DB33C @ =gMapObjects adds r4, r0, r1 ldrb r0, [r4, 0x4] lsls r1, r0, 4 @@ -748,7 +748,7 @@ _080DB334: pop {r0} bx r0 .align 2, 0 -_080DB33C: .4byte gUnknown_2036E38 +_080DB33C: .4byte gMapObjects _080DB340: .4byte gSprites _080DB344: .4byte 0x00400001 thumb_func_end oamc_shadow @@ -888,7 +888,7 @@ _080DB438: ldrsh r0, [r5, r2] movs r2, 0x32 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r6, r0, 24 mov r0, r8 @@ -929,7 +929,7 @@ _080DB4A0: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DB4F0 @ =gUnknown_2036E38 + ldr r1, _080DB4F0 @ =gMapObjects adds r2, r0, r1 ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] @@ -966,7 +966,7 @@ _080DB4E4: pop {r0} bx r0 .align 2, 0 -_080DB4F0: .4byte gUnknown_2036E38 +_080DB4F0: .4byte gMapObjects thumb_func_end unc_grass_normal thumb_func_start FldEff_JumpTallGrass @@ -1239,7 +1239,7 @@ _080DB6E8: ldrsh r0, [r5, r2] movs r2, 0x32 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 mov r0, r8 @@ -1280,7 +1280,7 @@ _080DB750: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080DB794 @ =gUnknown_2036E38 + ldr r1, _080DB794 @ =gMapObjects adds r2, r0, r1 ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] @@ -1309,7 +1309,7 @@ _080DB786: pop {r0} bx r0 .align 2, 0 -_080DB794: .4byte gUnknown_2036E38 +_080DB794: .4byte gMapObjects thumb_func_end unc_grass_tall thumb_func_start FldEff_JumpLongGrass @@ -1382,7 +1382,7 @@ sub_80DB808: @ 80DB808 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DB8A0 @ =gUnknown_2036E38 + ldr r0, _080DB8A0 @ =gMapObjects adds r5, r1, r0 ldr r0, _080DB8A4 @ =gUnknown_83A0010 ldr r0, [r0, 0x78] @@ -1446,7 +1446,7 @@ _080DB894: bx r1 .align 2, 0 _080DB89C: .4byte gUnknown_20386E0 -_080DB8A0: .4byte gUnknown_2036E38 +_080DB8A0: .4byte gMapObjects _080DB8A4: .4byte gUnknown_83A0010 _080DB8A8: .4byte gSprites thumb_func_end sub_80DB808 @@ -1472,7 +1472,7 @@ sub_80DB8AC: @ 80DB8AC lsls r0, 24 cmp r0, 0 bne _080DB8EA - ldr r5, _080DB8F4 @ =gUnknown_2036E38 + ldr r5, _080DB8F4 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -1489,7 +1489,7 @@ _080DB8EA: bl FieldEffectStop b _080DB98E .align 2, 0 -_080DB8F4: .4byte gUnknown_2036E38 +_080DB8F4: .4byte gMapObjects _080DB8F8: ldrb r0, [r1, 0x5] bl GetFieldObjectGraphicsInfo @@ -1839,7 +1839,7 @@ FldEff_Splash: @ 80DBB88 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DBC20 @ =gUnknown_2036E38 + ldr r0, _080DBC20 @ =gMapObjects adds r5, r1, r0 ldr r0, _080DBC24 @ =gUnknown_83A0010 ldr r0, [r0, 0x34] @@ -1900,7 +1900,7 @@ _080DBC12: bx r1 .align 2, 0 _080DBC1C: .4byte gUnknown_20386E0 -_080DBC20: .4byte gUnknown_2036E38 +_080DBC20: .4byte gMapObjects _080DBC24: .4byte gUnknown_83A0010 _080DBC28: .4byte gSprites thumb_func_end FldEff_Splash @@ -1937,7 +1937,7 @@ _080DBC5C: b _080DBCA6 _080DBC66: ldr r3, _080DBCB0 @ =gSprites - ldr r2, _080DBCB4 @ =gUnknown_2036E38 + ldr r2, _080DBCB4 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -1974,7 +1974,7 @@ _080DBCA6: bx r0 .align 2, 0 _080DBCB0: .4byte gSprites -_080DBCB4: .4byte gUnknown_2036E38 +_080DBCB4: .4byte gMapObjects thumb_func_end sub_80DBC2C thumb_func_start FldEff_JumpSmallSplash @@ -2104,7 +2104,7 @@ FldEff_FeetInFlowingWater: @ 80DBD98 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DBE3C @ =gUnknown_2036E38 + ldr r0, _080DBE3C @ =gMapObjects adds r6, r1, r0 ldr r0, _080DBE40 @ =gUnknown_83A0010 ldr r0, [r0, 0x34] @@ -2171,7 +2171,7 @@ _080DBE2E: bx r1 .align 2, 0 _080DBE38: .4byte gUnknown_20386E0 -_080DBE3C: .4byte gUnknown_2036E38 +_080DBE3C: .4byte gMapObjects _080DBE40: .4byte gUnknown_83A0010 _080DBE44: .4byte gSprites _080DBE48: .4byte sub_80DBE50 @@ -2197,7 +2197,7 @@ sub_80DBE50: @ 80DBE50 lsls r0, 24 cmp r0, 0 bne _080DBE8A - ldr r2, _080DBE94 @ =gUnknown_2036E38 + ldr r2, _080DBE94 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -2214,7 +2214,7 @@ _080DBE8A: bl FieldEffectStop b _080DBEE2 .align 2, 0 -_080DBE94: .4byte gUnknown_2036E38 +_080DBE94: .4byte gMapObjects _080DBE98: ldrb r1, [r5, 0x4] lsls r0, r1, 4 @@ -2323,7 +2323,7 @@ sub_80DBF50: @ 80DBF50 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DBFE8 @ =gUnknown_2036E38 + ldr r0, _080DBFE8 @ =gMapObjects adds r5, r1, r0 ldr r0, _080DBFEC @ =gUnknown_83A0010 ldr r0, [r0, 0x7C] @@ -2387,7 +2387,7 @@ _080DBFDC: bx r1 .align 2, 0 _080DBFE4: .4byte gUnknown_20386E0 -_080DBFE8: .4byte gUnknown_2036E38 +_080DBFE8: .4byte gMapObjects _080DBFEC: .4byte gUnknown_83A0010 _080DBFF0: .4byte gSprites thumb_func_end sub_80DBF50 @@ -2411,7 +2411,7 @@ sub_80DBFF4: @ 80DBFF4 lsls r0, 24 cmp r0, 0 bne _080DC02E - ldr r5, _080DC038 @ =gUnknown_2036E38 + ldr r5, _080DC038 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -2428,7 +2428,7 @@ _080DC02E: bl FieldEffectStop b _080DC080 .align 2, 0 -_080DC038: .4byte gUnknown_2036E38 +_080DC038: .4byte gMapObjects _080DC03C: ldrb r0, [r1, 0x5] bl GetFieldObjectGraphicsInfo @@ -2863,8 +2863,8 @@ sub_80DC348: @ 80DC348 movs r2, 0x32 ldrsh r1, [r4, r2] bl CurrentMapDrawMetatileAt - ldr r2, _080DC3A0 @ =gUnknown_2036E38 - ldr r0, _080DC3A4 @ =gUnknown_2037078 + ldr r2, _080DC3A0 @ =gMapObjects + ldr r0, _080DC3A4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2880,8 +2880,8 @@ sub_80DC348: @ 80DC348 pop {r0} bx r0 .align 2, 0 -_080DC3A0: .4byte gUnknown_2036E38 -_080DC3A4: .4byte gUnknown_2037078 +_080DC3A0: .4byte gMapObjects +_080DC3A4: .4byte gPlayerAvatar thumb_func_end sub_80DC348 thumb_func_start sub_80DC3A8 @@ -3081,7 +3081,7 @@ sub_80DC4F8: @ 80DC4F8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080DC548 @ =gUnknown_2036E38 + ldr r0, _080DC548 @ =gMapObjects adds r4, r0 ldrb r0, [r4, 0x4] lsls r5, r0, 4 @@ -3112,7 +3112,7 @@ sub_80DC4F8: @ 80DC4F8 pop {r0} bx r0 .align 2, 0 -_080DC548: .4byte gUnknown_2036E38 +_080DC548: .4byte gMapObjects _080DC54C: .4byte gSprites thumb_func_end sub_80DC4F8 @@ -3454,7 +3454,7 @@ FldEff_SandPile: @ 80DC7B0 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080DC860 @ =gUnknown_2036E38 + ldr r0, _080DC860 @ =gMapObjects adds r6, r1, r0 ldr r0, _080DC864 @ =gUnknown_83A0010 ldr r0, [r0, 0x74] @@ -3528,7 +3528,7 @@ _080DC854: bx r1 .align 2, 0 _080DC85C: .4byte gUnknown_20386E0 -_080DC860: .4byte gUnknown_2036E38 +_080DC860: .4byte gMapObjects _080DC864: .4byte gUnknown_83A0010 _080DC868: .4byte gSprites thumb_func_end FldEff_SandPile @@ -3552,7 +3552,7 @@ sub_80DC86C: @ 80DC86C lsls r0, 24 cmp r0, 0 bne _080DC8A6 - ldr r2, _080DC8B0 @ =gUnknown_2036E38 + ldr r2, _080DC8B0 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3569,7 +3569,7 @@ _080DC8A6: bl FieldEffectStop b _080DC926 .align 2, 0 -_080DC8B0: .4byte gUnknown_2036E38 +_080DC8B0: .4byte gMapObjects _080DC8B4: ldr r2, _080DC930 @ =gSprites ldrb r1, [r1, 0x4] @@ -3608,7 +3608,7 @@ _080DC8F6: strh r6, [r4, 0x20] strh r5, [r4, 0x22] ldr r3, _080DC930 @ =gSprites - ldr r2, _080DC934 @ =gUnknown_2036E38 + ldr r2, _080DC934 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3635,7 +3635,7 @@ _080DC926: bx r0 .align 2, 0 _080DC930: .4byte gSprites -_080DC934: .4byte gUnknown_2036E38 +_080DC934: .4byte gMapObjects thumb_func_end sub_80DC86C thumb_func_start FldEff_Bubbles @@ -3882,7 +3882,7 @@ sub_80DCAC8: @ 80DCAC8 adds r0, r5, 0 bl FieldEffectStop _080DCAF8: - ldr r4, _080DCBB0 @ =gUnknown_2036E38 + ldr r4, _080DCBB0 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3975,7 +3975,7 @@ _080DCBA8: pop {r0} bx r0 .align 2, 0 -_080DCBB0: .4byte gUnknown_2036E38 +_080DCBB0: .4byte gMapObjects _080DCBB4: .4byte gSprites thumb_func_end sub_80DCAC8 @@ -4217,7 +4217,7 @@ _080DCD5E: lsls r0, r7, 3 adds r0, r7 lsls r0, 2 - ldr r1, _080DCDF8 @ =gUnknown_2036E38 + ldr r1, _080DCDF8 @ =gMapObjects adds r4, r0, r1 ldrb r0, [r4] lsls r0, 31 @@ -4291,7 +4291,7 @@ _080DCDD8: strb r0, [r2] b _080DCE0A .align 2, 0 -_080DCDF8: .4byte gUnknown_2036E38 +_080DCDF8: .4byte gMapObjects _080DCDFC: .4byte gSprites _080DCE00: adds r0, r7, 0x1 diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index 1b3aaf9d3..703316872 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -11,7 +11,7 @@ palette_bg_faded_fill_white: @ 807DB14 sub sp, 0x4 ldr r0, _0807DB2C @ =0x7fff7fff str r0, [sp] - ldr r1, _0807DB30 @ =gUnknown_20375F8 + ldr r1, _0807DB30 @ =gPlttBufferFaded ldr r2, _0807DB34 @ =0x01000100 mov r0, sp bl CpuFastSet @@ -20,7 +20,7 @@ palette_bg_faded_fill_white: @ 807DB14 bx r0 .align 2, 0 _0807DB2C: .4byte 0x7fff7fff -_0807DB30: .4byte gUnknown_20375F8 +_0807DB30: .4byte gPlttBufferFaded _0807DB34: .4byte 0x01000100 thumb_func_end palette_bg_faded_fill_white @@ -30,7 +30,7 @@ palette_bg_faded_fill_black: @ 807DB38 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r1, _0807DB50 @ =gUnknown_20375F8 + ldr r1, _0807DB50 @ =gPlttBufferFaded ldr r2, _0807DB54 @ =0x01000100 mov r0, sp bl CpuFastSet @@ -38,7 +38,7 @@ palette_bg_faded_fill_black: @ 807DB38 pop {r0} bx r0 .align 2, 0 -_0807DB50: .4byte gUnknown_20375F8 +_0807DB50: .4byte gPlttBufferFaded _0807DB54: .4byte 0x01000100 thumb_func_end palette_bg_faded_fill_black @@ -461,7 +461,7 @@ sub_807DE78: @ 807DE78 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -727,7 +727,7 @@ _0807E0AE: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E0E8 @ =gUnknown_2036E38 + ldr r1, _0807E0E8 @ =gMapObjects adds r0, r1 movs r1, 0x10 bl sub_8063CA4 @@ -735,7 +735,7 @@ _0807E0AE: strh r0, [r4, 0x8] b _0807E206 .align 2, 0 -_0807E0E8: .4byte gUnknown_2036E38 +_0807E0E8: .4byte gMapObjects _0807E0EC: ldrh r0, [r4, 0x24] adds r0, 0x1 @@ -781,13 +781,13 @@ _0807E10E: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E15C @ =gUnknown_2036E38 + ldr r1, _0807E15C @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished b _0807E1F2 .align 2, 0 _0807E158: .4byte sub_807F204 -_0807E15C: .4byte gUnknown_2036E38 +_0807E15C: .4byte gMapObjects _0807E160: bl sub_807E418 cmp r0, 0 @@ -804,7 +804,7 @@ _0807E160: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E194 @ =gUnknown_2036E38 + ldr r1, _0807E194 @ =gMapObjects adds r0, r1 movs r1, 0x10 bl sub_8063CA4 @@ -812,7 +812,7 @@ _0807E160: strh r0, [r4, 0x8] b _0807E206 .align 2, 0 -_0807E194: .4byte gUnknown_2036E38 +_0807E194: .4byte gMapObjects _0807E198: bl walkrun_is_standing_still lsls r0, 24 @@ -836,14 +836,14 @@ _0807E198: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E1D8 @ =gUnknown_2036E38 + ldr r1, _0807E1D8 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished movs r0, 0x3 strh r0, [r4, 0x8] b _0807E206 .align 2, 0 -_0807E1D8: .4byte gUnknown_2036E38 +_0807E1D8: .4byte gMapObjects _0807E1DC: movs r1, 0xA ldrsh r0, [r4, r1] @@ -927,7 +927,7 @@ _0807E25E: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0807E2A4 @ =gUnknown_2036E38 + ldr r0, _0807E2A4 @ =gMapObjects adds r4, r0 bl player_get_direction_lower_nybble lsls r0, 24 @@ -942,7 +942,7 @@ _0807E25E: strh r0, [r5, 0x8] b _0807E2C6 .align 2, 0 -_0807E2A4: .4byte gUnknown_2036E38 +_0807E2A4: .4byte gMapObjects _0807E2A8: bl walkrun_is_standing_still lsls r0, 24 @@ -1125,12 +1125,12 @@ _0807E408: .4byte task_mpl_807E3C8 thumb_func_start sub_807E40C sub_807E40C: @ 807E40C - ldr r0, _0807E414 @ =gUnknown_2037AB8 + ldr r0, _0807E414 @ =gPaletteFade ldrb r0, [r0, 0x7] lsrs r0, 7 bx lr .align 2, 0 -_0807E414: .4byte gUnknown_2037AB8 +_0807E414: .4byte gPaletteFade thumb_func_end sub_807E40C thumb_func_start sub_807E418 @@ -1729,7 +1729,7 @@ _0807E8AE: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r4, _0807E8F0 @ =gUnknown_2036E38 + ldr r4, _0807E8F0 @ =gMapObjects adds r0, r4 bl FieldObjectClearAnimIfSpecialAnimActive movs r0, 0xFF @@ -1749,7 +1749,7 @@ _0807E8AE: strh r0, [r5, 0x8] b _0807E976 .align 2, 0 -_0807E8F0: .4byte gUnknown_2036E38 +_0807E8F0: .4byte gMapObjects _0807E8F4: bl walkrun_is_standing_still lsls r0, 24 @@ -1774,7 +1774,7 @@ _0807E8F4: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E93C @ =gUnknown_2036E38 + ldr r1, _0807E93C @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished movs r0, 0 @@ -1783,7 +1783,7 @@ _0807E8F4: strh r0, [r5, 0x8] b _0807E976 .align 2, 0 -_0807E93C: .4byte gUnknown_2036E38 +_0807E93C: .4byte gMapObjects _0807E940: movs r1, 0xA ldrsh r0, [r5, r1] @@ -1831,12 +1831,12 @@ sub_807E980: @ 807E980 lsls r0, 3 ldr r1, _0807E9C0 @ =gTasks+0x8 adds r5, r0, r1 - ldr r2, _0807E9C4 @ =gUnknown_2037078 + ldr r2, _0807E9C4 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807E9C8 @ =gUnknown_2036E38 + ldr r1, _0807E9C8 @ =gMapObjects adds r6, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -1855,8 +1855,8 @@ sub_807E980: @ 807E980 b _0807EA9A .align 2, 0 _0807E9C0: .4byte gTasks+0x8 -_0807E9C4: .4byte gUnknown_2037078 -_0807E9C8: .4byte gUnknown_2036E38 +_0807E9C4: .4byte gPlayerAvatar +_0807E9C8: .4byte gMapObjects _0807E9CC: .4byte gSprites _0807E9D0: cmp r0, 0x2 @@ -1984,7 +1984,7 @@ sub_807EAC4: @ 807EAC4 lsls r0, 16 lsrs r0, 16 mov r12, r0 - ldr r3, _0807EB58 @ =gUnknown_2037078 + ldr r3, _0807EB58 @ =gPlayerAvatar ldrb r2, [r3, 0x4] lsls r0, r2, 4 adds r0, r2 @@ -1995,7 +1995,7 @@ sub_807EAC4: @ 807EAC4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0807EB60 @ =gUnknown_2036E38 + ldr r2, _0807EB60 @ =gMapObjects adds r0, r2 mov r8, r0 lsls r1, 16 @@ -2049,9 +2049,9 @@ _0807EB4C: pop {r0} bx r0 .align 2, 0 -_0807EB58: .4byte gUnknown_2037078 +_0807EB58: .4byte gPlayerAvatar _0807EB5C: .4byte gSprites -_0807EB60: .4byte gUnknown_2036E38 +_0807EB60: .4byte gMapObjects thumb_func_end sub_807EAC4 thumb_func_start sub_807EB64 @@ -2064,12 +2064,12 @@ sub_807EB64: @ 807EB64 mov r8, r2 lsls r5, 16 lsrs r5, 16 - ldr r0, _0807EBB4 @ =gUnknown_2037078 + ldr r0, _0807EBB4 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0807EBB8 @ =gUnknown_2036E38 + ldr r0, _0807EBB8 @ =gMapObjects adds r4, r0 bl player_get_direction_lower_nybble lsls r0, 24 @@ -2092,8 +2092,8 @@ sub_807EB64: @ 807EB64 pop {r0} bx r0 .align 2, 0 -_0807EBB4: .4byte gUnknown_2037078 -_0807EBB8: .4byte gUnknown_2036E38 +_0807EBB4: .4byte gPlayerAvatar +_0807EBB8: .4byte gMapObjects thumb_func_end sub_807EB64 thumb_func_start sub_807EBBC @@ -2247,7 +2247,7 @@ sub_807ECBC: @ 807ECBC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r6, r0, 24 adds r0, r6, 0 @@ -2266,13 +2266,13 @@ _0807ED06: _0807ED0A: movs r1, 0x4 _0807ED0C: - ldr r0, _0807ED94 @ =gUnknown_2037078 + ldr r0, _0807ED94 @ =gPlayerAvatar mov r8, r0 ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0807ED98 @ =gUnknown_2036E38 + ldr r0, _0807ED98 @ =gMapObjects adds r4, r0 adds r0, r1, 0 bl sub_8064270 @@ -2332,8 +2332,8 @@ _0807ED0C: pop {r0} bx r0 .align 2, 0 -_0807ED94: .4byte gUnknown_2037078 -_0807ED98: .4byte gUnknown_2036E38 +_0807ED94: .4byte gPlayerAvatar +_0807ED98: .4byte gMapObjects _0807ED9C: .4byte gSprites thumb_func_end sub_807ECBC @@ -2343,7 +2343,7 @@ sub_807EDA0: @ 807EDA0 adds r5, r0, 0 adds r6, r1, 0 ldr r4, [sp, 0x14] - ldr r0, _0807EDC8 @ =gUnknown_2037078 + ldr r0, _0807EDC8 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -2359,7 +2359,7 @@ sub_807EDA0: @ 807EDA0 movs r0, 0 b _0807EDF8 .align 2, 0 -_0807EDC8: .4byte gUnknown_2037078 +_0807EDC8: .4byte gPlayerAvatar _0807EDCC: .4byte gSprites _0807EDD0: ldrh r0, [r5] diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index 4fc86db2c..40159bc04 100644 --- a/asm/field_ground_effect.s +++ b/asm/field_ground_effect.s @@ -118,13 +118,13 @@ FieldObjectUpdateMetatileBehaviors: @ 8067C24 ldrsh r0, [r4, r1] movs r2, 0x16 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strb r0, [r4, 0x1F] movs r1, 0x10 ldrsh r0, [r4, r1] movs r2, 0x12 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strb r0, [r4, 0x1E] pop {r4} pop {r0} @@ -616,7 +616,7 @@ _08067FA0: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -632,7 +632,7 @@ _08067FA0: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -661,7 +661,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -678,7 +678,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -695,7 +695,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -712,7 +712,7 @@ _08067FFC: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl GetReflectionTypeByMetatileBehavior @@ -801,7 +801,7 @@ _08068114: asrs r0, 16 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 ldr r2, _08068144 @ =gUnknown_83A705C diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 068f9c554..c79a0330f 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -28,7 +28,7 @@ npc_clear_ids_and_state: @ 805DE2C npcs_clear_ids_and_state: @ 805DE4C push {r4,r5,lr} movs r4, 0 - ldr r5, _0805DE70 @ =gUnknown_2036E38 + ldr r5, _0805DE70 @ =gMapObjects _0805DE52: lsls r0, r4, 3 adds r0, r4 @@ -44,7 +44,7 @@ _0805DE52: pop {r0} bx r0 .align 2, 0 -_0805DE70: .4byte gUnknown_2036E38 +_0805DE70: .4byte gMapObjects thumb_func_end npcs_clear_ids_and_state thumb_func_start sub_805DE74 @@ -141,11 +141,11 @@ _0805DF2C: .4byte gSprites sub_805DF30: @ 805DF30 push {lr} movs r1, 0 - ldr r2, _0805DF3C @ =gUnknown_2036E38 + ldr r2, _0805DF3C @ =gMapObjects ldrb r0, [r2] b _0805DF54 .align 2, 0 -_0805DF3C: .4byte gUnknown_2036E38 +_0805DF3C: .4byte gMapObjects _0805DF40: adds r0, r1, 0x1 lsls r0, 24 @@ -219,7 +219,7 @@ _0805DFA8: GetFieldObjectIdByXY: @ 805DFB0 push {r4-r6,lr} movs r3, 0 - ldr r5, _0805DFF0 @ =gUnknown_2036E38 + ldr r5, _0805DFF0 @ =gMapObjects lsls r0, 16 asrs r4, r0, 16 lsls r1, 16 @@ -253,7 +253,7 @@ _0805DFE8: pop {r1} bx r1 .align 2, 0 -_0805DFF0: .4byte gUnknown_2036E38 +_0805DFF0: .4byte gMapObjects thumb_func_end GetFieldObjectIdByXY thumb_func_start GetFieldObjectIdByLocalIdAndMapInternal @@ -266,7 +266,7 @@ GetFieldObjectIdByLocalIdAndMapInternal: @ 805DFF4 lsls r2, 24 lsrs r2, 24 movs r1, 0 - ldr r6, _0805E02C @ =gUnknown_2036E38 + ldr r6, _0805E02C @ =gMapObjects _0805E006: lsls r0, r1, 3 adds r0, r1 @@ -288,7 +288,7 @@ _0805E006: adds r0, r1, 0 b _0805E03C .align 2, 0 -_0805E02C: .4byte gUnknown_2036E38 +_0805E02C: .4byte gMapObjects _0805E030: adds r0, r1, 0x1 lsls r0, 24 @@ -308,7 +308,7 @@ GetFieldObjectIdByLocalId: @ 805E044 lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r4, _0805E068 @ =gUnknown_2036E38 + ldr r4, _0805E068 @ =gMapObjects _0805E04E: lsls r0, r2, 3 adds r0, r2 @@ -324,7 +324,7 @@ _0805E04E: adds r0, r2, 0 b _0805E078 .align 2, 0 -_0805E068: .4byte gUnknown_2036E38 +_0805E068: .4byte gMapObjects _0805E06C: adds r0, r2, 0x1 lsls r0, 24 @@ -414,7 +414,7 @@ _0805E10A: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805E13C @ =gUnknown_2036E38 + ldr r1, _0805E13C @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl npc_clear_ids_and_state @@ -434,7 +434,7 @@ _0805E10A: adds r0, r1 b _0805E14E .align 2, 0 -_0805E13C: .4byte gUnknown_2036E38 +_0805E13C: .4byte gMapObjects _0805E140: ldrh r0, [r5, 0x4] adds r0, 0x7 @@ -839,7 +839,7 @@ GetAvailableFieldObjectSlot: @ 805E414 lsls r2, 24 lsrs r4, r2, 24 movs r2, 0 - ldr r1, _0805E470 @ =gUnknown_2036E38 + ldr r1, _0805E470 @ =gMapObjects ldrb r0, [r1] lsls r0, 31 adds r7, r1, 0 @@ -881,11 +881,11 @@ _0805E46C: movs r0, 0x1 b _0805E4A8 .align 2, 0 -_0805E470: .4byte gUnknown_2036E38 +_0805E470: .4byte gMapObjects _0805E474: mov r0, r12 strb r2, [r0] - ldr r1, _0805E4B0 @ =gUnknown_2036E38 + ldr r1, _0805E4B0 @ =gMapObjects _0805E47A: lsls r0, r2, 3 adds r0, r2 @@ -916,7 +916,7 @@ _0805E4A8: pop {r1} bx r1 .align 2, 0 -_0805E4B0: .4byte gUnknown_2036E38 +_0805E4B0: .4byte gMapObjects thumb_func_end GetAvailableFieldObjectSlot thumb_func_start RemoveFieldObject @@ -958,7 +958,7 @@ RemoveFieldObjectByLocalIdAndMap: @ 805E4C8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805E50C @ =gUnknown_2036E38 + ldr r1, _0805E50C @ =gMapObjects adds r0, r1 bl RemoveFieldObject _0805E506: @@ -966,7 +966,7 @@ _0805E506: pop {r0} bx r0 .align 2, 0 -_0805E50C: .4byte gUnknown_2036E38 +_0805E50C: .4byte gMapObjects thumb_func_end RemoveFieldObjectByLocalIdAndMap thumb_func_start RemoveFieldObjectInternal @@ -1012,14 +1012,14 @@ unref_sub_808D958: @ 805E55C push {r4,lr} movs r4, 0 _0805E560: - ldr r0, _0805E588 @ =gUnknown_2037078 + ldr r0, _0805E588 @ =gPlayerAvatar ldrb r0, [r0, 0x5] cmp r4, r0 beq _0805E576 lsls r0, r4, 3 adds r0, r4 lsls r0, 2 - ldr r1, _0805E58C @ =gUnknown_2036E38 + ldr r1, _0805E58C @ =gMapObjects adds r0, r1 bl RemoveFieldObject _0805E576: @@ -1032,8 +1032,8 @@ _0805E576: pop {r0} bx r0 .align 2, 0 -_0805E588: .4byte gUnknown_2037078 -_0805E58C: .4byte gUnknown_2036E38 +_0805E588: .4byte gPlayerAvatar +_0805E58C: .4byte gMapObjects thumb_func_end unref_sub_808D958 thumb_func_start sub_805E590 @@ -1071,7 +1071,7 @@ _0805E5CA: lsls r4, r0, 3 adds r0, r4, r0 lsls r0, 2 - ldr r1, _0805E5F4 @ =gUnknown_2036E38 + ldr r1, _0805E5F4 @ =gMapObjects adds r5, r0, r1 ldrb r0, [r5, 0x5] bl GetFieldObjectGraphicsInfo @@ -1087,7 +1087,7 @@ _0805E5CA: bl npc_load_two_palettes__no_record b _0805E606 .align 2, 0 -_0805E5F4: .4byte gUnknown_2036E38 +_0805E5F4: .4byte gMapObjects _0805E5F8: cmp r0, 0xA bne _0805E606 @@ -1116,7 +1116,7 @@ _0805E614: lsrs r7, r0, 24 cmp r7, 0x40 bne _0805E650 - ldr r0, _0805E64C @ =gUnknown_2036E38 + ldr r0, _0805E64C @ =gMapObjects mov r2, r8 adds r1, r4, r2 lsls r1, 2 @@ -1130,7 +1130,7 @@ _0805E614: b _0805E718 .align 2, 0 _0805E648: .4byte 0x0000ffff -_0805E64C: .4byte gUnknown_2036E38 +_0805E64C: .4byte gMapObjects _0805E650: lsls r0, r7, 4 adds r0, r7 @@ -1302,7 +1302,7 @@ SpawnFieldObject: @ 805E72C _0805E7A4: .4byte 0xffff0000 _0805E7A8: ldr r4, _0805E7EC @ =gSprites - ldr r1, _0805E7F0 @ =gUnknown_2036E38 + ldr r1, _0805E7F0 @ =gMapObjects lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -1338,7 +1338,7 @@ _0805E7DE: bx r1 .align 2, 0 _0805E7EC: .4byte gSprites -_0805E7F0: .4byte gUnknown_2036E38 +_0805E7F0: .4byte gMapObjects thumb_func_end SpawnFieldObject thumb_func_start SpawnSpecialFieldObject @@ -2035,7 +2035,7 @@ _0805ED2E: lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r1, _0805ED68 @ =gUnknown_2036E38 + ldr r1, _0805ED68 @ =gMapObjects adds r2, r0, r1 ldr r0, [r2] ldr r1, _0805ED6C @ =0x00010001 @@ -2054,7 +2054,7 @@ _0805ED56: bx r0 .align 2, 0 _0805ED64: .4byte gUnknown_2031DEC -_0805ED68: .4byte gUnknown_2036E38 +_0805ED68: .4byte gMapObjects _0805ED6C: .4byte 0x00010001 thumb_func_end RemoveFieldObjectsOutsideView @@ -2138,7 +2138,7 @@ sub_805EDF0: @ 805EDF0 lsrs r5, 16 bl ClearPlayerAvatarInfo movs r6, 0 - ldr r7, _0805EE38 @ =gUnknown_2036E38 + ldr r7, _0805EE38 @ =gMapObjects lsls r4, 16 lsls r5, 16 _0805EE0A: @@ -2165,7 +2165,7 @@ _0805EE24: pop {r0} bx r0 .align 2, 0 -_0805EE38: .4byte gUnknown_2036E38 +_0805EE38: .4byte gMapObjects thumb_func_end sub_805EDF0 thumb_func_start sub_805EE3C @@ -2207,7 +2207,7 @@ _0805EE70: lsls r0, r1, 3 add r0, r8 lsls r0, 2 - ldr r1, _0805EFE4 @ =gUnknown_2036E38 + ldr r1, _0805EFE4 @ =gMapObjects adds r6, r0, r1 movs r0, 0 str r0, [sp, 0x20] @@ -2376,7 +2376,7 @@ _0805EFCE: bx r0 .align 2, 0 _0805EFE0: .4byte gUnknown_2031DEC -_0805EFE4: .4byte gUnknown_2036E38 +_0805EFE4: .4byte gMapObjects _0805EFE8: .4byte 0xffff0000 _0805EFEC: .4byte 0x0000ffff _0805EFF0: .4byte gSprites @@ -2418,10 +2418,10 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0805F058 @ =gUnknown_2037078 + ldr r5, _0805F058 @ =gPlayerAvatar strb r0, [r5, 0x5] strb r1, [r5, 0x4] - ldr r1, _0805F05C @ =gUnknown_2036E38 + ldr r1, _0805F05C @ =gMapObjects lsls r4, r0, 3 adds r4, r0 lsls r4, 2 @@ -2436,8 +2436,8 @@ SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C pop {r0} bx r0 .align 2, 0 -_0805F058: .4byte gUnknown_2037078 -_0805F05C: .4byte gUnknown_2036E38 +_0805F058: .4byte gPlayerAvatar +_0805F05C: .4byte gMapObjects thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId thumb_func_start sub_805F060 @@ -2649,7 +2649,7 @@ FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805F214 @ =gUnknown_2036E38 + ldr r1, _0805F214 @ =gMapObjects adds r0, r1 adds r1, r4, 0 bl sub_805F060 @@ -2659,7 +2659,7 @@ _0805F20C: pop {r0} bx r0 .align 2, 0 -_0805F214: .4byte gUnknown_2036E38 +_0805F214: .4byte gMapObjects thumb_func_end FieldObjectSetGraphicsIdByLocalIdAndMap thumb_func_start FieldObjectTurn @@ -2725,7 +2725,7 @@ FieldObjectTurnByLocalIdAndMap: @ 805F268 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805F2A4 @ =gUnknown_2036E38 + ldr r1, _0805F2A4 @ =gMapObjects adds r0, r1 adds r1, r4, 0 bl FieldObjectTurn @@ -2735,7 +2735,7 @@ _0805F29C: pop {r0} bx r0 .align 2, 0 -_0805F2A4: .4byte gUnknown_2036E38 +_0805F2A4: .4byte gMapObjects thumb_func_end FieldObjectTurnByLocalIdAndMap thumb_func_start PlayerObjectTurn @@ -2747,13 +2747,13 @@ PlayerObjectTurn: @ 805F2A8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805F2C4 @ =gUnknown_2036E38 + ldr r2, _0805F2C4 @ =gMapObjects adds r0, r2 bl FieldObjectTurn pop {r0} bx r0 .align 2, 0 -_0805F2C4: .4byte gUnknown_2036E38 +_0805F2C4: .4byte gMapObjects thumb_func_end PlayerObjectTurn thumb_func_start GetFieldObjectGraphicsInfo @@ -2819,7 +2819,7 @@ npc_by_local_id_and_map_set_field_1_bit_x20: @ 805F314 lsls r0, 24 cmp r0, 0 bne _0805F356 - ldr r2, _0805F360 @ =gUnknown_2036E38 + ldr r2, _0805F360 @ =gMapObjects mov r0, sp ldrb r0, [r0] lsls r1, r0, 3 @@ -2842,7 +2842,7 @@ _0805F356: pop {r0} bx r0 .align 2, 0 -_0805F360: .4byte gUnknown_2036E38 +_0805F360: .4byte gMapObjects thumb_func_end npc_by_local_id_and_map_set_field_1_bit_x20 thumb_func_start FieldObjectGetLocalIdAndMap @@ -2874,7 +2874,7 @@ sub_805F378: @ 805F378 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805F3A4 @ =gUnknown_2036E38 + ldr r1, _0805F3A4 @ =gMapObjects adds r0, r1 ldrb r1, [r0] movs r2, 0x4 @@ -2884,7 +2884,7 @@ _0805F3A0: pop {r0} bx r0 .align 2, 0 -_0805F3A4: .4byte gUnknown_2036E38 +_0805F3A4: .4byte gMapObjects thumb_func_end sub_805F378 thumb_func_start sub_805F3A8 @@ -2909,7 +2909,7 @@ sub_805F3A8: @ 805F3A8 lsls r2, r0, 3 adds r2, r0 lsls r2, 2 - ldr r0, _0805F3F8 @ =gUnknown_2036E38 + ldr r0, _0805F3F8 @ =gMapObjects adds r2, r0 ldrb r1, [r2, 0x4] lsls r0, r1, 4 @@ -2929,7 +2929,7 @@ _0805F3EE: pop {r0} bx r0 .align 2, 0 -_0805F3F8: .4byte gUnknown_2036E38 +_0805F3F8: .4byte gMapObjects _0805F3FC: .4byte gSprites thumb_func_end sub_805F3A8 @@ -2953,7 +2953,7 @@ sub_805F400: @ 805F400 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0805F444 @ =gUnknown_2036E38 + ldr r0, _0805F444 @ =gMapObjects adds r1, r0 ldrb r2, [r1, 0x3] movs r0, 0x5 @@ -2969,7 +2969,7 @@ _0805F43C: pop {r0} bx r0 .align 2, 0 -_0805F444: .4byte gUnknown_2036E38 +_0805F444: .4byte gMapObjects thumb_func_end sub_805F400 thumb_func_start sub_805F448 @@ -2992,7 +2992,7 @@ sub_805F448: @ 805F448 lsls r0, 24 cmp r0, 0 bne _0805F48C - ldr r2, _0805F494 @ =gUnknown_2036E38 + ldr r2, _0805F494 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -3013,7 +3013,7 @@ _0805F48C: pop {r0} bx r0 .align 2, 0 -_0805F494: .4byte gUnknown_2036E38 +_0805F494: .4byte gMapObjects _0805F498: .4byte gSprites thumb_func_end sub_805F448 @@ -3483,7 +3483,7 @@ sub_805F7C4: @ 805F7C4 lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r3, _0805F814 @ =gUnknown_2036E38 + ldr r3, _0805F814 @ =gMapObjects adds r0, r3 movs r3, 0xE0 lsls r3, 11 @@ -3498,7 +3498,7 @@ _0805F80C: pop {r0} bx r0 .align 2, 0 -_0805F814: .4byte gUnknown_2036E38 +_0805F814: .4byte gMapObjects thumb_func_end sub_805F7C4 thumb_func_start npc_coords_shift_still @@ -3523,7 +3523,7 @@ UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C cmp r0, 0 beq _0805F884 movs r3, 0 - ldr r5, _0805F890 @ =gUnknown_2036E38 + ldr r5, _0805F890 @ =gMapObjects movs r0, 0x4 ldrsh r4, [r2, r0] movs r0, 0x8 @@ -3567,7 +3567,7 @@ _0805F884: bx r0 .align 2, 0 _0805F88C: .4byte gUnknown_2036E18 -_0805F890: .4byte gUnknown_2036E38 +_0805F890: .4byte gMapObjects thumb_func_end UpdateFieldObjectCoordsForCameraUpdate thumb_func_start GetFieldObjectIdByXYZ @@ -3582,7 +3582,7 @@ GetFieldObjectIdByXYZ: @ 805F894 lsls r2, 24 lsrs r5, r2, 24 movs r4, 0 - ldr r0, _0805F8E0 @ =gUnknown_2036E38 + ldr r0, _0805F8E0 @ =gMapObjects mov r8, r0 _0805F8AC: lsls r0, r4, 3 @@ -3611,7 +3611,7 @@ _0805F8AC: adds r0, r4, 0 b _0805F8F0 .align 2, 0 -_0805F8E0: .4byte gUnknown_2036E38 +_0805F8E0: .4byte gMapObjects _0805F8E4: adds r0, r4, 0x1 lsls r0, 24 @@ -4098,7 +4098,7 @@ GetFieldObjectScriptPointerByFieldObjectId: @ 805FC38 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0805FC58 @ =gUnknown_2036E38 + ldr r1, _0805FC58 @ =gMapObjects lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -4110,7 +4110,7 @@ GetFieldObjectScriptPointerByFieldObjectId: @ 805FC38 pop {r1} bx r1 .align 2, 0 -_0805FC58: .4byte gUnknown_2036E38 +_0805FC58: .4byte gMapObjects thumb_func_end GetFieldObjectScriptPointerByFieldObjectId thumb_func_start GetFieldObjectFlagIdByLocalIdAndMap @@ -4133,7 +4133,7 @@ GetFieldObjectFlagIdByFieldObjectId: @ 805FC74 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0805FC98 @ =gUnknown_2036E38 + ldr r1, _0805FC98 @ =gMapObjects lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -4147,7 +4147,7 @@ GetFieldObjectFlagIdByFieldObjectId: @ 805FC74 pop {r1} bx r1 .align 2, 0 -_0805FC98: .4byte gUnknown_2036E38 +_0805FC98: .4byte gMapObjects thumb_func_end GetFieldObjectFlagIdByFieldObjectId thumb_func_start sub_805FC9C @@ -4165,7 +4165,7 @@ sub_805FC9C: @ 805FC9C lsls r0, 24 cmp r0, 0 bne _0805FCD0 - ldr r2, _0805FCCC @ =gUnknown_2036E38 + ldr r2, _0805FCCC @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -4175,7 +4175,7 @@ sub_805FC9C: @ 805FC9C ldrb r0, [r0, 0x7] b _0805FCD2 .align 2, 0 -_0805FCCC: .4byte gUnknown_2036E38 +_0805FCCC: .4byte gMapObjects _0805FCD0: movs r0, 0xFF _0805FCD2: @@ -4203,7 +4203,7 @@ sub_805FCD8: @ 805FCD8 sub_805FCF0: @ 805FCF0 lsls r0, 24 lsrs r0, 24 - ldr r2, _0805FD04 @ =gUnknown_2036E38 + ldr r2, _0805FD04 @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -4211,7 +4211,7 @@ sub_805FCF0: @ 805FCF0 ldrb r0, [r1, 0x7] bx lr .align 2, 0 -_0805FD04: .4byte gUnknown_2036E38 +_0805FD04: .4byte gMapObjects thumb_func_end sub_805FCF0 thumb_func_start sub_805FD08 @@ -4229,7 +4229,7 @@ sub_805FD08: @ 805FD08 lsls r0, 24 cmp r0, 0 bne _0805FD3C - ldr r2, _0805FD38 @ =gUnknown_2036E38 + ldr r2, _0805FD38 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -4239,7 +4239,7 @@ sub_805FD08: @ 805FD08 ldrb r0, [r0, 0x1D] b _0805FD3E .align 2, 0 -_0805FD38: .4byte gUnknown_2036E38 +_0805FD38: .4byte gMapObjects _0805FD3C: movs r0, 0xFF _0805FD3E: @@ -4252,7 +4252,7 @@ _0805FD3E: FieldObjectGetBerryTreeId: @ 805FD44 lsls r0, 24 lsrs r0, 24 - ldr r2, _0805FD58 @ =gUnknown_2036E38 + ldr r2, _0805FD58 @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -4260,7 +4260,7 @@ FieldObjectGetBerryTreeId: @ 805FD44 ldrb r0, [r1, 0x1D] bx lr .align 2, 0 -_0805FD58: .4byte gUnknown_2036E38 +_0805FD58: .4byte gMapObjects thumb_func_end FieldObjectGetBerryTreeId thumb_func_start GetFieldObjectTemplateByLocalIdAndMap @@ -4463,7 +4463,7 @@ sub_805FE94: @ 805FE94 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805FEC8 @ =gUnknown_2036E38 + ldr r1, _0805FEC8 @ =gMapObjects adds r0, r1 bl sub_805FE5C _0805FEC2: @@ -4471,7 +4471,7 @@ _0805FEC2: pop {r0} bx r0 .align 2, 0 -_0805FEC8: .4byte gUnknown_2036E38 +_0805FEC8: .4byte gMapObjects thumb_func_end sub_805FE94 thumb_func_start npc_paltag_set_load @@ -4602,14 +4602,14 @@ sub_805FFB4: @ 805FFB4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805FFD0 @ =gUnknown_2036E38 + ldr r2, _0805FFD0 @ =gMapObjects adds r0, r2 ldr r2, _0805FFD4 @ =sub_805FFD8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0805FFD0: .4byte gUnknown_2036E38 +_0805FFD0: .4byte gMapObjects _0805FFD4: .4byte sub_805FFD8 thumb_func_end sub_805FFB4 @@ -4628,14 +4628,14 @@ sub_805FFDC: @ 805FFDC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805FFF8 @ =gUnknown_2036E38 + ldr r2, _0805FFF8 @ =gMapObjects adds r0, r2 ldr r2, _0805FFFC @ =sub_8060000 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0805FFF8: .4byte gUnknown_2036E38 +_0805FFF8: .4byte gMapObjects _0805FFFC: .4byte sub_8060000 thumb_func_end sub_805FFDC @@ -4667,14 +4667,14 @@ sub_8060020: @ 8060020 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806003C @ =gUnknown_2036E38 + ldr r2, _0806003C @ =gMapObjects adds r0, r2 ldr r2, _08060040 @ =sub_8060044 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806003C: .4byte gUnknown_2036E38 +_0806003C: .4byte gMapObjects _08060040: .4byte sub_8060044 thumb_func_end sub_8060020 @@ -5437,14 +5437,14 @@ sub_806058C: @ 806058C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080605A8 @ =gUnknown_2036E38 + ldr r2, _080605A8 @ =gMapObjects adds r0, r2 ldr r2, _080605AC @ =sub_80605B0 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080605A8: .4byte gUnknown_2036E38 +_080605A8: .4byte gMapObjects _080605AC: .4byte sub_80605B0 thumb_func_end sub_806058C @@ -5610,14 +5610,14 @@ sub_80606CC: @ 80606CC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080606E8 @ =gUnknown_2036E38 + ldr r2, _080606E8 @ =gMapObjects adds r0, r2 ldr r2, _080606EC @ =sub_80606F0 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080606E8: .4byte gUnknown_2036E38 +_080606E8: .4byte gMapObjects _080606EC: .4byte sub_80606F0 thumb_func_end sub_80606CC @@ -5825,14 +5825,14 @@ sub_8060850: @ 8060850 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806086C @ =gUnknown_2036E38 + ldr r2, _0806086C @ =gMapObjects adds r0, r2 ldr r2, _08060870 @ =sub_8060874 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806086C: .4byte gUnknown_2036E38 +_0806086C: .4byte gMapObjects _08060870: .4byte sub_8060874 thumb_func_end sub_8060850 @@ -6040,14 +6040,14 @@ sub_80609D4: @ 80609D4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080609F0 @ =gUnknown_2036E38 + ldr r2, _080609F0 @ =gMapObjects adds r0, r2 ldr r2, _080609F4 @ =sub_80609F8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080609F0: .4byte gUnknown_2036E38 +_080609F0: .4byte gMapObjects _080609F4: .4byte sub_80609F8 thumb_func_end sub_80609D4 @@ -6133,14 +6133,14 @@ sub_8060A74: @ 8060A74 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060A90 @ =gUnknown_2036E38 + ldr r2, _08060A90 @ =gMapObjects adds r0, r2 ldr r2, _08060A94 @ =sub_8060A98 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08060A90: .4byte gUnknown_2036E38 +_08060A90: .4byte gMapObjects _08060A94: .4byte sub_8060A98 thumb_func_end sub_8060A74 @@ -6306,14 +6306,14 @@ sub_8060BB4: @ 8060BB4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060BD0 @ =gUnknown_2036E38 + ldr r2, _08060BD0 @ =gMapObjects adds r0, r2 ldr r2, _08060BD4 @ =sub_8060BD8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08060BD0: .4byte gUnknown_2036E38 +_08060BD0: .4byte gMapObjects _08060BD4: .4byte sub_8060BD8 thumb_func_end sub_8060BB4 @@ -6479,14 +6479,14 @@ sub_8060CF4: @ 8060CF4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060D10 @ =gUnknown_2036E38 + ldr r2, _08060D10 @ =gMapObjects adds r0, r2 ldr r2, _08060D14 @ =sub_8060D18 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08060D10: .4byte gUnknown_2036E38 +_08060D10: .4byte gMapObjects _08060D14: .4byte sub_8060D18 thumb_func_end sub_8060CF4 @@ -6652,14 +6652,14 @@ sub_8060E34: @ 8060E34 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060E50 @ =gUnknown_2036E38 + ldr r2, _08060E50 @ =gMapObjects adds r0, r2 ldr r2, _08060E54 @ =sub_8060E58 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08060E50: .4byte gUnknown_2036E38 +_08060E50: .4byte gMapObjects _08060E54: .4byte sub_8060E58 thumb_func_end sub_8060E34 @@ -6825,14 +6825,14 @@ sub_8060F74: @ 8060F74 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08060F90 @ =gUnknown_2036E38 + ldr r2, _08060F90 @ =gMapObjects adds r0, r2 ldr r2, _08060F94 @ =sub_8060F98 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08060F90: .4byte gUnknown_2036E38 +_08060F90: .4byte gMapObjects _08060F94: .4byte sub_8060F98 thumb_func_end sub_8060F74 @@ -6998,14 +6998,14 @@ sub_80610B4: @ 80610B4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080610D0 @ =gUnknown_2036E38 + ldr r2, _080610D0 @ =gMapObjects adds r0, r2 ldr r2, _080610D4 @ =sub_80610D8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080610D0: .4byte gUnknown_2036E38 +_080610D0: .4byte gMapObjects _080610D4: .4byte sub_80610D8 thumb_func_end sub_80610B4 @@ -7171,14 +7171,14 @@ sub_80611F4: @ 80611F4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061210 @ =gUnknown_2036E38 + ldr r2, _08061210 @ =gMapObjects adds r0, r2 ldr r2, _08061214 @ =sub_8061218 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061210: .4byte gUnknown_2036E38 +_08061210: .4byte gMapObjects _08061214: .4byte sub_8061218 thumb_func_end sub_80611F4 @@ -7344,14 +7344,14 @@ sub_8061334: @ 8061334 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061350 @ =gUnknown_2036E38 + ldr r2, _08061350 @ =gMapObjects adds r0, r2 ldr r2, _08061354 @ =sub_8061358 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061350: .4byte gUnknown_2036E38 +_08061350: .4byte gMapObjects _08061354: .4byte sub_8061358 thumb_func_end sub_8061334 @@ -7517,14 +7517,14 @@ sub_8061474: @ 8061474 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061490 @ =gUnknown_2036E38 + ldr r2, _08061490 @ =gMapObjects adds r0, r2 ldr r2, _08061494 @ =sub_8061498 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061490: .4byte gUnknown_2036E38 +_08061490: .4byte gMapObjects _08061494: .4byte sub_8061498 thumb_func_end sub_8061474 @@ -7690,14 +7690,14 @@ sub_80615B4: @ 80615B4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080615D0 @ =gUnknown_2036E38 + ldr r2, _080615D0 @ =gMapObjects adds r0, r2 ldr r2, _080615D4 @ =sub_80615D8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080615D0: .4byte gUnknown_2036E38 +_080615D0: .4byte gMapObjects _080615D4: .4byte sub_80615D8 thumb_func_end sub_80615B4 @@ -7863,14 +7863,14 @@ sub_80616F4: @ 80616F4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061710 @ =gUnknown_2036E38 + ldr r2, _08061710 @ =gMapObjects adds r0, r2 ldr r2, _08061714 @ =sub_8061718 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061710: .4byte gUnknown_2036E38 +_08061710: .4byte gMapObjects _08061714: .4byte sub_8061718 thumb_func_end sub_80616F4 @@ -8006,14 +8006,14 @@ sub_80617F8: @ 80617F8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061814 @ =gUnknown_2036E38 + ldr r2, _08061814 @ =gMapObjects adds r0, r2 ldr r2, _08061818 @ =sub_806181C bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061814: .4byte gUnknown_2036E38 +_08061814: .4byte gMapObjects _08061818: .4byte sub_806181C thumb_func_end sub_80617F8 @@ -8149,14 +8149,14 @@ sub_80618FC: @ 80618FC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061918 @ =gUnknown_2036E38 + ldr r2, _08061918 @ =gMapObjects adds r0, r2 ldr r2, _0806191C @ =sub_8061920 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061918: .4byte gUnknown_2036E38 +_08061918: .4byte gMapObjects _0806191C: .4byte sub_8061920 thumb_func_end sub_80618FC @@ -8465,14 +8465,14 @@ sub_8061B5C: @ 8061B5C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061B78 @ =gUnknown_2036E38 + ldr r2, _08061B78 @ =gMapObjects adds r0, r2 ldr r2, _08061B7C @ =sub_8061B80 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061B78: .4byte gUnknown_2036E38 +_08061B78: .4byte gMapObjects _08061B7C: .4byte sub_8061B80 thumb_func_end sub_8061B5C @@ -8542,14 +8542,14 @@ sub_8061BE8: @ 8061BE8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061C04 @ =gUnknown_2036E38 + ldr r2, _08061C04 @ =gMapObjects adds r0, r2 ldr r2, _08061C08 @ =sub_8061C0C bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061C04: .4byte gUnknown_2036E38 +_08061C04: .4byte gMapObjects _08061C08: .4byte sub_8061C0C thumb_func_end sub_8061BE8 @@ -8619,14 +8619,14 @@ sub_8061C74: @ 8061C74 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061C90 @ =gUnknown_2036E38 + ldr r2, _08061C90 @ =gMapObjects adds r0, r2 ldr r2, _08061C94 @ =sub_8061C98 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061C90: .4byte gUnknown_2036E38 +_08061C90: .4byte gMapObjects _08061C94: .4byte sub_8061C98 thumb_func_end sub_8061C74 @@ -8696,14 +8696,14 @@ sub_8061D00: @ 8061D00 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061D1C @ =gUnknown_2036E38 + ldr r2, _08061D1C @ =gMapObjects adds r0, r2 ldr r2, _08061D20 @ =sub_8061D24 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061D1C: .4byte gUnknown_2036E38 +_08061D1C: .4byte gMapObjects _08061D20: .4byte sub_8061D24 thumb_func_end sub_8061D00 @@ -8773,14 +8773,14 @@ sub_8061D8C: @ 8061D8C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061DA8 @ =gUnknown_2036E38 + ldr r2, _08061DA8 @ =gMapObjects adds r0, r2 ldr r2, _08061DAC @ =sub_8061DB0 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061DA8: .4byte gUnknown_2036E38 +_08061DA8: .4byte gMapObjects _08061DAC: .4byte sub_8061DB0 thumb_func_end sub_8061D8C @@ -8850,14 +8850,14 @@ sub_8061E18: @ 8061E18 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061E34 @ =gUnknown_2036E38 + ldr r2, _08061E34 @ =gMapObjects adds r0, r2 ldr r2, _08061E38 @ =sub_8061E3C bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061E34: .4byte gUnknown_2036E38 +_08061E34: .4byte gMapObjects _08061E38: .4byte sub_8061E3C thumb_func_end sub_8061E18 @@ -8927,14 +8927,14 @@ sub_8061EA4: @ 8061EA4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061EC0 @ =gUnknown_2036E38 + ldr r2, _08061EC0 @ =gMapObjects adds r0, r2 ldr r2, _08061EC4 @ =sub_8061EC8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061EC0: .4byte gUnknown_2036E38 +_08061EC0: .4byte gMapObjects _08061EC4: .4byte sub_8061EC8 thumb_func_end sub_8061EA4 @@ -9004,14 +9004,14 @@ sub_8061F30: @ 8061F30 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061F4C @ =gUnknown_2036E38 + ldr r2, _08061F4C @ =gMapObjects adds r0, r2 ldr r2, _08061F50 @ =sub_8061F54 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061F4C: .4byte gUnknown_2036E38 +_08061F4C: .4byte gMapObjects _08061F50: .4byte sub_8061F54 thumb_func_end sub_8061F30 @@ -9081,14 +9081,14 @@ sub_8061FBC: @ 8061FBC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08061FD8 @ =gUnknown_2036E38 + ldr r2, _08061FD8 @ =gMapObjects adds r0, r2 ldr r2, _08061FDC @ =sub_8061FE0 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08061FD8: .4byte gUnknown_2036E38 +_08061FD8: .4byte gMapObjects _08061FDC: .4byte sub_8061FE0 thumb_func_end sub_8061FBC @@ -9158,14 +9158,14 @@ sub_8062048: @ 8062048 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062064 @ =gUnknown_2036E38 + ldr r2, _08062064 @ =gMapObjects adds r0, r2 ldr r2, _08062068 @ =sub_806206C bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062064: .4byte gUnknown_2036E38 +_08062064: .4byte gMapObjects _08062068: .4byte sub_806206C thumb_func_end sub_8062048 @@ -9235,14 +9235,14 @@ sub_80620D4: @ 80620D4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080620F0 @ =gUnknown_2036E38 + ldr r2, _080620F0 @ =gMapObjects adds r0, r2 ldr r2, _080620F4 @ =sub_80620F8 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080620F0: .4byte gUnknown_2036E38 +_080620F0: .4byte gMapObjects _080620F4: .4byte sub_80620F8 thumb_func_end sub_80620D4 @@ -9312,14 +9312,14 @@ sub_8062160: @ 8062160 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806217C @ =gUnknown_2036E38 + ldr r2, _0806217C @ =gMapObjects adds r0, r2 ldr r2, _08062180 @ =sub_8062184 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806217C: .4byte gUnknown_2036E38 +_0806217C: .4byte gMapObjects _08062180: .4byte sub_8062184 thumb_func_end sub_8062160 @@ -9389,14 +9389,14 @@ sub_80621EC: @ 80621EC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062208 @ =gUnknown_2036E38 + ldr r2, _08062208 @ =gMapObjects adds r0, r2 ldr r2, _0806220C @ =sub_8062210 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062208: .4byte gUnknown_2036E38 +_08062208: .4byte gMapObjects _0806220C: .4byte sub_8062210 thumb_func_end sub_80621EC @@ -9466,14 +9466,14 @@ sub_8062278: @ 8062278 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062294 @ =gUnknown_2036E38 + ldr r2, _08062294 @ =gMapObjects adds r0, r2 ldr r2, _08062298 @ =sub_806229C bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062294: .4byte gUnknown_2036E38 +_08062294: .4byte gMapObjects _08062298: .4byte sub_806229C thumb_func_end sub_8062278 @@ -9543,14 +9543,14 @@ sub_8062304: @ 8062304 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062320 @ =gUnknown_2036E38 + ldr r2, _08062320 @ =gMapObjects adds r0, r2 ldr r2, _08062324 @ =sub_8062328 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062320: .4byte gUnknown_2036E38 +_08062320: .4byte gMapObjects _08062324: .4byte sub_8062328 thumb_func_end sub_8062304 @@ -9620,14 +9620,14 @@ sub_8062390: @ 8062390 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080623AC @ =gUnknown_2036E38 + ldr r2, _080623AC @ =gMapObjects adds r0, r2 ldr r2, _080623B0 @ =sub_80623B4 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080623AC: .4byte gUnknown_2036E38 +_080623AC: .4byte gMapObjects _080623B0: .4byte sub_80623B4 thumb_func_end sub_8062390 @@ -9697,14 +9697,14 @@ sub_806241C: @ 806241C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062438 @ =gUnknown_2036E38 + ldr r2, _08062438 @ =gMapObjects adds r0, r2 ldr r2, _0806243C @ =sub_8062440 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062438: .4byte gUnknown_2036E38 +_08062438: .4byte gMapObjects _0806243C: .4byte sub_8062440 thumb_func_end sub_806241C @@ -9774,14 +9774,14 @@ sub_80624A8: @ 80624A8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080624C4 @ =gUnknown_2036E38 + ldr r2, _080624C4 @ =gMapObjects adds r0, r2 ldr r2, _080624C8 @ =sub_80624CC bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080624C4: .4byte gUnknown_2036E38 +_080624C4: .4byte gMapObjects _080624C8: .4byte sub_80624CC thumb_func_end sub_80624A8 @@ -9851,14 +9851,14 @@ sub_8062534: @ 8062534 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062550 @ =gUnknown_2036E38 + ldr r2, _08062550 @ =gMapObjects adds r0, r2 ldr r2, _08062554 @ =sub_8062558 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062550: .4byte gUnknown_2036E38 +_08062550: .4byte gMapObjects _08062554: .4byte sub_8062558 thumb_func_end sub_8062534 @@ -9928,14 +9928,14 @@ sub_80625C0: @ 80625C0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080625DC @ =gUnknown_2036E38 + ldr r2, _080625DC @ =gMapObjects adds r0, r2 ldr r2, _080625E0 @ =sub_80625E4 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080625DC: .4byte gUnknown_2036E38 +_080625DC: .4byte gMapObjects _080625E0: .4byte sub_80625E4 thumb_func_end sub_80625C0 @@ -10005,14 +10005,14 @@ sub_806264C: @ 806264C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062668 @ =gUnknown_2036E38 + ldr r2, _08062668 @ =gMapObjects adds r0, r2 ldr r2, _0806266C @ =sub_8062670 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062668: .4byte gUnknown_2036E38 +_08062668: .4byte gMapObjects _0806266C: .4byte sub_8062670 thumb_func_end sub_806264C @@ -10082,14 +10082,14 @@ sub_80626D8: @ 80626D8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080626F4 @ =gUnknown_2036E38 + ldr r2, _080626F4 @ =gMapObjects adds r0, r2 ldr r2, _080626F8 @ =sub_80626FC bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080626F4: .4byte gUnknown_2036E38 +_080626F4: .4byte gMapObjects _080626F8: .4byte sub_80626FC thumb_func_end sub_80626D8 @@ -10159,14 +10159,14 @@ sub_8062764: @ 8062764 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062780 @ =gUnknown_2036E38 + ldr r2, _08062780 @ =gMapObjects adds r0, r2 ldr r2, _08062784 @ =sub_8062788 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062780: .4byte gUnknown_2036E38 +_08062780: .4byte gMapObjects _08062784: .4byte sub_8062788 thumb_func_end sub_8062764 @@ -10236,14 +10236,14 @@ sub_80627F0: @ 80627F0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806280C @ =gUnknown_2036E38 + ldr r2, _0806280C @ =gMapObjects adds r0, r2 ldr r2, _08062810 @ =sub_8062814 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806280C: .4byte gUnknown_2036E38 +_0806280C: .4byte gMapObjects _08062810: .4byte sub_8062814 thumb_func_end sub_80627F0 @@ -10313,14 +10313,14 @@ sub_806287C: @ 806287C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062898 @ =gUnknown_2036E38 + ldr r2, _08062898 @ =gMapObjects adds r0, r2 ldr r2, _0806289C @ =sub_80628A0 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062898: .4byte gUnknown_2036E38 +_08062898: .4byte gMapObjects _0806289C: .4byte sub_80628A0 thumb_func_end sub_806287C @@ -10368,8 +10368,8 @@ sub_80628E4: @ 80628E4 push {r4-r7,lr} adds r6, r0, 0 adds r7, r1, 0 - ldr r2, _08062908 @ =gUnknown_2036E38 - ldr r3, _0806290C @ =gUnknown_2037078 + ldr r2, _08062908 @ =gMapObjects + ldr r3, _0806290C @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -10385,8 +10385,8 @@ _08062904: movs r0, 0 b _08062938 .align 2, 0 -_08062908: .4byte gUnknown_2036E38 -_0806290C: .4byte gUnknown_2037078 +_08062908: .4byte gMapObjects +_0806290C: .4byte gPlayerAvatar _08062910: ldr r5, _08062940 @ =gUnknown_83A6390 bl player_get_x22 @@ -10533,7 +10533,7 @@ sub_80629B8: @ 80629B8 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10622,7 +10622,7 @@ sub_8062A70: @ 8062A70 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10711,7 +10711,7 @@ sub_8062B28: @ 8062B28 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10800,7 +10800,7 @@ sub_8062BE0: @ 8062BE0 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -10925,7 +10925,7 @@ sub_8062CE0: @ 8062CE0 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -11021,7 +11021,7 @@ oac_hopping: @ 8062D98 ldrsh r0, [r0, r2] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl _call_via_r8 @@ -11064,14 +11064,14 @@ sub_8062E60: @ 8062E60 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08062E7C @ =gUnknown_2036E38 + ldr r2, _08062E7C @ =gMapObjects adds r0, r2 ldr r2, _08062E80 @ =sub_8062E84 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_08062E7C: .4byte gUnknown_2036E38 +_08062E7C: .4byte gMapObjects _08062E80: .4byte sub_8062E84 thumb_func_end sub_8062E60 @@ -11099,8 +11099,8 @@ mss_08062EA4: @ 8062EA4 push {r4-r7,lr} adds r6, r0, 0 adds r7, r1, 0 - ldr r2, _08062EC8 @ =gUnknown_2036E38 - ldr r3, _08062ECC @ =gUnknown_2037078 + ldr r2, _08062EC8 @ =gMapObjects + ldr r3, _08062ECC @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -11116,8 +11116,8 @@ _08062EC4: movs r0, 0 b _08062EF8 .align 2, 0 -_08062EC8: .4byte gUnknown_2036E38 -_08062ECC: .4byte gUnknown_2037078 +_08062EC8: .4byte gMapObjects +_08062ECC: .4byte gPlayerAvatar _08062ED0: ldr r5, _08062F00 @ =gUnknown_83A6390 bl player_get_x22 @@ -11154,7 +11154,7 @@ FieldObjectCB_TreeDisguise: @ 8062F08 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08062F6C @ =gUnknown_2036E38 + ldr r0, _08062F6C @ =gMapObjects adds r4, r1, r0 adds r6, r4, 0 adds r6, 0x21 @@ -11188,7 +11188,7 @@ _08062F50: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08062F6C @ =gUnknown_2036E38 + ldr r1, _08062F6C @ =gMapObjects adds r0, r1 ldr r2, _08062F74 @ =sub_8062F78 adds r1, r5, 0 @@ -11197,7 +11197,7 @@ _08062F50: pop {r0} bx r0 .align 2, 0 -_08062F6C: .4byte gUnknown_2036E38 +_08062F6C: .4byte gMapObjects _08062F70: .4byte gUnknown_20386E0 _08062F74: .4byte sub_8062F78 thumb_func_end FieldObjectCB_TreeDisguise @@ -11220,7 +11220,7 @@ FieldObjectCB_MountainDisguise: @ 8062F84 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08062FE8 @ =gUnknown_2036E38 + ldr r0, _08062FE8 @ =gMapObjects adds r4, r1, r0 adds r6, r4, 0 adds r6, 0x21 @@ -11254,7 +11254,7 @@ _08062FCC: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08062FE8 @ =gUnknown_2036E38 + ldr r1, _08062FE8 @ =gMapObjects adds r0, r1 ldr r2, _08062FF0 @ =sub_8062F78 adds r1, r5, 0 @@ -11263,7 +11263,7 @@ _08062FCC: pop {r0} bx r0 .align 2, 0 -_08062FE8: .4byte gUnknown_2036E38 +_08062FE8: .4byte gMapObjects _08062FEC: .4byte gUnknown_20386E0 _08062FF0: .4byte sub_8062F78 thumb_func_end FieldObjectCB_MountainDisguise @@ -11274,7 +11274,7 @@ FieldObjectCB_Hidden1: @ 8062FF4 adds r3, r0, 0 movs r1, 0x3C ldrsh r0, [r3, r1] - ldr r4, _08063050 @ =gUnknown_2036E38 + ldr r4, _08063050 @ =gMapObjects cmp r0, 0 bne _08063034 movs r0, 0x2E @@ -11316,7 +11316,7 @@ _08063034: pop {r0} bx r0 .align 2, 0 -_08063050: .4byte gUnknown_2036E38 +_08063050: .4byte gMapObjects _08063054: .4byte sub_8063058 thumb_func_end FieldObjectCB_Hidden1 @@ -11374,14 +11374,14 @@ sub_80630A0: @ 80630A0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080630BC @ =gUnknown_2036E38 + ldr r2, _080630BC @ =gMapObjects adds r0, r2 ldr r2, _080630C0 @ =sub_80630C4 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080630BC: .4byte gUnknown_2036E38 +_080630BC: .4byte gMapObjects _080630C0: .4byte sub_80630C4 thumb_func_end sub_80630A0 @@ -11436,14 +11436,14 @@ sub_8063110: @ 8063110 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806312C @ =gUnknown_2036E38 + ldr r2, _0806312C @ =gMapObjects adds r0, r2 ldr r2, _08063130 @ =sub_8063134 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806312C: .4byte gUnknown_2036E38 +_0806312C: .4byte gMapObjects _08063130: .4byte sub_8063134 thumb_func_end sub_8063110 @@ -11498,14 +11498,14 @@ sub_8063180: @ 8063180 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806319C @ =gUnknown_2036E38 + ldr r2, _0806319C @ =gMapObjects adds r0, r2 ldr r2, _080631A0 @ =sub_80631A4 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806319C: .4byte gUnknown_2036E38 +_0806319C: .4byte gMapObjects _080631A0: .4byte sub_80631A4 thumb_func_end sub_8063180 @@ -11560,14 +11560,14 @@ sub_80631F0: @ 80631F0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0806320C @ =gUnknown_2036E38 + ldr r2, _0806320C @ =gMapObjects adds r0, r2 ldr r2, _08063210 @ =sub_8063214 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0806320C: .4byte gUnknown_2036E38 +_0806320C: .4byte gMapObjects _08063210: .4byte sub_8063214 thumb_func_end sub_80631F0 @@ -11657,14 +11657,14 @@ sub_8063298: @ 8063298 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080632B4 @ =gUnknown_2036E38 + ldr r2, _080632B4 @ =gMapObjects adds r0, r2 ldr r2, _080632B8 @ =sub_8063304 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080632B4: .4byte gUnknown_2036E38 +_080632B4: .4byte gMapObjects _080632B8: .4byte sub_8063304 thumb_func_end sub_8063298 @@ -11677,14 +11677,14 @@ sub_80632BC: @ 80632BC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080632D8 @ =gUnknown_2036E38 + ldr r2, _080632D8 @ =gMapObjects adds r0, r2 ldr r2, _080632DC @ =sub_8063324 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080632D8: .4byte gUnknown_2036E38 +_080632D8: .4byte gMapObjects _080632DC: .4byte sub_8063324 thumb_func_end sub_80632BC @@ -11697,14 +11697,14 @@ sub_80632E0: @ 80632E0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080632FC @ =gUnknown_2036E38 + ldr r2, _080632FC @ =gMapObjects adds r0, r2 ldr r2, _08063300 @ =sub_8063344 bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_080632FC: .4byte gUnknown_2036E38 +_080632FC: .4byte gMapObjects _08063300: .4byte sub_8063344 thumb_func_end sub_80632E0 @@ -12593,7 +12593,7 @@ IsMetatileDirectionallyImpassable: @ 80638AC asrs r0, 16 lsls r1, r7, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 ldr r1, [r4] @@ -12628,7 +12628,7 @@ _08063912: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 - ldr r1, _08063968 @ =gUnknown_2036E38 + ldr r1, _08063968 @ =gMapObjects adds r2, r0, r1 ldrb r0, [r2] lsls r0, 31 @@ -12669,7 +12669,7 @@ _0806394C: movs r0, 0x1 b _08063978 .align 2, 0 -_08063968: .4byte gUnknown_2036E38 +_08063968: .4byte gMapObjects _0806396C: adds r0, r4, 0x1 lsls r0, 24 @@ -12699,7 +12699,7 @@ IsBerryTreeSparkling: @ 8063980 cmp r0, 0 bne _080639CC ldr r3, _080639C4 @ =gSprites - ldr r2, _080639C8 @ =gUnknown_2036E38 + ldr r2, _080639C8 @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -12720,7 +12720,7 @@ IsBerryTreeSparkling: @ 8063980 b _080639CE .align 2, 0 _080639C4: .4byte gSprites -_080639C8: .4byte gUnknown_2036E38 +_080639C8: .4byte gMapObjects _080639CC: movs r0, 0 _080639CE: @@ -12745,7 +12745,7 @@ sub_80639D4: @ 80639D4 cmp r0, 0 bne _08063A12 ldr r3, _08063A18 @ =gSprites - ldr r2, _08063A1C @ =gUnknown_2036E38 + ldr r2, _08063A1C @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -12767,7 +12767,7 @@ _08063A12: bx r0 .align 2, 0 _08063A18: .4byte gSprites -_08063A1C: .4byte gUnknown_2036E38 +_08063A1C: .4byte gMapObjects thumb_func_end sub_80639D4 thumb_func_start MoveCoords @@ -18661,7 +18661,7 @@ sub_806637C: @ 806637C ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] - ldr r4, _080663D4 @ =gUnknown_2036E38 + ldr r4, _080663D4 @ =gMapObjects mov r2, sp ldrb r2, [r2] lsls r3, r2, 3 @@ -18687,7 +18687,7 @@ _080663C6: pop {r1} bx r1 .align 2, 0 -_080663D4: .4byte gUnknown_2036E38 +_080663D4: .4byte gMapObjects thumb_func_end sub_806637C thumb_func_start sub_80663D8 @@ -18708,7 +18708,7 @@ sub_80663D8: @ 80663D8 ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] - ldr r4, _08066438 @ =gUnknown_2036E38 + ldr r4, _08066438 @ =gMapObjects mov r2, sp ldrb r2, [r2] lsls r3, r2, 3 @@ -18737,7 +18737,7 @@ _0806642A: pop {r1} bx r1 .align 2, 0 -_08066438: .4byte gUnknown_2036E38 +_08066438: .4byte gMapObjects thumb_func_end sub_80663D8 thumb_func_start sub_806643C diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 93a13f293..82c566d6b 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -14,14 +14,14 @@ sub_805B3B8: @ 805B3B8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805B3D4 @ =gUnknown_2036E38 + ldr r2, _0805B3D4 @ =gMapObjects adds r0, r2 ldr r2, _0805B3D8 @ =sub_805B3DC bl FieldObjectStep pop {r0} bx r0 .align 2, 0 -_0805B3D4: .4byte gUnknown_2036E38 +_0805B3D4: .4byte gMapObjects _0805B3D8: .4byte sub_805B3DC thumb_func_end sub_805B3B8 @@ -43,12 +43,12 @@ sub_805B3E0: @ 805B3E0 mov r8, r1 lsls r2, 16 lsrs r7, r2, 16 - ldr r4, _0805B454 @ =gUnknown_2037078 + ldr r4, _0805B454 @ =gPlayerAvatar ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B458 @ =gUnknown_2036E38 + ldr r1, _0805B458 @ =gMapObjects adds r5, r0, r1 adds r0, r5, 0 bl sub_805CC40 @@ -84,8 +84,8 @@ _0805B448: pop {r0} bx r0 .align 2, 0 -_0805B454: .4byte gUnknown_2037078 -_0805B458: .4byte gUnknown_2036E38 +_0805B454: .4byte gPlayerAvatar +_0805B458: .4byte gMapObjects thumb_func_end sub_805B3E0 thumb_func_start sub_805B45C @@ -144,14 +144,14 @@ npc_clear_strange_bits: @ 805B4B0 adds r2, 0x2 ands r1, r2 strb r1, [r0, 0x1] - ldr r2, _0805B4D0 @ =gUnknown_2037078 + ldr r2, _0805B4D0 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x7F ands r0, r1 strb r0, [r2] bx lr .align 2, 0 -_0805B4D0: .4byte gUnknown_2037078 +_0805B4D0: .4byte gPlayerAvatar thumb_func_end npc_clear_strange_bits thumb_func_start MovePlayerAvatarUsingKeypadInput @@ -163,7 +163,7 @@ MovePlayerAvatarUsingKeypadInput: @ 805B4D4 lsrs r4, r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _0805B4F8 @ =gUnknown_2037078 + ldr r0, _0805B4F8 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -174,7 +174,7 @@ MovePlayerAvatarUsingKeypadInput: @ 805B4D4 bl sub_80BD09C b _0805B504 .align 2, 0 -_0805B4F8: .4byte gUnknown_2037078 +_0805B4F8: .4byte gPlayerAvatar _0805B4FC: adds r0, r3, 0 adds r1, r2, 0 @@ -188,7 +188,7 @@ _0805B504: thumb_func_start PlayerAllowForcedMovementIfMovingSameDirection PlayerAllowForcedMovementIfMovingSameDirection: @ 805B50C push {lr} - ldr r2, _0805B524 @ =gUnknown_2037078 + ldr r2, _0805B524 @ =gPlayerAvatar ldrb r0, [r2, 0x2] cmp r0, 0x2 bne _0805B51E @@ -200,13 +200,13 @@ _0805B51E: pop {r0} bx r0 .align 2, 0 -_0805B524: .4byte gUnknown_2037078 +_0805B524: .4byte gPlayerAvatar thumb_func_end PlayerAllowForcedMovementIfMovingSameDirection thumb_func_start sub_805B528 sub_805B528: @ 805B528 push {r4,r5,lr} - ldr r5, _0805B58C @ =gUnknown_2037078 + ldr r5, _0805B58C @ =gPlayerAvatar ldrb r1, [r5] movs r0, 0x40 ands r0, r1 @@ -222,7 +222,7 @@ sub_805B528: @ 805B528 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B594 @ =gUnknown_2036E38 + ldr r1, _0805B594 @ =gMapObjects adds r1, r0, r1 str r1, [r4] ldrb r0, [r1] @@ -252,9 +252,9 @@ _0805B586: movs r0, 0x1 b _0805B59A .align 2, 0 -_0805B58C: .4byte gUnknown_2037078 +_0805B58C: .4byte gPlayerAvatar _0805B590: .4byte gUnknown_2036E30 -_0805B594: .4byte gUnknown_2036E38 +_0805B594: .4byte gMapObjects _0805B598: movs r0, 0 _0805B59A: @@ -267,13 +267,13 @@ _0805B59A: sub_805B5A0: @ 805B5A0 push {r4-r7,lr} sub sp, 0x4 - ldr r3, _0805B5F4 @ =gUnknown_2037078 + ldr r3, _0805B5F4 @ =gPlayerAvatar ldrb r1, [r3] movs r0, 0x20 ands r0, r1 cmp r0, 0 bne _0805B610 - ldr r2, _0805B5F8 @ =gUnknown_2036E38 + ldr r2, _0805B5F8 @ =gMapObjects ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -307,17 +307,17 @@ _0805B5CC: bne _0805B5CC b _0805B628 .align 2, 0 -_0805B5F4: .4byte gUnknown_2037078 -_0805B5F8: .4byte gUnknown_2036E38 +_0805B5F4: .4byte gPlayerAvatar +_0805B5F8: .4byte gMapObjects _0805B5FC: .4byte gUnknown_835B764 _0805B600: - ldr r0, _0805B60C @ =gUnknown_2037078 + ldr r0, _0805B60C @ =gPlayerAvatar strh r7, [r0, 0x1C] adds r0, r2, 0x4 adds r0, r5, r0 b _0805B62E .align 2, 0 -_0805B60C: .4byte gUnknown_2037078 +_0805B60C: .4byte gPlayerAvatar _0805B610: movs r6, 0 ldr r0, _0805B640 @ =gUnknown_835B764 @@ -352,7 +352,7 @@ _0805B640: .4byte gUnknown_835B764 thumb_func_start ForcedMovement_None ForcedMovement_None: @ 805B644 push {r4,lr} - ldr r4, _0805B688 @ =gUnknown_2037078 + ldr r4, _0805B688 @ =gPlayerAvatar ldrb r1, [r4] movs r0, 0x40 ands r0, r1 @@ -362,7 +362,7 @@ ForcedMovement_None: @ 805B644 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805B68C @ =gUnknown_2036E38 + ldr r1, _0805B68C @ =gMapObjects adds r0, r1 ldrb r2, [r0, 0x1] movs r1, 0x3 @@ -385,8 +385,8 @@ _0805B67E: pop {r1} bx r1 .align 2, 0 -_0805B688: .4byte gUnknown_2037078 -_0805B68C: .4byte gUnknown_2036E38 +_0805B688: .4byte gPlayerAvatar +_0805B68C: .4byte gMapObjects thumb_func_end ForcedMovement_None thumb_func_start DoForcedMovement @@ -399,7 +399,7 @@ DoForcedMovement: @ 805B690 mov r9, r1 lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0805B6D0 @ =gUnknown_2037078 + ldr r6, _0805B6D0 @ =gPlayerAvatar adds r0, r5, 0 bl sub_805BB1C lsls r0, 24 @@ -421,7 +421,7 @@ DoForcedMovement: @ 805B690 movs r0, 0 b _0805B6F8 .align 2, 0 -_0805B6D0: .4byte gUnknown_2037078 +_0805B6D0: .4byte gPlayerAvatar _0805B6D4: cmp r7, 0x6 bne _0805B6DE @@ -456,12 +456,12 @@ _0805B6F8: DoForcedMovementInCurrentDirection: @ 805B708 push {lr} adds r1, r0, 0 - ldr r0, _0805B734 @ =gUnknown_2037078 + ldr r0, _0805B734 @ =gPlayerAvatar ldrb r2, [r0, 0x5] lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805B738 @ =gUnknown_2036E38 + ldr r2, _0805B738 @ =gMapObjects adds r0, r2 ldrb r2, [r0, 0x1] movs r3, 0x4 @@ -475,8 +475,8 @@ DoForcedMovementInCurrentDirection: @ 805B708 pop {r1} bx r1 .align 2, 0 -_0805B734: .4byte gUnknown_2037078 -_0805B738: .4byte gUnknown_2036E38 +_0805B734: .4byte gPlayerAvatar +_0805B738: .4byte gMapObjects thumb_func_end DoForcedMovementInCurrentDirection thumb_func_start ForcedMovement_Slip @@ -678,12 +678,12 @@ ForcedMovement_Slide: @ 805B88C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0805B8BC @ =gUnknown_2037078 + ldr r2, _0805B8BC @ =gPlayerAvatar ldrb r3, [r2, 0x5] lsls r2, r3, 3 adds r2, r3 lsls r2, 2 - ldr r3, _0805B8C0 @ =gUnknown_2036E38 + ldr r3, _0805B8C0 @ =gMapObjects adds r2, r3 ldrb r3, [r2, 0x1] movs r4, 0x4 @@ -698,8 +698,8 @@ ForcedMovement_Slide: @ 805B88C pop {r1} bx r1 .align 2, 0 -_0805B8BC: .4byte gUnknown_2037078 -_0805B8C0: .4byte gUnknown_2036E38 +_0805B8BC: .4byte gPlayerAvatar +_0805B8C0: .4byte gMapObjects thumb_func_end ForcedMovement_Slide thumb_func_start ForcedMovement_SlideSouth @@ -809,28 +809,28 @@ CheckMovementInputNotOnBike: @ 805B96C lsrs r4, r0, 24 cmp r4, 0 bne _0805B984 - ldr r0, _0805B980 @ =gUnknown_2037078 + ldr r0, _0805B980 @ =gPlayerAvatar strb r4, [r0, 0x2] movs r0, 0 b _0805B9A6 .align 2, 0 -_0805B980: .4byte gUnknown_2037078 +_0805B980: .4byte gPlayerAvatar _0805B984: bl player_get_direction_upper_nybble lsls r0, 24 lsrs r0, 24 cmp r4, r0 beq _0805B9A0 - ldr r1, _0805B99C @ =gUnknown_2037078 + ldr r1, _0805B99C @ =gPlayerAvatar ldrb r0, [r1, 0x2] cmp r0, 0x2 beq _0805B9A0 movs r0, 0x1 b _0805B9A4 .align 2, 0 -_0805B99C: .4byte gUnknown_2037078 +_0805B99C: .4byte gPlayerAvatar _0805B9A0: - ldr r1, _0805B9AC @ =gUnknown_2037078 + ldr r1, _0805B9AC @ =gPlayerAvatar movs r0, 0x2 _0805B9A4: strb r0, [r1, 0x2] @@ -839,7 +839,7 @@ _0805B9A6: pop {r1} bx r1 .align 2, 0 -_0805B9AC: .4byte gUnknown_2037078 +_0805B9AC: .4byte gPlayerAvatar thumb_func_end CheckMovementInputNotOnBike thumb_func_start PlayerNotOnBikeNotMoving @@ -898,7 +898,7 @@ _0805BA06: bl PlayerNotOnBikeCollide b _0805BAA4 _0805BA18: - ldr r6, _0805BA2C @ =gUnknown_2037078 + ldr r6, _0805BA2C @ =gPlayerAvatar ldrb r1, [r6] movs r0, 0x8 ands r0, r1 @@ -908,7 +908,7 @@ _0805BA18: bl sub_805C11C b _0805BAA4 .align 2, 0 -_0805BA2C: .4byte gUnknown_2037078 +_0805BA2C: .4byte gPlayerAvatar _0805BA30: movs r0, 0x2 ands r5, r0 @@ -919,7 +919,7 @@ _0805BA30: lsls r0, 24 cmp r0, 0 beq _0805BA8C - ldr r2, _0805BA70 @ =gUnknown_2036E38 + ldr r2, _0805BA70 @ =gMapObjects ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -938,19 +938,19 @@ _0805BA30: b _0805BA7A .align 2, 0 _0805BA6C: .4byte 0x0000082f -_0805BA70: .4byte gUnknown_2036E38 +_0805BA70: .4byte gMapObjects _0805BA74: adds r0, r4, 0 bl sub_805C17C _0805BA7A: - ldr r2, _0805BA88 @ =gUnknown_2037078 + ldr r2, _0805BA88 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x80 orrs r0, r1 strb r0, [r2] b _0805BAA4 .align 2, 0 -_0805BA88: .4byte gUnknown_2037078 +_0805BA88: .4byte gPlayerAvatar _0805BA8C: adds r0, r4, 0 bl sub_805BAAC @@ -974,12 +974,12 @@ sub_805BAAC: @ 805BAAC sub sp, 0x4 lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _0805BAE4 @ =gUnknown_2037078 + ldr r0, _0805BAE4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BAE8 @ =gUnknown_2036E38 + ldr r1, _0805BAE8 @ =gMapObjects adds r0, r1 ldrh r2, [r0, 0x10] mov r1, sp @@ -999,8 +999,8 @@ sub_805BAAC: @ 805BAAC asrs r1, 16 b _0805BB00 .align 2, 0 -_0805BAE4: .4byte gUnknown_2037078 -_0805BAE8: .4byte gUnknown_2036E38 +_0805BAE4: .4byte gPlayerAvatar +_0805BAE8: .4byte gMapObjects _0805BAEC: movs r0, 0x1 mov r1, sp @@ -1012,7 +1012,7 @@ _0805BAEC: movs r2, 0 ldrsh r1, [r4, r2] _0805BB00: - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_805A460 @@ -1034,12 +1034,12 @@ sub_805BB1C: @ 805BB1C sub sp, 0x8 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0805BB94 @ =gUnknown_2037078 + ldr r0, _0805BB94 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BB98 @ =gUnknown_2036E38 + ldr r1, _0805BB98 @ =gMapObjects adds r5, r0, r1 ldrh r1, [r5, 0x10] add r0, sp, 0x4 @@ -1052,7 +1052,7 @@ sub_805BB1C: @ 805BB1C ldrsh r0, [r0, r2] lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 @@ -1069,7 +1069,7 @@ sub_805BB1C: @ 805BB1C ldrsh r0, [r0, r3] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 add r1, sp, 0x4 @@ -1085,8 +1085,8 @@ sub_805BB1C: @ 805BB1C lsrs r0, 24 b _0805BB9E .align 2, 0 -_0805BB94: .4byte gUnknown_2037078 -_0805BB98: .4byte gUnknown_2036E38 +_0805BB94: .4byte gPlayerAvatar +_0805BB98: .4byte gMapObjects _0805BB9C: movs r0, 0x8 _0805BB9E: @@ -1200,7 +1200,7 @@ sub_805BC60: @ 805BC60 lsrs r4, r1, 16 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, _0805BCB8 @ =gUnknown_2037078 + ldr r0, _0805BCB8 @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x8 ands r0, r1 @@ -1233,7 +1233,7 @@ sub_805BC60: @ 805BC60 movs r0, 0x1 b _0805BCC2 .align 2, 0 -_0805BCB8: .4byte gUnknown_2037078 +_0805BCB8: .4byte gPlayerAvatar _0805BCBC: .4byte gUnknown_835B820 _0805BCC0: movs r0, 0 @@ -1291,7 +1291,7 @@ sub_805BCEC: @ 805BCEC lsrs r6, r0, 24 cmp r6, 0x10 beq _0805BDA0 - ldr r0, _0805BD9C @ =gUnknown_2036E38 + ldr r0, _0805BD9C @ =gMapObjects lsls r1, r6, 3 adds r1, r6 lsls r1, 2 @@ -1313,7 +1313,7 @@ sub_805BCEC: @ 805BCEC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r0, 0x66 beq _0805BD8A mov r0, sp @@ -1332,7 +1332,7 @@ sub_805BCEC: @ 805BCEC ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059C8C @@ -1347,7 +1347,7 @@ _0805BD8A: b _0805BDA2 .align 2, 0 _0805BD98: .4byte 0x00000805 -_0805BD9C: .4byte gUnknown_2036E38 +_0805BD9C: .4byte gMapObjects _0805BDA0: movs r0, 0 _0805BDA2: @@ -1399,7 +1399,7 @@ SetPlayerAvatarTransitionFlags: @ 805BDEC push {lr} lsls r0, 16 lsrs r0, 16 - ldr r2, _0805BE04 @ =gUnknown_2037078 + ldr r2, _0805BE04 @ =gPlayerAvatar ldrb r1, [r2, 0x1] orrs r0, r1 strb r0, [r2, 0x1] @@ -1407,13 +1407,13 @@ SetPlayerAvatarTransitionFlags: @ 805BDEC pop {r0} bx r0 .align 2, 0 -_0805BE04: .4byte gUnknown_2037078 +_0805BE04: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarTransitionFlags thumb_func_start DoPlayerAvatarTransition DoPlayerAvatarTransition: @ 805BE08 push {r4,r5,lr} - ldr r0, _0805BE50 @ =gUnknown_2037078 + ldr r0, _0805BE50 @ =gPlayerAvatar ldrb r4, [r0, 0x1] cmp r4, 0 beq _0805BE48 @@ -1426,12 +1426,12 @@ _0805BE14: ldr r0, _0805BE54 @ =gUnknown_835B844 lsls r2, r5, 2 adds r2, r0 - ldr r0, _0805BE50 @ =gUnknown_2037078 + ldr r0, _0805BE50 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BE58 @ =gUnknown_2036E38 + ldr r1, _0805BE58 @ =gMapObjects adds r0, r1 ldr r1, [r2] bl _call_via_r1 @@ -1442,7 +1442,7 @@ _0805BE36: lsrs r4, 1 cmp r5, 0x7 bls _0805BE14 - ldr r1, _0805BE50 @ =gUnknown_2037078 + ldr r1, _0805BE50 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x1] _0805BE48: @@ -1450,9 +1450,9 @@ _0805BE48: pop {r0} bx r0 .align 2, 0 -_0805BE50: .4byte gUnknown_2037078 +_0805BE50: .4byte gPlayerAvatar _0805BE54: .4byte gUnknown_835B844 -_0805BE58: .4byte gUnknown_2036E38 +_0805BE58: .4byte gMapObjects thumb_func_end DoPlayerAvatarTransition thumb_func_start nullsub_22 @@ -1503,20 +1503,20 @@ nullsub_23: @ 805BEA4 thumb_func_start PlayerAvatarTransition_ReturnToField PlayerAvatarTransition_ReturnToField: @ 805BEA8 - ldr r2, _0805BEB4 @ =gUnknown_2037078 + ldr r2, _0805BEB4 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x20 orrs r0, r1 strb r0, [r2] bx lr .align 2, 0 -_0805BEB4: .4byte gUnknown_2037078 +_0805BEB4: .4byte gPlayerAvatar thumb_func_end PlayerAvatarTransition_ReturnToField thumb_func_start sub_805BEB8 sub_805BEB8: @ 805BEB8 push {r4,lr} - ldr r4, _0805BEE4 @ =gUnknown_2037078 + ldr r4, _0805BEE4 @ =gPlayerAvatar movs r0, 0 strb r0, [r4, 0x3] bl PlayerIsAnimActive @@ -1534,7 +1534,7 @@ sub_805BEB8: @ 805BEB8 movs r0, 0x1 b _0805BEF4 .align 2, 0 -_0805BEE4: .4byte gUnknown_2037078 +_0805BEE4: .4byte gPlayerAvatar _0805BEE8: bl sub_805BF58 lsls r0, 24 @@ -1552,8 +1552,8 @@ _0805BEF6: thumb_func_start player_is_anim_in_certain_ranges player_is_anim_in_certain_ranges: @ 805BEFC push {lr} - ldr r2, _0805BF48 @ =gUnknown_2036E38 - ldr r0, _0805BF4C @ =gUnknown_2037078 + ldr r2, _0805BF48 @ =gMapObjects + ldr r0, _0805BF4C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1590,8 +1590,8 @@ _0805BF42: movs r0, 0x1 b _0805BF52 .align 2, 0 -_0805BF48: .4byte gUnknown_2036E38 -_0805BF4C: .4byte gUnknown_2037078 +_0805BF48: .4byte gMapObjects +_0805BF4C: .4byte gPlayerAvatar _0805BF50: movs r0, 0 _0805BF52: @@ -1606,14 +1606,14 @@ sub_805BF58: @ 805BF58 lsls r0, 24 cmp r0, 0 beq _0805BF74 - ldr r0, _0805BF70 @ =gUnknown_2037078 + ldr r0, _0805BF70 @ =gPlayerAvatar ldrb r0, [r0, 0x2] cmp r0, 0x1 beq _0805BF74 movs r0, 0x1 b _0805BF76 .align 2, 0 -_0805BF70: .4byte gUnknown_2037078 +_0805BF70: .4byte gPlayerAvatar _0805BF74: movs r0, 0 _0805BF76: @@ -1624,12 +1624,12 @@ _0805BF76: thumb_func_start PlayerIsAnimActive PlayerIsAnimActive: @ 805BF7C push {lr} - ldr r0, _0805BF98 @ =gUnknown_2037078 + ldr r0, _0805BF98 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BF9C @ =gUnknown_2036E38 + ldr r1, _0805BF9C @ =gMapObjects adds r0, r1 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 @@ -1637,19 +1637,19 @@ PlayerIsAnimActive: @ 805BF7C pop {r1} bx r1 .align 2, 0 -_0805BF98: .4byte gUnknown_2037078 -_0805BF9C: .4byte gUnknown_2036E38 +_0805BF98: .4byte gPlayerAvatar +_0805BF9C: .4byte gMapObjects thumb_func_end PlayerIsAnimActive thumb_func_start PlayerCheckIfAnimFinishedOrInactive PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 push {lr} - ldr r0, _0805BFBC @ =gUnknown_2037078 + ldr r0, _0805BFBC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805BFC0 @ =gUnknown_2036E38 + ldr r1, _0805BFC0 @ =gMapObjects adds r0, r1 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 @@ -1657,14 +1657,14 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0 pop {r1} bx r1 .align 2, 0 -_0805BFBC: .4byte gUnknown_2037078 -_0805BFC0: .4byte gUnknown_2036E38 +_0805BFBC: .4byte gPlayerAvatar +_0805BFC0: .4byte gMapObjects thumb_func_end PlayerCheckIfAnimFinishedOrInactive thumb_func_start player_set_x22 player_set_x22: @ 805BFC4 - ldr r3, _0805BFD8 @ =gUnknown_2036E38 - ldr r1, _0805BFDC @ =gUnknown_2037078 + ldr r3, _0805BFD8 @ =gMapObjects + ldr r1, _0805BFDC @ =gPlayerAvatar ldrb r2, [r1, 0x5] lsls r1, r2, 3 adds r1, r2 @@ -1674,14 +1674,14 @@ player_set_x22: @ 805BFC4 strb r0, [r1] bx lr .align 2, 0 -_0805BFD8: .4byte gUnknown_2036E38 -_0805BFDC: .4byte gUnknown_2037078 +_0805BFD8: .4byte gMapObjects +_0805BFDC: .4byte gPlayerAvatar thumb_func_end player_set_x22 thumb_func_start player_get_x22 player_get_x22: @ 805BFE0 - ldr r2, _0805BFF4 @ =gUnknown_2036E38 - ldr r0, _0805BFF8 @ =gUnknown_2037078 + ldr r2, _0805BFF4 @ =gMapObjects + ldr r0, _0805BFF8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -1691,8 +1691,8 @@ player_get_x22: @ 805BFE0 ldrb r0, [r0] bx lr .align 2, 0 -_0805BFF4: .4byte gUnknown_2036E38 -_0805BFF8: .4byte gUnknown_2037078 +_0805BFF4: .4byte gMapObjects +_0805BFF8: .4byte gPlayerAvatar thumb_func_end player_get_x22 thumb_func_start sub_805BFFC @@ -1701,19 +1701,19 @@ sub_805BFFC: @ 805BFFC adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _0805C01C @ =gUnknown_2037078 + ldr r0, _0805C01C @ =gPlayerAvatar ldrb r2, [r0, 0x5] lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0805C020 @ =gUnknown_2036E38 + ldr r2, _0805C020 @ =gMapObjects adds r0, r2 bl FieldObjectForceSetSpecialAnim pop {r0} bx r0 .align 2, 0 -_0805C01C: .4byte gUnknown_2037078 -_0805C020: .4byte gUnknown_2036E38 +_0805C01C: .4byte gPlayerAvatar +_0805C020: .4byte gMapObjects thumb_func_end sub_805BFFC thumb_func_start sub_805C024 @@ -1729,12 +1729,12 @@ sub_805C024: @ 805C024 bne _0805C05E adds r0, r4, 0 bl player_set_x22 - ldr r0, _0805C064 @ =gUnknown_2037078 + ldr r0, _0805C064 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C068 @ =gUnknown_2036E38 + ldr r1, _0805C068 @ =gMapObjects adds r0, r1 adds r1, r5, 0 bl sub_8063CA4 @@ -1748,8 +1748,8 @@ _0805C05E: pop {r0} bx r0 .align 2, 0 -_0805C064: .4byte gUnknown_2037078 -_0805C068: .4byte gUnknown_2036E38 +_0805C064: .4byte gPlayerAvatar +_0805C068: .4byte gMapObjects thumb_func_end sub_805C024 thumb_func_start sub_805C06C @@ -1757,12 +1757,12 @@ sub_805C06C: @ 805C06C push {r4,lr} lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _0805C09C @ =gUnknown_2037078 + ldr r0, _0805C09C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C0A0 @ =gUnknown_2036E38 + ldr r1, _0805C0A0 @ =gMapObjects adds r0, r1 adds r1, r4, 0 bl sub_8063CA4 @@ -1777,8 +1777,8 @@ _0805C094: pop {r0} bx r0 .align 2, 0 -_0805C09C: .4byte gUnknown_2037078 -_0805C0A0: .4byte gUnknown_2036E38 +_0805C09C: .4byte gPlayerAvatar +_0805C0A0: .4byte gMapObjects thumb_func_end sub_805C06C thumb_func_start sub_805C0A4 @@ -2045,7 +2045,7 @@ sub_805C260: @ 805C260 thumb_func_start sub_805C270 sub_805C270: @ 805C270 push {r4,lr} - ldr r4, _0805C2AC @ =gUnknown_2037078 + ldr r4, _0805C2AC @ =gPlayerAvatar ldrb r0, [r4, 0x3] cmp r0, 0x2 beq _0805C27E @@ -2056,7 +2056,7 @@ _0805C27E: lsls r0, 24 cmp r0, 0 beq _0805C2A6 - ldr r2, _0805C2B0 @ =gUnknown_2036E38 + ldr r2, _0805C2B0 @ =gMapObjects ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2074,8 +2074,8 @@ _0805C2A6: pop {r0} bx r0 .align 2, 0 -_0805C2AC: .4byte gUnknown_2037078 -_0805C2B0: .4byte gUnknown_2036E38 +_0805C2AC: .4byte gPlayerAvatar +_0805C2B0: .4byte gMapObjects thumb_func_end sub_805C270 thumb_func_start sub_805C2B4 @@ -2301,8 +2301,8 @@ sub_805C438: @ 805C438 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - ldr r2, _0805C4E8 @ =gUnknown_2036E38 - ldr r0, _0805C4EC @ =gUnknown_2037078 + ldr r2, _0805C4E8 @ =gMapObjects + ldr r0, _0805C4EC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2361,7 +2361,7 @@ _0805C4A0: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -2378,8 +2378,8 @@ _0805C4DE: pop {r0} bx r0 .align 2, 0 -_0805C4E8: .4byte gUnknown_2036E38 -_0805C4EC: .4byte gUnknown_2037078 +_0805C4E8: .4byte gMapObjects +_0805C4EC: .4byte gPlayerAvatar _0805C4F0: .4byte gUnknown_835B864 thumb_func_end sub_805C438 @@ -2388,8 +2388,8 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r3, _0805C530 @ =gUnknown_2036E38 - ldr r2, _0805C534 @ =gUnknown_2037078 + ldr r3, _0805C530 @ =gMapObjects + ldr r2, _0805C534 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2414,15 +2414,15 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4 pop {r0} bx r0 .align 2, 0 -_0805C530: .4byte gUnknown_2036E38 -_0805C534: .4byte gUnknown_2037078 +_0805C530: .4byte gMapObjects +_0805C534: .4byte gPlayerAvatar thumb_func_end GetXYCoordsOneStepInFrontOfPlayer thumb_func_start PlayerGetDestCoords PlayerGetDestCoords: @ 805C538 push {r4,r5,lr} - ldr r5, _0805C560 @ =gUnknown_2036E38 - ldr r4, _0805C564 @ =gUnknown_2037078 + ldr r5, _0805C560 @ =gMapObjects + ldr r4, _0805C564 @ =gPlayerAvatar ldrb r3, [r4, 0x5] lsls r2, r3, 3 adds r2, r3 @@ -2441,8 +2441,8 @@ PlayerGetDestCoords: @ 805C538 pop {r0} bx r0 .align 2, 0 -_0805C560: .4byte gUnknown_2036E38 -_0805C564: .4byte gUnknown_2037078 +_0805C560: .4byte gMapObjects +_0805C564: .4byte gPlayerAvatar thumb_func_end PlayerGetDestCoords thumb_func_start plaer_get_pos_including_state_based_drift @@ -2450,12 +2450,12 @@ plaer_get_pos_including_state_based_drift: @ 805C568 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _0805C5BC @ =gUnknown_2037078 + ldr r0, _0805C5BC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C5C0 @ =gUnknown_2036E38 + ldr r1, _0805C5C0 @ =gMapObjects adds r3, r0, r1 ldrb r1, [r3] movs r0, 0xC0 @@ -2492,8 +2492,8 @@ _0805C5B0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0805C5BC: .4byte gUnknown_2037078 -_0805C5C0: .4byte gUnknown_2036E38 +_0805C5BC: .4byte gPlayerAvatar +_0805C5C0: .4byte gMapObjects _0805C5C4: .4byte gSprites _0805C5C8: .4byte _0805C5CC .align 2, 0 @@ -2584,8 +2584,8 @@ _0805C6BC: thumb_func_start player_get_direction_lower_nybble player_get_direction_lower_nybble: @ 805C6C4 - ldr r2, _0805C6DC @ =gUnknown_2036E38 - ldr r0, _0805C6E0 @ =gUnknown_2037078 + ldr r2, _0805C6DC @ =gMapObjects + ldr r0, _0805C6E0 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2596,14 +2596,14 @@ player_get_direction_lower_nybble: @ 805C6C4 lsrs r0, 28 bx lr .align 2, 0 -_0805C6DC: .4byte gUnknown_2036E38 -_0805C6E0: .4byte gUnknown_2037078 +_0805C6DC: .4byte gMapObjects +_0805C6E0: .4byte gPlayerAvatar thumb_func_end player_get_direction_lower_nybble thumb_func_start player_get_direction_upper_nybble player_get_direction_upper_nybble: @ 805C6E4 - ldr r2, _0805C6F8 @ =gUnknown_2036E38 - ldr r0, _0805C6FC @ =gUnknown_2037078 + ldr r2, _0805C6F8 @ =gMapObjects + ldr r0, _0805C6FC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2613,14 +2613,14 @@ player_get_direction_upper_nybble: @ 805C6E4 lsrs r0, 4 bx lr .align 2, 0 -_0805C6F8: .4byte gUnknown_2036E38 -_0805C6FC: .4byte gUnknown_2037078 +_0805C6F8: .4byte gMapObjects +_0805C6FC: .4byte gPlayerAvatar thumb_func_end player_get_direction_upper_nybble thumb_func_start PlayerGetZCoord PlayerGetZCoord: @ 805C700 - ldr r2, _0805C714 @ =gUnknown_2036E38 - ldr r0, _0805C718 @ =gUnknown_2037078 + ldr r2, _0805C714 @ =gMapObjects + ldr r0, _0805C718 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -2630,8 +2630,8 @@ PlayerGetZCoord: @ 805C700 lsrs r0, 4 bx lr .align 2, 0 -_0805C714: .4byte gUnknown_2036E38 -_0805C718: .4byte gUnknown_2037078 +_0805C714: .4byte gMapObjects +_0805C718: .4byte gPlayerAvatar thumb_func_end PlayerGetZCoord thumb_func_start sub_805C71C @@ -2639,12 +2639,12 @@ sub_805C71C: @ 805C71C push {lr} adds r3, r0, 0 adds r2, r1, 0 - ldr r0, _0805C744 @ =gUnknown_2037078 + ldr r0, _0805C744 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805C748 @ =gUnknown_2036E38 + ldr r1, _0805C748 @ =gMapObjects adds r0, r1 lsls r3, 16 asrs r3, 16 @@ -2655,37 +2655,37 @@ sub_805C71C: @ 805C71C pop {r0} bx r0 .align 2, 0 -_0805C744: .4byte gUnknown_2037078 -_0805C748: .4byte gUnknown_2036E38 +_0805C744: .4byte gPlayerAvatar +_0805C748: .4byte gMapObjects thumb_func_end sub_805C71C thumb_func_start TestPlayerAvatarFlags TestPlayerAvatarFlags: @ 805C74C - ldr r1, _0805C758 @ =gUnknown_2037078 + ldr r1, _0805C758 @ =gPlayerAvatar ldrb r1, [r1] ands r1, r0 adds r0, r1, 0 bx lr .align 2, 0 -_0805C758: .4byte gUnknown_2037078 +_0805C758: .4byte gPlayerAvatar thumb_func_end TestPlayerAvatarFlags thumb_func_start sub_805C75C sub_805C75C: @ 805C75C - ldr r0, _0805C764 @ =gUnknown_2037078 + ldr r0, _0805C764 @ =gPlayerAvatar ldrb r0, [r0] bx lr .align 2, 0 -_0805C764: .4byte gUnknown_2037078 +_0805C764: .4byte gPlayerAvatar thumb_func_end sub_805C75C thumb_func_start GetPlayerAvatarObjectId GetPlayerAvatarObjectId: @ 805C768 - ldr r0, _0805C770 @ =gUnknown_2037078 + ldr r0, _0805C770 @ =gPlayerAvatar ldrb r0, [r0, 0x4] bx lr .align 2, 0 -_0805C770: .4byte gUnknown_2037078 +_0805C770: .4byte gPlayerAvatar thumb_func_end GetPlayerAvatarObjectId thumb_func_start sub_805C774 @@ -2699,12 +2699,12 @@ sub_805C774: @ 805C774 thumb_func_start sub_805C780 sub_805C780: @ 805C780 push {r4,lr} - ldr r0, _0805C7C0 @ =gUnknown_2037078 + ldr r0, _0805C7C0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805C7C4 @ =gUnknown_2036E38 + ldr r0, _0805C7C4 @ =gMapObjects adds r4, r0 adds r0, r4, 0 bl npc_clear_strange_bits @@ -2726,8 +2726,8 @@ _0805C7B8: pop {r0} bx r0 .align 2, 0 -_0805C7C0: .4byte gUnknown_2037078 -_0805C7C4: .4byte gUnknown_2036E38 +_0805C7C0: .4byte gPlayerAvatar +_0805C7C4: .4byte gMapObjects thumb_func_end sub_805C780 thumb_func_start sub_805C7C8 @@ -2776,7 +2776,7 @@ sub_805C808: @ 805C808 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0805C820 @ =gUnknown_2037078 + ldr r1, _0805C820 @ =gPlayerAvatar ldrb r1, [r1, 0x7] bl GetPlayerAvatarGraphicsIdByStateIdAndGender lsls r0, 24 @@ -2784,7 +2784,7 @@ sub_805C808: @ 805C808 pop {r1} bx r1 .align 2, 0 -_0805C820: .4byte gUnknown_2037078 +_0805C820: .4byte gPlayerAvatar thumb_func_end sub_805C808 thumb_func_start sub_805C824 @@ -2877,12 +2877,12 @@ _0805C8AC: IsPlayerFacingSurfableFishableWater: @ 805C8B0 push {r4,r5,lr} sub sp, 0x4 - ldr r0, _0805C924 @ =gUnknown_2037078 + ldr r0, _0805C924 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805C928 @ =gUnknown_2036E38 + ldr r0, _0805C928 @ =gMapObjects adds r4, r0 ldrh r1, [r4, 0x10] mov r0, sp @@ -2929,8 +2929,8 @@ IsPlayerFacingSurfableFishableWater: @ 805C8B0 movs r0, 0x1 b _0805C92E .align 2, 0 -_0805C924: .4byte gUnknown_2037078 -_0805C928: .4byte gUnknown_2036E38 +_0805C924: .4byte gPlayerAvatar +_0805C928: .4byte gMapObjects _0805C92C: movs r0, 0 _0805C92E: @@ -2962,21 +2962,21 @@ sub_805C938: @ 805C938 thumb_func_start ClearPlayerAvatarInfo ClearPlayerAvatarInfo: @ 805C95C push {lr} - ldr r0, _0805C96C @ =gUnknown_2037078 + ldr r0, _0805C96C @ =gPlayerAvatar movs r1, 0 movs r2, 0x20 bl memset pop {r0} bx r0 .align 2, 0 -_0805C96C: .4byte gUnknown_2037078 +_0805C96C: .4byte gPlayerAvatar thumb_func_end ClearPlayerAvatarInfo thumb_func_start SetPlayerAvatarStateMask SetPlayerAvatarStateMask: @ 805C970 lsls r0, 24 lsrs r0, 24 - ldr r3, _0805C984 @ =gUnknown_2037078 + ldr r3, _0805C984 @ =gPlayerAvatar ldrb r2, [r3] movs r1, 0xE0 ands r1, r2 @@ -2984,7 +2984,7 @@ SetPlayerAvatarStateMask: @ 805C970 strb r0, [r3] bx lr .align 2, 0 -_0805C984: .4byte gUnknown_2037078 +_0805C984: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarStateMask thumb_func_start GetPlayerAvatarStateTransitionByGraphicsId @@ -3028,7 +3028,7 @@ _0805C9C0: thumb_func_start GetPlayerAvatarGraphicsIdByCurrentState GetPlayerAvatarGraphicsIdByCurrentState: @ 805C9C8 push {r4-r6,lr} - ldr r0, _0805C9F0 @ =gUnknown_2037078 + ldr r0, _0805C9F0 @ =gPlayerAvatar ldrb r5, [r0] movs r2, 0 ldr r3, _0805C9F4 @ =gUnknown_835B882 @@ -3049,7 +3049,7 @@ _0805C9DC: ldrb r0, [r0] b _0805CA04 .align 2, 0 -_0805C9F0: .4byte gUnknown_2037078 +_0805C9F0: .4byte gPlayerAvatar _0805C9F4: .4byte gUnknown_835B882 _0805C9F8: adds r0, r2, 0x1 @@ -3072,7 +3072,7 @@ SetPlayerAvatarExtraStateTransition: @ 805CA0C lsrs r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r5, _0805CA38 @ =gUnknown_2037078 + ldr r5, _0805CA38 @ =gPlayerAvatar ldrb r1, [r5, 0x7] bl GetPlayerAvatarStateTransitionByGraphicsId lsls r0, 24 @@ -3086,7 +3086,7 @@ SetPlayerAvatarExtraStateTransition: @ 805CA0C pop {r0} bx r0 .align 2, 0 -_0805CA38: .4byte gUnknown_2037078 +_0805CA38: .4byte gPlayerAvatar thumb_func_end SetPlayerAvatarExtraStateTransition thumb_func_start InitPlayerAvatar @@ -3152,7 +3152,7 @@ InitPlayerAvatar: @ 805CA3C lsls r4, r5, 3 adds r4, r5 lsls r4, 2 - ldr r0, _0805CAFC @ =gUnknown_2036E38 + ldr r0, _0805CAFC @ =gMapObjects adds r4, r0 ldrb r0, [r4, 0x2] movs r1, 0x1 @@ -3164,7 +3164,7 @@ InitPlayerAvatar: @ 805CA3C mov r1, r9 bl FieldObjectTurn bl ClearPlayerAvatarInfo - ldr r0, _0805CB00 @ =gUnknown_2037078 + ldr r0, _0805CB00 @ =gPlayerAvatar strb r6, [r0, 0x2] strb r6, [r0, 0x3] strb r5, [r0, 0x5] @@ -3182,8 +3182,8 @@ InitPlayerAvatar: @ 805CA3C pop {r0} bx r0 .align 2, 0 -_0805CAFC: .4byte gUnknown_2036E38 -_0805CB00: .4byte gUnknown_2037078 +_0805CAFC: .4byte gMapObjects +_0805CB00: .4byte gPlayerAvatar thumb_func_end InitPlayerAvatar thumb_func_start sub_805CB04 @@ -3191,8 +3191,8 @@ sub_805CB04: @ 805CB04 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _0805CB64 @ =gUnknown_2036E38 - ldr r5, _0805CB68 @ =gUnknown_2037078 + ldr r6, _0805CB64 @ =gMapObjects + ldr r5, _0805CB68 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3236,20 +3236,20 @@ _0805CB5C: pop {r0} bx r0 .align 2, 0 -_0805CB64: .4byte gUnknown_2036E38 -_0805CB68: .4byte gUnknown_2037078 +_0805CB64: .4byte gMapObjects +_0805CB68: .4byte gPlayerAvatar _0805CB6C: .4byte gSprites thumb_func_end sub_805CB04 thumb_func_start sub_805CB70 sub_805CB70: @ 805CB70 push {r4,r5,lr} - ldr r5, _0805CBAC @ =gUnknown_2037078 + ldr r5, _0805CBAC @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805CBB0 @ =gUnknown_2036E38 + ldr r0, _0805CBB0 @ =gMapObjects adds r4, r0 movs r0, 0x3 bl sub_805C808 @@ -3270,15 +3270,15 @@ sub_805CB70: @ 805CB70 pop {r0} bx r0 .align 2, 0 -_0805CBAC: .4byte gUnknown_2037078 -_0805CBB0: .4byte gUnknown_2036E38 +_0805CBAC: .4byte gPlayerAvatar +_0805CBB0: .4byte gMapObjects _0805CBB4: .4byte gSprites thumb_func_end sub_805CB70 thumb_func_start sub_805CBB8 sub_805CBB8: @ 805CBB8 push {lr} - ldr r2, _0805CBD4 @ =gUnknown_2037078 + ldr r2, _0805CBD4 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0x6 ands r0, r1 @@ -3290,7 +3290,7 @@ sub_805CBB8: @ 805CBB8 lsrs r0, 24 b _0805CBE0 .align 2, 0 -_0805CBD4: .4byte gUnknown_2037078 +_0805CBD4: .4byte gPlayerAvatar _0805CBD8: ldr r0, _0805CBE4 @ =gUnknown_835B88E ldrb r1, [r2, 0x7] @@ -3306,12 +3306,12 @@ _0805CBE4: .4byte gUnknown_835B88E thumb_func_start sub_805CBE8 sub_805CBE8: @ 805CBE8 push {r4,r5,lr} - ldr r5, _0805CC20 @ =gUnknown_2037078 + ldr r5, _0805CC20 @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805CC24 @ =gUnknown_2036E38 + ldr r0, _0805CC24 @ =gMapObjects adds r4, r0 bl sub_805CBB8 adds r1, r0, 0 @@ -3331,8 +3331,8 @@ sub_805CBE8: @ 805CBE8 pop {r0} bx r0 .align 2, 0 -_0805CC20: .4byte gUnknown_2037078 -_0805CC24: .4byte gUnknown_2036E38 +_0805CC20: .4byte gPlayerAvatar +_0805CC24: .4byte gMapObjects _0805CC28: .4byte gSprites thumb_func_end sub_805CBE8 @@ -3468,7 +3468,7 @@ taskFF_bump_boulder: @ 805CD0C lsrs r0, 24 ldr r6, _0805CD54 @ =gUnknown_835B8A0 ldr r2, _0805CD58 @ =gTasks - ldr r5, _0805CD5C @ =gUnknown_2036E38 + ldr r5, _0805CD5C @ =gMapObjects lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3478,7 +3478,7 @@ _0805CD20: ldrsh r3, [r4, r0] lsls r3, 2 adds r3, r6 - ldr r0, _0805CD60 @ =gUnknown_2037078 + ldr r0, _0805CD60 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -3502,8 +3502,8 @@ _0805CD20: .align 2, 0 _0805CD54: .4byte gUnknown_835B8A0 _0805CD58: .4byte gTasks -_0805CD5C: .4byte gUnknown_2036E38 -_0805CD60: .4byte gUnknown_2037078 +_0805CD5C: .4byte gMapObjects +_0805CD60: .4byte gPlayerAvatar thumb_func_end taskFF_bump_boulder thumb_func_start sub_805CD64 @@ -3511,7 +3511,7 @@ sub_805CD64: @ 805CD64 push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _0805CD80 @ =gUnknown_2037078 + ldr r1, _0805CD80 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -3522,7 +3522,7 @@ sub_805CD64: @ 805CD64 pop {r1} bx r1 .align 2, 0 -_0805CD80: .4byte gUnknown_2037078 +_0805CD80: .4byte gPlayerAvatar thumb_func_end sub_805CD64 thumb_func_start sub_805CD84 @@ -3620,7 +3620,7 @@ sub_805CE20: @ 805CE20 ldrh r0, [r4, 0x10] ldrh r1, [r4, 0x12] bl sub_806DE70 - ldr r1, _0805CE78 @ =gUnknown_2037078 + ldr r1, _0805CE78 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -3635,7 +3635,7 @@ _0805CE70: pop {r1} bx r1 .align 2, 0 -_0805CE78: .4byte gUnknown_2037078 +_0805CE78: .4byte gPlayerAvatar _0805CE7C: .4byte taskFF_bump_boulder thumb_func_end sub_805CE20 @@ -3672,12 +3672,12 @@ _0805CEB2: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _0805CEE4 @ =gUnknown_2037078 + ldr r0, _0805CEE4 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0805CEE8 @ =gUnknown_2036E38 + ldr r0, _0805CEE8 @ =gMapObjects adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3691,8 +3691,8 @@ _0805CEB2: .align 2, 0 _0805CEDC: .4byte gUnknown_835B8AC _0805CEE0: .4byte gTasks -_0805CEE4: .4byte gUnknown_2037078 -_0805CEE8: .4byte gUnknown_2036E38 +_0805CEE4: .4byte gPlayerAvatar +_0805CEE8: .4byte gMapObjects thumb_func_end sub_805CEA0 thumb_func_start PlayerAvatar_DoSecretBaseMatJump @@ -3700,7 +3700,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC push {r4-r6,lr} adds r6, r0, 0 adds r4, r1, 0 - ldr r5, _0805CF50 @ =gUnknown_2037078 + ldr r5, _0805CF50 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r5, 0x6] adds r0, r4, 0 @@ -3743,7 +3743,7 @@ _0805CF48: pop {r1} bx r1 .align 2, 0 -_0805CF50: .4byte gUnknown_2037078 +_0805CF50: .4byte gPlayerAvatar _0805CF54: .4byte sub_805CEA0 thumb_func_end PlayerAvatar_DoSecretBaseMatJump @@ -3780,12 +3780,12 @@ _0805CF8A: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _0805CFBC @ =gUnknown_2037078 + ldr r0, _0805CFBC @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0805CFC0 @ =gUnknown_2036E38 + ldr r0, _0805CFC0 @ =gMapObjects adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -3799,8 +3799,8 @@ _0805CF8A: .align 2, 0 _0805CFB4: .4byte gUnknown_835B8B0 _0805CFB8: .4byte gTasks -_0805CFBC: .4byte gUnknown_2037078 -_0805CFC0: .4byte gUnknown_2036E38 +_0805CFBC: .4byte gPlayerAvatar +_0805CFC0: .4byte gMapObjects thumb_func_end sub_805CF78 thumb_func_start sub_805CFC4 @@ -3812,7 +3812,7 @@ sub_805CFC4: @ 805CFC4 ldrb r1, [r1, 0x18] lsrs r1, 4 strh r1, [r0, 0xA] - ldr r1, _0805CFE8 @ =gUnknown_2037078 + ldr r1, _0805CFE8 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] bl ScriptContext2_Enable @@ -3822,7 +3822,7 @@ sub_805CFC4: @ 805CFC4 pop {r1} bx r1 .align 2, 0 -_0805CFE8: .4byte gUnknown_2037078 +_0805CFE8: .4byte gPlayerAvatar thumb_func_end sub_805CFC4 thumb_func_start sub_805CFEC @@ -3939,7 +3939,7 @@ sub_805D0A4: @ 805D0A4 adds r0, r5, 0 bl sub_805C06C bl ScriptContext2_Disable - ldr r1, _0805D0F0 @ =gUnknown_2037078 + ldr r1, _0805D0F0 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] ldr r0, _0805D0F4 @ =sub_805CF78 @@ -3953,7 +3953,7 @@ _0805D0E8: pop {r1} bx r1 .align 2, 0 -_0805D0F0: .4byte gUnknown_2037078 +_0805D0F0: .4byte gPlayerAvatar _0805D0F4: .4byte sub_805CF78 thumb_func_end sub_805D0A4 @@ -3967,7 +3967,7 @@ sub_805D0F8: @ 805D0F8 bl player_bitmagic bl sav1_reset_battle_music_maybe bl Overworld_ChangeMusicToDefault - ldr r2, _0805D148 @ =gUnknown_2037078 + ldr r2, _0805D148 @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0xF7 ands r0, r1 @@ -3993,7 +3993,7 @@ sub_805D0F8: @ 805D0F8 pop {r0} bx r0 .align 2, 0 -_0805D148: .4byte gUnknown_2037078 +_0805D148: .4byte gPlayerAvatar _0805D14C: .4byte taskFF_0805D1D4 _0805D150: .4byte gTasks thumb_func_end sub_805D0F8 @@ -4006,7 +4006,7 @@ sub_805D154: @ 805D154 lsrs r4, 24 bl ScriptContext2_Enable bl player_bitmagic - ldr r2, _0805D19C @ =gUnknown_2037078 + ldr r2, _0805D19C @ =gPlayerAvatar ldrb r1, [r2] movs r0, 0xF7 ands r0, r1 @@ -4032,7 +4032,7 @@ sub_805D154: @ 805D154 pop {r0} bx r0 .align 2, 0 -_0805D19C: .4byte gUnknown_2037078 +_0805D19C: .4byte gPlayerAvatar _0805D1A0: .4byte taskFF_0805D1D4 _0805D1A4: .4byte gTasks thumb_func_end sub_805D154 @@ -4065,12 +4065,12 @@ taskFF_0805D1D4: @ 805D1D4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0805D230 @ =gUnknown_2037078 + ldr r0, _0805D230 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805D234 @ =gUnknown_2036E38 + ldr r1, _0805D234 @ =gMapObjects adds r5, r0, r1 adds r0, r5, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -4105,8 +4105,8 @@ _0805D228: pop {r0} bx r0 .align 2, 0 -_0805D230: .4byte gUnknown_2037078 -_0805D234: .4byte gUnknown_2036E38 +_0805D230: .4byte gPlayerAvatar +_0805D234: .4byte gMapObjects _0805D238: .4byte gTasks _0805D23C: .4byte sub_805D240 thumb_func_end taskFF_0805D1D4 @@ -4116,12 +4116,12 @@ sub_805D240: @ 805D240 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0805D2B4 @ =gUnknown_2037078 + ldr r6, _0805D2B4 @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805D2B8 @ =gUnknown_2036E38 + ldr r1, _0805D2B8 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -4163,8 +4163,8 @@ _0805D2AE: pop {r0} bx r0 .align 2, 0 -_0805D2B4: .4byte gUnknown_2037078 -_0805D2B8: .4byte gUnknown_2036E38 +_0805D2B4: .4byte gPlayerAvatar +_0805D2B8: .4byte gMapObjects _0805D2BC: .4byte gSprites thumb_func_end sub_805D240 @@ -4236,7 +4236,7 @@ sub_805D33C: @ 805D33C push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - ldr r1, _0805D358 @ =gUnknown_2037078 + ldr r1, _0805D358 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -4247,7 +4247,7 @@ sub_805D33C: @ 805D33C pop {r1} bx r1 .align 2, 0 -_0805D358: .4byte gUnknown_2037078 +_0805D358: .4byte gPlayerAvatar thumb_func_end sub_805D33C thumb_func_start fish1 @@ -4281,8 +4281,8 @@ fish1: @ 805D35C ldrh r1, [r6] adds r1, r0 strh r1, [r5, 0x22] - ldr r3, _0805D3EC @ =gUnknown_2036E38 - ldr r2, _0805D3F0 @ =gUnknown_2037078 + ldr r3, _0805D3EC @ =gMapObjects + ldr r2, _0805D3F0 @ =gPlayerAvatar ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4316,15 +4316,15 @@ fish1: @ 805D35C .align 2, 0 _0805D3E4: .4byte gUnknown_835B90C _0805D3E8: .4byte gUnknown_835B912 -_0805D3EC: .4byte gUnknown_2036E38 -_0805D3F0: .4byte gUnknown_2037078 +_0805D3EC: .4byte gMapObjects +_0805D3F0: .4byte gPlayerAvatar thumb_func_end fish1 thumb_func_start fish2 fish2: @ 805D3F4 push {r4,lr} adds r4, r0, 0 - ldr r0, _0805D428 @ =gUnknown_2037078 + ldr r0, _0805D428 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4348,7 +4348,7 @@ _0805D41E: pop {r1} bx r1 .align 2, 0 -_0805D428: .4byte gUnknown_2037078 +_0805D428: .4byte gPlayerAvatar _0805D42C: .4byte gSprites thumb_func_end fish2 @@ -4398,7 +4398,7 @@ sub_805D47C: @ 805D47C push {r4,r5,lr} sub sp, 0xC adds r4, r0, 0 - ldr r0, _0805D4CC @ =gUnknown_2037078 + ldr r0, _0805D4CC @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4436,7 +4436,7 @@ _0805D4C6: strh r0, [r4, 0x20] b _0805D4F8 .align 2, 0 -_0805D4CC: .4byte gUnknown_2037078 +_0805D4CC: .4byte gPlayerAvatar _0805D4D0: .4byte gSprites _0805D4D4: ldr r2, _0805D504 @ =gUnknown_835B918 @@ -4470,7 +4470,7 @@ _0805D504: .4byte gUnknown_835B918 sub_805D508: @ 805D508 push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _0805D540 @ =gUnknown_2037078 + ldr r6, _0805D540 @ =gPlayerAvatar ldrb r1, [r6, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4495,7 +4495,7 @@ _0805D53A: strh r0, [r4, 0x8] b _0805D56A .align 2, 0 -_0805D540: .4byte gUnknown_2037078 +_0805D540: .4byte gPlayerAvatar _0805D544: .4byte gSprites _0805D548: ldrb r0, [r6, 0x4] @@ -4537,7 +4537,7 @@ sub_805D580: @ 805D580 mov r0, sp movs r2, 0x6 bl memcpy - ldr r0, _0805D5C4 @ =gUnknown_2037078 + ldr r0, _0805D5C4 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4562,7 +4562,7 @@ sub_805D580: @ 805D580 b _0805D5DC .align 2, 0 _0805D5C0: .4byte gUnknown_835B91A -_0805D5C4: .4byte gUnknown_2037078 +_0805D5C4: .4byte gPlayerAvatar _0805D5C8: .4byte gSprites _0805D5CC: ldr r0, _0805D5E8 @ =gMain @@ -4594,7 +4594,7 @@ sub_805D5EC: @ 805D5EC mov r0, sp movs r2, 0xC bl memcpy - ldr r0, _0805D664 @ =gUnknown_2037078 + ldr r0, _0805D664 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4644,7 +4644,7 @@ _0805D654: bx r1 .align 2, 0 _0805D660: .4byte gUnknown_835B920 -_0805D664: .4byte gUnknown_2037078 +_0805D664: .4byte gPlayerAvatar _0805D668: .4byte gSprites thumb_func_end sub_805D5EC @@ -4653,7 +4653,7 @@ sub_805D66C: @ 805D66C push {r4,r5,lr} sub sp, 0x10 adds r4, r0, 0 - ldr r0, _0805D6BC @ =gUnknown_2037078 + ldr r0, _0805D6BC @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4687,7 +4687,7 @@ sub_805D66C: @ 805D66C pop {r1} bx r1 .align 2, 0 -_0805D6BC: .4byte gUnknown_2037078 +_0805D6BC: .4byte gPlayerAvatar _0805D6C0: .4byte gSprites _0805D6C4: .4byte gUnknown_841D14E thumb_func_end sub_805D66C @@ -4702,7 +4702,7 @@ sub_805D6C8: @ 805D6C8 ldrsh r0, [r5, r1] cmp r0, 0 bne _0805D6EA - ldr r0, _0805D774 @ =gUnknown_2037078 + ldr r0, _0805D774 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4722,12 +4722,12 @@ _0805D6EA: lsrs r6, r0, 16 cmp r6, 0 bne _0805D780 - ldr r7, _0805D774 @ =gUnknown_2037078 + ldr r7, _0805D774 @ =gPlayerAvatar ldrb r0, [r7, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805D77C @ =gUnknown_2036E38 + ldr r0, _0805D77C @ =gMapObjects mov r8, r0 add r4, r8 ldrh r1, [r5, 0x24] @@ -4775,16 +4775,16 @@ _0805D748: strh r0, [r5, 0xA] b _0805D7AA .align 2, 0 -_0805D774: .4byte gUnknown_2037078 +_0805D774: .4byte gPlayerAvatar _0805D778: .4byte gSprites -_0805D77C: .4byte gUnknown_2036E38 +_0805D77C: .4byte gMapObjects _0805D780: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 beq _0805D7AA _0805D788: - ldr r1, _0805D7B8 @ =gUnknown_2037078 + ldr r1, _0805D7B8 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] bl ScriptContext2_Disable @@ -4805,7 +4805,7 @@ _0805D7AA: pop {r1} bx r1 .align 2, 0 -_0805D7B8: .4byte gUnknown_2037078 +_0805D7B8: .4byte gPlayerAvatar _0805D7BC: .4byte sub_805D304 thumb_func_end sub_805D6C8 @@ -4814,7 +4814,7 @@ sub_805D7C0: @ 805D7C0 push {r4-r6,lr} sub sp, 0x10 adds r6, r0, 0 - ldr r4, _0805D82C @ =gUnknown_2037078 + ldr r4, _0805D82C @ =gPlayerAvatar ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4860,7 +4860,7 @@ sub_805D7C0: @ 805D7C0 pop {r1} bx r1 .align 2, 0 -_0805D82C: .4byte gUnknown_2037078 +_0805D82C: .4byte gPlayerAvatar _0805D830: .4byte gSprites _0805D834: .4byte gUnknown_841D169 thumb_func_end sub_805D7C0 @@ -4870,7 +4870,7 @@ sub_805D838: @ 805D838 push {r4-r6,lr} sub sp, 0x10 adds r6, r0, 0 - ldr r4, _0805D8A0 @ =gUnknown_2037078 + ldr r4, _0805D8A0 @ =gPlayerAvatar ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4914,7 +4914,7 @@ sub_805D838: @ 805D838 pop {r1} bx r1 .align 2, 0 -_0805D8A0: .4byte gUnknown_2037078 +_0805D8A0: .4byte gPlayerAvatar _0805D8A4: .4byte gSprites _0805D8A8: .4byte gUnknown_841D17E thumb_func_end sub_805D838 @@ -4923,7 +4923,7 @@ _0805D8A8: .4byte gUnknown_841D17E sub_805D8AC: @ 805D8AC push {r4,lr} adds r4, r0, 0 - ldr r0, _0805D8D0 @ =gUnknown_2037078 + ldr r0, _0805D8D0 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4939,7 +4939,7 @@ sub_805D8AC: @ 805D8AC pop {r1} bx r1 .align 2, 0 -_0805D8D0: .4byte gUnknown_2037078 +_0805D8D0: .4byte gPlayerAvatar _0805D8D4: .4byte gSprites thumb_func_end sub_805D8AC @@ -4949,7 +4949,7 @@ sub_805D8D8: @ 805D8D8 mov r7, r8 push {r7} adds r6, r0, 0 - ldr r5, _0805D974 @ =gUnknown_2037078 + ldr r5, _0805D974 @ =gPlayerAvatar ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4971,7 +4971,7 @@ sub_805D8D8: @ 805D8D8 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0805D97C @ =gUnknown_2036E38 + ldr r0, _0805D97C @ =gMapObjects mov r8, r0 add r4, r8 ldrh r1, [r6, 0x24] @@ -5022,9 +5022,9 @@ _0805D968: pop {r1} bx r1 .align 2, 0 -_0805D974: .4byte gUnknown_2037078 +_0805D974: .4byte gPlayerAvatar _0805D978: .4byte gSprites -_0805D97C: .4byte gUnknown_2036E38 +_0805D97C: .4byte gMapObjects thumb_func_end sub_805D8D8 thumb_func_start sub_805D980 @@ -5037,7 +5037,7 @@ sub_805D980: @ 805D980 lsrs r1, r0, 16 cmp r1, 0 bne _0805D9B6 - ldr r0, _0805D9BC @ =gUnknown_2037078 + ldr r0, _0805D9BC @ =gPlayerAvatar strb r1, [r0, 0x6] bl ScriptContext2_Disable bl UnfreezeMapObjects @@ -5054,7 +5054,7 @@ _0805D9B6: pop {r1} bx r1 .align 2, 0 -_0805D9BC: .4byte gUnknown_2037078 +_0805D9BC: .4byte gPlayerAvatar _0805D9C0: .4byte sub_805D304 thumb_func_end sub_805D980 @@ -5153,13 +5153,13 @@ _0805DA68: movs r0, 0x8 strh r0, [r4, 0x26] _0805DA78: - ldr r3, _0805DAA8 @ =gUnknown_2037078 + ldr r3, _0805DAA8 @ =gPlayerAvatar ldrb r1, [r3] movs r0, 0x8 ands r0, r1 cmp r0, 0 beq _0805DA9C - ldr r2, _0805DAAC @ =gUnknown_2036E38 + ldr r2, _0805DAAC @ =gMapObjects ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -5176,8 +5176,8 @@ _0805DA9C: bx r0 .align 2, 0 _0805DAA4: .4byte 0x0000fff8 -_0805DAA8: .4byte gUnknown_2037078 -_0805DAAC: .4byte gUnknown_2036E38 +_0805DAA8: .4byte gPlayerAvatar +_0805DAAC: .4byte gMapObjects thumb_func_end sub_805D9C4 thumb_func_start sub_805DAB0 @@ -5242,12 +5242,12 @@ sub_805DB04: @ 805DB04 lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 - ldr r0, _0805DB48 @ =gUnknown_2037078 + ldr r0, _0805DB48 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805DB4C @ =gUnknown_2036E38 + ldr r1, _0805DB4C @ =gMapObjects adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -5270,8 +5270,8 @@ sub_805DB04: @ 805DB04 beq _0805DB5E b _0805DBFA .align 2, 0 -_0805DB48: .4byte gUnknown_2037078 -_0805DB4C: .4byte gUnknown_2036E38 +_0805DB48: .4byte gPlayerAvatar +_0805DB4C: .4byte gMapObjects _0805DB50: .4byte gSprites _0805DB54: .4byte gTasks+0x8 _0805DB58: @@ -5401,12 +5401,12 @@ sub_805DC38: @ 805DC38 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0805DC80 @ =gUnknown_2037078 + ldr r0, _0805DC80 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805DC84 @ =gUnknown_2036E38 + ldr r1, _0805DC84 @ =gMapObjects adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -5430,8 +5430,8 @@ sub_805DC38: @ 805DC38 beq _0805DC9A b _0805DDBA .align 2, 0 -_0805DC80: .4byte gUnknown_2037078 -_0805DC84: .4byte gUnknown_2036E38 +_0805DC80: .4byte gPlayerAvatar +_0805DC84: .4byte gMapObjects _0805DC88: .4byte gSprites _0805DC8C: .4byte gTasks+0x8 _0805DC90: diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index 2a6ee5c65..a8477a33f 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -937,12 +937,12 @@ _0807F542: lsls r0, 24 cmp r0, 0 beq _0807F5E4 - ldr r0, _0807F57C @ =gUnknown_2037078 + ldr r0, _0807F57C @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807F580 @ =gUnknown_2036E38 + ldr r1, _0807F580 @ =gMapObjects adds r0, r1 movs r1, 0x2 bl FieldObjectTurn @@ -957,8 +957,8 @@ _0807F542: b _0807F5E4 .align 2, 0 _0807F578: .4byte gUnknown_841B5B6 -_0807F57C: .4byte gUnknown_2037078 -_0807F580: .4byte gUnknown_2036E38 +_0807F57C: .4byte gPlayerAvatar +_0807F580: .4byte gMapObjects _0807F584: .4byte gTasks _0807F588: lsls r4, r6, 2 diff --git a/asm/field_specials.s b/asm/field_specials.s index e0cd49fee..537a4e6dc 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -21,7 +21,7 @@ _080CA62C: .4byte sub_80F4C10 thumb_func_start sub_80CA630 sub_80CA630: @ 80CA630 push {r4,lr} - ldr r0, _080CA65C @ =gUnknown_2037078 + ldr r0, _080CA65C @ =gPlayerAvatar ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -40,7 +40,7 @@ _080CA644: pop {r0} bx r0 .align 2, 0 -_080CA65C: .4byte gUnknown_2037078 +_080CA65C: .4byte gPlayerAvatar thumb_func_end sub_80CA630 thumb_func_start nullsub_74 @@ -604,7 +604,7 @@ SpawnScriptFieldObject: @ 80CAA34 bl SpawnSpecialFieldObjectParametrized lsls r0, 24 lsrs r0, 24 - ldr r2, _080CAA84 @ =gUnknown_2036E38 + ldr r2, _080CAA84 @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -620,7 +620,7 @@ SpawnScriptFieldObject: @ 80CAA34 bx r0 .align 2, 0 _080CAA80: .4byte gSaveBlock1Ptr -_080CAA84: .4byte gUnknown_2036E38 +_080CAA84: .4byte gMapObjects thumb_func_end SpawnScriptFieldObject thumb_func_start RemoveScriptFieldObject @@ -3167,7 +3167,7 @@ sub_80CBE00: @ 80CBE00 _080CBE18: .4byte gUnknown_20370DA _080CBE1C: .4byte gUnknown_3005074 _080CBE20: - ldr r2, _080CBE4C @ =gUnknown_2036E38 + ldr r2, _080CBE4C @ =gMapObjects ldrb r1, [r1] lsls r0, r1, 3 adds r0, r1 @@ -3191,7 +3191,7 @@ _080CBE48: pop {r1} bx r1 .align 2, 0 -_080CBE4C: .4byte gUnknown_2036E38 +_080CBE4C: .4byte gMapObjects thumb_func_end sub_80CBE00 thumb_func_start sub_80CBE50 @@ -4717,7 +4717,7 @@ sub_80CCA18: @ 80CCA18 lsls r1, 3 ldr r0, _080CCAA4 @ =gTasks+0x8 adds r4, r1, r0 - ldr r0, _080CCAA8 @ =gUnknown_2037AB8 + ldr r0, _080CCAA8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4779,7 +4779,7 @@ _080CCA78: b _080CCADE .align 2, 0 _080CCAA4: .4byte gTasks+0x8 -_080CCAA8: .4byte gUnknown_2037AB8 +_080CCAA8: .4byte gPaletteFade _080CCAAC: .4byte gUnknown_2036E28 _080CCAB0: .4byte gSaveBlock1Ptr _080CCAB4: .4byte 0x00004f01 @@ -4847,7 +4847,7 @@ _080CCB36: movs r0, 0x7 movs r1, 0x1 bl sub_8059948 - ldr r0, _080CCB64 @ =gUnknown_2037AB8 + ldr r0, _080CCB64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4866,7 +4866,7 @@ _080CCB5A: bx r0 .align 2, 0 _080CCB60: .4byte gUnknown_83F60B0 -_080CCB64: .4byte gUnknown_2037AB8 +_080CCB64: .4byte gPaletteFade thumb_func_end sub_80CCAF4 thumb_func_start sub_80CCB68 diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 88b65274f..d7dd5e6b6 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -322,7 +322,7 @@ _0806EA52: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r6, r0, 24 adds r0, r6, 0 @@ -478,7 +478,7 @@ _0806EB8E: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059F50 @@ -576,7 +576,7 @@ sub_806EC40: @ 806EC40 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r7, r0, 16 ldrh r1, [r5, 0x8] diff --git a/asm/field_weather.s b/asm/field_weather.s index 8a3208f55..77a138ad2 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -22,7 +22,7 @@ sub_8079C08: @ 8079C08 lsrs r5, 24 ldr r0, _08079CD0 @ =gUnknown_83C2CE0 lsls r1, r5, 5 - ldr r2, _08079CD4 @ =gUnknown_20373F8 + ldr r2, _08079CD4 @ =gPlttBufferUnfaded + 0x200 adds r1, r2 ldr r2, _08079CD8 @ =0x04000008 bl CpuSet @@ -101,7 +101,7 @@ _08079CC4: .align 2, 0 _08079CCC: .4byte Task_WeatherMain _08079CD0: .4byte gUnknown_83C2CE0 -_08079CD4: .4byte gUnknown_20373F8 +_08079CD4: .4byte gPlttBufferUnfaded + 0x200 _08079CD8: .4byte 0x04000008 _08079CDC: .4byte gUnknown_2037F34 _08079CE0: .4byte 0x000006d5 @@ -690,7 +690,7 @@ _0807A144: _0807A164: .4byte gUnknown_2037F34 _0807A168: .4byte 0x000006c6 _0807A16C: - ldr r0, _0807A190 @ =gUnknown_2037AB8 + ldr r0, _0807A190 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -711,7 +711,7 @@ _0807A18C: pop {r0} bx r0 .align 2, 0 -_0807A190: .4byte gUnknown_2037AB8 +_0807A190: .4byte gPaletteFade _0807A194: .4byte 0x000006c1 _0807A198: .4byte 0x000006c6 thumb_func_end sub_807A084 @@ -889,9 +889,9 @@ _0807A2CE: cmp r0, 0 bne _0807A30C lsls r1, r6, 1 - ldr r0, _0807A304 @ =gUnknown_20371F8 + ldr r0, _0807A304 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _0807A308 @ =gUnknown_20375F8 + ldr r2, _0807A308 @ =gPlttBufferFaded adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -907,8 +907,8 @@ _0807A2CE: b _0807A38A .align 2, 0 _0807A300: .4byte gUnknown_20386A4 -_0807A304: .4byte gUnknown_20371F8 -_0807A308: .4byte gUnknown_20375F8 +_0807A304: .4byte gPlttBufferUnfaded +_0807A308: .4byte gPlttBufferFaded _0807A30C: cmp r0, 0x2 beq _0807A320 @@ -940,12 +940,12 @@ _0807A336: mov r8, r3 adds r4, 0x1 mov r12, r4 - ldr r0, _0807A398 @ =gUnknown_20375F8 + ldr r0, _0807A398 @ =gPlttBufferFaded mov r10, r0 _0807A34A: adds r2, r6, 0 lsls r0, r2, 1 - ldr r1, _0807A39C @ =gUnknown_20371F8 + ldr r1, _0807A39C @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r0, r1, 27 @@ -983,15 +983,15 @@ _0807A38A: bcc _0807A2CE b _0807A3B6 .align 2, 0 -_0807A398: .4byte gUnknown_20375F8 -_0807A39C: .4byte gUnknown_20371F8 +_0807A398: .4byte gPlttBufferFaded +_0807A39C: .4byte gPlttBufferUnfaded _0807A3A0: cmp r0, 0 blt _0807A3B6 lsls r1, r4, 5 - ldr r0, _0807A3C8 @ =gUnknown_20371F8 + ldr r0, _0807A3C8 @ =gPlttBufferUnfaded adds r0, r1, r0 - ldr r2, _0807A3CC @ =gUnknown_20375F8 + ldr r2, _0807A3CC @ =gPlttBufferFaded adds r1, r2 mov r3, r9 lsls r2, r3, 3 @@ -1006,8 +1006,8 @@ _0807A3B6: pop {r0} bx r0 .align 2, 0 -_0807A3C8: .4byte gUnknown_20371F8 -_0807A3CC: .4byte gUnknown_20375F8 +_0807A3C8: .4byte gPlttBufferUnfaded +_0807A3CC: .4byte gPlttBufferFaded thumb_func_end sub_807A294 thumb_func_start sub_807A3D0 @@ -1104,7 +1104,7 @@ _0807A472: _0807A47E: adds r4, r6, 0 lsls r0, r4, 1 - ldr r1, _0807A510 @ =gUnknown_20371F8 + ldr r1, _0807A510 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r0, r1, 27 @@ -1148,7 +1148,7 @@ _0807A47E: lsls r0, 16 lsrs r6, r0, 16 lsls r4, 1 - ldr r0, _0807A514 @ =gUnknown_20375F8 + ldr r0, _0807A514 @ =gPlttBufferFaded adds r4, r0 lsrs r1, 14 lsrs r2, 19 @@ -1177,8 +1177,8 @@ _0807A4FC: bx r0 .align 2, 0 _0807A50C: .4byte gUnknown_2038394 -_0807A510: .4byte gUnknown_20371F8 -_0807A514: .4byte gUnknown_20375F8 +_0807A510: .4byte gPlttBufferUnfaded +_0807A514: .4byte gPlttBufferFaded thumb_func_end sub_807A3D0 thumb_func_start sub_807A518 @@ -1231,12 +1231,12 @@ _0807A570: movs r7, 0 adds r4, 0x1 mov r12, r4 - ldr r0, _0807A5F0 @ =gUnknown_20375F8 + ldr r0, _0807A5F0 @ =gPlttBufferFaded mov r9, r0 _0807A57A: adds r4, r5, 0 lsls r0, r4, 1 - ldr r1, _0807A5F4 @ =gUnknown_20371F8 + ldr r1, _0807A5F4 @ =gPlttBufferUnfaded adds r0, r1 ldr r1, [r0] lsls r3, r1, 27 @@ -1294,8 +1294,8 @@ _0807A5D4: pop {r0} bx r0 .align 2, 0 -_0807A5F0: .4byte gUnknown_20375F8 -_0807A5F4: .4byte gUnknown_20371F8 +_0807A5F0: .4byte gPlttBufferFaded +_0807A5F4: .4byte gPlttBufferUnfaded thumb_func_end sub_807A518 thumb_func_start sub_807A5F8 @@ -1349,7 +1349,7 @@ _0807A634: mov r8, r0 _0807A658: lsls r5, r6, 1 - ldr r0, _0807A6DC @ =gUnknown_20371F8 + ldr r0, _0807A6DC @ =gPlttBufferUnfaded adds r0, r5, r0 ldr r2, [r0] lsls r4, r2, 27 @@ -1401,7 +1401,7 @@ _0807A658: asrs r0, 4 adds r2, r0 lsls r2, 24 - ldr r0, _0807A6E0 @ =gUnknown_20375F8 + ldr r0, _0807A6E0 @ =gPlttBufferFaded adds r5, r0 lsrs r2, 14 lsrs r3, 19 @@ -1415,8 +1415,8 @@ _0807A658: bcc _0807A658 b _0807A6F8 .align 2, 0 -_0807A6DC: .4byte gUnknown_20371F8 -_0807A6E0: .4byte gUnknown_20375F8 +_0807A6DC: .4byte gPlttBufferUnfaded +_0807A6E0: .4byte gPlttBufferFaded _0807A6E4: lsls r0, r4, 20 lsrs r0, 16 @@ -1650,8 +1650,8 @@ _0807A882: beq _0807A8C4 cmp r2, 0 beq _0807A896 - ldr r0, _0807A8B4 @ =gUnknown_20375F8 - ldr r1, _0807A8B8 @ =gUnknown_20371F8 + ldr r0, _0807A8B4 @ =gPlttBufferFaded + ldr r1, _0807A8B8 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -1671,8 +1671,8 @@ _0807A896: strb r1, [r0] b _0807A92C .align 2, 0 -_0807A8B4: .4byte gUnknown_20375F8 -_0807A8B8: .4byte gUnknown_20371F8 +_0807A8B4: .4byte gPlttBufferFaded +_0807A8B8: .4byte gPlttBufferUnfaded _0807A8BC: .4byte gUnknown_2037F34 _0807A8C0: .4byte 0x000006c6 _0807A8C4: @@ -1804,8 +1804,8 @@ _0807A9AE: beq _0807A9F0 cmp r2, 0 beq _0807A9C2 - ldr r0, _0807A9E0 @ =gUnknown_20375F8 - ldr r1, _0807A9E4 @ =gUnknown_20371F8 + ldr r0, _0807A9E0 @ =gPlttBufferFaded + ldr r1, _0807A9E4 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -1824,8 +1824,8 @@ _0807A9C2: strb r1, [r0] b _0807AA56 .align 2, 0 -_0807A9E0: .4byte gUnknown_20375F8 -_0807A9E4: .4byte gUnknown_20371F8 +_0807A9E0: .4byte gPlttBufferFaded +_0807A9E4: .4byte gPlttBufferUnfaded _0807A9E8: .4byte gUnknown_2037F34 _0807A9EC: .4byte 0x000006c6 _0807A9F0: @@ -1959,7 +1959,7 @@ _0807AAF0: lsls r0, r4, 20 lsrs r4, r0, 16 movs r2, 0 - ldr r6, _0807AB18 @ =gUnknown_20375F8 + ldr r6, _0807AB18 @ =gPlttBufferFaded ldr r0, _0807AB1C @ =0x000006c4 adds r3, r5, r0 _0807AAFC: @@ -1976,19 +1976,19 @@ _0807AAFC: b _0807AB68 .align 2, 0 _0807AB14: .4byte 0x000006ca -_0807AB18: .4byte gUnknown_20375F8 +_0807AB18: .4byte gPlttBufferFaded _0807AB1C: .4byte 0x000006c4 _0807AB20: lsls r0, r4, 20 lsrs r4, r0, 16 lsls r1, r4, 1 - ldr r0, _0807AB4C @ =gUnknown_20375F8 + ldr r0, _0807AB4C @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _0807AB50 @ =gUnknown_20371F8 + ldr r2, _0807AB50 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x8 bl CpuFastSet - ldr r0, _0807AB54 @ =gUnknown_2037AB8 + ldr r0, _0807AB54 @ =gPaletteFade ldrh r2, [r0, 0x4] lsls r2, 21 lsrs r2, 27 @@ -2000,9 +2000,9 @@ _0807AB20: bl BlendPalette b _0807AB68 .align 2, 0 -_0807AB4C: .4byte gUnknown_20375F8 -_0807AB50: .4byte gUnknown_20371F8 -_0807AB54: .4byte gUnknown_2037AB8 +_0807AB4C: .4byte gPlttBufferFaded +_0807AB50: .4byte gPlttBufferUnfaded +_0807AB54: .4byte gPaletteFade _0807AB58: lsls r0, r4, 20 lsrs r4, r0, 16 diff --git a/asm/fieldmap.s b/asm/fieldmap.s index f78a4df9b..a8b2d36ee 100644 --- a/asm/fieldmap.s +++ b/asm/fieldmap.s @@ -789,8 +789,8 @@ sub_8058F48: @ 8058F48 _08058F74: .4byte gMapHeader thumb_func_end sub_8058F48 - thumb_func_start sub_8058F78 -sub_8058F78: @ 8058F78 + thumb_func_start MapGridGetMetatileBehaviorAt +MapGridGetMetatileBehaviorAt: @ 8058F78 push {lr} lsls r0, 16 asrs r0, 16 @@ -800,7 +800,7 @@ sub_8058F78: @ 8058F78 bl sub_8058F48 pop {r1} bx r1 - thumb_func_end sub_8058F78 + thumb_func_end MapGridGetMetatileBehaviorAt thumb_func_start sub_8058F8C sub_8058F8C: @ 8058F8C @@ -2125,35 +2125,35 @@ sub_80598CC: @ 80598CC _080598EC: .4byte gUnknown_2036E28 _080598F0: lsls r4, 1 - ldr r0, _08059900 @ =gUnknown_20371F8 + ldr r0, _08059900 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale b _0805992C .align 2, 0 -_08059900: .4byte gUnknown_20371F8 +_08059900: .4byte gPlttBufferUnfaded _08059904: lsls r4, 1 - ldr r0, _08059914 @ =gUnknown_20371F8 + ldr r0, _08059914 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_SepiaTone b _0805992C .align 2, 0 -_08059914: .4byte gUnknown_20371F8 +_08059914: .4byte gPlttBufferUnfaded _08059918: adds r0, r4, 0 adds r1, r5, 0 bl sub_8111F38 lsls r4, 1 - ldr r0, _08059940 @ =gUnknown_20371F8 + ldr r0, _08059940 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale _0805992C: - ldr r0, _08059940 @ =gUnknown_20371F8 + ldr r0, _08059940 @ =gPlttBufferUnfaded adds r0, r4, r0 - ldr r1, _08059944 @ =gUnknown_20375F8 + ldr r1, _08059944 @ =gPlttBufferFaded adds r1, r4, r1 adds r2, r5, 0 bl CpuSet @@ -2162,8 +2162,8 @@ _0805993A: pop {r0} bx r0 .align 2, 0 -_08059940: .4byte gUnknown_20371F8 -_08059944: .4byte gUnknown_20375F8 +_08059940: .4byte gPlttBufferUnfaded +_08059944: .4byte gPlttBufferFaded thumb_func_end sub_80598CC thumb_func_start sub_8059948 @@ -2188,36 +2188,36 @@ sub_8059948: @ 8059948 _08059968: .4byte gUnknown_2036E28 _0805996C: lsls r4, 5 - ldr r0, _0805997C @ =gUnknown_20371F8 + ldr r0, _0805997C @ =gPlttBufferUnfaded adds r0, r4, r0 lsls r1, r6, 4 bl TintPalette_GrayScale b _080599AA .align 2, 0 -_0805997C: .4byte gUnknown_20371F8 +_0805997C: .4byte gPlttBufferUnfaded _08059980: lsls r4, 5 - ldr r0, _08059990 @ =gUnknown_20371F8 + ldr r0, _08059990 @ =gPlttBufferUnfaded adds r0, r4, r0 lsls r1, r6, 4 bl TintPalette_SepiaTone b _080599AA .align 2, 0 -_08059990: .4byte gUnknown_20371F8 +_08059990: .4byte gPlttBufferUnfaded _08059994: lsls r0, r4, 4 lsls r5, r6, 4 adds r1, r5, 0 bl sub_8111F38 lsls r4, 5 - ldr r0, _080599C0 @ =gUnknown_20371F8 + ldr r0, _080599C0 @ =gPlttBufferUnfaded adds r0, r4, r0 adds r1, r5, 0 bl TintPalette_GrayScale _080599AA: - ldr r0, _080599C0 @ =gUnknown_20371F8 + ldr r0, _080599C0 @ =gPlttBufferUnfaded adds r0, r4, r0 - ldr r1, _080599C4 @ =gUnknown_20375F8 + ldr r1, _080599C4 @ =gPlttBufferFaded adds r1, r4, r1 lsls r2, r6, 3 bl CpuFastSet @@ -2226,8 +2226,8 @@ _080599B8: pop {r0} bx r0 .align 2, 0 -_080599C0: .4byte gUnknown_20371F8 -_080599C4: .4byte gUnknown_20375F8 +_080599C0: .4byte gPlttBufferUnfaded +_080599C4: .4byte gPlttBufferFaded thumb_func_end sub_8059948 thumb_func_start apply_map_tileset_palette diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 697b80bd5..5710a320e 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -319,7 +319,7 @@ _08097ABC: movs r7, 0 ldr r5, _08097B44 @ =gSprites _08097AE2: - ldr r0, _08097B48 @ =gUnknown_2037078 + ldr r0, _08097B48 @ =gPlayerAvatar ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -366,7 +366,7 @@ _08097B38: .4byte gUnknown_2039A04 _08097B3C: .4byte 0x0000ffff _08097B40: .4byte gUnknown_2039870 _08097B44: .4byte gSprites -_08097B48: .4byte gUnknown_2037078 +_08097B48: .4byte gPlayerAvatar _08097B4C: .4byte gUnknown_83D414C thumb_func_end sub_8097A48 diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index dfa734b91..34a8ee372 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -87,13 +87,13 @@ sub_80DE134: @ 80DE134 bl Alloc adds r1, r0, 0 str r1, [r4] - ldr r4, _080DE1BC @ =gUnknown_20371F8 + ldr r4, _080DE1BC @ =gPlttBufferUnfaded movs r5, 0x80 lsls r5, 1 adds r0, r4, 0 adds r2, r5, 0 bl CpuFastSet - ldr r0, _080DE1C0 @ =gUnknown_20375F8 + ldr r0, _080DE1C0 @ =gPlttBufferFaded adds r1, r4, 0 adds r2, r5, 0 bl CpuFastSet @@ -137,8 +137,8 @@ sub_80DE134: @ 80DE134 bx r0 .align 2, 0 _080DE1B8: .4byte gUnknown_203AAB0 -_080DE1BC: .4byte gUnknown_20371F8 -_080DE1C0: .4byte gUnknown_20375F8 +_080DE1BC: .4byte gPlttBufferUnfaded +_080DE1C0: .4byte gPlttBufferFaded _080DE1C4: .4byte gSprites _080DE1C8: .4byte sub_80DE1D0 _080DE1CC: .4byte gTasks @@ -155,7 +155,7 @@ sub_80DE1D0: @ 80DE1D0 lsls r5, r0, 3 ldr r6, _080DE21C @ =gTasks+0x8 adds r2, r5, r6 - ldr r0, _080DE220 @ =gUnknown_2037AB8 + ldr r0, _080DE220 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -182,7 +182,7 @@ sub_80DE1D0: @ 80DE1D0 b _080DE26C .align 2, 0 _080DE21C: .4byte gTasks+0x8 -_080DE220: .4byte gUnknown_2037AB8 +_080DE220: .4byte gPaletteFade _080DE224: .4byte gUnknown_203AAB0 _080DE228: adds r0, r6, 0 @@ -229,7 +229,7 @@ sub_80DE274: @ 80DE274 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080DE2B0 @ =gUnknown_2037AB8 + ldr r0, _080DE2B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -237,7 +237,7 @@ sub_80DE274: @ 80DE274 bne _080DE2AA ldr r4, _080DE2B4 @ =gUnknown_203AAB0 ldr r0, [r4] - ldr r1, _080DE2B8 @ =gUnknown_20371F8 + ldr r1, _080DE2B8 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -253,9 +253,9 @@ _080DE2AA: pop {r0} bx r0 .align 2, 0 -_080DE2B0: .4byte gUnknown_2037AB8 +_080DE2B0: .4byte gPaletteFade _080DE2B4: .4byte gUnknown_203AAB0 -_080DE2B8: .4byte gUnknown_20371F8 +_080DE2B8: .4byte gPlttBufferUnfaded _080DE2BC: .4byte gUnknown_81BE564 thumb_func_end sub_80DE274 diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index e2cf4c477..147bc65c0 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -130,7 +130,7 @@ _080F1EBC: .4byte sub_80F1DAC _080F1EC0: .4byte gMain _080F1EC4: bl UpdatePaletteFade - ldr r0, _080F1EE8 @ =gUnknown_2037AB8 + ldr r0, _080F1EE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -144,7 +144,7 @@ _080F1EC4: movs r0, 0 b _080F1EF2 .align 2, 0 -_080F1EE8: .4byte gUnknown_2037AB8 +_080F1EE8: .4byte gPaletteFade _080F1EEC: .4byte sub_80F1DC0 _080F1EF0: movs r0, 0x1 @@ -1330,8 +1330,8 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080F287C @ =gUnknown_20375F8 - ldr r1, _080F2880 @ =gUnknown_20371F8 + ldr r0, _080F287C @ =gPlttBufferFaded + ldr r1, _080F2880 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 2 bl CpuSet @@ -1355,8 +1355,8 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C pop {r0} bx r0 .align 2, 0 -_080F287C: .4byte gUnknown_20375F8 -_080F2880: .4byte gUnknown_20371F8 +_080F287C: .4byte gPlttBufferFaded +_080F2880: .4byte gPlttBufferUnfaded _080F2884: .4byte gTasks _080F2888: .4byte Task_Hof_HandleExit thumb_func_end Task_Hof_HandlePaletteOnExit @@ -1366,7 +1366,7 @@ Task_Hof_HandleExit: @ 80F288C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080F2924 @ =gUnknown_2037AB8 + ldr r0, _080F2924 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1432,7 +1432,7 @@ _080F291E: pop {r0} bx r0 .align 2, 0 -_080F2924: .4byte gUnknown_2037AB8 +_080F2924: .4byte gPaletteFade _080F2928: .4byte gTasks _080F292C: .4byte gUnknown_203AB3C _080F2930: .4byte gUnknown_203AB38 @@ -2256,8 +2256,8 @@ sub_80F2FEC: @ 80F2FEC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080F3020 @ =gUnknown_20375F8 - ldr r1, _080F3024 @ =gUnknown_20371F8 + ldr r0, _080F3020 @ =gPlttBufferFaded + ldr r1, _080F3024 @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 2 bl CpuSet @@ -2276,8 +2276,8 @@ sub_80F2FEC: @ 80F2FEC pop {r0} bx r0 .align 2, 0 -_080F3020: .4byte gUnknown_20375F8 -_080F3024: .4byte gUnknown_20371F8 +_080F3020: .4byte gPlttBufferFaded +_080F3024: .4byte gPlttBufferUnfaded _080F3028: .4byte gTasks _080F302C: .4byte sub_80F3030 thumb_func_end sub_80F2FEC diff --git a/asm/hof_pc.s b/asm/hof_pc.s index 48085bbd8..b5a437662 100644 --- a/asm/hof_pc.s +++ b/asm/hof_pc.s @@ -10,7 +10,7 @@ sub_80CA53C: @ 80CA53C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080CA56C @ =gUnknown_2037AB8 + ldr r0, _080CA56C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -28,7 +28,7 @@ _080CA564: pop {r0} bx r0 .align 2, 0 -_080CA56C: .4byte gUnknown_2037AB8 +_080CA56C: .4byte gPaletteFade _080CA570: .4byte sub_80F2978 thumb_func_end sub_80CA53C @@ -100,7 +100,7 @@ sub_80CA5F8: @ 80CA5F8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080CA614 @ =gUnknown_2037AB8 + ldr r0, _080CA614 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -112,7 +112,7 @@ _080CA610: pop {r0} bx r0 .align 2, 0 -_080CA614: .4byte gUnknown_2037AB8 +_080CA614: .4byte gPaletteFade thumb_func_end sub_80CA5F8 .align 2, 0 @ Don't pad with nop. diff --git a/asm/intro.s b/asm/intro.s index 62951aa55..af5104da3 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -1222,7 +1222,7 @@ _080ECFA4: _080ECFD0: .4byte sub_80ED0AC _080ECFD4: .4byte 0x00007fff _080ECFD8: - ldr r0, _080ECFF8 @ =gUnknown_2037AB8 + ldr r0, _080ECFF8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1239,7 +1239,7 @@ _080ECFF0: strb r0, [r5, 0x4] b _080ED094 .align 2, 0 -_080ECFF8: .4byte gUnknown_2037AB8 +_080ECFF8: .4byte gPaletteFade _080ECFFC: .4byte 0x00000115 _080ED000: ldrh r0, [r5, 0x12] @@ -1282,7 +1282,7 @@ _080ED058: .4byte 0x00007fff _080ED05C: .4byte sub_80ED0AC _080ED060: .4byte sub_80ED188 _080ED064: - ldr r0, _080ED09C @ =gUnknown_2037AB8 + ldr r0, _080ED09C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1307,7 +1307,7 @@ _080ED094: pop {r0} bx r0 .align 2, 0 -_080ED09C: .4byte gUnknown_2037AB8 +_080ED09C: .4byte gPaletteFade _080ED0A0: .4byte sub_80ED0AC _080ED0A4: .4byte sub_80ED140 _080ED0A8: .4byte sub_80ED188 @@ -1618,13 +1618,13 @@ _080ED32C: .align 2, 0 _080ED34C: .4byte 0x00007fff _080ED350: - ldr r0, _080ED35C @ =gUnknown_2037AB8 + ldr r0, _080ED35C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 b _080ED3C0 .align 2, 0 -_080ED35C: .4byte gUnknown_2037AB8 +_080ED35C: .4byte gPaletteFade _080ED360: ldrh r0, [r7, 0x12] adds r0, 0x1 @@ -2477,7 +2477,7 @@ _080EDA1C: ldr r2, _080EDA50 @ =0x00007fff adds r0, r2, 0 strh r0, [r1] - ldr r1, _080EDA54 @ =gUnknown_2037218 + ldr r1, _080EDA54 @ =gPlttBufferUnfaded + 0x20 ldr r2, _080EDA58 @ =0x01000020 add r0, sp, 0x4 bl CpuSet @@ -2492,10 +2492,10 @@ _080EDA1C: b _080EDA6E .align 2, 0 _080EDA50: .4byte 0x00007fff -_080EDA54: .4byte gUnknown_2037218 +_080EDA54: .4byte gPlttBufferUnfaded + 0x20 _080EDA58: .4byte 0x01000020 _080EDA5C: - ldr r0, _080EDA78 @ =gUnknown_2037AB8 + ldr r0, _080EDA78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2512,7 +2512,7 @@ _080EDA6E: strb r0, [r4, 0x4] b _080EDAC4 .align 2, 0 -_080EDA78: .4byte gUnknown_2037AB8 +_080EDA78: .4byte gPaletteFade _080EDA7C: ldrh r0, [r4, 0x12] adds r0, 0x1 diff --git a/asm/item_menu.s b/asm/item_menu.s index 07fefddfe..6c508193f 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -264,13 +264,13 @@ _08107FC0: b _08108104 _08107FC6: bl ResetPaletteFade - ldr r2, _08107FD4 @ =gUnknown_2037AB8 + ldr r2, _08107FD4 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 b _08108102 .align 2, 0 -_08107FD4: .4byte gUnknown_2037AB8 +_08107FD4: .4byte gPaletteFade _08107FD8: bl ResetSpriteData b _08108104 @@ -408,7 +408,7 @@ _081080F4: movs r0, 0x9 bl sub_812B1F0 _081080FA: - ldr r2, _08108114 @ =gUnknown_2037AB8 + ldr r2, _08108114 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -424,7 +424,7 @@ _08108104: strb r0, [r1] b _08108134 .align 2, 0 -_08108114: .4byte gUnknown_2037AB8 +_08108114: .4byte gPaletteFade _08108118: .4byte gMain _0810811C: ldr r0, _0810812C @ =sub_8107EFC @@ -477,7 +477,7 @@ sub_8108178: @ 8108178 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081081A4 @ =gUnknown_2037AB8 + ldr r0, _081081A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -494,7 +494,7 @@ _0810819C: pop {r0} bx r0 .align 2, 0 -_081081A4: .4byte gUnknown_2037AB8 +_081081A4: .4byte gPaletteFade _081081A8: .4byte gUnknown_203ACFC thumb_func_end sub_8108178 @@ -1780,7 +1780,7 @@ sub_8108B8C: @ 8108B8C lsls r0, 3 ldr r1, _08108BE0 @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _08108BE4 @ =gUnknown_2037AB8 + ldr r0, _08108BE4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1812,7 +1812,7 @@ sub_8108B8C: @ 8108B8C b _08108BFA .align 2, 0 _08108BE0: .4byte gTasks+0x8 -_08108BE4: .4byte gUnknown_2037AB8 +_08108BE4: .4byte gPaletteFade _08108BE8: .4byte sub_8108CFC _08108BEC: .4byte gUnknown_203ACFC _08108BF0: .4byte gUnknown_203AD10 @@ -2245,7 +2245,7 @@ sub_8108F0C: @ 8108F0C lsls r0, 3 ldr r1, _08108F78 @ =gTasks+0x8 adds r7, r0, r1 - ldr r0, _08108F7C @ =gUnknown_2037AB8 + ldr r0, _08108F7C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2291,7 +2291,7 @@ _08108F4A: b _08108FA0 .align 2, 0 _08108F78: .4byte gTasks+0x8 -_08108F7C: .4byte gUnknown_2037AB8 +_08108F7C: .4byte gPaletteFade _08108F80: .4byte sub_8108CFC _08108F84: .4byte gUnknown_203ACFC _08108F88: .4byte gMain @@ -5817,8 +5817,8 @@ _0810AD08: .4byte gUnknown_84163BB _0810AD0C: .4byte sub_810A1D0 thumb_func_end sub_810AC40 - thumb_func_start sub_810AD10 -sub_810AD10: @ 810AD10 + thumb_func_start UseRegisteredKeyItemOnField +UseRegisteredKeyItemOnField: @ 810AD10 push {r4-r6,lr} bl InUnionRoom cmp r0, 0x1 @@ -5887,7 +5887,7 @@ _0810ADA0: bx r1 .align 2, 0 _0810ADA8: .4byte gUnknown_81A77A0 - thumb_func_end sub_810AD10 + thumb_func_end UseRegisteredKeyItemOnField thumb_func_start sub_810ADAC sub_810ADAC: @ 810ADAC @@ -6144,7 +6144,7 @@ sub_810AF9C: @ 810AF9C lsls r6, r0, 3 ldr r7, _0810AFCC @ =gTasks+0x8 adds r5, r6, r7 - ldr r0, _0810AFD0 @ =gUnknown_2037AB8 + ldr r0, _0810AFD0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6161,7 +6161,7 @@ sub_810AF9C: @ 810AF9C b _0810B064 .align 2, 0 _0810AFCC: .4byte gTasks+0x8 -_0810AFD0: .4byte gUnknown_2037AB8 +_0810AFD0: .4byte gPaletteFade _0810AFD4: movs r0, 0x99 lsls r0, 1 @@ -6269,7 +6269,7 @@ sub_810B0AC: @ 810B0AC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0810B0DC @ =gUnknown_2037AB8 + ldr r0, _0810B0DC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6289,7 +6289,7 @@ sub_810B0AC: @ 810B0AC bl SetMainCallback2 b _0810B0F0 .align 2, 0 -_0810B0DC: .4byte gUnknown_2037AB8 +_0810B0DC: .4byte gPaletteFade _0810B0E0: .4byte sub_8108CFC _0810B0E4: .4byte gUnknown_203AD10 _0810B0E8: @@ -6417,7 +6417,7 @@ sub_810B1D4: @ 810B1D4 lsls r5, r0, 3 ldr r6, _0810B220 @ =gTasks+0x8 adds r7, r5, r6 - ldr r0, _0810B224 @ =gUnknown_2037AB8 + ldr r0, _0810B224 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6450,7 +6450,7 @@ _0810B202: b _0810B36C .align 2, 0 _0810B220: .4byte gTasks+0x8 -_0810B224: .4byte gUnknown_2037AB8 +_0810B224: .4byte gPaletteFade _0810B228: movs r0, 0x99 lsls r0, 1 @@ -6614,7 +6614,7 @@ sub_810B378: @ 810B378 lsls r6, r0, 3 ldr r7, _0810B3B0 @ =gTasks+0x8 adds r4, r6, r7 - ldr r0, _0810B3B4 @ =gUnknown_2037AB8 + ldr r0, _0810B3B4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -6633,7 +6633,7 @@ _0810B396: b _0810B4B6 .align 2, 0 _0810B3B0: .4byte gTasks+0x8 -_0810B3B4: .4byte gUnknown_2037AB8 +_0810B3B4: .4byte gPaletteFade _0810B3B8: movs r0, 0x10 ldrsh r1, [r4, r0] @@ -6775,7 +6775,7 @@ sub_810B4BC: @ 810B4BC mov r9, r0 mov r5, r8 add r5, r9 - ldr r0, _0810B508 @ =gUnknown_2037AB8 + ldr r0, _0810B508 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r7, 0x80 adds r0, r7, 0 @@ -6795,7 +6795,7 @@ sub_810B4BC: @ 810B4BC b _0810B5C6 .align 2, 0 _0810B504: .4byte gTasks+0x8 -_0810B508: .4byte gUnknown_2037AB8 +_0810B508: .4byte gPaletteFade _0810B50C: movs r0, 0x10 ldrsh r1, [r5, r0] @@ -6901,7 +6901,7 @@ sub_810B5D4: @ 810B5D4 mov r9, r0 mov r6, r8 add r6, r9 - ldr r0, _0810B628 @ =gUnknown_2037AB8 + ldr r0, _0810B628 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r7, 0x80 adds r0, r7, 0 @@ -6927,7 +6927,7 @@ sub_810B5D4: @ 810B5D4 b _0810B6E0 .align 2, 0 _0810B624: .4byte gTasks+0x8 -_0810B628: .4byte gUnknown_2037AB8 +_0810B628: .4byte gPaletteFade _0810B62C: movs r0, 0x99 lsls r0, 1 diff --git a/asm/item_pc.s b/asm/item_pc.s index d209e7c0d..1a7a3b498 100644 --- a/asm/item_pc.s +++ b/asm/item_pc.s @@ -365,7 +365,7 @@ sub_810D6E8: @ 810D6E8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0810D714 @ =gUnknown_2037AB8 + ldr r0, _0810D714 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -382,7 +382,7 @@ _0810D70C: pop {r0} bx r0 .align 2, 0 -_0810D714: .4byte gUnknown_2037AB8 +_0810D714: .4byte gPaletteFade _0810D718: .4byte gUnknown_203ADCC thumb_func_end sub_810D6E8 @@ -1140,7 +1140,7 @@ sub_810DCE4: @ 810DCE4 lsls r0, 3 ldr r1, _0810DD28 @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _0810DD2C @ =gUnknown_2037AB8 + ldr r0, _0810DD2C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1164,7 +1164,7 @@ sub_810DCE4: @ 810DCE4 b _0810DD40 .align 2, 0 _0810DD28: .4byte gTasks+0x8 -_0810DD2C: .4byte gUnknown_2037AB8 +_0810DD2C: .4byte gPaletteFade _0810DD30: .4byte gUnknown_203ADD0 _0810DD34: .4byte gUnknown_203ADBC _0810DD38: @@ -1382,7 +1382,7 @@ sub_810DEA0: @ 810DEA0 lsls r0, 3 ldr r1, _0810DF10 @ =gTasks+0x8 adds r6, r0, r1 - ldr r0, _0810DF14 @ =gUnknown_2037AB8 + ldr r0, _0810DF14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1426,7 +1426,7 @@ sub_810DEA0: @ 810DEA0 b _0810DF9E .align 2, 0 _0810DF10: .4byte gTasks+0x8 -_0810DF14: .4byte gUnknown_2037AB8 +_0810DF14: .4byte gPaletteFade _0810DF18: .4byte gMain _0810DF1C: .4byte gUnknown_203ADBC _0810DF20: diff --git a/asm/item_use.s b/asm/item_use.s index 8229f5a2b..586426239 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -348,7 +348,7 @@ sub_80A122C: @ 80A122C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x83 @@ -506,7 +506,7 @@ sub_80A137C: @ 80A137C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r6, r0, 16 lsls r0, r6, 24 @@ -1060,7 +1060,7 @@ sub_80A17E8: @ 80A17E8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1818 @ =gUnknown_2037AB8 + ldr r0, _080A1818 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1079,7 +1079,7 @@ _080A1812: pop {r0} bx r0 .align 2, 0 -_080A1818: .4byte gUnknown_2037AB8 +_080A1818: .4byte gPaletteFade _080A181C: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A17E8 @@ -1138,7 +1138,7 @@ sub_80A1880: @ 80A1880 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A18B0 @ =gUnknown_2037AB8 + ldr r0, _080A18B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1157,7 +1157,7 @@ _080A18AA: pop {r0} bx r0 .align 2, 0 -_080A18B0: .4byte gUnknown_2037AB8 +_080A18B0: .4byte gPaletteFade _080A18B4: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1880 @@ -1253,7 +1253,7 @@ sub_80A1960: @ 80A1960 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1990 @ =gUnknown_2037AB8 + ldr r0, _080A1990 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1271,7 +1271,7 @@ _080A1988: pop {r0} bx r0 .align 2, 0 -_080A1990: .4byte gUnknown_2037AB8 +_080A1990: .4byte gPaletteFade _080A1994: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1960 @@ -1660,7 +1660,7 @@ sub_80A1CC0: @ 80A1CC0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1CF0 @ =gUnknown_2037AB8 + ldr r0, _080A1CF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1678,7 +1678,7 @@ _080A1CE8: pop {r0} bx r0 .align 2, 0 -_080A1CF0: .4byte gUnknown_2037AB8 +_080A1CF0: .4byte gPaletteFade _080A1CF4: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1CC0 @@ -1743,7 +1743,7 @@ sub_80A1D68: @ 80A1D68 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1D94 @ =gUnknown_2037AB8 + ldr r0, _080A1D94 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1760,7 +1760,7 @@ _080A1D8E: pop {r0} bx r0 .align 2, 0 -_080A1D94: .4byte gUnknown_2037AB8 +_080A1D94: .4byte gPaletteFade _080A1D98: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80A1D68 diff --git a/asm/learn_move.s b/asm/learn_move.s index 743067bfe..8d152ce5d 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -42,7 +42,7 @@ sub_80E4660: @ 80E4660 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080E468C @ =gUnknown_2037AB8 + ldr r0, _080E468C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -60,7 +60,7 @@ _080E4684: pop {r0} bx r0 .align 2, 0 -_080E468C: .4byte gUnknown_2037AB8 +_080E468C: .4byte gPaletteFade _080E4690: .4byte sub_80E478C _080E4694: .4byte gUnknown_3005020 _080E4698: .4byte sub_807DD24 @@ -406,7 +406,7 @@ _080E49A8: _080E49EC: .4byte gUnknown_203AAB4 _080E49F0: .4byte 0x0000025f _080E49F4: - ldr r0, _080E4A08 @ =gUnknown_2037AB8 + ldr r0, _080E4A08 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -418,7 +418,7 @@ _080E4A02: movs r0, 0x4 b _080E4ED8 .align 2, 0 -_080E4A08: .4byte gUnknown_2037AB8 +_080E4A08: .4byte gPaletteFade _080E4A0C: ldr r1, [r7] ldrb r0, [r1] @@ -720,7 +720,7 @@ _080E4C5A: bl BeginNormalPaletteFade b _080E4EDA _080E4C70: - ldr r0, _080E4CC8 @ =gUnknown_2037AB8 + ldr r0, _080E4CC8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -763,7 +763,7 @@ _080E4C7E: movs r0, 0x1C b _080E4ED8 .align 2, 0 -_080E4CC8: .4byte gUnknown_2037AB8 +_080E4CC8: .4byte gPaletteFade _080E4CCC: .4byte 0x00000263 _080E4CD0: .4byte 0x00000a68 _080E4CD4: .4byte 0x00000a6a @@ -798,7 +798,7 @@ _080E4CFA: .align 2, 0 _080E4D14: .4byte gUnknown_203AAB4 _080E4D18: - ldr r0, _080E4D3C @ =gUnknown_2037AB8 + ldr r0, _080E4D3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -814,7 +814,7 @@ _080E4D26: bl SetMainCallback2 b _080E4EDA .align 2, 0 -_080E4D3C: .4byte gUnknown_2037AB8 +_080E4D3C: .4byte gPaletteFade _080E4D40: .4byte gUnknown_203AAB4 _080E4D44: .4byte c2_exit_to_overworld_2_switch _080E4D48: @@ -844,7 +844,7 @@ _080E4D48: .align 2, 0 _080E4D88: .4byte gUnknown_203AAB4 _080E4D8C: - ldr r0, _080E4DAC @ =gUnknown_2037AB8 + ldr r0, _080E4DAC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -861,7 +861,7 @@ _080E4D9A: movs r0, 0x18 b _080E4ED8 .align 2, 0 -_080E4DAC: .4byte gUnknown_2037AB8 +_080E4DAC: .4byte gPaletteFade _080E4DB0: .4byte 0x00000261 _080E4DB4: movs r4, 0x98 diff --git a/asm/link_rfu.s b/asm/link_rfu.s index 3f8d3735c..4b20fa9a0 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -3372,7 +3372,7 @@ _080FED28: strh r0, [r6] b _080FED6E _080FED38: - ldr r0, _080FED78 @ =gUnknown_2037AB8 + ldr r0, _080FED78 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3402,7 +3402,7 @@ _080FED6E: pop {r0} bx r0 .align 2, 0 -_080FED78: .4byte gUnknown_2037AB8 +_080FED78: .4byte gPaletteFade _080FED7C: .4byte 0x0000082d thumb_func_end sub_80FEC90 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 9954d2b4a..d3c5d5917 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -3849,7 +3849,7 @@ _08117944: bl fade_screen b _08117968 _08117958: - ldr r0, _08117970 @ =gUnknown_2037AB8 + ldr r0, _08117970 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3862,7 +3862,7 @@ _08117968: strh r0, [r4] b _08117988 .align 2, 0 -_08117970: .4byte gUnknown_2037AB8 +_08117970: .4byte gPaletteFade _08117974: bl sub_800A4BC lsls r0, 24 @@ -6990,7 +6990,7 @@ _081194F0: movs r0, 0x36 b _081198DA _08119504: - ldr r0, _08119528 @ =gUnknown_2037AB8 + ldr r0, _08119528 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7009,7 +7009,7 @@ _08119512: bl sub_81277F4 b _081198DC .align 2, 0 -_08119528: .4byte gUnknown_2037AB8 +_08119528: .4byte gPaletteFade _0811952C: .4byte gUnknown_203B06C _08119530: .4byte gUnknown_3005020 _08119534: .4byte sub_807DCE4 @@ -9685,7 +9685,7 @@ sub_811A9B8: @ 811A9B8 ldrsh r0, [r4, r1] cmp r0, 0x8 bne _0811A9F0 - ldr r0, _0811A9EC @ =gUnknown_2037078 + ldr r0, _0811A9EC @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x2 beq _0811A9E6 @@ -9695,7 +9695,7 @@ _0811A9E6: movs r0, 0x1 b _0811A9F2 .align 2, 0 -_0811A9EC: .4byte gUnknown_2037078 +_0811A9EC: .4byte gPlayerAvatar _0811A9F0: movs r0, 0 _0811A9F2: @@ -11147,7 +11147,7 @@ _0811B500: .4byte gUnknown_8459580 thumb_func_start is_walking_or_running is_walking_or_running: @ 811B504 push {lr} - ldr r0, _0811B518 @ =gUnknown_2037078 + ldr r0, _0811B518 @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x2 beq _0811B512 @@ -11157,7 +11157,7 @@ _0811B512: movs r0, 0x1 b _0811B51E .align 2, 0 -_0811B518: .4byte gUnknown_2037078 +_0811B518: .4byte gPlayerAvatar _0811B51C: movs r0, 0 _0811B51E: @@ -11378,7 +11378,7 @@ sub_811B66C: @ 811B66C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0811B6C0 @ =gUnknown_2036E38 + ldr r1, _0811B6C0 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -11396,7 +11396,7 @@ sub_811B66C: @ 811B66C .align 2, 0 _0811B6B8: .4byte gUnknown_8457120 _0811B6BC: .4byte gSaveBlock1Ptr -_0811B6C0: .4byte gUnknown_2036E38 +_0811B6C0: .4byte gMapObjects _0811B6C4: ldr r0, _0811B6DC @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c" ldr r1, _0811B6E0 @ =0x00000183 @@ -11437,7 +11437,7 @@ sub_811B6E8: @ 811B6E8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0811B72C @ =gUnknown_2036E38 + ldr r1, _0811B72C @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -11449,7 +11449,7 @@ sub_811B6E8: @ 811B6E8 .align 2, 0 _0811B724: .4byte gUnknown_8457120 _0811B728: .4byte gSaveBlock1Ptr -_0811B72C: .4byte gUnknown_2036E38 +_0811B72C: .4byte gMapObjects _0811B730: bl ScriptContext2_IsEnabled lsls r0, 24 diff --git a/asm/load_save.s b/asm/load_save.s index c04284577..6d8e115d8 100644 --- a/asm/load_save.s +++ b/asm/load_save.s @@ -345,7 +345,7 @@ save_serialize_npcs: @ 804C270 movs r5, 0xD4 lsls r5, 3 mov r8, r5 - ldr r4, _0804C2B4 @ =gUnknown_2036E38 + ldr r4, _0804C2B4 @ =gMapObjects movs r3, 0 movs r2, 0xF _0804C286: @@ -372,7 +372,7 @@ _0804C286: bx r0 .align 2, 0 _0804C2B0: .4byte gSaveBlock1Ptr -_0804C2B4: .4byte gUnknown_2036E38 +_0804C2B4: .4byte gMapObjects thumb_func_end save_serialize_npcs thumb_func_start sub_804C2B8 @@ -385,7 +385,7 @@ sub_804C2B8: @ 804C2B8 movs r5, 0xD4 lsls r5, 3 mov r8, r5 - ldr r4, _0804C2FC @ =gUnknown_2036E38 + ldr r4, _0804C2FC @ =gMapObjects movs r3, 0 movs r2, 0xF _0804C2CE: @@ -412,7 +412,7 @@ _0804C2CE: bx r0 .align 2, 0 _0804C2F8: .4byte gSaveBlock1Ptr -_0804C2FC: .4byte gUnknown_2036E38 +_0804C2FC: .4byte gMapObjects thumb_func_end sub_804C2B8 thumb_func_start SaveSerializedGame diff --git a/asm/mail.s b/asm/mail.s index ecd5e71fd..1ecaf17cc 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -381,7 +381,7 @@ _080BEF28: movs r1, 0xF0 movs r2, 0x20 bl LoadPalette - ldr r6, _080BEFD0 @ =gUnknown_20371F8 + ldr r6, _080BEFD0 @ =gPlttBufferUnfaded ldr r4, _080BEFD4 @ =gUnknown_83EE9C8 ldr r0, _080BEFD8 @ =gUnknown_20399C4 ldr r3, [r0] @@ -396,7 +396,7 @@ _080BEF28: lsls r2, 1 adds r0, r6, r2 strh r1, [r0] - ldr r5, _080BEFDC @ =gUnknown_20375F8 + ldr r5, _080BEFDC @ =gPlttBufferFaded ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -458,10 +458,10 @@ _080BEF28: strh r0, [r5, 0x16] b _080BF0F4 .align 2, 0 -_080BEFD0: .4byte gUnknown_20371F8 +_080BEFD0: .4byte gPlttBufferUnfaded _080BEFD4: .4byte gUnknown_83EE9C8 _080BEFD8: .4byte gUnknown_20399C4 -_080BEFDC: .4byte gUnknown_20375F8 +_080BEFDC: .4byte gPlttBufferFaded _080BEFE0: .4byte gUnknown_83EE9C0 _080BEFE4: .4byte gSaveBlock2Ptr _080BEFE8: @@ -497,7 +497,7 @@ _080BF01C: _080BF026: ldr r0, _080BF038 @ =sub_80BF354 bl SetVBlankCallback - ldr r2, _080BF03C @ =gUnknown_2037AB8 + ldr r2, _080BF03C @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -505,7 +505,7 @@ _080BF026: b _080BF0F4 .align 2, 0 _080BF038: .4byte sub_80BF354 -_080BF03C: .4byte gUnknown_2037AB8 +_080BF03C: .4byte gPaletteFade _080BF040: ldr r5, _080BF064 @ =gUnknown_20399C4 ldr r0, [r5] @@ -573,7 +573,7 @@ _080BF0A4: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r2, _080BF0E8 @ =gUnknown_2037AB8 + ldr r2, _080BF0E8 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -586,7 +586,7 @@ _080BF0A4: movs r0, 0x1 b _080BF104 .align 2, 0 -_080BF0E8: .4byte gUnknown_2037AB8 +_080BF0E8: .4byte gPaletteFade _080BF0EC: .4byte gUnknown_20399C4 _080BF0F0: .4byte sub_80BF394 _080BF0F4: diff --git a/asm/main_menu.s b/asm/main_menu.s index ff1ab95cc..ae0a4c69b 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -223,7 +223,7 @@ sub_800C4D0: @ 800C4D0 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0800C538 @ =gUnknown_2037AB8 + ldr r0, _0800C538 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -266,7 +266,7 @@ _0800C4E8: beq _0800C54A b _0800C5E8 .align 2, 0 -_0800C538: .4byte gUnknown_2037AB8 +_0800C538: .4byte gPaletteFade _0800C53C: .4byte gSaveFileStatus _0800C540: cmp r4, 0x4 @@ -430,7 +430,7 @@ sub_800C688: @ 800C688 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800C6E0 @ =gUnknown_2037AB8 + ldr r0, _0800C6E0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -466,7 +466,7 @@ sub_800C688: @ 800C688 ldr r0, _0800C6F0 @ =sub_800C704 b _0800C6F6 .align 2, 0 -_0800C6E0: .4byte gUnknown_2037AB8 +_0800C6E0: .4byte gPaletteFade _0800C6E4: .4byte gMain _0800C6E8: .4byte gUnknown_8234638 _0800C6EC: .4byte gTasks @@ -488,7 +488,7 @@ sub_800C704: @ 800C704 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800C764 @ =gUnknown_2037AB8 + ldr r0, _0800C764 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -527,7 +527,7 @@ sub_800C704: @ 800C704 ldr r0, _0800C76C @ =sub_800CA94 b _0800C772 .align 2, 0 -_0800C764: .4byte gUnknown_2037AB8 +_0800C764: .4byte gPaletteFade _0800C768: .4byte gTasks _0800C76C: .4byte sub_800CA94 _0800C770: @@ -547,7 +547,7 @@ sub_800C780: @ 800C780 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0800C79C @ =gUnknown_2037AB8 + ldr r0, _0800C79C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -559,7 +559,7 @@ _0800C798: pop {r0} bx r0 .align 2, 0 -_0800C79C: .4byte gUnknown_2037AB8 +_0800C79C: .4byte gPaletteFade thumb_func_end sub_800C780 thumb_func_start sub_800C7A0 @@ -867,7 +867,7 @@ sub_800CA54: @ 800CA54 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800CA88 @ =gUnknown_2037AB8 + ldr r0, _0800CA88 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -890,7 +890,7 @@ _0800CA80: pop {r0} bx r0 .align 2, 0 -_0800CA88: .4byte gUnknown_2037AB8 +_0800CA88: .4byte gPaletteFade _0800CA8C: .4byte gTasks _0800CA90: .4byte sub_800CA28 thumb_func_end sub_800CA54 @@ -901,7 +901,7 @@ sub_800CA94: @ 800CA94 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0800CAC4 @ =gUnknown_2037AB8 + ldr r0, _0800CAC4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -922,7 +922,7 @@ sub_800CA94: @ 800CA94 beq _0800CADA b _0800CAEE .align 2, 0 -_0800CAC4: .4byte gUnknown_2037AB8 +_0800CAC4: .4byte gPaletteFade _0800CAC8: .4byte gTasks _0800CACC: movs r1, 0xA @@ -988,11 +988,11 @@ _0800CB2E: .align 2, 0 _0800CB44: .4byte gUnknown_2031DE0 _0800CB48: - ldr r0, _0800CB64 @ =gUnknown_20371F8 + ldr r0, _0800CB64 @ =gPlttBufferUnfaded movs r2, 0 movs r1, 0 strh r1, [r0] - ldr r0, _0800CB68 @ =gUnknown_20375F8 + ldr r0, _0800CB68 @ =gPlttBufferFaded strh r1, [r0] ldr r0, _0800CB6C @ =gUnknown_2031DE0 strb r2, [r0] @@ -1001,8 +1001,8 @@ _0800CB48: bl sub_8110F14 b _0800CB84 .align 2, 0 -_0800CB64: .4byte gUnknown_20371F8 -_0800CB68: .4byte gUnknown_20375F8 +_0800CB64: .4byte gPlttBufferUnfaded +_0800CB68: .4byte gPlttBufferFaded _0800CB6C: .4byte gUnknown_2031DE0 _0800CB70: ldr r0, _0800CB8C @ =sub_81422AC @@ -1084,13 +1084,13 @@ _0800CBF2: _0800CC04: .4byte gUnknown_8415ACB _0800CC08: .4byte gTasks _0800CC0C: - ldr r0, _0800CC18 @ =gUnknown_2037AB8 + ldr r0, _0800CC18 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 b _0800CC28 .align 2, 0 -_0800CC18: .4byte gUnknown_2037AB8 +_0800CC18: .4byte gPaletteFade _0800CC1C: bl RunTextPrinters movs r0, 0x4 @@ -1135,7 +1135,7 @@ sub_800CC68: @ 800CC68 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800CC8C @ =gUnknown_2037AB8 + ldr r0, _0800CC8C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1150,7 +1150,7 @@ _0800CC86: pop {r0} bx r0 .align 2, 0 -_0800CC8C: .4byte gUnknown_2037AB8 +_0800CC8C: .4byte gPaletteFade _0800CC90: .4byte sub_8078914 thumb_func_end sub_800CC68 diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s index 3c67e682a..275c9f0a7 100644 --- a/asm/map_name_popup.s +++ b/asm/map_name_popup.s @@ -348,7 +348,7 @@ _080983B4: .4byte 0x00ffffff _080983B8: movs r0, 0x3 bl stdpal_get - ldr r1, _080983FC @ =gUnknown_2037398 + ldr r1, _080983FC @ =gPlttBufferUnfaded + 0x1A0 movs r2, 0x10 bl CpuSet _080983C6: @@ -374,7 +374,7 @@ _080983C6: pop {r1} bx r1 .align 2, 0 -_080983FC: .4byte gUnknown_2037398 +_080983FC: .4byte gPlttBufferUnfaded + 0x1A0 thumb_func_end sub_8098340 thumb_func_start sub_8098400 diff --git a/asm/map_obj_80688E4.s b/asm/map_obj_80688E4.s index 5ba346f0b..7b3fd584e 100644 --- a/asm/map_obj_80688E4.s +++ b/asm/map_obj_80688E4.s @@ -86,7 +86,7 @@ _0806896E: player_bitmagic: @ 8068974 push {r4,r5,lr} movs r4, 0 - ldr r5, _080689A8 @ =gUnknown_2036E38 + ldr r5, _080689A8 @ =gMapObjects _0806897A: lsls r0, r4, 3 adds r0, r4 @@ -96,7 +96,7 @@ _0806897A: lsls r0, 31 cmp r0, 0 beq _08068998 - ldr r0, _080689AC @ =gUnknown_2037078 + ldr r0, _080689AC @ =gPlayerAvatar ldrb r0, [r0, 0x5] cmp r4, r0 beq _08068998 @@ -112,8 +112,8 @@ _08068998: pop {r0} bx r0 .align 2, 0 -_080689A8: .4byte gUnknown_2036E38 -_080689AC: .4byte gUnknown_2037078 +_080689A8: .4byte gMapObjects +_080689AC: .4byte gPlayerAvatar thumb_func_end player_bitmagic thumb_func_start FreezeMapObjectsExceptOne @@ -122,7 +122,7 @@ FreezeMapObjectsExceptOne: @ 80689B0 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r6, _080689EC @ =gUnknown_2036E38 + ldr r6, _080689EC @ =gMapObjects _080689BA: cmp r4, r5 beq _080689DC @@ -134,7 +134,7 @@ _080689BA: lsls r0, 31 cmp r0, 0 beq _080689DC - ldr r0, _080689F0 @ =gUnknown_2037078 + ldr r0, _080689F0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] cmp r4, r0 beq _080689DC @@ -150,8 +150,8 @@ _080689DC: pop {r0} bx r0 .align 2, 0 -_080689EC: .4byte gUnknown_2036E38 -_080689F0: .4byte gUnknown_2037078 +_080689EC: .4byte gMapObjects +_080689F0: .4byte gPlayerAvatar thumb_func_end FreezeMapObjectsExceptOne thumb_func_start npc_sync_anim_pause_bits @@ -213,7 +213,7 @@ _08068A58: .4byte gSprites UnfreezeMapObjects: @ 8068A5C push {r4,r5,lr} movs r4, 0 - ldr r5, _08068A88 @ =gUnknown_2036E38 + ldr r5, _08068A88 @ =gMapObjects _08068A62: lsls r0, r4, 3 adds r0, r4 @@ -235,7 +235,7 @@ _08068A78: pop {r0} bx r0 .align 2, 0 -_08068A88: .4byte gUnknown_2036E38 +_08068A88: .4byte gMapObjects thumb_func_end UnfreezeMapObjects thumb_func_start little_step diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index 2b3cbfc5a..4ff07589a 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -8,14 +8,14 @@ thumb_func_start walkrun_is_standing_still walkrun_is_standing_still: @ 8069554 push {lr} - ldr r0, _08069564 @ =gUnknown_2037078 + ldr r0, _08069564 @ =gPlayerAvatar ldrb r0, [r0, 0x3] cmp r0, 0x1 beq _08069568 movs r0, 0x1 b _0806956A .align 2, 0 -_08069564: .4byte gUnknown_2037078 +_08069564: .4byte gPlayerAvatar _08069568: movs r0, 0 _0806956A: @@ -100,7 +100,7 @@ _080695F6: ldrsh r0, [r5, r1] cmp r0, 0 bne _0806961E - ldr r2, _08069640 @ =gUnknown_2036E38 + ldr r2, _08069640 @ =gMapObjects ldr r0, _08069644 @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -132,7 +132,7 @@ _08069634: bx r0 .align 2, 0 _0806963C: .4byte gTasks -_08069640: .4byte gUnknown_2036E38 +_08069640: .4byte gMapObjects _08069644: .4byte gUnknown_3005074 thumb_func_end sub_80695CC @@ -167,7 +167,7 @@ LockSelectedMapObject: @ 806966C bl CreateTask lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _080696B8 @ =gUnknown_2036E38 + ldr r2, _080696B8 @ =gMapObjects ldrb r1, [r4] lsls r0, r1, 3 adds r0, r1 @@ -193,7 +193,7 @@ _080696AA: .align 2, 0 _080696B0: .4byte gUnknown_3005074 _080696B4: .4byte sub_80695CC -_080696B8: .4byte gUnknown_2036E38 +_080696B8: .4byte gMapObjects _080696BC: .4byte gTasks thumb_func_end LockSelectedMapObject @@ -210,7 +210,7 @@ sub_80696C0: @ 80696C0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080696EC @ =gUnknown_2036E38 + ldr r1, _080696EC @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished bl sub_80974D8 @@ -218,13 +218,13 @@ sub_80696C0: @ 80696C0 pop {r0} bx r0 .align 2, 0 -_080696EC: .4byte gUnknown_2036E38 +_080696EC: .4byte gMapObjects thumb_func_end sub_80696C0 thumb_func_start sub_80696F0 sub_80696F0: @ 80696F0 push {r4,lr} - ldr r4, _08069738 @ =gUnknown_2036E38 + ldr r4, _08069738 @ =gMapObjects ldr r0, _0806973C @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -256,7 +256,7 @@ _0806970E: pop {r0} bx r0 .align 2, 0 -_08069738: .4byte gUnknown_2036E38 +_08069738: .4byte gMapObjects _0806973C: .4byte gUnknown_3005074 thumb_func_end sub_80696F0 @@ -268,7 +268,7 @@ sub_8069740: @ 8069740 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08069760 @ =gUnknown_2036E38 + ldr r1, _08069760 @ =gMapObjects adds r0, r1 ldr r1, _08069764 @ =gUnknown_20370D4 ldrb r1, [r1] @@ -277,7 +277,7 @@ sub_8069740: @ 8069740 bx r0 .align 2, 0 _0806975C: .4byte gUnknown_3005074 -_08069760: .4byte gUnknown_2036E38 +_08069760: .4byte gMapObjects _08069764: .4byte gUnknown_20370D4 thumb_func_end sub_8069740 @@ -289,14 +289,14 @@ sub_8069768: @ 8069768 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08069784 @ =gUnknown_2036E38 + ldr r1, _08069784 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimActive pop {r0} bx r0 .align 2, 0 _08069780: .4byte gUnknown_3005074 -_08069784: .4byte gUnknown_2036E38 +_08069784: .4byte gMapObjects thumb_func_end sub_8069768 .align 2, 0 @ Don't pad with nop. diff --git a/asm/metatile_behavior.s b/asm/metatile_behavior.s index 12d5b243e..6dd520d71 100644 --- a/asm/metatile_behavior.s +++ b/asm/metatile_behavior.s @@ -484,8 +484,8 @@ _08059D66: bx r1 thumb_func_end sub_8059D2C - thumb_func_start sub_8059D70 -sub_8059D70: @ 8059D70 + thumb_func_start MetatileBehavior_IsMoveTile +MetatileBehavior_IsMoveTile: @ 8059D70 push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -519,7 +519,7 @@ _08059DA6: _08059DA8: pop {r1} bx r1 - thumb_func_end sub_8059D70 + thumb_func_end MetatileBehavior_IsMoveTile thumb_func_start sub_8059DAC sub_8059DAC: @ 8059DAC diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 0c344853a..ccb86ba64 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -246,7 +246,7 @@ _08145834: lsrs r6, r0, 24 cmp r6, 0 bne _0814592E - ldr r2, _081458A0 @ =gUnknown_2037AB8 + ldr r2, _081458A0 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -291,7 +291,7 @@ _08145834: bl CopyBgTilemapBufferToVram b _0814591E .align 2, 0 -_081458A0: .4byte gUnknown_2037AB8 +_081458A0: .4byte gPaletteFade _081458A4: .4byte gUnknown_203F3C8 _081458A8: .4byte 0x0000045c _081458AC: @@ -315,7 +315,7 @@ _081458D2: bl ShowBg movs r0, 0x2 bl ShowBg - ldr r2, _08145904 @ =gUnknown_2037AB8 + ldr r2, _08145904 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -331,7 +331,7 @@ _081458D2: bl UpdatePaletteFade b _0814591E .align 2, 0 -_08145904: .4byte gUnknown_2037AB8 +_08145904: .4byte gPaletteFade _08145908: bl UpdatePaletteFade lsls r0, 24 @@ -1780,7 +1780,7 @@ _08146494: beq _081464A2 b _081465EC _081464A2: - ldr r2, _0814653C @ =gUnknown_2037AB8 + ldr r2, _0814653C @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -1851,7 +1851,7 @@ _081464A2: bl CopyBgTilemapBufferToVram b _081465D2 .align 2, 0 -_0814653C: .4byte gUnknown_2037AB8 +_0814653C: .4byte gPaletteFade _08146540: .4byte gUnknown_203F3CC _08146544: bl sub_8146980 @@ -1870,7 +1870,7 @@ _0814655C: bl ShowBg movs r0, 0x3 bl ShowBg - ldr r2, _081465AC @ =gUnknown_2037AB8 + ldr r2, _081465AC @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -1898,7 +1898,7 @@ _0814655C: bl UpdatePaletteFade b _081465D2 .align 2, 0 -_081465AC: .4byte gUnknown_2037AB8 +_081465AC: .4byte gPaletteFade _081465B0: .4byte gUnknown_203F3CC _081465B4: .4byte 0x000001c1 _081465B8: diff --git a/asm/naming_screen.s b/asm/naming_screen.s index 2601ab1f1..191c6a1ac 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -692,7 +692,7 @@ _0809DF24: .4byte 0x00001e10 thumb_func_start sub_809DF28 sub_809DF28: @ 809DF28 push {lr} - ldr r0, _0809DF58 @ =gUnknown_2037AB8 + ldr r0, _0809DF58 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -714,7 +714,7 @@ _0809DF50: pop {r1} bx r1 .align 2, 0 -_0809DF58: .4byte gUnknown_2037AB8 +_0809DF58: .4byte gPaletteFade _0809DF5C: .4byte gUnknown_203998C _0809DF60: .4byte 0x00001e10 thumb_func_end sub_809DF28 @@ -837,7 +837,7 @@ _0809E044: .4byte 0x00001e10 thumb_func_start sub_809E048 sub_809E048: @ 809E048 push {r4,r5,lr} - ldr r0, _0809E0A0 @ =gUnknown_2037AB8 + ldr r0, _0809E0A0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -875,7 +875,7 @@ _0809E096: pop {r1} bx r1 .align 2, 0 -_0809E0A0: .4byte gUnknown_2037AB8 +_0809E0A0: .4byte gPaletteFade _0809E0A4: .4byte gUnknown_203998C _0809E0A8: .4byte 0x00001e2c _0809E0AC: .4byte 0x00001e3c @@ -1648,18 +1648,18 @@ sub_809E6B8: @ 809E6B8 lsrs r0, 24 bl sub_809E644 lsls r0, 16 - ldr r2, _0809E6D8 @ =gUnknown_20375F8 + ldr r2, _0809E6D8 @ =gPlttBufferFaded lsrs r0, 15 adds r2, r0, r2 - ldr r1, _0809E6DC @ =gUnknown_20371F8 + ldr r1, _0809E6DC @ =gPlttBufferUnfaded adds r0, r1 ldrh r0, [r0] strh r0, [r2] pop {r0} bx r0 .align 2, 0 -_0809E6D8: .4byte gUnknown_20375F8 -_0809E6DC: .4byte gUnknown_20371F8 +_0809E6D8: .4byte gPlttBufferFaded +_0809E6DC: .4byte gPlttBufferUnfaded thumb_func_end sub_809E6B8 thumb_func_start sub_809E6E0 diff --git a/asm/oak_speech.s b/asm/oak_speech.s index 54451e618..5d3f74c41 100644 --- a/asm/oak_speech.s +++ b/asm/oak_speech.s @@ -270,10 +270,10 @@ sub_812EB10: @ 812EB10 thumb_func_start sub_812EB2C sub_812EB2C: @ 812EB2C push {lr} - ldr r0, _0812EB48 @ =gUnknown_20371F8 + ldr r0, _0812EB48 @ =gPlttBufferUnfaded movs r1, 0 strh r1, [r0] - ldr r0, _0812EB4C @ =gUnknown_20375F8 + ldr r0, _0812EB4C @ =gPlttBufferFaded strh r1, [r0] ldr r0, _0812EB50 @ =sub_812EB58 bl CreateTask @@ -282,8 +282,8 @@ sub_812EB2C: @ 812EB2C pop {r0} bx r0 .align 2, 0 -_0812EB48: .4byte gUnknown_20371F8 -_0812EB4C: .4byte gUnknown_20375F8 +_0812EB48: .4byte gPlttBufferUnfaded +_0812EB4C: .4byte gPlttBufferFaded _0812EB50: .4byte sub_812EB58 _0812EB54: .4byte sub_812EB10 thumb_func_end sub_812EB2C @@ -462,7 +462,7 @@ _0812ECF4: .4byte gUnknown_203B108 _0812ECF8: .4byte gSpriteCoordOffsetX _0812ECFC: .4byte gSpriteCoordOffsetY _0812ED00: - ldr r2, _0812ED34 @ =gUnknown_2037AB8 + ldr r2, _0812ED34 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -483,7 +483,7 @@ _0812ED00: bl LoadPalette b _0812EE94 .align 2, 0 -_0812ED34: .4byte gUnknown_2037AB8 +_0812ED34: .4byte gPaletteFade _0812ED38: .4byte gUnknown_8460568 _0812ED3C: bl sub_80F78A8 @@ -561,7 +561,7 @@ _0812ED9A: movs r3, 0x13 bl FillBgTilemapBufferRect_Palette0 bl sub_812EEB0 - ldr r2, _0812EE28 @ =gUnknown_2037AB8 + ldr r2, _0812EE28 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -590,7 +590,7 @@ _0812ED9A: _0812EE1C: .4byte 0x0000d00f _0812EE20: .4byte 0x0000d002 _0812EE24: .4byte 0x0000d00e -_0812EE28: .4byte gUnknown_2037AB8 +_0812EE28: .4byte gPaletteFade _0812EE2C: .4byte gTasks _0812EE30: movs r0, 0x1 @@ -890,7 +890,7 @@ sub_812F0B0: @ 812F0B0 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0812F10C @ =gUnknown_2037AB8 + ldr r0, _0812F10C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -931,7 +931,7 @@ sub_812F0B0: @ 812F0B0 bl BeginNormalPaletteFade b _0812F150 .align 2, 0 -_0812F10C: .4byte gUnknown_2037AB8 +_0812F10C: .4byte gPaletteFade _0812F110: .4byte gMain _0812F114: .4byte gTasks _0812F118: .4byte gUnknown_203B108 @@ -992,7 +992,7 @@ sub_812F180: @ 812F180 lsrs r7, r0, 24 movs r0, 0 mov r8, r0 - ldr r0, _0812F1B0 @ =gUnknown_2037AB8 + ldr r0, _0812F1B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1008,7 +1008,7 @@ sub_812F180: @ 812F180 mov r8, r1 b _0812F1C4 .align 2, 0 -_0812F1B0: .4byte gUnknown_2037AB8 +_0812F1B0: .4byte gPaletteFade _0812F1B4: .4byte gUnknown_203B108 _0812F1B8: cmp r0, 0 @@ -1115,7 +1115,7 @@ sub_812F274: @ 812F274 lsrs r0, 24 mov r8, r0 movs r6, 0 - ldr r0, _0812F32C @ =gUnknown_2037AB8 + ldr r0, _0812F32C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1194,7 +1194,7 @@ _0812F320: pop {r0} bx r0 .align 2, 0 -_0812F32C: .4byte gUnknown_2037AB8 +_0812F32C: .4byte gPaletteFade _0812F330: .4byte gUnknown_203B108 _0812F334: .4byte gTasks _0812F338: .4byte sub_812F33C @@ -1402,7 +1402,7 @@ _0812F4E4: .4byte _0812F644 .4byte _0812F688 _0812F4F8: - ldr r0, _0812F534 @ =gUnknown_2037AB8 + ldr r0, _0812F534 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1429,7 +1429,7 @@ _0812F506: bl SetGpuRegBits b _0812F676 .align 2, 0 -_0812F534: .4byte gUnknown_2037AB8 +_0812F534: .4byte gPaletteFade _0812F538: ldrh r1, [r4, 0x2E] movs r0, 0x3 @@ -1681,7 +1681,7 @@ sub_812F72C: @ 812F72C ldr r0, _0812F7B4 @ =gTasks+0x8 mov r8, r0 adds r4, r7, r0 - ldr r0, _0812F7B8 @ =gUnknown_2037AB8 + ldr r0, _0812F7B8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1731,7 +1731,7 @@ _0812F7A6: bx r0 .align 2, 0 _0812F7B4: .4byte gTasks+0x8 -_0812F7B8: .4byte gUnknown_2037AB8 +_0812F7B8: .4byte gPaletteFade _0812F7BC: .4byte sub_812F7C0 thumb_func_end sub_812F72C @@ -1834,7 +1834,7 @@ sub_812F880: @ 812F880 lsls r0, 3 ldr r1, _0812F8B0 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _0812F8B4 @ =gUnknown_2037AB8 + ldr r0, _0812F8B4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1850,7 +1850,7 @@ sub_812F880: @ 812F880 b _0812F92E .align 2, 0 _0812F8B0: .4byte gTasks+0x8 -_0812F8B4: .4byte gUnknown_2037AB8 +_0812F8B4: .4byte gPaletteFade _0812F8B8: movs r0, 0 movs r1, 0 @@ -3215,7 +3215,7 @@ sub_81303B4: @ 81303B4 sub sp, 0x8 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _081303F8 @ =gUnknown_2037AB8 + ldr r0, _081303F8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3243,7 +3243,7 @@ sub_81303B4: @ 81303B4 bl DoNamingScreen b _08130440 .align 2, 0 -_081303F8: .4byte gUnknown_2037AB8 +_081303F8: .4byte gPaletteFade _081303FC: .4byte gUnknown_203B108 _08130400: .4byte gSaveBlock2Ptr _08130404: .4byte sub_8130C64 @@ -3301,7 +3301,7 @@ sub_8130464: @ 8130464 lsls r6, r1, 3 ldr r7, _081304A0 @ =gTasks+0x8 adds r5, r6, r7 - ldr r0, _081304A4 @ =gUnknown_2037AB8 + ldr r0, _081304A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3322,7 +3322,7 @@ sub_8130464: @ 8130464 b _081304BC .align 2, 0 _081304A0: .4byte gTasks+0x8 -_081304A4: .4byte gUnknown_2037AB8 +_081304A4: .4byte gPaletteFade _081304A8: .4byte gUnknown_203B108 _081304AC: .4byte gStringVar4 _081304B0: .4byte gUnknown_81C5E13 @@ -4072,7 +4072,7 @@ sub_8130A80: @ 8130A80 lsls r0, 3 ldr r1, _08130AB8 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _08130ABC @ =gUnknown_2037AB8 + ldr r0, _08130ABC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4091,7 +4091,7 @@ sub_8130A80: @ 8130A80 b _08130AD4 .align 2, 0 _08130AB8: .4byte gTasks+0x8 -_08130ABC: .4byte gUnknown_2037AB8 +_08130ABC: .4byte gPaletteFade _08130AC0: adds r0, 0x1 strh r0, [r2, 0x2] @@ -4188,9 +4188,9 @@ _08130B4A: cmp r1, 0xE ble _08130B96 movs r2, 0 - ldr r6, _08130BA0 @ =gUnknown_20375F8 + ldr r6, _08130BA0 @ =gPlttBufferFaded adds r3, r7, 0 - ldr r4, _08130BA4 @ =gUnknown_20371F8 + ldr r4, _08130BA4 @ =gPlttBufferUnfaded _08130B78: adds r0, r2, 0 adds r0, 0x40 @@ -4212,8 +4212,8 @@ _08130B96: bx r0 .align 2, 0 _08130B9C: .4byte 0x00007fff -_08130BA0: .4byte gUnknown_20375F8 -_08130BA4: .4byte gUnknown_20371F8 +_08130BA0: .4byte gPlttBufferFaded +_08130BA4: .4byte gPlttBufferUnfaded thumb_func_end sub_8130B10 thumb_func_start sub_8130BA8 @@ -4260,7 +4260,7 @@ sub_8130BF0: @ 8130BF0 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08130C14 @ =gUnknown_2037AB8 + ldr r0, _08130C14 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4277,7 +4277,7 @@ _08130C10: pop {r0} bx r0 .align 2, 0 -_08130C14: .4byte gUnknown_2037AB8 +_08130C14: .4byte gPaletteFade _08130C18: .4byte gTasks _08130C1C: .4byte sub_8130C20 thumb_func_end sub_8130BF0 @@ -5350,7 +5350,7 @@ sub_81314DC: @ 81314DC mov r12, r1 cmp r0, 0x10 bne _08131530 - ldr r0, _0813152C @ =gUnknown_2037AB8 + ldr r0, _0813152C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5369,7 +5369,7 @@ sub_81314DC: @ 81314DC b _081315BA .align 2, 0 _08131528: .4byte gTasks -_0813152C: .4byte gUnknown_2037AB8 +_0813152C: .4byte gPaletteFade _08131530: ldrh r1, [r2, 0x10] movs r7, 0x10 diff --git a/asm/option_menu.s b/asm/option_menu.s index 780b5046e..e3c44d1ac 100644 --- a/asm/option_menu.s +++ b/asm/option_menu.s @@ -640,7 +640,7 @@ _08088878: .align 2, 0 _08088890: .4byte gUnknown_2039620 _08088894: - ldr r0, _080888AC @ =gUnknown_2037AB8 + ldr r0, _080888AC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -653,7 +653,7 @@ _080888A2: strb r0, [r1, 0x10] b _080888B6 .align 2, 0 -_080888AC: .4byte gUnknown_2037AB8 +_080888AC: .4byte gPaletteFade _080888B0: adds r0, r2, 0 bl sub_8088B00 diff --git a/asm/overworld.s b/asm/overworld.s index 3c6f52f4e..4ab22581a 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -2190,7 +2190,7 @@ sub_8055C74: @ 8055C74 adds r1, 0x7 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r0, 16 pop {r1} @@ -2677,7 +2677,7 @@ sub_8055FE0: @ 8055FE0 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059CA4 @@ -3263,7 +3263,7 @@ sub_805644C: @ 805644C mov r0, sp adds r1, r5, 0 adds r2, r4, 0 - bl sub_806C8BC + bl FieldGetPlayerInput mov r0, sp bl sub_806CD30 bl ScriptContext2_IsEnabled @@ -3409,7 +3409,7 @@ sub_80565A8: @ 80565A8 thumb_func_start sub_80565B4 sub_80565B4: @ 80565B4 push {r4,lr} - ldr r0, _080565DC @ =gUnknown_2037AB8 + ldr r0, _080565DC @ =gPaletteFade ldrb r0, [r0, 0x7] lsrs r0, 7 adds r4, r0, 0 @@ -3427,7 +3427,7 @@ _080565D4: pop {r0} bx r0 .align 2, 0 -_080565DC: .4byte gUnknown_2037AB8 +_080565DC: .4byte gPaletteFade thumb_func_end sub_80565B4 thumb_func_start sub_80565E0 @@ -4734,8 +4734,8 @@ sub_8057100: @ 8057100 thumb_func_start sub_8057114 sub_8057114: @ 8057114 push {lr} - ldr r2, _08057138 @ =gUnknown_2036E38 - ldr r3, _0805713C @ =gUnknown_2037078 + ldr r2, _08057138 @ =gMapObjects + ldr r3, _0805713C @ =gPlayerAvatar ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -4750,8 +4750,8 @@ sub_8057114: @ 8057114 pop {r0} bx r0 .align 2, 0 -_08057138: .4byte gUnknown_2036E38 -_0805713C: .4byte gUnknown_2037078 +_08057138: .4byte gMapObjects +_0805713C: .4byte gPlayerAvatar thumb_func_end sub_8057114 thumb_func_start sub_8057140 @@ -5161,7 +5161,7 @@ _080574A0: .4byte sub_8056534 thumb_func_start sub_80574A4 sub_80574A4: @ 80574A4 push {r4,lr} - ldr r0, _080574E8 @ =gUnknown_2037AB8 + ldr r0, _080574E8 @ =gPaletteFade ldrb r0, [r0, 0x7] lsrs r0, 7 adds r4, r0, 0 @@ -5186,13 +5186,13 @@ _080574E0: pop {r0} bx r0 .align 2, 0 -_080574E8: .4byte gUnknown_2037AB8 +_080574E8: .4byte gPaletteFade thumb_func_end sub_80574A4 thumb_func_start sub_80574EC sub_80574EC: @ 80574EC push {lr} - ldr r0, _08057500 @ =gUnknown_2037AB8 + ldr r0, _08057500 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5201,7 +5201,7 @@ sub_80574EC: @ 80574EC movs r0, 0 b _08057506 .align 2, 0 -_08057500: .4byte gUnknown_2037AB8 +_08057500: .4byte gPaletteFade _08057504: movs r0, 0x1 _08057506: @@ -5305,7 +5305,7 @@ _08057560: ldrh r0, [r0, 0x4] strh r0, [r1] bl warp_in - ldr r2, _08057610 @ =gUnknown_2037AB8 + ldr r2, _08057610 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -5333,7 +5333,7 @@ _08057600: .4byte 0xffff0000 _08057604: .4byte 0x0000ffff _08057608: .4byte gUnknown_2031DBC _0805760C: .4byte gUnknown_2031DE8 -_08057610: .4byte gUnknown_2037AB8 +_08057610: .4byte gPaletteFade _08057614: .4byte gUnknown_3005024 _08057618: .4byte sub_80574EC _0805761C: .4byte gMain @@ -5443,7 +5443,7 @@ _0805770C: b _0805772A _08057712: bl cur_mapheader_run_tileset_funcs_after_some_cpuset - ldr r2, _08057734 @ =gUnknown_2037AB8 + ldr r2, _08057734 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -5458,7 +5458,7 @@ _0805772A: strb r0, [r4] b _08057740 .align 2, 0 -_08057734: .4byte gUnknown_2037AB8 +_08057734: .4byte gPaletteFade _08057738: .4byte 0x3fffffff _0805773C: movs r0, 0x1 @@ -5613,7 +5613,7 @@ sub_8057854: @ 8057854 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0805787C @ =gUnknown_2037AB8 + ldr r0, _0805787C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5629,7 +5629,7 @@ _08057876: pop {r0} bx r0 .align 2, 0 -_0805787C: .4byte gUnknown_2037AB8 +_0805787C: .4byte gPaletteFade _08057880: .4byte sub_805671C thumb_func_end sub_8057854 @@ -6640,7 +6640,7 @@ _08057F96: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r5, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strh r0, [r6, 0xC] add sp, 0x4 pop {r4-r6} @@ -6913,7 +6913,7 @@ sub_80581C8: @ 80581C8 push {lr} movs r0, 0x6 bl PlaySE - bl sub_806F258 + bl ShowStartMenu bl ScriptContext2_Enable pop {r0} bx r0 @@ -7029,7 +7029,7 @@ sub_8058274: @ 8058274 strb r1, [r0] cmp r2, 0x1 beq _080582C0 - ldr r2, _080582D4 @ =gUnknown_2037AB8 + ldr r2, _080582D4 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -7048,7 +7048,7 @@ _080582C4: .4byte gUnknown_3000E84 _080582C8: .4byte sub_8057DC8 _080582CC: .4byte sub_8057DA4 _080582D0: .4byte gUnknown_3000E88 -_080582D4: .4byte gUnknown_2037AB8 +_080582D4: .4byte gPaletteFade _080582D8: movs r0, 0 _080582DA: @@ -7200,7 +7200,7 @@ SpawnLinkPlayerMapObject: @ 805839C lsls r5, r6, 3 adds r5, r6 lsls r5, 2 - ldr r0, _08058444 @ =gUnknown_2036E38 + ldr r0, _08058444 @ =gMapObjects adds r5, r0 adds r0, r4, 0 bl ZeroLinkPlayerMapObject @@ -7248,7 +7248,7 @@ SpawnLinkPlayerMapObject: @ 805839C bx r0 .align 2, 0 _08058440: .4byte gUnknown_2031DEC -_08058444: .4byte gUnknown_2036E38 +_08058444: .4byte gMapObjects thumb_func_end SpawnLinkPlayerMapObject thumb_func_start InitLinkPlayerMapObjectPos @@ -7300,7 +7300,7 @@ sub_8058488: @ 8058488 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080584B4 @ =gUnknown_2036E38 + ldr r0, _080584B4 @ =gMapObjects adds r1, r0 strb r2, [r1, 0x19] _080584AA: @@ -7308,7 +7308,7 @@ _080584AA: bx r0 .align 2, 0 _080584B0: .4byte gUnknown_2031DEC -_080584B4: .4byte gUnknown_2036E38 +_080584B4: .4byte gMapObjects thumb_func_end sub_8058488 thumb_func_start sub_80584B8 @@ -7322,7 +7322,7 @@ sub_80584B8: @ 80584B8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080584FC @ =gUnknown_2036E38 + ldr r1, _080584FC @ =gMapObjects adds r4, r0, r1 ldrb r0, [r4, 0x4] cmp r0, 0x40 @@ -7346,7 +7346,7 @@ _080584E4: bx r0 .align 2, 0 _080584F8: .4byte gUnknown_2031DEC -_080584FC: .4byte gUnknown_2036E38 +_080584FC: .4byte gMapObjects _08058500: .4byte gSprites thumb_func_end sub_80584B8 @@ -7360,13 +7360,13 @@ sub_8058504: @ 8058504 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058520 @ =gUnknown_2036E38 + ldr r1, _08058520 @ =gMapObjects adds r0, r1 ldrb r0, [r0, 0x4] bx lr .align 2, 0 _0805851C: .4byte gUnknown_2031DEC -_08058520: .4byte gUnknown_2036E38 +_08058520: .4byte gMapObjects thumb_func_end sub_8058504 thumb_func_start sub_8058524 @@ -7379,7 +7379,7 @@ sub_8058524: @ 8058524 lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r3, _08058548 @ =gUnknown_2036E38 + ldr r3, _08058548 @ =gMapObjects adds r0, r3 ldrh r3, [r0, 0x10] strh r3, [r1] @@ -7388,7 +7388,7 @@ sub_8058524: @ 8058524 bx lr .align 2, 0 _08058544: .4byte gUnknown_2031DEC -_08058548: .4byte gUnknown_2036E38 +_08058548: .4byte gMapObjects thumb_func_end sub_8058524 thumb_func_start sub_805854C @@ -7401,13 +7401,13 @@ sub_805854C: @ 805854C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058568 @ =gUnknown_2036E38 + ldr r1, _08058568 @ =gMapObjects adds r0, r1 ldrb r0, [r0, 0x19] bx lr .align 2, 0 _08058564: .4byte gUnknown_2031DEC -_08058568: .4byte gUnknown_2036E38 +_08058568: .4byte gMapObjects thumb_func_end sub_805854C thumb_func_start sub_805856C @@ -7420,7 +7420,7 @@ sub_805856C: @ 805856C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805858C @ =gUnknown_2036E38 + ldr r1, _0805858C @ =gMapObjects adds r0, r1 ldrb r0, [r0, 0xB] lsls r0, 28 @@ -7428,7 +7428,7 @@ sub_805856C: @ 805856C bx lr .align 2, 0 _08058588: .4byte gUnknown_2031DEC -_0805858C: .4byte gUnknown_2036E38 +_0805858C: .4byte gMapObjects thumb_func_end sub_805856C thumb_func_start sub_8058590 @@ -7441,7 +7441,7 @@ sub_8058590: @ 8058590 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080585B4 @ =gUnknown_2036E38 + ldr r1, _080585B4 @ =gMapObjects adds r0, r1 adds r0, 0x21 movs r1, 0 @@ -7451,7 +7451,7 @@ sub_8058590: @ 8058590 bx lr .align 2, 0 _080585B0: .4byte gUnknown_2031DEC -_080585B4: .4byte gUnknown_2036E38 +_080585B4: .4byte gMapObjects thumb_func_end sub_8058590 thumb_func_start GetLinkPlayerIdAt @@ -7479,7 +7479,7 @@ _080585DA: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058600 @ =gUnknown_2036E38 + ldr r1, _08058600 @ =gMapObjects adds r1, r0, r1 movs r6, 0x10 ldrsh r0, [r1, r6] @@ -7493,7 +7493,7 @@ _080585DA: b _08058610 .align 2, 0 _080585FC: .4byte gUnknown_2031DEC -_08058600: .4byte gUnknown_2036E38 +_08058600: .4byte gMapObjects _08058604: adds r0, r2, 0x1 lsls r0, 24 @@ -7521,7 +7521,7 @@ sub_8058618: @ 8058618 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0805864C @ =gUnknown_2036E38 + ldr r1, _0805864C @ =gMapObjects adds r6, r0, r1 ldrb r0, [r5] cmp r0, 0 @@ -7535,7 +7535,7 @@ sub_8058618: @ 8058618 b _08058674 .align 2, 0 _08058648: .4byte gUnknown_2031DEC -_0805864C: .4byte gUnknown_2036E38 +_0805864C: .4byte gMapObjects _08058650: ldr r4, _0805867C @ =gUnknown_826D374 ldr r1, _08058680 @ =gUnknown_826D33C @@ -7780,7 +7780,7 @@ npc_080587EC: @ 80587EC mov r12, r2 lsls r3, 16 movs r4, 0 - ldr r0, _08058850 @ =gUnknown_2036E38 + ldr r0, _08058850 @ =gMapObjects mov r9, r0 lsrs r2, r3, 16 mov r10, r2 @@ -7820,7 +7820,7 @@ _0805884A: movs r0, 0x1 b _0805886A .align 2, 0 -_08058850: .4byte gUnknown_2036E38 +_08058850: .4byte gMapObjects _08058854: adds r0, r4, 0x1 lsls r0, 24 @@ -7857,7 +7857,7 @@ sub_8058878: @ 8058878 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080588B8 @ =gUnknown_2036E38 + ldr r1, _080588B8 @ =gMapObjects adds r4, r0, r1 ldrb r0, [r2] cmp r0, 0 @@ -7875,7 +7875,7 @@ sub_8058878: @ 8058878 b _080588C6 .align 2, 0 _080588B4: .4byte gUnknown_2031DEC -_080588B8: .4byte gUnknown_2036E38 +_080588B8: .4byte gMapObjects _080588BC: ldrb r0, [r4] lsls r0, 30 @@ -7931,7 +7931,7 @@ SpriteCB_LinkPlayer: @ 805890C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08058974 @ =gUnknown_2036E38 + ldr r1, _08058974 @ =gMapObjects adds r6, r0, r1 ldrh r0, [r6, 0xC] strh r0, [r5, 0x20] @@ -7967,7 +7967,7 @@ SpriteCB_LinkPlayer: @ 805890C b _0805898A .align 2, 0 _08058970: .4byte gUnknown_2031DEC -_08058974: .4byte gUnknown_2036E38 +_08058974: .4byte gMapObjects _08058978: ldrb r0, [r6, 0x19] bl get_go_image_anim_num diff --git a/asm/palette.s b/asm/palette.s index a99aeda10..ed9327106 100644 --- a/asm/palette.s +++ b/asm/palette.s @@ -17,13 +17,13 @@ LoadCompressedPalette: @ 80703A8 adds r1, r6, 0 bl LZDecompressWram lsls r4, 1 - ldr r1, _080703E4 @ =gUnknown_20371F8 + ldr r1, _080703E4 @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 adds r0, r6, 0 adds r2, r5, 0 bl CpuSet - ldr r0, _080703E8 @ =gUnknown_20375F8 + ldr r0, _080703E8 @ =gPlttBufferFaded adds r4, r0 adds r0, r6, 0 adds r1, r4, 0 @@ -34,8 +34,8 @@ LoadCompressedPalette: @ 80703A8 bx r0 .align 2, 0 _080703E0: .4byte gUnknown_2037ACC -_080703E4: .4byte gUnknown_20371F8 -_080703E8: .4byte gUnknown_20375F8 +_080703E4: .4byte gPlttBufferUnfaded +_080703E8: .4byte gPlttBufferFaded thumb_func_end LoadCompressedPalette thumb_func_start LoadPalette @@ -47,12 +47,12 @@ LoadPalette: @ 80703EC lsls r4, 16 lsls r5, 16 lsrs r4, 15 - ldr r1, _0807041C @ =gUnknown_20371F8 + ldr r1, _0807041C @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 adds r2, r5, 0 bl CpuSet - ldr r0, _08070420 @ =gUnknown_20375F8 + ldr r0, _08070420 @ =gPlttBufferFaded adds r4, r0 adds r0, r6, 0 adds r1, r4, 0 @@ -62,8 +62,8 @@ LoadPalette: @ 80703EC pop {r0} bx r0 .align 2, 0 -_0807041C: .4byte gUnknown_20371F8 -_08070420: .4byte gUnknown_20375F8 +_0807041C: .4byte gPlttBufferUnfaded +_08070420: .4byte gPlttBufferFaded thumb_func_end LoadPalette thumb_func_start FillPalette @@ -80,7 +80,7 @@ FillPalette: @ 8070424 mov r0, sp strh r6, [r0] lsrs r4, 15 - ldr r1, _0807046C @ =gUnknown_20371F8 + ldr r1, _0807046C @ =gPlttBufferUnfaded adds r1, r4, r1 lsrs r5, 17 movs r0, 0x80 @@ -92,7 +92,7 @@ FillPalette: @ 8070424 mov r0, sp adds r0, 0x2 strh r6, [r0] - ldr r1, _08070470 @ =gUnknown_20375F8 + ldr r1, _08070470 @ =gPlttBufferFaded adds r4, r1 adds r1, r4, 0 adds r2, r5, 0 @@ -102,14 +102,14 @@ FillPalette: @ 8070424 pop {r0} bx r0 .align 2, 0 -_0807046C: .4byte gUnknown_20371F8 -_08070470: .4byte gUnknown_20375F8 +_0807046C: .4byte gPlttBufferUnfaded +_08070470: .4byte gPlttBufferFaded thumb_func_end FillPalette thumb_func_start TransferPlttBuffer TransferPlttBuffer: @ 8070474 push {r4,r5,lr} - ldr r4, _080704BC @ =gUnknown_2037AB8 + ldr r4, _080704BC @ =gPaletteFade ldrb r1, [r4, 0x8] movs r5, 0x80 adds r0, r5, 0 @@ -118,7 +118,7 @@ TransferPlttBuffer: @ 8070474 lsrs r3, r0, 24 cmp r3, 0 bne _080704B6 - ldr r1, _080704C0 @ =gUnknown_20375F8 + ldr r1, _080704C0 @ =gPlttBufferFaded movs r2, 0xA0 lsls r2, 19 ldr r0, _080704C4 @ =0x040000d4 @@ -145,8 +145,8 @@ _080704B6: pop {r0} bx r0 .align 2, 0 -_080704BC: .4byte gUnknown_2037AB8 -_080704C0: .4byte gUnknown_20375F8 +_080704BC: .4byte gPaletteFade +_080704C0: .4byte gPlttBufferFaded _080704C4: .4byte 0x040000d4 _080704C8: .4byte 0x80000200 _080704CC: .4byte gUnknown_2037AC8 @@ -164,7 +164,7 @@ UpdatePaletteFade: @ 80704D0 .align 2, 0 _080704E0: .4byte gUnknown_2037AC8 _080704E4: - ldr r0, _080704F8 @ =gUnknown_2037AB8 + ldr r0, _080704F8 @ =gPaletteFade ldrb r0, [r0, 0x9] movs r1, 0x3 ands r1, r0 @@ -173,7 +173,7 @@ _080704E4: bl UpdateNormalPaletteFade b _0807050A .align 2, 0 -_080704F8: .4byte gUnknown_2037AB8 +_080704F8: .4byte gPaletteFade _080704FC: cmp r1, 0x1 bne _08070506 @@ -185,7 +185,7 @@ _0807050A: lsls r0, 24 lsrs r3, r0, 24 ldr r2, _08070520 @ =gUnknown_2037AC8 - ldr r0, _08070524 @ =gUnknown_2037AB8 + ldr r0, _08070524 @ =gPaletteFade ldr r0, [r0] movs r1, 0 orrs r0, r1 @@ -196,7 +196,7 @@ _0807051C: bx r1 .align 2, 0 _08070520: .4byte gUnknown_2037AC8 -_08070524: .4byte gUnknown_2037AB8 +_08070524: .4byte gPaletteFade thumb_func_end UpdatePaletteFade thumb_func_start ResetPaletteFade @@ -224,8 +224,8 @@ ReadPlttIntoBuffers: @ 8070548 lsls r0, 19 mov r12, r0 movs r4, 0 - ldr r7, _0807057C @ =gUnknown_20371F8 - ldr r6, _08070580 @ =gUnknown_20375F8 + ldr r7, _0807057C @ =gPlttBufferUnfaded + ldr r6, _08070580 @ =gPlttBufferFaded ldr r5, _08070584 @ =0x000001ff _08070558: lsls r1, r4, 1 @@ -246,8 +246,8 @@ _08070558: pop {r0} bx r0 .align 2, 0 -_0807057C: .4byte gUnknown_20371F8 -_08070580: .4byte gUnknown_20375F8 +_0807057C: .4byte gPlttBufferUnfaded +_08070580: .4byte gPlttBufferFaded _08070584: .4byte 0x000001ff thumb_func_end ReadPlttIntoBuffers @@ -268,7 +268,7 @@ BeginNormalPaletteFade: @ 8070588 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r5, _080705B8 @ =gUnknown_2037AB8 + ldr r5, _080705B8 @ =gPaletteFade ldrb r1, [r5, 0x7] movs r0, 0x80 ands r0, r1 @@ -277,7 +277,7 @@ BeginNormalPaletteFade: @ 8070588 movs r0, 0 b _080706B4 .align 2, 0 -_080705B8: .4byte gUnknown_2037AB8 +_080705B8: .4byte gPaletteFade _080705BC: ldrb r0, [r5, 0xA] movs r3, 0x79 @@ -367,13 +367,13 @@ _08070664: _08070668: strb r3, [r5, 0x8] bl UpdatePaletteFade - ldr r4, _080706C0 @ =gUnknown_2037AB8 + ldr r4, _080706C0 @ =gPaletteFade ldrb r1, [r4, 0x8] lsrs r5, r1, 7 movs r0, 0x7F ands r0, r1 strb r0, [r4, 0x8] - ldr r0, _080706C4 @ =gUnknown_20375F8 + ldr r0, _080706C4 @ =gPlttBufferFaded movs r1, 0xA0 lsls r1, 19 ldr r2, _080706C8 @ =0x04000100 @@ -393,7 +393,7 @@ _08070668: beq _080706A4 bl UpdateBlendRegisters _080706A4: - ldr r2, _080706C0 @ =gUnknown_2037AB8 + ldr r2, _080706C0 @ =gPaletteFade lsls r3, r5, 7 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -408,8 +408,8 @@ _080706B4: pop {r1} bx r1 .align 2, 0 -_080706C0: .4byte gUnknown_2037AB8 -_080706C4: .4byte gUnknown_20375F8 +_080706C0: .4byte gPaletteFade +_080706C4: .4byte gPlttBufferFaded _080706C8: .4byte 0x04000100 _080706CC: .4byte gUnknown_2037AC8 thumb_func_end BeginNormalPaletteFade @@ -542,9 +542,9 @@ unused_sub_80A1CDC: @ 8070790 lsrs r0, r2, 27 cmp r6, r0 bcs _08070878 - ldr r0, _0807081C @ =gUnknown_20371F8 + ldr r0, _0807081C @ =gPlttBufferUnfaded mov r12, r0 - ldr r7, _08070820 @ =gUnknown_20375F8 + ldr r7, _08070820 @ =gPlttBufferFaded _080707C4: ldr r0, [r4, 0x4] lsls r0, 11 @@ -591,15 +591,15 @@ _080707C4: bcc _080707C4 b _08070878 .align 2, 0 -_0807081C: .4byte gUnknown_20371F8 -_08070820: .4byte gUnknown_20375F8 +_0807081C: .4byte gPlttBufferUnfaded +_08070820: .4byte gPlttBufferFaded _08070824: .4byte 0x000003ff _08070828: .4byte 0xffe007ff _0807082C: lsrs r0, r2, 27 cmp r6, r0 bcs _08070878 - ldr r3, _080708E4 @ =gUnknown_20375F8 + ldr r3, _080708E4 @ =gPlttBufferFaded _08070834: ldr r1, [r4, 0x4] lsls r1, 11 @@ -693,7 +693,7 @@ _080708C8: pop {r0} bx r0 .align 2, 0 -_080708E4: .4byte gUnknown_20375F8 +_080708E4: .4byte gPlttBufferFaded _080708E8: .4byte 0x000003ff _080708EC: .4byte 0xffe007ff _080708F0: .4byte 0xfffff01f @@ -703,7 +703,7 @@ _080708F0: .4byte 0xfffff01f unused_sub_80A1E40: @ 80708F4 push {r4-r6,lr} adds r4, r0, 0 - ldr r3, _0807094C @ =gUnknown_2037AB8 + ldr r3, _0807094C @ =gPaletteFade ldrb r1, [r3, 0x7] movs r0, 0x80 ands r0, r1 @@ -745,7 +745,7 @@ unused_sub_80A1E40: @ 80708F4 bl BlendPalette b _080709A8 .align 2, 0 -_0807094C: .4byte gUnknown_2037AB8 +_0807094C: .4byte gPaletteFade _08070950: ldrb r1, [r3, 0x4] movs r0, 0x3F @@ -768,7 +768,7 @@ _08070950: adds r1, r2, 0 cmp r3, r1 bcs _080709A8 - ldr r6, _080709B0 @ =gUnknown_20375F8 + ldr r6, _080709B0 @ =gPlttBufferFaded _0807097C: ldrh r1, [r4, 0x4] lsls r1, 21 @@ -797,7 +797,7 @@ _080709A8: pop {r0} bx r0 .align 2, 0 -_080709B0: .4byte gUnknown_20375F8 +_080709B0: .4byte gPlttBufferFaded thumb_func_end unused_sub_80A1E40 thumb_func_start unused_sub_80A1F00 @@ -912,7 +912,7 @@ _08070A80: .4byte 0xfffff01f thumb_func_start ResetPaletteFadeControl ResetPaletteFadeControl: @ 8070A84 - ldr r2, _08070AEC @ =gUnknown_2037AB8 + ldr r2, _08070AEC @ =gPaletteFade movs r0, 0 str r0, [r2] subs r0, 0x40 @@ -965,7 +965,7 @@ ResetPaletteFadeControl: @ 8070A84 strb r3, [r2, 0xA] bx lr .align 2, 0 -_08070AEC: .4byte gUnknown_2037AB8 +_08070AEC: .4byte gPaletteFade _08070AF0: .4byte 0xfffff83f _08070AF4: .4byte 0xffff8000 _08070AF8: .4byte 0xfffe0fff @@ -1059,7 +1059,7 @@ _08070B88: thumb_func_start UpdateNormalPaletteFade UpdateNormalPaletteFade: @ 8070B8C push {r4-r7,lr} - ldr r4, _08070BA0 @ =gUnknown_2037AB8 + ldr r4, _08070BA0 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -1068,7 +1068,7 @@ UpdateNormalPaletteFade: @ 8070B8C movs r0, 0 b _08070CC0 .align 2, 0 -_08070BA0: .4byte gUnknown_2037AB8 +_08070BA0: .4byte gPaletteFade _08070BA4: bl IsSoftwarePaletteFadeFinishing lsls r0, 24 @@ -1106,7 +1106,7 @@ _08070BDE: strb r0, [r4, 0x4] _08070BE6: movs r5, 0 - ldr r2, _08070BFC @ =gUnknown_2037AB8 + ldr r2, _08070BFC @ =gPaletteFade ldrb r1, [r2, 0xA] movs r0, 0x4 ands r0, r1 @@ -1116,7 +1116,7 @@ _08070BE6: ldrh r4, [r7] b _08070C06 .align 2, 0 -_08070BFC: .4byte gUnknown_2037AB8 +_08070BFC: .4byte gPaletteFade _08070C00: ldrh r4, [r7, 0x2] movs r5, 0x80 @@ -1124,7 +1124,7 @@ _08070C00: _08070C06: cmp r4, 0 beq _08070C38 - ldr r7, _08070C74 @ =gUnknown_2037AB8 + ldr r7, _08070C74 @ =gPaletteFade adds r6, r7, 0 _08070C0E: movs r0, 0x1 @@ -1180,7 +1180,7 @@ _08070C38: strb r4, [r7, 0xA] b _08070CBC .align 2, 0 -_08070C74: .4byte gUnknown_2037AB8 +_08070C74: .4byte gPaletteFade _08070C78: ldrb r1, [r7, 0x8] movs r0, 0x40 @@ -1237,7 +1237,7 @@ InvertPlttBuffer: @ 8070CCC movs r3, 0 cmp r1, 0 beq _08070D0A - ldr r7, _08070D10 @ =gUnknown_20375F8 + ldr r7, _08070D10 @ =gPlttBufferFaded _08070CD8: movs r0, 0x1 ands r0, r1 @@ -1271,7 +1271,7 @@ _08070D0A: pop {r0} bx r0 .align 2, 0 -_08070D10: .4byte gUnknown_20375F8 +_08070D10: .4byte gPlttBufferFaded thumb_func_end InvertPlttBuffer thumb_func_start TintPlttBuffer @@ -1308,7 +1308,7 @@ _08070D3E: cmp r0, 0 beq _08070DC2 movs r4, 0 - ldr r2, _08070DE0 @ =gUnknown_20375F8 + ldr r2, _08070DE0 @ =gPlttBufferFaded mov r8, r2 ldr r1, [sp] lsls r0, r1, 24 @@ -1383,7 +1383,7 @@ _08070DD0: pop {r0} bx r0 .align 2, 0 -_08070DE0: .4byte gUnknown_20375F8 +_08070DE0: .4byte gPlttBufferFaded _08070DE4: .4byte 0xfffffc1f thumb_func_end TintPlttBuffer @@ -1396,9 +1396,9 @@ UnfadePlttBuffer: @ 8070DE8 movs r3, 0 cmp r1, 0 beq _08070E32 - ldr r0, _08070E3C @ =gUnknown_20375F8 + ldr r0, _08070E3C @ =gPlttBufferFaded mov r8, r0 - ldr r0, _08070E40 @ =gUnknown_20371F8 + ldr r0, _08070E40 @ =gPlttBufferUnfaded mov r12, r0 _08070DFE: movs r0, 0x1 @@ -1436,8 +1436,8 @@ _08070E32: pop {r0} bx r0 .align 2, 0 -_08070E3C: .4byte gUnknown_20375F8 -_08070E40: .4byte gUnknown_20371F8 +_08070E3C: .4byte gPlttBufferFaded +_08070E40: .4byte gPlttBufferUnfaded thumb_func_end UnfadePlttBuffer thumb_func_start BeginFastPaletteFade @@ -1445,7 +1445,7 @@ BeginFastPaletteFade: @ 8070E44 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _08070E64 @ =gUnknown_2037AB8 + ldr r3, _08070E64 @ =gPaletteFade ldrb r2, [r3, 0xA] movs r1, 0x79 negs r1, r1 @@ -1457,7 +1457,7 @@ BeginFastPaletteFade: @ 8070E44 pop {r0} bx r0 .align 2, 0 -_08070E64: .4byte gUnknown_2037AB8 +_08070E64: .4byte gPaletteFade thumb_func_end BeginFastPaletteFade thumb_func_start BeginFastPaletteFadeInternal @@ -1467,7 +1467,7 @@ BeginFastPaletteFadeInternal: @ 8070E68 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r2, _08070EDC @ =gUnknown_2037AB8 + ldr r2, _08070EDC @ =gPaletteFade ldrh r0, [r2, 0x4] movs r3, 0xF8 lsls r3, 3 @@ -1498,7 +1498,7 @@ BeginFastPaletteFadeInternal: @ 8070E68 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _08070EE0 @ =gUnknown_20375F8 + ldr r1, _08070EE0 @ =gPlttBufferFaded ldr r2, _08070EE4 @ =0x01000200 mov r0, sp bl CpuSet @@ -1510,7 +1510,7 @@ _08070EBA: ldr r2, _08070EE8 @ =0x00007fff adds r1, r2, 0 strh r1, [r0] - ldr r1, _08070EE0 @ =gUnknown_20375F8 + ldr r1, _08070EE0 @ =gPlttBufferFaded ldr r2, _08070EE4 @ =0x01000200 bl CpuSet _08070ED0: @@ -1520,8 +1520,8 @@ _08070ED0: pop {r0} bx r0 .align 2, 0 -_08070EDC: .4byte gUnknown_2037AB8 -_08070EE0: .4byte gUnknown_20375F8 +_08070EDC: .4byte gPaletteFade +_08070EE0: .4byte gPlttBufferFaded _08070EE4: .4byte 0x01000200 _08070EE8: .4byte 0x00007fff thumb_func_end BeginFastPaletteFadeInternal @@ -1534,7 +1534,7 @@ UpdateFastPaletteFade: @ 8070EEC mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r4, _08070F08 @ =gUnknown_2037AB8 + ldr r4, _08070F08 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -1543,7 +1543,7 @@ UpdateFastPaletteFade: @ 8070EEC movs r0, 0 b _08071246 .align 2, 0 -_08070F08: .4byte gUnknown_2037AB8 +_08070F08: .4byte gPaletteFade _08070F0C: bl IsSoftwarePaletteFadeFinishing lsls r0, 24 @@ -1569,7 +1569,7 @@ _08070F30: lsls r1, 1 mov r10, r1 _08070F38: - ldr r1, _08070F50 @ =gUnknown_2037AB8 + ldr r1, _08070F50 @ =gPaletteFade ldrb r0, [r1, 0x8] lsls r0, 26 lsrs r0, 26 @@ -1581,7 +1581,7 @@ _08070F38: beq _08070F62 b _08071148 .align 2, 0 -_08070F50: .4byte gUnknown_2037AB8 +_08070F50: .4byte gPaletteFade _08070F54: cmp r0, 0x2 bne _08070F5A @@ -1599,7 +1599,7 @@ _08070F62: b _08071148 _08070F6A: lsls r2, r7, 1 - ldr r0, _08070FF0 @ =gUnknown_20371F8 + ldr r0, _08070FF0 @ =gPlttBufferUnfaded adds r0, r2, r0 ldr r1, [r0] lsls r3, r1, 27 @@ -1609,7 +1609,7 @@ _08070F6A: lsls r1, 17 lsrs r1, 27 mov r8, r1 - ldr r0, _08070FF4 @ =gUnknown_20375F8 + ldr r0, _08070FF4 @ =gPlttBufferFaded adds r2, r0 mov r9, r2 ldr r1, [r2] @@ -1669,8 +1669,8 @@ _08070FD0: bcc _08070F6A b _08071148 .align 2, 0 -_08070FF0: .4byte gUnknown_20371F8 -_08070FF4: .4byte gUnknown_20375F8 +_08070FF0: .4byte gPlttBufferUnfaded +_08070FF4: .4byte gPlttBufferFaded _08070FF8: adds r7, r2, 0 cmp r7, r10 @@ -1678,7 +1678,7 @@ _08070FF8: b _08071148 _08071000: lsls r1, r7, 1 - ldr r0, _08071058 @ =gUnknown_20375F8 + ldr r0, _08071058 @ =gPlttBufferFaded adds r2, r1, r0 ldr r1, [r2] lsls r0, r1, 27 @@ -1725,14 +1725,14 @@ _0807103A: bcc _08071000 b _08071148 .align 2, 0 -_08071058: .4byte gUnknown_20375F8 +_08071058: .4byte gPlttBufferFaded _0807105C: adds r7, r2, 0 cmp r7, r10 bcs _08071148 _08071062: lsls r2, r7, 1 - ldr r0, _080710DC @ =gUnknown_20371F8 + ldr r0, _080710DC @ =gPlttBufferUnfaded adds r0, r2, r0 ldr r1, [r0] lsls r3, r1, 27 @@ -1742,7 +1742,7 @@ _08071062: lsls r1, 17 lsrs r1, 27 mov r8, r1 - ldr r0, _080710E0 @ =gUnknown_20375F8 + ldr r0, _080710E0 @ =gPlttBufferFaded adds r2, r0 ldr r1, [r2] lsls r0, r1, 27 @@ -1795,13 +1795,13 @@ _080710BC: bcc _08071062 b _08071148 .align 2, 0 -_080710DC: .4byte gUnknown_20371F8 -_080710E0: .4byte gUnknown_20375F8 +_080710DC: .4byte gPlttBufferUnfaded +_080710E0: .4byte gPlttBufferFaded _080710E4: adds r7, r2, 0 cmp r7, r10 bcs _08071148 - ldr r4, _08071170 @ =gUnknown_20375F8 + ldr r4, _08071170 @ =gPlttBufferFaded mov r8, r4 _080710EE: lsls r0, r7, 1 @@ -1853,7 +1853,7 @@ _0807112C: cmp r7, r10 bcc _080710EE _08071148: - ldr r0, _08071174 @ =gUnknown_2037AB8 + ldr r0, _08071174 @ =gPaletteFade ldrb r2, [r0, 0xA] lsls r0, r2, 29 lsrs r0, 31 @@ -1864,7 +1864,7 @@ _08071148: negs r3, r3 ands r3, r2 orrs r3, r1 - ldr r1, _08071174 @ =gUnknown_2037AB8 + ldr r1, _08071174 @ =gPaletteFade strb r3, [r1, 0xA] movs r0, 0x4 ands r0, r3 @@ -1873,10 +1873,10 @@ _08071148: ldrb r0, [r1, 0x7] b _08071244 .align 2, 0 -_08071170: .4byte gUnknown_20375F8 -_08071174: .4byte gUnknown_2037AB8 +_08071170: .4byte gPlttBufferFaded +_08071174: .4byte gPaletteFade _08071178: - ldr r2, _08071194 @ =gUnknown_2037AB8 + ldr r2, _08071194 @ =gPaletteFade ldrh r4, [r2, 0x4] lsls r5, r4, 21 lsrs r0, r5, 27 @@ -1887,11 +1887,11 @@ _08071178: bge _0807119C ldr r0, _08071198 @ =0xfffff83f ands r0, r4 - ldr r3, _08071194 @ =gUnknown_2037AB8 + ldr r3, _08071194 @ =gPaletteFade strh r0, [r3, 0x4] b _080711B2 .align 2, 0 -_08071194: .4byte gUnknown_2037AB8 +_08071194: .4byte gPaletteFade _08071198: .4byte 0xfffff83f _0807119C: lsrs r1, r5, 27 @@ -1903,17 +1903,17 @@ _0807119C: ldr r0, _080711D8 @ =0xfffff83f ands r0, r4 orrs r0, r1 - ldr r4, _080711DC @ =gUnknown_2037AB8 + ldr r4, _080711DC @ =gPaletteFade strh r0, [r4, 0x4] _080711B2: - ldr r1, _080711DC @ =gUnknown_2037AB8 + ldr r1, _080711DC @ =gPaletteFade ldrh r0, [r1, 0x4] movs r1, 0xF8 lsls r1, 3 ands r1, r0 cmp r1, 0 bne _08071240 - ldr r2, _080711DC @ =gUnknown_2037AB8 + ldr r2, _080711DC @ =gPaletteFade ldrb r0, [r2, 0x8] lsls r0, 26 lsrs r0, 26 @@ -1926,7 +1926,7 @@ _080711B2: b _0807122C .align 2, 0 _080711D8: .4byte 0xfffff83f -_080711DC: .4byte gUnknown_2037AB8 +_080711DC: .4byte gPaletteFade _080711E0: cmp r0, 0x2 beq _080711EA @@ -1934,35 +1934,35 @@ _080711E0: beq _08071220 b _0807122C _080711EA: - ldr r0, _080711F8 @ =gUnknown_20371F8 - ldr r1, _080711FC @ =gUnknown_20375F8 + ldr r0, _080711F8 @ =gPlttBufferUnfaded + ldr r1, _080711FC @ =gPlttBufferFaded ldr r2, _08071200 @ =0x04000100 bl CpuSet b _0807122C .align 2, 0 -_080711F8: .4byte gUnknown_20371F8 -_080711FC: .4byte gUnknown_20375F8 +_080711F8: .4byte gPlttBufferUnfaded +_080711FC: .4byte gPlttBufferFaded _08071200: .4byte 0x04000100 _08071204: movs r0, 0x1 negs r0, r0 str r0, [sp] - ldr r1, _08071218 @ =gUnknown_20375F8 + ldr r1, _08071218 @ =gPlttBufferFaded ldr r2, _0807121C @ =0x05000100 mov r0, sp bl CpuSet b _0807122C .align 2, 0 -_08071218: .4byte gUnknown_20375F8 +_08071218: .4byte gPlttBufferFaded _0807121C: .4byte 0x05000100 _08071220: str r1, [sp, 0x4] add r0, sp, 0x4 - ldr r1, _08071258 @ =gUnknown_20375F8 + ldr r1, _08071258 @ =gPlttBufferFaded ldr r2, _0807125C @ =0x05000100 bl CpuSet _0807122C: - ldr r2, _08071260 @ =gUnknown_2037AB8 + ldr r2, _08071260 @ =gPaletteFade ldrb r1, [r2, 0x9] movs r0, 0x4 negs r0, r0 @@ -1973,7 +1973,7 @@ _0807122C: orrs r0, r1 strb r0, [r2, 0xA] _08071240: - ldr r3, _08071260 @ =gUnknown_2037AB8 + ldr r3, _08071260 @ =gPaletteFade ldrb r0, [r3, 0x7] _08071244: lsrs r0, 7 @@ -1987,9 +1987,9 @@ _08071246: pop {r1} bx r1 .align 2, 0 -_08071258: .4byte gUnknown_20375F8 +_08071258: .4byte gPlttBufferFaded _0807125C: .4byte 0x05000100 -_08071260: .4byte gUnknown_2037AB8 +_08071260: .4byte gPaletteFade thumb_func_end UpdateFastPaletteFade thumb_func_start BeginHardwarePaletteFade @@ -2006,7 +2006,7 @@ BeginHardwarePaletteFade: @ 8071264 lsrs r3, 24 lsls r5, 24 lsrs r5, 24 - ldr r7, _080712EC @ =gUnknown_2037AB8 + ldr r7, _080712EC @ =gPaletteFade str r0, [r7] movs r0, 0x3F ands r1, r0 @@ -2062,7 +2062,7 @@ BeginHardwarePaletteFade: @ 8071264 ands r6, r0 b _080712F8 .align 2, 0 -_080712EC: .4byte gUnknown_2037AB8 +_080712EC: .4byte gPaletteFade _080712F0: .4byte 0xfffff83f _080712F4: movs r0, 0x40 @@ -2077,7 +2077,7 @@ _080712F8: thumb_func_start UpdateHardwarePaletteFade UpdateHardwarePaletteFade: @ 8071300 push {r4-r7,lr} - ldr r2, _08071314 @ =gUnknown_2037AB8 + ldr r2, _08071314 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -2087,7 +2087,7 @@ UpdateHardwarePaletteFade: @ 8071300 movs r0, 0 b _08071410 .align 2, 0 -_08071314: .4byte gUnknown_2037AB8 +_08071314: .4byte gPaletteFade _08071318: ldrb r2, [r4, 0x4] lsls r1, r2, 26 @@ -2229,7 +2229,7 @@ _08071418: .4byte 0xfffff83f thumb_func_start UpdateBlendRegisters UpdateBlendRegisters: @ 807141C push {r4,lr} - ldr r4, _08071468 @ =gUnknown_2037AB8 + ldr r4, _08071468 @ =gPaletteFade ldrh r1, [r4] movs r0, 0x50 bl SetGpuReg @@ -2265,14 +2265,14 @@ _08071460: pop {r0} bx r0 .align 2, 0 -_08071468: .4byte gUnknown_2037AB8 +_08071468: .4byte gPaletteFade _0807146C: .4byte 0xfffff83f thumb_func_end UpdateBlendRegisters thumb_func_start IsSoftwarePaletteFadeFinishing IsSoftwarePaletteFadeFinishing: @ 8071470 push {r4,lr} - ldr r3, _080714A8 @ =gUnknown_2037AB8 + ldr r3, _080714A8 @ =gPaletteFade ldrb r4, [r3, 0xA] movs r0, 0x2 ands r0, r4 @@ -2300,7 +2300,7 @@ IsSoftwarePaletteFadeFinishing: @ 8071470 str r0, [r3, 0x8] b _080714C4 .align 2, 0 -_080714A8: .4byte gUnknown_2037AB8 +_080714A8: .4byte gPaletteFade _080714AC: .4byte 0xfffe0fff _080714B0: lsls r0, r2, 15 @@ -2371,8 +2371,8 @@ BlendPalettesUnfaded: @ 8071510 lsrs r4, 24 lsls r5, 16 lsrs r5, 16 - ldr r0, _0807153C @ =gUnknown_20371F8 - ldr r1, _08071540 @ =gUnknown_20375F8 + ldr r0, _0807153C @ =gPlttBufferUnfaded + ldr r1, _08071540 @ =gPlttBufferFaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -2384,8 +2384,8 @@ BlendPalettesUnfaded: @ 8071510 pop {r0} bx r0 .align 2, 0 -_0807153C: .4byte gUnknown_20371F8 -_08071540: .4byte gUnknown_20375F8 +_0807153C: .4byte gPlttBufferUnfaded +_08071540: .4byte gPlttBufferFaded thumb_func_end BlendPalettesUnfaded thumb_func_start TintPalette_GrayScale diff --git a/asm/party_menu.s b/asm/party_menu.s index 3a7542241..50c485ad5 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -285,13 +285,13 @@ _0811EC8E: b _0811EDFC _0811EC94: bl ResetPaletteFade - ldr r2, _0811ECA4 @ =gUnknown_2037AB8 + ldr r2, _0811ECA4 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 b _0811EDFA .align 2, 0 -_0811ECA4: .4byte gUnknown_2037AB8 +_0811ECA4: .4byte gPaletteFade _0811ECA8: bl ResetSpriteData b _0811EDFC @@ -452,7 +452,7 @@ _0811EDDE: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r2, _0811EE0C @ =gUnknown_2037AB8 + ldr r2, _0811EE0C @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -468,7 +468,7 @@ _0811EDFC: strb r0, [r1] b _0811EE2C .align 2, 0 -_0811EE0C: .4byte gUnknown_2037AB8 +_0811EE0C: .4byte gPaletteFade _0811EE10: .4byte gMain _0811EE14: ldr r0, _0811EE24 @ =sub_811EBBC @@ -522,7 +522,7 @@ sub_811EE74: @ 811EE74 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0811EEA0 @ =gUnknown_2037AB8 + ldr r0, _0811EEA0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -539,7 +539,7 @@ _0811EE98: pop {r0} bx r0 .align 2, 0 -_0811EEA0: .4byte gUnknown_2037AB8 +_0811EEA0: .4byte gPaletteFade _0811EEA4: .4byte gUnknown_203B0A0 thumb_func_end sub_811EE74 @@ -681,7 +681,7 @@ _0811EFD4: lsls r2, 1 movs r1, 0 bl LoadCompressedPalette - ldr r0, _0811EFF8 @ =gUnknown_20371F8 + ldr r0, _0811EFF8 @ =gPlttBufferUnfaded ldr r4, _0811EFFC @ =gUnknown_203B09C ldr r1, [r4] adds r1, 0x18 @@ -691,7 +691,7 @@ _0811EFD4: b _0811F01A .align 2, 0 _0811EFF4: .4byte gUnknown_8E829C8 -_0811EFF8: .4byte gUnknown_20371F8 +_0811EFF8: .4byte gPlttBufferUnfaded _0811EFFC: .4byte gUnknown_203B09C _0811F000: movs r0, 0x4 @@ -739,7 +739,7 @@ sub_811F03C: @ 811F03C push {r4,r5,lr} adds r4, r0, 0 lsls r4, 28 - ldr r5, _0811F068 @ =gUnknown_2037258 + ldr r5, _0811F068 @ =gPlttBufferUnfaded + 0x60 lsrs r4, 23 adds r1, r5, 0 subs r1, 0x60 @@ -747,7 +747,7 @@ sub_811F03C: @ 811F03C adds r0, r5, 0 movs r2, 0x10 bl CpuSet - ldr r0, _0811F06C @ =gUnknown_20375F8 + ldr r0, _0811F06C @ =gPlttBufferFaded adds r4, r0 adds r0, r5, 0 adds r1, r4, 0 @@ -757,8 +757,8 @@ sub_811F03C: @ 811F03C pop {r0} bx r0 .align 2, 0 -_0811F068: .4byte gUnknown_2037258 -_0811F06C: .4byte gUnknown_20375F8 +_0811F068: .4byte gPlttBufferUnfaded + 0x60 +_0811F06C: .4byte gPlttBufferFaded thumb_func_end sub_811F03C thumb_func_start sub_811F070 @@ -2092,7 +2092,7 @@ sub_811FAB4: @ 811FAB4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0811FAE8 @ =gUnknown_2037AB8 + ldr r0, _0811FAE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2114,7 +2114,7 @@ _0811FAD6: bl SetMainCallback2 b _0811FAFA .align 2, 0 -_0811FAE8: .4byte gUnknown_2037AB8 +_0811FAE8: .4byte gPaletteFade _0811FAEC: .4byte gUnknown_203B0A0 _0811FAF0: .4byte gUnknown_203B09C _0811FAF4: @@ -2156,7 +2156,7 @@ sub_811FB28: @ 811FB28 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - ldr r0, _0811FB64 @ =gUnknown_2037AB8 + ldr r0, _0811FB64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2180,7 +2180,7 @@ sub_811FB28: @ 811FB28 beq _0811FB6E b _0811FB98 .align 2, 0 -_0811FB64: .4byte gUnknown_2037AB8 +_0811FB64: .4byte gPaletteFade _0811FB68: cmp r0, 0x8 beq _0811FB82 @@ -4413,7 +4413,7 @@ sub_8120C3C: @ 8120C3C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08120C60 @ =gUnknown_2037AB8 + ldr r0, _08120C60 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4430,7 +4430,7 @@ _08120C5C: pop {r0} bx r0 .align 2, 0 -_08120C60: .4byte gUnknown_2037AB8 +_08120C60: .4byte gPaletteFade _08120C64: .4byte gTasks _08120C68: .4byte sub_8120C6C thumb_func_end sub_8120C3C @@ -4471,7 +4471,7 @@ sub_8120CA8: @ 8120CA8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08120CCC @ =gUnknown_2037AB8 + ldr r0, _08120CCC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4488,7 +4488,7 @@ _08120CC8: pop {r0} bx r0 .align 2, 0 -_08120CCC: .4byte gUnknown_2037AB8 +_08120CCC: .4byte gPaletteFade _08120CD0: .4byte gTasks _08120CD4: .4byte sub_8120CD8 thumb_func_end sub_8120CA8 @@ -4584,7 +4584,7 @@ sub_8120D7C: @ 8120D7C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08120DA0 @ =gUnknown_2037AB8 + ldr r0, _08120DA0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4601,7 +4601,7 @@ _08120D9C: pop {r0} bx r0 .align 2, 0 -_08120DA0: .4byte gUnknown_2037AB8 +_08120DA0: .4byte gPaletteFade _08120DA4: .4byte gTasks _08120DA8: .4byte sub_8120DAC thumb_func_end sub_8120D7C @@ -4700,7 +4700,7 @@ sub_8120E58: @ 8120E58 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08120E90 @ =gUnknown_2037AB8 + ldr r0, _08120E90 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4722,7 +4722,7 @@ sub_8120E58: @ 8120E58 bl sub_8121D0C b _08120E9E .align 2, 0 -_08120E90: .4byte gUnknown_2037AB8 +_08120E90: .4byte gPaletteFade _08120E94: .4byte gUnknown_203B0A0 _08120E98: movs r0, 0 @@ -4775,7 +4775,7 @@ sub_8120EE0: @ 8120EE0 lsls r0, 3 ldr r1, _08120F1C @ =gTasks+0x8 adds r6, r0, r1 - ldr r0, _08120F20 @ =gUnknown_2037AB8 + ldr r0, _08120F20 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4798,7 +4798,7 @@ sub_8120EE0: @ 8120EE0 b _08120F62 .align 2, 0 _08120F1C: .4byte gTasks+0x8 -_08120F20: .4byte gUnknown_2037AB8 +_08120F20: .4byte gPaletteFade _08120F24: cmp r0, 0xF0 beq _08120F44 @@ -4919,7 +4919,7 @@ sub_8120FF0: @ 8120FF0 lsls r0, 3 ldr r1, _0812102C @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _08121030 @ =gUnknown_2037AB8 + ldr r0, _08121030 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4941,7 +4941,7 @@ sub_8120FF0: @ 8120FF0 b _08121048 .align 2, 0 _0812102C: .4byte gTasks+0x8 -_08121030: .4byte gUnknown_2037AB8 +_08121030: .4byte gPaletteFade _08121034: ldr r0, _08121050 @ =gUnknown_203B09C ldr r1, [r0] @@ -8529,7 +8529,7 @@ sub_8122C5C: @ 8122C5C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08122C94 @ =gUnknown_2037AB8 + ldr r0, _08122C94 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -8553,7 +8553,7 @@ sub_8122C5C: @ 8122C5C bl ProcessMenuInputNoWrapAround_other b _08122CA4 .align 2, 0 -_08122C94: .4byte gUnknown_2037AB8 +_08122C94: .4byte gPaletteFade _08122C98: .4byte gTasks+0x8 _08122C9C: .4byte gUnknown_203B09C _08122CA0: @@ -8697,7 +8697,7 @@ _08122DB8: .4byte sub_8122DBC sub_8122DBC: @ 8122DBC push {lr} sub sp, 0xC - ldr r2, _08122DF4 @ =gUnknown_2037AB8 + ldr r2, _08122DF4 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -8722,7 +8722,7 @@ sub_8122DBC: @ 8122DBC pop {r0} bx r0 .align 2, 0 -_08122DF4: .4byte gUnknown_2037AB8 +_08122DF4: .4byte gPaletteFade _08122DF8: .4byte gUnknown_203B0A0 _08122DFC: .4byte sub_8122C30 thumb_func_end sub_8122DBC @@ -9986,7 +9986,7 @@ sub_8123824: @ 8123824 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0812388C @ =gUnknown_2037AB8 + ldr r0, _0812388C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10031,7 +10031,7 @@ _08123880: pop {r0} bx r0 .align 2, 0 -_0812388C: .4byte gUnknown_2037AB8 +_0812388C: .4byte gPaletteFade _08123890: .4byte gUnknown_203AD30 _08123894: .4byte gUnknown_203B0A0 _08123898: .4byte gPlayerParty @@ -10044,7 +10044,7 @@ sub_81238A4: @ 81238A4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081238E4 @ =gUnknown_2037AB8 + ldr r0, _081238E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10073,7 +10073,7 @@ _081238DC: pop {r0} bx r0 .align 2, 0 -_081238E4: .4byte gUnknown_2037AB8 +_081238E4: .4byte gPaletteFade _081238E8: .4byte gUnknown_203B0A0 _081238EC: .4byte gPlayerParty _081238F0: .4byte gUnknown_203B0D8 @@ -10383,7 +10383,7 @@ sub_8123B78: @ 8123B78 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08123BB0 @ =gUnknown_2037AB8 + ldr r0, _08123BB0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10407,7 +10407,7 @@ sub_8123B78: @ 8123B78 bl sub_8120420 b _08123BD0 .align 2, 0 -_08123BB0: .4byte gUnknown_2037AB8 +_08123BB0: .4byte gPaletteFade _08123BB4: .4byte gUnknown_203B0D8 _08123BB8: .4byte gUnknown_203B0A0 _08123BBC: .4byte gPlayerParty @@ -10657,7 +10657,7 @@ _08123DC8: .4byte sub_8123DCC sub_8123DCC: @ 8123DCC push {lr} sub sp, 0xC - ldr r2, _08123E00 @ =gUnknown_2037AB8 + ldr r2, _08123E00 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -10680,7 +10680,7 @@ sub_8123DCC: @ 8123DCC pop {r0} bx r0 .align 2, 0 -_08123E00: .4byte gUnknown_2037AB8 +_08123E00: .4byte gPaletteFade _08123E04: .4byte gUnknown_203B0A0 _08123E08: .4byte sub_8122C30 thumb_func_end sub_8123DCC @@ -12100,7 +12100,7 @@ sub_8124998: @ 8124998 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059CC8 @@ -12163,7 +12163,7 @@ _08124A24: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059CC8 @@ -12276,7 +12276,7 @@ hm_prepare_waterfall: @ 8124AF8 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsWaterfall @@ -12870,7 +12870,7 @@ sub_8124FC8: @ 8124FC8 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _08125000 @ =gUnknown_2037AB8 + ldr r0, _08125000 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12896,7 +12896,7 @@ _08124FFA: pop {r0} bx r0 .align 2, 0 -_08125000: .4byte gUnknown_2037AB8 +_08125000: .4byte gPaletteFade _08125004: .4byte gUnknown_203B0A0 _08125008: .4byte gUnknown_203B09C _0812500C: .4byte sub_8128184 @@ -14729,7 +14729,7 @@ sub_8125F14: @ 8125F14 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, _08125F3C @ =gUnknown_2037AB8 + ldr r0, _08125F3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14744,7 +14744,7 @@ sub_8125F14: @ 8125F14 bl sub_8125FFC b _08125F46 .align 2, 0 -_08125F3C: .4byte gUnknown_2037AB8 +_08125F3C: .4byte gPaletteFade _08125F40: adds r0, r5, 0 bl sub_81260D8 @@ -16528,7 +16528,7 @@ sub_8126DC8: @ 8126DC8 push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08126E4C @ =gUnknown_2037AB8 + ldr r0, _08126E4C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -16583,7 +16583,7 @@ sub_8126DC8: @ 8126DC8 bl sub_8125C48 b _08126E98 .align 2, 0 -_08126E4C: .4byte gUnknown_2037AB8 +_08126E4C: .4byte gPaletteFade _08126E50: .4byte gUnknown_203B0A0 _08126E54: .4byte gPlayerParty _08126E58: .4byte gStringVar1 @@ -16813,7 +16813,7 @@ sub_812701C: @ 812701C push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08127084 @ =gUnknown_2037AB8 + ldr r0, _08127084 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -16858,7 +16858,7 @@ _08127078: pop {r0} bx r0 .align 2, 0 -_08127084: .4byte gUnknown_2037AB8 +_08127084: .4byte gPaletteFade _08127088: .4byte gUnknown_203B0A0 _0812708C: .4byte gPlayerParty _08127090: .4byte gTasks @@ -17010,7 +17010,7 @@ sub_81271C4: @ 81271C4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081271EC @ =gUnknown_2037AB8 + ldr r0, _081271EC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -17027,7 +17027,7 @@ sub_81271C4: @ 81271C4 bl sub_8120558 b _08127210 .align 2, 0 -_081271EC: .4byte gUnknown_2037AB8 +_081271EC: .4byte gPaletteFade _081271F0: .4byte gUnknown_203B0D8 _081271F4: .4byte gUnknown_203B0A0 _081271F8: @@ -19117,7 +19117,7 @@ sub_81281FC: @ 81281FC lsls r0, 3 ldr r1, _08128270 @ =gTasks+0x8 adds r4, r0, r1 - ldr r0, _08128274 @ =gUnknown_2037AB8 + ldr r0, _08128274 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -19168,7 +19168,7 @@ _08128268: bx r0 .align 2, 0 _08128270: .4byte gTasks+0x8 -_08128274: .4byte gUnknown_2037AB8 +_08128274: .4byte gPaletteFade _08128278: .4byte gUnknown_2022B58 _0812827C: .4byte gUnknown_203B0B4 _08128280: .4byte gTasks diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s index b8e48f91c..61c47a719 100644 --- a/asm/pc_screen_effect.s +++ b/asm/pc_screen_effect.s @@ -226,7 +226,7 @@ _080A0BCC: movs r1, 0 movs r2, 0 bl BlendPalettes - ldr r0, _080A0C0C @ =gUnknown_20375F8 + ldr r0, _080A0C0C @ =gPlttBufferFaded strh r5, [r0] _080A0BF2: ldrh r1, [r4, 0xE] @@ -241,7 +241,7 @@ _080A0BF2: ldrsh r0, [r4, r1] b _080A0C54 .align 2, 0 -_080A0C0C: .4byte gUnknown_20375F8 +_080A0C0C: .4byte gPlttBufferFaded _080A0C10: ldrh r0, [r4, 0x12] ldrh r1, [r4, 0xC] @@ -326,11 +326,11 @@ _080A0CA0: beq _080A0D54 b _080A0DA8 _080A0CAA: - ldr r0, _080A0CB0 @ =gUnknown_20375F8 + ldr r0, _080A0CB0 @ =gPlttBufferFaded strh r1, [r0] b _080A0DCA .align 2, 0 -_080A0CB0: .4byte gUnknown_20375F8 +_080A0CB0: .4byte gPlttBufferFaded _080A0CB4: movs r1, 0 strh r1, [r4, 0xE] @@ -431,7 +431,7 @@ _080A0D72: movs r1, 0x10 movs r2, 0 bl BlendPalettes - ldr r1, _080A0DA4 @ =gUnknown_20375F8 + ldr r1, _080A0DA4 @ =gPlttBufferFaded movs r0, 0 strh r0, [r1] _080A0D88: @@ -449,7 +449,7 @@ _080A0D88: bne _080A0DD0 b _080A0DCA .align 2, 0 -_080A0DA4: .4byte gUnknown_20375F8 +_080A0DA4: .4byte gPlttBufferFaded _080A0DA8: movs r1, 0x80 lsls r1, 6 diff --git a/asm/player_pc.s b/asm/player_pc.s index a113049c4..ed594cb59 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -621,7 +621,7 @@ sub_80EBB70: @ 80EBB70 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080EBBA4 @ =gUnknown_2037AB8 + ldr r0, _080EBBA4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -642,7 +642,7 @@ _080EBB9C: pop {r0} bx r0 .align 2, 0 -_080EBBA4: .4byte gUnknown_2037AB8 +_080EBBA4: .4byte gPaletteFade _080EBBA8: .4byte c2_exit_to_overworld_2_switch _080EBBAC: .4byte gUnknown_3005020 _080EBBB0: .4byte sub_80EBC0C @@ -802,7 +802,7 @@ sub_80EBCD8: @ 80EBCD8 lsls r0, 3 ldr r1, _080EBD0C @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _080EBD10 @ =gUnknown_2037AB8 + ldr r0, _080EBD10 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -820,7 +820,7 @@ _080EBD06: bx r0 .align 2, 0 _080EBD0C: .4byte gTasks+0x8 -_080EBD10: .4byte gUnknown_2037AB8 +_080EBD10: .4byte gPaletteFade _080EBD14: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80EBCD8 @@ -1127,7 +1127,7 @@ sub_80EBF40: @ 80EBF40 mov r10, r0 mov r4, r9 add r4, r10 - ldr r0, _080EBF98 @ =gUnknown_2037AB8 + ldr r0, _080EBF98 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1153,7 +1153,7 @@ sub_80EBF40: @ 80EBF40 b _080EBFEA .align 2, 0 _080EBF94: .4byte gTasks+0x8 -_080EBF98: .4byte gUnknown_2037AB8 +_080EBF98: .4byte gPaletteFade _080EBF9C: .4byte gUnknown_203AAC6 _080EBFA0: movs r0, 0x5 @@ -1431,7 +1431,7 @@ sub_80EC1D4: @ 80EC1D4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080EC21C @ =gUnknown_2037AB8 + ldr r0, _080EC21C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1462,7 +1462,7 @@ _080EC216: pop {r0} bx r0 .align 2, 0 -_080EC21C: .4byte gUnknown_2037AB8 +_080EC21C: .4byte gPaletteFade _080EC220: .4byte gSaveBlock1Ptr _080EC224: .4byte gUnknown_203AAC4 _080EC228: .4byte 0x00002cd0 @@ -1746,7 +1746,7 @@ sub_80EC444: @ 80EC444 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080EC470 @ =gUnknown_2037AB8 + ldr r0, _080EC470 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1762,7 +1762,7 @@ _080EC468: pop {r0} bx r0 .align 2, 0 -_080EC470: .4byte gUnknown_2037AB8 +_080EC470: .4byte gPaletteFade thumb_func_end sub_80EC444 thumb_func_start sub_80EC474 diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 280cda46d..3d3ca02ea 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -18,7 +18,7 @@ sub_81024C0: @ 81024C0 thumb_func_start sub_81024D4 sub_81024D4: @ 81024D4 push {lr} - ldr r0, _08102500 @ =gUnknown_2037AB8 + ldr r0, _08102500 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -35,7 +35,7 @@ _081024EC: bl BuildOamBuffer b _08102508 .align 2, 0 -_08102500: .4byte gUnknown_2037AB8 +_08102500: .4byte gPaletteFade _08102504: bl UpdatePaletteFade _08102508: @@ -194,7 +194,7 @@ _081025AE: movs r1, 0 movs r2, 0 bl ChangeBgY - ldr r2, _081026BC @ =gUnknown_2037AB8 + ldr r2, _081026BC @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -214,7 +214,7 @@ _081026AC: .4byte sub_81024C0 _081026B0: .4byte sub_810287C _081026B4: .4byte gUnknown_203ACF0 _081026B8: .4byte gUnknown_8451EE4 -_081026BC: .4byte gUnknown_2037AB8 +_081026BC: .4byte gPaletteFade _081026C0: .4byte gUnknown_84406E0 _081026C4: ldr r0, _08102758 @ =gUnknown_84404C8 @@ -354,7 +354,7 @@ _081027D4: movs r0, 0 b _0810284C _081027D8: - ldr r0, _081027E8 @ =gUnknown_2037AB8 + ldr r0, _081027E8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -363,7 +363,7 @@ _081027D8: movs r0, 0x2 b _081027D2 .align 2, 0 -_081027E8: .4byte gUnknown_2037AB8 +_081027E8: .4byte gPaletteFade _081027EC: bl UpdatePaletteFade b _081027D4 @@ -549,7 +549,7 @@ _08102964: bl ShowBg movs r0, 0 bl ShowBg - ldr r2, _081029A4 @ =gUnknown_2037AB8 + ldr r2, _081029A4 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x80 ands r0, r1 @@ -568,7 +568,7 @@ _08102964: bl BeginNormalPaletteFade b _081029BC .align 2, 0 -_081029A4: .4byte gUnknown_2037AB8 +_081029A4: .4byte gPaletteFade _081029A8: .4byte 0x0000ffff _081029AC: ldr r0, _081029C4 @ =0xffff7fff @@ -5856,7 +5856,7 @@ _08105506: .align 2, 0 _08105524: .4byte 0x00007fff _08105528: - ldr r2, _08105554 @ =gUnknown_2037AB8 + ldr r2, _08105554 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -5875,10 +5875,10 @@ _08105528: adds r0, 0x1 b _0810557A .align 2, 0 -_08105554: .4byte gUnknown_2037AB8 +_08105554: .4byte gPaletteFade _08105558: .4byte gUnknown_203ACF0 _0810555C: - ldr r2, _08105588 @ =gUnknown_2037AB8 + ldr r2, _08105588 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -5903,7 +5903,7 @@ _0810557E: pop {r1} bx r1 .align 2, 0 -_08105588: .4byte gUnknown_2037AB8 +_08105588: .4byte gPaletteFade _0810558C: .4byte 0x00007fff _08105590: .4byte gUnknown_203ACF0 thumb_func_end sub_81052D0 @@ -8765,7 +8765,7 @@ _08106C98: .align 2, 0 _08106CD0: .4byte gUnknown_203ACF0 _08106CD4: - ldr r2, _08106D10 @ =gUnknown_2037AB8 + ldr r2, _08106D10 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -8791,7 +8791,7 @@ _08106CD4: movs r0, 0x5 b _08106E68 .align 2, 0 -_08106D10: .4byte gUnknown_2037AB8 +_08106D10: .4byte gPaletteFade _08106D14: .4byte 0x0000ffff _08106D18: .4byte gUnknown_203ACF0 _08106D1C: diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index 9ebfd51bb..fa73d892f 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -580,7 +580,7 @@ _0811C9E0: strh r0, [r5] b _0811CA16 _0811C9E8: - ldr r0, _0811C9FC @ =gUnknown_2037AB8 + ldr r0, _0811C9FC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -593,7 +593,7 @@ _0811C9F4: strh r0, [r5] b _0811CA16 .align 2, 0 -_0811C9FC: .4byte gUnknown_2037AB8 +_0811C9FC: .4byte gPaletteFade _0811CA00: ldr r0, [r4, 0x4] bl SetMainCallback2 @@ -686,7 +686,7 @@ _0811CAAE: .align 2, 0 _0811CAD0: .4byte sub_811C6E8 _0811CAD4: - ldr r0, _0811CAF0 @ =gUnknown_2037AB8 + ldr r0, _0811CAF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -700,7 +700,7 @@ _0811CAD4: subs r1, 0xC b _0811CBC6 .align 2, 0 -_0811CAF0: .4byte gUnknown_2037AB8 +_0811CAF0: .4byte gPaletteFade _0811CAF4: adds r1, r5, 0 adds r1, 0x9E @@ -908,7 +908,7 @@ _0811CC7C: .align 2, 0 _0811CCA8: .4byte sub_811C6E8 _0811CCAC: - ldr r0, _0811CCBC @ =gUnknown_2037AB8 + ldr r0, _0811CCBC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -916,7 +916,7 @@ _0811CCAC: bne _0811CD5A b _0811CD2A .align 2, 0 -_0811CCBC: .4byte gUnknown_2037AB8 +_0811CCBC: .4byte gPaletteFade _0811CCC0: adds r0, r5, 0 adds r0, 0x9C @@ -977,7 +977,7 @@ _0811CD2A: .align 2, 0 _0811CD34: .4byte gMain _0811CD38: - ldr r0, _0811CD64 @ =gUnknown_2037AB8 + ldr r0, _0811CD64 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -996,7 +996,7 @@ _0811CD5A: pop {r0} bx r0 .align 2, 0 -_0811CD64: .4byte gUnknown_2037AB8 +_0811CD64: .4byte gPaletteFade thumb_func_end sub_811CBE4 thumb_func_start sub_811CD68 @@ -1073,7 +1073,7 @@ _0811CDD2: .align 2, 0 _0811CDFC: .4byte sub_811C6E8 _0811CE00: - ldr r0, _0811CE20 @ =gUnknown_2037AB8 + ldr r0, _0811CE20 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1090,7 +1090,7 @@ _0811CE16: strh r0, [r4] b _0811CE3E .align 2, 0 -_0811CE20: .4byte gUnknown_2037AB8 +_0811CE20: .4byte gPaletteFade _0811CE24: adds r1, r5, 0 adds r1, 0x9E @@ -1290,7 +1290,7 @@ _0811CFA8: .align 2, 0 _0811CFC4: .4byte sub_811C6E8 _0811CFC8: - ldr r0, _0811D010 @ =gUnknown_2037AB8 + ldr r0, _0811D010 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1323,7 +1323,7 @@ _0811D008: pop {r0} bx r0 .align 2, 0 -_0811D010: .4byte gUnknown_2037AB8 +_0811D010: .4byte gPaletteFade _0811D014: .4byte gUnknown_203B090 thumb_func_end sub_811CF88 @@ -2020,7 +2020,7 @@ _0811D546: strh r0, [r4] b _0811D594 _0811D57E: - ldr r0, _0811D590 @ =gUnknown_2037AB8 + ldr r0, _0811D590 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2029,7 +2029,7 @@ _0811D57E: movs r0, 0 b _0811D596 .align 2, 0 -_0811D590: .4byte gUnknown_2037AB8 +_0811D590: .4byte gPaletteFade _0811D594: movs r0, 0x1 _0811D596: diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 37a1eb75a..54abb5f87 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1731,7 +1731,7 @@ _0808C66E: .align 2, 0 _0808C67C: .4byte gUnknown_83CDA20 _0808C680: - ldr r0, _0808C6A4 @ =gUnknown_2037AB8 + ldr r0, _0808C6A4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1748,7 +1748,7 @@ _0808C69C: pop {r0} bx r0 .align 2, 0 -_0808C6A4: .4byte gUnknown_2037AB8 +_0808C6A4: .4byte gPaletteFade thumb_func_end c3_0808C39C thumb_func_start sub_808C6A8 @@ -12030,7 +12030,7 @@ _08091924: adds r1, r2 ldrb r1, [r1] lsls r1, 6 - ldr r2, _08091964 @ =gUnknown_2037278 + ldr r2, _08091964 @ =gPlttBufferUnfaded + 0x80 adds r1, r2 movs r2, 0x20 bl CpuSet @@ -12055,7 +12055,7 @@ _08091938: bx r0 .align 2, 0 _08091960: .4byte 0x000002d2 -_08091964: .4byte gUnknown_2037278 +_08091964: .4byte gPlttBufferUnfaded + 0x80 _08091968: .4byte gUnknown_20397B0 thumb_func_end sub_8091850 @@ -12786,7 +12786,7 @@ sub_8091EF0: @ 8091EF0 adds r1, r2, r3 ldrh r1, [r1] lsls r1, 1 - ldr r2, _08091F34 @ =gUnknown_20371F8 + ldr r2, _08091F34 @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x2 bl CpuSet @@ -12794,7 +12794,7 @@ sub_8091EF0: @ 8091EF0 .align 2, 0 _08091F2C: .4byte gUnknown_20397B0 _08091F30: .4byte gUnknown_83D29D0 -_08091F34: .4byte gUnknown_20371F8 +_08091F34: .4byte gPlttBufferUnfaded _08091F38: lsls r0, r1, 2 ldr r1, _08091F54 @ =gUnknown_83D29D0 @@ -12803,7 +12803,7 @@ _08091F38: adds r1, r2, r3 ldrh r1, [r1] lsls r1, 1 - ldr r2, _08091F5C @ =gUnknown_20371F8 + ldr r2, _08091F5C @ =gPlttBufferUnfaded adds r1, r2 movs r2, 0x2 bl CpuSet @@ -12813,7 +12813,7 @@ _08091F50: .align 2, 0 _08091F54: .4byte gUnknown_83D29D0 _08091F58: .4byte 0x0000071e -_08091F5C: .4byte gUnknown_20371F8 +_08091F5C: .4byte gPlttBufferUnfaded thumb_func_end sub_8091EF0 thumb_func_start sub_8091F60 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 03ede3f37..944273a90 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -463,7 +463,7 @@ _08134890: .align 2, 0 _081348A8: .4byte gUnknown_203B140 _081348AC: - ldr r0, _081348C8 @ =gUnknown_2037AB8 + ldr r0, _081348C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -476,7 +476,7 @@ _081348AC: adds r0, r2 b _08134AF6 .align 2, 0 -_081348C8: .4byte gUnknown_2037AB8 +_081348C8: .4byte gPaletteFade _081348CC: .4byte gUnknown_203B140 _081348D0: .4byte 0x00003270 _081348D4: @@ -803,7 +803,7 @@ _08134B60: _08134B80: .4byte gUnknown_203B140 _08134B84: .4byte 0x00003270 _08134B88: - ldr r0, _08134BA8 @ =gUnknown_2037AB8 + ldr r0, _08134BA8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -819,7 +819,7 @@ _08134B9A: pop {r0} bx r0 .align 2, 0 -_08134BA8: .4byte gUnknown_2037AB8 +_08134BA8: .4byte gPaletteFade thumb_func_end sub_8134840 thumb_func_start sub_8134BAC @@ -9566,7 +9566,7 @@ _08139420: _0813943C: .4byte gUnknown_203B140 _08139440: .4byte 0x00003288 _08139444: - ldr r0, _08139460 @ =gUnknown_2037AB8 + ldr r0, _08139460 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9581,7 +9581,7 @@ _08139452: adds r1, r0 b _08139728 .align 2, 0 -_08139460: .4byte gUnknown_2037AB8 +_08139460: .4byte gPaletteFade _08139464: .4byte gUnknown_203B140 _08139468: .4byte 0x00003288 _0813946C: @@ -9926,7 +9926,7 @@ _08139738: .align 2, 0 _08139744: .4byte gUnknown_203B16D _08139748: - ldr r0, _08139764 @ =gUnknown_2037AB8 + ldr r0, _08139764 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9940,7 +9940,7 @@ _0813975A: pop {r0} bx r0 .align 2, 0 -_08139764: .4byte gUnknown_2037AB8 +_08139764: .4byte gPaletteFade thumb_func_end sub_81393D4 thumb_func_start sub_8139768 diff --git a/asm/quest_log.s b/asm/quest_log.s index 57e9611a2..2bfc14dd1 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,4654 +5,6 @@ .text - thumb_func_start sub_8110840 -sub_8110840: @ 8110840 - push {lr} - ldr r1, _08110888 @ =gSaveBlock1Ptr - ldr r1, [r1] - subs r1, r0 - ldr r2, _0811088C @ =gUnknown_203AE04 - ldr r0, [r2] - cmp r0, 0 - beq _08110854 - adds r0, r1 - str r0, [r2] -_08110854: - ldr r0, _08110890 @ =gUnknown_203ADFA - ldrb r2, [r0] - cmp r2, 0 - beq _08110882 - ldr r3, _08110894 @ =gUnknown_203AE08 - ldr r0, [r3] - cmp r0, 0 - beq _08110868 - adds r0, r1 - str r0, [r3] -_08110868: - cmp r2, 0x2 - bne _08110882 - ldr r2, _08110898 @ =gUnknown_203AE0C - movs r3, 0x1F -_08110870: - ldr r0, [r2] - cmp r0, 0 - beq _0811087A - adds r0, r1 - str r0, [r2] -_0811087A: - adds r2, 0x4 - subs r3, 0x1 - cmp r3, 0 - bge _08110870 -_08110882: - pop {r0} - bx r0 - .align 2, 0 -_08110888: .4byte gSaveBlock1Ptr -_0811088C: .4byte gUnknown_203AE04 -_08110890: .4byte gUnknown_203ADFA -_08110894: .4byte gUnknown_203AE08 -_08110898: .4byte gUnknown_203AE0C - thumb_func_end sub_8110840 - - thumb_func_start sub_811089C -sub_811089C: @ 811089C - push {lr} - ldr r0, _081108D8 @ =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - movs r2, 0xCD - lsls r2, 5 - movs r1, 0 - bl memset - ldr r0, _081108DC @ =gUnknown_203ADF8 - movs r1, 0 - strb r1, [r0] - ldr r0, _081108E0 @ =gUnknown_203ADFA - strb r1, [r0] - ldr r0, _081108E4 @ =gUnknown_203AE8C - movs r1, 0 - str r1, [r0] - ldr r0, _081108E8 @ =gUnknown_203AE08 - str r1, [r0] - ldr r0, _081108EC @ =gUnknown_203AE04 - str r1, [r0] - bl sub_8113BD8 - bl sub_81138F8 - pop {r0} - bx r0 - .align 2, 0 -_081108D8: .4byte gSaveBlock1Ptr -_081108DC: .4byte gUnknown_203ADF8 -_081108E0: .4byte gUnknown_203ADFA -_081108E4: .4byte gUnknown_203AE8C -_081108E8: .4byte gUnknown_203AE08 -_081108EC: .4byte gUnknown_203AE04 - thumb_func_end sub_811089C - - thumb_func_start sub_81108F0 -sub_81108F0: @ 81108F0 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08110918 @ =gSaveBlock1Ptr - ldr r1, [r1] - movs r2, 0xCD - lsls r2, 3 - muls r0, r2 - adds r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - movs r1, 0 - bl memset - ldr r1, _0811091C @ =gUnknown_203AE04 - movs r0, 0 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08110918: .4byte gSaveBlock1Ptr -_0811091C: .4byte gUnknown_203AE04 - thumb_func_end sub_81108F0 - - thumb_func_start sub_8110920 -sub_8110920: @ 8110920 - ldr r1, _08110928 @ =gUnknown_203AE04 - movs r0, 0 - str r0, [r1] - bx lr - .align 2, 0 -_08110928: .4byte gUnknown_203AE04 - thumb_func_end sub_8110920 - - thumb_func_start sub_811092C -sub_811092C: @ 811092C - push {lr} - ldr r0, _08110940 @ =gUnknown_203AE8C - ldr r0, [r0] - cmp r0, 0 - beq _0811093A - bl _call_via_r0 -_0811093A: - pop {r0} - bx r0 - .align 2, 0 -_08110940: .4byte gUnknown_203AE8C - thumb_func_end sub_811092C - - thumb_func_start sub_8110944 -sub_8110944: @ 8110944 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _08110978 @ =gSaveBlock1Ptr - ldr r0, _0811097C @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r3, 0xCD - lsls r3, 3 - adds r2, r0, 0 - muls r2, r3 - movs r0, 0x98 - lsls r0, 5 - adds r2, r0 - ldr r0, [r4] - adds r0, r2 - movs r4, 0xAD - lsls r4, 3 - adds r2, r0, r4 - adds r0, r3 - subs r0, r1 - cmp r5, r2 - bcc _08110972 - cmp r5, r0 - bls _08110980 -_08110972: - movs r0, 0 - b _08110982 - .align 2, 0 -_08110978: .4byte gSaveBlock1Ptr -_0811097C: .4byte gUnknown_203ADF8 -_08110980: - movs r0, 0x1 -_08110982: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8110944 - - thumb_func_start sub_8110988 -sub_8110988: @ 8110988 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _081109BC @ =gSaveBlock1Ptr - ldr r0, _081109C0 @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r3, 0xCD - lsls r3, 3 - adds r2, r0, 0 - muls r2, r3 - movs r0, 0x98 - lsls r0, 5 - adds r2, r0 - ldr r0, [r4] - adds r0, r2 - movs r4, 0xAD - lsls r4, 3 - adds r2, r0, r4 - adds r0, r3 - subs r0, r1 - cmp r5, r2 - bcc _081109B6 - cmp r5, r0 - bls _081109C4 -_081109B6: - movs r0, 0 - b _081109C6 - .align 2, 0 -_081109BC: .4byte gSaveBlock1Ptr -_081109C0: .4byte gUnknown_203ADF8 -_081109C4: - movs r0, 0x1 -_081109C6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8110988 - - thumb_func_start sub_81109CC -sub_81109CC: @ 81109CC - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _081109E0 @ =gUnknown_203ADFA - strb r0, [r1] - cmp r0, 0x1 - bne _081109EC - ldr r1, _081109E4 @ =gUnknown_203AE8C - ldr r0, _081109E8 @ =sub_8110A00 - b _081109F0 - .align 2, 0 -_081109E0: .4byte gUnknown_203ADFA -_081109E4: .4byte gUnknown_203AE8C -_081109E8: .4byte sub_8110A00 -_081109EC: - ldr r1, _081109F8 @ =gUnknown_203AE8C - ldr r0, _081109FC @ =sub_8110A3C -_081109F0: - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_081109F8: .4byte gUnknown_203AE8C -_081109FC: .4byte sub_8110A3C - thumb_func_end sub_81109CC - - thumb_func_start sub_8110A00 -sub_8110A00: @ 8110A00 - push {r4,lr} - ldr r0, _08110A2C @ =gUnknown_203AE98 - bl sub_8110E68 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08110A24 - ldr r0, _08110A30 @ =gUnknown_3005E88 - movs r4, 0 - strb r4, [r0] - bl sub_8110E3C - ldr r0, _08110A34 @ =gUnknown_203ADFA - strb r4, [r0] - ldr r1, _08110A38 @ =gUnknown_203AE8C - movs r0, 0 - str r0, [r1] -_08110A24: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08110A2C: .4byte gUnknown_203AE98 -_08110A30: .4byte gUnknown_3005E88 -_08110A34: .4byte gUnknown_203ADFA -_08110A38: .4byte gUnknown_203AE8C - thumb_func_end sub_8110A00 - - thumb_func_start sub_8110A3C -sub_8110A3C: @ 8110A3C - push {r4,lr} - ldr r1, _08110A8C @ =gUnknown_203AE94 - ldrb r2, [r1] - movs r4, 0xF - adds r0, r4, 0 - ands r0, r2 - adds r3, r1, 0 - cmp r0, 0x2 - bne _08110A56 - movs r0, 0x10 - negs r0, r0 - ands r0, r2 - strb r0, [r3] -_08110A56: - ldrb r1, [r3] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - bne _08110AAE - ldr r0, _08110A90 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - bne _08110A84 - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0x1 - beq _08110A84 - ldrb r0, [r3, 0x1] - cmp r0, 0x1F - bhi _08110A98 - ldr r0, _08110A94 @ =gUnknown_203AE0C - ldrb r1, [r3, 0x1] - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] - cmp r0, 0 - beq _08110A98 -_08110A84: - bl sub_8111AD8 - b _08110AAE - .align 2, 0 -_08110A8C: .4byte gUnknown_203AE94 -_08110A90: .4byte gUnknown_3005E88 -_08110A94: .4byte gUnknown_203AE0C -_08110A98: - ldrb r0, [r3] - movs r1, 0x3F - ands r1, r0 - movs r0, 0x80 - orrs r1, r0 - strb r1, [r3] - bl ScriptContext2_Enable - movs r0, 0 - bl sub_81118F4 -_08110AAE: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8110A3C - - thumb_func_start sub_8110AB4 -sub_8110AB4: @ 8110AB4 - ldr r0, _08110AC0 @ =gUnknown_20370D0 - ldr r1, _08110AC4 @ =gUnknown_203ADFA - ldrb r1, [r1] - strh r1, [r0] - bx lr - .align 2, 0 -_08110AC0: .4byte gUnknown_20370D0 -_08110AC4: .4byte gUnknown_203ADFA - thumb_func_end sub_8110AB4 - - thumb_func_start sub_8110AC8 -sub_8110AC8: @ 8110AC8 - ldr r0, _08110AE4 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _08110AE8 @ =gUnknown_203ADF8 - ldrb r2, [r0] - movs r0, 0xCD - lsls r0, 3 - muls r0, r2 - adds r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldrb r0, [r1] - bx lr - .align 2, 0 -_08110AE4: .4byte gSaveBlock1Ptr -_08110AE8: .4byte gUnknown_203ADF8 - thumb_func_end sub_8110AC8 - - thumb_func_start sub_8110AEC -sub_8110AEC: @ 8110AEC - push {r4-r7,lr} - lsls r0, 16 - lsrs r6, r0, 16 - ldr r4, _08110B44 @ =gUnknown_203ADF8 - ldrb r0, [r4] - cmp r0, 0x3 - bls _08110AFE - movs r0, 0 - strb r0, [r4] -_08110AFE: - ldrb r0, [r4] - bl sub_81108F0 - bl sub_8113B88 - ldr r2, _08110B48 @ =gUnknown_203AE08 - ldr r1, _08110B4C @ =gSaveBlock1Ptr - ldrb r0, [r4] - movs r3, 0xCD - lsls r3, 3 - muls r0, r3 - movs r5, 0x98 - lsls r5, 5 - adds r0, r5 - ldr r1, [r1] - adds r0, r1, r0 - movs r7, 0xAD - lsls r7, 3 - adds r0, r7 - str r0, [r2] - adds r0, r6, 0 - subs r0, 0xC - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7 - bls _08110B36 - cmp r6, 0x23 - bne _08110B50 -_08110B36: - ldrb r0, [r4] - muls r0, r3 - adds r0, r1, r0 - adds r0, r5 - movs r1, 0x2 - b _08110B5A - .align 2, 0 -_08110B44: .4byte gUnknown_203ADF8 -_08110B48: .4byte gUnknown_203AE08 -_08110B4C: .4byte gSaveBlock1Ptr -_08110B50: - ldrb r0, [r4] - muls r0, r3 - adds r0, r1, r0 - adds r0, r5 - movs r1, 0x1 -_08110B5A: - strb r1, [r0] - bl sub_81115E8 - ldr r4, _08110BA4 @ =gUnknown_203ADF8 - ldrb r0, [r4] - bl sub_8110BB0 - ldrb r0, [r4] - bl sub_8110BE8 - bl sub_8110D94 - bl sub_8110E20 - ldrb r0, [r4] - bl sub_8110D48 - ldr r1, _08110BA8 @ =gUnknown_203ADFC - movs r0, 0 - strh r0, [r1] - ldr r4, _08110BAC @ =gUnknown_203AE98 - movs r2, 0x80 - lsls r2, 1 - movs r0, 0x2 - adds r1, r4, 0 - bl sub_8112940 - adds r0, r4, 0 - bl sub_8110E68 - movs r0, 0x1 - bl sub_81109CC - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110BA4: .4byte gUnknown_203ADF8 -_08110BA8: .4byte gUnknown_203ADFC -_08110BAC: .4byte gUnknown_203AE98 - thumb_func_end sub_8110AEC - - thumb_func_start sub_8110BB0 -sub_8110BB0: @ 8110BB0 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08110BE4 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldr r0, [r2] - adds r1, r0, r1 - ldrb r0, [r0, 0x4] - strb r0, [r1, 0x1] - ldr r0, [r2] - ldrb r0, [r0, 0x5] - strb r0, [r1, 0x2] - ldr r0, [r2] - ldrb r0, [r0, 0x6] - strb r0, [r1, 0x3] - ldr r2, [r2] - ldrh r0, [r2] - strh r0, [r1, 0x4] - ldrh r0, [r2, 0x2] - strh r0, [r1, 0x6] - bx lr - .align 2, 0 -_08110BE4: .4byte gSaveBlock1Ptr - thumb_func_end sub_8110BB0 - - thumb_func_start sub_8110BE8 -sub_8110BE8: @ 8110BE8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - ldr r4, _08110C54 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldr r1, [r4] - adds r7, r1, r0 - adds r0, r7, 0 - bl sub_815A008 - movs r6, 0 - mov r9, r4 - movs r2, 0x8D - lsls r2, 3 - mov r8, r2 - ldr r3, _08110C58 @ =0x0000046a - mov r10, r3 -_08110C1C: - mov r4, r9 - ldr r1, [r4] - lsls r2, r6, 1 - adds r0, r2, r6 - lsls r0, 3 - adds r1, r0 - ldr r0, _08110C5C @ =0x000008e4 - adds r1, r0 - ldrh r4, [r1] - movs r3, 0 - ldrsh r0, [r1, r3] - mov r12, r2 - cmp r0, 0 - bge _08110C64 - lsls r3, r6, 2 - adds r2, r7, r3 - negs r0, r0 - mov r4, r8 - adds r1, r2, r4 - strb r0, [r1] - ldr r0, _08110C60 @ =0x00000469 - adds r2, r0 - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] - b _08110C7C - .align 2, 0 -_08110C54: .4byte gSaveBlock1Ptr -_08110C58: .4byte 0x0000046a -_08110C5C: .4byte 0x000008e4 -_08110C60: .4byte 0x00000469 -_08110C64: - lsls r3, r6, 2 - adds r1, r7, r3 - mov r2, r8 - adds r0, r1, r2 - strb r4, [r0] - ldr r4, _08110CBC @ =0x00000469 - adds r1, r4 - ldrb r2, [r1] - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - strb r0, [r1] -_08110C7C: - adds r5, r3, 0 - mov r1, r9 - ldr r0, [r1] - mov r2, r12 - adds r1, r2, r6 - lsls r1, 3 - adds r0, r1 - ldr r3, _08110CC0 @ =0x000008e6 - adds r1, r0, r3 - ldrh r2, [r1] - movs r4, 0 - ldrsh r0, [r1, r4] - cmp r0, 0 - bge _08110CC8 - adds r3, r7, r5 - adds r1, r0, 0 - negs r1, r1 - lsls r1, 24 - mov r2, r8 - adds r4, r3, r2 - lsrs r1, 15 - ldr r0, [r4] - ldr r2, _08110CC4 @ =0xfffe01ff - ands r0, r2 - orrs r0, r1 - str r0, [r4] - add r3, r10 - ldrb r0, [r3] - movs r1, 0x2 - orrs r0, r1 - b _08110CE6 - .align 2, 0 -_08110CBC: .4byte 0x00000469 -_08110CC0: .4byte 0x000008e6 -_08110CC4: .4byte 0xfffe01ff -_08110CC8: - adds r3, r7, r5 - lsls r2, 24 - mov r0, r8 - adds r4, r3, r0 - lsrs r2, 15 - ldr r0, [r4] - ldr r1, _08110D38 @ =0xfffe01ff - ands r0, r1 - orrs r0, r2 - str r0, [r4] - add r3, r10 - ldrb r1, [r3] - movs r0, 0x3 - negs r0, r0 - ands r0, r1 -_08110CE6: - strb r0, [r3] - adds r5, r7, r5 - mov r1, r9 - ldr r0, [r1] - mov r2, r12 - adds r3, r2, r6 - lsls r3, 3 - adds r0, r3 - ldr r4, _08110D3C @ =0x000008e8 - adds r0, r4 - ldrb r1, [r0] - mov r0, r10 - adds r4, r5, r0 - lsls r1, 2 - ldrb r2, [r4] - movs r0, 0x3 - ands r0, r2 - orrs r0, r1 - strb r0, [r4] - mov r1, r9 - ldr r0, [r1] - adds r0, r3 - ldr r2, _08110D40 @ =0x000008e9 - adds r0, r2 - ldrb r0, [r0] - ldr r3, _08110D44 @ =0x0000046b - adds r5, r3 - strb r0, [r5] - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x3F - bhi _08110D2A - b _08110C1C -_08110D2A: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110D38: .4byte 0xfffe01ff -_08110D3C: .4byte 0x000008e8 -_08110D40: .4byte 0x000008e9 -_08110D44: .4byte 0x0000046b - thumb_func_end sub_8110BE8 - - thumb_func_start sub_8110D48 -sub_8110D48: @ 8110D48 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r4, _08110D90 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldr r0, [r4] - adds r5, r0, r1 - movs r1, 0xEE - lsls r1, 4 - adds r0, r1 - movs r2, 0xA4 - lsls r2, 1 - adds r1, r5, r2 - movs r2, 0x90 - bl CpuSet - ldr r0, [r4] - movs r1, 0x80 - lsls r1, 5 - adds r0, r1 - movs r2, 0x9A - lsls r2, 2 - adds r1, r5, r2 - movs r2, 0x80 - lsls r2, 1 - bl CpuSet - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08110D90: .4byte gSaveBlock1Ptr - thumb_func_end sub_8110D48 - - thumb_func_start sub_8110D94 -sub_8110D94: @ 8110D94 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - movs r4, 0 - ldr r0, _08110E14 @ =gSaveBlock1Ptr - mov r10, r0 - ldr r1, _08110E18 @ =0x0000063a - mov r9, r1 - movs r2, 0x1 - mov r8, r2 -_08110DAE: - lsls r1, r4, 1 - mov r7, sp - adds r2, r7, r1 - movs r0, 0 - strh r0, [r2] - movs r3, 0 - adds r6, r1, 0 - adds r0, r4, 0x1 - str r0, [sp, 0x8] - mov r1, r10 - ldr r0, [r1] - mov r7, r9 - adds r5, r0, r7 - lsls r1, r4, 4 -_08110DCA: - adds r0, r1, r3 - adds r0, r5, r0 - ldrb r0, [r0] - cmp r0, 0 - beq _08110DDE - mov r0, r8 - lsls r0, r3 - ldrh r7, [r2] - adds r0, r7 - strh r0, [r2] -_08110DDE: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0xF - bls _08110DCA - ldr r1, _08110E1C @ =0x000040aa - adds r0, r4, r1 - lsls r0, 16 - lsrs r0, 16 - mov r2, sp - adds r1, r2, r6 - ldrh r1, [r1] - bl VarSet - ldr r7, [sp, 0x8] - lsls r0, r7, 16 - lsrs r4, r0, 16 - cmp r4, 0x3 - bls _08110DAE - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110E14: .4byte gSaveBlock1Ptr -_08110E18: .4byte 0x0000063a -_08110E1C: .4byte 0x000040aa - thumb_func_end sub_8110D94 - - thumb_func_start sub_8110E20 -sub_8110E20: @ 8110E20 - push {lr} - ldr r0, _08110E34 @ =0x000040ae - ldr r1, _08110E38 @ =gSaveBlock1Ptr - ldr r1, [r1] - ldrh r1, [r1, 0x32] - bl VarSet - pop {r0} - bx r0 - .align 2, 0 -_08110E34: .4byte 0x000040ae -_08110E38: .4byte gSaveBlock1Ptr - thumb_func_end sub_8110E20 - - thumb_func_start sub_8110E3C -sub_8110E3C: @ 8110E3C - push {lr} - ldr r0, _08110E60 @ =gUnknown_203AE08 - ldr r0, [r0] - bl sub_8113BF4 - ldr r1, _08110E64 @ =gUnknown_203ADF8 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bls _08110E5A - movs r0, 0 - strb r0, [r1] -_08110E5A: - pop {r0} - bx r0 - .align 2, 0 -_08110E60: .4byte gUnknown_203AE08 -_08110E64: .4byte gUnknown_203ADF8 - thumb_func_end sub_8110E3C - - thumb_func_start sub_8110E68 -sub_8110E68: @ 8110E68 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - ldr r0, _08110EA0 @ =gUnknown_203ADFC - ldrh r5, [r0] - ldr r0, _08110EA4 @ =gUnknown_203AF98 - mov r8, r0 - ldrh r0, [r0] - cmp r5, r0 - bcs _08110ECA - ldr r6, _08110EA8 @ =gUnknown_203AE08 -_08110E80: - ldr r4, [r6] - cmp r4, 0 - beq _08110F02 - lsls r0, r5, 3 - adds r1, r0, r7 - ldrb r2, [r1, 0x6] - adds r3, r0, 0 - cmp r2, 0x1 - bgt _08110EAC - cmp r2, 0 - blt _08110EAC - adds r0, r4, 0 - bl sub_8113D48 - b _08110EB4 - .align 2, 0 -_08110EA0: .4byte gUnknown_203ADFC -_08110EA4: .4byte gUnknown_203AF98 -_08110EA8: .4byte gUnknown_203AE08 -_08110EAC: - ldr r0, [r6] - adds r1, r7, r3 - bl sub_8113CC8 -_08110EB4: - str r0, [r6] - ldr r1, [r6] - cmp r1, 0 - beq _08110EEC - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r0, _08110EE0 @ =gUnknown_203AF98 - ldrh r0, [r0] - cmp r5, r0 - bcc _08110E80 -_08110ECA: - ldr r0, _08110EE4 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - beq _08110EF8 - ldr r1, _08110EE8 @ =gUnknown_203ADFC - mov r2, r8 - ldrh r0, [r2] - strh r0, [r1] - movs r0, 0x1 - b _08110F04 - .align 2, 0 -_08110EE0: .4byte gUnknown_203AF98 -_08110EE4: .4byte gUnknown_3005E88 -_08110EE8: .4byte gUnknown_203ADFC -_08110EEC: - ldr r0, _08110EF4 @ =gUnknown_3005E88 - strb r1, [r0] - b _08110F02 - .align 2, 0 -_08110EF4: .4byte gUnknown_3005E88 -_08110EF8: - ldr r4, _08110F10 @ =gUnknown_203AE08 - ldr r0, [r4] - bl sub_8113BF4 - str r0, [r4] -_08110F02: - movs r0, 0 -_08110F04: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08110F10: .4byte gUnknown_203AE08 - thumb_func_end sub_8110E68 - - thumb_func_start sub_8110F14 -sub_8110F14: @ 8110F14 - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_811381C - ldr r1, _08110F6C @ =gUnknown_203ADF9 - movs r0, 0 - strb r0, [r1] - movs r2, 0 - ldr r0, _08110F70 @ =gSaveBlock1Ptr - ldr r5, [r0] - movs r7, 0xCD - lsls r7, 3 - movs r6, 0x98 - lsls r6, 5 -_08110F32: - adds r0, r2, 0 - muls r0, r7 - adds r0, r5, r0 - adds r0, r6 - ldrb r0, [r0] - ldr r3, _08110F6C @ =gUnknown_203ADF9 - cmp r0, 0 - beq _08110F48 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08110F48: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3 - bls _08110F32 - ldrb r0, [r3] - cmp r0, 0 - beq _08110F78 - ldr r1, _08110F74 @ =gUnknown_3005ECC - movs r0, 0 - strb r0, [r1] - adds r0, r4, 0 - bl sub_8110F90 - adds r0, r4, 0 - bl DestroyTask - b _08110F84 - .align 2, 0 -_08110F6C: .4byte gUnknown_203ADF9 -_08110F70: .4byte gSaveBlock1Ptr -_08110F74: .4byte gUnknown_3005ECC -_08110F78: - ldr r0, _08110F8C @ =sub_8056938 - bl SetMainCallback2 - adds r0, r4, 0 - bl DestroyTask -_08110F84: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110F8C: .4byte sub_8056938 - thumb_func_end sub_8110F14 - - thumb_func_start sub_8110F90 -sub_8110F90: @ 8110F90 - push {lr} - ldr r1, _08110FC0 @ =gSaveBlock1Ptr - ldr r2, [r1] - movs r3, 0 - movs r0, 0x3 - strb r0, [r2, 0x4] - ldr r2, [r1] - movs r0, 0x13 - strb r0, [r2, 0x5] - ldr r1, [r1] - movs r0, 0xFF - strb r0, [r1, 0x6] - ldr r0, _08110FC4 @ =gUnknown_203ADF8 - strb r3, [r0] - ldr r1, _08110FC8 @ =gUnknown_2031DD8 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x1 - bl sub_8082740 - bl sub_8111368 - pop {r0} - bx r0 - .align 2, 0 -_08110FC0: .4byte gSaveBlock1Ptr -_08110FC4: .4byte gUnknown_203ADF8 -_08110FC8: .4byte gUnknown_2031DD8 - thumb_func_end sub_8110F90 - - thumb_func_start sub_8110FCC -sub_8110FCC: @ 8110FCC - push {r4,r5,lr} - ldr r5, _08110FF8 @ =gUnknown_203ADF8 - ldrb r0, [r5] - ldr r4, _08110FFC @ =gUnknown_203AE98 - adds r1, r4, 0 - bl sub_811175C - bl sub_8113B88 - movs r2, 0x80 - lsls r2, 1 - movs r0, 0x1 - adds r1, r4, 0 - bl sub_8112940 - ldrb r0, [r5] - bl sub_8111150 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08110FF8: .4byte gUnknown_203ADF8 -_08110FFC: .4byte gUnknown_203AE98 - thumb_func_end sub_8110FCC - - thumb_func_start sub_8111000 -sub_8111000: @ 8111000 - push {lr} - movs r0, 0x4 - bl stdpal_get - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0x2 - bl sub_81109CC - bl sub_807DF64 - ldr r2, _08111034 @ =gUnknown_203AE94 - movs r0, 0 - str r0, [r2] - ldrb r1, [r2] - subs r0, 0x10 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x1 - pop {r1} - bx r1 - .align 2, 0 -_08111034: .4byte gUnknown_203AE94 - thumb_func_end sub_8111000 - - thumb_func_start sub_8111038 -sub_8111038: @ 8111038 - push {lr} - movs r0, 0x4 - bl stdpal_get - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0x2 - bl sub_81109CC - bl sub_807DF7C - ldr r2, _0811106C @ =gUnknown_203AE94 - movs r0, 0 - str r0, [r2] - ldrb r1, [r2] - subs r0, 0x10 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x1 - pop {r1} - bx r1 - .align 2, 0 -_0811106C: .4byte gUnknown_203AE94 - thumb_func_end sub_8111038 - - thumb_func_start sub_8111070 -sub_8111070: @ 8111070 - push {r4-r7,lr} - sub sp, 0x14 - lsls r0, 24 - lsrs r7, r0, 24 - movs r5, 0 -_0811107A: - lsls r4, r5, 3 - ldr r0, _0811111C @ =gUnknown_845661C - adds r4, r0 - adds r0, r4, 0 - bl AddWindow - ldr r6, _08111120 @ =gUnknown_203ADFE - adds r1, r5, r6 - strb r0, [r1] - ldrb r0, [r1] - ldrb r1, [r4, 0x3] - lsls r1, 3 - str r1, [sp] - ldrb r1, [r4, 0x4] - lsls r1, 3 - str r1, [sp, 0x4] - movs r1, 0xF - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _0811107A - ldr r5, _08111124 @ =gStringVar4 - ldr r1, _08111128 @ =gUnknown_841A155 - adds r0, r5, 0 - bl StringExpandPlaceholders - cmp r7, 0 - beq _081110D2 - ldr r4, _0811112C @ =gStringVar1 - adds r0, r4, 0 - adds r1, r7, 0 - movs r2, 0 - movs r3, 0x1 - bl ConvertIntToDecimalStringN - adds r0, r5, 0 - adds r1, r4, 0 - bl StringAppend -_081110D2: - ldrb r0, [r6] - movs r1, 0x1 - str r1, [sp] - movs r1, 0x2 - str r1, [sp, 0x4] - ldr r1, _08111130 @ =gUnknown_8456634 - str r1, [sp, 0x8] - movs r1, 0 - str r1, [sp, 0xC] - str r5, [sp, 0x10] - movs r1, 0x2 - movs r2, 0x2 - movs r3, 0x2 - bl AddTextPrinterParametrized2 - ldrb r0, [r6] - bl PutWindowTilemap - ldrb r0, [r6, 0x1] - bl PutWindowTilemap - ldrb r0, [r6] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r6, 0x2] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r6, 0x1] - movs r1, 0x3 - bl CopyWindowToVram - add sp, 0x14 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811111C: .4byte gUnknown_845661C -_08111120: .4byte gUnknown_203ADFE -_08111124: .4byte gStringVar4 -_08111128: .4byte gUnknown_841A155 -_0811112C: .4byte gStringVar1 -_08111130: .4byte gUnknown_8456634 - thumb_func_end sub_8111070 - - thumb_func_start sub_8111134 -sub_8111134: @ 8111134 - push {r4,lr} - ldr r4, _0811114C @ =gUnknown_203ADFE - ldrb r0, [r4, 0x1] - bl PutWindowTilemap - ldrb r0, [r4, 0x1] - movs r1, 0x1 - bl CopyWindowToVram - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0811114C: .4byte gUnknown_203ADFE - thumb_func_end sub_8111134 - - thumb_func_start sub_8111150 -sub_8111150: @ 8111150 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _081111A8 @ =gSaveBlock1Ptr - movs r1, 0xCD - lsls r1, 3 - muls r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldr r1, [r2] - adds r5, r1, r0 - movs r4, 0 - mov r9, r2 - mov r6, r9 - movs r2, 0x8D - lsls r2, 3 - mov r12, r2 - ldr r7, _081111AC @ =0x000008e4 - mov r8, r7 -_08111180: - lsls r0, r4, 2 - adds r3, r5, r0 - ldr r2, _081111B0 @ =0x00000469 - adds r1, r3, r2 - ldrb r1, [r1] - lsls r1, 31 - mov r10, r0 - cmp r1, 0 - beq _081111B4 - ldr r1, [r6] - lsls r2, r4, 1 - adds r0, r2, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r3, r7 - ldrb r0, [r0] - negs r0, r0 - b _081111C4 - .align 2, 0 -_081111A8: .4byte gSaveBlock1Ptr -_081111AC: .4byte 0x000008e4 -_081111B0: .4byte 0x00000469 -_081111B4: - ldr r1, [r6] - lsls r2, r4, 1 - adds r0, r2, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r3, r7 - ldrb r0, [r0] -_081111C4: - add r1, r8 - strh r0, [r1] - adds r3, r2, 0 - mov r0, r10 - adds r2, r5, r0 - ldr r1, _081111F0 @ =0x0000046a - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 30 - cmp r0, 0 - bge _081111F4 - ldr r1, [r6] - adds r0, r3, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r2, r7 - ldr r0, [r0] - lsls r0, 15 - lsrs r0, 24 - negs r0, r0 - b _08111206 - .align 2, 0 -_081111F0: .4byte 0x0000046a -_081111F4: - ldr r1, [r6] - adds r0, r3, r4 - lsls r0, 3 - adds r1, r0 - mov r7, r12 - adds r0, r2, r7 - ldr r0, [r0] - lsls r0, 15 - lsrs r0, 24 -_08111206: - ldr r2, _08111260 @ =0x000008e6 - adds r1, r2 - strh r0, [r1] - ldr r1, [r6] - adds r3, r4 - lsls r3, 3 - adds r1, r3 - mov r7, r10 - adds r2, r5, r7 - ldr r7, _08111264 @ =0x0000046a - adds r0, r2, r7 - ldrb r0, [r0] - lsrs r0, 2 - ldr r7, _08111268 @ =0x000008e8 - adds r1, r7 - strb r0, [r1] - ldr r0, [r6] - adds r0, r3 - ldr r1, _0811126C @ =0x0000046b - adds r2, r1 - ldrb r1, [r2] - ldr r2, _08111270 @ =0x000008e9 - adds r0, r2 - strb r1, [r0] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x3F - bls _08111180 - mov r7, r9 - ldr r1, [r7] - movs r0, 0x8E - lsls r0, 4 - adds r1, r0 - adds r0, r5, 0 - bl sub_815A1F8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08111260: .4byte 0x000008e6 -_08111264: .4byte 0x0000046a -_08111268: .4byte 0x000008e8 -_0811126C: .4byte 0x0000046b -_08111270: .4byte 0x000008e9 - thumb_func_end sub_8111150 - - thumb_func_start sub_8111274 -sub_8111274: @ 8111274 - push {r4,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - cmp r1, 0 - bne _081112D4 - ldr r3, _081112C8 @ =gSaveBlock1Ptr - ldr r2, [r3] - movs r0, 0xCD - lsls r0, 3 - adds r1, r4, 0 - muls r1, r0 - adds r0, r2, r1 - ldr r4, _081112CC @ =0x00001301 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2, 0x4] - ldr r2, [r3] - adds r0, r2, r1 - adds r4, 0x1 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2, 0x5] - ldr r2, [r3] - adds r0, r2, r1 - adds r4, 0x1 - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2, 0x6] - ldr r2, [r3] - adds r1, r2, r1 - ldr r3, _081112D0 @ =0x00001304 - adds r0, r1, r3 - ldrh r0, [r0] - strh r0, [r2] - adds r4, 0x3 - adds r1, r4 - ldrh r0, [r1] - strh r0, [r2, 0x2] - b _08111336 - .align 2, 0 -_081112C8: .4byte gSaveBlock1Ptr -_081112CC: .4byte 0x00001301 -_081112D0: .4byte 0x00001304 -_081112D4: - ldr r0, _08111340 @ =gSaveBlock1Ptr - ldr r3, [r0] - movs r0, 0xCD - lsls r0, 3 - muls r0, r4 - adds r3, r0 - ldr r1, _08111344 @ =0x00001301 - adds r0, r3, r1 - ldrb r2, [r0] - ldr r0, _08111348 @ =0xffffff00 - ldr r1, [sp] - ands r1, r0 - orrs r1, r2 - str r1, [sp] - ldr r2, _0811134C @ =0x00001302 - adds r0, r3, r2 - ldrb r0, [r0] - lsls r0, 8 - ldr r2, _08111350 @ =0xffff00ff - ands r2, r1 - orrs r2, r0 - str r2, [sp] - ldr r4, _08111354 @ =0x00001303 - adds r0, r3, r4 - ldrb r1, [r0] - lsls r1, 16 - ldr r0, _08111358 @ =0xff00ffff - ands r0, r2 - orrs r0, r1 - str r0, [sp] - ldr r1, _0811135C @ =0x00001304 - adds r0, r3, r1 - ldrh r1, [r0] - ldr r0, _08111360 @ =0xffff0000 - ldr r2, [sp, 0x4] - ands r2, r0 - orrs r2, r1 - str r2, [sp, 0x4] - adds r4, 0x3 - adds r3, r4 - ldrh r1, [r3] - lsls r1, 16 - ldr r0, _08111364 @ =0x0000ffff - ands r0, r2 - orrs r0, r1 - str r0, [sp, 0x4] - mov r0, sp - bl sub_8055D5C -_08111336: - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111340: .4byte gSaveBlock1Ptr -_08111344: .4byte 0x00001301 -_08111348: .4byte 0xffffff00 -_0811134C: .4byte 0x00001302 -_08111350: .4byte 0xffff00ff -_08111354: .4byte 0x00001303 -_08111358: .4byte 0xff00ffff -_0811135C: .4byte 0x00001304 -_08111360: .4byte 0xffff0000 -_08111364: .4byte 0x0000ffff - thumb_func_end sub_8111274 - - thumb_func_start sub_8111368 -sub_8111368: @ 8111368 - push {lr} - ldr r1, _081113A0 @ =gUnknown_203ADFA - movs r0, 0x2 - strb r0, [r1] - bl sub_806E6FC - bl sub_809A2DC - bl sub_809A2A4 - bl sub_8110AC8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081113B4 - ldr r0, _081113A4 @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r1, 0 - bl sub_8111274 - ldr r1, _081113A8 @ =gUnknown_3005024 - ldr r0, _081113AC @ =sub_8111038 - str r0, [r1] - ldr r0, _081113B0 @ =sub_80572A8 - bl SetMainCallback2 - b _081113CE - .align 2, 0 -_081113A0: .4byte gUnknown_203ADFA -_081113A4: .4byte gUnknown_203ADF8 -_081113A8: .4byte gUnknown_3005024 -_081113AC: .4byte sub_8111038 -_081113B0: .4byte sub_80572A8 -_081113B4: - ldr r0, _081113D4 @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r1, 0x1 - bl sub_8111274 - bl warp_in - ldr r1, _081113D8 @ =gUnknown_3005024 - ldr r0, _081113DC @ =sub_8111000 - str r0, [r1] - ldr r0, _081113E0 @ =sub_805726C - bl SetMainCallback2 -_081113CE: - pop {r0} - bx r0 - .align 2, 0 -_081113D4: .4byte gUnknown_203ADF8 -_081113D8: .4byte gUnknown_3005024 -_081113DC: .4byte sub_8111000 -_081113E0: .4byte sub_805726C - thumb_func_end sub_8111368 - - thumb_func_start sub_81113E4 -sub_81113E4: @ 81113E4 - push {r4,r5,lr} - ldr r4, _08111430 @ =gSaveBlock1Ptr - ldr r0, _08111434 @ =gUnknown_203ADF8 - ldrb r1, [r0] - movs r0, 0xCD - lsls r0, 3 - muls r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldr r1, [r4] - adds r5, r1, r0 - movs r2, 0xA4 - lsls r2, 1 - adds r0, r5, r2 - movs r2, 0xEE - lsls r2, 4 - adds r1, r2 - movs r2, 0x90 - bl CpuSet - movs r1, 0x9A - lsls r1, 2 - adds r0, r5, r1 - ldr r1, [r4] - movs r2, 0x80 - lsls r2, 5 - adds r1, r2 - movs r2, 0x80 - lsls r2, 1 - bl CpuSet - bl sub_8111688 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111430: .4byte gSaveBlock1Ptr -_08111434: .4byte gUnknown_203ADF8 - thumb_func_end sub_81113E4 - - thumb_func_start sub_8111438 -sub_8111438: @ 8111438 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - movs r0, 0x68 - bl AllocZeroed - mov r9, r0 - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - str r0, [sp, 0x8] - str r0, [sp, 0xC] - mov r0, r9 - movs r1, 0x13 - movs r2, 0x1 - movs r3, 0x20 - bl CreateMon - ldr r0, _081114BC @ =0x00004027 - bl VarGet - lsls r0, 16 - lsrs r1, r0, 28 - mov r6, r9 - adds r6, 0x64 - strh r1, [r6] - lsls r0, 4 - lsrs r0, 20 - mov r4, r9 - adds r4, 0x66 - strh r0, [r4] - bl sub_8111618 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r0, [r6] - cmp r5, r0 - bls _081114C4 - movs r3, 0 - subs r0, r5, r0 - mov r8, r4 - cmp r3, r0 - bge _0811150E -_08111492: - movs r0, 0x5 - subs r0, r3 - movs r1, 0x64 - muls r0, r1 - ldr r1, _081114C0 @ =gPlayerParty - adds r0, r1 - str r3, [sp, 0x10] - bl ZeroMonData - ldr r3, [sp, 0x10] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - mov r0, r9 - adds r0, 0x64 - ldrh r0, [r0] - subs r0, r5, r0 - cmp r3, r0 - blt _08111492 - b _0811150E - .align 2, 0 -_081114BC: .4byte 0x00004027 -_081114C0: .4byte gPlayerParty -_081114C4: - mov r8, r4 - cmp r5, r0 - bcs _0811150E - movs r3, 0 - adds r4, r6, 0 -_081114CE: - lsls r1, r3, 24 - lsrs r1, 24 - movs r0, 0 - str r3, [sp, 0x10] - bl sub_808BCB4 - ldr r3, [sp, 0x10] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x4 - bls _081114CE - adds r3, r5, 0 - ldrh r0, [r4] - cmp r3, r0 - bcs _0811150E -_081114EE: - movs r0, 0x64 - muls r0, r3 - ldr r1, _08111574 @ =gPlayerParty - adds r0, r1 - mov r1, r9 - movs r2, 0x64 - str r3, [sp, 0x10] - bl CopyMon - ldr r3, [sp, 0x10] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - ldrh r1, [r4] - cmp r3, r1 - bcc _081114EE -_0811150E: - bl sub_811164C - lsls r0, 16 - lsrs r5, r0, 16 - mov r1, r8 - ldrh r0, [r1] - cmp r5, r0 - bls _08111578 - movs r3, 0 -_08111520: - movs r6, 0 - lsls r7, r3, 24 - lsrs r7, 24 -_08111526: - lsls r0, r6, 24 - lsrs r4, r0, 24 - adds r0, r7, 0 - adds r1, r4, 0 - movs r2, 0x5 - str r3, [sp, 0x10] - bl GetBoxMonDataFromAnyBox - ldr r3, [sp, 0x10] - cmp r0, 0 - beq _08111554 - adds r0, r7, 0 - adds r1, r4, 0 - bl sub_808BCB4 - subs r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r3, [sp, 0x10] - mov r0, r8 - ldrh r0, [r0] - cmp r5, r0 - beq _081115D2 -_08111554: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x1D - bls _08111526 - mov r1, r8 - ldrh r1, [r1] - cmp r5, r1 - beq _081115D2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0xD - bls _08111520 - b _081115D2 - .align 2, 0 -_08111574: .4byte gPlayerParty -_08111578: - cmp r5, r0 - bcs _081115D2 - movs r3, 0 -_0811157E: - movs r6, 0 - lsls r7, r3, 24 -_08111582: - lsls r1, r6, 24 - lsrs r1, 24 - lsrs r0, r7, 24 - str r3, [sp, 0x10] - bl GetBoxedMonPtr - adds r4, r0, 0 - movs r1, 0x5 - bl GetBoxMonData - ldr r3, [sp, 0x10] - cmp r0, 0 - bne _081115B6 - adds r0, r4, 0 - mov r1, r9 - movs r2, 0x50 - bl CopyMon - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r3, [sp, 0x10] - mov r0, r8 - ldrh r0, [r0] - cmp r5, r0 - beq _081115D2 -_081115B6: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x1D - bls _08111582 - mov r1, r8 - ldrh r1, [r1] - cmp r5, r1 - beq _081115D2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0xD - bls _0811157E -_081115D2: - mov r0, r9 - bl Free - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8111438 - - thumb_func_start sub_81115E8 -sub_81115E8: @ 81115E8 - push {r4,lr} - bl sub_8111618 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - bl sub_811164C - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r0, _08111614 @ =0x00004027 - lsls r4, 12 - adds r1, r4 - lsls r1, 16 - lsrs r1, 16 - bl VarSet - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111614: .4byte 0x00004027 - thumb_func_end sub_81115E8 - - thumb_func_start sub_8111618 -sub_8111618: @ 8111618 - push {r4,r5,lr} - movs r5, 0 - movs r4, 0 -_0811161E: - movs r0, 0x64 - muls r0, r4 - ldr r1, _08111648 @ =gPlayerParty - adds r0, r1 - movs r1, 0x5 - bl GetMonData - cmp r0, 0 - beq _08111636 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_08111636: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x5 - bls _0811161E - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08111648: .4byte gPlayerParty - thumb_func_end sub_8111618 - - thumb_func_start sub_811164C -sub_811164C: @ 811164C - push {r4-r7,lr} - movs r6, 0 - movs r0, 0 -_08111652: - movs r4, 0 - lsls r5, r0, 24 - adds r7, r0, 0x1 -_08111658: - lsls r1, r4, 24 - lsrs r1, 24 - lsrs r0, r5, 24 - movs r2, 0x5 - bl GetBoxMonDataFromAnyBox - cmp r0, 0 - beq _0811166E - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_0811166E: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1D - bls _08111658 - lsls r0, r7, 16 - lsrs r0, 16 - cmp r0, 0xD - bls _08111652 - adds r0, r6, 0 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_811164C - - thumb_func_start sub_8111688 -sub_8111688: @ 8111688 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r5, 0 - ldr r0, _081116CC @ =gSaveBlock1Ptr - mov r8, r0 - ldr r7, _081116D0 @ =0x0000063a -_08111698: - ldr r1, _081116D4 @ =0x000040aa - adds r0, r5, r1 - lsls r0, 16 - lsrs r0, 16 - bl VarGet - lsls r1, r5, 1 - add r1, sp - strh r0, [r1] - movs r4, 0 - adds r6, r5, 0x1 - adds r3, r1, 0 - lsls r5, 4 -_081116B2: - ldrh r0, [r3] - movs r2, 0x1 - ands r2, r0 - cmp r2, 0 - beq _081116D8 - mov r1, r8 - ldr r0, [r1] - adds r1, r5, r4 - adds r0, r7 - adds r0, r1 - movs r1, 0x1E - strb r1, [r0] - b _081116E4 - .align 2, 0 -_081116CC: .4byte gSaveBlock1Ptr -_081116D0: .4byte 0x0000063a -_081116D4: .4byte 0x000040aa -_081116D8: - mov r1, r8 - ldr r0, [r1] - adds r1, r5, r4 - adds r0, r7 - adds r0, r1 - strb r2, [r0] -_081116E4: - ldrh r0, [r3] - lsrs r0, 1 - strh r0, [r3] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0xF - bls _081116B2 - lsls r0, r6, 16 - lsrs r5, r0, 16 - cmp r5, 0x3 - bls _08111698 - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8111688 - - thumb_func_start sub_8111708 -sub_8111708: @ 8111708 - push {r4,r5,lr} - sub sp, 0x1C - ldr r0, _08111754 @ =0x000040ae - bl VarGet - ldr r4, _08111758 @ =gSaveBlock1Ptr - ldr r1, [r4] - strh r0, [r1, 0x32] - lsls r0, 16 - cmp r0, 0 - bne _0811174A - movs r0, 0x4 - ldrsb r0, [r1, r0] - lsls r0, 16 - lsrs r0, 16 - ldrb r1, [r1, 0x5] - lsls r1, 24 - asrs r1, 24 - lsls r1, 16 - lsrs r1, 16 - bl get_mapheader_by_bank_and_number - mov r1, sp - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldr r0, [r0] - str r0, [r1] - ldr r1, [r4] - mov r0, sp - ldrh r0, [r0, 0x12] - strh r0, [r1, 0x32] -_0811174A: - add sp, 0x1C - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111754: .4byte 0x000040ae -_08111758: .4byte gSaveBlock1Ptr - thumb_func_end sub_8111708 - - thumb_func_start sub_811175C -sub_811175C: @ 811175C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - mov r8, r1 - lsls r0, 24 - lsrs r4, r0, 24 - movs r6, 0 - mov r9, r6 - movs r2, 0x80 - lsls r2, 1 - mov r0, r8 - movs r1, 0 - bl memset - movs r7, 0 - ldr r2, _081117B8 @ =gUnknown_203AE0C - movs r1, 0 -_08111780: - lsls r0, r7, 2 - adds r0, r2 - str r1, [r0] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x1F - bls _08111780 - ldr r1, _081117BC @ =gSaveBlock1Ptr - movs r0, 0xCD - lsls r0, 3 - muls r0, r4 - ldr r1, [r1] - adds r0, r1 - ldr r1, _081117C0 @ =0x00001868 - adds r4, r0, r1 - movs r7, 0 -_081117A2: - ldrh r0, [r4] - ldr r1, _081117C4 @ =0x00000fff - ands r1, r0 - cmp r1, 0x29 - bls _081117AE - b _081118AC -_081117AE: - lsls r0, r1, 2 - ldr r1, _081117C8 @ =_081117CC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081117B8: .4byte gUnknown_203AE0C -_081117BC: .4byte gSaveBlock1Ptr -_081117C0: .4byte 0x00001868 -_081117C4: .4byte 0x00000fff -_081117C8: .4byte _081117CC - .align 2, 0 -_081117CC: - .4byte _08111874 - .4byte _08111880 - .4byte _08111880 - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _081118AC - .4byte _0811188C - .4byte _081118AC - .4byte _08111898 -_08111874: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113D08 - b _081118A2 -_08111880: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113D94 - b _081118A2 -_0811188C: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113C20 - b _081118A2 -_08111898: - lsls r1, r6, 3 - add r1, r8 - adds r0, r4, 0 - bl sub_8113C8C -_081118A2: - adds r4, r0, 0 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - b _081118D2 -_081118AC: - mov r0, r9 - lsls r1, r0, 2 - ldr r5, _081118F0 @ =gUnknown_203AE0C - adds r1, r5 - adds r0, r4, 0 - bl sub_8113A78 - adds r4, r0, 0 - mov r1, r9 - cmp r1, 0 - bne _081118C8 - ldr r0, [r5] - bl sub_8113ABC -_081118C8: - mov r0, r9 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 -_081118D2: - cmp r4, 0 - beq _081118E2 - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x1F - bhi _081118E2 - b _081117A2 -_081118E2: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081118F0: .4byte gUnknown_203AE0C - thumb_func_end sub_811175C - - thumb_func_start sub_81118F4 -sub_81118F4: @ 81118F4 - push {lr} - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0x1 - bl fade_screen - ldr r1, _0811190C @ =gUnknown_203AE8C - ldr r0, _08111910 @ =sub_8111914 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0811190C: .4byte gUnknown_203AE8C -_08111910: .4byte sub_8111914 - thumb_func_end sub_81118F4 - - thumb_func_start sub_8111914 -sub_8111914: @ 8111914 - push {lr} - ldr r0, _08111960 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0811197A - bl ScriptContext2_Enable - ldr r1, _08111964 @ =gUnknown_203ADF8 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bhi _08111970 - ldr r0, _08111968 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r2, [r1] - movs r1, 0xCD - lsls r1, 3 - muls r1, r2 - adds r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _08111970 - ldr r1, _0811196C @ =gUnknown_203ADF9 - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - bl sub_8111368 - b _0811197A - .align 2, 0 -_08111960: .4byte gUnknown_2037AB8 -_08111964: .4byte gUnknown_203ADF8 -_08111968: .4byte gSaveBlock1Ptr -_0811196C: .4byte gUnknown_203ADF9 -_08111970: - ldr r1, _08111980 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] - bl sub_8111984 -_0811197A: - pop {r0} - bx r0 - .align 2, 0 -_08111980: .4byte gUnknown_3005E88 - thumb_func_end sub_8111914 - - thumb_func_start sub_8111984 -sub_8111984: @ 8111984 - push {lr} - bl sub_806E6FC - bl Save_ResetSaveCounters - movs r0, 0 - bl Save_LoadGameData - ldr r0, _081119B4 @ =sub_8057430 - bl SetMainCallback2 - ldr r1, _081119B8 @ =gUnknown_3005024 - ldr r0, _081119BC @ =sub_8111F60 - str r0, [r1] - bl FreeAllWindowBuffers - ldr r1, _081119C0 @ =gUnknown_203ADFA - movs r0, 0x3 - strb r0, [r1] - ldr r1, _081119C4 @ =gUnknown_203AE8C - movs r0, 0 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_081119B4: .4byte sub_8057430 -_081119B8: .4byte gUnknown_3005024 -_081119BC: .4byte sub_8111F60 -_081119C0: .4byte gUnknown_203ADFA -_081119C4: .4byte gUnknown_203AE8C - thumb_func_end sub_8111984 - - thumb_func_start sub_81119C8 -sub_81119C8: @ 81119C8 - push {lr} - bl sub_8111914 - pop {r0} - bx r0 - thumb_func_end sub_81119C8 - - thumb_func_start sub_81119D4 -sub_81119D4: @ 81119D4 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _081119E8 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x1 - beq _081119EC - cmp r0, 0x2 - beq _081119F2 - b _08111A2C - .align 2, 0 -_081119E8: .4byte gUnknown_203ADFA -_081119EC: - bl sub_8112364 - b _08111A2C -_081119F2: - ldr r1, _08111A20 @ =gUnknown_3005E88 - movs r0, 0x3 - strb r0, [r1] - ldr r0, _08111A24 @ =sub_8111A34 - movs r1, 0x50 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08111A28 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0 - strh r2, [r1, 0x8] - strh r2, [r1, 0xA] - movs r1, 0xE - adds r2, r4, 0 - bl SetWordTaskArg - movs r0, 0x1 - b _08111A2E - .align 2, 0 -_08111A20: .4byte gUnknown_3005E88 -_08111A24: .4byte sub_8111A34 -_08111A28: .4byte gTasks -_08111A2C: - movs r0, 0 -_08111A2E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81119D4 - - thumb_func_start sub_8111A34 -sub_8111A34: @ 8111A34 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _08111A54 @ =gTasks+0x8 - adds r4, r0, r1 - movs r0, 0x2 - ldrsh r1, [r4, r0] - cmp r1, 0 - beq _08111A58 - cmp r1, 0x1 - beq _08111A90 - b _08111AC0 - .align 2, 0 -_08111A54: .4byte gTasks+0x8 -_08111A58: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x7F - bne _08111AC0 - movs r0, 0x1 - negs r0, r0 - str r1, [sp] - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r2, _08111A8C @ =gUnknown_203AE94 - ldrb r1, [r2] - movs r0, 0x3F - ands r0, r1 - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2] - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - b _08111AC0 - .align 2, 0 -_08111A8C: .4byte gUnknown_203AE94 -_08111A90: - ldr r0, _08111AC8 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _08111AC0 - ldr r0, _08111ACC @ =gUnknown_3005E88 - strb r1, [r0] - adds r0, r5, 0 - movs r1, 0xE - bl GetWordTaskArg - cmp r0, 0 - beq _08111AB4 - bl _call_via_r0 -_08111AB4: - adds r0, r5, 0 - bl DestroyTask - ldr r1, _08111AD0 @ =gUnknown_203AE8C - ldr r0, _08111AD4 @ =sub_8111914 - str r0, [r1] -_08111AC0: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111AC8: .4byte gUnknown_2037AB8 -_08111ACC: .4byte gUnknown_3005E88 -_08111AD0: .4byte gUnknown_203AE8C -_08111AD4: .4byte sub_8111914 - thumb_func_end sub_8111A34 - - thumb_func_start sub_8111AD8 -sub_8111AD8: @ 8111AD8 - push {r4,r5,lr} - ldr r4, _08111B58 @ =gUnknown_203AE94 - ldrb r1, [r4] - movs r0, 0xF - ands r0, r1 - cmp r0, 0x1 - bne _08111B0A - ldrb r0, [r4, 0x2] - subs r0, 0x1 - strb r0, [r4, 0x2] - lsls r0, 24 - cmp r0, 0 - bne _08111B78 - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x31 - negs r1, r1 - ands r0, r1 - movs r1, 0x10 - orrs r0, r1 - strb r0, [r4] - movs r0, 0x2 - bl sub_8112888 -_08111B0A: - ldrb r1, [r4] - movs r0, 0x30 - ands r0, r1 - cmp r0, 0x10 - bne _08111B34 - ldrb r0, [r4, 0x3] - adds r0, 0x1 - strb r0, [r4, 0x3] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xF - bls _08111B34 - bl sub_8111E20 - ldrb r0, [r4] - movs r1, 0x31 - negs r1, r1 - ands r1, r0 - strb r1, [r4] - movs r0, 0 - strb r0, [r4, 0x3] -_08111B34: - ldr r4, _08111B58 @ =gUnknown_203AE94 - ldrb r0, [r4, 0x1] - cmp r0, 0x1F - bhi _08111B78 - ldr r5, _08111B5C @ =gUnknown_203AE0C - lsls r0, 2 - adds r0, r5 - ldr r0, [r0] - bl sub_8113B44 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08111B60 - bl sub_8111B80 - b _08111B78 - .align 2, 0 -_08111B58: .4byte gUnknown_203AE94 -_08111B5C: .4byte gUnknown_203AE0C -_08111B60: - ldrb r0, [r4, 0x1] - lsls r0, 2 - adds r0, r5 - ldr r0, [r0] - bl sub_8113AE8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08111B78 - bl sub_8111B80 -_08111B78: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8111AD8 - - thumb_func_start sub_8111B80 -sub_8111B80: @ 8111B80 - push {r4,lr} - ldr r4, _08111BCC @ =gUnknown_203AE94 - ldrb r1, [r4] - movs r2, 0xF - ands r2, r1 - cmp r2, 0 - bne _08111BC0 - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - movs r1, 0x31 - negs r1, r1 - ands r0, r1 - strb r0, [r4] - strb r2, [r4, 0x3] - bl sub_8111BD4 - strb r0, [r4, 0x2] - ldr r0, _08111BD0 @ =gUnknown_203B044 - ldrh r0, [r0, 0x2] - cmp r0, 0 - bne _08111BB6 - ldrb r0, [r4, 0x1] - adds r0, 0x1 - strb r0, [r4, 0x1] -_08111BB6: - ldrb r0, [r4, 0x1] - cmp r0, 0x20 - bhi _08111BC6 - bl sub_8111D10 -_08111BC0: - movs r0, 0x1 - bl sub_8112888 -_08111BC6: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111BCC: .4byte gUnknown_203AE94 -_08111BD0: .4byte gUnknown_203B044 - thumb_func_end sub_8111B80 - - thumb_func_start sub_8111BD4 -sub_8111BD4: @ 8111BD4 - push {r4,lr} - movs r2, 0 - movs r1, 0 - ldr r3, _08111C0C @ =gStringVar4 - ldrb r0, [r3] - cmp r0, 0xFF - beq _08111C04 - ldr r4, _08111C10 @ =0x000003ff -_08111BE4: - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, 0xFE - beq _08111BF2 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 -_08111BF2: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r4 - bhi _08111C04 - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, 0xFF - bne _08111BE4 -_08111C04: - cmp r2, 0x13 - bhi _08111C14 - movs r0, 0x5F - b _08111C26 - .align 2, 0 -_08111C0C: .4byte gStringVar4 -_08111C10: .4byte 0x000003ff -_08111C14: - cmp r2, 0x23 - bhi _08111C1C - movs r0, 0x7F - b _08111C26 -_08111C1C: - cmp r2, 0x2D - bls _08111C24 - movs r0, 0xFF - b _08111C26 -_08111C24: - movs r0, 0xBF -_08111C26: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8111BD4 - - thumb_func_start sub_8111C2C -sub_8111C2C: @ 8111C2C - push {lr} - ldr r0, _08111C54 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x2 - bne _08111C60 - ldr r0, _08111C58 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0 - beq _08111C4E - ldr r0, _08111C5C @ =gUnknown_203AE94 - ldrb r0, [r0] - movs r1, 0xF - ands r1, r0 - cmp r1, 0x1 - beq _08111C4E - cmp r1, 0x2 - bne _08111C60 -_08111C4E: - movs r0, 0x1 - b _08111C62 - .align 2, 0 -_08111C54: .4byte gUnknown_203ADFA -_08111C58: .4byte gUnknown_3005E88 -_08111C5C: .4byte gUnknown_203AE94 -_08111C60: - movs r0, 0 -_08111C62: - pop {r1} - bx r1 - thumb_func_end sub_8111C2C - - thumb_func_start sub_8111C68 -sub_8111C68: @ 8111C68 - push {r4,r5,lr} - ldr r5, _08111C9C @ =gUnknown_203AE94 - ldrb r2, [r5] - movs r4, 0xC0 - ands r4, r2 - cmp r4, 0 - bne _08111CC6 - ldr r0, _08111CA0 @ =gMain - ldrh r1, [r0, 0x2E] - movs r3, 0x1 - ands r3, r1 - cmp r3, 0 - beq _08111CA8 - movs r0, 0x3F - ands r0, r2 - movs r1, 0x80 - orrs r0, r1 - strb r0, [r5] - ldr r0, _08111CA4 @ =gUnknown_3005E88 - strb r4, [r0] - movs r0, 0x3 - negs r0, r0 - bl sub_81118F4 - b _08111CC6 - .align 2, 0 -_08111C9C: .4byte gUnknown_203AE94 -_08111CA0: .4byte gMain -_08111CA4: .4byte gUnknown_3005E88 -_08111CA8: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08111CC6 - movs r0, 0x3F - ands r0, r2 - movs r1, 0x40 - orrs r0, r1 - strb r0, [r5] - ldr r0, _08111CCC @ =gUnknown_3005E88 - strb r3, [r0] - movs r0, 0x3 - negs r0, r0 - bl sub_8111E64 -_08111CC6: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111CCC: .4byte gUnknown_3005E88 - thumb_func_end sub_8111C68 - - thumb_func_start sub_8111CD0 -sub_8111CD0: @ 8111CD0 - push {lr} - ldr r0, _08111CE4 @ =gUnknown_203AE94 - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - bne _08111CE8 - movs r0, 0 - b _08111CEA - .align 2, 0 -_08111CE4: .4byte gUnknown_203AE94 -_08111CE8: - movs r0, 0x1 -_08111CEA: - pop {r1} - bx r1 - thumb_func_end sub_8111CD0 - - thumb_func_start sub_8111CF0 -sub_8111CF0: @ 8111CF0 - push {lr} - ldr r0, _08111D08 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x2 - bne _08111D02 - ldr r0, _08111D0C @ =gUnknown_203ADF9 - ldrb r0, [r0] - bl sub_8111070 -_08111D02: - pop {r0} - bx r0 - .align 2, 0 -_08111D08: .4byte gUnknown_203ADFA -_08111D0C: .4byte gUnknown_203ADF9 - thumb_func_end sub_8111CF0 - - thumb_func_start sub_8111D10 -sub_8111D10: @ 8111D10 - push {r4,r5,lr} - sub sp, 0x14 - movs r4, 0 - movs r1, 0 - ldr r2, _08111D80 @ =gStringVar4 - ldrb r0, [r2] - ldr r5, _08111D84 @ =gUnknown_203ADFE - cmp r0, 0xFF - beq _08111D42 -_08111D22: - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0xFE - bne _08111D30 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_08111D30: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0xFF - bhi _08111D42 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0xFF - bne _08111D22 -_08111D42: - ldrb r0, [r5, 0x2] - bl PutWindowTilemap - ldrb r0, [r5, 0x2] - bl sub_8111D90 - ldrb r0, [r5, 0x2] - ldr r1, _08111D88 @ =gUnknown_8456698 - adds r1, r4, r1 - ldrb r3, [r1] - movs r1, 0x1 - str r1, [sp] - movs r2, 0 - str r2, [sp, 0x4] - ldr r1, _08111D8C @ =gUnknown_8456634 - str r1, [sp, 0x8] - str r2, [sp, 0xC] - ldr r1, _08111D80 @ =gStringVar4 - str r1, [sp, 0x10] - movs r1, 0x2 - movs r2, 0x2 - bl AddTextPrinterParametrized2 - movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram - add sp, 0x14 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08111D80: .4byte gStringVar4 -_08111D84: .4byte gUnknown_203ADFE -_08111D88: .4byte gUnknown_8456698 -_08111D8C: .4byte gUnknown_8456634 - thumb_func_end sub_8111D10 - - thumb_func_start sub_8111D90 -sub_8111D90: @ 8111D90 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - ldr r0, _08111DC0 @ =gUnknown_8456638 - mov r9, r0 - movs r0, 0xB4 - lsls r0, 5 - bl Alloc - mov r8, r0 - cmp r0, 0 - beq _08111E0C - movs r1, 0 -_08111DB4: - cmp r1, 0 - beq _08111DC4 - cmp r1, 0x5 - beq _08111DC8 - movs r0, 0x1 - b _08111DCA - .align 2, 0 -_08111DC0: .4byte gUnknown_8456638 -_08111DC4: - movs r0, 0 - b _08111DCA -_08111DC8: - movs r0, 0x2 -_08111DCA: - movs r4, 0 - lsls r6, r0, 5 - lsls r0, r1, 4 - adds r7, r1, 0x1 - subs r0, r1 - lsls r5, r0, 1 -_08111DD6: - adds r1, r5, r4 - lsls r1, 5 - add r1, r8 - mov r2, r9 - adds r0, r2, r6 - ldr r2, _08111E1C @ =0x04000008 - bl CpuSet - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1D - bls _08111DD6 - lsls r0, r7, 24 - lsrs r1, r0, 24 - cmp r1, 0x5 - bls _08111DB4 - movs r2, 0xB4 - lsls r2, 5 - mov r0, r10 - mov r1, r8 - movs r3, 0 - bl CopyToWindowPixelBuffer - mov r0, r8 - bl Free -_08111E0C: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08111E1C: .4byte 0x04000008 - thumb_func_end sub_8111D90 - - thumb_func_start sub_8111E20 -sub_8111E20: @ 8111E20 - push {r4,lr} - sub sp, 0x8 - ldr r4, _08111E60 @ =gUnknown_203ADFE - ldrb r0, [r4, 0x2] - bl ClearWindowTilemap - ldrb r0, [r4, 0x2] - movs r1, 0xF0 - str r1, [sp] - movs r1, 0x30 - str r1, [sp, 0x4] - movs r1, 0xF - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - ldrb r0, [r4, 0x2] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r4, 0x1] - bl PutWindowTilemap - ldrb r0, [r4, 0x1] - movs r1, 0x1 - bl CopyWindowToVram - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111E60: .4byte gUnknown_203ADFE - thumb_func_end sub_8111E20 - - thumb_func_start sub_8111E64 -sub_8111E64: @ 8111E64 - push {lr} - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0x1 - bl fade_screen - ldr r1, _08111E7C @ =gUnknown_203AE8C - ldr r0, _08111E80 @ =sub_8111E84 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08111E7C: .4byte gUnknown_203AE8C -_08111E80: .4byte sub_8111E84 - thumb_func_end sub_8111E64 - - thumb_func_start sub_8111E84 -sub_8111E84: @ 8111E84 - push {r4,lr} - ldr r0, _08111F00 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08111EF8 - bl ScriptContext2_Enable - ldr r3, _08111F04 @ =gUnknown_203ADF8 - ldrb r0, [r3] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bhi _08111EEE - ldr r0, _08111F08 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r2, [r3] - movs r1, 0xCD - lsls r1, 3 - muls r1, r2 - adds r0, r1 - movs r1, 0x98 - lsls r1, 5 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _08111EEE - adds r4, r3, 0 -_08111EBE: - ldrb r0, [r4] - ldr r1, _08111F0C @ =gUnknown_203AE98 - bl sub_811175C - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bhi _08111EEE - ldr r0, _08111F08 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldrb r2, [r4] - movs r0, 0xCD - lsls r0, 3 - muls r0, r2 - adds r1, r0 - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - ldrb r0, [r1] - cmp r0, 0 - bne _08111EBE -_08111EEE: - ldr r1, _08111F10 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] - bl sub_8111984 -_08111EF8: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111F00: .4byte gUnknown_2037AB8 -_08111F04: .4byte gUnknown_203ADF8 -_08111F08: .4byte gSaveBlock1Ptr -_08111F0C: .4byte gUnknown_203AE98 -_08111F10: .4byte gUnknown_3005E88 - thumb_func_end sub_8111E84 - - thumb_func_start sub_8111F14 -sub_8111F14: @ 8111F14 - push {r4,lr} - ldr r0, _08111F30 @ =gUnknown_203ADFA - ldrb r0, [r0] - cmp r0, 0x3 - bne _08111F2A - ldr r4, _08111F34 @ =gUnknown_203AE90 - movs r0, 0x80 - lsls r0, 3 - bl AllocZeroed - str r0, [r4] -_08111F2A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111F30: .4byte gUnknown_203ADFA -_08111F34: .4byte gUnknown_203AE90 - thumb_func_end sub_8111F14 - - thumb_func_start sub_8111F38 -sub_8111F38: @ 8111F38 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - lsls r3, 16 - lsls r2, 16 - lsrs r2, 16 - lsrs r3, 15 - ldr r0, _08111F58 @ =gUnknown_20371F8 - adds r0, r3, r0 - ldr r1, _08111F5C @ =gUnknown_203AE90 - ldr r1, [r1] - adds r1, r3 - bl CpuSet - pop {r0} - bx r0 - .align 2, 0 -_08111F58: .4byte gUnknown_20371F8 -_08111F5C: .4byte gUnknown_203AE90 - thumb_func_end sub_8111F38 - - thumb_func_start sub_8111F60 -sub_8111F60: @ 8111F60 - push {lr} - movs r0, 0x4 - bl stdpal_get - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0 - bl sub_8111070 - bl sub_807DF7C - ldr r0, _08111F88 @ =sub_8111F8C - movs r1, 0xFF - bl CreateTask - movs r0, 0x1 - pop {r1} - bx r1 - .align 2, 0 -_08111F88: .4byte sub_8111F8C - thumb_func_end sub_8111F60 - - thumb_func_start sub_8111F8C -sub_8111F8C: @ 8111F8C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08111FC4 @ =gTasks - adds r4, r1, r0 - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08111FBC - bl player_bitmagic - bl sub_805C270 - bl sub_805C780 - bl ScriptContext2_Enable - ldr r0, _08111FC8 @ =sub_8111FCC - str r0, [r4] -_08111FBC: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08111FC4: .4byte gTasks -_08111FC8: .4byte sub_8111FCC - thumb_func_end sub_8111F8C - - thumb_func_start sub_8111FCC -sub_8111FCC: @ 8111FCC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08112024 @ =gTasks - adds r5, r1, r0 - ldr r0, _08112028 @ =gUnknown_2037AB8 - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - bne _0811201E - ldr r0, _0811202C @ =gUnknown_203AE94 - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - beq _0811200E - ldr r0, _08112030 @ =gStringVar1 - ldr r1, _08112034 @ =gMapHeader - ldrb r1, [r1, 0x14] - bl sub_80C4DF8 - ldr r0, _08112038 @ =gStringVar4 - ldr r1, _0811203C @ =gUnknown_841B073 - bl StringExpandPlaceholders - bl sub_8111D10 -_0811200E: - strh r4, [r5, 0x8] - strh r4, [r5, 0xA] - ldr r0, _08112040 @ =sub_8112044 - str r0, [r5] - bl player_bitmagic - bl ScriptContext2_Enable -_0811201E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08112024: .4byte gTasks -_08112028: .4byte gUnknown_2037AB8 -_0811202C: .4byte gUnknown_203AE94 -_08112030: .4byte gStringVar1 -_08112034: .4byte gMapHeader -_08112038: .4byte gStringVar4 -_0811203C: .4byte gUnknown_841B073 -_08112040: .4byte sub_8112044 - thumb_func_end sub_8111FCC - - thumb_func_start sub_8112044 -sub_8112044: @ 8112044 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _0811208C @ =gTasks - adds r4, r1, r0 - ldr r0, _08112090 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08112076 - ldrh r2, [r4, 0x8] - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x7E - bgt _08112076 - ldr r0, _08112094 @ =gUnknown_203AE94 - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - bne _081120A0 -_08112076: - bl sub_8111E20 - movs r1, 0 - movs r0, 0 - strh r0, [r4, 0x8] - ldr r0, _08112098 @ =sub_81120AC - str r0, [r4] - ldr r0, _0811209C @ =gUnknown_203ADFA - strb r1, [r0] - b _081120A4 - .align 2, 0 -_0811208C: .4byte gTasks -_08112090: .4byte gMain -_08112094: .4byte gUnknown_203AE94 -_08112098: .4byte sub_81120AC -_0811209C: .4byte gUnknown_203ADFA -_081120A0: - adds r0, r2, 0x1 - strh r0, [r4, 0x8] -_081120A4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8112044 - - thumb_func_start sub_81120AC -sub_81120AC: @ 81120AC - push {r4-r6,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _081120D0 @ =gTasks+0x8 - adds r6, r0, r1 - movs r0, 0 - ldrsh r1, [r6, r0] - cmp r1, 0x1 - beq _08112110 - cmp r1, 0x1 - bgt _081120D4 - cmp r1, 0 - beq _081120DA - b _08112164 - .align 2, 0 -_081120D0: .4byte gTasks+0x8 -_081120D4: - cmp r1, 0x2 - beq _0811214C - b _08112164 -_081120DA: - ldr r0, _08112104 @ =gUnknown_2031DD8 - strb r1, [r0] - bl sub_8055DC4 - bl sub_811229C - ldr r0, _08112108 @ =gUnknown_203ADFE - ldrb r0, [r0] - ldr r2, _0811210C @ =gUnknown_845661C - ldrb r1, [r2, 0x3] - lsls r1, 3 - str r1, [sp] - ldrb r1, [r2, 0x4] - lsls r1, 3 - str r1, [sp, 0x4] - movs r1, 0xF - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - b _0811215C - .align 2, 0 -_08112104: .4byte gUnknown_2031DD8 -_08112108: .4byte gUnknown_203ADFE -_0811210C: .4byte gUnknown_845661C -_08112110: - adds r0, r5, 0 - bl sub_81121D8 - lsls r0, 24 - cmp r0, 0 - beq _081121B8 - movs r5, 0 -_0811211E: - ldr r4, _08112148 @ =gUnknown_203ADFE - adds r4, r5, r4 - ldrb r0, [r4] - bl ClearWindowTilemap - ldrb r0, [r4] - movs r1, 0x1 - bl CopyWindowToVram - ldrb r0, [r4] - bl RemoveWindow - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _0811211E - movs r0, 0 - strh r0, [r6, 0x2] - b _0811215C - .align 2, 0 -_08112148: .4byte gUnknown_203ADFE -_0811214C: - ldrh r1, [r6, 0x2] - movs r2, 0x2 - ldrsh r0, [r6, r2] - cmp r0, 0x1F - bgt _0811215C - adds r0, r1, 0x1 - strh r0, [r6, 0x2] - b _081121B8 -_0811215C: - ldrh r0, [r6] - adds r0, 0x1 - strh r0, [r6] - b _081121B8 -_08112164: - ldr r6, _081121C0 @ =gUnknown_203AE94 - ldrb r1, [r6] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x40 - bne _08112176 - movs r0, 0x1 - bl sub_8098110 -_08112176: - ldr r4, _081121C4 @ =gUnknown_203AE90 - ldr r0, [r4] - ldr r1, _081121C8 @ =gUnknown_20371F8 - movs r2, 0x80 - lsls r2, 2 - bl CpuSet - ldr r0, [r4] - bl Free - movs r4, 0 - str r4, [r6] - bl sub_80696C0 - bl ScriptContext2_Disable - ldr r2, _081121CC @ =gTextFlags - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - ldr r0, _081121D0 @ =gUnknown_2036E28 - strb r4, [r0] - movs r0, 0 - bl sub_8082740 - ldr r1, _081121D4 @ =gUnknown_3005ECC - movs r0, 0x1 - strb r0, [r1] - adds r0, r5, 0 - bl DestroyTask -_081121B8: - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081121C0: .4byte gUnknown_203AE94 -_081121C4: .4byte gUnknown_203AE90 -_081121C8: .4byte gUnknown_20371F8 -_081121CC: .4byte gTextFlags -_081121D0: .4byte gUnknown_2036E28 -_081121D4: .4byte gUnknown_3005ECC - thumb_func_end sub_81120AC - - thumb_func_start sub_81121D8 -sub_81121D8: @ 81121D8 - push {r4-r7,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _0811227C @ =gTasks+0x8 - adds r7, r1, r0 - ldrh r1, [r7, 0x2] - movs r2, 0x2 - ldrsh r0, [r7, r2] - cmp r0, 0xF - bgt _08112290 - ldr r5, _08112280 @ =gUnknown_20371FA - ldr r6, _08112284 @ =gUnknown_20375FA - movs r4, 0xF - subs r3, r4, r1 - lsls r3, 24 - lsrs r3, 24 - adds r0, r5, 0 - adds r1, r6, 0 - movs r2, 0xDF - bl sub_80716F8 - movs r0, 0xFF - lsls r0, 1 - adds r5, r0 - adds r6, r0 - movs r2, 0x80 - lsls r2, 1 - ldrb r0, [r7, 0x2] - subs r4, r0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - adds r1, r6, 0 - adds r3, r4, 0 - bl sub_80716F8 - ldr r5, _08112288 @ =gUnknown_203ADFE - ldrb r0, [r5] - ldr r4, _0811228C @ =gUnknown_845661C - ldrb r3, [r4, 0x4] - lsls r3, 3 - subs r3, 0x1 - ldrh r1, [r7, 0x2] - subs r3, r1 - lsls r3, 16 - lsrs r3, 16 - ldrb r1, [r4, 0x3] - lsls r1, 3 - str r1, [sp] - movs r6, 0x1 - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0 - bl FillWindowPixelRect - ldrb r0, [r5, 0x1] - ldrh r3, [r7, 0x2] - ldrb r1, [r4, 0xB] - lsls r1, 3 - str r1, [sp] - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0 - bl FillWindowPixelRect - ldrb r0, [r5] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r5, 0x1] - movs r1, 0x2 - bl CopyWindowToVram - ldrh r0, [r7, 0x2] - adds r0, 0x1 - strh r0, [r7, 0x2] - movs r0, 0 - b _08112292 - .align 2, 0 -_0811227C: .4byte gTasks+0x8 -_08112280: .4byte gUnknown_20371FA -_08112284: .4byte gUnknown_20375FA -_08112288: .4byte gUnknown_203ADFE -_0811228C: .4byte gUnknown_845661C -_08112290: - movs r0, 0x1 -_08112292: - add sp, 0x8 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81121D8 - - thumb_func_start sub_811229C -sub_811229C: @ 811229C - push {r4-r6,lr} - movs r0, 0x80 - lsls r0, 3 - bl Alloc - adds r6, r0, 0 - ldr r4, _08112314 @ =gUnknown_203AE90 - ldr r0, [r4] - movs r5, 0x80 - lsls r5, 2 - adds r1, r6, 0 - adds r2, r5, 0 - bl CpuSet - ldr r1, [r4] - adds r0, r1, 0 - movs r2, 0xD0 - bl sub_807B0C4 - ldr r1, [r4] - movs r0, 0x88 - lsls r0, 2 - adds r1, r0 - adds r0, r1, 0 - movs r2, 0x10 - bl sub_807B0C4 - ldr r1, [r4] - movs r0, 0xB0 - lsls r0, 2 - adds r1, r0 - adds r0, r1, 0 - movs r2, 0x40 - bl sub_807B0C4 - ldr r1, [r4] - movs r0, 0xD8 - lsls r0, 2 - adds r1, r0 - adds r0, r1, 0 - movs r2, 0x50 - bl sub_807B0C4 - ldr r0, [r4] - ldr r1, _08112318 @ =gUnknown_20371F8 - adds r2, r5, 0 - bl CpuSet - ldr r1, [r4] - adds r0, r6, 0 - adds r2, r5, 0 - bl CpuSet - adds r0, r6, 0 - bl Free - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08112314: .4byte gUnknown_203AE90 -_08112318: .4byte gUnknown_20371F8 - thumb_func_end sub_811229C - - thumb_func_start sub_811231C -sub_811231C: @ 811231C - push {r4,lr} - ldr r4, _0811234C @ =gUnknown_203ADFA - ldrb r0, [r4] - cmp r0, 0x1 - bne _08112346 - ldr r0, _08112350 @ =gUnknown_203AE98 - bl sub_8110E68 - bl sub_8110E3C - movs r0, 0 - strb r0, [r4] - ldr r0, _08112354 @ =gUnknown_203AE8C - movs r1, 0 - str r1, [r0] - ldr r0, _08112358 @ =gUnknown_203AE04 - str r1, [r0] - ldr r0, _0811235C @ =gUnknown_203AE08 - str r1, [r0] - ldr r0, _08112360 @ =gUnknown_3005E88 - strb r1, [r0] -_08112346: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0811234C: .4byte gUnknown_203ADFA -_08112350: .4byte gUnknown_203AE98 -_08112354: .4byte gUnknown_203AE8C -_08112358: .4byte gUnknown_203AE04 -_0811235C: .4byte gUnknown_203AE08 -_08112360: .4byte gUnknown_3005E88 - thumb_func_end sub_811231C - - thumb_func_start sub_8112364 -sub_8112364: @ 8112364 - push {r4,r5,lr} - ldr r5, _081123A4 @ =gUnknown_3005E88 - ldrb r0, [r5] - cmp r0, 0 - beq _08112392 - ldr r4, _081123A8 @ =gUnknown_203ADFA - ldrb r0, [r4] - cmp r0, 0x1 - bne _08112392 - ldr r0, _081123AC @ =gUnknown_203AE98 - bl sub_8110E68 - movs r0, 0x1 - bl sub_8113A1C - bl sub_8110E3C - movs r0, 0 - strb r0, [r5] - strb r0, [r4] - ldr r1, _081123B0 @ =gUnknown_203AE8C - movs r0, 0 - str r0, [r1] -_08112392: - ldr r0, _081123B4 @ =gUnknown_203AE04 - movs r1, 0 - str r1, [r0] - ldr r0, _081123B8 @ =gUnknown_203AE08 - str r1, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081123A4: .4byte gUnknown_3005E88 -_081123A8: .4byte gUnknown_203ADFA -_081123AC: .4byte gUnknown_203AE98 -_081123B0: .4byte gUnknown_203AE8C -_081123B4: .4byte gUnknown_203AE04 -_081123B8: .4byte gUnknown_203AE08 - thumb_func_end sub_8112364 - - thumb_func_start sub_81123BC -sub_81123BC: @ 81123BC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r0, 0xCD - lsls r0, 5 - bl AllocZeroed - mov r8, r0 - ldr r0, _08112448 @ =gUnknown_203ADF8 - ldrb r4, [r0] - movs r5, 0 - movs r6, 0 -_081123D6: - cmp r4, 0x3 - bls _081123DC - movs r4, 0 -_081123DC: - ldr r3, _0811244C @ =gSaveBlock1Ptr - ldr r0, [r3] - movs r2, 0xCD - lsls r2, 3 - adds r1, r4, 0 - muls r1, r2 - adds r0, r1 - movs r7, 0x98 - lsls r7, 5 - adds r1, r0, r7 - ldrb r0, [r1] - cmp r0, 0 - beq _0811240A - adds r0, r5, 0 - muls r0, r2 - add r0, r8 - str r3, [sp] - bl memcpy - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r3, [sp] -_0811240A: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x3 - bls _081123D6 - ldr r1, _08112448 @ =gUnknown_203ADF8 - movs r0, 0x3 - ands r5, r0 - strb r5, [r1] - ldr r1, [r3] - movs r0, 0x98 - lsls r0, 5 - adds r1, r0 - movs r2, 0xCD - lsls r2, 4 - mov r0, r8 - bl CpuSet - mov r0, r8 - bl Free - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112448: .4byte gUnknown_203ADF8 -_0811244C: .4byte gSaveBlock1Ptr - thumb_func_end sub_81123BC - - thumb_func_start sub_8112450 -sub_8112450: @ 8112450 - push {lr} - bl sub_80BF708 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08112466 - bl sub_8112364 - bl sub_81123BC -_08112466: - pop {r0} - bx r0 - thumb_func_end sub_8112450 - - thumb_func_start sub_811246C -sub_811246C: @ 811246C - push {r4-r6,lr} - adds r6, r0, 0 - movs r0, 0x2E - ldrsh r1, [r6, r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _081124B0 @ =gUnknown_2036E38 - adds r4, r0, r1 - ldrb r0, [r4, 0x8] - cmp r0, 0xFF - bne _081124B8 - ldr r5, _081124B4 @ =gUnknown_203AF9A - ldrb r0, [r5] - cmp r0, 0xFF - beq _08112498 - adds r1, r0, 0 - adds r0, r4, 0 - bl sub_8063CA4 - movs r0, 0xFF - strb r0, [r5] -_08112498: - ldrb r0, [r5, 0x1] - cmp r0, 0xFF - beq _081124A6 - bl sub_8150454 - movs r0, 0xFF - strb r0, [r5, 0x1] -_081124A6: - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_8063E28 - b _081124E0 - .align 2, 0 -_081124B0: .4byte gUnknown_2036E38 -_081124B4: .4byte gUnknown_203AF9A -_081124B8: - ldr r5, _081124E8 @ =gUnknown_203AF9A - ldrb r0, [r4, 0x8] - lsls r0, 1 - adds r1, r0, r5 - ldrb r0, [r1] - cmp r0, 0xFF - beq _081124D8 - adds r1, r0, 0 - adds r0, r4, 0 - bl sub_8063CA4 - ldrb r0, [r4, 0x8] - lsls r0, 1 - adds r0, r5 - movs r1, 0xFF - strb r1, [r0] -_081124D8: - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_8063E28 -_081124E0: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081124E8: .4byte gUnknown_203AF9A - thumb_func_end sub_811246C - - thumb_func_start sub_81124EC -sub_81124EC: @ 81124EC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - lsls r2, 24 - lsrs r2, 24 - mov r9, r2 - lsls r3, 24 - lsrs r3, 24 - mov r10, r3 - bl sub_8112CEC - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _0811256E - ldr r2, _0811257C @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112580 @ =gUnknown_3005E94 - ldr r5, [r3] - lsls r0, 3 - adds r0, r5 - ldr r1, _08112584 @ =gUnknown_203B01A - mov r12, r1 - ldrh r1, [r1] - movs r4, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - strb r4, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r6, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r4, r8 - strb r4, [r0, 0x1] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r1, r9 - strb r1, [r0, 0x2] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r4, r10 - strb r4, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - mov r0, r12 - strh r7, [r0] -_0811256E: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811257C: .4byte gUnknown_203AF98 -_08112580: .4byte gUnknown_3005E94 -_08112584: .4byte gUnknown_203B01A - thumb_func_end sub_81124EC - - thumb_func_start sub_8112588 -sub_8112588: @ 8112588 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r4, [sp, 0x20] - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r6, r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - lsls r3, 24 - lsrs r3, 24 - mov r9, r3 - lsls r4, 24 - lsrs r4, 24 - mov r10, r4 - bl sub_8112D1C - lsls r0, 24 - cmp r0, 0 - bne _0811260E - ldr r2, _0811261C @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112620 @ =gUnknown_3005E94 - ldr r5, [r3] - lsls r0, 3 - adds r0, r5 - ldr r1, _08112624 @ =gUnknown_203B01A - mov r12, r1 - ldrh r1, [r1] - movs r4, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - strb r4, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r7, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r6, [r0, 0x1] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r4, r8 - strb r4, [r0, 0x2] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r1, r9 - strb r1, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - mov r0, r10 - mov r4, r12 - strh r0, [r4] -_0811260E: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811261C: .4byte gUnknown_203AF98 -_08112620: .4byte gUnknown_3005E94 -_08112624: .4byte gUnknown_203B01A - thumb_func_end sub_8112588 - - thumb_func_start sub_8112628 -sub_8112628: @ 8112628 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r4, r0, 24 - mov r8, r4 - bl sub_8112CEC - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _08112692 - ldr r0, _0811269C @ =gUnknown_203B01C - mov r12, r0 - ldrh r0, [r0] - ldr r6, _081126A0 @ =gUnknown_3005E94 - ldr r5, [r6] - lsls r0, 3 - adds r0, r5 - ldrb r0, [r0, 0x3] - cmp r4, r0 - bne _08112658 - cmp r4, 0x3 - bls _08112692 -_08112658: - ldr r2, _081126A4 @ =gUnknown_203AF98 - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - ldr r4, _081126A8 @ =gUnknown_203B01A - ldrh r1, [r4] - movs r3, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r5 - strb r3, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r6] - lsls r0, 3 - adds r0, r1 - strb r3, [r0] - ldrh r0, [r2] - ldr r1, [r6] - lsls r0, 3 - adds r0, r1 - mov r1, r8 - strb r1, [r0, 0x3] - ldrh r0, [r2] - mov r1, r12 - strh r0, [r1] - adds r0, 0x1 - strh r0, [r2] - strh r7, [r4] -_08112692: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811269C: .4byte gUnknown_203B01C -_081126A0: .4byte gUnknown_3005E94 -_081126A4: .4byte gUnknown_203AF98 -_081126A8: .4byte gUnknown_203B01A - thumb_func_end sub_8112628 - - thumb_func_start sub_81126AC -sub_81126AC: @ 81126AC - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - bl sub_8112D1C - lsls r0, 24 - cmp r0, 0 - bne _08112704 - ldr r2, _08112710 @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112714 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - ldr r6, _08112718 @ =gUnknown_203B01A - ldrh r1, [r6] - movs r5, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - strb r5, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r7, [r0, 0x3] - ldr r1, _0811271C @ =gUnknown_203B01C - ldrh r0, [r2] - strh r0, [r1] - adds r0, 0x1 - strh r0, [r2] - mov r0, r8 - strh r0, [r6] -_08112704: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112710: .4byte gUnknown_203AF98 -_08112714: .4byte gUnknown_3005E94 -_08112718: .4byte gUnknown_203B01A -_0811271C: .4byte gUnknown_203B01C - thumb_func_end sub_81126AC - - thumb_func_start sub_8112720 -sub_8112720: @ 8112720 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - bl sub_8112D1C - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _08112774 - ldr r2, _08112780 @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _08112784 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - ldr r6, _08112788 @ =gUnknown_203B01A - ldrh r1, [r6] - movs r5, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - movs r1, 0x1 - strb r1, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - mov r1, r8 - strb r1, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - strh r7, [r6] -_08112774: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112780: .4byte gUnknown_203AF98 -_08112784: .4byte gUnknown_3005E94 -_08112788: .4byte gUnknown_203B01A - thumb_func_end sub_8112720 - - thumb_func_start sub_811278C -sub_811278C: @ 811278C - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - bl sub_8112D1C - lsls r0, 24 - cmp r0, 0 - bne _081127E2 - ldr r2, _081127EC @ =gUnknown_203AF98 - ldrh r0, [r2] - ldr r3, _081127F0 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - ldr r6, _081127F4 @ =gUnknown_203B01A - ldrh r1, [r6] - movs r5, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - movs r1, 0x1 - strb r1, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r7, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - mov r0, r8 - strh r0, [r6] -_081127E2: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081127EC: .4byte gUnknown_203AF98 -_081127F0: .4byte gUnknown_3005E94 -_081127F4: .4byte gUnknown_203B01A - thumb_func_end sub_811278C - - thumb_func_start sub_81127F8 -sub_81127F8: @ 81127F8 - push {r4-r6,lr} - adds r2, r0, 0 - ldr r5, _08112874 @ =gUnknown_203AF98 - ldr r1, _08112878 @ =gUnknown_3005E8C - ldrh r0, [r5] - ldrh r1, [r1] - cmp r0, r1 - bcs _0811286C - ldr r2, [r2] - ldr r0, _0811287C @ =0x00ff00f3 - ands r2, r0 - ldrh r1, [r5] - ldr r3, _08112880 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r1, 3 - adds r1, r4 - ldr r6, _08112884 @ =gUnknown_203B01A - ldrh r0, [r6] - strh r0, [r1, 0x4] - ldrh r0, [r5] - lsls r0, 3 - adds r0, r4 - movs r1, 0x2 - strb r1, [r0, 0x6] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r2, [r0] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - lsrs r1, r2, 8 - strb r1, [r0, 0x1] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - lsrs r1, r2, 16 - strb r1, [r0, 0x2] - ldrh r0, [r5] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - lsrs r2, 24 - strb r2, [r0, 0x3] - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _0811286A - movs r0, 0x1 -_0811286A: - strh r0, [r6] -_0811286C: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08112874: .4byte gUnknown_203AF98 -_08112878: .4byte gUnknown_3005E8C -_0811287C: .4byte 0x00ff00f3 -_08112880: .4byte gUnknown_3005E94 -_08112884: .4byte gUnknown_203B01A - thumb_func_end sub_81127F8 - - thumb_func_start sub_8112888 -sub_8112888: @ 8112888 - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08112898 - cmp r0, 0x2 - beq _081128A8 - b _081128B4 -_08112898: - ldr r1, _081128A4 @ =gUnknown_3005E88 - ldrb r0, [r1] - cmp r0, 0x1 - bne _081128B4 - movs r0, 0x3 - b _081128B2 - .align 2, 0 -_081128A4: .4byte gUnknown_3005E88 -_081128A8: - ldr r1, _081128B8 @ =gUnknown_3005E88 - ldrb r0, [r1] - cmp r0, 0x3 - bne _081128B4 - movs r0, 0x1 -_081128B2: - strb r0, [r1] -_081128B4: - pop {r0} - bx r0 - .align 2, 0 -_081128B8: .4byte gUnknown_3005E88 - thumb_func_end sub_8112888 - - thumb_func_start sub_81128BC -sub_81128BC: @ 81128BC - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_8112CAC - lsls r0, 24 - lsrs r1, r0, 24 - cmp r4, 0x1 - beq _081128D4 - cmp r4, 0x2 - beq _08112928 - b _08112934 -_081128D4: - cmp r1, 0x1 - bne _081128E4 - ldr r1, _081128E0 @ =gUnknown_3005E88 - movs r0, 0x3 - strb r0, [r1] - b _08112934 - .align 2, 0 -_081128E0: .4byte gUnknown_3005E88 -_081128E4: - cmp r1, 0x2 - bne _08112934 - ldr r2, _08112918 @ =gUnknown_203AF98 - ldrh r1, [r2] - ldr r0, _0811291C @ =gUnknown_3005E94 - ldr r3, [r0] - lsls r1, 3 - adds r1, r3 - ldr r4, _08112920 @ =gUnknown_203B01A - ldrh r0, [r4] - movs r5, 0 - strh r0, [r1, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r3 - movs r1, 0x3 - strb r1, [r0, 0x6] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - strh r5, [r4] - ldr r1, _08112924 @ =gUnknown_3005E88 - movs r0, 0x4 - strb r0, [r1] - b _08112934 - .align 2, 0 -_08112918: .4byte gUnknown_203AF98 -_0811291C: .4byte gUnknown_3005E94 -_08112920: .4byte gUnknown_203B01A -_08112924: .4byte gUnknown_3005E88 -_08112928: - cmp r1, 0x1 - beq _08112930 - cmp r1, 0x2 - bne _08112934 -_08112930: - ldr r0, _0811293C @ =gUnknown_3005E88 - strb r1, [r0] -_08112934: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0811293C: .4byte gUnknown_3005E88 - thumb_func_end sub_81128BC - - thumb_func_start sub_8112940 -sub_8112940: @ 8112940 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r3, r1, 0 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r2, 16 - cmp r0, 0x1 - beq _08112964 - cmp r0, 0x2 - beq _081129E0 - ldr r1, _08112960 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] - b _08112B20 - .align 2, 0 -_08112960: .4byte gUnknown_3005E88 -_08112964: - ldr r2, _081129C0 @ =gUnknown_3005E94 - str r3, [r2] - ldr r1, _081129C4 @ =gUnknown_3005E8C - lsrs r0, r4, 19 - strh r0, [r1] - ldr r0, _081129C8 @ =gUnknown_3005E88 - mov r9, r0 - adds r1, r2, 0 - ldr r6, _081129CC @ =gUnknown_203AF9A - ldr r2, _081129D0 @ =gUnknown_203AF98 - ldr r7, _081129D4 @ =gUnknown_203B01C - ldr r0, _081129D8 @ =gUnknown_3005E90 - mov r12, r0 - ldr r0, _081129DC @ =gUnknown_203B01A - mov r8, r0 - movs r5, 0xFF - adds r3, r6, 0 - movs r4, 0x3F -_08112988: - ldrb r0, [r3] - orrs r0, r5 - strb r0, [r3] - ldrb r0, [r3, 0x1] - orrs r0, r5 - strb r0, [r3, 0x1] - adds r3, 0x2 - subs r4, 0x1 - cmp r4, 0 - bge _08112988 - movs r0, 0 - strh r0, [r2] - strh r0, [r7] - movs r0, 0 - mov r2, r12 - str r0, [r2] - ldr r1, [r1] - ldrh r0, [r1, 0x4] - mov r2, r8 - strh r0, [r2] - ldrb r0, [r1, 0x3] - strb r0, [r6] - movs r0, 0xFF - strb r0, [r6, 0x1] - movs r0, 0x1 - mov r1, r9 - strb r0, [r1] - b _08112B20 - .align 2, 0 -_081129C0: .4byte gUnknown_3005E94 -_081129C4: .4byte gUnknown_3005E8C -_081129C8: .4byte gUnknown_3005E88 -_081129CC: .4byte gUnknown_203AF9A -_081129D0: .4byte gUnknown_203AF98 -_081129D4: .4byte gUnknown_203B01C -_081129D8: .4byte gUnknown_3005E90 -_081129DC: .4byte gUnknown_203B01A -_081129E0: - ldr r1, _08112A44 @ =gUnknown_3005E94 - str r3, [r1] - ldr r5, _08112A48 @ =gUnknown_3005E8C - lsrs r0, r4, 19 - strh r0, [r5] - movs r4, 0 - ldr r2, _08112A4C @ =gUnknown_203B01A - mov r8, r2 - cmp r4, r0 - bge _08112A0E - adds r6, r1, 0 - ldr r0, _08112A50 @ =gUnknown_845669C - ldr r2, [r0] - ldr r3, [r0, 0x4] -_081129FC: - ldr r1, [r6] - lsls r0, r4, 3 - adds r0, r1 - str r2, [r0] - str r3, [r0, 0x4] - adds r4, 0x1 - ldrh r0, [r5] - cmp r4, r0 - blt _081129FC -_08112A0E: - ldr r4, _08112A54 @ =gUnknown_203AF98 - movs r2, 0 - strh r2, [r4] - mov r1, r8 - strh r2, [r1] - movs r1, 0 - ldr r3, _08112A44 @ =gUnknown_3005E94 - ldr r0, [r3] - strh r1, [r0, 0x4] - strb r2, [r0, 0x6] - ldrh r0, [r4] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r2, [r0] - bl player_get_direction_lower_nybble - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bhi _08112AC8 - lsls r0, 2 - ldr r1, _08112A58 @ =_08112A5C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08112A44: .4byte gUnknown_3005E94 -_08112A48: .4byte gUnknown_3005E8C -_08112A4C: .4byte gUnknown_203B01A -_08112A50: .4byte gUnknown_845669C -_08112A54: .4byte gUnknown_203AF98 -_08112A58: .4byte _08112A5C - .align 2, 0 -_08112A5C: - .4byte _08112A70 - .4byte _08112A70 - .4byte _08112AA0 - .4byte _08112AB8 - .4byte _08112A88 -_08112A70: - ldr r0, _08112A80 @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112A84 @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0 - b _08112AC6 - .align 2, 0 -_08112A80: .4byte gUnknown_203AF98 -_08112A84: .4byte gUnknown_3005E94 -_08112A88: - ldr r0, _08112A98 @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112A9C @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0x3 - b _08112AC6 - .align 2, 0 -_08112A98: .4byte gUnknown_203AF98 -_08112A9C: .4byte gUnknown_3005E94 -_08112AA0: - ldr r0, _08112AB0 @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112AB4 @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0x1 - b _08112AC6 - .align 2, 0 -_08112AB0: .4byte gUnknown_203AF98 -_08112AB4: .4byte gUnknown_3005E94 -_08112AB8: - ldr r0, _08112B2C @ =gUnknown_203AF98 - ldrh r0, [r0] - ldr r1, _08112B30 @ =gUnknown_3005E94 - ldr r1, [r1] - lsls r0, 3 - adds r0, r1 - movs r1, 0x2 -_08112AC6: - strb r1, [r0, 0x3] -_08112AC8: - ldr r0, _08112B34 @ =gUnknown_203B01C - movs r5, 0 - strh r5, [r0] - ldr r2, _08112B2C @ =gUnknown_203AF98 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - ldrh r0, [r2] - ldr r3, _08112B30 @ =gUnknown_3005E94 - ldr r4, [r3] - lsls r0, 3 - adds r0, r4 - movs r1, 0 - strh r1, [r0, 0x4] - ldrh r0, [r2] - lsls r0, 3 - adds r0, r4 - movs r4, 0x2 - strb r4, [r0, 0x6] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0, 0x1] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0, 0x2] - ldrh r0, [r2] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - strb r5, [r0, 0x3] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - ldr r0, _08112B38 @ =gUnknown_3005E88 - strb r4, [r0] -_08112B20: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112B2C: .4byte gUnknown_203AF98 -_08112B30: .4byte gUnknown_3005E94 -_08112B34: .4byte gUnknown_203B01C -_08112B38: .4byte gUnknown_3005E88 - thumb_func_end sub_8112940 - - thumb_func_start sub_8112B3C -sub_8112B3C: @ 8112B3C - push {r4-r7,lr} - ldr r0, _08112B54 @ =gUnknown_3005E88 - ldrb r0, [r0] - cmp r0, 0x4 - bls _08112B48 - b _08112C84 -_08112B48: - lsls r0, 2 - ldr r1, _08112B58 @ =_08112B5C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08112B54: .4byte gUnknown_3005E88 -_08112B58: .4byte _08112B5C - .align 2, 0 -_08112B5C: - .4byte _08112C84 - .4byte _08112B70 - .4byte _08112C5E - .4byte _08112C84 - .4byte _08112C84 -_08112B70: - bl sub_8112CEC - lsls r0, 24 - cmp r0, 0 - beq _08112B7C - b _08112C72 -_08112B7C: - ldr r0, _08112B8C @ =gUnknown_203B01A - ldrh r1, [r0] - adds r7, r0, 0 - cmp r1, 0 - beq _08112B90 - subs r0, r1, 0x1 - strh r0, [r7] - b _08112C84 - .align 2, 0 -_08112B8C: .4byte gUnknown_203B01A -_08112B90: - ldr r5, _08112B98 @ =gUnknown_3005E88 - ldr r4, _08112B9C @ =gUnknown_203AF98 - ldr r6, _08112BA0 @ =gUnknown_3005E94 - b _08112BD4 - .align 2, 0 -_08112B98: .4byte gUnknown_3005E88 -_08112B9C: .4byte gUnknown_203AF98 -_08112BA0: .4byte gUnknown_3005E94 -_08112BA4: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - ldr r1, _08112BF0 @ =gUnknown_3005E8C - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r1] - cmp r0, r1 - bcs _08112C58 - ldrh r0, [r4] - ldr r1, [r6] - lsls r0, 3 - adds r0, r1 - ldrh r0, [r0, 0x4] - strh r0, [r7] - cmp r2, 0x3 - beq _08112C84 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0 - beq _08112BD4 - ldr r0, _08112BF4 @ =0x0000ffff - cmp r1, r0 - bne _08112C84 -_08112BD4: - ldrh r0, [r4] - ldr r1, [r6] - lsls r0, 3 - adds r3, r0, r1 - ldrb r0, [r3, 0x6] - cmp r0, 0x2 - beq _08112C2C - cmp r0, 0x2 - bgt _08112BF8 - cmp r0, 0 - beq _08112C0C - cmp r0, 0x1 - beq _08112C18 - b _08112C50 - .align 2, 0 -_08112BF0: .4byte gUnknown_3005E8C -_08112BF4: .4byte 0x0000ffff -_08112BF8: - cmp r0, 0xFE - beq _08112C50 - cmp r0, 0xFE - bgt _08112C06 - cmp r0, 0x3 - beq _08112C4E - b _08112C50 -_08112C06: - cmp r0, 0xFF - beq _08112C4C - b _08112C50 -_08112C0C: - ldr r0, _08112C14 @ =gUnknown_203AF9A - ldrb r1, [r3] - lsls r1, 1 - b _08112C20 - .align 2, 0 -_08112C14: .4byte gUnknown_203AF9A -_08112C18: - ldr r0, _08112C28 @ =gUnknown_203AF9A - ldrb r1, [r3] - lsls r1, 1 - adds r0, 0x1 -_08112C20: - adds r1, r0 - ldrb r0, [r3, 0x3] - strb r0, [r1] - b _08112C50 - .align 2, 0 -_08112C28: .4byte gUnknown_203AF9A -_08112C2C: - ldr r2, _08112C48 @ =gUnknown_3005E90 - ldrb r1, [r3, 0x3] - lsls r1, 24 - ldrb r0, [r3, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3] - orrs r1, r0 - str r1, [r2] - b _08112C50 - .align 2, 0 -_08112C48: .4byte gUnknown_3005E90 -_08112C4C: - movs r0, 0 -_08112C4E: - strb r0, [r5] -_08112C50: - ldrb r2, [r5] - cmp r2, 0 - bne _08112BA4 - b _08112C84 -_08112C58: - movs r0, 0 - strb r0, [r5] - b _08112C84 -_08112C5E: - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08112C84 - ldr r1, _08112C8C @ =gUnknown_203B01A - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_08112C72: - ldr r0, _08112C90 @ =gUnknown_203AF98 - ldr r1, _08112C94 @ =gUnknown_3005E8C - ldrh r0, [r0] - ldrh r1, [r1] - cmp r0, r1 - bcc _08112C84 - ldr r1, _08112C98 @ =gUnknown_3005E88 - movs r0, 0 - strb r0, [r1] -_08112C84: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112C8C: .4byte gUnknown_203B01A -_08112C90: .4byte gUnknown_203AF98 -_08112C94: .4byte gUnknown_3005E8C -_08112C98: .4byte gUnknown_3005E88 - thumb_func_end sub_8112B3C - thumb_func_start sub_8112C9C sub_8112C9C: @ 8112C9C ldr r1, _08112CA8 @ =gUnknown_203B01A diff --git a/asm/quest_log_8150454.s b/asm/quest_log_8150454.s index 1fe631d20..ac59263d7 100644 --- a/asm/quest_log_8150454.s +++ b/asm/quest_log_8150454.s @@ -59,12 +59,12 @@ sub_8150498: @ 8150498 thumb_func_start sub_81504A8 sub_81504A8: @ 81504A8 push {r4,lr} - ldr r0, _081504E0 @ =gUnknown_2037078 + ldr r0, _081504E0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _081504E4 @ =gUnknown_2036E38 + ldr r0, _081504E4 @ =gMapObjects adds r4, r0 movs r0, 0 bl sub_805C808 @@ -83,19 +83,19 @@ sub_81504A8: @ 81504A8 pop {r0} bx r0 .align 2, 0 -_081504E0: .4byte gUnknown_2037078 -_081504E4: .4byte gUnknown_2036E38 +_081504E0: .4byte gPlayerAvatar +_081504E4: .4byte gMapObjects thumb_func_end sub_81504A8 thumb_func_start sub_81504E8 sub_81504E8: @ 81504E8 push {r4,lr} - ldr r0, _08150528 @ =gUnknown_2037078 + ldr r0, _08150528 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0815052C @ =gUnknown_2036E38 + ldr r0, _0815052C @ =gMapObjects adds r4, r0 movs r0, 0x1 bl sub_805C808 @@ -117,19 +117,19 @@ sub_81504E8: @ 81504E8 pop {r0} bx r0 .align 2, 0 -_08150528: .4byte gUnknown_2037078 -_0815052C: .4byte gUnknown_2036E38 +_08150528: .4byte gPlayerAvatar +_0815052C: .4byte gMapObjects thumb_func_end sub_81504E8 thumb_func_start sub_8150530 sub_8150530: @ 8150530 push {r4-r6,lr} - ldr r6, _0815057C @ =gUnknown_2037078 + ldr r6, _0815057C @ =gPlayerAvatar ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08150580 @ =gUnknown_2036E38 + ldr r1, _08150580 @ =gMapObjects adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 @@ -161,8 +161,8 @@ _08150558: strh r4, [r1, 0x8] b _081505BC .align 2, 0 -_0815057C: .4byte gUnknown_2037078 -_08150580: .4byte gUnknown_2036E38 +_0815057C: .4byte gPlayerAvatar +_08150580: .4byte gMapObjects _08150584: .4byte gSprites _08150588: .4byte gUnknown_3005E88 _0815058C: .4byte sub_81505C4 @@ -199,13 +199,13 @@ sub_81505C4: @ 81505C4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0815060C @ =gUnknown_2037078 + ldr r0, _0815060C @ =gPlayerAvatar mov r9, r0 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08150610 @ =gUnknown_2036E38 + ldr r1, _08150610 @ =gMapObjects adds r5, r0, r1 ldrb r1, [r5, 0x4] lsls r0, r1, 4 @@ -229,8 +229,8 @@ sub_81505C4: @ 81505C4 beq _08150626 b _081506FC .align 2, 0 -_0815060C: .4byte gUnknown_2037078 -_08150610: .4byte gUnknown_2036E38 +_0815060C: .4byte gPlayerAvatar +_08150610: .4byte gMapObjects _08150614: .4byte gSprites _08150618: .4byte gTasks _0815061C: @@ -348,12 +348,12 @@ _081506FC: thumb_func_start sub_8150708 sub_8150708: @ 8150708 push {r4,r5,lr} - ldr r5, _08150770 @ =gUnknown_2037078 + ldr r5, _08150770 @ =gPlayerAvatar ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08150774 @ =gUnknown_2036E38 + ldr r1, _08150774 @ =gMapObjects adds r4, r0, r1 ldrb r1, [r5] movs r0, 0x8 @@ -394,8 +394,8 @@ _08150768: pop {r0} bx r0 .align 2, 0 -_08150770: .4byte gUnknown_2037078 -_08150774: .4byte gUnknown_2036E38 +_08150770: .4byte gPlayerAvatar +_08150774: .4byte gMapObjects _08150778: .4byte gUnknown_20386E0 thumb_func_end sub_8150708 diff --git a/asm/region_map.s b/asm/region_map.s index aa684531d..f860c6065 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -932,7 +932,7 @@ _080C0584: _080C05D8: .4byte gUnknown_8418EB5 _080C05DC: .4byte gUnknown_8418E8B _080C05E0: - ldr r0, _080C0618 @ =gUnknown_2037AB8 + ldr r0, _080C0618 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -958,7 +958,7 @@ _080C05FA: adds r1, r2 b _080C07A0 .align 2, 0 -_080C0618: .4byte gUnknown_2037AB8 +_080C0618: .4byte gPaletteFade _080C061C: .4byte gUnknown_20399D4 _080C0620: .4byte 0x000047a0 _080C0624: @@ -1140,7 +1140,7 @@ _080C07A0: _080C07A8: .4byte gUnknown_20399D4 _080C07AC: .4byte 0x000047a0 _080C07B0: - ldr r0, _080C07CC @ =gUnknown_2037AB8 + ldr r0, _080C07CC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1154,7 +1154,7 @@ _080C07C2: pop {r0} bx r0 .align 2, 0 -_080C07CC: .4byte gUnknown_2037AB8 +_080C07CC: .4byte gPaletteFade thumb_func_end sub_80C04E4 thumb_func_start sub_80C07D0 @@ -5019,7 +5019,7 @@ _080C2768: bl sub_80C2B48 b _080C2976 _080C2788: - ldr r0, _080C27AC @ =gUnknown_2037AB8 + ldr r0, _080C27AC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -5037,7 +5037,7 @@ _080C2796: bl PlaySE b _080C299A .align 2, 0 -_080C27AC: .4byte gUnknown_2037AB8 +_080C27AC: .4byte gPaletteFade _080C27B0: .4byte 0x00000ccc _080C27B4: bl sub_80C29A4 @@ -10006,7 +10006,7 @@ _080C4FEC: .align 2, 0 _080C4FFC: .4byte gUnknown_8418EB0 _080C5000: - ldr r0, _080C5024 @ =gUnknown_2037AB8 + ldr r0, _080C5024 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10022,7 +10022,7 @@ _080C500E: bl PutWindowTilemap b _080C51A6 .align 2, 0 -_080C5024: .4byte gUnknown_2037AB8 +_080C5024: .4byte gPaletteFade _080C5028: bl sub_80C3400 lsls r0, 24 @@ -10207,7 +10207,7 @@ _080C51AA: .align 2, 0 _080C51B4: .4byte gUnknown_20399FC _080C51B8: - ldr r0, _080C51E4 @ =gUnknown_2037AB8 + ldr r0, _080C51E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10229,7 +10229,7 @@ _080C51DC: pop {r0} bx r0 .align 2, 0 -_080C51E4: .4byte gUnknown_2037AB8 +_080C51E4: .4byte gPaletteFade thumb_func_end sub_80C4F08 thumb_func_start sub_80C51E8 diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s index a30d8e833..f7c412cde 100644 --- a/asm/reshow_battle_screen.s +++ b/asm/reshow_battle_screen.s @@ -13,7 +13,7 @@ nullsub_44: @ 8077760 thumb_func_start sub_8077764 sub_8077764: @ 8077764 push {lr} - ldr r2, _080777B0 @ =gUnknown_2037AB8 + ldr r2, _080777B0 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -48,7 +48,7 @@ sub_8077764: @ 8077764 bl sub_812B1F0 b _080777DA .align 2, 0 -_080777B0: .4byte gUnknown_2037AB8 +_080777B0: .4byte gPaletteFade _080777B4: .4byte gBattleScripting _080777B8: .4byte gBattleTypeFlags _080777BC: @@ -355,7 +355,7 @@ _08077A5C: movs r2, 0x10 movs r3, 0 bl BeginHardwarePaletteFade - ldr r2, _08077AA0 @ =gUnknown_2037AB8 + ldr r2, _08077AA0 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -375,7 +375,7 @@ _08077A8A: bx r0 .align 2, 0 _08077A9C: .4byte sub_80116F4 -_08077AA0: .4byte gUnknown_2037AB8 +_08077AA0: .4byte gPaletteFade _08077AA4: .4byte sub_8011100 _08077AA8: .4byte gBattleScripting thumb_func_end sub_80777E8 diff --git a/asm/rom6.s b/asm/rom6.s index a438b9276..8d5e76f8a 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -23,7 +23,7 @@ npc_before_player_of_type: @ 80C97A8 bl GetFieldObjectIdByXYZ lsls r0, 24 lsrs r0, 24 - ldr r2, _080C97EC @ =gUnknown_2036E38 + ldr r2, _080C97EC @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -38,7 +38,7 @@ npc_before_player_of_type: @ 80C97A8 b _080C97F6 .align 2, 0 _080C97E8: .4byte gUnknown_2039A04 -_080C97EC: .4byte gUnknown_2036E38 +_080C97EC: .4byte gMapObjects _080C97F0: .4byte gUnknown_20370D2 _080C97F4: movs r0, 0 @@ -73,14 +73,14 @@ task08_080C9820: @ 80C9820 lsrs r5, r0, 24 adds r6, r5, 0 bl ScriptContext2_Enable - ldr r1, _080C9874 @ =gUnknown_2037078 + ldr r1, _080C9874 @ =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] ldrb r1, [r1, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080C9878 @ =gUnknown_2036E38 + ldr r1, _080C9878 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -107,8 +107,8 @@ _080C9856: ldr r0, _080C9884 @ =sub_80C98FC b _080C98A0 .align 2, 0 -_080C9874: .4byte gUnknown_2037078 -_080C9878: .4byte gUnknown_2036E38 +_080C9874: .4byte gPlayerAvatar +_080C9878: .4byte gMapObjects _080C987C: .4byte gMapHeader _080C9880: .4byte gTasks _080C9884: .4byte sub_80C98FC @@ -139,12 +139,12 @@ sub_80C98B0: @ 80C98B0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080C98EC @ =gUnknown_2037078 + ldr r0, _080C98EC @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080C98F0 @ =gUnknown_2036E38 + ldr r1, _080C98F0 @ =gMapObjects adds r0, r1 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 @@ -165,8 +165,8 @@ _080C98E4: pop {r0} bx r0 .align 2, 0 -_080C98EC: .4byte gUnknown_2037078 -_080C98F0: .4byte gUnknown_2036E38 +_080C98EC: .4byte gPlayerAvatar +_080C98F0: .4byte gMapObjects _080C98F4: .4byte gTasks _080C98F8: .4byte sub_80C98FC thumb_func_end sub_80C98B0 @@ -207,12 +207,12 @@ _080C9934: movs r0, 0x3 str r0, [r6, 0x8] _080C993C: - ldr r5, _080C998C @ =gUnknown_2037078 + ldr r5, _080C998C @ =gPlayerAvatar ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080C9990 @ =gUnknown_2036E38 + ldr r0, _080C9990 @ =gMapObjects adds r4, r0 bl GetPlayerAvatarGraphicsIdByCurrentState adds r1, r0, 0 @@ -243,8 +243,8 @@ _080C9980: bx r0 .align 2, 0 _080C9988: .4byte gUnknown_20386E0 -_080C998C: .4byte gUnknown_2037078 -_080C9990: .4byte gUnknown_2036E38 +_080C998C: .4byte gPlayerAvatar +_080C9990: .4byte gMapObjects _080C9994: .4byte gSprites _080C9998: .4byte gTasks _080C999C: .4byte sub_80C99A0 @@ -266,7 +266,7 @@ sub_80C99A0: @ 80C99A0 ldrh r0, [r0, 0x1A] orrs r1, r0 bl _call_via_r1 - ldr r1, _080C99D4 @ =gUnknown_2037078 + ldr r1, _080C99D4 @ =gPlayerAvatar movs r0, 0 strb r0, [r1, 0x6] adds r0, r4, 0 @@ -276,7 +276,7 @@ sub_80C99A0: @ 80C99A0 bx r0 .align 2, 0 _080C99D0: .4byte gTasks -_080C99D4: .4byte gUnknown_2037078 +_080C99D4: .4byte gPlayerAvatar thumb_func_end sub_80C99A0 thumb_func_start SetUpFieldMove_RockSmash diff --git a/asm/roulette_util.s b/asm/roulette_util.s index 8e60a9fe2..532bf4684 100644 --- a/asm/roulette_util.s +++ b/asm/roulette_util.s @@ -151,9 +151,9 @@ _080D8CD8: ldrh r0, [r5, 0x6] add r0, r12 lsls r0, 1 - ldr r1, _080D8CFC @ =gUnknown_20375F8 + ldr r1, _080D8CFC @ =gPlttBufferFaded adds r3, r0, r1 - ldr r1, _080D8D00 @ =gUnknown_20371F8 + ldr r1, _080D8D00 @ =gPlttBufferUnfaded adds r6, r0, r1 ldrb r0, [r5] lsls r0, 25 @@ -165,8 +165,8 @@ _080D8CD8: b _080D8E4E .align 2, 0 _080D8CF8: .4byte 0xfffffc1f -_080D8CFC: .4byte gUnknown_20375F8 -_080D8D00: .4byte gUnknown_20371F8 +_080D8CFC: .4byte gPlttBufferFaded +_080D8D00: .4byte gPlttBufferUnfaded _080D8D04: ldr r0, [r3] lsls r2, r0, 27 @@ -422,7 +422,7 @@ _080D8ECE: ldrb r0, [r3, 0x8] cmp r2, r0 bcs _080D8EEE - ldr r4, _080D8EF8 @ =gUnknown_20375F8 + ldr r4, _080D8EF8 @ =gPlttBufferFaded _080D8ED6: ldrh r0, [r3, 0x6] adds r0, r2 @@ -443,13 +443,13 @@ _080D8EEE: adds r1, 0x1 b _080D8F28 .align 2, 0 -_080D8EF8: .4byte gUnknown_20375F8 +_080D8EF8: .4byte gPlttBufferFaded _080D8EFC: ldrb r0, [r3, 0x8] cmp r2, r0 bcs _080D8F20 - ldr r5, _080D8F40 @ =gUnknown_20375F8 - ldr r4, _080D8F44 @ =gUnknown_20371F8 + ldr r5, _080D8F40 @ =gPlttBufferFaded + ldr r4, _080D8F44 @ =gPlttBufferUnfaded _080D8F06: ldrh r0, [r3, 0x6] adds r0, r2 @@ -483,8 +483,8 @@ _080D8F36: pop {r1} bx r1 .align 2, 0 -_080D8F40: .4byte gUnknown_20375F8 -_080D8F44: .4byte gUnknown_20371F8 +_080D8F40: .4byte gPlttBufferFaded +_080D8F44: .4byte gPlttBufferUnfaded thumb_func_end sub_80D8EB8 thumb_func_start task_tutorial_controls_fadein @@ -625,9 +625,9 @@ _080D9016: beq _080D907E ldrh r1, [r4, 0xA] lsls r1, 1 - ldr r0, _080D9074 @ =gUnknown_20375F8 + ldr r0, _080D9074 @ =gPlttBufferFaded adds r0, r1, r0 - ldr r2, _080D9078 @ =gUnknown_20371F8 + ldr r2, _080D9078 @ =gPlttBufferUnfaded adds r1, r2 ldrb r2, [r4, 0xC] lsls r2, 1 @@ -651,8 +651,8 @@ _080D9016: strb r0, [r4, 0x7] b _080D907E .align 2, 0 -_080D9074: .4byte gUnknown_20375F8 -_080D9078: .4byte gUnknown_20371F8 +_080D9074: .4byte gPlttBufferFaded +_080D9078: .4byte gPlttBufferUnfaded _080D907C: strb r3, [r4, 0x7] _080D907E: @@ -787,8 +787,8 @@ sub_80D9140: @ 80D9140 adds r0, r2, r0 cmp r2, r0 bge _080D9182 - ldr r5, _080D91B4 @ =gUnknown_20375F8 - ldr r3, _080D91B8 @ =gUnknown_20371F8 + ldr r5, _080D91B4 @ =gPlttBufferFaded + ldr r3, _080D91B8 @ =gPlttBufferUnfaded _080D9168: lsls r0, r2, 1 adds r1, r0, r5 @@ -829,8 +829,8 @@ _080D9182: pop {r0} bx r0 .align 2, 0 -_080D91B4: .4byte gUnknown_20375F8 -_080D91B8: .4byte gUnknown_20371F8 +_080D91B4: .4byte gPlttBufferFaded +_080D91B8: .4byte gPlttBufferUnfaded thumb_func_end sub_80D9140 thumb_func_start sub_80D91BC @@ -992,8 +992,8 @@ sub_80D9294: @ 80D9294 adds r0, r2, r0 cmp r2, r0 bge _080D92FA - ldr r5, _080D9314 @ =gUnknown_20375F8 - ldr r4, _080D9318 @ =gUnknown_20371F8 + ldr r5, _080D9314 @ =gPlttBufferFaded + ldr r4, _080D9318 @ =gPlttBufferUnfaded _080D92E0: lsls r0, r2, 1 adds r1, r0, r5 @@ -1022,8 +1022,8 @@ _080D92FA: strh r0, [r2] b _080D93A6 .align 2, 0 -_080D9314: .4byte gUnknown_20375F8 -_080D9318: .4byte gUnknown_20371F8 +_080D9314: .4byte gPlttBufferFaded +_080D9318: .4byte gPlttBufferUnfaded _080D931C: movs r0, 0x1 mov r9, r0 @@ -1066,8 +1066,8 @@ _080D9350: adds r0, r2, r0 cmp r2, r0 bge _080D9386 - ldr r6, _080D93B4 @ =gUnknown_20375F8 - ldr r4, _080D93B8 @ =gUnknown_20371F8 + ldr r6, _080D93B4 @ =gPlttBufferFaded + ldr r4, _080D93B8 @ =gPlttBufferUnfaded _080D936C: lsls r0, r2, 1 adds r1, r0, r6 @@ -1109,8 +1109,8 @@ _080D93A6: pop {r0} bx r0 .align 2, 0 -_080D93B4: .4byte gUnknown_20375F8 -_080D93B8: .4byte gUnknown_20371F8 +_080D93B4: .4byte gPlttBufferFaded +_080D93B8: .4byte gPlttBufferUnfaded thumb_func_end sub_80D9294 thumb_func_start sub_80D93BC @@ -1151,7 +1151,7 @@ _080D93E4: beq _080D93FE b _080D9552 _080D93FE: - ldr r0, _080D944C @ =gUnknown_2037AB8 + ldr r0, _080D944C @ =gPaletteFade ldrb r1, [r0, 0x7] adds r0, r3, 0 ands r0, r1 @@ -1191,7 +1191,7 @@ _080D9424: beq _080D9456 b _080D953C .align 2, 0 -_080D944C: .4byte gUnknown_2037AB8 +_080D944C: .4byte gPaletteFade _080D9450: cmp r0, 0x2 beq _080D94FE diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 53215ab33..733860772 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -1423,7 +1423,7 @@ ScrCmd_setflashradius: @ 806A8FC thumb_func_start sub_806A918 sub_806A918: @ 806A918 push {lr} - ldr r0, _0806A92C @ =gUnknown_2037AB8 + ldr r0, _0806A92C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1432,7 +1432,7 @@ sub_806A918: @ 806A918 movs r0, 0 b _0806A932 .align 2, 0 -_0806A92C: .4byte gUnknown_2037AB8 +_0806A92C: .4byte gPaletteFade _0806A930: movs r0, 0x1 _0806A932: @@ -3065,7 +3065,7 @@ ScrCmd_resetobjectpriority: @ 806B58C thumb_func_start ScrCmd_faceplayer ScrCmd_faceplayer: @ 806B5BC push {r4,lr} - ldr r2, _0806B5EC @ =gUnknown_2036E38 + ldr r2, _0806B5EC @ =gMapObjects ldr r0, _0806B5F0 @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -3088,7 +3088,7 @@ _0806B5E4: pop {r1} bx r1 .align 2, 0 -_0806B5EC: .4byte gUnknown_2036E38 +_0806B5EC: .4byte gMapObjects _0806B5F0: .4byte gUnknown_3005074 thumb_func_end ScrCmd_faceplayer @@ -3245,7 +3245,7 @@ ScrCmd_lock: @ 806B704 movs r0, 0 b _0806B752 _0806B714: - ldr r2, _0806B738 @ =gUnknown_2036E38 + ldr r2, _0806B738 @ =gMapObjects ldr r0, _0806B73C @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -3262,7 +3262,7 @@ _0806B714: bl SetupNativeScript b _0806B750 .align 2, 0 -_0806B738: .4byte gUnknown_2036E38 +_0806B738: .4byte gMapObjects _0806B73C: .4byte gUnknown_3005074 _0806B740: .4byte sub_8069648 _0806B744: @@ -3294,7 +3294,7 @@ ScrCmd_releaseall: @ 806B75C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0806B790 @ =gUnknown_2036E38 + ldr r1, _0806B790 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished bl sub_80974D8 @@ -3303,14 +3303,14 @@ ScrCmd_releaseall: @ 806B75C pop {r1} bx r1 .align 2, 0 -_0806B790: .4byte gUnknown_2036E38 +_0806B790: .4byte gMapObjects thumb_func_end ScrCmd_releaseall thumb_func_start ScrCmd_release ScrCmd_release: @ 806B794 push {r4,lr} bl HideFieldMessageBox - ldr r4, _0806B7E4 @ =gUnknown_2036E38 + ldr r4, _0806B7E4 @ =gMapObjects ldr r0, _0806B7E8 @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -3343,7 +3343,7 @@ _0806B7B6: pop {r1} bx r1 .align 2, 0 -_0806B7E4: .4byte gUnknown_2036E38 +_0806B7E4: .4byte gMapObjects _0806B7E8: .4byte gUnknown_3005074 thumb_func_end ScrCmd_release diff --git a/asm/script_menu.s b/asm/script_menu.s index 08f1c32b4..321f739a0 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -453,7 +453,7 @@ sub_809CC98: @ 809CC98 lsls r0, 3 ldr r1, _0809CCC4 @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _0809CCC8 @ =gUnknown_2037AB8 + ldr r0, _0809CCC8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -468,7 +468,7 @@ sub_809CC98: @ 809CC98 b _0809CD3C .align 2, 0 _0809CCC4: .4byte gTasks+0x8 -_0809CCC8: .4byte gUnknown_2037AB8 +_0809CCC8: .4byte gPaletteFade _0809CCCC: .4byte gUnknown_2039988 _0809CCD0: movs r1, 0xA diff --git a/asm/script_movement.s b/asm/script_movement.s index 58becc75a..826d6d6bd 100644 --- a/asm/script_movement.s +++ b/asm/script_movement.s @@ -480,7 +480,7 @@ _0809777C: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080977A8 @ =gUnknown_2036E38 + ldr r1, _080977A8 @ =gMapObjects adds r0, r1 bl npc_sync_anim_pause_bits _08097792: @@ -495,7 +495,7 @@ _08097792: bx r0 .align 2, 0 _080977A4: .4byte gTasks+0x8 -_080977A8: .4byte gUnknown_2036E38 +_080977A8: .4byte gMapObjects thumb_func_end UnfreezeObjects thumb_func_start Task_80A244C @@ -557,7 +557,7 @@ sub_80977F0: @ 80977F0 lsls r0, r4, 3 adds r0, r4 lsls r0, 2 - ldr r1, _08097850 @ =gUnknown_2036E38 + ldr r1, _08097850 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimActive @@ -580,7 +580,7 @@ _08097838: bl FreezeMapObject b _0809786A .align 2, 0 -_08097850: .4byte gUnknown_2036E38 +_08097850: .4byte gMapObjects _08097854: adds r0, r4, 0 bl sub_8063CA4 diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index c2184904c..03c4a61a6 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -72,7 +72,7 @@ sub_80BF97C: @ 80BF97C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _080BF9B4 @ =gUnknown_2037AB8 + ldr r2, _080BF9B4 @ =gPaletteFade ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -96,7 +96,7 @@ _080BF9AC: pop {r0} bx r0 .align 2, 0 -_080BF9B4: .4byte gUnknown_2037AB8 +_080BF9B4: .4byte gPaletteFade _080BF9B8: .4byte gTasks thumb_func_end sub_80BF97C diff --git a/asm/seagallop.s b/asm/seagallop.s index 45ff92759..7d40b69e0 100644 --- a/asm/seagallop.s +++ b/asm/seagallop.s @@ -316,7 +316,7 @@ sub_8147108: @ 8147108 lsls r0, 24 cmp r0, 0 beq _08147136 - ldr r0, _0814713C @ =gUnknown_2037AB8 + ldr r0, _0814713C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -331,7 +331,7 @@ _08147136: pop {r0} bx r0 .align 2, 0 -_0814713C: .4byte gUnknown_2037AB8 +_0814713C: .4byte gPaletteFade thumb_func_end sub_8147108 thumb_func_start sub_8147140 diff --git a/asm/shop.s b/asm/shop.s index 8c39c795f..da5ab15ee 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -347,7 +347,7 @@ sub_809AD40: @ 809AD40 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0809AD70 @ =gUnknown_2037AB8 + ldr r0, _0809AD70 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -365,7 +365,7 @@ _0809AD68: pop {r0} bx r0 .align 2, 0 -_0809AD70: .4byte gUnknown_2037AB8 +_0809AD70: .4byte gPaletteFade thumb_func_end sub_809AD40 thumb_func_start sub_809AD74 @@ -1889,7 +1889,7 @@ _0809B976: ldr r1, _0809B9EC @ =gUnknown_20398B8 adds r0, r2, r1 strh r5, [r0] - ldr r1, _0809B9F0 @ =gUnknown_2036E38 + ldr r1, _0809B9F0 @ =gMapObjects lsls r0, r3, 3 adds r0, r3 lsls r0, 2 @@ -1910,7 +1910,7 @@ _0809B9E0: .4byte gUnknown_20398BA _0809B9E4: .4byte 0x0000fffd _0809B9E8: .4byte 0x0000fffe _0809B9EC: .4byte gUnknown_20398B8 -_0809B9F0: .4byte gUnknown_2036E38 +_0809B9F0: .4byte gMapObjects _0809B9F4: cmp r0, 0x3 beq _0809BA06 @@ -1968,7 +1968,7 @@ sub_809BA40: @ 809BA40 sub sp, 0x4 movs r6, 0 ldr r7, _0809BAE8 @ =gUnknown_20398B4 - ldr r0, _0809BAEC @ =gUnknown_2036E38 + ldr r0, _0809BAEC @ =gMapObjects mov r8, r0 adds r1, r7, 0x6 mov r9, r1 @@ -2045,7 +2045,7 @@ _0809BACE: bx r0 .align 2, 0 _0809BAE8: .4byte gUnknown_20398B4 -_0809BAEC: .4byte gUnknown_2036E38 +_0809BAEC: .4byte gMapObjects _0809BAF0: .4byte 0xfff80000 _0809BAF4: .4byte SpriteCallbackDummy _0809BAF8: .4byte gSprites @@ -2157,7 +2157,7 @@ sub_809BBC0: @ 809BBC0 lsls r0, 3 ldr r1, _0809BC00 @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _0809BC04 @ =gUnknown_2037AB8 + ldr r0, _0809BC04 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2181,7 +2181,7 @@ sub_809BBC0: @ 809BBC0 b _0809BC8E .align 2, 0 _0809BC00: .4byte gTasks+0x8 -_0809BC04: .4byte gUnknown_2037AB8 +_0809BC04: .4byte gPaletteFade _0809BC08: .4byte gUnknown_2039942 _0809BC0C: movs r0, 0x5 @@ -2682,7 +2682,7 @@ sub_809C04C: @ 809C04C lsls r0, 3 ldr r1, _0809C088 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _0809C08C @ =gUnknown_2037AB8 + ldr r0, _0809C08C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2703,7 +2703,7 @@ _0809C082: bx r0 .align 2, 0 _0809C088: .4byte gTasks+0x8 -_0809C08C: .4byte gUnknown_2037AB8 +_0809C08C: .4byte gPaletteFade _0809C090: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_809C04C diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 1f4cd16c8..f21a6f185 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -3683,7 +3683,7 @@ _0814142E: b _08141450 _08141436: bl UpdatePaletteFade - ldr r0, _0814144C @ =gUnknown_2037AB8 + ldr r0, _0814144C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3692,7 +3692,7 @@ _08141436: movs r0, 0 b _08141452 .align 2, 0 -_0814144C: .4byte gUnknown_2037AB8 +_0814144C: .4byte gPaletteFade _08141450: movs r0, 0x1 _08141452: @@ -3728,7 +3728,7 @@ _08141472: strb r0, [r4] b _081414A0 _0814148A: - ldr r0, _0814149C @ =gUnknown_2037AB8 + ldr r0, _0814149C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3737,7 +3737,7 @@ _0814148A: movs r0, 0 b _081414A2 .align 2, 0 -_0814149C: .4byte gUnknown_2037AB8 +_0814149C: .4byte gPaletteFade _081414A0: movs r0, 0x1 _081414A2: @@ -4503,9 +4503,9 @@ _08141A00: bl BlendPalettes _08141A2C: movs r4, 0 - ldr r5, _08141A4C @ =gUnknown_20375F8 + ldr r5, _08141A4C @ =gPlttBufferFaded ldr r3, _08141A50 @ =gUnknown_8466C34 - ldr r2, _08141A54 @ =gUnknown_20371F8 + ldr r2, _08141A54 @ =gPlttBufferUnfaded _08141A34: adds r0, r4, r3 ldrb r0, [r0] @@ -4520,9 +4520,9 @@ _08141A34: bls _08141A34 b _08141AA8 .align 2, 0 -_08141A4C: .4byte gUnknown_20375F8 +_08141A4C: .4byte gPlttBufferFaded _08141A50: .4byte gUnknown_8466C34 -_08141A54: .4byte gUnknown_20371F8 +_08141A54: .4byte gPlttBufferUnfaded _08141A58: movs r4, 0 _08141A5A: diff --git a/asm/ss_anne.s b/asm/ss_anne.s index 5ba63dea3..429645f3e 100644 --- a/asm/ss_anne.s +++ b/asm/ss_anne.s @@ -100,7 +100,7 @@ _0815D3D6: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0815D42C @ =gUnknown_2036E38 + ldr r1, _0815D42C @ =gMapObjects adds r0, r1 ldr r2, _0815D430 @ =gSprites ldrb r1, [r0, 0x4] @@ -128,7 +128,7 @@ _0815D3D6: .align 2, 0 _0815D424: .4byte gTasks+0x8 _0815D428: .4byte gSaveBlock1Ptr -_0815D42C: .4byte gUnknown_2036E38 +_0815D42C: .4byte gMapObjects _0815D430: .4byte gSprites _0815D434: .4byte sub_815D454 _0815D438: @@ -197,7 +197,7 @@ sub_815D498: @ 815D498 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0815D50C @ =gUnknown_2036E38 + ldr r1, _0815D50C @ =gMapObjects adds r0, r1 ldr r4, _0815D510 @ =gSprites ldrb r1, [r0, 0x4] @@ -238,7 +238,7 @@ sub_815D498: @ 815D498 bx r0 .align 2, 0 _0815D508: .4byte gSaveBlock1Ptr -_0815D50C: .4byte gUnknown_2036E38 +_0815D50C: .4byte gMapObjects _0815D510: .4byte gSprites _0815D514: .4byte gUnknown_8479C88 thumb_func_end sub_815D498 @@ -260,7 +260,7 @@ sub_815D518: @ 815D518 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0815D59C @ =gUnknown_2036E38 + ldr r1, _0815D59C @ =gMapObjects adds r0, r1 ldr r2, _0815D5A0 @ =gSprites ldrb r1, [r0, 0x4] @@ -308,7 +308,7 @@ _0815D58E: bx r0 .align 2, 0 _0815D598: .4byte gSaveBlock1Ptr -_0815D59C: .4byte gUnknown_2036E38 +_0815D59C: .4byte gMapObjects _0815D5A0: .4byte gSprites thumb_func_end sub_815D518 @@ -328,7 +328,7 @@ sub_815D5A4: @ 815D5A4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0815D618 @ =gUnknown_2036E38 + ldr r1, _0815D618 @ =gMapObjects adds r0, r1 ldr r4, _0815D61C @ =gSprites ldrb r0, [r0, 0x4] @@ -371,7 +371,7 @@ _0815D60C: bx r0 .align 2, 0 _0815D614: .4byte gSaveBlock1Ptr -_0815D618: .4byte gUnknown_2036E38 +_0815D618: .4byte gMapObjects _0815D61C: .4byte gSprites _0815D620: .4byte gUnknown_8479CC0 thumb_func_end sub_815D5A4 diff --git a/asm/start_menu.s b/asm/start_menu.s index a776442d5..377aea3f2 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -631,8 +631,8 @@ _0806F24E: _0806F254: .4byte gUnknown_20370F0 thumb_func_end sub_806F1F0 - thumb_func_start sub_806F258 -sub_806F258: @ 806F258 + thumb_func_start ShowStartMenu +ShowStartMenu: @ 806F258 push {lr} bl sub_805642C cmp r0, 0 @@ -648,7 +648,7 @@ _0806F26E: bx r0 .align 2, 0 _0806F27C: .4byte sub_806F1F0 - thumb_func_end sub_806F258 + thumb_func_end ShowStartMenu thumb_func_start sub_806F280 sub_806F280: @ 806F280 @@ -841,7 +841,7 @@ _0806F40A: thumb_func_start sub_806F410 sub_806F410: @ 806F410 push {lr} - ldr r0, _0806F424 @ =gUnknown_2037AB8 + ldr r0, _0806F424 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -850,7 +850,7 @@ sub_806F410: @ 806F410 movs r0, 0 b _0806F442 .align 2, 0 -_0806F424: .4byte gUnknown_2037AB8 +_0806F424: .4byte gPaletteFade _0806F428: movs r0, 0x29 bl IncrementGameStat @@ -870,7 +870,7 @@ _0806F448: .4byte sub_810275C thumb_func_start sub_806F44C sub_806F44C: @ 806F44C push {lr} - ldr r0, _0806F460 @ =gUnknown_2037AB8 + ldr r0, _0806F460 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -879,7 +879,7 @@ sub_806F44C: @ 806F44C movs r0, 0 b _0806F478 .align 2, 0 -_0806F460: .4byte gUnknown_2037AB8 +_0806F460: .4byte gPaletteFade _0806F464: bl play_some_sound bl sub_806EF18 @@ -897,7 +897,7 @@ _0806F47C: .4byte CB2_PartyMenuFromStartMenu thumb_func_start sub_806F480 sub_806F480: @ 806F480 push {lr} - ldr r0, _0806F494 @ =gUnknown_2037AB8 + ldr r0, _0806F494 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -906,7 +906,7 @@ sub_806F480: @ 806F480 movs r0, 0 b _0806F4AC .align 2, 0 -_0806F494: .4byte gUnknown_2037AB8 +_0806F494: .4byte gPaletteFade _0806F498: bl play_some_sound bl sub_806EF18 @@ -924,7 +924,7 @@ _0806F4B0: .4byte sub_8107EB8 thumb_func_start sub_806F4B4 sub_806F4B4: @ 806F4B4 push {lr} - ldr r0, _0806F4C8 @ =gUnknown_2037AB8 + ldr r0, _0806F4C8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -933,7 +933,7 @@ sub_806F4B4: @ 806F4B4 movs r0, 0 b _0806F4E0 .align 2, 0 -_0806F4C8: .4byte gUnknown_2037AB8 +_0806F4C8: .4byte gPaletteFade _0806F4CC: bl play_some_sound bl sub_806EF18 @@ -963,7 +963,7 @@ _0806F4F8: .4byte sub_806F5A4 thumb_func_start sub_806F4FC sub_806F4FC: @ 806F4FC push {lr} - ldr r0, _0806F510 @ =gUnknown_2037AB8 + ldr r0, _0806F510 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -972,7 +972,7 @@ sub_806F4FC: @ 806F4FC movs r0, 0 b _0806F52E .align 2, 0 -_0806F510: .4byte gUnknown_2037AB8 +_0806F510: .4byte gPaletteFade _0806F514: bl play_some_sound bl sub_806EF18 @@ -1018,7 +1018,7 @@ sub_806F554: @ 806F554 thumb_func_start sub_806F56C sub_806F56C: @ 806F56C push {lr} - ldr r0, _0806F580 @ =gUnknown_2037AB8 + ldr r0, _0806F580 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1027,7 +1027,7 @@ sub_806F56C: @ 806F56C movs r0, 0 b _0806F598 .align 2, 0 -_0806F580: .4byte gUnknown_2037AB8 +_0806F580: .4byte gPaletteFade _0806F584: bl play_some_sound bl sub_80563F0 @@ -1860,7 +1860,7 @@ sub_806FBB8: @ 806FBB8 lsls r0, 3 ldr r1, _0806FBEC @ =gTasks+0x8 adds r5, r0, r1 - ldr r0, _0806FBF0 @ =gUnknown_2037AB8 + ldr r0, _0806FBF0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1881,7 +1881,7 @@ _0806FBE2: mov pc, r0 .align 2, 0 _0806FBEC: .4byte gTasks+0x8 -_0806FBF0: .4byte gUnknown_2037AB8 +_0806FBF0: .4byte gPaletteFade _0806FBF4: .4byte _0806FBF8 .align 2, 0 _0806FBF8: diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s index 70b02bbd5..812aac1a5 100644 --- a/asm/teachy_tv.s +++ b/asm/teachy_tv.s @@ -849,7 +849,7 @@ sub_815B274: @ 815B274 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0815B298 @ =gUnknown_2037AB8 + ldr r0, _0815B298 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -863,7 +863,7 @@ sub_815B274: @ 815B274 bl SetMainCallback2 b _0815B2AC .align 2, 0 -_0815B298: .4byte gUnknown_2037AB8 +_0815B298: .4byte gPaletteFade _0815B29C: .4byte gUnknown_203F450 _0815B2A0: bl sub_8055DC4 @@ -893,7 +893,7 @@ sub_815B2C0: @ 815B2C0 ldr r1, _0815B31C @ =gTasks+0x8 adds r6, r0, r1 bl sub_815B0CC - ldr r0, _0815B320 @ =gUnknown_2037AB8 + ldr r0, _0815B320 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -929,7 +929,7 @@ _0815B30A: b _0815B37A .align 2, 0 _0815B31C: .4byte gTasks+0x8 -_0815B320: .4byte gUnknown_2037AB8 +_0815B320: .4byte gPaletteFade _0815B324: .4byte gUnknown_203F44A _0815B328: .4byte gMain _0815B32C: .4byte sub_8107EB8 @@ -1864,7 +1864,7 @@ sub_815BA54: @ 815BA54 lsls r2, r1, 3 ldr r4, _0815BA8C @ =gTasks+0x8 adds r3, r2, r4 - ldr r0, _0815BA90 @ =gUnknown_2037AB8 + ldr r0, _0815BA90 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1887,7 +1887,7 @@ _0815BA86: bx r0 .align 2, 0 _0815BA8C: .4byte gTasks+0x8 -_0815BA90: .4byte gUnknown_2037AB8 +_0815BA90: .4byte gPaletteFade _0815BA94: .4byte gUnknown_8479390 _0815BA98: .4byte gUnknown_203F444 _0815BA9C: .4byte sub_815B4EC diff --git a/asm/title_screen.s b/asm/title_screen.s index 3ff269d8f..c07978623 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -577,7 +577,7 @@ _08078DF2: bgt _08078E02 b _08078FB6 _08078E02: - ldr r0, _08078E20 @ =gUnknown_2037398 + ldr r0, _08078E20 @ =gPlttBufferUnfaded + 0x1A0 movs r1, 0x10 bl TintPalette_GrayScale2 movs r0, 0x80 @@ -590,9 +590,9 @@ _08078E02: bl BeginNormalPaletteFade b _08078F80 .align 2, 0 -_08078E20: .4byte gUnknown_2037398 +_08078E20: .4byte gPlttBufferUnfaded + 0x1A0 _08078E24: - ldr r0, _08078E3C @ =gUnknown_2037AB8 + ldr r0, _08078E3C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -605,7 +605,7 @@ _08078E36: strh r0, [r6, 0x4] b _08078F80 .align 2, 0 -_08078E3C: .4byte gUnknown_2037AB8 +_08078E3C: .4byte gPaletteFade _08078E40: ldrh r0, [r6, 0x4] adds r0, 0x1 @@ -749,7 +749,7 @@ _08078F24: movs r0, 0 bl ShowBg ldr r0, _08078F90 @ =gUnknown_8EAD5E8 - ldr r1, _08078F94 @ =gUnknown_2037398 + ldr r1, _08078F94 @ =gPlttBufferUnfaded + 0x1A0 movs r2, 0x10 bl CpuSet movs r0, 0x80 @@ -772,13 +772,13 @@ _08078F80: _08078F88: .4byte 0x00001fff _08078F8C: .4byte 0x00007fde _08078F90: .4byte gUnknown_8EAD5E8 -_08078F94: .4byte gUnknown_2037398 +_08078F94: .4byte gPlttBufferUnfaded + 0x1A0 _08078F98: movs r0, 0 bl sub_807185C cmp r0, 0 bne _08078FB6 - ldr r0, _08078FC0 @ =gUnknown_2037AB8 + ldr r0, _08078FC0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -793,7 +793,7 @@ _08078FB6: pop {r0} bx r0 .align 2, 0 -_08078FC0: .4byte gUnknown_2037AB8 +_08078FC0: .4byte gPaletteFade thumb_func_end sub_8078DA4 thumb_func_start sub_8078FC4 @@ -943,7 +943,7 @@ _080790FC: bl sub_8079A88 b _0807918C _08079104: - ldr r0, _08079138 @ =gUnknown_2037AB8 + ldr r0, _08079138 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -966,13 +966,13 @@ _08079104: bl sub_8079528 b _0807918C .align 2, 0 -_08079138: .4byte gUnknown_2037AB8 +_08079138: .4byte gPaletteFade _0807913C: bl IsNotWaitingForBGMStop lsls r0, 24 cmp r0, 0 beq _080791B0 - ldr r0, _08079168 @ =gUnknown_2037AB8 + ldr r0, _08079168 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -988,7 +988,7 @@ _0807913C: strh r5, [r4, 0x4] b _0807918C .align 2, 0 -_08079168: .4byte gUnknown_2037AB8 +_08079168: .4byte gPaletteFade _0807916C: .4byte sub_807941C _08079170: ldrh r0, [r4, 0x4] @@ -1048,7 +1048,7 @@ _080791D8: beq _08079248 b _080792A6 _080791DE: - ldr r0, _08079200 @ =gUnknown_2037AB8 + ldr r0, _08079200 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1064,7 +1064,7 @@ _080791DE: strh r5, [r4, 0x4] b _08079238 .align 2, 0 -_08079200: .4byte gUnknown_2037AB8 +_08079200: .4byte gPaletteFade _08079204: ldrh r1, [r4, 0x4] movs r2, 0x4 @@ -1098,7 +1098,7 @@ _08079238: _08079240: .4byte 0x0fffffff _08079244: .4byte 0x00007fff _08079248: - ldr r0, _080792B0 @ =gUnknown_2037AB8 + ldr r0, _080792B0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1142,7 +1142,7 @@ _080792A6: pop {r0} bx r0 .align 2, 0 -_080792B0: .4byte gUnknown_2037AB8 +_080792B0: .4byte gPaletteFade _080792B4: .4byte gSaveFileStatus _080792B8: .4byte gSaveBlock2Ptr _080792BC: .4byte gHeap @@ -1327,7 +1327,7 @@ sub_807941C: @ 807941C ldrsh r0, [r5, r1] cmp r0, 0 beq _08079444 - ldr r0, _08079464 @ =gUnknown_2037AB8 + ldr r0, _08079464 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1340,7 +1340,7 @@ _08079444: ldrsh r0, [r5, r3] cmp r0, 0 beq _08079468 - ldr r0, _08079464 @ =gUnknown_2037AB8 + ldr r0, _08079464 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1351,7 +1351,7 @@ _08079444: b _08079510 .align 2, 0 _08079460: .4byte gTasks+0x8 -_08079464: .4byte gUnknown_2037AB8 +_08079464: .4byte gPaletteFade _08079468: movs r1, 0x2 ldrsh r0, [r5, r1] @@ -1381,9 +1381,9 @@ _08079478: lsls r0, 16 cmp r0, 0 beq _080794CC - ldr r2, _080794C0 @ =gUnknown_20371F8 + ldr r2, _080794C0 @ =gPlttBufferUnfaded ldr r4, _080794C4 @ =gUnknown_8EAE094 - ldr r1, _080794C8 @ =gUnknown_20375F8 + ldr r1, _080794C8 @ =gPlttBufferFaded movs r0, 0xF1 lsls r0, 1 adds r1, r0 @@ -1401,14 +1401,14 @@ _080794AC: bge _080794AC b _080794F2 .align 2, 0 -_080794C0: .4byte gUnknown_20371F8 +_080794C0: .4byte gPlttBufferUnfaded _080794C4: .4byte gUnknown_8EAE094 -_080794C8: .4byte gUnknown_20375F8 +_080794C8: .4byte gPlttBufferFaded _080794CC: movs r3, 0 - ldr r2, _08079518 @ =gUnknown_20371F8 + ldr r2, _08079518 @ =gPlttBufferUnfaded ldr r0, _0807951C @ =gUnknown_8EAE094 - ldr r1, _08079520 @ =gUnknown_20375F8 + ldr r1, _08079520 @ =gPlttBufferFaded adds r4, r0, 0x2 movs r0, 0xF1 lsls r0, 1 @@ -1432,7 +1432,7 @@ _080794F2: beq _08079510 movs r0, 0x80 lsls r0, 8 - ldr r2, _08079524 @ =gUnknown_2037AB8 + ldr r2, _08079524 @ =gPaletteFade ldrh r1, [r2, 0x4] lsls r1, 21 lsrs r1, 27 @@ -1445,10 +1445,10 @@ _08079510: pop {r0} bx r0 .align 2, 0 -_08079518: .4byte gUnknown_20371F8 +_08079518: .4byte gPlttBufferUnfaded _0807951C: .4byte gUnknown_8EAE094 -_08079520: .4byte gUnknown_20375F8 -_08079524: .4byte gUnknown_2037AB8 +_08079520: .4byte gPlttBufferFaded +_08079524: .4byte gPaletteFade thumb_func_end sub_807941C thumb_func_start sub_8079528 diff --git a/asm/tm_case.s b/asm/tm_case.s index 303586153..a4767baa5 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -1314,7 +1314,7 @@ sub_813226C: @ 813226C lsls r0, 3 ldr r1, _081322A4 @ =gTasks+0x8 adds r2, r0, r1 - ldr r0, _081322A8 @ =gUnknown_2037AB8 + ldr r0, _081322A8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1334,7 +1334,7 @@ sub_813226C: @ 813226C b _081322BE .align 2, 0 _081322A4: .4byte gTasks+0x8 -_081322A8: .4byte gUnknown_2037AB8 +_081322A8: .4byte gPaletteFade _081322AC: .4byte gUnknown_203B116 _081322B0: .4byte gUnknown_203B118 _081322B4: @@ -1365,7 +1365,7 @@ sub_81322D4: @ 81322D4 lsls r0, 3 ldr r1, _08132340 @ =gTasks+0x8 adds r6, r0, r1 - ldr r0, _08132344 @ =gUnknown_2037AB8 + ldr r0, _08132344 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1406,7 +1406,7 @@ sub_81322D4: @ 81322D4 b _08132370 .align 2, 0 _08132340: .4byte gTasks+0x8 -_08132344: .4byte gUnknown_2037AB8 +_08132344: .4byte gPaletteFade _08132348: .4byte gUnknown_203B116 _0813234C: .4byte gMain _08132350: .4byte gUnknown_203AD30 @@ -2770,7 +2770,7 @@ sub_8132F20: @ 8132F20 lsls r3, r1, 3 ldr r4, _08132F54 @ =gTasks+0x8 adds r2, r3, r4 - ldr r0, _08132F58 @ =gUnknown_2037AB8 + ldr r0, _08132F58 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2791,7 +2791,7 @@ _08132F4E: bx r0 .align 2, 0 _08132F54: .4byte gTasks+0x8 -_08132F58: .4byte gUnknown_2037AB8 +_08132F58: .4byte gPaletteFade _08132F5C: .4byte sub_8132F60 thumb_func_end sub_8132F20 @@ -2873,7 +2873,7 @@ _08133008: .align 2, 0 _08133020: .4byte 0xffff8405 _08133024: - ldr r0, _0813304C @ =gUnknown_2037AB8 + ldr r0, _0813304C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2895,7 +2895,7 @@ _08133046: strh r1, [r6, 0x12] b _081331EA .align 2, 0 -_0813304C: .4byte gUnknown_2037AB8 +_0813304C: .4byte gPaletteFade _08133050: movs r0, 0x12 ldrsh r1, [r6, r0] @@ -3035,7 +3035,7 @@ _0813315C: .align 2, 0 _0813316C: .4byte gMain _08133170: - ldr r0, _081331F4 @ =gUnknown_2037AB8 + ldr r0, _081331F4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3075,8 +3075,8 @@ _08133170: ldrh r1, [r1] strh r1, [r2, 0xA] bl Free - ldr r0, _08133208 @ =gUnknown_20375F8 - ldr r1, _0813320C @ =gUnknown_20371F8 + ldr r0, _08133208 @ =gPlttBufferFaded + ldr r1, _0813320C @ =gPlttBufferUnfaded movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -3095,15 +3095,15 @@ _081331EA: strh r0, [r6, 0x10] b _08133232 .align 2, 0 -_081331F4: .4byte gUnknown_2037AB8 +_081331F4: .4byte gPaletteFade _081331F8: .4byte gSaveBlock1Ptr _081331FC: .4byte 0x00000464 _08133200: .4byte gUnknown_203B11C _08133204: .4byte gUnknown_203B10C -_08133208: .4byte gUnknown_20375F8 -_0813320C: .4byte gUnknown_20371F8 +_08133208: .4byte gPlttBufferFaded +_0813320C: .4byte gPlttBufferUnfaded _08133210: - ldr r0, _0813323C @ =gUnknown_2037AB8 + ldr r0, _0813323C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3122,7 +3122,7 @@ _08133232: pop {r0} bx r0 .align 2, 0 -_0813323C: .4byte gUnknown_2037AB8 +_0813323C: .4byte gPaletteFade _08133240: .4byte gUnknown_203B10C thumb_func_end sub_8132F60 diff --git a/asm/trade.s b/asm/trade.s index dafec1351..784126e55 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -13,7 +13,7 @@ sub_804C600: @ 804C600 bl FreeAllSpritePalettes bl ResetTasks bl ResetPaletteFade - ldr r2, _0804C6F8 @ =gUnknown_2037AB8 + ldr r2, _0804C6F8 @ =gPaletteFade ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -116,7 +116,7 @@ _0804C6F0: pop {r0} bx r0 .align 2, 0 -_0804C6F8: .4byte gUnknown_2037AB8 +_0804C6F8: .4byte gPaletteFade _0804C6FC: .4byte sub_804D4F8 _0804C700: .4byte gUnknown_841F408 _0804C704: .4byte gUnknown_8261F1C @@ -219,7 +219,7 @@ _0804C7F0: .4byte gUnknown_2031C90 _0804C7F4: .4byte gUnknown_2031C94 _0804C7F8: .4byte gMain _0804C7FC: - ldr r2, _0804C864 @ =gUnknown_2037AB8 + ldr r2, _0804C864 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -267,7 +267,7 @@ _0804C80A: bl sub_80FBB20 b _0804C892 .align 2, 0 -_0804C864: .4byte gUnknown_2037AB8 +_0804C864: .4byte gPaletteFade _0804C868: .4byte gEnemyParty _0804C86C: .4byte gUnknown_3003F64 _0804C870: .4byte gUnknown_202271A @@ -1019,7 +1019,7 @@ _0804CEC2: .align 2, 0 _0804CECC: .4byte gMain _0804CED0: - ldr r0, _0804CF08 @ =gUnknown_2037AB8 + ldr r0, _0804CF08 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1042,7 +1042,7 @@ _0804CEE6: pop {r0} bx r0 .align 2, 0 -_0804CF08: .4byte gUnknown_2037AB8 +_0804CF08: .4byte gPaletteFade _0804CF0C: .4byte sub_804DFF0 _0804CF10: .4byte sub_804D638 thumb_func_end sub_804C728 @@ -1647,7 +1647,7 @@ _0804D41C: _0804D43C: .4byte gUnknown_2031DA8 _0804D440: .4byte gMain _0804D444: - ldr r2, _0804D478 @ =gUnknown_2037AB8 + ldr r2, _0804D478 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -1671,7 +1671,7 @@ _0804D444: adds r1, r3 b _0804D4B4 .align 2, 0 -_0804D478: .4byte gUnknown_2037AB8 +_0804D478: .4byte gPaletteFade _0804D47C: .4byte gMain _0804D480: movs r1, 0x82 @@ -1707,7 +1707,7 @@ _0804D4B4: .align 2, 0 _0804D4BC: .4byte gMain _0804D4C0: - ldr r0, _0804D4F0 @ =gUnknown_2037AB8 + ldr r0, _0804D4F0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1727,7 +1727,7 @@ _0804D4D2: pop {r0} bx r0 .align 2, 0 -_0804D4F0: .4byte gUnknown_2037AB8 +_0804D4F0: .4byte gPaletteFade _0804D4F4: .4byte sub_804D638 thumb_func_end sub_804CF14 @@ -1778,7 +1778,7 @@ _0804D544: .4byte gUnknown_2031DA8 thumb_func_start sub_804D548 sub_804D548: @ 804D548 push {r4,lr} - ldr r0, _0804D580 @ =gUnknown_2037AB8 + ldr r0, _0804D580 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1805,7 +1805,7 @@ sub_804D548: @ 804D548 strb r0, [r1] b _0804D59E .align 2, 0 -_0804D580: .4byte gUnknown_2037AB8 +_0804D580: .4byte gPaletteFade _0804D584: .4byte gUnknown_2031DA4 _0804D588: .4byte gUnknown_2031DA8 _0804D58C: .4byte gUnknown_3003F3C @@ -3669,7 +3669,7 @@ _0804E490: .4byte gMain sub_804E494: @ 804E494 push {r4,lr} sub sp, 0x4 - ldr r0, _0804E4CC @ =gUnknown_2037AB8 + ldr r0, _0804E4CC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -3695,7 +3695,7 @@ sub_804E494: @ 804E494 bl sub_81344F8 b _0804E4F8 .align 2, 0 -_0804E4CC: .4byte gUnknown_2037AB8 +_0804E4CC: .4byte gPaletteFade _0804E4D0: .4byte gUnknown_2031DA8 _0804E4D4: .4byte gPlayerParty _0804E4D8: .4byte sub_804CF14 @@ -4247,7 +4247,7 @@ _0804E904: .4byte gSprites thumb_func_start sub_804E908 sub_804E908: @ 804E908 push {lr} - ldr r0, _0804E924 @ =gUnknown_2037AB8 + ldr r0, _0804E924 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -4260,7 +4260,7 @@ sub_804E908: @ 804E908 bl sub_800AB9C b _0804E932 .align 2, 0 -_0804E924: .4byte gUnknown_2037AB8 +_0804E924: .4byte gPaletteFade _0804E928: .4byte gUnknown_3003F3C _0804E92C: movs r0, 0xC @@ -7739,7 +7739,7 @@ _08050440: .align 2, 0 _08050448: .4byte gMain _0805044C: - ldr r0, _08050490 @ =gUnknown_2037AB8 + ldr r0, _08050490 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -7767,7 +7767,7 @@ _08050472: pop {r0} bx r0 .align 2, 0 -_08050490: .4byte gUnknown_2037AB8 +_08050490: .4byte gPaletteFade _08050494: .4byte gUnknown_3003F3C _08050498: .4byte sub_8053D84 thumb_func_end sub_8050138 @@ -9519,7 +9519,7 @@ _08051598: .align 2, 0 _080515B8: .4byte gUnknown_2031DAC _080515BC: - ldr r0, _080515E8 @ =gUnknown_2037AB8 + ldr r0, _080515E8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9537,7 +9537,7 @@ _080515CC: bl CopyWindowToVram bl _080522A8 .align 2, 0 -_080515E8: .4byte gUnknown_2037AB8 +_080515E8: .4byte gPaletteFade _080515EC: movs r1, 0x1 negs r1, r1 @@ -9548,7 +9548,7 @@ _080515EC: movs r3, 0 bl _080522A4 _080515FE: - ldr r0, _0805161C @ =gUnknown_2037AB8 + ldr r0, _0805161C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9562,7 +9562,7 @@ _0805160E: strh r1, [r0] bl _08052318 .align 2, 0 -_0805161C: .4byte gUnknown_2037AB8 +_0805161C: .4byte gPaletteFade _08051620: ldr r4, _0805163C @ =gUnknown_2031DAC ldr r0, [r4] @@ -9808,7 +9808,7 @@ _08051808: .align 2, 0 _08051828: .4byte gUnknown_2031DAC _0805182C: - ldr r0, _08051870 @ =gUnknown_2037AB8 + ldr r0, _08051870 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9838,7 +9838,7 @@ _0805183C: ldr r1, [r7] bl _080522AC .align 2, 0 -_08051870: .4byte gUnknown_2037AB8 +_08051870: .4byte gPaletteFade _08051874: .4byte gSprites _08051878: movs r1, 0x1 @@ -9874,7 +9874,7 @@ _08051878: _080518BC: .4byte gUnknown_826CE84 _080518C0: .4byte gUnknown_2031DAC _080518C4: - ldr r0, _08051914 @ =gUnknown_2037AB8 + ldr r0, _08051914 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -9913,7 +9913,7 @@ _080518E2: strh r1, [r0, 0x26] bl _08052318 .align 2, 0 -_08051914: .4byte gUnknown_2037AB8 +_08051914: .4byte gPaletteFade _08051918: .4byte gUnknown_2031DAC _0805191C: .4byte gSprites _08051920: @@ -10298,7 +10298,7 @@ _08051BF6: .align 2, 0 _08051C38: .4byte gSprites _08051C3C: - ldr r0, _08051CA4 @ =gUnknown_2037AB8 + ldr r0, _08051CA4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10347,7 +10347,7 @@ _08051C4A: bl StartSpriteAnim b _08052318 .align 2, 0 -_08051CA4: .4byte gUnknown_2037AB8 +_08051CA4: .4byte gPaletteFade _08051CA8: .4byte gUnknown_826CE44 _08051CAC: .4byte gUnknown_826CE84 _08051CB0: .4byte gSprites @@ -10365,7 +10365,7 @@ _08051CC4: lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _08051CE0 @ =gUnknown_2037AB8 + ldr r0, _08051CE0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10375,7 +10375,7 @@ _08051CC4: _08051CDC: b _080522A8 .align 2, 0 -_08051CE0: .4byte gUnknown_2037AB8 +_08051CE0: .4byte gPaletteFade _08051CE4: ldr r2, _08051D30 @ =gSprites ldr r4, [r7] @@ -10635,7 +10635,7 @@ _08051EC4: .align 2, 0 _08051EE0: .4byte gUnknown_2031DAC _08051EE4: - ldr r4, _08051F08 @ =gUnknown_2037AB8 + ldr r4, _08051F08 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -10653,9 +10653,9 @@ _08051EF2: strb r0, [r4, 0x8] b _080522A8 .align 2, 0 -_08051F08: .4byte gUnknown_2037AB8 +_08051F08: .4byte gPaletteFade _08051F0C: - ldr r2, _08051F24 @ =gUnknown_2037AB8 + ldr r2, _08051F24 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -10668,13 +10668,13 @@ _08051F0C: movs r3, 0 b _080522A4 .align 2, 0 -_08051F24: .4byte gUnknown_2037AB8 +_08051F24: .4byte gPaletteFade _08051F28: movs r1, 0xA2 lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _08051F44 @ =gUnknown_2037AB8 + ldr r0, _08051F44 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -10684,7 +10684,7 @@ _08051F28: _08051F40: b _080522A8 .align 2, 0 -_08051F44: .4byte gUnknown_2037AB8 +_08051F44: .4byte gPaletteFade _08051F48: ldr r0, _08051FDC @ =gUnknown_826CDE4 movs r2, 0x8 @@ -11107,7 +11107,7 @@ _080522AC: .align 2, 0 _080522B8: .4byte gUnknown_2031DAC _080522BC: - ldr r0, _08052324 @ =gUnknown_2037AB8 + ldr r0, _08052324 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11149,7 +11149,7 @@ _0805231A: pop {r1} bx r1 .align 2, 0 -_08052324: .4byte gUnknown_2037AB8 +_08052324: .4byte gPaletteFade _08052328: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_8050F3C @@ -11695,7 +11695,7 @@ _08052988: .align 2, 0 _080529A8: .4byte gUnknown_2031DAC _080529AC: - ldr r0, _080529D8 @ =gUnknown_2037AB8 + ldr r0, _080529D8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11713,7 +11713,7 @@ _080529BC: bl CopyWindowToVram bl _08053704 .align 2, 0 -_080529D8: .4byte gUnknown_2037AB8 +_080529D8: .4byte gPaletteFade _080529DC: movs r1, 0x1 negs r1, r1 @@ -11724,7 +11724,7 @@ _080529DC: movs r3, 0 bl _08053700 _080529EE: - ldr r0, _08052A0C @ =gUnknown_2037AB8 + ldr r0, _08052A0C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -11738,7 +11738,7 @@ _080529FE: strh r1, [r0] bl _08053774 .align 2, 0 -_08052A0C: .4byte gUnknown_2037AB8 +_08052A0C: .4byte gPaletteFade _08052A10: ldr r4, _08052A2C @ =gUnknown_2031DAC ldr r0, [r4] @@ -11994,7 +11994,7 @@ _08052C18: .align 2, 0 _08052C38: .4byte gUnknown_2031DAC _08052C3C: - ldr r0, _08052C80 @ =gUnknown_2037AB8 + ldr r0, _08052C80 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12024,7 +12024,7 @@ _08052C4C: ldr r1, [r7] bl _08053708 .align 2, 0 -_08052C80: .4byte gUnknown_2037AB8 +_08052C80: .4byte gPaletteFade _08052C84: .4byte gSprites _08052C88: movs r1, 0x1 @@ -12060,7 +12060,7 @@ _08052C88: _08052CCC: .4byte gUnknown_826CE84 _08052CD0: .4byte gUnknown_2031DAC _08052CD4: - ldr r0, _08052D24 @ =gUnknown_2037AB8 + ldr r0, _08052D24 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12099,7 +12099,7 @@ _08052CF2: strh r1, [r0, 0x26] bl _08053774 .align 2, 0 -_08052D24: .4byte gUnknown_2037AB8 +_08052D24: .4byte gPaletteFade _08052D28: .4byte gUnknown_2031DAC _08052D2C: .4byte gSprites _08052D30: @@ -12490,7 +12490,7 @@ _08053012: .align 2, 0 _08053054: .4byte gSprites _08053058: - ldr r0, _080530E4 @ =gUnknown_2037AB8 + ldr r0, _080530E4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12557,7 +12557,7 @@ _08053066: bl StartSpriteAnim b _08053774 .align 2, 0 -_080530E4: .4byte gUnknown_2037AB8 +_080530E4: .4byte gPaletteFade _080530E8: .4byte gUnknown_826CE44 _080530EC: .4byte gSprites _080530F0: .4byte sub_804FD48 @@ -12576,7 +12576,7 @@ _08053108: lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _08053124 @ =gUnknown_2037AB8 + ldr r0, _08053124 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12586,7 +12586,7 @@ _08053108: _08053120: b _08053704 .align 2, 0 -_08053124: .4byte gUnknown_2037AB8 +_08053124: .4byte gPaletteFade _08053128: ldr r2, _0805317C @ =gSprites ldr r4, [r7] @@ -12860,7 +12860,7 @@ _08053320: .align 2, 0 _0805333C: .4byte gUnknown_2031DAC _08053340: - ldr r4, _08053364 @ =gUnknown_2037AB8 + ldr r4, _08053364 @ =gPaletteFade ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -12878,9 +12878,9 @@ _0805334E: strb r0, [r4, 0x8] b _08053704 .align 2, 0 -_08053364: .4byte gUnknown_2037AB8 +_08053364: .4byte gPaletteFade _08053368: - ldr r2, _08053380 @ =gUnknown_2037AB8 + ldr r2, _08053380 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -12893,13 +12893,13 @@ _08053368: movs r3, 0 b _08053700 .align 2, 0 -_08053380: .4byte gUnknown_2037AB8 +_08053380: .4byte gPaletteFade _08053384: movs r1, 0xA2 lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r0, _080533A0 @ =gUnknown_2037AB8 + ldr r0, _080533A0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -12909,7 +12909,7 @@ _08053384: _0805339C: b _08053704 .align 2, 0 -_080533A0: .4byte gUnknown_2037AB8 +_080533A0: .4byte gPaletteFade _080533A4: ldr r0, _08053438 @ =gUnknown_826CDE4 movs r2, 0x8 @@ -13332,7 +13332,7 @@ _08053708: .align 2, 0 _08053714: .4byte gUnknown_2031DAC _08053718: - ldr r0, _08053780 @ =gUnknown_2037AB8 + ldr r0, _08053780 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -13374,7 +13374,7 @@ _08053776: pop {r1} bx r1 .align 2, 0 -_08053780: .4byte gUnknown_2037AB8 +_08053780: .4byte gPaletteFade _08053784: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_805232C @@ -14685,7 +14685,7 @@ _080542C4: bl BeginNormalPaletteFade b _08054338 _080542E0: - ldr r0, _080542FC @ =gUnknown_2037AB8 + ldr r0, _080542FC @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14699,7 +14699,7 @@ _080542E0: adds r1, r0 b _08054340 .align 2, 0 -_080542FC: .4byte gUnknown_2037AB8 +_080542FC: .4byte gPaletteFade _08054300: .4byte gMain _08054304: bl IsBGMStopped @@ -14792,7 +14792,7 @@ _080543C0: .4byte sub_80543C4 thumb_func_start sub_80543C4 sub_80543C4: @ 80543C4 push {r4,r5,lr} - ldr r0, _08054430 @ =gUnknown_2037AB8 + ldr r0, _08054430 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14833,7 +14833,7 @@ _0805441A: pop {r0} bx r0 .align 2, 0 -_08054430: .4byte gUnknown_2037AB8 +_08054430: .4byte gPaletteFade _08054434: .4byte gUnknown_2031DAC _08054438: .4byte gUnknown_3003F3C _0805443C: .4byte gMain @@ -14867,7 +14867,7 @@ sub_8054470: @ 8054470 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0805449C @ =gUnknown_2037AB8 + ldr r0, _0805449C @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -14885,7 +14885,7 @@ _08054494: pop {r0} bx r0 .align 2, 0 -_0805449C: .4byte gUnknown_2037AB8 +_0805449C: .4byte gPaletteFade _080544A0: .4byte sub_80505CC _080544A4: .4byte gUnknown_3005020 _080544A8: .4byte sub_807DD24 diff --git a/asm/trainer_see.s b/asm/trainer_see.s index 29c9b1983..91dc077d7 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8081B30 -sub_8081B30: @ 8081B30 + thumb_func_start CheckForTrainersWantingBattle +CheckForTrainersWantingBattle: @ 8081B30 push {r4,r5,lr} bl sub_8111C2C lsls r0, 24 @@ -19,7 +19,7 @@ _08081B40: b _08081B7A _08081B44: movs r4, 0 - ldr r5, _08081B80 @ =gUnknown_2036E38 + ldr r5, _08081B80 @ =gMapObjects _08081B48: lsls r0, r4, 3 adds r0, r4 @@ -53,8 +53,8 @@ _08081B7A: pop {r1} bx r1 .align 2, 0 -_08081B80: .4byte gUnknown_2036E38 - thumb_func_end sub_8081B30 +_08081B80: .4byte gMapObjects + thumb_func_end CheckForTrainersWantingBattle thumb_func_start sub_8081B84 sub_8081B84: @ 8081B84 @@ -70,7 +70,7 @@ sub_8081B84: @ 8081B84 lsls r4, r5, 3 adds r0, r4, r5 lsls r0, 2 - ldr r1, _08081BE0 @ =gUnknown_2036E38 + ldr r1, _08081BE0 @ =gMapObjects adds r0, r1 bl sub_8081BEC lsls r0, 24 @@ -90,7 +90,7 @@ _08081BC0: bl TrainerWantsBattle adds r0, r4, r5 lsls r0, 2 - ldr r1, _08081BE0 @ =gUnknown_2036E38 + ldr r1, _08081BE0 @ =gMapObjects adds r0, r1 subs r1, r7, 0x1 lsls r1, 24 @@ -99,7 +99,7 @@ _08081BC0: movs r0, 0x1 b _08081BE6 .align 2, 0 -_08081BE0: .4byte gUnknown_2036E38 +_08081BE0: .4byte gMapObjects _08081BE4: movs r0, 0 _08081BE6: @@ -735,12 +735,12 @@ _0808204A: bl sub_805FE7C adds r0, r4, 0 bl sub_805FE5C - ldr r0, _080820B4 @ =gUnknown_2037078 + ldr r0, _080820B4 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080820B8 @ =gUnknown_2036E38 + ldr r1, _080820B8 @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -763,8 +763,8 @@ _080820AC: pop {r1} bx r1 .align 2, 0 -_080820B4: .4byte gUnknown_2037078 -_080820B8: .4byte gUnknown_2036E38 +_080820B4: .4byte gPlayerAvatar +_080820B8: .4byte gMapObjects thumb_func_end sub_808202C thumb_func_start sub_80820BC @@ -772,12 +772,12 @@ sub_80820BC: @ 80820BC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080820F8 @ =gUnknown_2037078 + ldr r0, _080820F8 @ =gPlayerAvatar ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080820FC @ =gUnknown_2036E38 + ldr r1, _080820FC @ =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -798,8 +798,8 @@ _080820EE: pop {r1} bx r1 .align 2, 0 -_080820F8: .4byte gUnknown_2037078 -_080820FC: .4byte gUnknown_2036E38 +_080820F8: .4byte gPlayerAvatar +_080820FC: .4byte gMapObjects thumb_func_end sub_80820BC thumb_func_start sub_8082100 @@ -1025,7 +1025,7 @@ sub_808226C: @ 808226C movs r1, 0x7 movs r2, 0x7F bl SpawnSpecialFieldObjectParametrized - ldr r2, _080822C8 @ =gUnknown_2036E38 + ldr r2, _080822C8 @ =gMapObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -1046,7 +1046,7 @@ sub_808226C: @ 808226C bx r1 .align 2, 0 _080822C4: .4byte gSaveBlock1Ptr -_080822C8: .4byte gUnknown_2036E38 +_080822C8: .4byte gMapObjects thumb_func_end sub_808226C thumb_func_start sub_80822CC @@ -1067,7 +1067,7 @@ sub_80822CC: @ 80822CC lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r4, _0808234C @ =gUnknown_2036E38 + ldr r4, _0808234C @ =gMapObjects adds r0, r4 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 @@ -1096,7 +1096,7 @@ _08082312: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808234C @ =gUnknown_2036E38 + ldr r0, _0808234C @ =gMapObjects adds r4, r0 movs r0, 0x2 bl sub_8063FB0 @@ -1111,7 +1111,7 @@ _08082312: b _0808236E .align 2, 0 _08082348: .4byte gSaveBlock1Ptr -_0808234C: .4byte gUnknown_2036E38 +_0808234C: .4byte gMapObjects _08082350: ldr r1, _08082378 @ =gUnknown_20386E0 adds r2, r1, 0x4 @@ -1158,7 +1158,7 @@ sub_808237C: @ 808237C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r4, _08082408 @ =gUnknown_2036E38 + ldr r4, _08082408 @ =gMapObjects adds r0, r4 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 @@ -1187,7 +1187,7 @@ _080823CC: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08082408 @ =gUnknown_2036E38 + ldr r0, _08082408 @ =gMapObjects adds r4, r0 movs r0, 0x1 bl sub_8063FB0 @@ -1202,7 +1202,7 @@ _080823CC: b _0808242E .align 2, 0 _08082404: .4byte gSaveBlock1Ptr -_08082408: .4byte gUnknown_2036E38 +_08082408: .4byte gMapObjects _0808240C: bl GetPlayerAvatarObjectId lsls r0, 24 @@ -1579,7 +1579,7 @@ _080826DA: bl FieldEffectStop b _08082736 _080826E8: - ldr r2, _0808272C @ =gUnknown_2036E38 + ldr r2, _0808272C @ =gMapObjects mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -1614,7 +1614,7 @@ _080826E8: strh r0, [r4, 0x34] b _08082736 .align 2, 0 -_0808272C: .4byte gUnknown_2036E38 +_0808272C: .4byte gMapObjects _08082730: .4byte gSprites _08082734: strh r2, [r4, 0x34] diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index 48a4e478f..caec21cff 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -155,7 +155,7 @@ _08128548: _08128550: .4byte sub_81285B4 _08128554: bl UpdatePaletteFade - ldr r0, _081285A0 @ =gUnknown_2037AB8 + ldr r0, _081285A0 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -187,7 +187,7 @@ _08128598: pop {r0} bx r0 .align 2, 0 -_081285A0: .4byte gUnknown_2037AB8 +_081285A0: .4byte gPaletteFade _081285A4: .4byte sub_81285CC _081285A8: .4byte sub_81285E8 _081285AC: .4byte gUnknown_203B0E0 @@ -1711,7 +1711,7 @@ _081291C8: .align 2, 0 _081291E4: .4byte gUnknown_203B0E0 _081291E8: - ldr r0, _08129210 @ =gUnknown_2037AB8 + ldr r0, _08129210 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1728,7 +1728,7 @@ _08129206: pop {r0} bx r0 .align 2, 0 -_08129210: .4byte gUnknown_2037AB8 +_08129210: .4byte gPaletteFade _08129214: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_8128FB8 diff --git a/asm/unk_810C3A4.s b/asm/unk_810C3A4.s index a202dc769..e7e825483 100644 --- a/asm/unk_810C3A4.s +++ b/asm/unk_810C3A4.s @@ -44,7 +44,7 @@ _0810C3E2: cmp r0, 0 bne _0810C41C movs r4, 0 - ldr r7, _0810C440 @ =gUnknown_2036E38 + ldr r7, _0810C440 @ =gMapObjects _0810C3EE: adds r0, r4, 0 bl sub_810CF04 @@ -85,7 +85,7 @@ _0810C436: bx r0 .align 2, 0 _0810C43C: .4byte gTasks -_0810C440: .4byte gUnknown_2036E38 +_0810C440: .4byte gMapObjects thumb_func_end sub_810C3B8 thumb_func_start sub_810C444 @@ -140,7 +140,7 @@ _0810C47A: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r2, _0810C4E8 @ =gUnknown_2036E38 + ldr r2, _0810C4E8 @ =gMapObjects adds r4, r1, r2 bl sub_810CF04 lsls r0, 24 @@ -171,7 +171,7 @@ _0810C4D2: .align 2, 0 _0810C4E0: .4byte gSaveBlock1Ptr _0810C4E4: .4byte gMapHeader -_0810C4E8: .4byte gUnknown_2036E38 +_0810C4E8: .4byte gMapObjects thumb_func_end sub_810C444 thumb_func_start sub_810C4EC @@ -269,7 +269,7 @@ _0810C59A: lsls r0, r5, 3 adds r0, r5 lsls r0, 2 - ldr r1, _0810C5FC @ =gUnknown_2036E38 + ldr r1, _0810C5FC @ =gMapObjects adds r4, r0, r1 ldrb r0, [r4, 0x6] subs r0, 0x4D @@ -314,7 +314,7 @@ _0810C5EA: pop {r0} bx r0 .align 2, 0 -_0810C5FC: .4byte gUnknown_2036E38 +_0810C5FC: .4byte gMapObjects _0810C600: .4byte gSprites thumb_func_end sub_810C594 diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index fc9620900..9ae5acd08 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -497,7 +497,7 @@ _08147E98: .4byte sub_8147D58 _08147E9C: .4byte gUnknown_203F3D4 _08147EA0: bl UpdatePaletteFade - ldr r0, _08147EC4 @ =gUnknown_2037AB8 + ldr r0, _08147EC4 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -515,7 +515,7 @@ _08147EBC: strh r0, [r1, 0x8] b _08147F04 .align 2, 0 -_08147EC4: .4byte gUnknown_2037AB8 +_08147EC4: .4byte gPaletteFade _08147EC8: .4byte gUnknown_203F3D4 _08147ECC: ldr r0, [r2] @@ -2529,7 +2529,7 @@ _08148DC4: ldr r1, [r4] b _08148DFE _08148DEA: - ldr r0, _08148E08 @ =gUnknown_2037AB8 + ldr r0, _08148E08 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -2545,7 +2545,7 @@ _08148DFE: strh r0, [r1, 0xA] b _08148E20 .align 2, 0 -_08148E08: .4byte gUnknown_2037AB8 +_08148E08: .4byte gPaletteFade _08148E0C: .4byte gUnknown_203F3D4 _08148E10: ldr r0, _08148E1C @ =gUnknown_3003F64 diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s index bb11cca7f..1895133dc 100644 --- a/asm/unk_814BB4C.s +++ b/asm/unk_814BB4C.s @@ -89,7 +89,7 @@ sub_814BBB8: @ 814BBB8 lsls r4, 8 ldrb r2, [r1, 0x7] orrs r4, r2 - ldr r5, _0814BC0C @ =gUnknown_2037AB8 + ldr r5, _0814BC0C @ =gPaletteFade ldrb r3, [r5, 0x8] movs r2, 0x7F ands r2, r3 @@ -110,7 +110,7 @@ sub_814BBB8: @ 814BBB8 pop {r1} bx r1 .align 2, 0 -_0814BC0C: .4byte gUnknown_2037AB8 +_0814BC0C: .4byte gPaletteFade thumb_func_end sub_814BBB8 thumb_func_start sub_814BC10 diff --git a/asm/unk_814D5C8.s b/asm/unk_814D5C8.s index b3094ca40..4c78d4459 100644 --- a/asm/unk_814D5C8.s +++ b/asm/unk_814D5C8.s @@ -192,14 +192,14 @@ _0814D774: bl sub_814EB38 adds r0, r5, 0 bl sub_814EBB0 - ldr r0, _0814D794 @ =gUnknown_2037AB8 + ldr r0, _0814D794 @ =gPaletteFade ldrb r1, [r0, 0x8] movs r2, 0x80 orrs r1, r2 strb r1, [r0, 0x8] b _0814D878 .align 2, 0 -_0814D794: .4byte gUnknown_2037AB8 +_0814D794: .4byte gPaletteFade _0814D798: ldr r0, _0814D7E4 @ =gUnknown_8EAFEA0 movs r2, 0xC0 @@ -261,7 +261,7 @@ _0814D7F4: .align 2, 0 _0814D82C: .4byte gSpriteCoordOffsetY _0814D830: - ldr r2, _0814D874 @ =gUnknown_2037AB8 + ldr r2, _0814D874 @ =gPaletteFade ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -289,7 +289,7 @@ _0814D830: movs r0, 0x1 b _0814D880 .align 2, 0 -_0814D874: .4byte gUnknown_2037AB8 +_0814D874: .4byte gPaletteFade _0814D878: ldrb r0, [r5, 0xC] adds r0, 0x1 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index cb042d971..a93a5ae2e 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -468,7 +468,7 @@ _08150BA2: _08150BC8: .4byte sub_8152034 _08150BCC: bl UpdatePaletteFade - ldr r0, _08150BE8 @ =gUnknown_2037AB8 + ldr r0, _08150BE8 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -483,7 +483,7 @@ _08150BE0: strb r0, [r1, 0xC] b _08150BFC .align 2, 0 -_08150BE8: .4byte gUnknown_2037AB8 +_08150BE8: .4byte gPaletteFade _08150BEC: .4byte gUnknown_203F3E0 _08150BF0: adds r0, r1, 0 @@ -1678,7 +1678,7 @@ _08151512: b _0815155E _08151524: bl UpdatePaletteFade - ldr r0, _08151538 @ =gUnknown_2037AB8 + ldr r0, _08151538 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1686,7 +1686,7 @@ _08151524: bne _08151590 b _0815155E .align 2, 0 -_08151538: .4byte gUnknown_2037AB8 +_08151538: .4byte gPaletteFade _0815153C: bl sub_8154274 bl sub_8153ED8 @@ -1828,7 +1828,7 @@ _08151656: b _08151686 _08151676: bl UpdatePaletteFade - ldr r0, _08151694 @ =gUnknown_2037AB8 + ldr r0, _08151694 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -1842,7 +1842,7 @@ _08151686: strb r0, [r1, 0x10] b _081516CC .align 2, 0 -_08151694: .4byte gUnknown_2037AB8 +_08151694: .4byte gPaletteFade _08151698: .4byte gUnknown_203F3E0 _0815169C: ldrb r0, [r1, 0x4] diff --git a/asm/unk_8159F40.s b/asm/unk_8159F40.s index d84290a08..78693e452 100644 --- a/asm/unk_8159F40.s +++ b/asm/unk_8159F40.s @@ -127,7 +127,7 @@ sub_815A008: @ 815A008 movs r1, 0x7F mov r9, r1 _0815A02E: - ldr r2, _0815A1F4 @ =gUnknown_2036E38 + ldr r2, _0815A1F4 @ =gMapObjects adds r3, r7, r2 ldrb r0, [r3] lsls r0, 31 @@ -355,7 +355,7 @@ _0815A1E4: pop {r0} bx r0 .align 2, 0 -_0815A1F4: .4byte gUnknown_2036E38 +_0815A1F4: .4byte gMapObjects thumb_func_end sub_815A008 thumb_func_start sub_815A1F8 @@ -372,7 +372,7 @@ sub_815A1F8: @ 815A1F8 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r4, _0815A480 @ =gUnknown_2036E38 + ldr r4, _0815A480 @ =gMapObjects ldr r2, _0815A484 @ =0x01000120 mov r0, sp adds r1, r4, 0 @@ -386,7 +386,7 @@ _0815A224: lsls r7, r2, 3 adds r5, r7, r2 lsls r5, 2 - ldr r0, _0815A480 @ =gUnknown_2036E38 + ldr r0, _0815A480 @ =gMapObjects adds r5, r0 lsls r6, r2, 2 add r6, r12 @@ -663,20 +663,20 @@ _0815A444: mov r0, r8 add r0, r12 lsls r0, 2 - ldr r1, _0815A480 @ =gUnknown_2036E38 + ldr r1, _0815A480 @ =gMapObjects adds r6, r0, r1 movs r2, 0x10 ldrsh r0, [r6, r2] movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt strb r0, [r6, 0x1E] ldrb r4, [r6, 0x1F] movs r1, 0x10 ldrsh r0, [r6, r1] movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A488 ldrh r0, [r6, 0x10] @@ -684,7 +684,7 @@ _0815A444: ldrh r0, [r6, 0x12] b _0815A506 .align 2, 0 -_0815A480: .4byte gUnknown_2036E38 +_0815A480: .4byte gMapObjects _0815A484: .4byte 0x01000120 _0815A488: ldrb r4, [r6, 0x1F] @@ -694,7 +694,7 @@ _0815A488: asrs r0, 16 movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A4A8 ldrh r0, [r6, 0x10] @@ -710,7 +710,7 @@ _0815A4A8: asrs r0, 16 movs r2, 0x12 ldrsh r1, [r6, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A4C8 ldrh r0, [r6, 0x10] @@ -726,7 +726,7 @@ _0815A4C8: subs r1, 0x1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A4E8 ldrh r0, [r6, 0x10] @@ -742,7 +742,7 @@ _0815A4E8: adds r1, 0x1 lsls r1, 16 asrs r1, 16 - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt cmp r4, r0 bne _0815A508 ldrh r0, [r6, 0x10] @@ -758,7 +758,7 @@ _0815A508: bhi _0815A512 b _0815A224 _0815A512: - ldr r0, _0815A538 @ =gUnknown_2036E38 + ldr r0, _0815A538 @ =gMapObjects ldr r1, _0815A53C @ =gSaveBlock1Ptr ldr r1, [r1] movs r2, 0xD4 @@ -776,7 +776,7 @@ _0815A512: pop {r0} bx r0 .align 2, 0 -_0815A538: .4byte gUnknown_2036E38 +_0815A538: .4byte gMapObjects _0815A53C: .4byte gSaveBlock1Ptr thumb_func_end sub_815A1F8 @@ -798,7 +798,7 @@ sub_815A540: @ 815A540 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl sub_8059CA4 @@ -810,12 +810,12 @@ sub_815A540: @ 815A540 lsls r0, 24 cmp r0, 0 beq _0815A5A4 - ldr r0, _0815A5B0 @ =gUnknown_2037078 + ldr r0, _0815A5B0 @ =gPlayerAvatar ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0815A5B4 @ =gUnknown_2036E38 + ldr r0, _0815A5B4 @ =gMapObjects adds r4, r0 movs r0, 0x1 bl SetPlayerAvatarTransitionFlags @@ -833,8 +833,8 @@ _0815A5A4: bx r0 .align 2, 0 _0815A5AC: .4byte gUnknown_203ADFA -_0815A5B0: .4byte gUnknown_2037078 -_0815A5B4: .4byte gUnknown_2036E38 +_0815A5B0: .4byte gPlayerAvatar +_0815A5B4: .4byte gMapObjects _0815A5B8: .4byte gSprites thumb_func_end sub_815A540 diff --git a/asm/vs_seeker.s b/asm/vs_seeker.s index 00f880d86..8e66877fa 100644 --- a/asm/vs_seeker.s +++ b/asm/vs_seeker.s @@ -224,7 +224,7 @@ sub_810C808: @ 810C808 bge _0810C8BC ldr r7, _0810C8E4 @ =gUnknown_203ADB8 mov r6, sp - ldr r0, _0810C8E8 @ =gUnknown_2036E38 + ldr r0, _0810C8E8 @ =gMapObjects mov r10, r0 adds r5, r2, 0 _0810C83C: @@ -312,7 +312,7 @@ _0810C8BC: _0810C8DC: .4byte gSaveBlock1Ptr _0810C8E0: .4byte gMapHeader _0810C8E4: .4byte gUnknown_203ADB8 -_0810C8E8: .4byte gUnknown_2036E38 +_0810C8E8: .4byte gMapObjects thumb_func_end sub_810C808 thumb_func_start sub_810C8EC @@ -544,7 +544,7 @@ _0810CAA0: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0810CB5C @ =gUnknown_2036E38 + ldr r1, _0810CB5C @ =gMapObjects adds r0, r1 bl npc_coords_shift_still ldr r0, [r6] @@ -618,7 +618,7 @@ _0810CB2C: .align 2, 0 _0810CB54: .4byte gSaveBlock1Ptr _0810CB58: .4byte 0x0000063a -_0810CB5C: .4byte gUnknown_2036E38 +_0810CB5C: .4byte gMapObjects _0810CB60: .4byte gUnknown_8453F64 _0810CB64: .4byte 0x00000431 _0810CB68: .4byte gUnknown_203ADB8 @@ -706,7 +706,7 @@ _0810CBDE: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0810CC64 @ =gUnknown_2036E38 + ldr r1, _0810CC64 @ =gMapObjects adds r4, r0, r1 adds r0, r6, 0 bl sub_810CF54 @@ -743,7 +743,7 @@ _0810CC54: .4byte gSaveBlock1Ptr _0810CC58: .4byte gUnknown_845318C _0810CC5C: .4byte gTrainerBattleOpponent_A _0810CC60: .4byte gMapHeader -_0810CC64: .4byte gUnknown_2036E38 +_0810CC64: .4byte gMapObjects _0810CC68: .4byte gUnknown_8453F67 _0810CC6C: .4byte 0x0000063a _0810CC70: .4byte gUnknown_3005074 @@ -1123,7 +1123,7 @@ sub_810CF04: @ 810CF04 lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r1, _0810CF40 @ =gUnknown_2036E38 + ldr r1, _0810CF40 @ =gMapObjects adds r1, r0, r1 ldrb r0, [r1] lsls r0, 31 @@ -1148,7 +1148,7 @@ sub_810CF04: @ 810CF04 movs r0, 0x1 b _0810CF4E .align 2, 0 -_0810CF40: .4byte gUnknown_2036E38 +_0810CF40: .4byte gMapObjects _0810CF44: .4byte gMapHeader _0810CF48: .4byte gSprites _0810CF4C: @@ -1550,7 +1550,7 @@ sub_810D24C: @ 810D24C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0810D278 @ =gUnknown_2036E38 + ldr r1, _0810D278 @ =gMapObjects adds r0, r1 bl npc_sync_anim_pause_bits ldrb r0, [r4, 0x6] @@ -1564,7 +1564,7 @@ sub_810D24C: @ 810D24C pop {r0} bx r0 .align 2, 0 -_0810D278: .4byte gUnknown_2036E38 +_0810D278: .4byte gMapObjects _0810D27C: .4byte gSaveBlock1Ptr thumb_func_end sub_810D24C @@ -1691,7 +1691,7 @@ _0810D340: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r2, _0810D3E4 @ =gUnknown_2036E38 + ldr r2, _0810D3E4 @ =gMapObjects adds r4, r1, r2 bl sub_810CF04 lsls r0, 24 @@ -1758,7 +1758,7 @@ _0810D3CC: pop {r0} bx r0 .align 2, 0 -_0810D3E4: .4byte gUnknown_2036E38 +_0810D3E4: .4byte gMapObjects _0810D3E8: .4byte gUnknown_845318C _0810D3EC: .4byte gSaveBlock1Ptr _0810D3F0: .4byte 0x0000063a diff --git a/asm/wireless_communication_status_screen.s b/asm/wireless_communication_status_screen.s index 5b3186c32..b4aecb9a5 100644 --- a/asm/wireless_communication_status_screen.s +++ b/asm/wireless_communication_status_screen.s @@ -388,7 +388,7 @@ _0814F4D4: bl ShowBg b _0814F618 _0814F4F8: - ldr r0, _0814F510 @ =gUnknown_2037AB8 + ldr r0, _0814F510 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -402,7 +402,7 @@ _0814F506: adds r0, r2 b _0814F622 .align 2, 0 -_0814F510: .4byte gUnknown_2037AB8 +_0814F510: .4byte gPaletteFade _0814F514: ldr r0, _0814F570 @ =gUnknown_3002040 ldr r0, [r0] @@ -541,7 +541,7 @@ _0814F622: .align 2, 0 _0814F62C: .4byte gTasks _0814F630: - ldr r0, _0814F654 @ =gUnknown_2037AB8 + ldr r0, _0814F654 @ =gPaletteFade ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -559,7 +559,7 @@ _0814F648: pop {r0} bx r0 .align 2, 0 -_0814F654: .4byte gUnknown_2037AB8 +_0814F654: .4byte gPaletteFade _0814F658: .4byte sub_814F32C thumb_func_end sub_814F46C diff --git a/common_syms/quest_log.txt b/common_syms/quest_log.txt new file mode 100644 index 000000000..4ecbf66a8 --- /dev/null +++ b/common_syms/quest_log.txt @@ -0,0 +1 @@ +gUnknown_3005E88 diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 2266992ab..c4f9e9126 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1457,7 +1457,7 @@ gUnknown_8419F54:: @ 8419F54 .incbin "baserom.gba", 0x419F54, 0x201 gUnknown_841A155:: @ 841A155 - .incbin "baserom.gba", 0x41A155, 0x1A + .string "Previously on your quest…$" gUnknown_841A16F:: @ 841A16F .incbin "baserom.gba", 0x41A16F, 0x24 @@ -2754,78 +2754,9 @@ gUnknown_8454003:: @ 8454003 gUnknown_8456618:: @ 8456618 .incbin "baserom.gba", 0x456618, 0x4 -gUnknown_845661C:: @ 845661C - .incbin "baserom.gba", 0x45661C, 0x18 - -gUnknown_8456634:: @ 8456634 - .incbin "baserom.gba", 0x456634, 0x4 - -gUnknown_8456638:: @ 8456638 - .incbin "baserom.gba", 0x456638, 0x60 - -gUnknown_8456698:: @ 8456698 - .incbin "baserom.gba", 0x456698, 0x4 - -gUnknown_845669C:: @ 845669C - .incbin "baserom.gba", 0x45669C, 0x8 - -gUnknown_84566A4:: @ 84566A4 - .incbin "baserom.gba", 0x4566A4, 0x4 - -gUnknown_84566A8:: @ 84566A8 - .incbin "baserom.gba", 0x4566A8, 0x280 - -gUnknown_8456928:: @ 8456928 - .incbin "baserom.gba", 0x456928, 0x8 - -gUnknown_8456930:: @ 8456930 - .incbin "baserom.gba", 0x456930, 0x4 - -gUnknown_8456934:: @ 8456934 - .incbin "baserom.gba", 0x456934, 0x4 - -gUnknown_8456938:: @ 8456938 - .incbin "baserom.gba", 0x456938, 0x8 - -gUnknown_8456940:: @ 8456940 - .incbin "baserom.gba", 0x456940, 0x8 - -gUnknown_8456948:: @ 8456948 - .incbin "baserom.gba", 0x456948, 0xAC - -gUnknown_84569F4:: @ 84569F4 - .incbin "baserom.gba", 0x4569F4, 0xAC - -gUnknown_8456AA0:: @ 8456AA0 - .incbin "baserom.gba", 0x456AA0, 0x2C - -gUnknown_8456ACC:: @ 8456ACC - .incbin "baserom.gba", 0x456ACC, 0xC - -gUnknown_8456AD8:: @ 8456AD8 - .incbin "baserom.gba", 0x456AD8, 0xC - -gUnknown_8456AE4:: @ 8456AE4 - .incbin "baserom.gba", 0x456AE4, 0xC - -gUnknown_8456AF0:: @ 8456AF0 - .incbin "baserom.gba", 0x456AF0, 0xCC - -gUnknown_8456BBC:: @ 8456BBC - .incbin "baserom.gba", 0x456BBC, 0x28 - -gUnknown_8456BE4:: @ 8456BE4 - .incbin "baserom.gba", 0x456BE4, 0x33 - -gUnknown_8456C17:: @ 8456C17 - .incbin "baserom.gba", 0x456C17, 0x9 - -gUnknown_8456C20:: @ 8456C20 - .incbin "baserom.gba", 0x456C20, 0x30 - -gUnknown_8456C50:: @ 8456C50 - .incbin "baserom.gba", 0x456C50, 0x24 - + @ quest_log.o + @ link_rfu_3.o + .section .rodata.8456C74 gUnknown_8456C74:: @ 8456C74 .incbin "baserom.gba", 0x456C74, 0x5C diff --git a/data/graphics/unknown_8456638.bin b/data/graphics/unknown_8456638.bin new file mode 100644 index 000000000..53ea8cfb8 --- /dev/null +++ b/data/graphics/unknown_8456638.bin @@ -0,0 +1 @@ +»»»»ÌÌÌÌÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÌÌÌÌ»»»»
\ No newline at end of file diff --git a/data/quest_log.s b/data/quest_log.s new file mode 100644 index 000000000..dd7776ae0 --- /dev/null +++ b/data/quest_log.s @@ -0,0 +1,58 @@ + .section .rodata + +gUnknown_84566A4:: @ 84566A4 + .incbin "baserom.gba", 0x4566A4, 0x4 + +gUnknown_84566A8:: @ 84566A8 + .incbin "baserom.gba", 0x4566A8, 0x280 + +gUnknown_8456928:: @ 8456928 + .incbin "baserom.gba", 0x456928, 0x8 + +gUnknown_8456930:: @ 8456930 + .incbin "baserom.gba", 0x456930, 0x4 + +gUnknown_8456934:: @ 8456934 + .incbin "baserom.gba", 0x456934, 0x4 + +gUnknown_8456938:: @ 8456938 + .incbin "baserom.gba", 0x456938, 0x8 + +gUnknown_8456940:: @ 8456940 + .incbin "baserom.gba", 0x456940, 0x8 + +gUnknown_8456948:: @ 8456948 + .incbin "baserom.gba", 0x456948, 0xAC + +gUnknown_84569F4:: @ 84569F4 + .incbin "baserom.gba", 0x4569F4, 0xAC + +gUnknown_8456AA0:: @ 8456AA0 + .incbin "baserom.gba", 0x456AA0, 0x2C + +gUnknown_8456ACC:: @ 8456ACC + .incbin "baserom.gba", 0x456ACC, 0xC + +gUnknown_8456AD8:: @ 8456AD8 + .incbin "baserom.gba", 0x456AD8, 0xC + +gUnknown_8456AE4:: @ 8456AE4 + .incbin "baserom.gba", 0x456AE4, 0xC + +gUnknown_8456AF0:: @ 8456AF0 + .incbin "baserom.gba", 0x456AF0, 0xCC + +gUnknown_8456BBC:: @ 8456BBC + .incbin "baserom.gba", 0x456BBC, 0x28 + +gUnknown_8456BE4:: @ 8456BE4 + .incbin "baserom.gba", 0x456BE4, 0x33 + +gUnknown_8456C17:: @ 8456C17 + .incbin "baserom.gba", 0x456C17, 0x9 + +gUnknown_8456C20:: @ 8456C20 + .incbin "baserom.gba", 0x456C20, 0x30 + +gUnknown_8456C50:: @ 8456C50 + .incbin "baserom.gba", 0x456C50, 0x24 diff --git a/include/event_data.h b/include/event_data.h index f28ed4f75..77bc41603 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -31,6 +31,7 @@ u8 FlagClear(u16 id); bool8 FlagGet(u16 id); u16 * sub_806E454(u16 id); bool32 sub_806E2BC(void); +void sub_806E6FC(void); extern u16 gSpecialVar_0x8000; extern u16 gSpecialVar_0x8001; diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h new file mode 100644 index 000000000..5b2184561 --- /dev/null +++ b/include/field_control_avatar.h @@ -0,0 +1,6 @@ +#ifndef GUARD_FIELD_CONTROL_AVATAR_H +#define GUARD_FIELD_CONTROL_AVATAR_H + +extern u32 gUnknown_3005078; + +#endif //GUARD_FIELD_CONTROL_AVATAR_H diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index 7c2d16a24..2cd01601e 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -8,5 +8,7 @@ void sp13F_fall_to_last_warp(void); void sub_80AF848(void); void sub_80AF87C(void); +void sub_807DF64(void); +void sub_807DF7C(void); #endif // GUARD_FIELD_FADETRANSITION_H diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 0107fa10f..22d2d4a78 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -76,6 +76,8 @@ void MoveCoords(u8, s16 *, s16 *); bool8 FieldObjectIsSpecialAnimActive(struct MapObject *); u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *); u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z); +void sub_8063E28(struct MapObject *, struct Sprite *); +void sub_8063CA4(struct MapObject *, u8); // Exported data declarations diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 25b7f2d71..4bbc197aa 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -11,6 +11,8 @@ u8 player_get_direction_upper_nybble(void); u8 player_get_x22(void); void sub_808D074(u8); +void sub_805C270(); +void sub_805C780(); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); #endif //GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/field_weather.h b/include/field_weather.h index e12107e70..3f7741f00 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -8,5 +8,6 @@ u8 GetSav1Weather(void); void sub_80AEDBC(void); void DoCurrentWeather(void); +void sub_807B0C4(u16 *, u16 *, u32); #endif // GUARD_WEATHER_H diff --git a/include/gba/gba.h b/include/gba/gba.h index 7e58efb9f..4b5f2de95 100644 --- a/include/gba/gba.h +++ b/include/gba/gba.h @@ -1,6 +1,7 @@ #ifndef GUARD_GBA_GBA_H #define GUARD_GBA_GBA_H +#include <string.h> #include "defines.h" #include "io_reg.h" #include "types.h" diff --git a/include/global.h b/include/global.h index 8e5fab52c..ee64e855a 100644 --- a/include/global.h +++ b/include/global.h @@ -485,28 +485,69 @@ struct MysteryEventStruct u8 unk_1; }; +struct QuestLogNPCData +{ + u32 x:8; + u32 negx:1; + u32 y:8; + u32 negy:1; + u32 elevation:6; + u32 movementType:8; +}; + +struct QuestLog +{ + /*0x0000*/ u8 unk_000; + /*0x0001*/ s8 unk_001; + /*0x0002*/ s8 unk_002; + /*0x0003*/ s8 unk_003; + /*0x0004*/ s16 unk_004; + /*0x0006*/ s16 unk_006; + /*0x0008*/ u8 filler_008[0x140]; + /*0x0148*/ u8 unk_148[0x120]; + /*0x02c8*/ u8 unk_268[0x200]; + /*0x0468*/ struct QuestLogNPCData npcData[64]; + /*0x0568*/ u16 unk_568[0x80]; + /*0x0668*/ u16 end[0]; +}; + #define MAP_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 -#define FLAGS_COUNT 300 +#define FLAGS_COUNT 288 // 300 #define VARS_COUNT 256 #define MAIL_COUNT 16 struct SaveBlock1 { - /*0x0000*/ u8 filler[0x4]; + /*0x0000*/ struct Coords16 pos; /*0x0004*/ struct WarpData location; /*0x0C*/ struct WarpData warp1; /*0x14*/ struct WarpData warp2; /*0x1C*/ struct WarpData lastHealLocation; /*0x24*/ struct WarpData warp4; - /*0x002C*/ u8 filler2C[0x60C]; + /*0x2C*/ u16 savedMusic; + /*0x2E*/ u8 weather; + /*0x2F*/ u8 filler_2F; + /*0x30*/ u8 flashLevel; + /*0x32*/ u16 mapDataId; + /*0x34*/ u16 mapView[0x100]; + /*0x234*/ u8 playerPartyCount; + /*0x238*/ struct Pokemon playerParty[PARTY_SIZE]; + /*0x490*/ u32 money; + /*0x494*/ u16 coins; + /*0x496*/ u16 registeredItem; // registered for use with SELECT button + /*0x498*/ u8 filler_0498[0x1a0]; /*0x638*/ u8 trainerRematchStepCounter; u8 filler_639; /*0x63a*/ u8 trainerRematches[100]; /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; - /*0x0EE0*/ u8 fillerEE0[0x220A]; - /*0x30EA*/ struct EnigmaBerry enigmaBerry; + /*0x0EE0*/ u8 flags[FLAGS_COUNT]; + /*0x1000*/ u16 vars[VARS_COUNT]; + /*0x1200*/ u8 filler1200[0x100]; + /*0x1300*/ struct QuestLog questLog[4]; + /*0x2ca0*/ u8 filler2CA0[0x44C]; + /*0x30EC*/ struct EnigmaBerry enigmaBerry; /*0x3120*/ u8 filler3120[0x340]; /*0x3460*/ struct MysteryEventStruct unk_3460; /*0x3464*/ u8 filler_3464[0x1b8]; diff --git a/include/help_system.h b/include/help_system.h new file mode 100644 index 000000000..3a4c52f2e --- /dev/null +++ b/include/help_system.h @@ -0,0 +1,6 @@ +#ifndef GUARD_HELP_SYSTEM_H +#define GUARD_HELP_SYSTEM_H + +extern bool8 gUnknown_3005ECC; + +#endif //GUARD_HELP_SYSTEM_H diff --git a/include/item.h b/include/item.h index a136f03ec..199b3b65e 100644 --- a/include/item.h +++ b/include/item.h @@ -60,5 +60,7 @@ u8 ItemId_GetBattleUsage(u16 itemId); ItemUseFunc ItemId_GetBattleFunc(u16 itemId); u8 ItemId_GetSecondaryId(u16 itemId); u16 itemid_get_market_price(u16 itemId); +void sub_809A2DC(void); +void sub_809A2A4(void); #endif // ITEM_H diff --git a/include/map_name_popup.h b/include/map_name_popup.h index 8a9043a3f..0cb0c49ad 100644 --- a/include/map_name_popup.h +++ b/include/map_name_popup.h @@ -7,5 +7,6 @@ // Exported ROM declarations void HideMapNamePopUpWindow(void); +void sub_8098110(u8); #endif //GUARD_MAP_NAME_POPUP_H diff --git a/include/map_obj_80688E4.h b/include/map_obj_80688E4.h new file mode 100644 index 000000000..b131a1a54 --- /dev/null +++ b/include/map_obj_80688E4.h @@ -0,0 +1,6 @@ +#ifndef GUARD_MAP_OBJ_80688E4_H +#define GUARD_MAP_OBJ_80688E4_H + +void player_bitmagic(void); + +#endif //GUARD_MAP_OBJ_80688E4_H diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h index a10648f2f..cf1f714d7 100644 --- a/include/map_obj_lock.h +++ b/include/map_obj_lock.h @@ -7,5 +7,6 @@ bool8 sub_809847C(void); void LockSelectedMapObject(void); void sub_8098630(void); bool8 sub_8098734(void); +void sub_80696C0(void); #endif // GUARD_MAP_OBJ_LOCK_H diff --git a/include/menu.h b/include/menu.h index 99ff35adb..86a67adc4 100644 --- a/include/menu.h +++ b/include/menu.h @@ -32,7 +32,7 @@ void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirs s8 ProcessMenuInputNoWrap_(void); void do_scheduled_bg_tilemap_copies_to_vram(void); void clear_scheduled_bg_copies_to_vram(void); -void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str); +void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str); void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3); #endif // GUARD_MENU_H diff --git a/include/menu_helpers.h b/include/menu_helpers.h index f083a10e2..e88385f94 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -16,5 +16,6 @@ void sub_812225C(u16 *, u16 *, u8, u8); void sub_8122298(u16 *, u16 *, u8, u8, u8); void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data); bool8 sub_81221AC(void); +bool8 sub_80BF708(void); #endif //GUARD_MENU_HELPERS_H diff --git a/include/overworld.h b/include/overworld.h index a5fba0c10..d497ddbe1 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -71,4 +71,16 @@ void mapldr_default(void); void IncrementGameStat(u8); u32 GetGameStat(u8); +void sub_8056938(void); +void sub_8055D5C(struct WarpData *); +void sub_80572A8(void); +void sub_805726C(void); +void sub_8057430(void); +void sub_8055DC4(void); + +extern u8 gUnknown_2031DD8; +extern u8 gUnknown_2036E28; + +extern bool8 (* gUnknown_3005024)(void); + #endif //GUARD_ROM4_H diff --git a/include/palette.h b/include/palette.h index d3bcd2271..90112947a 100644 --- a/include/palette.h +++ b/include/palette.h @@ -42,8 +42,8 @@ struct PaletteFadeControl extern struct PaletteFadeControl gPaletteFade; extern u32 gPlttBufferTransferPending; extern u8 gPaletteDecompressionBuffer[]; -extern u16 gPlttBufferUnfaded[]; -extern u16 gPlttBufferFaded[]; +extern u16 gPlttBufferUnfaded[PLTT_BUFFER_SIZE]; +extern u16 gPlttBufferFaded[PLTT_BUFFER_SIZE]; void LoadCompressedPalette(const void *, u16, u16); void LoadPalette(const void *, u16, u16); @@ -67,5 +67,8 @@ void BeginFastPaletteFade(u8); void BeginHardwarePaletteFade(u8, u8, u8, u8, u8); void BlendPalettes(u32, u8, u16); void BlendPalettesUnfaded(u32, u8, u16); +void sub_80716F8(const u16 *, u16 *, u16, u8); + +extern struct PaletteFadeControl gPaletteFade; #endif // GUARD_PALETTE_H diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 9fcfdba96..04d739314 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -5,9 +5,10 @@ #define IN_BOX_COUNT 30 u8* GetBoxNamePtr(u8 boxNumber); -struct BoxPokemon *GetBoxedMonPtr(u8, u8); -void SetBoxMonNickFromAnyBox(u8, u8, u8 *); +struct BoxPokemon *GetBoxedMonPtr(u8 boxId, u8 monPosition); +void SetBoxMonNickFromAnyBox(u8 boxId, u8 monPosition, u8 * newNick); void CompactPartySlots(void); u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request); +void sub_808BCB4(u8 boxId, u8 monPosition); #endif // GUARD_POKEMON_STORAGE_SYSTEM_H diff --git a/include/quest_log.h b/include/quest_log.h new file mode 100644 index 000000000..f3fc04f41 --- /dev/null +++ b/include/quest_log.h @@ -0,0 +1,20 @@ +#ifndef GUARD_QUEST_LOG_H +#define GUARD_QUEST_LOG_H + +struct UnkStruct_3005E90 +{ + u8 unk_0; + u8 unk_1_0:1; + u8 unk_1_1:1; + u8 unk_1_2:1; + u8 unk_1_3:1; + u8 unk_1_4:1; + u8 unk_2; +}; + +extern u8 gUnknown_3005E88; +extern u16 gUnknown_3005E8C; +extern struct UnkStruct_3005E90 gUnknown_3005E90; +extern struct UnkStruct_203AE98 * gUnknown_3005E94; + +#endif //GUARD_QUEST_LOG_H diff --git a/include/quest_log_8150454.h b/include/quest_log_8150454.h new file mode 100644 index 000000000..05bebdd75 --- /dev/null +++ b/include/quest_log_8150454.h @@ -0,0 +1,6 @@ +#ifndef GUARD_QUEST_LOG_8150454_H +#define GUARD_QUEST_LOG_8150454_H + +void sub_8150454(void); + +#endif //GUARD_QUEST_LOG_8150454_H diff --git a/include/region_map.h b/include/region_map.h index 91384d166..eb84a71b1 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -310,5 +310,6 @@ void CreateRegionMapPlayerIcon(u16 x, u16 y); void CreateRegionMapCursor(u16 tileTag, u16 paletteTag); u8 *GetMapName(u8 *, u16, u16); bool32 sub_8124668(u8 mapSecId); +void sub_80C4DF8(u8 *, u8); #endif //GUARD_REGION_MAP_H diff --git a/include/save.h b/include/save.h index 38ad63170..5a502e1fc 100644 --- a/include/save.h +++ b/include/save.h @@ -117,6 +117,9 @@ u8 sub_80DA45C(void); bool8 sub_80DA4A0(void); u8 Save_LoadGameData(u8 a1); u32 TryCopySpecialSaveSection(u8 sector, u8* dst); +u32 sub_8153634(u8 sector, u8* src); +void sub_8153688(u8 taskId); +//void Save_LoadGameData(u8); u32 sub_80DA5E0(u8 sector, u8* src); void sub_80DA634(u8 taskId); diff --git a/include/unk_8159F40.h b/include/unk_8159F40.h new file mode 100644 index 000000000..b7666766f --- /dev/null +++ b/include/unk_8159F40.h @@ -0,0 +1,7 @@ +#ifndef GUARD_UNK_8159F40_H +#define GUARD_UNK_8159F40_H + +void sub_815A008(struct QuestLog *); +void sub_815A1F8(struct QuestLog *, struct MapObjectTemplate *); + +#endif //GUARD_UNK_8159F40_H diff --git a/include/wild_encounter.h b/include/wild_encounter.h index 55bbaa7dd..a1e26fe45 100644 --- a/include/wild_encounter.h +++ b/include/wild_encounter.h @@ -40,5 +40,6 @@ void FishingWildEncounter(u8 rod); u16 GetLocalWildMon(bool8 *isWaterMon); u16 GetLocalWaterMon(void); bool8 UpdateRepelCounter(void); +void sub_8082740(u8); #endif // GUARD_WILD_ENCOUNTER_H diff --git a/ld_script.txt b/ld_script.txt index 8fd83fbc8..5ac1bdeaa 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -219,6 +219,7 @@ SECTIONS { asm/item_pc.o(.text); asm/mailbox_pc.o(.text); asm/menu.o(.text); + src/quest_log.o(.text); asm/quest_log.o(.text); asm/link_rfu_3.o(.text); asm/pokemon_special_anim.o(.text); @@ -368,6 +369,9 @@ SECTIONS { data/data_83F5738.o(.rodata); src/save.o(.rodata); data/data_83FECCC.o(.rodata); + src/quest_log.o(.rodata); + data/quest_log.o(.rodata); + data/data_83FECCC.o(.rodata.8456C74); src/menews_jisan.o(.rodata); data/data_8468C98.o(.rodata); src/m4a_tables.o(.rodata); @@ -1067,7 +1067,6 @@ void CopyBgTilemapBufferToVram(u8 bg) void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height) { - void* srcCopy; u16 destX16; u16 destY16; u16 mode; @@ -1077,26 +1076,30 @@ void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u switch (GetBgType(bg)) { case 0: - srcCopy = src; + { + u16 * srcCopy = src; for (destY16 = destY; destY16 < (destY + height); destY16++) { for (destX16 = destX; destX16 < (destX + width); destX16++) { - ((u16*)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *((u16*)srcCopy)++; + ((u16*)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *(srcCopy)++; } } break; + } case 1: - srcCopy = src; + { + u8 * srcCopy = src; mode = GetBgMetricAffineMode(bg, 0x1); for (destY16 = destY; destY16 < (destY + height); destY16++) { for (destX16 = destX; destX16 < (destX + width); destX16++) { - ((u8*)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *((u8*)srcCopy)++; + ((u8*)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *(srcCopy)++; } } break; + } } } } diff --git a/src/quest_log.c b/src/quest_log.c new file mode 100644 index 000000000..a1008aa06 --- /dev/null +++ b/src/quest_log.c @@ -0,0 +1,1934 @@ +#include "global.h" +#include "constants/species.h" +#include "malloc.h" +#include "main.h" +#include "task.h" +#include "palette.h" +#include "menu.h" +#include "menu_helpers.h" +#include "window.h" +#include "text_window.h" +#include "event_data.h" +#include "string_util.h" +#include "script.h" +#include "overworld.h" +#include "field_fadetransition.h" +#include "field_weather.h" +#include "field_map_obj.h" +#include "map_obj_80688E4.h" +#include "map_obj_lock.h" +#include "field_player_avatar.h" +#include "field_control_avatar.h" +#include "item.h" +#include "region_map.h" +#include "map_name_popup.h" +#include "wild_encounter.h" +#include "help_system.h" +#include "unk_8159F40.h" +#include "pokemon_storage_system.h" +#include "save.h" +#include "quest_log_8150454.h" +#include "quest_log.h" + +u8 gUnknown_3005E88; + +struct UnkStruct_203AE94 +{ + u8 unk_0_0:4; + u8 unk_0_4:2; + u8 unk_0_6:2; + u8 unk_1; + u8 unk_2; + u8 unk_3; +}; + +struct UnkStruct_203AE98 +{ + u8 unk_0; + u8 unk_1; + u8 unk_2; + u8 unk_3; + u16 unk_4; + u8 unk_6; +}; + +u8 gUnknown_3005E88; +u16 gUnknown_3005E8C; +struct UnkStruct_3005E90 gUnknown_3005E90; +struct UnkStruct_203AE98 * gUnknown_3005E94; + +EWRAM_DATA u8 gUnknown_203ADF8 = 0; +EWRAM_DATA u8 gUnknown_203ADF9 = 0; +EWRAM_DATA u8 gUnknown_203ADFA = 0; +EWRAM_DATA u16 gUnknown_203ADFC = 0; +EWRAM_DATA u8 gUnknown_203ADFE[3]; +EWRAM_DATA void * gUnknown_203AE04 = NULL; +EWRAM_DATA u16 * gUnknown_203AE08 = NULL; +EWRAM_DATA void * gUnknown_203AE0C[32] = {NULL}; +EWRAM_DATA void (* gUnknown_203AE8C)(void) = 0; +EWRAM_DATA u16 *gUnknown_203AE90 = NULL; +EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; +EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; +EWRAM_DATA u16 gUnknown_203AF98 = 0; +EWRAM_DATA u8 gUnknown_203AF9A[64][2]; +EWRAM_DATA u16 gUnknown_203B01A; +EWRAM_DATA u16 gUnknown_203B01C; + +EWRAM_DATA u16 gUnknown_203B044[2] = {0}; + +void sub_8110A00(void); +void sub_8110A3C(void); +void sub_8110BB0(u8); +void sub_8110BE8(u8); +void sub_8110E3C(void); +void sub_8110D94(void); +void sub_8110E20(void); +void sub_8110D48(u8); +u8 sub_8110E68(struct UnkStruct_203AE98 *); +void sub_8110F90(u8); +void sub_8111150(u8); +void sub_8111368(void); +void sub_81115E8(void); +u16 sub_8111618(void); +u16 sub_811164C(void); +void sub_8111688(void); +void sub_811175C(u8, struct UnkStruct_203AE98 *); +void sub_81118F4(s8); +void sub_8111914(void); +void sub_8111984(void); +void sub_8111A34(u8); +void sub_8111AD8(void); +void sub_8111B80(void); +u8 sub_8111BD4(void); +void sub_8111D10(void); +void sub_8111D90(u8); +void sub_8111E20(void); +void sub_8111E64(s8); +void sub_8111E84(void); +bool8 sub_8111F60(void); +void sub_8111F8C(u8); +void sub_8111FCC(u8); +void sub_8112044(u8); +void sub_81120AC(u8); +bool8 sub_81121D8(u8); +void sub_811229C(void); +void sub_8112364(void); +void sub_8112888(u8); +void sub_8112940(u8, struct UnkStruct_203AE98 *, u16); +u8 sub_8112CAC(void); +bool8 sub_8112CEC(void); +bool8 sub_8112D1C(void); +void sub_8113A1C(u8); +void sub_811381C(void); +void sub_81138F8(void); +void * sub_8113A78(void *, void **); +void sub_8113ABC(void *); +bool8 sub_8113AE8(void *); +bool8 sub_8113B44(void *); +void sub_8113B88(void); +void sub_8113BD8(void); +void * sub_8113BF4(void *); +void * sub_8113C20(void *, struct UnkStruct_203AE98 *); +void * sub_8113C8C(void *, struct UnkStruct_203AE98 *); +void * sub_8113CC8(void *, struct UnkStruct_203AE98 *); +void * sub_8113D08(void *, struct UnkStruct_203AE98 *); +void * sub_8113D48(void *, struct UnkStruct_203AE98 *); +void * sub_8113D94(void *, struct UnkStruct_203AE98 *); + +extern const u8 gUnknown_841A155[]; +extern const u8 gUnknown_841B073[]; + +const struct WindowTemplate gUnknown_845661C[3] = { + { 0, 0, 0, 30, 2, 15, 0x0e9 }, + { 0, 0, 18, 30, 2, 15, 0x0ad }, + { 0, 0, 14, 30, 6, 15, 0x14c } +}; + +const struct TextColor gUnknown_8456634 = {15, 1, 12}; + +const u16 gUnknown_8456638[] = INCBIN_U16("data/graphics/unknown_8456638.bin"); + +const u8 gUnknown_8456698[] = {17, 10, 3}; + +extern const struct UnkStruct_203AE98 gUnknown_845669C; + +void sub_8110840(void * a0) +{ + size_t r1 = (void *)gSaveBlock1Ptr - a0; + if (gUnknown_203AE04) + gUnknown_203AE04 += r1; + if (gUnknown_203ADFA != 0) + { + if (gUnknown_203AE08) + gUnknown_203AE08 = (void *)gUnknown_203AE08 + r1; + if (gUnknown_203ADFA == 2) + { + int r3; + for (r3 = 0; r3 < 0x20; r3++) + if (gUnknown_203AE0C[r3]) + gUnknown_203AE0C[r3] += r1; + } + } +} + +void sub_811089C(void) +{ + memset(gSaveBlock1Ptr->questLog, 0, sizeof(gSaveBlock1Ptr->questLog)); + gUnknown_203ADF8 = 0; + gUnknown_203ADFA = 0; + gUnknown_203AE8C = 0; + gUnknown_203AE08 = NULL; + gUnknown_203AE04 = 0; + sub_8113BD8(); + sub_81138F8(); +} + +void sub_81108F0(u8 a0) +{ + memset(gSaveBlock1Ptr->questLog + a0, 0, sizeof(struct QuestLog)); + gUnknown_203AE04 = NULL; +} + +void sub_8110920(void) +{ + gUnknown_203AE04 = NULL; +} + +void sub_811092C(void) +{ + if (gUnknown_203AE8C) + gUnknown_203AE8C(); +} + +bool8 sub_8110944(void * a0, size_t a1) +{ + void * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; + void * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; + r0 -= a1; + if (a0 < r2 || a0 > r0) + return FALSE; + return TRUE; +} + +bool8 sub_8110988(void * a0, size_t a1) +{ + void * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; + void * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; + r0 -= a1; + if (a0 < r2 || a0 > r0) + return FALSE; + return TRUE; +} + +void sub_81109CC(u8 a0) +{ + gUnknown_203ADFA = a0; + if (a0 == 1) + gUnknown_203AE8C = sub_8110A00; + else + gUnknown_203AE8C = sub_8110A3C; +} + +void sub_8110A00(void) +{ + if (sub_8110E68(gUnknown_203AE98) != 1) + { + gUnknown_3005E88 = 0; + sub_8110E3C(); + gUnknown_203ADFA = 0; + gUnknown_203AE8C = NULL; + } +} + +void sub_8110A3C(void) +{ + if (gUnknown_203AE94.unk_0_0 == 2) + gUnknown_203AE94.unk_0_0 = 0; + + if (gUnknown_203AE94.unk_0_6 == 0) + { + if (gUnknown_3005E88 || gUnknown_203AE94.unk_0_0 == 1 || (gUnknown_203AE94.unk_1 < 32 && gUnknown_203AE0C[gUnknown_203AE94.unk_1])) + sub_8111AD8(); + else + { + gUnknown_203AE94.unk_0_6 = 2; + ScriptContext2_Enable(); + sub_81118F4(0); + } + } +} + +void sub_8110AB4(void) +{ + gUnknown_20370D0 = gUnknown_203ADFA; +} + +u8 sub_8110AC8(void) +{ + return gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000; +} + +void sub_8110AEC(u16 a0) +{ + if (gUnknown_203ADF8 > 3) + gUnknown_203ADF8 = 0; + + sub_81108F0(gUnknown_203ADF8); + sub_8113B88(); + gUnknown_203AE08 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_568; + if ((a0 >= 12 && a0 < 20) || a0 == 35) + gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000 = 2; + else + gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000 = 1; + sub_81115E8(); + sub_8110BB0(gUnknown_203ADF8); + sub_8110BE8(gUnknown_203ADF8); + sub_8110D94(); + sub_8110E20(); + sub_8110D48(gUnknown_203ADF8); + gUnknown_203ADFC = 0; + sub_8112940(2, gUnknown_203AE98, 0x100); + sub_8110E68(gUnknown_203AE98); + sub_81109CC(1); +} + +void sub_8110BB0(u8 a0) +{ + struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[a0]; + questLog->unk_001 = gSaveBlock1Ptr->location.mapGroup; + questLog->unk_002 = gSaveBlock1Ptr->location.mapNum; + questLog->unk_003 = gSaveBlock1Ptr->location.warpId; + questLog->unk_004 = gSaveBlock1Ptr->pos.x; + questLog->unk_006 = gSaveBlock1Ptr->pos.y; +} + +#ifdef NONMATCHING +void sub_8110BE8(u8 a0) +{ + struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[a0]; + u16 i; // r6 + + sub_815A008(questLog); + + for (i = 0; i < ARRAY_COUNT(gSaveBlock1Ptr->mapObjectTemplates); i++) + { + if (gSaveBlock1Ptr->mapObjectTemplates[i].x < 0) + { + questLog->npcData[i].x = (u8)-gSaveBlock1Ptr->mapObjectTemplates[i].x; + questLog->npcData[i].negx = TRUE; + } + else + { + questLog->npcData[i].x = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].x; + questLog->npcData[i].negx = FALSE; + } + if (gSaveBlock1Ptr->mapObjectTemplates[i].y < 0) + { + questLog->npcData[i].y = (u8)-gSaveBlock1Ptr->mapObjectTemplates[i].y; + questLog->npcData[i].negy = TRUE; + } + else + { + questLog->npcData[i].y = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].y; + questLog->npcData[i].negy = FALSE; + } + questLog->npcData[i].elevation = gSaveBlock1Ptr->mapObjectTemplates[i].elevation; + questLog->npcData[i].movementType = gSaveBlock1Ptr->mapObjectTemplates[i].movementType; + } +} +#else +NAKED +void sub_8110BE8(u8 a0) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tmov r7, r10\n" + "\tmov r6, r9\n" + "\tmov r5, r8\n" + "\tpush {r5-r7}\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tldr r4, =gSaveBlock1Ptr\n" + "\tmovs r1, 0xCD\n" + "\tlsls r1, 3\n" + "\tmuls r0, r1\n" + "\tmovs r1, 0x98\n" + "\tlsls r1, 5\n" + "\tadds r0, r1\n" + "\tldr r1, [r4]\n" + "\tadds r7, r1, r0\n" + "\tadds r0, r7, 0\n" + "\tbl sub_815A008\n" + "\tmovs r6, 0\n" + "\tmov r9, r4\n" + "\tmovs r2, 0x8D\n" + "\tlsls r2, 3\n" + "\tmov r8, r2\n" + "\tldr r3, =0x0000046a\n" + "\tmov r10, r3\n" + "_08110C1C:\n" + "\tmov r4, r9\n" + "\tldr r1, [r4]\n" + "\tlsls r2, r6, 1\n" + "\tadds r0, r2, r6\n" + "\tlsls r0, 3\n" + "\tadds r1, r0\n" + "\tldr r0, =0x000008e4\n" + "\tadds r1, r0\n" + "\tldrh r4, [r1]\n" + "\tmovs r3, 0\n" + "\tldrsh r0, [r1, r3]\n" + "\tmov r12, r2\n" + "\tcmp r0, 0\n" + "\tbge _08110C64\n" + "\tlsls r3, r6, 2\n" + "\tadds r2, r7, r3\n" + "\tnegs r0, r0\n" + "\tmov r4, r8\n" + "\tadds r1, r2, r4\n" + "\tstrb r0, [r1]\n" + "\tldr r0, =0x00000469\n" + "\tadds r2, r0\n" + "\tldrb r0, [r2]\n" + "\tmovs r1, 0x1\n" + "\torrs r0, r1\n" + "\tstrb r0, [r2]\n" + "\tb _08110C7C\n" + "\t.pool\n" + "_08110C64:\n" + "\tlsls r3, r6, 2\n" + "\tadds r1, r7, r3\n" + "\tmov r2, r8\n" + "\tadds r0, r1, r2\n" + "\tstrb r4, [r0]\n" + "\tldr r4, =0x00000469\n" + "\tadds r1, r4\n" + "\tldrb r2, [r1]\n" + "\tmovs r0, 0x2\n" + "\tnegs r0, r0\n" + "\tands r0, r2\n" + "\tstrb r0, [r1]\n" + "_08110C7C:\n" + "\tadds r5, r3, 0\n" + "\tmov r1, r9\n" + "\tldr r0, [r1]\n" + "\tmov r2, r12\n" + "\tadds r1, r2, r6\n" + "\tlsls r1, 3\n" + "\tadds r0, r1\n" + "\tldr r3, =0x000008e6\n" + "\tadds r1, r0, r3\n" + "\tldrh r2, [r1]\n" + "\tmovs r4, 0\n" + "\tldrsh r0, [r1, r4]\n" + "\tcmp r0, 0\n" + "\tbge _08110CC8\n" + "\tadds r3, r7, r5\n" + "\tadds r1, r0, 0\n" + "\tnegs r1, r1\n" + "\tlsls r1, 24\n" + "\tmov r2, r8\n" + "\tadds r4, r3, r2\n" + "\tlsrs r1, 15\n" + "\tldr r0, [r4]\n" + "\tldr r2, =0xfffe01ff\n" + "\tands r0, r2\n" + "\torrs r0, r1\n" + "\tstr r0, [r4]\n" + "\tadd r3, r10\n" + "\tldrb r0, [r3]\n" + "\tmovs r1, 0x2\n" + "\torrs r0, r1\n" + "\tb _08110CE6\n" + "\t.pool\n" + "_08110CC8:\n" + "\tadds r3, r7, r5\n" + "\tlsls r2, 24\n" + "\tmov r0, r8\n" + "\tadds r4, r3, r0\n" + "\tlsrs r2, 15\n" + "\tldr r0, [r4]\n" + "\tldr r1, =0xfffe01ff\n" + "\tands r0, r1\n" + "\torrs r0, r2\n" + "\tstr r0, [r4]\n" + "\tadd r3, r10\n" + "\tldrb r1, [r3]\n" + "\tmovs r0, 0x3\n" + "\tnegs r0, r0\n" + "\tands r0, r1\n" + "_08110CE6:\n" + "\tstrb r0, [r3]\n" + "\tadds r5, r7, r5\n" + "\tmov r1, r9\n" + "\tldr r0, [r1]\n" + "\tmov r2, r12\n" + "\tadds r3, r2, r6\n" + "\tlsls r3, 3\n" + "\tadds r0, r3\n" + "\tldr r4, =0x000008e8\n" + "\tadds r0, r4\n" + "\tldrb r1, [r0]\n" + "\tmov r0, r10\n" + "\tadds r4, r5, r0\n" + "\tlsls r1, 2\n" + "\tldrb r2, [r4]\n" + "\tmovs r0, 0x3\n" + "\tands r0, r2\n" + "\torrs r0, r1\n" + "\tstrb r0, [r4]\n" + "\tmov r1, r9\n" + "\tldr r0, [r1]\n" + "\tadds r0, r3\n" + "\tldr r2, =0x000008e9\n" + "\tadds r0, r2\n" + "\tldrb r0, [r0]\n" + "\tldr r3, =0x0000046b\n" + "\tadds r5, r3\n" + "\tstrb r0, [r5]\n" + "\tadds r0, r6, 0x1\n" + "\tlsls r0, 16\n" + "\tlsrs r6, r0, 16\n" + "\tcmp r6, 0x3F\n" + "\tbhi _08110D2A\n" + "\tb _08110C1C\n" + "_08110D2A:\n" + "\tpop {r3-r5}\n" + "\tmov r8, r3\n" + "\tmov r9, r4\n" + "\tmov r10, r5\n" + "\tpop {r4-r7}\n" + "\tpop {r0}\n" + "\tbx r0\n" + "\t.pool"); +} +#endif // NONMATCHING + +void sub_8110D48(u8 a0) +{ + struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[a0]; + + CpuCopy16(gSaveBlock1Ptr->flags, questLog->unk_148, FLAGS_COUNT * sizeof(u8)); + CpuCopy16(gSaveBlock1Ptr->vars, questLog->unk_268, VARS_COUNT * sizeof(u16)); +} + +void sub_8110D94(void) +{ + u16 i, j; + u16 sp0[4]; + + for (i = 0; i < 4; i++) + { + sp0[i] = 0; + for (j = 0; j < 16; j++) + { + if (gSaveBlock1Ptr->trainerRematches[16 * i + j]) + { + sp0[i] += (1 << j); + } + } + VarSet(VAR_0x40AA + i, sp0[i]); + } +} + +void sub_8110E20(void) +{ + VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapDataId); +} + +void sub_8110E3C(void) +{ + sub_8113BF4(gUnknown_203AE08); + if (++gUnknown_203ADF8 > 3) + gUnknown_203ADF8 = 0; +} + +bool8 sub_8110E68(struct UnkStruct_203AE98 * a0) +{ + u16 i; + + for (i = gUnknown_203ADFC; i < gUnknown_203AF98; i++) + { + if (gUnknown_203AE08 == NULL) + return FALSE; + switch (a0[i].unk_6) + { + case 0: + case 1: + gUnknown_203AE08 = sub_8113D48(gUnknown_203AE08, &a0[i]); + break; + default: + gUnknown_203AE08 = sub_8113CC8(gUnknown_203AE08, &a0[i]); + break; + } + if (gUnknown_203AE08 == NULL) + { + gUnknown_3005E88 = 0; + return FALSE; + } + } + + if (gUnknown_3005E88 == 0) + { + gUnknown_203AE08 = sub_8113BF4(gUnknown_203AE08); + return FALSE; + } + gUnknown_203ADFC = gUnknown_203AF98; + return TRUE; +} + +void sub_8110F14(u8 taskId) +{ + u8 i; + + sub_811381C(); + gUnknown_203ADF9 = 0; + for (i = 0; i < 4; i++) + { + if (gSaveBlock1Ptr->questLog[i].unk_000) + gUnknown_203ADF9++; + } + + if (gUnknown_203ADF9 != 0) + { + gUnknown_3005ECC = FALSE; + sub_8110F90(taskId); + DestroyTask(taskId); + } + else + { + SetMainCallback2(sub_8056938); + DestroyTask(taskId); + } +} + +void sub_8110F90(u8 unused) +{ + gSaveBlock1Ptr->location.mapGroup = 3; + gSaveBlock1Ptr->location.mapNum = 19; + gSaveBlock1Ptr->location.warpId = -1; + gUnknown_203ADF8 = 0; + gUnknown_2031DD8 = 1; + sub_8082740(1); + sub_8111368(); +} + +void sub_8110FCC(void) +{ + sub_811175C(gUnknown_203ADF8, gUnknown_203AE98); + sub_8113B88(); + sub_8112940(1, gUnknown_203AE98, 0x100); + sub_8111150(gUnknown_203ADF8); +} + +bool8 sub_8111000(void) +{ + LoadPalette(stdpal_get(4), 0xF0, 0x20); + sub_81109CC(2); + sub_807DF64(); + gUnknown_203AE94 = (struct UnkStruct_203AE94){}; + gUnknown_203AE94.unk_0_0 = 2; + return 1; +} + +bool8 sub_8111038(void) +{ + LoadPalette(stdpal_get(4), 0xF0, 0x20); + sub_81109CC(2); + sub_807DF7C(); + gUnknown_203AE94 = (struct UnkStruct_203AE94){}; + gUnknown_203AE94.unk_0_0 = 2; + return 1; +} + +void sub_8111070(u8 a0) +{ + u8 i; + + for (i = 0; i < 3; i++) + { + gUnknown_203ADFE[i] = AddWindow(&gUnknown_845661C[i]); + FillWindowPixelRect(gUnknown_203ADFE[i], 15, 0, 0, gUnknown_845661C[i].width * 8, gUnknown_845661C[i].height * 8); + } + + // _("Previously on your quest…$") + StringExpandPlaceholders(gStringVar4, gUnknown_841A155); + + if (a0) + { + ConvertIntToDecimalStringN(gStringVar1, a0, STR_CONV_MODE_LEFT_ALIGN, 1); + StringAppend(gStringVar4, gStringVar1); + } + + AddTextPrinterParametrized2(gUnknown_203ADFE[0], 2, 2, 2, 1, 2, &gUnknown_8456634, 0, gStringVar4); + PutWindowTilemap(gUnknown_203ADFE[0]); + PutWindowTilemap(gUnknown_203ADFE[1]); + CopyWindowToVram(gUnknown_203ADFE[0], 2); + CopyWindowToVram(gUnknown_203ADFE[2], 2); + CopyWindowToVram(gUnknown_203ADFE[1], 3); +} + +void sub_8111134(void) +{ + PutWindowTilemap(gUnknown_203ADFE[1]); + CopyWindowToVram(gUnknown_203ADFE[1], 1); +} + +void sub_8111150(u8 a0) +{ + struct QuestLog *questLog = &gSaveBlock1Ptr->questLog[a0]; + u16 i; + + for (i = 0; i < 64; i++) + { + if (questLog->npcData[i].negx) + gSaveBlock1Ptr->mapObjectTemplates[i].x = -questLog->npcData[i].x; + else + gSaveBlock1Ptr->mapObjectTemplates[i].x = questLog->npcData[i].x; + if (questLog->npcData[i].negy) + gSaveBlock1Ptr->mapObjectTemplates[i].y = -(u8)questLog->npcData[i].y; + else + gSaveBlock1Ptr->mapObjectTemplates[i].y = questLog->npcData[i].y; + gSaveBlock1Ptr->mapObjectTemplates[i].elevation = questLog->npcData[i].elevation; + gSaveBlock1Ptr->mapObjectTemplates[i].movementType = questLog->npcData[i].movementType; + } + + sub_815A1F8(questLog, gSaveBlock1Ptr->mapObjectTemplates); +} + +void sub_8111274(u8 a0, u8 a1) +{ + struct WarpData sp0; + + if (!a1) + { + gSaveBlock1Ptr->location.mapGroup = gSaveBlock1Ptr->questLog[a0].unk_001; + gSaveBlock1Ptr->location.mapNum = gSaveBlock1Ptr->questLog[a0].unk_002; + gSaveBlock1Ptr->location.warpId = gSaveBlock1Ptr->questLog[a0].unk_003; + gSaveBlock1Ptr->pos.x = gSaveBlock1Ptr->questLog[a0].unk_004; + gSaveBlock1Ptr->pos.y = gSaveBlock1Ptr->questLog[a0].unk_006; + } + else + { + sp0.mapGroup = gSaveBlock1Ptr->questLog[a0].unk_001; + sp0.mapNum = gSaveBlock1Ptr->questLog[a0].unk_002; + sp0.warpId = gSaveBlock1Ptr->questLog[a0].unk_003; + sp0.x = gSaveBlock1Ptr->questLog[a0].unk_004; + sp0.y = gSaveBlock1Ptr->questLog[a0].unk_006; + sub_8055D5C(&sp0); + } +} + +void sub_8111368(void) +{ + gUnknown_203ADFA = 2; + sub_806E6FC(); + sub_809A2DC(); + sub_809A2A4(); + if (sub_8110AC8() == 1) + { + sub_8111274(gUnknown_203ADF8, 0); + gUnknown_3005024 = sub_8111038; + SetMainCallback2(sub_80572A8); + } + else + { + sub_8111274(gUnknown_203ADF8, 1); + warp_in(); + gUnknown_3005024 = sub_8111000; + SetMainCallback2(sub_805726C); + } +} + +void sub_81113E4(void) +{ + struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[gUnknown_203ADF8]; + + CpuCopy16(questLog->unk_148, gSaveBlock1Ptr->flags, FLAGS_COUNT * sizeof(u8)); + CpuCopy16(questLog->unk_268, gSaveBlock1Ptr->vars, VARS_COUNT * sizeof(u16)); + sub_8111688(); +} + +struct PokemonAndSomethingElse +{ + struct Pokemon mon; + u16 unk_64; + u16 unk_66; +}; + +void sub_8111438(void) +{ + struct PokemonAndSomethingElse *r9 = AllocZeroed(sizeof(struct PokemonAndSomethingElse)); + u16 r0, r3, r5, r6; + + CreateMon(&r9->mon, SPECIES_RATTATA, 1, 0x20, FALSE, 0, 0, 0); + r0 = VarGet(VAR_0x4027); + r9->unk_64 = r0 >> 12; + r9->unk_66 = r0 % 0x1000; + + r5 = sub_8111618(); + if (r5 > r9->unk_64) + { + for (r3 = 0; r3 < r5 - r9->unk_64; r3++) + { + ZeroMonData(&gPlayerParty[5 - r3]); + } + } + else if (r5 < r9->unk_64) + { + for (r3 = 0; r3 < 5; r3++) + { + sub_808BCB4(0, r3); + } + for (r3 = r5; r3 < r9->unk_64; r3++) + { + CopyMon(&gPlayerParty[r3], &r9->mon, sizeof(struct Pokemon)); + } + } + + r5 = sub_811164C(); + if (r5 > r9->unk_66) + { + for (r3 = 0; r3 < 14; r3++) + { + for (r6 = 0; r6 < 30; r6++) + { + if (GetBoxMonDataFromAnyBox(r3, r6, MON_DATA_SANITY_BIT2)) + { + sub_808BCB4(r3, r6); + r5--; + if (r5 == r9->unk_66) + break; + } + } + if (r5 == r9->unk_66) + break; + } + } + else if (r5 < r9->unk_66) + { + for (r3 = 0; r3 < TOTAL_BOXES_COUNT; r3++) + { + for (r6 = 0; r6 < IN_BOX_COUNT; r6++) + { + struct BoxPokemon * boxMon = GetBoxedMonPtr(r3, r6); + if (!GetBoxMonData(boxMon, MON_DATA_SANITY_BIT2)) + { + CopyMon(boxMon, &r9->mon.box, sizeof(struct BoxPokemon)); + r5++; + if (r5 == r9->unk_66) + break; + } + } + if (r5 == r9->unk_66) + break; + } + } + + Free(r9); +} + +void sub_81115E8(void) +{ + u16 r4 = sub_8111618(); + u16 r1 = sub_811164C(); + VarSet(VAR_0x4027, (r4 << 12) + r1); +} + +u16 sub_8111618(void) +{ + u16 count = 0; + u16 i; + + for (i = 0; i < PARTY_SIZE; i++) + { + if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_BIT2)) + count++; + } + + return count; +} + +u16 sub_811164C(void) +{ + u16 count = 0; + u16 i, j; + + for (i = 0; i < TOTAL_BOXES_COUNT; i++) + { + for (j = 0; j < IN_BOX_COUNT; j++) + { + if (GetBoxMonDataFromAnyBox(i, j, MON_DATA_SANITY_BIT2)) + count++; + } + } + + return count; +} + +void sub_8111688(void) +{ + u16 i, j; + u16 sp0[4]; + + for (i = 0; i < 4; i++) + { + sp0[i] = VarGet(VAR_0x40AA + i); + + for (j = 0; j < 16; j++) + { + if (sp0[i] & 1) + gSaveBlock1Ptr->trainerRematches[16 * i + j] = 30; + else + gSaveBlock1Ptr->trainerRematches[16 * i + j] = 0; + sp0[i] >>= 1; + } + } +} + +void sub_8111708(void) +{ + struct MapHeader sp0; + + gSaveBlock1Ptr->mapDataId = VarGet(VAR_0x40AE); + if (gSaveBlock1Ptr->mapDataId == 0) + { + sp0 = *get_mapheader_by_bank_and_number(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); + gSaveBlock1Ptr->mapDataId = sp0.mapDataId; + } +} + +void sub_811175C(u8 a0, struct UnkStruct_203AE98 * a1) +{ + u16 i; + u16 *r4; + u16 r6 = 0; + u16 r9 = 0; + + memset(a1, 0, 32 * sizeof(struct UnkStruct_203AE98)); + for (i = 0; i < 32; i++) + { + gUnknown_203AE0C[i] = NULL; + } + + r4 = gSaveBlock1Ptr->questLog[a0].unk_568; + for (i = 0; i < 32; i++) + { + switch (*r4 & 0xFFF) + { + case 0: + r4 = sub_8113D08(r4, &a1[r6]); + r6++; + break; + case 1: + case 2: + r4 = sub_8113D94(r4, &a1[r6]); + r6++; + break; + case 39: + r4 = sub_8113C20(r4, &a1[r6]); + r6++; + break; + case 41: + r4 = sub_8113C8C(r4, &a1[r6]); + r6++; + break; + default: + r4 = sub_8113A78(r4, &gUnknown_203AE0C[r9]); + if (r9 == 0) + sub_8113ABC(gUnknown_203AE0C[0]); + r9++; + break; + } + if (r4 == NULL) + break; + } +} + +void sub_81118F4(s8 a0) +{ + fade_screen(1, a0); + gUnknown_203AE8C = sub_8111914; +} + +void sub_8111914(void) +{ + if (!gPaletteFade.active) + { + ScriptContext2_Enable(); + if (++gUnknown_203ADF8 < 4 && gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000) + { + gUnknown_203ADF9--; + sub_8111368(); + } + else + { + gUnknown_3005E88 = 0; + sub_8111984(); + } + } +} + +void sub_8111984(void) +{ + sub_806E6FC(); + Save_ResetSaveCounters(); + Save_LoadGameData(0); + SetMainCallback2(sub_8057430); + gUnknown_3005024 = sub_8111F60; + FreeAllWindowBuffers(); + gUnknown_203ADFA = 3; + gUnknown_203AE8C = NULL; +} + +void sub_81119C8(void) +{ + sub_8111914(); +} + +bool8 sub_81119D4(void (*a0)(void)) +{ + u8 taskId; + + switch (gUnknown_203ADFA) + { + case 1: + sub_8112364(); + break; + case 2: + gUnknown_3005E88 = 3; + taskId = CreateTask(sub_8111A34, 80); + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = 0; + SetWordTaskArg(taskId, 14, (u32)a0); + return TRUE; + } + return FALSE; +} + +void sub_8111A34(u8 taskId) +{ + void (*routine)(void); + s16 * data = gTasks[taskId].data; + + switch (data[1]) + { + case 0: + if (++data[0] == 0x7F) + { + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + gUnknown_203AE94.unk_0_6 = 2; + data[1]++; + } + break; + case 1: + if (!gPaletteFade.active) + { + gUnknown_3005E88 = 0; + routine = (void (*)(void)) GetWordTaskArg(taskId, 14); + if (routine != NULL) + routine(); + DestroyTask(taskId); + gUnknown_203AE8C = sub_8111914; + } + break; + } +} + +void sub_8111AD8(void) +{ + if (gUnknown_203AE94.unk_0_0 == 1) + { + if (--gUnknown_203AE94.unk_2 != 0) + return; + gUnknown_203AE94.unk_0_0 = 0; + gUnknown_203AE94.unk_0_4 = 1; + sub_8112888(2); + } + + if (gUnknown_203AE94.unk_0_4 == 1) + { + if (++gUnknown_203AE94.unk_3 > 15) + { + sub_8111E20(); + gUnknown_203AE94.unk_0_4 = 0; + gUnknown_203AE94.unk_3 = 0; + } + } + if (gUnknown_203AE94.unk_1 < 32) + { + if (sub_8113B44(gUnknown_203AE0C[gUnknown_203AE94.unk_1]) == 1) + sub_8111B80(); + else if (sub_8113AE8(gUnknown_203AE0C[gUnknown_203AE94.unk_1]) == 1) + sub_8111B80(); + } +} + +void sub_8111B80(void) +{ + if (gUnknown_203AE94.unk_0_0 == 0) + { + gUnknown_203AE94.unk_0_0 = 1; + gUnknown_203AE94.unk_0_4 = 0; + gUnknown_203AE94.unk_3 = 0; + gUnknown_203AE94.unk_2 = sub_8111BD4(); + if (gUnknown_203B044[1] == 0) + gUnknown_203AE94.unk_1++; + if (gUnknown_203AE94.unk_1 > 32) + return; + sub_8111D10(); + } + sub_8112888(1); +} + +u8 sub_8111BD4(void) +{ + u16 i; + u16 count = 0; + + for (i = 0; i < 0x400 && gStringVar4[i] != EOS; i++) + { + if (gStringVar4[i] != CHAR_NEWLINE) + count++; + } + + if (count < 20) + return 0x5F; + if (count < 36) + return 0x7F; + if (count < 46) + return 0xBF; + return 0xFF; +} + +bool8 sub_8111C2C(void) +{ + if (gUnknown_203ADFA != 2) + return FALSE; + if (gUnknown_3005E88 == 0 || gUnknown_203AE94.unk_0_0 == 1 || gUnknown_203AE94.unk_0_0 == 2) + return TRUE; + return FALSE; +} + +void sub_8111C68(void) +{ + if (gUnknown_203AE94.unk_0_6 == 0) + { + if (gMain.newKeys & A_BUTTON) + { + gUnknown_203AE94.unk_0_6 = 2; + gUnknown_3005E88 = 0; + sub_81118F4(-3); + } + else if (gMain.newKeys & B_BUTTON) + { + gUnknown_203AE94.unk_0_6 = 1; + gUnknown_3005E88 = 0; + sub_8111E64(-3); + } + } +} + +bool8 sub_8111CD0(void) +{ + if (gUnknown_203AE94.unk_0_6 != 0) + return TRUE; + return FALSE; +} + +void sub_8111CF0(void) +{ + if (gUnknown_203ADFA == 2) + sub_8111070(gUnknown_203ADF9); +} + +void sub_8111D10(void) +{ + u16 i; + u8 count = 0; + + for (i = 0; i < 0x100 && gStringVar4[i] != EOS; i++) + { + if (gStringVar4[i] == CHAR_NEWLINE) + count++; + } + + PutWindowTilemap(gUnknown_203ADFE[2]); + sub_8111D90(gUnknown_203ADFE[2]); + AddTextPrinterParametrized2(gUnknown_203ADFE[2], 2, 2, gUnknown_8456698[count], 1, 0, &gUnknown_8456634, 0, gStringVar4); + schedule_bg_copy_tilemap_to_vram(0); +} + +void sub_8111D90(u8 a0) +{ + const u16 * src = gUnknown_8456638; + u16 * buffer = Alloc(0x1680); + u8 i, j, y; + + if (buffer) + { + for (i = 0; i < 6; i++) + { + switch (i) + { + default: + y = 1; + break; + case 0: + y = 0; + break; + case 5: + y = 2; + break; + } + + // r6 = y * 32 + // r5 = 2 * (i % 16) + // r4 = j + for (j = 0; j < 30; j++) + { + CpuCopy32(src + 16 * y, buffer + 16 * (2 * (15 * i) + j), 32); + } + } + + CopyToWindowPixelBuffer(a0, (const u8 *)buffer, 0x1680, 0); + Free(buffer); + } +} + +void sub_8111E20(void) +{ + ClearWindowTilemap(gUnknown_203ADFE[2]); + FillWindowPixelRect(gUnknown_203ADFE[2], 15, 0, 0, 0xf0, 0x30); + CopyWindowToVram(gUnknown_203ADFE[2], 2); + PutWindowTilemap(gUnknown_203ADFE[1]); + CopyWindowToVram(gUnknown_203ADFE[1], 1); +} + +void sub_8111E64(s8 a0) +{ + fade_screen(1, a0); + gUnknown_203AE8C = sub_8111E84; +} + +void sub_8111E84(void) +{ + if (!gPaletteFade.active) + { + ScriptContext2_Enable(); + for (gUnknown_203ADF8 = gUnknown_203ADF8; gUnknown_203ADF8 < 4; gUnknown_203ADF8++) + { + if (gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000 == 0) + break; + sub_811175C(gUnknown_203ADF8, gUnknown_203AE98); + } + gUnknown_3005E88 = 0; + sub_8111984(); + } +} + +void sub_8111F14(void) +{ + if (gUnknown_203ADFA == 3) + gUnknown_203AE90 = AllocZeroed(0x200 * sizeof(u16)); +} + +void sub_8111F38(u16 a0, u16 a1) +{ + CpuSet(gPlttBufferUnfaded + a0, gUnknown_203AE90 + a0, a1); +} + +bool8 sub_8111F60(void) +{ + LoadPalette(stdpal_get(4), 0xF0, 0x20); + sub_8111070(0); + sub_807DF7C(); + CreateTask(sub_8111F8C, 0xFF); + return TRUE; +} + +void sub_8111F8C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (ScriptContext2_IsEnabled() != TRUE) + { + player_bitmagic(); + sub_805C270(); + sub_805C780(); + ScriptContext2_Enable(); + task->func = sub_8111FCC; + } +} + +void sub_8111FCC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (!gPaletteFade.active) + { + if (gUnknown_203AE94.unk_0_6 != 1) + { + sub_80C4DF8(gStringVar1, gMapHeader.regionMapSectionId); + StringExpandPlaceholders(gStringVar4, gUnknown_841B073); + sub_8111D10(); + } + task->data[0] = 0; + task->data[1] = 0; + task->func = sub_8112044; + player_bitmagic(); + ScriptContext2_Enable(); + } +} + +void sub_8112044(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (gMain.newKeys & (A_BUTTON | B_BUTTON) || task->data[0] >= 0x7f || gUnknown_203AE94.unk_0_6 == 1) + { + sub_8111E20(); + task->data[0] = 0; + task->func = sub_81120AC; + gUnknown_203ADFA = 0; + } + else + task->data[0]++; +} + +void sub_81120AC(u8 taskId) +{ + s16 * data = gTasks[taskId].data; + u8 i; + + switch (data[0]) + { + case 0: + gUnknown_2031DD8 = 0; + sub_8055DC4(); + sub_811229C(); + FillWindowPixelRect(gUnknown_203ADFE[0], 0xF, 0, 0, gUnknown_845661C[0].width * 8, gUnknown_845661C[0].height * 8); + data[0]++; + break; + case 1: + if (sub_81121D8(taskId)) + { + for (i = 0; i < 3; i++) + { + ClearWindowTilemap(gUnknown_203ADFE[i]); + CopyWindowToVram(gUnknown_203ADFE[i], 1); + RemoveWindow(gUnknown_203ADFE[i]); + } + data[1] = 0; + data[0]++; + } + break; + case 2: + if (data[1] < 32) + data[1]++; + else + data[0]++; + break; + default: + if (gUnknown_203AE94.unk_0_6 == 1) + sub_8098110(1); + CpuCopy16(gUnknown_203AE90, gPlttBufferUnfaded, 0x400); + Free(gUnknown_203AE90); + gUnknown_203AE94 = (struct UnkStruct_203AE94){}; + sub_80696C0(); + ScriptContext2_Disable(); + gTextFlags.flag_2 = FALSE; + gUnknown_2036E28 = 0; + sub_8082740(0); + gUnknown_3005ECC = 1; + DestroyTask(taskId); + break; + } +} + +bool8 sub_81121D8(u8 taskId) +{ + s16 * data = gTasks[taskId].data; + + if (data[1] > 15) + return TRUE; + + sub_80716F8(gPlttBufferUnfaded + 0x01, gPlttBufferFaded + 0x01, 0xDF, 0x0F - data[1]); + sub_80716F8(gPlttBufferUnfaded + 0x100, gPlttBufferFaded + 0x100, 0x100, 0x0F - data[1]); + FillWindowPixelRect(gUnknown_203ADFE[0], 0x00, 0, gUnknown_845661C[0].height * 8 - 1 - data[1], gUnknown_845661C[0].width * 8, 1); + FillWindowPixelRect(gUnknown_203ADFE[1], 0x00, 0, data[1], gUnknown_845661C[1].width * 8, 1); + CopyWindowToVram(gUnknown_203ADFE[0], 2); + CopyWindowToVram(gUnknown_203ADFE[1], 2); + data[1]++; + return FALSE; +} + +void sub_811229C(void) +{ + u16 * buffer = Alloc(0x400); + CpuCopy16(gUnknown_203AE90, buffer, 0x400); + sub_807B0C4(gUnknown_203AE90, gUnknown_203AE90, 0xd0); + sub_807B0C4(gUnknown_203AE90 + 0x110, gUnknown_203AE90 + 0x110, 0x10); + sub_807B0C4(gUnknown_203AE90 + 0x160, gUnknown_203AE90 + 0x160, 0x40); + sub_807B0C4(gUnknown_203AE90 + 0x1b0, gUnknown_203AE90 + 0x1b0, 0x50); + CpuCopy16(gUnknown_203AE90, gPlttBufferUnfaded, 0x400); + CpuCopy16(buffer, gUnknown_203AE90, 0x400); + Free(buffer); +} + +void sub_811231C(void) +{ + if (gUnknown_203ADFA == 1) + { + sub_8110E68(gUnknown_203AE98); + sub_8110E3C(); + gUnknown_203ADFA = 0; + gUnknown_203AE8C = NULL; + gUnknown_203AE04 = NULL; + gUnknown_203AE08 = NULL; + gUnknown_3005E88 = 0; + } +} + +void sub_8112364(void) +{ + if (gUnknown_3005E88 && gUnknown_203ADFA == 1) + { + sub_8110E68(gUnknown_203AE98); + sub_8113A1C(1); + sub_8110E3C(); + gUnknown_3005E88 = 0; + gUnknown_203ADFA = 0; + gUnknown_203AE8C = NULL; + } + gUnknown_203AE04 = NULL; + gUnknown_203AE08 = NULL; +} + +void sub_81123BC(void) +{ + struct QuestLog * buffer = AllocZeroed(4 * sizeof(struct QuestLog)); + u8 i; + u8 r4 = gUnknown_203ADF8; + u8 count = 0; + for (i = 0; i < 4; i++) + { + if (r4 > 3) + r4 = 0; + if (gSaveBlock1Ptr->questLog[r4].unk_000) + { + buffer[count] = gSaveBlock1Ptr->questLog[r4]; + count++; + } + r4++; + } + gUnknown_203ADF8 = count % 4; + CpuCopy16(buffer, gSaveBlock1Ptr->questLog, 4 * sizeof(struct QuestLog)); + Free(buffer); +} + +void sub_8112450(void) +{ + if (sub_80BF708() != 1) + { + sub_8112364(); + sub_81123BC(); + } +} + +void sub_811246C(struct Sprite *sprite) +{ + struct MapObject *mapObject = &gMapObjects[sprite->data[0]]; + if (mapObject->localId == 0xFF) + { + if (gUnknown_203AF9A[0][0] != 0xFF) + { + sub_8063CA4(mapObject, gUnknown_203AF9A[0][0]); + gUnknown_203AF9A[0][0] = 0xFF; + } + if (gUnknown_203AF9A[0][1] != 0xFF) + { + sub_8150454(); + gUnknown_203AF9A[0][1] = 0xFF; + } + sub_8063E28(mapObject, sprite); + } + else + { + if (gUnknown_203AF9A[mapObject->localId][0] != 0xFF) + { + sub_8063CA4(mapObject, gUnknown_203AF9A[mapObject->localId][0]); + gUnknown_203AF9A[mapObject->localId][0] = 0xFF; + } + sub_8063E28(mapObject, sprite); + } +} + +void sub_81124EC(u8 a0, u8 a1, u8 a2, u8 a3) +{ + if (!sub_8112CEC()) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = a0; + gUnknown_3005E94[gUnknown_203AF98].unk_1 = a1; + gUnknown_3005E94[gUnknown_203AF98].unk_2 = a2; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a3; + gUnknown_203AF98++; + gUnknown_203B01A = 0; + } +} + +void sub_8112588(u8 a0, u8 a1, u8 a2, u8 a3, u8 a4) +{ + if (!sub_8112D1C()) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = a0; + gUnknown_3005E94[gUnknown_203AF98].unk_1 = a1; + gUnknown_3005E94[gUnknown_203AF98].unk_2 = a2; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a3; + gUnknown_203AF98++; + gUnknown_203B01A = a4; + } +} + +void sub_8112628(u8 a0) +{ + if (!sub_8112CEC()) + { + if (a0 != gUnknown_3005E94[gUnknown_203B01C].unk_3 || a0 > 3) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a0; + gUnknown_203B01C = gUnknown_203AF98; + gUnknown_203AF98++; + gUnknown_203B01A = 0; + } + } +} + +void sub_81126AC(u8 a0, u8 a1) +{ + if (!sub_8112D1C()) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a0; + gUnknown_203B01C = gUnknown_203AF98; + gUnknown_203AF98++; + gUnknown_203B01A = a1; + } +} + +void sub_8112720(u8 a0) +{ + if (!sub_8112D1C()) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 1; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a0; + gUnknown_203AF98++; + gUnknown_203B01A = 0; + } +} + +void sub_811278C(u8 a0, u8 a1) +{ + if (!sub_8112D1C()) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 1; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = a0; + gUnknown_203AF98++; + gUnknown_203B01A = a1; + } +} + +void sub_81127F8(struct UnkStruct_3005E90 * a0) +{ + if (gUnknown_203AF98 < gUnknown_3005E8C) + { + u32 r2 = *(u32 *)a0 & 0x00FF00F3; + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 2; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = r2; + gUnknown_3005E94[gUnknown_203AF98].unk_1 = r2 >> 8; + gUnknown_3005E94[gUnknown_203AF98].unk_2 = r2 >> 16; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = r2 >> 24; + gUnknown_203AF98++; + if (ScriptContext2_IsEnabled()) + gUnknown_203B01A = TRUE; + else + gUnknown_203B01A = FALSE; + } +} + +void sub_8112888(u8 a0) +{ + switch (a0) + { + case 1: + if (gUnknown_3005E88 == 1) + gUnknown_3005E88 = 3; + break; + case 2: + if (gUnknown_3005E88 == 3) + gUnknown_3005E88 = 1; + break; + } +} + +void sub_81128BC(u8 a0) +{ + u8 r1 = sub_8112CAC(); + + switch (a0) + { + case 1: + if (r1 == 1) + gUnknown_3005E88 = 3; + else if (r1 == 2) + { + gUnknown_3005E94[gUnknown_203AF98].unk_4 = gUnknown_203B01A; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 3; + gUnknown_203AF98++; + gUnknown_203B01A = 0; + gUnknown_3005E88 = 4; + } + break; + case 2: + if (r1 == 1) + gUnknown_3005E88 = 1; + else if (r1 == 2) + gUnknown_3005E88 = 2; + break; + } +} + +void sub_8112940(u8 a0, struct UnkStruct_203AE98 *a1, u16 a2) +{ + s32 i; + + switch (a0) + { + default: + gUnknown_3005E88 = 0; + break; + case 1: + gUnknown_3005E94 = a1; + gUnknown_3005E8C = a2 / 8; + for (i = 0; i < 0x40; i++) + { + gUnknown_203AF9A[i][0] |= 0xFF; + gUnknown_203AF9A[i][1] |= 0xFF; + } + gUnknown_203AF98 = 0; + gUnknown_203B01C = 0; + gUnknown_3005E90 = (struct UnkStruct_3005E90){}; + gUnknown_203B01A = gUnknown_3005E94[gUnknown_203AF98].unk_4; + gUnknown_203AF9A[0][0] = gUnknown_3005E94[gUnknown_203AF98].unk_3; + gUnknown_203AF9A[0][1] = 0xFF; + gUnknown_3005E88 = 1; + break; + case 2: + gUnknown_3005E94 = a1; + gUnknown_3005E8C = a2 / 8; + for (i = 0; i < gUnknown_3005E8C; i++) + { + gUnknown_3005E94[i] = (struct UnkStruct_203AE98){ 0, 0, 0, 0, 0xFFFF, 0xFF }; + } + gUnknown_203AF98 = 0; + gUnknown_203B01A = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_4 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + switch (player_get_direction_lower_nybble()) + { + case 0: + case 1: + gUnknown_3005E94[gUnknown_203AF98].unk_3 = 0; + break; + case 4: + gUnknown_3005E94[gUnknown_203AF98].unk_3 = 3; + break; + case 2: + gUnknown_3005E94[gUnknown_203AF98].unk_3 = 1; + break; + case 3: + gUnknown_3005E94[gUnknown_203AF98].unk_3 = 2; + break; + } + gUnknown_203B01C = 0; + gUnknown_203AF98++; + gUnknown_3005E94[gUnknown_203AF98].unk_4 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_6 = 2; + gUnknown_3005E94[gUnknown_203AF98].unk_0 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_1 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_2 = 0; + gUnknown_3005E94[gUnknown_203AF98].unk_3 = 0; + gUnknown_203AF98++; + gUnknown_3005E88 = 2; + break; + } +} + +#ifdef NONMATCHING +void sub_8112B3C(void) +{ + switch (gUnknown_3005E88) + { + case 0: + break; + case 1: + if (sub_8112CEC()) + { + if (gUnknown_203B01A != 0) + gUnknown_203B01A--; + else + { + while (1) + { + switch (gUnknown_3005E94[gUnknown_203AF98].unk_6) + { + case 0: + gUnknown_203AF9A[gUnknown_3005E94[gUnknown_203AF98].unk_0][0] = gUnknown_3005E94[gUnknown_203AF98].unk_3; + break; + case 1: + gUnknown_203AF9A[gUnknown_3005E94[gUnknown_203AF98].unk_0][1] = gUnknown_3005E94[gUnknown_203AF98].unk_3; + break; + case 2: + *(u32 *)&gUnknown_3005E90 = ((gUnknown_3005E94[gUnknown_203AF98].unk_3 << 24) | (gUnknown_3005E94[gUnknown_203AF98].unk_2 << 16) | (gUnknown_3005E94[gUnknown_203AF98].unk_1 << 8) | (gUnknown_3005E94[gUnknown_203AF98].unk_0 << 0)); + break; + case 3: + gUnknown_3005E88 = 3; + break; + case 0xFE: + break; + case 0xFF: + gUnknown_3005E88 = 0; + break; + } + if (gUnknown_3005E88 == 0) + break; + if (++gUnknown_203AF98 >= gUnknown_3005E8C) + { + gUnknown_3005E88 = 0; + break; + } + gUnknown_203B01A = gUnknown_3005E94[gUnknown_203AF98].unk_4; + if (gUnknown_3005E88 == 3) + break; + if (gUnknown_203B01A == 0) + continue; + if (gUnknown_203B01A == 0xFFFF) + break; + } + } + } + else if (gUnknown_203AF98 >= gUnknown_3005E8C) + gUnknown_3005E88 = 0; + break; + case 2: + if (ScriptContext2_IsEnabled() != 1) + gUnknown_203B01A++; + if (gUnknown_203AF98 >= gUnknown_3005E8C) + gUnknown_3005E88 = 0; + break; + case 3: + break; + case 4: + break; + } +} +#else +NAKED +void sub_8112B3C(void) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tldr r0, _08112B54 @ =gUnknown_3005E88\n" + "\tldrb r0, [r0]\n" + "\tcmp r0, 0x4\n" + "\tbls _08112B48\n" + "\tb _08112C84\n" + "_08112B48:\n" + "\tlsls r0, 2\n" + "\tldr r1, _08112B58 @ =_08112B5C\n" + "\tadds r0, r1\n" + "\tldr r0, [r0]\n" + "\tmov pc, r0\n" + "\t.align 2, 0\n" + "_08112B54: .4byte gUnknown_3005E88\n" + "_08112B58: .4byte _08112B5C\n" + "\t.align 2, 0\n" + "_08112B5C:\n" + "\t.4byte _08112C84\n" + "\t.4byte _08112B70\n" + "\t.4byte _08112C5E\n" + "\t.4byte _08112C84\n" + "\t.4byte _08112C84\n" + "_08112B70:\n" + "\tbl sub_8112CEC\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq _08112B7C\n" + "\tb _08112C72\n" + "_08112B7C:\n" + "\tldr r0, _08112B8C @ =gUnknown_203B01A\n" + "\tldrh r1, [r0]\n" + "\tadds r7, r0, 0\n" + "\tcmp r1, 0\n" + "\tbeq _08112B90\n" + "\tsubs r0, r1, 0x1\n" + "\tstrh r0, [r7]\n" + "\tb _08112C84\n" + "\t.align 2, 0\n" + "_08112B8C: .4byte gUnknown_203B01A\n" + "_08112B90:\n" + "\tldr r5, _08112B98 @ =gUnknown_3005E88\n" + "\tldr r4, _08112B9C @ =gUnknown_203AF98\n" + "\tldr r6, _08112BA0 @ =gUnknown_3005E94\n" + "\tb _08112BD4\n" + "\t.align 2, 0\n" + "_08112B98: .4byte gUnknown_3005E88\n" + "_08112B9C: .4byte gUnknown_203AF98\n" + "_08112BA0: .4byte gUnknown_3005E94\n" + "_08112BA4:\n" + "\tldrh r0, [r4]\n" + "\tadds r0, 0x1\n" + "\tstrh r0, [r4]\n" + "\tldr r1, _08112BF0 @ =gUnknown_3005E8C\n" + "\tlsls r0, 16\n" + "\tlsrs r0, 16\n" + "\tldrh r1, [r1]\n" + "\tcmp r0, r1\n" + "\tbcs _08112C58\n" + "\tldrh r0, [r4]\n" + "\tldr r1, [r6]\n" + "\tlsls r0, 3\n" + "\tadds r0, r1\n" + "\tldrh r0, [r0, 0x4]\n" + "\tstrh r0, [r7]\n" + "\tcmp r2, 0x3\n" + "\tbeq _08112C84\n" + "\tlsls r0, 16\n" + "\tlsrs r1, r0, 16\n" + "\tcmp r1, 0\n" + "\tbeq _08112BD4\n" + "\tldr r0, _08112BF4 @ =0x0000ffff\n" + "\tcmp r1, r0\n" + "\tbne _08112C84\n" + "_08112BD4:\n" + "\tldrh r0, [r4]\n" + "\tldr r1, [r6]\n" + "\tlsls r0, 3\n" + "\tadds r3, r0, r1\n" + "\tldrb r0, [r3, 0x6]\n" + "\tcmp r0, 0x2\n" + "\tbeq _08112C2C\n" + "\tcmp r0, 0x2\n" + "\tbgt _08112BF8\n" + "\tcmp r0, 0\n" + "\tbeq _08112C0C\n" + "\tcmp r0, 0x1\n" + "\tbeq _08112C18\n" + "\tb _08112C50\n" + "\t.align 2, 0\n" + "_08112BF0: .4byte gUnknown_3005E8C\n" + "_08112BF4: .4byte 0x0000ffff\n" + "_08112BF8:\n" + "\tcmp r0, 0xFE\n" + "\tbeq _08112C50\n" + "\tcmp r0, 0xFE\n" + "\tbgt _08112C06\n" + "\tcmp r0, 0x3\n" + "\tbeq _08112C4E\n" + "\tb _08112C50\n" + "_08112C06:\n" + "\tcmp r0, 0xFF\n" + "\tbeq _08112C4C\n" + "\tb _08112C50\n" + "_08112C0C:\n" + "\tldr r0, _08112C14 @ =gUnknown_203AF9A\n" + "\tldrb r1, [r3]\n" + "\tlsls r1, 1\n" + "\tb _08112C20\n" + "\t.align 2, 0\n" + "_08112C14: .4byte gUnknown_203AF9A\n" + "_08112C18:\n" + "\tldr r0, _08112C28 @ =gUnknown_203AF9A\n" + "\tldrb r1, [r3]\n" + "\tlsls r1, 1\n" + "\tadds r0, 0x1\n" + "_08112C20:\n" + "\tadds r1, r0\n" + "\tldrb r0, [r3, 0x3]\n" + "\tstrb r0, [r1]\n" + "\tb _08112C50\n" + "\t.align 2, 0\n" + "_08112C28: .4byte gUnknown_203AF9A\n" + "_08112C2C:\n" + "\tldr r2, _08112C48 @ =gUnknown_3005E90\n" + "\tldrb r1, [r3, 0x3]\n" + "\tlsls r1, 24\n" + "\tldrb r0, [r3, 0x2]\n" + "\tlsls r0, 16\n" + "\torrs r1, r0\n" + "\tldrb r0, [r3, 0x1]\n" + "\tlsls r0, 8\n" + "\torrs r1, r0\n" + "\tldrb r0, [r3]\n" + "\torrs r1, r0\n" + "\tstr r1, [r2]\n" + "\tb _08112C50\n" + "\t.align 2, 0\n" + "_08112C48: .4byte gUnknown_3005E90\n" + "_08112C4C:\n" + "\tmovs r0, 0\n" + "_08112C4E:\n" + "\tstrb r0, [r5]\n" + "_08112C50:\n" + "\tldrb r2, [r5]\n" + "\tcmp r2, 0\n" + "\tbne _08112BA4\n" + "\tb _08112C84\n" + "_08112C58:\n" + "\tmovs r0, 0\n" + "\tstrb r0, [r5]\n" + "\tb _08112C84\n" + "_08112C5E:\n" + "\tbl ScriptContext2_IsEnabled\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r0, 0x1\n" + "\tbeq _08112C84\n" + "\tldr r1, _08112C8C @ =gUnknown_203B01A\n" + "\tldrh r0, [r1]\n" + "\tadds r0, 0x1\n" + "\tstrh r0, [r1]\n" + "_08112C72:\n" + "\tldr r0, _08112C90 @ =gUnknown_203AF98\n" + "\tldr r1, _08112C94 @ =gUnknown_3005E8C\n" + "\tldrh r0, [r0]\n" + "\tldrh r1, [r1]\n" + "\tcmp r0, r1\n" + "\tbcc _08112C84\n" + "\tldr r1, _08112C98 @ =gUnknown_3005E88\n" + "\tmovs r0, 0\n" + "\tstrb r0, [r1]\n" + "_08112C84:\n" + "\tpop {r4-r7}\n" + "\tpop {r0}\n" + "\tbx r0\n" + "\t.align 2, 0\n" + "_08112C8C: .4byte gUnknown_203B01A\n" + "_08112C90: .4byte gUnknown_203AF98\n" + "_08112C94: .4byte gUnknown_3005E8C\n" + "_08112C98: .4byte gUnknown_3005E88"); +} +#endif diff --git a/sym_common.txt b/sym_common.txt index 0995f4541..65be232af 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -315,8 +315,7 @@ gUnknown_3005E60: @ 3005E60 gUnknown_3005E70: @ 3005E70 .space 0x18 -gUnknown_3005E88: @ 3005E88 - .space 0x4 + .include "quest_log.o" gUnknown_3005E8C: @ 3005E8C .space 0x4 diff --git a/sym_ewram.txt b/sym_ewram.txt index 916b9beb5..4cad7bb1f 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -629,10 +629,10 @@ gUnknown_2036E30: @ 2036E30 gUnknown_2036E34: @ 2036E34 .space 0x4 -gUnknown_2036E38: @ 2036E38 +gMapObjects: @ 2036E38 .space 0x240 -gUnknown_2037078: @ 2037078 +gPlayerAvatar: @ 2037078 .space 0x20 gUnknown_2037098: @ 2037098 @@ -758,52 +758,16 @@ gUnknown_2037104: @ 2037104 gUnknown_2037108: @ 2037108 .space 0xF0 -gUnknown_20371F8: @ 20371F8 - .space 0x2 - -gUnknown_20371FA: @ 20371FA - .space 0x1E - -gUnknown_2037218: @ 2037218 - .space 0x20 - -gUnknown_2037238: @ 2037238 - .space 0x20 - -gUnknown_2037258: @ 2037258 - .space 0x20 - -gUnknown_2037278: @ 2037278 - .space 0x120 - -gUnknown_2037398: @ 2037398 - .space 0x60 - -gUnknown_20373F8: @ 20373F8 - .space 0x10 - -gUnknown_2037408: @ 2037408 - .space 0x1F0 - -gUnknown_20375F8: @ 20375F8 - .space 0x2 - -gUnknown_20375FA: @ 20375FA - .space 0x3E - -gUnknown_2037638: @ 2037638 - .space 0x78 - -gUnknown_20376B0: @ 20376B0 - .space 0x148 +gPlttBufferUnfaded: @ 20371F8 + .space 0x400 -gUnknown_20377F8: @ 20377F8 - .space 0x200 +gPlttBufferFaded: @ 20375F8 + .space 0x400 gUnknown_20379F8: @ 20379F8 .space 0xC0 -gUnknown_2037AB8: @ 2037AB8 +gPaletteFade: @ 2037AB8 .space 0x10 gUnknown_2037AC8: @ 2037AC8 |