From c033afc1f06569638db6a3defd0ca8849f1d50f7 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Fri, 2 May 2025 22:18:21 -0700 Subject: Match some data (#745) * J3DTransform Data * d_map Data * jstudio-object Data * JASBankMgr Data * JASTrack Data * d_particle Data * d_camera Data --- src/d/d_map.cpp | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'src/d/d_map.cpp') diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp index 24581001..092b59be 100644 --- a/src/d/d_map.cpp +++ b/src/d/d_map.cpp @@ -26,6 +26,66 @@ enum { #define Floor_Num (Floor_5F - Floor_B5F + 1) #define Floor_Valid(no) (no >= 0) && (no < Floor_Num) +u8 dMap_c::mCompAlpha; +u8 dMap_c::mAlpha; +u8 dMap_c::mDrawPointCntPlayer; +u8 dMap_c::mDrawPointCntEnemy; +u8 dMap_c::mDrawPointCntAgbCursor; +u8 dMap_c::mTboxNum; +u8 dMap_c::mDoorNum; +u8 dMap_c::mPointFriendNum; +u8 dMap_c::mDrawPointCntShip; +u8 dMap_c::mDrawPointRestartCnt; +u8 dMap_c::mCollectPointDataCnt; +u8 dMap_c::mAGBMapSendStatus; +u8 dMap_c::mSetCursorFlg; +u8 dMap_c::mMapDispMode; +u8 dMap_c::mIconDispMode; +u8 dMap_c::mIconFreeAlpha; +u8 dMap_c::mIconSelfAlpha; +bool dMap_c::mAGBMapSendStopFlg; +u8 dMap_c::mMapAGBCursorFlashFrmCnt; +u8 dMap_c::mPlayerStayAgbMapTypeNow; +u8 dMap_c::mPlayerStayAgbMapTypeOld; +u8 dMap_c::mPlGridX; +u8 dMap_c::mPlGridY; +u8 dMap_c::mPlGridX_Old; +u8 dMap_c::mPlGridY_Old; +u8 dMap_c::mNowFloorNo; +s16 dMap_c::mIconFreePosX; +s16 dMap_c::mIconFreePosY; +u16 dMap_c::mAGBPointValueC; +u16 dMap_c::mAGBPointValueE; +u16 dMap_c::mAGBPointValueAll; +u16 dMap_c::mAGBPointValueRoomAll; +char dMap_c::mAgbSendNowStageName[8]; +int dMap_c::mAgbSendNowRoomNo; +u16 dMap_c::mAgbSendNowDspFloorNo; +u8 dMap_c::mAgbSendNowAgbMapType; +f32 dMap_c::mEnlargementSizeCenterX; +f32 dMap_c::mEnlargementSizeCenterZ; +f32 dMap_c::mEnlargementSizeScaleX; +f32 dMap_c::mEnlargementSizeScaleZ; +u8 dMap_c::mFmapChkPntValue; +int dMap_c::mFmapChkPntData_p; +s16 dMap_c::mDispPosLeftUpX; +s16 dMap_c::mDispPosLeftUpY; +s16 dMap_c::mDispSizeX; +s16 dMap_c::mDispSizeY; +int dMap_c::mScissorOrigY; +int dMap_c::mScissorOrigX; +int dMap_c::mScissorWidth; +int dMap_c::mScissorHeight; +f32 dMap_c::mIconFreeScale; +f32 dMap_c::mIconSelfScale; +f32 dMap_c::mNowCenterX; +f32 dMap_c::mNowCenterZ; +f32 dMap_c::mNowScaleX; +f32 dMap_c::mNowScaleZ; +// ? dMap_c::mGbaSendMapOceanDt; +dMap_RoomInfoCtrl_c dMap_c::mRoomInfoCtrl; +void* dMap_c::mNowRoomInfoP; + static inline int gridPos2GridNo(int i_gridX, int i_gridY) { JUT_ASSERT(0x4a4, (i_gridX >= -3) && (i_gridX <= 3) && (i_gridY >= -3) && (i_gridY <= 3)); return i_gridX + 3 + (i_gridY + 3) * 7; -- cgit v1.2.3