hackern64/HackerSM64
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerSM64.git synced 2026-01-21 10:35:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop/2.0.2/fix_objects_rej' of https://github.com/Reonu/HackerSM64 into develop/arceveti/general_2

Browse Source
This commit is contained in:
Arceveti
2022-01-23 13:54:31 -08:00
parent 59bfc5b19e 7714accddd
commit 0587fa2a1d
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/engine/behavior_script.c
View File

@@ -908,20 +908,11 @@ void cur_obj_update(void) {
COND_BIT((objFlags & OBJ_FLAG_OCCLUDE_SILHOUETTE), o->header.gfx.node.flags, GRAPH_RENDER_OCCLUDE_SILHOUETTE);
#endif
#ifdef OBJECTS_REJ
s32 objListIndex = OBJ_LIST_PLAYER;
BehaviorScript *bhvScript = segmented_to_virtual(o->behavior);
if ((bhvScript[0] >> 24) == 0) {
objListIndex = ((bhvScript[0] >> 16) & 0xFFFF);
}
if (objFlags & OBJ_FLAG_UCODE_SMALL) {
o->header.gfx.ucode = GRAPH_NODE_UCODE_REJ;
}
else {
} else {
o->header.gfx.ucode = GRAPH_NODE_UCODE_DEFAULT;
}
#endif
#ifdef OBJ_OPACITY_BY_CAM_DIST
if (objFlags & OBJ_FLAG_OPACITY_FROM_CAMERA_DIST) {

2
src/game/rendering_graph_node.c
View File

@@ -248,7 +248,7 @@ void switch_ucode(s32 ucode) {
switch (ucode) {
default: // GRAPH_NODE_UCODE_DEFAULT
case GRAPH_NODE_UCODE_DEFAULT:
gSPLoadUcodeL(gDisplayListHead++, gspF3DZEX2_PosLight_fifo); // F3DZEX2_PosLight
gSPLoadUcodeL(gDisplayListHead++, gspF3DZEX2_NoN_PosLight_fifo); // F3DZEX2_PosLight
// Reload the necessary RSP settings
gSPDisplayList(gDisplayListHead++, init_rsp);
break;