diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/berry_crush_2.c | 2 | ||||
| -rw-r--r-- | src/pokedex_screen.c | 2 | ||||
| -rw-r--r-- | src/sound.c | 2 | ||||
| -rw-r--r-- | src/text_printer.c | 44 |
4 files changed, 25 insertions, 25 deletions
diff --git a/src/berry_crush_2.c b/src/berry_crush_2.c index cb5b97b47..fa9440888 100644 --- a/src/berry_crush_2.c +++ b/src/berry_crush_2.c @@ -743,7 +743,7 @@ static void BerryCrush_UpdateGameState(struct BerryCrushGame * game) u8 i; for (i = 0; i < game->playerCount; ++i) - game->unk68.as_four_players.others[i].apply.as_2d_bytes[1][5] = 0; + game->unk68.as_four_players.others[i].unk4.as_2d_bytes[1][5] = 0; #endif if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00 || gRecvCmds[0][1] != 2) diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index d71d2bec7..3c05010ae 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -925,7 +925,7 @@ bool8 sub_8102798(void) FREE_IF_NOT_NULL(GetBgTilemapBuffer(1)); FREE_IF_NOT_NULL(GetBgTilemapBuffer(2)); FREE_IF_NOT_NULL(GetBgTilemapBuffer(3)); - BGMVolumeMax_EnableHelySystemReduction(); + BGMVolumeMax_EnableHelpSystemReduction(); break; } return TRUE; diff --git a/src/sound.c b/src/sound.c index 47fc7e892..e14cd4c4e 100644 --- a/src/sound.c +++ b/src/sound.c @@ -636,7 +636,7 @@ void SetBGMVolume_SuppressHelpSystemReduction(u16 volume) m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, volume); } -void BGMVolumeMax_EnableHelySystemReduction(void) +void BGMVolumeMax_EnableHelpSystemReduction(void) { gDisableHelpSystemVolumeReduce = FALSE; m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); diff --git a/src/text_printer.c b/src/text_printer.c index c8d7fe329..bd29cb0ec 100644 --- a/src/text_printer.c +++ b/src/text_printer.c @@ -209,28 +209,28 @@ u8 GetLastTextColor(u8 colorType) } } -#define GLYPH_COPY(widthOffset, heightOffset, width, height, a4, a5, a6, sizeX) \ -{ \ - int xAdd, v1, yAdd, v3, toOrr, bits; \ - u8 * src, * dst; \ - u32 v8; \ - \ - src = gGlyphInfo.pixels + (heightOffset / 8 * 0x40) + (widthOffset / 8 * 0x20); \ - for (yAdd = 0, v3 = a6 + heightOffset; yAdd < height; yAdd++, v3++) \ - { \ - v8 = *(u32 *)src; \ - for (xAdd = 0, v1 = a5 + widthOffset; xAdd < width; xAdd++, v1++) \ - { \ - dst = (u8 *)((a4) + ((v1 >> 1) & 3) + ((v1 >> 3) << 5) + (((v3 >> 3) * (sizeX)) << 5) + ((u32)(v3 << 29) >> 27)); \ - toOrr = (v8 >> (xAdd * 4)) & 0xF; \ - if (toOrr != 0) \ - { \ - bits = (v1 & 1) * 4; \ - *dst = (toOrr << bits) | (*dst & (0xF0 >> bits)); \ - } \ - } \ - src += 4; \ - } \ +#define GLYPH_COPY(widthOffset, heightOffset, width, height, a4, a5, a6, sizeX) \ +{ \ + int xAdd, v1, yAdd, v3, toOrr, bits; \ + u8 * src, * dst; \ + u32 v8; \ + \ + src = gGlyphInfo.pixels + (heightOffset / 8 * 0x40) + (widthOffset / 8 * 0x20); \ + for (yAdd = 0, v3 = a6 + heightOffset; yAdd < height; yAdd++, v3++) \ + { \ + v8 = *(u32 *)src; \ + for (xAdd = 0, v1 = a5 + widthOffset; xAdd < width; xAdd++, v1++) \ + { \ + dst = (u8 *)((a4) + ((v1 >> 1) & 3) + ((v1 >> 3) << 5) + (((v3 >> 3) * (sizeX)) << 5) + ((u32)(v3 << 29) >> 27)); \ + toOrr = (v8 >> (xAdd * 4)) & 0xF; \ + if (toOrr != 0) \ + { \ + bits = (v1 & 1) * 4; \ + *dst = (toOrr << bits) | (*dst & (0xF0 >> bits)); \ + } \ + } \ + src += 4; \ + } \ } void CopyGlyphToWindow(struct TextPrinter *textPrinter) |