diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/agb_flash.c | 20 | ||||
| -rw-r--r-- | src/link.c | 84 | ||||
| -rw-r--r-- | src/m4a_2.c | 14 | ||||
| -rw-r--r-- | src/main.c | 18 | ||||
| -rw-r--r-- | src/rtc.c | 2 | ||||
| -rw-r--r-- | src/sprite.c | 24 | ||||
| -rw-r--r-- | src/string_util.c | 2 |
7 files changed, 83 insertions, 81 deletions
diff --git a/src/agb_flash.c b/src/agb_flash.c index 2164da194..34fb4e84a 100644 --- a/src/agb_flash.c +++ b/src/agb_flash.c @@ -6,16 +6,16 @@ static u16 sTimerCount; static vu16 *sTimerReg; static u16 sSavedIme; -COMM_2(u8 gFlashTimeoutFlag) -COMM_2(u8 (*PollFlashStatus)(u8 *)) -COMM_2(u16 (*WaitForFlashWrite)(u8 phase, u8 *addr, u8 lastData)) -COMM_2(u16 (*ProgramFlashSector)(u16 sectorNum, u8 *src)) -COMM_2(const struct FlashType *gFlash) -COMM_2(u16 (*ProgramFlashByte)(u16 sectorNum, u32 offset, u8 data)) -COMM_2(u16 gFlashNumRemainingBytes) -COMM_2(u16 (*EraseFlashChip)()) -COMM_2(u16 (*EraseFlashSector)(u16 sectorNum)) -COMM_2(const u16 *gFlashMaxTime) +u8 gFlashTimeoutFlag; +u8 (*PollFlashStatus)(u8 *); +u16 (*WaitForFlashWrite)(u8 phase, u8 *addr, u8 lastData); +u16 (*ProgramFlashSector)(u16 sectorNum, u8 *src); +const struct FlashType *gFlash; +u16 (*ProgramFlashByte)(u16 sectorNum, u32 offset, u8 data); +u16 gFlashNumRemainingBytes; +u16 (*EraseFlashChip)(); +u16 (*EraseFlashSector)(u16 sectorNum); +const u16 *gFlashMaxTime; void SetReadFlash1(u16 *dest); diff --git a/src/link.c b/src/link.c index fb168e08b..8d1da30a5 100644 --- a/src/link.c +++ b/src/link.c @@ -111,48 +111,48 @@ static u16 sRecvNonzeroCheck; static u8 sChecksumAvailable; static u8 sHandshakePlayerCount; -COMM_3(u16 word_3002910[MAX_LINK_PLAYERS]) -COMM_2(u32 gLinkDebugValue1) -COMM_4(struct LinkPlayerBlock localLinkPlayerBlock) -COMM_2(bool8 gLinkErrorOccurred) -COMM_2(u32 gFiller_3002960) -COMM_2(u32 gLinkDebugValue2) -COMM_2(u32 gFiller_3002968) -COMM_2(bool8 gLinkPlayerPending[MAX_LINK_PLAYERS]) -COMM_4(struct LinkPlayer gLinkPlayers[MAX_LINK_PLAYERS]) -COMM_2(bool8 gBlockReceived[MAX_LINK_PLAYERS]) -COMM_2(u32 gFiller_30029E4) -COMM_2(u16 gLinkHeldKeys) -COMM_2(u16 gLinkTimeOutCounter) -COMM_2(u32 gFiller_30029F0) -COMM_4(struct LinkPlayer localLinkPlayer) -COMM_4(u16 gRecvCmds[CMD_LENGTH][MAX_LINK_PLAYERS]) -COMM_2(u32 gLinkStatus) -COMM_2(bool8 gLinkDummyBool) -COMM_2(u8 byte_3002A68) -COMM_4(u8 gBlockSendBuffer[BLOCK_BUFFER_SIZE]) -COMM_2(bool8 u8_array_3002B70[MAX_LINK_PLAYERS]) -COMM_2(u16 gLinkType) -COMM_2(bool8 u8_array_3002B78[MAX_LINK_PLAYERS]) -COMM_4(u16 gBlockRecvBuffer[MAX_LINK_PLAYERS][BLOCK_BUFFER_SIZE / 2]) -COMM_2(bool8 gSuppressLinkErrorMessage) -COMM_2(u8 gSavedLinkPlayerCount) -COMM_4(u16 gSendCmd[CMD_LENGTH]) -COMM_2(u8 gSavedMultiplayerId) -COMM_2(bool8 gReceivedRemoteLinkPlayers) -COMM_4(struct LinkTestBGInfo gLinkTestBGInfo) -COMM_2(void (*gLinkCallback)(void)) -COMM_4(struct LinkPlayer gSavedLinkPlayers[MAX_LINK_PLAYERS]) -COMM_2(u8 gShouldAdvanceLinkState) -COMM_3(u16 gLinkTestBlockChecksums[MAX_LINK_PLAYERS]) -COMM_2(u32 gFiller_3003050) -COMM_2(u8 gBlockRequestType) -COMM_2(u32 gFiller_3003058) -COMM_2(u32 gFiller_300305C) -COMM_2(u8 gLastSendQueueCount) -COMM_4(struct Link gLink) -COMM_2(u8 gLastRecvQueueCount) -COMM_2(u16 gLinkSavedIme) +u16 word_3002910[MAX_LINK_PLAYERS]; +u32 gLinkDebugValue1; +struct LinkPlayerBlock localLinkPlayerBlock; +bool8 gLinkErrorOccurred; +u32 gFiller_3002960; +u32 gLinkDebugValue2; +u32 gFiller_3002968; +bool8 gLinkPlayerPending[MAX_LINK_PLAYERS]; +struct LinkPlayer gLinkPlayers[MAX_LINK_PLAYERS]; +bool8 gBlockReceived[MAX_LINK_PLAYERS]; +u32 gFiller_30029E4; +u16 gLinkHeldKeys; +u16 gLinkTimeOutCounter; +u32 gFiller_30029F0; +struct LinkPlayer localLinkPlayer; +u16 gRecvCmds[CMD_LENGTH][MAX_LINK_PLAYERS]; +u32 gLinkStatus; +bool8 gLinkDummyBool; +u8 byte_3002A68; +u8 gBlockSendBuffer[BLOCK_BUFFER_SIZE]; +bool8 u8_array_3002B70[MAX_LINK_PLAYERS]; +u16 gLinkType; +bool8 u8_array_3002B78[MAX_LINK_PLAYERS]; +u16 gBlockRecvBuffer[MAX_LINK_PLAYERS][BLOCK_BUFFER_SIZE / 2]; +bool8 gSuppressLinkErrorMessage; +u8 gSavedLinkPlayerCount; +u16 gSendCmd[CMD_LENGTH]; +u8 gSavedMultiplayerId; +bool8 gReceivedRemoteLinkPlayers; +struct LinkTestBGInfo gLinkTestBGInfo; +void (*gLinkCallback)(void); +struct LinkPlayer gSavedLinkPlayers[MAX_LINK_PLAYERS]; +u8 gShouldAdvanceLinkState; +u16 gLinkTestBlockChecksums[MAX_LINK_PLAYERS]; +u32 gFiller_3003050; +u8 gBlockRequestType; +u32 gFiller_3003058; +u32 gFiller_300305C; +u8 gLastSendQueueCount; +struct Link gLink; +u8 gLastRecvQueueCount; +u16 gLinkSavedIme; EWRAM_DATA bool8 gLinkTestDebugValuesEnabled = {0}; EWRAM_DATA bool8 gLinkTestDummyBool = {0}; diff --git a/src/m4a_2.c b/src/m4a_2.c index e0f5809d0..cb4b39e0f 100644 --- a/src/m4a_2.c +++ b/src/m4a_2.c @@ -4,13 +4,13 @@ BSS_CODE ALIGNED(4) char SoundMainRAM_Buffer[0x800] = {0}; -COMM_4(struct SoundInfo gSoundInfo) -COMM_4(struct PokemonCrySong gPokemonCrySongs[MAX_POKEMON_CRIES]) -COMM_4(struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES]) -COMM_4(void *gMPlayJumpTable[36]) -COMM_4(struct CgbChannel gCgbChans[4]) -COMM_4(struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2]) -COMM_4(struct PokemonCrySong gPokemonCrySong) +struct SoundInfo gSoundInfo; +struct PokemonCrySong gPokemonCrySongs[MAX_POKEMON_CRIES]; +struct MusicPlayerInfo gPokemonCryMusicPlayers[MAX_POKEMON_CRIES]; +void *gMPlayJumpTable[36]; +struct CgbChannel gCgbChans[4]; +struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2]; +struct PokemonCrySong gPokemonCrySong; u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust) { diff --git a/src/main.c b/src/main.c index 937978c38..2a1cbc1b7 100644 --- a/src/main.c +++ b/src/main.c @@ -50,15 +50,15 @@ const IntrFunc gIntrTableTemplate[] = #define INTR_COUNT ((int)(sizeof(gIntrTableTemplate)/sizeof(IntrFunc))) -COMM_2(u16 gKeyRepeatStartDelay) -COMM_2(u8 gUnknown_3001764) -COMM_4(struct Main gMain) -COMM_2(u16 gKeyRepeatContinueDelay) -COMM_2(u8 gUnknown_3001BB4) -COMM_4(IntrFunc gIntrTable[INTR_COUNT]) -COMM_2(bool8 gLinkVSyncDisabled) -COMM_4(u32 IntrMain_Buffer[0x200]) -COMM_2(u8 gPcmDmaCounter) +u16 gKeyRepeatStartDelay; +u8 gUnknown_3001764; +struct Main gMain; +u16 gKeyRepeatContinueDelay; +u8 gUnknown_3001BB4; +IntrFunc gIntrTable[INTR_COUNT]; +bool8 gLinkVSyncDisabled; +u32 IntrMain_Buffer[0x200]; +u8 gPcmDmaCounter; EWRAM_DATA void (*gFlashTimerIntrFunc)(void) = NULL; @@ -9,6 +9,8 @@ static struct SiiRtcInfo sRtc; static u8 sProbeResult; static u16 sSavedIme; +struct Time gLocalTime; + static const struct SiiRtcInfo sRtcDummy = {0, MONTH_JAN, 1}; // 2000 Jan 1 static const s32 sNumDaysInMonths[12] = diff --git a/src/sprite.c b/src/sprite.c index 9072a487e..2d9a8d883 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -307,18 +307,18 @@ static u16 sSpriteTileRanges[MAX_SPRITES * 2]; static struct AffineAnimState sAffineAnimStates[OAM_MATRIX_COUNT]; static u16 sSpritePaletteTags[16]; -COMM_4(u8 gSpriteOrder[MAX_SPRITES]) -COMM_4(u8 gSpriteTileAllocBitmap[128]) -COMM_2(s16 gSpriteCoordOffsetX) -COMM_2(u8 gOamLimit) -COMM_2(u16 gReservedSpriteTileCount) -COMM_2(u8 gSpriteCopyRequestCount) -COMM_4(struct SpriteCopyRequest gSpriteCopyRequests[MAX_SPRITE_COPY_REQUESTS]) -COMM_2(s16 gSpriteCoordOffsetY) -COMM_4(struct OamMatrix gOamMatrices[OAM_MATRIX_COUNT]) -COMM_2(bool8 gShouldProcessSpriteCopyRequests) -COMM_2(u32 gOamMatrixAllocBitmap) -COMM_2(u8 gReservedSpritePaletteCount) +u8 gSpriteOrder[MAX_SPRITES]; +u8 gSpriteTileAllocBitmap[128]; +s16 gSpriteCoordOffsetX; +u8 gOamLimit; +u16 gReservedSpriteTileCount; +u8 gSpriteCopyRequestCount; +struct SpriteCopyRequest gSpriteCopyRequests[MAX_SPRITE_COPY_REQUESTS]; +s16 gSpriteCoordOffsetY; +struct OamMatrix gOamMatrices[OAM_MATRIX_COUNT]; +bool8 gShouldProcessSpriteCopyRequests; +u32 gOamMatrixAllocBitmap; +u8 gReservedSpritePaletteCount; EWRAM_DATA struct Sprite gSprites[MAX_SPRITES + 1] = {0}; EWRAM_DATA u16 gSpritePriorities[MAX_SPRITES] = {0}; diff --git a/src/string_util.c b/src/string_util.c index cbcaff766..9f939014a 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -19,7 +19,7 @@ static u8 *ExpandPlaceholder_GoodLeader(void); static u8 *ExpandPlaceholder_EvilLegendary(void); static u8 *ExpandPlaceholder_GoodLegendary(void); -COMM_4(u8 gUnknownStringVar[16]) +u8 gUnknownStringVar[16]; const u8 gEmptyString_81E72B0[] = _""; const u8 gRightPointingTriangleString[] = _"▶"; |