Skip to content

Commit f891887

Browse files
LagoLunaticLagoLunatic
authored
d_stage cleanup (#2392)
1 parent 3df5c7b commit f891887

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1151
-1576
lines changed

‎config/GZ2E01/splits.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ f_pc/f_pc_node_req.cpp:
323323
f_pc/f_pc_priority.cpp:
324324
.text start:0x80023130 end:0x80023564
325325
.bss start:0x803F4E58 end:0x803F4E68
326-
.sdata start:0x804505E8 end:0x804505F8
326+
.sdata start:0x804505E8 end:0x804505F0
327327

328328
f_pc/f_pc_profile.cpp:
329329
.text start:0x80023564 end:0x80023578
@@ -364,6 +364,7 @@ d/d_stage.cpp:
364364
.rodata start:0x80378A50 end:0x80378E48
365365
.data start:0x803A3B18 end:0x803A6F08
366366
.bss start:0x803F4E68 end:0x804061A0
367+
.sdata start:0x804505F0 end:0x804505F8
367368
.sbss start:0x80450D58 end:0x80450D80
368369
.sdata2 start:0x80451C90 end:0x80451CA0
369370

‎config/GZ2E01/symbols.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21356,7 +21356,7 @@ g_fopDwTg_Queue = .sdata:0x804505D0; // type:object size:0x8 scope:global align:
2135621356
g_fpcLn_Queue = .sdata:0x804505D8; // type:object size:0x8 scope:global align:4
2135721357
g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x804505E0; // type:object size:0x4 scope:global align:4 data:4byte
2135821358
crear$2224 = .sdata:0x804505E8; // type:object size:0x8 scope:local align:4 data:4byte
21359-
data_804505F0 = .sdata:0x804505F0; // type:object size:0x1 scope:global align:1 data:byte
21359+
mRoomReadId__20dStage_roomControl_c = .sdata:0x804505F0; // type:object size:0x1 scope:global align:1 data:byte
2136021360
backColor$3972 = .sdata:0x804505F8; // type:object size:0x4 scope:local align:4 data:byte
2136121361
g_clearColor = .sdata:0x80450600; // type:object size:0x4 scope:global align:4 data:4byte
2136221362
g_blackColor = .sdata:0x80450604; // type:object size:0x4 scope:global align:4 data:4byte

‎config/GZ2J01/splits.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ f_pc/f_pc_node_req.cpp:
319319
f_pc/f_pc_priority.cpp:
320320
.text start:0x80023130 end:0x80023564
321321
.bss start:0x803EEF98 end:0x803EEFA8
322-
.sdata start:0x8044A728 end:0x8044A738
322+
.sdata start:0x8044A728 end:0x8044A730
323323

324324
f_pc/f_pc_profile.cpp:
325325
.text start:0x80023564 end:0x80023578
@@ -361,6 +361,7 @@ d/d_stage.cpp:
361361
.data start:0x8039DC78 end:0x803A1068
362362
.bss start:0x803EEFA8 end:0x804002E0
363363
.sbss start:0x8044AE98 end:0x8044AEC0
364+
.sdata start:0x8044A730 end:0x8044A738
364365
.sdata2 start:0x8044BDD0 end:0x8044BDE0
365366

366367
d/d_map.cpp:

‎config/GZ2J01/symbols.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21376,7 +21376,7 @@ g_fopDwTg_Queue = .sdata:0x8044A710; // type:object size:0x8 scope:global align:
2137621376
g_fpcLn_Queue = .sdata:0x8044A718; // type:object size:0x8 scope:global align:4
2137721377
g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x8044A720; // type:object size:0x4 scope:global align:4 data:4byte
2137821378
crear$2224 = .sdata:0x8044A728; // type:object size:0x8 scope:local align:4 data:4byte
21379-
lbl_8044A730 = .sdata:0x8044A730; // type:object size:0x1 data:byte
21379+
mRoomReadId__20dStage_roomControl_c = .sdata:0x8044A730; // type:object size:0x1 data:byte
2138021380
backColor$3972 = .sdata:0x8044A738; // type:object size:0x4 scope:local align:4 data:byte
2138121381
g_clearColor = .sdata:0x8044A740; // type:object size:0x4 scope:global align:4 data:4byte
2138221382
g_blackColor = .sdata:0x8044A744; // type:object size:0x4 scope:global align:4 data:4byte

‎config/GZ2P01/splits.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ f_pc/f_pc_node_req.cpp:
316316
f_pc/f_pc_priority.cpp:
317317
.text start:0x800231D8 end:0x8002360C
318318
.bss start:0x803F6DF8 end:0x803F6E08
319-
.sdata start:0x804525A8 end:0x804525B8
319+
.sdata start:0x804525A8 end:0x804525B0
320320

321321
f_pc/f_pc_profile.cpp:
322322
.text start:0x8002360C end:0x80023620
@@ -358,6 +358,7 @@ d/d_stage.cpp:
358358
.data start:0x803A57F8 end:0x803A8BE8
359359
.bss start:0x803F6E08 end:0x80408140
360360
.sbss start:0x80452D18 end:0x80452D40
361+
.sdata start:0x804525B0 end:0x804525B8
361362
.sdata2 start:0x80453C50 end:0x80453C60
362363

363364
d/d_map.cpp:

‎config/GZ2P01/symbols.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21385,7 +21385,7 @@ g_fopDwTg_Queue = .sdata:0x80452590; // type:object size:0x8 scope:global align:
2138521385
g_fpcLn_Queue = .sdata:0x80452598; // type:object size:0x8 scope:global align:4
2138621386
g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x804525A0; // type:object size:0x4 scope:global align:4 data:4byte
2138721387
crear$2224 = .sdata:0x804525A8; // type:object size:0x8 scope:local align:4 data:4byte
21388-
lbl_804525B0 = .sdata:0x804525B0; // type:object size:0x1 data:byte
21388+
mRoomReadId__20dStage_roomControl_c = .sdata:0x804525B0; // type:object size:0x1 data:byte
2138921389
backColor$3972 = .sdata:0x804525B8; // type:object size:0x4 scope:local align:4 data:byte
2139021390
g_clearColor = .sdata:0x804525C0; // type:object size:0x4 scope:global align:4 data:4byte
2139121391
g_blackColor = .sdata:0x804525C4; // type:object size:0x4 scope:global align:4 data:4byte

‎config/ShieldD/symbols.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57374,7 +57374,7 @@ g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x8073F9E8; // type:object size:0x4 scope
5737457374
@124001 = .sdata:0x807402C8; // type:object size:0x7 scope:local data:string hash:0xACC83683
5737557375
@124026 = .sdata:0x807402D0; // type:object size:0x7 scope:local data:string hash:0xACC83646
5737657376
@124029 = .sdata:0x807402D8; // type:object size:0x6 scope:local data:string hash:0xACC83649
57377-
lbl_807402DE = .sdata:0x807402DE; // type:object size:0x1 data:byte hash:0x1A63BEEE dhash:0x24126ACC
57377+
mRoomReadId__20dStage_roomControl_c = .sdata:0x807402DE; // type:object size:0x1 data:byte hash:0x1A63BEEE dhash:0x24126ACC
5737857378
__RTTI__16dStage_stageDt_c = .sdata:0x807402E0; // type:object size:0x8 scope:global hash:0x17B0566E dhash:0xF078A7E9
5737957379
__RTTI__15dStage_roomDt_c = .sdata:0x807402E8; // type:object size:0x8 scope:global hash:0x0033F5F6 dhash:0xF77E0AD2
5738057380
__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
6418064180
lbl_8074C57C = .sbss:0x8074C57C; // type:object size:0x1 data:byte hash:0x87058A4F dhash:0xB3B700CD
6418164181
lbl_8074C57D = .sbss:0x8074C57D; // type:object size:0x1 data:byte hash:0x5AF37248 dhash:0x1A945A6A
6418264182
lbl_8074C57E = .sbss:0x8074C57E; // type:object size:0x1 data:byte hash:0xE957ED68 dhash:0x66C51F6A
64183-
lbl_8074C57F = .sbss:0x8074C57F; // type:object size:0x1 data:byte hash:0x88D929D5 dhash:0xB0689D17
64183+
m_time_pass__20dStage_roomControl_c = .sbss:0x8074C57F; // type:object size:0x1 data:byte hash:0x88D929D5 dhash:0xB0689D17
6418464184
lbl_8074C580 = .sbss:0x8074C580; // type:object size:0x1 data:byte hash:0x3F91BE16 dhash:0xDD72DA34
6418564185
mArcBankName__20dStage_roomControl_c = .sbss:0x8074C584; // type:object size:0x4 scope:global data:4byte hash:0x885DF1A0 dhash:0xD2AA5D02
6418664186
mArcBankData__20dStage_roomControl_c = .sbss:0x8074C588; // type:object size:0x4 scope:global data:4byte hash:0xF1AABD97 dhash:0xD2A70575

‎configure.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ def MatchingFor(*versions):
493493
"progress_category": "game",
494494
"host": True,
495495
"objects": [
496-
Object(MatchingFor("GZ2E01"), "d/d_stage.cpp"),
496+
Object(MatchingFor("GZ2E01"), "d/d_stage.cpp", extra_cflags=['-pragma "nosyminline on"']),
497497
Object(MatchingFor("GZ2E01"), "d/d_map.cpp"),
498498
Object(MatchingFor("GZ2E01"), "d/d_com_inf_game.cpp", extra_cflags=['-pragma "nosyminline on"']),
499499
Object(MatchingFor("GZ2E01"), "d/d_com_static.cpp"),

‎include/d/d_com_inf_game.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "d/d_event.h"
99
#include "d/d_event_manager.h"
1010
#include "d/d_particle.h"
11+
#include "d/d_save.h"
1112
#include "f_op/f_op_camera_mng.h"
1213
#include "m_Do/m_Do_controller_pad.h"
1314
#include "global.h"
@@ -3338,7 +3339,7 @@ inline int dComIfGp_roomControl_loadRoom(int param_0, u8* param_1, bool param_2)
33383339
}
33393340

33403341
inline void dComIfGp_roomControl_setStayNo(int stayNo) {
3341-
g_dComIfG_gameInfo.play.getRoomControl()->setStayNo(stayNo);
3342+
g_dComIfG_gameInfo.play.mRoomControl.setStayNo(stayNo);
33423343
}
33433344

33443345
inline void dComIfGp_roomControl_setZoneNo(int roomNo, int zoneNo) {
@@ -3370,7 +3371,7 @@ inline void dComIfGp_roomControl_setStatusFlag(int i_roomNo, u8 flag) {
33703371
}
33713372

33723373
inline void dComIfGp_roomControl_zoneCountCheck(int i_roomNo) {
3373-
g_dComIfG_gameInfo.play.mRoomControl.zoneCountCheck(i_roomNo);
3374+
g_dComIfG_gameInfo.play.getRoomControl()->zoneCountCheck(i_roomNo);
33743375
}
33753376

33763377
inline u8 dComIfGp_getRStatus() {

‎include/d/d_kankyo_data.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#include "dolphin/types.h"
55

66
struct color_RGB_class {
7-
u8 r;
8-
u8 g;
9-
u8 b;
10-
};
7+
/* 0x0 */ u8 r;
8+
/* 0x1 */ u8 g;
9+
/* 0x2 */ u8 b;
10+
}; // Size: 0x3
1111

1212
// Invented name; Used as u8 `darkLv` in dKydata_darkworldInfo_c.
1313
enum dKyd_DARKLV {

0 commit comments

Comments
 (0)