Document FRLG-unique vars in main.c

This commit is contained in:
PikalaxALT
2021-03-16 16:57:52 -04:00
parent 783488aae5
commit c4b61cc0ed
4 changed files with 24 additions and 12 deletions
+3 -3
View File
@@ -4,9 +4,9 @@ gMain
gKeyRepeatContinueDelay gKeyRepeatContinueDelay
gSoftResetDisabled gSoftResetDisabled
gIntrTable gIntrTable
gUnknown_3003578 sVcountAfterSound
gLinkVSyncDisabled gLinkVSyncDisabled
IntrMain_Buffer IntrMain_Buffer
gUnknown_3003D80 sVcountAtIntr
gUnknown_3003D84 sVcountBeforeSound
gPcmDmaCounter gPcmDmaCounter
+1 -1
View File
@@ -185,7 +185,7 @@ extern struct UnusedControllerStruct gUnknown_2022870;
void HandleLinkBattleSetup(void); void HandleLinkBattleSetup(void);
void SetUpBattleVars(void); void SetUpBattleVars(void);
void InitBtlControllers(void); void InitBtlControllers(void);
void sub_800DD28(void); void TryReceiveLinkBattleData(void);
void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data); void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data);
// emitters // emitters
+1 -1
View File
@@ -481,7 +481,7 @@ static void Task_HandleSendLinkBuffersData(u8 taskId)
} }
} }
void sub_800DD28(void) void TryReceiveLinkBattleData(void)
{ {
u8 i; u8 i;
s32 j; s32 j;
+19 -7
View File
@@ -67,9 +67,15 @@ IntrFunc gIntrTable[INTR_COUNT];
bool8 gLinkVSyncDisabled; bool8 gLinkVSyncDisabled;
u32 IntrMain_Buffer[0x200]; u32 IntrMain_Buffer[0x200];
u8 gPcmDmaCounter; u8 gPcmDmaCounter;
u8 gUnknown_3003578;
u8 gUnknown_3003D80; // These variables are not defined in RS or Emerald, and are never read.
u8 gUnknown_3003D84; // They were likely used to debug the audio engine and VCount interrupt.
// Define NDEBUG in include/config.h to remove these variables.
#ifndef NDEBUG
u8 sVcountAfterSound;
u8 sVcountAtIntr;
u8 sVcountBeforeSound;
#endif
static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7; static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7;
@@ -369,11 +375,15 @@ static void VBlankIntr(void)
gPcmDmaCounter = gSoundInfo.pcmDmaCounter; gPcmDmaCounter = gSoundInfo.pcmDmaCounter;
gUnknown_3003D84 = REG_VCOUNT; #ifndef NDEBUG
sVcountBeforeSound = REG_VCOUNT;
#endif
m4aSoundMain(); m4aSoundMain();
gUnknown_3003578 = REG_VCOUNT; #ifndef NDEBUG
sVcountAfterSound = REG_VCOUNT;
#endif
sub_800DD28(); TryReceiveLinkBattleData();
Random(); Random();
UpdateWirelessStatusIndicatorSprite(); UpdateWirelessStatusIndicatorSprite();
@@ -398,7 +408,9 @@ static void HBlankIntr(void)
static void VCountIntr(void) static void VCountIntr(void)
{ {
gUnknown_3003D80 = REG_VCOUNT; #ifndef NDEBUG
sVcountAtIntr = REG_VCOUNT;
#endif
m4aSoundVSync(); m4aSoundVSync();
INTR_CHECK |= INTR_FLAG_VCOUNT; INTR_CHECK |= INTR_FLAG_VCOUNT;
gMain.intrCheck |= INTR_FLAG_VCOUNT; gMain.intrCheck |= INTR_FLAG_VCOUNT;