Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 11:26:18 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

decomp: task-control (#654)

Browse source 
* stash

* decompiler: support symbols in arrays

* decomp: a ton of lambda casts

* finish task control?

* add lambda label casts

* decomp: resolve some issues, add enums

* decomp: One last decompiler issue remains

* decomp: finalize `task-control`

* linting

* revert change to test change, didn't mean to commit

* decomp: comment out function call for now
This commit is contained in:
Tyler Wilding 2021-07-02 15:11:28 -04:00 committed by GitHub
parent d4683736a2
commit bc41241234
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 12003 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

243
decompiler/config/all-types.gc
View file

@ -596,6 +596,7 @@
:type uint16
(bit-1 1)
(dead 2)
(unknown 5) ;; TODO - task-control::task-cstage::14
(complete 6))
(defenum path-control-flag
@ -613,6 +614,140 @@
(bit13 13)
)
(defenum task-status
:type uint64
(invalid 0)
(unknown 1)
(need-hint 2)
(need-introduction 3)
(need-reminder-a 4)
(need-reminder 5)
(need-reward-speech 6)
(need-resolution 7)
(*unknown* 999999)
)
(defenum game-task
:type uint8
(none 0)
(complete 1)
(jungle-eggtop 2)
(jungle-lurkerm 3)
(jungle-tower 4)
(jungle-fishgame 5)
(jungle-plant 6)
(jungle-buzzer 7)
(jungle-canyon-end 8)
(jungle-temple-door 9)
(village1-yakow 10)
(village1-mayor-money 11)
(village1-uncle-money 12)
(village1-oracle-money1 13)
(village1-oracle-money2 14)
(beach-ecorocks 15)
(beach-pelican 16)
(beach-flutflut 17)
(beach-seagull 18)
(beach-cannon 19)
(beach-buzzer 20)
(beach-gimmie 21)
(beach-sentinel 22)
(misty-muse 23)
(misty-boat 24)
(misty-warehouse 25)
(misty-cannon 26)
(misty-bike 27)
(misty-buzzer 28)
(misty-bike-jump 29)
(misty-eco-challenge 30)
(village2-gambler-money 31)
(village2-geologist-money 32)
(village2-warrior-money 33)
(village2-oracle-money1 34)
(village2-oracle-money2 35)
(swamp-billy 36)
(swamp-flutflut 37)
(swamp-battle 38)
(swamp-tether-1 39)
(swamp-tether-2 40)
(swamp-tether-3 41)
(swamp-tether-4 42)
(swamp-buzzer 43)
(sunken-platforms 44)
(sunken-pipe 45)
(sunken-slide 46)
(sunken-room 47)
(sunken-sharks 48)
(sunken-buzzer 49)
(sunken-top-of-helix 50)
(sunken-spinning-room 51)
(rolling-race 52)
(rolling-robbers 53)
(rolling-moles 54)
(rolling-plants 55)
(rolling-lake 56)
(rolling-buzzer 57)
(rolling-ring-chase-1 58)
(rolling-ring-chase-2 59)
(snow-eggtop 60)
(snow-ram 61)
(snow-fort 62)
(snow-ball 63)
(snow-bunnies 64)
(snow-buzzer 65)
(snow-bumpers 66)
(snow-cage 67)
(firecanyon-buzzer 68)
(firecanyon-end 69)
(citadel-sage-green 70)
(citadel-sage-blue 71)
(citadel-sage-red 72)
(citadel-sage-yellow 73)
(village3-extra1 74)
(village1-buzzer 75)
(village2-buzzer 76)
(village3-buzzer 77)
(cave-gnawers 78)
(cave-dark-crystals 79)
(cave-dark-climb 80)
(cave-robot-climb 81)
(cave-swing-poles 82)
(cave-spider-tunnel 83)
(cave-platforms 84)
(cave-buzzer 85)
(ogre-boss 86)
(ogre-end 87)
(ogre-buzzer 88)
(lavatube-end 89)
(lavatube-buzzer 90)
(citadel-buzzer 91)
(training-gimmie 92)
(training-door 93)
(training-climb 94)
(training-buzzer 95)
(village3-miner-money1 96)
(village3-miner-money2 97)
(village3-miner-money3 98)
(village3-miner-money4 99)
(village3-oracle-money1 100)
(village3-oracle-money2 101)
(firecanyon-assistant 102)
(village2-levitator 103)
(swamp-arm 104)
(village3-button 105)
(red-eggtop 106)
(lavatube-balls 107)
(lavatube-start 108)
(intro 109)
(ogre-secret 110)
(village4-button 111)
(finalboss-movies 112)
(plunger-lurker-hit 113)
(leaving-misty 114)
(assistant-village3 115)
(max 116)
(*unknown* 255))
;; ----------------------
;; File - gstring-h
@ -8461,6 +8596,7 @@
)
)
(declare-type entity-perm structure)
(declare-type entity-perm-array basic)
(deftype game-info (basic)
((mode symbol :offset-assert 4)
@ -8517,7 +8653,7 @@
(dummy-10 () none 10)
(dummy-11 () none 11)
(dummy-12 () none 12)
(dummy-13 () none 13)
(dummy-13 (_type_ uint) entity-perm 13) ; TODO - not totally confirmed
(dummy-14 (_type_) none 14)
(dummy-15 (_type_) none 15)
(dummy-16 () none 16)
@ -12472,7 +12608,7 @@
)
(deftype entity-perm-array (inline-array-class)
()
((data entity-perm :inline :dynamic :offset-assert 16))
:method-count-assert 9
:size-assert #x10
:flag-assert #x900000010
@ -15852,44 +15988,45 @@
;; - Types
(declare-type task-control basic)
(deftype task-cstage (structure)
((game-task uint8 :offset-assert 0)
(status uint64 :offset-assert 8)
((game-task game-task :offset-assert 0)
(status task-status :offset-assert 8)
(flags uint8 :offset-assert 16)
(condition basic :offset-assert 20)
(condition (function task-control symbol) :offset-assert 20)
)
:method-count-assert 16
:size-assert #x18
:flag-assert #x1000000018
(:methods
(dummy-9 () none 9)
(dummy-10 () none 10)
(dummy-11 () none 11)
(dummy-12 () none 12)
(dummy-13 () none 13)
(dummy-14 () none 14)
(dummy-15 () none 15)
(get-game-task (_type_) uint 9)
(get-task-status (_type_) uint 10)
(TODO-RENAME-11 (_type_ task-control) symbol 11)
(first-flag-bit? (_type_) symbol 12)
(third-flag-bit? (_type_) symbol 13)
(TODO-RENAME-14 (_type_) int 14)
(clear-all-but-first-flag-bit (_type_) int 15)
)
)
(deftype task-control (basic)
((current-stage int16 :offset-assert 4)
(stage basic :offset-assert 8)
(stage (array task-cstage) :offset-assert 8)
)
:method-count-assert 19
:size-assert #xc
:flag-assert #x130000000c
(:methods
(dummy-9 () none 9)
(dummy-10 () none 10)
(dummy-11 () none 11)
(dummy-12 () none 12)
(dummy-13 () none 13)
(dummy-14 () none 14)
(dummy-15 () none 15)
(dummy-16 () none 16)
(dummy-17 () none 17)
(dummy-18 () none 18)
(current-task (_type_) int 9)
(current-status (_type_) int 10)
(close-current! (_type_) none 11)
(close-status! (_type_ int) int 12)
(first-any (_type_ symbol) int 13)
(reset! (_type_ symbol symbol) int 14)
(closed? (_type_ int int) symbol 15)
(get-reminder (_type_ int) int 16)
(save-reminder (_type_ int int) int 17) ;; TODO - i believe this is none
(exists? (_type_ int int) symbol 18)
)
)
@ -15986,11 +16123,11 @@
;; - Functions
(define-extern get-task-control function)
(define-extern get-task-control (function int task-control))
(define-extern level-hint-spawn function)
(define-extern get-game-count function)
(define-extern activate-orb-all function)
(define-extern close-specific-task! function)
(define-extern close-specific-task! (function task-control int int))
(define-extern reset-all-hint-controls function)
(define-extern reset-actors function)
(define-extern set-blackout-frames (function int uint))
@ -15998,7 +16135,7 @@
(define-extern stop (function symbol int))
(define-extern start (function symbol continue-point target))
(define-extern position-in-front-of-camera! (function vector float float vector))
(define-extern game-task->string function)
(define-extern game-task->string (function int string))
(define-extern trsq->continue-point function)
;; - Symbols
@ -16111,7 +16248,7 @@
(define-extern progress-allowed? (function symbol))
(define-extern print-game-text (function string font-context symbol int int float)) ; TODO decomp error, this seems correct though
(define-extern get-aspect-ratio (function symbol))
(define-extern get-task-status function)
(define-extern get-task-status (function task-control int))
(define-extern lookup-level-info (function symbol level-load-info))
(define-extern calculate-completion function)
(define-extern game-save-elt->string function)
@ -18095,7 +18232,7 @@
(define-extern hide-bottom-hud function)
(define-extern ambient-hint-init-by-other function)
(define-extern level-hint-process-cmd function)
(define-extern task-known? function)
(define-extern task-known? (function task-control symbol))
(define-extern can-grab-display? function)
(define-extern level-hint-displayed? function)
(define-extern ambient-inspect function)
@ -18753,7 +18890,7 @@
(define-extern target-hit-push function)
(define-extern velocity-set-to-target! function)
(define-extern start-sequence-a function)
(define-extern task-closed? function)
(define-extern task-closed? (function int int symbol))
(define-extern next-level function)
;; - Unknowns
@ -19163,7 +19300,7 @@
;; - Functions
(define-extern task-control-reset function)
(define-extern task-control-reset (function symbol none))
(define-extern init-entity function)
(define-extern birth-viewer function)
(define-extern update-actor-vis-box function)
@ -19666,31 +19803,31 @@
;; - Functions
(define-extern task-status->string function)
(define-extern open-specific-task! function)
(define-extern task-exists? function)
(define-extern sages-kidnapped? function)
(define-extern task-status->string (function int string))
(define-extern open-specific-task! (function task-control int int))
(define-extern task-exists? (function task-control int symbol))
(define-extern sages-kidnapped? (function symbol))
;; - Unknowns
;; - Symbols
;;(define-extern *null-task-control* object) ;; unknown type
;;(define-extern *task-controls* object) ;; unknown type
;;(define-extern *assistant-tasks* object) ;; unknown type
;;(define-extern *assistant-village2-tasks* object) ;; unknown type
;;(define-extern *gambler-tasks* object) ;; unknown type
;;(define-extern *geologist-tasks* object) ;; unknown type
;;(define-extern *mayor-tasks* object) ;; unknown type
;;(define-extern *sage-tasks* object) ;; unknown type
;;(define-extern *sage-bluehut-tasks* object) ;; unknown type
;;(define-extern *oracle-village1-tasks* object) ;; unknown type
;;(define-extern *oracle-village2-tasks* object) ;; unknown type
;;(define-extern *oracle-village3-tasks* object) ;; unknown type
;;(define-extern *miners-tasks* object) ;; unknown type
;;(define-extern *sage-villagec-tasks* object) ;; unknown type
;;(define-extern *citb-greensage-tasks* object) ;; unknown type
;;(define-extern *citb-bluesage-tasks* object) ;; unknown type
;;(define-extern *citb-redsage-tasks* object) ;; unknown type
;;(define-extern *citb-yellowsage-tasks* object) ;; unknown type
(define-extern *null-task-control* task-control)
(define-extern *task-controls* (array task-control))
(define-extern *assistant-tasks* task-control)
(define-extern *assistant-village2-tasks* task-control)
(define-extern *gambler-tasks* task-control)
(define-extern *geologist-tasks* task-control)
(define-extern *mayor-tasks* task-control)
(define-extern *sage-tasks* task-control)
(define-extern *sage-bluehut-tasks* task-control)
(define-extern *oracle-village1-tasks* task-control)
(define-extern *oracle-village2-tasks* task-control)
(define-extern *oracle-village3-tasks* task-control)
(define-extern *miners-tasks* task-control)
(define-extern *sage-villagec-tasks* task-control)
(define-extern *citb-greensage-tasks* task-control)
(define-extern *citb-bluesage-tasks* task-control)
(define-extern *citb-redsage-tasks* task-control)
(define-extern *citb-yellowsage-tasks* task-control)
;; ----------------------

527
decompiler/config/jak1_ntsc_black_label/anonymous_function_types.jsonc
View file

@ -1,22 +1,509 @@
{
"gkernel":[
[16, "(function process symbol)"],
[22, "(function process symbol)"],
[25, "(function process symbol)"],
[28, "(function process symbol)"],
[30, "(function process symbol)"],
[32, "(function process symbol)"]
],
"gkernel": [
[16, "(function process symbol)"],
[22, "(function process symbol)"],
[25, "(function process symbol)"],
[28, "(function process symbol)"],
[30, "(function process symbol)"],
[32, "(function process symbol)"]
],
"hud":[
[15, "(function basic int basic event-message-block object)"]
],
"main":[
[4, "(function none)"]
],
"process-drawable":[
[29, "(function string symbol)"]
]
}
"hud": [[15, "(function basic int basic event-message-block object)"]],
"main": [[4, "(function none)"]],
"process-drawable": [[29, "(function string symbol)"]],
"task-control": [
[9, "(function task-control symbol)"],
[10, "(function task-control symbol)"],
[11, "(function task-control symbol)"],
[12, "(function task-control symbol)"],
[13, "(function task-control symbol)"],
[14, "(function task-control symbol)"],
[15, "(function task-control symbol)"],
[16, "(function task-control symbol)"],
[17, "(function task-control symbol)"],
[18, "(function task-control symbol)"],
[19, "(function task-control symbol)"],
[20, "(function task-control symbol)"],
[21, "(function task-control symbol)"],
[22, "(function task-control symbol)"],
[23, "(function task-control symbol)"],
[24, "(function task-control symbol)"],
[25, "(function task-control symbol)"],
[26, "(function task-control symbol)"],
[27, "(function task-control symbol)"],
[28, "(function task-control symbol)"],
[29, "(function task-control symbol)"],
[30, "(function task-control symbol)"],
[31, "(function task-control symbol)"],
[32, "(function task-control symbol)"],
[33, "(function task-control symbol)"],
[34, "(function task-control symbol)"],
[35, "(function task-control symbol)"],
[36, "(function task-control symbol)"],
[37, "(function task-control symbol)"],
[38, "(function task-control symbol)"],
[39, "(function task-control symbol)"],
[40, "(function task-control symbol)"],
[41, "(function task-control symbol)"],
[42, "(function task-control symbol)"],
[43, "(function task-control symbol)"],
[44, "(function task-control symbol)"],
[45, "(function task-control symbol)"],
[46, "(function task-control symbol)"],
[47, "(function task-control symbol)"],
[48, "(function task-control symbol)"],
[49, "(function task-control symbol)"],
[50, "(function task-control symbol)"],
[51, "(function task-control symbol)"],
[52, "(function task-control symbol)"],
[53, "(function task-control symbol)"],
[54, "(function task-control symbol)"],
[55, "(function task-control symbol)"],
[56, "(function task-control symbol)"],
[57, "(function task-control symbol)"],
[58, "(function task-control symbol)"],
[59, "(function task-control symbol)"],
[60, "(function task-control symbol)"],
[61, "(function task-control symbol)"],
[62, "(function task-control symbol)"],
[63, "(function task-control symbol)"],
[64, "(function task-control symbol)"],
[65, "(function task-control symbol)"],
[66, "(function task-control symbol)"],
[67, "(function task-control symbol)"],
[68, "(function task-control symbol)"],
[69, "(function task-control symbol)"],
[70, "(function task-control symbol)"],
[71, "(function task-control symbol)"],
[72, "(function task-control symbol)"],
[73, "(function task-control symbol)"],
[74, "(function task-control symbol)"],
[75, "(function task-control symbol)"],
[76, "(function task-control symbol)"],
[77, "(function task-control symbol)"],
[78, "(function task-control symbol)"],
[79, "(function task-control symbol)"],
[80, "(function task-control symbol)"],
[81, "(function task-control symbol)"],
[82, "(function task-control symbol)"],
[83, "(function task-control symbol)"],
[84, "(function task-control symbol)"],
[85, "(function task-control symbol)"],
[86, "(function task-control symbol)"],
[87, "(function task-control symbol)"],
[88, "(function task-control symbol)"],
[89, "(function task-control symbol)"],
[90, "(function task-control symbol)"],
[91, "(function task-control symbol)"],
[92, "(function task-control symbol)"],
[93, "(function task-control symbol)"],
[94, "(function task-control symbol)"],
[95, "(function task-control symbol)"],
[96, "(function task-control symbol)"],
[97, "(function task-control symbol)"],
[98, "(function task-control symbol)"],
[99, "(function task-control symbol)"],
[100, "(function task-control symbol)"],
[101, "(function task-control symbol)"],
[102, "(function task-control symbol)"],
[103, "(function task-control symbol)"],
[104, "(function task-control symbol)"],
[105, "(function task-control symbol)"],
[106, "(function task-control symbol)"],
[107, "(function task-control symbol)"],
[108, "(function task-control symbol)"],
[109, "(function task-control symbol)"],
[110, "(function task-control symbol)"],
[111, "(function task-control symbol)"],
[112, "(function task-control symbol)"],
[113, "(function task-control symbol)"],
[114, "(function task-control symbol)"],
[115, "(function task-control symbol)"],
[116, "(function task-control symbol)"],
[117, "(function task-control symbol)"],
[118, "(function task-control symbol)"],
[119, "(function task-control symbol)"],
[120, "(function task-control symbol)"],
[121, "(function task-control symbol)"],
[122, "(function task-control symbol)"],
[123, "(function task-control symbol)"],
[124, "(function task-control symbol)"],
[125, "(function task-control symbol)"],
[126, "(function task-control symbol)"],
[127, "(function task-control symbol)"],
[128, "(function task-control symbol)"],
[129, "(function task-control symbol)"],
[130, "(function task-control symbol)"],
[131, "(function task-control symbol)"],
[132, "(function task-control symbol)"],
[133, "(function task-control symbol)"],
[134, "(function task-control symbol)"],
[135, "(function task-control symbol)"],
[136, "(function task-control symbol)"],
[137, "(function task-control symbol)"],
[138, "(function task-control symbol)"],
[139, "(function task-control symbol)"],
[140, "(function task-control symbol)"],
[141, "(function task-control symbol)"],
[142, "(function task-control symbol)"],
[143, "(function task-control symbol)"],
[144, "(function task-control symbol)"],
[145, "(function task-control symbol)"],
[146, "(function task-control symbol)"],
[147, "(function task-control symbol)"],
[148, "(function task-control symbol)"],
[149, "(function task-control symbol)"],
[150, "(function task-control symbol)"],
[151, "(function task-control symbol)"],
[152, "(function task-control symbol)"],
[153, "(function task-control symbol)"],
[154, "(function task-control symbol)"],
[155, "(function task-control symbol)"],
[156, "(function task-control symbol)"],
[157, "(function task-control symbol)"],
[158, "(function task-control symbol)"],
[159, "(function task-control symbol)"],
[160, "(function task-control symbol)"],
[161, "(function task-control symbol)"],
[162, "(function task-control symbol)"],
[163, "(function task-control symbol)"],
[164, "(function task-control symbol)"],
[165, "(function task-control symbol)"],
[166, "(function task-control symbol)"],
[167, "(function task-control symbol)"],
[168, "(function task-control symbol)"],
[169, "(function task-control symbol)"],
[170, "(function task-control symbol)"],
[171, "(function task-control symbol)"],
[172, "(function task-control symbol)"],
[173, "(function task-control symbol)"],
[174, "(function task-control symbol)"],
[175, "(function task-control symbol)"],
[176, "(function task-control symbol)"],
[177, "(function task-control symbol)"],
[178, "(function task-control symbol)"],
[179, "(function task-control symbol)"],
[180, "(function task-control symbol)"],
[181, "(function task-control symbol)"],
[182, "(function task-control symbol)"],
[183, "(function task-control symbol)"],
[184, "(function task-control symbol)"],
[185, "(function task-control symbol)"],
[186, "(function task-control symbol)"],
[187, "(function task-control symbol)"],
[188, "(function task-control symbol)"],
[189, "(function task-control symbol)"],
[190, "(function task-control symbol)"],
[191, "(function task-control symbol)"],
[192, "(function task-control symbol)"],
[193, "(function task-control symbol)"],
[194, "(function task-control symbol)"],
[195, "(function task-control symbol)"],
[196, "(function task-control symbol)"],
[197, "(function task-control symbol)"],
[198, "(function task-control symbol)"],
[199, "(function task-control symbol)"],
[200, "(function task-control symbol)"],
[201, "(function task-control symbol)"],
[202, "(function task-control symbol)"],
[203, "(function task-control symbol)"],
[204, "(function task-control symbol)"],
[205, "(function task-control symbol)"],
[206, "(function task-control symbol)"],
[207, "(function task-control symbol)"],
[208, "(function task-control symbol)"],
[209, "(function task-control symbol)"],
[210, "(function task-control symbol)"],
[211, "(function task-control symbol)"],
[212, "(function task-control symbol)"],
[213, "(function task-control symbol)"],
[214, "(function task-control symbol)"],
[215, "(function task-control symbol)"],
[216, "(function task-control symbol)"],
[217, "(function task-control symbol)"],
[218, "(function task-control symbol)"],
[219, "(function task-control symbol)"],
[220, "(function task-control symbol)"],
[221, "(function task-control symbol)"],
[222, "(function task-control symbol)"],
[223, "(function task-control symbol)"],
[224, "(function task-control symbol)"],
[225, "(function task-control symbol)"],
[226, "(function task-control symbol)"],
[227, "(function task-control symbol)"],
[228, "(function task-control symbol)"],
[229, "(function task-control symbol)"],
[230, "(function task-control symbol)"],
[231, "(function task-control symbol)"],
[232, "(function task-control symbol)"],
[233, "(function task-control symbol)"],
[234, "(function task-control symbol)"],
[235, "(function task-control symbol)"],
[236, "(function task-control symbol)"],
[237, "(function task-control symbol)"],
[238, "(function task-control symbol)"],
[239, "(function task-control symbol)"],
[240, "(function task-control symbol)"],
[241, "(function task-control symbol)"],
[242, "(function task-control symbol)"],
[243, "(function task-control symbol)"],
[244, "(function task-control symbol)"],
[245, "(function task-control symbol)"],
[246, "(function task-control symbol)"],
[247, "(function task-control symbol)"],
[248, "(function task-control symbol)"],
[249, "(function task-control symbol)"],
[250, "(function task-control symbol)"],
[251, "(function task-control symbol)"],
[252, "(function task-control symbol)"],
[253, "(function task-control symbol)"],
[254, "(function task-control symbol)"],
[255, "(function task-control symbol)"],
[256, "(function task-control symbol)"],
[257, "(function task-control symbol)"],
[258, "(function task-control symbol)"],
[259, "(function task-control symbol)"],
[260, "(function task-control symbol)"],
[261, "(function task-control symbol)"],
[262, "(function task-control symbol)"],
[263, "(function task-control symbol)"],
[264, "(function task-control symbol)"],
[265, "(function task-control symbol)"],
[266, "(function task-control symbol)"],
[267, "(function task-control symbol)"],
[268, "(function task-control symbol)"],
[269, "(function task-control symbol)"],
[270, "(function task-control symbol)"],
[271, "(function task-control symbol)"],
[272, "(function task-control symbol)"],
[273, "(function task-control symbol)"],
[274, "(function task-control symbol)"],
[275, "(function task-control symbol)"],
[276, "(function task-control symbol)"],
[277, "(function task-control symbol)"],
[278, "(function task-control symbol)"],
[279, "(function task-control symbol)"],
[280, "(function task-control symbol)"],
[281, "(function task-control symbol)"],
[282, "(function task-control symbol)"],
[283, "(function task-control symbol)"],
[284, "(function task-control symbol)"],
[285, "(function task-control symbol)"],
[286, "(function task-control symbol)"],
[287, "(function task-control symbol)"],
[288, "(function task-control symbol)"],
[289, "(function task-control symbol)"],
[290, "(function task-control symbol)"],
[291, "(function task-control symbol)"],
[292, "(function task-control symbol)"],
[293, "(function task-control symbol)"],
[294, "(function task-control symbol)"],
[295, "(function task-control symbol)"],
[296, "(function task-control symbol)"],
[297, "(function task-control symbol)"],
[298, "(function task-control symbol)"],
[299, "(function task-control symbol)"],
[300, "(function task-control symbol)"],
[301, "(function task-control symbol)"],
[302, "(function task-control symbol)"],
[303, "(function task-control symbol)"],
[304, "(function task-control symbol)"],
[305, "(function task-control symbol)"],
[306, "(function task-control symbol)"],
[307, "(function task-control symbol)"],
[308, "(function task-control symbol)"],
[309, "(function task-control symbol)"],
[310, "(function task-control symbol)"],
[311, "(function task-control symbol)"],
[312, "(function task-control symbol)"],
[313, "(function task-control symbol)"],
[314, "(function task-control symbol)"],
[315, "(function task-control symbol)"],
[316, "(function task-control symbol)"],
[317, "(function task-control symbol)"],
[318, "(function task-control symbol)"],
[319, "(function task-control symbol)"],
[320, "(function task-control symbol)"],
[321, "(function task-control symbol)"],
[322, "(function task-control symbol)"],
[323, "(function task-control symbol)"],
[324, "(function task-control symbol)"],
[325, "(function task-control symbol)"],
[326, "(function task-control symbol)"],
[327, "(function task-control symbol)"],
[328, "(function task-control symbol)"],
[329, "(function task-control symbol)"],
[330, "(function task-control symbol)"],
[331, "(function task-control symbol)"],
[332, "(function task-control symbol)"],
[333, "(function task-control symbol)"],
[334, "(function task-control symbol)"],
[335, "(function task-control symbol)"],
[336, "(function task-control task-control symbol)"],
[337, "(function task-control task-control symbol)"],
[338, "(function task-control symbol)"],
[339, "(function task-control symbol)"],
[340, "(function task-control symbol)"],
[341, "(function task-control symbol)"],
[342, "(function task-control symbol)"],
[343, "(function task-control symbol)"],
[344, "(function task-control symbol)"],
[345, "(function task-control symbol)"],
[346, "(function task-control symbol)"],
[347, "(function task-control symbol)"],
[348, "(function task-control symbol)"],
[349, "(function task-control symbol)"],
[350, "(function task-control symbol)"],
[351, "(function task-control symbol)"],
[352, "(function task-control symbol)"],
[353, "(function task-control symbol)"],
[354, "(function task-control symbol)"],
[355, "(function task-control symbol)"],
[356, "(function task-control symbol)"],
[357, "(function task-control symbol)"],
[358, "(function task-control symbol)"],
[359, "(function task-control symbol)"],
[360, "(function task-control symbol)"],
[361, "(function task-control symbol)"],
[362, "(function task-control task-control symbol)"],
[363, "(function task-control task-control symbol)"],
[364, "(function task-control task-control symbol)"],
[365, "(function task-control task-control symbol)"],
[366, "(function task-control symbol)"],
[367, "(function task-control symbol)"],
[368, "(function task-control symbol)"],
[369, "(function task-control symbol)"],
[370, "(function task-control symbol)"],
[371, "(function task-control symbol)"],
[372, "(function task-control symbol)"],
[373, "(function task-control symbol)"],
[374, "(function task-control symbol)"],
[375, "(function task-control symbol)"],
[376, "(function task-control symbol)"],
[377, "(function task-control symbol)"],
[378, "(function task-control symbol)"],
[379, "(function task-control symbol)"],
[380, "(function task-control symbol)"],
[381, "(function task-control symbol)"],
[382, "(function task-control symbol)"],
[383, "(function task-control symbol)"],
[384, "(function task-control symbol)"],
[385, "(function task-control symbol)"],
[386, "(function task-control symbol)"],
[387, "(function task-control symbol)"],
[388, "(function task-control symbol)"],
[389, "(function task-control symbol)"],
[390, "(function task-control symbol)"],
[391, "(function task-control symbol)"],
[392, "(function task-control symbol)"],
[393, "(function task-control symbol)"],
[394, "(function task-control symbol)"],
[395, "(function task-control symbol)"],
[396, "(function task-control symbol)"],
[397, "(function task-control symbol)"],
[398, "(function task-control symbol)"],
[399, "(function task-control symbol)"],
[400, "(function task-control symbol)"],
[401, "(function task-control symbol)"],
[402, "(function task-control symbol)"],
[403, "(function task-control symbol)"],
[404, "(function task-control symbol)"],
[405, "(function task-control symbol)"],
[406, "(function task-control symbol)"],
[407, "(function task-control symbol)"],
[408, "(function task-control symbol)"],
[409, "(function task-control symbol)"],
[410, "(function task-control symbol)"],
[411, "(function task-control symbol)"],
[412, "(function task-control symbol)"],
[413, "(function task-control symbol)"],
[414, "(function task-control task-control symbol)"],
[415, "(function task-control task-control symbol)"],
[416, "(function task-control symbol)"],
[417, "(function task-control symbol)"],
[418, "(function task-control symbol)"],
[419, "(function task-control symbol)"],
[420, "(function task-control symbol)"],
[421, "(function task-control symbol)"],
[422, "(function task-control symbol)"],
[423, "(function task-control symbol)"],
[424, "(function task-control symbol)"],
[425, "(function task-control task-control symbol)"],
[426, "(function task-control task-control symbol)"],
[427, "(function task-control symbol)"],
[428, "(function task-control symbol)"],
[429, "(function task-control symbol)"],
[430, "(function task-control symbol)"],
[431, "(function task-control symbol)"],
[432, "(function task-control task-control symbol)"],
[433, "(function task-control task-control symbol)"],
[434, "(function task-control task-control symbol)"],
[435, "(function task-control symbol)"],
[436, "(function task-control task-control symbol)"],
[437, "(function task-control task-control symbol)"],
[438, "(function task-control task-control symbol)"],
[439, "(function task-control symbol)"],
[440, "(function task-control symbol)"],
[441, "(function task-control symbol)"],
[442, "(function task-control symbol)"],
[443, "(function task-control task-control symbol)"],
[444, "(function task-control task-control symbol)"],
[445, "(function task-control symbol)"],
[446, "(function task-control task-control symbol)"],
[447, "(function task-control task-control symbol)"],
[448, "(function task-control task-control symbol)"],
[449, "(function task-control symbol)"],
[450, "(function task-control symbol)"],
[451, "(function task-control symbol)"],
[452, "(function task-control symbol)"],
[453, "(function task-control task-control symbol)"],
[454, "(function task-control task-control symbol)"],
[455, "(function task-control symbol)"],
[456, "(function task-control task-control symbol)"],
[457, "(function task-control task-control symbol)"],
[458, "(function task-control task-control symbol)"],
[459, "(function task-control symbol)"],
[460, "(function task-control symbol)"],
[461, "(function task-control symbol)"],
[462, "(function task-control symbol)"],
[463, "(function task-control symbol)"],
[464, "(function task-control symbol)"],
[465, "(function task-control symbol)"],
[466, "(function task-control symbol)"],
[467, "(function task-control symbol)"],
[468, "(function task-control symbol)"],
[469, "(function task-control symbol)"],
[470, "(function task-control symbol)"],
[471, "(function task-control symbol)"],
[472, "(function task-control symbol)"],
[473, "(function task-control symbol)"],
[474, "(function task-control task-control symbol)"],
[475, "(function task-control task-control symbol)"],
[476, "(function task-control task-control symbol)"],
[477, "(function task-control task-control symbol)"],
[478, "(function task-control symbol)"],
[479, "(function task-control symbol)"],
[480, "(function task-control symbol)"],
[481, "(function task-control symbol)"],
[482, "(function task-control symbol)"],
[483, "(function task-control symbol)"],
[484, "(function task-control symbol)"],
[485, "(function task-control symbol)"],
[486, "(function task-control symbol)"],
[487, "(function task-control symbol)"],
[488, "(function task-control symbol)"],
[489, "(function task-control symbol)"],
[490, "(function task-control symbol)"],
[491, "(function task-control symbol)"],
[492, "(function task-control symbol)"],
[493, "(function task-control symbol)"],
[494, "(function task-control symbol)"],
[495, "(function task-control symbol)"],
[496, "(function task-control symbol)"]
],
"placeholder-do-not-add-below": []
}

631
decompiler/config/jak1_ntsc_black_label/label_types.jsonc
View file

@ -437,46 +437,28 @@
["L2", "pair", true]
],
"load-dgo": [
["L46", "uint64", true]
],
"load-dgo": [["L46", "uint64", true]],
"trajectory": [
["L18", "uint64", true]
],
"trajectory": [["L18", "uint64", true]],
"res": [
["L150", "uint64", true]
],
"res": [["L150", "uint64", true]],
"ripple": [
["L73", "float", true],
["L74", "uint64", true]
],
"eye-h": [
["L2", "eye-control-array", true]
],
"eye-h": [["L2", "eye-control-array", true]],
"eye": [
["L36", "eye-work", true]
],
"eye": [["L36", "eye-work", true]],
"smush-control-h": [
["L20", "float", true]
],
"smush-control-h": [["L20", "float", true]],
"entity-h": [
["L2", "actor-bank", true]
],
"entity-h": [["L2", "actor-bank", true]],
"camera-h": [
["L14", "camera-bank", true]
],
"camera-h": [["L14", "camera-bank", true]],
"actor-link-h": [
["L79", "float", true]
],
"actor-link-h": [["L79", "float", true]],
"joint-mod-h": [
["L100", "float", true],
@ -486,13 +468,9 @@
["L90", "(inline-array vector)", true, 3]
],
"process-drawable-h": [
["L18", "float", true]
],
"process-drawable-h": [["L18", "float", true]],
"effect-control-h": [
["L6", "float", true]
],
"effect-control-h": [["L6", "float", true]],
"credits": [
["L32", "(array int32)", true],
@ -500,13 +478,9 @@
["L49", "float", true]
],
"cam-update-h": [
["L2", "bfloat", true]
],
"cam-update-h": [["L2", "bfloat", true]],
"collide-func": [
["L41", "float", true]
],
"collide-func": [["L41", "float", true]],
"cylinder": [
["L27", "float", true],
@ -514,47 +488,37 @@
["L60", "float", true]
],
"debug-sphere": [
["L10", "debug-sphere-table", true]
],
"debug-sphere": [["L10", "debug-sphere-table", true]],
"entity": [
["L324", "float", true]
],
"entity": [["L324", "float", true]],
"gsound": [
["L137", "float", true],
["L138", "float", true],
["L139", "float", true],
["L140", "float", true],
["L141", "float", true],
["L142", "float", true],
["L143", "float", true],
["L144", "float", true],
["L145", "float", true],
["L146", "float", true],
["L271", "uint64", true],
["L276", "uint64", true],
["L275", "uint64", true],
["L133", "_auto_", true]
["L137", "float", true],
["L138", "float", true],
["L139", "float", true],
["L140", "float", true],
["L141", "float", true],
["L142", "float", true],
["L143", "float", true],
["L144", "float", true],
["L145", "float", true],
["L146", "float", true],
["L271", "uint64", true],
["L276", "uint64", true],
["L275", "uint64", true],
["L133", "_auto_", true]
],
"vol-h": [
["L13", "float", true]
],
"vol-h": [["L13", "float", true]],
"joint": [
["L330", "float", true],
["L329", "float", true]
],
"assert-h": [
["L4", "__assert-info-private-struct", true]
],
"assert-h": [["L4", "__assert-info-private-struct", true]],
"navigate-h": [
["L20", "float", true]
],
"navigate-h": [["L20", "float", true]],
"debug": [
["L221", "float", true],
@ -583,17 +547,11 @@
["L12", "uint64", true]
],
"entity-table": [
["L8", "(array entity-info)", true]
],
"entity-table": [["L8", "(array entity-info)", true]],
"main": [
["L230", "_lambda_", true]
],
"main": [["L230", "_lambda_", true]],
"geometry": [
["L125", "float", true]
],
"geometry": [["L125", "float", true]],
"level": [
["L452", "_auto_", true],
@ -616,19 +574,524 @@
["L255", "float", true]
],
"load-boundary": [
["L327", "(inline-array lbvtx)", true, 3]
],
"load-boundary": [["L327", "(inline-array lbvtx)", true, 3]],
"shrub-work": [
["L3", "instance-shrub-work", true]
],
"shrub-work": [["L3", "instance-shrub-work", true]],
"tie-work": [
["L1", "prototype-tie-work", true],
["L2", "instance-tie-work", true]
],
"task-control": [
["L634", "(array task-control)", true],
["L1322", "task-control", true],
["L1297", "task-control", true],
["L1103", "task-control", true],
["L1107", "task-control", true],
["L1111", "task-control", true],
["L1115", "task-control", true],
["L1119", "task-control", true],
["L1135", "task-control", true],
["L1172", "task-control", true],
["L1184", "task-control", true],
["L1196", "task-control", true],
["L1208", "task-control", true],
["L1220", "task-control", true],
["L1236", "task-control", true],
["L1249", "task-control", true],
["L1261", "task-control", true],
["L1273", "task-control", true],
["L36", "_lambda_", true],
["L37", "_lambda_", true],
["L38", "_lambda_", true],
["L39", "_lambda_", true],
["L40", "_lambda_", true],
["L41", "_lambda_", true],
["L42", "_lambda_", true],
["L43", "_lambda_", true],
["L44", "_lambda_", true],
["L45", "_lambda_", true],
["L46", "_lambda_", true],
["L47", "_lambda_", true],
["L48", "_lambda_", true],
["L49", "_lambda_", true],
["L50", "_lambda_", true],
["L51", "_lambda_", true],
["L52", "_lambda_", true],
["L53", "_lambda_", true],
["L54", "_lambda_", true],
["L55", "_lambda_", true],
["L56", "_lambda_", true],
["L57", "_lambda_", true],
["L58", "_lambda_", true],
["L59", "_lambda_", true],
["L60", "_lambda_", true],
["L61", "_lambda_", true],
["L62", "_lambda_", true],
["L63", "_lambda_", true],
["L64", "_lambda_", true],
["L65", "_lambda_", true],
["L66", "_lambda_", true],
["L67", "_lambda_", true],
["L68", "_lambda_", true],
["L69", "_lambda_", true],
["L70", "_lambda_", true],
["L71", "_lambda_", true],
["L72", "_lambda_", true],
["L73", "_lambda_", true],
["L74", "_lambda_", true],
["L75", "_lambda_", true],
["L76", "_lambda_", true],
["L77", "_lambda_", true],
["L78", "_lambda_", true],
["L79", "_lambda_", true],
["L80", "_lambda_", true],
["L81", "_lambda_", true],
["L82", "_lambda_", true],
["L83", "_lambda_", true],
["L84", "_lambda_", true],
["L85", "_lambda_", true],
["L86", "_lambda_", true],
["L87", "_lambda_", true],
["L88", "_lambda_", true],
["L89", "_lambda_", true],
["L90", "_lambda_", true],
["L91", "_lambda_", true],
["L92", "_lambda_", true],
["L93", "_lambda_", true],
["L94", "_lambda_", true],
["L95", "_lambda_", true],
["L96", "_lambda_", true],
["L97", "_lambda_", true],
["L98", "_lambda_", true],
["L99", "_lambda_", true],
["L100", "_lambda_", true],
["L101", "_lambda_", true],
["L102", "_lambda_", true],
["L103", "_lambda_", true],
["L104", "_lambda_", true],
["L105", "_lambda_", true],
["L106", "_lambda_", true],
["L107", "_lambda_", true],
["L108", "_lambda_", true],
["L109", "_lambda_", true],
["L110", "_lambda_", true],
["L111", "_lambda_", true],
["L112", "_lambda_", true],
["L113", "_lambda_", true],
["L114", "_lambda_", true],
["L115", "_lambda_", true],
["L116", "_lambda_", true],
["L117", "_lambda_", true],
["L118", "_lambda_", true],
["L119", "_lambda_", true],
["L120", "_lambda_", true],
["L121", "_lambda_", true],
["L122", "_lambda_", true],
["L123", "_lambda_", true],
["L124", "_lambda_", true],
["L125", "_lambda_", true],
["L126", "_lambda_", true],
["L127", "_lambda_", true],
["L128", "_lambda_", true],
["L129", "_lambda_", true],
["L130", "_lambda_", true],
["L131", "_lambda_", true],
["L132", "_lambda_", true],
["L133", "_lambda_", true],
["L134", "_lambda_", true],
["L135", "_lambda_", true],
["L136", "_lambda_", true],
["L137", "_lambda_", true],
["L138", "_lambda_", true],
["L139", "_lambda_", true],
["L140", "_lambda_", true],
["L141", "_lambda_", true],
["L142", "_lambda_", true],
["L143", "_lambda_", true],
["L144", "_lambda_", true],
["L145", "_lambda_", true],
["L146", "_lambda_", true],
["L147", "_lambda_", true],
["L148", "_lambda_", true],
["L149", "_lambda_", true],
["L150", "_lambda_", true],
["L151", "_lambda_", true],
["L152", "_lambda_", true],
["L153", "_lambda_", true],
["L154", "_lambda_", true],
["L155", "_lambda_", true],
["L156", "_lambda_", true],
["L157", "_lambda_", true],
["L158", "_lambda_", true],
["L159", "_lambda_", true],
["L160", "_lambda_", true],
["L161", "_lambda_", true],
["L162", "_lambda_", true],
["L163", "_lambda_", true],
["L164", "_lambda_", true],
["L165", "_lambda_", true],
["L166", "_lambda_", true],
["L167", "_lambda_", true],
["L168", "_lambda_", true],
["L169", "_lambda_", true],
["L170", "_lambda_", true],
["L171", "_lambda_", true],
["L172", "_lambda_", true],
["L173", "_lambda_", true],
["L174", "_lambda_", true],
["L175", "_lambda_", true],
["L176", "_lambda_", true],
["L177", "_lambda_", true],
["L178", "_lambda_", true],
["L179", "_lambda_", true],
["L180", "_lambda_", true],
["L181", "_lambda_", true],
["L182", "_lambda_", true],
["L183", "_lambda_", true],
["L184", "_lambda_", true],
["L185", "_lambda_", true],
["L186", "_lambda_", true],
["L187", "_lambda_", true],
["L188", "_lambda_", true],
["L189", "_lambda_", true],
["L190", "_lambda_", true],
["L191", "_lambda_", true],
["L192", "_lambda_", true],
["L193", "_lambda_", true],
["L194", "_lambda_", true],
["L195", "_lambda_", true],
["L196", "_lambda_", true],
["L197", "_lambda_", true],
["L198", "_lambda_", true],
["L199", "_lambda_", true],
["L200", "_lambda_", true],
["L201", "_lambda_", true],
["L202", "_lambda_", true],
["L203", "_lambda_", true],
["L204", "_lambda_", true],
["L205", "_lambda_", true],
["L206", "_lambda_", true],
["L207", "_lambda_", true],
["L208", "_lambda_", true],
["L209", "_lambda_", true],
["L210", "_lambda_", true],
["L211", "_lambda_", true],
["L212", "_lambda_", true],
["L213", "_lambda_", true],
["L214", "_lambda_", true],
["L215", "_lambda_", true],
["L216", "_lambda_", true],
["L217", "_lambda_", true],
["L218", "_lambda_", true],
["L219", "_lambda_", true],
["L220", "_lambda_", true],
["L221", "_lambda_", true],
["L222", "_lambda_", true],
["L223", "_lambda_", true],
["L224", "_lambda_", true],
["L225", "_lambda_", true],
["L226", "_lambda_", true],
["L227", "_lambda_", true],
["L228", "_lambda_", true],
["L229", "_lambda_", true],
["L230", "_lambda_", true],
["L231", "_lambda_", true],
["L232", "_lambda_", true],
["L233", "_lambda_", true],
["L234", "_lambda_", true],
["L235", "_lambda_", true],
["L236", "_lambda_", true],
["L237", "_lambda_", true],
["L238", "_lambda_", true],
["L239", "_lambda_", true],
["L240", "_lambda_", true],
["L241", "_lambda_", true],
["L242", "_lambda_", true],
["L243", "_lambda_", true],
["L244", "_lambda_", true],
["L245", "_lambda_", true],
["L246", "_lambda_", true],
["L247", "_lambda_", true],
["L248", "_lambda_", true],
["L249", "_lambda_", true],
["L250", "_lambda_", true],
["L251", "_lambda_", true],
["L252", "_lambda_", true],
["L253", "_lambda_", true],
["L254", "_lambda_", true],
["L256", "_lambda_", true],
["L258", "_lambda_", true],
["L260", "_lambda_", true],
["L261", "_lambda_", true],
["L262", "_lambda_", true],
["L263", "_lambda_", true],
["L264", "_lambda_", true],
["L265", "_lambda_", true],
["L266", "_lambda_", true],
["L267", "_lambda_", true],
["L268", "_lambda_", true],
["L269", "_lambda_", true],
["L270", "_lambda_", true],
["L271", "_lambda_", true],
["L272", "_lambda_", true],
["L273", "_lambda_", true],
["L274", "_lambda_", true],
["L275", "_lambda_", true],
["L276", "_lambda_", true],
["L277", "_lambda_", true],
["L278", "_lambda_", true],
["L279", "_lambda_", true],
["L280", "_lambda_", true],
["L281", "_lambda_", true],
["L282", "_lambda_", true],
["L283", "_lambda_", true],
["L284", "_lambda_", true],
["L285", "_lambda_", true],
["L286", "_lambda_", true],
["L287", "_lambda_", true],
["L288", "_lambda_", true],
["L289", "_lambda_", true],
["L290", "_lambda_", true],
["L291", "_lambda_", true],
["L292", "_lambda_", true],
["L293", "_lambda_", true],
["L294", "_lambda_", true],
["L295", "_lambda_", true],
["L296", "_lambda_", true],
["L297", "_lambda_", true],
["L298", "_lambda_", true],
["L299", "_lambda_", true],
["L300", "_lambda_", true],
["L301", "_lambda_", true],
["L302", "_lambda_", true],
["L303", "_lambda_", true],
["L304", "_lambda_", true],
["L305", "_lambda_", true],
["L306", "_lambda_", true],
["L307", "_lambda_", true],
["L308", "_lambda_", true],
["L309", "_lambda_", true],
["L310", "_lambda_", true],
["L311", "_lambda_", true],
["L312", "_lambda_", true],
["L313", "_lambda_", true],
["L314", "_lambda_", true],
["L315", "_lambda_", true],
["L316", "_lambda_", true],
["L318", "_lambda_", true],
["L319", "_lambda_", true],
["L320", "_lambda_", true],
["L321", "_lambda_", true],
["L322", "_lambda_", true],
["L323", "_lambda_", true],
["L324", "_lambda_", true],
["L325", "_lambda_", true],
["L326", "_lambda_", true],
["L327", "_lambda_", true],
["L328", "_lambda_", true],
["L329", "_lambda_", true],
["L330", "_lambda_", true],
["L331", "_lambda_", true],
["L332", "_lambda_", true],
["L333", "_lambda_", true],
["L334", "_lambda_", true],
["L335", "_lambda_", true],
["L336", "_lambda_", true],
["L337", "_lambda_", true],
["L338", "_lambda_", true],
["L339", "_lambda_", true],
["L340", "_lambda_", true],
["L341", "_lambda_", true],
["L342", "_lambda_", true],
["L343", "_lambda_", true],
["L344", "_lambda_", true],
["L345", "_lambda_", true],
["L346", "_lambda_", true],
["L347", "_lambda_", true],
["L348", "_lambda_", true],
["L349", "_lambda_", true],
["L350", "_lambda_", true],
["L351", "_lambda_", true],
["L352", "_lambda_", true],
["L353", "_lambda_", true],
["L354", "_lambda_", true],
["L355", "_lambda_", true],
["L356", "_lambda_", true],
["L357", "_lambda_", true],
["L358", "_lambda_", true],
["L359", "_lambda_", true],
["L360", "_lambda_", true],
["L361", "_lambda_", true],
["L362", "_lambda_", true],
["L363", "_lambda_", true],
["L364", "_lambda_", true],
["L365", "_lambda_", true],
["L366", "_lambda_", true],
["L367", "_lambda_", true],
["L369", "_lambda_", true],
["L371", "_lambda_", true],
["L372", "_lambda_", true],
["L373", "_lambda_", true],
["L374", "_lambda_", true],
["L375", "_lambda_", true],
["L376", "_lambda_", true],
["L377", "_lambda_", true],
["L378", "_lambda_", true],
["L379", "_lambda_", true],
["L380", "_lambda_", true],
["L381", "_lambda_", true],
["L382", "_lambda_", true],
["L383", "_lambda_", true],
["L384", "_lambda_", true],
["L385", "_lambda_", true],
["L386", "_lambda_", true],
["L387", "_lambda_", true],
["L388", "_lambda_", true],
["L389", "_lambda_", true],
["L390", "_lambda_", true],
["L391", "_lambda_", true],
["L392", "_lambda_", true],
["L393", "_lambda_", true],
["L394", "_lambda_", true],
["L395", "_lambda_", true],
["L397", "_lambda_", true],
["L399", "_lambda_", true],
["L401", "_lambda_", true],
["L403", "_lambda_", true],
["L405", "_lambda_", true],
["L407", "_lambda_", true],
["L409", "_lambda_", true],
["L411", "_lambda_", true],
["L412", "_lambda_", true],
["L413", "_lambda_", true],
["L414", "_lambda_", true],
["L415", "_lambda_", true],
["L416", "_lambda_", true],
["L417", "_lambda_", true],
["L418", "_lambda_", true],
["L419", "_lambda_", true],
["L420", "_lambda_", true],
["L421", "_lambda_", true],
["L423", "_lambda_", true],
["L424", "_lambda_", true],
["L425", "_lambda_", true],
["L427", "_lambda_", true],
["L428", "_lambda_", true],
["L429", "_lambda_", true],
["L430", "_lambda_", true],
["L431", "_lambda_", true],
["L432", "_lambda_", true],
["L433", "_lambda_", true],
["L435", "_lambda_", true],
["L436", "_lambda_", true],
["L437", "_lambda_", true],
["L439", "_lambda_", true],
["L440", "_lambda_", true],
["L441", "_lambda_", true],
["L442", "_lambda_", true],
["L443", "_lambda_", true],
["L444", "_lambda_", true],
["L445", "_lambda_", true],
["L447", "_lambda_", true],
["L448", "_lambda_", true],
["L449", "_lambda_", true],
["L451", "_lambda_", true],
["L452", "_lambda_", true],
["L453", "_lambda_", true],
["L454", "_lambda_", true],
["L455", "_lambda_", true],
["L456", "_lambda_", true],
["L457", "_lambda_", true],
["L458", "_lambda_", true],
["L459", "_lambda_", true],
["L460", "_lambda_", true],
["L461", "_lambda_", true],
["L463", "_lambda_", true],
["L465", "_lambda_", true],
["L466", "_lambda_", true],
["L467", "_lambda_", true],
["L468", "_lambda_", true],
["L469", "_lambda_", true],
["L470", "_lambda_", true],
["L471", "_lambda_", true],
["L472", "_lambda_", true],
["L473", "_lambda_", true],
["L474", "_lambda_", true],
["L476", "_lambda_", true],
["L478", "_lambda_", true],
["L479", "_lambda_", true],
["L480", "_lambda_", true],
["L481", "_lambda_", true],
["L482", "_lambda_", true],
["L483", "_lambda_", true],
["L484", "_lambda_", true],
["L485", "_lambda_", true],
["L486", "_lambda_", true],
["L488", "_lambda_", true],
["L489", "_lambda_", true],
["L490", "_lambda_", true],
["L491", "_lambda_", true],
["L492", "_lambda_", true],
["L493", "_lambda_", true],
["L494", "_lambda_", true],
["L495", "_lambda_", true],
["L496", "_lambda_", true],
["L497", "_lambda_", true],
["L499", "_lambda_", true],
["L500", "_lambda_", true],
["L501", "_lambda_", true],
["L502", "_lambda_", true],
["L503", "_lambda_", true],
["L504", "_lambda_", true],
["L505", "_lambda_", true],
["L506", "_lambda_", true],
["L507", "_lambda_", true],
["L508", "_lambda_", true],
["L510", "_lambda_", true],
["L511", "_lambda_", true],
["L512", "_lambda_", true],
["L513", "_lambda_", true],
["L514", "_lambda_", true],
["L515", "_lambda_", true],
["L516", "_lambda_", true],
["L517", "_lambda_", true],
["L518", "_lambda_", true],
["L519", "_lambda_", true],
["L520", "_lambda_", true],
["L521", "_lambda_", true],
["L522", "_lambda_", true],
["L523", "_lambda_", true],
["L524", "_lambda_", true],
["L525", "_lambda_", true],
["L526", "_lambda_", true],
["L527", "_lambda_", true],
["L528", "_lambda_", true],
["L532", "_lambda_", true],
["L536", "_lambda_", true],
["L538", "_lambda_", true],
["L540", "_lambda_", true],
["L541", "_lambda_", true],
["L542", "_lambda_", true],
["L543", "_lambda_", true],
["L544", "_lambda_", true],
["L545", "_lambda_", true],
["L546", "_lambda_", true],
["L547", "_lambda_", true],
["L548", "_lambda_", true],
["L549", "_lambda_", true],
["L550", "_lambda_", true],
["L551", "_lambda_", true],
["L552", "_lambda_", true],
["L553", "_lambda_", true],
["L554", "_lambda_", true],
["L555", "_lambda_", true],
["L557", "_lambda_", true],
["L559", "_lambda_", true],
["L560", "_lambda_", true]
],
// please do not add things after this entry! git is dumb.
"object-file-that-doesnt-actually-exist-and-i-just-put-this-here-to-prevent-merge-conflicts-with-this-file":[]
"object-file-that-doesnt-actually-exist-and-i-just-put-this-here-to-prevent-merge-conflicts-with-this-file": []
}

140
decompiler/config/jak1_ntsc_black_label/stack_structures.jsonc
View file

@ -200,28 +200,22 @@
[80, "matrix"]
],
"(method 14 trsqv)": [
[16, "vector"]
],
"(method 14 trsqv)": [[16, "vector"]],
"(method 13 trsqv)": [
[16, "vector"]
],
"(method 13 trsqv)": [[16, "vector"]],
"(method 12 trsqv)": [
[16, "vector"],
[32, "vector"]
],
"(method 11 trsqv)": [
[16, "vector"]
],
"(method 11 trsqv)": [[16, "vector"]],
"(method 10 trsqv)": [
[16, "vector"],
[32, "vector"]
],
"make-light-kit": [[16, "matrix"]],
"(method 23 trsqv)": [[16, "vector"]],
@ -237,27 +231,21 @@
[208, "vector4s-3"]
],
"string->sound-name": [
[16, "qword"]
],
"string->sound-name": [[16, "qword"]],
"(method 15 trajectory)": [
[16, "vector"],
[32, "vector"]
],
"ripple-add-debug-sphere": [
[16, "vector"]
],
"ripple-add-debug-sphere": [[16, "vector"]],
"camera-teleport-to-entity": [
[16, "transformq"],
[64, "event-message-block"]
],
"(method 10 cam-vector-seeker)": [
[16, "vector"]
],
"(method 10 cam-vector-seeker)": [[16, "vector"]],
"joint-mod-look-at-handler": [
[16, "vector"],
@ -289,17 +277,11 @@
[48, "vector"]
],
"draw-end-credits": [
[16, "font-context"]
],
"draw-end-credits": [[16, "font-context"]],
"draw-title-credits": [
[16, "font-context"]
],
"draw-title-credits": [[16, "font-context"]],
"moving-sphere-sphere-intersect": [
[16, "vector"]
],
"moving-sphere-sphere-intersect": [[16, "vector"]],
"moving-sphere-moving-sphere-intersect": [
[16, "vector"],
@ -352,31 +334,60 @@
[64, "vector"]
],
"(method 23 actor-link-info)": [
[16, "event-message-block"]
],
"(method 23 actor-link-info)": [[16, "event-message-block"]],
"(method 24 actor-link-info)": [
[16, "event-message-block"]
"(method 24 actor-link-info)": [[16, "event-message-block"]],
"internal-draw-debug-line": [
[16, "vector4w-2"],
[48, "vector4w-2"]
],
"internal-draw-debug-text-3d": [
[16, "vector4w"],
[32, "font-context"]
],
"add-debug-triangle-normal": [
[16, "vector"],
[32, "vector"]
],
"add-debug-flat-triangle": [
[16, "vector4w-3"],
[64, "vector4w-3"]
],
"internal-draw-debug-line": [[16, "vector4w-2"], [48, "vector4w-2"]],
"internal-draw-debug-text-3d": [[16, "vector4w"], [32, "font-context"]],
"add-debug-triangle-normal": [[16, "vector"], [32, "vector"]],
"add-debug-flat-triangle": [[16, "vector4w-3"], [64, "vector4w-3"]],
"add-debug-point": [[16, "vector4w-2"]],
"add-debug-line2d": [[16, "vector4w"], [32, "vector4w"]],
"add-debug-box": [[16, "vector"], [32, "vector"]],
"add-debug-x": [[16, "vector"], [32, "vector"]],
"add-debug-line2d": [
[16, "vector4w"],
[32, "vector4w"]
],
"add-debug-box": [
[16, "vector"],
[32, "vector"]
],
"add-debug-x": [
[16, "vector"],
[32, "vector"]
],
"add-debug-sphere-with-transform": [[16, "vector"]],
"add-debug-circle": [[16, "vector"], [32, "vector"]],
"add-debug-circle": [
[16, "vector"],
[32, "vector"]
],
"add-debug-vector": [[16, "vector"]],
"add-debug-yrot-vector": [[16, "vector"]],
"add-debug-arc": [[16, "vector"], [32, "vector"]],
"add-debug-curve": [[16, "vector"], [32, "vector"]],
"add-debug-arc": [
[16, "vector"],
[32, "vector"]
],
"add-debug-curve": [
[16, "vector"],
[32, "vector"]
],
"add-debug-points": [[16, "vector"]],
"add-debug-light": [[16, "vector"]],
"dma-timeout-cam": [[16, "vector"], [32, "matrix"]],
"dma-timeout-cam": [
[16, "vector"],
[32, "matrix"]
],
"(method 18 tracking-spline)": [
[16, "tracking-spline-sampler"],
@ -392,5 +403,42 @@
"(method 10 load-state)": [[16, "event-message-block"]],
"draw-joint-spheres": [[16, "vector"]],
"(method 16 process-drawable)": [[16, "matrix"], [80, "matrix"], [144, "vector"], [160, "vector"]]
"(method 16 process-drawable)": [[16, "matrix"], [80, "matrix"], [144, "vector"], [160, "vector"]],
"draw-ocean-transition": [[16, "sphere"]],
"(anon-function 494 task-control)": [[16, "event-message-block"]],
"(anon-function 493 task-control)": [[16, "event-message-block"]],
"(anon-function 480 task-control)": [[16, "event-message-block"]],
"(anon-function 477 task-control)": [[16, "event-message-block"]],
"(anon-function 476 task-control)": [[16, "event-message-block"]],
"(anon-function 475 task-control)": [[16, "event-message-block"]],
"(anon-function 474 task-control)": [[16, "event-message-block"]],
"(anon-function 455 task-control)": [[16, "event-message-block"]],
"(anon-function 445 task-control)": [[16, "event-message-block"]],
"(anon-function 435 task-control)": [[16, "event-message-block"]],
"(anon-function 426 task-control)": [[16, "event-message-block"]],
"(anon-function 425 task-control)": [[16, "event-message-block"]],
"(anon-function 415 task-control)": [[16, "event-message-block"]],
"(anon-function 414 task-control)": [[16, "event-message-block"]],
"(anon-function 403 task-control)": [[16, "event-message-block"]],
"(anon-function 400 task-control)": [[16, "event-message-block"]],
"(anon-function 393 task-control)": [[16, "event-message-block"]],
"(anon-function 390 task-control)": [[16, "event-message-block"]],
"(anon-function 383 task-control)": [[16, "event-message-block"]],
"(anon-function 380 task-control)": [[16, "event-message-block"]],
"(anon-function 369 task-control)": [[16, "event-message-block"]],
"(anon-function 368 task-control)": [[16, "event-message-block"]],
"(anon-function 367 task-control)": [[16, "event-message-block"]],
"(anon-function 366 task-control)": [[16, "event-message-block"]],
"(anon-function 365 task-control)": [[16, "event-message-block"]],
"(anon-function 364 task-control)": [[16, "event-message-block"]],
"(anon-function 363 task-control)": [[16, "event-message-block"]],
"(anon-function 362 task-control)": [[16, "event-message-block"]],
"(anon-function 337 task-control)": [[16, "event-message-block"]],
"(anon-function 336 task-control)": [[16, "event-message-block"]],
"(anon-function 286 task-control)": [[16, "event-message-block"]],
"(anon-function 227 task-control)": [[16, "event-message-block"]],
"(anon-function 38 task-control)": [[16, "event-message-block"]],
"(anon-function 28 task-control)": [[16, "event-message-block"]]
}

113
decompiler/config/jak1_ntsc_black_label/type_casts.jsonc
View file

@ -685,25 +685,16 @@
[[1, 5], "v1", "collide-fragment"]
],
"(method 11 drawable-inline-array-collide-fragment)": [
[[1, 5], "v1", "collide-fragment"]
],
"main-cheats": [
[1221, "t9", "(function cpu-thread function none)"]
],
"on": [
[33, "t9", "(function cpu-thread function none)"]
],
"bg": [
[37, "a0", "symbol"]
],
"start": [
[27, "t9", "(function process function symbol object)"]
],
"main-cheats": [[1221, "t9", "(function cpu-thread function none)"]],
"on": [[33, "t9", "(function cpu-thread function none)"]],
"bg": [[37, "a0", "symbol"]],
"start": [[27, "t9", "(function process function symbol object)"]],
"level-update-after-load": [
[[29, 55], "s2", "drawable-tree"],
@ -711,9 +702,7 @@
[[150, 151], "s1", "drawable-tree-instance-tie"]
],
"(method 11 setting-control)": [
[[3, 25], "s4", "connection"]
],
"(method 11 setting-control)": [[[3, 25], "s4", "connection"]],
"(method 9 setting-data)": [
[[4, 345], "s3", "connection"],
@ -772,18 +761,19 @@
[[334, 337], "a0", "int"],
[[341, 344], "a0", "uint"]
],
"(method 12 level)": [
[151, "a0", "symbol"]
],
"(method 12 level)": [[151, "a0", "symbol"]],
"(method 26 level-group)": [[[65, 96], "v0", "level"]],
"update-sound-banks": [[[21, 52], "t0", "symbol"]],
"(method 16 level-group)": [
[[122, 146], "s1", "continue-point"],
[[115, 154], "s3", "continue-point"]
],
"(method 20 level)": [
[[43, 45], "s3", "ramdisk-rpc-fill"]
"(method 20 level)": [[[43, 45], "s3", "ramdisk-rpc-fill"]],
//"bg": [[[25, 52], "a0", "string"]],
"(anon-function 29 process-drawable)": [
[[0, 99999], "s6", "process-drawable"]
],
//"bg": [[[25, 52], "a0", "string"]],
@ -820,5 +810,80 @@
[[157, 162], "a1", "dma-packet"]
],
"(top-level-login task-control)" :[
[165, "v1", "symbol"]
],
"(anon-function 494 task-control)": [[32, "v0", "float"]],
"(anon-function 493 task-control)": [[32, "v0", "float"]],
"(anon-function 480 task-control)": [[13, "v0", "float"]],
"(anon-function 477 task-control)": [[38, "v0", "float"]],
"(anon-function 476 task-control)": [[38, "v0", "float"]],
"(anon-function 475 task-control)": [
[37, "v0", "float"],
[81, "v0", "float"]
],
"(anon-function 474 task-control)": [
[37, "v0", "float"],
[81, "v0", "float"]
],
"(anon-function 426 task-control)": [[32, "v0", "float"]],
"(anon-function 425 task-control)": [[32, "v0", "float"]],
"(anon-function 415 task-control)": [[32, "v0", "float"]],
"(anon-function 414 task-control)": [[32, "v0", "float"]],
"(anon-function 365 task-control)": [[32, "v0", "float"]],
"(anon-function 364 task-control)": [[32, "v0", "float"]],
"(anon-function 363 task-control)": [[32, "v0", "float"]],
"(anon-function 362 task-control)": [[32, "v0", "float"]],
"(anon-function 337 task-control)": [[32, "v0", "float"]],
"(anon-function 336 task-control)": [[32, "v0", "float"]],
"(anon-function 227 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 286 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 366 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 367 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 368 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 369 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 380 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 383 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 390 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 393 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 400 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 403 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 435 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 445 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 455 task-control)": [
[[14, 16], "t9", "(function process event-message-block float)"]
],
"(anon-function 38 task-control)": [[13, "v0", "float"]],
"(anon-function 28 task-control)": [[13, "v0", "float"]],
"placeholder-do-not-add-below": []
}

3
goal_src/engine/entity/entity-h.gc
View file

@ -19,6 +19,7 @@
:type uint16
(bit-1 1)
(dead 2)
(unknown 5) ;; TODO - task-control::task-cstage::14
(complete 6))
;; definition of type entity-perm
@ -71,7 +72,7 @@
;; definition of type entity-perm-array
(deftype entity-perm-array (inline-array-class)
()
((data entity-perm :inline :dynamic :offset-assert 16))
:method-count-assert 9
:size-assert #x10
:flag-assert #x900000010

3
goal_src/engine/game/game-info-h.gc
View file

@ -99,6 +99,7 @@
)
)
(declare-type entity-perm structure)
(declare-type entity-perm-array basic)
(deftype game-info (basic)
((mode symbol :offset-assert 4)
@ -155,7 +156,7 @@
(dummy-10 () none 10)
(dummy-11 () none 11)
(dummy-12 () none 12)
(dummy-13 () none 13)
(dummy-13 (_type_ uint) entity-perm 13) ; TODO - not totally confirmed
(dummy-14 (_type_) none 14)
(dummy-15 (_type_) none 15)
(dummy-16 () none 16)

2
goal_src/engine/game/game-info.gc
View file

@ -5,3 +5,5 @@
;; name in dgo: game-info
;; dgos: GAME, ENGINE
;; TODO - for task-control
(define-extern game-task->string (function int string))

180
goal_src/engine/game/task/task-control-h.gc
View file

@ -5,46 +5,182 @@
;; name in dgo: task-control-h
;; dgos: GAME, ENGINE
;; custom enums
(defenum task-status
:type uint64
(invalid 0)
(unknown 1)
(need-hint 2)
(need-introduction 3)
(need-reminder-a 4)
(need-reminder 5)
(need-reward-speech 6)
(need-resolution 7)
(*unknown* 999999)
)
(defenum game-task
:type uint8
(none 0)
(complete 1)
(jungle-eggtop 2)
(jungle-lurkerm 3)
(jungle-tower 4)
(jungle-fishgame 5)
(jungle-plant 6)
(jungle-buzzer 7)
(jungle-canyon-end 8)
(jungle-temple-door 9)
(village1-yakow 10)
(village1-mayor-money 11)
(village1-uncle-money 12)
(village1-oracle-money1 13)
(village1-oracle-money2 14)
(beach-ecorocks 15)
(beach-pelican 16)
(beach-flutflut 17)
(beach-seagull 18)
(beach-cannon 19)
(beach-buzzer 20)
(beach-gimmie 21)
(beach-sentinel 22)
(misty-muse 23)
(misty-boat 24)
(misty-warehouse 25)
(misty-cannon 26)
(misty-bike 27)
(misty-buzzer 28)
(misty-bike-jump 29)
(misty-eco-challenge 30)
(village2-gambler-money 31)
(village2-geologist-money 32)
(village2-warrior-money 33)
(village2-oracle-money1 34)
(village2-oracle-money2 35)
(swamp-billy 36)
(swamp-flutflut 37)
(swamp-battle 38)
(swamp-tether-1 39)
(swamp-tether-2 40)
(swamp-tether-3 41)
(swamp-tether-4 42)
(swamp-buzzer 43)
(sunken-platforms 44)
(sunken-pipe 45)
(sunken-slide 46)
(sunken-room 47)
(sunken-sharks 48)
(sunken-buzzer 49)
(sunken-top-of-helix 50)
(sunken-spinning-room 51)
(rolling-race 52)
(rolling-robbers 53)
(rolling-moles 54)
(rolling-plants 55)
(rolling-lake 56)
(rolling-buzzer 57)
(rolling-ring-chase-1 58)
(rolling-ring-chase-2 59)
(snow-eggtop 60)
(snow-ram 61)
(snow-fort 62)
(snow-ball 63)
(snow-bunnies 64)
(snow-buzzer 65)
(snow-bumpers 66)
(snow-cage 67)
(firecanyon-buzzer 68)
(firecanyon-end 69)
(citadel-sage-green 70)
(citadel-sage-blue 71)
(citadel-sage-red 72)
(citadel-sage-yellow 73)
(village3-extra1 74)
(village1-buzzer 75)
(village2-buzzer 76)
(village3-buzzer 77)
(cave-gnawers 78)
(cave-dark-crystals 79)
(cave-dark-climb 80)
(cave-robot-climb 81)
(cave-swing-poles 82)
(cave-spider-tunnel 83)
(cave-platforms 84)
(cave-buzzer 85)
(ogre-boss 86)
(ogre-end 87)
(ogre-buzzer 88)
(lavatube-end 89)
(lavatube-buzzer 90)
(citadel-buzzer 91)
(training-gimmie 92)
(training-door 93)
(training-climb 94)
(training-buzzer 95)
(village3-miner-money1 96)
(village3-miner-money2 97)
(village3-miner-money3 98)
(village3-miner-money4 99)
(village3-oracle-money1 100)
(village3-oracle-money2 101)
(firecanyon-assistant 102)
(village2-levitator 103)
(swamp-arm 104)
(village3-button 105)
(red-eggtop 106)
(lavatube-balls 107)
(lavatube-start 108)
(intro 109)
(ogre-secret 110)
(village4-button 111)
(finalboss-movies 112)
(plunger-lurker-hit 113)
(leaving-misty 114)
(assistant-village3 115)
(max 116)
(*unknown* 255))
;; definition of type task-cstage
(declare-type task-control basic)
(deftype task-cstage (structure)
((game-task uint8 :offset-assert 0)
(status uint64 :offset-assert 8)
((game-task game-task :offset-assert 0)
(status task-status :offset-assert 8)
(flags uint8 :offset-assert 16)
(condition basic :offset-assert 20)
(condition (function task-control symbol) :offset-assert 20)
)
:method-count-assert 16
:size-assert #x18
:flag-assert #x1000000018
(:methods
(dummy-9 () none 9)
(dummy-10 () none 10)
(dummy-11 () none 11)
(dummy-12 () none 12)
(dummy-13 () none 13)
(dummy-14 () none 14)
(dummy-15 () none 15)
(get-game-task (_type_) uint 9)
(get-task-status (_type_) uint 10)
(TODO-RENAME-11 (_type_ task-control) symbol 11)
(first-flag-bit? (_type_) symbol 12)
(third-flag-bit? (_type_) symbol 13)
(TODO-RENAME-14 (_type_) int 14)
(clear-all-but-first-flag-bit (_type_) int 15)
)
)
;; definition of type task-control
(deftype task-control (basic)
((current-stage int16 :offset-assert 4)
(stage basic :offset-assert 8)
(stage (array task-cstage) :offset-assert 8)
)
:method-count-assert 19
:size-assert #xc
:flag-assert #x130000000c
(:methods
(dummy-9 () none 9)
(dummy-10 () none 10)
(dummy-11 () none 11)
(dummy-12 () none 12)
(dummy-13 () none 13)
(dummy-14 () none 14)
(dummy-15 () none 15)
(dummy-16 () none 16)
(dummy-17 () none 17)
(dummy-18 () none 18)
(current-task (_type_) int 9)
(current-status (_type_) int 10)
(close-current! (_type_) none 11)
(close-status! (_type_ int) int 12)
(first-any (_type_ symbol) int 13)
(reset! (_type_ symbol symbol) int 14)
(closed? (_type_ int int) symbol 15)
(get-reminder (_type_ int) int 16)
(save-reminder (_type_ int int) int 17) ;; TODO - i believe this is none
(exists? (_type_ int int) symbol 18)
)
)
@ -132,3 +268,5 @@
(dummy-52 () none 52)
)
)
(define-extern task-closed? (function int int symbol))

5188
goal_src/engine/game/task/task-control.gc
View file

File diff suppressed because it is too large Load diff

5
test/decompiler/reference/engine/entity/entity-h_REF.gc
View file

@ -98,7 +98,8 @@
;; definition of type entity-perm-array
(deftype entity-perm-array (inline-array-class)
()
((data entity-perm :inline :dynamic :offset-assert 16)
)
:method-count-assert 9
:size-assert #x10
:flag-assert #x900000010
@ -109,7 +110,7 @@
(format #t "[~8x] ~A~%" obj (-> obj type))
(format #t "~Tlength: ~D~%" (-> obj length))
(format #t "~Tallocated-length: ~D~%" (-> obj allocated-length))
(format #t "~Tdata[0] @ #x~X~%" (-> obj _data))
(format #t "~Tdata[0] @ #x~X~%" (-> obj data))
obj
)

2
test/decompiler/reference/engine/game/game-info-h_REF.gc
View file

@ -214,7 +214,7 @@
(dummy-10 () none 10)
(dummy-11 () none 11)
(dummy-12 () none 12)
(dummy-13 () none 13)
(dummy-13 (_type_ uint) entity-perm 13)
(dummy-14 (_type_) none 14)
(dummy-15 (_type_) none 15)
(dummy-16 () none 16)

46
test/decompiler/reference/engine/game/task/task-control-h_REF.gc
View file

@ -3,22 +3,22 @@
;; definition of type task-cstage
(deftype task-cstage (structure)
((game-task uint8 :offset-assert 0)
(status uint64 :offset-assert 8)
(flags uint8 :offset-assert 16)
(condition basic :offset-assert 20)
((game-task game-task :offset-assert 0)
(status task-status :offset-assert 8)
(flags uint8 :offset-assert 16)
(condition (function task-control symbol) :offset-assert 20)
)
:method-count-assert 16
:size-assert #x18
:flag-assert #x1000000018
(:methods
(dummy-9 () none 9)
(dummy-10 () none 10)
(dummy-11 () none 11)
(dummy-12 () none 12)
(dummy-13 () none 13)
(dummy-14 () none 14)
(dummy-15 () none 15)
(get-game-task (_type_) uint 9)
(get-task-status (_type_) uint 10)
(TODO-RENAME-11 (_type_ task-control) symbol 11)
(first-flag-bit? (_type_) symbol 12)
(third-flag-bit? (_type_) symbol 13)
(TODO-RENAME-14 (_type_) int 14)
(clear-all-but-first-flag-bit (_type_) int 15)
)
)
@ -34,23 +34,23 @@
;; definition of type task-control
(deftype task-control (basic)
((current-stage int16 :offset-assert 4)
(stage basic :offset-assert 8)
((current-stage int16 :offset-assert 4)
(stage (array task-cstage) :offset-assert 8)
)
:method-count-assert 19
:size-assert #xc
:flag-assert #x130000000c
(:methods
(dummy-9 () none 9)
(dummy-10 () none 10)
(dummy-11 () none 11)
(dummy-12 () none 12)
(dummy-13 () none 13)
(dummy-14 () none 14)
(dummy-15 () none 15)
(dummy-16 () none 16)
(dummy-17 () none 17)
(dummy-18 () none 18)
(current-task (_type_) int 9)
(current-status (_type_) int 10)
(close-current! (_type_) none 11)
(close-status! (_type_ int) int 12)
(first-any (_type_ symbol) int 13)
(reset! (_type_ symbol symbol) int 14)
(closed? (_type_ int int) symbol 15)
(get-reminder (_type_ int) int 16)
(save-reminder (_type_ int int) int 17)
(exists? (_type_ int int) symbol 18)
)
)

5194
test/decompiler/reference/engine/game/task/task-control_REF.gc Normal file
View file

File diff suppressed because it is too large Load diff

3
test/offline/offline_test_main.cpp
View file

@ -353,7 +353,8 @@ TEST_F(OfflineDecompilation, FunctionDetect) {
EXPECT_EQ(config->allowed_objects.size(), login_count);
// not many lambdas.
EXPECT_TRUE(unknown_count < 10);
// TODO - disabling this test, some files do have many lambdas! Gotta figure out a better way to
// do this EXPECT_TRUE(unknown_count < 10);
}
TEST_F(OfflineDecompilation, AsmFunction) {