Merge branch 'master' into quest_log

data/data.s

@@ -79,16 +79,16 @@ gUnknown_8235E6C:: @ 8235E6C
 gUnknown_823654C:: @ 823654C
 	.incbin "baserom.gba", 0x23654C, 0xDC0
 
-gUnknown_823730C:: @ 823730C
+gMonPaletteTable:: @ 823730C
 	.incbin "baserom.gba", 0x23730C, 0xE8
 
 gUnknown_82373F4:: @ 82373F4
 	.incbin "baserom.gba", 0x2373F4, 0xCD8
 
-gUnknown_82380CC:: @ 82380CC
+gMonShinyPaletteTable:: @ 82380CC
 	.incbin "baserom.gba", 0x2380CC, 0x1010
 
-gUnknown_82390DC:: @ 82390DC
+gTrainerFrontAnimsPtrTable:: @ 82390DC
 	.incbin "baserom.gba", 0x2390DC, 0x250
 
 gUnknown_823932C:: @ 823932C
@@ -100,7 +100,7 @@ gUnknown_823957C:: @ 823957C
 gUnknown_8239A1C:: @ 8239A1C
 	.incbin "baserom.gba", 0x239A1C, 0x558
 
-gUnknown_8239F74:: @ 8239F74
+gTrainerBackAnimsPtrTable:: @ 8239F74
 	.incbin "baserom.gba", 0x239F74, 0x18
 
 gUnknown_8239F8C:: @ 8239F8C
@@ -121,7 +121,7 @@ gUnknown_823E558:: @ 823E558
 gTrainers:: @ 823EAD8
 	.incbin "baserom.gba", 0x23EAC8, 0x7418
 
-gUnknown_8245EE0:: @ 8245EE0
+gSpeciesNames:: @ 8245EE0
 	.incbin "baserom.gba", 0x245EE0, 0xD05
 
 gUnknown_8246BE5:: @ 8246BE5
@@ -296,10 +296,7 @@ gUnknown_8250B20:: @ 8250B20
 	.incbin "baserom.gba", 0x250B20, 0xE4
 
 gBattleMoves:: @ 8250C04
-	.incbin "baserom.gba", 0x250C04, 0x4
-
-gUnknown_8250C08:: @ 8250C08
-	.incbin "baserom.gba", 0x250C08, 0x10B0
+	.incbin "baserom.gba", 0x250C04, 0x10B4
 
 gUnknown_8251CB8:: @ 8251CB8
 	.incbin "baserom.gba", 0x251CB8, 0x336
@@ -310,31 +307,28 @@ gUnknown_8251FEE:: @ 8251FEE
 gUnknown_8252324:: @ 8252324
 	.incbin "baserom.gba", 0x252324, 0x338
 
-gUnknown_825265C:: @ 825265C
-	.incbin "baserom.gba", 0x25265C, 0x2
+gSpindaSpotGraphics:: @ 825265C
+	.incbin "baserom.gba", 0x25265C, 0x260
 
-gUnknown_825265E:: @ 825265E
-	.incbin "baserom.gba", 0x25265E, 0x25E
-
-gUnknown_82528BC:: @ 82528BC
+gItemEffectTable:: @ 82528BC
 	.incbin "baserom.gba", 0x2528BC, 0x28C
 
-gUnknown_8252B48:: @ 8252B48
+gNatureStatTable:: @ 8252B48
 	.incbin "baserom.gba", 0x252B48, 0x80
 
-gUnknown_8252BC8:: @ 8252BC8
+gTMHMLearnsets:: @ 8252BC8
 	.incbin "baserom.gba", 0x252BC8, 0xCE0
 
-gUnknown_82538A8:: @ 82538A8
+gFacilityClassToPicIndex:: @ 82538A8
 	.incbin "baserom.gba", 0x2538A8, 0x96
 
-gUnknown_825393E:: @ 825393E
+gFacilityClassToTrainerClass:: @ 825393E
 	.incbin "baserom.gba", 0x25393E, 0x96
 
 gUnknown_82539D4:: @ 82539D4
 	.incbin "baserom.gba", 0x2539D4, 0x110
 
-gUnknown_8253AE4:: @ 8253AE4
+gExperienceTables:: @ 8253AE4
 	.incbin "baserom.gba", 0x253AE4, 0xCA0
 
 gBaseStats:: @ 8254784
@@ -343,28 +337,28 @@ gBaseStats:: @ 8254784
 gUnknown_8254795:: @ 8254795
 	.incbin "baserom.gba", 0x254795, 0x4FBF
 
-gUnknown_8259754:: @ 8259754
+gEvolutionTable:: @ 8259754
 	.incbin "baserom.gba", 0x259754, 0x4060
 
-gUnknown_825D7B4:: @ 825D7B4
+gLevelUpLearnsets:: @ 825D7B4
 	.incbin "baserom.gba", 0x25D7B4, 0x670
 
-gUnknown_825DE24:: @ 825DE24
+gPokeblockFlavorCompatibilityTable:: @ 825DE24
 	.incbin "baserom.gba", 0x25DE24, 0x7D
 
 gUnknown_825DEA1:: @ 825DEA1
 	.incbin "baserom.gba", 0x25DEA1, 0x4
 
-gUnknown_825DEA5:: @ 825DEA5
+gPPUpWriteMasks:: @ 825DEA5
 	.incbin "baserom.gba", 0x25DEA5, 0x4
 
 gUnknown_825DEA9:: @ 825DEA9
 	.incbin "baserom.gba", 0x25DEA9, 0x4
 
-gUnknown_825DEAD:: @ 825DEAD
+gStatStageRatios:: @ 825DEAD
 	.incbin "baserom.gba", 0x25DEAD, 0x1F
 
-gUnknown_825DECC:: @ 825DECC
+sHoldEffectToType:: @ 825DECC
 	.incbin "baserom.gba", 0x25DECC, 0x24
 
 gUnknown_825DEF0:: @ 825DEF0
@@ -373,19 +367,19 @@ gUnknown_825DEF0:: @ 825DEF0
 gUnknown_825DF50:: @ 825DF50
 	.incbin "baserom.gba", 0x25DF50, 0x90
 
-gUnknown_825DFE0:: @ 825DFE0
+sSecretBaseFacilityClasses:: @ 825DFE0
 	.incbin "baserom.gba", 0x25DFE0, 0xA
 
-gUnknown_825DFEA:: @ 825DFEA
+sGetMonDataEVConstants:: @ 825DFEA
 	.incbin "baserom.gba", 0x25DFEA, 0x6
 
 gUnknown_825DFF0:: @ 825DFF0
 	.incbin "baserom.gba", 0x25DFF0, 0x6
 
-gUnknown_825DFF6:: @ 825DFF6
+sFriendshipEventDeltas:: @ 825DFF6
 	.incbin "baserom.gba", 0x25DFF6, 0x1E
 
-gUnknown_825E014:: @ 825E014
+sHMMoves:: @ 825E014
 	.incbin "baserom.gba", 0x25E014, 0x12
 
 gUnknown_825E026:: @ 825E026

data/data_84827AC.s

@@ -276,19 +276,19 @@ gUnknown_83FAC34:: @ 83FAC34
 gUnknown_83FB134:: @ 83FB134
 	.incbin "baserom.gba", 0x3FB134, 0xA80
 
-gUnknown_83FBBB4:: @ 83FBBB4
+BattleText_MistShroud:: @ 83FBBB4
 	.incbin "baserom.gba", 0x3FBBB4, 0x35
 
-gUnknown_83FBBE9:: @ 83FBBE9
+BattleText_GetPumped:: @ 83FBBE9
 	.incbin "baserom.gba", 0x3FBBE9, 0xE43
 
-gUnknown_83FCA2C:: @ 83FCA2C
+gText_PkmnsXPreventsSwitching:: @ 83FCA2C
 	.incbin "baserom.gba", 0x3FCA2C, 0x11E
 
-gUnknown_83FCB4A:: @ 83FCB4A
+BattleText_Rose:: @ 83FCB4A
 	.incbin "baserom.gba", 0x3FCB4A, 0x20
 
-gUnknown_83FCB6A:: @ 83FCB6A
+BattleText_UnknownString3:: @ 83FCB6A
 	.incbin "baserom.gba", 0x3FCB6A, 0x120
 
 gUnknown_83FCC8A:: @ 83FCC8A
@@ -579,7 +579,7 @@ gUnknown_83FE860:: @ 83FE860
 gUnknown_83FE864:: @ 83FE864
 	.incbin "baserom.gba", 0x3FE864, 0x4
 
-gUnknown_83FE868:: @ 83FE868
+gText_BadEgg:: @ 83FE868
 	.incbin "baserom.gba", 0x3FE868, 0xC
 
 gUnknown_83FE874:: @ 83FE874
@@ -1185,7 +1185,7 @@ gExpandedPlaceholder_Red:: @ 8415A58
 gExpandedPlaceholder_Green:: @ 8415A5C
 	.incbin "baserom.gba", 0x415A5C, 0x6
 
-gUnknown_8415A62:: @ 8415A62
+gText_EggNickname:: @ 8415A62
 	.incbin "baserom.gba", 0x415A62, 0x4
 
 gUnknown_8415A66:: @ 8415A66