Skip to content

Commit

Permalink
Change Clang Format's Line Width (ColumnLimit) to 140
Browse files Browse the repository at this point in the history
  • Loading branch information
@JaceCear
JaceCear committed Jul 12, 2024
1 parent 7fd6f64 commit 4bf1c63
Show file tree
Hide file tree
Showing 56 changed files with 644 additions and 899 deletions.
2 changes: 1 addition & 1 deletion .clang-format
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeComma
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 89
ColumnLimit: 140
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerIndentWidth: 4
Expand Down
13 changes: 5 additions & 8 deletions include/constants/anim_sizes.h
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
// TODO: Auto-generate this file
#define MAX_TILES(_animName) ((_animName##_WIDTH / 8) * (_animName##_HEIGHT / 8))
#define MAX_TILES_VARIANT(_animName, _variant) \
((_animName##_VAR##_variant##_WIDTH / 8) * (_animName##_VAR##_variant##_HEIGHT / 8))
#define ALLOC_TILES(_animName) \
VramMalloc(((_animName##_WIDTH / 8) * (_animName##_HEIGHT / 8)))
#define ALLOC_TILES_VARIANT(_animName, _variant) \
VramMalloc(((_animName##_VAR##_variant##_WIDTH / 8) \
* (_animName##_VAR##_variant##_HEIGHT / 8)))
#define MAX_TILES(_animName) ((_animName##_WIDTH / 8) * (_animName##_HEIGHT / 8))
#define MAX_TILES_VARIANT(_animName, _variant) ((_animName##_VAR##_variant##_WIDTH / 8) * (_animName##_VAR##_variant##_HEIGHT / 8))
#define ALLOC_TILES(_animName) VramMalloc(((_animName##_WIDTH / 8) * (_animName##_HEIGHT / 8)))
#define ALLOC_TILES_VARIANT(_animName, _variant) \
VramMalloc(((_animName##_VAR##_variant##_WIDTH / 8) * (_animName##_VAR##_variant##_HEIGHT / 8)))

#define ANIM_CHAOMAP_EMERALD_WIDTH 24
#define ANIM_CHAOMAP_EMERALD_HEIGHT 16
Expand Down
5 changes: 2 additions & 3 deletions include/constants/characters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@

#define CHARACTER_BIT(character) (1 << (character))

#define MAIN_CHARACTERS \
(CHARACTER_BIT(CHARACTER_SONIC) | CHARACTER_BIT(CHARACTER_CREAM) \
| CHARACTER_BIT(CHARACTER_TAILS) | CHARACTER_BIT(CHARACTER_KNUCKLES))
#define MAIN_CHARACTERS \
(CHARACTER_BIT(CHARACTER_SONIC) | CHARACTER_BIT(CHARACTER_CREAM) | CHARACTER_BIT(CHARACTER_TAILS) | CHARACTER_BIT(CHARACTER_KNUCKLES))

#endif
56 changes: 27 additions & 29 deletions include/constants/songs.h
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
#ifndef GUARD_CONSTANTS_SONGS_H
#define GUARD_CONSTANTS_SONGS_H

#define MUS_INTRO 0x0
#define MUS_TITLE_SCREEN 0x1
#define MUS_MAIN_MENU 0x2
#define MUS_CHARACTER_SELECT 0x3
#define MUS_SONIC_FACTORY 0x4
#define MUS_OPTIONS 0x5
#define MUS_OPTIONS_COPY 0x6
#define MUS_CHAO_PLAYGROUND 0x7
#define MUS_NEWGAME_INTRO 0x8
#define MUS_DUMMY__9 0x9
#define MUS_OVERWORLD__ROUTE_99 0xA
#define MUS_OVERWORLD__SUNSET_HILL 0xB
#define MUS_OVERWORLD__OCEAN_BASE 0xC
#define MUS_OVERWORLD__TOY_KINGDOM 0xD
#define MUS_OVERWORLD__TWINKLE_SNOW 0xE
#define MUS_OVERWORLD__CYBER_TRACK 0xF
#define MUS_OVERWORLD__CHAOS_ANGEL 0x10
#define MUS_OVERWORLD__ALTAR_EMERALD \
0x11 // @TODO: Find better name? (Not really an overworld in Altar Emerald's case)
#define MUS_INTRO 0x0
#define MUS_TITLE_SCREEN 0x1
#define MUS_MAIN_MENU 0x2
#define MUS_CHARACTER_SELECT 0x3
#define MUS_SONIC_FACTORY 0x4
#define MUS_OPTIONS 0x5
#define MUS_OPTIONS_COPY 0x6
#define MUS_CHAO_PLAYGROUND 0x7
#define MUS_NEWGAME_INTRO 0x8
#define MUS_DUMMY__9 0x9
#define MUS_OVERWORLD__ROUTE_99 0xA
#define MUS_OVERWORLD__SUNSET_HILL 0xB
#define MUS_OVERWORLD__OCEAN_BASE 0xC
#define MUS_OVERWORLD__TOY_KINGDOM 0xD
#define MUS_OVERWORLD__TWINKLE_SNOW 0xE
#define MUS_OVERWORLD__CYBER_TRACK 0xF
#define MUS_OVERWORLD__CHAOS_ANGEL 0x10
#define MUS_OVERWORLD__ALTAR_EMERALD 0x11 // @TODO: Find better name? (Not really an overworld in Altar Emerald's case)

#define MUS_INTACT_MUSIC_1 0x12
#define MUS_DUMMY__19 0x13
Expand Down Expand Up @@ -89,16 +88,15 @@
#define MUS_DUMMY__74 0x4A
#define MUS_DROWNING 0x4B

#define MUS_MINIGAME 0x4C
#define MUS_DUMMY__77 0x4D
#define MUS_78 0x4E
#define MUS_ENDING_A_COPY \
0x4F // @TODO: Find out whether there are differences between this and MUS_ENDING_A
#define MUS_DUMMY__80 0x50
#define MUS_EMERALD_GET 0x51
#define MUS_GAME_OVER 0x52
#define MUS_1_UP 0x53
#define MUS_EXTRALIFE 0x53
#define MUS_MINIGAME 0x4C
#define MUS_DUMMY__77 0x4D
#define MUS_78 0x4E
#define MUS_ENDING_A_COPY 0x4F // @TODO: Find out whether there are differences between this and MUS_ENDING_A
#define MUS_DUMMY__80 0x50
#define MUS_EMERALD_GET 0x51
#define MUS_GAME_OVER 0x52
#define MUS_1_UP 0x53
#define MUS_EXTRALIFE 0x53

#define MUS_STAGE_CLEAR_GOLD 0x54
#define MUS_STAGE_CLEAR 0x55
Expand Down
28 changes: 11 additions & 17 deletions include/constants/text.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,19 @@

#define LanguageIndex(lang) (lang - 1)

#define TextElementOffset(lang, elementsPerLang, element) \
(element + ((lang) * (elementsPerLang)))
#define TextElementOffsetAlt(lang, elementsPerLang, element) \
(((lang) * (elementsPerLang)) + element)
#define TextElementOffset(lang, elementsPerLang, element) (element + ((lang) * (elementsPerLang)))
#define TextElementOffsetAlt(lang, elementsPerLang, element) (((lang) * (elementsPerLang)) + element)

// TODO: move these to a better place

#define TextElementAlt(elementsPerLang, lang, element, a, b) \
[(lang) * (elementsPerLang) + (element - 1)] \
= { .numTiles = (a), .anim = (b), .variant = (element) }
#define TextElement(elementsPerLang, lang, element, a, b) \
[TextElementOffset(lang, elementsPerLang, element)] \
= { .numTiles = (a), .anim = (b), .variant = (element) }
#define TextElementAlt(elementsPerLang, lang, element, a, b) \
[(lang) * (elementsPerLang) + (element - 1)] = { .numTiles = (a), .anim = (b), .variant = (element) }
#define TextElement(elementsPerLang, lang, element, a, b) \
[TextElementOffset(lang, elementsPerLang, element)] = { .numTiles = (a), .anim = (b), .variant = (element) }

#define TextElementAlt2(lang, element, a, b) \
[lang] = { .numTiles = (a), .anim = (b), .variant = (element) }
#define TextElementAlt3(element, a, b) \
[element] = { .numTiles = (a), .anim = (b), .variant = (element) }
#define TextElementAlt4(_variant, _numTiles, _anim) \
{ \
.numTiles = (_numTiles), .anim = (_anim), .variant = (_variant) \
#define TextElementAlt2(lang, element, a, b) [lang] = { .numTiles = (a), .anim = (b), .variant = (element) }
#define TextElementAlt3(element, a, b) [element] = { .numTiles = (a), .anim = (b), .variant = (element) }
#define TextElementAlt4(_variant, _numTiles, _anim) \
{ \
.numTiles = (_numTiles), .anim = (_anim), .variant = (_variant) \
}
16 changes: 6 additions & 10 deletions include/constants/zones.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,20 @@

#define LEVEL_TO_ZONE(level) ((level) >> 2)
// ((((level) / (ACTS_PER_ZONE + 1)) * 2) | ((level) & 1))
#define LEVEL_TO_COURSE_INDEX(level) \
((((level) / ACT_SLOTS_PER_ZONE) << 0x19 >> 0x18) | ((level)&1))
#define LEVEL_TO_COURSE_INDEX(level) ((((level) / ACT_SLOTS_PER_ZONE) << 0x19 >> 0x18) | ((level)&1))
#define COURSE_LEVEL_TO_COURSE_INDEX(level) (((level) >> 1) + ((level)&1))

#define COURSE_INDEX(zone, act) (LEVEL_TO_COURSE_INDEX(LEVEL_INDEX(zone, act)))

#define CHAOS_EMERALD(zone) (1 << (zone))
#define ALL_ZONE_CHAOS_EMERALDS \
(CHAOS_EMERALD(ZONE_1) | CHAOS_EMERALD(ZONE_2) | CHAOS_EMERALD(ZONE_3) \
| CHAOS_EMERALD(ZONE_4) | CHAOS_EMERALD(ZONE_5) | CHAOS_EMERALD(ZONE_6) \
| CHAOS_EMERALD(ZONE_7))
#define ALL_ZONE_CHAOS_EMERALDS \
(CHAOS_EMERALD(ZONE_1) | CHAOS_EMERALD(ZONE_2) | CHAOS_EMERALD(ZONE_3) | CHAOS_EMERALD(ZONE_4) | CHAOS_EMERALD(ZONE_5) \
| CHAOS_EMERALD(ZONE_6) | CHAOS_EMERALD(ZONE_7))

#define CHAOS_EMERALDS_COMPLETED CHAOS_EMERALD(7)

#define IS_BOSS_STAGE(lvl) \
((ACT_INDEX(lvl) == ACT_BOSS) \
|| (((lvl) == LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)) \
&& (gUnknown_030054B0 == 0)) \
#define IS_BOSS_STAGE(lvl) \
((ACT_INDEX(lvl) == ACT_BOSS) || (((lvl) == LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)) && (gUnknown_030054B0 == 0)) \
|| (((lvl) == LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53))))

#endif // GUARD_ZONES_H
16 changes: 8 additions & 8 deletions include/core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ struct Unk_03003674 {
// No idea why this exists when there is a
// better random number generator in the math
// module
#define PseudoRandom32() \
({ \
gPseudoRandom = (gPseudoRandom * 0x196225) + 0x3C6EF35F; \
gPseudoRandom; \
#define PseudoRandom32() \
({ \
gPseudoRandom = (gPseudoRandom * 0x196225) + 0x3C6EF35F; \
gPseudoRandom; \
})

#define MultiplayerPseudoRandom32() \
({ \
gMultiplayerPseudoRandom = (gMultiplayerPseudoRandom * 0x196225) + 0x3C6EF35F; \
gMultiplayerPseudoRandom; \
#define MultiplayerPseudoRandom32() \
({ \
gMultiplayerPseudoRandom = (gMultiplayerPseudoRandom * 0x196225) + 0x3C6EF35F; \
gMultiplayerPseudoRandom; \
})
#define PseudoRandBetween(min, max) ((PseudoRandom32() & ((-min) + (max))) + (min))

Expand Down
33 changes: 13 additions & 20 deletions include/game/camera.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,41 +69,34 @@ struct Camera {
extern struct Camera gCamera;

// TODO: Merge all these into one!
#define IS_OUT_OF_RANGE_2(x, y, radiusX, radiusY) \
((x < -(radiusX)) || (x > DISPLAY_WIDTH + (radiusX)) || (y < -(radiusY)) \
|| (y > DISPLAY_HEIGHT + (radiusY)))
#define IS_OUT_OF_RANGE_2(x, y, radiusX, radiusY) \
((x < -(radiusX)) || (x > DISPLAY_WIDTH + (radiusX)) || (y < -(radiusY)) || (y > DISPLAY_HEIGHT + (radiusY)))

// No idea on this one
#define IS_OUT_OF_RANGE_3(x, y, radiusX, radiusY) \
((x < -(radiusX)) || (x > DISPLAY_WIDTH + (radiusX)) || ((y) + (radiusY) < 0) \
|| (y > DISPLAY_HEIGHT + (radiusY)))
#define IS_OUT_OF_RANGE_3(x, y, radiusX, radiusY) \
((x < -(radiusX)) || (x > DISPLAY_WIDTH + (radiusX)) || ((y) + (radiusY) < 0) || (y > DISPLAY_HEIGHT + (radiusY)))

// TODO: Merge all these into one!
#define IS_OUT_OF_RANGE_(UNUSED, x, y, radius) IS_OUT_OF_RANGE_2(x, y, radius, radius)

#define IS_OUT_OF_RANGE_OLD(castType, x, y, dim) \
(((castType)(x + (dim / 2)) > DISPLAY_WIDTH + dim) || (y + (dim / 2) < 0) \
|| (y > DISPLAY_HEIGHT + (dim / 2)))
#define IS_OUT_OF_RANGE_OLD(castType, x, y, dim) \
(((castType)(x + (dim / 2)) > DISPLAY_WIDTH + dim) || (y + (dim / 2) < 0) || (y > DISPLAY_HEIGHT + (dim / 2)))

#define IS_OUT_OF_RANGE IS_OUT_OF_RANGE_OLD

// @NOTE/INVESTIGATE: Some places match with u16, some with u32,
// but u16 is more common, so it's the default.
#define IS_OUT_OF_CAM_RANGE(_x, _y) IS_OUT_OF_RANGE(u16, _x, _y, CAM_REGION_WIDTH)
#define IS_OUT_OF_CAM_RANGE_TYPED(castType, _x, _y) \
IS_OUT_OF_RANGE(castType, _x, _y, CAM_REGION_WIDTH)
#define IS_OUT_OF_CAM_RANGE(_x, _y) IS_OUT_OF_RANGE(u16, _x, _y, CAM_REGION_WIDTH)
#define IS_OUT_OF_CAM_RANGE_TYPED(castType, _x, _y) IS_OUT_OF_RANGE(castType, _x, _y, CAM_REGION_WIDTH)

#define IS_OUT_OF_DISPLAY_RANGE(_x, _y) \
((_x) > gCamera.x + (DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2)) \
|| (_x) < gCamera.x - (CAM_REGION_WIDTH / 2) || (_y) > gCamera.y + CAM_BOUND_Y \
|| (_y) < gCamera.y - (CAM_REGION_WIDTH / 2))
#define IS_OUT_OF_DISPLAY_RANGE(_x, _y) \
((_x) > gCamera.x + (DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2)) || (_x) < gCamera.x - (CAM_REGION_WIDTH / 2) \
|| (_y) > gCamera.y + CAM_BOUND_Y || (_y) < gCamera.y - (CAM_REGION_WIDTH / 2))

// TODO: Remove macro and replace calls of it with 'IS_OUT_OF_RANGE' once rewritten.
#define IS_OUT_OF_GRAV_TRIGGER_RANGE(x, y) \
IS_OUT_OF_RANGE_(u16, x, y, (CAM_REGION_WIDTH / 2))
#define IS_OUT_OF_GRAV_TRIGGER_RANGE(x, y) IS_OUT_OF_RANGE_(u16, x, y, (CAM_REGION_WIDTH / 2))

#define IS_OUT_OF_LOOP_TRIGGER_RANGE(x, y) \
IS_OUT_OF_RANGE_3(x, y, (CAM_REGION_WIDTH / 2), (CAM_REGION_WIDTH / 2))
#define IS_OUT_OF_LOOP_TRIGGER_RANGE(x, y) IS_OUT_OF_RANGE_3(x, y, (CAM_REGION_WIDTH / 2), (CAM_REGION_WIDTH / 2))

bool32 IsPointInScreenRect(s32 worldX, s32 worldY);

Expand Down
Loading

0 comments on commit 4bf1c63

Please sign in to comment.