party_menu third quarter

asm/item_menu.s

@@ -141,14 +141,14 @@ _08107EB4: .4byte gUnknown_203ACFC
 	thumb_func_start CB2_BagMenuFromStartMenu
 CB2_BagMenuFromStartMenu: @ 8107EB8
 	push {lr}
-	ldr r2, _08107EC8 @ =CB2_ReturnToStartMenu
+	ldr r2, _08107EC8 @ =CB2_ReturnToFieldWithOpenMenu
 	movs r0, 0
 	movs r1, 0x3
 	bl GoToBagMenu
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08107EC8: .4byte CB2_ReturnToStartMenu
+_08107EC8: .4byte CB2_ReturnToFieldWithOpenMenu
 	thumb_func_end CB2_BagMenuFromStartMenu
 
 	thumb_func_start sub_8107ECC

asm/naming_screen.s

@@ -4490,7 +4490,7 @@ sub_809FC90: @ 809FC90
 	ldrb r2, [r1, 0x8]
 	movs r0, 0
 	str r0, [sp]
-	ldr r0, _0809FCB4 @ =CB2_ReturnToStartMenu
+	ldr r0, _0809FCB4 @ =CB2_ReturnToFieldWithOpenMenu
 	str r0, [sp, 0x4]
 	movs r0, 0
 	movs r3, 0
@@ -4500,7 +4500,7 @@ sub_809FC90: @ 809FC90
 	bx r0
 	.align 2, 0
 _0809FCB0: .4byte gSaveBlock2Ptr
-_0809FCB4: .4byte CB2_ReturnToStartMenu
+_0809FCB4: .4byte CB2_ReturnToFieldWithOpenMenu
 	thumb_func_end sub_809FC90
 
 	thumb_func_start sub_809FCB8
@@ -4512,7 +4512,7 @@ sub_809FCB8: @ 809FCB8
 	ldrb r2, [r1, 0x8]
 	movs r0, 0
 	str r0, [sp]
-	ldr r0, _0809FCDC @ =CB2_ReturnToStartMenu
+	ldr r0, _0809FCDC @ =CB2_ReturnToFieldWithOpenMenu
 	str r0, [sp, 0x4]
 	movs r0, 0x1
 	movs r3, 0
@@ -4522,7 +4522,7 @@ sub_809FCB8: @ 809FCB8
 	bx r0
 	.align 2, 0
 _0809FCD8: .4byte gSaveBlock2Ptr
-_0809FCDC: .4byte CB2_ReturnToStartMenu
+_0809FCDC: .4byte CB2_ReturnToFieldWithOpenMenu
 	thumb_func_end sub_809FCB8
 
 	thumb_func_start sub_809FCE0
@@ -4534,7 +4534,7 @@ sub_809FCE0: @ 809FCE0
 	ldrb r2, [r1, 0x8]
 	movs r0, 0
 	str r0, [sp]
-	ldr r0, _0809FD04 @ =CB2_ReturnToStartMenu
+	ldr r0, _0809FD04 @ =CB2_ReturnToFieldWithOpenMenu
 	str r0, [sp, 0x4]
 	movs r0, 0x2
 	movs r3, 0
@@ -4544,7 +4544,7 @@ sub_809FCE0: @ 809FCE0
 	bx r0
 	.align 2, 0
 _0809FD00: .4byte gSaveBlock2Ptr
-_0809FD04: .4byte CB2_ReturnToStartMenu
+_0809FD04: .4byte CB2_ReturnToFieldWithOpenMenu
 	thumb_func_end sub_809FCE0
 
 	thumb_func_start sub_809FD08
@@ -4556,7 +4556,7 @@ sub_809FD08: @ 809FD08
 	ldrb r2, [r1, 0x8]
 	movs r0, 0
 	str r0, [sp]
-	ldr r0, _0809FD2C @ =CB2_ReturnToStartMenu
+	ldr r0, _0809FD2C @ =CB2_ReturnToFieldWithOpenMenu
 	str r0, [sp, 0x4]
 	movs r0, 0x3
 	movs r3, 0
@@ -4566,7 +4566,7 @@ sub_809FD08: @ 809FD08
 	bx r0
 	.align 2, 0
 _0809FD28: .4byte gSaveBlock2Ptr
-_0809FD2C: .4byte CB2_ReturnToStartMenu
+_0809FD2C: .4byte CB2_ReturnToFieldWithOpenMenu
 	thumb_func_end sub_809FD08
 
 	thumb_func_start sub_809FD30
@@ -4578,7 +4578,7 @@ sub_809FD30: @ 809FD30
 	ldrb r2, [r1, 0x8]
 	movs r0, 0
 	str r0, [sp]
-	ldr r0, _0809FD54 @ =CB2_ReturnToStartMenu
+	ldr r0, _0809FD54 @ =CB2_ReturnToFieldWithOpenMenu
 	str r0, [sp, 0x4]
 	movs r0, 0x4
 	movs r3, 0
@@ -4588,7 +4588,7 @@ sub_809FD30: @ 809FD30
 	bx r0
 	.align 2, 0
 _0809FD50: .4byte gSaveBlock2Ptr
-_0809FD54: .4byte CB2_ReturnToStartMenu
+_0809FD54: .4byte CB2_ReturnToFieldWithOpenMenu
 	thumb_func_end sub_809FD30
 
 	.align 2, 0 @ Don't pad with nop.

asm/overworld.s

@@ -3754,8 +3754,8 @@ _080568A0: .4byte gFieldCallback
 _080568A4: .4byte sub_807DDD0
 	thumb_func_end c2_8056854
 
-	thumb_func_start CB2_ReturnToStartMenu
-CB2_ReturnToStartMenu: @ 80568A8
+	thumb_func_start CB2_ReturnToFieldWithOpenMenu
+CB2_ReturnToFieldWithOpenMenu: @ 80568A8
 	push {lr}
 	bl sub_80569BC
 	ldr r1, _080568BC @ =gFieldCallback2
@@ -3767,7 +3767,7 @@ CB2_ReturnToStartMenu: @ 80568A8
 	.align 2, 0
 _080568BC: .4byte gFieldCallback2
 _080568C0: .4byte FieldCB2_ReturnToStartMenuInit
-	thumb_func_end CB2_ReturnToStartMenu
+	thumb_func_end CB2_ReturnToFieldWithOpenMenu
 
 	thumb_func_start sub_80568C4
 sub_80568C4: @ 80568C4

asm/pokedex_screen.s

@@ -428,13 +428,13 @@ sub_8102858: @ 8102858
 	lsls r1, 7
 	movs r0, 0
 	bl SetGpuRegBits
-	ldr r0, _08102878 @ =CB2_ReturnToStartMenu
+	ldr r0, _08102878 @ =CB2_ReturnToFieldWithOpenMenu
 	bl SetMainCallback2
 _08102874:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08102878: .4byte CB2_ReturnToStartMenu
+_08102878: .4byte CB2_ReturnToFieldWithOpenMenu
 	thumb_func_end sub_8102858
 
 	thumb_func_start sub_810287C

asm/region_map.s

@@ -9893,15 +9893,15 @@ _080C4EF2:
 	bx r0
 	thumb_func_end sub_80C4ED0
 
-	thumb_func_start sub_80C4EF8
-sub_80C4EF8: @ 80C4EF8
+	thumb_func_start MCB2_FlyMap
+MCB2_FlyMap: @ 80C4EF8
 	push {lr}
 	bl sub_80C51E8
 	movs r0, 0x2
 	bl sub_80BFEDC
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80C4EF8
+	thumb_func_end MCB2_FlyMap
 
 	thumb_func_start sub_80C4F08
 sub_80C4F08: @ 80C4F08