diff --git a/include/common.h b/include/common.h
index 8c1208f..44686dc 100644
--- a/include/common.h
+++ b/include/common.h
@@ -171,8 +171,6 @@ extern u8 SP_THREAD_800BE1C0[1];
 extern void* D_800AA41C;
 extern u8 D_594284;
 
-extern void (*SWAP_BUFFER_FUNC)(void** buffers);
-
 extern Stack__dma_load_loop *D_800E9178[0];
 extern u8 nuScPreNMIFlag;
 extern OSMesgQueue MQ_800B9C40;
@@ -192,7 +190,6 @@ extern void __something_display_list(Gfx*, s32, s32, s32);
 extern void func_80089A10();
 
 extern void __osViSwapBuffer_3(void** buffers);
-extern void set_swap_buffer_func(void (*arg0)(void**));
 
 extern s32 func_80089CF8(s16 arg0, s32 arg1);
 extern void __controller_thread_80089D9C(void*);
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index e2ea884..941f541 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -12,6 +12,8 @@ nuGfxFunc = 0x800AA090;
 nuGfxPreNMIFunc = 0x800AA094;
 nuGfxTaskSpool = 0x800E79A4;
 nuGfxThread = 0x800BE1C0;
+nuGfxSwapCfbFunc = 0x800A9E84;
+nuGfxSwapCfb = 0x8008B110;
 
 nuBoot = 0x8007F880;
 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@@ -35,6 +37,7 @@ nuGfxInitEX2 = 0x8008A1B0;
 nuGfxThreadStart = 0x8008B0B0;
 nuGfxTaskMgrInit = 0x80089660;
 gfxThread = 0x8008AFE0;
+nuGfxSwapCfbFuncSet = 0x800899D0;
 
 
 obCurrentTime = 0x800C47D0;
@@ -686,7 +689,6 @@ __log_fatal_error_desc = 0x8007BBC0;
 
 __set_vi_mode = 0x80072738;
 __calls_osViSwapBuffer_8007307C = 0x8007307C;
-__osViSwapBuffer_3 = 0x8008B110;
 
 osAiSetFrequency = 0x8008C430;
 osAiGetLength = 0x8008C410;
@@ -939,8 +941,6 @@ __thread_80089540 = 0x80089540;
 
 STR_INVALID_HEADER_LHA_FILE = 0x800AE108;
 
-SWAP_BUFFER_FUNC = 0x800A9E84;
-set_swap_buffer_func = 0x800899D0;
 SWAP_BUFFER_FUNC_800A9E88 = 0x800A9E88;
 
 SWAP_BUFFER_FUNC_800A9E8C = 0x800A9E8C;
diff --git a/src/_ob_painful_roll.c b/src/_ob_painful_roll.c
index 2e3b797..9f74a1c 100644
--- a/src/_ob_painful_roll.c
+++ b/src/_ob_painful_roll.c
@@ -1,7 +1,9 @@
 #include "common.h"
 
+#include "nu/nusys.h"
+
 /* 1B510 8008B110 */
-void __osViSwapBuffer_3(void** buffers) {
-    osViSwapBuffer(buffers[3]);
+void nuGfxSwapCfb(void* framebuffer) {
+    osViSwapBuffer(framebuffer);
 }
 
diff --git a/src/_ob_questionable_glass.c b/src/_ob_questionable_glass.c
index 5d29d64..ca56ae3 100644
--- a/src/_ob_questionable_glass.c
+++ b/src/_ob_questionable_glass.c
@@ -1,10 +1,12 @@
 #include "common.h"
 
+#include "nu/nusys.h"
+
 /* 19DD0 800899D0 */
-void set_swap_buffer_func(void (*arg0)(void**)) {
+void nuGfxSwapCfbFuncSet(NUGfxSwapCfbFunc func) {
     s32 mask;
 
     mask = osSetIntMask(OS_IM_NONE);
-    SWAP_BUFFER_FUNC = arg0;
+    nuGfxSwapCfbFunc = func;
     osSetIntMask(mask);
 }
\ No newline at end of file
diff --git a/src/_ob_unusual_spiders.c b/src/_ob_unusual_spiders.c
index d2f13f4..439fbad 100644
--- a/src/_ob_unusual_spiders.c
+++ b/src/_ob_unusual_spiders.c
@@ -10,7 +10,7 @@ void nuGfxInitEX2(void) {
     nuGfxThreadStart();
     nuGfxSetCfb(&__SOMETHING_FRAMEBUFFERS, NU_GFX_FRAMEBUFFER_NUM);
     D_800C4B20 = BOOT_ADDRESS_ULTRA;
-    set_swap_buffer_func(__osViSwapBuffer_3);
+    nuGfxSwapCfbFuncSet(nuGfxSwapCfb);
     D_800C4CE0 = &D_800A9EB0;
     nuGfxTaskMgrInit();