From c3862413d5c4f7114945e566266f0beb671e9bb8 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 15 Jan 2024 15:07:30 -0500 Subject: [PATCH] Add noreloc to fix various data that looks like a pointer --- config/GZLE01/symbols.txt | 24 ++++++++++++------------ config/GZLJ01/symbols.txt | 24 ++++++++++++------------ config/GZLP01/symbols.txt | 24 ++++++++++++------------ src/d/actor/d_a_player_main.cpp | 2 +- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/config/GZLE01/symbols.txt b/config/GZLE01/symbols.txt index 7eb6fa99a..95b83489d 100644 --- a/config/GZLE01/symbols.txt +++ b/config/GZLE01/symbols.txt @@ -13865,7 +13865,7 @@ colorTable$6869 = .rodata:0x8033C1F8; // type:object size:0x24 scope:local align @stringBase0 = .rodata:0x8033C690; // type:object size:0x18 scope:local align:4 data:string_table black_tex = .rodata:0x8033C6C0; // type:object size:0x40 scope:global align:4 msg_data = .rodata:0x8033C700; // type:object size:0x260 scope:global align:32 -font_data = .rodata:0x8033C960; // type:object size:0x12260 scope:global align:32 +font_data = .rodata:0x8033C960; // type:object size:0x12260 scope:global align:32 noreloc @stringBase0 = .rodata:0x8034EBC0; // type:object size:0x4C scope:local align:4 data:string_table @4720 = .rodata:0x8034EC10; // type:object size:0x68 scope:local align:4 data:4byte @stringBase0 = .rodata:0x8034EC78; // type:object size:0x3AF scope:local align:4 data:string_table @@ -14603,8 +14603,8 @@ g_mDoMtx_identity = .data:0x80371768; // type:object size:0x30 scope:global alig l_invisibleMat$7212 = .data:0x803717C0; // type:object size:0x85 scope:local align:32 l_matDL = .data:0x80371860; // type:object size:0x8D scope:local align:32 l_toonMatDL = .data:0x80371900; // type:object size:0x9C scope:global align:32 -l_mat1DL = .data:0x803719A0; // type:object size:0x96 scope:global align:32 -l_toonMat1DL = .data:0x80371A40; // type:object size:0xA5 scope:global align:32 +l_mat1DL = .data:0x803719A0; // type:object size:0x96 scope:global align:32 noreloc +l_toonMat1DL = .data:0x80371A40; // type:object size:0xA5 scope:global align:32 noreloc __vt__7JUTFont = .data:0x80371AE8; // type:object size:0x44 scope:global align:4 __vt__26mDoExt_3DlineMatSortPacket = .data:0x80371B2C; // type:object size:0x18 scope:global align:4 __vt__19mDoExt_3DlineMat1_c = .data:0x80371B44; // type:object size:0x14 scope:global align:4 @@ -15024,7 +15024,7 @@ l_vtxAttrFmtList$5112 = .data:0x8037C534; // type:object size:0x20 scope:local a l_shadowVolPos = .data:0x8037C554; // type:object size:0x60 scope:global align:4 l_shadowVolDL = .data:0x8037C5C0; // type:object size:0x4A scope:global align:32 l_shadowProjMat = .data:0x8037C620; // type:object size:0x55 scope:global align:32 -l_shadowVolMat = .data:0x8037C680; // type:object size:0x5A scope:global align:32 +l_shadowVolMat = .data:0x8037C680; // type:object size:0x5A scope:global align:32 noreloc l_clearMat = .data:0x8037C6E0; // type:object size:0x55 scope:global align:32 l_frontMat = .data:0x8037C740; // type:object size:0x55 scope:global align:32 l_backSubMat = .data:0x8037C7A0; // type:object size:0x3C scope:global align:32 @@ -15734,7 +15734,7 @@ l_fan_wind_sph_src = .data:0x8038DE40; // type:object size:0x40 scope:global ali @4362 = .data:0x8038E8A0; // type:object size:0xC scope:local align:4 @4363 = .data:0x8038E8AC; // type:object size:0xC scope:local align:4 @4364 = .data:0x8038E8B8; // type:object size:0xC scope:local align:4 -mProcInitTable__9daPy_lk_c = .data:0x8038E8C4; // type:object size:0xDB0 scope:global align:4 data:4byte +mProcInitTable__9daPy_lk_c = .data:0x8038E8C4; // type:object size:0xDB0 scope:global align:4 data:4byte noreloc @4365 = .data:0x8038F674; // type:object size:0xC scope:local align:4 @4366 = .data:0x8038F680; // type:object size:0xC scope:local align:4 @4367 = .data:0x8038F68C; // type:object size:0xC scope:local align:4 @@ -15788,7 +15788,7 @@ mProcInitTable__9daPy_lk_c = .data:0x8038E8C4; // type:object size:0xDB0 scope:g @4415 = .data:0x8038F8CC; // type:object size:0xC scope:local align:4 @4416 = .data:0x8038F8D8; // type:object size:0xC scope:local align:4 mDemoProcInitFuncTable__9daPy_lk_c = .data:0x8038F8E4; // type:object size:0x384 scope:global align:4 data:4byte -l_sightDL = .data:0x8038FC80; // type:object size:0x89 scope:local align:32 +l_sightDL = .data:0x8038FC80; // type:object size:0x89 scope:local align:32 noreloc waterfall_ripple_scale$5702 = .data:0x8038FD0C; // type:object size:0xC scope:local align:4 grass_scale$6038 = .data:0x8038FD18; // type:object size:0xC scope:local align:4 smoke_scale$6039 = .data:0x8038FD24; // type:object size:0xC scope:local align:4 @@ -16749,7 +16749,7 @@ CUTOFF_TO_IIR_TABLE__Q28JASystem6Player = .data:0x80397F70; // type:object size: sAdsTable__Q28JASystem6Player = .data:0x80398370; // type:object size:0x18 scope:global align:4 sRelTable__Q28JASystem6Player = .data:0x80398388; // type:object size:0xC scope:global align:4 sVibTable__Q28JASystem6Player = .data:0x80398394; // type:object size:0x24 scope:global align:4 -sTreTable__Q28JASystem6Player = .data:0x803983B8; // type:object size:0x24 scope:global align:4 +sTreTable__Q28JASystem6Player = .data:0x803983B8; // type:object size:0x24 scope:global align:4 noreloc ...data.0 = .data:0x803983E0; // type:label scope:local @620 = .data:0x803983E0; // type:object size:0xC scope:local align:4 data:4byte @621 = .data:0x803983EC; // type:object size:0xC scope:local align:4 @@ -16836,8 +16836,8 @@ calc_sw_table__Q28JASystem6Driver = .data:0x80398C28; // type:object size:0x51 s oscTableForceStop__Q28JASystem11TOscillator = .data:0x80398CC0; // type:object size:0xC scope:global align:4 C5BASE_PITCHTABLE__Q28JASystem6Driver = .data:0x80398CE0; // type:object size:0x200 scope:global align:4 DSPADPCM_FILTER__Q28JASystem12DSPInterface = .data:0x80398EE0; // type:object size:0x40 scope:global align:32 -DSPRES_FILTER__Q28JASystem12DSPInterface = .data:0x80398F20; // type:object size:0x500 scope:global align:32 -jdsp = .data:0x80399420; // type:object size:0x1D20 scope:global align:32 +DSPRES_FILTER__Q28JASystem12DSPInterface = .data:0x80398F20; // type:object size:0x500 scope:global align:32 noreloc +jdsp = .data:0x80399420; // type:object size:0x1D20 scope:global align:32 noreloc __vt__13JAIAnimeSound = .data:0x8039B140; // type:object size:0x10 scope:global align:4 __vt__8JAIBasic = .data:0x8039B150; // type:object size:0x24 scope:global align:4 dummyZeroVec__Q27JAInter5Const = .data:0x8039B178; // type:object size:0xC scope:global align:4 data:float @@ -16920,8 +16920,8 @@ c3bcnt = .data:0x8039D238; // type:object size:0x20 scope:global align:8 data:4b sCpuExpName__12JUTException = .data:0x8039D258; // type:object size:0x44 scope:global align:4 __vt__12JUTException = .data:0x8039D29C; // type:object size:0x10 scope:global align:4 sAsciiTable__14JUTDirectPrint = .data:0x8039D2B0; // type:object size:0x80 scope:global align:4 -sFontData__14JUTDirectPrint = .data:0x8039D330; // type:object size:0x100 scope:global align:4 -sFontData2__14JUTDirectPrint = .data:0x8039D430; // type:object size:0x134 scope:global align:4 +sFontData__14JUTDirectPrint = .data:0x8039D330; // type:object size:0x100 scope:global align:4 noreloc +sFontData2__14JUTDirectPrint = .data:0x8039D430; // type:object size:0x134 scope:global align:4 noreloc __vt__8JUTVideo = .data:0x8039D568; // type:object size:0xC scope:global align:4 __vt__8JUTFader = .data:0x8039D578; // type:object size:0x18 scope:global align:4 __vt__10JUTConsole = .data:0x8039D590; // type:object size:0xC scope:global align:4 @@ -20227,7 +20227,7 @@ M_box_z_max__Q210daTagLight5Act_c = .sdata2:0x803F8334; // type:object size:0x4 M_cone_lower__Q210daTagLight5Act_c = .sdata2:0x803F8338; // type:object size:0x4 scope:global align:4 data:float M_cone_upper__Q210daTagLight5Act_c = .sdata2:0x803F833C; // type:object size:0x4 scope:global align:4 data:float M_cone_r__Q210daTagLight5Act_c = .sdata2:0x803F8340; // type:object size:0x4 scope:global align:4 data:float -M_dir_base__Q212daObjMovebox5Act_c = .sdata2:0x803F8344; // type:object size:0x8 scope:global align:4 +M_dir_base__Q212daObjMovebox5Act_c = .sdata2:0x803F8344; // type:object size:0x8 scope:global align:4 noreloc m_max_rot_speed__12daWindMill_c = .sdata2:0x803F834C; // type:object size:0x4 scope:global align:4 m_highscore__11daNpc_Kg1_c = .sdata2:0x803F8350; // type:object size:0x1 scope:global align:1 data:byte @4558 = .sdata2:0x803F8354; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GZLJ01/symbols.txt b/config/GZLJ01/symbols.txt index eda8f7aaf..60f8820f4 100644 --- a/config/GZLJ01/symbols.txt +++ b/config/GZLJ01/symbols.txt @@ -13796,7 +13796,7 @@ colorTable$7065 = .rodata:0x80339C34; // type:object size:0x24 scope:local align @stringBase0 = .rodata:0x8033A120; // type:object size:0x18 scope:local align:4 data:string_table black_tex = .rodata:0x8033A140; // type:object size:0x40 scope:global align:4 msg_data = .rodata:0x8033A180; // type:object size:0x220 scope:global align:32 -font_data = .rodata:0x8033A3A0; // type:object size:0x8280 scope:global align:32 +font_data = .rodata:0x8033A3A0; // type:object size:0x8280 scope:global align:32 noreloc @stringBase0 = .rodata:0x80342620; // type:object size:0x4C scope:local align:4 data:string_table @4720 = .rodata:0x80342670; // type:object size:0x68 scope:local align:4 data:4byte @stringBase0 = .rodata:0x803426D8; // type:object size:0x3AF scope:local align:4 data:string_table @@ -14526,8 +14526,8 @@ g_mDoMtx_identity = .data:0x80364C08; // type:object size:0x30 scope:global alig l_invisibleMat$7242 = .data:0x80364C60; // type:object size:0x85 scope:local align:32 l_matDL = .data:0x80364D00; // type:object size:0x8D scope:local align:32 l_toonMatDL = .data:0x80364DA0; // type:object size:0x9C scope:global align:32 -l_mat1DL = .data:0x80364E40; // type:object size:0x96 scope:global align:32 -l_toonMat1DL = .data:0x80364EE0; // type:object size:0xA5 scope:global align:32 +l_mat1DL = .data:0x80364E40; // type:object size:0x96 scope:global align:32 noreloc +l_toonMat1DL = .data:0x80364EE0; // type:object size:0xA5 scope:global align:32 noreloc __vt__7JUTFont = .data:0x80364F88; // type:object size:0x44 scope:global align:4 __vt__26mDoExt_3DlineMatSortPacket = .data:0x80364FCC; // type:object size:0x18 scope:global align:4 __vt__19mDoExt_3DlineMat1_c = .data:0x80364FE4; // type:object size:0x14 scope:global align:4 @@ -14947,7 +14947,7 @@ l_vtxAttrFmtList$5112 = .data:0x8036F9D4; // type:object size:0x20 scope:local a l_shadowVolPos = .data:0x8036F9F4; // type:object size:0x60 scope:global align:4 l_shadowVolDL = .data:0x8036FA60; // type:object size:0x4A scope:global align:32 l_shadowProjMat = .data:0x8036FAC0; // type:object size:0x55 scope:global align:32 -l_shadowVolMat = .data:0x8036FB20; // type:object size:0x5A scope:global align:32 +l_shadowVolMat = .data:0x8036FB20; // type:object size:0x5A scope:global align:32 noreloc l_clearMat = .data:0x8036FB80; // type:object size:0x55 scope:global align:32 l_frontMat = .data:0x8036FBE0; // type:object size:0x55 scope:global align:32 l_backSubMat = .data:0x8036FC40; // type:object size:0x3C scope:global align:32 @@ -15657,7 +15657,7 @@ l_fan_wind_sph_src = .data:0x803814E0; // type:object size:0x40 scope:global ali @4362 = .data:0x80381F40; // type:object size:0xC scope:local align:4 @4363 = .data:0x80381F4C; // type:object size:0xC scope:local align:4 @4364 = .data:0x80381F58; // type:object size:0xC scope:local align:4 -mProcInitTable__9daPy_lk_c = .data:0x80381F64; // type:object size:0xDB0 scope:global align:4 data:4byte +mProcInitTable__9daPy_lk_c = .data:0x80381F64; // type:object size:0xDB0 scope:global align:4 data:4byte noreloc @4365 = .data:0x80382D14; // type:object size:0xC scope:local align:4 @4366 = .data:0x80382D20; // type:object size:0xC scope:local align:4 @4367 = .data:0x80382D2C; // type:object size:0xC scope:local align:4 @@ -15711,7 +15711,7 @@ mProcInitTable__9daPy_lk_c = .data:0x80381F64; // type:object size:0xDB0 scope:g @4415 = .data:0x80382F6C; // type:object size:0xC scope:local align:4 @4416 = .data:0x80382F78; // type:object size:0xC scope:local align:4 mDemoProcInitFuncTable__9daPy_lk_c = .data:0x80382F84; // type:object size:0x384 scope:global align:4 data:4byte -l_sightDL = .data:0x80383320; // type:object size:0x89 scope:local align:32 +l_sightDL = .data:0x80383320; // type:object size:0x89 scope:local align:32 noreloc waterfall_ripple_scale$5699 = .data:0x803833AC; // type:object size:0xC scope:local align:4 grass_scale$6035 = .data:0x803833B8; // type:object size:0xC scope:local align:4 smoke_scale$6036 = .data:0x803833C4; // type:object size:0xC scope:local align:4 @@ -16671,7 +16671,7 @@ CUTOFF_TO_IIR_TABLE__Q28JASystem6Player = .data:0x8038B5F0; // type:object size: sAdsTable__Q28JASystem6Player = .data:0x8038B9F0; // type:object size:0x18 scope:global align:4 sRelTable__Q28JASystem6Player = .data:0x8038BA08; // type:object size:0xC scope:global align:4 sVibTable__Q28JASystem6Player = .data:0x8038BA14; // type:object size:0x24 scope:global align:4 -sTreTable__Q28JASystem6Player = .data:0x8038BA38; // type:object size:0x24 scope:global align:4 +sTreTable__Q28JASystem6Player = .data:0x8038BA38; // type:object size:0x24 scope:global align:4 noreloc ...data.0 = .data:0x8038BA60; // type:label scope:local @620 = .data:0x8038BA60; // type:object size:0xC scope:local align:4 data:4byte @621 = .data:0x8038BA6C; // type:object size:0xC scope:local align:4 @@ -16758,8 +16758,8 @@ calc_sw_table__Q28JASystem6Driver = .data:0x8038C2A8; // type:object size:0x51 s oscTableForceStop__Q28JASystem11TOscillator = .data:0x8038C340; // type:object size:0xC scope:global align:4 C5BASE_PITCHTABLE__Q28JASystem6Driver = .data:0x8038C360; // type:object size:0x200 scope:global align:4 DSPADPCM_FILTER__Q28JASystem12DSPInterface = .data:0x8038C560; // type:object size:0x40 scope:global align:32 -DSPRES_FILTER__Q28JASystem12DSPInterface = .data:0x8038C5A0; // type:object size:0x500 scope:global align:32 -jdsp = .data:0x8038CAA0; // type:object size:0x1D20 scope:global align:32 +DSPRES_FILTER__Q28JASystem12DSPInterface = .data:0x8038C5A0; // type:object size:0x500 scope:global align:32 noreloc +jdsp = .data:0x8038CAA0; // type:object size:0x1D20 scope:global align:32 noreloc __vt__13JAIAnimeSound = .data:0x8038E7C0; // type:object size:0x10 scope:global align:4 __vt__8JAIBasic = .data:0x8038E7D0; // type:object size:0x24 scope:global align:4 dummyZeroVec__Q27JAInter5Const = .data:0x8038E7F8; // type:object size:0xC scope:global align:4 data:float @@ -16841,8 +16841,8 @@ c3bcnt = .data:0x80390760; // type:object size:0x20 scope:global align:8 data:4b sCpuExpName__12JUTException = .data:0x80390780; // type:object size:0x44 scope:global align:4 __vt__12JUTException = .data:0x803907C4; // type:object size:0x10 scope:global align:4 sAsciiTable__14JUTDirectPrint = .data:0x803907D8; // type:object size:0x80 scope:global align:4 -sFontData__14JUTDirectPrint = .data:0x80390858; // type:object size:0x100 scope:global align:4 -sFontData2__14JUTDirectPrint = .data:0x80390958; // type:object size:0x134 scope:global align:4 +sFontData__14JUTDirectPrint = .data:0x80390858; // type:object size:0x100 scope:global align:4 noreloc +sFontData2__14JUTDirectPrint = .data:0x80390958; // type:object size:0x134 scope:global align:4 noreloc __vt__8JUTVideo = .data:0x80390A90; // type:object size:0xC scope:global align:4 __vt__8JUTFader = .data:0x80390AA0; // type:object size:0x18 scope:global align:4 __vt__10JUTConsole = .data:0x80390AB8; // type:object size:0xC scope:global align:4 @@ -20129,7 +20129,7 @@ M_box_z_max__Q210daTagLight5Act_c = .sdata2:0x803EB7EC; // type:object size:0x4 M_cone_lower__Q210daTagLight5Act_c = .sdata2:0x803EB7F0; // type:object size:0x4 scope:global align:4 data:float M_cone_upper__Q210daTagLight5Act_c = .sdata2:0x803EB7F4; // type:object size:0x4 scope:global align:4 data:float M_cone_r__Q210daTagLight5Act_c = .sdata2:0x803EB7F8; // type:object size:0x4 scope:global align:4 data:float -M_dir_base__Q212daObjMovebox5Act_c = .sdata2:0x803EB7FC; // type:object size:0x8 scope:global align:4 +M_dir_base__Q212daObjMovebox5Act_c = .sdata2:0x803EB7FC; // type:object size:0x8 scope:global align:4 noreloc m_max_rot_speed__12daWindMill_c = .sdata2:0x803EB804; // type:object size:0x4 scope:global align:4 m_highscore__11daNpc_Kg1_c = .sdata2:0x803EB808; // type:object size:0x1 scope:global align:1 data:byte @4544 = .sdata2:0x803EB80C; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GZLP01/symbols.txt b/config/GZLP01/symbols.txt index fa7c5da59..d74b0c8e4 100644 --- a/config/GZLP01/symbols.txt +++ b/config/GZLP01/symbols.txt @@ -13853,7 +13853,7 @@ msg_data_ge = .rodata:0x803422E0; // type:object size:0x2A0 scope:global align:3 msg_data_fr = .rodata:0x80342580; // type:object size:0x260 scope:global align:32 msg_data_sp = .rodata:0x803427E0; // type:object size:0x240 scope:global align:32 msg_data_it = .rodata:0x80342A20; // type:object size:0x280 scope:global align:32 -font_data = .rodata:0x80342CA0; // type:object size:0x12260 scope:global align:32 +font_data = .rodata:0x80342CA0; // type:object size:0x12260 scope:global align:32 noreloc @stringBase0 = .rodata:0x80354F00; // type:object size:0x4C scope:local align:4 data:string_table @4720 = .rodata:0x80354F50; // type:object size:0x68 scope:local align:4 data:4byte @stringBase0 = .rodata:0x80354FB8; // type:object size:0x3AF scope:local align:4 data:string_table @@ -14628,8 +14628,8 @@ g_mDoMtx_identity = .data:0x80378448; // type:object size:0x30 scope:global alig l_invisibleMat$7212 = .data:0x803784A0; // type:object size:0x85 scope:local align:32 l_matDL = .data:0x80378540; // type:object size:0x8D scope:local align:32 l_toonMatDL = .data:0x803785E0; // type:object size:0x9C scope:global align:32 -l_mat1DL = .data:0x80378680; // type:object size:0x96 scope:global align:32 -l_toonMat1DL = .data:0x80378720; // type:object size:0xA5 scope:global align:32 +l_mat1DL = .data:0x80378680; // type:object size:0x96 scope:global align:32 noreloc +l_toonMat1DL = .data:0x80378720; // type:object size:0xA5 scope:global align:32 noreloc __vt__7JUTFont = .data:0x803787C8; // type:object size:0x44 scope:global align:4 __vt__26mDoExt_3DlineMatSortPacket = .data:0x8037880C; // type:object size:0x18 scope:global align:4 __vt__19mDoExt_3DlineMat1_c = .data:0x80378824; // type:object size:0x14 scope:global align:4 @@ -15049,7 +15049,7 @@ l_vtxAttrFmtList$5112 = .data:0x80383214; // type:object size:0x20 scope:local a l_shadowVolPos = .data:0x80383234; // type:object size:0x60 scope:global align:4 l_shadowVolDL = .data:0x803832A0; // type:object size:0x4A scope:global align:32 l_shadowProjMat = .data:0x80383300; // type:object size:0x55 scope:global align:32 -l_shadowVolMat = .data:0x80383360; // type:object size:0x5A scope:global align:32 +l_shadowVolMat = .data:0x80383360; // type:object size:0x5A scope:global align:32 noreloc l_clearMat = .data:0x803833C0; // type:object size:0x55 scope:global align:32 l_frontMat = .data:0x80383420; // type:object size:0x55 scope:global align:32 l_backSubMat = .data:0x80383480; // type:object size:0x3C scope:global align:32 @@ -15759,7 +15759,7 @@ l_fan_wind_sph_src = .data:0x80394B20; // type:object size:0x40 scope:global ali @4362 = .data:0x80395580; // type:object size:0xC scope:local align:4 @4363 = .data:0x8039558C; // type:object size:0xC scope:local align:4 @4364 = .data:0x80395598; // type:object size:0xC scope:local align:4 -mProcInitTable__9daPy_lk_c = .data:0x803955A4; // type:object size:0xDB0 scope:global align:4 data:4byte +mProcInitTable__9daPy_lk_c = .data:0x803955A4; // type:object size:0xDB0 scope:global align:4 data:4byte noreloc @4365 = .data:0x80396354; // type:object size:0xC scope:local align:4 @4366 = .data:0x80396360; // type:object size:0xC scope:local align:4 @4367 = .data:0x8039636C; // type:object size:0xC scope:local align:4 @@ -15813,7 +15813,7 @@ mProcInitTable__9daPy_lk_c = .data:0x803955A4; // type:object size:0xDB0 scope:g @4415 = .data:0x803965AC; // type:object size:0xC scope:local align:4 @4416 = .data:0x803965B8; // type:object size:0xC scope:local align:4 mDemoProcInitFuncTable__9daPy_lk_c = .data:0x803965C4; // type:object size:0x384 scope:global align:4 data:4byte -l_sightDL = .data:0x80396960; // type:object size:0x89 scope:local align:32 +l_sightDL = .data:0x80396960; // type:object size:0x89 scope:local align:32 noreloc waterfall_ripple_scale$5702 = .data:0x803969EC; // type:object size:0xC scope:local align:4 grass_scale$6038 = .data:0x803969F8; // type:object size:0xC scope:local align:4 smoke_scale$6039 = .data:0x80396A04; // type:object size:0xC scope:local align:4 @@ -16779,7 +16779,7 @@ CUTOFF_TO_IIR_TABLE__Q28JASystem6Player = .data:0x8039EC70; // type:object size: sAdsTable__Q28JASystem6Player = .data:0x8039F070; // type:object size:0x18 scope:global align:4 sRelTable__Q28JASystem6Player = .data:0x8039F088; // type:object size:0xC scope:global align:4 sVibTable__Q28JASystem6Player = .data:0x8039F094; // type:object size:0x24 scope:global align:4 -sTreTable__Q28JASystem6Player = .data:0x8039F0B8; // type:object size:0x24 scope:global align:4 +sTreTable__Q28JASystem6Player = .data:0x8039F0B8; // type:object size:0x24 scope:global align:4 noreloc ...data.0 = .data:0x8039F0E0; // type:label scope:local @620 = .data:0x8039F0E0; // type:object size:0xC scope:local align:4 data:4byte @621 = .data:0x8039F0EC; // type:object size:0xC scope:local align:4 @@ -16866,8 +16866,8 @@ calc_sw_table__Q28JASystem6Driver = .data:0x8039F928; // type:object size:0x51 s oscTableForceStop__Q28JASystem11TOscillator = .data:0x8039F9C0; // type:object size:0xC scope:global align:4 C5BASE_PITCHTABLE__Q28JASystem6Driver = .data:0x8039F9E0; // type:object size:0x200 scope:global align:4 DSPADPCM_FILTER__Q28JASystem12DSPInterface = .data:0x8039FBE0; // type:object size:0x40 scope:global align:32 -DSPRES_FILTER__Q28JASystem12DSPInterface = .data:0x8039FC20; // type:object size:0x500 scope:global align:32 -jdsp = .data:0x803A0120; // type:object size:0x1D20 scope:global align:32 +DSPRES_FILTER__Q28JASystem12DSPInterface = .data:0x8039FC20; // type:object size:0x500 scope:global align:32 noreloc +jdsp = .data:0x803A0120; // type:object size:0x1D20 scope:global align:32 noreloc __vt__13JAIAnimeSound = .data:0x803A1E40; // type:object size:0x10 scope:global align:4 __vt__8JAIBasic = .data:0x803A1E50; // type:object size:0x24 scope:global align:4 dummyZeroVec__Q27JAInter5Const = .data:0x803A1E78; // type:object size:0xC scope:global align:4 data:float @@ -16950,8 +16950,8 @@ c3bcnt = .data:0x803A3F38; // type:object size:0x20 scope:global align:8 data:4b sCpuExpName__12JUTException = .data:0x803A3F58; // type:object size:0x44 scope:global align:4 __vt__12JUTException = .data:0x803A3F9C; // type:object size:0x10 scope:global align:4 sAsciiTable__14JUTDirectPrint = .data:0x803A3FB0; // type:object size:0x80 scope:global align:4 -sFontData__14JUTDirectPrint = .data:0x803A4030; // type:object size:0x100 scope:global align:4 -sFontData2__14JUTDirectPrint = .data:0x803A4130; // type:object size:0x134 scope:global align:4 +sFontData__14JUTDirectPrint = .data:0x803A4030; // type:object size:0x100 scope:global align:4 noreloc +sFontData2__14JUTDirectPrint = .data:0x803A4130; // type:object size:0x134 scope:global align:4 noreloc __vt__8JUTVideo = .data:0x803A4268; // type:object size:0xC scope:global align:4 __vt__8JUTFader = .data:0x803A4278; // type:object size:0x18 scope:global align:4 __vt__10JUTConsole = .data:0x803A4290; // type:object size:0xC scope:global align:4 @@ -20256,7 +20256,7 @@ M_box_z_max__Q210daTagLight5Act_c = .sdata2:0x803FFB5C; // type:object size:0x4 M_cone_lower__Q210daTagLight5Act_c = .sdata2:0x803FFB60; // type:object size:0x4 scope:global align:4 data:float M_cone_upper__Q210daTagLight5Act_c = .sdata2:0x803FFB64; // type:object size:0x4 scope:global align:4 data:float M_cone_r__Q210daTagLight5Act_c = .sdata2:0x803FFB68; // type:object size:0x4 scope:global align:4 data:float -M_dir_base__Q212daObjMovebox5Act_c = .sdata2:0x803FFB6C; // type:object size:0x8 scope:global align:4 +M_dir_base__Q212daObjMovebox5Act_c = .sdata2:0x803FFB6C; // type:object size:0x8 scope:global align:4 noreloc m_max_rot_speed__12daWindMill_c = .sdata2:0x803FFB74; // type:object size:0x4 scope:global align:4 m_highscore__11daNpc_Kg1_c = .sdata2:0x803FFB78; // type:object size:0x1 scope:global align:1 data:byte @4558 = .sdata2:0x803FFB7C; // type:object size:0x4 scope:local align:4 data:float diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 20b07debf..96f3e26fb 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -41,7 +41,7 @@ csXyz l_debug_shape_angle; #include "d/actor/d_a_player_HIO.inc" static u8 l_sightDL[] ALIGN_DECL(32) = { - 0x10, 0x00, 0x00, 0x10, 0x40, 0xFF, 0xFF, 0x42, 0x00, 0x00, 0x00, 0x00, 0xF3, 0xCF, 0x00, + 0x10, 0x00, 0x00, 0x10, 0x40, 0xFF, 0xFF, 0x42, 0x80, 0x08, 0x30, 0x3C, 0xF3, 0xCF, 0x00, 0x10, 0x00, 0x00, 0x10, 0x18, 0x3C, 0xF3, 0xCF, 0x00, 0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0xC0, 0x08, 0x42, 0x8F,