print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

whoops didn't commit everything

Browse Source
This commit is contained in:
CrashOveride95
2021-08-22 11:59:26 -04:00
parent 4ea65071f3
commit 587137a5fe
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/area.c
View File

@@ -298,6 +298,7 @@ void area_update_objects(void) {
* transition type, time in frames, and the RGB color that will fill the screen.
*/
void play_transition(s16 transType, s16 time, u8 red, u8 green, u8 blue) {
#ifndef L3DEX2_ALONE
gWarpTransition.isActive = TRUE;
gWarpTransition.type = transType;
gWarpTransition.time = time;
@@ -348,6 +349,7 @@ void play_transition(s16 transType, s16 time, u8 red, u8 green, u8 blue) {
gWarpTransition.data.endTexRadius = GFX_DIMENSIONS_FULL_RADIUS;
}
}
#endif
}
/*

5
src/game/game_init.c
View File

@@ -269,7 +269,10 @@ void create_gfx_task_structure(void) {
gGfxSPTask->task.t.ucode_boot = rspbootTextStart;
gGfxSPTask->task.t.ucode_boot_size = ((u8 *) rspbootTextEnd - (u8 *) rspbootTextStart);
gGfxSPTask->task.t.flags = 0;
#ifdef F3DZEX_GBI_2
#ifdef L3DEX2_ALONE
gGfxSPTask->task.t.ucode = gspL3DEX2_fifoTextStart;
gGfxSPTask->task.t.ucode_data = gspL3DEX2_fifoDataStart;
#elif F3DZEX_GBI_2
gGfxSPTask->task.t.ucode = gspF3DZEX2_PosLight_fifoTextStart;
gGfxSPTask->task.t.ucode_data = gspF3DZEX2_PosLight_fifoDataStart;
#elif F3DEX2PL_GBI

2
src/game/level_geo.c
View File

@@ -70,9 +70,11 @@ Gfx *geo_skybox_main(s32 callContext, struct GraphNode *node, UNUSED Mat4 *mtx)
struct GraphNodePerspective *camFrustum =
(struct GraphNodePerspective *) camNode->fnNode.node.parent;
#ifndef L3DEX2_ALONE
gfx = create_skybox_facing_camera(0, backgroundNode->background, camFrustum->fov, gLakituState.pos[0],
gLakituState.pos[1], gLakituState.pos[2], gLakituState.focus[0],
gLakituState.focus[1], gLakituState.focus[2]);
#endif
}
return gfx;

2
src/game/screen_transition.c
View File

@@ -298,7 +298,9 @@ 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;
#ifndef L3DEX2_ALONE
dlist = render_cannon_circle_base();
#endif
}
return dlist;
}