diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h
index 7a647faa05d..240fb27a08c 100644
--- a/include/JSystem/JUtility/JUTXfb.h
+++ b/include/JSystem/JUtility/JUTXfb.h
@@ -29,19 +29,26 @@ public:
     s16 getDisplayingXfbIndex() const { return mDisplayingXfbIndex; }
     s32 getSDrawingFlag() const { return mSDrawingFlag; }
 
+    void* getDrawnXfb() const {
+        if (mDrawnXfbIndex >= 0)
+            return mBuffer[mDrawnXfbIndex];
+        return NULL;
+    }
+
+    void* getDrawningXfb() const {
+        if (mDrawingXfbIndex >= 0)
+            return mBuffer[mDrawingXfbIndex];
+        return NULL;
+    }
+
     void* getDisplayingXfb() const {
         if (mDisplayingXfbIndex >= 0)
             return mBuffer[mDisplayingXfbIndex];
         return NULL;
     }
 
-    void setDisplayingXfbIndex(s16 index) {
-        mDisplayingXfbIndex = index;
-    }
-
-    void setSDrawingFlag(s32 flag) {
-        mSDrawingFlag = flag;
-    }
+    void setDisplayingXfbIndex(s16 index) { mDisplayingXfbIndex = index; }
+    void setSDrawingFlag(s32 flag) { mSDrawingFlag = flag; }
 
     static JUTXfb* getManager() { return sManager; }
 
diff --git a/libs/JSystem/JUtility/JUTVideo.cpp b/libs/JSystem/JUtility/JUTVideo.cpp
index 922b5a2810f..3aa9764b525 100644
--- a/libs/JSystem/JUtility/JUTVideo.cpp
+++ b/libs/JSystem/JUtility/JUTVideo.cpp
@@ -218,27 +218,38 @@ void JUTVideo::preRetraceProc(u32 retrace_count) {
 
 /* 802E5088-802E50B0 2DF9C8 0028+00 0/0 1/1 0/0 .text            drawDoneStart__8JUTVideoFv */
 void JUTVideo::drawDoneStart() {
-    data_80451544 = 1;
+    data_80451544 = true;
     GXSetDrawDone();
 }
 
 /* 802E50B0-802E50BC 2DF9F0 000C+00 0/0 1/1 0/0 .text            dummyNoDrawWait__8JUTVideoFv */
 void JUTVideo::dummyNoDrawWait() {
-    data_80451544 = 0;
+    data_80451544 = false;
 }
 
 /* 802E50BC-802E5144 2DF9FC 0088+00 1/1 0/0 0/0 .text            drawDoneCallback__8JUTVideoFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void JUTVideo::drawDoneCallback() {
-    nofralloc
-#include "asm/JSystem/JUtility/JUTVideo/drawDoneCallback__8JUTVideoFv.s"
+void JUTVideo::drawDoneCallback() {
+    JUTXfb* xfb = JUTXfb::getManager();
+    if (!xfb) {
+        return;
+    }
+
+    data_80451544 = false;
+    if (xfb->getBufferNum() == 1) {
+        if (xfb->getSDrawingFlag() == 1) {
+            xfb->setSDrawingFlag(0);
+
+            void* frameBuffer = xfb->getDrawnXfb();
+            if (frameBuffer) {
+                VISetNextFrameBuffer(xfb->getDrawnXfb());
+                VIFlush();
+            }
+        }
+    }
 }
-#pragma pop
 
 /* 802E5144-802E5198 2DFA84 0054+00 1/1 0/0 0/0 .text            postRetraceProc__8JUTVideoFUl */
-#ifdef NONMATCHING
+#if NONMATCHING
 void JUTVideo::postRetraceProc(u32 param_0) {
     void* message;
     if (sManager != NULL) {