diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/contest.h | 1 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 56 | ||||
| -rw-r--r-- | include/pokemon.h | 1 |
3 files changed, 2 insertions, 56 deletions
diff --git a/include/contest.h b/include/contest.h index 969ae51dd..ef8069367 100644 --- a/include/contest.h +++ b/include/contest.h @@ -8,6 +8,7 @@ enum CONTEST_CATEGORY_CUTE, CONTEST_CATEGORY_SMART, CONTEST_CATEGORY_TOUGH, + CONTEST_CATEGORIES_COUNT, }; enum diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 2ac149088..0c2deb8be 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -1,8 +1,6 @@ #ifndef GUARD_FIELD_PLAYER_AVATAR_H #define GUARD_FIELD_PLAYER_AVATAR_H -#include "task.h" - enum { PLAYER_AVATAR_STATE_NORMAL, PLAYER_AVATAR_STATE_MACH_BIKE, @@ -16,35 +14,8 @@ enum { // MovementType_None2 void player_step(u8 a, u16 b, u16 c); -u8 ForcedMovement_None(void); -u8 ForcedMovement_Slip(void); -u8 ForcedMovement_WalkSouth(void); -u8 ForcedMovement_WalkNorth(void); -u8 ForcedMovement_WalkWest(void); -u8 ForcedMovement_WalkEast(void); -u8 ForcedMovement_RideCurrentSouth(void); -u8 ForcedMovement_RideCurrentNorth(void); -u8 ForcedMovement_RideCurrentWest(void); -u8 ForcedMovement_RideCurrentEast(void); -u8 ForcedMovement_SlideSouth(void); -u8 ForcedMovement_SlideNorth(void); -u8 ForcedMovement_SlideWest(void); -u8 ForcedMovement_SlideEast(void); -u8 ForcedMovement_SecretBaseJumpMat(void); -u8 ForcedMovement_SecretBaseSpinMat(void); -u8 ForcedMovement_MuddySlope(void); -void PlayerNotOnBikeNotMoving(u8 direction, u16 heldKeys); -void PlayerNotOnBikeTurningInPlace(u8 direction, u16 heldKeys); -void sub_8058D0C(u8 direction, u16 heldKeys); u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e); void SetPlayerAvatarTransitionFlags(u16 a); -void nullsub_49(struct EventObject *a); -void PlayerAvatarTransition_Normal(struct EventObject *a); -void PlayerAvatarTransition_MachBike(struct EventObject *a); -void PlayerAvatarTransition_AcroBike(struct EventObject *a); -void PlayerAvatarTransition_Surfing(struct EventObject *a); -void PlayerAvatarTransition_Underwater(struct EventObject *a); -void sub_80591F4(struct EventObject *a); void sub_8059204(void); u8 PlayerGetCopyableMovement(void); void PlayerSetAnimId(u8 a, u8 b); @@ -52,7 +23,6 @@ void PlayerGoSpeed1(u8 a); void PlayerGoSpeed2(u8 a); void PlayerRideWaterCurrent(u8 a); void PlayerGoSpeed4(u8 a); -void sub_805940C(u8 a); void PlayerOnBikeCollide(u8); void PlayerFaceDirection(u8 a); void PlayerTurnInPlace(u8 a); @@ -92,34 +62,8 @@ void SetPlayerAvatarExtraStateTransition(u8 a, u8 b); void InitPlayerAvatar(s16 a, s16 b, u8 c, u8 d); void sub_8059B88(u8); void sub_8059BF4(void); -// sub_8059C3C void sub_8059C94(u8); void sub_8059D08(u8); -u8 sub_8059E84(struct Task *task, struct EventObject *b, struct EventObject *c); -u8 sub_8059EA4(struct Task *task, struct EventObject *b, struct EventObject *c); -u8 sub_8059F40(struct Task *task, struct EventObject *b, struct EventObject *c); -u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject); -u8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject); -u8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject); -u8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject); -u8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject); -void sub_805A20C(u8 a); void StartFishing(u8 a); -u8 Fishing1(struct Task *task); -u8 Fishing2(struct Task *task); -u8 Fishing3(struct Task *task); -u8 Fishing4(struct Task *task); -u8 Fishing5(struct Task *task); -u8 Fishing6(struct Task *task); -u8 Fishing7(struct Task *task); -u8 Fishing8(struct Task *task); -u8 Fishing9(struct Task *task); -u8 Fishing10(struct Task *task); -u8 Fishing11(struct Task *task); -u8 Fishing12(struct Task *task); -u8 Fishing13(struct Task *task); -u8 Fishing14(struct Task *task); -u8 Fishing15(struct Task *task); -u8 Fishing16(struct Task *task); #endif diff --git a/include/pokemon.h b/include/pokemon.h index 67ce267ab..67816b8f0 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -117,6 +117,7 @@ #define TYPE_ICE 0x0f #define TYPE_DRAGON 0x10 #define TYPE_DARK 0x11 +#define NUMBER_OF_MON_TYPES 0x12 #define FRIENDSHIP_EVENT_GROW_LEVEL 0x0 #define FRIENDSHIP_EVENT_VITAMIN 0x1 // unused |