Merge remote-tracking branch 'origin' into doc_pokesum

This commit is contained in:
PikalaxALT
2021-04-12 16:18:38 -04:00
51 changed files with 415 additions and 432 deletions
+1 -1
View File
@@ -1190,7 +1190,7 @@ extern const u8 gText_BerryCrush_NoBerries[];
extern const u8 gText_BerryCrush_MemberDroppedOut[];
extern const u8 gText_BerryCrush_TimeUp[];
extern const u8 gText_BerryCrush_CommunicationStandby[];
extern const u8 gText_1_ClrLtGryShdwBlk_Dynamic0[];
extern const u8 gText_1_ClrBluShdwLtBlu_Dynamic0[];
extern const u8 gText_1_Dynamic0[];
extern const u8 gText_SpaceTimes[];
extern const u8 gText_XDotY[];