d_a_dmidna OK / f_op + misc cleanup (#276)

* some f_op / d_insect cleanup

* rename some vars according to tww

* d_a_dmidna OK

* remove asm
This commit is contained in:
TakaRikka
2023-02-10 09:07:47 -08:00
committed by GitHub
parent 68f5b6d05a
commit 67a2c83b9b
73 changed files with 5635 additions and 20433 deletions
+30 -66
View File
@@ -1,58 +1,24 @@
//
// Generated By: dol2asm
// Translation Unit: d/d_kyeff
//
/**
* d_kyeff.cpp
*
*/
#include "d/d_kyeff.h"
#include "Z2AudioLib/Z2EnvSeMgr.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_kankyo.h"
#include "os/OSTime.h"
#include "d/kankyo/d_kankyo.h"
#include "d/kankyo/d_kankyo_wether.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" static void dKyeff_Draw__FP8dKyeff_c();
extern "C" void execute__8dKyeff_cFv();
extern "C" static void dKyeff_Execute__FP8dKyeff_c();
extern "C" static bool dKyeff_IsDelete__FP8dKyeff_c();
extern "C" static void dKyeff_Delete__FP8dKyeff_c();
extern "C" static void dKyeff_Create__FP12kankyo_class();
extern "C" extern char const* const d_d_kyeff__stringBase0;
extern "C" extern void* g_profile_KYEFF[10 + 1 /* padding */];
//
// External References:
//
extern "C" void dKyw_wether_init__Fv();
extern "C" void dKyw_wether_delete__Fv();
extern "C" void dKyw_wether_move__Fv();
extern "C" void dKyw_wether_move_draw__Fv();
extern "C" void dKyw_wether_draw__Fv();
extern "C" void dKy_FiveSenses_fullthrottle_dark__Fv();
extern "C" void framework__10Z2EnvSeMgrFv();
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern dScnKy_env_light_c g_env_light;
extern "C" extern Z2EnvSeMgr g_mEnvSeMgr;
//
// Declarations:
//
/* 801ADD00-801ADD38 1A8640 0038+00 2/2 0/0 0/0 .text dKankyo_DayProc__Fv */
void dKankyo_DayProc() {
dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[91]);
}
static int dKyeff_Draw(dKyeff_c* ptr) {
static int dKyeff_Draw(dKyeff_c* i_this) {
dKyw_wether_draw();
return 1;
}
@@ -62,21 +28,22 @@ int dKyeff_c::execute() {
if (strcmp(dComIfGp_getStartStageName(), "Name")) {
dKyw_wether_move();
}
dKyw_wether_move_draw();
dKy_FiveSenses_fullthrottle_dark();
mDoAud_mEnvse_framework();
return 1;
}
static int dKyeff_Execute(dKyeff_c* ptr) {
return ptr->execute();
static int dKyeff_Execute(dKyeff_c* i_this) {
return i_this->execute();
}
static int dKyeff_IsDelete(dKyeff_c* ptr) {
static int dKyeff_IsDelete(dKyeff_c* i_this) {
return 1;
}
static int dKyeff_Delete(dKyeff_c* ptr) {
static int dKyeff_Delete(dKyeff_c* i_this) {
dKyw_wether_delete();
return 1;
}
@@ -105,7 +72,7 @@ SECTION_SDATA2 static f32 lit_3844 = 15.0f;
/* 801ADE00-801ADEA0 1A8740 00A0+00 1/0 0/0 0/0 .text dKyeff_Create__FP12kankyo_class */
// float data
#ifdef NONMATCHING
static int dKyeff_Create(kankyo_class* kankyo) {
static int dKyeff_Create(kankyo_class* i_this) {
OSCalendarTime time;
dKyw_wether_init();
@@ -115,13 +82,14 @@ static int dKyeff_Create(kankyo_class* kankyo) {
g_env_light.mWind.pow = 0.7f;
g_env_light.mDaytime = time.hours * 15.0f;
}
return cPhs_COMPLEATE_e;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm int dKyeff_Create(kankyo_class* param_0) {
static asm int dKyeff_Create(kankyo_class* i_this) {
nofralloc
#include "asm/d/d_kyeff/dKyeff_Create__FP12kankyo_class.s"
}
@@ -131,29 +99,25 @@ static asm int dKyeff_Create(kankyo_class* param_0) {
/* ############################################################################################## */
/* 803BC158-803BC16C -00001 0014+00 1/0 0/0 0/0 .data l_dKyeff_Method */
static leafdraw_method_class l_dKyeff_Method = {
(process_method_func)dKyeff_Create,
(process_method_func)dKyeff_Delete,
(process_method_func)dKyeff_Execute,
(process_method_func)dKyeff_IsDelete,
(process_method_func)dKyeff_Create, (process_method_func)dKyeff_Delete,
(process_method_func)dKyeff_Execute, (process_method_func)dKyeff_IsDelete,
(process_method_func)dKyeff_Draw,
};
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
/* 803BC16C-803BC198 -00001 0028+04 0/0 0/0 1/0 .data g_profile_KYEFF */
SECTION_DATA extern void* g_profile_KYEFF[10 + 1 /* padding */] = {
(void*)0xFFFFFFFD,
(void*)0x000CFFFD,
(void*)0x03110000,
(void*)&g_fpcLf_Method,
(void*)0x000000F8,
(void*)NULL,
(void*)NULL,
(void*)&g_fopKy_Method,
(void*)0x00050000,
(void*)&l_dKyeff_Method,
/* padding */
NULL,
extern kankyo_process_profile_definition g_profile_KYEFF = {
-3,
12,
0xFFFD,
PROC_KYEFF,
0,
&g_fpcLf_Method.mBase,
sizeof(dKyeff_c),
0,
0,
&g_fopKy_Method,
0x0005,
0,
0,
&l_dKyeff_Method,
};
/* 80394F38-80394F38 021598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */