diff options
| author | RoastVeg <RoastVeg@users.noreply.github.com> | 2020-06-20 17:57:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 17:57:41 +0100 |
| commit | 6298426d9ad4c59a875b0a90a0facfa1a3a513cc (patch) | |
| tree | 542386bd071b5b5b5b87ec9ad65668745eabc0c4 /arm9/global.inc | |
| parent | 53ac396de4098e38a6916e0cc86cbd278a960c4c (diff) | |
| parent | 16b091058e6135f9b7875fcf074d812d610df380 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'arm9/global.inc')
| -rw-r--r-- | arm9/global.inc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/arm9/global.inc b/arm9/global.inc index 91b0ca46..80a7aa6a 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -524,18 +524,18 @@ .extern FUN_0200A2AC .extern FUN_0200A318 .extern FUN_0200A344 -.extern FUN_0200A648 -.extern FUN_0200A738 +.extern ReadMsgData_NewNarc_ExistingString +.extern ReadMsgData_NewNarc_NewString .extern NewMsgDataFromNarc .extern DestroyMsgData -.extern FUN_0200A8E0 -.extern FUN_0200A914 -.extern FUN_0200A940 -.extern DecryptCopyString +.extern ReadMsgDataIntoString +.extern NewString_ReadMsgData +.extern MsgDataGetCount +.extern ReadMsgDataIntoU16Array +.extern GetSpeciesNameIntoArray +.extern ReadMsgData_ExpandPlaceholders +.extern GetMoveName .extern GetSpeciesName -.extern FUN_0200A9C4 -.extern FUN_0200AA14 -.extern FUN_0200AA50 .extern FUN_0200AA80 .extern FUN_0200AA90 .extern FUN_0200AB18 @@ -596,7 +596,7 @@ .extern FUN_0200B708 .extern FUN_0200B764 .extern FUN_0200B7A8 -.extern FUN_0200B7B8 +.extern StringExpandPlaceholders .extern FUN_0200B84C .extern FUN_0200B870 .extern FUN_0200B990 @@ -1388,11 +1388,11 @@ .extern FUN_020218D8 .extern FUN_02021934 .extern FUN_0202199C -.extern FUN_020219F4 -.extern FUN_02021A20 -.extern FUN_02021A4C -.extern FUN_02021A74 -.extern FUN_02021ACC +.extern String_ctor +.extern String_dtor +.extern StringSetEmpty +.extern StringCopy +.extern StringDup .extern FUN_02021B04 .extern FUN_02021C38 .extern FUN_02021CE0 @@ -1402,7 +1402,7 @@ .extern FUN_02021E28 .extern FUN_02021E8C .extern FUN_02021EF0 -.extern FUN_02021F2C +.extern String_c_str .extern FUN_02021F4C .extern FUN_02021FB0 .extern FUN_02021FF8 @@ -7596,8 +7596,8 @@ .extern SetupBytecodeScript .extern SetupNativeScript .extern StopScript -.extern StringCopy -.extern StringCopyN +.extern CopyU16StringArray +.extern CopyU16StringArrayN .extern StringFillEOS .extern StringLength .extern StringNotEqual |