mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-02 01:52:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_meter2 wip / d_s_play / d_file_sel_info (#179)

Browse Source 
* d_meter2 wip

* d_s_play

* d_file_sel_info

* format

* tag_lv5soup / tag_setBall / fix dKyeff

* d_cc_uty
This commit is contained in:
TakaRikka
2022-02-06 06:23:54 -08:00
committed by GitHub
parent 612f26c132
commit 3a79e96e8b
133 changed files with 2652 additions and 4502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f_op/f_op_msg.cpp
+7 -26
View File
@@ -7,18 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct process_method_class {};
struct leafdraw_method_class {};
struct leafdraw_class {};
struct create_tag_class {};
//
// Forward References:
//
@@ -28,7 +16,6 @@ extern "C" static void fopMsg_Execute__FPv();
extern "C" static void fopMsg_IsDelete__FPv();
extern "C" static void fopMsg_Delete__FPv();
extern "C" static void fopMsg_Create__FPv();
extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */];
//
// External References:
@@ -55,7 +42,7 @@ extern "C" extern u8 struct_80451124[4];
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void fopMsg_Draw(void* param_0) {
static asm int fopMsg_Draw(void* param_0) {
nofralloc
#include "asm/f_op/f_op_msg/fopMsg_Draw__FPv.s"
}
@@ -65,7 +52,7 @@ static asm void fopMsg_Draw(void* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void fopMsg_Execute(void* param_0) {
static asm int fopMsg_Execute(void* param_0) {
nofralloc
#include "asm/f_op/f_op_msg/fopMsg_Execute__FPv.s"
}
@@ -75,7 +62,7 @@ static asm void fopMsg_Execute(void* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void fopMsg_IsDelete(void* param_0) {
static asm int fopMsg_IsDelete(void* param_0) {
nofralloc
#include "asm/f_op/f_op_msg/fopMsg_IsDelete__FPv.s"
}
@@ -85,7 +72,7 @@ static asm void fopMsg_IsDelete(void* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void fopMsg_Delete(void* param_0) {
static asm int fopMsg_Delete(void* param_0) {
nofralloc
#include "asm/f_op/f_op_msg/fopMsg_Delete__FPv.s"
}
@@ -99,7 +86,7 @@ static u8 fopMsg_MSG_TYPE[4 + 4 /* padding */];
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void fopMsg_Create(void* param_0) {
static asm int fopMsg_Create(void* param_0) {
nofralloc
#include "asm/f_op/f_op_msg/fopMsg_Create__FPv.s"
}
@@ -107,12 +94,6 @@ static asm void fopMsg_Create(void* param_0) {
/* ############################################################################################## */
/* 803A3958-803A3970 -00001 0014+04 0/0 5/0 0/0 .data g_fopMsg_Method */
SECTION_DATA extern void* g_fopMsg_Method[5 + 1 /* padding */] = {
(void*)fopMsg_Create__FPv,
(void*)fopMsg_Delete__FPv,
(void*)fopMsg_Execute__FPv,
(void*)fopMsg_IsDelete__FPv,
(void*)fopMsg_Draw__FPv,
/* padding */
NULL,
SECTION_DATA extern leafdraw_method_class g_fopMsg_Method = {
&fopMsg_Create, &fopMsg_Delete, &fopMsg_Execute, &fopMsg_IsDelete, &fopMsg_Draw,
};
src/f_op/f_op_msg_mng.cpp
+2 -12
View File
@@ -3,7 +3,7 @@
// Translation Unit: f_op/f_op_msg_mng
//
// #include "f_op/f_op_msg_mng.h"
#include "f_op/f_op_msg_mng.h"
#include "JSystem/J2DGraph/J2DPane.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@@ -12,12 +12,6 @@
// Types:
//
struct process_priority_class {};
struct layer_class {};
struct fopAc_ac_c {};
struct dStage_roomControl_c {
static u8 mProcID[4];
};
@@ -48,10 +42,6 @@ struct JMath {
static u8 sincosTable_[65536];
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct J2DPicture {
/* 800202CC */ void setBlendRatio(f32, f32);
/* 80020338 */ void append(char const*, f32);
@@ -283,7 +273,7 @@ asm void fopMsgM_setMessageID(unsigned int param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void fopMsgM_Create(s16 param_0, int (*param_1)(void*), void* param_2) {
asm u32 fopMsgM_Create(s16 param_0, int (*param_1)(void*), void* param_2) {
nofralloc
#include "asm/f_op/f_op_msg_mng/fopMsgM_Create__FsPFPv_iPv.s"
}
src/f_op/f_op_scene_pause.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ int fopScnPause_Enable(scene_class* pScene) {
/* 80020594-8002064C 01AED4 00B8+00 0/0 2/2 0/0 .text fopScnPause_Disable__FP11scene_class */
int fopScnPause_Disable(scene_class* pScene) {
if (pScene) {
void* tmp = (void*)pScene->field_0x2C[6];
void* tmp = (void*)pScene->field_0x0.mLyTg.mpLayer->mpPcNode;
if (!tmp) {
fpcM_PauseDisable(pScene, 1);
src/f_op/f_op_scene_req.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ static void fopScnRq_Execute(scene_request_class* pScnRq) {
static int fopScnRq_PostMethod(void* param_1, scene_request_class* pScnRq) {
if (pScnRq->mFadeRequest) {
fopScnPause_Enable((scene_class*)param_1);
fopOvlpM_ToldAboutID(((scene_class*)param_1)->field_0x04);
fopOvlpM_ToldAboutID(((scene_class*)param_1)->field_0x0.mBsPcId);
}
return 1;
}