dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Synced src/mon_markings.c and partly synced PSS

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-30 02:22:59 -04:00
parent 4a60396428
commit 60ce72fa5a
88 changed files with 1742 additions and 1590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/quest_log.c
+8 -8
View File
@@ -153,7 +153,7 @@ static const u16 sUnknown_8456638[] = INCBIN_U16("graphics/unknown/unknown_84566
static const u8 sQuestLogTextLineYCoords[] = {17, 10, 3};
void SetQuestLogRecordAndPlaybackPointers(void * oldPointer)
void SetQuestLogRecordAndPlaybackPointers(void *oldPointer)
{
ptrdiff_t offset = (void *)gSaveBlock1Ptr - oldPointer;
if (gUnknown_203AE04)
@@ -201,10 +201,10 @@ void RunQuestLogCB(void)
sQuestLogCB();
}
bool8 sub_8110944(const void * a0, size_t cmdSize)
bool8 sub_8110944(const void *a0, size_t cmdSize)
{
void * r2 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].script;
void * r0 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end;
void *r2 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].script;
void *r0 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end;
r0 -= cmdSize;
if ((const void *)a0 < r2 || (const void *)a0 > r0)
return FALSE;
@@ -213,8 +213,8 @@ bool8 sub_8110944(const void * a0, size_t cmdSize)
bool8 WillCommandOfSizeFitInSav1Record(u16 *cursor, size_t size)
{
void * start = gSaveBlock1Ptr->questLog[sCurrentSceneNum].script;
void * end = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end;
void *start = gSaveBlock1Ptr->questLog[sCurrentSceneNum].script;
void *end = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end;
end -= size;
if ((void *)cursor < start || (void *)cursor > end)
return FALSE;
@@ -1645,9 +1645,9 @@ static const struct FlagOrVarRecord sDummyFlagOrVarRecord = {
0x7FFF
};
void * QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx)
void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx)
{
void * response;
void *response;
if (sQuestLogCursor == 0)
return NULL;
if (sQuestLogCursor >= sNumEventsInLogEntry)