Merge branch 'master' of https://github.com/pret/pokeemerald into load_save

asm/battle_frontier_2.s

@@ -25426,8 +25426,8 @@ sub_81A7B84: @ 81A7B84
 	.pool
 	thumb_func_end sub_81A7B84
 
-	thumb_func_start sub_81A7B90
-sub_81A7B90: @ 81A7B90
+	thumb_func_start TryGenerateBattlePikeWildMon
+TryGenerateBattlePikeWildMon: @ 81A7B90
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -25437,7 +25437,7 @@ sub_81A7B90: @ 81A7B90
 	lsls r0, 24
 	lsrs r0, 24
 	mov r8, r0
-	bl sub_81A7D00
+	bl GetBattlePikeWildMonHeaderId
 	lsls r0, 24
 	lsrs r6, r0, 24
 	ldr r7, =gSaveBlock2Ptr
@@ -25596,10 +25596,10 @@ _081A7CE2:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_81A7B90
+	thumb_func_end TryGenerateBattlePikeWildMon
 
-	thumb_func_start sub_81A7D00
-sub_81A7D00: @ 81A7D00
+	thumb_func_start GetBattlePikeWildMonHeaderId
+GetBattlePikeWildMonHeaderId: @ 81A7D00
 	push {lr}
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
@@ -25638,7 +25638,7 @@ _081A7D4C:
 	adds r0, r1, 0
 	pop {r1}
 	bx r1
-	thumb_func_end sub_81A7D00
+	thumb_func_end GetBattlePikeWildMonHeaderId
 
 	thumb_func_start sub_81A7D54
 sub_81A7D54: @ 81A7D54
@@ -29386,8 +29386,8 @@ _081A9B86:
 	.pool
 	thumb_func_end sub_81A9B44
 
-	thumb_func_start sub_81A9C04
-sub_81A9C04: @ 81A9C04
+	thumb_func_start GenerateBattlePyramidWildMon
+GenerateBattlePyramidWildMon: @ 81A9C04
 	push {r4-r6,lr}
 	sub sp, 0x14
 	ldr r0, =gSaveBlock2Ptr
@@ -29627,7 +29627,7 @@ _081A9E0C:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_81A9C04
+	thumb_func_end GenerateBattlePyramidWildMon
 
 	thumb_func_start sub_81A9E28
 sub_81A9E28: @ 81A9E28

asm/battle_setup.s

@@ -82,8 +82,8 @@ task_add_01_battle_start: @ 80B065C
 	.pool
 	thumb_func_end task_add_01_battle_start
 
-	thumb_func_start sub_80B0698
-sub_80B0698: @ 80B0698
+	thumb_func_start BattleSetup_StartWildBattle
+BattleSetup_StartWildBattle: @ 80B0698
 	push {lr}
 	bl GetSafariZoneFlag
 	cmp r0, 0
@@ -95,15 +95,15 @@ _080B06A8:
 _080B06AC:
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80B0698
+	thumb_func_end BattleSetup_StartWildBattle
 
-	thumb_func_start sub_80B06B0
-sub_80B06B0: @ 80B06B0
+	thumb_func_start BattleSetup_StartBattlePikeWildBattle
+BattleSetup_StartBattlePikeWildBattle: @ 80B06B0
 	push {lr}
 	bl sub_80B07B4
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80B06B0
+	thumb_func_end BattleSetup_StartBattlePikeWildBattle
 
 	thumb_func_start sub_80B06BC
 sub_80B06BC: @ 80B06BC
@@ -147,8 +147,8 @@ _080B06F2:
 	.pool
 	thumb_func_end sub_80B06BC
 
-	thumb_func_start sub_80B072C
-sub_80B072C: @ 80B072C
+	thumb_func_start BattleSetup_StartRoamerBattle
+BattleSetup_StartRoamerBattle: @ 80B072C
 	push {lr}
 	bl ScriptContext2_Enable
 	bl player_bitmagic
@@ -174,7 +174,7 @@ sub_80B072C: @ 80B072C
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80B072C
+	thumb_func_end BattleSetup_StartRoamerBattle
 
 	thumb_func_start sub_80B077C
 sub_80B077C: @ 80B077C

asm/field_control_avatar.s

@@ -1246,7 +1246,7 @@ sub_809C8DC: @ 809C8DC
 	lsrs r0, 24
 	cmp r0, 0x1
 	beq _0809C92E
-	bl sub_80B5870
+	bl UpdateRepelCounter
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1607,7 +1607,7 @@ _0809CC0C:
 	ldr r5, =gUnknown_020375D6
 	ldrh r1, [r5]
 	adds r0, r4, 0
-	bl is_it_battle_time_2
+	bl StandardWildEncounter
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/field_player_avatar.s

@@ -4316,7 +4316,7 @@ fish5: @ 808CABC
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
 	movs r6, 0
-	bl GetFishingWildMonListHeader
+	bl DoesCurrentMapHaveFishingMons
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808CADC
@@ -4640,7 +4640,7 @@ _0808CD58:
 	ldrh r0, [r5, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80B5734
+	bl FishingWildEncounter
 	movs r0, 0x1
 	bl sub_80ED950
 	ldr r0, =Task_Fish

asm/pokeblock_feed.s

@@ -704,7 +704,7 @@ sub_817A1C4: @ 817A1C4
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r4, 0
-	bl sub_8136FE4
+	bl PokeblockGetGain
 	ldr r6, =gUnknown_0203BC9E
 	strh r0, [r6]
 	ldr r1, =gStringVar1

asm/rom4.s

@@ -2675,12 +2675,12 @@ sub_8085B2C: @ 8085B2C
 	ldr r1, =gUnknown_02032306
 	movs r0, 0x1
 	strb r0, [r1]
-	bl sub_80B582C
+	bl GetLocalWaterMon
 	b _08085B62
 	.pool
 _08085B5C:
 	ldr r0, =gUnknown_02032306
-	bl wild_pokemon_rand_for_map
+	bl GetLocalWildMon
 _08085B62:
 	ldr r1, =gUnknown_02032304
 	strh r0, [r1]

asm/rom6.s

@@ -2779,7 +2779,7 @@ sub_8136C8C: @ 8136C8C
 	adds r2, r6
 	ldr r1, [r5]
 	adds r1, r2
-	bl sub_8136FE4
+	bl PokeblockGetGain
 	adds r4, r0, 0
 	lsls r4, 16
 	lsrs r4, 16
@@ -3177,8 +3177,8 @@ _08136FDE:
 	bx r1
 	thumb_func_end sub_8136F9C
 
-	thumb_func_start sub_8136FE4
-sub_8136FE4: @ 8136FE4
+	thumb_func_start PokeblockGetGain
+PokeblockGetGain: @ 8136FE4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -3227,7 +3227,7 @@ _0813702A:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_8136FE4
+	thumb_func_end PokeblockGetGain
 
 	thumb_func_start sub_8137044
 sub_8137044: @ 8137044
@@ -3261,7 +3261,7 @@ _08137074:
 	ldr r0, =gUnknown_085B2720
 	adds r1, r0
 	adds r0, r5, 0
-	bl sub_8136FE4
+	bl PokeblockGetGain
 	lsls r0, 16
 	cmp r0, 0
 	ble _081370A0