diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 13 | ||||
| -rw-r--r-- | src/code/z_camera.c | 2 | ||||
| -rw-r--r-- | src/code/z_collision_check.c | 2 | ||||
| -rw-r--r-- | src/code/z_kaleido_scope_call.c | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 7029834af..13cd13160 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -41,8 +41,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" \ - "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:0" \ + "ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" CollisionPoly* sCurCeilingPoly; s32 sCurCeilingBgId; @@ -313,8 +313,7 @@ static AttentionColor sAttentionColors[ACTORCAT_MAX + 1] = { { { 0, 255, 0, 255 }, { 0, 255, 0, 0 } }, // unused extra entry }; -// unused -Gfx D_80115FF0[] = { +Gfx gActorSetupOpaDL[] = { gsSPEndDisplayList(), }; @@ -2126,8 +2125,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.0:22 ntsc-1.1:22 ntsc-1.2:22 pal-1.0:22 pal-1.1:22" +#pragma increment_block_number "gc-eu:23 gc-eu-mq:23 gc-jp:23 gc-jp-ce:23 gc-jp-mq:23 gc-us:23 gc-us-mq:23" \ + "ntsc-1.0:23 ntsc-1.1:23 ntsc-1.2:23 pal-1.0:23 pal-1.1:23" // Local data used for Farore's Wind light (stored in BSS) LightInfo D_8015BC00; @@ -4717,7 +4716,7 @@ void func_8003555C(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { Vec3f D_80116268 = { 0.0f, -1.5f, 0.0f }; Vec3f D_80116274 = { 0.0f, -0.2f, 0.0f }; -Gfx D_80116280[] = { +Gfx gActorSetupXluDL[] = { gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2 | Z_UPD), gsDPSetAlphaCompare(G_AC_THRESHOLD), gsSPEndDisplayList(), diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 3baaf6579..b94c5beda 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -3661,7 +3661,7 @@ s32 Camera_KeepOn3(Camera* camera) { } #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" \ - "ique-cn:128 ntsc-1.0:73 ntsc-1.1:73 ntsc-1.2:73 pal-1.0:73 pal-1.1:73" + "ique-cn:128 ntsc-1.0:72 ntsc-1.1:72 ntsc-1.2:72 pal-1.0:72 pal-1.1:72" s32 Camera_KeepOn4(Camera* camera) { static Vec3f sAtTarget; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 2b7ed05de..791a3fca6 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -17,7 +17,7 @@ #include "z_lib.h" #pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ - "ique-cn:192 ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160" + "ique-cn:192 ntsc-1.0:152 ntsc-1.1:152 ntsc-1.2:152 pal-1.0:152 pal-1.1:152" typedef s32 (*ColChkResetFunc)(PlayState*, Collider*); typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*); diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index ca7637214..406d38406 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -1,4 +1,4 @@ -#pragma increment_block_number "gc-eu:80 gc-eu-mq:80 gc-jp:80 gc-jp-ce:80 gc-jp-mq:80 gc-us:80 gc-us-mq:80 ique-cn:64" \ +#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64 ique-cn:64" \ "ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:80 pal-1.0:80 pal-1.1:80" #include "libu64/debug.h" |