Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-08-22 18:34:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch order of fill macros from dest, value to value, dest

Browse Source
This commit is contained in:
YamaArashi
2016-06-10 19:22:09 -07:00
parent 320deb92dd
commit 5dde2ecaaf
6 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/gba/macro.h
View File

@@ -1,7 +1,7 @@
#ifndef GUARD_GBA_MACRO_H
#define GUARD_GBA_MACRO_H
#define CPU_FILL(dest, value, size, bit) \
#define CPU_FILL(value, dest, size, bit) \
{ \
vu##bit tmp = (vu##bit)(value); \
CpuSet((void *)&tmp, \
@@ -9,15 +9,15 @@
CPU_SET_##bit##BIT | CPU_SET_SRC_FIXED | ((size)/(bit/8) & 0x1FFFFF)); \
}
#define CpuFill16(dest, value, size) CPU_FILL(dest, value, size, 16)
#define CpuFill32(dest, value, size) CPU_FILL(dest, value, size, 32)
#define CpuFill16(value, dest, size) CPU_FILL(value, dest, size, 16)
#define CpuFill32(value, dest, size) CPU_FILL(value, dest, size, 32)
#define CPU_COPY(src, dest, size, bit) CpuSet(src, dest, CPU_SET_##bit##BIT | ((size)/(bit/8) & 0x1FFFFF))
#define CpuCopy16(src, dest, size) CPU_COPY(src, dest, size, 16)
#define CpuCopy32(src, dest, size) CPU_COPY(src, dest, size, 32)
#define CpuFastFill(dest, value, size) \
#define CpuFastFill(value, dest, size) \
{ \
vu32 tmp = (vu32)(value); \
CpuFastSet((void *)&tmp, \
@@ -36,7 +36,7 @@
dmaRegs[2]; \
}
#define DMA_FILL(dmaNum, dest, value, size, bit) \
#define DMA_FILL(dmaNum, value, dest, size, bit) \
{ \
vu##bit tmp = (vu##bit)(value); \
DmaSet(dmaNum, \
@@ -46,8 +46,8 @@
| ((size)/(bit/8))); \
}
#define DmaFill16(dmaNum, dest, value, size) DMA_FILL(dmaNum, dest, value, size, 16)
#define DmaFill32(dmaNum, dest, value, size) DMA_FILL(dmaNum, dest, value, size, 32)
#define DmaFill16(dmaNum, value, dest, size) DMA_FILL(dmaNum, value, dest, size, 16)
#define DmaFill32(dmaNum, value, dest, size) DMA_FILL(dmaNum, value, dest, size, 32)
#define DMA_COPY(dmaNum, src, dest, size, bit) \
DmaSet(dmaNum, \

4
src/link.c
View File

@@ -1304,7 +1304,7 @@ static void DisableSerial(void)
REG_TM3CNT_H = 0;
REG_IF = INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL;
CpuFill32(&gLink, 0, sizeof(gLink));
CpuFill32(0, &gLink, sizeof(gLink));
}
static void EnableSerial(void)
@@ -1326,7 +1326,7 @@ static void EnableSerial(void)
REG_SIOMLT_SEND = 0;
CpuFill32(&gLink, 0, sizeof(gLink));
CpuFill32(0, &gLink, sizeof(gLink));
sNumVBlanksWithoutSerialIntr = 0;
sSendNonzeroCheck = 0;

6
src/m4a_2.c
View File

@@ -291,7 +291,7 @@ void MPlayExtender(struct CgbChannel *cgbChans)
soundInfo->MidiKeyToCgbFreq = MidiKeyToCgbFreq;
soundInfo->maxLines = MAX_LINES;
CpuFill32(cgbChans, 0, sizeof(struct CgbChannel) * 4);
CpuFill32(0, cgbChans, sizeof(struct CgbChannel) * 4);
cgbChans[0].ty = 1;
cgbChans[0].panMask = 0x11;
@@ -350,7 +350,7 @@ void SoundInit(struct SoundInfo *soundInfo)
REG_DMA2DAD = (s32)&REG_FIFO_B;
SOUND_INFO_PTR = soundInfo;
CpuFill32(soundInfo, 0, sizeof(struct SoundInfo));
CpuFill32(0, soundInfo, sizeof(struct SoundInfo));
soundInfo->maxChans = 8;
soundInfo->masterVolume = 15;
@@ -515,7 +515,7 @@ void m4aSoundVSyncOff(void)
REG_DMA1CNT_H = DMA_32BIT;
REG_DMA2CNT_H = DMA_32BIT;
CpuFill32(soundInfo->pcmBuffer, 0, sizeof(soundInfo->pcmBuffer));
CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer));
}
}

2
src/main.c
View File

@@ -362,5 +362,5 @@ void DoSoftReset(void)
void ClearPokemonCrySongs(void)
{
CpuFill16(gPokemonCrySongs, 0, MAX_POKEMON_CRIES * sizeof(struct PokemonCrySong));
CpuFill16(0, gPokemonCrySongs, MAX_POKEMON_CRIES * sizeof(struct PokemonCrySong));
}

24
src/palette.c
View File

@@ -70,8 +70,8 @@ void LoadPalette(const void *src, u16 offset, u16 size)
void FillPalette(u16 value, u16 offset, u16 size)
{
CpuFill16(gPlttBufferUnfaded + offset, value, size);
CpuFill16(gPlttBufferFaded + offset, value, size);
CpuFill16(value, gPlttBufferUnfaded + offset, size);
CpuFill16(value, gPlttBufferFaded + offset, size);
}
void TransferPlttBuffer(void)
@@ -91,7 +91,7 @@ u8 UpdatePaletteFade(void)
{
u8 result;
u8 dummy = 0;
if (gPlttBufferTransferPending)
return -1;
@@ -253,7 +253,7 @@ static void unused_sub_8073DFC(struct PaletteStruct *a1, u32 *a2)
a1->ps_field_9--;
a1->srcIndex = 0;
}
*a2 |= 1 << (a1->baseDestOffset >> 4);
}
@@ -441,7 +441,7 @@ static u8 UpdateNormalPaletteFade()
else
{
s8 val;
if (!gPaletteFade.yDec)
{
val = gPaletteFade.y;
@@ -468,7 +468,7 @@ static u8 UpdateNormalPaletteFade()
void InvertPlttBuffer(u32 selectedPalettes)
{
u16 paletteOffset = 0;
while (selectedPalettes)
{
if (selectedPalettes & 1)
@@ -485,7 +485,7 @@ void InvertPlttBuffer(u32 selectedPalettes)
void TintPlttBuffer(u32 selectedPalettes, s8 r, s8 g, s8 b)
{
u16 paletteOffset = 0;
while (selectedPalettes)
{
if (selectedPalettes & 1)
@@ -507,7 +507,7 @@ void TintPlttBuffer(u32 selectedPalettes, s8 r, s8 g, s8 b)
void UnfadePlttBuffer(u32 selectedPalettes)
{
u16 paletteOffset = 0;
while (selectedPalettes)
{
if (selectedPalettes & 1)
@@ -535,10 +535,10 @@ static void BeginFastPaletteFadeInternal(u8 submode)
gPaletteFade.mode = FAST_FADE;
if (submode == FAST_FADE_IN_FROM_BLACK)
CpuFill16(gPlttBufferFaded, RGB_BLACK, PLTT_SIZE);
CpuFill16(RGB_BLACK, gPlttBufferFaded, PLTT_SIZE);
if (submode == FAST_FADE_IN_FROM_WHITE)
CpuFill16(gPlttBufferFaded, RGB_WHITE, PLTT_SIZE);
CpuFill16(RGB_WHITE, gPlttBufferFaded, PLTT_SIZE);
UpdatePaletteFade();
}
@@ -682,10 +682,10 @@ static u8 UpdateFastPaletteFade(void)
CpuCopy32(gPlttBufferUnfaded, gPlttBufferFaded, PLTT_SIZE);
break;
case FAST_FADE_OUT_TO_WHTIE:
CpuFill32(gPlttBufferFaded, 0xFFFFFFFF, PLTT_SIZE);
CpuFill32(0xFFFFFFFF, gPlttBufferFaded, PLTT_SIZE);
break;
case FAST_FADE_OUT_TO_BLACK:
CpuFill32(gPlttBufferFaded, 0, PLTT_SIZE);
CpuFill32(0x00000000, gPlttBufferFaded, PLTT_SIZE);
break;
}

26
src/text.c
View File

@@ -1792,10 +1792,10 @@ static void UpdateBGRegs(struct WindowConfig *winConfig)
static void ClearBGMem(struct WindowConfig *winConfig)
{
CpuFastFill(winConfig->tileData, 0, 32);
CpuFastFill(0, winConfig->tileData, 32);
if (winConfig->tilemap)
CpuFastFill(winConfig->tilemap, 0, 0x800);
CpuFastFill(0, winConfig->tilemap, 0x800);
}
void LoadFontDefaultPalette(struct WindowConfig *winConfig)
@@ -1854,7 +1854,7 @@ static u16 InitVariableWidthFontTileData(struct Window *win, u16 startOffset)
win->tileDataStartOffset = startOffset;
win->tileDataOffset = 2;
buffer = win->tileData + 32 * win->tileDataStartOffset;
CpuFastFill(buffer, 0, 32);
CpuFastFill(0, buffer, 32);
ApplyColors_UnshadowedFont(sBlankTile, (u32 *)(buffer + 32), win->config->foregroundColor, win->config->backgroundColor);
return win->tileDataStartOffset + win->tileDataOffset + win->width * win->height;
}
@@ -3037,8 +3037,8 @@ static void DoScroll_TextMode0(struct Window *win, u16 lineLength)
fill = (win->paletteNum << 12) | GetBlankTileNum(win);
CpuCopy16(buffer + 64, buffer, lineLength * 2);
CpuCopy16(buffer + 96, buffer + 32, lineLength * 2);
CpuFill16(buffer + 64, fill, lineLength * 2);
CpuFill16(buffer + 96, fill, lineLength * 2);
CpuFill16(fill, buffer + 64, lineLength * 2);
CpuFill16(fill, buffer + 96, lineLength * 2);
}
static void ScrollWindowTextLines_TextMode1(struct Window *win)
@@ -3063,8 +3063,8 @@ static void DoScroll_TextMode1(struct Window *win, u16 lineLength)
u16 fill = (win->paletteNum << 12) | GetBlankTileNum(win);
CpuCopy16(buffer + 32, dest, lineLength * 2);
CpuCopy16(buffer + 64, buffer, lineLength * 2);
CpuFill16(buffer + 32, fill, lineLength * 2);
CpuFill16(buffer + 64, fill, lineLength * 2);
CpuFill16(fill, buffer + 32, lineLength * 2);
CpuFill16(fill, buffer + 64, lineLength * 2);
}
static void ScrollWindowTextLines_TextMode2(struct Window *win)
@@ -3092,10 +3092,10 @@ static void DoScroll_TextMode2(struct Window *win, u8 lineLength)
u16 a[4];
CpuFastCopy(buf2, buf1, 32 * lineLength);
CpuFastFill(buf2, sGlyphBuffer.background, 32 * lineLength);
CpuFastFill(sGlyphBuffer.background, buf2, 32 * lineLength);
buf4 = buf2 + 32 * win->width;
CpuFastCopy(buf4, buf1 + 32 * win->width, 32 * lineLength);
CpuFastFill(buf4, sGlyphBuffer.background, 32 * lineLength);
CpuFastFill(sGlyphBuffer.background, buf4, 32 * lineLength);
buf3 = GetCursorTilemapPointer(win) - 64;
@@ -3165,13 +3165,13 @@ static void ClearWindowTextLines_TextMode2(struct Window *win, u8 lineLength)
win->win_field_C = 0;
buffer = win->tileData + 32 * GetCursorTileNum(win, 0, 0);
CpuFastFill(buffer, sGlyphBuffer.background, 32 * lineLength);
CpuFastFill(sGlyphBuffer.background, buffer, 32 * lineLength);
buffer += 32 * win->width;
CpuFastFill(buffer, sGlyphBuffer.background, 32 * lineLength);
CpuFastFill(sGlyphBuffer.background, buffer, 32 * lineLength);
buffer += 32 * win->width;
CpuFastFill(buffer, sGlyphBuffer.background, 32 * lineLength);
CpuFastFill(sGlyphBuffer.background, buffer, 32 * lineLength);
buffer += 32 * win->width;
CpuFastFill(buffer, sGlyphBuffer.background, 32 * lineLength);
CpuFastFill(sGlyphBuffer.background, buffer, 32 * lineLength);
}
static void DrawDownArrow(struct Window *win)