diff options
| author | cadmic <cadmic24@gmail.com> | 2024-09-12 11:10:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-12 14:10:43 -0400 |
| commit | f089adf20c0f285925e67800723254a80c67db6e (patch) | |
| tree | fb82055b46202c80ed0dace5bccc4d850575f457 /src/code/z_actor.c | |
| parent | 09c1816e2d6c4da8468c59d69454aa3e6a9ef27f (diff) | |
[ntsc-1.2] Match ntsc-1.2 BSS and add to CI (#2187)
* Match ntsc-1.2
* Add ntsc-1.2 to CI
* Apply fixes from Jenkins
* Promote ntsc-1.2 to "supported" in Makefile
* Declare D_80858AD8 as a u64 array
* Tweak wording
* Hopefully make ntsc-1.2 bss more stable
* Restore segmented_address.h include
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 e0d1c5042..e36110e79 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -11,7 +11,8 @@ #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #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" +#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" static CollisionPoly* sCurCeilingPoly; static s32 sCurCeilingBgId; @@ -2019,7 +2020,7 @@ 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" +#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" // Local data used for Farore's Wind light (stored in BSS) LightInfo D_8015BC00; |