diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-09-08 16:31:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-08 16:31:47 -0400 |
| commit | 818bc4ebe5893783ef386b10b8b0ec6b4967086b (patch) | |
| tree | 4239d2cb1ce9d69df2d6e872dc993ad06ee08776 /include | |
| parent | 16ecbc6446f4e8d308e71aa5e649c69acb8a6b3e (diff) | |
| parent | 4d31980359af92c407a15358d3c73ba47d6f00b7 (diff) | |
Merge pull request #1179 from PokeCodec/Maintenance
Match CheckBagHasSpace
Diffstat (limited to 'include')
| -rw-r--r-- | include/AgbRfu_LinkManager.h | 4 | ||||
| -rw-r--r-- | include/battle_main.h | 2 | ||||
| -rw-r--r-- | include/battle_message.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/AgbRfu_LinkManager.h b/include/AgbRfu_LinkManager.h index d4ef13183..4e1a879c2 100644 --- a/include/AgbRfu_LinkManager.h +++ b/include/AgbRfu_LinkManager.h @@ -176,8 +176,8 @@ typedef struct linkManagerTag /* 0x024 */ VBL_TIMER nameAcceptTimer; /* 0x030 */ VBL_TIMER linkRecoveryTimer; /* 0x03c */ INIT_PARAM *init_param; - /* 0x040 */ void (*LMAN_callback)(u8, u8); - /* 0x044 */ void (*MSC_callback)(u16); + /* 0x040 */ void (*LMAN_callback)(u8 msg, u8 paramCount); + /* 0x044 */ void (*MSC_callback)(u16 REQ_commandID); } LINK_MANAGER; extern struct linkManagerTag lman; diff --git a/include/battle_main.h b/include/battle_main.h index 890e47f39..9e3dc7cd6 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -73,8 +73,6 @@ void nullsub_20(void); void BeginBattleIntro(void); void SwitchInClearSetData(void); void FaintClearSetData(void); -void sub_803B3AC(void); // unused -void sub_803B598(void); // unused void BattleTurnPassed(void); u8 IsRunningFromBattleImpossible(void); void SwitchPartyOrder(u8 battlerId); diff --git a/include/battle_message.h b/include/battle_message.h index 011a1cb0c..af090a06c 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -145,7 +145,7 @@ { \ textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ textVar[1] = B_BUFF_STRING; \ - textVar[2] = stringId; \ + textVar[2] = (stringId & 0xFF); \ textVar[3] = (stringId & 0xFF00) >> 8; \ textVar[4] = B_BUFF_EOS; \ } |