Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz
2019-08-03 06:59:28 +08:00
80 changed files with 4813 additions and 7283 deletions
+5
View File
@@ -203,6 +203,11 @@ extern const u8 gString_BattleRecords_ColumnHeaders[];
extern const u8 gString_BattleRecords_7Dashes[];
extern const u8 gString_BattleRecords_4Dashes[];
// slot_machine
extern const u8 gString_OutOfCoins[];
extern const u8 gString_QuitPlaying[];
extern const u8 gString_SlotMachineControls[];
// battle_controller_safari
extern const u8 gUnknown_83FDA4C[];
extern const u8 gUnknown_83FE747[];