From 144533e9f97274393d58ee324eca71b9da3ede59 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sat, 5 Apr 2025 22:35:43 +0200 Subject: [PATCH] d_lyt_msg_window_demo OK --- config/SOUE01/symbols.txt | 76 +++++++++++++++++----------------- configure.py | 2 +- include/toBeSorted/lyt_vec2f.h | 9 ++++ 3 files changed, 48 insertions(+), 39 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 2d1ca3f5..598b5153 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -7194,32 +7194,32 @@ fn_80123240 = .text:0x80123240; // type:function size:0x8 LytMsgWindowLink__initStates = .text:0x80123250; // type:function size:0x3F4 __dt__34sFStateID_c<19dLytMsgWindowLink_c>Fv = .text:0x80123650; // type:function size:0x58 isSameName__34sFStateID_c<19dLytMsgWindowLink_c>CFPCc = .text:0x801236B0; // type:function size:0x88 -fn_80123740 = .text:0x80123740; // type:function size:0x2A0 -fn_801239E0 = .text:0x801239E0; // type:function size:0xE0 -fn_80123AC0 = .text:0x80123AC0; // type:function size:0x8 -fn_80123AD0 = .text:0x80123AD0; // type:function size:0x28 -fn_80123B00 = .text:0x80123B00; // type:function size:0x4 -fn_80123B10 = .text:0x80123B10; // type:function size:0x48 -fn_80123B60 = .text:0x80123B60; // type:function size:0x78 -fn_80123BE0 = .text:0x80123BE0; // type:function size:0x4 -fn_80123BF0 = .text:0x80123BF0; // type:function size:0x10C -fn_80123D00 = .text:0x80123D00; // type:function size:0x8 -fn_80123D10 = .text:0x80123D10; // type:function size:0x28 -fn_80123D40 = .text:0x80123D40; // type:function size:0x4 -fn_80123D50 = .text:0x80123D50; // type:function size:0x48 -fn_80123DA0 = .text:0x80123DA0; // type:function size:0x78 -fn_80123E20 = .text:0x80123E20; // type:function size:0x4 -fn_80123E30 = .text:0x80123E30; // type:function size:0xBC -itemTextBoxDrawMaybe = .text:0x80123EF0; // type:function size:0x1EC -fn_801240E0 = .text:0x801240E0; // type:function size:0xC -fn_801240F0 = .text:0x801240F0; // type:function size:0x4C -fn_80124140 = .text:0x80124140; // type:function size:0xC -fn_80124150 = .text:0x80124150; // type:function size:0x4C -fn_801241A0 = .text:0x801241A0; // type:function size:0x7C -fn_80124220 = .text:0x80124220; // type:function size:0x8 -fn_80124230 = .text:0x80124230; // type:function size:0x8 -fn_80124240 = .text:0x80124240; // type:function size:0x8 -LytMsgWindowGet__initStates = .text:0x80124250; // type:function size:0x338 +build__18dLytMsgWindowGet_cFPQ23d2d10ResAccIf_cPQ23d2d10ResAccIf_cP15dTagProcessor_c = .text:0x80123740; // type:function size:0x2A0 +remove__18dLytMsgWindowGet_cFv = .text:0x801239E0; // type:function size:0xE0 +initializeState_Invisible__18dLytMsgWindowGet_cFv = .text:0x80123AC0; // type:function size:0x8 +executeState_Invisible__18dLytMsgWindowGet_cFv = .text:0x80123AD0; // type:function size:0x28 +finalizeState_Invisible__18dLytMsgWindowGet_cFv = .text:0x80123B00; // type:function size:0x4 +initializeState_In__18dLytMsgWindowGet_cFv = .text:0x80123B10; // type:function size:0x48 +executeState_In__18dLytMsgWindowGet_cFv = .text:0x80123B60; // type:function size:0x78 +finalizeState_In__18dLytMsgWindowGet_cFv = .text:0x80123BE0; // type:function size:0x4 +initializeState_Visible__18dLytMsgWindowGet_cFv = .text:0x80123BF0; // type:function size:0x10C +getTextBox__18dLytMsgWindowGet_cFv = .text:0x80123D00; // type:function size:0x8 +executeState_Visible__18dLytMsgWindowGet_cFv = .text:0x80123D10; // type:function size:0x28 +finalizeState_Visible__18dLytMsgWindowGet_cFv = .text:0x80123D40; // type:function size:0x4 +initializeState_Out__18dLytMsgWindowGet_cFv = .text:0x80123D50; // type:function size:0x48 +executeState_Out__18dLytMsgWindowGet_cFv = .text:0x80123DA0; // type:function size:0x78 +finalizeState_Out__18dLytMsgWindowGet_cFv = .text:0x80123E20; // type:function size:0x4 +execute__18dLytMsgWindowGet_cFv = .text:0x80123E30; // type:function size:0xBC +draw__18dLytMsgWindowGet_cFv = .text:0x80123EF0; // type:function size:0x1EC +open__18dLytMsgWindowGet_cFP12dAcObjBase_cUl = .text:0x801240E0; // type:function size:0xC +isDoneOpening__18dLytMsgWindowGet_cCFv = .text:0x801240F0; // type:function size:0x4C +close__18dLytMsgWindowGet_cFv = .text:0x80124140; // type:function size:0xC +isDoneClosing__18dLytMsgWindowGet_cCFv = .text:0x80124150; // type:function size:0x4C +setText__18dLytMsgWindowGet_cFPCw = .text:0x801241A0; // type:function size:0x7C +isDoneDecide__18dLytMsgWindowGet_cCFv = .text:0x80124220; // type:function size:0x8 +startDecide__18dLytMsgWindowGet_cFb = .text:0x80124230; // type:function size:0x8 +startConfirm__18dLytMsgWindowGet_cFv = .text:0x80124240; // type:function size:0x8 +__sinit_\d_lyt_msg_window_get_cpp = .text:0x80124250; // type:function size:0x338 __dt__33sFStateID_c<18dLytMsgWindowGet_c>Fv = .text:0x80124590; // type:function size:0x58 isSameName__33sFStateID_c<18dLytMsgWindowGet_c>CFPCc = .text:0x801245F0; // type:function size:0x88 build__20dLytMsgWindowSword_cFPQ23d2d10ResAccIf_cPQ23d2d10ResAccIf_cP15dTagProcessor_c = .text:0x80124680; // type:function size:0x3A4 @@ -7332,7 +7332,7 @@ isDoneOpening__19dLytMsgWindowDemo_cCFv = .text:0x80127CA0; // type:function siz close__19dLytMsgWindowDemo_cFv = .text:0x80127CF0; // type:function size:0xC isDoneClosing__19dLytMsgWindowDemo_cCFv = .text:0x80127D00; // type:function size:0x4C setText__19dLytMsgWindowDemo_cFPCw = .text:0x80127D50; // type:function size:0x7C -__sinit_\d_lyt_msg_window_demo_cpp = .text:0x80127DD0; // type:function size:0x338 +__sinit_\d_lyt_msg_window_demo_cpp = .text:0x80127DD0; // type:function size:0x338 scope:local __dt__34sFStateID_c<19dLytMsgWindowDemo_c>Fv = .text:0x80128110; // type:function size:0x58 isSameName__34sFStateID_c<19dLytMsgWindowDemo_c>CFPCc = .text:0x80128170; // type:function size:0x88 fn_80128200 = .text:0x80128200; // type:function size:0x8 @@ -32263,11 +32263,11 @@ lbl_8051DBC8 = .data:0x8051DBC8; // type:object size:0x9 data:string lbl_8051DBD4 = .data:0x8051DBD4; // type:object size:0x17 data:string __vt__20dLytMsgWindowStone_c = .data:0x8051DBEC; // type:object size:0x44 __vt__35sFStateID_c<20dLytMsgWindowStone_c> = .data:0x8051DD58; // type:object size:0x34 -lbl_8051DD90 = .data:0x8051DD90; // type:object size:0x18 -lbl_8051DDA8 = .data:0x8051DDA8; // type:object size:0xC -lbl_8051DDB4 = .data:0x8051DDB4; // type:object size:0x18 -lbl_8051DDCC = .data:0x8051DDCC; // type:object size:0x10 -lbl_8051DDDC = .data:0x8051DDDC; // type:object size:0x8C +lbl_8051DD90 = .data:0x8051DD90; // type:object size:0x15 data:string +lbl_8051DDA8 = .data:0x8051DDA8; // type:object size:0xB data:string +lbl_8051DDB4 = .data:0x8051DDB4; // type:object size:0x16 data:string +lbl_8051DDCC = .data:0x8051DDCC; // type:object size:0xD data:string +lbl_8051DDDC = .data:0x8051DDDC; // type:object size:0xE data:string __vt__19dLytMsgWindowDemo_c = .data:0x8051DE68; // type:object size:0x44 __vt__34sFStateID_c<19dLytMsgWindowDemo_c> = .data:0x8051DFD4; // type:object size:0x34 lbl_8051E008 = .data:0x8051E008; // type:object size:0x1C @@ -38213,7 +38213,7 @@ lbl_805725F0 = .sdata:0x805725F0; // type:object size:0x4 data:4byte lbl_805725F8 = .sdata:0x805725F8; // type:object size:0x8 data:4byte lbl_80572600 = .sdata:0x80572600; // type:object size:0x4 data:4byte lbl_80572608 = .sdata:0x80572608; // type:object size:0x8 data:4byte -lbl_80572610 = .sdata:0x80572610; // type:object size:0x8 +lbl_80572610 = .sdata:0x80572610; // type:object size:0x1 lbl_80572618 = .sdata:0x80572618; // type:object size:0x8 data:4byte lbl_80572620 = .sdata:0x80572620; // type:object size:0x8 data:4byte lbl_80572628 = .sdata:0x80572628; // type:object size:0x8 data:4byte @@ -48869,11 +48869,11 @@ StateID_Invisible__20dLytMsgWindowStone_c = .bss:0x805AEF00; // type:object size StateID_In__20dLytMsgWindowStone_c = .bss:0x805AEF40; // type:object size:0x30 data:4byte StateID_Visible__20dLytMsgWindowStone_c = .bss:0x805AEF80; // type:object size:0x30 data:4byte StateID_Out__20dLytMsgWindowStone_c = .bss:0x805AEFC0; // type:object size:0x30 data:4byte -lbl_805AEFF0 = .bss:0x805AEFF0; // type:object size:0x10 -LytMsgWindowDemo__STATE_INVISIBLE = .bss:0x805AF000; // type:object size:0x40 data:4byte -LytMsgWindowDemo__STATE_IN = .bss:0x805AF040; // type:object size:0x40 data:4byte -LytMsgWindowDemo__STATE_VISIBLE = .bss:0x805AF080; // type:object size:0x40 data:4byte -LytMsgWindowDemo__STATE_OUT = .bss:0x805AF0C0; // type:object size:0x30 data:4byte +lbl_805AEFF0 = .bss:0x805AEFF0; // type:object size:0xC +StateID_Invisible__19dLytMsgWindowDemo_c = .bss:0x805AF000; // type:object size:0x30 data:4byte +StateID_In__19dLytMsgWindowDemo_c = .bss:0x805AF040; // type:object size:0x30 data:4byte +StateID_Visible__19dLytMsgWindowDemo_c = .bss:0x805AF080; // type:object size:0x30 data:4byte +StateID_Out__19dLytMsgWindowDemo_c = .bss:0x805AF0C0; // type:object size:0x30 data:4byte lbl_805AF0F0 = .bss:0x805AF0F0; // type:object size:0x10 LytSimpleWindow__STATE_INVISIBLE = .bss:0x805AF100; // type:object size:0x40 data:4byte LytSimpleWindow__STATE_IN = .bss:0x805AF140; // type:object size:0x40 data:4byte diff --git a/configure.py b/configure.py index 14bd55e2..99f33c89 100644 --- a/configure.py +++ b/configure.py @@ -417,7 +417,7 @@ config.libs = [ Object(NonMatching, "d/lyt/msg_window/d_lyt_msg_window_sword.cpp"), Object(Matching, "d/lyt/msg_window/d_lyt_msg_window_wood.cpp"), Object(Matching, "d/lyt/msg_window/d_lyt_msg_window_stone.cpp"), - Object(NonMatching, "d/lyt/msg_window/d_lyt_msg_window_demo.cpp"), + Object(Matching, "d/lyt/msg_window/d_lyt_msg_window_demo.cpp"), Object(NonMatching, "d/lyt/d_lyt_simple_window.cpp"), Object(NonMatching, "d/lyt/d_lyt_auto_caption.cpp"), Object(NonMatching, "d/lyt/d_lyt_auto_explain.cpp"), diff --git a/include/toBeSorted/lyt_vec2f.h b/include/toBeSorted/lyt_vec2f.h index 54bc65c4..cdab4f91 100644 --- a/include/toBeSorted/lyt_vec2f.h +++ b/include/toBeSorted/lyt_vec2f.h @@ -7,6 +7,15 @@ struct LytVec2f { LytVec2f() {} ~LytVec2f() {} + + LytVec2f(const LytVec2f &other) { + set(other.x, other.y); + } + void set(f32 fx, f32 fy) { + x = fx; + y = fy; + } + f32 x; f32 y; };