diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-11-24 23:41:23 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 21:41:23 -0500 |
| commit | c36decaf50c2deaf5010edbf73de8e0e3d725d48 (patch) | |
| tree | 0203a639ee6c1c53127c8e2c64fe1ad72dce2058 /include | |
| parent | 665283432b7df51b8e031e91ad949402109a570f (diff) | |
Texture alignment macro and a bit of cleaning (#927)
* Add ALIGNED8
* Add designated initializers for cutscene macros
* Fix typo in ovl_Boss_Sst XML
* Fix extraction of ovlMagicDark
* names suggestions
* Remove braces
* fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/command_macros_base.h | 6 | ||||
| -rw-r--r-- | include/macros.h | 6 | ||||
| -rw-r--r-- | include/z64cutscene_commands.h | 14 |
3 files changed, 19 insertions, 7 deletions
diff --git a/include/command_macros_base.h b/include/command_macros_base.h index b6154b863..3f1a1a0d0 100644 --- a/include/command_macros_base.h +++ b/include/command_macros_base.h @@ -16,6 +16,12 @@ #define CMD_W(a) (a) +#ifdef __GNUC__ +#define CMD_F(a) {.f = (a)} +#else +#define CMD_F(a) {(a)} +#endif + #define CMD_PTR(a) (u32)(a) #endif diff --git a/include/macros.h b/include/macros.h index c1a1c0e02..a47fd9a83 100644 --- a/include/macros.h +++ b/include/macros.h @@ -164,4 +164,10 @@ extern GraphicsContext* __gfxCtx; ((height)-1) << G_TEXTURE_IMAGE_FRAC); \ } while (0) +#ifdef __GNUC__ +#define ALIGNED8 __attribute__ ((aligned (8))) +#else +#define ALIGNED8 +#endif + #endif diff --git a/include/z64cutscene_commands.h b/include/z64cutscene_commands.h index de3ad2fea..77ebb9e18 100644 --- a/include/z64cutscene_commands.h +++ b/include/z64cutscene_commands.h @@ -33,7 +33,7 @@ * size = 0x10 */ #define CS_CAM_POS(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_W(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) + CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) /** * ARGS @@ -55,7 +55,7 @@ * size = 0x10 */ #define CS_CAM_FOCUS_POINT(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_W(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) + CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) /** * ARGS @@ -122,7 +122,7 @@ * size = 0x10 */ #define CS_CAM_POS_PLAYER(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_W(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) + CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) /** * ARGS @@ -144,7 +144,7 @@ * size = 0x10 */ #define CS_CAM_FOCUS_POINT_PLAYER(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_W(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) + CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) /** * ARGS @@ -167,7 +167,7 @@ * size = 0x10 */ #define CS_CMD_07(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_W(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) + CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) /** * ARGS @@ -190,7 +190,7 @@ * size = 0x10 */ #define CS_CMD_08(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_W(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) + CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) /** * ARGS @@ -257,7 +257,7 @@ CMD_HH(npcAction, startFrame), CMD_HH(endFrame, rotX), CMD_HH(rotY, rotZ), \ CMD_W(startX), CMD_W(startY), CMD_W(startZ), \ CMD_W(endX), CMD_W(endY), CMD_W(endZ), \ - CMD_W(normX), CMD_W(normY), CMD_W(normZ) + CMD_F(normX), CMD_F(normY), CMD_F(normZ) /** * ARGS |