Skip to content

Commit 4dc3906

Browse files
TakaRikkaTakaRikka
committed
some tests with jp
1 parent 7da2ece commit 4dc3906

File tree

4 files changed

+50
-18
lines changed

4 files changed

+50
-18
lines changed

‎config/GZ2J01/splits.txt‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ m_Do/m_Do_main.cpp:
1919
.rodata start:0x80375E40 end:0x80376150
2020
.data start:0x8039D040 end:0x8039D0A0
2121
.bss start:0x803CD420 end:0x803D5880
22-
.sdata start:0x8044A6C4 end:0x8044A6D0
23-
.sbss start:0x8044AC48 end:0x8044ACE0
22+
.sdata start:0x8044A6C0 end:0x8044A6D0
23+
.sbss start:0x8044AC40 end:0x8044ACD8
2424
.sdata2 start:0x8044BB40 end:0x8044BB60
2525

2626
m_Do/m_Do_printf.cpp:
2727
.text start:0x80006798 end:0x80006FB4
2828
.rodata start:0x80376150 end:0x80376208
2929
.bss start:0x803D5880 end:0x803D6080
30-
.sbss start:0x8044ACE0 end:0x8044ACFC
30+
.sbss start:0x8044ACD8 end:0x8044ACF8
3131

3232
m_Do/m_Do_audio.cpp:
3333
.text start:0x80006FB4 end:0x80007954
3434
.ctors start:0x80375C68 end:0x80375C6C
3535
.rodata start:0x80376208 end:0x80376270
3636
.data start:0x8039D0A0 end:0x8039D0C0
3737
.bss start:0x803D6080 end:0x803D7418
38-
.sbss start:0x8044ACFC end:0x8044AD08
38+
.sbss start:0x8044ACF8 end:0x8044AD08
3939

4040
m_Do/m_Do_controller_pad.cpp:
4141
.text start:0x80007954 end:0x80007D9C
@@ -48,7 +48,7 @@ m_Do/m_Do_graphic.cpp:
4848
.rodata start:0x80376270 end:0x80376288
4949
.bss start:0x803D7528 end:0x803D75B0
5050
.sdata start:0x8044A6D0 end:0x8044A6E0
51-
.sbss start:0x8044AD08 end:0x8044AD34
51+
.sbss start:0x8044AD08 end:0x8044AD30
5252
.sdata2 start:0x8044BB78 end:0x8044BC40
5353
.sbss2 start:0x80450C80 end:0x80450C88
5454

@@ -57,7 +57,7 @@ m_Do/m_Do_machine.cpp:
5757
.rodata start:0x80376288 end:0x80376560
5858
.data start:0x8039D0C0 end:0x8039D138
5959
.sdata start:0x8044A6E0 end:0x8044A6E8
60-
.sbss start:0x8044AD34 end:0x8044AD58
60+
.sbss start:0x8044AD30 end:0x8044AD58
6161
.sdata2 start:0x8044BC40 end:0x8044BC48
6262

6363
m_Do/m_Do_mtx.cpp:
@@ -115,7 +115,10 @@ m_Do/m_Do_MemCardRWmng.cpp:
115115
m_Do/m_Do_machine_exception.cpp:
116116
.text start:0x80017D7C end:0x8001817C
117117
.rodata start:0x80376908 end:0x80376AE8
118-
.sbss start:0x8044ADD0 end:0x8044ADE4
118+
.sbss start:0x8044ADD0 end:0x8044ADD8
119+
120+
dolphin/os/__start.c:
121+
.init start:0x80003100 end:0x80003458
119122

120123
c/c_damagereaction.cpp:
121124
.text start:0x8001817C end:0x800183DC
@@ -1370,6 +1373,9 @@ d/d_k_wpillar.cpp:
13701373
.data start:0x803BD5B0 end:0x803BD5F0
13711374
.sdata2 start:0x8044F110 end:0x8044F128
13721375

1376+
PowerPC_EABI_Support/Runtime/Src/__mem.c:
1377+
.init start:0x80003458 end:0x80003590
1378+
13731379
DynamicLink.cpp:
13741380
.text start:0x802645FC end:0x80265650
13751381
.rodata start:0x80394608 end:0x80394950
@@ -2469,7 +2475,7 @@ JSystem/JUtility/JUTResFont.cpp:
24692475

24702476
JSystem/JUtility/JUTDbPrint.cpp:
24712477
.text start:0x802E25E4 end:0x802E2B78
2472-
.sbss start:0x8044B608 end:0x8044B614
2478+
.sbss start:0x8044B608 end:0x8044B610
24732479
.sdata2 start:0x80450128 end:0x80450138
24742480

24752481
JSystem/JUtility/JUTGamePad.cpp:
@@ -2478,7 +2484,7 @@ JSystem/JUtility/JUTGamePad.cpp:
24782484
.data start:0x803C6730 end:0x803C6760
24792485
.bss start:0x8042E518 end:0x8042E6B8
24802486
.sdata start:0x8044AA18 end:0x8044AA30
2481-
.sbss start:0x8044B614 end:0x8044B648
2487+
.sbss start:0x8044B610 end:0x8044B648
24822488
.sdata2 start:0x80450138 end:0x80450170
24832489

24842490
JSystem/JUtility/JUTException.cpp:
@@ -3501,6 +3507,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.
35013507
.text start:0x803719E4 end:0x80371A1C
35023508

35033509
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c:
3510+
.init start:0x80003590 end:0x800035E4
35043511
.text start:0x80371A1C end:0x80371AD4
35053512

35063513
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c:
@@ -3515,21 +3522,25 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s:
35153522
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c:
35163523
.text start:0x80373680 end:0x803739F0
35173524

3525+
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s:
3526+
.init start:0x800035E4 end:0x80005518
3527+
35183528
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c:
3529+
.init start:0x80005518 end:0x80005544
35193530
.text start:0x803739F0 end:0x8037402C
35203531
.data start:0x803CD3A8 end:0x803CD3E8
35213532
.bss start:0x80449950 end:0x80449958
35223533

35233534
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c:
35243535
.text start:0x8037402C end:0x80374084
35253536
.rodata start:0x8039CD58 end:0x8039CD68
3526-
.bss start:0x80449958 end:0x80449964
3537+
.bss start:0x80449958 end:0x80449960
35273538

35283539
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c:
35293540
.text start:0x80374084 end:0x803745DC
35303541
.rodata start:0x8039CD68 end:0x8039CE70
35313542
.data start:0x803CD3E8 end:0x803CD410
3532-
.bss start:0x80449964 end:0x80449970
3543+
.bss start:0x80449960 end:0x80449970
35333544

35343545
TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c:
35353546
.text start:0x803745DC end:0x80374610

‎config/GZ2J01/symbols.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21660,11 +21660,11 @@ sInstance__28JASGlobalInstance<8Z2SeqMgr> = .sbss:0x8044ACC4; // type:object siz
2166021660
sInstance__27JASGlobalInstance<7Z2SeMgr> = .sbss:0x8044ACC8; // type:object size:0x4 scope:global align:4 data:4byte
2166121661
sInstance__35JASGlobalInstance<14JASAudioThread> = .sbss:0x8044ACCC; // type:object size:0x4 scope:global align:4 data:4byte
2166221662
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .sbss:0x8044ACD0; // type:object size:0x4 scope:global align:4 data:4byte
21663-
lbl_8044ACD8 = .sbss:0x8044ACD8; // type:object size:0x1 data:byte
21664-
lbl_8044ACD9 = .sbss:0x8044ACD9; // type:object size:0x1 data:byte
21665-
lbl_8044ACDA = .sbss:0x8044ACDA; // type:object size:0x1 data:byte
21666-
lbl_8044ACDB = .sbss:0x8044ACDB; // type:object size:0x1 data:byte
21667-
lbl_8044ACDC = .sbss:0x8044ACDC; // type:object size:0x1 data:byte
21663+
__OSReport_disable = .sbss:0x8044ACD8; // type:object size:0x1 scope:global align:1 data:byte
21664+
__OSReport_Error_disable = .sbss:0x8044ACD9; // type:object size:0x1 scope:global align:1 data:byte
21665+
__OSReport_Warning_disable = .sbss:0x8044ACDA; // type:object size:0x1 scope:global align:1 data:byte
21666+
__OSReport_System_disable = .sbss:0x8044ACDB; // type:object size:0x1 scope:global align:1 data:byte
21667+
__OSReport_enable = .sbss:0x8044ACDC; // type:object size:0x1 scope:global align:1 data:byte
2166821668
__OSReport_MonopolyThread = .sbss:0x8044ACE0; // type:object size:0x4 scope:global align:4 data:4byte
2166921669
print_counts = .sbss:0x8044ACE4; // type:object size:0x4 scope:global align:4 data:4byte
2167021670
print_errors = .sbss:0x8044ACE8; // type:object size:0x4 scope:global align:4 data:4byte

‎src/d/actor/d_a_alink_demo.inc‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4218,7 +4218,10 @@ void daAlink_c::checkWarpStart() {
42184218
if (dMeter2Info_getWarpStatus() == WARP_STATUS_DECIDED_e ||
42194219
dComIfGp_event_compulsory(this, 0, 0xFFFF))
42204220
{
4221+
#if VERSION != VERSION_GCN_JPN
42214222
onNoResetFlg0(FLG0_UNK_4000);
4223+
#endif
4224+
42224225
if (dMeter2Info_getWarpStatus() == WARP_STATUS_DECIDED_e) {
42234226
const char* portal;
42244227
if (!checkMidnaRide()) {
@@ -4244,6 +4247,10 @@ void daAlink_c::checkWarpStart() {
42444247
fopAcM_orderOtherEvent(this, portal, 0xFFFF, 1, 1);
42454248
} else {
42464249
mDemo.setSpecialDemoType();
4250+
#if VERSION == VERSION_GCN_JPN
4251+
onNoResetFlg0(FLG0_UNK_4000);
4252+
#endif
4253+
42474254
if (dMeter2Info_getWarpStatus() == 1) {
42484255
stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo();
42494256
u32 exitID = dStage_stagInfo_GetEscapeWarp(stag_info);
@@ -4327,6 +4334,12 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) {
43274334
var_r29 = Z2SE_WOLF_WARP_IN_TATE;
43284335
}
43294336

4337+
#if VERSION == VERSION_GCN_JPN
4338+
if (param_1) {
4339+
onNoResetFlg0(FLG0_UNK_4000);
4340+
}
4341+
#endif
4342+
43304343
if (param_1) {
43314344
if (!checkMidnaRide()) {
43324345
onPlayerNoDraw();

‎src/m_Do/m_Do_MemCardRWmng.cpp‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@
1111
#include "dolphin/card.h"
1212
#include "m_Do/m_Do_MemCard.h"
1313

14+
#if VERSION == VERSION_GCN_JPN
15+
#define HEADER_TITLE "ゼルダの伝説 ﾄﾜｲﾗｲﾄﾌﾟﾘﾝｾｽ"
16+
#define HEADER_COMMENT "%d月%d日のセーブデータです"
17+
#else
18+
#define HEADER_TITLE "Zelda: Twilight Princess"
19+
#define HEADER_COMMENT "%d/%d Save Data"
20+
#endif
21+
1422
/* 803ECF40-803F0F40 019C60 4000+00 2/2 0/0 0/0 .bss sTmpBuf */
1523
static u8 sTmpBuf[0x4000];
1624

@@ -157,11 +165,11 @@ s32 mDoMemCdRWm_Restore(CARDFileInfo* file, void* data, u32 length) {
157165
/* 8001787C-800179E4 0121BC 0168+00 1/1 0/0 0/0 .text
158166
* mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData */
159167
static void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData* header) {
160-
snprintf(header->mTitle, sizeof(header->mTitle), "Zelda: Twilight Princess");
168+
snprintf(header->mTitle, sizeof(header->mTitle), HEADER_TITLE);
161169

162170
OSCalendarTime time;
163171
OSTicksToCalendarTime(OSGetTime(), &time);
164-
snprintf(header->mComment, sizeof(header->mComment), "%d/%d Save Data", time.mon + 1,
172+
snprintf(header->mComment, sizeof(header->mComment), HEADER_COMMENT, time.mon + 1,
165173
time.mday);
166174

167175
ResTIMG* banner_data =

0 commit comments

Comments
 (0)