diff options
| author | Jcw87 <Jcw87@users.noreply.github.com> | 2023-11-22 20:51:47 -0800 |
|---|---|---|
| committer | Jcw87 <Jcw87@users.noreply.github.com> | 2023-12-10 01:25:36 -0800 |
| commit | e2a3c6b7bf292d671bb100643d83ae6d854d23e3 (patch) | |
| tree | 7c0b46430779bae6e198289064a3b57feab0a15a /src/d/actor/d_a_hookshot.cpp | |
| parent | 1087848ba77925c4d4fe0e5e3993c8416c9e886b (diff) | |
use macros for compiler alignment and section directives
Diffstat (limited to 'src/d/actor/d_a_hookshot.cpp')
| -rw-r--r-- | src/d/actor/d_a_hookshot.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index 4a82736c..cf9b863d 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -10,12 +10,13 @@ #include "SSystem/SComponent/c_counter.h" #include "d/actor/d_a_player_main.h" #include "d/d_procname.h" +#include "global.h" // Needed for the .data section to match. static Vec dummy_2100 = {1.0f, 1.0f, 1.0f}; static Vec dummy_2080 = {1.0f, 1.0f, 1.0f}; -static u8 l_chainS3TCTEX[] __attribute__((aligned(32))) = { +static u8 l_chainS3TCTEX[] ALIGN_DECL(32) = { 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDE, 0xDB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDE, 0xDB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -82,7 +83,7 @@ static cXy l_texCoord[0xC] = { {0.961538, 0.983522}, }; -static u8 l_chainDL[] __attribute__((aligned(32))) = { +static u8 l_chainDL[] ALIGN_DECL(32) = { 0x98, 0x00, 0x06, 0x01, 0x0A, 0x07, 0x0B, 0x09, 0x08, 0x0B, 0x09, 0x02, 0x08, 0x08, 0x09, 0x98, 0x00, 0x06, 0x0B, 0x07, 0x07, 0x06, 0x0A, 0x04, 0x04, 0x05, 0x09, 0x07, 0x01, 0x06, 0x98, 0x00, 0x06, 0x08, 0x03, 0x0B, 0x02, 0x05, 0x00, 0x0A, 0x01, 0x02, 0x03, 0x09, 0x02, @@ -96,7 +97,7 @@ static u8 l_chainDL[] __attribute__((aligned(32))) = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -static u8 l_matDL[] __attribute__((aligned(32))) = { +static u8 l_matDL[] ALIGN_DECL(32) = { 0x61, 0x80, 0x00, 0x01, 0x3A, 0x61, 0x84, 0x00, 0x00, 0x00, 0x61, 0x88, 0xE0, 0x7C, 0x1F, |