encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup msg scrn (#2051)

Browse Source 
* msg_scrn_light done

* update include paths

* some cleanup

* fix build
This commit is contained in:
TakaRikka
2024-01-27 11:43:19 +02:00
committed by GitHub
parent 3470c4eb34
commit 7f0ba98c9f
38 changed files with 994 additions and 1218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/msg/scrn/d_msg_scrn_3select.h → include/d/msg/d_msg_scrn_3select.h
View File
include/msg/scrn/d_msg_scrn_arrow.h → include/d/msg/d_msg_scrn_arrow.h
+6 -6
View File
@@ -20,12 +20,12 @@ public:
/* 8023BFC4 */ void dotAnimeInit();
/* 8023C010 */ void dotAnimeMove();
/* 0x04 */ J2DScreen* mScreen;
/* 0x08 */ J2DAnmTransform* mAnmBck;
/* 0x0C */ J2DAnmColor* mAnmBpk;
/* 0x10 */ CPaneMgr* mPaneMgr0;
/* 0x14 */ CPaneMgr* mPaneMgr1;
/* 0x18 */ CPaneMgr* mPaneMgr2;
/* 0x04 */ J2DScreen* mpScreen;
/* 0x08 */ J2DAnmTransform* mpBck;
/* 0x0C */ J2DAnmColor* mpBpk;
/* 0x10 */ CPaneMgr* mpParent_c;
/* 0x14 */ CPaneMgr* mpArw_c;
/* 0x18 */ CPaneMgr* mpDot_c;
/* 0x1C */ f32 mBckFrame;
/* 0x20 */ f32 mBpkFrame;
};
include/msg/scrn/d_msg_scrn_base.h → include/d/msg/d_msg_scrn_base.h
View File
include/msg/scrn/d_msg_scrn_boss.h → include/d/msg/d_msg_scrn_boss.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef MSG_SCRN_D_MSG_SCRN_BOSS_H
#define MSG_SCRN_D_MSG_SCRN_BOSS_H
#include "msg/scrn/d_msg_scrn_base.h"
#include "d/msg/d_msg_scrn_base.h"
class dMsgScrnBoss_c : public dMsgScrnBase_c {
public:
include/msg/scrn/d_msg_scrn_explain.h → include/d/msg/d_msg_scrn_explain.h
+2 -2
View File
@@ -1,7 +1,7 @@
#ifndef MSG_SCRN_D_MSG_SCRN_EXPLAIN_H
#define MSG_SCRN_D_MSG_SCRN_EXPLAIN_H
#include "msg/scrn/d_msg_scrn_base.h"
#include "d/msg/d_msg_scrn_base.h"
class J2DOrthoGraph;
class STControl;
@@ -53,7 +53,7 @@ private:
/* 0x38 */ dMsgScrn3Select_c* mpSelect_c;
/* 0x3C */ COutFont_c* mpOutFont;
/* 0x40 */ J2DPicture* mpBackTex;
/* 0x44 */ STControl* field_0x44;
/* 0x44 */ STControl* mpStick;
/* 0x48 */ f32 field_0x48;
/* 0x4C */ f32 field_0x4c;
/* 0x50 */ f32 field_0x50;
include/msg/scrn/d_msg_scrn_howl.h → include/d/msg/d_msg_scrn_howl.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define MSG_SCRN_D_MSG_SCRN_HOWL_H
#include "dolphin/types.h"
#include "msg/scrn/d_msg_scrn_base.h"
#include "d/msg/d_msg_scrn_base.h"
struct dMsgScrnHowl_c : public dMsgScrnBase_c {
/* 8024096C */ dMsgScrnHowl_c();
include/msg/scrn/d_msg_scrn_item.h → include/d/msg/d_msg_scrn_item.h
View File
include/msg/scrn/d_msg_scrn_jimaku.h → include/d/msg/d_msg_scrn_jimaku.h
View File
include/msg/scrn/d_msg_scrn_kanban.h → include/d/msg/d_msg_scrn_kanban.h
+1 -2
View File
@@ -1,8 +1,7 @@
#ifndef MSG_SCRN_D_MSG_SCRN_KANBAN_H
#define MSG_SCRN_D_MSG_SCRN_KANBAN_H
#include "dolphin/types.h"
#include "msg/scrn/d_msg_scrn_base.h"
#include "d/msg/d_msg_scrn_base.h"
class JKRExpHeap;
class J2DAnmTransform;
include/d/msg/d_msg_scrn_light.h
+33
View File
@@ -0,0 +1,33 @@
#ifndef MSG_SCRN_D_MSG_SCRN_LIGHT_H
#define MSG_SCRN_D_MSG_SCRN_LIGHT_H
#include "JSystem/JUtility/TColor.h"
class J2DScreen;
class J2DAnmTransform;
class J2DAnmColorKey;
class CPaneMgr;
class dMsgScrnLight_c {
public:
/* 80245934 */ dMsgScrnLight_c(u8, u8);
/* 80245C04 */ void draw(f32*, f32, f32, f32, f32, f32, u8);
/* 80245F90 */ void draw(f32*, f32, f32, f32, f32, f32, f32, JUtility::TColor,
JUtility::TColor);
/* 802460DC */ void drawCommon(f32, f32, f32, f32, f32);
/* 80245B00 */ virtual ~dMsgScrnLight_c();
/* 0x04 */ J2DScreen* mpScreen;
/* 0x08 */ J2DAnmTransform* mpBck;
/* 0x0C */ J2DAnmColorKey* mpBpk;
/* 0x10 */ CPaneMgr* mpParent_c;
/* 0x14 */ f32 mBckFrame;
/* 0x18 */ f32 mBpkFrame;
/* 0x1C */ f32 mAlpha;
/* 0x20 */ u8 mColorType;
/* 0x21 */ u8 field_0x21;
/* 0x22 */ bool mPlayAnim;
};
#endif /* MSG_SCRN_D_MSG_SCRN_LIGHT_H */
include/msg/scrn/d_msg_scrn_place.h → include/d/msg/d_msg_scrn_place.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef MSG_SCRN_D_MSG_SCRN_PLACE_H
#define MSG_SCRN_D_MSG_SCRN_PLACE_H
#include "msg/scrn/d_msg_scrn_base.h"
#include "d/msg/d_msg_scrn_base.h"
class dMsgScrnPlace_c : public dMsgScrnBase_c {
public:
include/msg/scrn/d_msg_scrn_staff.h → include/d/msg/d_msg_scrn_staff.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef MSG_SCRN_D_MSG_SCRN_STAFF_H
#define MSG_SCRN_D_MSG_SCRN_STAFF_H
#include "msg/scrn/d_msg_scrn_base.h"
#include "d/msg/d_msg_scrn_base.h"
class dMsgScrnStaff_c : public dMsgScrnBase_c {
public:
include/msg/scrn/d_msg_scrn_talk.h → include/d/msg/d_msg_scrn_talk.h
View File
include/msg/scrn/d_msg_scrn_tree.h → include/d/msg/d_msg_scrn_tree.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef MSG_SCRN_D_MSG_SCRN_TREE_H
#define MSG_SCRN_D_MSG_SCRN_TREE_H
#include "msg/scrn/d_msg_scrn_base.h"
#include "d/msg/d_msg_scrn_base.h"
class JUTFont;
class JKRExpHeap;
include/msg/scrn/d_msg_scrn_light.h
-49
View File
@@ -1,49 +0,0 @@
#ifndef MSG_SCRN_D_MSG_SCRN_LIGHT_H
#define MSG_SCRN_D_MSG_SCRN_LIGHT_H
#include "dolphin/types.h"
#include "JSystem/JUtility/TColor.h"
class J2DScreen;
class J2DAnmTransform;
class J2DAnmColor;
class CPaneMgr;
struct dMsgScrnLight_c {
/* 80245934 */ dMsgScrnLight_c(u8, u8);
/* 80245B00 */ virtual ~dMsgScrnLight_c();
/* 80245C04 */ void draw(f32*, f32, f32, f32, f32, f32, u8);
/* 80245F90 */ void draw(f32*, f32, f32, f32, f32, f32, f32, JUtility::TColor,
JUtility::TColor);
/* 802460DC */ void drawCommon(f32, f32, f32, f32, f32);
/* 0x04 */ J2DScreen* mpScreen;
/* 0x08 */ J2DAnmTransform* field_0x8;
/* 0x0C */ J2DAnmColor* field_0xc;
/* 0x10 */ CPaneMgr* mpParent_c;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ u8 field_0x20;
/* 0x21 */ u8 field_0x21;
/* 0x22 */ u8 field_0x22;
};
struct dMsgScrnLight_HIO_c {
/* 8024575C */ dMsgScrnLight_HIO_c();
/* 802457C4 */ void updateColor(u8);
/* 80246348 */ virtual ~dMsgScrnLight_HIO_c() {}
/* 0x04 */ s8 field_0x4;
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u8 field_0x6[9];
/* 0x0F */ u8 field_0xf[9];
/* 0x18 */ u8 field_0x18[9];
/* 0x21 */ u8 field_0x21[9];
/* 0x2A */ u8 field_0x2a[9];
/* 0x33 */ u8 field_0x33[9];
/* 0x3C */ u8 field_0x3c[9];
/* 0x45 */ u8 field_0x45[9];
};
#endif /* MSG_SCRN_D_MSG_SCRN_LIGHT_H */
obj_files.mk
+14 -14
View File
@@ -204,20 +204,20 @@ O_FILES := \
$(BUILD_DIR)/src/d/msg/d_msg_class.o \
$(BUILD_DIR)/src/d/msg/d_msg_object.o \
$(BUILD_DIR)/src/d/msg/d_msg_unit.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_3select.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_arrow.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_base.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_boss.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_explain.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_item.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_howl.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_jimaku.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_kanban.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_light.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_place.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_staff.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_talk.o \
$(BUILD_DIR)/src/msg/scrn/d_msg_scrn_tree.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_3select.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_arrow.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_base.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_boss.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_explain.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_item.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_howl.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_jimaku.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_kanban.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_light.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_place.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_staff.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_talk.o \
$(BUILD_DIR)/src/d/msg/d_msg_scrn_tree.o \
$(BUILD_DIR)/src/d/msg/d_msg_string_base.o \
$(BUILD_DIR)/src/d/msg/d_msg_string.o \
$(BUILD_DIR)/src/d/msg/d_msg_flow.o \
src/d/menu/d_menu_insect.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include "dolphin/types.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
#include "msg/scrn/d_msg_scrn_3select.h"
#include "d/msg/d_msg_scrn_3select.h"
//
// Forward References:
src/d/menu/d_menu_item_explain.cpp
+2 -2
View File
@@ -24,8 +24,8 @@
#include "dol2asm.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
#include "msg/scrn/d_msg_scrn_3select.h"
#include "msg/scrn/d_msg_scrn_arrow.h"
#include "d/msg/d_msg_scrn_3select.h"
#include "d/msg/d_msg_scrn_arrow.h"
/* 80396950-80396970 022FB0 0020+00 1/1 0/0 0/0 .rodata name_tag$3883 */
static const u64 name_tag[4] = {
src/d/menu/d_menu_letter.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include "dolphin/types.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
#include "msg/scrn/d_msg_scrn_arrow.h"
#include "d/msg/d_msg_scrn_arrow.h"
extern "C" void __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl();
extern "C" void __dt__14dMenu_Letter_cFv();
src/d/menu/d_menu_save.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "m_Do/m_Do_Reset.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
#include "msg/scrn/d_msg_scrn_explain.h"
#include "d/msg/d_msg_scrn_explain.h"
//
// Forward References:

Some files were not shown because too many files have changed in this diff Show More