Skip to content

Commit 47f2f01

Browse files
MegaMechgithub-actions[bot]
authored andcommitted
Clang Format
1 parent bee9b0f commit 47f2f01

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+712
-623
lines changed

include/PR/abi.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,13 @@ typedef short ENVMIX_STATE[40];
822822
/*
823823
* See aEnvMixer for more info.
824824
*/
825-
#define aEnvSetup1Alt(pkt,initialVolReverb,rampReverbL,rampReverbR,rampLeft,rampRight) { Acmd *_a = (Acmd *)pkt; _a->words.w0 = (_SHIFTL(A_ENVSETUP1, 24, 8) | _SHIFTL(initialVolReverb, 16, 8) | (_SHIFTL(rampReverbL, 8, 8)) | _SHIFTL(rampReverbR, 0, 8)); _a->words.w1 = _SHIFTL(rampLeft, 16, 16) | _SHIFTL(rampRight, 0, 16); }
825+
#define aEnvSetup1Alt(pkt, initialVolReverb, rampReverbL, rampReverbR, rampLeft, rampRight) \
826+
{ \
827+
Acmd* _a = (Acmd*) pkt; \
828+
_a->words.w0 = (_SHIFTL(A_ENVSETUP1, 24, 8) | _SHIFTL(initialVolReverb, 16, 8) | \
829+
(_SHIFTL(rampReverbL, 8, 8)) | _SHIFTL(rampReverbR, 0, 8)); \
830+
_a->words.w1 = _SHIFTL(rampLeft, 16, 16) | _SHIFTL(rampRight, 0, 16); \
831+
}
826832

827833
/*
828834
* See aEnvMixer for more info.

include/PR/gbi.h

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1983,7 +1983,10 @@ typedef union {
19831983
_g->words.w0 = _SHIFTL(G_TRI1, 24, 8) | __gsSP1Triangle_w1f(v0, v1, v2, flag); \
19841984
_g->words.w1 = 0; \
19851985
}
1986-
#define gsSP1Triangle(v0, v1, v2, flag) { { _SHIFTL(G_TRI1, 24, 8) | __gsSP1Triangle_w1f(v0, v1, v2, flag), 0 } }
1986+
#define gsSP1Triangle(v0, v1, v2, flag) \
1987+
{ \
1988+
{ _SHIFTL(G_TRI1, 24, 8) | __gsSP1Triangle_w1f(v0, v1, v2, flag), 0 } \
1989+
}
19871990

19881991
/***
19891992
*** Line
@@ -1995,7 +1998,10 @@ typedef union {
19951998
_g->words.w0 = _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, 0, flag); \
19961999
_g->words.w1 = 0; \
19972000
}
1998-
#define gsSPLine3D(v0, v1, flag) { { _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, 0, flag), 0 } }
2001+
#define gsSPLine3D(v0, v1, flag) \
2002+
{ \
2003+
{ _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, 0, flag), 0 } \
2004+
}
19992005

20002006
/***
20012007
*** LineW
@@ -2013,7 +2019,10 @@ typedef union {
20132019
_g->words.w0 = _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, wd, flag); \
20142020
_g->words.w1 = 0; \
20152021
}
2016-
#define gsSPLineW3D(v0, v1, wd, flag) { { _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, wd, flag), 0 } }
2022+
#define gsSPLineW3D(v0, v1, wd, flag) \
2023+
{ \
2024+
{ _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, wd, flag), 0 } \
2025+
}
20172026

20182027
/***
20192028
*** 1 Quadrangle
@@ -2093,12 +2102,14 @@ typedef union {
20932102
/***
20942103
*** 1 Quadrangle
20952104
***/
2096-
#define gSP1Quadrangle(v0, v1, v2, v3, flag) \
2097-
{ { Gfx* _g = (Gfx*) (pkt); \
2098-
\
2099-
_g->words.w0 = _SHIFTL(G_QUAD, 24, 8); \
2100-
_g->words.w1 = __gsSP1Quadrangle_w1(v0, v1, v2, v3); \
2101-
} \
2105+
#define gSP1Quadrangle(v0, v1, v2, v3, flag) \
2106+
{ \
2107+
{ \
2108+
Gfx* _g = (Gfx*) (pkt); \
2109+
\
2110+
_g->words.w0 = _SHIFTL(G_QUAD, 24, 8); \
2111+
_g->words.w1 = __gsSP1Quadrangle_w1(v0, v1, v2, v3); \
2112+
} \
21022113
}
21032114

21042115
#define gsSP1Quadrangle(v0, v1, v2, v3, flag) \
@@ -2602,7 +2613,8 @@ typedef union {
26022613
#define gsSPLookAtY(l) gsDma1p(G_MOVEMEM, l, sizeof(Light), G_MV_LOOKATY)
26032614
#endif /* F3DEX_GBI_2 */
26042615

2605-
#define gSPLookAt(pkt, la) { gSPLookAtX(pkt, la) gSPLookAtY(pkt, (char*) (la) + 16) }
2616+
#define gSPLookAt(pkt, la) \
2617+
{ gSPLookAtX(pkt, la) gSPLookAtY(pkt, (char*) (la) + 16) }
26062618
#define gsSPLookAt(la) gsSPLookAtX(la), gsSPLookAtY((char*) (la) + 16)
26072619

26082620
#define gDPSetHilite1Tile(pkt, tile, hilite, width, height) \
@@ -2755,7 +2767,10 @@ typedef union {
27552767
_g->words.w1 = 0; \
27562768
}
27572769

2758-
#define gsSPEndDisplayList() { { _SHIFTL(G_ENDDL, 24, 8), 0 } }
2770+
#define gsSPEndDisplayList() \
2771+
{ \
2772+
{ _SHIFTL(G_ENDDL, 24, 8), 0 } \
2773+
}
27592774

27602775
#ifdef F3DEX_GBI_2
27612776
/*
@@ -3979,7 +3994,10 @@ typedef union {
39793994
_g->words.w1 = 0; \
39803995
}
39813996

3982-
#define gsDPNoParam(cmd) { { _SHIFTL(cmd, 24, 8), 0 } }
3997+
#define gsDPNoParam(cmd) \
3998+
{ \
3999+
{ _SHIFTL(cmd, 24, 8), 0 } \
4000+
}
39834001

39844002
#define gDPParam(pkt, cmd, param) \
39854003
{ \

include/common_structs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ typedef struct {
253253
/* 0x0006 */ u16 unk_006;
254254
/* 0x0008 */ s16 lapCount;
255255
/* 0x000A */ char unk_00A[0x2];
256-
/* 0x000C */ s32 triggers; // Bitflag.
256+
/* 0x000C */ s32 triggers; // Bitflag.
257257
/* 0x0010 */ s16 currentItemCopy; // Has no effect on what item the players has, It is just a synced copy
258258
/* 0x0012 */ s16 unk_012;
259259
/* 0x0014 */ Vec3f pos;

include/defines.h

Lines changed: 58 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE };
334334
// player->unk_046
335335

336336
/* The first time you touch a penguin or bat, and anytime you touch a thwomp during a
337-
race will set a flag which will cause your next spinout to be instant (i.e. no
337+
race will set a flag which will cause your next spinout to be instant (i.e. no
338338
sliding forward). Probably half-implemented code to prevent sliding through enemies,
339339
but causes this bug */
340340
#define CRITTER_TOUCH 0x2 // Touched a penguin, bat or thwomp
@@ -344,19 +344,21 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE };
344344
// player->oobProps
345345
/* Deals with the lower out of bounds (OOB) plane on levels. Represented by fluids (water / lava)
346346
or nothing for Rainbow Road and Skyscraper. */
347-
#define UNDER_OOB_OR_FLUID_LEVEL 0x1 // Set while mostly under the plane. Does not necessarily trigger Lakitu on Koopa Troopa Beach.
347+
#define UNDER_OOB_OR_FLUID_LEVEL \
348+
0x1 // Set while mostly under the plane. Does not necessarily trigger Lakitu on Koopa Troopa Beach.
348349
#define PASS_OOB_OR_FLUID_LEVEL 0x2 // Set when passing through the lower plane in either direction
349350
// The next two are also activated when passing through the lower plane.
350351
#define UNDER_FLUID_LEVEL 0x4 // Stays active until Lakitu places back on track
351-
#define UNDER_OOB_LEVEL 0x8 // Active while under a non-fluid OOB plane. Is momentarily active when passing through fluids.
352-
352+
#define UNDER_OOB_LEVEL \
353+
0x8 // Active while under a non-fluid OOB plane. Is momentarily active when passing through fluids.
353354

354355
/* UNK_002 has something to do with player animations. Each player has a 32-bit
355356
flag broken into 8 groups of 4 bits. Those 4 bits affect how each of the 8 players
356357
appear to the specified player */
357358
#define CHANGING_ANIMATION 0x1 // Seems to be set when the kart animation has to change.
358-
#define UNK_002_UNKNOWN_0x2 0x2
359-
#define UNK_002_UNKNOWN_0x4 0x4 /* Unclear, but has to do with viewing the side of player. At least tends to change if target
359+
#define UNK_002_UNKNOWN_0x2 0x2
360+
#define UNK_002_UNKNOWN_0x4 \
361+
0x4 /* Unclear, but has to do with viewing the side of player. At least tends to change if target \
360362
player spins. Something with avoding rollover of aniamation frame data? */
361363
#define SIDE_OF_KART 0x8 // Seems to be whether you are in a rectangle shooting out from both sides of target player
362364

@@ -368,62 +370,64 @@ player spins. Something with avoding rollover of aniamation frame data? */
368370
#define EXPLOSION 0x1000 // Big shock looking graphic when starting tumble
369371

370372
// player->lakituProps
371-
#define LAKITU_RETRIEVAL 0x1 // While lakitu is grabbing you, but before the scene transition of being placed on the track
372-
#define HELD_BY_LAKITU 0x2
373-
#define LAKITU_FIZZLE 0x4 // Disintegration and reintegration effect when transitioning from retrieval to placement
374-
#define LAKITU_SCENE 0x8 // the whole segment from when lakitu is called to when you regain control
375-
#define FRIGID_EFFECT 0x10 // Cold colors on Sherbet Land after in frigid water
376-
#define THAWING_EFFECT 0x20 // Regaining usual colors post frigid effect
377-
#define FROZEN_EFFECT 0x80 // In the ice cube
378-
#define WENT_OVER_OOB 0x100 // Player went over (or is on) an OOB area. Cancelled if touch back in bounds
379-
#define LAKITU_LAVA 0x1000 // smoky effect when retrieved from lava
380-
#define LAKITU_WATER 0x2000 // dripping effect when retreived from water
373+
#define LAKITU_RETRIEVAL \
374+
0x1 // While lakitu is grabbing you, but before the scene transition of being placed on the track
375+
#define HELD_BY_LAKITU 0x2
376+
#define LAKITU_FIZZLE 0x4 // Disintegration and reintegration effect when transitioning from retrieval to placement
377+
#define LAKITU_SCENE 0x8 // the whole segment from when lakitu is called to when you regain control
378+
#define FRIGID_EFFECT 0x10 // Cold colors on Sherbet Land after in frigid water
379+
#define THAWING_EFFECT 0x20 // Regaining usual colors post frigid effect
380+
#define FROZEN_EFFECT 0x80 // In the ice cube
381+
#define WENT_OVER_OOB 0x100 // Player went over (or is on) an OOB area. Cancelled if touch back in bounds
382+
#define LAKITU_LAVA 0x1000 // smoky effect when retrieved from lava
383+
#define LAKITU_WATER 0x2000 // dripping effect when retreived from water
381384

382385
// player->kartProps
383-
#define BACK_UP 0x1
384-
#define RIGHT_TURN 0x2 // non-drifting (more than 5 degrees)
385-
#define LEFT_TURN 0x4 // non-drifting (more than 5 degrees)
386-
#define MOVE_BACKWARDS 0x8 // includes lakitu
387-
#define LOSE_GP_RACE 0x10 // pointless, only unsets itself
388-
#define THROTTLE 0x20 // Closely tied to just pressing A. Possible exception for AB-spins
389-
#define EARLY_SPINOUT_RIGHT 0x40 // Spinning out while facing right (not actually used for anything)
390-
#define EARLY_SPINOUT_LEFT 0x80 // Spinning out while facing left
391-
#define POST_TUMBLE_GAS 0x100 // Causes particles after a vertical tumble, I think
392-
#define BECOME_INVISIBLE 0x200
393-
#define UNUSED_0x400 0x400 // locked behind 0x800 (func_80091440)
394-
#define UNUSED_0x800 0x800 // locked behind 0x400 (func_8002B830 -> func_800911B4)
395-
#define UNUSED_0x1000 0x1000 // 0x1000 locked behind 0x400 (func_8002B830 -> func_800911B4)
396-
#define UNUSED_0x2000 0x2000 // 0x2000 locked behind 0x400 and 0x800 (func_8002B830 -> func_800911B4, apply_effect -> func_80091298,
397-
// func_80091440)
398-
#define DRIVING_SPINOUT 0x4000
386+
#define BACK_UP 0x1
387+
#define RIGHT_TURN 0x2 // non-drifting (more than 5 degrees)
388+
#define LEFT_TURN 0x4 // non-drifting (more than 5 degrees)
389+
#define MOVE_BACKWARDS 0x8 // includes lakitu
390+
#define LOSE_GP_RACE 0x10 // pointless, only unsets itself
391+
#define THROTTLE 0x20 // Closely tied to just pressing A. Possible exception for AB-spins
392+
#define EARLY_SPINOUT_RIGHT 0x40 // Spinning out while facing right (not actually used for anything)
393+
#define EARLY_SPINOUT_LEFT 0x80 // Spinning out while facing left
394+
#define POST_TUMBLE_GAS 0x100 // Causes particles after a vertical tumble, I think
395+
#define BECOME_INVISIBLE 0x200
396+
#define UNUSED_0x400 0x400 // locked behind 0x800 (func_80091440)
397+
#define UNUSED_0x800 0x800 // locked behind 0x400 (func_8002B830 -> func_800911B4)
398+
#define UNUSED_0x1000 0x1000 // 0x1000 locked behind 0x400 (func_8002B830 -> func_800911B4)
399+
#define UNUSED_0x2000 \
400+
0x2000 // 0x2000 locked behind 0x400 and 0x800 (func_8002B830 -> func_800911B4, apply_effect -> func_80091298,
401+
// func_80091440)
402+
#define DRIVING_SPINOUT 0x4000
399403
#define UNKNOWN_BATTLE_VAR 0x8000 // 0x8000 something battle related, unclear if ever set
400404

401405
/*
402406
* @brief triggers indicating that an effect should be applied to a kart
403407
*/
404-
#define HIT_BANANA_TRIGGER 0x1 // hits a banana
405-
#define HIGH_TUMBLE_TRIGGER 0x2 // hit by a red shell, blue shell, or hit a mole
406-
#define LOW_TUMBLE_TRIGGER 0x4 // hit by a green shell
407-
#define DRIVING_SPINOUT_TRIGGER 0x80 // spinning out from erratic driving
408-
#define THWOMP_SQUISH_TRIGGER 0x100 // stomped by thwomp
409-
#define SHROOM_TRIGGER 0x200 // being boosted by trigger a mushroom
410-
#define BOO_TRIGGER 0x800 // being a boo
411-
#define UNUSED_TRIGGER_0x1000 0x1000 // Unused
412-
#define STAR_TRIGGER 0x2000 // Starting a star
413-
#define LIGHTNING_STRIKE_TRIGGER 0x4000 // Struck by lightning
414-
#define BOOST_RAMP_WOOD_TRIGGER 0x8000 // being boosted by a ramp
415-
#define UNUSED_TRIGGER_0x20000 0x20000 // Unused
416-
#define DRAG_ITEM_EFFECT 0x40000 // holding a non-shell item behind you
417-
#define HIT_PADDLE_BOAT_TRIGGER 0x80000 // hit paddle boat
418-
#define UNUSED_TRIGGER_0x10000 0x100000 // Unused
419-
#define SPINOUT_TRIGGER 0x200000 // hit crab or spiny spinout or losing versus race
420-
#define VERTICAL_TUMBLE_TRIGGER 0x400000 // hitting a fake item / bomb / snowman / car / train
408+
#define HIT_BANANA_TRIGGER 0x1 // hits a banana
409+
#define HIGH_TUMBLE_TRIGGER 0x2 // hit by a red shell, blue shell, or hit a mole
410+
#define LOW_TUMBLE_TRIGGER 0x4 // hit by a green shell
411+
#define DRIVING_SPINOUT_TRIGGER 0x80 // spinning out from erratic driving
412+
#define THWOMP_SQUISH_TRIGGER 0x100 // stomped by thwomp
413+
#define SHROOM_TRIGGER 0x200 // being boosted by trigger a mushroom
414+
#define BOO_TRIGGER 0x800 // being a boo
415+
#define UNUSED_TRIGGER_0x1000 0x1000 // Unused
416+
#define STAR_TRIGGER 0x2000 // Starting a star
417+
#define LIGHTNING_STRIKE_TRIGGER 0x4000 // Struck by lightning
418+
#define BOOST_RAMP_WOOD_TRIGGER 0x8000 // being boosted by a ramp
419+
#define UNUSED_TRIGGER_0x20000 0x20000 // Unused
420+
#define DRAG_ITEM_EFFECT 0x40000 // holding a non-shell item behind you
421+
#define HIT_PADDLE_BOAT_TRIGGER 0x80000 // hit paddle boat
422+
#define UNUSED_TRIGGER_0x10000 0x100000 // Unused
423+
#define SPINOUT_TRIGGER 0x200000 // hit crab or spiny spinout or losing versus race
424+
#define VERTICAL_TUMBLE_TRIGGER 0x400000 // hitting a fake item / bomb / snowman / car / train
421425
#define BOOST_RAMP_ASPHALT_TRIGGER 0x800000 // being boosted by a boost pad
422-
#define HIT_BY_STAR_TRIGGER 0x1000000 // being hit by a star
423-
#define START_BOOST_TRIGGER 0x2000000 // Start boost
424-
#define LOSE_BATTLE_EFFECT 0x4000000 // When losing battle mode
425-
#define BECOME_BOMB_EFFECT 0x8000000 // When becoming a bomb in battle mode
426-
#define START_SPINOUT_TRIGGER 0x10000000 // Spinning out by holding gas at start of race
426+
#define HIT_BY_STAR_TRIGGER 0x1000000 // being hit by a star
427+
#define START_BOOST_TRIGGER 0x2000000 // Start boost
428+
#define LOSE_BATTLE_EFFECT 0x4000000 // When losing battle mode
429+
#define BECOME_BOMB_EFFECT 0x8000000 // When becoming a bomb in battle mode
430+
#define START_SPINOUT_TRIGGER 0x10000000 // Spinning out by holding gas at start of race
427431

428432
#define ALL_TRIGGERS (0xFFFFFFFF)
429433
#define RACING_SPINOUT_TRIGGERS (SPINOUT_TRIGGER | DRIVING_SPINOUT_TRIGGER | HIT_BANANA_TRIGGER) // 0x200081

include/libc/stddef.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <PR/ultratypes.h>
55

66
#ifndef offsetof
7-
#define offsetof(st, m) ((size_t) &(((st*) 0)->m))
7+
#define offsetof(st, m) ((size_t) & (((st*) 0)->m))
88
#endif
99

1010
#endif

include/segments.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,32 +45,32 @@ extern u8 _startupLogoSegmentRomEnd[];
4545
// Defines duplicated even if the same for both for easier readability
4646
#ifdef AVOID_UB
4747

48-
#define MEMORY_POOL_START (uintptr_t) &_memoryPoolSegmentNoloadStart[0]
49-
#define MEMORY_POOL_END (uintptr_t) &_memoryPoolSegmentNoloadEnd[0]
48+
#define MEMORY_POOL_START (uintptr_t) & _memoryPoolSegmentNoloadStart[0]
49+
#define MEMORY_POOL_END (uintptr_t) & _memoryPoolSegmentNoloadEnd[0]
5050

51-
#define SEG_ENDING (uintptr_t) &_endingSegmentStart[0]
52-
#define SEG_ENDING_ROM_START (uintptr_t) &_endingSegmentRomStart[0]
51+
#define SEG_ENDING (uintptr_t) & _endingSegmentStart[0]
52+
#define SEG_ENDING_ROM_START (uintptr_t) & _endingSegmentRomStart[0]
5353
/**
5454
* Ending segment original size is 0xDF00 but much of that remains unused.
5555
* This auto fits the segment to its proper size.
5656
*/
5757
#define SEG_ENDING_SIZE (size_t) ALIGN16((ptrdiff_t) (&_endingSegmentNoloadEnd[0] - &_endingSegmentStart[0]))
5858
#define SEG_ENDING_ROM_SIZE (size_t) ALIGN16((ptrdiff_t) (&_endingSegmentRomEnd[0] - &_endingSegmentRomStart[0]))
5959

60-
#define SEG_RACING (uintptr_t) &_racingSegmentStart[0]
61-
#define SEG_RACING_ROM_START (uintptr_t) &_racingSegmentRomStart[0]
60+
#define SEG_RACING (uintptr_t) & _racingSegmentStart[0]
61+
#define SEG_RACING_ROM_START (uintptr_t) & _racingSegmentRomStart[0]
6262
#define SEG_RACING_SIZE (size_t) ALIGN16((ptrdiff_t) (&_racingSegmentNoloadEnd[0] - &_racingSegmentStart[0]))
6363
#define SEG_RACING_ROM_SIZE (size_t) ALIGN16((ptrdiff_t) (&_racingSegmentRomEnd[0] - &_racingSegmentRomStart[0]))
6464

65-
#define TRIG_TABLES (uintptr_t) &_trigTablesSegmentStart[0]
66-
#define TRIG_TABLES_ROM_START (uintptr_t) &_trigTablesSegmentRomStart[0]
65+
#define TRIG_TABLES (uintptr_t) & _trigTablesSegmentStart[0]
66+
#define TRIG_TABLES_ROM_START (uintptr_t) & _trigTablesSegmentRomStart[0]
6767
#define TRIG_TABLES_SIZE (size_t) _trigTablesSegmentSize
6868

69-
#define SEG_DATA_START (uintptr_t) &_data_segment2SegmentRomStart[0]
70-
#define SEG_DATA_END (uintptr_t) &_data_segment2SegmentRomEnd[0]
69+
#define SEG_DATA_START (uintptr_t) & _data_segment2SegmentRomStart[0]
70+
#define SEG_DATA_END (uintptr_t) & _data_segment2SegmentRomEnd[0]
7171

72-
#define COMMON_TEXTURES_ROM_START (uintptr_t) &_common_texturesSegmentRomStart[0]
73-
#define COMMON_TEXTURES_SIZE (ptrdiff_t) (&_common_texturesSegmentRomEnd[0] - &_common_texturesSegmentRomStart[0])
72+
#define COMMON_TEXTURES_ROM_START (uintptr_t) & _common_texturesSegmentRomStart[0]
73+
#define COMMON_TEXTURES_SIZE (ptrdiff_t)(&_common_texturesSegmentRomEnd[0] - &_common_texturesSegmentRomStart[0])
7474

7575
#define CEREMONY_DATA_ROM_START &_ceremonyDataSegmentRomStart[0]
7676
#define CEREMONY_DATA_ROM_END &_ceremonyDataSegmentRomEnd[0]
@@ -80,7 +80,7 @@ extern u8 _startupLogoSegmentRomEnd[];
8080

8181
#else // Required for ok
8282

83-
#define MEMORY_POOL_START (uintptr_t) &_memoryPoolSegmentNoloadStart
83+
#define MEMORY_POOL_START (uintptr_t) & _memoryPoolSegmentNoloadStart
8484
#define MEMORY_POOL_END (uintptr_t) 0x80242F00
8585

8686
#define SEG_ENDING (uintptr_t) 0x80280000
@@ -96,15 +96,15 @@ extern u8 _startupLogoSegmentRomEnd[];
9696
#define SEG_RACING_ROM_SIZE (size_t) ALIGN16((ptrdiff_t) (&_racingSegmentRomEnd[0] - &_racingSegmentRomStart[0]))
9797

9898
#define TRIG_TABLES (uintptr_t) 0x802BA370
99-
#define TRIG_TABLES_ROM_START (uintptr_t) &_trigTablesSegmentRomStart[0]
99+
#define TRIG_TABLES_ROM_START (uintptr_t) & _trigTablesSegmentRomStart[0]
100100
#define TRIG_TABLES_SIZE (size_t) 0x5810
101101

102-
#define SEG_DATA_START (uintptr_t) &_data_segment2SegmentRomStart[0]
103-
#define SEG_DATA_END (uintptr_t) &_data_segment2SegmentRomEnd[0]
102+
#define SEG_DATA_START (uintptr_t) & _data_segment2SegmentRomStart[0]
103+
#define SEG_DATA_END (uintptr_t) & _data_segment2SegmentRomEnd[0]
104104

105-
#define COMMON_TEXTURES_ROM_START (uintptr_t) &_common_texturesSegmentRomStart[0]
105+
#define COMMON_TEXTURES_ROM_START (uintptr_t) & _common_texturesSegmentRomStart[0]
106106
#define COMMON_TEXTURES_SIZE \
107-
(ptrdiff_t) ((uintptr_t) &_common_texturesSegmentRomEnd - (uintptr_t) &_common_texturesSegmentRomStart)
107+
(ptrdiff_t)((uintptr_t) & _common_texturesSegmentRomEnd - (uintptr_t) & _common_texturesSegmentRomStart)
108108

109109
#define CEREMONY_DATA_ROM_START &_ceremonyDataSegmentRomStart[0]
110110
#define CEREMONY_DATA_ROM_END &_ceremonyDataSegmentRomEnd[0]

0 commit comments

Comments
 (0)