mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-09 18:58:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

split f_ap_game, fapGm_Execute ok, more changes to m_Do_main

Browse Source
This commit is contained in:
Pheenoh
2021-02-13 15:23:18 -05:00
parent e08abacc1d
commit 63d4e517f7
18 changed files with 291 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f/f_ap_game.cpp
+79 -1
View File
@@ -1 +1,79 @@
// ok
/* f_ap_game.cpp autogenerated by split.py v0.4 at 2021-02-13 20:07:21.300413 */
#include "global.h"
#include "f/f_pc/f_pc_manager.h"
#include "SComponent/c_counter.h"
// additional symbols needed for f_ap_game.cpp
// autogenerated by split.py v0.4 at 2021-02-13 20:07:21.300465
extern "C" {
void __dl__FPv(void);
// void cCt_Counter(void);
void fapGm_After(void);
void fapGm_Create(void);
void fapGm_Execute(void);
void fapGm_HIO_c(void);
void fapGm_HIO_c_NS_dtor(void);
void fopCamM_Init(void);
void fopCamM_Management(void);
void fopDwTg_CreateQueue(void);
void fopOvlpM_Init(void);
void fopOvlpM_Management(void);
void fopScnM_Init(void);
void fopScnM_Management(void);
void fpcM_Init(void);
//void fpcM_Management__FPFv_vPFv_v(void);
void func_80018B28(void);
void func_80361C24(void);
}
// additional symbols needed for f_ap_game.cpp
// autogenerated by split.py v0.4 at 2021-02-13 20:07:21.300472
extern u8 lbl_803A35A0;
extern u8 lbl_803F1BB0;
extern u8 lbl_80451BC0;
extern u8 lbl_80451BC4;
extern "C" {
// __ct__11fapGm_HIO_cFv
// fapGm_HIO_c::fapGm_HIO_c(void)
asm void fapGm_HIO_c(void) {
nofralloc
#include "f/f_ap_game/asm/func_80018944.s"
}
// fapGm_After__Fv
// fapGm_After(void)
asm void fapGm_After(void) {
nofralloc
#include "f/f_ap_game/asm/func_80018A44.s"
}
void fapGm_Execute(void) {
fpcM_Management(0,fapGm_After);
cCt_Counter(0);
}
// fapGm_Create__Fv
// fapGm_Create(void)
asm void fapGm_Create(void) {
nofralloc
#include "f/f_ap_game/asm/func_80018AA0.s"
}
// __dt__11fapGm_HIO_cFv
// fapGm_HIO_c::~fapGm_HIO_c(void)
asm void fapGm_HIO_c_NS_dtor(void) {
nofralloc
#include "f/f_ap_game/asm/func_80018AE0.s"
}
// __sinit_f_ap_game_cpp
//
asm void func_80018B28(void) {
nofralloc
#include "f/f_ap_game/asm/func_80018B28.s"
}
};
src/f/f_pc/f_pc_manager.cpp
-1
View File
@@ -60,7 +60,6 @@ BOOL fpcM_IsCreating(u32 pID) {
return fpcCt_IsCreatingByID(pID);
}
typedef void (*fpcM_ManagementFunc)(void);
void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2) {
MtxInit();
dDlst_peekZ_c_NS_peekData(&g_dComIfG_gameInfo.getdlstPeekZ());
src/m_Do/m_Do_main.cpp
+39 -31
View File
@@ -3,6 +3,7 @@
#include "JSystem/JKernel/JKRAramHeap/JKRAramHeap.h"
#include "JSystem/JUtility/JUTAssert/JUTAssert.h"
#include "JSystem/JUtility/JUTReport/JUTReport.h"
#include "JSystem/JUtility/JUTGamePad/JUTGamePad.h"
#include "SComponent/c_API_controller_pad.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "dvd/dvd.h"
@@ -264,7 +265,7 @@ asm void debugDisplay(void) {
#endif
#ifdef NONMATCHING
void Debug_console(u32 controller_no) {
void Debug_console(u32 controller_pad_no) {
float tmp2;
float tmp3;
int tmp6;
@@ -285,32 +286,32 @@ void Debug_console(u32 controller_no) {
lbl_80450B30 = 1;
}
u32 tmp5 = m_cpadInfo[controller_no].mPressedButtonFlags;
u32 tmp5 = m_cpadInfo[controller_pad_no].mPressedButtonFlags;
if ((m_cpadInfo[controller_no].mPressedButtonFlags & 0x10) &&
!(m_cpadInfo[controller_no].mButtonFlags & 0xFFFFFFEF)) {
if ((m_cpadInfo[controller_pad_no].mPressedButtonFlags & 0x10) &&
!(m_cpadInfo[controller_pad_no].mButtonFlags & ~0x10)) {
lbl_804511B8->field_0x68 = !lbl_804511B8->field_0x68;
JUTAssertion::setMessageCount(0);
}
if (lbl_804511B8->field_0x68) {
u32 tmp = m_cpadInfo[controller_no].mButtonFlags;
u32 tmp = m_cpadInfo[controller_pad_no].mButtonFlags;
// if R and L are pressed
if ((tmp & 0x40 && tmp & 0x20) ||
((lbl_80451A08 > m_cpadInfo[controller_no].mTriggerLeft) &&
(lbl_80451A08 > m_cpadInfo[controller_no].mTriggerRight))) {
tmp2 = m_cpadInfo[controller_no].mMainStickPosX;
tmp3 = m_cpadInfo[controller_no].mMainStickPosY;
if ((tmp & CButton::R && tmp & CButton::L) ||
((lbl_80451A08 > m_cpadInfo[controller_pad_no].mTriggerLeft) &&
(lbl_80451A08 > m_cpadInfo[controller_pad_no].mTriggerRight))) {
tmp2 = m_cpadInfo[controller_pad_no].mMainStickPosX;
tmp3 = m_cpadInfo[controller_pad_no].mMainStickPosY;
// if x buttons are pressed, clear the console
if (tmp & 0xC00 && tmp5 & 0x1000) {
if (tmp & (CButton::Y | CButton::START) && tmp5 & CButton::START) {
lbl_804511B8->clear();
}
u32 tmp = m_cpadInfo[controller_no].mButtonFlags;
u32 tmp = m_cpadInfo[controller_pad_no].mButtonFlags;
if (!(tmp & 0xC00)) {
if (!(tmp & (CButton::Y | CButton::START))) {
// subtract console scroll value from stick Y
float tmp4 = lbl_80450B2C;
lbl_80450B2C = tmp4 - tmp3;
@@ -325,16 +326,16 @@ void Debug_console(u32 controller_no) {
lbl_804511B8->scroll(tmp);
}
} else {
if (tmp & 0x400) {
if (tmp & CButton::X) {
lbl_80450B2C += tmp2;
}
if (tmp & 0x800) {
if (tmp & CButton::Y) {
lbl_80450B2C -= tmp3;
}
}
if (tmp5 & 0x100) {
if (tmp5 & CButton::A) {
lbl_804511B8->dumpToTerminal(0xFFFFFFFF);
lbl_804511B8->field_0x58 = 3;
}
@@ -385,16 +386,21 @@ asm void Debug_console(u32) {
#endif
#ifdef NONMATCHING
void LOAD_COPYDATE(void*) {
DVDFileInfo file_info;
s32 LOAD_COPYDATE(void*) {
s32 status;
u8 buffer[32];
u8 fileInfo[80];
//DVDFileInfo fileInfo;
s32 dvd_status = DVDOpen("/str/Final/Release/COPYDATE", &file_info);
if (dvd_status) {
char buffer[32];
DVDReadPrio(&file_info, buffer, 32, 0, 2);
status = DVDOpen("/str/Final/Release/COPYDATE", (DVDFileInfo*)&fileInfo);
if (status) {
DVDReadPrio((DVDFileInfo*)fileInfo, &buffer, 32, 0, 2);
memcpy(lbl_803A2EE0, buffer, 17);
DVDClose(&file_info);
status = DVDClose((DVDFileInfo*)fileInfo);
}
return status;
}
#else
const char* lbl_80373C23 = "/str/Final/Release/COPYDATE";
@@ -447,10 +453,12 @@ void debug(void) {
#ifdef NONMATCHING
void main01(void) {
HeapCheck* heaps = lbl_803D32E0;
mDoMch_Create();
mDoGph_Create();
create__8mDoCPd_cFv();
mDoDVDThd_callback_c thread_callback;
// mDoDVDThd_callback_c thread_callback;
// JKRSolidHeap audio_heap;
// Root Heap
@@ -498,23 +506,23 @@ void main01(void) {
// Command Heap
heaps[7].setHeap(mDoExt_getCommandHeap());
u8* systemConsole = lbl_804511B8;
JUTConsole* systemConsole = lbl_804511B8;
if (heaps[7].getHeap()) {
heaps[7].setHeapSize(heaps[7].getHeap()->getSize());
}
int unk = 0;
u32 unk = 0;
if (lbl_80450580) {
unk = 3;
}
*(lbl_804511B8 + 0x58) = unk;
*(systemConsole + 0x40) = 0x20;
*(systemConsole + 0x44) = 0x2a;
systemConsole->field_0x58 = unk;
systemConsole->field_0x40 = 0x20;
systemConsole->field_0x44 = 0x2A;
// lol
thread_callback.create((void* (*)(void*))LOAD_COPYDATE, 0);
mDoDVDThd_callback_c::create(LOAD_COPYDATE,0);
fapGm_Create();
fopAcM_initManager();
lbl_80450B18 = 0;
@@ -522,7 +530,7 @@ void main01(void) {
// g_mDoAud_audioHeap
lbl_80450BBC = JKRSolidHeap_NS_create(0x14d800, JKRHeap::getCurrentHeap(), false);
lbl_80450BBC = JKRSolidHeap::create(0x14d800, JKRHeap::getCurrentHeap(), false);
// main loop
do {