diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2025-02-04 11:55:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-04 06:55:04 -0500 |
| commit | c028db03b47f8b38bc2a1b87569fd7fae0ea9067 (patch) | |
| tree | 99007ef3e69f69b4e6924ba54468adda49461565 /src/code/z_actor.c | |
| parent | 6c06168e7212616ea08460d487a4b99e89a34108 (diff) | |
Finish matching ique-cn (#2451)
* git subrepo clone git@github.com:Thar0/com-plugin.git tools/com-plugin
subrepo:
subdir: "tools/com-plugin"
merged: "e8543312d"
upstream:
origin: "git@github.com:Thar0/com-plugin.git"
branch: "main"
commit: "e8543312d"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* ique-cn OK
* Review suggestions
* Most suggestions
* git subrepo pull tools/com-plugin
subrepo:
subdir: "tools/com-plugin"
merged: "81595ed1c"
upstream:
origin: "git@github.com:Thar0/com-plugin.git"
branch: "main"
commit: "81595ed1c"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* Fix other versions
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 37a370557..f59a996e6 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -15,8 +15,8 @@ #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" -static CollisionPoly* sCurCeilingPoly; -static s32 sCurCeilingBgId; +CollisionPoly* sCurCeilingPoly; +s32 sCurCeilingBgId; #if DEBUG_FEATURES #define ACTOR_DEBUG_PRINTF \ @@ -265,7 +265,10 @@ typedef struct AttentionColor { /* 0x04 */ Color_RGBA8 secondary; // Used for Navi's outer color } AttentionColor; // size = 0x8 -AttentionColor sAttentionColors[ACTORCAT_MAX + 1] = { +// Needs to be static to work around an EGCS codegen bug in Attention_SetNaviState on iQue builds. +// If this isn't static, accessing the element at offset 4 into the struct (secondary.r) will not +// be offset correctly in the compiled code. +static AttentionColor sAttentionColors[ACTORCAT_MAX + 1] = { { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, // ACTORCAT_SWITCH { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, // ACTORCAT_BG { { 255, 255, 255, 255 }, { 0, 0, 255, 0 } }, // ACTORCAT_PLAYER |