Document src/overworld.c
This commit is contained in:
+4
-4
@@ -782,20 +782,20 @@ static void Task_EnterCableClubSeat(u8 taskId)
|
||||
case 1:
|
||||
if (IsFieldMessageBoxHidden())
|
||||
{
|
||||
sub_8057F34();
|
||||
SetInCableClubSeat();
|
||||
SetLocalLinkPlayerId(gSpecialVar_0x8005);
|
||||
task->data[0] = 2;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
switch (sub_8057EC0())
|
||||
switch (GetCableClubPartnersReady())
|
||||
{
|
||||
case 0:
|
||||
break;
|
||||
case 1:
|
||||
HideFieldMessageBox();
|
||||
task->data[0] = 0;
|
||||
sub_8057F70();
|
||||
SetStartedCableClubActivity();
|
||||
SwitchTaskToFollowupFunc(taskId);
|
||||
break;
|
||||
case 2:
|
||||
@@ -804,7 +804,7 @@ static void Task_EnterCableClubSeat(u8 taskId)
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
sub_8057F48();
|
||||
SetLinkWaitingForScript();
|
||||
sub_80F771C(TRUE);
|
||||
DestroyTask(taskId);
|
||||
EnableBothScriptContexts();
|
||||
|
||||
+1
-2
@@ -1278,8 +1278,7 @@ static bool8 FallWarpEffect_7(struct Task * task)
|
||||
UnfreezeObjectEvents();
|
||||
InstallCameraPanAheadCallback();
|
||||
PlayerGetDestCoords(&x, &y);
|
||||
// Seafoam Islands
|
||||
if (sub_8055B38(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
|
||||
if (MetatileBehavior_IsSurfableInSeafoamIslands(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
|
||||
{
|
||||
VarSet(VAR_TEMP_1, 1);
|
||||
SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_SURFING);
|
||||
|
||||
@@ -264,7 +264,7 @@ static void SetUpWarpExitTask(bool8 playerNotMoving)
|
||||
func = Task_ExitNonAnimDoor;
|
||||
else if (MetatileBehavior_IsDirectionalStairWarp(metatileBehavior) == TRUE)
|
||||
{
|
||||
u8 tmp = gUnknown_2031DE0;
|
||||
u8 tmp = gExitStairsMovementDisabled;
|
||||
func = Task_ExitNonDoor;
|
||||
if (!tmp)
|
||||
func = Task_ExitStairs;
|
||||
@@ -272,7 +272,7 @@ static void SetUpWarpExitTask(bool8 playerNotMoving)
|
||||
else
|
||||
func = Task_ExitNonDoor;
|
||||
}
|
||||
gUnknown_2031DE0 = FALSE;
|
||||
gExitStairsMovementDisabled = FALSE;
|
||||
CreateTask(func, 10);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -221,7 +221,7 @@ static bool8 sub_80A1194(void)
|
||||
ScriptContext2_Enable();
|
||||
FadeInFromBlack();
|
||||
CreateTask(sub_80A11C0, 10);
|
||||
gUnknown_2031DE0 = 0;
|
||||
gExitStairsMovementDisabled = 0;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -468,7 +468,7 @@ static void Task_ExecuteMainMenuSelection(u8 taskId)
|
||||
{
|
||||
default:
|
||||
case MAIN_MENU_NEWGAME:
|
||||
gUnknown_2031DE0 = 0;
|
||||
gExitStairsMovementDisabled = 0;
|
||||
FreeAllWindowBuffers();
|
||||
DestroyTask(taskId);
|
||||
StartNewGameScene();
|
||||
@@ -476,7 +476,7 @@ static void Task_ExecuteMainMenuSelection(u8 taskId)
|
||||
case MAIN_MENU_CONTINUE:
|
||||
gPlttBufferUnfaded[0] = RGB_BLACK;
|
||||
gPlttBufferFaded[0] = RGB_BLACK;
|
||||
gUnknown_2031DE0 = 0;
|
||||
gExitStairsMovementDisabled = 0;
|
||||
FreeAllWindowBuffers();
|
||||
TrySetUpQuestLogScenes_ElseContinueFromSave(taskId);
|
||||
break;
|
||||
|
||||
+230
-237
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -1416,7 +1416,7 @@ static void InitRegionMap(u8 type)
|
||||
}
|
||||
else
|
||||
{
|
||||
gUnknown_2031DE0 = TRUE;
|
||||
gExitStairsMovementDisabled = TRUE;
|
||||
sRegionMap->type = type;
|
||||
sRegionMap->mainState = 0;
|
||||
sRegionMap->openState = 0;
|
||||
@@ -1435,7 +1435,7 @@ void InitRegionMapWithExitCB(u8 type, MainCallback cb)
|
||||
}
|
||||
else
|
||||
{
|
||||
gUnknown_2031DE0 = TRUE;
|
||||
gExitStairsMovementDisabled = TRUE;
|
||||
sRegionMap->type = type;
|
||||
sRegionMap->mainState = 0;
|
||||
sRegionMap->openState = 0;
|
||||
|
||||
Reference in New Issue
Block a user