Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge adjustments

Browse Source
This commit is contained in:
W1serV1ser committed 2022-07-06 00:15:30 -07:00
1 parent 59e91c9b5f
commit a716f522f3
1 file changed
+1 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_movement.c
+1 -3
View File
@@ -141,8 +141,6 @@ static u16 GetObjectEventFlagIdByObjectEventId(u8);
static void UpdateObjectEventVisibility(struct ObjectEvent *, struct Sprite *); static void UpdateObjectEventVisibility(struct ObjectEvent *, struct Sprite *);
static void MakeSpriteTemplateFromObjectEventTemplate(struct ObjectEventTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); static void MakeSpriteTemplateFromObjectEventTemplate(struct ObjectEventTemplate *, struct SpriteTemplate *, const struct SubspriteTable **);
static void GetObjectEventMovingCameraOffset(s16 *, s16 *); static void GetObjectEventMovingCameraOffset(s16 *, s16 *);
static void LoadObjectEventPalette(u16);
static struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8, u8, u8);
static void RemoveObjectEventIfOutsideView(struct ObjectEvent *); static void RemoveObjectEventIfOutsideView(struct ObjectEvent *);
static void SpawnObjectEventOnReturnToField(u8, s16, s16); static void SpawnObjectEventOnReturnToField(u8, s16, s16);
static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8); static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8);
@@ -2130,7 +2128,7 @@ u8 CreateVirtualObject(u16 graphicsId, u8 virtualObjId, s16 x, s16 y, u8 z, u8 d
sprite->oam.paletteNum = IndexOfSpritePaletteTag(spriteTemplate.paletteTag); sprite->oam.paletteNum = IndexOfSpritePaletteTag(spriteTemplate.paletteTag);
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
sprite->sVirtualObjId = virtualObjId; sprite->sVirtualObjId = virtualObjId;
sprite->sVirtualObjElev = elevation; sprite->sVirtualObjElev = z;
if (subspriteTables != NULL) if (subspriteTables != NULL)
{ {
SetSubspriteTables(sprite, subspriteTables); SetSubspriteTables(sprite, subspriteTables);