Merge branch 'functions'

src/d/d_a/d_a_horse_static.cpp

@@ -2,6 +2,10 @@
 #include "Z2AudioLib/Z2Creature/Z2Creature.h"
 #include "global.h"
 
+extern "C" {
+void checkDownDamage__10e_wb_classFv(void);
+}
+
 u32 e_wb_class::checkWait(void) {
     u32 temp;
 

src/d/d_attention.cpp

@@ -8,6 +8,61 @@
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
+extern "C" {
+double func_8036C668(double);
+int strcmp(const char*, const char*);
+void __ct__7cSAngleFRC7cSAngle(void);
+void __ct__7cSAngleFs(void);
+void __ct__7cSGlobeFRC4cXyz(void);
+void __dl__FPv(void);
+void __mi__7cSAngleCFs(void);
+void daPy_py_c_NS_getAttentionOffsetY(void);
+void dAttCatch_c_NS_init(void);
+void dAttCatch_c_NS_proc(void);
+void dAttDraw_c_NS_ctor(void);
+void dAttDraw_c_NS_draw(void);
+void dAttDraw_c_NS_dtor(void);
+void dAttDraw_c_NS_setAlphaAnm(void);
+void dAttDraw_c_NS_setAnm(void);
+void dAttention_c_NS_initList(void);
+void dAttention_c_NS_LockonTargetPId(void);
+void dAttention_c_NS_LockonTruth(void);
+void dAttention_c_NS_lockSoundStart(void);
+void dAttention_c_NS_SelectAttention(void);
+void dAttHint_c_NS_init(void);
+void dAttHint_c_NS_proc(void);
+void dAttList_c_NS_ctor(void);
+void dAttList_c_NS_dtor(void);
+void dAttList_c_NS_setActor(void);
+void dAttLook_c_NS_init(void);
+void dAttLook_c_NS_proc(void);
+void DCStoreRangeNoSync(void);
+void dRes_control_c_NS_getRes(void);
+void fopAcIt_Executor(void);
+void fopAcM_searchActorDistance(void);
+void func_80361C24(void);
+void func_80361D60(void);
+void Inv__7cSAngleCFv(void);
+void isSwitch__12dSv_danBit_cCFi(void);
+void mDoExt_adjustSolidHeap(void);
+void mDoExt_baseAnm_NS_play(void);
+void mDoExt_bckAnm_NS_entry(void);
+void mDoExt_bckAnm_NS_init(void);
+void mDoExt_bpkAnm_NS_entry(void);
+void mDoExt_bpkAnm_NS_init(void);
+void mDoExt_brkAnm_NS_entry(void);
+void mDoExt_brkAnm_NS_init(void);
+void mDoExt_btkAnm_NS_entry(void);
+void mDoExt_btkAnm_NS_init(void);
+void mDoExt_createSolidHeapFromGameToCurrent_X1_(void);
+void mDoExt_destroySolidHeap(void);
+void mDoExt_J3DModel__create(void);
+void mDoExt_modelUpdateDL(void);
+void mDoExt_restoreCurrentHeap(void);
+void memcpy(void*, const void*, int);
+void Z2SeqMgr_NS_bgmNowBattle(void);
+}
+
 extern "C" {
 // padLockButton__25@unnamed@d_attention_cpp@Fl
 // @unnamed@d_attention_cpp@::padLockButton(long)

src/d/d_bg/d_bg_s_poly_pass_chk.cpp

@@ -3,6 +3,10 @@
 #include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h"
 #include "global.h"
 
+extern "C" {
+void __dl__FPv(void);
+}
+
 dBgS_PolyPassChk::dBgS_PolyPassChk()
     : mObject(false), mCamera(false), mLink(false), mArrow(false), mBomb(false), mBoomerang(false),
       mRope(false), mUnderwaterRoof(false), mHorse(false), mStatue(false), mIronBall(false) {}

src/d/d_camera.cpp

@@ -13,6 +13,342 @@
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
+extern "C" {
+double func_8036C668(double);
+int func_80368954(char*, char*, u32);
+int strcmp(const char*, const char*);
+void __ami__7cSAngleFRC7cSAngle(void);
+void __amu__7cSAngleFf(void);
+void __apl__7cSAngleFRC7cSAngle(void);
+void __apl__7cSAngleFs(void);
+void __ct__7cDegreeFf(void);
+void __ct__7cSAngleFf(void);
+void __ct__7cSAngleFRC7cSAngle(void);
+void __ct__7cSAngleFs(void);
+void __ct__7cSAngleFv(void);
+void __ct__7cSGlobeFfRC7cSAngleRC7cSAngle(void);
+void __ct__7cSGlobeFfss(void);
+void __ct__7cSGlobeFRC4cXyz(void);
+void __ct__7cSGlobeFRC7cSGlobe(void);
+void __ct__7cSGlobeFv(void);
+void __ct__8cM3dGCpsFv(void);
+void __ct__8cM3dGCylFPC4cXyzff(void);
+void __ct__8cM3dGLinFRC4cXyzRC4cXyz(void);
+void __dl__FPv(void);
+void __dt__8cM3dGCpsFv(void);
+void __mi__4cXyzCFRC3Vec(void);
+void __mi__7cSAngleCFRC7cSAngle(void);
+void __mi__7cSAngleCFs(void);
+void __mi__7cSAngleCFv(void);
+void __ml__4cXyzCFf(void);
+void __ml__4cXyzCFRC3Vec(void);
+void __ml__7cSAngleCFf(void);
+void __ne__4cXyzCFRC3Vec(void);
+void __pl__4cXyzCFRC3Vec(void);
+void __pl__7cSAngleCFRC7cSAngle(void);
+void __pl__7cSAngleCFs(void);
+void _unnamed_d_camera_cpp__NS_check_owner_action(void);
+void _unnamed_d_camera_cpp__NS_check_owner_action1(void);
+void _unnamed_d_camera_cpp__NS_is_player(void);
+void _unnamed_d_camera_cpp__NS_isPlayerCharging(void);
+void _unnamed_d_camera_cpp__NS_isPlayerFlying(void);
+void _unnamed_d_camera_cpp__NS_lineCollisionCheck(void);
+void _unnamed_d_camera_cpp__NS_rangef(void);
+void _unnamed_d_camera_cpp__NS_sAngleX(void);
+void _unnamed_d_camera_cpp__NS_sAngleY(void);
+void Abs__7cSAngleCFv(void);
+void cAngle_NS_d2s(void);
+void cBgS_LinChk_NS_GetCross(void);
+void cBgS_NS_GetActorPointer(void);
+void cBgS_NS_GetTriPla(void);
+void cBgS_NS_GroundCross(void);
+void cBgS_NS_LineCross(void);
+void cCcD_ShapeAttr_NS_Shape_NS_dtor(void);
+void cDegree_NS_dtor(void);
+void cM_rnd_c_NS_init(void);
+void cM3d_2PlaneLinePosNearPos__FRC8cM3dGPlaRC8cM3dGPlaPC3VecP3Vec(void);
+void cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec(void);
+void cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec(void);
+void cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf(void);
+void cM3d_SignedLenPlaAndPos__FPC8cM3dGPlaPC3Vec(void);
+void cM3dGCyl_NS_dtor(void);
+void cM3dGLin_NS_dtor(void);
+void cM3dGPla_NS_ctor(void);
+void cM3dGPla_NS_dtor(void);
+void cM3dGPla_NS_GetNP(void);
+void Cos__7cDegreeCFv(void);
+void Cos__7cSAngleCFv(void);
+void cSAngle_NS___as(void);
+void cSAngle_NS___gt(void);
+void cSAngle_NS___lt(void);
+void cSAngle_NS___ops(void);
+void cSAngle_NS_dtor(void);
+void cSAngle_NS_Val(void);
+void cSGlobe_NS___as(void);
+void cSGlobe_NS_dtor(void);
+void cSGlobe_NS_R_X1_(void);
+void cSGlobe_NS_R(void);
+void cSGlobe_NS_U_X1_(void);
+void cSGlobe_NS_U(void);
+void cSGlobe_NS_V_X1_(void);
+void cSGlobe_NS_V(void);
+void cXyz_NS___ami(void);
+void cXyz_NS___apl(void);
+void cXyz_NS___as(void);
+void cXyz_NS_abs(void);
+void cXyz_NS_ctor(void);
+void cXyz_NS_dtor(void);
+void cXyz_NS_set(void);
+void cXyz_X1_(void);
+void cXyz_X2_(void);
+void d2DBSplinePath_NS_Init(void);
+void d2DBSplinePath_NS_Spot(void);
+void daAlink_c_NS_checkBowCameraArrowPosP(void);
+void daAlink_c_NS_checkCameraLargeDamage(void);
+void daAlink_c_NS_checkCanoeRideTandem(void);
+void daAlink_c_NS_checkCokkoGlide(void);
+void daAlink_c_NS_checkCutHeadProc(void);
+void daAlink_c_NS_checkCutLargeTurnState(void);
+void daAlink_c_NS_checkIronBallThrowMode(void);
+void daAlink_c_NS_checkIronBallThrowReturnMode(void);
+void daAlink_c_NS_checkMidnaLockJumpPoint(void);
+void daAlink_c_NS_getChainGrabActor(void);
+void daAlink_c_NS_getCopyRodCameraActor(void);
+void daAlink_c_NS_getHsSubChainTopPos(void);
+void daAlink_c_NS_getRideActor(void);
+void daAlink_getAlinkActorClass(void);
+void daHorse_c_NS_checkJump(void);
+void daHorse_c_NS_checkTurnStandCamera(void);
+void daHorse_c_NS_getLashDashStart(void);
+void daPy_py_c_NS_checkCopyRodThrowAfter(void);
+void daPy_py_c_NS_checkGoronSideMove(void);
+void daPy_py_c_NS_checkMagneBootsOn(void);
+void daPy_py_c_NS_checkRide(void);
+void daPy_py_c_NS_checkThrowDamage(void);
+void daPy_py_c_NS_getLeftFootPosP(void);
+void daPy_py_c_NS_getLeftHandPos(void);
+void daPy_py_c_NS_getMidnaActor(void);
+void daPy_py_c_NS_getRightFootPosP(void);
+void daPy_py_c_NS_getRightHandPos(void);
+void daPy_py_c_NS_getThrowBoomerangActor(void);
+void daTagMhint_c_NS_checkNoAttention(void);
+void daTagMstop_c_NS_checkNoAttention(void);
+void daTagMwait_c_NS_checkEndMessage(void);
+void dAttention_c_NS_ActionTarget(void);
+void dAttention_c_NS_CheckObjectTarget(void);
+void dAttention_c_NS_GetCheckObjectCount(void);
+void dAttention_c_NS_keepLock(void);
+void dAttention_c_NS_LockEdge(void);
+void dAttention_c_NS_LockonReleaseDistanse(void);
+void dAttention_c_NS_LockonTarget(void);
+void dAttention_c_NS_LockonTruth(void);
+void dBgS_CamGndChk_NS_dtor(void);
+void dBgS_CamGndChk_Wtr_NS_dtor(void);
+void dBgS_CamGndChk_Wtr(void);
+void dBgS_CamLinChk_NS_dtor(void);
+void dBgS_CamLinChk(void);
+void dBgS_GndChk_NS_dtor(void);
+void dBgS_GndChk(void);
+void dBgS_LinChk_NS_Set(void);
+void dBgS_NS_ChkGrpInf(void);
+void dBgS_NS_ChkMoveBG(void);
+void dBgS_NS_GetCamMoveBG(void);
+void dBgS_NS_GetGroundCode(void);
+void dBgS_NS_GetGrpSoundId(void);
+void dBgS_NS_GetRoomCamId(void);
+void dBgS_NS_MoveBgMatrixCrrPos(void);
+void dBgS_NS_RoofChk(void);
+void dBgS_NS_SphChk(void);
+void dBgS_RoofChk_NS_dtor(void);
+void dBgS_RoofChk(void);
+void dBgS_SphChk_NS_dtor(void);
+void dBgS_SphChk(void);
+void dCamera_c_NS__class_3665d_camera_cpp_NS_dtor(void);
+void dCamera_c_NS__class_3665d_camera_cpp(void);
+void dCamera_c_NS_attentionPos(void);
+void dCamera_c_NS_Bank(void);
+void dCamera_c_NS_blureCamera(void);
+void dCamera_c_NS_bumpCheck(void);
+void dCamera_c_NS_Center(void);
+void dCamera_c_NS_checkGroundInfo(void);
+void dCamera_c_NS_chkFlag(void);
+void dCamera_c_NS_clrFlag(void);
+void dCamera_c_NS_dCamInfo_c_NS_dtor(void);
+void dCamera_c_NS_dCamInfo_c(void);
+void dCamera_c_NS_defaultTriming(void);
+void dCamera_c_NS_directionOf(void);
+void dCamera_c_NS_eventCamera(void);
+void dCamera_c_NS_Eye(void);
+void dCamera_c_NS_eyePos(void);
+void dCamera_c_NS_footHeightOf(void);
+void dCamera_c_NS_ForceLockOff(void);
+void dCamera_c_NS_forwardCheckAngle(void);
+void dCamera_c_NS_GetCameraTypeFromCameraName(void);
+void dCamera_c_NS_GetCameraTypeFromToolData(void);
+void dCamera_c_NS_getEvActor_X1_(void);
+void dCamera_c_NS_getEvActor(void);
+void dCamera_c_NS_getEvFloatData_X1_(void);
+void dCamera_c_NS_getEvFloatData(void);
+void dCamera_c_NS_getEvIntData_X1_(void);
+void dCamera_c_NS_getEvIntData(void);
+void dCamera_c_NS_getEvStringData(void);
+void dCamera_c_NS_GetForceLockOnActor(void);
+void dCamera_c_NS_getUSOAngle(void);
+void dCamera_c_NS_getWaterSurfaceHeight(void);
+void dCamera_c_NS_initialize(void);
+void dCamera_c_NS_initMonitor(void);
+void dCamera_c_NS_initPad(void);
+void dCamera_c_NS_lineBGCheckBoth(void);
+void dCamera_c_NS_nextMode(void);
+void dCamera_c_NS_nextType(void);
+void dCamera_c_NS_onHorseDush(void);
+void dCamera_c_NS_onModeChange(void);
+void dCamera_c_NS_onRoomChange(void);
+void dCamera_c_NS_onStyleChange(void);
+void dCamera_c_NS_onTypeChange(void);
+void dCamera_c_NS_popInfo(void);
+void dCamera_c_NS_positionOf(void);
+void dCamera_c_NS_push_any_key(void);
+void dCamera_c_NS_pushInfo(void);
+void dCamera_c_NS_radiusActorInSight_X1_(void);
+void dCamera_c_NS_Reset_X2_(void);
+void dCamera_c_NS_Reset(void);
+void dCamera_c_NS_runEventRecoveryTrans(void);
+void dCamera_c_NS_SetBlureActor(void);
+void dCamera_c_NS_setEventRecoveryTrans(void);
+void dCamera_c_NS_setFlag(void);
+void dCamera_c_NS_setMapToolData(void);
+void dCamera_c_NS_setRoomMapToolData(void);
+void dCamera_c_NS_setStageMapToolData(void);
+void dCamera_c_NS_setUSOAngle(void);
+void dCamera_c_NS_shakeCamera(void);
+void dCamera_c_NS_talkBasePos(void);
+void dCamera_c_NS_talkEyePos(void);
+void dCamera_c_NS_tooNearEscape(void);
+void dCamera_c_NS_Up(void);
+void dCamForcusLine_NS_Draw(void);
+void dCamForcusLine_NS_Init(void);
+void dCamForcusLine_NS_Off(void);
+void dCamMath_NS_rationalBezierRatio(void);
+void dCamMath_NS_xyzHorizontalDistance(void);
+void dCamMath_NS_xyzRotateX(void);
+void dCamMath_NS_xyzRotateY(void);
+void dCamMath_NS_zoomFovy(void);
+void dCamParam_c_NS_Arg0_X1_(void);
+void dCamParam_c_NS_Arg0(void);
+void dCamParam_c_NS_Arg1_X1_(void);
+void dCamParam_c_NS_Arg1(void);
+void dCamParam_c_NS_Arg2_X1_(void);
+void dCamParam_c_NS_Arg2(void);
+void dCamParam_c_NS_Change(void);
+void dCamParam_c_NS_CheckFlag(void);
+void dCamParam_c_NS_dtor(void);
+void dCamParam_c_NS_Flag(void);
+void dCamParam_c_NS_Fovy_X1_(void);
+void dCamParam_c_NS_Fovy(void);
+void dCamParam_c_NS_SearchStyle(void);
+void dCamParam_c_NS_Val(void);
+void dCamParam_c(void);
+void dCamSetup_c_NS_ChargeBRatio(void);
+void dCamSetup_c_NS_ChargeLatitude(void);
+void dCamSetup_c_NS_ChargeTimer(void);
+void dCamSetup_c_NS_CheckFlag(void);
+void dCamSetup_c_NS_CheckFlag2(void);
+void dCamSetup_c_NS_CheckLatitudeRange(void);
+void dCamSetup_c_NS_dtor(void);
+void dCamSetup_c_NS_PlayerHideDist(void);
+void dCamSetup_c_NS_ThrowCtrAdjust(void);
+void dCamSetup_c_NS_ThrowCushion(void);
+void dCamSetup_c_NS_ThrowTimer(void);
+void dCamSetup_c_NS_ThrowVAngle(void);
+void dCamSetup_c_NS_WaitRollSpeed(void);
+void dCamSetup_c_NS_WaitRollTimer(void);
+void dCamSetup_c(void);
+void dCcMassS_Mng_NS_GetCamTopPos(void);
+void dCcMassS_Mng_NS_GetResultCam(void);
+void dCcMassS_Mng_NS_SetCam(void);
+void dCcS_NS_ChkCamera(void);
+void dCcS_NS_chkCameraPoint(void);
+void dComIfG_Bgsp(void);
+void dComIfGp_evmng_cameraPlay(void);
+void dComIfGp_getAttention(void);
+void dComIfGp_getHorseActor(void);
+void dComIfGp_getRoomArrow(void);
+void dComIfGp_getRoomCamera(void);
+void dComIfGs_isTmpBit(void);
+void dComLbG_PhaseHandler(void);
+void dCstick_c_NS_Shift(void);
+void dDemo_object_c_NS_getActiveCamera(void);
+void dDlst_effectLine_c_NS_update(void);
+void dDlst_window_c_NS_setScissor(void);
+void dDlst_window_c_NS_setViewPort(void);
+void Degree__7cSAngleCFv(void);
+void dEvent_manager_c_NS_cutEnd(void);
+void dEvent_manager_c_NS_getIsAddvance(void);
+void dEvent_manager_c_NS_getMyActIdx(void);
+void dEvent_manager_c_NS_getMyStaffId(void);
+void dKy_camera_water_in_status_set(void);
+void dKy_pol_sound_get(void);
+void dKy_TeachWind_existence_chk(void);
+void dKyw_get_wind_pow(void);
+void dKyw_get_wind_vec(void);
+void dPath_GetRoomPath(void);
+void dRes_control_c_NS_getRes_X1_(void);
+void dStage_roomControl_c_NS_getStatusRoomDt(void);
+void dVibration_c_NS_StartShock(void);
+void fopAcIt_Judge(void);
+void fopAcM_GetID(void);
+void fopAcM_GetName(void);
+void fopAcM_GetParam(void);
+void fopAcM_searchFromName4Event(void);
+void fopAcM_setStageLayer(void);
+void fopCamM_GetParam(void);
+void func_80361C24(void);
+void func_80361D60(void);
+void func_80362084(void);
+void func_803620AC(void);
+void getE3Zhint__9daAlink_cFv(void);
+void Inv__7cSAngleCFv(void);
+void Invert__7cSGlobeFv(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void isSwitch__10dSv_info_cCFii(void);
+void JMAFastSqrt(void);
+void mDoCPd_c_NS_getHoldA(void);
+void mDoCPd_c_NS_getTrigA(void);
+void mDoGph_gInf_c_NS_onBlure_X1_(void);
+void mDoGph_gInf_c_NS_onBlure(void);
+void mDoLib_clipper_NS_setup(void);
+void mDoLib_project(void);
+void mDoMtx_concatProjView(void);
+void mDoMtx_lookAt_X1_(void);
+void mDoMtx_stack_c_NS_scaleM_X1_(void);
+void mDoMtx_stack_c_NS_transM(float, float, float);
+void mDoMtx_XrotM(void);
+void mDoMtx_YrotM(void);
+void mDoMtx_ZrotM(void);
+void norm__4cXyzCFv(void);
+void Norm__7cSAngleCFv(void);
+void normalize__4cXyzFv(void);
+void searchMapEventData__14dEvt_control_cFUc(void);
+void Set__8cM3dGCpsFRC4cXyzRC4cXyzf(void);
+void setCameraInWaterDepth__11Z2StatusMgrFf(void);
+void SetPos__11cBgS_GndChkFPC4cXyz(void);
+void SetStartEnd__8cM3dGLinFRC3VecRC3Vec(void);
+void Sin__7cSAngleCFv(void);
+void std_NS_fabs(void);
+void std_NS_fabsf(void);
+void Tan__7cDegreeCFv(void);
+void Val__7cSAngleFf(void);
+void Val__7cSAngleFRC7cSAngle(void);
+void Val__7cSAngleFs(void);
+void Val__7cSGlobeFfRC7cSAngleRC7cSAngle(void);
+void Val__7cSGlobeFfss(void);
+void Val__7cSGlobeFRC4cXyz(void);
+void Xyz__7cSGlobeCFv(void);
+void Xyz__7cSPolarCFv(void);
+void Z2Audience_NS_setAudioCamera(void);
+}
+
 extern "C" {
 // limitf__22@unnamed@d_camera_cpp@Ffff
 // @unnamed@d_camera_cpp@::limitf(float, float, float)

src/d/d_com/d_com_inf_game.cpp

@@ -9,6 +9,279 @@
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "m_Do/m_Do_ext/m_Do_ext.h"
 
+extern "C" {
+bool dComIfGp_checkMapShow(void);
+BOOL dComIfGp_isLightDropMapVisible(void);
+BOOL isTransformLV__21dSv_player_status_b_cCFi(int);
+char* strcpy(char*, const char*);
+const char* dComIfGs_getWarpStageName(void);
+int dComIfGs_getWarpRoomNo(void);
+int dKy_daynight_check(void);
+int dStage_roomControl_c_NS_getZoneNo(int);
+int getTimerMode__14dComIfG_play_cFv(void);
+int strcmp(const char*, const char*);
+s16 dComIfGs_getWarpPlayerAngleY(void);
+u16 dComIfGs_getMaxLifeGauge(void);
+u32 getBombNum__21dSv_player_item_max_cCFUc(u8);
+u32 getTimerPtr__14dComIfG_play_cFv(void);
+u8 dComIfGs_checkGetItem(u8);
+u8 dComIfGs_getBottleMax(void);
+u8 dComIfGs_getMixItemIndex(int);
+u8 getBombNum__24dSv_player_item_record_cCFUc(u8);
+unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int);
+void __ct__10dSv_zone_cFv(void);
+void __ct__11cBgS_ChkElmFv(void);
+void __ct__11dRes_info_cFv(void);
+void __ct__12dCcMassS_MngFv(void);
+void __ct__12dDlst_list_cFv(void);
+void __ct__12dSv_memory_cFv(void);
+void __ct__13dComIfG_inf_cFv(void);
+void __ct__13dSv_memory2_cFv(void);
+void __ct__13mDoExt_bckAnmFv(void);
+void __ct__13mDoExt_bpkAnmFv(void);
+void __ct__13mDoExt_brkAnmFv(void);
+void __ct__13mDoExt_btkAnmFv(void);
+void __ct__14dDlst_window_cFv(void);
+void __ct__14dEvt_control_cFv(void);
+void __ct__16dEvent_manager_cFv(void);
+void __ct__25dComIfG_camera_info_classFv(void);
+void __ct__4cCcSFv(void);
+void __dl__FPv(void);
+void __dt__8cM3dGCpsFv(void);
+void __nw__FUl(void);
+void addBottleNum__24dSv_player_item_record_cFUcs(void);
+void cBgS_ChkElm_NS_dtor(void);
+void cBgS_ChkElm_NS_Init(void);
+void cBgS_NS_GetTriPla(void);
+void ChkSetInfo__13cBgS_PolyInfoCFv(void);
+void cM3dGCyl_NS_dtor(void);
+void create__10JKRExpHeapFUlP7JKRHeapb(void);
+void cSAngle_NS_dtor(void);
+void ct__14dComIfG_play_cFv(void);
+void daAlink_c_NS_setLastSceneMode(void);
+void dAttDraw_c_NS_ctor(void);
+void dAttDraw_c_NS_dtor(void);
+void dAttention_c_NS_dtor(void);
+void dAttList_c_NS_ctor(void);
+void dAttList_c_NS_dtor(void);
+void dCcMassS_Obj_NS_dtor(void);
+void dCcS_NS_dtor(void);
+void dComIfG_camera_info_class_NS_dtor(void);
+void dComIfG_changeOpeningScene(void);
+void dComIfG_get_timelayer__FPi(int*);
+void dComIfG_getOldStageRes(void);
+void dComIfG_getRoomArcName(void);
+void dComIfG_getStageRes(void);
+void dComIfG_inf_c_NS_ct(void);
+void dComIfG_inf_c_NS_dtor(void);
+void dComIfG_play_c_NS_clearItemBombNumCount(void);
+void dComIfG_play_c_NS_createParticle(void);
+void dComIfG_play_c_NS_createSimpleModel(void);
+void dComIfG_play_c_NS_deleteSimpleModel(void);
+void dComIfG_play_c_NS_dtor(void);
+void dComIfG_play_c_NS_getItemBombNumCount(void);
+void dComIfG_play_c_NS_getLayerNo_common_common(void);
+void dComIfG_play_c_NS_getLayerNo_common(void);
+void dComIfG_play_c_NS_getLayerNo(int);
+void dComIfG_play_c_NS_itemInit(void);
+void dComIfG_play_c_NS_setItemBombNumCount(u8, s16);
+void dComIfG_play_c_NS_setStartStage(void);
+void dComIfG_play_c_NS_setTimerPtr(void);
+void dComIfG_resDelete(void);
+void dComIfG_resetToOpening(void);
+void dComIfG_resLoad_X1_(void);
+void dComIfG_resLoad(void);
+void dComIfG_TimerDeleteRequest(void);
+void dComIfGd_setShadow(void);
+void dComIfGd_setSimpleShadow(void);
+void dComIfGp_addSelectItemNum(void);
+void dComIfGp_calcNowRegion(void);
+void dComIfGp_checkEmptySubHeap2D(void);
+void dComIfGp_createSubExpHeap2D(void);
+void dComIfGp_destroySubExpHeap2D(void);
+void dComIfGp_getNowLevel(void);
+void dComIfGp_getReverb(void);
+void dComIfGp_getRoomArrow(void);
+void dComIfGp_getRoomCamera(void);
+void dComIfGp_getSelectItem(void);
+void dComIfGp_getSelectItemMaxNum(void);
+void dComIfGp_getSelectItemNum(void);
+void dComIfGp_getSubHeap2D(void);
+void dComIfGp_mapHide(void);
+void dComIfGp_mapShow(void);
+void dComIfGp_offHeapLockFlag(void);
+void dComIfGp_ret_wp_set(void);
+void dComIfGp_searchUseSubHeap2D(void);
+void dComIfGp_SelectWarpPt_get(void);
+void dComIfGp_SelectWarpPt_set(void);
+void dComIfGp_setHeapLockFlag(void);
+void dComIfGp_setNextStage_X1_(void);
+void dComIfGp_setNextStage(void);
+void dComIfGp_setSelectItem(int);
+void dComIfGp_setSelectItemNum(void);
+void dComIfGp_TargetWarpPt_get(void);
+void dComIfGp_TargetWarpPt_set(void);
+void dComIfGp_TransportWarp_check(void);
+void dComIfGp_world_dark_get(void);
+void dComIfGp_world_dark_set(u8);
+void dComIfGs_BossLife_public_Set(void);
+void dComIfGs_checkGetInsectNum(void);
+void dComIfGs_gameStart(void);
+void dComIfGs_getSelectMixItemNoArrowIndex(void);
+void dComIfGs_getWarpMarkFlag(void);
+void dComIfGs_getWarpPlayerPos(void);
+void dComIfGs_isDungeonItemWarp(void);
+void dComIfGs_isOneZoneItem(void);
+void dComIfGs_isOneZoneSwitch(void);
+void dComIfGs_isStageSwitch(void);
+void dComIfGs_isStageTbox(void);
+void dComIfGs_isVisitedRoom(void);
+void dComIfGs_isZoneItem(void);
+void dComIfGs_isZoneSwitch(void);
+void dComIfGs_offOneZoneSwitch(void);
+void dComIfGs_offStageSwitch(void);
+void dComIfGs_offZoneSwitch(void);
+void dComIfGs_onOneZoneSwitch(void);
+void dComIfGs_onStageSwitch(void);
+void dComIfGs_onVisitedRoom(void);
+void dComIfGs_onZoneSwitch(void);
+void dComIfGs_PolyDamageOff_Check(void);
+void dComIfGs_PolyDamageOff_Set(void);
+void dComIfGs_sense_type_change_Get(void);
+void dComIfGs_setKeyNum(int, u8);
+void dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc(void);
+void dComIfGs_setMixItemIndex(int, u8);
+void dComIfGs_setSelectEquipClothes(u8);
+void dComIfGs_setSelectEquipShield(u8);
+void dComIfGs_setSelectEquipSword(u8);
+void dComIfGs_setSelectItemIndex(int, u8);
+void dComIfGs_setWarpItemData_X1_(void);
+void dComIfGs_setWarpMarkFlag(void);
+void dComIfGs_staffroll_next_go_check(void);
+void dComIfGs_Wolf_Change_Check(void);
+void dComIfGs_wolfeye_effect_check(void);
+void dComLbG_PhaseHandler(void);
+void dDlst_list_c_NS_dtor(void);
+void dDlst_shadowControl_c_NS_setReal(void);
+void dDlst_shadowControl_c_NS_setSimple(void);
+void dDlst_window_c_NS_dtor(void);
+void dEvDtBase_c_NS_dtor(void);
+void dEvt_order_c_NS_dtor(void);
+void dKy_darkworld_stage_check(void);
+void dMapInfo_n_NS_getMapPlayerPos(void);
+void dMenuFmap_getStartStageName(void);
+void dMeter2Info_c_NS_init(void);
+void dMeter2Info_c_NS_setSaveStageName(void);
+void dPa_control_c(void);
+void dRes_control_c_NS_deleteRes(void);
+void dRes_control_c_NS_dtor(void);
+void dRes_control_c_NS_getRes_X1_(void);
+void dRes_control_c_NS_setRes(void);
+void dRes_control_c_NS_syncRes(void);
+void dRes_info_c_NS_dtor(void);
+void dSmplMdl_draw_c_NS_addModel(void);
+void dSmplMdl_draw_c_NS_draw(void);
+void dSmplMdl_draw_c_NS_entry(void);
+void dSmplMdl_draw_c_NS_removeModel(void);
+void dSmplMdl_draw_c(void);
+void dStage_roomControl_c_NS_getStatusRoomDt(void);
+void dStage_roomRead_dt_c_GetReverbStage(void);
+void dTimer_c_NS_deleteCheck(void);
+void dTimer_c_NS_deleteRequest(void);
+void dTimer_c_NS_end(void);
+void dTimer_c_NS_restart(void);
+void dTimer_c_NS_start_X1_(void);
+void dTimer_c_NS_start(void);
+void dTimer_c_NS_stop(void);
+void fopScnM_ChangeReq(void);
+void fopScnM_ReRequest(void);
+void func_8002CAF0(void);
+void func_8002CB30(void);
+void func_8002CB68(void);
+void func_8002CDB8(void);
+void func_8002CE38(void);
+void func_8002CEB4(void);
+void func_8002CEFC(void);
+void func_8002CF5C(void);
+void func_8002CFB8(void);
+void func_8002D1AC(void);
+void func_8002D7D0(void);
+void func_8002D910(void);
+void func_8002D924(void);
+void func_8002E9D4(void);
+void func_8002F314(void);
+void func_8002F328(void);
+void func_8002F3B4(void);
+void func_8002F52C(void);
+void func_8002F5C0(void);
+void func_8002F638(void);
+void func_8002F6B0(void);
+void func_8002F72C(void);
+void func_8002FA18(void);
+void func_8002FA30(void);
+void func_8002FA84(void);
+void func_8002FC3C(void);
+void func_8002FD18(void);
+void func_80030A74(void);
+void func_80030BDC(void);
+void func_80030C50(void);
+void func_80030CCC(void);
+void func_80030DE0(void);
+void func_80030E84(void);
+void func_80030ECC(void);
+void func_80361C24(void);
+void func_80361D60(void);
+void func_803620AC(void);
+void func_803664DC(void);
+void getBottleNum__24dSv_player_item_record_cCFUc(void);
+void getItem__17dSv_player_item_cCFib(void);
+void getSave2__10dSv_save_cFi(void);
+void getTotalFreeSize__7JKRHeapCFv(void);
+void getVibration__19dSv_player_config_cFv(void);
+void init__12dSv_memory_cFv(void);
+void init__13dSv_memory2_cFv(void);
+void init__14dComIfG_play_cFv(void);
+void init__20dStage_roomControl_cFvZone(void);
+void isDarkClearLV__21dSv_player_status_b_cCFi(void);
+void isDungeonItem__12dSv_memBit_cCFi(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void isFirstBit__21dSv_player_get_item_cCFUc(void);
+void isItem__13dSv_zoneBit_cCFi(void);
+void isOneItem__13dSv_zoneBit_cCFi(void);
+void isOneSwitch__13dSv_zoneBit_cCFi(void);
+void isRegionBit__33dSv_player_field_last_stay_info_cCFi(void);
+void isSwitch__10dSv_info_cCFii(void);
+void isSwitch__12dSv_memBit_cCFi(void);
+void isSwitch__13dSv_zoneBit_cCFi(void);
+void isTbox__12dSv_memBit_cCFi(void);
+void isVisitedRoom__13dSv_memory2_cFi(void);
+void J3DFrameCtrl_NS_init(void);
+void mDoExt_bckAnm_NS_dtor(void);
+void mDoExt_bpkAnm_NS_dtor(void);
+void mDoExt_brkAnm_NS_dtor(void);
+void mDoExt_btkAnm_NS_dtor(void);
+void mDoExt_destroyExpHeap(void);
+void offOneSwitch__13dSv_zoneBit_cFi(void);
+void offSwitch__10dSv_info_cFii(void);
+void offSwitch__12dSv_memBit_cFi(void);
+void offSwitch__13dSv_zoneBit_cFi(void);
+void offVisitedRoom__13dSv_memory2_cFi(void);
+void onDungeonItem__12dSv_memBit_cFi(int);
+void onOneSwitch__13dSv_zoneBit_cFi(void);
+void onRegionBit__33dSv_player_field_last_stay_info_cFi(void);
+void onSwitch__10dSv_info_cFii(int, int);
+void onSwitch__12dSv_memBit_cFi(void);
+void onSwitch__13dSv_zoneBit_cFi(void);
+void onVisitedRoom__13dSv_memory2_cFi(void);
+void set__18dStage_nextStage_cFPCcScsScScUc(void);
+void set__33dSv_player_field_last_stay_info_cFPCcRC4cXyzsScUc(void);
+void setBombNum__24dSv_player_item_record_cFUcUc(void);
+void setBottleNum__24dSv_player_item_record_cFUcUc(u8, u8);
+void setCollect__20dSv_player_collect_cFiUc(int, u8);
+void setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc(void);
+void* memset(void* dest, int ch, u32 count);
+}
+
 // memset first arg is wrong
 #ifdef NONMATCHING
 void dComIfG_play_c::ct(void) {
@@ -527,8 +800,10 @@ void dComIfGp_mapHide(void) {
     dComIfGs_onEventBit(0x1D01);
 }
 
-bool dComIfGp_checkMapShow(void) {
-    return !dComIfGs_isEventBit(0x1D01);
+asm bool dComIfGp_checkMapShow(void) {
+    nofralloc
+    #include "d/d_com/d_com_inf_game/asm/func_8002E0A8.s"
+    //return !dComIfGs_isEventBit(0x1D01);
 }
 
 // dComIfGp_setHeapLockFlag__FUc

src/d/d_file/d_file_sel_info.cpp

@@ -2,6 +2,29 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
+extern "C" {
+char* strcpy(char*, const char*);
+void __ct__9J2DScreenFv(void);
+void __dl__FPv(void);
+void __nw__FUl(void);
+void CPaneMgrAlpha_X1_(void);
+void dDlst_list_c_NS_set(void);
+void dMeter2Info_c_NS_getString(void);
+void func_80362324(void);
+void func_80362540(void);
+void func_803664DC(void);
+void J2DScreen_NS_draw(void);
+void J2DScreen_NS_setPriority(void);
+void J2DTextBox_NS_getStringPtr(void);
+void J2DTextBox_NS_setString_X1_(void);
+void mDoExt_getMesgFont(void);
+void mDoExt_removeMesgFont(void);
+void screenSet__12dFile_info_cFv(void);
+void setHeartCnt__12dFile_info_cFP10dSv_save_c(void);
+void setPlayTime__12dFile_info_cFP10dSv_save_c(void);
+void setSaveDate__12dFile_info_cFP10dSv_save_c(void);
+}
+
 asm dFile_info_c::dFile_info_c(JKRArchive*, u8) {
     nofralloc
 #include "d/d_file/d_file_sel_info/asm/func_80192434.s"

src/d/d_item/d_item.cpp

@@ -2,6 +2,31 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
+extern "C" {
+int checkItemGet__FUci(u8, int);
+int func_80368954(char*, char*, u32);
+int item_getcheck_func_FISHING_ROD_1(void);
+u16 dComIfGs_getMaxLifeGauge(void);
+u32 getBombNum__21dSv_player_item_max_cCFUc(u8);
+u32 isMagicFlag__21dSv_player_status_a_cCFUc(u8);
+u8 getBombNum__24dSv_player_item_record_cCFUc(u8);
+void addBombCount(u8, u8);
+void dComIfG_play_c_NS_getLayerNo(int);
+void dComIfG_play_c_NS_setItemBombNumCount(u8, s16);
+void dComIfGs_setSelectEquipClothes(u8);
+void dComIfGs_setSelectEquipShield(u8);
+void dComIfGs_setSelectEquipSword(u8);
+void dMeter2Info_setSword(u8, bool);
+void getItem__17dSv_player_item_cCFib(void);
+void isFirstBit__21dSv_player_get_item_cCFUc(void);
+void onDungeonItem__12dSv_memBit_cFi(int);
+void onSwitch__10dSv_info_cFii(int, int);
+void setBottleNum__24dSv_player_item_record_cFUcUc(u8, u8);
+void setCollect__20dSv_player_collect_cFiUc(int, u8);
+void setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb(u8, bool);
+void setEmptyBottleItemIn__17dSv_player_item_cFUc(u8);
+}
+
 inline void dComIfGp_setItemLifeCount(float amount, u8 unk) {
     g_dComIfG_gameInfo.getPlay().setItemLifeCount(amount, unk);
 }

src/d/d_kankyo.cpp

@@ -6,6 +6,145 @@
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "os/OS.h"
 
+extern "C" {
+double func_8036C028(double);
+double func_8036C590(double);
+int abs(int);
+int func_8036608C(const void*, const void*, u32);
+int strcmp(const char*, const char*);
+void __dl__FPv(void);
+void __mi__4cXyzCFRC3Vec(void);
+void __ml__4cXyzCFf(void);
+void __nw__FUl(void);
+void __pl__4cXyzCFRC3Vec(void);
+void BOSS_LIGHT_NS_dtor(void);
+void BOSS_LIGHT(void);
+void cBgS_NS_GroundCross(void);
+void cLib_addCalc__FPfffff(void);
+void cM3d_VectorProduct2d__Fffffff(void);
+void cXyz_NS_dtor(void);
+void daPy_py_c_NS_checkNowWolfEyeUp(void);
+void dBgS_CamGndChk_Wtr_NS_dtor(void);
+void dBgS_CamGndChk_Wtr(void);
+void dBgS_NS_GetPolyAtt0(void);
+void dBgS_NS_GetPolyAtt1(void);
+void dCam_getBody(void);
+void dComIfG_getStageRes(void);
+void dComIfG_play_c_NS_getLayerNo_common(void);
+void dComIfG_play_c_NS_getLayerNo(int);
+void dComIfGp_world_dark_get(void);
+void dComIfGs_PolyDamageOff_Set(void);
+void dComIfGs_sense_type_change_Get(void);
+void dKankyo_DayProc(void);
+void dKy_actor_addcol_set(void);
+void dKy_bgparts_activelight_cut(void);
+void dKy_bgparts_activelight_set(void);
+void dKy_BossLight_set(void);
+void dKy_camera_water_in_status_check(void);
+void dKy_darkworld_check(void);
+void dKy_efplight_cut(void);
+void dKy_efplight_set(void);
+void dKy_fog_startendz_set(void);
+void dKy_get_dayofweek(void);
+void dKy_getdaytime_hour(void);
+void dKy_getdaytime_minute(void);
+void dKy_Indoor_check(void);
+void dKy_light_influence_pos(void);
+void dKy_Outdoor_check(void);
+void dKy_plight_set(void);
+void dKy_set_vrboxkumocol_ratio(void);
+void dKy_set_vrboxsoracol_ratio(void);
+void dKy_setLight_init(void);
+void dKy_setLight_nowroom_actor(void);
+void dKy_setLight_nowroom(void);
+void dKy_shadow_mode_check(void);
+void dKy_shadow_mode_reset(void);
+void dKy_shadow_mode_set(void);
+void dKy_Sound_init(void);
+void dKy_SunMoon_Light_Check(void);
+void dKy_tevstr_init(void);
+void dKy_twilight_camelight_set(void);
+void dKy_vrbox_addcol_set(void);
+void dKy_WaterIn_Light_set(void);
+void dKyd_BloomInf_tbl_getp(void);
+void dKyd_darkworld_tbl_getp(void);
+void dKyd_dmenvr_getp(void);
+void dKyd_dmpalet_getp(void);
+void dKyd_dmpselect_getp(void);
+void dKyd_dmvrbox_getp(void);
+void dKyd_light_size_tbl_getp(void);
+void dKyd_light_tw_size_tbl_getp(void);
+void dKyd_maple_col_getp(void);
+void dKyd_schejule_boss_getp(void);
+void dKyd_schejule_getp(void);
+void dKyd_xfog_table_set(void);
+void dKyr_get_vectle_calc(void);
+void dKyw_get_wind_vec(void);
+void dKyw_rain_set(void);
+void dKyw_wether_proc(void);
+void dKyw_wind_set(void);
+void dMsgObject_c_NS_getActor(void);
+void dPa_control_c_NS_set(void);
+void dRes_control_c_NS_getRes(void);
+void dScnKy_env_light_c_NS_getDarkDaytime(void);
+void dStage_roomControl_c_NS_getStatusRoomDt(void);
+void dStage_roomControl_c_NS_GetTimePass(void);
+void DUNGEON_LIGHT_NS_dtor(void);
+void DUNGEON_LIGHT(void);
+void func_80361C24(void);
+void func_80361D60(void);
+void func_803620AC(void);
+void GB_MAPLE_COL_CHANGE(void);
+void GFSetFog(void);
+void GXInitLightAttn(void);
+void GXInitLightColor(void);
+void GXInitLightDir(void);
+void GXInitLightDistAttn(void);
+void GXInitLightSpot(void);
+void GXInitLightPos(void);
+void GXLoadLightObjImm(void);
+void GXSetChanAmbColor(void);
+void GXSetFog(void);
+void GXSetFogRangeAdj(void);
+void GxXFog_set(void);
+void isDarkClearLV__21dSv_player_status_b_cCFi(void);
+void isDungeonItem__12dSv_memBit_cCFi(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void isSwitch__10dSv_info_cCFii(void);
+void isSwitch__12dSv_memBit_cCFi(void);
+void J3DFrameCtrl_NS_init(void);
+void J3DLightInfo_NS___as(void);
+void J3DModelData_NS_simpleCalcMaterial(void);
+void J3DTexMtxInfo_NS_setEffectMtx(void);
+void JPABaseEmitter_NS_deleteAllParticle(void);
+void JUTNameTab_NS_getName(void);
+void LIGHT_INFLUENCE_NS_dtor(void);
+void LIGHT_INFLUENCE(void);
+void mDoExt_adjustSolidHeap(void);
+void mDoExt_baseAnm_NS_play(void);
+void mDoExt_btkAnm_NS_entry(void);
+void mDoExt_btkAnm_NS_init(void);
+void mDoExt_createSolidHeapFromGameToCurrent_X1_(void);
+void mDoExt_destroySolidHeap(void);
+void mDoExt_J3DModel__create(void);
+void mDoExt_modelUpdateDL(void);
+void mDoExt_restoreCurrentHeap(void);
+void mDoGph_gInf_c_NS_bloom_c_NS_create(void);
+void mDoLib_project(void);
+void mDoMtx_inverseTranspose(void);
+void mDoMtx_lookAt(void);
+void memcpy(void*, const void*, int);
+void offEventBit__11dSv_event_cFUs(void);
+void SetPos__11cBgS_GndChkFPC4cXyz(void);
+void WIND_INF_ENTITY_NS_dtor(void);
+void WIND_INF_ENTITY(void);
+void Z2EnvSeMgr_NS_dtor(void);
+void Z2EnvSeMgr_NS_resetScene(void);
+void Z2EnvSeMgr(void);
+void Z2SceneMgr_NS_load2ndDynamicWave(void);
+void* memset(void* dest, int ch, u32 count);
+}
+
 extern "C" {
 // dKy_WolfPowerup_AmbCol__FP11_GXColorS10
 // dKy_WolfPowerup_AmbCol(_GXColorS10*)

src/d/d_kankyo/d_kankyo_rain.cpp

@@ -5,6 +5,93 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
+extern "C" {
+double func_8036C028(double);
+double func_8036C590(double);
+double func_8036CA54(double);
+int dKy_daynight_check(void);
+int func_8036608C(const void*, const void*, u32);
+int strcmp(const char*, const char*);
+void __ct__5csXyzFsss(void);
+void __nw__FUli(void);
+void __pl__4cXyzCFRC3Vec(void);
+void cBgS_NS_GroundCross(void);
+void cLib_addCalc__FPfffff(void);
+void cM3d_VectorProduct2d__Fffffff(void);
+void csXyz_NS_dtor(void);
+void cXyz_NS_dtor(void);
+void daPy_py_c_NS_checkNowWolfEyeUp(void);
+void dBgS_CamGndChk_Wtr_NS_dtor(void);
+void dBgS_CamGndChk_Wtr(void);
+void dBgS_GndChk_NS_dtor(void);
+void dBgS_GndChk(void);
+void dBgS_NS_RoofChk(void);
+void dBgS_ObjGndChk_All_NS_dtor(void);
+void dBgS_RoofChk_NS_dtor(void);
+void dBgS_RoofChk(void);
+void dCcMassS_Mng_NS_Prepare(void);
+void dComIfG_getStageRes(void);
+void dComIfG_play_c_NS_getLayerNo(int);
+void dComIfGs_PolyDamageOff_Set(void);
+void dDlst_peekZ_c_NS_newData(void);
+void dEvent_manager_c_NS_getRunEventName(void);
+void dKy_actor_addcol_amb_set(void);
+void dKy_addcol_fog_set(void);
+void dKy_bg_addcol_amb_set(void);
+void dKy_bg1_addcol_amb_set(void);
+void dKy_darkworld_check(void);
+void dKy_efplight_cut(void);
+void dKy_efplight_set(void);
+void dKy_get_parcent(void);
+void dKy_GxFog_set(void);
+void dKy_move_room_ratio(void);
+void dKy_ParticleColor_get_bg(void);
+void dKy_rain_check(void);
+void dKy_set_actcol_ratio(void);
+void dKy_set_bgcol_ratio(void);
+void dKy_set_fogcol_ratio(void);
+void dKy_set_vrboxcol_ratio(void);
+void dKy_vrbox_addcol_kasumi_set(void);
+void dKy_vrbox_addcol_sky0_set(void);
+void dKyw_get_wind_pow(void);
+void dKyw_get_wind_vec(void);
+void dKyw_get_wind_vecpow(void);
+void dKyw_pntwind_get_vecpow(void);
+void dPa_control_c_NS_set_X1_(void);
+void dRes_control_c_NS_getRes(void);
+void dScnKy_env_light_c_NS_getDaytime(void);
+void dStage_roomControl_c_NS_getStatusRoomDt(void);
+void fopKyM_create(void);
+void func_80361C24(void);
+void func_80361D60(void);
+void func_8036C720(void);
+void GXLoadPosMtxImm(void);
+void GXLoadTexMtxImm(void);
+void GXSetAlphaCompare(void);
+void GXSetClipMode(void);
+void GXSetColorUpdate(void);
+void GXSetCullMode(void);
+void GXSetCurrentMtx(void);
+void GXSetFog(void);
+void GXSetNumIndStages(void);
+void GXSetTexCoordGen2(void);
+void GXSetZCompLoc(void);
+void GXSetZMode(void);
+void isDungeonItem__12dSv_memBit_cCFi(void);
+void J3DSys_NS_reinitGX(void);
+void mDoLib_project(void);
+void mDoMtx_XrotM(void);
+void mDoMtx_YrotM(void);
+void mDoMtx_ZrotM(void);
+void mDoMtx_ZXYrotM(void);
+void SetPos__11cBgS_GndChkFPC4cXyz(void);
+void SNOW_EFF_NS_dtor(void);
+void SNOW_EFF(void);
+void STAR_EFF_NS_dtor(void);
+void STAR_EFF(void);
+void Z2EnvSeMgr_NS_startNearThunderSe(void);
+}
+
 extern "C" {
 // vectle_calc__FP10DOUBLE_POSP4cXyz
 // vectle_calc(DOUBLE_POS*, cXyz*)

src/d/d_kankyo/d_kankyo_wether.cpp

@@ -6,6 +6,78 @@
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 
+extern "C" {
+int func_8036608C(const void*, const void*, u32);
+int strcmp(const char*, const char*);
+void __dl__FPv(void);
+void __ml__4cXyzCFf(void);
+void __ne__4cXyzCFRC3Vec(void);
+void __nw__FUli(void);
+void __pl__4cXyzCFRC3Vec(void);
+void cLib_addCalc__FPfffff(void);
+void cloud_shadow_move(void);
+void cXyz_NS_ctor(void);
+void cXyz_NS_dtor(void);
+void dComIfG_getStageRes(void);
+void dComIfG_play_c_NS_getLayerNo(int);
+void dComIfGp_getReverb(void);
+void dKy_darkworld_check(void);
+void dKy_get_dayofweek(void);
+void dKy_undwater_filter_draw(void);
+void dKyr_drawHousi(void);
+void dKyr_drawLenzflare(void);
+void dKyr_drawRain(void);
+void dKyr_drawSibuki(void);
+void dKyr_drawSnow(void);
+void dKyr_drawStar(void);
+void dKyr_drawSun(void);
+void dKyr_evil_draw(void);
+void dKyr_evil_init(void);
+void dKyr_evil_move(void);
+void dKyr_get_vectle_calc(void);
+void dKyr_housi_move(void);
+void dKyr_lenzflare_move(void);
+void dKyr_mud_draw(void);
+void dKyr_mud_init(void);
+void dKyr_mud_move(void);
+void dKyr_odour_draw(void);
+void dKyr_odour_init(void);
+void dKyr_odour_move(void);
+void dKyr_rain_init(void);
+void dKyr_rain_move(void);
+void dKyr_shstar_init(void);
+void dKyr_shstar_move(void);
+void dKyr_snow_init(void);
+void dKyr_snow_move(void);
+void dKyr_star_init(void);
+void dKyr_star_move(void);
+void dKyr_sun_move(void);
+void dKyr_thunder_init(void);
+void dKyr_thunder_move(void);
+void dKyw_get_wind_pow(void);
+void dKyw_get_wind_vec(void);
+void dKyw_pntlight_set(void);
+void dKyw_pntwind_cut(void);
+void dKyw_pntwind_init(void);
+void dKyw_wind_init(void);
+void dPa_control_c_NS_set(void);
+void drawCloudShadow(void);
+void drawVrkumo(void);
+void dRes_control_c_NS_getRes(void);
+void dScnKy_env_light_c_NS_getDaytime(void);
+void dStage_roomControl_c_NS_getStatusRoomDt(void);
+void func_80361C24(void);
+void func_80361D60(void);
+void J3DDrawBuffer_NS_entryImm(void);
+void normZP__4cXyzCFv(void);
+void squal_proc(void);
+void vrkumo_move(void);
+void Z2EnvSeMgr_NS_initStrongWindSe(void);
+void Z2EnvSeMgr_NS_setWindDirection(void);
+void Z2EnvSeMgr_NS_startRainSe(void);
+void Z2EnvSeMgr_NS_startStrongWindSe(void);
+}
+
 extern "C" {
 // dKyw_setDrawPacketList__FP9J3DPacketi
 // dKyw_setDrawPacketList(J3DPacket*, int)

src/d/d_kantera_icon_meter.cpp

@@ -3,6 +3,18 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
+extern "C" {
+void __ct__9J2DScreenFv(void);
+void __dl__FPv(void);
+void __nw__FUl(void);
+void CPaneMgr_X1_(void);
+void CPaneMgrAlpha_NS_setAlphaRate(void);
+void dKantera_icon_c_NS_initiate(void);
+void dPaneClass_showNullPane(void);
+void J2DScreen_NS_draw(void);
+void J2DScreen_NS_setPriority(void);
+}
+
 extern "C" {
 // __ct__15dKantera_icon_cFv
 // dKantera_icon_c::dKantera_icon_c(void)

src/d/d_lib.cpp

@@ -5,6 +5,17 @@
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "os/OS.h"
 
+extern "C" {
+void __mi__4cXyzCFRC3Vec(void);
+void aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl(void);
+void findFsResource__10JKRArchiveCFPCcUl(void);
+void getAramAddress__14JKRAramArchiveFPCc(void);
+void mDoMtx_YrotS(void);
+void searchMapEventData__14dEvt_control_cFUc(void);
+void Xinit__9STControlFv(void);
+void Yinit__9STControlFv(void);
+}
+
 STControl::STControl(s16 param_1, s16 param_2, s16 param_3, s16 param_4, f32 param_5, f32 param_6,
                      s16 param_7, s16 param_8) {
     __vt = (STControl_vtable*)0x803a7260;

src/d/d_meter/d_meter_HIO.cpp

@@ -3,6 +3,18 @@
 #include "global.h"
 #include "m_Do/m_Do_ext/m_Do_ext.h"
 
+extern "C" {
+void __dl__FPv(void);
+void cXyz_NS_ctor(void);
+void cXyz_NS_dtor(void);
+void dMeter_fmapHIO_c_NS_MapBlinkAnime(void);
+void free__7JKRHeapFPv(void);
+void func_80361C24(void);
+void func_80361CE8(void);
+void func_80361D60(void);
+void JUtility_NS_TColor(void);
+}
+
 extern "C" {
 // __ct__16dMeter_menuHIO_cFv
 // dMeter_menuHIO_c::dMeter_menuHIO_c(void)

src/d/d_meter/d_meter_button.cpp

@@ -5,6 +5,144 @@
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 
+extern "C" {
+char* strcpy(char*, const char*);
+int strcmp(const char*, const char*);
+void __ct__9J2DScreenFv(void);
+void __dl__FPv(void);
+void __nw__FUl(void);
+void alloc__7JKRHeapFUli(void);
+void cLib_addCalc2__FPffff(void);
+void COutFont_c(void);
+void CPaneMgr_NS_dtor(void);
+void CPaneMgr_NS_getGlobalVtx(void);
+void CPaneMgr_NS_getGlobalVtxCenter(void);
+void CPaneMgr_NS_paneTrans(void);
+void CPaneMgr_X1_(void);
+void CPaneMgr(void);
+void CPaneMgrAlpha_NS_getAlphaRate(void);
+void CPaneMgrAlpha_NS_hide(void);
+void CPaneMgrAlpha_NS_setAlphaRate(void);
+void CPaneMgrAlpha_NS_show(void);
+void dComIfG_play_c_NS_getLayerNo(int);
+void dComIfGs_isOneZoneSwitch(void);
+void dMeter2Draw_c_NS_drawPikari_X1_(void);
+void dMeter2Draw_c_NS_getCanoeFishing(void);
+void dMeter2Draw_c_NS_setAlphaAnimeMax(void);
+void dMeter2Info_c_NS_decFloatingMessageTimer(void);
+void dMeter2Info_c_NS_getStringLength(void);
+void dMeter2Info_c_NS_readItemTexture(void);
+void dMeter2Info_c_NS_resetFloatingMessage(void);
+void dMeterButton_c_NS__create(void);
+void dMeterButton_c_NS__delete(void);
+void dMeterButton_c_NS_alphaAnimeButton3D(void);
+void dMeterButton_c_NS_alphaAnimeButton3DB(void);
+void dMeterButton_c_NS_alphaAnimeButtonA(void);
+void dMeterButton_c_NS_alphaAnimeButtonAB(void);
+void dMeterButton_c_NS_alphaAnimeButtonAR(void);
+void dMeterButton_c_NS_alphaAnimeButtonB(void);
+void dMeterButton_c_NS_alphaAnimeButtonBin(void);
+void dMeterButton_c_NS_alphaAnimeButtonC(void);
+void dMeterButton_c_NS_alphaAnimeButtonNun(void);
+void dMeterButton_c_NS_alphaAnimeButtonNunC(void);
+void dMeterButton_c_NS_alphaAnimeButtonNunZ(void);
+void dMeterButton_c_NS_alphaAnimeButtonNURE(void);
+void dMeterButton_c_NS_alphaAnimeButtonR(void);
+void dMeterButton_c_NS_alphaAnimeButtonReel(void);
+void dMeterButton_c_NS_alphaAnimeButtonReel2(void);
+void dMeterButton_c_NS_alphaAnimeButtonRemo(void);
+void dMeterButton_c_NS_alphaAnimeButtonRemo2(void);
+void dMeterButton_c_NS_alphaAnimeButtonS(void);
+void dMeterButton_c_NS_alphaAnimeButtonTate(void);
+void dMeterButton_c_NS_alphaAnimeButtonX(void);
+void dMeterButton_c_NS_alphaAnimeButtonY(void);
+void dMeterButton_c_NS_alphaAnimeButtonZ(void);
+void dMeterButton_c_NS_getCenterPosCalc(void);
+void dMeterButton_c_NS_hide_button(void);
+void dMeterButton_c_NS_isFastSet(void);
+void dMeterButton_c_NS_paneTrans(void);
+void dMeterButton_c_NS_pikariCheck(void);
+void dMeterButton_c_NS_screenInitButton(void);
+void dMeterButton_c_NS_screenInitText(void);
+void dMeterButton_c_NS_setAlphaButton3DAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButton3DAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButton3DBAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButton3DBAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButton3DVAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButton3DVAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonAAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonAAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonABAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonABAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonARAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonARAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonBAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonBAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonBinAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonBinAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonCAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonCAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonNunAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonNunAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonNunCAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonNunCAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonNunZAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonNunZAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonNUREAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonNUREAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonOAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonOAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonRAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonRAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonReel2AnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonReel2AnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonReelAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonReelAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonRemo2AnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonRemo2AnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonRemoAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonRemoAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonSAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonSAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonTateAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonTateAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonXAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonXAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonYAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonYAnimeMin(void);
+void dMeterButton_c_NS_setAlphaButtonZAnimeMax(void);
+void dMeterButton_c_NS_setAlphaButtonZAnimeMin(void);
+void dMeterButton_c_NS_setAlphaIconAnimeMax(void);
+void dMeterButton_c_NS_setAlphaIconAnimeMin(void);
+void dMeterButton_c_NS_trans_button(void);
+void dMeterButton_c_NS_updateButton(void);
+void dMeterButton_c_NS_updateText(void);
+void dMsgObject_c_NS_getScrnDrawPtr(void);
+void dMsgObject_c_NS_getStatus(void);
+void dMsgObject_c_NS_getString(void);
+void dMsgObject_c_NS_isBookMessage(void);
+void dMsgObject_c_NS_isBossMessage(void);
+void dMsgObject_c_NS_isGetItemMessage(void);
+void dMsgObject_c_NS_isHowlMessage(void);
+void dMsgObject_c_NS_isKanbanMessage(void);
+void dMsgObject_c_NS_isMidonaTalkWait(void);
+void dMsgObject_c_NS_isPlaceMessage(void);
+void dMsgObject_c_NS_isStaffMessage(void);
+void dMsgString_c_NS_dtor(void);
+void dMsgString_c(void);
+void dPaneClass_showNullPane(void);
+void free__7JKRHeapFPv(void);
+void getBounds__7J2DPaneFv(void);
+void getItem__17dSv_player_item_cCFib(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void J2DScreen_NS_draw(void);
+void J2DScreen_NS_setPriority(void);
+void J2DTextBox_NS_getStringPtr(void);
+void J2DTextBox_NS_setString_X1_(void);
+void mDoExt_getCurrentHeap(void);
+void mDoExt_getMesgFont(void);
+}
+
 extern "C" {
 // __ct__14dMeterButton_cFv
 // dMeterButton_c::dMeterButton_c(void)

src/d/d_meter/d_meter_haihai.cpp

@@ -3,6 +3,30 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
+extern "C" {
+void __ct__9J2DScreenFv(void);
+void __dl__FPv(void);
+void __nw__FUl(void);
+void animationTransform__7J2DPaneFv(void);
+void CPaneMgr_X1_(void);
+void dMeterHaihai_c_NS_alphaAnimeHaihai(void);
+void dMeterHaihai_c_NS_drawHaihaiBottom(void);
+void dMeterHaihai_c_NS_drawHaihaiLeft(void);
+void dMeterHaihai_c_NS_drawHaihaiRight(void);
+void dMeterHaihai_c_NS_drawHaihaiTop(void);
+void dMeterHaihai_c_NS_playBckAnime(void);
+void dMeterHaihai_c_NS_playBpkAnime(void);
+void dMeterHaihai_c_NS_playBtkAnime(void);
+void dMeterHaihai_c_NS_updateHaihai(void);
+void dPaneClass_showNullPane(void);
+void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void);
+void J2DAnmLoaderDataBase_NS_load(void);
+void J2DScreen_NS_animation(void);
+void J2DScreen_NS_draw(void);
+void J2DScreen_NS_setPriority(void);
+void rotate__7J2DPaneFff13J2DRotateAxisf(void);
+}
+
 extern "C" {
 // __ct__14dMeterHaihai_cFUc
 // dMeterHaihai_c::dMeterHaihai_c(unsigned char)

src/d/d_meter/d_meter_hakusha.cpp

@@ -3,6 +3,34 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
+extern "C" {
+int strcmp(const char*, const char*);
+void __ct__9J2DScreenFv(void);
+void __dl__FPv(void);
+void __nw__FUl(void);
+void CPaneMgr_NS_getGlobalVtxCenter(void);
+void CPaneMgr_NS_paneTrans(void);
+void CPaneMgr_X1_(void);
+void CPaneMgrAlpha_NS_getAlphaRate(void);
+void CPaneMgrAlpha_NS_hide(void);
+void CPaneMgrAlpha_NS_setAlphaRate(void);
+void CPaneMgrAlpha_NS_show(void);
+void dComIfG_play_c_NS_getLayerNo(int);
+void dMeter2Draw_c_NS_drawPikariHakusha(void);
+void dMeter2Draw_c_NS_setAlphaAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaAnimeMin(void);
+void dMeterHakusha_c_NS_alphaAnimeHakusha(void);
+void dMeterHakusha_c_NS_getHakushaNum(void);
+void dMeterHakusha_c_NS_setAlphaButtonAnimeMax(void);
+void dMeterHakusha_c_NS_setAlphaButtonAnimeMin(void);
+void dMeterHakusha_c_NS_setAlphaHakushaAnimeMax(void);
+void dMeterHakusha_c_NS_setAlphaHakushaAnimeMin(void);
+void dMeterHakusha_c_NS_updateHakusha(void);
+void dPaneClass_showNullPane(void);
+void J2DScreen_NS_draw(void);
+void J2DScreen_NS_setPriority(void);
+}
+
 extern "C" {
 // __ct__15dMeterHakusha_cFPv
 // dMeterHakusha_c::dMeterHakusha_c(void*)

src/d/d_meter/d_meter_map.cpp

@@ -5,6 +5,40 @@
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
+extern "C" {
+bool dComIfGp_checkMapShow(void);
+int strcmp(const char*, const char*);
+void __dl__FPv(void);
+void __nw__FUl(void);
+void cLib_addCalcAngleS__FPsssss(void);
+void dComIfGp_mapHide(void);
+void dComIfGp_mapShow(void);
+void dDlst_list_c_NS_set(void);
+void dMap_c_NS__draw(void);
+void dMap_c_NS__move(void);
+void dMap_c(void);
+void dMapInfo_n_NS_getMapPlayerPos(void);
+void dMeter2Info_set2DVibration(void);
+void dMeterMap_c_NS__create(void);
+void dMeterMap_c_NS__delete(void);
+void dMeterMap_c_NS_checkMoveStatus(void);
+void dMeterMap_c_NS_ctrlShowMap(void);
+void dMeterMap_c_NS_getMapDispSizeTypeNo(void);
+void dMeterMap_c_NS_isDmapScreen(void);
+void dMeterMap_c_NS_isFmapScreen(void);
+void dMeterMap_c_NS_isShow(void);
+void dMeterMap_c_NS_keyCheck(void);
+void dMpath_c_NS_isExistMapPathData(void);
+void dMsgObject_c_NS_getStatus(void);
+void dMw_LEFT_TRIGGER(void);
+void dMw_RIGHT_TRIGGER(void);
+void dStage_roomControl_c_NS_getStatusRoomDt(void);
+void fopOvlpM_IsDoingReq(void);
+void isDungeonItem__12dSv_memBit_cCFi(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void J2DPicture_X3_(void);
+void onEventBit__11dSv_event_cFUs(void);
+}
 
 extern "C" {
 // isEnableDispMap__11dMeterMap_cFv

src/d/d_meter/d_meter_string.cpp

@@ -3,6 +3,36 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
+extern "C" {
+char* strcpy(char*, const char*);
+void __ct__9J2DScreenFv(void);
+void __dl__FPv(void);
+void __nw__FUl(void);
+void animationTransform__7J2DPaneFv(void);
+void CPaneMgr_NS_getGlobalVtxCenter(void);
+void CPaneMgr_NS_paneTrans(void);
+void CPaneMgr_X1_(void);
+void CPaneMgrAlpha_NS_setAlphaRate(void);
+void dComIfG_TimerDeleteRequest(void);
+void dMeter2Draw_c_NS_drawPikari_X1_(void);
+void dMeter2Info_c_NS_getString(void);
+void dMeter2Info_c_NS_resetMeterString(void);
+void dMeterString_c_NS_createString(void);
+void dMeterString_c_NS_drawPikari(void);
+void dMeterString_c_NS_isLeadByte(void);
+void dMeterString_c_NS_playBckAnimation(void);
+void dPaneClass_showNullPane(void);
+void dTimer_createTimer(void);
+void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void);
+void getParentPane__7J2DPaneFv(void);
+void J2DAnmLoaderDataBase_NS_load(void);
+void J2DScreen_NS_draw(void);
+void J2DScreen_NS_setPriority(void);
+void J2DTextBox_NS_getStringPtr(void);
+void J2DTextBox_NS_setString_X1_(void);
+void mDoExt_getMesgFont(void);
+}
+
 extern "C" {
 // __ct__14dMeterString_cFi
 // dMeterString_c::dMeterString_c(int)

src/d/d_meter2.cpp

@@ -5,6 +5,183 @@
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 
+extern "C" {
+int getTimerMode__14dComIfG_play_cFv(void);
+int strcmp(const char*, const char*);
+u32 getBombNum__21dSv_player_item_max_cCFUc(u8);
+u8 dComIfGs_getMixItemIndex(int);
+u8 getBombNum__24dSv_player_item_record_cCFUc(u8);
+unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int);
+void __nw__FUl(void);
+void cLib_addCalc2__FPffff(void);
+void dCam_getBody(void);
+void dCamera_c_NS_CalcSubjectAngle(void);
+void dComIfG_play_c_NS_clearItemBombNumCount(void);
+void dComIfG_play_c_NS_getItemBombNumCount(void);
+void dComIfG_play_c_NS_getLayerNo(int);
+void dComIfG_play_c_NS_setItemBombNumCount(u8, s16);
+void dComIfGp_getSelectItem(void);
+void dComIfGp_getSelectItemMaxNum(void);
+void dComIfGp_getSelectItemNum(void);
+void dComIfGp_getSubHeap2D(void);
+void dComIfGp_offHeapLockFlag(void);
+void dComIfGp_setHeapLockFlag(void);
+void dComIfGp_setSelectItem(int);
+void dComIfGs_getSelectMixItemNoArrowIndex(void);
+void dComIfGs_setMixItemIndex(int, u8);
+void dComIfGs_setSelectItemIndex(int, u8);
+void dDlst_list_c_NS_set(void);
+void dKy_darkworld_check(void);
+void dMeter2_c_NS_alphaAnimeButton(void);
+void dMeter2_c_NS_alphaAnimeButtonCross(void);
+void dMeter2_c_NS_alphaAnimeKantera(void);
+void dMeter2_c_NS_alphaAnimeKey(void);
+void dMeter2_c_NS_alphaAnimeLife(void);
+void dMeter2_c_NS_alphaAnimeLightDrop(void);
+void dMeter2_c_NS_alphaAnimeOxygen(void);
+void dMeter2_c_NS_alphaAnimeRupee(void);
+void dMeter2_c_NS_check2DContents(void);
+void dMeter2_c_NS_checkStatus(void);
+void dMeter2_c_NS_checkSubContents(void);
+void dMeter2_c_NS_emphasisButtonDelete(void);
+void dMeter2_c_NS_isArrowEquip(void);
+void dMeter2_c_NS_isKeyVisible(void);
+void dMeter2_c_NS_isPachinkoEquip(void);
+void dMeter2_c_NS_isShowLightDrop(void);
+void dMeter2_c_NS_killSubContents(void);
+void dMeter2_c_NS_move2DContents(void);
+void dMeter2_c_NS_moveArrowNum(void);
+void dMeter2_c_NS_moveBombNum(void);
+void dMeter2_c_NS_moveBottleNum(void);
+void dMeter2_c_NS_moveButton3D(void);
+void dMeter2_c_NS_moveButtonA(void);
+void dMeter2_c_NS_moveButtonB(void);
+void dMeter2_c_NS_moveButtonC(void);
+void dMeter2_c_NS_moveButtonCross(void);
+void dMeter2_c_NS_moveButtonR(void);
+void dMeter2_c_NS_moveButtonS(void);
+void dMeter2_c_NS_moveButtonXY(void);
+void dMeter2_c_NS_moveButtonZ(void);
+void dMeter2_c_NS_moveKantera(void);
+void dMeter2_c_NS_moveKey(void);
+void dMeter2_c_NS_moveLife(void);
+void dMeter2_c_NS_moveLightDrop(void);
+void dMeter2_c_NS_moveOxygen(void);
+void dMeter2_c_NS_movePachinkoNum(void);
+void dMeter2_c_NS_moveRupee(void);
+void dMeter2_c_NS_moveSubContents(void);
+void dMeter2_c_NS_moveTouchSubMenu(void);
+void dMeter2Draw_c_NS_drawButton3D(void);
+void dMeter2Draw_c_NS_drawButtonA(void);
+void dMeter2Draw_c_NS_drawButtonB(void);
+void dMeter2Draw_c_NS_drawButtonBin(void);
+void dMeter2Draw_c_NS_drawButtonC(void);
+void dMeter2Draw_c_NS_drawButtonCross(void);
+void dMeter2Draw_c_NS_drawButtonR(void);
+void dMeter2Draw_c_NS_drawButtonS(void);
+void dMeter2Draw_c_NS_drawButtonXY(void);
+void dMeter2Draw_c_NS_drawButtonZ(void);
+void dMeter2Draw_c_NS_drawItemNum(void);
+void dMeter2Draw_c_NS_drawKantera(void);
+void dMeter2Draw_c_NS_drawKanteraMeter(void);
+void dMeter2Draw_c_NS_drawKey(void);
+void dMeter2Draw_c_NS_drawLife(void);
+void dMeter2Draw_c_NS_drawLightDrop(void);
+void dMeter2Draw_c_NS_drawOxygen(void);
+void dMeter2Draw_c_NS_drawRupee(void);
+void dMeter2Draw_c_NS_exec(void);
+void dMeter2Draw_c_NS_getActionString(void);
+void dMeter2Draw_c_NS_getButtonCrossParentInitTransY(void);
+void dMeter2Draw_c_NS_getButtonTimer(void);
+void dMeter2Draw_c_NS_getCameraSubject(void);
+void dMeter2Draw_c_NS_getItemSubject(void);
+void dMeter2Draw_c_NS_getNowLightDropRateCalc(void);
+void dMeter2Draw_c_NS_getPlayerSubject(void);
+void dMeter2Draw_c_NS_isBButtonShow(void);
+void dMeter2Draw_c_NS_isButtonVisible(void);
+void dMeter2Draw_c_NS_setAlphaButtonAAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaButtonAAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaButtonAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaButtonAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaButtonBAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaButtonBAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaButtonChange(void);
+void dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaKanteraAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaKanteraAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaKanteraChange(void);
+void dMeter2Draw_c_NS_setAlphaKeyAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaKeyAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaKeyChange(void);
+void dMeter2Draw_c_NS_setAlphaLifeAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaLifeAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaLifeChange(void);
+void dMeter2Draw_c_NS_setAlphaLightDropAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaLightDropAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaLightDropChange(void);
+void dMeter2Draw_c_NS_setAlphaOxygenAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaOxygenAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaOxygenChange(void);
+void dMeter2Draw_c_NS_setAlphaRupeeAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaRupeeAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaRupeeChange(void);
+void dMeter2Draw_c_NS_setButtonIconAAlpha(void);
+void dMeter2Draw_c_NS_setButtonIconAlpha(void);
+void dMeter2Draw_c_NS_setButtonIconBAlpha(void);
+void dMeter2Draw_c_NS_setButtonIconMidonaAlpha(void);
+void dMeter2Draw_c_NS_setItemNum(void);
+void dMeter2Draw_c(void);
+void dMeter2Info_c_NS_decHotSpringTimer(void);
+void dMeter2Info_c_NS_isDirectUseItem(void);
+void dMeter2Info_c_NS_isFloatingMessageVisible(void);
+void dMeter2Info_is2DActiveTouchArea(void);
+void dMeterButton_c_NS__execute(void);
+void dMeterButton_c_NS_hideAll(void);
+void dMeterButton_c_NS_isClose(void);
+void dMeterButton_c_NS_setString(void);
+void dMeterButton_c(void);
+void dMeterHaihai_c(void);
+void dMeterHakusha_c(void);
+void dMeterMap_c_NS__draw(void);
+void dMeterMap_c_NS__move(void);
+void dMeterMap_c_NS_getMapDispEdgeTop(void);
+void dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo(void);
+void dMeterMap_c_NS_meter_map_move(void);
+void dMeterMap_c_NS_setMapAlpha(void);
+void dMeterMap_c(void);  // from d_meter_map
+void dMeterString_c_NS_createString(void);
+void dMeterString_c(void);
+void dMsgObject_c_NS_getStatus(void);
+void dMsgObject_c_NS_isPlaceMessage(void);
+void dMw_HIO_c_NS_getArrowFlag(void);
+void dMw_HIO_c_NS_getBombFlag(void);
+void dMw_HIO_c_NS_getPachinkoFlag(void);
+void dScope_c(void);
+void dTimer_createStockTimer(void);
+void fopMsgM_Create(void);
+void fopMsgM_createExpHeap(void);
+void fopMsgM_destroyExpHeap(void);
+void fopMsgM_setMessageID(void);
+void fopMsgM_setStageLayer(void);
+void freeAll__7JKRHeapFv(void);
+void getBottleNum__24dSv_player_item_record_cCFUc(void);
+void getItem__17dSv_player_item_cCFib(void);
+void getLightDropNum__16dSv_light_drop_cCFUc(void);
+void getRupeeMax__21dSv_player_status_a_cCFv(void);
+void getTotalFreeSize__7JKRHeapCFv(void);
+void heartGaugeOn__11Z2StatusMgrFv(void);
+void isCollectCrystal__20dSv_player_collect_cCFUc(void);
+void isCollectMirror__20dSv_player_collect_cCFUc(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void isLightDropGetFlag__16dSv_light_drop_cCFUc(void);
+void mDoExt_setCurrentHeap(void);
+void onCollectCrystal__20dSv_player_collect_cFUc(void);
+void onCollectMirror__20dSv_player_collect_cFUc(void);
+void setBombNum__24dSv_player_item_record_cFUcUc(void);
+void setItem__17dSv_player_item_cFiUc(void);
+}
+
 extern "C" {
 // _create__9dMeter2_cFv
 // dMeter2_c::_create(void)

src/d/d_meter2/d_meter2_draw.cpp

@@ -5,6 +5,122 @@
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 
+extern "C" {
+char* strcpy(char*, const char*);
+int strcmp(const char*, const char*);
+u16 dComIfGs_getMaxLifeGauge(void);
+void __ct__9J2DScreenFv(void);
+void __dl__FPv(void);
+void __nw__FUl(void);
+void alloc__7JKRHeapFUli(void);
+void animationTransform__7J2DPaneFv(void);
+void appendChild__7J2DPaneFP7J2DPane(void);
+void cLib_addCalc2__FPffff(void);
+void CPaneMgr_NS_getGlobalVtxCenter(void);
+void CPaneMgr_NS_paneTrans(void);
+void CPaneMgr_NS_setBlackWhite(void);
+void CPaneMgr_X1_(void);
+void CPaneMgrAlpha_NS_getAlphaRate(void);
+void CPaneMgrAlpha_NS_hide(void);
+void CPaneMgrAlpha_NS_isVisible(void);
+void CPaneMgrAlpha_NS_setAlphaRate(void);
+void CPaneMgrAlpha_NS_show(void);
+void CPaneMgrAlpha_X1_(void);
+void dCam_getBody(void);
+void dComIfGp_getSelectItem(void);
+void dKantera_icon_c_NS_setAlphaRate(void);
+void dKantera_icon_c_NS_setNowGauge(void);
+void dKantera_icon_c_NS_setPos(void);
+void dKantera_icon_c_NS_setScale(void);
+void dKantera_icon_c(void);
+void dMeter2Draw_c_NS_changeTextureItemB(void);
+void dMeter2Draw_c_NS_changeTextureItemXY(void);
+void dMeter2Draw_c_NS_drawButton3D(void);
+void dMeter2Draw_c_NS_drawButtonA(void);
+void dMeter2Draw_c_NS_drawButtonB(void);
+void dMeter2Draw_c_NS_drawButtonC(void);
+void dMeter2Draw_c_NS_drawButtonCross(void);
+void dMeter2Draw_c_NS_drawButtonR(void);
+void dMeter2Draw_c_NS_drawButtonS(void);
+void dMeter2Draw_c_NS_drawButtonXY(void);
+void dMeter2Draw_c_NS_drawButtonZ(void);
+void dMeter2Draw_c_NS_drawKantera(void);
+void dMeter2Draw_c_NS_drawKanteraScreen(void);
+void dMeter2Draw_c_NS_drawKey(void);
+void dMeter2Draw_c_NS_drawLife(void);
+void dMeter2Draw_c_NS_drawLightDrop(void);
+void dMeter2Draw_c_NS_drawMagic(void);
+void dMeter2Draw_c_NS_drawPikari_X1_(void);
+void dMeter2Draw_c_NS_drawPikari(void);
+void dMeter2Draw_c_NS_drawRupee(void);
+void dMeter2Draw_c_NS_getActionString(void);
+void dMeter2Draw_c_NS_getCanoeFishing(void);
+void dMeter2Draw_c_NS_getFishingType(void);
+void dMeter2Draw_c_NS_getNumberTexture(void);
+void dMeter2Draw_c_NS_init(void);
+void dMeter2Draw_c_NS_initButton(void);
+void dMeter2Draw_c_NS_initButtonCross(void);
+void dMeter2Draw_c_NS_initLife(void);
+void dMeter2Draw_c_NS_initLightDrop(void);
+void dMeter2Draw_c_NS_initMagic(void);
+void dMeter2Draw_c_NS_initRupeeKey(void);
+void dMeter2Draw_c_NS_isBButtonShow(void);
+void dMeter2Draw_c_NS_playPikariBckAnimation(void);
+void dMeter2Draw_c_NS_playPikariBpkAnimation(void);
+void dMeter2Draw_c_NS_setAlphaAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaButtonChange(void);
+void dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMax(void);
+void dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin(void);
+void dMeter2Draw_c_NS_setAlphaKanteraChange(void);
+void dMeter2Draw_c_NS_setAlphaKeyChange(void);
+void dMeter2Draw_c_NS_setAlphaLifeChange(void);
+void dMeter2Draw_c_NS_setAlphaLightDropChange(void);
+void dMeter2Draw_c_NS_setAlphaMagicChange(void);
+void dMeter2Draw_c_NS_setAlphaOxygenChange(void);
+void dMeter2Draw_c_NS_setAlphaRupeeChange(void);
+void dMeter2Draw_c_NS_setItemParamB(void);
+void dMeter2Draw_c_NS_setItemParamX(void);
+void dMeter2Draw_c_NS_setItemParamY(void);
+void dMeter2Draw_c_NS_setItemParamZ(void);
+void dMeter2Info_c_NS_getString(void);
+void dMeter2Info_c_NS_getStringKana(void);
+void dMeter2Info_c_NS_getStringKanji(void);
+void dMeter2Info_c_NS_isDirectUseItem(void);
+void dMeter2Info_c_NS_readItemTexture(void);
+void dMeter2Info_getNumberTextureName(void);
+void dMeter2Info_isItemOpenCheck(void);
+void dMeter2Info_isMapOpenCheck(void);
+void dMeter2Info_set2DVibration(void);
+void dMsgObject_c_NS_getStatus(void);
+void dMsgObject_c_NS_isHowlMessage(void);
+void dMsgObject_getGroupID(void);
+void dPaneClass_showNullPane(void);
+void free__7JKRHeapFPv(void);
+void getGlbResource__10JKRArchiveFUlPCcP10JKRArchive(void);
+void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void);
+void getGlbVtx__7J2DPaneCFUc(void);
+void getItem__17dSv_player_item_cCFib(void);
+void getLightDropNum__16dSv_light_drop_cCFUc(void);
+void isBottleItem__FUc(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void isLightDropGetFlag__16dSv_light_drop_cCFUc(void);
+void J2DAnmLoaderDataBase_NS_load(void);
+void J2DPicture_X3_(void);
+void J2DPicture_X4_(void);
+void J2DScreen_NS_animation(void);
+void J2DScreen_NS_draw(void);
+void J2DScreen_NS_setPriority(void);
+void J2DTextBox_NS_getStringPtr(void);
+void J2DTextBox_NS_setString_X1_(void);
+void mDoExt_getMesgFont(void);
+void mDoExt_setCurrentHeap(void);
+void rotate__7J2DPaneFff13J2DRotateAxisf(void);
+void setBasePosition__7J2DPaneF15J2DBasePosition(void);
+}
+
 extern "C" {
 // __ct__13dMeter2Draw_cFP10JKRExpHeap
 // dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap*)

src/d/d_meter2/d_meter2_info.cpp

@@ -4,6 +4,58 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
+extern "C" {
+char* strcpy(char*, const char*);
+int strcmp(const char*, const char*);
+u8 dComIfGs_getMixItemIndex(int);
+u8 getBombNum__24dSv_player_item_record_cCFUc(u8);
+unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int);
+void __ct__5csXyzFsss(void);
+void __dl__FPv(void);
+void daNpcF_getPlayerInfoFromPlayerList(void);
+void dComIfGp_setSelectItem(int);
+void dComIfGs_setMixItemIndex(int, u8);
+void dComIfGs_setSelectEquipClothes(u8);
+void dComIfGs_setSelectEquipShield(u8);
+void dComIfGs_setSelectEquipSword(u8);
+void dComIfGs_setSelectItemIndex(int, u8);
+void dComIfGs_setWarpItemData_X1_(void);
+void dComIfGs_setWarpMarkFlag(void);
+void DCStoreRangeNoSync(void);
+void dMeter2Info_c_NS_changeWater(void);
+void dMeter2Info_c_NS_get2ndTexture(void);
+void dMeter2Info_c_NS_get3rdTexture(void);
+void dMeter2Info_c_NS_get4thTexture(void);
+void dMeter2Info_c_NS_init(void);
+void dMeter2Info_c_NS_resetWarpStatus(void);
+void dMeter2Info_c_NS_set1stColor(void);
+void dMeter2Info_c_NS_set2ndColor(void);
+void dMeter2Info_c_NS_set3rdColor(void);
+void dMeter2Info_c_NS_set4thColor(void);
+void dMeter2Info_c_NS_setSaveStageName(void);
+void dMeter2Info_c_NS_setWarpInfo(void);
+void dMeterMap_c_NS_isMapOpenCheck(void);
+void dMsgFlow_c_NS_doFlow(void);
+void dMsgFlow_c_NS_dtor(void);
+void dMsgFlow_c_NS_getMsgNo(void);
+void dMsgFlow_c_NS_init(void);
+void dMsgFlow_c(void);
+void dMsgObject_c_NS_setLetterNameID(void);
+void func_80361C24(void);
+void func_803620AC(void);
+void getGlbResource__10JKRArchiveFUlPCcP10JKRArchive(void);
+void getItem__17dSv_player_item_cCFib(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void isLetterGetFlag__17dSv_letter_info_cCFi(void);
+void isLightDropGetFlag__16dSv_light_drop_cCFUc(void);
+void memcpy(void*, const void*, int);
+void offFirstBit__21dSv_player_get_item_cFUc(void);
+void onLetterGetFlag__17dSv_letter_info_cFi(void);
+void readIdxResource__10JKRArchiveFPvUlUl(void);
+void setBombNum__24dSv_player_item_record_cFUcUc(void);
+void setItem__17dSv_player_item_cFiUc(void);
+}
+
 extern "C" {
 // __ct__13dMeter2Info_cFv
 // dMeter2Info_c::dMeter2Info_c(void)

src/d/d_save/d_save.cpp

@@ -1,10 +1,48 @@
 #include "d/d_save/d_save/d_save.h"
-
 #include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "d/d_save/d_save_init/d_save_init.h"
 #include "os/OS.h"
 
+extern "C" {
+char* strcpy(char*, const char*);
+int dStage_roomControl_c_NS_getZoneNo(int);
+u32 getBombNum__21dSv_player_item_max_cCFUc(u8);
+u8 dComIfGs_getBottleMax(void);
+u8 dComIfGs_getMixItemIndex(int);
+unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int);
+void __ct__12dSv_memory_cFv(void);
+void __ct__13dSv_memory2_cFv(void);
+void daObjCarry_c_NS_clrSaveFlag(void);
+void daObjCarry_c_NS_setSaveFlag(void);
+void dComIfGp_setSelectItem(int);
+void dComIfGs_setKeyNum(int, u8);
+void dComIfGs_setMixItemIndex(int, u8);
+void dComIfGs_setSelectItemIndex(int, u8);
+void dMeter2Info_c_NS_getString(void);
+void dMeter2Info_c_NS_setHotSpringTimer(void);
+void dMeter2Info_c_NS_setSaveStageName(void);
+void dSv_item_rename__FUc(void);
+void func_80361D60(void);
+void func_80362324(void);
+void func_8036687C(void);
+void getItem__17dSv_player_item_cCFib(void);
+void getSound__19dSv_player_config_cFv(void);
+void getVibration__19dSv_player_config_cFv(void);
+void init__10dSv_save_cFv(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void isFirstBit__21dSv_player_get_item_cCFUc(void);
+void memcpy(void*, const void*, int);
+void offEventBit__11dSv_event_cFUs(void);
+void onEventBit__11dSv_event_cFUs(void);
+void setBombNum__24dSv_player_item_record_cFUcUc(void);
+void setBottleItemIn__17dSv_player_item_cFUcUc(void);
+void setItem__17dSv_player_item_cFiUc(void);
+void setLineUpItem__17dSv_player_item_cFv(void);
+void setNowVibration__14dComIfG_play_cFUc(u8);
+void setSound__19dSv_player_config_cFUc(void);
+}
+
 inline int dComIfGs_isItemFirstBit(u8 i_no) {
     return g_dComIfG_gameInfo.getSaveFile().getPlayerGetItem().isFirstBit(i_no);
 }
@@ -97,11 +135,13 @@ u16 dSv_player_status_a_c::getRupeeMax(void) const {
     return 0;
 }
 
-BOOL dSv_player_status_a_c::isMagicFlag(u8 i_magic) const {
-    if (i_magic == 0) {
-        return dComIfGs_isEventBit(0x2304);
-    }
-    return (this->mMagicFlag & (u8)(1 << i_magic)) ? TRUE : FALSE;
+asm BOOL dSv_player_status_a_c::isMagicFlag(u8 i_magic) const {
+    nofralloc
+#include "d/d_save/d_save/asm/func_80032AF8.s"
+    // if (i_magic == 0) {
+    //     return dComIfGs_isEventBit(0x2304);
+    // }
+    // return (this->mMagicFlag & (u8)(1 << i_magic)) ? TRUE : FALSE;
 }
 
 void dSv_player_status_b_c::init() {
@@ -463,17 +503,19 @@ u8 dSv_player_item_c::checkBottle(u8 i_item_id) {
     return num_bottles;
 }
 
-int dSv_player_item_c::checkInsectBottle(void) {
-    int i = 0;
-    int j = 0;
-    for (; i < 0x18; i++) {
-        if (dComIfGs_isItemFirstBit(192 + i) &&
-            !dComIfGs_isEventBit(lbl_803A7288.unk0[0x191 + j])) {
-            return 1;
-        }
-        j += 1;
-    }
-    return 0;
+asm int dSv_player_item_c::checkInsectBottle(void){
+    nofralloc
+#include "d/d_save/d_save/asm/func_80033754.s"
+    // int i = 0;
+    // int j = 0;
+    // for (; i < 0x18; i++) {
+    //     if (dComIfGs_isItemFirstBit(192 + i) &&
+    //         !dComIfGs_isEventBit(lbl_803A7288.unk0[0x191 + j])) {
+    //         return 1;
+    //     }
+    //     j += 1;
+    // }
+    // return 0;
 }
 
 u8 dSv_player_item_c::checkEmptyBottle(void) {
@@ -1537,4 +1579,4 @@ asm void dSv_info_c::card_to_memory(char*, int) {
 asm void dSv_info_c::initdata_to_card(char*, int) {
     nofralloc
 #include "d/d_save/d_save/asm/func_80035BD0.s"
-}
+}

src/d/d_save/d_save_HIO.cpp

@@ -2,6 +2,10 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
+extern "C" {
+void isSwitch__12dSv_memBit_cCFi(void);
+}
+
 #ifdef NONMATCHING
 dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() {
     this->__vt = (dSvBit_childSwPerfectionHIO_c_vtable*)0x803C3384;

src/d/d_stage.cpp

@@ -6,6 +6,73 @@
 #include "global.h"
 #include "m_Do/m_Do_Reset/m_Do_Reset.h"
 
+extern "C" {
+char* strcpy(char*, const char*);
+int strcmp(const char*, const char*);
+void __arraydtor_5375(void);
+void __dl__FPv(void);
+void __dla__FPv(void);
+void __nwa__FUlP7JKRHeapi(void);
+void alloc__7JKRHeapFUli(void);
+void alloc__7JKRHeapFUliP7JKRHeap(void);
+void clearRoomItem__13dSv_zoneBit_cFv(void);
+void clearRoomSwitch__13dSv_zoneBit_cFv(void);
+void create__10JKRExpHeapFUlP7JKRHeapb(void);
+void daSus_c_NS_check(void);
+void daSus_c_NS_execute(void);
+void dBgS_NS_GetExitId(void);
+void dBgS_NS_GetRoomId(void);
+void dComIfG_getOldStageRes(void);
+void dComIfG_getStageRes(void);
+void dComIfG_play_c_NS_getLayerNo(int);
+void dComIfGp_setNextStage(void);
+void dEvent_manager_c_NS_create(void);
+void dEvent_manager_c_NS_remove(void);
+void dKy_set_nexttime(void);
+void dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc(void);
+void dMpath_c_NS_setPointer_X1_(void);
+void dMpath_c_NS_setPointer(void);
+void dRes_control_c_NS_deleteRes(void);
+void dRes_control_c_NS_getResInfo(void);
+void dRes_control_c_NS_syncRes(void);
+void dStage_changeScene(void);
+void dStage_KeepDoorInfo_NS_dtor(void);
+void dStage_roomControl_c_NS_SetTimePass(void);
+void dStage_roomStatus_c_NS_dtor(void);
+void dStage_roomStatus_c(void);
+void dSvBit_HIO_c_NS_init(void);
+void dTres_c_NS_addData(void);
+void fopAcM_CreateAppend(void);
+void fopAcM_delete(void);
+void fopAcM_FastCreate(void);
+void fopCamM_Create(void);
+void fopKyM_fastCreate(void);
+void fopMsgM_Create(void);
+void fopScnM_CreateReq(void);
+void fopScnM_SearchByID(void);
+void free__7JKRHeapFPv(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void func_80361C24(void);
+void func_80361CE8(void);
+void func_80361D60(void);
+void func_803664DC(void);
+void func_803665BC(void);
+void func_80368AE8(void);
+void getSave__10dSv_info_cFi(void);
+void init__12dSv_danBit_cFSc(void);
+void init__20dStage_roomControl_cFvZone(void);
+void initFileList2__15dStage_roomDt_cFv(void);
+void initZone__10dSv_info_cFv(void);
+void isActor__10dSv_info_cCFii(void);
+void J3DLightInfo_NS___as(void);
+void mDoExt_destroyExpHeap(void);
+void putSave__10dSv_info_cFi(void);
+void set__19dStage_startStage_cFPCcScsSc(const char*, s8, s16, s8);
+void stage_tgsc_data_class_NS_dtor(void);
+void stage_tgsc_data_class(void);
+void* memalignB__3cMlFiUl(int pAlign, u32 pSize);
+}
+
 #ifdef NONMATCHING
 void dStage_nextStage_c::set(const char* param_1, s8 param_2, s16 param_3, s8 param_4, s8 param_5,
                              u8 param_6) {

src/f/f_pc/f_pc_base.cpp

@@ -12,6 +12,11 @@
 #include "f/f_pc/f_pc_priority.h"
 #include "f/f_pc/f_pc_profile.h"
 
+extern "C" {
+void free__3cMlFPv(void* pPtr);
+void* memalignB__3cMlFiUl(int pAlign, u32 pSize);
+}
+
 extern s32 lbl_80450D04;  // f_pc_base::t_type
 extern s8 lbl_80450D08;
 extern s32 lbl_80450D0C;  // f_pc_base::process_id

src/f/f_pc/f_pc_create_req.cpp

@@ -10,6 +10,10 @@
 #include "f/f_pc/f_pc_layer.h"
 #include "f/f_pc/f_pc_method.h"
 
+extern "C" {
+void* memalignB__3cMlFiUl(int pAlign, u32 pSize);
+}
+
 extern "C" {
 
 BOOL fpcCtRq_isCreatingByID(create_tag* pTag, s32* pId) {

src/f/f_pc/f_pc_manager.cpp

@@ -24,6 +24,15 @@
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
 extern "C" {
+bool dDvdErrorMsg_c_NS_execute(void);
+bool dShutdownErrorMsg_c_NS_execute(void);
+void dDlst_peekZ_c_NS_peekData(dDlst_peekZ_c*);
+void fpcDw_Execute(base_process_class* pProc);
+void fpcDw_Handler(void*, void*);
+base_process_class* fpcFCtRq_Request(layer_class* pLayer, s16 pProcTypeID,
+                                            FastCreateReqFunc param_3, void* param_4, void* pData);
+void* fpcCtIt_JudgeInLayer(u32 pLayerID, cNdIt_MethodFunc pFunc, void* pUserData);
+}
 
 extern u8 lbl_80450D38;
 extern s8 lbl_80450D39;
@@ -31,13 +40,6 @@ extern u8 lbl_80450EC4;
 extern layer_class lbl_803F4DB0;      // f_pc_manager::rootlayer$3716
 extern node_list_class lbl_803F4DDC;  // f_pc_manager::queue$3717
 
-extern void fpcDw_Execute(base_process_class* pProc);
-extern void fpcDw_Handler(void*, void*);
-extern base_process_class* fpcFCtRq_Request(layer_class* pLayer, s16 pProcTypeID,
-                                            FastCreateReqFunc param_3, void* param_4, void* pData);
-extern void* fpcCtIt_JudgeInLayer(u32 pLayerID, cNdIt_MethodFunc pFunc, void* pUserData);
-}
-
 void fpcM_Draw(void* pProc) {
     fpcDw_Execute((base_process_class*)pProc);
 }

src/f/f_pc/f_pc_node_req.cpp

@@ -10,6 +10,13 @@
 #include "f/f_pc/f_pc_layer.h"
 #include "f/f_pc/f_pc_stdcreate_req.h"
 
+extern "C" {
+void free__3cMlFPv(void* pPtr);
+void* memalignB__3cMlFiUl(int pAlign, u32 pSize);
+void sBs_ClearArea(void* pPtr, s32 pSize);
+s32 fpcSCtRq_Request(layer_class*, s16, process_method_func, void*, void*);
+}
+
 // f_pc_node_req::l_fpcNdRq_Queue
 extern node_list_class lbl_803A3A38;
 // f_pc_node_req::clear$2359
@@ -24,8 +31,6 @@ extern cPhs__Handler lbl_803A3AD0[4];
 extern s32 lbl_80450D48;
 extern s8 lbl_80450D4C;
 
-extern "C" {
-
 void fpcNdRq_RequestQTo(node_create_request* pNodeCreateReq) {
     fpcLy_CreatedMesg(pNodeCreateReq->mpLayerClass);
     fpcLy_CancelQTo(&pNodeCreateReq->mProcMthCls);
@@ -290,5 +295,4 @@ s32 fpcNdRq_ReChangeNode(u32 pRequestId, s16 param_2, void* param_3) {
 
 s32 fpcNdRq_ReRequest(u32 pRequestId, s16 param_2, void* param_3) {
     return fpcNdRq_ReChangeNode(pRequestId, param_2, param_3);
-}
 }

src/m_Do/m_Do_DVDError.cpp

@@ -14,11 +14,7 @@ extern "C" {
     void __RAS_OSDisableInterrupts_begin(void);
     void __ct__9JKRThreadFP8OSThreadi(void);
     void __dt__9JKRThreadFv(void);
-    void _restgpr_29(void);
-    void _savegpr_29(void);
     void becomeCurrentHeap__7JKRHeapFv(void);
-    void mDoDvdErr_ThdCleanup(void);
-    void mDoDvdErr_ThdInit(void);
     void mDoDvdErr_Watch(void);
     void mDoDvdThd_NS_suspend(void);
     void mDoExt_getAssertHeap(void);

src/m_Do/m_Do_Reset.cpp

@@ -6,6 +6,23 @@
 #include "global.h"
 
 extern "C" {
+class JSURandomInputStream;
+class mDoCPd_c;
+struct JASTaskThread {
+    u8 unk0[0x2c];
+    OSThread* thread;
+};
+JASTaskThread* JASDvd_NS_getThreadPointer(void);
+s32 JASTaskThread_NS_pause(JASTaskThread*, bool);
+void cAPICPad_recalibrate__Fv(void);
+void getResetData__6mDoRstFv(void);
+void JUTVideo_NS_destroyManager(void);
+void mDoDvdErr_ThdCleanup(void);
+void VIFlush(void);
+void VISetBlack(s32);
+void VIWaitForRetrace(void);
+}
+
 void my_OSCancelAlarmAll(void) {
     return;
 }
@@ -18,7 +35,6 @@ void destroyVideo() {
     VIWaitForRetrace();
     return;
 }
-}
 
 // TODO: cleanup
 void mDoRst_reset(int p1, u32 p2, int p3) {

src/m_Do/m_Do_audio.cpp

@@ -9,6 +9,15 @@
 #include "m_Do/m_Do_Reset/m_Do_Reset.h"
 #include "m_Do/m_Do_main/m_Do_main.h"
 
+extern "C" {
+void __dl__FPv(void);
+void __dt__10JSUPtrListFv(void);
+void adjustSize__12JKRSolidHeapFv(void);
+void changeGroupID__7JKRHeapFUc(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void func_80361C24(void);
+}
+
 void mDoAud_zelAudio_c::reset(void) {
     lbl_80450BBA = false;
 }

src/m_Do/m_Do_controller_pad.cpp

@@ -6,6 +6,17 @@
 #include "m_Do/m_Do_main/m_Do_main.h"
 #include "pad/pad.h"
 
+extern "C" {
+void __ct__10JUTGamePadFQ210JUTGamePad8EPadPort(void);
+void __nw__FUl(void);
+void cLib_memSet__FPviUl(void);
+void convert__8mDoCPd_cFP27interface_of_controller_padP10JUTGamePad(void);
+void getGamePad__10JUTGamePadFi(void);
+void LRlockCheck__8mDoCPd_cFP27interface_of_controller_pad(void);
+void mDoRst_resetCallBack__FiPv(void);
+void read__10JUTGamePadFv(void);
+}
+
 // TODO: m_cpadInfo uses a bad type in a number of the NONMATCHING functions,
 // and references need to be updated to reflect its correct type.
 

src/m_Do/m_Do_main.cpp

@@ -20,6 +20,41 @@ extern u8 lbl_80451A18;
 // extern char lbl_803739A0[0x310];
 
 extern char lbl_803739A0;
+extern "C" {
+int strcmp(const char*, const char*);
+void cDyl_InitAsync(void);
+void CheckHeap1__9HeapCheckFv(void);
+void create__12JKRSolidHeapFUlP7JKRHeapb(void);
+void create__8mDoCPd_cFv(void);
+void dComIfG_inf_c_NS_ct(void);
+void debug__Fv(void);
+void dRes_control_c_NS_dump(void);
+void dump__11JKRAramHeapFv(void);
+void DynamicModuleControlBase_NS_dump(void);
+void fapGm_Create(void);
+void fapGm_Execute(void);
+void fopAcM_initManager(void);
+void getFreeSize__11JKRAramHeapFv(void);
+void getFreeSize__7JKRHeapCFv(void);
+void getTotalFreeSize__11JKRAramHeapFv(void);
+void getTotalFreeSize__7JKRHeapCFv(void);
+void getTotalUsedSize__10JKRExpHeapCFv(void);
+void getUsedCount__9HeapCheckCFv(void);
+void heapDisplay__9HeapCheckCFv(void);
+void JUTAssertion_NS_setMessageCount(void);
+void JUTConsole_NS_clear(void);
+void JUTConsole_NS_dumpToTerminal(void);
+void JUTConsole_NS_getLineOffset(void);
+void JUTConsole_NS_scroll(void);
+void JUTReport__FiiPCce(int, int, const char*, ...);
+void JUTReport_X1_(void);
+void mDoDvdThd_callback_c_NS_create(void);
+void mDoMch_HeapCheckAll(void);
+void mDoMemCd_Ctrl_c_NS_update(void);
+void memcpy(void*, const void*, int);
+void read__8mDoCPd_cFv(void);
+void version_check__Fv(void);
+}
 
 void version_check(void) {
     if ((!strcmp("20Apr2004", "20Apr2004")) && (!strcmp("Patch2", "Patch2"))) {