Merge remote-tracking branch 'upstream/master'

data/data.s

@@ -82,16 +82,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
@@ -103,7 +103,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
@@ -124,7 +124,7 @@ gUnknown_823E558:: @ 823E558
 gTrainers:: @ 823EAD8
 	.incbin "baserom.gba", 0x23EAC8, 0x7418
 
-gUnknown_8245EE0:: @ 8245EE0
+gSpeciesNames:: @ 8245EE0
 	.incbin "baserom.gba", 0x245EE0, 0xD05
 
 gUnknown_8246BE5:: @ 8246BE5
@@ -299,10 +299,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
@@ -313,31 +310,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
@@ -346,28 +340,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
@@ -376,19 +370,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