diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/event_objects.h | 16 | ||||
| -rw-r--r-- | include/constants/global.h | 4 | ||||
| -rw-r--r-- | include/event_object_movement.h | 2 | ||||
| -rw-r--r-- | include/field_effect.h | 2 | ||||
| -rw-r--r-- | include/field_effect_helpers.h | 15 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 2 |
6 files changed, 32 insertions, 9 deletions
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index cccba35ff..2e9fcaa83 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -6,15 +6,15 @@ #define OBJ_EVENT_GFX_RED_SURF 2 #define OBJ_EVENT_GFX_RED_ITEM 3 #define OBJ_EVENT_GFX_RED_FISH 4 -#define OBJ_EVENT_GFX_RED_ITEM_COPY 5 -#define OBJ_EVENT_GFX_RED_FIELD_MOVE_BIKE 6 +#define OBJ_EVENT_GFX_RED_VS_SEEKER 5 +#define OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE 6 #define OBJ_EVENT_GFX_GREEN_NORMAL 7 #define OBJ_EVENT_GFX_GREEN_BIKE 8 #define OBJ_EVENT_GFX_GREEN_SURF 9 #define OBJ_EVENT_GFX_GREEN_ITEM 10 #define OBJ_EVENT_GFX_GREEN_FISH 11 -#define OBJ_EVENT_GFX_GREEN_ITEM_COPY 12 -#define OBJ_EVENT_GFX_GREEN_FIELD_MOVE_BIKE 13 +#define OBJ_EVENT_GFX_GREEN_VS_SEEKER 12 +#define OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE 13 #define OBJ_EVENT_GFX_RS_BRENDAN 14 #define OBJ_EVENT_GFX_RS_MAY 15 #define OBJ_EVENT_GFX_LITTLE_BOY 16 @@ -37,9 +37,9 @@ #define OBJ_EVENT_GFX_OLD_MAN_2 33 #define OBJ_EVENT_GFX_OLD_MAN_LYING_DOWN 34 #define OBJ_EVENT_GFX_OLD_WOMAN 35 -#define OBJ_EVENT_GFX_TUBER_M_1 36 +#define OBJ_EVENT_GFX_TUBER_M_WATER 36 #define OBJ_EVENT_GFX_TUBER_F 37 -#define OBJ_EVENT_GFX_TUBER_M_2 38 +#define OBJ_EVENT_GFX_TUBER_M_LAND 38 #define OBJ_EVENT_GFX_CAMPER 39 #define OBJ_EVENT_GFX_PICNICKER 40 #define OBJ_EVENT_GFX_COOLTRAINER_M 41 @@ -154,12 +154,12 @@ #define OBJ_EVENT_GFX_DEOXYS_N 150 #define OBJ_EVENT_GFX_SS_ANNE 151 -#define NUM_OBJ_EVENT_GFX 239 +#define NUM_OBJ_EVENT_GFX 152 // These are dynamic object gfx ids. // They correspond with the values of the VAR_OBJ_GFX_ID_X vars. // More info about them in include/constants/vars.h -#define OBJ_EVENT_GFX_VARS (NUM_OBJ_EVENT_GFX + 1) +#define OBJ_EVENT_GFX_VARS 240 #define OBJ_EVENT_GFX_VAR_0 (OBJ_EVENT_GFX_VARS + 0x0) // 240 #define OBJ_EVENT_GFX_VAR_1 (OBJ_EVENT_GFX_VARS + 0x1) #define OBJ_EVENT_GFX_VAR_2 (OBJ_EVENT_GFX_VARS + 0x2) diff --git a/include/constants/global.h b/include/constants/global.h index 28fe660e3..f8cfaa4b0 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -78,5 +78,9 @@ #define DIR_NORTH 2 #define DIR_WEST 3 #define DIR_EAST 4 +#define DIR_SOUTHWEST 5 +#define DIR_SOUTHEAST 6 +#define DIR_NORTHWEST 7 +#define DIR_NORTHEAST 8 #endif //GUARD_CONSTANTS_GLOBAL_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 496b2f245..34247c3a5 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -132,6 +132,7 @@ u8 GetWalkFastestMovementAction(u32); u8 sub_8063F2C(u32 direction); u8 GetTrainerFacingDirectionMovementType(u8 direction); u8 GetFaceDirectionMovementAction(u32); +u8 GetFaceDirectionFastMovementAction(u32); void CameraObjectSetFollowedObjectId(u8 objectId); void UnfreezeObjectEvents(void); void sub_8069058(u8, u8); @@ -189,6 +190,7 @@ bool8 sub_8068CB4(struct Sprite *sprite); void SetAndStartSpriteAnim(struct Sprite *, u8, u8); bool8 SpriteAnimEnded(struct Sprite *); u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent); +u8 GetMoveDirectionAnimNum(u8 direction); // Exported data declarations diff --git a/include/field_effect.h b/include/field_effect.h index 59de741be..40c58f44e 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -25,5 +25,7 @@ void FreeResourcesAndDestroySprite(struct Sprite * sprite, u8 spriteId); u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused); void ReturnToFieldFromFlyMapSelect(void); void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); +void SpriteCB_PopOutOfAsh(struct Sprite * sprite); +void SpriteCB_LavaridgeGymWarp(struct Sprite * sprite); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 4505b2e48..a842c5dc6 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -25,5 +25,20 @@ u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y); void SetSpriteInvisible(u8 spriteId); void sub_80DC4A4(u8 spriteId, u8 value, s16 data1); +void sub_80DCCE0(struct Sprite * sprite); +void UpdateShadowFieldEffect(struct Sprite * sprite); +void UpdateBubblesFieldEffect(struct Sprite * sprite); +void UpdateSparkleFieldEffect(struct Sprite * sprite); +void UpdateTallGrassFieldEffect(struct Sprite * sprite); +void WaitFieldEffectSpriteAnim(struct Sprite * sprite); +void UpdateAshFieldEffect(struct Sprite * sprite); +void UpdateSurfBlobFieldEffect(struct Sprite * sprite); +void UpdateFootprintsTireTracksFieldEffect(struct Sprite * sprite); +void UpdateSplashFieldEffect(struct Sprite * sprite); +void UpdateShortGrassFieldEffect(struct Sprite * sprite); +void UpdateLongGrassFieldEffect(struct Sprite * sprite); +void UpdateSandPileFieldEffect(struct Sprite * sprite); +void UpdateDisguiseFieldEffect(struct Sprite * sprite); +void UpdateHotSpringsWaterFieldEffect(struct Sprite * sprite); #endif //GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 90e2baaaf..b88952038 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -52,7 +52,7 @@ void PlayerRunSlow(u8 direction); void PlayerOnBikeCollide(u8 direction); void PlayerNotOnBikeCollide(u8 direction); void PlayerFaceDirection(u8 direction); -void sub_805C20C(u8 direction); +void PlayerFaceDirectionFast(u8 direction); void PlayerTurnInPlace(u8 direction); void PlayerJumpLedge(u8 direction); void sub_805C260(void); |