Repository navigation
CCLCC Switch Assets MVP #542
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+5,218
−920
Merged
Changes from all commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
72da8f7
Centralize spritesheets in sprites.lua and try adding cclcc-switch pr…
02aad29
WIP doublepack
Gunoshozo 9db188b
WIP CCLCC
Gunoshozo 54e7d40
Title menu and Help menu switch corrections
fd01919
Msb Fixes
Gunoshozo 254f273
More VM vars and displaying first lines
Gunoshozo e46d95e
Sprite size fixes
Gunoshozo 65975c5
- Fix system menu and submenus
Gunoshozo 15c2d9f
32bit strings character names and Nameplates fixes
Gunoshozo 4117160
Roadblock removed + bg partially fixed
Gunoshozo 5b2a3e9
Rendering fixes
Gunoshozo 89f846a
Profiles fixes
Gunoshozo 4bcc050
Fix backlog and tips
Gunoshozo ab87184
Tips menu & SysMesBox choice fixes
Gunoshozo 719d0c3
Fill data for overlay
Gunoshozo b1dfbd9
CCLCC Switch Save System
Gunoshozo 3ccc5af
Switch Map Trigger
Gunoshozo 57ddb42
Fix Grayscale Alpha Masks, doing swizzle for color channels
Gunoshozo b8f4069
Sysmenu and TitleMenu State fixes
Gunoshozo 244e0dc
Multiple ScrVar Fixes:
Gunoshozo e58aaea
Use switch font
Gunoshozo 18f9e08
Delusion Trigger corrections for Switch + some vars
Gunoshozo bf27df5
Extend fs folder archive to use WhiteList and Order from cls
Gunoshozo 7196bd3
Tips menu fixes
Gunoshozo c80d62d
Fix Extra menus access + add resources
Gunoshozo ec33de8
Lint formatting
Gunoshozo 9a9bd81
Fix thread reset after becoming non-trivial
Gunoshozo e3f4624
Use scoped enums for SW_TITLEMODE values PS4 vs Switch and add versio…
Gunoshozo 223d318
Text Fixes
Gunoshozo 14777f2
Fix ID for CGs and Movies
Gunoshozo 54221ce
Release surface new
Gunoshozo d67f559
Fix overlay for backlog
Gunoshozo f443681
unslow logs
Gunoshozo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| root.BgEffData = { | ||
| BgChaEffectType = BgEffTypeEnum.Disabled; | ||
| BgFrameEffectType = BgEffTypeEnum.Disabled; | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| root.Dialogue.DialogueFont = "Default"; | ||
| root.Dialogue.TipsMessageModeIdx = 4; | ||
| root.Dialogue.REVMessageModeIdx = 8; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| root.Fonts = { | ||
| ["Default"] = { | ||
| Type = FontType.EdgeDetectedSingleVariableWidthSheet, | ||
| Sheet = "Font", | ||
| BinaryPath = {Mount = "system", Id = 7}, | ||
| BitmapEmWidth = 53, | ||
| BitmapEmHeight = 53, | ||
| DifferenceFactor = 0.8, | ||
| IntensityShift = 0.48, | ||
| AlphaShift = 0.36 | ||
| }, | ||
|
|
||
| ["Default2"] = { | ||
| Type = FontType.EdgeDetectedSingleVariableWidthSheet, | ||
| Sheet = "Font", | ||
| BinaryPath = {Mount = "system", Id = 9}, | ||
| BitmapEmWidth = 53, | ||
| BitmapEmHeight = 53, | ||
| DifferenceFactor = 0.8, | ||
| IntensityShift = 0.48, | ||
| AlphaShift = 0.36 | ||
| }, | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
|
|
||
| root.ActiveRenderer = RendererType.OpenGL; | ||
|
|
||
| root.LayerCount = 100; | ||
| root.GameFeatures = GameFeature.Sc3VirtualMachine | | ||
| GameFeature.Renderer2D | | ||
| GameFeature.Input | | ||
| GameFeature.Audio | | ||
| GameFeature.Video | | ||
| GameFeature.Subtitles | | ||
| GameFeature.DebugMenu | | ||
| GameFeature.Achievements | | ||
| GameFeature.Overlay; | ||
| root.DesignWidth = 1920; | ||
| root.DesignHeight = 1080; | ||
|
|
||
| root.WindowName = "CHAOS;CHILD Love Chu☆Chu!!"; | ||
| root.WindowIconPath = "resources/cclcc/icondata/icon.png"; | ||
| root.CursorArrowPath = "resources/cclcc/icondata/cursor_arrow.png"; | ||
| root.CursorPointerPath = "resources/cclcc/icondata/cursor_pointer.png"; | ||
|
|
||
| root.CharaIsMvl = true; | ||
| root.UseMoviePriority = true; | ||
| root.UseBgChaEffects = false; | ||
| root.UseBgFrameEffects = false; | ||
| root.UseWaveEffects = true; | ||
|
|
||
| root.ScreenCaptureCount = 2; | ||
|
|
||
| root.Vm = { | ||
| StartScript = 2, | ||
| StartScriptBuffer = 0, | ||
| GameInstructionSet = InstructionSet.LCCSwitch, | ||
|
|
||
| UseMsbStrings = true; | ||
| UseReturnIds = true; | ||
| UseSeparateMsbArchive = true; | ||
| StringEncodingType = StringUnitEncoding.Uint32, | ||
| StringIdSize = 4, | ||
|
|
||
| ScrWorkChaStructSize = 24, | ||
| ScrWorkChaOffsetStructSize = 10, | ||
| ScrWorkBgStructSize = 24, | ||
| ScrWorkBgOffsetStructSize = 10, | ||
| ScrWorkCaptureStructSize = 20, | ||
| ScrWorkCaptureOffsetStructSize = 10, | ||
| ScrWorkCaptureEffectInfoStructSize = 3, | ||
| ScrWorkBgEffStructSize = 30, | ||
| ScrWorkBgEffOffsetStructSize = 18, | ||
| ScrWorkMesStructSize = 7, | ||
|
|
||
| MaxLinkedBgBuffers = 2 | ||
| }; | ||
|
|
||
| root.PlatformId = 0x100000; -- switch, important for scripts | ||
|
|
||
| include(root.BasePaths.RootProfilesDir .. '/common/animation.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/common/achievementnotification.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/common/charset.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/common/scriptinput.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/common/scriptvars.lua'); | ||
|
|
||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/scriptinput.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/scriptvars.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/scriptvars.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/sprites.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/savedata.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/savedata.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/tipssystem.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/vfs.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/charset.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/gamespecific.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/font.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/dialogue.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/dialogue.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/configsystem.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/bgeff.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/waveeffects.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/hud/saveicon.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/loadingdisplay.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/datedisplay.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/titlemenu.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/backlogmenu.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/sysmesboxdisplay.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/selectiondisplay.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/optionsmenu.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/tipsmenu.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/hud/tipsmenu.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/extramenus.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/hud/extramenus.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/tipsnotification.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/hud/tipsnotification.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/systemmenu.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc/hud/savemenu.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/hud/helpmenu.lua'); | ||
| include(root.BasePaths.RootProfilesDir .. '/cclcc-switch/hud/titlemenu.lua'); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| root.ExtraMenus.LibraryMenu.MusicStringLockedIndex = 3; | ||
| root.ExtraMenus.LibraryMenu.LibraryMenuId = 16; | ||
| root.ExtraMenus.LibraryMenu.MovieDiskPlayIds = {55, 54, 53, 52}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| root.HelpMenu = { | ||
| DrawType = DrawComponentType.SystemMenu, | ||
| Type = HelpMenuType.CCLCC, | ||
| FadeInDuration = 32/60, | ||
| FadeOutDuration = 32/60, | ||
| NextPageInDuration = 0.4, | ||
| NextPageOutDuration = 0.4, | ||
| ManualPages = {}, | ||
| } | ||
|
|
||
| root.Sprites["ManualPage0"] ={ | ||
| Sheet = "Help", | ||
| Bounds = { X = 0, Y = 0, Width = 1920, Height = 1080 } | ||
| }; | ||
| root.HelpMenu.ManualPages[#root.HelpMenu.ManualPages + 1] = "ManualPage0"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| root.SaveIcon = { | ||
| ForegroundAnimation = "SaveIcon", | ||
| DefaultPosition = { X = 104, Y = 736 }, | ||
| BackgroundSprite = "SaveIconBg", | ||
| BackgroundOffset = { X = 0, Y = 0 }, | ||
| BackgroundMaxAlpha = 0.0, | ||
| FadeInDuration = 16/60, | ||
| FadeOutDuration = 12/60, | ||
| FullyVisibleSpriteIndex = 1 | ||
| }; | ||
|
|
||
| MakeAnimation({ | ||
| Name = "SaveIcon", | ||
| Sheet = "Data", | ||
| FirstFrameX = 127, | ||
| FirstFrameY = 417, | ||
| FrameWidth = 179, | ||
| ColWidth = 179, | ||
| FrameHeight = 62, | ||
| RowHeight = 62, | ||
| Frames = 2, | ||
| Duration = 2*18/60, -- 18 frames per sprite | ||
| Rows = 2, | ||
| Columns = 1, | ||
| PrimaryDirection = AnimationDirections.Down | ||
| }); | ||
|
|
||
| root.Sprites["SaveIconBg"] = { | ||
| Sheet = "Data", | ||
| Bounds = { X = 127, Y = 479, Width = 179, Height = 62 } | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| root.TipsMenu.TipsTextTableIndex = 2; | ||
| root.TipsMenu.TipsTextEntryLockedIndex = 7; | ||
| root.TipsMenu.TipsTextSortStringIndex = 10; | ||
| root.TipsMenu.TipsEntryNameOffset = {X = 100, Y = 10}; | ||
| root.TipsMenu.NumberPos = { X = 1190 * 1.5, Y = 52 * 1.5 }; | ||
| root.TipsMenu.NumberFontSize = 52; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| root.TipsNotification.NotificationTextPart1MessageId = 21; | ||
| root.TipsNotification.NotificationTextPart2MessageId = 22; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| root.TitleMenu.TitleAnimationFileId = 36; | ||
| root.TitleMenu.NewButtonId = 0; | ||
| root.TitleMenu.LoadButtonId = 2; | ||
| root.TitleMenu.QLoadButtonId = 3; | ||
| root.TitleMenu.TipsButtonId = 9; | ||
| root.TitleMenu.LibraryButtonId = 5; | ||
| root.TitleMenu.EndingListButtonId = 8; | ||
| root.TitleMenu.ConfigButtonId = 10; | ||
| root.TitleMenu.HelpButtonId = 11; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.