Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ def MatchingFor(*versions):
Object(NonMatching, "Kameda/CharacterSelect3D.cpp"),
Object(NonMatching, "Kameda/SceneCourseSelect.cpp"),
Object(NonMatching, "Kameda/SceneGhostLoadSave.cpp"),
Object(NonMatching, "Kameda/PrintWindow.cpp"),
Object(Matching, "Kameda/PrintWindow.cpp"),
Object(NonMatching, "Kameda/CourseName2D.cpp"),
Object(NonMatching, "Kameda/SceneLanEntry.cpp"),
Object(NonMatching, "Kameda/SceneMapSelect.cpp"),
Expand Down
49 changes: 42 additions & 7 deletions include/Kameda/PrintWindow.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef PRINTWINDOW_H
#define PRINTWINDOW_H

#include "types.h"
#include <JSystem/J2D/J2DPrint.h>
#include <JSystem/J2D/J2DPane.h>
#include <JSystem/JKernel/JKRHeap.h>
Expand All @@ -25,13 +26,47 @@ class PrintWindow
static const u64 mVisibleTag[3]; // 0x80375f60

//private:
u8 _0[0x2e8];
u32 _2e8;
u32 _2ec;
u32 _2f0;
f32 _2f4;
u32 _2f8;
u8 _2fc[0x308 - 0x2fc];
struct Container
{
J2DAnmBase *animation;
J2DPane *pane;
f32 frame;
};

struct TextBoxContainer
{
J2DTextBox *mTextBox[4];
};

struct FontSizeContainer
{
J2DTextBox::TFontSize mFontSize[4];
};

struct VisibleContainer
{
J2DPane *pane;
};

Container mBckContainer[2][13]; // 0x0
Container mBtkContainer[2][4]; // 0x138
Container mBrkContainer[2][9]; // 0x198
TextBoxContainer mTextBoxContainer[2]; // 0x270
FontSizeContainer mFontSizeContainer[2]; // 0x290
VisibleContainer mVisibleContainer[2][3]; // 0x2d0

struct
{
s32 type; // 0x2e8
u32 _2ec;
s32 _2f0;
f32 frame; // 0x2f4
u32 _2f8;
} mInfo;

J2DGrafContext *mGrafContext; // 0x2fc
JKRArchive *mArchive; // 0x300
J2DScreen *mScreen; // 0x304
}; // Size: 0x308

#endif
10 changes: 5 additions & 5 deletions src/Kameda/PrintDvdError.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ void PrintDvdError::init(int errorId) {
mColor = getColor(mColorFile, getDefaultColor(mBmgFile));

// Inline setters?
mPrintWindow->_2e8 = 1;
mPrintWindow->_2ec = 1;
mPrintWindow->_2f0 = 1;
mPrintWindow->_2f4 = 9.0f;
mPrintWindow->_2f8 = 2;
mPrintWindow->mInfo.type = 1;
mPrintWindow->mInfo._2ec = 1;
mPrintWindow->mInfo._2f0 = 1;
mPrintWindow->mInfo.frame = 9.0f;
mPrintWindow->mInfo._2f8 = 2;
mPrintWindow->calc();

char *msg = getMessage(mBmgFile, mBmgId);
Expand Down
Loading
Loading