diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /src/help_system.c | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
Diffstat (limited to 'src/help_system.c')
| -rw-r--r-- | src/help_system.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/help_system.c b/src/help_system.c index eeeb0a65f..9c794f878 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -74,9 +74,9 @@ u8 RunHelpSystemCallback(void) sVideoState.state = 2; break; case 2: - RequestDma3Fill(0, (void *)BG_CHAR_ADDR(3), BG_CHAR_SIZE, 0); - RequestDma3Copy(sPals, (void *)PLTT, sizeof(sPals), 0); - RequestDma3Copy(sTiles, gDecompressionBuffer + 0x3EE0, sizeof(sTiles), 0); + RequestDma3Fill(0, (void *)BG_CHAR_ADDR(3), BG_CHAR_SIZE, DMA3_16BIT); + RequestDma3Copy(sPals, (void *)PLTT, sizeof(sPals), DMA3_16BIT); + RequestDma3Copy(sTiles, gDecompressionBuffer + 0x3EE0, sizeof(sTiles), DMA3_16BIT); sVideoState.state = 3; break; case 3: @@ -160,7 +160,7 @@ void SaveMapGPURegs(void) void SaveMapTiles(void) { - RequestDma3Copy((void *)BG_CHAR_ADDR(3), sMapTilesBackup, BG_CHAR_SIZE, 0); + RequestDma3Copy((void *)BG_CHAR_ADDR(3), sMapTilesBackup, BG_CHAR_SIZE, DMA3_16BIT); } void SaveMapTextColors(void) @@ -189,7 +189,7 @@ void RestoreGPURegs(void) void RestoreMapTiles(void) { - RequestDma3Copy(sMapTilesBackup, (void *)BG_CHAR_ADDR(3), BG_CHAR_SIZE, 0); + RequestDma3Copy(sMapTilesBackup, (void *)BG_CHAR_ADDR(3), BG_CHAR_SIZE, DMA3_16BIT); } void RestoreMapTextColors(void) @@ -203,7 +203,7 @@ void RestoreMapTextColors(void) void CommitTilemap(void) { - RequestDma3Copy(gDecompressionBuffer, (void *)BG_CHAR_ADDR(3), BG_CHAR_SIZE, 0); + RequestDma3Copy(gDecompressionBuffer, (void *)BG_CHAR_ADDR(3), BG_CHAR_SIZE, DMA3_16BIT); } void HS_DrawBgTilemapRect(u16 baseTile, u8 left, u8 top, u8 width, u8 height, u16 increment) |