From 11baa6b83f3434ea1f6ea937484c48224dbbbf00 Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Sat, 16 Jul 2022 06:00:19 +0100 Subject: [PATCH] fix misc options being swapped (#1658) * fix misc options being swapped * fixed bad msaa option with no framerate menu * update settings version to clear any bad settings --- goal_src/jak1/pc/pckernel-h.gc | 4 ++-- goal_src/jak1/pc/progress-pc.gc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/goal_src/jak1/pc/pckernel-h.gc b/goal_src/jak1/pc/pckernel-h.gc index fa1d970416..fa9fb491e6 100644 --- a/goal_src/jak1/pc/pckernel-h.gc +++ b/goal_src/jak1/pc/pckernel-h.gc @@ -29,9 +29,9 @@ (defglobalconstant PC_KERNEL_VERSION_BUILD #x0001) -(defglobalconstant PC_KERNEL_VERSION_REVISION #x0008) +(defglobalconstant PC_KERNEL_VERSION_REVISION #x0001) -(defglobalconstant PC_KERNEL_VERSION_MINOR #x0006) +(defglobalconstant PC_KERNEL_VERSION_MINOR #x0007) (defglobalconstant PC_KERNEL_VERSION_MAJOR #x0001) (defglobalconstant PC_KERNEL_VERSION (logior (ash PC_KERNEL_VERSION_MAJOR 48) diff --git a/goal_src/jak1/pc/progress-pc.gc b/goal_src/jak1/pc/progress-pc.gc index 487dcea44d..7942473991 100644 --- a/goal_src/jak1/pc/progress-pc.gc +++ b/goal_src/jak1/pc/progress-pc.gc @@ -695,9 +695,9 @@ (set! (-> *graphic-options-pc* 5 value-to-modify) (&-> *progress-carousell* int-backup)) (set! (-> *graphic-options-no-frame-rate-pc* 1 value-to-modify) (&-> *progress-carousell* int-backup)) (set! (-> *graphic-options-no-frame-rate-pc* 2 value-to-modify) (&-> *pc-settings* vsync?)) - (set! (-> *graphic-options-pc* 4 value-to-modify) (&-> *progress-carousell* int-backup)) - (set! (-> *misc-options* 0 value-to-modify) (&-> *pc-settings* discord-rpc?)) - (set! (-> *misc-options* 1 value-to-modify) (&-> *pc-settings* money-starburst?)) + (set! (-> *graphic-options-no-frame-rate-pc* 4 value-to-modify) (&-> *progress-carousell* int-backup)) + (set! (-> *misc-options* 0 value-to-modify) (&-> *pc-settings* money-starburst?)) + (set! (-> *misc-options* 1 value-to-modify) (&-> *pc-settings* discord-rpc?)) (set! (-> *camera-options* 0 value-to-modify) (&-> *pc-settings* first-camera-h-inverted?)) (set! (-> *camera-options* 1 value-to-modify) (&-> *pc-settings* first-camera-v-inverted?)) (set! (-> *camera-options* 2 value-to-modify) (&-> *pc-settings* third-camera-h-inverted?))