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

[decomp] cleanup default-menu, fix dangerous IOP bug, autoconvert ints in pairs to/from bintegers (#997)

Browse Source 
* fix a couple macros in ref tests

* `default-menu` cleanup

* add `find-instance-by-name` func

* improve debugger slightly hopefully

* fix IOP PLAY buffer overrun bug

* fix `default-menu` more

* automatically convert ints in static pairs to/from bintegers

* fix test

* clang

* fix a few more lambdas

* update refs

* add custom menu cuz cool

* oopsie! also make `default-level` and `halfpipe` go away

* add camera teleport menu

* update types in debug menu
This commit is contained in:
ManDude
2021-12-09 23:39:40 +00:00
committed by GitHub
parent dbc266c00b
commit 59a12029a0
62 changed files with 9230 additions and 15230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/all-types.gc
+85 -66
View File
@@ -6046,7 +6046,7 @@
(define-extern mt8-block-table (array int32))
(define-extern mt4-block-table (array int32))
(define-extern *shader-list* pair) ;; unknown type
(define-extern *edit-shader* int) ;; unknown type
(define-extern *edit-shader* texture-id)
;; ----------------------
@@ -14539,9 +14539,14 @@
;; Containing DGOs - ['GAME', 'ENGINE']
;; Version - 3
(defenum external-cam-option
:bitfield #t
(allow-z 0)
)
;; - Symbols
(define-extern *external-cam-options* int)
(define-extern *external-cam-options* external-cam-option)
(define-extern *external-cam-mode* symbol)
(define-extern *camera-look-through-other* int)
(define-extern *camera-other-fov* bfloat)
@@ -20177,25 +20182,25 @@
)
(deftype debug-menu-item-function (debug-menu-item)
((activate-func (function int object) :offset-assert 24)
((activate-func (function object object) :offset-assert 24)
(hilite-timer int8 :offset-assert 28)
)
:method-count-assert 9
:size-assert #x1d
:flag-assert #x90000001d
(:methods
(new (symbol type string int (function int object)) _type_ 0))
(new (symbol type string object (function object object)) _type_ 0))
)
(deftype debug-menu-item-flag (debug-menu-item)
((activate-func (function int debug-menu-msg object) :offset-assert 24) ;; func is kinda a guess
((activate-func (function object debug-menu-msg object) :offset-assert 24)
(is-on object :offset-assert 28)
)
:method-count-assert 9
:size-assert #x20
:flag-assert #x900000020
(:methods
(new (symbol type string int (function int debug-menu-msg object)) _type_ 0))
(new (symbol type string object (function object debug-menu-msg object)) _type_ 0))
)
@@ -20272,7 +20277,7 @@
(define-extern debug-menu-item-flag-render (function debug-menu-item-flag int int int symbol debug-menu-item-flag))
(define-extern debug-menu-item-var-render (function debug-menu-item-var int int int symbol debug-menu-item-var))
(define-extern debug-menu-make-from-template (function debug-menu-context pair debug-menu-node))
(define-extern debug-menu-append-item (function debug-menu debug-menu-item debug-menu-item))
(define-extern debug-menu-append-item (function debug-menu debug-menu-node debug-menu-node))
(define-extern debug-menu-context-set-root-menu (function debug-menu-context debug-menu debug-menu-context))
(define-extern debug-menu-func-decode (function object function))
(define-extern debug-menu-item-var-make-int (function debug-menu-item-var (function int debug-menu-msg int int int) int symbol int int symbol debug-menu-item-var))
@@ -20304,10 +20309,10 @@
(define-extern error-sphere (function drawable-error string none))
(define-extern draw-instance-info (function string none)) ;; only passed *stdcon*
(define-extern find-instance-by-name (function string prototype-bucket))
(define-extern prototype-bucket-type (function instance type))
(define-extern prototype-bucket-type (function prototype-bucket type))
(define-extern guard-band-cull (function vector symbol)) ;; vf deps - 20-23
(define-extern find-instance-by-index function)
(define-extern prototype-bucket-recalc-fields (function instance instance))
(define-extern prototype-bucket-recalc-fields (function prototype-bucket prototype-bucket))
(define-extern dma-add-process-drawable-hud (function process-drawable draw-control symbol dma-buffer none))
(define-extern foreground-engine-execute (function engine display-frame int int none))
(define-extern main-debug-hook (function none))
@@ -21831,8 +21836,19 @@
:flag-assert #x900000044
)
(defenum anim-tester-flags
:bitfield #t
:type int32
(fanimt0)
(fanimt1)
(fanimt2)
(fanimt3)
(fanimt4)
(fanimt5)
)
(deftype anim-tester (process-drawable)
((flags int32 :offset-assert 176)
((flags anim-tester-flags :offset-assert 176)
(obj-list glst-list :inline :offset-assert 180)
(current-obj string :offset-assert 196)
(speed int32 :offset-assert 200)
@@ -21852,6 +21868,9 @@
:size-assert #x198
:heap-base #x130
:flag-assert #x1401300198
(:states
anim-tester-process
)
)
(deftype anim-test-obj (glst-named-node)
@@ -22030,67 +22049,67 @@
;; - Functions
(define-extern build-continue-menu (function debug-menu-context debug-menu-context)) ;; TODO - this is so simple...just iterating through a list of symbols...still confused though...
(define-extern build-continue-menu (function debug-menu game-info debug-menu-context))
(define-extern debug-menu-make-camera-menu (function debug-menu-context debug-menu-item-submenu))
(define-extern debug-menu-make-shader-menu (function debug-menu-context debug-menu-item-submenu))
(define-extern debug-menu-make-instance-menu (function debug-menu-context debug-menu-item-submenu))
(define-extern debug-menu-make-task-menu (function debug-menu-context debug-menu-item-submenu))
(define-extern dm-current-continue (function function int object)) ;; TODO - game-info::17
(define-extern dm-task-get-money (function int int symbol))
(define-extern dm-levitator-ready (function int int symbol))
(define-extern dm-lavabike-ready (function int int symbol))
(define-extern dm-give-all-cells (function int int symbol))
(define-extern debug-menu-make-task-unknown-menu (function debug-menu-context debug-menu-context debug-menu-item))
(define-extern debug-menu-make-task-need-hint-menu (function debug-menu-context debug-menu-context debug-menu-item))
(define-extern debug-menu-make-task-need-introduction-menu (function debug-menu-context debug-menu-context debug-menu-item))
(define-extern debug-menu-make-task-need-reminder-a-menu (function debug-menu-context debug-menu-context debug-menu-item))
(define-extern debug-menu-make-task-need-reminder-menu (function debug-menu-context debug-menu-context debug-menu-item))
(define-extern debug-menu-make-task-need-reward-speech-menu (function debug-menu-context debug-menu-context debug-menu-item))
(define-extern debug-menu-make-task-need-resolution-menu (function debug-menu-context debug-menu-context debug-menu-item))
(define-extern dm-give-cell (function int none))
(define-extern build-instance-list (function none)) ;; TODO - drawable types aren't complete
(define-extern dm-edit-instance-toggle-pick-func (function int int symbol))
(define-extern dm-boolean-toggle-pick-func (function (pointer symbol) int object)) ;; TODO
(define-extern dm-current-continue (function string debug-menu-msg symbol))
(define-extern dm-task-get-money (function int debug-menu-msg symbol))
(define-extern dm-levitator-ready (function int debug-menu-msg symbol))
(define-extern dm-lavabike-ready (function int debug-menu-msg symbol))
(define-extern dm-give-all-cells (function int debug-menu-msg symbol))
(define-extern debug-menu-make-task-unknown-menu (function debug-menu debug-menu-context none))
(define-extern debug-menu-make-task-need-hint-menu (function debug-menu debug-menu-context none))
(define-extern debug-menu-make-task-need-introduction-menu (function debug-menu debug-menu-context none))
(define-extern debug-menu-make-task-need-reminder-a-menu (function debug-menu debug-menu-context none))
(define-extern debug-menu-make-task-need-reminder-menu (function debug-menu debug-menu-context none))
(define-extern debug-menu-make-task-need-reward-speech-menu (function debug-menu debug-menu-context none))
(define-extern debug-menu-make-task-need-resolution-menu (function debug-menu debug-menu-context none))
(define-extern dm-give-cell (function game-task none))
(define-extern build-instance-list (function object none)) ;; TODO - drawable types aren't complete
(define-extern dm-edit-instance-toggle-pick-func (function int debug-menu-msg symbol))
(define-extern dm-boolean-toggle-pick-func (function (pointer symbol) debug-menu-msg symbol))
(define-extern build-shader-list (function object))
(define-extern all-texture-tweak-adjust (function texture-page-dir float object)) ;; TODO - texture related types
(define-extern debug-menu-make-camera-mode-menu (function int int object)) ;; TODO - depends on camera stuff yet merged
(define-extern dm-cam-externalize (function symbol int symbol))
(define-extern dm-cam-render-float (function int int float float float))
(define-extern dm-cam-settings-func (function int int symbol))
(define-extern dm-cam-settings-func-int (function int int debug-menu debug-menu debug-menu))
(define-extern all-texture-tweak-adjust (function texture-page-dir float none)) ;; TODO - texture related types
(define-extern debug-menu-make-camera-mode-menu (function debug-menu debug-menu none))
(define-extern dm-cam-externalize (function symbol debug-menu-msg symbol))
(define-extern dm-cam-render-float (function int debug-menu-msg float float float))
(define-extern dm-cam-settings-func (function int debug-menu-msg symbol))
(define-extern dm-cam-settings-func-int (function int debug-menu-msg int int int))
(define-extern debug-create-cam-restore (function none)) ;; TODO - level-group type isn't complete
(define-extern dm-cam-mode-func (function (state camera-slave) int object))
(define-extern dm-instance-pick-func (function string int basic))
(define-extern dm-enable-instance-func (function string int symbol))
(define-extern dm-shader-pick-func (function texture-id int object)) ;; TODO - more texture stuff...
(define-extern debug-menu-node<? (function debug-menu debug-menu symbol))
(define-extern dm-subdiv-float (function symbol int float float float))
(define-extern dm-subdiv-int (function function int object object object)) ;; TODO - dependant on anim-tester
(define-extern dm-setting-language (function function int symbol))
(define-extern dm-subdiv-draw-func (function int int symbol))
(define-extern dm-ocean-subdiv-draw-func (function int int symbol))
(define-extern dm-time-of-day-func (function int int symbol))
(define-extern dm-time-of-day-func2 (function (pointer symbol) int symbol)) ;; TODO
(define-extern dm-time-of-day-pick-func (function symbol int none)) ;; TODO - confirm time-of-day::time-of-day-setup
(define-extern dm-actor-marks-pick-func (function symbol int symbol))
(define-extern dm-compact-actor-pick-func (function int int object)) ;; TODO - what is *compact-actors*
(define-extern dm-actor-vis-pick-func (function symbol int symbol))
(define-extern dm-game-mode-pick-func (function symbol int symbol))
(define-extern dm-vu1-user-toggle-pick-func (function int int symbol))
(define-extern dm-vu1-user-set-pick-func (function int int symbol))
(define-extern dm-texture-user-toggle-pick-func (function int int symbol))
(define-extern dm-texture-user-set-pick-func (function int int symbol))
(define-extern dm-strip-lines-toggle-pick-func (function int int symbol))
(define-extern dm-strip-lines-set-pick-func (function int int symbol))
(define-extern dm-task-unknown (function int int symbol))
(define-extern dm-task-hint (function int int symbol))
(define-extern dm-task-introduction (function int int symbol))
(define-extern dm-task-reminder-a (function int int symbol))
(define-extern dm-task-reminder (function int int symbol))
(define-extern dm-task-reward-speech (function int int symbol))
(define-extern dm-task-resolution (function int int symbol))
(define-extern dm-anim-tester-flag-func (function int int object)) ;; TODO - *anim-tester*
(define-extern dm-anim-tester-func (function int none)) ;; TODO - *anim-tester*
(define-extern dm-cam-mode-func (function (state camera-slave) debug-menu-msg object))
(define-extern dm-instance-pick-func (function string debug-menu-msg basic))
(define-extern dm-enable-instance-func (function string debug-menu-msg symbol))
(define-extern dm-shader-pick-func (function texture-id debug-menu-msg symbol))
(define-extern debug-menu-node<? (function debug-menu-node debug-menu-node symbol))
(define-extern dm-subdiv-float (function symbol debug-menu-msg float float float))
(define-extern dm-subdiv-int (function symbol debug-menu-msg int int int))
(define-extern dm-setting-language (function int debug-menu-msg symbol))
(define-extern dm-subdiv-draw-func (function int debug-menu-msg symbol))
(define-extern dm-ocean-subdiv-draw-func (function int debug-menu-msg symbol))
(define-extern dm-time-of-day-func (function int debug-menu-msg symbol))
(define-extern dm-time-of-day-func2 (function (pointer symbol) debug-menu-msg symbol)) ;; TODO
(define-extern dm-time-of-day-pick-func (function symbol debug-menu-msg none)) ;; TODO - confirm time-of-day::time-of-day-setup
(define-extern dm-actor-marks-pick-func (function symbol debug-menu-msg symbol))
(define-extern dm-compact-actor-pick-func (function symbol debug-menu-msg symbol))
(define-extern dm-actor-vis-pick-func (function symbol debug-menu-msg symbol))
(define-extern dm-game-mode-pick-func (function symbol debug-menu-msg symbol))
(define-extern dm-vu1-user-toggle-pick-func (function vu1-renderer-mask debug-menu-msg symbol))
(define-extern dm-vu1-user-set-pick-func (function vu1-renderer-mask debug-menu-msg symbol))
(define-extern dm-texture-user-toggle-pick-func (function int debug-menu-msg symbol))
(define-extern dm-texture-user-set-pick-func (function int debug-menu-msg symbol))
(define-extern dm-strip-lines-toggle-pick-func (function int debug-menu-msg symbol))
(define-extern dm-strip-lines-set-pick-func (function int debug-menu-msg symbol))
(define-extern dm-task-unknown (function int debug-menu-msg symbol))
(define-extern dm-task-hint (function int debug-menu-msg symbol))
(define-extern dm-task-introduction (function int debug-menu-msg symbol))
(define-extern dm-task-reminder-a (function int debug-menu-msg symbol))
(define-extern dm-task-reminder (function int debug-menu-msg symbol))
(define-extern dm-task-reward-speech (function int debug-menu-msg symbol))
(define-extern dm-task-resolution (function int debug-menu-msg symbol))
(define-extern dm-anim-tester-flag-func (function int debug-menu-msg symbol))
(define-extern dm-anim-tester-func (function int debug-menu-msg none)) ;; TODO - *anim-tester*
(define-extern debug-menu-context-make-default-menus (function debug-menu-context debug-menu-context))
(define-extern popup-menu-context-make-default-menus (function debug-menu-context debug-menu-context))
@@ -22102,7 +22121,7 @@
(define-extern *enable-instance-tie-menu* debug-menu)
(define-extern *shader-pick-menu* debug-menu)
(define-extern cam-robotboss (state camera-slave))
(define-extern *dm-cam-mode-interpolation* debug-menu)
(define-extern *dm-cam-mode-interpolation* int)
;; ----------------------
decompiler/config/jak1_ntsc_black_label/anonymous_function_types.jsonc
+34 -34
View File
@@ -514,29 +514,29 @@
"default-menu": [
[3, "(function none)"],
[4, "(function int int symbol)"], // TODO - first arg is ignored - i think there's a decomp bug here
[5, "(function int int symbol)"], // TODO - first arg is ignored
[6, "(function int int target)"], // TODO - first arg is ignored
[4, "(function int debug-menu-msg symbol)"],
[5, "(function int debug-menu-msg symbol)"],
[6, "(function int debug-menu-msg target)"],
[8, "(function int)"],
[9, "(function continue-point)"],
[9, "(function none)"],
[10, "(function none)"],
[11, "(function object)"],
[12, "(function object)"],
[13, "(function object)"],
[14, "(function quaternion)"],
[15, "(function quaternion)"],
[16, "(function int int basic)"], // TODO - first arg is ignored
[16, "(function int debug-menu-msg symbol)"],
[17, "(function int)"],
[18, "(function int)"],
[19, "(function int)"],
[20, "(function none)"],
[21, "(function int int basic)"], // TODO - first arg is ignored
[22, "(function int int basic)"], // TODO - first arg is ignored
[23, "(function int int basic)"], // TODO - first arg is ignored
[24, "(function int int float float)"], // TODO - first arg is ignored
[25, "(function int int float float)"], // TODO - first arg is ignored
[26, "(function int int float float)"], // TODO - first arg is ignored
[27, "(function int int target)"], // TODO - first arg is ignored
[21, "(function int debug-menu-msg symbol)"],
[22, "(function int debug-menu-msg symbol)"],
[23, "(function int debug-menu-msg symbol)"],
[24, "(function int debug-menu-msg float float)"],
[25, "(function int debug-menu-msg float float)"],
[26, "(function int debug-menu-msg float float)"],
[27, "(function int debug-menu-msg target)"],
[28, "(function none)"],
[29, "(function none)"],
[30, "(function none)"],
@@ -544,30 +544,30 @@
[32, "(function none)"],
[33, "(function none)"],
[34, "(function int)"],
[35, "(function int)"],
[60, "(function debug-menu int float float object)"], // TODO - instance type blocking this one, not 100% sure about the debug-menu, but it has a string at offset 0
[61, "(function debug-menu int float float object)"], // TODO - instance type blocking this one, not 100% sure about the debug-menu, but it has a string at offset 0
[63, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[64, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[65, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[66, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[67, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[68, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[69, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[70, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[71, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[72, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[73, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[74, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[75, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[76, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[77, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[78, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[79, "(function symbol int int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[35, "(function target)"],
[60, "(function debug-menu debug-menu-msg float float object)"], // TODO - instance type blocking this one, not 100% sure about the debug-menu, but it has a string at offset 0
[61, "(function debug-menu debug-menu-msg float float object)"], // TODO - instance type blocking this one, not 100% sure about the debug-menu, but it has a string at offset 0
[63, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[64, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[65, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[66, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[67, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[68, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[69, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[70, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[71, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[72, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[73, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[74, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[75, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[76, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[77, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[78, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[79, "(function symbol debug-menu-msg int basic object)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0) and a3 is a default return value it seems
[80, "(function object)"],
[81, "(function object)"],
[82, "(function symbol int float float none)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0)
[84, "(function symbol int none)"], // TODO - i don't know the first (is a basic/struct with an int32 at offset 0)
[82, "(function symbol debug-menu-msg float float none)"],
[84, "(function symbol debug-menu-msg none)"],
[88, "(function debug-menu debug-menu symbol)"], // not 100% sure about the debug-menu, but it has a string at offset 0
[89, "(function debug-menu debug-menu symbol)"], // not 100% sure about the debug-menu, but it has a string at offset 0
[90, "(function debug-menu debug-menu symbol)"] // not 100% sure about the debug-menu, but it has a string at offset 0
decompiler/config/jak1_ntsc_black_label/var_names.jsonc
+1 -1
View File
@@ -144,7 +144,7 @@
"s4-0": "unsorted-count",
"s3-0": "iter",
"s2-0": "first-elt",
"s1-0": "seoncd-elt",
"s1-0": "second-elt",
"v1-1": "compare-result"
}
},
decompiler/config/jak1_pal/var_names.jsonc
+1 -1
View File
@@ -144,7 +144,7 @@
"s4-0": "unsorted-count",
"s3-0": "iter",
"s2-0": "first-elt",
"s1-0": "seoncd-elt",
"s1-0": "second-elt",
"v1-1": "compare-result"
}
},
decompiler/config/jak1_sced/var_names.jsonc
+1 -1
View File
@@ -144,7 +144,7 @@
"s4-0": "unsorted-count",
"s3-0": "iter",
"s2-0": "first-elt",
"s1-0": "seoncd-elt",
"s1-0": "second-elt",
"v1-1": "compare-result"
}
},
decompiler/util/data_decompile.cpp
+1 -1
View File
@@ -1193,7 +1193,7 @@ goos::Object decompile_pair_elt(const LinkedWord& word,
} else if (word.kind() == LinkedWord::EMPTY_PTR) {
return pretty_print::to_symbol("'()");
} else if (word.kind() == LinkedWord::PLAIN_DATA && (word.data & 0b111) == 0) {
return pretty_print::to_symbol(fmt::format("(the binteger {})", ((s32)word.data) >> 3));
return pretty_print::to_symbol(fmt::format("{}", ((s32)word.data) >> 3)); // binteger assumed
} else if (word.kind() == LinkedWord::PLAIN_DATA) {
return pretty_print::to_symbol(fmt::format("#x{:x}", word.data));
} else {
game/common/str_rpc_types.h
+5 -1
View File
@@ -16,6 +16,10 @@ struct RPC_Str_Cmd {
char name[64]; // file name
};
struct RPC_Play_Cmd {
u8 pad[1024]; // TODO everything
};
constexpr int STR_RPC_RESULT_ERROR = 1;
constexpr int STR_RPC_RESULT_DONE = 0;
@@ -34,4 +38,4 @@ struct StrFileHeaderSector : StrFileHeader {
};
static_assert(sizeof(StrFileHeader) == 0x200, "Sector header size");
static_assert(sizeof(StrFileHeaderSector) == SECTOR_SIZE, "Sector header size");
static_assert(sizeof(StrFileHeaderSector) == SECTOR_SIZE, "Sector header size");
game/kernel/kboot.cpp
+1 -1
View File
@@ -176,7 +176,7 @@ void KernelCheckAndDispatch() {
}
auto time_ms = kernel_dispatch_timer.getMs();
if (time_ms > 30) {
if (time_ms > 50) {
printf("Kernel dispatch time: %.3f ms\n", time_ms);
}
game/overlord/stream.cpp
+6 -6
View File
@@ -15,8 +15,8 @@
using namespace iop;
static RPC_Str_Cmd sRPCBuf;
static RPC_Str_Cmd sRPCBuf2; // todo type
static RPC_Str_Cmd sSTRBuf;
static RPC_Play_Cmd sPLAYBuf; // todo type
void* RPC_STR(unsigned int fno, void* _cmd, int y);
void* RPC_PLAY(unsigned int fno, void* _cmd, int y);
@@ -38,8 +38,8 @@ constexpr int STR_INDEX_CACHE_SIZE = 4;
CacheEntry sCache[STR_INDEX_CACHE_SIZE];
void stream_init_globals() {
memset(&sRPCBuf, 0, sizeof(RPC_Str_Cmd));
memset(&sRPCBuf2, 0, sizeof(RPC_Str_Cmd));
memset(&sSTRBuf, 0, sizeof(RPC_Str_Cmd));
memset(&sPLAYBuf, 0, sizeof(RPC_Play_Cmd));
}
/*!
@@ -52,7 +52,7 @@ u32 STRThread() {
CpuDisableIntr();
sceSifInitRpc(0);
sceSifSetRpcQueue(&dq, GetThreadId());
sceSifRegisterRpc(&serve, STR_RPC_ID, RPC_STR, &sRPCBuf, nullptr, nullptr, &dq);
sceSifRegisterRpc(&serve, STR_RPC_ID, RPC_STR, &sSTRBuf, nullptr, nullptr, &dq);
CpuEnableIntr();
sceSifRpcLoop(&dq);
return 0;
@@ -65,7 +65,7 @@ u32 PLAYThread() {
CpuDisableIntr();
sceSifInitRpc(0);
sceSifSetRpcQueue(&dq, GetThreadId());
sceSifRegisterRpc(&serve, PLAY_RPC_ID, RPC_PLAY, &sRPCBuf2, nullptr, nullptr, &dq);
sceSifRegisterRpc(&serve, PLAY_RPC_ID, RPC_PLAY, &sPLAYBuf, nullptr, nullptr, &dq);
CpuEnableIntr();
sceSifRpcLoop(&dq);
return 0;
game/sce/iop.cpp
+1 -1
View File
@@ -217,4 +217,4 @@ s32 WakeupThread(s32 thid) {
iop->kernel.WakeupThread(thid);
return 0;
}
} // namespace iop
} // namespace iop
goal_src/engine/camera/cam-update-h.gc
+5 -1
View File
@@ -5,8 +5,12 @@
;; name in dgo: cam-update-h
;; dgos: GAME, ENGINE
(defenum external-cam-option
:bitfield #t
(allow-z 0)
)
(define *external-cam-options* 0)
(define *external-cam-options* (external-cam-option))
(define *external-cam-mode* #f)
(define-perm *camera-look-through-other* int 0)
(define-perm *camera-other-fov* bfloat (new 'static 'bfloat :data 11650.845))
goal_src/engine/debug/anim-tester.gc
+2227 -2879
View File
File diff suppressed because it is too large Load Diff
goal_src/engine/debug/default-menu.gc
+3780 -8626
View File
File diff suppressed because it is too large Load Diff
goal_src/engine/debug/menu.gc
+11 -14
View File
@@ -159,25 +159,25 @@
;; An item that calls a function when you select it.
(deftype debug-menu-item-function (debug-menu-item)
((activate-func (function int object) :offset-assert 24)
((activate-func (function object object) :offset-assert 24)
(hilite-timer int8 :offset-assert 28) ;; how much longer to stay highlighted for.
)
:method-count-assert 9
:size-assert #x1d
:flag-assert #x90000001d
(:methods
(new (symbol type string int (function int object)) _type_ 0)
(new (symbol type string object (function object object)) _type_ 0)
)
)
(defmethod new debug-menu-item-function ((allocation symbol) (type-to-make type) (name string) (id int) (func (function int object)))
(defmethod new debug-menu-item-function ((allocation symbol) (type-to-make type) (name string) id (func (function object object)))
"Create an item for a function."
(let ((obj (object-new allocation type-to-make (the-as int (-> type-to-make size)))))
(set! (-> obj name) name)
(set! (-> obj parent) #f)
(set! (-> obj refresh-delay) 0)
(set! (-> obj refresh-ctr) (-> obj refresh-delay))
(set! (-> obj id) id)
(set! (-> obj id) (the-as int id))
(set! (-> obj activate-func) func)
(set! (-> obj hilite-timer) 0)
obj
@@ -186,25 +186,25 @@
;; An item with on/off state.
(deftype debug-menu-item-flag (debug-menu-item)
((activate-func (function int debug-menu-msg object) :offset-assert 24)
((activate-func (function object debug-menu-msg object) :offset-assert 24)
(is-on object :offset-assert 28)
)
:method-count-assert 9
:size-assert #x20
:flag-assert #x900000020
(:methods
(new (symbol type string int (function int debug-menu-msg object)) _type_ 0)
(new (symbol type string object (function object debug-menu-msg object)) _type_ 0)
)
)
(defmethod new debug-menu-item-flag ((allocation symbol) (type-to-make type) (name string) (id int) (func (function int debug-menu-msg object)))
(defmethod new debug-menu-item-flag ((allocation symbol) (type-to-make type) (name string) id (func (function object debug-menu-msg object)))
"Create a new item for a flag. By default, the refresh-delay is set to 23."
(let ((v0-0 (object-new allocation type-to-make (the-as int (-> type-to-make size)))))
(set! (-> v0-0 name) name)
(set! (-> v0-0 parent) #f)
(set! (-> v0-0 refresh-delay) 23)
(set! (-> v0-0 refresh-ctr) (-> v0-0 refresh-delay))
(set! (-> v0-0 id) id)
(set! (-> v0-0 id) (the-as int id))
(set! (-> v0-0 activate-func) func)
(set! (-> v0-0 is-on) #f)
v0-0
@@ -258,10 +258,7 @@
(define-extern debug-menu-context-send-msg (function debug-menu-context debug-menu-msg debug-menu-dest debug-menu-context))
(define-extern debug-menu-make-from-template (function debug-menu-context pair debug-menu-node))
(define-extern debug-menu-item-send-msg (function debug-menu-item debug-menu-msg debug-menu-item))
(define-extern debug-menu-item-var-render (function debug-menu-item-var int int int symbol debug-menu-item-var))
(define-extern debug-menu-send-msg (function debug-menu debug-menu-msg symbol debug-menu))
@@ -522,7 +519,7 @@
context
)
(defun debug-menu-append-item ((menu debug-menu) (item debug-menu-item))
(defun debug-menu-append-item ((menu debug-menu) (item debug-menu-node))
"Add an entry to the debug menu."
(let* ((context (-> menu context))
(was-active (-> context is-active))
@@ -578,7 +575,7 @@
)
)
(defun debug-menu-make-from-template ((arg0 debug-menu-context) (arg1 pair))
(defun-recursive debug-menu-make-from-template debug-menu-node ((arg0 debug-menu-context) (arg1 pair))
"Make a debug menu from static layout data. The keys are:
- menu : make a new submenu
- main-menu : make the root menu
@@ -1388,7 +1385,7 @@
arg0
)
(defun debug-menu-send-msg ((arg0 debug-menu) (arg1 debug-menu-msg) (arg2 symbol))
(defun-recursive debug-menu-send-msg debug-menu ((arg0 debug-menu) (arg1 debug-menu-msg) (arg2 symbol))
"Send to all items in menu. Arg2 picks if we are recursive or not."
(let* ((s3-0 (-> arg0 items))
(s2-0 (car s3-0))
goal_src/engine/draw/drawable.gc
+54
View File
@@ -53,6 +53,60 @@
|#
)
(defun-debug find-instance-by-name ((arg0 string))
(dotimes (s5-0 (-> *level* length))
(let ((v1-3 (-> *level* level s5-0)))
(when (= (-> v1-3 status) 'active)
(let ((s4-0 (-> v1-3 bsp drawable-trees)))
(dotimes (s3-0 (-> s4-0 length))
(let ((v1-7 (-> s4-0 trees s3-0)))
(case (-> v1-7 type)
((drawable-tree-instance-shrub)
(let ((s2-0 (-> (the-as drawable-tree-instance-shrub v1-7) info prototype-inline-array-shrub)))
(dotimes (s1-0 (-> s2-0 length))
(if (string= arg0 (the-as string (-> s2-0 data s1-0 name)))
(return (-> s2-0 data s1-0))
)
)
)
)
((drawable-tree-instance-tie)
(let ((s2-1 (-> (the-as drawable-tree-instance-tie v1-7) prototypes prototype-array-tie)))
(dotimes (s1-1 (-> s2-1 length))
(if (string= arg0 (the-as string (-> s2-1 array-data s1-1 name)))
(return (-> s2-1 array-data s1-1))
)
)
)
)
)
)
)
)
)
)
)
(the-as prototype-bucket #f)
)
(define-extern prototype-bucket-type (function prototype-bucket type)) ;; TODO
(defun-debug prototype-bucket-recalc-fields ((arg0 prototype-bucket))
(case (prototype-bucket-type arg0)
((instance-shrubbery)
(set! (-> arg0 rdists x) (/ 1.0 (- (-> arg0 dists w) (-> arg0 dists x))))
)
(else
(set! (-> arg0 dists z) (+ (-> arg0 dists x) (* 0.33333334 (- (-> arg0 dists w) (-> arg0 dists x)))))
(set! (-> arg0 rdists x) (/ 1.0 (- (-> arg0 dists z) (-> arg0 dists x))))
)
)
(set! (-> arg0 rdists z) (/ 1.0 (- (-> arg0 dists w) (-> arg0 dists z))))
(set! (-> arg0 dists y) (* 0.5 (-> arg0 dists x)))
(set! (-> arg0 rdists y) (/ 1.0 (-> arg0 dists y)))
arg0
)
(defun sphere-cull ((arg0 vector))
#t
;; todo
goal_src/engine/entity/entity.gc
+1 -1
View File
@@ -1434,7 +1434,7 @@
"This function starts up an entity!
The process should not be activated yet."
(birth-log "(init-entity entity: ~A)~%" ent)
;;(birth-log "(init-entity ~A)~%" ent)
;; activate the process. It goes in the entity-pool, which is a child of the main active-pool.
(activate proc *entity-pool* (res-lump-struct ent 'name basic) (the-as pointer #x70004000))
goal_src/engine/gfx/texture.gc
+1 -1
View File
@@ -2278,7 +2278,7 @@
;; debug menu shader stuff
(define *shader-list* '())
(define *edit-shader* 0)
(define *edit-shader* (the-as texture-id 0))
(defun link-texture-by-id ((arg0 texture-id) (arg1 adgif-shader))
"Link the given adgif shader to the texture with the given ID"
goal_src/engine/level/level.gc
+5 -5
View File
@@ -1455,7 +1455,7 @@
(let ((startup-level (case *kernel-boot-message*
(('play)
(if *debug-segment*
(#if (user? dass) 'finalboss 'village1)
'village1
'title
)
)
@@ -1478,10 +1478,10 @@
))
(set! *time-of-day-fast* #f)
(load-commands-set! *level* '())
; (when *time-of-day-proc*
; (set! (-> *time-of-day-proc* 0 time-ratio) (seconds 1.0))
; (set! (-> *time-of-day-proc* 0 hour) 7) ;; 7AM waking up in the morning
; )
(when *time-of-day-proc*
(set! (-> *time-of-day-proc* 0 time-ratio) (fsec 1.0))
(set! (-> *time-of-day-proc* 0 hour) 7) ;; 7AM waking up in the morning
)
(set-blackout-frames 6)
(unless *dproc*
(reset! *load-state*)
goal_src/engine/math/vector-h.gc
+1 -2
View File
@@ -506,8 +506,7 @@
(set! (-> ,vec z) ,zv)
(set! (-> ,vec w) ,wv)
,vec
)
)
))
)
(defun vector-dot ((a vector) (b vector))
goal_src/goal-lib.gc
+4
View File
@@ -655,6 +655,10 @@
`(car (cdr (cdr (cdr ,arg))))
)
(defmacro dcons (a b)
`(new 'debug 'pair ,a ,b)
)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; METHOD STUFF
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
goal_src/kernel/gcommon.gc
+4 -4
View File
@@ -614,7 +614,7 @@
NOTE: if you use an integer, don't accidentally return TRUE."
;; the compare function can return a few possible things.
;; we assume "unsorted" if compare-result is #f explicitly, or if it positive.
;; HOWEVER, '#t itself is positive. So if we get #t, we assume sorted.
;; HOWEVER, #t itself is positive. So if we get #t, we assume sorted.
;; there is possibly an ambiguity, if you happen to return a positive integer that
;; happens to be a pointer to #t,
(let ((unsorted-count -1))
@@ -625,8 +625,8 @@
(let ((iter lst))
(while (not (or (null? (cdr iter)) (not (pair? (cdr iter)))))
(let* ((first-elt (car iter))
(seoncd-elt (car (cdr iter)))
(compare-result (compare-func first-elt seoncd-elt))
(second-elt (car (cdr iter)))
(compare-result (compare-func first-elt second-elt))
)
;; the compare function can return a few possible things.
;; we assume "unsorted" if compare-result is #f explicitly, or if it positive.
@@ -638,7 +638,7 @@
(!= compare-result #t)
)
(+! unsorted-count 1)
(set! (car iter) seoncd-elt)
(set! (car iter) second-elt)
(set! (car (cdr iter)) first-elt)
)
)
goalc/compiler/compilation/Static.cpp
+4 -3
View File
@@ -575,12 +575,13 @@ StaticResult Compiler::compile_static_no_eval_for_pairs(const goos::Object& form
fie->add_static(std::move(pair_structure));
return result;
} else if (form.is_int()) {
if (!integer_fits(form.as_int(), 4, true)) {
s64 bint_val = form.as_int() << 3;
if (!integer_fits(bint_val, 4, true)) {
throw_compiler_error(
form, "Cannot store {} (0x{:x}) in a pair because it overflows a signed 32-bit integer.",
form.as_int(), form.as_int());
bint_val, bint_val);
}
return StaticResult::make_constant_data(form.as_int(), TypeSpec("int32"));
return StaticResult::make_constant_data(bint_val, TypeSpec("int32"));
} else if (form.is_symbol()) {
return StaticResult::make_symbol(form.as_symbol()->name);
} else if (form.is_empty_list()) {
goalc/debugger/Debugger.cpp
+51 -9
View File
@@ -214,6 +214,7 @@ std::vector<BacktraceFrame> Debugger::get_backtrace(u64 rip, u64 rsp) {
rsp += 8;
}
int fails = 0;
while (true) {
fmt::print(" rsp: 0x{:x} (#x{:x}) rip: 0x{:x} (#x{:x})\n", rsp, rsp - m_debug_context.base,
rip, rip - m_debug_context.base);
@@ -223,6 +224,7 @@ std::vector<BacktraceFrame> Debugger::get_backtrace(u64 rip, u64 rsp) {
if (frame.rip_info.knows_function && frame.rip_info.func_debug &&
frame.rip_info.func_debug->stack_usage) {
fails = 0;
fmt::print("<====================== CALL STACK ======================>\n");
fmt::print("{} from {}\n", frame.rip_info.function_name, frame.rip_info.func_debug->obj_name);
// we're good!
@@ -241,17 +243,57 @@ std::vector<BacktraceFrame> Debugger::get_backtrace(u64 rip, u64 rsp) {
} else {
if (!frame.rip_info.knows_function) {
fmt::print("Unknown Function at 0x{:x} (#x{:x})\n", rip, rip - m_debug_context.base);
// attempt to backtrace anyway! if this fails then rip
u64 next_rip = 0;
if (!read_memory_if_safe<u64>(&next_rip, rsp - m_debug_context.base)) {
fmt::print("Invalid return address encountered!\n");
break;
if (fails == 0) {
fmt::print("Unknown Function at rip\n");
}
rip = next_rip;
rsp = rsp + 8; // 8 for the call itself.
if (s32(rip - m_debug_context.base) > 0 &&
m_symbol_name_to_value_map.find("function") != m_symbol_name_to_value_map.cend()) {
u32 function_sym_val = m_symbol_name_to_value_map.at("function");
u32 goal_pc = u32(rip - m_debug_context.base) & -8;
// go back through memory, but stop before reading the symbol table
u32 symtable_end = m_symbol_name_to_value_map.at("#f") + 0xff38;
while (goal_pc > symtable_end) {
goal_pc -= 8;
u32 wordval;
if (!read_memory_if_safe<u32>(&wordval, goal_pc)) {
goal_pc = symtable_end;
break;
}
if (wordval == function_sym_val) {
// found a function!
fmt::print("Found function after {} bytes!\n",
(rip - m_debug_context.base) - goal_pc);
break;
}
}
if (goal_pc == symtable_end) {
fmt::print("Could not find function within this address.\n");
break;
}
rip = goal_pc + m_debug_context.base + BASIC_OFFSET;
rsp = rsp + 8; // 8 for the call itself.
} else if (fails > 50) {
fmt::print(
"Backtrace was too long. Exception might have happened outside GOAL code, or the "
"stack frame is too long.\n");
break;
} else {
// attempt to backtrace anyway! if this fails then rip
u64 next_rip = 0;
if (!read_memory_if_safe<u64>(&next_rip, rsp - m_debug_context.base)) {
fmt::print("Invalid return address encountered!\n");
break;
}
rip = next_rip;
rsp = rsp + 8; // 8 for the call itself.
++fails;
}
// break;
} else if (!frame.rip_info.func_debug) {
fmt::print("Function {} has no debug info.\n", frame.rip_info.function_name);
test/decompiler/reference/decompiler-macros.gc
Generated Vendored
+24 -13
View File
@@ -257,11 +257,13 @@
(defmacro set-vector! (v xv yv zv wv)
"Set all fields in a vector"
(with-gensyms (vec)
`(let ((vec ,v))
(set! (-> vec x) ,xv)
(set! (-> vec y) ,yv)
(set! (-> vec z) ,zv)
(set! (-> vec w) ,wv)))
`(let ((,vec ,v))
(set! (-> ,vec x) ,xv)
(set! (-> ,vec y) ,yv)
(set! (-> ,vec z) ,zv)
(set! (-> ,vec w) ,wv)
,vec
))
)
;; cause the current process to change state
@@ -406,6 +408,7 @@
(set! *defstate-type-stack* '())
`(none)
)
;; *no-state* is just used for the compiler to know whether a handler was actually set or not
(defmacro defstate (state-name parents
&key (virtual #f)
&key (event *no-state*)
@@ -416,7 +419,7 @@
&key (post *no-state*)
)
"Define a new state!"
(with-gensyms (new-state)
(let ((defstate-type (first parents)))
(when (not (null? *defstate-type-stack*))
@@ -427,24 +430,32 @@
;; check for default handlers
(let ((default-handlers (assoc defstate-type *default-state-handlers*)))
(when (not (null? default-handlers))
;;(fmt #t "found default-handlers for {}: {}\n" defstate-type default-handlers)
;; event
(set! default-handlers (cdr default-handlers))
(when (and (not event) (car default-handlers))
(when (and (eq? event '*no-state*) (car default-handlers))
(set! event (car default-handlers)))
;; enter
(set! default-handlers (cdr default-handlers))
(when (and (not enter) (car default-handlers))
(when (and (eq? enter '*no-state*) (car default-handlers))
(set! enter (car default-handlers)))
;; trans
(set! default-handlers (cdr default-handlers))
(when (and (not trans) (car default-handlers))
(when (and (eq? trans '*no-state*) (car default-handlers))
(set! trans (car default-handlers)))
;; exit
(set! default-handlers (cdr default-handlers))
(when (and (not exit) (car default-handlers))
(when (and (eq? exit '*no-state*) (car default-handlers))
(set! exit (car default-handlers)))
;; code
(set! default-handlers (cdr default-handlers))
(when (and (not code) (car default-handlers))
(when (and (eq? code '*no-state*) (car default-handlers))
(set! code (car default-handlers)))
;; post
(set! default-handlers (cdr default-handlers))
(when (and (not post) (car default-handlers))
(when (and (eq? post '*no-state*) (car default-handlers))
(set! post (car default-handlers)))
(set! default-handlers (cdr default-handlers))
)
)
@@ -472,7 +483,7 @@
`(define-virtual-state-hook ,state-name ,defstate-type ,new-state :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
`(define-state-hook ,state-name ,defstate-type ,new-state :event ,event :enter ,enter :trans ,trans :exit ,exit :code ,code :post ,post)
)
)
)
)
test/decompiler/reference/engine/camera/cam-update-h_REF.gc
Generated Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
;;-*-Lisp-*-
(in-package goal)
;; definition for symbol *external-cam-options*, type int
(define *external-cam-options* 0)
;; definition for symbol *external-cam-options*, type external-cam-option
(define *external-cam-options* (the-as external-cam-option 0))
;; definition for symbol *external-cam-mode*, type symbol
(define *external-cam-mode* #f)
test/decompiler/reference/engine/camera/cam-update_REF.gc
Generated Vendored
+1 -1
View File
@@ -221,7 +221,7 @@
(if (= (vector-length s4-1) 0.0)
(set! (-> s4-1 y) -1.0)
)
(if (logtest? *external-cam-options* 1)
(if (logtest? *external-cam-options* (external-cam-option allow-z))
(set! s4-1 (the-as vector #f))
)
(cam-free-floating-move *save-camera-inv-rot* (-> arg0 trans) s4-1 s5-0)
test/decompiler/reference/engine/debug/anim-tester_REF.gc
Generated Vendored
+50 -43
View File
@@ -449,26 +449,29 @@
;; definition of type anim-tester
(deftype anim-tester (process-drawable)
((flags int32 :offset-assert 176)
(obj-list glst-list :inline :offset-assert 180)
(current-obj string :offset-assert 196)
(speed int32 :offset-assert 200)
(list-con list-control :inline :offset-assert 204)
(pick-con list-control :inline :offset-assert 284)
(item-field int64 :offset-assert 368)
(inc-delay int32 :offset-assert 376)
(inc-timer int32 :offset-assert 380)
(edit-mode int32 :offset-assert 384)
(old-mode int32 :offset-assert 388)
(anim-speed float :offset-assert 392)
(anim-gspeed float :offset-assert 396)
(anim-first float :offset-assert 400)
(anim-last float :offset-assert 404)
((flags anim-tester-flags :offset-assert 176)
(obj-list glst-list :inline :offset-assert 180)
(current-obj string :offset-assert 196)
(speed int32 :offset-assert 200)
(list-con list-control :inline :offset-assert 204)
(pick-con list-control :inline :offset-assert 284)
(item-field int64 :offset-assert 368)
(inc-delay int32 :offset-assert 376)
(inc-timer int32 :offset-assert 380)
(edit-mode int32 :offset-assert 384)
(old-mode int32 :offset-assert 388)
(anim-speed float :offset-assert 392)
(anim-gspeed float :offset-assert 396)
(anim-first float :offset-assert 400)
(anim-last float :offset-assert 404)
)
:heap-base #x130
:method-count-assert 20
:size-assert #x198
:flag-assert #x1401300198
(:states
anim-tester-process
)
)
;; definition for method 3 of type anim-tester
@@ -809,7 +812,7 @@
(format #t "current-obj=~A~%" (-> obj current-obj))
(format #t "speed=~f~%" (* (-> (new 'static 'array float 1 0.01) 0) (the float (-> obj speed))))
(format #t "--flags:--~%")
(the-as anim-tester (format #t " CONNECTED: ~A~%" (if (logtest? (-> obj flags) 1)
(the-as anim-tester (format #t " CONNECTED: ~A~%" (if (logtest? (-> obj flags) (anim-tester-flags fanimt0))
"TRUE"
"f"
)
@@ -934,12 +937,12 @@
;; definition for function anim-tester-real-post
;; INFO: Return type mismatch int vs none.
(defbehavior anim-tester-real-post anim-tester ()
(when (logtest? (-> self flags) 1)
(if (logtest? (-> self flags) 32)
(when (logtest? (-> self flags) (anim-tester-flags fanimt0))
(if (logtest? (-> self flags) (anim-tester-flags fanimt5))
(vector-v+! (-> self root trans) (-> self root trans) (-> self root transv))
)
(ja-post)
(when (logtest? (-> self flags) 16)
(when (logtest? (-> self flags) (anim-tester-flags fanimt4))
(draw-joint-spheres self)
(dummy-10 (-> self skel) (the-as symbol *stdcon*))
)
@@ -1093,7 +1096,7 @@
(case arg2
(('reset)
(process-disconnect self)
(set! (-> self flags) (logand -2 (-> self flags)))
(logclear! (-> self flags) (anim-tester-flags fanimt0))
(when (!= (-> *anim-tester* 0 edit-mode) 1)
(set! (-> *debug-menu-context* is-hidden) #f)
(set! (-> *anim-tester* 0 edit-mode) 0)
@@ -1212,7 +1215,7 @@
(set! (-> *debug-menu-context* is-hidden) #f)
(set! (-> *anim-tester* 0 edit-mode) 0)
(set! *camera-read-buttons* #t)
(logior! (-> *anim-tester* 0 flags) 4)
(logior! (-> *anim-tester* 0 flags) (anim-tester-flags fanimt2))
)
)
)
@@ -1383,7 +1386,7 @@
(set! (-> *debug-menu-context* is-hidden) #f)
(set! (-> *anim-tester* 0 edit-mode) 0)
(set! *camera-read-buttons* #t)
(logior! (-> *anim-tester* 0 flags) 4)
(logior! (-> *anim-tester* 0 flags) (anim-tester-flags fanimt2))
)
)
)
@@ -1557,7 +1560,7 @@
(set! (-> *debug-menu-context* is-hidden) #f)
(set! (-> *anim-tester* 0 edit-mode) 0)
(set! *camera-read-buttons* #t)
(logior! (-> *anim-tester* 0 flags) 4)
(logior! (-> *anim-tester* 0 flags) (anim-tester-flags fanimt2))
)
)
)
@@ -1660,7 +1663,7 @@
)
;; definition for function anim-tester-pick-item-setup
;; INFO: Return type mismatch int vs none.
;; INFO: Return type mismatch anim-tester-flags vs none.
(defun anim-tester-pick-item-setup ((arg0 anim-test-seq-item) (arg1 anim-test-sequence))
(let ((gp-0 (-> arg1 parent)))
(set! (-> *anim-tester* 0 pick-con listfunc) anim-test-anim-list-handler)
@@ -1692,7 +1695,7 @@
)
)
)
(logior! (-> *anim-tester* 0 flags) 8)
(logior! (-> *anim-tester* 0 flags) (anim-tester-flags fanimt3))
(none)
)
@@ -1735,7 +1738,11 @@
)
(let ((gp-0 (-> arg1 the-node))
(s4-0 (the-as object (-> arg1 list-owner)))
(s2-0 (and (logtest? (-> *anim-tester* 0 flags) 8) (zero? (-> *anim-tester* 0 item-field))))
(s2-0 (and
(logtest? (-> *anim-tester* 0 flags) (anim-tester-flags fanimt3))
(zero? (-> *anim-tester* 0 item-field))
)
)
)
(cond
((zero? arg0)
@@ -1938,13 +1945,13 @@
)
((= arg0 4)
(cond
((logtest? (-> *anim-tester* 0 flags) 8)
((logtest? (-> *anim-tester* 0 flags) (anim-tester-flags fanimt3))
(let ((v1-88 (-> *anim-tester* 0 item-field)))
(cond
((zero? v1-88)
(cond
((cpad-pressed? 0 x)
(set! (-> *anim-tester* 0 flags) (logand -9 (-> *anim-tester* 0 flags)))
(logclear! (-> *anim-tester* 0 flags) (anim-tester-flags fanimt3))
(let ((v0-24
(the-as
anim-test-obj
@@ -1968,14 +1975,14 @@
)
)
((cpad-pressed? 0 square)
(set! (-> *anim-tester* 0 flags) (logand -9 (-> *anim-tester* 0 flags)))
(logclear! (-> *anim-tester* 0 flags) (anim-tester-flags fanimt3))
)
)
)
((= v1-88 9)
(cond
((zero? (logand (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons x)))
(set! (-> *anim-tester* 0 flags) (logand -9 (-> *anim-tester* 0 flags)))
(logclear! (-> *anim-tester* 0 flags) (anim-tester-flags fanimt3))
)
((cpad-pressed? 0 up)
(let ((v1-124 (the-as anim-test-seq-item gp-0)))
@@ -2018,7 +2025,7 @@
((or (= v1-88 1) (= v1-88 2) (= v1-88 3) (= v1-88 4))
(cond
((zero? (logand (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons x)))
(set! (-> *anim-tester* 0 flags) (logand -9 (-> *anim-tester* 0 flags)))
(logclear! (-> *anim-tester* 0 flags) (anim-tester-flags fanimt3))
)
((begin (set! (-> arg1 current-index) (-> arg1 the-index)) (<= (-> *anim-tester* 0 inc-timer) 0))
(if (> (-> *anim-tester* 0 inc-delay) 0)
@@ -2137,7 +2144,7 @@
(logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons square))
(logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons square))
(set! (-> *anim-tester* 0 edit-mode) 3)
(logior! (-> *anim-tester* 0 flags) 4)
(logior! (-> *anim-tester* 0 flags) (anim-tester-flags fanimt2))
)
((cpad-pressed? 0 x)
(cond
@@ -2184,7 +2191,7 @@
(the-as int #f)
)
(else
(logior! (-> *anim-tester* 0 flags) 8)
(logior! (-> *anim-tester* 0 flags) (anim-tester-flags fanimt3))
(set! (-> *anim-tester* 0 inc-delay) (-> *DISP_LIST-bank* INC_DELAY))
(set! (-> *anim-tester* 0 inc-timer) 0)
0
@@ -2272,8 +2279,8 @@
(let ((v1-0 (-> self edit-mode)))
(cond
((zero? v1-0)
(when (logtest? (-> *anim-tester* 0 flags) 4)
(set! (-> *anim-tester* 0 flags) (logand -5 (-> *anim-tester* 0 flags)))
(when (logtest? (-> *anim-tester* 0 flags) (anim-tester-flags fanimt2))
(logclear! (-> *anim-tester* 0 flags) (anim-tester-flags fanimt2))
(set-master-mode 'menu)
)
)
@@ -2480,13 +2487,13 @@
:event
anim-tester-standard-event-handler
:enter
(behavior () (logior! (-> self flags) 2) (none))
(behavior () (logior! (-> self flags) (anim-tester-flags fanimt1)) (none))
:trans
(behavior ()
(if (and (zero? (logand (-> self flags) 2)) (= *master-mode* 'menu))
(if (and (zero? (logand (-> self flags) (anim-tester-flags fanimt1))) (= *master-mode* 'menu))
(anim-tester-interface)
)
(set! (-> self flags) (logand -3 (-> self flags)))
(logclear! (-> self flags) (anim-tester-flags fanimt1))
(when (!= *master-mode* 'menu)
(dummy-10 (-> self skel) (the-as symbol *stdcon*))
(add-debug-x
@@ -2502,7 +2509,7 @@
(behavior ()
(local-vars (s4-0 glst-node) (s5-1 anim-test-seq-item) (gp-2 anim-test-sequence))
(while #t
(set! (-> self flags) (logand -2 (-> self flags)))
(logclear! (-> self flags) (anim-tester-flags fanimt0))
(let ((v1-2 (-> self obj-list)))
"is the list empty, #t = empty"
(cond
@@ -2529,7 +2536,7 @@
)
(format *stdcon* "anim-tester:no anims loaded~%")
(format *stdcon* "displaying without anim not yet implement~%")
(set! (-> self flags) (logand -2 (-> self flags)))
(logclear! (-> self flags) (anim-tester-flags fanimt0))
(suspend)
0
)
@@ -2577,7 +2584,7 @@
(anim-tester-update-anim-info s5-1)
(cond
(s4-1
(logior! (-> self flags) 1)
(logior! (-> self flags) (anim-tester-flags fanimt0))
(if (nonzero? (-> s5-1 blend))
(ja-channel-push! 1 (the int (* (the float (-> s5-1 blend)) (-> self anim-gspeed))))
(ja-channel-set! 1)
@@ -2604,7 +2611,7 @@
)
(when (nonzero? (-> s5-1 blend))
(while (and (!= (-> self skel root-channel 0) (-> self skel channel)) (logtest? (-> s5-1 flags) 2))
(when (logtest? (-> self flags) 32)
(when (logtest? (-> self flags) (anim-tester-flags fanimt5))
(TODO-RENAME-9 (-> self align))
(TODO-RENAME-10
(-> self align)
@@ -2618,7 +2625,7 @@
)
)
(until (ja-done? 0)
(when (logtest? (-> self flags) 32)
(when (logtest? (-> self flags) (anim-tester-flags fanimt5))
(TODO-RENAME-9 (-> self align))
(TODO-RENAME-10
(-> self align)
test/decompiler/reference/engine/debug/default-menu_REF.gc
Generated Vendored
+1810 -2335
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/engine/debug/menu_REF.gc
Generated Vendored
+22 -17
View File
@@ -182,14 +182,14 @@
;; definition of type debug-menu-item-function
(deftype debug-menu-item-function (debug-menu-item)
((activate-func (function int object) :offset-assert 24)
(hilite-timer int8 :offset-assert 28)
((activate-func (function object object) :offset-assert 24)
(hilite-timer int8 :offset-assert 28)
)
:method-count-assert 9
:size-assert #x1d
:flag-assert #x90000001d
(:methods
(new (symbol type string int (function int object)) _type_ 0)
(new (symbol type string object (function object object)) _type_ 0)
)
)
@@ -207,13 +207,13 @@
)
;; definition for method 0 of type debug-menu-item-function
(defmethod new debug-menu-item-function ((allocation symbol) (type-to-make type) (arg0 string) (arg1 int) (arg2 (function int object)))
(defmethod new debug-menu-item-function ((allocation symbol) (type-to-make type) (arg0 string) (arg1 object) (arg2 (function object object)))
(let ((v0-0 (object-new allocation type-to-make (the-as int (-> type-to-make size)))))
(set! (-> v0-0 name) arg0)
(set! (-> v0-0 parent) #f)
(set! (-> v0-0 refresh-delay) 0)
(set! (-> v0-0 refresh-ctr) (-> v0-0 refresh-delay))
(set! (-> v0-0 id) arg1)
(set! (-> v0-0 id) (the-as int arg1))
(set! (-> v0-0 activate-func) arg2)
(set! (-> v0-0 hilite-timer) 0)
v0-0
@@ -222,14 +222,14 @@
;; definition of type debug-menu-item-flag
(deftype debug-menu-item-flag (debug-menu-item)
((activate-func (function int debug-menu-msg object) :offset-assert 24)
(is-on object :offset-assert 28)
((activate-func (function object debug-menu-msg object) :offset-assert 24)
(is-on object :offset-assert 28)
)
:method-count-assert 9
:size-assert #x20
:flag-assert #x900000020
(:methods
(new (symbol type string int (function int debug-menu-msg object)) _type_ 0)
(new (symbol type string object (function object debug-menu-msg object)) _type_ 0)
)
)
@@ -247,13 +247,18 @@
)
;; definition for method 0 of type debug-menu-item-flag
(defmethod new debug-menu-item-flag ((allocation symbol) (type-to-make type) (arg0 string) (arg1 int) (arg2 (function int debug-menu-msg object)))
(defmethod new debug-menu-item-flag ((allocation symbol)
(type-to-make type)
(arg0 string)
(arg1 object)
(arg2 (function object debug-menu-msg object))
)
(let ((v0-0 (object-new allocation type-to-make (the-as int (-> type-to-make size)))))
(set! (-> v0-0 name) arg0)
(set! (-> v0-0 parent) #f)
(set! (-> v0-0 refresh-delay) 23)
(set! (-> v0-0 refresh-ctr) (-> v0-0 refresh-delay))
(set! (-> v0-0 id) arg1)
(set! (-> v0-0 id) (the-as int arg1))
(set! (-> v0-0 activate-func) arg2)
(set! (-> v0-0 is-on) (the-as object #f))
v0-0
@@ -578,7 +583,7 @@
)
;; definition for function debug-menu-append-item
(defun debug-menu-append-item ((menu debug-menu) (item debug-menu-item))
(defun debug-menu-append-item ((menu debug-menu) (item debug-menu-node))
(let* ((context (-> menu context))
(was-active (-> context is-active))
)
@@ -661,7 +666,7 @@
(while (not (null? gp-1))
(let ((a1-4 (debug-menu-make-from-template arg0 (the-as pair a1-3))))
(if a1-4
(debug-menu-append-item s4-1 (the-as debug-menu-item a1-4))
(debug-menu-append-item s4-1 a1-4)
)
)
(set! gp-1 (cdr gp-1))
@@ -678,7 +683,7 @@
(while (not (null? gp-2))
(let ((a1-7 (debug-menu-make-from-template arg0 (the-as pair a1-6))))
(if a1-7
(debug-menu-append-item (the-as debug-menu s5-0) (the-as debug-menu-item a1-7))
(debug-menu-append-item (the-as debug-menu s5-0) a1-7)
)
)
(set! gp-2 (cdr gp-2))
@@ -695,8 +700,8 @@
'debug
'debug-menu-item-flag
s5-1
(the-as int (car (cdr (cdr arg1))))
(the-as (function int debug-menu-msg object) (debug-menu-func-decode (car (cdr (cdr (cdr arg1))))))
(car (cdr (cdr arg1)))
(the-as (function object debug-menu-msg object) (debug-menu-func-decode (car (cdr (cdr (cdr arg1))))))
)
)
((or (= s4-0 0) (= s4-0 'function))
@@ -704,8 +709,8 @@
'debug
'debug-menu-item-function
s5-1
(the-as int (car (cdr (cdr arg1))))
(the-as (function int object) (debug-menu-func-decode (car (cdr (cdr (cdr arg1))))))
(car (cdr (cdr arg1)))
(the-as (function object object) (debug-menu-func-decode (car (cdr (cdr (cdr arg1))))))
)
)
((= s4-0 'var)
test/decompiler/reference/engine/gfx/texture_REF.gc
Generated Vendored
+2 -2
View File
@@ -2469,8 +2469,8 @@
;; definition for symbol *shader-list*, type pair
(define *shader-list* '())
;; definition for symbol *edit-shader*, type int
(define *edit-shader* 0)
;; definition for symbol *edit-shader*, type texture-id
(define *edit-shader* (new 'static 'texture-id))
;; definition for function link-texture-by-id
(defun link-texture-by-id ((arg0 texture-id) (arg1 adgif-shader))
test/decompiler/reference/engine/level/level-info_REF.gc
Generated Vendored
+15 -93
View File
@@ -109,8 +109,7 @@
:disp1 'special
)
)
:tasks
'((the binteger 92) (the binteger 93) (the binteger 94) (the binteger 95))
:tasks '(92 93 94 95)
:priority 100
:load-commands '()
:alt-load-commands '()
@@ -250,8 +249,7 @@
:disp1 #f
)
)
:tasks
'((the binteger 10) (the binteger 11) (the binteger 12) (the binteger 13) (the binteger 14) (the binteger 75))
:tasks '(10 11 12 13 14 75)
:priority #xc8
:load-commands '()
:alt-load-commands
@@ -303,16 +301,7 @@
:disp1 'display
)
)
:tasks
'((the binteger 15)
(the binteger 16)
(the binteger 17)
(the binteger 18)
(the binteger 19)
(the binteger 20)
(the binteger 21)
(the binteger 22)
)
:tasks '(15 16 17 18 19 20 21 22)
:priority 100
:load-commands '()
:alt-load-commands '()
@@ -363,15 +352,7 @@
:disp1 'display
)
)
:tasks
'((the binteger 2)
(the binteger 3)
(the binteger 4)
(the binteger 5)
(the binteger 7)
(the binteger 8)
(the binteger 9)
)
:tasks '(2 3 4 5 7 8 9)
:priority 100
:load-commands '()
:alt-load-commands
@@ -609,16 +590,7 @@
:disp1 'special
)
)
:tasks
'((the binteger 23)
(the binteger 24)
(the binteger 25)
(the binteger 26)
(the binteger 27)
(the binteger 28)
(the binteger 29)
(the binteger 30)
)
:tasks '(23 24 25 26 27 28 29 30)
:priority 100
:load-commands '()
:alt-load-commands '()
@@ -686,8 +658,7 @@
:disp1 'display
)
)
:tasks
'((the binteger 68) (the binteger 69))
:tasks '(68 69)
:priority 100
:load-commands '()
:alt-load-commands '()
@@ -774,8 +745,7 @@
:disp1 #f
)
)
:tasks
'((the binteger 31) (the binteger 32) (the binteger 34) (the binteger 35) (the binteger 76))
:tasks '(31 32 34 35 76)
:priority #xc8
:load-commands '()
:alt-load-commands '()
@@ -1154,16 +1124,7 @@
:disp1 'special-vis
)
)
:tasks
'((the binteger 36)
(the binteger 37)
(the binteger 38)
(the binteger 39)
(the binteger 40)
(the binteger 41)
(the binteger 42)
(the binteger 43)
)
:tasks '(36 37 38 39 40 41 42 43)
:priority 100
:load-commands '()
:alt-load-commands '()
@@ -1213,16 +1174,7 @@
:disp1 'display
)
)
:tasks
'((the binteger 52)
(the binteger 53)
(the binteger 54)
(the binteger 55)
(the binteger 56)
(the binteger 57)
(the binteger 58)
(the binteger 59)
)
:tasks '(52 53 54 55 56 57 58 59)
:priority 100
:load-commands '()
:alt-load-commands '()
@@ -1308,8 +1260,7 @@
:disp1 'display
)
)
:tasks
'((the binteger 86) (the binteger 87) (the binteger 110) (the binteger 88))
:tasks '(86 87 110 88)
:priority 100
:load-commands '()
:alt-load-commands '()
@@ -1396,16 +1347,7 @@
:disp1 #f
)
)
:tasks
'((the binteger 96)
(the binteger 97)
(the binteger 98)
(the binteger 99)
(the binteger 100)
(the binteger 101)
(the binteger 74)
(the binteger 77)
)
:tasks '(96 97 98 99 100 101 74 77)
:priority #xc8
:load-commands '()
:alt-load-commands '()
@@ -1600,16 +1542,7 @@
:disp1 'display
)
)
:tasks
'((the binteger 60)
(the binteger 61)
(the binteger 62)
(the binteger 63)
(the binteger 64)
(the binteger 66)
(the binteger 67)
(the binteger 65)
)
:tasks '(60 61 62 63 64 66 67 65)
:priority 100
:load-commands '()
:alt-load-commands '()
@@ -1695,16 +1628,7 @@
:disp1 #f
)
)
:tasks
'((the binteger 78)
(the binteger 79)
(the binteger 80)
(the binteger 81)
(the binteger 82)
(the binteger 83)
(the binteger 84)
(the binteger 85)
)
:tasks '(78 79 80 81 82 83 84 85)
:priority 100
:load-commands '()
:alt-load-commands '()
@@ -1926,8 +1850,7 @@
:disp1 'display
)
)
:tasks
'((the binteger 89) (the binteger 90))
:tasks '(89 90)
:priority 100
:load-commands '()
:alt-load-commands '()
@@ -2140,8 +2063,7 @@
:disp1 #f
)
)
:tasks
'((the binteger 70) (the binteger 71) (the binteger 72) (the binteger 73) (the binteger 91))
:tasks '(70 71 72 73 91)
:priority 100
:load-commands '()
:alt-load-commands '()
test/decompiler/reference/engine/level/load-boundary-data_REF.gc
Generated Vendored
+236 -236
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/kernel/gcommon_REF.gc
Generated Vendored
+3 -3
View File
@@ -414,12 +414,12 @@
(let ((iter lst))
(while (not (or (null? (cdr iter)) (not (pair? (cdr iter)))))
(let* ((first-elt (car iter))
(seoncd-elt (car (cdr iter)))
(compare-result (compare-func first-elt seoncd-elt))
(second-elt (car (cdr iter)))
(compare-result (compare-func first-elt second-elt))
)
(when (and (or (not compare-result) (> (the-as int compare-result) 0)) (!= compare-result #t))
(+! unsorted-count 1)
(set! (car iter) seoncd-elt)
(set! (car iter) second-elt)
(set! (car (cdr iter)) first-elt)
)
)
test/decompiler/reference/levels/beach/beach-rocks_REF.gc
Generated Vendored
+1 -1
View File
@@ -465,7 +465,7 @@
:index 4
:parts 4
:command-list
'(((the binteger -150) blackout (the binteger 100)) ((the binteger -116) blackout 0))
'((-150 blackout 100) (-116 blackout 0))
)
(the-as art-joint-anim (-> self draw art-group data 2))
(the-as art-joint-anim (-> self draw art-group data 3))
test/decompiler/reference/levels/beach/bird-lady-beach_REF.gc
Generated Vendored
+1 -6
View File
@@ -97,12 +97,7 @@
:index 4
:parts 10
:command-list
'(((the binteger 141) joint "cameraB")
((the binteger 535) joint "camera")
((the binteger 696) joint "cameraB")
((the binteger 758) joint "camera")
((the binteger 813) joint "cameraB")
)
'((141 joint "cameraB") (535 joint "camera") (696 joint "cameraB") (758 joint "camera") (813 joint "cameraB"))
)
)
(else
test/decompiler/reference/levels/beach/bird-lady_REF.gc
Generated Vendored
+19 -19
View File
@@ -83,25 +83,25 @@
:parts 11
:command-list
'((0 want-levels village1 beach)
((the binteger 49) joint "cameraB")
((the binteger 101) display-level beach special)
((the binteger 101) kill "yakow-8")
((the binteger 101) kill "yakow-9")
((the binteger 101) kill "yakow-10")
((the binteger 101) kill "yakow-11")
((the binteger 101) kill "yakow-12")
((the binteger 102) joint "camera")
((the binteger 125) joint "cameraB")
((the binteger 251) joint "camera")
((the binteger 326) joint "cameraB")
((the binteger 649) display-level beach movie)
((the binteger 649) want-force-vis beach #t)
((the binteger 650) alive "flutflutegg-1")
((the binteger 651) joint "camera")
((the binteger 1041) joint "cameraB")
((the binteger 1046) dead "flutflutegg-1")
((the binteger 1046) display-level beach display)
((the binteger 1046) want-force-vis beach #f)
(49 joint "cameraB")
(101 display-level beach special)
(101 kill "yakow-8")
(101 kill "yakow-9")
(101 kill "yakow-10")
(101 kill "yakow-11")
(101 kill "yakow-12")
(102 joint "camera")
(125 joint "cameraB")
(251 joint "camera")
(326 joint "cameraB")
(649 display-level beach movie)
(649 want-force-vis beach #t)
(650 alive "flutflutegg-1")
(651 joint "camera")
(1041 joint "cameraB")
(1046 dead "flutflutegg-1")
(1046 display-level beach display)
(1046 want-force-vis beach #f)
)
)
)
test/decompiler/reference/levels/beach/mayor_REF.gc
Generated Vendored
+3 -3
View File
@@ -172,9 +172,9 @@
(0 kill "crate-2469")
(0 kill "villagea-part-69")
(0 display-level beach special)
((the binteger 565) joint "cameraB")
((the binteger 850) joint "camera")
((the binteger 915) joint "cameraB")
(565 joint "cameraB")
(850 joint "camera")
(915 joint "cameraB")
)
)
)
test/decompiler/reference/levels/beach/sculptor_REF.gc
Generated Vendored
+8 -8
View File
@@ -135,13 +135,13 @@
(0 kill "med-res-level-14")
(0 kill "med-res-level-22")
(0 kill "med-res-level-23")
((the binteger 285) joint "cameraB")
((the binteger 331) joint "camera")
((the binteger 614) joint "cameraB")
((the binteger 760) joint "camera")
((the binteger 1183) joint "cameraB")
((the binteger 1278) joint "camera")
((the binteger 1433) joint "cameraB")
(285 joint "cameraB")
(331 joint "camera")
(614 joint "cameraB")
(760 joint "camera")
(1183 joint "cameraB")
(1278 joint "camera")
(1433 joint "cameraB")
)
)
)
@@ -179,7 +179,7 @@
:index 18
:parts 4
:command-list
'(((the binteger 51) joint "cameraB") ((the binteger 87) joint "camera"))
'((51 joint "cameraB") (87 joint "camera"))
)
)
(else
test/decompiler/reference/levels/citadel/assistant-citadel_REF.gc
Generated Vendored
+13 -13
View File
@@ -43,19 +43,19 @@
:index 4
:parts 11
:command-list
'(((the binteger 61) joint "cameraB")
((the binteger 151) joint "camera")
((the binteger 226) joint "cameraB")
((the binteger 273) joint "camera")
((the binteger 316) joint "cameraB")
((the binteger 451) joint "camera")
((the binteger 651) joint "cameraB")
((the binteger 786) joint "camera")
((the binteger 888) joint "cameraB")
((the binteger 1011) joint "camera")
((the binteger 1011) shadow target #f)
((the binteger 1140) shadow target #t)
((the binteger 1191) joint "cameraB")
'((61 joint "cameraB")
(151 joint "camera")
(226 joint "cameraB")
(273 joint "camera")
(316 joint "cameraB")
(451 joint "camera")
(651 joint "cameraB")
(786 joint "camera")
(888 joint "cameraB")
(1011 joint "camera")
(1011 shadow target #f)
(1140 shadow target #t)
(1191 joint "cameraB")
)
)
)
test/decompiler/reference/levels/citadel/citadel-sages_REF.gc
Generated Vendored
+105 -105
View File
@@ -647,11 +647,11 @@
:index 7
:parts 9
:command-list
'(((the binteger 15) send-event self disable-bars)
((the binteger 45) joint "cameraB")
((the binteger 216) joint "camera")
((the binteger 435) joint "cameraB")
((the binteger 685) joint "camera")
'((15 send-event self disable-bars)
(45 joint "cameraB")
(216 joint "camera")
(435 joint "cameraB")
(685 joint "camera")
)
)
)
@@ -779,16 +779,16 @@
:index 7
:parts 9
:command-list
'(((the binteger 15) send-event self disable-bars)
((the binteger 45) joint "cameraB")
((the binteger 74) shadow self #f)
((the binteger 185) joint "camera")
((the binteger 256) joint "cameraB")
((the binteger 505) joint "camera")
((the binteger 590) joint "cameraB")
((the binteger 670) joint "camera")
((the binteger 875) shadow self #t)
((the binteger 876) joint "cameraB")
'((15 send-event self disable-bars)
(45 joint "cameraB")
(74 shadow self #f)
(185 joint "camera")
(256 joint "cameraB")
(505 joint "camera")
(590 joint "cameraB")
(670 joint "camera")
(875 shadow self #t)
(876 joint "cameraB")
)
)
)
@@ -916,11 +916,11 @@
:index 7
:parts 6
:command-list
'(((the binteger 15) send-event self disable-bars)
((the binteger 45) joint "cameraB")
((the binteger 256) joint "camera")
((the binteger 314) joint "cameraB")
((the binteger 600) joint "camera")
'((15 send-event self disable-bars)
(45 joint "cameraB")
(256 joint "camera")
(314 joint "cameraB")
(600 joint "camera")
)
)
)
@@ -1018,13 +1018,13 @@
:index 6
:parts 12
:command-list
'(((the binteger 33) joint "cameraB")
((the binteger 156) joint "camera")
((the binteger 405) joint "cameraB")
((the binteger 576) joint "camera")
((the binteger 823) joint "cameraB")
((the binteger 1156) joint "camera")
((the binteger 1199) joint "cameraB")
'((33 joint "cameraB")
(156 joint "camera")
(405 joint "cameraB")
(576 joint "camera")
(823 joint "cameraB")
(1156 joint "camera")
(1199 joint "cameraB")
)
)
)
@@ -1051,12 +1051,12 @@
:index 5
:parts 12
:command-list
'(((the binteger 71) joint "cameraB")
((the binteger 207) joint "camera")
((the binteger 343) joint "cameraB")
((the binteger 574) joint "camera")
((the binteger 1060) joint "cameraB")
((the binteger 1061) send-event camera teleport)
'((71 joint "cameraB")
(207 joint "camera")
(343 joint "cameraB")
(574 joint "camera")
(1060 joint "cameraB")
(1061 send-event camera teleport)
)
)
)
@@ -1117,78 +1117,78 @@
(0 want-levels citadel finalboss)
(0 display-level finalboss special)
(0 send-event "citb-robotboss-1" 'die)
((the binteger 335) joint "cameraB")
((the binteger 581) joint "camera")
((the binteger 696) joint "cameraB")
((the binteger 828) joint "camera")
((the binteger 1180) joint "cameraB")
((the binteger 1380) send-event self 'spawn-robot)
((the binteger 1382) joint "camera")
((the binteger 1382) kill "citb-disc-d-2")
((the binteger 1382) kill "citb-disc-c-4")
((the binteger 1382) kill "citb-disc-c-5")
((the binteger 1382) kill "citb-disc-c-6")
((the binteger 1382) kill "citb-disc-b-12")
((the binteger 1382) kill "citb-disc-b-13")
((the binteger 1382) kill "citb-disc-b-14")
((the binteger 1382) kill "citb-disc-a-11")
((the binteger 1382) kill "citb-disc-a-12")
((the binteger 1382) kill "citb-disc-a-13")
((the binteger 1382) kill "citb-disc-a-14")
((the binteger 1382) kill "citb-disc-a-15")
((the binteger 1382) kill "citb-disc-a-16")
((the binteger 1382) kill "citb-disc-b-21")
((the binteger 1382) kill "citb-button-28")
((the binteger 1382) kill "citb-button-32")
((the binteger 1382) kill "citb-generator-1")
((the binteger 1382) kill "citb-generator-2")
((the binteger 1382) kill "citb-generator-3")
((the binteger 1382) kill "citb-generator-4")
((the binteger 1382) kill "citb-iris-door-15")
((the binteger 1382) kill "citb-iris-door-16")
((the binteger 1382) kill "crate-2996")
((the binteger 1382) kill "crate-2997")
((the binteger 1382) kill "crate-2998")
((the binteger 1382) kill "crate-3000")
((the binteger 1382) kill "citb-plat-eco-1")
((the binteger 1382) kill "citb-plat-eco-2")
((the binteger 1382) kill "citb-plat-eco-3")
((the binteger 1382) kill "citb-stair-plat-1")
((the binteger 1382) kill "citb-stair-plat-2")
((the binteger 1382) kill "citb-stair-plat-3")
((the binteger 1382) kill "citb-stair-plat-4")
((the binteger 1382) kill "citb-stair-plat-5")
((the binteger 1382) kill "citb-stair-plat-6")
((the binteger 1382) kill "red-sagecage-1")
((the binteger 1382) kill "blue-sagecage-1")
((the binteger 1382) kill "yellow-sagecage-1")
((the binteger 1382) kill "babak-391")
((the binteger 1382) kill "citb-disc-c-10")
((the binteger 1382) kill "citb-iris-door-32")
((the binteger 1382) kill "citb-disc-b-18")
((the binteger 1382) kill "citb-disc-b-19")
((the binteger 1382) kill "citb-disc-b-20")
((the binteger 1382) kill "citb-iris-door-14")
((the binteger 1382) kill "orb-cache-top-32")
((the binteger 1382) kill "citb-disc-b-17")
((the binteger 1382) kill "citb-iris-door-13")
((the binteger 1382) kill "citb-button-39")
((the binteger 1382) kill "citb-button-40")
((the binteger 1382) kill "babak-392")
((the binteger 1382) kill "babak-393")
((the binteger 1382) kill "citb-button-33")
((the binteger 1382) kill "citb-button-34")
((the binteger 1382) kill "citb-drop-plat-365")
((the binteger 1382) kill "citb-drop-plat-366")
((the binteger 1382) kill "citb-drop-plat-367")
((the binteger 1382) kill "citb-iris-door-21")
((the binteger 1382) kill "assistant-lavatube-end-3")
((the binteger 1382) kill "babak-394")
((the binteger 1382) kill "babak-396")
((the binteger 1382) kill "citb-drop-plat-376")
((the binteger 1605) joint "cameraB")
((the binteger 1733) kill "citb-iris-door-2")
((the binteger 1736) joint "camera")
(335 joint "cameraB")
(581 joint "camera")
(696 joint "cameraB")
(828 joint "camera")
(1180 joint "cameraB")
(1380 send-event self 'spawn-robot)
(1382 joint "camera")
(1382 kill "citb-disc-d-2")
(1382 kill "citb-disc-c-4")
(1382 kill "citb-disc-c-5")
(1382 kill "citb-disc-c-6")
(1382 kill "citb-disc-b-12")
(1382 kill "citb-disc-b-13")
(1382 kill "citb-disc-b-14")
(1382 kill "citb-disc-a-11")
(1382 kill "citb-disc-a-12")
(1382 kill "citb-disc-a-13")
(1382 kill "citb-disc-a-14")
(1382 kill "citb-disc-a-15")
(1382 kill "citb-disc-a-16")
(1382 kill "citb-disc-b-21")
(1382 kill "citb-button-28")
(1382 kill "citb-button-32")
(1382 kill "citb-generator-1")
(1382 kill "citb-generator-2")
(1382 kill "citb-generator-3")
(1382 kill "citb-generator-4")
(1382 kill "citb-iris-door-15")
(1382 kill "citb-iris-door-16")
(1382 kill "crate-2996")
(1382 kill "crate-2997")
(1382 kill "crate-2998")
(1382 kill "crate-3000")
(1382 kill "citb-plat-eco-1")
(1382 kill "citb-plat-eco-2")
(1382 kill "citb-plat-eco-3")
(1382 kill "citb-stair-plat-1")
(1382 kill "citb-stair-plat-2")
(1382 kill "citb-stair-plat-3")
(1382 kill "citb-stair-plat-4")
(1382 kill "citb-stair-plat-5")
(1382 kill "citb-stair-plat-6")
(1382 kill "red-sagecage-1")
(1382 kill "blue-sagecage-1")
(1382 kill "yellow-sagecage-1")
(1382 kill "babak-391")
(1382 kill "citb-disc-c-10")
(1382 kill "citb-iris-door-32")
(1382 kill "citb-disc-b-18")
(1382 kill "citb-disc-b-19")
(1382 kill "citb-disc-b-20")
(1382 kill "citb-iris-door-14")
(1382 kill "orb-cache-top-32")
(1382 kill "citb-disc-b-17")
(1382 kill "citb-iris-door-13")
(1382 kill "citb-button-39")
(1382 kill "citb-button-40")
(1382 kill "babak-392")
(1382 kill "babak-393")
(1382 kill "citb-button-33")
(1382 kill "citb-button-34")
(1382 kill "citb-drop-plat-365")
(1382 kill "citb-drop-plat-366")
(1382 kill "citb-drop-plat-367")
(1382 kill "citb-iris-door-21")
(1382 kill "assistant-lavatube-end-3")
(1382 kill "babak-394")
(1382 kill "babak-396")
(1382 kill "citb-drop-plat-376")
(1605 joint "cameraB")
(1733 kill "citb-iris-door-2")
(1736 joint "camera")
)
)
)
test/decompiler/reference/levels/firecanyon/assistant-firecanyon_REF.gc
Generated Vendored
+12 -12
View File
@@ -41,18 +41,18 @@
:parts 11
:command-list
'((0 want-levels village1 firecanyon)
((the binteger 151) joint "cameraB")
((the binteger 346) joint "camera")
((the binteger 346) shadow self #f)
((the binteger 461) joint "cameraB")
((the binteger 546) joint "camera")
((the binteger 636) joint "cameraB")
((the binteger 695) alive "balloon-12")
((the binteger 696) joint "camera")
((the binteger 821) alive "balloon-16")
((the binteger 822) joint "cameraB")
((the binteger 962) joint "camera")
((the binteger 1268) shadow self #t)
(151 joint "cameraB")
(346 joint "camera")
(346 shadow self #f)
(461 joint "cameraB")
(546 joint "camera")
(636 joint "cameraB")
(695 alive "balloon-12")
(696 joint "camera")
(821 alive "balloon-16")
(822 joint "cameraB")
(962 joint "camera")
(1268 shadow self #t)
)
)
)
test/decompiler/reference/levels/jungle/fisher-JUN_REF.gc
Generated Vendored
+28 -28
View File
@@ -1296,32 +1296,32 @@
:command-list
'((0 want-levels village1 jungle)
(0 alive "jungle-part-1")
((the binteger 130) blackout (the binteger 10))
((the binteger 130) display-level village1 movie)
((the binteger 130) want-force-vis village1 #t)
((the binteger 134) blackout 0)
((the binteger 229) blackout (the binteger 10))
((the binteger 232) blackout 0)
((the binteger 235) display-level village1 #f)
((the binteger 235) want-force-vis village1 #f)
((the binteger 419) blackout (the binteger 10))
((the binteger 422) blackout 0)
((the binteger 518) blackout (the binteger 10))
((the binteger 521) blackout 0)
((the binteger 585) blackout (the binteger 10))
((the binteger 588) blackout 0)
((the binteger 668) blackout (the binteger 10))
((the binteger 671) blackout 0)
((the binteger 848) display-level village1 movie)
((the binteger 848) want-force-vis village1 #t)
((the binteger 849) alive "fishermans-boat-2")
((the binteger 878) blackout (the binteger 10))
((the binteger 881) blackout 0)
((the binteger 958) blackout (the binteger 10))
((the binteger 961) blackout 0)
((the binteger 965) dead "fishermans-boat-2")
((the binteger 965) display-level village1 display)
((the binteger 965) want-force-vis village1 #f)
(130 blackout 10)
(130 display-level village1 movie)
(130 want-force-vis village1 #t)
(134 blackout 0)
(229 blackout 10)
(232 blackout 0)
(235 display-level village1 #f)
(235 want-force-vis village1 #f)
(419 blackout 10)
(422 blackout 0)
(518 blackout 10)
(521 blackout 0)
(585 blackout 10)
(588 blackout 0)
(668 blackout 10)
(671 blackout 0)
(848 display-level village1 movie)
(848 want-force-vis village1 #t)
(849 alive "fishermans-boat-2")
(878 blackout 10)
(881 blackout 0)
(958 blackout 10)
(961 blackout 0)
(965 dead "fishermans-boat-2")
(965 display-level village1 display)
(965 want-force-vis village1 #f)
)
)
)
@@ -1340,7 +1340,7 @@
:index 9
:parts 4
:command-list
'(((the binteger 188) blackout (the binteger 10)) ((the binteger 199) blackout 0))
'((188 blackout 10) (199 blackout 0))
)
)
(else
@@ -1392,7 +1392,7 @@
:index 12
:parts 6
:command-list
'((0 send-event self emissive-on) ((the binteger 700) send-event self emissive-off))
'((0 send-event self emissive-on) (700 send-event self emissive-off))
)
)
test/decompiler/reference/levels/lavatube/assistant-lavatube_REF.gc
Generated Vendored
+1 -5
View File
@@ -40,11 +40,7 @@
:index 5
:parts 11
:command-list
'(((the binteger 232) joint "cameraB")
((the binteger 491) joint "camera")
((the binteger 866) joint "cameraB")
((the binteger 1061) joint "camera")
)
'((232 joint "cameraB") (491 joint "camera") (866 joint "cameraB") (1061 joint "camera"))
)
)
(else
test/decompiler/reference/levels/misty/muse_REF.gc
Generated Vendored
+1 -1
View File
@@ -698,7 +698,7 @@ nav-enemy-default-event-handler
:index 9
:parts 2
:command-list
'(((the binteger 1) blackout 0) ((the binteger 219) blackout (the binteger 60)))
'((1 blackout 0) (219 blackout 60))
)
)
(set! (-> obj victory-anim) (fuel-cell-pick-anim obj))
test/decompiler/reference/levels/misty/sidekick-human_REF.gc
Generated Vendored
+66 -66
View File
@@ -1674,30 +1674,30 @@
(0 kill "teetertotter-5")
(0 kill "bone-platform-4")
(0 kill "misty-battle-controller-1")
((the binteger 30) send-event self offset-army)
((the binteger 196) joint "cameraB")
((the binteger 196) shadow target #f)
((the binteger 196) shadow self #f)
((the binteger 380) send-event self evilbro)
((the binteger 385) send-event "evilbro" draw #t)
((the binteger 385) send-event "evilsis" draw #t)
((the binteger 397) joint "camera")
((the binteger 410) setting-reset ocean-off #t)
((the binteger 456) joint "cameraB")
((the binteger 546) joint "camera")
((the binteger 701) joint "cameraB")
((the binteger 701) setting-reset ocean-off near)
((the binteger 776) joint "camera")
((the binteger 776) setting-reset ocean-off #t)
((the binteger 937) joint "cameraB")
((the binteger 1027) joint "camera")
((the binteger 1122) joint "cameraB")
((the binteger 1221) joint "cameraB")
((the binteger 1221) setting-reset ocean-off near)
((the binteger 1280) alive "sequenceC-1")
((the binteger 1281) save)
((the binteger 1281) shadow target #t)
((the binteger 1281) setting-unset ocean-off)
(30 send-event self offset-army)
(196 joint "cameraB")
(196 shadow target #f)
(196 shadow self #f)
(380 send-event self evilbro)
(385 send-event "evilbro" draw #t)
(385 send-event "evilsis" draw #t)
(397 joint "camera")
(410 setting-reset ocean-off #t)
(456 joint "cameraB")
(546 joint "camera")
(701 joint "cameraB")
(701 setting-reset ocean-off near)
(776 joint "camera")
(776 setting-reset ocean-off #t)
(937 joint "cameraB")
(1027 joint "camera")
(1122 joint "cameraB")
(1221 joint "cameraB")
(1221 setting-reset ocean-off near)
(1280 alive "sequenceC-1")
(1281 save)
(1281 shadow target #t)
(1281 setting-unset ocean-off)
)
)
)
@@ -1971,48 +1971,48 @@
(0 kill "money-1563")
(0 kill "money-1564")
(0 kill "money-1565")
((the binteger 5) alive "dark-eco-pool-11")
((the binteger 151) joint "cameraB")
((the binteger 200) want-levels misty village1)
((the binteger 236) joint "camera")
((the binteger 301) joint "cameraB")
((the binteger 421) joint "camera")
((the binteger 460) shadow self #f)
((the binteger 470) shadow self #t)
((the binteger 496) joint "cameraB")
((the binteger 611) joint "camera")
((the binteger 721) joint "cameraB")
((the binteger 1176) joint "camera")
((the binteger 1271) joint "cameraB")
((the binteger 1331) joint "camera")
((the binteger 1386) joint "cameraB")
((the binteger 1461) joint "camera")
((the binteger 1524) joint "cameraB")
((the binteger 1558) joint "camera")
((the binteger 1602) joint "cameraB")
((the binteger 1628) joint "camera")
((the binteger 1676) joint "cameraB")
((the binteger 1728) joint "camera")
((the binteger 1791) joint "cameraB")
((the binteger 1831) joint "camera")
((the binteger 1942) joint "cameraB")
((the binteger 2000) display-level village1 special)
((the binteger 2028) joint "camera")
((the binteger 2096) joint "cameraB")
((the binteger 2154) joint "camera")
((the binteger 2226) joint "cameraB")
((the binteger 2266) joint "camera")
((the binteger 2307) joint "cameraB")
((the binteger 2431) joint "camera")
((the binteger 2476) joint "cameraB")
((the binteger 2530) display-level misty movie)
((the binteger 2530) want-force-vis misty #t)
((the binteger 2530) dead "dark-eco-pool-11")
((the binteger 2534) display-level village1 display)
((the binteger 2535) want-vis vi1)
((the binteger 2536) joint "camera")
((the binteger 2580) alive "sage-23")
((the binteger 2596) save)
(5 alive "dark-eco-pool-11")
(151 joint "cameraB")
(200 want-levels misty village1)
(236 joint "camera")
(301 joint "cameraB")
(421 joint "camera")
(460 shadow self #f)
(470 shadow self #t)
(496 joint "cameraB")
(611 joint "camera")
(721 joint "cameraB")
(1176 joint "camera")
(1271 joint "cameraB")
(1331 joint "camera")
(1386 joint "cameraB")
(1461 joint "camera")
(1524 joint "cameraB")
(1558 joint "camera")
(1602 joint "cameraB")
(1628 joint "camera")
(1676 joint "cameraB")
(1728 joint "camera")
(1791 joint "cameraB")
(1831 joint "camera")
(1942 joint "cameraB")
(2000 display-level village1 special)
(2028 joint "camera")
(2096 joint "cameraB")
(2154 joint "camera")
(2226 joint "cameraB")
(2266 joint "camera")
(2307 joint "cameraB")
(2431 joint "camera")
(2476 joint "cameraB")
(2530 display-level misty movie)
(2530 want-force-vis misty #t)
(2530 dead "dark-eco-pool-11")
(2534 display-level village1 display)
(2535 want-vis vi1)
(2536 joint "camera")
(2580 alive "sage-23")
(2596 save)
)
)
)
test/decompiler/reference/levels/ogre/flying-lurker_REF.gc
Generated Vendored
+26 -26
View File
@@ -109,32 +109,32 @@
:index 7
:parts 4
:command-list
'(((the binteger 200) alive "tntbarrel-223")
((the binteger 200) alive "tntbarrel-222")
((the binteger 200) alive "tntbarrel-221")
((the binteger 200) alive "tntbarrel-220")
((the binteger 200) alive "tntbarrel-224")
((the binteger 200) alive "tntbarrel-219")
((the binteger 200) alive "tntbarrel-246")
((the binteger 200) alive "tntbarrel-249")
((the binteger 200) alive "tntbarrel-250")
((the binteger 200) alive "tntbarrel-251")
((the binteger 200) alive "tntbarrel-225")
((the binteger 201) joint "cameraB")
((the binteger 220) send-event "tntbarrel-223" 'die-big)
((the binteger 230) send-event "tntbarrel-222" 'die-big)
((the binteger 240) send-event "tntbarrel-221" 'die-big)
((the binteger 240) send-event "tntbarrel-220" 'die-big)
((the binteger 245) send-event "tntbarrel-224" 'die-big)
((the binteger 250) send-event "tntbarrel-219" 'die-big)
((the binteger 251) joint "cameraA")
((the binteger 260) send-event "tntbarrel-246" 'die-big)
((the binteger 325) send-event "tntbarrel-249" 'die-big)
((the binteger 380) send-event "tntbarrel-250" 'die-big)
((the binteger 410) send-event "tntbarrel-251" 'die-big)
((the binteger 420) blackout (the binteger 30))
((the binteger 421) joint "cameraB")
((the binteger 430) send-event "tntbarrel-225" 'die-big)
'((200 alive "tntbarrel-223")
(200 alive "tntbarrel-222")
(200 alive "tntbarrel-221")
(200 alive "tntbarrel-220")
(200 alive "tntbarrel-224")
(200 alive "tntbarrel-219")
(200 alive "tntbarrel-246")
(200 alive "tntbarrel-249")
(200 alive "tntbarrel-250")
(200 alive "tntbarrel-251")
(200 alive "tntbarrel-225")
(201 joint "cameraB")
(220 send-event "tntbarrel-223" 'die-big)
(230 send-event "tntbarrel-222" 'die-big)
(240 send-event "tntbarrel-221" 'die-big)
(240 send-event "tntbarrel-220" 'die-big)
(245 send-event "tntbarrel-224" 'die-big)
(250 send-event "tntbarrel-219" 'die-big)
(251 joint "cameraA")
(260 send-event "tntbarrel-246" 'die-big)
(325 send-event "tntbarrel-249" 'die-big)
(380 send-event "tntbarrel-250" 'die-big)
(410 send-event "tntbarrel-251" 'die-big)
(420 blackout 30)
(421 joint "cameraB")
(430 send-event "tntbarrel-225" 'die-big)
)
)
(the-as art-joint-anim #f)
test/decompiler/reference/levels/swamp/billy_REF.gc
Generated Vendored
+8 -8
View File
@@ -530,14 +530,14 @@
(0 kill "swamp-spike-43")
(0 kill "swamp-spike-44")
(0 kill "swamp-spike-45")
((the binteger 346) blackout (the binteger 10))
((the binteger 349) blackout 0)
((the binteger 494) blackout (the binteger 10))
((the binteger 497) blackout 0)
((the binteger 1145) blackout (the binteger 10))
((the binteger 1148) blackout 0)
((the binteger 1518) blackout (the binteger 10))
((the binteger 1521) blackout 0)
(346 blackout 10)
(349 blackout 0)
(494 blackout 10)
(497 blackout 0)
(1145 blackout 10)
(1148 blackout 0)
(1518 blackout 10)
(1521 blackout 0)
)
)
)
test/decompiler/reference/levels/swamp/swamp-rat-nest_REF.gc
Generated Vendored
+10 -17
View File
@@ -1508,9 +1508,7 @@ swamp-rat-nest-default-event-handler
;; definition for method 21 of type swamp-rat-nest-dummy-a
(defmethod dummy-21 swamp-rat-nest-dummy-a ((obj swamp-rat-nest-dummy-a))
(let ((v1-0 0))
(let* ((a0-1
'((the binteger 5) (the binteger 6) (the binteger 7) (the binteger 8) (the binteger 9) (the binteger 10))
)
(let* ((a0-1 '(5 6 7 8 9 10))
(a1-0 (car a0-1))
)
(while (not (null? a0-1))
@@ -1535,9 +1533,7 @@ swamp-rat-nest-default-event-handler
;; definition for method 21 of type swamp-rat-nest-dummy-b
(defmethod dummy-21 swamp-rat-nest-dummy-b ((obj swamp-rat-nest-dummy-b))
(let ((v1-0 0))
(let* ((a0-1
'((the binteger 5) (the binteger 9) (the binteger 10) (the binteger 6) (the binteger 7) (the binteger 8))
)
(let* ((a0-1 '(5 9 10 6 7 8))
(a1-0 (car a0-1))
)
(while (not (null? a0-1))
@@ -1562,18 +1558,15 @@ swamp-rat-nest-default-event-handler
;; definition for method 21 of type swamp-rat-nest-dummy-c
(defmethod dummy-21 swamp-rat-nest-dummy-c ((obj swamp-rat-nest-dummy-c))
(let ((v1-0 0))
(let* ((a0-1 '((the binteger 5) (the binteger 6)))
(a1-0 (car a0-1))
)
(while (not (null? a0-1))
(when (< v1-0 6)
(set! (-> obj spawn-joint-array v1-0) (/ (the-as int a1-0) 8))
(+! v1-0 1)
(let* ((a0-1 '(5 6)) (a1-0 (car a0-1))) (while (not (null? a0-1))
(when (< v1-0 6)
(set! (-> obj spawn-joint-array v1-0) (/ (the-as int a1-0) 8))
(+! v1-0 1)
)
(set! a0-1 (cdr a0-1))
(set! a1-0 (car a0-1))
)
)
(set! a0-1 (cdr a0-1))
(set! a1-0 (car a0-1))
)
)
(set! (-> obj spawn-joint-count) v1-0)
)
(set! (-> obj death-part) (-> *part-group-id-table* 294))
test/decompiler/reference/levels/village1/assistant_REF.gc
Generated Vendored
+26 -30
View File
@@ -100,31 +100,31 @@
:parts 11
:command-list
'((0 want-levels village1 beach)
((the binteger 128) joint "cameraB")
((the binteger 312) joint "camera")
((the binteger 492) joint "cameraB")
((the binteger 537) joint "camera")
((the binteger 734) display-level beach movie)
((the binteger 734) want-force-vis beach #t)
((the binteger 735) alive "ecovent-48")
((the binteger 742) blackout (the binteger 10))
((the binteger 743) joint "cameraB")
((the binteger 745) blackout 0)
((the binteger 839) alive "ecovent-200")
((the binteger 841) joint "camera")
((the binteger 842) dead "ecovent-48")
((the binteger 942) blackout (the binteger 10))
((the binteger 944) joint "cameraB")
((the binteger 945) blackout 0)
((the binteger 945) dead "ecovent-200")
((the binteger 945) display-level beach #f)
((the binteger 1049) blackout (the binteger 10))
((the binteger 1051) joint "camera")
((the binteger 1052) blackout 0)
((the binteger 1135) blackout (the binteger 10))
((the binteger 1137) joint "cameraB")
((the binteger 1138) blackout 0)
((the binteger 1216) joint "camera")
(128 joint "cameraB")
(312 joint "camera")
(492 joint "cameraB")
(537 joint "camera")
(734 display-level beach movie)
(734 want-force-vis beach #t)
(735 alive "ecovent-48")
(742 blackout 10)
(743 joint "cameraB")
(745 blackout 0)
(839 alive "ecovent-200")
(841 joint "camera")
(842 dead "ecovent-48")
(942 blackout 10)
(944 joint "cameraB")
(945 blackout 0)
(945 dead "ecovent-200")
(945 display-level beach #f)
(1049 blackout 10)
(1051 joint "camera")
(1052 blackout 0)
(1135 blackout 10)
(1137 joint "cameraB")
(1138 blackout 0)
(1216 joint "camera")
)
)
)
@@ -137,11 +137,7 @@
:index 12
:parts 6
:command-list
'((0 want-levels village1 beach)
((the binteger 129) joint "cameraB")
((the binteger 319) joint "camera")
((the binteger 505) joint "cameraB")
)
'((0 want-levels village1 beach) (129 joint "cameraB") (319 joint "camera") (505 joint "cameraB"))
)
)
)
test/decompiler/reference/levels/village1/explorer_REF.gc
Generated Vendored
+7 -12
View File
@@ -83,12 +83,7 @@
:index 9
:parts 11
:command-list
'(((the binteger 418) joint "cameraB")
((the binteger 695) shadow self #f)
((the binteger 695) joint "camera")
((the binteger 838) shadow self #t)
((the binteger 838) joint "cameraB")
)
'((418 joint "cameraB") (695 shadow self #f) (695 joint "camera") (838 shadow self #t) (838 joint "cameraB"))
)
)
(((task-status need-reminder))
@@ -104,11 +99,11 @@
:parts 5
:command-list
'((0 send-event target draw #f)
((the binteger 148) send-event target draw #t)
((the binteger 148) joint "cameraB")
((the binteger 390) send-event target draw #f)
((the binteger 390) joint "camera")
((the binteger 505) send-event target draw #t)
(148 send-event target draw #t)
(148 joint "cameraB")
(390 send-event target draw #f)
(390 joint "camera")
(505 send-event target draw #t)
)
)
)
@@ -137,7 +132,7 @@
:index 12
:parts 5
:command-list
'(((the binteger 167) joint "cameraB") ((the binteger 310) joint "camera"))
'((167 joint "cameraB") (310 joint "camera"))
)
)
(else
test/decompiler/reference/levels/village1/fishermans-boat_REF.gc
Generated Vendored
+31 -31
View File
@@ -1069,14 +1069,14 @@
'((0 want-levels village1 misty)
(0 shadow target #f)
(0 shadow sidekick #f)
((the binteger 250) display-level misty display)
((the binteger 250) display-level village1 special)
((the binteger 250) want-vis mis)
((the binteger 250) want-force-vis misty #t)
((the binteger 459) want-force-vis misty #f)
((the binteger 459) save)
((the binteger 459) blackout (the binteger 20))
((the binteger 459) shadow target #t)
(250 display-level misty display)
(250 display-level village1 special)
(250 want-vis mis)
(250 want-force-vis misty #t)
(459 want-force-vis misty #f)
(459 save)
(459 blackout 20)
(459 shadow target #t)
)
)
)
@@ -1206,14 +1206,14 @@
'((0 want-levels village1 misty)
(0 shadow target #f)
(0 shadow sidekick #f)
((the binteger 250) display-level village1 display)
((the binteger 250) display-level misty #f)
((the binteger 250) want-vis vi1)
((the binteger 250) want-force-vis village1 #t)
((the binteger 459) want-force-vis village1 #f)
((the binteger 459) save)
((the binteger 459) blackout (the binteger 20))
((the binteger 459) shadow target #t)
(250 display-level village1 display)
(250 display-level misty #f)
(250 want-vis vi1)
(250 want-force-vis village1 #t)
(459 want-force-vis village1 #f)
(459 save)
(459 blackout 20)
(459 shadow target #t)
)
)
)
@@ -1223,21 +1223,21 @@
:parts 12
:command-list
'((0 want-levels village1 misty)
((the binteger 105) want-levels village1 intro)
((the binteger 150) display-level intro display)
((the binteger 150) want-vis int)
((the binteger 150) kill "med-res-level-3")
((the binteger 150) want-force-vis intro #t)
((the binteger 151) send-event self evilbro)
((the binteger 1199) send-event self evilsis)
((the binteger 1200) want-force-vis intro #f)
((the binteger 1200) want-levels village1 beach)
((the binteger 1200) display-level village1 display)
((the binteger 1200) want-vis vi1)
((the binteger 1200) want-force-vis village1 #t)
((the binteger 1349) want-force-vis village1 #f)
((the binteger 1349) save)
((the binteger 1349) blackout (the binteger 20))
(105 want-levels village1 intro)
(150 display-level intro display)
(150 want-vis int)
(150 kill "med-res-level-3")
(150 want-force-vis intro #t)
(151 send-event self evilbro)
(1199 send-event self evilsis)
(1200 want-force-vis intro #f)
(1200 want-levels village1 beach)
(1200 display-level village1 display)
(1200 want-vis vi1)
(1200 want-force-vis village1 #t)
(1349 want-force-vis village1 #f)
(1349 save)
(1349 blackout 20)
)
)
)
test/decompiler/reference/levels/village1/sage_REF.gc
Generated Vendored
+147 -147
View File
@@ -42,16 +42,16 @@
:index 8
:parts 12
:command-list
'(((the binteger 1) blackout 0)
((the binteger 100) want-levels village1 misty)
((the binteger 261) joint "cameraB")
((the binteger 521) joint "camera")
((the binteger 776) joint "cameraB")
((the binteger 810) joint "camera")
((the binteger 1171) joint "cameraB")
((the binteger 1235) joint "camera")
((the binteger 1235) save)
((the binteger 1418) blackout (the binteger 30))
'((1 blackout 0)
(100 want-levels village1 misty)
(261 joint "cameraB")
(521 joint "camera")
(776 joint "cameraB")
(810 joint "camera")
(1171 joint "cameraB")
(1235 joint "camera")
(1235 save)
(1418 blackout 30)
)
)
)
@@ -91,33 +91,33 @@
(0 kill "ropebridge-5")
(0 kill "ropebridge-4")
(0 kill "villagea-water-2")
(0 time-of-day (the binteger 7))
((the binteger 1) time-of-day (the binteger -1))
((the binteger 3) blackout 0)
((the binteger 25) blackout 0)
((the binteger 25) want-force-vis village1 #f)
((the binteger 56) joint "cameraB")
((the binteger 100) want-force-inside village1 #f)
((the binteger 107) joint "camera")
((the binteger 137) joint "cameraB")
((the binteger 202) joint "camera")
((the binteger 286) joint "cameraB")
((the binteger 554) joint "camera")
((the binteger 633) joint "cameraB")
((the binteger 711) joint "camera")
((the binteger 796) joint "cameraB")
((the binteger 921) joint "camera")
((the binteger 1021) shadow self #f)
((the binteger 1021) joint "cameraB")
((the binteger 1081) joint "camera")
((the binteger 1183) joint "cameraB")
((the binteger 1221) joint "camera")
((the binteger 1496) shadow self #t)
((the binteger 1496) joint "cameraB")
((the binteger 1496) time-of-day (the binteger 18))
((the binteger 1721) joint "camera")
((the binteger 1721) time-of-day (the binteger 7))
((the binteger 1722) time-of-day (the binteger -1))
(0 time-of-day 7)
(1 time-of-day -1)
(3 blackout 0)
(25 blackout 0)
(25 want-force-vis village1 #f)
(56 joint "cameraB")
(100 want-force-inside village1 #f)
(107 joint "camera")
(137 joint "cameraB")
(202 joint "camera")
(286 joint "cameraB")
(554 joint "camera")
(633 joint "cameraB")
(711 joint "camera")
(796 joint "cameraB")
(921 joint "camera")
(1021 shadow self #f)
(1021 joint "cameraB")
(1081 joint "camera")
(1183 joint "cameraB")
(1221 joint "camera")
(1496 shadow self #t)
(1496 joint "cameraB")
(1496 time-of-day 18)
(1721 joint "camera")
(1721 time-of-day 7)
(1722 time-of-day -1)
)
)
)
@@ -143,37 +143,37 @@
:command-list
'((0 want-levels village1 beach)
(0 blackout 0)
((the binteger 197) joint "cameraB")
((the binteger 361) joint "camera")
((the binteger 660) joint "cameraB")
((the binteger 937) display-level beach movie)
((the binteger 937) want-force-vis beach #t)
((the binteger 938) alive "ecoventrock-3")
((the binteger 938) alive "ecoventrock-4")
((the binteger 938) alive "ecoventrock-5")
((the binteger 938) alive "ecoventrock-6")
((the binteger 938) alive "ecoventrock-7")
((the binteger 938) alive "harvester-87")
((the binteger 938) alive "harvester-88")
((the binteger 938) alive "harvester-89")
((the binteger 938) alive "harvester-90")
((the binteger 938) alive "harvester-91")
((the binteger 940) joint "camera")
((the binteger 1160) joint "cameraB")
((the binteger 1162) dead "ecoventrock-3")
((the binteger 1162) dead "ecoventrock-4")
((the binteger 1162) dead "ecoventrock-5")
((the binteger 1162) dead "ecoventrock-6")
((the binteger 1162) dead "ecoventrock-7")
((the binteger 1162) dead "harvester-87")
((the binteger 1162) dead "harvester-88")
((the binteger 1162) dead "harvester-89")
((the binteger 1162) dead "harvester-90")
((the binteger 1162) dead "harvester-91")
((the binteger 1310) joint "camera")
((the binteger 1313) want-force-vis beach #f)
((the binteger 1313) display-level beach #f)
((the binteger 1313) send-event "warp-gate-switch-3" 'hide)
(197 joint "cameraB")
(361 joint "camera")
(660 joint "cameraB")
(937 display-level beach movie)
(937 want-force-vis beach #t)
(938 alive "ecoventrock-3")
(938 alive "ecoventrock-4")
(938 alive "ecoventrock-5")
(938 alive "ecoventrock-6")
(938 alive "ecoventrock-7")
(938 alive "harvester-87")
(938 alive "harvester-88")
(938 alive "harvester-89")
(938 alive "harvester-90")
(938 alive "harvester-91")
(940 joint "camera")
(1160 joint "cameraB")
(1162 dead "ecoventrock-3")
(1162 dead "ecoventrock-4")
(1162 dead "ecoventrock-5")
(1162 dead "ecoventrock-6")
(1162 dead "ecoventrock-7")
(1162 dead "harvester-87")
(1162 dead "harvester-88")
(1162 dead "harvester-89")
(1162 dead "harvester-90")
(1162 dead "harvester-91")
(1310 joint "camera")
(1313 want-force-vis beach #f)
(1313 display-level beach #f)
(1313 send-event "warp-gate-switch-3" 'hide)
)
)
)
@@ -187,12 +187,12 @@
:parts 12
:command-list
'((0 want-levels village1 beach)
((the binteger 261) joint "cameraB")
((the binteger 521) joint "camera")
((the binteger 776) joint "cameraB")
((the binteger 810) joint "camera")
((the binteger 1171) joint "cameraB")
((the binteger 1235) joint "camera")
(261 joint "cameraB")
(521 joint "camera")
(776 joint "cameraB")
(810 joint "camera")
(1171 joint "cameraB")
(1235 joint "camera")
)
)
)
@@ -216,7 +216,7 @@
:index 9
:parts 5
:command-list
'(((the binteger 86) joint "cameraB") ((the binteger 320) joint "camera"))
'((86 joint "cameraB") (320 joint "camera"))
)
)
(else
@@ -226,22 +226,22 @@
:parts 4
:command-list
'((0 want-levels village1 beach)
((the binteger 245) display-level beach movie)
((the binteger 245) want-force-vis beach #t)
((the binteger 246) alive "ecoventrock-3")
((the binteger 246) alive "ecoventrock-4")
((the binteger 246) alive "ecoventrock-5")
((the binteger 246) alive "ecoventrock-6")
((the binteger 246) alive "ecoventrock-7")
((the binteger 246) alive "harvester-87")
((the binteger 246) alive "harvester-88")
((the binteger 246) alive "harvester-89")
((the binteger 246) alive "harvester-90")
((the binteger 246) alive "harvester-91")
((the binteger 246) joint "cameraB")
((the binteger 365) want-force-vis beach #f)
((the binteger 365) display-level beach #f)
((the binteger 366) joint "camera")
(245 display-level beach movie)
(245 want-force-vis beach #t)
(246 alive "ecoventrock-3")
(246 alive "ecoventrock-4")
(246 alive "ecoventrock-5")
(246 alive "ecoventrock-6")
(246 alive "ecoventrock-7")
(246 alive "harvester-87")
(246 alive "harvester-88")
(246 alive "harvester-89")
(246 alive "harvester-90")
(246 alive "harvester-91")
(246 joint "cameraB")
(365 want-force-vis beach #f)
(365 display-level beach #f)
(366 joint "camera")
)
)
)
@@ -293,62 +293,62 @@
(0 kill "fishermans-boat-2")
(0 kill "revcycleprop-2")
(0 kill "revcycle-8")
((the binteger 113) joint "cameraB")
((the binteger 232) joint "camera")
((the binteger 289) joint "cameraB")
((the binteger 338) joint "camera")
((the binteger 405) joint "cameraB")
((the binteger 560) joint "camera")
((the binteger 660) joint "cameraB")
((the binteger 699) joint "camera")
((the binteger 837) joint "cameraB")
((the binteger 837) shadow self #f)
((the binteger 910) joint "camera")
((the binteger 945) alive "farmer-3")
((the binteger 945) alive "hutlamp-2")
((the binteger 950) joint "cameraB")
((the binteger 974) display-level beach movie)
((the binteger 974) want-force-vis beach #t)
((the binteger 1011) alive "bird-lady-4")
((the binteger 1015) joint "camera")
((the binteger 1018) dead "farmer-3")
((the binteger 1018) dead "hutlamp-2")
((the binteger 1075) alive "explorer-4")
((the binteger 1080) joint "cameraB")
((the binteger 1080) want-force-vis beach #f)
((the binteger 1080) display-level beach #f)
((the binteger 1082) dead "bird-lady-4")
((the binteger 1133) joint "camera")
((the binteger 1135) dead "explorer-4")
((the binteger 1244) display-level beach movie)
((the binteger 1244) want-force-vis beach #t)
((the binteger 1245) alive "fuel-cell-42")
((the binteger 1246) joint "cameraB")
((the binteger 1369) joint "camera")
((the binteger 1438) alive "fuel-cell-42")
((the binteger 1438) want-force-vis beach #f)
((the binteger 1438) dead "fuel-cell-42")
((the binteger 1438) kill "villagea-water-2")
((the binteger 1438) kill "crate-3147")
((the binteger 1438) kill "crate-3146")
((the binteger 1438) kill "crate-3143")
((the binteger 1438) kill "sagesail-6")
((the binteger 1438) kill "windmill-sail-4")
((the binteger 1438) kill "ropebridge-4")
((the binteger 1438) kill "ropebridge-5")
((the binteger 1438) kill "windspinner-8")
((the binteger 1438) kill "windspinner-9")
((the binteger 1438) joint "cameraB")
((the binteger 1439) want-levels village1 training)
((the binteger 1439) save)
((the binteger 1529) joint "camera")
((the binteger 1691) joint "cameraB")
((the binteger 1753) joint "camera")
((the binteger 1874) joint "cameraB")
((the binteger 2057) joint "camera")
((the binteger 2176) joint "cameraB")
((the binteger 2226) joint "camera")
((the binteger 2226) shadow self #t)
(113 joint "cameraB")
(232 joint "camera")
(289 joint "cameraB")
(338 joint "camera")
(405 joint "cameraB")
(560 joint "camera")
(660 joint "cameraB")
(699 joint "camera")
(837 joint "cameraB")
(837 shadow self #f)
(910 joint "camera")
(945 alive "farmer-3")
(945 alive "hutlamp-2")
(950 joint "cameraB")
(974 display-level beach movie)
(974 want-force-vis beach #t)
(1011 alive "bird-lady-4")
(1015 joint "camera")
(1018 dead "farmer-3")
(1018 dead "hutlamp-2")
(1075 alive "explorer-4")
(1080 joint "cameraB")
(1080 want-force-vis beach #f)
(1080 display-level beach #f)
(1082 dead "bird-lady-4")
(1133 joint "camera")
(1135 dead "explorer-4")
(1244 display-level beach movie)
(1244 want-force-vis beach #t)
(1245 alive "fuel-cell-42")
(1246 joint "cameraB")
(1369 joint "camera")
(1438 alive "fuel-cell-42")
(1438 want-force-vis beach #f)
(1438 dead "fuel-cell-42")
(1438 kill "villagea-water-2")
(1438 kill "crate-3147")
(1438 kill "crate-3146")
(1438 kill "crate-3143")
(1438 kill "sagesail-6")
(1438 kill "windmill-sail-4")
(1438 kill "ropebridge-4")
(1438 kill "ropebridge-5")
(1438 kill "windspinner-8")
(1438 kill "windspinner-9")
(1438 joint "cameraB")
(1439 want-levels village1 training)
(1439 save)
(1529 joint "camera")
(1691 joint "cameraB")
(1753 joint "camera")
(1874 joint "cameraB")
(2057 joint "camera")
(2176 joint "cameraB")
(2226 joint "camera")
(2226 shadow self #t)
)
)
)
test/decompiler/reference/levels/village2/assistant-village2_REF.gc
Generated Vendored
+168 -177
View File
@@ -130,156 +130,156 @@
:command-list
'((0 send-event target draw #f)
(0 kill "villageb-part-33")
((the binteger 95) send-event target draw #t)
((the binteger 95) joint "cameraB")
((the binteger 131) send-event target draw #f)
((the binteger 131) joint "camera")
((the binteger 190) setting-reset ocean-off #t)
((the binteger 190) kill "pontoonten-20")
((the binteger 190) kill "pontoonten-19")
((the binteger 190) kill "pontoonten-18")
((the binteger 190) kill "pontoonten-17")
((the binteger 190) kill "pontoonten-16")
((the binteger 190) kill "pontoonten-15")
((the binteger 190) kill "pontoonten-14")
((the binteger 190) kill "pontoonten-13")
((the binteger 190) kill "pontoonten-12")
((the binteger 190) kill "pontoonten-11")
((the binteger 190) kill "pontoonten-10")
((the binteger 190) kill "pontoonten-9")
((the binteger 190) kill "pontoonten-8")
((the binteger 190) kill "pontoonten-7")
((the binteger 190) kill "pontoonten-6")
((the binteger 190) kill "pontoonfive-3")
((the binteger 190) kill "pontoonfive-4")
((the binteger 190) kill "pontoonfive-5")
((the binteger 190) kill "pontoonfive-6")
((the binteger 190) kill "pontoonfive-7")
((the binteger 190) kill "pontoonfive-8")
((the binteger 190) kill "pontoonfive-12")
((the binteger 190) kill "pontoonfive-13")
((the binteger 190) kill "pontoonfive-14")
((the binteger 190) kill "pontoonfive-15")
((the binteger 190) kill "pontoonfive-16")
((the binteger 190) kill "pontoonfive-17")
((the binteger 190) kill "pontoonfive-18")
((the binteger 190) kill "pontoonfive-19")
((the binteger 190) kill "pontoonfive-20")
((the binteger 190) kill "allpontoons-1")
((the binteger 190) kill "med-res-level-12")
((the binteger 190) kill "med-res-level-13")
((the binteger 190) kill "med-res-level-15")
((the binteger 190) kill "swamp-blimp-3")
((the binteger 190) kill "barrel-85")
((the binteger 190) kill "barrel-86")
((the binteger 190) kill "money-2844")
((the binteger 190) kill "money-2845")
((the binteger 190) kill "money-2846")
((the binteger 190) kill "money-2847")
((the binteger 190) kill "money-2848")
((the binteger 190) kill "money-2849")
((the binteger 190) kill "money-4923")
((the binteger 190) kill "money-4924")
((the binteger 190) kill "money-4925")
((the binteger 190) kill "money-4926")
((the binteger 190) kill "money-4927")
((the binteger 190) kill "eco-27")
((the binteger 190) kill "sharkey-25")
((the binteger 190) kill "barrel-117")
((the binteger 190) kill "barrel-118")
((the binteger 190) kill "barrel-119")
((the binteger 190) kill "barrel-120")
((the binteger 190) kill "barrel-121")
((the binteger 190) kill "barrel-122")
((the binteger 190) kill "crate-3129")
((the binteger 190) kill "crate-3132")
((the binteger 190) kill "crate-3133")
((the binteger 190) kill "villageb-part-32")
((the binteger 190) kill "villageb-part-30")
((the binteger 190) kill "exit-chamber-dummy-1")
((the binteger 190) kill "villageb-part-34")
((the binteger 191) send-event target draw #t)
((the binteger 191) joint "cameraB")
((the binteger 241) joint "camera")
((the binteger 241) send-event target draw #f)
((the binteger 241) setting-unset ocean-off)
((the binteger 241) dead "pontoonten-20")
((the binteger 241) dead "pontoonten-19")
((the binteger 241) dead "pontoonten-18")
((the binteger 241) dead "pontoonten-17")
((the binteger 241) dead "pontoonten-16")
((the binteger 241) dead "pontoonten-15")
((the binteger 241) dead "pontoonten-14")
((the binteger 241) dead "pontoonten-13")
((the binteger 241) dead "pontoonten-12")
((the binteger 241) dead "pontoonten-11")
((the binteger 241) dead "pontoonten-10")
((the binteger 241) dead "pontoonten-9")
((the binteger 241) dead "pontoonten-8")
((the binteger 241) dead "pontoonten-7")
((the binteger 241) dead "pontoonten-6")
((the binteger 241) dead "pontoonfive-3")
((the binteger 241) dead "pontoonfive-4")
((the binteger 241) dead "pontoonfive-5")
((the binteger 241) dead "pontoonfive-6")
((the binteger 241) dead "pontoonfive-7")
((the binteger 241) dead "pontoonfive-8")
((the binteger 241) dead "pontoonfive-12")
((the binteger 241) dead "pontoonfive-13")
((the binteger 241) dead "pontoonfive-14")
((the binteger 241) dead "pontoonfive-15")
((the binteger 241) dead "pontoonfive-16")
((the binteger 241) dead "pontoonfive-17")
((the binteger 241) dead "pontoonfive-18")
((the binteger 241) dead "pontoonfive-19")
((the binteger 241) dead "pontoonfive-20")
((the binteger 241) dead "allpontoons-1")
((the binteger 241) dead "med-res-level-12")
((the binteger 241) dead "med-res-level-13")
((the binteger 241) dead "med-res-level-15")
((the binteger 241) dead "swamp-blimp-3")
((the binteger 241) dead "barrel-85")
((the binteger 241) dead "barrel-86")
((the binteger 241) dead "money-2844")
((the binteger 241) dead "money-2845")
((the binteger 241) dead "money-2846")
((the binteger 241) dead "money-2847")
((the binteger 241) dead "money-2848")
((the binteger 241) dead "money-2849")
((the binteger 241) dead "money-4923")
((the binteger 241) dead "money-4924")
((the binteger 241) dead "money-4925")
((the binteger 241) dead "money-4926")
((the binteger 241) dead "money-4927")
((the binteger 241) dead "eco-27")
((the binteger 241) dead "sharkey-25")
((the binteger 241) dead "barrel-117")
((the binteger 241) dead "barrel-118")
((the binteger 241) dead "barrel-119")
((the binteger 241) dead "barrel-120")
((the binteger 241) dead "barrel-121")
((the binteger 241) dead "barrel-122")
((the binteger 241) dead "crate-3129")
((the binteger 241) dead "crate-3132")
((the binteger 241) dead "crate-3133")
((the binteger 241) dead "villageb-part-32")
((the binteger 241) dead "villageb-part-30")
((the binteger 321) joint "cameraB")
((the binteger 352) joint "camera")
((the binteger 383) joint "cameraB")
((the binteger 411) joint "camera")
((the binteger 501) joint "cameraB")
((the binteger 501) send-event target draw #t)
((the binteger 567) joint "camera")
((the binteger 634) alive "fireboulder-6")
((the binteger 635) joint "cameraB")
((the binteger 701) joint "camera")
((the binteger 741) joint "cameraB")
((the binteger 784) joint "camera")
((the binteger 936) joint "cameraB")
((the binteger 1065) joint "camera")
((the binteger 1145) joint "cameraB")
((the binteger 1241) joint "camera")
(95 send-event target draw #t)
(95 joint "cameraB")
(131 send-event target draw #f)
(131 joint "camera")
(190 setting-reset ocean-off #t)
(190 kill "pontoonten-20")
(190 kill "pontoonten-19")
(190 kill "pontoonten-18")
(190 kill "pontoonten-17")
(190 kill "pontoonten-16")
(190 kill "pontoonten-15")
(190 kill "pontoonten-14")
(190 kill "pontoonten-13")
(190 kill "pontoonten-12")
(190 kill "pontoonten-11")
(190 kill "pontoonten-10")
(190 kill "pontoonten-9")
(190 kill "pontoonten-8")
(190 kill "pontoonten-7")
(190 kill "pontoonten-6")
(190 kill "pontoonfive-3")
(190 kill "pontoonfive-4")
(190 kill "pontoonfive-5")
(190 kill "pontoonfive-6")
(190 kill "pontoonfive-7")
(190 kill "pontoonfive-8")
(190 kill "pontoonfive-12")
(190 kill "pontoonfive-13")
(190 kill "pontoonfive-14")
(190 kill "pontoonfive-15")
(190 kill "pontoonfive-16")
(190 kill "pontoonfive-17")
(190 kill "pontoonfive-18")
(190 kill "pontoonfive-19")
(190 kill "pontoonfive-20")
(190 kill "allpontoons-1")
(190 kill "med-res-level-12")
(190 kill "med-res-level-13")
(190 kill "med-res-level-15")
(190 kill "swamp-blimp-3")
(190 kill "barrel-85")
(190 kill "barrel-86")
(190 kill "money-2844")
(190 kill "money-2845")
(190 kill "money-2846")
(190 kill "money-2847")
(190 kill "money-2848")
(190 kill "money-2849")
(190 kill "money-4923")
(190 kill "money-4924")
(190 kill "money-4925")
(190 kill "money-4926")
(190 kill "money-4927")
(190 kill "eco-27")
(190 kill "sharkey-25")
(190 kill "barrel-117")
(190 kill "barrel-118")
(190 kill "barrel-119")
(190 kill "barrel-120")
(190 kill "barrel-121")
(190 kill "barrel-122")
(190 kill "crate-3129")
(190 kill "crate-3132")
(190 kill "crate-3133")
(190 kill "villageb-part-32")
(190 kill "villageb-part-30")
(190 kill "exit-chamber-dummy-1")
(190 kill "villageb-part-34")
(191 send-event target draw #t)
(191 joint "cameraB")
(241 joint "camera")
(241 send-event target draw #f)
(241 setting-unset ocean-off)
(241 dead "pontoonten-20")
(241 dead "pontoonten-19")
(241 dead "pontoonten-18")
(241 dead "pontoonten-17")
(241 dead "pontoonten-16")
(241 dead "pontoonten-15")
(241 dead "pontoonten-14")
(241 dead "pontoonten-13")
(241 dead "pontoonten-12")
(241 dead "pontoonten-11")
(241 dead "pontoonten-10")
(241 dead "pontoonten-9")
(241 dead "pontoonten-8")
(241 dead "pontoonten-7")
(241 dead "pontoonten-6")
(241 dead "pontoonfive-3")
(241 dead "pontoonfive-4")
(241 dead "pontoonfive-5")
(241 dead "pontoonfive-6")
(241 dead "pontoonfive-7")
(241 dead "pontoonfive-8")
(241 dead "pontoonfive-12")
(241 dead "pontoonfive-13")
(241 dead "pontoonfive-14")
(241 dead "pontoonfive-15")
(241 dead "pontoonfive-16")
(241 dead "pontoonfive-17")
(241 dead "pontoonfive-18")
(241 dead "pontoonfive-19")
(241 dead "pontoonfive-20")
(241 dead "allpontoons-1")
(241 dead "med-res-level-12")
(241 dead "med-res-level-13")
(241 dead "med-res-level-15")
(241 dead "swamp-blimp-3")
(241 dead "barrel-85")
(241 dead "barrel-86")
(241 dead "money-2844")
(241 dead "money-2845")
(241 dead "money-2846")
(241 dead "money-2847")
(241 dead "money-2848")
(241 dead "money-2849")
(241 dead "money-4923")
(241 dead "money-4924")
(241 dead "money-4925")
(241 dead "money-4926")
(241 dead "money-4927")
(241 dead "eco-27")
(241 dead "sharkey-25")
(241 dead "barrel-117")
(241 dead "barrel-118")
(241 dead "barrel-119")
(241 dead "barrel-120")
(241 dead "barrel-121")
(241 dead "barrel-122")
(241 dead "crate-3129")
(241 dead "crate-3132")
(241 dead "crate-3133")
(241 dead "villageb-part-32")
(241 dead "villageb-part-30")
(321 joint "cameraB")
(352 joint "camera")
(383 joint "cameraB")
(411 joint "camera")
(501 joint "cameraB")
(501 send-event target draw #t)
(567 joint "camera")
(634 alive "fireboulder-6")
(635 joint "cameraB")
(701 joint "camera")
(741 joint "cameraB")
(784 joint "camera")
(936 joint "cameraB")
(1065 joint "camera")
(1145 joint "cameraB")
(1241 joint "camera")
)
)
)
@@ -324,14 +324,14 @@
:index 21
:parts 10
:command-list
'(((the binteger 197) joint "cameraB")
((the binteger 351) joint "camera")
((the binteger 431) joint "cameraB")
((the binteger 553) joint "camera")
((the binteger 631) joint "cameraB")
((the binteger 842) joint "camera")
((the binteger 900) joint "cameraB")
((the binteger 1069) joint "camera")
'((197 joint "cameraB")
(351 joint "camera")
(431 joint "cameraB")
(553 joint "camera")
(631 joint "cameraB")
(842 joint "camera")
(900 joint "cameraB")
(1069 joint "camera")
)
)
)
@@ -356,11 +356,7 @@
:index 17
:parts 6
:command-list
'(((the binteger 55) joint "cameraB")
((the binteger 145) joint "camera")
((the binteger 207) joint "cameraB")
((the binteger 363) joint "camera")
)
'((55 joint "cameraB") (145 joint "camera") (207 joint "cameraB") (363 joint "camera"))
)
)
(else
@@ -374,12 +370,7 @@
:index 19
:parts 8
:command-list
'(((the binteger 71) joint "cameraB")
((the binteger 308) joint "camera")
((the binteger 426) joint "cameraB")
((the binteger 550) joint "camera")
((the binteger 644) joint "cameraB")
)
'((71 joint "cameraB") (308 joint "camera") (426 joint "cameraB") (550 joint "camera") (644 joint "cameraB"))
)
)
)
@@ -1644,14 +1635,14 @@
:index 16
:parts 7
:command-list
'(((the binteger 196) joint "cameraB")
((the binteger 241) joint "camera")
((the binteger 286) joint "cameraB")
((the binteger 436) joint "camera")
((the binteger 526) joint "cameraB")
((the binteger 581) joint "camera")
((the binteger 639) joint "cameraB")
((the binteger 715) joint "camera")
'((196 joint "cameraB")
(241 joint "camera")
(286 joint "cameraB")
(436 joint "camera")
(526 joint "cameraB")
(581 joint "camera")
(639 joint "cameraB")
(715 joint "camera")
)
)
)
test/decompiler/reference/levels/village2/gambler_REF.gc
Generated Vendored
+15 -15
View File
@@ -44,21 +44,21 @@
:command-list
'((0 want-levels village2 rolling)
(0 display-level rolling #f)
((the binteger 29) joint "cameraB")
((the binteger 103) joint "camera")
((the binteger 231) joint "cameraB")
((the binteger 730) display-level rolling display)
((the binteger 730) want-force-vis rolling #t)
((the binteger 732) alive "gorge-pusher-5")
((the binteger 732) alive "gorge-pusher-6")
((the binteger 732) alive "gorge-start-1")
((the binteger 732) joint "camera")
((the binteger 945) joint "cameraB")
((the binteger 950) dead "gorge-pusher-5")
((the binteger 950) dead "gorge-pusher-6")
((the binteger 950) dead "gorge-start-1")
((the binteger 950) display-level rolling #f)
((the binteger 950) want-force-vis rolling #f)
(29 joint "cameraB")
(103 joint "camera")
(231 joint "cameraB")
(730 display-level rolling display)
(730 want-force-vis rolling #t)
(732 alive "gorge-pusher-5")
(732 alive "gorge-pusher-6")
(732 alive "gorge-start-1")
(732 joint "camera")
(945 joint "cameraB")
(950 dead "gorge-pusher-5")
(950 dead "gorge-pusher-6")
(950 dead "gorge-start-1")
(950 display-level rolling #f)
(950 want-force-vis rolling #f)
)
)
)
test/decompiler/reference/levels/village2/geologist_REF.gc
Generated Vendored
+8 -8
View File
@@ -43,14 +43,14 @@
:parts 13
:command-list
'((0 want-levels village2 rolling)
((the binteger 199) joint "cameraB")
((the binteger 325) joint "camera")
((the binteger 520) alive "racer-2")
((the binteger 544) joint "cameraB")
((the binteger 546) dead "racer-2")
((the binteger 809) joint "camera")
((the binteger 1031) joint "cameraB")
((the binteger 1229) joint "camera")
(199 joint "cameraB")
(325 joint "camera")
(520 alive "racer-2")
(544 joint "cameraB")
(546 dead "racer-2")
(809 joint "camera")
(1031 joint "cameraB")
(1229 joint "camera")
)
)
)
test/decompiler/reference/levels/village2/sage-bluehut_REF.gc
Generated Vendored
+8 -14
View File
@@ -94,10 +94,7 @@
:index 8
:parts 12
:command-list
'(((the binteger 678) joint "cameraB")
((the binteger 1166) joint "camera")
((the binteger 1258) joint "cameraB")
)
'((678 joint "cameraB") (1166 joint "camera") (1258 joint "cameraB"))
)
)
(else
@@ -113,12 +110,12 @@
:index 6
:parts 8
:command-list
'(((the binteger 141) joint "cameraB")
((the binteger 214) joint "camera")
((the binteger 308) joint "cameraB")
((the binteger 686) joint "camera")
((the binteger 786) joint "cameraB")
((the binteger 843) joint "camera")
'((141 joint "cameraB")
(214 joint "camera")
(308 joint "cameraB")
(686 joint "camera")
(786 joint "cameraB")
(843 joint "camera")
)
)
)
@@ -142,10 +139,7 @@
:index 7
:parts 4
:command-list
'(((the binteger 90) joint "cameraB")
((the binteger 259) joint "camera")
((the binteger 352) joint "cameraB")
)
'((90 joint "cameraB") (259 joint "camera") (352 joint "cameraB"))
)
)
)
test/decompiler/reference/levels/village2/warrior_REF.gc
Generated Vendored
+12 -12
View File
@@ -81,17 +81,17 @@
:index 6
:parts 29
:command-list
'(((the binteger 125) joint "cameraB")
((the binteger 260) joint "camera")
((the binteger 574) joint "cameraB")
((the binteger 918) joint "camera")
((the binteger 1174) joint "cameraB")
((the binteger 1174) shadow self #f)
((the binteger 1301) joint "camera")
((the binteger 1301) shadow self #t)
((the binteger 2025) joint "cameraB")
((the binteger 2322) joint "camera")
((the binteger 2560) joint "cameraB")
'((125 joint "cameraB")
(260 joint "camera")
(574 joint "cameraB")
(918 joint "camera")
(1174 joint "cameraB")
(1174 shadow self #f)
(1301 joint "camera")
(1301 shadow self #t)
(2025 joint "cameraB")
(2322 joint "camera")
(2560 joint "cameraB")
)
)
)
@@ -135,7 +135,7 @@
:index 8
:parts 6
:command-list
'(((the binteger 508) blackout (the binteger 10)) ((the binteger 511) blackout 0))
'((508 blackout 10) (511 blackout 0))
)
)
(else
test/decompiler/reference/levels/village3/miners_REF.gc
Generated Vendored
+20 -20
View File
@@ -349,16 +349,16 @@
:index 4
:parts 16
:command-list
'(((the binteger 171) joint "cameraB")
((the binteger 206) joint "camera")
((the binteger 423) joint "cameraB")
((the binteger 591) joint "camera")
((the binteger 692) joint "cameraB")
((the binteger 918) joint "camera")
((the binteger 1122) joint "cameraB")
((the binteger 1122) shadow self #f)
((the binteger 1241) joint "camera")
((the binteger 1241) shadow self #t)
'((171 joint "cameraB")
(206 joint "camera")
(423 joint "cameraB")
(591 joint "camera")
(692 joint "cameraB")
(918 joint "camera")
(1122 joint "cameraB")
(1122 shadow self #f)
(1241 joint "camera")
(1241 shadow self #t)
)
)
)
@@ -384,13 +384,13 @@
:parts 8
:command-list
'((0 want-levels village3 maincave)
((the binteger 149) joint "cameraB")
((the binteger 158) display-level maincave movie)
((the binteger 158) want-force-vis maincave #t)
((the binteger 435) display-level maincave #f)
((the binteger 435) joint "camera")
((the binteger 680) joint "cameraB")
((the binteger 719) joint "camera")
(149 joint "cameraB")
(158 display-level maincave movie)
(158 want-force-vis maincave #t)
(435 display-level maincave #f)
(435 joint "camera")
(680 joint "cameraB")
(719 joint "camera")
)
)
)
@@ -404,7 +404,7 @@
:index 11
:parts 7
:command-list
'(((the binteger 2) shadow "minertall-1" #f) ((the binteger 835) shadow "minertall-1" #t))
'((2 shadow "minertall-1" #f) (835 shadow "minertall-1" #t))
)
)
)
@@ -481,7 +481,7 @@
:index 12
:parts 5
:command-list
'(((the binteger 2) shadow "minertall-1" #f) ((the binteger 500) shadow "minertall-1" #t))
'((2 shadow "minertall-1" #f) (500 shadow "minertall-1" #t))
)
)
)
@@ -509,7 +509,7 @@
:index 8
:parts 6
:command-list
'(((the binteger 154) joint "cameraB") ((the binteger 461) joint "camera"))
'((154 joint "cameraB") (461 joint "camera"))
)
)
)
test/decompiler/reference/levels/village3/sage-village3_REF.gc
Generated Vendored
+32 -37
View File
@@ -107,36 +107,36 @@
:index 8
:parts 58
:command-list
'(((the binteger 206) joint "cameraB")
((the binteger 268) joint "camera")
((the binteger 321) joint "cameraB")
((the binteger 415) joint "camera")
((the binteger 502) joint "cameraB")
((the binteger 655) joint "camera")
((the binteger 864) joint "cameraB")
((the binteger 958) joint "camera")
((the binteger 1178) joint "cameraB")
((the binteger 1295) joint "camera")
((the binteger 1377) joint "cameraB")
((the binteger 1683) joint "camera")
((the binteger 2066) joint "cameraB")
((the binteger 2209) joint "camera")
((the binteger 2389) joint "cameraB")
((the binteger 2707) joint "camera")
((the binteger 2769) joint "cameraB")
((the binteger 2901) joint "camera")
((the binteger 3021) joint "cameraB")
((the binteger 3158) joint "camera")
((the binteger 3301) joint "cameraB")
((the binteger 3533) joint "camera")
((the binteger 3632) joint "cameraB")
((the binteger 3692) joint "camera")
((the binteger 3780) joint "cameraB")
((the binteger 3818) joint "camera")
((the binteger 4188) joint "cameraB")
((the binteger 4324) joint "camera")
((the binteger 4462) joint "cameraB")
((the binteger 4542) joint "camera")
'((206 joint "cameraB")
(268 joint "camera")
(321 joint "cameraB")
(415 joint "camera")
(502 joint "cameraB")
(655 joint "camera")
(864 joint "cameraB")
(958 joint "camera")
(1178 joint "cameraB")
(1295 joint "camera")
(1377 joint "cameraB")
(1683 joint "camera")
(2066 joint "cameraB")
(2209 joint "camera")
(2389 joint "cameraB")
(2707 joint "camera")
(2769 joint "cameraB")
(2901 joint "camera")
(3021 joint "cameraB")
(3158 joint "camera")
(3301 joint "cameraB")
(3533 joint "camera")
(3632 joint "cameraB")
(3692 joint "camera")
(3780 joint "cameraB")
(3818 joint "camera")
(4188 joint "cameraB")
(4324 joint "camera")
(4462 joint "cameraB")
(4542 joint "camera")
)
)
)
@@ -160,12 +160,7 @@
:index 4
:parts 9
:command-list
'(((the binteger 111) joint "cameraB")
((the binteger 189) joint "camera")
((the binteger 455) joint "cameraB")
((the binteger 638) joint "camera")
((the binteger 753) joint "cameraB")
)
'((111 joint "cameraB") (189 joint "camera") (455 joint "cameraB") (638 joint "camera") (753 joint "cameraB"))
)
)
(else
@@ -177,7 +172,7 @@
:index 6
:parts 6
:command-list
'(((the binteger 155) joint "cameraB") ((the binteger 370) joint "camera"))
'((155 joint "cameraB") (370 joint "camera"))
)
)
)
test/decompiler/reference/levels/village_common/oracle_REF.gc
Generated Vendored
+1 -1
View File
@@ -135,7 +135,7 @@
(0 kill "ceilingflag-9")
(0 kill "orb-cache-top-14")
(0 setting-reset ocean-off near)
((the binteger 399) setting-unset ocean-off)
(399 setting-unset ocean-off)
)
)
)
test/goalc/source_templates/with_game/test-static-pair-1.gc
+1 -1
View File
@@ -1,5 +1,5 @@
(defun test-static-pair-function ()
(format #t "~A~%" '(8 ( w . a ) beans 16 (-8 -16) twelve ( a . "test")))
(format #t "~A~%" '(1 ( w . a ) beans 2 (-1 -2) twelve ( a . "test")))
0
)
test/goalc/test_with_game.cpp
+3 -4
View File
@@ -869,10 +869,9 @@ TEST_F(WithGameTests, StackInlineArray) {
}
TEST_F(WithGameTests, GetEnumVals) {
shared_compiler->runner.run_static_test(
env, testCategory, "test-get-enum-vals.gc",
{"((thing1 . #<invalid object #x1>) (thing3 . #<invalid object #x3>) "
"(thing5 . #<invalid object #x5>))\n0\n"});
shared_compiler->runner.run_static_test(env, testCategory, "test-get-enum-vals.gc",
{"((thing1 . 1) (thing3 . 3) "
"(thing5 . 5))\n0\n"});
}
TEST_F(WithGameTests, SetU64FromFloat) {