Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-27 12:26:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015

Browse Source
This commit is contained in:
Eduardo Quezada
2024-10-15 20:56:56 -03:00
parent 0f8b2a1ba8 a55c75d350
commit 80447bee8e
140 changed files with 928 additions and 1969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/preproc/asm_file.cpp
View File

@@ -26,7 +26,7 @@
#include "char_util.h"
#include "utf8.h"
#include "string_parser.h"
#include "../../gflib/characters.h"
#include "../../include/constants/characters.h"
#include "io.h"
AsmFile::AsmFile(std::string filename, bool isStdin, bool doEnum) : m_filename(filename)
@@ -524,6 +524,17 @@ bool AsmFile::ParseEnum()
long enumCounter = 0;
long symbolCount = 0;
if (m_buffer[m_pos] == ':') // : <type>
{
m_pos++;
std::string underlyingType;
do {
currentHeaderLine += SkipWhitespaceAndEol();
underlyingType = ReadIdentifier();
} while (!underlyingType.empty());
currentHeaderLine += SkipWhitespaceAndEol();
}
if (m_buffer[m_pos] != '{') // assume assembly macro, otherwise assume enum and report errors accordingly
{
m_pos = fallbackPosition - 4;