diff options
| author | cbt6 <91667135+cbt6@users.noreply.github.com> | 2022-02-10 01:53:48 +0800 |
|---|---|---|
| committer | cbt6 <91667135+cbt6@users.noreply.github.com> | 2022-02-10 01:53:48 +0800 |
| commit | 0f3e26f9a406caafbad02d39b15137efe5fb3ecd (patch) | |
| tree | f47a46c56c7b3ecefd454ece378685a67e4883e7 | |
| parent | 7de67831e90daa5f03c4cb78d60f8edfd2763127 (diff) | |
Fix formatting and style
| -rw-r--r-- | include/constants/event_object_movement.h | 36 | ||||
| -rw-r--r-- | src/event_object_movement.c | 18 |
2 files changed, 28 insertions, 26 deletions
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index d7901481e..87625860b 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -236,26 +236,22 @@ #define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x92 #define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x93 -#define MOVEMENT_ACTION_SPIN_DOWN 0x94 -#define MOVEMENT_ACTION_SPIN_UP 0x95 -#define MOVEMENT_ACTION_SPIN_LEFT 0x96 -#define MOVEMENT_ACTION_SPIN_RIGHT 0x97 - -#define MOVEMENT_ACTION_0x98 0x98 -#define MOVEMENT_ACTION_0x99 0x99 -#define MOVEMENT_ACTION_0x9A 0x9A - -#define MOVEMENT_ACTION_WALK_SLOWEST_DOWN 0x9B -#define MOVEMENT_ACTION_WALK_SLOWEST_UP 0x9C -#define MOVEMENT_ACTION_WALK_SLOWEST_LEFT 0x9D -#define MOVEMENT_ACTION_WALK_SLOWEST_RIGHT 0x9E -#define MOVEMENT_ACTION_SHAKE_HEAD 0x9F - -#define MOVEMENT_ACTION_0xA0 0xA0 -#define MOVEMENT_ACTION_0xA1 0xA1 -#define MOVEMENT_ACTION_0xA2 0xA2 -#define MOVEMENT_ACTION_0xA3 0xA3 - +#define MOVEMENT_ACTION_SPIN_DOWN 0x94 +#define MOVEMENT_ACTION_SPIN_UP 0x95 +#define MOVEMENT_ACTION_SPIN_LEFT 0x96 +#define MOVEMENT_ACTION_SPIN_RIGHT 0x97 +#define MOVEMENT_ACTION_0x98 0x98 +#define MOVEMENT_ACTION_0x99 0x99 +#define MOVEMENT_ACTION_0x9A 0x9A +#define MOVEMENT_ACTION_WALK_SLOWEST_DOWN 0x9B +#define MOVEMENT_ACTION_WALK_SLOWEST_UP 0x9C +#define MOVEMENT_ACTION_WALK_SLOWEST_LEFT 0x9D +#define MOVEMENT_ACTION_WALK_SLOWEST_RIGHT 0x9E +#define MOVEMENT_ACTION_SHAKE_HEAD 0x9F +#define MOVEMENT_ACTION_0xA0 0xA0 +#define MOVEMENT_ACTION_0xA1 0xA1 +#define MOVEMENT_ACTION_0xA2 0xA2 +#define MOVEMENT_ACTION_0xA3 0xA3 #define MOVEMENT_ACTION_FLY_UP 0xA4 #define MOVEMENT_ACTION_FLY_DOWN 0xA5 #define MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_DOWN 0xA6 diff --git a/src/event_object_movement.c b/src/event_object_movement.c index bd66b32a4..d2cff5e53 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -2197,7 +2197,8 @@ static void LoadObjectEventPalette(u16 paletteTag) } } -void Unused_LoadObjectEventPaletteSet(u16 *paletteTags) +// Unused +void LoadObjectEventPaletteSet(u16 *paletteTags) { u8 i; @@ -2285,7 +2286,8 @@ u8 sub_805F6D0(u8 var) return gReflectionEffectPaletteMap[var]; } -void Unused_IncrementObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) +// Unused +void IncrementObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { objectEvent->previousCoords.x = objectEvent->currentCoords.x; objectEvent->previousCoords.y = objectEvent->currentCoords.y; @@ -2575,7 +2577,8 @@ static u16 GetObjectEventFlagIdByObjectEventId(u8 objectEventId) return GetObjectEventFlagIdByLocalIdAndMap(gObjectEvents[objectEventId].localId, gObjectEvents[objectEventId].mapNum, gObjectEvents[objectEventId].mapGroup); } -u8 Unused_GetObjectTrainerTypeByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +// Unused +u8 GetObjectTrainerTypeByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { u8 objectEventId; @@ -2590,12 +2593,14 @@ u16 GetObjectEventFlagByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->trainerType; } -u8 Unused_GetObjectTrainerTypeByObjectEventId(u8 objectEventId) +// Unused +u8 GetObjectTrainerTypeByObjectEventId(u8 objectEventId) { return gObjectEvents[objectEventId].trainerType; } -u8 Unused_GetObjectEventBerryTreeIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +// Unused +u8 GetObjectEventBerryTreeIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { u8 objectEventId; @@ -2605,7 +2610,8 @@ u8 Unused_GetObjectEventBerryTreeIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 map return gObjectEvents[objectEventId].trainerRange_berryTreeId; } -u8 Unused_GetObjectEventBerryTreeId(u8 objectEventId) +// Unused +u8 GetObjectEventBerryTreeId(u8 objectEventId) { return gObjectEvents[objectEventId].trainerRange_berryTreeId; } |