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

also started fixing pointers in my dumps

asm/contest_painting.s

@@ -386,7 +386,7 @@ sub_813010C: @ 813010C
 	ldr r1, =gText_Space
 	adds r0, r4, 0
 	bl StringAppend
-	ldr r1, =gUnknown_085B07D4
+	ldr r1, =gContestRankTextPointers
 	ldr r0, [r6]
 	ldrb r0, [r0, 0x1E]
 	lsls r0, 2
@@ -415,7 +415,7 @@ _08130190:
 	adds r1, 0xB
 	bl StringCopy
 	ldr r0, =gStringVar4
-	ldr r2, =gUnknown_085B07F4
+	ldr r2, =gContestPaintingDescriptionPointers
 	lsls r1, r5, 2
 	adds r1, r2
 	ldr r1, [r1]
@@ -572,7 +572,7 @@ sub_81302E8: @ 81302E8
 	ldr r1, [r0, 0x4]
 	ldr r2, [r0]
 	adds r0, r5, 0
-	bl species_and_otid_get_pal
+	bl GetFrontSpritePalFromSpeciesAndPersonality
 	ldr r7, =gUnknown_030061C4
 	ldr r1, [r7]
 	bl LZDecompressVram