mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-28 07:09:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

memory cards (in progress) (#868)

Browse Source 
* c++ memory card stuff

* saving kinda works

* load working

* more progress

* clean up
This commit is contained in:
water111
2021-10-01 23:12:34 -04:00
committed by GitHub
parent 254a29851e
commit 845802ca45
56 changed files with 3069 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/engine/game/collectables-part_REF.gc
Vendored
+2 -2
View File
@@ -2989,7 +2989,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1a :page #x2))
(sp-flt spt-num 2.0)
(sp-rnd-flt spt-scale-x (meters 1.3) (meters 0.2) 1.0)
(sp-int spt-rot-x 0)
(sp-rnd-flt spt-rot-x 0.0 12743.111 1.0)
(sp-flt spt-rot-y (degrees 0.0))
(sp-copy-from-other spt-scale-y -4)
(sp-flt spt-r 128.0)
@@ -3015,7 +3015,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1a :page #x2))
(sp-flt spt-num 2.0)
(sp-rnd-flt spt-scale-x (meters 1.3) (meters 0.2) 1.0)
(sp-int spt-rot-x 1184657863)
(sp-rnd-flt spt-rot-x 20024.889 12743.111 1.0)
(sp-flt spt-rot-y (degrees 0.0))
(sp-copy-from-other spt-scale-y -4)
(sp-flt spt-r 128.0)
test/decompiler/reference/engine/load/loader-h_REF.gc
Vendored
+1 -1
View File
@@ -98,7 +98,7 @@
:flag-assert #x1000000068
(:methods
(new (symbol type int) _type_ 0)
(want-file (_type_ string int handle float) int 9)
(set-pending-file (_type_ string int handle float) int 9)
(update (_type_) int 10)
(inactive? (_type_) symbol 11)
(file-status (_type_ string int) symbol 12)
test/decompiler/reference/engine/load/loader_REF.gc
Vendored
+4 -4
View File
@@ -205,7 +205,7 @@
;; definition for method 9 of type external-art-buffer
(defmethod
want-file
set-pending-file
external-art-buffer
((obj external-art-buffer)
(arg0 string)
@@ -675,7 +675,7 @@
(dotimes (s2-1 2)
(when (not (-> obj buffer s2-1 frame-lock))
(set! (-> obj buffer s2-1 frame-lock) #t)
(want-file
(set-pending-file
(-> obj buffer s2-1)
(-> s3-1 name)
(-> s3-1 parts)
@@ -699,7 +699,7 @@
(not (string= (-> s4-2 pending-load-file) "reserved"))
(not (string= (-> s4-2 other pending-load-file) "reserved"))
)
(want-file
(set-pending-file
(-> s4-2 other)
(the-as string #f)
-1
@@ -838,7 +838,7 @@
0
)
((= (-> obj reserve-buffer heap) arg0)
(want-file
(set-pending-file
(-> obj reserve-buffer)
(the-as string #f)
-1
test/decompiler/reference/levels/beach/beach-part_REF.gc
Vendored
+2 -6
View File
@@ -1063,7 +1063,7 @@
(sp-func spt-birth-func 'birth-func-copy-rot-color)
(sp-flt spt-num 2.0)
(sp-flt spt-scale-x (meters 0.9))
(sp-int spt-rot-x -970282325)
(sp-rnd-flt spt-rot-x -10922.667 54613.332 1.0)
(sp-flt spt-scale-y (meters 1.3))
(sp-flt spt-r 255.0)
(sp-flt spt-g 255.0)
@@ -1171,7 +1171,7 @@
(sp-func spt-birth-func 'birth-func-copy-rot-color)
(sp-flt spt-num 2.0)
(sp-flt spt-scale-x (meters 0.4))
(sp-int spt-rot-x -970282325)
(sp-rnd-flt spt-rot-x -10922.667 54613.332 1.0)
(sp-flt spt-scale-y (meters 0.4))
(sp-flt spt-r 128.0)
(sp-flt spt-g 128.0)
@@ -1183,7 +1183,3 @@
)
)
)
test/decompiler/reference/levels/citadel/citadel-part_REF.gc
Vendored
+12 -16
View File
@@ -902,7 +902,7 @@
(sp-flt spt-num 4.0)
(sp-flt spt-y (meters 23.0))
(sp-rnd-flt spt-scale-x (meters 6.0) (meters 6.0) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-flt spt-scale-y (meters 31.0))
(sp-rnd-flt spt-r 24.0 32.0 1.0)
(sp-flt spt-g 0.0)
@@ -1014,7 +1014,7 @@
(sp-flt spt-y (meters 1.0025))
(sp-flt spt-z 9420.8)
(sp-flt spt-scale-x (meters 4.1))
(sp-int spt-rot-x 1179997525)
(sp-flt spt-rot-x 13653.333)
(sp-flt spt-rot-y (degrees -80.0))
(sp-flt spt-scale-y (meters 3.0))
(sp-rnd-flt spt-r 32.0 32.0 1.0)
@@ -1041,7 +1041,7 @@
(sp-flt spt-y (meters 3.9))
(sp-flt spt-z 9420.8)
(sp-flt spt-scale-x (meters 4.1))
(sp-int spt-rot-x 1184191829)
(sp-flt spt-rot-x 19114.666)
(sp-flt spt-rot-y (degrees -80.0))
(sp-flt spt-scale-y (meters 3.0))
(sp-rnd-flt spt-r 32.0 32.0 1.0)
@@ -1068,7 +1068,7 @@
(sp-flt spt-y (meters 3.2897))
(sp-flt spt-z 10178.56)
(sp-flt spt-scale-x (meters 3.1))
(sp-int spt-rot-x 1184191829)
(sp-flt spt-rot-x 19114.666)
(sp-flt spt-rot-y (degrees 67.0))
(sp-flt spt-scale-y (meters 2.9))
(sp-rnd-flt spt-r 32.0 32.0 1.0)
@@ -1095,7 +1095,7 @@
(sp-flt spt-y (meters 0.8025))
(sp-flt spt-z 9830.4)
(sp-flt spt-scale-x (meters 3.1))
(sp-int spt-rot-x 1179997525)
(sp-flt spt-rot-x 13653.333)
(sp-flt spt-rot-y (degrees 67.0))
(sp-flt spt-scale-y (meters 2.25))
(sp-rnd-flt spt-r 32.0 32.0 1.0)
@@ -1122,7 +1122,7 @@
(sp-flt spt-y (meters 0.8025))
(sp-flt spt-z 11468.8)
(sp-flt spt-scale-x (meters 3.1))
(sp-int spt-rot-x 1179997525)
(sp-flt spt-rot-x 13653.333)
(sp-flt spt-rot-y (degrees 10.0))
(sp-flt spt-scale-y (meters 3.0))
(sp-rnd-flt spt-r 32.0 32.0 1.0)
@@ -1148,7 +1148,7 @@
(sp-flt spt-y (meters 3.7))
(sp-flt spt-z 11468.8)
(sp-flt spt-scale-x (meters 3.1))
(sp-int spt-rot-x 1184191829)
(sp-flt spt-rot-x 19114.666)
(sp-flt spt-rot-y (degrees 10.0))
(sp-flt spt-scale-y (meters 3.0))
(sp-rnd-flt spt-r 32.0 32.0 1.0)
@@ -1496,7 +1496,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x12 :page #x2))
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-scale-x (meters 12.0) (meters 24.0) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-rot-y (degrees 25.000002) (degrees 20.0) 1.0)
(sp-flt spt-rot-z (degrees 180.0))
(sp-copy-from-other spt-scale-y -4)
@@ -1765,7 +1765,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x12 :page #x2))
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-scale-x (meters 12.0) (meters 24.0) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-rot-y (degrees -20.0) (degrees 40.0) 1.0)
(sp-flt spt-rot-z (degrees 68.0))
(sp-copy-from-other spt-scale-y -4)
@@ -2014,7 +2014,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x12 :page #x2))
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-scale-x (meters 12.0) (meters 24.0) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-rot-y (degrees -20.0) (degrees 40.0) 1.0)
(sp-flt spt-rot-z (degrees 115.0))
(sp-copy-from-other spt-scale-y -4)
@@ -2260,7 +2260,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x12 :page #x2))
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-scale-x (meters 12.0) (meters 24.0) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-rot-y (degrees -20.0) (degrees 40.0) 1.0)
(sp-flt spt-rot-z (degrees 180.0))
(sp-copy-from-other spt-scale-y -4)
@@ -2653,7 +2653,7 @@
(sp-flt spt-num 0.5)
(sp-flt spt-x (meters 0.0))
(sp-flt spt-scale-x (meters 5.0))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-flt spt-rot-z (degrees 82.0))
(sp-copy-from-other spt-scale-y -4)
(sp-rnd-flt spt-r 0.0 32.0 1.0)
@@ -3022,7 +3022,3 @@
)
)
)
test/decompiler/reference/levels/finalboss/robotboss-part_REF.gc
Vendored
+4 -8
View File
@@ -3526,7 +3526,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x12 :page #x2))
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-scale-x (meters 12.0) (meters 24.0) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-rot-y (degrees 25.000002) (degrees 20.0) 1.0)
(sp-flt spt-rot-z (degrees 180.0))
(sp-copy-from-other spt-scale-y -4)
@@ -3766,7 +3766,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x12 :page #x2))
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-scale-x (meters 12.0) (meters 24.0) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-rot-y (degrees -20.0) (degrees 40.0) 1.0)
(sp-flt spt-rot-z (degrees 68.0))
(sp-copy-from-other spt-scale-y -4)
@@ -4002,7 +4002,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x12 :page #x2))
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-scale-x (meters 12.0) (meters 24.0) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-rot-y (degrees -20.0) (degrees 40.0) 1.0)
(sp-flt spt-rot-z (degrees 115.0))
(sp-copy-from-other spt-scale-y -4)
@@ -4235,7 +4235,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x12 :page #x2))
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-scale-x (meters 12.0) (meters 24.0) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-rot-y (degrees -20.0) (degrees 40.0) 1.0)
(sp-flt spt-rot-z (degrees 180.0))
(sp-copy-from-other spt-scale-y -4)
@@ -4471,7 +4471,3 @@
;; failed to figure out what this is:
0
test/decompiler/reference/levels/finalboss/sage-finalboss-part_REF.gc
Vendored
+4 -8
View File
@@ -279,7 +279,7 @@
(sp-rnd-flt spt-x (meters 0.0) (meters 2.0) 1.0)
(sp-rnd-flt spt-y (meters 0.0) (meters 16.0) 1.0)
(sp-rnd-flt spt-scale-x (meters 0.2) (meters 0.2) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0)
(sp-rnd-flt spt-scale-y (meters 8.0) (meters 8.0) 1.0)
(sp-rnd-int spt-r 0 1 128.0)
@@ -306,7 +306,7 @@
(sp-rnd-flt spt-num 1.0 2.0 1.0)
(sp-rnd-flt spt-x (meters 1.8) (meters 1.0) 1.0)
(sp-rnd-flt spt-scale-x (meters 0.2) (meters 0.1) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-rot-z (degrees 0.0) (degrees 360.0) 1.0)
(sp-rnd-flt spt-scale-y (meters 1.0) (meters 3.0) 1.0)
(sp-rnd-int spt-r 0 1 128.0)
@@ -935,7 +935,7 @@
(sp-flt spt-num 6.0)
(sp-flt spt-y (meters 10.0))
(sp-rnd-flt spt-scale-x (meters 8.0) (meters 60.0) 1.0)
(sp-int spt-rot-x 0)
(sp-rnd-flt spt-rot-x 0.0 262144.0 1.0)
(sp-rnd-flt spt-rot-y (degrees 0.0) (degrees 360.0) 1.0)
(sp-copy-from-other spt-scale-y -4)
(sp-rnd-flt spt-r 192.0 32.0 1.0)
@@ -1251,7 +1251,7 @@
(sp-flt spt-y (meters 10.0))
(sp-flt spt-z 16384.0)
(sp-flt spt-scale-x (meters 48.0))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-copy-from-other spt-scale-y -4)
(sp-flt spt-r 255.0)
(sp-flt spt-g 255.0)
@@ -1601,7 +1601,3 @@
;; failed to figure out what this is:
0
test/decompiler/reference/levels/flut_common/flut-part_REF.gc
Vendored
+1 -5
View File
@@ -74,7 +74,7 @@
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-y (meters 0.75) (meters 0.1) 1.0)
(sp-flt spt-scale-x (meters 0.0))
(sp-int spt-rot-x 0)
(sp-rnd-flt spt-rot-x 0.0 2730.6667 1.0)
(sp-rnd-flt spt-rot-y (degrees 0.0) (degrees 360.0) 1.0)
(sp-copy-from-other spt-scale-y -4)
(sp-flt spt-r 16.0)
@@ -177,7 +177,3 @@
)
)
)
test/decompiler/reference/levels/racer_common/racer-part_REF.gc
Vendored
+2 -6
View File
@@ -771,7 +771,7 @@
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-y (meters 0.75) (meters 0.1) 1.0)
(sp-flt spt-scale-x (meters 0.0))
(sp-int spt-rot-x 0)
(sp-rnd-flt spt-rot-x 0.0 2730.6667 1.0)
(sp-rnd-flt spt-rot-y (degrees 0.0) (degrees 360.0) 1.0)
(sp-copy-from-other spt-scale-y -4)
(sp-flt spt-r 16.0)
@@ -1196,7 +1196,7 @@
(sp-func spt-birth-func 'birth-func-vector-orient)
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-scale-x (meters 4.0) (meters -0.5) 1.0)
(sp-int spt-rot-x 0)
(sp-rnd-flt spt-rot-x 0.0 65536.0 1.0)
(sp-flt spt-rot-y (degrees 0.0))
(sp-flt spt-rot-z (degrees 90.0))
(sp-copy-from-other spt-scale-y -4)
@@ -1571,7 +1571,3 @@
)
)
)
test/decompiler/reference/levels/swamp/swamp-part_REF.gc
Vendored
+2 -6
View File
@@ -235,7 +235,7 @@
(sp-func spt-birth-func 'birth-func-copy-rot-color)
(sp-flt spt-num 3.0)
(sp-flt spt-scale-x (meters 0.075))
(sp-int spt-rot-x -970282325)
(sp-rnd-flt spt-rot-x -10922.667 54613.332 1.0)
(sp-flt spt-scale-y (meters 0.075))
(sp-flt spt-r 64.0)
(sp-flt spt-g 128.0)
@@ -395,7 +395,7 @@
(sp-func spt-birth-func 'birth-func-copy-rot-color)
(sp-flt spt-num 4.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x -978670933)
(sp-rnd-flt spt-rot-x -5461.3335 43690.668 1.0)
(sp-flt spt-rot-y (degrees 0.0))
(sp-flt spt-scale-y (meters 1.7))
(sp-flt spt-r 128.0)
@@ -2128,7 +2128,3 @@
)
)
)
test/decompiler/reference/levels/training/training-part_REF.gc
Vendored
+2 -6
View File
@@ -810,7 +810,7 @@
(sp-flt spt-num 0.5)
(sp-flt spt-x (meters 0.0))
(sp-flt spt-scale-x (meters 5.0))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-flt spt-rot-z (degrees 15.0))
(sp-copy-from-other spt-scale-y -4)
(sp-rnd-flt spt-r 0.0 32.0 1.0)
@@ -1088,7 +1088,7 @@
(sp-func spt-birth-func 'birth-func-copy-rot-color)
(sp-flt spt-num 2.0)
(sp-flt spt-scale-x (meters 0.9))
(sp-int spt-rot-x -970282325)
(sp-rnd-flt spt-rot-x -10922.667 54613.332 1.0)
(sp-flt spt-scale-y (meters 1.3))
(sp-flt spt-r 255.0)
(sp-flt spt-g 255.0)
@@ -1766,7 +1766,3 @@
)
)
)
test/decompiler/reference/levels/village1/village1-part2_REF.gc
Vendored
+4 -8
View File
@@ -1203,7 +1203,7 @@
(sp-flt spt-y (meters -0.55))
(sp-flt spt-z 327.68)
(sp-rnd-flt spt-scale-x (meters 0.4) (meters 0.25) 1.0)
(sp-int spt-rot-x 1181022800)
(sp-flt spt-rot-x 14654.578)
(sp-flt spt-rot-y (degrees 15.5))
(sp-copy-from-other spt-scale-y -4)
(sp-rnd-flt spt-r 0.0 64.0 1.0)
@@ -1234,7 +1234,7 @@
(sp-flt spt-num 1.0)
(sp-flt spt-z -1064.96)
(sp-flt spt-scale-x (meters 6.0))
(sp-int spt-rot-x 1181022800)
(sp-flt spt-rot-x 14654.578)
(sp-flt spt-rot-y (degrees 15.5))
(sp-copy-from-other spt-scale-y -4)
(sp-flt spt-r 64.0)
@@ -2095,7 +2095,7 @@
(sp-flt spt-num 0.5)
(sp-flt spt-x (meters 0.0))
(sp-flt spt-scale-x (meters 5.0))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-flt spt-rot-z (degrees 105.0))
(sp-copy-from-other spt-scale-y -4)
(sp-rnd-flt spt-r 0.0 32.0 1.0)
@@ -2640,7 +2640,7 @@
(sp-flt spt-num 1.0)
(sp-rnd-flt spt-y (meters 0.75) (meters 0.1) 1.0)
(sp-flt spt-scale-x (meters 0.0))
(sp-int spt-rot-x 0)
(sp-rnd-flt spt-rot-x 0.0 2730.6667 1.0)
(sp-rnd-flt spt-rot-y (degrees 0.0) (degrees 360.0) 1.0)
(sp-copy-from-other spt-scale-y -4)
(sp-flt spt-r 16.0)
@@ -2659,7 +2659,3 @@
)
)
)
test/decompiler/reference/levels/village1/village1-part_REF.gc
Vendored
+46 -50
View File
@@ -154,7 +154,7 @@
(sp-func spt-birth-func 'birth-func-copy-rot-color)
(sp-flt spt-num 2.0)
(sp-flt spt-scale-x (meters 0.9))
(sp-int spt-rot-x -970282325)
(sp-rnd-flt spt-rot-x -10922.667 54613.332 1.0)
(sp-flt spt-scale-y (meters 1.3))
(sp-flt spt-r 255.0)
(sp-flt spt-g 255.0)
@@ -262,7 +262,7 @@
(sp-func spt-birth-func 'birth-func-copy-rot-color)
(sp-flt spt-num 2.0)
(sp-flt spt-scale-x (meters 0.4))
(sp-int spt-rot-x -970282325)
(sp-rnd-flt spt-rot-x -10922.667 54613.332 1.0)
(sp-flt spt-scale-y (meters 0.4))
(sp-flt spt-r 128.0)
(sp-flt spt-g 128.0)
@@ -306,7 +306,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1b :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 0.5))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-scale-y (meters 0.5) (meters 0.1) 1.0)
(sp-flt spt-r 128.0)
(sp-flt spt-g 128.0)
@@ -348,7 +348,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1b :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 0.5))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-scale-y (meters 0.5) (meters 0.1) 1.0)
(sp-flt spt-r 128.0)
(sp-flt spt-g 128.0)
@@ -407,7 +407,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 2.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-flt spt-rot-z (degrees 60.0))
(sp-flt spt-scale-y (meters 0.5))
@@ -433,7 +433,7 @@
(new 'static 'sparticle-launcher
:init-specs
(new 'static 'inline-array sp-field-init-spec 7
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-rnd-flt spt-rot-z (degrees -70.0) (degrees 140.0) 1.0)
(sp-rnd-int spt-a 1107296256 1 32.0)
@@ -453,7 +453,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 2.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-flt spt-rot-z (degrees 60.0))
(sp-flt spt-scale-y (meters 0.5))
@@ -479,7 +479,7 @@
(new 'static 'sparticle-launcher
:init-specs
(new 'static 'inline-array sp-field-init-spec 9
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-rnd-flt spt-rot-z (degrees -70.0) (degrees 140.0) 1.0)
(sp-rnd-int spt-a 1107296256 1 32.0)
@@ -498,7 +498,7 @@
(new 'static 'sparticle-launcher
:init-specs
(new 'static 'inline-array sp-field-init-spec 7
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-rnd-flt spt-rot-z (degrees -70.0) (degrees 140.0) 1.0)
(sp-rnd-int spt-a 1107296256 1 32.0)
@@ -518,7 +518,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 2.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1174405120)
(sp-flt spt-rot-x 8192.0)
(sp-flt spt-rot-y (degrees -90.0))
(sp-flt spt-scale-y (meters 0.5))
(sp-flt spt-r 128.0)
@@ -543,7 +543,7 @@
(new 'static 'sparticle-launcher
:init-specs
(new 'static 'inline-array sp-field-init-spec 7
(sp-int spt-rot-x 1174405120)
(sp-flt spt-rot-x 8192.0)
(sp-flt spt-rot-y (degrees -90.0))
(sp-rnd-flt spt-rot-z (degrees -70.0) (degrees 140.0) 1.0)
(sp-rnd-int spt-a 1107296256 1 32.0)
@@ -563,7 +563,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 2.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1174405120)
(sp-flt spt-rot-x 8192.0)
(sp-flt spt-rot-y (degrees -90.0))
(sp-flt spt-rot-z (degrees 60.0))
(sp-flt spt-scale-y (meters 0.5))
@@ -589,7 +589,7 @@
(new 'static 'sparticle-launcher
:init-specs
(new 'static 'inline-array sp-field-init-spec 9
(sp-int spt-rot-x 1174405120)
(sp-flt spt-rot-x 8192.0)
(sp-flt spt-rot-y (degrees -90.0))
(sp-rnd-flt spt-rot-z (degrees -70.0) (degrees 140.0) 1.0)
(sp-rnd-int spt-a 1107296256 1 32.0)
@@ -608,7 +608,7 @@
(new 'static 'sparticle-launcher
:init-specs
(new 'static 'inline-array sp-field-init-spec 7
(sp-int spt-rot-x 1174405120)
(sp-flt spt-rot-x 8192.0)
(sp-flt spt-rot-y (degrees -90.0))
(sp-rnd-flt spt-rot-z (degrees -70.0) (degrees 140.0) 1.0)
(sp-rnd-int spt-a 1107296256 1 32.0)
@@ -1299,7 +1299,7 @@
(sp-flt spt-num 1.0)
(sp-flt spt-y (meters 0.05))
(sp-flt spt-scale-x (meters 0.9))
(sp-int spt-rot-x 1183725796)
(sp-flt spt-rot-x 18204.445)
(sp-flt spt-rot-y (degrees 72.5))
(sp-flt spt-scale-y (meters 1.3))
(sp-flt spt-r 0.0)
@@ -1338,7 +1338,7 @@
(sp-flt spt-num 1.0)
(sp-flt spt-y (meters 0.05))
(sp-flt spt-scale-x (meters 0.9))
(sp-int spt-rot-x 1180929593)
(sp-flt spt-rot-x 14563.556)
(sp-flt spt-rot-y (degrees 72.5))
(sp-flt spt-scale-y (meters 1.3))
(sp-flt spt-r 0.0)
@@ -1908,7 +1908,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1b :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 0.5))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-flt spt-rot-y (degrees -60.0))
(sp-rnd-flt spt-scale-y (meters 0.5) (meters 0.1) 1.0)
(sp-flt spt-r 128.0)
@@ -1931,7 +1931,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 30.0))
(sp-rnd-flt spt-rot-z (degrees -60.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -1955,7 +1955,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 30.0))
(sp-rnd-flt spt-rot-z (degrees 120.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2005,7 +2005,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1b :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 0.5))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-scale-y (meters 0.5) (meters 0.1) 1.0)
(sp-flt spt-r 64.0)
(sp-flt spt-g 128.0)
@@ -2027,7 +2027,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-rnd-flt spt-rot-z (degrees -60.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2051,7 +2051,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-rnd-flt spt-rot-z (degrees 120.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2101,7 +2101,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1b :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 0.5))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-scale-y (meters 0.5) (meters 0.1) 1.0)
(sp-flt spt-r 196.0)
(sp-flt spt-g 196.0)
@@ -2123,7 +2123,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-rnd-flt spt-rot-z (degrees -60.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2147,7 +2147,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-rnd-flt spt-rot-z (degrees 120.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2209,7 +2209,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1b :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 0.5))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-scale-y (meters 0.5) (meters 0.1) 1.0)
(sp-flt spt-r 196.0)
(sp-flt spt-g 196.0)
@@ -2231,7 +2231,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-rnd-flt spt-rot-z (degrees -60.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2255,7 +2255,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-rnd-flt spt-rot-z (degrees 120.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2282,7 +2282,7 @@
(sp-flt spt-y (meters 1.9))
(sp-flt spt-z 12902.4)
(sp-flt spt-scale-x (meters 0.6))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-flt spt-rot-y (degrees 270.0))
(sp-flt spt-rot-z (degrees 0.0))
(sp-flt spt-scale-y (meters 0.6))
@@ -2309,7 +2309,7 @@
(sp-flt spt-y (meters 1.9))
(sp-flt spt-z 12902.4)
(sp-flt spt-scale-x (meters 0.4))
(sp-int spt-rot-x -970282325)
(sp-flt spt-rot-x -10922.667)
(sp-flt spt-rot-y (degrees 150.0))
(sp-flt spt-rot-z (degrees -60.0))
(sp-flt spt-scale-y (meters 1.0))
@@ -2339,7 +2339,7 @@
(sp-flt spt-y (meters 1.9))
(sp-flt spt-z 12902.4)
(sp-flt spt-scale-x (meters 0.4))
(sp-int spt-rot-x 1193978539)
(sp-flt spt-rot-x 43690.668)
(sp-flt spt-rot-y (degrees 30.0))
(sp-flt spt-rot-z (degrees 60.0))
(sp-flt spt-scale-y (meters 1.0))
@@ -2369,7 +2369,7 @@
(sp-flt spt-y (meters 4.5))
(sp-flt spt-z -10240.0)
(sp-flt spt-scale-x (meters 0.5))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-flt spt-rot-y (degrees 210.0))
(sp-flt spt-rot-z (degrees 0.0))
(sp-flt spt-scale-y (meters 0.5))
@@ -2396,7 +2396,7 @@
(sp-flt spt-y (meters 4.5))
(sp-flt spt-z -10240.0)
(sp-flt spt-scale-x (meters 0.3))
(sp-int spt-rot-x -970282325)
(sp-flt spt-rot-x -10922.667)
(sp-flt spt-rot-y (degrees 90.0))
(sp-flt spt-rot-z (degrees -60.0))
(sp-flt spt-scale-y (meters 1.0))
@@ -2426,7 +2426,7 @@
(sp-flt spt-y (meters 4.5))
(sp-flt spt-z -10240.0)
(sp-flt spt-scale-x (meters 0.3))
(sp-int spt-rot-x 1193978539)
(sp-flt spt-rot-x 43690.668)
(sp-flt spt-rot-y (degrees -30.0))
(sp-flt spt-rot-z (degrees 60.0))
(sp-flt spt-scale-y (meters 1.0))
@@ -2456,7 +2456,7 @@
(sp-flt spt-y (meters 5.0))
(sp-flt spt-z -16384.0)
(sp-flt spt-scale-x (meters 0.5))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-flt spt-rot-y (degrees 180.0))
(sp-flt spt-rot-z (degrees 0.0))
(sp-flt spt-scale-y (meters 0.5))
@@ -2483,7 +2483,7 @@
(sp-flt spt-y (meters 5.0))
(sp-flt spt-z -16384.0)
(sp-flt spt-scale-x (meters 0.3))
(sp-int spt-rot-x -970282325)
(sp-flt spt-rot-x -10922.667)
(sp-flt spt-rot-y (degrees 60.0))
(sp-flt spt-rot-z (degrees -60.0))
(sp-flt spt-scale-y (meters 1.0))
@@ -2525,7 +2525,7 @@
(sp-flt spt-y (meters 5.0))
(sp-flt spt-z -16384.0)
(sp-flt spt-scale-x (meters 0.3))
(sp-int spt-rot-x 1193978539)
(sp-flt spt-rot-x 43690.668)
(sp-flt spt-rot-y (degrees -60.0))
(sp-flt spt-rot-z (degrees 60.0))
(sp-flt spt-scale-y (meters 1.0))
@@ -2612,7 +2612,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1b :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 0.5))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-flt spt-rot-y (degrees -60.0))
(sp-rnd-flt spt-scale-y (meters 0.5) (meters 0.1) 1.0)
(sp-flt spt-r 128.0)
@@ -2635,7 +2635,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 30.0))
(sp-rnd-flt spt-rot-z (degrees -60.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2659,7 +2659,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 30.0))
(sp-rnd-flt spt-rot-z (degrees 120.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2731,7 +2731,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1b :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 0.5))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-flt spt-rot-y (degrees 180.0))
(sp-rnd-flt spt-scale-y (meters 0.5) (meters 0.1) 1.0)
(sp-flt spt-r 255.0)
@@ -2754,7 +2754,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees -90.0))
(sp-rnd-flt spt-rot-z (degrees -60.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2778,7 +2778,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees -90.0))
(sp-rnd-flt spt-rot-z (degrees 120.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2850,7 +2850,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1b :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 0.5))
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-rnd-flt spt-scale-y (meters 0.5) (meters 0.1) 1.0)
(sp-flt spt-r 128.0)
(sp-flt spt-g 128.0)
@@ -2872,7 +2872,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-rnd-flt spt-rot-z (degrees -60.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2896,7 +2896,7 @@
(sp-tex spt-texture (new 'static 'texture-id :index #x1c :page #x2))
(sp-flt spt-num 1.0)
(sp-flt spt-scale-x (meters 1.0))
(sp-int spt-rot-x 1186988032)
(sp-flt spt-rot-x 24576.0)
(sp-flt spt-rot-y (degrees 90.0))
(sp-rnd-flt spt-rot-z (degrees 120.0) (degrees 120.0) 1.0)
(sp-flt spt-scale-y (meters 0.5))
@@ -2910,7 +2910,3 @@
)
)
)
test/decompiler/reference/levels/village2/village2-part_REF.gc
Vendored
+2 -6
View File
@@ -112,7 +112,7 @@
(sp-func spt-birth-func 'birth-func-copy-rot-color)
(sp-flt spt-num 2.0)
(sp-flt spt-scale-x (meters 0.4))
(sp-int spt-rot-x -970282325)
(sp-rnd-flt spt-rot-x -10922.667 54613.332 1.0)
(sp-flt spt-scale-y (meters 0.4))
(sp-flt spt-r 128.0)
(sp-flt spt-g 128.0)
@@ -269,7 +269,7 @@
(sp-func spt-birth-func 'birth-func-copy-rot-color)
(sp-flt spt-num 3.0)
(sp-flt spt-scale-x (meters 0.15))
(sp-int spt-rot-x -970282325)
(sp-rnd-flt spt-rot-x -10922.667 54613.332 1.0)
(sp-flt spt-scale-y (meters 0.15))
(sp-flt spt-r 128.0)
(sp-flt spt-g 128.0)
@@ -2914,7 +2914,3 @@
)
)
)
test/decompiler/reference/levels/village3/village3-part_REF.gc
Vendored
+2 -6
View File
@@ -2874,7 +2874,7 @@
(sp-flt spt-y (meters -2.0))
(sp-flt spt-z -1228.8)
(sp-rnd-flt spt-scale-x (meters 0.5) (meters 0.2) 1.0)
(sp-int spt-rot-x 1182793728)
(sp-flt spt-rot-x 16384.0)
(sp-flt spt-rot-y (degrees -50.000004))
(sp-copy-from-other spt-scale-y -4)
(sp-flt spt-r 128.0)
@@ -2919,7 +2919,7 @@
(sp-flt spt-y (meters -0.5))
(sp-flt spt-z -1064.96)
(sp-flt spt-scale-x (meters 12.0))
(sp-int spt-rot-x 1181395627)
(sp-flt spt-rot-x 15018.667)
(sp-flt spt-rot-y (degrees -50.000004))
(sp-copy-from-other spt-scale-y -4)
(sp-flt spt-r 128.0)
@@ -3097,7 +3097,3 @@
)
)
)