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

[decomp] hud, hud-classes, add some new basic alignment options, fix type bug (#2084)

Browse Source
This commit is contained in:
water111
2023-01-02 10:05:22 -05:00
committed by GitHub
parent 9f53edae7a
commit 0e43c96e52
112 changed files with 4036 additions and 2701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/type_system/Type.cpp
+2 -2
View File
@@ -886,9 +886,9 @@ int BasicType::get_offset() const {
}
int BasicType::get_inline_array_start_alignment() const {
if (m_pack) {
if (m_pack || m_allow_misalign) {
// make elements of inline array the minimum allowable alignment.
int alignment = 8;
int alignment = m_allow_misalign ? 4 : 8;
// TODO - I don't know if GOAL actually did this check, maybe packed inline arrays could
// violate these?
for (const auto& field : m_fields) {
common/type_system/TypeSystem.cpp
+3 -2
View File
@@ -954,8 +954,9 @@ int TypeSystem::add_field_to_type(StructureType* type,
int aligned_offset = align(offset, field_alignment);
field.mark_as_user_placed();
if (offset != aligned_offset) {
throw_typesystem_error("Tried to place field {} at {}, but it is not aligned correctly\n",
field_name, offset);
throw_typesystem_error(
"Tried to place field {} at {}, but it is not aligned correctly, requires {}\n",
field_name, offset, field_alignment);
}
}
common/type_system/deftype.cpp
+1 -5
View File
@@ -624,11 +624,7 @@ DeftypeResult parse_deftype(const goos::Object& deftype,
new_type->set_pack(true);
}
if (sr.allow_misaligned) {
lg::print(
"[TypeSystem] :allow-misaligned was set on {}, which is a basic and cannot "
"be misaligned\n",
name);
throw std::runtime_error("invalid pack option on basic");
new_type->set_allow_misalign(true);
}
if (sr.always_stack_singleton) {
lg::print(
decompiler/config/jak2/all-types.gc
+87 -56
View File
@@ -6967,6 +6967,7 @@
(text-x24d #x024d)
(text-x24e #x024e)
(text-x24f #x024f)
(text-x277 #x0277)
(scene-subtitles-enabled #x30d)
(scene-subtitles-disabled #x30e)
(progress-unknown-continue #x310)
@@ -7426,19 +7427,19 @@
(minimap-method-12 (_type_ process uint int vector int) connection-minimap 12)
(minimap-method-13 () none 13)
(minimap-method-14 () none 14)
(minimap-method-15 () none 15)
(minimap-method-15 (_type_ dma-buffer vector4w symbol) none 15) ;; hud sprite 1 draw
(minimap-method-16 () none 16)
(minimap-method-17 () none 17)
(minimap-method-18 () none 18)
(minimap-method-19 () none 19)
(minimap-method-20 () none 20)
(minimap-method-20 (_type_) symbol 20)
(minimap-method-21 () none 21)
(minimap-method-22 () none 22)
(minimap-method-23 () none 23)
(minimap-method-24 () none 24)
(minimap-method-25 () none 25)
(minimap-method-24 (_type_ dma-buffer vector4w symbol) none 24) ;; hud sprite 2 draw
(minimap-method-25 (_type_ texture float) none 25)
(minimap-method-26 () none 26)
(minimap-method-27 () none 27)
(minimap-method-27 (_type_ float float) none 27)
)
)
@@ -12919,7 +12920,7 @@
(race-total-lap-count int32 :offset-assert 508)
(race-position int32 :offset-assert 512)
(race-number-turbos int32 :offset-assert 516)
(bot-health uint32 3 :offset-assert 520)
(bot-health float 3 :offset-assert 520)
(demo-state uint32 :offset-assert 532)
(wanted-flash basic :offset-assert 536)
(distance float :offset-assert 540)
@@ -12990,6 +12991,17 @@
(fade 9)
)
(defenum gui-status
:type uint8 ;; not sure
:bitfield #f
(unknown 0)
(pending 1)
(ready 2)
(active 3)
(hide 4)
(stop 5)
)
(defenum gui-channel
:type uint8
:bitfield #f
@@ -13040,12 +13052,22 @@
(max 96)
)
(defenum gui-connection-flags
:type uint8
:bitfield #t
(gcf0 0)
(gcf1 1)
(fo-curve 2)
(fo-min 3)
(fo-max 4)
)
(deftype gui-connection (connection)
((priority float :offset 16 :score 1)
(action gui-action :offset 20)
(channel gui-channel :offset 21)
(anim-part uint8 :offset 22)
(flags uint8 :offset 23)
(flags gui-connection-flags :offset 23)
(name string :offset 24)
(id sound-id :offset 28)
(handle handle :offset 0)
@@ -13082,21 +13104,21 @@
;; Failed to read fields.
(:methods
(new (symbol type int) _type_ 0)
(gui-control-method-9 (_type_ process gui-channel gui-action string float time-frame) sound-id 9)
(gui-control-method-10 (_type_ process gui-channel) none 10)
(gui-control-method-11 (_type_ gui-connection) int 11)
(add-process (_type_ process gui-channel gui-action string float time-frame) sound-id 9)
(remove-process (_type_ process gui-channel) none 10)
(stop-str (_type_ gui-connection) int 11)
(gui-control-method-12 (_type_ process gui-channel gui-action string int float sound-id) sound-id 12)
(update (_type_ symbol) int 13)
(gui-control-method-14 (_type_ string gui-channel gui-action) int 14)
(gui-control-method-15 (_type_ process gui-channel string sound-id) gui-connection 15)
(gui-control-method-16 (_type_ gui-action sound-id gui-channel gui-action string (function gui-connection symbol) process) int 16)
(gui-control-method-17 (_type_ sound-id) gui-action 17)
(lookup-gui-connection-id (_type_ string gui-channel gui-action) int 14)
(lookup-gui-connection (_type_ process gui-channel string sound-id) gui-connection 15)
(set-action! (_type_ gui-action sound-id gui-channel gui-action string (function gui-connection symbol) process) int 16)
(get-status (_type_ sound-id) gui-status 17)
(gui-control-method-18 (_type_ gui-channel) symbol 18)
(gui-control-method-19 (_type_ gui-channel gui-connection) symbol 19)
(gui-control-method-20 (_type_ sound-id symbol int int int) gui-connection 20)
(handle-command-list (_type_ gui-channel gui-connection) symbol 19)
(set-falloff! (_type_ sound-id symbol int int int) gui-connection 20)
(gui-control-method-21 (_type_ gui-connection vector) int 21)
(gui-control-method-22 (_type_ gui-connection process symbol) none 22)
(gui-control-method-23 (_type_ gui-channel gui-channel symbol gui-connection) symbol 23)
(handle-command (_type_ gui-channel gui-channel symbol gui-connection) symbol 23)
(channel-id-set! (_type_ gui-connection sound-id) int 24)
)
)
@@ -14625,7 +14647,7 @@
;; Failed to read fields.
(:methods
(new (symbol type process-drawable pickup-type float) _type_ 0)
(get-gun-ammo (_type_ target) float 12)
(get-gun-ammo (_type_) float 12)
)
)
@@ -20906,10 +20928,12 @@
(deftype hud-string (basic)
((text string :offset-assert 4)
(scale float :offset-assert 8)
(color uint32 :offset-assert 12)
(flags uint32 :offset-assert 16)
(pos vector4w :inline :offset-assert 32)
(color font-color :offset-assert 12)
(flags font-flags :offset-assert 16)
;(pos vector4w :inline :offset-assert 32)
(pos int32 4 :offset 32)
)
:allow-misaligned
:method-count-assert 9
:size-assert #x30
:flag-assert #x900000030
@@ -20918,6 +20942,7 @@
(deftype hud-sprite (structure)
((pos vector4w :inline :offset-assert 0)
(color vector4w :inline :offset-assert 16)
(color2 int32 4 :offset 16 :score 1)
(flags uint32 :offset-assert 32)
(scale-x float :offset-assert 36)
(scale-y float :offset-assert 40)
@@ -20928,7 +20953,7 @@
:size-assert #x34
:flag-assert #xb00000034
(:methods
(hud-sprite-method-9 (_type_ dma-buffer level) none 9)
(draw (_type_ dma-buffer level) none 9)
(hud-sprite-method-10 (_type_) none 10)
)
)
@@ -20942,22 +20967,24 @@
:size-assert #x20
:flag-assert #x1000000020
(:methods
(hud-box-method-9 (_type_ dma-buffer) none 9)
(hud-box-method-10 () none 10)
(hud-box-method-11 () none 11)
(hud-box-method-12 () none 12)
(hud-box-method-13 (_type_ dma-buffer float) int 13)
(hud-box-method-14 (_type_) none 14)
(hud-box-method-15 (_type_) none 15)
(draw-box-prim-only (_type_ dma-buffer) none 9)
(draw-box-alpha-1 (_type_ dma-buffer) none 10)
(draw-box-alpha-2 (_type_ dma-buffer) none 11)
(draw-box-alpha-3 (_type_ dma-buffer) none 12)
(draw-scan-and-line (_type_ dma-buffer float) int 13)
(setup-scissor (_type_ dma-buffer) none 14)
(restore-scissor (_type_ dma-buffer) none 15)
)
)
(deftype hud-icon (basic)
((icon (pointer manipy) :offset-assert 4) ;; guessed by decompiler
(pos vector4w :inline :offset-assert 16)
;(pos vector4w :inline :offset-assert 16)
(pos int32 4 :offset 16)
(scale-x float :offset-assert 32)
(scale-y float :offset-assert 36)
)
:allow-misaligned
:method-count-assert 9
:size-assert #x28
:flag-assert #x900000028
@@ -20969,7 +20996,7 @@
(flags uint16 :offset-assert 12)
(counter uint16 :offset-assert 14)
)
:pack-me
:allow-misaligned
:method-count-assert 9
:size-assert #x10
:flag-assert #x900000010
@@ -20978,6 +21005,9 @@
(defenum hud-flags
:type uint32
:bitfield #t
(disable 0)
(should-die 1)
(show 2)
)
(deftype hud (process)
@@ -20985,29 +21015,29 @@
(last-hide-time time-frame :offset-assert 136) ;; time-frame
(offset float :offset-assert 144) ;; int32
(flags hud-flags :offset-assert 148)
(values hud-value 8 :inline :offset-assert 152 :score 999)
(strings hud-string 14 :inline :offset-assert 288 :score 999)
(sprites hud-sprite 30 :inline :offset-assert 960)
(icons hud-icon 2 :inline :offset-assert 2880) ;; guessed by decompiler
(gui-id sound-id :offset-assert 2976)
(values hud-value 8 :inline :offset 148)
(strings hud-string 14 :inline :offset 284 :score 999)
(sprites hud-sprite 30 :inline :offset 960 :score 999)
(icons hud-icon 2 :inline :offset 2876) ;; guessed by decompiler
(gui-id sound-id :offset 2976)
)
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
(:methods
(hidden? (_type_) symbol 14) ;; (hidden? (_type_) symbol 14)
(hud-method-15 (_type_) none 15) ;; (draw-hud (_type_) none 15)
(hud-method-16 (_type_ int int) none 16) ;; (tally-value (_type_ int int) none 16)
(hud-method-17 (_type_) none 17) ;; (draw-icons (_type_) none 17)
(hud-method-18 (_type_) symbol 18) ;; (draw-particles (_type_) none 18)
(draw (_type_) none 15) ;; (draw-hud (_type_) none 15)
(update-values (_type_) none 16) ;; (tally-value (_type_ int int) none 16)
(init-callback (_type_) none 17) ;; (draw-icons (_type_) none 17)
(event-callback (_type_ process int symbol event-message-block) symbol 18) ;; (draw-particles (_type_) none 18)
(hud-method-19 (_type_) none 19) ;; (hud-update (_type_) none 19)
(hud-method-20 (_type_) none 20) ;; (init-particles! (_type_ int) none 20)
(hud-method-21 (_type_) none 21) ;; (get-icon-pos-x (_type_) int 21)
(hud-method-22 (_type_) none 22) ;; (get-icon-pos-y (_type_) int 22)
(hud-method-23 (_type_) none 23) ;; (dummy-23 (_type_) none 23)
(hud-method-24 (_type_ symbol) none 24) ;; (set-pos-and-scale (_type_ symbol symbol) none 24)
(hud-method-25 (_type_) none 25) ;; (get-icon-scale-x (_type_) float 25)
(hud-method-26 (_type_ int) none 26) ;; (get-icon-scale-y (_type_) float 26)
(check-ready-and-maybe-show "Is this element ready to be shown? If arg0 is set, show it now." (_type_ symbol) symbol 24)
(update-value-callback (_type_ int int) none 25) ;; (get-icon-scale-x (_type_) float 25)
(alloc-string-if-needed (_type_ int) none 26) ;; (get-icon-scale-y (_type_) float 26)
)
)
@@ -21495,7 +21525,7 @@
(gone () _type_ :state 23) ;; (adjust-ratios (_type_ symbol symbol) none 23)
(init-defaults "Initialize default menu settings." (_type_) connection 24) ;; (draw-fuel-cell-screen (_type_ int) none 24)
(progress-method-25 (_type_) none 25) ;; (draw-money-screen (_type_ int) none 25)
(progress-method-26 (_type_) object 26) ;; (draw-buzzer-screen (_type_ int) none 26)
(is-gone (_type_) object 26) ;; (draw-buzzer-screen (_type_ int) none 26)
(can-go-back? (_type_) symbol 27) ;; (draw-notice-screen (_type_) none 27)
(progress-method-28 (_type_ symbol) symbol 28) ;; (draw-options (_type_ int int float) none 28)
(progress-method-29 (_type_) int 29) ;; (respond-common (_type_) none 29)
@@ -21570,7 +21600,7 @@
(deftype menu-slider-option (menu-option)
((value-to-modify pointer :offset-assert 48)
(sprites hud-sprite 5 :inline :offset-assert 64) ;; guess
(sprites hud-sprite 5 :inline :offset 64) ;; guess
)
:method-count-assert 12
:size-assert #x180
@@ -21639,7 +21669,7 @@
)
(deftype menu-memcard-slot-option (menu-option)
((sprites hud-sprite 5 :inline :offset-assert 48 :score 999) ;; total guess
((sprites hud-sprite 5 :inline :offset 48 :score 999) ;; total guess
(pad uint8 32)
)
:method-count-assert 12
@@ -21732,7 +21762,7 @@
)
(deftype menu-icon-info-option (menu-option)
((sprites hud-sprite 2 :inline :offset-assert 48)
((sprites hud-sprite 2 :inline :offset 48)
)
:method-count-assert 12
:size-assert #xb0
@@ -21862,7 +21892,7 @@
(deftype menu-highscores-option (paged-menu-option)
((last-move uint64 :offset-assert 64)
(sprites hud-sprite 2 :inline :offset-assert 80)
(sprites hud-sprite 2 :inline :offset 80)
)
:method-count-assert 12
:size-assert #xd0
@@ -21891,7 +21921,7 @@
(num-hero-items int32 :offset-assert 60)
(secret-items (array secret-item-option) :offset-assert 64)
(last-move uint64 :offset-assert 72)
(sprites hud-sprite 2 :inline :offset-assert 80)
(sprites hud-sprite 2 :inline :offset 80)
)
:method-count-assert 12
:size-assert #xd0
@@ -25211,7 +25241,7 @@
(notify handle :offset-assert 456)
(force symbol :offset-assert 464)
(state-time time-frame :offset-assert 472)
(icon hud-sprite :inline :offset-assert 480)
(icon hud-sprite :inline :offset 480)
)
:method-count-assert 23
:size-assert #x214
@@ -30344,7 +30374,8 @@
(mask-tmpl dma-gif-packet :inline :offset-assert 160)
(line-tmpl dma-gif-packet :inline :offset-assert 192)
(scan-tmpl dma-gif-packet :inline :offset-assert 224)
(line-color vector4w :inline :offset-assert 256)
;(line-color vector4w :inline :offset-assert 256)
(line-color gs-rgbaq)
(scan-colors vector4w 32 :inline :offset 272)
(scanline uint32 :offset 784)
)
@@ -30354,25 +30385,25 @@
)
(define-extern *hud-sprite-work* hud-sprite-work)
(define-extern hud-create-icon (function none))
(define-extern hud-create-icon (function hud int int (pointer manipy)))
(define-extern hud-hidden (state hud)) ;; (state hud)
(define-extern hud-arriving (state hud)) ;;
(define-extern hud-in (state hud)) ;; (state hud)
(define-extern hud-leaving (state int hud)) ;; (state int hud)
(define-extern hud-leaving (state float hud)) ;; (state int hud)
(define-extern hud-init-by-other (function object :behavior hud))
(define-extern hide-hud (function symbol none))
;; (define-extern enable-hud function) ;; (function none)
(define-extern enable-hud (function none))
(define-extern hide-hud-quick (function symbol none))
(define-extern show-hud (function object none))
(define-extern hud-hidden? (function symbol))
(define-extern set-hud-piece-position! (function hud-sprite int int none))
;; (define-extern set-as-offset-from! function)
(define-extern set-as-offset-from! (function hud-sprite vector4w int int none))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; hud-classes ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; (define-extern *hud-skullgem* object)
(define-extern *hud-skullgem* (pointer hud-skullgem))
(define-extern activate-hud (function target none)) ;; (function process none)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
decompiler/config/jak2/hacks.jsonc
+6
View File
@@ -525,6 +525,12 @@
[444, 1],
[479, 1],
[510, 1]
],
"(method 17 hud-goal)": [
[71, 0]
],
"(method 15 hud-miss)": [
[44, 0]
]
},
decompiler/config/jak2/label_types.jsonc
+3
View File
@@ -801,5 +801,8 @@
["L801", "uint64", true],
["L802", "uint64", true],
["L803", "uint64", true]
],
"hud": [
["L217", "vector"]
]
}
decompiler/config/jak2/type_casts.jsonc
+93 -1
View File
@@ -5535,5 +5535,97 @@
"(method 7 fodder)": [[19, "t9", "(function nav-enemy int nav-enemy)"]],
"(post idle fodder)": [[4, "t9", "(function none)"]],
"(method 180 fodder)": [[24, "s1", "fodder"]],
"(method 55 fodder)": [[29, "s5", "process-drawable"]]
"(method 55 fodder)": [[29, "s5", "process-drawable"]],
"(method 13 hud-box)": [
[[63, 70], "t4", "dma-packet"],
[[72, 79], "t4", "gs-gif-tag"],
[83, "t4", "(pointer gs-test)"],
[85, "t4", "(pointer gs-reg64)"],
[87, "t4", "(pointer gs-alpha)"],
[89, "t4", "(pointer gs-reg64)"],
[[96, 101], "t3", "(pointer uint128)"],
[[110, 144], "t4", "(inline-array vector4w)"],
[[156, 163], "t2", "dma-packet"],
[[165, 172], "t2", "gs-gif-tag"],
[176, "t2", "(pointer gs-alpha)"],
[178, "t2", "(pointer gs-reg64)"],
[180, "t2", "(pointer gs-rgbaq)"],
[182, "t2", "(pointer gs-reg64)"],
[[187, 212], "t2", "(inline-array vector4w)"]
],
"(method 9 hud-sprite)": [
[[27, 34], "v1", "(pointer uint128)"],
[[39, 280], "v1", "(inline-array vector)"],
[[280, 316], "v1", "(inline-array vector4w)"]
],
"(method 9 hud-box)": [
[[1, 53], "v1", "(inline-array vector4w)"]
],
"(method 10 hud-box)": [
[[1, 8], "a2", "dma-packet"],
[[10, 17], "a2", "gs-gif-tag"],
[21, "a2", "(pointer gs-test)"],
[23, "a2", "(pointer gs-reg64)"],
[25, "a2", "(pointer gs-alpha)"],
[27, "a2", "(pointer gs-reg64)"],
[[31, 77], "v1", "(inline-array vector4w)"]
],
"(method 11 hud-box)": [
[[1, 8], "a2", "dma-packet"],
[[10, 17], "a2", "gs-gif-tag"],
[21, "a2", "(pointer gs-test)"],
[23, "a2", "(pointer gs-reg64)"],
[25, "a2", "(pointer gs-alpha)"],
[27, "a2", "(pointer gs-reg64)"],
[[31, 77], "v1", "(inline-array vector4w)"]
],
"(method 12 hud-box)": [
[[1, 8], "a2", "dma-packet"],
[[10, 17], "a2", "gs-gif-tag"],
[21, "a2", "(pointer gs-test)"],
[23, "a2", "(pointer gs-reg64)"],
[25, "a2", "(pointer gs-alpha)"],
[27, "a2", "(pointer gs-reg64)"],
[[31, 77], "v1", "(inline-array vector4w)"]
],
"(method 14 hud-box)": [
[[1, 8], "a2", "dma-packet"],
[[10, 17], "a2", "gs-gif-tag"],
[43, "a1", "(pointer gs-scissor)"],
[45, "a1", "(pointer gs-reg64)"]
],
"(method 15 hud-box)": [
[[1, 8], "a0", "dma-packet"],
[[10, 17], "a0", "gs-gif-tag"],
[21, "a0", "(pointer gs-scissor)"],
[23, "a0", "(pointer gs-reg64)"]
],
"hud-create-icon": [
[35, "a0", "process-drawable"]
],
"hide-hud": [
[11, "v1", "connection"],
[23, "v1", "connection"]
],
"enable-hud": [
[17, "v1", "connection"]
],
"hide-hud-quick": [
[11, "v1", "connection"],
[23, "v1", "connection"]
],
"show-hud": [
[22, "v1", "connection"],
[34, "v1", "connection"]
],
"hud-hidden?": [
[9, "v1", "connection"],
[[9, 13], "a0", "hud"]
],
"(method 15 hud-dark-eco-symbol)": [
[[9, 14], "v1", "hud-health"]
],
"(method 15 hud-gun)": [
[[251, 256], "v1", "dma-packet"]
]
}
decompiler/types2/ForwardProp.cpp
+5 -5
View File
@@ -36,7 +36,7 @@ void types2_from_ambiguous_deref(types2::Instruction& instr,
// HACK - this is disabled for now. This probably works, but the expression pass needs
// a way to get the decisions.
type.type = TP_Type::make_from_ts(out.front().result_type);
type.type = TP_Type::make_from_ts(coerce_to_reg_type(out.front().result_type));
return;
// see if we've tagged this instruction in a previous iteration..
@@ -51,7 +51,7 @@ void types2_from_ambiguous_deref(types2::Instruction& instr,
for (auto& sel : out) {
if (sel.result_type == desired_type) {
// found one, take it.
type.type = TP_Type::make_from_ts(desired_type);
type.type = TP_Type::make_from_ts(coerce_to_reg_type(desired_type));
return;
}
}
@@ -59,11 +59,11 @@ void types2_from_ambiguous_deref(types2::Instruction& instr,
// use the first one (highest scored).
lg::print("type2_from_ambiguous_deref: wanted type {}, but couldn't find it.\n",
desired_type.print());
type.type = TP_Type::make_from_ts(out.front().result_type);
type.type = TP_Type::make_from_ts(coerce_to_reg_type(out.front().result_type));
return;
} else {
// we've got a tag, but no info, just pick the first.
type.type = TP_Type::make_from_ts(out.front().result_type);
type.type = TP_Type::make_from_ts(coerce_to_reg_type(out.front().result_type));
return;
}
} else {
@@ -81,7 +81,7 @@ void types2_from_ambiguous_deref(types2::Instruction& instr,
// don't think this should be possible
lg::warn("Tag lock prevented the creation of a tag in types2_from_ambiguous_deref");
}
type.type = TP_Type::make_from_ts(out.front().result_type);
type.type = TP_Type::make_from_ts(coerce_to_reg_type(out.front().result_type));
return;
}
}
game/CMakeLists.txt
+1 -1
View File
@@ -213,5 +213,5 @@ else()
target_link_libraries(runtime pthread dl)
endif()
add_executable(gk main.cpp "tools/filter_menu/filter_menu.cpp" "tools/filter_menu/filter_menu.h")
add_executable(gk main.cpp)
target_link_libraries(gk runtime)
game/tools/filter_menu/filter_menu.cpp
+2 -2
View File
@@ -18,14 +18,14 @@ void FiltersMenu::draw_window() {
if (ImGui::TreeNode("Debug Text Filters")) {
auto& current_filters = Gfx::g_debug_settings.debug_text_filters;
// Iterate and display all current debug text filters
for (int i = 0; i < current_filters.size(); i++) {
for (size_t i = 0; i < current_filters.size(); i++) {
std::string label = "contains?";
if (current_filters[i].type == DebugTextFilter::Type::NOT_CONTAINS) {
label = "not-contains?";
} else if (current_filters[i].type == DebugTextFilter::Type::REGEX) {
label = "regex?";
}
ImGui::Text(label.c_str());
ImGui::Text("%s", label.c_str());
ImGui::SameLine();
ImGui::InputText(fmt::format("##filter-{}", i).c_str(), &current_filters[i].content);
}
goal_src/jak2/engine/ai/enemy.gc
+2 -2
View File
@@ -756,7 +756,7 @@
(set! (-> obj incoming blue-juggle-count) (the-as uint 1))
)
(else
(set! (-> obj incoming blue-juggle-count) (the-as uint (+ (-> obj incoming blue-juggle-count) 1)))
(+! (-> obj incoming blue-juggle-count) 1)
)
)
(set! (-> obj incoming attack-time) a0-4)
@@ -3132,7 +3132,7 @@
)
(vector-float*! arg0 arg0 (lerp (-> s5-0 knocked-blue-vxz-lo) (-> s5-0 knocked-blue-vxz-hi) f30-7))
(cond
((>= (the-as uint 4) (the-as uint (-> obj incoming blue-juggle-count)))
((>= (the-as uint 4) (-> obj incoming blue-juggle-count))
(set! (-> arg0 y) (lerp (-> s5-0 knocked-blue-vy-lo) (-> s5-0 knocked-blue-vy-hi) f30-7))
)
(else
goal_src/jak2/engine/ambient/ambient.gc
+19 -24
View File
@@ -25,7 +25,7 @@
)
)
)
(= (gui-control-method-17 *gui-control* a1-3) (gui-action playing))
(= (get-status *gui-control* a1-3) (gui-status active))
)
)
@@ -41,7 +41,7 @@
(defun kill-current-talker ((arg0 symbol) (arg1 pair) (arg2 symbol))
(if (not (member 'daxter arg1))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -53,7 +53,7 @@
)
)
(if (not (member 'voicebox arg1))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -65,7 +65,7 @@
)
)
(if (not (member 'message arg1))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -77,7 +77,7 @@
)
)
(when (not (member 'notice arg1))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -87,7 +87,7 @@
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -173,7 +173,7 @@
)
(talker-speech-class-method-10 arg0)
)
(set! s2-0 (gui-control-method-14 *gui-control* (-> arg0 name) (-> arg0 channel) (gui-action none)))
(set! s2-0 (lookup-gui-connection-id *gui-control* (-> arg0 name) (-> arg0 channel) (gui-action none)))
(set! s2-0 (cond
((zero? s2-0)
(let ((v1-17 (process-spawn talker :init talker-init arg0 arg2 arg3 :to arg1)))
@@ -211,13 +211,13 @@
)
)
(set! (-> self voice-id)
(gui-control-method-9 *gui-control* self (-> arg0 channel) (gui-action queue) (-> arg0 name) 81920.0 0)
(add-process *gui-control* self (-> arg0 channel) (gui-action queue) (-> arg0 name) 81920.0 0)
)
)
)
(when (nonzero? (-> arg0 text-message))
(let* ((a0-6 *gui-control*)
(t9-1 (method-of-object a0-6 gui-control-method-9))
(t9-1 (method-of-object a0-6 add-process))
(a1-3 self)
(v1-15 (shr (the-as int (-> arg0 channel)) 4))
)
@@ -362,10 +362,8 @@
)
)
(while (< (- (-> self clock frame-counter) (-> self start-time)) (the-as time-frame (+ (-> self message delay) 300)))
(if (and (or (zero? (-> self voice-id)) (= (gui-control-method-17 *gui-control* (-> self voice-id)) (gui-action play)))
(or (zero? (-> self message-id))
(= (gui-control-method-17 *gui-control* (-> self message-id)) (gui-action playing))
)
(if (and (or (zero? (-> self voice-id)) (= (get-status *gui-control* (-> self voice-id)) (gui-status ready)))
(or (zero? (-> self message-id)) (= (get-status *gui-control* (-> self message-id)) (gui-status active)))
)
(go-virtual active)
)
@@ -386,7 +384,7 @@
(set-setting! 'hint (process->ppointer self) 0 0)
(set-setting! 'speech-control #f 0 0)
(if (nonzero? (-> self voice-id))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action play)
(-> self voice-id)
@@ -432,7 +430,7 @@
(auto-save-user)
)
(if (nonzero? (-> self voice-id))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(-> self voice-id)
@@ -444,7 +442,7 @@
)
)
(if (nonzero? (-> self message-id))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(-> self message-id)
@@ -467,8 +465,8 @@
(local-vars (v1-43 symbol))
(let ((gp-1 (zero? (logand (-> self message flags) 2))))
(while (or (and (nonzero? (-> self voice-id))
(let ((v1-34 (gui-control-method-17 *gui-control* (-> self voice-id))))
(or (= v1-34 (gui-action play)) (= v1-34 (gui-action playing)))
(let ((v1-34 (get-status *gui-control* (-> self voice-id))))
(or (= v1-34 (gui-status ready)) (= v1-34 (gui-status active)))
)
(begin
(dotimes (s5-2 4)
@@ -486,24 +484,21 @@
)
)
(and (nonzero? (-> self message-id))
(= (gui-control-method-17 *gui-control* (-> self message-id)) (gui-action playing))
(= (get-status *gui-control* (-> self message-id)) (gui-status active))
(or (< (- (-> self clock frame-counter) (-> self state-time)) (the-as time-frame (-> self message text-duration)))
(and (logtest? (-> self message flags) 16) (-> self region) (region-method-9 (-> self region) (target-pos 0)))
)
)
(< (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.05))
)
(when (and (nonzero? (-> self voice-id))
(not gp-1)
(zero? (gui-control-method-17 *gui-control* (-> self voice-id)))
)
(when (and (nonzero? (-> self voice-id)) (not gp-1) (zero? (get-status *gui-control* (-> self voice-id))))
(remove-setting! 'music-volume)
(remove-setting! 'sfx-volume)
(remove-setting! 'dialog-volume)
(set! gp-1 #t)
)
(when (and (nonzero? (-> self message-id))
(= (gui-control-method-17 *gui-control* (-> self message-id)) (gui-action playing))
(= (get-status *gui-control* (-> self message-id)) (gui-status active))
(not (paused?))
)
(if (logtest? (-> self message flags) 32)
goal_src/jak2/engine/camera/cam-debug.gc
+8 -8
View File
@@ -1109,9 +1109,9 @@
(else
(vector+float*! s5-1 s4-1 (the-as vector (-> arg0 tracking)) 2048.0)
(camera-line s4-1 s5-1 (new 'static 'vector4w :x #xff :w #x80))
(vector+float*! s5-1 s4-1 (the-as vector (&-> arg0 stack 96)) 2048.0)
(vector+float*! s5-1 s4-1 (-> arg0 tracking inv-mat vector 1) 2048.0)
(camera-line s4-1 s5-1 (new 'static 'vector4w :y #xff :w #x80))
(vector+float*! s5-1 s4-1 (the-as vector (&-> arg0 stack 112)) 2048.0)
(vector+float*! s5-1 s4-1 (-> arg0 tracking inv-mat vector 2) 2048.0)
(camera-line s4-1 s5-1 (new 'static 'vector4w :z #xff :w #x80))
)
)
@@ -1603,14 +1603,14 @@
(set! (-> *camera-combiner* trans quad) (-> arg0 quad))
(let* ((v1-6 (-> *camera-combiner* inv-camera-rot))
(a3-0 arg1)
(a0-3 (-> a3-0 vector 0 quad))
(a1-1 (-> a3-0 vector 1 quad))
(a2-0 (-> a3-0 vector 2 quad))
(a0-3 (-> a3-0 quad 0))
(a1-1 (-> a3-0 quad 1))
(a2-0 (-> a3-0 quad 2))
(a3-1 (-> a3-0 trans quad))
)
(set! (-> v1-6 vector 0 quad) a0-3)
(set! (-> v1-6 vector 1 quad) a1-1)
(set! (-> v1-6 vector 2 quad) a2-0)
(set! (-> v1-6 quad 0) a0-3)
(set! (-> v1-6 quad 1) a1-1)
(set! (-> v1-6 quad 2) a2-0)
(set! (-> v1-6 trans quad) a3-1)
)
(set-setting-by-param *setting-control* 'mode-name 'cam-fixed 0 0)
goal_src/jak2/engine/camera/cam-layout.gc
+28 -169
View File
@@ -19,10 +19,8 @@
;; this file is debug only
(declare-file (debug))
(when *debug-segment*
;; definition for symbol *camera-layout-blink*, type symbol
(define *camera-layout-blink* #f)
;; definition of type cam-layout-bank
(deftype cam-layout-bank (basic)
((spline-t float :offset-assert 4)
(spline-step float :offset-assert 8)
@@ -36,7 +34,7 @@
:flag-assert #x90000001c
)
;; definition for symbol *CAM_LAYOUT-bank*, type cam-layout-bank
(define *CAM_LAYOUT-bank* (new 'static 'cam-layout-bank
:spline-t 0.01
:spline-step 0.0016666667
@@ -47,10 +45,8 @@
)
)
;; definition for symbol *camera-layout-message-ypos*, type int
(define *camera-layout-message-ypos* 30)
;; definition of type clm-basic
(deftype clm-basic (basic)
()
:method-count-assert 9
@@ -58,7 +54,7 @@
:flag-assert #x900000004
)
;; definition of type clm-item-action
(deftype clm-item-action (structure)
((button uint64 :offset-assert 0)
(options uint64 :offset-assert 8)
@@ -74,7 +70,7 @@
:flag-assert #x90000001c
)
;; definition of type clm-item
(deftype clm-item (clm-basic)
((description string :offset-assert 4)
(button-symbol symbol :offset-assert 8)
@@ -85,7 +81,7 @@
:flag-assert #x90000002c
)
;; definition of type clm-list-item
(deftype clm-list-item (basic)
((description string :offset-assert 4)
(track-val symbol :offset-assert 8)
@@ -102,7 +98,7 @@
:flag-assert #x90000001c
)
;; definition of type clm-list
(deftype clm-list (clm-basic)
((tracker symbol :offset-assert 4)
(cur-list-item int32 :offset-assert 8)
@@ -113,7 +109,7 @@
:flag-assert #x900000010
)
;; definition of type clm
(deftype clm (basic)
((title string :offset-assert 4)
(items (array clm-basic) :offset-assert 8)
@@ -123,19 +119,15 @@
:flag-assert #x90000000c
)
;; definition for symbol *volume-point-current*, type int
(define *volume-point-current* 0)
;; definition for symbol *volume-point*, type vector-array
(define *volume-point* (new 'debug 'vector-array 1000))
;; definition for symbol *volume-normal-current*, type int
(define *volume-normal-current* 0)
;; definition for symbol *volume-normal*, type vector-array
(define *volume-normal* (new 'debug 'vector-array 600))
;; definition of type volume-descriptor-array
(deftype volume-descriptor-array (inline-array-class)
((data plane-volume :inline :dynamic :offset 16)
)
@@ -144,16 +136,13 @@
:flag-assert #x900000010
)
;; failed to figure out what this is:
(set! (-> volume-descriptor-array heap-base) (the-as uint 24))
;; definition for symbol *volume-descriptor-current*, type int
(define *volume-descriptor-current* 0)
;; definition for symbol *volume-descriptor*, type vol-control
(define *volume-descriptor* (the-as vol-control (new 'debug 'volume-descriptor-array 100)))
;; definition of type cam-layout
(deftype cam-layout (process)
((cam-entity entity-camera :offset-assert 128)
(num-entities int32 :offset-assert 132)
@@ -173,30 +162,17 @@
)
)
;; definition for function cam-layout-print
;; WARN: Failed store: (s.w! (+ v1-6 8) 0) at op 22
;; WARN: Failed store: (s.w! (+ v1-6 12) 0) at op 23
(defun cam-layout-print ((arg0 int) (arg1 int) (arg2 string))
(let* ((s5-0 (-> *display* frames (-> *display* on-screen) debug-buf))
(gp-0 (-> s5-0 base))
)
(with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) debug-buf))
(bucket-id debug2)
)
(draw-string-xy arg2 s5-0 arg0 arg1 (font-color #dadada) (font-flags shadow kerning))
(let ((a3-2 (-> s5-0 base)))
(let ((v1-6 (the-as object (-> s5-0 base))))
(set! (-> (the-as dma-packet v1-6) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
(set! (-> (the-as dma-packet v1-6) vif0) (new 'static 'vif-tag))
(set! (-> (the-as dma-packet v1-6) vif1) (new 'static 'vif-tag))
(set! (-> s5-0 base) (&+ (the-as pointer v1-6) 16))
)
(dma-bucket-insert-tag
(-> *display* frames (-> *display* on-screen) bucket-group)
(bucket-id debug2)
gp-0
(the-as (pointer dma-tag) a3-2)
)
)
)
)
;; definition for function cam-layout-intersect-dist
(defun cam-layout-intersect-dist ((arg0 vector) (arg1 vector) (arg2 vector))
(let ((f0-1 (vector-dot arg1 arg0))
(f1-1 (vector-dot arg2 arg0))
@@ -208,28 +184,6 @@
)
)
;; definition for function cam-layout-entity-volume-info-create
;; INFO: Used lq/sq
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: new jak 2 until loop case, check carefully
(defbehavior cam-layout-entity-volume-info-create cam-layout ((arg0 entity-camera) (arg1 symbol))
(local-vars
@@ -407,7 +361,6 @@
#f
)
;; definition for function cam-layout-entity-volume-info
(defbehavior cam-layout-entity-volume-info cam-layout ()
(dotimes (gp-0 (-> self num-volumes))
(cond
@@ -453,8 +406,6 @@
#f
)
;; definition for function v-slrp!
;; INFO: Used lq/sq
(defun v-slrp! ((arg0 vector) (arg1 vector) (arg2 vector) (arg3 float))
(let ((s2-0 (new-stack-vector0))
(s1-0 (new-stack-vector0))
@@ -484,7 +435,6 @@
)
)
;; definition of type interp-test-info
(deftype interp-test-info (structure)
((from vector :inline :offset-assert 0)
(to vector :inline :offset-assert 16)
@@ -498,8 +448,7 @@
:flag-assert #x90000003c
)
;; definition for function interp-test
;; INFO: Used lq/sq
(defun interp-test ((arg0 (function vector vector vector float vector float none)) (arg1 interp-test-info))
(let ((s3-0 (new-stack-vector0))
(s5-0 (new-stack-vector0))
@@ -521,8 +470,6 @@
(none)
)
;; definition for function interp-test-deg
;; INFO: Used lq/sq
(defun interp-test-deg ((arg0 (function vector vector vector vector float none)) (arg1 interp-test-info))
(let ((s3-0 (new-stack-vector0))
(s5-0 (new-stack-vector0))
@@ -544,8 +491,6 @@
(none)
)
;; definition for function cam-layout-entity-info
;; INFO: Used lq/sq
;; WARN: Function cam-layout-entity-info has a return type of none, but the expression builder found a return statement.
(defun cam-layout-entity-info ((arg0 entity-actor))
(if (not arg0)
@@ -807,7 +752,6 @@
(none)
)
;; definition for function clmf-button-test
(defun clmf-button-test ()
"Displays the message `button test`"
(cam-layout-print 16 *camera-layout-message-ypos* "button test")
@@ -816,7 +760,6 @@
#f
)
;; definition for function clmf-bna
(defun clmf-bna ()
"Displays the message `button not available`"
(cam-layout-print 16 *camera-layout-message-ypos* "button not applicable")
@@ -825,7 +768,6 @@
#t
)
;; definition for function clmf-implement
(defun clmf-implement ()
"Displays the message `button not implemented yet`"
(cam-layout-print 16 *camera-layout-message-ypos* "button not implemented yet")
@@ -834,8 +776,6 @@
#t
)
;; definition for function clmf-input
;; INFO: Used lq/sq
(defun clmf-input ((arg0 vector) (arg1 vector) (arg2 int))
(vector-reset! arg0)
(vector-reset! arg1)
@@ -882,8 +822,6 @@
arg1
)
;; definition for function clmf-pos-rot
;; INFO: Used lq/sq
(defbehavior clmf-pos-rot cam-layout ((arg0 symbol) (arg1 symbol))
(local-vars (s2-0 structure) (s3-1 vector) (sv-192 matrix))
(cam-layout-print 16 *camera-layout-message-ypos* "x/z pos: left stick, down: l1, up: r1")
@@ -910,10 +848,7 @@
res-tag
(make-u128
(logior (shl (shl #x8001 16) 32) (shr (shl (the-as int vector) 32) 32))
(the-as
res-tag
(logior (shl (-> (new 'static 'array uint64 1 #xce6e6b28) 0) 32) (shr (shl (the-as int arg0) 32) 32))
)
(the-as res-tag (logior (shl (the-as uint #xce6e6b28) 32) (shr (shl (the-as int arg0) 32) 32)))
)
)
(the-as pointer (new 'static 'vector4w))
@@ -942,7 +877,7 @@
res-tag
(make-u128
(the-as res-tag (logior (shl (shl #x8001 16) 32) (shr (shl (the-as int quaternion) 32) 32)))
(logior (shl (-> (new 'static 'array uint64 1 #xce6e6b28) 0) 32) (shr (shl (the-as int arg1) 32) 32))
(logior (shl (the-as uint #xce6e6b28) 32) (shr (shl (the-as int arg1) 32) 32))
)
)
(the-as pointer (quaternion-identity! (new 'static 'quaternion)))
@@ -995,7 +930,6 @@
#t
)
;; definition for function clmf-next-volume
(defbehavior clmf-next-volume cam-layout ((arg0 int))
(if (zero? (-> self num-volumes))
(return #f)
@@ -1007,7 +941,6 @@
#t
)
;; definition for function clmf-next-vol-dpad
(defun clmf-next-vol-dpad ()
(local-vars (a0-1 int))
(cam-layout-print 16 *camera-layout-message-ypos* "dpad selects volume")
@@ -1034,17 +967,14 @@
#t
)
;; definition for function clmf-to-edit-cam
(defun clmf-to-edit-cam ()
(clmf-next-volume 0)
(set! *clm* *clm-edit*)
#t
)
;; definition for symbol *last-cur-entity*, type int
(define *last-cur-entity* -1)
;; definition for function clmf-next-entity
(defbehavior clmf-next-entity cam-layout ((arg0 int))
(let ((v1-0 (/ arg0 8)))
(when (zero? (-> self num-entities))
@@ -1099,46 +1029,38 @@
#t
)
;; definition for function clmf-to-spline-attr
(defun clmf-to-spline-attr ()
(set! *clm* *clm-spline-attr*)
#t
)
;; definition for function clmf-to-intro-attr
(defun clmf-to-intro-attr ()
(set! *clm* *clm-intro-attr*)
#t
)
;; definition for function clmf-to-index-attr
(defun clmf-to-index-attr ()
(set! *clm* *clm-index-attr*)
#t
)
;; definition for function clmf-to-focalpull-attr
(defun clmf-to-focalpull-attr ()
(set! *clm* *clm-focalpull-attr*)
#t
)
;; definition for function clmf-to-edit
(defbehavior clmf-to-edit cam-layout ()
(set! (-> self res-key) -1000000000.0)
(set! *clm* *clm-edit*)
#t
)
;; definition for function clmf-to-select
(defun clmf-to-select ()
(set! *camera-layout-blink* #f)
(set! *clm* *clm-select*)
#t
)
;; definition for function clmf-look-through
;; INFO: Used lq/sq
(defbehavior clmf-look-through cam-layout ()
(set! (-> *camera-other-fov* data) (cam-slave-get-fov (-> self cam-entity)))
(cam-slave-get-vector-with-offset (the-as entity-actor (-> self cam-entity)) *camera-other-trans* 'trans)
@@ -1149,7 +1071,6 @@
#f
)
;; definition for function fov->maya
(defun fov->maya ((arg0 float))
(if (= arg0 0.0)
0.0
@@ -1157,7 +1078,6 @@
)
)
;; definition for function cam-layout-save-cam-rot
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-cam-rot ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((s3-0 (-> arg2 quat))
@@ -1183,8 +1103,6 @@
(none)
)
;; definition for function cam-layout-save-cam-trans
;; INFO: Used lq/sq
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-cam-trans ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((s1-0 (-> arg2 trans))
@@ -1255,8 +1173,6 @@
(none)
)
;; definition for function cam-layout-save-pivot
;; INFO: Used lq/sq
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-pivot ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((s2-0 (res-lump-struct arg2 'pivot vector))
@@ -1303,8 +1219,6 @@
(none)
)
;; definition for function cam-layout-save-align
;; INFO: Used lq/sq
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-align ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((s2-0 (res-lump-struct arg2 'align vector))
@@ -1351,8 +1265,6 @@
(none)
)
;; definition for function cam-layout-save-interesting
;; INFO: Used lq/sq
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-interesting ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((s2-0 (res-lump-struct arg2 'interesting vector))
@@ -1399,7 +1311,6 @@
(none)
)
;; definition for function cam-layout-save-fov
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-fov ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f28-0 (res-lump-float arg2 'fov))
@@ -1440,7 +1351,6 @@
(none)
)
;; definition for function cam-layout-save-focalpull
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-focalpull ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f30-0 (res-lump-float arg2 'focalPull))
@@ -1473,7 +1383,6 @@
(none)
)
;; definition for function cam-layout-save-flags
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-flags ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((s4-0 (res-lump-value arg2 'flags uint128 :time -1000000000.0))
@@ -1529,7 +1438,6 @@
(none)
)
;; definition for function cam-layout-save-focalpull-flags
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-focalpull-flags ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((s4-0 (res-lump-value arg2 'focalpull-flags uint128 :time -1000000000.0))
@@ -1585,7 +1493,6 @@
(none)
)
;; definition for function cam-layout-save-campoints-flags
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-campoints-flags ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((s4-0 (res-lump-value arg2 'campoints-flags uint128 :time -1000000000.0))
@@ -1641,7 +1548,6 @@
(none)
)
;; definition for function cam-layout-save-introsplinetime
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-introsplinetime ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f28-0 (res-lump-float arg2 'intro-time))
@@ -1682,7 +1588,6 @@
(none)
)
;; definition for function cam-layout-save-introsplineexitval
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-introsplineexitval ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f30-0 (res-lump-float arg2 'intro-exitValue))
@@ -1718,7 +1623,6 @@
(none)
)
;; definition for function cam-layout-save-interptime
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-interptime ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f30-0 (res-lump-float arg2 'interpTime))
@@ -1751,7 +1655,6 @@
(none)
)
;; definition for function cam-layout-save-splineoffset
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-splineoffset ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(when (and (not (res-lump-struct arg2 'pivot structure)) (res-lump-struct arg2 'spline-offset structure))
@@ -1773,7 +1676,6 @@
(none)
)
;; definition for function cam-layout-save-spline-follow-dist-offset
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-spline-follow-dist-offset ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f30-0 (res-lump-float arg2 'spline-follow-dist-offset)))
@@ -1787,7 +1689,6 @@
(none)
)
;; definition for function cam-layout-save-campointsoffset
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-campointsoffset ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((s5-0 (res-lump-struct arg2 'campoints-offset vector)))
@@ -1807,7 +1708,6 @@
(none)
)
;; definition for function cam-layout-save-tiltAdjust
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-tiltAdjust ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f30-0 (res-lump-float arg2 'tiltAdjust))
@@ -1840,7 +1740,6 @@
(none)
)
;; definition for function cam-layout-save-stringMinLength
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-stringMinLength ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f30-0 (res-lump-float arg2 'stringMinLength))
@@ -1873,7 +1772,6 @@
(none)
)
;; definition for function cam-layout-save-stringMaxLength
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-stringMaxLength ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f30-0 (res-lump-float arg2 'stringMaxLength))
@@ -1906,7 +1804,6 @@
(none)
)
;; definition for function cam-layout-save-stringMinHeight
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-stringMinHeight ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f30-0 (res-lump-float arg2 'stringMinHeight))
@@ -1939,7 +1836,6 @@
(none)
)
;; definition for function cam-layout-save-stringMaxHeight
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-stringMaxHeight ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f30-0 (res-lump-float arg2 'stringMaxHeight))
@@ -1972,7 +1868,6 @@
(none)
)
;; definition for function cam-layout-save-stringCliffHeight
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-stringCliffHeight ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f30-0 (res-lump-float arg2 'stringCliffHeight))
@@ -2005,7 +1900,6 @@
(none)
)
;; definition for function cam-layout-save-maxAngle
;; WARN: Return type mismatch object vs none.
(defun cam-layout-save-maxAngle ((arg0 symbol) (arg1 string) (arg2 entity-actor))
(let ((f30-0 (res-lump-float arg2 'maxAngle))
@@ -2038,7 +1932,6 @@
(none)
)
;; definition for function clmf-save-single
(defbehavior clmf-save-single cam-layout ((arg0 entity-camera) (arg1 symbol) (arg2 symbol))
(clear *temp-string*)
(if arg2
@@ -2079,7 +1972,6 @@
)
)
;; definition for function clmf-save-one
(defbehavior clmf-save-one cam-layout ((arg0 symbol))
(let ((s5-1 (logtest? (the-as int arg0) 8))
(gp-1 (logtest? (the-as int arg0) 16))
@@ -2098,7 +1990,6 @@
#t
)
;; definition for function clmf-save-all
(defbehavior clmf-save-all cam-layout ((arg0 symbol))
(let ((s5-1 (logtest? (the-as int arg0) 8))
(gp-1 (logtest? (the-as int arg0) 16))
@@ -2129,7 +2020,6 @@
#t
)
;; definition of type clmf-cam-flag-toggle-info
(deftype clmf-cam-flag-toggle-info (structure)
((key float :offset-assert 0)
(force-on int32 :offset-assert 4)
@@ -2140,7 +2030,7 @@
:flag-assert #x90000000c
)
;; definition for function clmf-cam-flag-toggle
(defbehavior clmf-cam-flag-toggle cam-layout ((arg0 int) (arg1 int))
(let ((s4-0 (/ arg0 8))
(gp-0 (new 'stack 'clmf-cam-flag-toggle-info))
@@ -2264,7 +2154,6 @@
#t
)
;; definition for function clmf-cam-flag
(defbehavior clmf-cam-flag cam-layout ((arg0 string) (arg1 uint) (arg2 uint))
(let ((s5-0 (/ (the-as int arg1) 8))
(f30-0 (-> self res-key))
@@ -2315,7 +2204,7 @@
)
(format arg0 ": on")
)
((zero? (logand ((method-of-type res-lump get-property-value)
((not (logtest? ((method-of-type res-lump get-property-value)
(-> self cam-entity)
(the-as symbol arg2)
'exact
@@ -2326,7 +2215,7 @@
)
s5-0
)
)
)
(format arg0 ": off(maya)")
)
(else
@@ -2338,7 +2227,6 @@
#t
)
;; definition for function clmf-cam-float-adjust
(defbehavior clmf-cam-float-adjust cam-layout ((arg0 symbol) (arg1 (pointer float)))
(cam-layout-print 16 *camera-layout-message-ypos* "left stick adjusts value")
(set! *camera-layout-message-ypos* (+ *camera-layout-message-ypos* 14))
@@ -2351,13 +2239,11 @@
(let ((f0-2 (+ f30-0 (analog-input (the-as int (-> *cpad-list* cpads 0 leftx)) 128.0 48.0 110.0 f0-0))))
(add-32bit-data!
(-> self cam-entity)
(the-as
res-tag
(make-u128
(the-as res-tag (logior (shl #x10000 32) (shr (shl (the-as int float) 32) 32)))
(logior (shl (-> (new 'static 'array uint64 1 #xce6e6b28) 0) 32) (shr (shl (the-as int arg0) 32) 32))
)
)
(the-as res-tag (make-u128
(the-as res-tag (logior (shl #x10000 32) (shr (shl (the-as int float) 32) 32)))
(logior (shl (the-as uint #xce6e6b28) 32) (shr (shl (the-as int arg0) 32) 32))
)
)
f0-2
)
)
@@ -2366,7 +2252,6 @@
#t
)
;; definition for function clmf-cam-meters
(defbehavior clmf-cam-meters cam-layout ((arg0 meters) (arg1 symbol))
(let ((f0-0 (cam-slave-get-float (-> self cam-entity) arg1 0.0)))
(format arg0 ": ~M" f0-0)
@@ -2374,19 +2259,16 @@
#t
)
;; definition for function clmf-cam-fov
(defbehavior clmf-cam-fov cam-layout ((arg0 degrees) (arg1 symbol))
(format arg0 ": ~R" (cam-slave-get-fov (-> self cam-entity)))
#t
)
;; definition for function clmf-cam-deg
(defbehavior clmf-cam-deg cam-layout ((arg0 degrees) (arg1 symbol))
(format arg0 ": ~R" (cam-slave-get-float (-> self cam-entity) arg1 0.0))
#t
)
;; definition for function clmf-cam-intro-time
(defbehavior clmf-cam-intro-time cam-layout ((arg0 float) (arg1 symbol))
(let ((f30-0 (cam-slave-get-intro-step (-> self cam-entity))))
(format arg0 ": ~f" (/ 0.016666668 f30-0))
@@ -2395,20 +2277,16 @@
#t
)
;; definition for function clmf-cam-interp-time
(defbehavior clmf-cam-interp-time cam-layout ((arg0 float) (arg1 symbol))
(format arg0 ": ~f" (cam-slave-get-interp-time (-> self cam-entity)))
#t
)
;; definition for function clmf-cam-float
(defbehavior clmf-cam-float cam-layout ((arg0 float) (arg1 symbol))
(format arg0 ": ~f" (cam-slave-get-float (-> self cam-entity) arg1 0.0))
#t
)
;; definition for function clmf-cam-string
;; INFO: Used lq/sq
(defbehavior clmf-cam-string cam-layout ((arg0 string) (arg1 symbol))
(local-vars (r0-0 uint128) (v1-5 uint128) (sv-16 int))
(format arg0 ":")
@@ -2431,7 +2309,6 @@
#t
)
;; definition for symbol *clm-focalpull-attr*, type clm
(define *clm-focalpull-attr*
(new 'static 'clm
:title "---focalpull attributes--"
@@ -2486,7 +2363,6 @@
)
)
;; definition for symbol *clm-index-attr*, type clm
(define *clm-index-attr*
(new 'static 'clm
:title "---index attributes--"
@@ -2541,7 +2417,6 @@
)
)
;; definition for symbol *clm-intro-attr*, type clm
(define *clm-intro-attr*
(new 'static 'clm
:title "---intro attributes--"
@@ -2592,7 +2467,6 @@
)
)
;; definition for symbol *clm-spline-attr*, type clm
(define *clm-spline-attr*
(new 'static 'clm
:title "---spline attributes--"
@@ -2629,7 +2503,6 @@
)
)
;; definition for symbol *clm-cam-attr*, type clm
(define *clm-cam-attr*
(new 'static 'clm
:title "---camera attributes--"
@@ -2931,7 +2804,6 @@
)
)
;; definition for symbol *clm-cam-lookthrough*, type clm
(define *clm-cam-lookthrough*
(new 'static 'clm
:title "---cam-lookthrough---"
@@ -2984,7 +2856,6 @@
)
)
;; definition for symbol *clm-edit*, type clm
(define *clm-edit*
(new 'static 'clm
:title "---edit---"
@@ -3116,7 +2987,6 @@
)
)
;; definition for symbol *clm-save-all*, type clm
(define *clm-save-all*
(new 'static 'clm
:title "---save all?---"
@@ -3140,7 +3010,6 @@
)
)
;; definition for symbol *clm-save-one*, type clm
(define *clm-save-one*
(new 'static 'clm
:title "---single save?---"
@@ -3164,7 +3033,6 @@
)
)
;; definition for symbol *clm-select*, type clm
(define *clm-select*
(new 'static 'clm
:title "---camera---"
@@ -3208,10 +3076,8 @@
)
)
;; definition for symbol *clm*, type clm
(define *clm* *clm-select*)
;; definition for function cam-layout-do-action
(defbehavior cam-layout-do-action cam-layout ((arg0 clm-item-action))
(let ((s5-0 (-> arg0 func value)))
(cond
@@ -3227,13 +3093,13 @@
((and (logtest? (-> arg0 options) 8) (logtest? (-> *cpad-list* cpads 0 button0-abs 0) (-> arg0 button)))
#f
)
((and (zero? (logand (-> arg0 options) 28))
((and (not (logtest? (-> arg0 options) 28))
(logtest? (-> arg0 options) 1)
(zero? (logand (-> *cpad-list* cpads 0 button0-rel 0) (-> arg0 button)))
)
#f
)
((and (zero? (logand (-> arg0 options) 29))
((and (not (logtest? (-> arg0 options) 29))
(zero? (logand (-> *cpad-list* cpads 0 button0-abs 0) (-> arg0 button)))
)
#f
@@ -3256,7 +3122,6 @@
)
)
;; definition for function cam-layout-function-call
(defbehavior cam-layout-function-call cam-layout ((arg0 symbol) (arg1 string) (arg2 int) (arg3 basic))
(let ((gp-0 (-> arg0 value)))
(cond
@@ -3272,7 +3137,6 @@
#f
)
;; definition for function cam-layout-do-menu
(defbehavior cam-layout-do-menu cam-layout ((arg0 clm))
(set! *camera-layout-message-ypos* 30)
(+! (-> *CAM_LAYOUT-bank* spline-t) (-> *CAM_LAYOUT-bank* spline-step))
@@ -3325,7 +3189,7 @@
(cam-layout-function-call
(-> s3-1 items s2-1 val-func)
*temp-string*
(the-as int (-> s3-1 items s2-1 val-parm0))
(-> s3-1 items s2-1 val-parm0)
(the-as basic (-> s3-1 items s2-1 val-parm1))
)
(cam-layout-print 320 s4-2 *temp-string*)
@@ -3418,7 +3282,6 @@
#f
)
;; failed to figure out what this is:
(defstate cam-layout-active (cam-layout)
:code (behavior ()
(until #f
@@ -3431,7 +3294,6 @@
)
)
;; definition for function cam-layout-init
(defbehavior cam-layout-init cam-layout ()
(set! (-> self res-key) -1000000000.0)
(set! (-> self num-entities) 0)
@@ -3453,13 +3315,11 @@
(go cam-layout-active)
)
;; definition for function cam-layout-stop
(defun cam-layout-stop ()
(set! *cam-layout* #f)
(kill-by-name "cam-layout" *active-pool*)
)
;; definition for function cam-layout-start
(defun cam-layout-start ()
(let ((a0-1 (new 'global 'file-stream "dd_next/caminfo/garbage" 'read)))
(file-stream-close a0-1)
@@ -3486,7 +3346,6 @@
*cam-layout*
)
;; definition for function cam-layout-restart
(defun cam-layout-restart ()
(cam-layout-stop)
(cam-layout-start)
goal_src/jak2/engine/camera/cam-update.gc
+12 -12
View File
@@ -224,20 +224,20 @@
(set! (-> a3-6 quad) (-> s5-2 bsp bsp-offset quad))
(cond
((zero? (-> s5-2 bsp cam-using-back))
(+! (-> a2-9 x) (the float (* (the-as int (-> v1-107 front-box-min x)) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a2-9 y) (the float (* (the-as int (-> v1-107 front-box-min y)) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a2-9 z) (the float (* (the-as int (-> v1-107 front-box-min z)) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a3-6 x) (the float (* (the-as int (-> v1-107 front-box-max x)) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a3-6 y) (the float (* (the-as int (-> v1-107 front-box-max y)) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a3-6 z) (the float (* (the-as int (-> v1-107 front-box-max z)) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a2-9 x) (the float (* (-> v1-107 front-box-min x) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a2-9 y) (the float (* (-> v1-107 front-box-min y) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a2-9 z) (the float (* (-> v1-107 front-box-min z) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a3-6 x) (the float (* (-> v1-107 front-box-max x) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a3-6 y) (the float (* (-> v1-107 front-box-max y) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a3-6 z) (the float (* (-> v1-107 front-box-max z) (the int (-> s5-2 bsp bsp-scale z)))))
)
(else
(+! (-> a2-9 x) (the float (* (the-as int (-> v1-107 back-box-min x)) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a2-9 y) (the float (* (the-as int (-> v1-107 back-box-min y)) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a2-9 z) (the float (* (the-as int (-> v1-107 back-box-min z)) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a3-6 x) (the float (* (the-as int (-> v1-107 back-box-max x)) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a3-6 y) (the float (* (the-as int (-> v1-107 back-box-max y)) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a3-6 z) (the float (* (the-as int (-> v1-107 back-box-max z)) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a2-9 x) (the float (* (-> v1-107 back-box-min x) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a2-9 y) (the float (* (-> v1-107 back-box-min y) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a2-9 z) (the float (* (-> v1-107 back-box-min z) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a3-6 x) (the float (* (-> v1-107 back-box-max x) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a3-6 y) (the float (* (-> v1-107 back-box-max y) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a3-6 z) (the float (* (-> v1-107 back-box-max z) (the int (-> s5-2 bsp bsp-scale z)))))
)
)
(add-debug-box #t (bucket-id debug2) a2-9 a3-6 (new 'static 'rgba :g #xff :b #xff :a #x80))
goal_src/jak2/engine/collide/collide-shape-rider.gc
+1 -16
View File
@@ -7,7 +7,6 @@
;; DECOMP BEGINS
;; definition for method 39 of type collide-shape
(defmethod on-platform collide-shape ((obj collide-shape) (arg0 collide-shape) (arg1 collide-query))
(let ((v1-0 arg1))
(set! (-> v1-0 best-dist) 0.0)
@@ -38,20 +37,17 @@
(< (-> arg1 best-dist) 122.88)
)
;; definition for method 17 of type collide-shape-prim
;; WARN: Return type mismatch object vs none.
(defmethod on-platform-test collide-shape-prim ((obj collide-shape-prim) (arg0 collide-shape-prim) (arg1 collide-query) (arg2 float))
(format 0 "ERROR: collide-shape-prim::on-platform-test was called illegally!~%")
(none)
)
;; definition for method 17 of type collide-shape-prim-group
;; WARN: Return type mismatch int vs none.
(defmethod on-platform-test collide-shape-prim-group ((obj collide-shape-prim-group) (arg0 collide-shape-prim) (arg1 collide-query) (arg2 float))
(let ((s4-0 (-> arg0 prim-core collide-as))
(s3-0 (-> obj child 0))
)
(countdown (s2-0 (the-as uint (-> obj num-children)))
(countdown (s2-0 (-> obj num-children))
(when (and (logtest? (-> s3-0 prim-core collide-with) s4-0)
(logtest? (-> s3-0 prim-core action) (collide-action rideable))
)
@@ -74,8 +70,6 @@
(none)
)
;; definition for method 17 of type collide-shape-prim-mesh
;; INFO: Used lq/sq
;; WARN: Return type mismatch pat-surface vs none.
(defmethod on-platform-test collide-shape-prim-mesh ((obj collide-shape-prim-mesh) (arg0 collide-shape-prim) (arg1 collide-query) (arg2 float))
(case (-> arg0 type)
@@ -141,7 +135,6 @@
(none)
)
;; definition for method 9 of type collide-rider-pool
(defmethod add-rider collide-rider-pool ((obj collide-rider-pool) (arg0 handle))
(let ((v1-0 (-> obj alloc-count)))
(cond
@@ -161,7 +154,6 @@
)
)
;; definition for method 35 of type collide-shape
;; WARN: Return type mismatch joint-control-status vs symbol.
(defmethod detect-riders! collide-shape ((obj collide-shape))
(local-vars (v0-7 joint-control-status) (a2-5 float) (a2-12 float))
@@ -319,7 +311,6 @@
)
)
;; definition for method 44 of type collide-shape
;; WARN: Return type mismatch int vs symbol.
(defmethod pull-riders! collide-shape ((obj collide-shape))
(let ((s5-0 (-> obj riders)))
@@ -355,8 +346,6 @@
(the-as symbol 0)
)
;; definition for method 43 of type collide-shape
;; INFO: Used lq/sq
;; WARN: Return type mismatch object vs none.
(defmethod pull-rider! collide-shape ((obj collide-shape) (arg0 pull-rider-info))
(local-vars (at-0 int))
@@ -438,7 +427,3 @@
)
)
)
goal_src/jak2/engine/common_objs/plat.gc
+1 -9
View File
@@ -272,15 +272,7 @@
)
:trans (the-as (function none :behavior drop-plat) plat-trans)
:code (behavior ()
(gui-control-method-9
*gui-control*
self
(gui-channel art-load)
(gui-action queue)
(-> self anim name)
-99.0
0
)
(add-process *gui-control* self (gui-channel art-load) (gui-action queue) (-> self anim name) -99.0 0)
(until #f
(when (not (-> self bouncing))
(logior! (-> self mask) (process-mask sleep-code))
goal_src/jak2/engine/debug/editable.gc
+4 -4
View File
@@ -125,7 +125,7 @@
(format (clear *temp-string*) "region-~D~%" (-> obj id))
(s3-0 s2-0 (the-as bucket-id s1-0) *temp-string* arg0 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
(when (>= arg1 1)
(let ((s4-1 (-> obj on-enter)))
(when s4-1
@@ -136,7 +136,7 @@
(format (clear *temp-string*) "(on-enter ~S)" s4-1)
(s3-1 s2-1 (the-as bucket-id s1-1) *temp-string* arg0 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
(let ((s4-2 (-> obj on-inside)))
@@ -148,7 +148,7 @@
(format (clear *temp-string*) "(on-inside ~S)" s4-2)
(s3-2 s2-2 (the-as bucket-id s1-2) *temp-string* arg0 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
(let ((s5-1 (-> obj on-exit)))
@@ -160,7 +160,7 @@
(format (clear *temp-string*) "(on-exit ~S)" s5-1)
(s4-3 s3-3 (the-as bucket-id s2-3) *temp-string* arg0 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
)
goal_src/jak2/engine/game/fact-h.gc
+1 -1
View File
@@ -368,7 +368,7 @@
:flag-assert #xd00000110
(:methods
(new (symbol type process-drawable pickup-type float) _type_ 0)
(get-gun-ammo (_type_ target) float 12)
(get-gun-ammo (_type_) float 12)
)
)
goal_src/jak2/engine/game/game-info-h.gc
+1 -1
View File
@@ -315,7 +315,7 @@
(race-total-lap-count int32 :offset-assert 508)
(race-position int32 :offset-assert 512)
(race-number-turbos int32 :offset-assert 516)
(bot-health uint32 3 :offset-assert 520)
(bot-health float 3 :offset-assert 520)
(demo-state uint32 :offset-assert 532)
(wanted-flash basic :offset-assert 536)
(distance float :offset-assert 540)
goal_src/jak2/engine/game/game-info.gc
+12 -15
View File
@@ -886,24 +886,21 @@
(let ((s3-0 (new 'stack-no-clear 'vector4w)))
(set! (-> s3-0 quad) (the-as uint128 0))
(when (transform-point-qword! s3-0 (the-as vector arg0))
(let ((s5-0
(new
'stack
'font-context
*font-default-matrix*
(+ (the int (/ (the float (+ (/ (the-as int (-> s3-0 x)) 16) -1792)) (-> *video-params* relative-x-scale)))
-48
)
(the-as int (+ (/ (the-as int (-> s3-0 y)) 16) -1855))
0.0
(font-color gold-#ba9200)
(font-flags shadow kerning)
)
)
(let ((s5-0 (new
'stack
'font-context
*font-default-matrix*
(+ (the int (/ (the float (+ (/ (-> s3-0 x) 16) -1792)) (-> *video-params* relative-x-scale))) -48)
(+ (/ (-> s3-0 y) 16) -1855)
0.0
(font-color gold-#ba9200)
(font-flags shadow kerning)
)
)
)
(set! (-> s5-0 scale) (lerp-scale 0.6 1.0 (the-as float arg1) 50.0 8000.0))
(let ((v1-9 s5-0))
(set! (-> v1-9 origin z) (the float (/ (the-as int (-> s3-0 z)) 16)))
(set! (-> v1-9 origin z) (the float (/ (-> s3-0 z) 16)))
)
(set! (-> s5-0 flags) (font-flags shadow kerning large))
(let ((s3-1 (-> self clock frame-counter)))
goal_src/jak2/engine/game/game-save.gc
+8 -3
View File
@@ -1624,7 +1624,7 @@
(notify handle :offset-assert 456)
(force symbol :offset-assert 464)
(state-time time-frame :offset-assert 472)
(icon hud-sprite :inline :offset-assert 480)
(icon hud-sprite :inline :offset 480)
)
:heap-base #x1a0
:method-count-assert 23
@@ -1714,7 +1714,7 @@
(with-dma-buffer-add-bucket ((s5-3 (-> *display* frames (-> *display* on-screen) global-buf))
(bucket-id progress)
)
(hud-sprite-method-9 (-> self icon) s5-3 (-> self level))
(draw (-> self icon) s5-3 (-> self level))
)
)
)
@@ -1757,7 +1757,12 @@ auto-save-post
)
)
(set! (-> *setting-control* user-default auto-save) #f)
(set-vector! (-> self icon color) 128 128 128 128)
(let ((v1-51 (-> self icon color2)))
(set! (-> v1-51 0) 128)
(set! (-> v1-51 1) 128)
(set! (-> v1-51 2) 128)
(set! (-> v1-51 3) 128)
)
(set! (-> self icon pos x) 440)
(set! (-> self icon pos y) 200)
(set! (-> self icon pos z) #xffffff)
goal_src/jak2/engine/game/task/task-control.gc
+5 -11
View File
@@ -1415,7 +1415,7 @@
(defmethod print-text fail-mission ((obj fail-mission))
(when (and (not (logtest? (-> obj flags) (fail-mission-flags famflags-6)))
(= (gui-control-method-17 *gui-control* (the-as sound-id (-> obj message-id))) (gui-action playing))
(= (get-status *gui-control* (the-as sound-id (-> obj message-id))) (gui-status active))
)
(let ((gp-0 (new
'stack
@@ -1748,7 +1748,7 @@
(set! (-> self fail-message) (the-as uint (-> arg0 fail-message)))
(set-setting! 'allow-continue #f 0 0)
(set-setting! 'minimap 'clear 0 128)
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -1758,7 +1758,7 @@
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -1771,10 +1771,7 @@
(when (not (logtest? (-> arg0 flags) (fail-mission-flags famflags-4)))
(if (not (and *target* (logtest? (-> *target* focus-status) (focus-status dead)) (zero? (-> self message))))
(set! (-> self stinger)
(the-as
uint
(gui-control-method-9 *gui-control* *target* (gui-channel background) (gui-action play) "lose1" -99.0 0)
)
(the-as uint (add-process *gui-control* *target* (gui-channel background) (gui-action play) "lose1" -99.0 0))
)
)
)
@@ -1788,10 +1785,7 @@
(= (-> self message) (fail-mission-message fammsg-1))
)
(set! (-> self message-id)
(the-as
uint
(gui-control-method-9 *gui-control* self (gui-channel supertitle) (gui-action play) "fail" 81920.0 0)
)
(the-as uint (add-process *gui-control* self (gui-channel supertitle) (gui-action play) "fail" 81920.0 0))
)
)
(go-virtual idle)
goal_src/jak2/engine/gfx/foreground/foreground.gc
+6
View File
@@ -13,6 +13,12 @@
)
;; todo hack
(defun foreground-draw-hud ((a draw-control) (b dma-buffer) (c float))
(none)
)
;; DECOMP BEGINS
(define foreground-vu0-block (new 'static 'vu-function :length 9 :qlength 5))
goal_src/jak2/engine/gfx/lights.gc
+3 -19
View File
@@ -48,6 +48,7 @@
arg0
)
;; WARN: Return type mismatch pointer vs none.
(defun-debug init-light-hash ()
(when (not *light-hash*)
(set! *light-hash* (new 'loading-level 'light-hash))
@@ -65,16 +66,10 @@
(init-light-hash)
;; definition (debug) for function light-hash-count-items
;; ERROR: function was not converted to expressions. Cannot decompile.
(def-mips2c light-hash-count-items (function light-hash light-sphere none))
;; definition (debug) for function light-hash-add-items
;; ERROR: function was not converted to expressions. Cannot decompile.
(def-mips2c light-hash-add-items (function light-hash light-sphere integer object))
(defun-debug reset-light-hash ((arg0 light-hash))
(set! (-> *light-hash* num-lights) (the-as uint 0))
(set! (-> *light-hash* num-indices) (the-as uint 0))
@@ -120,9 +115,7 @@
(set! (-> arg0 dimension-array z) (max 1 (min 16 (the int (+ 0.5 (* f0-5 (-> s4-0 z)))))))
)
)
(set! (-> arg0 bucket-step 0)
(the-as uint (* (the-as int (-> arg0 dimension-array z)) (the-as int (-> arg0 dimension-array x))))
)
(set! (-> arg0 bucket-step 0) (the-as uint (* (-> arg0 dimension-array z) (-> arg0 dimension-array x))))
(set! (-> arg0 bucket-step 1) (the-as uint (-> arg0 dimension-array x)))
(dotimes (v1-13 3)
(set! (-> arg0 axis-scale data v1-13)
@@ -131,10 +124,7 @@
)
)
(set! (-> arg0 num-buckets)
(the-as uint (* (* (the-as int (-> arg0 dimension-array x)) (the-as int (-> arg0 dimension-array y)))
(the-as int (-> arg0 dimension-array z))
)
)
(the-as uint (* (* (-> arg0 dimension-array x) (-> arg0 dimension-array y)) (-> arg0 dimension-array z)))
)
(dotimes (v1-19 (the-as int (-> arg0 num-buckets)))
(let ((a0-27 (-> arg0 bucket-array v1-19)))
@@ -179,10 +169,4 @@
(def-mips2c light-hash-get-bucket-index (function light-hash vector int))
;; definition for function add-light-sphere-to-light-group
;; ERROR: function was not converted to expressions. Cannot decompile.
(def-mips2c add-light-sphere-to-light-group (function object object object object object))
goal_src/jak2/engine/level/region.gc
+4 -4
View File
@@ -96,7 +96,7 @@
(format (clear *temp-string*) "region-~D~%" (-> obj region id))
(s5-0 s4-0 (the-as bucket-id s3-0) *temp-string* sv-36 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
(let ((s5-1 (-> obj region on-enter)))
(when s5-1
(let ((s4-1 add-debug-text-3d)
@@ -106,7 +106,7 @@
(format (clear *temp-string*) "(on-enter ~S)" s5-1)
(s4-1 s3-1 (the-as bucket-id s2-1) *temp-string* sv-36 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
(let ((s5-2 (-> obj region on-inside)))
@@ -118,7 +118,7 @@
(format (clear *temp-string*) "(on-inside ~S)" s5-2)
(s4-2 s3-2 (the-as bucket-id s2-2) *temp-string* sv-36 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
(let ((gp-1 (-> obj region on-exit)))
@@ -130,7 +130,7 @@
(format (clear *temp-string*) "(on-exit ~S)" gp-1)
(s5-3 s4-3 (the-as bucket-id s3-3) *temp-string* sv-36 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
)
goal_src/jak2/engine/load/loader.gc
+91 -90
View File
@@ -802,7 +802,7 @@
(set! (-> s5-0 paused?) #f)
)
(let ((v1-7
(gui-control-method-15 *gui-control* self (gui-channel art-load) (-> gp-0 anim name) (new 'static 'sound-id))
(lookup-gui-connection *gui-control* self (gui-channel art-load) (-> gp-0 anim name) (new 'static 'sound-id))
)
)
(if v1-7
@@ -817,7 +817,7 @@
(talker-surpress!)
(apply-settings *setting-control*)
(when (or (and (-> *setting-control* user-current spooling)
(or (< 2 (the-as int (-> gp-0 anim parts)))
(or (< 2 (-> gp-0 anim parts))
(not (string= (-> *setting-control* user-current spool-anim name) (-> gp-0 anim name)))
)
)
@@ -836,7 +836,7 @@
)
)
(while (or (and (-> *setting-control* user-current spooling)
(or (< 2 (the-as int (-> gp-0 anim parts)))
(or (< 2 (-> gp-0 anim parts))
(not (string= (-> *setting-control* user-current spool-anim name) (-> gp-0 anim name)))
)
)
@@ -867,7 +867,7 @@
(set-setting! 'spool-anim (-> gp-0 anim) 0 0)
(apply-settings *setting-control*)
(set! (-> gp-0 old-time) (-> self clock frame-counter))
(while (< (-> gp-0 part) (the-as int (-> gp-0 anim parts)))
(while (< (-> gp-0 part) (-> gp-0 anim parts))
(when (> (-> gp-0 part) 0)
(while (let ((v1-99 (file-status *art-control* (-> gp-0 anim name) (-> gp-0 part))))
(not (or (= v1-99 'active) (= v1-99 'locked)))
@@ -1033,7 +1033,7 @@
-20.0
(-> gp-0 sid)
)
(if (< (+ (-> gp-0 part) 1) (the-as int (-> gp-0 anim parts)))
(if (< (+ (-> gp-0 part) 1) (-> gp-0 anim parts))
(gui-control-method-12
*gui-control*
self
@@ -1099,7 +1099,7 @@
(defbehavior ja-abort-spooled-anim process-drawable ((arg0 spool-anim) (arg1 art-joint-anim) (arg2 int))
(let ((s3-0 (new 'static 'sound-id)))
(let ((v1-1
(gui-control-method-15 *gui-control* self (gui-channel art-load) (-> arg0 name) (new 'static 'sound-id))
(lookup-gui-connection *gui-control* self (gui-channel art-load) (-> arg0 name) (new 'static 'sound-id))
)
)
(when v1-1
@@ -1339,28 +1339,28 @@
(let ((s5-0 format)
(s4-0 #t)
(s3-0 " ~6S <@ #x~A>")
(v1-3 (gui-control-method-17 *gui-control* (-> obj id)))
(v1-3 (get-status *gui-control* (-> obj id)))
)
(s5-0
s4-0
s3-0
(cond
((= v1-3 (gui-action play))
((= v1-3 (gui-status ready))
"ready"
)
((= v1-3 (gui-action playing))
((= v1-3 (gui-status active))
"active"
)
((= v1-3 (gui-action stopping))
((= v1-3 (gui-status stop))
"stop"
)
((= v1-3 (gui-action none))
((= v1-3 (gui-status unknown))
"unknown"
)
((= v1-3 (gui-action stop))
((= v1-3 (gui-status hide))
"hide"
)
((= v1-3 (gui-action queue))
((= v1-3 (gui-status pending))
"pending"
)
(else
@@ -1378,7 +1378,7 @@
0
)
(defmethod gui-control-method-15 gui-control ((obj gui-control) (arg0 process) (arg1 gui-channel) (arg2 string) (arg3 sound-id))
(defmethod lookup-gui-connection gui-control ((obj gui-control) (arg0 process) (arg1 gui-channel) (arg2 string) (arg3 sound-id))
(let ((s1-0 (the-as gui-connection (-> obj engine alive-list next0))))
(-> obj engine)
(let ((s0-0 (-> s1-0 next0)))
@@ -1412,7 +1412,7 @@
(the-as gui-connection #f)
)
(defmethod gui-control-method-14 gui-control ((obj gui-control) (arg0 string) (arg1 gui-channel) (arg2 gui-action))
(defmethod lookup-gui-connection-id gui-control ((obj gui-control) (arg0 string) (arg1 gui-channel) (arg2 gui-action))
(let ((s2-0 (the-as gui-connection (-> obj engine alive-list next0))))
(-> obj engine)
(let ((s1-0 (-> s2-0 next0)))
@@ -1443,23 +1443,23 @@
0
)
(defmethod gui-control-method-20 gui-control ((obj gui-control) (arg0 sound-id) (arg1 symbol) (arg2 int) (arg3 int) (arg4 int))
(defmethod set-falloff! gui-control ((obj gui-control) (arg0 sound-id) (arg1 symbol) (arg2 int) (arg3 int) (arg4 int))
(when (nonzero? arg0)
(let ((v1-2 (gui-control-method-15 *gui-control* (the-as process #f) (gui-channel none) (the-as string #f) arg0)))
(let ((v1-2 (lookup-gui-connection *gui-control* (the-as process #f) (gui-channel none) (the-as string #f) arg0)))
(when v1-2
(if arg1
(logior! (-> v1-2 flags) 2)
(logior! (-> v1-2 flags) (gui-connection-flags gcf1))
)
(when (>= arg2 0)
(logior! (-> v1-2 flags) 8)
(logior! (-> v1-2 flags) (gui-connection-flags fo-min))
(set! (-> v1-2 fo-min) arg2)
)
(when (>= arg3 0)
(logior! (-> v1-2 flags) 16)
(logior! (-> v1-2 flags) (gui-connection-flags fo-max))
(set! (-> v1-2 fo-max) arg3)
)
(when (>= arg4 0)
(logior! (-> v1-2 flags) 4)
(logior! (-> v1-2 flags) (gui-connection-flags fo-curve))
(set! (-> v1-2 fo-curve) arg4)
)
v1-2
@@ -1491,21 +1491,21 @@
)
)
(defmethod gui-control-method-23 gui-control ((obj gui-control) (arg0 gui-channel) (arg1 gui-channel) (arg2 symbol) (arg3 gui-connection))
(defmethod handle-command gui-control ((obj gui-control) (arg0 gui-channel) (arg1 gui-channel) (arg2 symbol) (arg3 gui-connection))
(let ((s5-0 (-> obj ids arg1)))
(cond
((nonzero? s5-0)
(case arg2
(('wait)
(if (nonzero? (gui-control-method-17 obj s5-0))
(if (nonzero? (get-status obj s5-0))
(return #f)
)
)
(('stop 'priority-stop)
(when (nonzero? (-> obj ids arg1))
(let ((s2-0 (gui-control-method-15 obj (the-as process #f) arg1 (the-as string #f) s5-0)))
(let ((s2-0 (lookup-gui-connection obj (the-as process #f) arg1 (the-as string #f) s5-0)))
(when (and s2-0 (or (= arg2 'priority) (= s2-0 arg3) (and arg3 (< (-> arg3 priority) (-> s2-0 priority)))))
(gui-control-method-11 obj s2-0)
(stop-str obj s2-0)
(cond
((= (shr (the-as int arg1) 4) 5)
(set! (-> obj times arg1)
@@ -1523,14 +1523,14 @@
)
)
)
(if (nonzero? (gui-control-method-17 obj s5-0))
(if (nonzero? (get-status obj s5-0))
(return #f)
)
)
(('hide)
(let ((v1-34 (gui-control-method-15 obj (the-as process #f) arg1 (the-as string #f) s5-0)))
(let ((v1-34 (lookup-gui-connection obj (the-as process #f) arg1 (the-as string #f) s5-0)))
(when (and v1-34 (!= (-> v1-34 action) 8))
(gui-control-method-16
(set-action!
obj
(gui-action hide)
s5-0
@@ -1545,7 +1545,7 @@
)
)
)
(if (nonzero? (gui-control-method-17 obj s5-0))
(if (nonzero? (get-status obj s5-0))
(return #f)
)
)
@@ -1561,7 +1561,7 @@
#t
)
(defmethod gui-control-method-19 gui-control ((obj gui-control) (arg0 gui-channel) (arg1 gui-connection))
(defmethod handle-command-list gui-control ((obj gui-control) (arg0 gui-channel) (arg1 gui-connection))
(local-vars (sv-16 int) (sv-32 int) (sv-48 int))
(let ((gp-0 #t))
(cond
@@ -1581,7 +1581,7 @@
(let ((s0-0 80))
(set! sv-16 90)
(while (>= (the-as uint sv-16) (the-as uint s0-0))
(if (not (gui-control-method-23 obj arg0 (the-as gui-channel s0-0) (the-as symbol s1-0) arg1))
(if (not (handle-command obj arg0 (the-as gui-channel s0-0) (the-as symbol s1-0) arg1))
(set! gp-0 #f)
)
(+! s0-0 1)
@@ -1592,7 +1592,7 @@
(let ((s0-1 66))
(set! sv-32 70)
(while (>= (the-as uint sv-32) (the-as uint s0-1))
(if (not (gui-control-method-23 obj arg0 (the-as gui-channel s0-1) (the-as symbol s1-0) arg1))
(if (not (handle-command obj arg0 (the-as gui-channel s0-1) (the-as symbol s1-0) arg1))
(set! gp-0 #f)
)
(+! s0-1 1)
@@ -1603,7 +1603,7 @@
(let ((s0-2 18))
(set! sv-48 32)
(while (>= (the-as uint sv-48) (the-as uint s0-2))
(if (not (gui-control-method-23 obj arg0 (the-as gui-channel s0-2) (the-as symbol s1-0) arg1))
(if (not (handle-command obj arg0 (the-as gui-channel s0-2) (the-as symbol s1-0) arg1))
(set! gp-0 #f)
)
(+! s0-2 1)
@@ -1611,7 +1611,7 @@
)
)
(else
(if (not (gui-control-method-23 obj arg0 a2-1 (the-as symbol s1-0) arg1))
(if (not (handle-command obj arg0 a2-1 (the-as symbol s1-0) arg1))
(set! gp-0 #f)
)
)
@@ -1627,11 +1627,11 @@
)
)
;; WARN: Return type mismatch int vs gui-action.
(defmethod gui-control-method-17 gui-control ((obj gui-control) (arg0 sound-id))
;; WARN: Return type mismatch int vs gui-status.
(defmethod get-status gui-control ((obj gui-control) (arg0 sound-id))
(let ((gp-0 (the-as gui-connection #f)))
(if (zero? arg0)
(return (gui-action none))
(return (gui-status unknown))
)
(let ((v1-4 (-> obj engine alive-list next0)))
(-> obj engine)
@@ -1658,14 +1658,14 @@
)
(label cfg-15)
(the-as
gui-action
gui-status
(cond
((= (-> gp-0 channel) (gui-channel movie))
(cond
((= (-> gp-0 id) (-> obj ids (-> gp-0 channel)))
3
)
((gui-control-method-19 obj (-> gp-0 channel) gp-0)
((handle-command-list obj (-> gp-0 channel) gp-0)
2
)
(else
@@ -1693,16 +1693,16 @@
)
(cond
((logtest? (-> *sound-iop-info* stream-status s4-0) (stream-status ststatus-four))
(return (gui-action playing))
(return (gui-status active))
)
((logtest? (-> *sound-iop-info* stream-status s4-0) (stream-status ststatus-nine))
(return (gui-action stopping))
(return (gui-status stop))
)
((or (= (-> gp-0 id) (-> obj ids (-> gp-0 channel))) (gui-control-method-19 obj (-> gp-0 channel) gp-0))
(return (gui-action play))
((or (= (-> gp-0 id) (-> obj ids (-> gp-0 channel))) (handle-command-list obj (-> gp-0 channel) gp-0))
(return (gui-status ready))
)
(else
(return (gui-action queue))
(return (gui-status pending))
)
)
(the-as none 0)
@@ -1728,7 +1728,7 @@
3
)
)
((gui-control-method-19 obj (-> gp-0 channel) gp-0)
((handle-command-list obj (-> gp-0 channel) gp-0)
2
)
(else
@@ -1743,7 +1743,7 @@
((= (-> gp-0 id) (-> obj ids (-> gp-0 channel)))
3
)
((gui-control-method-19 obj (-> gp-0 channel) gp-0)
((handle-command-list obj (-> gp-0 channel) gp-0)
2
)
(else
@@ -1761,15 +1761,15 @@
)
)
(defmethod gui-control-method-16 gui-control ((obj gui-control)
(arg0 gui-action)
(arg1 sound-id)
(arg2 gui-channel)
(arg3 gui-action)
(arg4 string)
(arg5 (function gui-connection symbol))
(arg6 process)
)
(defmethod set-action! gui-control ((obj gui-control)
(arg0 gui-action)
(arg1 sound-id)
(arg2 gui-channel)
(arg3 gui-action)
(arg4 string)
(arg5 (function gui-connection symbol))
(arg6 process)
)
(local-vars (sv-16 gui-action) (sv-17 gui-action) (sv-20 string) (sv-24 (function gui-connection symbol)))
(set! sv-16 arg0)
(set! sv-17 arg3)
@@ -1794,7 +1794,7 @@
)
(else
(set! (-> s1-0 action) sv-16)
(if (and (= sv-16 'play) (gui-control-method-19 obj (-> s1-0 channel) s1-0))
(if (and (= sv-16 'play) (handle-command-list obj (-> s1-0 channel) s1-0))
(channel-id-set! obj s1-0 (-> s1-0 id))
)
)
@@ -1810,14 +1810,14 @@
)
;; WARN: Return type mismatch int vs sound-id.
(defmethod gui-control-method-9 gui-control ((obj gui-control)
(arg0 process)
(arg1 gui-channel)
(arg2 gui-action)
(arg3 string)
(arg4 float)
(arg5 time-frame)
)
(defmethod add-process gui-control ((obj gui-control)
(arg0 process)
(arg1 gui-channel)
(arg2 gui-action)
(arg3 string)
(arg4 float)
(arg5 time-frame)
)
(local-vars
(sv-16 int)
(sv-20 gui-connection)
@@ -1870,7 +1870,7 @@
(set! (-> sv-32 action) arg2)
(set! (-> sv-32 param2) (the-as int arg3))
(set! (-> sv-32 hold-time) arg5)
(set! (-> sv-32 flags) (the-as uint 1))
(set! (-> sv-32 flags) (gui-connection-flags gcf0))
(set! (-> sv-32 fade) (the-as uint 0))
(the-as int (-> (the-as gui-connection sv-32) id))
)
@@ -1882,7 +1882,7 @@
)
)
(defmethod gui-control-method-10 gui-control ((obj gui-control) (arg0 process) (arg1 gui-channel))
(defmethod remove-process gui-control ((obj gui-control) (arg0 process) (arg1 gui-channel))
(let ((s3-0 (the-as gui-connection (-> obj engine alive-list next0))))
(-> obj engine)
(let ((s2-0 (-> s3-0 next0)))
@@ -1946,7 +1946,7 @@
(when (or (zero? (-> a0-15 id)) (not (handle->process (-> a0-15 handle))))
(set! sv-16 a0-15)
(set! (-> sv-16 param3) 0)
(set! (-> sv-16 flags) (the-as uint 0))
(set! (-> sv-16 flags) (gui-connection-flags))
(goto cfg-44)
)
)
@@ -1956,7 +1956,7 @@
(sv-16
(when (zero? (-> (the-as gui-connection sv-16) id))
(when (zero? sv-20)
(let ((v1-46 (gui-control-method-15 obj arg0 arg1 arg3 (new 'static 'sound-id))))
(let ((v1-46 (lookup-gui-connection obj arg0 arg1 arg3 (new 'static 'sound-id))))
(if v1-46
(set! sv-20 (the-as int (-> v1-46 id)))
)
@@ -2072,10 +2072,10 @@
0
)
(defmethod gui-control-method-11 gui-control ((obj gui-control) (arg0 gui-connection))
(defmethod stop-str gui-control ((obj gui-control) (arg0 gui-connection))
(case (shr (the-as int (-> arg0 channel)) 4)
((1 2)
(if (= (gui-control-method-17 obj (-> arg0 id)) (gui-action playing))
(if (= (get-status obj (-> arg0 id)) (gui-status active))
(str-play-stop (-> arg0 name) (-> arg0 id))
)
)
@@ -2095,7 +2095,9 @@
(case (-> arg0 action)
(((gui-action queue))
(spool-push *art-control* (-> arg0 name) (the-as int (-> arg0 anim-part)) arg1 (-> arg0 priority))
(if (and (logtest? (-> arg0 flags) 1) (= (gui-control-method-17 obj (-> arg0 id)) (gui-action playing)))
(if (and (logtest? (-> arg0 flags) (gui-connection-flags gcf0))
(= (get-status obj (-> arg0 id)) (gui-status active))
)
(set! (-> arg0 action) (gui-action playing))
)
)
@@ -2103,13 +2105,11 @@
)
(let ((v1-16 (-> arg0 action)))
(b! (!= v1-16 (gui-action play)) cfg-39 :delay (empty-form))
(if (gui-control-method-19 obj (-> arg0 channel) arg0)
(if (handle-command-list obj (-> arg0 channel) arg0)
(channel-id-set! obj arg0 (-> arg0 id))
)
(b!
(not (or (not (gui-control-method-18 obj (-> arg0 channel)))
(= (gui-control-method-17 obj (-> arg0 id)) (gui-action stopping))
)
(not (or (not (gui-control-method-18 obj (-> arg0 channel))) (= (get-status obj (-> arg0 id)) (gui-status stop)))
)
cfg-27
:delay (empty-form)
@@ -2118,7 +2118,7 @@
(channel-id-set! obj arg0 (new 'static 'sound-id))
)
(if (and arg2 (or (< (shr (the-as int (-> arg0 channel)) 4) (the-as uint 4))
(= (gui-control-method-17 obj (-> arg0 id)) (gui-action stopping))
(= (get-status obj (-> arg0 id)) (gui-status stop))
)
)
(move-to-dead arg0)
@@ -2128,8 +2128,8 @@
(let ((v1-40 (-> arg0 id)))
(b! (!= (-> obj ids (-> arg0 channel)) v1-40) cfg-38 :delay (empty-form))
)
(let ((v1-43 (gui-control-method-17 obj (-> arg0 id))))
(b! (!= v1-43 (gui-action play)) cfg-36 :delay (empty-form))
(let ((v1-43 (get-status obj (-> arg0 id))))
(b! (!= v1-43 (gui-status ready)) cfg-36 :delay (empty-form))
(case (shr (the-as int (-> arg0 channel)) 4)
((1 2)
(if (not (paused?))
@@ -2139,7 +2139,7 @@
)
(b! #t cfg-38 :delay (nop!))
(label cfg-36)
(b! (!= v1-43 (gui-action playing)) cfg-38 :delay (empty-form))
(b! (!= v1-43 (gui-status active)) cfg-38 :delay (empty-form))
)
(set! (-> arg0 action) (gui-action playing))
(label cfg-38)
@@ -2147,7 +2147,7 @@
(label cfg-39)
(b! (not (or (= v1-16 (gui-action playing)) (= v1-16 (gui-action fade)))) cfg-117 :delay (empty-form))
(b!
(not (and (= (gui-control-method-17 obj (-> arg0 id)) (gui-action playing))
(not (and (= (get-status obj (-> arg0 id)) (gui-status active))
(gui-control-method-18 obj (-> arg0 channel))
(or (= (-> arg0 action) (gui-action playing)) (< (-> arg0 fade) (the-as uint 30)))
)
@@ -2182,7 +2182,9 @@
(label cfg-73)
(cond
((not v1-66)
(when (and (logtest? (-> arg0 flags) 30) (logtest? (-> arg0 flags) 1))
(when (and (logtest? (-> arg0 flags) (gui-connection-flags gcf1 fo-curve fo-min fo-max))
(logtest? (-> arg0 flags) (gui-connection-flags gcf0))
)
(let* ((s5-1 (get-process arg0))
(s4-1 (if (type? s5-1 process-drawable)
s5-1
@@ -2209,16 +2211,16 @@
(set! (-> s5-2 params fo-min) (-> arg0 fo-min))
(set! (-> s5-2 params fo-max) (-> arg0 fo-max))
(set! (-> s5-2 params mask) (the-as uint 0))
(if (logtest? (-> arg0 flags) 2)
(if (logtest? (-> arg0 flags) (gui-connection-flags gcf1))
(logior! (-> s5-2 params mask) 32)
)
(if (logtest? (-> arg0 flags) 4)
(if (logtest? (-> arg0 flags) (gui-connection-flags fo-curve))
(logior! (-> s5-2 params mask) 256)
)
(if (logtest? (-> arg0 flags) 8)
(if (logtest? (-> arg0 flags) (gui-connection-flags fo-min))
(logior! (-> s5-2 params mask) 64)
)
(if (logtest? (-> arg0 flags) 16)
(if (logtest? (-> arg0 flags) (gui-connection-flags fo-max))
(logior! (-> s5-2 params mask) 128)
)
)
@@ -2249,7 +2251,7 @@
(let ((a0-75 (< (shr (the-as int (-> arg0 channel)) 4) (the-as uint 4))))
(b! a0-75 cfg-113 :likely-delay (set! v1-143 a0-75))
)
(set! v1-143 (= (gui-control-method-17 obj (-> arg0 id)) (gui-action stopping)))
(set! v1-143 (= (get-status obj (-> arg0 id)) (gui-status stop)))
(label cfg-113)
(if v1-143
(move-to-dead arg0)
@@ -2260,7 +2262,7 @@
(b! #t cfg-139 :delay (nop!))
(label cfg-117)
(b! (!= v1-16 (gui-action stop)) cfg-121 :delay (empty-form))
(gui-control-method-11 obj arg0)
(stop-str obj arg0)
(if arg2
(move-to-dead arg0)
)
@@ -2280,9 +2282,9 @@
((= v1-16 (gui-action hidden))
(cond
((or (< (shr (the-as int (-> arg0 channel)) 4) (the-as uint 4))
(= (gui-control-method-17 obj (-> arg0 id)) (gui-action stopping))
(= (get-status obj (-> arg0 id)) (gui-status stop))
)
(gui-control-method-11 obj arg0)
(stop-str obj arg0)
(if arg2
(move-to-dead arg0)
)
@@ -2302,7 +2304,6 @@
)
)
(defmethod update gui-control ((obj gui-control) (arg0 symbol))
(set! (-> obj ids 65)
(the-as sound-id (if (and (>= (-> *display* base-clock frame-counter) (-> *game-info* blackout-time))
goal_src/jak2/engine/nav/nav-control.gc
+10 -849
View File
File diff suppressed because it is too large Load Diff
goal_src/jak2/engine/nav/nav-enemy.gc
+1 -1
View File
@@ -288,7 +288,7 @@
(defmethod nav-enemy-method-177 nav-enemy ((obj nav-enemy))
(let ((v1-2 (-> obj nav state current-poly)))
(when (and v1-2 (logtest? (the-as int (-> v1-2 pat)) 4) (!= (-> v1-2 link) 255))
(when (and v1-2 (logtest? (-> v1-2 pat) 4) (!= (-> v1-2 link) 255))
(let ((v1-6 (-> obj nav state mesh link-array (-> v1-2 link) dest-mesh)))
(if v1-6
(change-to v1-6 obj)
goal_src/jak2/engine/nav/nav-mesh-h.gc
+1 -1
View File
@@ -483,7 +483,7 @@
(next-poly-idx int)
(work nav-mesh-work)
(current-poly nav-poly)
(current-poly-vtx-count uint8)
(current-poly-vtx-count uint)
(v0-table (pointer int8))
(v1-table (pointer int8))
(delta-x float)
goal_src/jak2/engine/nav/nav-mesh.gc
+10 -10
View File
@@ -517,7 +517,7 @@
(defmethod debug-draw-poly nav-mesh ((obj nav-mesh) (arg0 nav-poly) (arg1 rgba))
(let ((gp-0 (new 'stack-no-clear 'inline-array 'vector 3)))
(set! (-> gp-0 0 quad) (-> obj bounds quad))
(if (logtest? (the-as int (-> arg0 pat)) 7)
(if (logtest? (-> arg0 pat) 7)
(set! (-> gp-0 0 y) (+ 409.6 (-> gp-0 0 y)))
)
(let ((v1-7 (the-as int (+ (-> arg0 vertex-count) -1))))
@@ -534,7 +534,7 @@
(set! v1-7 s2-0)
)
)
(when (and (logtest? (the-as int (-> arg0 pat)) 4) (< (the-as uint (-> arg0 link)) (-> obj link-count)))
(when (and (logtest? (-> arg0 pat) 4) (< (-> arg0 link) (-> obj link-count)))
(poly-centroid obj arg0 (-> gp-0 1))
(let ((s5-1 (-> obj link-array (-> arg0 link))))
(add-debug-x #t (bucket-id debug-no-zbuf1) (-> gp-0 1) *color-magenta*)
@@ -1482,13 +1482,13 @@
(dotimes (s5-1 (the-as int (-> obj poly-count)))
(let ((s4-1 (-> obj poly-array s5-1)))
(debug-draw-poly obj s4-1 (cond
((logtest? (the-as int (-> s4-1 pat)) 1)
((logtest? (-> s4-1 pat) 1)
*color-black*
)
((logtest? (the-as int (-> s4-1 pat)) 2)
((logtest? (-> s4-1 pat) 2)
*color-gray*
)
((logtest? (the-as int (-> s4-1 pat)) 4)
((logtest? (-> s4-1 pat) 4)
(if (-> obj link-array (-> s4-1 link) dest-mesh)
*color-green*
*color-light-red*
@@ -2031,7 +2031,7 @@
((and arg0 arg1 (!= arg0 arg1))
(let* ((a1-1 obj)
(v1-1 (-> arg0 id))
(v1-4 (* (+ (-> arg1 id) (* (the-as uint v1-1) (-> a1-1 poly-count))) 2))
(v1-4 (* (+ (-> arg1 id) (* v1-1 (-> a1-1 poly-count))) 2))
(s3-0
(logand (ash (-> (the-as (pointer uint8) (&+ (-> obj route) (shr v1-4 3)))) (- (the-as int (logand v1-4 7))))
3
@@ -2051,7 +2051,7 @@
(let ((a0-7 s3-0)
(v1-16 (the-as int (+ s3-0 1)))
)
(if (>= (the-as uint v1-16) (the-as uint (-> arg0 vertex-count)))
(if (>= (the-as uint v1-16) (-> arg0 vertex-count))
(set! v1-16 0)
)
(set! (-> arg2 vertex 1 quad) (-> arg0 vertex a0-7 quad))
@@ -2073,7 +2073,7 @@
((and arg0 arg1 (!= arg0 arg1))
(let* ((a3-0 obj)
(v1-1 (-> arg0 id))
(v1-4 (* (+ (-> arg1 id) (* (the-as uint v1-1) (-> a3-0 poly-count))) 2))
(v1-4 (* (+ (-> arg1 id) (* v1-1 (-> a3-0 poly-count))) 2))
(v1-9
(logand (ash (-> (the-as (pointer uint8) (&+ (-> obj route) (shr v1-4 3)))) (- (the-as int (logand v1-4 7))))
3
@@ -2159,7 +2159,7 @@
(set! sv-64 (the-as symbol #f))
(countdown (s5-0 sv-36)
(let ((v1-3 (-> obj poly-array s5-0)))
(if (logtest? (the-as int (-> v1-3 pat)) 1)
(if (logtest? (-> v1-3 pat) 1)
(set! sv-56 (+ sv-56 1))
)
(set! sv-68 (-> v1-3 vertex))
@@ -2279,7 +2279,7 @@
(s1-0 vector)
(sv-16 int)
(sv-24 nav-mesh-work)
(sv-28 uint8)
(sv-28 uint)
(sv-32 (pointer int8))
(sv-36 (pointer int8))
(sv-40 vector)
goal_src/jak2/engine/process-drawable/process-drawable.gc
+12 -12
View File
@@ -219,7 +219,7 @@
)
(defmethod lod-set! draw-control ((obj draw-control) (arg0 int))
(let ((v1-1 (max 0 (min arg0 (the-as int (-> obj lod-set max-lod))))))
(let ((v1-1 (max 0 (min arg0 (-> obj lod-set max-lod)))))
(set! (-> obj desired-lod) v1-1)
(when (!= (-> obj cur-lod) v1-1)
(set! (-> obj mgeo) (-> obj lod-set lod v1-1 geo))
@@ -235,7 +235,7 @@
(defmethod lods-assign! draw-control ((obj draw-control) (arg0 lod-set))
(mem-copy! (the-as pointer (-> obj lod-set)) (the-as pointer arg0) 49)
(let ((a1-2 (min (-> obj cur-lod) (the-as int (-> obj lod-set max-lod)))))
(let ((a1-2 (min (-> obj cur-lod) (-> obj lod-set max-lod))))
(set! (-> obj cur-lod) -1)
(lod-set! obj a1-2)
)
@@ -275,8 +275,8 @@
(let ((v1-0 (-> arg1 length))
(s3-0 (-> arg0 max-lod))
)
(set! (-> obj max-lod) (the-as int s3-0))
(dotimes (a0-1 (the-as int (+ s3-0 1)))
(set! (-> obj max-lod) s3-0)
(dotimes (a0-1 (+ s3-0 1))
(when (or (< (-> arg0 mgeo a0-1) 0) (>= (-> arg0 mgeo a0-1) v1-0))
(set! obj (the-as lod-set #f))
(goto cfg-22)
@@ -519,7 +519,7 @@
(let ((a2-3 *temp-string*))
(add-debug-text-3d #t (bucket-id debug-no-zbuf1) a2-3 s3-0 (font-color blue-#003cf1) s5-0)
)
(set! (-> s5-0 x) (the-as int (+ (-> s5-0 x) 10)))
(+! (-> s5-0 x) 10)
)
)
(none)
@@ -569,13 +569,13 @@
(defstate process-drawable-art-error (process-drawable)
:event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block))
(let ((v1-0 event-type))
(the-as object (when (= v1-0 'nav-mesh-kill)
(deactivate self)
#t
)
)
)
(the-as object (case event-type
(('nav-mesh-kill)
(deactivate self)
#t
)
)
)
)
:code (behavior ((arg0 string))
(format 0 "ART ERROR: ~A for ~A~%" arg0 self)
goal_src/jak2/engine/scene/scene.gc
+7 -7
View File
@@ -24,7 +24,7 @@
(defmethod scene-method-15 scene ((obj scene) (arg0 spool-anim))
(set! (-> arg0 name) (-> obj anim))
(set! (-> arg0 anim-name) (-> obj anim))
(set! (-> arg0 parts) (the-as int (-> obj parts)))
(set! (-> arg0 parts) (-> obj parts))
(set! (-> arg0 command-list) (-> obj command-list))
(none)
)
@@ -992,7 +992,7 @@
(!= (-> *setting-control* user-current movie) (process->ppointer self))
)
*progress-process*
(!= (gui-control-method-17 *gui-control* (the-as sound-id (-> self gui-id))) 3)
(!= (get-status *gui-control* (the-as sound-id (-> self gui-id))) 3)
)
)
(suspend)
@@ -1060,16 +1060,16 @@
(nonzero? (-> self anim anim-name))
(let ((v1-161 (file-status *art-control* (-> self anim name) 0)))
(or (not (or (= v1-161 'active) (= v1-161 'locked)))
(let* ((a1-26 (gui-control-method-14
(let* ((a1-26 (lookup-gui-connection-id
*gui-control*
(the-as string (-> self anim anim-name))
(gui-channel none)
(gui-action none)
)
)
(v1-167 (gui-control-method-17 *gui-control* (the-as sound-id a1-26)))
(v1-167 (get-status *gui-control* (the-as sound-id a1-26)))
)
(not (or (= v1-167 (gui-action play)) (= v1-167 (gui-action playing))))
(not (or (= v1-167 (gui-status ready)) (= v1-167 (gui-status active))))
)
)
)
@@ -1485,7 +1485,7 @@
(process-drawable-draw-subtitles)
(when (and (= *cheat-mode* 'debug) (-> self scene))
(let ((gp-7
(gui-control-method-15 *gui-control* self (gui-channel art-load) (-> self scene name) (new 'static 'sound-id))
(lookup-gui-connection *gui-control* self (gui-channel art-load) (-> self scene name) (new 'static 'sound-id))
)
)
(when (!= *external-cam-mode* 'pad-0)
@@ -1667,7 +1667,7 @@
(set! (-> self scene) #f)
)
)
(set! (-> self gui-id) (the-as uint (gui-control-method-9
(set! (-> self gui-id) (the-as uint (add-process
*gui-control*
self
(gui-channel movie)
goal_src/jak2/engine/sound/speech.gc
+9 -11
View File
@@ -90,9 +90,7 @@
(the-as uint (rand-vu-int-range (the-as int (-> s5-1 min-delay)) (the-as int (-> s5-1 max-delay))))
)
(set! (-> s5-1 delay) (-> obj delay))
(set! (-> obj id)
(gui-control-method-9 *gui-control* s4-0 (-> obj gui-channel) (gui-action play) s3-1 -99.0 0)
)
(set! (-> obj id) (add-process *gui-control* s4-0 (-> obj gui-channel) (gui-action play) s3-1 -99.0 0))
)
(speech-channel-method-12 obj)
(logior! (-> obj flags) (speech-channel-flag disable))
@@ -137,7 +135,7 @@
)
)
(else
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(-> obj id)
@@ -152,10 +150,10 @@
)
)
)
(case (gui-control-method-17 *gui-control* (-> obj id))
(((gui-action queue))
(case (get-status *gui-control* (-> obj id))
(((gui-status pending))
(when (>= (- (-> pp clock frame-counter) (-> obj start-time)) (seconds 1))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(-> obj id)
@@ -169,7 +167,7 @@
(set! (-> obj end-time) (-> obj update-time))
)
)
(((gui-action none))
(((gui-status unknown))
(set! (-> obj id) (new 'static 'sound-id))
(set! (-> obj last-request handle) (the-as handle #f))
(set! (-> obj end-time) (-> obj update-time))
@@ -207,7 +205,7 @@
(defmethod speech-channel-method-10 speech-channel ((obj speech-channel) (arg0 handle))
(when (= arg0 (handle->process (-> obj last-request handle)))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(-> obj id)
@@ -299,7 +297,7 @@
)
(defmethod speech-control-method-16 speech-control ((obj speech-control))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -309,7 +307,7 @@
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
goal_src/jak2/engine/target/gun/gun-dark-shot.gc
+9 -13
View File
@@ -154,12 +154,9 @@
(set! (-> obj fire-sound) (the-as uint (new-sound-id)))
(set! (-> obj trail-sound) (the-as uint (new-sound-id)))
(set! (-> obj explode-sound)
(the-as
uint
(gui-control-method-9 *gui-control* obj (gui-channel background) (gui-action queue) "pmkrxplo" -99.0 0)
)
(the-as uint (add-process *gui-control* obj (gui-channel background) (gui-action queue) "pmkrxplo" -99.0 0))
)
(gui-control-method-20 *gui-control* (the-as sound-id (-> obj explode-sound)) #t 50 150 11)
(set-falloff! *gui-control* (the-as sound-id (-> obj explode-sound)) #t 50 150 11)
(set! (-> obj start-pilot?)
(the-as basic (and *target* (logtest? (focus-status pilot) (-> *target* focus-status))))
)
@@ -636,10 +633,10 @@
(send-event (ppointer->process (-> self parent)) 'release)
)
(sound-stop (the-as sound-id (-> self trail-sound)))
(let ((v1-10 (gui-control-method-17 *gui-control* (the-as sound-id (-> self explode-sound)))))
(let ((v1-10 (get-status *gui-control* (the-as sound-id (-> self explode-sound)))))
(cond
((= v1-10 (gui-action play))
(gui-control-method-16
((= v1-10 (gui-status ready))
(set-action!
*gui-control*
(gui-action play)
(the-as sound-id (-> self explode-sound))
@@ -651,7 +648,7 @@
)
)
(else
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id (-> self explode-sound))
@@ -881,10 +878,9 @@
)
)
(let ((gp-3 (-> self clock frame-counter)))
(while (or (-> self child)
(and (nonzero? (gui-control-method-17 *gui-control* (the-as sound-id (-> self explode-sound))))
(< (- (-> self clock frame-counter) gp-3) (seconds 10))
)
(while (or (-> self child) (and (nonzero? (get-status *gui-control* (the-as sound-id (-> self explode-sound))))
(< (- (-> self clock frame-counter) gp-3) (seconds 10))
)
)
(suspend)
)
goal_src/jak2/engine/target/gun/gun-h.gc
+1 -1
View File
@@ -187,7 +187,7 @@
)
)
(defmethod get-gun-ammo fact-info-target ((obj fact-info-target) (arg0 target))
(defmethod get-gun-ammo fact-info-target ((obj fact-info-target))
(let ((current-gun (gun->ammo (-> (the-as target (-> obj process)) gun gun-type))))
(if (zero? current-gun)
0.0
goal_src/jak2/engine/target/target-darkjak.gc
+5 -5
View File
@@ -954,7 +954,7 @@
(-> self skel effect)
'punch
-1.0
(the-as int (-> self control impact-ctrl joint))
(-> self control impact-ctrl joint)
(the-as basic #f)
(the-as sound-name t1-3)
)
@@ -1091,12 +1091,12 @@
(set! (-> self darkjak clock-vel) 0.0)
(set! (-> self darkjak clock-on) #f)
(set! (-> self control unknown-sound-id00)
(gui-control-method-9 *gui-control* self (gui-channel jak) (gui-action queue) "darkbom0" -99.0 0)
(add-process *gui-control* self (gui-channel jak) (gui-action queue) "darkbom0" -99.0 0)
)
(none)
)
:exit (behavior ()
(gui-control-method-16
(set-action!
*gui-control*
(gui-action fade)
(-> self control unknown-sound-id00)
@@ -1231,7 +1231,7 @@
(suspend)
(ja :num! (seek! (ja-aframe 35.0 0)))
)
(gui-control-method-16
(set-action!
*gui-control*
(gui-action play)
(-> self control unknown-sound-id00)
@@ -1623,7 +1623,7 @@
(set-setting! 'music-volume 'rel 0 0)
(set-setting! 'ambient-volume 'rel 0 0)
(compute-alignment! (-> self align))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action play)
(-> self control unknown-sound-id00)
goal_src/jak2/engine/target/target-death.gc
+4 -4
View File
@@ -590,10 +590,10 @@
)
)
(set! (-> self control unknown-sound-id00)
(gui-control-method-9 *gui-control* *target* (gui-channel daxter) (gui-action play) t0-1 -99.0 0)
(add-process *gui-control* *target* (gui-channel daxter) (gui-action play) t0-1 -99.0 0)
)
)
(gui-control-method-20 *gui-control* (-> self control unknown-sound-id00) #t -1 100 2)
(set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2)
)
(else
(case (-> arg0 angle)
@@ -1881,9 +1881,9 @@
(local-vars (v1-24 symbol))
(sound-play "death-fall")
(set! (-> self control unknown-sound-id00)
(gui-control-method-9 *gui-control* *target* (gui-channel daxter) (gui-action play) "jakfall" -99.0 0)
(add-process *gui-control* *target* (gui-channel daxter) (gui-action play) "jakfall" -99.0 0)
)
(gui-control-method-20 *gui-control* (-> self control unknown-sound-id00) #t -1 100 2)
(set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2)
(set-setting! 'mode-name 'cam-endlessfall 0 0)
(logclear! (-> self water flags) (water-flags swim-ground))
(let ((f0-1 (fmin -4096.0 (- (-> self control ground-impact-vel)))))
goal_src/jak2/engine/target/target-gun.gc
+2 -2
View File
@@ -1353,8 +1353,8 @@
(let ((s3-1 (new 'stack-no-clear 'vector4w)))
(cond
((and (logtest? (process-mask enemy guard) (-> s5-2 mask)) (transform-point-qword! s3-1 s4-5))
(let ((v1-173 (the-as int (+ (/ (the-as int (-> s3-1 x)) 16) -2048))))
(+ (/ (the-as int (-> s3-1 y)) 16) -2048)
(let ((v1-173 (+ (/ (-> s3-1 x) 16) -2048)))
(+ (/ (-> s3-1 y) 16) -2048)
(let ((a0-91 (abs v1-173)))
(cond
((< a0-91 65)
goal_src/jak2/engine/target/target.gc
+6 -6
View File
@@ -2378,7 +2378,7 @@
(logtest? (-> v1-14 root-prim prim-core action) (collide-action no-smack))
)
)
(set! (-> self control unknown-word04) (the-as uint (+ (-> self control unknown-word04) 1)))
(+! (-> self control unknown-word04) 1)
)
)
)
@@ -2742,7 +2742,7 @@
(-> self skel effect)
'punch
-1.0
(the-as int (-> self control impact-ctrl joint))
(-> self control impact-ctrl joint)
(the-as basic #f)
(the-as sound-name t1-6)
)
@@ -3073,7 +3073,7 @@
)
:exit (behavior ()
(if (not (and (-> self next-state) (= (-> self next-state name) 'target-darkjak-bomb1)))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action play)
(-> self control unknown-sound-id00)
@@ -3146,7 +3146,7 @@
(logtest? (-> self darkjak stage) 8)
)
(set! (-> self control unknown-sound-id00)
(gui-control-method-9 *gui-control* self (gui-channel jak) (gui-action queue) "darkbom1" -99.0 0)
(add-process *gui-control* self (gui-channel jak) (gui-action queue) "darkbom1" -99.0 0)
)
(ja-no-eval :group! (-> self draw art-group data 391)
:num! (seek! (ja-aframe 7.0 0))
@@ -3463,7 +3463,7 @@
(and (logtest? (-> self control status) (collide-status touch-wall)) (< 0.7 (-> self control poly-angle)))
)
(not (logtest? (-> self control status) (collide-status touch-actor)))
(>= (the-as uint (-> self control unknown-word04)) (the-as uint 2))
(>= (-> self control unknown-word04) (the-as uint 2))
)
(set! (-> self control last-time-of-stuck) (-> self clock frame-counter))
(set! gp-1 'stuck)
@@ -3602,7 +3602,7 @@
)
(suspend)
(until #f
(set! (-> self control unknown-word04) (the-as uint (+ (-> self control unknown-word04) 1)))
(+! (-> self control unknown-word04) 1)
(ja :num! (seek!))
(let ((gp-1 (-> self skel root-channel 1)))
(let ((f0-28 (lerp-scale 0.0 1.0 (-> self control ctrl-xz-vel) 0.0 40960.0)))
goal_src/jak2/engine/ui/credits.gc
+53 -4
View File
@@ -25,10 +25,10 @@
)
)
(let ((v1-2 s4-0))
(set! (-> v1-2 width) (the float (the-as float #x1f4)))
(set! (-> v1-2 width) (the float 500))
)
(let ((v1-3 s4-0))
(set! (-> v1-3 height) (the float (the-as float #x96)))
(set! (-> v1-3 height) (the float 150))
)
(let ((v1-4 s4-0))
(set! (-> v1-4 scale) 0.8)
@@ -82,6 +82,8 @@
)
)
;; definition for function start-credits
;; WARN: Return type mismatch int vs none.
(defun start-credits ((arg0 process))
(remove-setting! 'movie)
(remove-setting! 'music-volume)
@@ -97,7 +99,7 @@
(apply-settings *setting-control*)
(let ((gp-0 (ppointer->process (-> self parent))))
(when (type? gp-0 scene-player)
(if (gui-control-method-15
(if (lookup-gui-connection
*gui-control*
(the-as process gp-0)
(gui-channel art-load)
@@ -117,7 +119,7 @@
)
(let ((gp-2 (ppointer->process (-> self parent))))
(when (type? gp-2 scene-player)
(if (gui-control-method-15
(if (lookup-gui-connection
*gui-control*
(the-as process gp-2)
(gui-channel art-load)
@@ -136,6 +138,7 @@
(none)
)
;; failed to figure out what this is:
(defpartgroup group-ctyport-fireworks
:id 1272
:duration (seconds 169.6)
@@ -201,6 +204,7 @@
)
)
;; failed to figure out what this is:
(defpart 5408
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x2 :page #xdb9))
(sp-flt spt-num 0.01)
@@ -226,6 +230,7 @@
)
)
;; failed to figure out what this is:
(defpart 5405
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x3 :page #xdb9))
(sp-flt spt-num 1.0)
@@ -251,6 +256,7 @@
)
)
;; failed to figure out what this is:
(defpartgroup group-ctyport-firework-green-pop
:id 1273
:duration (seconds 0.835)
@@ -336,6 +342,7 @@
)
)
;; failed to figure out what this is:
(defpart 5412
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc))
(sp-flt spt-num 1.0)
@@ -359,6 +366,7 @@
)
)
;; failed to figure out what this is:
(defpart 5415
:init-specs ((sp-flt spt-scale-x (meters 8))
(sp-copy-from-other spt-scale-y -4)
@@ -367,6 +375,7 @@
)
)
;; failed to figure out what this is:
(defpart 5413
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc))
(sp-flt spt-num 1.0)
@@ -386,6 +395,7 @@
)
)
;; failed to figure out what this is:
(defpart 5416
:init-specs ((sp-flt spt-scale-x (meters 4))
(sp-copy-from-other spt-scale-y -4)
@@ -394,6 +404,7 @@
)
)
;; failed to figure out what this is:
(defpart 5414
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x2 :page #xdb9))
(sp-rnd-flt spt-num 0.0 1.0 1.0)
@@ -414,6 +425,7 @@
)
)
;; failed to figure out what this is:
(defpart 5410
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x2 :page #xdb9))
(sp-flt spt-num 1.0)
@@ -438,6 +450,7 @@
)
)
;; failed to figure out what this is:
(defpart 5411
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x2 :page #xdb9))
(sp-func spt-birth-func 'birth-func-firework-color)
@@ -466,6 +479,7 @@
)
)
;; failed to figure out what this is:
(defpart 5417
:init-specs ((sp-rnd-flt spt-scale-x (meters 1) (meters 1) 1.0)
(sp-copy-from-other spt-scale-y -4)
@@ -479,6 +493,7 @@
)
)
;; failed to figure out what this is:
(defpart 5407
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xca :page #xc))
(sp-flt spt-num 0.01)
@@ -504,6 +519,7 @@
)
)
;; failed to figure out what this is:
(defpart 5403
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x2 :page #xdb9))
(sp-flt spt-num 1.0)
@@ -526,6 +542,7 @@
)
)
;; failed to figure out what this is:
(defpart 5404
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x4 :page #xdb9))
(sp-flt spt-num 1.0)
@@ -550,6 +567,7 @@
)
)
;; failed to figure out what this is:
(defpartgroup group-ctyport-firework-red-pop
:id 1274
:duration (seconds 0.75)
@@ -558,6 +576,7 @@
:parts ((sp-item 5419 :flags (launch-asap)) (sp-item 5420 :flags (launch-asap) :binding 5418))
)
;; failed to figure out what this is:
(defpart 5419
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc))
(sp-flt spt-num 1.0)
@@ -581,10 +600,12 @@
)
)
;; failed to figure out what this is:
(defpart 5421
:init-specs ((sp-flt spt-scalevel-x (meters -0.09142857)) (sp-copy-from-other spt-scalevel-y -4))
)
;; failed to figure out what this is:
(defpart 5420
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x4 :page #xdb9))
(sp-flt spt-num 128.0)
@@ -612,6 +633,7 @@
)
)
;; failed to figure out what this is:
(defpart 5422
:init-specs ((sp-flt spt-scale-x (meters 2.5))
(sp-copy-from-other spt-scale-y -4)
@@ -624,6 +646,7 @@
)
)
;; failed to figure out what this is:
(defpart 5423
:init-specs ((sp-flt spt-scale-x (meters 3))
(sp-copy-from-other spt-scale-y -4)
@@ -637,6 +660,7 @@
)
)
;; failed to figure out what this is:
(defpart 5424
:init-specs ((sp-flt spt-scale-x (meters 2))
(sp-copy-from-other spt-scale-y -4)
@@ -645,6 +669,8 @@
)
)
;; definition for function check-pop-level-firework-userdata
;; INFO: Used lq/sq
(defun check-pop-level-firework-userdata ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 sparticle-launchinfo))
(when (< (-> arg1 user-float) (-> arg2 launchrot y))
(let ((s3-0 (new 'stack-no-clear 'vector)))
@@ -691,6 +717,8 @@
(none)
)
;; definition for function check-pop-level-firework-red-userdata
;; INFO: Used lq/sq
(defun check-pop-level-firework-red-userdata ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 sparticle-launchinfo))
(when (< (-> arg1 user-float) (-> arg2 launchrot y))
(let ((s3-0 (new 'stack-no-clear 'vector)))
@@ -737,6 +765,8 @@
(none)
)
;; definition for function check-pop-level-firework-green-userdata
;; INFO: Used lq/sq
(defun check-pop-level-firework-green-userdata ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 sparticle-launchinfo))
(when (< (-> arg1 user-float) (-> arg2 launchrot y))
(let ((s3-0 (new 'stack-no-clear 'vector)))
@@ -783,6 +813,7 @@
(none)
)
;; failed to figure out what this is:
(defpartgroup group-ctyport-firework-pop
:id 1275
:duration (seconds 0.75)
@@ -832,6 +863,8 @@
)
)
;; definition for function birth-func-firework-color
;; WARN: Return type mismatch int vs none.
(defun birth-func-firework-color ((arg0 sparticle-system)
(arg1 sparticle-cpuinfo)
(arg2 sprite-vec-data-3d)
@@ -847,6 +880,7 @@
(none)
)
;; failed to figure out what this is:
(defpart 5418
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x3 :page #xdb9))
(sp-func spt-birth-func 'birth-func-firework-color)
@@ -875,6 +909,7 @@
)
)
;; failed to figure out what this is:
(defpart 5427
:init-specs ((sp-rnd-flt spt-scalevel-x (meters 0.0016666667) (meters 0.0033333334) 1.0)
(sp-copy-from-other spt-scalevel-y -4)
@@ -883,6 +918,7 @@
)
)
;; failed to figure out what this is:
(defpart 5428
:init-specs ((sp-rnd-flt spt-scalevel-x (meters -0.00083333335) (meters -0.0016666667) 1.0)
(sp-copy-from-other spt-scalevel-y -4)
@@ -891,6 +927,7 @@
)
)
;; failed to figure out what this is:
(defpart 5429
:init-specs ((sp-flt spt-scale-x (meters 1))
(sp-copy-from-other spt-scale-y -4)
@@ -903,10 +940,12 @@
)
)
;; failed to figure out what this is:
(defpart 5430
:init-specs ((sp-flt spt-r 128.0) (sp-flt spt-g 128.0) (sp-flt spt-b 128.0) (sp-flt spt-a 64.0) (sp-flt spt-fade-a -0.8))
)
;; failed to figure out what this is:
(defpart 5425
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #xbb :page #xc))
(sp-flt spt-num 1.0)
@@ -930,6 +969,7 @@
)
)
;; failed to figure out what this is:
(defpart 5431
:init-specs ((sp-flt spt-r 0.0)
(sp-flt spt-scalevel-x (meters -0.09142857))
@@ -940,6 +980,7 @@
)
)
;; failed to figure out what this is:
(defpart 5426
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x2 :page #xdb9))
(sp-rnd-flt spt-num 24.0 12.0 1.0)
@@ -967,10 +1008,12 @@
)
)
;; failed to figure out what this is:
(defpart 5432
:init-specs ((sp-flt spt-fade-g 0.0) (sp-rnd-flt spt-fade-a -0.85333335 -0.85333335 1.0))
)
;; failed to figure out what this is:
(defpart 5406
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x1 :page #xdb9))
(sp-flt spt-num 0.01)
@@ -996,10 +1039,12 @@
)
)
;; failed to figure out what this is:
(defpart 5409
:init-specs ((sp-flt spt-userdata -4096000.0))
)
;; failed to figure out what this is:
(defpart 5402
:init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x1 :page #xdb9))
(sp-flt spt-num 1.0)
@@ -1024,3 +1069,7 @@
(sp-rnd-flt spt-conerot-z (degrees 0.0) (degrees 3600.0) 1.0)
)
)
goal_src/jak2/engine/ui/gui-h.gc
+46 -31
View File
@@ -70,27 +70,48 @@
(max 96)
)
(defenum gui-connection-flags
:type uint8
:bitfield #t
(gcf0 0)
(gcf1 1)
(fo-curve 2)
(fo-min 3)
(fo-max 4)
)
(defenum gui-status
:type uint8 ;; not sure
:bitfield #f
(unknown 0)
(pending 1)
(ready 2)
(active 3)
(hide 4)
(stop 5)
)
(declare-type gui-control basic)
(define-extern *gui-control* gui-control)
;; DECOMP BEGINS
(deftype gui-connection (connection)
((priority float :offset 16)
(action gui-action :offset 20)
(channel gui-channel :offset 21)
(anim-part uint8 :offset 22)
(flags uint8 :offset 23)
(name string :offset 24)
(id sound-id :offset 28)
(handle handle :offset 0)
(time-stamp time-frame :offset 8)
(hold-time time-frame :offset-assert 32)
(fo-min int16 :offset-assert 40)
(fo-max int16 :offset-assert 42)
(fo-curve int8 :offset-assert 44)
(fade uint8 :offset-assert 45)
(pad uint8 2 :offset-assert 46)
((priority float :offset 16)
(action gui-action :offset 20)
(channel gui-channel :offset 21)
(anim-part uint8 :offset 22)
(flags gui-connection-flags :offset 23)
(name string :offset 24)
(id sound-id :offset 28)
(handle handle :offset 0)
(time-stamp time-frame :offset 8)
(hold-time time-frame :offset-assert 32)
(fo-min int16 :offset-assert 40)
(fo-max int16 :offset-assert 42)
(fo-curve int8 :offset-assert 44)
(fade uint8 :offset-assert 45)
(pad uint8 2 :offset-assert 46)
)
:method-count-assert 14
:size-assert #x30
@@ -112,27 +133,21 @@
:flag-assert #x1900000cd0
(:methods
(new (symbol type int) _type_ 0)
(gui-control-method-9 (_type_ process gui-channel gui-action string float time-frame) sound-id 9)
(gui-control-method-10 (_type_ process gui-channel) none 10)
(gui-control-method-11 (_type_ gui-connection) int 11)
(add-process (_type_ process gui-channel gui-action string float time-frame) sound-id 9)
(remove-process (_type_ process gui-channel) none 10)
(stop-str (_type_ gui-connection) int 11)
(gui-control-method-12 (_type_ process gui-channel gui-action string int float sound-id) sound-id 12)
(update (_type_ symbol) int 13)
(gui-control-method-14 (_type_ string gui-channel gui-action) int 14)
(gui-control-method-15 (_type_ process gui-channel string sound-id) gui-connection 15)
(gui-control-method-16 (_type_ gui-action sound-id gui-channel gui-action string (function gui-connection symbol) process) int 16)
(gui-control-method-17 (_type_ sound-id) gui-action 17)
(lookup-gui-connection-id (_type_ string gui-channel gui-action) int 14)
(lookup-gui-connection (_type_ process gui-channel string sound-id) gui-connection 15)
(set-action! (_type_ gui-action sound-id gui-channel gui-action string (function gui-connection symbol) process) int 16)
(get-status (_type_ sound-id) gui-status 17)
(gui-control-method-18 (_type_ gui-channel) symbol 18)
(gui-control-method-19 (_type_ gui-channel gui-connection) symbol 19)
(gui-control-method-20 (_type_ sound-id symbol int int int) gui-connection 20)
(handle-command-list (_type_ gui-channel gui-connection) symbol 19)
(set-falloff! (_type_ sound-id symbol int int int) gui-connection 20)
(gui-control-method-21 (_type_ gui-connection vector) int 21)
(gui-control-method-22 (_type_ gui-connection process symbol) none 22)
(gui-control-method-23 (_type_ gui-channel gui-channel symbol gui-connection) symbol 23)
(handle-command (_type_ gui-channel gui-channel symbol gui-connection) symbol 23)
(channel-id-set! (_type_ gui-connection sound-id) int 24)
)
)
0
goal_src/jak2/engine/ui/hud-classes.gc
+1123 -3
View File
File diff suppressed because it is too large Load Diff
goal_src/jak2/engine/ui/hud-h.gc
+39 -30
View File
@@ -8,6 +8,9 @@
(defenum hud-flags
:type uint32
:bitfield #t
(disable 0)
(should-die 1)
(show 2)
)
;; NOTE - for progress
@@ -18,16 +21,20 @@
(define-extern show-hud (function object none))
(declare-type hud process)
(define-extern hud-init-by-other (function object :behavior hud))
(define-extern hud-arriving (state hud))
(define-extern hud-leaving (state float hud))
(define-extern hud-in (state hud))
;; DECOMP BEGINS
(deftype hud-string (basic)
((text string :offset-assert 4)
(scale float :offset-assert 8)
(color uint32 :offset-assert 12)
(flags uint32 :offset-assert 16)
(pos vector4w :inline :offset-assert 32)
((text string :offset-assert 4)
(scale float :offset-assert 8)
(color font-color :offset-assert 12)
(flags font-flags :offset-assert 16)
(pos int32 4 :offset 32)
)
:allow-misaligned
:method-count-assert 9
:size-assert #x30
:flag-assert #x900000030
@@ -37,6 +44,7 @@
(deftype hud-sprite (structure)
((pos vector4w :inline :offset-assert 0)
(color vector4w :inline :offset-assert 16)
(color2 int32 4 :offset 16)
(flags uint32 :offset-assert 32)
(scale-x float :offset-assert 36)
(scale-y float :offset-assert 40)
@@ -47,7 +55,7 @@
:size-assert #x34
:flag-assert #xb00000034
(:methods
(hud-sprite-method-9 (_type_ dma-buffer level) none 9)
(draw (_type_ dma-buffer level) none 9)
(hud-sprite-method-10 (_type_) none 10)
)
)
@@ -62,23 +70,24 @@
:size-assert #x20
:flag-assert #x1000000020
(:methods
(hud-box-method-9 (_type_ dma-buffer) none 9)
(hud-box-method-10 () none 10)
(hud-box-method-11 () none 11)
(hud-box-method-12 () none 12)
(hud-box-method-13 (_type_ dma-buffer float) int 13)
(hud-box-method-14 (_type_) none 14)
(hud-box-method-15 (_type_) none 15)
(draw-box-prim-only (_type_ dma-buffer) none 9)
(draw-box-alpha-1 (_type_ dma-buffer) none 10)
(draw-box-alpha-2 (_type_ dma-buffer) none 11)
(draw-box-alpha-3 (_type_ dma-buffer) none 12)
(draw-scan-and-line (_type_ dma-buffer float) int 13)
(setup-scissor (_type_ dma-buffer) none 14)
(restore-scissor (_type_ dma-buffer) none 15)
)
)
(deftype hud-icon (basic)
((icon (pointer manipy) :offset-assert 4)
(pos vector4w :inline :offset-assert 16)
(scale-x float :offset-assert 32)
(scale-y float :offset-assert 36)
((icon (pointer manipy) :offset-assert 4)
(pos int32 4 :offset 16)
(scale-x float :offset-assert 32)
(scale-y float :offset-assert 36)
)
:allow-misaligned
:method-count-assert 9
:size-assert #x28
:flag-assert #x900000028
@@ -91,7 +100,7 @@
(flags uint16 :offset-assert 12)
(counter uint16 :offset-assert 14)
)
:pack-me
:allow-misaligned
:method-count-assert 9
:size-assert #x10
:flag-assert #x900000010
@@ -103,11 +112,11 @@
(last-hide-time time-frame :offset-assert 136)
(offset float :offset-assert 144)
(flags hud-flags :offset-assert 148)
(values hud-value 8 :inline :offset-assert 152)
(strings hud-string 14 :inline :offset-assert 288)
(sprites hud-sprite 30 :inline :offset-assert 960)
(icons hud-icon 2 :inline :offset-assert 2880)
(gui-id sound-id :offset-assert 2976)
(values hud-value 8 :inline :offset 148)
(strings hud-string 14 :inline :offset 284)
(sprites hud-sprite 30 :inline :offset 960)
(icons hud-icon 2 :inline :offset 2876)
(gui-id sound-id :offset 2976)
)
:heap-base #xb30
:method-count-assert 27
@@ -115,18 +124,18 @@
:flag-assert #x1b0b300ba4
(:methods
(hidden? (_type_) symbol 14)
(hud-method-15 (_type_) none 15)
(hud-method-16 (_type_ int int) none 16)
(hud-method-17 (_type_) none 17)
(hud-method-18 (_type_) symbol 18)
(draw (_type_) none 15)
(update-values (_type_) none 16)
(init-callback (_type_) none 17)
(event-callback (_type_ process int symbol event-message-block) symbol 18)
(hud-method-19 (_type_) none 19)
(hud-method-20 (_type_) none 20)
(hud-method-21 (_type_) none 21)
(hud-method-22 (_type_) none 22)
(hud-method-23 (_type_) none 23)
(hud-method-24 (_type_ symbol) none 24)
(hud-method-25 (_type_) none 25)
(hud-method-26 (_type_ int) none 26)
(check-ready-and-maybe-show (_type_ symbol) symbol 24)
(update-value-callback (_type_ int int) none 25)
(alloc-string-if-needed (_type_ int) none 26)
)
)
goal_src/jak2/engine/ui/hud.gc
+1316 -2
View File
File diff suppressed because it is too large Load Diff
goal_src/jak2/engine/ui/minimap-h.gc
+5 -5
View File
@@ -222,18 +222,18 @@
(minimap-method-12 (_type_ process uint int vector int) connection-minimap 12)
(minimap-method-13 () none 13)
(minimap-method-14 () none 14)
(minimap-method-15 () none 15)
(minimap-method-15 (_type_ dma-buffer vector4w symbol) none 15)
(minimap-method-16 () none 16)
(minimap-method-17 () none 17)
(minimap-method-18 () none 18)
(minimap-method-19 () none 19)
(minimap-method-20 () none 20)
(minimap-method-20 (_type_) symbol 20)
(minimap-method-21 () none 21)
(minimap-method-22 () none 22)
(minimap-method-23 () none 23)
(minimap-method-24 () none 24)
(minimap-method-25 () none 25)
(minimap-method-24 (_type_ dma-buffer vector4w symbol) none 24)
(minimap-method-25 (_type_ texture float) none 25)
(minimap-method-26 () none 26)
(minimap-method-27 () none 27)
(minimap-method-27 (_type_ float float) none 27)
)
)
goal_src/jak2/engine/ui/minimap.gc
+16
View File
@@ -46,3 +46,19 @@
;; s3-0
;; )
)
(defmethod minimap-method-20 minimap ((obj minimap))
#t)
(defmethod minimap-method-15 minimap ((obj minimap) (dma dma-buffer) (a vector4w) (k symbol))
(none))
(defmethod minimap-method-24 minimap ((obj minimap) (dma dma-buffer) (a vector4w) (k symbol))
(none))
(defmethod minimap-method-25 minimap ((obj minimap) (text texture) (a float))
(none))
(defmethod minimap-method-27 minimap ((obj minimap) (dma float) (a float))
(none))
goal_src/jak2/engine/ui/progress/progress-draw.gc
+132 -92
View File
@@ -298,7 +298,7 @@
(let* ((s4-0 (-> *display* frames (-> *display* on-screen) global-buf))
(s5-1 (-> s4-0 base))
)
(hud-box-method-14 arg0)
(setup-scissor arg0 s4-0)
(let ((a3-0 (-> s4-0 base)))
(let ((v1-23 (the-as object (-> s4-0 base))))
(set! (-> (the-as dma-packet v1-23) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -322,7 +322,7 @@
(let* ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(gp-0 (-> s5-0 base))
)
(hud-box-method-15 arg0)
(restore-scissor arg0 s5-0)
(let ((a3-0 (-> s5-0 base)))
(let ((v1-7 (the-as object (-> s5-0 base))))
(set! (-> (the-as dma-packet v1-7) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -360,7 +360,7 @@
(let* ((s4-0 (-> *display* frames (-> *display* on-screen) global-buf))
(s5-1 (-> s4-0 base))
)
(hud-box-method-14 arg0)
(setup-scissor arg0 s4-0)
(let ((a3-0 (-> s4-0 base)))
(let ((v1-17 (the-as object (-> s4-0 base))))
(set! (-> (the-as dma-packet v1-17) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -384,7 +384,7 @@
(let* ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(gp-0 (-> s5-0 base))
)
(hud-box-method-15 arg0)
(restore-scissor arg0 s5-0)
(let ((a3-0 (-> s5-0 base)))
(let ((v1-7 (the-as object (-> s5-0 base))))
(set! (-> (the-as dma-packet v1-7) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -422,7 +422,7 @@
(let* ((s4-0 (-> *display* frames (-> *display* on-screen) global-buf))
(s5-1 (-> s4-0 base))
)
(hud-box-method-14 arg0)
(setup-scissor arg0 s4-0)
(let ((a3-0 (-> s4-0 base)))
(let ((v1-17 (the-as object (-> s4-0 base))))
(set! (-> (the-as dma-packet v1-17) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -446,7 +446,7 @@
(let* ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(gp-0 (-> s5-0 base))
)
(hud-box-method-15 arg0)
(restore-scissor arg0 s5-0)
(let ((a3-0 (-> s5-0 base)))
(let ((v1-7 (the-as object (-> s5-0 base))))
(set! (-> (the-as dma-packet v1-7) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -484,7 +484,7 @@
(let* ((s4-0 (-> *display* frames (-> *display* on-screen) global-buf))
(s5-1 (-> s4-0 base))
)
(hud-box-method-14 arg0)
(setup-scissor arg0 s4-0)
(let ((a3-0 (-> s4-0 base)))
(let ((v1-17 (the-as object (-> s4-0 base))))
(set! (-> (the-as dma-packet v1-17) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -508,7 +508,7 @@
(let* ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(gp-0 (-> s5-0 base))
)
(hud-box-method-15 arg0)
(restore-scissor arg0 s5-0)
(let ((a3-0 (-> s5-0 base)))
(let ((v1-7 (the-as object (-> s5-0 base))))
(set! (-> (the-as dma-packet v1-7) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -546,7 +546,7 @@
(let* ((s4-0 (-> *display* frames (-> *display* on-screen) global-buf))
(s5-1 (-> s4-0 base))
)
(hud-box-method-14 arg0)
(setup-scissor arg0 s4-0)
(let ((a3-0 (-> s4-0 base)))
(let ((v1-17 (the-as object (-> s4-0 base))))
(set! (-> (the-as dma-packet v1-17) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -570,7 +570,7 @@
(let* ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(gp-0 (-> s5-0 base))
)
(hud-box-method-15 arg0)
(restore-scissor arg0 s5-0)
(let ((a3-0 (-> s5-0 base)))
(let ((v1-7 (the-as object (-> s5-0 base))))
(set! (-> (the-as dma-packet v1-7) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -1419,7 +1419,7 @@
(let* ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(gp-0 (-> s5-0 base))
)
((method-of-type hud-box hud-box-method-9) (the-as hud-box (-> arg0 box)) s5-0)
((method-of-type hud-box draw-box-prim-only) (the-as hud-box (-> arg0 box)) s5-0)
(let ((a3-1 (-> s5-0 base)))
(let ((v1-7 (the-as object (-> s5-0 base))))
(set! (-> (the-as dma-packet v1-7) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -2486,42 +2486,67 @@
(set! (-> arg1 height) 190.0)
(let ((s2-8 (-> *progress-save-info* file arg2 level-index)))
(when (= arg2 sv-20)
(set-vector! (-> obj sprites 0 color) 128 128 128 (the int (* 128.0 sv-16)))
(set-vector! (-> obj sprites 1 color) 128 128 128 (the int (* 128.0 sv-16)))
(let ((v1-199 (-> obj sprites 0 color2)))
(set! (-> v1-199 0) 128)
(set! (-> v1-199 1) 128)
(set! (-> v1-199 2) 128)
(set! (-> v1-199 3) (the int (* 128.0 sv-16)))
)
(let ((v1-200 (-> obj sprites 1 color2)))
(set! (-> v1-200 0) 128)
(set! (-> v1-200 1) 128)
(set! (-> v1-200 2) 128)
(set! (-> v1-200 3) (the int (* 128.0 sv-16)))
)
(set! (-> obj sprites 1 pos z) #xffffff)
(set! (-> obj sprites 1 pos w) 1)
(set! (-> obj sprites 1 tex) (lookup-texture-by-id (get-level-icon-id-01 (the-as int s2-8))))
(set! (-> obj sprites 1 tex) (lookup-texture-by-id (get-level-icon-id-01 s2-8)))
(set! (-> obj sprites 1 scale-x) 1.0)
(set! (-> obj sprites 1 scale-y) 1.0)
(set-hud-piece-position! (-> obj sprites 1) sv-40 sv-48)
(set-vector! (-> obj sprites 2 color) 128 128 128 (the int (* 128.0 sv-16)))
(let ((v1-205 (-> obj sprites 2 color2)))
(set! (-> v1-205 0) 128)
(set! (-> v1-205 1) 128)
(set! (-> v1-205 2) 128)
(set! (-> v1-205 3) (the int (* 128.0 sv-16)))
)
(set! (-> obj sprites 2 pos z) #xffffff)
(set! (-> obj sprites 2 pos w) 1)
(set! (-> obj sprites 2 tex) (lookup-texture-by-id (get-level-icon-id-02 (the-as int s2-8))))
(set! (-> obj sprites 2 tex) (lookup-texture-by-id (get-level-icon-id-02 s2-8)))
(set! (-> obj sprites 2 scale-x) 1.0)
(set! (-> obj sprites 2 scale-y) 1.0)
(set-hud-piece-position! (-> obj sprites 2) (+ sv-40 sv-56) sv-48)
(set-vector! (-> obj sprites 3 color) 128 128 128 (the int (* 128.0 sv-16)))
(let ((v1-211 (-> obj sprites 3 color2)))
(set! (-> v1-211 0) 128)
(set! (-> v1-211 1) 128)
(set! (-> v1-211 2) 128)
(set! (-> v1-211 3) (the int (* 128.0 sv-16)))
)
(set! (-> obj sprites 3 pos z) #xffffff)
(set! (-> obj sprites 3 pos w) 1)
(set! (-> obj sprites 3 tex) (lookup-texture-by-id (get-level-icon-id-03 (the-as int s2-8))))
(set! (-> obj sprites 3 tex) (lookup-texture-by-id (get-level-icon-id-03 s2-8)))
(set! (-> obj sprites 3 scale-x) 1.0)
(set! (-> obj sprites 3 scale-y) 1.0)
(set-hud-piece-position! (-> obj sprites 3) sv-40 (+ sv-48 64))
(set-vector! (-> obj sprites 4 color) 128 128 128 (the int (* 128.0 sv-16)))
(let ((v1-217 (-> obj sprites 4 color2)))
(set! (-> v1-217 0) 128)
(set! (-> v1-217 1) 128)
(set! (-> v1-217 2) 128)
(set! (-> v1-217 3) (the int (* 128.0 sv-16)))
)
(set! (-> obj sprites 4 pos z) #xffffff)
(set! (-> obj sprites 4 pos w) 1)
(set! (-> obj sprites 4 tex) (lookup-texture-by-id (get-level-icon-id-04 (the-as int s2-8))))
(set! (-> obj sprites 4 tex) (lookup-texture-by-id (get-level-icon-id-04 s2-8)))
(set! (-> obj sprites 4 scale-x) 1.0)
(set! (-> obj sprites 4 scale-y) 1.0)
(set-hud-piece-position! (-> obj sprites 4) (+ sv-40 sv-56) (+ sv-48 64))
(let* ((s1-7 (-> *display* frames (-> *display* on-screen) global-buf))
(s2-9 (-> s1-7 base))
)
(hud-sprite-method-9 (-> obj sprites 1) s1-7 (-> *level* default-level))
(hud-sprite-method-9 (-> obj sprites 2) s1-7 (-> *level* default-level))
(hud-sprite-method-9 (-> obj sprites 3) s1-7 (-> *level* default-level))
(hud-sprite-method-9 (-> obj sprites 4) s1-7 (-> *level* default-level))
(draw (-> obj sprites 1) s1-7 (-> *level* default-level))
(draw (-> obj sprites 2) s1-7 (-> *level* default-level))
(draw (-> obj sprites 3) s1-7 (-> *level* default-level))
(draw (-> obj sprites 4) s1-7 (-> *level* default-level))
(let ((a3-35 (-> s1-7 base)))
(let ((v1-237 (the-as object (-> s1-7 base))))
(set! (-> (the-as dma-packet v1-237) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -2551,11 +2576,7 @@
(let* ((s1-8 (-> *display* frames (-> *display* on-screen) global-buf))
(s2-10 (-> s1-8 base))
)
((method-of-type hud-sprite hud-sprite-method-9)
(the-as hud-sprite (-> obj sprites))
s1-8
(-> *level* default-level)
)
((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-8 (-> *level* default-level))
(let ((a3-36 (-> s1-8 base)))
(let ((v1-260 (the-as object (-> s1-8 base))))
(set! (-> (the-as dma-packet v1-260) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -2574,7 +2595,7 @@
(set! (-> arg1 origin y) (+ 1.0 (-> arg1 origin y)))
(set! (-> arg1 origin x) (+ 28.0 (-> arg1 origin x)))
(let* ((v1-272 (-> *progress-save-info* file arg2 game-time0))
(v1-273 (logior (shl (the-as int (-> *progress-save-info* file arg2 game-time1)) 32) v1-272))
(v1-273 (logior (shl (-> *progress-save-info* file arg2 game-time1) 32) v1-272))
(s2-11 (/ (the-as int v1-273) #x107ac0))
)
(set! sv-112 (/ (mod (the-as int v1-273) #x107ac0) #x4650))
@@ -2588,11 +2609,7 @@
(let* ((s1-10 (-> *display* frames (-> *display* on-screen) global-buf))
(s2-12 (-> s1-10 base))
)
((method-of-type hud-sprite hud-sprite-method-9)
(the-as hud-sprite (-> obj sprites))
s1-10
(-> *level* default-level)
)
((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-10 (-> *level* default-level))
(let ((a3-39 (-> s1-10 base)))
(let ((v1-285 (the-as object (-> s1-10 base))))
(set! (-> (the-as dma-packet v1-285) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -2618,11 +2635,7 @@
(let* ((s1-12 (-> *display* frames (-> *display* on-screen) global-buf))
(s2-14 (-> s1-12 base))
)
((method-of-type hud-sprite hud-sprite-method-9)
(the-as hud-sprite (-> obj sprites))
s1-12
(-> *level* default-level)
)
((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-12 (-> *level* default-level))
(let ((a3-41 (-> s1-12 base)))
(let ((v1-304 (the-as object (-> s1-12 base))))
(set! (-> (the-as dma-packet v1-304) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -2650,11 +2663,7 @@
(let* ((s1-14 (-> *display* frames (-> *display* on-screen) global-buf))
(s2-16 (-> s1-14 base))
)
((method-of-type hud-sprite hud-sprite-method-9)
(the-as hud-sprite (-> obj sprites))
s1-14
(-> *level* default-level)
)
((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s1-14 (-> *level* default-level))
(let ((a3-43 (-> s1-14 base)))
(let ((v1-325 (the-as object (-> s1-14 base))))
(set! (-> (the-as dma-packet v1-325) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -3299,18 +3308,19 @@
(set! (-> obj sprites 0 tex) (lookup-texture-by-id (new 'static 'texture-id :index #x48 :page #x67a)))
(set! (-> obj sprites 0 scale-x) 1.0)
(set! (-> obj sprites 0 scale-y) 1.0)
(set-vector! (-> obj sprites 0 color) 128 128 128 (the int (* 128.0 (- 1.0 (-> arg0 menu-transition)))))
(let ((v1-6 (-> obj sprites 0 color2)))
(set! (-> v1-6 0) 128)
(set! (-> v1-6 1) 128)
(set! (-> v1-6 2) 128)
(set! (-> v1-6 3) (the int (* 128.0 (- 1.0 (-> arg0 menu-transition)))))
)
(set! (-> obj sprites 0 pos z) #xffffff)
(set! (-> obj sprites 0 pos w) 0)
(set-hud-piece-position! (the-as hud-sprite (-> obj sprites)) 240 160)
(let* ((s3-0 (-> *display* frames (-> *display* on-screen) global-buf))
(s4-1 (-> s3-0 base))
)
((method-of-type hud-sprite hud-sprite-method-9)
(the-as hud-sprite (-> obj sprites))
s3-0
(-> *level* default-level)
)
((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s3-0 (-> *level* default-level))
(let ((a3-1 (-> s3-0 base)))
(let ((v1-16 (the-as object (-> s3-0 base))))
(set! (-> (the-as dma-packet v1-16) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -4698,18 +4708,19 @@
(set! (-> obj sprites 0 flags) (the-as uint 4))
(set! (-> obj sprites 0 scale-x) 0.64)
(set! (-> obj sprites 0 scale-y) 0.64)
(set-vector! (-> obj sprites 0 color) 128 128 128 (the int (* 128.0 sv-16)))
(let ((v1-32 (-> obj sprites 0 color2)))
(set! (-> v1-32 0) 128)
(set! (-> v1-32 1) 128)
(set! (-> v1-32 2) 128)
(set! (-> v1-32 3) (the int (* 128.0 sv-16)))
)
(set! (-> obj sprites 0 pos z) #xffffff)
(set! (-> obj sprites 0 pos w) 0)
(set-hud-piece-position! (the-as hud-sprite (-> obj sprites)) 100 128)
(let* ((s3-0 (-> *display* frames (-> *display* on-screen) global-buf))
(s4-0 (-> s3-0 base))
)
((method-of-type hud-sprite hud-sprite-method-9)
(the-as hud-sprite (-> obj sprites))
s3-0
(-> *level* default-level)
)
((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s3-0 (-> *level* default-level))
(let ((a3-1 (-> s3-0 base)))
(let ((v1-42 (the-as object (-> s3-0 base))))
(set! (-> (the-as dma-packet v1-42) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -4893,11 +4904,7 @@
(let* ((s4-1 (-> *display* frames (-> *display* on-screen) global-buf))
(gp-1 (-> s4-1 base))
)
((method-of-type hud-sprite hud-sprite-method-9)
(the-as hud-sprite (-> arg0 sprites))
s4-1
(-> *level* default-level)
)
((method-of-type hud-sprite draw) (the-as hud-sprite (-> arg0 sprites)) s4-1 (-> *level* default-level))
(let ((a3-1 (-> s4-1 base)))
(let ((v1-8 (the-as object (-> s4-1 base))))
(set! (-> (the-as dma-packet v1-8) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -4946,11 +4953,7 @@
(let* ((s4-1 (-> *display* frames (-> *display* on-screen) global-buf))
(s5-1 (-> s4-1 base))
)
((method-of-type hud-sprite hud-sprite-method-9)
(the-as hud-sprite (&-> arg0 pad 3))
s4-1
(-> *level* default-level)
)
((method-of-type hud-sprite draw) (the-as hud-sprite (&-> arg0 pad 3)) s4-1 (-> *level* default-level))
(let ((a3-1 (-> s4-1 base)))
(let ((v1-20 (the-as object (-> s4-1 base))))
(set! (-> (the-as dma-packet v1-20) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -5751,7 +5754,12 @@
(set! (-> sv-144 sprites 0 flags) (the-as uint 4))
(set! (-> sv-144 sprites 0 scale-x) sv-100)
(set! (-> sv-144 sprites 0 scale-y) sv-100)
(set-vector! (-> sv-144 sprites 0 color) 128 128 128 (the int (* 128.0 sv-96)))
(let ((v1-33 (-> sv-144 sprites 0 color2)))
(set! (-> v1-33 0) 128)
(set! (-> v1-33 1) 128)
(set! (-> v1-33 2) 128)
(set! (-> v1-33 3) (the int (* 128.0 sv-96)))
)
(set! (-> sv-144 sprites 0 pos z) #xfffff0)
(set! (-> sv-144 sprites 0 pos w) 0)
(if (= (-> *setting-control* user-default language) (language-enum spanish))
@@ -7050,25 +7058,45 @@
(set! (-> obj sprites 0 tex) (lookup-texture-by-id (new 'static 'texture-id :index #xb :page #xc93)))
(set! (-> obj sprites 0 scale-x) f28-0)
(set! (-> obj sprites 0 scale-y) 0.7)
(set-vector! (-> obj sprites 0 color) 128 128 128 (the int (* 128.0 f30-0)))
(let ((v1-57 (-> obj sprites 0 color2)))
(set! (-> v1-57 0) 128)
(set! (-> v1-57 1) 128)
(set! (-> v1-57 2) 128)
(set! (-> v1-57 3) (the int (* 128.0 f30-0)))
)
(set! (-> obj sprites 0 pos z) #x3fffff)
(set! (-> obj sprites 0 pos w) 0)
(set! (-> obj sprites 1 tex) (lookup-texture-by-id (new 'static 'texture-id :index #xc :page #xc93)))
(set! (-> obj sprites 1 scale-x) 0.2)
(set! (-> obj sprites 1 scale-y) 1.33)
(set-vector! (-> obj sprites 1 color) 128 128 128 (the int (* 128.0 f30-0)))
(let ((v1-62 (-> obj sprites 1 color2)))
(set! (-> v1-62 0) 128)
(set! (-> v1-62 1) 128)
(set! (-> v1-62 2) 128)
(set! (-> v1-62 3) (the int (* 128.0 f30-0)))
)
(set! (-> obj sprites 1 pos z) #x3fffff)
(set! (-> obj sprites 1 pos w) 0)
(set! (-> obj sprites 2 tex) (lookup-texture-by-id (new 'static 'texture-id :index #x3e :page #xc93)))
(set! (-> obj sprites 2 scale-x) 1.0)
(set! (-> obj sprites 2 scale-y) 1.0)
(set-vector! (-> obj sprites 2 color) sv-80 sv-96 sv-112 (the int (* 128.0 f30-0)))
(let ((v1-67 (-> obj sprites 2 color2)))
(set! (-> v1-67 0) sv-80)
(set! (-> v1-67 1) sv-96)
(set! (-> v1-67 2) sv-112)
(set! (-> v1-67 3) (the int (* 128.0 f30-0)))
)
(set! (-> obj sprites 2 pos z) #xffffff)
(set! (-> obj sprites 2 pos w) 0)
(set! (-> obj sprites 3 tex) (lookup-texture-by-id (new 'static 'texture-id :index #x3f :page #xc93)))
(set! (-> obj sprites 3 scale-x) 1.0)
(set! (-> obj sprites 3 scale-y) 1.0)
(set-vector! (-> obj sprites 3 color) sv-80 sv-96 sv-112 (the int (* 128.0 f30-0)))
(let ((v1-72 (-> obj sprites 3 color2)))
(set! (-> v1-72 0) sv-80)
(set! (-> v1-72 1) sv-96)
(set! (-> v1-72 2) sv-112)
(set! (-> v1-72 3) (the int (* 128.0 f30-0)))
)
(set! (-> obj sprites 3 pos z) #xffffff)
(set! (-> obj sprites 3 pos w) 0)
(set-hud-piece-position! (the-as hud-sprite (-> obj sprites)) s1-0 s2-0)
@@ -7081,11 +7109,7 @@
(set-hud-piece-position! (-> obj sprites 3) (+ sv-64 242 s1-0) (+ s2-0 -4))
(set! sv-176 (-> *display* frames (-> *display* on-screen) global-buf))
(set! sv-192 (-> sv-176 base))
((method-of-type hud-sprite hud-sprite-method-9)
(the-as hud-sprite (-> obj sprites))
sv-176
(-> *level* default-level)
)
((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) sv-176 (-> *level* default-level))
(draw-sprite2d-xy
sv-176
(+ s1-0 s0-0 (the int (* 230.0 (-> (the-as (pointer float) sv-128)))))
@@ -7094,9 +7118,9 @@
9
(the-as rgba sv-160)
)
(hud-sprite-method-9 (-> obj sprites 1) sv-176 (-> *level* default-level))
(hud-sprite-method-9 (-> obj sprites 2) sv-176 (-> *level* default-level))
(hud-sprite-method-9 (-> obj sprites 3) sv-176 (-> *level* default-level))
(draw (-> obj sprites 1) sv-176 (-> *level* default-level))
(draw (-> obj sprites 2) sv-176 (-> *level* default-level))
(draw (-> obj sprites 3) sv-176 (-> *level* default-level))
(let ((a3-6 (-> sv-176 base)))
(let ((v1-100 (the-as object (-> sv-176 base))))
(set! (-> (the-as dma-packet v1-100) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -7165,25 +7189,45 @@
(set! (-> obj sprites 0 tex) (lookup-texture-by-id (new 'static 'texture-id :index #xb :page #xc93)))
(set! (-> obj sprites 0 scale-x) f28-0)
(set! (-> obj sprites 0 scale-y) 0.7)
(set-vector! (-> obj sprites 0 color) 128 128 128 (the int (* 128.0 f30-0)))
(let ((v1-140 (-> obj sprites 0 color2)))
(set! (-> v1-140 0) 128)
(set! (-> v1-140 1) 128)
(set! (-> v1-140 2) 128)
(set! (-> v1-140 3) (the int (* 128.0 f30-0)))
)
(set! (-> obj sprites 0 pos z) #x3fffff)
(set! (-> obj sprites 0 pos w) 0)
(set! (-> obj sprites 1 tex) (lookup-texture-by-id (new 'static 'texture-id :index #xc :page #xc93)))
(set! (-> obj sprites 1 scale-x) 0.2)
(set! (-> obj sprites 1 scale-y) 1.33)
(set-vector! (-> obj sprites 1 color) 128 128 128 (the int (* 128.0 f30-0)))
(let ((v1-145 (-> obj sprites 1 color2)))
(set! (-> v1-145 0) 128)
(set! (-> v1-145 1) 128)
(set! (-> v1-145 2) 128)
(set! (-> v1-145 3) (the int (* 128.0 f30-0)))
)
(set! (-> obj sprites 1 pos z) #x3fffff)
(set! (-> obj sprites 1 pos w) 0)
(set! (-> obj sprites 2 tex) (lookup-texture-by-id (new 'static 'texture-id :index #x3e :page #xc93)))
(set! (-> obj sprites 2 scale-x) 1.0)
(set! (-> obj sprites 2 scale-y) 1.0)
(set-vector! (-> obj sprites 2 color) sv-80 sv-96 sv-112 (the int (* 128.0 f30-0)))
(let ((v1-150 (-> obj sprites 2 color2)))
(set! (-> v1-150 0) sv-80)
(set! (-> v1-150 1) sv-96)
(set! (-> v1-150 2) sv-112)
(set! (-> v1-150 3) (the int (* 128.0 f30-0)))
)
(set! (-> obj sprites 2 pos z) #xffffff)
(set! (-> obj sprites 2 pos w) 0)
(set! (-> obj sprites 3 tex) (lookup-texture-by-id (new 'static 'texture-id :index #x3f :page #xc93)))
(set! (-> obj sprites 3 scale-x) 1.0)
(set! (-> obj sprites 3 scale-y) 1.0)
(set-vector! (-> obj sprites 3 color) sv-80 sv-96 sv-112 (the int (* 128.0 f30-0)))
(let ((v1-155 (-> obj sprites 3 color2)))
(set! (-> v1-155 0) sv-80)
(set! (-> v1-155 1) sv-96)
(set! (-> v1-155 2) sv-112)
(set! (-> v1-155 3) (the int (* 128.0 f30-0)))
)
(set! (-> obj sprites 3 pos z) #xffffff)
(set! (-> obj sprites 3 pos w) 0)
(set-hud-piece-position! (the-as hud-sprite (-> obj sprites)) s1-0 s2-0)
@@ -7196,11 +7240,7 @@
(set-hud-piece-position! (-> obj sprites 3) (+ sv-64 242 s1-0) (+ s2-0 -4))
(set! sv-256 (-> *display* frames (-> *display* on-screen) global-buf))
(set! sv-272 (-> sv-256 base))
((method-of-type hud-sprite hud-sprite-method-9)
(the-as hud-sprite (-> obj sprites))
sv-256
(-> *level* default-level)
)
((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) sv-256 (-> *level* default-level))
(draw-sprite2d-xy
sv-256
(+ s1-0 s0-0 (the int (* 230.0 (-> (the-as (pointer float) sv-208)))))
@@ -7209,9 +7249,9 @@
9
(the-as rgba sv-240)
)
(hud-sprite-method-9 (-> obj sprites 1) sv-256 (-> *level* default-level))
(hud-sprite-method-9 (-> obj sprites 2) sv-256 (-> *level* default-level))
(hud-sprite-method-9 (-> obj sprites 3) sv-256 (-> *level* default-level))
(draw (-> obj sprites 1) sv-256 (-> *level* default-level))
(draw (-> obj sprites 2) sv-256 (-> *level* default-level))
(draw (-> obj sprites 3) sv-256 (-> *level* default-level))
(let ((a3-13 (-> sv-256 base)))
(let ((v1-183 (the-as object (-> sv-256 base))))
(set! (-> (the-as dma-packet v1-183) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
goal_src/jak2/engine/ui/progress/progress-h.gc
+6 -6
View File
@@ -61,7 +61,7 @@
(gone () _type_ :state 23)
(init-defaults (_type_) connection 24)
(progress-method-25 (_type_) none 25)
(progress-method-26 (_type_) object 26)
(is-gone (_type_) object 26)
(can-go-back? (_type_) symbol 27)
(progress-method-28 (_type_ symbol) symbol 28)
(progress-method-29 (_type_) int 29)
@@ -130,7 +130,7 @@
(deftype menu-slider-option (menu-option)
((value-to-modify pointer :offset-assert 48)
(sprites hud-sprite 5 :inline :offset-assert 64)
(sprites hud-sprite 5 :inline :offset 64)
)
:method-count-assert 12
:size-assert #x180
@@ -192,7 +192,7 @@
(deftype menu-memcard-slot-option (menu-option)
((sprites hud-sprite 5 :inline :offset-assert 48)
((sprites hud-sprite 5 :inline :offset 48)
(pad uint8 32 :offset-assert 368)
)
:method-count-assert 12
@@ -275,7 +275,7 @@
(deftype menu-icon-info-option (menu-option)
((sprites hud-sprite 2 :inline :offset-assert 48)
((sprites hud-sprite 2 :inline :offset 48)
)
:method-count-assert 12
:size-assert #xb0
@@ -392,7 +392,7 @@
(deftype menu-highscores-option (paged-menu-option)
((last-move uint64 :offset-assert 64)
(sprites hud-sprite 2 :inline :offset-assert 80)
(sprites hud-sprite 2 :inline :offset 80)
)
:method-count-assert 12
:size-assert #xd0
@@ -419,7 +419,7 @@
(num-hero-items int32 :offset-assert 60)
(secret-items (array secret-item-option) :offset-assert 64)
(last-move uint64 :offset-assert 72)
(sprites hud-sprite 2 :inline :offset-assert 80)
(sprites hud-sprite 2 :inline :offset 80)
)
:method-count-assert 12
:size-assert #xd0
goal_src/jak2/engine/ui/progress/progress.gc
+3 -9
View File
@@ -502,7 +502,7 @@
(none)
)
(defmethod progress-method-26 progress ((obj progress))
(defmethod is-gone progress ((obj progress))
(and *progress-process*
(-> *progress-process* 0 next-state)
(= (-> *progress-process* 0 next-state name) 'gone)
@@ -1299,7 +1299,7 @@
(with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(bucket-id progress)
)
(hud-box-method-13 arg0 s5-0 arg1)
(draw-scan-and-line arg0 s5-0 arg1)
)
0
)
@@ -1394,13 +1394,7 @@
(let ((s5-1 (new 'stack-no-clear 'vector4w)))
(set! (-> s5-1 quad) (the-as uint128 0))
(if (and (transform-point-qword! gp-1 s4-2) (transform-point-qword! s5-1 s3-1))
(bigmap-method-11
*bigmap*
(the-as int (/ (the-as int (-> s5-1 x)) 16))
(the-as int (/ (the-as int (-> s5-1 y)) 16))
(the-as int (/ (the-as int (-> gp-1 x)) 16))
(the-as int (/ (the-as int (-> gp-1 y)) 16))
)
(bigmap-method-11 *bigmap* (/ (-> s5-1 x) 16) (/ (-> s5-1 y) 16) (/ (-> gp-1 x) 16) (/ (-> gp-1 y) 16))
)
)
)
goal_src/jak2/engine/ui/text-id-h.gc
+1
View File
@@ -372,6 +372,7 @@
(text-x24d #x024d)
(text-x24e #x024e)
(text-x24f #x024f)
(text-x277 #x0277)
(scene-subtitles-enabled #x30d)
(scene-subtitles-disabled #x30e)
(progress-unknown-continue #x310)
goal_src/jak2/levels/common/airlock.gc
+1 -1
View File
@@ -338,7 +338,7 @@
(cond
((and gp-0 (>= (- (-> self clock frame-counter) (-> obj spool-sound-time)) (seconds 2)))
(set! (-> obj spool-sound-time) (-> self clock frame-counter))
(gui-control-method-9
(add-process
*gui-control*
obj
(gui-channel alert)
goal_src/jak2/levels/common/battle.gc
+16 -16
View File
@@ -792,13 +792,13 @@
)
)
(('beaten)
(set! (-> self flags) (the-as uint (logior (the-as int (-> self flags)) 4)))
(logior! (-> self flags) 4)
(if (and (-> self next-state) (= (-> self next-state name) 'idle))
(go-virtual beaten)
)
)
(('resume)
(set! (-> self flags) (the-as uint (logand -5 (-> self flags))))
(set! (-> self flags) (logand -5 (-> self flags)))
(process-entity-status! self (entity-perm-status subtask-complete) #f)
(if (and (-> self next-state) (= (-> self next-state name) 'beaten))
(go-virtual hostile)
@@ -989,7 +989,7 @@
)
(defmethod battle-method-25 battle ((obj battle) (arg0 battle-spawner))
(when (not (logtest? (the-as int (-> obj flags)) 8))
(when (not (logtest? (-> obj flags) 8))
(let ((f0-0 (-> obj info spawner-blocked-by-player-xz)))
(if (and (< 0.0 f0-0) (>= (* f0-0 f0-0) (vector-vector-xz-distance-squared (target-pos 0) (-> arg0 attack-pos))))
(return #t)
@@ -1184,7 +1184,7 @@
)
(defmethod battle-method-51 battle ((obj battle) (arg0 battle-spawner) (arg1 symbol))
(when (and (logtest? (the-as int (-> obj flags)) 2) (zero? (logand (the-as int (-> obj flags)) 4)))
(when (and (logtest? (-> obj flags) 2) (zero? (logand (-> obj flags) 4)))
(let ((v1-5 (-> arg0 noticed-attack-time)))
(cond
((zero? v1-5)
@@ -1402,10 +1402,10 @@
(if (-> self spawn-initial-creatures?)
(battle-method-40 self)
)
(if (logtest? (the-as int (-> self flags)) 1)
(if (logtest? (-> self flags) 1)
(go-virtual hostile)
)
(set! (-> self flags) (the-as uint (logior (the-as int (-> self flags)) 1)))
(logior! (-> self flags) 1)
(none)
)
:trans (behavior ()
@@ -1460,11 +1460,11 @@
(v1-4 (-> obj max-count))
)
(when (zero? a0-4)
(if (or (logtest? (the-as int (-> obj flags)) 4) (>= (-> obj die-count) v1-4))
(if (or (logtest? (-> obj flags) 4) (>= (-> obj die-count) v1-4))
(return #t)
)
)
(set! (-> obj flags) (the-as uint (logand -9 (-> obj flags))))
(set! (-> obj flags) (logand -9 (-> obj flags)))
(cond
((and (> s5-0 0) (>= s5-0 (the-as int (- v1-4 (-> obj die-count)))))
(let ((a1-14 (-> obj jammed-starting-time)))
@@ -1474,7 +1474,7 @@
)
(else
(if (>= (- (-> pp clock frame-counter) a1-14) (seconds 3.5))
(set! (-> obj flags) (the-as uint (logior (the-as int (-> obj flags)) 8)))
(logior! (-> obj flags) 8)
)
)
)
@@ -1486,7 +1486,7 @@
)
)
(cond
((and (not (logtest? (the-as int (-> obj flags)) 4))
((and (not (logtest? (-> obj flags) 4))
(> (-> obj spawners length) 0)
(< a0-4 (the-as int (-> obj info desired-alive-count)))
(< (-> obj count) v1-4)
@@ -1521,8 +1521,8 @@
:event battle-event-handler
:enter (behavior ()
(set! (-> self state-time) (-> self clock frame-counter))
(set! (-> self flags) (the-as uint (logior (the-as int (-> self flags)) 2)))
(set! (-> self flags) (the-as uint (logand -9 (-> self flags))))
(logior! (-> self flags) 2)
(set! (-> self flags) (logand -9 (-> self flags)))
(set! (-> self jammed-starting-time) 0)
(set! (-> self cant-spawn-time) 0)
(set! (-> self next-spawn-delay) (the-as uint 0))
@@ -1568,10 +1568,10 @@
:code (the-as (function none :behavior battle) sleep-code)
)
;; WARN: Return type mismatch uint8 vs none.
;; WARN: Return type mismatch uint vs none.
(defmethod battle-method-47 battle ((obj battle))
(let ((a3-0 (-> obj info play-battle-music)))
(when (and a3-0 (zero? (logand (the-as int (-> obj flags)) 16)))
(when (and a3-0 (zero? (logand (-> obj flags) 16)))
(case a3-0
(('sound-mode)
(set-setting! 'sound-mode #f 0 1)
@@ -1580,14 +1580,14 @@
(set-setting! 'music a3-0 0 0)
)
)
(set! (-> obj flags) (the-as uint (logior (the-as int (-> obj flags)) 16)))
(logior! (-> obj flags) 16)
)
)
(none)
)
(defmethod battle-method-48 battle ((obj battle))
(when (logtest? (the-as int (-> obj flags)) 16)
(when (logtest? (-> obj flags) 16)
(remove-setting! 'sound-mode)
(remove-setting! 'music)
)
goal_src/jak2/levels/common/enemy/guards/guard-conversation.gc
+8 -8
View File
@@ -218,7 +218,7 @@
)
)
)
(gui-control-method-9
(add-process
*gui-control*
obj
(gui-channel guard)
@@ -294,11 +294,11 @@
(go-virtual die)
)
)
(if (nonzero? (gui-control-method-17
(if (nonzero? (get-status
*gui-control*
(the-as
sound-id
(gui-control-method-14 *gui-control* (the-as string #f) (gui-channel guard) (gui-action none))
(lookup-gui-connection-id *gui-control* (the-as string #f) (gui-channel guard) (gui-action none))
)
)
)
@@ -315,7 +315,7 @@
(defstate notice (guard-conversation)
:virtual #t
:code (behavior ()
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -326,7 +326,7 @@
(the-as process #f)
)
(let ((v1-2 (rand-vu-int-count 3)))
(gui-control-method-9
(add-process
*gui-control*
self
(gui-channel guard)
@@ -346,14 +346,14 @@
0
)
)
(until (= (gui-control-method-17
(until (= (get-status
*gui-control*
(the-as
sound-id
(gui-control-method-14 *gui-control* (the-as string #f) (gui-channel guard) (gui-action none))
(lookup-gui-connection-id *gui-control* (the-as string #f) (gui-channel guard) (gui-action none))
)
)
(gui-action none)
(gui-status unknown)
)
(suspend)
)
goal_src/jak2/levels/common/flitter.gc
+15 -15
View File
@@ -399,10 +399,10 @@
)
(defskelgroup skel-flitter flitter 0 -1
((1 (meters 20)) (2 (meters 40)) (3 (meters 999999)))
(defskelgroup skel-flitter flitter flitter-lod0-jg -1
((flitter-lod0-mg (meters 20)) (flitter-lod1-mg (meters 40)) (flitter-lod2-mg (meters 999999)))
:bounds (static-spherem 0 0 0 5.5)
:shadow 4
:shadow flitter-shadow-mg
:origin-joint-index 3
)
@@ -590,7 +590,7 @@
(defmethod enemy-method-78 flitter ((obj flitter) (arg0 (pointer float)))
(case (-> obj incoming knocked-type)
(((knocked-type knocked-type-6))
(when (>= (the-as uint (-> obj incoming blue-juggle-count)) (the-as uint 2))
(when (>= (-> obj incoming blue-juggle-count) (the-as uint 2))
(let ((v1-4 (-> obj skel root-channel 0)))
(set! (-> v1-4 frame-group) (the-as art-joint-anim (-> obj draw art-group data 22)))
(set! (-> v1-4 param 0)
@@ -739,8 +739,8 @@
)
:code (behavior ()
(ja-channel-push! 1 (seconds 0.1))
(ja-no-eval :group! (-> self draw art-group data 10)
:num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 10)) frames num-frames) -1)))
(ja-no-eval :group! flitter-ambush-jump-ja
:num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-ambush-jump-ja) frames num-frames) -1)))
)
(until #f
(when (< (-> self base-height) (-> self root-override2 trans y))
@@ -814,8 +814,8 @@
)
#f
(label cfg-26)
(ja-no-eval :group! (-> self draw art-group data 11)
:num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 11)) frames num-frames) -1)))
(ja-no-eval :group! flitter-ambush-land-ja
:num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-ambush-land-ja) frames num-frames) -1)))
:frame-num 0.0
)
(until (ja-done? 0)
@@ -979,7 +979,7 @@
0
(ja-no-eval :num! (loop!))
(ja-channel-push! 1 (seconds 0.2))
(ja :group! (-> self draw art-group data 15))
(ja :group! flitter-turn-ja)
(ja :num-func num-func-identity :frame-num 0.0)
(until (enemy-method-96 self 1820.4445 #t)
(ja-blend-eval)
@@ -1249,17 +1249,17 @@
:code (behavior ()
(ja-channel-push! 2 (seconds 0.1))
(let ((f30-0 (flitter-method-183 self)))
(ja-no-eval :group! (-> self draw art-group data 16)
:num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) frames num-frames) -1)) 0.8)
(ja-no-eval :group! flitter-attack-ja
:num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-attack-ja) frames num-frames) -1)) 0.8)
:frame-num 0.0
)
(let ((a0-3 (-> self skel root-channel 1)))
(set! (-> a0-3 frame-interp 1) f30-0)
(set! (-> a0-3 frame-interp 0) f30-0)
(set! (-> a0-3 frame-group) (the-as art-joint-anim (-> self draw art-group data 17)))
(set! (-> a0-3 frame-group) (the-as art-joint-anim flitter-attack-high-ja))
(set! (-> a0-3 param 0) 0.0)
(set! (-> a0-3 frame-num) 0.0)
(joint-control-channel-group! a0-3 (the-as art-joint-anim (-> self draw art-group data 17)) num-func-chan)
(joint-control-channel-group! a0-3 (the-as art-joint-anim flitter-attack-high-ja) num-func-chan)
)
(until (ja-done? 0)
(suspend)
@@ -1284,8 +1284,8 @@
(logclear! (-> self focus-status) (focus-status dangerous))
)
(dotimes (gp-1 (get-rand-int self 3))
(ja-no-eval :group! (-> self draw art-group data 5)
:num! (seek! (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) frames num-frames) -1)))
(ja-no-eval :group! flitter-idle-ja
:num! (seek! (the float (+ (-> (the-as art-joint-anim flitter-idle-ja) frames num-frames) -1)))
:frame-num 0.0
)
(until (ja-done? 0)
goal_src/jak2/levels/common/grunt.gc
+15 -40
View File
@@ -7,10 +7,10 @@
;; DECOMP BEGINS
(defskelgroup skel-grunt grunt 0 -1
((1 (meters 20)) (2 (meters 40)) (3 (meters 999999)))
(defskelgroup skel-grunt grunt grunt-lod0-jg -1
((grunt-lod0-mg (meters 20)) (grunt-lod1-mg (meters 40)) (grunt-lod2-mg (meters 999999)))
:bounds (static-spherem 0 0 0 5)
:shadow 4
:shadow grunt-shadow-mg
:origin-joint-index 18
)
@@ -521,17 +521,10 @@
:virtual #t
:code (behavior ()
(let ((v1-2 (ja-group)))
(when (or (and v1-2 (or (= v1-2 (-> self draw art-group data 14))
(= v1-2 (-> self draw art-group data 15))
(= v1-2 (-> self draw art-group data 16))
)
)
(when (or (and v1-2 (or (= v1-2 grunt-charge0-ja) (= v1-2 grunt-charge1-ja) (= v1-2 grunt-charge2-ja)))
(let ((v1-8 (ja-group)))
(and v1-8 (or (= v1-8 (-> self draw art-group data 11))
(= v1-8 (-> self draw art-group data 12))
(= v1-8 (-> self draw art-group data 14))
(= v1-8 (-> self draw art-group data 15))
)
(and v1-8
(or (= v1-8 grunt-patrol0-ja) (= v1-8 grunt-patrol1-ja) (= v1-8 grunt-charge0-ja) (= v1-8 grunt-charge1-ja))
)
)
)
@@ -743,11 +736,7 @@
)
:code (behavior ()
(let ((v1-2 (ja-group)))
(when (and v1-2 (or (= v1-2 (-> self draw art-group data 14))
(= v1-2 (-> self draw art-group data 15))
(= v1-2 (-> self draw art-group data 16))
)
)
(when (and v1-2 (or (= v1-2 grunt-charge0-ja) (= v1-2 grunt-charge1-ja) (= v1-2 grunt-charge2-ja)))
(let ((v1-6 (-> self nav)))
(set! (-> v1-6 target-speed) (-> self charge-anim travel-speed))
)
@@ -987,11 +976,7 @@
:virtual #t
:code (behavior ()
(let ((v1-2 (ja-group)))
(when (and v1-2 (or (= v1-2 (-> self draw art-group data 14))
(= v1-2 (-> self draw art-group data 15))
(= v1-2 (-> self draw art-group data 16))
)
)
(when (and v1-2 (or (= v1-2 grunt-charge0-ja) (= v1-2 grunt-charge1-ja) (= v1-2 grunt-charge2-ja)))
(let ((v1-6 (-> self nav)))
(set! (-> v1-6 target-speed) (-> self charge-anim travel-speed))
)
@@ -1064,27 +1049,21 @@
0
(vector-reset! (-> self root-override2 transv))
(let ((v1-77 (ja-group)))
(if (not (and v1-77 (= v1-77 (-> self draw art-group data 30))))
(if (not (and v1-77 (= v1-77 grunt-celebrate-start-ja)))
(ja-channel-push! 1 (seconds 0.1))
)
)
(let ((f30-2 (get-rand-float-range self 0.9 1.1)))
(ja-no-eval :group! (-> self draw art-group data 30)
:num! (seek!
(the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 30)) frames num-frames) -1))
f30-2
)
(ja-no-eval :group! grunt-celebrate-start-ja
:num! (seek! (the float (+ (-> (the-as art-joint-anim grunt-celebrate-start-ja) frames num-frames) -1)) f30-2)
:frame-num 0.0
)
(until (ja-done? 0)
(suspend)
(ja :num! (seek! max f30-2))
)
(ja-no-eval :group! (-> self draw art-group data 31)
:num! (seek!
(the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 31)) frames num-frames) -1))
f30-2
)
(ja-no-eval :group! grunt-celebrate-finish-ja
:num! (seek! (the float (+ (-> (the-as art-joint-anim grunt-celebrate-finish-ja) frames num-frames) -1)) f30-2)
:frame-num 0.0
)
(until (ja-done? 0)
@@ -1103,11 +1082,7 @@
:virtual #t
:code (behavior ()
(let ((v1-2 (ja-group)))
(when (and v1-2 (or (= v1-2 (-> self draw art-group data 14))
(= v1-2 (-> self draw art-group data 15))
(= v1-2 (-> self draw art-group data 16))
)
)
(when (and v1-2 (or (= v1-2 grunt-charge0-ja) (= v1-2 grunt-charge1-ja) (= v1-2 grunt-charge2-ja)))
(let ((v1-6 (-> self nav)))
(set! (-> v1-6 target-speed) (-> self charge-anim travel-speed))
)
@@ -1260,7 +1235,7 @@
)
)
)
(if (>= (the-as uint (-> obj incoming blue-juggle-count)) (the-as uint 2))
(if (>= (-> obj incoming blue-juggle-count) (the-as uint 2))
(set! (-> obj unknown-byte-n123n) (the-as int (logior (-> obj stack 511) 2)))
)
(cond
goal_src/jak2/levels/fortress/prison/prison-obs.gc
+17 -125
View File
@@ -10,10 +10,6 @@
;; DECOMP BEGINS
;;-*-Lisp-*-
(in-package goal)
;; failed to figure out what this is:
(set! (-> *lightning-spec-id-table* 19) (new 'static 'lightning-spec
:name "lightning-darkjak-prison"
:flags (lightning-spec-flags lsf0)
@@ -33,7 +29,6 @@
)
)
;; failed to figure out what this is:
(set! (-> *lightning-spec-id-table* 20) (new 'static 'lightning-spec
:name "lightning-darkjak-prison-shock"
:flags (lightning-spec-flags lsf0)
@@ -55,14 +50,10 @@
)
)
;; definition for symbol *prsn-torture-lightning-joints*, type (array int32)
(define *prsn-torture-lightning-joints* (new 'static 'boxed-array :type int32 14 16 18 20))
;; definition for symbol *prsn-chair-shackle-lightning-joints*, type (array int32)
(define *prsn-chair-shackle-lightning-joints* (new 'static 'boxed-array :type int32 4 5 6 7))
;; definition for function dark-lightning-handler
;; INFO: Used lq/sq
;; WARN: Return type mismatch none vs object.
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 119]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 195]
@@ -79,18 +70,10 @@
(let ((s1-0 (command-get-process "prsn-chair-shackle" *target*))
(gp-1 (new 'stack-no-clear 'matrix))
(s2-0 *prsn-torture-lightning-joints*)
(s3-1
(rand-vu-int-range-exclude 0 (+ (-> *prsn-torture-lightning-joints* length) -1) (the-as int (-> s3-0 x)))
)
(s3-1 (rand-vu-int-range-exclude 0 (+ (-> *prsn-torture-lightning-joints* length) -1) (-> s3-0 x)))
)
*prsn-chair-shackle-lightning-joints*
(let ((v1-7 (rand-vu-int-range-exclude
0
(+ (-> *prsn-chair-shackle-lightning-joints* length) -1)
(the-as int (-> s4-0 x))
)
)
)
(let ((v1-7 (rand-vu-int-range-exclude 0 (+ (-> *prsn-chair-shackle-lightning-joints* length) -1) (-> s4-0 x))))
(when s1-0
(set! (-> s4-0 x) v1-7)
(vector<-cspace! (the-as vector (-> gp-1 vector)) (-> self node-list data 13))
@@ -118,13 +101,7 @@
((= arg2 'lightning-needle)
(let ((gp-2 (command-get-process "prsn-chair-shackle" *target*)))
*prsn-chair-shackle-lightning-joints*
(let ((v1-38 (rand-vu-int-range-exclude
0
(+ (-> *prsn-chair-shackle-lightning-joints* length) -1)
(the-as int (-> s4-0 x))
)
)
)
(let ((v1-38 (rand-vu-int-range-exclude 0 (+ (-> *prsn-chair-shackle-lightning-joints* length) -1) (-> s4-0 x))))
(when gp-2
(set! (-> s4-0 x) v1-38)
(let ((s4-2 (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 8)))
@@ -176,8 +153,8 @@
(when (and (nonzero? (-> self skel)) (nonzero? (-> (the-as process-drawable gp-3) skel)))
(let* ((v1-52 (-> s2-3 length))
(s1-3 (-> s5-3 length))
(s0-2 (rand-vu-int-range-exclude 0 (+ v1-52 -1) (the-as int (-> s3-0 x))))
(s1-4 (rand-vu-int-range-exclude 0 (+ s1-3 -1) (the-as int (-> s4-0 x))))
(s0-2 (rand-vu-int-range-exclude 0 (+ v1-52 -1) (-> s3-0 x)))
(s1-4 (rand-vu-int-range-exclude 0 (+ s1-3 -1) (-> s4-0 x)))
)
(set! sv-112 (-> *part-id-table* 179))
(set! (-> s3-0 x) s0-2)
@@ -235,7 +212,6 @@
)
)
;; definition of type prsn-hang-cell
(deftype prsn-hang-cell (process-drawable)
((path-u float :offset-assert 200)
(path-du float :offset-assert 204)
@@ -249,28 +225,12 @@
)
)
;; definition for method 3 of type prsn-hang-cell
(defmethod inspect prsn-hang-cell ((obj prsn-hang-cell))
(when (not obj)
(set! obj obj)
(goto cfg-4)
)
(let ((t9-0 (method-of-type process-drawable inspect)))
(t9-0 obj)
)
(format #t "~2Tpath-u: ~f~%" (-> obj path-u))
(format #t "~2Tpath-du: ~f~%" (-> obj path-du))
(label cfg-4)
obj
)
;; failed to figure out what this is:
(defskelgroup skel-prsn-hang-cell prsn-hang-cell 0 2
((1 (meters 999999)))
(defskelgroup skel-prsn-hang-cell prsn-hang-cell prsn-hang-cell-lod0-jg prsn-hang-cell-idle-ja
((prsn-hang-cell-lod0-mg (meters 999999)))
:bounds (static-spherem 0 -9.5 0 10)
)
;; failed to figure out what this is:
(defstate idle (prsn-hang-cell)
:virtual #t
:code (behavior ()
@@ -299,7 +259,6 @@
)
)
;; definition for method 11 of type prsn-hang-cell
;; WARN: Return type mismatch object vs none.
(defmethod init-from-entity! prsn-hang-cell ((obj prsn-hang-cell) (arg0 entity-actor))
(with-pp
@@ -340,7 +299,6 @@
)
)
;; definition for function prsn-hang-cell-init-by-other
;; WARN: Return type mismatch object vs none.
(defbehavior prsn-hang-cell-init-by-other prsn-hang-cell ((arg0 float))
(set! (-> self root) (new 'process 'trsqv))
@@ -359,14 +317,12 @@
(none)
)
;; failed to figure out what this is:
(defskelgroup skel-warp-gate-b warp-gate-b 0 2
((1 (meters 999999)))
(defskelgroup skel-warp-gate-b warp-gate-b warp-gate-b-lod0-jg warp-gate-b-idle-ja
((warp-gate-b-lod0-mg (meters 999999)))
:bounds (static-spherem 0 3 0 4)
:origin-joint-index 3
)
;; definition of type warp-gate-b
(deftype warp-gate-b (warp-gate)
()
:heap-base #x80
@@ -375,20 +331,7 @@
:flag-assert #x1a00800100
)
;; definition for method 3 of type warp-gate-b
(defmethod inspect warp-gate-b ((obj warp-gate-b))
(when (not obj)
(set! obj obj)
(goto cfg-4)
)
(let ((t9-0 (method-of-type warp-gate inspect)))
(t9-0 obj)
)
(label cfg-4)
obj
)
;; definition for method 23 of type warp-gate-b
;; WARN: Return type mismatch draw-control vs none.
(defmethod init-skel-and-collide warp-gate-b ((obj warp-gate-b))
(let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player))))
@@ -416,7 +359,6 @@
(none)
)
;; definition of type prsn-cell-door
(deftype prsn-cell-door (process-drawable)
((frame float :offset-assert 200)
(desired float :offset-assert 204)
@@ -430,29 +372,13 @@
)
)
;; definition for method 3 of type prsn-cell-door
(defmethod inspect prsn-cell-door ((obj prsn-cell-door))
(when (not obj)
(set! obj obj)
(goto cfg-4)
)
(let ((t9-0 (method-of-type process-drawable inspect)))
(t9-0 obj)
)
(format #t "~2Tframe: ~f~%" (-> obj frame))
(format #t "~2Tdesired: ~f~%" (-> obj desired))
(label cfg-4)
obj
)
;; failed to figure out what this is:
(defskelgroup skel-prsn-cell-door prsn-cell-door 0 2
((1 (meters 999999)))
(defskelgroup skel-prsn-cell-door prsn-cell-door prsn-cell-door-lod0-jg prsn-cell-door-idle-ja
((prsn-cell-door-lod0-mg (meters 999999)))
:bounds (static-spherem -2.5 3.25 0 4.25)
:origin-joint-index 3
)
;; failed to figure out what this is:
(defstate idle (prsn-cell-door)
:virtual #t
:event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block))
@@ -487,7 +413,6 @@
:post (the-as (function none :behavior prsn-cell-door) transform-post)
)
;; definition for method 11 of type prsn-cell-door
;; WARN: Return type mismatch object vs none.
(defmethod init-from-entity! prsn-cell-door ((obj prsn-cell-door) (arg0 entity-actor))
(let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player))))
@@ -520,7 +445,6 @@
(none)
)
;; definition of type prsn-vent-fan
(deftype prsn-vent-fan (process-drawable)
()
:heap-base #x50
@@ -532,27 +456,13 @@
)
)
;; definition for method 3 of type prsn-vent-fan
(defmethod inspect prsn-vent-fan ((obj prsn-vent-fan))
(when (not obj)
(set! obj obj)
(goto cfg-4)
)
(let ((t9-0 (method-of-type process-drawable inspect)))
(t9-0 obj)
)
(label cfg-4)
obj
)
;; failed to figure out what this is:
(defskelgroup skel-prsn-vent-fan prsn-vent-fan 0 3
((1 (meters 999999)))
(defskelgroup skel-prsn-vent-fan prsn-vent-fan prsn-vent-fan-lod0-jg prsn-vent-fan-idle-ja
((prsn-vent-fan-lod0-mg (meters 999999)))
:bounds (static-spherem -2.5 3.25 0 4.25)
:origin-joint-index 3
)
;; failed to figure out what this is:
(defstate idle (prsn-vent-fan)
:virtual #t
:code (behavior ()
@@ -572,7 +482,6 @@
:post (the-as (function none :behavior prsn-vent-fan) ja-post)
)
;; definition for method 11 of type prsn-vent-fan
;; WARN: Return type mismatch object vs none.
(defmethod init-from-entity! prsn-vent-fan ((obj prsn-vent-fan) (arg0 entity-actor))
(set! (-> obj root) (new 'process 'trsqv))
@@ -587,7 +496,6 @@
(none)
)
;; definition of type prsn-torture
(deftype prsn-torture (process-drawable)
()
:heap-base #x50
@@ -599,23 +507,13 @@
)
)
;; definition for method 3 of type prsn-torture
(defmethod inspect prsn-torture ((obj prsn-torture))
(when (not obj)
(set! obj obj)
(goto cfg-4)
)
(let ((t9-0 (method-of-type process-drawable inspect)))
(t9-0 obj)
)
(label cfg-4)
obj
)
;; failed to figure out what this is:
(defstate idle (prsn-torture)
:virtual #t
:event dark-lightning-handler
:event (the-as
(function process int symbol event-message-block object :behavior prsn-torture)
dark-lightning-handler
)
:code (behavior ()
(until #f
(ja-no-eval :group! (ja-group)
@@ -636,7 +534,6 @@
)
)
;; definition for method 11 of type prsn-torture
;; WARN: Return type mismatch object vs none.
(defmethod init-from-entity! prsn-torture ((obj prsn-torture) (arg0 entity-actor))
(let ((s4-0 (new 'process 'collide-shape obj (collide-list-enum usually-hit-by-player))))
@@ -732,7 +629,6 @@
(none)
)
;; failed to figure out what this is:
(scene-method-16
(new 'static 'scene
:name "fortress-save-friends-res"
@@ -886,7 +782,3 @@
:save #t
)
)
goal_src/jak2/levels/gungame/gungame-obs.gc
+76 -76
View File
@@ -87,7 +87,7 @@
(defmethod training-manager-method-32 training-manager ((obj training-manager))
(when (handle->process (-> obj voicebox))
(if (= (gui-control-method-17 *gui-control* (-> obj last-sound-id)) (gui-action none))
(if (= (get-status *gui-control* (-> obj last-sound-id)) (gui-status unknown))
(send-event (handle->process (-> obj voicebox)) 'speak-effect #f)
(send-event (handle->process (-> obj voicebox)) 'speak-effect #t)
)
@@ -96,13 +96,13 @@
((= (-> (level-get-target-inside *level*) name) 'gungame)
(if (zero? (-> obj gui-id))
(set! (-> obj gui-id)
(gui-control-method-9 *gui-control* obj (gui-channel message) (gui-action play) (-> obj name) 81920.0 0)
(add-process *gui-control* obj (gui-channel message) (gui-action play) (-> obj name) 81920.0 0)
)
)
)
(else
(when (nonzero? (-> obj gui-id))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(-> obj gui-id)
@@ -215,7 +215,7 @@
)
(defmethod training-manager-method-30 training-manager ((obj training-manager) (arg0 game-text-id))
(when (= (gui-control-method-17 *gui-control* (-> obj gui-id)) (gui-action playing))
(when (= (get-status *gui-control* (-> obj gui-id)) (gui-status active))
(let ((s5-1 (new
'stack
'font-context
@@ -270,15 +270,15 @@
(set! (-> self voicebox) (ppointer->handle (voicebox-spawn *target* (target-pos 0))))
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc001" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc001" -99.0 0)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc002" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc002" -99.0 0)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc003" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc003" -99.0 0)
)
(while (nonzero? (gui-control-method-17 *gui-control* (-> self last-sound-id)))
(while (nonzero? (get-status *gui-control* (-> self last-sound-id)))
(suspend)
)
(until (cpad-pressed? 0 r1)
@@ -286,18 +286,18 @@
(suspend)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc004" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc004" -99.0 0)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc005" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc005" -99.0 0)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc006" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc006" -99.0 0)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc007" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc007" -99.0 0)
)
(while (nonzero? (gui-control-method-17 *gui-control* (-> self last-sound-id)))
(while (nonzero? (get-status *gui-control* (-> self last-sound-id)))
(suspend)
)
(when *target*
@@ -307,12 +307,12 @@
)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* *target* (gui-channel sig) (gui-action play) "sigc008" -99.0 0)
(add-process *gui-control* *target* (gui-channel sig) (gui-action play) "sigc008" -99.0 0)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc009" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc009" -99.0 0)
)
(while (nonzero? (gui-control-method-17 *gui-control* (-> self last-sound-id)))
(while (nonzero? (get-status *gui-control* (-> self last-sound-id)))
(suspend)
)
(while (or (not *target*) (zero? (logand (focus-status gun) (-> *target* focus-status))))
@@ -320,17 +320,17 @@
(suspend)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc010" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc010" -99.0 0)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc011" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc011" -99.0 0)
)
(while (nonzero? (gui-control-method-17 *gui-control* (-> self last-sound-id)))
(while (nonzero? (get-status *gui-control* (-> self last-sound-id)))
(suspend)
)
(when (nonzero? (training-manager-method-26 self))
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc012" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc012" -99.0 0)
)
(let ((gp-2 (training-manager-method-26 self)))
(while (= (training-manager-method-26 self) gp-2)
@@ -339,13 +339,13 @@
)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc013" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc013" -99.0 0)
)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc014" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc014" -99.0 0)
)
(while (nonzero? (gui-control-method-17 *gui-control* (-> self last-sound-id)))
(while (nonzero? (get-status *gui-control* (-> self last-sound-id)))
(suspend)
)
(task-node-close! (game-task-node city-red-gun-training-introduction))
@@ -849,7 +849,7 @@
(set! (-> self egg-count) 0)
(if (not (task-node-open? (game-task-node sewer-enemy-resolution)))
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "cityv178" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "cityv178" -99.0 0)
)
)
(until #f
@@ -1006,15 +1006,15 @@
(set! (-> self voicebox) (ppointer->handle (voicebox-spawn *target* (target-pos 0))))
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc015" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc015" -99.0 0)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc016" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc016" -99.0 0)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc017" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc017" -99.0 0)
)
(while (nonzero? (gui-control-method-17 *gui-control* (-> self last-sound-id)))
(while (nonzero? (get-status *gui-control* (-> self last-sound-id)))
(suspend)
)
(let ((gp-2 (-> *game-info* gun-type)))
@@ -1024,12 +1024,12 @@
)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc073" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc073" -99.0 0)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc075" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc075" -99.0 0)
)
(while (nonzero? (gui-control-method-17 *gui-control* (-> self last-sound-id)))
(while (nonzero? (get-status *gui-control* (-> self last-sound-id)))
(suspend)
)
(set! (-> self combo-done?) #f)
@@ -1054,9 +1054,9 @@
(cond
((-> self combo-done?)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc080" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc080" -99.0 0)
)
(while (nonzero? (gui-control-method-17 *gui-control* (-> self last-sound-id)))
(while (nonzero? (get-status *gui-control* (-> self last-sound-id)))
(suspend)
)
#t
@@ -1064,9 +1064,9 @@
)
(else
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc077" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc077" -99.0 0)
)
(while (nonzero? (gui-control-method-17 *gui-control* (-> self last-sound-id)))
(while (nonzero? (get-status *gui-control* (-> self last-sound-id)))
(suspend)
)
)
@@ -1075,12 +1075,12 @@
#f
(label cfg-61)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc018" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc018" -99.0 0)
)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc022" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc022" -99.0 0)
)
(while (nonzero? (gui-control-method-17 *gui-control* (-> self last-sound-id)))
(while (nonzero? (get-status *gui-control* (-> self last-sound-id)))
(suspend)
)
(task-node-close! (game-task-node city-yellow-gun-training-introduction))
@@ -1230,12 +1230,12 @@
(cond
((zero? v1-106)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc026" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc026" -99.0 0)
)
)
((= v1-106 1)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc027" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc027" -99.0 0)
)
)
)
@@ -1271,7 +1271,7 @@
((>= (-> *game-info* score) (-> s5-0 0))
(set! (-> *game-info* goal) (-> *game-info* score))
(let ((s5-1 format)
(gp-1 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-1 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-0 "~S")
)
(let* ((s3-0 format)
@@ -1289,7 +1289,7 @@
((>= (-> *game-info* score) (-> s5-0 1))
(set! (-> *game-info* goal) (-> s5-0 0))
(let ((s5-2 format)
(gp-2 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-2 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-1 "~S")
)
(let* ((s3-1 format)
@@ -1307,7 +1307,7 @@
((>= (-> *game-info* score) (-> s5-0 2))
(set! (-> *game-info* goal) (-> s5-0 1))
(let ((s5-3 format)
(gp-3 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-3 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-2 "~S")
)
(let* ((s3-2 format)
@@ -1325,7 +1325,7 @@
(else
(set! (-> *game-info* goal) (-> s5-0 2))
(let ((s5-4 format)
(gp-4 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-4 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-3 "~S")
)
(let* ((s3-3 format)
@@ -1347,7 +1347,7 @@
((>= (-> *game-info* score) (-> s5-0 0))
(set! (-> *game-info* goal) (-> *game-info* score))
(let ((s5-5 format)
(gp-5 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-5 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-4 "~S")
)
(let* ((s3-4 format)
@@ -1365,7 +1365,7 @@
((>= (-> *game-info* score) (-> s5-0 1))
(set! (-> *game-info* goal) (-> s5-0 0))
(let ((s5-6 format)
(gp-6 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-6 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-5 "~S")
)
(let* ((s3-5 format)
@@ -1383,7 +1383,7 @@
(else
(set! (-> *game-info* goal) (-> s5-0 1))
(let ((s5-7 format)
(gp-7 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-7 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-6 "~S")
)
(let* ((s3-6 format)
@@ -1407,7 +1407,7 @@
((>= (-> *game-info* score) (-> s5-0 0))
(set! (-> *game-info* goal) (-> *game-info* score))
(let ((s5-8 format)
(gp-8 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-8 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-7 "~S")
)
(let* ((s3-7 format)
@@ -1425,7 +1425,7 @@
(else
(set! (-> *game-info* goal) (-> s5-0 0))
(let ((s5-9 format)
(gp-9 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-9 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-8 "~S")
)
(let* ((s3-8 format)
@@ -1445,7 +1445,7 @@
((>= (-> *game-info* score) (-> s5-0 0))
(set! (-> *game-info* goal) (-> *game-info* score))
(let ((s5-10 format)
(gp-10 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-10 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-9 "~S")
)
(let* ((s3-9 format)
@@ -1463,7 +1463,7 @@
((>= (-> *game-info* score) (-> s5-0 1))
(set! (-> *game-info* goal) (-> s5-0 0))
(let ((s5-11 format)
(gp-11 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-11 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-10 "~S")
)
(let* ((s3-10 format)
@@ -1481,7 +1481,7 @@
((>= (-> *game-info* score) (-> s5-0 2))
(set! (-> *game-info* goal) (-> s5-0 1))
(let ((s5-12 format)
(gp-12 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-12 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-11 "~S")
)
(let* ((s3-11 format)
@@ -1499,7 +1499,7 @@
((>= (-> *game-info* score) (-> self training-goal))
(set! (-> *game-info* goal) (-> s5-0 2))
(let ((s5-13 format)
(gp-13 (the-as hud (clear (the-as string (-> (the-as hud gp-0) strings 1 type)))))
(gp-13 (the-as hud (clear (-> (the-as hud gp-0) strings 1 text))))
(s4-12 "~S")
)
(let* ((s3-12 format)
@@ -1517,7 +1517,7 @@
(else
(set! (-> *game-info* goal) (-> self training-goal))
(let ((s5-14 format)
(gp-14 (clear (the-as string (-> (the-as hud gp-0) strings 1 type))))
(gp-14 (clear (-> (the-as hud gp-0) strings 1 text)))
(s4-13 "~S")
)
(let* ((s3-13 format)
@@ -1592,7 +1592,7 @@
(when (and (not (logtest? (-> s5-0 flags) 4)) (not (-> self first-enemy-shown?)))
(if (task-node-open? (game-task-node city-red-gun-training-try-once))
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc024" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc024" -99.0 0)
)
)
(set! (-> self first-enemy-shown?) #t)
@@ -1600,7 +1600,7 @@
(when (and (logtest? (-> s5-0 flags) 4) (not (-> self first-citizen-shown?)))
(if (task-node-open? (game-task-node city-red-gun-training-try-once))
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc025" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc025" -99.0 0)
)
)
(set! (-> self first-citizen-shown?) #t)
@@ -1791,17 +1791,17 @@
(cond
((zero? v1-10)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "cityv179" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "cityv179" -99.0 0)
)
)
((= v1-10 1)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "cityv180" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "cityv180" -99.0 0)
)
)
((= v1-10 2)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "cityv181" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "cityv181" -99.0 0)
)
)
)
@@ -1816,22 +1816,22 @@
(cond
((zero? v1-17)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc028" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc028" -99.0 0)
)
)
((= v1-17 1)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc029" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc029" -99.0 0)
)
)
((= v1-17 2)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc030" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc030" -99.0 0)
)
)
((= v1-17 3)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc031" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc031" -99.0 0)
)
)
)
@@ -1845,22 +1845,22 @@
(cond
((zero? v1-28)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc032" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc032" -99.0 0)
)
)
((= v1-28 1)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc033" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc033" -99.0 0)
)
)
((= v1-28 2)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc034" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc034" -99.0 0)
)
)
((= v1-28 3)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc035" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc035" -99.0 0)
)
)
)
@@ -1879,22 +1879,22 @@
(cond
((zero? v1-35)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc028" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc028" -99.0 0)
)
)
((= v1-35 1)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc029" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc029" -99.0 0)
)
)
((= v1-35 2)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc030" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc030" -99.0 0)
)
)
((= v1-35 3)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc031" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc031" -99.0 0)
)
)
)
@@ -1908,22 +1908,22 @@
(cond
((zero? v1-46)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc032" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc032" -99.0 0)
)
)
((= v1-46 1)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc033" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc033" -99.0 0)
)
)
((= v1-46 2)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc034" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc034" -99.0 0)
)
)
((= v1-46 3)
(set! (-> self last-sound-id)
(gui-control-method-9 *gui-control* self (gui-channel sig) (gui-action play) "sigc035" -99.0 0)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "sigc035" -99.0 0)
)
)
)
@@ -1947,7 +1947,7 @@
(none)
)
:code (behavior ()
(while (nonzero? (gui-control-method-17 *gui-control* (-> self last-sound-id)))
(while (nonzero? (get-status *gui-control* (-> self last-sound-id)))
(suspend)
)
(when (> (-> self egg-count) 0)
goal_src/jak2/levels/intro/intro-scenes.gc
+21 -6
View File
@@ -2294,7 +2294,12 @@
(set! (-> gp-0 flags) (the-as uint 8))
(set! (-> gp-0 tex) (lookup-texture-by-id (new 'static 'texture-id :index #xb :page #xdbc)))
(set-vector! (-> gp-0 pos) 256 180 #xffffff 0)
(set-vector! (-> gp-0 color) 128 128 128 128)
(let ((v1-7 (-> gp-0 color2)))
(set! (-> v1-7 0) 128)
(set! (-> v1-7 1) 128)
(set! (-> v1-7 2) 128)
(set! (-> v1-7 3) 128)
)
(set! (-> gp-0 scale-x) 1.0)
(set! (-> gp-0 scale-y) 1.0)
(when (and s5-0 (-> gp-0 tex))
@@ -2314,7 +2319,7 @@
(let* ((s2-0 (-> *display* frames (-> *display* on-screen) global-buf))
(s3-0 (-> s2-0 base))
)
(hud-sprite-method-9 gp-0 s2-0 s5-0)
(draw gp-0 s2-0 s5-0)
(let ((a3-0 (-> s2-0 base)))
(let ((v1-31 (the-as object (-> s2-0 base))))
(set! (-> (the-as dma-packet v1-31) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
@@ -2375,13 +2380,23 @@
(set! (-> gp-0 flags) (the-as uint 8))
(set! (-> gp-0 scale-x) 0.85)
(set! (-> gp-0 scale-y) 0.85)
(set-vector! (-> gp-0 color) 128 128 128 128)
(let ((v1-8 (-> gp-0 color2)))
(set! (-> v1-8 0) 128)
(set! (-> v1-8 1) 128)
(set! (-> v1-8 2) 128)
(set! (-> v1-8 3) 128)
)
(case (scf-get-territory)
((1)
(set-vector! (-> gp-0 pos) 256 170 #xffffff 0)
(set! (-> gp-0 tex) (lookup-texture-by-id (new 'static 'texture-id :index #xa :page #xdbc)))
(set! (-> s5-0 flags) (the-as uint 8))
(set-vector! (-> s5-0 color) 128 128 128 128)
(let ((v1-13 (-> s5-0 color2)))
(set! (-> v1-13 0) 128)
(set! (-> v1-13 1) 128)
(set! (-> v1-13 2) 128)
(set! (-> v1-13 3) 128)
)
(set! (-> s5-0 scale-x) 0.55)
(set-vector! (-> s5-0 pos) 285 255 #xffffff 0)
(case (-> *setting-control* user-current language)
@@ -2428,9 +2443,9 @@
(let* ((s1-0 (-> *display* frames (-> *display* on-screen) global-buf))
(s2-0 (-> s1-0 base))
)
(hud-sprite-method-9 gp-0 s1-0 s4-0)
(draw gp-0 s1-0 s4-0)
(if (-> s5-0 tex)
(hud-sprite-method-9 s5-0 s1-0 s4-0)
(draw s5-0 s1-0 s4-0)
)
(let ((a3-0 (-> s1-0 base)))
(let ((v1-59 (the-as object (-> s1-0 base))))
goal_src/jak2/levels/temple/mountain-scenes.gc
+5 -37
View File
@@ -1716,7 +1716,7 @@
(while (movie?)
(suspend)
)
(gui-control-method-10 *gui-control* self (gui-channel art-load))
(remove-process *gui-control* self (gui-channel art-load))
)
(ja-channel-set! 1)
(set! (-> self draw bounds w) 491520.0)
@@ -1767,15 +1767,7 @@
(go (method-of-object obj done) #t)
)
(else
(gui-control-method-9
*gui-control*
obj
(gui-channel art-load)
(gui-action queue)
"mtn-plat-buried-rocks-a"
-99.0
0
)
(add-process *gui-control* obj (gui-channel art-load) (gui-action queue) "mtn-plat-buried-rocks-a" -99.0 0)
(go (method-of-object obj idle))
)
)
@@ -3175,15 +3167,7 @@
(go (method-of-object obj done) #t)
)
(else
(gui-control-method-9
*gui-control*
obj
(gui-channel art-load)
(gui-action queue)
"mtn-step-plat-rocks-a"
-99.0
0
)
(add-process *gui-control* obj (gui-channel art-load) (gui-action queue) "mtn-step-plat-rocks-a" -99.0 0)
(go (method-of-object obj idle))
)
)
@@ -3279,15 +3263,7 @@
(go (method-of-object obj done) #t)
)
(else
(gui-control-method-9
*gui-control*
obj
(gui-channel art-load)
(gui-action queue)
"mtn-step-plat-rocks-b"
-99.0
0
)
(add-process *gui-control* obj (gui-channel art-load) (gui-action queue) "mtn-step-plat-rocks-b" -99.0 0)
(go (method-of-object obj idle))
)
)
@@ -3390,15 +3366,7 @@
(go (method-of-object obj done) #t)
)
(else
(gui-control-method-9
*gui-control*
obj
(gui-channel art-load)
(gui-action queue)
"mtn-step-plat-rocks-c"
-99.0
0
)
(add-process *gui-control* obj (gui-channel art-load) (gui-action queue) "mtn-step-plat-rocks-c" -99.0 0)
(go (method-of-object obj idle))
)
)
test/decompiler/reference/jak2/engine/ai/enemy_REF.gc
Generated Vendored
+2 -2
View File
@@ -805,7 +805,7 @@
(set! (-> obj incoming blue-juggle-count) (the-as uint 1))
)
(else
(set! (-> obj incoming blue-juggle-count) (the-as uint (+ (-> obj incoming blue-juggle-count) 1)))
(+! (-> obj incoming blue-juggle-count) 1)
)
)
(set! (-> obj incoming attack-time) a0-4)
@@ -3269,7 +3269,7 @@
)
(vector-float*! arg0 arg0 (lerp (-> s5-0 knocked-blue-vxz-lo) (-> s5-0 knocked-blue-vxz-hi) f30-7))
(cond
((>= (the-as uint 4) (the-as uint (-> obj incoming blue-juggle-count)))
((>= (the-as uint 4) (-> obj incoming blue-juggle-count))
(set! (-> arg0 y) (lerp (-> s5-0 knocked-blue-vy-lo) (-> s5-0 knocked-blue-vy-hi) f30-7))
)
(else
test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc
Generated Vendored
+19 -24
View File
@@ -18,7 +18,7 @@
)
)
)
(= (gui-control-method-17 *gui-control* a1-3) (gui-action playing))
(= (get-status *gui-control* a1-3) (gui-status active))
)
)
@@ -39,7 +39,7 @@
;; WARN: Return type mismatch int vs none.
(defun kill-current-talker ((arg0 symbol) (arg1 pair) (arg2 symbol))
(if (not (member 'daxter arg1))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -51,7 +51,7 @@
)
)
(if (not (member 'voicebox arg1))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -63,7 +63,7 @@
)
)
(if (not (member 'message arg1))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -75,7 +75,7 @@
)
)
(when (not (member 'notice arg1))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -85,7 +85,7 @@
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -182,7 +182,7 @@
)
(talker-speech-class-method-10 arg0)
)
(set! s2-0 (gui-control-method-14 *gui-control* (-> arg0 name) (-> arg0 channel) (gui-action none)))
(set! s2-0 (lookup-gui-connection-id *gui-control* (-> arg0 name) (-> arg0 channel) (gui-action none)))
(set! s2-0 (cond
((zero? s2-0)
(let ((v1-17 (process-spawn talker :init talker-init arg0 arg2 arg3 :to arg1)))
@@ -223,13 +223,13 @@
)
)
(set! (-> self voice-id)
(gui-control-method-9 *gui-control* self (-> arg0 channel) (gui-action queue) (-> arg0 name) 81920.0 0)
(add-process *gui-control* self (-> arg0 channel) (gui-action queue) (-> arg0 name) 81920.0 0)
)
)
)
(when (nonzero? (-> arg0 text-message))
(let* ((a0-6 *gui-control*)
(t9-1 (method-of-object a0-6 gui-control-method-9))
(t9-1 (method-of-object a0-6 add-process))
(a1-3 self)
(v1-15 (shr (the-as int (-> arg0 channel)) 4))
)
@@ -378,10 +378,8 @@
)
)
(while (< (- (-> self clock frame-counter) (-> self start-time)) (the-as time-frame (+ (-> self message delay) 300)))
(if (and (or (zero? (-> self voice-id)) (= (gui-control-method-17 *gui-control* (-> self voice-id)) (gui-action play)))
(or (zero? (-> self message-id))
(= (gui-control-method-17 *gui-control* (-> self message-id)) (gui-action playing))
)
(if (and (or (zero? (-> self voice-id)) (= (get-status *gui-control* (-> self voice-id)) (gui-status ready)))
(or (zero? (-> self message-id)) (= (get-status *gui-control* (-> self message-id)) (gui-status active)))
)
(go-virtual active)
)
@@ -403,7 +401,7 @@
(set-setting! 'hint (process->ppointer self) 0 0)
(set-setting! 'speech-control #f 0 0)
(if (nonzero? (-> self voice-id))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action play)
(-> self voice-id)
@@ -449,7 +447,7 @@
(auto-save-user)
)
(if (nonzero? (-> self voice-id))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(-> self voice-id)
@@ -461,7 +459,7 @@
)
)
(if (nonzero? (-> self message-id))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(-> self message-id)
@@ -484,8 +482,8 @@
(local-vars (v1-43 symbol))
(let ((gp-1 (zero? (logand (-> self message flags) 2))))
(while (or (and (nonzero? (-> self voice-id))
(let ((v1-34 (gui-control-method-17 *gui-control* (-> self voice-id))))
(or (= v1-34 (gui-action play)) (= v1-34 (gui-action playing)))
(let ((v1-34 (get-status *gui-control* (-> self voice-id))))
(or (= v1-34 (gui-status ready)) (= v1-34 (gui-status active)))
)
(begin
(dotimes (s5-2 4)
@@ -503,24 +501,21 @@
)
)
(and (nonzero? (-> self message-id))
(= (gui-control-method-17 *gui-control* (-> self message-id)) (gui-action playing))
(= (get-status *gui-control* (-> self message-id)) (gui-status active))
(or (< (- (-> self clock frame-counter) (-> self state-time)) (the-as time-frame (-> self message text-duration)))
(and (logtest? (-> self message flags) 16) (-> self region) (region-method-9 (-> self region) (target-pos 0)))
)
)
(< (- (-> self clock frame-counter) (-> self state-time)) (seconds 0.05))
)
(when (and (nonzero? (-> self voice-id))
(not gp-1)
(zero? (gui-control-method-17 *gui-control* (-> self voice-id)))
)
(when (and (nonzero? (-> self voice-id)) (not gp-1) (zero? (get-status *gui-control* (-> self voice-id))))
(remove-setting! 'music-volume)
(remove-setting! 'sfx-volume)
(remove-setting! 'dialog-volume)
(set! gp-1 #t)
)
(when (and (nonzero? (-> self message-id))
(= (gui-control-method-17 *gui-control* (-> self message-id)) (gui-action playing))
(= (get-status *gui-control* (-> self message-id)) (gui-status active))
(not (paused?))
)
(if (logtest? (-> self message flags) 32)
test/decompiler/reference/jak2/engine/camera/cam-debug_REF.gc
Generated Vendored
+6 -6
View File
@@ -267,16 +267,16 @@
;; definition for function camera-line2d
(defun camera-line2d ((arg0 vector4w) (arg1 vector4w))
(set! (-> (the-as cam-dbg-scratch #x70000000) linevec4w 0 x) (the-as int (* (+ (-> arg0 x) 1792) 16)))
(set! (-> (the-as cam-dbg-scratch #x70000000) linevec4w 0 x) (* (+ (-> arg0 x) 1792) 16))
(set! (-> (the-as cam-dbg-scratch #x70000000) linevec4w 0 y)
(the-as int (* (- 2256 (the-as int (-> (the-as cam-dbg-scratch arg0) linevec4w 0 y))) 16))
(* (- 2256 (-> (the-as cam-dbg-scratch arg0) linevec4w 0 y)) 16)
)
(set! (-> (the-as cam-dbg-scratch #x70000000) linevec4w 0 z) #x7fffff)
(set! (-> (the-as cam-dbg-scratch #x70000000) linevec4w 1 x)
(the-as int (* (+ (-> (the-as cam-dbg-scratch arg1) linevec4w 0 x) 1792) 16))
(* (+ (-> (the-as cam-dbg-scratch arg1) linevec4w 0 x) 1792) 16)
)
(set! (-> (the-as cam-dbg-scratch #x70000000) linevec4w 1 y)
(the-as int (* (- 2256 (the-as int (-> (the-as cam-dbg-scratch arg1) linevec4w 0 y))) 16))
(* (- 2256 (-> (the-as cam-dbg-scratch arg1) linevec4w 0 y)) 16)
)
(set! (-> (the-as cam-dbg-scratch #x70000000) linevec4w 1 z) #x7fffff)
(cam-line-dma)
@@ -304,7 +304,7 @@
)
(set! (-> (the-as cam-dbg-scratch #x70000000) plotvec 0 y) 20)
(set! (-> (the-as cam-dbg-scratch #x70000000) plotvec 1 x)
(the-as int (-> (the-as cam-dbg-scratch #x70000000) plotvec 0 x))
(-> (the-as cam-dbg-scratch #x70000000) plotvec 0 x)
)
(set! (-> (the-as cam-dbg-scratch #x70000000) plotvec 1 y) (+ (the int (* f28-0 f24-0)) 20))
(camera-line2d
@@ -319,7 +319,7 @@
)
(set! (-> (the-as cam-dbg-scratch #x70000000) plotvec 1 x) (+ (the int (* f26-0 f30-0)) 20))
(set! (-> (the-as cam-dbg-scratch #x70000000) plotvec 1 y)
(the-as int (-> (the-as cam-dbg-scratch #x70000000) plotvec 0 y))
(-> (the-as cam-dbg-scratch #x70000000) plotvec 0 y)
)
(camera-line2d
(the-as vector4w (-> (the-as cam-dbg-scratch #x70000000) plotvec))
test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc
Generated Vendored
+1 -1
View File
@@ -3476,7 +3476,7 @@
(cam-layout-function-call
(-> s3-1 items s2-1 val-func)
*temp-string*
(the-as int (-> s3-1 items s2-1 val-parm0))
(-> s3-1 items s2-1 val-parm0)
(the-as basic (-> s3-1 items s2-1 val-parm1))
)
(cam-layout-print 320 s4-2 *temp-string*)
test/decompiler/reference/jak2/engine/camera/cam-update_REF.gc
Generated Vendored
+12 -12
View File
@@ -225,20 +225,20 @@
(set! (-> a3-6 quad) (-> s5-2 bsp bsp-offset quad))
(cond
((zero? (-> s5-2 bsp cam-using-back))
(+! (-> a2-9 x) (the float (* (the-as int (-> v1-107 front-box-min x)) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a2-9 y) (the float (* (the-as int (-> v1-107 front-box-min y)) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a2-9 z) (the float (* (the-as int (-> v1-107 front-box-min z)) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a3-6 x) (the float (* (the-as int (-> v1-107 front-box-max x)) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a3-6 y) (the float (* (the-as int (-> v1-107 front-box-max y)) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a3-6 z) (the float (* (the-as int (-> v1-107 front-box-max z)) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a2-9 x) (the float (* (-> v1-107 front-box-min x) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a2-9 y) (the float (* (-> v1-107 front-box-min y) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a2-9 z) (the float (* (-> v1-107 front-box-min z) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a3-6 x) (the float (* (-> v1-107 front-box-max x) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a3-6 y) (the float (* (-> v1-107 front-box-max y) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a3-6 z) (the float (* (-> v1-107 front-box-max z) (the int (-> s5-2 bsp bsp-scale z)))))
)
(else
(+! (-> a2-9 x) (the float (* (the-as int (-> v1-107 back-box-min x)) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a2-9 y) (the float (* (the-as int (-> v1-107 back-box-min y)) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a2-9 z) (the float (* (the-as int (-> v1-107 back-box-min z)) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a3-6 x) (the float (* (the-as int (-> v1-107 back-box-max x)) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a3-6 y) (the float (* (the-as int (-> v1-107 back-box-max y)) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a3-6 z) (the float (* (the-as int (-> v1-107 back-box-max z)) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a2-9 x) (the float (* (-> v1-107 back-box-min x) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a2-9 y) (the float (* (-> v1-107 back-box-min y) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a2-9 z) (the float (* (-> v1-107 back-box-min z) (the int (-> s5-2 bsp bsp-scale z)))))
(+! (-> a3-6 x) (the float (* (-> v1-107 back-box-max x) (the int (-> s5-2 bsp bsp-scale x)))))
(+! (-> a3-6 y) (the float (* (-> v1-107 back-box-max y) (the int (-> s5-2 bsp bsp-scale y)))))
(+! (-> a3-6 z) (the float (* (-> v1-107 back-box-max z) (the int (-> s5-2 bsp bsp-scale z)))))
)
)
(add-debug-box #t (bucket-id debug2) a2-9 a3-6 (new 'static 'rgba :g #xff :b #xff :a #x80))
test/decompiler/reference/jak2/engine/collide/collide-shape-rider_REF.gc
Generated Vendored
+1 -5
View File
@@ -45,7 +45,7 @@
(let ((s4-0 (-> arg0 prim-core collide-as))
(s3-0 (-> obj child 0))
)
(countdown (s2-0 (the-as uint (-> obj num-children)))
(countdown (s2-0 (-> obj num-children))
(when (and (logtest? (-> s3-0 prim-core collide-with) s4-0)
(logtest? (-> s3-0 prim-core action) (collide-action rideable))
)
@@ -432,7 +432,3 @@
)
)
)
test/decompiler/reference/jak2/engine/collide/collide-shape_REF.gc
Generated Vendored
+7 -7
View File
@@ -96,7 +96,7 @@
(init-vf0-vector)
(nop!)
(let ((s4-0 (the-as collide-shape-prim obj))
(s3-0 (the-as uint (-> obj num-children)))
(s3-0 (-> obj num-children))
)
(nop!)
(let ((v1-0 (-> other prim-core collide-as)))
@@ -154,7 +154,7 @@
(init-vf0-vector)
(nop!)
(let ((s4-0 (the-as object other))
(s3-0 (the-as uint (-> other num-children)))
(s3-0 (-> other num-children))
)
(nop!)
(let ((v1-0 (-> obj prim-core collide-with)))
@@ -493,7 +493,7 @@
(let ((s4-0 (-> arg1 prim-core collide-as))
(s3-0 (-> obj child 0))
)
(countdown (s2-0 (the-as uint (-> obj num-children)))
(countdown (s2-0 (-> obj num-children))
(if (logtest? (-> s3-0 prim-core collide-with) s4-0)
(collide-with-collide-cache-prim-mesh s3-0 arg0 arg1)
)
@@ -593,7 +593,7 @@
(let ((s4-0 (-> arg1 prim-core collide-as))
(s3-0 (-> obj child 0))
)
(countdown (s2-0 (the-as uint (-> obj num-children)))
(countdown (s2-0 (-> obj num-children))
(if (logtest? (-> s3-0 prim-core collide-with) s4-0)
(collide-with-collide-cache-prim-sphere s3-0 arg0 arg1)
)
@@ -2421,7 +2421,7 @@
(-> obj local-sphere w)
(new 'static 'rgba :g #xff :a #x10)
)
(countdown (s5-0 (the-as uint (-> obj num-children)))
(countdown (s5-0 (-> obj num-children))
(debug-draw (-> obj child s5-0))
)
0
@@ -2795,7 +2795,7 @@
)
(let ((a1-1 (-> arg0 collide-with-filter)))
(nop!)
(let ((s3-0 (the-as uint (-> obj num-children)))
(let ((s3-0 (-> obj num-children))
(v1-1 (logand v1-0 a1-1))
)
(.lvf vf1 (&-> arg1 prim-core world-sphere quad))
@@ -2854,7 +2854,7 @@
(nop!)
(let ((a0-1 (-> arg0 collide-with-filter)))
(nop!)
(let ((s3-0 (the-as uint (-> arg1 num-children)))
(let ((s3-0 (-> arg1 num-children))
(v1-1 (logand v1-0 a0-1))
)
(.lvf vf2 (&-> obj prim-core world-sphere quad))
test/decompiler/reference/jak2/engine/common_objs/plat_REF.gc
Generated Vendored
+1 -9
View File
@@ -314,15 +314,7 @@
)
:trans (the-as (function none :behavior drop-plat) plat-trans)
:code (behavior ()
(gui-control-method-9
*gui-control*
self
(gui-channel art-load)
(gui-action queue)
(-> self anim name)
-99.0
0
)
(add-process *gui-control* self (gui-channel art-load) (gui-action queue) (-> self anim name) -99.0 0)
(until #f
(when (not (-> self bouncing))
(logior! (-> self mask) (process-mask sleep-code))
test/decompiler/reference/jak2/engine/debug/debug_REF.gc
Generated Vendored
+20 -21
View File
@@ -94,7 +94,7 @@
(set! (-> s5-0 vector 1 y) 128)
(set! (-> s5-0 vector 1 z) 128)
(set! (-> s5-0 vector 1 w) 128)
(set! (-> s5-0 vector 0 y) (the-as int (+ (-> s5-0 vector 0 y) 288)))
(+! (-> s5-0 vector 0 y) 288)
(let* ((a1-11 buf)
(a3-4 (the-as vector4w-2 (-> a1-11 base)))
)
@@ -102,8 +102,8 @@
(set! (-> a3-4 vector 1 quad) (-> s5-0 vector 0 quad))
(set! (-> a1-11 base) (&+ (the-as pointer a3-4) 32))
)
(set! (-> s5-0 vector 0 x) (the-as int (+ (-> s5-0 vector 0 x) -256)))
(set! (-> s5-0 vector 0 y) (the-as int (+ (-> s5-0 vector 0 y) -288)))
(+! (-> s5-0 vector 0 x) -256)
(+! (-> s5-0 vector 0 y) -288)
(set! (-> s5-0 vector 1 x) 128)
(set! (-> s5-0 vector 1 y) 255)
(let* ((a1-18 buf)
@@ -113,7 +113,7 @@
(set! (-> a3-6 vector 1 quad) (-> s5-0 vector 0 quad))
(set! (-> a1-18 base) (&+ (the-as pointer a3-6) 32))
)
(set! (-> s5-0 vector 0 x) (the-as int (+ (-> s5-0 vector 0 x) 512)))
(+! (-> s5-0 vector 0 x) 512)
(set! (-> s5-0 vector 1 y) 128)
(set! (-> s5-0 vector 1 z) 255)
(let* ((a1-23 buf)
@@ -123,8 +123,8 @@
(set! (-> a3-8 vector 1 quad) (-> s5-0 vector 0 quad))
(set! (-> a1-23 base) (&+ (the-as pointer a3-8) 32))
)
(set! (-> s5-0 vector 0 x) (the-as int (+ (-> s5-0 vector 0 x) -256)))
(set! (-> s5-0 vector 0 y) (the-as int (+ (-> s5-0 vector 0 y) -288)))
(+! (-> s5-0 vector 0 x) -256)
(+! (-> s5-0 vector 0 y) -288)
(set! (-> s5-0 vector 1 x) 255)
(set! (-> s5-0 vector 1 y) 128)
(let* ((a3-10 buf)
@@ -260,8 +260,8 @@
(set! (-> s3-0 vector 1 w) (the-as int (-> var-end-color a)))
)
)
(set! (-> s4-0 vector 0 z) (the-as int (+ (-> s4-0 vector 0 z) -8192)))
(set! (-> s4-0 vector 1 z) (the-as int (+ (-> s4-0 vector 1 z) -8192)))
(+! (-> s4-0 vector 0 z) -8192)
(+! (-> s4-0 vector 1 z) -8192)
(let* ((a3-7 buf2)
(a1-50 (the-as (inline-array vector4w-2) (-> a3-7 base)))
)
@@ -305,8 +305,8 @@
'stack
'font-context
*font-default-matrix*
(the-as int (+ (-> screen-offset x) -1792 (/ (the-as int (-> screen-pos x)) 16)))
(the-as int (+ (-> screen-offset y) -1855 (/ (the-as int (-> screen-pos y)) 16)))
(+ (-> screen-offset x) -1792 (/ (-> screen-pos x) 16))
(+ (-> screen-offset y) -1855 (/ (-> screen-pos y) 16))
0.0
color
(font-flags shadow kerning)
@@ -314,7 +314,7 @@
)
)
(let ((v1-10 font-ctx))
(set! (-> v1-10 origin z) (the float (/ (the-as int (-> screen-pos z)) 16)))
(set! (-> v1-10 origin z) (the float (/ (-> screen-pos z) 16)))
)
(draw-string text buf font-ctx)
)
@@ -418,9 +418,9 @@
(set! (-> s4-0 vector 0 y) (the-as int (-> s3-0 g)))
(set! (-> s4-0 vector 0 z) (the-as int (-> s3-0 b)))
(set! (-> s4-0 vector 0 w) (the-as int (-> s3-0 a)))
(set! (-> s5-0 vector 0 z) (the-as int (+ (-> s5-0 vector 0 z) -8192)))
(set! (-> s5-0 vector 1 z) (the-as int (+ (-> s5-0 vector 1 z) -8192)))
(set! (-> s5-0 vector 2 z) (the-as int (+ (-> s5-0 vector 2 z) -8192)))
(+! (-> s5-0 vector 0 z) -8192)
(+! (-> s5-0 vector 1 z) -8192)
(+! (-> s5-0 vector 2 z) -8192)
(let* ((a1-21 buf)
(a3-5 (the-as (inline-array vector) (-> a1-21 base)))
)
@@ -673,11 +673,11 @@
(let ((p1 (new 'stack 'vector4w)))
(set! (-> p0 quad) (-> start quad))
(set! (-> p1 quad) (-> end quad))
(set! (-> p0 x) (the-as int (* (+ (-> p0 x) 2048) 16)))
(set! (-> p0 y) (* -16 (the-as int (- 2048 (the-as int (-> p0 y))))))
(set! (-> p0 x) (* (+ (-> p0 x) 2048) 16))
(set! (-> p0 y) (* -16 (- 2048 (-> p0 y))))
(set! (-> p0 z) #x7fffff)
(set! (-> p1 x) (the-as int (* (+ (-> p1 x) 2048) 16)))
(set! (-> p1 y) (* -16 (the-as int (- 2048 (the-as int (-> p1 y))))))
(set! (-> p1 x) (* (+ (-> p1 x) 2048) 16))
(set! (-> p1 y) (* -16 (- 2048 (-> p1 y))))
(set! (-> p1 z) #x7fffff)
(let ((a0-18 (the-as (pointer uint64) (-> buf base))))
(let* ((a1-7 buf)
@@ -941,8 +941,8 @@
(set! (-> v1-2 pos quad) (-> position quad))
(cond
(screen-offset
(set! (-> v1-2 offset x) (the-as int (-> screen-offset x)))
(set! (-> v1-2 offset y) (the-as int (-> screen-offset y)))
(set! (-> v1-2 offset x) (-> screen-offset x))
(set! (-> v1-2 offset y) (-> screen-offset y))
)
(else
(set! (-> v1-2 offset x) 0)
@@ -1619,7 +1619,6 @@
)
;; definition for method 3 of type debug-vertex-stats
;; INFO: this function exists in multiple non-identical object files
(defmethod inspect debug-vertex-stats ((obj debug-vertex-stats))
(format #t "[~8x] ~A~%" obj (-> obj type))
(format #t "~Tlength: ~D~%" (-> obj length))
test/decompiler/reference/jak2/engine/debug/editable_REF.gc
Generated Vendored
+4 -4
View File
@@ -126,7 +126,7 @@
(format (clear *temp-string*) "region-~D~%" (-> obj id))
(s3-0 s2-0 (the-as bucket-id s1-0) *temp-string* arg0 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
(when (>= arg1 1)
(let ((s4-1 (-> obj on-enter)))
(when s4-1
@@ -137,7 +137,7 @@
(format (clear *temp-string*) "(on-enter ~S)" s4-1)
(s3-1 s2-1 (the-as bucket-id s1-1) *temp-string* arg0 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
(let ((s4-2 (-> obj on-inside)))
@@ -149,7 +149,7 @@
(format (clear *temp-string*) "(on-inside ~S)" s4-2)
(s3-2 s2-2 (the-as bucket-id s1-2) *temp-string* arg0 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
(let ((s5-1 (-> obj on-exit)))
@@ -161,7 +161,7 @@
(format (clear *temp-string*) "(on-exit ~S)" s5-1)
(s4-3 s3-3 (the-as bucket-id s2-3) *temp-string* arg0 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
)
test/decompiler/reference/jak2/engine/draw/drawable_REF.gc
Generated Vendored
+10 -10
View File
@@ -504,8 +504,8 @@
(defun-debug draw-instance-info ((arg0 string))
(local-vars
(sv-16 uint)
(sv-32 uint32)
(sv-48 uint32)
(sv-32 uint)
(sv-48 uint)
(sv-64 int)
(sv-80 int)
(sv-96 int)
@@ -632,14 +632,14 @@
s0-1
sv-16
sv-32
(/ (* 2.0 (the float sv-16)) (the float (- sv-32 (the-as uint sv-16))))
(/ (* 2.0 (the float sv-16)) (the float (- sv-32 sv-16)))
sv-48
)
(+! s3-2 sv-16)
(+! s4-3 (the-as int sv-32))
(+! s4-3 sv-32)
(set! f30-0
(+ 29.0
(* 5.5 (the float (- sv-32 (the-as uint sv-16))))
(* 5.5 (the float (- sv-32 sv-16)))
(* 22.0 (the float sv-48))
(* 8.0 (the float sv-32))
(* 53.0 (the float (/ (+ s2-2 9) (the-as uint 10))))
@@ -679,7 +679,7 @@
(set! sv-112 (+ sv-112 (-> v1-100 data a0-36 debug num-dverts)))
(set! sv-128 (+ sv-128 (-> v1-100 data a0-36 tex-count)))
)
(set! sv-144 (+ sv-144 (the-as int (-> (the-as prototype-bucket-tie s5-0) count sv-64))))
(set! sv-144 (+ sv-144 (-> (the-as prototype-bucket-tie s5-0) count sv-64)))
(format
arg0
"~5D ~7D ~5D ~5D"
@@ -695,10 +695,10 @@
sv-112
(/ (* 2.0 (the float sv-96)) (the float (- sv-112 sv-96)))
sv-128
(* (the-as uint sv-96) (the-as uint (-> (the-as prototype-bucket-tie s5-0) count sv-64)))
(* (the-as uint sv-96) (-> (the-as prototype-bucket-tie s5-0) count sv-64))
)
(+! s1-3 (* (the-as uint sv-96) (the-as uint (-> (the-as prototype-bucket-tie s5-0) count sv-64))))
(+! s0-2 (* (the-as uint sv-112) (the-as uint (-> (the-as prototype-bucket-tie s5-0) count sv-64))))
(+! s1-3 (* (the-as uint sv-96) (-> (the-as prototype-bucket-tie s5-0) count sv-64)))
(+! s0-2 (* (the-as uint sv-112) (-> (the-as prototype-bucket-tie s5-0) count sv-64)))
(+! s3-2 sv-96)
(+! s4-3 sv-112)
(+! s2-3 sv-128)
@@ -1070,7 +1070,7 @@
)
)
(else
(while (and (< lod-idx (the-as int (-> dc lod-set max-lod))) (< (-> dc lod-set lod lod-idx dist) dist-w))
(while (and (< lod-idx (-> dc lod-set max-lod)) (< (-> dc lod-set lod lod-idx dist) dist-w))
(+! lod-idx 1)
)
)
test/decompiler/reference/jak2/engine/game/fact-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -516,7 +516,7 @@
:flag-assert #xd00000110
(:methods
(new (symbol type process-drawable pickup-type float) _type_ 0)
(get-gun-ammo (_type_ target) float 12)
(get-gun-ammo (_type_) float 12)
)
)
test/decompiler/reference/jak2/engine/game/game-info-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -301,7 +301,7 @@
(race-total-lap-count int32 :offset-assert 508)
(race-position int32 :offset-assert 512)
(race-number-turbos int32 :offset-assert 516)
(bot-health uint32 3 :offset-assert 520)
(bot-health float 3 :offset-assert 520)
(demo-state uint32 :offset-assert 532)
(wanted-flash basic :offset-assert 536)
(distance float :offset-assert 540)
test/decompiler/reference/jak2/engine/game/game-info_REF.gc
Generated Vendored
+12 -15
View File
@@ -773,24 +773,21 @@
(let ((s3-0 (new 'stack-no-clear 'vector4w)))
(set! (-> s3-0 quad) (the-as uint128 0))
(when (transform-point-qword! s3-0 (the-as vector arg0))
(let ((s5-0
(new
'stack
'font-context
*font-default-matrix*
(+ (the int (/ (the float (+ (/ (the-as int (-> s3-0 x)) 16) -1792)) (-> *video-params* relative-x-scale)))
-48
)
(the-as int (+ (/ (the-as int (-> s3-0 y)) 16) -1855))
0.0
(font-color gold-#ba9200)
(font-flags shadow kerning)
)
)
(let ((s5-0 (new
'stack
'font-context
*font-default-matrix*
(+ (the int (/ (the float (+ (/ (-> s3-0 x) 16) -1792)) (-> *video-params* relative-x-scale))) -48)
(+ (/ (-> s3-0 y) 16) -1855)
0.0
(font-color gold-#ba9200)
(font-flags shadow kerning)
)
)
)
(set! (-> s5-0 scale) (lerp-scale 0.6 1.0 (the-as float arg1) 50.0 8000.0))
(let ((v1-9 s5-0))
(set! (-> v1-9 origin z) (the float (/ (the-as int (-> s3-0 z)) 16)))
(set! (-> v1-9 origin z) (the float (/ (-> s3-0 z) 16)))
)
(set! (-> s5-0 flags) (font-flags shadow kerning large))
(let ((s3-1 (-> self clock frame-counter)))
test/decompiler/reference/jak2/engine/game/game-save_REF.gc
Generated Vendored
+8 -3
View File
@@ -1833,7 +1833,7 @@
(notify handle :offset-assert 456)
(force symbol :offset-assert 464)
(state-time time-frame :offset-assert 472)
(icon hud-sprite :inline :offset-assert 480)
(icon hud-sprite :inline :offset 480)
)
:heap-base #x1a0
:method-count-assert 23
@@ -1948,7 +1948,7 @@
(with-dma-buffer-add-bucket ((s5-3 (-> *display* frames (-> *display* on-screen) global-buf))
(bucket-id progress)
)
(hud-sprite-method-9 (-> self icon) s5-3 (-> self level))
(draw (-> self icon) s5-3 (-> self level))
)
)
)
@@ -1993,7 +1993,12 @@ auto-save-post
)
)
(set! (-> *setting-control* user-default auto-save) #f)
(set-vector! (-> self icon color) 128 128 128 128)
(let ((v1-51 (-> self icon color2)))
(set! (-> v1-51 0) 128)
(set! (-> v1-51 1) 128)
(set! (-> v1-51 2) 128)
(set! (-> v1-51 3) 128)
)
(set! (-> self icon pos x) 440)
(set! (-> self icon pos y) 200)
(set! (-> self icon pos z) #xffffff)
test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
Generated Vendored
+5 -11
View File
@@ -1466,7 +1466,7 @@
;; definition for method 16 of type fail-mission
(defmethod print-text fail-mission ((obj fail-mission))
(when (and (not (logtest? (-> obj flags) (fail-mission-flags famflags-6)))
(= (gui-control-method-17 *gui-control* (the-as sound-id (-> obj message-id))) (gui-action playing))
(= (get-status *gui-control* (the-as sound-id (-> obj message-id))) (gui-status active))
)
(let ((gp-0 (new
'stack
@@ -1803,7 +1803,7 @@
(set! (-> self fail-message) (the-as uint (-> arg0 fail-message)))
(set-setting! 'allow-continue #f 0 0)
(set-setting! 'minimap 'clear 0 128)
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -1813,7 +1813,7 @@
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -1826,10 +1826,7 @@
(when (not (logtest? (-> arg0 flags) (fail-mission-flags famflags-4)))
(if (not (and *target* (logtest? (-> *target* focus-status) (focus-status dead)) (zero? (-> self message))))
(set! (-> self stinger)
(the-as
uint
(gui-control-method-9 *gui-control* *target* (gui-channel background) (gui-action play) "lose1" -99.0 0)
)
(the-as uint (add-process *gui-control* *target* (gui-channel background) (gui-action play) "lose1" -99.0 0))
)
)
)
@@ -1843,10 +1840,7 @@
(= (-> self message) (fail-mission-message fammsg-1))
)
(set! (-> self message-id)
(the-as
uint
(gui-control-method-9 *gui-control* self (gui-channel supertitle) (gui-action play) "fail" 81920.0 0)
)
(the-as uint (add-process *gui-control* self (gui-channel supertitle) (gui-action play) "fail" 81920.0 0))
)
)
(go-virtual idle)
test/decompiler/reference/jak2/engine/gfx/lights_REF.gc
Generated Vendored
+2 -7
View File
@@ -126,9 +126,7 @@
(set! (-> arg0 dimension-array z) (max 1 (min 16 (the int (+ 0.5 (* f0-5 (-> s4-0 z)))))))
)
)
(set! (-> arg0 bucket-step 0)
(the-as uint (* (the-as int (-> arg0 dimension-array z)) (the-as int (-> arg0 dimension-array x))))
)
(set! (-> arg0 bucket-step 0) (the-as uint (* (-> arg0 dimension-array z) (-> arg0 dimension-array x))))
(set! (-> arg0 bucket-step 1) (the-as uint (-> arg0 dimension-array x)))
(dotimes (v1-13 3)
(set! (-> arg0 axis-scale data v1-13)
@@ -137,10 +135,7 @@
)
)
(set! (-> arg0 num-buckets)
(the-as uint (* (* (the-as int (-> arg0 dimension-array x)) (the-as int (-> arg0 dimension-array y)))
(the-as int (-> arg0 dimension-array z))
)
)
(the-as uint (* (* (-> arg0 dimension-array x) (-> arg0 dimension-array y)) (-> arg0 dimension-array z)))
)
(dotimes (v1-19 (the-as int (-> arg0 num-buckets)))
(let ((a0-27 (-> arg0 bucket-array v1-19)))
test/decompiler/reference/jak2/engine/gfx/mood/mood_REF.gc
Generated Vendored
+6 -6
View File
@@ -1505,15 +1505,15 @@
(let ((a0-6 (-> s4-0 iweather fog))
(v1-30 (-> s4-0 iweather cloud))
)
(set! (-> s4-0 index 0) (+ (* 3 (the-as int v1-30)) (the-as int a0-6)))
(set! (-> s4-0 index 1) (the-as int (+ a0-6 1 (* 3 (the-as int v1-30)))))
(set! (-> s4-0 index 2) (+ (* 3 (the-as int (+ v1-30 1))) (the-as int a0-6)))
(set! (-> s4-0 index 3) (the-as int (+ a0-6 1 (* 3 (the-as int (+ v1-30 1))))))
(set! (-> s4-0 index 0) (+ (* 3 v1-30) a0-6))
(set! (-> s4-0 index 1) (+ a0-6 1 (* 3 v1-30)))
(set! (-> s4-0 index 2) (+ (* 3 (+ v1-30 1)) a0-6))
(set! (-> s4-0 index 3) (+ a0-6 1 (* 3 (+ v1-30 1))))
)
(let ((v1-34 (-> s4-0 iweather cloud)))
(set! (-> s4-0 color-interp) (-> s4-0 interp cloud))
(set! (-> s4-0 color-index 0) (the-as int v1-34))
(set! (-> s4-0 color-index 1) (the-as int (+ v1-34 1)))
(set! (-> s4-0 color-index 0) v1-34)
(set! (-> s4-0 color-index 1) (+ v1-34 1))
)
0
(let ((f0-23 (- (-> s4-0 weather cloud) (the float (-> s4-0 iweather cloud)))))
test/decompiler/reference/jak2/engine/gfx/shrub/shrubbery_REF.gc
Generated Vendored
+4 -5
View File
@@ -234,9 +234,8 @@
(define shrub-vu1-block (new 'static 'vu-function :length #x26a :qlength #x135))
;; definition for function shrub-num-tris
;; WARN: Return type mismatch uint32 vs uint.
(defun shrub-num-tris ((shrub shrubbery))
(the-as uint (- (-> shrub header data 2) (the-as uint (* (-> shrub header data 1) 2))))
(- (-> shrub header data 2) (* (-> shrub header data 1) 2))
)
;; definition for function shrub-make-perspective-matrix
@@ -389,7 +388,7 @@
)
(set! (-> a3-0 dma) (new 'static 'dma-tag
:id (dma-tag-id ref)
:addr (the-as int (-> shrub obj))
:addr (-> shrub obj)
:qwc (+ (-> shrub obj-qwc) (-> shrub vtx-qwc) (-> shrub col-qwc) (-> shrub stq-qwc))
)
)
@@ -1175,7 +1174,7 @@
(while (nonzero? s2-0)
(+! s2-0 -1)
(let ((a0-15 (* (shrub-num-tris (the-as shrubbery s3-0)) s4-0))
(v1-26 (* (the-as uint (-> (the-as shrubbery s3-0) header data 2)) s4-0))
(v1-26 (* (-> (the-as shrubbery s3-0) header data 2) s4-0))
)
(+! (-> *terrain-stats* shrub tris) a0-15)
(+! (-> *terrain-stats* shrub dverts) v1-26)
@@ -1200,7 +1199,7 @@
(while (nonzero? s2-1)
(+! s2-1 -1)
(let ((a0-28 (* (shrub-num-tris (the-as shrubbery s3-1)) s4-1))
(v1-44 (* (the-as uint (-> (the-as shrubbery s3-1) header data 2)) s4-1))
(v1-44 (* (-> (the-as shrubbery s3-1) header data 2) s4-1))
)
(+! (-> *terrain-stats* trans-shrub tris) a0-28)
(+! (-> *terrain-stats* trans-shrub dverts) v1-44)
test/decompiler/reference/jak2/engine/gfx/sprite/particles/sparticle-launcher_REF.gc
Generated Vendored
+1 -2
View File
@@ -2,7 +2,6 @@
(in-package goal)
;; definition for method 3 of type sparticle-launcher
;; INFO: this function exists in multiple non-identical object files
;; WARN: Return type mismatch int vs sparticle-launcher.
(defmethod inspect sparticle-launcher ((obj sparticle-launcher))
(format #t "~X: sparticle-launcher~%" obj)
@@ -2090,7 +2089,7 @@
object
(-> (the-as (array int32) a1-4)
(+ (mod
(the-as int (/ (-> a0-1 state-counter) (/ (the-as int (-> (the-as vector4w a1-4) w)) 8)))
(the-as int (/ (-> a0-1 state-counter) (the-as uint (/ (-> (the-as vector4w a1-4) w) 8))))
(+ (-> (the-as (pointer int32) a1-4) 0) -1)
)
1
test/decompiler/reference/jak2/engine/gfx/texture/texture_REF.gc
Generated Vendored
+2 -2
View File
@@ -2327,8 +2327,8 @@
)
(set! (-> v1-5 mask dword 0) (ash (-> v1-5 mask dword 0) s5-0))
)
(set! (-> gp-0 mask dword 0) (the-as uint (logior (-> gp-0 mask dword 0) (-> v1-5 mask dword 0))))
(set! (-> gp-0 mask dword 1) (the-as uint (logior (-> gp-0 mask dword 1) (-> v1-5 mask dword 1))))
(logior! (-> gp-0 mask dword 0) (-> v1-5 mask dword 0))
(logior! (-> gp-0 mask dword 1) (-> v1-5 mask dword 1))
)
0
(none)
test/decompiler/reference/jak2/engine/level/region_REF.gc
Generated Vendored
+4 -4
View File
@@ -103,7 +103,7 @@
(format (clear *temp-string*) "region-~D~%" (-> obj region id))
(s5-0 s4-0 (the-as bucket-id s3-0) *temp-string* sv-36 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
(let ((s5-1 (-> obj region on-enter)))
(when s5-1
(let ((s4-1 add-debug-text-3d)
@@ -113,7 +113,7 @@
(format (clear *temp-string*) "(on-enter ~S)" s5-1)
(s4-1 s3-1 (the-as bucket-id s2-1) *temp-string* sv-36 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
(let ((s5-2 (-> obj region on-inside)))
@@ -125,7 +125,7 @@
(format (clear *temp-string*) "(on-inside ~S)" s5-2)
(s4-2 s3-2 (the-as bucket-id s2-2) *temp-string* sv-36 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
(let ((gp-1 (-> obj region on-exit)))
@@ -137,7 +137,7 @@
(format (clear *temp-string*) "(on-exit ~S)" gp-1)
(s5-3 s4-3 (the-as bucket-id s3-3) *temp-string* sv-36 (font-color #dadada) sv-32)
)
(set! (-> sv-32 y) (the-as int (+ (-> sv-32 y) 8)))
(+! (-> sv-32 y) 8)
)
)
)
test/decompiler/reference/jak2/engine/load/loader_REF.gc
Generated Vendored
+93 -99
View File
@@ -558,9 +558,7 @@
(let ((s3-0 (-> obj rec s4-0)))
(when (-> s3-0 name)
(dotimes (s2-0 2)
(when (and (file-status (-> obj buffer s2-0) (-> s3-0 name) (the-as int (-> s3-0 parts)))
(not (-> obj buffer s2-0 frame-lock))
)
(when (and (file-status (-> obj buffer s2-0) (-> s3-0 name) (-> s3-0 parts)) (not (-> obj buffer s2-0 frame-lock)))
(set! (-> obj buffer s2-0 frame-lock) #t)
(set! (-> s3-0 anim-name) (-> obj buffer s2-0))
(set! (-> obj buffer s2-0 pending-load-file-owner) (-> s3-0 owner))
@@ -583,13 +581,7 @@
(dotimes (s2-1 2)
(when (not (-> obj buffer s2-1 frame-lock))
(set! (-> obj buffer s2-1 frame-lock) #t)
(set-pending-file
(-> obj buffer s2-1)
(-> s3-1 name)
(the-as int (-> s3-1 parts))
(-> s3-1 owner)
(-> s3-1 priority)
)
(set-pending-file (-> obj buffer s2-1) (-> s3-1 name) (-> s3-1 parts) (-> s3-1 owner) (-> s3-1 priority))
(set! (-> s3-1 anim-name) (-> obj buffer s2-1))
(goto cfg-46)
)
@@ -869,7 +861,7 @@
(set! (-> s5-0 paused?) #f)
)
(let ((v1-7
(gui-control-method-15 *gui-control* self (gui-channel art-load) (-> gp-0 anim name) (new 'static 'sound-id))
(lookup-gui-connection *gui-control* self (gui-channel art-load) (-> gp-0 anim name) (new 'static 'sound-id))
)
)
(if v1-7
@@ -884,7 +876,7 @@
(talker-surpress!)
(apply-settings *setting-control*)
(when (or (and (-> *setting-control* user-current spooling)
(or (< 2 (the-as int (-> gp-0 anim parts)))
(or (< 2 (-> gp-0 anim parts))
(not (string= (-> *setting-control* user-current spool-anim name) (-> gp-0 anim name)))
)
)
@@ -903,7 +895,7 @@
)
)
(while (or (and (-> *setting-control* user-current spooling)
(or (< 2 (the-as int (-> gp-0 anim parts)))
(or (< 2 (-> gp-0 anim parts))
(not (string= (-> *setting-control* user-current spool-anim name) (-> gp-0 anim name)))
)
)
@@ -934,7 +926,7 @@
(set-setting! 'spool-anim (-> gp-0 anim) 0 0)
(apply-settings *setting-control*)
(set! (-> gp-0 old-time) (-> self clock frame-counter))
(while (< (-> gp-0 part) (the-as int (-> gp-0 anim parts)))
(while (< (-> gp-0 part) (-> gp-0 anim parts))
(when (> (-> gp-0 part) 0)
(while (let ((v1-99 (file-status *art-control* (-> gp-0 anim name) (-> gp-0 part))))
(not (or (= v1-99 'active) (= v1-99 'locked)))
@@ -1100,7 +1092,7 @@
-20.0
(-> gp-0 sid)
)
(if (< (+ (-> gp-0 part) 1) (the-as int (-> gp-0 anim parts)))
(if (< (+ (-> gp-0 part) 1) (-> gp-0 anim parts))
(gui-control-method-12
*gui-control*
self
@@ -1167,7 +1159,7 @@
(defbehavior ja-abort-spooled-anim process-drawable ((arg0 spool-anim) (arg1 art-joint-anim) (arg2 int))
(let ((s3-0 (new 'static 'sound-id)))
(let ((v1-1
(gui-control-method-15 *gui-control* self (gui-channel art-load) (-> arg0 name) (new 'static 'sound-id))
(lookup-gui-connection *gui-control* self (gui-channel art-load) (-> arg0 name) (new 'static 'sound-id))
)
)
(when v1-1
@@ -1425,28 +1417,28 @@
(let ((s5-0 format)
(s4-0 #t)
(s3-0 " ~6S <@ #x~A>")
(v1-3 (gui-control-method-17 *gui-control* (-> obj id)))
(v1-3 (get-status *gui-control* (-> obj id)))
)
(s5-0
s4-0
s3-0
(cond
((= v1-3 (gui-action play))
((= v1-3 (gui-status ready))
"ready"
)
((= v1-3 (gui-action playing))
((= v1-3 (gui-status active))
"active"
)
((= v1-3 (gui-action stopping))
((= v1-3 (gui-status stop))
"stop"
)
((= v1-3 (gui-action none))
((= v1-3 (gui-status unknown))
"unknown"
)
((= v1-3 (gui-action stop))
((= v1-3 (gui-status hide))
"hide"
)
((= v1-3 (gui-action queue))
((= v1-3 (gui-status pending))
"pending"
)
(else
@@ -1466,7 +1458,7 @@
)
;; definition for method 15 of type gui-control
(defmethod gui-control-method-15 gui-control ((obj gui-control) (arg0 process) (arg1 gui-channel) (arg2 string) (arg3 sound-id))
(defmethod lookup-gui-connection gui-control ((obj gui-control) (arg0 process) (arg1 gui-channel) (arg2 string) (arg3 sound-id))
(let ((s1-0 (the-as gui-connection (-> obj engine alive-list next0))))
(-> obj engine)
(let ((s0-0 (-> s1-0 next0)))
@@ -1501,7 +1493,7 @@
)
;; definition for method 14 of type gui-control
(defmethod gui-control-method-14 gui-control ((obj gui-control) (arg0 string) (arg1 gui-channel) (arg2 gui-action))
(defmethod lookup-gui-connection-id gui-control ((obj gui-control) (arg0 string) (arg1 gui-channel) (arg2 gui-action))
(let ((s2-0 (the-as gui-connection (-> obj engine alive-list next0))))
(-> obj engine)
(let ((s1-0 (-> s2-0 next0)))
@@ -1533,23 +1525,23 @@
)
;; definition for method 20 of type gui-control
(defmethod gui-control-method-20 gui-control ((obj gui-control) (arg0 sound-id) (arg1 symbol) (arg2 int) (arg3 int) (arg4 int))
(defmethod set-falloff! gui-control ((obj gui-control) (arg0 sound-id) (arg1 symbol) (arg2 int) (arg3 int) (arg4 int))
(when (nonzero? arg0)
(let ((v1-2 (gui-control-method-15 *gui-control* (the-as process #f) (gui-channel none) (the-as string #f) arg0)))
(let ((v1-2 (lookup-gui-connection *gui-control* (the-as process #f) (gui-channel none) (the-as string #f) arg0)))
(when v1-2
(if arg1
(logior! (-> v1-2 flags) 2)
(logior! (-> v1-2 flags) (gui-connection-flags gcf1))
)
(when (>= arg2 0)
(logior! (-> v1-2 flags) 8)
(logior! (-> v1-2 flags) (gui-connection-flags fo-min))
(set! (-> v1-2 fo-min) arg2)
)
(when (>= arg3 0)
(logior! (-> v1-2 flags) 16)
(logior! (-> v1-2 flags) (gui-connection-flags fo-max))
(set! (-> v1-2 fo-max) arg3)
)
(when (>= arg4 0)
(logior! (-> v1-2 flags) 4)
(logior! (-> v1-2 flags) (gui-connection-flags fo-curve))
(set! (-> v1-2 fo-curve) arg4)
)
v1-2
@@ -1583,21 +1575,21 @@
)
;; definition for method 23 of type gui-control
(defmethod gui-control-method-23 gui-control ((obj gui-control) (arg0 gui-channel) (arg1 gui-channel) (arg2 symbol) (arg3 gui-connection))
(defmethod handle-command gui-control ((obj gui-control) (arg0 gui-channel) (arg1 gui-channel) (arg2 symbol) (arg3 gui-connection))
(let ((s5-0 (-> obj ids arg1)))
(cond
((nonzero? s5-0)
(case arg2
(('wait)
(if (nonzero? (gui-control-method-17 obj s5-0))
(if (nonzero? (get-status obj s5-0))
(return #f)
)
)
(('stop 'priority-stop)
(when (nonzero? (-> obj ids arg1))
(let ((s2-0 (gui-control-method-15 obj (the-as process #f) arg1 (the-as string #f) s5-0)))
(let ((s2-0 (lookup-gui-connection obj (the-as process #f) arg1 (the-as string #f) s5-0)))
(when (and s2-0 (or (= arg2 'priority) (= s2-0 arg3) (and arg3 (< (-> arg3 priority) (-> s2-0 priority)))))
(gui-control-method-11 obj s2-0)
(stop-str obj s2-0)
(cond
((= (shr (the-as int arg1) 4) 5)
(set! (-> obj times arg1)
@@ -1615,14 +1607,14 @@
)
)
)
(if (nonzero? (gui-control-method-17 obj s5-0))
(if (nonzero? (get-status obj s5-0))
(return #f)
)
)
(('hide)
(let ((v1-34 (gui-control-method-15 obj (the-as process #f) arg1 (the-as string #f) s5-0)))
(let ((v1-34 (lookup-gui-connection obj (the-as process #f) arg1 (the-as string #f) s5-0)))
(when (and v1-34 (!= (-> v1-34 action) 8))
(gui-control-method-16
(set-action!
obj
(gui-action hide)
s5-0
@@ -1637,7 +1629,7 @@
)
)
)
(if (nonzero? (gui-control-method-17 obj s5-0))
(if (nonzero? (get-status obj s5-0))
(return #f)
)
)
@@ -1655,7 +1647,7 @@
;; definition for method 19 of type gui-control
;; INFO: Used lq/sq
(defmethod gui-control-method-19 gui-control ((obj gui-control) (arg0 gui-channel) (arg1 gui-connection))
(defmethod handle-command-list gui-control ((obj gui-control) (arg0 gui-channel) (arg1 gui-connection))
(local-vars (sv-16 int) (sv-32 int) (sv-48 int))
(let ((gp-0 #t))
(cond
@@ -1675,7 +1667,7 @@
(let ((s0-0 80))
(set! sv-16 90)
(while (>= (the-as uint sv-16) (the-as uint s0-0))
(if (not (gui-control-method-23 obj arg0 (the-as gui-channel s0-0) (the-as symbol s1-0) arg1))
(if (not (handle-command obj arg0 (the-as gui-channel s0-0) (the-as symbol s1-0) arg1))
(set! gp-0 #f)
)
(+! s0-0 1)
@@ -1686,7 +1678,7 @@
(let ((s0-1 66))
(set! sv-32 70)
(while (>= (the-as uint sv-32) (the-as uint s0-1))
(if (not (gui-control-method-23 obj arg0 (the-as gui-channel s0-1) (the-as symbol s1-0) arg1))
(if (not (handle-command obj arg0 (the-as gui-channel s0-1) (the-as symbol s1-0) arg1))
(set! gp-0 #f)
)
(+! s0-1 1)
@@ -1697,7 +1689,7 @@
(let ((s0-2 18))
(set! sv-48 32)
(while (>= (the-as uint sv-48) (the-as uint s0-2))
(if (not (gui-control-method-23 obj arg0 (the-as gui-channel s0-2) (the-as symbol s1-0) arg1))
(if (not (handle-command obj arg0 (the-as gui-channel s0-2) (the-as symbol s1-0) arg1))
(set! gp-0 #f)
)
(+! s0-2 1)
@@ -1705,7 +1697,7 @@
)
)
(else
(if (not (gui-control-method-23 obj arg0 a2-1 (the-as symbol s1-0) arg1))
(if (not (handle-command obj arg0 a2-1 (the-as symbol s1-0) arg1))
(set! gp-0 #f)
)
)
@@ -1722,11 +1714,11 @@
)
;; definition for method 17 of type gui-control
;; WARN: Return type mismatch int vs gui-action.
(defmethod gui-control-method-17 gui-control ((obj gui-control) (arg0 sound-id))
;; WARN: Return type mismatch int vs gui-status.
(defmethod get-status gui-control ((obj gui-control) (arg0 sound-id))
(let ((gp-0 (the-as gui-connection #f)))
(if (zero? arg0)
(return (gui-action none))
(return (gui-status unknown))
)
(let ((v1-4 (-> obj engine alive-list next0)))
(-> obj engine)
@@ -1753,14 +1745,14 @@
)
(label cfg-15)
(the-as
gui-action
gui-status
(cond
((= (-> gp-0 channel) (gui-channel movie))
(cond
((= (-> gp-0 id) (-> obj ids (-> gp-0 channel)))
3
)
((gui-control-method-19 obj (-> gp-0 channel) gp-0)
((handle-command-list obj (-> gp-0 channel) gp-0)
2
)
(else
@@ -1788,16 +1780,16 @@
)
(cond
((logtest? (-> *sound-iop-info* stream-status s4-0) (stream-status ststatus-four))
(return (gui-action playing))
(return (gui-status active))
)
((logtest? (-> *sound-iop-info* stream-status s4-0) (stream-status ststatus-nine))
(return (gui-action stopping))
(return (gui-status stop))
)
((or (= (-> gp-0 id) (-> obj ids (-> gp-0 channel))) (gui-control-method-19 obj (-> gp-0 channel) gp-0))
(return (gui-action play))
((or (= (-> gp-0 id) (-> obj ids (-> gp-0 channel))) (handle-command-list obj (-> gp-0 channel) gp-0))
(return (gui-status ready))
)
(else
(return (gui-action queue))
(return (gui-status pending))
)
)
(the-as none 0)
@@ -1823,7 +1815,7 @@
3
)
)
((gui-control-method-19 obj (-> gp-0 channel) gp-0)
((handle-command-list obj (-> gp-0 channel) gp-0)
2
)
(else
@@ -1838,7 +1830,7 @@
((= (-> gp-0 id) (-> obj ids (-> gp-0 channel)))
3
)
((gui-control-method-19 obj (-> gp-0 channel) gp-0)
((handle-command-list obj (-> gp-0 channel) gp-0)
2
)
(else
@@ -1857,15 +1849,15 @@
)
;; definition for method 16 of type gui-control
(defmethod gui-control-method-16 gui-control ((obj gui-control)
(arg0 gui-action)
(arg1 sound-id)
(arg2 gui-channel)
(arg3 gui-action)
(arg4 string)
(arg5 (function gui-connection symbol))
(arg6 process)
)
(defmethod set-action! gui-control ((obj gui-control)
(arg0 gui-action)
(arg1 sound-id)
(arg2 gui-channel)
(arg3 gui-action)
(arg4 string)
(arg5 (function gui-connection symbol))
(arg6 process)
)
(local-vars (sv-16 gui-action) (sv-17 gui-action) (sv-20 string) (sv-24 (function gui-connection symbol)))
(set! sv-16 arg0)
(set! sv-17 arg3)
@@ -1890,7 +1882,7 @@
)
(else
(set! (-> s1-0 action) sv-16)
(if (and (= sv-16 'play) (gui-control-method-19 obj (-> s1-0 channel) s1-0))
(if (and (= sv-16 'play) (handle-command-list obj (-> s1-0 channel) s1-0))
(channel-id-set! obj s1-0 (-> s1-0 id))
)
)
@@ -1908,14 +1900,14 @@
;; definition for method 9 of type gui-control
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs sound-id.
(defmethod gui-control-method-9 gui-control ((obj gui-control)
(arg0 process)
(arg1 gui-channel)
(arg2 gui-action)
(arg3 string)
(arg4 float)
(arg5 time-frame)
)
(defmethod add-process gui-control ((obj gui-control)
(arg0 process)
(arg1 gui-channel)
(arg2 gui-action)
(arg3 string)
(arg4 float)
(arg5 time-frame)
)
(local-vars
(sv-16 int)
(sv-20 gui-connection)
@@ -1968,7 +1960,7 @@
(set! (-> sv-32 action) arg2)
(set! (-> sv-32 param2) (the-as int arg3))
(set! (-> sv-32 hold-time) arg5)
(set! (-> sv-32 flags) (the-as uint 1))
(set! (-> sv-32 flags) (gui-connection-flags gcf0))
(set! (-> sv-32 fade) (the-as uint 0))
(the-as int (-> (the-as gui-connection sv-32) id))
)
@@ -1982,7 +1974,7 @@
;; definition for method 10 of type gui-control
;; WARN: Return type mismatch int vs none.
(defmethod gui-control-method-10 gui-control ((obj gui-control) (arg0 process) (arg1 gui-channel))
(defmethod remove-process gui-control ((obj gui-control) (arg0 process) (arg1 gui-channel))
(let ((s3-0 (the-as gui-connection (-> obj engine alive-list next0))))
(-> obj engine)
(let ((s2-0 (-> s3-0 next0)))
@@ -2048,7 +2040,7 @@
(when (or (zero? (-> a0-15 id)) (not (handle->process (-> a0-15 handle))))
(set! sv-16 a0-15)
(set! (-> sv-16 param3) 0)
(set! (-> sv-16 flags) (the-as uint 0))
(set! (-> sv-16 flags) (gui-connection-flags))
(goto cfg-44)
)
)
@@ -2058,7 +2050,7 @@
(sv-16
(when (zero? (-> (the-as gui-connection sv-16) id))
(when (zero? sv-20)
(let ((v1-46 (gui-control-method-15 obj arg0 arg1 arg3 (new 'static 'sound-id))))
(let ((v1-46 (lookup-gui-connection obj arg0 arg1 arg3 (new 'static 'sound-id))))
(if v1-46
(set! sv-20 (the-as int (-> v1-46 id)))
)
@@ -2176,10 +2168,10 @@
)
;; definition for method 11 of type gui-control
(defmethod gui-control-method-11 gui-control ((obj gui-control) (arg0 gui-connection))
(defmethod stop-str gui-control ((obj gui-control) (arg0 gui-connection))
(case (shr (the-as int (-> arg0 channel)) 4)
((1 2)
(if (= (gui-control-method-17 obj (-> arg0 id)) (gui-action playing))
(if (= (get-status obj (-> arg0 id)) (gui-status active))
(str-play-stop (-> arg0 name) (-> arg0 id))
)
)
@@ -2201,7 +2193,9 @@
(case (-> arg0 action)
(((gui-action queue))
(spool-push *art-control* (-> arg0 name) (the-as int (-> arg0 anim-part)) arg1 (-> arg0 priority))
(if (and (logtest? (-> arg0 flags) 1) (= (gui-control-method-17 obj (-> arg0 id)) (gui-action playing)))
(if (and (logtest? (-> arg0 flags) (gui-connection-flags gcf0))
(= (get-status obj (-> arg0 id)) (gui-status active))
)
(set! (-> arg0 action) (gui-action playing))
)
)
@@ -2209,13 +2203,11 @@
)
(let ((v1-16 (-> arg0 action)))
(b! (!= v1-16 (gui-action play)) cfg-39 :delay (empty-form))
(if (gui-control-method-19 obj (-> arg0 channel) arg0)
(if (handle-command-list obj (-> arg0 channel) arg0)
(channel-id-set! obj arg0 (-> arg0 id))
)
(b!
(not (or (not (gui-control-method-18 obj (-> arg0 channel)))
(= (gui-control-method-17 obj (-> arg0 id)) (gui-action stopping))
)
(not (or (not (gui-control-method-18 obj (-> arg0 channel))) (= (get-status obj (-> arg0 id)) (gui-status stop)))
)
cfg-27
:delay (empty-form)
@@ -2224,7 +2216,7 @@
(channel-id-set! obj arg0 (new 'static 'sound-id))
)
(if (and arg2 (or (< (shr (the-as int (-> arg0 channel)) 4) (the-as uint 4))
(= (gui-control-method-17 obj (-> arg0 id)) (gui-action stopping))
(= (get-status obj (-> arg0 id)) (gui-status stop))
)
)
(move-to-dead arg0)
@@ -2234,8 +2226,8 @@
(let ((v1-40 (-> arg0 id)))
(b! (!= (-> obj ids (-> arg0 channel)) v1-40) cfg-38 :delay (empty-form))
)
(let ((v1-43 (gui-control-method-17 obj (-> arg0 id))))
(b! (!= v1-43 (gui-action play)) cfg-36 :delay (empty-form))
(let ((v1-43 (get-status obj (-> arg0 id))))
(b! (!= v1-43 (gui-status ready)) cfg-36 :delay (empty-form))
(case (shr (the-as int (-> arg0 channel)) 4)
((1 2)
(if (not (paused?))
@@ -2245,7 +2237,7 @@
)
(b! #t cfg-38 :delay (nop!))
(label cfg-36)
(b! (!= v1-43 (gui-action playing)) cfg-38 :delay (empty-form))
(b! (!= v1-43 (gui-status active)) cfg-38 :delay (empty-form))
)
(set! (-> arg0 action) (gui-action playing))
(label cfg-38)
@@ -2253,7 +2245,7 @@
(label cfg-39)
(b! (not (or (= v1-16 (gui-action playing)) (= v1-16 (gui-action fade)))) cfg-117 :delay (empty-form))
(b!
(not (and (= (gui-control-method-17 obj (-> arg0 id)) (gui-action playing))
(not (and (= (get-status obj (-> arg0 id)) (gui-status active))
(gui-control-method-18 obj (-> arg0 channel))
(or (= (-> arg0 action) (gui-action playing)) (< (-> arg0 fade) (the-as uint 30)))
)
@@ -2288,7 +2280,9 @@
(label cfg-73)
(cond
((not v1-66)
(when (and (logtest? (-> arg0 flags) 30) (logtest? (-> arg0 flags) 1))
(when (and (logtest? (-> arg0 flags) (gui-connection-flags gcf1 fo-curve fo-min fo-max))
(logtest? (-> arg0 flags) (gui-connection-flags gcf0))
)
(let* ((s5-1 (get-process arg0))
(s4-1 (if (type? s5-1 process-drawable)
s5-1
@@ -2315,16 +2309,16 @@
(set! (-> s5-2 params fo-min) (-> arg0 fo-min))
(set! (-> s5-2 params fo-max) (-> arg0 fo-max))
(set! (-> s5-2 params mask) (the-as uint 0))
(if (logtest? (-> arg0 flags) 2)
(if (logtest? (-> arg0 flags) (gui-connection-flags gcf1))
(logior! (-> s5-2 params mask) 32)
)
(if (logtest? (-> arg0 flags) 4)
(if (logtest? (-> arg0 flags) (gui-connection-flags fo-curve))
(logior! (-> s5-2 params mask) 256)
)
(if (logtest? (-> arg0 flags) 8)
(if (logtest? (-> arg0 flags) (gui-connection-flags fo-min))
(logior! (-> s5-2 params mask) 64)
)
(if (logtest? (-> arg0 flags) 16)
(if (logtest? (-> arg0 flags) (gui-connection-flags fo-max))
(logior! (-> s5-2 params mask) 128)
)
)
@@ -2355,7 +2349,7 @@
(let ((a0-75 (< (shr (the-as int (-> arg0 channel)) 4) (the-as uint 4))))
(b! a0-75 cfg-113 :likely-delay (set! v1-143 a0-75))
)
(set! v1-143 (= (gui-control-method-17 obj (-> arg0 id)) (gui-action stopping)))
(set! v1-143 (= (get-status obj (-> arg0 id)) (gui-status stop)))
(label cfg-113)
(if v1-143
(move-to-dead arg0)
@@ -2366,7 +2360,7 @@
(b! #t cfg-139 :delay (nop!))
(label cfg-117)
(b! (!= v1-16 (gui-action stop)) cfg-121 :delay (empty-form))
(gui-control-method-11 obj arg0)
(stop-str obj arg0)
(if arg2
(move-to-dead arg0)
)
@@ -2386,9 +2380,9 @@
((= v1-16 (gui-action hidden))
(cond
((or (< (shr (the-as int (-> arg0 channel)) 4) (the-as uint 4))
(= (gui-control-method-17 obj (-> arg0 id)) (gui-action stopping))
(= (get-status obj (-> arg0 id)) (gui-status stop))
)
(gui-control-method-11 obj arg0)
(stop-str obj arg0)
(if arg2
(move-to-dead arg0)
)
test/decompiler/reference/jak2/engine/nav/nav-control_REF.gc
Generated Vendored
+10 -143
View File
@@ -1282,38 +1282,6 @@
;; WARN: Stack slot offset 168 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 168 signed mismatch
;; WARN: Stack slot offset 200 signed mismatch
;; WARN: Stack slot offset 204 signed mismatch
;; WARN: Stack slot offset 200 signed mismatch
;; WARN: Stack slot offset 204 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 168 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 180 signed mismatch
;; WARN: Stack slot offset 168 signed mismatch
;; WARN: Stack slot offset 184 signed mismatch
;; WARN: Stack slot offset 180 signed mismatch
;; WARN: Stack slot offset 184 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 168 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 168 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 168 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 180 signed mismatch
;; WARN: Stack slot offset 168 signed mismatch
;; WARN: Stack slot offset 184 signed mismatch
;; WARN: Stack slot offset 180 signed mismatch
;; WARN: Stack slot offset 184 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 168 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 168 signed mismatch
;; WARN: Stack slot offset 200 signed mismatch
;; WARN: Stack slot offset 204 signed mismatch
;; WARN: Stack slot offset 200 signed mismatch
;; WARN: Stack slot offset 204 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
;; WARN: Stack slot offset 168 signed mismatch
;; WARN: Stack slot offset 164 signed mismatch
@@ -1380,7 +1348,7 @@
(sv-136 int)
(sv-144 nav-mesh-work)
(sv-148 nav-poly)
(sv-152 uint8)
(sv-152 uint)
(sv-156 (pointer int8))
(sv-160 (pointer int8))
(sv-164 float)
@@ -1594,7 +1562,7 @@
(defmethod find-adjacent-bounds-one nav-mesh ((obj nav-mesh) (arg0 vector) (arg1 nav-poly) (arg2 int) (arg3 int))
(local-vars (sv-16 nav-poly))
(if (zero? arg3)
(set! arg2 (the-as int (mod (the-as uint (+ arg2 1)) (the-as uint (-> arg1 vertex-count)))))
(set! arg2 (the-as int (mod (the-as uint (+ arg2 1)) (-> arg1 vertex-count))))
)
(set! sv-16 arg1)
(let ((s2-0 (-> sv-16 vertex arg2))
@@ -1604,18 +1572,13 @@
(while (begin (label cfg-21) (nonzero? s1-0))
(+! s1-0 -1)
(if (nonzero? arg3)
(set! arg2
(the-as
int
(mod (the-as uint (+ (+ arg2 arg3) (the-as int (-> s3-0 vertex-count)))) (the-as uint (-> s3-0 vertex-count)))
)
)
(set! arg2 (the-as int (mod (the-as uint (+ arg2 arg3 (-> s3-0 vertex-count))) (-> s3-0 vertex-count))))
)
(let ((v1-12 (-> s3-0 adj-poly arg2)))
(cond
((= v1-12 255)
(if (zero? arg3)
(set! arg2 (the-as int (mod (the-as uint (+ arg2 1)) (the-as uint (-> s3-0 vertex-count)))))
(set! arg2 (the-as int (mod (the-as uint (+ arg2 1)) (-> s3-0 vertex-count))))
)
(vector+! arg0 (-> s3-0 vertex arg2) (-> obj bounds))
(return #f)
@@ -1748,18 +1711,6 @@
;; WARN: Stack slot offset 160 signed mismatch
;; WARN: Stack slot offset 156 signed mismatch
;; WARN: Stack slot offset 160 signed mismatch
;; WARN: Stack slot offset 156 signed mismatch
;; WARN: Stack slot offset 160 signed mismatch
;; WARN: Stack slot offset 156 signed mismatch
;; WARN: Stack slot offset 172 signed mismatch
;; WARN: Stack slot offset 160 signed mismatch
;; WARN: Stack slot offset 176 signed mismatch
;; WARN: Stack slot offset 172 signed mismatch
;; WARN: Stack slot offset 176 signed mismatch
;; WARN: Stack slot offset 156 signed mismatch
;; WARN: Stack slot offset 160 signed mismatch
;; WARN: Stack slot offset 156 signed mismatch
;; WARN: Stack slot offset 160 signed mismatch
;; WARN: Stack slot offset 192 signed mismatch
;; WARN: Stack slot offset 196 signed mismatch
;; WARN: Stack slot offset 192 signed mismatch
@@ -1836,18 +1787,6 @@
;; WARN: Stack slot offset 176 signed mismatch
;; WARN: Stack slot offset 156 signed mismatch
;; WARN: Stack slot offset 160 signed mismatch
;; WARN: Stack slot offset 156 signed mismatch
;; WARN: Stack slot offset 160 signed mismatch
;; WARN: Stack slot offset 156 signed mismatch
;; WARN: Stack slot offset 160 signed mismatch
;; WARN: Stack slot offset 156 signed mismatch
;; WARN: Stack slot offset 172 signed mismatch
;; WARN: Stack slot offset 160 signed mismatch
;; WARN: Stack slot offset 176 signed mismatch
;; WARN: Stack slot offset 172 signed mismatch
;; WARN: Stack slot offset 176 signed mismatch
;; WARN: Stack slot offset 156 signed mismatch
;; WARN: Stack slot offset 160 signed mismatch
;; WARN: Return type mismatch int vs none.
(defmethod clamp-vector-to-mesh-cross-gaps nav-mesh ((obj nav-mesh)
(arg0 vector)
@@ -1868,7 +1807,7 @@
(sv-128 int)
(sv-136 nav-mesh-work)
(sv-140 nav-poly)
(sv-144 uint8)
(sv-144 uint)
(sv-148 (pointer int8))
(sv-152 (pointer int8))
(sv-156 float)
@@ -2913,37 +2852,13 @@
;; WARN: Stack slot offset 144 signed mismatch
;; WARN: Stack slot offset 124 signed mismatch
;; WARN: Stack slot offset 128 signed mismatch
;; WARN: Stack slot offset 124 signed mismatch
;; WARN: Stack slot offset 128 signed mismatch
;; WARN: Stack slot offset 124 signed mismatch
;; WARN: Stack slot offset 128 signed mismatch
;; WARN: Stack slot offset 124 signed mismatch
;; WARN: Stack slot offset 140 signed mismatch
;; WARN: Stack slot offset 128 signed mismatch
;; WARN: Stack slot offset 144 signed mismatch
;; WARN: Stack slot offset 140 signed mismatch
;; WARN: Stack slot offset 144 signed mismatch
;; WARN: Stack slot offset 124 signed mismatch
;; WARN: Stack slot offset 128 signed mismatch
;; WARN: Stack slot offset 124 signed mismatch
;; WARN: Stack slot offset 128 signed mismatch
;; WARN: Stack slot offset 124 signed mismatch
;; WARN: Stack slot offset 128 signed mismatch
;; WARN: Stack slot offset 124 signed mismatch
;; WARN: Stack slot offset 140 signed mismatch
;; WARN: Stack slot offset 128 signed mismatch
;; WARN: Stack slot offset 144 signed mismatch
;; WARN: Stack slot offset 140 signed mismatch
;; WARN: Stack slot offset 144 signed mismatch
;; WARN: Stack slot offset 124 signed mismatch
;; WARN: Stack slot offset 128 signed mismatch
;; WARN: Return type mismatch int vs none.
(defmethod navigate-using-best-dir-use-existing-avoid-spheres nav-state ((obj nav-state) (arg0 nav-avoid-spheres-params))
(local-vars
(sv-96 int)
(sv-104 nav-mesh-work)
(sv-108 nav-poly)
(sv-112 uint8)
(sv-112 uint)
(sv-116 (pointer int8))
(sv-120 (pointer int8))
(sv-124 float)
@@ -3171,37 +3086,13 @@
;; WARN: Stack slot offset 240 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 236 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 240 signed mismatch
;; WARN: Stack slot offset 236 signed mismatch
;; WARN: Stack slot offset 240 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 236 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 240 signed mismatch
;; WARN: Stack slot offset 236 signed mismatch
;; WARN: Stack slot offset 240 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Return type mismatch int vs none.
(defmethod navigate-using-best-dir-recompute-avoid-spheres-1 nav-state ((obj nav-state))
(local-vars
(sv-192 int)
(sv-200 nav-mesh-work)
(sv-204 nav-poly)
(sv-208 uint8)
(sv-208 uint)
(sv-212 (pointer int8))
(sv-216 (pointer int8))
(sv-220 float)
@@ -3531,8 +3422,8 @@
(defmethod plan-over-pat1-polys-using-route nav-state ((obj nav-state) (arg0 nav-gap-info))
(local-vars (sv-48 vector) (sv-52 vector) (sv-56 float))
(let ((a1-1 (-> obj next-poly)))
(when (logtest? (the-as int (-> a1-1 pat)) 1)
(while (and a1-1 (logtest? (the-as int (-> a1-1 pat)) 1))
(when (logtest? (-> a1-1 pat) 1)
(while (and a1-1 (logtest? (-> a1-1 pat) 1))
(set! a1-1 (lookup-poly-on-route-to-target (-> obj mesh) a1-1 (-> obj target-poly)))
)
(when (and a1-1 (!= a1-1 (-> obj current-poly)))
@@ -3944,37 +3835,13 @@
;; WARN: Stack slot offset 240 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 236 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 240 signed mismatch
;; WARN: Stack slot offset 236 signed mismatch
;; WARN: Stack slot offset 240 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 236 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Stack slot offset 240 signed mismatch
;; WARN: Stack slot offset 236 signed mismatch
;; WARN: Stack slot offset 240 signed mismatch
;; WARN: Stack slot offset 220 signed mismatch
;; WARN: Stack slot offset 224 signed mismatch
;; WARN: Return type mismatch int vs none.
(defmethod navigate-using-best-dir-recompute-avoid-spheres-2 nav-state ((obj nav-state))
(local-vars
(sv-192 int)
(sv-200 nav-mesh-work)
(sv-204 nav-poly)
(sv-208 uint8)
(sv-208 uint)
(sv-212 (pointer int8))
(sv-216 (pointer int8))
(sv-220 float)
test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc
Generated Vendored
+1 -1
View File
@@ -298,7 +298,7 @@
;; WARN: Return type mismatch int vs none.
(defmethod nav-enemy-method-177 nav-enemy ((obj nav-enemy))
(let ((v1-2 (-> obj nav state current-poly)))
(when (and v1-2 (logtest? (the-as int (-> v1-2 pat)) 4) (!= (-> v1-2 link) 255))
(when (and v1-2 (logtest? (-> v1-2 pat) 4) (!= (-> v1-2 link) 255))
(let ((v1-6 (-> obj nav state mesh link-array (-> v1-2 link) dest-mesh)))
(if v1-6
(change-to v1-6 obj)
test/decompiler/reference/jak2/engine/nav/nav-mesh-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -784,7 +784,7 @@
(next-poly-idx int)
(work nav-mesh-work)
(current-poly nav-poly)
(current-poly-vtx-count uint8)
(current-poly-vtx-count uint)
(v0-table (pointer int8))
(v1-table (pointer int8))
(delta-x float)
test/decompiler/reference/jak2/engine/nav/nav-mesh_REF.gc
Generated Vendored
+10 -10
View File
@@ -545,7 +545,7 @@
(defmethod debug-draw-poly nav-mesh ((obj nav-mesh) (arg0 nav-poly) (arg1 rgba))
(let ((gp-0 (new 'stack-no-clear 'inline-array 'vector 3)))
(set! (-> gp-0 0 quad) (-> obj bounds quad))
(if (logtest? (the-as int (-> arg0 pat)) 7)
(if (logtest? (-> arg0 pat) 7)
(set! (-> gp-0 0 y) (+ 409.6 (-> gp-0 0 y)))
)
(let ((v1-7 (the-as int (+ (-> arg0 vertex-count) -1))))
@@ -562,7 +562,7 @@
(set! v1-7 s2-0)
)
)
(when (and (logtest? (the-as int (-> arg0 pat)) 4) (< (the-as uint (-> arg0 link)) (-> obj link-count)))
(when (and (logtest? (-> arg0 pat) 4) (< (-> arg0 link) (-> obj link-count)))
(poly-centroid obj arg0 (-> gp-0 1))
(let ((s5-1 (-> obj link-array (-> arg0 link))))
(add-debug-x #t (bucket-id debug-no-zbuf1) (-> gp-0 1) *color-magenta*)
@@ -1573,13 +1573,13 @@
(dotimes (s5-1 (the-as int (-> obj poly-count)))
(let ((s4-1 (-> obj poly-array s5-1)))
(debug-draw-poly obj s4-1 (cond
((logtest? (the-as int (-> s4-1 pat)) 1)
((logtest? (-> s4-1 pat) 1)
*color-black*
)
((logtest? (the-as int (-> s4-1 pat)) 2)
((logtest? (-> s4-1 pat) 2)
*color-gray*
)
((logtest? (the-as int (-> s4-1 pat)) 4)
((logtest? (-> s4-1 pat) 4)
(if (-> obj link-array (-> s4-1 link) dest-mesh)
*color-green*
*color-light-red*
@@ -2163,7 +2163,7 @@
((and arg0 arg1 (!= arg0 arg1))
(let* ((a1-1 obj)
(v1-1 (-> arg0 id))
(v1-4 (* (+ (-> arg1 id) (* (the-as uint v1-1) (-> a1-1 poly-count))) 2))
(v1-4 (* (+ (-> arg1 id) (* v1-1 (-> a1-1 poly-count))) 2))
(s3-0
(logand (ash (-> (the-as (pointer uint8) (&+ (-> obj route) (shr v1-4 3)))) (- (the-as int (logand v1-4 7))))
3
@@ -2183,7 +2183,7 @@
(let ((a0-7 s3-0)
(v1-16 (the-as int (+ s3-0 1)))
)
(if (>= (the-as uint v1-16) (the-as uint (-> arg0 vertex-count)))
(if (>= (the-as uint v1-16) (-> arg0 vertex-count))
(set! v1-16 0)
)
(set! (-> arg2 vertex 1 quad) (-> arg0 vertex a0-7 quad))
@@ -2206,7 +2206,7 @@
((and arg0 arg1 (!= arg0 arg1))
(let* ((a3-0 obj)
(v1-1 (-> arg0 id))
(v1-4 (* (+ (-> arg1 id) (* (the-as uint v1-1) (-> a3-0 poly-count))) 2))
(v1-4 (* (+ (-> arg1 id) (* v1-1 (-> a3-0 poly-count))) 2))
(v1-9
(logand (ash (-> (the-as (pointer uint8) (&+ (-> obj route) (shr v1-4 3)))) (- (the-as int (logand v1-4 7))))
3
@@ -2296,7 +2296,7 @@
(set! sv-64 (the-as symbol #f))
(countdown (s5-0 sv-36)
(let ((v1-3 (-> obj poly-array s5-0)))
(if (logtest? (the-as int (-> v1-3 pat)) 1)
(if (logtest? (-> v1-3 pat) 1)
(set! sv-56 (+ sv-56 1))
)
(set! sv-68 (-> v1-3 vertex))
@@ -2420,7 +2420,7 @@
(s1-0 vector)
(sv-16 int)
(sv-24 nav-mesh-work)
(sv-28 uint8)
(sv-28 uint)
(sv-32 (pointer int8))
(sv-36 (pointer int8))
(sv-40 vector)
test/decompiler/reference/jak2/engine/process-drawable/process-drawable_REF.gc
Generated Vendored
+8 -12
View File
@@ -196,7 +196,7 @@
;; definition for method 10 of type draw-control
;; WARN: Return type mismatch int vs none.
(defmethod lod-set! draw-control ((obj draw-control) (arg0 int))
(let ((v1-1 (max 0 (min arg0 (the-as int (-> obj lod-set max-lod))))))
(let ((v1-1 (max 0 (min arg0 (-> obj lod-set max-lod)))))
(set! (-> obj desired-lod) v1-1)
(when (!= (-> obj cur-lod) v1-1)
(set! (-> obj mgeo) (-> obj lod-set lod v1-1 geo))
@@ -214,7 +214,7 @@
;; WARN: Return type mismatch int vs none.
(defmethod lods-assign! draw-control ((obj draw-control) (arg0 lod-set))
(mem-copy! (the-as pointer (-> obj lod-set)) (the-as pointer arg0) 49)
(let ((a1-2 (min (-> obj cur-lod) (the-as int (-> obj lod-set max-lod)))))
(let ((a1-2 (min (-> obj cur-lod) (-> obj lod-set max-lod))))
(set! (-> obj cur-lod) -1)
(lod-set! obj a1-2)
)
@@ -258,8 +258,8 @@
(let ((v1-0 (-> arg1 length))
(s3-0 (-> arg0 max-lod))
)
(set! (-> obj max-lod) (the-as int s3-0))
(dotimes (a0-1 (the-as int (+ s3-0 1)))
(set! (-> obj max-lod) s3-0)
(dotimes (a0-1 (+ s3-0 1))
(when (or (< (-> arg0 mgeo a0-1) 0) (>= (-> arg0 mgeo a0-1) v1-0))
(set! obj (the-as lod-set #f))
(goto cfg-22)
@@ -511,7 +511,7 @@
(let ((a2-3 *temp-string*))
(add-debug-text-3d #t (bucket-id debug-no-zbuf1) a2-3 s3-0 (font-color blue-#003cf1) s5-0)
)
(set! (-> s5-0 x) (the-as int (+ (-> s5-0 x) 10)))
(+! (-> s5-0 x) 10)
)
)
(none)
@@ -661,11 +661,7 @@
)
(set! sv-16 (-> s1-0 data (-> arg1 jgeo)))
(set! sv-20 (-> s1-0 length))
(when (or (< (the-as int (-> arg1 jgeo)) 0)
(>= (the-as int (-> arg1 jgeo)) sv-20)
(not sv-16)
(!= (-> sv-16 type) art-joint-geo)
)
(when (or (< (-> arg1 jgeo) 0) (>= (-> arg1 jgeo) sv-20) (not sv-16) (!= (-> sv-16 type) art-joint-geo))
(go process-drawable-art-error "joint-geo")
(set! s2-0 (the-as draw-control #f))
(goto cfg-50)
@@ -764,8 +760,8 @@
(let ((s4-0 v0-3))
(let ((s3-1 (-> s3-0 art-group)))
(cond
((>= (the-as int (-> arg0 janim)) 0)
(when (or (>= (the-as int (-> arg0 janim)) (-> s3-1 length))
((>= (-> arg0 janim) 0)
(when (or (>= (-> arg0 janim) (-> s3-1 length))
(begin (set! v1-14 (-> s3-1 data (-> arg0 janim))) (not v1-14))
(!= (-> v1-14 type) art-joint-anim)
)
test/decompiler/reference/jak2/engine/scene/scene_REF.gc
Generated Vendored
+7 -7
View File
@@ -158,7 +158,7 @@
(defmethod scene-method-15 scene ((obj scene) (arg0 spool-anim))
(set! (-> arg0 name) (-> obj anim))
(set! (-> arg0 anim-name) (-> obj anim))
(set! (-> arg0 parts) (the-as int (-> obj parts)))
(set! (-> arg0 parts) (-> obj parts))
(set! (-> arg0 command-list) (-> obj command-list))
(none)
)
@@ -1157,7 +1157,7 @@
(!= (-> *setting-control* user-current movie) (process->ppointer self))
)
*progress-process*
(!= (gui-control-method-17 *gui-control* (the-as sound-id (-> self gui-id))) 3)
(!= (get-status *gui-control* (the-as sound-id (-> self gui-id))) 3)
)
)
(suspend)
@@ -1225,16 +1225,16 @@
(nonzero? (-> self anim anim-name))
(let ((v1-161 (file-status *art-control* (-> self anim name) 0)))
(or (not (or (= v1-161 'active) (= v1-161 'locked)))
(let* ((a1-26 (gui-control-method-14
(let* ((a1-26 (lookup-gui-connection-id
*gui-control*
(the-as string (-> self anim anim-name))
(gui-channel none)
(gui-action none)
)
)
(v1-167 (gui-control-method-17 *gui-control* (the-as sound-id a1-26)))
(v1-167 (get-status *gui-control* (the-as sound-id a1-26)))
)
(not (or (= v1-167 (gui-action play)) (= v1-167 (gui-action playing))))
(not (or (= v1-167 (gui-status ready)) (= v1-167 (gui-status active))))
)
)
)
@@ -1652,7 +1652,7 @@
(process-drawable-draw-subtitles)
(when (and (= *cheat-mode* 'debug) (-> self scene))
(let ((gp-7
(gui-control-method-15 *gui-control* self (gui-channel art-load) (-> self scene name) (new 'static 'sound-id))
(lookup-gui-connection *gui-control* self (gui-channel art-load) (-> self scene name) (new 'static 'sound-id))
)
)
(when (!= *external-cam-mode* 'pad-0)
@@ -1835,7 +1835,7 @@
(set! (-> self scene) #f)
)
)
(set! (-> self gui-id) (the-as uint (gui-control-method-9
(set! (-> self gui-id) (the-as uint (add-process
*gui-control*
self
(gui-channel movie)
test/decompiler/reference/jak2/engine/sound/speech_REF.gc
Generated Vendored
+9 -11
View File
@@ -91,9 +91,7 @@
(the-as uint (rand-vu-int-range (the-as int (-> s5-1 min-delay)) (the-as int (-> s5-1 max-delay))))
)
(set! (-> s5-1 delay) (-> obj delay))
(set! (-> obj id)
(gui-control-method-9 *gui-control* s4-0 (-> obj gui-channel) (gui-action play) s3-1 -99.0 0)
)
(set! (-> obj id) (add-process *gui-control* s4-0 (-> obj gui-channel) (gui-action play) s3-1 -99.0 0))
)
(speech-channel-method-12 obj)
(logior! (-> obj flags) (speech-channel-flag disable))
@@ -138,7 +136,7 @@
)
)
(else
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(-> obj id)
@@ -153,10 +151,10 @@
)
)
)
(case (gui-control-method-17 *gui-control* (-> obj id))
(((gui-action queue))
(case (get-status *gui-control* (-> obj id))
(((gui-status pending))
(when (>= (- (-> pp clock frame-counter) (-> obj start-time)) (seconds 1))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(-> obj id)
@@ -170,7 +168,7 @@
(set! (-> obj end-time) (-> obj update-time))
)
)
(((gui-action none))
(((gui-status unknown))
(set! (-> obj id) (new 'static 'sound-id))
(set! (-> obj last-request handle) (the-as handle #f))
(set! (-> obj end-time) (-> obj update-time))
@@ -212,7 +210,7 @@
;; WARN: Return type mismatch int vs none.
(defmethod speech-channel-method-10 speech-channel ((obj speech-channel) (arg0 handle))
(when (= arg0 (handle->process (-> obj last-request handle)))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(-> obj id)
@@ -318,7 +316,7 @@
;; definition for method 16 of type speech-control
;; WARN: Return type mismatch int vs none.
(defmethod speech-control-method-16 speech-control ((obj speech-control))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
@@ -328,7 +326,7 @@
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(gui-control-method-16
(set-action!
*gui-control*
(gui-action stop)
(the-as sound-id 1)
test/decompiler/reference/jak2/engine/spatial-hash/collide-hash_REF.gc
Generated Vendored
+6 -6
View File
@@ -648,12 +648,12 @@
(set! (-> arg0 data 55 name) (symbol->string 'prototype-fragment))
(+! (-> arg0 data 55 count) 1)
(set! (-> arg0 data 56 name) (symbol->string 'prototype-poly))
(+! (-> arg0 data 56 count) (the-as int (-> obj stats num-polys)))
(+! (-> arg0 data 56 count) (-> obj stats num-polys))
(set! (-> arg0 data 57 name) (symbol->string 'prototype-vertex))
(+! (-> arg0 data 57 count) (the-as int (-> obj stats num-verts)))
(+! (-> arg0 data 57 count) (-> obj stats num-verts))
(let ((a3-0 (+ (-> obj num-indices) 112 (* (-> obj num-buckets) 4)))
(a2-9 (* (-> obj stats num-polys) 4))
(v1-22 (* (the-as uint 6) (the-as uint (-> obj stats num-verts))))
(v1-22 (* (the-as uint 6) (-> obj stats num-verts)))
)
(+! (-> arg0 data 55 used) a3-0)
(+! (-> arg0 data 55 total) (- (logand -16 (+ v1-22 15 a2-9 a3-0)) (the-as int (+ a2-9 v1-22))))
@@ -668,12 +668,12 @@
(set! (-> arg0 data 51 name) (symbol->string 'collision-fragment))
(+! (-> arg0 data 51 count) 1)
(set! (-> arg0 data 52 name) (symbol->string 'collision-poly))
(+! (-> arg0 data 52 count) (the-as int (-> obj stats num-polys)))
(+! (-> arg0 data 52 count) (-> obj stats num-polys))
(set! (-> arg0 data 53 name) (symbol->string 'collision-vertex))
(+! (-> arg0 data 53 count) (the-as int (-> obj stats num-verts)))
(+! (-> arg0 data 53 count) (-> obj stats num-verts))
(let ((a3-8 (+ (-> obj num-indices) 112 (* (-> obj num-buckets) 4)))
(a2-22 (* (-> obj stats num-polys) 4))
(v1-45 (* (the-as uint 6) (the-as uint (-> obj stats num-verts))))
(v1-45 (* (the-as uint 6) (-> obj stats num-verts)))
)
(+! (-> arg0 data 51 used) a3-8)
(+! (-> arg0 data 51 total) (- (logand -16 (+ v1-45 15 a2-22 a3-8)) (the-as int (+ a2-22 v1-45))))
test/decompiler/reference/jak2/engine/target/gun/gun-dark-shot_REF.gc
Generated Vendored
+2 -5
View File
@@ -177,12 +177,9 @@
(set! (-> obj fire-sound) (the-as uint (new-sound-id)))
(set! (-> obj trail-sound) (the-as uint (new-sound-id)))
(set! (-> obj explode-sound)
(the-as
uint
(gui-control-method-9 *gui-control* obj (gui-channel background) (gui-action queue) "pmkrxplo" -99.0 0)
)
(the-as uint (add-process *gui-control* obj (gui-channel background) (gui-action queue) "pmkrxplo" -99.0 0))
)
(gui-control-method-20 *gui-control* (the-as sound-id (-> obj explode-sound)) #t 50 150 11)
(set-falloff! *gui-control* (the-as sound-id (-> obj explode-sound)) #t 50 150 11)
(set! (-> obj start-pilot?)
(the-as basic (and *target* (logtest? (focus-status pilot) (-> *target* focus-status))))
)
test/decompiler/reference/jak2/engine/target/gun/gun-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -523,7 +523,7 @@
)
;; definition for method 12 of type fact-info-target
(defmethod get-gun-ammo fact-info-target ((obj fact-info-target) (arg0 target))
(defmethod get-gun-ammo fact-info-target ((obj fact-info-target))
(let ((current-gun (gun->ammo (-> (the-as target (-> obj process)) gun gun-type))))
(if (zero? current-gun)
0.0
test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc
Generated Vendored
+5 -5
View File
@@ -955,7 +955,7 @@
(-> self skel effect)
'punch
-1.0
(the-as int (-> self control impact-ctrl joint))
(-> self control impact-ctrl joint)
(the-as basic #f)
(the-as sound-name t1-3)
)
@@ -1097,12 +1097,12 @@
(set! (-> self darkjak clock-vel) 0.0)
(set! (-> self darkjak clock-on) #f)
(set! (-> self control unknown-sound-id00)
(gui-control-method-9 *gui-control* self (gui-channel jak) (gui-action queue) "darkbom0" -99.0 0)
(add-process *gui-control* self (gui-channel jak) (gui-action queue) "darkbom0" -99.0 0)
)
(none)
)
:exit (behavior ()
(gui-control-method-16
(set-action!
*gui-control*
(gui-action fade)
(-> self control unknown-sound-id00)
@@ -1237,7 +1237,7 @@
(suspend)
(ja :num! (seek! (ja-aframe 35.0 0)))
)
(gui-control-method-16
(set-action!
*gui-control*
(gui-action play)
(-> self control unknown-sound-id00)
@@ -1633,7 +1633,7 @@
(set-setting! 'music-volume 'rel 0 0)
(set-setting! 'ambient-volume 'rel 0 0)
(compute-alignment! (-> self align))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action play)
(-> self control unknown-sound-id00)
test/decompiler/reference/jak2/engine/target/target-death_REF.gc
Generated Vendored
+4 -8
View File
@@ -590,10 +590,10 @@
)
)
(set! (-> self control unknown-sound-id00)
(gui-control-method-9 *gui-control* *target* (gui-channel daxter) (gui-action play) t0-1 -99.0 0)
(add-process *gui-control* *target* (gui-channel daxter) (gui-action play) t0-1 -99.0 0)
)
)
(gui-control-method-20 *gui-control* (-> self control unknown-sound-id00) #t -1 100 2)
(set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2)
)
(else
(case (-> arg0 angle)
@@ -1917,9 +1917,9 @@
(local-vars (v1-24 symbol))
(sound-play "death-fall")
(set! (-> self control unknown-sound-id00)
(gui-control-method-9 *gui-control* *target* (gui-channel daxter) (gui-action play) "jakfall" -99.0 0)
(add-process *gui-control* *target* (gui-channel daxter) (gui-action play) "jakfall" -99.0 0)
)
(gui-control-method-20 *gui-control* (-> self control unknown-sound-id00) #t -1 100 2)
(set-falloff! *gui-control* (-> self control unknown-sound-id00) #t -1 100 2)
(set-setting! 'mode-name 'cam-endlessfall 0 0)
(logclear! (-> self water flags) (water-flags swim-ground))
(let ((f0-1 (fmin -4096.0 (- (-> self control ground-impact-vel)))))
@@ -2178,7 +2178,3 @@
)
:post target-no-stick-post
)
test/decompiler/reference/jak2/engine/target/target-gun_REF.gc
Generated Vendored
+2 -2
View File
@@ -1368,8 +1368,8 @@
(let ((s3-1 (new 'stack-no-clear 'vector4w)))
(cond
((and (logtest? (process-mask enemy guard) (-> s5-2 mask)) (transform-point-qword! s3-1 s4-5))
(let ((v1-173 (the-as int (+ (/ (the-as int (-> s3-1 x)) 16) -2048))))
(+ (/ (the-as int (-> s3-1 y)) 16) -2048)
(let ((v1-173 (+ (/ (-> s3-1 x) 16) -2048)))
(+ (/ (-> s3-1 y) 16) -2048)
(let ((a0-91 (abs v1-173)))
(cond
((< a0-91 65)
test/decompiler/reference/jak2/engine/target/target_REF.gc
Generated Vendored
+6 -6
View File
@@ -2404,7 +2404,7 @@
(logtest? (-> v1-14 root-prim prim-core action) (collide-action no-smack))
)
)
(set! (-> self control unknown-word04) (the-as uint (+ (-> self control unknown-word04) 1)))
(+! (-> self control unknown-word04) 1)
)
)
)
@@ -2768,7 +2768,7 @@
(-> self skel effect)
'punch
-1.0
(the-as int (-> self control impact-ctrl joint))
(-> self control impact-ctrl joint)
(the-as basic #f)
(the-as sound-name t1-6)
)
@@ -3104,7 +3104,7 @@
)
:exit (behavior ()
(if (not (and (-> self next-state) (= (-> self next-state name) 'target-darkjak-bomb1)))
(gui-control-method-16
(set-action!
*gui-control*
(gui-action play)
(-> self control unknown-sound-id00)
@@ -3177,7 +3177,7 @@
(logtest? (-> self darkjak stage) 8)
)
(set! (-> self control unknown-sound-id00)
(gui-control-method-9 *gui-control* self (gui-channel jak) (gui-action queue) "darkbom1" -99.0 0)
(add-process *gui-control* self (gui-channel jak) (gui-action queue) "darkbom1" -99.0 0)
)
(ja-no-eval :group! (-> self draw art-group data 391)
:num! (seek! (ja-aframe 7.0 0))
@@ -3496,7 +3496,7 @@
(and (logtest? (-> self control status) (collide-status touch-wall)) (< 0.7 (-> self control poly-angle)))
)
(not (logtest? (-> self control status) (collide-status touch-actor)))
(>= (the-as uint (-> self control unknown-word04)) (the-as uint 2))
(>= (-> self control unknown-word04) (the-as uint 2))
)
(set! (-> self control last-time-of-stuck) (-> self clock frame-counter))
(set! gp-1 'stuck)
@@ -3635,7 +3635,7 @@
)
(suspend)
(until #f
(set! (-> self control unknown-word04) (the-as uint (+ (-> self control unknown-word04) 1)))
(+! (-> self control unknown-word04) 1)
(ja :num! (seek!))
(let ((gp-1 (-> self skel root-channel 1)))
(let ((f0-28 (lerp-scale 0.0 1.0 (-> self control ctrl-xz-vel) 0.0 40960.0)))
test/decompiler/reference/jak2/engine/ui/gui-h_REF.gc
Generated Vendored
+25 -25
View File
@@ -3,21 +3,21 @@
;; definition of type gui-connection
(deftype gui-connection (connection)
((priority float :offset 16)
(action gui-action :offset 20)
(channel gui-channel :offset 21)
(anim-part uint8 :offset 22)
(flags uint8 :offset 23)
(name string :offset 24)
(id sound-id :offset 28)
(handle handle :offset 0)
(time-stamp time-frame :offset 8)
(hold-time time-frame :offset-assert 32)
(fo-min int16 :offset-assert 40)
(fo-max int16 :offset-assert 42)
(fo-curve int8 :offset-assert 44)
(fade uint8 :offset-assert 45)
(pad uint8 2 :offset-assert 46)
((priority float :offset 16)
(action gui-action :offset 20)
(channel gui-channel :offset 21)
(anim-part uint8 :offset 22)
(flags gui-connection-flags :offset 23)
(name string :offset 24)
(id sound-id :offset 28)
(handle handle :offset 0)
(time-stamp time-frame :offset 8)
(hold-time time-frame :offset-assert 32)
(fo-min int16 :offset-assert 40)
(fo-max int16 :offset-assert 42)
(fo-curve int8 :offset-assert 44)
(fade uint8 :offset-assert 45)
(pad uint8 2 :offset-assert 46)
)
:method-count-assert 14
:size-assert #x30
@@ -262,21 +262,21 @@
:flag-assert #x1900000cd0
(:methods
(new (symbol type int) _type_ 0)
(gui-control-method-9 (_type_ process gui-channel gui-action string float time-frame) sound-id 9)
(gui-control-method-10 (_type_ process gui-channel) none 10)
(gui-control-method-11 (_type_ gui-connection) int 11)
(add-process (_type_ process gui-channel gui-action string float time-frame) sound-id 9)
(remove-process (_type_ process gui-channel) none 10)
(stop-str (_type_ gui-connection) int 11)
(gui-control-method-12 (_type_ process gui-channel gui-action string int float sound-id) sound-id 12)
(update (_type_ symbol) int 13)
(gui-control-method-14 (_type_ string gui-channel gui-action) int 14)
(gui-control-method-15 (_type_ process gui-channel string sound-id) gui-connection 15)
(gui-control-method-16 (_type_ gui-action sound-id gui-channel gui-action string (function gui-connection symbol) process) int 16)
(gui-control-method-17 (_type_ sound-id) gui-action 17)
(lookup-gui-connection-id (_type_ string gui-channel gui-action) int 14)
(lookup-gui-connection (_type_ process gui-channel string sound-id) gui-connection 15)
(set-action! (_type_ gui-action sound-id gui-channel gui-action string (function gui-connection symbol) process) int 16)
(get-status (_type_ sound-id) gui-status 17)
(gui-control-method-18 (_type_ gui-channel) symbol 18)
(gui-control-method-19 (_type_ gui-channel gui-connection) symbol 19)
(gui-control-method-20 (_type_ sound-id symbol int int int) gui-connection 20)
(handle-command-list (_type_ gui-channel gui-connection) symbol 19)
(set-falloff! (_type_ sound-id symbol int int int) gui-connection 20)
(gui-control-method-21 (_type_ gui-connection vector) int 21)
(gui-control-method-22 (_type_ gui-connection process symbol) none 22)
(gui-control-method-23 (_type_ gui-channel gui-channel symbol gui-connection) symbol 23)
(handle-command (_type_ gui-channel gui-channel symbol gui-connection) symbol 23)
(channel-id-set! (_type_ gui-connection sound-id) int 24)
)
)
test/decompiler/reference/jak2/engine/ui/hud-h_REF.gc
Generated Vendored
+37 -34
View File
@@ -3,12 +3,13 @@
;; definition of type hud-string
(deftype hud-string (basic)
((text string :offset-assert 4)
(scale float :offset-assert 8)
(color uint32 :offset-assert 12)
(flags uint32 :offset-assert 16)
(pos vector4w :inline :offset-assert 32)
((text string :offset-assert 4)
(scale float :offset-assert 8)
(color font-color :offset-assert 12)
(flags font-flags :offset-assert 16)
(pos int32 4 :offset 32)
)
:allow-misaligned
:method-count-assert 9
:size-assert #x30
:flag-assert #x900000030
@@ -34,6 +35,7 @@
(deftype hud-sprite (structure)
((pos vector4w :inline :offset-assert 0)
(color vector4w :inline :offset-assert 16)
(color2 int32 4 :offset 16)
(flags uint32 :offset-assert 32)
(scale-x float :offset-assert 36)
(scale-y float :offset-assert 40)
@@ -44,7 +46,7 @@
:size-assert #x34
:flag-assert #xb00000034
(:methods
(hud-sprite-method-9 (_type_ dma-buffer level) none 9)
(draw (_type_ dma-buffer level) none 9)
(hud-sprite-method-10 (_type_) none 10)
)
)
@@ -57,7 +59,7 @@
)
(format #t "[~8x] ~A~%" obj 'hud-sprite)
(format #t "~1Tpos: #<vector4w @ #x~X>~%" (-> obj pos))
(format #t "~1Tcolor: #<vector4w @ #x~X>~%" (-> obj color))
(format #t "~1Tcolor: #<vector4w @ #x~X>~%" (-> obj color2))
(format #t "~1Tflags: ~D~%" (-> obj flags))
(format #t "~1Tscale-x: ~f~%" (-> obj scale-x))
(format #t "~1Tscale-y: ~f~%" (-> obj scale-y))
@@ -77,13 +79,13 @@
:size-assert #x20
:flag-assert #x1000000020
(:methods
(hud-box-method-9 (_type_ dma-buffer) none 9)
(hud-box-method-10 () none 10)
(hud-box-method-11 () none 11)
(hud-box-method-12 () none 12)
(hud-box-method-13 (_type_ dma-buffer float) int 13)
(hud-box-method-14 (_type_) none 14)
(hud-box-method-15 (_type_) none 15)
(draw-box-prim-only (_type_ dma-buffer) none 9)
(draw-box-alpha-1 (_type_ dma-buffer) none 10)
(draw-box-alpha-2 (_type_ dma-buffer) none 11)
(draw-box-alpha-3 (_type_ dma-buffer) none 12)
(draw-scan-and-line (_type_ dma-buffer float) int 13)
(setup-scissor (_type_ dma-buffer) none 14)
(restore-scissor (_type_ dma-buffer) none 15)
)
)
@@ -103,11 +105,12 @@
;; definition of type hud-icon
(deftype hud-icon (basic)
((icon (pointer manipy) :offset-assert 4)
(pos vector4w :inline :offset-assert 16)
(scale-x float :offset-assert 32)
(scale-y float :offset-assert 36)
((icon (pointer manipy) :offset-assert 4)
(pos int32 4 :offset 16)
(scale-x float :offset-assert 32)
(scale-y float :offset-assert 36)
)
:allow-misaligned
:method-count-assert 9
:size-assert #x28
:flag-assert #x900000028
@@ -135,7 +138,7 @@
(flags uint16 :offset-assert 12)
(counter uint16 :offset-assert 14)
)
:pack-me
:allow-misaligned
:method-count-assert 9
:size-assert #x10
:flag-assert #x900000010
@@ -162,11 +165,11 @@
(last-hide-time time-frame :offset-assert 136)
(offset float :offset-assert 144)
(flags hud-flags :offset-assert 148)
(values hud-value 8 :inline :offset-assert 152)
(strings hud-string 14 :inline :offset-assert 288)
(sprites hud-sprite 30 :inline :offset-assert 960)
(icons hud-icon 2 :inline :offset-assert 2880)
(gui-id sound-id :offset-assert 2976)
(values hud-value 8 :inline :offset 148)
(strings hud-string 14 :inline :offset 284)
(sprites hud-sprite 30 :inline :offset 960)
(icons hud-icon 2 :inline :offset 2876)
(gui-id sound-id :offset 2976)
)
:heap-base #xb30
:method-count-assert 27
@@ -174,18 +177,18 @@
:flag-assert #x1b0b300ba4
(:methods
(hidden? (_type_) symbol 14)
(hud-method-15 (_type_) none 15)
(hud-method-16 (_type_ int int) none 16)
(hud-method-17 (_type_) none 17)
(hud-method-18 (_type_) symbol 18)
(draw (_type_) none 15)
(update-values (_type_) none 16)
(init-callback (_type_) none 17)
(event-callback (_type_ process int symbol event-message-block) symbol 18)
(hud-method-19 (_type_) none 19)
(hud-method-20 (_type_) none 20)
(hud-method-21 (_type_) none 21)
(hud-method-22 (_type_) none 22)
(hud-method-23 (_type_) none 23)
(hud-method-24 (_type_ symbol) none 24)
(hud-method-25 (_type_) none 25)
(hud-method-26 (_type_ int) none 26)
(check-ready-and-maybe-show (_type_ symbol) symbol 24)
(update-value-callback (_type_ int int) none 25)
(alloc-string-if-needed (_type_ int) none 26)
)
)
@@ -202,10 +205,10 @@
(format #t "~2Tlast-hide-time: ~D~%" (-> obj last-hide-time))
(format #t "~2Toffset: ~f~%" (-> obj offset))
(format #t "~2Tflags: ~D~%" (-> obj flags))
(format #t "~2Tvalues[8] @ #x~X~%" (&-> obj values 0 type))
(format #t "~2Tstrings[14] @ #x~X~%" (&-> obj strings 0 type))
(format #t "~2Tvalues[8] @ #x~X~%" (-> obj values))
(format #t "~2Tstrings[14] @ #x~X~%" (-> obj strings))
(format #t "~2Tsprites[30] @ #x~X~%" (-> obj sprites))
(format #t "~2Ticons[2] @ #x~X~%" (&-> obj stack 2752))
(format #t "~2Ticons[2] @ #x~X~%" (-> obj icons))
(format #t "~2Tgui-id: ~D~%" (-> obj gui-id))
(label cfg-4)
obj
test/decompiler/reference/jak2/engine/ui/minimap-h_REF.gc
Generated Vendored
+5 -5
View File
@@ -556,19 +556,19 @@
(minimap-method-12 (_type_ process uint int vector int) connection-minimap 12)
(minimap-method-13 () none 13)
(minimap-method-14 () none 14)
(minimap-method-15 () none 15)
(minimap-method-15 (_type_ dma-buffer vector4w symbol) none 15)
(minimap-method-16 () none 16)
(minimap-method-17 () none 17)
(minimap-method-18 () none 18)
(minimap-method-19 () none 19)
(minimap-method-20 () none 20)
(minimap-method-20 (_type_) symbol 20)
(minimap-method-21 () none 21)
(minimap-method-22 () none 22)
(minimap-method-23 () none 23)
(minimap-method-24 () none 24)
(minimap-method-25 () none 25)
(minimap-method-24 (_type_ dma-buffer vector4w symbol) none 24)
(minimap-method-25 (_type_ texture float) none 25)
(minimap-method-26 () none 26)
(minimap-method-27 () none 27)
(minimap-method-27 (_type_ float float) none 27)
)
)

Some files were not shown because too many files have changed in this diff Show More