Fix C/C++ errors generated by CLion IDE
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
#define IS_POKEMON_C
|
||||
|
||||
#include "global.h"
|
||||
#include "pokemon.h"
|
||||
#include "random.h"
|
||||
|
||||
+4
-4
@@ -769,8 +769,8 @@ void sub_8110D48(u8 a0)
|
||||
{
|
||||
struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[a0];
|
||||
|
||||
CpuCopy16(gSaveBlock1Ptr->flags, questLog->unk_148, FLAGS_COUNT * sizeof(u8));
|
||||
CpuCopy16(gSaveBlock1Ptr->vars, questLog->unk_268, VARS_COUNT * sizeof(u16));
|
||||
CpuCopy16(gSaveBlock1Ptr->flags, questLog->flags, FLAGS_COUNT * sizeof(u8));
|
||||
CpuCopy16(gSaveBlock1Ptr->vars, questLog->vars, VARS_COUNT * sizeof(u16));
|
||||
}
|
||||
|
||||
void sub_8110D94(void)
|
||||
@@ -1005,8 +1005,8 @@ void sub_81113E4(void)
|
||||
{
|
||||
struct QuestLog * questLog = &gSaveBlock1Ptr->questLog[gUnknown_203ADF8];
|
||||
|
||||
CpuCopy16(questLog->unk_148, gSaveBlock1Ptr->flags, FLAGS_COUNT * sizeof(u8));
|
||||
CpuCopy16(questLog->unk_268, gSaveBlock1Ptr->vars, VARS_COUNT * sizeof(u16));
|
||||
CpuCopy16(questLog->flags, gSaveBlock1Ptr->flags, FLAGS_COUNT * sizeof(u8));
|
||||
CpuCopy16(questLog->vars, gSaveBlock1Ptr->vars, VARS_COUNT * sizeof(u16));
|
||||
sub_8111688();
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -1479,17 +1479,17 @@ u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing)
|
||||
return (u8)(GetFontAttribute(fontId, 0) + letterSpacing) * width;
|
||||
}
|
||||
|
||||
u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32)
|
||||
u32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
for (i = 0; i < 7; ++i)
|
||||
{
|
||||
if (glyphId == gGlyphWidthFuncs[i].font_id)
|
||||
return gGlyphWidthFuncs[i].func;
|
||||
return *gGlyphWidthFuncs[i].func;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
|
||||
|
||||
Reference in New Issue
Block a user