i dont even know

gfx_build/.gitignore

@@ -1,2 +1,3 @@
 *.o
-*.s
+*.s
+*.ld

main.asm

@@ -45,6 +45,8 @@
 
 .include "patches/text_system.asm"
 
+.include "patches/game_engine/quick_hacks.asm"
+
 .org 0x0815F9B8
     .word 0x08069ED5 // fix nop1 for now...
 

nbproject/configurations.xml

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

nbproject/private/configurations.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="97">
+<configurationDescriptor version="100">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="." name="0">
       <df name="assets">
@@ -74,6 +74,7 @@
       </df>
       <df name="gfx_build">
         <df name="icons">
+          <in>702.s</in>
         </df>
         <df name="overworlds">
           <in>ow_0000.s</in>
@@ -544,6 +545,8 @@
           <in>ow_0529.s</in>
           <in>ow_0530.s</in>
           <in>ow_0531.s</in>
+          <in>ow_077.s</in>
+          <in>ow_175.s</in>
         </df>
         <df name="sprites">
           <df name="back_sprites">
@@ -4543,6 +4546,8 @@
         <df name="string">
           <df name="DE">
             <df name="story_text">
+              <df name="carun_city">
+              </df>
               <df name="hesperia">
               </df>
               <df name="tundra_hq">
@@ -4561,6 +4566,9 @@
         <df name="dns">
           <in>core.asm</in>
         </df>
+        <df name="game_engine">
+          <in>quick_hacks.asm</in>
+        </df>
         <df name="items">
           <in>item_limits.asm</in>
           <in>item_routines.asm</in>
@@ -4641,7 +4649,725 @@
             <df name="RAW">
             </df>
             <df name="S">
+              <in>cry_001.s</in>
+              <in>cry_002.s</in>
+              <in>cry_003.s</in>
+              <in>cry_004.s</in>
+              <in>cry_005.s</in>
+              <in>cry_006.s</in>
+              <in>cry_007.s</in>
+              <in>cry_008.s</in>
+              <in>cry_009.s</in>
+              <in>cry_010.s</in>
+              <in>cry_011.s</in>
+              <in>cry_012.s</in>
+              <in>cry_013.s</in>
+              <in>cry_014.s</in>
+              <in>cry_015.s</in>
+              <in>cry_016.s</in>
+              <in>cry_017.s</in>
+              <in>cry_018.s</in>
+              <in>cry_019.s</in>
+              <in>cry_020.s</in>
+              <in>cry_021.s</in>
+              <in>cry_022.s</in>
+              <in>cry_023.s</in>
+              <in>cry_024.s</in>
+              <in>cry_025.s</in>
+              <in>cry_026.s</in>
+              <in>cry_027.s</in>
+              <in>cry_028.s</in>
+              <in>cry_029.s</in>
+              <in>cry_030.s</in>
+              <in>cry_031.s</in>
+              <in>cry_032.s</in>
+              <in>cry_033.s</in>
+              <in>cry_034.s</in>
+              <in>cry_035.s</in>
+              <in>cry_036.s</in>
+              <in>cry_037.s</in>
+              <in>cry_038.s</in>
+              <in>cry_039.s</in>
+              <in>cry_040.s</in>
+              <in>cry_041.s</in>
+              <in>cry_042.s</in>
+              <in>cry_043.s</in>
+              <in>cry_044.s</in>
+              <in>cry_045.s</in>
+              <in>cry_046.s</in>
+              <in>cry_047.s</in>
+              <in>cry_048.s</in>
+              <in>cry_049.s</in>
+              <in>cry_050.s</in>
+              <in>cry_051.s</in>
+              <in>cry_052.s</in>
+              <in>cry_053.s</in>
+              <in>cry_054.s</in>
+              <in>cry_055.s</in>
+              <in>cry_056.s</in>
+              <in>cry_057.s</in>
+              <in>cry_058.s</in>
+              <in>cry_059.s</in>
+              <in>cry_060.s</in>
+              <in>cry_061.s</in>
+              <in>cry_062.s</in>
+              <in>cry_063.s</in>
+              <in>cry_064.s</in>
+              <in>cry_065.s</in>
+              <in>cry_066.s</in>
+              <in>cry_067.s</in>
+              <in>cry_068.s</in>
+              <in>cry_069.s</in>
+              <in>cry_070.s</in>
+              <in>cry_071.s</in>
+              <in>cry_072.s</in>
+              <in>cry_073.s</in>
+              <in>cry_074.s</in>
+              <in>cry_075.s</in>
+              <in>cry_076.s</in>
+              <in>cry_077.s</in>
+              <in>cry_078.s</in>
+              <in>cry_079.s</in>
+              <in>cry_080.s</in>
+              <in>cry_081.s</in>
+              <in>cry_082.s</in>
+              <in>cry_083.s</in>
+              <in>cry_084.s</in>
+              <in>cry_085.s</in>
+              <in>cry_086.s</in>
+              <in>cry_087.s</in>
+              <in>cry_088.s</in>
+              <in>cry_089.s</in>
+              <in>cry_090.s</in>
+              <in>cry_091.s</in>
+              <in>cry_092.s</in>
+              <in>cry_093.s</in>
+              <in>cry_094.s</in>
+              <in>cry_095.s</in>
+              <in>cry_096.s</in>
+              <in>cry_097.s</in>
+              <in>cry_098.s</in>
+              <in>cry_099.s</in>
+              <in>cry_100.s</in>
+              <in>cry_101.s</in>
+              <in>cry_102.s</in>
+              <in>cry_103.s</in>
+              <in>cry_104.s</in>
+              <in>cry_105.s</in>
+              <in>cry_106.s</in>
+              <in>cry_107.s</in>
+              <in>cry_108.s</in>
+              <in>cry_109.s</in>
+              <in>cry_110.s</in>
+              <in>cry_111.s</in>
+              <in>cry_112.s</in>
+              <in>cry_113.s</in>
+              <in>cry_114.s</in>
+              <in>cry_115.s</in>
+              <in>cry_116.s</in>
+              <in>cry_117.s</in>
+              <in>cry_118.s</in>
+              <in>cry_119.s</in>
+              <in>cry_120.s</in>
+              <in>cry_121.s</in>
+              <in>cry_122.s</in>
+              <in>cry_123.s</in>
+              <in>cry_124.s</in>
+              <in>cry_125.s</in>
+              <in>cry_126.s</in>
+              <in>cry_127.s</in>
+              <in>cry_128.s</in>
+              <in>cry_129.s</in>
+              <in>cry_130.s</in>
+              <in>cry_131.s</in>
+              <in>cry_132.s</in>
+              <in>cry_133.s</in>
+              <in>cry_134.s</in>
+              <in>cry_135.s</in>
+              <in>cry_136.s</in>
+              <in>cry_137.s</in>
+              <in>cry_138.s</in>
+              <in>cry_139.s</in>
+              <in>cry_140.s</in>
+              <in>cry_141.s</in>
+              <in>cry_142.s</in>
+              <in>cry_143.s</in>
+              <in>cry_144.s</in>
+              <in>cry_145.s</in>
+              <in>cry_146.s</in>
+              <in>cry_147.s</in>
+              <in>cry_148.s</in>
+              <in>cry_149.s</in>
+              <in>cry_150.s</in>
+              <in>cry_151.s</in>
+              <in>cry_152.s</in>
+              <in>cry_153.s</in>
+              <in>cry_154.s</in>
+              <in>cry_155.s</in>
+              <in>cry_156.s</in>
+              <in>cry_157.s</in>
+              <in>cry_158.s</in>
+              <in>cry_159.s</in>
+              <in>cry_160.s</in>
+              <in>cry_161.s</in>
+              <in>cry_162.s</in>
+              <in>cry_163.s</in>
+              <in>cry_164.s</in>
+              <in>cry_165.s</in>
+              <in>cry_166.s</in>
+              <in>cry_167.s</in>
+              <in>cry_168.s</in>
+              <in>cry_169.s</in>
+              <in>cry_170.s</in>
+              <in>cry_171.s</in>
+              <in>cry_172.s</in>
+              <in>cry_173.s</in>
+              <in>cry_174.s</in>
+              <in>cry_175.s</in>
+              <in>cry_176.s</in>
+              <in>cry_177.s</in>
+              <in>cry_178.s</in>
+              <in>cry_179.s</in>
+              <in>cry_180.s</in>
+              <in>cry_181.s</in>
+              <in>cry_182.s</in>
+              <in>cry_183.s</in>
+              <in>cry_184.s</in>
+              <in>cry_185.s</in>
+              <in>cry_186.s</in>
+              <in>cry_187.s</in>
+              <in>cry_188.s</in>
+              <in>cry_189.s</in>
+              <in>cry_190.s</in>
+              <in>cry_191.s</in>
+              <in>cry_192.s</in>
+              <in>cry_193.s</in>
+              <in>cry_194.s</in>
+              <in>cry_195.s</in>
+              <in>cry_196.s</in>
+              <in>cry_197.s</in>
+              <in>cry_198.s</in>
+              <in>cry_199.s</in>
+              <in>cry_200.s</in>
+              <in>cry_201.s</in>
+              <in>cry_202.s</in>
+              <in>cry_203.s</in>
+              <in>cry_204.s</in>
+              <in>cry_205.s</in>
+              <in>cry_206.s</in>
+              <in>cry_207.s</in>
+              <in>cry_208.s</in>
+              <in>cry_209.s</in>
+              <in>cry_210.s</in>
+              <in>cry_211.s</in>
+              <in>cry_212.s</in>
+              <in>cry_213.s</in>
+              <in>cry_214.s</in>
+              <in>cry_215.s</in>
+              <in>cry_216.s</in>
+              <in>cry_217.s</in>
+              <in>cry_218.s</in>
+              <in>cry_219.s</in>
+              <in>cry_220.s</in>
+              <in>cry_221.s</in>
+              <in>cry_222.s</in>
+              <in>cry_223.s</in>
+              <in>cry_224.s</in>
+              <in>cry_225.s</in>
+              <in>cry_226.s</in>
+              <in>cry_227.s</in>
+              <in>cry_228.s</in>
+              <in>cry_229.s</in>
+              <in>cry_230.s</in>
+              <in>cry_231.s</in>
+              <in>cry_232.s</in>
+              <in>cry_233.s</in>
+              <in>cry_234.s</in>
+              <in>cry_235.s</in>
+              <in>cry_236.s</in>
+              <in>cry_237.s</in>
+              <in>cry_238.s</in>
+              <in>cry_239.s</in>
+              <in>cry_240.s</in>
+              <in>cry_241.s</in>
+              <in>cry_242.s</in>
+              <in>cry_243.s</in>
+              <in>cry_244.s</in>
+              <in>cry_245.s</in>
+              <in>cry_246.s</in>
+              <in>cry_247.s</in>
+              <in>cry_248.s</in>
+              <in>cry_249.s</in>
+              <in>cry_250.s</in>
+              <in>cry_251.s</in>
+              <in>cry_252.s</in>
+              <in>cry_253.s</in>
+              <in>cry_254.s</in>
+              <in>cry_255.s</in>
+              <in>cry_256.s</in>
+              <in>cry_257.s</in>
+              <in>cry_258.s</in>
+              <in>cry_259.s</in>
+              <in>cry_260.s</in>
+              <in>cry_261.s</in>
+              <in>cry_262.s</in>
+              <in>cry_263.s</in>
+              <in>cry_264.s</in>
+              <in>cry_265.s</in>
+              <in>cry_266.s</in>
+              <in>cry_267.s</in>
+              <in>cry_268.s</in>
+              <in>cry_269.s</in>
+              <in>cry_270.s</in>
+              <in>cry_271.s</in>
+              <in>cry_272.s</in>
+              <in>cry_273.s</in>
+              <in>cry_274.s</in>
+              <in>cry_275.s</in>
+              <in>cry_276.s</in>
+              <in>cry_277.s</in>
+              <in>cry_278.s</in>
+              <in>cry_279.s</in>
+              <in>cry_280.s</in>
+              <in>cry_281.s</in>
+              <in>cry_282.s</in>
+              <in>cry_283.s</in>
+              <in>cry_284.s</in>
+              <in>cry_285.s</in>
+              <in>cry_286.s</in>
+              <in>cry_287.s</in>
+              <in>cry_288.s</in>
+              <in>cry_289.s</in>
+              <in>cry_290.s</in>
+              <in>cry_291.s</in>
+              <in>cry_292.s</in>
+              <in>cry_293.s</in>
+              <in>cry_294.s</in>
+              <in>cry_295.s</in>
+              <in>cry_296.s</in>
+              <in>cry_297.s</in>
+              <in>cry_298.s</in>
+              <in>cry_299.s</in>
+              <in>cry_300.s</in>
+              <in>cry_301.s</in>
+              <in>cry_302.s</in>
+              <in>cry_303.s</in>
+              <in>cry_304.s</in>
+              <in>cry_305.s</in>
+              <in>cry_306.s</in>
+              <in>cry_307.s</in>
+              <in>cry_308.s</in>
+              <in>cry_309.s</in>
+              <in>cry_310.s</in>
+              <in>cry_311.s</in>
+              <in>cry_312.s</in>
+              <in>cry_313.s</in>
+              <in>cry_314.s</in>
+              <in>cry_315.s</in>
+              <in>cry_316.s</in>
+              <in>cry_317.s</in>
+              <in>cry_318.s</in>
+              <in>cry_319.s</in>
+              <in>cry_320.s</in>
+              <in>cry_321.s</in>
+              <in>cry_322.s</in>
+              <in>cry_323.s</in>
+              <in>cry_324.s</in>
+              <in>cry_325.s</in>
+              <in>cry_326.s</in>
+              <in>cry_327.s</in>
+              <in>cry_328.s</in>
+              <in>cry_329.s</in>
+              <in>cry_330.s</in>
+              <in>cry_331.s</in>
+              <in>cry_332.s</in>
+              <in>cry_333.s</in>
+              <in>cry_334.s</in>
+              <in>cry_335.s</in>
+              <in>cry_336.s</in>
+              <in>cry_337.s</in>
+              <in>cry_338.s</in>
+              <in>cry_339.s</in>
+              <in>cry_340.s</in>
+              <in>cry_341.s</in>
+              <in>cry_342.s</in>
+              <in>cry_343.s</in>
+              <in>cry_344.s</in>
+              <in>cry_345.s</in>
+              <in>cry_346.s</in>
+              <in>cry_347.s</in>
+              <in>cry_348.s</in>
+              <in>cry_349.s</in>
+              <in>cry_350.s</in>
+              <in>cry_351.s</in>
+              <in>cry_352.s</in>
+              <in>cry_353.s</in>
+              <in>cry_354.s</in>
+              <in>cry_355.s</in>
+              <in>cry_356.s</in>
+              <in>cry_357.s</in>
+              <in>cry_358.s</in>
+              <in>cry_359.s</in>
+              <in>cry_360.s</in>
+              <in>cry_361.s</in>
+              <in>cry_362.s</in>
+              <in>cry_363.s</in>
+              <in>cry_364.s</in>
+              <in>cry_365.s</in>
+              <in>cry_366.s</in>
+              <in>cry_367.s</in>
+              <in>cry_368.s</in>
+              <in>cry_369.s</in>
+              <in>cry_370.s</in>
+              <in>cry_371.s</in>
+              <in>cry_372.s</in>
+              <in>cry_373.s</in>
+              <in>cry_374.s</in>
+              <in>cry_375.s</in>
+              <in>cry_376.s</in>
+              <in>cry_377.s</in>
+              <in>cry_378.s</in>
+              <in>cry_379.s</in>
+              <in>cry_380.s</in>
+              <in>cry_381.s</in>
+              <in>cry_382.s</in>
+              <in>cry_383.s</in>
+              <in>cry_384.s</in>
+              <in>cry_385.s</in>
+              <in>cry_386.s</in>
+              <in>cry_387.s</in>
+              <in>cry_388.s</in>
+              <in>cry_389.s</in>
+              <in>cry_390.s</in>
+              <in>cry_391.s</in>
+              <in>cry_392.s</in>
+              <in>cry_393.s</in>
+              <in>cry_394.s</in>
+              <in>cry_395.s</in>
+              <in>cry_396.s</in>
+              <in>cry_397.s</in>
+              <in>cry_398.s</in>
+              <in>cry_399.s</in>
+              <in>cry_400.s</in>
+              <in>cry_401.s</in>
+              <in>cry_402.s</in>
+              <in>cry_403.s</in>
+              <in>cry_404.s</in>
+              <in>cry_405.s</in>
+              <in>cry_406.s</in>
+              <in>cry_407.s</in>
+              <in>cry_408.s</in>
+              <in>cry_409.s</in>
+              <in>cry_410.s</in>
+              <in>cry_411.s</in>
+              <in>cry_412.s</in>
+              <in>cry_413.s</in>
+              <in>cry_414.s</in>
+              <in>cry_415.s</in>
+              <in>cry_416.s</in>
+              <in>cry_417.s</in>
+              <in>cry_418.s</in>
+              <in>cry_419.s</in>
+              <in>cry_420.s</in>
+              <in>cry_421.s</in>
+              <in>cry_422.s</in>
+              <in>cry_423.s</in>
+              <in>cry_424.s</in>
+              <in>cry_425.s</in>
+              <in>cry_426.s</in>
+              <in>cry_427.s</in>
+              <in>cry_428.s</in>
+              <in>cry_429.s</in>
+              <in>cry_430.s</in>
+              <in>cry_431.s</in>
+              <in>cry_432.s</in>
+              <in>cry_433.s</in>
+              <in>cry_434.s</in>
+              <in>cry_435.s</in>
+              <in>cry_436.s</in>
+              <in>cry_437.s</in>
+              <in>cry_438.s</in>
+              <in>cry_439.s</in>
+              <in>cry_440.s</in>
+              <in>cry_441.s</in>
+              <in>cry_442.s</in>
+              <in>cry_443.s</in>
+              <in>cry_444.s</in>
+              <in>cry_445.s</in>
+              <in>cry_446.s</in>
+              <in>cry_447.s</in>
+              <in>cry_448.s</in>
+              <in>cry_449.s</in>
+              <in>cry_450.s</in>
+              <in>cry_451.s</in>
+              <in>cry_452.s</in>
+              <in>cry_453.s</in>
+              <in>cry_454.s</in>
+              <in>cry_455.s</in>
+              <in>cry_456.s</in>
+              <in>cry_457.s</in>
+              <in>cry_458.s</in>
+              <in>cry_459.s</in>
+              <in>cry_460.s</in>
+              <in>cry_461.s</in>
+              <in>cry_462.s</in>
+              <in>cry_463.s</in>
+              <in>cry_464.s</in>
+              <in>cry_465.s</in>
+              <in>cry_466.s</in>
+              <in>cry_467.s</in>
+              <in>cry_468.s</in>
+              <in>cry_469.s</in>
+              <in>cry_470.s</in>
+              <in>cry_471.s</in>
+              <in>cry_472.s</in>
+              <in>cry_473.s</in>
+              <in>cry_474.s</in>
+              <in>cry_475.s</in>
+              <in>cry_476.s</in>
+              <in>cry_477.s</in>
+              <in>cry_478.s</in>
+              <in>cry_479.s</in>
+              <in>cry_480.s</in>
+              <in>cry_481.s</in>
+              <in>cry_482.s</in>
+              <in>cry_483.s</in>
+              <in>cry_484.s</in>
+              <in>cry_485.s</in>
+              <in>cry_486.s</in>
+              <in>cry_487.s</in>
+              <in>cry_488.s</in>
+              <in>cry_489.s</in>
+              <in>cry_490.s</in>
+              <in>cry_491.s</in>
               <in>cry_492.s</in>
+              <in>cry_492_zenith.s</in>
+              <in>cry_493.s</in>
+              <in>cry_494.s</in>
+              <in>cry_495.s</in>
+              <in>cry_496.s</in>
+              <in>cry_497.s</in>
+              <in>cry_498.s</in>
+              <in>cry_499.s</in>
+              <in>cry_500.s</in>
+              <in>cry_501.s</in>
+              <in>cry_502.s</in>
+              <in>cry_503.s</in>
+              <in>cry_504.s</in>
+              <in>cry_505.s</in>
+              <in>cry_506.s</in>
+              <in>cry_507.s</in>
+              <in>cry_508.s</in>
+              <in>cry_509.s</in>
+              <in>cry_510.s</in>
+              <in>cry_511.s</in>
+              <in>cry_512.s</in>
+              <in>cry_513.s</in>
+              <in>cry_514.s</in>
+              <in>cry_515.s</in>
+              <in>cry_516.s</in>
+              <in>cry_517.s</in>
+              <in>cry_518.s</in>
+              <in>cry_519.s</in>
+              <in>cry_520.s</in>
+              <in>cry_521.s</in>
+              <in>cry_522.s</in>
+              <in>cry_523.s</in>
+              <in>cry_524.s</in>
+              <in>cry_525.s</in>
+              <in>cry_526.s</in>
+              <in>cry_527.s</in>
+              <in>cry_528.s</in>
+              <in>cry_529.s</in>
+              <in>cry_530.s</in>
+              <in>cry_531.s</in>
+              <in>cry_532.s</in>
+              <in>cry_533.s</in>
+              <in>cry_534.s</in>
+              <in>cry_535.s</in>
+              <in>cry_536.s</in>
+              <in>cry_537.s</in>
+              <in>cry_538.s</in>
+              <in>cry_539.s</in>
+              <in>cry_540.s</in>
+              <in>cry_541.s</in>
+              <in>cry_542.s</in>
+              <in>cry_543.s</in>
+              <in>cry_544.s</in>
+              <in>cry_545.s</in>
+              <in>cry_546.s</in>
+              <in>cry_547.s</in>
+              <in>cry_548.s</in>
+              <in>cry_549.s</in>
+              <in>cry_550.s</in>
+              <in>cry_551.s</in>
+              <in>cry_552.s</in>
+              <in>cry_553.s</in>
+              <in>cry_554.s</in>
+              <in>cry_555.s</in>
+              <in>cry_556.s</in>
+              <in>cry_557.s</in>
+              <in>cry_558.s</in>
+              <in>cry_559.s</in>
+              <in>cry_560.s</in>
+              <in>cry_561.s</in>
+              <in>cry_562.s</in>
+              <in>cry_563.s</in>
+              <in>cry_564.s</in>
+              <in>cry_565.s</in>
+              <in>cry_566.s</in>
+              <in>cry_567.s</in>
+              <in>cry_568.s</in>
+              <in>cry_569.s</in>
+              <in>cry_570.s</in>
+              <in>cry_571.s</in>
+              <in>cry_572.s</in>
+              <in>cry_573.s</in>
+              <in>cry_574.s</in>
+              <in>cry_575.s</in>
+              <in>cry_576.s</in>
+              <in>cry_577.s</in>
+              <in>cry_578.s</in>
+              <in>cry_579.s</in>
+              <in>cry_580.s</in>
+              <in>cry_581.s</in>
+              <in>cry_582.s</in>
+              <in>cry_583.s</in>
+              <in>cry_584.s</in>
+              <in>cry_585.s</in>
+              <in>cry_586.s</in>
+              <in>cry_587.s</in>
+              <in>cry_588.s</in>
+              <in>cry_589.s</in>
+              <in>cry_590.s</in>
+              <in>cry_591.s</in>
+              <in>cry_592.s</in>
+              <in>cry_593.s</in>
+              <in>cry_594.s</in>
+              <in>cry_595.s</in>
+              <in>cry_596.s</in>
+              <in>cry_597.s</in>
+              <in>cry_598.s</in>
+              <in>cry_599.s</in>
+              <in>cry_600.s</in>
+              <in>cry_601.s</in>
+              <in>cry_602.s</in>
+              <in>cry_603.s</in>
+              <in>cry_604.s</in>
+              <in>cry_605.s</in>
+              <in>cry_606.s</in>
+              <in>cry_607.s</in>
+              <in>cry_608.s</in>
+              <in>cry_609.s</in>
+              <in>cry_610.s</in>
+              <in>cry_611.s</in>
+              <in>cry_612.s</in>
+              <in>cry_613.s</in>
+              <in>cry_614.s</in>
+              <in>cry_615.s</in>
+              <in>cry_616.s</in>
+              <in>cry_617.s</in>
+              <in>cry_618.s</in>
+              <in>cry_619.s</in>
+              <in>cry_620.s</in>
+              <in>cry_621.s</in>
+              <in>cry_622.s</in>
+              <in>cry_623.s</in>
+              <in>cry_624.s</in>
+              <in>cry_625.s</in>
+              <in>cry_626.s</in>
+              <in>cry_627.s</in>
+              <in>cry_628.s</in>
+              <in>cry_629.s</in>
+              <in>cry_630.s</in>
+              <in>cry_631.s</in>
+              <in>cry_632.s</in>
+              <in>cry_633.s</in>
+              <in>cry_634.s</in>
+              <in>cry_635.s</in>
+              <in>cry_636.s</in>
+              <in>cry_637.s</in>
+              <in>cry_638.s</in>
+              <in>cry_639.s</in>
+              <in>cry_640.s</in>
+              <in>cry_641.s</in>
+              <in>cry_642.s</in>
+              <in>cry_643.s</in>
+              <in>cry_644.s</in>
+              <in>cry_645.s</in>
+              <in>cry_646.s</in>
+              <in>cry_647.s</in>
+              <in>cry_648.s</in>
+              <in>cry_649.s</in>
+              <in>cry_650.s</in>
+              <in>cry_651.s</in>
+              <in>cry_652.s</in>
+              <in>cry_653.s</in>
+              <in>cry_654.s</in>
+              <in>cry_655.s</in>
+              <in>cry_656.s</in>
+              <in>cry_657.s</in>
+              <in>cry_658.s</in>
+              <in>cry_659.s</in>
+              <in>cry_660.s</in>
+              <in>cry_661.s</in>
+              <in>cry_662.s</in>
+              <in>cry_663.s</in>
+              <in>cry_664.s</in>
+              <in>cry_665.s</in>
+              <in>cry_666.s</in>
+              <in>cry_667.s</in>
+              <in>cry_668.s</in>
+              <in>cry_669.s</in>
+              <in>cry_670.s</in>
+              <in>cry_671.s</in>
+              <in>cry_672.s</in>
+              <in>cry_673.s</in>
+              <in>cry_674.s</in>
+              <in>cry_675.s</in>
+              <in>cry_676.s</in>
+              <in>cry_677.s</in>
+              <in>cry_678.s</in>
+              <in>cry_679.s</in>
+              <in>cry_680.s</in>
+              <in>cry_681.s</in>
+              <in>cry_682.s</in>
+              <in>cry_683.s</in>
+              <in>cry_684.s</in>
+              <in>cry_685.s</in>
+              <in>cry_686.s</in>
+              <in>cry_687.s</in>
+              <in>cry_688.s</in>
+              <in>cry_689.s</in>
+              <in>cry_690.s</in>
+              <in>cry_691.s</in>
+              <in>cry_692.s</in>
+              <in>cry_693.s</in>
+              <in>cry_694.s</in>
+              <in>cry_695.s</in>
+              <in>cry_696.s</in>
+              <in>cry_697.s</in>
+              <in>cry_698.s</in>
+              <in>cry_699.s</in>
+              <in>cry_700.s</in>
+              <in>cry_701.s</in>
+              <in>cry_702.s</in>
+              <in>cry_703.s</in>
+              <in>cry_704.s</in>
+              <in>cry_705.s</in>
+              <in>cry_706.s</in>
+              <in>cry_707.s</in>
+              <in>cry_708.s</in>
+              <in>cry_709.s</in>
+              <in>cry_710.s</in>
+              <in>cry_711.s</in>
+              <in>cry_712.s</in>
+              <in>cry_713.s</in>
+              <in>cry_714.s</in>
+              <in>cry_715.s</in>
+              <in>cry_716.s</in>
+              <in>cry_717.s</in>
+              <in>cry_718.s</in>
               <in>cry_NULL.s</in>
             </df>
             <df name="TABLE">
@@ -5363,8 +6089,6 @@
               </df>
               <df name="chords_normalized">
               </df>
-              <df name="guitar">
-              </df>
             </df>
             <df name="WAV">
             </df>
@@ -5748,6 +6472,7 @@
         <df name="de">
           <df name="story_text">
             <df name="carun_city">
+              <in>globals.S</in>
               <in>globals.txt</in>
             </df>
             <df name="hesperia">

nbproject/private/private.xml

@@ -19,83 +19,16 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/bpre.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/table.tbl</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_end_of_turn_hook.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/main.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/metal_burst/metal_burst_script.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/config.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/roost/roost_scripts.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/moves.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/trainer_run.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/move_table.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/custom_structs_malloc.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/disable_cry_table_blocks.s</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_locations.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/bride/bride.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/entry_hazards.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/music.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_end_of_turn.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/sots-private/sound/Samples/Makefile</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/specials/custom_specials.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/sprites.makefile</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/overworlds/overworld.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/moves/effect_table.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/sots-private/sound/Samples/S/fx_36_rain.s</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/makefile</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/text_system.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/overworld.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/item_data.txt</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/dynamic_overworld_hooks.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/moves.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/pkmn_tables/pokemon_moveset_table.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/types.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/overworld_hooks.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/battle_engine/battle_engine.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/feint/feint.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/icons.makefile</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/item_limits.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/tm_fixes.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/item_descriptions.txt</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/hooks.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_switch_in_hook.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/item/tm_hm_move_table.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/item_routines.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/dns/dns_core.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/moves/animation_table.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/uturn/u_turn_script.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/item/item_scripts.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/gfx_build/overworlds/.gitignore</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/linker.ld</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/tailwind/tailwind_scripts.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/tailwind/tailwind.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/overworlds/trainer.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/battle_engine/bs_table.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_structs.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_initiative.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/special.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/metal_burst/metal_burst.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/hazards.txt</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/custom_structs_malloc_hook.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/battle_test.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/assets.makefile</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/bride/bride_scripts.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/feint/feint_scripts.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/item_tables.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/gfx_build/sprites/back_sprites/.gitignore</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/split_physical_special.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/battle_engine/malloc.asm</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/bpre.sym</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/roost/roost.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/hazards/hazards_scripts.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_script.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/entry_hazards_hook.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/moves/move_data.S</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/interface/textbox_mugshots.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/specials/trainer_battle.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/move_strings.txt</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_abilities.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/items.asm</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/assets.makefile</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/string/de/invalid.txt</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/specials/custom_specials.c</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/math.h</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/string/table.tbl</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/game_engine.h</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/makefile</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/patches/game_engine/quick_hacks.asm</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/battle_engine/battle_initiative.c</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/sprites.makefile</file>
         </group>
     </open-files>
 </project-private>

patches/game_engine/quick_hacks.asm

@@ -0,0 +1,84 @@
+EGG_HATCH_LEVEL EQU 1
+EV_CAP EQU 252
+
+PLAYER_S_X EQU 7
+PLAYER_S_Y EQU 0x13
+
+PLAYER_S_B EQU 5
+PLAYER_S_M EQU 0
+
+// Something //
+.org 0x080441D6
+.byte 0x0
+
+.org 0x08125AA8
+.byte 0x0
+
+// Change hatch level of new pokémon //
+.org 0x081375B0
+.byte EGG_HATCH_LEVEL
+
+.org 0x08046CBE
+.byte EGG_HATCH_LEVEL
+
+.org 0x0804623E
+.byte EGG_HATCH_LEVEL
+
+// Something //
+.org 0x0805BA3A
+.word 0x00000000
+
+// No flag check while in menu (moves) //
+.org 0x08124630
+.halfword 0xE012
+
+// Intro and Naming Hacking //
+
+.org 0x080EC5D0
+.word 0x08078915
+
+.org 0x0800C4C8
+.word 0x0800C608
+
+.org 0x08054A68
+.halfword 0x4C3C
+.halfword 0x6820
+.halfword 0x4900
+.halfword 0xE001
+.word str_player_dummy_name
+
+.org 0x08054A7E
+.halfword 0x4E34
+
+.org 0x08054B3A
+.word 0x00000000
+
+.org 0x080439FC
+.byte EV_CAP
+
+.org 0x08043A02
+.byte EV_CAP
+
+// Critical hit chance table //
+.org 0x08250530
+.halfword 0x0010
+.halfword 0x0008
+.halfword 0x0002
+.halfword 0x0001
+.halfword 0x0001
+
+.org 0x08080484
+.word 0x00000000
+.word 0x00000000
+
+.org 0x08054A08
+.byte PLAYER_S_X
+
+.org 0x08054A00
+.byte PLAYER_S_Y
+
+.org 0x08054A04
+.byte PLAYER_S_B
+
+.org 0x08054A06
+.byte PLAYER_S_M

sots-private

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

sprites.makefile

@@ -6,6 +6,8 @@ GFX_BUILD_DIR = gfx_build
 TMP_FILE = $(GFX_BUILD_DIR)/tmp.o
 TMP_FILE2 = $(GFX_BUILD_DIR)/tmp2.o
 
+LDFLAGS   := -z muldefs
+
 ASSET_ROOT = sots-private/assets
 
 SPRITES_BINARY = object/pkmn_sprites.o
@@ -44,18 +46,8 @@ clean:
 	rm -f $(GFX_BUILD_DIR)/overworlds/*
 
 $(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ) $(OW_OBJ) $(TS_OBJ)
-	rm -f $(TMP_FILE2)
-	rm -f $(TMP_FILE)
-	for file in $^;\
-	do \
-		if [ ! -f $(TMP_FILE) ]; then\
-			$(LD) -r -o $(TMP_FILE) $$file;\
-		else\
-			$(LD) -r -o $(TMP_FILE2) $$file $(TMP_FILE);\
-			mv -f $(TMP_FILE2) $(TMP_FILE);\
-		fi;\
-	done
-	mv $(TMP_FILE) $@
+	@echo "INPUT($^)" > $(GFX_BUILD_DIR)/sprites.ld
+	$(LD) -r -o $(SPRITES_BINARY) -T $(GFX_BUILD_DIR)/sprites.ld
 
 # OW Targets
 $(GFX_BUILD_DIR)/overworlds/%.o: $(GFX_BUILD_DIR)/overworlds/%.s

src/specials/custom_specials.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (C) 2015-2016 by the SotS Team                                 *
+ * Copyright (C) 2015-2017 by the SotS Team                                 *
  *                                                                          *
  * This file is part of Sovereign of the Skies.                             *
  *                                                                          *
@@ -36,6 +36,7 @@
 #include <debug.h>
 #include <game_engine.h>
 #include <config.h>
+#include <math.h>
 
 /* === PROTOTYPES === */
 
@@ -60,17 +61,23 @@ void sp_special_casm();
  */
 void sp_clear_variables();
 
+/**
+ * @brief generate a random number, store in last result
+ */
+void sp_random_number();
+
 
 void get_text_pointer_from_lookup();
 
 /* === STATICS === */
 
-static callback special_routines[6] = {
+static callback special_routines[7] = {
     met_play,
     cam_sp_move_camera,
     sp_init_script,
     debug_some_test,
     sp_dns_switch,
+    sp_random_number,
 };
 
 /* === IMPLEMENTATIONS === */
@@ -106,4 +113,9 @@ void sp_clear_variables()
     (void) var_set(MUGSHOT_2_Y, 0);
     (void) var_set(TEXT_VAR, 0);
     return;
+}
+
+void sp_random_number()
+{
+    var_set(0x800D, (__aeabi_uidivmod(random(), var_get(0x8000))));
 }

string/de/invalid.txt

@@ -1 +1,2 @@
 str_invalid_text=Dies ist ein Dummy Text!
+str_player_dummy_name=DUMMY_NAME