Skip to content

Commit

Permalink
Fix bpk loading for d_a_title, the ship now fades in
Browse files Browse the repository at this point in the history
  • Loading branch information
themikelester committed Dec 28, 2024
1 parent 72712ce commit 5f7e8a0
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/ZeldaWindWaker/d_a.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5760,13 +5760,13 @@ class d_a_title extends fopAc_ac_c {

private modelShip: J3DModelInstance;
private bckShip = new mDoExt_bckAnm();
private bpkShip = new mDoExt_btpAnm();
private bpkShip = new mDoExt_brkAnm();

private anmFrameCounter = 0
private delayFrameCounter = 120;
private shipFrameCounter = -50;
private enterMode = 0;
private shipOffsetX: number;
private shipOffsetX: number = 0;

public override subload(globals: dGlobals): cPhs__Status {
const status = dComIfG_resLoad(globals, d_a_title.arcName);
Expand All @@ -5780,7 +5780,6 @@ class d_a_title extends fopAc_ac_c {
}

public override execute(globals: dGlobals, deltaTimeFrames: number): void {
// TODO:
if (this.delayFrameCounter > 0) {
this.delayFrameCounter -= deltaTimeFrames;

Expand Down Expand Up @@ -5891,7 +5890,7 @@ class d_a_title extends fopAc_ac_c {

private set_mtx() {
vec3.set(this.modelShip.baseScale, 0.9, 0.9, 0.9);
mat4.fromTranslation(this.modelShip.modelMatrix, [0 + this.shipOffsetX, 0, 1000]);
mat4.fromTranslation(this.modelShip.modelMatrix, [this.shipOffsetX, 0, 1000]);
mDoMtx_ZXYrotM(this.modelShip.modelMatrix, [0, 0x4000, 0]);

// pos.set(m094 + attr().field_0x00, attr().field_0x04, 0.0f);
Expand Down

0 comments on commit 5f7e8a0

Please sign in to comment.