diff --git a/actors/chillychief/geo.inc.c b/actors/chillychief/geo.inc.c index 96ec2e1c..78a0bfa2 100644 --- a/actors/chillychief/geo.inc.c +++ b/actors/chillychief/geo.inc.c @@ -5,39 +5,39 @@ const GeoLayout chilly_chief_geo[] = { GEO_OPEN_NODE(), GEO_SCALE(0, 0x7333), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 75, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 75, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 146, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 146, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, chilly_chief_seg6_dl_06002B30), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, chilly_chief_seg6_dl_06002B30), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 0, 0, -75, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, -75, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 146, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 146, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, chilly_chief_seg6_dl_06002BC8), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, chilly_chief_seg6_dl_06002BC8), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), GEO_BILLBOARD(), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_ALPHA, chilly_chief_seg6_dl_06002D88), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, chilly_chief_seg6_dl_06002C60), - GEO_ANIMATED_PART(4, 0, 0, 0, chilly_chief_seg6_dl_06003010), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, chilly_chief_seg6_dl_06002C60), + GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, chilly_chief_seg6_dl_06003010), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -51,39 +51,39 @@ const GeoLayout chilly_chief_big_geo[] = { GEO_OPEN_NODE(), GEO_SCALE(0, 0xE666), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 75, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 75, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 146, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 146, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, chilly_chief_seg6_dl_06002B30), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, chilly_chief_seg6_dl_06002B30), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 0, 0, -75, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, -75, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 146, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 146, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, chilly_chief_seg6_dl_06002BC8), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, chilly_chief_seg6_dl_06002BC8), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), GEO_BILLBOARD(), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_ALPHA, chilly_chief_seg6_dl_06002EF0), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, chilly_chief_seg6_dl_06002C60), - GEO_ANIMATED_PART(4, 0, 0, 0, chilly_chief_seg6_dl_06003010), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, chilly_chief_seg6_dl_06002C60), + GEO_ANIMATED_PART(LAYER_ALPHA, 0, 0, 0, chilly_chief_seg6_dl_06003010), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), diff --git a/actors/group11.c b/actors/group11.c index 2dddacb5..669a72c8 100644 --- a/actors/group11.c +++ b/actors/group11.c @@ -13,7 +13,6 @@ UNUSED static const u64 binid_0 = 0; #include "wiggler_body/model.inc.c" #include "wiggler_body/anims/data.inc.c" -#include "wiggler_body/geo.inc.c" #include "wiggler_body/anims/table.inc.c" #include "wiggler_head/model.inc.c" diff --git a/actors/group11_geo.c b/actors/group11_geo.c index 5a3f296c..ae26eddc 100644 --- a/actors/group11_geo.c +++ b/actors/group11_geo.c @@ -8,6 +8,7 @@ #include "group11.h" #include "bubba/geo.inc.c" +#include "wiggler_body/geo.inc.c" #include "wiggler_head/geo.inc.c" #include "lakitu_enemy/geo.inc.c" #include "spiny_egg/geo.inc.c" diff --git a/actors/group16.c b/actors/group16.c index 5435ac0f..50338e05 100644 --- a/actors/group16.c +++ b/actors/group16.c @@ -10,7 +10,6 @@ #include "chillychief/model.inc.c" #include "chillychief/anims/data.inc.c" -#include "chillychief/geo.inc.c" #include "chillychief/anims/table.inc.c" UNUSED static const u64 binid_0 = 0; diff --git a/actors/group16_geo.c b/actors/group16_geo.c index ab80df19..114eb979 100644 --- a/actors/group16_geo.c +++ b/actors/group16_geo.c @@ -7,4 +7,5 @@ #include "common1.h" #include "group16.h" +#include "chillychief/geo.inc.c" #include "moneybag/geo.inc.c" diff --git a/actors/group4.c b/actors/group4.c index 080a026d..d9a0e4ee 100644 --- a/actors/group4.c +++ b/actors/group4.c @@ -14,7 +14,6 @@ UNUSED static const u64 binid_0 = 0; #include "manta/model.inc.c" #include "manta/anims/data.inc.c" -#include "manta/geo.inc.c" #include "manta/anims/table.inc.c" UNUSED static const u64 binid_1 = 1; diff --git a/actors/group4_geo.c b/actors/group4_geo.c index 6e93672f..c922414b 100644 --- a/actors/group4_geo.c +++ b/actors/group4_geo.c @@ -8,5 +8,6 @@ #include "group4.h" #include "clam_shell/geo.inc.c" +#include "manta/geo.inc.c" #include "sushi/geo.inc.c" #include "unagi/geo.inc.c" diff --git a/actors/manta/geo.inc.c b/actors/manta/geo.inc.c index d60ce675..4c669e7d 100644 --- a/actors/manta/geo.inc.c +++ b/actors/manta/geo.inc.c @@ -2,56 +2,56 @@ const GeoLayout manta_seg5_geo_05008D14[] = { GEO_SCALE(0, 16384), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, manta_seg5_dl_05006750), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, manta_seg5_dl_05006750), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 440, 220, 6, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 440, 220, 6, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, manta_seg5_dl_05005358), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, manta_seg5_dl_05005358), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 220, 0, 0, manta_seg5_dl_050055A8), + GEO_ANIMATED_PART(LAYER_OPAQUE, 220, 0, 0, manta_seg5_dl_050055A8), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 180, 0, 0, manta_seg5_dl_05005768), + GEO_ANIMATED_PART(LAYER_OPAQUE, 180, 0, 0, manta_seg5_dl_05005768), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 440, -220, 6, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 440, -220, 6, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, manta_seg5_dl_05005C38), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, manta_seg5_dl_05005C38), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 220, 0, 0, manta_seg5_dl_05005E88), + GEO_ANIMATED_PART(LAYER_OPAQUE, 220, 0, 0, manta_seg5_dl_05005E88), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 180, 0, 0, manta_seg5_dl_05006048), + GEO_ANIMATED_PART(LAYER_OPAQUE, 180, 0, 0, manta_seg5_dl_05006048), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, manta_seg5_dl_05006C08), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, manta_seg5_dl_05006C08), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 168, 0, 0, manta_seg5_dl_05006B70), + GEO_ANIMATED_PART(LAYER_OPAQUE, 168, 0, 0, manta_seg5_dl_05006B70), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 236, 0, 0, manta_seg5_dl_05006B08), - GEO_ANIMATED_PART(1, 236, 0, 0, manta_seg5_dl_05004E90), + GEO_ANIMATED_PART(LAYER_OPAQUE, 236, 0, 0, manta_seg5_dl_05006B08), + GEO_ANIMATED_PART(LAYER_OPAQUE, 236, 0, 0, manta_seg5_dl_05004E90), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 688, 120, -6, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 688, 120, -6, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, manta_seg5_dl_05005038), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, manta_seg5_dl_05005038), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 668, 170, 6, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 668, 170, 6, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, manta_seg5_dl_05004DB8), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, manta_seg5_dl_05004DB8), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 688, -120, -6, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 688, -120, -6, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, manta_seg5_dl_05005918), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, manta_seg5_dl_05005918), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, 668, -170, 6, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 668, -170, 6, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, manta_seg5_dl_05004A70), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, manta_seg5_dl_05004A70), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), diff --git a/actors/wiggler_body/geo.inc.c b/actors/wiggler_body/geo.inc.c index a55a1f93..38568c74 100644 --- a/actors/wiggler_body/geo.inc.c +++ b/actors/wiggler_body/geo.inc.c @@ -4,9 +4,9 @@ const GeoLayout wiggler_body_geo[] = { GEO_OPEN_NODE(), GEO_SCALE(0, 16384), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, NULL), GEO_OPEN_NODE(), GEO_BILLBOARD(), GEO_OPEN_NODE(), @@ -14,23 +14,23 @@ const GeoLayout wiggler_body_geo[] = { GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, -31, 0, 51, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, -31, 0, 51, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, wiggler_seg5_dl_0500BE98), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wiggler_seg5_dl_0500BE98), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 39, 0, 0, wiggler_seg5_dl_0500BE10), + GEO_ANIMATED_PART(LAYER_OPAQUE, 39, 0, 0, wiggler_seg5_dl_0500BE10), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 41, 0, 0, wiggler_seg5_dl_0500BCB8), + GEO_ANIMATED_PART(LAYER_OPAQUE, 41, 0, 0, wiggler_seg5_dl_0500BCB8), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), - GEO_ANIMATED_PART(1, -31, 0, -49, NULL), + GEO_ANIMATED_PART(LAYER_OPAQUE, -31, 0, -49, NULL), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 0, 0, 0, wiggler_seg5_dl_0500C100), + GEO_ANIMATED_PART(LAYER_OPAQUE, 0, 0, 0, wiggler_seg5_dl_0500C100), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 39, 0, 0, wiggler_seg5_dl_0500C078), + GEO_ANIMATED_PART(LAYER_OPAQUE, 39, 0, 0, wiggler_seg5_dl_0500C078), GEO_OPEN_NODE(), - GEO_ANIMATED_PART(1, 41, 0, 0, wiggler_seg5_dl_0500BF20), + GEO_ANIMATED_PART(LAYER_OPAQUE, 41, 0, 0, wiggler_seg5_dl_0500BF20), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), diff --git a/src/engine/graph_node.h b/src/engine/graph_node.h index c8d48f89..89276f59 100644 --- a/src/engine/graph_node.h +++ b/src/engine/graph_node.h @@ -17,9 +17,6 @@ // Whether the node type has a function pointer of type GraphNodeFunc #define GRAPH_NODE_TYPE_FUNCTIONAL 0x100 -// Type used for Bowser and an unused geo function in obj_behaviors.c -#define GRAPH_NODE_TYPE_400 0x400 - // The discriminant for different types of geo nodes #define GRAPH_NODE_TYPE_ROOT 0x001 #define GRAPH_NODE_TYPE_ORTHO_PROJECTION 0x002 diff --git a/src/game/geo_misc.c b/src/game/geo_misc.c index 61d7a8c0..383f5fff 100644 --- a/src/game/geo_misc.c +++ b/src/game/geo_misc.c @@ -96,7 +96,7 @@ Gfx *geo_exec_inside_castle_light(s32 callContext, struct GraphNode *node, UNUSE } generatedNode = (struct GraphNodeGenerated *) node; - generatedNode->fnNode.node.flags = (generatedNode->fnNode.node.flags & 0xFF) | 0x500; + generatedNode->fnNode.node.flags = (generatedNode->fnNode.node.flags & 0xFF) | (LAYER_TRANSPARENT << 8); gSPDisplayList(displayListHead++, dl_castle_lobby_wing_cap_light); gSPEndDisplayList(displayListHead); @@ -149,7 +149,7 @@ Gfx *geo_exec_flying_carpet_create(s32 callContext, struct GraphNode *node, UNUS return NULL; } - generatedNode->fnNode.node.flags = (generatedNode->fnNode.node.flags & 0xFF) | 0x100; + generatedNode->fnNode.node.flags = (generatedNode->fnNode.node.flags & 0xFF) | (LAYER_OPAQUE << 8); for (n = 0; n <= 20; n++) { row = n / 3; @@ -202,7 +202,7 @@ Gfx *geo_exec_cake_end_screen(s32 callContext, struct GraphNode *node, UNUSED f3 displayList = alloc_display_list(3 * sizeof(*displayList)); displayListHead = displayList; - generatedNode->fnNode.node.flags = (generatedNode->fnNode.node.flags & 0xFF) | 0x100; + generatedNode->fnNode.node.flags = (generatedNode->fnNode.node.flags & 0xFF) | (LAYER_OPAQUE << 8); #ifdef VERSION_EU gSPDisplayList(displayListHead++, dl_cake_end_screen); #else diff --git a/src/game/level_geo.c b/src/game/level_geo.c index 1fc4b88e..f7e40543 100644 --- a/src/game/level_geo.c +++ b/src/game/level_geo.c @@ -40,7 +40,7 @@ Gfx *geo_envfx_main(s32 callContext, struct GraphNode *node, Mat4 mtxf) { mtxf_to_mtx(mtx, mtxf); gSPMatrix(&gfx[0], VIRTUAL_TO_PHYSICAL(mtx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); gSPBranchList(&gfx[1], VIRTUAL_TO_PHYSICAL(particleList)); - execNode->fnNode.node.flags = (execNode->fnNode.node.flags & 0xFF) | 0x400; + execNode->fnNode.node.flags = (execNode->fnNode.node.flags & 0xFF) | (LAYER_ALPHA << 8); } SET_HIGH_U16_OF_32(*params, gAreaUpdateCounter); } diff --git a/src/game/obj_behaviors.c b/src/game/obj_behaviors.c index fdfc70fa..4432645a 100644 --- a/src/game/obj_behaviors.c +++ b/src/game/obj_behaviors.c @@ -108,7 +108,7 @@ Gfx UNUSED *geo_obj_transparency_something(s32 callContext, struct GraphNode *no gfxHead = alloc_display_list(3 * sizeof(Gfx)); gfx = gfxHead; obj->header.gfx.node.flags = - (obj->header.gfx.node.flags & 0xFF) | (GRAPH_NODE_TYPE_FUNCTIONAL | GRAPH_NODE_TYPE_400); + (obj->header.gfx.node.flags & 0xFF) | (LAYER_TRANSPARENT << 8); gDPSetEnvColor(gfx++, 255, 255, 255, heldObject->oOpacity); diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c index 3a37f3d5..f9a144cb 100644 --- a/src/game/object_helpers.c +++ b/src/game/object_helpers.c @@ -76,20 +76,20 @@ Gfx *geo_update_layer_transparency(s32 callContext, struct GraphNode *node, UNUS if (objectOpacity == 0xFF) { if (currentGraphNode->parameter == 20) { currentGraphNode->fnNode.node.flags = - 0x600 | (currentGraphNode->fnNode.node.flags & 0xFF); + (LAYER_TRANSPARENT_DECAL << 8) | (currentGraphNode->fnNode.node.flags & 0xFF); } else { currentGraphNode->fnNode.node.flags = - 0x100 | (currentGraphNode->fnNode.node.flags & 0xFF); + (LAYER_OPAQUE << 8) | (currentGraphNode->fnNode.node.flags & 0xFF); } objectGraphNode->oAnimState = 0; } else { if (currentGraphNode->parameter == 20) { currentGraphNode->fnNode.node.flags = - 0x600 | (currentGraphNode->fnNode.node.flags & 0xFF); + (LAYER_TRANSPARENT_DECAL << 8) | (currentGraphNode->fnNode.node.flags & 0xFF); } else { currentGraphNode->fnNode.node.flags = - 0x500 | (currentGraphNode->fnNode.node.flags & 0xFF); + (LAYER_TRANSPARENT << 8) | (currentGraphNode->fnNode.node.flags & 0xFF); } objectGraphNode->oAnimState = 1; diff --git a/src/game/screen_transition.c b/src/game/screen_transition.c index 52452b82..9347e223 100644 --- a/src/game/screen_transition.c +++ b/src/game/screen_transition.c @@ -297,7 +297,7 @@ Gfx *geo_cannon_circle_base(s32 callContext, struct GraphNode *node, UNUSED Mat4 if (callContext == GEO_CONTEXT_RENDER && gCurrentArea != NULL && gCurrentArea->camera->mode == CAMERA_MODE_INSIDE_CANNON) { - graphNode->fnNode.node.flags = (graphNode->fnNode.node.flags & 0xFF) | 0x500; + graphNode->fnNode.node.flags = (graphNode->fnNode.node.flags & 0xFF) | (LAYER_TRANSPARENT << 8); dlist = render_cannon_circle_base(); } return dlist;