Quest log doc cleanup

This commit is contained in:
GriffinR
2023-08-18 12:15:02 -04:00
parent 10c1e1298f
commit 09ee60049c
21 changed files with 410 additions and 428 deletions
+13 -13
View File
@@ -772,7 +772,7 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum)
InitSecondaryTilesetAnimation();
UpdateLocationHistoryForRoamer();
RoamerMove();
sub_8110920();
QL_ResetDefeatedWildMonRecord();
DoCurrentWeather();
ResetFieldTasksArgs();
RunOnResumeMapScript();
@@ -803,7 +803,7 @@ static void LoadMapFromWarp(bool32 unused)
TryRegenerateRenewableHiddenItems();
UpdateLocationHistoryForRoamer();
RoamerMoveToOtherLocationSet();
sub_8110920();
QL_ResetDefeatedWildMonRecord();
InitMap();
}
@@ -818,7 +818,7 @@ static void QL_LoadMapNormal(void)
SetSavedWeatherFromCurrMapHeader();
ChooseAmbientCrySpecies();
SetDefaultFlashLevel();
sub_8110920();
QL_ResetDefeatedWildMonRecord();
QL_RestoreMapLayoutId();
LoadSaveblockMapHeader();
InitMap();
@@ -1390,7 +1390,7 @@ static void DoCB1_Overworld(u16 newKeys, u16 heldKeys)
{
struct FieldInput fieldInput;
sub_8112B3C();
QL_TryRunActions();
UpdatePlayerAvatarTransitionState();
FieldClearPlayerInput(&fieldInput);
FieldGetPlayerInput(&fieldInput, newKeys, heldKeys);
@@ -1399,8 +1399,8 @@ static void DoCB1_Overworld(u16 newKeys, u16 heldKeys)
{
if (ProcessPlayerFieldInput(&fieldInput) == TRUE)
{
if (gQuestLogPlaybackState == QL_PLAYBACK_STATE_2)
sub_81127F8(&gInputToStoreInQuestLogMaybe);
if (gQuestLogPlaybackState == QL_PLAYBACK_STATE_RECORDING)
QL_RecordFieldInput(&gFieldInputRecord);
LockPlayerFieldControls();
DismissMapNamePopup();
}
@@ -1416,9 +1416,9 @@ static void DoCB1_Overworld_QuestLogPlayback(void)
{
struct FieldInput fieldInput;
sub_8112B3C();
QL_TryRunActions();
UpdatePlayerAvatarTransitionState();
HandleQuestLogInput();
QL_HandleInput();
FieldClearPlayerInput(&fieldInput);
fieldInput = gQuestLogFieldInput;
FieldInput_HandleCancelSignpost(&fieldInput);
@@ -1445,7 +1445,7 @@ void CB1_Overworld(void)
{
if (gMain.callback2 == CB2_Overworld)
{
if (sub_8112CAC() == 1 || gQuestLogState == QL_STATE_PLAYBACK)
if (QL_GetPlaybackState() == QL_PLAYBACK_STATE_RUNNING || gQuestLogState == QL_STATE_PLAYBACK)
DoCB1_Overworld_QuestLogPlayback();
else
DoCB1_Overworld(gMain.newKeys, gMain.heldKeys);
@@ -2239,8 +2239,8 @@ static bool32 LoadMap_QLPlayback(u8 *state)
InitOverworldBgs();
FieldClearVBlankHBlankCallbacks();
QuestLog_InitPalettesBackup();
sub_81113E4();
sub_8111438();
QL_CopySaveState();
QL_ResetPartyAndPC();
if (GetQuestLogStartType() == QL_START_WARP)
{
gExitStairsMovementDisabled = FALSE;
@@ -2254,7 +2254,7 @@ static bool32 LoadMap_QLPlayback(u8 *state)
(*state)++;
break;
case 1:
sub_8110FCC();
QL_InitSceneObjectsAndActions();
(*state)++;
break;
case 2:
@@ -2296,7 +2296,7 @@ static bool32 LoadMap_QLPlayback(u8 *state)
break;
case 10:
InitTilesetAnimations();
sub_815A540();
QL_TryStopSurfing();
(*state)++;
break;
default: