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

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/quest_log.c
+13 -13
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;
@@ -496,12 +496,12 @@ void DrawPreviouslyOnQuestHeader(u8 sceneNum)
StringAppend(gStringVar4, gStringVar1);
}
AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[0], 2, 2, 2, 1, 2, sTextColors, 0, gStringVar4);
AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[0], FONT_2, 2, 2, 1, 2, sTextColors, 0, gStringVar4);
PutWindowTilemap(sQuestLogHeaderWindowIds[0]);
PutWindowTilemap(sQuestLogHeaderWindowIds[1]);
CopyWindowToVram(sQuestLogHeaderWindowIds[0], COPYWIN_GFX);
CopyWindowToVram(sQuestLogHeaderWindowIds[2], COPYWIN_GFX);
CopyWindowToVram(sQuestLogHeaderWindowIds[1], COPYWIN_BOTH);
CopyWindowToVram(sQuestLogHeaderWindowIds[1], COPYWIN_FULL);
}
void CommitQuestLogWindow1(void)
@@ -809,7 +809,7 @@ static void QuestLog_StartFinalScene(void)
{
ResetSpecialVars();
Save_ResetSaveCounters();
Save_LoadGameData(SAVE_NORMAL);
LoadGameSave(SAVE_NORMAL);
SetMainCallback2(CB2_EnterFieldFromQuestLog);
gFieldCallback2 = FieldCB2_FinalScene;
FreeAllWindowBuffers();
@@ -852,7 +852,7 @@ static void Task_RunPlaybackCB(u8 taskId)
case 0:
if (++data[0] == 0x7F)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0);
sQuestLogCurrentScene.sceneEndMode = 2;
data[1]++;
}
@@ -991,7 +991,7 @@ static void DrawQuestLogSceneDescription(void)
PutWindowTilemap(sQuestLogHeaderWindowIds[2]);
sub_8111D90(sQuestLogHeaderWindowIds[2]);
AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[2], 2, 2, sQuestLogTextLineYCoords[numLines], 1, 0, sTextColors, 0, gStringVar4);
AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[2], FONT_2, 2, sQuestLogTextLineYCoords[numLines], 1, 0, sTextColors, 0, gStringVar4);
ScheduleBgCopyTilemapToVram(0);
}
@@ -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)