encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

J2DWindow (#1910)

Browse Source
This commit is contained in:
Jcw87
2023-09-04 16:41:08 +03:00
committed by GitHub
parent a6d49a9901
commit d98444fe4e
26 changed files with 548 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/J2DGraph/J2DPicture.cpp
+1 -1
View File
@@ -953,7 +953,7 @@ void J2DPicture::load(_GXTexMapID param_0, u8 param_1) {
}
/* 802FF2E8-802FF2F0 2F9C28 0008+00 1/0 1/0 0/0 .text getTypeID__10J2DPictureCFv */
s32 J2DPicture::getTypeID() const {
u16 J2DPicture::getTypeID() const {
return 18;
}
libs/JSystem/J2DGraph/J2DScreen.cpp
+1 -1
View File
@@ -794,7 +794,7 @@ J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputS
}
/* 802F9A18-802F9A20 2F4358 0008+00 1/0 0/0 0/0 .text getTypeID__9J2DScreenCFv */
s32 J2DScreen::getTypeID() const {
u16 J2DScreen::getTypeID() const {
return 8;
}
libs/JSystem/J2DGraph/J2DTextBox.cpp
+3 -3
View File
@@ -410,7 +410,7 @@ bool J2DTextBox::setConnectParent(bool connected) {
return false;
}
if ((u16)getPaneTree()->getParent()->getObject()->getTypeID() != 0x11) {
if (getPaneTree()->getParent()->getObject()->getTypeID() != 0x11) {
return false;
}
@@ -456,7 +456,7 @@ void J2DTextBox::resize(f32 x, f32 y) {
if (mConnected && getPaneTree() != NULL && getPaneTree()->getParent() != NULL) {
J2DPane* obj = getPaneTree()->getParent()->getObject();
if ((u16)obj->getTypeID() == 0x11) {
if (obj->getTypeID() == 0x11) {
f32 obj_x = obj->getWidth() + (x - getWidth());
f32 obj_y = obj->getHeight() + (y - getHeight());
obj->resize(obj_x, obj_y);
@@ -477,7 +477,7 @@ bool J2DTextBox::isUsed(ResFONT const* p_font) {
}
/* 80300C68-80300C70 2FB5A8 0008+00 1/0 1/0 0/0 .text getTypeID__10J2DTextBoxCFv */
s32 J2DTextBox::getTypeID() const {
u16 J2DTextBox::getTypeID() const {
return 19;
}
libs/JSystem/J2DGraph/J2DWindow.cpp
+462 -137
View File
File diff suppressed because it is too large Load Diff
libs/JSystem/J2DGraph/J2DWindowEx.cpp
+12 -12
View File
@@ -340,7 +340,7 @@ asm void J2DWindowEx::setStage(J2DTevStage* param_0, J2DWindowEx::stage_enum par
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::setBlack(JUtility::TColor param_0) {
asm bool J2DWindowEx::setBlack(JUtility::TColor param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/setBlack__11J2DWindowExFQ28JUtility6TColor.s"
}
@@ -351,7 +351,7 @@ asm void J2DWindowEx::setBlack(JUtility::TColor param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::setWhite(JUtility::TColor param_0) {
asm bool J2DWindowEx::setWhite(JUtility::TColor param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/setWhite__11J2DWindowExFQ28JUtility6TColor.s"
}
@@ -362,7 +362,7 @@ asm void J2DWindowEx::setWhite(JUtility::TColor param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
asm bool J2DWindowEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/setBlackWhite__11J2DWindowExFQ28JUtility6TColorQ28JUtility6TColor.s"
}
@@ -394,7 +394,7 @@ asm void J2DWindowEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::getBlack() const {
asm JUtility::TColor J2DWindowEx::getBlack() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/getBlack__11J2DWindowExCFv.s"
}
@@ -404,7 +404,7 @@ asm void J2DWindowEx::getBlack() const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::getWhite() const {
asm JUtility::TColor J2DWindowEx::getWhite() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/getWhite__11J2DWindowExCFv.s"
}
@@ -444,7 +444,7 @@ asm void J2DWindowEx::rewriteAlpha() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::getFrameTexture(u8 param_0, u8 param_1) const {
asm JUTTexture* J2DWindowEx::getFrameTexture(u8 param_0, u8 param_1) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/getFrameTexture__11J2DWindowExCFUcUc.s"
}
@@ -454,7 +454,7 @@ asm void J2DWindowEx::getFrameTexture(u8 param_0, u8 param_1) const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::getContentsTexture(u8 param_0) const {
asm JUTTexture* J2DWindowEx::getContentsTexture(u8 param_0) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/getContentsTexture__11J2DWindowExCFUc.s"
}
@@ -464,7 +464,7 @@ asm void J2DWindowEx::getContentsTexture(u8 param_0) const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::isUsed(ResTIMG const* param_0) {
asm bool J2DWindowEx::isUsed(ResTIMG const* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResTIMG.s"
}
@@ -686,7 +686,7 @@ COMPILER_STRIP_GATE(0x803A1D40, &lit_3089);
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::animationPane(J2DAnmTransform const* param_0) {
asm J2DAnmTransform* J2DWindowEx::animationPane(J2DAnmTransform const* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/animationPane__11J2DWindowExFPC15J2DAnmTransform.s"
}
@@ -697,7 +697,7 @@ asm void J2DWindowEx::animationPane(J2DAnmTransform const* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::getFrameMaterial(u8 param_0) const {
asm J2DMaterial* J2DWindowEx::getFrameMaterial(u8 param_0) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/getFrameMaterial__11J2DWindowExCFUc.s"
}
@@ -707,7 +707,7 @@ asm void J2DWindowEx::getFrameMaterial(u8 param_0) const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::getContentsMaterial() const {
asm J2DMaterial* J2DWindowEx::getContentsMaterial() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/getContentsMaterial__11J2DWindowExCFv.s"
}
@@ -748,7 +748,7 @@ asm void J2DWindowEx::setCullBack(bool param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DWindowEx::isUsed(ResFONT const* param_0) {
asm bool J2DWindowEx::isUsed(ResFONT const* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DWindowEx/isUsed__11J2DWindowExFPC7ResFONT.s"
}