Merge branch 'master' into heal_location

sym_ewram.txt

@@ -978,10 +978,10 @@ gUnknown_02039F2A: @ 2039F2A
 gUnknown_02039F2B: @ 2039F2B
 	.space 0x1
 
-gScriptContestCategory: @ 2039F2C
+gSpecialVar_ContestCategory: @ 2039F2C
 	.space 0x2
 
-gUnknown_02039F2E: @ 2039F2E
+gSpecialVar_ContestRank: @ 2039F2E
 	.space 0x2
 
 gUnknown_02039F30: @ 2039F30
@@ -1398,11 +1398,7 @@ gUnknown_0203BCCC: @ 203BCCC
 gUnknown_0203BCD4: @ 203BCD4
 	.space 0x4
 
-gUnknown_0203BCD8: @ 203BCD8
-	.space 0x4
-
-gUnknown_0203BCDC: @ 203BCDC
-	.space 0x4
+    .include "src/hall_of_fame.o"
 
 gUnknown_0203BCE0: @ 203BCE0
 	.space 0x2
@@ -1410,7 +1406,7 @@ gUnknown_0203BCE0: @ 203BCE0
 gUnknown_0203BCE2: @ 203BCE2
 	.space 0x2
 
-gUnknown_0203BCE4: @ 203BCE4
+gHasHallOfFameRecords: @ 203BCE4
 	.space 0x1
 
 gUnknown_0203BCE5: @ 203BCE5
@@ -1640,7 +1636,7 @@ gUnknown_0203CE74: @ 203CE74
 gUnknown_0203CE78: @ 203CE78
 	.space 0x4
 
-gScriptItemId: @ 203CE7C
+gSpecialVar_ItemId: @ 203CE7C
 	.space 0x4
 
 gUnknown_0203CE80: @ 203CE80