dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix alignment and typos

Browse Source
This commit is contained in:
PikalaxALT
2021-03-23 15:58:16 -04:00
parent 56b37fef8d
commit 877e09438b
6 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sound.h
+1 -1
View File
@@ -47,6 +47,6 @@ bool8 IsSEPlaying(void);
bool8 IsBGMPlaying(void);
bool8 IsSpecialSEPlaying(void);
void SetBGMVolume_SuppressHelpSystemReduction(u16 volume);
void BGMVolumeMax_EnableHelySystemReduction(void);
void BGMVolumeMax_EnableHelpSystemReduction(void);
#endif // GUARD_SOUND_H
include/text.h
+33 -33
View File
@@ -83,15 +83,15 @@
#define CHAR_z 0xEE
#define CHAR_COLON 0xF0
#define CHAR_DYNAMIC_PLACEHOLDER 0xF7
#define CHAR_KEYPAD_ICON 0xF8
#define CHAR_EXTRA_EMOJI 0xF9
#define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog
#define CHAR_PROMPT_CLEAR 0xFB // waits for button press and clears dialog
#define EXT_CTRL_CODE_BEGIN 0xFC // extended control code
#define PLACEHOLDER_BEGIN 0xFD // string placeholder
#define CHAR_NEWLINE 0xFE
#define EOS 0xFF // end of string
#define CHAR_DYNAMIC_PLACEHOLDER 0xF7
#define CHAR_KEYPAD_ICON 0xF8
#define CHAR_EXTRA_EMOJI 0xF9
#define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog
#define CHAR_PROMPT_CLEAR 0xFB // waits for button press and clears dialog
#define EXT_CTRL_CODE_BEGIN 0xFC // extended control code
#define PLACEHOLDER_BEGIN 0xFD // string placeholder
#define CHAR_NEWLINE 0xFE
#define EOS 0xFF // end of string
#define TEXT_COLOR_TRANSPARENT 0x0
#define TEXT_COLOR_WHITE 0x1
@@ -126,30 +126,30 @@
#define PLACEHOLDER_ID_KYOGRE 0xD
// battle placeholders are located in battle_message.h
#define EXT_CTRL_CODE_COLOR 0x1
#define EXT_CTRL_CODE_HIGHLIGHT 0x2
#define EXT_CTRL_CODE_SHADOW 0x3
#define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x4
#define EXT_CTRL_CODE_PALETTE 0x5
#define EXT_CTRL_CODE_FONT 0x6
#define EXT_CTRL_CODE_RESET_FONT 0x7
#define EXT_CTRL_CODE_PAUSE 0x8
#define EXT_CTRL_CODE_WAIT_BUTTON 0x9
#define EXT_CTRL_CODE_WAIT_SE 0xA
#define EXT_CTRL_CODE_PLAY_BGM 0xB
#define EXT_CTRL_CODE_ESCAPE 0xC
#define EXT_CTRL_CODE_SHIFT_RIGHT 0xD
#define EXT_CTRL_CODE_SHIFT_DOWN 0xE
#define EXT_CTRL_CODE_FILL_WINDOW 0xF
#define EXT_CTRL_CODE_PLAY_SE 0x10
#define EXT_CTRL_CODE_CLEAR 0x11
#define EXT_CTRL_CODE_SKIP 0x12
#define EXT_CTRL_CODE_CLEAR_TO 0x13
#define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14
#define EXT_CTRL_CODE_JPN 0x15
#define EXT_CTRL_CODE_ENG 0x16
#define EXT_CTRL_CODE_STOP_BGM 0x17
#define EXT_CTRL_CODE_RESUME_BGM 0x18
#define EXT_CTRL_CODE_COLOR 0x1
#define EXT_CTRL_CODE_HIGHLIGHT 0x2
#define EXT_CTRL_CODE_SHADOW 0x3
#define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x4
#define EXT_CTRL_CODE_PALETTE 0x5
#define EXT_CTRL_CODE_FONT 0x6
#define EXT_CTRL_CODE_RESET_FONT 0x7
#define EXT_CTRL_CODE_PAUSE 0x8
#define EXT_CTRL_CODE_WAIT_BUTTON 0x9
#define EXT_CTRL_CODE_WAIT_SE 0xA
#define EXT_CTRL_CODE_PLAY_BGM 0xB
#define EXT_CTRL_CODE_ESCAPE 0xC
#define EXT_CTRL_CODE_SHIFT_RIGHT 0xD
#define EXT_CTRL_CODE_SHIFT_DOWN 0xE
#define EXT_CTRL_CODE_FILL_WINDOW 0xF
#define EXT_CTRL_CODE_PLAY_SE 0x10
#define EXT_CTRL_CODE_CLEAR 0x11
#define EXT_CTRL_CODE_SKIP 0x12
#define EXT_CTRL_CODE_CLEAR_TO 0x13
#define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14
#define EXT_CTRL_CODE_JPN 0x15
#define EXT_CTRL_CODE_ENG 0x16
#define EXT_CTRL_CODE_STOP_BGM 0x17
#define EXT_CTRL_CODE_RESUME_BGM 0x18
#define NUM_TEXT_PRINTERS 32
src/berry_crush_2.c
+1 -1
View File
@@ -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)
src/pokedex_screen.c
+1 -1
View File
@@ -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;
src/sound.c
+1 -1
View File
@@ -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);
src/text_printer.c
+22 -22
View File
@@ -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)