From dfdcc439e476580ef989b5fbedbd0d1a52fef66f Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Tue, 14 Mar 2023 22:24:57 +0000 Subject: [PATCH] add 2 extra levels to jak 2 --- game/graphics/opengl_renderer/buckets.h | 94 ++++++++++ goal_src/jak2/engine/debug/editable.gc | 4 +- goal_src/jak2/engine/game/game-info-h.gc | 14 +- .../engine/gfx/background/background-h.gc | 14 +- .../gfx/background/tfrag/tfrag-methods.gc | 40 ++++- .../engine/gfx/background/tie/tie-methods.gc | 38 +++- .../engine/gfx/foreground/foreground-h.gc | 26 +-- .../jak2/engine/gfx/foreground/foreground.gc | 62 ++++++- .../jak2/engine/gfx/foreground/merc/emerc.gc | 50 ++++++ .../jak2/engine/gfx/foreground/merc/merc.gc | 12 ++ .../jak2/engine/gfx/generic/generic-vu1.gc | 12 ++ goal_src/jak2/engine/gfx/shrub/shrubbery.gc | 8 +- goal_src/jak2/engine/gfx/texture/texture-h.gc | 122 ++++++++++++- goal_src/jak2/engine/gfx/vu1-user-h.gc | 166 ++++++++++++++---- goal_src/jak2/engine/level/level-h.gc | 30 +++- goal_src/jak2/engine/level/level.gc | 23 ++- .../jak2/engine/ui/progress/progress-draw.gc | 4 +- 17 files changed, 639 insertions(+), 80 deletions(-) diff --git a/game/graphics/opengl_renderer/buckets.h b/game/graphics/opengl_renderer/buckets.h index 5601dab09e..3c8498890d 100644 --- a/game/graphics/opengl_renderer/buckets.h +++ b/game/graphics/opengl_renderer/buckets.h @@ -154,6 +154,28 @@ enum class BucketId { EMERC_L5_TFRAG, GMERC_L5_TFRAG, TIE_V_L5_TFRAG, + TEX_L6_TFRAG, + TFRAG_L6_TFRAG, + TIE_L6_TFRAG, + ETIE_L6_TFRAG, + TFRAG_S_L6_TFRAG, + TIE_S_L6_TFRAG, + ETIE_S_L6_TFRAG, + MERC_L6_TFRAG, + EMERC_L6_TFRAG, + GMERC_L6_TFRAG, + TIE_V_L6_TFRAG, + TEX_L7_TFRAG, + TFRAG_L7_TFRAG, + TIE_L7_TFRAG, + ETIE_L7_TFRAG, + TFRAG_S_L7_TFRAG, + TIE_S_L7_TFRAG, + ETIE_S_L7_TFRAG, + MERC_L7_TFRAG, + EMERC_L7_TFRAG, + GMERC_L7_TFRAG, + TIE_V_L7_TFRAG, TEX_L0_SHRUB, SHRUB_L0_SHRUB, SHRUB_N_L0_SHRUB, @@ -208,6 +230,24 @@ enum class BucketId { MERC_L5_SHRUB, EMERC_L5_SHRUB, GMERC_L5_SHRUB, + TEX_L6_SHRUB, + SHRUB_L6_SHRUB, + SHRUB_N_L6_SHRUB, + BILLBOARD_L6_SHRUB, + SHRUB_V_L6_SHRUB, + SHRUB_NT_L6_SHRUB, + MERC_L6_SHRUB, + EMERC_L6_SHRUB, + GMERC_L6_SHRUB, + TEX_L7_SHRUB, + SHRUB_L7_SHRUB, + SHRUB_N_L7_SHRUB, + BILLBOARD_L7_SHRUB, + SHRUB_V_L7_SHRUB, + SHRUB_NT_L7_SHRUB, + MERC_L7_SHRUB, + EMERC_L7_SHRUB, + GMERC_L7_SHRUB, TEX_L0_ALPHA, TFRAG_T_L0_ALPHA, TIE_T_L0_ALPHA, @@ -268,6 +308,26 @@ enum class BucketId { TFRAG_ST_L5_ALPHA, TIE_ST_L5_ALPHA, ETIE_ST_L5_ALPHA, + TEX_L6_ALPHA, + TFRAG_T_L6_ALPHA, + TIE_T_L6_ALPHA, + ETIE_T_L6_ALPHA, + MERC_L6_ALPHA, + EMERC_L6_ALPHA, + GMERC_L6_ALPHA, + TFRAG_ST_L6_ALPHA, + TIE_ST_L6_ALPHA, + ETIE_ST_L6_ALPHA, + TEX_L7_ALPHA, + TFRAG_T_L7_ALPHA, + TIE_T_L7_ALPHA, + ETIE_T_L7_ALPHA, + MERC_L7_ALPHA, + EMERC_L7_ALPHA, + GMERC_L7_ALPHA, + TFRAG_ST_L7_ALPHA, + TIE_ST_L7_ALPHA, + ETIE_ST_L7_ALPHA, TEX_LCOM_TFRAG, MERC_LCOM_TFRAG, EMERC_LCOM_TFRAG, @@ -301,6 +361,14 @@ enum class BucketId { MERC_L5_PRIS, EMERC_L5_PRIS, GMERC_L5_PRIS, + TEX_L6_PRIS, + MERC_L6_PRIS, + EMERC_L6_PRIS, + GMERC_L6_PRIS, + TEX_L7_PRIS, + MERC_L7_PRIS, + EMERC_L7_PRIS, + GMERC_L7_PRIS, TEX_LCOM_PRIS, MERC_LCOM_PRIS, EMERC_LCOM_PRIS, @@ -329,6 +397,14 @@ enum class BucketId { MERC_L5_PRIS2, EMERC_L5_PRIS2, GMERC_L5_PRIS2, + TEX_L6_PRIS2, + MERC_L6_PRIS2, + EMERC_L6_PRIS2, + GMERC_L6_PRIS2, + TEX_L7_PRIS2, + MERC_L7_PRIS2, + EMERC_L7_PRIS2, + GMERC_L7_PRIS2, TEX_LCOM_PRIS2, MERC_LCOM_PRIS2, EMERC_LCOM_PRIS2, @@ -387,6 +463,24 @@ enum class BucketId { TIE_SW_L5_WATER, TFRAG_WS_L5_WATER, ETIE_SW_L5_WATER, + TEX_L6_WATER, + MERC_L6_WATER, + GMERC_L6_WATER, + TFRAG_W_L6_WATER, + TIE_W_L6_WATER, + ETIE_W_L6_WATER, + TIE_SW_L6_WATER, + TFRAG_WS_L6_WATER, + ETIE_SW_L6_WATER, + TEX_L7_WATER, + MERC_L7_WATER, + GMERC_L7_WATER, + TFRAG_W_L7_WATER, + TIE_W_L7_WATER, + ETIE_W_L7_WATER, + TIE_SW_L7_WATER, + TFRAG_WS_L7_WATER, + ETIE_SW_L7_WATER, TEX_LCOM_WATER, MERC_LCOM_WATER, GMERC_LCOM_WATER, diff --git a/goal_src/jak2/engine/debug/editable.gc b/goal_src/jak2/engine/debug/editable.gc index 6978bf0990..490bce0cb8 100644 --- a/goal_src/jak2/engine/debug/editable.gc +++ b/goal_src/jak2/engine/debug/editable.gc @@ -307,7 +307,7 @@ (add-debug-x #t (bucket-id debug-no-zbuf1) arg0 (new 'static 'rgba :r #xff :g #xff :a #x80)) (let ((s3-0 add-debug-text-3d) (s2-0 #t) - (s1-0 318) + (s1-0 (bucket-id debug-no-zbuf1)) ) (format (clear *temp-string*) "region-~D~%" (-> obj id)) (s3-0 s2-0 (the-as bucket-id s1-0) *temp-string* arg0 (font-color white) sv-32) @@ -318,7 +318,7 @@ (when s4-1 (let ((s3-1 add-debug-text-3d) (s2-1 #t) - (s1-1 318) + (s1-1 (bucket-id debug-no-zbuf1)) ) (format (clear *temp-string*) "(on-enter ~S)" s4-1) (s3-1 s2-1 (the-as bucket-id s1-1) *temp-string* arg0 (font-color white) sv-32) diff --git a/goal_src/jak2/engine/game/game-info-h.gc b/goal_src/jak2/engine/game/game-info-h.gc index 0ab99b12fd..1a8448624f 100644 --- a/goal_src/jak2/engine/game/game-info-h.gc +++ b/goal_src/jak2/engine/game/game-info-h.gc @@ -171,15 +171,15 @@ (deftype load-state (basic) ((want level-buffer-state LEVEL_MAX :inline :offset-assert 4) - (want-sound symbol 3 :offset-assert 100) - (vis-nick symbol :offset-assert 112) - (command-list pair :offset-assert 116) - (object-name string 256 :offset-assert 120) - (object-status basic 256 :offset-assert 1144) + (want-sound symbol 3 );:offset-assert 100) + (vis-nick symbol );:offset-assert 112) + (command-list pair );:offset-assert 116) + (object-name string 256 );:offset-assert 120) + (object-status basic 256 );:offset-assert 1144) ) :method-count-assert 22 - :size-assert #x878 - :flag-assert #x1600000878 + ;:size-assert #x878 + ;:flag-assert #x1600000878 (:methods (new (symbol type) _type_ 0) (reset! (_type_) _type_ 9) diff --git a/goal_src/jak2/engine/gfx/background/background-h.gc b/goal_src/jak2/engine/gfx/background/background-h.gc index 02039719f1..9f20b11009 100644 --- a/goal_src/jak2/engine/gfx/background/background-h.gc +++ b/goal_src/jak2/engine/gfx/background/background-h.gc @@ -23,15 +23,15 @@ (shrub-trees drawable-tree-instance-shrub 8 :offset-assert 212) (shrub-levels level 8 :offset-assert 244) (tie-tree-count int32 :offset-assert 276) - (tie-trees drawable-tree-instance-tie 8 :offset-assert 280) - (tie-levels level 8 :offset-assert 312) - (tie-generic basic 8 :offset-assert 344) - (tie-generic-trans basic 8 :offset-assert 376) - (wait-to-vu0 uint32 :offset-assert 408) + (tie-trees drawable-tree-instance-tie 12);:offset-assert 280) ;; guessed by decompiler + (tie-levels level 12);:offset-assert 312) ;; guessed by decompiler + (tie-generic basic 12);:offset-assert 344) ;; guessed by decompiler + (tie-generic-trans basic 12);:offset-assert 376) + (wait-to-vu0 uint32 );:offset-assert 408) ) :method-count-assert 9 - :size-assert #x19c - :flag-assert #x90000019c + ;:size-assert #x19c + ;:flag-assert #x90000019c ) ;; DECOMP ENDS diff --git a/goal_src/jak2/engine/gfx/background/tfrag/tfrag-methods.gc b/goal_src/jak2/engine/gfx/background/tfrag/tfrag-methods.gc index b45e9b6bdc..0cab4d3843 100644 --- a/goal_src/jak2/engine/gfx/background/tfrag/tfrag-methods.gc +++ b/goal_src/jak2/engine/gfx/background/tfrag/tfrag-methods.gc @@ -103,8 +103,14 @@ ((= v1-53 4) (bucket-id tfrag-l4-tfrag) ) + ((= v1-53 5) + (bucket-id tfrag-l5-tfrag) + ) + ((= v1-53 6) + (bucket-id tfrag-l6-tfrag) + ) (else - (bucket-id tfrag-l5-tfrag) + (bucket-id tfrag-l7-tfrag) ) ) s2-0 @@ -256,8 +262,14 @@ ((= v1-46 4) (bucket-id tfrag-t-l4-alpha) ) + ((= v1-46 5) + (bucket-id tfrag-t-l5-alpha) + ) + ((= v1-46 6) + (bucket-id tfrag-t-l6-alpha) + ) (else - (bucket-id tfrag-t-l5-alpha) + (bucket-id tfrag-t-l7-alpha) ) ) s3-0 @@ -397,8 +409,14 @@ ((= v1-46 4) (bucket-id tfrag-w-l4-water) ) + ((= v1-46 5) + (bucket-id tfrag-w-l5-water) + ) + ((= v1-46 6) + (bucket-id tfrag-w-l6-water) + ) (else - (bucket-id tfrag-w-l5-water) + (bucket-id tfrag-w-l7-water) ) ) s3-0 @@ -572,6 +590,22 @@ :tfrag-water-bucket (bucket-id tfrag-w-l5-water) :tfrag-water-scissor-bucket (bucket-id tfrag-ws-l5-water) ) + (new 'static 'tfrag-init-data + :tfrag-bucket (bucket-id tfrag-l6-tfrag) + :tfrag-scissor-bucket (bucket-id tfrag-s-l6-tfrag) + :tfrag-trans-bucket (bucket-id tfrag-t-l6-alpha) + :tfrag-scissor-trans-bucket (bucket-id tfrag-st-l6-alpha) + :tfrag-water-bucket (bucket-id tfrag-w-l6-water) + :tfrag-water-scissor-bucket (bucket-id tfrag-ws-l6-water) + ) + (new 'static 'tfrag-init-data + :tfrag-bucket (bucket-id tfrag-l7-tfrag) + :tfrag-scissor-bucket (bucket-id tfrag-s-l7-tfrag) + :tfrag-trans-bucket (bucket-id tfrag-t-l7-alpha) + :tfrag-scissor-trans-bucket (bucket-id tfrag-st-l7-alpha) + :tfrag-water-bucket (bucket-id tfrag-w-l7-water) + :tfrag-water-scissor-bucket (bucket-id tfrag-ws-l7-water) + ) ) ) diff --git a/goal_src/jak2/engine/gfx/background/tie/tie-methods.gc b/goal_src/jak2/engine/gfx/background/tie/tie-methods.gc index ca8753da15..76fb42cd1c 100644 --- a/goal_src/jak2/engine/gfx/background/tie/tie-methods.gc +++ b/goal_src/jak2/engine/gfx/background/tie/tie-methods.gc @@ -267,8 +267,14 @@ ((= v1-48 4) (bucket-id tie-l4-tfrag) ) + ((= v1-48 5) + (bucket-id tie-l5-tfrag) + ) + ((= v1-48 6) + (bucket-id tie-l6-tfrag) + ) (else - (bucket-id tie-l5-tfrag) + (bucket-id tie-l7-tfrag) ) ) a2-10 @@ -1618,6 +1624,36 @@ :tie-envmap-water-bucket (bucket-id etie-w-l5-water) :tie-envmap-scissor-water-bucket (bucket-id etie-sw-l5-water) ) + (new 'static 'tie-init-data + :tie-bucket (bucket-id tie-l6-tfrag) + :tie-scissor-bucket (bucket-id tie-s-l6-tfrag) + :tie-envmap-bucket (bucket-id etie-l6-tfrag) + :tie-envmap-scissor-bucket (bucket-id etie-s-l6-tfrag) + :tie-vanish-bucket (bucket-id tie-v-l6-tfrag) + :tie-trans-bucket (bucket-id tie-t-l6-alpha) + :tie-scissor-trans-bucket (bucket-id tie-st-l6-alpha) + :tie-envmap-trans-bucket (bucket-id etie-t-l6-alpha) + :tie-envmap-scissor-trans-bucket (bucket-id etie-st-l6-alpha) + :tie-water-bucket (bucket-id tie-w-l6-water) + :tie-scissor-water-bucket (bucket-id tie-sw-l6-water) + :tie-envmap-water-bucket (bucket-id etie-w-l6-water) + :tie-envmap-scissor-water-bucket (bucket-id etie-sw-l6-water) + ) + (new 'static 'tie-init-data + :tie-bucket (bucket-id tie-l7-tfrag) + :tie-scissor-bucket (bucket-id tie-s-l7-tfrag) + :tie-envmap-bucket (bucket-id etie-l7-tfrag) + :tie-envmap-scissor-bucket (bucket-id etie-s-l7-tfrag) + :tie-vanish-bucket (bucket-id tie-v-l7-tfrag) + :tie-trans-bucket (bucket-id tie-t-l7-alpha) + :tie-scissor-trans-bucket (bucket-id tie-st-l7-alpha) + :tie-envmap-trans-bucket (bucket-id etie-t-l7-alpha) + :tie-envmap-scissor-trans-bucket (bucket-id etie-st-l7-alpha) + :tie-water-bucket (bucket-id tie-w-l7-water) + :tie-scissor-water-bucket (bucket-id tie-sw-l7-water) + :tie-envmap-water-bucket (bucket-id etie-w-l7-water) + :tie-envmap-scissor-water-bucket (bucket-id etie-sw-l7-water) + ) ) ) diff --git a/goal_src/jak2/engine/gfx/foreground/foreground-h.gc b/goal_src/jak2/engine/gfx/foreground/foreground-h.gc index a47a41321b..101b8368ac 100644 --- a/goal_src/jak2/engine/gfx/foreground/foreground-h.gc +++ b/goal_src/jak2/engine/gfx/foreground/foreground-h.gc @@ -54,11 +54,11 @@ (deftype foreground-bucket-grid (structure) ((level-buckets foreground-level-buckets LEVEL_TOTAL :inline :offset-assert 0) - (warp-chain mercneric-chain :inline :offset-assert 2352) + (warp-chain mercneric-chain :inline :offset-assert 3024) ) :method-count-assert 9 - :size-assert #x944 - :flag-assert #x900000944 + :size-assert #xbe4 + :flag-assert #x900000be4 ) (deftype foreground-regs (structure) @@ -86,14 +86,14 @@ ((regs foreground-regs :inline :offset-assert 0) (draw-index-map uint8 LEVEL_TOTAL :offset 64) (grid foreground-bucket-grid :inline :offset-assert 80) - (bounds sphere :inline :offset-assert 2464) - (lights vu-lights :inline :offset-assert 2480) - (distance vector :inline :offset-assert 2592) - (next-tmpl dma-packet :inline :offset-assert 2608) + (bounds sphere :inline :offset-assert 3136) + (lights vu-lights :inline :offset-assert 3152) + (distance vector :inline :offset-assert 3264) + (next-tmpl dma-packet :inline :offset-assert 3280) ) :method-count-assert 9 - :size-assert #xa40 - :flag-assert #x900000a40 + :size-assert #xce0 + :flag-assert #x900000ce0 ) @@ -143,12 +143,12 @@ (deftype foreground-globals (structure) ((foreground-grid foreground-bucket-grid :inline :offset-assert 0) - (merc-bucket-info merc-bucket-info :inline :offset-assert 2384) - (texscroll texscroll-globals :inline :offset-assert 3024) + (merc-bucket-info merc-bucket-info :inline :offset-assert 3056) + (texscroll texscroll-globals :inline :offset-assert 3696) ) :method-count-assert 9 - :size-assert #xc54 - :flag-assert #x900000c54 + :size-assert #xef4 + :flag-assert #x900000ef4 ) (define *foreground* (new 'global 'foreground-globals)) diff --git a/goal_src/jak2/engine/gfx/foreground/foreground.gc b/goal_src/jak2/engine/gfx/foreground/foreground.gc index 4f723d421a..e300b6528f 100644 --- a/goal_src/jak2/engine/gfx/foreground/foreground.gc +++ b/goal_src/jak2/engine/gfx/foreground/foreground.gc @@ -20,7 +20,7 @@ (define foreground-vu0-block (new 'static 'vu-function)) -(define *bucket-map* (new 'static 'array bucket-id-16 200 +(define *bucket-map* (new 'static 'array bucket-id-16 260 (bucket-id-16 merc-l0-tfrag) (bucket-id-16 emerc-l0-tfrag) (bucket-id-16 gmerc-l0-tfrag) @@ -189,6 +189,62 @@ (bucket-id-16 emerc-l5-pris2) (bucket-id-16 gmerc-l5-pris2) (bucket-id-16 tex-l5-pris2) + (bucket-id-16 merc-l6-tfrag) + (bucket-id-16 emerc-l6-tfrag) + (bucket-id-16 gmerc-l6-tfrag) + (bucket-id-16 tex-l6-tfrag) + (bucket-id-16 merc-l6-pris) + (bucket-id-16 emerc-l6-pris) + (bucket-id-16 gmerc-l6-pris) + (bucket-id-16 tex-l6-pris) + (bucket-id-16 merc-l6-shrub) + (bucket-id-16 emerc-l6-shrub) + (bucket-id-16 gmerc-l6-shrub) + (bucket-id-16 tex-l6-shrub) + (bucket-id-16 merc-l6-alpha) + (bucket-id-16 emerc-l6-alpha) + (bucket-id-16 gmerc-l6-alpha) + (bucket-id-16 tex-l6-alpha) + (bucket-id-16 merc-l6-water) + (bucket-id-16 merc-l6-water) + (bucket-id-16 gmerc-l6-water) + (bucket-id-16 tex-l6-water) + (bucket-id-16 merc-l6-pris) + (bucket-id-16 emerc-l6-pris) + (bucket-id-16 gmerc-l6-pris) + (bucket-id-16 tex-l6-pris) + (bucket-id-16 merc-l6-pris2) + (bucket-id-16 emerc-l6-pris2) + (bucket-id-16 gmerc-l6-pris2) + (bucket-id-16 tex-l6-pris2) + (bucket-id-16 merc-l7-tfrag) + (bucket-id-16 emerc-l7-tfrag) + (bucket-id-16 gmerc-l7-tfrag) + (bucket-id-16 tex-l7-tfrag) + (bucket-id-16 merc-l7-pris) + (bucket-id-16 emerc-l7-pris) + (bucket-id-16 gmerc-l7-pris) + (bucket-id-16 tex-l7-pris) + (bucket-id-16 merc-l7-shrub) + (bucket-id-16 emerc-l7-shrub) + (bucket-id-16 gmerc-l7-shrub) + (bucket-id-16 tex-l7-shrub) + (bucket-id-16 merc-l7-alpha) + (bucket-id-16 emerc-l7-alpha) + (bucket-id-16 gmerc-l7-alpha) + (bucket-id-16 tex-l7-alpha) + (bucket-id-16 merc-l7-water) + (bucket-id-16 merc-l7-water) + (bucket-id-16 gmerc-l7-water) + (bucket-id-16 tex-l7-water) + (bucket-id-16 merc-l7-pris) + (bucket-id-16 emerc-l7-pris) + (bucket-id-16 gmerc-l7-pris) + (bucket-id-16 tex-l7-pris) + (bucket-id-16 merc-l7-pris2) + (bucket-id-16 emerc-l7-pris2) + (bucket-id-16 gmerc-l7-pris2) + (bucket-id-16 tex-l7-pris2) (bucket-id-16 merc-lcom-tfrag) (bucket-id-16 emerc-lcom-tfrag) (bucket-id-16 gmerc-lcom-tfrag) @@ -221,6 +277,10 @@ (bucket-id-16 bucket-0) (bucket-id-16 bucket-0) (bucket-id-16 bucket-0) + (bucket-id-16 bucket-0) + (bucket-id-16 bucket-0) + (bucket-id-16 bucket-0) + (bucket-id-16 bucket-0) ) ) diff --git a/goal_src/jak2/engine/gfx/foreground/merc/emerc.gc b/goal_src/jak2/engine/gfx/foreground/merc/emerc.gc index 32c07879b5..c08868b66e 100644 --- a/goal_src/jak2/engine/gfx/foreground/merc/emerc.gc +++ b/goal_src/jak2/engine/gfx/foreground/merc/emerc.gc @@ -108,6 +108,16 @@ (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) 0 ) + (emerc-vu1-init-buffer + (bucket-id emerc-l6-tfrag) + (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) + 0 + ) + (emerc-vu1-init-buffer + (bucket-id emerc-l7-tfrag) + (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) + 0 + ) (emerc-vu1-init-buffer (bucket-id emerc-lcom-tfrag) (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) @@ -143,6 +153,16 @@ (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) 0 ) + (emerc-vu1-init-buffer + (bucket-id emerc-l6-pris) + (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) + 0 + ) + (emerc-vu1-init-buffer + (bucket-id emerc-l7-pris) + (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) + 0 + ) (emerc-vu1-init-buffer (bucket-id emerc-lcom-pris) (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) @@ -178,6 +198,16 @@ (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) 0 ) + (emerc-vu1-init-buffer + (bucket-id emerc-l6-shrub) + (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) + 0 + ) + (emerc-vu1-init-buffer + (bucket-id emerc-l7-shrub) + (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) + 0 + ) (emerc-vu1-init-buffer (bucket-id emerc-lcom-shrub) (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) @@ -213,6 +243,16 @@ (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) 0 ) + (emerc-vu1-init-buffer + (bucket-id emerc-l6-alpha) + (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) + 0 + ) + (emerc-vu1-init-buffer + (bucket-id emerc-l7-alpha) + (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) + 0 + ) (emerc-vu1-init-buffer (bucket-id emerc-l0-pris2) (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) @@ -243,6 +283,16 @@ (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) 0 ) + (emerc-vu1-init-buffer + (bucket-id emerc-l6-pris2) + (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) + 0 + ) + (emerc-vu1-init-buffer + (bucket-id emerc-l7-pris2) + (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) + 0 + ) (emerc-vu1-init-buffer (bucket-id emerc-lcom-pris2) (new 'static 'gs-test :zte #x1 :ztst (gs-ztest greater-equal)) diff --git a/goal_src/jak2/engine/gfx/foreground/merc/merc.gc b/goal_src/jak2/engine/gfx/foreground/merc/merc.gc index 5268832279..adc952bc5c 100644 --- a/goal_src/jak2/engine/gfx/foreground/merc/merc.gc +++ b/goal_src/jak2/engine/gfx/foreground/merc/merc.gc @@ -572,6 +572,8 @@ (merc-vu1-init-buffer (bucket-id merc-l3-tfrag) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l4-tfrag) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l5-tfrag) 0 #t) + (merc-vu1-init-buffer (bucket-id merc-l6-tfrag) 0 #t) + (merc-vu1-init-buffer (bucket-id merc-l7-tfrag) 0 #t) (merc-vu1-init-buffer (bucket-id merc-lcom-tfrag) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l0-pris) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l1-pris) 0 #t) @@ -579,6 +581,8 @@ (merc-vu1-init-buffer (bucket-id merc-l3-pris) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l4-pris) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l5-pris) 0 #t) + (merc-vu1-init-buffer (bucket-id merc-l6-pris) 0 #t) + (merc-vu1-init-buffer (bucket-id merc-l7-pris) 0 #t) (merc-vu1-init-buffer (bucket-id merc-lcom-pris) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l0-shrub) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l1-shrub) 0 #t) @@ -586,6 +590,8 @@ (merc-vu1-init-buffer (bucket-id merc-l3-shrub) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l4-shrub) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l5-shrub) 0 #t) + (merc-vu1-init-buffer (bucket-id merc-l6-shrub) 0 #t) + (merc-vu1-init-buffer (bucket-id merc-l7-shrub) 0 #t) (merc-vu1-init-buffer (bucket-id merc-lcom-shrub) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l0-alpha) 1 #t) (merc-vu1-init-buffer (bucket-id merc-l1-alpha) 1 #t) @@ -593,12 +599,16 @@ (merc-vu1-init-buffer (bucket-id merc-l3-alpha) 1 #t) (merc-vu1-init-buffer (bucket-id merc-l4-alpha) 1 #t) (merc-vu1-init-buffer (bucket-id merc-l5-alpha) 1 #t) + (merc-vu1-init-buffer (bucket-id merc-l6-alpha) 1 #t) + (merc-vu1-init-buffer (bucket-id merc-l7-alpha) 1 #t) (merc-vu1-init-buffer (bucket-id merc-l0-pris2) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l1-pris2) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l2-pris2) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l3-pris2) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l4-pris2) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l5-pris2) 0 #t) + (merc-vu1-init-buffer (bucket-id merc-l6-pris2) 0 #t) + (merc-vu1-init-buffer (bucket-id merc-l7-pris2) 0 #t) (merc-vu1-init-buffer (bucket-id merc-lcom-pris2) 0 #t) (merc-vu1-init-buffer (bucket-id merc-l0-water) 1 #f) (merc-vu1-init-buffer (bucket-id merc-l1-water) 1 #f) @@ -606,6 +616,8 @@ (merc-vu1-init-buffer (bucket-id merc-l3-water) 1 #f) (merc-vu1-init-buffer (bucket-id merc-l4-water) 1 #f) (merc-vu1-init-buffer (bucket-id merc-l5-water) 1 #f) + (merc-vu1-init-buffer (bucket-id merc-l6-water) 1 #f) + (merc-vu1-init-buffer (bucket-id merc-l7-water) 1 #f) (merc-vu1-init-buffer (bucket-id merc-lcom-water) 1 #f) ) 0 diff --git a/goal_src/jak2/engine/gfx/generic/generic-vu1.gc b/goal_src/jak2/engine/gfx/generic/generic-vu1.gc index 1ab3d15136..3ab578a321 100644 --- a/goal_src/jak2/engine/gfx/generic/generic-vu1.gc +++ b/goal_src/jak2/engine/gfx/generic/generic-vu1.gc @@ -149,6 +149,8 @@ (generic-vu1-init-buf (bucket-id gmerc-l3-tfrag) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l4-tfrag) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l5-tfrag) s5-0) + (generic-vu1-init-buf (bucket-id gmerc-l6-tfrag) s5-0) + (generic-vu1-init-buf (bucket-id gmerc-l7-tfrag) s5-0) (generic-vu1-init-buf (bucket-id gmerc-lcom-tfrag) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l0-pris) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l1-pris) s5-0) @@ -156,6 +158,8 @@ (generic-vu1-init-buf (bucket-id gmerc-l3-pris) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l4-pris) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l5-pris) s5-0) + (generic-vu1-init-buf (bucket-id gmerc-l6-pris) s5-0) + (generic-vu1-init-buf (bucket-id gmerc-l7-pris) s5-0) (generic-vu1-init-buf (bucket-id gmerc-lcom-pris) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l0-shrub) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l1-shrub) s5-0) @@ -163,6 +167,8 @@ (generic-vu1-init-buf (bucket-id gmerc-l3-shrub) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l4-shrub) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l5-shrub) s5-0) + (generic-vu1-init-buf (bucket-id gmerc-l6-shrub) s5-0) + (generic-vu1-init-buf (bucket-id gmerc-l7-shrub) s5-0) (generic-vu1-init-buf (bucket-id gmerc-lcom-shrub) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l0-alpha) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l1-alpha) s5-0) @@ -170,12 +176,16 @@ (generic-vu1-init-buf (bucket-id gmerc-l3-alpha) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l4-alpha) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l5-alpha) s5-0) + (generic-vu1-init-buf (bucket-id gmerc-l6-alpha) s5-0) + (generic-vu1-init-buf (bucket-id gmerc-l7-alpha) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l0-pris2) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l1-pris2) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l2-pris2) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l3-pris2) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l4-pris2) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l5-pris2) s5-0) + (generic-vu1-init-buf (bucket-id gmerc-l6-pris2) s5-0) + (generic-vu1-init-buf (bucket-id gmerc-l7-pris2) s5-0) (generic-vu1-init-buf (bucket-id gmerc-lcom-pris2) s5-0) (generic-vu1-init-buf (bucket-id gmerc-l0-water) gp-0) (generic-vu1-init-buf (bucket-id gmerc-l1-water) gp-0) @@ -183,6 +193,8 @@ (generic-vu1-init-buf (bucket-id gmerc-l3-water) gp-0) (generic-vu1-init-buf (bucket-id gmerc-l4-water) gp-0) (generic-vu1-init-buf (bucket-id gmerc-l5-water) gp-0) + (generic-vu1-init-buf (bucket-id gmerc-l6-water) gp-0) + (generic-vu1-init-buf (bucket-id gmerc-l7-water) gp-0) (generic-vu1-init-buf (bucket-id gmerc-lcom-water) gp-0) ) (generic-vu1-init-buf (bucket-id effects) gp-0) diff --git a/goal_src/jak2/engine/gfx/shrub/shrubbery.gc b/goal_src/jak2/engine/gfx/shrub/shrubbery.gc index 582cb3f15e..80dc631a3c 100644 --- a/goal_src/jak2/engine/gfx/shrub/shrubbery.gc +++ b/goal_src/jak2/engine/gfx/shrub/shrubbery.gc @@ -506,8 +506,14 @@ ((= *draw-index* 4) (bucket-id shrub-l4-shrub) ) + ((= *draw-index* 5) + (bucket-id shrub-l5-shrub) + ) + ((= *draw-index* 6) + (bucket-id shrub-l6-shrub) + ) (else - (bucket-id shrub-l5-shrub) + (bucket-id shrub-l7-shrub) ) ) dma-start diff --git a/goal_src/jak2/engine/gfx/texture/texture-h.gc b/goal_src/jak2/engine/gfx/texture/texture-h.gc index e2709d9185..f7c9bdd042 100644 --- a/goal_src/jak2/engine/gfx/texture/texture-h.gc +++ b/goal_src/jak2/engine/gfx/texture/texture-h.gc @@ -424,7 +424,7 @@ (new 'static 'boxed-array :type texture-page-translate-item (new 'static 'texture-page-translate-item :bucket (bucket-id tex-lcom-sky-pre) - :level-index #x6 + :level-index #x8 :level-texture-page (tpage-category-u32 sky) :texture-user (texture-enable-mask-u32 sky) ) @@ -457,6 +457,16 @@ :level-index #x5 :texture-user (texture-enable-mask-u32 tfrag) ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-l6-tfrag) + :level-index #x6 + :texture-user (texture-enable-mask-u32 tfrag) + ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-l7-tfrag) + :level-index #x7 + :texture-user (texture-enable-mask-u32 tfrag) + ) (new 'static 'texture-page-translate-item :bucket (bucket-id tex-l0-shrub) :level-texture-page (tpage-category-u32 shrub) @@ -492,6 +502,18 @@ :level-texture-page (tpage-category-u32 shrub) :texture-user (texture-enable-mask-u32 shrub) ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-l6-shrub) + :level-index #x6 + :level-texture-page (tpage-category-u32 shrub) + :texture-user (texture-enable-mask-u32 shrub) + ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-l7-shrub) + :level-index #x7 + :level-texture-page (tpage-category-u32 shrub) + :texture-user (texture-enable-mask-u32 shrub) + ) (new 'static 'texture-page-translate-item :bucket (bucket-id tex-l0-alpha) :level-texture-page (tpage-category-u32 alpha) @@ -528,13 +550,25 @@ :texture-user (texture-enable-mask-u32 alpha) ) (new 'static 'texture-page-translate-item - :bucket (bucket-id tex-lcom-tfrag) + :bucket (bucket-id tex-l6-alpha) :level-index #x6 + :level-texture-page (tpage-category-u32 alpha) + :texture-user (texture-enable-mask-u32 alpha) + ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-l7-alpha) + :level-index #x7 + :level-texture-page (tpage-category-u32 alpha) + :texture-user (texture-enable-mask-u32 alpha) + ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-lcom-tfrag) + :level-index #x8 :texture-user (texture-enable-mask-u32 tfrag) ) (new 'static 'texture-page-translate-item :bucket (bucket-id tex-lcom-shrub) - :level-index #x6 + :level-index #x8 :level-texture-page (tpage-category-u32 shrub) :texture-user (texture-enable-mask-u32 shrub) ) @@ -574,11 +608,23 @@ :texture-user (texture-enable-mask-u32 pris) ) (new 'static 'texture-page-translate-item - :bucket (bucket-id tex-lcom-pris) + :bucket (bucket-id tex-l6-pris) :level-index #x6 :level-texture-page (tpage-category-u32 pris) :texture-user (texture-enable-mask-u32 pris) ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-l7-pris) + :level-index #x7 + :level-texture-page (tpage-category-u32 pris) + :texture-user (texture-enable-mask-u32 pris) + ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-lcom-pris) + :level-index #x8 + :level-texture-page (tpage-category-u32 pris) + :texture-user (texture-enable-mask-u32 pris) + ) (new 'static 'texture-page-translate-item :bucket (bucket-id tex-l0-pris2) :level-texture-page (tpage-category-u32 pris2) @@ -615,11 +661,23 @@ :texture-user (texture-enable-mask-u32 pris) ) (new 'static 'texture-page-translate-item - :bucket (bucket-id tex-lcom-pris2) + :bucket (bucket-id tex-l6-pris2) :level-index #x6 :level-texture-page (tpage-category-u32 pris2) :texture-user (texture-enable-mask-u32 pris) ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-l7-pris2) + :level-index #x7 + :level-texture-page (tpage-category-u32 pris2) + :texture-user (texture-enable-mask-u32 pris) + ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-lcom-pris2) + :level-index #x8 + :level-texture-page (tpage-category-u32 pris2) + :texture-user (texture-enable-mask-u32 pris) + ) (new 'static 'texture-page-translate-item :bucket (bucket-id tex-l0-water) :level-texture-page (tpage-category-u32 water) @@ -656,14 +714,26 @@ :texture-user (texture-enable-mask-u32 water) ) (new 'static 'texture-page-translate-item - :bucket (bucket-id tex-lcom-water) + :bucket (bucket-id tex-l6-water) :level-index #x6 :level-texture-page (tpage-category-u32 water) :texture-user (texture-enable-mask-u32 water) ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-l7-water) + :level-index #x7 + :level-texture-page (tpage-category-u32 water) + :texture-user (texture-enable-mask-u32 water) + ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-lcom-water) + :level-index #x8 + :level-texture-page (tpage-category-u32 water) + :texture-user (texture-enable-mask-u32 water) + ) (new 'static 'texture-page-translate-item :bucket (bucket-id tex-lcom-sky-post) - :level-index #x6 + :level-index #x8 :level-texture-page (tpage-category-u32 sky) :texture-user (texture-enable-mask-u32 sky) ) @@ -708,6 +778,18 @@ :level-texture-page (tpage-category-u32 sprite) :texture-user (texture-enable-mask-u32 sprite) ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-all-sprite) + :level-index #x7 + :level-texture-page (tpage-category-u32 sprite) + :texture-user (texture-enable-mask-u32 sprite) + ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-all-sprite) + :level-index #x8 + :level-texture-page (tpage-category-u32 sprite) + :texture-user (texture-enable-mask-u32 sprite) + ) (new 'static 'texture-page-translate-item :bucket (bucket-id tex-all-warp) :level-texture-page (tpage-category-u32 warp) @@ -749,6 +831,18 @@ :level-texture-page (tpage-category-u32 warp) :texture-user (texture-enable-mask-u32 warp) ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-all-warp) + :level-index #x7 + :level-texture-page (tpage-category-u32 warp) + :texture-user (texture-enable-mask-u32 warp) + ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-all-warp) + :level-index #x8 + :level-texture-page (tpage-category-u32 warp) + :texture-user (texture-enable-mask-u32 warp) + ) (new 'static 'texture-page-translate-item :bucket (bucket-id tex-all-map) :level-texture-page (tpage-category-u32 map) @@ -792,7 +886,19 @@ ) (new 'static 'texture-page-translate-item :bucket (bucket-id tex-all-map) - :level-index #x6 + :level-index #x7 + :level-texture-page (tpage-category-u32 map) + :texture-user (texture-enable-mask-u32 map) + ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-all-map) + :level-index #x8 + :level-texture-page (tpage-category-u32 map) + :texture-user (texture-enable-mask-u32 map) + ) + (new 'static 'texture-page-translate-item + :bucket (bucket-id tex-all-map) + :level-index #x8 :level-texture-page (tpage-category-u32 alpha) :texture-user (texture-enable-mask-u32 map) ) diff --git a/goal_src/jak2/engine/gfx/vu1-user-h.gc b/goal_src/jak2/engine/gfx/vu1-user-h.gc index 6faf4b56ba..b67feb13ae 100644 --- a/goal_src/jak2/engine/gfx/vu1-user-h.gc +++ b/goal_src/jak2/engine/gfx/vu1-user-h.gc @@ -113,6 +113,30 @@ for example: tie-s-l1-tfrag (gmerc-l5-tfrag) ;; mercneric (tie-v-l5-tfrag) ;; tie + (tex-l6-tfrag) ;; tex + (tfrag-l6-tfrag) ;; tfrag + (tie-l6-tfrag) ;; tie + (etie-l6-tfrag) ;; tie + (tfrag-s-l6-tfrag) ;; tfrag + (tie-s-l6-tfrag) ;; tie + (etie-s-l6-tfrag) ;; tie + (merc-l6-tfrag) ;; merc + (emerc-l6-tfrag) ;; emerc + (gmerc-l6-tfrag) ;; mercneric + (tie-v-l6-tfrag) ;; tie + + (tex-l7-tfrag) ;; tex + (tfrag-l7-tfrag) ;; tfrag + (tie-l7-tfrag) ;; tie + (etie-l7-tfrag) ;; tie + (tfrag-s-l7-tfrag) ;; tfrag + (tie-s-l7-tfrag) ;; tie + (etie-s-l7-tfrag) ;; tie + (merc-l7-tfrag) ;; merc + (emerc-l7-tfrag) ;; emerc + (gmerc-l7-tfrag) ;; mercneric + (tie-v-l7-tfrag) ;; tie + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; All levels with shrub tpage ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -177,6 +201,26 @@ for example: tie-s-l1-tfrag (emerc-l5-shrub) ;; emerc (gmerc-l5-shrub) ;; mercneric + (tex-l6-shrub) ;; tex + (shrub-l6-shrub) ;; shrub + (shrub-n-l6-shrub) ;; shrub + (billboard-l6-shrub) ;; shrub + (shrub-v-l6-shrub) ;; shrub + (shrub-nt-l6-shrub) ;; shrub + (merc-l6-shrub) ;; merc + (emerc-l6-shrub) ;; emerc + (gmerc-l6-shrub) ;; mercneric + + (tex-l7-shrub) ;; tex + (shrub-l7-shrub) ;; shrub + (shrub-n-l7-shrub) ;; shrub + (billboard-l7-shrub) ;; shrub + (shrub-v-l7-shrub) ;; shrub + (shrub-nt-l7-shrub) ;; shrub + (merc-l7-shrub) ;; merc + (emerc-l7-shrub) ;; emerc + (gmerc-l7-shrub) ;; mercneric + (tex-l0-alpha) ;; tex (tfrag-t-l0-alpha) ;; tfrag (tie-t-l0-alpha) ;; tie @@ -243,6 +287,28 @@ for example: tie-s-l1-tfrag (tie-st-l5-alpha) ;; tie (etie-st-l5-alpha) ;; tie + (tex-l6-alpha) ;; tex + (tfrag-t-l6-alpha) ;; tfrag + (tie-t-l6-alpha) ;; tie + (etie-t-l6-alpha) ;; tie + (merc-l6-alpha) ;; merc + (emerc-l6-alpha) ;; emerc + (gmerc-l6-alpha) ;; mercneric + (tfrag-st-l6-alpha) ;; tfrag + (tie-st-l6-alpha) ;; tie + (etie-st-l6-alpha) ;; tie + + (tex-l7-alpha) ;; tex + (tfrag-t-l7-alpha) ;; tfrag + (tie-t-l7-alpha) ;; tie + (etie-t-l7-alpha) ;; tie + (merc-l7-alpha) ;; merc + (emerc-l7-alpha) ;; emerc + (gmerc-l7-alpha) ;; mercneric + (tfrag-st-l7-alpha) ;; tfrag + (tie-st-l7-alpha) ;; tie + (etie-st-l7-alpha) ;; tie + (tex-lcom-tfrag) ;; tex (merc-lcom-tfrag) ;; merc (emerc-lcom-tfrag) ;; emerc @@ -253,7 +319,7 @@ for example: tie-s-l1-tfrag (emerc-lcom-shrub) ;; emerc (gmerc-lcom-shrub) ;; mercneric - (shadow) ;; shadow + (bucket-195) ;; shadow (tex-l0-pris) ;; tex (merc-l0-pris) ;; merc @@ -285,6 +351,16 @@ for example: tie-s-l1-tfrag (emerc-l5-pris) ;; emerc (gmerc-l5-pris) ;; mercneric + (tex-l6-pris) ;; tex + (merc-l6-pris) ;; merc + (emerc-l6-pris) ;; emerc + (gmerc-l6-pris) ;; mercneric + + (tex-l7-pris) ;; tex + (merc-l7-pris) ;; merc + (emerc-l7-pris) ;; emerc + (gmerc-l7-pris) ;; mercneric + (tex-lcom-pris) ;; tex (merc-lcom-pris) ;; merc (emerc-lcom-pris) ;; emerc @@ -320,6 +396,16 @@ for example: tie-s-l1-tfrag (emerc-l5-pris2) ;; emerc (gmerc-l5-pris2) ;; mercneric + (tex-l6-pris2) ;; tex + (merc-l6-pris2) ;; merc + (emerc-l6-pris2) ;; emerc + (gmerc-l6-pris2) ;; mercneric + + (tex-l7-pris2) ;; tex + (merc-l7-pris2) ;; merc + (emerc-l7-pris2) ;; emerc + (gmerc-l7-pris2) ;; mercneric + (tex-lcom-pris2) ;; tex (merc-lcom-pris2) ;; merc (emerc-lcom-pris2) ;; emerc @@ -329,75 +415,95 @@ for example: tie-s-l1-tfrag (merc-l0-water) ;; merc (gmerc-l0-water) ;; mercneric (tfrag-w-l0-water) ;; tfrag - (tie-w-l0-water) - (etie-w-l0-water) - (tie-sw-l0-water) + (tie-w-l0-water) + (etie-w-l0-water) + (tie-sw-l0-water) (tfrag-ws-l0-water) ;; tfrag - (etie-sw-l0-water) + (etie-sw-l0-water) (tex-l1-water) ;; tex (merc-l1-water) ;; merc (gmerc-l1-water) ;; mercneric (tfrag-w-l1-water) ;; tfrag - (tie-w-l1-water) - (etie-w-l1-water) - (tie-sw-l1-water) + (tie-w-l1-water) + (etie-w-l1-water) + (tie-sw-l1-water) (tfrag-ws-l1-water) ;; tfrag - (etie-sw-l1-water) + (etie-sw-l1-water) (tex-l2-water) ;; tex (merc-l2-water) ;; merc (gmerc-l2-water) ;; mercneric (tfrag-w-l2-water) ;; tfrag - (tie-w-l2-water) - (etie-w-l2-water) - (tie-sw-l2-water) + (tie-w-l2-water) + (etie-w-l2-water) + (tie-sw-l2-water) (tfrag-ws-l2-water) ;; tfrag - (tie-esw-l2-water) + (tie-esw-l2-water) (tex-l3-water) ;; tex (merc-l3-water) ;; merc (gmerc-l3-water) ;; mercneric (tfrag-w-l3-water) ;; tfrag - (tie-w-l3-water) - (etie-w-l3-water) - (tie-sw-l3-water) + (tie-w-l3-water) + (etie-w-l3-water) + (tie-sw-l3-water) (tfrag-ws-l3-water) ;; tfrag - (etie-sw-l3-water) + (etie-sw-l3-water) (tex-l4-water) ;; tex (merc-l4-water) ;; merc (gmerc-l4-water) ;; mercneric (tfrag-w-l4-water) ;; tfrag - (tie-w-l4-water) - (etie-w-l4-water) - (tie-sw-l4-water) + (tie-w-l4-water) + (etie-w-l4-water) + (tie-sw-l4-water) (tfrag-ws-l4-water) ;; tfrag - (etie-sw-l4-water) + (etie-sw-l4-water) (tex-l5-water) ;; tex (merc-l5-water) ;; merc (gmerc-l5-water) ;; mercneric (tfrag-w-l5-water) ;; tfrag - (tie-w-l5-water) - (etie-w-l5-water) - (tie-sw-l5-water) + (tie-w-l5-water) + (etie-w-l5-water) + (tie-sw-l5-water) (tfrag-ws-l5-water) ;; tfrag - (etie-sw-l5-water) + (etie-sw-l5-water) + + (tex-l6-water) ;; tex + (merc-l6-water) ;; merc + (gmerc-l6-water) ;; mercneric + (tfrag-w-l6-water) ;; tfrag + (tie-w-l6-water) + (etie-w-l6-water) + (tie-sw-l6-water) + (tfrag-ws-l6-water) ;; tfrag + (etie-sw-l6-water) + + (tex-l7-water) ;; tex + (merc-l7-water) ;; merc + (gmerc-l7-water) ;; mercneric + (tfrag-w-l7-water) ;; tfrag + (tie-w-l7-water) + (etie-w-l7-water) + (tie-sw-l7-water) + (tfrag-ws-l7-water) ;; tfrag + (etie-sw-l7-water) (tex-lcom-water) ;; tex (merc-lcom-water) ;; merc (gmerc-lcom-water) ;; mercneric - (tex-lcom-sky-post) + (tex-lcom-sky-post) (ocean-near) ;; ocean - (depth-cue) ;; depth-cue + (bucket-311) ;; depth-cue - (tex-all-sprite) + (tex-all-sprite) (particles) ;; particles - (shadow2) ;; shadow - (effects) ;; effects + (bucket-314) ;; shadow + (bucket-315) ;; effects (tex-all-warp) ;; tex (gmerc-warp) ;; mercneric diff --git a/goal_src/jak2/engine/level/level-h.gc b/goal_src/jak2/engine/level/level-h.gc index b53a27a35b..cadcd6f9f6 100644 --- a/goal_src/jak2/engine/level/level-h.gc +++ b/goal_src/jak2/engine/level/level-h.gc @@ -396,12 +396,14 @@ (level3 level :inline :offset 15952) (level4 level :inline :offset 21184) (level5 level :inline :offset 26416) - (default-level level :inline :offset 31648) + (level6 level :inline :offset 31648) + (level7 level :inline :offset 36880) + (default-level level :inline :offset 42112) (pad2 uint8 4) ) :method-count-assert 31 - :size-assert #x9014 - :flag-assert #x1f00009014 + ;:size-assert #x9014 + ;:flag-assert #x1f00009014 (:methods (level-get (_type_ symbol) level 9) (level-get-with-status (_type_ symbol) level 10) @@ -507,6 +509,28 @@ :linking #f :level-type #f ) + :level6 (new 'static 'level + :name #f + :index 6 + :status 'inactive + :borrow-level (new 'static 'array level 2 #f #f) + :borrow-from-level #f + :inside-boxes #f + :force-inside? #f + :linking #f + :level-type #f + ) + :level7 (new 'static 'level + :name #f + :index 7 + :status 'inactive + :borrow-level (new 'static 'array level 2 #f #f) + :borrow-from-level #f + :inside-boxes #f + :force-inside? #f + :linking #f + :level-type #f + ) :default-level (new 'static 'level :name 'default :index LEVEL_MAX diff --git a/goal_src/jak2/engine/level/level.gc b/goal_src/jak2/engine/level/level.gc index 9f2be79872..a259af45f1 100644 --- a/goal_src/jak2/engine/level/level.gc +++ b/goal_src/jak2/engine/level/level.gc @@ -24,7 +24,7 @@ into 7 sections, which might explain the weird sizes in the center. (define-extern level-update-after-load (function level login-state level)) (define-extern *level-type-list* type) -(defglobalconstant NUM_LEVEL_PAGES 146) +(defglobalconstant NUM_LEVEL_PAGES (+ 146 25 25 25 25)) (defglobalconstant LEVEL_PAGE_SIZE_KB 126) ;; original value (defglobalconstant LEVEL_PAGE_SIZE (* LEVEL_PAGE_SIZE_KB 1024)) ;; original value @@ -894,6 +894,16 @@ into 7 sections, which might explain the weird sizes in the center. (set! bits-to-use #b001100) (goto cfg-83) ) + (when (memory-unused? *level* #b11000000) + (set! offset-in-level-heap (+ 24 24 25 25 24 24)) + (set! bits-to-use #b11000000) + (goto cfg-83) + ) + (when (memory-unused? *level* #b1100000000) + (set! offset-in-level-heap (+ 24 24 25 25 24 24 25 25)) + (set! bits-to-use #b1100000000) + (goto cfg-83) + ) ) (((load-buffer-mode small-edge)) ;; check one side @@ -907,6 +917,16 @@ into 7 sections, which might explain the weird sizes in the center. (set! bits-to-use #b110000) (goto cfg-83) ) + (when (memory-unused? *level* #b11000000) + (set! offset-in-level-heap (+ 24 24 25 25 24 24)) + (set! bits-to-use #b11000000) + (goto cfg-83) + ) + (when (memory-unused? *level* #b1100000000) + (set! offset-in-level-heap (+ 24 24 25 25 24 24 25 25)) + (set! bits-to-use #b1100000000) + (goto cfg-83) + ) ) ) (set! bits-to-use 0) @@ -1519,7 +1539,6 @@ into 7 sections, which might explain the weird sizes in the center. ;; copy data from entities to permanent storage (copy-perms-from-level! *game-info* obj) - ;; tell target (send-event *target* 'level-deactivate (-> obj name)) diff --git a/goal_src/jak2/engine/ui/progress/progress-draw.gc b/goal_src/jak2/engine/ui/progress/progress-draw.gc index c4a2d44fa7..bab27be874 100644 --- a/goal_src/jak2/engine/ui/progress/progress-draw.gc +++ b/goal_src/jak2/engine/ui/progress/progress-draw.gc @@ -6494,7 +6494,7 @@ (a1-3 s5-0) (a2-3 #f) (a3-1 44) - (t0-1 320) + (t0-1 (bucket-id progress)) ) (sv-144 a0-15 a1-3 a2-3 a3-1 (the-as bucket-id t0-1)) ) @@ -6625,7 +6625,7 @@ (a1-21 s5-0) (a2-18 #f) (a3-8 44) - (t0-4 320) + (t0-4 (bucket-id progress)) ) (sv-224 a0-81 a1-21 a2-18 a3-8 (the-as bucket-id t0-4)) )