mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
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
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
// Translation Unit: d_a_b_zant
|
||||
//
|
||||
|
||||
#include "rel/d/a/b/d_a_b_zant/d_a_b_zant.h"
|
||||
// #include "rel/d/a/b/d_a_b_zant/d_a_b_zant.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
|
||||
@@ -18,28 +18,6 @@ struct mDoGph_gInf_c {
|
||||
/* 80878D10 */ void setFrameRate(u16);
|
||||
};
|
||||
|
||||
struct fopAc_ac_c {
|
||||
/* 80018B64 */ fopAc_ac_c();
|
||||
};
|
||||
|
||||
struct daMP_c {
|
||||
/* 80031A78 */ void daMP_c_Get_MovieRestFrame();
|
||||
/* 80031AA4 */ void daMP_c_Set_PercentMovieVolume(f32);
|
||||
/* 80878BB8 */ void daMP_c_Get_arg_demoNo();
|
||||
/* 80878C04 */ void daMP_c_Get_arg_movieNo();
|
||||
/* 80878C28 */ void daMP_c_Init();
|
||||
/* 80878D64 */ void daMP_c_Finish();
|
||||
/* 80878D94 */ void daMP_c_Main();
|
||||
/* 80878DD8 */ void daMP_c_Draw();
|
||||
/* 80878E60 */ void daMP_c_Callback_Init(fopAc_ac_c*);
|
||||
/* 80878ED4 */ daMP_c();
|
||||
/* 80878F18 */ void daMP_c_Callback_Finish(daMP_c*);
|
||||
/* 80878F38 */ void daMP_c_Callback_Main(daMP_c*);
|
||||
/* 80878F70 */ void daMP_c_Callback_Draw(daMP_c*);
|
||||
|
||||
static u8 m_myObj[4];
|
||||
};
|
||||
|
||||
struct daMP_THPReadBuffer {};
|
||||
|
||||
struct daMP_Dlst_base_c {
|
||||
@@ -65,8 +43,6 @@ struct dComIfG_play_c {
|
||||
/* 80878A64 */ void getEvent();
|
||||
};
|
||||
|
||||
struct _GXRenderModeObj {};
|
||||
|
||||
struct THPVideoInfo {};
|
||||
|
||||
struct THPAudioInfo {};
|
||||
@@ -78,11 +54,6 @@ struct JUTVideo {
|
||||
static u8 sManager[4];
|
||||
};
|
||||
|
||||
struct JKRHeap {
|
||||
/* 802CE4D4 */ void alloc(u32, int);
|
||||
/* 802CE500 */ void free(void*, JKRHeap*);
|
||||
};
|
||||
|
||||
struct JFWDisplay {
|
||||
/* 80878D44 */ void setFrameRate(u16);
|
||||
/* 80878D54 */ void getManager();
|
||||
@@ -92,10 +63,6 @@ struct JFWDisplay {
|
||||
|
||||
struct JASMixMode {};
|
||||
|
||||
struct JASDriver {
|
||||
/* 8029C9DC */ void registerMixCallback(s16* (*)(s32), JASMixMode);
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
@@ -126,8 +93,8 @@ extern "C" void __THPHuffDecodeDCTCompY();
|
||||
extern "C" void __THPHuffDecodeTab();
|
||||
extern "C" void __THPHuffDecodeDCTCompU();
|
||||
extern "C" void __THPHuffDecodeDCTCompV();
|
||||
extern "C" static void THPInit();
|
||||
extern "C" static void OSInitFastCast();
|
||||
extern "C" static void THPInit();
|
||||
extern "C" static void daMP_PopReadedBuffer__Fv();
|
||||
extern "C" static void daMP_PushReadedBuffer__FPv();
|
||||
extern "C" static void daMP_PopFreeReadBuffer__Fv();
|
||||
@@ -163,9 +130,7 @@ extern "C" static void daMP_THPGXRestore__Fv();
|
||||
extern "C" static void daMP_THPGXYuv2RgbSetup__FPC16_GXRenderModeObj();
|
||||
extern "C" static void GXSetTexCoordGen();
|
||||
extern "C" static void daMP_THPGXYuv2RgbDraw__FPUcPUcPUcssssss();
|
||||
extern "C" static void GXEnd();
|
||||
extern "C" static void GXTexCoord2u16();
|
||||
extern "C" static void GXPosition3s16();
|
||||
extern "C" static void daMP_MixAudio__FPsPsUl();
|
||||
extern "C" static void daMP_audioCallbackWithMSound__Fl();
|
||||
extern "C" static void daMP_audioInitWithMSound__Fv();
|
||||
@@ -243,7 +208,6 @@ extern "C" extern char const* const d_a_movie_player__stringBase0;
|
||||
|
||||
SECTION_INIT void memset();
|
||||
SECTION_INIT void memcpy();
|
||||
extern "C" void OSReport();
|
||||
extern "C" void fadeOut__13mDoGph_gInf_cFf();
|
||||
extern "C" void mDoExt_getArchiveHeap__Fv();
|
||||
extern "C" void __ct__10fopAc_ac_cFv();
|
||||
@@ -258,76 +222,18 @@ extern "C" void getOutputMode__9JASDriverFv();
|
||||
extern "C" void alloc__7JKRHeapFUli();
|
||||
extern "C" void free__7JKRHeapFPvP7JKRHeap();
|
||||
extern "C" void PPCMfhid2();
|
||||
extern "C" void DCInvalidateRange();
|
||||
extern "C" void DCStoreRange();
|
||||
extern "C" void DCZeroRange();
|
||||
extern "C" void LCEnable();
|
||||
extern "C" void LCDisable();
|
||||
extern "C" void LCStoreData();
|
||||
extern "C" void LCQueueWait();
|
||||
extern "C" void OSDisableInterrupts();
|
||||
extern "C" void OSEnableInterrupts();
|
||||
extern "C" void OSRestoreInterrupts();
|
||||
extern "C" void OSInitMessageQueue();
|
||||
extern "C" void OSSendMessage();
|
||||
extern "C" void OSReceiveMessage();
|
||||
extern "C" void OSCreateThread();
|
||||
extern "C" void OSCancelThread();
|
||||
extern "C" void OSResumeThread();
|
||||
extern "C" void OSSuspendThread();
|
||||
extern "C" void OSGetTick();
|
||||
extern "C" void PSMTXIdentity();
|
||||
extern "C" void C_MTXOrtho();
|
||||
extern "C" void DVDOpen();
|
||||
extern "C" void DVDClose();
|
||||
extern "C" void DVDReadPrio();
|
||||
extern "C" void DVDCancel();
|
||||
extern "C" void VISetPostRetraceCallback();
|
||||
extern "C" void VIGetNextField();
|
||||
extern "C" void VIGetTvFormat();
|
||||
extern "C" void AIGetDSPSampleRate();
|
||||
extern "C" void GXSetVtxDesc();
|
||||
extern "C" void GXClearVtxDesc();
|
||||
extern "C" void GXSetVtxAttrFmt();
|
||||
extern "C" void GXSetTexCoordGen2();
|
||||
extern "C" void GXSetNumTexGens();
|
||||
extern "C" void GXDrawDone();
|
||||
extern "C" void GXBegin();
|
||||
extern "C" void GXSetCullMode();
|
||||
extern "C" void GXSetNumChans();
|
||||
extern "C" void GXInitTexObj();
|
||||
extern "C" void GXInitTexObjLOD();
|
||||
extern "C" void GXLoadTexObj();
|
||||
extern "C" void GXInvalidateTexAll();
|
||||
extern "C" void GXSetNumIndStages();
|
||||
extern "C" void GXSetTevOp();
|
||||
extern "C" void GXSetTevColorIn();
|
||||
extern "C" void GXSetTevAlphaIn();
|
||||
extern "C" void GXSetTevColorOp();
|
||||
extern "C" void GXSetTevAlphaOp();
|
||||
extern "C" void GXSetTevColorS10();
|
||||
extern "C" void GXSetTevKColor();
|
||||
extern "C" void GXSetTevKColorSel();
|
||||
extern "C" void GXSetTevKAlphaSel();
|
||||
extern "C" void GXSetTevSwapMode();
|
||||
extern "C" void GXSetTevSwapModeTable();
|
||||
extern "C" void GXSetAlphaCompare();
|
||||
extern "C" void GXSetTevOrder();
|
||||
extern "C" void GXSetNumTevStages();
|
||||
extern "C" void GXSetFog();
|
||||
extern "C" void GXSetFogRangeAdj();
|
||||
extern "C" void GXSetBlendMode();
|
||||
extern "C" void GXSetColorUpdate();
|
||||
extern "C" void GXSetAlphaUpdate();
|
||||
extern "C" void GXSetZMode();
|
||||
extern "C" void GXSetZCompLoc();
|
||||
extern "C" void GXSetPixelFmt();
|
||||
extern "C" void GXSetDither();
|
||||
extern "C" void GXSetProjection();
|
||||
extern "C" void GXLoadPosMtxImm();
|
||||
extern "C" void GXSetCurrentMtx();
|
||||
extern "C" void GXSetViewport();
|
||||
extern "C" void GXSetScissor();
|
||||
extern "C" static void GXEnd();
|
||||
extern "C" static void GXPosition3s16();
|
||||
extern "C" void _savegpr_21();
|
||||
extern "C" void _savegpr_22();
|
||||
extern "C" void _savegpr_23();
|
||||
@@ -346,7 +252,6 @@ extern "C" void __div2i();
|
||||
extern "C" void sprintf();
|
||||
extern "C" void strcmp();
|
||||
extern "C" extern void* g_fopAc_Method[8];
|
||||
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" extern u8 g_clearColor[4];
|
||||
extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4];
|
||||
@@ -2248,7 +2153,7 @@ asm daMP_c::daMP_c() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void* operator new(u32 param_0, void* param_1) {
|
||||
extern "C" static asm void* __nw__FUlPv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/__nw__FUlPv.s"
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
// Translation Unit: d_a_spinner
|
||||
//
|
||||
|
||||
#include "rel/d/a/d_a_spinner/d_a_spinner.h"
|
||||
// #include "rel/d/a/d_a_spinner/d_a_spinner.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
|
||||
@@ -11,11 +11,6 @@
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct fopAc_ac_c {
|
||||
/* 80018B64 */ fopAc_ac_c();
|
||||
/* 80018C8C */ ~fopAc_ac_c();
|
||||
};
|
||||
|
||||
struct daPy_py_c {
|
||||
static u8 m_midnaActor[4];
|
||||
};
|
||||
@@ -33,14 +28,6 @@ struct dSv_event_c {
|
||||
/* 800349BC */ void isEventBit(u16) const;
|
||||
};
|
||||
|
||||
struct dMsgFlow_c {
|
||||
/* 80249F00 */ dMsgFlow_c();
|
||||
/* 80249F48 */ ~dMsgFlow_c();
|
||||
/* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
|
||||
/* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
|
||||
/* 8024A528 */ void getEventId(int*);
|
||||
};
|
||||
|
||||
struct dEvt_control_c {
|
||||
/* 80042468 */ void reset();
|
||||
};
|
||||
@@ -54,18 +41,6 @@ struct dAttHint_c {
|
||||
/* 800738FC */ void request(fopAc_ac_c*, int);
|
||||
};
|
||||
|
||||
struct JAISoundID {};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct Z2SeMgr {
|
||||
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
|
||||
};
|
||||
|
||||
struct Z2AudioMgr {
|
||||
static u8 mAudioMgrPtr[4 + 4 /* padding */];
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
@@ -112,7 +87,6 @@ extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" void strcmp();
|
||||
extern "C" extern void* g_fopAc_Method[8];
|
||||
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
|
||||
extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" extern u8 g_meter2_info[248];
|
||||
|
||||
@@ -11,11 +11,6 @@
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct fopAc_ac_c {
|
||||
/* 80018B64 */ fopAc_ac_c();
|
||||
/* 80018C8C */ ~fopAc_ac_c();
|
||||
};
|
||||
|
||||
struct daPy_py_c {
|
||||
static u8 m_midnaActor[4];
|
||||
};
|
||||
@@ -32,35 +27,11 @@ struct dSv_event_c {
|
||||
/* 800349BC */ void isEventBit(u16) const;
|
||||
};
|
||||
|
||||
struct dMsgFlow_c {
|
||||
/* 80249F00 */ dMsgFlow_c();
|
||||
/* 80249F48 */ ~dMsgFlow_c();
|
||||
/* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
|
||||
/* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
|
||||
};
|
||||
|
||||
struct dEvt_control_c {
|
||||
/* 80042468 */ void reset();
|
||||
/* 80042518 */ void reset(void*);
|
||||
};
|
||||
|
||||
struct csXyz {};
|
||||
|
||||
struct cXyz {};
|
||||
|
||||
struct JAISoundID {};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct Z2SeMgr {
|
||||
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
|
||||
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
|
||||
};
|
||||
|
||||
struct Z2AudioMgr {
|
||||
static u8 mAudioMgrPtr[4 + 4 /* padding */];
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
@@ -101,13 +72,11 @@ extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci();
|
||||
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void PSVECSquareDistance();
|
||||
extern "C" void _savegpr_28();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_28();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" extern void* g_fopAc_Method[8];
|
||||
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
|
||||
extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" u8 m_midnaActor__9daPy_py_c[4];
|
||||
|
||||
Reference in New Issue
Block a user