Переглянути джерело

private module, some minor updates

SBird1337 7 роки тому
джерело
коміт
96febdc7fd

+ 1
- 1
nbproject/configurations.xml Переглянути файл

@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<configurationDescriptor version="100">
2
+<configurationDescriptor version="97">
3 3
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
4 4
     <df root="." name="0">
5 5
       <df name="data">

+ 4
- 881
nbproject/private/configurations.xml Переглянути файл

@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<configurationDescriptor version="100">
2
+<configurationDescriptor version="97">
3 3
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
4 4
     <df root="." name="0">
5 5
       <df name="assets">
@@ -544,8 +544,6 @@
544 544
           <in>ow_0529.s</in>
545 545
           <in>ow_0530.s</in>
546 546
           <in>ow_0531.s</in>
547
-          <in>ow_077.s</in>
548
-          <in>ow_175.s</in>
549 547
         </df>
550 548
         <df name="sprites">
551 549
           <df name="back_sprites">
@@ -4274,159 +4272,6 @@
4274 4272
           </df>
4275 4273
         </df>
4276 4274
         <df name="trainer_sprites">
4277
-          <in>ts_0000.s</in>
4278
-          <in>ts_0001.s</in>
4279
-          <in>ts_0002.s</in>
4280
-          <in>ts_0003.s</in>
4281
-          <in>ts_0004.s</in>
4282
-          <in>ts_0005.s</in>
4283
-          <in>ts_0006.s</in>
4284
-          <in>ts_0007.s</in>
4285
-          <in>ts_0008.s</in>
4286
-          <in>ts_0009.s</in>
4287
-          <in>ts_0010.s</in>
4288
-          <in>ts_0011.s</in>
4289
-          <in>ts_0012.s</in>
4290
-          <in>ts_0013.s</in>
4291
-          <in>ts_0014.s</in>
4292
-          <in>ts_0015.s</in>
4293
-          <in>ts_0016.s</in>
4294
-          <in>ts_0017.s</in>
4295
-          <in>ts_0018.s</in>
4296
-          <in>ts_0019.s</in>
4297
-          <in>ts_0020.s</in>
4298
-          <in>ts_0021.s</in>
4299
-          <in>ts_0022.s</in>
4300
-          <in>ts_0023.s</in>
4301
-          <in>ts_0024.s</in>
4302
-          <in>ts_0025.s</in>
4303
-          <in>ts_0026.s</in>
4304
-          <in>ts_0027.s</in>
4305
-          <in>ts_0028.s</in>
4306
-          <in>ts_0029.s</in>
4307
-          <in>ts_0030.s</in>
4308
-          <in>ts_0031.s</in>
4309
-          <in>ts_0032.s</in>
4310
-          <in>ts_0033.s</in>
4311
-          <in>ts_0034.s</in>
4312
-          <in>ts_0035.s</in>
4313
-          <in>ts_0036.s</in>
4314
-          <in>ts_0037.s</in>
4315
-          <in>ts_0038.s</in>
4316
-          <in>ts_0039.s</in>
4317
-          <in>ts_0040.s</in>
4318
-          <in>ts_0041.s</in>
4319
-          <in>ts_0042.s</in>
4320
-          <in>ts_0043.s</in>
4321
-          <in>ts_0044.s</in>
4322
-          <in>ts_0045.s</in>
4323
-          <in>ts_0046.s</in>
4324
-          <in>ts_0047.s</in>
4325
-          <in>ts_0048.s</in>
4326
-          <in>ts_0049.s</in>
4327
-          <in>ts_0050.s</in>
4328
-          <in>ts_0051.s</in>
4329
-          <in>ts_0052.s</in>
4330
-          <in>ts_0053.s</in>
4331
-          <in>ts_0054.s</in>
4332
-          <in>ts_0055.s</in>
4333
-          <in>ts_0056.s</in>
4334
-          <in>ts_0057.s</in>
4335
-          <in>ts_0058.s</in>
4336
-          <in>ts_0059.s</in>
4337
-          <in>ts_0060.s</in>
4338
-          <in>ts_0061.s</in>
4339
-          <in>ts_0062.s</in>
4340
-          <in>ts_0063.s</in>
4341
-          <in>ts_0064.s</in>
4342
-          <in>ts_0065.s</in>
4343
-          <in>ts_0066.s</in>
4344
-          <in>ts_0067.s</in>
4345
-          <in>ts_0068.s</in>
4346
-          <in>ts_0069.s</in>
4347
-          <in>ts_0070.s</in>
4348
-          <in>ts_0071.s</in>
4349
-          <in>ts_0072.s</in>
4350
-          <in>ts_0073.s</in>
4351
-          <in>ts_0074.s</in>
4352
-          <in>ts_0075.s</in>
4353
-          <in>ts_0076.s</in>
4354
-          <in>ts_0077.s</in>
4355
-          <in>ts_0078.s</in>
4356
-          <in>ts_0079.s</in>
4357
-          <in>ts_0080.s</in>
4358
-          <in>ts_0081.s</in>
4359
-          <in>ts_0082.s</in>
4360
-          <in>ts_0083.s</in>
4361
-          <in>ts_0084.s</in>
4362
-          <in>ts_0085.s</in>
4363
-          <in>ts_0086.s</in>
4364
-          <in>ts_0087.s</in>
4365
-          <in>ts_0088.s</in>
4366
-          <in>ts_0089.s</in>
4367
-          <in>ts_0090.s</in>
4368
-          <in>ts_0091.s</in>
4369
-          <in>ts_0092.s</in>
4370
-          <in>ts_0093.s</in>
4371
-          <in>ts_0094.s</in>
4372
-          <in>ts_0095.s</in>
4373
-          <in>ts_0096.s</in>
4374
-          <in>ts_0097.s</in>
4375
-          <in>ts_0098.s</in>
4376
-          <in>ts_0099.s</in>
4377
-          <in>ts_0100.s</in>
4378
-          <in>ts_0101.s</in>
4379
-          <in>ts_0102.s</in>
4380
-          <in>ts_0103.s</in>
4381
-          <in>ts_0104.s</in>
4382
-          <in>ts_0105.s</in>
4383
-          <in>ts_0106.s</in>
4384
-          <in>ts_0107.s</in>
4385
-          <in>ts_0108.s</in>
4386
-          <in>ts_0109.s</in>
4387
-          <in>ts_0110.s</in>
4388
-          <in>ts_0111.s</in>
4389
-          <in>ts_0112.s</in>
4390
-          <in>ts_0113.s</in>
4391
-          <in>ts_0114.s</in>
4392
-          <in>ts_0115.s</in>
4393
-          <in>ts_0116.s</in>
4394
-          <in>ts_0117.s</in>
4395
-          <in>ts_0118.s</in>
4396
-          <in>ts_0119.s</in>
4397
-          <in>ts_0120.s</in>
4398
-          <in>ts_0121.s</in>
4399
-          <in>ts_0122.s</in>
4400
-          <in>ts_0123.s</in>
4401
-          <in>ts_0124.s</in>
4402
-          <in>ts_0125.s</in>
4403
-          <in>ts_0126.s</in>
4404
-          <in>ts_0127.s</in>
4405
-          <in>ts_0128.s</in>
4406
-          <in>ts_0129.s</in>
4407
-          <in>ts_0130.s</in>
4408
-          <in>ts_0131.s</in>
4409
-          <in>ts_0132.s</in>
4410
-          <in>ts_0133.s</in>
4411
-          <in>ts_0134.s</in>
4412
-          <in>ts_0135.s</in>
4413
-          <in>ts_0136.s</in>
4414
-          <in>ts_0137.s</in>
4415
-          <in>ts_0138.s</in>
4416
-          <in>ts_0139.s</in>
4417
-          <in>ts_0140.s</in>
4418
-          <in>ts_0141.s</in>
4419
-          <in>ts_0142.s</in>
4420
-          <in>ts_0143.s</in>
4421
-          <in>ts_0144.s</in>
4422
-          <in>ts_0145.s</in>
4423
-          <in>ts_0146.s</in>
4424
-          <in>ts_0147.s</in>
4425
-          <in>ts_0148.s</in>
4426
-          <in>ts_0149.s</in>
4427
-          <in>ts_0150.s</in>
4428
-          <in>ts_0151.s</in>
4429
-          <in>ts_0152.s</in>
4430 4275
         </df>
4431 4276
       </df>
4432 4277
       <df name="object">
@@ -4543,7 +4388,7 @@
4543 4388
           </df>
4544 4389
         </df>
4545 4390
         <df name="string">
4546
-          <df name="DE">
4391
+          <df name="de">
4547 4392
             <df name="story_text">
4548 4393
               <df name="hesperia">
4549 4394
               </df>
@@ -4643,725 +4488,7 @@
4643 4488
             <df name="RAW">
4644 4489
             </df>
4645 4490
             <df name="S">
4646
-              <in>cry_001.s</in>
4647
-              <in>cry_002.s</in>
4648
-              <in>cry_003.s</in>
4649
-              <in>cry_004.s</in>
4650
-              <in>cry_005.s</in>
4651
-              <in>cry_006.s</in>
4652
-              <in>cry_007.s</in>
4653
-              <in>cry_008.s</in>
4654
-              <in>cry_009.s</in>
4655
-              <in>cry_010.s</in>
4656
-              <in>cry_011.s</in>
4657
-              <in>cry_012.s</in>
4658
-              <in>cry_013.s</in>
4659
-              <in>cry_014.s</in>
4660
-              <in>cry_015.s</in>
4661
-              <in>cry_016.s</in>
4662
-              <in>cry_017.s</in>
4663
-              <in>cry_018.s</in>
4664
-              <in>cry_019.s</in>
4665
-              <in>cry_020.s</in>
4666
-              <in>cry_021.s</in>
4667
-              <in>cry_022.s</in>
4668
-              <in>cry_023.s</in>
4669
-              <in>cry_024.s</in>
4670
-              <in>cry_025.s</in>
4671
-              <in>cry_026.s</in>
4672
-              <in>cry_027.s</in>
4673
-              <in>cry_028.s</in>
4674
-              <in>cry_029.s</in>
4675
-              <in>cry_030.s</in>
4676
-              <in>cry_031.s</in>
4677
-              <in>cry_032.s</in>
4678
-              <in>cry_033.s</in>
4679
-              <in>cry_034.s</in>
4680
-              <in>cry_035.s</in>
4681
-              <in>cry_036.s</in>
4682
-              <in>cry_037.s</in>
4683
-              <in>cry_038.s</in>
4684
-              <in>cry_039.s</in>
4685
-              <in>cry_040.s</in>
4686
-              <in>cry_041.s</in>
4687
-              <in>cry_042.s</in>
4688
-              <in>cry_043.s</in>
4689
-              <in>cry_044.s</in>
4690
-              <in>cry_045.s</in>
4691
-              <in>cry_046.s</in>
4692
-              <in>cry_047.s</in>
4693
-              <in>cry_048.s</in>
4694
-              <in>cry_049.s</in>
4695
-              <in>cry_050.s</in>
4696
-              <in>cry_051.s</in>
4697
-              <in>cry_052.s</in>
4698
-              <in>cry_053.s</in>
4699
-              <in>cry_054.s</in>
4700
-              <in>cry_055.s</in>
4701
-              <in>cry_056.s</in>
4702
-              <in>cry_057.s</in>
4703
-              <in>cry_058.s</in>
4704
-              <in>cry_059.s</in>
4705
-              <in>cry_060.s</in>
4706
-              <in>cry_061.s</in>
4707
-              <in>cry_062.s</in>
4708
-              <in>cry_063.s</in>
4709
-              <in>cry_064.s</in>
4710
-              <in>cry_065.s</in>
4711
-              <in>cry_066.s</in>
4712
-              <in>cry_067.s</in>
4713
-              <in>cry_068.s</in>
4714
-              <in>cry_069.s</in>
4715
-              <in>cry_070.s</in>
4716
-              <in>cry_071.s</in>
4717
-              <in>cry_072.s</in>
4718
-              <in>cry_073.s</in>
4719
-              <in>cry_074.s</in>
4720
-              <in>cry_075.s</in>
4721
-              <in>cry_076.s</in>
4722
-              <in>cry_077.s</in>
4723
-              <in>cry_078.s</in>
4724
-              <in>cry_079.s</in>
4725
-              <in>cry_080.s</in>
4726
-              <in>cry_081.s</in>
4727
-              <in>cry_082.s</in>
4728
-              <in>cry_083.s</in>
4729
-              <in>cry_084.s</in>
4730
-              <in>cry_085.s</in>
4731
-              <in>cry_086.s</in>
4732
-              <in>cry_087.s</in>
4733
-              <in>cry_088.s</in>
4734
-              <in>cry_089.s</in>
4735
-              <in>cry_090.s</in>
4736
-              <in>cry_091.s</in>
4737
-              <in>cry_092.s</in>
4738
-              <in>cry_093.s</in>
4739
-              <in>cry_094.s</in>
4740
-              <in>cry_095.s</in>
4741
-              <in>cry_096.s</in>
4742
-              <in>cry_097.s</in>
4743
-              <in>cry_098.s</in>
4744
-              <in>cry_099.s</in>
4745
-              <in>cry_100.s</in>
4746
-              <in>cry_101.s</in>
4747
-              <in>cry_102.s</in>
4748
-              <in>cry_103.s</in>
4749
-              <in>cry_104.s</in>
4750
-              <in>cry_105.s</in>
4751
-              <in>cry_106.s</in>
4752
-              <in>cry_107.s</in>
4753
-              <in>cry_108.s</in>
4754
-              <in>cry_109.s</in>
4755
-              <in>cry_110.s</in>
4756
-              <in>cry_111.s</in>
4757
-              <in>cry_112.s</in>
4758
-              <in>cry_113.s</in>
4759
-              <in>cry_114.s</in>
4760
-              <in>cry_115.s</in>
4761
-              <in>cry_116.s</in>
4762
-              <in>cry_117.s</in>
4763
-              <in>cry_118.s</in>
4764
-              <in>cry_119.s</in>
4765
-              <in>cry_120.s</in>
4766
-              <in>cry_121.s</in>
4767
-              <in>cry_122.s</in>
4768
-              <in>cry_123.s</in>
4769
-              <in>cry_124.s</in>
4770
-              <in>cry_125.s</in>
4771
-              <in>cry_126.s</in>
4772
-              <in>cry_127.s</in>
4773
-              <in>cry_128.s</in>
4774
-              <in>cry_129.s</in>
4775
-              <in>cry_130.s</in>
4776
-              <in>cry_131.s</in>
4777
-              <in>cry_132.s</in>
4778
-              <in>cry_133.s</in>
4779
-              <in>cry_134.s</in>
4780
-              <in>cry_135.s</in>
4781
-              <in>cry_136.s</in>
4782
-              <in>cry_137.s</in>
4783
-              <in>cry_138.s</in>
4784
-              <in>cry_139.s</in>
4785
-              <in>cry_140.s</in>
4786
-              <in>cry_141.s</in>
4787
-              <in>cry_142.s</in>
4788
-              <in>cry_143.s</in>
4789
-              <in>cry_144.s</in>
4790
-              <in>cry_145.s</in>
4791
-              <in>cry_146.s</in>
4792
-              <in>cry_147.s</in>
4793
-              <in>cry_148.s</in>
4794
-              <in>cry_149.s</in>
4795
-              <in>cry_150.s</in>
4796
-              <in>cry_151.s</in>
4797
-              <in>cry_152.s</in>
4798
-              <in>cry_153.s</in>
4799
-              <in>cry_154.s</in>
4800
-              <in>cry_155.s</in>
4801
-              <in>cry_156.s</in>
4802
-              <in>cry_157.s</in>
4803
-              <in>cry_158.s</in>
4804
-              <in>cry_159.s</in>
4805
-              <in>cry_160.s</in>
4806
-              <in>cry_161.s</in>
4807
-              <in>cry_162.s</in>
4808
-              <in>cry_163.s</in>
4809
-              <in>cry_164.s</in>
4810
-              <in>cry_165.s</in>
4811
-              <in>cry_166.s</in>
4812
-              <in>cry_167.s</in>
4813
-              <in>cry_168.s</in>
4814
-              <in>cry_169.s</in>
4815
-              <in>cry_170.s</in>
4816
-              <in>cry_171.s</in>
4817
-              <in>cry_172.s</in>
4818
-              <in>cry_173.s</in>
4819
-              <in>cry_174.s</in>
4820
-              <in>cry_175.s</in>
4821
-              <in>cry_176.s</in>
4822
-              <in>cry_177.s</in>
4823
-              <in>cry_178.s</in>
4824
-              <in>cry_179.s</in>
4825
-              <in>cry_180.s</in>
4826
-              <in>cry_181.s</in>
4827
-              <in>cry_182.s</in>
4828
-              <in>cry_183.s</in>
4829
-              <in>cry_184.s</in>
4830
-              <in>cry_185.s</in>
4831
-              <in>cry_186.s</in>
4832
-              <in>cry_187.s</in>
4833
-              <in>cry_188.s</in>
4834
-              <in>cry_189.s</in>
4835
-              <in>cry_190.s</in>
4836
-              <in>cry_191.s</in>
4837
-              <in>cry_192.s</in>
4838
-              <in>cry_193.s</in>
4839
-              <in>cry_194.s</in>
4840
-              <in>cry_195.s</in>
4841
-              <in>cry_196.s</in>
4842
-              <in>cry_197.s</in>
4843
-              <in>cry_198.s</in>
4844
-              <in>cry_199.s</in>
4845
-              <in>cry_200.s</in>
4846
-              <in>cry_201.s</in>
4847
-              <in>cry_202.s</in>
4848
-              <in>cry_203.s</in>
4849
-              <in>cry_204.s</in>
4850
-              <in>cry_205.s</in>
4851
-              <in>cry_206.s</in>
4852
-              <in>cry_207.s</in>
4853
-              <in>cry_208.s</in>
4854
-              <in>cry_209.s</in>
4855
-              <in>cry_210.s</in>
4856
-              <in>cry_211.s</in>
4857
-              <in>cry_212.s</in>
4858
-              <in>cry_213.s</in>
4859
-              <in>cry_214.s</in>
4860
-              <in>cry_215.s</in>
4861
-              <in>cry_216.s</in>
4862
-              <in>cry_217.s</in>
4863
-              <in>cry_218.s</in>
4864
-              <in>cry_219.s</in>
4865
-              <in>cry_220.s</in>
4866
-              <in>cry_221.s</in>
4867
-              <in>cry_222.s</in>
4868
-              <in>cry_223.s</in>
4869
-              <in>cry_224.s</in>
4870
-              <in>cry_225.s</in>
4871
-              <in>cry_226.s</in>
4872
-              <in>cry_227.s</in>
4873
-              <in>cry_228.s</in>
4874
-              <in>cry_229.s</in>
4875
-              <in>cry_230.s</in>
4876
-              <in>cry_231.s</in>
4877
-              <in>cry_232.s</in>
4878
-              <in>cry_233.s</in>
4879
-              <in>cry_234.s</in>
4880
-              <in>cry_235.s</in>
4881
-              <in>cry_236.s</in>
4882
-              <in>cry_237.s</in>
4883
-              <in>cry_238.s</in>
4884
-              <in>cry_239.s</in>
4885
-              <in>cry_240.s</in>
4886
-              <in>cry_241.s</in>
4887
-              <in>cry_242.s</in>
4888
-              <in>cry_243.s</in>
4889
-              <in>cry_244.s</in>
4890
-              <in>cry_245.s</in>
4891
-              <in>cry_246.s</in>
4892
-              <in>cry_247.s</in>
4893
-              <in>cry_248.s</in>
4894
-              <in>cry_249.s</in>
4895
-              <in>cry_250.s</in>
4896
-              <in>cry_251.s</in>
4897
-              <in>cry_252.s</in>
4898
-              <in>cry_253.s</in>
4899
-              <in>cry_254.s</in>
4900
-              <in>cry_255.s</in>
4901
-              <in>cry_256.s</in>
4902
-              <in>cry_257.s</in>
4903
-              <in>cry_258.s</in>
4904
-              <in>cry_259.s</in>
4905
-              <in>cry_260.s</in>
4906
-              <in>cry_261.s</in>
4907
-              <in>cry_262.s</in>
4908
-              <in>cry_263.s</in>
4909
-              <in>cry_264.s</in>
4910
-              <in>cry_265.s</in>
4911
-              <in>cry_266.s</in>
4912
-              <in>cry_267.s</in>
4913
-              <in>cry_268.s</in>
4914
-              <in>cry_269.s</in>
4915
-              <in>cry_270.s</in>
4916
-              <in>cry_271.s</in>
4917
-              <in>cry_272.s</in>
4918
-              <in>cry_273.s</in>
4919
-              <in>cry_274.s</in>
4920
-              <in>cry_275.s</in>
4921
-              <in>cry_276.s</in>
4922
-              <in>cry_277.s</in>
4923
-              <in>cry_278.s</in>
4924
-              <in>cry_279.s</in>
4925
-              <in>cry_280.s</in>
4926
-              <in>cry_281.s</in>
4927
-              <in>cry_282.s</in>
4928
-              <in>cry_283.s</in>
4929
-              <in>cry_284.s</in>
4930
-              <in>cry_285.s</in>
4931
-              <in>cry_286.s</in>
4932
-              <in>cry_287.s</in>
4933
-              <in>cry_288.s</in>
4934
-              <in>cry_289.s</in>
4935
-              <in>cry_290.s</in>
4936
-              <in>cry_291.s</in>
4937
-              <in>cry_292.s</in>
4938
-              <in>cry_293.s</in>
4939
-              <in>cry_294.s</in>
4940
-              <in>cry_295.s</in>
4941
-              <in>cry_296.s</in>
4942
-              <in>cry_297.s</in>
4943
-              <in>cry_298.s</in>
4944
-              <in>cry_299.s</in>
4945
-              <in>cry_300.s</in>
4946
-              <in>cry_301.s</in>
4947
-              <in>cry_302.s</in>
4948
-              <in>cry_303.s</in>
4949
-              <in>cry_304.s</in>
4950
-              <in>cry_305.s</in>
4951
-              <in>cry_306.s</in>
4952
-              <in>cry_307.s</in>
4953
-              <in>cry_308.s</in>
4954
-              <in>cry_309.s</in>
4955
-              <in>cry_310.s</in>
4956
-              <in>cry_311.s</in>
4957
-              <in>cry_312.s</in>
4958
-              <in>cry_313.s</in>
4959
-              <in>cry_314.s</in>
4960
-              <in>cry_315.s</in>
4961
-              <in>cry_316.s</in>
4962
-              <in>cry_317.s</in>
4963
-              <in>cry_318.s</in>
4964
-              <in>cry_319.s</in>
4965
-              <in>cry_320.s</in>
4966
-              <in>cry_321.s</in>
4967
-              <in>cry_322.s</in>
4968
-              <in>cry_323.s</in>
4969
-              <in>cry_324.s</in>
4970
-              <in>cry_325.s</in>
4971
-              <in>cry_326.s</in>
4972
-              <in>cry_327.s</in>
4973
-              <in>cry_328.s</in>
4974
-              <in>cry_329.s</in>
4975
-              <in>cry_330.s</in>
4976
-              <in>cry_331.s</in>
4977
-              <in>cry_332.s</in>
4978
-              <in>cry_333.s</in>
4979
-              <in>cry_334.s</in>
4980
-              <in>cry_335.s</in>
4981
-              <in>cry_336.s</in>
4982
-              <in>cry_337.s</in>
4983
-              <in>cry_338.s</in>
4984
-              <in>cry_339.s</in>
4985
-              <in>cry_340.s</in>
4986
-              <in>cry_341.s</in>
4987
-              <in>cry_342.s</in>
4988
-              <in>cry_343.s</in>
4989
-              <in>cry_344.s</in>
4990
-              <in>cry_345.s</in>
4991
-              <in>cry_346.s</in>
4992
-              <in>cry_347.s</in>
4993
-              <in>cry_348.s</in>
4994
-              <in>cry_349.s</in>
4995
-              <in>cry_350.s</in>
4996
-              <in>cry_351.s</in>
4997
-              <in>cry_352.s</in>
4998
-              <in>cry_353.s</in>
4999
-              <in>cry_354.s</in>
5000
-              <in>cry_355.s</in>
5001
-              <in>cry_356.s</in>
5002
-              <in>cry_357.s</in>
5003
-              <in>cry_358.s</in>
5004
-              <in>cry_359.s</in>
5005
-              <in>cry_360.s</in>
5006
-              <in>cry_361.s</in>
5007
-              <in>cry_362.s</in>
5008
-              <in>cry_363.s</in>
5009
-              <in>cry_364.s</in>
5010
-              <in>cry_365.s</in>
5011
-              <in>cry_366.s</in>
5012
-              <in>cry_367.s</in>
5013
-              <in>cry_368.s</in>
5014
-              <in>cry_369.s</in>
5015
-              <in>cry_370.s</in>
5016
-              <in>cry_371.s</in>
5017
-              <in>cry_372.s</in>
5018
-              <in>cry_373.s</in>
5019
-              <in>cry_374.s</in>
5020
-              <in>cry_375.s</in>
5021
-              <in>cry_376.s</in>
5022
-              <in>cry_377.s</in>
5023
-              <in>cry_378.s</in>
5024
-              <in>cry_379.s</in>
5025
-              <in>cry_380.s</in>
5026
-              <in>cry_381.s</in>
5027
-              <in>cry_382.s</in>
5028
-              <in>cry_383.s</in>
5029
-              <in>cry_384.s</in>
5030
-              <in>cry_385.s</in>
5031
-              <in>cry_386.s</in>
5032
-              <in>cry_387.s</in>
5033
-              <in>cry_388.s</in>
5034
-              <in>cry_389.s</in>
5035
-              <in>cry_390.s</in>
5036
-              <in>cry_391.s</in>
5037
-              <in>cry_392.s</in>
5038
-              <in>cry_393.s</in>
5039
-              <in>cry_394.s</in>
5040
-              <in>cry_395.s</in>
5041
-              <in>cry_396.s</in>
5042
-              <in>cry_397.s</in>
5043
-              <in>cry_398.s</in>
5044
-              <in>cry_399.s</in>
5045
-              <in>cry_400.s</in>
5046
-              <in>cry_401.s</in>
5047
-              <in>cry_402.s</in>
5048
-              <in>cry_403.s</in>
5049
-              <in>cry_404.s</in>
5050
-              <in>cry_405.s</in>
5051
-              <in>cry_406.s</in>
5052
-              <in>cry_407.s</in>
5053
-              <in>cry_408.s</in>
5054
-              <in>cry_409.s</in>
5055
-              <in>cry_410.s</in>
5056
-              <in>cry_411.s</in>
5057
-              <in>cry_412.s</in>
5058
-              <in>cry_413.s</in>
5059
-              <in>cry_414.s</in>
5060
-              <in>cry_415.s</in>
5061
-              <in>cry_416.s</in>
5062
-              <in>cry_417.s</in>
5063
-              <in>cry_418.s</in>
5064
-              <in>cry_419.s</in>
5065
-              <in>cry_420.s</in>
5066
-              <in>cry_421.s</in>
5067
-              <in>cry_422.s</in>
5068
-              <in>cry_423.s</in>
5069
-              <in>cry_424.s</in>
5070
-              <in>cry_425.s</in>
5071
-              <in>cry_426.s</in>
5072
-              <in>cry_427.s</in>
5073
-              <in>cry_428.s</in>
5074
-              <in>cry_429.s</in>
5075
-              <in>cry_430.s</in>
5076
-              <in>cry_431.s</in>
5077
-              <in>cry_432.s</in>
5078
-              <in>cry_433.s</in>
5079
-              <in>cry_434.s</in>
5080
-              <in>cry_435.s</in>
5081
-              <in>cry_436.s</in>
5082
-              <in>cry_437.s</in>
5083
-              <in>cry_438.s</in>
5084
-              <in>cry_439.s</in>
5085
-              <in>cry_440.s</in>
5086
-              <in>cry_441.s</in>
5087
-              <in>cry_442.s</in>
5088
-              <in>cry_443.s</in>
5089
-              <in>cry_444.s</in>
5090
-              <in>cry_445.s</in>
5091
-              <in>cry_446.s</in>
5092
-              <in>cry_447.s</in>
5093
-              <in>cry_448.s</in>
5094
-              <in>cry_449.s</in>
5095
-              <in>cry_450.s</in>
5096
-              <in>cry_451.s</in>
5097
-              <in>cry_452.s</in>
5098
-              <in>cry_453.s</in>
5099
-              <in>cry_454.s</in>
5100
-              <in>cry_455.s</in>
5101
-              <in>cry_456.s</in>
5102
-              <in>cry_457.s</in>
5103
-              <in>cry_458.s</in>
5104
-              <in>cry_459.s</in>
5105
-              <in>cry_460.s</in>
5106
-              <in>cry_461.s</in>
5107
-              <in>cry_462.s</in>
5108
-              <in>cry_463.s</in>
5109
-              <in>cry_464.s</in>
5110
-              <in>cry_465.s</in>
5111
-              <in>cry_466.s</in>
5112
-              <in>cry_467.s</in>
5113
-              <in>cry_468.s</in>
5114
-              <in>cry_469.s</in>
5115
-              <in>cry_470.s</in>
5116
-              <in>cry_471.s</in>
5117
-              <in>cry_472.s</in>
5118
-              <in>cry_473.s</in>
5119
-              <in>cry_474.s</in>
5120
-              <in>cry_475.s</in>
5121
-              <in>cry_476.s</in>
5122
-              <in>cry_477.s</in>
5123
-              <in>cry_478.s</in>
5124
-              <in>cry_479.s</in>
5125
-              <in>cry_480.s</in>
5126
-              <in>cry_481.s</in>
5127
-              <in>cry_482.s</in>
5128
-              <in>cry_483.s</in>
5129
-              <in>cry_484.s</in>
5130
-              <in>cry_485.s</in>
5131
-              <in>cry_486.s</in>
5132
-              <in>cry_487.s</in>
5133
-              <in>cry_488.s</in>
5134
-              <in>cry_489.s</in>
5135
-              <in>cry_490.s</in>
5136
-              <in>cry_491.s</in>
5137 4491
               <in>cry_492.s</in>
5138
-              <in>cry_492_zenith.s</in>
5139
-              <in>cry_493.s</in>
5140
-              <in>cry_494.s</in>
5141
-              <in>cry_495.s</in>
5142
-              <in>cry_496.s</in>
5143
-              <in>cry_497.s</in>
5144
-              <in>cry_498.s</in>
5145
-              <in>cry_499.s</in>
5146
-              <in>cry_500.s</in>
5147
-              <in>cry_501.s</in>
5148
-              <in>cry_502.s</in>
5149
-              <in>cry_503.s</in>
5150
-              <in>cry_504.s</in>
5151
-              <in>cry_505.s</in>
5152
-              <in>cry_506.s</in>
5153
-              <in>cry_507.s</in>
5154
-              <in>cry_508.s</in>
5155
-              <in>cry_509.s</in>
5156
-              <in>cry_510.s</in>
5157
-              <in>cry_511.s</in>
5158
-              <in>cry_512.s</in>
5159
-              <in>cry_513.s</in>
5160
-              <in>cry_514.s</in>
5161
-              <in>cry_515.s</in>
5162
-              <in>cry_516.s</in>
5163
-              <in>cry_517.s</in>
5164
-              <in>cry_518.s</in>
5165
-              <in>cry_519.s</in>
5166
-              <in>cry_520.s</in>
5167
-              <in>cry_521.s</in>
5168
-              <in>cry_522.s</in>
5169
-              <in>cry_523.s</in>
5170
-              <in>cry_524.s</in>
5171
-              <in>cry_525.s</in>
5172
-              <in>cry_526.s</in>
5173
-              <in>cry_527.s</in>
5174
-              <in>cry_528.s</in>
5175
-              <in>cry_529.s</in>
5176
-              <in>cry_530.s</in>
5177
-              <in>cry_531.s</in>
5178
-              <in>cry_532.s</in>
5179
-              <in>cry_533.s</in>
5180
-              <in>cry_534.s</in>
5181
-              <in>cry_535.s</in>
5182
-              <in>cry_536.s</in>
5183
-              <in>cry_537.s</in>
5184
-              <in>cry_538.s</in>
5185
-              <in>cry_539.s</in>
5186
-              <in>cry_540.s</in>
5187
-              <in>cry_541.s</in>
5188
-              <in>cry_542.s</in>
5189
-              <in>cry_543.s</in>
5190
-              <in>cry_544.s</in>
5191
-              <in>cry_545.s</in>
5192
-              <in>cry_546.s</in>
5193
-              <in>cry_547.s</in>
5194
-              <in>cry_548.s</in>
5195
-              <in>cry_549.s</in>
5196
-              <in>cry_550.s</in>
5197
-              <in>cry_551.s</in>
5198
-              <in>cry_552.s</in>
5199
-              <in>cry_553.s</in>
5200
-              <in>cry_554.s</in>
5201
-              <in>cry_555.s</in>
5202
-              <in>cry_556.s</in>
5203
-              <in>cry_557.s</in>
5204
-              <in>cry_558.s</in>
5205
-              <in>cry_559.s</in>
5206
-              <in>cry_560.s</in>
5207
-              <in>cry_561.s</in>
5208
-              <in>cry_562.s</in>
5209
-              <in>cry_563.s</in>
5210
-              <in>cry_564.s</in>
5211
-              <in>cry_565.s</in>
5212
-              <in>cry_566.s</in>
5213
-              <in>cry_567.s</in>
5214
-              <in>cry_568.s</in>
5215
-              <in>cry_569.s</in>
5216
-              <in>cry_570.s</in>
5217
-              <in>cry_571.s</in>
5218
-              <in>cry_572.s</in>
5219
-              <in>cry_573.s</in>
5220
-              <in>cry_574.s</in>
5221
-              <in>cry_575.s</in>
5222
-              <in>cry_576.s</in>
5223
-              <in>cry_577.s</in>
5224
-              <in>cry_578.s</in>
5225
-              <in>cry_579.s</in>
5226
-              <in>cry_580.s</in>
5227
-              <in>cry_581.s</in>
5228
-              <in>cry_582.s</in>
5229
-              <in>cry_583.s</in>
5230
-              <in>cry_584.s</in>
5231
-              <in>cry_585.s</in>
5232
-              <in>cry_586.s</in>
5233
-              <in>cry_587.s</in>
5234
-              <in>cry_588.s</in>
5235
-              <in>cry_589.s</in>
5236
-              <in>cry_590.s</in>
5237
-              <in>cry_591.s</in>
5238
-              <in>cry_592.s</in>
5239
-              <in>cry_593.s</in>
5240
-              <in>cry_594.s</in>
5241
-              <in>cry_595.s</in>
5242
-              <in>cry_596.s</in>
5243
-              <in>cry_597.s</in>
5244
-              <in>cry_598.s</in>
5245
-              <in>cry_599.s</in>
5246
-              <in>cry_600.s</in>
5247
-              <in>cry_601.s</in>
5248
-              <in>cry_602.s</in>
5249
-              <in>cry_603.s</in>
5250
-              <in>cry_604.s</in>
5251
-              <in>cry_605.s</in>
5252
-              <in>cry_606.s</in>
5253
-              <in>cry_607.s</in>
5254
-              <in>cry_608.s</in>
5255
-              <in>cry_609.s</in>
5256
-              <in>cry_610.s</in>
5257
-              <in>cry_611.s</in>
5258
-              <in>cry_612.s</in>
5259
-              <in>cry_613.s</in>
5260
-              <in>cry_614.s</in>
5261
-              <in>cry_615.s</in>
5262
-              <in>cry_616.s</in>
5263
-              <in>cry_617.s</in>
5264
-              <in>cry_618.s</in>
5265
-              <in>cry_619.s</in>
5266
-              <in>cry_620.s</in>
5267
-              <in>cry_621.s</in>
5268
-              <in>cry_622.s</in>
5269
-              <in>cry_623.s</in>
5270
-              <in>cry_624.s</in>
5271
-              <in>cry_625.s</in>
5272
-              <in>cry_626.s</in>
5273
-              <in>cry_627.s</in>
5274
-              <in>cry_628.s</in>
5275
-              <in>cry_629.s</in>
5276
-              <in>cry_630.s</in>
5277
-              <in>cry_631.s</in>
5278
-              <in>cry_632.s</in>
5279
-              <in>cry_633.s</in>
5280
-              <in>cry_634.s</in>
5281
-              <in>cry_635.s</in>
5282
-              <in>cry_636.s</in>
5283
-              <in>cry_637.s</in>
5284
-              <in>cry_638.s</in>
5285
-              <in>cry_639.s</in>
5286
-              <in>cry_640.s</in>
5287
-              <in>cry_641.s</in>
5288
-              <in>cry_642.s</in>
5289
-              <in>cry_643.s</in>
5290
-              <in>cry_644.s</in>
5291
-              <in>cry_645.s</in>
5292
-              <in>cry_646.s</in>
5293
-              <in>cry_647.s</in>
5294
-              <in>cry_648.s</in>
5295
-              <in>cry_649.s</in>
5296
-              <in>cry_650.s</in>
5297
-              <in>cry_651.s</in>
5298
-              <in>cry_652.s</in>
5299
-              <in>cry_653.s</in>
5300
-              <in>cry_654.s</in>
5301
-              <in>cry_655.s</in>
5302
-              <in>cry_656.s</in>
5303
-              <in>cry_657.s</in>
5304
-              <in>cry_658.s</in>
5305
-              <in>cry_659.s</in>
5306
-              <in>cry_660.s</in>
5307
-              <in>cry_661.s</in>
5308
-              <in>cry_662.s</in>
5309
-              <in>cry_663.s</in>
5310
-              <in>cry_664.s</in>
5311
-              <in>cry_665.s</in>
5312
-              <in>cry_666.s</in>
5313
-              <in>cry_667.s</in>
5314
-              <in>cry_668.s</in>
5315
-              <in>cry_669.s</in>
5316
-              <in>cry_670.s</in>
5317
-              <in>cry_671.s</in>
5318
-              <in>cry_672.s</in>
5319
-              <in>cry_673.s</in>
5320
-              <in>cry_674.s</in>
5321
-              <in>cry_675.s</in>
5322
-              <in>cry_676.s</in>
5323
-              <in>cry_677.s</in>
5324
-              <in>cry_678.s</in>
5325
-              <in>cry_679.s</in>
5326
-              <in>cry_680.s</in>
5327
-              <in>cry_681.s</in>
5328
-              <in>cry_682.s</in>
5329
-              <in>cry_683.s</in>
5330
-              <in>cry_684.s</in>
5331
-              <in>cry_685.s</in>
5332
-              <in>cry_686.s</in>
5333
-              <in>cry_687.s</in>
5334
-              <in>cry_688.s</in>
5335
-              <in>cry_689.s</in>
5336
-              <in>cry_690.s</in>
5337
-              <in>cry_691.s</in>
5338
-              <in>cry_692.s</in>
5339
-              <in>cry_693.s</in>
5340
-              <in>cry_694.s</in>
5341
-              <in>cry_695.s</in>
5342
-              <in>cry_696.s</in>
5343
-              <in>cry_697.s</in>
5344
-              <in>cry_698.s</in>
5345
-              <in>cry_699.s</in>
5346
-              <in>cry_700.s</in>
5347
-              <in>cry_701.s</in>
5348
-              <in>cry_702.s</in>
5349
-              <in>cry_703.s</in>
5350
-              <in>cry_704.s</in>
5351
-              <in>cry_705.s</in>
5352
-              <in>cry_706.s</in>
5353
-              <in>cry_707.s</in>
5354
-              <in>cry_708.s</in>
5355
-              <in>cry_709.s</in>
5356
-              <in>cry_710.s</in>
5357
-              <in>cry_711.s</in>
5358
-              <in>cry_712.s</in>
5359
-              <in>cry_713.s</in>
5360
-              <in>cry_714.s</in>
5361
-              <in>cry_715.s</in>
5362
-              <in>cry_716.s</in>
5363
-              <in>cry_717.s</in>
5364
-              <in>cry_718.s</in>
5365 4492
               <in>cry_NULL.s</in>
5366 4493
             </df>
5367 4494
             <df name="TABLE">
@@ -5877,13 +5004,7 @@
5877 5004
               <in>snd_106_shamisen.s</in>
5878 5005
               <in>snd_107_koto.s</in>
5879 5006
               <in>snd_10_musicbox.s</in>
5880
-              <in>snd_116_taiko_drum.s</in>
5881 5007
               <in>snd_11_vibes.s</in>
5882
-              <in>snd_127_bassdrum.s</in>
5883
-              <in>snd_127_bongo_hi.s</in>
5884
-              <in>snd_127_bongo_lo.s</in>
5885
-              <in>snd_127_clap.s</in>
5886
-              <in>snd_127_claves.s</in>
5887 5008
               <in>snd_127_closed_hat.s</in>
5888 5009
               <in>snd_127_conga_hi.s</in>
5889 5010
               <in>snd_127_conga_hi_sl.s</in>
@@ -6083,6 +5204,8 @@
6083 5204
               </df>
6084 5205
               <df name="chords_normalized">
6085 5206
               </df>
5207
+              <df name="guitar">
5208
+              </df>
6086 5209
             </df>
6087 5210
             <df name="WAV">
6088 5211
             </df>

+ 73
- 6
nbproject/private/private.xml Переглянути файл

@@ -19,12 +19,79 @@
19 19
     </editor-bookmarks>
20 20
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
21 21
         <group>
22
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/assets.makefile</file>
23
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/string/de/story_text/hesperia/player_house.txt</file>
24
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/data/text_lookup/text_lookup_array.s</file>
25
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/string/table.tbl</file>
26
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/string/de/story_text/hesperia/globals.txt</file>
27
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/string/de/story_text/tundra_hq/globals.txt</file>
22
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/makefile</file>
23
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/music.asm</file>
24
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/uturn/u_turn_script.S</file>
25
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_switch_in_hook.S</file>
26
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/tm_fixes.asm</file>
27
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/trainer_run.S</file>
28
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/item_limits.asm</file>
29
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/item_routines.asm</file>
30
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/move_strings.txt</file>
31
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/overworld_hooks.S</file>
32
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/custom_structs_malloc.c</file>
33
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/entry_hazards.c</file>
34
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/types.h</file>
35
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/hazards.txt</file>
36
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/overworlds/trainer.asm</file>
37
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/gfx_build/sprites/back_sprites/.gitignore</file>
38
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/moves.h</file>
39
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/item_data.txt</file>
40
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_structs.h</file>
41
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/linker.ld</file>
42
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_end_of_turn.c</file>
43
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/item_descriptions.txt</file>
44
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/icons.makefile</file>
45
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/sprites.makefile</file>
46
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_locations.h</file>
47
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/tailwind/tailwind_scripts.S</file>
48
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_test.c</file>
49
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/items.asm</file>
50
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/hooks.asm</file>
51
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/item/tm_hm_move_table.S</file>
52
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/specials/custom_specials.c</file>
53
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/feint/feint_scripts.S</file>
54
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/move_table.asm</file>
55
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/item/item_scripts.S</file>
56
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_end_of_turn_hook.S</file>
57
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/pkmn_tables/pokemon_moveset_table.S</file>
58
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/roost/roost_scripts.S</file>
59
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/bpre.h</file>
60
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/interface/textbox_mugshots.c</file>
61
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/tailwind/tailwind.c</file>
62
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/dynamic_overworld_hooks.asm</file>
63
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/moves/move_data.S</file>
64
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/config.h</file>
65
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/bride/bride_scripts.S</file>
66
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_initiative.c</file>
67
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/disable_cry_table_blocks.s</file>
68
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/moves.asm</file>
69
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/moves/effect_table.S</file>
70
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/metal_burst/metal_burst.c</file>
71
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_abilities.h</file>
72
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/moves/animation_table.S</file>
73
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/main.asm</file>
74
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/roost/roost.c</file>
75
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/gfx_build/overworlds/.gitignore</file>
76
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/table.tbl</file>
77
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/item_tables.asm</file>
78
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/battle_engine/malloc.asm</file>
79
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/hazards/hazards_scripts.S</file>
80
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/feint/feint.c</file>
81
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/bpre.sym</file>
82
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/assets.makefile</file>
83
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/battle_engine/battle_engine.asm</file>
84
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/battle_engine/bs_table.S</file>
85
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/metal_burst/metal_burst_script.S</file>
86
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/overworlds/overworld.asm</file>
87
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/dns/dns_core.c</file>
88
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/special.asm</file>
89
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/overworld.c</file>
90
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/custom_structs_malloc_hook.S</file>
91
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/bride/bride.c</file>
92
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/split_physical_special.asm</file>
93
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/entry_hazards_hook.S</file>
94
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_script.h</file>
28 95
         </group>
29 96
     </open-files>
30 97
 </project-private>

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 7e3e3f73103207143c99a0662c36d4281cefda2e
1
+Subproject commit e0c9161af72cceec0ef48b5131cc346e69b490c9

+ 1
- 1
src/include/assets/interface/text_box.img.h Переглянути файл

@@ -7,7 +7,7 @@
7 7
 //	+ 38 tiles not compressed
8 8
 //	Total size: 1216 = 1216
9 9
 //
10
-//	Time-stamp: 2017-01-01, 17:52:58
10
+//	Time-stamp: 2017-01-21, 12:22:18
11 11
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
12 12
 //	( http://www.coranac.com/projects/#grit )
13 13
 //

+ 1
- 1
src/include/assets/mug/mug_00.c Переглянути файл

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 188 = 220
10 10
 //
11
-//	Time-stamp: 2017-01-01, 14:21:14
11
+//	Time-stamp: 2017-01-21, 12:22:18
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //

+ 1
- 1
src/include/assets/mug/mug_00.h Переглянути файл

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 188 = 220
10 10
 //
11
-//	Time-stamp: 2017-01-01, 14:21:14
11
+//	Time-stamp: 2017-01-21, 12:22:18
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //

+ 1
- 1
src/include/assets/mug/mug_05.c Переглянути файл

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 472 = 504
10 10
 //
11
-//	Time-stamp: 2017-01-01, 14:21:14
11
+//	Time-stamp: 2017-01-21, 12:22:18
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //

+ 1
- 1
src/include/assets/mug/mug_05.h Переглянути файл

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 472 = 504
10 10
 //
11
-//	Time-stamp: 2017-01-01, 14:21:14
11
+//	Time-stamp: 2017-01-21, 12:22:18
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //

+ 1
- 1
src/include/assets/mug/mug_08.c Переглянути файл

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 492 = 524
10 10
 //
11
-//	Time-stamp: 2017-01-01, 14:21:14
11
+//	Time-stamp: 2017-01-21, 12:22:18
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //

+ 1
- 1
src/include/assets/mug/mug_08.h Переглянути файл

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 492 = 524
10 10
 //
11
-//	Time-stamp: 2017-01-01, 14:21:14
11
+//	Time-stamp: 2017-01-21, 12:22:18
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //

+ 1
- 1
src/include/assets/mug/mug_09.c Переглянути файл

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 476 = 508
10 10
 //
11
-//	Time-stamp: 2017-01-01, 14:21:14
11
+//	Time-stamp: 2017-01-21, 12:22:18
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //

+ 1
- 1
src/include/assets/mug/mug_09.h Переглянути файл

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 476 = 508
10 10
 //
11
-//	Time-stamp: 2017-01-01, 14:21:14
11
+//	Time-stamp: 2017-01-21, 12:22:18
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //

+ 1
- 1
src/include/assets/mug/mug_11.c Переглянути файл

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 504 = 536
10 10
 //
11
-//	Time-stamp: 2017-01-01, 14:21:14
11
+//	Time-stamp: 2017-01-21, 12:22:18
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //

+ 1
- 1
src/include/assets/mug/mug_11.h Переглянути файл

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 504 = 536
10 10
 //
11
-//	Time-stamp: 2017-01-01, 14:21:14
11
+//	Time-stamp: 2017-01-21, 12:22:18
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //

+ 1
- 0
src/specials/trainer_battle.c Переглянути файл

@@ -115,6 +115,7 @@ u16 tb_modify_flag_id(u16 flag)
115 115
             return flag + 2;
116 116
     }
117 117
     assert(0);
118
+    return 0;
118 119
 }
119 120
 
120 121
 /**