From 53a4effd577cc60a9e3af422bf99109d54053440 Mon Sep 17 00:00:00 2001 From: PokeCodec <67983839+PokeCodec@users.noreply.github.com> Date: Sat, 5 Sep 2020 16:41:44 -0400 Subject: Tidy up headers --- include/AgbRfu_LinkManager.h | 4 ++-- include/gba/m4a_internal.h | 6 +++--- include/librfu.h | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'include') 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/gba/m4a_internal.h b/include/gba/m4a_internal.h index bdff1b865..09e5646f2 100644 --- a/include/gba/m4a_internal.h +++ b/include/gba/m4a_internal.h @@ -317,9 +317,9 @@ struct SoundInfo u8 pcmDmaPeriod; // number of V-blanks per PCM DMA u8 maxLines; u8 gap[3]; - s32 pcmSamplesPerVBlank; - s32 pcmFreq; - s32 divFreq; + u32 pcmSamplesPerVBlank; + u32 pcmFreq; + u32 divFreq; struct CgbChannel *cgbChans; void (*func)(); u32 intp; diff --git a/include/librfu.h b/include/librfu.h index 69c696172..3c56491c3 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -407,6 +407,7 @@ struct RfuTgtData u16 serialNo; // Game serial number of parent candidate Game serial number of connection partner u8 gname[RFU_GAME_NAME_LENGTH + 2]; // Game name of parent candidate Game name of connection partner u8 uname[RFU_USER_NAME_LENGTH + 1]; // User name for parent candidate User name for connection partner + u8 padding[2]; }; struct RfuLinkStatus -- cgit v1.2.3 From 2d624d66dbe50b1c65b32ae11f6ac7b7eeb33122 Mon Sep 17 00:00:00 2001 From: PokeCodec <67983839+PokeCodec@users.noreply.github.com> Date: Sat, 5 Sep 2020 16:49:33 -0400 Subject: Fix --- include/gba/m4a_internal.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index 09e5646f2..bdff1b865 100644 --- a/include/gba/m4a_internal.h +++ b/include/gba/m4a_internal.h @@ -317,9 +317,9 @@ struct SoundInfo u8 pcmDmaPeriod; // number of V-blanks per PCM DMA u8 maxLines; u8 gap[3]; - u32 pcmSamplesPerVBlank; - u32 pcmFreq; - u32 divFreq; + s32 pcmSamplesPerVBlank; + s32 pcmFreq; + s32 divFreq; struct CgbChannel *cgbChans; void (*func)(); u32 intp; -- cgit v1.2.3 From 5d2a4e02dd9febf57968ddb9754aaf32cdc64065 Mon Sep 17 00:00:00 2001 From: PokeCodec <67983839+PokeCodec@users.noreply.github.com> Date: Sun, 6 Sep 2020 12:14:35 -0400 Subject: Remove explicit padding --- include/librfu.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/librfu.h b/include/librfu.h index 3c56491c3..69c696172 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -407,7 +407,6 @@ struct RfuTgtData u16 serialNo; // Game serial number of parent candidate Game serial number of connection partner u8 gname[RFU_GAME_NAME_LENGTH + 2]; // Game name of parent candidate Game name of connection partner u8 uname[RFU_USER_NAME_LENGTH + 1]; // User name for parent candidate User name for connection partner - u8 padding[2]; }; struct RfuLinkStatus -- cgit v1.2.3 From b49c5d188f19445783ff1ffa82129c4e0a55b13c Mon Sep 17 00:00:00 2001 From: PokeCodec <67983839+PokeCodec@users.noreply.github.com> Date: Sun, 6 Sep 2020 17:59:42 -0400 Subject: Move buffer has and operation too --- include/battle_message.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_message.h b/include/battle_message.h index 011a1cb0c..46db1bea6 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; \ } -- cgit v1.2.3 From 0a13d718ea90cfc853e8ce1e6b3f02202e42fbfe Mon Sep 17 00:00:00 2001 From: PokeCodec <67983839+PokeCodec@users.noreply.github.com> Date: Sun, 6 Sep 2020 20:03:53 -0400 Subject: Make 0xFF have a lowercase "x" --- include/battle_message.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_message.h b/include/battle_message.h index 46db1bea6..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 & 0XFF); \ + textVar[2] = (stringId & 0xFF); \ textVar[3] = (stringId & 0xFF00) >> 8; \ textVar[4] = B_BUFF_EOS; \ } -- cgit v1.2.3 From 3336eb341d4407a42115b52f6404ad921269b2af Mon Sep 17 00:00:00 2001 From: PokeCodec <67983839+PokeCodec@users.noreply.github.com> Date: Tue, 8 Sep 2020 14:26:37 -0400 Subject: More adjustments --- include/battle_main.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') 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); -- cgit v1.2.3