diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-01-19 02:17:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 02:17:21 -0500 |
| commit | 419c897292dbfbc4f6d43880eb94597987e09e2c (patch) | |
| tree | 36094eda149165d0e4dad545924b95f582d83838 /tools/preproc/asm_file.cpp | |
| parent | ac62e8e563f9e74493a394a21c1bd8fa1570b184 (diff) | |
| parent | a52d6e43794e0fa773f10dcebb820bd2bca8fc40 (diff) | |
Merge pull request #380 from GriffinRichards/sync-scaninc
Sync tools with pokeemerald
Diffstat (limited to 'tools/preproc/asm_file.cpp')
| -rw-r--r-- | tools/preproc/asm_file.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp index 07921321d..7756cadc5 100644 --- a/tools/preproc/asm_file.cpp +++ b/tools/preproc/asm_file.cpp @@ -476,9 +476,11 @@ void AsmFile::ExpectEmptyRestOfLine() m_lineStart = m_pos; m_lineNum++; } - else if (m_buffer[m_pos] == '\r') + else if (m_buffer[m_pos] == '\r' && m_buffer[m_pos + 1] == '\n') { - RaiseError("only Unix-style LF newlines are supported"); + m_pos += 2; + m_lineStart = m_pos; + m_lineNum++; } else { |