d_menu_map_common OK (#2075)

This commit is contained in:
hatal175
2024-02-18 09:55:58 +02:00
committed by GitHub
parent fa3be5d11d
commit c471449d0e
18 changed files with 519 additions and 3038 deletions
+1 -1
View File
@@ -117,9 +117,9 @@ public:
protected:
JKRArchive();
JKRArchive(s32, EMountMode);
virtual ~JKRArchive();
public:
virtual ~JKRArchive();
bool getDirEntry(SDirEntry*, u32) const;
void* getIdxResource(u32);
void* getResource(u16);
+4 -4
View File
@@ -13,7 +13,7 @@ struct dMenuMapCommon_c {
/* 801C28D8 */ void initiate(JKRArchive*);
/* 801C38E4 */ void drawIcon(f32, f32, f32, f32);
/* 801C3EC4 */ void iconScale(int, f32, f32, f32);
/* 801C43A8 */ void setIconInfo(u8, f32, f32, f32, f32, f32, u8);
/* 801C43A8 */ bool setIconInfo(u8, f32, f32, f32, f32, f32, u8);
/* 801C443C */ void clearIconInfo();
/* 801C4494 */ void setBlendRatio(u8, f32, f32);
/* 801C452C */ void blinkMove(s16);
@@ -38,9 +38,9 @@ struct dMenuMapCommon_c {
/* 0x068 */ dSelect_cursor_c* mpPortalIcon;
/* 0x06C */ u32 _6c;
/* 0x070 */ data _70[128];
/* 0xC70 */ u16 _c70;
/* 0xC72 */ u16 _c72;
/* 0xC74 */ u16 _c74;
/* 0xC70 */ u16 mIconNum;
/* 0xC72 */ s16 _c72;
/* 0xC74 */ s16 _c74;
/* 0xC76 */ u16 _c76;
/* 0xC78 */ float _c78;
/* 0xC7C */ float _c7c;
+46 -92
View File
@@ -1032,99 +1032,53 @@ public:
/* 0x004 */ u8 field_0x4[4];
/* 0x008 */ f32 mPortalCursorScale;
/* 0x00C */ f32 mPortalIconScale;
/* 0x010 */ f32 mDestinationScale;
/* 0x014 */ f32 mDungeonDestScale;
/* 0x018 */ f32 mDestinationZoomScale;
/* 0x01C */ f32 mDungeonDestZoomScale;
/* 0x020 */ f32 field_0x20;
/* 0x024 */ f32 mBossScale;
/* 0x028 */ f32 field_0x28;
/* 0x02C */ f32 mBossZoomScale;
/* 0x030 */ f32 field_0x30;
/* 0x034 */ f32 mGanonScale;
/* 0x038 */ f32 field_0x38;
/* 0x03C */ f32 mGanonZoomScale;
/* 0x040 */ f32 mDungeonEntranceScale;
/* 0x044 */ f32 mDungeonExitScale;
/* 0x048 */ f32 mDungeonEntranceZoomScale;
/* 0x04C */ f32 mDungeonExitZoomScale;
/* 0x050 */ f32 field_0x50;
/* 0x054 */ f32 mSmallKeyScale;
/* 0x058 */ f32 field_0x58;
/* 0x05C */ f32 mSmallKeyZoomScale;
/* 0x060 */ f32 field_0x60;
/* 0x064 */ f32 mChestScale;
/* 0x068 */ f32 field_0x68;
/* 0x06C */ f32 mChestZoomScale;
/* 0x070 */ f32 mYetoScale;
/* 0x074 */ f32 field_0x74;
/* 0x078 */ f32 mYetoZoomScale;
/* 0x07C */ f32 field_0x7c;
/* 0x080 */ f32 mYetaScale;
/* 0x084 */ f32 field_0x84;
/* 0x088 */ f32 mYetaZoomScale;
/* 0x08C */ f32 field_0x8c;
/* 0x090 */ f32 mGoldWolfScale;
/* 0x094 */ f32 field_0x94;
/* 0x098 */ f32 mGoldWolfZoomScale;
/* 0x09C */ f32 field_0x9c;
/* 0x0A0 */ f32 field_0xa0;
/* 0x0A4 */ f32 mMonkeyScale;
/* 0x0A8 */ f32 field_0xa8;
/* 0x0AC */ f32 mMonkeyZoomScale;
/* 0x0B0 */ f32 field_0xb0;
/* 0x0B4 */ f32 mOoccooScale;
/* 0x0B8 */ f32 field_0xb8;
/* 0x0BC */ f32 mOoccooZoomScale;
/* 0x0C0 */ f32 field_0xc0;
/* 0x0C4 */ f32 mOoccooPotScale;
/* 0x0C8 */ f32 field_0xc8;
/* 0x0CC */ f32 mOoccooPotZoomScale;
/* 0x0D0 */ f32 field_0xd0;
/* 0x0D4 */ f32 mCopyRodStatueScale;
/* 0x0D8 */ f32 field_0xd8;
/* 0x0DC */ f32 mCopyRodStatueZoomScale;
/* 0x0E0 */ f32 mWagonScale;
/* 0x0E4 */ f32 field_0xe4;
/* 0x0E8 */ f32 mWagonZoomScale;
/* 0x0EC */ f32 field_0xec;
/* 0x0F0 */ f32 mLinkScale;
/* 0x0F4 */ f32 mDungeonLinkScale;
/* 0x0F8 */ f32 mLinkZoomScale;
/* 0x0FC */ f32 mDungeonLinkZoomScale;
/* 0x100 */ f32 mRoomEntranceScale;
/* 0x104 */ f32 mDungeonSpawnScale;
/* 0x108 */ f32 mRoomEntranceZoomScale;
/* 0x10C */ f32 mDungeonSpawnZoomScale;
/* 0x110 */ f32 mLV8EntranceScale;
/* 0x114 */ f32 field_0x114;
/* 0x118 */ f32 mLV8EntranceZoomScale;
/* 0x11C */ f32 field_0x11c;
/* 0x120 */ f32 field_0x120;
/* 0x124 */ f32 mDungeonWarpScale;
/* 0x128 */ f32 field_0x128;
/* 0x12C */ f32 mDungeonWarpZoomScale;
/* 0x130 */ f32 mLightDropScale;
/* 0x134 */ f32 field_0x134;
/* 0x138 */ f32 mLightDropZoomScale;
/* 0x13C */ f32 field_0x13c;
/* 0x140 */ f32 field_0x140;
/* 0x144 */ f32 mLightOrbScale;
/* 0x148 */ f32 field_0x148;
/* 0x14C */ f32 mLightOrbZoomScale;
/* 0x150 */ f32 field_0x150;
/* 0x154 */ f32 mCannonBallScale;
/* 0x158 */ f32 field_0x158;
/* 0x15C */ f32 mCannonBallZoomScale;
/* 0x160 */ f32 mLightDropFlashStartScaleOut;
/* 0x164 */ f32 mLightDropFlashStartScaleIn;
/* 0x168 */ f32 mLightDropFlashEndScaleOut;
/* 0x16C */ f32 mLightDropFlashEndScaleIn;
/* 0x010 */ f32 mDestinationScale[2];
/* 0x018 */ f32 mDestinationZoomScale[2];
/* 0x020 */ f32 mBossScale[2];
/* 0x028 */ f32 mBossZoomScale[2];
/* 0x030 */ f32 mGanonScale[2];
/* 0x038 */ f32 mGanonZoomScale[2];
/* 0x040 */ f32 mDungeonEntranceScale[2];
/* 0x048 */ f32 mDungeonEntranceZoomScale[2];
/* 0x050 */ f32 mSmallKeyScale[2];
/* 0x058 */ f32 mSmallKeyZoomScale[2];
/* 0x060 */ f32 mChestScale[2];
/* 0x068 */ f32 mChestZoomScale[2];
/* 0x070 */ f32 mYetoScale[2];
/* 0x078 */ f32 mYetoZoomScale[2];
/* 0x080 */ f32 mYetaScale[2];
/* 0x088 */ f32 mYetaZoomScale[2];
/* 0x090 */ f32 mGoldWolfScale[2];
/* 0x098 */ f32 mGoldWolfZoomScale[2];
/* 0x0A0 */ f32 mMonkeyScale[2];
/* 0x0A8 */ f32 mMonkeyZoomScale[2];
/* 0x0B0 */ f32 mOoccooScale[2];
/* 0x0B8 */ f32 mOoccooZoomScale[2];
/* 0x0C0 */ f32 mOoccooPotScale[2];
/* 0x0C8 */ f32 mOoccooPotZoomScale[2];
/* 0x0D0 */ f32 mCopyRodStatueScale[2];
/* 0x0D8 */ f32 mCopyRodStatueZoomScale[2];
/* 0x0E0 */ f32 mWagonScale[2];
/* 0x0E8 */ f32 mWagonZoomScale[2];
/* 0x0F0 */ f32 mLinkScale[2];
/* 0x0F8 */ f32 mLinkZoomScale[2];
/* 0x100 */ f32 mRoomEntranceScale[2];
/* 0x108 */ f32 mRoomEntranceZoomScale[2];
/* 0x110 */ f32 mLV8EntranceScale[2];
/* 0x118 */ f32 mLV8EntranceZoomScale[2];
/* 0x120 */ f32 mDungeonWarpScale[2];
/* 0x128 */ f32 mDungeonWarpZoomScale[2];
/* 0x130 */ f32 mLightDropScale[2];
/* 0x138 */ f32 mLightDropZoomScale[2];
/* 0x140 */ f32 mLightOrbScale[2];
/* 0x148 */ f32 mLightOrbZoomScale[2];
/* 0x150 */ f32 mCannonBallScale[2];
/* 0x158 */ f32 mCannonBallZoomScale[2];
/* 0x160 */ f32 mLightDropFlashStartScaleOut[2];
/* 0x168 */ f32 mLightDropFlashEndScaleOut[2];
/* 0x170 */ s16 mLightDropFlashFrameNum;
/* 0x172 */ u8 mLightDropFlashStartAlphaOut;
/* 0x173 */ u8 mLightDropFlashStartAlphaIn;
/* 0x174 */ u8 mLightDropFlashEndAlphaOut;
/* 0x175 */ u8 mLightDropFlashEndAlphaIn;
/* 0x172 */ u8 mLightDropFlashStartAlphaOut[2];
/* 0x174 */ u8 mLightDropFlashEndAlphaOut[2];
/* 0x176 */ bool mLV5DungeonItemDebug;
/* 0x177 */ u8 mLV5DungeonItem;
/* 0x178 */ bool mIconDebug;