From f8979749e3ef8e8cacf2ea8f474c7f23fc5cb6b3 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 30 Aug 2022 14:22:17 -0700 Subject: j2d / map_path work, d_drawlist / d_attention cleanup (#208) * work on fop actor / actor mng, daalink, d_a_obj_item * d_a_title mostly decompiled * daalink / d_event / JMessage / dmsg_out_font work * msg_scrn_base / msg_scrn_boss * some work on mDo machine, d_menu_save, d_tresure, and various * remove asm * progress * finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data * rename more data * remove asm / progress * match all of d_pane_class * fixes / some dKankyo doc * bunch of j2d work. d_drawlist / d_attention cleanup * progress / asm * cleanup wip * decompile JStage * setup some more JStudio structs * set up d_demo classes * some d_demo work * cleanup dolphin os stuff * some initial dEvent documentation * some At collision documentation * match JUTConsole::doDraw * dbgs work / split up some of d_a_alink into .inc files * d_a_alink_spinner work --- libs/JSystem/JStage/JSGSystem.cpp | 127 +++----------------------------------- 1 file changed, 8 insertions(+), 119 deletions(-) (limited to 'libs/JSystem/JStage/JSGSystem.cpp') diff --git a/libs/JSystem/JStage/JSGSystem.cpp b/libs/JSystem/JStage/JSGSystem.cpp index 62ae7a01f1..e21642b2e6 100644 --- a/libs/JSystem/JStage/JSGSystem.cpp +++ b/libs/JSystem/JStage/JSGSystem.cpp @@ -1,145 +1,34 @@ -// -// Generated By: dol2asm -// Translation Unit: JSGSystem -// - #include "JSystem/JStage/JSGSystem.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct JStage { - struct TObject { - /* 80280DD4 */ ~TObject(); - /* 80280E1C */ bool JSGGetName() const; - /* 80280E24 */ void JSGUpdate(); - /* 80280E28 */ bool JSGGetFlag() const; - /* 80280E30 */ void JSGSetFlag(u32); - /* 80280E34 */ bool JSGGetData(u32, void*, u32) const; - /* 80280E3C */ void JSGSetData(u32, void const*, u32); - /* 80280E40 */ void JSGGetParent(JStage::TObject**, u32*) const; - /* 80280E44 */ void JSGSetParent(JStage::TObject*, u32); - /* 80280E48 */ void JSGSetRelation(bool, JStage::TObject*, u32); - /* 80280E4C */ s32 JSGFindNodeID(char const*) const; - /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; - }; - - struct TEObject {}; - - struct TSystem { - /* 80280E90 */ ~TSystem(); - /* 80280EF0 */ bool JSGFGetType() const; - /* 80280EF8 */ bool JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const; - /* 80280F00 */ bool JSGCreateObject(char const*, JStage::TEObject, u32); - /* 80280F08 */ void JSGDestroyObject(JStage::TObject*); - /* 80280F0C */ bool JSGGetSystemData(u32); - /* 80280F14 */ void JSGSetSystemData(u32, u32); - }; -}; - -// -// Forward References: -// - -extern "C" void __dt__Q26JStage7TSystemFv(); -extern "C" bool JSGFGetType__Q26JStage7TSystemCFv(); -extern "C" bool JSGFindObject__Q26JStage7TSystemCFPPQ26JStage7TObjectPCcQ26JStage8TEObject(); -extern "C" bool JSGCreateObject__Q26JStage7TSystemFPCcQ26JStage8TEObjectUl(); -extern "C" void JSGDestroyObject__Q26JStage7TSystemFPQ26JStage7TObject(); -extern "C" bool JSGGetSystemData__Q26JStage7TSystemFUl(); -extern "C" void JSGSetSystemData__Q26JStage7TSystemFUlUl(); - -// -// External References: -// - -extern "C" void __dt__Q26JStage7TObjectFv(); -extern "C" bool JSGGetName__Q26JStage7TObjectCFv(); -extern "C" void JSGUpdate__Q26JStage7TObjectFv(); -extern "C" bool JSGGetFlag__Q26JStage7TObjectCFv(); -extern "C" void JSGSetFlag__Q26JStage7TObjectFUl(); -extern "C" bool JSGGetData__Q26JStage7TObjectCFUlPvUl(); -extern "C" void JSGSetData__Q26JStage7TObjectFUlPCvUl(); -extern "C" void JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl(); -extern "C" void JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl(); -extern "C" void JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl(); -extern "C" s32 JSGFindNodeID__Q26JStage7TObjectCFPCc(); -extern "C" void JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C4828-803C4878 021948 0050+00 1/1 1/1 0/0 .data __vt__Q26JStage7TSystem */ -SECTION_DATA extern void* __vt__Q26JStage7TSystem[20] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)NULL, - (void*)JSGFGetType__Q26JStage7TSystemCFv, - (void*)JSGGetName__Q26JStage7TObjectCFv, - (void*)JSGUpdate__Q26JStage7TObjectFv, - (void*)JSGGetFlag__Q26JStage7TObjectCFv, - (void*)JSGSetFlag__Q26JStage7TObjectFUl, - (void*)JSGGetData__Q26JStage7TObjectCFUlPvUl, - (void*)JSGSetData__Q26JStage7TObjectFUlPCvUl, - (void*)JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl, - (void*)JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl, - (void*)JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl, - (void*)JSGFindNodeID__Q26JStage7TObjectCFPCc, - (void*)JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f, - (void*)JSGFindObject__Q26JStage7TSystemCFPPQ26JStage7TObjectPCcQ26JStage8TEObject, - (void*)JSGCreateObject__Q26JStage7TSystemFPCcQ26JStage8TEObjectUl, - (void*)JSGDestroyObject__Q26JStage7TSystemFPQ26JStage7TObject, - (void*)JSGGetSystemData__Q26JStage7TSystemFUl, - (void*)JSGSetSystemData__Q26JStage7TSystemFUlUl, -}; /* 80280E90-80280EF0 27B7D0 0060+00 0/0 1/1 0/0 .text __dt__Q26JStage7TSystemFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStage::TSystem::~TSystem() { - nofralloc -#include "asm/JSystem/JStage/JSGSystem/__dt__Q26JStage7TSystemFv.s" -} -#pragma pop +JStage::TSystem::~TSystem() {} /* 80280EF0-80280EF8 27B830 0008+00 1/0 1/0 0/0 .text JSGFGetType__Q26JStage7TSystemCFv */ -bool JStage::TSystem::JSGFGetType() const { - return true; +s32 JStage::TSystem::JSGFGetType() const { + return 1; } /* 80280EF8-80280F00 27B838 0008+00 1/0 0/0 0/0 .text * JSGFindObject__Q26JStage7TSystemCFPPQ26JStage7TObjectPCcQ26JStage8TEObject */ -bool JStage::TSystem::JSGFindObject(JStage::TObject** param_0, char const* param_1, - JStage::TEObject param_2) const { +bool JStage::TSystem::JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const { return true; } /* 80280F00-80280F08 27B840 0008+00 1/0 1/0 0/0 .text * JSGCreateObject__Q26JStage7TSystemFPCcQ26JStage8TEObjectUl */ -bool JStage::TSystem::JSGCreateObject(char const* param_0, JStage::TEObject param_1, u32 param_2) { +bool JStage::TSystem::JSGCreateObject(char const*, JStage::TEObject, u32) { return false; } /* 80280F08-80280F0C 27B848 0004+00 1/0 1/0 0/0 .text * JSGDestroyObject__Q26JStage7TSystemFPQ26JStage7TObject */ -void JStage::TSystem::JSGDestroyObject(JStage::TObject* param_0) { - /* empty function */ -} +void JStage::TSystem::JSGDestroyObject(JStage::TObject*) {} /* 80280F0C-80280F14 27B84C 0008+00 1/0 1/0 0/0 .text JSGGetSystemData__Q26JStage7TSystemFUl */ -bool JStage::TSystem::JSGGetSystemData(u32 param_0) { +bool JStage::TSystem::JSGGetSystemData(u32) { return false; } /* 80280F14-80280F18 27B854 0004+00 1/0 1/0 0/0 .text JSGSetSystemData__Q26JStage7TSystemFUlUl */ -void JStage::TSystem::JSGSetSystemData(u32 param_0, u32 param_1) { - /* empty function */ -} +void JStage::TSystem::JSGSetSystemData(u32, u32) {} -- cgit v1.2.3