From cca829aecd6a33593d51630a66e91e58a4e6d73d Mon Sep 17 00:00:00 2001 From: Ziemas Date: Wed, 15 Nov 2023 22:29:51 +0100 Subject: [PATCH] j2: fix enemy-method-135 (#3206) Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com> --- decompiler/config/jak2/all-types.gc | 8 ++--- .../config/jak2/ntsc_v1/var_names.jsonc | 7 ++++ goal_src/jak2/engine/ai/enemy-h.gc | 8 ++--- goal_src/jak2/engine/ai/enemy.gc | 36 +++++++++---------- goal_src/jak2/engine/nav/nav-enemy.gc | 8 ++--- .../jak2/levels/castle/roboguard-level.gc | 2 +- .../city/traffic/citizen/metalhead-flitter.gc | 2 +- .../city/traffic/citizen/metalhead-grunt.gc | 2 +- goal_src/jak2/levels/common/enemy/flitter.gc | 2 +- goal_src/jak2/levels/common/enemy/grunt.gc | 2 +- .../enemy/guards/crimson-guard-level.gc | 2 +- goal_src/jak2/levels/common/enemy/hopper.gc | 2 +- goal_src/jak2/levels/nest/flying-spider.gc | 2 +- goal_src/jak2/levels/nest/mantis.gc | 2 +- goal_src/jak2/levels/ruins/rapid-gunner.gc | 2 +- goal_src/jak2/levels/sewer/hosehead.gc | 2 +- goal_src/jak2/levels/tomb/monster-frog.gc | 2 +- .../reference/jak2/engine/ai/enemy-h_REF.gc | 8 ++--- .../reference/jak2/engine/ai/enemy_REF.gc | 36 +++++++++---------- .../jak2/engine/nav/nav-enemy_REF.gc | 8 ++--- .../jak2/levels/castle/roboguard-level_REF.gc | 2 +- .../traffic/citizen/metalhead-flitter_REF.gc | 2 +- .../traffic/citizen/metalhead-grunt_REF.gc | 2 +- .../jak2/levels/common/enemy/flitter_REF.gc | 2 +- .../jak2/levels/common/enemy/grunt_REF.gc | 2 +- .../enemy/guards/crimson-guard-level_REF.gc | 2 +- .../jak2/levels/common/enemy/hopper_REF.gc | 2 +- .../jak2/levels/nest/flying-spider_REF.gc | 2 +- .../reference/jak2/levels/nest/mantis_REF.gc | 2 +- .../jak2/levels/ruins/rapid-gunner_REF.gc | 2 +- .../jak2/levels/sewer/hosehead_REF.gc | 2 +- .../jak2/levels/tomb/monster-frog_REF.gc | 2 +- 32 files changed, 87 insertions(+), 80 deletions(-) diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc index 7f8848476..05b6dd0c7 100644 --- a/decompiler/config/jak2/all-types.gc +++ b/decompiler/config/jak2/all-types.gc @@ -33068,10 +33068,10 @@ (actor-group (pointer actor-group) :offset-assert 480) (actor-group-count int32 :offset-assert 484) (neck joint-mod :offset-assert 488) - (on-notice symbol :offset-assert 492) - (on-active symbol :offset-assert 496) - (on-hostile symbol :offset-assert 500) - (on-death symbol :offset-assert 504) + (on-notice pair :offset-assert 492) + (on-active pair :offset-assert 496) + (on-hostile pair :offset-assert 500) + (on-death pair :offset-assert 504) (idle-anim-player idle-control :inline :offset-assert 512) (rand-gen symbol :offset-assert 528) ) diff --git a/decompiler/config/jak2/ntsc_v1/var_names.jsonc b/decompiler/config/jak2/ntsc_v1/var_names.jsonc index d872665c7..aa1afe621 100644 --- a/decompiler/config/jak2/ntsc_v1/var_names.jsonc +++ b/decompiler/config/jak2/ntsc_v1/var_names.jsonc @@ -4625,5 +4625,12 @@ "vars": { "s5-0": "play-sound?" } + }, + "(method 135 enemy)": { + "args": ["this", "sound"], + "vars": { + "gp-0": ["name", "sound-name"], + "v1-0": "sound-type" + } } } diff --git a/goal_src/jak2/engine/ai/enemy-h.gc b/goal_src/jak2/engine/ai/enemy-h.gc index 2a60dbf13..b2a0356f8 100644 --- a/goal_src/jak2/engine/ai/enemy-h.gc +++ b/goal_src/jak2/engine/ai/enemy-h.gc @@ -275,10 +275,10 @@ (actor-group (pointer actor-group)) (actor-group-count int32) (neck joint-mod) - (on-notice symbol) - (on-active symbol) - (on-hostile symbol) - (on-death symbol) + (on-notice pair) + (on-active pair) + (on-hostile pair) + (on-death pair) (idle-anim-player idle-control :inline) (rand-gen symbol) ) diff --git a/goal_src/jak2/engine/ai/enemy.gc b/goal_src/jak2/engine/ai/enemy.gc index d547db63b..d2dc71999 100644 --- a/goal_src/jak2/engine/ai/enemy.gc +++ b/goal_src/jak2/engine/ai/enemy.gc @@ -552,20 +552,20 @@ ) ) -(defmethod enemy-method-135 ((this enemy) (arg0 int)) - (let ((gp-0 (make-u128 0 0))) - (let ((v1-0 arg0)) +(defmethod enemy-method-135 ((this enemy) (sound int)) + (let ((name (static-sound-name ""))) + (let ((sound-type sound)) (cond - ((zero? v1-0) - (set! gp-0 (the-as uint (-> this enemy-info sound-hit))) + ((zero? sound-type) + (set! name (-> this enemy-info sound-hit)) ) - ((= v1-0 1) - (set! gp-0 (the-as uint (-> this enemy-info sound-die))) + ((= sound-type 1) + (set! name (-> this enemy-info sound-die)) ) ) ) - (if (nonzero? gp-0) - (sound-play-by-name (the-as sound-name gp-0) (new-sound-id) 1024 0 0 (sound-group sfx) #t) + (if (nonzero? (the-as uint name)) + (sound-play-by-name (the-as sound-name name) (new-sound-id) 1024 0 0 (sound-group sfx) #t) ) ) ) @@ -1090,10 +1090,10 @@ ) ) ) - (set! (-> this on-notice) (res-lump-struct (-> this entity) 'on-notice symbol)) - (set! (-> this on-active) (res-lump-struct (-> this entity) 'on-active symbol)) - (set! (-> this on-hostile) (res-lump-struct (-> this entity) 'on-hostile symbol)) - (set! (-> this on-death) (res-lump-struct (-> this entity) 'on-death symbol)) + (set! (-> this on-notice) (res-lump-struct (-> this entity) 'on-notice pair)) + (set! (-> this on-active) (res-lump-struct (-> this entity) 'on-active pair)) + (set! (-> this on-hostile) (res-lump-struct (-> this entity) 'on-hostile pair)) + (set! (-> this on-death) (res-lump-struct (-> this entity) 'on-death pair)) (if (-> this on-notice) (logior! (-> this enemy-flags) (enemy-flag auto-reset-penetrate)) ) @@ -1841,7 +1841,7 @@ This commonly includes things such as: (drop-pickup (-> this fact) #t *entity-pool* (-> this fact) 0) (let ((s5-1 (-> this on-death))) (if s5-1 - (script-eval (the-as pair s5-1) :vector (-> this root trans)) + (script-eval s5-1 :vector (-> this root trans)) ) ) ) @@ -1883,7 +1883,7 @@ This commonly includes things such as: (send-event (ppointer->process (-> this parent)) 'child-die) (let ((s5-3 (-> this on-death))) (if s5-3 - (script-eval (the-as pair s5-3) :vector (-> this root trans)) + (script-eval s5-3 :vector (-> this root trans)) ) ) (cleanup-for-death this) @@ -2282,7 +2282,7 @@ This commonly includes things such as: (logclear! (-> self enemy-flags) (enemy-flag jump-check-blocked)) (let ((gp-0 (-> self on-active))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) @@ -2331,7 +2331,7 @@ This commonly includes things such as: (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) @@ -2386,7 +2386,7 @@ This commonly includes things such as: (logclear! (-> self enemy-flags) (enemy-flag drawn-mirrored)) (let ((gp-0 (-> self on-hostile))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/engine/nav/nav-enemy.gc b/goal_src/jak2/engine/nav/nav-enemy.gc index 84e697a14..5f6d56f0e 100644 --- a/goal_src/jak2/engine/nav/nav-enemy.gc +++ b/goal_src/jak2/engine/nav/nav-enemy.gc @@ -1175,10 +1175,10 @@ ) ) ) - (set! (-> this on-notice) (res-lump-struct (-> this entity) 'on-notice symbol)) - (set! (-> this on-active) (res-lump-struct (-> this entity) 'on-active symbol)) - (set! (-> this on-hostile) (res-lump-struct (-> this entity) 'on-hostile symbol)) - (set! (-> this on-death) (res-lump-struct (-> this entity) 'on-death symbol)) + (set! (-> this on-notice) (res-lump-struct (-> this entity) 'on-notice pair)) + (set! (-> this on-active) (res-lump-struct (-> this entity) 'on-active pair)) + (set! (-> this on-hostile) (res-lump-struct (-> this entity) 'on-hostile pair)) + (set! (-> this on-death) (res-lump-struct (-> this entity) 'on-death pair)) (if (-> this on-notice) (logior! (-> this enemy-flags) (enemy-flag auto-reset-penetrate)) ) diff --git a/goal_src/jak2/levels/castle/roboguard-level.gc b/goal_src/jak2/levels/castle/roboguard-level.gc index d572395c0..64098efae 100644 --- a/goal_src/jak2/levels/castle/roboguard-level.gc +++ b/goal_src/jak2/levels/castle/roboguard-level.gc @@ -531,7 +531,7 @@ (logclear! (-> self enemy-flags) (enemy-flag drawn-mirrored)) (let ((gp-0 (-> self on-hostile))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc b/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc index dcaa8df61..a163d11bd 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/metalhead-flitter.gc @@ -279,7 +279,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc b/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc index 218468439..5aa2879bd 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/metalhead-grunt.gc @@ -334,7 +334,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/levels/common/enemy/flitter.gc b/goal_src/jak2/levels/common/enemy/flitter.gc index ea2335365..89377f14b 100644 --- a/goal_src/jak2/levels/common/enemy/flitter.gc +++ b/goal_src/jak2/levels/common/enemy/flitter.gc @@ -624,7 +624,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/levels/common/enemy/grunt.gc b/goal_src/jak2/levels/common/enemy/grunt.gc index cac59b3bc..44bd9a241 100644 --- a/goal_src/jak2/levels/common/enemy/grunt.gc +++ b/goal_src/jak2/levels/common/enemy/grunt.gc @@ -411,7 +411,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc b/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc index 8d9eed0b3..5e119760c 100644 --- a/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc +++ b/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc @@ -1554,7 +1554,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-1 (-> self on-notice))) (if gp-1 - (script-eval (the-as pair gp-1) :vector (-> self root trans)) + (script-eval gp-1 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/levels/common/enemy/hopper.gc b/goal_src/jak2/levels/common/enemy/hopper.gc index 036a118d6..b21b4a014 100644 --- a/goal_src/jak2/levels/common/enemy/hopper.gc +++ b/goal_src/jak2/levels/common/enemy/hopper.gc @@ -843,7 +843,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/levels/nest/flying-spider.gc b/goal_src/jak2/levels/nest/flying-spider.gc index e913348c3..a329e8925 100644 --- a/goal_src/jak2/levels/nest/flying-spider.gc +++ b/goal_src/jak2/levels/nest/flying-spider.gc @@ -178,7 +178,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/levels/nest/mantis.gc b/goal_src/jak2/levels/nest/mantis.gc index f661bd214..55d3d815c 100644 --- a/goal_src/jak2/levels/nest/mantis.gc +++ b/goal_src/jak2/levels/nest/mantis.gc @@ -452,7 +452,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/levels/ruins/rapid-gunner.gc b/goal_src/jak2/levels/ruins/rapid-gunner.gc index 185e6a1e1..798ddc2c3 100644 --- a/goal_src/jak2/levels/ruins/rapid-gunner.gc +++ b/goal_src/jak2/levels/ruins/rapid-gunner.gc @@ -609,7 +609,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/levels/sewer/hosehead.gc b/goal_src/jak2/levels/sewer/hosehead.gc index 95150f97e..3a814108a 100644 --- a/goal_src/jak2/levels/sewer/hosehead.gc +++ b/goal_src/jak2/levels/sewer/hosehead.gc @@ -1266,7 +1266,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/goal_src/jak2/levels/tomb/monster-frog.gc b/goal_src/jak2/levels/tomb/monster-frog.gc index b6c280f01..543a8e46b 100644 --- a/goal_src/jak2/levels/tomb/monster-frog.gc +++ b/goal_src/jak2/levels/tomb/monster-frog.gc @@ -267,7 +267,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/engine/ai/enemy-h_REF.gc b/test/decompiler/reference/jak2/engine/ai/enemy-h_REF.gc index 1241c56df..3fe41b1f7 100644 --- a/test/decompiler/reference/jak2/engine/ai/enemy-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/ai/enemy-h_REF.gc @@ -374,10 +374,10 @@ (actor-group (pointer actor-group)) (actor-group-count int32) (neck joint-mod) - (on-notice symbol) - (on-active symbol) - (on-hostile symbol) - (on-death symbol) + (on-notice pair) + (on-active pair) + (on-hostile pair) + (on-death pair) (idle-anim-player idle-control :inline) (rand-gen symbol) ) diff --git a/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc b/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc index 10327f84a..92dc09d17 100644 --- a/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc +++ b/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc @@ -593,20 +593,20 @@ ;; definition for method 135 of type enemy ;; INFO: Used lq/sq -(defmethod enemy-method-135 ((this enemy) (arg0 int)) - (let ((gp-0 (make-u128 0 0))) - (let ((v1-0 arg0)) +(defmethod enemy-method-135 ((this enemy) (sound int)) + (let ((name (static-sound-name ""))) + (let ((sound-type sound)) (cond - ((zero? v1-0) - (set! gp-0 (the-as uint (-> this enemy-info sound-hit))) + ((zero? sound-type) + (set! name (-> this enemy-info sound-hit)) ) - ((= v1-0 1) - (set! gp-0 (the-as uint (-> this enemy-info sound-die))) + ((= sound-type 1) + (set! name (-> this enemy-info sound-die)) ) ) ) - (if (nonzero? gp-0) - (sound-play-by-name (the-as sound-name gp-0) (new-sound-id) 1024 0 0 (sound-group sfx) #t) + (if (nonzero? (the-as uint name)) + (sound-play-by-name (the-as sound-name name) (new-sound-id) 1024 0 0 (sound-group sfx) #t) ) ) ) @@ -1167,10 +1167,10 @@ ) ) ) - (set! (-> this on-notice) (res-lump-struct (-> this entity) 'on-notice symbol)) - (set! (-> this on-active) (res-lump-struct (-> this entity) 'on-active symbol)) - (set! (-> this on-hostile) (res-lump-struct (-> this entity) 'on-hostile symbol)) - (set! (-> this on-death) (res-lump-struct (-> this entity) 'on-death symbol)) + (set! (-> this on-notice) (res-lump-struct (-> this entity) 'on-notice pair)) + (set! (-> this on-active) (res-lump-struct (-> this entity) 'on-active pair)) + (set! (-> this on-hostile) (res-lump-struct (-> this entity) 'on-hostile pair)) + (set! (-> this on-death) (res-lump-struct (-> this entity) 'on-death pair)) (if (-> this on-notice) (logior! (-> this enemy-flags) (enemy-flag auto-reset-penetrate)) ) @@ -1916,7 +1916,7 @@ This commonly includes things such as: (drop-pickup (-> this fact) #t *entity-pool* (-> this fact) 0) (let ((s5-1 (-> this on-death))) (if s5-1 - (script-eval (the-as pair s5-1) :vector (-> this root trans)) + (script-eval s5-1 :vector (-> this root trans)) ) ) ) @@ -1958,7 +1958,7 @@ This commonly includes things such as: (send-event (ppointer->process (-> this parent)) 'child-die) (let ((s5-3 (-> this on-death))) (if s5-3 - (script-eval (the-as pair s5-3) :vector (-> this root trans)) + (script-eval s5-3 :vector (-> this root trans)) ) ) (cleanup-for-death this) @@ -2377,7 +2377,7 @@ This commonly includes things such as: (logclear! (-> self enemy-flags) (enemy-flag jump-check-blocked)) (let ((gp-0 (-> self on-active))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) @@ -2427,7 +2427,7 @@ This commonly includes things such as: (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) @@ -2483,7 +2483,7 @@ This commonly includes things such as: (logclear! (-> self enemy-flags) (enemy-flag drawn-mirrored)) (let ((gp-0 (-> self on-hostile))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc b/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc index e55ef0363..4a04df156 100644 --- a/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc +++ b/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc @@ -1256,10 +1256,10 @@ ) ) ) - (set! (-> this on-notice) (res-lump-struct (-> this entity) 'on-notice symbol)) - (set! (-> this on-active) (res-lump-struct (-> this entity) 'on-active symbol)) - (set! (-> this on-hostile) (res-lump-struct (-> this entity) 'on-hostile symbol)) - (set! (-> this on-death) (res-lump-struct (-> this entity) 'on-death symbol)) + (set! (-> this on-notice) (res-lump-struct (-> this entity) 'on-notice pair)) + (set! (-> this on-active) (res-lump-struct (-> this entity) 'on-active pair)) + (set! (-> this on-hostile) (res-lump-struct (-> this entity) 'on-hostile pair)) + (set! (-> this on-death) (res-lump-struct (-> this entity) 'on-death pair)) (if (-> this on-notice) (logior! (-> this enemy-flags) (enemy-flag auto-reset-penetrate)) ) diff --git a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc index 95bef519b..214e4f1c7 100644 --- a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc @@ -563,7 +563,7 @@ (logclear! (-> self enemy-flags) (enemy-flag drawn-mirrored)) (let ((gp-0 (-> self on-hostile))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc index 5745c216e..d9e7fcbec 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-flitter_REF.gc @@ -303,7 +303,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc index 5e82390a6..3076abaf3 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-grunt_REF.gc @@ -362,7 +362,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc index 6801215fb..ce74351c1 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc @@ -664,7 +664,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc index 2fbfef685..313ca9658 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc @@ -476,7 +476,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc index 0aeda8c5f..bba55038f 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc @@ -1678,7 +1678,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-1 (-> self on-notice))) (if gp-1 - (script-eval (the-as pair gp-1) :vector (-> self root trans)) + (script-eval gp-1 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc index c405efa44..d71e7c7b0 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc @@ -787,7 +787,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc b/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc index 3c0d7c742..319ade617 100644 --- a/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc @@ -210,7 +210,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc index 25582bc84..feba8cafc 100644 --- a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc @@ -497,7 +497,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc index 839219e97..7f1ca5c12 100644 --- a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc @@ -647,7 +647,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc b/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc index 73b70ffa2..17d88ef24 100644 --- a/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc @@ -1381,7 +1381,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/tomb/monster-frog_REF.gc b/test/decompiler/reference/jak2/levels/tomb/monster-frog_REF.gc index fa1bacdc1..f9834d2f9 100644 --- a/test/decompiler/reference/jak2/levels/tomb/monster-frog_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/monster-frog_REF.gc @@ -280,7 +280,7 @@ (logclear! (-> self enemy-flags) (enemy-flag auto-reset-penetrate)) (let ((gp-0 (-> self on-notice))) (if gp-0 - (script-eval (the-as pair gp-0) :vector (-> self root trans)) + (script-eval gp-0 :vector (-> self root trans)) ) ) )