Use microcode that clips

lambertjamesd · Aug 20, 2023 · e470af2 · e470af2
1 parent d4b958a
commit e470af2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/megatextures.ld b/megatextures.ld
@@ -35,13 +35,13 @@ SECTIONS
       build/asm/entry.o(.text);
       CODE_SEGMENT(.text);
       /usr/lib/n64/PR/rspboot.o(.text);
-      /usr/lib/n64/PR/gspF3DEX2.NoN.fifo.o(.text);
+      /usr/lib/n64/PR/gspF3DEX2.fifo.o(.text);
       /usr/lib/n64/PR/aspMain.o(.text);
 
       /* data */
       CODE_SEGMENT(.data*);
       /usr/lib/n64/PR/rspboot.o(.data*);
-      /usr/lib/n64/PR/gspF3DEX2.NoN.fifo.o(.data*);
+      /usr/lib/n64/PR/gspF3DEX2.fifo.o(.data*);
       /usr/lib/n64/PR/aspMain.o(.data*);
 
       /* rodata */

diff --git a/src/graphics/graphics.c b/src/graphics/graphics.c
@@ -115,8 +115,8 @@ int graphicsCreateTask(struct GraphicsTask* targetTask, GraphicsCallback callbac
     task->flags = OS_TASK_LOADABLE;
     task->ucode_boot = (u64*)rspbootTextStart;
     task->ucode_boot_size = (u32)rspbootTextEnd - (u32)rspbootTextStart;
-    task->ucode = (u64*)gspF3DEX2_NoN_fifoTextStart;
-    task->ucode_data = (u64*)gspF3DEX2_NoN_fifoDataStart;
+    task->ucode = (u64*)gspF3DEX2_fifoTextStart;
+    task->ucode_data = (u64*)gspF3DEX2_fifoDataStart;
     task->output_buff = (u64*)rdpOutput;
     task->output_buff_size = (u64*)rdpOutput + RDP_OUTPUT_SIZE/sizeof(u64);
     task->ucode_data_size = SP_UCODE_DATA_SIZE;

diff --git a/src/scene/scene.c b/src/scene/scene.c
@@ -26,7 +26,7 @@
 #define FADE_IN_TIME    2.0f
 
 void sceneInit(struct Scene* scene) {
-    cameraInit(&scene->camera, 70.0f, 0.125f * SCENE_SCALE, 20.0f * SCENE_SCALE);
+    cameraInit(&scene->camera, 70.0f, 0.05f * SCENE_SCALE, 20.0f * SCENE_SCALE);
 
     scene->camera.transform.position.x = 0.0f;
     scene->camera.transform.position.y = PLAYER_HEAD_HEIGHT;