mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-30 15:43:19 -04:00
project cleanup (#2895)
* some wii OS fixes * remove old dol2asm comments * remove dol2asm.h * remove function address comments * normalize ATTRIBUTE_ALIGN usage * DECL_WEAK macro * fix gcc attribute weak macro * wrap more mwcc specific things in ifdefs * fixes * fix revo sdk version flags * fixes
This commit is contained in:
@@ -1,8 +1,3 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d/d_ev_camera
|
||||
//
|
||||
|
||||
#include "d/dolzel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/d_ev_camera.h"
|
||||
@@ -32,7 +27,6 @@ namespace {
|
||||
}
|
||||
} // namespace
|
||||
|
||||
/* 80088A7C-80088BBC 0833BC 0140+00 0/0 15/15 2/2 .text StartEventCamera__9dCamera_cFiie */
|
||||
int dCamera_c::StartEventCamera(int param_0, int param_1, ...) {
|
||||
if (chkFlag(0x20000000)) {
|
||||
return 0;
|
||||
@@ -62,7 +56,6 @@ int dCamera_c::StartEventCamera(int param_0, int param_1, ...) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80088BBC-80088C24 0834FC 0068+00 0/0 3/3 4/4 .text EndEventCamera__9dCamera_cFi */
|
||||
int dCamera_c::EndEventCamera(int param_1) {
|
||||
if (!chkFlag(0x20000000)) {
|
||||
return 0;
|
||||
@@ -82,7 +75,6 @@ int dCamera_c::EndEventCamera(int param_1) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 80088C24-80088CB0 083564 008C+00 10/10 0/0 0/0 .text searchEventArgData__9dCamera_cFPc */
|
||||
int dCamera_c::searchEventArgData(char* i_eventName) {
|
||||
int i;
|
||||
bool found_event = false;
|
||||
@@ -101,7 +93,6 @@ int dCamera_c::searchEventArgData(char* i_eventName) {
|
||||
return found_event ? i : -1;
|
||||
}
|
||||
|
||||
/* 80088CB0-80088D90 0835F0 00E0+00 3/3 1/1 0/0 .text getEvIntData__9dCamera_cFPiPc */
|
||||
bool dCamera_c::getEvIntData(int* i_data, char* i_event) {
|
||||
if (chkFlag(0x20000000)) {
|
||||
int index = searchEventArgData(i_event);
|
||||
@@ -135,7 +126,6 @@ bool dCamera_c::getEvIntData(int* i_data, char* i_event) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80088D90-80088E58 0836D0 00C8+00 0/0 1/1 0/0 .text getEvFloatData__9dCamera_cFPfPc */
|
||||
bool dCamera_c::getEvFloatData(f32* i_data, char* i_event) {
|
||||
if (chkFlag(0x20000000)) {
|
||||
int index = searchEventArgData(i_event);
|
||||
@@ -165,7 +155,6 @@ bool dCamera_c::getEvFloatData(f32* i_data, char* i_event) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80088E58-80088F1C 083798 00C4+00 4/4 0/0 0/0 .text getEvFloatListData__9dCamera_cFPPfPc */
|
||||
int dCamera_c::getEvFloatListData(f32** i_data, char* i_event) {
|
||||
int num = 0;
|
||||
|
||||
@@ -198,7 +187,6 @@ int dCamera_c::getEvFloatListData(f32** i_data, char* i_event) {
|
||||
return num;
|
||||
}
|
||||
|
||||
/* 80088F1C-80088FE0 08385C 00C4+00 1/1 0/0 0/0 .text getEvXyzListData__9dCamera_cFPP4cXyzPc */
|
||||
int dCamera_c::getEvXyzListData(cXyz** i_data, char* i_event) {
|
||||
int num = 0;
|
||||
|
||||
@@ -231,7 +219,6 @@ int dCamera_c::getEvXyzListData(cXyz** i_data, char* i_event) {
|
||||
return num;
|
||||
}
|
||||
|
||||
/* 80088FE0-8008908C 083920 00AC+00 1/1 0/0 0/0 .text getEvStringPntData__9dCamera_cFPc */
|
||||
char* dCamera_c::getEvStringPntData(char* i_event) {
|
||||
char* string = NULL;
|
||||
|
||||
@@ -263,7 +250,6 @@ char* dCamera_c::getEvStringPntData(char* i_event) {
|
||||
return string;
|
||||
}
|
||||
|
||||
/* 8008908C-80089154 0839CC 00C8+00 20/20 5/5 0/0 .text getEvIntData__9dCamera_cFPiPci */
|
||||
bool dCamera_c::getEvIntData(int* i_data, char* i_event, int param_2) {
|
||||
if (chkFlag(0x20000000)) {
|
||||
int index = searchEventArgData(i_event);
|
||||
@@ -293,7 +279,6 @@ bool dCamera_c::getEvIntData(int* i_data, char* i_event, int param_2) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80089154-8008922C 083A94 00D8+00 11/11 1/1 0/0 .text getEvFloatData__9dCamera_cFPfPcf */
|
||||
bool dCamera_c::getEvFloatData(f32* i_data, char* i_event, f32 param_2) {
|
||||
if (chkFlag(0x20000000)) {
|
||||
int index = searchEventArgData(i_event);
|
||||
@@ -322,7 +307,6 @@ bool dCamera_c::getEvFloatData(f32* i_data, char* i_event, f32 param_2) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8008922C-8008933C 083B6C 0110+00 10/10 0/0 0/0 .text getEvXyzData__9dCamera_cFP4cXyzPc4cXyz */
|
||||
bool dCamera_c::getEvXyzData(cXyz* i_data, char* i_event, cXyz param_2) {
|
||||
if (chkFlag(0x20000000)) {
|
||||
int index = searchEventArgData(i_event);
|
||||
@@ -351,7 +335,6 @@ bool dCamera_c::getEvXyzData(cXyz* i_data, char* i_event, cXyz param_2) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8008933C-8008941C 083C7C 00E0+00 7/7 1/1 0/0 .text getEvStringData__9dCamera_cFPcPcPc */
|
||||
bool dCamera_c::getEvStringData(char* i_data, char* i_event, char* param_2) {
|
||||
if (chkFlag(0x20000000)) {
|
||||
int index = searchEventArgData(i_event);
|
||||
@@ -380,7 +363,6 @@ bool dCamera_c::getEvStringData(char* i_data, char* i_event, char* param_2) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8008941C-800894C4 083D5C 00A8+00 1/1 0/0 0/0 .text getEvStringPntData__9dCamera_cFPcPc */
|
||||
char* dCamera_c::getEvStringPntData(char* i_event, char* param_1) {
|
||||
char* string = NULL;
|
||||
|
||||
@@ -412,7 +394,6 @@ char* dCamera_c::getEvStringPntData(char* i_event, char* param_1) {
|
||||
return string;
|
||||
}
|
||||
|
||||
/* 800894C4-800895F4 083E04 0130+00 7/7 1/1 0/0 .text getEvActor__9dCamera_cFPc */
|
||||
fopAc_ac_c* dCamera_c::getEvActor(char* i_event) {
|
||||
char* string = getEvStringPntData(i_event);
|
||||
if (string == NULL) {
|
||||
@@ -453,7 +434,6 @@ fopAc_ac_c* dCamera_c::getEvActor(char* i_event) {
|
||||
return actor;
|
||||
}
|
||||
|
||||
/* 800895F4-80089730 083F34 013C+00 8/8 1/1 0/0 .text getEvActor__9dCamera_cFPcPc */
|
||||
fopAc_ac_c* dCamera_c::getEvActor(char* i_event, char* param_1) {
|
||||
char string[16];
|
||||
string[0] = 0;
|
||||
@@ -494,7 +474,6 @@ fopAc_ac_c* dCamera_c::getEvActor(char* i_event, char* param_1) {
|
||||
return actor;
|
||||
}
|
||||
|
||||
/* 80089730-800897E8 084070 00B8+00 0/0 3/0 0/0 .text pauseEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::pauseEvCamera() {
|
||||
EventData* event = (EventData*)mWork;
|
||||
|
||||
@@ -521,7 +500,6 @@ namespace {
|
||||
static cXyz WolfAdditionVec(0.0f, -70.0f, 70.0f);
|
||||
}
|
||||
|
||||
/* 800897E8-8008A510 084128 0D28+00 0/0 1/0 0/0 .text fixedFrameEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::fixedFrameEvCamera() {
|
||||
FixedFrameEvData* fframe_p = (FixedFrameEvData*)mWork;
|
||||
if (mCurCamStyleTimer == 0) {
|
||||
@@ -656,7 +634,6 @@ bool dCamera_c::fixedFrameEvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8008A510-8008A974 084E50 0464+00 0/0 1/0 0/0 .text stokerEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::stokerEvCamera() {
|
||||
StokerData* stoker_p = (StokerData*)mWork;
|
||||
if (mCurCamStyleTimer == 0) {
|
||||
@@ -726,7 +703,6 @@ bool dCamera_c::stokerEvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8008A974-8008B9B0 0852B4 103C+00 0/0 1/0 0/0 .text rollingEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::rollingEvCamera() {
|
||||
struct RollingData* rolling_p = (RollingData*)mWork;
|
||||
if (mCurCamStyleTimer == 0) {
|
||||
@@ -873,7 +849,6 @@ namespace {
|
||||
}
|
||||
} // namespace
|
||||
|
||||
/* 8008B9B0-8008BE2C 0862F0 047C+00 0/0 1/0 0/0 .text fixedPositionEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::fixedPositionEvCamera() {
|
||||
static cXyz DefaultGap(cXyz::Zero);
|
||||
FixedPosData* fpos_p = (FixedPosData*)mWork;
|
||||
@@ -945,17 +920,14 @@ bool dCamera_c::fixedPositionEvCamera() {
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* 8008BE2C-8008BE50 08676C 0024+00 0/0 1/0 0/0 .text uniformTransEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::uniformTransEvCamera() {
|
||||
transEvCamera(1);
|
||||
}
|
||||
|
||||
/* 8008BE50-8008BE74 086790 0024+00 0/0 1/0 0/0 .text uniformBrakeEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::uniformBrakeEvCamera() {
|
||||
transEvCamera(2);
|
||||
}
|
||||
|
||||
/* 8008BE74-8008BE98 0867B4 0024+00 0/0 1/0 0/0 .text uniformAcceleEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::uniformAcceleEvCamera() {
|
||||
transEvCamera(3);
|
||||
}
|
||||
@@ -972,7 +944,6 @@ f32 dummy_lit_3871(int val) {
|
||||
return my_vec[val];
|
||||
}
|
||||
|
||||
/* 8008BE98-8008E750 0867D8 28B8+00 3/3 0/0 0/0 .text transEvCamera__9dCamera_cFi */
|
||||
bool dCamera_c::transEvCamera(int param_1) {
|
||||
TransData* trans = (TransData*)mWork;
|
||||
f32 mid_val;
|
||||
@@ -1439,7 +1410,6 @@ bool dCamera_c::transEvCamera(int param_1) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* 8008E938-8008FA58 089278 1120+00 0/0 1/0 0/0 .text watchActorEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::watchActorEvCamera() {
|
||||
static cXyz DefaultGap(cXyz::Zero);
|
||||
|
||||
@@ -1743,7 +1713,6 @@ bool dCamera_c::watchActorEvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8008FAE8-80090174 08A428 068C+00 0/0 1/0 0/0 .text restorePosEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::restorePosEvCamera() {
|
||||
static cXyz DefaultGap(cXyz::Zero);
|
||||
RestorePosData* restorePos = (RestorePosData*)mWork;
|
||||
@@ -1855,7 +1824,6 @@ bool dCamera_c::restorePosEvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80090174-80090230 08AAB4 00BC+00 0/0 1/0 0/0 .text talktoEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::talktoEvCamera() {
|
||||
fopAc_ac_c* r27 = (fopAc_ac_c*)dComIfGp_event_getPt1();
|
||||
s32 style = mCamTypeData[mEventData.field_0xc].field_0x18[mIsWolf][3];
|
||||
@@ -1878,7 +1846,6 @@ bool dCamera_c::talktoEvCamera() {
|
||||
return (this->*engine_tbl[mCamParam.Algorythmn(style)])(style);
|
||||
}
|
||||
|
||||
/* 80090230-80090478 08AB70 0248+00 0/0 1/0 0/0 .text maptoolIdEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::maptoolIdEvCamera() {
|
||||
if (mCurCamStyleTimer == 0) {
|
||||
int id;
|
||||
@@ -1956,7 +1923,6 @@ bool dCamera_c::maptoolIdEvCamera() {
|
||||
return false;
|
||||
}
|
||||
|
||||
/* 80090478-80090514 08ADB8 009C+00 0/0 1/0 0/0 .text styleEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::styleEvCamera() {
|
||||
if (mCurCamStyleTimer == 0) {
|
||||
mEventData.field_0x8 = 0;
|
||||
@@ -1968,7 +1934,6 @@ bool dCamera_c::styleEvCamera() {
|
||||
return isModeOK();
|
||||
}
|
||||
|
||||
/* 80090514-80091468 08AE54 0F54+00 0/0 1/0 0/0 .text gameOverEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::gameOverEvCamera() {
|
||||
int i;
|
||||
|
||||
@@ -2309,7 +2274,6 @@ bool dCamera_c::gameOverEvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80091468-8009236C 08BDA8 0F04+00 1/0 1/0 0/0 .text tactEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::tactEvCamera() {
|
||||
TactData* tact_p = (TactData*)mWork;
|
||||
cXyz sp58[6] = {
|
||||
@@ -2588,12 +2552,10 @@ bool dCamera_c::tactEvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 800923B8-800923C0 08CCF8 0008+00 0/0 1/0 0/0 .text turnToActorEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::turnToActorEvCamera() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 800923C0-800924D0 08CD00 0110+00 0/0 1/0 0/0 .text stbWaitEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::stbWaitEvCamera() {
|
||||
dDemo_camera_c* demo_cam = dDemo_c::getCamera();
|
||||
#if DEBUG
|
||||
@@ -2648,7 +2610,6 @@ bool dCamera_c::stbWaitEvCamera() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 800924D0-8009258C 08CE10 00BC+00 0/0 1/0 0/0 .text saveEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::saveEvCamera() {
|
||||
int slot;
|
||||
getEvIntData(&slot, "Slot", 0);
|
||||
@@ -2663,7 +2624,6 @@ bool dCamera_c::saveEvCamera() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 8009258C-800929AC 08CECC 0420+00 0/0 1/0 0/0 .text loadEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::loadEvCamera() {
|
||||
LoadData* load = (LoadData*)mWork;
|
||||
f32 local_58[6] = { 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f };
|
||||
@@ -2729,7 +2689,6 @@ bool dCamera_c::loadEvCamera() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 800929AC-800937AC 08D2EC 0E00+00 0/0 1/0 0/0 .text useItem0EvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::useItem0EvCamera() {
|
||||
ItemData* item_p = (ItemData*)mWork;
|
||||
cXyz vec_1dc(10.0f, -15.0f, 20.0f);
|
||||
@@ -2998,7 +2957,6 @@ bool dCamera_c::useItem0EvCamera() {
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* 800937AC-80094240 08E0EC 0A94+00 0/0 1/0 0/0 .text useItem1EvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::useItem1EvCamera() {
|
||||
ItemData* item_p = (ItemData*)mWork;
|
||||
if (mCurCamStyleTimer == 0) {
|
||||
@@ -3192,7 +3150,6 @@ bool dCamera_c::useItem1EvCamera() {
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* 80094240-80094A70 08EB80 0830+00 0/0 1/0 0/0 .text getItemEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::getItemEvCamera() {
|
||||
GetItemData* gitem_p = (GetItemData*)mWork;
|
||||
cXyz cStack_90[8] = {
|
||||
@@ -3318,7 +3275,6 @@ namespace {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80094A70-80095010 08F3B0 05A0+00 0/0 1/0 0/0 .text possessedEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::possessedEvCamera() {
|
||||
PossessedData* possessed = (PossessedData*)mWork;
|
||||
cXyz vec_d8;
|
||||
@@ -3417,7 +3373,6 @@ bool dCamera_c::possessedEvCamera() {
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* 80095010-8009544C 08F950 043C+00 0/0 1/0 0/0 .text fixedFramesEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::fixedFramesEvCamera() {
|
||||
int const_1_val = 1;
|
||||
FixedFramesData* fframes_p = (FixedFramesData*)mWork;
|
||||
@@ -3524,7 +3479,6 @@ bool dCamera_c::fixedFramesEvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8009544C-800956E4 08FD8C 0298+00 0/0 1/0 0/0 .text bSplineEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::bSplineEvCamera() {
|
||||
BSplineData* bSpline = (BSplineData*)mWork;
|
||||
if (mCurCamStyleTimer == 0) {
|
||||
@@ -3592,7 +3546,6 @@ bool dCamera_c::bSplineEvCamera() {
|
||||
return bSpline->field_0x1c;
|
||||
}
|
||||
|
||||
/* 800956E4-80095E7C 090024 0798+00 0/0 1/0 0/0 .text twoActor0EvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::twoActor0EvCamera() {
|
||||
static cXyz DefaultGap(0.0f, 0.0f, 0.0f);
|
||||
TwoActor0Data* twoact0_p = (TwoActor0Data*)mWork;
|
||||
@@ -3711,7 +3664,6 @@ bool dCamera_c::twoActor0EvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80095E7C-80095FD0 0907BC 0154+00 0/0 1/0 0/0 .text peepHoleEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::peepHoleEvCamera() {
|
||||
if (mCurCamStyleTimer == 0) {
|
||||
fopAc_ac_c* mPlayer = dComIfGp_getLinkPlayer();
|
||||
@@ -3736,7 +3688,6 @@ bool dCamera_c::peepHoleEvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80095FD0-800965AC 090910 05DC+00 0/0 1/0 0/0 .text digHoleEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::digHoleEvCamera() {
|
||||
DigHoleData* digHole = (DigHoleData*)mWork;
|
||||
if (mCurCamStyleTimer == 0) {
|
||||
@@ -3841,7 +3792,6 @@ bool dCamera_c::digHoleEvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 800965AC-80096EDC 090EEC 0930+00 0/0 1/0 0/0 .text hintTalkEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::hintTalkEvCamera() {
|
||||
HintTalkData* hintTalk = (HintTalkData*)mWork;
|
||||
daAlink_c* link_p = (daAlink_c*)mpPlayerActor;
|
||||
@@ -3978,7 +3928,6 @@ bool dCamera_c::hintTalkEvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80096EDC-80097694 09181C 07B8+00 0/0 1/0 0/0 .text bspTransEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::bspTransEvCamera() {
|
||||
BspTransData* bspTrans = (BspTransData*)mWork;
|
||||
f32 local_7c[4] = { 0.0f, 0.0f, 1.0f, 1.0f };
|
||||
@@ -4138,7 +4087,6 @@ bool dCamera_c::bspTransEvCamera() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80097694-8009769C 091FD4 0008+00 0/0 1/0 0/0 .text portalWarpEvCamera__9dCamera_cFv */
|
||||
bool dCamera_c::portalWarpEvCamera() {
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user