diff options
Diffstat (limited to 'asm/fldeff_softboiled.s')
| -rw-r--r-- | asm/fldeff_softboiled.s | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s index 112659afd..857686ab3 100644 --- a/asm/fldeff_softboiled.s +++ b/asm/fldeff_softboiled.s @@ -13,7 +13,7 @@ hm_prepare_dive_probably: @ 80E5684 lsrs r0, 24 movs r6, 0x64 muls r0, r6 - ldr r4, _080E56D0 @ =gUnknown_2024284 + ldr r4, _080E56D0 @ =gPlayerParty adds r0, r4 movs r1, 0x3A bl GetMonData @@ -40,7 +40,7 @@ hm_prepare_dive_probably: @ 80E5684 movs r0, 0 b _080E56D6 .align 2, 0 -_080E56D0: .4byte gUnknown_2024284 +_080E56D0: .4byte gPlayerParty _080E56D4: movs r0, 0x1 _080E56D6: @@ -67,7 +67,7 @@ sub_80E56DC: @ 80E56DC bl sub_811F818 movs r0, 0x5 bl sub_8121D0C - ldr r1, _080E571C @ =gUnknown_3005090 + ldr r1, _080E571C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -79,7 +79,7 @@ sub_80E56DC: @ 80E56DC bx r0 .align 2, 0 _080E5718: .4byte gUnknown_203B0A0 -_080E571C: .4byte gUnknown_3005090 +_080E571C: .4byte gTasks _080E5720: .4byte sub_811FB28 thumb_func_end sub_80E56DC @@ -104,7 +104,7 @@ sub_80E5724: @ 80E5724 movs r0, 0 strb r0, [r1, 0xB] bl sub_8121D0C - ldr r1, _080E5760 @ =gUnknown_3005090 + ldr r1, _080E5760 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -114,14 +114,14 @@ sub_80E5724: @ 80E5724 b _080E57D4 .align 2, 0 _080E575C: .4byte gUnknown_203B0A0 -_080E5760: .4byte gUnknown_3005090 +_080E5760: .4byte gTasks _080E5764: .4byte sub_811FB28 _080E5768: movs r0, 0x64 mov r10, r0 mov r0, r10 muls r0, r5 - ldr r1, _080E57A0 @ =gUnknown_2024284 + ldr r1, _080E57A0 @ =gPlayerParty mov r9, r1 adds r6, r0, r1 adds r0, r6, 0 @@ -143,7 +143,7 @@ _080E5796: bl sub_80E5934 b _080E57D4 .align 2, 0 -_080E57A0: .4byte gUnknown_2024284 +_080E57A0: .4byte gPlayerParty _080E57A4: movs r0, 0x1 bl PlaySE @@ -192,7 +192,7 @@ sub_80E57E8: @ 80E57E8 ldrsb r1, [r5, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _080E5834 @ =gUnknown_2024284 + ldr r1, _080E5834 @ =gPlayerParty adds r0, r1 movs r1, 0x3A bl GetMonData @@ -213,7 +213,7 @@ sub_80E57E8: @ 80E57E8 bx r0 .align 2, 0 _080E5830: .4byte gUnknown_203B0A0 -_080E5834: .4byte gUnknown_2024284 +_080E5834: .4byte gPlayerParty _080E5838: .4byte sub_80E583C thumb_func_end sub_80E57E8 @@ -228,7 +228,7 @@ sub_80E583C: @ 80E583C ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _080E5888 @ =gUnknown_2024284 + ldr r1, _080E5888 @ =gPlayerParty adds r0, r1 ldr r1, _080E588C @ =gStringVar1 bl GetMonNickname @@ -241,7 +241,7 @@ sub_80E583C: @ 80E583C bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _080E5898 @ =gUnknown_3005090 + ldr r1, _080E5898 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -253,11 +253,11 @@ sub_80E583C: @ 80E583C bx r0 .align 2, 0 _080E5884: .4byte gUnknown_203B0A0 -_080E5888: .4byte gUnknown_2024284 +_080E5888: .4byte gPlayerParty _080E588C: .4byte gStringVar1 _080E5890: .4byte gStringVar4 _080E5894: .4byte gUnknown_8416F27 -_080E5898: .4byte gUnknown_3005090 +_080E5898: .4byte gTasks _080E589C: .4byte sub_80E58A0 thumb_func_end sub_80E583C @@ -289,7 +289,7 @@ sub_80E58A0: @ 80E58A0 bl ClearWindowTilemap movs r0, 0 bl sub_8121D0C - ldr r1, _080E58F8 @ =gUnknown_3005090 + ldr r1, _080E58F8 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -302,7 +302,7 @@ _080E58EE: bx r0 .align 2, 0 _080E58F4: .4byte gUnknown_203B0A0 -_080E58F8: .4byte gUnknown_3005090 +_080E58F8: .4byte gTasks _080E58FC: .4byte sub_811FB28 thumb_func_end sub_80E58A0 @@ -318,7 +318,7 @@ sub_80E5900: @ 80E5900 beq _080E5926 movs r0, 0x5 bl sub_8121D0C - ldr r0, _080E592C @ =gUnknown_3005090 + ldr r0, _080E592C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -330,7 +330,7 @@ _080E5926: pop {r0} bx r0 .align 2, 0 -_080E592C: .4byte gUnknown_3005090 +_080E592C: .4byte gTasks _080E5930: .4byte sub_811FB28 thumb_func_end sub_80E5900 @@ -347,7 +347,7 @@ sub_80E5934: @ 80E5934 bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _080E5968 @ =gUnknown_3005090 + ldr r1, _080E5968 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -359,7 +359,7 @@ sub_80E5934: @ 80E5934 bx r0 .align 2, 0 _080E5964: .4byte gUnknown_84169F8 -_080E5968: .4byte gUnknown_3005090 +_080E5968: .4byte gTasks _080E596C: .4byte sub_80E5900 thumb_func_end sub_80E5934 |