more pokemon work

asm/main_menu.s

@@ -3940,7 +3940,7 @@ AddBirchSpeechObjects: @ 803192C
 	strb r1, [r2]
 	strh r0, [r5, 0x1A]
 	movs r0, 0x3C
-	bl sub_806EFF0
+	bl FacilityClassToPicIndex
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r4, =0x0201c000
@@ -3970,7 +3970,7 @@ AddBirchSpeechObjects: @ 803192C
 	strb r1, [r2, 0x5]
 	strh r0, [r5, 0x1C]
 	movs r0, 0x3F
-	bl sub_806EFF0
+	bl FacilityClassToPicIndex
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =0x0201c000

asm/party_menu.s

@@ -11943,7 +11943,7 @@ _081B6558:
 	adds r1, r5, 0
 _081B6572:
 	adds r3, r6, 0
-	bl ExecuteTableBasedItemEffect_
+	bl ExecuteTableBasedItemEffect
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r4-r6}

asm/pokemon_summary_screen.s

@@ -1173,7 +1173,7 @@ sub_81C47B4: @ 81C47B4
 	ands r0, r1
 	strb r0, [r7, 0x5]
 	ldrh r0, [r6, 0x2]
-	bl IsPokeSpriteNotFlipped
+	bl IsMonSpriteNotFlipped
 	lsls r0, 24
 	cmp r0, 0
 	bne _081C4828
@@ -1221,7 +1221,7 @@ sub_81C4844: @ 81C4844
 	cmp r0, 0x1
 	beq _081C487E
 	ldrh r0, [r4, 0x2E]
-	bl IsPokeSpriteNotFlipped
+	bl IsMonSpriteNotFlipped
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x30]

asm/trade.s

@@ -7155,7 +7155,7 @@ _0807AD94:
 	bl HandleLoadSpecialPokePic_DontHandleDeoxys
 _0807ADB2:
 	mov r0, r8
-	bl sub_806E794
+	bl GetMonSpritePalStruct
 	bl LoadCompressedObjectPalette
 	ldr r0, =gUnknown_020322A0
 	ldr r1, [r0]
@@ -7171,7 +7171,7 @@ _0807ADB2:
 	.pool
 _0807ADE0:
 	mov r0, r8
-	bl sub_806E794
+	bl GetMonSpritePalStruct
 	ldrh r0, [r0, 0x4]
 	adds r1, r4, 0
 	bl sub_806A068
@@ -9589,7 +9589,7 @@ _0807C66C:
 	ldr r0, [r5]
 	adds r0, 0xF0
 	ldrh r0, [r0]
-	bl IsPokeSpriteNotFlipped
+	bl IsMonSpriteNotFlipped
 	lsls r0, 24
 	cmp r0, 0
 	bne _0807C6E4
@@ -11663,7 +11663,7 @@ _0807DA74:
 	ldr r0, [r5]
 	adds r0, 0xF0
 	ldrh r0, [r0]
-	bl IsPokeSpriteNotFlipped
+	bl IsMonSpriteNotFlipped
 	lsls r0, 24
 	cmp r0, 0
 	bne _0807DAEC

asm/trainer_card.s

@@ -4754,7 +4754,7 @@ sub_80C4FF0: @ 80C4FF0
 	ldr r1, =0x00000583
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_806EFF0
+	bl FacilityClassToPicIndex
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r4, =gUnknown_0856FB18
@@ -4795,7 +4795,7 @@ _080C5060:
 	adds r0, r1
 	adds r0, r2
 	ldrb r0, [r0]
-	bl sub_806EFF0
+	bl FacilityClassToPicIndex
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r4, =gUnknown_0856FB18