mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-30 08:26:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_name matching for PAL (#2751)

Browse Source
This commit is contained in:
hev7
2025-10-22 01:52:02 +01:00
committed by GitHub
parent 7b999a5420
commit 4e33b2e15b
9 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/rels/d_a_grass/symbols.txt
+3 -2
View File
@@ -169,7 +169,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_73_data_10 = .data:0x00000010; // type:object size:0x10
_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8
_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8
l_M_kusa05_RGBATEX = .data:0x00000020; // type:object size:0x800 scope:global
l_M_Hijiki00TEX = .data:0x00000820; // type:object size:0x800 scope:global
l_pos = .data:0x00001020; // type:object size:0x3C0 scope:global
@@ -239,7 +240,7 @@ init$4869 = .bss:0x00000060; // type:object size:0x1 scope:local
exec_count_dammy2$4871 = .bss:0x00000062; // type:object size:0x2 scope:local
init$4872 = .bss:0x00000064; // type:object size:0x1 scope:local
mAngleZ$5046 = .bss:0x00000068; // type:object size:0xBB8 scope:local
lbl_73_bss_C20 = .bss:0x00000C20; // type:object size:0x1 data:byte
data_805284E8 = .bss:0x00000C20; // type:object size:0x1 scope:local data:byte
@5442 = .bss:0x00000C24; // type:object size:0xC scope:local
init$5443 = .bss:0x00000C30; // type:object size:0x1 scope:local
ang$5441 = .bss:0x00000C34; // type:object size:0x6 scope:local
config/GZ2E01/rels/d_a_hozelda/symbols.txt
+2 -2
View File
@@ -106,5 +106,5 @@ __vt__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya
__vt__19J3DMtxCalcNoAnmBase = .data:0x000000A0; // type:object size:0x2C scope:global
__vt__10J3DMtxCalc = .data:0x000000CC; // type:object size:0x2C scope:global
__vt__18daHoZelda_matAnm_c = .data:0x000000F8; // type:object size:0x10 scope:global
lbl_263_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
lbl_263_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte
mEyeMoveFlg__18daHoZelda_matAnm_c = .bss:0x00000000; // type:object size:0x1 data:byte
mMorfFrame__18daHoZelda_matAnm_c = .bss:0x00000001; // type:object size:0x1 data:byte
config/GZ2J01/rels/d_a_grass/symbols.txt
+3 -2
View File
@@ -168,7 +168,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@stringBase0 = .rodata:0x00000198; // type:object size:0x16 scope:local data:string_table
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_73_data_10 = .data:0x00000010; // type:object size:0x10
_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8
_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8
l_M_kusa05_RGBATEX = .data:0x00000020; // type:object size:0x800 scope:global
l_M_Hijiki00TEX = .data:0x00000820; // type:object size:0x800 scope:global
l_pos = .data:0x00001020; // type:object size:0x3C0 scope:global
@@ -234,7 +235,7 @@ ang$4292 = .bss:0x00000058; // type:object size:0x6 scope:local
exec_count_dammy$4868 = .bss:0x0000005E; // type:object size:0x2 scope:local
exec_count_dammy2$4871 = .bss:0x00000062; // type:object size:0x2 scope:local
mAngleZ$5046 = .bss:0x00000068; // type:object size:0xBB8 scope:local
lbl_73_bss_C20 = .bss:0x00000C20; // type:object size:0x1 data:byte
data_805284E8 = .bss:0x00000C20; // type:object size:0x1 scope:local data:byte
@5442 = .bss:0x00000C24; // type:object size:0xC scope:local
ang$5441 = .bss:0x00000C34; // type:object size:0x6 scope:local
@6340 = .bss:0x00000C3C; // type:object size:0xC scope:local
config/GZ2J01/rels/d_a_hozelda/symbols.txt
+2 -2
View File
@@ -106,5 +106,5 @@ __vt__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya
__vt__19J3DMtxCalcNoAnmBase = .data:0x000000A0; // type:object size:0x2C scope:global
__vt__10J3DMtxCalc = .data:0x000000CC; // type:object size:0x2C scope:global
__vt__18daHoZelda_matAnm_c = .data:0x000000F8; // type:object size:0x10 scope:global
lbl_263_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
lbl_263_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte
mEyeMoveFlg__18daHoZelda_matAnm_c = .bss:0x00000000; // type:object size:0x1 data:byte
mMorfFrame__18daHoZelda_matAnm_c = .bss:0x00000001; // type:object size:0x1 data:byte
config/GZ2P01/rels/d_a_grass/symbols.txt
+20 -14
View File
@@ -168,7 +168,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@stringBase0 = .rodata:0x00000198; // type:object size:0x16 scope:local data:string_table
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_73_data_10 = .data:0x00000010; // type:object size:0x10
_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8
_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8
l_M_kusa05_RGBATEX = .data:0x00000020; // type:object size:0x800 scope:global
l_M_Hijiki00TEX = .data:0x00000820; // type:object size:0x800 scope:global
l_pos = .data:0x00001020; // type:object size:0x3C0 scope:global
@@ -229,13 +230,18 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
data_8052790d = .bss:0x00000045; // type:object size:0x1 scope:local
@4293 = .bss:0x00000048; // type:object size:0xC scope:local
init$4294 = .bss:0x00000054; // type:object size:0x1 scope:local
ang$4292 = .bss:0x00000058; // type:object size:0x6 scope:local
exec_count_dammy$4868 = .bss:0x0000005E; // type:object size:0x2 scope:local
init$4869 = .bss:0x00000060; // type:object size:0x1 scope:local
exec_count_dammy2$4871 = .bss:0x00000062; // type:object size:0x2 scope:local
init$4872 = .bss:0x00000064; // type:object size:0x1 scope:local
mAngleZ$5046 = .bss:0x00000068; // type:object size:0xBB8 scope:local
lbl_73_bss_C20 = .bss:0x00000C20; // type:object size:0x1 data:byte
data_805284E8 = .bss:0x00000C20; // type:object size:0x1 scope:local data:byte
@5442 = .bss:0x00000C24; // type:object size:0xC scope:local
init$5443 = .bss:0x00000C30; // type:object size:0x1 scope:local
ang$5441 = .bss:0x00000C34; // type:object size:0x6 scope:local
@6340 = .bss:0x00000C3C; // type:object size:0xC scope:local
@6342 = .bss:0x00000C48; // type:object size:0xC scope:local
@@ -324,15 +330,15 @@ sInstance__32JASGlobalInstance<11Z2FxLineMgr> = .bss:0x00000F78; // type:object
sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .bss:0x00000F7C; // type:object size:0x4 scope:global
sInstance__32JASGlobalInstance<11Z2SpeechMgr> = .bss:0x00000F80; // type:object size:0x4 scope:global
sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .bss:0x00000F84; // type:object size:0x4 scope:global
lbl_73_bss_F88 = .bss:0x00000F88; // type:object size:0x1 data:byte
l_setType0$localstatic3$create__9daGrass_cFv = .bss:0x00000F8C; // type:object size:0x2A scope:local data:2byte
lbl_73_bss_FB6 = .bss:0x00000FB6; // type:object size:0x1 data:byte
l_setType1$localstatic5$create__9daGrass_cFv = .bss:0x00000FB8; // type:object size:0x7E scope:local data:2byte
lbl_73_bss_1036 = .bss:0x00001036; // type:object size:0x1 data:byte
l_setType2$localstatic7$create__9daGrass_cFv = .bss:0x00001038; // type:object size:0x12 scope:local data:2byte
lbl_73_bss_104A = .bss:0x0000104A; // type:object size:0x1 data:byte
l_setType3$localstatic9$create__9daGrass_cFv = .bss:0x0000104C; // type:object size:0x2A scope:local data:2byte
lbl_73_bss_1076 = .bss:0x00001076; // type:object size:0x1 data:byte
l_setType4$localstatic11$create__9daGrass_cFv = .bss:0x00001078; // type:object size:0x66 scope:local data:2byte
lbl_73_bss_10DE = .bss:0x000010DE; // type:object size:0x1 data:byte
l_setType5$localstatic13$create__9daGrass_cFv = .bss:0x000010E0; // type:object size:0x2A scope:local data:2byte
init$localstatic4$create__9daGrass_cFv = .bss:0x00000F88; // type:object size:0x1 scope:global data:byte
l_setType0$localstatic3$create__9daGrass_cFv = .bss:0x00000F8C; // type:object size:0x2A scope:global data:2byte
init$localstatic6$create__9daGrass_cFv = .bss:0x00000FB6; // type:object size:0x1 scope:global data:byte
l_setType1$localstatic5$create__9daGrass_cFv = .bss:0x00000FB8; // type:object size:0x7E scope:global data:2byte
init$localstatic8$create__9daGrass_cFv = .bss:0x00001036; // type:object size:0x1 scope:global data:byte
l_setType2$localstatic7$create__9daGrass_cFv = .bss:0x00001038; // type:object size:0x12 scope:global data:2byte
init$localstatic10$create__9daGrass_cFv = .bss:0x0000104A; // type:object size:0x1 scope:global data:byte
l_setType3$localstatic9$create__9daGrass_cFv = .bss:0x0000104C; // type:object size:0x2A scope:global data:2byte
init$localstatic12$create__9daGrass_cFv = .bss:0x00001076; // type:object size:0x1 scope:global data:byte
l_setType4$localstatic11$create__9daGrass_cFv = .bss:0x00001078; // type:object size:0x66 scope:global data:2byte
init$localstatic14$create__9daGrass_cFv = .bss:0x000010DE; // type:object size:0x1 scope:global data:byte
l_setType5$localstatic13$create__9daGrass_cFv = .bss:0x000010E0; // type:object size:0x2A scope:global data:2byte
config/GZ2P01/rels/d_a_hozelda/symbols.txt
+2 -2
View File
@@ -106,5 +106,5 @@ __vt__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya
__vt__19J3DMtxCalcNoAnmBase = .data:0x000000A0; // type:object size:0x2C scope:global
__vt__10J3DMtxCalc = .data:0x000000CC; // type:object size:0x2C scope:global
__vt__18daHoZelda_matAnm_c = .data:0x000000F8; // type:object size:0x10 scope:global
lbl_263_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
lbl_263_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte
mEyeMoveFlg__18daHoZelda_matAnm_c = .bss:0x00000000; // type:object size:0x1 data:byte
mMorfFrame__18daHoZelda_matAnm_c = .bss:0x00000001; // type:object size:0x1 data:byte
configure.py
+1 -1
View File
@@ -749,7 +749,7 @@ config.libs = [
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_msg_string_base.cpp"),
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_msg_string.cpp"),
Object(NonMatching, "d/d_msg_flow.cpp"),
Object(MatchingFor("GZ2E01"), "d/d_name.cpp"),
Object(MatchingFor("GZ2E01", "GZ2P01"), "d/d_name.cpp"),
Object(NonMatching, "d/d_npc_lib.cpp"),
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_ovlp_fade.cpp"),
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d/d_ovlp_fade2.cpp"),
src/d/actor/d_a_hozelda.cpp
+2
View File
@@ -43,8 +43,10 @@ const daHoZelda_hio_c1 daHoZelda_hio_c0::m = {
4000.0f,
};
#if VERSION != VERSION_GCN_PAL
bool daHoZelda_matAnm_c::mEyeMoveFlg;
u8 daHoZelda_matAnm_c::mMorfFrame;
#endif
/* 80845EAC-80845EDC 00008C 0030+00 2/2 0/0 0/0 .text init__18daHoZelda_matAnm_cFv */
void daHoZelda_matAnm_c::init() {
src/d/d_name.cpp
+5 -10
View File
@@ -1221,22 +1221,17 @@ void dName_c::screenSet() {
0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF6, 0x9C, 0xF9, 0xFA, 0xFB, 0xFC, 0xDF,
};
u8* palMoji00_p = palMoji00;
u8* palMoji01_p = palMoji01;
u8* palMoji10_p = palMoji10;
u8* palMoji11_p = palMoji11;
for (int i = 0; i < 13; i++, palMoji11_p++, palMoji10_p++, palMoji01_p++, palMoji00_p++, idx += 5) {
l_mojiEisuPal_1[idx][0] = *palMoji00_p;
for (int i = 0; i < 13; i++, idx += 5) {
l_mojiEisuPal_1[idx][0] = palMoji00[i];
l_mojiEisuPal_1[idx][1] = 0;
l_mojiEisuPal_1[idx + 1][0] = *palMoji01_p;
l_mojiEisuPal_1[idx + 1][0] = palMoji01[i];
l_mojiEisuPal_1[idx + 1][1] = 0;
l_mojiEisuPal_2[idx][0] = *palMoji10_p;
l_mojiEisuPal_2[idx][0] = palMoji10[i];
l_mojiEisuPal_2[idx][1] = 0;
l_mojiEisuPal_2[idx + 1][0] = *palMoji11_p;
l_mojiEisuPal_2[idx + 1][0] = palMoji11[i];
l_mojiEisuPal_2[idx + 1][1] = 0;
}
#endif