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

1 files changed, 0 insertions, 181 deletions

diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index c9b82edca9..1381b17be0 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_camera
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_camera.h"
@@ -30,7 +25,6 @@
 
 namespace {
 
-/* 8015FA2C-8015FA4C 15A36C 0020+00 2/2 0/0 0/0 .text limitf__22@unnamed@d_camera_cpp@Ffff */
 static f32 limitf(f32 value, f32 min, f32 max) {
     if (value > max) {
         return max;
@@ -49,8 +43,6 @@ inline static bool is_player(fopAc_ac_c* actor) {
     return fopAcM_GetName(actor) == PROC_ALINK || fopAcM_GetName(actor) == PROC_ALINK;
 }
 
-/* 8015FA4C-8015FADC 15A38C 0090+00 1/1 0/0 0/0 .text
- * hideActor__22@unnamed@d_camera_cpp@FP10fopAc_ac_c            */
 static void hideActor(fopAc_ac_c* actor) {
     if (is_player(actor)) {
         dComIfGp_onCameraAttentionStatus(0, 2);
@@ -62,8 +54,6 @@ static void hideActor(fopAc_ac_c* actor) {
     }
 }
 
-/* 8015FADC-8015FB28 15A41C 004C+00 1/1 0/0 0/0 .text defaultRadius__22@unnamed@d_camera_cpp@FffPf
- */
 static bool defaultRadius(f32 param_0, f32 param_1, f32* param_2) {
     f32 var_f30;
     f32 var_f31;
@@ -89,8 +79,6 @@ static bool defaultRadius(f32 param_0, f32 param_1, f32* param_2) {
     return true;
 }
 
-/* 8015FB28-8015FBF8 15A468 00D0+00 1/1 0/0 0/0 .text
- * posInLine2D__22@unnamed@d_camera_cpp@FP4cXyzP4cXyzP4cXyz     */
 static bool posInLine2D(cXyz* param_0, cXyz* param_1, cXyz* param_2) {
     if (param_0->x <= param_1->x) {
         if (param_2->x < param_0->x)
@@ -119,8 +107,6 @@ static bool posInLine2D(cXyz* param_0, cXyz* param_1, cXyz* param_2) {
     return true;
 }
 
-/* 8015FBF8-8015FEB8 15A538 02C0+00 1/1 0/0 0/0 .text
- * relationalPos2__22@unnamed@d_camera_cpp@FP10fopAc_ac_cP10fopAc_ac_cP4cXyzf7cSAngle */
 static cXyz relationalPos2(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cXyz* param_2, f32 param_3,
                            cSAngle param_4) {
     if (i_actor1 == NULL || i_actor2 == NULL) {
@@ -153,8 +139,6 @@ inline static cSAngle sAngleY(cXyz& i_vec) {
 
 }  // namespace
 
-/* 8015FEB8-8016008C 15A7F8 01D4+00 4/4 0/0 0/0 .text Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc
- */
 int dCamMapToolData::Set(s32 param_0, s32 roomNo, fopAc_ac_c* param_2, u16 param_3, u8 param_4) {
     if ((param_3 & 0xFF) > mPriority) {
         return 0;
@@ -194,7 +178,6 @@ int dCamMapToolData::Set(s32 param_0, s32 roomNo, fopAc_ac_c* param_2, u16 param
     return 0;
 }
 
-/* 803BA25C-803BA34C 01737C 00F0+00 2/3 3/3 0/0 .data            engine_tbl__9dCamera_c */
 engine_fn dCamera_c::engine_tbl[] = {
     &dCamera_c::letCamera,        &dCamera_c::chaseCamera,    &dCamera_c::lockonCamera,
     &dCamera_c::talktoCamera,     &dCamera_c::subjectCamera,  &dCamera_c::fixedPositionCamera,
@@ -249,13 +232,11 @@ inline static f32 playerMaxSpeed() {
 
 }  // namespace
 
-/* 8016008C-801602C4 15A9CC 0238+00 1/1 0/0 0/0 .text            __ct__9dCamera_cFP12camera_class */
 dCamera_c::dCamera_c(camera_class* i_camera) : mCamParam(0) {
     initialize(i_camera, get_player_actor(i_camera), get_camera_id(i_camera),
                get_controller_id(i_camera));
 }
 
-/* 80160304-80160470 15AC44 016C+00 1/1 0/0 0/0 .text            __dt__9dCamera_cFv */
 dCamera_c::~dCamera_c() {
     if (!daPy_py_c::checkPeepEndSceneChange()) {
         dComIfGs_getTurnRestart().setCameraCtr(mCenter);
@@ -313,10 +294,8 @@ enum SpecialType {
 
 namespace {
 
-/* 8042C8F8-8042C9A0 059618 00A8+00 12/12 0/0 0/0 .bss specialType__22@unnamed@d_camera_cpp@ */
 static int specialType[42];
 
-/* 80451020-80451024 000520 0004+00 4/4 0/0 0/0 .sbss            Stage__22@unnamed@d_camera_cpp@ */
 static int Stage;
 
 static f32 WideTurnSaving = 0.86f + OREG_F(1);
@@ -355,8 +334,6 @@ inline static void setComZoomForcus(f32 param_0) {
 
 }  // namespace
 
-/* 80160470-801614AC 15ADB0 103C+00 1/1 0/0 0/0 .text
- * initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl      */
 void dCamera_c::initialize(camera_class* i_camera, fopAc_ac_c* i_player, u32 i_cameraID,
                            u32 i_padID) {
     char* type_data =
@@ -645,7 +622,6 @@ void dCamera_c::initialize(camera_class* i_camera, fopAc_ac_c* i_player, u32 i_c
     field_0x95c = cXyz::Zero;
 }
 
-/* 801614AC-801614C4 15BDEC 0018+00 0/0 1/1 106/106 .text            Start__9dCamera_cFv */
 void dCamera_c::Start() {
     if (mCamSetup.CheckFlag(0x8000) && mCurState != 0 && mCurState != 2) {
         OS_REPORT("camera: start\n");
@@ -656,7 +632,6 @@ void dCamera_c::Start() {
     }
 }
 
-/* 801614C4-801614D0 15BE04 000C+00 0/0 1/1 0/0 .text            QuickStart__9dCamera_cFv */
 void dCamera_c::QuickStart() {
     if (mCamSetup.CheckFlag(0x8000) && mCurState != 0) {
         OS_REPORT("camera: quick start\n");
@@ -665,7 +640,6 @@ void dCamera_c::QuickStart() {
     mCurState = 0;
 }
 
-/* 801614D0-801614E8 15BE10 0018+00 0/0 2/2 98/98 .text            Stop__9dCamera_cFv */
 void dCamera_c::Stop() {
     clrFlag(0x200000);
 
@@ -676,12 +650,10 @@ void dCamera_c::Stop() {
     mCurState = 3;
 }
 
-/* 801614E8-801614F4 15BE28 000C+00 0/0 2/2 0/0 .text            Stay__9dCamera_cFv */
 void dCamera_c::Stay() {
     mCurState = 1;
 }
 
-/* 801614F4-80161550 15BE34 005C+00 2/2 4/4 0/0 .text            ChangeModeOK__9dCamera_cFl */
 bool dCamera_c::ChangeModeOK(s32 param_0) {
     if (dComIfGp_evmng_cameraPlay() || chkFlag(0x20000000)) {
         return 0;
@@ -690,7 +662,6 @@ bool dCamera_c::ChangeModeOK(s32 param_0) {
     return !(mCamTypeData[mCurType].field_0x18[mIsWolf][param_0] < 0);
 }
 
-/* 80161550-801617B0 15BE90 0260+00 1/1 0/0 0/0 .text            initPad__9dCamera_cFv */
 void dCamera_c::initPad() {
     if (chkFlag(0x1000000)) {
         mPadInfo.mMainStick.mLastPosX = 0.0f;
@@ -758,7 +729,6 @@ void dCamera_c::initPad() {
     mCameraInputActive = 0;
 }
 
-/* 801617B0-80161D84 15C0F0 05D4+00 1/1 0/0 0/0 .text            updatePad__9dCamera_cFv */
 void dCamera_c::updatePad() {
     dComIfGp_getAttention();
     int var_r30 = mCamParam.Algorythmn(mCamStyle);
@@ -925,7 +895,6 @@ void dCamera_c::updatePad() {
 }
 
 
-/* 80161D84-80161E34 15C6C4 00B0+00 1/1 0/0 0/0 .text            initMonitor__9dCamera_cFv */
 void dCamera_c::initMonitor() {
     if (mpPlayerActor != NULL) {
         mMonitor.field_0x0 = positionOf(mpPlayerActor);
@@ -941,7 +910,6 @@ void dCamera_c::initMonitor() {
     mMonitor.field_0x14 = cXyz::Zero;
 }
 
-/* 80161E34-80162088 15C774 0254+00 1/1 0/0 0/0 .text            updateMonitor__9dCamera_cFv */
 void dCamera_c::updateMonitor() {
     if (mpPlayerActor != NULL) {
         cXyz sp24 = positionOf(mpPlayerActor);
@@ -973,8 +941,6 @@ void dCamera_c::updateMonitor() {
     }
 }
 
-/* 80162088-801622B0 15C9C8 0228+00 1/1 0/0 0/0 .text            checkForceLockTarget__9dCamera_cFv
- */
 bool dCamera_c::checkForceLockTarget() {
     bool ret = true;
     if (mLockOnActorID != -1) {
@@ -994,7 +960,6 @@ bool dCamera_c::checkForceLockTarget() {
     return ret;
 }
 
-/* 801622B0-801622B4 15CBF0 0004+00 1/1 0/0 0/0 .text            infoReport__9dCamera_cFv */
 void dCamera_c::infoReport() {
 #if DEBUG
 #endif
@@ -1016,7 +981,6 @@ inline bool chkCornerCos(f32 param_0) {
 
 }  // namespace
 
-/* 801622B4-80162D38 15CBF4 0A84+00 1/1 0/0 0/0 .text            Run__9dCamera_cFv */
 bool dCamera_c::Run() {
     daAlink_c* link = daAlink_getAlinkActorClass();
     daMidna_c* midna = daPy_py_c::getMidnaActor();
@@ -1248,7 +1212,6 @@ bool dCamera_c::Run() {
     return bVar9;
 }
 
-/* 80162D38-80162FB8 15D678 0280+00 1/1 0/0 0/0 .text            NotRun__9dCamera_cFv */
 bool dCamera_c::NotRun() {
     daAlink_c* link = daAlink_getAlinkActorClass();
     daMidna_c* midna = daPy_py_c::getMidnaActor();
@@ -1301,7 +1264,6 @@ bool dCamera_c::NotRun() {
     return true;
 }
 
-/* 80162FB8-80162FD4 15D8F8 001C+00 1/1 0/0 0/0 .text            V__9dCamera_cFv */
 s16 dCamera_c::V() {
     if (chkFlag(0x10)) {
         return mUpOverride.field_0x24.V();
@@ -1310,7 +1272,6 @@ s16 dCamera_c::V() {
     }
 }
 
-/* 80162FD4-8016300C 15D914 0038+00 1/1 0/0 0/0 .text            U__9dCamera_cFv */
 s16 dCamera_c::U() {
     if (chkFlag(0x10)) {
         return mUpOverride.field_0x24.U();
@@ -1319,20 +1280,17 @@ s16 dCamera_c::U() {
     }
 }
 
-/* 8016300C-80163028 15D94C 001C+00 1/1 1/1 135/135 .text            SetTrimSize__9dCamera_cFl */
 bool dCamera_c::SetTrimSize(s32 size) {
     bool rt = mTrimSize != size;
     mTrimSize = size;
     return rt;
 }
 
-/* 80163028-80163034 15D968 000C+00 1/1 2/2 4/4 .text            SetTrimTypeForce__9dCamera_cFl */
 bool dCamera_c::SetTrimTypeForce(s32 param_0) {
     mTrimTypeForce = param_0;
     return 1;
 }
 
-/* 80163034-80163154 15D974 0120+00 1/1 0/0 0/0 .text            CalcTrimSize__9dCamera_cFv */
 void dCamera_c::CalcTrimSize() {
     if (mCurState != 2) {
         switch (mTrimSize) {
@@ -1367,7 +1325,6 @@ void dCamera_c::CalcTrimSize() {
     mForcedMode = 11;
 }
 
-/* 80163154-8016317C 15DA94 0028+00 1/1 0/0 0/0 .text            Draw__9dCamera_cFv */
 int dCamera_c::Draw() {
 #if DEBUG
     debugDraw();
@@ -1376,8 +1333,6 @@ int dCamera_c::Draw() {
     return 1;
 }
 
-/* 8016317C-80163340 15DABC 01C4+00 1/1 0/0 0/0 .text            setStageMapToolData__9dCamera_cFv
- */
 void dCamera_c::setStageMapToolData() {
     int cameraIndex = 0xFF;
     int var_r27 = 0xFF;
@@ -1414,7 +1369,6 @@ void dCamera_c::setStageMapToolData() {
     }
 }
 
-/* 80163340-80163558 15DC80 0218+00 2/2 0/0 0/0 .text            setMapToolData__9dCamera_cFv */
 void dCamera_c::setMapToolData() {
     int room_no = dComIfGp_roomControl_getStayNo();
     stage_camera_class* camera = dComIfGp_getRoomCamera(room_no);
@@ -1446,7 +1400,6 @@ void dCamera_c::setMapToolData() {
     setRoomMapToolData(&mRoomMapTool, var_r29, room_no);
 }
 
-/* 80163558-801635AC 15DE98 0054+00 0/0 0/0 1/1 .text SetTagData__9dCamera_cFP10fopAc_ac_clUsUc */
 void dCamera_c::SetTagData(fopAc_ac_c* param_0, s32 param_1, u16 param_2, u8 param_3) {
     s32 room_no;
     if (param_0 != NULL) {
@@ -1458,13 +1411,10 @@ void dCamera_c::SetTagData(fopAc_ac_c* param_0, s32 param_1, u16 param_2, u8 par
     mTagCamTool.Set(param_1, room_no, param_0, param_2, param_3);
 }
 
-/* 801635AC-801635E4 15DEEC 0038+00 2/2 0/0 0/0 .text
- * setRoomMapToolData__9dCamera_cFP15dCamMapToolDatall          */
 void dCamera_c::setRoomMapToolData(dCamMapToolData* i_toolData, s32 param_1, s32 i_roomNo) {
     i_toolData->Set(param_1, i_roomNo, NULL, 0xFF, 0xFF);
 }
 
-/* 801635E4-80163C38 15DF24 0654+00 1/1 0/0 0/0 .text            nextMode__9dCamera_cFl */
 s32 dCamera_c::nextMode(s32 i_curMode) {
     dAttention_c* attn = dComIfGp_getAttention();
     s32 next_mode = i_curMode;
@@ -1578,7 +1528,6 @@ s32 dCamera_c::nextMode(s32 i_curMode) {
     return next_mode;
 }
 
-/* 80163C38-80163D50 15E578 0118+00 2/1 0/0 0/0 .text            onModeChange__9dCamera_cFll */
 bool dCamera_c::onModeChange(s32 i_curMode, s32 i_nextMode) {
     field_0x160 = 0;
     field_0x164 = 0;
@@ -1625,13 +1574,11 @@ bool dCamera_c::onModeChange(s32 i_curMode, s32 i_nextMode) {
     return true;
 }
 
-/* 80163D50-80163D5C 15E690 000C+00 0/0 0/0 4/4 .text            ModeFix__9dCamera_cFl */
 int dCamera_c::ModeFix(s32 param_0) {
     mForcedMode = param_0;
     return 1;
 }
 
-/* 80163D5C-8016444C 15E69C 06F0+00 1/1 0/0 0/0 .text            nextType__9dCamera_cFl */
 s32 dCamera_c::nextType(s32 i_curType) {
     s32 next_type = i_curType;
 
@@ -1768,7 +1715,6 @@ s32 dCamera_c::nextType(s32 i_curType) {
     return next_type;
 }
 
-/* 8016444C-8016469C 15ED8C 0250+00 1/1 0/0 0/0 .text            onTypeChange__9dCamera_cFll */
 bool dCamera_c::onTypeChange(s32 i_curType, s32 i_nextType) {
     if (i_curType == specialType[CAM_TYPE_EVENT]) {
         if (mCamSetup.CheckFlag(0x4000)) {
@@ -1826,7 +1772,6 @@ bool dCamera_c::onTypeChange(s32 i_curType, s32 i_nextType) {
     return true;
 }
 
-/* 8016469C-801647B0 15EFDC 0114+00 2/1 0/0 0/0 .text            onStyleChange__9dCamera_cFll */
 bool dCamera_c::onStyleChange(s32 param_0, s32 param_1) {
     mCurCamStyleTimer = 0;
     mStyleSettle.mFinished = false;
@@ -1872,7 +1817,6 @@ bool dCamera_c::onStyleChange(s32 param_0, s32 param_1) {
 }
 
 
-/* 801647B0-80164878 15F0F0 00C8+00 1/1 0/0 0/0 .text            onRoomChange__9dCamera_cFl */
 int dCamera_c::onRoomChange(s32 i_roomNo) {
     mRoomCtx.mRoomNo = i_roomNo;
     setFlag(0x1000);
@@ -1895,8 +1839,6 @@ int dCamera_c::onRoomChange(s32 i_roomNo) {
     return 1;
 }
 
-/* 80164878-80164944 15F1B8 00CC+00 4/4 0/0 0/0 .text            getParamTargetActor__9dCamera_cFl
- */
 fopAc_ac_c* dCamera_c::getParamTargetActor(s32 param_0) {
     daAlink_c* player = daAlink_getAlinkActorClass();
 
@@ -1914,7 +1856,6 @@ fopAc_ac_c* dCamera_c::getParamTargetActor(s32 param_0) {
     return fopAcM_searchFromName4Event(&mCamTypeData[param_0].name[16], -1);
 }
 
-/* 80164944-80164B64 15F284 0220+00 0/0 1/1 0/0 .text GetCameraTypeFromMapToolID__9dCamera_cFll */
 int dCamera_c::GetCameraTypeFromMapToolID(s32 param_0, s32 i_roomNo) {
     dStage_dt_c& stage_dt = g_dComIfG_gameInfo.play.getStage();
 
@@ -1986,8 +1927,6 @@ int dCamera_c::GetCameraTypeFromMapToolID(s32 param_0, s32 i_roomNo) {
     return i;
 }
 
-/* 80164B64-80164C10 15F4A4 00AC+00 2/2 1/1 0/0 .text GetCameraTypeFromCameraName__9dCamera_cFPCc
- */
 int dCamera_c::GetCameraTypeFromCameraName(char const* i_name) {
     if (strcmp(i_name, mCamTypeData[mCurType].name) == 0) {
         return mCurType;
@@ -2010,8 +1949,6 @@ int dCamera_c::GetCameraTypeFromCameraName(char const* i_name) {
     return i;
 }
 
-/* 80164C10-80164C64 15F550 0054+00 2/2 0/0 0/0 .text
- * GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class */
 int dCamera_c::GetCameraTypeFromToolData(stage_camera2_data_class* i_data) {
     if (i_data->field_0x16 != 0xFFFF) {
         return i_data->field_0x16;
@@ -2025,8 +1962,6 @@ int dCamera_c::GetCameraTypeFromToolData(stage_camera2_data_class* i_data) {
     return type;
 }
 
-/* 80164C64-80164CAC 15F5A4 0048+00 4/4 2/2 0/0 .text
- * pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs              */
 void dCamera_c::pushInfo(dCamera_c::dCamInfo_c* i_info, s16 param_1) {
     i_info->mCenter = mCenter;
     i_info->mEye = mEye;
@@ -2035,8 +1970,6 @@ void dCamera_c::pushInfo(dCamera_c::dCamInfo_c* i_info, s16 param_1) {
     i_info->field_0x1e = param_1;
 }
 
-/* 80164CAC-80164D2C 15F5EC 0080+00 2/2 0/0 0/0 .text
- * popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c                */
 void dCamera_c::popInfo(dCamera_c::dCamInfo_c* i_info) {
     mCenter = mViewCache.mCenter = i_info->mCenter;
     mEye = mViewCache.mEye = i_info->mEye;
@@ -2045,8 +1978,6 @@ void dCamera_c::popInfo(dCamera_c::dCamInfo_c* i_info) {
     mBank = mViewCache.mBank;
 }
 
-/* 80164D2C-80164D6C 15F66C 0040+00 4/4 0/0 0/0 .text            heightOf__9dCamera_cFP10fopAc_ac_c
- */
 f32 dCamera_c::heightOf(fopAc_ac_c* i_actor) {
     if (is_player(i_actor)) {
         return ((daPy_py_c*)i_actor)->getHeight();
@@ -2055,8 +1986,6 @@ f32 dCamera_c::heightOf(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 80164D6C-80164E20 15F6AC 00B4+00 9/9 15/15 0/0 .text
- * relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz                */
 cXyz dCamera_c::relationalPos(fopAc_ac_c* i_actor, cXyz* i_offset) {
     if (i_actor == NULL) {
         return cXyz::Zero;
@@ -2066,8 +1995,6 @@ cXyz dCamera_c::relationalPos(fopAc_ac_c* i_actor, cXyz* i_offset) {
     return attentionPos(i_actor) + offset;
 }
 
-/* 80164E20-80165104 15F760 02E4+00 0/0 1/1 0/0 .text
- * relationalPos__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzf  */
 cXyz dCamera_c::relationalPos(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cXyz* i_offset,
                               f32 param_3) {
     if (i_actor1 == NULL) {
@@ -2098,19 +2025,16 @@ cXyz dCamera_c::relationalPos(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cXyz*
     return ret;
 }
 
-/* 80165104-80165158 15FA44 0054+00 7/7 0/0 0/0 .text            setUSOAngle__9dCamera_cFv */
 void dCamera_c::setUSOAngle() {
     mFakeAngleSys.field_0x0 = 1;
     mFakeAngleSys.field_0x2 = mDirection.U().Inv();
     mFakeAngleSys.field_0x4 = mPadInfo.mMainStick.mAngle;
 }
 
-/* 80165158-8016517C 15FA98 0024+00 1/1 0/0 0/0 .text            getUSOAngle__9dCamera_cF7cSAngle */
 cSAngle dCamera_c::getUSOAngle(cSAngle param_0) {
     return mFakeAngleSys.field_0x2;
 }
 
-/* 8016517C-80165238 15FABC 00BC+00 1/1 2/2 0/0 .text            pointInSight__9dCamera_cFP4cXyz */
 bool dCamera_c::pointInSight(cXyz* i_point) {
     cXyz proj;
     dDlst_window_c* window = get_window(field_0x0);
@@ -2121,8 +2045,6 @@ bool dCamera_c::pointInSight(cXyz* i_point) {
     return (proj.x > 0.0f && proj.x < scissor_width) && (proj.y > 0.0f && proj.y < scissor_height);
 }
 
-/* 80165238-801657EC 15FB78 05B4+00 3/3 0/0 0/0 .text
- * radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyzfsf */
 f32 dCamera_c::radiusActorInSight(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cXyz* i_center,
                                    cXyz* i_eye, f32 i_fovY, s16 i_bank, f32 param_6) {
     dDlst_window_c* window = get_window(field_0x0);
@@ -2221,7 +2143,6 @@ f32 dCamera_c::radiusActorInSight(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cX
     return ret;
 }
 
-/* 801657EC-801658C0 16012C 00D4+00 3/3 0/0 0/0 .text            groundHeight__9dCamera_cFP4cXyz */
 f32 dCamera_c::groundHeight(cXyz* param_0) {
     dBgS_GndChk gndchk;
     gndchk.SetPos(param_0);
@@ -2248,8 +2169,6 @@ f32 dCamera_c::groundHeight(cXyz* param_0) {
     return height_correct;
 }
 
-/* 801658C0-801659F4 160200 0134+00 12/12 0/0 0/0 .text
- * lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl         */
 bool dCamera_c::lineBGCheck(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linChk, u32 i_flags) {
     if (i_flags & 0x8000) {
         i_linChk->ClrCam();
@@ -2292,8 +2211,6 @@ bool dCamera_c::lineBGCheck(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linChk, u
     }
 }
 
-/* 801659F4-80165AF0 160334 00FC+00 4/4 4/4 0/0 .text lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl
- */
 bool dCamera_c::lineBGCheck(cXyz* i_start, cXyz* i_end, cXyz* o_cross, u32 i_flags) {
     dBgS_CamLinChk lin_chk;
     if (lineBGCheck(i_start, i_end, &lin_chk, i_flags)) {
@@ -2307,14 +2224,11 @@ bool dCamera_c::lineBGCheck(cXyz* i_start, cXyz* i_end, cXyz* o_cross, u32 i_fla
     }
 }
 
-/* 80165AF0-80165B60 160430 0070+00 3/3 13/13 0/0 .text lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl */
 bool dCamera_c::lineBGCheck(cXyz* i_start, cXyz* i_end, u32 i_flags) {
     dBgS_CamLinChk lin_chk;
     return lineBGCheck(i_start, i_end, &lin_chk, i_flags);
 }
 
-/* 80165B60-80165C08 1604A0 00A8+00 1/1 0/0 0/0 .text
- * lineCollisionCheckBush__9dCamera_cFP4cXyzP4cXyz              */
 u32 dCamera_c::lineCollisionCheckBush(cXyz* i_start, cXyz* i_end) {
     u32 ret = 0;
     u32 result = dComIfG_Ccsp()->GetMassResultCam();
@@ -2335,8 +2249,6 @@ u32 dCamera_c::lineCollisionCheckBush(cXyz* i_start, cXyz* i_end) {
     return ret;
 }
 
-/* 80165C08-80165CE0 160548 00D8+00 1/1 0/0 0/0 .text
- * sph_chk_callback__FP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv */
 static void sph_chk_callback(dBgS_SphChk* i_sphChk, cBgD_Vtx_t* i_vtxTbl, int i_vtxIdx0,
                              int i_vtxIdx1, int i_vtxIdx2, cM3dGPla* i_plane, void* i_data) {
     camSphChkdata* sph_chk_data = (camSphChkdata*)i_data;
@@ -2351,7 +2263,6 @@ static void sph_chk_callback(dBgS_SphChk* i_sphChk, cBgD_Vtx_t* i_vtxTbl, int i_
     }
 }
 
-/* 80165CE0-80165E74 160620 0194+00 1/1 0/0 0/0 .text compWallMargin__9dCamera_cFP4cXyzP4cXyzf */
 cXyz dCamera_c::compWallMargin(cXyz* i_center, cXyz* param_1, f32 i_radius) {
     dBgS_CamSphChk sph_chk;
     camSphChkdata sph_chk_data(i_center, param_1, i_radius);
@@ -2370,7 +2281,6 @@ cXyz dCamera_c::compWallMargin(cXyz* i_center, cXyz* param_1, f32 i_radius) {
     return sph_chk_data.field_0xc;
 }
 
-/* 80165EF4-80165FB4 160834 00C0+00 1/1 0/0 0/0 .text            defaultTriming__9dCamera_cFv */
 int dCamera_c::defaultTriming() {
     if (mTrimTypeForce >= 0) {
         SetTrimSize(mTrimTypeForce);
@@ -2401,7 +2311,6 @@ int dCamera_c::defaultTriming() {
     return mTrimSize;
 }
 
-/* 80165FB4-8016608C 1608F4 00D8+00 1/1 0/0 0/0 .text            setView__9dCamera_cFffff */
 void dCamera_c::setView(f32 i_xOrig, f32 i_yOrig, f32 i_width, f32 i_height) {
     dDlst_window_c* window = get_window(field_0x0);
     view_port_class* view_port = window->getViewPort();
@@ -2409,7 +2318,6 @@ void dCamera_c::setView(f32 i_xOrig, f32 i_yOrig, f32 i_width, f32 i_height) {
     window->setScissor(i_xOrig, i_yOrig, i_width, i_height);
 }
 
-/* 8016608C-80166764 1609CC 06D8+00 1/1 0/0 0/0 .text            forwardCheckAngle__9dCamera_cFv */
 cSAngle dCamera_c::forwardCheckAngle() {
     dBgS_CamLinChk lin_chk;
     cSAngle ret = cSAngle::_0;
@@ -2476,7 +2384,6 @@ cSAngle dCamera_c::forwardCheckAngle() {
     return ret;
 }
 
-/* 80166764-80167BBC 1610A4 1458+00 1/1 0/0 0/0 .text            bumpCheck__9dCamera_cFUl */
 bool dCamera_c::bumpCheck(u32 i_flags) {
     int uVar14 = 0;
     static int prev_plat1 = 0;
@@ -2886,8 +2793,6 @@ bool dCamera_c::bumpCheck(u32 i_flags) {
     return uVar13 != 0 ? true : false;
 }
 
-/* 80167BF8-80167C24 162538 002C+00 2/2 0/0 0/0 .text
- * lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl     */
 bool dCamera_c::lineBGCheckBoth(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linchk,
                                 u32 i_flags) {
     i_linchk->OnBackFlag();
@@ -2895,8 +2800,6 @@ bool dCamera_c::lineBGCheckBoth(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linch
     return lineBGCheck(i_start, i_end, i_linchk, i_flags);
 }
 
-/* 80167C24-80167CB8 162564 0094+00 1/1 0/0 0/0 .text
- * radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c */
 f32 dCamera_c::radiusActorInSight(fopAc_ac_c* param_0, fopAc_ac_c* param_1,
                                        fopAc_ac_c* param_2) {
     f32 var_f31 = radiusActorInSight(param_0, param_1, &mViewCache.mCenter, &mViewCache.mEye, mFovy, mBank, 0.05f);
@@ -2912,7 +2815,6 @@ f32 dCamera_c::radiusActorInSight(fopAc_ac_c* param_0, fopAc_ac_c* param_1,
     return var_f29;
 }
 
-/* 80167CD8-80167E3C 162618 0164+00 2/2 0/0 0/0 .text            jutOutCheck__9dCamera_cFP4cXyzf */
 BOOL dCamera_c::jutOutCheck(cXyz* param_0, f32 param_1) {
     cXyz spB4 = attentionPos(mpPlayerActor);
     spB4 += (positionOf(mpPlayerActor) - spB4) * 0.5f;
@@ -2930,7 +2832,6 @@ BOOL dCamera_c::jutOutCheck(cXyz* param_0, f32 param_1) {
     return FALSE;
 }
 
-/* 80167E3C-80167EF4 16277C 00B8+00 1/1 0/0 0/0 .text            tooNearEscape__9dCamera_cFP4cXyz */
 void dCamera_c::tooNearEscape(cXyz* param_0) {
     cXyz sp2C = attentionPos(mpPlayerActor);
     cSGlobe sp58(*param_0 - sp2C);
@@ -2941,7 +2842,6 @@ void dCamera_c::tooNearEscape(cXyz* param_0) {
     }
 }
 
-/* 80167EF4-80167FEC 162834 00F8+00 2/2 0/0 0/0 .text getWaterSurfaceHeight__9dCamera_cFP4cXyz */
 f32 dCamera_c::getWaterSurfaceHeight(cXyz* param_0) {
     f32 var_f31 = -G_CM3D_F_INF;
 
@@ -2966,7 +2866,6 @@ f32 dCamera_c::getWaterSurfaceHeight(cXyz* param_0) {
     return var_f31;
 }
 
-/* 80167FEC-80168744 16292C 0758+00 3/3 0/0 0/0 .text            checkGroundInfo__9dCamera_cFv */
 void dCamera_c::checkGroundInfo() {
     daAlink_c* player = (daAlink_c*)mpPlayerActor;
     cXyz gnd_chk_pos = positionOf(mpPlayerActor);
@@ -3077,7 +2976,6 @@ void dCamera_c::checkGroundInfo() {
     }
 }
 
-/* 80168744-8016C25C 163084 3B18+00 3/2 0/0 0/0 .text            chaseCamera__9dCamera_cFl */
 bool dCamera_c::chaseCamera(s32 param_0) {
     static f32 JumpCushion = 0.9f;
     f32 charge_latitude = mCamSetup.ChargeLatitude();
@@ -4116,7 +4014,6 @@ bool dCamera_c::chaseCamera(s32 param_0) {
     return 1;
 }
 
-/* 8016C384-8016E410 166CC4 208C+00 1/0 0/0 0/0 .text            lockonCamera__9dCamera_cFl */
 bool dCamera_c::lockonCamera(s32 param_0) {
     f32 lockon_change_cushion = mCamSetup.LockonChangeCushion();
     cSAngle charge_latitude = cSAngle(mCamSetup.ChargeLatitude());
@@ -4692,7 +4589,6 @@ bool dCamera_c::lockonCamera(s32 param_0) {
     return true;
 }
 
-/* 8016E448-8016E4A4 168D88 005C+00 1/1 0/0 0/0 .text            getMsgCmdSpeaker__9dCamera_cFv */
 fopAc_ac_c* dCamera_c::getMsgCmdSpeaker() {
     dComIfG_MesgCamInfo_c* info = dComIfGp_getMesgCameraInfo();
     fopAc_ac_c* actor = NULL;
@@ -4710,7 +4606,6 @@ fopAc_ac_c* dCamera_c::getMsgCmdSpeaker() {
     return actor;
 }
 
-/* 8016E4A4-8016E4F4 168DE4 0050+00 1/1 0/0 0/0 .text            getMsgCmdCut__9dCamera_cFl */
 s32 dCamera_c::getMsgCmdCut(s32 param_0) {
     dComIfG_MesgCamInfo_c* info = dComIfGp_getMesgCameraInfo();
 
@@ -4725,7 +4620,6 @@ s32 dCamera_c::getMsgCmdCut(s32 param_0) {
     return param_0;
 }
 
-/* 8016E4F4-80174E18 168E34 6924+00 2/0 0/0 0/0 .text            talktoCamera__9dCamera_cFl */
 bool dCamera_c::talktoCamera(s32 param_0) {
     f32 val0 = mCamParam.Val(param_0, 0);
     f32 val2 = mCamParam.Val(param_0, 2);
@@ -6161,13 +6055,10 @@ bool dCamera_c::talktoCamera(s32 param_0) {
     return uVar18;
 }
 
-/* 80174EA4-80174EAC 16F7E4 0008+00 0/0 1/1 0/0 .text            CalcSubjectAngle__9dCamera_cFPsPs
- */
 bool dCamera_c::CalcSubjectAngle(s16* param_0, s16* param_1) {
     return false;
 }
 
-/* 80174EAC-80174ED4 16F7EC 0028+00 0/0 0/0 1/1 .text            SaveZoomRatio__9dCamera_cFv */
 bool dCamera_c::SaveZoomRatio() {
     if (mCamParam.Algorythmn() != 4) {
         return false;
@@ -6179,7 +6070,6 @@ bool dCamera_c::SaveZoomRatio() {
     return true;
 }
 
-/* 80174ED4-80176074 16F814 11A0+00 1/0 0/0 0/0 .text            subjectCamera__9dCamera_cFl */
 bool dCamera_c::subjectCamera(s32 param_0) {
     f32 val0 = mCamParam.Val(param_0, 0);
     f32 val2 = mCamParam.Val(param_0, 2);
@@ -6528,7 +6418,6 @@ bool dCamera_c::subjectCamera(s32 param_0) {
     return true;
 }
 
-/* 80176074-801767F8 1709B4 0784+00 1/0 0/0 0/0 .text            magneCamera__9dCamera_cFl */
 bool dCamera_c::magneCamera(s32 param_0) {
     f32 val5 = mCamParam.Val(param_0, 5);
     f32 val0 = mCamParam.Val(param_0, 0);
@@ -6639,7 +6528,6 @@ bool dCamera_c::magneCamera(s32 param_0) {
     return true;
 }
 
-/* 801767F8-80176DF0 171138 05F8+00 1/0 0/0 0/0 .text            colosseumCamera__9dCamera_cFl */
 bool dCamera_c::colosseumCamera(s32 param_0) {
     f32 val0 = mCamParam.Val(param_0, 0);
     f32 val2 = mCamParam.Val(param_0, 2);
@@ -6749,17 +6637,14 @@ bool dCamera_c::colosseumCamera(s32 param_0) {
     return true;
 }
 
-/* 80176DF0-80176DF8 171730 0008+00 1/0 0/0 0/0 .text            test1Camera__9dCamera_cFl */
 bool dCamera_c::test1Camera(s32 param_0) {
     return false;
 }
 
-/* 80176DF8-80176E00 171738 0008+00 1/0 0/0 0/0 .text            test2Camera__9dCamera_cFl */
 bool dCamera_c::test2Camera(s32 param_0) {
     return false;
 }
 
-/* 80176E00-80178E50 171740 2050+00 1/0 0/0 0/0 .text            towerCamera__9dCamera_cFl */
 bool dCamera_c::towerCamera(s32 param_0) {
     cSAngle stack_444 = cSAngle(mCamSetup.ChargeLatitude());
     cSAngle stack_448 = 80.0f;
@@ -7198,7 +7083,6 @@ bool dCamera_c::towerCamera(s32 param_0) {
     return true;
 }
 
-/* 80178E50-80179590 173790 0740+00 1/0 0/0 0/0 .text            hookshotCamera__9dCamera_cFl */
 bool dCamera_c::hookshotCamera(s32 param_0) {
     f32 val0 = mCamParam.Val(param_0, 0);
     f32 val2 = mCamParam.Val(param_0, 2);
@@ -7589,7 +7473,6 @@ bool dCamera_c::railCamera(s32 param_0) {
     return true;
 }
 
-/* 8017A2A0-8017ADC0 174BE0 0B20+00 1/0 0/0 0/0 .text            paraRailCamera__9dCamera_cFl */
 bool dCamera_c::paraRailCamera(s32 param_0) {
     int i;
 
@@ -7820,7 +7703,6 @@ bool dCamera_c::paraRailCamera(s32 param_0) {
     return true;
 }
 
-/* 8017ADC0-8017D934 175700 2B74+00 1/0 0/0 0/0 .text            rideCamera__9dCamera_cFl */
 bool dCamera_c::rideCamera(s32 param_0) {
     static cSAngle LatMin = -80.0f;
     static cSAngle LatMax = 80.0f;
@@ -8544,12 +8426,10 @@ bool dCamera_c::rideCamera(s32 param_0) {
     return true;
 }
 
-/* 8017D974-8017D97C 1782B4 0008+00 1/0 0/0 0/0 .text            manualCamera__9dCamera_cFl */
 bool dCamera_c::manualCamera(s32 param_0) {
     return true;
 }
 
-/* 8017D97C-8017DFAC 1782BC 0630+00 1/0 0/0 0/0 .text            observeCamera__9dCamera_cFl */
 bool dCamera_c::observeCamera(s32 param_0) {
 
     f32 dVar8 = mCamSetup.CurveWeight();
@@ -8660,7 +8540,6 @@ bool dCamera_c::observeCamera(s32 param_0) {
     return true;
 }
 
-/* 8017DFAC-8017E730 1788EC 0784+00 1/0 0/0 0/0 .text            fixedFrameCamera__9dCamera_cFl */
 bool dCamera_c::fixedFrameCamera(s32 param_0) {
     f32 val24 = mCamParam.Val(param_0, 24);
     f32 val17 = mCamParam.Val(param_0, 17);
@@ -8751,8 +8630,6 @@ bool dCamera_c::fixedFrameCamera(s32 param_0) {
     return true;
 }
 
-/* 8017E730-8017F25C 179070 0B2C+00 1/0 0/0 0/0 .text            fixedPositionCamera__9dCamera_cFl
- */
 bool dCamera_c::fixedPositionCamera(s32 param_0) {
     f32 focusOffsetX = mCamParam.Val(param_0, 0);
     f32 focusOffsetY = mCamParam.Val(param_0, 2);
@@ -8923,7 +8800,6 @@ bool dCamera_c::fixedPositionCamera(s32 param_0) {
     return true;
 }
 
-/* 8017F25C-8017F828 179B9C 05CC+00 1/0 0/0 0/0 .text            oneSideCamera__9dCamera_cFl */
 bool dCamera_c::oneSideCamera(s32 param_1) {
     f32 unkRatio;
 
@@ -9043,7 +8919,6 @@ bool dCamera_c::oneSideCamera(s32 param_1) {
     return true;
 }
 
-/* 8017F828-8018050C 17A168 0CE4+00 2/1 0/0 0/0 .text            eventCamera__9dCamera_cFl */
 bool dCamera_c::eventCamera(s32 param_0) {
     char sp90[12];
 
@@ -9416,7 +9291,6 @@ bool dCamera_c::eventCamera(s32 param_0) {
     return true;
 }
 
-/* 8018050C-801806D4 17AE4C 01C8+00 1/0 0/0 0/0 .text            currentEvCamera__9dCamera_cFv */
 bool dCamera_c::currentEvCamera() {
     int style = mCamTypeData[mEventData.field_0xc].field_0x18[mIsWolf][0];
     if (style < 0) {
@@ -9458,20 +9332,15 @@ bool dCamera_c::currentEvCamera() {
     return true;
 }
 
-/* 801806D4-801806DC 17B014 0008+00 1/0 0/0 0/0 .text            letCamera__9dCamera_cFl */
 bool dCamera_c::letCamera(s32) {
     return true;
 }
 
-/* 801806DC-80180738 17B01C 005C+00 2/2 0/0 0/0 .text            setEventRecoveryTrans__9dCamera_cFs
- */
 void dCamera_c::setEventRecoveryTrans(s16 param_0) {
     pushInfo(&mRecovery.field_0x8, param_0);
     mRecovery.field_0x28 = positionOf(mpPlayerActor);
 }
 
-/* 80180738-80180A40 17B078 0308+00 1/1 0/0 0/0 .text            runEventRecoveryTrans__9dCamera_cFv
- */
 s16 dCamera_c::runEventRecoveryTrans() {
     if (mRecovery.field_0x8.field_0x1e > 0) {
         field_0x668++;
@@ -9504,20 +9373,17 @@ s16 dCamera_c::runEventRecoveryTrans() {
     return mRecovery.field_0x8.field_0x1e;
 }
 
-/* 80180A40-80180AA8 17B380 0068+00 0/0 3/3 0/0 .text            EventRecoverNotime__9dCamera_cFv */
 void dCamera_c::EventRecoverNotime() {
     mRecovery.field_0x4 = 1;
     Reset(mRecovery.field_0x8.mCenter, mRecovery.field_0x8.mEye, mRecovery.field_0x8.mFovy, mRecovery.field_0x8.mBank);
 }
 
-/* 80180AA8-80180AE0 17B3E8 0038+00 0/0 0/0 24/24 .text            Set__9dCamera_cF4cXyz4cXyz */
 int dCamera_c::Set(cXyz i_center, cXyz i_eye) {
     mCenter = i_center;
     mEye = i_eye;
     return 1;
 }
 
-/* 80180AE0-80180B40 17B420 0060+00 0/0 2/2 93/93 .text            Set__9dCamera_cF4cXyz4cXyzfs */
 int dCamera_c::Set(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) {
     mCenter = i_center;
     mEye = i_eye;
@@ -9526,7 +9392,6 @@ int dCamera_c::Set(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) {
     return 1;
 }
 
-/* 80180B40-80180BA0 17B480 0060+00 0/0 0/0 11/11 .text            Set__9dCamera_cF4cXyz4cXyzsf */
 int dCamera_c::Set(cXyz i_center, cXyz i_eye, s16 i_bank, f32 i_fovy) {
     mCenter = i_center;
     mEye = i_eye;
@@ -9535,7 +9400,6 @@ int dCamera_c::Set(cXyz i_center, cXyz i_eye, s16 i_bank, f32 i_fovy) {
     return 1;
 }
 
-/* 80180BA0-80180C18 17B4E0 0078+00 1/1 1/1 18/18 .text            Reset__9dCamera_cF4cXyz4cXyzfs */
 void dCamera_c::Reset(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) {
     mCenter = i_center;
     mEye = i_eye;
@@ -9544,14 +9408,12 @@ void dCamera_c::Reset(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) {
     Reset();
 }
 
-/* 80180C18-80180C68 17B558 0050+00 0/0 0/0 64/64 .text            Reset__9dCamera_cF4cXyz4cXyz */
 void dCamera_c::Reset(cXyz i_center, cXyz i_eye) {
     mCenter = i_center;
     mEye = i_eye;
     Reset();
 }
 
-/* 80180C68-80180D24 17B5A8 00BC+00 2/2 1/1 3/3 .text            Reset__9dCamera_cFv */
 int dCamera_c::Reset() {
     mViewCache.mCenter = mCenter;
     mViewCache.mEye = mEye;
@@ -9563,7 +9425,6 @@ int dCamera_c::Reset() {
     return 1;
 }
 
-/* 80180D24-80181000 17B664 02DC+00 2/2 0/0 0/0 .text            shakeCamera__9dCamera_cFv */
 // NONMATCHING - minor regalloc
 f32 dCamera_c::shakeCamera() {
     static f32 const wave[] = {0.4f, 0.9f, 2.1f, 3.2f};
@@ -9630,13 +9491,9 @@ f32 dCamera_c::shakeCamera() {
     return var_f31;
 }
 
-/* 80453914-80453918 001F14 0004+00 1/1 0/0 0/0 .sdata2
- * PatternLengthMax__Q29dCamera_c23@class$3669d_camera_cpp      */
 // supposed to be some anonymous static class member or something?
 static const int PatternLengthMax[] = {0x00000004};  // array to make it go in correct section
 
-/* 80181000-80181158 17B940 0158+00 0/0 1/1 0/0 .text            StartShake__9dCamera_cFlPUcl4cXyz
- */
 int dCamera_c::StartShake(s32 i_length, u8* i_pattern, s32 i_flags, cXyz i_pos) {
     if (i_length < 0 || i_length > (PatternLengthMax[0] << 3)) {
         i_length = (PatternLengthMax[0] << 3);
@@ -9674,7 +9531,6 @@ int dCamera_c::StartShake(s32 i_length, u8* i_pattern, s32 i_flags, cXyz i_pos)
     return 1;
 }
 
-/* 80181158-80181170 17BA98 0018+00 0/0 1/1 0/0 .text            StopShake__9dCamera_cFv */
 int dCamera_c::StopShake() {
     mShake.m_length = 0;
     mShake.field_0x10 = 0;
@@ -9682,7 +9538,6 @@ int dCamera_c::StopShake() {
     return 1;
 }
 
-/* 80181170-801811B8 17BAB0 0048+00 1/1 2/2 10/10 .text StartBlure__9dCamera_cFiP10fopAc_ac_cff */
 void dCamera_c::StartBlure(int param_0, fopAc_ac_c* i_actor, f32 i_alpha, f32 i_scale) {
     mBlure.field_0x14 = param_0;
     mBlure.mpActor = NULL;
@@ -9704,7 +9559,6 @@ void dCamera_c::StartBlure(int param_0, fopAc_ac_c* i_actor, f32 i_alpha, f32 i_
     mBlure.field_0x4 = param_0;
 }
 
-/* 801811B8-80181208 17BAF8 0050+00 0/0 0/0 1/1 .text            ResetBlure__9dCamera_cFv */
 void dCamera_c::ResetBlure() {
     mBlure.mpActor = NULL;
     mBlure.mAlpha = 0.75f;
@@ -9724,19 +9578,16 @@ void dCamera_c::ResetBlure() {
     mBlure.field_0x14 = 1;
 }
 
-/* 80181208-80181210 17BB48 0008+00 0/0 1/1 0/0 .text            SetBlureAlpha__9dCamera_cFf */
 void dCamera_c::SetBlureAlpha(f32 i_alpha) {
     mBlure.mAlpha = i_alpha;
 }
 
-/* 80181210-80181220 17BB50 0010+00 0/0 1/1 0/0 .text            SetBlureScale__9dCamera_cFfff */
 void dCamera_c::SetBlureScale(f32 i_scalex, f32 i_scaley, f32 i_scalez) {
     mBlure.mScale.x = i_scalex;
     mBlure.mScale.y = i_scaley;
     mBlure.mScale.z = i_scalez;
 }
 
-/* 80181220-80181278 17BB60 0058+00 0/0 1/1 0/0 .text            SetBlurePosition__9dCamera_cFfff */
 void dCamera_c::SetBlurePosition(f32 i_posx, f32 i_posy, f32 i_posz) {
     SetBlureActor(NULL);
     mBlure.mPosition.x = i_posx;
@@ -9744,12 +9595,10 @@ void dCamera_c::SetBlurePosition(f32 i_posx, f32 i_posy, f32 i_posz) {
     mBlure.mPosition.z = i_posz;
 }
 
-/* 80181278-80181280 -00001 0008+00 0/0 0/0 0/0 .text SetBlureActor__9dCamera_cFP10fopAc_ac_c */
 void dCamera_c::SetBlureActor(fopAc_ac_c* i_actor) {
     mBlure.mpActor = i_actor;
 }
 
-/* 80181280-80181490 17BBC0 0210+00 2/2 0/0 0/0 .text            blureCamera__9dCamera_cFv */
 int dCamera_c::blureCamera() {
     if (mBlure.field_0x4 > 0) {
         if (mBlure.mpActor != NULL) {
@@ -9790,19 +9639,15 @@ int dCamera_c::blureCamera() {
     return mBlure.field_0x4;
 }
 
-/* 80181490-80181500 17BDD0 0070+00 2/2 0/0 0/0 .text            onHorseDush__9dCamera_cFv */
 void dCamera_c::onHorseDush() {
     dComIfGp_getVibration().StartShock(VIBMODE_S_POWER2, 1, cXyz(0.0f, 1.0f, 0.0f));
     StartBlure(55, mpPlayerActor, 0.75f, 1.0f);
 }
 
-/* 80181500-80181534 17BE40 0034+00 1/1 1/1 5/5 .text            GetForceLockOnActor__9dCamera_cFv
- */
 fopAc_ac_c* dCamera_c::GetForceLockOnActor() {
     return fopAcM_SearchByID(mLockOnActorID);
 }
 
-/* 80181534-80181560 17BE74 002C+00 0/0 0/0 9/9 .text ForceLockOn__9dCamera_cFP10fopAc_ac_c */
 int dCamera_c::ForceLockOn(fopAc_ac_c* i_actor) {
     mForceLockTimer = 0;
     mpLockOnActor = i_actor;
@@ -9810,7 +9655,6 @@ int dCamera_c::ForceLockOn(fopAc_ac_c* i_actor) {
     return 1;
 }
 
-/* 80181560-8018159C 17BEA0 003C+00 1/1 0/0 0/0 .text            ForceLockOff__9dCamera_cFUi */
 int dCamera_c::ForceLockOff(fpc_ProcID i_id) {
     if (i_id == mLockOnActorID || i_id == fpcM_ERROR_PROCESS_ID_e) {
         mLockOnActorID = fpcM_ERROR_PROCESS_ID_e;
@@ -9822,7 +9666,6 @@ int dCamera_c::ForceLockOff(fpc_ProcID i_id) {
     return 0;
 }
 
-/* 8018159C-801815CC 17BEDC 0030+00 0/0 0/0 7/7 .text ForceLockOff__9dCamera_cFP10fopAc_ac_c */
 int dCamera_c::ForceLockOff(fopAc_ac_c* i_actor) {
     if (i_actor == mpLockOnActor) {
         mLockOnActorID = fpcM_ERROR_PROCESS_ID_e;
@@ -9834,32 +9677,26 @@ int dCamera_c::ForceLockOff(fopAc_ac_c* i_actor) {
     return 0;
 }
 
-/* 801815CC-801815F0 17BF0C 0024+00 0/0 0/0 5/5 .text            dCam_getAngleY__FP12camera_class */
 s16 dCam_getAngleY(camera_class* i_cam) {
     return i_cam->mCamera.U();
 }
 
-/* 801815F0-80181614 17BF30 0024+00 0/0 0/0 5/5 .text            dCam_getAngleX__FP12camera_class */
 s16 dCam_getAngleX(camera_class* i_cam) {
     return i_cam->mCamera.V();
 }
 
-/* 80181614-80181630 17BF54 001C+00 0/0 2/2 4/4 .text dCam_getControledAngleY__FP12camera_class */
 s16 dCam_getControledAngleY(camera_class* i_cam) {
     return i_cam->mCamera.U2();
 }
 
-/* 80181630-80181640 17BF70 0010+00 1/1 1/1 0/0 .text            dCam_getCamera__Fv */
 camera_class* dCam_getCamera() {
     return dComIfGp_getCamera(0);
 }
 
-/* 80181640-80181664 17BF80 0024+00 0/0 43/43 91/91 .text            dCam_getBody__Fv */
 dCamera_c* dCam_getBody() {
     return &dCam_getCamera()->mCamera;
 }
 
-/* 80181664-80181708 17BFA4 00A4+00 1/1 0/0 0/0 .text preparation__FP20camera_process_class */
 static void preparation(camera_process_class* i_this) {
     camera_class* a_this = (camera_class*)i_this;
     dCamera_c* camera = &a_this->mCamera;
@@ -9877,7 +9714,6 @@ static void preparation(camera_process_class* i_this) {
     }
 }
 
-/* 80181708-80181804 17C048 00FC+00 2/2 0/0 0/0 .text view_setup__FP20camera_process_class */
 static void view_setup(camera_process_class* i_this) {
     camera_class* a_this = (camera_class*)i_this;
     dDlst_window_c* window = get_window(a_this);
@@ -9905,7 +9741,6 @@ static void view_setup(camera_process_class* i_this) {
     mDoLib_clipper::setup(view->fovy, view->aspect, view->near, far);
 }
 
-/* 80181804-80181E20 17C144 061C+00 2/2 0/0 0/0 .text            store__FP20camera_process_class */
 static void store(camera_process_class* i_camera) {
     camera_class* a_camera = (camera_class*)i_camera;
     dCamera_c* dCamera = &a_camera->mCamera;
@@ -9991,7 +9826,6 @@ static void store(camera_process_class* i_camera) {
     fopCamM_SetAngleX(a_camera, globe.V());
 }
 
-/* 80181E20-80181E64 17C760 0044+00 1/1 0/0 0/0 .text            Up__9dCamera_cFv */
 cXyz dCamera_c::Up() {
     if (chkFlag(0x10)) {
         return mUpOverride.field_0x18;
@@ -10000,17 +9834,14 @@ cXyz dCamera_c::Up() {
     }
 }
 
-/* 80181E64-80181E98 17C7A4 0034+00 1/1 1/1 30/30 .text            Eye__9dCamera_cFv */
 cXyz dCamera_c::Eye() {
     return mEye + mShake.mEyeShake;
 }
 
-/* 80181E98-80181ECC 17C7D8 0034+00 1/1 1/1 25/25 .text            Center__9dCamera_cFv */
 cXyz dCamera_c::Center() {
     return mCenter + mShake.field_0x24;
 }
 
-/* 80181ECC-80181F70 17C80C 00A4+00 1/0 0/0 0/0 .text camera_execute__FP20camera_process_class */
 static int camera_execute(camera_process_class* i_this) {
     camera_class* a_this = (camera_class*)i_this;
     preparation(i_this);
@@ -10034,7 +9865,6 @@ static int camera_execute(camera_process_class* i_this) {
     return 1;
 }
 
-/* 80181F70-801821E0 17C8B0 0270+00 1/0 0/0 0/0 .text camera_draw__FP20camera_process_class */
 static int camera_draw(camera_process_class* i_this) {
     camera_class* a_this = (camera_class*)i_this;
     dCamera_c* body = &((camera_class*)i_this)->mCamera;
@@ -10089,7 +9919,6 @@ static int camera_draw(camera_process_class* i_this) {
     return 1;
 }
 
-/* 801821E0-80182260 17CB20 0080+00 1/0 0/0 0/0 .text            init_phase1__FP12camera_class */
 static int init_phase1(camera_class* i_this) {
     int camera_id = get_camera_id(i_this);
 
@@ -10105,7 +9934,6 @@ static int init_phase1(camera_class* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 80182260-80182454 17CBA0 01F4+00 1/0 0/0 0/0 .text            init_phase2__FP12camera_class */
 static int init_phase2(camera_class* i_this) {
     camera_process_class* a_this = (camera_process_class*)i_this;
     dCamera_c* body = &i_this->mCamera;
@@ -10170,7 +9998,6 @@ static int init_phase2(camera_class* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 80182454-80182484 17CD94 0030+00 1/0 0/0 0/0 .text            camera_create__FP12camera_class */
 static int camera_create(camera_class* i_this) {
     static request_of_phase_process_fn l_method[3] = {
         (request_of_phase_process_fn)init_phase1,
@@ -10181,7 +10008,6 @@ static int camera_create(camera_class* i_this) {
     return dComLbG_PhaseHandler(&i_this->phase_request, l_method, i_this);
 }
 
-/* 80182484-801824C0 17CDC4 003C+00 1/0 0/0 0/0 .text camera_delete__FP20camera_process_class */
 static int camera_delete(camera_process_class* i_this) {
     dCamera_c* camera = &((camera_class*)i_this)->mCamera;
 
@@ -10195,12 +10021,10 @@ static int camera_delete(camera_process_class* i_this) {
     return 1;
 }
 
-/* 801824C0-801824C8 17CE00 0008+00 1/0 0/0 0/0 .text            is_camera_delete__FPv */
 static int is_camera_delete(void* i_this) {
     return 1;
 }
 
-/* 801824C8-80182560 17CE08 0098+00 1/1 0/0 0/0 .text            Init__14dCamForcusLineFv */
 void dCamForcusLine::Init() {
     field_0x49 = 0;
     field_0x48 = 1;
@@ -10224,7 +10048,6 @@ void dCamForcusLine::Init() {
     field_0x64 = 60.0f;
 }
 
-/* 80182560-801825E4 17CEA0 0084+00 1/1 0/0 0/0 .text            Draw__14dCamForcusLineFv */
 void dCamForcusLine::Draw() {
     if (field_0x49) {
         if (field_0x48 == 0) {
@@ -10235,13 +10058,11 @@ void dCamForcusLine::Draw() {
     }
 }
 
-/* 801825E4-801825FC 17CF24 0018+00 2/2 0/0 0/0 .text            Off__14dCamForcusLineFv */
 bool dCamForcusLine::Off() {
     field_0x49 = 0;
     return field_0x49 == 0;
 }
 
-/* 803BA6E4-803BA6F8 -00001 0014+00 2/0 0/0 0/0 .data            method */
 static leafdraw_method_class method = {
     (process_method_func)camera_create,
     (process_method_func)camera_delete,
@@ -10250,7 +10071,6 @@ static leafdraw_method_class method = {
     (process_method_func)camera_draw,
 };
 
-/* 803BA6F8-803BA73C -00001 0044+00 0/0 0/0 1/0 .data            g_profile_CAMERA */
 extern camera_process_profile_definition g_profile_CAMERA = {
     fpcLy_CURRENT_e,
     11,
@@ -10272,7 +10092,6 @@ extern camera_process_profile_definition g_profile_CAMERA = {
     0,
 };
 
-/* 803BA73C-803BA798 -00001 0044+18 0/0 0/0 1/0 .data            g_profile_CAMERA2 */
 extern camera_process_profile_definition g_profile_CAMERA2 = {
     fpcLy_CURRENT_e,
     11,