diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-30 07:48:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 07:48:45 -0500 |
| commit | d1965e3c751b77243c11d62eadc994422dc682ae (patch) | |
| tree | 61ee8faf9f1fc7569efa086f2108b7f886e49127 /src/field_special_scene.c | |
| parent | b8f90052a58d1781ef40e2a4b7decf4ca4ed62b8 (diff) | |
| parent | 9680b95bdde1226e12485a84e47c6a7c32932048 (diff) | |
Merge pull request #618 from huderlem/objMovement
Document event object movement
Diffstat (limited to 'src/field_special_scene.c')
| -rw-r--r-- | src/field_special_scene.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/field_special_scene.c b/src/field_special_scene.c index c710547d3..cf67aa361 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -26,8 +26,8 @@ enum STEP_END = 0xFE, }; -const u32 gMapObjectPic_MovingBox[] = INCBIN_U32("graphics/map_objects/pics/misc/moving_box.4bpp"); -const u16 gMapObjectPalette19[] = INCBIN_U16("graphics/map_objects/palettes/19.gbapal"); +const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); +const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/19.gbapal"); static const s8 gTruckCamera_HorizontalTable[] = { @@ -348,24 +348,24 @@ void Task_HandlePorthole(u8 taskId) void sub_80C78A0(void) { - u8 spriteId = AddPseudoFieldObject(0x8C, SpriteCallbackDummy, 112, 80, 0); + u8 spriteId = AddPseudoEventObject(0x8C, SpriteCallbackDummy, 112, 80, 0); gSprites[spriteId].coordOffsetEnabled = FALSE; if (VarGet(VAR_PORTHOLE_STATE) == 2) { - StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(4)); + StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(4)); } else { - StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(3)); + StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(3)); } } void sub_80C791C(void) { sub_80C78A0(); - gMapObjects[gPlayerAvatar.mapObjectId].invisible = TRUE; + gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; pal_fill_black(); CreateTask(Task_HandlePorthole, 80); ScriptContext2_Enable(); |