diff options
| author | cadmic <cadmic24@gmail.com> | 2024-09-28 17:52:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-28 20:52:45 -0400 |
| commit | f7f38ff87498b6b18fe524d6750d1eef7e9f579a (patch) | |
| tree | d5d0b665756303884f1054b13dab70bff502bcc3 /src/code/z_actor.c | |
| parent | 04498f808f6607616e587d31d0518292a736d378 (diff) | |
[PAL N64] Completely match pal-1.0 and pal-1.1 and add to CI (#2246)
* [PAL N64] Match pal-1.0 and pal-1.1 and add to CI
* bss fixes from Jenkins
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 39c1ecdea..f0d43e632 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -12,7 +12,7 @@ #include "assets/objects/object_bdoor/object_bdoor.h" #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.2:0" + "ntsc-1.2:0 pal-1.0:0 pal-1.1:0" static CollisionPoly* sCurCeilingPoly; static s32 sCurCeilingBgId; @@ -2071,7 +2071,8 @@ s32 func_8002F9EC(PlayState* play, Actor* actor, CollisionPoly* poly, s32 bgId, return false; } -#pragma increment_block_number "gc-eu:22 gc-eu-mq:22 gc-jp:22 gc-jp-ce:22 gc-jp-mq:22 gc-us:22 gc-us-mq:22 ntsc-1.2:22" +#pragma increment_block_number "gc-eu:22 gc-eu-mq:22 gc-jp:22 gc-jp-ce:22 gc-jp-mq:22 gc-us:22 gc-us-mq:22" \ + "ntsc-1.2:22 pal-1.0:22 pal-1.1:22" // Local data used for Farore's Wind light (stored in BSS) LightInfo D_8015BC00; |