Merge pull request #115 from PikalaxALT/player_pc

Player PC

asm/field_effect.s

@@ -2014,7 +2014,7 @@ task00_8084310: @ 8084310
 	ldrsh r6, [r4, r0]
 	cmp r6, 0
 	bne _08084350
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08084376
@@ -2287,7 +2287,7 @@ _08084560: .4byte gSprites
 sub_8084564: @ 8084564
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08084578
@@ -4002,7 +4002,7 @@ sub_8085274: @ 8085274
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r6, r2, 0
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080852B4
@@ -5025,7 +5025,7 @@ _08085A50: .4byte gTasks
 sub_8085A54: @ 8085A54
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08085A78
@@ -5492,7 +5492,7 @@ _08085E08: .4byte gTasks
 sub_8085E0C: @ 8085E0C
 	push {r4-r6,lr}
 	adds r6, r0, 0
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08085E82

asm/field_weather.s

@@ -1889,8 +1889,8 @@ _0807AA68: .4byte 0x000006ca
 _0807AA6C: .4byte 0x000006cb
 	thumb_func_end FieldWeather_StartFadingOutCreditsMap
 
-	thumb_func_start sub_807AA70
-sub_807AA70: @ 807AA70
+	thumb_func_start field_weather_is_fade_finished
+field_weather_is_fade_finished: @ 807AA70
 	ldr r0, _0807AA84 @ =gUnknown_2037F34
 	ldr r1, _0807AA88 @ =0x000006c6
 	adds r0, r1
@@ -1904,7 +1904,7 @@ sub_807AA70: @ 807AA70
 	.align 2, 0
 _0807AA84: .4byte gUnknown_2037F34
 _0807AA88: .4byte 0x000006c6
-	thumb_func_end sub_807AA70
+	thumb_func_end field_weather_is_fade_finished
 
 	thumb_func_start sub_807AA8C
 sub_807AA8C: @ 807AA8C

asm/mail.s

@@ -204,7 +204,7 @@ _080BED8C:
 	movs r0, 0
 	movs r1, 0
 	bl SetGpuReg
-	ldr r0, _080BEDB0 @ =gUnknown_203AAC4
+	ldr r0, _080BEDB0 @ =gPlayerPcMenuManager
 	ldrb r0, [r0, 0x9]
 	cmp r0, 0
 	bne _080BEDB4
@@ -212,7 +212,7 @@ _080BED8C:
 	bl HelpSystem_SetSomeVariable2
 	b _080BF0F4
 	.align 2, 0
-_080BEDB0: .4byte gUnknown_203AAC4
+_080BEDB0: .4byte gPlayerPcMenuManager
 _080BEDB4:
 	movs r0, 0x1E
 	bl HelpSystem_SetSomeVariable2

asm/party_menu.s

@@ -11978,7 +11978,7 @@ task_launch_hm_phase_2: @ 81248C8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -17272,15 +17272,15 @@ _081273D0:
 	bx r1
 	thumb_func_end sub_81273AC
 
-	thumb_func_start sub_81273D8
-sub_81273D8: @ 81273D8
+	thumb_func_start PartyMenuInit_FromPlayerPc
+PartyMenuInit_FromPlayerPc: @ 81273D8
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x6
 	str r0, [sp]
 	ldr r0, _081273FC @ =sub_811FB28
 	str r0, [sp, 0x4]
-	ldr r0, _08127400 @ =sub_80EC500
+	ldr r0, _08127400 @ =CB2_PlayerPC_ReturnFromPartyMenu
 	str r0, [sp, 0x8]
 	movs r0, 0
 	movs r1, 0
@@ -17292,8 +17292,8 @@ sub_81273D8: @ 81273D8
 	bx r0
 	.align 2, 0
 _081273FC: .4byte sub_811FB28
-_08127400: .4byte sub_80EC500
-	thumb_func_end sub_81273D8
+_08127400: .4byte CB2_PlayerPC_ReturnFromPartyMenu
+	thumb_func_end PartyMenuInit_FromPlayerPc
 
 	thumb_func_start sub_8127404
 sub_8127404: @ 8127404
@@ -17311,7 +17311,7 @@ sub_8127404: @ 8127404
 	movs r0, 0
 	strb r0, [r1]
 	ldr r2, _0812745C @ =gSaveBlock1Ptr
-	ldr r0, _08127460 @ =gUnknown_203AAC4
+	ldr r0, _08127460 @ =gPlayerPcMenuManager
 	ldrh r1, [r0]
 	adds r1, 0x6
 	ldrh r0, [r0, 0x2]
@@ -17337,7 +17337,7 @@ _08127450: .4byte gUnknown_203B0A0
 _08127454: .4byte gPlayerParty
 _08127458: .4byte gUnknown_203B0C0
 _0812745C: .4byte gSaveBlock1Ptr
-_08127460: .4byte gUnknown_203AAC4
+_08127460: .4byte gPlayerPcMenuManager
 _08127464: .4byte 0x00002cd0
 _08127468: .4byte gUnknown_8416D17
 _0812746C:
@@ -19373,7 +19373,7 @@ task_hm_without_phase_2: @ 81283FC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0812841A

asm/pokemon_storage_system.s

@@ -1455,7 +1455,7 @@ _0808C3E0:
 	.align 2, 0
 _0808C444: .4byte gUnknown_83CDA20
 _0808C448:
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808C454

asm/shop.s

@@ -386,7 +386,7 @@ sub_809AD8C: @ 809AD8C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1