summaryrefslogtreecommitdiff
path: root/src/field_effect.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/field_effect.c')
-rw-r--r--src/field_effect.c438
1 files changed, 219 insertions, 219 deletions
diff --git a/src/field_effect.c b/src/field_effect.c
index f7667597c..f5f6b1cba 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -27,7 +27,7 @@
#include "trig.h"
#include "util.h"
#include "constants/field_effects.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
#include "constants/rgb.h"
#include "constants/songs.h"
@@ -101,11 +101,11 @@ static bool8 sub_80B72D0(struct Task *);
static bool8 sub_80B72F4(struct Task *);
static void sub_80B7384(u8);
-static bool8 sub_80B73D0(struct Task *, struct EventObject *);
-static bool8 waterfall_1_do_anim_probably(struct Task *, struct EventObject *);
-static bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct EventObject *);
-static bool8 sub_80B7450(struct Task *, struct EventObject *);
-static bool8 sub_80B7478(struct Task *, struct EventObject *);
+static bool8 sub_80B73D0(struct Task *, struct ObjectEvent *);
+static bool8 waterfall_1_do_anim_probably(struct Task *, struct ObjectEvent *);
+static bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct ObjectEvent *);
+static bool8 sub_80B7450(struct Task *, struct ObjectEvent *);
+static bool8 sub_80B7478(struct Task *, struct ObjectEvent *);
static void Task_Dive(u8);
static bool8 dive_1_lock(struct Task *);
@@ -113,28 +113,28 @@ static bool8 dive_2_unknown(struct Task *);
static bool8 dive_3_unknown(struct Task *);
static void sub_80B75F0(u8);
-static bool8 sub_80B764C(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B7684(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B76B8(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B7704(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B77F8(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B7814(struct Task *, struct EventObject *, struct Sprite *);
+static bool8 sub_80B764C(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B7684(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B76B8(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B7704(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B77F8(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B7814(struct Task *, struct ObjectEvent *, struct Sprite *);
static void mapldr_080851BC(void);
static void sub_80B7890(u8);
-static bool8 sub_80B78EC(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B791C(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B7968(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B79BC(struct Task *, struct EventObject *, struct Sprite *);
+static bool8 sub_80B78EC(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B791C(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B7968(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B79BC(struct Task *, struct ObjectEvent *, struct Sprite *);
static void sub_80B7A8C(u8);
-static bool8 sub_80B7AE8(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B7B18(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *);
-static bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *);
+static bool8 sub_80B7AE8(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B7B18(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B7B94(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B7BCC(struct Task *, struct ObjectEvent *, struct Sprite *);
+static bool8 sub_80B7BF4(struct Task *, struct ObjectEvent *, struct Sprite *);
static void DoEscapeRopeFieldEffect(u8);
static void EscapeRopeFieldEffect_Step0(struct Task *);
@@ -246,12 +246,12 @@ const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
const u32 gUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp");
const u16 gNewGameBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
const u32 gSpriteImage_855A970[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
-const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_04.gbapal");
+const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_04.gbapal");
const u32 gSpriteImage_855A9B0[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp");
const u32 gSpriteImage_855AA70[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp");
const u32 gSpriteImage_855AB30[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp");
const u8 gSpriteImage_855AD30[] = INCBIN_U8("graphics/misc/small_hof_monitor.4bpp");
-const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_05.gbapal");
+const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_05.gbapal");
// Graphics for the lights streaking past your Pokemon when it uses a field move.
const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp");
@@ -628,7 +628,7 @@ bool8 (*const gUnknown_0855C3FC[])(struct Task *) =
sub_80B72F4,
};
-bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) =
+bool8 (*const gUnknown_0855C418[])(struct Task *, struct ObjectEvent *) =
{
sub_80B73D0,
waterfall_1_do_anim_probably,
@@ -644,7 +644,7 @@ bool8 (*const gUnknown_0855C42C[])(struct Task *) =
dive_3_unknown,
};
-bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) =
+bool8 (*const gUnknown_0855C438[])(struct Task *, struct ObjectEvent *, struct Sprite *) =
{
sub_80B764C,
sub_80B7684,
@@ -654,7 +654,7 @@ bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct S
sub_80B7814,
};
-bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct Sprite *) =
+bool8 (*const gUnknown_0855C450[])(struct Task *, struct ObjectEvent *, struct Sprite *) =
{
sub_80B78EC,
sub_80B791C,
@@ -662,7 +662,7 @@ bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct S
sub_80B79BC,
};
-bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) =
+bool8 (*const gUnknown_0855C460[])(struct Task *, struct ObjectEvent *, struct Sprite *) =
{
sub_80B7AE8,
sub_80B7B18,
@@ -1431,7 +1431,7 @@ static void FieldCallback_Fly(void)
pal_fill_black();
CreateTask(task00_8084310, 0);
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
gFieldCallback = NULL;
}
@@ -1468,13 +1468,13 @@ static void mapldr_08084390(void)
Overworld_PlaySpecialMapMusic();
pal_fill_black();
CreateTask(c3_080843F8, 0);
- gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
if (gPlayerAvatar.flags & 0x08)
{
- EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST);
+ ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST);
}
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
gFieldCallback = NULL;
}
@@ -1494,7 +1494,7 @@ static void c3_080843F8(u8 taskId)
if (!FieldEffectActiveListContains(FLDEFF_FLY_IN))
{
ScriptContext2_Disable();
- UnfreezeEventObjects();
+ UnfreezeObjectEvents();
DestroyTask(taskId);
}
}
@@ -1504,7 +1504,7 @@ void sub_80B6B68(void)
Overworld_PlaySpecialMapMusic();
pal_fill_for_maplights();
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
CreateTask(sub_80B6B94, 0);
gFieldCallback = NULL;
}
@@ -1518,14 +1518,14 @@ static void sub_80B6B94(u8 taskId)
static bool8 sub_80B6BCC(struct Task *task) // gUnknown_0855C3C8[0]
{
- struct EventObject *playerObject;
+ struct ObjectEvent *playerObject;
struct Sprite *playerSprite;
- playerObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+ playerObject = &gObjectEvents[gPlayerAvatar.objectEventId];
playerSprite = &gSprites[gPlayerAvatar.spriteId];
CameraObjectReset2();
- gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
gPlayerAvatar.preventStep = TRUE;
- EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
+ ObjectEventSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
task->data[4] = playerSprite->subspriteMode;
playerObject->fixedPriority = 1;
playerSprite->oam.priority = 1;
@@ -1552,7 +1552,7 @@ static bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2]
sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
task->data[1] = 1;
task->data[2] = 0;
- gEventObjects[gPlayerAvatar.eventObjectId].invisible = FALSE;
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE;
PlaySE(SE_RU_HYUU);
task->data[0]++;
return FALSE;
@@ -1560,10 +1560,10 @@ static bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2]
static bool8 sub_80B6D04(struct Task *task)
{
- struct EventObject *eventObject;
+ struct ObjectEvent *objectEvent;
struct Sprite *sprite;
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
sprite = &gSprites[gPlayerAvatar.spriteId];
sprite->pos2.y += task->data[1];
if (task->data[1] < 8)
@@ -1577,15 +1577,15 @@ static bool8 sub_80B6D04(struct Task *task)
if (task->data[3] == 0 && sprite->pos2.y >= -16)
{
task->data[3]++;
- eventObject->fixedPriority = 0;
+ objectEvent->fixedPriority = 0;
sprite->subspriteMode = task->data[4];
- eventObject->triggerGroundEffectsOnMove = 1;
+ objectEvent->triggerGroundEffectsOnMove = 1;
}
if (sprite->pos2.y >= 0)
{
PlaySE(SE_W070);
- eventObject->triggerGroundEffectsOnStop = 1;
- eventObject->landingJump = 1;
+ objectEvent->triggerGroundEffectsOnStop = 1;
+ objectEvent->landingJump = 1;
sprite->pos2.y = 0;
task->data[0]++;
}
@@ -1622,7 +1622,7 @@ static bool8 sub_80B6E18(struct Task *task)
gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable();
CameraObjectReset1();
- UnfreezeEventObjects();
+ UnfreezeObjectEvents();
InstallCameraPanAheadCallback();
DestroyTask(FindTaskIdByFunc(sub_80B6B94));
return FALSE;
@@ -1648,7 +1648,7 @@ static void sub_80B6E88(u8 taskId)
static bool8 sub_80B6EC0(struct Task *task)
{
- FreezeEventObjects();
+ FreezeObjectEvents();
CameraObjectReset2();
sub_80E1558(task->data[1]);
task->data[0]++;
@@ -1657,11 +1657,11 @@ static bool8 sub_80B6EC0(struct Task *task)
static bool8 sub_80B6EE0(struct Task *task)
{
- struct EventObject *eventObject;
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
+ struct ObjectEvent *objectEvent;
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent))
{
- EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
+ ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
task->data[0]++;
task->data[2] = 0;
task->data[3] = 0;
@@ -1772,13 +1772,13 @@ static void sub_80B70DC(u8 taskId)
static bool8 sub_80B7114(struct Task *task)
{
- struct EventObject *eventObject;
+ struct ObjectEvent *objectEvent;
s16 x;
s16 y;
u8 behavior;
CameraObjectReset2();
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(DIR_EAST));
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(DIR_EAST));
PlayerGetDestCoords(&x, &y);
behavior = MapGridGetMetatileBehaviorAt(x, y);
task->data[0]++;
@@ -1868,13 +1868,13 @@ static bool8 sub_80B72D0(struct Task *task)
static bool8 sub_80B72F4(struct Task *task)
{
- struct EventObject *eventObject;
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- if (EventObjectClearHeldMovementIfFinished(eventObject))
+ struct ObjectEvent *objectEvent;
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{
CameraObjectReset1();
ScriptContext2_Disable();
- EventObjectSetHeldMovement(eventObject, GetWalkNormalMovementAction(DIR_EAST));
+ ObjectEventSetHeldMovement(objectEvent, GetWalkNormalMovementAction(DIR_EAST));
DestroyTask(FindTaskIdByFunc(sub_80B70DC));
}
return FALSE;
@@ -1891,10 +1891,10 @@ bool8 FldEff_UseWaterfall(void)
static void sub_80B7384(u8 taskId)
{
- while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId]));
+ while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId]));
}
-static bool8 sub_80B73D0(struct Task *task, struct EventObject *eventObject)
+static bool8 sub_80B73D0(struct Task *task, struct ObjectEvent *objectEvent)
{
ScriptContext2_Enable();
gPlayerAvatar.preventStep = TRUE;
@@ -1902,12 +1902,12 @@ static bool8 sub_80B73D0(struct Task *task, struct EventObject *eventObject)
return FALSE;
}
-static bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventObject)
+static bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent *objectEvent)
{
ScriptContext2_Enable();
- if (!EventObjectIsMovementOverridden(eventObject))
+ if (!ObjectEventIsMovementOverridden(objectEvent))
{
- EventObjectClearHeldMovementIfFinished(eventObject);
+ ObjectEventClearHeldMovementIfFinished(objectEvent);
gFieldEffectArguments[0] = task->data[1];
FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
task->data[0]++;
@@ -1915,7 +1915,7 @@ static bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject
return FALSE;
}
-static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObject *eventObject)
+static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent *objectEvent)
{
if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
{
@@ -1925,20 +1925,20 @@ static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct Eve
return TRUE;
}
-static bool8 sub_80B7450(struct Task *task, struct EventObject *eventObject)
+static bool8 sub_80B7450(struct Task *task, struct ObjectEvent *objectEvent)
{
- EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(DIR_NORTH));
+ ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(DIR_NORTH));
task->data[0]++;
return FALSE;
}
-static bool8 sub_80B7478(struct Task *task, struct EventObject *eventObject)
+static bool8 sub_80B7478(struct Task *task, struct ObjectEvent *objectEvent)
{
- if (!EventObjectClearHeldMovementIfFinished(eventObject))
+ if (!ObjectEventClearHeldMovementIfFinished(objectEvent))
{
return FALSE;
}
- if (MetatileBehavior_IsWaterfall(eventObject->currentMetatileBehavior))
+ if (MetatileBehavior_IsWaterfall(objectEvent->currentMetatileBehavior))
{
task->data[0] = 3;
return TRUE;
@@ -1987,7 +1987,7 @@ static bool8 dive_3_unknown(struct Task *task)
PlayerGetDestCoords(&mapPosition.x, &mapPosition.y);
if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
{
- dive_warp(&mapPosition, gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior);
+ dive_warp(&mapPosition, gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior);
DestroyTask(FindTaskIdByFunc(Task_Dive));
FieldEffectActiveListRemove(FLDEFF_USE_DIVE);
}
@@ -2001,22 +2001,22 @@ void sub_80B75D8(u8 priority)
static void sub_80B75F0(u8 taskId)
{
- while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId]));
+ while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId]));
}
-static bool8 sub_80B764C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B764C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- FreezeEventObjects();
+ FreezeObjectEvents();
CameraObjectReset2();
SetCameraPanningCallback(NULL);
gPlayerAvatar.preventStep = TRUE;
- eventObject->fixedPriority = 1;
+ objectEvent->fixedPriority = 1;
task->data[1] = 1;
task->data[0]++;
return TRUE;
}
-static bool8 sub_80B7684(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B7684(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
SetCameraPanning(0, task->data[1]);
task->data[1] = -task->data[1];
@@ -2029,12 +2029,12 @@ static bool8 sub_80B7684(struct Task *task, struct EventObject *eventObject, str
return FALSE;
}
-static bool8 sub_80B76B8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B76B8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
sprite->pos2.y = 0;
task->data[3] = 1;
- gFieldEffectArguments[0] = eventObject->currentCoords.x;
- gFieldEffectArguments[1] = eventObject->currentCoords.y;
+ gFieldEffectArguments[0] = objectEvent->currentCoords.x;
+ gFieldEffectArguments[1] = objectEvent->currentCoords.y;
gFieldEffectArguments[2] = sprite->subpriority - 1;
gFieldEffectArguments[3] = sprite->oam.priority;
FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
@@ -2043,7 +2043,7 @@ static bool8 sub_80B76B8(struct Task *task, struct EventObject *eventObject, str
return TRUE;
}
-static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B7704(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
s16 centerToCornerVecY;
SetCameraPanning(0, task->data[1]);
@@ -2075,7 +2075,7 @@ static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, str
if (task->data[5] == 0 && sprite->pos2.y < -0x10)
{
task->data[5]++;
- eventObject->fixedPriority = 1;
+ objectEvent->fixedPriority = 1;
sprite->oam.priority = 1;
sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
}
@@ -2086,7 +2086,7 @@ static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, str
return FALSE;
}
-static bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B77F8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
TryFadeOutOldMapMusic();
WarpFadeScreen();
@@ -2094,7 +2094,7 @@ static bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, str
return FALSE;
}
-static bool8 sub_80B7814(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B7814(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
if (!gPaletteFade.active && BGMusicStopped() == TRUE)
{
@@ -2117,25 +2117,25 @@ static void mapldr_080851BC(void)
static void sub_80B7890(u8 taskId)
{
- while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId]));
+ while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId]));
}
-static bool8 sub_80B78EC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B78EC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
CameraObjectReset2();
- FreezeEventObjects();
+ FreezeObjectEvents();
gPlayerAvatar.preventStep = TRUE;
- eventObject->invisible = TRUE;
+ objectEvent->invisible = TRUE;
task->data[0]++;
return FALSE;
}
-static bool8 sub_80B791C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B791C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
if (IsWeatherNotFadingIn())
{
- gFieldEffectArguments[0] = eventObject->currentCoords.x;
- gFieldEffectArguments[1] = eventObject->currentCoords.y;
+ gFieldEffectArguments[0] = objectEvent->currentCoords.x;
+ gFieldEffectArguments[1] = objectEvent->currentCoords.y;
gFieldEffectArguments[2] = sprite->subpriority - 1;
gFieldEffectArguments[3] = sprite->oam.priority;
task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
@@ -2144,27 +2144,27 @@ static bool8 sub_80B791C(struct Task *task, struct EventObject *eventObject, str
return FALSE;
}
-static bool8 sub_80B7968(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B7968(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
sprite = &gSprites[task->data[1]];
if (sprite->animCmdIndex > 1)
{
task->data[0]++;
- eventObject->invisible = FALSE;
+ objectEvent->invisible = FALSE;
CameraObjectReset1();
PlaySE(SE_W091);
- EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST));
+ ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST));
}
return FALSE;
}
-static bool8 sub_80B79BC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B79BC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- if (EventObjectClearHeldMovementIfFinished(eventObject))
+ if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{
gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable();
- UnfreezeEventObjects();
+ UnfreezeObjectEvents();
DestroyTask(FindTaskIdByFunc(sub_80B7890));
}
return FALSE;
@@ -2195,27 +2195,27 @@ void sub_80B7A74(u8 priority)
static void sub_80B7A8C(u8 taskId)
{
- while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId]));
+ while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId]));
}
-static bool8 sub_80B7AE8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B7AE8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- FreezeEventObjects();
+ FreezeObjectEvents();
CameraObjectReset2();
gPlayerAvatar.preventStep = TRUE;
- eventObject->fixedPriority = 1;
+ objectEvent->fixedPriority = 1;
task->data[0]++;
return FALSE;
}
-static bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B7B18(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- if (EventObjectClearHeldMovementIfFinished(eventObject))
+ if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{
if (task->data[1] > 3)
{
- gFieldEffectArguments[0] = eventObject->currentCoords.x;
- gFieldEffectArguments[1] = eventObject->currentCoords.y;
+ gFieldEffectArguments[0] = objectEvent->currentCoords.x;
+ gFieldEffectArguments[1] = objectEvent->currentCoords.y;
gFieldEffectArguments[2] = sprite->subpriority - 1;
gFieldEffectArguments[3] = sprite->oam.priority;
task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
@@ -2223,24 +2223,24 @@ static bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, str
} else
{
task->data[1]++;
- EventObjectSetHeldMovement(eventObject, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection));
+ ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection));
PlaySE(SE_FU_ZUZUZU);
}
}
return FALSE;
}
-static bool8 sub_80B7B94(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B7B94(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
if (gSprites[task->data[1]].animCmdIndex == 2)
{
- eventObject->invisible = TRUE;
+ objectEvent->invisible = TRUE;
task->data[0]++;
}
return FALSE;
}
-static bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B7BCC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
{
@@ -2251,7 +2251,7 @@ static bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, str
return FALSE;
}
-static bool8 sub_80B7BF4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
+static bool8 sub_80B7BF4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
if (!gPaletteFade.active && BGMusicStopped() == TRUE)
{
@@ -2284,7 +2284,7 @@ void sub_80B7CAC(struct Sprite *sprite)
void StartEscapeRopeFieldEffect(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
CreateTask(DoEscapeRopeFieldEffect, 0x50);
}
@@ -2302,19 +2302,19 @@ static void EscapeRopeFieldEffect_Step0(struct Task *task)
static void EscapeRopeFieldEffect_Step1(struct Task *task)
{
- struct EventObject *eventObject;
+ struct ObjectEvent *objectEvent;
u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
if (task->data[14] != 0 && (--task->data[14]) == 0)
{
TryFadeOutOldMapMusic();
WarpFadeScreen();
}
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent))
{
if (task->data[14] == 0 && !gPaletteFade.active && BGMusicStopped() == TRUE)
{
- SetEventObjectDirection(eventObject, task->data[15]);
+ SetObjectEventDirection(objectEvent, task->data[15]);
SetWarpDestinationToEscapeWarp();
WarpIntoMap();
gFieldCallback = mapldr_080859D4;
@@ -2322,7 +2322,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task)
DestroyTask(FindTaskIdByFunc(DoEscapeRopeFieldEffect));
} else if (task->data[1] == 0 || (--task->data[1]) == 0)
{
- EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection]));
+ ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection]));
if (task->data[2] < 12)
{
task->data[2]++;
@@ -2342,9 +2342,9 @@ static void mapldr_080859D4(void)
Overworld_PlaySpecialMapMusic();
pal_fill_for_maplights();
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
gFieldCallback = NULL;
- gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
CreateTask(sub_80B7E94, 0);
}
@@ -2365,29 +2365,29 @@ static void sub_80B7EC4(struct Task *task)
static void sub_80B7EE8(struct Task *task)
{
u8 spinDirections[5] = {1, 3, 4, 2, 1};
- struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
if (task->data[1] == 0 || (--task->data[1]) == 0)
{
- if (EventObjectIsMovementOverridden(eventObject) && !EventObjectClearHeldMovementIfFinished(eventObject))
+ if (ObjectEventIsMovementOverridden(objectEvent) && !ObjectEventClearHeldMovementIfFinished(objectEvent))
{
return;
}
if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection())
{
- eventObject->invisible = FALSE;
+ objectEvent->invisible = FALSE;
ScriptContext2_Disable();
- UnfreezeEventObjects();
+ UnfreezeObjectEvents();
DestroyTask(FindTaskIdByFunc(sub_80B7E94));
return;
}
- EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection]));
+ ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection]));
if (task->data[2] < 32)
{
task->data[2]++;
}
task->data[1] = task->data[2] >> 2;
}
- eventObject->invisible ^= 1;
+ objectEvent->invisible ^= 1;
}
void CreateTeleportFieldEffectTask(void)
@@ -2410,7 +2410,7 @@ static void ExecuteTeleportFieldEffectTask(u8 taskId)
static void TeleportFieldEffectTask1(struct Task *task)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
CameraObjectReset2();
task->data[15] = GetPlayerFacingDirection();
task->data[0]++;
@@ -2419,14 +2419,14 @@ static void TeleportFieldEffectTask1(struct Task *task)
static void TeleportFieldEffectTask2(struct Task *task)
{
u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
- struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
if (task->data[1] == 0 || (--task->data[1]) == 0)
{
- EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
+ ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]);
task->data[1] = 8;
task->data[2]++;
}
- if (task->data[2] > 7 && task->data[15] == eventObject->facingDirection)
+ if (task->data[2] > 7 && task->data[15] == objectEvent->facingDirection)
{
task->data[0]++;
task->data[1] = 4;
@@ -2439,12 +2439,12 @@ static void TeleportFieldEffectTask2(struct Task *task)
static void TeleportFieldEffectTask3(struct Task *task)
{
u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
- struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId];
if ((--task->data[1]) <= 0)
{
task->data[1] = 4;
- EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
+ ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]);
}
sprite->pos1.y -= task->data[3];
task->data[4] += task->data[3];
@@ -2490,9 +2490,9 @@ static void mapldr_08085D88(void)
Overworld_PlaySpecialMapMusic();
pal_fill_for_maplights();
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
gFieldCallback = NULL;
- gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE;
CameraObjectReset2();
CreateTask(sub_80B8250, 0);
}
@@ -2517,7 +2517,7 @@ static void sub_80B8280(struct Task *task)
sprite = &gSprites[gPlayerAvatar.spriteId];
centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
- gEventObjects[gPlayerAvatar.eventObjectId].invisible = FALSE;
+ gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE;
task->data[0]++;
task->data[1] = 8;
task->data[2] = 1;
@@ -2530,14 +2530,14 @@ static void sub_80B8280(struct Task *task)
static void sub_80B830C(struct Task *task)
{
u8 spinDirections[5] = {1, 3, 4, 2, 1};
- struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId];
if ((sprite->pos2.y += task->data[1]) >= -8)
{
if (task->data[13] == 0)
{
task->data[13]++;
- eventObject->triggerGroundEffectsOnMove = 1;
+ objectEvent->triggerGroundEffectsOnMove = 1;
sprite->subspriteMode = task->data[14];
}
} else
@@ -2555,7 +2555,7 @@ static void sub_80B830C(struct Task *task)
if ((--task->data[2]) == 0)
{
task->data[2] = 4;
- EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
+ ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]);
}
if (sprite->pos2.y >= 0)
{
@@ -2569,16 +2569,16 @@ static void sub_80B830C(struct Task *task)
static void sub_80B8410(struct Task *task)
{
u8 spinDirections[5] = {1, 3, 4, 2, 1};
- struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
if ((--task->data[1]) == 0)
{
- EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
+ ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]);
task->data[1] = 8;
- if ((++task->data[2]) > 4 && task->data[14] == eventObject->facingDirection)
+ if ((++task->data[2]) > 4 && task->data[14] == objectEvent->facingDirection)
{
ScriptContext2_Disable();
CameraObjectReset1();
- UnfreezeEventObjects();
+ UnfreezeObjectEvents();
DestroyTask(FindTaskIdByFunc(sub_80B8250));
}
}
@@ -3008,31 +3008,31 @@ static void sub_80B8D84(u8 taskId)
static void sub_80B8DB4(struct Task *task)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
gPlayerAvatar.preventStep = TRUE;
SetPlayerAvatarStateMask(8);
PlayerGetDestCoords(&task->data[1], &task->data[2]);
- MoveCoords(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection, &task->data[1], &task->data[2]);
+ MoveCoords(gObjectEvents[gPlayerAvatar.objectEventId].movementDirection, &task->data[1], &task->data[2]);
task->data[0]++;
}
static void sub_80B8E14(struct Task *task)
{
- struct EventObject *eventObject;
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
+ struct ObjectEvent *objectEvent;
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent))
{
sub_808C114();
- EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
+ ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
task->data[0]++;
}
}
static void sub_80B8E60(struct Task *task)
{
- struct EventObject *eventObject;
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- if (EventObjectCheckHeldMovementStatus(eventObject))
+ struct ObjectEvent *objectEvent;
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if (ObjectEventCheckHeldMovementStatus(objectEvent))
{
gFieldEffectArguments[0] = task->data[15] | 0x80000000;
FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
@@ -3042,32 +3042,32 @@ static void sub_80B8E60(struct Task *task)
static void sub_80B8EA8(struct Task *task)
{
- struct EventObject *eventObject;
+ struct ObjectEvent *objectEvent;
if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
{
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(3));
- EventObjectClearHeldMovementIfFinished(eventObject);
- EventObjectSetHeldMovement(eventObject, GetJumpSpecialMovementAction(eventObject->movementDirection));
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(3));
+ ObjectEventClearHeldMovementIfFinished(objectEvent);
+ ObjectEventSetHeldMovement(objectEvent, GetJumpSpecialMovementAction(objectEvent->movementDirection));
gFieldEffectArguments[0] = task->data[1];
gFieldEffectArguments[1] = task->data[2];
- gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId;
- eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB);
+ gFieldEffectArguments[2] = gPlayerAvatar.objectEventId;
+ objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB);
task->data[0]++;
}
}
static void sub_80B8F24(struct Task *task)
{
- struct EventObject *eventObject;
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- if (EventObjectClearHeldMovementIfFinished(eventObject))
+ struct ObjectEvent *objectEvent;
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{
gPlayerAvatar.preventStep = FALSE;
gPlayerAvatar.flags &= 0xdf;
- EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(eventObject->movementDirection));
- sub_81555AC(eventObject->fieldEffectSpriteId, 1);
- UnfreezeEventObjects();
+ ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection));
+ sub_81555AC(objectEvent->fieldEffectSpriteId, 1);
+ UnfreezeObjectEvents();
ScriptContext2_Disable();
FieldEffectActiveListRemove(FLDEFF_USE_SURF);
DestroyTask(FindTaskIdByFunc(sub_80B8D84));
@@ -3172,22 +3172,22 @@ static void sub_80B91D4(u8 taskId)
static void sub_80B9204(struct Task *task)
{
- struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent))
{
task->data[15] = gPlayerAvatar.flags;
gPlayerAvatar.preventStep = TRUE;
SetPlayerAvatarStateMask(1);
sub_808C114();
- EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
+ ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
task->data[0]++;
}
}
static void sub_80B925C(struct Task *task)
{
- struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- if (EventObjectClearHeldMovementIfFinished(eventObject))
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{
task->data[0]++;
gFieldEffectArguments[0] = task->data[1];
@@ -3199,11 +3199,11 @@ static void sub_80B92A0(struct Task *task)
{
if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
{
- struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
if (task->data[15] & 0x08)
{
- sub_81555AC(eventObject->fieldEffectSpriteId, 2);
- sub_81555D8(eventObject->fieldEffectSpriteId, 0);
+ sub_81555AC(objectEvent->fieldEffectSpriteId, 2);
+ sub_81555D8(objectEvent->fieldEffectSpriteId, 0);
}
task->data[1] = sub_80B94C4();
task->data[0]++;
@@ -3217,14 +3217,14 @@ static void sub_80B92F8(struct Task *task)
task->data[0]++;
task->data[2] = 16;
SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
- EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], MOVEMENT_ACTION_FACE_LEFT);
+ ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], MOVEMENT_ACTION_FACE_LEFT);
}
}
static void sub_80B933C(struct Task *task)
{
- struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject))
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent))
{
task->data[0]++;
PlaySE(SE_W019);
@@ -3236,14 +3236,14 @@ static void sub_80B9390(struct Task *task)
{
if ((++task->data[2]) >= 8)
{
- struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x03));
- StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16);
- eventObject->inanimate = 1;
- EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT);
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0x03));
+ StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16);
+ objectEvent->inanimate = 1;
+ ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT);
if (task->data[15] & 0x08)
{
- DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]);
+ DestroySprite(&gSprites[objectEvent->fieldEffectSpriteId]);
}
task->data[0]++;
task->data[2] = 0;
@@ -3254,11 +3254,11 @@ static void sub_80B9418(struct Task *task)
{
if ((++task->data[2]) >= 10)
{
- struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- EventObjectClearHeldMovementIfActive(eventObject);
- eventObject->inanimate = 0;
- eventObject->hasShadow = 0;
- sub_80B9560(task->data[1], eventObject->spriteId);
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ ObjectEventClearHeldMovementIfActive(objectEvent);
+ objectEvent->inanimate = 0;
+ objectEvent->hasShadow = 0;
+ sub_80B9560(task->data[1], objectEvent->spriteId);
CameraObjectReset2();
task->data[0]++;
}
@@ -3460,9 +3460,9 @@ static void sub_80B97D4(u8 taskId)
static void sub_80B9804(struct Task *task)
{
- struct EventObject *eventObject;
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
+ struct ObjectEvent *objectEvent;
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent))
{
task->data[0]++;
task->data[2] = 17;
@@ -3471,27 +3471,27 @@ static void sub_80B9804(struct Task *task)
SetPlayerAvatarStateMask(0x01);
if (task->data[15] & 0x08)
{
- sub_81555AC(eventObject->fieldEffectSpriteId, 0);
+ sub_81555AC(objectEvent->fieldEffectSpriteId, 0);
}
- EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x3));
+ ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0x3));
CameraObjectReset2();
- EventObjectTurn(eventObject, DIR_WEST);
- StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16);
- eventObject->invisible = FALSE;
+ ObjectEventTurn(objectEvent, DIR_WEST);
+ StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16);
+ objectEvent->invisible = FALSE;
task->data[1] = sub_80B94C4();
sub_80B9524(task->data[1]);
- sub_80B9560(task->data[1], eventObject->spriteId);
+ sub_80B9560(task->data[1], objectEvent->spriteId);
}
}
static void sub_80B98B8(struct Task *task)
{
- struct EventObject *eventObject;
+ struct ObjectEvent *objectEvent;
struct Sprite *sprite;
if (task->data[2] == 0 || (--task->data[2]) == 0)
{
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- sprite = &gSprites[eventObject->spriteId];
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ sprite = &gSprites[objectEvent->spriteId];
sub_80B9560(task->data[1], 0x40);
sprite->pos1.x += sprite->pos2.x;
sprite->pos1.y += sprite->pos2.y;
@@ -3534,26 +3534,26 @@ static void sub_80B9924(struct Task *task)
static void sub_80B9978(struct Task *task)
{
- struct EventObject *eventObject;
+ struct ObjectEvent *objectEvent;
struct Sprite *sprite;
if (sub_80B9508(task->data[1]))
{
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
- sprite = &gSprites[eventObject->spriteId];
- eventObject->inanimate = 0;
- MoveEventObjectToMapCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y);
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ sprite = &gSprites[objectEvent->spriteId];
+ objectEvent->inanimate = 0;
+ MoveObjectEventToMapCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y);
sprite->pos2.x = 0;
sprite->pos2.y = 0;
sprite->coordOffsetEnabled = 1;
sub_808C114();
- EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
+ ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
task->data[0]++;
}
}
static void sub_80B99F0(struct Task *task)
{
- if (EventObjectClearHeldMovementIfFinished(&gEventObjects[gPlayerAvatar.eventObjectId]))
+ if (ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gPlayerAvatar.objectEventId]))
{
task->data[0]++;
sub_80B9794(task->data[1]);
@@ -3573,18 +3573,18 @@ static void sub_80B9A28(struct Task *task)
static void sub_80B9A60(struct Task *task)
{
u8 state;
- struct EventObject *eventObject;
+ struct ObjectEvent *objectEvent;
if ((--task->data[1]) == 0)
{
- eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+ objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
state = 0;
if (task->data[15] & 0x08)
{
state = 3;
- sub_81555AC(eventObject->fieldEffectSpriteId, 1);
+ sub_81555AC(objectEvent->fieldEffectSpriteId, 1);
}
- EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(state));
- EventObjectTurn(eventObject, DIR_SOUTH);
+ ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(state));
+ ObjectEventTurn(objectEvent, DIR_SOUTH);
gPlayerAvatar.flags = task->data[15];
gPlayerAvatar.preventStep = FALSE;
FieldEffectActiveListRemove(FLDEFF_FLY_IN);
@@ -3595,11 +3595,11 @@ static void sub_80B9A60(struct Task *task)
bool8 sub_80B9ADC(void)
{
u8 taskId;
- u8 eventObjectIdBuffer;
- if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer))
+ u8 objectEventIdBuffer;
+ if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer))
{
taskId = CreateTask(sub_80B9BE8, 0x50);
- gTasks[taskId].data[2] = eventObjectIdBuffer;
+ gTasks[taskId].data[2] = objectEventIdBuffer;
gTasks[taskId].data[6] = gFieldEffectArguments[0];
gTasks[taskId].data[7] = gFieldEffectArguments[1];
gTasks[taskId].data[8] = gFieldEffectArguments[2];
@@ -3678,8 +3678,8 @@ void sub_80B9C54(s16* data, u8 taskId)
{
if (++data[3] > 0x78)
{
- struct Sprite *sprite = &gSprites[gEventObjects[data[2]].spriteId];
- gEventObjects[data[2]].invisible = TRUE;
+ struct Sprite *sprite = &gSprites[gObjectEvents[data[2]].spriteId];
+ gObjectEvents[data[2]].invisible = TRUE;
BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE);
BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE);
sub_80B9D24(sprite);
@@ -3695,7 +3695,7 @@ void sub_80B9CDC(s16* a0, u8 taskId)
if (!gPaletteFade.active && !FuncIsActiveTask(sub_80B9B3C))
{
InstallCameraPanAheadCallback();
- RemoveEventObjectByLocalIdAndMap(a0[6], a0[7], a0[8]);
+ RemoveObjectEventByLocalIdAndMap(a0[6], a0[7], a0[8]);
FieldEffectActiveListRemove(0x41);
DestroyTask(taskId);
}
@@ -3790,24 +3790,24 @@ static void sub_80B9DB8(struct Sprite* sprite)
bool8 Fldeff_MoveDeoxysRock(struct Sprite* sprite)
{
- u8 eventObjectIdBuffer;
- if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer))
+ u8 objectEventIdBuffer;
+ if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer))
{
- struct EventObject *object;
+ struct ObjectEvent *object;
int xPos, yPos;
u8 taskId;
- object = &gEventObjects[eventObjectIdBuffer];
+ object = &gObjectEvents[objectEventIdBuffer];
xPos = object->currentCoords.x - 7;
yPos = object->currentCoords.y - 7;
xPos = (gFieldEffectArguments[3] - xPos) * 16;
yPos = (gFieldEffectArguments[4] - yPos) * 16;
- ShiftEventObjectCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7);
+ ShiftObjectEventCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7);
taskId = CreateTask(Fldeff_MoveDeoxysRock_Step, 0x50);
gTasks[taskId].data[1] = object->spriteId;
gTasks[taskId].data[2] = gSprites[object->spriteId].pos1.x + xPos;
gTasks[taskId].data[3] = gSprites[object->spriteId].pos1.y + yPos;
gTasks[taskId].data[8] = gFieldEffectArguments[5];
- gTasks[taskId].data[9] = eventObjectIdBuffer;
+ gTasks[taskId].data[9] = objectEventIdBuffer;
}
return FALSE;
}
@@ -3836,10 +3836,10 @@ static void Fldeff_MoveDeoxysRock_Step(u8 taskId)
}
else
{
- struct EventObject *object = &gEventObjects[data[9]];
+ struct ObjectEvent *object = &gObjectEvents[data[9]];
sprite->pos1.x = data[2];
sprite->pos1.y = data[3];
- ShiftStillEventObjectCoords(object);
+ ShiftStillObjectEventCoords(object);
object->triggerGroundEffectsOnStop = TRUE;
FieldEffectActiveListRemove(0x42);
DestroyTask(taskId);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 19:35:00 +0000