mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-20 14:24:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get started on collide-func and clean up log forms in decompiler (#713)

Browse Source 
* wip

* temp

* temp2

* first part of log macros

* more log macros

* logtest

* clean up

* dont initialize game info because we are missing stuff
This commit is contained in:
water111
2021-07-23 20:51:26 -04:00
committed by GitHub
parent 65b61d05e6
commit 95366d21df
73 changed files with 1900 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/engine/debug/menu_REF.gc
+19 -42
View File
@@ -1570,10 +1570,7 @@
(debug-menu-context-release-joypad a0-1)
)
(set! (-> arg0 grabbed-joypad-p) #f)
(when
(nonzero?
(logand (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons circle))
)
(when (logtest? (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons circle))
(cond
((-> arg0 float-p)
(if (-> arg0 factivate-func)
@@ -1612,39 +1609,27 @@
)
)
((or
(nonzero?
(logand (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons right))
)
(nonzero?
(logand (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons left))
)
(nonzero?
(logand (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons down))
)
(logtest? (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons right))
(logtest? (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons left))
(logtest? (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons down))
(nonzero? (logand (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons up)))
)
(let ((v1-39 (cond
((nonzero?
(logand
(-> *cpad-list* cpads 0 button0-abs 0)
(pad-buttons right)
)
((logtest?
(-> *cpad-list* cpads 0 button0-abs 0)
(pad-buttons right)
)
10
)
((nonzero?
(logand
(-> *cpad-list* cpads 0 button0-abs 0)
(pad-buttons up)
)
((logtest?
(-> *cpad-list* cpads 0 button0-abs 0)
(pad-buttons up)
)
1
)
((nonzero?
(logand
(-> *cpad-list* cpads 0 button0-abs 0)
(pad-buttons down)
)
((logtest?
(-> *cpad-list* cpads 0 button0-abs 0)
(pad-buttons down)
)
-1
)
@@ -1953,9 +1938,7 @@
;; definition for function debug-menus-default-joypad-func
(defun debug-menus-default-joypad-func ((arg0 debug-menu-context))
(cond
((nonzero?
(logand (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons square))
)
((logtest? (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons square))
(cond
((< 1 (-> arg0 sel-length))
(debug-menu-context-close-submenu arg0)
@@ -1964,25 +1947,19 @@
)
)
)
((nonzero? (logand (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons x)))
((logtest? (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons x))
(debug-menu-context-activate-selection arg0)
)
((nonzero? (logand (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons up)))
((logtest? (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons up))
(debug-menu-context-select-new-item arg0 -1)
)
((nonzero?
(logand (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons down))
)
((logtest? (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons down))
(debug-menu-context-select-new-item arg0 1)
)
((nonzero?
(logand (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons left))
)
((logtest? (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons left))
(debug-menu-context-select-new-item arg0 -5)
)
((nonzero?
(logand (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons right))
)
((logtest? (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons right))
(debug-menu-context-select-new-item arg0 5)
)
)