mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-10 03:01:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_s_logo (#188)

Browse Source 
* d_s_logo

* match fpcM_Management

* asm
This commit is contained in:
TakaRikka
2022-04-10 15:29:28 -07:00
committed by GitHub
parent 215421ba51
commit bd4682495b
67 changed files with 1111 additions and 3622 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_drawlist.cpp
+2 -13
View File
@@ -44,11 +44,6 @@ struct dDlst_2Dm_c {
/* 8005312C */ void draw();
};
struct dDlst_2D_c {
/* 80053A00 */ dDlst_2D_c(ResTIMG*, s16, s16, s16, s16, u8);
/* 80053A9C */ void draw();
};
struct dDlst_2DTri_c {
/* 80051AF0 */ void draw();
};
@@ -102,13 +97,6 @@ struct J3DUClipper {
/* 80273A44 */ void clip(f32 const (*)[4], Vec*, Vec*) const;
};
struct J2DPicture {
/* 800539DC */ void getTexture(u8) const;
/* 80053C44 */ void setWhite(JUtility::TColor);
/* 80053C6C */ void setBlack(JUtility::TColor);
/* 802FC050 */ J2DPicture();
};
//
// Forward References:
//
@@ -2156,7 +2144,8 @@ asm dDlst_2D_c::dDlst_2D_c(ResTIMG* param_0, s16 param_1, s16 param_2, s16 param
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dDlst_2D_c::draw() {
// asm void dDlst_2D_c::draw() {
extern "C" asm void draw__10dDlst_2D_cFv() {
nofralloc
#include "asm/d/d_drawlist/draw__10dDlst_2D_cFv.s"
}
src/d/menu/d_menu_dmap.cpp
-6
View File
@@ -72,12 +72,6 @@ struct dMeterHaihai_c {
/* 8020BC20 */ void setScale(f32);
};
struct J2DPicture {
/* 801BDD40 */ void append(ResTIMG const*, f32);
/* 801BDD70 */ void insert(ResTIMG const*, u8, f32);
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
src/d/s/d_s_logo.cpp
+733 -870
View File
File diff suppressed because it is too large Load Diff
src/f_pc/f_pc_manager.cpp
+65 -40
View File
@@ -26,39 +26,20 @@
#include "f_pc/f_pc_priority.h"
#include "f_pc/f_pc_profile.h"
#include "d/com/d_com_inf_game.h"
#include "m_Do/m_Do_audio.h"
#include "SSystem/SComponent/c_API_graphic.h"
//
// Types:
//
struct dShutdownErrorMsg_c {
/* 8009D790 */ void execute();
};
struct dLib_time_c {
/* 80032880 */ void stopTime();
/* 800328BC */ void startTime();
/* 8009D790 */ static bool execute();
};
struct dDvdErrorMsg_c {
/* 8009D354 */ void execute();
};
struct dDlst_peekZ_c {
/* 80056080 */ void peekData();
};
struct dComIfG_play_c {
/* 8002CAC4 */ void drawSimpleModel();
};
struct Z2SoundMgr {
/* 802AA6B0 */ void pauseAllGameSound(bool);
};
struct JUTGamePad {
struct CRumble {
/* 802E1948 */ void stopPatternedRumble(s16);
};
/* 8009D354 */ static u8 execute();
};
//
@@ -116,17 +97,22 @@ extern "C" void stopPatternedRumble__Q210JUTGamePad7CRumbleFs();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" extern u8 m_gamePad__8mDoCPd_c[16];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 data_80450B60[4];
extern "C" extern u8 struct_80450D38[8];
extern "C" extern u8 data_80450EC4[4];
extern "C" extern Z2SoundMgr* data_80450B60;
extern "C" extern u8 struct_80450D38;
//
// Declarations:
//
// move / fix for JASGlobalInstance eventually
inline Z2SoundMgr* Z2GetSoundMgr() {
return data_80450B60;
}
/* 80450D38-80450D40 0008+00 s=0 e=1 z=0 None .sbss None */
u8 struct_80450D38[8];
u8 struct_80450D38;
s8 data_80450D39;
/* 800220A0-800220C0 0020+00 s=1 e=1 z=0 None .text fpcM_Draw__FPv */
void fpcM_Draw(void* pProc) {
@@ -139,8 +125,8 @@ s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc) {
}
/* 800220F8-80022118 0020+00 s=1 e=0 z=1 None .text fpcM_Execute__FPv */
void fpcM_Execute(void* pProc) {
fpcEx_Execute((base_process_class*)pProc);
s32 fpcM_Execute(void* pProc) {
return fpcEx_Execute((base_process_class*)pProc);
}
/* 80022118-80022138 0020+00 s=0 e=7 z=0 None .text fpcM_Delete__FPv */
@@ -153,16 +139,55 @@ BOOL fpcM_IsCreating(unsigned int pID) {
return fpcCt_IsCreatingByID(pID);
}
// TODO, uses a lot of functions outside f_pc/SSystem
/* 80022158-800222B8 0160+00 s=0 e=1 z=0 None .text fpcM_Management__FPFv_vPFv_v */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void fpcM_Management(fpcM_ManagementFunc, fpcM_ManagementFunc) {
nofralloc
#include "asm/f_pc/f_pc_manager/fpcM_Management__FPFv_vPFv_v.s"
void fpcM_Management(fpcM_ManagementFunc func1, fpcM_ManagementFunc func2) {
MtxInit();
dComIfGd_peekZdata();
if (!dShutdownErrorMsg_c::execute()) {
if (data_80450D39 == 0) {
struct_80450D38 = 0;
data_80450D39 = 1;
}
if (!dDvdErrorMsg_c::execute()) {
if (struct_80450D38 != 0) {
dLib_time_c::startTime();
Z2GetSoundMgr()->pauseAllGameSound(false);
struct_80450D38 = 0;
}
cAPIGph_Painter();
if (!dPa_control_c::isStatus(1)) {
fpcDt_Handler();
} else {
dPa_control_c::offStatus(1);
}
fpcPi_Handler();
fpcCt_Handler();
if (func1 != NULL) {
func1();
}
fpcEx_Handler((fpcLnIt_QueueFunc)fpcM_Execute);
fpcDw_Handler((fpcDw_HandlerFuncFunc)fpcM_DrawIterater, (fpcDw_HandlerFunc)fpcM_Draw);
if (func2 != NULL) {
func2();
}
dComIfGp_drawSimpleModel();
} else if (struct_80450D38 == 0) {
dLib_time_c::stopTime();
Z2GetSoundMgr()->pauseAllGameSound(true);
mDoCPd_c::stopMotorWaveHard(0);
struct_80450D38 = 1;
}
}
}
#pragma pop
/* ############################################################################################## */
/* 803F4DB0-803F4DDC 002C+00 s=1 e=0 z=0 None .bss rootlayer$3716 */
src/m_Do/m_Do_main.cpp
+6 -3
View File
@@ -708,9 +708,11 @@ void main01(void) {
}
JUTConsole* console = JFWSystem::getSystemConsole();
u32 output = JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE;
if (data_80450580 != 0) {
console->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE);
data_80450580 = JUTConsole::OUTPUT_NONE;
}
console->setOutput(output);
console->setPosition(32, 42);
@@ -724,13 +726,14 @@ void main01(void) {
do {
frame++;
if (data_80450B00 && frame == data_80450B00 * (frame / data_80450B00)) {
if (data_80450B00 != 0 && frame % data_80450B00 == 0) {
mDoMch_HeapCheckAll__Fv();
}
if (struct_80450C80[0]) {
g_mDoMemCd_control.update();
}
mDoCPd_c::read();
fapGm_Execute__Fv();
mDoAud_Execute__Fv();