battle_setup funcs

asm/battle_anim_effects_2.s

@@ -3902,7 +3902,7 @@ _080A8C60:
 	subs r0, r4
 	strh r0, [r1]
 _080A8C6A:
-	ldr r1, _080A8C80 @ =sub_8075D9C
+	ldr r1, _080A8C80 @ =AnimSparklingParticle
 	str r1, [r6, 0x1C]
 	adds r0, r6, 0
 	bl _call_via_r1
@@ -3912,7 +3912,7 @@ _080A8C6A:
 	bx r0
 	.align 2, 0
 _080A8C7C: .4byte gBattleAnimArgs
-_080A8C80: .4byte sub_8075D9C
+_080A8C80: .4byte AnimSparklingParticle
 	thumb_func_end sub_80A8BC4
 
 	thumb_func_start sub_80A8C84
@@ -4233,7 +4233,7 @@ _080A8F0E:
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl StartSpriteAffineAnim
-	ldr r1, _080A8F34 @ =sub_8075D9C
+	ldr r1, _080A8F34 @ =AnimSparklingParticle
 	str r1, [r4, 0x1C]
 	adds r0, r4, 0
 	bl _call_via_r1
@@ -4244,7 +4244,7 @@ _080A8F0E:
 _080A8F28: .4byte 0x000027db
 _080A8F2C: .4byte 0x01010000
 _080A8F30: .4byte gBattleAnimArgs
-_080A8F34: .4byte sub_8075D9C
+_080A8F34: .4byte AnimSparklingParticle
 	thumb_func_end sub_80A8EE8
 
 	thumb_func_start sub_80A8F38

asm/field_effect_helpers.s

@@ -134,13 +134,13 @@ npc_pal_op: @ 80DAE54
 	cmp r0, 0
 	bne _080DAEB0
 	ldrb r0, [r5, 0x1F]
-	bl MetatileBehavior_ReturnFalse_7
+	bl MetatileBehavior_GetBridgeType
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
 	bne _080DAE96
 	ldrb r0, [r5, 0x1E]
-	bl MetatileBehavior_ReturnFalse_7
+	bl MetatileBehavior_GetBridgeType
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
@@ -1251,7 +1251,7 @@ _080DB6E8:
 	cmp r0, 0
 	bne _080DB73C
 	adds r0, r4, 0
-	bl MetatileBehavior_ReturnFalse_3
+	bl MetatileBehavior_IsLongGrass
 	lsls r0, 24
 	cmp r0, 0
 	beq _080DB73C

asm/field_ground_effect.s

@@ -224,7 +224,7 @@ GetGroundEffectFlags_LongGrassOnSpawn: @ 8067CE8
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
-	bl MetatileBehavior_ReturnFalse_3
+	bl MetatileBehavior_IsLongGrass
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067D00
@@ -243,7 +243,7 @@ GetGroundEffectFlags_LongGrassOnBeginStep: @ 8067D08
 	push {r4,lr}
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x1E]
-	bl MetatileBehavior_ReturnFalse_3
+	bl MetatileBehavior_IsLongGrass
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067D20
@@ -838,12 +838,12 @@ FieldObjectSetSpriteOamTableForLongGrass: @ 8068154
 	cmp r0, 0
 	blt _080681A8
 	ldrb r0, [r5, 0x1E]
-	bl MetatileBehavior_ReturnFalse_3
+	bl MetatileBehavior_IsLongGrass
 	lsls r0, 24
 	cmp r0, 0
 	beq _080681A8
 	ldrb r0, [r5, 0x1F]
-	bl MetatileBehavior_ReturnFalse_3
+	bl MetatileBehavior_IsLongGrass
 	lsls r0, 24
 	cmp r0, 0
 	beq _080681A8

asm/overworld.s

@@ -3522,8 +3522,8 @@ _0805669C: .4byte sub_8056534
 _080566A0: .4byte sub_80565B4
 	thumb_func_end CB2_NewGame
 
-	thumb_func_start c2_whiteout
-c2_whiteout: @ 80566A4
+	thumb_func_start CB2_WhiteOut
+CB2_WhiteOut: @ 80566A4
 	push {lr}
 	sub sp, 0x4
 	ldr r1, _08056708 @ =gMain
@@ -3569,7 +3569,7 @@ _0805670C: .4byte gFieldCallback
 _08056710: .4byte sub_807F5F0
 _08056714: .4byte sub_8056534
 _08056718: .4byte sub_80565B4
-	thumb_func_end c2_whiteout
+	thumb_func_end CB2_WhiteOut
 
 	thumb_func_start CB2_LoadMap
 CB2_LoadMap: @ 805671C

asm/post_battle_event_funcs.s

@@ -109,13 +109,13 @@ _080CA3C0: .4byte CB2_DoHallOfFameScreen
 	thumb_func_start sub_80CA3C4
 sub_80CA3C4: @ 80CA3C4
 	push {lr}
-	ldr r0, _080CA3D4 @ =c2_whiteout
+	ldr r0, _080CA3D4 @ =CB2_WhiteOut
 	bl SetMainCallback2
 	movs r0, 0
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080CA3D4: .4byte c2_whiteout
+_080CA3D4: .4byte CB2_WhiteOut
 	thumb_func_end sub_80CA3C4
 
 	.align 2, 0 @ Don't pad with nop.

asm/wild_encounter.s

@@ -878,7 +878,7 @@ _08082D78:
 	bl sub_8058F1C
 	lsls r0, 24
 	lsrs r0, 24
-	bl MetatileBehavior_ReturnFalse_6
+	bl MetatileBehavior_IsBridge
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1