Wind Waker: Link now appears in cutscenes (Neat!!)

src/Common/JSYSTEM/JStudio.ts

@@ -544,6 +544,8 @@ export abstract class TActor extends JStage.TObject {
     public JSGGetTextureAnimationFrame(): number { return 0.0; }
     public JSGSetTextureAnimationFrame(x: number): void { }
     public JSGGetTextureAnimationFrameMax(): number { return 0.0; }
+
+    public JSGDebugGetAnimationName(x: number): string | null { return null; }
 }
 
 class TActorAdaptor extends TAdaptor {
@@ -699,7 +701,11 @@ class TActorAdaptor extends TAdaptor {
 
     public adaptor_do_ANIMATION(data: ParagraphData): void {
         assert(data.dataOp === EDataOp.ObjectIdx);
-        this.log(`SetAnimation: ${(data.value) & 0xFFFF} (${(data.value) >> 4 & 0x01})`);
+        const animName = this.object.JSGDebugGetAnimationName(data.value);
+        if( animName )
+            this.log(`SetAnimation: ${animName}`);
+        else 
+            this.log(`SetAnimation: ${(data.value) & 0xFFFF} (${(data.value) >> 4 & 0x01})`);
         this.object.JSGSetAnimation(data.value);
     }
 

src/ZeldaWindWaker/Main.ts

@@ -31,7 +31,6 @@ import { LegacyActor__RegisterFallbackConstructor } from './LegacyActor.js';
 import { dDlst_2DStatic_c, d_a__RegisterConstructors } from './d_a.js';
 import { d_a_sea } from './d_a_sea.js';
 import { dBgS } from './d_bg.js';
-import { EDemoCamFlags, EDemoMode, dDemo_manager_c } from './d_demo.js';
 import { dDlst_list_Set, dDlst_list_c } from './d_drawlist.js';
 import { dKankyo_create, dKy__RegisterConstructors, dKy_setLight, dScnKy_env_light_c } from './d_kankyo.js';
 import { dKyw__RegisterConstructors } from './d_kankyo_wether.js';
@@ -40,8 +39,9 @@ import { dProcName_e } from './d_procname.js';
 import { ResType, dRes_control_c } from './d_resorce.js';
 import { dStage_dt_c_roomLoader, dStage_dt_c_roomReLoader, dStage_dt_c_stageInitLoader, dStage_dt_c_stageLoader, dStage_roomControl_c, dStage_roomStatus_c, dStage_stageDt_c } from './d_stage.js';
 import { WoodPacket } from './d_wood.js';
-import { fopAcM_create, fopAc_ac_c } from './f_op_actor.js';
+import { fopAcM_create, fopAcM_searchFromName, fopAc_ac_c } from './f_op_actor.js';
 import { cPhs__Status, fGlobals, fopDw_Draw, fopScn, fpcCt_Handler, fpcLy_SetCurrentLayer, fpcM_Management, fpcPf__Register, fpcSCtRq_Request, fpc_pc__ProfileList } from './framework.js';
+import { dDemo_manager_c, EDemoCamFlags, EDemoMode } from './d_demo.js';
 
 type SymbolData = { Filename: string, SymbolName: string, Data: ArrayBufferSlice };
 type SymbolMapData = { SymbolData: SymbolData[] };
@@ -858,7 +858,7 @@ class SceneDesc {
         modelCache.fetchObjectData(`Always`);
         modelCache.fetchStageData(`Stage`);
 
-        modelCache.fetchFileData(`extra.crg1_arc`, 9);
+        modelCache.fetchFileData(`extra.crg1_arc`, 10);
         modelCache.fetchFileData(`f_pc_profiles.crg1_arc`);
 
         const particleArchives = [
@@ -999,7 +999,7 @@ class DemoDesc extends SceneDesc implements Viewer.SceneDesc {
         globals.scnPlay.demo.remove();
 
         // TODO: Don't render until the camera has been placed for this demo. The cuts are jarring.
-
+    
         // noclip modification: This normally happens on room load. Do it here instead so that we don't waste time 
         //                      loading .arcs for cutscenes that aren't going to be played
         const lbnk = globals.roomCtrl.status[this.roomList[0]].data.lbnk;
@@ -1014,11 +1014,16 @@ class DemoDesc extends SceneDesc implements Viewer.SceneDesc {
                     // @TODO: Better error handling. This does not prevent a debugger break.
                     console.log(`Failed to load stage demo file: ${globals.roomCtrl.demoArcName}`, e);
                 })
-
-                await globals.modelCache.waitForLoad();
             }
         }
 
+        await globals.modelCache.waitForLoad();
+
+        // Most cutscenes expect the Link actor to be loaded
+        if(!fopAcM_searchFromName(globals, 'Link', 0, 0)) {
+            fopAcM_create(globals.frameworkGlobals, dProcName_e.d_a_py_lk, 0, null, globals.mStayNo, null, null, 0xFF, -1);
+        }
+
         // noclip modification: ensure all the actors are created before we load the cutscene
         await new Promise(resolve => { (function waitForActors(){
             if (globals.frameworkGlobals.ctQueue.length === 0) return resolve(null);
@@ -1048,7 +1053,6 @@ class DemoDesc extends SceneDesc implements Viewer.SceneDesc {
 // It has been reconstructed by cross-referencing each Room's lbnk section (which points to a Demo*.arc file for each layer),
 // the .stb files contained in each of those Objects/Demo*.arc files, and the FileName attribute from the event action.   
 const demoDescs = [
-    new DemoDesc("sea", "Stolen Sister", [44], "stolensister.stb", 9, [0.0, 0.0, 20000.0], 0, 0, 0),
     new DemoDesc("sea", "Departure", [44], "departure.stb", 10, [-200000.0, 0.0, 320000.0], 0.0, 204, 0),
     new DemoDesc("sea", "Pirate Zelda Fly", [44], "kaizoku_zelda_fly.stb", 0, [-200000.0, 0.0, 320000.0], 180.0, 0, 0),
     new DemoDesc("sea", "Zola Awakens", [13], "awake_zola.stb", 8, [200000.0, 0.0, -200000.0], 0, 227, 0),
@@ -1128,6 +1132,7 @@ const sceneDescs = [
     "Cutscenes",
     new DemoDesc("sea_T", "Title Screen", [44], "title.stb", 0, [-220000.0, 0.0, 320000.0], 180.0, 0, 0),
     new DemoDesc("sea", "Awaken", [44], "awake.stb", 0, [-220000.0, 0.0, 320000.0], 0.0, 0, 0),
+    new DemoDesc("sea", "Stolen Sister", [44], "stolensister.stb", 9, [0.0, 0.0, 20000.0], 0, 0, 0),
 
     "Outset Island",
     new SceneDesc("sea_T", "Title Screen", [44]),