Merge branch 'master' into contest

asm/field_effect_helpers.s

@@ -204,7 +204,7 @@ _0815405A:
 	bl pal_patch_for_npc
 _0815406A:
 	adds r0, r4, 0
-	bl sub_80ABE18
+	bl UpdateSpritePaletteWithWeather
 _08154070:
 	pop {r4}
 	pop {r0}
@@ -227,7 +227,7 @@ npc_pal_op_A: @ 8154078
 	adds r1, r4, 0
 	bl pal_patch_for_npc
 	adds r0, r4, 0
-	bl sub_80ABE18
+	bl UpdateSpritePaletteWithWeather
 _0815409C:
 	pop {r4}
 	pop {r0}

asm/field_screen.s

@@ -1764,8 +1764,8 @@ _080ABDE4:
 	.pool
 	thumb_func_end FadeScreen
 
-	thumb_func_start sub_80ABDFC
-sub_80ABDFC: @ 80ABDFC
+	thumb_func_start IsWeatherNotFadingIn
+IsWeatherNotFadingIn: @ 80ABDFC
 	ldr r0, =gUnknown_02038454
 	ldr r1, =0x000006c6
 	adds r0, r1
@@ -1777,11 +1777,11 @@ sub_80ABDFC: @ 80ABDFC
 	lsrs r0, 31
 	bx lr
 	.pool
-	thumb_func_end sub_80ABDFC
+	thumb_func_end IsWeatherNotFadingIn
 
-	thumb_func_start sub_80ABE18
-@ void sub_80ABE18(u8 a1)
-sub_80ABE18: @ 80ABE18
+	thumb_func_start UpdateSpritePaletteWithWeather
+@ void UpdateSpritePaletteWithWeather(u8 a1)
+UpdateSpritePaletteWithWeather: @ 80ABE18
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r0, 8
@@ -1882,7 +1882,7 @@ _080ABEF4:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80ABE18
+	thumb_func_end UpdateSpritePaletteWithWeather
 
 	thumb_func_start ApplyWeatherGammaShiftToPal
 ApplyWeatherGammaShiftToPal: @ 80ABF00
@@ -1939,7 +1939,7 @@ sub_80ABF4C: @ 80ABF4C
 	movs r2, 0x20
 	bl LoadPalette
 	ldrb r0, [r4]
-	bl sub_80ABE18
+	bl UpdateSpritePaletteWithWeather
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -2504,8 +2504,8 @@ sub_80AC3E4: @ 80AC3E4
 	.pool
 	thumb_func_end sub_80AC3E4
 
-	thumb_func_start sub_80AC3F8
-sub_80AC3F8: @ 80AC3F8
+	thumb_func_start PreservePaletteInWeather
+PreservePaletteInWeather: @ 80AC3F8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -2524,16 +2524,16 @@ sub_80AC3F8: @ 80AC3F8
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80AC3F8
+	thumb_func_end PreservePaletteInWeather
 
-	thumb_func_start sub_80AC428
-sub_80AC428: @ 80AC428
+	thumb_func_start ResetPreservedPalettesInWeather
+ResetPreservedPalettesInWeather: @ 80AC428
 	ldr r1, =gUnknown_03000F50
 	ldr r0, =gUnknown_0854C250
 	str r0, [r1]
 	bx lr
 	.pool
-	thumb_func_end sub_80AC428
+	thumb_func_end ResetPreservedPalettesInWeather
 
 	thumb_func_start sub_80AC438
 sub_80AC438: @ 80AC438
@@ -8702,7 +8702,7 @@ sub_80AF710: @ 80AF710
 	thumb_func_start sub_80AF71C
 sub_80AF71C: @ 80AF71C
 	push {lr}
-	bl sub_80ABDFC
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/field_specials.s

@@ -3155,7 +3155,7 @@ SetRoute119Weather: @ 8139648
 	bl get_map_light_from_warp0
 	lsls r0, 24
 	lsrs r0, 24
-	bl is_light_level_1_2_3_5_or_6
+	bl is_map_type_1_2_3_5_or_6
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -3173,7 +3173,7 @@ SetRoute123Weather: @ 8139668
 	bl get_map_light_from_warp0
 	lsls r0, 24
 	lsrs r0, 24
-	bl is_light_level_1_2_3_5_or_6
+	bl is_map_type_1_2_3_5_or_6
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/party_menu.s

@@ -10231,7 +10231,7 @@ task_launch_hm_phase_2: @ 81B5750
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_80ABDFC
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -17337,7 +17337,7 @@ task_hm_without_phase_2: @ 81B93E0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_80ABDFC
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B93FE

asm/pokemon_storage_system.s

@@ -245,7 +245,7 @@ _080C72AC:
 	b _080C7318
 	.pool
 _080C730C:
-	bl sub_80ABDFC
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	cmp r0, 0
 	bne _080C7318

asm/pokenav.s

@@ -26676,7 +26676,7 @@ _081D4B3A:
 	bl IndexOfSpritePaletteTag
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80ABE18
+	bl UpdateSpritePaletteWithWeather
 	ldrh r1, [r5, 0x10]
 	mov r0, sp
 	strh r1, [r0]

asm/script_menu.s

@@ -1316,7 +1316,7 @@ _080E28CA:
 	ldr r1, =gSprites
 	adds r0, r1
 	ldrb r1, [r4, 0xC]
-	bl sub_80B6070
+	bl FreeResourcesAndDestroySprite
 _080E28DE:
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
@@ -1363,7 +1363,7 @@ ScriptMenu_ShowPokemonPic: @ 80E2900
 	asrs r2, 16
 	mov r0, r8
 	movs r3, 0
-	bl sub_80B5F84
+	bl CreateMonSprite_PicBox
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24

asm/shop.s

@@ -316,7 +316,7 @@ Task_ExitSellMenu: @ 80DFCF8
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r5, r4, 0
-	bl sub_80ABDFC
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/slot_machine.s

@@ -5583,7 +5583,7 @@ _0812D08E:
 	lsrs r3, 24
 	adds r1, r3, 0
 	adds r2, r3, 0
-	bl sub_80B6128
+	bl MultiplyPaletteRGBComponents
 _0812D0A6:
 	pop {r4-r7}
 	pop {r0}