summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-13 23:04:56 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-13 23:04:56 -0500
commit9e8a841bfa0271a603b5e4895be3067cfa26f8ab (patch)
tree52279a2b052583ccfc4a0d6a592cf8a384227a93 /tools
parentd979ac3bf3924051de8bb4154e8398083535eabb (diff)
parentefc54948345235bdc7d2961d547498612ea8426c (diff)
Merge branch 'master' of github.com:pret/pokeemerald into main-menu-state-machine
Diffstat (limited to 'tools')
-rw-r--r--tools/scaninc/c_file.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/scaninc/c_file.cpp b/tools/scaninc/c_file.cpp
index d470f959d..595f366cb 100644
--- a/tools/scaninc/c_file.cpp
+++ b/tools/scaninc/c_file.cpp
@@ -134,7 +134,7 @@ bool CFile::ConsumeComment()
if (m_buffer[m_pos] == '/' && m_buffer[m_pos + 1] == '*')
{
m_pos += 2;
- while (m_buffer[m_pos] != '*' && m_buffer[m_pos + 1] != '/')
+ while (m_buffer[m_pos] != '*' || m_buffer[m_pos + 1] != '/')
{
if (m_buffer[m_pos] == 0)
return false;