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

d_stage cleanup (#2392)

Browse Source
This commit is contained in:
LagoLunatic
2025-04-13 20:54:57 -07:00
committed by GitHub
parent 3df5c7bb42
commit f891887626
47 changed files with 1184 additions and 1609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/splits.txt
+2 -1
View File
@@ -323,7 +323,7 @@ f_pc/f_pc_node_req.cpp:
f_pc/f_pc_priority.cpp:
.text start:0x80023130 end:0x80023564
.bss start:0x803F4E58 end:0x803F4E68
.sdata start:0x804505E8 end:0x804505F8
.sdata start:0x804505E8 end:0x804505F0
f_pc/f_pc_profile.cpp:
.text start:0x80023564 end:0x80023578
@@ -364,6 +364,7 @@ d/d_stage.cpp:
.rodata start:0x80378A50 end:0x80378E48
.data start:0x803A3B18 end:0x803A6F08
.bss start:0x803F4E68 end:0x804061A0
.sdata start:0x804505F0 end:0x804505F8
.sbss start:0x80450D58 end:0x80450D80
.sdata2 start:0x80451C90 end:0x80451CA0
config/GZ2E01/symbols.txt
+1 -1
View File
@@ -21356,7 +21356,7 @@ g_fopDwTg_Queue = .sdata:0x804505D0; // type:object size:0x8 scope:global align:
g_fpcLn_Queue = .sdata:0x804505D8; // type:object size:0x8 scope:global align:4
g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x804505E0; // type:object size:0x4 scope:global align:4 data:4byte
crear$2224 = .sdata:0x804505E8; // type:object size:0x8 scope:local align:4 data:4byte
data_804505F0 = .sdata:0x804505F0; // type:object size:0x1 scope:global align:1 data:byte
mRoomReadId__20dStage_roomControl_c = .sdata:0x804505F0; // type:object size:0x1 scope:global align:1 data:byte
backColor$3972 = .sdata:0x804505F8; // type:object size:0x4 scope:local align:4 data:byte
g_clearColor = .sdata:0x80450600; // type:object size:0x4 scope:global align:4 data:4byte
g_blackColor = .sdata:0x80450604; // type:object size:0x4 scope:global align:4 data:4byte
config/GZ2J01/splits.txt
+2 -1
View File
@@ -319,7 +319,7 @@ f_pc/f_pc_node_req.cpp:
f_pc/f_pc_priority.cpp:
.text start:0x80023130 end:0x80023564
.bss start:0x803EEF98 end:0x803EEFA8
.sdata start:0x8044A728 end:0x8044A738
.sdata start:0x8044A728 end:0x8044A730
f_pc/f_pc_profile.cpp:
.text start:0x80023564 end:0x80023578
@@ -361,6 +361,7 @@ d/d_stage.cpp:
.data start:0x8039DC78 end:0x803A1068
.bss start:0x803EEFA8 end:0x804002E0
.sbss start:0x8044AE98 end:0x8044AEC0
.sdata start:0x8044A730 end:0x8044A738
.sdata2 start:0x8044BDD0 end:0x8044BDE0
d/d_map.cpp:
config/GZ2J01/symbols.txt
+1 -1
View File
@@ -21376,7 +21376,7 @@ g_fopDwTg_Queue = .sdata:0x8044A710; // type:object size:0x8 scope:global align:
g_fpcLn_Queue = .sdata:0x8044A718; // type:object size:0x8 scope:global align:4
g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x8044A720; // type:object size:0x4 scope:global align:4 data:4byte
crear$2224 = .sdata:0x8044A728; // type:object size:0x8 scope:local align:4 data:4byte
lbl_8044A730 = .sdata:0x8044A730; // type:object size:0x1 data:byte
mRoomReadId__20dStage_roomControl_c = .sdata:0x8044A730; // type:object size:0x1 data:byte
backColor$3972 = .sdata:0x8044A738; // type:object size:0x4 scope:local align:4 data:byte
g_clearColor = .sdata:0x8044A740; // type:object size:0x4 scope:global align:4 data:4byte
g_blackColor = .sdata:0x8044A744; // type:object size:0x4 scope:global align:4 data:4byte
config/GZ2P01/splits.txt
+2 -1
View File
@@ -316,7 +316,7 @@ f_pc/f_pc_node_req.cpp:
f_pc/f_pc_priority.cpp:
.text start:0x800231D8 end:0x8002360C
.bss start:0x803F6DF8 end:0x803F6E08
.sdata start:0x804525A8 end:0x804525B8
.sdata start:0x804525A8 end:0x804525B0
f_pc/f_pc_profile.cpp:
.text start:0x8002360C end:0x80023620
@@ -358,6 +358,7 @@ d/d_stage.cpp:
.data start:0x803A57F8 end:0x803A8BE8
.bss start:0x803F6E08 end:0x80408140
.sbss start:0x80452D18 end:0x80452D40
.sdata start:0x804525B0 end:0x804525B8
.sdata2 start:0x80453C50 end:0x80453C60
d/d_map.cpp:
config/GZ2P01/symbols.txt
+1 -1
View File
@@ -21385,7 +21385,7 @@ g_fopDwTg_Queue = .sdata:0x80452590; // type:object size:0x8 scope:global align:
g_fpcLn_Queue = .sdata:0x80452598; // type:object size:0x8 scope:global align:4
g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x804525A0; // type:object size:0x4 scope:global align:4 data:4byte
crear$2224 = .sdata:0x804525A8; // type:object size:0x8 scope:local align:4 data:4byte
lbl_804525B0 = .sdata:0x804525B0; // type:object size:0x1 data:byte
mRoomReadId__20dStage_roomControl_c = .sdata:0x804525B0; // type:object size:0x1 data:byte
backColor$3972 = .sdata:0x804525B8; // type:object size:0x4 scope:local align:4 data:byte
g_clearColor = .sdata:0x804525C0; // type:object size:0x4 scope:global align:4 data:4byte
g_blackColor = .sdata:0x804525C4; // type:object size:0x4 scope:global align:4 data:4byte
config/ShieldD/symbols.txt
+2 -2
View File
@@ -57374,7 +57374,7 @@ g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x8073F9E8; // type:object size:0x4 scope
@124001 = .sdata:0x807402C8; // type:object size:0x7 scope:local data:string hash:0xACC83683
@124026 = .sdata:0x807402D0; // type:object size:0x7 scope:local data:string hash:0xACC83646
@124029 = .sdata:0x807402D8; // type:object size:0x6 scope:local data:string hash:0xACC83649
lbl_807402DE = .sdata:0x807402DE; // type:object size:0x1 data:byte hash:0x1A63BEEE dhash:0x24126ACC
mRoomReadId__20dStage_roomControl_c = .sdata:0x807402DE; // type:object size:0x1 data:byte hash:0x1A63BEEE dhash:0x24126ACC
__RTTI__16dStage_stageDt_c = .sdata:0x807402E0; // type:object size:0x8 scope:global hash:0x17B0566E dhash:0xF078A7E9
__RTTI__15dStage_roomDt_c = .sdata:0x807402E8; // type:object size:0x8 scope:global hash:0x0033F5F6 dhash:0xF77E0AD2
__RTTI__11dStage_dt_c = .sdata:0x807402F0; // type:object size:0x8 scope:global hash:0x5F98966D dhash:0x6874274D
@@ -64180,7 +64180,7 @@ mProcID__20dStage_roomControl_c = .sbss:0x8074C578; // type:object size:0x4 scop
lbl_8074C57C = .sbss:0x8074C57C; // type:object size:0x1 data:byte hash:0x87058A4F dhash:0xB3B700CD
lbl_8074C57D = .sbss:0x8074C57D; // type:object size:0x1 data:byte hash:0x5AF37248 dhash:0x1A945A6A
lbl_8074C57E = .sbss:0x8074C57E; // type:object size:0x1 data:byte hash:0xE957ED68 dhash:0x66C51F6A
lbl_8074C57F = .sbss:0x8074C57F; // type:object size:0x1 data:byte hash:0x88D929D5 dhash:0xB0689D17
m_time_pass__20dStage_roomControl_c = .sbss:0x8074C57F; // type:object size:0x1 data:byte hash:0x88D929D5 dhash:0xB0689D17
lbl_8074C580 = .sbss:0x8074C580; // type:object size:0x1 data:byte hash:0x3F91BE16 dhash:0xDD72DA34
mArcBankName__20dStage_roomControl_c = .sbss:0x8074C584; // type:object size:0x4 scope:global data:4byte hash:0x885DF1A0 dhash:0xD2AA5D02
mArcBankData__20dStage_roomControl_c = .sbss:0x8074C588; // type:object size:0x4 scope:global data:4byte hash:0xF1AABD97 dhash:0xD2A70575
configure.py
+1 -1
View File
@@ -493,7 +493,7 @@ config.libs = [
"progress_category": "game",
"host": True,
"objects": [
Object(MatchingFor("GZ2E01"), "d/d_stage.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_stage.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(MatchingFor("GZ2E01"), "d/d_map.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_com_inf_game.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(MatchingFor("GZ2E01"), "d/d_com_static.cpp"),
include/d/d_com_inf_game.h
+3 -2
View File
@@ -8,6 +8,7 @@
#include "d/d_event.h"
#include "d/d_event_manager.h"
#include "d/d_particle.h"
#include "d/d_save.h"
#include "f_op/f_op_camera_mng.h"
#include "m_Do/m_Do_controller_pad.h"
#include "global.h"
@@ -3338,7 +3339,7 @@ inline int dComIfGp_roomControl_loadRoom(int param_0, u8* param_1, bool param_2)
}
inline void dComIfGp_roomControl_setStayNo(int stayNo) {
g_dComIfG_gameInfo.play.getRoomControl()->setStayNo(stayNo);
g_dComIfG_gameInfo.play.mRoomControl.setStayNo(stayNo);
}
inline void dComIfGp_roomControl_setZoneNo(int roomNo, int zoneNo) {
@@ -3370,7 +3371,7 @@ inline void dComIfGp_roomControl_setStatusFlag(int i_roomNo, u8 flag) {
}
inline void dComIfGp_roomControl_zoneCountCheck(int i_roomNo) {
g_dComIfG_gameInfo.play.mRoomControl.zoneCountCheck(i_roomNo);
g_dComIfG_gameInfo.play.getRoomControl()->zoneCountCheck(i_roomNo);
}
inline u8 dComIfGp_getRStatus() {
include/d/d_kankyo_data.h
+4 -4
View File
@@ -4,10 +4,10 @@
#include "dolphin/types.h"
struct color_RGB_class {
u8 r;
u8 g;
u8 b;
};
/* 0x0 */ u8 r;
/* 0x1 */ u8 g;
/* 0x2 */ u8 b;
}; // Size: 0x3
// Invented name; Used as u8 `darkLv` in dKydata_darkworldInfo_c.
enum dKyd_DARKLV {
include/d/d_stage.h
+609 -354
View File
File diff suppressed because it is too large Load Diff
include/f_op/f_op_actor_mng.h
+20 -9
View File
@@ -45,18 +45,21 @@ class JKRHeap;
class cM3dGPla;
struct fopAcM_prmBase_class {
/* 0x00 */ u32 field_0x00;
/* 0x04 */ cXyz field_0x04;
/* 0x10 */ csXyz field_0x10;
/* 0x16 */ u16 field_0x16;
}; // Size = 0x18
struct fopAcM_prm_class {
/* 0x00 */ u32 parameters;
/* 0x04 */ cXyz position;
/* 0x10 */ csXyz angle;
/* 0x16 */ u16 setId;
/* 0x18 */ u8 scale[3];
/* 0x16 */ u16 setID;
}; // Size: 0x18
struct fopAcM_prmScale_class {
/* 0x0 */ u8 x;
/* 0x1 */ u8 y;
/* 0x2 */ u8 z;
}; // Size: 0x3
struct fopAcM_prm_class {
/* 0x00 */ fopAcM_prmBase_class base;
/* 0x18 */ fopAcM_prmScale_class scale;
/* 0x1C */ fpc_ProcID parent_id;
/* 0x20 */ s8 subtype;
/* 0x21 */ s8 room_no;
@@ -486,6 +489,14 @@ fpc_ProcID fopAcM_create(s16 i_procName, u16 i_setId, u32 i_parameters, const cX
fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo,
const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype);
inline fpc_ProcID fopAcM_create(s16 i_procName, createFunc i_createFunc, void* params) {
return fpcM_Create(i_procName, i_createFunc, params);
}
inline fpc_ProcID fopAcM_Create(s16 i_procName, createFunc i_createFunc, void* params) {
return fpcM_Create(i_procName, i_createFunc,params);
}
fopAc_ac_c* fopAcM_fastCreate(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo,
const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype,
createFunc i_createFunc, void* i_createFuncData);
include/f_op/f_op_camera_mng.h
+4
View File
@@ -7,6 +7,10 @@
typedef struct leafdraw_method_class leafdraw_method_class;
struct fopCamM_prm_class {
/* 0x00 */ fopAcM_prmBase_class base;
}; // Size: 0x18
class camera_process_class : public view_class {
public:
/* 0x210 */ create_tag_class create_tag;
src/d/actor/d_a_alink.cpp
+1 -1
View File
@@ -6212,7 +6212,7 @@ int daAlink_c::create() {
daTagMhint_c::createPortalWarpMissTag(0xBBE, fopAcM_GetID(this));
}
if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) == 0x11) {
if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) == 0x11) {
if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD) && !dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD) &&
!dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD))
{
src/d/actor/d_a_alink_copyrod.inc
+1 -1
View File
@@ -75,7 +75,7 @@ BOOL daAlink_c::checkForestOldCentury() {
BOOL daAlink_c::checkCopyRodTopUse() {
// Event flag 0x2580: Dominion Rod power restored
return (dComIfGs_isEventBit(0x2580) && !(mProcID == PROC_UNEQUIP && mProcVar3.field_0x300e != 0)) ||
i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x15 ||
dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x15 ||
checkForestOldCentury();
}
src/d/actor/d_a_alink_cut.inc
+1 -1
View File
@@ -32,7 +32,7 @@ void daAlink_c::checkLightSwordMtrl() {
if (checkLightMasterSwordEquip()) {
stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo();
if (i_dStage_stagInfo_GetSaveTbl(stag_info) == 0x17 ||
if (dStage_stagInfo_GetSaveTbl(stag_info) == 0x17 ||
fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchNightStalker, NULL))
{
onNoResetFlg3(FLG3_UNK_100000);
src/d/actor/d_a_alink_demo.inc
+2 -2
View File
@@ -43,8 +43,8 @@ bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) {
u32 scene_mode = getLastSceneMode();
if (param_2 != 0 && checkDungeon() &&
i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17 &&
i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x18 &&
dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17 &&
dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x18 &&
(checkItemGet(fpcNm_ITEM_TKS_LETTER, 1) ||
(checkItemGet(fpcNm_ITEM_DUNGEON_BACK, 1) && !checkLv7DungeonShop())) &&
dComIfGs_isDungeonItemWarp())
src/d/actor/d_a_no_chg_room.cpp
+3 -3
View File
@@ -12,13 +12,13 @@
static bool isLoadRoom(int i_roomNo) {
roomRead_class* room = dComIfGp_getStageRoom();
if (room != NULL && room->field_0x0 > i_roomNo) {
if (room != NULL && room->num > i_roomNo) {
int load_room_index;
int num;
u8* data;
num = room->field_0x4[i_roomNo]->field_0x0;
data = room->field_0x4[i_roomNo]->field_0x4;
num = room->m_entries[i_roomNo]->num;
data = room->m_entries[i_roomNo]->m_rooms;
for (int i = 0; i < num; i++) {
load_room_index = dStage_roomRead_dt_c_GetLoadRoomIndex(data[i]);
src/d/actor/d_a_npc.cpp
+8 -8
View File
@@ -2535,11 +2535,11 @@ BOOL daNpcT_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz* o_spawn
csXyz* o_angle) {
BOOL ret = FALSE;
dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
stage_actor_data_class* entry = room_dt->getPlayer()->mEntries;
stage_actor_data_class* entry = room_dt->getPlayer()->m_entries;
for (int i = 0; i < room_dt->getPlayerNum(); entry++, i++) {
if (param_0 == (entry->mAngle.z & 0xff)) {
*o_spawnPos = entry->mSpawnPos;
*o_angle = entry->mAngle;
if (param_0 == (entry->base.angle.z & 0xff)) {
*o_spawnPos = entry->base.position;
*o_angle = entry->base.angle;
ret = TRUE;
break;
}
@@ -5094,12 +5094,12 @@ int daNpcF_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz& param_2,
int rv = 0;
dStage_roomDt_c* roomP = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
stage_actor_data_class* entries = roomP->getPlayer()->mEntries;
stage_actor_data_class* entries = roomP->getPlayer()->m_entries;
for (int i = 0; i < roomP->getPlayerNum(); entries++, i++) {
if (param_0 == (u8)entries->mAngle.z) {
param_2 = entries->mSpawnPos;
param_3 = entries->mAngle;
if (param_0 == (u8)entries->base.angle.z) {
param_2 = entries->base.position;
param_3 = entries->base.angle;
rv = 1;
break;
}
src/d/actor/d_a_player.cpp
+2 -2
View File
@@ -541,7 +541,7 @@ bool daPy_py_c::checkRoomRestartStart() {
u32 daPy_py_c::checkCarryStartLightBallA() {
if (checkRoomRestartStart() || !dComIfGp_getStage() ||
!dComIfGp_getStage()->getStagInfo() ||
i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17)
dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17)
{
return FALSE;
}
@@ -553,7 +553,7 @@ u32 daPy_py_c::checkCarryStartLightBallA() {
u32 daPy_py_c::checkCarryStartLightBallB() {
if (checkRoomRestartStart() || !dComIfGp_getStage() ||
!dComIfGp_getStage()->getStagInfo() ||
i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17)
dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17)
{
return FALSE;
}

Some files were not shown because too many files have changed in this diff Show More