mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-28 03:03:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_menu_save / pane_class / rename some data (#205)

Browse Source 
* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress

* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data

* rename more data

* remove asm / progress

* match all of d_pane_class

* fixes / some dKankyo doc
This commit is contained in:
TakaRikka
2022-07-04 12:21:57 -07:00
committed by GitHub
parent b68cfbc0e6
commit 929c5cfa5a
572 changed files with 4756 additions and 8007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+17 -10
View File
@@ -18079,32 +18079,32 @@ int daAlink_c::checkItemSetButton(int i_itemNo) {
/* 800C0284-800C02C8 0BABC4 0044+00 1/1 0/0 0/0 .text checkField__9daAlink_cFv */
bool daAlink_c::checkField() {
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == 0;
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_FIELD;
}
/* 800C02C8-800C0310 0BAC08 0048+00 6/6 0/0 0/0 .text checkBossRoom__9daAlink_cFv */
bool daAlink_c::checkBossRoom() {
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == 3;
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_BOSS_ROOM;
}
/* 800C0310-800C0358 0BAC50 0048+00 4/4 0/0 0/0 .text checkDungeon__9daAlink_cFv */
bool daAlink_c::checkDungeon() {
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == 1;
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_DUNGEON;
}
/* 800C0358-800C03A0 0BAC98 0048+00 3/3 0/0 0/0 .text checkCastleTown__9daAlink_cFv */
bool daAlink_c::checkCastleTown() {
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == 4;
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_CASTLE_TOWN;
}
/* 800C03A0-800C03E8 0BACE0 0048+00 6/6 0/0 1/1 .text checkCloudSea__9daAlink_cFv */
bool daAlink_c::checkCloudSea() {
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == 5;
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_CLOUD_SEA;
}
/* 800C03E8-800C044C 0BAD28 0064+00 5/5 0/0 0/0 .text checkRoomOnly__9daAlink_cFv */
bool daAlink_c::checkRoomOnly() {
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == 2 || checkLv7DungeonShop();
return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_ROOM || checkLv7DungeonShop();
}
/* 800C044C-800C04B4 0BAD8C 0068+00 3/3 0/0 0/0 .text checkLv2DungeonRoomSpecial__9daAlink_cFv */
@@ -19697,9 +19697,9 @@ asm void daAlink_c::setWaterDropColor(J3DGXColorS10 const* param_0) {
/* 800CC7DC-800CC7FC 0C711C 0020+00 2/2 0/0 0/0 .text initTevCustomColor__9daAlink_cFv */
void daAlink_c::initTevCustomColor() {
mTevStr.field_0x367 = 0;
mTevStr.field_0x358 = 0;
mTevStr.field_0x35a = 0;
mTevStr.field_0x35c = 0;
mTevStr.mFogColor.r = 0;
mTevStr.mFogColor.g = 0;
mTevStr.mFogColor.b = 0;
mTevStr.field_0x360 = 0;
mTevStr.field_0x362 = 0;
}
@@ -20034,7 +20034,14 @@ daAlink_c::firePointEff_c::firePointEff_c() {
}
/* 800CFC7C-800CFCB8 0CA5BC 003C+00 0/0 2/2 0/0 .text __dt__15LIGHT_INFLUENCEFv */
LIGHT_INFLUENCE::~LIGHT_INFLUENCE() {}
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void __dt__15LIGHT_INFLUENCEFv() {
nofralloc
#include "asm/d/a/d_a_alink/__dt__15LIGHT_INFLUENCEFv.s"
}
#pragma pop
/* 800CFCB8-800CFCF4 0CA5F8 003C+00 2/2 0/0 0/0 .text __dt__18daAlink_footData_cFv */
daAlink_footData_c::~daAlink_footData_c() {}
src/d/a/d_a_no_chg_room.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ extern "C" u8 mGndCheck__11fopAcM_gc_c[84];
extern "C" u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 data_804505F0[8];
extern "C" extern u8 data_80450D68[4];
extern "C" extern u8 mNoChangeRoom__20dStage_roomControl_c[4];
//
// Declarations:
src/d/a/d_a_npc.cpp
+11 -11
View File
@@ -1775,22 +1775,22 @@ int daNpcT_c::draw(int param_0, int param_1, f32 param_2, GXColorS10* color, f32
return 1;
}
mTevStr.field_0x358 = 0;
mTevStr.field_0x35a = 0;
mTevStr.field_0x35c = 0;
mTevStr.field_0x35e = 0;
mTevStr.mFogColor.r = 0;
mTevStr.mFogColor.g = 0;
mTevStr.mFogColor.b = 0;
mTevStr.mFogColor.a = 0;
if (color != NULL) {
mTevStr.field_0x358 = color->r;
mTevStr.field_0x35a = color->g;
mTevStr.field_0x35c = color->b;
mTevStr.field_0x35e = color->a;
mTevStr.mFogColor.r = color->r;
mTevStr.mFogColor.g = color->g;
mTevStr.mFogColor.b = color->b;
mTevStr.mFogColor.a = color->a;
}
if (field_0xdb8 != 0 && mTimer != 0) {
f32 r = (f32)field_0xdb8 / (f32)mTimer;
if (!cM3d_IsZero(r)) {
mTevStr.field_0x358 = r * 20.0f;
mTevStr.mFogColor.r = r * 20.0f;
}
} else if (param_0 != 0) {
mTevStr.field_0x35a = 20;
@@ -1874,8 +1874,8 @@ asm int daNpcT_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param
/* 80148C70-80148CCC 1435B0 005C+00 1/1 0/0 58/58 .text setEnvTevColor__8daNpcT_cFv */
void daNpcT_c::setEnvTevColor() {
mTevStr.field_0x381 = dComIfG_Bgsp().GetPolyColor(field_0x930);
mTevStr.field_0x380 = dComIfG_Bgsp().GetRoomId(field_0x930);
mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0x930);
mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(field_0x930);
}
/* 80148CCC-80148D10 14360C 0044+00 1/1 0/0 58/58 .text setRoomNo__8daNpcT_cFv */