diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 16:52:18 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 16:52:18 -0400 |
| commit | ad1e7f58f2912df805d9a768715497c9cc6a85c1 (patch) | |
| tree | c08534f0cb1a3269e632fec9996ec75482936070 /arm9/global.inc | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/global.inc')
| -rw-r--r-- | arm9/global.inc | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/arm9/global.inc b/arm9/global.inc index 02f56526..9da41335 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1470,34 +1470,34 @@ .extern FUN_02023874 .extern FUN_02023884 .extern FUN_020238A4 -.extern FUN_020238C4 -.extern FUN_020238C8 -.extern FUN_020238F4 +.extern Sav2_PlayerData_sizeof +.extern Sav2_PlayerData_init +.extern Sav2_GetPlayerDataPtr .extern FUN_0202390C .extern FUN_02023918 -.extern FUN_02023924 -.extern FUN_02023928 +.extern PlayerData_sizeof +.extern PlayerData_init .extern FUN_0202393C -.extern FUN_02023948 -.extern FUN_0202395C -.extern FUN_0202397C +.extern PlayerData_Clear +.extern CopyPlayerName +.extern PlayerName_StringToFlat .extern FUN_0202398C -.extern FUN_02023990 -.extern FUN_020239A0 +.extern PlayerName_FlatToString +.extern PlayerData_GetPlayerName_NewString .extern FUN_020239B8 -.extern FUN_020239BC -.extern FUN_020239C0 -.extern FUN_020239C8 -.extern FUN_020239CC -.extern FUN_020239D0 -.extern FUN_020239E4 -.extern FUN_020239F4 -.extern FUN_02023A10 -.extern FUN_02023A14 +.extern PlayerData_GetTrainerID +.extern PlayerData_GetTrainerID_VisibleHalf +.extern PlayerData_SetTrainerGender +.extern PlayerData_GetTrainerGender +.extern PlayerData_TestBadgeFlag +.extern PlayerData_SetBadgeFlag +.extern PlayerData_CountBadges +.extern PlayerData_GetMoney +.extern PlayerData_SetMoney .extern FUN_02023A28 .extern FUN_02023A2C -.extern FUN_02023A30 -.extern FUN_02023A54 +.extern PlayerData_AddMoney +.extern PlayerData_SubMoney .extern FUN_02023A68 .extern FUN_02023A6C .extern FUN_02023A70 @@ -1506,7 +1506,7 @@ .extern FUN_02023A88 .extern FUN_02023A90 .extern FUN_02023A9C -.extern FUN_02023AA4 +.extern PlayerData_NameAndOTIDMatchPlayer .extern FUN_02023AC4 .extern FUN_02023AC8 .extern FUN_02023ACC |