dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2020-01-19 20:21:53 -05:00
parent ea8b1011d3 a40f054900
commit 4c12ad00d2
30 changed files with 3398 additions and 7590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_movement.c
+7 -5
View File
@@ -1861,27 +1861,29 @@ const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId)
{
u8 bard;
if (graphicsId >= SPRITE_VAR)
if (graphicsId >= OBJ_EVENT_GFX_VARS)
{
graphicsId = VarGetObjectEventGraphicsId(graphicsId - SPRITE_VAR);
graphicsId = VarGetObjectEventGraphicsId(graphicsId - OBJ_EVENT_GFX_VARS);
}
if (graphicsId == OBJ_EVENT_GFX_BARD)
{
bard = GetCurrentMauvilleOldMan();
return gMauvilleOldManGraphicsInfoPointers[bard];
}
if (graphicsId >= NUM_OBJECT_GRAPHICS_INFO)
if (graphicsId >= NUM_OBJ_EVENT_GFX)
{
graphicsId = OBJ_EVENT_GFX_NINJA_BOY;
}
return gObjectEventGraphicsInfoPointers[graphicsId];
}
static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *objectEvent)
{
if (objectEvent->graphicsId >= SPRITE_VAR)
if (objectEvent->graphicsId >= OBJ_EVENT_GFX_VARS)
{
objectEvent->graphicsId = VarGetObjectEventGraphicsId(objectEvent->graphicsId - SPRITE_VAR);
objectEvent->graphicsId = VarGetObjectEventGraphicsId(objectEvent->graphicsId - OBJ_EVENT_GFX_VARS);
}
}