diff options
author | red031000 <rubenru09@aol.com> | 2020-08-31 21:57:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-31 21:57:56 +0100 |
commit | 6891309e08e30a744561d42e347e2dbe2de3eab8 (patch) | |
tree | 19fa922dbfedc4be863aeb5b36f51f76d076fc6e /arm9/global.inc | |
parent | bf25a361cd0d013beb86a936b516957b66cfa011 (diff) | |
parent | 392f50eea4375637f23a4abc8643f525ba98f469 (diff) |
Merge pull request #276 from PikalaxALT/pikalax_work
Trainer parties to json; trainer frontpics to png; refactor graphics rules
Diffstat (limited to 'arm9/global.inc')
-rw-r--r-- | arm9/global.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/global.inc b/arm9/global.inc index 1dc35362..c039fd35 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -4838,11 +4838,11 @@ .extern WazaGetMaxPp .extern GetAttrFromWazaTbl .extern FUN_0206ABC4 -.extern FUN_0206AC74 +.extern TrainerData_GetAttr .extern FUN_0206ACD4 .extern FUN_0206AD4C -.extern FUN_0206ADE0 -.extern FUN_0206ADF0 +.extern TrainerData_ReadTrData +.extern TrainerData_ReadTrPoke .extern FUN_0206AE00 .extern PCStorage_init .extern PCStorage_sizeof |