diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/.wsuo b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/.wsuo index 112515f..9a66055 100644 Binary files a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/.wsuo and b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/.wsuo differ diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db index 32ef17f..7c25c38 100644 Binary files a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db and b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db differ diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/DocumentLayout.json b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/DocumentLayout.json index 3f1751d..8065e6a 100644 --- a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/DocumentLayout.json +++ b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/DocumentLayout.json @@ -6,6 +6,38 @@ "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:decor.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\event.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:event.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:decor.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\def.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:def.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\misc.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:misc.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\sound.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:sound.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\event.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:event.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\action.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:action.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\tables.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:tables.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\pixmap.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:pixmap.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" @@ -14,34 +46,14 @@ "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\pixmap.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:pixmap.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\event.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:event.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" - }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\jauge.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:jauge.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:decor.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\event.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:event.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" - }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\text.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:text.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\sound.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:sound.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\action.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:action.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" - }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}" @@ -62,10 +74,6 @@ "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:button.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\def.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", - "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:def.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" - }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\ddutil.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:ddutil.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" @@ -86,37 +94,52 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 4, + "SelectedChildIndex": 5, "Children": [ { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 3, "Title": "def.h", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\def.h", "RelativeDocumentMoniker": "def.h", "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\def.h", "RelativeToolTip": "def.h", - "ViewState": "AQIAAFICAAAAAAAAAAAAAFwCAAAWAAAA", + "ViewState": "AQIAADAAAAAAAAAAAAAAAEwAAAAZAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", "WhenOpened": "2024-06-03T13:35:08.061Z", - "IsPinned": true + "IsPinned": true, + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 1, "Title": "event.cpp", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\event.cpp", "RelativeDocumentMoniker": "event.cpp", "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\event.cpp", "RelativeToolTip": "event.cpp", - "ViewState": "AQIAALQGAAAAAAAAAAAAAGcIAAAIAAAA", + "ViewState": "AQIAAJMAAAAAAAAAAAAAAF8AAAAIAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", "WhenOpened": "2024-06-05T15:46:32.188Z", - "IsPinned": true + "IsPinned": true, + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 4, + "Title": "misc.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\misc.cpp", + "RelativeDocumentMoniker": "misc.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\misc.cpp", + "RelativeToolTip": "misc.cpp", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-11T13:52:38.85Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, "Title": "action.h", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\action.h", "RelativeDocumentMoniker": "action.h", @@ -124,7 +147,8 @@ "RelativeToolTip": "action.h", "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", - "WhenOpened": "2024-06-06T14:48:26.328Z" + "WhenOpened": "2024-06-06T14:48:26.328Z", + "EditorCaption": "" }, { "$type": "Document", @@ -134,9 +158,10 @@ "RelativeDocumentMoniker": "event.h", "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\event.h", "RelativeToolTip": "event.h", - "ViewState": "AQIAAEIAAAAAAAAAAAAAAEYAAAARAAAA", + "ViewState": "AQIAAAMAAAAAAAAAAAAWwBUAAAASAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", - "WhenOpened": "2024-06-05T16:14:42.084Z" + "WhenOpened": "2024-06-05T16:14:42.084Z", + "EditorCaption": "" }, { "$type": "Document", @@ -146,38 +171,31 @@ "RelativeDocumentMoniker": "decor.cpp", "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.cpp", "RelativeToolTip": "decor.cpp", - "ViewState": "AQIAAIIBAAAAAAAAAAAAAIsBAAAAAAAA", + "ViewState": "AQIAAP0DAAAAAAAAAAAIwBIEAAAiAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", "WhenOpened": "2024-06-03T13:22:46.652Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 2, "Title": "decor.h", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.h", "RelativeDocumentMoniker": "decor.h", "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decor.h", "RelativeToolTip": "decor.h", - "ViewState": "AQIAACwCAAAAAAAAAAAAADcCAAAYAAAA", + "ViewState": "AQIAAD8CAAAAAAAAAAAIwFUCAAAYAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", - "WhenOpened": "2024-06-06T13:28:47.781Z" + "WhenOpened": "2024-06-06T13:28:47.781Z", + "EditorCaption": "" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" }, { "$type": "Document", - "DocumentIndex": 12, - "Title": "decblupi.cpp", - "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decblupi.cpp", - "RelativeDocumentMoniker": "decblupi.cpp", - "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decblupi.cpp", - "RelativeToolTip": "decblupi.cpp", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-06-03T15:31:53.081Z" - }, - { - "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 5, "Title": "sound.cpp", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\sound.cpp", "RelativeDocumentMoniker": "sound.cpp", @@ -185,11 +203,25 @@ "RelativeToolTip": "sound.cpp", "ViewState": "AQIAAH8CAAAAAAAAAAAAAIUCAAACAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-06-06T17:04:46.211Z" + "WhenOpened": "2024-06-06T17:04:46.211Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 8, + "Title": "tables.h", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\tables.h", + "RelativeDocumentMoniker": "tables.h", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\tables.h", + "RelativeToolTip": "tables.h", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAIAAAAMAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", + "WhenOpened": "2024-06-10T13:08:09.936Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 11, "Title": "jauge.cpp", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\jauge.cpp", "RelativeDocumentMoniker": "jauge.cpp", @@ -201,7 +233,19 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 15, + "Title": "decblupi.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decblupi.cpp", + "RelativeDocumentMoniker": "decblupi.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\decblupi.cpp", + "RelativeToolTip": "decblupi.cpp", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-03T15:31:53.081Z" + }, + { + "$type": "Document", + "DocumentIndex": 12, "Title": "text.cpp", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\text.cpp", "RelativeDocumentMoniker": "text.cpp", @@ -213,7 +257,19 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 16, + "Title": "button.cpp", + "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.cpp", + "RelativeDocumentMoniker": "button.cpp", + "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.cpp", + "RelativeToolTip": "button.cpp", + "ViewState": "AQIAAHIAAAAAAAAAAAAAAIEAAAAjAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", + "WhenOpened": "2024-06-03T14:57:00.84Z" + }, + { + "$type": "Document", + "DocumentIndex": 13, "Title": "README.md", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\README.md", "RelativeDocumentMoniker": "README.md", @@ -225,7 +281,7 @@ }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 14, "Title": "actions.h", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\actions.h", "RelativeDocumentMoniker": "actions.h", @@ -237,23 +293,7 @@ }, { "$type": "Document", - "DocumentIndex": 13, - "Title": "button.cpp", - "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.cpp", - "RelativeDocumentMoniker": "button.cpp", - "ToolTip": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.cpp", - "RelativeToolTip": "button.cpp", - "ViewState": "AQIAAHIAAAAAAAAAAAAAAIEAAAAjAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-06-03T14:57:00.84Z" - }, - { - "$type": "Bookmark", - "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" - }, - { - "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 9, "Title": "pixmap.cpp", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\pixmap.cpp", "RelativeDocumentMoniker": "pixmap.cpp", @@ -265,7 +305,7 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 10, "Title": "pixmap.h", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\pixmap.h", "RelativeDocumentMoniker": "pixmap.h", @@ -277,7 +317,7 @@ }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 17, "Title": "button.h", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\button.h", "RelativeDocumentMoniker": "button.h", @@ -289,7 +329,7 @@ }, { "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 20, "Title": "CppProperties.json", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\CppProperties.json", "RelativeDocumentMoniker": "CppProperties.json", @@ -301,7 +341,7 @@ }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 19, "Title": "blupi.cpp", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\blupi.cpp", "RelativeDocumentMoniker": "blupi.cpp", @@ -313,7 +353,7 @@ }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 18, "Title": "ddutil.cpp", "DocumentMoniker": "C:\\Users\\JonAd\\source\\repos\\HMVocaloid\\Speedy-Eggbert-2-Source-Code-Decomp\\ddutil.cpp", "RelativeDocumentMoniker": "ddutil.cpp", diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 87fee35..46f91fd 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.command.1.tlog b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.command.1.tlog new file mode 100644 index 0000000..46b134b --- /dev/null +++ b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/CL.command.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/Speedy Eggbert 2 Source.lastbuildstate b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/Speedy Eggbert 2 Source.lastbuildstate new file mode 100644 index 0000000..d0a128b --- /dev/null +++ b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/Speedy Eggbert 2 Source.lastbuildstate @@ -0,0 +1,2 @@ +PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.40.33807:TargetPlatformVersion=10.0.22621.0: +Debug|Win32|C:\Users\JonAd\Source\Repos\HMVocaloid\Speedy-Eggbert-2-Source-Code-Decomp\| diff --git a/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/unsuccessfulbuild b/Speedy E.e424a3cb/Debug/Speedy E.e424a3cb.tlog/unsuccessfulbuild new file mode 100644 index 0000000..e69de29 diff --git a/Speedy E.e424a3cb/Debug/vc143.idb b/Speedy E.e424a3cb/Debug/vc143.idb new file mode 100644 index 0000000..bcb9464 Binary files /dev/null and b/Speedy E.e424a3cb/Debug/vc143.idb differ diff --git a/Speedy E.e424a3cb/Debug/vc143.pdb b/Speedy E.e424a3cb/Debug/vc143.pdb new file mode 100644 index 0000000..3bbb366 Binary files /dev/null and b/Speedy E.e424a3cb/Debug/vc143.pdb differ diff --git a/decor.cpp b/decor.cpp index 1ed0877..a776afa 100644 --- a/decor.cpp +++ b/decor.cpp @@ -603,6 +603,19 @@ int CDecor::SoundEnviron(int sound, int obstacle) return sound; } +void CDecor::PlaySound(int sound, POINT pos) +{ + { + if (m_blupiHide && (sound == 1 || sound == 2 || sound == 3 || sound == 4 || sound == 5 || sound == 6 || sound == 7 || sound == 20 || sound == 21 || sound == 22 || sound == 23 || sound == 24 || sound == 25 || sound == 27 || sound == 32 || sound == 34 || sound == 35 || sound == 36 || sound == 37 || sound == 38 || sound == 39 || sound == 40 || sound == 46 || sound == 47 || sound == 48 || sound == 49 || sound == 64 || sound == 65 || sound == 78 || sound == 79 || sound == 80 || sound == 81 || sound == 82 || sound == 83 || sound == 84 || sound == 85 || sound == 86 || sound == 87 || sound == 88 || sound == 89 || sound == 90 || sound == 91)) + { + return; + } + pos.x -= m_posDecor.y; + pos.y -= m_posDecor.y; + m_pSound->PlayImage(sound, pos); + } +} + void CDecor::StopSound(CSound sound) { m_pSound->StopSound(sound); @@ -650,6 +663,8 @@ void CDecor::AdaptMotorVehicleSound() return; } +// TODO: Add VehicleSoundsPhase + void CDecor::UpdateCaisse() { m_nbRankCaisse = 0; @@ -1000,6 +1015,33 @@ void CDecor::CheatAction(int cheat, MoveObject moveObject) } } } + if (cheat == cheat_roundshield) + { + m_blupiPos->PlaySound(42); + m_blupiShield = TRUE; + m_blupiPower = FALSE; + m_blupiCloud = FALSE; + m_blupiHide = FALSE; + m_blupiTimeShield = 100; + m_blupiPosMagic = m_blupiPos; + m_jauges[1]->SetHide(FALSE); + } + if (cheat == cheat_quicklollipop) + { + m_blupiAction = 49; + m_blupiPhase = 0; + m_blupiHelico = FALSE; + m_blupiOver = FALSE; + m_blupiJeep = FALSE; + m_blupiTank = FALSE; + m_blupiSkate = FALSE; + m_blupiShield = FALSE; + m_blupiPower = FALSE; + m_blupiCloud = FALSE; + m_blupiHide = FALSE; + m_blupiFocus = FALSE; + m_blupiPos->PlaySound(50); + } } BOOL CDecor::GetInvincible() @@ -1451,6 +1493,95 @@ BOOL CDecor::DecorDetect(RECT rect, BOOL bCaisse) return FALSE; } +BOOL CDecor::TestPath(RECT rect, POINT start, POINT end) +{ + int num = abs(end.x - start.x); + int num2 = abs(end.y - start.y); + + POINT tinyPoint = start; + if (num > num2) + { + RECT rect2; + if (end.x > start.x) + { + for (int i = 0; i <= num; i++) + { + int j = i * (end.y - start.y) / num; + rect2.left = rect.left + i; + rect2.right = rect.right + i; + rect2.top = rect.top + j; + rect2.bottom = rect.bottom + j; + if (DecorDetect(rect2)) + { + end = tinyPoint; + return FALSE; + } + tinyPoint.x = start.x + i; + tinyPoint.y = start.y + j; + } + } + if (end.x < start.x) + { + for (int i = 0; i >= -num; i--) + { + int j = i * (start.y - end.y) / num; + rect2.left = rect.left + i; + rect2.right = rect.right + i; + rect2.top = rect.top + j; + rect2.bottom = rect.bottom + j; + if (DecorDetect(rect2)) + { + end = tinyPoint; + return FALSE; + } + tinyPoint.x = start.x + i; + tinyPoint.y = start.y + j; + } + } + } + else + { + RECT rect2; + if (end.y > start.y) + { + for (int j = 0; j <= num2; j++) + { + int i = j * (end.x - start.x) / num2; + rect2.left = rect.left + i; + rect2.right = rect.right + i; + rect2.top = rect.top + j; + rect2.bottom = rect.bottom + j; + if (DecorDetect(rect2)) + { + end = tinyPoint; + return FALSE; + } + tinyPoint.x = start.x + i; + tinyPoint.y = start.y + j; + } + } + if (end.y < start.y) + { + for (int j = 0; j >= -num2; j--) + { + int i = j * (start.x - end.x) / num2; + rect2.left = rect.left + i; + rect2.right = rect.right + i; + rect2.top = rect.top + j; + rect2.bottom = rect.bottom + j; + if (DecorDetect(rect2)) + { + end = tinyPoint; + return FALSE; + } + tinyPoint.x = start.x + i; + tinyPoint.y = start.y + j; + } + } + } + return TRUE; +} + int CDecor::IsWorld(POINT pos) { pos.x += 30; @@ -1538,6 +1669,23 @@ BOOL CDecor::SearchDoor(int n, POINT cel, POINT blupi) return FALSE; } +BOOL SearchGold(int n, POINT cel) +{ + for (int i = 99; i >= 0; i--) + { + for (int j = 99; j >= 0; j--) + { + if (m_decor[j, i]->icon == 183) + { + cel.x = j; + cel.y = i; + return TRUE; + } + } + } + return FALSE; +} + void CDecor::OpenDoorsTresor() { for (int i = 0; i < 100; i++) @@ -1556,12 +1704,27 @@ void CDecor::OpenDoorsTresor() } } -void CDecor::OpenDoors(POINT cel) +void CDecor::OpenDoor(POINT cel) { int icon = m_decor[cel.x, cel.y]->icon; m_decor[cel.x, cel.y]->icon = -1; int num = MoveObjectFree(); - + m_moveObject[num]->type = 22; + m_moveObject[num]->stepAdvance = 50; + m_moveObject[num]->stepRecede = 1; + m_moveObject[num]->timeStopStart = 0; + m_moveObject[num]->timeStopEnd = 0; + m_moveObject[num]->posStart.x = 64 * cel.x; + m_moveObject[num]->posStart.y = 64 * cel.y; + m_moveObject[num]->posEnd.x = 64 * cel.x; + m_moveObject[num]->posEnd.y = 64 * (cel.y - 1); + m_moveObject[num]->posCurrent = m_moveObject[num]->posStart; + m_moveObject[num]->step = 1; + m_moveObject[num]->time = 0; + m_moveObject[num]->phase = 0; + m_moveObject[num]->channel = 1; + m_moveObject[num]->icon = icon; + PlaySound(33, m_moveObject[num]->posStart); } void CDecor::OpenDoorsWin() diff --git a/decor.h b/decor.h index 0e63670..e18db82 100644 --- a/decor.h +++ b/decor.h @@ -568,8 +568,11 @@ public: BOOL DecorDetect(RECT rect, BOOL bCaisse); int IsWorld(POINT pos); BOOL SearchDoor(int n, POINT cel, POINT blupi); + BOOL SearchGold(int n, POINT cel); + BOOL TestPath(RECT rect, POINT start, POINT end); + void PlaySound(int sound, POINT pos); void OpenDoorsTresor(); - void OpenDoors(POINT cel); + void OpenDoor(POINT cel); void OpenDoorsWin(); void OpenGoldsWin(); void DoorsLost(); @@ -591,6 +594,8 @@ protected: Perso m_persos[200]; int m_input; int m_previousInput; + int m_blupiTimeShield; + POINT m_blupiPosMagic; int m_detectIcon = -1; POINT m_cameraPos; POINT m_dimDecor; diff --git a/tables.h b/tables.h index a177000..bf8b845 100644 --- a/tables.h +++ b/tables.h @@ -1,10 +1,7 @@ #pragma once -class Tables - { - Tables() - { - int[] array = new int[]; +static Phase table[] +{ { 1, 3,