diff options
Diffstat (limited to 'asm/rom_8065394.s')
-rw-r--r-- | asm/rom_8065394.s | 1066 |
1 files changed, 533 insertions, 533 deletions
diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s index 6e7b07780..e94d9b09e 100644 --- a/asm/rom_8065394.s +++ b/asm/rom_8065394.s @@ -143,7 +143,7 @@ _08067FD8: movs r0, 0x2 b _08068014 .align 2, 0 -_08067FE8: .4byte 0x0202e858 +_08067FE8: .4byte gPlayerAvatar _08067FEC: movs r0, 0x80 mov r1, r8 @@ -555,7 +555,7 @@ _0806830E: b _0806834E .align 2, 0 _08068314: .4byte gUnknown_0821664C -_08068318: .4byte 0x030048a0 +_08068318: .4byte gMapObjects _0806831C: movs r4, 0 ldr r1, _08068354 @@ -588,10 +588,10 @@ _0806834E: pop {r1} bx r1 .align 2, 0 -_08068354: .4byte 0x02029818 -_08068358: .4byte 0x03004ae0 -_0806835C: .4byte 0x0202e8de -_08068360: .4byte 0x0202e8e0 +_08068354: .4byte gUnknown_02029818 +_08068358: .4byte gSelectedMapObject +_0806835C: .4byte gUnknown_0202E8DE +_08068360: .4byte gUnknown_0202E8E0 thumb_func_end sub_80682A8 thumb_func_start sub_8068364 @@ -658,7 +658,7 @@ _080683DC: movs r0, 0 b _0806840C .align 2, 0 -_080683E0: .4byte 0x030048a0 +_080683E0: .4byte gMapObjects _080683E4: .4byte gUnknown_0821664C _080683E8: ldr r0, _08068414 @@ -682,9 +682,9 @@ _0806840C: pop {r1} bx r1 .align 2, 0 -_08068414: .4byte 0x03004ae0 -_08068418: .4byte 0x0202e8de -_0806841C: .4byte 0x0202e8e0 +_08068414: .4byte gSelectedMapObject +_08068418: .4byte gUnknown_0202E8DE +_0806841C: .4byte gUnknown_0202E8E0 thumb_func_end sub_8068364 thumb_func_start TryGetInvisibleMapObjectScript @@ -712,7 +712,7 @@ TryGetInvisibleMapObjectScript: @ 8068420 ldr r0, _08068454 b _080684FA .align 2, 0 -_08068450: .4byte 0x0202e828 +_08068450: .4byte gMapHeader _08068454: .4byte gUnknown_081C6C02 _08068458: ldrb r0, [r0, 0x5] @@ -772,8 +772,8 @@ _080684AA: ldr r0, _080684D4 b _080684FA .align 2, 0 -_080684CC: .4byte 0x0202e8cc -_080684D0: .4byte 0x0202e8ce +_080684CC: .4byte gUnknown_0202E8CC +_080684D0: .4byte gUnknown_0202E8CE _080684D4: .4byte HiddenItemScript _080684D8: cmp r5, 0x2 @@ -787,7 +787,7 @@ _080684D8: ldr r0, _080684F4 b _080684FA .align 2, 0 -_080684F0: .4byte 0x0202e8cc +_080684F0: .4byte gUnknown_0202E8CC _080684F4: .4byte gUnknown_081A2C51 _080684F8: adds r0, r2, 0 @@ -1145,7 +1145,7 @@ sub_80687A4: @ 80687A4 b _080687DE .align 2, 0 _080687D0: .4byte 0x0000080d -_080687D4: .4byte 0x0202e828 +_080687D4: .4byte gMapHeader _080687D8: .4byte UnderwaterUseDiveScript _080687DC: movs r0, 0 @@ -1220,7 +1220,7 @@ mapheader_trigger_activate_at__run_now: @ 806883C movs r0, 0x1 b _0806886A .align 2, 0 -_08068864: .4byte 0x0202e828 +_08068864: .4byte gMapHeader _08068868: movs r0, 0 _0806886A: @@ -1343,7 +1343,7 @@ _0806893A: bx r0 .align 2, 0 _08068940: .4byte 0x0000402a -_08068944: .4byte 0x03004360 +_08068944: .4byte gPlayerParty thumb_func_end happiness_algorithm_step thumb_func_start overworld_poison_timer_set @@ -1386,7 +1386,7 @@ overworld_poison_step: @ 806895C movs r0, 0x1 b _0806899E .align 2, 0 -_08068994: .4byte 0x0202e828 +_08068994: .4byte gMapHeader _08068998: .4byte 0x0000402b _0806899C: movs r0, 0 @@ -1402,7 +1402,7 @@ prev_quest_postbuffer_cursor_backup_reset: @ 80689A4 strb r0, [r1] bx lr .align 2, 0 -_080689AC: .4byte 0x0202e8c0 +_080689AC: .4byte gUnknown_0202E8C0 thumb_func_end prev_quest_postbuffer_cursor_backup_reset thumb_func_start is_it_battle_time_3 @@ -1422,8 +1422,8 @@ is_it_battle_time_3: @ 80689B0 movs r0, 0 b _080689F8 .align 2, 0 -_080689CC: .4byte 0x0202e8c0 -_080689D0: .4byte 0x0202e8c2 +_080689CC: .4byte gUnknown_0202E8C0 +_080689D0: .4byte gUnknown_0202E8C2 _080689D4: ldr r5, _080689EC ldrh r1, [r5] @@ -1437,7 +1437,7 @@ _080689D4: movs r0, 0 b _080689F8 .align 2, 0 -_080689EC: .4byte 0x0202e8c2 +_080689EC: .4byte gUnknown_0202E8C2 _080689F0: movs r0, 0 strb r0, [r6] @@ -1489,7 +1489,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 8068A00 movs r0, 0x1 b _08068A5A .align 2, 0 -_08068A54: .4byte 0x0202e828 +_08068A54: .4byte gMapHeader _08068A58: movs r0, 0 _08068A5A: @@ -1540,7 +1540,7 @@ sub_8068A64: @ 8068A64 movs r0, 0x1 b _08068B2A .align 2, 0 -_08068ABC: .4byte 0x0202e828 +_08068ABC: .4byte gMapHeader _08068AC0: adds r0, r4, 0 bl sub_8057798 @@ -1748,7 +1748,7 @@ sub_8068C30: @ 8068C30 bl copy_saved_warp2_bank_and_enter_x_to_warp1 b _08068C9E .align 2, 0 -_08068C50: .4byte 0x0202e828 +_08068C50: .4byte gMapHeader _08068C54: movs r0, 0x7 ldrsb r0, [r4, r0] @@ -1788,7 +1788,7 @@ _08068C9E: pop {r0} bx r0 .align 2, 0 -_08068CA4: .4byte 0x02025734 +_08068CA4: .4byte gSaveBlock1 thumb_func_end sub_8068C30 thumb_func_start map_warp_consider_2_to_inside @@ -1817,7 +1817,7 @@ map_warp_consider_2_to_inside: @ 8068CA8 movs r0, 0x1 b _08068D2E .align 2, 0 -_08068CDC: .4byte 0x0202e828 +_08068CDC: .4byte gMapHeader _08068CE0: adds r0, r4, 0 bl is_tile_x69_2_warp_door @@ -1850,7 +1850,7 @@ _08068CE0: movs r0, 0x1 b _08068D2E .align 2, 0 -_08068D28: .4byte 0x0202e828 +_08068D28: .4byte gMapHeader _08068D2C: movs r0, 0 _08068D2E: @@ -2018,7 +2018,7 @@ sub_8068E24: @ 8068E24 pop {r1} bx r1 .align 2, 0 -_08068E48: .4byte 0x0202e828 +_08068E48: .4byte gMapHeader thumb_func_end sub_8068E24 thumb_func_start FindInvisibleMapObjectByPosition @@ -2096,7 +2096,7 @@ dive_warp: @ 8068E9C bl sub_80538B0 b _08068EF8 .align 2, 0 -_08068ED0: .4byte 0x0202e828 +_08068ED0: .4byte gMapHeader _08068ED4: lsls r0, r5, 24 lsrs r0, 24 @@ -2175,7 +2175,7 @@ sub_8068F18: @ 8068F18 movs r0, 0x1 b _08068FA6 .align 2, 0 -_08068F70: .4byte 0x0202e828 +_08068F70: .4byte gMapHeader _08068F74: adds r0, r5, 0 bl sub_80574EC @@ -2267,7 +2267,7 @@ sub_8068FEC: @ 8068FEC pop {r1} bx r1 .align 2, 0 -_0806902C: .4byte 0x0202e828 +_0806902C: .4byte gMapHeader thumb_func_end sub_8068FEC thumb_func_start sub_8069030 @@ -2295,8 +2295,8 @@ sub_8069030: @ 8069030 pop {r0} bx r0 .align 2, 0 -_08069064: .4byte 0x02026954 -_08069068: .4byte 0x0202e8e2 +_08069064: .4byte gUnknown_02026954 +_08069068: .4byte gUnknown_0202E8E2 thumb_func_end sub_8069030 thumb_func_start sub_806906C @@ -2322,7 +2322,7 @@ sub_806906C: @ 806906C pop {r0} bx r0 .align 2, 0 -_080690A0: .4byte 0x02026954 +_080690A0: .4byte gUnknown_02026954 _080690A4: .4byte 0x0000084d _080690A8: .4byte 0x0000084e _080690AC: .4byte 0x00000829 @@ -2339,7 +2339,7 @@ sub_80690B4: @ 80690B4 pop {r0} bx r0 .align 2, 0 -_080690C4: .4byte 0x02026a6c +_080690C4: .4byte gUnknown_02026A6C thumb_func_end sub_80690B4 thumb_func_start sub_80690C8 @@ -2628,7 +2628,7 @@ _080692BC: b _080692E0 .align 2, 0 _080692C8: .4byte 0x00003fff -_080692CC: .4byte 0x02026954 +_080692CC: .4byte gUnknown_02026954 _080692D0: ldr r1, _080692E8 adds r0, r3, r1 @@ -2646,7 +2646,7 @@ _080692E2: bx r1 .align 2, 0 _080692E8: .4byte 0xffffc000 -_080692EC: .4byte 0x0202e8e2 +_080692EC: .4byte gUnknown_0202E8E2 thumb_func_end GetFlagPointer thumb_func_start FlagSet @@ -2893,7 +2893,7 @@ task_per_step_callback_manager: @ 806943C pop {r0} bx r0 .align 2, 0 -_08069460: .4byte 0x03004b20 +_08069460: .4byte gTasks _08069464: .4byte gUnknown_08376364 thumb_func_end task_per_step_callback_manager @@ -2921,7 +2921,7 @@ _0806947A: adds r0, 0x1 b _080694AA .align 2, 0 -_08069494: .4byte 0x03001770 +_08069494: .4byte gMain _08069498: ldr r0, _080694B4 ldr r0, [r0, 0x20] @@ -2939,7 +2939,7 @@ _080694AC: pop {r0} bx r0 .align 2, 0 -_080694B4: .4byte 0x03001770 +_080694B4: .4byte gMain thumb_func_end sub_8069468 thumb_func_start sub_80694B8 @@ -2966,7 +2966,7 @@ _080694E0: pop {r0} bx r0 .align 2, 0 -_080694E8: .4byte 0x03004b28 +_080694E8: .4byte gUnknown_03004B28 thumb_func_end sub_80694B8 thumb_func_start overworld_ensure_per_step_coros_running @@ -3016,7 +3016,7 @@ _08069542: bx r0 .align 2, 0 _08069548: .4byte task_per_step_callback_manager -_0806954C: .4byte 0x03004b20 +_0806954C: .4byte gTasks _08069550: .4byte sub_806A1E8 _08069554: .4byte sub_80694B8 thumb_func_end overworld_ensure_per_step_coros_running @@ -3052,7 +3052,7 @@ _0806957C: b _0806959A .align 2, 0 _08069590: .4byte task_per_step_callback_manager -_08069594: .4byte 0x03004b28 +_08069594: .4byte gUnknown_03004B28 _08069598: strh r4, [r1] _0806959A: @@ -3088,7 +3088,7 @@ _080695CA: .align 2, 0 _080695D0: .4byte task_per_step_callback_manager _080695D4: .4byte sub_80694B8 -_080695D8: .4byte 0x03004b28 +_080695D8: .4byte gUnknown_03004B28 thumb_func_end wild_encounter_reset_coro_args thumb_func_start nullsub_51 @@ -3466,7 +3466,7 @@ sub_8069864: @ 8069864 beq _080698A2 b _080699CE .align 2, 0 -_08069898: .4byte 0x03004b28 +_08069898: .4byte gUnknown_03004B28 _0806989C: cmp r0, 0x2 beq _0806998C @@ -3760,7 +3760,7 @@ sub_8069AA0: @ 8069AA0 beq _08069AE8 b _08069CA6 .align 2, 0 -_08069ADC: .4byte 0x03004b28 +_08069ADC: .4byte gUnknown_03004B28 _08069AE0: cmp r5, 0x2 bne _08069AE6 @@ -4142,7 +4142,7 @@ _08069DC0: pop {r0} bx r0 .align 2, 0 -_08069DCC: .4byte 0x0202e828 +_08069DCC: .4byte gMapHeader _08069DD0: .4byte 0x0000020e thumb_func_end sub_8069D78 @@ -4167,7 +4167,7 @@ sub_8069DD4: @ 8069DD4 beq _08069E08 b _08069F56 .align 2, 0 -_08069DF8: .4byte 0x03004b28 +_08069DF8: .4byte gUnknown_03004B28 _08069DFC: cmp r0, 0x2 beq _08069EB6 @@ -4413,7 +4413,7 @@ _08069F9E: bl ash b _0806A006 .align 2, 0 -_08069FE8: .4byte 0x03004b28 +_08069FE8: .4byte gUnknown_03004B28 _08069FEC: .4byte 0x0000020a _08069FF0: .4byte 0x00000212 _08069FF4: @@ -4597,7 +4597,7 @@ _0806A14A: strh r0, [r5, 0xC] b _0806A182 .align 2, 0 -_0806A164: .4byte 0x03004b28 +_0806A164: .4byte gUnknown_03004B28 _0806A168: .4byte 0x00004022 _0806A16C: movs r2, 0xE @@ -4705,8 +4705,8 @@ sub_806A1E8: @ 806A1E8 beq _0806A264 b _0806A2B8 .align 2, 0 -_0806A230: .4byte 0x03004b28 -_0806A234: .4byte 0x02025734 +_0806A230: .4byte gUnknown_03004B28 +_0806A234: .4byte gSaveBlock1 _0806A238: strh r7, [r4] mov r0, sp @@ -4790,7 +4790,7 @@ _0806A2B8: ldrh r1, [r2, 0x8] b _0806A2DC .align 2, 0 -_0806A2D4: .4byte 0x0202e844 +_0806A2D4: .4byte gUnknown_0202E844 _0806A2D8: movs r0, 0 movs r1, 0 @@ -4857,7 +4857,7 @@ sub_806A328: @ 806A328 .align 2, 0 _0806A350: .4byte 0x00000835 _0806A354: .4byte gSaveBlock2 -_0806A358: .4byte 0x03004038 +_0806A358: .4byte gLocalTime _0806A35C: .4byte 0x00004040 thumb_func_end sub_806A328 @@ -4881,7 +4881,7 @@ _0806A380: bx r0 .align 2, 0 _0806A388: .4byte 0x00000835 -_0806A38C: .4byte 0x03004038 +_0806A38C: .4byte gLocalTime thumb_func_end InTrainerHill thumb_func_start sub_806A390 @@ -4972,7 +4972,7 @@ _0806A43E: pop {r0} bx r0 .align 2, 0 -_0806A448: .4byte 0x02024f44 +_0806A448: .4byte gUnknown_02024F44 thumb_func_end sub_806A3F4 thumb_func_start sub_806A44C @@ -4999,7 +4999,7 @@ sub_806A460: @ 806A460 bx r0 .align 2, 0 _0806A474: .4byte Cb2_StartWallClock -_0806A478: .4byte 0x03001770 +_0806A478: .4byte gMain _0806A47C: .4byte sub_806A44C thumb_func_end sub_806A460 @@ -5030,7 +5030,7 @@ sub_806A480: @ 806A480 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806A4B0: .4byte 0x03004b20 +_0806A4B0: .4byte gTasks _0806A4B4: .4byte _0806A4B8 .align 2, 0 _0806A4B8: @@ -5177,7 +5177,7 @@ sub_806A59C: @ 806A59C ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806A5CC: .4byte 0x03004b20 +_0806A5CC: .4byte gTasks _0806A5D0: .4byte _0806A5D4 .align 2, 0 _0806A5D4: @@ -5340,7 +5340,7 @@ sub_806A69C: @ 806A69C .align 2, 0 _0806A70C: .4byte gUnknown_083764BC _0806A710: .4byte gSpriteTemplate_83764E8 -_0806A714: .4byte 0x02020004 +_0806A714: .4byte gSprites _0806A718: .4byte sub_806A480 _0806A71C: .4byte 0x0000ffff _0806A720: .4byte sub_806A59C @@ -5479,9 +5479,9 @@ sub_806A74C: @ 806A74C pop {r0} bx r0 .align 2, 0 -_0806A83C: .4byte 0x020234cc +_0806A83C: .4byte gStringVar4 _0806A840: .4byte 0x00002710 -_0806A844: .4byte 0x020231cc +_0806A844: .4byte gStringVar1 _0806A848: .4byte gOtherText_Day _0806A84C: .4byte gUnknown_08376500 thumb_func_end sub_806A74C @@ -5608,7 +5608,7 @@ sub_806A914: @ 806A914 strh r0, [r1, 0x8] bx lr .align 2, 0 -_0806A928: .4byte 0x03004b20 +_0806A928: .4byte gTasks thumb_func_end sub_806A914 thumb_func_start sub_806A92C @@ -5630,7 +5630,7 @@ sub_806A92C: @ 806A92C pop {r0} bx r0 .align 2, 0 -_0806A950: .4byte 0x03004b20 +_0806A950: .4byte gTasks _0806A954: .4byte sub_806A914 thumb_func_end sub_806A92C @@ -5671,9 +5671,9 @@ sub_806A958: @ 806A958 movs r0, 0x6 b _0806A9CC .align 2, 0 -_0806A99C: .4byte 0x03004b28 +_0806A99C: .4byte gUnknown_03004B28 _0806A9A0: .4byte gUnknown_08376414 -_0806A9A4: .4byte 0x03001770 +_0806A9A4: .4byte gMain _0806A9A8: .4byte sub_806A92C _0806A9AC: movs r0, 0x10 @@ -5731,8 +5731,8 @@ _0806A9D6: strh r0, [r5, 0x4] b _0806AA58 .align 2, 0 -_0806AA18: .4byte 0x03004038 -_0806AA1C: .4byte 0x03004b20 +_0806AA18: .4byte gLocalTime +_0806AA1C: .4byte gTasks _0806AA20: .4byte sub_806A92C _0806AA24: ldrb r0, [r2] @@ -5820,8 +5820,8 @@ sub_806AA64: @ 806AA64 pop {r0} bx r0 .align 2, 0 -_0806AACC: .4byte 0x03004b28 -_0806AAD0: .4byte 0x03004038 +_0806AACC: .4byte gUnknown_03004B28 +_0806AAD0: .4byte gLocalTime _0806AAD4: .4byte sub_806A958 thumb_func_end sub_806AA64 @@ -5972,7 +5972,7 @@ sub_806ABF4: @ 806ABF4 beq _0806AC80 b _0806ACC4 .align 2, 0 -_0806AC14: .4byte 0x03004b28 +_0806AC14: .4byte gUnknown_03004B28 _0806AC18: bl MenuZeroFillScreen movs r0, 0 @@ -6032,11 +6032,11 @@ _0806AC80: b _0806ACC4 .align 2, 0 _0806AC98: .4byte gSystemText_PresentTime -_0806AC9C: .4byte 0x03004038 +_0806AC9C: .4byte gLocalTime _0806ACA0: .4byte gSystemText_PreviousTime _0806ACA4: .4byte gSaveBlock2 _0806ACA8: .4byte gSystemText_ResetRTCPrompt -_0806ACAC: .4byte 0x03001770 +_0806ACAC: .4byte gMain _0806ACB0: movs r0, 0x1 ands r0, r1 @@ -6076,7 +6076,7 @@ _0806ACE8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806ACF4: .4byte 0x03004b28 +_0806ACF4: .4byte gUnknown_03004B28 _0806ACF8: .4byte _0806ACFC .align 2, 0 _0806ACFC: @@ -6123,8 +6123,8 @@ _0806AD4E: strh r0, [r5] b _0806AEC4 .align 2, 0 -_0806AD5C: .4byte 0x0202f388 -_0806AD60: .4byte 0x03005eb8 +_0806AD5C: .4byte gPaletteFade +_0806AD60: .4byte gSaveFileStatus _0806AD64: .4byte gSystemText_NoSaveFileNoTime _0806AD68: bl RtcCalcLocalTime @@ -6170,9 +6170,9 @@ _0806AD96: strh r0, [r5] b _0806AEC4 .align 2, 0 -_0806ADC4: .4byte 0x03004b20 +_0806ADC4: .4byte gTasks _0806ADC8: .4byte gSystemText_PleaseResetTime -_0806ADCC: .4byte 0x03004038 +_0806ADCC: .4byte gLocalTime _0806ADD0: .4byte gSaveBlock2 _0806ADD4: .4byte sub_806AA64 _0806ADD8: @@ -6198,7 +6198,7 @@ _0806ADFC: strh r0, [r5] b _0806AEC4 .align 2, 0 -_0806AE04: .4byte 0x03004b20 +_0806AE04: .4byte gTasks _0806AE08: ldrb r0, [r5, 0x2] bl DestroyTask @@ -6229,7 +6229,7 @@ _0806AE08: strh r0, [r5] b _0806AEC4 .align 2, 0 -_0806AE4C: .4byte 0x03004038 +_0806AE4C: .4byte gLocalTime _0806AE50: .4byte gSaveBlock2 _0806AE54: .4byte 0x00004040 _0806AE58: .4byte gSystemText_ClockResetDataSave @@ -6289,9 +6289,9 @@ _0806AEC4: bx r0 .align 2, 0 _0806AECC: .4byte gSystemText_SaveFailed -_0806AED0: .4byte 0x03001770 +_0806AED0: .4byte gMain _0806AED4: .4byte 0x0000ffff -_0806AED8: .4byte 0x0202f388 +_0806AED8: .4byte gPaletteFade thumb_func_end sub_806ACCC thumb_func_start sub_806AEDC @@ -6332,7 +6332,7 @@ _0806AEF8: pop {r0} bx r0 .align 2, 0 -_0806AF2C: .4byte 0x0202e8fa +_0806AF2C: .4byte gUnknown_0202E8FA _0806AF30: .4byte gUnknown_08376BB4 thumb_func_end sub_806AEDC @@ -6378,7 +6378,7 @@ _0806AF64: pop {r0} bx r0 .align 2, 0 -_0806AF84: .4byte 0x020239f8 +_0806AF84: .4byte gUnknown_020239F8 _0806AF88: .4byte 0x0201b000 thumb_func_end sub_806AF4C @@ -6477,8 +6477,8 @@ _0806B020: b _0806B114 .align 2, 0 _0806B048: .4byte 0x00000266 -_0806B04C: .4byte 0x03004350 -_0806B050: .4byte 0x03004360 +_0806B04C: .4byte gPlayerPartyCount +_0806B050: .4byte gPlayerParty _0806B054: movs r0, 0 strh r0, [r5] @@ -6609,7 +6609,7 @@ _0806B13A: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806B144: .4byte 0x03001770 +_0806B144: .4byte gMain _0806B148: .4byte 0x0000043c _0806B14C: .4byte _0806B150 .align 2, 0 @@ -6710,8 +6710,8 @@ _0806B1BC: .align 2, 0 _0806B22C: .4byte 0x040000d4 _0806B230: .4byte 0x81000800 -_0806B234: .4byte 0x0202f388 -_0806B238: .4byte 0x03001770 +_0806B234: .4byte gPaletteFade +_0806B238: .4byte gMain _0806B23C: .4byte 0x0000043c _0806B240: bl remove_some_task @@ -6738,7 +6738,7 @@ _0806B246: .align 2, 0 _0806B26C: .4byte 0x0201b000 _0806B270: .4byte 0x00000266 -_0806B274: .4byte 0x03001770 +_0806B274: .4byte gMain _0806B278: .4byte 0x0000043c _0806B27C: bl ResetSpriteData @@ -6761,7 +6761,7 @@ _0806B298: b _0806B42C .align 2, 0 _0806B2A0: .4byte 0x0201b000 -_0806B2A4: .4byte 0x03001770 +_0806B2A4: .4byte gMain _0806B2A8: .4byte 0x0000043c _0806B2AC: bl FreeAllSpritePalettes @@ -6790,7 +6790,7 @@ _0806B2D0: b _0806B42C .align 2, 0 _0806B2E0: .4byte gWindowConfig_81E6C90 -_0806B2E4: .4byte 0x03001770 +_0806B2E4: .4byte gMain _0806B2E8: .4byte 0x0000043c _0806B2EC: ldr r4, _0806B308 @@ -6805,9 +6805,9 @@ _0806B2EC: adds r1, r2 b _0806B42C .align 2, 0 -_0806B308: .4byte 0x03004210 +_0806B308: .4byte gUnknown_03004210 _0806B30C: .4byte gWindowConfig_81E6C90 -_0806B310: .4byte 0x03001770 +_0806B310: .4byte gMain _0806B314: .4byte 0x0000043c _0806B318: bl MultistepLoadFont @@ -6827,7 +6827,7 @@ _0806B322: b _0806B42C .align 2, 0 _0806B338: .4byte 0x0201b000 -_0806B33C: .4byte 0x03001770 +_0806B33C: .4byte gMain _0806B340: .4byte 0x0000043c _0806B344: ldr r0, _0806B368 @@ -6848,7 +6848,7 @@ _0806B344: b _0806B42C .align 2, 0 _0806B368: .4byte 0x0201b000 -_0806B36C: .4byte 0x03001770 +_0806B36C: .4byte gMain _0806B370: .4byte 0x0000043c _0806B374: ldrh r0, [r4] @@ -6883,7 +6883,7 @@ _0806B382: .align 2, 0 _0806B3B0: .4byte gUnknown_08376C74 _0806B3B4: .4byte 0x0201b000 -_0806B3B8: .4byte 0x03001770 +_0806B3B8: .4byte gMain _0806B3BC: .4byte 0x0000043c _0806B3C0: ldr r0, _0806B3C8 @@ -6900,7 +6900,7 @@ _0806B3CC: adds r1, r0 b _0806B42C .align 2, 0 -_0806B3DC: .4byte 0x03001770 +_0806B3DC: .4byte gMain _0806B3E0: .4byte 0x0000043c _0806B3E4: ldr r0, _0806B3FC @@ -6916,7 +6916,7 @@ _0806B3E4: .align 2, 0 _0806B3FC: .4byte 0x0201b000 _0806B400: .4byte 0x00000259 -_0806B404: .4byte 0x03001770 +_0806B404: .4byte gMain _0806B408: .4byte 0x0000043c _0806B40C: movs r0, 0x1 @@ -6941,8 +6941,8 @@ _0806B42C: strb r0, [r1] b _0806B450 .align 2, 0 -_0806B434: .4byte 0x0202f388 -_0806B438: .4byte 0x03001770 +_0806B434: .4byte gPaletteFade +_0806B438: .4byte gMain _0806B43C: .4byte 0x0000043c _0806B440: ldr r0, _0806B44C @@ -7074,7 +7074,7 @@ sub_806B528: @ 806B528 movs r0, 0 b _0806B542 .align 2, 0 -_0806B53C: .4byte 0x020239f8 +_0806B53C: .4byte gUnknown_020239F8 _0806B540: movs r0, 0x1 _0806B542: @@ -7110,7 +7110,7 @@ _0806B56E: .align 2, 0 _0806B574: .4byte 0x0201b000 _0806B578: .4byte 0x00000261 -_0806B57C: .4byte 0x020221cc +_0806B57C: .4byte gBG2TilemapBuffer _0806B580: .4byte 0x06003000 _0806B584: .4byte 0x040000d4 _0806B588: .4byte 0x80000400 @@ -7130,7 +7130,7 @@ sub_806B58C: @ 806B58C strb r2, [r0] b _0806B5C8 .align 2, 0 -_0806B5A4: .4byte 0x0202e8fa +_0806B5A4: .4byte gUnknown_0202E8FA _0806B5A8: bl sub_806B528 lsls r0, 24 @@ -7141,7 +7141,7 @@ _0806B5A8: movs r0, 0x2 b _0806B5C4 .align 2, 0 -_0806B5BC: .4byte 0x0202e8fa +_0806B5BC: .4byte gUnknown_0202E8FA _0806B5C0: ldr r1, _0806B5E4 movs r0, 0x1 @@ -7165,7 +7165,7 @@ _0806B5DA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806B5E4: .4byte 0x0202e8fa +_0806B5E4: .4byte gUnknown_0202E8FA _0806B5E8: .4byte gUnknown_083769A8 _0806B5EC: .4byte _0806B5F0 .align 2, 0 @@ -7187,7 +7187,7 @@ _0806B614: bl memset b _0806B900 .align 2, 0 -_0806B624: .4byte 0x020221cc +_0806B624: .4byte gBG2TilemapBuffer _0806B628: ldrb r0, [r4] ldrb r1, [r4, 0x1] @@ -7214,7 +7214,7 @@ _0806B638: movs r1, 0x1 b _0806B8A8 .align 2, 0 -_0806B65C: .4byte 0x03004350 +_0806B65C: .4byte gPlayerPartyCount _0806B660: ldrb r0, [r4, 0x2] ldrb r1, [r4, 0x3] @@ -7259,7 +7259,7 @@ _0806B694: movs r1, 0x2 b _0806B8A8 .align 2, 0 -_0806B6B8: .4byte 0x03004350 +_0806B6B8: .4byte gPlayerPartyCount _0806B6BC: ldrb r0, [r4, 0x4] ldrb r1, [r4, 0x5] @@ -7284,7 +7284,7 @@ _0806B6C2: movs r1, 0x2 b _0806B8A8 .align 2, 0 -_0806B6EC: .4byte 0x03004428 +_0806B6EC: .4byte gUnknown_03004428 _0806B6F0: ldrb r0, [r4, 0x4] ldrb r1, [r4, 0x5] @@ -7303,7 +7303,7 @@ _0806B6F6: movs r1, 0x2 b _0806B8A8 .align 2, 0 -_0806B710: .4byte 0x03004350 +_0806B710: .4byte gPlayerPartyCount _0806B714: ldrb r0, [r4, 0x4] ldrb r1, [r4, 0x5] @@ -7326,7 +7326,7 @@ _0806B71A: movs r1, 0x3 b _0806B8A8 .align 2, 0 -_0806B740: .4byte 0x03004350 +_0806B740: .4byte gPlayerPartyCount _0806B744: ldrb r0, [r4, 0x6] ldrb r1, [r4, 0x7] @@ -7351,7 +7351,7 @@ _0806B74A: movs r1, 0x3 b _0806B8A8 .align 2, 0 -_0806B774: .4byte 0x0300448c +_0806B774: .4byte gUnknown_0300448C _0806B778: ldrb r0, [r4, 0x6] ldrb r1, [r4, 0x7] @@ -7370,7 +7370,7 @@ _0806B77E: movs r1, 0x3 b _0806B8A8 .align 2, 0 -_0806B798: .4byte 0x03004350 +_0806B798: .4byte gPlayerPartyCount _0806B79C: ldrb r0, [r4, 0x6] ldrb r1, [r4, 0x7] @@ -7394,7 +7394,7 @@ _0806B7A2: movs r1, 0x4 b _0806B8A8 .align 2, 0 -_0806B7C8: .4byte 0x03004350 +_0806B7C8: .4byte gPlayerPartyCount _0806B7CC: ldrb r0, [r4, 0x8] ldrb r1, [r4, 0x9] @@ -7421,7 +7421,7 @@ _0806B7D2: movs r2, 0x4 b _0806B8AA .align 2, 0 -_0806B800: .4byte 0x030044f0 +_0806B800: .4byte gUnknown_030044F0 _0806B804: ldrb r0, [r4, 0x8] ldrb r1, [r4, 0x9] @@ -7441,7 +7441,7 @@ _0806B80A: movs r1, 0x4 b _0806B8A8 .align 2, 0 -_0806B828: .4byte 0x03004350 +_0806B828: .4byte gPlayerPartyCount _0806B82C: ldrb r0, [r4, 0x8] ldrb r1, [r4, 0x9] @@ -7457,7 +7457,7 @@ _0806B832: bhi _0806B896 b _0806B8B8 .align 2, 0 -_0806B848: .4byte 0x03004350 +_0806B848: .4byte gPlayerPartyCount _0806B84C: bl sub_806B528 lsls r0, 24 @@ -7480,7 +7480,7 @@ _0806B84C: movs r2, 0x4 b _0806B8AA .align 2, 0 -_0806B87C: .4byte 0x03004554 +_0806B87C: .4byte gUnknown_03004554 _0806B880: ldrb r0, [r4, 0xA] ldrb r1, [r4, 0xB] @@ -7510,7 +7510,7 @@ _0806B8AA: bl sub_806BF24 b _0806B900 .align 2, 0 -_0806B8B4: .4byte 0x03004350 +_0806B8B4: .4byte gPlayerPartyCount _0806B8B8: ldrb r0, [r4, 0xA] ldrb r1, [r4, 0xB] @@ -7585,10 +7585,10 @@ sub_806B908: @ 806B908 bl sub_806BA94 b _0806B964 .align 2, 0 -_0806B948: .4byte 0x020221cc -_0806B94C: .4byte 0x0202e8fa +_0806B948: .4byte gBG2TilemapBuffer +_0806B94C: .4byte gUnknown_0202E8FA _0806B950: .4byte gUnknown_083769A8 -_0806B954: .4byte 0x030043c4 +_0806B954: .4byte gUnknown_030043C4 _0806B958: ldrb r0, [r4, 0x4] ldrb r1, [r4, 0x5] @@ -7703,7 +7703,7 @@ _0806BA12: bx r0 .align 2, 0 _0806BA2C: .4byte gUnknown_083769D8 -_0806BA30: .4byte 0x020221cc +_0806BA30: .4byte gBG2TilemapBuffer thumb_func_end sub_806B9A4 thumb_func_start sub_806BA34 @@ -7758,7 +7758,7 @@ _0806BA7C: pop {r0} bx r0 .align 2, 0 -_0806BA90: .4byte 0x020221cc +_0806BA90: .4byte gBG2TilemapBuffer thumb_func_end sub_806BA34 thumb_func_start sub_806BA94 @@ -7848,7 +7848,7 @@ _0806BB16: .align 2, 0 _0806BB30: .4byte gUnknown_08376A5E _0806BB34: .4byte gUnknown_08376A25 -_0806BB38: .4byte 0x020221cc +_0806BB38: .4byte gBG2TilemapBuffer thumb_func_end sub_806BA94 thumb_func_start sub_806BB3C @@ -7903,7 +7903,7 @@ _0806BB84: pop {r0} bx r0 .align 2, 0 -_0806BB98: .4byte 0x020221cc +_0806BB98: .4byte gBG2TilemapBuffer thumb_func_end sub_806BB3C thumb_func_start sub_806BB9C @@ -8079,7 +8079,7 @@ _0806BCDE: pop {r0} bx r0 .align 2, 0 -_0806BCE4: .4byte 0x03004350 +_0806BCE4: .4byte gPlayerPartyCount thumb_func_end unref_sub_806BCB8 thumb_func_start sub_806BCE8 @@ -8111,7 +8111,7 @@ _0806BCEE: bl sub_806BC3C b _0806BD40 .align 2, 0 -_0806BD20: .4byte 0x03004360 +_0806BD20: .4byte gPlayerParty _0806BD24: adds r0, r5, 0 movs r1, 0x54 @@ -8139,7 +8139,7 @@ _0806BD46: pop {r0} bx r0 .align 2, 0 -_0806BD54: .4byte 0x03004350 +_0806BD54: .4byte gPlayerPartyCount thumb_func_end sub_806BCE8 thumb_func_start sub_806BD58 @@ -8179,7 +8179,7 @@ sub_806BD80: @ 806BD80 beq _0806BDB6 b _0806BDB8 .align 2, 0 -_0806BD9C: .4byte 0x03001770 +_0806BD9C: .4byte gMain _0806BDA0: cmp r0, 0x40 beq _0806BDAA @@ -8226,7 +8226,7 @@ _0806BDDC: ldrh r0, [r0, 0x30] b _0806BE2C .align 2, 0 -_0806BDEC: .4byte 0x03001770 +_0806BDEC: .4byte gMain _0806BDF0: ldr r0, _0806BE1C ldrh r1, [r0, 0x2E] @@ -8250,8 +8250,8 @@ _0806BDF0: movs r0, 0x2 b _0806BE2C .align 2, 0 -_0806BE1C: .4byte 0x03001770 -_0806BE20: .4byte 0x02020004 +_0806BE1C: .4byte gMain +_0806BE20: .4byte gSprites _0806BE24: ldr r0, _0806BE34 ldrh r1, [r0, 0x2E] @@ -8262,7 +8262,7 @@ _0806BE2C: pop {r1} bx r1 .align 2, 0 -_0806BE34: .4byte 0x03001770 +_0806BE34: .4byte gMain thumb_func_end sub_806BD80 thumb_func_start sub_806BE38 @@ -8282,7 +8282,7 @@ sub_806BE38: @ 806BE38 beq _0806BE6E b _0806BE70 .align 2, 0 -_0806BE54: .4byte 0x03001770 +_0806BE54: .4byte gMain _0806BE58: cmp r1, 0x40 beq _0806BE62 @@ -8329,7 +8329,7 @@ _0806BE8E: movs r0, 0x8 b _0806BEF0 .align 2, 0 -_0806BEA4: .4byte 0x03001770 +_0806BEA4: .4byte gMain _0806BEA8: lsls r0, r4, 24 asrs r1, r0, 24 @@ -8360,7 +8360,7 @@ _0806BEBA: movs r0, 0x2 b _0806BEF0 .align 2, 0 -_0806BEE4: .4byte 0x02020004 +_0806BEE4: .4byte gSprites _0806BEE8: ldr r0, _0806BEF8 ldrh r1, [r0, 0x2E] @@ -8371,7 +8371,7 @@ _0806BEF0: pop {r1} bx r1 .align 2, 0 -_0806BEF8: .4byte 0x03001770 +_0806BEF8: .4byte gMain thumb_func_end sub_806BE38 thumb_func_start task_pc_turn_off @@ -8436,7 +8436,7 @@ _0806BF60: pop {r0} bx r0 .align 2, 0 -_0806BF70: .4byte 0x03004360 +_0806BF70: .4byte gPlayerParty thumb_func_end sub_806BF24 thumb_func_start sub_806BF74 @@ -8610,7 +8610,7 @@ _0806C096: adds r0, r7, 0 b _0806C1A4 .align 2, 0 -_0806C0C4: .4byte 0x02020004 +_0806C0C4: .4byte gSprites _0806C0C8: .4byte gUnknown_083769C0 _0806C0CC: .4byte 0x0201b000 _0806C0D0: .4byte 0x00000261 @@ -8681,7 +8681,7 @@ _0806C128: bl sub_806BF24 b _0806C16E .align 2, 0 -_0806C160: .4byte 0x02020004 +_0806C160: .4byte gSprites _0806C164: .4byte gUnknown_083769A8 _0806C168: movs r0, 0x2 @@ -8741,7 +8741,7 @@ _0806C1C8: .align 2, 0 _0806C1D4: .4byte 0x0201b000 _0806C1D8: .4byte 0x00000261 -_0806C1DC: .4byte 0x02020004 +_0806C1DC: .4byte gSprites _0806C1E0: .4byte gUnknown_083768B8 thumb_func_end sub_806BF74 @@ -8786,7 +8786,7 @@ _0806C224: strh r0, [r1, 0x30] b _0806C306 .align 2, 0 -_0806C234: .4byte 0x02020004 +_0806C234: .4byte gSprites _0806C238: cmp r3, 0 beq _0806C266 @@ -8802,8 +8802,8 @@ _0806C238: subs r0, 0x1 b _0806C2AA .align 2, 0 -_0806C254: .4byte 0x02020004 -_0806C258: .4byte 0x03004350 +_0806C254: .4byte gSprites +_0806C258: .4byte gPlayerPartyCount _0806C25C: ldr r0, _0806C278 ldrb r0, [r0] @@ -8820,8 +8820,8 @@ _0806C266: strh r1, [r0, 0x2E] b _0806C2AC .align 2, 0 -_0806C278: .4byte 0x03004350 -_0806C27C: .4byte 0x02020004 +_0806C278: .4byte gPlayerPartyCount +_0806C27C: .4byte gSprites _0806C280: cmp r3, 0x7 bne _0806C298 @@ -8834,7 +8834,7 @@ _0806C280: strh r1, [r0, 0x2E] b _0806C2AC .align 2, 0 -_0806C294: .4byte 0x02020004 +_0806C294: .4byte gSprites _0806C298: ldr r2, _0806C2B8 lsls r3, r4, 4 @@ -8855,7 +8855,7 @@ _0806C2AC: strh r1, [r0, 0x30] b _0806C306 .align 2, 0 -_0806C2B8: .4byte 0x02020004 +_0806C2B8: .4byte gSprites _0806C2BC: ldr r0, _0806C2E4 ldrb r0, [r0] @@ -8879,8 +8879,8 @@ _0806C2DE: strh r0, [r1, 0x2E] b _0806C306 .align 2, 0 -_0806C2E4: .4byte 0x03004350 -_0806C2E8: .4byte 0x02020004 +_0806C2E4: .4byte gPlayerPartyCount +_0806C2E8: .4byte gSprites _0806C2EC: subs r0, r3, 0x1 lsls r0, 24 @@ -8900,7 +8900,7 @@ _0806C306: pop {r0} bx r0 .align 2, 0 -_0806C30C: .4byte 0x02020004 +_0806C30C: .4byte gSprites thumb_func_end sub_806C1E4 thumb_func_start sub_806C310 @@ -8944,7 +8944,7 @@ _0806C350: strh r0, [r1, 0x30] b _0806C486 .align 2, 0 -_0806C360: .4byte 0x02020004 +_0806C360: .4byte gSprites _0806C364: cmp r3, 0x7 bne _0806C37C @@ -8957,7 +8957,7 @@ _0806C364: strh r1, [r0, 0x2E] b _0806C3D8 .align 2, 0 -_0806C378: .4byte 0x02020004 +_0806C378: .4byte gSprites _0806C37C: ldr r0, _0806C388 ldrb r0, [r0] @@ -8966,7 +8966,7 @@ _0806C37C: beq _0806C390 b _0806C3C4 .align 2, 0 -_0806C388: .4byte 0x03004350 +_0806C388: .4byte gPlayerPartyCount _0806C38C: cmp r3, 0 bne _0806C3A4 @@ -8980,7 +8980,7 @@ _0806C390: strh r1, [r0, 0x2E] b _0806C3D8 .align 2, 0 -_0806C3A0: .4byte 0x02020004 +_0806C3A0: .4byte gSprites _0806C3A4: cmp r3, 0x7 bne _0806C3C4 @@ -8994,8 +8994,8 @@ _0806C3A4: subs r0, 0x1 b _0806C3D6 .align 2, 0 -_0806C3BC: .4byte 0x02020004 -_0806C3C0: .4byte 0x03004350 +_0806C3BC: .4byte gSprites +_0806C3C0: .4byte gPlayerPartyCount _0806C3C4: ldr r2, _0806C3E4 lsls r3, r4, 4 @@ -9016,7 +9016,7 @@ _0806C3D8: strh r1, [r0, 0x30] b _0806C486 .align 2, 0 -_0806C3E4: .4byte 0x02020004 +_0806C3E4: .4byte gSprites _0806C3E8: cmp r3, 0 bne _0806C418 @@ -9039,8 +9039,8 @@ _0806C3E8: strh r0, [r1, 0x2E] b _0806C486 .align 2, 0 -_0806C410: .4byte 0x03004350 -_0806C414: .4byte 0x02020004 +_0806C410: .4byte gPlayerPartyCount +_0806C414: .4byte gSprites _0806C418: cmp r3, 0x1 bne _0806C486 @@ -9063,8 +9063,8 @@ _0806C43A: strh r2, [r1, 0x2E] b _0806C486 .align 2, 0 -_0806C440: .4byte 0x03004350 -_0806C444: .4byte 0x02020004 +_0806C440: .4byte gPlayerPartyCount +_0806C444: .4byte gSprites _0806C448: movs r0, 0x4 strh r0, [r1, 0x2E] @@ -9083,7 +9083,7 @@ _0806C44E: movs r0, 0 b _0806C482 .align 2, 0 -_0806C468: .4byte 0x02020004 +_0806C468: .4byte gSprites _0806C46C: subs r0, r3, 0x4 lsls r0, 24 @@ -9104,7 +9104,7 @@ _0806C486: pop {r0} bx r0 .align 2, 0 -_0806C48C: .4byte 0x02020004 +_0806C48C: .4byte gSprites thumb_func_end sub_806C310 thumb_func_start sub_806C490 @@ -9147,7 +9147,7 @@ _0806C4CC: strh r0, [r1, 0x30] b _0806C64E .align 2, 0 -_0806C4DC: .4byte 0x02020004 +_0806C4DC: .4byte gSprites _0806C4E0: cmp r4, 0x7 bne _0806C4FC @@ -9162,7 +9162,7 @@ _0806C4E0: adds r6, r3, 0 b _0806C566 .align 2, 0 -_0806C4F8: .4byte 0x02020004 +_0806C4F8: .4byte gSprites _0806C4FC: lsls r6, r5, 4 b _0806C518 @@ -9183,7 +9183,7 @@ _0806C518: bne _0806C500 b _0806C558 .align 2, 0 -_0806C520: .4byte 0x03004360 +_0806C520: .4byte gPlayerParty _0806C524: lsls r6, r5, 4 b _0806C554 @@ -9195,7 +9195,7 @@ _0806C528: strh r4, [r0, 0x2E] b _0806C566 .align 2, 0 -_0806C534: .4byte 0x02020004 +_0806C534: .4byte gSprites _0806C538: subs r0, r4, 0x1 lsls r0, 24 @@ -9229,8 +9229,8 @@ _0806C566: strh r1, [r0, 0x30] b _0806C64E .align 2, 0 -_0806C574: .4byte 0x03004360 -_0806C578: .4byte 0x02020004 +_0806C574: .4byte gPlayerParty +_0806C578: .4byte gSprites _0806C57C: cmp r4, 0 bne _0806C5C8 @@ -9255,8 +9255,8 @@ _0806C57C: strh r0, [r4, 0x2E] b _0806C64E .align 2, 0 -_0806C5AC: .4byte 0x02020004 -_0806C5B0: .4byte 0x03004428 +_0806C5AC: .4byte gSprites +_0806C5B0: .4byte gUnknown_03004428 _0806C5B4: adds r0, r5, 0 adds r0, 0x64 @@ -9285,7 +9285,7 @@ _0806C5E2: strh r1, [r4, 0x2E] b _0806C64E .align 2, 0 -_0806C5E8: .4byte 0x02020004 +_0806C5E8: .4byte gSprites _0806C5EC: ldr r5, _0806C600 adds r0, r5, 0 @@ -9297,7 +9297,7 @@ _0806C5EC: strh r0, [r4, 0x2E] b _0806C64E .align 2, 0 -_0806C600: .4byte 0x030044f0 +_0806C600: .4byte gUnknown_030044F0 _0806C604: adds r0, r5, 0 adds r0, 0x64 @@ -9322,7 +9322,7 @@ _0806C618: movs r0, 0 b _0806C64A .align 2, 0 -_0806C630: .4byte 0x02020004 +_0806C630: .4byte gSprites _0806C634: subs r0, r4, 0x4 lsls r0, 24 @@ -9343,7 +9343,7 @@ _0806C64E: pop {r0} bx r0 .align 2, 0 -_0806C654: .4byte 0x02020004 +_0806C654: .4byte gSprites thumb_func_end sub_806C490 thumb_func_start sub_806C658 @@ -9382,7 +9382,7 @@ sub_806C658: @ 806C658 bl sub_806BF24 b _0806C6BA .align 2, 0 -_0806C6A0: .4byte 0x02020004 +_0806C6A0: .4byte gSprites _0806C6A4: .4byte gUnknown_083769A8 _0806C6A8: cmp r6, 0x6 @@ -9430,7 +9430,7 @@ _0806C6F0: adds r4, r2, 0 b _0806C7EA .align 2, 0 -_0806C704: .4byte 0x02020004 +_0806C704: .4byte gSprites _0806C708: cmp r6, 0 bne _0806C720 @@ -9443,7 +9443,7 @@ _0806C708: strh r1, [r0, 0x2E] b _0806C78E .align 2, 0 -_0806C71C: .4byte 0x02020004 +_0806C71C: .4byte gSprites _0806C720: cmp r6, 0x6 bne _0806C77C @@ -9457,8 +9457,8 @@ _0806C720: subs r0, 0x1 b _0806C78C .align 2, 0 -_0806C738: .4byte 0x02020004 -_0806C73C: .4byte 0x03004350 +_0806C738: .4byte gSprites +_0806C73C: .4byte gPlayerPartyCount _0806C740: ldr r0, _0806C75C ldrb r0, [r0] @@ -9474,8 +9474,8 @@ _0806C740: strh r1, [r0, 0x2E] b _0806C78E .align 2, 0 -_0806C75C: .4byte 0x03004350 -_0806C760: .4byte 0x02020004 +_0806C75C: .4byte gPlayerPartyCount +_0806C760: .4byte gSprites _0806C764: cmp r6, 0x7 bne _0806C77C @@ -9488,7 +9488,7 @@ _0806C764: strh r1, [r0, 0x2E] b _0806C78E .align 2, 0 -_0806C778: .4byte 0x02020004 +_0806C778: .4byte gSprites _0806C77C: ldr r2, _0806C79C lsls r3, r5, 4 @@ -9509,7 +9509,7 @@ _0806C78E: strh r1, [r0, 0x30] b _0806C7EA .align 2, 0 -_0806C79C: .4byte 0x02020004 +_0806C79C: .4byte gSprites _0806C7A0: ldr r0, _0806C7C8 ldrb r0, [r0] @@ -9533,8 +9533,8 @@ _0806C7C2: strh r0, [r1, 0x2E] b _0806C7EA .align 2, 0 -_0806C7C8: .4byte 0x03004350 -_0806C7CC: .4byte 0x02020004 +_0806C7C8: .4byte gPlayerPartyCount +_0806C7CC: .4byte gSprites _0806C7D0: subs r0, r6, 0x1 lsls r0, 24 @@ -9582,7 +9582,7 @@ _0806C7EA: bl sub_806BF24 b _0806C84A .align 2, 0 -_0806C82C: .4byte 0x02020004 +_0806C82C: .4byte gSprites _0806C830: .4byte gUnknown_083768B8 _0806C834: .4byte gUnknown_083769A8 _0806C838: @@ -9625,7 +9625,7 @@ _0806C878: .align 2, 0 _0806C884: .4byte 0x0201b000 _0806C888: .4byte 0x00000261 -_0806C88C: .4byte 0x02020004 +_0806C88C: .4byte gSprites thumb_func_end sub_806C658 thumb_func_start sub_806C890 @@ -9662,7 +9662,7 @@ sub_806C890: @ 806C890 bl sub_806BF24 b _0806C8E2 .align 2, 0 -_0806C8D4: .4byte 0x02020004 +_0806C8D4: .4byte gSprites _0806C8D8: .4byte gUnknown_083769A8 _0806C8DC: movs r0, 0x1 @@ -9696,7 +9696,7 @@ _0806C914: pop {r0} bx r0 .align 2, 0 -_0806C91C: .4byte 0x02020004 +_0806C91C: .4byte gSprites _0806C920: .4byte gUnknown_083768B8 _0806C924: .4byte 0x0201b000 _0806C928: .4byte 0x00000261 @@ -9729,7 +9729,7 @@ sub_806C92C: @ 806C92C movs r4, 0x1 b _0806C97C .align 2, 0 -_0806C960: .4byte 0x02020004 +_0806C960: .4byte gSprites _0806C964: cmp r4, 0 beq _0806C97C @@ -9757,7 +9757,7 @@ _0806C97C: pop {r0} bx r0 .align 2, 0 -_0806C990: .4byte 0x02020004 +_0806C990: .4byte gSprites thumb_func_end sub_806C92C thumb_func_start sub_806C994 @@ -9782,7 +9782,7 @@ sub_806C994: @ 806C994 pop {r0} bx r0 .align 2, 0 -_0806C9C0: .4byte 0x02020004 +_0806C9C0: .4byte gSprites thumb_func_end sub_806C994 thumb_func_start sub_806C9C4 @@ -9815,7 +9815,7 @@ sub_806C9C4: @ 806C9C4 pop {r0} bx r0 .align 2, 0 -_0806C9FC: .4byte 0x02020004 +_0806C9FC: .4byte gSprites thumb_func_end sub_806C9C4 thumb_func_start sub_806CA00 @@ -9831,7 +9831,7 @@ sub_806CA00: @ 806CA00 lsrs r0, 8 bx lr .align 2, 0 -_0806CA14: .4byte 0x03004b20 +_0806CA14: .4byte gTasks thumb_func_end sub_806CA00 thumb_func_start sub_806CA18 @@ -9850,7 +9850,7 @@ sub_806CA18: @ 806CA18 strh r0, [r2, 0xE] bx lr .align 2, 0 -_0806CA34: .4byte 0x03004b20 +_0806CA34: .4byte gTasks thumb_func_end sub_806CA18 thumb_func_start sub_806CA38 @@ -9872,7 +9872,7 @@ sub_806CA38: @ 806CA38 pop {r1} bx r1 .align 2, 0 -_0806CA5C: .4byte 0x02020004 +_0806CA5C: .4byte gSprites thumb_func_end sub_806CA38 thumb_func_start sub_806CA60 @@ -9932,13 +9932,13 @@ sub_806CA60: @ 806CA60 pop {r0} bx r0 .align 2, 0 -_0806CAD8: .4byte 0x03004b20 +_0806CAD8: .4byte gTasks _0806CADC: .4byte TaskDummy _0806CAE0: .4byte 0x02001000 _0806CAE4: .4byte sub_806CB74 _0806CAE8: .4byte SpriteCallbackDummy _0806CAEC: .4byte 0x0001a272 -_0806CAF0: .4byte 0x02020004 +_0806CAF0: .4byte gSprites _0806CAF4: .4byte gUnknown_083769A8 _0806CAF8: .4byte 0x0001a261 thumb_func_end sub_806CA60 @@ -9982,7 +9982,7 @@ sub_806CAFC: @ 806CAFC b _0806CB6A .align 2, 0 _0806CB48: .4byte 0x02001000 -_0806CB4C: .4byte 0x02020004 +_0806CB4C: .4byte gSprites _0806CB50: .4byte gUnknown_083769A8 _0806CB54: movs r3, 0x2E @@ -10018,7 +10018,7 @@ sub_806CB74: @ 806CB74 beq _0806CBD0 b _0806CBDA .align 2, 0 -_0806CB8C: .4byte 0x03001770 +_0806CB8C: .4byte gMain _0806CB90: cmp r0, 0x40 beq _0806CB9A @@ -10078,8 +10078,8 @@ _0806CBDA: b _0806CC24 .align 2, 0 _0806CC04: .4byte 0x02001000 -_0806CC08: .4byte 0x03001770 -_0806CC0C: .4byte 0x03004b20 +_0806CC08: .4byte gMain +_0806CC0C: .4byte gTasks _0806CC10: lsls r0, r1, 16 lsrs r0, 16 @@ -10125,7 +10125,7 @@ sub_806CC2C: @ 806CC2C bx r0 .align 2, 0 _0806CC68: .4byte 0x02001000 -_0806CC6C: .4byte 0x02020004 +_0806CC6C: .4byte gSprites _0806CC70: .4byte 0x0001a261 thumb_func_end sub_806CC2C @@ -10179,7 +10179,7 @@ sub_806CC74: @ 806CC74 pop {r0} bx r0 .align 2, 0 -_0806CCD8: .4byte 0x02020004 +_0806CCD8: .4byte gSprites _0806CCDC: .4byte 0x02001000 _0806CCE0: .4byte gUnknown_083769A8 thumb_func_end sub_806CC74 @@ -10229,7 +10229,7 @@ _0806CD32: pop {r0} bx r0 .align 2, 0 -_0806CD38: .4byte 0x02020004 +_0806CD38: .4byte gSprites _0806CD3C: .4byte 0x02001000 _0806CD40: .4byte gUnknown_083769A8 thumb_func_end sub_806CCE4 @@ -10288,7 +10288,7 @@ _0806CD9E: bl sub_806CD44 b _0806CED2 .align 2, 0 -_0806CDA8: .4byte 0x02020004 +_0806CDA8: .4byte gSprites _0806CDAC: .4byte 0x02001000 _0806CDB0: adds r0, r5, 0 @@ -10345,10 +10345,10 @@ _0806CDCC: b _0806CE66 .align 2, 0 _0806CE1C: .4byte 0x02001000 -_0806CE20: .4byte 0x02020004 +_0806CE20: .4byte gSprites _0806CE24: .4byte 0x0000fff8 _0806CE28: .4byte 0x0000ff58 -_0806CE2C: .4byte 0x03004b20 +_0806CE2C: .4byte gTasks _0806CE30: .4byte sub_806D014 _0806CE34: ldr r2, _0806CEE0 @@ -10437,8 +10437,8 @@ _0806CED2: pop {r0} bx r0 .align 2, 0 -_0806CEE0: .4byte 0x02020004 -_0806CEE4: .4byte 0x03004b20 +_0806CEE0: .4byte gSprites +_0806CEE4: .4byte gTasks _0806CEE8: .4byte sub_806D118 _0806CEEC: .4byte 0x0001a261 _0806CEF0: .4byte 0x02001000 @@ -10526,7 +10526,7 @@ sub_806CF04: @ 806CF04 bx r0 .align 2, 0 _0806CF94: .4byte 0x02001000 -_0806CF98: .4byte 0x02020024 +_0806CF98: .4byte gSprites + 0x20 _0806CF9C: .4byte sub_806D37C thumb_func_end sub_806CF04 @@ -10621,7 +10621,7 @@ _0806D04A: bx r0 .align 2, 0 _0806D050: .4byte 0x02001000 -_0806D054: .4byte 0x03004b20 +_0806D054: .4byte gTasks _0806D058: .4byte sub_806D05C thumb_func_end sub_806D014 @@ -10652,7 +10652,7 @@ _0806D084: bx r0 .align 2, 0 _0806D08C: .4byte 0x02001000 -_0806D090: .4byte 0x03004b20 +_0806D090: .4byte gTasks _0806D094: .4byte sub_806D198 thumb_func_end sub_806D05C @@ -10753,7 +10753,7 @@ _0806D14A: bx r0 .align 2, 0 _0806D150: .4byte 0x02001000 -_0806D154: .4byte 0x03004b20 +_0806D154: .4byte gTasks _0806D158: .4byte sub_806D15C thumb_func_end sub_806D118 @@ -10784,7 +10784,7 @@ _0806D182: .align 2, 0 _0806D188: .4byte 0x02001000 _0806D18C: .4byte 0x000b000b -_0806D190: .4byte 0x03004b20 +_0806D190: .4byte gTasks _0806D194: .4byte sub_806D198 thumb_func_end sub_806D15C @@ -11003,11 +11003,11 @@ sub_806D198: @ 806D198 bx r0 .align 2, 0 _0806D364: .4byte 0x02001000 -_0806D368: .4byte 0x02020004 +_0806D368: .4byte gSprites _0806D36C: .4byte gUnknown_08376678 _0806D370: .4byte sub_806DA38 _0806D374: .4byte sub_806DA0C -_0806D378: .4byte 0x03004360 +_0806D378: .4byte gPlayerParty thumb_func_end sub_806D198 thumb_func_start sub_806D37C @@ -11107,7 +11107,7 @@ sub_806D3B4: @ 806D3B4 b _0806D454 .align 2, 0 _0806D438: .4byte gUnknown_083769C0 -_0806D43C: .4byte 0x03004b20 +_0806D43C: .4byte gTasks _0806D440: ldrh r0, [r5, 0x8] ldrb r1, [r6, 0x8] @@ -11138,7 +11138,7 @@ _0806D454: bl sub_806BA94 b _0806D49E .align 2, 0 -_0806D47C: .4byte 0x03004b20 +_0806D47C: .4byte gTasks _0806D480: ldr r1, _0806D4A8 lsls r0, r7, 2 @@ -11161,7 +11161,7 @@ _0806D49E: pop {r0} bx r0 .align 2, 0 -_0806D4A8: .4byte 0x03004b20 +_0806D4A8: .4byte gTasks thumb_func_end sub_806D3B4 thumb_func_start sub_806D4AC @@ -11207,9 +11207,9 @@ _0806D4F6: pop {r0} bx r0 .align 2, 0 -_0806D4FC: .4byte 0x02020004 +_0806D4FC: .4byte gSprites _0806D500: .4byte 0x0000fff8 -_0806D504: .4byte 0x03004b20 +_0806D504: .4byte gTasks _0806D508: .4byte sub_806D37C thumb_func_end sub_806D4AC @@ -11234,7 +11234,7 @@ sub_806D50C: @ 806D50C pop {r0} bx r0 .align 2, 0 -_0806D534: .4byte 0x02020004 +_0806D534: .4byte gSprites thumb_func_end sub_806D50C thumb_func_start sub_806D538 @@ -11389,7 +11389,7 @@ sub_806D5B8: @ 806D5B8 bx r0 .align 2, 0 _0806D658: .4byte gUnknown_08376948 -_0806D65C: .4byte 0x03004210 +_0806D65C: .4byte gUnknown_03004210 _0806D660: .4byte 0x06014000 _0806D664: .4byte 0x01000100 thumb_func_end sub_806D5B8 @@ -11471,7 +11471,7 @@ sub_806D668: @ 806D668 bx r0 .align 2, 0 _0806D708: .4byte gUnknown_08376978 -_0806D70C: .4byte 0x03004210 +_0806D70C: .4byte gUnknown_03004210 _0806D710: .4byte 0x06014300 _0806D714: .4byte 0x01000040 thumb_func_end sub_806D668 @@ -11627,7 +11627,7 @@ _0806D830: pop {r0} bx r0 .align 2, 0 -_0806D848: .4byte 0x02020004 +_0806D848: .4byte gSprites thumb_func_end sub_806D7F8 thumb_func_start sub_806D84C @@ -11798,8 +11798,8 @@ _0806D986: pop {r0} bx r0 .align 2, 0 -_0806D994: .4byte 0x03004360 -_0806D998: .4byte 0x03004350 +_0806D994: .4byte gPlayerParty +_0806D998: .4byte gPlayerPartyCount thumb_func_end unref_sub_806D964 thumb_func_start sub_806D99C @@ -11921,7 +11921,7 @@ sub_806DA44: @ 806DA44 ldr r1, _0806DA80 b _0806DA8C .align 2, 0 -_0806DA7C: .4byte 0x02020004 +_0806DA7C: .4byte gSprites _0806DA80: .4byte sub_806DA38 _0806DA84: adds r0, r3, 0 @@ -11978,7 +11978,7 @@ sub_806DAB4: @ 806DAB4 strb r1, [r0] b _0806DB06 .align 2, 0 -_0806DAE4: .4byte 0x02020004 +_0806DAE4: .4byte gSprites _0806DAE8: adds r3, r4, 0 adds r3, 0x3E @@ -12060,7 +12060,7 @@ sub_806DB0C: @ 806DB0C pop {r0} bx r0 .align 2, 0 -_0806DB84: .4byte 0x02020004 +_0806DB84: .4byte gSprites _0806DB88: .4byte gSpriteTemplate_837660C _0806DB8C: .4byte sub_806DAB4 thumb_func_end sub_806DB0C @@ -12111,7 +12111,7 @@ _0806DBD8: bcc _0806DBAC b _0806DC28 .align 2, 0 -_0806DBE8: .4byte 0x03004360 +_0806DBE8: .4byte gPlayerParty _0806DBEC: movs r5, 0 b _0806DC22 @@ -12148,7 +12148,7 @@ _0806DC28: pop {r0} bx r0 .align 2, 0 -_0806DC30: .4byte 0x030045c0 +_0806DC30: .4byte gEnemyParty thumb_func_end sub_806DB90 thumb_func_start sub_806DC34 @@ -12225,8 +12225,8 @@ _0806DCB0: pop {r0} bx r0 .align 2, 0 -_0806DCC8: .4byte 0x02020004 -_0806DCCC: .4byte 0x03004360 +_0806DCC8: .4byte gSprites +_0806DCCC: .4byte gPlayerParty _0806DCD0: .4byte gSpriteTemplate_837660C thumb_func_end sub_806DC34 @@ -12276,7 +12276,7 @@ sub_806DCD4: @ 806DCD4 b _0806DD5C .align 2, 0 _0806DD2C: .4byte gSpriteTemplate_837660C -_0806DD30: .4byte 0x02020004 +_0806DD30: .4byte gSprites _0806DD34: adds r0, r7, 0 bl itemid_is_mail @@ -12313,7 +12313,7 @@ _0806DD5C: pop {r0} bx r0 .align 2, 0 -_0806DD78: .4byte 0x02020004 +_0806DD78: .4byte gSprites thumb_func_end sub_806DCD4 thumb_func_start sub_806DD7C @@ -12334,7 +12334,7 @@ sub_806DD7C: @ 806DD7C strh r1, [r0, 0x22] bx lr .align 2, 0 -_0806DD9C: .4byte 0x02020004 +_0806DD9C: .4byte gSprites thumb_func_end sub_806DD7C thumb_func_start sub_806DDA0 @@ -12370,7 +12370,7 @@ _0806DDD4: ldrb r0, [r1, 0x8] b _0806DE46 .align 2, 0 -_0806DDE4: .4byte 0x03004b20 +_0806DDE4: .4byte gTasks _0806DDE8: ldr r0, _0806DDF8 lsls r1, r2, 2 @@ -12380,7 +12380,7 @@ _0806DDE8: ldrh r0, [r1, 0xA] b _0806DE44 .align 2, 0 -_0806DDF8: .4byte 0x03004b20 +_0806DDF8: .4byte gTasks _0806DDFC: ldr r0, _0806DE0C lsls r1, r2, 2 @@ -12390,7 +12390,7 @@ _0806DDFC: ldrb r0, [r1, 0xA] b _0806DE46 .align 2, 0 -_0806DE0C: .4byte 0x03004b20 +_0806DE0C: .4byte gTasks _0806DE10: ldr r0, _0806DE20 lsls r1, r2, 2 @@ -12400,7 +12400,7 @@ _0806DE10: ldrh r0, [r1, 0xC] b _0806DE44 .align 2, 0 -_0806DE20: .4byte 0x03004b20 +_0806DE20: .4byte gTasks _0806DE24: ldr r0, _0806DE34 lsls r1, r2, 2 @@ -12410,7 +12410,7 @@ _0806DE24: ldrb r0, [r1, 0xC] b _0806DE46 .align 2, 0 -_0806DE34: .4byte 0x03004b20 +_0806DE34: .4byte gTasks _0806DE38: ldr r0, _0806DE4C lsls r1, r2, 2 @@ -12424,7 +12424,7 @@ _0806DE46: pop {r1} bx r1 .align 2, 0 -_0806DE4C: .4byte 0x03004b20 +_0806DE4C: .4byte gTasks thumb_func_end sub_806DDA0 thumb_func_start sub_806DE50 @@ -12465,7 +12465,7 @@ _0806DE88: strh r1, [r0, 0x8] b _0806DF24 .align 2, 0 -_0806DE9C: .4byte 0x03004b20 +_0806DE9C: .4byte gTasks _0806DEA0: ldr r0, _0806DEB8 lsls r1, r3, 2 @@ -12479,7 +12479,7 @@ _0806DEA0: strh r0, [r1, 0x8] b _0806DF24 .align 2, 0 -_0806DEB8: .4byte 0x03004b20 +_0806DEB8: .4byte gTasks _0806DEBC: .4byte 0xffffff00 _0806DEC0: ldr r1, _0806DED4 @@ -12493,7 +12493,7 @@ _0806DEC0: strh r1, [r0, 0xA] b _0806DF24 .align 2, 0 -_0806DED4: .4byte 0x03004b20 +_0806DED4: .4byte gTasks _0806DED8: ldr r0, _0806DEF0 lsls r1, r3, 2 @@ -12507,7 +12507,7 @@ _0806DED8: strh r0, [r1, 0xA] b _0806DF24 .align 2, 0 -_0806DEF0: .4byte 0x03004b20 +_0806DEF0: .4byte gTasks _0806DEF4: .4byte 0xffffff00 _0806DEF8: ldr r1, _0806DF0C @@ -12521,7 +12521,7 @@ _0806DEF8: strh r1, [r0, 0xC] b _0806DF24 .align 2, 0 -_0806DF0C: .4byte 0x03004b20 +_0806DF0C: .4byte gTasks _0806DF10: ldr r0, _0806DF2C lsls r1, r3, 2 @@ -12538,7 +12538,7 @@ _0806DF24: pop {r0} bx r0 .align 2, 0 -_0806DF2C: .4byte 0x03004b20 +_0806DF2C: .4byte gTasks _0806DF30: .4byte 0xffffff00 thumb_func_end sub_806DE50 @@ -12563,7 +12563,7 @@ sub_806DF34: @ 806DF34 pop {r1} bx r1 .align 2, 0 -_0806DF5C: .4byte 0x02020004 +_0806DF5C: .4byte gSprites thumb_func_end sub_806DF34 thumb_func_start sub_806DF60 @@ -12601,8 +12601,8 @@ sub_806DF60: @ 806DF60 strb r1, [r0] b _0806DFF6 .align 2, 0 -_0806DFA4: .4byte 0x03004360 -_0806DFA8: .4byte 0x02020004 +_0806DFA4: .4byte gPlayerParty +_0806DFA8: .4byte gSprites _0806DFAC: adds r0, r4, 0 movs r1, 0xC @@ -12622,7 +12622,7 @@ _0806DFAC: movs r1, 0x1 b _0806DFE6 .align 2, 0 -_0806DFD4: .4byte 0x02020004 +_0806DFD4: .4byte gSprites _0806DFD8: lsls r4, r6, 4 adds r4, r6 @@ -12644,7 +12644,7 @@ _0806DFF6: pop {r0} bx r0 .align 2, 0 -_0806DFFC: .4byte 0x02020004 +_0806DFFC: .4byte gSprites thumb_func_end sub_806DF60 thumb_func_start box_print @@ -12678,7 +12678,7 @@ box_print: @ 806E000 pop {r0} bx r0 .align 2, 0 -_0806E040: .4byte 0x02039360 +_0806E040: .4byte gTileBuffer _0806E044: .4byte 0x01000100 _0806E048: .4byte gWindowConfig_81E6CAC _0806E04C: .4byte 0x06014000 @@ -12764,7 +12764,7 @@ _0806E0CC: pop {r0} bx r0 .align 2, 0 -_0806E0E8: .4byte 0x03004360 +_0806E0E8: .4byte gPlayerParty thumb_func_end sub_806E0C4 thumb_func_start GetMonNickname @@ -12974,8 +12974,8 @@ sub_806E1F4: @ 806E1F4 bx r0 .align 2, 0 _0806E278: .4byte gUnknown_08376738 -_0806E27C: .4byte 0x020231cc -_0806E280: .4byte 0x02039460 +_0806E27C: .4byte gStringVar1 +_0806E280: .4byte gUnknown_02039460 _0806E284: .4byte 0x01000020 _0806E288: .4byte gWindowConfig_81E6CAC _0806E28C: .4byte 0xffffff00 @@ -13085,7 +13085,7 @@ _0806E33C: pop {r0} bx r0 .align 2, 0 -_0806E358: .4byte 0x03004360 +_0806E358: .4byte gPlayerParty thumb_func_end sub_806E334 thumb_func_start sub_806E35C @@ -13186,7 +13186,7 @@ sub_806E3C0: @ 806E3C0 pop {r0} bx r0 .align 2, 0 -_0806E41C: .4byte 0x020231cc +_0806E41C: .4byte gStringVar1 thumb_func_end sub_806E3C0 thumb_func_start sub_806E420 @@ -13240,8 +13240,8 @@ sub_806E420: @ 806E420 pop {r0} bx r0 .align 2, 0 -_0806E48C: .4byte 0x020231cc -_0806E490: .4byte 0x02039460 +_0806E48C: .4byte gStringVar1 +_0806E490: .4byte gUnknown_02039460 _0806E494: .4byte 0x01000040 _0806E498: .4byte gWindowConfig_81E6CAC _0806E49C: .4byte 0xffffff00 @@ -13345,7 +13345,7 @@ _0806E544: pop {r0} bx r0 .align 2, 0 -_0806E560: .4byte 0x03004360 +_0806E560: .4byte gPlayerParty thumb_func_end sub_806E53C thumb_func_start unref_sub_806E564 @@ -13562,7 +13562,7 @@ _0806E6D0: pop {r0} bx r0 .align 2, 0 -_0806E6EC: .4byte 0x03004360 +_0806E6EC: .4byte gPlayerParty thumb_func_end sub_806E6C8 thumb_func_start sub_806E6F0 @@ -13767,9 +13767,9 @@ sub_806E834: @ 806E834 pop {r1} bx r1 .align 2, 0 -_0806E878: .4byte 0x0202e8f6 +_0806E878: .4byte gUnknown_0202E8F6 _0806E87C: .4byte sub_806E884 -_0806E880: .4byte 0x03004b20 +_0806E880: .4byte gTasks thumb_func_end sub_806E834 thumb_func_start sub_806E884 @@ -13807,8 +13807,8 @@ _0806E8C0: pop {r0} bx r0 .align 2, 0 -_0806E8C8: .4byte 0x0202e8f6 -_0806E8CC: .4byte 0x03004b20 +_0806E8C8: .4byte gUnknown_0202E8F6 +_0806E8CC: .4byte gTasks thumb_func_end sub_806E884 thumb_func_start sub_806E8D0 @@ -13836,7 +13836,7 @@ sub_806E8D0: @ 806E8D0 bx r0 .align 2, 0 _0806E8FC: .4byte 0x0201c000 -_0806E900: .4byte 0x03004360 +_0806E900: .4byte gPlayerParty thumb_func_end sub_806E8D0 thumb_func_start sub_806E904 @@ -13866,7 +13866,7 @@ _0806E930: movs r0, 0x2 b _0806E940 .align 2, 0 -_0806E938: .4byte 0x0202e8f4 +_0806E938: .4byte gUnknown_0202E8F4 _0806E93C: ldr r1, _0806E960 movs r0, 0x1 @@ -13888,7 +13888,7 @@ _0806E958: pop {r1} bx r1 .align 2, 0 -_0806E960: .4byte 0x0202e8f4 +_0806E960: .4byte gUnknown_0202E8F4 thumb_func_end sub_806E904 thumb_func_start sub_806E964 @@ -13945,11 +13945,11 @@ sub_806E964: @ 806E964 bl CreateTask b _0806EA78 .align 2, 0 -_0806E9D4: .4byte 0x03004b20 +_0806E9D4: .4byte gTasks _0806E9D8: .4byte TaskDummy _0806E9DC: .4byte 0x0201c000 -_0806E9E0: .4byte 0x0202e8f4 -_0806E9E4: .4byte 0x0202e8f8 +_0806E9E0: .4byte gUnknown_0202E8F4 +_0806E9E4: .4byte gUnknown_0202E8F8 _0806E9E8: .4byte gOtherText_MailMustBeRemoved _0806E9EC: .4byte party_menu_link_mon_held_item_object _0806E9F0: @@ -13979,9 +13979,9 @@ _0806E9F0: strh r7, [r0] b _0806EA78 .align 2, 0 -_0806EA30: .4byte 0x020231cc -_0806EA34: .4byte 0x020232cc -_0806EA38: .4byte 0x020234cc +_0806EA30: .4byte gStringVar1 +_0806EA34: .4byte gStringVar2 +_0806EA38: .4byte gStringVar4 _0806EA3C: .4byte gOtherText_AlreadyHolding _0806EA40: .4byte sub_806EBB8 _0806EA44: @@ -14047,9 +14047,9 @@ _0806EABA: pop {r0} bx r0 .align 2, 0 -_0806EAC0: .4byte 0x0202e8f6 +_0806EAC0: .4byte gUnknown_0202E8F6 _0806EAC4: .4byte 0x0201c000 -_0806EAC8: .4byte 0x03004b20 +_0806EAC8: .4byte gTasks thumb_func_end party_menu_link_mon_held_item_object thumb_func_start sub_806EACC @@ -14111,8 +14111,8 @@ _0806EB34: bl sub_806E834 b _0806EB9A .align 2, 0 -_0806EB50: .4byte 0x020231cc -_0806EB54: .4byte 0x020234cc +_0806EB50: .4byte gStringVar1 +_0806EB54: .4byte gStringVar4 _0806EB58: .4byte gOtherText_TakenAndReplaced _0806EB5C: ldr r0, _0806EB70 @@ -14157,7 +14157,7 @@ _0806EBA8: pop {r0} bx r0 .align 2, 0 -_0806EBB0: .4byte 0x03004b20 +_0806EBB0: .4byte gTasks _0806EBB4: .4byte party_menu_link_mon_held_item_object thumb_func_end sub_806EACC @@ -14186,8 +14186,8 @@ _0806EBDE: pop {r0} bx r0 .align 2, 0 -_0806EBE4: .4byte 0x0202e8f6 -_0806EBE8: .4byte 0x03004b20 +_0806EBE4: .4byte gUnknown_0202E8F6 +_0806EBE8: .4byte gTasks _0806EBEC: .4byte sub_806EACC thumb_func_end sub_806EBB8 @@ -14222,10 +14222,10 @@ sub_806EBF0: @ 806EBF0 pop {r0} bx r0 .align 2, 0 -_0806EC30: .4byte 0x03004360 -_0806EC34: .4byte 0x020231cc -_0806EC38: .4byte 0x020232cc -_0806EC3C: .4byte 0x020234cc +_0806EC30: .4byte gPlayerParty +_0806EC34: .4byte gStringVar1 +_0806EC38: .4byte gStringVar2 +_0806EC3C: .4byte gStringVar4 _0806EC40: .4byte gOtherText_WasGivenToHold thumb_func_end sub_806EBF0 @@ -14274,11 +14274,11 @@ sub_806EC44: @ 806EC44 bl CreateTask b _0806ECDA .align 2, 0 -_0806ECA0: .4byte 0x03004b20 +_0806ECA0: .4byte gTasks _0806ECA4: .4byte TaskDummy _0806ECA8: .4byte 0x0201c000 -_0806ECAC: .4byte 0x0202e8f4 -_0806ECB0: .4byte 0x02028280 +_0806ECAC: .4byte gUnknown_0202E8F4 +_0806ECB0: .4byte gUnknown_02028280 _0806ECB4: .4byte gOtherText_PokeHoldingItemCantMail _0806ECB8: .4byte party_menu_link_mon_held_item_object _0806ECBC: @@ -14339,10 +14339,10 @@ sub_806ECE8: @ 806ECE8 bl CreateTask b _0806EDA2 .align 2, 0 -_0806ED38: .4byte 0x03004b20 +_0806ED38: .4byte gTasks _0806ED3C: .4byte TaskDummy _0806ED40: .4byte 0x0201c000 -_0806ED44: .4byte 0x020234cc +_0806ED44: .4byte gStringVar4 _0806ED48: .4byte gOtherText_NotHoldingAnything _0806ED4C: .4byte party_menu_link_mon_held_item_object _0806ED50: @@ -14424,10 +14424,10 @@ sub_806EDB4: @ 806EDB4 pop {r0} bx r0 .align 2, 0 -_0806EDF4: .4byte 0x03004360 -_0806EDF8: .4byte 0x020231cc -_0806EDFC: .4byte 0x020232cc -_0806EE00: .4byte 0x020234cc +_0806EDF4: .4byte gPlayerParty +_0806EDF8: .4byte gStringVar1 +_0806EDFC: .4byte gStringVar2 +_0806EE00: .4byte gStringVar4 _0806EE04: .4byte gOtherText_ReceivedTheThingFrom thumb_func_end sub_806EDB4 @@ -14461,7 +14461,7 @@ sub_806EE08: @ 806EE08 pop {r0} bx r0 .align 2, 0 -_0806EE48: .4byte 0x03004b20 +_0806EE48: .4byte gTasks _0806EE4C: .4byte TaskDummy _0806EE50: .4byte 0x0201c000 _0806EE54: .4byte gOtherText_SendRemovedMailPrompt @@ -14545,7 +14545,7 @@ _0806EEF0: pop {r0} bx r0 .align 2, 0 -_0806EEF8: .4byte 0x03004b20 +_0806EEF8: .4byte gTasks _0806EEFC: .4byte party_menu_link_mon_held_item_object thumb_func_end sub_806EE5C @@ -14574,8 +14574,8 @@ _0806EF26: pop {r0} bx r0 .align 2, 0 -_0806EF2C: .4byte 0x0202e8f6 -_0806EF30: .4byte 0x03004b20 +_0806EF2C: .4byte gUnknown_0202E8F6 +_0806EF30: .4byte gTasks _0806EF34: .4byte sub_806EE5C thumb_func_end sub_806EF00 @@ -14623,7 +14623,7 @@ _0806EF80: b _0806EFD8 .align 2, 0 _0806EF90: .4byte gOtherText_MailboxIsFull -_0806EF94: .4byte 0x03004b20 +_0806EF94: .4byte gTasks _0806EF98: .4byte party_menu_link_mon_held_item_object _0806EF9C: cmp r1, 0x1 @@ -14661,7 +14661,7 @@ _0806EFD8: bx r0 .align 2, 0 _0806EFE0: .4byte gOtherText_MailRemovedMessageLost -_0806EFE4: .4byte 0x03004b20 +_0806EFE4: .4byte gTasks _0806EFE8: .4byte sub_806EF00 thumb_func_end sub_806EF38 @@ -14690,8 +14690,8 @@ _0806F012: pop {r0} bx r0 .align 2, 0 -_0806F018: .4byte 0x0202e8f6 -_0806F01C: .4byte 0x03004b20 +_0806F018: .4byte gUnknown_0202E8F6 +_0806F01C: .4byte gTasks _0806F020: .4byte sub_806EF38 thumb_func_end sub_806EFEC @@ -14769,7 +14769,7 @@ sub_806F06C: @ 806F06C pop {r0} bx r0 .align 2, 0 -_0806F0A8: .4byte 0x03004b20 +_0806F0A8: .4byte gTasks _0806F0AC: .4byte TaskDummy _0806F0B0: .4byte sub_806F0B4 thumb_func_end sub_806F06C @@ -14820,13 +14820,13 @@ sub_806F0B4: @ 806F0B4 b _0806F1B6 .align 2, 0 _0806F114: .4byte 0x0201c000 -_0806F118: .4byte 0x020231cc -_0806F11C: .4byte 0x020232cc +_0806F118: .4byte gStringVar1 +_0806F11C: .4byte gStringVar2 _0806F120: .4byte gMoveNames _0806F124: .4byte 0xfffff282 -_0806F128: .4byte 0x020234cc +_0806F128: .4byte gStringVar4 _0806F12C: .4byte gOtherText_AlreadyKnows -_0806F130: .4byte 0x03004b20 +_0806F130: .4byte gTasks _0806F134: .4byte party_menu_link_mon_held_item_object _0806F138: ldr r0, [r5] @@ -14852,9 +14852,9 @@ _0806F138: ldr r1, _0806F178 b _0806F1B6 .align 2, 0 -_0806F16C: .4byte 0x020234cc +_0806F16C: .4byte gStringVar4 _0806F170: .4byte gOtherText_NotCompatible -_0806F174: .4byte 0x03004b20 +_0806F174: .4byte gTasks _0806F178: .4byte party_menu_link_mon_held_item_object _0806F17C: ldr r0, [r5] @@ -14890,9 +14890,9 @@ _0806F1B8: pop {r0} bx r0 .align 2, 0 -_0806F1C0: .4byte 0x020234cc +_0806F1C0: .4byte gStringVar4 _0806F1C4: .4byte gOtherText_WantsToLearn -_0806F1C8: .4byte 0x03004b20 +_0806F1C8: .4byte gTasks _0806F1CC: .4byte sub_806F358 thumb_func_end sub_806F0B4 @@ -14945,13 +14945,13 @@ _0806F220: pop {r0} bx r0 .align 2, 0 -_0806F234: .4byte 0x020232cc +_0806F234: .4byte gStringVar2 _0806F238: .4byte 0x0201c000 _0806F23C: .4byte gMoveNames -_0806F240: .4byte 0x020234cc +_0806F240: .4byte gStringVar4 _0806F244: .4byte gOtherText_LearnedMove _0806F248: .4byte 0xfffff282 -_0806F24C: .4byte 0x03004b20 +_0806F24C: .4byte gTasks _0806F250: .4byte sub_806F254 thumb_func_end sub_806F1D0 @@ -14978,9 +14978,9 @@ _0806F276: pop {r0} bx r0 .align 2, 0 -_0806F27C: .4byte 0x0202e8f6 +_0806F27C: .4byte gUnknown_0202E8F6 _0806F280: .4byte 0x0000016f -_0806F284: .4byte 0x03004b20 +_0806F284: .4byte gTasks _0806F288: .4byte sub_806F28C thumb_func_end sub_806F254 @@ -15019,7 +15019,7 @@ _0806F2B2: bl sub_8070C54 b _0806F2F2 .align 2, 0 -_0806F2D0: .4byte 0x03001770 +_0806F2D0: .4byte gMain _0806F2D4: .4byte 0x0201c000 _0806F2D8: .4byte 0xfffff282 _0806F2DC: @@ -15038,7 +15038,7 @@ _0806F2F2: pop {r0} bx r0 .align 2, 0 -_0806F2F8: .4byte 0x03004b20 +_0806F2F8: .4byte gTasks thumb_func_end sub_806F28C thumb_func_start sub_806F2FC @@ -15065,7 +15065,7 @@ sub_806F2FC: @ 806F2FC bl sub_8070C54 b _0806F34E .align 2, 0 -_0806F32C: .4byte 0x0202e8f6 +_0806F32C: .4byte gUnknown_0202E8F6 _0806F330: .4byte 0x0201c000 _0806F334: .4byte 0xfffff282 _0806F338: @@ -15084,7 +15084,7 @@ _0806F34E: pop {r0} bx r0 .align 2, 0 -_0806F354: .4byte 0x03004b20 +_0806F354: .4byte gTasks thumb_func_end sub_806F2FC thumb_func_start sub_806F358 @@ -15112,8 +15112,8 @@ _0806F37E: pop {r0} bx r0 .align 2, 0 -_0806F384: .4byte 0x0202e8f6 -_0806F388: .4byte 0x03004b20 +_0806F384: .4byte gUnknown_0202E8F6 +_0806F388: .4byte gTasks _0806F38C: .4byte sub_806F390 thumb_func_end sub_806F358 @@ -15146,7 +15146,7 @@ sub_806F390: @ 806F390 b _0806F3F4 .align 2, 0 _0806F3C8: .4byte gOtherText_WhichMoveToForget2 -_0806F3CC: .4byte 0x03004b20 +_0806F3CC: .4byte gTasks _0806F3D0: .4byte sub_806F44C _0806F3D4: cmp r1, 0x1 @@ -15203,10 +15203,10 @@ _0806F430: pop {r0} bx r0 .align 2, 0 -_0806F438: .4byte 0x0202f388 -_0806F43C: .4byte 0x03004360 +_0806F438: .4byte gPaletteFade +_0806F43C: .4byte gPlayerParty _0806F440: .4byte 0x0201c000 -_0806F444: .4byte 0x03004350 +_0806F444: .4byte gPlayerPartyCount _0806F448: .4byte sub_808B564 thumb_func_end sub_806F3FC @@ -15240,8 +15240,8 @@ _0806F47A: pop {r0} bx r0 .align 2, 0 -_0806F484: .4byte 0x0202e8f6 -_0806F488: .4byte 0x03004b20 +_0806F484: .4byte gUnknown_0202E8F6 +_0806F488: .4byte gTasks _0806F48C: .4byte sub_806F3FC thumb_func_end sub_806F44C @@ -15303,16 +15303,16 @@ _0806F506: pop {r0} bx r0 .align 2, 0 -_0806F50C: .4byte 0x0202f388 -_0806F510: .4byte 0x03004b20 +_0806F50C: .4byte gPaletteFade +_0806F510: .4byte gTasks _0806F514: .4byte TaskDummy -_0806F518: .4byte 0x0203855e +_0806F518: .4byte word_203855E _0806F51C: .4byte sub_808B508 _0806F520: .4byte 0x0201c000 -_0806F524: .4byte 0x020231cc -_0806F528: .4byte 0x020232cc +_0806F524: .4byte gStringVar1 +_0806F528: .4byte gStringVar2 _0806F52C: .4byte gMoveNames -_0806F530: .4byte 0x020234cc +_0806F530: .4byte gStringVar4 _0806F534: .4byte gOtherText_ForgetMove123_2 _0806F538: .4byte sub_806F53C thumb_func_end sub_806F490 @@ -15350,7 +15350,7 @@ _0806F57A: pop {r0} bx r0 .align 2, 0 -_0806F580: .4byte 0x0202e8f6 +_0806F580: .4byte gUnknown_0202E8F6 _0806F584: .4byte 0x0201c000 thumb_func_end sub_806F53C @@ -15400,15 +15400,15 @@ _0806F5E0: pop {r0} bx r0 .align 2, 0 -_0806F5E8: .4byte 0x0202f388 -_0806F5EC: .4byte 0x03004b20 +_0806F5E8: .4byte gPaletteFade +_0806F5EC: .4byte gTasks _0806F5F0: .4byte TaskDummy -_0806F5F4: .4byte 0x0203855e +_0806F5F4: .4byte word_203855E _0806F5F8: .4byte sub_808B508 -_0806F5FC: .4byte 0x020232cc +_0806F5FC: .4byte gStringVar2 _0806F600: .4byte 0x0201c000 _0806F604: .4byte gMoveNames -_0806F608: .4byte 0x020234cc +_0806F608: .4byte gStringVar4 _0806F60C: .4byte gOtherText_StopTryingTo _0806F610: .4byte sub_806F67C thumb_func_end sub_806F588 @@ -15450,12 +15450,12 @@ sub_806F614: @ 806F614 pop {r0} bx r0 .align 2, 0 -_0806F660: .4byte 0x020232cc +_0806F660: .4byte gStringVar2 _0806F664: .4byte 0x0201c000 _0806F668: .4byte gMoveNames -_0806F66C: .4byte 0x020234cc +_0806F66C: .4byte gStringVar4 _0806F670: .4byte gOtherText_StopTryingTo -_0806F674: .4byte 0x03004b20 +_0806F674: .4byte gTasks _0806F678: .4byte sub_806F67C thumb_func_end sub_806F614 @@ -15484,8 +15484,8 @@ _0806F6A2: pop {r0} bx r0 .align 2, 0 -_0806F6A8: .4byte 0x0202e8f6 -_0806F6AC: .4byte 0x03004b20 +_0806F6A8: .4byte gUnknown_0202E8F6 +_0806F6AC: .4byte gTasks _0806F6B0: .4byte sub_806F6B4 thumb_func_end sub_806F67C @@ -15532,12 +15532,12 @@ sub_806F6B4: @ 806F6B4 b _0806F78E .align 2, 0 _0806F710: .4byte 0x0201c000 -_0806F714: .4byte 0x020231cc -_0806F718: .4byte 0x020232cc +_0806F714: .4byte gStringVar1 +_0806F718: .4byte gStringVar2 _0806F71C: .4byte gMoveNames -_0806F720: .4byte 0x020234cc +_0806F720: .4byte gStringVar4 _0806F724: .4byte gOtherText_DidNotLearnMove2 -_0806F728: .4byte 0x03004b20 +_0806F728: .4byte gTasks _0806F72C: .4byte sub_806F2FC _0806F730: cmp r1, 0x1 @@ -15591,12 +15591,12 @@ _0806F790: bx r0 .align 2, 0 _0806F798: .4byte 0x0201c000 -_0806F79C: .4byte 0x020231cc -_0806F7A0: .4byte 0x020232cc +_0806F79C: .4byte gStringVar1 +_0806F7A0: .4byte gStringVar2 _0806F7A4: .4byte gMoveNames -_0806F7A8: .4byte 0x020234cc +_0806F7A8: .4byte gStringVar4 _0806F7AC: .4byte gOtherText_WantsToLearn -_0806F7B0: .4byte 0x03004b20 +_0806F7B0: .4byte gTasks _0806F7B4: .4byte sub_806F358 thumb_func_end sub_806F6B4 @@ -15722,7 +15722,7 @@ _0806F862: pop {r1} bx r1 .align 2, 0 -_0806F898: .4byte 0x03004b28 +_0806F898: .4byte gUnknown_03004B28 _0806F89C: .4byte 0x0201b000 _0806F8A0: .4byte 0x00000282 _0806F8A4: .4byte gUnknown_08376858 @@ -15803,12 +15803,12 @@ _0806F900: bl StringExpandPlaceholders b _0806F964 .align 2, 0 -_0806F940: .4byte 0x02024bec +_0806F940: .4byte gUnknown_02024BEC _0806F944: .4byte 0x0201c000 -_0806F948: .4byte 0x020231cc -_0806F94C: .4byte 0x020232cc -_0806F950: .4byte 0x03004b20 -_0806F954: .4byte 0x020234cc +_0806F948: .4byte gStringVar1 +_0806F94C: .4byte gStringVar2 +_0806F950: .4byte gTasks +_0806F954: .4byte gStringVar4 _0806F958: .4byte gOtherText_HPRestoredBy _0806F95C: ldr r0, _0806F9D4 @@ -15864,12 +15864,12 @@ _0806F964: str r1, [r0] b _0806FA10 .align 2, 0 -_0806F9D4: .4byte 0x020234cc +_0806F9D4: .4byte gStringVar4 _0806F9D8: .4byte gOtherText_RegainedHealth _0806F9DC: .4byte 0x0201c000 _0806F9E0: .4byte gUnknown_083769A8 _0806F9E4: .4byte 0xfffff261 -_0806F9E8: .4byte 0x03004b20 +_0806F9E8: .4byte gTasks _0806F9EC: .4byte sub_806FB44 _0806F9F0: movs r2, 0x80 @@ -15976,10 +15976,10 @@ sub_806FA18: @ 806FA18 .align 2, 0 _0806FAC4: .4byte 0x0201b000 _0806FAC8: .4byte 0x00000282 -_0806FACC: .4byte 0x03004b20 +_0806FACC: .4byte gTasks _0806FAD0: .4byte 0xfffe6000 -_0806FAD4: .4byte 0x02020004 -_0806FAD8: .4byte 0x03004360 +_0806FAD4: .4byte gSprites +_0806FAD8: .4byte gPlayerParty _0806FADC: .4byte 0xffff8000 _0806FAE0: .4byte sub_806F8AC _0806FAE4: @@ -16029,8 +16029,8 @@ _0806FB32: pop {r0} bx r0 .align 2, 0 -_0806FB38: .4byte 0x0202e8f6 -_0806FB3C: .4byte 0x03004b20 +_0806FB38: .4byte gUnknown_0202E8F6 +_0806FB3C: .4byte gTasks _0806FB40: .4byte 0x0201c000 thumb_func_end sub_806FB0C @@ -16059,8 +16059,8 @@ _0806FB6A: pop {r0} bx r0 .align 2, 0 -_0806FB70: .4byte 0x0202e8f6 -_0806FB74: .4byte 0x03004b20 +_0806FB70: .4byte gUnknown_0202E8F6 +_0806FB74: .4byte gTasks _0806FB78: .4byte 0x0201c000 thumb_func_end sub_806FB44 @@ -16074,7 +16074,7 @@ sub_806FB7C: @ 806FB7C ldr r0, _0806FB8C b _0806FB9A .align 2, 0 -_0806FB8C: .4byte 0x02028daa +_0806FB8C: .4byte gUnknown_02028DAA _0806FB90: ldr r1, _0806FBA8 subs r0, 0xD @@ -16161,7 +16161,7 @@ _0806FC40: bl StringExpandPlaceholders b _0806FD84 .align 2, 0 -_0806FC4C: .4byte 0x020234cc +_0806FC4C: .4byte gStringVar4 _0806FC50: .4byte gOtherText_CuredPoisoning _0806FC54: ldr r0, _0806FC60 @@ -16169,7 +16169,7 @@ _0806FC54: bl StringExpandPlaceholders b _0806FD84 .align 2, 0 -_0806FC60: .4byte 0x020234cc +_0806FC60: .4byte gStringVar4 _0806FC64: .4byte gOtherText_WokeUp _0806FC68: ldr r0, _0806FC74 @@ -16177,7 +16177,7 @@ _0806FC68: bl StringExpandPlaceholders b _0806FD84 .align 2, 0 -_0806FC74: .4byte 0x020234cc +_0806FC74: .4byte gStringVar4 _0806FC78: .4byte gOtherText_BurnHealed _0806FC7C: ldr r0, _0806FC88 @@ -16185,7 +16185,7 @@ _0806FC7C: bl StringExpandPlaceholders b _0806FD84 .align 2, 0 -_0806FC88: .4byte 0x020234cc +_0806FC88: .4byte gStringVar4 _0806FC8C: .4byte gOtherText_ThawedOut _0806FC90: ldr r0, _0806FC9C @@ -16193,7 +16193,7 @@ _0806FC90: bl StringExpandPlaceholders b _0806FD84 .align 2, 0 -_0806FC9C: .4byte 0x020234cc +_0806FC9C: .4byte gStringVar4 _0806FCA0: .4byte gOtherText_CuredParalysis _0806FCA4: ldr r0, _0806FCB0 @@ -16201,7 +16201,7 @@ _0806FCA4: bl StringExpandPlaceholders b _0806FD84 .align 2, 0 -_0806FCB0: .4byte 0x020234cc +_0806FCB0: .4byte gStringVar4 _0806FCB4: .4byte gOtherText_SnapConfusion _0806FCB8: ldr r0, _0806FCC4 @@ -16209,7 +16209,7 @@ _0806FCB8: bl StringExpandPlaceholders b _0806FD84 .align 2, 0 -_0806FCC4: .4byte 0x020234cc +_0806FCC4: .4byte gStringVar4 _0806FCC8: .4byte gOtherText_GotOverLove _0806FCCC: ldr r0, _0806FCD8 @@ -16217,42 +16217,42 @@ _0806FCCC: bl StringExpandPlaceholders b _0806FD84 .align 2, 0 -_0806FCD8: .4byte 0x020234cc +_0806FCD8: .4byte gStringVar4 _0806FCDC: .4byte gOtherText_BecameHealthy _0806FCE0: ldr r0, _0806FCE8 ldr r1, _0806FCEC b _0806FD34 .align 2, 0 -_0806FCE8: .4byte 0x020232cc +_0806FCE8: .4byte gStringVar2 _0806FCEC: .4byte gOtherText_Hp2 _0806FCF0: ldr r0, _0806FCF8 ldr r1, _0806FCFC b _0806FD34 .align 2, 0 -_0806FCF8: .4byte 0x020232cc +_0806FCF8: .4byte gStringVar2 _0806FCFC: .4byte gOtherText_Attack _0806FD00: ldr r0, _0806FD08 ldr r1, _0806FD0C b _0806FD34 .align 2, 0 -_0806FD08: .4byte 0x020232cc +_0806FD08: .4byte gStringVar2 _0806FD0C: .4byte gOtherText_Defense _0806FD10: ldr r0, _0806FD18 ldr r1, _0806FD1C b _0806FD34 .align 2, 0 -_0806FD18: .4byte 0x020232cc +_0806FD18: .4byte gStringVar2 _0806FD1C: .4byte gOtherText_Speed _0806FD20: ldr r0, _0806FD28 ldr r1, _0806FD2C b _0806FD34 .align 2, 0 -_0806FD28: .4byte 0x020232cc +_0806FD28: .4byte gStringVar2 _0806FD2C: .4byte gOtherText_SpAtk2 _0806FD30: ldr r0, _0806FD44 @@ -16264,9 +16264,9 @@ _0806FD34: bl StringExpandPlaceholders b _0806FD84 .align 2, 0 -_0806FD44: .4byte 0x020232cc +_0806FD44: .4byte gStringVar2 _0806FD48: .4byte gOtherText_SpDef2 -_0806FD4C: .4byte 0x020234cc +_0806FD4C: .4byte gStringVar4 _0806FD50: .4byte gOtherText_WasRaised _0806FD54: ldr r0, _0806FD60 @@ -16274,7 +16274,7 @@ _0806FD54: bl StringExpandPlaceholders b _0806FD84 .align 2, 0 -_0806FD60: .4byte 0x020234cc +_0806FD60: .4byte gStringVar4 _0806FD64: .4byte gOtherText_PPIncreased _0806FD68: ldr r0, _0806FD74 @@ -16282,7 +16282,7 @@ _0806FD68: bl StringExpandPlaceholders b _0806FD84 .align 2, 0 -_0806FD74: .4byte 0x020234cc +_0806FD74: .4byte gStringVar4 _0806FD78: .4byte gOtherText_PPRestored _0806FD7C: ldr r0, _0806FD88 @@ -16292,7 +16292,7 @@ _0806FD84: pop {r0} bx r0 .align 2, 0 -_0806FD88: .4byte 0x020234cc +_0806FD88: .4byte gStringVar4 _0806FD8C: .4byte gOtherText_WontHaveAnyEffect thumb_func_end GetMedicineItemEffectMessage @@ -16350,9 +16350,9 @@ ExecuteTableBasedItemEffect__: @ 806FDC4 adds r2, r3, 0 b _0806FE16 .align 2, 0 -_0806FDF0: .4byte 0x03001770 +_0806FDF0: .4byte gMain _0806FDF4: .4byte 0x0000043d -_0806FDF8: .4byte 0x03004360 +_0806FDF8: .4byte gPlayerParty _0806FDFC: movs r0, 0x64 adds r4, r3, 0 @@ -16375,7 +16375,7 @@ _0806FE16: pop {r1} bx r1 .align 2, 0 -_0806FE28: .4byte 0x03004360 +_0806FE28: .4byte gPlayerParty thumb_func_end ExecuteTableBasedItemEffect__ thumb_func_start sub_806FE2C @@ -16459,7 +16459,7 @@ _0806FEC2: lsrs r0, 24 b _0806FEE6 .align 2, 0 -_0806FED4: .4byte 0x03004b20 +_0806FED4: .4byte gTasks _0806FED8: .4byte TaskDummy _0806FEDC: .4byte 0x0201c000 _0806FEE0: @@ -16482,9 +16482,9 @@ _0806FEE6: adds r0, r3, r7 b _08070002 .align 2, 0 -_0806FF08: .4byte 0x0202e8f4 +_0806FF08: .4byte gUnknown_0202E8F4 _0806FF0C: .4byte gOtherText_WontHaveAnyEffect -_0806FF10: .4byte 0x03004b20 +_0806FF10: .4byte gTasks _0806FF14: ldr r1, _0806FF30 movs r0, 0x1 @@ -16498,7 +16498,7 @@ _0806FF14: bl audio_play b _0806FF3A .align 2, 0 -_0806FF30: .4byte 0x0202e8f4 +_0806FF30: .4byte gUnknown_0202E8F4 _0806FF34: movs r0, 0x75 bl audio_play @@ -16543,7 +16543,7 @@ _0806FF56: b _0806FF98 .align 2, 0 _0806FF88: .4byte 0x0201c000 -_0806FF8C: .4byte 0x03004b20 +_0806FF8C: .4byte gTasks _0806FF90: .4byte 0xffff8000 _0806FF94: movs r0, 0 @@ -16566,7 +16566,7 @@ _0806FF98: b _0807000A .align 2, 0 _0806FFB8: .4byte 0x0201c000 -_0806FFBC: .4byte 0x03004b20 +_0806FFBC: .4byte gTasks _0806FFC0: .4byte sub_806F8AC _0806FFC4: .4byte 0xfffff282 _0806FFC8: @@ -16609,9 +16609,9 @@ _0807000A: bx r0 .align 2, 0 _08070018: .4byte 0x0201c000 -_0807001C: .4byte 0x020231cc -_08070020: .4byte 0x020234cc -_08070024: .4byte 0x03004b20 +_0807001C: .4byte gStringVar1 +_08070020: .4byte gStringVar4 +_08070024: .4byte gTasks _08070028: .4byte sub_806FB0C thumb_func_end sub_806FE2C @@ -16740,10 +16740,10 @@ _08070118: str r0, [r7] b _080701B0 .align 2, 0 -_08070120: .4byte 0x03004b20 +_08070120: .4byte gTasks _08070124: .4byte TaskDummy _08070128: .4byte 0x0201c000 -_0807012C: .4byte 0x03004360 +_0807012C: .4byte gPlayerParty _08070130: .4byte sub_80701DC _08070134: ldr r1, _080701C0 @@ -16812,7 +16812,7 @@ _080701B0: pop {r0} bx r0 .align 2, 0 -_080701C0: .4byte 0x0202e8f4 +_080701C0: .4byte gUnknown_0202E8F4 _080701C4: .4byte gUnknown_083769A8 _080701C8: .4byte 0xfffff261 _080701CC: .4byte 0xfffff27e @@ -16904,13 +16904,13 @@ _0807023E: .align 2, 0 _08070280: .4byte 0x0201b000 _08070284: .4byte 0x0000027e -_08070288: .4byte 0x03004360 +_08070288: .4byte gPlayerParty _0807028C: .4byte gUnknown_083769A8 _08070290: .4byte 0x00000261 _08070294: .4byte 0x0201c000 -_08070298: .4byte 0x0202e8f4 +_08070298: .4byte gUnknown_0202E8F4 _0807029C: .4byte 0xfffff280 -_080702A0: .4byte 0x03004b20 +_080702A0: .4byte gTasks _080702A4: .4byte TaskDummy _080702A8: .4byte gOtherText_WontHaveAnyEffect _080702AC: .4byte sub_806FB0C @@ -16931,8 +16931,8 @@ _080702C6: strb r0, [r1] b _080702DE .align 2, 0 -_080702D0: .4byte 0x03004b20 -_080702D4: .4byte 0x03005ce0 +_080702D0: .4byte gTasks +_080702D4: .4byte gUnknown_03005CE0 _080702D8: adds r0, r5, 0 bl sub_8070088 @@ -17010,7 +17010,7 @@ _08070340: pop {r0} bx r0 .align 2, 0 -_0807036C: .4byte 0x03004360 +_0807036C: .4byte gPlayerParty _08070370: .4byte gMoveNames thumb_func_end sub_80702E4 @@ -17033,7 +17033,7 @@ sub_8070374: @ 8070374 bl MoveMenuCursor b _080703E4 .align 2, 0 -_08070398: .4byte 0x03001770 +_08070398: .4byte gMain _0807039C: movs r0, 0x80 ands r0, r1 @@ -17091,7 +17091,7 @@ dp05_ether: @ 80703F0 ldr r0, _0807040C b _0807041C .align 2, 0 -_0807040C: .4byte 0x02028daa +_0807040C: .4byte gUnknown_02028DAA _08070410: ldr r1, _08070464 adds r0, r5, 0 @@ -17134,7 +17134,7 @@ _0807041C: b _08070498 .align 2, 0 _08070464: .4byte gItemEffectTable -_08070468: .4byte 0x03004b20 +_08070468: .4byte gTasks _0807046C: .4byte TaskDummy _08070470: movs r0, 0x5 @@ -17164,7 +17164,7 @@ _08070498: .align 2, 0 _080704A4: .4byte 0x0201c000 _080704A8: .4byte sub_8070374 -_080704AC: .4byte 0x03001770 +_080704AC: .4byte gMain thumb_func_end dp05_ether thumb_func_start ether_effect_related_2 @@ -17195,7 +17195,7 @@ ether_effect_related_2: @ 80704B0 pop {r0} bx r0 .align 2, 0 -_080704EC: .4byte 0x03004b20 +_080704EC: .4byte gTasks thumb_func_end ether_effect_related_2 thumb_func_start sub_80704F0 @@ -17227,9 +17227,9 @@ sub_80704F0: @ 80704F0 ldr r1, _08070538 b _0807054C .align 2, 0 -_08070528: .4byte 0x03001770 +_08070528: .4byte gMain _0807052C: .4byte 0x0000043d -_08070530: .4byte 0x03004b20 +_08070530: .4byte gTasks _08070534: .4byte 0x0201c000 _08070538: .4byte sub_8095118 _0807053C: @@ -17252,7 +17252,7 @@ _0807054C: pop {r0} bx r0 .align 2, 0 -_08070564: .4byte 0x03004b20 +_08070564: .4byte gTasks _08070568: .4byte 0x0201c000 _0807056C: .4byte sub_808B0C0 thumb_func_end sub_80704F0 @@ -17286,8 +17286,8 @@ ether_effect_related: @ 8070570 b _080705F8 .align 2, 0 _080705A8: .4byte 0x0201c000 -_080705AC: .4byte 0x03004b20 -_080705B0: .4byte 0x0202e8f4 +_080705AC: .4byte gTasks +_080705B0: .4byte gUnknown_0202E8F4 _080705B4: .4byte gOtherText_WontHaveAnyEffect _080705B8: ldr r1, _0807060C @@ -17328,11 +17328,11 @@ _080705F8: pop {r0} bx r0 .align 2, 0 -_0807060C: .4byte 0x0202e8f4 -_08070610: .4byte 0x020231cc +_0807060C: .4byte gUnknown_0202E8F4 +_08070610: .4byte gStringVar1 _08070614: .4byte gMoveNames -_08070618: .4byte 0x020234cc -_0807061C: .4byte 0x03004b20 +_08070618: .4byte gStringVar4 +_0807061C: .4byte gTasks _08070620: .4byte sub_806FB0C thumb_func_end ether_effect_related @@ -17369,11 +17369,11 @@ dp05_pp_up: @ 8070624 pop {r0} bx r0 .align 2, 0 -_0807066C: .4byte 0x03004b20 +_0807066C: .4byte gTasks _08070670: .4byte TaskDummy _08070674: .4byte 0x0201c000 _08070678: .4byte sub_8070374 -_0807067C: .4byte 0x03001770 +_0807067C: .4byte gMain thumb_func_end dp05_pp_up thumb_func_start sub_8070680 @@ -17424,7 +17424,7 @@ _080706B2: lsrs r0, 24 b _080706F6 .align 2, 0 -_080706E0: .4byte 0x03004b20 +_080706E0: .4byte gTasks _080706E4: .4byte TaskDummy _080706E8: .4byte 0x0201c000 _080706EC: .4byte 0xfffff264 @@ -17447,7 +17447,7 @@ _080706F6: bl CreateTask b _0807077C .align 2, 0 -_08070718: .4byte 0x0202e8f4 +_08070718: .4byte gUnknown_0202E8F4 _0807071C: .4byte gOtherText_WontHaveAnyEffect _08070720: .4byte sub_806FB0C _08070724: @@ -17491,11 +17491,11 @@ _0807077C: pop {r0} bx r0 .align 2, 0 -_08070784: .4byte 0x0202e8f4 +_08070784: .4byte gUnknown_0202E8F4 _08070788: .4byte 0x0201c000 -_0807078C: .4byte 0x020231cc -_08070790: .4byte 0x020232cc -_08070794: .4byte 0x020234cc +_0807078C: .4byte gStringVar1 +_08070790: .4byte gStringVar2 +_08070794: .4byte gStringVar4 _08070798: .4byte gOtherText_ElevatedTo _0807079C: .4byte sub_80707A0 thumb_func_end sub_8070680 @@ -17541,9 +17541,9 @@ _080707E8: pop {r0} bx r0 .align 2, 0 -_080707F0: .4byte 0x0202e8f6 -_080707F4: .4byte 0x03001770 -_080707F8: .4byte 0x03004b20 +_080707F0: .4byte gUnknown_0202E8F6 +_080707F4: .4byte gMain +_080707F8: .4byte gTasks _080707FC: .4byte sub_8070800 thumb_func_end sub_80707A0 @@ -17579,8 +17579,8 @@ _08070834: pop {r0} bx r0 .align 2, 0 -_0807083C: .4byte 0x03001770 -_08070840: .4byte 0x03004b20 +_0807083C: .4byte gMain +_08070840: .4byte gTasks _08070844: .4byte sub_8070AC8 thumb_func_end sub_8070800 @@ -17660,7 +17660,7 @@ _08070864: bl sub_80729D8 b _08070910 .align 2, 0 -_080708E4: .4byte 0x020231cc +_080708E4: .4byte gStringVar1 _080708E8: .4byte 0x0201c000 _080708EC: .4byte gUnknown_08376D1C _080708F0: .4byte 0x0201b264 @@ -17804,7 +17804,7 @@ _08070982: .align 2, 0 _08070A10: .4byte 0x0201c000 _08070A14: .4byte 0xfffff264 -_08070A18: .4byte 0x020231cc +_08070A18: .4byte gStringVar1 _08070A1C: .4byte gUnknown_08376D1C thumb_func_end sub_8070968 @@ -17932,7 +17932,7 @@ _08070AF4: beq _08070B40 b _08070BF4 .align 2, 0 -_08070B24: .4byte 0x03001770 +_08070B24: .4byte gMain _08070B28: .4byte 0x0201c000 _08070B2C: .4byte 0xfffff282 _08070B30: .4byte 0x0000fffe @@ -17964,7 +17964,7 @@ _08070B40: bl DestroyTask b _08070C2C .align 2, 0 -_08070B6C: .4byte 0x03005e94 +_08070B6C: .4byte gUnknown_03005E94 _08070B70: .4byte sub_80A53F8 _08070B74: adds r0, r6, 0 @@ -17999,13 +17999,13 @@ _08070B7C: ldr r1, _08070BD8 b _08070C2A .align 2, 0 -_08070BBC: .4byte 0x020231cc -_08070BC0: .4byte 0x020232cc -_08070BC4: .4byte 0x02024e82 +_08070BBC: .4byte gStringVar1 +_08070BC0: .4byte gStringVar2 +_08070BC4: .4byte word_2024E82 _08070BC8: .4byte gMoveNames -_08070BCC: .4byte 0x020234cc +_08070BCC: .4byte gStringVar4 _08070BD0: .4byte gOtherText_WantsToLearn -_08070BD4: .4byte 0x03004b20 +_08070BD4: .4byte gTasks _08070BD8: .4byte sub_806F358 _08070BDC: ldr r0, _08070BEC @@ -18017,7 +18017,7 @@ _08070BDC: str r0, [r1] b _08070C2C .align 2, 0 -_08070BEC: .4byte 0x03004b20 +_08070BEC: .4byte gTasks _08070BF0: .4byte sub_8070C54 _08070BF4: ldr r0, _08070C34 @@ -18051,12 +18051,12 @@ _08070C2C: bx r0 .align 2, 0 _08070C34: .4byte 0x0201c000 -_08070C38: .4byte 0x020231cc -_08070C3C: .4byte 0x020232cc +_08070C38: .4byte gStringVar1 +_08070C3C: .4byte gStringVar2 _08070C40: .4byte gMoveNames -_08070C44: .4byte 0x020234cc +_08070C44: .4byte gStringVar4 _08070C48: .4byte gOtherText_LearnedMove -_08070C4C: .4byte 0x03004b20 +_08070C4C: .4byte gTasks _08070C50: .4byte sub_806F254 thumb_func_end sub_8070AC8 @@ -18110,7 +18110,7 @@ _08070C8C: bl DestroyTask b _08070D68 .align 2, 0 -_08070CB8: .4byte 0x03005e94 +_08070CB8: .4byte gUnknown_03005E94 _08070CBC: .4byte sub_80A53F8 _08070CC0: adds r0, r6, 0 @@ -18145,13 +18145,13 @@ _08070CC8: ldr r1, _08070D24 b _08070D66 .align 2, 0 -_08070D08: .4byte 0x020231cc -_08070D0C: .4byte 0x020232cc -_08070D10: .4byte 0x02024e82 +_08070D08: .4byte gStringVar1 +_08070D0C: .4byte gStringVar2 +_08070D10: .4byte word_2024E82 _08070D14: .4byte gMoveNames -_08070D18: .4byte 0x020234cc +_08070D18: .4byte gStringVar4 _08070D1C: .4byte gOtherText_WantsToLearn -_08070D20: .4byte 0x03004b20 +_08070D20: .4byte gTasks _08070D24: .4byte sub_806F358 _08070D28: adds r0, r6, 0 @@ -18189,12 +18189,12 @@ _08070D68: bx r0 .align 2, 0 _08070D70: .4byte 0x0201c000 -_08070D74: .4byte 0x020231cc -_08070D78: .4byte 0x020232cc +_08070D74: .4byte gStringVar1 +_08070D78: .4byte gStringVar2 _08070D7C: .4byte gMoveNames -_08070D80: .4byte 0x020234cc +_08070D80: .4byte gStringVar4 _08070D84: .4byte gOtherText_LearnedMove -_08070D88: .4byte 0x03004b20 +_08070D88: .4byte gTasks _08070D8C: .4byte sub_806F254 thumb_func_end sub_8070C54 @@ -18217,7 +18217,7 @@ sub_8070D90: @ 8070D90 pop {r0} bx r0 .align 2, 0 -_08070DB4: .4byte 0x03004b20 +_08070DB4: .4byte gTasks _08070DB8: .4byte 0x0201c000 thumb_func_end sub_8070D90 @@ -18265,12 +18265,12 @@ sub_8070DBC: @ 8070DBC bl CreateTask b _08070E40 .align 2, 0 -_08070E18: .4byte 0x03004b20 +_08070E18: .4byte gTasks _08070E1C: .4byte TaskDummy -_08070E20: .4byte 0x03005e94 +_08070E20: .4byte gUnknown_03005E94 _08070E24: .4byte sub_80A53F8 _08070E28: .4byte 0x0201c000 -_08070E2C: .4byte 0x0202e8f4 +_08070E2C: .4byte gUnknown_0202E8F4 _08070E30: .4byte gOtherText_WontHaveAnyEffect _08070E34: .4byte sub_806FB0C _08070E38: @@ -18293,7 +18293,7 @@ sub_8070E48: @ 8070E48 ldr r4, _08070E58 b _08070E66 .align 2, 0 -_08070E58: .4byte 0x02028daa +_08070E58: .4byte gUnknown_02028DAA _08070E5C: ldr r1, _08070E8C subs r0, 0xD @@ -18506,7 +18506,7 @@ sub_8070FB4: @ 8070FB4 bl sub_80710A0 b _08070FE2 .align 2, 0 -_08070FCC: .4byte 0x0202e8fd +_08070FCC: .4byte gUnknown_0202E8FD _08070FD0: bl GetSafariZoneFlag cmp r0, 0x1 @@ -18532,8 +18532,8 @@ AddStartMenuAction: @ 8070FE8 pop {r0} bx r0 .align 2, 0 -_08070FFC: .4byte 0x0202e8fe -_08071000: .4byte 0x0202e8fd +_08070FFC: .4byte gUnknown_0202E8FE +_08071000: .4byte gUnknown_0202E8FD thumb_func_end AddStartMenuAction thumb_func_start BuildStartMenuActions_Normal @@ -18654,8 +18654,8 @@ sub_80710DC: @ 80710DC pop {r0} bx r0 .align 2, 0 -_08071108: .4byte 0x020231cc -_0807110C: .4byte 0x02038808 +_08071108: .4byte gStringVar1 +_0807110C: .4byte gUnknown_02038808 _08071110: .4byte gOtherText_SafariStock thumb_func_end sub_80710DC @@ -18700,8 +18700,8 @@ _0807112E: b _08071170 .align 2, 0 _08071160: .4byte gUnknown_08376D24 -_08071164: .4byte 0x0202e8fe -_08071168: .4byte 0x0202e8fd +_08071164: .4byte gUnknown_0202E8FE +_08071168: .4byte gUnknown_0202E8FD _0807116C: strh r4, [r7] movs r0, 0x1 @@ -18757,7 +18757,7 @@ _080711BA: strh r0, [r5] b _080711F6 .align 2, 0 -_080711D8: .4byte 0x0202e8fd +_080711D8: .4byte gUnknown_0202E8FD _080711DC: bl GetSafariZoneFlag cmp r0, 0 @@ -18791,8 +18791,8 @@ _080711FE: movs r0, 0x1 b _08071226 .align 2, 0 -_0807121C: .4byte 0x0202e8fd -_08071220: .4byte 0x0202e8fc +_0807121C: .4byte gUnknown_0202E8FD +_08071220: .4byte gUnknown_0202E8FC _08071224: movs r0, 0 _08071226: @@ -18848,7 +18848,7 @@ _0807127A: pop {r0} bx r0 .align 2, 0 -_08071280: .4byte 0x03004b28 +_08071280: .4byte gUnknown_03004B28 thumb_func_end task50_startmenu thumb_func_start sub_8071284 @@ -18892,7 +18892,7 @@ sub_80712B4: @ 80712B4 beq _080712F0 b _08071306 .align 2, 0 -_080712D4: .4byte 0x03004b20 +_080712D4: .4byte gTasks _080712D8: ldr r1, _080712E8 ldr r0, _080712EC @@ -18902,7 +18902,7 @@ _080712D8: strh r0, [r2, 0x8] b _08071306 .align 2, 0 -_080712E8: .4byte 0x03004ae8 +_080712E8: .4byte gUnknown_03004AE8 _080712EC: .4byte sub_8071338 _080712F0: ldr r0, _0807130C @@ -18919,7 +18919,7 @@ _08071306: pop {r0} bx r0 .align 2, 0 -_0807130C: .4byte 0x03004ae8 +_0807130C: .4byte gUnknown_03004AE8 thumb_func_end sub_80712B4 thumb_func_start sub_8071310 @@ -19022,12 +19022,12 @@ _080713A8: bl fade_screen b _08071408 .align 2, 0 -_080713DC: .4byte 0x03001770 -_080713E0: .4byte 0x0202e8fc +_080713DC: .4byte gMain +_080713E0: .4byte gUnknown_0202E8FC _080713E4: .4byte gUnknown_08376D24 -_080713E8: .4byte 0x0202e8fe +_080713E8: .4byte gUnknown_0202E8FE _080713EC: .4byte StartMenu_Pokedex -_080713F0: .4byte 0x03004ae8 +_080713F0: .4byte gUnknown_03004AE8 _080713F4: .4byte sub_80714FC _080713F8: .4byte sub_8071554 _080713FC: .4byte sub_8071560 @@ -19060,7 +19060,7 @@ StartMenu_Pokedex: @ 8071418 movs r0, 0 b _08071442 .align 2, 0 -_0807142C: .4byte 0x0202f388 +_0807142C: .4byte gPaletteFade _08071430: movs r0, 0x29 bl sav12_xor_increment @@ -19087,7 +19087,7 @@ sub_807144C: @ 807144C movs r0, 0 b _08071470 .align 2, 0 -_08071460: .4byte 0x0202f388 +_08071460: .4byte gPaletteFade _08071464: bl play_some_sound ldr r0, _08071474 @@ -19112,7 +19112,7 @@ sub_8071478: @ 8071478 movs r0, 0 b _0807149C .align 2, 0 -_0807148C: .4byte 0x0202f388 +_0807148C: .4byte gPaletteFade _08071490: bl play_some_sound ldr r0, _080714A0 @@ -19137,7 +19137,7 @@ sub_80714A4: @ 80714A4 movs r0, 0 b _080714C8 .align 2, 0 -_080714B8: .4byte 0x0202f388 +_080714B8: .4byte gPaletteFade _080714BC: bl play_some_sound ldr r0, _080714CC @@ -19162,7 +19162,7 @@ sub_80714D0: @ 80714D0 movs r0, 0 b _080714F4 .align 2, 0 -_080714E4: .4byte 0x0202f388 +_080714E4: .4byte gPaletteFade _080714E8: bl play_some_sound ldr r0, _080714F8 @@ -19186,7 +19186,7 @@ sub_80714FC: @ 80714FC pop {r1} bx r1 .align 2, 0 -_08071510: .4byte 0x03004ae8 +_08071510: .4byte gUnknown_03004AE8 _08071514: .4byte sub_80715A4 thumb_func_end sub_80714FC @@ -19202,7 +19202,7 @@ sub_8071518: @ 8071518 movs r0, 0 b _08071542 .align 2, 0 -_0807152C: .4byte 0x0202f388 +_0807152C: .4byte gPaletteFade _08071530: bl play_some_sound ldr r0, _08071548 @@ -19216,7 +19216,7 @@ _08071542: bx r1 .align 2, 0 _08071548: .4byte CB2_InitOptionMenu -_0807154C: .4byte 0x03001770 +_0807154C: .4byte gMain _08071550: .4byte sub_805469C thumb_func_end sub_8071518 @@ -19251,7 +19251,7 @@ sub_8071570: @ 8071570 movs r0, 0 b _08071598 .align 2, 0 -_08071584: .4byte 0x0202f388 +_08071584: .4byte gPaletteFade _08071588: bl play_some_sound ldr r0, _0807159C @@ -19263,7 +19263,7 @@ _08071598: pop {r1} bx r1 .align 2, 0 -_0807159C: .4byte 0x03004860 +_0807159C: .4byte gUnknown_03004860 _080715A0: .4byte sub_805469C thumb_func_end sub_8071570 @@ -19278,7 +19278,7 @@ sub_80715A4: @ 80715A4 pop {r1} bx r1 .align 2, 0 -_080715B8: .4byte 0x03004ae8 +_080715B8: .4byte gUnknown_03004AE8 _080715BC: .4byte sub_80715C0 thumb_func_end sub_80715A4 @@ -19305,7 +19305,7 @@ _080715DC: str r0, [r1] b _08071604 .align 2, 0 -_080715EC: .4byte 0x03004ae8 +_080715EC: .4byte gUnknown_03004AE8 _080715F0: .4byte sub_8071338 _080715F4: bl MenuZeroFillScreen @@ -19333,9 +19333,9 @@ sub_807160C: @ 807160C pop {r0} bx r0 .align 2, 0 -_08071624: .4byte 0x030006a8 +_08071624: .4byte gUnknown_030006A8 _08071628: .4byte sub_8071794 -_0807162C: .4byte 0x030006ad +_0807162C: .4byte gUnknown_030006AD thumb_func_end sub_807160C thumb_func_start sub_8071630 @@ -19352,7 +19352,7 @@ sub_8071630: @ 8071630 movs r0, 0 b _0807165E .align 2, 0 -_08071648: .4byte 0x030006ad +_08071648: .4byte gUnknown_030006AD _0807164C: ldr r1, _08071664 movs r0, 0 @@ -19366,8 +19366,8 @@ _0807165E: pop {r1} bx r1 .align 2, 0 -_08071664: .4byte 0x030006ad -_08071668: .4byte 0x030006a8 +_08071664: .4byte gUnknown_030006AD +_08071668: .4byte gUnknown_030006A8 thumb_func_end sub_8071630 thumb_func_start sub_807166C @@ -19404,9 +19404,9 @@ sub_8071684: @ 8071684 pop {r0} bx r0 .align 2, 0 -_080716B0: .4byte 0x020234cc -_080716B4: .4byte 0x030006ad -_080716B8: .4byte 0x030006a8 +_080716B0: .4byte gStringVar4 +_080716B4: .4byte gUnknown_030006AD +_080716B8: .4byte gUnknown_030006A8 thumb_func_end sub_8071684 thumb_func_start task50_save_game @@ -19432,7 +19432,7 @@ _080716D8: strh r0, [r1] b _080716EC .align 2, 0 -_080716E4: .4byte 0x0202e8dc +_080716E4: .4byte gScriptResult _080716E8: ldr r0, _080716FC strh r1, [r0] @@ -19445,7 +19445,7 @@ _080716F6: pop {r0} bx r0 .align 2, 0 -_080716FC: .4byte 0x0202e8dc +_080716FC: .4byte gScriptResult thumb_func_end task50_save_game thumb_func_start sub_8071700 @@ -19477,7 +19477,7 @@ sub_8071724: @ 8071724 strb r0, [r1] bx lr .align 2, 0 -_0807172C: .4byte 0x030006ac +_0807172C: .4byte gUnknown_030006AC thumb_func_end sub_8071724 thumb_func_start sub_8071730 @@ -19499,8 +19499,8 @@ sub_8071730: @ 8071730 movs r0, 0 b _08071760 .align 2, 0 -_08071750: .4byte 0x030006ac -_08071754: .4byte 0x03001770 +_08071750: .4byte gUnknown_030006AC +_08071754: .4byte gMain _08071758: movs r0, 0x5 bl audio_play @@ -19527,8 +19527,8 @@ sub_8071764: @ 8071764 movs r0, 0x1 b _0807178E .align 2, 0 -_08071780: .4byte 0x030006ac -_08071784: .4byte 0x03001770 +_08071780: .4byte gUnknown_030006AC +_08071784: .4byte gMain _08071788: subs r0, 0x1 strb r0, [r1] @@ -19571,7 +19571,7 @@ sub_80717B8: @ 80717B8 pop {r1} bx r1 .align 2, 0 -_080717D0: .4byte 0x030006a8 +_080717D0: .4byte gUnknown_030006A8 _080717D4: .4byte sub_80717D8 thumb_func_end sub_80717B8 @@ -19613,9 +19613,9 @@ _08071812: str r0, [r1] b _08071848 .align 2, 0 -_0807181C: .4byte 0x03005eb8 -_08071820: .4byte 0x020297ec -_08071824: .4byte 0x030006a8 +_0807181C: .4byte gSaveFileStatus +_08071820: .4byte gUnknown_020297EC +_08071824: .4byte gUnknown_030006A8 _08071828: .4byte sub_8071850 _0807182C: ldr r1, _08071834 @@ -19623,7 +19623,7 @@ _0807182C: str r0, [r1] b _08071848 .align 2, 0 -_08071834: .4byte 0x030006a8 +_08071834: .4byte gUnknown_030006A8 _08071838: .4byte sub_80718E8 _0807183C: bl sub_8071710 @@ -19654,7 +19654,7 @@ _0807185E: pop {r1} bx r1 .align 2, 0 -_0807186C: .4byte 0x020297ec +_0807186C: .4byte gUnknown_020297EC _08071870: .4byte gUnknown_081C6CA6 _08071874: .4byte gUnknown_081C6D26 _08071878: .4byte sub_807187C @@ -19674,7 +19674,7 @@ sub_807187C: @ 807187C pop {r1} bx r1 .align 2, 0 -_08071894: .4byte 0x030006a8 +_08071894: .4byte gUnknown_030006A8 _08071898: .4byte sub_807189C thumb_func_end sub_807187C @@ -19704,7 +19704,7 @@ _080718BE: str r0, [r1] b _080718E0 .align 2, 0 -_080718CC: .4byte 0x030006a8 +_080718CC: .4byte gUnknown_030006A8 _080718D0: .4byte sub_80718E8 _080718D4: bl sub_8071710 @@ -19749,7 +19749,7 @@ sub_8071900: @ 8071900 strb r0, [r4] b _0807192E .align 2, 0 -_08071920: .4byte 0x020297ec +_08071920: .4byte gUnknown_020297EC _08071924: movs r0, 0 bl sub_8125D44 @@ -19797,7 +19797,7 @@ _08071978: pop {r1} bx r1 .align 2, 0 -_08071980: .4byte 0x030006a8 +_08071980: .4byte gUnknown_030006A8 _08071984: .4byte sub_8071988 thumb_func_end sub_8071960 @@ -19839,7 +19839,7 @@ _080719C4: pop {r1} bx r1 .align 2, 0 -_080719CC: .4byte 0x030006a8 +_080719CC: .4byte gUnknown_030006A8 _080719D0: .4byte sub_80719D4 thumb_func_end sub_80719AC @@ -20027,7 +20027,7 @@ _08071B42: pop {r0} bx r0 .align 2, 0 -_08071B48: .4byte 0x03001bac +_08071B48: .4byte gUnknown_03001BAC _08071B4C: .4byte sub_8071B64 _08071B50: .4byte sub_8071B54 thumb_func_end sub_8071B28 @@ -20068,8 +20068,8 @@ sub_8071B64: @ 8071B64 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08071B94: .4byte 0x03004b28 -_08071B98: .4byte 0x0202f388 +_08071B94: .4byte gUnknown_03004B28 +_08071B98: .4byte gPaletteFade _08071B9C: .4byte _08071BA0 .align 2, 0 _08071BA0: @@ -20130,7 +20130,7 @@ _08071C14: pop {r0} bx r0 .align 2, 0 -_08071C1C: .4byte 0x03001770 +_08071C1C: .4byte gMain thumb_func_end sub_8071B64 thumb_func_start sub_8071C20 |