Merge branch 'master' into link

1 files changed, 15 insertions, 15 deletions

diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 2deae56ab..00a8b4d92 100755
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -1106,7 +1106,7 @@ sub_80C7958: @ 80C7958
 	ldrh r0, [r3]
 	adds r0, 0x1
 	strh r0, [r1]
-	ldr r0, =gUnknown_08571710
+	ldr r0, =sSpriteAnimTable_8571710
 	str r0, [sp, 0xC]
 	movs r4, 0
 _080C7A10:
@@ -2201,7 +2201,7 @@ _080C83CC:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C83F4
@@ -2304,7 +2304,7 @@ _080C84C8:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C84F8
@@ -2874,7 +2874,7 @@ _080C8A0C:
 	ldr r2, =0x00000ce6
 	adds r0, r2
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080C8A8C
@@ -2913,7 +2913,7 @@ _080C8A7C:
 	ldr r2, =0x00000ce6
 	adds r0, r1, r2
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C8A98
@@ -3661,7 +3661,7 @@ _080C914E:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080C9168
@@ -3943,7 +3943,7 @@ _080C93E4:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080C9404
@@ -5343,7 +5343,7 @@ sub_80CA044: @ 80CA044
 	movs r0, 0
 	movs r2, 0x4
 	bl InitBgsFromTemplates
-	ldr r1, =gUnknown_08DD2FE8
+	ldr r1, =gPSSMenu_Gfx
 	movs r0, 0
 	str r0, [sp]
 	movs r0, 0x1
@@ -6104,7 +6104,7 @@ sub_80CA704: @ 80CA704
 	ldr r1, [r4]
 	adds r1, 0xB0
 	bl LZ77UnCompWram
-	ldr r0, =gUnknown_08DD36A8
+	ldr r0, =gPSSMenu_Pal
 	movs r1, 0x10
 	movs r2, 0x20
 	bl LoadPalette
@@ -9124,7 +9124,7 @@ _080CBF80:
 	adds r1, r3
 	ldr r0, [r1]
 	ldr r2, [r0]
-	ldr r0, =gUnknown_0857291C
+	ldr r0, =gSpriteAffineAnimTable_857291C
 	str r0, [r2, 0x10]
 	ldr r0, [r1]
 	ldr r0, [r0]
@@ -16168,7 +16168,7 @@ sub_80CFB44: @ 80CFB44
 	.pool
 _080CFB8C:
 	ldrh r0, [r1]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080CFBA4
@@ -16197,7 +16197,7 @@ _080CFBAC:
 	.pool
 _080CFBCC:
 	ldrh r0, [r1]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -21048,8 +21048,8 @@ _080D220C:
 	bx r1
 	thumb_func_end sub_80D214C
 
-	thumb_func_start sub_80D2218
-sub_80D2218: @ 80D2218
+	thumb_func_start CheckFreePokemonStorageSpace
+CheckFreePokemonStorageSpace: @ 80D2218
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -21095,7 +21095,7 @@ _080D2262:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80D2218
+	thumb_func_end CheckFreePokemonStorageSpace
 
 	thumb_func_start sub_80D2270
 sub_80D2270: @ 80D2270