Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-08 11:06:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove INCBIN_S*

Browse Source 
The signed INCBINs are unused, I assume they were once for audio data
but that is handled in assembly now.
This commit is contained in:
Martin Griffin
2026-04-18 09:30:12 +01:00
parent 61674ecd4b
commit 84e8d23425
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/preproc/c_file.cpp
View File

@@ -281,10 +281,10 @@ int ExtractData(const std::unique_ptr<unsigned char[]>& buffer, int offset, int
void CFile::TryConvertIncbin()
{
std::string idents[6] = { "INCBIN_S8", "INCBIN_U8", "INCBIN_S16", "INCBIN_U16", "INCBIN_S32", "INCBIN_U32" };
std::string idents[3] = { "INCBIN_U8", "INCBIN_U16", "INCBIN_U32" };
int incbinType = -1;
for (int i = 0; i < 6; i++)
for (int i = 0; i < 3; i++)
{
if (CheckIdentifier(idents[i]))
{
@@ -296,8 +296,7 @@ void CFile::TryConvertIncbin()
if (incbinType == -1)
return;
int size = 1 << (incbinType / 2);
bool isSigned = ((incbinType % 2) == 0);
int size = 1 << incbinType;
long oldPos = m_pos;
long oldLineNum = m_lineNum;
@@ -364,11 +363,7 @@ void CFile::TryConvertIncbin()
{
int data = ExtractData(buffer, offset, size);
offset += size;
if (isSigned)
std::printf("%d,", data);
else
std::printf("%uu,", data);
std::printf("%uu,", data);
}
SkipWhitespace();

4
tools/scaninc/c_file.cpp
View File

@@ -218,10 +218,10 @@ void CFile::CheckIncbin()
return;
}
std::string idents[6] = { "INCBIN_S8", "INCBIN_U8", "INCBIN_S16", "INCBIN_U16", "INCBIN_S32", "INCBIN_U32" };
std::string idents[3] = { "INCBIN_U8", "INCBIN_U16", "INCBIN_U32" };
int incbinType = -1;
for (int i = 0; i < 6; i++)
for (int i = 0; i < 3; i++)
{
if (CheckIdentifier(idents[i]))
{