diff --git a/config/GZ2J01/splits.txt b/config/GZ2J01/splits.txt index ec8067bd93c..63e963ac4e3 100644 --- a/config/GZ2J01/splits.txt +++ b/config/GZ2J01/splits.txt @@ -143,7 +143,7 @@ f_op/f_op_actor.cpp: .text start:0x80018B64 end:0x800197BC .rodata start:0x8037AD20 end:0x8037AD28 .data start:0x8039D710 end:0x8039D740 - .sbss start:0x8044ADF8 end:0x8044AE0C + .sbss start:0x8044ADF8 end:0x8044AE08 .sdata2 start:0x8044BD08 end:0x8044BD40 f_op/f_op_actor_iter.cpp: @@ -159,7 +159,7 @@ f_op/f_op_actor_mng.cpp: .rodata start:0x8037AD28 end:0x8037AEF8 .data start:0x8039D750 end:0x8039D9C0 .bss start:0x803EBD40 end:0x803EBF18 - .sbss start:0x8044AE0C end:0x8044AE20 + .sbss start:0x8044AE08 end:0x8044AE20 .sdata2 start:0x8044BD40 end:0x8044BDA8 f_op/f_op_camera.cpp: @@ -395,7 +395,7 @@ d/d_bomb.cpp: d/d_lib.cpp: .text start:0x80032044 end:0x80032918 .data start:0x803A13A0 end:0x803A13D0 - .sbss start:0x8044AF18 end:0x8044AF38 + .sbss start:0x8044AF18 end:0x8044AF30 d/d_save.cpp: .text start:0x80032918 end:0x80035C88 @@ -415,6 +415,7 @@ d/d_a_obj.cpp: .text start:0x80037038 end:0x80037A5C .rodata start:0x8037B740 end:0x8037B758 .bss start:0x8041E728 end:0x8041E788 + .sbss start:0x8044AF30 end:0x8044AF38 .sdata2 start:0x8044BED8 end:0x8044BEF0 d/d_a_itembase_static.cpp: @@ -533,7 +534,7 @@ d/d_drawlist.cpp: .data start:0x803A2900 end:0x803A2FF8 .bss start:0x8041EA10 end:0x8041EA78 .sdata start:0x8044A788 end:0x8044A7A0 - .sbss start:0x8044B014 end:0x8044B028 + .sbss start:0x8044B014 end:0x8044B020 .sdata2 start:0x8044C148 end:0x8044C220 .sbss2 start:0x80450C88 end:0x80450C90 @@ -547,6 +548,7 @@ d/d_kankyo_wether.cpp: .rodata start:0x8037C810 end:0x8037C968 .data start:0x803A3C20 end:0x803A3D00 .bss start:0x8041EA78 end:0x8041EA90 + .sbss start:0x8044B020 end:0x8044B028 .sdata2 start:0x8044C220 end:0x8044C2F0 d/d_kankyo_rain.cpp: @@ -571,7 +573,7 @@ d/d_attention.cpp: .rodata start:0x8037CC18 end:0x8037CC28 .data start:0x803A3D58 end:0x803A3DD0 .bss start:0x8041EC40 end:0x8041EC60 - .sdata start:0x8044A7A0 end:0x8044A7D0 + .sdata start:0x8044A7A0 end:0x8044A7C0 .sdata2 start:0x8044C768 end:0x8044C7F8 d/d_att_dist.cpp: @@ -641,7 +643,7 @@ d/d_bg_w.cpp: .text start:0x80079204 end:0x8007E5E8 .data start:0x803A5BE0 end:0x803A5E28 .bss start:0x8041ECC0 end:0x8041F0B0 - .sbss start:0x8044B0C0 end:0x8044B0D0 + .sbss start:0x8044B0C0 end:0x8044B0C8 .sdata2 start:0x8044C838 end:0x8044C858 d/d_bg_w_base.cpp: @@ -690,6 +692,7 @@ d/d_ev_camera.cpp: .rodata start:0x8037CC98 end:0x8037D210 .data start:0x803A6688 end:0x803A6700 .bss start:0x8041F4E8 end:0x8041F578 + .sbss start:0x8044B0C8 end:0x8044B0D0 .sdata2 start:0x8044C9F8 end:0x8044CD08 d/d_item_data.cpp: @@ -711,6 +714,7 @@ d/d_tresure.cpp: .text start:0x8009BC18 end:0x8009C53C .rodata start:0x8037D580 end:0x8037D5A8 .bss start:0x8041F578 end:0x8041F648 + .sdata start:0x8044A7C0 end:0x8044A7C8 .sbss start:0x8044B0D8 end:0x8044B0E0 .sdata2 start:0x8044CD28 end:0x8044CD50 @@ -723,12 +727,14 @@ d/d_model.cpp: d/d_eye_hl.cpp: .text start:0x8009C9A4 end:0x8009CBC8 .rodata start:0x8037D5A8 end:0x8037D5E0 - .sbss start:0x8044B0E8 end:0x8044B100 + .sbss start:0x8044B0E8 end:0x8044B0F0 .sdata2 start:0x8044CD50 end:0x8044CD58 d/d_error_msg.cpp: .text start:0x8009CBC8 end:0x8009D8B4 .rodata start:0x8037D5E0 end:0x803876D8 + .sdata start:0x8044A7C8 end:0x8044A7D0 + .sbss start:0x8044B0F0 end:0x8044B0F8 .sdata2 start:0x8044CD58 end:0x8044CD98 .sbss2 start:0x80450C98 end:0x80450CA0 @@ -739,7 +745,7 @@ d/actor/d_a_alink.cpp: .data start:0x803A9AF0 end:0x803AD770 .bss start:0x8041F648 end:0x8041F848 .sdata start:0x8044A7D0 end:0x8044A7E8 - .sbss start:0x8044B100 end:0x8044B118 + .sbss start:0x8044B0F8 end:0x8044B118 .sdata2 start:0x8044CD98 end:0x8044D4F0 d/actor/d_a_itembase.cpp: @@ -904,7 +910,7 @@ d/d_kankyo.cpp: .data start:0x803B5F18 end:0x803B62B8 .bss start:0x80426B88 end:0x80428930 .sdata start:0x8044A840 end:0x8044A860 - .sbss start:0x8044B1A8 end:0x8044B1B8 + .sbss start:0x8044B1A8 end:0x8044B1B0 .sdata2 start:0x8044DCF8 end:0x8044DF90 d/d_kyeff.cpp: @@ -922,6 +928,7 @@ d/d_ky_thunder.cpp: .rodata start:0x8038EFC0 end:0x8038EFD0 .data start:0x803B6338 end:0x803B6378 .bss start:0x80428930 end:0x80428960 + .sbss start:0x8044B1B0 end:0x8044B1B8 .sdata2 start:0x8044DFA8 end:0x8044E030 d/d_kantera_icon_meter.cpp: @@ -1570,7 +1577,7 @@ JSystem/JParticle/JPAResource.cpp: JSystem/JParticle/JPABaseShape.cpp: .text start:0x80278EC0 end:0x8027CD48 .data start:0x803BE420 end:0x803BE5C8 - .sdata start:0x8044A8E0 end:0x8044A8EC + .sdata start:0x8044A8E0 end:0x8044A8E8 .sdata2 start:0x8044F3C8 end:0x8044F400 JSystem/JParticle/JPAExtraShape.cpp: @@ -1633,10 +1640,12 @@ JSystem/JStage/JSGAmbientLight.cpp: JSystem/JStage/JSGCamera.cpp: .text start:0x80282FD0 end:0x802830B0 - .text start:0x802830B0 end:0x80283158 .data start:0x803BE7C0 end:0x803BE858 - .data start:0x803BE858 end:0x803BE8B8 .sdata2 start:0x8044F4F8 end:0x8044F500 + +JSystem/JStage/JSGFog.cpp: + .text start:0x802830B0 end:0x80283158 + .data start:0x803BE858 end:0x803BE8B8 .sdata2 start:0x8044F500 end:0x8044F508 JSystem/JStage/JSGLight.cpp: @@ -1697,7 +1706,7 @@ JSystem/JStudio/JStudio/jstudio-object.cpp: .rodata start:0x80394BD0 end:0x80394CF0 .data start:0x803BEC40 end:0x803BF7E0 .bss start:0x8042B150 end:0x8042B2C8 - .sbss start:0x8044B330 end:0x8044B348 + .sbss start:0x8044B330 end:0x8044B338 .sdata2 start:0x8044F5C0 end:0x8044F5F0 JSystem/JStudio/JStudio/object-id.cpp: @@ -1761,6 +1770,7 @@ JSystem/JStudio/JStudio_JAudio2/object-sound.cpp: .ctors start:0x80375D98 end:0x80375D9C .data start:0x803BFBB8 end:0x803BFC18 .bss start:0x8042B5D0 end:0x8042B680 + .sbss start:0x8044B338 end:0x8044B340 .sdata2 start:0x8044F630 end:0x8044F640 JSystem/JStudio/JStudio_JParticle/control.cpp: @@ -1772,6 +1782,7 @@ JSystem/JStudio/JStudio_JParticle/object-particle.cpp: .text start:0x80290A3C end:0x80291718 .data start:0x803BFC30 end:0x803BFC98 .bss start:0x8042B680 end:0x8042B710 + .sbss start:0x8044B340 end:0x8044B348 .sdata2 start:0x8044F640 end:0x8044F678 JSystem/JAudio2/JASCalc.cpp: @@ -1931,7 +1942,7 @@ JSystem/JAudio2/JASAiCtrl.cpp: .rodata start:0x80395448 end:0x803954A0 .data start:0x803C19F8 end:0x803C1A20 .bss start:0x8042BD98 end:0x8042BDA8 - .sdata start:0x8044A8EC end:0x8044A8F8 + .sdata start:0x8044A8E8 end:0x8044A8F8 .sbss start:0x8044B3E0 end:0x8044B418 .sdata2 start:0x8044F840 end:0x8044F860 @@ -2255,7 +2266,7 @@ Z2AudioLib/Z2AudioMgr.cpp: dolphin/gf/GFGeometry.cpp: .text start:0x802D0264 end:0x802D02F0 - .sdata start:0x8044A9E8 end:0x8044A9F8 + .sdata start:0x8044A9E8 end:0x8044A9F0 dolphin/gf/GFLight.cpp: .text start:0x802D02F0 end:0x802D0338 @@ -2271,6 +2282,7 @@ JSystem/JKernel/JKRHeap.cpp: .text start:0x802D05D4 end:0x802D1250 .rodata start:0x80396C38 end:0x80396C50 .data start:0x803C60B0 end:0x803C6110 + .sdata start:0x8044A9F0 end:0x8044A9F1 .sbss start:0x8044B4B0 end:0x8044B4D8 JSystem/JKernel/JKRExpHeap.cpp: @@ -2340,7 +2352,7 @@ JSystem/JKernel/JKRFileLoader.cpp: .rodata start:0x803972B0 end:0x803972B8 .data start:0x803C6308 end:0x803C6348 .bss start:0x8042E488 end:0x8042E4A0 - .sdata start:0x8044AA00 end:0x8044AA0C + .sdata start:0x8044AA00 end:0x8044AA08 .sbss start:0x8044B558 end:0x8044B560 JSystem/JKernel/JKRFileFinder.cpp: @@ -2395,20 +2407,20 @@ JSystem/JKernel/JKRDvdRipper.cpp: .ctors start:0x80375DE4 end:0x80375DE8 .rodata start:0x803973F0 end:0x80397450 .bss start:0x8042E4B8 end:0x8042E4E8 - .sdata start:0x8044AA0C end:0x8044AA14 + .sdata start:0x8044AA08 end:0x8044AA10 .sbss start:0x8044B568 end:0x8044B5A8 JSystem/JKernel/JKRDvdAramRipper.cpp: .text start:0x802DCD10 end:0x802DDB1C .ctors start:0x80375DE8 end:0x80375DEC .bss start:0x8042E4E8 end:0x8042E518 - .sdata start:0x8044AA14 end:0x8044AA18 + .sdata start:0x8044AA10 end:0x8044AA18 .sbss start:0x8044B5A8 end:0x8044B5F0 JSystem/JKernel/JKRDecomp.cpp: .text start:0x802DDB1C end:0x802DE298 .data start:0x803C65A0 end:0x803C65F0 - .sbss start:0x8044B5F0 end:0x8044B5FC + .sbss start:0x8044B5F0 end:0x8044B5F8 JSystem/JSupport/JSUList.cpp: .text start:0x802DE298 end:0x802DE6D8 @@ -2457,7 +2469,7 @@ JSystem/JUtility/JUTNameTab.cpp: JSystem/JUtility/JUTGraphFifo.cpp: .text start:0x802E0FF4 end:0x802E1194 .data start:0x803C66D0 end:0x803C66E0 - .sbss start:0x8044B5FC end:0x8044B608 + .sbss start:0x8044B5F8 end:0x8044B608 JSystem/JUtility/JUTFont.cpp: .text start:0x802E1194 end:0x802E13E4 @@ -3238,15 +3250,16 @@ PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c: PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c: .text start:0x80364E68 end:0x80364FF4 .bss start:0x80447580 end:0x80447680 - .sbss start:0x8044BAD0 end:0x8044BAE8 - -PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c: - .sbss start:0x8044BAE8 end:0x8044BAF0 + .sbss start:0x8044BAD0 end:0x8044BAE0 PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c: .text start:0x80364FF4 end:0x803654A8 .rodata start:0x8039C380 end:0x8039C398 .bss start:0x80447680 end:0x804476B8 + .sbss start:0x8044BAE0 end:0x8044BAE8 + +PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c: + .sbss start:0x8044BAE8 end:0x8044BAF0 PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c: .text start:0x803654A8 end:0x803655C0 @@ -3305,7 +3318,7 @@ PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c: .sdata2 start:0x80450790 end:0x80450798 PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c: - .sdata start:0x8044AC20 end:0x8044AC34 + .sdata start:0x8044AC20 end:0x8044AC30 PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c: .text start:0x8036AC28 end:0x8036ACB8 @@ -3581,6 +3594,7 @@ amcstubs/AmcExi2Stubs.c: odemuexi2/DebuggerDriver.c: .text start:0x803751BC end:0x80375C3C + .sdata start:0x8044AC30 end:0x8044AC34 .sbss start:0x8044BB10 end:0x8044BB28 odenotstub/odenotstub.c: diff --git a/config/GZ2J01/symbols.txt b/config/GZ2J01/symbols.txt index 027d18a9222..da567a83e67 100644 --- a/config/GZ2J01/symbols.txt +++ b/config/GZ2J01/symbols.txt @@ -9,12 +9,12 @@ __flush_cache = .init:0x80003424; // type:function size:0x34 scope:global memset = .init:0x80003458; // type:function size:0x30 scope:global __fill_mem = .init:0x80003488; // type:function size:0xB8 scope:global memcpy = .init:0x80003540; // type:function size:0x50 scope:global -fn_80003590 = .init:0x80003590; // type:function size:0x30 -fn_800035C0 = .init:0x800035C0; // type:function size:0x24 +TRK_memset = .init:0x80003590; // type:function size:0x30 +TRK_memcpy = .init:0x800035C0; // type:function size:0x24 gTRKInterruptVectorTable = .init:0x800035E4; // type:label scope:global lbl_80004600 = .init:0x80004600; // type:label lbl_80005400 = .init:0x80005400; // type:label -fn_80005518 = .init:0x80005518; // type:function size:0x2C +__TRK_reset = .init:0x80005518; // type:function size:0x2C gTRKInterruptVectorTableEnd = .init:0x80005518; // type:label scope:global _rom_copy_info = .init:0x80005544; // type:object size:0x84 scope:global data:4byte _bss_init_info = .init:0x800055C8; // type:object size:0x20 scope:global data:4byte @@ -11764,26 +11764,26 @@ __sinit_JASDriverIF_cpp = .text:0x802A0750; // type:function size:0x80 scope:loc __ct__Q214JASCallbackMgr9TCallbackFv = .text:0x802A07D0; // type:function size:0x10 scope:global align:4 clamp__14JASSoundParamsFv = .text:0x802A07E0; // type:function size:0xCC scope:global align:4 combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams = .text:0x802A08AC; // type:function size:0x5C scope:global align:4 -DSPReleaseHalt2__FUl = .text:0x802A0920; // type:function size:0x48 scope:global align:4 -setup_callback__FUs = .text:0x802A0980; // type:function size:0xC scope:global align:4 -DsetupTable__FUlUlUlUlUl = .text:0x802A09A0; // type:function size:0x64 scope:global align:4 -DsetMixerLevel__Ff = .text:0x802A0A20; // type:function size:0x24 scope:global align:4 -DsyncFrame2ch__FUlUlUl = .text:0x802A0A60; // type:function size:0x54 scope:global align:4 -DsyncFrame4ch__FUlUlUlUlUl = .text:0x802A0AC0; // type:function size:0x50 scope:global align:4 -DspHandShake__FPv = .text:0x802A0B20; // type:function size:0x38 scope:global align:4 -DspBoot__FPFPv_v = .text:0x802A0B60; // type:function size:0xAC scope:global align:4 -DSPSendCommands2__FPUlUlPFUs_v = .text:0x802A0C20; // type:function size:0xE8 scope:global align:4 -DspInitWork__Fv = .text:0x802A0D20; // type:function size:0x2C scope:global align:4 -DspStartWork__FUlPFUs_v = .text:0x802A0D60; // type:function size:0x48 scope:global align:4 -DspFinishWork__FUs = .text:0x802A0DC0; // type:function size:0x68 scope:global align:4 -DSPAddTask = .text:0x802A0E40; // type:function size:0x84 scope:global align:4 -DSPAddPriorTask__FP15STRUCT_DSP_TASK = .text:0x802A0EE0; // type:function size:0x7C scope:global align:4 -__DSPHandler = .text:0x802A0F60; // type:function size:0x304 scope:global align:4 -DsyncFrame2__FUlUlUl = .text:0x802A1280; // type:function size:0x50 scope:global align:4 -DsyncFrame3__FUlUlUlUlUl = .text:0x802A12E0; // type:function size:0x58 scope:global align:4 -Dsp_Update_Request__Fv = .text:0x802A1340; // type:function size:0x78 scope:global align:4 -Dsp_Running_Check__Fv = .text:0x802A13C0; // type:function size:0x14 scope:global align:4 -Dsp_Running_Start__Fv = .text:0x802A13E0; // type:function size:0xC scope:global align:4 +DSPReleaseHalt2__FUl = .text:0x802A0920; // type:function size:0x48 scope:global align:32 +setup_callback__FUs = .text:0x802A0980; // type:function size:0xC scope:global align:32 +DsetupTable__FUlUlUlUlUl = .text:0x802A09A0; // type:function size:0x64 scope:global align:32 +DsetMixerLevel__Ff = .text:0x802A0A20; // type:function size:0x24 scope:global align:32 +DsyncFrame2ch__FUlUlUl = .text:0x802A0A60; // type:function size:0x54 scope:global align:32 +DsyncFrame4ch__FUlUlUlUlUl = .text:0x802A0AC0; // type:function size:0x50 scope:global align:32 +DspHandShake__FPv = .text:0x802A0B20; // type:function size:0x38 scope:global align:32 +DspBoot__FPFPv_v = .text:0x802A0B60; // type:function size:0xAC scope:global align:32 +DSPSendCommands2__FPUlUlPFUs_v = .text:0x802A0C20; // type:function size:0xE8 scope:global align:32 +DspInitWork__Fv = .text:0x802A0D20; // type:function size:0x2C scope:global align:32 +DspStartWork__FUlPFUs_v = .text:0x802A0D60; // type:function size:0x48 scope:global align:32 +DspFinishWork__FUs = .text:0x802A0DC0; // type:function size:0x68 scope:global align:32 +DSPAddTask = .text:0x802A0E40; // type:function size:0x84 scope:global align:32 +DSPAddPriorTask__FP15STRUCT_DSP_TASK = .text:0x802A0EE0; // type:function size:0x7C scope:global align:32 +__DSPHandler = .text:0x802A0F60; // type:function size:0x304 scope:global align:32 +DsyncFrame2__FUlUlUl = .text:0x802A1280; // type:function size:0x50 scope:global align:32 +DsyncFrame3__FUlUlUlUlUl = .text:0x802A12E0; // type:function size:0x58 scope:global align:32 +Dsp_Update_Request__Fv = .text:0x802A1340; // type:function size:0x78 scope:global align:32 +Dsp_Running_Check__Fv = .text:0x802A13C0; // type:function size:0x14 scope:global align:32 +Dsp_Running_Start__Fv = .text:0x802A13E0; // type:function size:0xC scope:global align:32 __dt__10JAIAudibleFv = .text:0x802A13EC; // type:function size:0x48 scope:global align:4 __dt__11JAIAudienceFv = .text:0x802A1434; // type:function size:0x48 scope:global align:4 __ct__5JAISeFP8JAISeMgrP27JAISoundStrategyMgr<5JAISe>Ul = .text:0x802A147C; // type:function size:0xBC scope:global align:4 @@ -16615,9 +16615,9 @@ m_hitSeID__12dCcD_GObjInf = .rodata:0x8037CC28; // type:object size:0x60 scope:g @stringBase0 = .rodata:0x8037D578; // type:object size:0x7 scope:local align:4 data:string_table typeToTypeGroup__7dTres_c = .rodata:0x8037D580; // type:object size:0x22 scope:global align:4 @stringBase0 = .rodata:0x8037D5A8; // type:object size:0x2A scope:local align:4 data:string_table -black_tex = .rodata:0x8037D5E0; // type:object size:0x40 scope:global align:4 +black_tex = .rodata:0x8037D5E0; // type:object size:0x40 scope:global align:32 msg_data = .rodata:0x8037D620; // type:object size:0x220 scope:global align:4 -font_data = .rodata:0x8037D840; // type:object size:0x9E80 scope:global align:4 +font_data = .rodata:0x8037D840; // type:object size:0x9E80 scope:global align:4 noreloc @stringBase0 = .rodata:0x803876C0; // type:object size:0x13 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x803876D8; // type:label scope:local align:4 @3757 = .rodata:0x803876D8; // type:object size:0xC scope:local align:4 @@ -16765,7 +16765,7 @@ m_mainBckShield__9daAlink_c = .rodata:0x80389C54; // type:object size:0x50 scope m_mainBckSword__9daAlink_c = .rodata:0x80389CA4; // type:object size:0x14 scope:global align:4 m_mainBckFishing__9daAlink_c = .rodata:0x80389CB8; // type:object size:0x70 scope:global align:4 m_anmDataTable__9daAlink_c = .rodata:0x80389D28; // type:object size:0x1368 scope:global align:4 -m_wlAnmDataTable__9daAlink_c = .rodata:0x8038B090; // type:object size:0x498 scope:global align:4 +m_wlAnmDataTable__9daAlink_c = .rodata:0x8038B090; // type:object size:0x498 scope:global align:4 noreloc m_faceTexDataTable__9daAlink_c = .rodata:0x8038B528; // type:object size:0x28C scope:global align:4 @5908 = .rodata:0x8038B7B4; // type:object size:0xC scope:local align:4 data:4byte atnNormalType1$6976 = .rodata:0x8038B7C0; // type:object size:0x14 scope:local align:4 @@ -17066,7 +17066,7 @@ key_tag$5002 = .rodata:0x8038F7B0; // type:object size:0x18 scope:local align:4 item_tag$5040 = .rodata:0x8038F7C8; // type:object size:0x18 scope:local align:4 @stringBase0 = .rodata:0x8038F7E0; // type:object size:0xEB scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8038F8E0; // type:label scope:local align:4 -l_paletteDmap_m = .rodata:0x8038F8E0; // type:object size:0xF0 scope:global align:4 +l_paletteDmap_m = .rodata:0x8038F8E0; // type:object size:0xF0 scope:global align:4 noreloc l_dungeon_offColor$3841 = .rodata:0x8038F9D0; // type:object size:0x24 scope:local align:4 l_dungeon_onColor$3842 = .rodata:0x8038F9F4; // type:object size:0x24 scope:local align:4 l_dungeon_stayColor$3843 = .rodata:0x8038FA18; // type:object size:0x24 scope:local align:4 @@ -17414,7 +17414,7 @@ sMixFuncs__9JASDriver = .rodata:0x80395448; // type:object size:0x10 scope:globa @stringBase0 = .rodata:0x80395458; // type:object size:0x48 scope:local align:4 data:string_table @stringBase0 = .rodata:0x803954A0; // type:object size:0x13 scope:local align:4 data:string_table DSPADPCM_FILTER__6JASDsp = .rodata:0x803954C0; // type:object size:0x40 scope:global align:4 -DSPRES_FILTER__6JASDsp = .rodata:0x80395500; // type:object size:0x500 scope:global align:4 +DSPRES_FILTER__6JASDsp = .rodata:0x80395500; // type:object size:0x500 scope:global align:4 noreloc connect_table$463 = .rodata:0x80395A00; // type:object size:0x18 scope:local align:4 @81 = .rodata:0x80395A18; // type:object size:0x1A scope:local align:4 data:string @88 = .rodata:0x80395A34; // type:object size:0x1F scope:local align:4 data:string @@ -17658,7 +17658,7 @@ g_ntscZeldaProg = .data:0x8039D0FC; // type:object size:0x3C scope:global align: g_mDoMtx_identity = .data:0x8039D138; // type:object size:0x30 scope:global align:4 l_invisibleMat$7041 = .data:0x8039D180; // type:object size:0x85 scope:local align:32 l_matDL = .data:0x8039D220; // type:object size:0x84 scope:global align:4 -l_mat1DL = .data:0x8039D2C0; // type:object size:0x8D scope:global align:4 +l_mat1DL = .data:0x8039D2C0; // type:object size:0x8D scope:global align:4 noreloc __vt__7JUTFont = .data:0x8039D350; // type:object size:0x44 scope:global align:4 __vt__26mDoExt_3DlineMatSortPacket = .data:0x8039D394; // type:object size:0x14 scope:global align:4 __vt__19mDoExt_3DlineMat1_c = .data:0x8039D3A8; // type:object size:0x14 scope:global align:4 @@ -17855,21 +17855,21 @@ m_typeFourData__8dPaPoF_c = .data:0x803A2830; // type:object size:0x3C scope:glo m_emitterFourData__8dPaPoF_c = .data:0x803A28A8; // type:object size:0x3C scope:global align:4 data:4byte ...data.0 = .data:0x803A2900; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803A2900; // type:object size:0xC scope:local align:4 -l_frontZMat = .data:0x803A2920; // type:object size:0x3C scope:global align:4 -l_frontNoZSubMat = .data:0x803A2960; // type:object size:0x2A scope:global align:4 +l_frontZMat = .data:0x803A2920; // type:object size:0x3C scope:global align:32 +l_frontNoZSubMat = .data:0x803A2960; // type:object size:0x2A scope:global align:32 l_shadowVolPos = .data:0x803A298C; // type:object size:0x60 scope:global align:4 -l_shadowVolDL = .data:0x803A2A00; // type:object size:0x3B scope:global align:4 -l_shadowProjMat = .data:0x803A2A40; // type:object size:0x5A scope:global align:4 -l_shadowVolMat = .data:0x803A2AA0; // type:object size:0x5A scope:global align:4 -l_clearMat = .data:0x803A2B00; // type:object size:0x55 scope:global align:4 -l_frontMat = .data:0x803A2B60; // type:object size:0x55 scope:global align:4 -l_backSubMat = .data:0x803A2BC0; // type:object size:0x3C scope:global align:4 +l_shadowVolDL = .data:0x803A2A00; // type:object size:0x3B scope:global align:32 +l_shadowProjMat = .data:0x803A2A40; // type:object size:0x5A scope:global align:32 +l_shadowVolMat = .data:0x803A2AA0; // type:object size:0x5A scope:global align:32 noreloc +l_clearMat = .data:0x803A2B00; // type:object size:0x55 scope:global align:32 +l_frontMat = .data:0x803A2B60; // type:object size:0x55 scope:global align:32 +l_backSubMat = .data:0x803A2BC0; // type:object size:0x3C scope:global align:32 l_simpleShadowPos = .data:0x803A2BFC; // type:object size:0xA8 scope:global align:4 -l_shadowVolumeDL = .data:0x803A2CC0; // type:object size:0x58 scope:global align:4 -l_shadowSealTexDL = .data:0x803A2D20; // type:object size:0x55 scope:global align:4 -l_shadowSealTex2DL = .data:0x803A2D80; // type:object size:0x55 scope:global align:4 -l_shadowSealDL = .data:0x803A2DE0; // type:object size:0x69 scope:global align:4 -l_matDL$5404 = .data:0x803A2E60; // type:object size:0x7B scope:local align:4 +l_shadowVolumeDL = .data:0x803A2CC0; // type:object size:0x58 scope:global align:32 +l_shadowSealTexDL = .data:0x803A2D20; // type:object size:0x55 scope:global align:32 +l_shadowSealTex2DL = .data:0x803A2D80; // type:object size:0x55 scope:global align:32 +l_shadowSealDL = .data:0x803A2DE0; // type:object size:0x69 scope:global align:32 +l_matDL$5404 = .data:0x803A2E60; // type:object size:0x7B scope:local align:32 l_imageDrawColor$5405 = .data:0x803A2EDC; // type:object size:0x10 scope:local align:4 l_tevColorChan$5438 = .data:0x803A2EEC; // type:object size:0x10 scope:local align:4 mtx_adj$5842 = .data:0x803A2EFC; // type:object size:0x30 scope:local align:4 @@ -18562,7 +18562,7 @@ __vt__8daItem_c = .data:0x803B4104; // type:object size:0x44 scope:global align: __vt__9dInsect_c = .data:0x803B41D8; // type:object size:0xC scope:global 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:global align:4 +l_sightDL = .data:0x803B4220; // type:object size:0x89 scope:global align:4 noreloc __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 @@ -19008,7 +19008,7 @@ __vt__14dMenu_DmapBg_c = .data:0x803B6C98; // type:object size:0x1C scope:global ...data.0 = .data:0x803B6CC0; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B6CC0; // type:object size:0xC scope:local align:4 @3798 = .data:0x803B6CCC; // type:object size:0x44 scope:local align:4 -l_data = .data:0x803B6D20; // type:object size:0xF4 scope:global align:4 +l_data = .data:0x803B6D20; // type:object size:0xF4 scope:global align:4 noreloc @3922 = .data:0x803B6E14; // type:object size:0xC scope:local align:4 @3923 = .data:0x803B6E20; // type:object size:0xC scope:local align:4 @3924 = .data:0x803B6E2C; // type:object size:0xC scope:local align:4 @@ -19806,10 +19806,10 @@ __vt__13cBgS_PolyInfo = .data:0x803BE110; // type:object size:0xC scope:global a __vt__8cM3dGCir = .data:0x803BE120; // type:object size:0xC scope:global align:4 __vt__8cM2dGCir = .data:0x803BE12C; // type:object size:0xC scope:global align:4 __vt__8cM3dGCps = .data:0x803BE138; // type:object size:0xC scope:global align:4 -e_mtx = .data:0x803BE160; // type:object size:0x30 scope:global align:4 -clear_z_TX = .data:0x803BE1A0; // type:object size:0x40 scope:global align:4 +e_mtx = .data:0x803BE160; // type:object size:0x30 scope:global align:32 +clear_z_TX = .data:0x803BE1A0; // type:object size:0x40 scope:global align:32 __vt__10JFWDisplay = .data:0x803BE1E0; // type:object size:0x18 scope:global align:4 -jpa_pos = .data:0x803BE200; // type:object size:0x144 scope:global align:4 +jpa_pos = .data:0x803BE200; // type:object size:0x144 scope:global align:32 jpa_crd = .data:0x803BE360; // type:object size:0x20 scope:global align:4 @2829 = .data:0x803BE380; // type:object size:0x2C scope:local align:4 @2828 = .data:0x803BE3AC; // type:object size:0x2C scope:local align:4 @@ -20107,7 +20107,7 @@ table_list$151 = .data:0x803C19E8; // type:object size:0x10 scope:local align:4 history$267 = .data:0x803C19F8; // type:object size:0x28 scope:local align:4 data:4byte __vt__14JASAudioThread = .data:0x803C1A20; // type:object size:0x10 scope:global align:4 SEND_TABLE__6JASDsp = .data:0x803C1A30; // type:object size:0x18 scope:global align:4 -jdsp = .data:0x803C1A60; // type:object size:0x1F00 scope:global align:4 +jdsp = .data:0x803C1A60; // type:object size:0x1F00 scope:global align:4 noreloc __vt__10JAIAudible = .data:0x803C3960; // type:object size:0x14 scope:global align:4 __vt__11JAIAudience = .data:0x803C3978; // type:object size:0x20 scope:global align:4 __vt__5JAISe = .data:0x803C3998; // type:object size:0x58 scope:global align:4 @@ -20263,8 +20263,8 @@ sCpuExpName__12JUTException = .data:0x803C67A0; // type:object size:0x44 scope:g __vt__12JUTException = .data:0x803C67E4; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803C67F8; // type:label scope:local align:4 sAsciiTable__14JUTDirectPrint = .data:0x803C67F8; // type:object size:0x80 scope:global align:4 -sFontData__14JUTDirectPrint = .data:0x803C6878; // type:object size:0x100 scope:global align:4 -sFontData2__14JUTDirectPrint = .data:0x803C6978; // type:object size:0x134 scope:global align:4 +sFontData__14JUTDirectPrint = .data:0x803C6878; // type:object size:0x100 scope:global align:4 noreloc +sFontData2__14JUTDirectPrint = .data:0x803C6978; // type:object size:0x134 scope:global align:4 noreloc twiceBit$371 = .data:0x803C6AAC; // type:object size:0x10 scope:local align:4 __vt__8JUTVideo = .data:0x803C6AC0; // type:object size:0xC scope:global align:4 __vt__8JUTFader = .data:0x803C6AD0; // type:object size:0x18 scope:global align:4 @@ -20634,12 +20634,12 @@ ResetFunctionInfo = .data:0x803CBCD0; // type:object size:0x10 scope:local align ...data.0 = .data:0x803CBF78; // type:label scope:local align:4 @1 = .data:0x803CBF78; // type:object size:0x46 scope:local align:4 data:string ResetFunctionInfo = .data:0x803CBFC0; // type:object size:0x10 scope:local align:4 -CardData = .data:0x803CBFE0; // type:object size:0x160 scope:global align:4 +CardData = .data:0x803CBFE0; // type:object size:0x160 scope:global align:32 SectorSizeTable = .data:0x803CC140; // type:object size:0x20 scope:global align:4 LatencyTable = .data:0x803CC160; // type:object size:0x20 scope:global align:4 ...data.0 = .data:0x803CC180; // type:label scope:local align:4 @1 = .data:0x803CC180; // type:object size:0x44 scope:local align:4 data:string -DefaultTexData = .data:0x803CC1E0; // type:object size:0x20 scope:global align:4 +DefaultTexData = .data:0x803CC1E0; // type:object size:0x20 scope:global align:32 GXDefaultVATList = .data:0x803CC200; // type:object size:0xD0 scope:global align:4 GXDefaultProjData = .data:0x803CC2D0; // type:object size:0x1C scope:global align:4 GXTexRegionAddrTable = .data:0x803CC2EC; // type:object size:0xC0 scope:global align:4 data:4byte @@ -20725,7 +20725,7 @@ DvdErr_stack = .bss:0x803D9120; // type:object size:0xC00 scope:global align:4 Alarm = .bss:0x803D9D20; // type:object size:0x28 scope:local align:4 MemCardStack = .bss:0x803D9D60; // type:object size:0x1000 scope:global align:4 MemCardThread = .bss:0x803DAD60; // type:object size:0x318 scope:global align:4 -MemCardWorkArea0 = .bss:0x803DB080; // type:object size:0xA000 scope:global align:4 +MemCardWorkArea0 = .bss:0x803DB080; // type:object size:0xA000 scope:global align:32 g_mDoMemCd_control = .bss:0x803E5080; // type:object size:0x2000 scope:global align:4 sTmpBuf = .bss:0x803E7080; // type:object size:0x4000 scope:global align:4 data:4byte @3741 = .bss:0x803EB080; // type:object size:0xC scope:local align:4 @@ -21187,8 +21187,8 @@ sDmaDacBuffer__9JASDriver = .bss:0x8042BD98; // type:object size:0xC scope:globa sDspSyncCallback__9JASDriver = .bss:0x8042BDB8; // type:object size:0x100 scope:global align:4 sSubFrameCallback__9JASDriver = .bss:0x8042BEB8; // type:object size:0x100 scope:global align:4 sUpdateDacCallback__9JASDriver = .bss:0x8042BFB8; // type:object size:0x100 scope:global align:4 -audio_task = .bss:0x8042C0C0; // type:object size:0x50 scope:global align:4 -AUDIO_YIELD_BUFFER = .bss:0x8042C120; // type:object size:0x2000 scope:global align:4 +audio_task = .bss:0x8042C0C0; // type:object size:0x50 scope:global align:32 +AUDIO_YIELD_BUFFER = .bss:0x8042C120; // type:object size:0x2000 scope:global align:32 taskwork = .bss:0x8042E120; // type:object size:0x80 scope:global align:4 sync_stack = .bss:0x8042E1A0; // type:object size:0x14 scope:global align:4 data:4byte @744 = .bss:0x8042E1B8; // type:object size:0xC scope:local align:4 @@ -21285,7 +21285,7 @@ __OSRebootParams = .bss:0x80445BF0; // type:object size:0x1C scope:global align: ...bss.0 = .bss:0x80445C10; // type:label scope:local align:4 __OSErrorTable = .bss:0x80445C10; // type:object size:0x44 scope:global align:4 data:4byte ...bss.0 = .bss:0x80445C60; // type:label scope:local align:4 -Scb = .bss:0x80445C60; // type:object size:0x54 scope:global align:4 data:4byte +Scb = .bss:0x80445C60; // type:object size:0x54 scope:global align:32 data:4byte ...bss.0 = .bss:0x80445CB8; // type:label scope:local align:4 RunQueue = .bss:0x80445CB8; // type:object size:0x100 scope:global align:4 data:4byte IdleThread = .bss:0x80445DB8; // type:object size:0x318 scope:global align:4 @@ -21311,8 +21311,8 @@ AlarmForBreak = .bss:0x80446A00; // type:object size:0x28 scope:global align:4 Prev = .bss:0x80446A28; // type:object size:0xC scope:global align:4 Curr = .bss:0x80446A34; // type:object size:0xC scope:global align:4 ...bss.0 = .bss:0x80446A40; // type:label scope:local align:4 -BB2 = .bss:0x80446A40; // type:object size:0x20 scope:global align:4 -CurrDiskID = .bss:0x80446A60; // type:object size:0x20 scope:global align:4 +BB2 = .bss:0x80446A40; // type:object size:0x20 scope:global align:32 +CurrDiskID = .bss:0x80446A60; // type:object size:0x20 scope:global align:32 DummyCommandBlock = .bss:0x80446A80; // type:object size:0x30 scope:global align:4 ResetAlarm = .bss:0x80446AB0; // type:object size:0x28 scope:global align:4 ...bss.0 = .bss:0x80446AD8; // type:label scope:local align:4 @@ -21528,12 +21528,12 @@ sStickHigh = .sdata:0x8044A9D8; // type:object size:0x4 scope:global align:4 dat sStickCenter = .sdata:0x8044A9DC; // type:object size:0x4 scope:global align:4 data:float sHowlTobikusa = .sdata:0x8044A9E0; // type:object size:0x8 scope:global align:4 cm2hw$539 = .sdata:0x8044A9E8; // type:object size:0x4 scope:local align:4 -lbl_8044A9F0 = .sdata:0x8044A9F0; // type:object size:0x1 data:byte +data_804508B0 = .sdata:0x8044A9F0; // type:object size:0x1 data:byte sSZSBufferSize__7JKRAram = .sdata:0x8044A9F8; // type:object size:0x4 scope:global align:4 data:4byte rootPath$2498 = .sdata:0x8044AA00; // type:object size:0x2 scope:local align:4 data:string -lbl_8044AA08 = .sdata:0x8044AA08; // type:object size:0x1 data:byte +errorRetry = .sdata:0x8044AA08; // type:object size:0x1 data:byte sSZSBufferSize__12JKRDvdRipper = .sdata:0x8044AA0C; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8044AA10 = .sdata:0x8044AA10; // type:object size:0x1 data:byte +errorRetry__16JKRDvdAramRipper = .sdata:0x8044AA10; // type:object size:0x1 data:byte sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x8044AA14; // type:object size:0x4 scope:global align:4 data:4byte sStickMode__10JUTGamePad = .sdata:0x8044AA18; // type:object size:0x4 scope:global align:4 data:4byte sClampMode__10JUTGamePad = .sdata:0x8044AA1C; // type:object size:0x4 scope:global align:4 data:4byte @@ -21623,19 +21623,19 @@ __float_nan = .sdata:0x8044AC20; // type:object size:0x4 scope:global align:4 da __float_huge = .sdata:0x8044AC24; // type:object size:0x4 scope:global align:4 data:float __float_max = .sdata:0x8044AC28; // type:object size:0x4 scope:global align:4 data:float __float_epsilon = .sdata:0x8044AC2C; // type:object size:0x4 scope:global align:4 data:float -lbl_8044AC30 = .sdata:0x8044AC30; // type:object size:0x1 data:byte -lbl_8044AC40 = .sbss:0x8044AC40; // type:object size:0x1 data:byte +SendCount = .sdata:0x8044AC30; // type:object size:0x1 data:byte +fillcheck_check_frame = .sbss:0x8044AC40; // type:object size:0x1 data:byte sPowerOnTime__7mDoMain = .sbss:0x8044AC48; // type:object size:0x8 scope:global align:4 data:4byte sHungUpTime__7mDoMain = .sbss:0x8044AC50; // type:object size:0x8 scope:global align:4 data:4byte -lbl_8044AC58 = .sbss:0x8044AC58; // type:object size:0x1 data:byte -lbl_8044AC59 = .sbss:0x8044AC59; // type:object size:0x1 data:byte -lbl_8044AC5A = .sbss:0x8044AC5A; // type:object size:0x1 data:byte +mDisplayHeapSize = .sbss:0x8044AC58; // type:object size:0x1 data:byte +mSelectHeapBar = .sbss:0x8044AC59; // type:object size:0x1 data:byte +mCheckHeap = .sbss:0x8044AC5A; // type:object size:0x1 data:byte console_position_x$3776 = .sbss:0x8044AC5C; // type:object size:0x4 scope:local align:4 data:float -lbl_8044AC60 = .sbss:0x8044AC60; // type:object size:0x1 data:byte +console_x_init$1077 = .sbss:0x8044AC60; // type:object size:0x1 data:byte console_position_y$3779 = .sbss:0x8044AC64; // type:object size:0x4 scope:local align:4 data:float -lbl_8044AC68 = .sbss:0x8044AC68; // type:object size:0x1 data:byte +console_y_init$1079 = .sbss:0x8044AC68; // type:object size:0x1 data:byte console_scroll$3782 = .sbss:0x8044AC6C; // type:object size:0x4 scope:local align:4 data:float -lbl_8044AC70 = .sbss:0x8044AC70; // type:object size:0x1 data:byte +console_scroll_init$1081 = .sbss:0x8044AC70; // type:object size:0x1 data:byte frame$3939 = .sbss:0x8044AC74; // type:object size:0x4 scope:local align:4 data:4byte sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .sbss:0x8044AC78; // type:object size:0x4 scope:global align:4 data:4byte sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .sbss:0x8044AC7C; // type:object size:0x4 scope:global align:4 data:4byte @@ -21685,12 +21685,12 @@ mZbufferTimg__13mDoGph_gInf_c = .sbss:0x8044AD14; // type:object size:0x4 scope: mZbufferTex__13mDoGph_gInf_c = .sbss:0x8044AD18; // type:object size:0x4 scope:global align:4 data:4byte mFadeRate__13mDoGph_gInf_c = .sbss:0x8044AD1C; // type:object size:0x4 scope:global align:4 data:float mFadeSpeed__13mDoGph_gInf_c = .sbss:0x8044AD20; // type:object size:0x4 scope:global align:4 data:float -lbl_8044AD24 = .sbss:0x8044AD24; // type:object size:0x1 data:byte -lbl_8044AD25 = .sbss:0x8044AD25; // type:object size:0x1 data:byte -lbl_8044AD26 = .sbss:0x8044AD26; // type:object size:0x1 data:byte -lbl_8044AD27 = .sbss:0x8044AD27; // type:object size:0x1 data:byte +mBlureFlag__13mDoGph_gInf_c = .sbss:0x8044AD24; // type:object size:0x1 data:byte +mBlureRate__13mDoGph_gInf_c = .sbss:0x8044AD25; // type:object size:0x1 data:byte +mFade__13mDoGph_gInf_c = .sbss:0x8044AD26; // type:object size:0x1 data:byte +data_80450BE7 = .sbss:0x8044AD27; // type:object size:0x1 data:byte lbl_8044AD28 = .sbss:0x8044AD28; // type:object size:0x8 data:byte -lbl_8044AD30 = .sbss:0x8044AD30; // type:object size:0x1 data:byte +mDebugFill = .sbss:0x8044AD30; // type:object size:0x1 data:byte solidHeapErrors = .sbss:0x8044AD34; // type:object size:0x4 scope:global align:4 data:4byte gameHeapErrors = .sbss:0x8044AD38; // type:object size:0x4 scope:global align:4 data:4byte zeldaHeapErrors = .sbss:0x8044AD3C; // type:object size:0x4 scope:global align:4 data:4byte @@ -21745,8 +21745,8 @@ cDyl_DVD = .sbss:0x8044ADF0; // type:object size:0x4 scope:global align:4 data:4 g_fopAc_type = .sbss:0x8044ADF8; // type:object size:0x4 scope:global align:4 data:4byte stopStatus__10fopAc_ac_c = .sbss:0x8044ADFC; // type:object size:0x4 scope:global align:4 data:4byte sInstance__35JASGlobalInstance<14JAUSectionHeap> = .sbss:0x8044AE00; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8044AE08 = .sbss:0x8044AE08; // type:object size:0x1 data:byte -lbl_8044AE09 = .sbss:0x8044AE09; // type:object size:0x1 data:byte +HeapAdjustEntry__6fopAcM = .sbss:0x8044AE08; // type:object size:0x1 scope:global data:byte +HeapAdjustVerbose__6fopAcM = .sbss:0x8044AE09; // type:object size:0x1 scope:global data:byte l_hio = .sbss:0x8044AE0C; // type:object size:0x1 scope:global align:4 mGroundY__11fopAcM_gc_c = .sbss:0x8044AE10; // type:object size:0x4 scope:global align:4 data:float mRoofY__11fopAcM_rc_c = .sbss:0x8044AE14; // type:object size:0x4 scope:global align:4 data:float @@ -21774,20 +21774,20 @@ lbl_8044AE8C = .sbss:0x8044AE8C; // type:object size:0x1 data:byte g_fpcPf_ProfileList_p = .sbss:0x8044AE90; // type:object size:0x4 scope:global align:4 data:4byte tmp_name$4456 = .sbss:0x8044AE98; // type:object size:0x8 scope:local align:4 mProcID__20dStage_roomControl_c = .sbss:0x8044AEA0; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8044AEA4 = .sbss:0x8044AEA4; // type:object size:0x1 data:byte -lbl_8044AEA5 = .sbss:0x8044AEA5; // type:object size:0x1 data:byte -lbl_8044AEA6 = .sbss:0x8044AEA6; // type:object size:0x1 data:byte -lbl_8044AEA7 = .sbss:0x8044AEA7; // type:object size:0x1 data:byte -lbl_8044AEA8 = .sbss:0x8044AEA8; // type:object size:0x1 data:byte +mStayNo__20dStage_roomControl_c = .sbss:0x8044AEA4; // type:object size:0x1 data:byte +mOldStayNo__20dStage_roomControl_c = .sbss:0x8044AEA5; // type:object size:0x1 data:byte +mNextStayNo__20dStage_roomControl_c = .sbss:0x8044AEA6; // type:object size:0x1 data:byte +m_time_pass__20dStage_roomControl_c = .sbss:0x8044AEA7; // type:object size:0x1 data:byte +mNoChangeRoom__20dStage_roomControl_c = .sbss:0x8044AEA8; // type:object size:0x1 data:byte mArcBankName__20dStage_roomControl_c = .sbss:0x8044AEAC; // type:object size:0x4 scope:global align:4 data:4byte mArcBankData__20dStage_roomControl_c = .sbss:0x8044AEB0; // type:object size:0x4 scope:global align:4 data:4byte m_roomDzs__20dStage_roomControl_c = .sbss:0x8044AEB4; // type:object size:0x8 scope:global align:4 data:byte m_res__22dMap_HIO_prm_res_dst_s = .sbss:0x8044AEC0; // type:object size:0x4 scope:global align:4 data:4byte m_count__9daArrow_c = .sbss:0x8044AEC8; // type:object size:0x2 scope:global align:2 mSetTop__7daSus_c = .sbss:0x8044AECA; // type:object size:0x2 scope:global align:2 data:2byte -lbl_8044AECC = .sbss:0x8044AECC; // type:object size:0x1 data:byte -lbl_8044AECD = .sbss:0x8044AECD; // type:object size:0x1 data:byte -lbl_8044AECE = .sbss:0x8044AECE; // type:object size:0x1 data:byte +m_flag__8daYkgr_c = .sbss:0x8044AECC; // type:object size:0x1 data:byte +m_alpha_flag__8daYkgr_c = .sbss:0x8044AECD; // type:object size:0x1 data:byte +m_alpha__8daYkgr_c = .sbss:0x8044AECE; // type:object size:0x1 data:byte m_aim_rate__8daYkgr_c = .sbss:0x8044AED0; // type:object size:0x4 scope:global align:4 m_path__8daYkgr_c = .sbss:0x8044AED4; // type:object size:0x4 scope:global align:4 m_emitter__8daYkgr_c = .sbss:0x8044AED8; // type:object size:0x4 scope:global align:4 data:4byte @@ -21799,13 +21799,13 @@ m_grass__9daGrass_c = .sbss:0x8044AEF0; // type:object size:0x4 scope:global ali m_flower__9daGrass_c = .sbss:0x8044AEF4; // type:object size:0x4 scope:global align:4 data:4byte m_myObj__6daMP_c = .sbss:0x8044AEF8; // type:object size:0x4 scope:global align:4 data:4byte mTagMagne__12daTagMagne_c = .sbss:0x8044AEFC; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8044AF00 = .sbss:0x8044AF00; // type:object size:0x1 data:byte -lbl_8044AF01 = .sbss:0x8044AF01; // type:object size:0x1 data:byte +mPlayerNo__11daTagMist_c = .sbss:0x8044AF00; // type:object size:0x1 data:byte +mSaveFlag__12daObjCarry_c = .sbss:0x8044AF01; // type:object size:0x1 data:byte mSttsFlag__12daObjCarry_c = .sbss:0x8044AF04; // type:object size:0x5 scope:global align:4 mRoomNo__12daObjCarry_c = .sbss:0x8044AF0C; // type:object size:0x5 scope:global align:4 -m_diffTime__11dLib_time_c = .sbss:0x8044AF18; // type:object size:0x8 scope:global align:4 data:4byte -m_stopTime__11dLib_time_c = .sbss:0x8044AF20; // type:object size:0x8 scope:global align:4 data:4byte -lbl_8044AF28 = .sbss:0x8044AF28; // type:object size:0x8 data:byte +m_diffTime__11dLib_time_c = .sbss:0x8044AF18; // type:object size:0x8 scope:global align:8 data:4byte +m_stopTime__11dLib_time_c = .sbss:0x8044AF20; // type:object size:0x8 scope:global align:8 data:4byte +m_timeStopped__11dLib_time_c = .sbss:0x8044AF28; // type:object size:0x1 data:byte lbl_8044AF30 = .sbss:0x8044AF30; // type:object size:0x1 data:byte lbl_8044AF31 = .sbss:0x8044AF31; // type:object size:0x1 data:byte lbl_8044AF32 = .sbss:0x8044AF32; // type:object size:0x1 data:byte @@ -21833,9 +21833,9 @@ lbl_8044AF88 = .sbss:0x8044AF88; // type:object size:0x1 data:byte lbl_8044AF89 = .sbss:0x8044AF89; // type:object size:0x1 data:byte it$4206 = .sbss:0x8044AF8C; // type:object size:0x4 scope:local align:4 data:4byte lbl_8044AF90 = .sbss:0x8044AF90; // type:object size:0x8 data:byte -lbl_8044AF98 = .sbss:0x8044AF98; // type:object size:0x1 data:byte +mNowStayFloorNo__10dMapInfo_c = .sbss:0x8044AF98; // type:object size:0x1 data:byte mNowStayRoomNo__10dMapInfo_c = .sbss:0x8044AF9C; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8044AFA0 = .sbss:0x8044AFA0; // type:object size:0x1 data:byte +mNowStayFloorNoDecisionFlg__10dMapInfo_c = .sbss:0x8044AFA0; // type:object size:0x1 data:byte mLayerList__8dMpath_c = .sbss:0x8044AFA4; // type:object size:0x4 scope:global align:4 data:4byte mMinX__8dMpath_c = .sbss:0x8044AFA8; // type:object size:0x4 scope:global align:4 data:float mMaxX__8dMpath_c = .sbss:0x8044AFAC; // type:object size:0x4 scope:global align:4 data:float @@ -21861,9 +21861,9 @@ m_b_Light8EcallBack__13dPa_control_c = .sbss:0x8044AFF4; // type:object size:0x4 m_b_Light8PcallBack__13dPa_control_c = .sbss:0x8044AFF8; // type:object size:0x4 scope:global align:4 data:4byte m_d_Light8EcallBack__13dPa_control_c = .sbss:0x8044AFFC; // type:object size:0x4 scope:global align:4 data:4byte m_d_Light8PcallBack__13dPa_control_c = .sbss:0x8044B000; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8044B004 = .sbss:0x8044B004; // type:object size:0x1 data:byte +mStatus__13dPa_control_c = .sbss:0x8044B004; // type:object size:0x1 data:byte mParticleTracePCB__13dPa_control_c = .sbss:0x8044B008; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8044B010 = .sbss:0x8044B010; // type:object size:0x1 data:byte +mWipe__12dDlst_list_c = .sbss:0x8044B010; // type:object size:0x1 data:byte mWipeRate__12dDlst_list_c = .sbss:0x8044B014; // type:object size:0x4 scope:global align:4 data:float mWipeSpeed__12dDlst_list_c = .sbss:0x8044B018; // type:object size:0x4 scope:global align:4 data:float lbl_8044B020 = .sbss:0x8044B020; // type:object size:0x1 data:byte @@ -22006,8 +22006,8 @@ dylPreLoadTime1 = .sbss:0x8044B248; // type:object size:0x8 scope:global align:4 resPreLoadTime0 = .sbss:0x8044B250; // type:object size:0x8 scope:global align:4 data:4byte resPreLoadTime1 = .sbss:0x8044B258; // type:object size:0x8 scope:global align:4 data:4byte g_preLoadHIO = .sbss:0x8044B260; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8044B264 = .sbss:0x8044B264; // type:object size:0x1 data:byte -lbl_8044B265 = .sbss:0x8044B265; // type:object size:0x1 data:byte +pauseTimer__9dScnPly_c = .sbss:0x8044B264; // type:object size:0x1 data:byte +nextPauseTimer__9dScnPly_c = .sbss:0x8044B265; // type:object size:0x1 data:byte g_regHIO = .sbss:0x8044B268; // type:object size:0x4 scope:global align:4 data:4byte m_nowID__9dkWmark_c = .sbss:0x8044B270; // type:object size:0x4 scope:global align:4 data:4byte lbl_8044B274 = .sbss:0x8044B274; // type:object size:0x1 data:byte @@ -22253,8 +22253,8 @@ j3dDefaultViewNo = .sbss:0x8044B6D8; // type:object size:0x4 scope:global align: sInterruptFlag__17J3DDisplayListObj = .sbss:0x8044B6E0; // type:object size:0x4 scope:global align:4 data:4byte sCurrentPipeline__11J3DShapeMtx = .sbss:0x8044B6E8; // type:object size:0x4 scope:global align:4 data:4byte sCurrentScaleFlag__11J3DShapeMtx = .sbss:0x8044B6EC; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8044B6F0 = .sbss:0x8044B6F0; // type:object size:0x1 data:byte -lbl_8044B6F1 = .sbss:0x8044B6F1; // type:object size:0x1 data:byte +sNBTFlag__11J3DShapeMtx = .sbss:0x8044B6F0; // type:object size:0x1 data:byte +sLODFlag__11J3DShapeMtx = .sbss:0x8044B6F1; // type:object size:0x1 data:byte sTexMtxLoadType__11J3DShapeMtx = .sbss:0x8044B6F4; // type:object size:0x4 scope:global align:4 data:4byte sMtxPtrTbl__21J3DShapeMtxConcatView = .sbss:0x8044B6F8; // type:object size:0x8 scope:global align:4 data:4byte sTexGenBlock__17J3DDifferedTexMtx = .sbss:0x8044B700; // type:object size:0x4 scope:global align:4 data:4byte @@ -22630,7 +22630,7 @@ borderColor1$3976 = .sdata2:0x8044BE1C; // type:object size:0x4 scope:local alig @6980 = .sdata2:0x8044BE58; // type:object size:0x4 scope:local align:4 data:float @6981 = .sdata2:0x8044BE5C; // type:object size:0x4 scope:local align:4 data:float @7580 = .sdata2:0x8044BE60; // type:object size:0x8 scope:local align:4 data:double -M_dir_base__Q212daObjMovebox5Act_c = .sdata2:0x8044BE68; // type:object size:0x8 scope:global align:4 +M_dir_base__Q212daObjMovebox5Act_c = .sdata2:0x8044BE68; // type:object size:0x8 scope:global align:4 noreloc OPEN_SIZE__7daDsh_c = .sdata2:0x8044BE70; // type:object size:0x4 scope:global align:4 OPEN_ACCEL__7daDsh_c = .sdata2:0x8044BE74; // type:object size:0x4 scope:global align:4 OPEN_SPEED__7daDsh_c = .sdata2:0x8044BE78; // type:object size:0x4 scope:global align:4 @@ -26333,9 +26333,9 @@ j2dDefaultTevKColor = .sdata2:0x804502B4; // type:object size:0x4 scope:global a j2dDefaultTevSwapMode = .sdata2:0x804502B8; // type:object size:0x4 scope:global align:4 data:byte j2dDefaultTevSwapModeTable = .sdata2:0x804502BC; // type:object size:0x4 scope:global align:4 data:byte j2dDefaultBlendInfo = .sdata2:0x804502C0; // type:object size:0x4 scope:global align:4 data:byte -lbl_804502C4 = .sdata2:0x804502C4; // type:object size:0x1 data:byte +j2dDefaultPEBlockDither = .sdata2:0x804502C4; // type:object size:0x1 data:byte j2dDefaultColorChanInfo = .sdata2:0x804502C8; // type:object size:0x4 scope:global align:4 -lbl_804502CC = .sdata2:0x804502CC; // type:object size:0x1 data:byte +data_804561AC = .sdata2:0x804502CC; // type:object size:0x1 data:byte j2dDefaultAlphaCmp = .sdata2:0x804502CE; // type:object size:0x2 scope:global align:2 data:2byte @1943 = .sdata2:0x804502D0; // type:object size:0x4 scope:local align:4 data:float @1944 = .sdata2:0x804502D4; // type:object size:0x4 scope:local align:4 data:float @@ -26429,7 +26429,7 @@ j2dDefaultAlphaCmp = .sdata2:0x804502CE; // type:object size:0x2 scope:global al @1171 = .sdata2:0x804504D8; // type:object size:0x8 scope:local align:4 data:double j3dDefaultColInfo = .sdata2:0x804504E0; // type:object size:0x4 scope:global align:4 data:4byte j3dDefaultAmbInfo = .sdata2:0x804504E4; // type:object size:0x4 scope:global align:4 data:4byte -lbl_804504E8 = .sdata2:0x804504E8; // type:object size:0x1 data:byte +data_804563C8 = .sdata2:0x804504E8; // type:object size:0x1 data:byte j3dDefaultTevOrderInfoNull = .sdata2:0x804504EC; // type:object size:0x4 scope:global align:4 data:4byte j3dDefaultIndTexOrderNull = .sdata2:0x804504F0; // type:object size:0x4 scope:global align:4 data:4byte j3dDefaultTevColor = .sdata2:0x804504F4; // type:object size:0x8 scope:global align:4 data:4byte @@ -26439,7 +26439,7 @@ j3dDefaultTevSwapMode = .sdata2:0x80450504; // type:object size:0x4 scope:global j3dDefaultTevSwapModeTable = .sdata2:0x80450508; // type:object size:0x4 scope:global align:4 data:byte j3dDefaultBlendInfo = .sdata2:0x8045050C; // type:object size:0x4 scope:global align:4 data:4byte j3dDefaultColorChanInfo = .sdata2:0x80450510; // type:object size:0x8 scope:global align:4 data:byte -lbl_80450518 = .sdata2:0x80450518; // type:object size:0x1 data:byte +j3dDefaultTevSwapTableID = .sdata2:0x80450518; // type:object size:0x1 data:byte j3dDefaultAlphaCmpID = .sdata2:0x8045051A; // type:object size:0x2 scope:global align:2 data:2byte j3dDefaultZModeID = .sdata2:0x8045051C; // type:object size:0x2 scope:global align:2 data:2byte @781 = .sdata2:0x80450520; // type:object size:0x4 scope:local align:4 data:float diff --git a/configure.py b/configure.py index 6902ed52261..02aea375562 100755 --- a/configure.py +++ b/configure.py @@ -417,7 +417,7 @@ config.libs = [ "host": True, "objects": [ Object(MatchingFor("GZ2E01", "GZ2J01"), "m_Do/m_Do_main.cpp"), - Object(MatchingFor("GZ2E01"), "m_Do/m_Do_printf.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "m_Do/m_Do_printf.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "m_Do/m_Do_audio.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "m_Do/m_Do_controller_pad.cpp"), Object(Equivalent, "m_Do/m_Do_graphic.cpp"), # weak func order @@ -453,63 +453,63 @@ config.libs = [ "host": True, "objects": [ # f_ap - Object(MatchingFor("GZ2E01"), "f_ap/f_ap_game.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_ap/f_ap_game.cpp"), # f_op - Object(MatchingFor("GZ2E01"), "f_op/f_op_actor.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01"), "f_op/f_op_actor_iter.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_actor_tag.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_actor_mng.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01"), "f_op/f_op_camera.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_camera_mng.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_overlap.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_overlap_mng.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_overlap_req.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_scene.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_scene_iter.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_scene_mng.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_scene_req.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_scene_tag.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_view.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_kankyo.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_msg.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_kankyo_mng.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_msg_mng.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01"), "f_op/f_op_draw_iter.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_draw_tag.cpp"), - Object(MatchingFor("GZ2E01"), "f_op/f_op_scene_pause.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_actor.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_actor_iter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_actor_tag.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_actor_mng.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_camera.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_camera_mng.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_overlap.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_overlap_mng.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_overlap_req.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_scene.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_scene_iter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_scene_mng.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_scene_req.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_scene_tag.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_view.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_kankyo.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_msg.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_kankyo_mng.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_msg_mng.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_draw_iter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_draw_tag.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_scene_pause.cpp"), # f_pc - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_base.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_create_iter.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_create_req.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_create_tag.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_creator.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_delete_tag.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_deletor.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_draw_priority.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_executor.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_layer.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_leaf.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_layer_iter.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_layer_tag.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_line.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_load.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_manager.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_method.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_node.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_node_req.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_priority.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_profile.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_searcher.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_line_tag.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_line_iter.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_method_iter.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_method_tag.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_pause.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_draw.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_fstcreate_req.cpp"), - Object(MatchingFor("GZ2E01"), "f_pc/f_pc_stdcreate_req.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_base.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_create_iter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_create_req.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_create_tag.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_creator.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_delete_tag.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_deletor.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_draw_priority.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_executor.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_layer.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_leaf.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_layer_iter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_layer_tag.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_line.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_load.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_manager.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_method.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_node.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_node_req.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_priority.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_profile.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_searcher.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_line_tag.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_line_iter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_method_iter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_method_tag.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_pause.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_draw.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_fstcreate_req.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_pc/f_pc_stdcreate_req.cpp"), Object(NonMatching, "f_pc/f_pc_debug_sv.cpp"), ], }, @@ -520,112 +520,112 @@ config.libs = [ "progress_category": "game", "host": True, "objects": [ - Object(MatchingFor("GZ2E01"), "d/d_stage.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01"), "d/d_map.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_com_inf_game.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01"), "d/d_com_static.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_com_inf_actor.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bomb.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_lib.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_save.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_save_init.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_jnt_col.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01"), "d/d_a_obj.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_a_itembase_static.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_a_item_static.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_a_shop_item_static.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_a_horse_static.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_stage.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_map.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_com_inf_game.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_com_static.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_com_inf_actor.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bomb.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_lib.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_save.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_save_init.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_jnt_col.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_a_obj.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_a_itembase_static.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_a_item_static.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_a_shop_item_static.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_a_horse_static.cpp"), Object(NonMatching, "d/d_demo.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_door_param2.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_door_param2.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(NonMatching, "d/d_resorce.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_map_path.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_map_path_fmap.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_map_path.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_map_path_fmap.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(NonMatching, "d/d_map_path_dmap.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_event.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_event_data.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_event_manager.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01"), "d/d_event_lib.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_event.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_event_data.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_event_manager.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_event_lib.cpp"), Object(Equivalent, "d/d_event_debug.cpp"), # RTTI & vtable padding - Object(MatchingFor("GZ2E01"), "d/d_simple_model.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_simple_model.cpp"), Object(NonMatching, "d/d_particle.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_particle_name.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_particle_copoly.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_path.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_particle_name.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_particle_copoly.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_path.cpp"), Object(NonMatching, "d/d_drawlist.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_kankyo_data.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_kankyo_wether.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_kankyo_data.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_kankyo_wether.cpp"), Object(NonMatching, "d/d_kankyo_rain.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_vibration.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_vib_pattern.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_attention.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01"), "d/d_bg_pc.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_att_dist.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_plc.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s_acch.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s_chk.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s_gnd_chk.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s_grp_pass_chk.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s_lin_chk.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s_movebg_actor.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s_sph_chk.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s_spl_grp_chk.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s_poly_pass_chk.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s_roof_chk.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_s_wtr_chk.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_w.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01"), "d/d_bg_w_base.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_vibration.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_vib_pattern.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_attention.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_pc.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_att_dist.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_plc.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_acch.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_gnd_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_grp_pass_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_lin_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_movebg_actor.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_sph_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_spl_grp_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_poly_pass_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_roof_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_wtr_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_w.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_w_base.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(NonMatching, "d/d_bg_w_kcol.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bg_w_sv.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_w_sv.cpp"), Object(Equivalent, "d/d_cc_d.cpp"), # weak func order - Object(MatchingFor("GZ2E01"), "d/d_cc_mass_s.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_cc_mass_s.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(NonMatching, "d/d_cc_s.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_cc_uty.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_cc_uty.cpp"), Object(Equivalent, "d/d_cam_param.cpp", extra_cflags=['-pragma "nosyminline on"']), # weak func order Object(NonMatching, "d/d_ev_camera.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_spline_path.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_item_data.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_item.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_tresure.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_model.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_eye_hl.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_error_msg.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_spline_path.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_item_data.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_item.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_tresure.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_model.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_eye_hl.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_error_msg.cpp"), Object(NonMatching, "d/d_debug_viewer.cpp"), Object(NonMatching, "d/actor/d_a_alink.cpp"), - Object(MatchingFor("GZ2E01"), "d/actor/d_a_itembase.cpp"), - Object(MatchingFor("GZ2E01"), "d/actor/d_a_no_chg_room.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/actor/d_a_itembase.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/actor/d_a_no_chg_room.cpp"), Object(NonMatching, "d/actor/d_a_npc.cpp"), Object(Equivalent, "d/actor/d_a_npc_cd.cpp"), # weak func order Object(NonMatching, "d/actor/d_a_npc_cd2.cpp"), Object(NonMatching, "d/actor/d_a_obj_item.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_insect.cpp"), - Object(MatchingFor("GZ2E01"), "d/actor/d_a_obj_ss_base.cpp"), - Object(MatchingFor("GZ2E01"), "d/actor/d_a_player.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_insect.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/actor/d_a_obj_ss_base.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/actor/d_a_player.cpp"), Object(NonMatching, "d/d_camera.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_envse.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_envse.cpp"), Object(NonMatching, "d/d_file_select.cpp"), Object(NonMatching, "d/d_file_sel_warning.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_file_sel_info.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_bright_check.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_file_sel_info.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bright_check.cpp"), Object(Equivalent, "d/d_scope.cpp", extra_cflags=['-pragma "nosyminline on"']), # weak func order - Object(MatchingFor("GZ2E01"), "d/d_select_cursor.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_select_icon.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_shop_camera.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_shop_item_ctrl.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_shop_system.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_gameover.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_select_cursor.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_select_icon.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_shop_camera.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_shop_item_ctrl.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_shop_system.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_gameover.cpp"), Object(NonMatching, "d/d_kankyo.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_kyeff.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_kyeff2.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_ky_thunder.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_kantera_icon_meter.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_menu_calibration.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_kyeff.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_kyeff2.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_ky_thunder.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_kantera_icon_meter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_menu_calibration.cpp"), Object(NonMatching, "d/d_menu_collect.cpp"), Object(NonMatching, "d/d_menu_dmap.cpp"), Object(Equivalent, "d/d_menu_dmap_map.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_menu_map_common.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_menu_fishing.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_menu_fmap.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_menu_map_common.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_menu_fishing.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_menu_fmap.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(NonMatching, "d/d_menu_fmap_map.cpp"), Object(MatchingFor("GZ2E01"), "d/d_menu_fmap2D.cpp"), Object(MatchingFor("GZ2E01"), "d/d_menu_insect.cpp"), @@ -639,20 +639,20 @@ config.libs = [ Object(Equivalent, "d/d_menu_window.cpp"), # weak func order Object(MatchingFor("GZ2E01"), "d/d_meter_HIO.cpp"), Object(MatchingFor("GZ2E01"), "d/d_meter_button.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_meter_haihai.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_meter_hakusha.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_meter_map.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_meter_string.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_meter_haihai.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_meter_hakusha.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_meter_map.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_meter_string.cpp"), Object(MatchingFor("GZ2E01"), "d/d_meter2_draw.cpp"), Object(NonMatching, "d/d_meter2_info.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_meter2.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_meter2.cpp"), Object(MatchingFor("GZ2E01"), "d/d_msg_out_font.cpp"), Object(NonMatching, "d/d_msg_class.cpp"), Object(NonMatching, "d/d_msg_object.cpp"), Object(NonMatching, "d/d_msg_unit.cpp"), Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_3select.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_arrow.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_base.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_msg_scrn_base.cpp"), Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_boss.cpp"), Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_explain.cpp"), Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_item.cpp"), @@ -665,26 +665,26 @@ config.libs = [ Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_talk.cpp"), Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_tree.cpp"), Object(MatchingFor("GZ2E01"), "d/d_msg_string_base.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_msg_string.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_msg_string.cpp"), Object(NonMatching, "d/d_msg_flow.cpp"), Object(Equivalent, "d/d_name.cpp"), # missing vtable padding Object(NonMatching, "d/d_npc_lib.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_ovlp_fade.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_ovlp_fade.cpp"), Object(Equivalent, "d/d_ovlp_fade2.cpp"), # weak func order - Object(MatchingFor("GZ2E01"), "d/d_ovlp_fade3.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_pane_class.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_pane_class_alpha.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_pane_class_ex.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01"), "d/d_s_logo.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_s_menu.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_s_name.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_s_play.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_s_room.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_s_title.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_save_HIO.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_ovlp_fade3.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_pane_class.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_pane_class_alpha.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_pane_class_ex.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_s_logo.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_s_menu.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_s_name.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_s_play.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_s_room.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_s_title.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_save_HIO.cpp"), Object(MatchingFor("GZ2E01"), "d/d_timer.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_k_wmark.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_k_wpillar.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_k_wmark.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_k_wpillar.cpp"), ], }, { @@ -694,7 +694,7 @@ config.libs = [ "progress_category": "core", "host": True, "objects": [ - Object(MatchingFor("GZ2E01"), "DynamicLink.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "DynamicLink.cpp"), ], }, { @@ -704,175 +704,175 @@ config.libs = [ "progress_category": "third_party", "host": True, "objects": [ - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_malloc.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_API.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_API_controller_pad.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_API_graphic.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_cc_d.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_cc_s.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_counter.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_list.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_list_iter.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_node.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_node_iter.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_tree.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_tree_iter.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_phase.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_request.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_tag.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_tag_iter.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_xyz.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_sxyz.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_math.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_bg_s_chk.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_bg_s_gnd_chk.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_bg_s_lin_chk.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_bg_s_shdw_draw.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_bg_s_poly_info.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_bg_w.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_m2d.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_m3d.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_m3d_g_aab.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_m3d_g_cir.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_m3d_g_cps.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_m3d_g_cyl.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_m3d_g_lin.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_m3d_g_pla.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_m3d_g_sph.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_m3d_g_tri.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_malloc.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_API.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_API_controller_pad.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_API_graphic.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_cc_d.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_cc_s.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_counter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_list.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_list_iter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_node.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_node_iter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_tree.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_tree_iter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_phase.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_request.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_tag.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_tag_iter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_xyz.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_sxyz.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_math.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_bg_s_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_bg_s_gnd_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_bg_s_lin_chk.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_bg_s_shdw_draw.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_bg_s_poly_info.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_bg_w.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m2d.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_aab.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_cir.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_cps.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_cyl.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_lin.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_pla.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_sph.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_tri.cpp"), Object(NonMatching, "SSystem/SComponent/c_m3d_g_vtx.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_lib.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SComponent/c_angle.cpp"), - Object(MatchingFor("GZ2E01"), "SSystem/SStandard/s_basic.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_lib.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_angle.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SStandard/s_basic.cpp"), ], }, JSystemLib( "JFramework", [ Object(Equivalent, "JSystem/JFramework/JFWSystem.cpp"), # regalloc - Object(MatchingFor("GZ2E01"), "JSystem/JFramework/JFWDisplay.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JFramework/JFWDisplay.cpp"), ], ), JSystemLib( "J3DU", [ - Object(MatchingFor("GZ2E01"), "JSystem/J3DU/J3DUClipper.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DU/J3DUDL.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DU/J3DUClipper.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DU/J3DUDL.cpp"), ], ), JSystemLib( "JParticle", [ - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPAResourceManager.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPAResource.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPABaseShape.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPAExtraShape.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPAChildShape.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPAExTexShape.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPADynamicsBlock.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPAFieldBlock.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPAKeyBlock.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPATexture.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPAResourceLoader.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAResourceManager.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAResource.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPABaseShape.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAExtraShape.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAChildShape.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAExTexShape.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPADynamicsBlock.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAFieldBlock.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAKeyBlock.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPATexture.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAResourceLoader.cpp"), Object(Equivalent, "JSystem/JParticle/JPAEmitterManager.cpp", extra_cflags=['-pragma "nosyminline off"']), # weak func order - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPAEmitter.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPAParticle.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JParticle/JPAMath.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAEmitter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAParticle.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAMath.cpp"), ], ), JSystemLib( "JStage", [ - Object(MatchingFor("GZ2E01"), "JSystem/JStage/JSGActor.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStage/JSGAmbientLight.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStage/JSGCamera.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStage/JSGFog.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStage/JSGLight.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStage/JSGObject.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStage/JSGSystem.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStage/JSGActor.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStage/JSGAmbientLight.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStage/JSGCamera.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStage/JSGFog.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStage/JSGLight.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStage/JSGObject.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStage/JSGSystem.cpp"), ], ), JSystemLib( "JStudio", [ - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/ctb.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/ctb-data.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/ctb.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/ctb-data.cpp"), Object(Equivalent, "JSystem/JStudio/JStudio/functionvalue.cpp", extra_cflags=['-pragma "nosyminline off"']), # weak func order Object(NonMatching, "JSystem/JStudio/JStudio/fvb.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/fvb-data.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/fvb-data-parse.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/jstudio-control.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/jstudio-data.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/jstudio-math.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/jstudio-object.cpp", extra_cflags=['-pragma "sym off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/object-id.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/stb.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/stb-data-parse.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio/stb-data.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/fvb-data.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/fvb-data-parse.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/jstudio-control.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/jstudio-data.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/jstudio-math.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/jstudio-object.cpp", extra_cflags=['-pragma "sym off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/object-id.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/stb.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/stb-data-parse.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/stb-data.cpp"), ], ), JSystemLib( "JStudio_JStage", [ - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio_JStage/control.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio_JStage/object.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio_JStage/object-actor.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio_JStage/object-camera.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio_JStage/object-fog.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/control.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/object.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/object-actor.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/object-camera.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/object-fog.cpp"), Object(NonMatching, "JSystem/JStudio/JStudio_JStage/object-light.cpp"), ], ), JSystemLib( "JStudio_JAudio2", [ - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio_JAudio2/control.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio_JAudio2/object-sound.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JAudio2/control.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JAudio2/object-sound.cpp"), ], ), JSystemLib( "JStudio_JParticle", [ - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio_JParticle/control.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JStudio/JStudio_JParticle/object-particle.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JParticle/control.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JParticle/object-particle.cpp"), ], ), JSystemLib( "JAudio2", [ - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASCalc.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASCalc.cpp"), Object(NonMatching, "JSystem/JAudio2/JASTaskThread.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASDvdThread.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASCallback.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASDvdThread.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASCallback.cpp"), Object(NonMatching, "JSystem/JAudio2/JASHeapCtrl.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASResArcLoader.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASProbe.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASResArcLoader.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASProbe.cpp"), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASReport.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASCmdStack.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASCmdStack.cpp"), Object(NonMatching, "JSystem/JAudio2/JASTrack.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASTrackPort.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASRegisterParam.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASSeqCtrl.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASSeqParser.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASSeqReader.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASTrackPort.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASRegisterParam.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASSeqCtrl.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASSeqParser.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASSeqReader.cpp"), Object(NonMatching, "JSystem/JAudio2/JASAramStream.cpp"), Object(NonMatching, "JSystem/JAudio2/JASBank.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASBasicBank.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASVoiceBank.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASBasicInst.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASDrumSet.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASBasicBank.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASVoiceBank.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASBasicInst.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASDrumSet.cpp"), Object(NonMatching, "JSystem/JAudio2/JASBasicWaveBank.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASSimpleWaveBank.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASWSParser.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASSimpleWaveBank.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASWSParser.cpp"), Object(NonMatching, "JSystem/JAudio2/JASBNKParser.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASWaveArcLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASWaveArcLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASChannel.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASLfo.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASOscillator.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASLfo.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASOscillator.cpp"), Object(NonMatching, "JSystem/JAudio2/JASAiCtrl.cpp"), Object(NonMatching, "JSystem/JAudio2/JASAudioThread.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASAudioReseter.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASDSPChannel.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASAudioReseter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASDSPChannel.cpp"), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASDSPInterface.cpp"), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASDriverIF.cpp"), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASSoundParams.cpp"), @@ -880,44 +880,44 @@ config.libs = [ Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/dsptask.cpp", extra_cflags=["-O4", "-func_align 32"]), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/osdsp.cpp", extra_cflags=["-O4", "-func_align 32", "-str nopool"]), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/osdsp_task.cpp", extra_cflags=["-O4", "-func_align 32"]), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIAudible.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIAudience.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISe.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAIAudible.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAIAudience.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISe.cpp"), Object(Equivalent, "JSystem/JAudio2/JAISeMgr.cpp", extra_cflags=['-pragma "nosyminline off"']), # weak function order Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISeq.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISeqDataMgr.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISeqDataMgr.cpp"), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISeqMgr.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISound.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISoundChild.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISoundHandles.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISoundInfo.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISoundParams.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISoundStarter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISound.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISoundChild.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISoundHandles.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISoundInfo.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISoundParams.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISoundStarter.cpp"), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIStream.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIStreamDataMgr.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAIStreamDataMgr.cpp"), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIStreamMgr.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUAudioArcInterpreter.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUAudioArcLoader.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUAudioMgr.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUBankTable.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUClusterSound.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUAudioArcInterpreter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUAudioArcLoader.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUAudioMgr.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUBankTable.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUClusterSound.cpp"), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUInitializer.cpp", extra_cflags=['-pragma "nosyminline off"']), Object(NonMatching, "JSystem/JAudio2/JAUSectionHeap.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUSeqCollection.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUSeqDataBlockMgr.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUSoundAnimator.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUSoundTable.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUStreamFileTable.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUSeqCollection.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUSeqDataBlockMgr.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUSoundAnimator.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUSoundTable.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUStreamFileTable.cpp"), ], ), JSystemLib( "JMessage", [ - Object(MatchingFor("GZ2E01"), "JSystem/JMessage/control.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JMessage/data.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JMessage/control.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JMessage/data.cpp"), Object(NonMatching, "JSystem/JMessage/processor.cpp", extra_cflags=['-pragma "nosyminline off"']), Object(NonMatching, "JSystem/JMessage/resource.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JMessage/locale.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JMessage/locale.cpp"), ], ), { @@ -931,22 +931,22 @@ config.libs = [ Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2AudioArcLoader.cpp"), Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2Param.cpp"), Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundMgr.cpp"), - Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundStarter.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "Z2AudioLib/Z2SoundStarter.cpp"), Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundHandles.cpp"), - Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SeMgr.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "Z2AudioLib/Z2SeMgr.cpp"), Object(Equivalent, "Z2AudioLib/Z2SeqMgr.cpp"), Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2StatusMgr.cpp"), Object(NonMatching, "Z2AudioLib/Z2SceneMgr.cpp"), - Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2FxLineMgr.cpp"), - Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundInfo.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "Z2AudioLib/Z2FxLineMgr.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "Z2AudioLib/Z2SoundInfo.cpp"), Object(Equivalent, "Z2AudioLib/Z2Audience.cpp"), - Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundObject.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "Z2AudioLib/Z2SoundObject.cpp"), Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SoundObjMgr.cpp"), Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2Creature.cpp"), Object(NonMatching, "Z2AudioLib/Z2LinkMgr.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(NonMatching, "Z2AudioLib/Z2EnvSeMgr.cpp"), - Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2WolfHowlMgr.cpp"), - Object(MatchingFor("GZ2E01"), "Z2AudioLib/Z2SpeechMgr2.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "Z2AudioLib/Z2WolfHowlMgr.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "Z2AudioLib/Z2SpeechMgr2.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(NonMatching, "Z2AudioLib/Z2AudioMgr.cpp"), ], }, @@ -956,162 +956,162 @@ config.libs = [ "cflags": cflags_noopt, "progress_category": "sdk", "objects": [ - Object(MatchingFor("GZ2E01"), "dolphin/gf/GFGeometry.cpp", extra_cflags=["-O3"]), - Object(MatchingFor("GZ2E01"), "dolphin/gf/GFLight.cpp", extra_cflags=["-O3"]), - Object(MatchingFor("GZ2E01"), "dolphin/gf/GFPixel.cpp", extra_cflags=["-O3"]), - Object(MatchingFor("GZ2E01"), "dolphin/gf/GFTev.cpp", extra_cflags=["-O3"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gf/GFGeometry.cpp", extra_cflags=["-O3"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gf/GFLight.cpp", extra_cflags=["-O3"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gf/GFPixel.cpp", extra_cflags=["-O3"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gf/GFTev.cpp", extra_cflags=["-O3"]), ], }, JSystemLib( "JKernel", [ - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRHeap.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRExpHeap.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRSolidHeap.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRAssertHeap.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRDisposer.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRThread.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRAram.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRAramHeap.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRAramBlock.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRAramPiece.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRAramStream.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRFileLoader.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRFileFinder.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRFileCache.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRArchivePub.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRArchivePri.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRMemArchive.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRAramArchive.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRDvdArchive.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRCompArchive.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRFile.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRDvdFile.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRDvdRipper.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRDvdAramRipper.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JKernel/JKRDecomp.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRHeap.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRExpHeap.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRSolidHeap.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRAssertHeap.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDisposer.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRThread.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRAram.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRAramHeap.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRAramBlock.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRAramPiece.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRAramStream.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRFileLoader.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRFileFinder.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRFileCache.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRArchivePub.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRArchivePri.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRMemArchive.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRAramArchive.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDvdArchive.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRCompArchive.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRFile.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDvdFile.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDvdRipper.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDvdAramRipper.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDecomp.cpp"), ], ), JSystemLib( "JSupport", [ - Object(MatchingFor("GZ2E01"), "JSystem/JSupport/JSUList.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JSupport/JSUInputStream.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JSupport/JSUList.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JSupport/JSUInputStream.cpp"), Object(NonMatching, "JSystem/JSupport/JSUOutputStream.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JSupport/JSUMemoryStream.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JSupport/JSUFileStream.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JSupport/JSUMemoryStream.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JSupport/JSUFileStream.cpp"), ], ), JSystemLib( "JGadget", [ - Object(MatchingFor("GZ2E01"), "JSystem/JGadget/binary.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JGadget/linklist.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JGadget/std-vector.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JGadget/binary.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JGadget/linklist.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JGadget/std-vector.cpp", extra_cflags=['-pragma "nosyminline off"']), ], ), JSystemLib( "JUtility", [ - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTCacheFont.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTResource.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTTexture.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTPalette.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTNameTab.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTGraphFifo.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTFont.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTResFont.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTDbPrint.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTGamePad.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTException.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTDirectPrint.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTAssert.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTVideo.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTXfb.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTFader.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTProcBar.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTConsole.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTDirectFile.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTCacheFont.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTResource.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTTexture.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTPalette.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTNameTab.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTGraphFifo.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTFont.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTResFont.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTDbPrint.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTGamePad.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTException.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTDirectPrint.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTAssert.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTVideo.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTXfb.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTFader.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTProcBar.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTConsole.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTDirectFile.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp"), ], ), JSystemLib( "J2DGraph", [ - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DGrafContext.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DOrthoGraph.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DTevs.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DGrafContext.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DOrthoGraph.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DTevs.cpp"), Object(Equivalent, "JSystem/J2DGraph/J2DMaterial.cpp", extra_cflags=['-pragma "nosyminline off"']), # weak func order Object(NonMatching, "JSystem/J2DGraph/J2DMatBlock.cpp"), Object(NonMatching, "JSystem/J2DGraph/J2DMaterialFactory.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DPrint.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DPane.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DPrint.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DPane.cpp"), Object(NonMatching, "JSystem/J2DGraph/J2DScreen.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DWindow.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DPicture.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DTextBox.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DWindow.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DPicture.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DTextBox.cpp"), Object(NonMatching, "JSystem/J2DGraph/J2DWindowEx.cpp"), Object(NonMatching, "JSystem/J2DGraph/J2DPictureEx.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DTextBoxEx.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DAnmLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DAnimation.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J2DGraph/J2DManage.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DTextBoxEx.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DAnmLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DAnimation.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DManage.cpp"), ], ), JSystemLib( "J3DGraphBase", [ Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DGD.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DSys.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DVertex.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DTransform.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DTexture.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DPacket.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DSys.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DVertex.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DTransform.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DTexture.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DPacket.cpp"), Object(NonMatching, "JSystem/J3DGraphBase/J3DShapeMtx.cpp"), Object(NonMatching, "JSystem/J3DGraphBase/J3DShapeDraw.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DShape.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DMaterial.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DShape.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DMaterial.cpp", extra_cflags=['-pragma "nosyminline off"']), Object(NonMatching, "JSystem/J3DGraphBase/J3DMatBlock.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DTevs.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DDrawBuffer.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DStruct.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DTevs.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DDrawBuffer.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DStruct.cpp"), ], ), JSystemLib( "J3DGraphAnimator", [ - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphAnimator/J3DShapeTable.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphAnimator/J3DJointTree.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphAnimator/J3DModelData.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DShapeTable.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DJointTree.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DModelData.cpp", extra_cflags=['-pragma "nosyminline off"']), Object(NonMatching, "JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphAnimator/J3DModel.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphAnimator/J3DAnimation.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DModel.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DAnimation.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp"), Object(NonMatching, "JSystem/J3DGraphAnimator/J3DSkinDeform.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphAnimator/J3DCluster.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphAnimator/J3DJoint.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DCluster.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DJoint.cpp"), Object(NonMatching, "JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp"), ], ), JSystemLib( "J3DGraphLoader", [ - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphLoader/J3DMaterialFactory.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphLoader/J3DClusterLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphLoader/J3DModelLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphLoader/J3DJointFactory.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphLoader/J3DShapeFactory.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphLoader/J3DAnmLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DMaterialFactory.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DClusterLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DModelLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DJointFactory.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DShapeFactory.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DAnmLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), ], ), JSystemLib( "JMath", [ - Object(MatchingFor("GZ2E01"), "JSystem/JMath/JMath.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JMath/random.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JMath/JMATrigonometric.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JMath/JMath.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JMath/random.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JMath/JMATrigonometric.cpp"), ], ), JSystemLib( @@ -1134,36 +1134,36 @@ config.libs = [ DolphinLib( "base", [ - Object(MatchingFor("GZ2E01"), "dolphin/base/PPCArch.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/base/PPCArch.c"), ], ), DolphinLib( "os", [ - Object(MatchingFor("GZ2E01"), "dolphin/os/__start.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OS.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSAlarm.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSAlloc.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSArena.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSAudioSystem.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSCache.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSContext.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSError.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSExec.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSFont.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSInterrupt.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSLink.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSMessage.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSMemory.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSMutex.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSReboot.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSReset.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSResetSW.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSRtc.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSSync.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSThread.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/OSTime.c"), - Object(MatchingFor("GZ2E01"), "dolphin/os/__ppc_eabi_init.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/__start.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OS.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSAlarm.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSAlloc.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSArena.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSAudioSystem.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSCache.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSContext.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSError.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSExec.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSFont.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSInterrupt.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSLink.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSMessage.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSMemory.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSMutex.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSReboot.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSReset.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSResetSW.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSRtc.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSSync.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSThread.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/OSTime.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/os/__ppc_eabi_init.cpp"), ], ), { @@ -1172,123 +1172,123 @@ config.libs = [ "cflags": cflags_noopt, "progress_category": "sdk", "objects": [ - Object(MatchingFor("GZ2E01"), "dolphin/exi/EXIBios.c", extra_cflags=["-O3,p"]), - Object(MatchingFor("GZ2E01"), "dolphin/exi/EXIUart.c", extra_cflags=["-O4,p"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/exi/EXIBios.c", extra_cflags=["-O3,p"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/exi/EXIUart.c", extra_cflags=["-O4,p"]), ], }, DolphinLib( "si", [ - Object(MatchingFor("GZ2E01"), "dolphin/si/SIBios.c"), - Object(MatchingFor("GZ2E01"), "dolphin/si/SISamplingRate.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/si/SIBios.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/si/SISamplingRate.c"), ], ), DolphinLib( "db", [ - Object(MatchingFor("GZ2E01"), "dolphin/db/db.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/db/db.c"), ], ), DolphinLib( "mtx", [ - Object(MatchingFor("GZ2E01"), "dolphin/mtx/mtx.c", extra_cflags=["-char signed"]), - Object(MatchingFor("GZ2E01"), "dolphin/mtx/mtxvec.c"), - Object(MatchingFor("GZ2E01"), "dolphin/mtx/mtx44.c", extra_cflags=["-char signed"]), - Object(MatchingFor("GZ2E01"), "dolphin/mtx/vec.c"), - Object(MatchingFor("GZ2E01"), "dolphin/mtx/quat.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/mtx/mtx.c", extra_cflags=["-char signed"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/mtx/mtxvec.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/mtx/mtx44.c", extra_cflags=["-char signed"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/mtx/vec.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/mtx/quat.c"), ], ), DolphinLib( "dvd", [ - Object(MatchingFor("GZ2E01"), "dolphin/dvd/dvdlow.c", extra_cflags=["-char signed"]), - Object(MatchingFor("GZ2E01"), "dolphin/dvd/dvdfs.c", extra_cflags=["-char signed"]), - Object(MatchingFor("GZ2E01"), "dolphin/dvd/dvd.c", extra_cflags=["-char signed"]), - Object(MatchingFor("GZ2E01"), "dolphin/dvd/dvdqueue.c", extra_cflags=["-char signed"]), - Object(MatchingFor("GZ2E01"), "dolphin/dvd/dvderror.c", extra_cflags=["-char signed"]), - Object(MatchingFor("GZ2E01"), "dolphin/dvd/dvdidutils.c", extra_cflags=["-char signed"]), - Object(MatchingFor("GZ2E01"), "dolphin/dvd/dvdFatal.c", extra_cflags=["-char signed"]), - Object(MatchingFor("GZ2E01"), "dolphin/dvd/fstload.c", extra_cflags=["-char signed"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/dvd/dvdlow.c", extra_cflags=["-char signed"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/dvd/dvdfs.c", extra_cflags=["-char signed"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/dvd/dvd.c", extra_cflags=["-char signed"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/dvd/dvdqueue.c", extra_cflags=["-char signed"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/dvd/dvderror.c", extra_cflags=["-char signed"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/dvd/dvdidutils.c", extra_cflags=["-char signed"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/dvd/dvdFatal.c", extra_cflags=["-char signed"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/dvd/fstload.c", extra_cflags=["-char signed"]), ], ), DolphinLib( "vi", [ - Object(MatchingFor("GZ2E01"), "dolphin/vi/vi.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/vi/vi.c"), ], ), DolphinLib( "pad", [ - Object(MatchingFor("GZ2E01"), "dolphin/pad/Padclamp.c"), - Object(MatchingFor("GZ2E01"), "dolphin/pad/Pad.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/pad/Padclamp.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/pad/Pad.c"), ], ), DolphinLib( "ai", [ - Object(MatchingFor("GZ2E01"), "dolphin/ai/ai.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/ai/ai.c"), ], ), DolphinLib( "ar", [ - Object(MatchingFor("GZ2E01"), "dolphin/ar/ar.c"), - Object(MatchingFor("GZ2E01"), "dolphin/ar/arq.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/ar/ar.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/ar/arq.c"), ], ), DolphinLib( "dsp", [ - Object(MatchingFor("GZ2E01"), "dolphin/dsp/dsp.c"), - Object(MatchingFor("GZ2E01"), "dolphin/dsp/dsp_debug.c"), - Object(MatchingFor("GZ2E01"), "dolphin/dsp/dsp_task.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/dsp/dsp.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/dsp/dsp_debug.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/dsp/dsp_task.c"), ], ), DolphinLib( "card", [ - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDBios.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDUnlock.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDRdwr.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDBlock.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDDir.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDCheck.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDMount.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDFormat.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDOpen.c", extra_cflags=["-char signed"]), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDCreate.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDRead.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDWrite.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDStat.c"), - Object(MatchingFor("GZ2E01"), "dolphin/card/CARDNet.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDBios.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDUnlock.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDRdwr.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDBlock.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDDir.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDCheck.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDMount.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDFormat.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDOpen.c", extra_cflags=["-char signed"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDCreate.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDRead.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDWrite.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDStat.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/card/CARDNet.c"), ], ), DolphinLib( "gx", [ - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXInit.c", extra_cflags=["-opt nopeephole"]), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXFifo.c"), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXAttr.c"), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXMisc.c"), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXGeometry.c"), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXFrameBuf.c"), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXLight.c", extra_cflags=["-fp_contract off"]), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXTexture.c"), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXBump.c"), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXTev.c"), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXPixel.c"), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXDisplayList.c"), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXTransform.c", extra_cflags=["-fp_contract off"]), - Object(MatchingFor("GZ2E01"), "dolphin/gx/GXPerf.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXInit.c", extra_cflags=["-opt nopeephole"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXFifo.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXAttr.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXMisc.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXGeometry.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXFrameBuf.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXLight.c", extra_cflags=["-fp_contract off"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXTexture.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXBump.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXTev.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXPixel.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXDisplayList.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXTransform.c", extra_cflags=["-fp_contract off"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gx/GXPerf.c"), ], ), DolphinLib( "gd", [ - Object(MatchingFor("GZ2E01"), "dolphin/gd/GDBase.c"), - Object(MatchingFor("GZ2E01"), "dolphin/gd/GDGeometry.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gd/GDBase.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "dolphin/gd/GDGeometry.c"), ], ), { @@ -1298,16 +1298,16 @@ config.libs = [ "progress_category": "sdk", "host": False, "objects": [ - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/Runtime/Src/__mem.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/Runtime/Src/__va_arg.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/Runtime/Src/NMWException.cp", extra_cflags=["-Cpp_exceptions on"]), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/Runtime/Src/ptmf.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/Runtime/Src/runtime.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c", extra_cflags=["-str reuse,nopool,readonly"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/Runtime/Src/__mem.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/Runtime/Src/__va_arg.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/Runtime/Src/NMWException.cp", extra_cflags=["-Cpp_exceptions on"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/Runtime/Src/ptmf.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/Runtime/Src/runtime.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c", extra_cflags=["-str reuse,nopool,readonly"]), ], }, { @@ -1317,62 +1317,62 @@ config.libs = [ "progress_category": "sdk", "host": False, "objects": [ - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c"), - Object(MatchingFor("GZ2E01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c"), ], }, { @@ -1383,38 +1383,38 @@ config.libs = [ "host": False, "objects": [ # debugger - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c", extra_cflags=["-sdata 8"]), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c", extra_cflags=["-sdata 8"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c"), Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c"), Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c"), # gamedev - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c", extra_cflags=["-sdata 8"]), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c", extra_cflags=["-sdata 8"]), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c"), - Object(MatchingFor("GZ2E01"), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c", extra_cflags=["-sdata 8"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c", extra_cflags=["-sdata 8"]), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c"), ], }, { @@ -1424,7 +1424,7 @@ config.libs = [ "progress_category": "sdk", "host": False, "objects": [ - Object(MatchingFor("GZ2E01"), "amcstubs/AmcExi2Stubs.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "amcstubs/AmcExi2Stubs.c"), ], }, { @@ -1434,7 +1434,7 @@ config.libs = [ "progress_category": "sdk", "host": False, "objects": [ - Object(MatchingFor("GZ2E01"), "odemuexi2/DebuggerDriver.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "odemuexi2/DebuggerDriver.c"), ], }, { @@ -1444,7 +1444,7 @@ config.libs = [ "progress_category": "sdk", "host": False, "objects": [ - Object(MatchingFor("GZ2E01"), "odenotstub/odenotstub.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "odenotstub/odenotstub.c"), ], }, @@ -1456,7 +1456,7 @@ config.libs = [ "progress_category": "sdk", "host": False, "objects": [ - Object(MatchingFor("GZ2E01"), "REL/executor.c"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "REL/executor.c"), Object( MatchingFor("GZ2E01"), "REL/global_destructor_chain.c", diff --git a/include/d/actor/d_a_npc.h b/include/d/actor/d_a_npc.h index 336be3894b3..373d95980b7 100644 --- a/include/d/actor/d_a_npc.h +++ b/include/d/actor/d_a_npc.h @@ -911,7 +911,7 @@ public: /* 8014F6FC */ int MoveBGDelete(); /* 8014F770 */ int MoveBGExecute(); - /* 80155FB0 */ virtual ~daBaseNpc_moveBgActor_c(); + /* 80155FB0 */ virtual ~daBaseNpc_moveBgActor_c() {} /* 801503BC */ virtual int CreateHeap() { return 1; } /* 801503C4 */ virtual int Create() { return 1; } /* 801503D4 */ virtual int Execute(Mtx**) { return 1; } @@ -943,6 +943,8 @@ public: /* 801506E0 */ void remove(); /* 801506EC */ fopAc_ac_c* getActorP(); + fpc_ProcID getPId() { return mActorID; } + /* 80155E40 */ virtual ~daNpcF_ActorMngr_c() {} }; @@ -1135,20 +1137,20 @@ public: /* 80154BD8 */ void setHitodamaPrtcl(); /* 80155BF4 */ virtual ~daNpcF_c() {} - /* 80155BC8 */ virtual void setParam(); - /* 80155BC0 */ virtual BOOL main(); - /* 80155BD8 */ virtual BOOL ctrlBtk(); + /* 80155BC8 */ virtual void setParam() {} + /* 80155BC0 */ virtual BOOL main() { return TRUE; } + /* 80155BD8 */ virtual BOOL ctrlBtk() { return FALSE; } /* 80155BBC */ virtual void adjustShapeAngle() {} /* 8015276C */ virtual void setMtx(); /* 801527FC */ virtual void setMtx2(); - /* 80155BB8 */ virtual void setAttnPos(); + /* 80155BB8 */ virtual void setAttnPos() {} /* 80155BB4 */ virtual void setCollisions() {} - /* 80155BE0 */ virtual bool setExpressionAnm(int i_idx, bool i_modify); - /* 80155EC8 */ virtual bool setExpressionBtp(int i_idx); - /* 80155BF0 */ virtual void setExpression(int i_expression, f32 i_morf); - /* 80155BE8 */ virtual void setMotionAnm(int i_idx, f32 i_morf); - /* 80155BEC */ virtual void setMotion(int i_motion, f32 i_morf, int i_restart); - /* 80155BD0 */ virtual BOOL drawDbgInfo(); + /* 80155BE0 */ virtual bool setExpressionAnm(int i_idx, bool i_modify) { return true; } + /* 80155EC8 */ virtual bool setExpressionBtp(int i_idx) { return true; } + /* 80155BF0 */ virtual void setExpression(int i_expression, f32 i_morf) {} + /* 80155BE8 */ virtual void setMotionAnm(int i_idx, f32 i_morf) {} + /* 80155BEC */ virtual void setMotion(int i_motion, f32 i_morf, int i_restart) {} + /* 80155BD0 */ virtual BOOL drawDbgInfo() { return TRUE; } /* 80155BCC */ virtual void drawOtherMdls() {} BOOL chkActorInSpeakArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) { @@ -1208,7 +1210,7 @@ public: daNpcF_MatAnm_c() { initialize(); } /* 80150738 */ void initialize(); /* 8015075C */ void calc(J3DMaterial*) const; - /* 80155ED0 */ ~daNpcF_MatAnm_c(); + /* 80155ED0 */ ~daNpcF_MatAnm_c() {} void setNowOffsetX(float i_nowOffsetX) { mNowOffsetX = i_nowOffsetX; } void setNowOffsetY(float i_nowOffsetY) { mNowOffsetY = i_nowOffsetY; } void onEyeMoveFlag() { mEyeMoveFlag = 1; } @@ -1311,59 +1313,95 @@ public: class daNpcF_MoveBgActor_c : public daNpcF_c { private: public: - /* 80155B54 */ ~daNpcF_MoveBgActor_c(); - /* 80155E88 */ virtual bool CreateHeap(); - /* 80155E90 */ virtual bool Create(); - /* 80155EA0 */ virtual bool Execute(f32 (**)[3][4]); - /* 80155EA8 */ virtual bool Draw(); - /* 80155E98 */ virtual bool Delete(); - /* 80155EB0 */ virtual bool IsDelete(); - /* 80155EB8 */ virtual bool ToFore(); - /* 80155EC0 */ virtual bool ToBack(); + /* 80155B54 */ ~daNpcF_MoveBgActor_c() {} + /* 80155E88 */ virtual bool CreateHeap() { return true; } + /* 80155E90 */ virtual bool Create() { return true; } + /* 80155EA0 */ virtual bool Execute(f32 (**)[3][4]) { return true; } + /* 80155EA8 */ virtual bool Draw() { return true; } + /* 80155E98 */ virtual bool Delete() { return true; } + /* 80155EB0 */ virtual bool IsDelete() { return true; } + /* 80155EB8 */ virtual bool ToFore() { return true; } + /* 80155EC0 */ virtual bool ToBack() { return true; } }; struct daNpcT_HIOParam { - /* 0x00 */ f32 unk0; - /* 0x04 */ f32 unk4; - /* 0x08 */ f32 unk8; - /* 0x0C */ f32 unkC; - /* 0x10 */ f32 unk10; - /* 0x14 */ f32 unk14; - /* 0x18 */ f32 unk18; - /* 0x1C */ f32 unk1C; - /* 0x20 */ f32 unk20; - /* 0x24 */ f32 unk24; - /* 0x28 */ f32 unk28; - /* 0x2C */ f32 unk2C; - /* 0x30 */ f32 unk30; - /* 0x34 */ f32 unk34; - /* 0x38 */ f32 unk38; - /* 0x3C */ f32 unk3C; - /* 0x40 */ f32 unk40; - /* 0x44 */ f32 unk44; - /* 0x48 */ s16 unk48; - /* 0x4A */ s16 unk4A; - /* 0x4C */ s16 unk4C; - /* 0x4E */ s16 unk4E; - /* 0x50 */ f32 unk50; - /* 0x54 */ f32 unk54; - /* 0x58 */ f32 unk58; - /* 0x5C */ f32 unk5C; - /* 0x60 */ s16 unk60; - /* 0x62 */ s16 unk62; - /* 0x64 */ s16 unk64; - /* 0x66 */ s16 unk66; - /* 0x68 */ s16 unk68; - /* 0x6A */ u8 unk6A; - /* 0x6B */ u8 unk6B; - /* 0x6C */ f32 unk6C; - /* 0x70 */ f32 unk70; - /* 0x74 */ f32 unk74; - /* 0x78 */ f32 unk78; - /* 0x7C */ f32 unk7C; - /* 0x80 */ f32 unk80; - /* 0x84 */ f32 unk84; - /* 0x88 */ f32 unk88; + /* 0x00 */ f32 attention_offset; + /* 0x04 */ f32 gravity; + /* 0x08 */ f32 scale; + /* 0x0C */ f32 real_shadow_size; + /* 0x10 */ f32 weight; + /* 0x14 */ f32 height; + /* 0x18 */ f32 knee_length; + /* 0x1C */ f32 width; + /* 0x20 */ f32 body_angleX_max; + /* 0x24 */ f32 body_angleX_min; + /* 0x28 */ f32 body_angleY_max; + /* 0x2C */ f32 body_angleY_min; + /* 0x30 */ f32 head_angleX_max; + /* 0x34 */ f32 head_angleX_min; + /* 0x38 */ f32 head_angleY_max; + /* 0x3C */ f32 head_angleY_min; + /* 0x40 */ f32 neck_rotation_ratio; + /* 0x44 */ f32 morf_frame; + /* 0x48 */ s16 talk_distance; + /* 0x4A */ s16 talk_angle; + /* 0x4C */ s16 attention_distance; + /* 0x4E */ s16 attention_angle; + /* 0x50 */ f32 fov; + /* 0x54 */ f32 search_distance; + /* 0x58 */ f32 search_height; + /* 0x5C */ f32 search_depth; + /* 0x60 */ s16 attention_time; + /* 0x62 */ s16 damage_time; + /* 0x64 */ s16 face_expression; + /* 0x66 */ s16 motion; + /* 0x68 */ s16 look_mode; + /* 0x6A */ u8 debug_mode_ON; + /* 0x6B */ u8 debug_info_ON; + /* 0x6C */ f32 expression_morf_frame; + /* 0x70 */ f32 box_min_x; + /* 0x74 */ f32 box_min_y; + /* 0x78 */ f32 box_min_z; + /* 0x7C */ f32 box_max_x; + /* 0x80 */ f32 box_max_y; + /* 0x84 */ f32 box_max_z; + /* 0x88 */ f32 box_offset; +}; + +struct daNpcF_HIOParam { + /* 0x00 */ f32 attention_offset; + /* 0x04 */ f32 gravity; + /* 0x08 */ f32 scale; + /* 0x0C */ f32 real_shadow_size; + /* 0x10 */ f32 weight; + /* 0x14 */ f32 height; + /* 0x18 */ f32 knee_length; + /* 0x1C */ f32 width; + /* 0x20 */ f32 body_angleX_max; + /* 0x24 */ f32 body_angleX_min; + /* 0x28 */ f32 body_angleY_max; + /* 0x2C */ f32 body_angleY_min; + /* 0x30 */ f32 head_angleX_max; + /* 0x34 */ f32 head_angleX_min; + /* 0x38 */ f32 head_angleY_max; + /* 0x3C */ f32 head_angleY_min; + /* 0x40 */ f32 neck_rotation_ratio; + /* 0x44 */ f32 morf_frame; + /* 0x48 */ s16 talk_distance; + /* 0x4A */ s16 talk_angle; + /* 0x4C */ s16 attention_distance; + /* 0x4E */ s16 attention_angle; + /* 0x50 */ f32 fov; + /* 0x54 */ f32 search_distance; + /* 0x58 */ f32 search_height; + /* 0x5C */ f32 search_depth; + /* 0x60 */ s16 attention_time; + /* 0x62 */ s16 damage_time; + /* 0x64 */ s16 face_expression; + /* 0x66 */ s16 motion; + /* 0x68 */ s16 look_mode; + /* 0x6A */ u8 debug_mode_ON; + /* 0x6B */ u8 debug_info_ON; }; #endif /* D_A_D_A_NPC_H */ diff --git a/include/d/actor/d_a_npc_prayer.h b/include/d/actor/d_a_npc_prayer.h index 209538fbe1c..d5b145d2886 100644 --- a/include/d/actor/d_a_npc_prayer.h +++ b/include/d/actor/d_a_npc_prayer.h @@ -11,54 +11,78 @@ * @details * */ -class daNpcPray_c : public fopAc_ac_c { +class daNpcPray_c : public daNpcF_c { public: + typedef BOOL (daNpcPray_c::*EvtSeq)(int); + /* 80AB2DEC */ daNpcPray_c(); - /* 80AB3000 */ ~daNpcPray_c(); - /* 80AB3204 */ void Create(); - /* 80AB348C */ void CreateHeap(); - /* 80AB3610 */ void Delete(); - /* 80AB3644 */ void Execute(); - /* 80AB3668 */ void Draw(); - /* 80AB36A8 */ void ctrlJoint(J3DJoint*, J3DModel*); - /* 80AB3834 */ void createHeapCallBack(fopAc_ac_c*); - /* 80AB3854 */ void ctrlJointCallBack(J3DJoint*, int); - /* 80AB38A0 */ void setParam(); - /* 80AB390C */ void main(); - /* 80AB3964 */ void setAttnPos(); - /* 80AB3B0C */ bool setMotionAnm(int, f32); - /* 80AB3BDC */ void setMotion(int, f32, int); - /* 80AB3C24 */ bool drawDbgInfo(); + /* 80AB3204 */ int Create(); + /* 80AB348C */ int CreateHeap(); + /* 80AB3610 */ int Delete(); + /* 80AB3644 */ int Execute(); + /* 80AB3668 */ int Draw(); + /* 80AB36A8 */ int ctrlJoint(J3DJoint*, J3DModel*); + /* 80AB3834 */ static int createHeapCallBack(fopAc_ac_c*); + /* 80AB3854 */ static int ctrlJointCallBack(J3DJoint*, int); /* 80AB3C2C */ void reset(); /* 80AB3DBC */ void playMotion(); - /* 80AB3F54 */ void setAction(bool (daNpcPray_c::*)(void*)); + /* 80AB3F54 */ int setAction(bool (daNpcPray_c::*)(void*)); /* 80AB3FFC */ void setLookMode(int); /* 80AB4020 */ void lookat(); - /* 80AB4200 */ void step(s16, int); - /* 80AB42F4 */ void chkFindPlayer(); - /* 80AB43D8 */ void wait(void*); - /* 80AB4674 */ void fear(void*); - /* 80AB4740 */ void talk(void*); - /* 80AB498C */ void demo(void*); - /* 80AB4B20 */ void createHeart(); - /* 80AB4BFC */ void _Evt_GetHeart(int); - /* 80AB4CA4 */ void _Evt_GetHeart_CutInit(int const&); - /* 80AB4D34 */ void _Evt_GetHeart_CutMain(int const&); - /* 80AB5798 */ void adjustShapeAngle(); + /* 80AB4200 */ bool step(s16, int); + /* 80AB42F4 */ bool chkFindPlayer(); + /* 80AB43D8 */ bool wait(void*); + /* 80AB4674 */ bool fear(void*); + /* 80AB4740 */ bool talk(void*); + /* 80AB498C */ bool demo(void*); + /* 80AB4B20 */ fpc_ProcID createHeart(); + /* 80AB4BFC */ BOOL _Evt_GetHeart(int); + /* 80AB4CA4 */ BOOL _Evt_GetHeart_CutInit(int const&); + /* 80AB4D34 */ BOOL _Evt_GetHeart_CutMain(int const&); + + /* 80AB3000 */ virtual ~daNpcPray_c(); + /* 80AB38A0 */ virtual void setParam(); + /* 80AB390C */ virtual BOOL main(); + /* 80AB5798 */ virtual void adjustShapeAngle() {} + /* 80AB3964 */ virtual void setAttnPos(); + /* 80AB3B0C */ virtual void setMotionAnm(int, f32); + /* 80AB3BDC */ virtual void setMotion(int, f32, int); + /* 80AB3C24 */ virtual BOOL drawDbgInfo(); - static u8 mEvtSeqList[24]; + s16 getMessageNo() { return (fopAcM_GetParam(this) >> 8) & 0xFFFF; } + + static EvtSeq mEvtSeqList[]; private: - /* 0x568 */ u8 field_0x568[0xe10 - 0x568]; + /* 0xB48 */ Z2CreatureCitizen mSound; + /* 0xBEC */ u8 field_0xBEC[0xBF0 - 0xBEC]; + /* 0xBF0 */ daNpcF_Lookat_c mLookat; + /* 0xC8C */ daNpcF_ActorMngr_c mActorMngr[2]; + /* 0xC9C */ u8 field_0xC9C[0xCA0 - 0xC9C]; + /* 0xCA0 */ dCcD_Cyl mCcCyl; + /* 0xDDC */ bool (daNpcPray_c::*mAction)(void*); + /* 0xDE8 */ request_of_phase_process_class mPhase[2]; + /* 0xDF8 */ int field_0xdf8; + /* 0xDFC */ int field_0xdfc; + /* 0xE00 */ int field_0xe00; + /* 0xE04 */ int mMessageNo; + /* 0xE08 */ s16 mLookMode; + /* 0xE0A */ s16 field_0xe0a; + /* 0xE0C */ u16 mActionMode; + /* 0xE0E */ u8 field_0xe0e; }; STATIC_ASSERT(sizeof(daNpcPray_c) == 0xe10); +struct daNpcPray_HIOParam { + daNpcF_HIOParam common; +}; + class daNpcPray_Param_c { public: - /* 80AB579C */ ~daNpcPray_Param_c(); + /* 80AB579C */ virtual ~daNpcPray_Param_c() {} - static u8 const m[108]; + static const daNpcPray_HIOParam m; }; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index fdb405735b6..d3ea759835e 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -418,6 +418,10 @@ inline void fopAcM_SetHomePosition(fopAc_ac_c* i_actor, f32 x, f32 y, f32 z) { i_actor->home.pos.set(x, y, z); } +inline void fopAcM_SetAngle(fopAc_ac_c* i_actor, s16 x, s16 y, s16 z) { + i_actor->current.angle.set(x, y, z); +} + inline void dComIfGs_onSwitch(int i_no, int i_roomNo); inline void dComIfGs_offSwitch(int i_no, int i_roomNo); inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo); diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index 2f2d4bda94b..5568e6fc694 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -1977,97 +1977,19 @@ void daNpcF_clearMessageTmpBit() { daNpcF_offTmpBit(0x37); } -/* 80155B54-80155BB4 150494 0060+00 1/0 0/0 0/0 .text __dt__20daNpcF_MoveBgActor_cFv */ -daNpcF_MoveBgActor_c::~daNpcF_MoveBgActor_c() {} - -/* 80155BB8-80155BBC 1504F8 0004+00 2/0 0/0 0/0 .text setAttnPos__8daNpcF_cFv */ -void daNpcF_c::setAttnPos() {} - -/* 80155BC0-80155BC8 150500 0008+00 2/0 0/0 0/0 .text main__8daNpcF_cFv */ -BOOL daNpcF_c::main() { - return true; +// TODO: dummy to generate weak functions, proper fix later +static void dummyVirtual(daNpcF_MoveBgActor_c* dummy) { + dummy->~daNpcF_MoveBgActor_c(); + dummy->CreateHeap(); + dummy->Create(); + dummy->Execute(NULL); + dummy->Draw(); + dummy->Delete(); + dummy->IsDelete(); + dummy->ToFore(); + dummy->ToBack(); } -/* 80155BC8-80155BCC 150508 0004+00 2/0 0/0 0/0 .text setParam__8daNpcF_cFv */ -void daNpcF_c::setParam() {} - -/* 80155BD0-80155BD8 150510 0008+00 2/0 0/0 0/0 .text drawDbgInfo__8daNpcF_cFv */ -BOOL daNpcF_c::drawDbgInfo() { - return true; -} - -/* 80155BD8-80155BE0 150518 0008+00 2/0 0/0 0/0 .text ctrlBtk__8daNpcF_cFv */ -BOOL daNpcF_c::ctrlBtk() { - return false; -} - -/* 80155BE0-80155BE8 150520 0008+00 2/0 0/0 0/0 .text setExpressionAnm__8daNpcF_cFib */ -bool daNpcF_c::setExpressionAnm(int param_0, bool param_1) { - return true; -} - -/* 80155BE8-80155BEC 150528 0004+00 2/0 0/0 0/0 .text setMotionAnm__8daNpcF_cFif */ -void daNpcF_c::setMotionAnm(int param_0, f32 param_1) {} - -/* 80155BEC-80155BF0 15052C 0004+00 2/0 0/0 0/0 .text setMotion__8daNpcF_cFifi */ -void daNpcF_c::setMotion(int param_0, f32 param_1, int param_2) {} - -/* 80155BF0-80155BF4 150530 0004+00 2/0 0/0 0/0 .text setExpression__8daNpcF_cFif */ -void daNpcF_c::setExpression(int param_0, f32 param_1) {} - -/* 80155E88-80155E90 1507C8 0008+00 1/0 0/0 0/0 .text CreateHeap__20daNpcF_MoveBgActor_cFv */ -bool daNpcF_MoveBgActor_c::CreateHeap() { - return true; -} - -/* 80155E90-80155E98 1507D0 0008+00 1/0 0/0 0/0 .text Create__20daNpcF_MoveBgActor_cFv */ -bool daNpcF_MoveBgActor_c::Create() { - return true; -} - -/* 80155E98-80155EA0 1507D8 0008+00 1/0 0/0 0/0 .text Delete__20daNpcF_MoveBgActor_cFv */ -bool daNpcF_MoveBgActor_c::Delete() { - return true; -} - -/* 80155EA0-80155EA8 1507E0 0008+00 1/0 0/0 0/0 .text Execute__20daNpcF_MoveBgActor_cFPPA3_A4_f */ -bool daNpcF_MoveBgActor_c::Execute(f32 (**param_0)[3][4]) { - return true; -} - -/* 80155EA8-80155EB0 1507E8 0008+00 1/0 0/0 0/0 .text Draw__20daNpcF_MoveBgActor_cFv */ -bool daNpcF_MoveBgActor_c::Draw() { - return true; -} - -/* 80155EB0-80155EB8 1507F0 0008+00 1/0 0/0 0/0 .text IsDelete__20daNpcF_MoveBgActor_cFv - */ -bool daNpcF_MoveBgActor_c::IsDelete() { - return true; -} - -/* 80155EB8-80155EC0 1507F8 0008+00 1/0 0/0 0/0 .text ToFore__20daNpcF_MoveBgActor_cFv */ -bool daNpcF_MoveBgActor_c::ToFore() { - return true; -} - -/* 80155EC0-80155EC8 150800 0008+00 1/0 0/0 0/0 .text ToBack__20daNpcF_MoveBgActor_cFv */ -bool daNpcF_MoveBgActor_c::ToBack() { - return true; -} - -/* 80155EC8-80155ED0 150808 0008+00 2/0 0/0 0/0 .text setExpressionBtp__8daNpcF_cFi */ -bool daNpcF_c::setExpressionBtp(int param_0) { - return true; -} - -/* 80155ED0-80155FB0 150810 00E0+00 1/0 0/0 0/0 .text __dt__15daNpcF_MatAnm_cFv */ -daNpcF_MatAnm_c::~daNpcF_MatAnm_c() {} - -/* 80155FB0-80156010 1508F0 0060+00 1/0 0/0 0/0 .text __dt__23daBaseNpc_moveBgActor_cFv - */ -daBaseNpc_moveBgActor_c::~daBaseNpc_moveBgActor_c() {} - /* 803926B0-803926E0 01ED10 0030+00 0/0 0/0 0/0 .rodata mCcDObj__11daBaseNpc_c */ dCcD_SrcGObjInf const daBaseNpc_c::mCcDObj = { {0, {{0, 0, 0}, {0x0, 0x0}, {0x79}}}, diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index 0da24a8eb98..b3e8cdd76d0 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -4,349 +4,872 @@ */ #include "d/actor/d_a_npc_prayer.h" -#include "dol2asm.h" +#include "d/d_com_inf_game.h" -// -// Forward References: -// +UNK_REL_DATA -extern "C" void __ct__11daNpcPray_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__11daNpcPray_cFv(); -extern "C" void Create__11daNpcPray_cFv(); -extern "C" void CreateHeap__11daNpcPray_cFv(); -extern "C" void Delete__11daNpcPray_cFv(); -extern "C" void Execute__11daNpcPray_cFv(); -extern "C" void Draw__11daNpcPray_cFv(); -extern "C" void ctrlJoint__11daNpcPray_cFP8J3DJointP8J3DModel(); -extern "C" void createHeapCallBack__11daNpcPray_cFP10fopAc_ac_c(); -extern "C" void ctrlJointCallBack__11daNpcPray_cFP8J3DJointi(); -extern "C" void setParam__11daNpcPray_cFv(); -extern "C" void main__11daNpcPray_cFv(); -extern "C" void setAttnPos__11daNpcPray_cFv(); -extern "C" void setMotionAnm__11daNpcPray_cFif(); -extern "C" void setMotion__11daNpcPray_cFifi(); -extern "C" bool drawDbgInfo__11daNpcPray_cFv(); -extern "C" void reset__11daNpcPray_cFv(); -extern "C" void playMotion__11daNpcPray_cFv(); -extern "C" void setAction__11daNpcPray_cFM11daNpcPray_cFPCvPvPv_b(); -extern "C" void setLookMode__11daNpcPray_cFi(); -extern "C" void lookat__11daNpcPray_cFv(); -extern "C" void step__11daNpcPray_cFsi(); -extern "C" void chkFindPlayer__11daNpcPray_cFv(); -extern "C" void wait__11daNpcPray_cFPv(); -extern "C" void fear__11daNpcPray_cFPv(); -extern "C" void talk__11daNpcPray_cFPv(); -extern "C" void demo__11daNpcPray_cFPv(); -extern "C" void createHeart__11daNpcPray_cFv(); -extern "C" void _Evt_GetHeart__11daNpcPray_cFi(); -extern "C" void _Evt_GetHeart_CutInit__11daNpcPray_cFRCi(); -extern "C" void _Evt_GetHeart_CutMain__11daNpcPray_cFRCi(); -extern "C" static void daNpcPray_Create__FPv(); -extern "C" static void daNpcPray_Delete__FPv(); -extern "C" static void daNpcPray_Execute__FPv(); -extern "C" static void daNpcPray_Draw__FPv(); -extern "C" static bool daNpcPray_IsDelete__FPv(); -extern "C" void __dt__18daNpcF_ActorMngr_cFv(); -extern "C" void __ct__18daNpcF_ActorMngr_cFv(); -extern "C" void __dt__15daNpcF_Lookat_cFv(); -extern "C" void __dt__5csXyzFv(); -extern "C" void __ct__5csXyzFv(); -extern "C" void __dt__4cXyzFv(); -extern "C" void __ct__4cXyzFv(); -extern "C" void __dt__8daNpcF_cFv(); -extern "C" void __ct__8daNpcF_cFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" bool ctrlBtk__8daNpcF_cFv(); -extern "C" void setCollisions__8daNpcF_cFv(); -extern "C" bool setExpressionAnm__8daNpcF_cFib(); -extern "C" bool setExpressionBtp__8daNpcF_cFi(); -extern "C" void setExpression__8daNpcF_cFif(); -extern "C" void drawOtherMdls__8daNpcF_cFv(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __sinit_d_a_npc_prayer_cpp(); -extern "C" void adjustShapeAngle__11daNpcPray_cFv(); -extern "C" void __dt__17daNpcPray_Param_cFv(); -extern "C" static void func_80AB57E4(); -extern "C" static void func_80AB57EC(); -extern "C" u8 const m__17daNpcPray_Param_c[108]; -extern "C" extern char const* const d_a_npc_prayer__stringBase0; -extern "C" u8 mEvtSeqList__11daNpcPray_c[24]; - -// -// External References: -// - -extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void -__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl(); -extern "C" void stopZelAnime__16mDoExt_McaMorfSOFv(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(); -extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_createItemForBoss__FPC4cXyziiPC5csXyzPC4cXyzffi(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void onSwitch__12dSv_danBit_cFi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void ChkPresentEnd__16dEvent_manager_cFv(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void __ct__11dBgS_GndChkFv(); -extern "C" void __dt__11dBgS_GndChkFv(); -extern "C" void __ct__11dBgS_LinChkFv(); -extern "C" void __dt__11dBgS_LinChkFv(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void initialize__18daNpcF_ActorMngr_cFv(); -extern "C" void entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c(); -extern "C" void entry__18daNpcF_ActorMngr_cFUi(); -extern "C" void remove__18daNpcF_ActorMngr_cFv(); -extern "C" void getActorP__18daNpcF_ActorMngr_cFv(); -extern "C" void initialize__15daNpcF_Lookat_cFv(); -extern "C" void setParam__15daNpcF_Lookat_cFffffffffffffsP4cXyz(); -extern "C" void calc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fPP5csXyziii(); -extern "C" void execute__8daNpcF_cFv(); -extern "C" void draw__8daNpcF_cFiifP11_GXColorS10i(); -extern "C" void setMtx__8daNpcF_cFv(); -extern "C" void setMtx2__8daNpcF_cFv(); -extern "C" void initialize__8daNpcF_cFv(); -extern "C" void getTrnsfrmKeyAnmP__8daNpcF_cFPci(); -extern "C" void setMcaMorfAnm__8daNpcF_cFP18J3DAnmTransformKeyffiii(); -extern "C" void setEnvTevColor__8daNpcF_cFv(); -extern "C" void setRoomNo__8daNpcF_cFv(); -extern "C" void playMotionAnm__8daNpcF_cFPPPQ28daNpcF_c18daNpcF_anmPlayData(); -extern "C" void setLookatMtx__8daNpcF_cFiPif(); -extern "C" void ctrlMsgAnm__8daNpcF_cFRiRiP10fopAc_ac_ci(); -extern "C" void orderEvent__8daNpcF_cFiPcUsUsUcUs(); -extern "C" void changeEvent__8daNpcF_cFPcPcUsUs(); -extern "C" void chkActorInSight__8daNpcF_cFP10fopAc_ac_cf(); -extern "C" void chkActorInAttnArea__8daNpcF_cFP10fopAc_ac_cP10fopAc_ac_ci(); -extern "C" void initTalk__8daNpcF_cFiPP10fopAc_ac_c(); -extern "C" void talkProc__8daNpcF_cFPiiPP10fopAc_ac_c(); -extern "C" void turn__8daNpcF_cFsfi(); -extern "C" void getDistTableIdx__8daNpcF_cFii(); -extern "C" void daNpcF_onEvtBit__FUl(); -extern "C" void dKy_darkworld_check__Fv(); -extern "C" void __ct__10dMsgFlow_cFv(); -extern "C" void __dt__10dMsgFlow_cFv(); -extern "C" void getEventId__10dMsgFlow_cFPi(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __ct__5csXyzFsss(); -extern "C" void __ct__11cBgS_GndChkFv(); -extern "C" void __dt__11cBgS_GndChkFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); -extern "C" void cLib_targetAngleX__FPC4cXyzPC4cXyz(); -extern "C" void __ct__17Z2CreatureCitizenFv(); -extern "C" void __dt__17Z2CreatureCitizenFv(); -extern "C" void init__17Z2CreatureCitizenFP3VecP3VecUcUc(); -extern "C" void setMdlType__17Z2CreatureCitizenFScbb(); -extern "C" void playVoice__17Z2CreatureCitizenFi(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void __destroy_arr(); -extern "C" void __construct_array(); -extern "C" void __ptmf_test(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mCurrentMtx__6J3DSys[48]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80AB5964-80AB5964 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80AB5964 = "Prayer"; -SECTION_DEAD static char const* const stringBase_80AB596B = "Wgeneral"; -SECTION_DEAD static char const* const stringBase_80AB5974 = "GET_HEART"; -#pragma pop - -/* 80AB5984-80AB5990 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AB5990-80AB59A4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop +/* 80AB5BB4-80AB5BB8 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ +static daNpcPray_Param_c l_HIO; /* 80AB59A4-80AB59EC 000020 0048+00 1/1 0/0 0/0 .data l_bckGetParamList */ -SECTION_DATA static u8 l_bckGetParamList[72] = { - 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, - 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, - 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, +static struct { + int resIdx; + int anmMode; + int arcnameIdx; +} l_bckGetParamList[] = { + {5, 0, 0}, // pray + {6, 0, 0}, // pray talk + {31, 2, 1}, // wait_a + {25, 0, 1}, // talk a + {26, 2, 1}, // talk b + {30, 2, 1}, // to wolf +}; + +enum daNpcPray_MOTION_e { + MOTION_WAIT_e, + MOTION_PRAY_e, + MOTION_PRAYTALK_e, + MOTION_WOLF_e, }; /* 80AB59EC-80AB59F4 -00001 0008+00 4/5 0/0 0/0 .data l_arcNames */ -SECTION_DATA static void* l_arcNames[2] = { - (void*)&d_a_npc_prayer__stringBase0, - (void*)(((char*)&d_a_npc_prayer__stringBase0) + 0x7), +static char* l_arcNames[2] = { + "Prayer", + "Wgeneral", }; /* 80AB59F4-80AB59FC -00001 0008+00 0/2 0/0 0/0 .data l_evtNames */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_evtNames[2] = { - (void*)NULL, - (void*)(((char*)&d_a_npc_prayer__stringBase0) + 0x10), +static char* l_evtNames[2] = { + NULL, + "GET_HEART", }; -#pragma pop /* 80AB59FC-80AB5A00 -00001 0004+00 0/2 0/0 0/0 .data l_myName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_myName = (void*)&d_a_npc_prayer__stringBase0; -#pragma pop - -/* 80AB5A00-80AB5A0C -00001 000C+00 1/1 0/0 0/0 .data @3804 */ -SECTION_DATA static void* lit_3804[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)_Evt_GetHeart__11daNpcPray_cFi, -}; +static char* l_myName = "Prayer"; /* 80AB5A0C-80AB5A24 000088 0018+00 1/2 0/0 0/0 .data mEvtSeqList__11daNpcPray_c */ -SECTION_DATA u8 daNpcPray_c::mEvtSeqList[24] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +daNpcPray_c::EvtSeq daNpcPray_c::mEvtSeqList[] = { + NULL, + &daNpcPray_c::_Evt_GetHeart, }; -/* 80AB5A24-80AB5A30 -00001 000C+00 1/1 0/0 0/0 .data @4425 */ -SECTION_DATA static void* lit_4425[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait__11daNpcPray_cFPv, +/* 80AB2DEC-80AB2F70 0000EC 0184+00 1/1 0/0 0/0 .text __ct__11daNpcPray_cFv */ +daNpcPray_c::daNpcPray_c() {} + +/* 80AB3000-80AB3204 000300 0204+00 1/0 0/0 0/0 .text __dt__11daNpcPray_cFv */ +daNpcPray_c::~daNpcPray_c() { + for (int i = 0; i < 2; i++) { + dComIfG_resDelete(&mPhase[i], l_arcNames[i]); + } + + fopAc_ac_c* actor = mActorMngr[1].getActorP(); + if (actor != NULL) { + fopAcM_delete(actor); + mActorMngr[1].remove(); + } + + if (heap != NULL) { + mpMorf->stopZelAnime(); + } +} + +/* 80AB5808-80AB5874 000000 006C+00 14/14 0/0 0/0 .rodata m__17daNpcPray_Param_c */ +const daNpcPray_HIOParam daNpcPray_Param_c::m = { + 55.0f, + -3.0f, + 1.0f, + 500.0f, + 255.0f, + 140.0f, + 35.0f, + 30.0f, + 0.0f, + 0.0f, + 10.0f, + -10.0f, + 30.0f, + -10.0f, + 45.0f, + -45.0f, + 0.6f, + 12.0f, + 2, + 6, + 3, + 6, + 60.0f, + 500.0f, + 300.0f, + -300.0f, + 60, + 0, + 0, + 0, + 0, + false, + false, }; -/* 80AB5A30-80AB5A3C -00001 000C+00 0/1 0/0 0/0 .data @4611 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4611[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)talk__11daNpcPray_cFPv, -}; -#pragma pop +/* 80AB3204-80AB348C 000504 0288+00 1/1 0/0 0/0 .text Create__11daNpcPray_cFv */ +int daNpcPray_c::Create() { + fopAcM_SetupActor(this, daNpcPray_c); -/* 80AB5A3C-80AB5A48 -00001 000C+00 0/1 0/0 0/0 .data @4616 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4616[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)demo__11daNpcPray_cFPv, -}; -#pragma pop + mMessageNo = getMessageNo(); -/* 80AB5A48-80AB5A54 -00001 000C+00 0/1 0/0 0/0 .data @4623 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4623[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)fear__11daNpcPray_cFPv, -}; -#pragma pop + int phase_state = cPhs_ERROR_e; + for (int i = 0; i < 2; i++) { + phase_state = dComIfG_resLoad(&mPhase[i], l_arcNames[i]); + if (phase_state != cPhs_COMPLEATE_e) { + return phase_state; + } + } -/* 80AB5A54-80AB5A60 -00001 000C+00 0/1 0/0 0/0 .data @4682 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4682[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)demo__11daNpcPray_cFPv, -}; -#pragma pop + if (phase_state == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x1980)) { + return cPhs_ERROR_e; + } -/* 80AB5A60-80AB5A6C -00001 000C+00 0/1 0/0 0/0 .data @4684 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4684[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait__11daNpcPray_cFPv, -}; -#pragma pop + J3DModelData* modelData = mpMorf->getModel()->getModelData(); + fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_setCullSizeBox(this, -60.0f, -10.0f, -60.0f, 60.0f, 220.0f, 60.0f); -/* 80AB5A6C-80AB5A78 -00001 000C+00 0/1 0/0 0/0 .data @4732 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4732[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait__11daNpcPray_cFPv, -}; -#pragma pop + mSound.init(¤t.pos, &eyePos, 3, 1); + mSound.setMdlType(25, 0, 0); + + mAcchCir.SetWall(daNpcPray_Param_c::m.common.width, daNpcPray_Param_c::m.common.knee_length); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); + mAcch.CrrPos(dComIfG_Bgsp()); + + mCcStts.Init(daNpcPray_Param_c::m.common.weight, 0, this); + mCcCyl.Set(mCcDCyl); + mCcCyl.SetStts(&mCcStts); + mCcCyl.SetTgType(0); + mCcCyl.SetTgSPrm(0); + mCcCyl.SetH(daNpcPray_Param_c::m.common.height); + mCcCyl.SetR(daNpcPray_Param_c::m.common.width); + + mGndChk = mAcch.m_gnd; + mGroundH = mAcch.GetGroundH(); + + setEnvTevColor(); + setRoomNo(); + reset(); + Execute(); + } + + return phase_state; +} + +/* 80AB348C-80AB3610 00078C 0184+00 1/1 0/0 0/0 .text CreateHeap__11daNpcPray_cFv */ +int daNpcPray_c::CreateHeap() { + J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 9); + JUT_ASSERT(313, 0 != mdlData_p); + + mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + if (mpMorf != NULL && mpMorf->getModel() == NULL) { + mpMorf->stopZelAnime(); + mpMorf = NULL; + } + + if (mpMorf == NULL) { + return 0; + } + + cXyz scale(1.0f, 1.0999999f, 1.0f); + mpMorf->offTranslate(); + mpMorf->setTranslateScale(scale); + + J3DModel* model_p = mpMorf->getModel(); + for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { + mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); + } + + model_p->setUserArea((u32)this); + setMotion(MOTION_WAIT_e, -1.0f, 0); + return 1; +} + +/* 80AB3610-80AB3644 000910 0034+00 1/1 0/0 0/0 .text Delete__11daNpcPray_cFv */ +int daNpcPray_c::Delete() { + fopAcM_GetID(this); + this->~daNpcPray_c(); + return 1; +} + +/* 80AB3644-80AB3668 000944 0024+00 2/2 0/0 0/0 .text Execute__11daNpcPray_cFv */ +int daNpcPray_c::Execute() { + execute(); + return 1; +} + +/* 80AB3668-80AB36A8 000968 0040+00 1/1 0/0 0/0 .text Draw__11daNpcPray_cFv */ +int daNpcPray_c::Draw() { + draw(FALSE, FALSE, daNpcPray_Param_c::m.common.real_shadow_size, NULL, FALSE); + return 1; +} + +/* 80AB36A8-80AB3834 0009A8 018C+00 1/1 0/0 0/0 .text + * ctrlJoint__11daNpcPray_cFP8J3DJointP8J3DModel */ +int daNpcPray_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { + int jnt_no = i_joint->getJntNo(); + int spC[] = {1, 2, 3}; + + if (jnt_no == 0) { + mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::multVecZero(&mLookatPos[0]); + + mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); + mDoMtx_stack_c::multVecZero(&mLookatPos[1]); + + mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::multVecZero(&mLookatPos[2]); + } + + mDoMtx_stack_c::copy(i_model->getAnmMtx(jnt_no)); + + switch (jnt_no) { + case 1: + case 2: + case 3: + setLookatMtx(jnt_no, spC, daNpcPray_Param_c::m.common.neck_rotation_ratio); + break; + } + + i_model->setAnmMtx(jnt_no, mDoMtx_stack_c::get()); + cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + return 1; +} + +/* 80AB3834-80AB3854 000B34 0020+00 1/1 0/0 0/0 .text + * createHeapCallBack__11daNpcPray_cFP10fopAc_ac_c */ +int daNpcPray_c::createHeapCallBack(fopAc_ac_c* i_this) { + return ((daNpcPray_c*)i_this)->CreateHeap(); +} + +/* 80AB3854-80AB38A0 000B54 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpcPray_cFP8J3DJointi + */ +int daNpcPray_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { + if (param_1 == 0) { + J3DModel* model_p = j3dSys.getModel(); + daNpcPray_c* a_this = (daNpcPray_c*)model_p->getUserArea(); + if (a_this != NULL) { + a_this->ctrlJoint(i_joint, model_p); + } + } + + return 1; +} + +/* 80AB38A0-80AB390C 000BA0 006C+00 1/0 0/0 0/0 .text setParam__11daNpcPray_cFv */ +void daNpcPray_c::setParam() { + attention_info.distances[fopAc_attn_LOCK_e] = getDistTableIdx(daNpcPray_Param_c::m.common.attention_distance, daNpcPray_Param_c::m.common.attention_angle); + attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e]; + attention_info.distances[fopAc_attn_SPEAK_e] = getDistTableIdx(daNpcPray_Param_c::m.common.talk_distance, daNpcPray_Param_c::m.common.talk_angle); + attention_info.flags = 0xA; + +#if VERSION == VERSION_SHIELD_DEBUG + scale.set(daNpcPray_Param_c::m.common.scale, daNpcPray_Param_c::m.common.scale, daNpcPray_Param_c::m.common.scale); + mAcchCir.SetWallR(daNpcPray_Param_c::m.common.width); + mAcchCir.SetWallH(daNpcPray_Param_c::m.common.knee_length); + gravity = daNpcPray_Param_c::m.common.gravity; +#endif +} + +/* 80AB390C-80AB3964 000C0C 0058+00 1/0 0/0 0/0 .text main__11daNpcPray_cFv */ +BOOL daNpcPray_c::main() { + if (mAction != NULL) { + (this->*mAction)(NULL); + } + + playMotion(); + return FALSE; +} + +/* 80AB3964-80AB3B0C 000C64 01A8+00 1/0 0/0 0/0 .text setAttnPos__11daNpcPray_cFv */ +void daNpcPray_c::setAttnPos() { + if (mLookMode == LOOK_RESET) { + for (int i = 0; i < 3; i++) { + mLookatAngle[i].setall(0); + } + } + + daNpcF_c::setMtx(); + lookat(); + + cXyz sp14(10.0f, 15.0f, 0.0f); + + mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::multVecZero(&mHeadPos); + mDoMtx_stack_c::multVec(&sp14, &eyePos); + sp14.x = 0.0f; + mDoMtx_stack_c::multVec(&sp14, &sp14); + + mHeadAngle.x = cLib_targetAngleX(&mHeadPos, &sp14); + mHeadAngle.y = cLib_targetAngleY(&mHeadPos, &sp14); + attention_info.position.set(mHeadPos.x, mHeadPos.y + daNpcPray_Param_c::m.common.attention_offset, mHeadPos.z); + + cXyz cyl_center; + mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::multVecZero(&cyl_center); + cyl_center.y = current.pos.y; + + mCcCyl.SetC(cyl_center); +#if VERSION == VERSION_SHIELD_DEBUG + mCcCyl.SetH(daNpcPray_Param_c::m.common.height); + mCcCyl.SetR(daNpcPray_Param_c::m.common.width); +#endif + dComIfG_Ccsp()->Set(&mCcCyl); +} + +/* 80AB3B0C-80AB3BDC 000E0C 00D0+00 1/0 0/0 0/0 .text setMotionAnm__11daNpcPray_cFif */ +void daNpcPray_c::setMotionAnm(int i_idx, f32 i_morf) { + J3DAnmTransformKey* bck_p = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_idx].arcnameIdx], l_bckGetParamList[i_idx].resIdx); + int anmMode = l_bckGetParamList[i_idx].anmMode; + mAnmFlags &= ~(ANM_PLAY_MORF | ANM_PAUSE_MORF); + + if (bck_p != NULL && setMcaMorfAnm(bck_p, 1.0f, i_morf, anmMode, 0, -1)) { + mAnmFlags |= (ANM_PLAY_MORF | ANM_PAUSE_MORF); + mMotionLoops = 0; + } +} + +/* 80AB3BDC-80AB3C24 000EDC 0048+00 1/0 0/0 0/0 .text setMotion__11daNpcPray_cFifi */ +void daNpcPray_c::setMotion(int i_motion, f32 i_morf, int param_2) { + s16 var_r31 = i_motion; + if ((param_2 != 0 || mMotion != var_r31) && i_motion >= 0 && i_motion < 4) { + mMotion = var_r31; + mMotionMorfOverride = i_morf; + mMotionPrevPhase = -1; + mMotionPhase = 0; + field_0xe0a = 0; + } +} + +/* 80AB3C24-80AB3C2C 000F24 0008+00 1/0 0/0 0/0 .text drawDbgInfo__11daNpcPray_cFv */ +BOOL daNpcPray_c::drawDbgInfo() { + return false; +} + +/* 80AB3C2C-80AB3DBC 000F2C 0190+00 1/1 0/0 0/0 .text reset__11daNpcPray_cFv */ +void daNpcPray_c::reset() { + initialize(); + mLookat.initialize(); + + for (int i = 0; i < 2; i++) { + mActorMngr[i].initialize(); + } + + field_0xdfc = 0; + field_0xe00 = 0; + mAction = NULL; + mLookMode = -1; + mActionMode = 0; + + current.pos.set(home.pos); + old.pos.set(current.pos); + current.angle.set(0, home.angle.y, 0); + + old.angle = current.angle; + shape_angle = current.angle; + mCurAngle = current.angle; + mOldAngle = mCurAngle; + + speedF = 0.0f; + speed.setall(0.0f); + field_0xdf8 = -1; + mOrderEvtNo = 0; + + setAction(&daNpcPray_c::wait); + mMotionMorfOverride = 0.0f; +} + +/* 80AB3DBC-80AB3F54 0010BC 0198+00 1/1 0/0 0/0 .text playMotion__11daNpcPray_cFv */ +void daNpcPray_c::playMotion() { + daNpcF_anmPlayData wait_phase1 = {2, daNpcPray_Param_c::m.common.morf_frame, 0}; + daNpcF_anmPlayData* wait_m[] = {&wait_phase1}; + + daNpcF_anmPlayData pray_phase1 = {0, daNpcPray_Param_c::m.common.morf_frame, 1}; + daNpcF_anmPlayData pray_phase2 = {2, daNpcPray_Param_c::m.common.morf_frame, 0}; + daNpcF_anmPlayData* pray_m[] = {&pray_phase1, &pray_phase2}; + + daNpcF_anmPlayData praytalk_phase1 = {1, daNpcPray_Param_c::m.common.morf_frame, 1}; + daNpcF_anmPlayData praytalk_phase2 = {2, daNpcPray_Param_c::m.common.morf_frame, 0}; + daNpcF_anmPlayData* praytalk_m[] = {&praytalk_phase1, &praytalk_phase2}; + + daNpcF_anmPlayData wolf_phase1 = {5, daNpcPray_Param_c::m.common.morf_frame, 0}; + daNpcF_anmPlayData* wolf_m[] = {&wolf_phase1}; + + daNpcF_anmPlayData** anmData_p[] = {wait_m, pray_m, praytalk_m, wolf_m}; + + if (mMotion >= 0 && mMotion < 4) { + field_0xe0a = mMotionPhase; + playMotionAnm(anmData_p); + } +} + +/* 80AB3F54-80AB3FFC 001254 00A8+00 4/4 0/0 0/0 .text + * setAction__11daNpcPray_cFM11daNpcPray_cFPCvPvPv_b */ +int daNpcPray_c::setAction(bool (daNpcPray_c::*i_action)(void*)) { + mActionMode = 3; + if (mAction != NULL) { + (this->*mAction)(NULL); + } + + mActionMode = 0; + mAction = i_action; + + if (mAction != NULL) { + (this->*mAction)(NULL); + } + + return 1; +} + +/* 80AB3FFC-80AB4020 0012FC 0024+00 2/2 0/0 0/0 .text setLookMode__11daNpcPray_cFi */ +void daNpcPray_c::setLookMode(int i_mode) { + if (i_mode >= 0 && i_mode < 4 && i_mode != mLookMode) { + mLookMode = i_mode; + } +} + +/* 80AB4020-80AB4200 001320 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcPray_cFv */ +void daNpcPray_c::lookat() { + daPy_py_c* player = NULL; + J3DModel* model_p = mpMorf->getModel(); + + int var_r28 = 0; + f32 body_angleX_min = daNpcPray_Param_c::m.common.body_angleX_min; + f32 body_angleX_max = daNpcPray_Param_c::m.common.body_angleX_max; + f32 body_angleY_min = daNpcPray_Param_c::m.common.body_angleY_min; + f32 body_angleY_max = daNpcPray_Param_c::m.common.body_angleY_max; + f32 head_angleX_min = daNpcPray_Param_c::m.common.head_angleX_min; + f32 head_angleX_max = daNpcPray_Param_c::m.common.head_angleX_max; + f32 head_angleY_min = daNpcPray_Param_c::m.common.head_angleY_min; + f32 head_angleY_max = daNpcPray_Param_c::m.common.head_angleY_max; + + s16 temp_r26 = mCurAngle.y - mOldAngle.y; + cXyz sp30[] = {mLookatPos[0], mLookatPos[1], mLookatPos[2]}; + csXyz* sp24[] = {&mLookatAngle[0], &mLookatAngle[1], &mLookatAngle[2]}; + + cXyz sp18; + switch (mLookMode) { + case LOOK_NONE: + break; + case LOOK_RESET: + var_r28 = 1; + break; + case LOOK_PLAYER: + case LOOK_PLAYER_TALK: + player = daPy_getPlayerActorClass(); + if (mLookMode == LOOK_PLAYER_TALK) { + head_angleY_min = -80.0f; + head_angleY_max = 80.0f; + } + break; + } + + if (player != NULL) { + mLookPos = player->attention_info.position; + if (mLookMode != LOOK_PLAYER && mLookMode != LOOK_PLAYER_TALK) { + mLookPos.y -= 40.0f; + } + mLookat.setAttnPos(&mLookPos); + } else { + mLookat.setAttnPos(NULL); + } + + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, + 0.0f, 0.0f, 0.0f, 0.0f, + head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, + mCurAngle.y, sp30); + mLookat.calc(this, model_p->getBaseTRMtx(), sp24, var_r28, temp_r26, 0); +} + +/* 80AB4200-80AB42F4 001500 00F4+00 2/2 0/0 0/0 .text step__11daNpcPray_cFsi */ +bool daNpcPray_c::step(s16 i_targetAngle, int) { + if (mTurnMode == 0) { + mTurnTargetAngle = i_targetAngle; + mTurnAmount = 0; + if (mCurAngle.y == mTurnTargetAngle) { + mTurnMode++; + } + + current.angle.y = mCurAngle.y; + shape_angle.y = current.angle.y; + mTurnMode++; + } else if (mTurnMode == 1) { + if (turn(mTurnTargetAngle, 15.0f, 0)) { + shape_angle.y = current.angle.y; + mCurAngle.y = current.angle.y; + mOldAngle.y = current.angle.y; + mTurnMode++; + } else { + shape_angle.y = current.angle.y; + mCurAngle.y = current.angle.y; + } + } + + return mTurnMode > 1; +} + +/* 80AB42F4-80AB43D8 0015F4 00E4+00 1/1 0/0 0/0 .text chkFindPlayer__11daNpcPray_cFv */ +bool daNpcPray_c::chkFindPlayer() { + if (!chkActorInSight(daPy_getPlayerActorClass(), daNpcPray_Param_c::m.common.fov)) { + mActorMngr[0].remove(); + return 0; + } + + bool find_player; + if (mActorMngr[0].getActorP() == NULL) { + find_player = chkPlayerInSpeakArea(this); + } else { + find_player = chkPlayerInTalkArea(this); + } + + if (find_player) { + mActorMngr[0].entry(daPy_getPlayerActorClass()); + } else { + mActorMngr[0].remove(); + } + + return find_player; +} + +/* 80AB43D8-80AB4674 0016D8 029C+00 3/0 0/0 0/0 .text wait__11daNpcPray_cFPv */ +bool daNpcPray_c::wait(void*) { + switch (mActionMode) { + case 0: + setMotion(MOTION_WAIT_e, -1.0f, 0); + speedF = 0.0f; + mActionMode = 2; + break; + case 2: + chkFindPlayer(); + + if (mActorMngr[0].getActorP() != NULL) { + setLookMode(2); + } else { + setLookMode(0); + if (home.angle.y != mCurAngle.y && step(home.angle.y, 1)) { + setMotion(MOTION_WAIT_e, -1.0f, 0); + mTurnMode = 0; + } + } + + if (dComIfGp_event_runCheck()) { + if (eventInfo.checkCommandTalk()) { + if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { + setAction(&daNpcPray_c::talk); + } + } else if (dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0) != -1) { + setAction(&daNpcPray_c::demo); + } + } else { + if (!dKy_darkworld_check() && daPy_py_c::checkNowWolf()) { + f32 search_range = pow(500.0f, 2.0f); + if (fopAcM_searchPlayerDistanceXZ2(this) < search_range) { + setAction(&daNpcPray_c::fear); + break; + } + } + + if (mOrderEvtNo != 0) { + eventInfo.setArchiveName(l_arcNames[0]); + } + + orderEvent(field_0xe0e, l_evtNames[mOrderEvtNo], 0xFFFF, 40, 0xFF, 1); + } + break; + case 1: + case 3: + JUT_ASSERT(1076, 0); + break; + } + + return 1; +} + +/* 80AB4674-80AB4740 001974 00CC+00 1/0 0/0 0/0 .text fear__11daNpcPray_cFPv */ +bool daNpcPray_c::fear(void*) { + switch (mActionMode) { + case 0: + setMotion(MOTION_WOLF_e, -1.0f, 0); + speedF = 0.0f; + mSound.playVoice(2); + dComIfGs_onSaveDunSwitch(60); + mActionMode = 2; + break; + case 2: + OS_REPORT("-------------prayer frame=%f\n", mpMorf->getFrame()); + if (1.0f == mpMorf->getFrame()) { + OS_REPORT("-------------prayer fear se start!!\n"); + mSound.playVoice(2); + } + break; + case 1: + case 3: + JUT_ASSERT(1076, 0); + break; + } + + return 1; +} + +/* 80AB4740-80AB498C 001A40 024C+00 1/0 0/0 0/0 .text talk__11daNpcPray_cFPv */ +bool daNpcPray_c::talk(void*) { + int sp20 = 0; + bool var_r28 = 0; + + switch (mActionMode) { + case 0: + initTalk(mMessageNo, NULL); + mMsgTimer = 0; + field_0xe0e = 0; + setLookMode(3); + mActionMode = 2; + break; + case 2: + if (mCurAngle.y == fopAcM_searchPlayerAngleY(this)) { + if (talkProc(NULL, TRUE, NULL)) { + mActorMngr[0].entry(daPy_getPlayerActorClass()); + int itemNo = 0; + u16 eventID = mFlow.getEventId(&itemNo); + // "at talk end EventID=%d ItemNo=%d\n" + OS_REPORT("会話終了時 イベントID=%d アイテムNo=%d\n", eventID, itemNo); + + if (eventID == 20) { + // "full offering amount reached!\n" + OS_REPORT("お布施額が満額になりました！\n"); + daNpcF_onEvtBit(294); + mOrderEvtNo = 1; + changeEvent("Prayer", l_evtNames[mOrderEvtNo], 2, 0xFFFF); + setAction(&daNpcPray_c::demo); + return 1; + } + + setAction(&daNpcPray_c::wait); + var_r28 = 1; + break; + } + + int expression; + int motion; + int timer = mMsgTimer; + if (ctrlMsgAnm(expression, motion, this, FALSE)) { + setMotion(motion, -1.0f, 0); + } + break; + } + + if (step(fopAcM_searchPlayerAngleY(this), 1)) { + setMotion(MOTION_PRAYTALK_e, -1.0f, 0); + mTurnMode = 0; + } + break; + case 3: + if (field_0x9ec == 0) { + dComIfGp_event_reset(); + } + break; + default: + JUT_ASSERT(1209, 0); + } + + return var_r28; +} + +/* 80AB498C-80AB4B20 001C8C 0194+00 2/0 0/0 0/0 .text demo__11daNpcPray_cFPv */ +bool daNpcPray_c::demo(void*) { + dEvent_manager_c& evtmgr = dComIfGp_getEventManager(); + int var_r25 = 0; + + switch (mActionMode) { + case 0: + setMotion(MOTION_WAIT_e, -1.0f, 0); + mActionMode = 2; + break; + case 2: + if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { + dEvent_manager_c& evtmgr = dComIfGp_getEventManager(); + const int staffID = evtmgr.getMyStaffId(l_myName, NULL, 0); + if (staffID != -1) { + mStaffID = staffID; + + JUT_ASSERT(1243, 0 != mEvtSeqList[mOrderEvtNo]); + if ((this->*mEvtSeqList[mOrderEvtNo])(staffID)) { + evtmgr.cutEnd(staffID); + var_r25 = 1; + } + } + + if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && evtmgr.endCheck(mEventIdx)) { + switch (mOrderEvtNo) { + case 1: + OS_REPORT("------------------heart remove!!\n"); + fopAc_ac_c* heart_actor_p = mActorMngr[1].getActorP(); + if (heart_actor_p != NULL) { + fopAcM_delete(heart_actor_p); + mActorMngr[1].remove(); + } + } + + dComIfGp_event_reset(); + mOrderEvtNo = 0; + mEventIdx = -1; + setAction(&daNpcPray_c::wait); + } + } + break; + case 3: + JUT_ASSERT(1280, 0); + break; + } + + return 1; +} + +/* 80AB4B20-80AB4BFC 001E20 00DC+00 1/1 0/0 0/0 .text createHeart__11daNpcPray_cFv */ +fpc_ProcID daNpcPray_c::createHeart() { + cXyz pos(-4142.7036f, 850.0f, -569.3754f); + csXyz rot(0, 0, 0); + cXyz size(0.3f, 0.3f, 0.3f); + cXyz offset(0.0f, 0.0f, 95.0f); + + mDoMtx_stack_c::ZXYrotS(rot); + mDoMtx_stack_c::multVec(&offset, &offset); + pos += offset; + return fopAcM_createItemForBoss(&pos, fpcNm_ITEM_KAKERA_HEART, fopAcM_GetRoomNo(this), &rot, &size, 0.0f, 0.0f, 0); +} + +/* 80AB4BFC-80AB4CA4 001EFC 00A8+00 1/0 0/0 0/0 .text _Evt_GetHeart__11daNpcPray_cFi */ +BOOL daNpcPray_c::_Evt_GetHeart(int i_staffID) { + dEvent_manager_c& evtmgr = dComIfGp_getEventManager(); + int cutId = -1; + + int* cutId_p = dComIfGp_evmng_getMyIntegerP(i_staffID, "cutId"); + if (cutId_p != NULL) { + cutId = *cutId_p; + } else { + return 1; + } + + if (evtmgr.getIsAddvance(i_staffID)) { + _Evt_GetHeart_CutInit(cutId); + } + + return _Evt_GetHeart_CutMain(cutId); +} + +/* 80AB4CA4-80AB4D34 001FA4 0090+00 1/1 0/0 0/0 .text _Evt_GetHeart_CutInit__11daNpcPray_cFRCi */ +BOOL daNpcPray_c::_Evt_GetHeart_CutInit(const int& i_cutId) { + switch (i_cutId) { + case 10: + break; + case 20: { + fopAc_ac_c* heart_actor_p = mActorMngr[1].getActorP(); + if (heart_actor_p != NULL) { + fopAcM_SetSpeedF(heart_actor_p, 0.0f); + fopAcM_SetSpeed(heart_actor_p, 0.0f, 0.0f, 0.0f); + fopAcM_SetGravity(heart_actor_p, -3.0f); + fopAcM_SetAngle(heart_actor_p, 0, 0, 0); + fopAcM_SetMaxFallSpeed(heart_actor_p, -4.0f); + } + break; + } + default: + JUT_ASSERT(1396, 0); + break; + } + + return 1; +} + +/* 80AB4D34-80AB4E88 002034 0154+00 1/1 0/0 0/0 .text _Evt_GetHeart_CutMain__11daNpcPray_cFRCi */ +BOOL daNpcPray_c::_Evt_GetHeart_CutMain(int const& i_cutId) { + BOOL var_r28 = 0; + + switch (i_cutId) { + case 10: + if (mActorMngr[1].getPId() == fpcM_ERROR_PROCESS_ID_e) { + fpc_ProcID heart_pid = createHeart(); + if (heart_pid != fpcM_ERROR_PROCESS_ID_e) { + mActorMngr[1].entry(heart_pid); + + fopAc_ac_c* heart_actor_p = mActorMngr[1].getActorP(); + if (heart_actor_p != NULL) { + fopAcM_SetSpeedF(heart_actor_p, 0.0f); + fopAcM_SetSpeed(heart_actor_p, 0.0f, 0.0f, 0.0f); + fopAcM_SetGravity(heart_actor_p, 0.0f); + fopAcM_SetAngle(heart_actor_p, 0, 0, 0); + fopAcM_SetMaxFallSpeed(heart_actor_p, -4.0f); + var_r28 = 1; + } + } + } else { + fopAc_ac_c* heart_actor_p = mActorMngr[1].getActorP(); + if (heart_actor_p != NULL) { + fopAcM_SetSpeedF(heart_actor_p, 0.0f); + fopAcM_SetSpeed(heart_actor_p, 0.0f, 0.0f, 0.0f); + fopAcM_SetGravity(heart_actor_p, 0.0f); + fopAcM_SetAngle(heart_actor_p, 0, 0, 0); + fopAcM_SetMaxFallSpeed(heart_actor_p, -4.0f); + var_r28 = 1; + } + } + break; + case 20: { + fopAc_ac_c* heart_actor_p = mActorMngr[1].getActorP(); + if (heart_actor_p != NULL) { + fopAcM_posMoveF(heart_actor_p, NULL); + cXyz& heart_pos = fopAcM_GetPosition(heart_actor_p); + if (heart_pos.y < 110.0f) { + heart_pos.y = -300.0f; + var_r28 = 1; + } + } + break; + } + default: + JUT_ASSERT(1474, 0); + var_r28 = 1; + break; + } + + return var_r28; +} + +/* 80AB4E88-80AB4EA8 002188 0020+00 1/0 0/0 0/0 .text daNpcPray_Create__FPv */ +static int daNpcPray_Create(void* i_this) { + return ((daNpcPray_c*)i_this)->Create(); +} + +/* 80AB4EA8-80AB4EC8 0021A8 0020+00 1/0 0/0 0/0 .text daNpcPray_Delete__FPv */ +static int daNpcPray_Delete(void* i_this) { + return ((daNpcPray_c*)i_this)->Delete(); +} + +/* 80AB4EC8-80AB4EE8 0021C8 0020+00 1/0 0/0 0/0 .text daNpcPray_Execute__FPv */ +static int daNpcPray_Execute(void* i_this) { + return ((daNpcPray_c*)i_this)->Execute(); +} + +/* 80AB4EE8-80AB4F08 0021E8 0020+00 1/0 0/0 0/0 .text daNpcPray_Draw__FPv */ +static int daNpcPray_Draw(void* i_this) { + return ((daNpcPray_c*)i_this)->Draw(); +} + +/* 80AB4F08-80AB4F10 002208 0008+00 1/0 0/0 0/0 .text daNpcPray_IsDelete__FPv */ +static int daNpcPray_IsDelete(void* i_this) { + return 1; +} /* 80AB5A78-80AB5A98 -00001 0020+00 1/0 0/0 0/0 .data daNpcPray_MethodTable */ static actor_method_class daNpcPray_MethodTable = { - (process_method_func)daNpcPray_Create__FPv, - (process_method_func)daNpcPray_Delete__FPv, - (process_method_func)daNpcPray_Execute__FPv, - (process_method_func)daNpcPray_IsDelete__FPv, - (process_method_func)daNpcPray_Draw__FPv, + (process_method_func)daNpcPray_Create, + (process_method_func)daNpcPray_Delete, + (process_method_func)daNpcPray_Execute, + (process_method_func)daNpcPray_IsDelete, + (process_method_func)daNpcPray_Draw, }; /* 80AB5A98-80AB5AC8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_PRAYER */ @@ -366,771 +889,3 @@ extern actor_process_profile_definition g_profile_NPC_PRAYER = { fopAc_NPC_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80AB5AC8-80AB5B10 000144 0048+00 2/2 0/0 0/0 .data __vt__11daNpcPray_c */ -SECTION_DATA extern void* __vt__11daNpcPray_c[18] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11daNpcPray_cFv, - (void*)setParam__11daNpcPray_cFv, - (void*)main__11daNpcPray_cFv, - (void*)ctrlBtk__8daNpcF_cFv, - (void*)adjustShapeAngle__11daNpcPray_cFv, - (void*)setMtx__8daNpcF_cFv, - (void*)setMtx2__8daNpcF_cFv, - (void*)setAttnPos__11daNpcPray_cFv, - (void*)setCollisions__8daNpcF_cFv, - (void*)setExpressionAnm__8daNpcF_cFib, - (void*)setExpressionBtp__8daNpcF_cFi, - (void*)setExpression__8daNpcF_cFif, - (void*)setMotionAnm__11daNpcPray_cFif, - (void*)setMotion__11daNpcPray_cFifi, - (void*)drawDbgInfo__11daNpcPray_cFv, - (void*)drawOtherMdls__8daNpcF_cFv, -}; - -/* 80AB5B10-80AB5B1C 00018C 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80AB5B1C-80AB5B40 000198 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80AB57EC, - (void*)NULL, - (void*)NULL, - (void*)func_80AB57E4, -}; - -/* 80AB5B40-80AB5B4C 0001BC 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80AB5B4C-80AB5B58 0001C8 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80AB5B58-80AB5B64 0001D4 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80AB5B64-80AB5B70 0001E0 000C+00 4/4 0/0 0/0 .data __vt__18daNpcF_ActorMngr_c */ -SECTION_DATA extern void* __vt__18daNpcF_ActorMngr_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18daNpcF_ActorMngr_cFv, -}; - -/* 80AB5B70-80AB5B7C 0001EC 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80AB5B7C-80AB5B88 0001F8 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80AB5B88-80AB5B94 000204 000C+00 3/3 0/0 0/0 .data __vt__15daNpcF_Lookat_c */ -SECTION_DATA extern void* __vt__15daNpcF_Lookat_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daNpcF_Lookat_cFv, -}; - -/* 80AB2DEC-80AB2F70 0000EC 0184+00 1/1 0/0 0/0 .text __ct__11daNpcPray_cFv */ -daNpcPray_c::daNpcPray_c() { - // NONMATCHING -} - -/* 80AB2F70-80AB2FB8 000270 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -// cM3dGCyl::~cM3dGCyl() { -extern "C" void __dt__8cM3dGCylFv() { - // NONMATCHING -} - -/* 80AB2FB8-80AB3000 0002B8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} - -/* 80AB3000-80AB3204 000300 0204+00 1/0 0/0 0/0 .text __dt__11daNpcPray_cFv */ -daNpcPray_c::~daNpcPray_c() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB5808-80AB5874 000000 006C+00 14/14 0/0 0/0 .rodata m__17daNpcPray_Param_c */ -SECTION_RODATA u8 const daNpcPray_Param_c::m[108] = { - 0x42, 0x5C, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x43, 0x7F, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, - 0x41, 0xF0, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0xC2, 0x34, 0x00, 0x00, - 0x3F, 0x19, 0x99, 0x9A, 0x41, 0x40, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x03, 0x00, 0x06, - 0x42, 0x70, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AB5808, &daNpcPray_Param_c::m); - -/* 80AB5874-80AB5878 00006C 0004+00 0/1 0/0 0/0 .rodata @4169 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4169 = -60.0f; -COMPILER_STRIP_GATE(0x80AB5874, &lit_4169); -#pragma pop - -/* 80AB5878-80AB587C 000070 0004+00 0/1 0/0 0/0 .rodata @4170 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4170 = -10.0f; -COMPILER_STRIP_GATE(0x80AB5878, &lit_4170); -#pragma pop - -/* 80AB587C-80AB5880 000074 0004+00 0/1 0/0 0/0 .rodata @4171 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4171 = 60.0f; -COMPILER_STRIP_GATE(0x80AB587C, &lit_4171); -#pragma pop - -/* 80AB5880-80AB5884 000078 0004+00 0/1 0/0 0/0 .rodata @4172 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4172 = 220.0f; -COMPILER_STRIP_GATE(0x80AB5880, &lit_4172); -#pragma pop - -/* 80AB3204-80AB348C 000504 0288+00 1/1 0/0 0/0 .text Create__11daNpcPray_cFv */ -void daNpcPray_c::Create() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB5884-80AB5888 00007C 0004+00 1/3 0/0 0/0 .rodata @4220 */ -SECTION_RODATA static f32 const lit_4220 = 1.0f; -COMPILER_STRIP_GATE(0x80AB5884, &lit_4220); - -/* 80AB5888-80AB588C 000080 0004+00 0/1 0/0 0/0 .rodata @4221 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4221 = 0x3F8CCCCC; -COMPILER_STRIP_GATE(0x80AB5888, &lit_4221); -#pragma pop - -/* 80AB588C-80AB5890 000084 0004+00 2/5 0/0 0/0 .rodata @4222 */ -SECTION_RODATA static f32 const lit_4222 = -1.0f; -COMPILER_STRIP_GATE(0x80AB588C, &lit_4222); - -/* 80AB348C-80AB3610 00078C 0184+00 1/1 0/0 0/0 .text CreateHeap__11daNpcPray_cFv */ -void daNpcPray_c::CreateHeap() { - // NONMATCHING -} - -/* 80AB3610-80AB3644 000910 0034+00 1/1 0/0 0/0 .text Delete__11daNpcPray_cFv */ -void daNpcPray_c::Delete() { - // NONMATCHING -} - -/* 80AB3644-80AB3668 000944 0024+00 2/2 0/0 0/0 .text Execute__11daNpcPray_cFv */ -void daNpcPray_c::Execute() { - // NONMATCHING -} - -/* 80AB3668-80AB36A8 000968 0040+00 1/1 0/0 0/0 .text Draw__11daNpcPray_cFv */ -void daNpcPray_c::Draw() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB5890-80AB589C 000088 000C+00 1/1 0/0 0/0 .rodata @4241 */ -SECTION_RODATA static u8 const lit_4241[12] = { - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, -}; -COMPILER_STRIP_GATE(0x80AB5890, &lit_4241); - -/* 80AB36A8-80AB3834 0009A8 018C+00 1/1 0/0 0/0 .text - * ctrlJoint__11daNpcPray_cFP8J3DJointP8J3DModel */ -void daNpcPray_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) { - // NONMATCHING -} - -/* 80AB3834-80AB3854 000B34 0020+00 1/1 0/0 0/0 .text - * createHeapCallBack__11daNpcPray_cFP10fopAc_ac_c */ -void daNpcPray_c::createHeapCallBack(fopAc_ac_c* param_0) { - // NONMATCHING -} - -/* 80AB3854-80AB38A0 000B54 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpcPray_cFP8J3DJointi - */ -void daNpcPray_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) { - // NONMATCHING -} - -/* 80AB38A0-80AB390C 000BA0 006C+00 1/0 0/0 0/0 .text setParam__11daNpcPray_cFv */ -void daNpcPray_c::setParam() { - // NONMATCHING -} - -/* 80AB390C-80AB3964 000C0C 0058+00 1/0 0/0 0/0 .text main__11daNpcPray_cFv */ -void daNpcPray_c::main() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB589C-80AB58A0 000094 0004+00 0/1 0/0 0/0 .rodata @4391 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4391 = 10.0f; -COMPILER_STRIP_GATE(0x80AB589C, &lit_4391); -#pragma pop - -/* 80AB58A0-80AB58A4 000098 0004+00 1/2 0/0 0/0 .rodata @4392 */ -SECTION_RODATA static f32 const lit_4392 = 15.0f; -COMPILER_STRIP_GATE(0x80AB58A0, &lit_4392); - -/* 80AB58A4-80AB58A8 00009C 0004+00 1/8 0/0 0/0 .rodata @4393 */ -SECTION_RODATA static u8 const lit_4393[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AB58A4, &lit_4393); - -/* 80AB3964-80AB3B0C 000C64 01A8+00 1/0 0/0 0/0 .text setAttnPos__11daNpcPray_cFv */ -void daNpcPray_c::setAttnPos() { - // NONMATCHING -} - -/* 80AB3B0C-80AB3BDC 000E0C 00D0+00 1/0 0/0 0/0 .text setMotionAnm__11daNpcPray_cFif */ -bool daNpcPray_c::setMotionAnm(int param_0, f32 param_1) { - // NONMATCHING -} - -/* 80AB3BDC-80AB3C24 000EDC 0048+00 1/0 0/0 0/0 .text setMotion__11daNpcPray_cFifi */ -void daNpcPray_c::setMotion(int param_0, f32 param_1, int param_2) { - // NONMATCHING -} - -/* 80AB3C24-80AB3C2C 000F24 0008+00 1/0 0/0 0/0 .text drawDbgInfo__11daNpcPray_cFv */ -bool daNpcPray_c::drawDbgInfo() { - return false; -} - -/* 80AB3C2C-80AB3DBC 000F2C 0190+00 1/1 0/0 0/0 .text reset__11daNpcPray_cFv */ -void daNpcPray_c::reset() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB58A8-80AB58B4 0000A0 000C+00 0/1 0/0 0/0 .rodata @4452 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4452[12] = { - 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AB58A8, &lit_4452); -#pragma pop - -/* 80AB58B4-80AB58B8 0000AC 0004+00 0/1 0/0 0/0 .rodata @4453 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4453[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AB58B4, &lit_4453); -#pragma pop - -/* 80AB58B8-80AB58C4 0000B0 000C+00 0/1 0/0 0/0 .rodata @4454 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4454[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AB58B8, &lit_4454); -#pragma pop - -/* 80AB58C4-80AB58D0 0000BC 000C+00 0/1 0/0 0/0 .rodata @4455 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4455[12] = { - 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AB58C4, &lit_4455); -#pragma pop - -/* 80AB58D0-80AB58D8 0000C8 0008+00 0/1 0/0 0/0 .rodata @4456 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4456[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AB58D0, &lit_4456); -#pragma pop - -/* 80AB58D8-80AB58E4 0000D0 000C+00 0/1 0/0 0/0 .rodata @4457 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4457[12] = { - 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AB58D8, &lit_4457); -#pragma pop - -/* 80AB58E4-80AB58F0 0000DC 000C+00 0/1 0/0 0/0 .rodata @4458 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4458[12] = { - 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AB58E4, &lit_4458); -#pragma pop - -/* 80AB58F0-80AB58F8 0000E8 0008+00 0/1 0/0 0/0 .rodata @4459 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4459[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AB58F0, &lit_4459); -#pragma pop - -/* 80AB58F8-80AB5904 0000F0 000C+00 0/1 0/0 0/0 .rodata @4460 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4460[12] = { - 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AB58F8, &lit_4460); -#pragma pop - -/* 80AB5904-80AB5908 0000FC 0004+00 0/1 0/0 0/0 .rodata @4461 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4461[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AB5904, &lit_4461); -#pragma pop - -/* 80AB5908-80AB5918 000100 0010+00 0/1 0/0 0/0 .rodata @4462 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4462[16] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AB5908, &lit_4462); -#pragma pop - -/* 80AB3DBC-80AB3F54 0010BC 0198+00 1/1 0/0 0/0 .text playMotion__11daNpcPray_cFv */ -void daNpcPray_c::playMotion() { - // NONMATCHING -} - -/* 80AB3F54-80AB3FFC 001254 00A8+00 4/4 0/0 0/0 .text - * setAction__11daNpcPray_cFM11daNpcPray_cFPCvPvPv_b */ -void daNpcPray_c::setAction(bool (daNpcPray_c::*param_0)(void*)) { - // NONMATCHING -} - -/* 80AB3FFC-80AB4020 0012FC 0024+00 2/2 0/0 0/0 .text setLookMode__11daNpcPray_cFi */ -void daNpcPray_c::setLookMode(int param_0) { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB5918-80AB5924 000110 000C+00 0/1 0/0 0/0 .rodata @4495 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4495[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AB5918, &lit_4495); -#pragma pop - -/* 80AB5924-80AB5928 00011C 0004+00 0/1 0/0 0/0 .rodata @4543 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4543 = -80.0f; -COMPILER_STRIP_GATE(0x80AB5924, &lit_4543); -#pragma pop - -/* 80AB5928-80AB592C 000120 0004+00 0/1 0/0 0/0 .rodata @4544 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4544 = 80.0f; -COMPILER_STRIP_GATE(0x80AB5928, &lit_4544); -#pragma pop - -/* 80AB592C-80AB5930 000124 0004+00 0/1 0/0 0/0 .rodata @4545 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4545 = 40.0f; -COMPILER_STRIP_GATE(0x80AB592C, &lit_4545); -#pragma pop - -/* 80AB4020-80AB4200 001320 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcPray_cFv */ -void daNpcPray_c::lookat() { - // NONMATCHING -} - -/* 80AB4200-80AB42F4 001500 00F4+00 2/2 0/0 0/0 .text step__11daNpcPray_cFsi */ -void daNpcPray_c::step(s16 param_0, int param_1) { - // NONMATCHING -} - -/* 80AB42F4-80AB43D8 0015F4 00E4+00 1/1 0/0 0/0 .text chkFindPlayer__11daNpcPray_cFv */ -void daNpcPray_c::chkFindPlayer() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB5930-80AB5938 000128 0008+00 0/1 0/0 0/0 .rodata @4653 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4653[8] = { - 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AB5930, &lit_4653); -#pragma pop - -/* 80AB5938-80AB5940 000130 0008+00 0/1 0/0 0/0 .rodata @4654 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4654[8] = { - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AB5938, &lit_4654); -#pragma pop - -/* 80AB43D8-80AB4674 0016D8 029C+00 3/0 0/0 0/0 .text wait__11daNpcPray_cFPv */ -void daNpcPray_c::wait(void* param_0) { - // NONMATCHING -} - -/* 80AB4674-80AB4740 001974 00CC+00 1/0 0/0 0/0 .text fear__11daNpcPray_cFPv */ -void daNpcPray_c::fear(void* param_0) { - // NONMATCHING -} - -/* 80AB4740-80AB498C 001A40 024C+00 1/0 0/0 0/0 .text talk__11daNpcPray_cFPv */ -void daNpcPray_c::talk(void* param_0) { - // NONMATCHING -} - -/* 80AB498C-80AB4B20 001C8C 0194+00 2/0 0/0 0/0 .text demo__11daNpcPray_cFPv */ -void daNpcPray_c::demo(void* param_0) { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB5940-80AB5944 000138 0004+00 0/1 0/0 0/0 .rodata @4765 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4765 = 0xC58175A1; -COMPILER_STRIP_GATE(0x80AB5940, &lit_4765); -#pragma pop - -/* 80AB5944-80AB5948 00013C 0004+00 0/1 0/0 0/0 .rodata @4766 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4766 = 850.0f; -COMPILER_STRIP_GATE(0x80AB5944, &lit_4766); -#pragma pop - -/* 80AB5948-80AB594C 000140 0004+00 0/1 0/0 0/0 .rodata @4767 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4767 = 0xC40E5807; -COMPILER_STRIP_GATE(0x80AB5948, &lit_4767); -#pragma pop - -/* 80AB594C-80AB5950 000144 0004+00 0/1 0/0 0/0 .rodata @4768 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4768 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(0x80AB594C, &lit_4768); -#pragma pop - -/* 80AB5950-80AB5954 000148 0004+00 0/1 0/0 0/0 .rodata @4769 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4769 = 95.0f; -COMPILER_STRIP_GATE(0x80AB5950, &lit_4769); -#pragma pop - -/* 80AB4B20-80AB4BFC 001E20 00DC+00 1/1 0/0 0/0 .text createHeart__11daNpcPray_cFv */ -void daNpcPray_c::createHeart() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB5964-80AB5964 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80AB597E = "cutId"; -#pragma pop - -/* 80AB4BFC-80AB4CA4 001EFC 00A8+00 1/0 0/0 0/0 .text _Evt_GetHeart__11daNpcPray_cFi */ -void daNpcPray_c::_Evt_GetHeart(int param_0) { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB5954-80AB5958 00014C 0004+00 0/1 0/0 0/0 .rodata @4800 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4800 = -3.0f; -COMPILER_STRIP_GATE(0x80AB5954, &lit_4800); -#pragma pop - -/* 80AB5958-80AB595C 000150 0004+00 0/2 0/0 0/0 .rodata @4801 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4801 = -4.0f; -COMPILER_STRIP_GATE(0x80AB5958, &lit_4801); -#pragma pop - -/* 80AB4CA4-80AB4D34 001FA4 0090+00 1/1 0/0 0/0 .text _Evt_GetHeart_CutInit__11daNpcPray_cFRCi */ -void daNpcPray_c::_Evt_GetHeart_CutInit(int const& param_0) { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB595C-80AB5960 000154 0004+00 0/1 0/0 0/0 .rodata @4840 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4840 = 110.0f; -COMPILER_STRIP_GATE(0x80AB595C, &lit_4840); -#pragma pop - -/* 80AB5960-80AB5964 000158 0004+00 0/1 0/0 0/0 .rodata @4841 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4841 = -300.0f; -COMPILER_STRIP_GATE(0x80AB5960, &lit_4841); -#pragma pop - -/* 80AB4D34-80AB4E88 002034 0154+00 1/1 0/0 0/0 .text _Evt_GetHeart_CutMain__11daNpcPray_cFRCi */ -void daNpcPray_c::_Evt_GetHeart_CutMain(int const& param_0) { - // NONMATCHING -} - -/* 80AB4E88-80AB4EA8 002188 0020+00 1/0 0/0 0/0 .text daNpcPray_Create__FPv */ -static void daNpcPray_Create(void* param_0) { - // NONMATCHING -} - -/* 80AB4EA8-80AB4EC8 0021A8 0020+00 1/0 0/0 0/0 .text daNpcPray_Delete__FPv */ -static void daNpcPray_Delete(void* param_0) { - // NONMATCHING -} - -/* 80AB4EC8-80AB4EE8 0021C8 0020+00 1/0 0/0 0/0 .text daNpcPray_Execute__FPv */ -static void daNpcPray_Execute(void* param_0) { - // NONMATCHING -} - -/* 80AB4EE8-80AB4F08 0021E8 0020+00 1/0 0/0 0/0 .text daNpcPray_Draw__FPv */ -static void daNpcPray_Draw(void* param_0) { - // NONMATCHING -} - -/* 80AB4F08-80AB4F10 002208 0008+00 1/0 0/0 0/0 .text daNpcPray_IsDelete__FPv */ -static bool daNpcPray_IsDelete(void* param_0) { - return true; -} - -/* 80AB4F10-80AB4F58 002210 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ -// daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { -extern "C" void __dt__18daNpcF_ActorMngr_cFv() { - // NONMATCHING -} - -/* 80AB4F58-80AB4F94 002258 003C+00 2/2 0/0 0/0 .text __ct__18daNpcF_ActorMngr_cFv */ -// daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { -extern "C" void __ct__18daNpcF_ActorMngr_cFv() { - // NONMATCHING -} - -/* 80AB4F94-80AB5064 002294 00D0+00 1/0 0/0 0/0 .text __dt__15daNpcF_Lookat_cFv */ -// daNpcF_Lookat_c::~daNpcF_Lookat_c() { -extern "C" void __dt__15daNpcF_Lookat_cFv() { - // NONMATCHING -} - -/* 80AB5064-80AB50A0 002364 003C+00 5/5 0/0 0/0 .text __dt__5csXyzFv */ -// csXyz::~csXyz() { -extern "C" void __dt__5csXyzFv() { - // NONMATCHING -} - -/* 80AB50A0-80AB50A4 0023A0 0004+00 2/2 0/0 0/0 .text __ct__5csXyzFv */ -// csXyz::csXyz() { -extern "C" void __ct__5csXyzFv() { - /* empty function */ -} - -/* 80AB50A4-80AB50E0 0023A4 003C+00 5/5 0/0 0/0 .text __dt__4cXyzFv */ -// cXyz::~cXyz() { -extern "C" void __dt__4cXyzFv() { - // NONMATCHING -} - -/* 80AB50E0-80AB50E4 0023E0 0004+00 2/2 0/0 0/0 .text __ct__4cXyzFv */ -// cXyz::cXyz() { -extern "C" void __ct__4cXyzFv() { - /* empty function */ -} - -/* 80AB50E4-80AB5330 0023E4 024C+00 1/1 0/0 0/0 .text __dt__8daNpcF_cFv */ -// daNpcF_c::~daNpcF_c() { -extern "C" void __dt__8daNpcF_cFv() { - // NONMATCHING -} - -/* 80AB5330-80AB5520 002630 01F0+00 1/1 0/0 0/0 .text __ct__8daNpcF_cFv */ -// daNpcF_c::daNpcF_c() { -extern "C" void __ct__8daNpcF_cFv() { - // NONMATCHING -} - -/* 80AB5520-80AB5590 002820 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -// dBgS_AcchCir::~dBgS_AcchCir() { -extern "C" void __dt__12dBgS_AcchCirFv() { - // NONMATCHING -} - -/* 80AB5590-80AB55EC 002890 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -// dCcD_GStts::~dCcD_GStts() { -extern "C" void __dt__10dCcD_GSttsFv() { - // NONMATCHING -} - -/* 80AB55EC-80AB565C 0028EC 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -// dBgS_ObjAcch::~dBgS_ObjAcch() { -extern "C" void __dt__12dBgS_ObjAcchFv() { - // NONMATCHING -} - -/* 80AB565C-80AB56A4 00295C 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -// J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" void __dt__12J3DFrameCtrlFv() { - // NONMATCHING -} - -/* 80AB56A4-80AB56AC 0029A4 0008+00 1/0 0/0 0/0 .text ctrlBtk__8daNpcF_cFv */ -// bool daNpcF_c::ctrlBtk() { -extern "C" bool ctrlBtk__8daNpcF_cFv() { - return false; -} - -/* 80AB56AC-80AB56B0 0029AC 0004+00 1/0 0/0 0/0 .text setCollisions__8daNpcF_cFv */ -// void daNpcF_c::setCollisions() { -extern "C" void setCollisions__8daNpcF_cFv() { - /* empty function */ -} - -/* 80AB56B0-80AB56B8 0029B0 0008+00 1/0 0/0 0/0 .text setExpressionAnm__8daNpcF_cFib */ -// bool daNpcF_c::setExpressionAnm(int param_0, bool param_1) { -extern "C" bool setExpressionAnm__8daNpcF_cFib() { - return true; -} - -/* 80AB56B8-80AB56C0 0029B8 0008+00 1/0 0/0 0/0 .text setExpressionBtp__8daNpcF_cFi */ -// bool daNpcF_c::setExpressionBtp(int param_0) { -extern "C" bool setExpressionBtp__8daNpcF_cFi() { - return true; -} - -/* 80AB56C0-80AB56C4 0029C0 0004+00 1/0 0/0 0/0 .text setExpression__8daNpcF_cFif */ -// void daNpcF_c::setExpression(int param_0, f32 param_1) { -extern "C" void setExpression__8daNpcF_cFif() { - /* empty function */ -} - -/* 80AB56C4-80AB56C8 0029C4 0004+00 1/0 0/0 0/0 .text drawOtherMdls__8daNpcF_cFv */ -// void daNpcF_c::drawOtherMdls() { -extern "C" void drawOtherMdls__8daNpcF_cFv() { - /* empty function */ -} - -/* 80AB56C8-80AB5710 0029C8 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -// cCcD_GStts::~cCcD_GStts() { -extern "C" void __dt__10cCcD_GSttsFv() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AB5B94-80AB5BA0 000210 000C+00 2/2 0/0 0/0 .data __vt__17daNpcPray_Param_c */ -SECTION_DATA extern void* __vt__17daNpcPray_Param_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17daNpcPray_Param_cFv, -}; - -/* 80AB5BA8-80AB5BB4 000008 000C+00 1/1 0/0 0/0 .bss @3803 */ -static u8 lit_3803[12]; - -/* 80AB5BB4-80AB5BB8 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[4]; - -/* 80AB5710-80AB5798 002A10 0088+00 0/0 1/0 0/0 .text __sinit_d_a_npc_prayer_cpp */ -void __sinit_d_a_npc_prayer_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80AB5710, __sinit_d_a_npc_prayer_cpp); -#pragma pop - -/* 80AB5798-80AB579C 002A98 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpcPray_cFv - */ -void daNpcPray_c::adjustShapeAngle() { - /* empty function */ -} - -/* 80AB579C-80AB57E4 002A9C 0048+00 2/1 0/0 0/0 .text __dt__17daNpcPray_Param_cFv */ -daNpcPray_Param_c::~daNpcPray_Param_c() { - // NONMATCHING -} - -/* 80AB57E4-80AB57EC 002AE4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -static void func_80AB57E4() { - // NONMATCHING -} - -/* 80AB57EC-80AB57F4 002AEC 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -static void func_80AB57EC() { - // NONMATCHING -} - -/* 80AB5964-80AB5964 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index 4a717958ae3..aca8c8690cb 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -60,23 +60,43 @@ void dBrightCheck_c::screenSet() { 'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at', }; + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + static u64 const txTV[] = { + 'menu_t6s', 'menu_t6', 'menu_t9s', 'menu_t9', 'menut10s', + 'menu_t10', 'menu_t7s', 'menu_t7', 'menu_t8s', 'menu_t8', + }; + #else static u64 const txTV[] = { 'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101', 'menu_t01', 'menu_t71', 'menu_t3', 'menu_t81', 'menu_t4', }; + #endif + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + static u64 const txTVhide[] = { + 'fmenu_6n', 'fmenu_9n', 'fmenu_10', 'fmenu_7n', 'fmenu_8n', + }; + #else static u64 const txTVhide[] = { 'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n', }; + #endif mBrightCheck.Scr = new J2DScreen(); JUT_ASSERT(0, mBrightCheck.Scr != 0); mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive); mBrightCheck.Scr->search('g_abtn_n')->hide(); + + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('t_t00'); + mBrightCheck.Scr->search('t_t00')->show(); + mBrightCheck.Scr->search('f_t00')->hide(); + #else J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('f_t00'); mBrightCheck.Scr->search('f_t00')->show(); mBrightCheck.Scr->search('t_t00')->hide(); + #endif settings_text->setFont(mDoExt_getRubyFont()); settings_text->setString(0x40, ""); @@ -84,8 +104,14 @@ void dBrightCheck_c::screenSet() { J2DTextBox* btna_text[5]; for (int i = 0; i < 5; i++) { + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + btna_text[i] = (J2DTextBox*)mBrightCheck.Scr->search(tv_btnA[i]); + mBrightCheck.Scr->search(ftv_btnA[i])->hide(); + #else btna_text[i] = (J2DTextBox*)mBrightCheck.Scr->search(ftv_btnA[i]); mBrightCheck.Scr->search(tv_btnA[i])->hide(); + #endif + btna_text[i]->setFont(mDoExt_getMesgFont()); btna_text[i]->setString(0x40, ""); mBrightCheck.mMsgString->getString(0x564, btna_text[i], NULL, NULL, NULL, 0); // "Complete" @@ -98,7 +124,10 @@ void dBrightCheck_c::screenSet() { for (int i = 0; i < 10; i++) { J2DTextBox* check_text = (J2DTextBox*)mBrightCheck.Scr->search(txTV[i]); check_text->setFont(mDoExt_getMesgFont()); + + #if (VERSION != VERSION_GCN_JPN) && (VERSION != VERSION_WII_JPN) check_text->setCharSpace(0.0f); + #endif if (i < 2) { check_text->setString(0x100, ""); diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index c14db920f60..5051645c4d6 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -30,6 +30,16 @@ struct BMG_INF1 : JUTDataBlockHeader { /* 0x10 */ u32 entries[6]; }; +#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) +#define LINE_HEIGHT 30.0f +#define LINE_SPACE 30.0f +#define CHAR_SPACE 3.0f +#else +#define LINE_HEIGHT 23.0f +#define LINE_SPACE 23.0f +#define CHAR_SPACE 1.0f +#endif + /* 8009CB88-8009D194 0974C8 060C+00 1/1 0/0 0/0 .text messageSet__FUlb */ static void messageSet(u32 status, bool i_drawBg) { BMG_INF1* inf1 = (BMG_INF1*)&msg_data[0x20]; @@ -58,22 +68,22 @@ static void messageSet(u32 status, bool i_drawBg) { size.mSizeY = 22.0f; tpane.setFontSize(size); - tpane.setCharSpace(1.0f); - tpane.setLineSpace(23.0f); + tpane.setCharSpace(CHAR_SPACE); + tpane.setLineSpace(LINE_SPACE); tpane.setCharColor(tcharcolor); tpane.setGradColor(tgradcolor); tpane.setBlackWhite(tblack, twhite); spane.setFontSize(size); - spane.setCharSpace(1.0f); - spane.setLineSpace(23.0f); + spane.setCharSpace(CHAR_SPACE); + spane.setLineSpace(LINE_SPACE); spane.setCharColor(scharcolor); spane.setGradColor(sgradcolor); spane.setBlackWhite(sblack, swhite); const int lineMax = 10; - f32 height = 23.0f; + f32 height = LINE_HEIGHT; f32 maxWidth = 0.0f; int cnt = 0; f32 lineWidth[lineMax]; @@ -83,19 +93,23 @@ static void messageSet(u32 status, bool i_drawBg) { for (; *msg_p != '\0'; msg_p++) { if (*msg_p == '\n') { - height += 23.0f; + height += LINE_HEIGHT; cnt++; JUT_ASSERT(191, cnt < lineMax); continue; } int c = (u8)*msg_p; + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + if (pfont->isLeadByte_ShiftJIS(c)) { + #else if (pfont->isLeadByte_EUC(c)) { + #endif msg_p++; c = (c << 8) | (u8)*msg_p; } - lineWidth[cnt] += 1.0f + size.mSizeX * ((f32)pfont->getWidth(c) / (f32)pfont->getCellWidth()); + lineWidth[cnt] += CHAR_SPACE + size.mSizeX * ((f32)pfont->getWidth(c) / (f32)pfont->getCellWidth()); } for (int i = 0; i < lineMax; i++) { @@ -104,6 +118,18 @@ static void messageSet(u32 status, bool i_drawBg) { maxWidth = width; } + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + f32 temp_0 = 0.0f; // fixes load order + f32 y = temp_0 + ((448.0f - height) / 2); + + if (i_drawBg) { + ppane.mAlpha = 0x82; + ppane.draw(0.0f, 0.0f, 608.0f, 448.0f, false, false, false); + } + + spane.draw(2.0f, y + 10.0f + 2.0f, 608.0f, HBIND_CENTER); + tpane.draw(0.0f, y + 10.0f, 608.0f, HBIND_CENTER); + #else f32 temp_0 = 0.0f; // fixes load order f32 x = temp_0 + ((608.0f - maxWidth) / 2); f32 y = temp_0 + ((448.0f - height) / 2); @@ -115,6 +141,7 @@ static void messageSet(u32 status, bool i_drawBg) { spane.draw(x + 2.0f, y + 10.0f + 2.0f, 608.0f, HBIND_LEFT); tpane.draw(x, y + 10.0f, 608.0f, HBIND_LEFT); + #endif } /* 8009D194-8009D354 097AD4 01C0+00 1/1 0/0 0/0 .text draw__14dDvdErrorMsg_cFl */ diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index 366896199cf..3295f392b38 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -64,10 +64,19 @@ void dFile_info_c::screenSet() { mNoDatBase = new CPaneMgrAlpha(mFileInfo.Scr, 'w_nda_i1', 2, NULL); J2DTextBox* info_text[4]; + + + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('w_s_t_01'); + info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('w_p_t_01'); + mFileInfo.Scr->search('f_s_t_02')->hide(); + mFileInfo.Scr->search('f_p_t_02')->hide(); + #else info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_s_t_02'); info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_p_t_02'); mFileInfo.Scr->search('w_s_t_01')->hide(); mFileInfo.Scr->search('w_p_t_01')->hide(); + #endif for (int i = 0; i < 2; i++) { info_text[i]->setFont(mFileInfo.mFont); @@ -76,10 +85,17 @@ void dFile_info_c::screenSet() { dMeter2Info_getString(0x3D0, info_text[0]->getStringPtr(), NULL); // Save time dMeter2Info_getString(0x3D1, info_text[1]->getStringPtr(), NULL); // Total play time + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('w_name01'); + info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('w_new_1'); + mFileInfo.Scr->search('f_name01')->hide(); + mFileInfo.Scr->search('f_new_1')->hide(); + #else info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_name01'); info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_new_1'); mFileInfo.Scr->search('w_name01')->hide(); mFileInfo.Scr->search('w_new_1')->hide(); + #endif info_text[2] = (J2DTextBox*)mFileInfo.Scr->search('w_time01'); info_text[3] = (J2DTextBox*)mFileInfo.Scr->search('w_ptim01'); @@ -177,8 +193,14 @@ static procFunc fileWarningProc[] = {&dFile_info_c::modeWait, &dFile_info_c::mod void dFile_info_c::setSaveDate(dSv_save_c* i_savedata) { OSCalendarTime time; OSTicksToCalendarTime(i_savedata->getPlayer().getPlayerStatusB().getDateIpl(), &time); + + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + sprintf(mSaveDate, "%d.%02d.%02d %02d:%02d", time.year, time.mon + 1, time.mday, + time.hour, time.min); + #else sprintf(mSaveDate, "%02d/%02d/%d %02d:%02d", time.mon + 1, time.mday, time.year, time.hour, time.min); + #endif } /* 80192C70-80192D58 18D5B0 00E8+00 1/1 0/0 0/0 .text setPlayTime__12dFile_info_cFP10dSv_save_c */ diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 927aeacbf8d..c14e4725629 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -2356,10 +2356,22 @@ void dFile_select_c::screenSet() { static u64 l_nouseTag[15] = { 'w_mcheck', 'w_tabi1', 'w_tabi2', 'w_tabi3', 'w_doko_c', 'w_uwa_c', 'w_cp_chu', 'w_cpsita', 'w_cp_x', 'w_de', 'w_de_chu', 'w_desita', 'w_de_x', 'w_name', 'w_h_name'}; + + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + static u64 l_tagName21[2] = {'w_tabi_s', 'w_tabi_x'}; + #else static u64 l_tagName21[2] = {'t_for', 't_for1'}; + #endif + static u64 l_tagName18[3] = {'w_de_ef0', 'w_de_ef1', 'w_de_ef2'}; static u64 l_tagName19[3] = {'w_cp_ef0', 'w_cp_ef1', 'w_cp_ef2'}; + + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + static u64 l_tagName20[2] = {'w_er_msg', 'w_er_msR'}; + #else static u64 l_tagName20[2] = {'er_for0', 'er_for1'}; + #endif + static u64 l_tagName131[3] = {'N_sel_00', 'N_sel_01', 'N_sel_02'}; fileSel.Scr = new J2DScreen(); @@ -2385,10 +2397,19 @@ void dFile_select_c::screenSet() { fileSel.Scr->search('Wi_btn_n')->hide(); field_0x0238 = new CPaneMgrAlpha(fileSel.Scr, 'w_n_bbtn', 2, NULL); field_0x023c = new CPaneMgrAlpha(fileSel.Scr, 'w_n_abtn', 2, NULL); + + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + field_0x0240 = new CPaneMgrAlpha(fileSel.Scr, 'w_modo', 2, NULL); + field_0x0244 = new CPaneMgrAlpha(fileSel.Scr, 'w_kete', 2, NULL); + fileSel.Scr->search('f_modo')->hide(); + fileSel.Scr->search('f_kete')->hide(); + #else field_0x0240 = new CPaneMgrAlpha(fileSel.Scr, 'f_modo', 2, NULL); field_0x0244 = new CPaneMgrAlpha(fileSel.Scr, 'f_kete', 2, NULL); fileSel.Scr->search('w_modo')->hide(); fileSel.Scr->search('w_kete')->hide(); + #endif + ((J2DTextBox*)field_0x0240->getPanePtr())->setFont(fileSel.mpMessageFont[0]); ((J2DTextBox*)field_0x0244->getPanePtr())->setFont(fileSel.mpMessageFont[0]); ((J2DTextBox*)field_0x0240->getPanePtr())->setString(32, ""); @@ -2442,10 +2463,17 @@ void dFile_select_c::screenSet() { for (int i = 0; i < 15; i++) { fileSel.Scr->search(l_nouseTag[i])->hide(); } + + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + fileSel.Scr->search('t_for')->hide(); + fileSel.Scr->search('t_for1')->hide(); + #else fileSel.Scr->search('w_tabi_s')->hide(); fileSel.Scr->search('w_tabi_x')->hide(); fileSel.Scr->search('w_mgn1')->hide(); fileSel.Scr->search('w_mgn2')->hide(); + #endif + for (int i = 0; i < 2; i++) { field_0x020c[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName21[i], 0, NULL); ((J2DTextBox*)field_0x020c[i]->getPanePtr())->setFont(fileSel.mpMessageFont[0]); @@ -2480,17 +2508,35 @@ void dFile_select_c::screenSet() { field_0x0208 = 0; field_0x0209 = 0; field_0x012c = fileSel.Scr->search('w_er_n'); + + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + fileSel.Scr->search('er_for0')->hide(); + fileSel.Scr->search('er_for1')->hide(); + #else fileSel.Scr->search('w_er_msg')->hide(); fileSel.Scr->search('w_er_msR')->hide(); + #endif + fileSel.Scr->search('w_er_msE')->hide(); for (int i = 0; i < 2; i++) { field_0x0138[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName20[i], 0, NULL); ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setFont(fileSel.mpMessageFont[0]); ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setString(512, ""); + + #if (VERSION != VERSION_GCN_JPN) && (VERSION != VERSION_WII_JPN) field_0x0138[i]->getPanePtr()->resize(440.0f, 198.0f); + #endif + ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setFontSize(21.0f, 21.0f); + + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setLineSpace(22.0f); + ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setCharSpace(2.0f); + #else ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setLineSpace(21.0f); ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setCharSpace(1.0f); + #endif + field_0x0140[i] = ((J2DTextBox*)field_0x0138[i]->getPanePtr())->getStringPtr(); field_0x0138[i]->show(); } @@ -3302,7 +3348,11 @@ void dFile_select_c::MemCardStatCheck() { field_0x0280 = false; field_0x0284 = NULL; field_0x0273 = 2; + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + field_0x0290 = &dFile_select_c::noFileSpaceDispInit; + #else field_0x0290 = &dFile_select_c::noSaveSelDispInit; + #endif field_0x0274 = 18; break; case 2: diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index f99b6af1248..af8fae97b5c 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -9,6 +9,7 @@ #include "m_Do/m_Do_lib.h" #include "dol2asm.h" +#if VERSION == VERSION_GCN_USA // This is a HACK to get d_insect data at correct address due to // issues with the d_a_obj_item vtable. TODO: fix daItem_c vtable #pragma push @@ -24,6 +25,7 @@ SECTION_DATA extern void* __vt__8daItem_c__HACK[] = { NULL, }; #pragma pop +#endif /* 8015E010-8015E078 158950 0068+00 0/0 0/0 13/13 .text __ct__9dInsect_cFv */ dInsect_c::dInsect_c() { diff --git a/src/d/d_menu_fishing.cpp b/src/d/d_menu_fishing.cpp index e61e45829fe..134580fecc7 100644 --- a/src/d/d_menu_fishing.cpp +++ b/src/d/d_menu_fishing.cpp @@ -297,8 +297,15 @@ void dMenu_Fishing_c::screenSetBase() { } mpFishInfoParent[0] = new CPaneMgr(mpScreen, 'info_blu', 0, NULL); mpFishInfoParent[1] = new CPaneMgr(mpScreen, 'info_red', 0, NULL); + + #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) + J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('t_t00'); + mpScreen->search('f_t00')->hide(); + #else J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('f_t00'); mpScreen->search('t_t00')->hide(); + #endif + textBox->setFont(mDoExt_getSubFont()); textBox->setString(0x200, ""); mpString->getString(0x5a1, textBox, NULL, NULL, NULL, 0); @@ -509,4 +516,4 @@ void dMenu_Fishing_c::setHIO(bool i_useHIO) { g_drawHIO.mCollectScreen.mButtonBTextScale); } } -} \ No newline at end of file +}