Merge branch 'master' into slot_machine

1 files changed, 62 insertions, 62 deletions

diff --git a/asm/overworld.s b/asm/overworld.s
index 103ed2c46..39fbe770a 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -22,7 +22,7 @@ sub_8054BC8: @ 8054BC8
 	bl sp000_heal_pokemon
 	bl sub_8054DD8
 	bl sub_80554BC
-	bl warp_in
+	bl WarpIntoMap
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -38,7 +38,7 @@ sub_8054C04: @ 8054C04
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_80444F8
+	bl GetPlayerPartyHighestLevel
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, _08054C40 @ =gUnknown_826D294
@@ -193,8 +193,8 @@ _08054D68: .4byte 0x00000808
 _08054D6C: .4byte 0x0000404d
 	thumb_func_end Overworld_ResetStateAfterTeleport
 
-	thumb_func_start sub_8054D70
-sub_8054D70: @ 8054D70
+	thumb_func_start Overworld_ResetStateAfterDigEscRope
+Overworld_ResetStateAfterDigEscRope: @ 8054D70
 	push {lr}
 	bl ResetInitialPlayerAvatarState
 	movs r0, 0x83
@@ -230,7 +230,7 @@ _08054DC8: .4byte 0x00000805
 _08054DCC: .4byte 0x00000806
 _08054DD0: .4byte 0x00000808
 _08054DD4: .4byte 0x0000404d
-	thumb_func_end sub_8054D70
+	thumb_func_end Overworld_ResetStateAfterDigEscRope
 
 	thumb_func_start sub_8054DD8
 sub_8054DD8: @ 8054DD8
@@ -334,7 +334,7 @@ _08054EB0:
 	ldr r1, _08054EC0 @ =0x00ffffff
 _08054EB2:
 	adds r0, r4, 0
-	bl sub_8054F00
+	bl SetGameStat
 _08054EB8:
 	pop {r4}
 	pop {r0}
@@ -376,8 +376,8 @@ _08054EFA:
 	bx r1
 	thumb_func_end GetGameStat
 
-	thumb_func_start sub_8054F00
-sub_8054F00: @ 8054F00
+	thumb_func_start SetGameStat
+SetGameStat: @ 8054F00
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -405,7 +405,7 @@ _08054F2A:
 	.align 2, 0
 _08054F30: .4byte gSaveBlock1Ptr
 _08054F34: .4byte gSaveBlock2Ptr
-	thumb_func_end sub_8054F00
+	thumb_func_end SetGameStat
 
 	thumb_func_start sub_8054F38
 sub_8054F38: @ 8054F38
@@ -993,15 +993,15 @@ _0805536C:
 _08055374: .4byte gMapHeader
 	thumb_func_end update_camera_pos_from_warpid
 
-	thumb_func_start warp_in
-warp_in: @ 8055378
+	thumb_func_start WarpIntoMap
+WarpIntoMap: @ 8055378
 	push {lr}
 	bl warp_shift
 	bl set_current_map_header_from_sav1_save_old_name
 	bl update_camera_pos_from_warpid
 	pop {r0}
 	bx r0
-	thumb_func_end warp_in
+	thumb_func_end WarpIntoMap
 
 	thumb_func_start Overworld_SetWarpDestination
 Overworld_SetWarpDestination: @ 805538C
@@ -1257,7 +1257,7 @@ sub_805550C: @ 805550C
 	ldrh r0, [r0, 0x4]
 	cmp r0, 0x1
 	beq _08055590
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -1858,7 +1858,7 @@ _08055A04: .4byte gUnknown_2031DD4
 	thumb_func_start sub_8055A08
 sub_8055A08: @ 8055A08
 	push {r4,lr}
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	ldr r4, _08055A24 @ =gUnknown_2031DD4
 	strb r0, [r4, 0x1]
 	movs r0, 0x2
@@ -2378,8 +2378,8 @@ sub_8055DB8: @ 8055DB8
 	bx r0
 	thumb_func_end sub_8055DB8
 
-	thumb_func_start sub_8055DC4
-sub_8055DC4: @ 8055DC4
+	thumb_func_start Overworld_PlaySpecialMapMusic
+Overworld_PlaySpecialMapMusic: @ 8055DC4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r0, _08055DD8 @ =gUnknown_2031DD8
@@ -2441,7 +2441,7 @@ _08055E40:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08055E5A
-	ldr r5, _08055E74 @ =0x00000131
+	ldr r5, _08055E74 @ =0x00000131 @ BGM_FRLG_SURF
 	adds r0, r5, 0
 	bl sub_8056124
 	cmp r0, 0
@@ -2462,7 +2462,7 @@ _08055E6C:
 	bx r0
 	.align 2, 0
 _08055E74: .4byte 0x00000131
-	thumb_func_end sub_8055DC4
+	thumb_func_end Overworld_PlaySpecialMapMusic
 
 	thumb_func_start Overworld_SetSavedMusic
 Overworld_SetSavedMusic: @ 8055E78
@@ -2511,7 +2511,7 @@ _08055EA8:
 	bl GetCurrentMapMusic
 	lsls r0, 16
 	lsrs r6, r0, 16
-	ldr r5, _08055F08 @ =0x00000131
+	ldr r5, _08055F08 @ =0x00000131 @ BGM_FRLG_SURF
 	cmp r6, r5
 	beq _08055F14
 	movs r0, 0x8
@@ -3199,7 +3199,7 @@ _080563EC: .4byte gUnknown_300501C
 	thumb_func_start CleanupOverworldWindowsAndTilemaps
 CleanupOverworldWindowsAndTilemaps: @ 80563F0
 	push {lr}
-	bl sub_80F6C8C
+	bl FreeAllOverworldWindowBuffers
 	ldr r0, _08056414 @ =gUnknown_300501C
 	ldr r0, [r0]
 	bl Free
@@ -3225,8 +3225,8 @@ sub_8056420: @ 8056420
 	bx r0
 	thumb_func_end sub_8056420
 
-	thumb_func_start is_c1_link_related_active
-is_c1_link_related_active: @ 805642C
+	thumb_func_start IsUpdateLinkStateCBActive
+IsUpdateLinkStateCBActive: @ 805642C
 	push {lr}
 	ldr r0, _0805643C @ =gMain
 	ldr r1, [r0]
@@ -3243,7 +3243,7 @@ _08056444:
 _08056446:
 	pop {r1}
 	bx r1
-	thumb_func_end is_c1_link_related_active
+	thumb_func_end IsUpdateLinkStateCBActive
 
 	thumb_func_start sub_805644C
 sub_805644C: @ 805644C
@@ -3393,7 +3393,7 @@ sub_8056578: @ 8056578
 	bl BuildOamBuffer
 	bl UpdatePaletteFade
 	bl sub_806FFBC
-	bl do_scheduled_bg_tilemap_copies_to_vram
+	bl DoScheduledBgTilemapCopiesToVram
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8056578
@@ -3571,8 +3571,8 @@ _08056714: .4byte sub_8056534
 _08056718: .4byte sub_80565B4
 	thumb_func_end c2_whiteout
 
-	thumb_func_start sub_805671C
-sub_805671C: @ 805671C
+	thumb_func_start CB2_LoadMap
+CB2_LoadMap: @ 805671C
 	push {lr}
 	bl sub_80569BC
 	bl ScriptContext1_Init
@@ -3590,7 +3590,7 @@ sub_805671C: @ 805671C
 _08056740: .4byte sub_80C9BFC
 _08056744: .4byte gMain
 _08056748: .4byte sub_805674C
-	thumb_func_end sub_805671C
+	thumb_func_end CB2_LoadMap
 
 	thumb_func_start sub_805674C
 sub_805674C: @ 805674C
@@ -3662,7 +3662,7 @@ _080567D8: .4byte sub_80565B4
 	thumb_func_start CB2_ReturnToField
 CB2_ReturnToField: @ 80567DC
 	push {lr}
-	bl is_c1_link_related_active
+	bl IsUpdateLinkStateCBActive
 	cmp r0, 0x1
 	bne _080567F4
 	ldr r0, _080567F0 @ =c2_exit_to_overworld_2_link
@@ -3784,8 +3784,8 @@ _080568D8: .4byte gFieldCallback
 _080568DC: .4byte sub_807DD44
 	thumb_func_end sub_80568C4
 
-	thumb_func_start c2_exit_to_overworld_1_continue_scripts_restart_music
-c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80568E0
+	thumb_func_start CB2_ReturnToFieldContinueScriptPlayMapMusic
+CB2_ReturnToFieldContinueScriptPlayMapMusic: @ 80568E0
 	push {lr}
 	bl sub_80569BC
 	ldr r1, _080568F4 @ =gFieldCallback
@@ -3797,10 +3797,10 @@ c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80568E0
 	.align 2, 0
 _080568F4: .4byte gFieldCallback
 _080568F8: .4byte FieldCallback_ReturnToEventScript2
-	thumb_func_end c2_exit_to_overworld_1_continue_scripts_restart_music
+	thumb_func_end CB2_ReturnToFieldContinueScriptPlayMapMusic
 
-	thumb_func_start sub_80568FC
-sub_80568FC: @ 80568FC
+	thumb_func_start CB2_Overworld
+CB2_Overworld: @ 80568FC
 	push {lr}
 	bl sub_80569BC
 	ldr r1, _08056910 @ =gFieldCallback
@@ -3812,7 +3812,7 @@ sub_80568FC: @ 80568FC
 	.align 2, 0
 _08056910: .4byte gFieldCallback
 _08056914: .4byte sub_807DF7C
-	thumb_func_end sub_80568FC
+	thumb_func_end CB2_Overworld
 
 	thumb_func_start sub_8056918
 sub_8056918: @ 8056918
@@ -3833,8 +3833,8 @@ _0805692C:
 _08056934: .4byte gMapHeader
 	thumb_func_end sub_8056918
 
-	thumb_func_start sub_8056938
-sub_8056938: @ 8056938
+	thumb_func_start CB2_ContinueSavedGame
+CB2_ContinueSavedGame: @ 8056938
 	push {lr}
 	bl sub_80569BC
 	bl StopMapMusic
@@ -3858,14 +3858,14 @@ sub_8056938: @ 8056938
 	bne _0805699C
 	bl sav2_x9_clear_bit1
 	bl warp1_set_to_sav1w
-	bl warp_in
-	ldr r0, _08056998 @ =sub_805671C
+	bl WarpIntoMap
+	ldr r0, _08056998 @ =CB2_LoadMap
 	bl SetMainCallback2
 	b _080569AC
 	.align 2, 0
 _08056990: .4byte gFieldCallback2
 _08056994: .4byte gUnknown_2031DE0
-_08056998: .4byte sub_805671C
+_08056998: .4byte CB2_LoadMap
 _0805699C:
 	ldr r0, _080569B0 @ =gFieldCallback
 	ldr r1, _080569B4 @ =sub_8056918
@@ -3880,7 +3880,7 @@ _080569AC:
 _080569B0: .4byte gFieldCallback
 _080569B4: .4byte sub_8056918
 _080569B8: .4byte sub_8056534
-	thumb_func_end sub_8056938
+	thumb_func_end CB2_ContinueSavedGame
 
 	thumb_func_start sub_80569BC
 sub_80569BC: @ 80569BC
@@ -4036,7 +4036,7 @@ _08056B04:
 	.align 2, 0
 _08056B10: .4byte gMapHeader
 _08056B14:
-	bl free_temp_tile_data_buffers_if_possible
+	bl FreeTempTileDataBuffersIfPossible
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -4178,7 +4178,7 @@ _08056C40:
 	.align 2, 0
 _08056C4C: .4byte gMapHeader
 _08056C50:
-	bl free_temp_tile_data_buffers_if_possible
+	bl FreeTempTileDataBuffersIfPossible
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -4367,7 +4367,7 @@ _08056DE0:
 	.align 2, 0
 _08056DEC: .4byte gMapHeader
 _08056DF0:
-	bl free_temp_tile_data_buffers_if_possible
+	bl FreeTempTileDataBuffersIfPossible
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -4523,8 +4523,8 @@ sub_8056F08: @ 8056F08
 	thumb_func_start sub_8056F1C
 sub_8056F1C: @ 8056F1C
 	push {r4,lr}
-	bl clear_scheduled_bg_copies_to_vram
-	bl reset_temp_tile_data_buffers
+	bl ClearScheduledBgCopiesToVram
+	bl ResetTempTileDataBuffers
 	movs r0, 0x4C
 	movs r1, 0
 	bl SetGpuReg
@@ -4563,11 +4563,11 @@ sub_8056F1C: @ 8056F1C
 	movs r0, 0x52
 	bl SetGpuReg
 	movs r0, 0x1
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	movs r0, 0x2
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	movs r0, 0x3
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	ldr r1, _08057020 @ =0x00007060
 	movs r0, 0
 	bl SetGpuReg
@@ -5078,7 +5078,7 @@ _080573D8:
 	.align 2, 0
 _080573E4: .4byte gMapHeader
 _080573E8:
-	bl free_temp_tile_data_buffers_if_possible
+	bl FreeTempTileDataBuffersIfPossible
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -5139,14 +5139,14 @@ sub_8057430: @ 8057430
 	bne _08057490
 	bl sav2_x9_clear_bit1
 	bl warp1_set_to_sav1w
-	bl warp_in
-	ldr r0, _0805748C @ =sub_805671C
+	bl WarpIntoMap
+	ldr r0, _0805748C @ =CB2_LoadMap
 	bl SetMainCallback2
 	b _0805749A
 	.align 2, 0
 _08057484: .4byte gUnknown_2036E28
 _08057488: .4byte gUnknown_2031DE0
-_0805748C: .4byte sub_805671C
+_0805748C: .4byte CB2_LoadMap
 _08057490:
 	ldr r0, _080574A0 @ =sub_8056534
 	bl sub_80565E0
@@ -5177,7 +5177,7 @@ _080574B8:
 	bl BuildOamBuffer
 	bl UpdatePaletteFade
 	bl sub_806FFBC
-	bl do_scheduled_bg_tilemap_copies_to_vram
+	bl DoScheduledBgTilemapCopiesToVram
 	cmp r4, 0
 	beq _080574E0
 	bl SetFieldVBlankCallback
@@ -5304,7 +5304,7 @@ _08057560:
 	adds r0, r4
 	ldrh r0, [r0, 0x4]
 	strh r0, [r1]
-	bl warp_in
+	bl WarpIntoMap
 	ldr r2, _08057610 @ =gPaletteFade
 	ldrb r0, [r2, 0x8]
 	movs r1, 0x80
@@ -5427,7 +5427,7 @@ _080576E0:
 	.align 2, 0
 _080576EC: .4byte gMapHeader
 _080576F0:
-	bl free_temp_tile_data_buffers_if_possible
+	bl FreeTempTileDataBuffersIfPossible
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -5620,7 +5620,7 @@ sub_8057854: @ 8057854
 	cmp r0, 0
 	bne _08057876
 	bl CleanupOverworldWindowsAndTilemaps
-	ldr r0, _08057880 @ =sub_805671C
+	ldr r0, _08057880 @ =CB2_LoadMap
 	bl SetMainCallback2
 	adds r0, r4, 0
 	bl DestroyTask
@@ -5630,7 +5630,7 @@ _08057876:
 	bx r0
 	.align 2, 0
 _0805787C: .4byte gPaletteFade
-_08057880: .4byte sub_805671C
+_08057880: .4byte CB2_LoadMap
 	thumb_func_end sub_8057854
 
 	thumb_func_start c1_link_related
@@ -6144,7 +6144,7 @@ _08057C72:
 	bl sub_805833C
 	cmp r0, 0x1
 	bls _08057CA8
-	bl is_c1_link_related_active
+	bl IsUpdateLinkStateCBActive
 	cmp r0, 0x1
 	bne _08057CA8
 	bl sub_800A00C
@@ -6976,7 +6976,7 @@ _08058240: .4byte gUnknown_81BB9F0
 	thumb_func_start sub_8058244
 sub_8058244: @ 8058244
 	push {lr}
-	bl is_c1_link_related_active
+	bl IsUpdateLinkStateCBActive
 	cmp r0, 0
 	bne _08058252
 	movs r0, 0
@@ -7009,7 +7009,7 @@ sub_8058274: @ 8058274
 	bl sub_800B248
 	cmp r0, 0x1
 	bls _080582D8
-	bl is_c1_link_related_active
+	bl IsUpdateLinkStateCBActive
 	cmp r0, 0x1
 	bne _080582D8
 	bl sub_800A00C
@@ -7062,7 +7062,7 @@ sub_80582E0: @ 80582E0
 	bl sub_805833C
 	cmp r0, 0x1
 	bls _08058304
-	bl is_c1_link_related_active
+	bl IsUpdateLinkStateCBActive
 	cmp r0, 0x1
 	bne _08058304
 	bl sub_800A00C
@@ -7888,7 +7888,7 @@ _080588C6:
 	movs r2, 0
 	str r2, [sp]
 	movs r3, 0
-	bl AddPseudoFieldObject
+	bl AddPseudoEventObject
 	strb r0, [r4, 0x4]
 	ldrb r1, [r4, 0x4]
 	lsls r0, r1, 4