diff --git a/Event sheets/Battle.xml b/Event sheets/Battle.xml index 00683754..9907c511 100644 --- a/Event sheets/Battle.xml +++ b/Event sheets/Battle.xml @@ -121,6 +121,11 @@ 1 MODE_NORMAL + + MUSIC + 0 + 1 + @@ -352,13 +357,30 @@ "EndAttack" - - mus_zz_megalovania - 1 - 0 - "Music" - + + + + + MUSIC + 0 + 1 + + + + + mus_zz_megalovania + 1 + 0 + "Music" + + + + + + + + @@ -1268,6 +1290,11 @@ "Music" + + MUSIC + 0 + 1 + @@ -1483,6 +1510,29 @@ "alright, i guess" & newline & "you win."{###}"Win2" + + + + + DAMAGE + 0 + 0 + + + + + + "SansText" + "but you have the damage disabled"{###}0 + + + + "SansText" + "it is ike nothing"{###}0 + + + + @@ -7760,6 +7810,27 @@ "" + + + + + DAMAGE + 0 + 0 + + + + + HP + MaxHP + + + KR + 0 + + + + diff --git a/Event sheets/Globals.xml b/Event sheets/Globals.xml index 795c2d3c..8b4246a6 100644 --- a/Event sheets/Globals.xml +++ b/Event sheets/Globals.xml @@ -18,5 +18,7 @@ 92 0 0 + 1 + 1 diff --git a/Event sheets/MainMenu.xml b/Event sheets/MainMenu.xml index 2cf1cbfe..81c67fda 100644 --- a/Event sheets/MainMenu.xml +++ b/Event sheets/MainMenu.xml @@ -157,6 +157,10 @@ "CreateMenuItem" 0{###}192{###}224{###}4{###}"Custom attack"{###}"MenuModeCustom" + + "CreateMenuItem" + 0{###}192{###}256{###}5{###}"Options"{###}"MenuModeOptions" + @@ -334,10 +338,6 @@ 0 32 - - 640 - 32 - 2 @@ -417,6 +417,9 @@ 224 96 + + "document.getElementById('filechooser').focus();" + @@ -478,6 +481,166 @@ + + + + "MenuModeOptions" + + + + + + + "MenuBackAction" + "MenuMain" + + + DefaultFont + 0 + 0 + 32 + + + 2 + + + "Options" + + + 1 + + + "InflateMusicMenu" + + + + 640 + 32 + + + "InflateDamageMenu" + + + + + + + + "InflateMusicMenu" + + + + + + + + MUSIC + 0 + 0 + + + + + "CreateMenuItem" + 0{###}192{###}96{###}0{###}"Enable music"{###}"ToggleMusic" + + + + + + + MUSIC + 0 + 1 + + + + + "CreateMenuItem" + 0{###}192{###}96{###}0{###}"Disable music"{###}"ToggleMusic" + + + + + + + + + "ToggleMusic" + + + + + MUSIC + MUSIC ? 0 : 1 + + + "MenuModeOptions" + + + + + + + + "InflateDamageMenu" + + + + + + + + DAMAGE + 0 + 0 + + + + + "CreateMenuItem" + 0{###}192{###}128{###}1{###}"Enable damage"{###}"ToggleDamage" + + + + + + + DAMAGE + 0 + 1 + + + + + "CreateMenuItem" + 0{###}192{###}128{###}1{###}"Disable damage"{###}"ToggleDamage" + + + + + + + + + "ToggleDamage" + + + + + DAMAGE + DAMAGE ? 0 : 1 + + + 0 + 0 + + + "MenuModeOptions" + + + + @@ -682,5 +845,9 @@ + + + + diff --git a/Layouts/System.xml b/Layouts/System.xml index 8dc795a2..7cb314bc 100644 --- a/Layouts/System.xml +++ b/Layouts/System.xml @@ -860,7 +860,7 @@ .csv Visible - + filechooser 0 0