Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jak1: clean up all dummy methods #2457

Merged
merged 12 commits into from Apr 5, 2023

Conversation

Hat-Kid
Copy link
Member

@Hat-Kid Hat-Kid commented Apr 5, 2023

Cleans up every dummy-* and TODO-RENAME-* method up with either proper names or by renaming them to [type-name]-method-[method-id] similar to Jak 2's all-types.

Also fixes the bad format string in collide-cache and adds the event handler hack to Jak 1.

The game boots and runs fine, but I might have missed a PAL patch or other manual patches here and there, please double-check if possible.

goal_src/jak1/engine/game/game-save.gc Outdated Show resolved Hide resolved
goal_src/jak1/levels/citadel/citadel-obs.gc Outdated Show resolved Hide resolved
goal_src/jak1/levels/jungle/fisher.gc Outdated Show resolved Hide resolved
goal_src/jak1/levels/maincave/baby-spider.gc Outdated Show resolved Hide resolved
goal_src/jak1/levels/title/title-obs.gc Outdated Show resolved Hide resolved
goal_src/jak1/levels/title/title-obs.gc Outdated Show resolved Hide resolved
goal_src/jak1/levels/title/title-obs.gc Outdated Show resolved Hide resolved
goal_src/jak1/levels/title/title-obs.gc Outdated Show resolved Hide resolved
goal_src/jak1/levels/title/title-obs.gc Outdated Show resolved Hide resolved
goal_src/jak1/levels/village1/yakow.gc Outdated Show resolved Hide resolved
Copy link
Collaborator

@water111 water111 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing the cleanup! I just found one missing thing, but I'll grab it in a separate PR.



; (defmethod find-edge-grabs! target ((obj target) (arg0 collide-cache))
; (format *stdcon* "no edge grabs for you!~%")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow, I guess this has been here for a while...

)
(else
(new 'static 'rgba :r #xff :g #x80 :a #x40)
)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cool to see that this works now

@@ -451,13 +451,13 @@
(+! (-> obj sim-time-remaining)
(* 0.0033333334 (the float (- (-> *display* base-frame-counter) (-> *display* old-base-frame-counter))))
)
(let ((f30-0 (* DISPLAY_FPS_RATIO 0.016666668)) ;; changed for high fps
(let ((f30-0 0.016666668)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing patch

)
(+! (-> obj to-vu0-waits) arg0)
(+! (-> obj to-spr-waits) arg1)
(+! (-> obj from-spr-waits) arg2)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow, this must be ancient if +! wasn't recognized!

@water111 water111 merged commit f4085a4 into open-goal:master Apr 5, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants