@@ -55,6 +55,19 @@ StaticVector<Item, NumWitchItemsHf> WitchItems;
5555int BoyItemLevel;
5656Item BoyItem;
5757
58+ /* * Remember currently selected text line from TextLine while displaying a dialog */
59+ int OldTextLine;
60+ /* * Currently selected text line from TextLine */
61+ int CurrentTextLine;
62+ /* * Remember last scroll position */
63+ int OldScrollPos;
64+ /* * Scroll position */
65+ int ScrollPos;
66+ /* * Remember current store while displaying a dialog */
67+ TalkID OldActiveStore;
68+ /* * Temporary item used to hold the item being traded */
69+ Item TempItem;
70+
5871namespace {
5972
6073/* * The current towner being interacted with */
@@ -65,10 +78,6 @@ bool IsTextFullSize;
6578
6679/* * Number of text lines in the current dialog */
6780int NumTextLines;
68- /* * Remember currently selected text line from TextLine while displaying a dialog */
69- int OldTextLine;
70- /* * Currently selected text line from TextLine */
71- int CurrentTextLine;
7281
7382struct STextStruct {
7483 enum Type : uint8_t {
@@ -110,10 +119,6 @@ bool RenderGold;
110119
111120/* * Does the current panel have a scrollbar */
112121bool HasScrollbar;
113- /* * Remember last scroll position */
114- int OldScrollPos;
115- /* * Scroll position */
116- int ScrollPos;
117122/* * Next scroll position */
118123int NextScrollPos;
119124/* * Previous scroll position */
@@ -123,12 +128,6 @@ int8_t CountdownScrollUp;
123128/* * Countdown for the push state of the scroll down button */
124129int8_t CountdownScrollDown;
125130
126- /* * Remember current store while displaying a dialog */
127- TalkID OldActiveStore;
128-
129- /* * Temporary item used to hold the item being traded */
130- Item TempItem;
131-
132131/* * Maps from towner IDs to NPC names. */
133132const char *const TownerNames[] = {
134133 N_ (" Griswold" ),
0 commit comments