update xenia, more progress

hmxmilohax · Jun 2, 2023 · 30e1ea4 · 30e1ea4
1 parent 6f09816
commit 30e1ea4
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 919 deletions.
diff --git a/_ark/ui/eng/locale_milo.dta b/_ark/ui/eng/locale_milo.dta
@@ -144,7 +144,7 @@
 (os_trackelm "TRACK ELEMENT")
 (os_trackmodifiers "TRACK OPTIONS")
 (os_songlistthemes "Song List")
-(os_songlistthemeslbl "SONG LIST OPTIONS")
+(os_songlistthemeslbl "SONG LIST")
 (os_gh1theme "GUITAR HERO I")
 (os_speedsettings "SET SPEEDS")
 (os_gh2theme "GUITAR HERO II DX")
@@ -240,8 +240,8 @@
 (os_divisionlines {sprint "No Division Lines" {if_else $removedivisionlines ": ON" ": OFF"}})
 (os_notestreakmod {sprint "Note Streak Popups" {if_else $notestreakmod ": ON" ": OFF"}})
 (os_sppop {sprint "Star Power Popup" {if_else $sppop ": ON" ": OFF"}})
-(os_leftyp1 {sprint "Lefty Flip P1" {if_else $leftyp1 ": ON" ": OFF"}})
-(os_leftyp2 {sprint "Lefty Flip P2" {if_else $leftyp2 ": ON" ": OFF"}})
+(os_leftyp1 {sprint "Player 1" {if_else $leftyp1 ": LEFTY" ": RIGHTY"}})
+(os_leftyp2 {sprint "Player 2" {if_else $leftyp2 ": LEFTY" ": RIGHTY"}})
 (os_selecttorestart {sprint "Select in Practice" {if_else $selecttorestart ": ON" ": OFF"}})
 (os_autoplay {sprint "Autoplay" {if_else $autoplay ": ON" ": OFF"}})
 (os_gh3track {sprint "GH3 Frets" {if_else $gh3track ": ON" ": OFF"}})

diff --git a/_ark/ui/overshell.dta b/_ark/ui/overshell.dta
@@ -155,19 +155,22 @@
    (reset_focus TRUE) ;make sure to bring the focus to the overshell panel
    (enter ;when the screen is entered
       {$this overshell_theme} ;run the theme code on the current overshell screen
+      {pause_title.lbl set_local_pos 0 0 105} ;move the label to the proper location
+      {pause_buttons.view set_local_pos 0 125 50} ;move the buttons to the proper location
       {pause_title.lbl set_localized_text {localize os_deluxesettings}} ;set the header label text
-      {resume.btn set_localized_text {localize os_gameplay}} ;set the button text
-      {restart.btn set_localized_text {localize os_modifiers}} ;set the button text
-      {change_speed.btn set_localized_text {localize os_speedsettings}} ;set the button text
-      {section.btn set_localized_text {localize os_appearance}} ;set the button text
-      {newsong.btn set_localized_text {localize os_background}} ;set the button text
-      {quit.btn set_localized_text {localize os_options}} ;set the button text
-      {extra1.btn set_localized_text {localize os_credits}} ;set the button text
+      {resume.btn set_localized_text {localize os_modifiers}} ;set the button text
+      {restart.btn set_localized_text {localize os_speedsettings}} ;set the button text
+      {change_speed.btn set_localized_text {localize os_appearance}} ;set the button text
+      {section.btn set_localized_text {localize os_background}} ;set the button text
+      {newsong.btn set_localized_text {localize os_handedness}} ;set the button text
       {$this disable diff.btn} ;hide unused button
       {diff.btn set_showing FALSE}
+      {$this disable quit.btn} ;hide unused button
+      {quit.btn set_showing FALSE}
+      {$this disable extra1.btn} ;hide unused button
+      {extra1.btn set_showing FALSE}
       {$this disable extra2.btn} ;hide unused button
       {extra2.btn set_showing FALSE}
-   ;   {extra2.btn set_localized_text {localize nine}} ;set the button text
    )
 }
 {new
@@ -179,14 +182,11 @@
    OVERSHELL_SCREEN_COMMON_HANDLER ;setup overshell with common screen handles defined above
    (SELECT_START_MSG ;code ran when a button is selected
       {switch $component ;run different code based on the button selected
-         (resume.btn {ui push_screen overshell_diff_list_screen}) ;difficulty screen
-         (restart.btn {ui push_screen overshell_modifier_list_screen}) ;modifiers screen
-         (change_speed.btn {ui push_screen overshell_speed_slider_screen}) ;speed settings screen
-         (section.btn {ui push_screen overshell_appearance_screen}) ;appearance screen
-         (newsong.btn {ui push_screen overshell_managegig_screen}) ;manage gig screen
-         (quit.btn {ui push_screen overshell_options_screen}) ;guitar select screen
-         (extra1.btn {$this disable overshell_panel} {overshell_panel set_showing FALSE} {ui goto_screen credits_screen}) ;theme select screen
-      ;   (extra2.btn {ui push_screen overshell_audio_slider_screen}) ;audio settings screen
+         (resume.btn {ui push_screen overshell_modifier_list_screen}) ;modifiers screen
+         (restart.btn {ui push_screen overshell_speed_slider_screen}) ;speed settings screen
+         (change_speed.btn {ui push_screen overshell_appearance_screen}) ;appearance screen
+         (section.btn {ui push_screen overshell_managegig_screen}) ;manage gig screen
+         (newsong.btn {ui push_screen overshell_handedness_screen}) ;handedness screen
       }
    )
    (BUTTON_DOWN_MSG ;code ran when a button is pressed

diff --git a/_ark/ui/overshell_handlers.dta b/_ark/ui/overshell_handlers.dta
@@ -111,7 +111,7 @@
    (enter ;when the panel is entered
       {$this overshell_theme} ;run the theme code on the current overshell screen
       {gs_tile5.mesh set_showing FALSE} ;hide the spare mesh we put into the overshell list milo
-      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
+      {sel_section.lst set_local_pos -140 0 60} ;move the list to the proper location
       {sel_section.lst set circular 1} ;set the list to wrap around when the end is reached
       {gs_title.lbl set_localized_text {localize os_trackelm}} ;set the title text for this screen
       {sel_section.lst set_data ;set up the data for the list
@@ -177,6 +177,8 @@
    (enter ;when the panel is entered
       {$this overshell_theme} ;run the theme code on the current overshell screen
       {pause_title.lbl set_localized_text {localize os_appearance}} ;set the title text for this screen
+      {pause_title.lbl set_local_pos 0 0 105} ;move the label to the proper location
+      {pause_buttons.view set_local_pos 0 125 50} ;move the buttons to the proper location
       {diff.btn set_showing FALSE} ;hide the extra unused button
       {extra2.btn set_showing FALSE} ;hide the extra unused button
       {$this disable diff.btn} ;disable the extra unused button
@@ -231,6 +233,8 @@
    (enter ;when the panel is entered
       {$this overshell_theme} ;run the theme code on the current overshell screen
       {pause_title.lbl set_localized_text {localize os_background}} ;set the title text for this screen
+      {pause_title.lbl set_local_pos 0 0 105} ;move the label to the proper location
+      {pause_buttons.view set_local_pos 0 125 50} ;move the buttons to the proper location
       {diff.btn set_showing FALSE} ;hide the extra unused button
       {extra2.btn set_showing FALSE} ;hide the extra unused button
       {$this disable diff.btn} ;disable the extra unused button
@@ -279,6 +283,8 @@
    (enter ;when the panel is entered
       {$this overshell_theme} ;run the theme code on the current overshell screen
       {pause_title.lbl set_localized_text {localize os_options}} ;set the title text for this screen
+      {pause_title.lbl set_local_pos 0 0 105} ;move the label to the proper location
+      {pause_buttons.view set_local_pos 0 125 50} ;move the buttons to the proper location
       {diff.btn set_showing FALSE} ;hide the extra unused button
       {extra2.btn set_showing FALSE} ;hide the extra unused button
       {$this disable diff.btn} ;disable the extra unused button
@@ -343,7 +349,7 @@
    (enter ;when the panel is entered
       {$this overshell_theme} ;run the theme code on the current overshell screen
       {gs_tile5.mesh set_showing FALSE} ;hide the spare mesh we put into the overshell list milo
-      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
+      {sel_section.lst set_local_pos -140 0 60} ;move the list to the proper location
       {sel_section.lst set alignment kTopCenter} ;ensure the list is aligned properly
       {gs_title.lbl set_localized_text {localize os_trackmodifiers}} ;set the title text for this screen
       {sel_section.lst set_data ;set up the data for the list
@@ -482,7 +488,7 @@
       {$this overshell_theme} ;run the theme code on the current overshell screen
       {gs_tile5.mesh set_showing FALSE} ;hide the spare mesh we put into the overshell list milo
       {sel_section.lst set_selected $modifierlistpos} ;select our saved list position
-      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
+      {sel_section.lst set_local_pos -140 0 60} ;move the list to the proper location
       {sel_section.lst set circular 1} ;set the list to wrap around when the end is reached
       {sel_section.lst set alignment kTopCenter} ;ensure the list is aligned properly
       {gs_title.lbl set_localized_text {localize os_modifiers}} ;set the title text for this screen
@@ -783,7 +789,7 @@
       {gs_title.lbl set_localized_text {localize os_diff}} ;set the title text for this screen
       {sel_section.lst set_selected $difflistpos} ;select our saved list position
       {sel_section.lst set circular 0} ;we dont set this list to be circular because there are not enough list items to wrap
-      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
+      {sel_section.lst set_local_pos -140 0 60} ;move the list to the proper location
       {sel_section.lst set_data ;set up the data for the list
          (
             easy medium hard expert os_leftyp1 os_leftyp2 ;we combine difficulty and lefty flip in the same spot because they would otherwise be very bare menus
@@ -843,7 +849,7 @@
       {gs_title.lbl set_localized_text {localize os_handedness}} ;set the title text for this screen
       {sel_section.lst set_selected $handlistpos} ;select our saved list position
       {sel_section.lst set circular 0} ;we dont set this list to be circular because there are not enough list items to wrap
-      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
+      {sel_section.lst set_local_pos -140 0 60} ;move the list to the proper location
       {sel_section.lst set_data ;set up the data for the list
          (
             os_leftyp1 os_leftyp2
@@ -894,7 +900,7 @@
    )
    (enter ;when the panel is entered
       {$this overshell_theme} ;run the theme code on the current overshell screen
-      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
+      {sel_section.lst set_local_pos -140 0 60} ;move the list to the proper location
       {sel_section.lst set circular 1} ;set the list to wrap around when the end is reached
       {gs_title.lbl set_localized_text {localize os_characterselect}} ;set the title label for the current screen
       {gs_background.view add_object gs_tile5.mesh} ;make sure we have the spare mesh loaded
@@ -987,7 +993,7 @@
       {$this overshell_theme} ;run the theme code on the current overshell screen
       {gs_tile5.mesh set_showing FALSE} ;hide the spare mesh we put into the overshell list milo
       {gs_title.lbl set_localized_text {localize os_venueselect}} ;set the title text for this screen
-      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper locatio
+      {sel_section.lst set_local_pos -140 0 60} ;move the list to the proper locatio
       {sel_section.lst set circular 1} ;set the list to wrap around when the end is reached
       {sel_section.lst set_data ;set up the data for the list
          (
@@ -1028,7 +1034,7 @@
    (focus sel_section.lst) ;focus the list used in the current overshell screen
    (enter ;when the panel is entered
       {$this overshell_theme} ;run the theme code on the current overshell screen
-      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
+      {sel_section.lst set_local_pos -140 0 60} ;move the list to the proper location
       {sel_section.lst set circular 1} ;set the list to wrap around when the end is reached
       {gs_title.lbl set_localized_text {localize os_guitarselect}} ;set the title text for this screen
       {gs_tile5.mesh set_showing FALSE} ;hide the spare mesh we put into the overshell list milo
@@ -1160,6 +1166,8 @@
    (enter ;when the panel is entered
       {$this overshell_theme} ;run the theme code on the current overshell screen
       {pause_title.lbl set_localized_text {localize os_themeselectlbl}} ;set the title text for this screen
+      {pause_title.lbl set_local_pos 0 0 105} ;move the label to the proper location
+      {pause_buttons.view set_local_pos 0 125 50} ;move the buttons to the proper location
       {diff.btn set_showing FALSE} ;hide the extra unused button
       {extra2.btn set_showing FALSE} ;hide the extra unused button
       {$this disable diff.btn} ;disable the extra unused button
@@ -1245,7 +1253,7 @@
       {gs_pic.tex set_bitmap {sprint "track/surfaces/" $highwaymenu "_keep.bmp"}} ;set the preview image to the current highlighted highway
       {gs_title.lbl set_localized_text {localize os_sethighway}} ;set the title text for this screen
       {sel_section.lst set circular 1} ;set the list to wrap around when the end is reached
-      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
+      {sel_section.lst set_local_pos -140 0 60} ;move the list to the proper location
       {sel_section.lst set_data ;set up the data for the list
          (
             #include ../track/surfaces/highways.dta ;nice trick to provide easy user provided highways. highways.bat in the root of the repo sets up this dta.
@@ -1283,7 +1291,7 @@
       {set $fontmenu blockletters} ;set the temp var to the first item in the list
       {gs_title.lbl set_type $fontmenu} ;set the title label font to the temp var
       {gs_title.lbl set_localized_text {localize os_setfont}} ;set the title text for this screen
-      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
+      {sel_section.lst set_local_pos -140 0 60} ;move the list to the proper location
       {sel_section.lst set circular 1} ;set the list to wrap around when the end is reached
       {sel_section.lst set_data ;set up the data for the list
          (
@@ -1358,7 +1366,7 @@
    (enter ;when the panel is entered
       {$this overshell_theme} ;run the theme code on the current overshell screen
       {gs_tile5.mesh set_showing FALSE} ;hide the spare mesh we put into the overshell list milo
-      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
+      {sel_section.lst set_local_pos -140 0 60} ;move the list to the proper location
       {sel_section.lst set_data ;set up the data for the list
          (
             os_altsong os_gh3song os_loopsong ;data for the list

diff --git a/_ark/ui/seldiff.dta b/_ark/ui/seldiff.dta
@@ -28,14 +28,16 @@
             {if_else $diffseen
             {ui goto_screen manage_gig_screen}
             {ui goto_screen loading_screen}}
-            {set $diffseen TRUE}}}
+            ;{set $diffseen TRUE}
+            }}
       kDataUnhandled)
    (SELECT_START_MSG
                {do
          {if_else $diffseen
          {ui goto_screen manage_gig_screen}
          {ui goto_screen loading_screen}}
-         {set $diffseen TRUE}}
+         ;{set $diffseen TRUE}
+         }
       kDataUnhandled)}
 {new
    GHPanel

diff --git a/_build/Xbox/gen/init.dtb b/_build/Xbox/gen/init.dtb
diff --git a/_build/Xbox/gen/init_ui_theme.dtb b/_build/Xbox/gen/init_ui_theme.dtb
diff --git a/_init/init.dta b/_init/init.dta
@@ -128,4 +128,7 @@
 {set $drumenabled FALSE}
 
 ;show practice section names in quickplay (not implemented)
-{set $quickplaysectionnames FALSE}
+{set $quickplaysectionnames FALSE}
+
+;skip help screen
+{set $helpentered TRUE}
diff --git a/_init/init_ui_theme.dta b/_init/init_ui_theme.dta
@@ -1,7 +1,7 @@
 ;set menu theming
 ;current themes are
 ;gh1 gh2 gh3 80s gold custom
-{set $menutheme none}
+{set $menutheme gh2}
 
 ;sets custom values for custom menu theme
 ;you can customize your own menu theme here