dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatting and style

Browse Source
This commit is contained in:
cbt6
2022-02-10 01:53:48 +08:00
parent 7de67831e9
commit 0f3e26f9a4
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/event_object_movement.h
+16 -20
View File
@@ -236,26 +236,22 @@
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x92 #define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x92
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x93 #define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x93
#define MOVEMENT_ACTION_SPIN_DOWN 0x94 #define MOVEMENT_ACTION_SPIN_DOWN 0x94
#define MOVEMENT_ACTION_SPIN_UP 0x95 #define MOVEMENT_ACTION_SPIN_UP 0x95
#define MOVEMENT_ACTION_SPIN_LEFT 0x96 #define MOVEMENT_ACTION_SPIN_LEFT 0x96
#define MOVEMENT_ACTION_SPIN_RIGHT 0x97 #define MOVEMENT_ACTION_SPIN_RIGHT 0x97
#define MOVEMENT_ACTION_0x98 0x98
#define MOVEMENT_ACTION_0x98 0x98 #define MOVEMENT_ACTION_0x99 0x99
#define MOVEMENT_ACTION_0x99 0x99 #define MOVEMENT_ACTION_0x9A 0x9A
#define MOVEMENT_ACTION_0x9A 0x9A #define MOVEMENT_ACTION_WALK_SLOWEST_DOWN 0x9B
#define MOVEMENT_ACTION_WALK_SLOWEST_UP 0x9C
#define MOVEMENT_ACTION_WALK_SLOWEST_DOWN 0x9B #define MOVEMENT_ACTION_WALK_SLOWEST_LEFT 0x9D
#define MOVEMENT_ACTION_WALK_SLOWEST_UP 0x9C #define MOVEMENT_ACTION_WALK_SLOWEST_RIGHT 0x9E
#define MOVEMENT_ACTION_WALK_SLOWEST_LEFT 0x9D #define MOVEMENT_ACTION_SHAKE_HEAD 0x9F
#define MOVEMENT_ACTION_WALK_SLOWEST_RIGHT 0x9E #define MOVEMENT_ACTION_0xA0 0xA0
#define MOVEMENT_ACTION_SHAKE_HEAD 0x9F #define MOVEMENT_ACTION_0xA1 0xA1
#define MOVEMENT_ACTION_0xA2 0xA2
#define MOVEMENT_ACTION_0xA0 0xA0 #define MOVEMENT_ACTION_0xA3 0xA3
#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_UP 0xA4
#define MOVEMENT_ACTION_FLY_DOWN 0xA5 #define MOVEMENT_ACTION_FLY_DOWN 0xA5
#define MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_DOWN 0xA6 #define MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_DOWN 0xA6
src/event_object_movement.c
+12 -6
View File
@@ -2197,7 +2197,8 @@ static void LoadObjectEventPalette(u16 paletteTag)
} }
} }
void Unused_LoadObjectEventPaletteSet(u16 *paletteTags) // Unused
void LoadObjectEventPaletteSet(u16 *paletteTags)
{ {
u8 i; u8 i;
@@ -2285,7 +2286,8 @@ u8 sub_805F6D0(u8 var)
return gReflectionEffectPaletteMap[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.x = objectEvent->currentCoords.x;
objectEvent->previousCoords.y = objectEvent->currentCoords.y; 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); 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; u8 objectEventId;
@@ -2590,12 +2593,14 @@ u16 GetObjectEventFlagByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->trainerType; return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->trainerType;
} }
u8 Unused_GetObjectTrainerTypeByObjectEventId(u8 objectEventId) // Unused
u8 GetObjectTrainerTypeByObjectEventId(u8 objectEventId)
{ {
return gObjectEvents[objectEventId].trainerType; return gObjectEvents[objectEventId].trainerType;
} }
u8 Unused_GetObjectEventBerryTreeIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) // Unused
u8 GetObjectEventBerryTreeIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
{ {
u8 objectEventId; u8 objectEventId;
@@ -2605,7 +2610,8 @@ u8 Unused_GetObjectEventBerryTreeIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 map
return gObjectEvents[objectEventId].trainerRange_berryTreeId; return gObjectEvents[objectEventId].trainerRange_berryTreeId;
} }
u8 Unused_GetObjectEventBerryTreeId(u8 objectEventId) // Unused
u8 GetObjectEventBerryTreeId(u8 objectEventId)
{ {
return gObjectEvents[objectEventId].trainerRange_berryTreeId; return gObjectEvents[objectEventId].trainerRange_berryTreeId;
} }