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, 2 insertions, 93 deletions

diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index 87505ab40f..623da54fcf 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -103,15 +103,12 @@ void dComIfG_play_c::setStartStage(dStage_startStage_c* i_startStage) {
     mStartStage = *i_startStage;
 }
 
-/* 8002B3F4-8002B434 025D34 0040+00 1/1 0/0 0/0 .text            dComIfG_get_timelayer__FPi */
 void dComIfG_get_timelayer(int* o_layer) {
     if (dKy_daynight_check()) {
         *o_layer += 1;
     }
 }
 
-/* 8002B434-8002C950 025D74 151C+00 1/1 1/1 0/0 .text
- * getLayerNo_common_common__14dComIfG_play_cFPCcii             */
 int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_roomNo, int o_layer) {
     if (o_layer < 0) {
         o_layer = -1;
@@ -832,7 +829,6 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room
     return o_layer;
 }
 
-/* 8002C950-8002C97C 027290 002C+00 1/1 3/3 0/0 .text getLayerNo_common__14dComIfG_play_cFPCcii */
 int dComIfG_play_c::getLayerNo_common(char const* i_stageName, int i_roomID, int i_layerOverride) {
     int layer = getLayerNo_common_common(i_stageName, i_roomID, i_layerOverride);
 
@@ -843,8 +839,6 @@ int dComIfG_play_c::getLayerNo_common(char const* i_stageName, int i_roomID, int
     return layer;
 }
 
-/* 8002C97C-8002C9D8 0272BC 005C+00 1/1 22/22 68/68 .text            getLayerNo__14dComIfG_play_cFi
- */
 int dComIfG_play_c::getLayerNo(int) {
     int roomNo = dComIfGp_roomControl_getStayNo();
 
@@ -855,13 +849,10 @@ int dComIfG_play_c::getLayerNo(int) {
     return getLayerNo_common(dComIfGp_getStartStageName(), roomNo, dComIfGp_getStartStageLayer());
 }
 
-/* 8002C9D8-8002CA1C 027318 0044+00 0/0 1/1 0/0 .text            createParticle__14dComIfG_play_cFv
- */
 void dComIfG_play_c::createParticle() {
     mParticle = new dPa_control_c();
 }
 
-/* 8002CA1C-8002CA70 02735C 0054+00 0/0 1/1 0/0 .text createSimpleModel__14dComIfG_play_cFv */
 dSmplMdl_draw_c* dComIfG_play_c::createSimpleModel() {
     if (mSimpleModel == NULL) {
         mSimpleModel = new dSmplMdl_draw_c();
@@ -869,7 +860,6 @@ dSmplMdl_draw_c* dComIfG_play_c::createSimpleModel() {
     return mSimpleModel;
 }
 
-/* 8002CA70-8002CAC4 0273B0 0054+00 0/0 1/1 0/0 .text deleteSimpleModel__14dComIfG_play_cFv */
 void dComIfG_play_c::deleteSimpleModel() {
     if (mSimpleModel != NULL) {
         delete mSimpleModel;
@@ -877,16 +867,12 @@ void dComIfG_play_c::deleteSimpleModel() {
     }
 }
 
-/* 8002CAC4-8002CAF0 027404 002C+00 0/0 1/1 0/0 .text            drawSimpleModel__14dComIfG_play_cFv
- */
 void dComIfG_play_c::drawSimpleModel() {
     if (mSimpleModel != NULL) {
         mSimpleModel->draw();
     }
 }
 
-/* 8002CAF0-8002CB30 027430 0040+00 0/0 0/0 16/16 .text
- * addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc          */
 int dComIfG_play_c::addSimpleModel(J3DModelData* i_modelData, int i_roomNo, u8 i_drawBG) {
     if (mSimpleModel != NULL && mSimpleModel->addModel(i_modelData, i_roomNo, i_drawBG)) {
         return 1;
@@ -895,8 +881,6 @@ int dComIfG_play_c::addSimpleModel(J3DModelData* i_modelData, int i_roomNo, u8 i
     return -1;
 }
 
-/* 8002CB30-8002CB68 027470 0038+00 0/0 0/0 16/16 .text
- * removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai         */
 int dComIfG_play_c::removeSimpleModel(J3DModelData* i_modelData, int i_roomNo) {
     if (mSimpleModel != NULL) {
         mSimpleModel->removeModel(i_modelData, i_roomNo);
@@ -906,8 +890,6 @@ int dComIfG_play_c::removeSimpleModel(J3DModelData* i_modelData, int i_roomNo) {
     return 0;
 }
 
-/* 8002CB68-8002CB94 0274A8 002C+00 0/0 0/0 16/16 .text
- * entrySimpleModel__14dComIfG_play_cFP8J3DModeli               */
 void dComIfG_play_c::entrySimpleModel(J3DModel* i_model, int i_roomNo) {
     if (mSimpleModel != NULL) {
         mSimpleModel->entry(i_model, i_roomNo);
@@ -946,13 +928,10 @@ u8 dComIfG_play_c::getTimerType() {
     return mTimerInfo.mTimerType;
 }
 
-/* 8002CBD4-8002CBDC -00001 0008+00 0/0 0/0 0/0 .text setTimerPtr__14dComIfG_play_cFP8dTimer_c */
 void dComIfG_play_c::setTimerPtr(dTimer_c* i_ptr) {
     mTimerInfo.mTimerPtr = i_ptr;
 }
 
-/* 8002CBDC-8002CBE4 02751C 0008+00 6/6 7/7 15/15 .text            getTimerPtr__14dComIfG_play_cFv
- */
 dTimer_c* dComIfG_play_c::getTimerPtr() {
     return mTimerInfo.mTimerPtr;
 }
@@ -971,14 +950,10 @@ void dComIfG_inf_c::ct() {
     field_0x1de0a = 0xFF;
 }
 
-/* 80450600-80450604 000080 0004+00 0/0 18/18 2/2 .sdata           g_clearColor */
 GXColor g_clearColor = {0, 0, 0, 0};
 
-/* 80450604-80450608 000084 0004+00 1/1 10/10 15/15 .sdata           g_blackColor */
 GXColor g_blackColor = {0, 0, 0, 255};
 
-/* 8002CC54-8002CD44 027594 00F0+00 1/1 1/1 0/0 .text dComIfG_changeOpeningScene__FP11scene_classs
- */
 int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName) {
     dComIfGp_offEnableNextStage();
     dComIfGp_setNextStage("F_SP102", 100, 0, 10);
@@ -996,7 +971,6 @@ int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName) {
     return 1;
 }
 
-/* 8002CD44-8002CDB8 027684 0074+00 0/0 2/2 0/0 .text dComIfG_resetToOpening__FP11scene_class */
 BOOL dComIfG_resetToOpening(scene_class* i_scene) {
     if (mDoRst::isReturnToMenu() || !mDoRst::isReset() ||
         mDoGph_gInf_c::getFader()->getStatus() == 2)
@@ -1019,7 +993,6 @@ static int phase_1(char* i_arcName) {
     return cPhs_NEXT_e;
 }
 
-/* 8002CE38-8002CEB4 027778 007C+00 1/0 0/0 0/0 .text            phase_2__FPc */
 static int phase_2(char* i_arcName) {
     int syncStatus = dComIfG_syncObjectRes(i_arcName);
 
@@ -1035,13 +1008,10 @@ static int phase_2(char* i_arcName) {
     }
 }
 
-/* 8002CEB4-8002CEBC 0277F4 0008+00 1/0 0/0 0/0 .text            phase_3__FPc */
 static int phase_3(char*) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8002CEBC-8002CEFC 0277FC 0040+00 0/0 7/7 550/550 .text
- * dComIfG_resLoad__FP30request_of_phase_process_classPCc       */
 /**
  * Attempts to load a Resource Archive (*.arc) into the Resource Control.
  * The archive must be successfully loaded into the Resource Control before
@@ -1061,7 +1031,6 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_arcNa
     return dComLbG_PhaseHandler(i_phase, l_method, (void*)i_arcName);
 }
 
-/* 8002CEFC-8002CF5C 02783C 0060+00 1/0 0/0 0/0 .text            phase_01__FP12phaseParam_c */
 static int phase_01(phaseParam_c* i_phasePrm) {
     if (dComIfG_setObjectRes(i_phasePrm->mResName, (u8)0, i_phasePrm->mpHeap) == 0) {
         return cPhs_ERROR_e;
@@ -1070,7 +1039,6 @@ static int phase_01(phaseParam_c* i_phasePrm) {
     return cPhs_NEXT_e;
 }
 
-/* 8002CF5C-8002CFB8 02789C 005C+00 1/0 0/0 0/0 .text            phase_02__FP12phaseParam_c */
 static int phase_02(phaseParam_c* i_phasePrm) {
     int syncStatus = dComIfG_syncObjectRes(i_phasePrm->mResName);
     if (syncStatus < 0) {
@@ -1084,13 +1052,10 @@ static int phase_02(phaseParam_c* i_phasePrm) {
     }
 }
 
-/* 8002CFB8-8002CFC0 0278F8 0008+00 1/0 0/0 0/0 .text            phase_03__FP12phaseParam_c */
 static int phase_03(phaseParam_c*) {
     return cPhs_INIT_e;
 }
 
-/* 8002CFC0-8002D008 027900 0048+00 1/1 3/3 0/0 .text
- * dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap */
 /**
  * Attempts to load a Resource Archive (*.arc) into the Resource Control using a specified heap.
  * The archive must be successfully loaded into the Resource Control before
@@ -1113,8 +1078,6 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa
     return dComLbG_PhaseHandler(i_phase, l_method, &param);
 }
 
-/* 8002D008-8002D06C 027948 0064+00 1/1 10/10 540/540 .text
- * dComIfG_resDelete__FP30request_of_phase_process_classPCc     */
 /**
  * Attempts to unload a Resource Archive (*.arc) from the Resource Control.
  * This should be called from a process' delete method to prevent a memory leak.
@@ -1136,8 +1099,6 @@ s8 dComIfGp_getReverb(int i_roomNo) {
     return dStage_roomRead_dt_c_GetReverbStage(*dComIfGp_getStageRoom(), i_roomNo);
 }
 
-/* 8002D0B4-8002D1AC 0279F4 00F8+00 0/0 3/3 34/34 .text
- * dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj */
 int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3,
                              s16 i_angle, f32 param_5, GXTexObj* i_tex) {
     if (param_3.ChkSetInfo() && -G_CM3D_F_INF != param_1) {
@@ -1151,7 +1112,6 @@ int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyInf
     }
 }
 
-/* 8002D1AC-8002D25C 027AEC 00B0+00 0/0 0/0 1/1 .text            dComIfGp_getMapTrans__FiPfPfPs */
 bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle) {
     dStage_Multi_c* multi = dComIfGp_getMulti();
     if (multi == NULL) {
@@ -1172,7 +1132,6 @@ bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_ang
     return false;
 }
 
-/* 8002D25C-8002D2AC 027B9C 0050+00 0/0 3/3 3/3 .text            dComIfGp_getRoomCamera__Fi */
 stage_camera_class* dComIfGp_getRoomCamera(int i_roomNo) {
     dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
 
@@ -1183,7 +1142,6 @@ stage_camera_class* dComIfGp_getRoomCamera(int i_roomNo) {
     return room_dt->getCamera();
 }
 
-/* 8002D2AC-8002D2FC 027BEC 0050+00 0/0 3/3 3/3 .text            dComIfGp_getRoomArrow__Fi */
 stage_arrow_class* dComIfGp_getRoomArrow(int i_roomNo) {
     dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
 
@@ -1194,7 +1152,6 @@ stage_arrow_class* dComIfGp_getRoomArrow(int i_roomNo) {
     return room_dt->getArrow();
 }
 
-/* 8002D2FC-8002D554 027C3C 0258+00 2/2 7/7 4/4 .text dComIfGp_setNextStage__FPCcsScScfUliScsii */
 void dComIfGp_setNextStage(char const* i_stage, s16 i_point, s8 i_roomNo, s8 i_layer,
                            f32 i_lastSpeed, u32 i_lastMode, int i_setPoint, s8 i_wipe,
                            s16 i_lastAngle, int param_9, int i_wipeSpeedT) {
@@ -1340,7 +1297,6 @@ s8 dComIfGs_sense_type_change_Get() {
     return g_dComIfG_gameInfo.field_0x1ddfa;
 }
 
-/* 8002D94C-8002D9B0 02828C 0064+00 0/0 1/1 17/17 .text            dComIfGs_onZoneSwitch__Fii */
 void dComIfGs_onZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1356,7 +1312,6 @@ void dComIfGs_onZoneSwitch(int i_swBit, int i_roomNo) {
     dComIfGs_onSvZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002D9CC-8002DA30 02830C 0064+00 0/0 1/1 1/1 .text            dComIfGs_offZoneSwitch__Fii */
 void dComIfGs_offZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1372,7 +1327,6 @@ void dComIfGs_offZoneSwitch(int i_swBit, int i_roomNo) {
     dComIfGs_offSvZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002DA30-8002DA9C 028370 006C+00 0/0 1/1 10/10 .text            dComIfGs_isZoneSwitch__Fii */
 BOOL dComIfGs_isZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1388,7 +1342,6 @@ BOOL dComIfGs_isZoneSwitch(int i_swBit, int i_roomNo) {
     return dComIfGs_isSvZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002DA9C-8002DB00 0283DC 0064+00 0/0 1/1 51/51 .text            dComIfGs_onOneZoneSwitch__Fii */
 void dComIfGs_onOneZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1404,7 +1357,6 @@ void dComIfGs_onOneZoneSwitch(int i_swBit, int i_roomNo) {
     dComIfGs_onSvOneZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002DB00-8002DB64 028440 0064+00 0/0 1/1 17/17 .text            dComIfGs_offOneZoneSwitch__Fii */
 void dComIfGs_offOneZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1420,7 +1372,6 @@ void dComIfGs_offOneZoneSwitch(int i_swBit, int i_roomNo) {
     dComIfGs_offSvOneZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002DB64-8002DBD0 0284A4 006C+00 0/0 5/5 13/13 .text            dComIfGs_isOneZoneSwitch__Fii */
 BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1436,7 +1387,6 @@ BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo) {
     return dComIfGs_isSvOneZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002DBD0-8002DC3C 028510 006C+00 0/0 1/1 0/0 .text            dComIfGs_isZoneItem__Fii */
 BOOL dComIfGs_isZoneItem(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1452,7 +1402,6 @@ BOOL dComIfGs_isZoneItem(int i_swBit, int i_roomNo) {
     return dComIfGs_isSvZoneItem(zone_no, i_swBit);
 }
 
-/* 8002DC3C-8002DCA8 02857C 006C+00 0/0 1/1 0/0 .text            dComIfGs_isOneZoneItem__Fii */
 BOOL dComIfGs_isOneZoneItem(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1489,7 +1438,6 @@ void dComIfGs_setMixItemIndex(int i_no, u8 i_slotNo) {
     g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMixItemIndex(i_no, i_slotNo);
 }
 
-/* 8002DD3C-8002DDC8 02867C 008C+00 3/3 1/1 0/0 .text dComIfGs_getSelectMixItemNoArrowIndex__Fi */
 u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx) {
     u8 sel_item_slotNo = dComIfGs_getSelectItemIndex(i_selmixItemIdx);
     u8 mix_item_slotNo = dComIfGs_getMixItemIndex(i_selmixItemIdx);
@@ -1509,7 +1457,6 @@ u8 dComIfGs_getMixItemIndex(int i_no) {
     return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMixItemIndex(i_no);
 }
 
-/* 8002DDF4-8002DF1C 028734 0128+00 1/1 13/13 0/0 .text            dComIfGp_setSelectItem__Fi */
 void dComIfGp_setSelectItem(int i_selItemIdx) {
     if (i_selItemIdx == SELECT_ITEM_DOWN) {
         if (dComIfGs_getSelectItemIndex(i_selItemIdx) != 0xFF) {
@@ -1534,7 +1481,6 @@ void dComIfGp_setSelectItem(int i_selItemIdx) {
     }
 }
 
-/* 8002DF1C-8002E048 02885C 012C+00 4/4 19/19 0/0 .text            dComIfGp_getSelectItem__Fi */
 u8 dComIfGp_getSelectItem(int i_selItemIdx) {
     u8 playItem = g_dComIfG_gameInfo.play.getSelectItem(i_selItemIdx);
 
@@ -1592,7 +1538,6 @@ bool dComIfGp_checkMapShow() {
     return !dComIfGs_isEventBit(dSv_event_flag_c::MAP_VISIBLE);
 }
 
-/* 8002E0E0-8002E188 028A20 00A8+00 0/0 9/9 0/0 .text            dComIfGp_setHeapLockFlag__FUc */
 s32 dComIfGp_setHeapLockFlag(u8 flag) {
     if (flag == 7 || flag == 8) {
         if (!dComIfGp_isHeapLockFlag()) {
@@ -1740,7 +1685,6 @@ u8 dComIfGs_getBottleMax() {
     return 10;
 }
 
-/* 8002E5C0-8002E688 028F00 00C8+00 0/0 11/11 0/0 .text            dComIfGp_getSelectItemNum__Fi */
 s16 dComIfGp_getSelectItemNum(int i_selItemIdx) {
     u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
     s16 itemNum = 0;
@@ -1759,7 +1703,6 @@ s16 dComIfGp_getSelectItemNum(int i_selItemIdx) {
     return itemNum;
 }
 
-/* 8002E688-8002E714 028FC8 008C+00 0/0 5/5 0/0 .text            dComIfGp_getSelectItemMaxNum__Fi */
 int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) {
     u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
     int itemNum = 0;
@@ -1779,7 +1722,6 @@ int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) {
     return itemNum;
 }
 
-/* 8002E714-8002E83C 029054 0128+00 0/0 2/2 0/0 .text            dComIfGp_setSelectItemNum__Fis */
 void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) {
     u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
 
@@ -1804,7 +1746,6 @@ void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) {
     }
 }
 
-/* 8002E83C-8002E910 02917C 00D4+00 0/0 5/5 0/0 .text            dComIfGp_addSelectItemNum__Fis */
 void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) {
     u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
 
@@ -1820,8 +1761,6 @@ void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) {
     }
 }
 
-/* 8002E910-8002E974 029250 0064+00 0/0 5/5 137/137 .text
- * dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj */
 int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4,
                        f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8,
                        dKy_tevstr_c* param_9, s16 param_10, f32 param_11, _GXTexObj* param_12) {
@@ -1833,7 +1772,6 @@ int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3
     }
 }
 
-/* 8002E974-8002E9D4 0292B4 0060+00 0/0 1/1 0/0 .text            dComIfGs_gameStart__Fv */
 void dComIfGs_gameStart() {
     dComIfGp_offEnableNextStage();
 
@@ -2013,9 +1951,8 @@ struct field_data {
     /* 0x0A */ u8 field_0xa[0x14 - 0xA];
 };
 
-/* 8002E9F0-8002EC54 029330 0264+00 0/0 1/1 0/0 .text            dComIfGp_calcNowRegion__Fv */
 void dComIfGp_calcNowRegion() {
-    u8 buffer[0x800] ALIGN_DECL(32);
+    u8 buffer[0x800] ATTRIBUTE_ALIGN(32);
 
     dComIfGp_getFieldMapArchive2()->readResource(buffer, 0x800, "dat/field.dat");
     u8* entry_num_p = &buffer[((field_data_header*)buffer)->field_0x4];
@@ -2070,9 +2007,8 @@ void dComIfGp_calcNowRegion() {
     dComIfGp_getFieldMapArchive2()->removeResourceAll();
 }
 
-/* 8002EC54-8002EDE0 029594 018C+00 1/1 0/0 0/0 .text            dComIfG_getNowCalcRegion__Fv */
 u8 dComIfG_getNowCalcRegion() {
-    u8 buffer[0x800] ALIGN_DECL(32);
+    u8 buffer[0x800] ATTRIBUTE_ALIGN(32);
 
     dComIfGp_getFieldMapArchive2()->readResource(buffer, 0x800, "dat/field.dat");
     u8* entry_num_p = &buffer[((field_data_header*)buffer)->field_0x4];
@@ -2131,7 +2067,6 @@ bool dComIfGp_isLightDropMapVisible() {
     return false;
 }
 
-/* 8002EE60-8002EEB0 0297A0 0050+00 1/1 11/11 0/0 .text            dComIfGp_getNowLevel__Fv */
 u8 dComIfGp_getNowLevel() {
     int roomNo = -1;
     if (daPy_getLinkPlayerActorClass() != NULL) {
@@ -2150,8 +2085,6 @@ void dComIfGs_setSelectEquipClothes(u8 i_itemNo) {
                                                                           i_itemNo);
 }
 
-/* 8002EEC0-8002EF94 029800 00D4+00 0/0 4/4 1/1 .text            dComIfGs_setSelectEquipSword__FUc
- */
 void dComIfGs_setSelectEquipSword(u8 i_itemNo) {
     switch (i_itemNo) {
     case fpcNm_ITEM_SWORD:
@@ -2171,8 +2104,6 @@ void dComIfGs_setSelectEquipSword(u8 i_itemNo) {
     g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(COLLECT_SWORD, i_itemNo);
 }
 
-/* 8002EF94-8002F040 0298D4 00AC+00 0/0 2/2 0/0 .text            dComIfGs_setSelectEquipShield__FUc
- */
 void dComIfGs_setSelectEquipShield(u8 i_itemNo) {
     switch (i_itemNo) {
     case fpcNm_ITEM_WOOD_SHIELD:
@@ -2201,8 +2132,6 @@ void dComIfGs_setKeyNum(int i_stageNo, u8 i_keyNum) {
     g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().setKeyNum(i_keyNum);
 }
 
-/* 8002F0E0-8002F128 029A20 0048+00 1/1 0/0 0/0 .text dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc
- */
 static void dComIfGs_setWarpItemData(int, char const* i_stage, cXyz i_pos, s16 i_angle, s8 i_roomNo,
                                      u8 param_5, u8 param_6) {
     g_dComIfG_gameInfo.play.setWarpItemData(i_stage, i_pos, i_angle, i_roomNo, param_5, param_6);
@@ -2234,7 +2163,6 @@ const char* dComIfGs_getWarpStageName() {
     return dComIfGs_getLastWarpMarkStageName();
 }
 
-/* 8002F2BC-8002F2CC 029BFC 0010+00 0/0 1/1 0/0 .text            dComIfGs_getWarpPlayerPos__Fv */
 cXyz& dComIfGs_getWarpPlayerPos() {
     return dComIfGs_getLastWarpMarkPlayerPos();
 }
@@ -2253,14 +2181,12 @@ bool dComIfGs_getWarpMarkFlag() {
 
 void dComIfGs_setWarpMarkFlag(u8) {}
 
-/* 8002F314-8002F328 029C54 0014+00 0/0 0/0 1/1 .text            __ct__19dComIfG_resLoader_cFv */
 dComIfG_resLoader_c::dComIfG_resLoader_c() {
     mResNameTable = NULL;
     mPhase.id = cPhs_INIT_e;
     mLoadIndex = 0;
 }
 
-/* 8002F328-8002F3B4 029C68 008C+00 0/0 0/0 1/1 .text            __dt__19dComIfG_resLoader_cFv */
 dComIfG_resLoader_c::~dComIfG_resLoader_c() {
     if (mResNameTable != NULL) {
         for (int i = mLoadIndex; i >= 0; i--) {
@@ -2270,7 +2196,6 @@ dComIfG_resLoader_c::~dComIfG_resLoader_c() {
     }
 }
 
-/* 8002F3B4-8002F434 029CF4 0080+00 0/0 0/0 1/1 .text load__19dComIfG_resLoader_cFPPCcP7JKRHeap */
 int dComIfG_resLoader_c::load(char const** i_resNameTbl, JKRHeap* i_heap) {
     mResNameTable = i_resNameTbl;
 
@@ -2286,12 +2211,10 @@ int dComIfG_resLoader_c::load(char const** i_resNameTbl, JKRHeap* i_heap) {
     return phase_state;
 }
 
-/* 8002F434-8002F478 029D74 0044+00 0/0 12/12 12/12 .text            dComIfG_getStageRes__FPCc */
 void* dComIfG_getStageRes(char const* i_resName) {
     return dComIfG_getStageRes("Stg_00", i_resName);
 }
 
-/* 8002F478-8002F4BC 029DB8 0044+00 0/0 1/1 0/0 .text            dComIfG_getOldStageRes__FPCc */
 void* dComIfG_getOldStageRes(char const* i_resName) {
     return dComIfG_getStageRes("Xtg_00", i_resName);
 }
@@ -2302,7 +2225,6 @@ char* dComIfG_getRoomArcName(int i_roomNo) {
     return buf;
 }
 
-/* 8002F500-8002F504 029E40 0004+00 0/0 1/1 0/0 .text            dComIfGp_ret_wp_set__FSc */
 void dComIfGp_ret_wp_set(s8) {}
 
 void dComIfGp_world_dark_set(u8 param_0) {
@@ -2373,7 +2295,6 @@ int dComIfG_TimerEnd(int i_mode, int param_1) {
     return 0;
 }
 
-/* 8002F72C-8002F79C 02A06C 0070+00 0/0 0/0 2/2 .text            dComIfG_TimerDeleteCheck__Fi */
 int dComIfG_TimerDeleteCheck(int i_mode) {
     if (i_mode == dComIfG_getTimerMode()) {
         dTimer_c* timer = dComIfG_getTimerPtr();
@@ -2401,7 +2322,6 @@ int dComIfG_TimerDeleteRequest(int i_mode) {
     return 0;
 }
 
-/* 8002F810-8002F9F0 02A150 01E0+00 0/0 1/1 0/0 .text            dComIfGs_Wolf_Change_Check__Fv */
 BOOL dComIfGs_Wolf_Change_Check() {
     BOOL is_wolf = false;
 
@@ -2455,8 +2375,6 @@ int dComIfGs_shake_kandelaar_check() {
     return check;
 }
 
-/* 8002FA54-8002FA84 02A394 0030+00 0/0 4/4 96/96 .text            dComIfGs_wolfeye_effect_check__Fv
- */
 BOOL dComIfGs_wolfeye_effect_check() {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     BOOL ret = false;
@@ -2497,8 +2415,6 @@ BOOL dComIfGp_TransportWarp_check() {
     return check;
 }
 
-/* 8002FB20-8002FB80 02A460 0060+00 2/2 6/6 0/0 .text
- * dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv */
 int dComLbG_PhaseHandler(request_of_phase_process_class* i_phaseReq, cPhs__Handler* i_handler,
                          void* i_data) {
     int phase = cPhs_Handler(i_phaseReq, i_handler, i_data);
@@ -2514,7 +2430,6 @@ int dComLbG_PhaseHandler(request_of_phase_process_class* i_phaseReq, cPhs__Handl
     return phase;
 }
 
-/* 8002FB80-8002FC3C 02A4C0 00BC+00 0/0 1/1 1/1 .text            dComIfGs_onVisitedRoom__Fi */
 void dComIfGs_onVisitedRoom(int i_roomNo) {
     dStage_FileList2_dt_c* fileList = dStage_roomControl_c::getFileList2(i_roomNo);
 
@@ -2530,32 +2445,26 @@ void dComIfGs_onVisitedRoom(int i_roomNo) {
     }
 }
 
-/* 8002FC3C-8002FC98 02A57C 005C+00 0/0 0/0 1/1 .text            dComIfGs_offVisitedRoom__Fi */
 void dComIfGs_offVisitedRoom(int i_roomNo) {
     dStage_FileList2_dt_c* list = dStage_roomControl_c::getFileList2(dComIfGp_roomControl_getStayNo());
 
     dComIfGs_offSaveVisitedRoom(list->field_0x13, i_roomNo);
 }
 
-/* 8002FC98-8002FCF4 02A5D8 005C+00 0/0 1/1 0/0 .text            dComIfGs_isVisitedRoom__Fi */
 BOOL dComIfGs_isVisitedRoom(int param_0) {
     dStage_FileList2_dt_c* fileList = dStage_roomControl_c::getFileList2(dComIfGp_roomControl_getStayNo());
 
     return dComIfGs_isSaveVisitedRoom(fileList->field_0x13, param_0);
 }
 
-/* 8002FCF4-8002FD08 02A634 0014+00 0/0 1/1 0/0 .text            dComIfGs_staffroll_next_go__Fv */
 void dComIfGs_staffroll_next_go() {
     g_env_light.staffroll_next_timer = true;
 }
 
-/* 8002FD08-8002FD18 02A648 0010+00 0/0 1/1 0/0 .text dComIfGs_staffroll_next_go_check__Fv */
 u8 dComIfGs_staffroll_next_go_check() {
     return g_env_light.staffroll_next_timer;
 }
 
-/* 80450608-8045060C 000088 0004+00 0/0 6/6 11/11 .sdata           g_whiteColor */
 GXColor g_whiteColor = {255, 255, 255, 255};
 
-/* 8045060C-80450610 00008C 0004+00 0/0 3/3 3/3 .sdata           g_saftyWhiteColor */
 GXColor g_saftyWhiteColor = {160, 160, 160, 255};