4.11 -> 4.2

Update diff
This commit is contained in:
Josh Freeman
2018-01-30 08:59:07 +00:00
parent 01b5e5a7f3
commit e4ef0f4400
579 changed files with 90883 additions and 64028 deletions
+7 -7
View File
@@ -646,7 +646,7 @@ int32,str,str
652,"cbnm_swu_rise2","cbnm_swu_id0"
653,"cbem_sp05_1","cbem_sp05_2lp"
654,"cblm_item_fsc","cblm_id0_fsc"
655,"",""
655,"cbem_sp06","cbnm_id0"
656,"cblm_swu_abl_hr_a","cblm_swu_id0_hr_2lp"
657,"cbnm_swo_itm_1","cbnm_swo_itm_2lp"
658,"cbnm_swo_itm_3","cbnm_swo_id0"
@@ -837,15 +837,15 @@ int32,str,str
843,"cbbm_lbk_plt_3b","cbbm_id0"
844,"cbbm_bnpc_lbk_plt","cbbm_id0"
845,"cbnm_mini_pop","cbnm_id0"
846,"",""
847,"",""
846,"cbem_act_emot13","cbnm_id0"
847,"cbem_act_emot14","cbnm_id0"
848,"",""
849,"",""
850,"",""
851,"",""
852,"",""
853,"",""
854,"",""
851,"cbnm_msc_inst01_id0_1","cbnm_msc_inst01_id0_2lp"
852,"cbnm_msc_inst01_id0_3","cbnm_id0"
853,"cbnm_msc_inst01_play01_1","cbnm_msc_inst01_play01_2lp"
854,"cbnm_msc_inst01_play02_1","cbnm_msc_inst01_play02_2lp"
855,"",""
856,"",""
857,"",""
1 key 0 1
646 652 cbnm_swu_rise2 cbnm_swu_id0
647 653 cbem_sp05_1 cbem_sp05_2lp
648 654 cblm_item_fsc cblm_id0_fsc
649 655 cbem_sp06 cbnm_id0
650 656 cblm_swu_abl_hr_a cblm_swu_id0_hr_2lp
651 657 cbnm_swo_itm_1 cbnm_swo_itm_2lp
652 658 cbnm_swo_itm_3 cbnm_swo_id0
837 843 cbbm_lbk_plt_3b cbbm_id0
838 844 cbbm_bnpc_lbk_plt cbbm_id0
839 845 cbnm_mini_pop cbnm_id0
840 846 cbem_act_emot13 cbnm_id0
841 847 cbem_act_emot14 cbnm_id0
842 848
843 849
844 850
845 851 cbnm_msc_inst01_id0_1 cbnm_msc_inst01_id0_2lp
846 852 cbnm_msc_inst01_id0_3 cbnm_id0
847 853 cbnm_msc_inst01_play01_1 cbnm_msc_inst01_play01_2lp
848 854 cbnm_msc_inst01_play02_1 cbnm_msc_inst01_play02_2lp
849 855
850 856
851 857