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

Review changes

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-30 13:11:02 -04:00
parent 60ce72fa5a
commit bcfebc7de4
13 changed files with 256 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_records.c
+1 -1
View File
@@ -167,7 +167,7 @@ static void Task_WaitFadeIn(u8 taskId)
static void Task_WaitButton(u8 taskId) static void Task_WaitButton(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON))
{ {
src/cable_club.c
+4 -4
View File
@@ -580,7 +580,7 @@ void CableClub_AskSaveTheGame(void)
static void Task_StartWiredCableClubBattle(u8 taskId) static void Task_StartWiredCableClubBattle(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
@@ -772,7 +772,7 @@ void ExitLinkRoom(void)
static void Task_EnterCableClubSeat(u8 taskId) static void Task_EnterCableClubSeat(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
@@ -821,7 +821,7 @@ static void CreateEnterCableClubSeatTaskWithFollowupFunc(TaskFunc followUpFunc)
static void Task_StartWiredCableClubTrade(u8 taskId) static void Task_StartWiredCableClubTrade(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
@@ -936,7 +936,7 @@ bool32 GetSeeingLinkPlayerCardMsg(u8 who)
void Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout(u8 taskId) void Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
task->data[0]++; task->data[0]++;
if (task->data[0] > 300) if (task->data[0] > 300)
{ {
src/event_object_lock.c
+1 -1
View File
@@ -42,7 +42,7 @@ void ScriptFreezeObjectEvents(void)
void Task_WaitPlayerAndTargetNPCStopMoving(u8 taskId) void Task_WaitPlayerAndTargetNPCStopMoving(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
if (task->data[0] == 0 && walkrun_is_standing_still() == TRUE) if (task->data[0] == 0 && walkrun_is_standing_still() == TRUE)
{ {
src/fame_checker.c
+2 -2
View File
@@ -1503,7 +1503,7 @@ static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list
static void Task_SwitchToPickMode(u8 taskId) static void Task_SwitchToPickMode(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
task->data[2] = CreatePersonPicSprite(sFameCheckerData->unlockedPersons[sLastMenuIdx]); task->data[2] = CreatePersonPicSprite(sFameCheckerData->unlockedPersons[sLastMenuIdx]);
gSprites[task->data[2]].data[0] = 0; gSprites[task->data[2]].data[0] = 0;
GetPickModeText(); GetPickModeText();
@@ -1642,7 +1642,7 @@ static void HandleFlavorTextModeSwitch(bool8 state)
static void Task_FCOpenOrCloseInfoBox(u8 taskId) static void Task_FCOpenOrCloseInfoBox(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
src/field_effect.c
+169 -169
View File
@@ -161,7 +161,7 @@ static const union AnimCmd *const sNewGameOakAnimTable[] = {
static const struct SpriteTemplate sNewGameOakObjectTemplate = { static const struct SpriteTemplate sNewGameOakObjectTemplate = {
.tileTag = TAG_NONE, .tileTag = TAG_NONE,
.paletteTag = 4102, .paletteTag = 0x1006,
.oam = &sNewGameOakOamAttributes, .oam = &sNewGameOakOamAttributes,
.anims = sNewGameOakAnimTable, .anims = sNewGameOakAnimTable,
.images = sNewGameOakObjectSpriteFrames, .images = sNewGameOakObjectSpriteFrames,
@@ -1133,15 +1133,15 @@ static void Task_FlyIntoMap(u8 taskId)
} }
static void Task_FallWarpFieldEffect(u8 taskId); static void Task_FallWarpFieldEffect(u8 taskId);
static bool8 FallWarpEffect_1(struct Task * task); static bool8 FallWarpEffect_1(struct Task *task);
static bool8 FallWarpEffect_2(struct Task * task); static bool8 FallWarpEffect_2(struct Task *task);
static bool8 FallWarpEffect_3(struct Task * task); static bool8 FallWarpEffect_3(struct Task *task);
static bool8 FallWarpEffect_4(struct Task * task); static bool8 FallWarpEffect_4(struct Task *task);
static bool8 FallWarpEffect_5(struct Task * task); static bool8 FallWarpEffect_5(struct Task *task);
static bool8 FallWarpEffect_6(struct Task * task); static bool8 FallWarpEffect_6(struct Task *task);
static bool8 FallWarpEffect_7(struct Task * task); static bool8 FallWarpEffect_7(struct Task *task);
static bool8 (*const sFallWarpEffectCBPtrs[])(struct Task * task) = { static bool8 (*const sFallWarpEffectCBPtrs[])(struct Task *task) = {
FallWarpEffect_1, FallWarpEffect_1,
FallWarpEffect_2, FallWarpEffect_2,
FallWarpEffect_3, FallWarpEffect_3,
@@ -1164,12 +1164,12 @@ void FieldCB_FallWarpExit(void)
static void Task_FallWarpFieldEffect(u8 taskId) static void Task_FallWarpFieldEffect(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
while (sFallWarpEffectCBPtrs[task->data[0]](task)) while (sFallWarpEffectCBPtrs[task->data[0]](task))
; ;
} }
static bool8 FallWarpEffect_1(struct Task * task) static bool8 FallWarpEffect_1(struct Task *task)
{ {
struct ObjectEvent * playerObject; struct ObjectEvent * playerObject;
struct Sprite *playerSprite; struct Sprite *playerSprite;
@@ -1187,7 +1187,7 @@ static bool8 FallWarpEffect_1(struct Task * task)
return TRUE; return TRUE;
} }
static bool8 FallWarpEffect_2(struct Task * task) static bool8 FallWarpEffect_2(struct Task *task)
{ {
if (IsWeatherNotFadingIn()) if (IsWeatherNotFadingIn())
{ {
@@ -1196,7 +1196,7 @@ static bool8 FallWarpEffect_2(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 FallWarpEffect_3(struct Task * task) static bool8 FallWarpEffect_3(struct Task *task)
{ {
struct Sprite *sprite; struct Sprite *sprite;
s16 centerToCornerVecY; s16 centerToCornerVecY;
@@ -1211,7 +1211,7 @@ static bool8 FallWarpEffect_3(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 FallWarpEffect_4(struct Task * task) static bool8 FallWarpEffect_4(struct Task *task)
{ {
struct ObjectEvent * objectEvent; struct ObjectEvent * objectEvent;
struct Sprite *sprite; struct Sprite *sprite;
@@ -1245,7 +1245,7 @@ static bool8 FallWarpEffect_4(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 FallWarpEffect_5(struct Task * task) static bool8 FallWarpEffect_5(struct Task *task)
{ {
task->data[0]++; task->data[0]++;
task->data[1] = 4; task->data[1] = 4;
@@ -1254,7 +1254,7 @@ static bool8 FallWarpEffect_5(struct Task * task)
return TRUE; return TRUE;
} }
static bool8 FallWarpEffect_6(struct Task * task) static bool8 FallWarpEffect_6(struct Task *task)
{ {
SetCameraPanning(0, task->data[1]); SetCameraPanning(0, task->data[1]);
task->data[1] = -task->data[1]; task->data[1] = -task->data[1];
@@ -1270,7 +1270,7 @@ static bool8 FallWarpEffect_6(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 FallWarpEffect_7(struct Task * task) static bool8 FallWarpEffect_7(struct Task *task)
{ {
s16 x, y; s16 x, y;
gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.preventStep = FALSE;
@@ -1290,27 +1290,27 @@ static bool8 FallWarpEffect_7(struct Task * task)
} }
static void Task_EscalatorWarpFieldEffect(u8 taskId); static void Task_EscalatorWarpFieldEffect(u8 taskId);
static bool8 EscalatorWarpEffect_1(struct Task * task); static bool8 EscalatorWarpEffect_1(struct Task *task);
static bool8 EscalatorWarpEffect_2(struct Task * task); static bool8 EscalatorWarpEffect_2(struct Task *task);
static bool8 EscalatorWarpEffect_3(struct Task * task); static bool8 EscalatorWarpEffect_3(struct Task *task);
static bool8 EscalatorWarpEffect_4(struct Task * task); static bool8 EscalatorWarpEffect_4(struct Task *task);
static bool8 EscalatorWarpEffect_5(struct Task * task); static bool8 EscalatorWarpEffect_5(struct Task *task);
static bool8 EscalatorWarpEffect_6(struct Task * task); static bool8 EscalatorWarpEffect_6(struct Task *task);
static void Escalator_AnimatePlayerGoingDown(struct Task * task); static void Escalator_AnimatePlayerGoingDown(struct Task *task);
static void Escalator_AnimatePlayerGoingUp(struct Task * task); static void Escalator_AnimatePlayerGoingUp(struct Task *task);
static void Escalator_BeginFadeOutToNewMap(void); static void Escalator_BeginFadeOutToNewMap(void);
static void Escalator_TransitionToWarpInEffect(void); static void Escalator_TransitionToWarpInEffect(void);
static void FieldCB_EscalatorWarpIn(void); static void FieldCB_EscalatorWarpIn(void);
static void Task_EscalatorWarpInFieldEffect(u8 taskId); static void Task_EscalatorWarpInFieldEffect(u8 taskId);
static bool8 EscalatorWarpInEffect_1(struct Task * task); static bool8 EscalatorWarpInEffect_1(struct Task *task);
static bool8 EscalatorWarpInEffect_2(struct Task * task); static bool8 EscalatorWarpInEffect_2(struct Task *task);
static bool8 EscalatorWarpInEffect_3(struct Task * task); static bool8 EscalatorWarpInEffect_3(struct Task *task);
static bool8 EscalatorWarpInEffect_4(struct Task * task); static bool8 EscalatorWarpInEffect_4(struct Task *task);
static bool8 EscalatorWarpInEffect_5(struct Task * task); static bool8 EscalatorWarpInEffect_5(struct Task *task);
static bool8 EscalatorWarpInEffect_6(struct Task * task); static bool8 EscalatorWarpInEffect_6(struct Task *task);
static bool8 EscalatorWarpInEffect_7(struct Task * task); static bool8 EscalatorWarpInEffect_7(struct Task *task);
static bool8 (*const sEscalatorWarpFieldEffectFuncs[])(struct Task * task) = { static bool8 (*const sEscalatorWarpFieldEffectFuncs[])(struct Task *task) = {
EscalatorWarpEffect_1, EscalatorWarpEffect_1,
EscalatorWarpEffect_2, EscalatorWarpEffect_2,
EscalatorWarpEffect_3, EscalatorWarpEffect_3,
@@ -1329,12 +1329,12 @@ void StartEscalatorWarp(u8 metatileBehavior, u8 priority)
static void Task_EscalatorWarpFieldEffect(u8 taskId) static void Task_EscalatorWarpFieldEffect(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
while (sEscalatorWarpFieldEffectFuncs[task->data[0]](task)) while (sEscalatorWarpFieldEffectFuncs[task->data[0]](task))
; ;
} }
static bool8 EscalatorWarpEffect_1(struct Task * task) static bool8 EscalatorWarpEffect_1(struct Task *task)
{ {
FreezeObjectEvents(); FreezeObjectEvents();
CameraObjectReset2(); CameraObjectReset2();
@@ -1344,7 +1344,7 @@ static bool8 EscalatorWarpEffect_1(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 EscalatorWarpEffect_2(struct Task * task) static bool8 EscalatorWarpEffect_2(struct Task *task)
{ {
struct ObjectEvent * objectEvent; struct ObjectEvent * objectEvent;
objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -1363,7 +1363,7 @@ static bool8 EscalatorWarpEffect_2(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 EscalatorWarpEffect_3(struct Task * task) static bool8 EscalatorWarpEffect_3(struct Task *task)
{ {
Escalator_AnimatePlayerGoingDown(task); Escalator_AnimatePlayerGoingDown(task);
if (task->data[2] > 3) if (task->data[2] > 3)
@@ -1374,14 +1374,14 @@ static bool8 EscalatorWarpEffect_3(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 EscalatorWarpEffect_4(struct Task * task) static bool8 EscalatorWarpEffect_4(struct Task *task)
{ {
Escalator_AnimatePlayerGoingDown(task); Escalator_AnimatePlayerGoingDown(task);
Escalator_TransitionToWarpInEffect(); Escalator_TransitionToWarpInEffect();
return FALSE; return FALSE;
} }
static bool8 EscalatorWarpEffect_5(struct Task * task) static bool8 EscalatorWarpEffect_5(struct Task *task)
{ {
Escalator_AnimatePlayerGoingUp(task); Escalator_AnimatePlayerGoingUp(task);
if (task->data[2] > 3) if (task->data[2] > 3)
@@ -1392,7 +1392,7 @@ static bool8 EscalatorWarpEffect_5(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 EscalatorWarpEffect_6(struct Task * task) static bool8 EscalatorWarpEffect_6(struct Task *task)
{ {
Escalator_AnimatePlayerGoingUp(task); Escalator_AnimatePlayerGoingUp(task);
Escalator_TransitionToWarpInEffect(); Escalator_TransitionToWarpInEffect();
@@ -1400,7 +1400,7 @@ static bool8 EscalatorWarpEffect_6(struct Task * task)
} }
static void Escalator_AnimatePlayerGoingDown(struct Task * task) static void Escalator_AnimatePlayerGoingDown(struct Task *task)
{ {
struct Sprite *sprite; struct Sprite *sprite;
sprite = &gSprites[gPlayerAvatar.spriteId]; sprite = &gSprites[gPlayerAvatar.spriteId];
@@ -1413,7 +1413,7 @@ static void Escalator_AnimatePlayerGoingDown(struct Task * task)
} }
} }
static void Escalator_AnimatePlayerGoingUp(struct Task * task) static void Escalator_AnimatePlayerGoingUp(struct Task *task)
{ {
struct Sprite *sprite; struct Sprite *sprite;
sprite = &gSprites[gPlayerAvatar.spriteId]; sprite = &gSprites[gPlayerAvatar.spriteId];
@@ -1444,7 +1444,7 @@ static void Escalator_TransitionToWarpInEffect(void)
} }
} }
static bool8 (*const sEscalatorWarpInFieldEffectFuncs[])(struct Task * task) = { static bool8 (*const sEscalatorWarpInFieldEffectFuncs[])(struct Task *task) = {
EscalatorWarpInEffect_1, EscalatorWarpInEffect_1,
EscalatorWarpInEffect_2, EscalatorWarpInEffect_2,
EscalatorWarpInEffect_3, EscalatorWarpInEffect_3,
@@ -1467,12 +1467,12 @@ static void FieldCB_EscalatorWarpIn(void)
static void Task_EscalatorWarpInFieldEffect(u8 taskId) static void Task_EscalatorWarpInFieldEffect(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
while (sEscalatorWarpInFieldEffectFuncs[task->data[0]](task)) while (sEscalatorWarpInFieldEffectFuncs[task->data[0]](task))
; ;
} }
static bool8 EscalatorWarpInEffect_1(struct Task * task) static bool8 EscalatorWarpInEffect_1(struct Task *task)
{ {
struct ObjectEvent * objectEvent; struct ObjectEvent * objectEvent;
s16 x; s16 x;
@@ -1497,7 +1497,7 @@ static bool8 EscalatorWarpInEffect_1(struct Task * task)
return TRUE; return TRUE;
} }
static bool8 EscalatorWarpInEffect_2(struct Task * task) static bool8 EscalatorWarpInEffect_2(struct Task *task)
{ {
struct Sprite *sprite; struct Sprite *sprite;
sprite = &gSprites[gPlayerAvatar.spriteId]; sprite = &gSprites[gPlayerAvatar.spriteId];
@@ -1507,7 +1507,7 @@ static bool8 EscalatorWarpInEffect_2(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 EscalatorWarpInEffect_3(struct Task * task) static bool8 EscalatorWarpInEffect_3(struct Task *task)
{ {
struct Sprite *sprite; struct Sprite *sprite;
sprite = &gSprites[gPlayerAvatar.spriteId]; sprite = &gSprites[gPlayerAvatar.spriteId];
@@ -1528,7 +1528,7 @@ static bool8 EscalatorWarpInEffect_3(struct Task * task)
} }
static bool8 EscalatorWarpInEffect_4(struct Task * task) static bool8 EscalatorWarpInEffect_4(struct Task *task)
{ {
struct Sprite *sprite; struct Sprite *sprite;
sprite = &gSprites[gPlayerAvatar.spriteId]; sprite = &gSprites[gPlayerAvatar.spriteId];
@@ -1538,7 +1538,7 @@ static bool8 EscalatorWarpInEffect_4(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 EscalatorWarpInEffect_5(struct Task * task) static bool8 EscalatorWarpInEffect_5(struct Task *task)
{ {
struct Sprite *sprite; struct Sprite *sprite;
sprite = &gSprites[gPlayerAvatar.spriteId]; sprite = &gSprites[gPlayerAvatar.spriteId];
@@ -1558,7 +1558,7 @@ static bool8 EscalatorWarpInEffect_5(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 EscalatorWarpInEffect_6(struct Task * task) static bool8 EscalatorWarpInEffect_6(struct Task *task)
{ {
if (IsEscalatorMoving()) if (IsEscalatorMoving())
{ {
@@ -1569,7 +1569,7 @@ static bool8 EscalatorWarpInEffect_6(struct Task * task)
return TRUE; return TRUE;
} }
static bool8 EscalatorWarpInEffect_7(struct Task * task) static bool8 EscalatorWarpInEffect_7(struct Task *task)
{ {
struct ObjectEvent * objectEvent; struct ObjectEvent * objectEvent;
objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -1587,13 +1587,13 @@ static bool8 EscalatorWarpInEffect_7(struct Task * task)
static void Task_UseWaterfall(u8 taskId); static void Task_UseWaterfall(u8 taskId);
static bool8 waterfall_0_setup(struct Task * task, struct ObjectEvent * playerObj); static bool8 waterfall_0_setup(struct Task *task, struct ObjectEvent * playerObj);
static bool8 waterfall_1_do_anim_probably(struct Task * task, struct ObjectEvent * playerObj); static bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent * playerObj);
static bool8 waterfall_2_wait_anim_finish_probably(struct Task * task, struct ObjectEvent * playerObj); static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent * playerObj);
static bool8 waterfall_3_move_player_probably(struct Task * task, struct ObjectEvent * playerObj); static bool8 waterfall_3_move_player_probably(struct Task *task, struct ObjectEvent * playerObj);
static bool8 waterfall_4_wait_player_move_probably(struct Task * task, struct ObjectEvent * playerObj); static bool8 waterfall_4_wait_player_move_probably(struct Task *task, struct ObjectEvent * playerObj);
static bool8 (*const sUseWaterfallFieldEffectFuncs[])(struct Task * task, struct ObjectEvent * playerObj) = { static bool8 (*const sUseWaterfallFieldEffectFuncs[])(struct Task *task, struct ObjectEvent * playerObj) = {
waterfall_0_setup, waterfall_0_setup,
waterfall_1_do_anim_probably, waterfall_1_do_anim_probably,
waterfall_2_wait_anim_finish_probably, waterfall_2_wait_anim_finish_probably,
@@ -1615,7 +1615,7 @@ static void Task_UseWaterfall(u8 taskId)
; ;
} }
static bool8 waterfall_0_setup(struct Task * task, struct ObjectEvent * playerObj) static bool8 waterfall_0_setup(struct Task *task, struct ObjectEvent * playerObj)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
@@ -1623,7 +1623,7 @@ static bool8 waterfall_0_setup(struct Task * task, struct ObjectEvent * playerOb
return FALSE; return FALSE;
} }
static bool8 waterfall_1_do_anim_probably(struct Task * task, struct ObjectEvent * playerObj) static bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent * playerObj)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
if (!ObjectEventIsMovementOverridden(playerObj)) if (!ObjectEventIsMovementOverridden(playerObj))
@@ -1636,7 +1636,7 @@ static bool8 waterfall_1_do_anim_probably(struct Task * task, struct ObjectEvent
return FALSE; return FALSE;
} }
static bool8 waterfall_2_wait_anim_finish_probably(struct Task * task, struct ObjectEvent * playerObj) static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent * playerObj)
{ {
if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
return FALSE; return FALSE;
@@ -1644,14 +1644,14 @@ static bool8 waterfall_2_wait_anim_finish_probably(struct Task * task, struct Ob
return TRUE; return TRUE;
} }
static bool8 waterfall_3_move_player_probably(struct Task * task, struct ObjectEvent * playerObj) static bool8 waterfall_3_move_player_probably(struct Task *task, struct ObjectEvent * playerObj)
{ {
ObjectEventSetHeldMovement(playerObj, GetWalkSlowerMovementAction(DIR_NORTH)); ObjectEventSetHeldMovement(playerObj, GetWalkSlowerMovementAction(DIR_NORTH));
task->data[0]++; task->data[0]++;
return FALSE; return FALSE;
} }
static bool8 waterfall_4_wait_player_move_probably(struct Task * task, struct ObjectEvent * playerObj) static bool8 waterfall_4_wait_player_move_probably(struct Task *task, struct ObjectEvent * playerObj)
{ {
if (!ObjectEventClearHeldMovementIfFinished(playerObj)) if (!ObjectEventClearHeldMovementIfFinished(playerObj))
return FALSE; return FALSE;
@@ -1723,20 +1723,20 @@ static bool8 DiveFieldEffect_TryWarp(struct Task *task)
} }
static void Task_LavaridgeGymB1FWarp(u8 taskId); static void Task_LavaridgeGymB1FWarp(u8 taskId);
static bool8 LavaridgeGymB1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGymB1FWarpEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGymB1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGymB1FWarpEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGymB1FWarpEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGymB1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGymB1FWarpEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGymB1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGymB1FWarpEffect_5(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGymB1FWarpEffect_6(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGymB1FWarpEffect_6(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static void FieldCB_LavaridgeGymB1FWarpExit(void); static void FieldCB_LavaridgeGymB1FWarpExit(void);
static void Task_LavaridgeGymB1FWarpExit(u8 taskId); static void Task_LavaridgeGymB1FWarpExit(u8 taskId);
static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 (*const sLavaridgeGymB1FWarpEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { static bool8 (*const sLavaridgeGymB1FWarpEffectFuncs[])(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = {
LavaridgeGymB1FWarpEffect_1, LavaridgeGymB1FWarpEffect_1,
LavaridgeGymB1FWarpEffect_2, LavaridgeGymB1FWarpEffect_2,
LavaridgeGymB1FWarpEffect_3, LavaridgeGymB1FWarpEffect_3,
@@ -1755,7 +1755,7 @@ static void Task_LavaridgeGymB1FWarp(u8 taskId)
while (sLavaridgeGymB1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); while (sLavaridgeGymB1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId]));
} }
static bool8 LavaridgeGymB1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGymB1FWarpEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
FreezeObjectEvents(); FreezeObjectEvents();
CameraObjectReset2(); CameraObjectReset2();
@@ -1767,7 +1767,7 @@ static bool8 LavaridgeGymB1FWarpEffect_1(struct Task * task, struct ObjectEvent
return TRUE; return TRUE;
} }
static bool8 LavaridgeGymB1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGymB1FWarpEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
SetCameraPanning(0, task->data[1]); SetCameraPanning(0, task->data[1]);
task->data[1] = -task->data[1]; task->data[1] = -task->data[1];
@@ -1780,7 +1780,7 @@ static bool8 LavaridgeGymB1FWarpEffect_2(struct Task * task, struct ObjectEvent
return FALSE; return FALSE;
} }
static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGymB1FWarpEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
sprite->y2 = 0; sprite->y2 = 0;
task->data[3] = 1; task->data[3] = 1;
@@ -1794,7 +1794,7 @@ static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent
return TRUE; return TRUE;
} }
static bool8 LavaridgeGymB1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGymB1FWarpEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
s16 centerToCornerVecY; s16 centerToCornerVecY;
SetCameraPanning(0, task->data[1]); SetCameraPanning(0, task->data[1]);
@@ -1837,7 +1837,7 @@ static bool8 LavaridgeGymB1FWarpEffect_4(struct Task * task, struct ObjectEvent
return FALSE; return FALSE;
} }
static bool8 LavaridgeGymB1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGymB1FWarpEffect_5(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
TryFadeOutOldMapMusic(); TryFadeOutOldMapMusic();
WarpFadeOutScreen(); WarpFadeOutScreen();
@@ -1845,7 +1845,7 @@ static bool8 LavaridgeGymB1FWarpEffect_5(struct Task * task, struct ObjectEvent
return FALSE; return FALSE;
} }
static bool8 LavaridgeGymB1FWarpEffect_6(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGymB1FWarpEffect_6(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
if (!gPaletteFade.active && BGMusicStopped() == TRUE) if (!gPaletteFade.active && BGMusicStopped() == TRUE)
{ {
@@ -1857,7 +1857,7 @@ static bool8 LavaridgeGymB1FWarpEffect_6(struct Task * task, struct ObjectEvent
return FALSE; return FALSE;
} }
static bool8 (*const sLavaridgeGymB1FWarpExitEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { static bool8 (*const sLavaridgeGymB1FWarpExitEffectFuncs[])(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = {
LavaridgeGymB1FWarpExitEffect_1, LavaridgeGymB1FWarpExitEffect_1,
LavaridgeGymB1FWarpExitEffect_2, LavaridgeGymB1FWarpExitEffect_2,
LavaridgeGymB1FWarpExitEffect_3, LavaridgeGymB1FWarpExitEffect_3,
@@ -1879,7 +1879,7 @@ static void Task_LavaridgeGymB1FWarpExit(u8 taskId)
while (sLavaridgeGymB1FWarpExitEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); while (sLavaridgeGymB1FWarpExitEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId]));
} }
static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
CameraObjectReset2(); CameraObjectReset2();
FreezeObjectEvents(); FreezeObjectEvents();
@@ -1889,7 +1889,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task * task, struct ObjectEv
return FALSE; return FALSE;
} }
static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
if (IsWeatherNotFadingIn()) if (IsWeatherNotFadingIn())
{ {
@@ -1903,7 +1903,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task * task, struct ObjectEv
return FALSE; return FALSE;
} }
static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
sprite = &gSprites[task->data[1]]; sprite = &gSprites[task->data[1]];
if (sprite->animCmdIndex > 1) if (sprite->animCmdIndex > 1)
@@ -1917,7 +1917,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEv
return FALSE; return FALSE;
} }
static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
if (ObjectEventClearHeldMovementIfFinished(objectEvent)) if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{ {
@@ -1930,13 +1930,13 @@ static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task * task, struct ObjectEv
} }
static void Task_LavaridgeGym1FWarp(u8 taskId); static void Task_LavaridgeGym1FWarp(u8 taskId);
static bool8 LavaridgeGym1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGym1FWarpEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGym1FWarpEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGym1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGym1FWarpEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGym1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGym1FWarpEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 LavaridgeGym1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static bool8 LavaridgeGym1FWarpEffect_5(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite);
static bool8 (*const sLavaridgeGym1FWarpEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { static bool8 (*const sLavaridgeGym1FWarpEffectFuncs[])(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = {
LavaridgeGym1FWarpEffect_1, LavaridgeGym1FWarpEffect_1,
LavaridgeGym1FWarpEffect_2, LavaridgeGym1FWarpEffect_2,
LavaridgeGym1FWarpEffect_3, LavaridgeGym1FWarpEffect_3,
@@ -1973,7 +1973,7 @@ static void Task_LavaridgeGym1FWarp(u8 taskId)
while(sLavaridgeGym1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); while(sLavaridgeGym1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId]));
} }
static bool8 LavaridgeGym1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGym1FWarpEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
FreezeObjectEvents(); FreezeObjectEvents();
CameraObjectReset2(); CameraObjectReset2();
@@ -1983,7 +1983,7 @@ static bool8 LavaridgeGym1FWarpEffect_1(struct Task * task, struct ObjectEvent *
return FALSE; return FALSE;
} }
static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGym1FWarpEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
if (ObjectEventClearHeldMovementIfFinished(objectEvent)) if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{ {
@@ -2005,7 +2005,7 @@ static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent *
return FALSE; return FALSE;
} }
static bool8 LavaridgeGym1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGym1FWarpEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
if (gSprites[task->data[1]].animCmdIndex == 2) if (gSprites[task->data[1]].animCmdIndex == 2)
{ {
@@ -2015,7 +2015,7 @@ static bool8 LavaridgeGym1FWarpEffect_3(struct Task * task, struct ObjectEvent *
return FALSE; return FALSE;
} }
static bool8 LavaridgeGym1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGym1FWarpEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
{ {
@@ -2026,7 +2026,7 @@ static bool8 LavaridgeGym1FWarpEffect_4(struct Task * task, struct ObjectEvent *
return FALSE; return FALSE;
} }
static bool8 LavaridgeGym1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) static bool8 LavaridgeGym1FWarpEffect_5(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite)
{ {
if (!gPaletteFade.active && BGMusicStopped() == TRUE) if (!gPaletteFade.active && BGMusicStopped() == TRUE)
{ {
@@ -2331,17 +2331,17 @@ static void EscapeRopeWarpInEffect_Spin(struct Task *task)
#undef tOriginalDir #undef tOriginalDir
static void Task_DoTeleportFieldEffect(u8 taskId); static void Task_DoTeleportFieldEffect(u8 taskId);
static void TeleportFieldEffectTask1(struct Task * task); static void TeleportFieldEffectTask1(struct Task *task);
static void TeleportFieldEffectTask2(struct Task * task); static void TeleportFieldEffectTask2(struct Task *task);
static void TeleportFieldEffectTask3(struct Task * task); static void TeleportFieldEffectTask3(struct Task *task);
static void TeleportFieldEffectTask4(struct Task * task); static void TeleportFieldEffectTask4(struct Task *task);
static void FieldCallback_TeleportIn(void); static void FieldCallback_TeleportIn(void);
static void Task_DoTeleportInFieldEffect(u8 taskId); static void Task_DoTeleportInFieldEffect(u8 taskId);
static void TeleportInFieldEffectTask1(struct Task * task); static void TeleportInFieldEffectTask1(struct Task *task);
static void TeleportInFieldEffectTask2(struct Task * task); static void TeleportInFieldEffectTask2(struct Task *task);
static void TeleportInFieldEffectTask3(struct Task * task); static void TeleportInFieldEffectTask3(struct Task *task);
static void (*const sTeleportEffectFuncs[])(struct Task * ) = { static void (*const sTeleportEffectFuncs[])(struct Task *) = {
TeleportFieldEffectTask1, TeleportFieldEffectTask1,
TeleportFieldEffectTask2, TeleportFieldEffectTask2,
TeleportFieldEffectTask3, TeleportFieldEffectTask3,
@@ -2358,7 +2358,7 @@ static void Task_DoTeleportFieldEffect(u8 taskId)
sTeleportEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); sTeleportEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]);
} }
static void TeleportFieldEffectTask1(struct Task * task) static void TeleportFieldEffectTask1(struct Task *task)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeObjectEvents(); FreezeObjectEvents();
@@ -2367,7 +2367,7 @@ static void TeleportFieldEffectTask1(struct Task * task)
task->data[0]++; task->data[0]++;
} }
static void TeleportFieldEffectTask2(struct Task * task) static void TeleportFieldEffectTask2(struct Task *task)
{ {
u8 spinDirections[5] = { u8 spinDirections[5] = {
[DIR_NONE] = DIR_SOUTH, [DIR_NONE] = DIR_SOUTH,
@@ -2393,7 +2393,7 @@ static void TeleportFieldEffectTask2(struct Task * task)
} }
} }
static void TeleportFieldEffectTask3(struct Task * task) static void TeleportFieldEffectTask3(struct Task *task)
{ {
u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -2421,7 +2421,7 @@ static void TeleportFieldEffectTask3(struct Task * task)
} }
} }
static void TeleportFieldEffectTask4(struct Task * task) static void TeleportFieldEffectTask4(struct Task *task)
{ {
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
@@ -2436,7 +2436,7 @@ static void TeleportFieldEffectTask4(struct Task * task)
} }
} }
static void (*const sTeleportInEffectFuncs[])(struct Task * ) = { static void (*const sTeleportInEffectFuncs[])(struct Task *) = {
TeleportInFieldEffectTask1, TeleportInFieldEffectTask1,
TeleportInFieldEffectTask2, TeleportInFieldEffectTask2,
TeleportInFieldEffectTask3 TeleportInFieldEffectTask3
@@ -2460,7 +2460,7 @@ static void Task_DoTeleportInFieldEffect(u8 taskId)
sTeleportInEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); sTeleportInEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]);
} }
static void TeleportInFieldEffectTask1(struct Task * task) static void TeleportInFieldEffectTask1(struct Task *task)
{ {
struct Sprite *sprite; struct Sprite *sprite;
s16 centerToCornerVecY; s16 centerToCornerVecY;
@@ -2479,7 +2479,7 @@ static void TeleportInFieldEffectTask1(struct Task * task)
} }
} }
static void TeleportInFieldEffectTask2(struct Task * task) static void TeleportInFieldEffectTask2(struct Task *task)
{ {
u8 spinDirections[5] = {1, 3, 4, 2, 1}; u8 spinDirections[5] = {1, 3, 4, 2, 1};
struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -2518,7 +2518,7 @@ static void TeleportInFieldEffectTask2(struct Task * task)
} }
} }
static void TeleportInFieldEffectTask3(struct Task * task) static void TeleportInFieldEffectTask3(struct Task *task)
{ {
u8 spinDirections[5] = {1, 3, 4, 2, 1}; u8 spinDirections[5] = {1, 3, 4, 2, 1};
struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -2537,33 +2537,33 @@ static void TeleportInFieldEffectTask3(struct Task * task)
} }
static void Task_ShowMon_Outdoors(u8 taskId); static void Task_ShowMon_Outdoors(u8 taskId);
static void ShowMonEffect_Outdoors_1(struct Task * task); static void ShowMonEffect_Outdoors_1(struct Task *task);
static void ShowMonEffect_Outdoors_2(struct Task * task); static void ShowMonEffect_Outdoors_2(struct Task *task);
static void ShowMonEffect_Outdoors_3(struct Task * task); static void ShowMonEffect_Outdoors_3(struct Task *task);
static void ShowMonEffect_Outdoors_4(struct Task * task); static void ShowMonEffect_Outdoors_4(struct Task *task);
static void ShowMonEffect_Outdoors_5(struct Task * task); static void ShowMonEffect_Outdoors_5(struct Task *task);
static void ShowMonEffect_Outdoors_6(struct Task * task); static void ShowMonEffect_Outdoors_6(struct Task *task);
static void ShowMonEffect_Outdoors_7(struct Task * task); static void ShowMonEffect_Outdoors_7(struct Task *task);
static void VBlankCB_ShowMonEffect_Outdoors(void); static void VBlankCB_ShowMonEffect_Outdoors(void);
static void LoadFieldMoveStreaksTilemapToVram(u16 screenbase); static void LoadFieldMoveStreaksTilemapToVram(u16 screenbase);
static void Task_ShowMon_Indoors(u8 taskId); static void Task_ShowMon_Indoors(u8 taskId);
static void ShowMonEffect_Indoors_1(struct Task * task); static void ShowMonEffect_Indoors_1(struct Task *task);
static void ShowMonEffect_Indoors_2(struct Task * task); static void ShowMonEffect_Indoors_2(struct Task *task);
static void ShowMonEffect_Indoors_3(struct Task * task); static void ShowMonEffect_Indoors_3(struct Task *task);
static void ShowMonEffect_Indoors_4(struct Task * task); static void ShowMonEffect_Indoors_4(struct Task *task);
static void ShowMonEffect_Indoors_5(struct Task * task); static void ShowMonEffect_Indoors_5(struct Task *task);
static void ShowMonEffect_Indoors_6(struct Task * task); static void ShowMonEffect_Indoors_6(struct Task *task);
static void ShowMonEffect_Indoors_7(struct Task * task); static void ShowMonEffect_Indoors_7(struct Task *task);
static void VBlankCB_ShowMonEffect_Indoors(void); static void VBlankCB_ShowMonEffect_Indoors(void);
static void AnimateIndoorShowMonBg(struct Task * task); static void AnimateIndoorShowMonBg(struct Task *task);
static bool8 SlideIndoorBannerOnscreen(struct Task * task); static bool8 SlideIndoorBannerOnscreen(struct Task *task);
static bool8 SlideIndoorBannerOffscreen(struct Task * task); static bool8 SlideIndoorBannerOffscreen(struct Task *task);
static u8 InitFieldMoveMonSprite(u32 species, u32 otId, u32 personality); static u8 InitFieldMoveMonSprite(u32 species, u32 otId, u32 personality);
static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite *sprite); static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite *sprite);
static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite *sprite); static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite *sprite);
static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite *sprite); static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite *sprite);
static void (*const sShowMonOutdoorsEffectFuncs[])(struct Task * task) = { static void (*const sShowMonOutdoorsEffectFuncs[])(struct Task *task) = {
ShowMonEffect_Outdoors_1, ShowMonEffect_Outdoors_1,
ShowMonEffect_Outdoors_2, ShowMonEffect_Outdoors_2,
ShowMonEffect_Outdoors_3, ShowMonEffect_Outdoors_3,
@@ -2602,7 +2602,7 @@ static void Task_ShowMon_Outdoors(u8 taskId)
sShowMonOutdoorsEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); sShowMonOutdoorsEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]);
} }
static void ShowMonEffect_Outdoors_1(struct Task * task) static void ShowMonEffect_Outdoors_1(struct Task *task)
{ {
task->data[11] = GetGpuReg(REG_OFFSET_WININ); task->data[11] = GetGpuReg(REG_OFFSET_WININ);
task->data[12] = GetGpuReg(REG_OFFSET_WINOUT); task->data[12] = GetGpuReg(REG_OFFSET_WINOUT);
@@ -2619,7 +2619,7 @@ static void ShowMonEffect_Outdoors_1(struct Task * task)
task->data[0]++; task->data[0]++;
} }
static void ShowMonEffect_Outdoors_2(struct Task * task) static void ShowMonEffect_Outdoors_2(struct Task *task)
{ {
u16 charbase = ((GetGpuReg(REG_OFFSET_BG0CNT) >> 2) << 14); u16 charbase = ((GetGpuReg(REG_OFFSET_BG0CNT) >> 2) << 14);
u16 screenbase = ((GetGpuReg(REG_OFFSET_BG0CNT) >> 8) << 11); u16 screenbase = ((GetGpuReg(REG_OFFSET_BG0CNT) >> 8) << 11);
@@ -2630,7 +2630,7 @@ static void ShowMonEffect_Outdoors_2(struct Task * task)
task->data[0]++; task->data[0]++;
} }
static void ShowMonEffect_Outdoors_3(struct Task * task) static void ShowMonEffect_Outdoors_3(struct Task *task)
{ {
s16 win0h_lo; s16 win0h_lo;
s16 win0v_lo; s16 win0v_lo;
@@ -2663,7 +2663,7 @@ static void ShowMonEffect_Outdoors_3(struct Task * task)
} }
} }
static void ShowMonEffect_Outdoors_4(struct Task * task) static void ShowMonEffect_Outdoors_4(struct Task *task)
{ {
task->data[5] -= 16; task->data[5] -= 16;
if (gSprites[task->data[15]].data[7]) if (gSprites[task->data[15]].data[7])
@@ -2672,7 +2672,7 @@ static void ShowMonEffect_Outdoors_4(struct Task * task)
} }
} }
static void ShowMonEffect_Outdoors_5(struct Task * task) static void ShowMonEffect_Outdoors_5(struct Task *task)
{ {
s16 win0v_lo; s16 win0v_lo;
s16 win0v_hi; s16 win0v_hi;
@@ -2696,7 +2696,7 @@ static void ShowMonEffect_Outdoors_5(struct Task * task)
} }
} }
static void ShowMonEffect_Outdoors_6(struct Task * task) static void ShowMonEffect_Outdoors_6(struct Task *task)
{ {
u16 bg0cnt = (GetGpuReg(REG_OFFSET_BG0CNT) >> 8) << 11; u16 bg0cnt = (GetGpuReg(REG_OFFSET_BG0CNT) >> 8) << 11;
CpuFill32(0, (void *)VRAM + bg0cnt, 0x800); CpuFill32(0, (void *)VRAM + bg0cnt, 0x800);
@@ -2707,7 +2707,7 @@ static void ShowMonEffect_Outdoors_6(struct Task * task)
task->data[0]++; task->data[0]++;
} }
static void ShowMonEffect_Outdoors_7(struct Task * task) static void ShowMonEffect_Outdoors_7(struct Task *task)
{ {
IntrCallback callback; IntrCallback callback;
LoadWordFromTwoHalfwords((u16 *)&task->data[13], (uintptr_t *)&callback); LoadWordFromTwoHalfwords((u16 *)&task->data[13], (uintptr_t *)&callback);
@@ -2723,7 +2723,7 @@ static void ShowMonEffect_Outdoors_7(struct Task * task)
static void VBlankCB_ShowMonEffect_Outdoors(void) static void VBlankCB_ShowMonEffect_Outdoors(void)
{ {
IntrCallback callback; IntrCallback callback;
struct Task * task = &gTasks[FindTaskIdByFunc(Task_ShowMon_Outdoors)]; struct Task *task = &gTasks[FindTaskIdByFunc(Task_ShowMon_Outdoors)];
LoadWordFromTwoHalfwords((u16 *)&task->data[13], (uintptr_t *)&callback); LoadWordFromTwoHalfwords((u16 *)&task->data[13], (uintptr_t *)&callback);
callback(); callback();
SetGpuReg(REG_OFFSET_WIN0H, task->data[1]); SetGpuReg(REG_OFFSET_WIN0H, task->data[1]);
@@ -2745,7 +2745,7 @@ static void LoadFieldMoveStreaksTilemapToVram(u16 screenbase)
} }
} }
static void (*const sShowMonIndoorsEffectFuncs[])(struct Task * ) = { static void (*const sShowMonIndoorsEffectFuncs[])(struct Task *) = {
ShowMonEffect_Indoors_1, ShowMonEffect_Indoors_1,
ShowMonEffect_Indoors_2, ShowMonEffect_Indoors_2,
ShowMonEffect_Indoors_3, ShowMonEffect_Indoors_3,
@@ -2760,7 +2760,7 @@ static void Task_ShowMon_Indoors(u8 taskId)
sShowMonIndoorsEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); sShowMonIndoorsEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]);
} }
static void ShowMonEffect_Indoors_1(struct Task * task) static void ShowMonEffect_Indoors_1(struct Task *task)
{ {
SetGpuReg(REG_OFFSET_BG0HOFS, task->data[1]); SetGpuReg(REG_OFFSET_BG0HOFS, task->data[1]);
SetGpuReg(REG_OFFSET_BG0VOFS, task->data[2]); SetGpuReg(REG_OFFSET_BG0VOFS, task->data[2]);
@@ -2769,7 +2769,7 @@ static void ShowMonEffect_Indoors_1(struct Task * task)
task->data[0]++; task->data[0]++;
} }
static void ShowMonEffect_Indoors_2(struct Task * task) static void ShowMonEffect_Indoors_2(struct Task *task)
{ {
u16 charbase; u16 charbase;
u16 screenbase; u16 screenbase;
@@ -2782,7 +2782,7 @@ static void ShowMonEffect_Indoors_2(struct Task * task)
task->data[0]++; task->data[0]++;
} }
static void ShowMonEffect_Indoors_3(struct Task * task) static void ShowMonEffect_Indoors_3(struct Task *task)
{ {
if (SlideIndoorBannerOnscreen(task)) if (SlideIndoorBannerOnscreen(task))
{ {
@@ -2796,7 +2796,7 @@ static void ShowMonEffect_Indoors_3(struct Task * task)
AnimateIndoorShowMonBg(task); AnimateIndoorShowMonBg(task);
} }
static void ShowMonEffect_Indoors_4(struct Task * task) static void ShowMonEffect_Indoors_4(struct Task *task)
{ {
AnimateIndoorShowMonBg(task); AnimateIndoorShowMonBg(task);
if (gSprites[task->data[15]].data[7]) if (gSprites[task->data[15]].data[7])
@@ -2805,7 +2805,7 @@ static void ShowMonEffect_Indoors_4(struct Task * task)
} }
} }
static void ShowMonEffect_Indoors_5(struct Task * task) static void ShowMonEffect_Indoors_5(struct Task *task)
{ {
AnimateIndoorShowMonBg(task); AnimateIndoorShowMonBg(task);
task->data[3] = task->data[1] & 7; task->data[3] = task->data[1] & 7;
@@ -2816,7 +2816,7 @@ static void ShowMonEffect_Indoors_5(struct Task * task)
task->data[0]++; task->data[0]++;
} }
static void ShowMonEffect_Indoors_6(struct Task * task) static void ShowMonEffect_Indoors_6(struct Task *task)
{ {
AnimateIndoorShowMonBg(task); AnimateIndoorShowMonBg(task);
if (SlideIndoorBannerOffscreen(task)) if (SlideIndoorBannerOffscreen(task))
@@ -2825,7 +2825,7 @@ static void ShowMonEffect_Indoors_6(struct Task * task)
} }
} }
static void ShowMonEffect_Indoors_7(struct Task * task) static void ShowMonEffect_Indoors_7(struct Task *task)
{ {
IntrCallback intrCallback; IntrCallback intrCallback;
u16 charbase; u16 charbase;
@@ -2844,7 +2844,7 @@ static void ShowMonEffect_Indoors_7(struct Task * task)
static void VBlankCB_ShowMonEffect_Indoors(void) static void VBlankCB_ShowMonEffect_Indoors(void)
{ {
IntrCallback intrCallback; IntrCallback intrCallback;
struct Task * task; struct Task *task;
task = &gTasks[FindTaskIdByFunc(Task_ShowMon_Indoors)]; task = &gTasks[FindTaskIdByFunc(Task_ShowMon_Indoors)];
LoadWordFromTwoHalfwords((u16 *)&task->data[13], (uintptr_t *)&intrCallback); LoadWordFromTwoHalfwords((u16 *)&task->data[13], (uintptr_t *)&intrCallback);
intrCallback(); intrCallback();
@@ -2852,13 +2852,13 @@ static void VBlankCB_ShowMonEffect_Indoors(void)
SetGpuReg(REG_OFFSET_BG0VOFS, task->data[2]); SetGpuReg(REG_OFFSET_BG0VOFS, task->data[2]);
} }
static void AnimateIndoorShowMonBg(struct Task * task) static void AnimateIndoorShowMonBg(struct Task *task)
{ {
task->data[1] -= 16; task->data[1] -= 16;
task->data[3] += 16; task->data[3] += 16;
} }
static bool8 SlideIndoorBannerOnscreen(struct Task * task) static bool8 SlideIndoorBannerOnscreen(struct Task *task)
{ {
u16 i; u16 i;
u16 srcOffs; u16 srcOffs;
@@ -2887,7 +2887,7 @@ static bool8 SlideIndoorBannerOnscreen(struct Task * task)
return FALSE; return FALSE;
} }
static bool8 SlideIndoorBannerOffscreen(struct Task * task) static bool8 SlideIndoorBannerOffscreen(struct Task *task)
{ {
u16 i; u16 i;
u16 dstOffs; u16 dstOffs;
@@ -2966,13 +2966,13 @@ static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite *sprite)
} }
static void Task_FldEffUseSurf(u8 taskId); static void Task_FldEffUseSurf(u8 taskId);
static void UseSurfEffect_1(struct Task * task); static void UseSurfEffect_1(struct Task *task);
static void UseSurfEffect_2(struct Task * task); static void UseSurfEffect_2(struct Task *task);
static void UseSurfEffect_3(struct Task * task); static void UseSurfEffect_3(struct Task *task);
static void UseSurfEffect_4(struct Task * task); static void UseSurfEffect_4(struct Task *task);
static void UseSurfEffect_5(struct Task * task); static void UseSurfEffect_5(struct Task *task);
static void (*const sUseSurfEffectFuncs[])(struct Task * ) = { static void (*const sUseSurfEffectFuncs[])(struct Task *) = {
UseSurfEffect_1, UseSurfEffect_1,
UseSurfEffect_2, UseSurfEffect_2,
UseSurfEffect_3, UseSurfEffect_3,
@@ -2995,7 +2995,7 @@ static void Task_FldEffUseSurf(u8 taskId)
sUseSurfEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); sUseSurfEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]);
} }
static void UseSurfEffect_1(struct Task * task) static void UseSurfEffect_1(struct Task *task)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeObjectEvents(); FreezeObjectEvents();
@@ -3006,7 +3006,7 @@ static void UseSurfEffect_1(struct Task * task)
task->data[0]++; task->data[0]++;
} }
static void UseSurfEffect_2(struct Task * task) static void UseSurfEffect_2(struct Task *task)
{ {
struct ObjectEvent * objectEvent; struct ObjectEvent * objectEvent;
objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -3018,7 +3018,7 @@ static void UseSurfEffect_2(struct Task * task)
} }
} }
static void UseSurfEffect_3(struct Task * task) static void UseSurfEffect_3(struct Task *task)
{ {
struct ObjectEvent * objectEvent; struct ObjectEvent * objectEvent;
objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -3030,7 +3030,7 @@ static void UseSurfEffect_3(struct Task * task)
} }
} }
static void UseSurfEffect_4(struct Task * task) static void UseSurfEffect_4(struct Task *task)
{ {
struct ObjectEvent * objectEvent; struct ObjectEvent * objectEvent;
if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
@@ -3047,7 +3047,7 @@ static void UseSurfEffect_4(struct Task * task)
} }
} }
static void UseSurfEffect_5(struct Task * task) static void UseSurfEffect_5(struct Task *task)
{ {
struct ObjectEvent * objectEvent; struct ObjectEvent * objectEvent;
objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -3066,12 +3066,12 @@ static void UseSurfEffect_5(struct Task * task)
} }
static void Task_FldEffUseVsSeeker(u8 taskId); static void Task_FldEffUseVsSeeker(u8 taskId);
static void UseVsSeekerEffect_1(struct Task * task); static void UseVsSeekerEffect_1(struct Task *task);
static void UseVsSeekerEffect_2(struct Task * task); static void UseVsSeekerEffect_2(struct Task *task);
static void UseVsSeekerEffect_3(struct Task * task); static void UseVsSeekerEffect_3(struct Task *task);
static void UseVsSeekerEffect_4(struct Task * task); static void UseVsSeekerEffect_4(struct Task *task);
static void (*const sUseVsSeekerEffectFuncs[])(struct Task * task) = { static void (*const sUseVsSeekerEffectFuncs[])(struct Task *task) = {
UseVsSeekerEffect_1, UseVsSeekerEffect_1,
UseVsSeekerEffect_2, UseVsSeekerEffect_2,
UseVsSeekerEffect_3, UseVsSeekerEffect_3,
@@ -3091,7 +3091,7 @@ static void Task_FldEffUseVsSeeker(u8 taskId)
sUseVsSeekerEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); sUseVsSeekerEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]);
} }
static void UseVsSeekerEffect_1(struct Task * task) static void UseVsSeekerEffect_1(struct Task *task)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeObjectEvents(); FreezeObjectEvents();
@@ -3099,7 +3099,7 @@ static void UseVsSeekerEffect_1(struct Task * task)
task->data[0]++; task->data[0]++;
} }
static void UseVsSeekerEffect_2(struct Task * task) static void UseVsSeekerEffect_2(struct Task *task)
{ {
struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (!ObjectEventIsMovementOverridden(playerObj) || ObjectEventClearHeldMovementIfFinished(playerObj)) if (!ObjectEventIsMovementOverridden(playerObj) || ObjectEventClearHeldMovementIfFinished(playerObj))
@@ -3110,7 +3110,7 @@ static void UseVsSeekerEffect_2(struct Task * task)
} }
} }
static void UseVsSeekerEffect_3(struct Task * task) static void UseVsSeekerEffect_3(struct Task *task)
{ {
struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (ObjectEventClearHeldMovementIfFinished(playerObj)) if (ObjectEventClearHeldMovementIfFinished(playerObj))
@@ -3126,7 +3126,7 @@ static void UseVsSeekerEffect_3(struct Task * task)
} }
} }
static void UseVsSeekerEffect_4(struct Task * task) static void UseVsSeekerEffect_4(struct Task *task)
{ {
struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (ObjectEventClearHeldMovementIfFinished(playerObj)) if (ObjectEventClearHeldMovementIfFinished(playerObj))
src/field_player_avatar.c
+26 -26
View File
@@ -87,38 +87,38 @@ static bool8 MetatileAtCoordsIsWaterTile(s16 x, s16 y);
static void HandleWarpArrowSpriteHideShow(struct ObjectEvent * playerObjEvent); static void HandleWarpArrowSpriteHideShow(struct ObjectEvent * playerObjEvent);
static void StartStrengthAnim(u8 objectEventId, u8 direction); static void StartStrengthAnim(u8 objectEventId, u8 direction);
static void Task_BumpBoulder(u8 taskId); static void Task_BumpBoulder(u8 taskId);
static bool8 DoBoulderInit(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj); static bool8 DoBoulderInit(struct Task *task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj);
static bool8 DoBoulderDust(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj); static bool8 DoBoulderDust(struct Task *task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj);
static bool8 DoBoulderFinish(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj); static bool8 DoBoulderFinish(struct Task *task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj);
static void DoPlayerMatJump(void); static void DoPlayerMatJump(void);
static void DoPlayerAvatarSecretBaseMatJump(u8 taskId); static void DoPlayerAvatarSecretBaseMatJump(u8 taskId);
static bool8 PlayerAvatar_DoSecretBaseMatJump(struct Task * task, struct ObjectEvent * playerObj); static bool8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent * playerObj);
static void DoPlayerMatSpin(void); static void DoPlayerMatSpin(void);
static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId); static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId);
static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task * task, struct ObjectEvent * playerObj); static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent * playerObj);
static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task * task, struct ObjectEvent * playerObj); static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent * playerObj);
static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task * task, struct ObjectEvent * playerObj); static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent * playerObj);
static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task * task, struct ObjectEvent * playerObj); static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent * playerObj);
static void CreateStopSurfingTask(u8 direction); static void CreateStopSurfingTask(u8 direction);
static void Task_StopSurfingInit(u8 taskId); static void Task_StopSurfingInit(u8 taskId);
static void Task_WaitStopSurfing(u8 taskId); static void Task_WaitStopSurfing(u8 taskId);
static void Task_Fishing(u8 taskId); static void Task_Fishing(u8 taskId);
static bool8 Fishing1(struct Task * task); static bool8 Fishing1(struct Task *task);
static bool8 Fishing2(struct Task * task); static bool8 Fishing2(struct Task *task);
static bool8 Fishing3(struct Task * task); static bool8 Fishing3(struct Task *task);
static bool8 Fishing4(struct Task * task); static bool8 Fishing4(struct Task *task);
static bool8 Fishing5(struct Task * task); static bool8 Fishing5(struct Task *task);
static bool8 Fishing6(struct Task * task); static bool8 Fishing6(struct Task *task);
static bool8 Fishing7(struct Task * task); static bool8 Fishing7(struct Task *task);
static bool8 Fishing8(struct Task * task); static bool8 Fishing8(struct Task *task);
static bool8 Fishing9(struct Task * task); static bool8 Fishing9(struct Task *task);
static bool8 Fishing10(struct Task * task); static bool8 Fishing10(struct Task *task);
static bool8 Fishing11(struct Task * task); static bool8 Fishing11(struct Task *task);
static bool8 Fishing12(struct Task * task); static bool8 Fishing12(struct Task *task);
static bool8 Fishing13(struct Task * task); static bool8 Fishing13(struct Task *task);
static bool8 Fishing14(struct Task * task); static bool8 Fishing14(struct Task *task);
static bool8 Fishing15(struct Task * task); static bool8 Fishing15(struct Task *task);
static bool8 Fishing16(struct Task * task); static bool8 Fishing16(struct Task *task);
static void Task_TeleportWarpOutPlayerAnim(u8 taskId); static void Task_TeleportWarpOutPlayerAnim(u8 taskId);
static void Task_TeleportWarpInPlayerAnim(u8 taskId); static void Task_TeleportWarpInPlayerAnim(u8 taskId);
static u8 TeleportAnim_RotatePlayer(struct ObjectEvent * object, s16 *timer); static u8 TeleportAnim_RotatePlayer(struct ObjectEvent * object, s16 *timer);
@@ -1392,7 +1392,7 @@ static void HandleWarpArrowSpriteHideShow(struct ObjectEvent *objectEvent)
SetSpriteInvisible(objectEvent->warpArrowSpriteId); SetSpriteInvisible(objectEvent->warpArrowSpriteId);
} }
static bool8 (*const sBoulderTaskSteps[])(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj) = { static bool8 (*const sBoulderTaskSteps[])(struct Task *task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj) = {
DoBoulderInit, DoBoulderInit,
DoBoulderDust, DoBoulderDust,
DoBoulderFinish DoBoulderFinish
@@ -1493,7 +1493,7 @@ static bool8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEv
return FALSE; return FALSE;
} }
static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task * task, struct ObjectEvent * playerObj) = { static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *task, struct ObjectEvent * playerObj) = {
PlayerAvatar_SecretBaseMatSpinStep0, PlayerAvatar_SecretBaseMatSpinStep0,
PlayerAvatar_SecretBaseMatSpinStep1, PlayerAvatar_SecretBaseMatSpinStep1,
PlayerAvatar_SecretBaseMatSpinStep2, PlayerAvatar_SecretBaseMatSpinStep2,
src/field_specials.c
+7 -7
View File
@@ -1165,7 +1165,7 @@ static void Task_AnimateElevatorWindowView(u8 taskId)
void ListMenu(void) void ListMenu(void)
{ {
u8 taskId; u8 taskId;
struct Task * task; struct Task *task;
if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE) if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE)
{ {
taskId = CreateTask(Task_CreateScriptListMenu, 8); taskId = CreateTask(Task_CreateScriptListMenu, 8);
@@ -1334,7 +1334,7 @@ static void Task_CreateScriptListMenu(u8 taskId)
u8 i; u8 i;
s32 width; s32 width;
s32 mwidth; s32 mwidth;
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
u8 windowId; u8 windowId;
ScriptContext2_Enable(); ScriptContext2_Enable();
if (gSpecialVar_0x8004 == LISTMENU_SILPHCO_FLOORS) if (gSpecialVar_0x8004 == LISTMENU_SILPHCO_FLOORS)
@@ -1393,7 +1393,7 @@ static void CreateScriptListMenu(void)
static void ScriptListMenuMoveCursorFunction(s32 nothing, bool8 is, struct ListMenu * used) static void ScriptListMenuMoveCursorFunction(s32 nothing, bool8 is, struct ListMenu * used)
{ {
u8 taskId; u8 taskId;
struct Task * task; struct Task *task;
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
taskId = FindTaskIdByFunc(Task_ListMenuHandleInput); taskId = FindTaskIdByFunc(Task_ListMenuHandleInput);
if (taskId != 0xFF) if (taskId != 0xFF)
@@ -1407,7 +1407,7 @@ static void ScriptListMenuMoveCursorFunction(s32 nothing, bool8 is, struct ListM
static void Task_ListMenuHandleInput(u8 taskId) static void Task_ListMenuHandleInput(u8 taskId)
{ {
s32 input; s32 input;
struct Task * task; struct Task *task;
task = &gTasks[taskId]; task = &gTasks[taskId];
task++;task--; task++;task--;
@@ -1440,7 +1440,7 @@ static void Task_ListMenuHandleInput(u8 taskId)
static void Task_DestroyListMenu(u8 taskId) static void Task_DestroyListMenu(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
Task_ListMenuRemoveScrollIndicatorArrowPair(taskId); Task_ListMenuRemoveScrollIndicatorArrowPair(taskId);
DestroyListMenuTask(task->data[14], NULL, NULL); DestroyListMenuTask(task->data[14], NULL, NULL);
Free(sListMenuItems); Free(sListMenuItems);
@@ -1484,7 +1484,7 @@ static void Task_RedrawScrollArrowsAndWaitInput(u8 taskId)
static void Task_CreateMenuRemoveScrollIndicatorArrowPair(u8 taskId) static void Task_CreateMenuRemoveScrollIndicatorArrowPair(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
struct ScrollArrowsTemplate template = { struct ScrollArrowsTemplate template = {
.firstArrowType = 2, .firstArrowType = 2,
.secondArrowType = 3, .secondArrowType = 3,
@@ -1505,7 +1505,7 @@ static void Task_CreateMenuRemoveScrollIndicatorArrowPair(u8 taskId)
static void Task_ListMenuRemoveScrollIndicatorArrowPair(u8 taskId) static void Task_ListMenuRemoveScrollIndicatorArrowPair(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
if (task->data[0] != task->data[1]) if (task->data[0] != task->data[1])
RemoveScrollIndicatorArrowPair(task->data[12]); RemoveScrollIndicatorArrowPair(task->data[12]);
} }
src/map_name_popup.c
+1 -1
View File
@@ -48,7 +48,7 @@ void ShowMapNamePopup(bool32 palIntoFadedBuffer)
static void Task_MapNamePopup(u8 taskId) static void Task_MapNamePopup(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
switch (task->tState) switch (task->tState)
{ {
case 0: case 0:
src/naming_screen.c
+9 -9
View File
@@ -130,15 +130,15 @@ static bool8 MainState_WaitPageSwap(void);
static void StartPageSwapAnim(void); static void StartPageSwapAnim(void);
static void Task_HandlePageSwapAnim(u8 taskId); static void Task_HandlePageSwapAnim(u8 taskId);
static bool8 IsPageSwapAnimNotInProgress(void); static bool8 IsPageSwapAnimNotInProgress(void);
static bool8 PageSwapAnimState_Init(struct Task * task); static bool8 PageSwapAnimState_Init(struct Task *task);
static bool8 PageSwapAnimState_1(struct Task * task); static bool8 PageSwapAnimState_1(struct Task *task);
static bool8 PageSwapAnimState_2(struct Task * task); static bool8 PageSwapAnimState_2(struct Task *task);
static bool8 PageSwapAnimState_Done(struct Task * task); static bool8 PageSwapAnimState_Done(struct Task *task);
static void sub_809E518(u8 a0, u8 a1, u8 a2); static void sub_809E518(u8 a0, u8 a1, u8 a2);
static void Task_809E58C(u8 taskId); static void Task_809E58C(u8 taskId);
static u16 sub_809E644(u8 tag); static u16 sub_809E644(u8 tag);
static void sub_809E6B8(u8 a0); static void sub_809E6B8(u8 a0);
static void sub_809E6E0(struct Task * task, u8 a1, u8 a2); static void sub_809E6E0(struct Task *task, u8 a1, u8 a2);
static void sub_809E700(struct Sprite *sprite); static void sub_809E700(struct Sprite *sprite);
static void sub_809E7F0(struct Sprite *sprite); static void sub_809E7F0(struct Sprite *sprite);
static void sub_809E83C(struct Sprite *sprite); static void sub_809E83C(struct Sprite *sprite);
@@ -175,9 +175,9 @@ static bool8 TriggerKeyboardChange(void);
static u8 GetInputEvent(void); static u8 GetInputEvent(void);
static void SetInputState(u8 state); static void SetInputState(u8 state);
static void Task_HandleInput(u8 taskId); static void Task_HandleInput(u8 taskId);
static void InputState_Disabled(struct Task * task); static void InputState_Disabled(struct Task *task);
static void InputState_Enabled(struct Task * task); static void InputState_Enabled(struct Task *task);
static void HandleDpadMovement(struct Task * task); static void HandleDpadMovement(struct Task *task);
static void PrintTitle(void); static void PrintTitle(void);
static void AddGenderIconFunc_No(void); static void AddGenderIconFunc_No(void);
static void AddGenderIconFunc_Yes(void); static void AddGenderIconFunc_Yes(void);
@@ -773,7 +773,7 @@ static bool8 MainState_WaitPageSwap(void)
#define tState data[0] #define tState data[0]
#define tFrameCount data[1] #define tFrameCount data[1]
static bool8 (*const sPageSwapAnimStateFuncs[])(struct Task * task) = { static bool8 (*const sPageSwapAnimStateFuncs[])(struct Task *task) = {
PageSwapAnimState_Init, PageSwapAnimState_Init,
PageSwapAnimState_1, PageSwapAnimState_1,
PageSwapAnimState_2, PageSwapAnimState_2,
src/script_menu.c
+3 -3
View File
@@ -1008,7 +1008,7 @@ void ScriptMenu_DisplayPCStartupPrompt(void)
static void Task_ScriptShowMonPic(u8 taskId) static void Task_ScriptShowMonPic(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
@@ -1068,7 +1068,7 @@ static bool8 PicboxWait(void)
void PicboxCancel(void) void PicboxCancel(void)
{ {
u8 taskId = FindTaskIdByFunc(Task_ScriptShowMonPic); u8 taskId = FindTaskIdByFunc(Task_ScriptShowMonPic);
struct Task * task; struct Task *task;
if (taskId != 0xFF) if (taskId != 0xFF)
{ {
task = &gTasks[taskId]; task = &gTasks[taskId];
@@ -1091,7 +1091,7 @@ void PicboxCancel(void)
void Task_WaitMuseumFossilPic(u8 taskId) void Task_WaitMuseumFossilPic(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
src/seagallop.c
+1 -1
View File
@@ -284,7 +284,7 @@ static void ScrollBG(void)
static void Task_Seagallop_1(u8 taskId) static void Task_Seagallop_1(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
ScrollBG(); ScrollBG();
if (++task->data[1] == 140) if (++task->data[1] == 140)
src/trainer_see.c
+31 -31
View File
@@ -24,21 +24,21 @@ static u8 GetTrainerApproachDistanceEast(struct ObjectEvent * trainerObj, s16 ra
static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent * trainerObj, u8 approachDistance, u8 facingDirection); static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent * trainerObj, u8 approachDistance, u8 facingDirection);
static void TrainerApproachPlayer(struct ObjectEvent * trainerObj, u8 approachDistance); static void TrainerApproachPlayer(struct ObjectEvent * trainerObj, u8 approachDistance);
static void Task_RunTrainerSeeFuncList(u8 taskId); static void Task_RunTrainerSeeFuncList(u8 taskId);
static bool8 TrainerSeeFunc_Dummy(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_Dummy(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_TrainerApproach(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_TrainerApproach(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_PrepareToEngage(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_PrepareToEngage(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_End(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_End(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_BeginRemoveDisguise(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_BeginRemoveDisguise(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_WaitRemoveDisguise(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_WaitRemoveDisguise(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_TrainerInAshFacesPlayer(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_TrainerInAshFacesPlayer(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_BeginJumpOutOfAsh(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_BeginJumpOutOfAsh(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_WaitJumpOutOfAsh(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_WaitJumpOutOfAsh(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_EndJumpOutOfAsh(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_EndJumpOutOfAsh(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_OffscreenAboveTrainerCreateCameraObj(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_OffscreenAboveTrainerCreateCameraObj(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj);
static void Task_DestroyTrainerApproachTask(u8 taskId); static void Task_DestroyTrainerApproachTask(u8 taskId);
static void SpriteCB_TrainerIcons(struct Sprite *sprite); static void SpriteCB_TrainerIcons(struct Sprite *sprite);
static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum); static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum);
@@ -57,7 +57,7 @@ static const TrainerApproachFunc sDirectionalApproachDistanceFuncs[] = {
GetTrainerApproachDistanceEast GetTrainerApproachDistanceEast
}; };
// bool8 func(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) // bool8 func(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
// Returns TRUE to run the next func immediately // Returns TRUE to run the next func immediately
// Returns FALSE to delay the next func to the next frame // Returns FALSE to delay the next func to the next frame
static const TrainerSeeFunc sTrainerSeeFuncList[] = { static const TrainerSeeFunc sTrainerSeeFuncList[] = {
@@ -246,7 +246,7 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 ap
static void TrainerApproachPlayer(struct ObjectEvent * trainerObj, u8 approachDistance) static void TrainerApproachPlayer(struct ObjectEvent * trainerObj, u8 approachDistance)
{ {
u8 taskId = CreateTask(Task_RunTrainerSeeFuncList, 80); u8 taskId = CreateTask(Task_RunTrainerSeeFuncList, 80);
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
task->tTrainerObjHi = ((uintptr_t)trainerObj) >> 16; task->tTrainerObjHi = ((uintptr_t)trainerObj) >> 16;
task->tTrainerObjLo = (uintptr_t)trainerObj; task->tTrainerObjLo = (uintptr_t)trainerObj;
task->tTrainerRange = approachDistance; task->tTrainerRange = approachDistance;
@@ -262,7 +262,7 @@ static void StartTrainerApproachWithFollowupTask(TaskFunc taskFunc)
static void Task_RunTrainerSeeFuncList(u8 taskId) static void Task_RunTrainerSeeFuncList(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
struct ObjectEvent * trainerObj; struct ObjectEvent * trainerObj;
TaskGetTrainerObj(trainerObj, task); TaskGetTrainerObj(trainerObj, task);
@@ -279,12 +279,12 @@ static void Task_RunTrainerSeeFuncList(u8 taskId)
// TrainerSeeFuncs // TrainerSeeFuncs
static bool8 TrainerSeeFunc_Dummy(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_Dummy(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
return FALSE; return FALSE;
} }
static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
u8 action; u8 action;
// FRLG introduces trainers who can see the player from offscreen above. // FRLG introduces trainers who can see the player from offscreen above.
@@ -304,7 +304,7 @@ static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task * task, struct
return TRUE; return TRUE;
} }
static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
{ {
@@ -321,7 +321,7 @@ static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task * task, struct O
} }
} }
static bool8 TrainerSeeFunc_TrainerApproach(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_TrainerApproach(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
if (!ObjectEventIsMovementOverridden(trainerObj) || ObjectEventClearHeldMovementIfFinished(trainerObj)) if (!ObjectEventIsMovementOverridden(trainerObj) || ObjectEventClearHeldMovementIfFinished(trainerObj))
{ {
@@ -339,7 +339,7 @@ static bool8 TrainerSeeFunc_TrainerApproach(u8 taskId, struct Task * task, struc
return FALSE; return FALSE;
} }
static bool8 TrainerSeeFunc_PrepareToEngage(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_PrepareToEngage(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
struct ObjectEvent *playerObj; struct ObjectEvent *playerObj;
@@ -361,7 +361,7 @@ static bool8 TrainerSeeFunc_PrepareToEngage(u8 taskId, struct Task * task, struc
return FALSE; return FALSE;
} }
static bool8 TrainerSeeFunc_End(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_End(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -372,7 +372,7 @@ static bool8 TrainerSeeFunc_End(u8 taskId, struct Task * task, struct ObjectEven
} }
// Jumps here if disguised. Not used in FRLG. // Jumps here if disguised. Not used in FRLG.
static bool8 TrainerSeeFunc_BeginRemoveDisguise(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_BeginRemoveDisguise(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
if (!ObjectEventIsMovementOverridden(trainerObj) if (!ObjectEventIsMovementOverridden(trainerObj)
|| ObjectEventClearHeldMovementIfFinished(trainerObj)) || ObjectEventClearHeldMovementIfFinished(trainerObj))
@@ -383,7 +383,7 @@ static bool8 TrainerSeeFunc_BeginRemoveDisguise(u8 taskId, struct Task * task, s
return FALSE; return FALSE;
} }
static bool8 TrainerSeeFunc_WaitRemoveDisguise(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_WaitRemoveDisguise(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
if (ObjectEventClearHeldMovementIfFinished(trainerObj)) if (ObjectEventClearHeldMovementIfFinished(trainerObj))
task->tFuncId = 3; task->tFuncId = 3;
@@ -392,7 +392,7 @@ static bool8 TrainerSeeFunc_WaitRemoveDisguise(u8 taskId, struct Task * task, st
} }
// Jump here if buried in ash. Not used in FRLG. // Jump here if buried in ash. Not used in FRLG.
static bool8 TrainerSeeFunc_TrainerInAshFacesPlayer(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_TrainerInAshFacesPlayer(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
if (!ObjectEventIsMovementOverridden(trainerObj) if (!ObjectEventIsMovementOverridden(trainerObj)
|| ObjectEventClearHeldMovementIfFinished(trainerObj)) || ObjectEventClearHeldMovementIfFinished(trainerObj))
@@ -403,7 +403,7 @@ static bool8 TrainerSeeFunc_TrainerInAshFacesPlayer(u8 taskId, struct Task * tas
return FALSE; return FALSE;
} }
static bool8 TrainerSeeFunc_BeginJumpOutOfAsh(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_BeginJumpOutOfAsh(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
if (ObjectEventCheckHeldMovementStatus(trainerObj)) if (ObjectEventCheckHeldMovementStatus(trainerObj))
{ {
@@ -417,7 +417,7 @@ static bool8 TrainerSeeFunc_BeginJumpOutOfAsh(u8 taskId, struct Task * task, str
return FALSE; return FALSE;
} }
static bool8 TrainerSeeFunc_WaitJumpOutOfAsh(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_WaitJumpOutOfAsh(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
struct Sprite *sprite; struct Sprite *sprite;
@@ -479,7 +479,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, stru
return FALSE; return FALSE;
} }
static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{ {
u8 specialObjectId; u8 specialObjectId;
TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId); TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId);
@@ -514,7 +514,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, st
static void Task_RevealTrainer_RunTrainerSeeFuncList(u8 taskId) static void Task_RevealTrainer_RunTrainerSeeFuncList(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
struct ObjectEvent * trainerObj; struct ObjectEvent * trainerObj;
// another objEvent loaded into by loadword? // another objEvent loaded into by loadword?
src/vs_seeker.c
+1 -1
View File
@@ -597,7 +597,7 @@ void VsSeekerFreezeObjectsAfterChargeComplete(void)
static void Task_ResetObjectsRematchWantedState(u8 taskId) static void Task_ResetObjectsRematchWantedState(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
u8 i; u8 i;
if (task->data[0] == 0 && walkrun_is_standing_still() == TRUE) if (task->data[0] == 0 && walkrun_is_standing_still() == TRUE)