summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/berry.h12
-rw-r--r--include/event_data.h2
-rw-r--r--include/field_effect_helpers.h2
-rw-r--r--include/field_ground_effect.h8
-rw-r--r--include/field_map_obj.h66
-rw-r--r--include/field_map_obj_helpers.h2
-rw-r--r--include/fieldmap.h6
-rw-r--r--include/global.fieldmap.h26
-rw-r--r--include/global.h10
-rw-r--r--include/map_obj_80688E4.h4
-rw-r--r--include/map_obj_8097404.h8
-rw-r--r--include/map_obj_lock.h4
-rw-r--r--include/overworld.h10
-rw-r--r--include/quest_log_815A008.h2
-rw-r--r--include/rom_81BE66C.h2
-rw-r--r--include/save_location.h2
-rw-r--r--include/trainer_see.h4
17 files changed, 85 insertions, 85 deletions
diff --git a/include/berry.h b/include/berry.h
index d55192301..5bf272d42 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -25,7 +25,7 @@ enum
#define NUM_BERRIES 44
-extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[NUM_BERRIES];
+extern const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[NUM_BERRIES];
extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[NUM_BERRIES];
extern const u8 *const gBerryTreePaletteSlotTablePointers[NUM_BERRIES];
@@ -35,7 +35,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
bool32 IsEnigmaBerryValid(void);
const struct Berry *GetBerryInfo(u8 berry);
struct BerryTree *GetBerryTreeInfo(u8 id);
-bool32 FieldObjectInteractionWaterBerryTree(void);
+bool32 ObjectEventInteractionWaterBerryTree(void);
bool8 IsPlayerFacingPlantedBerryTree(void);
bool8 TryToWaterBerryTree(void);
void ClearBerryTrees(void);
@@ -56,10 +56,10 @@ u8 CalcBerryYield(struct BerryTree *tree);
u8 GetBerryCountByBerryTreeId(u8 id);
u16 GetStageDurationByBerryType(u8);
void Bag_ChooseBerry(void);
-void FieldObjectInteractionGetBerryTreeData(void);
-void FieldObjectInteractionPlantBerryTree(void);
-void FieldObjectInteractionPickBerryTree(void);
-void FieldObjectInteractionRemoveBerryTree(void);
+void ObjectEventInteractionGetBerryTreeData(void);
+void ObjectEventInteractionPlantBerryTree(void);
+void ObjectEventInteractionPickBerryTree(void);
+void ObjectEventInteractionRemoveBerryTree(void);
u8 PlayerHasBerries(void);
void ResetBerryTreeSparkleFlags(void);
void sub_809C794(void);
diff --git a/include/event_data.h b/include/event_data.h
index 719ba37b2..7987720f1 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -46,7 +46,7 @@ bool32 CanResetRTC(void);
u16 *GetVarPointer(u16 id);
u16 VarGet(u16 id);
bool8 VarSet(u16 id, u16 value);
-u8 VarGetFieldObjectGraphicsId(u8 id);
+u8 VarGetObjectEventGraphicsId(u8 id);
u8 *GetFlagPointer(u16 id);
u8 FlagSet(u16 id);
u8 FlagClear(u16 id);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 5cd29fc5b..f2a4f83a7 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -13,7 +13,7 @@
// Exported ROM declarations
u8 sub_8154228(void);
-bool8 sub_8155DA0(struct MapObject *);
+bool8 sub_8155DA0(struct ObjectEvent *);
void sub_80DC44C(u8, u8);
#endif //GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h
index 49448db6a..1233dec69 100644
--- a/include/field_ground_effect.h
+++ b/include/field_ground_effect.h
@@ -16,9 +16,9 @@ void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
void InitObjectPriorityByZCoord(struct Sprite *, u8);
bool8 IsZCoordMismatchAt(u8, s16, s16);
bool8 AreZCoordsCompatible(u8, u8);
-void FieldObjectUpdateSubpriority(struct MapObject *, struct Sprite *);
-void DoGroundEffects_OnSpawn(struct MapObject *, struct Sprite *);
-void DoGroundEffects_OnBeginStep(struct MapObject *, struct Sprite *);
-void DoGroundEffects_OnFinishStep(struct MapObject *, struct Sprite *);
+void ObjectEventUpdateSubpriority(struct ObjectEvent *, struct Sprite *);
+void DoGroundEffects_OnSpawn(struct ObjectEvent *, struct Sprite *);
+void DoGroundEffects_OnBeginStep(struct ObjectEvent *, struct Sprite *);
+void DoGroundEffects_OnFinishStep(struct ObjectEvent *, struct Sprite *);
#endif //GUARD_FIELD_GROUND_EFFECT_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 6177cba1c..e962c39e7 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -27,12 +27,12 @@ enum SpinnerRunnerFollowPatterns {
// Exported ROM declarations
void sub_808D438(void);
-u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8);
-bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
-u8 GetFieldObjectIdByXY(s16, s16);
-void FieldObjectSetDirection(struct MapObject *, u8);
+u8 GetObjectEventIdByLocalIdAndMap(u8, u8, u8);
+bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *);
+u8 GetObjectEventIdByXY(s16, s16);
+void ObjectEventSetDirection(struct ObjectEvent *, u8);
u8 sub_808D4F4(void);
-void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
+void RemoveObjectEventByLocalIdAndMap(u8, u8, u8);
void npc_load_two_palettes__no_record(u16, u8);
void npc_load_two_palettes__and_record(u16, u8);
void sub_805F7C4(u8, u8, u8, s16, s16);
@@ -40,59 +40,59 @@ void pal_patch_for_npc(u16, u8);
void sub_808E16C(s16, s16);
void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
void sub_8092FF0(s16, s16, s16 *, s16 *);
-u8 FieldObjectDirectionToImageAnimId(u8);
+u8 ObjectEventDirectionToImageAnimId(u8);
void sub_80930E0(s16 *, s16 *, s16, s16);
-void FieldObjectClearAnim(struct MapObject *);
-void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);
-void SpawnFieldObjectsInView(s16, s16);
+void ObjectEventClearAnim(struct ObjectEvent *);
+void ObjectEventClearAnimIfSpecialAnimActive(struct ObjectEvent *);
+void SpawnObjectEventsInView(s16, s16);
u8 sprite_new(u8, u8, s16, s16, u8, u8);
u8 AddPseudoEventObject(u16, SpriteCallback, s16, s16, u8);
u8 show_sprite(u8, u8, u8);
-u8 SpawnSpecialFieldObjectParameterized(u8, u8, u8, s16, s16, u8);
-u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
+u8 SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8);
+u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *);
void sub_8093038(s16, s16, s16 *, s16 *);
void CameraObjectReset1(void);
void CameraObjectReset2(void);
-void FieldObjectSetGraphicsId(struct MapObject *, u8);
-void FieldObjectTurn(struct MapObject *, u8);
-void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
-void FieldObjectForceSetSpecialAnim(struct MapObject *, u8);
+void ObjectEventSetGraphicsId(struct ObjectEvent *, u8);
+void ObjectEventTurn(struct ObjectEvent *, u8);
+void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8);
+void ObjectEventForceSetSpecialAnim(struct ObjectEvent *, u8);
u8 sub_8064270(u8 a0);
-const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
+const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8);
void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
void gpu_pal_allocator_reset__manage_upper_four(void);
void sub_808E82C(u8, u8, u8, s16, s16);
void sub_805F400(u8, u8, u8);
void sub_805F3A8(u8, u8, u8, u8);
void sub_808E75C(s16, s16);
-void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *);
-void npc_coords_shift(struct MapObject *, s16, s16);
-void sub_808EB08(struct MapObject *, s16, s16);
+void ObjectEventGetLocalIdAndMap(struct ObjectEvent *, u8 *, u8 *, u8 *);
+void npc_coords_shift(struct ObjectEvent *, s16, s16);
+void sub_808EB08(struct ObjectEvent *, s16, s16);
void sub_805FE94(u8, u8, u8);
-void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *));
-u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
+void ObjectEventStep(struct ObjectEvent *, struct Sprite *, bool8(struct ObjectEvent *, struct Sprite *));
+u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8);
u8 GetOppositeDirection(u8);
u8 GetStepInPlaceDelay4AnimId(u32);
u8 GetStepInPlaceDelay8AnimId(u32);
u8 GetStepInPlaceDelay16AnimId(u32);
u8 GetStepInPlaceDelay32AnimId(u32);
-u8 npc_block_way(struct MapObject *, s16, s16, u32);
+u8 npc_block_way(struct ObjectEvent *, s16, s16, u32);
void MoveCoords(u8, s16 *, s16 *);
-bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
-u8 FieldObjectClearHeldMovementIfFinished(struct MapObject *);
-u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
-void sub_8063E28(struct MapObject *, struct Sprite *);
-void FieldObjectSetHeldMovement(struct MapObject *, u8);
-void npc_coords_shift_still(struct MapObject *);
-void sub_805FE7C(struct MapObject *, u8);
-void SetTrainerMovementType(struct MapObject *, u8);
+bool8 ObjectEventIsSpecialAnimActive(struct ObjectEvent *);
+u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *);
+u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z);
+void sub_8063E28(struct ObjectEvent *, struct Sprite *);
+void ObjectEventSetHeldMovement(struct ObjectEvent *, u8);
+void npc_coords_shift_still(struct ObjectEvent *);
+void sub_805FE7C(struct ObjectEvent *, u8);
+void SetTrainerMovementType(struct ObjectEvent *, u8);
u8 sub_80634F0(u8 direction);
u8 sub_8063500(u8 a0);
-void EventObjectSetGraphicsId(struct MapObject *mapObject, u8 a1);
+void EventObjectSetGraphicsId(struct ObjectEvent *mapObject, u8 a1);
u8 sub_805EB44(u8, u8, s16, s16);
void npc_paltag_set_load(u8 mode);
-bool8 FieldObjectIsMovementOverridden(struct MapObject *mapObject);
-u8 FieldObjectCheckHeldMovementStatus(struct MapObject *mapObject);
+bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *mapObject);
+u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *mapObject);
u8 sub_8063F84(u8 direction);
u8 GetTrainerFacingDirectionMovementType(u8 direction);
void CameraObjectSetFollowedObjectId(u8 spriteId);
diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h
index cd1b19eaf..dec3639ef 100644
--- a/include/field_map_obj_helpers.h
+++ b/include/field_map_obj_helpers.h
@@ -3,7 +3,7 @@
#include "global.h"
-void UnfreezeMapObjects(void);
+void UnfreezeObjectEvents(void);
void sub_8069058(u8, u8);
#endif
diff --git a/include/fieldmap.h b/include/fieldmap.h
index f1107100f..1560a0841 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -11,8 +11,8 @@
#define NUM_PALS_TOTAL 13
#define VIRTUAL_MAP_SIZE 0x2800
-extern struct BackupMapData VMap;
-extern const struct MapData Route1_Layout;
+extern struct BackupMapLayout VMap;
+extern const struct MapLayout Route1_Layout;
u32 MapGridGetMetatileIdAt(int, int);
u32 MapGridGetMetatileBehaviorAt(int, int);
@@ -23,7 +23,7 @@ void GetCameraCoords(u16*, u16*);
bool8 MapGridIsImpassableAt(s32, s32);
s32 GetMapBorderIdAt(s32, s32);
bool32 CanCameraMoveInDirection(s32);
-u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr);
+u32 GetBehaviorByMetatileIdAndMapLayout(struct MapLayout *mapLayout, u16 metatile, u8 attr);
const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection);
struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y);
void sub_8059948(u8 a0, u8 a1);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 186185104..72970f28a 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -26,7 +26,7 @@ struct Tileset
/*0x14*/ void *metatileAttributes;
};
-struct MapData
+struct MapLayout
{
/*0x00*/ s32 width;
/*0x04*/ s32 height;
@@ -38,14 +38,14 @@ struct MapData
/*0x19*/ u8 unk19;
};
-struct BackupMapData
+struct BackupMapLayout
{
s32 Xsize;
s32 Ysize;
u16 *map;
};
-union __attribute__((packed)) MapObjectRange {
+union __attribute__((packed)) ObjectEventRange {
u8 as_byte;
struct __attribute__((packed)) {
u8 x:4;
@@ -53,7 +53,7 @@ union __attribute__((packed)) MapObjectRange {
} __attribute__((aligned (1))) as_nybbles;
} __attribute__((aligned (1)));
-struct MapObjectTemplate
+struct ObjectEventTemplate
{
/*0x00*/ u8 localId;
/*0x01*/ u8 graphicsId;
@@ -123,12 +123,12 @@ struct BgEvent
struct MapEvents
{
- u8 mapObjectCount;
+ u8 objectEventCount;
u8 warpCount;
u8 coordEventCount;
u8 bgEventCount;
- struct MapObjectTemplate *mapObjects;
+ struct ObjectEventTemplate *objectEvents;
struct WarpEvent *warps;
struct CoordEvent *coordEvents;
struct BgEvent *bgEvents;
@@ -150,12 +150,12 @@ struct MapConnections
struct MapHeader
{
- /* 0x00 */ struct MapData *mapData;
+ /* 0x00 */ struct MapLayout *mapLayout;
/* 0x04 */ struct MapEvents *events;
/* 0x08 */ u8 *mapScripts;
/* 0x0C */ struct MapConnections *connections;
/* 0x10 */ u16 music;
- /* 0x12 */ u16 mapDataId;
+ /* 0x12 */ u16 mapLayoutId;
/* 0x14 */ u8 regionMapSectionId;
/* 0x15 */ u8 cave;
/* 0x16 */ u8 weather;
@@ -166,7 +166,7 @@ struct MapHeader
/* 0x1B */ u8 battleType;
};
-struct MapObject
+struct ObjectEvent
{
/*0x00*/ u32 active:1;
u32 mapobj_bit_1:1;
@@ -214,7 +214,7 @@ struct MapObject
/*0x14*/ struct Coords16 coords3;
/*0x18*/ u8 facingDirection:4; //current direction?
/*0x18*/ u8 placeholder18:4;
- /*0x19*/ union MapObjectRange range;
+ /*0x19*/ union ObjectEventRange range;
/*0x1A*/ u8 mapobj_unk_1A;
/*0x1B*/ u8 mapobj_unk_1B;
/*0x1C*/ u8 mapobj_unk_1C;
@@ -227,7 +227,7 @@ struct MapObject
/*size = 0x24*/
};
-struct MapObjectGraphicsInfo
+struct ObjectEventGraphicsInfo
{
/*0x00*/ u16 tileTag;
/*0x02*/ u16 paletteTag1;
@@ -309,8 +309,8 @@ struct Camera
s32 y;
};
-extern struct MapObject gMapObjects[NUM_FIELD_OBJECTS];
-extern u8 gSelectedEventObject;
+extern struct ObjectEvent gObjectEvents[NUM_FIELD_OBJECTS];
+extern u8 gSelectedObjectEvent;
extern struct MapHeader gMapHeader;
extern struct PlayerAvatar gPlayerAvatar;
extern struct Camera gCamera;
diff --git a/include/global.h b/include/global.h
index 9df153270..ea94512f7 100644
--- a/include/global.h
+++ b/include/global.h
@@ -564,7 +564,7 @@ union QuestLogMovement
} ident_struct;
};
-struct QuestLogMapObject
+struct QuestLogObjectEvent
{
/*0x00*/ u8 active:1;
/*0x00*/ u8 mapobj_bit_3:1;
@@ -609,7 +609,7 @@ struct QuestLog
/*0x0003*/ s8 unk_003;
/*0x0004*/ s16 unk_004;
/*0x0006*/ s16 unk_006;
- /*0x0008*/ struct QuestLogMapObject unk_008[MAP_OBJECTS_COUNT];
+ /*0x0008*/ struct QuestLogObjectEvent unk_008[MAP_OBJECTS_COUNT];
// These arrays hold the game state for
// playing back the quest log
@@ -727,7 +727,7 @@ struct SaveBlock1
/*0x002E*/ u8 weather;
/*0x002F*/ u8 filler_2F;
/*0x0030*/ u8 flashLevel;
- /*0x0032*/ u16 mapDataId;
+ /*0x0032*/ u16 mapLayoutId;
/*0x0034*/ u8 playerPartyCount;
/*0x0038*/ struct Pokemon playerParty[PARTY_SIZE];
/*0x0290*/ u32 money;
@@ -744,8 +744,8 @@ struct SaveBlock1
/*0x0632*/ u8 field_632[6]; // unused?
/*0x0638*/ u16 trainerRematchStepCounter;
/*0x063A*/ u8 ALIGNED(2) trainerRematches[100];
- /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
- /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64];
+ /*0x06A0*/ struct ObjectEvent objectEvents[MAP_OBJECTS_COUNT];
+ /*0x08E0*/ struct ObjectEventTemplate mapObjectTemplates[64];
/*0x0EE0*/ u8 flags[FLAGS_COUNT];
/*0x1000*/ u16 vars[VARS_COUNT];
/*0x1200*/ u32 gameStats[NUM_GAME_STATS];
diff --git a/include/map_obj_80688E4.h b/include/map_obj_80688E4.h
index bfd5dd3c7..7132d2aa8 100644
--- a/include/map_obj_80688E4.h
+++ b/include/map_obj_80688E4.h
@@ -4,7 +4,7 @@
#include "global.h"
void FreezeEventObjects(void);
-void FreezeMapObject(struct MapObject *);
-void FreezeMapObjectsExceptOne(u8 mapObjectId);
+void FreezeObjectEvent(struct ObjectEvent *);
+void FreezeObjectEventsExceptOne(u8 objEventId);
#endif //GUARD_MAP_OBJ_80688E4_H
diff --git a/include/map_obj_8097404.h b/include/map_obj_8097404.h
index ad90bed9c..84ecbf26f 100644
--- a/include/map_obj_8097404.h
+++ b/include/map_obj_8097404.h
@@ -14,21 +14,21 @@ extern void *gUnknown_020375B8;
// Exported ROM declarations
void sub_8097AC8(struct Sprite *);
-void npc_sync_anim_pause_bits(struct MapObject *);
+void npc_sync_anim_pause_bits(struct ObjectEvent *);
void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
-u8 sub_8097F78(struct MapObject *);
+u8 sub_8097F78(struct ObjectEvent *);
bool8 obj_npc_ministep(struct Sprite *sprite);
bool8 sub_80976EC(struct Sprite *sprite);
void sub_80976DC(struct Sprite *, u8);
void sub_809783C(struct Sprite *, u8, u8, u8);
-void DoShadowFieldEffect(struct MapObject *);
+void DoShadowFieldEffect(struct ObjectEvent *);
u8 sub_809785C(struct Sprite *);
u8 sub_80978E4(struct Sprite *);
void obj_anim_image_set_and_seek(struct Sprite *, u8, u8);
bool8 sub_80979BC(struct Sprite *);
void sub_8097750(struct Sprite *);
bool8 sub_8097758(struct Sprite *);
-void sub_8097FA4(struct MapObject *);
+void sub_8097FA4(struct ObjectEvent *);
void sub_8098044(u8);
#endif //GUARD_MAP_OBJ_8097404_H
diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h
index 0d130973b..12e0eae53 100644
--- a/include/map_obj_lock.h
+++ b/include/map_obj_lock.h
@@ -4,9 +4,9 @@
#include "global.h"
bool8 sub_8069590(void);
-void ScriptFreezeMapObjects(void);
+void ScriptFreezeObjectEvents(void);
bool8 sub_8069648(void);
-void LockSelectedMapObject(void);
+void LockSelectedObjectEvent(void);
void sub_8098630(void);
bool8 sub_8098734(void);
void sub_80696C0(void);
diff --git a/include/overworld.h b/include/overworld.h
index ab20d9ff0..c6f1595d3 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -10,7 +10,7 @@ struct UnkPlayerStruct
u8 player_field_1;
};
-struct LinkPlayerMapObject
+struct LinkPlayerObjectEvent
{
u8 active;
u8 linkPlayerId;
@@ -32,7 +32,7 @@ struct CreditsOverworldCmd
extern struct UCoords32 gDirectionToVectors[];
-extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
+extern struct LinkPlayerObjectEvent gLinkPlayerMapObjects[4];
extern MainCallback gFieldCallback;
extern struct WarpData gUnknown_2031DB4;
@@ -73,7 +73,7 @@ bool32 IsUpdateLinkStateCBActive(void);
void strange_npc_table_clear(void);
const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16, u16);
-void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
+void ObjectEventMoveDestCoords(struct ObjectEvent *, u32, s16 *, s16 *);
void sub_8086230(void);
void CB2_ReturnToField(void);
bool32 sub_8087598(void);
@@ -99,11 +99,11 @@ void Overworld_PlaySpecialMapMusic(void);
u8 GetCurrentRegionMapSectionId(void);
-void SetCurrentMapLayout(u16 mapDataId);
+void SetCurrentMapLayout(u16 mapLayoutId);
void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y);
void ResetInitialPlayerAvatarState(void);
-void sub_8055D40(u16 mapDataId);
+void sub_8055D40(u16 mapLayoutId);
void CleanupOverworldWindowsAndTilemaps(void);
u32 ComputeWhiteOutMoneyLoss(void);
diff --git a/include/quest_log_815A008.h b/include/quest_log_815A008.h
index 2577450a4..72613be86 100644
--- a/include/quest_log_815A008.h
+++ b/include/quest_log_815A008.h
@@ -4,6 +4,6 @@
#include "global.h"
void sub_815A008(struct QuestLog *);
-void sub_815A1F8(struct QuestLog *, struct MapObjectTemplate *);
+void sub_815A1F8(struct QuestLog *, struct ObjectEventTemplate *);
#endif //GUARD_QUEST_LOG_815A008_H
diff --git a/include/rom_81BE66C.h b/include/rom_81BE66C.h
index fa439d8da..17b02ffa4 100644
--- a/include/rom_81BE66C.h
+++ b/include/rom_81BE66C.h
@@ -8,7 +8,7 @@
#include "global.h"
bool32 InTrainerHill(void);
-bool8 FieldObjectIsFarawayIslandMew(struct MapObject *);
+bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *);
u32 sub_81D427C(void);
#endif //GUARD_ROM_81BE66C_H
diff --git a/include/save_location.h b/include/save_location.h
index 4e01c64e4..fb71ab728 100644
--- a/include/save_location.h
+++ b/include/save_location.h
@@ -12,4 +12,4 @@ bool32 IsCurMapPokeCenter(void);
void sub_810B810(void);
void sub_810B82C(void);
-#endif // GUARD_SAVE_LOCATION_H \ No newline at end of file
+#endif // GUARD_SAVE_LOCATION_H
diff --git a/include/trainer_see.h b/include/trainer_see.h
index f87189377..511edf404 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -3,8 +3,8 @@
#include "global.h"
-void sub_80B4578(struct MapObject *);
+void sub_80B4578(struct ObjectEvent *);
u8 sub_80B47BC(void);
-void sub_8155D78(struct MapObject *);
+void sub_8155D78(struct ObjectEvent *);
#endif //GUARD_TRAINER_SEE_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 03:39:33 +0000