diff --git a/config/GZ2E01/config.yml b/config/GZ2E01/config.yml index edd4c3ab12..b310d97fc2 100644 --- a/config/GZ2E01/config.yml +++ b/config/GZ2E01/config.yml @@ -3150,3 +3150,7 @@ extract: - symbol: font_data binary: assets/font_data.bin header: assets/font_data.h + +- symbol: l_sightDL!.data:0x803BA0C0 + binary: assets/l_sightDL__d_a_player.bin + header: assets/l_sightDL__d_a_player.h diff --git a/config/GZ2E01/symbols.txt b/config/GZ2E01/symbols.txt index a479620f5e..278d4fd598 100644 --- a/config/GZ2E01/symbols.txt +++ b/config/GZ2E01/symbols.txt @@ -18553,7 +18553,7 @@ __vt__8daItem_c = .data:0x803B9FA4; // type:object size:0x44 scope:global align: __vt__9dInsect_c = .data:0x803BA078; // type:object size:0xC scope:weak align:4 __vt__14daObj_SSBase_c = .data:0x803BA088; // type:object size:0x14 scope:global align:4 arcName$4622 = .data:0x803BA0A0; // type:object size:0x20 scope:local align:4 -l_sightDL = .data:0x803BA0C0; // type:object size:0x89 scope:local align:4 noreloc +l_sightDL = .data:0x803BA0C0; // type:object size:0x89 scope:local align:32 __vt__18daPy_sightPacket_c = .data:0x803BA14C; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BA160; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BA160; // type:object size:0xC scope:local align:4 diff --git a/config/GZ2J01/config.yml b/config/GZ2J01/config.yml index 19815f0433..d2b5cf054f 100644 --- a/config/GZ2J01/config.yml +++ b/config/GZ2J01/config.yml @@ -4663,3 +4663,7 @@ extract: - symbol: font_data binary: assets/font_data.bin header: assets/font_data.h + +- symbol: l_sightDL!.data:0x803B4220 + binary: assets/l_sightDL__d_a_player.bin + header: assets/l_sightDL__d_a_player.h diff --git a/config/GZ2J01/symbols.txt b/config/GZ2J01/symbols.txt index 215c86e5f1..0a6233cf56 100644 --- a/config/GZ2J01/symbols.txt +++ b/config/GZ2J01/symbols.txt @@ -18573,7 +18573,7 @@ __vt__8daItem_c = .data:0x803B4104; // type:object size:0x44 scope:global align: __vt__9dInsect_c = .data:0x803B41D8; // type:object size:0xC scope:weak align:4 __vt__14daObj_SSBase_c = .data:0x803B41E8; // type:object size:0x14 scope:global align:4 arcName$4622 = .data:0x803B4200; // type:object size:0x20 scope:local align:4 -l_sightDL = .data:0x803B4220; // type:object size:0x89 scope:local align:4 noreloc +l_sightDL = .data:0x803B4220; // type:object size:0x89 scope:local align:32 __vt__18daPy_sightPacket_c = .data:0x803B42AC; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803B42C0; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B42C0; // type:object size:0xC scope:local align:4 diff --git a/config/GZ2P01/config.yml b/config/GZ2P01/config.yml index ed3824393f..0c1199dd44 100644 --- a/config/GZ2P01/config.yml +++ b/config/GZ2P01/config.yml @@ -4675,3 +4675,7 @@ extract: - symbol: font_data binary: assets/font_data.bin header: assets/font_data.h + +- symbol: l_sightDL!.data:0x803BBDA0 + binary: assets/l_sightDL__d_a_player.bin + header: assets/l_sightDL__d_a_player.h diff --git a/config/GZ2P01/symbols.txt b/config/GZ2P01/symbols.txt index 871d3e3aa7..81f01cb611 100644 --- a/config/GZ2P01/symbols.txt +++ b/config/GZ2P01/symbols.txt @@ -18573,7 +18573,7 @@ __vt__8daItem_c = .data:0x803BBC84; // type:object size:0x44 scope:global align: __vt__9dInsect_c = .data:0x803BBD58; // type:object size:0xC scope:weak align:4 __vt__14daObj_SSBase_c = .data:0x803BBD68; // type:object size:0x14 scope:global align:4 arcName$4622 = .data:0x803BBD80; // type:object size:0x20 scope:local align:4 -l_sightDL = .data:0x803BBDA0; // type:object size:0x89 scope:local align:4 noreloc +l_sightDL = .data:0x803BBDA0; // type:object size:0x89 scope:local align:32 __vt__18daPy_sightPacket_c = .data:0x803BBE2C; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BBE40; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BBE40; // type:object size:0xC scope:local align:4 diff --git a/config/Shield/config.yml b/config/Shield/config.yml index 5f199784df..6966e21804 100644 --- a/config/Shield/config.yml +++ b/config/Shield/config.yml @@ -4665,3 +4665,7 @@ extract: - symbol: font_data binary: assets/font_data.bin header: assets/font_data.h + +- symbol: l_sightDL!.data:0x804CC1A0 + binary: assets/l_sightDL__d_a_player.bin + header: assets/l_sightDL__d_a_player.h diff --git a/config/Shield/symbols.txt b/config/Shield/symbols.txt index bce77f0328..80368d8aa8 100644 --- a/config/Shield/symbols.txt +++ b/config/Shield/symbols.txt @@ -18897,7 +18897,7 @@ __vt__14daObj_SSBase_c = .data:0x804CC138; // type:object size:0x14 scope:global @105660 = .data:0x804CC14C; // type:object size:0xF scope:local data:string hash:0xACA5BB21 @105661 = .data:0x804CC15C; // type:object size:0xC scope:local hash:0xACA5BB20 @LOCAL@loadData__14daPy_anmHeap_cFUs@arcName@7 = .data:0x804CC180; // type:object size:0x20 scope:local hash:0x5D88FFAA dhash:0x25797719 -l_sightDL = .data:0x804CC1A0; // type:object size:0x89 scope:global hash:0xA0DE52FF +l_sightDL = .data:0x804CC1A0; // type:object size:0x89 scope:global hash:0xA0DE52FF align:32 engine_tbl__9dCamera_c = .data:0x804CC230; // type:object size:0xF0 scope:global hash:0x26F01736 dhash:0xFBCD726F ...data.0 = .data:0x804CC230; // type:label scope:local @149411 = .data:0x804CC320; // type:object size:0xC scope:local data:string hash:0xAC63E58D diff --git a/config/ShieldD/config.yml b/config/ShieldD/config.yml index 94998b74c3..19c8d2e9dd 100644 --- a/config/ShieldD/config.yml +++ b/config/ShieldD/config.yml @@ -5358,3 +5358,7 @@ extract: header: assets/l_mat2Light4DL.h header_type: none custom_type: matDL + +- symbol: l_sightDL!.data:0x806C9C60 + binary: assets/l_sightDL__d_a_player.bin + header: assets/l_sightDL__d_a_player.h diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index 53a109d7c5..ef379f2e1e 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -43814,7 +43814,7 @@ __vt__14daObj_SSBase_c = .data:0x806C9BA0; // type:object size:0x14 scope:global @130813 = .data:0x806C9C24; // type:object size:0xB scope:local data:string hash:0xACB9822D @130814 = .data:0x806C9C30; // type:object size:0xB scope:local data:string hash:0xACB9822A @LOCAL@loadData__14daPy_anmHeap_cFUs@arcName@7 = .data:0x806C9C40; // type:object size:0x20 scope:local hash:0x5D88FFAA dhash:0x25797719 -l_sightDL = .data:0x806C9C60; // type:object size:0x89 scope:global hash:0xA0DE52FF noreloc +l_sightDL = .data:0x806C9C60; // type:object size:0x89 scope:global align:32 hash:0xA0DE52FF __vt__18daPy_sightPacket_c = .data:0x806C9CF0; // type:object size:0x10 scope:global hash:0xAF6F4F08 dhash:0xDCA1CE01 @131223 = .data:0x806C9D00; // type:object size:0x13 scope:local data:string hash:0xACB9DBE5 @131224 = .data:0x806C9D14; // type:object size:0xC scope:local hash:0xACB9DBE2 diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index 8d9a056c4a..0b6dd246ff 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -362,17 +362,8 @@ JKRHeap* daPy_anmHeap_c::setAnimeHeap() { return mDoExt_setCurrentHeap(mAnimeHeap); } -static u8 l_sightDL[] = { - 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, 0x61, 0xC1, 0x08, 0xE6, 0x70, 0x61, 0x43, 0x00, 0x00, 0x01, 0x61, 0x40, 0x00, 0x00, - 0x06, 0x61, 0x41, 0x00, 0x04, 0xAD, 0x61, 0xF3, 0x64, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, - 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, - 0x00, 0x01, 0x98, 0x00, 0x04, 0x01, 0x01, 0x00, 0x01, 0x01, 0xFF, 0x01, 0x00, 0x00, 0x01, 0x01, - 0xFF, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +#if !PLATFORM_WII +#include "assets/l_sightDL__d_a_player.h" void daPy_sightPacket_c::draw() { GXTexObj texObj; @@ -415,6 +406,7 @@ void daPy_sightPacket_c::setSightImage(ResTIMG* i_img) { mpImg = i_img; mpData = (u8*)i_img + i_img->imageOffset; } +#endif BOOL daPy_py_c::checkMasterSwordEquip() { u16 equipSword = dComIfGs_getSelectEquipSword();