Skip to content

d_stage cleanup #2392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TakaRikka merged 1 commit into from
Apr 14, 2025
Merged

d_stage cleanup #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion config/GZ2E01/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion config/GZ2E01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion config/GZ2J01/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/GZ2J01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion config/GZ2P01/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/GZ2P01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/ShieldD/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ def MatchingFor(*versions):
"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"),
Expand Down
5 changes: 3 additions & 2 deletions include/d/d_com_inf_game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions include/d/d_kankyo_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading