diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-08-02 00:45:49 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2019-08-02 00:45:49 +0200 |
| commit | 9306c142b3d566c1309caae9cd54b11ea433a570 (patch) | |
| tree | 9dabdb5b4128510d23da9d5ac72a1ef1c93689bd /include/strings.h | |
| parent | 4d2d8779bfb56385b5e35d3010d28a248780f134 (diff) | |
| parent | 242bed733fb960743701e0ab088e5b2bc1d92e79 (diff) | |
Merge dodrio with master
Diffstat (limited to 'include/strings.h')
| -rw-r--r-- | include/strings.h | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/include/strings.h b/include/strings.h index 7e80a2ac1..261396678 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2708,21 +2708,6 @@ extern const u8 gText_Symbols[]; extern const u8 gText_Register2[]; extern const u8 gText_Exit2[]; -// Pokemon jump -extern const u8 gText_WantToPlayAgain2[]; -extern const u8 gText_SomeoneDroppedOut2[]; -extern const u8 gText_CommunicationStandby4[]; -extern const u8 gText_AwesomeWonF701F700[]; -extern const u8 gText_FilledStorageSpace2[]; -extern const u8 gText_CantHoldMore[]; - -// Pokenav Match Call -extern const u8 gText_CallCantBeMadeHere[]; -extern const u8 gText_NumberRegistered[]; -extern const u8 gText_NumberOfBattles[]; -extern const u8 gText_Unknown[]; -extern const u8 gText_TrainerCloseBy[]; - // Dodrio Berry Picking extern const u8 gText_BerryPickingRecords[]; extern const u8 gText_BerriesPicked[]; @@ -2745,4 +2730,40 @@ extern const u8 gText_WantToPlayAgain[]; extern const u8 gText_CommunicationStandby3[]; extern const u8 gText_SomeoneDroppedOut[]; +// Pokemon jump +extern const u8 gText_WantToPlayAgain2[]; +extern const u8 gText_SomeoneDroppedOut2[]; +extern const u8 gText_CommunicationStandby4[]; +extern const u8 gText_AwesomeWonF701F700[]; +extern const u8 gText_FilledStorageSpace2[]; +extern const u8 gText_CantHoldMore[]; + +// Pokenav Match Call +extern const u8 gText_CallCantBeMadeHere[]; +extern const u8 gText_NumberRegistered[]; +extern const u8 gText_NumberOfBattles[]; +extern const u8 gText_Unknown[]; +extern const u8 gText_TrainerCloseBy[]; + +// pokenav_unk_2 +extern const u8 gUnknown_085EBCC5[]; +extern const u8 gUnknown_085EBCE8[]; +extern const u8 gUnknown_085EBD01[]; +extern const u8 gUnknown_085EBD1C[]; +extern const u8 gUnknown_085EBD34[]; +extern const u8 gUnknown_085EBD83[]; +extern const u8 gUnknown_085EBDA2[]; +extern const u8 gUnknown_085EBDBF[]; +extern const u8 gUnknown_085EBDDB[]; +extern const u8 gUnknown_085EBDEE[]; +extern const u8 gUnknown_085EBE06[]; +extern const u8 gUnknown_085EBE19[]; +extern const u8 gUnknown_085EBE2D[]; +extern const u8 gUnknown_085EBE41[]; + +// pokenav_unk_4 +extern const u8 gUnknown_085EC017[]; +extern const u8 gUnknown_085EC01C[]; +extern const u8 gUnknown_085EC022[]; + #endif // GUARD_STRINGS_H |