From c176c969a4586d9ad4f535176ba85c2a2bb4e06e Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 9 Mar 2025 10:05:16 +0100 Subject: [PATCH] Slightly more useful names --- config/SOUE01/symbols.txt | 4 ++-- include/d/d_sc_game.h | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 4593343c..cfac4d4c 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -11115,8 +11115,8 @@ fn_801B9210 = .text:0x801B9210; // type:function size:0x1C dScTitle_c_classInit__Fv = .text:0x801B9230; // type:function size:0x30 __ct__10dScTitle_cFv = .text:0x801B9260; // type:function size:0xFC __dt__9dScGame_cFv = .text:0x801B9360; // type:function size:0x138 -__dt__16SomeM2dThingBaseFv = .text:0x801B94A0; // type:function size:0x58 -__dt__12SomeM2dThingFv = .text:0x801B9500; // type:function size:0x5C +__dt__12ScGameScreenFv = .text:0x801B94A0; // type:function size:0x58 +__dt__21ScGameScreenTargetingFv = .text:0x801B9500; // type:function size:0x5C __dt__47sFStateMgr_c<9dScGame_c,20sStateMethodUsr_FI_c>Fv = .text:0x801B9560; // type:function size:0xA4 __dt__77sStateMgr_c<9dScGame_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801B9610; // type:function size:0xA0 __dt__24sFStateFct_c<9dScGame_c>Fv = .text:0x801B96B0; // type:function size:0x6C diff --git a/include/d/d_sc_game.h b/include/d/d_sc_game.h index 131db005..1bae3b7f 100644 --- a/include/d/d_sc_game.h +++ b/include/d/d_sc_game.h @@ -16,9 +16,9 @@ #include "sized_string.h" #include "toBeSorted/arc_managers/layout_arc_manager.h" -class SomeM2dThingBase : public m2d::Base_c { +class ScGameScreen : public m2d::Base_c { public: - SomeM2dThingBase(u8 priority) { + ScGameScreen(u8 priority) { setPriority(priority); } @@ -26,12 +26,12 @@ private: /* 0x10 */ EGG::Screen mScreen; }; -class SomeM2dThing : public SomeM2dThingBase { +class ScGameScreenTargeting : public ScGameScreen { public: - SomeM2dThing(u8 priority) : SomeM2dThingBase(priority), field_unk(0.0f) {} + ScGameScreenTargeting(u8 priority) : ScGameScreen(priority), mLetterboxAmount(0.0f) {} private: - f32 field_unk; + f32 mLetterboxAmount; }; struct SpawnInfo { @@ -203,8 +203,8 @@ protected: /* 0x0C4 */ LayoutArcControl mLayoutCtrl; /* 0x0D0 */ dFader_c mFader; - /* 0x0F8 */ SomeM2dThing mScreen1; - /* 0x194 */ SomeM2dThingBase mScreen2; + /* 0x0F8 */ ScGameScreenTargeting mScreen1; + /* 0x194 */ ScGameScreen mScreen2; /* 0x228 */ UNKWORD field_0x228; /* 0x22C */ u8 _0x22C[0x230 - 0x22C]; /* 0x230 */ dAcRefBase_c mStageMgrRef;