From fb6939d9cdc3545f8f99ca76dbd8f0c460071142 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 16 Jan 2024 17:18:38 -0500 Subject: Get more TUs to compile --- src/d/actor/d_a_bigelf.cpp | 11 -- src/d/actor/d_a_npc_bs1.cpp | 16 --- src/d/actor/d_a_npc_de1.cpp | 6 - src/d/actor/d_a_npc_so.cpp | 226 +---------------------------------- src/d/actor/d_a_npc_so_cut.inc | 229 ++++++++++++++++++++++++++++++++++++ src/d/actor/d_a_npc_tt.cpp | 40 +------ src/d/actor/d_a_npc_tt_anm.inc | 33 ++++++ src/d/actor/d_a_obj_ekskz.cpp | 6 +- src/d/actor/d_a_obj_hat.cpp | 5 - src/d/actor/d_a_obj_hha.cpp | 20 ---- src/d/actor/d_a_obj_majyuu_door.cpp | 2 +- src/d/actor/d_a_obj_plant.cpp | 2 +- src/d/actor/d_a_obj_tapestry.cpp | 1 - src/d/actor/d_a_obj_vfan.cpp | 6 +- src/d/actor/d_a_ykgr.cpp | 10 ++ src/d/d_gameover.cpp | 30 +---- src/d/d_menu_cloth.cpp | 8 +- src/d/d_menu_collect.cpp | 53 +-------- src/d/d_menu_dmap.cpp | 20 +--- src/d/d_menu_fmap.cpp | 14 +-- src/d/d_menu_fmap2.cpp | 19 +-- src/d/d_menu_item.cpp | 18 +-- src/d/d_menu_option.cpp | 8 +- src/d/d_menu_save.cpp | 17 +-- src/d/d_menu_window.cpp | 60 +--------- 25 files changed, 296 insertions(+), 564 deletions(-) create mode 100644 src/d/actor/d_a_npc_so_cut.inc create mode 100644 src/d/actor/d_a_npc_tt_anm.inc (limited to 'src/d') diff --git a/src/d/actor/d_a_bigelf.cpp b/src/d/actor/d_a_bigelf.cpp index 02744939..29b6d397 100644 --- a/src/d/actor/d_a_bigelf.cpp +++ b/src/d/actor/d_a_bigelf.cpp @@ -355,14 +355,3 @@ static BOOL daBigelf_Draw(daBigelf_c*) { static BOOL daBigelf_IsDelete(daBigelf_c*) { /* Nonmatching */ } - -/* 00003890-000038AC .text setEyePos__10daBigelf_cF4cXyz */ -void daBigelf_c::setEyePos(cXyz) { - /* Nonmatching */ -} - -/* 000038AC-000038C8 .text setAttentionBasePos__10daBigelf_cF4cXyz */ -void daBigelf_c::setAttentionBasePos(cXyz) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index cbf1a6b7..92523616 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -295,19 +295,3 @@ static BOOL daNpc_Bs1_Draw(daNpc_Bs1_c*) { static BOOL daNpc_Bs1_IsDelete(daNpc_Bs1_c*) { /* Nonmatching */ } - -/* 00005848-00005864 .text setEyePos__11daNpc_Bs1_cF4cXyz */ -void daNpc_Bs1_c::setEyePos(cXyz) { - /* Nonmatching */ -} - -/* 00005864-00005880 .text setAttentionBasePos__11daNpc_Bs1_cF4cXyz */ -void daNpc_Bs1_c::setAttentionBasePos(cXyz) { - /* Nonmatching */ -} - -/* 000058BC-0000599C .text getItemZoomPos__16ShopCam_action_cFf */ -void ShopCam_action_c::getItemZoomPos(float) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_npc_de1.cpp b/src/d/actor/d_a_npc_de1.cpp index b2df0a84..46982aff 100644 --- a/src/d/actor/d_a_npc_de1.cpp +++ b/src/d/actor/d_a_npc_de1.cpp @@ -290,9 +290,3 @@ static BOOL daNpc_De1_Draw(daNpc_De1_c*) { static BOOL daNpc_De1_IsDelete(daNpc_De1_c*) { /* Nonmatching */ } - -/* 00002F54-00002F58 .text MatrixCrrPos__6dBgWSvFR13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */ -void dBgWSv::MatrixCrrPos(cBgS_PolyInfo&, void*, bool, cXyz*, csXyz*, csXyz*) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_npc_so.cpp b/src/d/actor/d_a_npc_so.cpp index cbf4494d..e203e506 100644 --- a/src/d/actor/d_a_npc_so.cpp +++ b/src/d/actor/d_a_npc_so.cpp @@ -391,228 +391,4 @@ static BOOL daNpc_SoIsDelete(void*) { /* Nonmatching */ } -/* 00004CE8-000051E8 .text cutProc__10daNpc_So_cFv */ -void daNpc_So_c::cutProc() { - /* Nonmatching */ -} - -/* 000051E8-000051EC .text cutSwimStart__10daNpc_So_cFv */ -void daNpc_So_c::cutSwimStart() { - /* Nonmatching */ -} - -/* 000051EC-00005364 .text cutSwimProc__10daNpc_So_cFv */ -void daNpc_So_c::cutSwimProc() { - /* Nonmatching */ -} - -/* 00005364-000054A4 .text cutJumpStart__10daNpc_So_cFv */ -void daNpc_So_c::cutJumpStart() { - /* Nonmatching */ -} - -/* 000054A4-00005598 .text cutJumpProc__10daNpc_So_cFv */ -void daNpc_So_c::cutJumpProc() { - /* Nonmatching */ -} - -/* 00005598-00005610 .text cutAppearStart__10daNpc_So_cFv */ -void daNpc_So_c::cutAppearStart() { - /* Nonmatching */ -} - -/* 00005610-00005668 .text cutAppearProc__10daNpc_So_cFv */ -void daNpc_So_c::cutAppearProc() { - /* Nonmatching */ -} - -/* 00005668-00005688 .text cutDiveStart__10daNpc_So_cFv */ -void daNpc_So_c::cutDiveStart() { - /* Nonmatching */ -} - -/* 00005688-000056E0 .text cutDiveProc__10daNpc_So_cFv */ -void daNpc_So_c::cutDiveProc() { - /* Nonmatching */ -} - -/* 000056E0-00005778 .text cutDisappearStart__10daNpc_So_cFv */ -void daNpc_So_c::cutDisappearStart() { - /* Nonmatching */ -} - -/* 00005778-000057D0 .text cutDisappearProc__10daNpc_So_cFv */ -void daNpc_So_c::cutDisappearProc() { - /* Nonmatching */ -} - -/* 000057D0-000058D0 .text cutSetAnmStart__10daNpc_So_cFv */ -void daNpc_So_c::cutSetAnmStart() { - /* Nonmatching */ -} - -/* 000058D0-0000599C .text cutSetAnmProc__10daNpc_So_cFv */ -void daNpc_So_c::cutSetAnmProc() { - /* Nonmatching */ -} - -/* 0000599C-00005AA8 .text cutEffectStart__10daNpc_So_cFv */ -void daNpc_So_c::cutEffectStart() { - /* Nonmatching */ -} - -/* 00005AA8-00005ADC .text cutEffectProc__10daNpc_So_cFv */ -void daNpc_So_c::cutEffectProc() { - /* Nonmatching */ -} - -/* 00005ADC-00005AE0 .text cutEquipStart__10daNpc_So_cFv */ -void daNpc_So_c::cutEquipStart() { - /* Nonmatching */ -} - -/* 00005AE0-00005B1C .text cutEquipProc__10daNpc_So_cFv */ -void daNpc_So_c::cutEquipProc() { - /* Nonmatching */ -} - -/* 00005B1C-00005B20 .text cutUnequipStart__10daNpc_So_cFv */ -void daNpc_So_c::cutUnequipStart() { - /* Nonmatching */ -} - -/* 00005B20-00005B5C .text cutUnequipProc__10daNpc_So_cFv */ -void daNpc_So_c::cutUnequipProc() { - /* Nonmatching */ -} - -/* 00005B5C-00005B98 .text cutEatesaStart__10daNpc_So_cFv */ -void daNpc_So_c::cutEatesaStart() { - /* Nonmatching */ -} - -/* 00005B98-00005BF8 .text cutEatesaProc__10daNpc_So_cFv */ -void daNpc_So_c::cutEatesaProc() { - /* Nonmatching */ -} - -/* 00005BF8-00005C6C .text cutEatesaFirstStart__10daNpc_So_cFv */ -void daNpc_So_c::cutEatesaFirstStart() { - /* Nonmatching */ -} - -/* 00005C6C-000060FC .text cutEatesaFirstProc__10daNpc_So_cFv */ -void daNpc_So_c::cutEatesaFirstProc() { - /* Nonmatching */ -} - -/* 000060FC-00006148 .text cutJumpMapopenStart__10daNpc_So_cFv */ -void daNpc_So_c::cutJumpMapopenStart() { - /* Nonmatching */ -} - -/* 00006148-000064B8 .text cutJumpMapopenProc__10daNpc_So_cFv */ -void daNpc_So_c::cutJumpMapopenProc() { - /* Nonmatching */ -} - -/* 000064B8-00006710 .text cutMiniGameStart__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGameStart() { - /* Nonmatching */ -} - -/* 00006710-00006FE4 .text cutMiniGameProc__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGameProc() { - /* Nonmatching */ -} - -/* 00006FE4-00006FF0 .text cutTurnStart__10daNpc_So_cFv */ -void daNpc_So_c::cutTurnStart() { - /* Nonmatching */ -} - -/* 00006FF0-00007114 .text cutTurnProc__10daNpc_So_cFv */ -void daNpc_So_c::cutTurnProc() { - /* Nonmatching */ -} - -/* 00007114-00007324 .text cutMiniGameWarpStart__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGameWarpStart() { - /* Nonmatching */ -} - -/* 00007324-00007438 .text cutMiniGameWarpProc__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGameWarpProc() { - /* Nonmatching */ -} - -/* 00007438-00007524 .text cutMiniGameReturnStart__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGameReturnStart() { - /* Nonmatching */ -} - -/* 00007524-0000781C .text cutMiniGameReturnProc__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGameReturnProc() { - /* Nonmatching */ -} - -/* 0000781C-00007820 .text cutPartnerShipStart__10daNpc_So_cFv */ -void daNpc_So_c::cutPartnerShipStart() { - /* Nonmatching */ -} - -/* 00007820-00007878 .text cutPartnerShipProc__10daNpc_So_cFv */ -void daNpc_So_c::cutPartnerShipProc() { - /* Nonmatching */ -} - -/* 00007878-000078E0 .text cutMiniGameWaitStart__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGameWaitStart() { - /* Nonmatching */ -} - -/* 000078E0-00007914 .text cutMiniGameWaitProc__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGameWaitProc() { - /* Nonmatching */ -} - -/* 00007914-00007934 .text cutMiniGameEndStart__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGameEndStart() { - /* Nonmatching */ -} - -/* 00007934-0000798C .text cutMiniGameEndProc__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGameEndProc() { - /* Nonmatching */ -} - -/* 0000798C-000079AC .text cutMiniGamePlTurnStart__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGamePlTurnStart() { - /* Nonmatching */ -} - -/* 000079AC-00007AC0 .text cutMiniGamePlTurnProc__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGamePlTurnProc() { - /* Nonmatching */ -} - -/* 00007AC0-00007B1C .text cutMiniGamePlUpStart__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGamePlUpStart() { - /* Nonmatching */ -} - -/* 00007B1C-00007CBC .text cutMiniGamePlUpProc__10daNpc_So_cFv */ -void daNpc_So_c::cutMiniGamePlUpProc() { - /* Nonmatching */ -} - -/* 00007CBC-00007E74 .text initCam__10daNpc_So_cFv */ -void daNpc_So_c::initCam() { - /* Nonmatching */ -} - -/* 00007E74-00008010 .text moveCam__10daNpc_So_cFv */ -void daNpc_So_c::moveCam() { - /* Nonmatching */ -} - +#include "d/actor/d_a_npc_so_cut.inc" diff --git a/src/d/actor/d_a_npc_so_cut.inc b/src/d/actor/d_a_npc_so_cut.inc new file mode 100644 index 00000000..7ec72d11 --- /dev/null +++ b/src/d/actor/d_a_npc_so_cut.inc @@ -0,0 +1,229 @@ +// The original name of this file is unknown, but it must exist because d_a_npc_so's "cut" functions +// are in a separate .text section from the rest of its functions. + +#include "d/actor/d_a_npc_so.h" + +/* 00004CE8-000051E8 .text cutProc__10daNpc_So_cFv */ +void daNpc_So_c::cutProc() { + /* Nonmatching */ +} + +/* 000051E8-000051EC .text cutSwimStart__10daNpc_So_cFv */ +void daNpc_So_c::cutSwimStart() { + /* Nonmatching */ +} + +/* 000051EC-00005364 .text cutSwimProc__10daNpc_So_cFv */ +void daNpc_So_c::cutSwimProc() { + /* Nonmatching */ +} + +/* 00005364-000054A4 .text cutJumpStart__10daNpc_So_cFv */ +void daNpc_So_c::cutJumpStart() { + /* Nonmatching */ +} + +/* 000054A4-00005598 .text cutJumpProc__10daNpc_So_cFv */ +void daNpc_So_c::cutJumpProc() { + /* Nonmatching */ +} + +/* 00005598-00005610 .text cutAppearStart__10daNpc_So_cFv */ +void daNpc_So_c::cutAppearStart() { + /* Nonmatching */ +} + +/* 00005610-00005668 .text cutAppearProc__10daNpc_So_cFv */ +void daNpc_So_c::cutAppearProc() { + /* Nonmatching */ +} + +/* 00005668-00005688 .text cutDiveStart__10daNpc_So_cFv */ +void daNpc_So_c::cutDiveStart() { + /* Nonmatching */ +} + +/* 00005688-000056E0 .text cutDiveProc__10daNpc_So_cFv */ +void daNpc_So_c::cutDiveProc() { + /* Nonmatching */ +} + +/* 000056E0-00005778 .text cutDisappearStart__10daNpc_So_cFv */ +void daNpc_So_c::cutDisappearStart() { + /* Nonmatching */ +} + +/* 00005778-000057D0 .text cutDisappearProc__10daNpc_So_cFv */ +void daNpc_So_c::cutDisappearProc() { + /* Nonmatching */ +} + +/* 000057D0-000058D0 .text cutSetAnmStart__10daNpc_So_cFv */ +void daNpc_So_c::cutSetAnmStart() { + /* Nonmatching */ +} + +/* 000058D0-0000599C .text cutSetAnmProc__10daNpc_So_cFv */ +void daNpc_So_c::cutSetAnmProc() { + /* Nonmatching */ +} + +/* 0000599C-00005AA8 .text cutEffectStart__10daNpc_So_cFv */ +void daNpc_So_c::cutEffectStart() { + /* Nonmatching */ +} + +/* 00005AA8-00005ADC .text cutEffectProc__10daNpc_So_cFv */ +void daNpc_So_c::cutEffectProc() { + /* Nonmatching */ +} + +/* 00005ADC-00005AE0 .text cutEquipStart__10daNpc_So_cFv */ +void daNpc_So_c::cutEquipStart() { + /* Nonmatching */ +} + +/* 00005AE0-00005B1C .text cutEquipProc__10daNpc_So_cFv */ +void daNpc_So_c::cutEquipProc() { + /* Nonmatching */ +} + +/* 00005B1C-00005B20 .text cutUnequipStart__10daNpc_So_cFv */ +void daNpc_So_c::cutUnequipStart() { + /* Nonmatching */ +} + +/* 00005B20-00005B5C .text cutUnequipProc__10daNpc_So_cFv */ +void daNpc_So_c::cutUnequipProc() { + /* Nonmatching */ +} + +/* 00005B5C-00005B98 .text cutEatesaStart__10daNpc_So_cFv */ +void daNpc_So_c::cutEatesaStart() { + /* Nonmatching */ +} + +/* 00005B98-00005BF8 .text cutEatesaProc__10daNpc_So_cFv */ +void daNpc_So_c::cutEatesaProc() { + /* Nonmatching */ +} + +/* 00005BF8-00005C6C .text cutEatesaFirstStart__10daNpc_So_cFv */ +void daNpc_So_c::cutEatesaFirstStart() { + /* Nonmatching */ +} + +/* 00005C6C-000060FC .text cutEatesaFirstProc__10daNpc_So_cFv */ +void daNpc_So_c::cutEatesaFirstProc() { + /* Nonmatching */ +} + +/* 000060FC-00006148 .text cutJumpMapopenStart__10daNpc_So_cFv */ +void daNpc_So_c::cutJumpMapopenStart() { + /* Nonmatching */ +} + +/* 00006148-000064B8 .text cutJumpMapopenProc__10daNpc_So_cFv */ +void daNpc_So_c::cutJumpMapopenProc() { + /* Nonmatching */ +} + +/* 000064B8-00006710 .text cutMiniGameStart__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGameStart() { + /* Nonmatching */ +} + +/* 00006710-00006FE4 .text cutMiniGameProc__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGameProc() { + /* Nonmatching */ +} + +/* 00006FE4-00006FF0 .text cutTurnStart__10daNpc_So_cFv */ +void daNpc_So_c::cutTurnStart() { + /* Nonmatching */ +} + +/* 00006FF0-00007114 .text cutTurnProc__10daNpc_So_cFv */ +void daNpc_So_c::cutTurnProc() { + /* Nonmatching */ +} + +/* 00007114-00007324 .text cutMiniGameWarpStart__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGameWarpStart() { + /* Nonmatching */ +} + +/* 00007324-00007438 .text cutMiniGameWarpProc__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGameWarpProc() { + /* Nonmatching */ +} + +/* 00007438-00007524 .text cutMiniGameReturnStart__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGameReturnStart() { + /* Nonmatching */ +} + +/* 00007524-0000781C .text cutMiniGameReturnProc__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGameReturnProc() { + /* Nonmatching */ +} + +/* 0000781C-00007820 .text cutPartnerShipStart__10daNpc_So_cFv */ +void daNpc_So_c::cutPartnerShipStart() { + /* Nonmatching */ +} + +/* 00007820-00007878 .text cutPartnerShipProc__10daNpc_So_cFv */ +void daNpc_So_c::cutPartnerShipProc() { + /* Nonmatching */ +} + +/* 00007878-000078E0 .text cutMiniGameWaitStart__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGameWaitStart() { + /* Nonmatching */ +} + +/* 000078E0-00007914 .text cutMiniGameWaitProc__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGameWaitProc() { + /* Nonmatching */ +} + +/* 00007914-00007934 .text cutMiniGameEndStart__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGameEndStart() { + /* Nonmatching */ +} + +/* 00007934-0000798C .text cutMiniGameEndProc__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGameEndProc() { + /* Nonmatching */ +} + +/* 0000798C-000079AC .text cutMiniGamePlTurnStart__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGamePlTurnStart() { + /* Nonmatching */ +} + +/* 000079AC-00007AC0 .text cutMiniGamePlTurnProc__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGamePlTurnProc() { + /* Nonmatching */ +} + +/* 00007AC0-00007B1C .text cutMiniGamePlUpStart__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGamePlUpStart() { + /* Nonmatching */ +} + +/* 00007B1C-00007CBC .text cutMiniGamePlUpProc__10daNpc_So_cFv */ +void daNpc_So_c::cutMiniGamePlUpProc() { + /* Nonmatching */ +} + +/* 00007CBC-00007E74 .text initCam__10daNpc_So_cFv */ +void daNpc_So_c::initCam() { + /* Nonmatching */ +} + +/* 00007E74-00008010 .text moveCam__10daNpc_So_cFv */ +void daNpc_So_c::moveCam() { + /* Nonmatching */ +} diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp index 9d3afa7d..7915ca30 100644 --- a/src/d/actor/d_a_npc_tt.cpp +++ b/src/d/actor/d_a_npc_tt.cpp @@ -250,43 +250,5 @@ static BOOL daNpc_Tt_Draw(daNpc_Tt_c*) { static BOOL daNpc_Tt_IsDelete(daNpc_Tt_c*) { /* Nonmatching */ } -/* 00002C60-00002C7C .text setEyePos__10daNpc_Tt_cF4cXyz */ -void daNpc_Tt_c::setEyePos(cXyz) { - /* Nonmatching */ -} - -/* 00002C7C-00002C98 .text setAttentionBasePos__10daNpc_Tt_cF4cXyz */ -void daNpc_Tt_c::setAttentionBasePos(cXyz) { - /* Nonmatching */ -} - -/* 00002CD4-00002DEC .text initTexPatternAnm__10daNpc_Tt_cFb */ -void daNpc_Tt_c::initTexPatternAnm(bool) { - /* Nonmatching */ -} - -/* 00002DEC-00002E78 .text playTexPatternAnm__10daNpc_Tt_cFv */ -void daNpc_Tt_c::playTexPatternAnm() { - /* Nonmatching */ -} - -/* 00002E78-00002F94 .text setAnm__10daNpc_Tt_cFi */ -void daNpc_Tt_c::setAnm(int) { - /* Nonmatching */ -} - -/* 00002F94-00002FFC .text danceInit__10daNpc_Tt_cFi */ -void daNpc_Tt_c::danceInit(int) { - /* Nonmatching */ -} - -/* 00002FFC-000030B0 .text danceProc__10daNpc_Tt_cFv */ -void daNpc_Tt_c::danceProc() { - /* Nonmatching */ -} - -/* 000030B0-00003210 .text danceNext__10daNpc_Tt_cFv */ -void daNpc_Tt_c::danceNext() { - /* Nonmatching */ -} +#include "d/actor/d_a_npc_tt_anm.inc" diff --git a/src/d/actor/d_a_npc_tt_anm.inc b/src/d/actor/d_a_npc_tt_anm.inc new file mode 100644 index 00000000..8f63442c --- /dev/null +++ b/src/d/actor/d_a_npc_tt_anm.inc @@ -0,0 +1,33 @@ +// The name of this .inc file is known because of an assert contained in it. + +#include "d/actor/d_a_npc_tt.h" + +/* 00002CD4-00002DEC .text initTexPatternAnm__10daNpc_Tt_cFb */ +void daNpc_Tt_c::initTexPatternAnm(bool) { + /* Nonmatching */ +} + +/* 00002DEC-00002E78 .text playTexPatternAnm__10daNpc_Tt_cFv */ +void daNpc_Tt_c::playTexPatternAnm() { + /* Nonmatching */ +} + +/* 00002E78-00002F94 .text setAnm__10daNpc_Tt_cFi */ +void daNpc_Tt_c::setAnm(int) { + /* Nonmatching */ +} + +/* 00002F94-00002FFC .text danceInit__10daNpc_Tt_cFi */ +void daNpc_Tt_c::danceInit(int) { + /* Nonmatching */ +} + +/* 00002FFC-000030B0 .text danceProc__10daNpc_Tt_cFv */ +void daNpc_Tt_c::danceProc() { + /* Nonmatching */ +} + +/* 000030B0-00003210 .text danceNext__10daNpc_Tt_cFv */ +void daNpc_Tt_c::danceNext() { + /* Nonmatching */ +} diff --git a/src/d/actor/d_a_obj_ekskz.cpp b/src/d/actor/d_a_obj_ekskz.cpp index a98e0a1e..227d50d8 100644 --- a/src/d/actor/d_a_obj_ekskz.cpp +++ b/src/d/actor/d_a_obj_ekskz.cpp @@ -7,12 +7,12 @@ #include "dolphin/types.h" /* 00000078-00000368 .text CreateHeap__Q210daObjEkskz5Act_cFv */ -void daObjEkskz::Act_c::CreateHeap() { +int daObjEkskz::Act_c::CreateHeap() { /* Nonmatching */ } /* 00000368-0000054C .text Create__Q210daObjEkskz5Act_cFv */ -s32 daObjEkskz::Act_c::Create() { +int daObjEkskz::Act_c::Create() { /* Nonmatching */ } @@ -42,7 +42,7 @@ void daObjEkskz::Act_c::init_mtx() { } /* 00000DC0-00000FFC .text Execute__Q210daObjEkskz5Act_cFPPA3_A4_f */ -void daObjEkskz::Act_c::Execute(float(**)[3][4]) { +int daObjEkskz::Act_c::Execute(float(**)[3][4]) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp index 5fae315a..5fc777c7 100644 --- a/src/d/actor/d_a_obj_hat.cpp +++ b/src/d/actor/d_a_obj_hat.cpp @@ -90,8 +90,3 @@ static BOOL daSampleDraw(void*) { static BOOL daSampleIsDelete(void*) { /* Nonmatching */ } - -/* 00000B94-00000BB0 .text getWindVec__12daNpcRoten_cFv */ -void daNpcRoten_c::getWindVec() { - /* Nonmatching */ -} diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index a8c451b8..fcc2eba8 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/src/d/actor/d_a_obj_hha.cpp @@ -155,23 +155,3 @@ BOOL daObjHha_c::_execute() { BOOL daObjHha_c::_draw() { /* Nonmatching */ } -/* 00003064-00003080 .text get_base_pos__16daObjHhaSplash_cFv */ -void daObjHhaSplash_c::get_base_pos() { - /* Nonmatching */ -} - -/* 00003080-0000309C .text get_pos__16daObjHhaSplash_cFv */ -void daObjHhaSplash_c::get_pos() { - /* Nonmatching */ -} - -/* 0000309C-000030B8 .text set_pos__15daObjHhaYgush_cF4cXyz */ -void daObjHhaYgush_c::set_pos(cXyz) { - /* Nonmatching */ -} - -/* 000030B8-000030D4 .text get_base_pos__15daObjHhaYgush_cFv */ -void daObjHhaYgush_c::get_base_pos() { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_obj_majyuu_door.cpp b/src/d/actor/d_a_obj_majyuu_door.cpp index 05271af8..7c50163c 100644 --- a/src/d/actor/d_a_obj_majyuu_door.cpp +++ b/src/d/actor/d_a_obj_majyuu_door.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_obj_majyuu_door.h" -#include "dolphin/types.h" +#include "d/d_cc_d.h" /* 000000EC-0000010C .text createHeap_CB__FP10fopAc_ac_c */ static BOOL createHeap_CB(fopAc_ac_c*) { diff --git a/src/d/actor/d_a_obj_plant.cpp b/src/d/actor/d_a_obj_plant.cpp index 7b75c9f2..9af9bd03 100644 --- a/src/d/actor/d_a_obj_plant.cpp +++ b/src/d/actor/d_a_obj_plant.cpp @@ -4,7 +4,7 @@ // #include "d/actor/d_a_obj_plant.h" -#include "dolphin/types.h" +#include "m_Do/m_Do_ext.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { diff --git a/src/d/actor/d_a_obj_tapestry.cpp b/src/d/actor/d_a_obj_tapestry.cpp index d278ac18..fb7a3278 100644 --- a/src/d/actor/d_a_obj_tapestry.cpp +++ b/src/d/actor/d_a_obj_tapestry.cpp @@ -340,4 +340,3 @@ static BOOL daObjTapestry_Draw(daObjTapestry_c*) { static BOOL daObjTapestry_IsDelete(daObjTapestry_c*) { /* Nonmatching */ } - diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index 40343b1b..3376e7fa 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -7,12 +7,12 @@ #include "dolphin/types.h" /* 00000078-00000134 .text CreateHeap__Q29daObjVfan5Act_cFv */ -void daObjVfan::Act_c::CreateHeap() { +int daObjVfan::Act_c::CreateHeap() { /* Nonmatching */ } /* 00000134-00000214 .text Create__Q29daObjVfan5Act_cFv */ -s32 daObjVfan::Act_c::Create() { +int daObjVfan::Act_c::Create() { /* Nonmatching */ } @@ -47,7 +47,7 @@ void daObjVfan::Act_c::ParticleSet() { } /* 000009B4-00000C74 .text Execute__Q29daObjVfan5Act_cFPPA3_A4_f */ -void daObjVfan::Act_c::Execute(float(**)[3][4]) { +int daObjVfan::Act_c::Execute(float(**)[3][4]) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 9bc47ad8..1fc1a43f 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -6,6 +6,16 @@ #include "d/actor/d_a_ykgr.h" #include "dolphin/types.h" +/* 000000EC-00000134 .text draw__17dPa_YkgrPcallBackFP14JPABaseEmitterP15JPABaseParticle */ +void dPa_YkgrPcallBack::draw(JPABaseEmitter*, JPABaseParticle*) { + /* Nonmatching */ +} + +/* 00000134-00000234 .text setParam__17dPa_YkgrPcallBackFf */ +void dPa_YkgrPcallBack::setParam(float) { + /* Nonmatching */ +} + /* 00000234-00000408 .text getPosRate__8daYkgr_cFv */ void daYkgr_c::getPosRate() { /* Nonmatching */ diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index fd514ea6..ca161121 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_gameover.cpp // +#include "d/d_menu_save.h" #include "d/d_drawlist.h" #include "d/d_com_inf_game.h" #include "d/d_meter.h" @@ -17,35 +18,6 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "SSystem/SComponent/c_phase.h" -class dDlst_MenuSave_c : public dDlst_base_c { -}; - -class dMenu_save_c { -public: - virtual ~dMenu_save_c() {} - void _create(); - void _draw2(); - void _move(); - bool _open(); - bool _close(); - void _delete(); - -public: - /* 0x0004 */ u8 field_0x0004; - /* 0x0008 */ dDlst_MenuSave_c mDlst; - /* 0x000C */ u8 field_0x000c[0x0524]; - /* 0x0530 */ u8 field_0x0530; - /* 0x0531 */ u8 field_0x0531; - /* 0x0532 */ u8 field_0x0532; - /* 0x0533 */ u8 field_0x0533; - /* 0x0534 */ u8 field_0x0534; - /* 0x0535 */ u8 field_0x0535; - /* 0x0536 */ u8 field_0x0536; - /* 0x0537 */ u8 field_0x0537; - /* 0x0538 */ u8 field_0x0538; - /* 0x0539 */ u8 field_0x0539[0x1ba4 - 0x0539]; -}; - class dDlst_Gameover_CAPTURE_c : public dDlst_base_c { public: virtual ~dDlst_Gameover_CAPTURE_c() {} diff --git a/src/d/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp index 74688b0e..efc1da3a 100644 --- a/src/d/d_menu_cloth.cpp +++ b/src/d/d_menu_cloth.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_menu_cloth.cpp // -#include "d_menu_cloth.h" +#include "d/d_menu_cloth.h" #include "dolphin/types.h" /* 8019940C-8019966C .text __ct__13daCLOTH_HIO_cFv */ @@ -145,9 +145,3 @@ void dMenu_ClothDraw(void*) { void dMenu_ClothIsDelete(void*) { /* Nonmatching */ } - -/* 8019BDE0-8019BE50 .text __dt__13daCLOTH_HIO_cFv */ -daCLOTH_HIO_c::~daCLOTH_HIO_c() { - /* Nonmatching */ -} - diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index bf24d015..4e606177 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_menu_collect.cpp // -#include "d_menu_collect.h" +#include "d/d_menu_collect.h" #include "dolphin/types.h" /* 8019BE8C-8019BF14 .text __ct__9dMc_HIO_cFv */ @@ -290,54 +290,3 @@ void dMenu_Collect_c::_open2() { void dMenu_Collect_c::_close2() { /* Nonmatching */ } - -/* 801A84B4-801A84FC .text __dt__14dMenu_Option_cFv */ -dMenu_Option_c::~dMenu_Option_c() { - /* Nonmatching */ -} - -/* 801A84FC-801A8584 .text __dt__15dMenu_Collect_cFv */ -dMenu_Collect_c::~dMenu_Collect_c() { - /* Nonmatching */ -} - -/* 801A8584-801A85B0 .text draw__15dMenu_Collect_cFv */ -void dMenu_Collect_c::draw() { - /* Nonmatching */ -} - -/* 801A85B0-801A860C .text __dt__12dMenu_base_cFv */ -dMenu_base_c::~dMenu_base_c() { - /* Nonmatching */ -} - -/* 801A860C-801A8610 .text _create__12dMenu_base_cFv */ -void dMenu_base_c::_create() { - /* Nonmatching */ -} - -/* 801A8610-801A8614 .text _delete__12dMenu_base_cFv */ -void dMenu_base_c::_delete() { - /* Nonmatching */ -} - -/* 801A8614-801A8618 .text _move__12dMenu_base_cFv */ -void dMenu_base_c::_move() { - /* Nonmatching */ -} - -/* 801A8618-801A861C .text _draw__12dMenu_base_cFv */ -void dMenu_base_c::_draw() { - /* Nonmatching */ -} - -/* 801A861C-801A8620 .text draw__12dMenu_base_cFv */ -void dMenu_base_c::draw() { - /* Nonmatching */ -} - -/* 801A8620-801A8668 .text __dt__9dMc_HIO_cFv */ -dMc_HIO_c::~dMc_HIO_c() { - /* Nonmatching */ -} - diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index ff2984df..ecf49681 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -3,8 +3,8 @@ // Translation Unit: d_menu_dmap.cpp // -#include "d_menu_dmap.h" -#include "dolphin/types.h" +#include "d/d_menu_dmap.h" +#include "d/d_stage.h" /* 801A86A4-801A87CC .text __ct__9dMd_HIO_cFv */ dMd_HIO_c::dMd_HIO_c() { @@ -185,19 +185,3 @@ void dMenu_Dmap_c::_open() { void dMenu_Dmap_c::_close() { /* Nonmatching */ } - -/* 801AF3B8-801AF440 .text __dt__12dMenu_Dmap_cFv */ -dMenu_Dmap_c::~dMenu_Dmap_c() { - /* Nonmatching */ -} - -/* 801AF440-801AF46C .text draw__12dMenu_Dmap_cFv */ -void dMenu_Dmap_c::draw() { - /* Nonmatching */ -} - -/* 801AF46C-801AF4B4 .text __dt__9dMd_HIO_cFv */ -dMd_HIO_c::~dMd_HIO_c() { - /* Nonmatching */ -} - diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index 5460a4e5..df696042 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -3,8 +3,7 @@ // Translation Unit: d_menu_fmap.cpp // -#include "d_menu_fmap.h" -#include "dolphin/types.h" +#include "d/d_menu_fmap.h" /* 801AF4F0-801AF848 .text __ct__9dMf_HIO_cFv */ dMf_HIO_c::dMf_HIO_c() { @@ -660,14 +659,3 @@ void dMenu_Fmap_c::getButtonIconMode() { void dDlst_FMAP_c::draw() { /* Nonmatching */ } - -/* 801BB088-801BB0E4 .text __dt__12dDlst_FMAP_cFv */ -dDlst_FMAP_c::~dDlst_FMAP_c() { - /* Nonmatching */ -} - -/* 801BB0E4-801BB12C .text __dt__9dMf_HIO_cFv */ -dMf_HIO_c::~dMf_HIO_c() { - /* Nonmatching */ -} - diff --git a/src/d/d_menu_fmap2.cpp b/src/d/d_menu_fmap2.cpp index b02a4448..8a26d818 100644 --- a/src/d/d_menu_fmap2.cpp +++ b/src/d/d_menu_fmap2.cpp @@ -3,8 +3,7 @@ // Translation Unit: d_menu_fmap2.cpp // -#include "d_menu_fmap2.h" -#include "dolphin/types.h" +#include "d/d_menu_fmap2.h" /* 801BB3E4-801BB5B8 .text __ct__10dMf2_HIO_cFv */ dMf2_HIO_c::dMf2_HIO_c() { @@ -570,19 +569,3 @@ void dDlst_FMAP2_c::draw() { void dDlst_FMAP2GS_c::draw() { /* Nonmatching */ } - -/* 801C790C-801C7968 .text __dt__15dDlst_FMAP2GS_cFv */ -dDlst_FMAP2GS_c::~dDlst_FMAP2GS_c() { - /* Nonmatching */ -} - -/* 801C7968-801C79C4 .text __dt__13dDlst_FMAP2_cFv */ -dDlst_FMAP2_c::~dDlst_FMAP2_c() { - /* Nonmatching */ -} - -/* 801C79C4-801C7A0C .text __dt__10dMf2_HIO_cFv */ -dMf2_HIO_c::~dMf2_HIO_c() { - /* Nonmatching */ -} - diff --git a/src/d/d_menu_item.cpp b/src/d/d_menu_item.cpp index b3b81586..0de373b3 100644 --- a/src/d/d_menu_item.cpp +++ b/src/d/d_menu_item.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_menu_item.cpp // -#include "d_menu_item.h" +#include "d/d_menu_item.h" #include "dolphin/types.h" /* 801C7B4C-801C7C7C .text __ct__9dMi_HIO_cFv */ @@ -260,19 +260,3 @@ void dMenu_Item_c::_open2() { void dMenu_Item_c::_close2() { /* Nonmatching */ } - -/* 801D2A4C-801D2AB8 .text __dt__12dMenu_Item_cFv */ -dMenu_Item_c::~dMenu_Item_c() { - /* Nonmatching */ -} - -/* 801D2AB8-801D2AE4 .text draw__12dMenu_Item_cFv */ -void dMenu_Item_c::draw() { - /* Nonmatching */ -} - -/* 801D2AE4-801D2B2C .text __dt__9dMi_HIO_cFv */ -dMi_HIO_c::~dMi_HIO_c() { - /* Nonmatching */ -} - diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index 9a9326a6..4079c582 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_menu_option.cpp // -#include "d_menu_option.h" +#include "d/d_menu_option.h" #include "dolphin/types.h" /* 801D2B68-801D2B78 .text __ct__9dMo_HIO_cFv */ @@ -150,9 +150,3 @@ void dMenu_Option_c::_open() { void dMenu_Option_c::_close() { /* Nonmatching */ } - -/* 801D5D38-801D5D80 .text __dt__9dMo_HIO_cFv */ -dMo_HIO_c::~dMo_HIO_c() { - /* Nonmatching */ -} - diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index 7609eba4..33d3e45e 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_menu_save.cpp // -#include "d_menu_save.h" +#include "d/d_menu_save.h" #include "dolphin/types.h" /* 801D5DB8-801D5E8C .text __ct__9dMs_HIO_cFv */ @@ -22,7 +22,7 @@ void dMenu_save_c::initialize() { } /* 801D6174-801D61A0 .text _open__12dMenu_save_cFv */ -void dMenu_save_c::_open() { +bool dMenu_save_c::_open() { /* Nonmatching */ } @@ -32,7 +32,7 @@ void dMenu_save_c::openNormal() { } /* 801D62CC-801D62F8 .text _close__12dMenu_save_cFv */ -void dMenu_save_c::_close() { +bool dMenu_save_c::_close() { /* Nonmatching */ } @@ -420,14 +420,3 @@ void dMenu_save_c::_draw2() { void dDlst_MenuSave_c::draw() { /* Nonmatching */ } - -/* 801DAED0-801DAF44 .text __dt__13dFile_error_cFv */ -dFile_error_c::~dFile_error_c() { - /* Nonmatching */ -} - -/* 801DAF44-801DAF8C .text __dt__9dMs_HIO_cFv */ -dMs_HIO_c::~dMs_HIO_c() { - /* Nonmatching */ -} - diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index b493585e..58ef1456 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -3,8 +3,8 @@ // Translation Unit: d_menu_window.cpp // -#include "d_menu_window.h" -#include "dolphin/types.h" +#include "d/d_menu_window.h" +#include "f_op/f_op_msg.h" /* 801DB384-801DB50C .text __ct__9dMw_HIO_cFv */ dMw_HIO_c::dMw_HIO_c() { @@ -160,59 +160,3 @@ void dMs_Delete(sub_ms_screen_class*) { void dMs_Create(msg_class*) { /* Nonmatching */ } - -/* 801DF684-801DF9C0 .text draw__20dDlst_MENU_CAPTURE_cFv */ -void dDlst_MENU_CAPTURE_c::draw() { - /* Nonmatching */ -} - -/* 801DF9C0-801DFA70 .text draw__18dDlst_MENU_CLOTH_cFv */ -void dDlst_MENU_CLOTH_c::draw() { - /* Nonmatching */ -} - -/* 801DFA70-801DFACC .text __dt__20dDlst_MENU_CAPTURE_cFv */ -dDlst_MENU_CAPTURE_c::~dDlst_MENU_CAPTURE_c() { - /* Nonmatching */ -} - -/* 801DFACC-801DFB28 .text __dt__18dDlst_MENU_CLOTH_cFv */ -dDlst_MENU_CLOTH_c::~dDlst_MENU_CLOTH_c() { - /* Nonmatching */ -} - -/* 801DFB28-801DFBC4 .text __dt__13dMenu_Fmap2_cFv */ -dMenu_Fmap2_c::~dMenu_Fmap2_c() { - /* Nonmatching */ -} - -/* 801DFBC4-801DFC9C .text __dt__12dMenu_Fmap_cFv */ -dMenu_Fmap_c::~dMenu_Fmap_c() { - /* Nonmatching */ -} - -/* 801DFC9C-801DFCF8 .text __dt__14dDlst_NameIN_cFv */ -dDlst_NameIN_c::~dDlst_NameIN_c() { - /* Nonmatching */ -} - -/* 801DFCF8-801DFD6C .text __dt__7dName_cFv */ -dName_c::~dName_c() { - /* Nonmatching */ -} - -/* 801DFD6C-801DFDB4 .text __dt__10dMw_DHIO_cFv */ -dMw_DHIO_c::~dMw_DHIO_c() { - /* Nonmatching */ -} - -/* 801DFDB4-801DFDFC .text __dt__9dMw_HIO_cFv */ -dMw_HIO_c::~dMw_HIO_c() { - /* Nonmatching */ -} - -/* 801DFEA8-801DFEE4 .text __dt__14dMenu_FmapSv_cFv */ -dMenu_FmapSv_c::~dMenu_FmapSv_c() { - /* Nonmatching */ -} - -- cgit v1.2.3