mirror of
https://github.com/n64decomp/mk64
synced 2026-06-18 22:46:48 -04:00
Clang Format
This commit is contained in:
MegaMech
committed by
github-actions[bot]
github-actions[bot]
parent
44fe054525
commit
8ada0fa1a3
+7
-1
@@ -822,7 +822,13 @@ typedef short ENVMIX_STATE[40];
|
||||
/*
|
||||
* See aEnvMixer for more info.
|
||||
*/
|
||||
#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); }
|
||||
#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); \
|
||||
}
|
||||
|
||||
/*
|
||||
* See aEnvMixer for more info.
|
||||
|
||||
+30
-12
@@ -1983,7 +1983,10 @@ typedef union {
|
||||
_g->words.w0 = _SHIFTL(G_TRI1, 24, 8) | __gsSP1Triangle_w1f(v0, v1, v2, flag); \
|
||||
_g->words.w1 = 0; \
|
||||
}
|
||||
#define gsSP1Triangle(v0, v1, v2, flag) { { _SHIFTL(G_TRI1, 24, 8) | __gsSP1Triangle_w1f(v0, v1, v2, flag), 0 } }
|
||||
#define gsSP1Triangle(v0, v1, v2, flag) \
|
||||
{ \
|
||||
{ _SHIFTL(G_TRI1, 24, 8) | __gsSP1Triangle_w1f(v0, v1, v2, flag), 0 } \
|
||||
}
|
||||
|
||||
/***
|
||||
*** Line
|
||||
@@ -1995,7 +1998,10 @@ typedef union {
|
||||
_g->words.w0 = _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, 0, flag); \
|
||||
_g->words.w1 = 0; \
|
||||
}
|
||||
#define gsSPLine3D(v0, v1, flag) { { _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, 0, flag), 0 } }
|
||||
#define gsSPLine3D(v0, v1, flag) \
|
||||
{ \
|
||||
{ _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, 0, flag), 0 } \
|
||||
}
|
||||
|
||||
/***
|
||||
*** LineW
|
||||
@@ -2013,7 +2019,10 @@ typedef union {
|
||||
_g->words.w0 = _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, wd, flag); \
|
||||
_g->words.w1 = 0; \
|
||||
}
|
||||
#define gsSPLineW3D(v0, v1, wd, flag) { { _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, wd, flag), 0 } }
|
||||
#define gsSPLineW3D(v0, v1, wd, flag) \
|
||||
{ \
|
||||
{ _SHIFTL(G_LINE3D, 24, 8) | __gsSPLine3D_w1f(v0, v1, wd, flag), 0 } \
|
||||
}
|
||||
|
||||
/***
|
||||
*** 1 Quadrangle
|
||||
@@ -2093,12 +2102,14 @@ typedef union {
|
||||
/***
|
||||
*** 1 Quadrangle
|
||||
***/
|
||||
#define gSP1Quadrangle(v0, v1, v2, v3, flag) \
|
||||
{ { Gfx* _g = (Gfx*) (pkt); \
|
||||
\
|
||||
_g->words.w0 = _SHIFTL(G_QUAD, 24, 8); \
|
||||
_g->words.w1 = __gsSP1Quadrangle_w1(v0, v1, v2, v3); \
|
||||
} \
|
||||
#define gSP1Quadrangle(v0, v1, v2, v3, flag) \
|
||||
{ \
|
||||
{ \
|
||||
Gfx* _g = (Gfx*) (pkt); \
|
||||
\
|
||||
_g->words.w0 = _SHIFTL(G_QUAD, 24, 8); \
|
||||
_g->words.w1 = __gsSP1Quadrangle_w1(v0, v1, v2, v3); \
|
||||
} \
|
||||
}
|
||||
|
||||
#define gsSP1Quadrangle(v0, v1, v2, v3, flag) \
|
||||
@@ -2602,7 +2613,8 @@ typedef union {
|
||||
#define gsSPLookAtY(l) gsDma1p(G_MOVEMEM, l, sizeof(Light), G_MV_LOOKATY)
|
||||
#endif /* F3DEX_GBI_2 */
|
||||
|
||||
#define gSPLookAt(pkt, la) { gSPLookAtX(pkt, la) gSPLookAtY(pkt, (char*) (la) + 16) }
|
||||
#define gSPLookAt(pkt, la) \
|
||||
{ gSPLookAtX(pkt, la) gSPLookAtY(pkt, (char*) (la) + 16) }
|
||||
#define gsSPLookAt(la) gsSPLookAtX(la), gsSPLookAtY((char*) (la) + 16)
|
||||
|
||||
#define gDPSetHilite1Tile(pkt, tile, hilite, width, height) \
|
||||
@@ -2755,7 +2767,10 @@ typedef union {
|
||||
_g->words.w1 = 0; \
|
||||
}
|
||||
|
||||
#define gsSPEndDisplayList() { { _SHIFTL(G_ENDDL, 24, 8), 0 } }
|
||||
#define gsSPEndDisplayList() \
|
||||
{ \
|
||||
{ _SHIFTL(G_ENDDL, 24, 8), 0 } \
|
||||
}
|
||||
|
||||
#ifdef F3DEX_GBI_2
|
||||
/*
|
||||
@@ -3979,7 +3994,10 @@ typedef union {
|
||||
_g->words.w1 = 0; \
|
||||
}
|
||||
|
||||
#define gsDPNoParam(cmd) { { _SHIFTL(cmd, 24, 8), 0 } }
|
||||
#define gsDPNoParam(cmd) \
|
||||
{ \
|
||||
{ _SHIFTL(cmd, 24, 8), 0 } \
|
||||
}
|
||||
|
||||
#define gDPParam(pkt, cmd, param) \
|
||||
{ \
|
||||
|
||||
@@ -253,7 +253,7 @@ typedef struct {
|
||||
/* 0x0006 */ u16 unk_006;
|
||||
/* 0x0008 */ s16 lapCount;
|
||||
/* 0x000A */ char unk_00A[0x2];
|
||||
/* 0x000C */ s32 triggers; // Bitflag.
|
||||
/* 0x000C */ s32 triggers; // Bitflag.
|
||||
/* 0x0010 */ s16 currentItemCopy; // Has no effect on what item the players has, It is just a synced copy
|
||||
/* 0x0012 */ s16 unk_012;
|
||||
/* 0x0014 */ Vec3f pos;
|
||||
@@ -273,9 +273,10 @@ typedef struct {
|
||||
/* 0x0064 */ Vec3f unk_064;
|
||||
/* 0x0070 */ f32 boundingBoxSize;
|
||||
/* 0x0074 */ f32 unk_074;
|
||||
/* 0x0078 */ s16 unk_078; // One source of angular velocity (turning / swerving)
|
||||
/* 0x0078 */ s16 unk_078; // One source of angular velocity (turning / swerving)
|
||||
/* 0x007A */ s16 unk_07A;
|
||||
/* 0x007C */ s32 steerPosition; // Where the kart is steering, related to joystick position. Basically, in [-53 to 53], but shifted 16 bits left
|
||||
/* 0x007C */ s32 steerPosition; // Where the kart is steering, related to joystick position. Basically, in [-53 to
|
||||
// 53], but shifted 16 bits left
|
||||
/* 0x0080 */ f32 boostPower;
|
||||
/* 0x0084 */ f32 unk_084;
|
||||
/* 0x0088 */ f32 unk_088;
|
||||
@@ -328,7 +329,7 @@ typedef struct {
|
||||
/* 0x01F8 */ f32 unk_1F8;
|
||||
/* 0x01FC */ f32 unk_1FC;
|
||||
/* 0x0200 */ u32 steerChangeIncrement; // May be s32. but less casting required if u32
|
||||
/* 0x0204 */ s16 driftDuration; // charges up while drifting, primarily protects against driving spinouts
|
||||
/* 0x0204 */ s16 driftDuration; // charges up while drifting, primarily protects against driving spinouts
|
||||
/* 0x0206 */ s16 unk_206;
|
||||
/* 0x0208 */ f32 unk_208;
|
||||
/* 0x020C */ f32 unk_20C;
|
||||
|
||||
+62
-58
@@ -330,17 +330,17 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE };
|
||||
*/
|
||||
#define MAX_TIME 0x927C0
|
||||
|
||||
/* The codebase uses 16-bit representations of angles (either u16 or s16 depending on context).
|
||||
Thus, values of [0, 2**16 - 1] (for u16) or [-2**15, 2**15 - 1] (for s16) represent evenly
|
||||
/* The codebase uses 16-bit representations of angles (either u16 or s16 depending on context).
|
||||
Thus, values of [0, 2**16 - 1] (for u16) or [-2**15, 2**15 - 1] (for s16) represent evenly
|
||||
spaced angles around a circle. (e.g. (u16) 0x8000 is 2**15, which represents half a circle, or 180 degrees)
|
||||
|
||||
|
||||
However, it is clear that the developers were thinking in terms of degrees and often worked
|
||||
with values that corresponded to a specific number of degrees. The DEGREES macro converts
|
||||
from the specified number of degrees to the 16-bit representation. This allows readers to
|
||||
think in degrees while leaving the compiled machine code unaffected.
|
||||
|
||||
Note that 2**16 / 360 is not an integer. It has a value of ~182.04, but is rounded to 182
|
||||
by the DEGREES function. There is some inconsistency with how the codebase handles this.
|
||||
Note that 2**16 / 360 is not an integer. It has a value of ~182.04, but is rounded to 182
|
||||
by the DEGREES function. There is some inconsistency with how the codebase handles this.
|
||||
e.g. 70 degrees might be represented as DEGREES(70) or 70 * DEGREES(1), which are slightly
|
||||
different values due to this rounding. As a practical matter, this rounding is less than
|
||||
0.1 degrees in all cases */
|
||||
@@ -349,7 +349,7 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE };
|
||||
// player->unk_046
|
||||
|
||||
/* The first time you touch a penguin or bat, and anytime you touch a thwomp during a
|
||||
race will set a flag which will cause your next spinout to be instant (i.e. no
|
||||
race will set a flag which will cause your next spinout to be instant (i.e. no
|
||||
sliding forward). Probably half-implemented code to prevent sliding through enemies,
|
||||
but causes this bug */
|
||||
#define CRITTER_TOUCH 0x2 // Touched a penguin, bat or thwomp
|
||||
@@ -359,19 +359,21 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE };
|
||||
// player->oobProps
|
||||
/* Deals with the lower out of bounds (OOB) plane on levels. Represented by fluids (water / lava)
|
||||
or nothing for Rainbow Road and Skyscraper. */
|
||||
#define UNDER_OOB_OR_FLUID_LEVEL 0x1 // Set while mostly under the plane. Does not necessarily trigger Lakitu on Koopa Troopa Beach.
|
||||
#define UNDER_OOB_OR_FLUID_LEVEL \
|
||||
0x1 // Set while mostly under the plane. Does not necessarily trigger Lakitu on Koopa Troopa Beach.
|
||||
#define PASS_OOB_OR_FLUID_LEVEL 0x2 // Set when passing through the lower plane in either direction
|
||||
// The next two are also activated when passing through the lower plane.
|
||||
#define UNDER_FLUID_LEVEL 0x4 // Stays active until Lakitu places back on track
|
||||
#define UNDER_OOB_LEVEL 0x8 // Active while under a non-fluid OOB plane. Is momentarily active when passing through fluids.
|
||||
|
||||
#define UNDER_OOB_LEVEL \
|
||||
0x8 // Active while under a non-fluid OOB plane. Is momentarily active when passing through fluids.
|
||||
|
||||
/* UNK_002 has something to do with player animations. Each player has a 32-bit
|
||||
flag broken into 8 groups of 4 bits. Those 4 bits affect how each of the 8 players
|
||||
appear to the specified player */
|
||||
#define CHANGING_ANIMATION 0x1 // Seems to be set when the kart animation has to change.
|
||||
#define UNK_002_UNKNOWN_0x2 0x2
|
||||
#define UNK_002_UNKNOWN_0x4 0x4 /* Unclear, but has to do with viewing the side of player. At least tends to change if target
|
||||
#define UNK_002_UNKNOWN_0x2 0x2
|
||||
#define UNK_002_UNKNOWN_0x4 \
|
||||
0x4 /* Unclear, but has to do with viewing the side of player. At least tends to change if target \
|
||||
player spins. Something with avoding rollover of aniamation frame data? */
|
||||
#define SIDE_OF_KART 0x8 // Seems to be whether you are in a rectangle shooting out from both sides of target player
|
||||
|
||||
@@ -383,62 +385,64 @@ player spins. Something with avoding rollover of aniamation frame data? */
|
||||
#define EXPLOSION 0x1000 // Big shock looking graphic when starting tumble
|
||||
|
||||
// player->lakituProps
|
||||
#define LAKITU_RETRIEVAL 0x1 // While lakitu is grabbing you, but before the scene transition of being placed on the track
|
||||
#define HELD_BY_LAKITU 0x2
|
||||
#define LAKITU_FIZZLE 0x4 // Disintegration and reintegration effect when transitioning from retrieval to placement
|
||||
#define LAKITU_SCENE 0x8 // the whole segment from when lakitu is called to when you regain control
|
||||
#define FRIGID_EFFECT 0x10 // Cold colors on Sherbet Land after in frigid water
|
||||
#define THAWING_EFFECT 0x20 // Regaining usual colors post frigid effect
|
||||
#define FROZEN_EFFECT 0x80 // In the ice cube
|
||||
#define WENT_OVER_OOB 0x100 // Player went over (or is on) an OOB area. Cancelled if touch back in bounds
|
||||
#define LAKITU_LAVA 0x1000 // smoky effect when retrieved from lava
|
||||
#define LAKITU_WATER 0x2000 // dripping effect when retreived from water
|
||||
#define LAKITU_RETRIEVAL \
|
||||
0x1 // While lakitu is grabbing you, but before the scene transition of being placed on the track
|
||||
#define HELD_BY_LAKITU 0x2
|
||||
#define LAKITU_FIZZLE 0x4 // Disintegration and reintegration effect when transitioning from retrieval to placement
|
||||
#define LAKITU_SCENE 0x8 // the whole segment from when lakitu is called to when you regain control
|
||||
#define FRIGID_EFFECT 0x10 // Cold colors on Sherbet Land after in frigid water
|
||||
#define THAWING_EFFECT 0x20 // Regaining usual colors post frigid effect
|
||||
#define FROZEN_EFFECT 0x80 // In the ice cube
|
||||
#define WENT_OVER_OOB 0x100 // Player went over (or is on) an OOB area. Cancelled if touch back in bounds
|
||||
#define LAKITU_LAVA 0x1000 // smoky effect when retrieved from lava
|
||||
#define LAKITU_WATER 0x2000 // dripping effect when retreived from water
|
||||
|
||||
// player->kartProps
|
||||
#define BACK_UP 0x1
|
||||
#define RIGHT_TURN 0x2 // non-drifting (more than 5 degrees)
|
||||
#define LEFT_TURN 0x4 // non-drifting (more than 5 degrees)
|
||||
#define MOVE_BACKWARDS 0x8 // includes lakitu
|
||||
#define LOSE_GP_RACE 0x10 // pointless, only unsets itself
|
||||
#define THROTTLE 0x20 // Closely tied to just pressing A. Possible exception for AB-spins
|
||||
#define EARLY_SPINOUT_RIGHT 0x40 // Spinning out while facing right (not actually used for anything)
|
||||
#define EARLY_SPINOUT_LEFT 0x80 // Spinning out while facing left
|
||||
#define POST_TUMBLE_GAS 0x100 // Causes particles after a vertical tumble, I think
|
||||
#define BECOME_INVISIBLE 0x200
|
||||
#define UNUSED_0x400 0x400 // locked behind 0x800 (func_80091440)
|
||||
#define UNUSED_0x800 0x800 // locked behind 0x400 (func_8002B830 -> func_800911B4)
|
||||
#define UNUSED_0x1000 0x1000 // 0x1000 locked behind 0x400 (func_8002B830 -> func_800911B4)
|
||||
#define UNUSED_0x2000 0x2000 // 0x2000 locked behind 0x400 and 0x800 (func_8002B830 -> func_800911B4, apply_effect -> func_80091298,
|
||||
// func_80091440)
|
||||
#define BACK_UP 0x1
|
||||
#define RIGHT_TURN 0x2 // non-drifting (more than 5 degrees)
|
||||
#define LEFT_TURN 0x4 // non-drifting (more than 5 degrees)
|
||||
#define MOVE_BACKWARDS 0x8 // includes lakitu
|
||||
#define LOSE_GP_RACE 0x10 // pointless, only unsets itself
|
||||
#define THROTTLE 0x20 // Closely tied to just pressing A. Possible exception for AB-spins
|
||||
#define EARLY_SPINOUT_RIGHT 0x40 // Spinning out while facing right (not actually used for anything)
|
||||
#define EARLY_SPINOUT_LEFT 0x80 // Spinning out while facing left
|
||||
#define POST_TUMBLE_GAS 0x100 // Causes particles after a vertical tumble, I think
|
||||
#define BECOME_INVISIBLE 0x200
|
||||
#define UNUSED_0x400 0x400 // locked behind 0x800 (func_80091440)
|
||||
#define UNUSED_0x800 0x800 // locked behind 0x400 (func_8002B830 -> func_800911B4)
|
||||
#define UNUSED_0x1000 0x1000 // 0x1000 locked behind 0x400 (func_8002B830 -> func_800911B4)
|
||||
#define UNUSED_0x2000 \
|
||||
0x2000 // 0x2000 locked behind 0x400 and 0x800 (func_8002B830 -> func_800911B4, apply_effect -> func_80091298,
|
||||
// func_80091440)
|
||||
#define DRIVING_NEAR_SPINOUT 0x4000
|
||||
#define UNKNOWN_BATTLE_VAR 0x8000 // 0x8000 something battle related, unclear if ever set
|
||||
|
||||
/*
|
||||
* @brief triggers indicating that an effect should be applied to a kart
|
||||
*/
|
||||
#define HIT_BANANA_TRIGGER 0x1 // hits a banana
|
||||
#define HIGH_TUMBLE_TRIGGER 0x2 // hit by a red shell, blue shell, or hit a mole
|
||||
#define LOW_TUMBLE_TRIGGER 0x4 // hit by a green shell
|
||||
#define DRIVING_SPINOUT_TRIGGER 0x80 // spinning out from erratic driving
|
||||
#define THWOMP_SQUISH_TRIGGER 0x100 // stomped by thwomp
|
||||
#define SHROOM_TRIGGER 0x200 // being boosted by trigger a mushroom
|
||||
#define BOO_TRIGGER 0x800 // being a boo
|
||||
#define UNUSED_TRIGGER_0x1000 0x1000 // Unused
|
||||
#define STAR_TRIGGER 0x2000 // Starting a star
|
||||
#define LIGHTNING_STRIKE_TRIGGER 0x4000 // Struck by lightning
|
||||
#define BOOST_RAMP_WOOD_TRIGGER 0x8000 // being boosted by a ramp
|
||||
#define UNUSED_TRIGGER_0x20000 0x20000 // Unused
|
||||
#define DRAG_ITEM_EFFECT 0x40000 // holding a non-shell item behind you
|
||||
#define HIT_PADDLE_BOAT_TRIGGER 0x80000 // hit paddle boat
|
||||
#define UNUSED_TRIGGER_0x10000 0x100000 // Unused
|
||||
#define SPINOUT_TRIGGER 0x200000 // hit crab or spiny spinout or losing versus race
|
||||
#define VERTICAL_TUMBLE_TRIGGER 0x400000 // hitting a fake item / bomb / snowman / car / train
|
||||
#define HIT_BANANA_TRIGGER 0x1 // hits a banana
|
||||
#define HIGH_TUMBLE_TRIGGER 0x2 // hit by a red shell, blue shell, or hit a mole
|
||||
#define LOW_TUMBLE_TRIGGER 0x4 // hit by a green shell
|
||||
#define DRIVING_SPINOUT_TRIGGER 0x80 // spinning out from erratic driving
|
||||
#define THWOMP_SQUISH_TRIGGER 0x100 // stomped by thwomp
|
||||
#define SHROOM_TRIGGER 0x200 // being boosted by trigger a mushroom
|
||||
#define BOO_TRIGGER 0x800 // being a boo
|
||||
#define UNUSED_TRIGGER_0x1000 0x1000 // Unused
|
||||
#define STAR_TRIGGER 0x2000 // Starting a star
|
||||
#define LIGHTNING_STRIKE_TRIGGER 0x4000 // Struck by lightning
|
||||
#define BOOST_RAMP_WOOD_TRIGGER 0x8000 // being boosted by a ramp
|
||||
#define UNUSED_TRIGGER_0x20000 0x20000 // Unused
|
||||
#define DRAG_ITEM_EFFECT 0x40000 // holding a non-shell item behind you
|
||||
#define HIT_PADDLE_BOAT_TRIGGER 0x80000 // hit paddle boat
|
||||
#define UNUSED_TRIGGER_0x10000 0x100000 // Unused
|
||||
#define SPINOUT_TRIGGER 0x200000 // hit crab or spiny spinout or losing versus race
|
||||
#define VERTICAL_TUMBLE_TRIGGER 0x400000 // hitting a fake item / bomb / snowman / car / train
|
||||
#define BOOST_RAMP_ASPHALT_TRIGGER 0x800000 // being boosted by a boost pad
|
||||
#define HIT_BY_STAR_TRIGGER 0x1000000 // being hit by a star
|
||||
#define START_BOOST_TRIGGER 0x2000000 // Start boost
|
||||
#define LOSE_BATTLE_EFFECT 0x4000000 // When losing battle mode
|
||||
#define BECOME_BOMB_EFFECT 0x8000000 // When becoming a bomb in battle mode
|
||||
#define START_SPINOUT_TRIGGER 0x10000000 // Spinning out by holding gas at start of race
|
||||
#define HIT_BY_STAR_TRIGGER 0x1000000 // being hit by a star
|
||||
#define START_BOOST_TRIGGER 0x2000000 // Start boost
|
||||
#define LOSE_BATTLE_EFFECT 0x4000000 // When losing battle mode
|
||||
#define BECOME_BOMB_EFFECT 0x8000000 // When becoming a bomb in battle mode
|
||||
#define START_SPINOUT_TRIGGER 0x10000000 // Spinning out by holding gas at start of race
|
||||
|
||||
#define ALL_TRIGGERS (0xFFFFFFFF)
|
||||
#define RACING_SPINOUT_TRIGGERS (SPINOUT_TRIGGER | DRIVING_SPINOUT_TRIGGER | HIT_BANANA_TRIGGER) // 0x200081
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <PR/ultratypes.h>
|
||||
|
||||
#ifndef offsetof
|
||||
#define offsetof(st, m) ((size_t) &(((st*) 0)->m))
|
||||
#define offsetof(st, m) ((size_t) & (((st*) 0)->m))
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
+18
-18
@@ -45,11 +45,11 @@ extern u8 _startupLogoSegmentRomEnd[];
|
||||
// Defines duplicated even if the same for both for easier readability
|
||||
#ifdef AVOID_UB
|
||||
|
||||
#define MEMORY_POOL_START (uintptr_t) &_memoryPoolSegmentNoloadStart[0]
|
||||
#define MEMORY_POOL_END (uintptr_t) &_memoryPoolSegmentNoloadEnd[0]
|
||||
#define MEMORY_POOL_START (uintptr_t) & _memoryPoolSegmentNoloadStart[0]
|
||||
#define MEMORY_POOL_END (uintptr_t) & _memoryPoolSegmentNoloadEnd[0]
|
||||
|
||||
#define SEG_ENDING (uintptr_t) &_endingSegmentStart[0]
|
||||
#define SEG_ENDING_ROM_START (uintptr_t) &_endingSegmentRomStart[0]
|
||||
#define SEG_ENDING (uintptr_t) & _endingSegmentStart[0]
|
||||
#define SEG_ENDING_ROM_START (uintptr_t) & _endingSegmentRomStart[0]
|
||||
/**
|
||||
* Ending segment original size is 0xDF00 but much of that remains unused.
|
||||
* This auto fits the segment to its proper size.
|
||||
@@ -57,20 +57,20 @@ extern u8 _startupLogoSegmentRomEnd[];
|
||||
#define SEG_ENDING_SIZE (size_t) ALIGN16((ptrdiff_t) (&_endingSegmentNoloadEnd[0] - &_endingSegmentStart[0]))
|
||||
#define SEG_ENDING_ROM_SIZE (size_t) ALIGN16((ptrdiff_t) (&_endingSegmentRomEnd[0] - &_endingSegmentRomStart[0]))
|
||||
|
||||
#define SEG_RACING (uintptr_t) &_racingSegmentStart[0]
|
||||
#define SEG_RACING_ROM_START (uintptr_t) &_racingSegmentRomStart[0]
|
||||
#define SEG_RACING (uintptr_t) & _racingSegmentStart[0]
|
||||
#define SEG_RACING_ROM_START (uintptr_t) & _racingSegmentRomStart[0]
|
||||
#define SEG_RACING_SIZE (size_t) ALIGN16((ptrdiff_t) (&_racingSegmentNoloadEnd[0] - &_racingSegmentStart[0]))
|
||||
#define SEG_RACING_ROM_SIZE (size_t) ALIGN16((ptrdiff_t) (&_racingSegmentRomEnd[0] - &_racingSegmentRomStart[0]))
|
||||
|
||||
#define TRIG_TABLES (uintptr_t) &_trigTablesSegmentStart[0]
|
||||
#define TRIG_TABLES_ROM_START (uintptr_t) &_trigTablesSegmentRomStart[0]
|
||||
#define TRIG_TABLES (uintptr_t) & _trigTablesSegmentStart[0]
|
||||
#define TRIG_TABLES_ROM_START (uintptr_t) & _trigTablesSegmentRomStart[0]
|
||||
#define TRIG_TABLES_SIZE (size_t) _trigTablesSegmentSize
|
||||
|
||||
#define SEG_DATA_START (uintptr_t) &_data_segment2SegmentRomStart[0]
|
||||
#define SEG_DATA_END (uintptr_t) &_data_segment2SegmentRomEnd[0]
|
||||
#define SEG_DATA_START (uintptr_t) & _data_segment2SegmentRomStart[0]
|
||||
#define SEG_DATA_END (uintptr_t) & _data_segment2SegmentRomEnd[0]
|
||||
|
||||
#define COMMON_TEXTURES_ROM_START (uintptr_t) &_common_texturesSegmentRomStart[0]
|
||||
#define COMMON_TEXTURES_SIZE (ptrdiff_t) (&_common_texturesSegmentRomEnd[0] - &_common_texturesSegmentRomStart[0])
|
||||
#define COMMON_TEXTURES_ROM_START (uintptr_t) & _common_texturesSegmentRomStart[0]
|
||||
#define COMMON_TEXTURES_SIZE (ptrdiff_t)(&_common_texturesSegmentRomEnd[0] - &_common_texturesSegmentRomStart[0])
|
||||
|
||||
#define CEREMONY_DATA_ROM_START &_ceremonyDataSegmentRomStart[0]
|
||||
#define CEREMONY_DATA_ROM_END &_ceremonyDataSegmentRomEnd[0]
|
||||
@@ -80,7 +80,7 @@ extern u8 _startupLogoSegmentRomEnd[];
|
||||
|
||||
#else // Required for ok
|
||||
|
||||
#define MEMORY_POOL_START (uintptr_t) &_memoryPoolSegmentNoloadStart
|
||||
#define MEMORY_POOL_START (uintptr_t) & _memoryPoolSegmentNoloadStart
|
||||
#define MEMORY_POOL_END (uintptr_t) 0x80242F00
|
||||
|
||||
#define SEG_ENDING (uintptr_t) 0x80280000
|
||||
@@ -96,15 +96,15 @@ extern u8 _startupLogoSegmentRomEnd[];
|
||||
#define SEG_RACING_ROM_SIZE (size_t) ALIGN16((ptrdiff_t) (&_racingSegmentRomEnd[0] - &_racingSegmentRomStart[0]))
|
||||
|
||||
#define TRIG_TABLES (uintptr_t) 0x802BA370
|
||||
#define TRIG_TABLES_ROM_START (uintptr_t) &_trigTablesSegmentRomStart[0]
|
||||
#define TRIG_TABLES_ROM_START (uintptr_t) & _trigTablesSegmentRomStart[0]
|
||||
#define TRIG_TABLES_SIZE (size_t) 0x5810
|
||||
|
||||
#define SEG_DATA_START (uintptr_t) &_data_segment2SegmentRomStart[0]
|
||||
#define SEG_DATA_END (uintptr_t) &_data_segment2SegmentRomEnd[0]
|
||||
#define SEG_DATA_START (uintptr_t) & _data_segment2SegmentRomStart[0]
|
||||
#define SEG_DATA_END (uintptr_t) & _data_segment2SegmentRomEnd[0]
|
||||
|
||||
#define COMMON_TEXTURES_ROM_START (uintptr_t) &_common_texturesSegmentRomStart[0]
|
||||
#define COMMON_TEXTURES_ROM_START (uintptr_t) & _common_texturesSegmentRomStart[0]
|
||||
#define COMMON_TEXTURES_SIZE \
|
||||
(ptrdiff_t) ((uintptr_t) &_common_texturesSegmentRomEnd - (uintptr_t) &_common_texturesSegmentRomStart)
|
||||
(ptrdiff_t)((uintptr_t) & _common_texturesSegmentRomEnd - (uintptr_t) & _common_texturesSegmentRomStart)
|
||||
|
||||
#define CEREMONY_DATA_ROM_START &_ceremonyDataSegmentRomStart[0]
|
||||
#define CEREMONY_DATA_ROM_END &_ceremonyDataSegmentRomEnd[0]
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ enum SeqId {
|
||||
SEQ_EVENT_CEREMONY_PRESENTATION_PART2_WIN, // 0x1B (27)
|
||||
SEQ_EVENT_CEREMONY_TROPHY_CREDITS, // 0x1C (28)
|
||||
SEQ_EVENT_CEREMONY_PRESENTATION_PART2_LOSE, // 0x1D (29)
|
||||
SEQ_COUNT
|
||||
SEQ_COUNT
|
||||
};
|
||||
|
||||
#endif // SEQ_IDS_H
|
||||
|
||||
Reference in New Issue
Block a user