summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_setup.c34
-rw-r--r--src/battle_transition.c4
-rw-r--r--src/event_object_lock.c2
-rw-r--r--src/field_fadetransition.c18
-rw-r--r--src/fldeff_rocksmash.c2
-rw-r--r--src/item_use.c2
-rw-r--r--src/quest_log.c4
-rw-r--r--src/quest_log_8150454.c2
-rw-r--r--src/shop.c8
-rw-r--r--src/start_menu.c2
-rw-r--r--src/teachy_tv.c2
11 files changed, 40 insertions, 40 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 2faa70c15..17da53083 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -71,7 +71,7 @@ static const u8 *GetTrainerCantBattleSpeech(void);
static EWRAM_DATA u16 sTrainerBattleMode = 0;
EWRAM_DATA u16 gTrainerBattleOpponent_A = 0;
-static EWRAM_DATA u16 sTrainerEventObjectLocalId = 0;
+static EWRAM_DATA u16 sTrainerObjectEventLocalId = 0;
static EWRAM_DATA u8 *sTrainerAIntroSpeech = NULL;
static EWRAM_DATA u8 *sTrainerADefeatSpeech = NULL;
static EWRAM_DATA u8 *sTrainerVictorySpeech = NULL;
@@ -100,7 +100,7 @@ static const struct TrainerBattleParameter sOrdinaryBattleParams[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -113,7 +113,7 @@ static const struct TrainerBattleParameter sContinueScriptBattleParams[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -126,7 +126,7 @@ static const struct TrainerBattleParameter sDoubleBattleParams[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -139,7 +139,7 @@ static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -165,7 +165,7 @@ static const struct TrainerBattleParameter sContinueScriptDoubleBattleParams[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -237,7 +237,7 @@ void BattleSetup_StartWildBattle(void)
static void DoStandardWildBattle(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C780();
gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = 0;
@@ -249,7 +249,7 @@ static void DoStandardWildBattle(void)
void BattleSetup_StartRoamerBattle(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C780();
gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = BATTLE_TYPE_ROAMER;
@@ -261,7 +261,7 @@ void BattleSetup_StartRoamerBattle(void)
static void DoSafariBattle(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C780();
gMain.savedCallback = CB2_EndSafariBattle;
gBattleTypeFlags = BATTLE_TYPE_SAFARI;
@@ -271,7 +271,7 @@ static void DoSafariBattle(void)
static void DoGhostBattle(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C780();
gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = BATTLE_TYPE_GHOST;
@@ -401,7 +401,7 @@ static void sub_807FAF8(void)
static void sub_807FB08(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C780();
gMain.savedCallback = sub_807FAF8;
SavePlayerParty();
@@ -698,7 +698,7 @@ static void InitTrainerBattleVariables(void)
{
sTrainerBattleMode = 0;
gTrainerBattleOpponent_A = 0;
- sTrainerEventObjectLocalId = 0;
+ sTrainerObjectEventLocalId = 0;
sTrainerAIntroSpeech = NULL;
sTrainerADefeatSpeech = NULL;
sTrainerVictorySpeech = NULL;
@@ -765,10 +765,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co
static void SetMapVarsToTrainer(void)
{
- if (sTrainerEventObjectLocalId != 0)
+ if (sTrainerObjectEventLocalId != 0)
{
- gSpecialVar_LastTalked = sTrainerEventObjectLocalId;
- gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+ gSpecialVar_LastTalked = sTrainerObjectEventLocalId;
+ gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
}
}
@@ -835,9 +835,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
void SetUpTrainerMovement(void)
{
- struct ObjectEvent *eventObject = &gObjectEvents[gSelectedObjectEvent];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent];
- SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection));
+ SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection));
}
u8 ScrSpecial_GetTrainerBattleMode(void)
diff --git a/src/battle_transition.c b/src/battle_transition.c
index a5b6f369c..aa68ed278 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -46,7 +46,7 @@ struct TransitionData
static EWRAM_DATA struct TransitionData *sTransitionStructPtr = NULL;
// TODO: Move this declaration to include/event_object_movement.h
-extern const struct OamData gEventObjectBaseOam_32x32;
+extern const struct OamData gObjectEventBaseOam_32x32;
static bool8 BT_Phase1_FadeOut(struct Task *task);
static bool8 BT_Phase1_FadeIn(struct Task *task);
@@ -470,7 +470,7 @@ static const struct SpriteTemplate sSpriteTemplate_SlidingPokeball =
{
.tileTag = SPRITE_INVALID_TAG,
.paletteTag = 0x1009,
- .oam = &gEventObjectBaseOam_32x32,
+ .oam = &gObjectEventBaseOam_32x32,
.anims = sSpriteAnimTable_SlidingPokeball,
.images = sSpriteImageTable_SlidingPokeball,
.affineAnims = sSpriteAffineAnimTable_SlidingPokeball,
diff --git a/src/event_object_lock.c b/src/event_object_lock.c
index e9de984f1..23131067e 100644
--- a/src/event_object_lock.c
+++ b/src/event_object_lock.c
@@ -37,7 +37,7 @@ bool8 sub_8069590(void)
void ScriptFreezeObjectEvents(void)
{
- FreezeEventObjects();
+ FreezeObjectEvents();
CreateTask(sub_8069570, 80);
}
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 9c3173421..7dc30bb77 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -322,14 +322,14 @@ static void sub_807DFBC(u8 taskId)
{
case 0: // Never reached
sub_807DCB0(0);
- FreezeEventObjects();
+ FreezeObjectEvents();
PlayerGetDestCoords(x, y);
FieldSetDoorOpened(*x, *y);
task->data[0] = 1;
break;
case 5:
sub_807DCB0(0);
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_807F114();
sub_807DBAC();
task->data[0] = 6;
@@ -407,7 +407,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
{
case 0:
sub_807DCB0(0);
- FreezeEventObjects();
+ FreezeObjectEvents();
PlayerGetDestCoords(x, y);
task->data[0] = 1;
break;
@@ -438,7 +438,7 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
switch (gTasks[taskId].data[0])
{
case 0:
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
gTasks[taskId].data[0]++;
break;
@@ -458,7 +458,7 @@ static void sub_807E31C(u8 taskId)
switch (gTasks[taskId].data[0])
{
case 0:
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
sub_805DC04();
gTasks[taskId].data[0]++;
@@ -688,7 +688,7 @@ static void sub_807E718(u8 taskId)
switch (task->data[0])
{
case 0:
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
task->data[0]++;
break;
@@ -710,7 +710,7 @@ static void sub_807E784(u8 taskId)
switch (task->data[0])
{
case 0:
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
PlaySE(SE_TK_WARPIN);
sub_805DAB0();
@@ -743,7 +743,7 @@ static void sub_807E80C(u8 taskId)
switch (task->data[0])
{
case 0:
- FreezeEventObjects();
+ FreezeObjectEvents();
PlayerGetDestCoords(xp, yp);
PlaySE(GetDoorSoundEffect(*xp, *yp - 1));
task->data[1] = FieldAnimateDoorOpen(*xp, *yp - 1);
@@ -797,7 +797,7 @@ static void sub_807E980(u8 taskId)
{
case 0:
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
CameraObjectReset2();
data[0]++;
break;
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index a0c97e9e3..c62653367 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -90,7 +90,7 @@ static void sub_80C98FC(u8 taskId)
gFieldEffectArguments[2] = 2;
if (gFieldEffectArguments[1] == 4)
gFieldEffectArguments[2] = 3;
- EventObjectSetGraphicsId(&gObjectEvents[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
+ ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]);
FieldEffectActiveListRemove(6);
gTasks[taskId].func = sub_80C99A0;
diff --git a/src/item_use.c b/src/item_use.c
index 83181e0be..46bd066f9 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -223,7 +223,7 @@ static void sub_80A1184(void)
static bool8 sub_80A1194(void)
{
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
sub_807DC00();
CreateTask(sub_80A11C0, 10);
diff --git a/src/quest_log.c b/src/quest_log.c
index ec864ff02..7448e4b87 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -1347,7 +1347,7 @@ static void sub_8111F8C(u8 taskId)
if (ScriptContext2_IsEnabled() != TRUE)
{
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C270();
sub_805C780();
ScriptContext2_Enable();
@@ -1370,7 +1370,7 @@ static void sub_8111FCC(u8 taskId)
task->data[0] = 0;
task->data[1] = 0;
task->func = sub_8112044;
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
}
}
diff --git a/src/quest_log_8150454.c b/src/quest_log_8150454.c
index 64731f522..2e67ebdce 100644
--- a/src/quest_log_8150454.c
+++ b/src/quest_log_8150454.c
@@ -172,7 +172,7 @@ static void sub_8150794(u8 taskId)
static void sub_81507BC(struct ObjectEvent * a0, u8 a1)
{
- EventObjectSetGraphicsId(a0, a1);
+ ObjectEventSetGraphicsId(a0, a1);
}
static void sub_81507CC(void)
diff --git a/src/shop.c b/src/shop.c
index f4f45eb52..0eb4baaa1 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -139,7 +139,7 @@ static void sub_809B764(void);
static void BuyMenuDrawMapBg(void);
static void BuyMenuDrawMapMetatile(s16 x, s16 y, const u16 *src, u8 metatileLayerType);
static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src);
-static void BuyMenuCollectEventObjectData(void);
+static void BuyMenuCollectObjectEventData(void);
static void BuyMenuDrawObjectEvents(void);
static void BuyMenuCopyTilemapData(void);
static void BuyMenuPrintItemQuantityAndPrice(u8 taskId);
@@ -735,7 +735,7 @@ static void BuyMenuRemoveScrollIndicatorArrows(void)
static void sub_809B764(void)
{
- BuyMenuCollectEventObjectData();
+ BuyMenuCollectObjectEventData();
BuyMenuDrawObjectEvents();
BuyMenuDrawMapBg();
}
@@ -801,7 +801,7 @@ static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, con
dest[offset1 + offset2 + 33] = src[3]; // bottom right
}
-static void BuyMenuCollectEventObjectData(void)
+static void BuyMenuCollectObjectEventData(void)
{
s16 facingX, facingY;
u8 x, y, z;
@@ -857,7 +857,7 @@ static void BuyMenuDrawObjectEvents(void)
continue;
graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[sViewportObjectEvents[i][OBJECT_EVENT_ID]].graphicsId);
- spriteId = AddPseudoEventObject(
+ spriteId = AddPseudoObjectEvent(
gObjectEvents[sViewportObjectEvents[i][OBJECT_EVENT_ID]].graphicsId,
SpriteCallbackDummy,
(u16)sViewportObjectEvents[i][X_COORD] * 16 - 8,
diff --git a/src/start_menu.c b/src/start_menu.c
index 7394c8d52..59bfb8643 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -392,7 +392,7 @@ void ShowStartMenu(void)
{
if (!IsUpdateLinkStateCBActive())
{
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_805C270();
sub_805C780();
}
diff --git a/src/teachy_tv.c b/src/teachy_tv.c
index 449e75f09..11d4a80b1 100644
--- a/src/teachy_tv.c
+++ b/src/teachy_tv.c
@@ -619,7 +619,7 @@ static void TeachyTvInitIo(void)
static u8 TeachyTvSetupObjEventAndOam(void)
{
- u8 objId = AddPseudoEventObject(90, SpriteCallbackDummy, 0, 0, 8);
+ u8 objId = AddPseudoObjectEvent(90, SpriteCallbackDummy, 0, 0, 8);
gSprites[objId].oam.priority = 2;
gSprites[objId].invisible = 1;
return objId;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 11:49:12 +0000