summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_setup.c42
-rw-r--r--src/battle_tower.c4
-rw-r--r--src/battle_transition.c4
-rw-r--r--src/data/pokemon/pokedex_entries.h2
-rw-r--r--src/easy_chat.c2
-rw-r--r--src/event_data.c2
-rw-r--r--src/event_object_lock.c (renamed from src/map_obj_lock.c)45
-rw-r--r--src/fame_checker.c2
-rw-r--r--src/field_fadetransition.c61
-rw-r--r--src/field_specials.c24
-rw-r--r--src/fieldmap.c126
-rw-r--r--src/fldeff_dig.c2
-rw-r--r--src/fldeff_rocksmash.c24
-rw-r--r--src/fldeff_strength.c4
-rw-r--r--src/item_use.c10
-rw-r--r--src/itemfinder.c14
-rw-r--r--src/load_save.c16
-rw-r--r--src/quest_log.c66
-rw-r--r--src/quest_log_8150454.c63
-rw-r--r--src/quest_log_815A008.c186
-rw-r--r--src/scrcmd.c41
-rw-r--r--src/sea_cottage_special_anim.c2
-rw-r--r--src/shop.c68
-rw-r--r--src/ss_anne.c34
-rw-r--r--src/start_menu.c6
-rw-r--r--src/teachy_tv.c16
-rw-r--r--src/tileset_anims.c8
-rw-r--r--src/trade.c2
-rw-r--r--src/trainer_tower.c204
-rw-r--r--src/vs_seeker.c162
30 files changed, 619 insertions, 623 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 9fef6a8a5..17da53083 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -13,7 +13,7 @@
#include "strings.h"
#include "string_util.h"
#include "event_data.h"
-#include "map_obj_80688E4.h"
+#include "event_object_80688E4.h"
#include "metatile_behavior.h"
#include "event_scripts.h"
#include "fldeff.h"
@@ -22,7 +22,7 @@
#include "field_player_avatar.h"
#include "field_screen_effect.h"
#include "field_message_box.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
#include "vs_seeker.h"
#include "battle.h"
#include "battle_setup.h"
@@ -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;
- gSelectedEventObject = GetFieldObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+ gSpecialVar_LastTalked = sTrainerObjectEventLocalId;
+ gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
}
}
@@ -819,8 +819,8 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript)
{
- gSelectedEventObject = trainerEventObjId;
- gSpecialVar_LastTalked = gMapObjects[trainerEventObjId].localId;
+ gSelectedObjectEvent = trainerEventObjId;
+ gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId;
BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
ScriptContext1_SetupScript(gUnknown_81A4EB4);
ScriptContext2_Enable();
@@ -835,9 +835,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
void SetUpTrainerMovement(void)
{
- struct MapObject *eventObject = &gMapObjects[gSelectedEventObject];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent];
- SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection));
+ SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection));
}
u8 ScrSpecial_GetTrainerBattleMode(void)
diff --git a/src/battle_tower.c b/src/battle_tower.c
index dfbef8fe5..c8098abf4 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -24,7 +24,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/vars.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
static EWRAM_DATA u16 sSpecialVar_0x8004_Copy = 0;
@@ -389,7 +389,7 @@ void ChooseNextBattleTowerTrainer(void)
static void SetBattleTowerTrainerGfxId(u8 trainerClass)
{
- VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_YOUNGSTER);
+ VarSet(VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_YOUNGSTER);
}
void SetEReaderTrainerGfxId(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/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h
index 4f14c64e9..1f388e05e 100644
--- a/src/data/pokemon/pokedex_entries.h
+++ b/src/data/pokemon/pokedex_entries.h
@@ -5030,4 +5030,4 @@ const struct PokedexEntry gPokedexEntries[] =
.trainerScale = 337,
.trainerOffset = 2,
},
-}; \ No newline at end of file
+};
diff --git a/src/easy_chat.c b/src/easy_chat.c
index be617133b..1d2873fc2 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -25,7 +25,7 @@
#include "text_window.h"
#include "window.h"
#include "constants/easy_chat.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
#include "constants/flags.h"
#include "constants/songs.h"
#include "constants/species.h"
diff --git a/src/event_data.c b/src/event_data.c
index 4aca57e50..9291c06aa 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -238,7 +238,7 @@ bool8 VarSet(u16 idx, u16 val)
return TRUE;
}
-u8 VarGetFieldObjectGraphicsId(u8 idx)
+u8 VarGetObjectEventGraphicsId(u8 idx)
{
return VarGet(VAR_OBJ_GFX_ID_0 + idx);
}
diff --git a/src/map_obj_lock.c b/src/event_object_lock.c
index e28872fd4..17ec57b20 100644
--- a/src/map_obj_lock.c
+++ b/src/event_object_lock.c
@@ -1,12 +1,11 @@
#include "global.h"
#include "task.h"
#include "field_player_avatar.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
#include "script_movement.h"
-#include "map_obj_80688E4.h"
+#include "event_object_80688E4.h"
#include "event_data.h"
-#include "map_obj_lock.h"
+#include "event_object_lock.h"
bool8 walkrun_is_standing_still(void)
{
@@ -36,9 +35,9 @@ bool8 sub_8069590(void)
}
}
-void ScriptFreezeMapObjects(void)
+void ScriptFreezeObjectEvents(void)
{
- FreezeEventObjects();
+ FreezeObjectEvents();
CreateTask(sub_8069570, 80);
}
@@ -52,9 +51,9 @@ void sub_80695CC(u8 taskId)
task->data[0] = 1;
}
- if (task->data[1] == 0 && !gMapObjects[gSelectedEventObject].mapobj_bit_1)
+ if (task->data[1] == 0 && !gObjectEvents[gSelectedObjectEvent].mapobj_bit_1)
{
- FreezeMapObject(&gMapObjects[gSelectedEventObject]);
+ FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
task->data[1] = 1;
}
@@ -73,44 +72,44 @@ bool8 sub_8069648(void)
}
}
-void LockSelectedMapObject(void)
+void LockSelectedObjectEvent(void)
{
u8 taskId;
- FreezeMapObjectsExceptOne(gSelectedEventObject);
+ FreezeObjectEventsExceptOne(gSelectedObjectEvent);
taskId = CreateTask(sub_80695CC, 80);
- if (!gMapObjects[gSelectedEventObject].mapobj_bit_1)
+ if (!gObjectEvents[gSelectedObjectEvent].mapobj_bit_1)
{
- FreezeMapObject(&gMapObjects[gSelectedEventObject]);
+ FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
gTasks[taskId].data[1] = 1;
}
}
void sub_80696C0(void)
{
- u8 fieldObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
- FieldObjectClearHeldMovementIfFinished(&gMapObjects[fieldObjectId]);
+ u8 objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
+ ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
sub_80974D8();
- UnfreezeMapObjects();
+ UnfreezeObjectEvents();
}
void sub_80696F0(void)
{
- u8 fieldObjectId;
- if (gMapObjects[gSelectedEventObject].active)
- FieldObjectClearHeldMovementIfFinished(&gMapObjects[gSelectedEventObject]);
- fieldObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
- FieldObjectClearHeldMovementIfFinished(&gMapObjects[fieldObjectId]);
+ u8 objectEventId;
+ if (gObjectEvents[gSelectedObjectEvent].active)
+ ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
+ objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
+ ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
sub_80974D8();
- UnfreezeMapObjects();
+ UnfreezeObjectEvents();
}
void sub_8069740(void)
{
- FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedEventObject], gSpecialVar_Facing);
+ ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing);
}
void sub_8069768(void)
{
- FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[gSelectedEventObject]);
+ ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[gSelectedObjectEvent]);
}
diff --git a/src/fame_checker.c b/src/fame_checker.c
index 8c8f5b4ea..b8f2c0055 100644
--- a/src/fame_checker.c
+++ b/src/fame_checker.c
@@ -22,7 +22,7 @@
#include "text.h"
#include "window.h"
#include "string_util.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
#include "menu_indicators.h"
#include "text_window.h"
#include "fame_checker.h"
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index d6bf4ea07..6627aaf48 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -13,15 +13,14 @@
#include "metatile_behavior.h"
#include "quest_log.h"
#include "link.h"
-#include "map_obj_80688E4.h"
+#include "event_object_80688E4.h"
#include "sound.h"
#include "field_door.h"
#include "field_effect.h"
#include "field_screen_effect.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
#include "field_specials.h"
-#include "map_obj_lock.h"
+#include "event_object_lock.h"
#include "start_menu.h"
#include "constants/songs.h"
@@ -323,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;
@@ -350,7 +349,7 @@ static void sub_807DFBC(u8 taskId)
{
PlayerGetDestCoords(&task->data[12], &task->data[13]);
sub_807DCB0(TRUE);
- FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 16);
+ ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 16);
task->data[0] = 8;
}
break;
@@ -365,7 +364,7 @@ static void sub_807DFBC(u8 taskId)
case 9:
if (sub_807E418() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(sub_807F204))
{
- FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+ ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
task->data[0] = 4;
}
break;
@@ -374,7 +373,7 @@ static void sub_807DFBC(u8 taskId)
if (sub_807E418())
{
sub_807DCB0(TRUE);
- FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 16);
+ ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 16);
task->data[0] = 2;
}
break;
@@ -382,7 +381,7 @@ static void sub_807DFBC(u8 taskId)
if (walkrun_is_standing_still())
{
task->data[1] = FieldAnimateDoorClose(*x, *y);
- FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+ ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
task->data[0] = 3;
}
break;
@@ -391,7 +390,7 @@ static void sub_807DFBC(u8 taskId)
task->data[0] = 4;
break;
case 4:
- UnfreezeMapObjects();
+ UnfreezeObjectEvents();
ScriptContext2_Disable();
DestroyTask(taskId);
break;
@@ -408,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;
@@ -416,7 +415,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
if (sub_807E418())
{
sub_807DCB0(TRUE);
- FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], sub_8063F84(GetPlayerFacingDirection()));
+ ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], sub_8063F84(GetPlayerFacingDirection()));
task->data[0] = 2;
}
break;
@@ -427,7 +426,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
}
break;
case 3:
- UnfreezeMapObjects();
+ UnfreezeObjectEvents();
ScriptContext2_Disable();
DestroyTask(taskId);
break;
@@ -439,14 +438,14 @@ 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;
case 1:
if (sub_807E418())
{
- UnfreezeMapObjects();
+ UnfreezeObjectEvents();
ScriptContext2_Disable();
DestroyTask(taskId);
}
@@ -459,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]++;
@@ -467,7 +466,7 @@ static void sub_807E31C(u8 taskId)
case 1:
if (sub_807E418() && sub_805DC24() != TRUE)
{
- UnfreezeMapObjects();
+ UnfreezeObjectEvents();
ScriptContext2_Disable();
DestroyTask(taskId);
}
@@ -689,7 +688,7 @@ static void sub_807E718(u8 taskId)
switch (task->data[0])
{
case 0:
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
task->data[0]++;
break;
@@ -711,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();
@@ -744,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);
@@ -753,8 +752,8 @@ static void sub_807E80C(u8 taskId)
case 1:
if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
{
- FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
- FieldObjectSetHeldMovement(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)], 17);
+ ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
+ ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], 17);
task->data[0] = 2;
}
break;
@@ -762,7 +761,7 @@ static void sub_807E80C(u8 taskId)
if (walkrun_is_standing_still())
{
task->data[1] = FieldAnimateDoorClose(*xp, *yp - 1);
- FieldObjectClearHeldMovementIfFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+ ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
sub_807DCB0(FALSE);
task->data[0] = 3;
}
@@ -792,18 +791,18 @@ static void sub_807E80C(u8 taskId)
static void sub_807E980(u8 taskId)
{
s16 * data = gTasks[taskId].data;
- struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+ struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
struct Sprite *playerSpr = &gSprites[gPlayerAvatar.spriteId];
switch (data[0])
{
case 0:
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
CameraObjectReset2();
data[0]++;
break;
case 1:
- if (!FieldObjectIsMovementOverridden(playerObj) || FieldObjectClearHeldMovementIfFinished(playerObj))
+ if (!ObjectEventIsMovementOverridden(playerObj) || ObjectEventClearHeldMovementIfFinished(playerObj))
{
if (data[15] != 0)
data[15]--;
@@ -844,7 +843,7 @@ static void sub_807E980(u8 taskId)
static void sub_807EAC4(s16 a0, s16 a1, s16 *a2, s16 *a3, s16 *a4)
{
struct Sprite *playerSpr = &gSprites[gPlayerAvatar.spriteId];
- struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+ struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
if (a1 > 0 || *a4 > 6)
*a3 += a1;
*a2 += a0;
@@ -853,13 +852,13 @@ static void sub_807EAC4(s16 a0, s16 a1, s16 *a2, s16 *a3, s16 *a4)
playerSpr->pos2.y = *a3 >> 5;
if (playerObj->mapobj_bit_7)
{
- FieldObjectForceSetSpecialAnim(playerObj, GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection()));
+ ObjectEventForceSetSpecialAnim(playerObj, GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection()));
}
}
static void sub_807EB64(u16 a0, s16 *a1, s16 *a2)
{
- FieldObjectForceSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection()));
+ ObjectEventForceSetSpecialAnim(&gObjectEvents[gPlayerAvatar.objectEventId], GetStepInPlaceDelay16AnimId(GetPlayerFacingDirection()));
sub_807EBBC(a0, a1, a2);
}
@@ -931,7 +930,7 @@ static void sub_807ECBC(s16 *a0, s16 *a1, s16 *a2, s16 *a3, s16 *a4)
r1 = 3;
else
r1 = 4;
- FieldObjectForceSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], sub_8064270(r1));
+ ObjectEventForceSetSpecialAnim(&gObjectEvents[gPlayerAvatar.objectEventId], sub_8064270(r1));
sub_807EBBC(behavior, a0, a1);
*a2 = *a0 * 16;
*a3 = *a1 * 16;
diff --git a/src/field_specials.c b/src/field_specials.c
index 374c74f3c..de3bc7d57 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -19,7 +19,7 @@
#include "battle_tower.h"
#include "field_camera.h"
#include "field_effect.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
#include "menu_indicators.h"
#include "random.h"
#include "mail_data.h"
@@ -41,7 +41,7 @@
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/items.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
#include "constants/maps.h"
#include "constants/region_map.h"
#include "constants/moves.h"
@@ -314,15 +314,15 @@ void Special_AnimatePcTurnOff()
void SpawnCameraObject(void)
{
- u8 mapObjectId = SpawnSpecialFieldObjectParameterized(MAP_OBJ_GFX_YOUNGSTER, 8, 127, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
- gMapObjects[mapObjectId].mapobj_bit_13 = TRUE;
- CameraObjectSetFollowedObjectId(gMapObjects[mapObjectId].spriteId);
+ u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJECT_EVENT_GFX_YOUNGSTER, 8, 127, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
+ gObjectEvents[objectEventId].mapobj_bit_13 = TRUE;
+ CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId);
}
void RemoveCameraObject(void)
{
CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId());
- RemoveFieldObjectByLocalIdAndMap(127, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+ RemoveObjectEventByLocalIdAndMap(127, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
}
void Special_BufferEReaderTrainerName5(void)
@@ -1499,7 +1499,7 @@ void Special_SetSeenMon(void)
void sub_80CBDE8(void)
{
- gSelectedEventObject = 0;
+ gSelectedObjectEvent = 0;
gSpecialVar_TextColor = 0xFF;
}
@@ -1508,13 +1508,13 @@ u8 ContextNpcGetTextColor(void)
u8 gfxId;
if (gSpecialVar_TextColor != 0xFF)
return gSpecialVar_TextColor;
- else if (gSelectedEventObject == 0)
+ else if (gSelectedObjectEvent == 0)
return 3;
else
{
- gfxId = gMapObjects[gSelectedEventObject].graphicsId;
- if (gfxId >= MAP_OBJ_GFX_VAR_0)
- gfxId = VarGetFieldObjectGraphicsId(gfxId - MAP_OBJ_GFX_VAR_0);
+ gfxId = gObjectEvents[gSelectedObjectEvent].graphicsId;
+ if (gfxId >= OBJECT_EVENT_GFX_VAR_0)
+ gfxId = VarGetObjectEventGraphicsId(gfxId - OBJECT_EVENT_GFX_VAR_0);
return GetColorFromTextColorTable(gfxId);
}
}
@@ -2359,7 +2359,7 @@ static void MoveDeoxysObject(u8 num)
u8 mapObjId;
LoadPalette(sDeoxysObjectPals[num], 0x1A0, 0x08);
sub_8083598(10);
- TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId);
+ TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId);
if (num == 0)
PlaySE(SE_W109);
else
diff --git a/src/fieldmap.c b/src/fieldmap.c
index e5901c149..5582b6977 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -28,8 +28,8 @@ struct MapConnection *sub_8059600(u8 direction, s32 x, s32 y);
bool8 sub_8059658(u8 direction, s32 x, s32 y, struct MapConnection *connection);
bool8 sub_80596BC(s32 x, s32 src_width, s32 dest_width, s32 offset);
-struct BackupMapData VMap;
-EWRAM_DATA u16 gBackupMapData[VIRTUAL_MAP_SIZE] = {};
+struct BackupMapLayout VMap;
+EWRAM_DATA u16 gBackupMapLayout[VIRTUAL_MAP_SIZE] = {};
EWRAM_DATA struct MapHeader gMapHeader = {};
EWRAM_DATA struct Camera gCamera = {};
EWRAM_DATA struct ConnectionFlags gMapConnectionFlags = {};
@@ -78,13 +78,13 @@ void sub_80589E8(void)
void sub_8058A00(struct MapHeader * mapHeader)
{
- const struct MapData * mapData = mapHeader->mapData;
- CpuFastFill(0x03FF03FF, gBackupMapData, sizeof(gBackupMapData));
- VMap.map = gBackupMapData;
- VMap.Xsize = mapData->width + 15;
- VMap.Ysize = mapData->height + 14;
+ const struct MapLayout * mapLayout = mapHeader->mapLayout;
+ CpuFastFill(0x03FF03FF, gBackupMapLayout, sizeof(gBackupMapLayout));
+ VMap.map = gBackupMapLayout;
+ VMap.Xsize = mapLayout->width + 15;
+ VMap.Ysize = mapLayout->height + 14;
AGB_ASSERT_EX(VMap.Xsize * VMap.Ysize <= VIRTUAL_MAP_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/fieldmap.c", 158);
- map_copy_with_padding(mapData->map, mapData->width, mapData->height);
+ map_copy_with_padding(mapLayout->map, mapLayout->width, mapLayout->height);
mapheader_copy_mapdata_of_adjacent_maps(mapHeader);
}
@@ -155,8 +155,8 @@ void sub_8058B54(s32 x, s32 y, const struct MapHeader *connectedMapHeader, s32 x
u16 *dest;
s32 mapWidth;
- mapWidth = connectedMapHeader->mapData->width;
- src = &connectedMapHeader->mapData->map[mapWidth * y2 + x2];
+ mapWidth = connectedMapHeader->mapLayout->width;
+ src = &connectedMapHeader->mapLayout->map[mapWidth * y2 + x2];
dest = &VMap.map[VMap.Xsize * y + x];
for (i = 0; i < height; i++)
@@ -176,9 +176,9 @@ void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader con
if (connectedMapHeader)
{
- cWidth = connectedMapHeader->mapData->width;
+ cWidth = connectedMapHeader->mapLayout->width;
x = offset + 7;
- y = mapHeader->mapData->height + 7;
+ y = mapHeader->mapLayout->height + 7;
if (x < 0)
{
x2 = -x;
@@ -223,8 +223,8 @@ void fillNorthConnection(struct MapHeader const *mapHeader, struct MapHeader con
if (connectedMapHeader)
{
- cWidth = connectedMapHeader->mapData->width;
- cHeight = connectedMapHeader->mapData->height;
+ cWidth = connectedMapHeader->mapLayout->width;
+ cHeight = connectedMapHeader->mapLayout->height;
x = offset + 7;
y2 = cHeight - 7;
if (x < 0)
@@ -271,8 +271,8 @@ void fillWestConnection(struct MapHeader const *mapHeader, struct MapHeader cons
s32 cWidth, cHeight;
if (connectedMapHeader)
{
- cWidth = connectedMapHeader->mapData->width;
- cHeight = connectedMapHeader->mapData->height;
+ cWidth = connectedMapHeader->mapLayout->width;
+ cHeight = connectedMapHeader->mapLayout->height;
y = offset + 7;
x2 = cWidth - 7;
if (y < 0)
@@ -317,8 +317,8 @@ void fillEastConnection(struct MapHeader const *mapHeader, struct MapHeader cons
s32 cHeight;
if (connectedMapHeader)
{
- cHeight = connectedMapHeader->mapData->height;
- x = mapHeader->mapData->width + 7;
+ cHeight = connectedMapHeader->mapLayout->height;
+ x = mapHeader->mapLayout->width + 7;
y = offset + 7;
if (y < 0)
{
@@ -370,17 +370,17 @@ union Block
s32 xprime; \
s32 yprime; \
\
- struct MapData *mapData = gMapHeader.mapData; \
+ struct MapLayout *mapLayout = gMapHeader.mapLayout; \
\
xprime = x - 7; \
- xprime += 8 * mapData->unk18; \
- xprime %= mapData->unk18; \
+ xprime += 8 * mapLayout->unk18; \
+ xprime %= mapLayout->unk18; \
\
yprime = y - 7; \
- yprime += 8 * mapData->unk19; \
- yprime %= mapData->unk19; \
+ yprime += 8 * mapLayout->unk19; \
+ yprime %= mapLayout->unk19; \
\
- block = mapData->border[xprime + yprime * mapData->unk18]; \
+ block = mapLayout->border[xprime + yprime * mapLayout->unk18]; \
block |= 0xC00; \
block; \
})
@@ -390,17 +390,17 @@ union Block
s32 xprime; \
s32 yprime; \
\
- struct MapData *mapData = gMapHeader.mapData; \
+ struct MapLayout *mapLayout = gMapHeader.mapLayout; \
\
xprime = x - 7; \
- xprime += 8 * mapData->unk18; \
- xprime %= mapData->unk18; \
+ xprime += 8 * mapLayout->unk18; \
+ xprime %= mapLayout->unk18; \
\
yprime = y - 7; \
- yprime += 8 * mapData->unk19; \
- yprime %= mapData->unk19; \
+ yprime += 8 * mapLayout->unk19; \
+ yprime %= mapLayout->unk19; \
\
- block = mapData->border[xprime + yprime * mapData->unk18] | 0xC00; \
+ block = mapLayout->border[xprime + yprime * mapLayout->unk18] | 0xC00; \
block; \
})
@@ -455,7 +455,7 @@ u32 sub_8058F1C(u32 original, u8 bit)
u32 sub_8058F48(s16 x, s16 y, u8 z)
{
u16 metatileId = MapGridGetMetatileIdAt(x, y);
- return GetBehaviorByMetatileIdAndMapData(gMapHeader.mapData, metatileId, z);
+ return GetBehaviorByMetatileIdAndMapLayout(gMapHeader.mapLayout, metatileId, z);
}
u32 MapGridGetMetatileBehaviorAt(s32 x, s32 y)
@@ -506,18 +506,18 @@ void sub_8059024(s32 x, s32 y, bool32 arg2)
}
}
-u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr)
+u32 GetBehaviorByMetatileIdAndMapLayout(struct MapLayout *mapLayout, u16 metatile, u8 attr)
{
u32 * attributes;
if (metatile < NUM_METATILES_IN_PRIMARY)
{
- attributes = mapData->primaryTileset->metatileAttributes;
+ attributes = mapLayout->primaryTileset->metatileAttributes;
return sub_8058F1C(attributes[metatile], attr);
}
else if (metatile < 0x400)
{
- attributes = mapData->secondaryTileset->metatileAttributes;
+ attributes = mapLayout->secondaryTileset->metatileAttributes;
return sub_8058F1C(attributes[metatile - NUM_METATILES_IN_PRIMARY], attr);
}
else
@@ -540,7 +540,7 @@ void save_serialize_map(void)
{
for (j = x; j < x + 15; j++)
{
- *mapView++ = gBackupMapData[width * i + j];
+ *mapView++ = gBackupMapLayout[width * i + j];
}
}
}
@@ -581,7 +581,7 @@ void LoadSavedMapView(void)
{
for (j = x; j < x + 15; j++)
{
- gBackupMapData[j + width * i] = *mapView;
+ gBackupMapLayout[j + width * i] = *mapView;
mapView++;
}
}
@@ -636,7 +636,7 @@ void sub_8059250(u8 a1)
desti = width * (y + y0);
srci = (y + r8) * 15 + r9;
src = &mapView[srci + i];
- dest = &gBackupMapData[x0 + desti + j];
+ dest = &gBackupMapLayout[x0 + desti + j];
*dest = *src;
i++;
j++;
@@ -720,7 +720,7 @@ void sub_80594AC(struct MapConnection *connection, int direction, s32 x, s32 y)
gSaveBlock1Ptr->pos.y -= connection->offset;
break;
case CONNECTION_WEST:
- gSaveBlock1Ptr->pos.x = mapHeader->mapData->width;
+ gSaveBlock1Ptr->pos.x = mapHeader->mapLayout->width;
gSaveBlock1Ptr->pos.y -= connection->offset;
break;
case CONNECTION_SOUTH:
@@ -729,7 +729,7 @@ void sub_80594AC(struct MapConnection *connection, int direction, s32 x, s32 y)
break;
case CONNECTION_NORTH:
gSaveBlock1Ptr->pos.x -= connection->offset;
- gSaveBlock1Ptr->pos.y = mapHeader->mapData->height;
+ gSaveBlock1Ptr->pos.y = mapHeader->mapLayout->height;
break;
}
}
@@ -788,10 +788,10 @@ bool8 sub_8059658(u8 direction, s32 x, s32 y, struct MapConnection *connection)
{
case CONNECTION_SOUTH:
case CONNECTION_NORTH:
- return sub_80596BC(x, gMapHeader.mapData->width, mapHeader->mapData->width, connection->offset);
+ return sub_80596BC(x, gMapHeader.mapLayout->width, mapHeader->mapLayout->width, connection->offset);
case CONNECTION_WEST:
case CONNECTION_EAST:
- return sub_80596BC(y, gMapHeader.mapData->height, mapHeader->mapData->height, connection->offset);
+ return sub_80596BC(y, gMapHeader.mapLayout->height, mapHeader->mapLayout->height, connection->offset);
}
return FALSE;
}
@@ -825,10 +825,10 @@ s32 sub_80596FC(struct MapConnection *connection, s32 x, s32 y)
{
case CONNECTION_SOUTH:
case CONNECTION_NORTH:
- return sub_80596E8(x - connection->offset, mapHeader->mapData->width);
+ return sub_80596E8(x - connection->offset, mapHeader->mapLayout->width);
case CONNECTION_WEST:
case CONNECTION_EAST:
- return sub_80596E8(y - connection->offset, mapHeader->mapData->height);
+ return sub_80596E8(y - connection->offset, mapHeader->mapLayout->height);
}
return FALSE;
}
@@ -852,9 +852,9 @@ struct MapConnection *GetMapConnectionAtPos(s16 x, s16 y)
direction = connection->direction;
if ((direction == CONNECTION_DIVE || direction == CONNECTION_EMERGE)
|| (direction == CONNECTION_NORTH && y > 6)
- || (direction == CONNECTION_SOUTH && y < gMapHeader.mapData->height + 7)
+ || (direction == CONNECTION_SOUTH && y < gMapHeader.mapLayout->height + 7)
|| (direction == CONNECTION_WEST && x > 6)
- || (direction == CONNECTION_EAST && x < gMapHeader.mapData->width + 7))
+ || (direction == CONNECTION_EAST && x < gMapHeader.mapLayout->width + 7))
{
continue;
}
@@ -981,45 +981,45 @@ void apply_map_tileset_palette(struct Tileset const *tileset, u16 destOffset, u1
}
}
-void copy_map_tileset1_to_vram(const struct MapData *mapData)
+void copy_map_tileset1_to_vram(const struct MapLayout *mapLayout)
{
- copy_tileset_patterns_to_vram(mapData->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
+ copy_tileset_patterns_to_vram(mapLayout->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
}
-void copy_map_tileset2_to_vram(const struct MapData *mapData)
+void copy_map_tileset2_to_vram(const struct MapLayout *mapLayout)
{
- copy_tileset_patterns_to_vram(mapData->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
+ copy_tileset_patterns_to_vram(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
}
-void copy_map_tileset2_to_vram_2(const struct MapData *mapData)
+void copy_map_tileset2_to_vram_2(const struct MapLayout *mapLayout)
{
- copy_tileset_patterns_to_vram2(mapData->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
+ copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
}
-void apply_map_tileset1_palette(const struct MapData *mapData)
+void apply_map_tileset1_palette(const struct MapLayout *mapLayout)
{
- apply_map_tileset_palette(mapData->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2);
+ apply_map_tileset_palette(mapLayout->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2);
}
-void apply_map_tileset2_palette(const struct MapData *mapData)
+void apply_map_tileset2_palette(const struct MapLayout *mapLayout)
{
- apply_map_tileset_palette(mapData->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2);
+ apply_map_tileset_palette(mapLayout->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2);
}
-void copy_map_tileset1_tileset2_to_vram(struct MapData const *mapData)
+void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout)
{
- if (mapData)
+ if (mapLayout)
{
- copy_tileset_patterns_to_vram2(mapData->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
- copy_tileset_patterns_to_vram2(mapData->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
+ copy_tileset_patterns_to_vram2(mapLayout->primaryTileset, NUM_TILES_IN_PRIMARY, 0);
+ copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, NUM_TILES_TOTAL - NUM_TILES_IN_PRIMARY, NUM_TILES_IN_PRIMARY);
}
}
-void apply_map_tileset1_tileset2_palette(struct MapData const *mapData)
+void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout)
{
- if (mapData)
+ if (mapLayout)
{
- apply_map_tileset1_palette(mapData);
- apply_map_tileset2_palette(mapData);
+ apply_map_tileset1_palette(mapLayout);
+ apply_map_tileset2_palette(mapLayout);
}
}
diff --git a/src/fldeff_dig.c b/src/fldeff_dig.c
index 3a28c1adc..7d229ce3f 100644
--- a/src/fldeff_dig.c
+++ b/src/fldeff_dig.c
@@ -6,7 +6,7 @@
#include "overworld.h"
#include "party_menu.h"
#include "sprite.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
static void FieldCallback_Dig(void);
static void sub_80C9AFC(void);
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index 90abda81f..980b72d4f 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -13,9 +13,9 @@
#include "palette.h"
#include "overworld.h"
#include "wild_encounter.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
#include "constants/songs.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
#include "constants/map_types.h"
static void task08_080C9820(u8 taskId);
@@ -31,10 +31,10 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId)
GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y);
gPlayerFacingPosition.height = PlayerGetZCoord();
- mapObjId = GetFieldObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height);
- if (gMapObjects[mapObjId].graphicsId != graphicsId)
+ mapObjId = GetObjectEventIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height);
+ if (gObjectEvents[mapObjId].graphicsId != graphicsId)
return FALSE;
- gSpecialVar_LastTalked = gMapObjects[mapObjId].localId;
+ gSpecialVar_LastTalked = gObjectEvents[mapObjId].localId;
return TRUE;
}
@@ -50,9 +50,9 @@ static void task08_080C9820(u8 taskId)
ScriptContext2_Enable();
gPlayerAvatar.unk6 = TRUE;
- mapObjId = gPlayerAvatar.mapObjectId;
- if (!FieldObjectIsMovementOverridden(&gMapObjects[mapObjId])
- || FieldObjectClearHeldMovementIfFinished(&gMapObjects[mapObjId]))
+ mapObjId = gPlayerAvatar.objectEventId;
+ if (!ObjectEventIsMovementOverridden(&gObjectEvents[mapObjId])
+ || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[mapObjId]))
{
if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
{
@@ -62,7 +62,7 @@ static void task08_080C9820(u8 taskId)
else
{
sub_805CB70();
- FieldObjectSetHeldMovement(&gMapObjects[mapObjId], 0x45);
+ ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], 0x45);
gTasks[taskId].func = sub_80C98B0;
}
}
@@ -70,7 +70,7 @@ static void task08_080C9820(u8 taskId)
static void sub_80C98B0(u8 taskId)
{
- if (FieldObjectCheckHeldMovementStatus(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE)
+ if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE)
{
FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
gTasks[taskId].func = sub_80C98FC;
@@ -90,7 +90,7 @@ static void sub_80C98FC(u8 taskId)
gFieldEffectArguments[2] = 2;
if (gFieldEffectArguments[1] == 4)
gFieldEffectArguments[2] = 3;
- EventObjectSetGraphicsId(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
+ ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState());
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]);
FieldEffectActiveListRemove(6);
gTasks[taskId].func = sub_80C99A0;
@@ -106,7 +106,7 @@ static void sub_80C99A0(u8 taskId)
bool8 SetUpFieldMove_RockSmash(void)
{
- if (CheckObjectGraphicsInFrontOfPlayer(/*MAP_OBJ_GFX_BREAKABLE_ROCK*/0x60) == TRUE)
+ if (CheckObjectGraphicsInFrontOfPlayer(OBJECT_EVENT_GFX_ROCK_SMASH_ROCK) == TRUE)
{
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
gPostMenuFieldCallback = sub_80C9A10;
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 3f3254ade..b8d5af31d 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -7,14 +7,14 @@
#include "fldeff.h"
#include "event_scripts.h"
#include "constants/songs.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
static void FldEff_UseStrength(void);
static void sub_80D08A8(void);
bool8 SetUpFieldMove_Strength(void)
{
- if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(/*MAP_OBJ_GFX_PUSHABLE_BOULDER*/0x61) != TRUE)
+ if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJECT_EVENT_GFX_STRENGTH_BOULDER) != TRUE)
{
return FALSE;
}
diff --git a/src/item_use.c b/src/item_use.c
index 256711463..46bd066f9 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -7,7 +7,7 @@
#include "event_data.h"
#include "field_effect.h"
#include "field_fadetransition.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
#include "field_player_avatar.h"
#include "field_specials.h"
#include "field_weather.h"
@@ -19,8 +19,8 @@
#include "mail.h"
#include "main.h"
#include "malloc.h"
-#include "map_obj_80688E4.h"
-#include "map_obj_lock.h"
+#include "event_object_80688E4.h"
+#include "event_object_lock.h"
#include "metatile_behavior.h"
#include "new_menu_helpers.h"
#include "overworld.h"
@@ -223,7 +223,7 @@ static void sub_80A1184(void)
static bool8 sub_80A1194(void)
{
- FreezeEventObjects();
+ FreezeObjectEvents();
ScriptContext2_Enable();
sub_807DC00();
CreateTask(sub_80A11C0, 10);
@@ -235,7 +235,7 @@ static void sub_80A11C0(u8 taskId)
{
if (IsWeatherNotFadingIn() == TRUE)
{
- UnfreezeMapObjects();
+ UnfreezeObjectEvents();
ScriptContext2_Disable();
DestroyTask(taskId);
}
diff --git a/src/itemfinder.c b/src/itemfinder.c
index 05072c49e..370fce841 100644
--- a/src/itemfinder.c
+++ b/src/itemfinder.c
@@ -3,7 +3,7 @@
#include "new_menu_helpers.h"
#include "strings.h"
#include "event_scripts.h"
-#include "map_obj_lock.h"
+#include "event_object_lock.h"
#include "script.h"
#include "sound.h"
#include "event_data.h"
@@ -325,23 +325,23 @@ static bool8 HiddenItemInConnectedMapAtPos(struct MapConnection * connection, s3
case 2:
localOffset = connection->offset + 7;
localX = x - localOffset;
- localLength = mapHeader->mapData->height - 7;
+ localLength = mapHeader->mapLayout->height - 7;
localY = localLength + y; // additions are reversed for some reason
break;
case 1:
localOffset = connection->offset + 7;
localX = x - localOffset;
- localLength = gMapHeader.mapData->height + 7;
+ localLength = gMapHeader.mapLayout->height + 7;
localY = y - localLength;
break;
case 3:
- localLength = mapHeader->mapData->width - 7;
+ localLength = mapHeader->mapLayout->width - 7;
localX = localLength + x; // additions are reversed for some reason
localOffset = connection->offset + 7;
localY = y - localOffset;
break;
case 4:
- localLength = gMapHeader.mapData->width + 7;
+ localLength = gMapHeader.mapLayout->width + 7;
localX = x - localLength;
localOffset = connection->offset + 7;
localY = y - localOffset;
@@ -356,8 +356,8 @@ static void FindHiddenItemsInConnectedMaps(u8 taskId)
{
s16 x, y;
s16 curX, curY;
- s16 width = gMapHeader.mapData->width + 7;
- s16 height = gMapHeader.mapData->height + 7;
+ s16 width = gMapHeader.mapLayout->width + 7;
+ s16 height = gMapHeader.mapLayout->height + 7;
s16 var1 = 7;
s16 var2 = 7;
diff --git a/src/load_save.c b/src/load_save.c
index da469d4e6..3881646dd 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -174,32 +174,32 @@ void LoadPlayerParty(void)
gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i];
}
-void SaveMapObjects(void)
+void SaveObjectEvents(void)
{
int i;
- for (i = 0; i < NUM_FIELD_OBJECTS; i++)
- gSaveBlock1Ptr->mapObjects[i] = gMapObjects[i];
+ for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
+ gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i];
}
-void LoadMapObjects(void)
+void LoadObjectEvents(void)
{
int i;
- for (i = 0; i < NUM_FIELD_OBJECTS; i++)
- gMapObjects[i] = gSaveBlock1Ptr->mapObjects[i];
+ for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
+ gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i];
}
void SaveSerializedGame(void)
{
SavePlayerParty();
- SaveMapObjects();
+ SaveObjectEvents();
}
void LoadSerializedGame(void)
{
LoadPlayerParty();
- LoadMapObjects();
+ LoadObjectEvents();
}
void LoadPlayerBag(void)
diff --git a/src/quest_log.c b/src/quest_log.c
index 04369f1c2..6b25150f3 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -19,9 +19,9 @@
#include "overworld.h"
#include "field_fadetransition.h"
#include "field_weather.h"
-#include "field_map_obj.h"
-#include "map_obj_80688E4.h"
-#include "map_obj_lock.h"
+#include "event_object_movement.h"
+#include "event_object_80688E4.h"
+#include "event_object_lock.h"
#include "field_player_avatar.h"
#include "field_control_avatar.h"
#include "battle.h"
@@ -571,30 +571,30 @@ static void sub_8110BE8(u8 a0)
sub_815A008(questLog);
- for (i = 0; i < NELEMS(gSaveBlock1Ptr->mapObjectTemplates); i++)
+ for (i = 0; i < NELEMS(gSaveBlock1Ptr->objectEventTemplates); i++)
{
- if (gSaveBlock1Ptr->mapObjectTemplates[i].x < 0)
+ if (gSaveBlock1Ptr->objectEventTemplates[i].x < 0)
{
- questLog->npcData[i].x = -1 * gSaveBlock1Ptr->mapObjectTemplates[i].x;
+ questLog->npcData[i].x = -1 * gSaveBlock1Ptr->objectEventTemplates[i].x;
questLog->npcData[i].negx = TRUE;
}
else
{
- questLog->npcData[i].x = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].x;
+ questLog->npcData[i].x = (u8)gSaveBlock1Ptr->objectEventTemplates[i].x;
questLog->npcData[i].negx = FALSE;
}
- if (gSaveBlock1Ptr->mapObjectTemplates[i].y < 0)
+ if (gSaveBlock1Ptr->objectEventTemplates[i].y < 0)
{
- questLog->npcData[i].y = (-gSaveBlock1Ptr->mapObjectTemplates[i].y << 24) >> 24;
+ questLog->npcData[i].y = (-gSaveBlock1Ptr->objectEventTemplates[i].y << 24) >> 24;
questLog->npcData[i].negy = TRUE;
}
else
{
- questLog->npcData[i].y = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].y;
+ questLog->npcData[i].y = (u8)gSaveBlock1Ptr->objectEventTemplates[i].y;
questLog->npcData[i].negy = FALSE;
}
- questLog->npcData[i].elevation = gSaveBlock1Ptr->mapObjectTemplates[i].elevation;
- questLog->npcData[i].movementType = gSaveBlock1Ptr->mapObjectTemplates[i].movementType;
+ questLog->npcData[i].elevation = gSaveBlock1Ptr->objectEventTemplates[i].elevation;
+ questLog->npcData[i].movementType = gSaveBlock1Ptr->objectEventTemplates[i].movementType;
}
}
@@ -627,7 +627,7 @@ static void sub_8110D94(void)
static void sub_8110E20(void)
{
- VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapDataId);
+ VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapLayoutId);
}
static void sub_8110E3C(void)
@@ -776,18 +776,18 @@ static void sub_8111150(u8 a0)
for (i = 0; i < 64; i++)
{
if (questLog->npcData[i].negx)
- gSaveBlock1Ptr->mapObjectTemplates[i].x = -questLog->npcData[i].x;
+ gSaveBlock1Ptr->objectEventTemplates[i].x = -questLog->npcData[i].x;
else
- gSaveBlock1Ptr->mapObjectTemplates[i].x = questLog->npcData[i].x;
+ gSaveBlock1Ptr->objectEventTemplates[i].x = questLog->npcData[i].x;
if (questLog->npcData[i].negy)
- gSaveBlock1Ptr->mapObjectTemplates[i].y = -(u8)questLog->npcData[i].y;
+ gSaveBlock1Ptr->objectEventTemplates[i].y = -(u8)questLog->npcData[i].y;
else
- gSaveBlock1Ptr->mapObjectTemplates[i].y = questLog->npcData[i].y;
- gSaveBlock1Ptr->mapObjectTemplates[i].elevation = questLog->npcData[i].elevation;
- gSaveBlock1Ptr->mapObjectTemplates[i].movementType = questLog->npcData[i].movementType;
+ gSaveBlock1Ptr->objectEventTemplates[i].y = questLog->npcData[i].y;
+ gSaveBlock1Ptr->objectEventTemplates[i].elevation = questLog->npcData[i].elevation;
+ gSaveBlock1Ptr->objectEventTemplates[i].movementType = questLog->npcData[i].movementType;
}
- sub_815A1F8(questLog, gSaveBlock1Ptr->mapObjectTemplates);
+ sub_815A1F8(questLog, gSaveBlock1Ptr->objectEventTemplates);
}
void sub_8111274(u8 a0, u8 a1)
@@ -984,11 +984,11 @@ void sub_8111708(void)
{
struct MapHeader sp0;
- gSaveBlock1Ptr->mapDataId = VarGet(VAR_0x40AE);
- if (gSaveBlock1Ptr->mapDataId == 0)
+ gSaveBlock1Ptr->mapLayoutId = VarGet(VAR_0x40AE);
+ if (gSaveBlock1Ptr->mapLayoutId == 0)
{
sp0 = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);
- gSaveBlock1Ptr->mapDataId = sp0.mapDataId;
+ gSaveBlock1Ptr->mapLayoutId = sp0.mapLayoutId;
}
}
@@ -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();
}
}
@@ -1532,12 +1532,12 @@ void sub_8112450(void)
void sub_811246C(struct Sprite *sprite)
{
- struct MapObject *mapObject = &gMapObjects[sprite->data[0]];
- if (mapObject->localId == 0xFF)
+ struct ObjectEvent *objectEvent = &gObjectEvents[sprite->data[0]];
+ if (objectEvent->localId == 0xFF)
{
if (gUnknown_203AF9A[0][0] != 0xFF)
{
- FieldObjectSetHeldMovement(mapObject, gUnknown_203AF9A[0][0]);
+ ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[0][0]);
gUnknown_203AF9A[0][0] = 0xFF;
}
if (gUnknown_203AF9A[0][1] != 0xFF)
@@ -1545,16 +1545,16 @@ void sub_811246C(struct Sprite *sprite)
sub_8150454();
gUnknown_203AF9A[0][1] = 0xFF;
}
- sub_8063E28(mapObject, sprite);
+ sub_8063E28(objectEvent, sprite);
}
else
{
- if (gUnknown_203AF9A[mapObject->localId][0] != 0xFF)
+ if (gUnknown_203AF9A[objectEvent->localId][0] != 0xFF)
{
- FieldObjectSetHeldMovement(mapObject, gUnknown_203AF9A[mapObject->localId][0]);
- gUnknown_203AF9A[mapObject->localId][0] = 0xFF;
+ ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[objectEvent->localId][0]);
+ gUnknown_203AF9A[objectEvent->localId][0] = 0xFF;
}
- sub_8063E28(mapObject, sprite);
+ sub_8063E28(objectEvent, sprite);
}
}
diff --git a/src/quest_log_8150454.c b/src/quest_log_8150454.c
index 09cf47f93..7665a8a92 100644
--- a/src/quest_log_8150454.c
+++ b/src/quest_log_8150454.c
@@ -3,8 +3,7 @@
#include "script.h"
#include "task.h"
#include "field_player_avatar.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
#include "field_effect.h"
#include "field_effect_helpers.h"
#include "quest_log.h"
@@ -20,7 +19,7 @@ static void sub_81507CC(void);
static void sub_81507D8(void);
static void sub_81507E4(void);
static void sub_81507F0(void);
-static void sub_81507BC(struct MapObject *a0, u8 a1);
+static void sub_81507BC(struct ObjectEvent *a0, u8 a1);
static void (*const gUnknown_8471EDC[])(void) = {
sub_81504A8,
@@ -57,25 +56,25 @@ void sub_8150498(u8 a0)
static void sub_81504A8(void)
{
- struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
- sub_81507BC(mapObject, sub_805C808(0));
- FieldObjectTurn(mapObject, mapObject->placeholder18);
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ sub_81507BC(objectEvent, sub_805C808(0));
+ ObjectEventTurn(objectEvent, objectEvent->placeholder18);
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT);
}
static void sub_81504E8(void)
{
- struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
- sub_81507BC(mapObject, sub_805C808(1));
- FieldObjectTurn(mapObject, mapObject->placeholder18);
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ sub_81507BC(objectEvent, sub_805C808(1));
+ ObjectEventTurn(objectEvent, objectEvent->placeholder18);
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE);
sub_80BD620(0, 0);
}
static void sub_8150530(void)
{
- struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
- struct Sprite *sprite = &gSprites[mapObject->spriteId];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ struct Sprite *sprite = &gSprites[objectEvent->spriteId];
if (gUnknown_3005E88 == 1 || gUnknown_3005E88 == 3)
{
@@ -87,23 +86,23 @@ static void sub_8150530(void)
}
else
{
- sub_81507BC(mapObject, sub_805C808(4));
- StartSpriteAnim(sprite, sub_80634F0(mapObject->facingDirection));
+ sub_81507BC(objectEvent, sub_805C808(4));
+ StartSpriteAnim(sprite, sub_80634F0(objectEvent->facingDirection));
}
}
static void sub_81505C4(u8 taskId)
{
- struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
- struct Sprite *sprite = &gSprites[mapObject->spriteId];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+ struct Sprite *sprite = &gSprites[objectEvent->spriteId];
switch (gTasks[taskId].data[0])
{
case 0:
- FieldObjectClearAnimIfSpecialAnimActive(mapObject);
- mapObject->mapobj_bit_11 = TRUE;
- sub_81507BC(mapObject, sub_805C808(4));
- StartSpriteAnim(sprite, sub_80634F0(mapObject->facingDirection));
+ ObjectEventClearAnimIfSpecialAnimActive(objectEvent);
+ objectEvent->mapobj_bit_11 = TRUE;
+ sub_81507BC(objectEvent, sub_805C808(4));
+ StartSpriteAnim(sprite, sub_80634F0(objectEvent->facingDirection));
gTasks[taskId].data[0]++;
gTasks[taskId].data[1] = 0;
break;
@@ -123,10 +122,10 @@ static void sub_81505C4(u8 taskId)
if (sprite->animEnded)
{
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING))
- sub_81507BC(mapObject, sub_805C808(0));
+ sub_81507BC(objectEvent, sub_805C808(0));
else
- sub_81507BC(mapObject, sub_805C808(2));
- FieldObjectTurn(mapObject, mapObject->placeholder18);
+ sub_81507BC(objectEvent, sub_805C808(2));
+ ObjectEventTurn(objectEvent, objectEvent->placeholder18);
sprite->pos2.x = 0;
sprite->pos2.y = 0;
ScriptContext2_Disable();
@@ -138,19 +137,19 @@ static void sub_81505C4(u8 taskId)
static void sub_8150708(void)
{
- struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
u8 fieldEffectId;
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING))
{
- sub_81507BC(mapObject, sub_805C808(2));
- FieldObjectTurn(mapObject, mapObject->placeholder18);
+ sub_81507BC(objectEvent, sub_805C808(2));
+ ObjectEventTurn(objectEvent, objectEvent->placeholder18);
SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING);
- gFieldEffectArguments[0] = mapObject->coords2.x;
- gFieldEffectArguments[1] = mapObject->coords2.y;
- gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId;
+ gFieldEffectArguments[0] = objectEvent->coords2.x;
+ gFieldEffectArguments[1] = objectEvent->coords2.y;
+ gFieldEffectArguments[2] = gPlayerAvatar.objectEventId;
fieldEffectId = FieldEffectStart(FLDEFF_SURF_BLOB);
- mapObject->mapobj_unk_1A = fieldEffectId;
+ objectEvent->mapobj_unk_1A = fieldEffectId;
sub_80DC44C(fieldEffectId, 1);
}
}
@@ -165,15 +164,15 @@ static void sub_8150794(u8 taskId)
{
if (!FieldEffectActiveListContains(0x41))
{
- UnfreezeMapObjects();
+ UnfreezeObjectEvents();
ScriptContext2_Disable();
DestroyTask(taskId);
}
}
-static void sub_81507BC(struct MapObject * a0, u8 a1)
+static void sub_81507BC(struct ObjectEvent * a0, u8 a1)
{
- EventObjectSetGraphicsId(a0, a1);
+ ObjectEventSetGraphicsId(a0, a1);
}
static void sub_81507CC(void)
diff --git a/src/quest_log_815A008.c b/src/quest_log_815A008.c
index fb49fc880..32d0becbf 100644
--- a/src/quest_log_815A008.c
+++ b/src/quest_log_815A008.c
@@ -11,125 +11,125 @@ void sub_815A008(struct QuestLog * questLog)
{
u32 i;
- for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+ for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
- questLog->unk_008[i].active = gMapObjects[i].active;
- questLog->unk_008[i].mapobj_bit_3 = gMapObjects[i].mapobj_bit_3;
- questLog->unk_008[i].mapobj_bit_4 = gMapObjects[i].mapobj_bit_4;
- questLog->unk_008[i].mapobj_bit_5 = gMapObjects[i].mapobj_bit_5;
- questLog->unk_008[i].mapobj_bit_8 = gMapObjects[i].mapobj_bit_8;
- questLog->unk_008[i].mapobj_bit_9 = gMapObjects[i].mapobj_bit_9;
- questLog->unk_008[i].mapobj_bit_10 = gMapObjects[i].mapobj_bit_10;
- questLog->unk_008[i].mapobj_bit_11 = gMapObjects[i].mapobj_bit_11;
- questLog->unk_008[i].mapobj_bit_12 = gMapObjects[i].mapobj_bit_12;
- questLog->unk_008[i].mapobj_bit_13 = gMapObjects[i].mapobj_bit_13;
- questLog->unk_008[i].mapobj_bit_14 = gMapObjects[i].mapobj_bit_14;
- questLog->unk_008[i].mapobj_bit_15 = gMapObjects[i].mapobj_bit_15;
- questLog->unk_008[i].mapobj_bit_16 = gMapObjects[i].mapobj_bit_16;
- questLog->unk_008[i].mapobj_bit_23 = gMapObjects[i].mapobj_bit_23;
- questLog->unk_008[i].mapobj_bit_24 = gMapObjects[i].mapobj_bit_24;
- questLog->unk_008[i].mapobj_bit_25 = gMapObjects[i].mapobj_bit_25;
- questLog->unk_008[i].mapobj_bit_26 = gMapObjects[i].mapobj_bit_26;
- questLog->unk_008[i].mapobj_unk_18 = gMapObjects[i].facingDirection;
- questLog->unk_008[i].mapobj_unk_0B_0 = gMapObjects[i].mapobj_unk_0B_0;
- questLog->unk_008[i].elevation = gMapObjects[i].elevation;
- questLog->unk_008[i].graphicsId = gMapObjects[i].graphicsId;
- questLog->unk_008[i].animPattern = gMapObjects[i].animPattern;
- questLog->unk_008[i].trainerType = gMapObjects[i].trainerType;
- questLog->unk_008[i].localId = gMapObjects[i].localId;
- questLog->unk_008[i].mapNum = gMapObjects[i].mapNum;
- questLog->unk_008[i].mapGroup = gMapObjects[i].mapGroup;
- questLog->unk_008[i].x = gMapObjects[i].coords2.x;
- questLog->unk_008[i].y = gMapObjects[i].coords2.y;
- questLog->unk_008[i].trainerRange_berryTreeId = gMapObjects[i].trainerRange_berryTreeId;
- questLog->unk_008[i].mapobj_unk_1F = gMapObjects[i].mapobj_unk_1F;
- questLog->unk_008[i].mapobj_unk_21 = gMapObjects[i].mapobj_unk_21;
- questLog->unk_008[i].animId = gMapObjects[i].animId;
+ questLog->unk_008[i].active = gObjectEvents[i].active;
+ questLog->unk_008[i].mapobj_bit_3 = gObjectEvents[i].mapobj_bit_3;
+ questLog->unk_008[i].mapobj_bit_4 = gObjectEvents[i].mapobj_bit_4;
+ questLog->unk_008[i].mapobj_bit_5 = gObjectEvents[i].mapobj_bit_5;
+ questLog->unk_008[i].mapobj_bit_8 = gObjectEvents[i].mapobj_bit_8;
+ questLog->unk_008[i].mapobj_bit_9 = gObjectEvents[i].mapobj_bit_9;
+ questLog->unk_008[i].mapobj_bit_10 = gObjectEvents[i].mapobj_bit_10;
+ questLog->unk_008[i].mapobj_bit_11 = gObjectEvents[i].mapobj_bit_11;
+ questLog->unk_008[i].mapobj_bit_12 = gObjectEvents[i].mapobj_bit_12;
+ questLog->unk_008[i].mapobj_bit_13 = gObjectEvents[i].mapobj_bit_13;
+ questLog->unk_008[i].mapobj_bit_14 = gObjectEvents[i].mapobj_bit_14;
+ questLog->unk_008[i].mapobj_bit_15 = gObjectEvents[i].mapobj_bit_15;
+ questLog->unk_008[i].mapobj_bit_16 = gObjectEvents[i].mapobj_bit_16;
+ questLog->unk_008[i].mapobj_bit_23 = gObjectEvents[i].mapobj_bit_23;
+ questLog->unk_008[i].mapobj_bit_24 = gObjectEvents[i].mapobj_bit_24;
+ questLog->unk_008[i].mapobj_bit_25 = gObjectEvents[i].mapobj_bit_25;
+ questLog->unk_008[i].mapobj_bit_26 = gObjectEvents[i].mapobj_bit_26;
+ questLog->unk_008[i].mapobj_unk_18 = gObjectEvents[i].facingDirection;
+ questLog->unk_008[i].mapobj_unk_0B_0 = gObjectEvents[i].mapobj_unk_0B_0;
+ questLog->unk_008[i].elevation = gObjectEvents[i].elevation;
+ questLog->unk_008[i].graphicsId = gObjectEvents[i].graphicsId;
+ questLog->unk_008[i].animPattern = gObjectEvents[i].animPattern;
+ questLog->unk_008[i].trainerType = gObjectEvents[i].trainerType;
+ questLog->unk_008[i].localId = gObjectEvents[i].localId;
+ questLog->unk_008[i].mapNum = gObjectEvents[i].mapNum;
+ questLog->unk_008[i].mapGroup = gObjectEvents[i].mapGroup;
+ questLog->unk_008[i].x = gObjectEvents[i].coords2.x;
+ questLog->unk_008[i].y = gObjectEvents[i].coords2.y;
+ questLog->unk_008[i].trainerRange_berryTreeId = gObjectEvents[i].trainerRange_berryTreeId;
+ questLog->unk_008[i].mapobj_unk_1F = gObjectEvents[i].mapobj_unk_1F;
+ questLog->unk_008[i].mapobj_unk_21 = gObjectEvents[i].mapobj_unk_21;
+ questLog->unk_008[i].animId = gObjectEvents[i].animId;
}
}
-void sub_815A1F8(const struct QuestLog * questLog, const struct MapObjectTemplate * templates)
+void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
{
u32 i, j;
- const struct QuestLogMapObject * questLogMapObjects = questLog->unk_008;
+ const struct QuestLogObjectEvent * questLogObjectEvents = questLog->unk_008;
- CpuFill16(0, gMapObjects, sizeof(gMapObjects));
+ CpuFill16(0, gObjectEvents, sizeof(gObjectEvents));
- for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+ for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
- gMapObjects[i].active = questLogMapObjects[i].active;
- gMapObjects[i].mapobj_bit_3 = questLogMapObjects[i].mapobj_bit_3;
- gMapObjects[i].mapobj_bit_4 = questLogMapObjects[i].mapobj_bit_4;
- gMapObjects[i].mapobj_bit_5 = questLogMapObjects[i].mapobj_bit_5;
- gMapObjects[i].mapobj_bit_8 = questLogMapObjects[i].mapobj_bit_8;
- gMapObjects[i].mapobj_bit_9 = questLogMapObjects[i].mapobj_bit_9;
- gMapObjects[i].mapobj_bit_10 = questLogMapObjects[i].mapobj_bit_10;
- gMapObjects[i].mapobj_bit_11 = questLogMapObjects[i].mapobj_bit_11;
- gMapObjects[i].mapobj_bit_12 = questLogMapObjects[i].mapobj_bit_12;
- gMapObjects[i].mapobj_bit_13 = questLogMapObjects[i].mapobj_bit_13;
- gMapObjects[i].mapobj_bit_14 = questLogMapObjects[i].mapobj_bit_14;
- gMapObjects[i].mapobj_bit_15 = questLogMapObjects[i].mapobj_bit_15;
- gMapObjects[i].mapobj_bit_16 = questLogMapObjects[i].mapobj_bit_16;
- gMapObjects[i].mapobj_bit_23 = questLogMapObjects[i].mapobj_bit_23;
- gMapObjects[i].mapobj_bit_24 = questLogMapObjects[i].mapobj_bit_24;
- gMapObjects[i].mapobj_bit_25 = questLogMapObjects[i].mapobj_bit_25;
- gMapObjects[i].mapobj_bit_26 = questLogMapObjects[i].mapobj_bit_26;
- gMapObjects[i].facingDirection = questLogMapObjects[i].mapobj_unk_18;
- gMapObjects[i].mapobj_unk_0B_0 = questLogMapObjects[i].mapobj_unk_0B_0;
- gMapObjects[i].elevation = questLogMapObjects[i].elevation;
- gMapObjects[i].graphicsId = questLogMapObjects[i].graphicsId;
- gMapObjects[i].animPattern = questLogMapObjects[i].animPattern;
- gMapObjects[i].trainerType = questLogMapObjects[i].trainerType;
- gMapObjects[i].localId = questLogMapObjects[i].localId;
- gMapObjects[i].mapNum = questLogMapObjects[i].mapNum;
- gMapObjects[i].mapGroup = questLogMapObjects[i].mapGroup;
- gMapObjects[i].coords2.x = questLogMapObjects[i].x;
- gMapObjects[i].coords2.y = questLogMapObjects[i].y;
- gMapObjects[i].trainerRange_berryTreeId = questLogMapObjects[i].trainerRange_berryTreeId;
- gMapObjects[i].mapobj_unk_1F = questLogMapObjects[i].mapobj_unk_1F;
- gMapObjects[i].mapobj_unk_21 = questLogMapObjects[i].mapobj_unk_21;
- gMapObjects[i].animId = questLogMapObjects[i].animId;
+ gObjectEvents[i].active = questLogObjectEvents[i].active;
+ gObjectEvents[i].mapobj_bit_3 = questLogObjectEvents[i].mapobj_bit_3;
+ gObjectEvents[i].mapobj_bit_4 = questLogObjectEvents[i].mapobj_bit_4;
+ gObjectEvents[i].mapobj_bit_5 = questLogObjectEvents[i].mapobj_bit_5;
+ gObjectEvents[i].mapobj_bit_8 = questLogObjectEvents[i].mapobj_bit_8;
+ gObjectEvents[i].mapobj_bit_9 = questLogObjectEvents[i].mapobj_bit_9;
+ gObjectEvents[i].mapobj_bit_10 = questLogObjectEvents[i].mapobj_bit_10;
+ gObjectEvents[i].mapobj_bit_11 = questLogObjectEvents[i].mapobj_bit_11;
+ gObjectEvents[i].mapobj_bit_12 = questLogObjectEvents[i].mapobj_bit_12;
+ gObjectEvents[i].mapobj_bit_13 = questLogObjectEvents[i].mapobj_bit_13;
+ gObjectEvents[i].mapobj_bit_14 = questLogObjectEvents[i].mapobj_bit_14;
+ gObjectEvents[i].mapobj_bit_15 = questLogObjectEvents[i].mapobj_bit_15;
+ gObjectEvents[i].mapobj_bit_16 = questLogObjectEvents[i].mapobj_bit_16;
+ gObjectEvents[i].mapobj_bit_23 = questLogObjectEvents[i].mapobj_bit_23;
+ gObjectEvents[i].mapobj_bit_24 = questLogObjectEvents[i].mapobj_bit_24;
+ gObjectEvents[i].mapobj_bit_25 = questLogObjectEvents[i].mapobj_bit_25;
+ gObjectEvents[i].mapobj_bit_26 = questLogObjectEvents[i].mapobj_bit_26;
+ gObjectEvents[i].facingDirection = questLogObjectEvents[i].mapobj_unk_18;
+ gObjectEvents[i].mapobj_unk_0B_0 = questLogObjectEvents[i].mapobj_unk_0B_0;
+ gObjectEvents[i].elevation = questLogObjectEvents[i].elevation;
+ gObjectEvents[i].graphicsId = questLogObjectEvents[i].graphicsId;
+ gObjectEvents[i].animPattern = questLogObjectEvents[i].animPattern;
+ gObjectEvents[i].trainerType = questLogObjectEvents[i].trainerType;
+ gObjectEvents[i].localId = questLogObjectEvents[i].localId;
+ gObjectEvents[i].mapNum = questLogObjectEvents[i].mapNum;
+ gObjectEvents[i].mapGroup = questLogObjectEvents[i].mapGroup;
+ gObjectEvents[i].coords2.x = questLogObjectEvents[i].x;
+ gObjectEvents[i].coords2.y = questLogObjectEvents[i].y;
+ gObjectEvents[i].trainerRange_berryTreeId = questLogObjectEvents[i].trainerRange_berryTreeId;
+ gObjectEvents[i].mapobj_unk_1F = questLogObjectEvents[i].mapobj_unk_1F;
+ gObjectEvents[i].mapobj_unk_21 = questLogObjectEvents[i].mapobj_unk_21;
+ gObjectEvents[i].animId = questLogObjectEvents[i].animId;
for (j = 0; j < 0x40; j++)
{
- if (gMapObjects[i].localId == templates[j].localId)
+ if (gObjectEvents[i].localId == templates[j].localId)
{
- gMapObjects[i].coords1.x = templates[j].x + 7;
- gMapObjects[i].coords1.y = templates[j].y + 7;
- gMapObjects[i].range.as_nybbles.x = templates[j].movementRangeX;
- gMapObjects[i].range.as_nybbles.y = templates[j].movementRangeY;
+ gObjectEvents[i].coords1.x = templates[j].x + 7;
+ gObjectEvents[i].coords1.y = templates[j].y + 7;
+ gObjectEvents[i].range.as_nybbles.x = templates[j].movementRangeX;
+ gObjectEvents[i].range.as_nybbles.y = templates[j].movementRangeY;
}
}
- gMapObjects[i].mapobj_unk_1E = MapGridGetMetatileBehaviorAt(gMapObjects[i].coords2.x, gMapObjects[i].coords2.y);
- if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y)))
+ gObjectEvents[i].mapobj_unk_1E = MapGridGetMetatileBehaviorAt(gObjectEvents[i].coords2.x, gObjectEvents[i].coords2.y);
+ if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y)))
{
- gMapObjects[i].coords3.x = gMapObjects[i].coords2.x;
- gMapObjects[i].coords3.y = gMapObjects[i].coords2.y;
+ gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
+ gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
}
- else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x - 1), (s16)(gMapObjects[i].coords2.y)))
+ else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x - 1), (s16)(gObjectEvents[i].coords2.y)))
{
- gMapObjects[i].coords3.x = gMapObjects[i].coords2.x - 1;
- gMapObjects[i].coords3.y = gMapObjects[i].coords2.y;
+ gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x - 1;
+ gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
}
- else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x + 1), (s16)(gMapObjects[i].coords2.y)))
+ else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x + 1), (s16)(gObjectEvents[i].coords2.y)))
{
- gMapObjects[i].coords3.x = gMapObjects[i].coords2.x + 1;
- gMapObjects[i].coords3.y = gMapObjects[i].coords2.y;
+ gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x + 1;
+ gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
}
- else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y - 1)))
+ else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y - 1)))
{
- gMapObjects[i].coords3.x = gMapObjects[i].coords2.x;
- gMapObjects[i].coords3.y = gMapObjects[i].coords2.y - 1;
+ gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
+ gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y - 1;
}
- else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y + 1)))
+ else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y + 1)))
{
- gMapObjects[i].coords3.x = gMapObjects[i].coords2.x;
- gMapObjects[i].coords3.y = gMapObjects[i].coords2.y + 1;
+ gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
+ gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y + 1;
}
}
- CpuCopy16(gMapObjects, gSaveBlock1Ptr->mapObjects, sizeof(gMapObjects));
+ CpuCopy16(gObjectEvents, gSaveBlock1Ptr->objectEvents, sizeof(gObjectEvents));
}
void sub_815A540(void)
@@ -141,9 +141,9 @@ void sub_815A540(void)
PlayerGetDestCoords(&x, &y);
if (!MetatileBehavior_IsSurfable(MapGridGetMetatileBehaviorAt(x, y)) && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
{
- struct MapObject * mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+ struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
SetPlayerAvatarTransitionFlags(0x01);
- DestroySprite(&gSprites[mapObject->mapobj_unk_1A]);
+ DestroySprite(&gSprites[objectEvent->mapobj_unk_1A]);
}
}
}
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 9675a132e..6a5d61227 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -16,9 +16,8 @@
#include "field_player_avatar.h"
#include "sound.h"
#include "script_movement.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
-#include "map_obj_lock.h"
+#include "event_object_movement.h"
+#include "event_object_lock.h"
#include "field_message_box.h"
#include "new_menu_helpers.h"
#include "window.h"
@@ -60,7 +59,7 @@ static EWRAM_DATA u16 sFieldEffectScriptId = 0;
struct ScriptContext * gUnknown_3005070;
-extern u8 gSelectedEventObject;
+extern u8 gSelectedObjectEvent;
// This is defined in here so the optimizer can't see its value when compiling
// script.c.
@@ -1048,7 +1047,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx)
{
u16 localId = VarGet(ScriptReadHalfword(ctx));
- RemoveFieldObjectByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+ RemoveObjectEventByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
return FALSE;
}
@@ -1058,7 +1057,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx)
u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx);
- RemoveFieldObjectByLocalIdAndMap(objectId, mapNum, mapGroup);
+ RemoveObjectEventByLocalIdAndMap(objectId, mapNum, mapGroup);
return FALSE;
}
@@ -1151,9 +1150,9 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx)
bool8 ScrCmd_faceplayer(struct ScriptContext *ctx)
{
- if (gMapObjects[gSelectedEventObject].active)
+ if (gObjectEvents[gSelectedObjectEvent].active)
{
- FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedEventObject],
+ ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent],
GetPlayerFacingDirection());
}
return FALSE;
@@ -1164,7 +1163,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx)
u16 localId = VarGet(ScriptReadHalfword(ctx));
u8 direction = ScriptReadByte(ctx);
- FieldObjectTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction);
+ ObjectEventTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction);
return FALSE;
}
@@ -1207,7 +1206,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
}
else
{
- ScriptFreezeMapObjects();
+ ScriptFreezeObjectEvents();
SetupNativeScript(ctx, sub_8069590);
return TRUE;
}
@@ -1221,14 +1220,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
}
else
{
- if (gMapObjects[gSelectedEventObject].active)
+ if (gObjectEvents[gSelectedObjectEvent].active)
{
- LockSelectedMapObject();
+ LockSelectedObjectEvent();
SetupNativeScript(ctx, sub_8069648);
}
else
{
- ScriptFreezeMapObjects();
+ ScriptFreezeObjectEvents();
SetupNativeScript(ctx, sub_8069590);
}
return TRUE;
@@ -1240,10 +1239,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
u8 playerObjectId;
HideFieldMessageBox();
- playerObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
- FieldObjectClearHeldMovementIfFinished(&gMapObjects[playerObjectId]);
+ playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
+ ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
sub_80974D8();
- UnfreezeMapObjects();
+ UnfreezeObjectEvents();
return FALSE;
}
@@ -1252,12 +1251,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
u8 playerObjectId;
HideFieldMessageBox();
- if (gMapObjects[gSelectedEventObject].active)
- FieldObjectClearHeldMovementIfFinished(&gMapObjects[gSelectedEventObject]);
- playerObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
- FieldObjectClearHeldMovementIfFinished(&gMapObjects[playerObjectId]);
+ if (gObjectEvents[gSelectedObjectEvent].active)
+ ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
+ playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
+ ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
sub_80974D8();
- UnfreezeMapObjects();
+ UnfreezeObjectEvents();
return FALSE;
}
diff --git a/src/sea_cottage_special_anim.c b/src/sea_cottage_special_anim.c
index 18a8da234..56d01ca29 100644
--- a/src/sea_cottage_special_anim.c
+++ b/src/sea_cottage_special_anim.c
@@ -4,7 +4,7 @@
#include "menu.h"
#include "field_player_avatar.h"
#include "fieldmap.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
#include "field_camera.h"
static EWRAM_DATA u8 gUnknown_2039984 = 0;
diff --git a/src/shop.c b/src/shop.c
index 12f3f3263..0eb4baaa1 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -31,7 +31,7 @@
#include "menu_indicators.h"
#include "field_player_avatar.h"
#include "fieldmap.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
#include "money.h"
#include "quest_log.h"
#include "script.h"
@@ -55,7 +55,7 @@ enum
// shop view window NPC info enum
enum
{
- EVENT_OBJ_ID,
+ OBJECT_EVENT_ID,
X_COORD,
Y_COORD,
ANIM_NUM
@@ -89,7 +89,7 @@ struct MartHistory
/*0x0B*/ u8 unkB;
}; /* size = 12 */
-static EWRAM_DATA s16 sViewportMapObjects[MAP_OBJECTS_COUNT][4] = {0};
+static EWRAM_DATA s16 sViewportObjectEvents[OBJECT_EVENTS_COUNT][4] = {0};
EWRAM_DATA struct ShopData gShopData = {0};
static EWRAM_DATA u8 sShopMenuWindowId = 0;
EWRAM_DATA u16 (*gShopTilemapBuffer1)[0x400] = {0};
@@ -139,8 +139,8 @@ 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 BuyMenuDrawEventObjects(void);
+static void BuyMenuCollectObjectEventData(void);
+static void BuyMenuDrawObjectEvents(void);
static void BuyMenuCopyTilemapData(void);
static void BuyMenuPrintItemQuantityAndPrice(u8 taskId);
static void Task_BuyMenu(u8 taskId);
@@ -735,19 +735,19 @@ static void BuyMenuRemoveScrollIndicatorArrows(void)
static void sub_809B764(void)
{
- BuyMenuCollectEventObjectData();
- BuyMenuDrawEventObjects();
+ BuyMenuCollectObjectEventData();
+ BuyMenuDrawObjectEvents();
BuyMenuDrawMapBg();
}
static void BuyMenuDrawMapBg(void)
{
s16 i, j, x, y;
- const struct MapData *mapData;
+ const struct MapLayout *mapLayout;
u16 metatile;
u8 metatileLayerType;
- mapData = gMapHeader.mapData;
+ mapLayout = gMapHeader.mapLayout;
GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
x -= 2;
y -= 3;
@@ -761,11 +761,11 @@ static void BuyMenuDrawMapBg(void)
if (metatile < NUM_METATILES_IN_PRIMARY)
{
- BuyMenuDrawMapMetatile(i, j, (u16*)mapData->primaryTileset->metatiles + metatile * 8, metatileLayerType);
+ BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType);
}
else
{
- BuyMenuDrawMapMetatile(i, j, (u16*)mapData->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
+ BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
}
}
}
@@ -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;
@@ -810,34 +810,34 @@ static void BuyMenuCollectEventObjectData(void)
GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY);
z = PlayerGetZCoord();
- for (y = 0; y < MAP_OBJECTS_COUNT; y++)
- sViewportMapObjects[y][EVENT_OBJ_ID] = MAP_OBJECTS_COUNT;
+ for (y = 0; y < OBJECT_EVENTS_COUNT; y++)
+ sViewportObjectEvents[y][OBJECT_EVENT_ID] = OBJECT_EVENTS_COUNT;
for (y = 0; y < 5; y++)
{
for (x = 0; x < 7; x++)
{
- u8 eventObjId = GetFieldObjectIdByXYZ(facingX - 3 + x, facingY - 2 + y, z);
- if (eventObjId != MAP_OBJECTS_COUNT)
+ u8 eventObjId = GetObjectEventIdByXYZ(facingX - 3 + x, facingY - 2 + y, z);
+ if (eventObjId != OBJECT_EVENTS_COUNT)
{
- sViewportMapObjects[num][EVENT_OBJ_ID] = eventObjId;
- sViewportMapObjects[num][X_COORD] = x;
- sViewportMapObjects[num][Y_COORD] = y;
+ sViewportObjectEvents[num][OBJECT_EVENT_ID] = eventObjId;
+ sViewportObjectEvents[num][X_COORD] = x;
+ sViewportObjectEvents[num][Y_COORD] = y;
- switch (gMapObjects[eventObjId].facingDirection)
+ switch (gObjectEvents[eventObjId].facingDirection)
{
case DIR_SOUTH:
- sViewportMapObjects[num][ANIM_NUM] = 0;
+ sViewportObjectEvents[num][ANIM_NUM] = 0;
break;
case DIR_NORTH:
- sViewportMapObjects[num][ANIM_NUM] = 1;
+ sViewportObjectEvents[num][ANIM_NUM] = 1;
break;
case DIR_WEST:
- sViewportMapObjects[num][ANIM_NUM] = 2;
+ sViewportObjectEvents[num][ANIM_NUM] = 2;
break;
case DIR_EAST:
default:
- sViewportMapObjects[num][ANIM_NUM] = 3;
+ sViewportObjectEvents[num][ANIM_NUM] = 3;
break;
}
num++;
@@ -846,24 +846,24 @@ static void BuyMenuCollectEventObjectData(void)
}
}
-static void BuyMenuDrawEventObjects(void)
+static void BuyMenuDrawObjectEvents(void)
{
u8 i, spriteId;
- const struct MapObjectGraphicsInfo *graphicsInfo;
+ const struct ObjectEventGraphicsInfo *graphicsInfo;
- for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+ for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
- if (sViewportMapObjects[i][EVENT_OBJ_ID] == MAP_OBJECTS_COUNT)
+ if (sViewportObjectEvents[i][OBJECT_EVENT_ID] == OBJECT_EVENTS_COUNT)
continue;
- graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[sViewportMapObjects[i][EVENT_OBJ_ID]].graphicsId);
- spriteId = AddPseudoEventObject(
- gMapObjects[sViewportMapObjects[i][EVENT_OBJ_ID]].graphicsId,
+ graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[sViewportObjectEvents[i][OBJECT_EVENT_ID]].graphicsId);
+ spriteId = AddPseudoObjectEvent(
+ gObjectEvents[sViewportObjectEvents[i][OBJECT_EVENT_ID]].graphicsId,
SpriteCallbackDummy,
- (u16)sViewportMapObjects[i][X_COORD] * 16 - 8,
- (u16)sViewportMapObjects[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2,
+ (u16)sViewportObjectEvents[i][X_COORD] * 16 - 8,
+ (u16)sViewportObjectEvents[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2,
2);
- StartSpriteAnim(&gSprites[spriteId], sViewportMapObjects[i][ANIM_NUM]);
+ StartSpriteAnim(&gSprites[spriteId], sViewportObjectEvents[i][ANIM_NUM]);
}
}
diff --git a/src/ss_anne.c b/src/ss_anne.c
index 19c3c8e08..401f4e235 100644
--- a/src/ss_anne.c
+++ b/src/ss_anne.c
@@ -1,7 +1,7 @@
#include "global.h"
#include "task.h"
#include "sound.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
#include "script.h"
#include "constants/songs.h"
@@ -103,8 +103,8 @@ static void Task_SSAnneInit(u8 taskId)
static void Task_SSAnneRun(u8 taskId)
{
s16 * data = gTasks[taskId].data;
- u8 mapObjectId;
- struct MapObject * boatObject;
+ u8 objectEventId;
+ struct ObjectEvent * boatObject;
s16 x;
data[1]++;
@@ -114,8 +114,8 @@ static void Task_SSAnneRun(u8 taskId)
data[1] = 0;
CreateSmokeSprite();
}
- TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
- boatObject = &gMapObjects[mapObjectId];
+ TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
+ boatObject = &gObjectEvents[objectEventId];
if (gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x < -120)
{
PlaySE(SE_KITEKI);
@@ -143,13 +143,13 @@ static void Task_SSAnneFinish(u8 taskId)
static void CreateWakeBehindBoat(void)
{
- u8 mapObjectId;
- struct MapObject * boatObject;
+ u8 objectEventId;
+ struct ObjectEvent * boatObject;
u16 x;
u8 spriteId;
- TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
- boatObject = &gMapObjects[mapObjectId];
+ TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
+ boatObject = &gObjectEvents[objectEventId];
x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 80;
spriteId = CreateSprite(&sWakeSpriteTemplate, x, 109, 0xFF);
gSprites[spriteId].oam.priority = 2;
@@ -158,12 +158,12 @@ static void CreateWakeBehindBoat(void)
static void WakeSpriteCallback(struct Sprite * sprite)
{
- u8 mapObjectId;
- struct MapObject * boatObject;
+ u8 objectEventId;
+ struct ObjectEvent * boatObject;
u16 x;
- TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
- boatObject = &gMapObjects[mapObjectId];
+ TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
+ boatObject = &gObjectEvents[objectEventId];
x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 80;
sprite->pos1.x = x;
if (sprite->data[0] / 6 < 22)
@@ -175,13 +175,13 @@ static void WakeSpriteCallback(struct Sprite * sprite)
static void CreateSmokeSprite(void)
{
- u8 mapObjectId;
- struct MapObject * boatObject;
+ u8 objectEventId;
+ struct ObjectEvent * boatObject;
u16 x;
u8 spriteId;
- TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
- boatObject = &gMapObjects[mapObjectId];
+ TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
+ boatObject = &gObjectEvents[objectEventId];
x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 49;
if ((s16)x >= -32)
{
diff --git a/src/start_menu.c b/src/start_menu.c
index 31bb3beb7..59bfb8643 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -23,8 +23,8 @@
#include "field_fadetransition.h"
#include "field_player_avatar.h"
#include "new_menu_helpers.h"
-#include "map_obj_80688E4.h"
-#include "map_obj_lock.h"
+#include "event_object_80688E4.h"
+#include "event_object_lock.h"
#include "script.h"
#include "sound.h"
#include "quest_log.h"
@@ -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 2720f3204..11d4a80b1 100644
--- a/src/teachy_tv.c
+++ b/src/teachy_tv.c
@@ -15,7 +15,7 @@
#include "item_menu.h"
#include "item.h"
#include "menu_indicators.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
#include "random.h"
#include "text.h"
#include "constants/songs.h"
@@ -112,11 +112,11 @@ static void TeachyTvGrassAnimationObjCallback(struct Sprite *sprite);
static void TeachyTvRestorePlayerPartyCallback(void);
static void TeachyTvPreBattleAnimAndSetBattleCallback(u8 taskId);
static void TeachyTvLoadMapTilesetToBuffer(struct Tileset *ts, u8 *dstBuffer, u16 size);
-static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapData *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset);
+static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapLayout *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset);
static void TeachyTvComputeMapTilesFromTilesetAndMetaTiles(u16 *metaTilesArray, u8 *blockBuf, u8 *tileset);
static void TeachyTvComputeSingleMapTileBlockFromTilesetAndMetaTiles(u8 *blockBuf, u8 *tileset, u8 metaTile);
static u16 TeachyTvComputePalIndexArrayEntryByMetaTile(u8 *palIndexArrayBuf, u16 metaTile);
-static void TeachyTvLoadMapPalette(const struct MapData * mStruct, const u8 *palIndexArray);
+static void TeachyTvLoadMapPalette(const struct MapLayout * mStruct, const u8 *palIndexArray);
static const struct BgTemplate sBgTemplates[] =
{
@@ -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;
@@ -1125,7 +1125,7 @@ static void TeachyTvGrassAnimationMain(u8 taskId, s16 x, s16 y, u8 subpriority,
if (sResources->grassAnimDisabled != 1 && TeachyTvGrassAnimationCheckIfNeedsToGenerateGrassObj(x - 0x10, y))
{
- spriteId = CreateSprite(gUnknown_83A0010[4], 0, 0, subpriority);
+ spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[4], 0, 0, subpriority);
obj = &gSprites[spriteId];
obj->pos2.x = x;
obj->pos2.y = y + 8;
@@ -1240,7 +1240,7 @@ static void TeachyTvLoadBg3Map(u16 *buffer)
void * tilesetsBuffer;
void * palIndicesBuffer;
u16 numMapTilesRows = 0;
- const struct MapData *layout = &Route1_Layout;
+ const struct MapLayout *layout = &Route1_Layout;
u16 * blockIndicesBuffer = AllocZeroed(0x800);
tilesetsBuffer = AllocZeroed(0x8000);
palIndicesBuffer = Alloc(16);
@@ -1307,7 +1307,7 @@ static void TeachyTvLoadMapTilesetToBuffer(struct Tileset *ts, u8 *dstBuffer, u1
}
}
-static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapData *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset)
+static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapLayout *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset)
{
u16 * metaTileEntryAddr = mapEntry <= 0x27F ? &((u16*)(mStruct->primaryTileset->metatiles))[8 * mapEntry] : &((u16*)(mStruct->secondaryTileset->metatiles))[8 * (mapEntry - 0x280)];
buf1[0] = (TeachyTvComputePalIndexArrayEntryByMetaTile(palIndexArray, metaTileEntryAddr[0]) << 12) + 4 * offset;
@@ -1397,7 +1397,7 @@ static u16 TeachyTvComputePalIndexArrayEntryByMetaTile(u8 *palIndexArrayBuf, u16
return (0xF - i);
}
-static void TeachyTvLoadMapPalette(const struct MapData * mStruct, const u8 * palIndexArray)
+static void TeachyTvLoadMapPalette(const struct MapLayout * mStruct, const u8 * palIndexArray)
{
u8 i;
const struct Tileset * ts;
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index a8539a5d8..44e86448f 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -194,8 +194,8 @@ static void _InitPrimaryTilesetAnimation(void)
sPrimaryTilesetAnimCounter = 0;
sPrimaryTilesetAnimCounterMax = 0;
sPrimaryTilesetAnimCallback = NULL;
- if (gMapHeader.mapData->primaryTileset && gMapHeader.mapData->primaryTileset->callback)
- gMapHeader.mapData->primaryTileset->callback();
+ if (gMapHeader.mapLayout->primaryTileset && gMapHeader.mapLayout->primaryTileset->callback)
+ gMapHeader.mapLayout->primaryTileset->callback();
}
static void _InitSecondaryTilesetAnimation(void)
@@ -203,8 +203,8 @@ static void _InitSecondaryTilesetAnimation(void)
sSecondaryTilesetAnimCounter = 0;
sSecondaryTilesetAnimCounterMax = 0;
sSecondaryTilesetAnimCallback = NULL;
- if (gMapHeader.mapData->secondaryTileset && gMapHeader.mapData->secondaryTileset->callback)
- gMapHeader.mapData->secondaryTileset->callback();
+ if (gMapHeader.mapLayout->secondaryTileset && gMapHeader.mapLayout->secondaryTileset->callback)
+ gMapHeader.mapLayout->secondaryTileset->callback();
}
static void sub_80700A4(u16 timer)
diff --git a/src/trade.c b/src/trade.c
index 4921a1ba3..f52950d82 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -142,7 +142,7 @@ static u32 sub_804FA14(struct Pokemon * party, int partyCount, int cursorPos);
static const size_t gUnknown_8260814[] = {
sizeof(struct SaveBlock2),
sizeof(struct SaveBlock1),
- sizeof(struct MapData),
+ sizeof(struct MapLayout),
0x530, // unk
0x34, // unk
sizeof(struct MailStruct),
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index 19d44d7cc..dd00bf854 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -30,7 +30,7 @@
#include "constants/layouts.h"
#include "constants/trainers.h"
#include "constants/facility_trainer_classes.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
struct UnkStruct_203F458
{
@@ -113,102 +113,102 @@ extern const u8 gUnknown_83FE998[];
extern const u8 *const gUnknown_83FE9C4[];
static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = {
- {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY, FEMALE},
- {MAP_OBJ_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC, MALE},
- {MAP_OBJ_GFX_TUBER_F, FACILITY_CLASS_TUBER, FEMALE},
- {MAP_OBJ_GFX_TUBER_M_2, FACILITY_CLASS_TUBER_2, MALE},
- {MAP_OBJ_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER, MALE},
- {MAP_OBJ_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_2, FEMALE},
- {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE},
- {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_LADY, FEMALE},
- {MAP_OBJ_GFX_BEAUTY, FACILITY_CLASS_BEAUTY, FEMALE},
- {MAP_OBJ_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE},
- {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE},
- {MAP_OBJ_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE, MALE},
- {MAP_OBJ_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT, MALE},
- {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE},
- {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE},
- {MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_CAMPER, MALE},
- {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE},
- {MAP_OBJ_GFX_BOY, FACILITY_CLASS_PSYCHIC, MALE},
- {MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_2, FEMALE},
- {MAP_OBJ_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN, MALE},
- {MAP_OBJ_GFX_BOY, FACILITY_CLASS_SCHOOL_KID, MALE},
- {MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_SCHOOL_KID_2, FEMALE},
- {MAP_OBJ_GFX_BALDING_MAN, FACILITY_CLASS_POKEFAN, MALE},
- {MAP_OBJ_GFX_WOMAN_3, FACILITY_CLASS_POKEFAN_2, FEMALE},
- {MAP_OBJ_GFX_OLD_MAN_1, FACILITY_CLASS_EXPERT, MALE},
- {MAP_OBJ_GFX_OLD_WOMAN, FACILITY_CLASS_EXPERT_2, FEMALE},
- {MAP_OBJ_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER, MALE},
- {MAP_OBJ_GFX_FISHER, FACILITY_CLASS_FISHERMAN, MALE},
- {MAP_OBJ_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE},
- {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE},
- {MAP_OBJ_GFX_LITTLE_BOY, FACILITY_CLASS_NINJA_BOY, MALE},
- {MAP_OBJ_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE},
- {MAP_OBJ_GFX_BEAUTY, FACILITY_CLASS_PARASOL_LADY, FEMALE},
- {MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE, FEMALE},
- {MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PICNICKER, FEMALE},
- {MAP_OBJ_GFX_SAILOR, FACILITY_CLASS_SAILOR, MALE},
- {MAP_OBJ_GFX_FAT_MAN, FACILITY_CLASS_COLLECTOR, MALE},
- {MAP_OBJ_GFX_MAN, FACILITY_CLASS_PKMN_BREEDER, MALE},
- {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_2, FEMALE},
- {MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER, MALE},
- {MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_2, FEMALE},
- {MAP_OBJ_GFX_LASS, FACILITY_CLASS_LASS, FEMALE},
- {MAP_OBJ_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER, MALE},
- {MAP_OBJ_GFX_HIKER, FACILITY_CLASS_HIKER, MALE},
- {MAP_OBJ_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER_2, MALE},
- {MAP_OBJ_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER_2, MALE},
- {MAP_OBJ_GFX_LASS, FACILITY_CLASS_LASS_2, FEMALE},
- {MAP_OBJ_GFX_SAILOR, FACILITY_CLASS_SAILOR_2, MALE},
- {MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_CAMPER_2, MALE},
- {MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PICNICKER_2, FEMALE},
- {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC_2, MALE},
- {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD, MALE},
- {MAP_OBJ_GFX_HIKER, FACILITY_CLASS_HIKER_2, MALE},
- {MAP_OBJ_GFX_BIKER, FACILITY_CLASS_BIKER, MALE},
- {MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR, MALE},
- {MAP_OBJ_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER, MALE},
- {MAP_OBJ_GFX_FISHER, FACILITY_CLASS_FISHERMAN_2, MALE},
- {MAP_OBJ_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2, MALE},
- {MAP_OBJ_GFX_BIKER, FACILITY_CLASS_CUE_BALL, MALE},
- {MAP_OBJ_GFX_OLD_MAN_1, FACILITY_CLASS_GAMER, MALE},
- {MAP_OBJ_GFX_BEAUTY, FACILITY_CLASS_BEAUTY_2, FEMALE},
- {MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE},
- {MAP_OBJ_GFX_BOY, FACILITY_CLASS_PSYCHIC_3, MALE},
- {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_ROCKER, MALE},
- {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_JUGGLER, MALE},
- {MAP_OBJ_GFX_MAN, FACILITY_CLASS_TAMER, MALE},
- {MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER_2, MALE},
- {MAP_OBJ_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT_2, MALE},
- {MAP_OBJ_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST, MALE},
- {MAP_OBJ_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_3, MALE},
- {MAP_OBJ_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_4, FEMALE},
- {MAP_OBJ_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN_2, MALE},
- {MAP_OBJ_GFX_CHANNELER, FACILITY_CLASS_CHANNELER, FEMALE},
- {MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_4, FEMALE},
- {MAP_OBJ_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE},
- {MAP_OBJ_GFX_TUBER_F, FACILITY_CLASS_TUBER_3, FEMALE},
- {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_3, FEMALE},
- {MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER_3, MALE},
- {MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_4, FEMALE},
- {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY_2, FEMALE},
- {MAP_OBJ_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC_2, MALE},
- {MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_LADY_2, FEMALE},
- {MAP_OBJ_GFX_LASS, FACILITY_CLASS_PAINTER, FEMALE}
+ {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY, FEMALE},
+ {OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC, MALE},
+ {OBJECT_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER, FEMALE},
+ {OBJECT_EVENT_GFX_TUBER_M_2, FACILITY_CLASS_TUBER_2, MALE},
+ {OBJECT_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER, MALE},
+ {OBJECT_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_2, FEMALE},
+ {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE},
+ {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_LADY, FEMALE},
+ {OBJECT_EVENT_GFX_BEAUTY, FACILITY_CLASS_BEAUTY, FEMALE},
+ {OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE},
+ {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE},
+ {OBJECT_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE, MALE},
+ {OBJECT_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT, MALE},
+ {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE},
+ {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE},
+ {OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER, MALE},
+ {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE},
+ {OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_PSYCHIC, MALE},
+ {OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_2, FEMALE},
+ {OBJECT_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN, MALE},
+ {OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_SCHOOL_KID, MALE},
+ {OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_SCHOOL_KID_2, FEMALE},
+ {OBJECT_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_POKEFAN, MALE},
+ {OBJECT_EVENT_GFX_WOMAN_3, FACILITY_CLASS_POKEFAN_2, FEMALE},
+ {OBJECT_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_EXPERT, MALE},
+ {OBJECT_EVENT_GFX_OLD_WOMAN, FACILITY_CLASS_EXPERT_2, FEMALE},
+ {OBJECT_EVENT_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER, MALE},
+ {OBJECT_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN, MALE},
+ {OBJECT_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE},
+ {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE},
+ {OBJECT_EVENT_GFX_LITTLE_BOY, FACILITY_CLASS_NINJA_BOY, MALE},
+ {OBJECT_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE},
+ {OBJECT_EVENT_GFX_BEAUTY, FACILITY_CLASS_PARASOL_LADY, FEMALE},
+ {OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE, FEMALE},
+ {OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER, FEMALE},
+ {OBJECT_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR, MALE},
+ {OBJECT_EVENT_GFX_FAT_MAN, FACILITY_CLASS_COLLECTOR, MALE},
+ {OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_PKMN_BREEDER, MALE},
+ {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_2, FEMALE},
+ {OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER, MALE},
+ {OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_2, FEMALE},
+ {OBJECT_EVENT_GFX_LASS, FACILITY_CLASS_LASS, FEMALE},
+ {OBJECT_EVENT_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER, MALE},
+ {OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER, MALE},
+ {OBJECT_EVENT_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER_2, MALE},
+ {OBJECT_EVENT_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER_2, MALE},
+ {OBJECT_EVENT_GFX_LASS, FACILITY_CLASS_LASS_2, FEMALE},
+ {OBJECT_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR_2, MALE},
+ {OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER_2, MALE},
+ {OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER_2, FEMALE},
+ {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC_2, MALE},
+ {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD, MALE},
+ {OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER_2, MALE},
+ {OBJECT_EVENT_GFX_BIKER, FACILITY_CLASS_BIKER, MALE},
+ {OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR, MALE},
+ {OBJECT_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER, MALE},
+ {OBJECT_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN_2, MALE},
+ {OBJECT_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2, MALE},
+ {OBJECT_EVENT_GFX_BIKER, FACILITY_CLASS_CUE_BALL, MALE},
+ {OBJECT_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_GAMER, MALE},
+ {OBJECT_EVENT_GFX_BEAUTY, FACILITY_CLASS_BEAUTY_2, FEMALE},
+ {OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE},
+ {OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_PSYCHIC_3, MALE},
+ {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_ROCKER, MALE},
+ {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_JUGGLER, MALE},
+ {OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_TAMER, MALE},
+ {OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER_2, MALE},
+ {OBJECT_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT_2, MALE},
+ {OBJECT_EVENT_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST, MALE},
+ {OBJECT_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_3, MALE},
+ {OBJECT_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_4, FEMALE},
+ {OBJECT_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN_2, MALE},
+ {OBJECT_EVENT_GFX_CHANNELER, FACILITY_CLASS_CHANNELER, FEMALE},
+ {OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_4, FEMALE},
+ {OBJECT_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE},
+ {OBJECT_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER_3, FEMALE},
+ {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_3, FEMALE},
+ {OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER_3, MALE},
+ {OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_4, FEMALE},
+ {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY_2, FEMALE},
+ {OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC_2, MALE},
+ {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_LADY_2, FEMALE},
+ {OBJECT_EVENT_GFX_LASS, FACILITY_CLASS_PAINTER, FEMALE}
};
static const struct DoublesTrainerInfo sDoubleBattleTrainerInfo[] = {
- {MAP_OBJ_GFX_BEAUTY, MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_SR_AND_JR, FEMALE, FEMALE},
- {MAP_OBJ_GFX_LITTLE_GIRL, MAP_OBJ_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS, FEMALE, FEMALE},
- {MAP_OBJ_GFX_BEAUTY, MAP_OBJ_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE, FEMALE, MALE},
- {MAP_OBJ_GFX_OLD_MAN_1, MAP_OBJ_GFX_OLD_WOMAN, FACILITY_CLASS_OLD_COUPLE, MALE, FEMALE},
- {MAP_OBJ_GFX_TUBER_M_2, MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO, MALE, FEMALE},
- {MAP_OBJ_GFX_LITTLE_GIRL, MAP_OBJ_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS_2, FEMALE, FEMALE},
- {MAP_OBJ_GFX_COOLTRAINER_M, MAP_OBJ_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE, MALE, FEMALE},
- {MAP_OBJ_GFX_BEAUTY, MAP_OBJ_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE},
- {MAP_OBJ_GFX_BATTLE_GIRL, MAP_OBJ_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE},
- {MAP_OBJ_GFX_SWIMMER_F_LAND, MAP_OBJ_GFX_TUBER_M_2, FACILITY_CLASS_SIS_AND_BRO_2, FEMALE, MALE}
+ {OBJECT_EVENT_GFX_BEAUTY, OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_SR_AND_JR, FEMALE, FEMALE},
+ {OBJECT_EVENT_GFX_LITTLE_GIRL, OBJECT_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS, FEMALE, FEMALE},
+ {OBJECT_EVENT_GFX_BEAUTY, OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE, FEMALE, MALE},
+ {OBJECT_EVENT_GFX_OLD_MAN_1, OBJECT_EVENT_GFX_OLD_WOMAN, FACILITY_CLASS_OLD_COUPLE, MALE, FEMALE},
+ {OBJECT_EVENT_GFX_TUBER_M_2, OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO, MALE, FEMALE},
+ {OBJECT_EVENT_GFX_LITTLE_GIRL, OBJECT_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS_2, FEMALE, FEMALE},
+ {OBJECT_EVENT_GFX_COOLTRAINER_M, OBJECT_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE, MALE, FEMALE},
+ {OBJECT_EVENT_GFX_BEAUTY, OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE},
+ {OBJECT_EVENT_GFX_BATTLE_GIRL, OBJECT_EVENT_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE},
+ {OBJECT_EVENT_GFX_SWIMMER_F_LAND, OBJECT_EVENT_GFX_TUBER_M_2, FACILITY_CLASS_SIS_AND_BRO_2, FEMALE, MALE}
};
static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[105] = {
@@ -521,7 +521,7 @@ static void sub_815DC8C(void) // fakematching
const struct TrainerTowerFloor *const * r7;
sTrainerTowerState = AllocZeroed(sizeof(*sTrainerTowerState));
- sTrainerTowerState->floorIdx = gMapHeader.mapDataId - 42;
+ sTrainerTowerState->floorIdx = gMapHeader.mapLayoutId - 42;
if (sub_815D834() == TRUE)
CEReaderTool_LoadTrainerTower(&sTrainerTowerState->unk_0004);
else
@@ -628,7 +628,7 @@ static void sub_815DD2C(void)
static void sub_815DD44(void)
{
- if (gMapHeader.mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.count)
+ if (gMapHeader.mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.count)
{
gSpecialVar_Result = 3;
SetCurrentMapLayout(LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF);
@@ -674,8 +674,8 @@ static void SetTrainerTowerNPCGraphics(void)
}
else
{
- r1 = MAP_OBJ_GFX_YOUNGSTER;
- r4_ = MAP_OBJ_GFX_YOUNGSTER;
+ r1 = OBJECT_EVENT_GFX_YOUNGSTER;
+ r4_ = OBJECT_EVENT_GFX_YOUNGSTER;
}
VarSet(VAR_OBJ_GFX_ID_0, r1);
VarSet(VAR_OBJ_GFX_ID_3, r4_);
@@ -692,7 +692,7 @@ static void SetTrainerTowerNPCGraphics(void)
if (r3 != NELEMS(sSingleBattleTrainerInfo))
r1 = sSingleBattleTrainerInfo[r3].mapObjGfx;
else
- r1 = MAP_OBJ_GFX_YOUNGSTER;
+ r1 = OBJECT_EVENT_GFX_YOUNGSTER;
switch (r4)
{
case 0:
@@ -831,8 +831,8 @@ static void sub_815E1F0(void)
static void TTSpecial_HasReachedTheRoof(void)
{
- u16 mapDataId = gMapHeader.mapDataId;
- if (mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F == gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 && mapDataId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY <= sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].floorIdx)
+ u16 mapLayoutId = gMapHeader.mapLayoutId;
+ if (mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F == gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 && mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY <= sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].floorIdx)
gSpecialVar_Result = FALSE;
else
gSpecialVar_Result = TRUE;
@@ -1008,7 +1008,7 @@ static void sub_815E8CC(void)
static void sub_815E908(void)
{
- if (gMapHeader.mapDataId == LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0)
+ if (gMapHeader.mapLayoutId == LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0)
{
gSpecialVar_Result = FALSE;
}
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index bf85c68b3..23eaafd2f 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -3,13 +3,13 @@
#include "sound.h"
#include "task.h"
#include "malloc.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
#include "new_menu_helpers.h"
#include "item_use.h"
#include "event_scripts.h"
#include "event_data.h"
#include "script.h"
-#include "map_obj_lock.h"
+#include "event_object_lock.h"
#include "field_specials.h"
#include "item_menu.h"
#include "field_effect.h"
@@ -17,14 +17,14 @@
#include "battle.h"
#include "battle_setup.h"
#include "random.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
#include "field_player_avatar.h"
-#include "map_obj_80688E4.h"
-#include "map_obj_8097404.h"
+#include "event_object_80688E4.h"
+#include "event_object_8097404.h"
#include "unk_810c3a4.h"
#include "vs_seeker.h"
#include "constants/movement_commands.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
#include "constants/trainers.h"
#include "constants/maps.h"
@@ -48,7 +48,7 @@ struct VsSeekerTrainerInfo
const u8 *script;
u16 trainerIdx;
u8 localId;
- u8 fieldObjectId;
+ u8 objectEventId;
s16 xCoord;
s16 yCoord;
u8 graphicsId;
@@ -56,10 +56,10 @@ struct VsSeekerTrainerInfo
struct VsSeekerStruct
{
- /*0x000*/ struct VsSeekerTrainerInfo trainerInfo[MAP_OBJECTS_COUNT];
+ /*0x000*/ struct VsSeekerTrainerInfo trainerInfo[OBJECT_EVENTS_COUNT];
/*0x100*/ u8 filler_100[0x300];
- /*0x400*/ u16 trainerIdxArray[MAP_OBJECTS_COUNT];
- /*0x420*/ u8 runningBehaviourEtcArray[MAP_OBJECTS_COUNT];
+ /*0x400*/ u16 trainerIdxArray[OBJECT_EVENTS_COUNT];
+ /*0x420*/ u8 runningBehaviourEtcArray[OBJECT_EVENTS_COUNT];
/*0x430*/ u8 numRematchableTrainers;
/*0x431*/ u8 trainerHasNotYetBeenFought:1;
/*0x431*/ u8 trainerDoesNotWantRematch:1;
@@ -68,8 +68,8 @@ struct VsSeekerStruct
};
extern u16 gSpecialVar_LastTalked;
-extern struct MapObject gMapObjects[MAP_OBJECTS_COUNT];
-extern u8 gSelectedEventObject;
+extern struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT];
+extern u8 gSelectedObjectEvent;
// static declarations
static EWRAM_DATA struct VsSeekerStruct *sVsSeeker = NULL;
@@ -591,13 +591,13 @@ static void sub_810C3B8(u8 taskId)
if (task->data[1] == 0)
{
- for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+ for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
if (sub_810CF04(i) == TRUE)
{
- if (gMapObjects[i].mapobj_bit_1)
+ if (gObjectEvents[i].mapobj_bit_1)
return;
- FreezeMapObject(&gMapObjects[i]);
+ FreezeObjectEvent(&gObjectEvents[i]);
}
}
}
@@ -613,22 +613,22 @@ static void sub_810C3B8(u8 taskId)
void sub_810C444(void)
{
- struct MapObjectTemplate * templates = gSaveBlock1Ptr->mapObjectTemplates;
+ struct ObjectEventTemplate * templates = gSaveBlock1Ptr->objectEventTemplates;
u8 i;
u8 r6;
u8 sp0;
- struct MapObject * mapObject;
+ struct ObjectEvent * objectEvent;
- for (i = 0; i < gMapHeader.events->mapObjectCount; i++)
+ for (i = 0; i < gMapHeader.events->objectEventCount; i++)
{
if ((templates[i].trainerType == 1 || templates[i].trainerType == 3) && (templates[i].movementType == 0x4D || templates[i].movementType == 0x4E || templates[i].movementType == 0x4F))
{
r6 = sub_810CF54();
- TryGetFieldObjectIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0);
- mapObject = &gMapObjects[sp0];
+ TryGetObjectEventIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0);
+ objectEvent = &gObjectEvents[sp0];
if (sub_810CF04(sp0) == TRUE)
{
- SetTrainerMovementType(mapObject, r6);
+ SetTrainerMovementType(objectEvent, r6);
}
templates[i].movementType = r6;
}
@@ -756,17 +756,17 @@ static void sub_810C594(void)
{
u8 i;
- for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+ for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
- struct MapObject * mapObject = &gMapObjects[i];
- if (mapObject->animPattern == 0x4D || mapObject->animPattern == 0x4E || mapObject->animPattern == 0x4F)
+ struct ObjectEvent * objectEvent = &gObjectEvents[i];
+ if (objectEvent->animPattern == 0x4D || objectEvent->animPattern == 0x4E || objectEvent->animPattern == 0x4F)
{
u8 r3 = sub_810CF54();
- if (mapObject->active && gSprites[mapObject->spriteId].data[0] == i)
+ if (objectEvent->active && gSprites[objectEvent->spriteId].data[0] == i)
{
- gSprites[mapObject->spriteId].pos2.x = 0;
- gSprites[mapObject->spriteId].pos2.y = 0;
- SetTrainerMovementType(mapObject, r3);
+ gSprites[objectEvent->spriteId].pos2.x = 0;
+ gSprites[objectEvent->spriteId].pos2.y = 0;
+ SetTrainerMovementType(objectEvent, r3);
}
}
}
@@ -857,23 +857,23 @@ static void Task_VsSeeker_2(u8 taskId)
static void GatherNearbyTrainerInfo(void)
{
- struct MapObjectTemplate *templates = gSaveBlock1Ptr->mapObjectTemplates;
- u8 fieldObjectId = 0;
+ struct ObjectEventTemplate *templates = gSaveBlock1Ptr->objectEventTemplates;
+ u8 objectEventId = 0;
u8 vsSeekerObjectIdx = 0;
- s32 mapObjectIdx;
+ s32 objectEventIdx;
- for (mapObjectIdx = 0; mapObjectIdx < gMapHeader.events->mapObjectCount; mapObjectIdx++)
+ for (objectEventIdx = 0; objectEventIdx < gMapHeader.events->objectEventCount; objectEventIdx++)
{
- if (templates[mapObjectIdx].trainerType == 1 || templates[mapObjectIdx].trainerType == 3)
+ if (templates[objectEventIdx].trainerType == 1 || templates[objectEventIdx].trainerType == 3)
{
- sVsSeeker->trainerInfo[vsSeekerObjectIdx].script = templates[mapObjectIdx].script;
- sVsSeeker->trainerInfo[vsSeekerObjectIdx].trainerIdx = GetTrainerFlagFromScript(templates[mapObjectIdx].script);
- sVsSeeker->trainerInfo[vsSeekerObjectIdx].localId = templates[mapObjectIdx].localId;
- TryGetFieldObjectIdByLocalIdAndMap(templates[mapObjectIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &fieldObjectId);
- sVsSeeker->trainerInfo[vsSeekerObjectIdx].fieldObjectId = fieldObjectId;
- sVsSeeker->trainerInfo[vsSeekerObjectIdx].xCoord = gMapObjects[fieldObjectId].coords2.x - 7;
- sVsSeeker->trainerInfo[vsSeekerObjectIdx].yCoord = gMapObjects[fieldObjectId].coords2.y - 7;
- sVsSeeker->trainerInfo[vsSeekerObjectIdx].graphicsId = templates[mapObjectIdx].graphicsId;
+ sVsSeeker->trainerInfo[vsSeekerObjectIdx].script = templates[objectEventIdx].script;
+ sVsSeeker->trainerInfo[vsSeekerObjectIdx].trainerIdx = GetTrainerFlagFromScript(templates[objectEventIdx].script);
+ sVsSeeker->trainerInfo[vsSeekerObjectIdx].localId = templates[objectEventIdx].localId;
+ TryGetObjectEventIdByLocalIdAndMap(templates[objectEventIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
+ sVsSeeker->trainerInfo[vsSeekerObjectIdx].objectEventId = objectEventId;
+ sVsSeeker->trainerInfo[vsSeekerObjectIdx].xCoord = gObjectEvents[objectEventId].coords2.x - 7;
+ sVsSeeker->trainerInfo[vsSeekerObjectIdx].yCoord = gObjectEvents[objectEventId].coords2.y - 7;
+ sVsSeeker->trainerInfo[vsSeekerObjectIdx].graphicsId = templates[objectEventIdx].graphicsId;
vsSeekerObjectIdx++;
}
}
@@ -960,7 +960,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
else
{
gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[vsSeekerIdx].localId] = r7;
- npc_coords_shift_still(&gMapObjects[sVsSeeker->trainerInfo[vsSeekerIdx].fieldObjectId]);
+ npc_coords_shift_still(&gObjectEvents[sVsSeeker->trainerInfo[vsSeekerIdx].objectEventId]);
StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], gUnknown_8453F64);
sVsSeeker->trainerIdxArray[sVsSeeker->numRematchableTrainers] = r8;
sVsSeeker->runningBehaviourEtcArray[sVsSeeker->numRematchableTrainers] = GetRunningBehaviorFromGraphicsId(sVsSeeker->trainerInfo[vsSeekerIdx].graphicsId);
@@ -1120,7 +1120,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
"\tlsls r0, r1, 3\n"
"\tadds r0, r1\n"
"\tlsls r0, 2\n"
- "\tldr r1, _0810CB5C @ =gMapObjects\n"
+ "\tldr r1, _0810CB5C @ =gObjectEvents\n"
"\tadds r0, r1\n"
"\tbl npc_coords_shift_still\n"
"\tldr r0, [r6]\n"
@@ -1194,7 +1194,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
"\t.align 2, 0\n"
"_0810CB54: .4byte gSaveBlock1Ptr\n"
"_0810CB58: .4byte 0x0000063a\n"
- "_0810CB5C: .4byte gMapObjects\n"
+ "_0810CB5C: .4byte gObjectEvents\n"
"_0810CB60: .4byte gUnknown_8453F64\n"
"_0810CB64: .4byte 0x00000431\n"
"_0810CB68: .4byte sVsSeeker\n"
@@ -1223,25 +1223,25 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
void sub_810CB90(void)
{
u8 sp0 = 0;
- struct MapObjectTemplate *r4 = gSaveBlock1Ptr->mapObjectTemplates;
+ struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->objectEventTemplates;
s32 r9 = sub_810CE10(sVsSeekerData, gTrainerBattleOpponent_A);
if (r9 != -1)
{
s32 r8;
- for (r8 = 0; r8 < gMapHeader.events->mapObjectCount; r8++)
+ for (r8 = 0; r8 < gMapHeader.events->objectEventCount; r8++)
{
if ((r4[r8].trainerType == 1 || r4[r8].trainerType == 3) && r9 == sub_810CE10(sVsSeekerData, GetTrainerFlagFromScript(r4[r8].script)))
{
- struct MapObject *r4_2;
+ struct ObjectEvent *r4_2;
- TryGetFieldObjectIdByLocalIdAndMap(r4[r8].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0);
- r4_2 = &gMapObjects[sp0];
+ TryGetObjectEventIdByLocalIdAndMap(r4[r8].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0);
+ r4_2 = &gObjectEvents[sp0];
sub_810CF54(&r4[r8]); // You are using this function incorrectly. Please consult the manual.
sub_805FE7C(r4_2, gUnknown_8453F67[r4_2->facingDirection]);
gSaveBlock1Ptr->trainerRematches[r4[r8].localId] = 0;
- if (gSelectedEventObject == sp0)
+ if (gSelectedObjectEvent == sp0)
r4_2->animPattern = gUnknown_8453F67[r4_2->facingDirection];
else
r4_2->animPattern = 0x08;
@@ -1384,9 +1384,9 @@ static bool8 sub_810CED0(const VsSeekerData * a0, u16 a1)
bool8 sub_810CF04(u8 a0)
{
- struct MapObject *r1 = &gMapObjects[a0];
+ struct ObjectEvent *r1 = &gObjectEvents[a0];
- if (r1->active && gMapHeader.events->mapObjectCount >= r1->localId && gSprites[r1->spriteId].data[0] == a0)
+ if (r1->active && gMapHeader.events->objectEventCount >= r1->localId && gSprites[r1->spriteId].data[0] == a0)
return TRUE;
return FALSE;
}
@@ -1414,32 +1414,32 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId)
{
switch (graphicsId)
{
- case MAP_OBJ_GFX_LITTLE_GIRL:
- case MAP_OBJ_GFX_YOUNGSTER:
- case MAP_OBJ_GFX_BOY:
- case MAP_OBJ_GFX_BUG_CATCHER:
- case MAP_OBJ_GFX_LASS:
- case MAP_OBJ_GFX_WOMAN_1:
- case MAP_OBJ_GFX_BATTLE_GIRL:
- case MAP_OBJ_GFX_MAN:
- case MAP_OBJ_GFX_ROCKER:
- case MAP_OBJ_GFX_WOMAN_2:
- case MAP_OBJ_GFX_BEAUTY:
- case MAP_OBJ_GFX_BALDING_MAN:
- case MAP_OBJ_GFX_TUBER_F:
- case MAP_OBJ_GFX_CAMPER:
- case MAP_OBJ_GFX_PICNICKER:
- case MAP_OBJ_GFX_COOLTRAINER_M:
- case MAP_OBJ_GFX_COOLTRAINER_F:
- case MAP_OBJ_GFX_SWIMMER_M_LAND:
- case MAP_OBJ_GFX_SWIMMER_F_LAND:
- case MAP_OBJ_GFX_BLACKBELT:
- case MAP_OBJ_GFX_HIKER:
- case MAP_OBJ_GFX_SAILOR:
+ case OBJECT_EVENT_GFX_LITTLE_GIRL:
+ case OBJECT_EVENT_GFX_YOUNGSTER:
+ case OBJECT_EVENT_GFX_BOY:
+ case OBJECT_EVENT_GFX_BUG_CATCHER:
+ case OBJECT_EVENT_GFX_LASS:
+ case OBJECT_EVENT_GFX_WOMAN_1:
+ case OBJECT_EVENT_GFX_BATTLE_GIRL:
+ case OBJECT_EVENT_GFX_MAN:
+ case OBJECT_EVENT_GFX_ROCKER:
+ case OBJECT_EVENT_GFX_WOMAN_2:
+ case OBJECT_EVENT_GFX_BEAUTY:
+ case OBJECT_EVENT_GFX_BALDING_MAN:
+ case OBJECT_EVENT_GFX_TUBER_F:
+ case OBJECT_EVENT_GFX_CAMPER:
+ case OBJECT_EVENT_GFX_PICNICKER:
+ case OBJECT_EVENT_GFX_COOLTRAINER_M:
+ case OBJECT_EVENT_GFX_COOLTRAINER_F:
+ case OBJECT_EVENT_GFX_SWIMMER_M_LAND:
+ case OBJECT_EVENT_GFX_SWIMMER_F_LAND:
+ case OBJECT_EVENT_GFX_BLACKBELT:
+ case OBJECT_EVENT_GFX_HIKER:
+ case OBJECT_EVENT_GFX_SAILOR:
return 0x4e;
- case MAP_OBJ_GFX_TUBER_M_1:
- case MAP_OBJ_GFX_SWIMMER_M_WATER:
- case MAP_OBJ_GFX_SWIMMER_F_WATER:
+ case OBJECT_EVENT_GFX_TUBER_M_1:
+ case OBJECT_EVENT_GFX_SWIMMER_M_WATER:
+ case OBJECT_EVENT_GFX_SWIMMER_F_WATER:
return 0x4f;
default:
return 0x4d;
@@ -1508,7 +1508,7 @@ static bool8 IsTrainerVisibleOnScreen(struct VsSeekerTrainerInfo * trainerInfo)
&& x + 7 >= trainerInfo->xCoord
&& y - 5 <= trainerInfo->yCoord
&& y + 5 >= trainerInfo->yCoord
- && sub_810CF04(trainerInfo->fieldObjectId) == 1)
+ && sub_810CF04(trainerInfo->objectEventId) == 1)
return TRUE;
return FALSE;
}
@@ -1560,7 +1560,7 @@ static u8 GetRematchableTrainerLocalId(void)
static void StartTrainerObjectMovementScript(struct VsSeekerTrainerInfo * trainerInfo, const u8 * script)
{
- npc_sync_anim_pause_bits(&gMapObjects[trainerInfo->fieldObjectId]);
+ npc_sync_anim_pause_bits(&gObjectEvents[trainerInfo->objectEventId]);
ScriptMovement_StartObjectMovementScript(trainerInfo->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, script);
}
@@ -1596,9 +1596,9 @@ static void StartAllRespondantIdleMovements(void)
{
if (sVsSeeker->trainerInfo[j].trainerIdx == sVsSeeker->trainerIdxArray[i])
{
- struct MapObject *r4 = &gMapObjects[sVsSeeker->trainerInfo[j].fieldObjectId];
+ struct ObjectEvent *r4 = &gObjectEvents[sVsSeeker->trainerInfo[j].objectEventId];
- if (sub_810CF04(sVsSeeker->trainerInfo[j].fieldObjectId) == 1)
+ if (sub_810CF04(sVsSeeker->trainerInfo[j].objectEventId) == 1)
SetTrainerMovementType(r4, sVsSeeker->runningBehaviourEtcArray[i]);
sub_805FE7C(r4, sVsSeeker->runningBehaviourEtcArray[i]);
gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[j].localId] = GetNextAvailableRematchTrainer(sVsSeekerData, sVsSeeker->trainerInfo[j].trainerIdx, &dummy);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 18:50:45 +0000