diff --git a/data/ryz/ryz_zzz_bazaar/config.xml b/data/kh/aaa_lirria/config.xml
similarity index 96%
rename from data/ryz/ryz_zzz_bazaar/config.xml
rename to data/kh/aaa_lirria/config.xml
index 630ecd4c..e1ffb565 100644
--- a/data/ryz/ryz_zzz_bazaar/config.xml
+++ b/data/kh/aaa_lirria/config.xml
@@ -264,16 +264,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+ value="-7" />
+ value="-7" />
+ value="-23" />
+ value="-7" />
+ value="-7" />
+ value="-7" />
+ value="-4" />
+ value="-4" />
+ value="-3" />
+ value="-3" />
+ value="-3" />
+ value="-3" />
+ value="-3" />
+ value="-3" />
+ value="-4" />
+ value="-4" />
@@ -1698,11 +1698,11 @@
+ value="0" />
+ value="0" />
@@ -1916,6 +1916,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
value="basic.ttf" /> -->
+
-
-
-
-
+
+
+
+
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2765,6 +2767,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
+
@@ -2882,15 +2887,12 @@ This MUST follow the Enum MISSION_DESC::TIconId
type="bool"
value="true" />
-
-
-
+
+
+
@@ -2923,13 +2925,13 @@ This MUST follow the Enum MISSION_DESC::TIconId
-
-
-
@@ -3321,9 +3323,6 @@ This MUST follow the Enum MISSION_DESC::TIconId
-
@@ -3342,9 +3341,6 @@ This MUST follow the Enum MISSION_DESC::TIconId
-
-
-
-
-
-
@@ -3705,27 +3701,13 @@ This MUST follow the Enum MISSION_DESC::TIconId
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
diff --git a/data/ryz/ryz_zzz_bazaar/game_r2_loading.lua b/data/kh/aaa_lirria/game_r2_loading.lua
similarity index 100%
rename from data/ryz/ryz_zzz_bazaar/game_r2_loading.lua
rename to data/kh/aaa_lirria/game_r2_loading.lua
diff --git a/data/ryz/ryz_zzz_bazaar/keys.xml b/data/kh/aaa_lirria/keys.xml
similarity index 100%
rename from data/ryz/ryz_zzz_bazaar/keys.xml
rename to data/kh/aaa_lirria/keys.xml
diff --git a/data/ryz/ryz_zzz_bazaar/keys_bi.wasd.xml b/data/kh/aaa_lirria/keys_bi.wasd.xml
similarity index 100%
rename from data/ryz/ryz_zzz_bazaar/keys_bi.wasd.xml
rename to data/kh/aaa_lirria/keys_bi.wasd.xml
diff --git a/data/ryz/ryz_zzz_bazaar/keys_bi.zqsd.xml b/data/kh/aaa_lirria/keys_bi.zqsd.xml
similarity index 100%
rename from data/ryz/ryz_zzz_bazaar/keys_bi.zqsd.xml
rename to data/kh/aaa_lirria/keys_bi.zqsd.xml
diff --git a/data/ryz/ryz_ring/ring_window.xml b/data/kh/aaa_lirria/ring_window.xml
similarity index 99%
rename from data/ryz/ryz_ring/ring_window.xml
rename to data/kh/aaa_lirria/ring_window.xml
index 6048b6cc..b92614e3 100644
--- a/data/ryz/ryz_ring/ring_window.xml
+++ b/data/kh/aaa_lirria/ring_window.xml
@@ -1077,15 +1077,15 @@
-
-
-
@@ -1650,10 +1650,10 @@
-
-
@@ -1679,7 +1679,7 @@
-
diff --git a/data/kh/kh_interfaces/actions.xml b/data/kh/kh_interfaces/actions.xml
index 27ce357c..5fb009ad 100644
--- a/data/kh/kh_interfaces/actions.xml
+++ b/data/kh/kh_interfaces/actions.xml
@@ -124,20 +124,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -211,13 +197,6 @@
-
-
-
-
-
-
-
@@ -225,51 +204,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -282,13 +220,12 @@
-
-
+
@@ -297,7 +234,6 @@
-
diff --git a/data/kh/kh_interfaces/info_player.xml b/data/kh/kh_interfaces/info_player.xml
index 34476015..38dbf0ed 100644
--- a/data/kh/kh_interfaces/info_player.xml
+++ b/data/kh/kh_interfaces/info_player.xml
@@ -57,7 +57,7 @@
+ y="-30">
@@ -729,7 +729,7 @@
sizeref="w5"
w="-1"
h="188"
- y="-72">
+ y="-52">
@@ -758,46 +758,46 @@
fontsize="10"
color="255 255 255 255" />
+ tooltip="uittIdentityChaScore1"
+ text="uiChaScore1"
+ val="%player_ChaScore1"
+ maxval="%player_ChaScore1_max"
+ baseval="%player_ChaScore1_base" />
+ tooltip="uittIdentityChaScore3"
+ text="uiChaScore3"
+ val="%player_ChaScore3"
+ maxval="%player_ChaScore3_max"
+ baseval="%player_ChaScore3_base" />
+ tooltip="uittIdentityChaScore2"
+ text="uiChaScore2"
+ val="%player_ChaScore2"
+ maxval="%player_ChaScore2_max"
+ baseval="%player_ChaScore2_base" />
+ tooltip="uittIdentityChaScore4"
+ text="uiChaScore4"
+ val="%player_ChaScore4"
+ maxval="%player_ChaScore4_max"
+ baseval="%player_ChaScore4_base" />
+ text="uiChaScore1"
+ val="%player_ChaScore1reg"
+ baseval="%player_ChaScore1reg_base"
+ tooltip="uittIdentityChaScore1Reg" />
+ text="uiChaScore3"
+ val="%player_ChaScore3reg"
+ baseval="%player_ChaScore3reg_base"
+ tooltip="uittIdentityChaScore3Reg" />
+ text="uiChaScore2"
+ val="%player_ChaScore2reg"
+ baseval="%player_ChaScore2reg_base"
+ tooltip="uittIdentityChaScore2Reg" />
+ text="uiChaScore4"
+ val="%player_ChaScore4reg"
+ baseval="%player_ChaScore4reg_base"
+ tooltip="uittIdentityChaScore4Reg" />
+ y="-52">
+ text="uiCarac_ChaScore1Max"
+ val="%player_carac_ChaScore1max"
+ tooltip="uittIdentityCha1" />
+ text="uiCarac_ChaScore3Max"
+ val="%player_carac_ChaScore3max"
+ tooltip="uittIdentityCha3" />
+ text="uiCarac_ChaScore2Max"
+ val="%player_carac_ChaScore2max"
+ tooltip="uittIdentityCha2" />
+ text="uiCarac_ChaScore4Max"
+ val="%player_carac_ChaScore4max"
+ tooltip="uittIdentityCha4" />
+ text="uiCarac_ChaScore1Reg"
+ val="%player_carac_ChaScore1reg"
+ tooltip="uittIdentityCha1Reg" />
+ text="uiCarac_ChaScore3Reg"
+ val="%player_carac_ChaScore3reg"
+ tooltip="uittIdentityCha3Reg" />
+ tooltip="uittIdentityCha2Reg" />
+ text="uiCarac_ChaScore4Reg"
+ val="%player_carac_ChaScore4reg"
+ tooltip="uittIdentityCha4Reg" />
+ y="-248">
@@ -1024,7 +1024,7 @@
w="-1"
x="1"
h="83"
- y="-264">
+ y="-248">
@@ -1110,8 +1110,8 @@
posref="TL TL"
sizeref="w5"
w="-1"
- h="155"
- y="-347">
+ h="157"
+ y="-338">
+ h="158"
+ y="-337">
+ h="42"
+ y="-500">
+ h="42"
+ y="-500">
@@ -1453,8 +1453,8 @@
inherit_gc_alpha="true" />
-
-
+
-
-
-
+
-
-
-
-
-
-
@@ -253,11 +253,11 @@
-
-
-
@@ -1025,21 +1025,21 @@
-
-
-
-
-
-
@@ -1512,6 +1512,8 @@
type="I5" />
+