mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-05-31 09:22:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

jak2: fill out names for text-id enum (#2640)

Browse Source
This commit is contained in:
Hat Kid
2023-05-17 01:48:44 +02:00
committed by GitHub
parent 0dccd048ef
commit ebc90d57ed
36 changed files with 4422 additions and 2768 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak2/all-types.gc
+341 -171
View File
@@ -6716,21 +6716,20 @@
(text-xfd #x00fd)
(text-xfe #x00fe)
(text-xff #x00ff)
(text-x100 #x0100)
(quit #x0100)
(pause #x101)
(text-x102 #x0102)
(text-x103 #x0103)
(text-x104 #x0104)
(text-x105 #x0105)
(text-x106 #x0106)
(text-x107 #x0107)
(progress-sound-subtitle-language #x0102)
(progress-sound-format #x0103)
(progress-sound-mono #x0104)
(progress-sound-stereo #x0105)
(progress-sound-surround #x0106)
(progress-sound-sfx-volume #x0107)
(progress-sound-music-volume #x108)
(progress-sound-speech-volume #x109)
(text-x109 #x0109)
(text-x10a #x010a)
(text-x10b #x010b)
(text-x10c #x010c)
(text-x10d #x010d)
(progress-sound-language #x010a)
(progress-vibration #x010b)
(progress-play-hints #x010c)
(progress-center-screen #x010d)
(progress-on #x10e)
(progress-off #x10f)
(progress-move-dpad #x110)
@@ -6762,7 +6761,7 @@
(progress-title-prompt #x132)
(progress-quit #x133)
(progress-root-show-map #x134)
(text-x135 #x0135)
(progress-select-start #x0135)
(progress-root-highscores #x136)
(progress-highscores-1st #x137)
(progress-highscores-2nd #x138)
@@ -6774,10 +6773,10 @@
(progress-highscores-8th #x13e)
(progress-root-secrets #x153)
(progress-secrets-unlocked #x154)
(text-x155 #x0155)
(text-x156 #x0156)
(text-x157 #x0157)
(text-x158 #x0158)
(progress-secrets-toggle-beard #x0155)
(progress-secrets-hflip-screen #x0156)
(progress-secrets-endless-ammo #x0157)
(progress-secrets-invulnerable #x0158)
(progress-main-secrets-hero-mode #x159)
(progress-main-secrets-sceneplayer-1 #x15a)
(progress-main-secrets-sceneplayer-2 #x15b)
@@ -6786,48 +6785,47 @@
(progress-main-secrets-mega-scrapbook #x15e)
(progress-main-secrets-scrapbook-3 #x15f)
(progress-main-secrets-levelselect #x160)
(text-x161 #x0161)
(text-x162 #x0162)
(text-x163 #x0163)
(text-x164 #x0164)
(text-x165 #x0165)
(text-x166 #x0166)
(text-x167 #x0167)
(progress-secrets-endless-dark #x0161)
(progress-highscores-gungame-blue #x0162)
(progress-highscores-gungame-dark #x0163)
(progress-highscores-reverse-races #x0164)
(progress-secrets-big-head #x0165)
(progress-secrets-small-head #x0166)
(progress-secrets-orbs-available #x0167)
(progress-secrets-orb-label #x168)
(progress-root-missions #x169)
(text-x16a #x016a)
(text-x16b #x016b)
(text-x16c #x016c)
(text-x16d #x016d)
(progress-select-pre-start #x016a)
(progress-select-kiosk-start #x016b)
(progress-select-scene #x016c)
(progress-subtitles #x016d)
(progress-root-restart-mission #x16e)
(progress-missions-icon-todo #x16f)
(progress-missions-icon-completed #x170)
(progress-missions-none #x171)
(progress-unknown-game #x172)
(text-x173 #x0173)
(text-x174 #x0174)
(text-x175 #x0175)
(text-x176 #x0176)
(text-x177 #x0177)
(text-x178 #x0178)
(progress-restart-quit #x0173)
(progress-purchase #x0174)
(race-you-win #x0175)
(race-you-lose #x0176)
(race-total-time #x0177)
(race-lap #x0178)
(progress-unknown-square-to-reset #x179)
(race-unknown #x017b)
(progress-unknown-oi1un23i13 #x17c)
(progress-unknown-kjanskd #x17d)
(progress-x-to-continue #x017b)
(progress-missions-completed #x17c)
(progress-missions-in-progress #x17d)
(progress-unknown-retry? #x17e)
(progress-secrets-go-to-title-screen #x17f)
(text-x180 #x0180)
(text-x181 #x0181)
(text-x182 #x0182)
(text-x183 #x0183)
(text-x184 #x0184)
(text-x185 #x0185)
(text-x186 #x0186)
(text-x187 #x0187)
(text-x188 #x0188)
(text-x189 #x0189)
(text-x18a #x018a)
(text-x18b #x018b)
(yes-no-prompt #x0180)
(press-triangle-to-talk #x0181)
(press-triangle-to-use #x0182)
(press-triangle-to-warp #x0183)
(select-level-with-dpad #x0184)
(press-triangle-to-exit #x0185)
(press-triangle-to-play #x0186)
(play-again? #x0187)
(task-completed #x0188)
(mission-failed #x0189)
(try-again? #x018a)
(progress-graphics-60hz-change-notice #x18b)
(progress-graphics-progressivescan-change-notice #x18c)
(progress-graphics-progressivescan-warning-1 #x18d)
@@ -6846,10 +6844,10 @@
(progress-memcard-insert-card-with-jak2 #x19c)
(progress-memcard-insert-card-with-space-to-save #x19d)
(progress-memcard-formatting-required-notice #x19e)
(text-x19f #x19f)
(progress-memcard-saving-data #x19f)
(progress-memcard-loading-data #x1a0)
(text-x1a1 #x01a1)
(text-x1a2 #x01a2)
(progress-memcard-formatting #x01a1)
(progress-memcard-creating-save-data #x01a2)
(progress-memcard-dont-remove #x1a3)
(progress-memcard-overwrite-warning #x1a4)
(progress-memcard-overwrite-confirm #x1a5)
@@ -6857,8 +6855,8 @@
(progress-memcard-continue? #x1a7)
(progress-memcard-go-back? #x1a8)
(progress-memcard-error-while-saving #x1aa)
(text-x1ab #x01ab)
(text-x1ac #x01ac)
(progress-memcard-format-error #x01ab)
(progress-memcard-error-creating-save #x01ac)
(progress-memcard-check #x1ad)
(progress-memcard-check-and-try-again #x1ae)
(progress-memcard-was-removed #x1af)
@@ -6868,100 +6866,99 @@
(progress-memcard-create-jak2-file? #x1b3)
(progress-autosave-explanation #x1b4)
(progress-autosave-dont-remove #x1b5)
(text-x1b6 #x01b6)
(text-x1b7 #x01b7)
(text-x1b8 #x01b8)
(text-x1b9 #x01b9)
(text-x1ba #x01ba)
(text-x1bb #x01bb)
(text-x1bc #x01bc)
(text-x1bd #x01bd)
(text-x1be #x01be)
(text-x1bf #x01bf)
(text-x1c0 #x01c0)
(text-x1c1 #x01c1)
(text-x1c2 #x01c2)
(text-x1c3 #x01c3)
(text-x1c4 #x01c4)
(text-x1c5 #x01c5)
(text-x1c6 #x01c6)
(text-x1c7 #x01c7)
(text-x1c8 #x01c8)
(text-x1c9 #x01c9)
(text-x1ca #x01ca)
(text-x1cb #x01cb)
(text-x1cc #x01cc)
(text-x1cd #x01cd)
(text-x1ce #x01ce)
(text-x1cf #x01cf)
(text-x1d0 #x01d0)
(text-x1d1 #x01d1)
(text-x1d2 #x01d2)
(text-x1d3 #x01d3)
(text-x1d4 #x01d4)
(text-x1d5 #x01d5)
(text-x1d6 #x01d6)
(text-x1d7 #x01d7)
(text-x1d8 #x01d8)
(text-x1d9 #x01d9)
(text-x1da #x01da)
(text-x1db #x01db)
(text-x1dc #x01dc)
(text-x1dd #x01dd)
(text-x1de #x01de)
(text-x1df #x01df)
(text-x1e0 #x01e0)
(text-x1e1 #x01e1)
(text-x1e2 #x01e2)
(text-x1e3 #x01e3)
(text-x1e4 #x01e4)
(text-x1e5 #x01e5)
(text-x1e6 #x01e6)
(text-x1e7 #x01e7)
(text-x1e8 #x01e8)
(text-x1e9 #x01e9)
(text-x1ea #x01ea)
(text-x1eb #x01eb)
(text-x1ec #x01ec)
(text-x1ed #x01ed)
(text-x1ee #x01ee)
(text-x1ef #x01ef)
(text-x1f0 #x01f0)
(text-x1f1 #x01f1)
(text-x1f2 #x01f2)
(text-x1f3 #x01f3)
(text-x1f4 #x01f4)
(text-x1f5 #x01f5)
(text-x1f6 #x01f6)
(text-x1f7 #x01f7)
(text-x1f8 #x01f8)
(text-x1f9 #x01f9)
(text-x1fa #x01fa)
(text-x1fb #x01fb)
(text-x1fc #x01fc)
(text-x1fd #x01fd)
(text-x1fe #x01fe)
(text-x1ff #x01ff)
(text-x200 #x0200)
(text-x201 #x0201)
(text-x202 #x0202)
(text-x203 #x0203)
(text-x204 #x0204)
(text-x205 #x0205)
(text-x206 #x0206)
(text-x207 #x0207)
(text-x208 #x0208)
(text-x209 #x0209)
(text-x20a #x020a)
(text-x20b #x020b)
(text-x20c #x020c)
(text-x20d #x020d)
(text-x20e #x020e)
(text-x20f #x020f)
(text-x210 #x0210)
(text-x211 #x0211)
(text-x212 #x0212)
(text-x213 #x0213)
(progress-missions-fortress-escape #x01b6)
(progress-missions-city-save-kid #x01b7)
(progress-missions-ruins-tower #x01b8)
(progress-missions-atoll-water #x01b9)
(progress-missions-fortress-dump #x01ba)
(progress-missions-city-krew-delivery #x01bb)
(progress-missions-city-red-gun-training #x01bc)
(progress-missions-atoll-sig #x01bd)
(progress-missions-sewer-enemy #x01be)
(progress-missions-city-get-yellow-gun #x01bf)
(progress-missions-strip-rescue #x01c0)
(progress-missions-city-keira-delivery #x01c1)
(progress-missions-city-yellow-gun-training #x01c2)
(progress-missions-drill-eggs #x01c3)
(progress-missions-atoll-battle #x01c4)
(progress-missions-city-krew-collection #x01c5)
(progress-missions-stadium-board1 #x01c6)
(progress-missions-mountain-lens #x01c7)
(progress-missions-mountain-shard #x01c8)
(progress-missions-mountain-gear #x01c9)
(progress-missions-city-power #x01ca)
(progress-missions-palace-cable #x01cb)
(progress-missions-palace-boss #x01cc)
(progress-missions-city-shuttle #x01cd)
(progress-missions-ruins-enemy #x01ce)
(progress-missions-forest-scouts #x01cf)
(progress-missions-city-escort-kid #x01d0)
(progress-missions-city-meet-brutter #x01d1)
(progress-missions-city-port-run #x01d2)
(progress-missions-city-intercept-tanker #x01d3)
(progress-missions-dig-knock-down #x01d4)
(progress-missions-strip-grenade #x01d5)
(progress-missions-sewer-board #x01d6)
(progress-missions-drill-ship #x01d7)
(progress-missions-dig-rescue-lurkers #x01d8)
(progress-missions-forest-hunt #x01d9)
(progress-missions-stadium-race-class3 #x01da)
(progress-missions-dig-find-totem #x01db)
(progress-missions-city-protect-water-slums #x01dc)
(progress-missions-city-destroy-guard-vehicles #x01dd)
(progress-missions-onin-game #x01de)
(progress-missions-canyon-insert-items #x01df)
(progress-missions-tomb-face-tests #x01e0)
(progress-missions-tomb-open-door #x01e1)
(progress-missions-tomb-poles #x01e2)
(progress-missions-tomb-water #x01e3)
(progress-missions-tomb-boss #x01e4)
(progress-missions-fortress-save-friends #x01e5)
(progress-missions-sewer-escort #x01e6)
(progress-missions-city-get-dark-gun #x01e7)
(progress-missions-stadium-race-class2 #x01e8)
(progress-missions-city-stop-bomb-bots #x01e9)
(progress-missions-explore-consite #x01ea)
(progress-missions-climb-consite #x01eb)
(progress-missions-city-errol-challenge #x01ec)
(progress-missions-strip-drop #x01ed)
(progress-missions-ruins-mech #x01ee)
(progress-missions-deliver-life-seed #x01ef)
(progress-missions-forest-protect #x01f0)
(progress-missions-drill-mech #x01f1)
(progress-missions-stadium-race-class1 #x01f2)
(progress-missions-palace-sneak-in #x01f3)
(progress-missions-castle-break-in #x01f4)
(progress-missions-castle-boss #x01f5)
(progress-missions-city-whack #x01f6)
(progress-missions-under-find-sig #x01f7)
(progress-missions-under-escort-sig #x01f8)
(progress-missions-city-defend-stadium #x01f9)
(progress-missions-protect-balloon #x01fa)
(progress-missions-under-destroy-tunnels #x01fb)
(progress-missions-nest-enter #x01fc)
(progress-missions-consite-find-baron #x01fd)
(progress-missions-nest-get-to-gun #x01fe)
(progress-missions-nest-boss #x01ff)
(progress-missions-talk-to-kor #x0200)
(progress-missions-talk-to-torn #x0201)
(progress-missions-talk-to-krew #x0202)
(progress-missions-talk-to-onin #x0203)
(progress-missions-talk-to-vin #x0204)
(progress-missions-talk-to-shadow #x0205)
(progress-missions-talk-to-sig #x0206)
(progress-missions-talk-to-mechanic #x0207)
(progress-missions-talk-to-keira #x0208)
(progress-missions-talk-to-brutter #x0209)
(progress-missions-check-bazaar #x020a)
(progress-missions-check-water-slums #x020b)
(progress-missions-go-to-canyon #x020c)
(progress-missions-go-to-tomb #x020d)
(progress-missions-beat-whack #x020e)
(progress-missions-defend-port-wall #x020f)
(progress-missions-check-consite #x0210)
(progress-missions-nest-attack #x0211)
(progress-missions-go-to-oracle #x0212)
(progress-locations-haven-city #x213)
(progress-locations-fortress #x214)
(progress-locations-landing-pad #x215)
@@ -7012,32 +7009,205 @@
(board-score-activate-judge #x0242)
(board-score-try-again #x0243) ;; TODO only for board?
(board-score-return-to-garage #x0244)
(text-x245 #x0245)
(text-x246 #x0246)
(text-x247 #x0247)
(text-x248 #x0248)
(text-x249 #x0249)
(text-x24a #x024a)
(text-x24b #x024b)
(text-x24c #x024c)
(text-x24d #x024d)
(text-x24e #x024e)
(text-x24f #x024f)
(mission-complete-return-to-krew #x0245)
(tutorial-hover-zones #x0246)
(tutorial-dive #x0247)
(tutorial-turbo-or-jump #x0248)
(tutorial-mech-punch #x0249)
(tutorial-mech-carry #x024a)
(tutorial-mech-throw #x024b)
(tutorial-ramp #x024c)
(tutorial-grind #x024d)
(tutorial-unknown #x024e)
(atoll-unknown #x024f)
(strip-unknown #x250)
(watch-trailer #x251)
(tutorial-board-get-on #x252)
(tutorial-dark #x253)
(scea-splash #x254)
(scee-splash #x255)
(scek-splash #x256)
(scei-splash #x257)
(a-game-by #x258)
(jak2 #x259)
(two-years-later #x25a)
(one-week-later #x25b)
(gun-upgrade-acquired #x25c)
(red-gun-acquired #x25d)
(yellow-gun-acquired #x25e)
(blue-gun-acquired #x25f)
(dark-gun-acquired #x260)
(gun-upgrade-speed #x261)
(gun-upgrade-ammo #x262)
(gun-upgrade-damage #x263)
(mission-complete #x264)
(pass-red-acquired #x265)
(pass-green-acquired #x266)
(pass-yellow-acquired #x267)
(pass-palace-acquired #x268)
(pass-black-acquired #x269)
(mountain-lens-acquired #x26a)
(mountain-gear-acquired #x26b)
(mountain-shard-acquired #x26c)
(oracle-gem-grind-25 #x26d)
(oracle-gem-grind-200 #x26e)
(oracle-gem-grind1-25 #x26f)
(oracle-gem-grind1-200 #x270)
(oracle-gem-grind2-200 #x271)
(oracle-gem-grind-100 #x272)
(oracle-tutorial-dark-bomb #x0273)
(oracle-tutorial-dark-blast #x0274)
(oracle-tutorial-dark-invincible #x0275)
(oracle-tutorial-dark-giant #x0276)
(text-x277 #x0277)
(text-x278 #x0278)
(text-x27a #x027a)
(text-x27b #x027b)
(text-x27c #x027c)
(text-x27d #x027d)
(text-x27e #x027e)
(text-x27f #x027f)
(miss #x0277)
(select-event #x0278)
(skate-park #x0279)
(race-class3 #x027a)
(race-class2 #x027b)
(race-class1 #x027c)
(reverse-race-class3 #x027d)
(reverse-race-class2 #x027e)
(reverse-race-class1 #x027f)
(scene-daxter-gets-a-mouthful #x280)
(scene-ruins-tower-intro #x281)
(scene-ruins-tower-victory #x282)
(scene-ruins-sacred-intro #x283)
(scene-ruins-sacred-victory #x284)
(scene-get-to-hut-res #x285)
(scene-vin-rescue-intro #x286)
(scene-vin-rescue #x287)
(scene-crane-intro #x288)
(scene-crane-victory #x289)
(scene-ecowells-intro #x28a)
(scene-ecowells-victory #x28b)
(scene-city-help-kid-intro #x28c)
(scene-city-help-kid-resolution #x28d)
(scene-city-destroy-guard-vehicles-intro #x28e)
(scene-city-krew-delivery-intro #x28f)
(scene-krew-delivery-res #x290)
(scene-city-intercept-tanker-intro #x291)
(scene-city-intercept-tanker-res #x292)
(scene-city-switch-on-power-intro #x293)
(scene-city-keira-hover-challenge-intro #x294)
(scene-city-keira-hover-challenge-res #x295)
(scene-city-class-3-race-intro #x296)
(scene-city-class-3-race-res #x297)
(scene-city-class-2-race-intro #x298)
(scene-city-class-2-race-res #x299)
(scene-city-class-1-race-intro-a #x29a)
(scene-city-class-1-race-intro-b #x29b)
(scene-city-class-1-race-res #x29c)
(scene-city-oracle-intro #x29d)
(scene-city-oracle-level-0 #x29e)
(scene-city-oracle-level-1 #x29f)
(scene-city-oracle-level-2 #x2a0)
(scene-city-oracle-level-3 #x2a1)
(scene-city-krew-collection-intro #x2a2)
(scene-city-krew-collection-res #x2a3)
(scene-city-escort-kid-intro #x2a4)
(scene-city-meet-brutter-intro #x2a5)
(scene-city-meet-brutter-res #x2a6)
(scene-city-keira-delivery-intro #x2a7)
(scene-city-shuttle-underground-intro #x2a8)
(scene-city-play-onin-game-intro #x2a9)
(scene-city-play-onin-game-res #x2aa)
(scene-city-save-lurkers-intro #x2ab)
(scene-city-stop-bomb-bots-intro #x2ac)
(scene-city-errol-challenge-intro #x2ad)
(scene-city-whack-a-metal-intro #x2ae)
(scene-city-whack-a-metal-res #x2af)
(scene-city-defend-stadium-intro #x2b0)
(scene-city-defend-stadium-res #x2b1)
(scene-city-get-yellow-gun #x2b2)
(scene-city-get-hoverboard #x2b3)
(scene-city-put-hoverboard #x2b4)
(scene-city-get-dark-gun #x2b5)
(scene-city-air-train-in-caspad #x2b6)
(scene-nest-visit #x2b7) ;; unused
(scene-city-air-train-out #x2b8)
(scene-city-ashelin-drop-off #x2b9)
(scene-city-protect-slums-intro #x2ba)
(scene-city-errol-challenge-res #x2bb)
(scene-fortress-2-intro #x2bc)
(scene-fortress-blow-up-ammo-res-a #x2bd)
(scene-fortress-blow-up-ammo-res-b #x2be)
(scene-fortress-save-friends-intro-a #x2bf)
(scene-fortress-save-friends-res #x2c0)
(scene-sewer-1-intro #x2c1)
(scene-sewer-1-res #x2c2)
(scene-sewer-2-intro #x2c3)
(scene-sewer-drain-res #x2c4)
(scene-sewer-blow-up-statue-intro #x2c5)
(scene-sewer-blow-up-statue-res #x2c6)
(scene-sewer-hosehead #x2c7)
(scene-atoll-1-int #x2c8)
(scene-atoll-1-res #x2c9)
(scene-atoll-2-intro #x2ca)
(scene-atoll-3-intro #x2cb)
(scene-atoll-save-ashelin-res-a #x2cc)
(scene-atoll-save-ashelin-res-b #x2cd)
(scene-atoll-sig-intro #x2ce)
(scene-atoll-sig-tank #x2cf)
(scene-atoll-sniper-a #x2d0)
(scene-atoll-sniper-b #x2d1)
(scene-atoll-sniper-c #x2d2)
(scene-atoll-sniper-d #x2d3)
(scene-atoll-sniper-e #x2d4)
(scene-drill-kill-metal-heads-intro #x2d5)
(scene-drill-destroy-ship-intro #x2d6)
(scene-city-destroy-control-tower-intro #x2d7)
(scene-drill-top-explode #x2d8)
(scene-mountain-finditems-intro #x2d9)
(scene-mountain-gear-res #x2da)
(scene-mountain-shard-res #x2db)
(scene-mountain-lens-res #x2dc)
(scene-palace-outside-window-res #x2dd)
(scene-palace-outside-window-res-b #x2de)
(scene-palace-boss-res #x2df)
(scene-palace-sneak-in-res #x2e0)
(scene-consite-find-baron-res #x2e1)
(scene-castle-krew-boss-fight-intro #x2e2)
(scene-castle-krew-boss-fight-res #x2e3)
(scene-caspad-air-train-in #x2e4)
(scene-caspad-air-train-out #x2e5)
(scene-tomb-face-tests-intro #x2e6)
(scene-tomb-open-door-res #x2e7) ;; unused
(scene-tomb-open-door-res-2 #x2e8) ;; unused
(scene-tomb-unlock-start #x2e9)
(scene-tomb-unlock-water #x2ea)
(scene-tomb-unlock-poles #x2eb)
(scene-tomb-boss-open #x2ec)
(scene-tomb-boss-intro #x2ed)
(scene-tomb-boss-res #x2ee)
(scene-tomb-boulder-start #x2ef)
(scene-tomb-spider-scare #x2f0)
(scene-forest-catch-metal-heads-intro #x2f1)
(scene-forest-hunt-camo-metal-heads-intro #x2f2)
(scene-forest-protect-samos-intro-a #x2f3)
(scene-forest-protect-samos-intro-b #x2f4)
(scene-forest-protect-samos-res #x2f5)
(scene-dig-knock-down-scaffolding-intro #x2f6)
(scene-save-more-lurkers #x2f7) ;; unused
(scene-dig-find-totem-intro #x2f8)
(scene-dig-find-totem-res #x2f9)
(scene-dig-digger-explode #x2fa)
(scene-canyon-insert-items-res #x2fb)
(scene-canyon-insert-items-intro #x2fc)
(scene-under-find-sig-res #x2fd)
(scene-under-centipede-one #x2fe)
(scene-under-centipede-two #x2ff)
(scene-under-centipede-three #x300)
(scene-under-get-sig-out-res #x301)
(scene-nest-break-barrier-res #x302)
(scene-nest-air-train-out #x303)
(scene-nest-air-train-in #x304)
(scene-nest-boss-mid #x305)
(scene-nest-boss-intro #x306)
(scene-intro #x307)
(scene-outro #x308)
(scene-subtitles-enabled #x30d)
(scene-subtitles-disabled #x30e)
(text-x30f #x30f)
(board-name #x30f)
(progress-unknown-continue #x310)
)
;; ---text-id-h:text-id
@@ -22284,8 +22454,8 @@
(deftype secret-item-option (menu-option)
((cost int32 :offset-assert 48)
(can-toggle symbol :offset-assert 52)
(flag uint32 :offset-assert 56)
(avail-after uint16 :offset-assert 60)
(flag game-secrets :offset-assert 56)
(avail-after game-task-node :offset-assert 60)
)
:method-count-assert 12
:size-assert #x3e
@@ -30679,7 +30849,7 @@
(info object :offset-assert 12)
(info-str string :offset 12)
(info-list pair :offset 12) ;; a list of strings
(text uint32 :offset-assert 16)
(text text-id :offset-assert 16)
)
:method-count-assert 9
:size-assert #x14
goal_src/jak2/engine/game/game-save.gc
+7 -1
View File
@@ -1677,7 +1677,13 @@
)
(set! (-> gp-1 flags) (font-flags shadow kerning middle left large))
(when (and (>= 1 (-> *game-info* auto-save-count)) (-> self next-state) (= (-> self next-state name) 'save))
(print-game-text (lookup-text! *common-text* (text-id text-x19f) #f) gp-1 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id progress-memcard-saving-data) #f)
gp-1
#f
44
(bucket-id progress)
)
(set! (-> gp-1 origin x) 20.0)
(set! (-> gp-1 origin y) 130.0)
(let ((v1-30 gp-1))
goal_src/jak2/engine/game/task/game-task.gc
+269 -269
View File
File diff suppressed because it is too large Load Diff
goal_src/jak2/engine/game/task/task-control.gc
+2 -2
View File
@@ -1447,14 +1447,14 @@
(set! (-> v1-17 height) (the float 95))
)
(let ((s5-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x18a) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id try-again?) #f) 1)
(s5-1 *temp-string* gp-0 #f 44 (bucket-id progress))
)
(let ((v1-19 gp-0))
(set! (-> v1-19 height) (the float 155))
)
(let ((s5-2 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x180) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id yes-no-prompt) #f) 1)
(s5-2 *temp-string* gp-0 #f 44 (bucket-id progress))
)
)
goal_src/jak2/engine/process-drawable/process-taskable.gc
+1 -1
View File
@@ -412,7 +412,7 @@ Seen take in - `true-func` which takes no args TODO - seems fishy
(defmethod process-taskable-method-32 process-taskable ((obj process-taskable))
(logior! (-> obj skel status) (joint-control-status eye-anim))
(set! (-> obj talk-message) (text-id text-x181))
(set! (-> obj talk-message) (text-id press-triangle-to-talk))
(set! (-> obj bounce-away) #t)
(set! (-> obj will-talk) #t)
(set! (-> obj look-at-me) #t)
goal_src/jak2/engine/target/mech_suit/mech.gc
+10 -12
View File
@@ -172,17 +172,9 @@
(can-display-query? self (the-as string #f) -99.0)
(-> *setting-control* user-current pilot)
)
(let ((gp-0 (new
'stack
'font-context
*font-default-matrix*
32
320
0.0
(font-color default)
(font-flags shadow kerning)
)
)
(let ((gp-0
(new 'stack 'font-context *font-default-matrix* 32 320 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-31 gp-0))
(set! (-> v1-31 width) (the float 340))
@@ -194,7 +186,13 @@
(set! (-> v1-33 scale) 0.9)
)
(set! (-> gp-0 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id text-x182) #f) gp-0 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
gp-0
#f
44
(bucket-id progress)
)
)
(if (and (cpad-pressed? 0 triangle) (send-event *target* 'change-mode 'mech self (-> self shield-value)))
(go-virtual pickup (method-of-object self wait-for-return))
goal_src/jak2/engine/target/target-turret.gc
+7 -1
View File
@@ -978,7 +978,13 @@
(set! (-> v1-23 scale) 0.9)
)
(set! (-> gp-1 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id text-x182) #f) gp-1 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
gp-1
#f
44
(bucket-id progress)
)
)
(when (and (cpad-pressed? 0 triangle) (send-event *target* 'change-mode 'turret self))
(set! (-> self rider) (process->handle *target*))
goal_src/jak2/engine/ui/hud-classes.gc
+10 -20
View File
@@ -9,14 +9,6 @@
(defglobalconstant SKIP_MINIMAP_DRAW #f)
;; WARN: Failed store: (s.w! (+ v1-35 8) 0) at op 135
;; WARN: Failed store: (s.w! (+ v1-35 12) 0) at op 136
;; WARN: Failed store: (s.w! (+ v1-61 8) 0) at op 213
;; WARN: Failed store: (s.w! (+ v1-61 12) 0) at op 214
;; WARN: Failed store: (s.w! (+ v1-86 8) 0) at op 292
;; WARN: Failed store: (s.w! (+ v1-86 12) 0) at op 293
;; WARN: Failed store: (s.w! (+ v1-111 8) 0) at op 371
;; WARN: Failed store: (s.w! (+ v1-111 12) 0) at op 372
(defmethod draw hud-map ((obj hud-map))
(set-hud-piece-position!
(-> obj sprites 1)
@@ -415,11 +407,9 @@
(set! (-> obj values 2 target) (mod (the int (+ 0.5 (-> *target* game eco-pill-dark))) 100))
(set! (-> obj values 3 target) (the-as int (-> *target* fact-override eco-pill-dark-pickup-time)))
(if (and (or (and (zero? (-> obj values 2 target)) (!= (-> *target* game eco-pill-dark) 0.0))
(logtest? (focus-status dark) (-> *target* focus-status))
(focus-test? *target* dark)
)
(and (not (logtest? (focus-status indax) (-> *target* focus-status)))
(-> *setting-control* user-current darkjak)
)
(and (not (focus-test? *target* indax)) (-> *setting-control* user-current darkjak))
)
(set! (-> obj values 2 target) 100)
)
@@ -446,13 +436,13 @@
(defmethod draw hud-skullgem ((obj hud-skullgem))
(set-hud-piece-position!
(the-as hud-sprite (&-> obj stack 2764))
(the-as hud-sprite (-> obj icons 0 pos))
(the int (+ 60.0 (* -130.0 (-> obj offset))))
150
)
(set-as-offset-from!
(the-as hud-sprite (-> obj sprites))
(the-as vector4w (&-> obj stack 2764))
(the-as vector4w (-> obj icons 0 pos))
(if (= (-> *setting-control* user-default aspect-ratio) 'aspect4x3)
-27
-35
@@ -465,7 +455,7 @@
)
)
(format (clear (-> obj strings 0 text)) "~D" (-> obj values 0 current))
(set-as-offset-from! (the-as hud-sprite (-> obj strings 0 pos)) (the-as vector4w (&-> obj stack 2764)) 0 45)
(set-as-offset-from! (the-as hud-sprite (-> obj strings 0 pos)) (the-as vector4w (-> obj icons 0 pos)) 0 45)
((method-of-type hud draw) obj)
0
(none)
@@ -498,13 +488,13 @@
(defmethod draw hud-skill ((obj hud-skill))
(set-hud-piece-position!
(the-as hud-sprite (&-> obj stack 2764))
(the-as hud-sprite (-> obj icons 0 pos))
(the int (+ 60.0 (* -130.0 (-> obj offset))))
270
)
(set-as-offset-from!
(the-as hud-sprite (-> obj sprites))
(the-as vector4w (&-> obj stack 2764))
(the-as vector4w (-> obj icons 0 pos))
(if (= (-> *setting-control* user-default aspect-ratio) 'aspect4x3)
-19
-25
@@ -517,7 +507,7 @@
)
)
(format (clear (-> obj strings 0 text)) "~D" (-> obj values 0 current))
(set-as-offset-from! (the-as hud-sprite (-> obj strings 0 pos)) (the-as vector4w (&-> obj stack 2764)) 0 -5)
(set-as-offset-from! (the-as hud-sprite (-> obj strings 0 pos)) (the-as vector4w (-> obj icons 0 pos)) 0 -5)
(when (not (paused?))
(let ((s5-1 (new 'stack-no-clear 'quaternion)))
(quaternion-axis-angle! s5-1 0.0 1.0 0.0 364.0889)
@@ -766,7 +756,7 @@
(s4-0 (clear (-> obj strings 1 text)))
(s3-0 "~S")
)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x277) #f))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id miss) #f))
(s5-1 s4-0 s3-0 *temp-string*)
)
(set-as-offset-from! (the-as hud-sprite (-> obj strings 0 pos)) (the-as vector4w (-> obj sprites)) 0 -8)
@@ -1048,7 +1038,7 @@
(defmethod update-values hud-gun ((obj hud-gun))
(cond
((logtest? (focus-status gun) (-> *target* focus-status))
((focus-test? *target* gun)
(set! (-> obj values 0 target) (the-as int (-> *target* gun gun-type)))
(set! (-> obj values 1 target) (the int (get-gun-ammo (-> *target* fact-override))))
(logclear! (-> obj flags) (hud-flags disable))
goal_src/jak2/engine/ui/progress/progress-draw.gc
+7 -7
View File
@@ -3671,7 +3671,7 @@
(set! sv-48 0)
(while (< sv-48 s4-0)
(set! sv-64 print-game-text)
(let ((a0-4 (lookup-text! *common-text* (the-as text-id (-> s2-0 sv-48 text)) #f))
(let ((a0-4 (lookup-text! *common-text* (-> s2-0 sv-48 text) #f))
(a1-16 arg1)
(a2-4 #t)
(a3-3 44)
@@ -3684,7 +3684,7 @@
(let ((s0-1 (- s0-0 (the int f28-0)))
(f28-1 (cond
((< (-> arg0 sliding-height) 0.0)
(set! sv-112 (lookup-text! *common-text* (the-as text-id (-> s2-0 s4-0 text)) #f))
(set! sv-112 (lookup-text! *common-text* (-> s2-0 s4-0 text) #f))
0.0
(set! sv-80 print-game-text)
(set! sv-96 format)
@@ -3704,7 +3704,7 @@
)
)
(else
(set! sv-160 (lookup-text! *common-text* (the-as text-id (-> s2-0 (+ s4-0 -1) text)) #f))
(set! sv-160 (lookup-text! *common-text* (-> s2-0 (+ s4-0 -1) text) #f))
0.0
(set! sv-128 print-game-text)
(set! sv-144 format)
@@ -3729,7 +3729,7 @@
(set! (-> arg1 origin y) (the float (+ s0-1 (the int f28-1))))
(while (< s3-0 (length s2-0))
(set! sv-176 print-game-text)
(let* ((a0-14 (lookup-text! *common-text* (the-as text-id (-> s2-0 s3-0 text)) #f))
(let* ((a0-14 (lookup-text! *common-text* (-> s2-0 s3-0 text) #f))
(a1-24 arg1)
(a2-12 #t)
(a3-6 44)
@@ -3756,7 +3756,7 @@
)
)
(set! sv-224 print-game-text)
(let ((a0-23 (lookup-text! *common-text* (the-as text-id (-> s2-0 s3-0 text)) #f))
(let ((a0-23 (lookup-text! *common-text* (-> s2-0 s3-0 text) #f))
(a1-28 arg1)
(a2-16 #f)
(a3-7 44)
@@ -3963,8 +3963,8 @@
)
(set! (-> arg1 alpha) sv-16)
(set! (-> *game-info* mission-list 0) sv-264)
(set! (-> sv-264 description) (text-id progress-unknown-kjanskd))
(set! (-> sv-268 description) (text-id progress-unknown-oi1un23i13))
(set! (-> sv-264 description) (text-id progress-missions-in-progress))
(set! (-> sv-268 description) (text-id progress-missions-completed))
(while (< sv-24 (length (-> *game-info* sub-task-list)))
(let ((v1-26 (find-mission-text-at-index sv-24))
(a0-15 (-> *game-info* mission-list))
goal_src/jak2/engine/ui/progress/progress-h.gc
+9 -9
View File
@@ -73,11 +73,11 @@
(deftype menu-option (basic)
((name text-id :offset-assert 4)
(scale symbol :offset-assert 8)
(unknown function :offset-assert 12)
(box hud-box 1 :inline :offset-assert 16)
(options menu-option 8 :offset 16)
((name text-id :offset-assert 4)
(scale symbol :offset-assert 8)
(unknown function :offset-assert 12)
(box hud-box 1 :inline :offset-assert 16)
(options menu-option 8 :offset 16)
)
:method-count-assert 12
:size-assert #x30
@@ -401,10 +401,10 @@
(deftype secret-item-option (menu-option)
((cost int32 :offset-assert 48)
(can-toggle symbol :offset-assert 52)
(flag uint32 :offset-assert 56)
(avail-after uint16 :offset-assert 60)
((cost int32 :offset-assert 48)
(can-toggle symbol :offset-assert 52)
(flag game-secrets :offset-assert 56)
(avail-after game-task-node :offset-assert 60)
)
:method-count-assert 12
:size-assert #x3e
goal_src/jak2/engine/ui/progress/progress-static.gc
+922 -902
View File
File diff suppressed because it is too large Load Diff
goal_src/jak2/engine/ui/text-id-h.gc
+338 -168
View File
@@ -66,21 +66,20 @@
(text-xfd #x00fd)
(text-xfe #x00fe)
(text-xff #x00ff)
(text-x100 #x0100)
(quit #x0100)
(pause #x101)
(text-x102 #x0102)
(text-x103 #x0103)
(text-x104 #x0104)
(text-x105 #x0105)
(text-x106 #x0106)
(text-x107 #x0107)
(progress-sound-subtitle-language #x0102)
(progress-sound-format #x0103)
(progress-sound-mono #x0104)
(progress-sound-stereo #x0105)
(progress-sound-surround #x0106)
(progress-sound-sfx-volume #x0107)
(progress-sound-music-volume #x108)
(progress-sound-speech-volume #x109)
(text-x109 #x0109)
(text-x10a #x010a)
(text-x10b #x010b)
(text-x10c #x010c)
(text-x10d #x010d)
(progress-sound-language #x010a)
(progress-vibration #x010b)
(progress-play-hints #x010c)
(progress-center-screen #x010d)
(progress-on #x10e)
(progress-off #x10f)
(progress-move-dpad #x110)
@@ -112,7 +111,7 @@
(progress-title-prompt #x132)
(progress-quit #x133)
(progress-root-show-map #x134)
(text-x135 #x0135)
(progress-select-start #x0135)
(progress-root-highscores #x136)
(progress-highscores-1st #x137)
(progress-highscores-2nd #x138)
@@ -124,10 +123,10 @@
(progress-highscores-8th #x13e)
(progress-root-secrets #x153)
(progress-secrets-unlocked #x154)
(text-x155 #x0155)
(text-x156 #x0156)
(text-x157 #x0157)
(text-x158 #x0158)
(progress-secrets-toggle-beard #x0155)
(progress-secrets-hflip-screen #x0156)
(progress-secrets-endless-ammo #x0157)
(progress-secrets-invulnerable #x0158)
(progress-main-secrets-hero-mode #x159)
(progress-main-secrets-sceneplayer-1 #x15a)
(progress-main-secrets-sceneplayer-2 #x15b)
@@ -136,48 +135,47 @@
(progress-main-secrets-mega-scrapbook #x15e)
(progress-main-secrets-scrapbook-3 #x15f)
(progress-main-secrets-levelselect #x160)
(text-x161 #x0161)
(text-x162 #x0162)
(text-x163 #x0163)
(text-x164 #x0164)
(text-x165 #x0165)
(text-x166 #x0166)
(text-x167 #x0167)
(progress-secrets-endless-dark #x0161)
(progress-highscores-gungame-blue #x0162)
(progress-highscores-gungame-dark #x0163)
(progress-highscores-reverse-races #x0164)
(progress-secrets-big-head #x0165)
(progress-secrets-small-head #x0166)
(progress-secrets-orbs-available #x0167)
(progress-secrets-orb-label #x168)
(progress-root-missions #x169)
(text-x16a #x016a)
(text-x16b #x016b)
(text-x16c #x016c)
(text-x16d #x016d)
(progress-select-pre-start #x016a)
(progress-select-kiosk-start #x016b)
(progress-select-scene #x016c)
(progress-subtitles #x016d)
(progress-root-restart-mission #x16e)
(progress-missions-icon-todo #x16f)
(progress-missions-icon-completed #x170)
(progress-missions-none #x171)
(progress-unknown-game #x172)
(text-x173 #x0173)
(text-x174 #x0174)
(text-x175 #x0175)
(text-x176 #x0176)
(text-x177 #x0177)
(text-x178 #x0178)
(progress-restart-quit #x0173)
(progress-purchase #x0174)
(race-you-win #x0175)
(race-you-lose #x0176)
(race-total-time #x0177)
(race-lap #x0178)
(progress-unknown-square-to-reset #x179)
(race-unknown #x017b)
(progress-unknown-oi1un23i13 #x17c)
(progress-unknown-kjanskd #x17d)
(progress-x-to-continue #x017b)
(progress-missions-completed #x17c)
(progress-missions-in-progress #x17d)
(progress-unknown-retry? #x17e)
(progress-secrets-go-to-title-screen #x17f)
(text-x180 #x0180)
(text-x181 #x0181)
(text-x182 #x0182)
(text-x183 #x0183)
(text-x184 #x0184)
(text-x185 #x0185)
(text-x186 #x0186)
(text-x187 #x0187)
(text-x188 #x0188)
(text-x189 #x0189)
(text-x18a #x018a)
(text-x18b #x018b)
(yes-no-prompt #x0180)
(press-triangle-to-talk #x0181)
(press-triangle-to-use #x0182)
(press-triangle-to-warp #x0183)
(select-level-with-dpad #x0184)
(press-triangle-to-exit #x0185)
(press-triangle-to-play #x0186)
(play-again? #x0187)
(task-completed #x0188)
(mission-failed #x0189)
(try-again? #x018a)
(progress-graphics-60hz-change-notice #x18b)
(progress-graphics-progressivescan-change-notice #x18c)
(progress-graphics-progressivescan-warning-1 #x18d)
@@ -196,10 +194,10 @@
(progress-memcard-insert-card-with-jak2 #x19c)
(progress-memcard-insert-card-with-space-to-save #x19d)
(progress-memcard-formatting-required-notice #x19e)
(text-x19f #x19f)
(progress-memcard-saving-data #x19f)
(progress-memcard-loading-data #x1a0)
(text-x1a1 #x01a1)
(text-x1a2 #x01a2)
(progress-memcard-formatting #x01a1)
(progress-memcard-creating-save-data #x01a2)
(progress-memcard-dont-remove #x1a3)
(progress-memcard-overwrite-warning #x1a4)
(progress-memcard-overwrite-confirm #x1a5)
@@ -207,8 +205,8 @@
(progress-memcard-continue? #x1a7)
(progress-memcard-go-back? #x1a8)
(progress-memcard-error-while-saving #x1aa)
(text-x1ab #x01ab)
(text-x1ac #x01ac)
(progress-memcard-format-error #x01ab)
(progress-memcard-error-creating-save #x01ac)
(progress-memcard-check #x1ad)
(progress-memcard-check-and-try-again #x1ae)
(progress-memcard-was-removed #x1af)
@@ -218,100 +216,99 @@
(progress-memcard-create-jak2-file? #x1b3)
(progress-autosave-explanation #x1b4)
(progress-autosave-dont-remove #x1b5)
(text-x1b6 #x01b6)
(text-x1b7 #x01b7)
(text-x1b8 #x01b8)
(text-x1b9 #x01b9)
(text-x1ba #x01ba)
(text-x1bb #x01bb)
(text-x1bc #x01bc)
(text-x1bd #x01bd)
(text-x1be #x01be)
(text-x1bf #x01bf)
(text-x1c0 #x01c0)
(text-x1c1 #x01c1)
(text-x1c2 #x01c2)
(text-x1c3 #x01c3)
(text-x1c4 #x01c4)
(text-x1c5 #x01c5)
(text-x1c6 #x01c6)
(text-x1c7 #x01c7)
(text-x1c8 #x01c8)
(text-x1c9 #x01c9)
(text-x1ca #x01ca)
(text-x1cb #x01cb)
(text-x1cc #x01cc)
(text-x1cd #x01cd)
(text-x1ce #x01ce)
(text-x1cf #x01cf)
(text-x1d0 #x01d0)
(text-x1d1 #x01d1)
(text-x1d2 #x01d2)
(text-x1d3 #x01d3)
(text-x1d4 #x01d4)
(text-x1d5 #x01d5)
(text-x1d6 #x01d6)
(text-x1d7 #x01d7)
(text-x1d8 #x01d8)
(text-x1d9 #x01d9)
(text-x1da #x01da)
(text-x1db #x01db)
(text-x1dc #x01dc)
(text-x1dd #x01dd)
(text-x1de #x01de)
(text-x1df #x01df)
(text-x1e0 #x01e0)
(text-x1e1 #x01e1)
(text-x1e2 #x01e2)
(text-x1e3 #x01e3)
(text-x1e4 #x01e4)
(text-x1e5 #x01e5)
(text-x1e6 #x01e6)
(text-x1e7 #x01e7)
(text-x1e8 #x01e8)
(text-x1e9 #x01e9)
(text-x1ea #x01ea)
(text-x1eb #x01eb)
(text-x1ec #x01ec)
(text-x1ed #x01ed)
(text-x1ee #x01ee)
(text-x1ef #x01ef)
(text-x1f0 #x01f0)
(text-x1f1 #x01f1)
(text-x1f2 #x01f2)
(text-x1f3 #x01f3)
(text-x1f4 #x01f4)
(text-x1f5 #x01f5)
(text-x1f6 #x01f6)
(text-x1f7 #x01f7)
(text-x1f8 #x01f8)
(text-x1f9 #x01f9)
(text-x1fa #x01fa)
(text-x1fb #x01fb)
(text-x1fc #x01fc)
(text-x1fd #x01fd)
(text-x1fe #x01fe)
(text-x1ff #x01ff)
(text-x200 #x0200)
(text-x201 #x0201)
(text-x202 #x0202)
(text-x203 #x0203)
(text-x204 #x0204)
(text-x205 #x0205)
(text-x206 #x0206)
(text-x207 #x0207)
(text-x208 #x0208)
(text-x209 #x0209)
(text-x20a #x020a)
(text-x20b #x020b)
(text-x20c #x020c)
(text-x20d #x020d)
(text-x20e #x020e)
(text-x20f #x020f)
(text-x210 #x0210)
(text-x211 #x0211)
(text-x212 #x0212)
(text-x213 #x0213)
(progress-missions-fortress-escape #x01b6)
(progress-missions-city-save-kid #x01b7)
(progress-missions-ruins-tower #x01b8)
(progress-missions-atoll-water #x01b9)
(progress-missions-fortress-dump #x01ba)
(progress-missions-city-krew-delivery #x01bb)
(progress-missions-city-red-gun-training #x01bc)
(progress-missions-atoll-sig #x01bd)
(progress-missions-sewer-enemy #x01be)
(progress-missions-city-get-yellow-gun #x01bf)
(progress-missions-strip-rescue #x01c0)
(progress-missions-city-keira-delivery #x01c1)
(progress-missions-city-yellow-gun-training #x01c2)
(progress-missions-drill-eggs #x01c3)
(progress-missions-atoll-battle #x01c4)
(progress-missions-city-krew-collection #x01c5)
(progress-missions-stadium-board1 #x01c6)
(progress-missions-mountain-lens #x01c7)
(progress-missions-mountain-shard #x01c8)
(progress-missions-mountain-gear #x01c9)
(progress-missions-city-power #x01ca)
(progress-missions-palace-cable #x01cb)
(progress-missions-palace-boss #x01cc)
(progress-missions-city-shuttle #x01cd)
(progress-missions-ruins-enemy #x01ce)
(progress-missions-forest-scouts #x01cf)
(progress-missions-city-escort-kid #x01d0)
(progress-missions-city-meet-brutter #x01d1)
(progress-missions-city-port-run #x01d2)
(progress-missions-city-intercept-tanker #x01d3)
(progress-missions-dig-knock-down #x01d4)
(progress-missions-strip-grenade #x01d5)
(progress-missions-sewer-board #x01d6)
(progress-missions-drill-ship #x01d7)
(progress-missions-dig-rescue-lurkers #x01d8)
(progress-missions-forest-hunt #x01d9)
(progress-missions-stadium-race-class3 #x01da)
(progress-missions-dig-find-totem #x01db)
(progress-missions-city-protect-water-slums #x01dc)
(progress-missions-city-destroy-guard-vehicles #x01dd)
(progress-missions-onin-game #x01de)
(progress-missions-canyon-insert-items #x01df)
(progress-missions-tomb-face-tests #x01e0)
(progress-missions-tomb-open-door #x01e1)
(progress-missions-tomb-poles #x01e2)
(progress-missions-tomb-water #x01e3)
(progress-missions-tomb-boss #x01e4)
(progress-missions-fortress-save-friends #x01e5)
(progress-missions-sewer-escort #x01e6)
(progress-missions-city-get-dark-gun #x01e7)
(progress-missions-stadium-race-class2 #x01e8)
(progress-missions-city-stop-bomb-bots #x01e9)
(progress-missions-explore-consite #x01ea)
(progress-missions-climb-consite #x01eb)
(progress-missions-city-errol-challenge #x01ec)
(progress-missions-strip-drop #x01ed)
(progress-missions-ruins-mech #x01ee)
(progress-missions-deliver-life-seed #x01ef)
(progress-missions-forest-protect #x01f0)
(progress-missions-drill-mech #x01f1)
(progress-missions-stadium-race-class1 #x01f2)
(progress-missions-palace-sneak-in #x01f3)
(progress-missions-castle-break-in #x01f4)
(progress-missions-castle-boss #x01f5)
(progress-missions-city-whack #x01f6)
(progress-missions-under-find-sig #x01f7)
(progress-missions-under-escort-sig #x01f8)
(progress-missions-city-defend-stadium #x01f9)
(progress-missions-protect-balloon #x01fa)
(progress-missions-under-destroy-tunnels #x01fb)
(progress-missions-nest-enter #x01fc)
(progress-missions-consite-find-baron #x01fd)
(progress-missions-nest-get-to-gun #x01fe)
(progress-missions-nest-boss #x01ff)
(progress-missions-talk-to-kor #x0200)
(progress-missions-talk-to-torn #x0201)
(progress-missions-talk-to-krew #x0202)
(progress-missions-talk-to-onin #x0203)
(progress-missions-talk-to-vin #x0204)
(progress-missions-talk-to-shadow #x0205)
(progress-missions-talk-to-sig #x0206)
(progress-missions-talk-to-mechanic #x0207)
(progress-missions-talk-to-keira #x0208)
(progress-missions-talk-to-brutter #x0209)
(progress-missions-check-bazaar #x020a)
(progress-missions-check-water-slums #x020b)
(progress-missions-go-to-canyon #x020c)
(progress-missions-go-to-tomb #x020d)
(progress-missions-beat-whack #x020e)
(progress-missions-defend-port-wall #x020f)
(progress-missions-check-consite #x0210)
(progress-missions-nest-attack #x0211)
(progress-missions-go-to-oracle #x0212)
(progress-locations-haven-city #x213)
(progress-locations-fortress #x214)
(progress-locations-landing-pad #x215)
@@ -362,32 +359,205 @@
(board-score-activate-judge #x0242)
(board-score-try-again #x0243) ;; TODO only for board?
(board-score-return-to-garage #x0244)
(text-x245 #x0245)
(text-x246 #x0246)
(text-x247 #x0247)
(text-x248 #x0248)
(text-x249 #x0249)
(text-x24a #x024a)
(text-x24b #x024b)
(text-x24c #x024c)
(text-x24d #x024d)
(text-x24e #x024e)
(text-x24f #x024f)
(mission-complete-return-to-krew #x0245)
(tutorial-hover-zones #x0246)
(tutorial-dive #x0247)
(tutorial-turbo-or-jump #x0248)
(tutorial-mech-punch #x0249)
(tutorial-mech-carry #x024a)
(tutorial-mech-throw #x024b)
(tutorial-ramp #x024c)
(tutorial-grind #x024d)
(tutorial-unknown #x024e)
(atoll-unknown #x024f)
(strip-unknown #x250)
(watch-trailer #x251)
(tutorial-board-get-on #x252)
(tutorial-dark #x253)
(scea-splash #x254)
(scee-splash #x255)
(scek-splash #x256)
(scei-splash #x257)
(a-game-by #x258)
(jak2 #x259)
(two-years-later #x25a)
(one-week-later #x25b)
(gun-upgrade-acquired #x25c)
(red-gun-acquired #x25d)
(yellow-gun-acquired #x25e)
(blue-gun-acquired #x25f)
(dark-gun-acquired #x260)
(gun-upgrade-speed #x261)
(gun-upgrade-ammo #x262)
(gun-upgrade-damage #x263)
(mission-complete #x264)
(pass-red-acquired #x265)
(pass-green-acquired #x266)
(pass-yellow-acquired #x267)
(pass-palace-acquired #x268)
(pass-black-acquired #x269)
(mountain-lens-acquired #x26a)
(mountain-gear-acquired #x26b)
(mountain-shard-acquired #x26c)
(oracle-gem-grind-25 #x26d)
(oracle-gem-grind-200 #x26e)
(oracle-gem-grind1-25 #x26f)
(oracle-gem-grind1-200 #x270)
(oracle-gem-grind2-200 #x271)
(oracle-gem-grind-100 #x272)
(oracle-tutorial-dark-bomb #x0273)
(oracle-tutorial-dark-blast #x0274)
(oracle-tutorial-dark-invincible #x0275)
(oracle-tutorial-dark-giant #x0276)
(text-x277 #x0277)
(text-x278 #x0278)
(text-x27a #x027a)
(text-x27b #x027b)
(text-x27c #x027c)
(text-x27d #x027d)
(text-x27e #x027e)
(text-x27f #x027f)
(miss #x0277)
(select-event #x0278)
(skate-park #x0279)
(race-class3 #x027a)
(race-class2 #x027b)
(race-class1 #x027c)
(reverse-race-class3 #x027d)
(reverse-race-class2 #x027e)
(reverse-race-class1 #x027f)
(scene-daxter-gets-a-mouthful #x280)
(scene-ruins-tower-intro #x281)
(scene-ruins-tower-victory #x282)
(scene-ruins-sacred-intro #x283)
(scene-ruins-sacred-victory #x284)
(scene-get-to-hut-res #x285)
(scene-vin-rescue-intro #x286)
(scene-vin-rescue #x287)
(scene-crane-intro #x288)
(scene-crane-victory #x289)
(scene-ecowells-intro #x28a)
(scene-ecowells-victory #x28b)
(scene-city-help-kid-intro #x28c)
(scene-city-help-kid-resolution #x28d)
(scene-city-destroy-guard-vehicles-intro #x28e)
(scene-city-krew-delivery-intro #x28f)
(scene-krew-delivery-res #x290)
(scene-city-intercept-tanker-intro #x291)
(scene-city-intercept-tanker-res #x292)
(scene-city-switch-on-power-intro #x293)
(scene-city-keira-hover-challenge-intro #x294)
(scene-city-keira-hover-challenge-res #x295)
(scene-city-class-3-race-intro #x296)
(scene-city-class-3-race-res #x297)
(scene-city-class-2-race-intro #x298)
(scene-city-class-2-race-res #x299)
(scene-city-class-1-race-intro-a #x29a)
(scene-city-class-1-race-intro-b #x29b)
(scene-city-class-1-race-res #x29c)
(scene-city-oracle-intro #x29d)
(scene-city-oracle-level-0 #x29e)
(scene-city-oracle-level-1 #x29f)
(scene-city-oracle-level-2 #x2a0)
(scene-city-oracle-level-3 #x2a1)
(scene-city-krew-collection-intro #x2a2)
(scene-city-krew-collection-res #x2a3)
(scene-city-escort-kid-intro #x2a4)
(scene-city-meet-brutter-intro #x2a5)
(scene-city-meet-brutter-res #x2a6)
(scene-city-keira-delivery-intro #x2a7)
(scene-city-shuttle-underground-intro #x2a8)
(scene-city-play-onin-game-intro #x2a9)
(scene-city-play-onin-game-res #x2aa)
(scene-city-save-lurkers-intro #x2ab)
(scene-city-stop-bomb-bots-intro #x2ac)
(scene-city-errol-challenge-intro #x2ad)
(scene-city-whack-a-metal-intro #x2ae)
(scene-city-whack-a-metal-res #x2af)
(scene-city-defend-stadium-intro #x2b0)
(scene-city-defend-stadium-res #x2b1)
(scene-city-get-yellow-gun #x2b2)
(scene-city-get-hoverboard #x2b3)
(scene-city-put-hoverboard #x2b4)
(scene-city-get-dark-gun #x2b5)
(scene-city-air-train-in-caspad #x2b6)
(scene-nest-visit #x2b7) ;; unused
(scene-city-air-train-out #x2b8)
(scene-city-ashelin-drop-off #x2b9)
(scene-city-protect-slums-intro #x2ba)
(scene-city-errol-challenge-res #x2bb)
(scene-fortress-2-intro #x2bc)
(scene-fortress-blow-up-ammo-res-a #x2bd)
(scene-fortress-blow-up-ammo-res-b #x2be)
(scene-fortress-save-friends-intro-a #x2bf)
(scene-fortress-save-friends-res #x2c0)
(scene-sewer-1-intro #x2c1)
(scene-sewer-1-res #x2c2)
(scene-sewer-2-intro #x2c3)
(scene-sewer-drain-res #x2c4)
(scene-sewer-blow-up-statue-intro #x2c5)
(scene-sewer-blow-up-statue-res #x2c6)
(scene-sewer-hosehead #x2c7)
(scene-atoll-1-int #x2c8)
(scene-atoll-1-res #x2c9)
(scene-atoll-2-intro #x2ca)
(scene-atoll-3-intro #x2cb)
(scene-atoll-save-ashelin-res-a #x2cc)
(scene-atoll-save-ashelin-res-b #x2cd)
(scene-atoll-sig-intro #x2ce)
(scene-atoll-sig-tank #x2cf)
(scene-atoll-sniper-a #x2d0)
(scene-atoll-sniper-b #x2d1)
(scene-atoll-sniper-c #x2d2)
(scene-atoll-sniper-d #x2d3)
(scene-atoll-sniper-e #x2d4)
(scene-drill-kill-metal-heads-intro #x2d5)
(scene-drill-destroy-ship-intro #x2d6)
(scene-city-destroy-control-tower-intro #x2d7)
(scene-drill-top-explode #x2d8)
(scene-mountain-finditems-intro #x2d9)
(scene-mountain-gear-res #x2da)
(scene-mountain-shard-res #x2db)
(scene-mountain-lens-res #x2dc)
(scene-palace-outside-window-res #x2dd)
(scene-palace-outside-window-res-b #x2de)
(scene-palace-boss-res #x2df)
(scene-palace-sneak-in-res #x2e0)
(scene-consite-find-baron-res #x2e1)
(scene-castle-krew-boss-fight-intro #x2e2)
(scene-castle-krew-boss-fight-res #x2e3)
(scene-caspad-air-train-in #x2e4)
(scene-caspad-air-train-out #x2e5)
(scene-tomb-face-tests-intro #x2e6)
(scene-tomb-open-door-res #x2e7) ;; unused
(scene-tomb-open-door-res-2 #x2e8) ;; unused
(scene-tomb-unlock-start #x2e9)
(scene-tomb-unlock-water #x2ea)
(scene-tomb-unlock-poles #x2eb)
(scene-tomb-boss-open #x2ec)
(scene-tomb-boss-intro #x2ed)
(scene-tomb-boss-res #x2ee)
(scene-tomb-boulder-start #x2ef)
(scene-tomb-spider-scare #x2f0)
(scene-forest-catch-metal-heads-intro #x2f1)
(scene-forest-hunt-camo-metal-heads-intro #x2f2)
(scene-forest-protect-samos-intro-a #x2f3)
(scene-forest-protect-samos-intro-b #x2f4)
(scene-forest-protect-samos-res #x2f5)
(scene-dig-knock-down-scaffolding-intro #x2f6)
(scene-save-more-lurkers #x2f7) ;; unused
(scene-dig-find-totem-intro #x2f8)
(scene-dig-find-totem-res #x2f9)
(scene-dig-digger-explode #x2fa)
(scene-canyon-insert-items-res #x2fb)
(scene-canyon-insert-items-intro #x2fc)
(scene-under-find-sig-res #x2fd)
(scene-under-centipede-one #x2fe)
(scene-under-centipede-two #x2ff)
(scene-under-centipede-three #x300)
(scene-under-get-sig-out-res #x301)
(scene-nest-break-barrier-res #x302)
(scene-nest-air-train-out #x303)
(scene-nest-air-train-in #x304)
(scene-nest-boss-mid #x305)
(scene-nest-boss-intro #x306)
(scene-intro #x307)
(scene-outro #x308)
(scene-subtitles-enabled #x30d)
(scene-subtitles-disabled #x30e)
(text-x30f #x30f)
(board-name #x30f)
(progress-unknown-continue #x310)
)
;; ---text-id
goal_src/jak2/levels/city/common/ctywide-obs.gc
+9 -9
View File
@@ -3112,7 +3112,7 @@ This commonly includes things such as:
(set! (-> v1-39 scale) 0.9)
)
(let ((s4-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x181) #f))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id press-triangle-to-talk) #f))
(s4-1 *temp-string* s5-1 #f 44 (bucket-id progress))
)
)
@@ -3549,7 +3549,7 @@ This commonly includes things such as:
(let ((s0-0 print-game-text))
(set! sv-352 format)
(set! sv-368 (clear *temp-string*))
(let ((a1-5 (lookup-text! *common-text* (text-id text-x278) #f)))
(let ((a1-5 (lookup-text! *common-text* (text-id select-event) #f)))
(sv-352 sv-368 a1-5)
)
(s0-0 *temp-string* s1-0 #f 44 (bucket-id progress))
@@ -3585,7 +3585,7 @@ This commonly includes things such as:
(set! sv-384 print-game-text)
(set! sv-400 format)
(set! sv-416 (clear *temp-string*))
(let ((a1-9 (lookup-text! *common-text* (text-id text-x30f) #f)))
(let ((a1-9 (lookup-text! *common-text* (text-id board-name) #f)))
(sv-400 sv-416 a1-9)
)
(let ((a0-73 *temp-string*)
@@ -3601,7 +3601,7 @@ This commonly includes things such as:
(set! sv-432 print-game-text)
(set! sv-448 format)
(set! sv-464 (clear *temp-string*))
(let ((a1-12 (lookup-text! *common-text* (text-id text-x27a) #f)))
(let ((a1-12 (lookup-text! *common-text* (text-id race-class3) #f)))
(sv-448 sv-464 a1-12)
)
(let ((a0-79 *temp-string*)
@@ -3617,7 +3617,7 @@ This commonly includes things such as:
(set! sv-480 print-game-text)
(set! sv-496 format)
(set! sv-512 (clear *temp-string*))
(let ((a1-15 (lookup-text! *common-text* (text-id text-x27b) #f)))
(let ((a1-15 (lookup-text! *common-text* (text-id race-class2) #f)))
(sv-496 sv-512 a1-15)
)
(let ((a0-85 *temp-string*)
@@ -3633,7 +3633,7 @@ This commonly includes things such as:
(set! sv-528 print-game-text)
(set! sv-544 format)
(set! sv-560 (clear *temp-string*))
(let ((a1-18 (lookup-text! *common-text* (text-id text-x27c) #f)))
(let ((a1-18 (lookup-text! *common-text* (text-id race-class1) #f)))
(sv-544 sv-560 a1-18)
)
(let ((a0-91 *temp-string*)
@@ -3649,7 +3649,7 @@ This commonly includes things such as:
(set! sv-576 print-game-text)
(set! sv-592 format)
(set! sv-608 (clear *temp-string*))
(let ((a1-21 (lookup-text! *common-text* (text-id text-x27d) #f)))
(let ((a1-21 (lookup-text! *common-text* (text-id reverse-race-class3) #f)))
(sv-592 sv-608 a1-21)
)
(let ((a0-97 *temp-string*)
@@ -3665,7 +3665,7 @@ This commonly includes things such as:
(set! sv-624 print-game-text)
(set! sv-640 format)
(set! sv-656 (clear *temp-string*))
(let ((a1-24 (lookup-text! *common-text* (text-id text-x27e) #f)))
(let ((a1-24 (lookup-text! *common-text* (text-id reverse-race-class2) #f)))
(sv-640 sv-656 a1-24)
)
(let ((a0-103 *temp-string*)
@@ -3681,7 +3681,7 @@ This commonly includes things such as:
(set! sv-672 print-game-text)
(set! sv-688 format)
(set! sv-704 (clear *temp-string*))
(let ((a1-27 (lookup-text! *common-text* (text-id text-x27f) #f)))
(let ((a1-27 (lookup-text! *common-text* (text-id reverse-race-class1) #f)))
(sv-688 sv-704 a1-27)
)
(let ((a0-108 *temp-string*)
goal_src/jak2/levels/city/common/vehicle-util.gc
+7 -1
View File
@@ -349,7 +349,13 @@ This commonly includes things such as:
(set! (-> v1-99 scale) 0.9)
)
(set! (-> s3-1 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id text-x182) #f) s3-1 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
s3-1
#f
44
(bucket-id progress)
)
)
(when (cpad-pressed? 0 triangle)
(cond
goal_src/jak2/levels/common/races/race-hud.gc
+4 -13
View File
@@ -289,16 +289,7 @@
(s3-0 (+ s4-0 3))
)
(let ((s1-0
(new
'stack
'font-context
*font-default-matrix*
0
0
0.0
(font-color default)
(font-flags shadow kerning)
)
(new 'stack 'font-context *font-default-matrix* 0 0 0.0 (font-color default) (font-flags shadow kerning))
)
)
(set! (-> obj strings 0 scale) 0.0)
@@ -331,7 +322,7 @@
)
)
(set! sv-112 print-game-text)
(let ((a0-20 (lookup-text! *common-text* (text-id text-x175) #f))
(let ((a0-20 (lookup-text! *common-text* (text-id race-you-win) #f))
(a2-2 #f)
(a3-1 44)
(t0-1 320)
@@ -350,7 +341,7 @@
)
)
(set! sv-128 print-game-text)
(let ((a0-26 (lookup-text! *common-text* (text-id text-x176) #f))
(let ((a0-26 (lookup-text! *common-text* (text-id race-you-lose) #f))
(a1-5 s1-0)
(a2-4 #f)
(a3-2 44)
@@ -401,7 +392,7 @@
(s0-1 (clear (-> obj strings s3-0 text)))
)
(set! sv-160 "~S~D")
(let ((a2-10 (lookup-text! *common-text* (text-id text-x178) #f))
(let ((a2-10 (lookup-text! *common-text* (text-id race-lap) #f))
(a3-4 (+ s4-0 1))
)
(s1-3 s0-1 sv-160 a2-10 a3-4)
goal_src/jak2/levels/common/races/race-manager.gc
+3 -3
View File
@@ -1278,7 +1278,7 @@
(set! (-> gp-1 origin y) 320.0)
(set! (-> gp-1 flags) (font-flags shadow kerning middle left large))
(let ((s5-0 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id race-unknown) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-x-to-continue) #f) 1)
(s5-0 *temp-string* gp-1 #f 44 (bucket-id progress))
)
)
@@ -1314,12 +1314,12 @@
(set! (-> gp-1 origin y) 320.0)
(set! (-> gp-1 flags) (font-flags shadow kerning middle left large))
(let ((s5-0 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x18a) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id try-again?) #f) 1)
(s5-0 *temp-string* gp-1 #f 44 (bucket-id progress))
)
(set! (-> gp-1 origin y) (+ 35.0 (-> gp-1 origin y)))
(let ((s5-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x180) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id yes-no-prompt) #f) 1)
(s5-1 *temp-string* gp-1 #f 44 (bucket-id progress))
)
)
goal_src/jak2/levels/common/scene-actor.gc
+2 -2
View File
@@ -788,10 +788,10 @@ This commonly includes things such as:
(let ((v1-1 (get-current-task-event (-> obj task))))
(case (-> v1-1 action)
(((game-task-action play))
(set! (-> obj talk-message) (text-id text-x186))
(set! (-> obj talk-message) (text-id press-triangle-to-play))
)
(else
(set! (-> obj talk-message) (text-id text-x181))
(set! (-> obj talk-message) (text-id press-triangle-to-talk))
)
)
(if (and (= (-> v1-1 action) (game-task-action play))
goal_src/jak2/levels/common/warp-gate.gc
+7 -1
View File
@@ -577,7 +577,13 @@
(set! (-> v1-53 scale) 0.9)
)
(set! (-> gp-0 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id text-x182) #f) gp-0 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
gp-0
#f
44
(bucket-id progress)
)
)
)
)
goal_src/jak2/levels/hiphog/hiphog-scenes.gc
+2 -2
View File
@@ -121,10 +121,10 @@ This commonly includes things such as:
@returns the appropriate [[art-element]] for the given NPC"
(case (-> (get-current-task-event (-> obj task)) action)
(((game-task-action play))
(set! (-> obj talk-message) (text-id text-x186))
(set! (-> obj talk-message) (text-id press-triangle-to-play))
)
(else
(set! (-> obj talk-message) (text-id text-x181))
(set! (-> obj talk-message) (text-id press-triangle-to-talk))
)
)
(-> obj draw art-group data 2)
test/decompiler/reference/jak2/engine/game/game-save_REF.gc
Generated Vendored
+7 -1
View File
@@ -1911,7 +1911,13 @@
)
(set! (-> gp-1 flags) (font-flags shadow kerning middle left large))
(when (and (>= 1 (-> *game-info* auto-save-count)) (-> self next-state) (= (-> self next-state name) 'save))
(print-game-text (lookup-text! *common-text* (text-id text-x19f) #f) gp-1 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id progress-memcard-saving-data) #f)
gp-1
#f
44
(bucket-id progress)
)
(set! (-> gp-1 origin x) 20.0)
(set! (-> gp-1 origin y) 130.0)
(let ((v1-30 gp-1))
test/decompiler/reference/jak2/engine/game/task/game-task_REF.gc
Generated Vendored
+269 -269
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
Generated Vendored
+2 -2
View File
@@ -1499,14 +1499,14 @@
(set! (-> v1-17 height) (the float 95))
)
(let ((s5-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x18a) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id try-again?) #f) 1)
(s5-1 *temp-string* gp-0 #f 44 (bucket-id progress))
)
(let ((v1-19 gp-0))
(set! (-> v1-19 height) (the float 155))
)
(let ((s5-2 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x180) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id yes-no-prompt) #f) 1)
(s5-2 *temp-string* gp-0 #f 44 (bucket-id progress))
)
)
test/decompiler/reference/jak2/engine/process-drawable/process-taskable_REF.gc
Generated Vendored
+1 -1
View File
@@ -380,7 +380,7 @@ Seen take in - `true-func` which takes no args TODO - seems fishy
;; WARN: Return type mismatch int vs none.
(defmethod process-taskable-method-32 process-taskable ((obj process-taskable))
(logior! (-> obj skel status) (joint-control-status eye-anim))
(set! (-> obj talk-message) (text-id text-x181))
(set! (-> obj talk-message) (text-id press-triangle-to-talk))
(set! (-> obj bounce-away) #t)
(set! (-> obj will-talk) #t)
(set! (-> obj look-at-me) #t)
test/decompiler/reference/jak2/engine/target/mech_suit/mech_REF.gc
Generated Vendored
+7 -1
View File
@@ -202,7 +202,13 @@
(set! (-> v1-33 scale) 0.9)
)
(set! (-> gp-0 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id text-x182) #f) gp-0 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
gp-0
#f
44
(bucket-id progress)
)
)
(if (and (cpad-pressed? 0 triangle) (send-event *target* 'change-mode 'mech self (-> self shield-value)))
(go-virtual pickup (method-of-object self wait-for-return))
test/decompiler/reference/jak2/engine/target/target-turret_REF.gc
Generated Vendored
+7 -1
View File
@@ -1165,7 +1165,13 @@
(set! (-> v1-23 scale) 0.9)
)
(set! (-> gp-1 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id text-x182) #f) gp-1 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
gp-1
#f
44
(bucket-id progress)
)
)
(when (and (cpad-pressed? 0 triangle) (send-event *target* 'change-mode 'turret self))
(set! (-> self rider) (process->handle *target*))
test/decompiler/reference/jak2/engine/ui/hud-classes_REF.gc
Generated Vendored
+1206
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc
Generated Vendored
+11 -7
View File
@@ -3856,7 +3856,7 @@
(set! sv-48 0)
(while (< sv-48 s4-0)
(set! sv-64 print-game-text)
(let ((a0-4 (lookup-text! *common-text* (the-as text-id (-> s2-0 sv-48 text)) #f))
(let ((a0-4 (lookup-text! *common-text* (-> s2-0 sv-48 text) #f))
(a1-16 arg1)
(a2-4 #t)
(a3-3 44)
@@ -3869,7 +3869,7 @@
(let ((s0-1 (- s0-0 (the int f28-0)))
(f28-1 (cond
((< (-> arg0 sliding-height) 0.0)
(set! sv-112 (lookup-text! *common-text* (the-as text-id (-> s2-0 s4-0 text)) #f))
(set! sv-112 (lookup-text! *common-text* (-> s2-0 s4-0 text) #f))
0.0
(set! sv-80 print-game-text)
(set! sv-96 format)
@@ -3889,7 +3889,7 @@
)
)
(else
(set! sv-160 (lookup-text! *common-text* (the-as text-id (-> s2-0 (+ s4-0 -1) text)) #f))
(set! sv-160 (lookup-text! *common-text* (-> s2-0 (+ s4-0 -1) text) #f))
0.0
(set! sv-128 print-game-text)
(set! sv-144 format)
@@ -3914,7 +3914,7 @@
(set! (-> arg1 origin y) (the float (+ s0-1 (the int f28-1))))
(while (< s3-0 (length s2-0))
(set! sv-176 print-game-text)
(let* ((a0-14 (lookup-text! *common-text* (the-as text-id (-> s2-0 s3-0 text)) #f))
(let* ((a0-14 (lookup-text! *common-text* (-> s2-0 s3-0 text) #f))
(a1-24 arg1)
(a2-12 #t)
(a3-6 44)
@@ -3941,7 +3941,7 @@
)
)
(set! sv-224 print-game-text)
(let ((a0-23 (lookup-text! *common-text* (the-as text-id (-> s2-0 s3-0 text)) #f))
(let ((a0-23 (lookup-text! *common-text* (-> s2-0 s3-0 text) #f))
(a1-28 arg1)
(a2-16 #f)
(a3-7 44)
@@ -4229,8 +4229,8 @@
)
(set! (-> arg1 alpha) sv-16)
(set! (-> *game-info* mission-list 0) sv-264)
(set! (-> sv-264 description) (text-id progress-unknown-kjanskd))
(set! (-> sv-268 description) (text-id progress-unknown-oi1un23i13))
(set! (-> sv-264 description) (text-id progress-missions-in-progress))
(set! (-> sv-268 description) (text-id progress-missions-completed))
(while (< sv-24 (length (-> *game-info* sub-task-list)))
(let ((v1-26 (find-mission-text-at-index sv-24))
(a0-15 (-> *game-info* mission-list))
@@ -7983,3 +7983,7 @@
0
(none)
)
test/decompiler/reference/jak2/engine/ui/progress/progress-h_REF.gc
Generated Vendored
+4 -4
View File
@@ -962,10 +962,10 @@
;; definition of type secret-item-option
(deftype secret-item-option (menu-option)
((cost int32 :offset-assert 48)
(can-toggle symbol :offset-assert 52)
(flag uint32 :offset-assert 56)
(avail-after uint16 :offset-assert 60)
((cost int32 :offset-assert 48)
(can-toggle symbol :offset-assert 52)
(flag game-secrets :offset-assert 56)
(avail-after game-task-node :offset-assert 60)
)
:method-count-assert 12
:size-assert #x3e
test/decompiler/reference/jak2/engine/ui/progress/progress-static_REF.gc
Generated Vendored
+918 -864
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/levels/city/common/ctywide-obs_REF.gc
Generated Vendored
+9 -9
View File
@@ -3254,7 +3254,7 @@ This commonly includes things such as:
(set! (-> v1-39 scale) 0.9)
)
(let ((s4-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x181) #f))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id press-triangle-to-talk) #f))
(s4-1 *temp-string* s5-1 #f 44 (bucket-id progress))
)
)
@@ -3693,7 +3693,7 @@ This commonly includes things such as:
(let ((s0-0 print-game-text))
(set! sv-352 format)
(set! sv-368 (clear *temp-string*))
(let ((a1-5 (lookup-text! *common-text* (text-id text-x278) #f)))
(let ((a1-5 (lookup-text! *common-text* (text-id select-event) #f)))
(sv-352 sv-368 a1-5)
)
(s0-0 *temp-string* s1-0 #f 44 (bucket-id progress))
@@ -3729,7 +3729,7 @@ This commonly includes things such as:
(set! sv-384 print-game-text)
(set! sv-400 format)
(set! sv-416 (clear *temp-string*))
(let ((a1-9 (lookup-text! *common-text* (text-id text-x30f) #f)))
(let ((a1-9 (lookup-text! *common-text* (text-id board-name) #f)))
(sv-400 sv-416 a1-9)
)
(let ((a0-73 *temp-string*)
@@ -3745,7 +3745,7 @@ This commonly includes things such as:
(set! sv-432 print-game-text)
(set! sv-448 format)
(set! sv-464 (clear *temp-string*))
(let ((a1-12 (lookup-text! *common-text* (text-id text-x27a) #f)))
(let ((a1-12 (lookup-text! *common-text* (text-id race-class3) #f)))
(sv-448 sv-464 a1-12)
)
(let ((a0-79 *temp-string*)
@@ -3761,7 +3761,7 @@ This commonly includes things such as:
(set! sv-480 print-game-text)
(set! sv-496 format)
(set! sv-512 (clear *temp-string*))
(let ((a1-15 (lookup-text! *common-text* (text-id text-x27b) #f)))
(let ((a1-15 (lookup-text! *common-text* (text-id race-class2) #f)))
(sv-496 sv-512 a1-15)
)
(let ((a0-85 *temp-string*)
@@ -3777,7 +3777,7 @@ This commonly includes things such as:
(set! sv-528 print-game-text)
(set! sv-544 format)
(set! sv-560 (clear *temp-string*))
(let ((a1-18 (lookup-text! *common-text* (text-id text-x27c) #f)))
(let ((a1-18 (lookup-text! *common-text* (text-id race-class1) #f)))
(sv-544 sv-560 a1-18)
)
(let ((a0-91 *temp-string*)
@@ -3793,7 +3793,7 @@ This commonly includes things such as:
(set! sv-576 print-game-text)
(set! sv-592 format)
(set! sv-608 (clear *temp-string*))
(let ((a1-21 (lookup-text! *common-text* (text-id text-x27d) #f)))
(let ((a1-21 (lookup-text! *common-text* (text-id reverse-race-class3) #f)))
(sv-592 sv-608 a1-21)
)
(let ((a0-97 *temp-string*)
@@ -3809,7 +3809,7 @@ This commonly includes things such as:
(set! sv-624 print-game-text)
(set! sv-640 format)
(set! sv-656 (clear *temp-string*))
(let ((a1-24 (lookup-text! *common-text* (text-id text-x27e) #f)))
(let ((a1-24 (lookup-text! *common-text* (text-id reverse-race-class2) #f)))
(sv-640 sv-656 a1-24)
)
(let ((a0-103 *temp-string*)
@@ -3825,7 +3825,7 @@ This commonly includes things such as:
(set! sv-672 print-game-text)
(set! sv-688 format)
(set! sv-704 (clear *temp-string*))
(let ((a1-27 (lookup-text! *common-text* (text-id text-x27f) #f)))
(let ((a1-27 (lookup-text! *common-text* (text-id reverse-race-class1) #f)))
(sv-688 sv-704 a1-27)
)
(let ((a0-108 *temp-string*)
test/decompiler/reference/jak2/levels/city/common/vehicle-util_REF.gc
Generated Vendored
+7 -1
View File
@@ -400,7 +400,13 @@ This commonly includes things such as:
(set! (-> v1-99 scale) 0.9)
)
(set! (-> s3-1 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id text-x182) #f) s3-1 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
s3-1
#f
44
(bucket-id progress)
)
)
(when (cpad-pressed? 0 triangle)
(cond
test/decompiler/reference/jak2/levels/common/races/race-hud_REF.gc
Generated Vendored
+3 -3
View File
@@ -346,7 +346,7 @@
)
)
(set! sv-112 print-game-text)
(let ((a0-20 (lookup-text! *common-text* (text-id text-x175) #f))
(let ((a0-20 (lookup-text! *common-text* (text-id race-you-win) #f))
(a2-2 #f)
(a3-1 44)
(t0-1 320)
@@ -365,7 +365,7 @@
)
)
(set! sv-128 print-game-text)
(let ((a0-26 (lookup-text! *common-text* (text-id text-x176) #f))
(let ((a0-26 (lookup-text! *common-text* (text-id race-you-lose) #f))
(a1-5 s1-0)
(a2-4 #f)
(a3-2 44)
@@ -416,7 +416,7 @@
(s0-1 (clear (-> obj strings s3-0 text)))
)
(set! sv-160 "~S~D")
(let ((a2-10 (lookup-text! *common-text* (text-id text-x178) #f))
(let ((a2-10 (lookup-text! *common-text* (text-id race-lap) #f))
(a3-4 (+ s4-0 1))
)
(s1-3 s0-1 sv-160 a2-10 a3-4)
test/decompiler/reference/jak2/levels/common/races/race-manager_REF.gc
Generated Vendored
+3 -3
View File
@@ -1317,7 +1317,7 @@
(set! (-> gp-1 origin y) 320.0)
(set! (-> gp-1 flags) (font-flags shadow kerning middle left large))
(let ((s5-0 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id race-unknown) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-x-to-continue) #f) 1)
(s5-0 *temp-string* gp-1 #f 44 (bucket-id progress))
)
)
@@ -1355,12 +1355,12 @@
(set! (-> gp-1 origin y) 320.0)
(set! (-> gp-1 flags) (font-flags shadow kerning middle left large))
(let ((s5-0 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x18a) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id try-again?) #f) 1)
(s5-0 *temp-string* gp-1 #f 44 (bucket-id progress))
)
(set! (-> gp-1 origin y) (+ 35.0 (-> gp-1 origin y)))
(let ((s5-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x180) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id yes-no-prompt) #f) 1)
(s5-1 *temp-string* gp-1 #f 44 (bucket-id progress))
)
)
test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc
Generated Vendored
+2 -5
View File
@@ -546,7 +546,6 @@ This commonly includes things such as:
)
;; definition for method 3 of type keira-npc
;; INFO: this function exists in multiple non-identical object files
(defmethod inspect keira-npc ((obj keira-npc))
(when (not obj)
(set! obj obj)
@@ -560,7 +559,6 @@ This commonly includes things such as:
)
;; definition for method 35 of type keira-npc
;; INFO: this function exists in multiple non-identical object files
(defmethod get-art-elem keira-npc ((obj keira-npc))
"Checks various things such the current actor, task status, etc to determine the right art-group data to use
@returns the appropriate [[art-element]] for the given NPC"
@@ -575,7 +573,6 @@ This commonly includes things such as:
)
;; definition for method 33 of type keira-npc
;; INFO: this function exists in multiple non-identical object files
;; WARN: Return type mismatch int vs none.
(defmethod init-art! keira-npc ((obj keira-npc))
"@see [[initialize-skeleton]]"
@@ -997,10 +994,10 @@ This commonly includes things such as:
(let ((v1-1 (get-current-task-event (-> obj task))))
(case (-> v1-1 action)
(((game-task-action play))
(set! (-> obj talk-message) (text-id text-x186))
(set! (-> obj talk-message) (text-id press-triangle-to-play))
)
(else
(set! (-> obj talk-message) (text-id text-x181))
(set! (-> obj talk-message) (text-id press-triangle-to-talk))
)
)
(if (and (= (-> v1-1 action) (game-task-action play))
test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc
Generated Vendored
+7 -1
View File
@@ -624,7 +624,13 @@
(set! (-> v1-53 scale) 0.9)
)
(set! (-> gp-0 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id text-x182) #f) gp-0 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
gp-0
#f
44
(bucket-id progress)
)
)
)
)
test/decompiler/reference/jak2/levels/hiphog/hiphog-scenes_REF.gc
Generated Vendored
+2 -2
View File
@@ -143,10 +143,10 @@ This commonly includes things such as:
@returns the appropriate [[art-element]] for the given NPC"
(case (-> (get-current-task-event (-> obj task)) action)
(((game-task-action play))
(set! (-> obj talk-message) (text-id text-x186))
(set! (-> obj talk-message) (text-id press-triangle-to-play))
)
(else
(set! (-> obj talk-message) (text-id text-x181))
(set! (-> obj talk-message) (text-id press-triangle-to-talk))
)
)
(-> obj draw art-group data 2)