mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-01 16:29:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_menu_insect basically OK, optimizations, match one func in d_menu_ring (#1934)

Browse Source 
* next d_menu_insect pass

* work on d_menu_ring & d_menu_insect

* d_menu_insect basically OK

* remove unused asm
This commit is contained in:
Trueffel
2023-09-18 06:39:57 +02:00
committed by GitHub
parent db8c99ad49
commit f8f258b5b6
25 changed files with 323 additions and 1794 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/menu/d_menu_insect.h
+4 -4
View File
@@ -1,6 +1,7 @@
#ifndef D_MENU_D_MENU_INSECT_H
#define D_MENU_D_MENU_INSECT_H
#include "d/com/d_com_inf_game.h"
#include "d/d_drawlist.h"
class CPaneMgr;
@@ -68,19 +69,18 @@ private:
/* 0x28 */ J2DScreen* mpIconScreen;
/* 0x2C */ J2DTextBox* mpAButtonString[5];
/* 0x40 */ J2DTextBox* mpBButtonString[5];
/* 0x54 */ J2DTextBox* field_0x54;
/* 0x58 */ J2DTextBox* field_0x58;
/* 0x54 */ J2DPicture* field_0x54[2];
/* 0x5C */ J2DTextBox* field_0x5c;
/* 0x60 */ J2DPicture* mpBlackTex;
/* 0x64 */ CPaneMgr* mpParent;
/* 0x68 */ CPaneMgr* mpExpParent;
/* 0x6C */ CPaneMgr* mpINSParent[24];
/* 0x6C */ CPaneMgr* mpINSParent[MAX_INSECT_NUM];
/* 0xCC */ CPaneMgr* mpInfoText;
/* 0xD0 */ CPaneMgr* mpExpSubWin[2];
/* 0xD8 */ CPaneMgr* mpButtonAB[2];
/* 0xE0 */ CPaneMgr* mpButtonText[2];
/* 0xE8 */ dMsgString_c* mpString;
/* 0xEC */ void* mpExpItemTex;
/* 0xEC */ ResTIMG* mpExpItemTex;
/* 0xF0 */ s16 field_0xf0;
/* 0xF2 */ u8 mStatus;
/* 0xF3 */ u8 field_0xf3;
include/d/save/d_save.h
+1
View File
@@ -14,6 +14,7 @@
#define MAX_ITEM_SLOTS 24
#define LIGHT_DROP_STAGE 4
#define LETTER_INFO_BIT 64
#define MAX_INSECT_NUM 24
#define BOMB_BAG_MAX 3
#define BOTTLE_MAX 4
#define TBOX_MAX 64
include/msg/scrn/d_msg_scrn_3select.h
+52 -3
View File
@@ -1,7 +1,15 @@
#ifndef MSG_SCRN_D_MSG_SCRN_3SELECT_H
#define MSG_SCRN_D_MSG_SCRN_3SELECT_H
#include "dolphin/types.h"
#include "d/d_drawlist.h"
class J2DScreen;
class J2DAnmTransform;
class J2DAnmColor;
class J2DAnmTextureSRTKey;
class dSelect_cursor_c;
class CPaneMgr;
class J2DTextBox;
class dMsgScrn3Select_c {
public:
@@ -32,7 +40,48 @@ public:
/* 8023B4AC */ void selectTrans();
/* 8023B870 */ void selectAnimeTransform(int);
u8 field_0x0[0x114];
};
void setOffsetX(f32 i_offsetX) { mOffsetX = i_offsetX; }
private:
/* 0x004 */ J2DScreen* mpScreen;
/* 0x008 */ J2DAnmTransform* mpAnmBck;
/* 0x00C */ J2DAnmColor* mpAnmBpk;
/* 0x010 */ J2DAnmTextureSRTKey* mpAnmBtk;
/* 0x014 */ dSelect_cursor_c* mpSelectCursor;
/* 0x018 */ CPaneMgr* mpParent;
/* 0x01C */ CPaneMgr* mpTouchArea[3];
/* 0x028 */ J2DTextBox* mpTmrSel_c[3];
/* 0x034 */ CPaneMgr* mpSel_c[3];
/* 0x040 */ CPaneMgr* mpSelCld_c[3];
/* 0x04C */ CPaneMgr* mpSelCldr_c[3];
/* 0x058 */ CPaneMgr* mpSelCldm_c[3];
/* 0x064 */ CPaneMgr* mpSelCldw_c[5][3];
/* 0x0A0 */ CPaneMgr* mpSelPo_c[3];
/* 0x0AC */ CPaneMgr* mpKahen_c[3];
/* 0x0B8 */ CPaneMgr* mpCursor_c[3];
/* 0x0C4 */ JUtility::TColor field_0xc4;
/* 0x0C8 */ JUtility::TColor field_0xc8;
/* 0x0CC */ u8 field_0xcc[0xF0 - 0xCC];
/* 0x0F0 */ f32 field_0xf0;
/* 0x0F4 */ f32 field_0xf4;
/* 0x0F8 */ f32 field_0xf8;
/* 0x0FC */ f32 mOffsetX;
/* 0x100 */ f32 field_0x100;
/* 0x104 */ f32 field_0x104;
/* 0x108 */ u8 field_0x108;
/* 0x109 */ u8 field_0x109[0x10A - 0x109];
/* 0x10A */ s16 field_0x10a;
/* 0x10C */ s16 field_0x10c;
/* 0x10E */ u8 field_0x10e;
/* 0x10F */ u8 field_0x10f;
/* 0x110 */ u8 field_0x110;
/* 0x111 */ u8 field_0x111;
/* 0x112 */ u8 field_0x112;
/* 0x113 */ u8 field_0x113;
/* 0x114 */ u8 field_0x114;
/* 0x115 */ u8 field_0x115;
/* 0x116 */ u8 field_0x116;
/* 0x117 */ u8 field_0x117;
}; // Size: 0x118
#endif /* MSG_SCRN_D_MSG_SCRN_3SELECT_H */