mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-10-28 03:26:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1242 from Jcw87/misc_fixes

Browse Source 
Misc fixes
This commit is contained in:
LagoLunatic
2026-10-13 13:40:20 -04:00
committed by GitHub
parent f99fcde4f1 8f10c1c140
commit d1f97fd901
11 changed files with 94 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -472,7 +472,7 @@ config.libs = [
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "f_op/f_op_msg_mng.cpp"),
Object(Matching, "f_op/f_op_draw_iter.cpp"),
Object(Matching, "f_op/f_op_draw_tag.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "f_op/f_op_scene_pause.cpp"),
Object(Matching, "f_op/f_op_scene_pause.cpp"),
# f_pc
Object(Matching, "f_pc/f_pc_base.cpp"),
include/f_op/f_op_scene_mng.h
-4
View File
@@ -22,10 +22,6 @@ inline u32 fpcM_LayerID(void* pProc) {
}
}
inline layer_class* fpcM_Layer(void* pProc) {
return &((process_node_class*)pProc)->mLayer;
}
inline fpc_ProcID fopScnM_GetID(void* proc) {
return fpcM_GetID(proc);
}
include/f_op/f_op_scene_pause.h
+4 -2
View File
@@ -1,9 +1,11 @@
#ifndef F_F_OP_SCENE_PAUSE_H_
#define F_F_OP_SCENE_PAUSE_H_
#include "dolphin/types.h"
class scene_class;
int fopScnPause_Enable(scene_class* pScene);
int fopScnPause_Disable(scene_class* pScene);
BOOL fopScnPause_Enable(scene_class* pScene);
BOOL fopScnPause_Disable(scene_class* pScene);
#endif
include/f_pc/f_pc_manager.h
+3
View File
@@ -24,6 +24,9 @@ inline BOOL fpcM_IsErrorID(fpc_ProcID id) {
inline s16 fpcM_GetName(void* pProc) {
return ((base_process_class*)pProc)->mProcName;
}
inline process_node_class* fpcM_Layer(void* pProc) {
return ((base_process_class*)pProc)->mLyTg.mpLayer->mpPcNode;
}
inline u32 fpcM_GetParam(void* pProc) {
return ((base_process_class*)pProc)->mParameters;
}
src/JSystem/J2DGraph/J2DPicture.cpp
+1
View File
@@ -441,6 +441,7 @@ void J2DPicture::drawOut(const JGeometry::TBox2<f32>& posBox, const JGeometry::T
GXColor1u32(color[2]);
GXTexCoord2f32(s0, t1);
GXEnd();
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_U16, 15);
GXSetNumTexGens(0);
src/d/d_cloth_packet.cpp
+1
View File
@@ -457,6 +457,7 @@ void dCloth_packet_c::plot() {
yPos += yStep;
}
GXEnd();
xPos += xStep;
}
src/d/d_map.cpp
+31 -1
View File
@@ -2638,7 +2638,36 @@ void dMap_2DTri_c::init(s16 i_posX, s16 i_posY, const GXColor& i_color, f32 i_sc
/* 8004EE88-8004F080 .text draw__12dMap_2DTri_cFv */
void dMap_2DTri_c::draw() {
/* Nonmatching */
f32 f2 = JMASCos(mAngle);
f32 f3 = JMASSin(mAngle);
s16 r10 = 0;
s16 local_2c[3];
s16 local_34[3];
for (int i = 0; i < 3; i++) {
f32 f4 = mScaleX * JMASSin(r10);
f32 f5 = mScaleY * JMASCos(r10);
local_2c[i] = mPosX + int(f4 * f2 + f5 * f3);
local_34[i] = mPosY + int(f5 * f2 - f4 * f3);
r10 -= 0x5555;
}
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetNumChans(1);
GXSetChanCtrl(GX_COLOR0A0, GX_DISABLE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_NONE, GX_AF_NONE);
GXSetChanMatColor(GX_COLOR0A0, mColor);
GXSetNumTexGens(0);
GXSetNumTevStages(1);
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR);
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_SET);
GXSetZMode(0, GX_LEQUAL, 0);
GXSetScissor(mScissorX, mScissorY, mScissorWidth, mScissorHeight);
GXBegin(GX_TRIANGLES, GX_VTXFMT0, 3);
GXPosition3s16(local_2c[0], local_34[0], 0);
GXPosition3s16(local_2c[1], local_34[1], 0);
GXPosition3s16(local_2c[2], local_34[2], 0);
GXEnd();
GXSetScissor(0, 0, 640, 480);
}
/* 8004F080-8004F08C .text setPos__12dMap_2DTri_cFss */
@@ -2672,6 +2701,7 @@ void dMap_2DPoint_c::draw() {
GXSetScissor(field_0x4,field_0x8, field_0xc,field_0x10);
GXBegin(GX_POINTS,GX_VTXFMT0,1);
GXPosition3s16(field_0x14,field_0x16,0);
GXEnd();
GXSetScissor(0,0,0x280,0x1e0);
return;
}
src/d/d_menu_window.cpp
+41 -36
View File
@@ -33,8 +33,13 @@ static void dummy0() {
DEAD_STRING("cmap_phantomship.bti");
DEAD_STRING("cmap_hint.bti");
DEAD_STRING("f_item_tri.bti");
#if VERSION == VERSION_DEMO
DEAD_STRING("get_rupy.bti");
DEAD_STRING("heart_up_02.bti");
#else
DEAD_STRING("f_get_rupy.bti");
DEAD_STRING("f_heart_up_02.bti");
#endif
DEAD_STRING("f_korog_kare.bti");
DEAD_STRING("f_korog_saki.bti");
}
@@ -159,15 +164,15 @@ void dMs_item_create(sub_ms_screen_class* i_Ms) {
for (int i = 0; i < 2; i++) {
i_Ms->name[i] = (char*)i_Ms->childHeap->alloc(0x20, 4);
JUT_ASSERT(1936, i_Ms->name[i] != NULL);
JUT_ASSERT(VERSION_SELECT(1984, 1870, 1936, 1936), i_Ms->name[i] != NULL);
strcpy(i_Ms->name[i], "");
i_Ms->note[i] = (char*)i_Ms->childHeap->alloc(0x200, 4);
JUT_ASSERT(1939, i_Ms->note[i] != NULL);
JUT_ASSERT(VERSION_SELECT(1987, 1873, 1939, 1939), i_Ms->note[i] != NULL);
strcpy(i_Ms->note[i], "");
i_Ms->dummy[i] = (char*)i_Ms->childHeap->alloc(0x200, 4);
JUT_ASSERT(1942, i_Ms->dummy[i] != NULL);
JUT_ASSERT(VERSION_SELECT(1990, 1876, 1942, 1942), i_Ms->dummy[i] != NULL);
strcpy(i_Ms->dummy[i], "");
}
@@ -175,7 +180,7 @@ void dMs_item_create(sub_ms_screen_class* i_Ms) {
for (int i = 0; i < 33; i++) {
i_Ms->buffer_p[i] = i_Ms->childHeap->alloc(0xC00, 0x20);
JUT_ASSERT(1951, i_Ms->buffer_p[i] != NULL);
JUT_ASSERT(VERSION_SELECT(1998, 1884, 1951, 1951), i_Ms->buffer_p[i] != NULL);
i_Ms->field_0x1B2++;
}
@@ -185,7 +190,7 @@ void dMs_item_create(sub_ms_screen_class* i_Ms) {
#endif
dMi_c = new dMenu_Item_c();
JUT_ASSERT(1962, dMi_c != NULL);
JUT_ASSERT(VERSION_SELECT(2004, 1890, 1962, 1962), dMi_c != NULL);
for (int i = 0; i < 21; i++) {
dMi_c->setItemTexBuffer(i, i_Ms->buffer_p[i]);
@@ -253,25 +258,25 @@ void dMs_collect_create(sub_ms_screen_class* i_Ms) {
for (int i = 0; i < 2; i++) {
i_Ms->name[i] = (char*)i_Ms->childHeap->alloc(0x20, 4);
JUT_ASSERT(2089, i_Ms->name[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2119, 2005, 2089, 2089), i_Ms->name[i] != NULL);
i_Ms->note[i] = (char*)i_Ms->childHeap->alloc(0x200, 4);
JUT_ASSERT(2091, i_Ms->note[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2121, 2007, 2091, 2091), i_Ms->note[i] != NULL);
i_Ms->dummy[i] = (char*)i_Ms->childHeap->alloc(0x200, 4);
JUT_ASSERT(2093, i_Ms->dummy[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2123, 2009, 2093, 2093), i_Ms->dummy[i] != NULL);
}
i_Ms->field_0x1B2 = 0;
for (int i = 0; i < 21; i++) {
i_Ms->buffer_p[i] = i_Ms->childHeap->alloc(0xC00, 0x20);
JUT_ASSERT(2101, i_Ms->buffer_p[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2130, 2016, 2101, 2101), i_Ms->buffer_p[i] != NULL);
i_Ms->field_0x1B2++;
}
dMc_c = new dMenu_Collect_c();
JUT_ASSERT(2112, dMc_c != NULL);
JUT_ASSERT(VERSION_SELECT(2136, 2022, 2112, 2112), dMc_c != NULL);
dMc_c->setTactTexBuffer(i_Ms->buffer_p[0]);
@@ -316,25 +321,25 @@ void dMs_collect_create2(sub_ms_screen_class* i_Ms) {
for (int i = 0; i < 2; i++) {
i_Ms->name[i] = (char*)i_Ms->childHeap->alloc(0x20, 4);
JUT_ASSERT(2183, i_Ms->name[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2201, 2087, 2183, 2183), i_Ms->name[i] != NULL);
i_Ms->note[i] = (char*)i_Ms->childHeap->alloc(0x200, 4);
JUT_ASSERT(2185, i_Ms->note[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2203, 2089, 2185, 2185), i_Ms->note[i] != NULL);
i_Ms->dummy[i] = (char*)i_Ms->childHeap->alloc(0x200, 4);
JUT_ASSERT(2187, i_Ms->dummy[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2205, 2091, 2187, 2187), i_Ms->dummy[i] != NULL);
}
i_Ms->field_0x1B2 = 0;
for (int i = 0; i < 21; i++) {
i_Ms->buffer_p[i] = i_Ms->childHeap->alloc(0xC00, 0x20);
JUT_ASSERT(2195, i_Ms->buffer_p[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2212, 2098, 2195, 2195), i_Ms->buffer_p[i] != NULL);
i_Ms->field_0x1B2++;
}
dMc_c = new dMenu_Collect_c();
JUT_ASSERT(2205, dMc_c != NULL);
JUT_ASSERT(VERSION_SELECT(2218, 2104, 2205, 2205), dMc_c != NULL);
dMc_c->setTactTexBuffer(i_Ms->buffer_p[0]);
@@ -414,17 +419,17 @@ void dMs_fmap_create(sub_ms_screen_class* i_Ms) {
for (int i = 0; i < 2; i++) {
i_Ms->name[i] = (char*)i_Ms->parentHeap_0xfc->alloc(0x40, 4);
JUT_ASSERT(2343, i_Ms->name[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2342, 2228, 2343, 2343), i_Ms->name[i] != NULL);
i_Ms->note[i] = (char*)i_Ms->parentHeap_0xfc->alloc(0x200, 4);
JUT_ASSERT(2345, i_Ms->note[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2344, 2230, 2345, 2345), i_Ms->note[i] != NULL);
i_Ms->dummy[i] = (char*)i_Ms->parentHeap_0xfc->alloc(0x200, 4);
JUT_ASSERT(2347, i_Ms->dummy[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2346, 2232, 2347, 2347), i_Ms->dummy[i] != NULL);
}
dMf_c = new dMenu_Fmap_c();
JUT_ASSERT(2352, dMf_c != NULL);
JUT_ASSERT(VERSION_SELECT(2351, 2237, 2352, 2352), dMf_c != NULL);
dMf_c->setSvPtr(&dMv_CIO_c);
dMf_c->setFont(fonttype, rfonttype);
@@ -434,7 +439,7 @@ void dMs_fmap_create(sub_ms_screen_class* i_Ms) {
dMf_c->_create();
dMs_capture_c = new dDlst_MENU_CAPTURE_c();
JUT_ASSERT(2362, dMs_capture_c != NULL);
JUT_ASSERT(VERSION_SELECT(2361, 2247, 2362, 2362), dMs_capture_c != NULL);
if (i_Ms->mMenuProc == MENU_STATE_FMAP_OPEN_WALLPAPER) {
dMs_capture_c->setDrawFlagOn();
@@ -482,25 +487,25 @@ void dMs_dmap_create(sub_ms_screen_class* i_Ms) {
for (int i = 0; i < 2; i++) {
i_Ms->name[i] = (char*)i_Ms->parentHeap_0xfc->alloc(0x20, 4);
JUT_ASSERT(2464, i_Ms->name[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2463, 2349, 2464, 2464), i_Ms->name[i] != NULL);
i_Ms->note[i] = (char*)i_Ms->parentHeap_0xfc->alloc(0x200, 4);
JUT_ASSERT(2466, i_Ms->note[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2465, 2351, 2466, 2466), i_Ms->note[i] != NULL);
i_Ms->dummy[i] = (char*)i_Ms->parentHeap_0xfc->alloc(0x200, 4);
JUT_ASSERT(2468, i_Ms->dummy[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2467, 2353, 2468, 2468), i_Ms->dummy[i] != NULL);
}
i_Ms->field_0x1B2 = 0;
for (int i = 0; i < 3; i++) {
i_Ms->buffer_p[i] = i_Ms->parentHeap_0xfc->alloc(0xC00, 0x20);
JUT_ASSERT(2475, i_Ms->buffer_p[i] != NULL);
JUT_ASSERT(VERSION_SELECT(2474, 2360, 2475, 2475), i_Ms->buffer_p[i] != NULL);
i_Ms->field_0x1B2++;
}
dMd_c = new dMenu_Dmap_c();
JUT_ASSERT(2480, dMd_c != NULL);
JUT_ASSERT(VERSION_SELECT(2479, 2365, 2480, 2480), dMd_c != NULL);
for (int i = 0; i < 3; i++) {
dMd_c->mpTIMG[i] = (ResTIMG*)i_Ms->buffer_p[i];
@@ -514,7 +519,7 @@ void dMs_dmap_create(sub_ms_screen_class* i_Ms) {
dMd_c->_create();
dMs_capture_c = new dDlst_MENU_CAPTURE_c();
JUT_ASSERT(2491, dMs_capture_c != NULL);
JUT_ASSERT(VERSION_SELECT(2490, 2376, 2491, 2491), dMs_capture_c != NULL);
}
/* 801DCB30-801DCC80 .text dMs_dmap_delete__FP19sub_ms_screen_class */
@@ -558,12 +563,12 @@ void dMs_name_create(sub_ms_screen_class*) {
dComIfGp_setHeapLockFlag(10);
dNm_c = new dName_c();
JUT_ASSERT(2569, dNm_c != NULL);
JUT_ASSERT(VERSION_SELECT(2568, 2454, 2569, 2569), dNm_c != NULL);
dNm_c->_create();
dMs_capture_c = new dDlst_MENU_CAPTURE_c();
JUT_ASSERT(2573, dMs_capture_c != NULL);
JUT_ASSERT(VERSION_SELECT(2572, 2458, 2573, 2573), dMs_capture_c != NULL);
}
/* 801DCDA0-801DCE20 .text dMs_name_delete__FP19sub_ms_screen_class */
@@ -605,19 +610,19 @@ void dMs_cloth_create(sub_ms_screen_class* i_Ms) {
JKRArchive* arc = dComIfGp_getClothResArchive();
cloth_c = new dMCloth_c();
JUT_ASSERT(2674, cloth_c != NULL);
JUT_ASSERT(VERSION_SELECT(2673, 2559, 2674, 2674), cloth_c != NULL);
cloth_c->setArchive(arc);
cloth_c->init();
dMs_cloth_c = new dDlst_MENU_CLOTH_c();
JUT_ASSERT(2680, dMs_cloth_c != NULL);
JUT_ASSERT(VERSION_SELECT(2679, 2565, 2680, 2680), dMs_cloth_c != NULL);
dMs_capture_c = new dDlst_MENU_CAPTURE_c();
JUT_ASSERT(2683, dMs_capture_c != NULL);
JUT_ASSERT(VERSION_SELECT(2682, 2568, 2683, 2683), dMs_capture_c != NULL);
i_Ms->childHeap = JKRExpHeap::create(0x506A1, i_Ms->parentHeap_0xfc, false);
JUT_ASSERT(2686, i_Ms->childHeap != NULL);
JUT_ASSERT(VERSION_SELECT(2685, 2571, 2686, 2686), i_Ms->childHeap != NULL);
}
/* 801DD090-801DD154 .text dMs_cloth_delete__FP19sub_ms_screen_class */
@@ -645,14 +650,14 @@ void dMs_clothOnly_create(sub_ms_screen_class*) {
JKRArchive* arc = dComIfGp_getClothResArchive();
cloth_c = new dMCloth_c();
JUT_ASSERT(2744, cloth_c != NULL);
JUT_ASSERT(VERSION_SELECT(2743, 2629, 2744, 2744), cloth_c != NULL);
cloth_c->setArchive(arc);
cloth_c->setClothType(MENU_CLOTH_TYPE_CLOTH_ONLY);
cloth_c->init();
dMs_cloth_c = new dDlst_MENU_CLOTH_c();
JUT_ASSERT(2751, dMs_cloth_c != NULL);
JUT_ASSERT(VERSION_SELECT(2750, 2636, 2751, 2751), dMs_cloth_c != NULL);
}
/* 801DD270-801DD308 .text dMs_clothOnly_delete__FP19sub_ms_screen_class */
@@ -1488,10 +1493,10 @@ static cPhs_State dMs_Create(msg_class* i_this) {
i_Ms->parentHeap_0xfc = dComIfGp_getExpHeap2D();
fonttype = mDoExt_getMesgFont();
JUT_ASSERT(4097, fonttype != NULL);
JUT_ASSERT(VERSION_SELECT(3966, 3966, 4097, 4097), fonttype != NULL);
rfonttype = mDoExt_getRubyFont();
JUT_ASSERT(4100, rfonttype != NULL);
JUT_ASSERT(VERSION_SELECT(3968, 3968, 4100, 4100), rfonttype != NULL);
event_wait_frame = 0;
src/d/d_s_room.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ void objectSetCheck(room_of_scene_class* i_this) {
} else {
s32 roomNo = fopScnM_GetParam(i_this);
if (hiddenFlag) {
fpcLyIt_Judge(fpcM_Layer(i_this), deleteJugge, NULL);
fpcLyIt_Judge(&i_this->base.mLayer, deleteJugge, NULL);
dComIfGs_clearRoomSwitch(dComIfGp_roomControl_getZoneNo(roomNo));
i_this->mbReLoaded = false;
}
src/d/d_snap.cpp
+4
View File
@@ -1645,6 +1645,7 @@ void dSnap_Obj::draw() {
GXPosition3f32(-cylvtx[i+1].x, 0.0f, cylvtx[i+1].z);
GXPosition3f32(-cylvtx[i+1].x, 1.0f, cylvtx[i+1].z);
}
GXEnd();
GXBegin(GX_TRIANGLES, GX_VTXFMT0, field_0x19 * 0xC);
for (int i = 0; i < field_0x19; i++) {
@@ -1664,6 +1665,7 @@ void dSnap_Obj::draw() {
GXPosition3f32(-cylvtx[i+1].x, 0.0f, cylvtx[i+1].z);
GXPosition3f32(-cylvtx[i].x, 0.0f, cylvtx[i].z);
}
GXEnd();
} else {
f32 scale = mRadius;
mDoMtx_stack_c::copy(j3dSys.getViewMtx());
@@ -1680,6 +1682,7 @@ void dSnap_Obj::draw() {
GXPosition3f32(vdata[tindices[i][0]].x, vdata[tindices[i][0]].y, vdata[tindices[i][0]].z);
GXPosition3f32(vdata[tindices[i][1]].x, vdata[tindices[i][1]].y, vdata[tindices[i][1]].z);
GXPosition3f32(vdata[tindices[i][2]].x, vdata[tindices[i][2]].y, vdata[tindices[i][2]].z);
GXEnd();
}
}
}
@@ -1929,6 +1932,7 @@ void dSnap_packet::ClearAlphaBuffer() {
GXPosition3s16(0x1D4, 0x083, -0x005);
GXPosition3s16(0x1D4, 0x149, -0x005);
GXPosition3s16(0x0AE, 0x149, -0x005);
GXEnd();
camera_process_class* view = dComIfGp_getCamera(dComIfGp_getWindow(0)->getCameraID());
GXSetProjection(view->view.mProjMtx, GX_PERSPECTIVE);
src/f_op/f_op_scene_pause.cpp
+7 -7
View File
@@ -7,7 +7,7 @@
#include "f_op/f_op_scene.h"
#include "f_pc/f_pc_manager.h"
int fopScnPause_Enable(scene_class* i_scene) {
BOOL fopScnPause_Enable(scene_class* i_scene) {
if (i_scene) {
fpcM_PauseEnable(i_scene, 1);
fpcM_PauseEnable(i_scene, 2);
@@ -17,19 +17,19 @@ int fopScnPause_Enable(scene_class* i_scene) {
return 0;
}
int fopScnPause_Disable(scene_class* i_scene) {
BOOL fopScnPause_Disable(scene_class* i_scene) {
if (i_scene) {
void* tmp = (void*)i_scene->base.base.mLyTg.mpLayer->mpPcNode;
process_node_class* process_node = fpcM_Layer(i_scene);
if (!tmp) {
if (!process_node) {
fpcM_PauseDisable(i_scene, 1);
fpcM_PauseDisable(i_scene, 2);
} else if (fpcEx_IsExist((s32)((int*)tmp)[1]) == 1) {
if (!fpcM_IsPause(tmp, 1)) {
} else if (fpcEx_IsExist(process_node->base.mBsPcId) == 1) {
if (!fpcM_IsPause(process_node, 1)) {
fpcM_PauseDisable(i_scene, 1);
}
if (!fpcM_IsPause(tmp, 2)) {
if (!fpcM_IsPause(process_node, 2)) {
fpcM_PauseDisable(i_scene, 2);
}
}