From f4085a4362908d5fb0e8b8340069c12cdf45f9af Mon Sep 17 00:00:00 2001 From: Hat Kid <6624576+Hat-Kid@users.noreply.github.com> Date: Thu, 6 Apr 2023 00:41:05 +0200 Subject: [PATCH] jak1: clean up all `dummy` methods (#2457) Cleans up every `dummy-*` and `TODO-RENAME-*` method up with either proper names or by renaming them to `[type-name]-method-[method-id]` similar to Jak 2's `all-types`. Also fixes the bad format string in `collide-cache` and adds the event handler hack to Jak 1. The game boots and runs fine, but I might have missed a PAL patch or other manual patches here and there, please double-check if possible. --- decompiler/analysis/variable_naming.cpp | 5 + decompiler/config/jak1/all-types.gc | 758 +++++++++--------- decompiler/config/jak1/ntsc_v1/hacks.jsonc | 3 +- goal_src/jak1/engine/anim/joint-exploder.gc | 106 +-- goal_src/jak1/engine/camera/cam-combiner.gc | 310 ++++--- goal_src/jak1/engine/camera/cam-debug.gc | 131 ++- goal_src/jak1/engine/camera/cam-master.gc | 14 +- goal_src/jak1/engine/camera/cam-states.gc | 64 +- goal_src/jak1/engine/camera/camera-h.gc | 44 +- goal_src/jak1/engine/camera/camera.gc | 176 ++-- .../jak1/engine/collide/collide-cache-h.gc | 96 ++- goal_src/jak1/engine/collide/collide-cache.gc | 13 +- .../engine/collide/collide-edge-grab-h.gc | 170 ++-- .../jak1/engine/collide/collide-edge-grab.gc | 150 ++-- .../jak1/engine/collide/collide-shape-h.gc | 180 +++-- goal_src/jak1/engine/collide/collide-shape.gc | 71 +- .../jak1/engine/collide/collide-touch-h.gc | 43 +- goal_src/jak1/engine/common-obs/babak.gc | 10 +- goal_src/jak1/engine/common-obs/basebutton.gc | 86 +- goal_src/jak1/engine/common-obs/baseplat.gc | 90 +-- goal_src/jak1/engine/common-obs/crates.gc | 90 +-- .../jak1/engine/common-obs/dark-eco-pool.gc | 16 +- .../jak1/engine/common-obs/generic-obs.gc | 323 ++++---- .../jak1/engine/common-obs/nav-enemy-h.gc | 57 +- goal_src/jak1/engine/common-obs/nav-enemy.gc | 184 ++--- goal_src/jak1/engine/common-obs/orb-cache.gc | 14 +- .../jak1/engine/common-obs/plat-button.gc | 52 +- goal_src/jak1/engine/common-obs/plat-eco.gc | 30 +- goal_src/jak1/engine/common-obs/plat.gc | 26 +- .../engine/common-obs/process-drawable.gc | 13 +- .../engine/common-obs/process-taskable.gc | 212 +++-- .../jak1/engine/common-obs/rigid-body-h.gc | 31 +- goal_src/jak1/engine/common-obs/rigid-body.gc | 126 ++- goal_src/jak1/engine/common-obs/ropebridge.gc | 28 +- goal_src/jak1/engine/common-obs/sharkey.gc | 41 +- goal_src/jak1/engine/common-obs/tippy.gc | 8 +- goal_src/jak1/engine/common-obs/water-anim.gc | 432 +++++----- goal_src/jak1/engine/common-obs/water-h.gc | 27 +- goal_src/jak1/engine/common-obs/water.gc | 119 ++- goal_src/jak1/engine/debug/stats-h.gc | 67 +- goal_src/jak1/engine/entity/entity-h.gc | 52 +- goal_src/jak1/engine/entity/entity.gc | 10 +- goal_src/jak1/engine/game/effect-control-h.gc | 10 +- goal_src/jak1/engine/game/effect-control.gc | 72 +- goal_src/jak1/engine/game/game-h.gc | 123 ++- goal_src/jak1/engine/game/game-save.gc | 118 ++- goal_src/jak1/engine/game/powerups.gc | 2 +- goal_src/jak1/engine/game/projectiles-h.gc | 17 +- goal_src/jak1/engine/game/projectiles.gc | 70 +- .../jak1/engine/game/task/task-control-h.gc | 22 +- goal_src/jak1/engine/geometry/path-h.gc | 35 +- goal_src/jak1/engine/geometry/path.gc | 30 +- goal_src/jak1/engine/geometry/vol-h.gc | 16 +- goal_src/jak1/engine/geometry/vol.gc | 36 +- goal_src/jak1/engine/level/load-boundary.gc | 725 ++++++++--------- goal_src/jak1/engine/nav/navigate-h.gc | 310 +++---- goal_src/jak1/engine/nav/navigate.gc | 83 +- goal_src/jak1/engine/target/logic-target.gc | 4 +- goal_src/jak1/engine/target/sidekick.gc | 16 +- goal_src/jak1/engine/target/target-death.gc | 4 +- goal_src/jak1/engine/target/target-handler.gc | 557 +++++++------ goal_src/jak1/engine/target/target.gc | 22 +- goal_src/jak1/engine/target/target2.gc | 10 +- goal_src/jak1/engine/ui/hud-h.gc | 2 +- .../jak1/engine/ui/progress/progress-h.gc | 12 +- goal_src/jak1/kernel-defs.gc | 2 +- goal_src/jak1/kernel/gkernel-h.gc | 2 +- goal_src/jak1/levels/beach/beach-obs.gc | 18 +- goal_src/jak1/levels/beach/bird-lady-beach.gc | 8 +- goal_src/jak1/levels/beach/bird-lady.gc | 12 +- goal_src/jak1/levels/beach/lurkercrab.gc | 16 +- goal_src/jak1/levels/beach/lurkerpuppy.gc | 8 +- goal_src/jak1/levels/beach/lurkerworm.gc | 16 +- goal_src/jak1/levels/beach/mayor.gc | 14 +- goal_src/jak1/levels/beach/pelican.gc | 162 ++-- goal_src/jak1/levels/beach/sculptor.gc | 16 +- goal_src/jak1/levels/beach/seagull.gc | 65 +- goal_src/jak1/levels/beach/twister.gc | 16 +- goal_src/jak1/levels/beach/wobbler.gc | 8 +- .../jak1/levels/citadel/assistant-citadel.gc | 10 +- goal_src/jak1/levels/citadel/citadel-obs.gc | 94 +-- goal_src/jak1/levels/citadel/citadel-sages.gc | 143 ++-- goal_src/jak1/levels/citadel/citb-bunny.gc | 14 +- .../jak1/levels/citadel/citb-drop-plat.gc | 58 +- goal_src/jak1/levels/citadel/citb-plat.gc | 104 ++- .../jak1/levels/common/battlecontroller.gc | 25 +- goal_src/jak1/levels/darkcave/darkcave-obs.gc | 46 +- goal_src/jak1/levels/finalboss/final-door.gc | 60 +- .../jak1/levels/finalboss/green-eco-lurker.gc | 38 +- .../jak1/levels/finalboss/robotboss-misc.gc | 132 ++- .../jak1/levels/finalboss/robotboss-weapon.gc | 46 +- goal_src/jak1/levels/finalboss/robotboss.gc | 65 +- .../jak1/levels/finalboss/sage-finalboss.gc | 54 +- .../levels/firecanyon/assistant-firecanyon.gc | 8 +- .../jak1/levels/flut_common/target-flut.gc | 4 +- goal_src/jak1/levels/intro/evilbro.gc | 12 +- goal_src/jak1/levels/jungle/fisher.gc | 108 ++- goal_src/jak1/levels/jungle/hopper.gc | 14 +- goal_src/jak1/levels/jungle/jungle-obs.gc | 126 ++- goal_src/jak1/levels/jungle/junglefish.gc | 8 +- goal_src/jak1/levels/jungle/junglesnake.gc | 40 +- goal_src/jak1/levels/jungleb/aphid.gc | 14 +- goal_src/jak1/levels/jungleb/jungleb-obs.gc | 34 +- .../levels/lavatube/assistant-lavatube.gc | 16 +- .../jak1/levels/lavatube/lavatube-energy.gc | 121 ++- goal_src/jak1/levels/lavatube/lavatube-obs.gc | 57 +- goal_src/jak1/levels/maincave/baby-spider.gc | 50 +- .../jak1/levels/maincave/cavecrystal-light.gc | 24 +- goal_src/jak1/levels/maincave/dark-crystal.gc | 32 +- .../jak1/levels/maincave/driller-lurker.gc | 72 +- goal_src/jak1/levels/maincave/gnawer.gc | 199 +++-- goal_src/jak1/levels/maincave/maincave-obs.gc | 38 +- .../jak1/levels/maincave/mother-spider-egg.gc | 55 +- .../jak1/levels/maincave/mother-spider-h.gc | 23 +- .../levels/maincave/mother-spider-proj.gc | 8 +- .../jak1/levels/maincave/mother-spider.gc | 66 +- .../jak1/levels/misty/babak-with-cannon.gc | 4 +- goal_src/jak1/levels/misty/balloonlurker.gc | 68 +- goal_src/jak1/levels/misty/bonelurker.gc | 40 +- goal_src/jak1/levels/misty/misty-conveyor.gc | 70 +- goal_src/jak1/levels/misty/misty-obs.gc | 38 +- goal_src/jak1/levels/misty/misty-warehouse.gc | 12 +- goal_src/jak1/levels/misty/mistycannon.gc | 110 +-- goal_src/jak1/levels/misty/mud.gc | 8 +- goal_src/jak1/levels/misty/muse.gc | 30 +- goal_src/jak1/levels/misty/quicksandlurker.gc | 37 +- goal_src/jak1/levels/misty/sidekick-human.gc | 140 ++-- goal_src/jak1/levels/ogre/flying-lurker.gc | 20 +- goal_src/jak1/levels/ogre/ogre-obs.gc | 144 ++-- .../jak1/levels/racer_common/racer-states.gc | 4 +- .../jak1/levels/racer_common/target-racer.gc | 2 +- goal_src/jak1/levels/robocave/cave-trap.gc | 16 +- goal_src/jak1/levels/robocave/spider-egg.gc | 65 +- .../levels/rolling/rolling-lightning-mole.gc | 67 +- goal_src/jak1/levels/rolling/rolling-obs.gc | 105 +-- .../jak1/levels/rolling/rolling-robber.gc | 15 +- goal_src/jak1/levels/snow/ice-cube.gc | 260 +++--- goal_src/jak1/levels/snow/snow-ball.gc | 50 +- goal_src/jak1/levels/snow/snow-bumper.gc | 14 +- goal_src/jak1/levels/snow/snow-bunny.gc | 122 +-- .../jak1/levels/snow/snow-flutflut-obs.gc | 64 +- goal_src/jak1/levels/snow/snow-obs.gc | 12 +- goal_src/jak1/levels/snow/snow-ram-boss.gc | 66 +- goal_src/jak1/levels/snow/snow-ram-h.gc | 13 +- goal_src/jak1/levels/snow/snow-ram.gc | 38 +- goal_src/jak1/levels/snow/yeti.gc | 20 +- goal_src/jak1/levels/sunken/bully.gc | 221 +++-- goal_src/jak1/levels/sunken/double-lurker.gc | 296 ++----- .../jak1/levels/sunken/floating-launcher.gc | 6 +- goal_src/jak1/levels/sunken/helix-water.gc | 10 +- goal_src/jak1/levels/sunken/orbit-plat.gc | 171 ++-- goal_src/jak1/levels/sunken/puffer.gc | 272 +++---- goal_src/jak1/levels/sunken/qbert-plat.gc | 44 +- goal_src/jak1/levels/sunken/shover.gc | 30 +- .../jak1/levels/sunken/square-platform.gc | 104 ++- goal_src/jak1/levels/sunken/steam-cap.gc | 16 +- .../jak1/levels/sunken/sun-exit-chamber.gc | 111 ++- goal_src/jak1/levels/sunken/sunken-fish.gc | 90 +-- goal_src/jak1/levels/sunken/sunken-obs.gc | 12 +- .../jak1/levels/sunken/sunken-pipegame.gc | 22 +- goal_src/jak1/levels/sunken/sunken-water.gc | 20 +- goal_src/jak1/levels/sunken/target-tube.gc | 8 +- goal_src/jak1/levels/sunken/wedge-plats.gc | 108 ++- goal_src/jak1/levels/sunken/whirlpool.gc | 10 +- goal_src/jak1/levels/swamp/billy.gc | 12 +- goal_src/jak1/levels/swamp/kermit.gc | 25 +- goal_src/jak1/levels/swamp/swamp-bat.gc | 57 +- goal_src/jak1/levels/swamp/swamp-obs.gc | 68 +- goal_src/jak1/levels/swamp/swamp-rat-nest.gc | 55 +- goal_src/jak1/levels/swamp/swamp-rat.gc | 21 +- goal_src/jak1/levels/title/title-obs.gc | 122 ++- goal_src/jak1/levels/training/training-obs.gc | 55 +- goal_src/jak1/levels/village1/assistant.gc | 14 +- goal_src/jak1/levels/village1/explorer.gc | 16 +- goal_src/jak1/levels/village1/farmer.gc | 12 +- .../jak1/levels/village1/fishermans-boat.gc | 172 ++-- goal_src/jak1/levels/village1/sage.gc | 18 +- .../levels/village1/sequence-a-village1.gc | 16 +- goal_src/jak1/levels/village1/village-obs.gc | 21 +- goal_src/jak1/levels/village1/yakow.gc | 102 ++- .../levels/village2/assistant-village2.gc | 26 +- .../jak1/levels/village2/flutflut-bluehut.gc | 8 +- goal_src/jak1/levels/village2/gambler.gc | 14 +- goal_src/jak1/levels/village2/geologist.gc | 12 +- goal_src/jak1/levels/village2/sage-bluehut.gc | 26 +- .../jak1/levels/village2/sunken-elevator.gc | 8 +- goal_src/jak1/levels/village2/swamp-blimp.gc | 67 +- goal_src/jak1/levels/village2/village2-obs.gc | 88 +- goal_src/jak1/levels/village2/warrior.gc | 14 +- .../levels/village3/assistant-village3.gc | 16 +- goal_src/jak1/levels/village3/miners.gc | 22 +- .../jak1/levels/village3/sage-village3.gc | 16 +- goal_src/jak1/levels/village3/village3-obs.gc | 4 +- goal_src/jak1/levels/village_common/oracle.gc | 8 +- .../levels/village_common/villagep-obs.gc | 6 +- .../jak1/engine/ambient/ambient_REF.gc | 4 +- .../jak1/engine/camera/cam-combiner_REF.gc | 35 +- .../jak1/engine/camera/cam-master_REF.gc | 14 +- .../jak1/engine/camera/cam-states_REF.gc | 56 +- .../jak1/engine/camera/camera-h_REF.gc | 32 +- .../jak1/engine/camera/camera_REF.gc | 62 +- .../engine/collide/collide-cache-h_REF.gc | 10 +- .../engine/collide/collide-edge-grab-h_REF.gc | 4 +- .../engine/collide/collide-edge-grab_REF.gc | 8 +- .../engine/collide/collide-shape-h_REF.gc | 4 +- .../engine/collide/collide-touch-h_REF.gc | 10 +- .../jak1/engine/debug/stats-h_REF.gc | 2 +- .../jak1/engine/draw/process-drawable_REF.gc | 2 +- .../jak1/engine/entity/entity-h_REF.gc | 2 +- .../jak1/engine/entity/entity_REF.gc | 10 +- .../jak1/engine/game/collectables_REF.gc | 24 +- .../reference/jak1/engine/game/crates_REF.gc | 10 +- .../jak1/engine/game/effect-control-h_REF.gc | 10 +- .../jak1/engine/game/effect-control_REF.gc | 66 +- .../reference/jak1/engine/game/game-h_REF.gc | 86 +- .../jak1/engine/game/game-save_REF.gc | 2 +- .../jak1/engine/game/generic-obs_REF.gc | 74 +- .../jak1/engine/game/powerups_REF.gc | 2 +- .../jak1/engine/game/projectiles-h_REF.gc | 10 +- .../jak1/engine/game/projectiles_REF.gc | 40 +- .../engine/game/task/process-taskable_REF.gc | 40 +- .../engine/game/task/task-control-h_REF.gc | 22 +- .../jak1/engine/geometry/vol-h_REF.gc | 12 +- .../reference/jak1/engine/geometry/vol_REF.gc | 16 +- .../jak1/engine/gfx/water/water-h_REF.gc | 20 +- .../jak1/engine/gfx/water/water_REF.gc | 57 +- .../jak1/engine/level/load-boundary_REF.gc | 19 +- .../jak1/engine/nav/navigate-h_REF.gc | 40 +- .../reference/jak1/engine/nav/navigate_REF.gc | 78 +- .../reference/jak1/engine/nav/path-h_REF.gc | 10 +- .../reference/jak1/engine/nav/path_REF.gc | 22 +- .../jak1/engine/target/logic-target_REF.gc | 4 +- .../jak1/engine/target/sidekick_REF.gc | 2 +- .../jak1/engine/target/target-death_REF.gc | 4 +- .../jak1/engine/target/target-handler_REF.gc | 71 +- .../jak1/engine/target/target2_REF.gc | 10 +- .../jak1/engine/target/target_REF.gc | 22 +- .../reference/jak1/engine/ui/hud-h_REF.gc | 2 +- .../jak1/engine/ui/progress-h_REF.gc | 12 +- .../jak1/engine/ui/progress/progress_REF.gc | 22 +- .../jak1/levels/beach/beach-obs_REF.gc | 18 +- .../jak1/levels/beach/bird-lady-beach_REF.gc | 4 +- .../jak1/levels/beach/bird-lady_REF.gc | 8 +- .../jak1/levels/beach/lurkercrab_REF.gc | 10 +- .../jak1/levels/beach/lurkerpuppy_REF.gc | 4 +- .../jak1/levels/beach/lurkerworm_REF.gc | 12 +- .../reference/jak1/levels/beach/mayor_REF.gc | 10 +- .../jak1/levels/beach/pelican_REF.gc | 25 +- .../jak1/levels/beach/sculptor_REF.gc | 12 +- .../jak1/levels/beach/seagull_REF.gc | 36 +- .../jak1/levels/beach/twister_REF.gc | 12 +- .../jak1/levels/beach/wobbler_REF.gc | 4 +- .../levels/citadel/assistant-citadel_REF.gc | 6 +- .../jak1/levels/citadel/citadel-obs_REF.gc | 32 +- .../jak1/levels/citadel/citadel-sages_REF.gc | 70 +- .../jak1/levels/citadel/citb-bunny_REF.gc | 10 +- .../jak1/levels/citadel/citb-drop-plat_REF.gc | 14 +- .../jak1/levels/citadel/citb-plat_REF.gc | 66 +- .../reference/jak1/levels/common/babak_REF.gc | 6 +- .../jak1/levels/common/basebutton_REF.gc | 28 +- .../jak1/levels/common/baseplat_REF.gc | 44 +- .../levels/common/battlecontroller_REF.gc | 14 +- .../jak1/levels/common/dark-eco-pool_REF.gc | 8 +- .../jak1/levels/common/joint-exploder_REF.gc | 92 +-- .../jak1/levels/common/nav-enemy-h_REF.gc | 50 +- .../jak1/levels/common/nav-enemy_REF.gc | 84 +- .../jak1/levels/common/orb-cache_REF.gc | 4 +- .../jak1/levels/common/plat-button_REF.gc | 24 +- .../jak1/levels/common/plat-eco_REF.gc | 8 +- .../reference/jak1/levels/common/plat_REF.gc | 22 +- .../jak1/levels/common/rigid-body-h_REF.gc | 24 +- .../jak1/levels/common/rigid-body_REF.gc | 120 +-- .../jak1/levels/common/ropebridge_REF.gc | 6 +- .../jak1/levels/common/sharkey_REF.gc | 24 +- .../reference/jak1/levels/common/tippy_REF.gc | 4 +- .../jak1/levels/common/water-anim_REF.gc | 4 +- .../jak1/levels/darkcave/darkcave-obs_REF.gc | 4 +- .../jak1/levels/finalboss/final-door_REF.gc | 10 +- .../levels/finalboss/green-eco-lurker_REF.gc | 28 +- .../levels/finalboss/robotboss-misc_REF.gc | 6 +- .../levels/finalboss/robotboss-weapon_REF.gc | 24 +- .../jak1/levels/finalboss/robotboss_REF.gc | 12 +- .../levels/finalboss/sage-finalboss_REF.gc | 12 +- .../firecanyon/assistant-firecanyon_REF.gc | 4 +- .../levels/flut_common/target-flut_REF.gc | 4 +- .../jak1/levels/intro/evilbro_REF.gc | 8 +- .../jak1/levels/jungle/fisher_REF.gc | 24 +- .../jak1/levels/jungle/hopper_REF.gc | 6 +- .../jak1/levels/jungle/jungle-obs_REF.gc | 8 +- .../jak1/levels/jungle/junglefish_REF.gc | 4 +- .../jak1/levels/jungle/junglesnake_REF.gc | 40 +- .../jak1/levels/jungleb/aphid_REF.gc | 10 +- .../jak1/levels/jungleb/jungleb-obs_REF.gc | 4 +- .../levels/lavatube/assistant-lavatube_REF.gc | 4 +- .../levels/lavatube/lavatube-energy_REF.gc | 2 +- .../jak1/levels/lavatube/lavatube-obs_REF.gc | 6 +- .../jak1/levels/maincave/baby-spider_REF.gc | 46 +- .../levels/maincave/cavecrystal-light_REF.gc | 18 +- .../jak1/levels/maincave/dark-crystal_REF.gc | 12 +- .../levels/maincave/driller-lurker_REF.gc | 64 +- .../jak1/levels/maincave/gnawer_REF.gc | 74 +- .../jak1/levels/maincave/maincave-obs_REF.gc | 38 +- .../levels/maincave/mother-spider-egg_REF.gc | 19 +- .../levels/maincave/mother-spider-h_REF.gc | 16 +- .../levels/maincave/mother-spider-proj_REF.gc | 8 +- .../jak1/levels/maincave/mother-spider_REF.gc | 66 +- .../levels/misty/babak-with-cannon_REF.gc | 4 +- .../jak1/levels/misty/balloonlurker_REF.gc | 52 +- .../jak1/levels/misty/bonelurker_REF.gc | 10 +- .../jak1/levels/misty/misty-conveyor_REF.gc | 10 +- .../jak1/levels/misty/misty-obs_REF.gc | 16 +- .../jak1/levels/misty/misty-warehouse_REF.gc | 4 +- .../jak1/levels/misty/mistycannon_REF.gc | 24 +- .../reference/jak1/levels/misty/mud_REF.gc | 4 +- .../reference/jak1/levels/misty/muse_REF.gc | 16 +- .../jak1/levels/misty/quicksandlurker_REF.gc | 6 +- .../jak1/levels/misty/sidekick-human_REF.gc | 8 +- .../jak1/levels/ogre/flying-lurker_REF.gc | 20 +- .../jak1/levels/ogre/ogre-obs_REF.gc | 36 +- .../levels/racer_common/racer-states_REF.gc | 4 +- .../levels/racer_common/target-racer_REF.gc | 2 +- .../jak1/levels/robocave/cave-trap_REF.gc | 6 +- .../jak1/levels/robocave/spider-egg_REF.gc | 21 +- .../rolling/rolling-lightning-mole_REF.gc | 8 +- .../jak1/levels/rolling/rolling-obs_REF.gc | 4 +- .../jak1/levels/rolling/rolling-robber_REF.gc | 6 +- .../jak1/levels/snow/ice-cube_REF.gc | 74 +- .../jak1/levels/snow/snow-ball_REF.gc | 22 +- .../jak1/levels/snow/snow-bumper_REF.gc | 2 +- .../jak1/levels/snow/snow-bunny_REF.gc | 122 +-- .../jak1/levels/snow/snow-flutflut-obs_REF.gc | 64 +- .../jak1/levels/snow/snow-obs_REF.gc | 12 +- .../jak1/levels/snow/snow-ram-boss_REF.gc | 66 +- .../jak1/levels/snow/snow-ram-h_REF.gc | 6 +- .../jak1/levels/snow/snow-ram_REF.gc | 12 +- .../reference/jak1/levels/snow/yeti_REF.gc | 16 +- .../reference/jak1/levels/sunken/bully_REF.gc | 14 +- .../jak1/levels/sunken/double-lurker_REF.gc | 72 +- .../levels/sunken/floating-launcher_REF.gc | 2 +- .../jak1/levels/sunken/helix-water_REF.gc | 10 +- .../jak1/levels/sunken/orbit-plat_REF.gc | 42 +- .../jak1/levels/sunken/puffer_REF.gc | 94 +-- .../jak1/levels/sunken/qbert-plat_REF.gc | 26 +- .../jak1/levels/sunken/shover_REF.gc | 2 +- .../jak1/levels/sunken/square-platform_REF.gc | 16 +- .../jak1/levels/sunken/steam-cap_REF.gc | 12 +- .../levels/sunken/sun-exit-chamber_REF.gc | 72 +- .../jak1/levels/sunken/sunken-fish_REF.gc | 58 +- .../jak1/levels/sunken/sunken-obs_REF.gc | 8 +- .../jak1/levels/sunken/sunken-pipegame_REF.gc | 22 +- .../jak1/levels/sunken/sunken-water_REF.gc | 8 +- .../jak1/levels/sunken/target-tube_REF.gc | 4 +- .../jak1/levels/sunken/wedge-plats_REF.gc | 38 +- .../jak1/levels/sunken/whirlpool_REF.gc | 6 +- .../reference/jak1/levels/swamp/billy_REF.gc | 12 +- .../reference/jak1/levels/swamp/kermit_REF.gc | 10 +- .../jak1/levels/swamp/swamp-bat_REF.gc | 33 +- .../jak1/levels/swamp/swamp-obs_REF.gc | 12 +- .../jak1/levels/swamp/swamp-rat-nest_REF.gc | 20 +- .../jak1/levels/swamp/swamp-rat_REF.gc | 12 +- .../jak1/levels/title/title-obs_REF.gc | 8 +- .../jak1/levels/training/training-obs_REF.gc | 55 +- .../jak1/levels/village1/assistant_REF.gc | 10 +- .../jak1/levels/village1/explorer_REF.gc | 12 +- .../jak1/levels/village1/farmer_REF.gc | 8 +- .../levels/village1/fishermans-boat_REF.gc | 82 +- .../jak1/levels/village1/sage_REF.gc | 14 +- .../village1/sequence-a-village1_REF.gc | 2 +- .../jak1/levels/village1/village-obs_REF.gc | 10 +- .../jak1/levels/village1/yakow_REF.gc | 14 +- .../levels/village2/assistant-village2_REF.gc | 18 +- .../levels/village2/flutflut-bluehut_REF.gc | 4 +- .../jak1/levels/village2/gambler_REF.gc | 10 +- .../jak1/levels/village2/geologist_REF.gc | 8 +- .../jak1/levels/village2/sage-bluehut_REF.gc | 22 +- .../levels/village2/sunken-elevator_REF.gc | 4 +- .../jak1/levels/village2/swamp-blimp_REF.gc | 28 +- .../jak1/levels/village2/village2-obs_REF.gc | 30 +- .../jak1/levels/village2/warrior_REF.gc | 10 +- .../levels/village3/assistant-village3_REF.gc | 12 +- .../jak1/levels/village3/miners_REF.gc | 18 +- .../jak1/levels/village3/sage-village3_REF.gc | 12 +- .../jak1/levels/village3/village3-obs_REF.gc | 4 +- .../jak1/levels/village_common/oracle_REF.gc | 4 +- .../levels/village_common/villagep-obs_REF.gc | 6 +- 385 files changed, 8218 insertions(+), 9494 deletions(-) diff --git a/decompiler/analysis/variable_naming.cpp b/decompiler/analysis/variable_naming.cpp index 505cdcff21..0bd042aa0a 100644 --- a/decompiler/analysis/variable_naming.cpp +++ b/decompiler/analysis/variable_naming.cpp @@ -746,6 +746,11 @@ void SSA::make_vars(const Function& function, const DecompilerTypeSystem& dts) { function.guessed_name.to_string() == "(method 74 crimson-guard)"; } + if (function.ir2.env.version == GameVersion::Jak1) { + event_handler_hack = function.guessed_name.is_event_handler() || + function.guessed_name.to_string() == "target-generic-event-handler"; + } + for (int block_id = 0; block_id < int(blocks.size()); block_id++) { const auto& block = blocks.at(block_id); const TypeState* init_types = &function.ir2.env.get_types_at_block_entry(block_id); diff --git a/decompiler/config/jak1/all-types.gc b/decompiler/config/jak1/all-types.gc index 4149a92f3b..078271d263 100644 --- a/decompiler/config/jak1/all-types.gc +++ b/decompiler/config/jak1/all-types.gc @@ -1677,7 +1677,7 @@ (deactivate (_type_) none 10) (init-from-entity! (_type_ entity-actor) none 11) (run-logic? (_type_) symbol 12) - (dummy-method () none 13) + (process-tree-method-13 () none 13) ) :size-assert #x20 :method-count-assert 14 @@ -10868,49 +10868,49 @@ :flag-assert #x3f004000b0 ;; not enough basic ops (:methods - (dummy-20 () none 20) - (dummy-21 () none 21) - (dummy-22 () none 22) - (dummy-23 () none 23) - (dummy-24 () none 24) - (dummy-25 () none 25) - (dummy-26 () none 26) - (dummy-27 () none 27) - (dummy-28 () none 28) - (dummy-29 () none 29) - (dummy-30 () none 30) - (dummy-31 () none 31) - (dummy-32 () none 32) - (dummy-33 () none 33) - (dummy-34 () none 34) - (dummy-35 () none 35) - (dummy-36 () none 36) - (dummy-37 () none 37) - (dummy-38 () none 38) - (dummy-39 () none 39) - (dummy-40 () none 40) - (dummy-41 () none 41) - (dummy-42 () none 42) - (dummy-43 () none 43) - (dummy-44 () none 44) - (dummy-45 () none 45) - (dummy-46 () none 46) - (dummy-47 () none 47) - (dummy-48 () none 48) - (dummy-49 () none 49) - (dummy-50 () none 50) - (dummy-51 () none 51) - (dummy-52 () none 52) - (dummy-53 () none 53) - (dummy-54 () none 54) - (dummy-55 () none 55) - (dummy-56 () none 56) - (dummy-57 () none 57) - (dummy-58 () none 58) - (dummy-59 () none 59) - (dummy-60 () none 60) - (dummy-61 () none 61) - (dummy-62 () none 62) + (process-drawable-reserved-method-20 () none 20) + (process-drawable-reserved-method-21 () none 21) + (process-drawable-reserved-method-22 () none 22) + (process-drawable-reserved-method-23 () none 23) + (process-drawable-reserved-method-24 () none 24) + (process-drawable-reserved-method-25 () none 25) + (process-drawable-reserved-method-26 () none 26) + (process-drawable-reserved-method-27 () none 27) + (process-drawable-reserved-method-28 () none 28) + (process-drawable-reserved-method-29 () none 29) + (process-drawable-reserved-method-30 () none 30) + (process-drawable-reserved-method-31 () none 31) + (process-drawable-reserved-method-32 () none 32) + (process-drawable-reserved-method-33 () none 33) + (process-drawable-reserved-method-34 () none 34) + (process-drawable-reserved-method-35 () none 35) + (process-drawable-reserved-method-36 () none 36) + (process-drawable-reserved-method-37 () none 37) + (process-drawable-reserved-method-38 () none 38) + (process-drawable-reserved-method-39 () none 39) + (process-drawable-reserved-method-40 () none 40) + (process-drawable-reserved-method-41 () none 41) + (process-drawable-reserved-method-42 () none 42) + (process-drawable-reserved-method-43 () none 43) + (process-drawable-reserved-method-44 () none 44) + (process-drawable-reserved-method-45 () none 45) + (process-drawable-reserved-method-46 () none 46) + (process-drawable-reserved-method-47 () none 47) + (process-drawable-reserved-method-48 () none 48) + (process-drawable-reserved-method-49 () none 49) + (process-drawable-reserved-method-50 () none 50) + (process-drawable-reserved-method-51 () none 51) + (process-drawable-reserved-method-52 () none 52) + (process-drawable-reserved-method-53 () none 53) + (process-drawable-reserved-method-54 () none 54) + (process-drawable-reserved-method-55 () none 55) + (process-drawable-reserved-method-56 () none 56) + (process-drawable-reserved-method-57 () none 57) + (process-drawable-reserved-method-58 () none 58) + (process-drawable-reserved-method-59 () none 59) + (process-drawable-reserved-method-60 () none 60) + (process-drawable-reserved-method-61 () none 61) + (process-drawable-reserved-method-62 () none 62) ) ) @@ -12037,7 +12037,7 @@ (find-collision-meshes (_type_) symbol 38) (on-platform (_type_ collide-shape collide-overlap-result) symbol 39) (find-overlapping-shapes (_type_ overlaps-others-params) symbol 40) ;; check if blocked?? - (dummy-41 (_type_ attack-info float) vector 41) + (calc-shove-up (_type_ attack-info float) vector 41) (should-push-away (_type_ collide-shape collide-overlap-result) symbol 42) (pull-rider! (_type_ pull-rider-info) none 43) (pull-riders! (_type_) symbol 44) @@ -12160,7 +12160,7 @@ (:methods (set-and-handle-pat! (_type_ pat-surface) none 56) (integrate-no-collide! (_type_ vector) none 57) - (dummy-58 (_type_ vector) symbol 58) + (collide-shape-moving-method-58 (_type_ vector) symbol 58) (integrate-for-enemy-with-move-to-ground! (_type_ vector collide-kind float symbol symbol symbol) none 59) (move-to-ground (_type_ float float symbol collide-kind) symbol 60) (move-to-ground-point! (_type_ vector vector vector) none 61) @@ -12412,7 +12412,7 @@ :flag-assert #xd000000e4 (:methods (get-touched-prim (_type_ trsqv touching-shapes-entry) collide-shape-prim 9) - (dummy-10 () none 10) + (touching-prims-entry-method-10 () none 10) (get-middle-of-bsphere-overlap (_type_ vector) vector 11) (get-touched-tri (_type_ collide-shape touching-shapes-entry) collide-tri-result 12) ) @@ -12445,12 +12445,12 @@ :size-assert #x10 :flag-assert #x1200000010 (:methods - (dummy-9 (_type_) none 9) + (touching-shapes-entry-method-9 (_type_) none 9) (get-touched-shape (_type_ collide-shape) collide-shape 10) - (dummy-11 () none 11) + (touching-shapes-entry-method-11 () none 11) (prims-touching? (_type_ collide-shape-moving uint) touching-prims-entry 12) ; this one! (prims-touching-action? (_type_ collide-shape collide-action collide-action) touching-prims-entry 13) - (dummy-14 () none 14) + (touching-shapes-entry-method-14 () none 14) (free-touching-prims-list (_type_) symbol 15) (get-head (_type_) touching-prims-entry 16) (get-next (_type_ touching-prims-entry) touching-prims-entry 17) @@ -12468,7 +12468,7 @@ (:methods (new (symbol type) _type_ 0) (add-touching-prims (_type_ collide-shape-prim collide-shape-prim float collide-tri-result collide-tri-result) none 9) - (dummy-10 () none 10) + (touching-list-method-10 () none 10) (update-from-step-size (_type_ float) none 11) (send-events-for-touching-shapes (_type_) none 12) (get-shapes-entry (_type_ collide-shape collide-shape) touching-shapes-entry 13) @@ -12508,7 +12508,7 @@ :size-assert #x144 :flag-assert #xb00000144 (:methods - (dummy-9 (_type_) symbol 9) + (edge-grab-info-method-9 (_type_) symbol 9) (debug-draw (_type_) symbol 10) ) ) @@ -12603,7 +12603,7 @@ (debug-draw-tris (_type_) none 11) (debug-draw-sphere (_type_) symbol 12) (compute-center-point! (_type_ collide-edge-edge vector) float 13) - (dummy-14 (_type_ vector vector int) float 14) + (collide-edge-work-method-14 (_type_ vector vector int) float 14) (find-grabbable-edges! (_type_) none 15) (find-grabbable-tris! (_type_) none 16) (should-add-to-list? (_type_ collide-edge-hold-item collide-edge-edge) symbol 17) @@ -12664,12 +12664,12 @@ :flag-assert #xf00000024 (:methods (new (symbol type process-drawable) _type_) - (TODO-RENAME-9 (_type_) none 9) - (dummy-10 (_type_ symbol float int) object 10) - (dummy-11 (_type_ symbol float int basic pat-surface) none 11) - (dummy-12 (_type_ symbol float int basic sound-name) int 12) + (effect-control-method-9 (_type_) none 9) + (effect-control-method-10 (_type_ symbol float int) object 10) + (effect-control-method-11 (_type_ symbol float int basic pat-surface) none 11) + (effect-control-method-12 (_type_ symbol float int basic sound-name) int 12) (set-channel-offset! (_type_ int) none 13) - (TODO-RENAME-14 (_type_ float float float) none 14) + (effect-control-method-14 (_type_ float float float) none 14) ) ) @@ -12774,11 +12774,11 @@ (projectile-dissipate () _type_ :state 21) ;; state (projectile-impact () _type_ :state 22) ;; state (projectile-moving () _type_ :state 23) ;; state - (dummy-24 (_type_) none 24) - (dummy-25 (_type_) none 25) - (dummy-26 (_type_) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_) none 28) + (projectile-method-24 (_type_) none 24) + (projectile-method-25 (_type_) none 25) + (projectile-method-26 (_type_) none 26) + (projectile-method-27 (_type_) none 27) + (projectile-method-28 (_type_) none 28) ) ) @@ -13071,7 +13071,7 @@ :size-assert #x34 :flag-assert #xe00000034 (:methods - (dummy-9 (_type_) none 9) + (perf-stat-method-9 (_type_) none 9) (print-to-stream (_type_ string basic) none 10) (reset! (_type_) none 11) (read! (_type_) none 12) @@ -13254,8 +13254,8 @@ :size-assert #xc60 :flag-assert #xb00000c60 (:methods - (dummy-9 (_type_ object object) symbol 9) - (dummy-10 (_type_ object object) symbol 10) + (collide-puss-work-method-9 (_type_ object object) symbol 9) + (collide-puss-work-method-10 (_type_ object object) symbol 10) ) ) @@ -13343,9 +13343,9 @@ (fill-from-foreground-using-y-probe (_type_) none 24) (fill-from-water (_type_ water-control) none 25) ;; or whatever is from 152 in the process passed to 16 (load-mesh-from-spad-in-box (_type_ collide-frag-mesh) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_) none 28) - (dummy-29 (_type_ collide-frag-mesh) none 29) + (collide-cache-method-27 (_type_) none 27) + (collide-cache-method-28 (_type_) none 28) + (collide-cache-method-29 (_type_ collide-frag-mesh) none 29) (puyp-mesh (_type_ collide-puyp-work collide-cache-prim) none 30) (puyp-sphere (_type_ collide-puyp-work collide-cache-prim) vector 31) (unpack-background-collide-mesh (_type_ object object object) none 32) ;; helper for fill from background. @@ -14477,7 +14477,7 @@ (next-actor (_type_) entity-actor 27) (prev-actor (_type_) entity-actor 28) (debug-print (_type_ symbol type) none 29) - (dummy-30 (_type_ entity-perm-status symbol) none 30) + (set-or-clear-status! (_type_ entity-perm-status symbol) none 30) ) ) @@ -15175,8 +15175,8 @@ :size-assert #x30 :flag-assert #xb00000030 (:methods - (dummy-9 (_type_ symbol entity vector curve) symbol 9) - (dummy-10 (_type_ vector) float 10) ; inlined vector-dot issue? + (cam-index-method-9 (_type_ symbol entity vector curve) symbol 9) + (cam-index-method-10 (_type_ vector) float 10) ; inlined vector-dot issue? ) ) @@ -15221,21 +15221,21 @@ :size-assert #x664 :flag-assert #x1800000664 (:methods - (TODO-RENAME-9 (_type_) none 9) - (TODO-RENAME-10 (_type_ vector) none 10) + (tracking-spline-method-9 (_type_) none 9) + (tracking-spline-method-10 (_type_ vector) none 10) (print-nth-point (_type_ int) none 11) - (TODO-RENAME-12 (_type_) none 12) - (TODO-RENAME-13 (_type_ int) none 13) - (TODO-RENAME-14 (_type_ tracking-spline-sampler) none 14) - (TODO-RENAME-15 (_type_) none 15) - (TODO-RENAME-16 (_type_ float) none 16) - (TODO-RENAME-17 (_type_ vector float float symbol) int 17) ; - return value is actually none but they do a manual `return` - (TODO-RENAME-18 (_type_ float vector tracking-spline-sampler) vector 18) - (TODO-RENAME-19 (_type_ float vector tracking-spline-sampler) vector 19) - (TODO-RENAME-20 (_type_ vector int) none 20) - (TODO-RENAME-21 (_type_ vector float float) vector 21) - (TODO-RENAME-22 (_type_ float) none 22) - (TODO-RENAME-23 (_type_) none 23) + (tracking-spline-method-12 (_type_) none 12) + (tracking-spline-method-13 (_type_ int) none 13) + (tracking-spline-method-14 (_type_ tracking-spline-sampler) none 14) + (tracking-spline-method-15 (_type_) none 15) + (tracking-spline-method-16 (_type_ float) none 16) + (tracking-spline-method-17 (_type_ vector float float symbol) int 17) ; - return value is actually none but they do a manual `return` + (tracking-spline-method-18 (_type_ float vector tracking-spline-sampler) vector 18) + (tracking-spline-method-19 (_type_ float vector tracking-spline-sampler) vector 19) + (tracking-spline-method-20 (_type_ vector int) none 20) + (tracking-spline-method-21 (_type_ vector float float) vector 21) + (tracking-spline-method-22 (_type_ float) none 22) + (tracking-spline-method-23 (_type_) none 23) ) ) @@ -15646,7 +15646,7 @@ (init-particles! (_type_ int) none 20) (get-icon-pos-x (_type_) int 21) (get-icon-pos-y (_type_) int 22) - (dummy-23 (_type_) none 23) ;; unused + (hud-method-23 (_type_) none 23) ;; unused (set-pos-and-scale (_type_ symbol symbol) none 24) (get-icon-scale-x (_type_) float 25) (get-icon-scale-y (_type_) float 26) @@ -15918,11 +15918,11 @@ :heap-base #x270 :flag-assert #x3b027002dc (:methods - (progress-dummy-14 (_type_) none 14) ;; unused - (progress-dummy-15 (_type_) none 15) ;; unused - (progress-dummy-16 (_type_) none 16) ;; unused + (progress-method-14 (_type_) none 14) ;; unused + (progress-method-15 (_type_) none 15) ;; unused + (progress-method-16 (_type_) none 16) ;; unused (draw-progress (_type_) none 17) - (progress-dummy-18 () none 18) ;; unused + (progress-method-18 () none 18) ;; unused (visible? (_type_) symbol 19) (hidden? (_type_) symbol 20) (adjust-sprites (_type_) none 21) @@ -15948,10 +15948,10 @@ (draw-memcard-auto-save-error (_type_ font-context) none 41) (draw-memcard-removed (_type_ font-context) none 42) (draw-memcard-error (_type_ font-context) none 43) - (progress-dummy-44 (_type_) none 44) ;; unused + (progress-method-44 (_type_) none 44) ;; unused (push! (_type_) none 45) (pop! (_type_) none 46) - (progress-dummy-47 (_type_) none 47) ;; unused + (progress-method-47 (_type_) none 47) ;; unused (enter! (_type_ progress-screen int) none 48) (draw-memcard-format (_type_ font-context) none 49) (draw-auto-save (_type_ font-context) none 50) @@ -16050,18 +16050,18 @@ :flag-assert #x1500000024 (:methods (new (symbol type process symbol float) _type_) - (dummy-9 (_type_) none 9) + (debug-draw (_type_) none 9) (eval-path-curve-div! (_type_ vector float symbol) vector 10) (get-random-point (_type_ vector) vector 11) - (TODO-RENAME-12 (_type_ vector float) vector 12) + (path-control-method-12 (_type_ vector float) vector 12) (eval-path-curve! (_type_ vector float symbol) vector 13) - (TODO-RENAME-14 (_type_ vector float) vector 14) + (path-control-method-14 (_type_ vector float) vector 14) (length-as-float (_type_) float 15) (path-distance (_type_) float 16) (get-num-verts (_type_) int 17) (should-display? (_type_) symbol 18) - (TODO-RENAME-19 (_type_) float 19) - (TODO-RENAME-20 (_type_) float 20) + (path-control-method-19 (_type_) float 19) + (path-control-method-20 (_type_) float 20) ) ) @@ -16235,14 +16235,14 @@ ;; - you hit a nav mesh boundary/gap ;; - you cross 15 triangles. (try-move-along-ray (_type_ nav-poly vector vector float) meters 15) - (TODO-RENAME-16 (_type_ vector nav-poly vector symbol float clip-travel-vector-to-mesh-return-info) none 16) + (nav-mesh-method-16 (_type_ vector nav-poly vector symbol float clip-travel-vector-to-mesh-return-info) none 16) (update-route-table (_type_) none 17) ;; (initialization related) - (dummy-18 (_type_ int vector int (pointer int8) int) none 18) ;; something to do with routes. + (nav-mesh-method-18 (_type_ int vector int (pointer int8) int) none 18) ;; something to do with routes. (compute-bounding-box (_type_ vector vector) none 19) (debug-draw-poly (_type_ nav-poly rgba) none 20) ;; TODO - is rgba a vector4w? (point-in-poly? (_type_ nav-poly vector) symbol 21) ;; is the point inside of the triangle? (find-opposite-vertices (_type_ nav-poly nav-poly) uint 22) ;; given two triangles that share an edge, get the indices of the two vertices that aren't part of the edge. - (dummy-23 (_type_ nav-poly vector vector vector nav-route-portal) vector 23) + (nav-mesh-method-23 (_type_ nav-poly vector vector vector nav-route-portal) vector 23) (closest-point-on-boundary (_type_ nav-poly vector vector) vector 24) ;; find the closest point on the perimeter of the triangle. (project-point-into-tri-3d (_type_ nav-poly vector vector) none 25) ;; will move a 3D point in space to the surface of this nav-poly ;; Looking from the top down, is the point inside the nav-poly? @@ -16315,31 +16315,31 @@ (new (symbol type collide-shape int float) _type_) (debug-draw (_type_) none 9) (point-in-bounds? (_type_ vector) symbol 10) - (dummy-11 (_type_ vector) vector 11) - (TODO-RENAME-12 (_type_ nav-gap-info) symbol 12) - (dummy-13 (_type_ vector vector) vector 13) ;; see - puffer::20 | second vector may be clip-travel-vector-to-mesh-return-info though + (nav-control-method-11 (_type_ vector) vector 11) + (nav-control-method-12 (_type_ nav-gap-info) symbol 12) + (nav-control-method-13 (_type_ vector vector) vector 13) ;; see - puffer::20 | second vector may be clip-travel-vector-to-mesh-return-info though (set-current-poly! (_type_ nav-poly) none 14) (set-target-pos! (_type_ vector) none 15) - (dummy-16 (_type_ vector) nav-poly 16) ; see - nav-enemy-test-point-in-nav-mesh? + (nav-control-method-16 (_type_ vector) nav-poly 16) ; see - nav-enemy-test-point-in-nav-mesh? (project-onto-nav-mesh (_type_ vector vector) vector 17) ;; moves point to nav-mesh. (find-poly (_type_ vector) nav-poly 18) - (dummy-19 (_type_ vector collide-shape-moving vector float) none 19) ;; csm not trsqv? ret not vector? + (nav-control-method-19 (_type_ vector collide-shape-moving vector float) none 19) ;; csm not trsqv? ret not vector? (project-point-into-tri-3d (_type_ nav-poly vector vector) vector 20) - (TODO-RENAME-21 (_type_ vector) nav-poly 21) - (TODO-RENAME-22 (_type_ vector float) symbol 22) - (dummy-23 (_type_ vector check-vector-collision-with-nav-spheres-info) float 23) ;; TODO - unconfirmed maybe (dummy-23 (_type_ vector matrix) float 23) - (dummy-24 (_type_ float clip-travel-vector-to-mesh-return-info) none 24) + (nav-control-method-21 (_type_ vector) nav-poly 21) + (nav-control-method-22 (_type_ vector float) symbol 22) + (nav-control-method-23 (_type_ vector check-vector-collision-with-nav-spheres-info) float 23) ;; TODO - unconfirmed maybe (nav-control-method-23 (_type_ vector matrix) float 23) + (nav-control-method-24 (_type_ float clip-travel-vector-to-mesh-return-info) none 24) (is-in-mesh? (_type_ vector float) symbol 25) ; see - nav-enemy-test-point-near-nav-mesh? - (TODO-RENAME-26 (_type_) none 26) ;; stub - (TODO-RENAME-27 (_type_) none 27) - (TODO-RENAME-28 (_type_ collide-kind) none 28) + (nav-control-method-26 (_type_) none 26) ;; stub + (nav-control-method-27 (_type_) none 27) + (nav-control-method-28 (_type_ collide-kind) none 28) (should-display? (_type_) symbol 29) - (dummy-30 (_type_ vector vector vector) sphere 30) ;; TODO - last arg? - it has a float as the first arg, vector is a total guess + (nav-control-method-30 (_type_ vector vector vector) sphere 30) ;; TODO - last arg? - it has a float as the first arg, vector is a total guess (intersect-ray-line-segment? (_type_ vector vector vector vector) symbol 31) - (TODO-ASM-32 (_type_ vector vector vector vector float) symbol 32) - (TODO-RENAME-33 (_type_ vector vector vector vector float) symbol 33) - (dummy-34 () none 34) - (dummy-35 (_type_ vector vector vector vector float) none 35) + (nav-control-method-32 (_type_ vector vector vector vector float) symbol 32) + (nav-control-method-33 (_type_ vector vector vector vector float) symbol 33) + (nav-control-method-34 () none 34) + (nav-control-method-35 (_type_ vector vector vector vector float) none 35) ) ) @@ -18213,8 +18213,8 @@ :flag-assert #xc00000010 :pack-me (:methods - (dummy-9 (_type_) none 9) - (TODO-RENAME-10 (_type_ vector time-frame float process-drawable) vector 10) + (ambient-control-method-9 (_type_) none 9) + (ambient-control-method-10 (_type_ vector time-frame float process-drawable) vector 10) (play-ambient (_type_ string symbol vector) symbol 11) ) ) @@ -18265,26 +18265,26 @@ (idle () _type_ :state 30) ;; state (get-art-elem (_type_) art-element 31) (play-anim! (_type_ symbol) basic 32) ;; ret - spool-anim | .. - (dummy-33 (_type_) none 33) + (process-taskable-method-33 (_type_) none 33) (get-accept-anim (_type_ symbol) spool-anim 34) (push-accept-anim (_type_) none 35) (get-reject-anim (_type_ symbol) spool-anim 36) ;; ret - spool-anim | .. (push-reject-anim (_type_) none 37) - (dummy-38 (_type_) none 38) + (process-taskable-method-38 (_type_) none 38) (should-display? (_type_) symbol 39) - (dummy-40 (_type_ object skeleton-group int int vector int) none 40) + (process-taskable-method-40 (_type_ object skeleton-group int int vector int) none 40) (initialize-collision (_type_ int vector) none 41) - (dummy-42 (_type_) none 42) - (TODO-RENAME-43 (_type_) symbol 43) + (process-taskable-method-42 (_type_) none 42) + (process-taskable-method-43 (_type_) symbol 43) (play-reminder (_type_) symbol 44) - (dummy-45 (_type_) symbol 45) - (dummy-46 (_type_) none 46) + (process-taskable-method-45 (_type_) symbol 45) + (process-taskable-method-46 (_type_) none 46) (target-above-threshold? (_type_) symbol 47) (draw-npc-shadow (_type_) none 48) (hidden-other () _type_ :state 49) - (TODO-RENAME-50 (_type_) symbol 50) + (process-taskable-method-50 (_type_) symbol 50) (close-anim-file! (_type_) symbol 51) - (dummy-52 (_type_) none 52) + (process-taskable-method-52 (_type_) none 52) ) ) @@ -19625,14 +19625,14 @@ :flag-assert #x110000011c (:methods (new (symbol type process int float float float) _type_ 0) - (dummy-9 (_type_) none 9) - (dummy-10 (_type_) none 10) + (water-control-method-9 (_type_) none 9) + (water-control-method-10 (_type_) none 10) (start-bobbing! (_type_ float int int) none 11) (distance-from-surface (_type_) float 12) - (dummy-13 (_type_ float vector int vector) none 13) + (create-splash (_type_ float vector int vector) none 13) (display-water-marks? (_type_) symbol 14) - (TODO-RENAME-15 (_type_) none 15) - (TODO-RENAME-16 (_type_) none 16) + (water-control-method-15 (_type_) none 15) + (water-control-method-16 (_type_) none 16) ) ) @@ -19653,14 +19653,14 @@ (:methods (water-vol-idle () _type_ :state 20) (water-vol-startup () _type_ :state 21) - (TODO-RENAME-22 (_type_) none 22) ;; can also return an obs? + (water-vol-method-22 (_type_) none 22) ;; can also return an obs? (reset-root! (_type_) none 23) (set-stack-size! (_type_) none 24) - (TODO-RENAME-25 (_type_) none 25) - (TODO-RENAME-26 (_type_) none 26) - (dummy-27 (_type_) none 27) + (water-vol-method-25 (_type_) none 25) + (update! (_type_) none 26) + (on-exit-water (_type_) none 27) (get-ripple-height (_type_ vector) float 28) - (TODO-RENAME-29 (_type_) none 29) + (init! (_type_) none 29) ) ) @@ -20057,9 +20057,9 @@ :size-assert #x18 :flag-assert #xc00000018 (:methods - (dummy-9 (_type_ symbol vector-array vector-array) symbol 9) + (init-vol! (_type_ symbol vector-array vector-array) symbol 9) (debug-draw (_type_) none 10) - (dummy-11 (_type_ vector float) symbol 11) + (point-in-vol? (_type_ vector float) symbol 11) ) ) @@ -20115,9 +20115,9 @@ :flag-assert #xc0000061c (:methods (new (symbol type process-drawable) _type_ 0) - (dummy-9 (_type_) symbol 9) - (dummy-10 (_type_ vector) symbol 10) - (TODO-RENAME-11 (_type_) symbol 11) + (init! (_type_) symbol 9) + (point-in-vol? (_type_ vector) symbol 10) + (vol-control-method-11 (_type_) symbol 11) ) ) @@ -22105,7 +22105,7 @@ (params-init (_type_ entity) none 25) (art-init (_type_) crate 26) (params-set! (_type_ symbol symbol) none 27) - (dummy-28 (_type_) none 28) + (check-dead (_type_) none 28) (smush-update! (_type_) none 29) ) ) @@ -23126,20 +23126,20 @@ :size-assert #x1a8 :flag-assert #x17000001a8 (:methods - (TODO-RENAME-9 (_type_ float float float float) none 9) - (dummy-10 (_type_ float) none 10) + (rigid-body-method-9 (_type_ float float float float) none 9) + (rigid-body-method-10 (_type_ float) none 10) (clear-force-torque! (_type_) none 11) (clear-momentum! (_type_) none 12) - (TODO-RENAME-13 (_type_ vector vector) none 13) - (TODO-RENAME-14 (_type_ vector vector) none 14) - (TODO-RENAME-15 (_type_ vector) none 15) - (TODO-RENAME-16 (_type_ vector vector float) none 16) - (TODO-RENAME-17 (_type_ vector vector) vector 17) - (TODO-RENAME-18 (_type_ vector) vector 18) - (dummy-19 (_type_) none 19) - (dummy-20 (_type_) none 20) - (TODO-RENAME-21 (_type_) none 21) - (TODO-RENAME-22 (_type_ vector quaternion float float) none 22) + (rigid-body-method-13 (_type_ vector vector) none 13) + (rigid-body-method-14 (_type_ vector vector) none 14) + (rigid-body-method-15 (_type_ vector) none 15) + (rigid-body-method-16 (_type_ vector vector float) none 16) + (rigid-body-method-17 (_type_ vector vector) vector 17) + (rigid-body-method-18 (_type_ vector) vector 18) + (print-stats (_type_) none 19) + (rigid-body-method-20 (_type_) none 20) + (rigid-body-method-21 (_type_) none 21) + (rigid-body-method-22 (_type_ vector quaternion float float) none 22) ) ) @@ -23335,19 +23335,19 @@ (:methods (rigid-body-platform-idle () _type_ :state 20) (rigid-body-platform-float () _type_ :state 21) - (TODO-RENAME-22 (_type_ vector float) float 22) - (TODO-RENAME-23 (_type_ float) none 23) - (TODO-RENAME-24 (_type_ rigid-body-control-point float) none 24) - (TODO-RENAME-25 (_type_) none 25) - (TODO-RENAME-26 (_type_) none 26) - (TODO-RENAME-27 (_type_ vector) none 27) - (TODO-RENAME-28 (_type_) none 28) - (TODO-RENAME-29 (_type_ rigid-body-platform-constants) none 29) - (TODO-RENAME-30 (_type_) none 30) - (TODO-RENAME-31 (_type_) none 31) - (dummy-32 (_type_) sound-id 32) - (dummy-33 (_type_) object 33) - (TODO-RENAME-34 (_type_) none 34) + (rigid-body-platform-method-22 (_type_ vector float) float 22) + (rigid-body-platform-method-23 (_type_ float) none 23) + (rigid-body-platform-method-24 (_type_ rigid-body-control-point float) none 24) + (rigid-body-platform-method-25 (_type_) none 25) + (rigid-body-platform-method-26 (_type_) none 26) + (rigid-body-platform-method-27 (_type_ vector) none 27) + (rigid-body-platform-method-28 (_type_) none 28) + (rigid-body-platform-method-29 (_type_ rigid-body-platform-constants) none 29) + (rigid-body-platform-method-30 (_type_) none 30) + (rigid-body-platform-method-31 (_type_) none 31) + (rigid-body-platform-method-32 (_type_) sound-id 32) + (rigid-body-platform-method-33 (_type_) object 33) + (rigid-body-platform-method-34 (_type_) none 34) ) ) @@ -23513,48 +23513,48 @@ (nav-enemy-stare () _type_ :state 31) (nav-enemy-stop-chase () _type_ :state 32) (nav-enemy-victory () _type_ :state 33) - (dummy-34 (_type_) none 34) + (nav-enemy-method-34 (_type_) none 34) (nav-enemy-wait-for-cue () _type_ :state 35) (nav-enemy-jump-to-point () _type_ :state 36) - (TODO-RENAME-37 (_type_) none 37) - (TODO-RENAME-38 (_type_) none 38) + (nav-enemy-method-37 (_type_) none 37) + (nav-enemy-method-38 (_type_) none 38) (common-post (_type_) none 39) - (dummy-40 (_type_) none 40) - (dummy-41 (_type_) none 41) - (TODO-RENAME-42 (_type_) int 42) - (dummy-43 (_type_ process event-message-block) object 43) - (dummy-44 (_type_ process event-message-block) object 44) - (TODO-RENAME-45 (_type_ nav-enemy-info) none 45) - (TODO-RENAME-46 (_type_ float) basic 46) + (nav-enemy-method-40 (_type_) none 40) + (nav-enemy-method-41 (_type_) none 41) + (new-patrol-point! (_type_) int 42) + (attack-handler (_type_ process event-message-block) object 43) + (touch-handler (_type_ process event-message-block) object 44) + (init-defaults! (_type_ nav-enemy-info) none 45) + (target-in-range? (_type_ float) basic 46) (initialize-collision (_type_) none 47) - (TODO-RENAME-48 (_type_) none 48) ;; object past to method 60 -- see citb-bunny - (TODO-RENAME-49 (_type_ nav-enemy-info) float 49) - (TODO-RENAME-50 (_type_ vector) symbol 50) - (dummy-51 (_type_) none 51) ;; ret - float | symbol - (dummy-52 (_type_ vector) symbol 52) ;; ret - symbol | vector - (dummy-53 (_type_) symbol 53) ;; ret - symbol | none - (dummy-54 (_type_ vector) symbol 54) - (dummy-55 (_type_) symbol 55) + (nav-enemy-method-48 (_type_) none 48) ;; object past to method 60 -- see citb-bunny + (init-jm! (_type_ nav-enemy-info) float 49) + (nav-enemy-method-50 (_type_ vector) symbol 50) + (nav-enemy-method-51 (_type_) none 51) ;; ret - float | symbol + (nav-enemy-method-52 (_type_ vector) symbol 52) ;; ret - symbol | vector + (nav-enemy-method-53 (_type_) symbol 53) ;; ret - symbol | none + (nav-enemy-method-54 (_type_ vector) symbol 54) + (nav-enemy-method-55 (_type_) symbol 55) (set-jump-height-factor! (_type_ int) none 56) - (dummy-57 (_type_) none 57) - (dummy-58 (_type_) none 58) - (TODO-RENAME-59 (_type_) none 59) - (dummy-60 (_type_ symbol) symbol 60) + (nav-enemy-method-57 (_type_) none 57) + (nav-enemy-method-58 (_type_) none 58) + (nav-enemy-method-59 (_type_) none 59) + (nav-enemy-method-60 (_type_ symbol) symbol 60) (snow-bunny-attack () _type_ :state 61) (snow-bunny-chase-hop () _type_ :state 62) (snow-bunny-defend () _type_ :state 63) - (dummy-64 () _type_ :state 64) + (nav-enemy-method-64 () _type_ :state 64) (snow-bunny-lunge () _type_ :state 65) (snow-bunny-nav-resume () _type_ :state 66) (snow-bunny-patrol-hop () _type_ :state 67) (snow-bunny-patrol-idle () _type_ :state 68) - (dummy-69 () _type_ :state 69) + (nav-enemy-method-69 () _type_ :state 69) (snow-bunny-retreat-hop () _type_ :state 70) (snow-bunny-tune-spheres () _type_ :state 71) (nav-enemy-touch-handler (_type_ process event-message-block) object 72) (nav-enemy-attack-handler (_type_ process event-message-block) object 73) (nav-enemy-jump-blocked () _type_ :state 74) - (dummy-75 () _type_ :state 75) + (nav-enemy-method-75 () _type_ :state 75) ) ) @@ -23641,13 +23641,13 @@ :flag-assert #x1b008000e4 ;; inherited inspect of process-drawable (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) none 22) + (baseplat-method-20 (_type_) none 20) + (baseplat-method-21 (_type_) none 21) + (baseplat-method-22 (_type_) none 22) (get-unlit-skel (_type_) skeleton-group 23) - (dummy-24 (_type_) none 24) - (TODO-RENAME-25 (_type_) sparticle-launch-group 25) - (dummy-26 (_type_) none 26) + (baseplat-method-24 (_type_) none 24) + (baseplat-method-25 (_type_) sparticle-launch-group 25) + (baseplat-method-26 (_type_) none 26) ) ) @@ -23712,9 +23712,9 @@ (door-opening () _type_ :state 21) (door-open () _type_ :state 22) (door-closing () _type_ :state 23) - (TODO-RENAME-24 (_type_) none 24) - (TODO-RENAME-25 (_type_) none 25) - (dummy-26 (_type_) none 26) + (eco-door-method-24 (_type_) none 24) + (eco-door-method-25 (_type_) none 25) + (eco-door-method-26 (_type_) none 26) ) ) @@ -23763,10 +23763,10 @@ (basebutton-startup () _type_ :state 23) (basebutton-up-idle () _type_ :state 24) ;; state (reset! (_type_) float 25) - (TODO-RENAME-26 (_type_) none 26) - (TODO-RENAME-27 (_type_) collide-shape-moving 27) + (basebutton-method-26 (_type_) none 26) + (basebutton-method-27 (_type_) collide-shape-moving 27) (arm-trigger-event! (_type_) symbol 28) - (TODO-RENAME-29 (_type_ symbol entity) none 29) + (basebutton-method-29 (_type_ symbol entity) none 29) (move-to-vec-or-quat! (_type_ vector quaternion) quaternion 30) ;; args are optional (press! (_type_ symbol) int 31) ) @@ -23822,7 +23822,7 @@ :flag-assert #xb0000003c (:methods (reset! (_type_ process-drawable float float) none 9) - (TODO-RENAME-10 (_type_ process-drawable vector) symbol 10) + (tippy-method-10 (_type_ process-drawable vector) symbol 10) ) ) @@ -23926,15 +23926,15 @@ :heap-base #x1a0 :flag-assert #x1d01a00210 (:methods - (TODO-RENAME-20 (_type_ joint-exploder-list int) int 20) - (TODO-RENAME-21 (_type_ joint-exploder-list joint-exploder-joint) none 21) - (TODO-RENAME-22 (_type_ joint-exploder-list) symbol 22) - (TODO-RENAME-23 (_type_) symbol 23) - (TODO-RENAME-24 (_type_ joint-exploder-list int) int 24) - (TODO-RENAME-25 (_type_ joint-exploder-list) symbol 25) - (TODO-RENAME-26 (_type_ joint-exploder-list int) int 26) - (TODO-RENAME-27 (_type_ joint-exploder-list int) joint-exploder-list 27) - (TODO-RENAME-28 (_type_ joint-exploder-list) none 28) + (joint-exploder-method-20 (_type_ joint-exploder-list int) int 20) + (joint-exploder-method-21 (_type_ joint-exploder-list joint-exploder-joint) none 21) + (joint-exploder-method-22 (_type_ joint-exploder-list) symbol 22) + (joint-exploder-method-23 (_type_) symbol 23) + (joint-exploder-method-24 (_type_ joint-exploder-list int) int 24) + (joint-exploder-method-25 (_type_ joint-exploder-list) symbol 25) + (joint-exploder-method-26 (_type_ joint-exploder-list int) int 26) + (joint-exploder-method-27 (_type_ joint-exploder-list int) joint-exploder-list 27) + (joint-exploder-method-28 (_type_ joint-exploder-list) none 28) ) (:states joint-exploder-shatter) @@ -24079,7 +24079,7 @@ ;; inherited inspect of baseplat (:methods (get-lit-skel (_type_) skeleton-group 27) - (dummy-28 () none 28) + (plat-method-28 () none 28) (wad () _type_ :state 29) (plat-startup (plat) _type_ :state 30) ;; state (plat-idle () _type_ :state 31) ;; state @@ -24127,12 +24127,12 @@ (plat-button-move-upward () _type_ :state 24) (plat-button-teleport-to-other-end () _type_ :state 25) (can-activate? (_type_) symbol 26) - (TODO-RENAME-27 (_type_) none 27) - (TODO-RENAME-28 (_type_) collide-shape-moving 28) + (plat-button-method-27 (_type_) none 27) + (plat-button-method-28 (_type_) collide-shape-moving 28) (can-target-move? (_type_) none 29) (should-teleport? (_type_) symbol 30) - (TODO-RENAME-31 (_type_) none 31) ;; TODO - need to know super::14 - (TODO-RENAME-32 (_type_) none 32) + (plat-button-method-31 (_type_) none 31) ;; TODO - need to know super::14 + (plat-button-method-32 (_type_) none 32) ) ) @@ -24252,7 +24252,7 @@ (set-to-rest-state (_type_) none 25) (add-collision-meshes (_type_) none 26) (do-integration (_type_) none 27) ;; physics3 - (dummy-28 (_type_) none 28) + (ropebridge-method-28 (_type_) none 28) ) (:states ropebridge-idle) @@ -24386,8 +24386,8 @@ (:methods (rotate! (_type_ float) none 20) (tilt! (_type_ float) none 21) - (dummy-22 (_type_ float float float) none 22) ;; can return a #f is postbindinfo-ok is false - (dummy-23 (_type_) none 23) + (mistycannon-method-22 (_type_ float float float) none 22) ;; can return a #f is postbindinfo-ok is false + (mistycannon-method-23 (_type_) none 23) ) (:states mistycannon-idle @@ -24545,7 +24545,7 @@ (reset! (_type_ float float float) none 9) (inc-xy-vel! (_type_ float float) none 10) (move! (_type_) none 11) - (TODO-RENAME-12 (_type_ quaternion) none 12) + (wobbler-method-12 (_type_ quaternion) none 12) ) ) @@ -24586,10 +24586,10 @@ :flag-assert #xd00000028 (:methods (new (symbol type int int float float float float) _type_ 0) - (TODO-RENAME-9 (_type_ int int float) none 9) + (twister-method-9 (_type_ int int float) none 9) (set-target! (_type_ float) none 10) - (TODO-RENAME-11 (_type_) none 11) - (TODO-RENAME-12 (_type_ process-drawable) none 12) + (twister-method-11 (_type_) none 11) + (twister-method-12 (_type_ process-drawable) none 12) ) ) @@ -24686,7 +24686,7 @@ :heap-base #xa0 :flag-assert #x1500a00110 (:methods - (dummy-20 (_type_ float float float) none 20) + (flutflutegg-method-20 (_type_ float float float) none 20) ) (:states (flutflutegg-break symbol) @@ -24937,7 +24937,7 @@ :flag-assert #x16006000c8 ;; inherited inspect of process-drawable (:methods - (TODO-RENAME-20 (_type_) none 20) + (lurkerworm-method-20 (_type_) none 20) (particle-effect (_type_) none 21) ) (:states @@ -25088,12 +25088,12 @@ (:methods (move-vertically! (_type_ symbol) none 20) (adjust-heading-around-point-slow! (_type_ float) none 21) - (dummy-22 (_type_) none 22) + (seagull-method-22 (_type_) none 22) (adjust-heading-around-point! (_type_ float) none 23) - (dummy-24 (_type_) none 24) - (dummy-25 (_type_ float) none 25) - (dummy-26 (_type_) symbol 26) - (dummy-27 (_type_) none 27) + (seagull-method-24 (_type_) none 24) + (seagull-method-25 (_type_ float) none 25) + (seagull-method-26 (_type_) symbol 26) + (seagull-method-27 (_type_) none 27) ) (:states (seagull-idle) @@ -25128,7 +25128,7 @@ (:methods (spawn-bird (_type_ vector) (pointer process) 14) (play-hint (_type_ int) none 15) - (dummy-16 (_type_ seagull) float 16) + (seagullflock-method-16 (_type_ seagull) float 16) ) (:states (seagullflock-idle) @@ -25316,14 +25316,14 @@ :flag-assert #x1d0210027c ;; inherited inspect of process-drawable (:methods - (dummy-20 () none 20) + (battlecontroller-method-20 () none 20) (battlecontroller-idle () _type_ :state 21) (battlecontroller-play-intro-camera () _type_ :state 22) - (dummy-23 () none 23) + (battlecontroller-method-23 () none 23) (battlecontroller-active () _type_ :state 24) - (dummy-25 () none 25) + (battlecontroller-method-25 () none 25) (battlecontroller-die () _type_ :state 26) - (TODO-RENAME-27 (_type_) none 27) ;; has pairs + (battlecontroller-method-27 (_type_) none 27) ;; has pairs (cleanup-if-finished! (_type_) none 28) ) ) @@ -25474,7 +25474,7 @@ :flag-assert #x16005000bc (:methods (init! (_type_) none 20) - (dummy-21 (_type_) none 21) + (citb-disc-method-21 (_type_) none 21) ) (:states citb-disc-idle) @@ -25599,7 +25599,7 @@ :flag-assert #x1600c00124 (:methods (init! (_type_) none 20) - (dummy-21 (_type_) none 21) + (citb-generator-method-21 (_type_) none 21) ) (:states citb-generator-broken @@ -25681,10 +25681,10 @@ ;; inherited inspect of process-drawable (:methods (citb-base-plat-idle () _type_ :state 20) ;; state - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) none 22) + (citb-base-plat-method-21 (_type_) none 21) + (citb-base-plat-method-22 (_type_) none 22) (citb-base-plat-active () _type_ :state 23) ;; state - (dummy-24 (_type_) none 24) + (citb-base-plat-method-24 (_type_) none 24) ) ) @@ -25829,8 +25829,8 @@ :heap-base #x110 :flag-assert #x160110017c (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) none 21) + (citb-sagecage-method-20 (_type_) none 20) + (citb-sagecage-method-21 (_type_) none 21) ) (:states citb-sagecage-idle) @@ -25951,12 +25951,12 @@ :heap-base #x190 :flag-assert #x4d01900200 (:methods - (dummy-51 (_type_ vector vector) symbol :replace 51) - (dummy-52 (_type_) symbol :replace 52) - (dummy-54 (_type_) symbol :replace 54) - (dummy-57 (_type_) symbol :replace 57) - (dummy-60 (_type_) none :replace 60) - (dummy-76 (_type_ symbol) none 76) + (snow-bunny-method-51 (_type_ vector vector) symbol :replace 51) + (snow-bunny-method-52 (_type_) symbol :replace 52) + (snow-bunny-method-54 (_type_) symbol :replace 54) + (snow-bunny-method-57 (_type_) symbol :replace 57) + (snow-bunny-method-60 (_type_) none :replace 60) + (snow-bunny-method-76 (_type_ symbol) none 76) ) ) @@ -26000,7 +26000,7 @@ :heap-base #x190 :flag-assert #x4d01900200 (:methods - (TODO-RENAME-48 (_type_ object) none :replace 48)) ;; object past to method 60 + (citb-bunny-method-48 (_type_ object) none :replace 48)) ;; object past to method 60 ) ;; - Unknowns @@ -26032,8 +26032,8 @@ :heap-base #x80 :flag-assert #x16008000e1 (:methods - (TODO-RENAME-20 (_type_) none 20) - (dummy-21 (_type_) none 21) + (drop-plat-method-20 (_type_) none 20) + (drop-plat-method-21 (_type_) none 21) ) (:states drop-plat-spawn @@ -26392,10 +26392,10 @@ :size-assert #x28 :flag-assert #xd00000028 (:methods - (dummy-9 (_type_ vector) none 9) - (TODO-RENAME-10 (_type_ collide-prim-core vector) symbol 10) - (dummy-11 (_type_ vector) symbol 11) - (dummy-12 (_type_ vector) vector 12) + (torus-method-9 (_type_ vector) none 9) + (torus-method-10 (_type_ collide-prim-core vector) symbol 10) + (torus-method-11 (_type_ vector) symbol 11) + (torus-method-12 (_type_ vector) vector 12) ) ) @@ -26589,7 +26589,7 @@ :heap-base #x170 :flag-assert #x4c017001d8 (:methods - (dummy-51 (_type_ vector) symbol :replace 51)) + (green-eco-lurker-method-51 (_type_ vector) symbol :replace 51)) (:states green-eco-lurker-appear green-eco-lurker-appear-land @@ -26702,7 +26702,7 @@ ;; not enough basic ops (:methods (idle () _type_ :state 20) ;; state - (dummy-21 (_type_) none 21) + (final-door-method-21 (_type_) none 21) (open (symbol) _type_ :state 22) ) ) @@ -26734,7 +26734,7 @@ :heap-base #x70 :flag-assert #x17007000d4 (:methods - (dummy-20 () none 20) + (powercellalt-method-20 () none 20) (jump () _type_ :state 21) (idle () _type_ :state 22) ) @@ -27195,11 +27195,11 @@ :heap-base #x220 :flag-assert #x190220028c (:methods - (dummy-20 (_type_) symbol 20) - (dummy-21 (_type_) symbol 21) - (dummy-22 (_type_ float) symbol 22) - (dummy-23 (_type_) none 23) - (dummy-24 (_type_) none 24) + (junglesnake-method-20 (_type_) symbol 20) + (junglesnake-method-21 (_type_) symbol 21) + (junglesnake-method-22 (_type_ float) symbol 22) + (junglesnake-method-23 (_type_) none 23) + (junglesnake-method-24 (_type_) none 24) ) (:states junglesnake-sleeping @@ -28598,13 +28598,13 @@ :flag-assert #x110000008c (:methods (init! (_type_ vehicle-path (pointer float) (pointer float) int float) none 9) - (TODO-RENAME-10 (_type_ vector float int) none 10) - (dummy-11 (_type_) none 11) - (TODO-RENAME-12 (_type_ int vector) none 12) + (vehicle-controller-method-10 (_type_ vector float int) none 10) + (vehicle-controller-method-11 (_type_) none 11) + (vehicle-controller-method-12 (_type_ int vector) none 12) (move-to-next-point (_type_ vector) none 13) - (TODO-RENAME-14 (_type_ vector vector) none 14) - (dummy-15 (_type_ collide-shape-moving) none 15) - (dummy-16 (_type_) none 16) + (vehicle-controller-method-14 (_type_ vector vector) none 14) + (vehicle-controller-method-15 (_type_ collide-shape-moving) none 15) + (vehicle-controller-method-16 (_type_) none 16) ) ) @@ -29397,8 +29397,8 @@ :heap-base #x40 :flag-assert #x16004000b0 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) none 21) + (balloonlurker-pilot-method-20 (_type_) none 20) + (balloonlurker-pilot-method-21 (_type_) none 21) ) (:states balloonlurker-pilot-idle @@ -29854,7 +29854,7 @@ :flag-assert #xb00000018 (:methods (init! (_type_ float float float float) none 9) - (TODO-RENAME-10 (_type_ float) none 10) + (swamp-rope-oscillator-method-10 (_type_ float) none 10) ) ) @@ -29889,7 +29889,7 @@ :flag-assert #xb0000003c (:methods (init! (_type_ vector float float float) none 9) - (TODO-RENAME-10 (_type_ vector) none 10) + (swamp-blimp-oscillator-method-10 (_type_ vector) none 10) ) ) @@ -29954,7 +29954,7 @@ :heap-base #xb0 :flag-assert #x1500b00120 (:methods - (dummy-20 (_type_) basic 20) ;; ret - entity-actor | symbol + (swamp-rope-method-20 (_type_) basic 20) ;; ret - entity-actor | symbol ) (:states swamp-rope-idle-rock @@ -30257,7 +30257,7 @@ :size-assert #x30 :flag-assert #xa00000030 (:methods - (TODO-RENAME-9 (_type_ vector float) vector 9) + (swamp-bat-idle-path-method-9 (_type_ vector float) vector 9) ) ) @@ -30302,7 +30302,7 @@ :heap-base #xb0 :flag-assert #x1500b00118 (:methods - (dummy-20 (_type_) float 20) + (swamp-bat-slave-method-20 (_type_) float 20) ) (:states swamp-bat-slave-idle @@ -30426,8 +30426,8 @@ :heap-base #x60 :flag-assert #x16006000cc (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) int 21) + (swamp-rat-nest-dummy-method-20 (_type_) none 20) + (swamp-rat-nest-dummy-method-21 (_type_) int 21) ) (:states swamp-rat-nest-dummy-idle @@ -30703,10 +30703,10 @@ :size-assert #x170 :flag-assert #xf00000170 (:methods - (TODO-RENAME-9 (_type_ int float process-drawable) none 9) - (TODO-RENAME-10 (_type_ vector) float 10) + (cavecrystal-light-control-method-9 (_type_ int float process-drawable) none 9) + (cavecrystal-light-control-method-10 (_type_ vector) float 10) (inc-intensities! (_type_) none 11) - (TODO-RENAME-12 (_type_) none 12) + (cavecrystal-light-control-method-12 (_type_) none 12) (create-connection! (_type_ process-drawable res-lump (function object object object object object) int float) connection 13) ;; TODO - process-drawable is often a cavecrystal (execute-connections (_type_) int 14) ) @@ -30829,8 +30829,8 @@ :heap-base #xe0 :flag-assert #x1600e00150 (:methods - (TODO-RENAME-20 (_type_) none 20) - (TODO-RENAME-21 (_type_) float 21) + (caveelevator-method-20 (_type_) none 20) + (caveelevator-method-21 (_type_) float 21) ) (:states caveelevator-cycle-active @@ -30940,8 +30940,8 @@ :heap-base #x90 :flag-assert #x1600900100 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) symbol 21) + (dark-crystal-method-20 (_type_) none 20) + (dark-crystal-method-21 (_type_) symbol 21) ) (:states dark-crystal-spawn-fuel-cell @@ -31135,16 +31135,16 @@ :heap-base #x180 :flag-assert #x20018001f0 (:methods - (TODO-RENAME-20 (_type_ vector vector) symbol 20) - (TODO-RENAME-21 (_type_ vector float symbol) symbol 21) - (dummy-22 (_type_ matrix vector) float 22) - (TODO-RENAME-23 (_type_) none 23) - (TODO-RENAME-24 (_type_) number 24) + (mother-spider-method-20 (_type_ vector vector) symbol 20) + (mother-spider-method-21 (_type_ vector float symbol) symbol 21) + (mother-spider-method-22 (_type_ matrix vector) float 22) + (mother-spider-method-23 (_type_) none 23) + (shadow-handler (_type_) number 24) (letgo-player? (_type_) symbol 25) (grab-player? (_type_) symbol 26) - (STUB-27 (_type_) none 27) - (STUB-28 (_type_) none 28) - (TODO-RENAME-29 (_type_ symbol symbol) none 29) + (mother-spider-method-27 (_type_) none 27) + (mother-spider-method-28 (_type_) none 28) + (mother-spider-method-29 (_type_ symbol symbol) none 29) (spawn-child (_type_ vector vector symbol) int 30) (is-player-stuck? (_type_) symbol 31) ) @@ -31189,7 +31189,7 @@ :heap-base #xe0 :flag-assert #x1600e00150 (:methods - (dummy-20 (_type_) none 20) + (mother-spider-egg-method-20 (_type_) none 20) (draw-egg-shadow (_type_ vector symbol) symbol 21) ) (:states @@ -31341,17 +31341,17 @@ :heap-base #x560 :flag-assert #x1f056005d0 (:methods - (dummy-20 (_type_ int) matrix 20) - (dummy-21 (_type_ int bounding-box symbol float) float 21) - (dummy-22 (_type_ float) symbol 22) - (dummy-23 (_type_) none 23) - (dummy-24 (_type_) none 24) - (dummy-25 (_type_) symbol 25) - (dummy-26 (_type_) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_ int int) symbol 28) - (dummy-29 (_type_ int vector vector) float 29) - (dummy-30 (_type_ process-drawable) uint 30) + (gnawer-method-20 (_type_ int) matrix 20) + (gnawer-method-21 (_type_ int bounding-box symbol float) float 21) + (gnawer-method-22 (_type_ float) symbol 22) + (gnawer-method-23 (_type_) none 23) + (gnawer-method-24 (_type_) none 24) + (gnawer-method-25 (_type_) symbol 25) + (gnawer-method-26 (_type_) none 26) + (gnawer-method-27 (_type_) none 27) + (gnawer-method-28 (_type_ int int) symbol 28) + (gnawer-method-29 (_type_ int vector vector) float 29) + (gnawer-method-30 (_type_ process-drawable) uint 30) ) (:states gnawer-put-items-at-dest @@ -31416,14 +31416,14 @@ :heap-base #xc0 :flag-assert #x1c00c00128 (:methods - (dummy-20 (_type_ symbol target) symbol 20) - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) none 22) - (dummy-23 (_type_) float 23) - (dummy-24 (_type_) symbol 24) - (dummy-25 (_type_) symbol 25) - (dummy-26 (_type_) symbol 26) - (dummy-27 (_type_) object 27) + (driller-lurker-method-20 (_type_ symbol target) symbol 20) + (driller-lurker-method-21 (_type_) none 21) + (driller-lurker-method-22 (_type_) none 22) + (driller-lurker-method-23 (_type_) float 23) + (driller-lurker-method-24 (_type_) symbol 24) + (driller-lurker-method-25 (_type_) symbol 25) + (driller-lurker-method-26 (_type_) symbol 26) + (driller-lurker-method-27 (_type_) object 27) ) (:states driller-lurker-idle-drilling @@ -31640,7 +31640,7 @@ :heap-base #xc0 :flag-assert #x1c00c00130 (:methods - (TODO-RENAME-27 (_type_ symbol) none 27) + (square-platform-method-27 (_type_ symbol) none 27) ) (:states square-platform-lowered @@ -31745,7 +31745,7 @@ :heap-base #x50 :flag-assert #x15005000b4 (:methods - (dummy-20 (_type_ vector vector) none 20) + (orbit-plat-bottom-method-20 (_type_ vector vector) none 20) ) (:states orbit-plat-bottom-idle) @@ -31765,8 +31765,8 @@ :heap-base #xb0 :flag-assert #x1d00b00118 (:methods - (dummy-27 (_type_) symbol 27) - (dummy-28 (_type_) symbol 28) + (orbit-plat-method-27 (_type_) symbol 27) + (orbit-plat-method-28 (_type_) symbol 28) ) (:states orbit-plat-wait-for-other @@ -31821,7 +31821,7 @@ :heap-base #x80 :flag-assert #x1c008000f0 (:methods - (dummy-27 (_type_) symbol 27) + (wedge-plat-method-27 (_type_) symbol 27) ) (:states wedge-plat-idle @@ -31985,8 +31985,8 @@ :heap-base #xf0 :flag-assert #x1600f00160 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) quaternion 21) + (steam-cap-method-20 (_type_) none 20) + (steam-cap-method-21 (_type_) quaternion 21) ) (:states (steam-cap-idle)) @@ -32018,7 +32018,7 @@ :heap-base #x80 :flag-assert #x15008000f0 (:methods - (dummy-20 (_type_ float) vector 20) + (blue-eco-charger-orb-method-20 (_type_ float) vector 20) ) (:states blue-eco-charger-orb-idle @@ -32036,8 +32036,8 @@ :heap-base #x50 :flag-assert #x16005000bc (:methods - (dummy-20 (_type_) object 20) - (dummy-21 (_type_ symbol) object 21) + (blue-eco-charger-method-20 (_type_) object 20) + (blue-eco-charger-method-21 (_type_ symbol) object 21) ) (:states blue-eco-charger-idle @@ -32077,11 +32077,11 @@ :heap-base #x90 :flag-assert #x1900900100 (:methods - (dummy-20 (_type_ float) float 20) - (dummy-21 (_type_ exit-chamber-items) vector 21) - (dummy-22 (_type_) none 22) - (dummy-23 (_type_ symbol) object 23) - (dummy-24 (_type_ float) none 24) + (exit-chamber-method-20 (_type_ float) float 20) + (exit-chamber-method-21 (_type_ exit-chamber-items) vector 21) + (exit-chamber-method-22 (_type_) none 22) + (exit-chamber-method-23 (_type_ symbol) object 23) + (exit-chamber-method-24 (_type_ float) none 24) ) (:states exit-chamber-charger-puzzle @@ -32192,7 +32192,7 @@ :heap-base #x60 :flag-assert #x15006000cc (:methods - (dummy-20 (_type_ float) cshape-moving-flags 20) + (whirlpool-method-20 (_type_ float) cshape-moving-flags 20) ) (:states (whirlpool-idle)) @@ -32251,9 +32251,9 @@ :heap-base #x230 :flag-assert #x17023002a0 (:methods - (dummy-20 (_type_) uint 20) - (dummy-21 (_type_ symbol) symbol 21) - (dummy-22 (_type_ symbol) none 22) + (sunken-pipegame-method-20 (_type_) uint 20) + (sunken-pipegame-method-21 (_type_ symbol) symbol 21) + (sunken-pipegame-method-22 (_type_ symbol) none 22) ) (:states sunken-pipegame-start-up @@ -32310,7 +32310,7 @@ :heap-base #x90 :flag-assert #x15009000f4 (:methods - (dummy-20 (_type_) float 20) + (bully-method-20 (_type_) float 20) ) (:states (bully-idle symbol) @@ -32367,7 +32367,7 @@ ) (:methods (initialize-collision (_type_) collide-shape-moving :replace 47) - (dummy-53 (_type_ vector) symbol :replace 53) + (double-lurker-method-53 (_type_ vector) symbol :replace 53) ) :method-count-assert 76 :size-assert #x1a8 @@ -32459,8 +32459,8 @@ :heap-base #x60 :flag-assert #x16006000c8 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) object 21) + (helix-water-method-20 (_type_) none 20) + (helix-water-method-21 (_type_) object 21) ) (:states helix-water-idle @@ -32520,18 +32520,18 @@ :heap-base #x130 :flag-assert #x2001300198 (:methods - (dummy-20 (_type_ vector) none 20) - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) symbol 22) - (dummy-23 (_type_ symbol) symbol 23) - (dummy-24 (_type_ vector) symbol 24) - (dummy-25 (_type_ float) symbol 25) - (dummy-26 (_type_) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_) none 28) + (puffer-method-20 (_type_ vector) none 20) + (puffer-method-21 (_type_) none 21) + (puffer-method-22 (_type_) symbol 22) + (puffer-method-23 (_type_ symbol) symbol 23) + (puffer-method-24 (_type_ vector) symbol 24) + (puffer-method-25 (_type_ float) symbol 25) + (puffer-method-26 (_type_) none 26) + (puffer-method-27 (_type_) none 27) + (puffer-method-28 (_type_) none 28) (flip-look! (_type_ symbol) none 29) - (dummy-30 (_type_) vector 30) - (dummy-31 (_type_) vector 31) + (puffer-method-30 (_type_) vector 30) + (puffer-method-31 (_type_) vector 31) ) (:states puffer-idle @@ -32593,14 +32593,14 @@ :heap-base #xd0 :flag-assert #x1c00d00140 (:methods - (TODO-RENAME-20 (_type_) float 20) - (TODO-RENAME-orbit?-21 (_type_ vector float vector) vector 21) - (dummy-22 (_type_) none 22) - (TODO-RENAME-23 (_type_) quaternion 23) - (TODO-RENAME-24 (_type_) vector 24) - (dummy-25 (_type_) none 25) - (TODO-RENAME-26 (_type_) float 26) - (TODO-RENAME-27 (_type_) float 27) + (sunkenfisha-method-20 (_type_) float 20) + (sunkenfisha-method-21 (_type_ vector float vector) vector 21) + (sunkenfisha-method-22 (_type_) none 22) + (sunkenfisha-method-23 (_type_) quaternion 23) + (sunkenfisha-method-24 (_type_) vector 24) + (sunkenfisha-method-25 (_type_) none 25) + (sunkenfisha-method-26 (_type_) float 26) + (sunkenfisha-method-27 (_type_) float 27) ) (:states sunkenfisha-idle) @@ -33509,7 +33509,7 @@ :heap-base #xc0 :flag-assert #x1500c00130 (:methods - (dummy-20 (_type_) none 20) + (flying-lurker-method-20 (_type_) none 20) ) (:states flying-lurker-die @@ -33770,7 +33770,7 @@ :heap-base #x70 :flag-assert #x15007000e0 (:methods - (TODO-RENAME-20 (_type_) symbol 20) + (cave-trap-method-20 (_type_) symbol 20) ) (:states cave-trap-idle @@ -33920,8 +33920,8 @@ :heap-base #x180 :flag-assert #x4c018001f0 (:methods - (dummy-51 (_type_ vector vector) symbol :replace 51) - (dummy-53 (_type_ vector vector) symbol :replace 53) + (ice-cube-method-51 (_type_ vector vector) symbol :replace 51) + (ice-cube-method-53 (_type_ vector vector) symbol :replace 53) ) (:states ice-cube-face-player @@ -34008,7 +34008,7 @@ (:methods (follow-path (_type_) none 20) (play-landing-sound (_type_ float) sound-id 21) - (dummy-22 (_type_ process-drawable) none 22) + (snow-ball-roller-method-22 (_type_ process-drawable) none 22) ) (:states snow-ball-roller-idle) @@ -34027,8 +34027,8 @@ :heap-base #x20 :flag-assert #x100020008c (:methods - (dummy-14 (_type_ (inline-array snow-ball-junction) float int) symbol 14) - (dummy-15 (_type_ (inline-array snow-ball-junction) int) symbol 15) + (snow-ball-method-14 (_type_ (inline-array snow-ball-junction) float int) symbol 14) + (snow-ball-method-15 (_type_ (inline-array snow-ball-junction) int) symbol 15) ) (:states snow-ball-idle) @@ -34131,7 +34131,7 @@ :heap-base #x40 :flag-assert #x15004000b0 (:methods - (TODO-RENAME-20 (_type_) none 20) + (snow-gears-method-20 (_type_) none 20) ) (:states snow-gears-idle @@ -34310,7 +34310,7 @@ :heap-base #x60 :flag-assert #x16006000c8 (:methods - (dummy-20 (_type_) none 20) + (snow-bumper-method-20 (_type_) none 20) (shove-player (_type_ process-drawable) none 21) ) (:states @@ -34348,9 +34348,9 @@ :heap-base #x70 :flag-assert #x17007000e0 (:methods - (dummy-20 (_type_) object 20) - (dummy-21 (_type_) object 21) - (dummy-22 (_type_) symbol 22) + (ram-method-20 (_type_) object 20) + (ram-method-21 (_type_) object 21) + (ram-method-22 (_type_) symbol 22) ) (:states ram-fun-idle @@ -34408,9 +34408,9 @@ :heap-base #x190 :flag-assert #x4c019001f4 (:methods - (dummy-51 (_type_ vector) symbol :replace 51) - (dummy-52 (_type_) symbol :replace 52) - (dummy-57 (_type_ float) float :replace 57) + (ram-boss-method-51 (_type_ vector) symbol :replace 51) + (ram-boss-method-52 (_type_) symbol :replace 52) + (ram-boss-method-57 (_type_ float) float :replace 57) ) (:states ram-boss-tracking @@ -34509,7 +34509,7 @@ :heap-base #x60 :flag-assert #x16006000c8 (:methods - (TODO-RENAME-20 (_type_ vector vector) symbol 20) + (yeti-method-20 (_type_ vector vector) symbol 20) (aggro? (_type_ vector) symbol 21) ) (:states @@ -34983,8 +34983,8 @@ :heap-base #xe0 ;; inherited inpspect of process-drawable (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) none 21) + (cavegeyserrock-method-20 (_type_) none 20) + (cavegeyserrock-method-21 (_type_) none 21) ) (:states cavegeyserrock-idle diff --git a/decompiler/config/jak1/ntsc_v1/hacks.jsonc b/decompiler/config/jak1/ntsc_v1/hacks.jsonc index c2b0efa882..7717155354 100644 --- a/decompiler/config/jak1/ntsc_v1/hacks.jsonc +++ b/decompiler/config/jak1/ntsc_v1/hacks.jsonc @@ -337,7 +337,8 @@ "~0k~5d/~d ~6d/~d ~6d/~d ": 6, "~0k~s~%": 1, "money ~A was killed in pickup~%": 0, - " id address name aid tsk lev status x y z address name state heap flags~%": 3 + " id address name aid tsk lev status x y z address name state heap flags~%": 3, + "ERROR: Exceeded max # of spheres in collide-cache::probe-using-spheres!~": 0 }, "blocks_ending_in_asm_branch": { diff --git a/goal_src/jak1/engine/anim/joint-exploder.gc b/goal_src/jak1/engine/anim/joint-exploder.gc index 722811e80e..646ce6b1c7 100644 --- a/goal_src/jak1/engine/anim/joint-exploder.gc +++ b/goal_src/jak1/engine/anim/joint-exploder.gc @@ -105,15 +105,15 @@ :size-assert #x210 :flag-assert #x1d01a00210 (:methods - (TODO-RENAME-20 (_type_ joint-exploder-list int) int 20) - (TODO-RENAME-21 (_type_ joint-exploder-list joint-exploder-joint) none 21) - (TODO-RENAME-22 (_type_ joint-exploder-list) symbol 22) - (TODO-RENAME-23 (_type_) symbol 23) - (TODO-RENAME-24 (_type_ joint-exploder-list int) int 24) - (TODO-RENAME-25 (_type_ joint-exploder-list) symbol 25) - (TODO-RENAME-26 (_type_ joint-exploder-list int) int 26) - (TODO-RENAME-27 (_type_ joint-exploder-list int) joint-exploder-list 27) - (TODO-RENAME-28 (_type_ joint-exploder-list) none 28) + (joint-exploder-method-20 (_type_ joint-exploder-list int) int 20) + (joint-exploder-method-21 (_type_ joint-exploder-list joint-exploder-joint) none 21) + (joint-exploder-method-22 (_type_ joint-exploder-list) symbol 22) + (joint-exploder-method-23 (_type_) symbol 23) + (joint-exploder-method-24 (_type_ joint-exploder-list int) int 24) + (joint-exploder-method-25 (_type_ joint-exploder-list) symbol 25) + (joint-exploder-method-26 (_type_ joint-exploder-list int) int 26) + (joint-exploder-method-27 (_type_ joint-exploder-list int) joint-exploder-list 27) + (joint-exploder-method-28 (_type_ joint-exploder-list) none 28) ) (:states joint-exploder-shatter @@ -157,8 +157,8 @@ (none) ) -(defmethod TODO-RENAME-24 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) - (let ((v0-0 (TODO-RENAME-26 obj arg0 arg1))) +(defmethod joint-exploder-method-24 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) + (let ((v0-0 (joint-exploder-method-26 obj arg0 arg1))) (let* ((v1-1 (-> obj joints)) (v1-2 (-> v1-1 joint arg1)) ) @@ -171,7 +171,7 @@ ) ) -(defmethod TODO-RENAME-26 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) +(defmethod joint-exploder-method-26 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) (let* ((v1-0 (-> obj joints)) (a2-1 (-> v1-0 joint arg1)) (a0-4 (-> a2-1 prev)) @@ -202,7 +202,7 @@ ) ) -(defmethod TODO-RENAME-20 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) +(defmethod joint-exploder-method-20 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) (let* ((v1-0 (-> obj joints)) (a3-0 (-> v1-0 joint arg1)) (a0-4 (-> arg0 head)) @@ -217,7 +217,7 @@ ) ) -(defmethod TODO-RENAME-21 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 joint-exploder-joint)) +(defmethod joint-exploder-method-21 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 joint-exploder-joint)) (let ((a1-1 (-> arg1 mat vector 3))) (cond ((-> arg0 bbox-valid?) @@ -234,7 +234,7 @@ (none) ) -(defmethod TODO-RENAME-27 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) +(defmethod joint-exploder-method-27 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) (local-vars (sv-16 int) (sv-32 int) (sv-48 int)) (let ((s4-0 (the-as joint-exploder-list #f))) (let ((v1-0 1)) @@ -270,13 +270,13 @@ (let ((s0-0 (-> s2-0 joint s1-0))) (cond ((>= (-> s0-0 mat vector 3 x) f30-0) - (set! sv-16 (TODO-RENAME-26 obj arg0 s1-0)) - (TODO-RENAME-20 obj (the-as joint-exploder-list s3-0) s1-0) + (set! sv-16 (joint-exploder-method-26 obj arg0 s1-0)) + (joint-exploder-method-20 obj (the-as joint-exploder-list s3-0) s1-0) (set! s1-0 sv-16) - (TODO-RENAME-21 obj (the-as joint-exploder-list s3-0) s0-0) + (joint-exploder-method-21 obj (the-as joint-exploder-list s3-0) s0-0) ) (else - (TODO-RENAME-21 obj arg0 s0-0) + (joint-exploder-method-21 obj arg0 s0-0) (set! s1-0 (-> s0-0 next)) ) ) @@ -290,13 +290,13 @@ (let ((s0-1 (-> s2-0 joint s1-0))) (cond ((>= (-> s0-1 mat vector 3 y) f30-1) - (set! sv-32 (TODO-RENAME-26 obj arg0 s1-0)) - (TODO-RENAME-20 obj (the-as joint-exploder-list s3-0) s1-0) + (set! sv-32 (joint-exploder-method-26 obj arg0 s1-0)) + (joint-exploder-method-20 obj (the-as joint-exploder-list s3-0) s1-0) (set! s1-0 sv-32) - (TODO-RENAME-21 obj (the-as joint-exploder-list s3-0) s0-1) + (joint-exploder-method-21 obj (the-as joint-exploder-list s3-0) s0-1) ) (else - (TODO-RENAME-21 obj arg0 s0-1) + (joint-exploder-method-21 obj arg0 s0-1) (set! s1-0 (-> s0-1 next)) ) ) @@ -310,13 +310,13 @@ (let ((s0-2 (-> s2-0 joint s1-0))) (cond ((>= (-> s0-2 mat vector 3 z) f30-2) - (set! sv-48 (TODO-RENAME-26 obj arg0 s1-0)) - (TODO-RENAME-20 obj (the-as joint-exploder-list s3-0) s1-0) + (set! sv-48 (joint-exploder-method-26 obj arg0 s1-0)) + (joint-exploder-method-20 obj (the-as joint-exploder-list s3-0) s1-0) (set! s1-0 sv-48) - (TODO-RENAME-21 obj (the-as joint-exploder-list s3-0) s0-2) + (joint-exploder-method-21 obj (the-as joint-exploder-list s3-0) s0-2) ) (else - (TODO-RENAME-21 obj arg0 s0-2) + (joint-exploder-method-21 obj arg0 s0-2) (set! s1-0 (-> s0-2 next)) ) ) @@ -331,39 +331,39 @@ ) ) -(defmethod TODO-RENAME-28 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) +(defmethod joint-exploder-method-28 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) (when (and (-> arg0 bbox-valid?) (>= (-> arg0 head) 0)) (cond ((< 20480.0 (- (-> arg0 bbox max x) (-> arg0 bbox min x))) - (let ((a1-2 (TODO-RENAME-27 obj arg0 0))) + (let ((a1-2 (joint-exploder-method-27 obj arg0 0))) (if a1-2 - (TODO-RENAME-28 obj a1-2) + (joint-exploder-method-28 obj a1-2) ) ) - (TODO-RENAME-28 obj arg0) + (joint-exploder-method-28 obj arg0) ) ((< 20480.0 (- (-> arg0 bbox max y) (-> arg0 bbox min y))) - (let ((a1-5 (TODO-RENAME-27 obj arg0 1))) + (let ((a1-5 (joint-exploder-method-27 obj arg0 1))) (if a1-5 - (TODO-RENAME-28 obj a1-5) + (joint-exploder-method-28 obj a1-5) ) ) - (TODO-RENAME-28 obj arg0) + (joint-exploder-method-28 obj arg0) ) ((< 20480.0 (- (-> arg0 bbox max z) (-> arg0 bbox min z))) - (let ((a1-8 (TODO-RENAME-27 obj arg0 2))) + (let ((a1-8 (joint-exploder-method-27 obj arg0 2))) (if a1-8 - (TODO-RENAME-28 obj a1-8) + (joint-exploder-method-28 obj a1-8) ) ) - (TODO-RENAME-28 obj arg0) + (joint-exploder-method-28 obj arg0) ) ) ) (none) ) -(defmethod TODO-RENAME-25 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) +(defmethod joint-exploder-method-25 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) (set! (-> arg0 bbox-valid?) #f) (set! (-> arg0 pre-moved?) #t) (let ((s4-0 (-> obj joints)) @@ -393,10 +393,10 @@ ((or (< (-> s1-0 y) (-> obj die-if-below-y)) (< (-> obj die-if-beyond-xz-dist-sqrd) (vector-vector-xz-distance s1-0 (-> obj root trans))) ) - (set! s3-0 (TODO-RENAME-24 obj arg0 s3-0)) + (set! s3-0 (joint-exploder-method-24 obj arg0 s3-0)) ) (else - (TODO-RENAME-21 obj arg0 s2-0) + (joint-exploder-method-21 obj arg0 s2-0) (set! s3-0 (-> s2-0 next)) ) ) @@ -406,7 +406,7 @@ #f ) -(defmethod TODO-RENAME-22 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) +(defmethod joint-exploder-method-22 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) (fill-using-bounding-box *collide-cache* (-> arg0 bbox) @@ -424,7 +424,15 @@ (s3-0 (new 'stack-no-clear 'collide-tri-result)) ) (vector-! a2-1 s4-0 (-> s5-1 prev-pos)) - (when (>= (probe-using-line-sphere *collide-cache* (-> s5-1 prev-pos) a2-1 40.96 (collide-kind background) s3-0 (new 'static 'pat-surface :noentity #x1)) + (when (>= (probe-using-line-sphere + *collide-cache* + (-> s5-1 prev-pos) + a2-1 + 40.96 + (collide-kind background) + s3-0 + (new 'static 'pat-surface :noentity #x1) + ) 0.0 ) (set! (-> s4-0 quad) (-> s3-0 intersect quad)) @@ -470,9 +478,9 @@ (let ((s5-0 (-> self lists gp-0))) (when (>= (-> s5-0 head) 0) (when (not (-> s5-0 pre-moved?)) - (TODO-RENAME-25 self s5-0) + (joint-exploder-method-25 self s5-0) (if (nonzero? gp-0) - (TODO-RENAME-28 self s5-0) + (joint-exploder-method-28 self s5-0) ) ) ) @@ -489,7 +497,7 @@ (add-box! gp-1 (-> s4-0 bbox)) ) (if (nonzero? s5-1) - (TODO-RENAME-22 self s4-0) + (joint-exploder-method-22 self s4-0) ) ) ) @@ -521,7 +529,7 @@ :post (the-as (function none :behavior joint-exploder) ja-post) ) -(defmethod TODO-RENAME-23 joint-exploder ((obj joint-exploder)) +(defmethod joint-exploder-method-23 joint-exploder ((obj joint-exploder)) (let ((gp-0 (-> obj joints))) (dotimes (s4-0 (-> gp-0 num-joints)) (let ((v1-2 (-> obj static-params joints s4-0)) @@ -647,7 +655,7 @@ (ja-channel-set! 1) (ja :group! (-> self anim) :num! min) (ja-post) - (TODO-RENAME-23 self) + (joint-exploder-method-23 self) (set! (-> self die-if-below-y) (+ -102400.0 (-> self root trans y))) (set! (-> self skel postbind-function) joint-exploder-joint-callback) (go joint-exploder-shatter) @@ -681,7 +689,3 @@ ) ) ) - - - - diff --git a/goal_src/jak1/engine/camera/cam-combiner.gc b/goal_src/jak1/engine/camera/cam-combiner.gc index 5b9506a66e..a01cbfc03a 100644 --- a/goal_src/jak1/engine/camera/cam-combiner.gc +++ b/goal_src/jak1/engine/camera/cam-combiner.gc @@ -8,176 +8,170 @@ ;; DECOMP BEGINS (defstate cam-combiner-active (camera-combiner) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - object - (cond - ((= v1-0 'point-of-interest) - (cond - ((-> arg3 param 0) - (set! (-> self tracking use-point-of-interest) #t) - (set! (-> self tracking point-of-interest quad) (-> (the-as vector (-> arg3 param 0)) quad)) - (let ((f0-0 1.0)) - (set! (-> self tracking point-of-interest-blend target) f0-0) - f0-0 - ) - ) - (else - (set! (-> self tracking use-point-of-interest) #f) - (let ((f0-1 0.0)) - (set! (-> self tracking point-of-interest-blend target) f0-1) - f0-1 - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as + object + (case event-type + (('point-of-interest) + (cond + ((-> event param 0) + (set! (-> self tracking use-point-of-interest) #t) + (set! (-> self tracking point-of-interest quad) (-> (the-as vector (-> event param 0)) quad)) + (set! (-> self tracking point-of-interest-blend target) 1.0) + ) + (else + (set! (-> self tracking use-point-of-interest) #f) + (set! (-> self tracking point-of-interest-blend target) 0.0) ) ) - ((= v1-0 'set-interpolation) - (set! (-> self interp-val) 0.0) - (let ((f0-4 (/ 5.0 (the float (-> arg3 param 0))))) - (set! (-> self interp-step) f0-4) - f0-4 - ) - ) - ((= v1-0 'teleport) - (when (nonzero? (-> self tracking-status)) - (cam-calc-follow! (-> self tracking) (-> self trans) #f) - (slave-set-rotation! - (-> self tracking) - (-> self trans) - (the-as float (-> self tracking-options)) - (-> self fov) - #f - ) - ) - ) - ((= v1-0 'stop-tracking) - (set! (-> self tracking-status) (the-as uint 0)) - 0 - ) - ((= v1-0 'start-tracking) - (cond - ((< arg1 1) - (let ((t9-2 format) - (a0-15 0) - (a1-3 "ERROR : missing camera-slave parameter to *camera-combiner* start-tracking~%") - ) - (let ((v1-7 (-> arg3 param 0))) - (rtype-of v1-7) - ) - (t9-2 a0-15 a1-3) - ) - ) - ((let ((t9-3 type-type?) - (v1-8 (-> arg3 param 0)) - ) - (not (t9-3 (rtype-of v1-8) camera-slave)) - ) - (let ((t9-4 format) - (a0-18 0) - (a1-5 "ERROR : invalid type '~A' to *camera-combiner* start-tracking~%") - (v1-10 (-> arg3 param 0)) - ) - (t9-4 a0-18 a1-5 (rtype-of v1-10)) - ) - ) - ((zero? (-> self tracking-status)) - (set! (-> self tracking-status) (the-as uint 1)) - (let ((gp-1 (the-as object (-> arg3 param 0)))) - (set! (-> self tracking-options) (the-as int (-> (the-as camera-slave gp-1) options))) - (set! (-> self tracking no-follow) (-> (the-as camera-slave gp-1) tracking no-follow)) - (copy-cam-float-seeker (-> self tracking tilt-adjust) (-> (the-as camera-slave gp-1) tracking tilt-adjust)) - (copy-cam-float-seeker - (-> self tracking underwater-blend) - (-> (the-as camera-slave gp-1) tracking underwater-blend) - ) - (set! (-> self tracking use-point-of-interest) (-> (the-as camera-slave gp-1) tracking use-point-of-interest)) - (set! (-> self tracking point-of-interest quad) - (-> (the-as camera-slave gp-1) tracking point-of-interest quad) - ) - (copy-cam-float-seeker - (-> self tracking point-of-interest-blend) - (-> (the-as camera-slave gp-1) tracking point-of-interest-blend) - ) - (let ((gp-2 (+ (the-as uint gp-1) 108))) - (cam-calc-follow! (-> self tracking) (the-as vector gp-2) #f) - (slave-set-rotation! - (-> self tracking) - (the-as vector gp-2) - (the-as float (-> self tracking-options)) - (-> self fov) - #f - ) - ) - ) - ) - ) - ) - ((= v1-0 'copy-tracking) - (cond - ((< arg1 1) - (let ((t9-10 format) - (a0-27 0) - (a1-11 "ERROR : missing camera-slave parameter to *camera-combiner* copy-tracking~%") - ) - (let ((v1-23 (-> arg3 param 0))) - (rtype-of v1-23) - ) - (t9-10 a0-27 a1-11) - ) - ) - ((let ((t9-11 type-type?) - (v1-24 (-> arg3 param 0)) - ) - (not (t9-11 (rtype-of v1-24) camera-slave)) - ) - (let ((t9-12 format) - (a0-30 0) - (a1-13 "ERROR : invalid type '~A' to *camera-combiner* copy-tracking~%") - (v1-25 (-> arg3 param 0)) - ) - (t9-12 a0-30 a1-13 (rtype-of v1-25)) - ) - ) - ((nonzero? (-> self tracking-status)) - #f - ) - (else - (set! (-> self tracking-status) (the-as uint 1)) - (let ((gp-3 (the-as camera-slave (-> arg3 param 0)))) - (set! (-> self tracking-options) (the-as int (-> gp-3 options))) - (set! (-> self tracking no-follow) (-> gp-3 tracking no-follow)) - (copy-cam-float-seeker (-> self tracking tilt-adjust) (-> gp-3 tracking tilt-adjust)) - (copy-cam-float-seeker (-> self tracking underwater-blend) (-> gp-3 tracking underwater-blend)) - (set! (-> self tracking follow-off quad) (-> gp-3 tracking follow-off quad)) - (set! (-> self tracking follow-pt quad) (-> gp-3 tracking follow-pt quad)) - (let* ((a2-17 (-> self tracking)) - (a3-3 (-> gp-3 tracking)) - (v1-36 (-> a3-3 inv-mat vector 0 quad)) - (a0-37 (-> a3-3 inv-mat vector 1 quad)) - (a1-16 (-> a3-3 inv-mat vector 2 quad)) - (a3-4 (-> a3-3 inv-mat vector 3 quad)) - ) - (set! (-> a2-17 inv-mat vector 0 quad) v1-36) - (set! (-> a2-17 inv-mat vector 1 quad) a0-37) - (set! (-> a2-17 inv-mat vector 2 quad) a1-16) - (set! (-> a2-17 inv-mat vector 3 quad) a3-4) + ) + (('set-interpolation) + (set! (-> self interp-val) 0.0) + (set! (-> self interp-step) (/ 5.0 (the float (-> event param 0)))) + ) + (('teleport) + (when (nonzero? (-> self tracking-status)) + (cam-calc-follow! (-> self tracking) (-> self trans) #f) + (the-as object (slave-set-rotation! + (-> self tracking) + (-> self trans) + (the-as float (-> self tracking-options)) + (-> self fov) + #f + ) ) - (set! (-> self tracking use-point-of-interest) (-> gp-3 tracking use-point-of-interest)) - (set! (-> self tracking point-of-interest quad) (-> gp-3 tracking point-of-interest quad)) + ) + ) + (('stop-tracking) + (set! (-> self tracking-status) (the-as uint 0)) + 0 + ) + (('start-tracking) + (cond + ((< arg1 1) + (let ((t9-2 format) + (a0-15 0) + (a1-3 "ERROR : missing camera-slave parameter to *camera-combiner* start-tracking~%") + ) + (let ((v1-7 (-> event param 0))) + (rtype-of v1-7) + ) + (t9-2 a0-15 a1-3) + ) + ) + ((let ((t9-3 type-type?) + (v1-8 (-> event param 0)) + ) + (not (t9-3 (rtype-of v1-8) camera-slave)) + ) + (let ((t9-4 format) + (a0-18 0) + (a1-5 "ERROR : invalid type '~A' to *camera-combiner* start-tracking~%") + (v1-10 (-> event param 0)) + ) + (t9-4 a0-18 a1-5 (rtype-of v1-10)) + ) + ) + ((zero? (-> self tracking-status)) + (set! (-> self tracking-status) (the-as uint 1)) + (let ((gp-1 (the-as object (-> event param 0)))) + (set! (-> self tracking-options) (the-as int (-> (the-as camera-slave gp-1) options))) + (set! (-> self tracking no-follow) (-> (the-as camera-slave gp-1) tracking no-follow)) + (copy-cam-float-seeker (-> self tracking tilt-adjust) (-> (the-as camera-slave gp-1) tracking tilt-adjust)) + (copy-cam-float-seeker + (-> self tracking underwater-blend) + (-> (the-as camera-slave gp-1) tracking underwater-blend) + ) + (set! (-> self tracking use-point-of-interest) (-> (the-as camera-slave gp-1) tracking use-point-of-interest)) + (set! (-> self tracking point-of-interest quad) + (-> (the-as camera-slave gp-1) tracking point-of-interest quad) + ) + (copy-cam-float-seeker + (-> self tracking point-of-interest-blend) + (-> (the-as camera-slave gp-1) tracking point-of-interest-blend) + ) + (let ((gp-2 (+ (the-as uint gp-1) 108))) + (cam-calc-follow! (-> self tracking) (the-as vector gp-2) #f) + (the-as object (slave-set-rotation! + (-> self tracking) + (the-as vector gp-2) + (the-as float (-> self tracking-options)) + (-> self fov) + #f + ) + ) + ) + ) + ) + ) + ) + (('copy-tracking) + (cond + ((< arg1 1) + (let ((t9-10 format) + (a0-27 0) + (a1-11 "ERROR : missing camera-slave parameter to *camera-combiner* copy-tracking~%") + ) + (let ((v1-23 (-> event param 0))) + (rtype-of v1-23) + ) + (t9-10 a0-27 a1-11) + ) + ) + ((let ((t9-11 type-type?) + (v1-24 (-> event param 0)) + ) + (not (t9-11 (rtype-of v1-24) camera-slave)) + ) + (let ((t9-12 format) + (a0-30 0) + (a1-13 "ERROR : invalid type '~A' to *camera-combiner* copy-tracking~%") + (v1-25 (-> event param 0)) + ) + (t9-12 a0-30 a1-13 (rtype-of v1-25)) + ) + ) + ((nonzero? (-> self tracking-status)) + #f + ) + (else + (set! (-> self tracking-status) (the-as uint 1)) + (let ((gp-3 (the-as camera-slave (-> event param 0)))) + (set! (-> self tracking-options) (the-as int (-> gp-3 options))) + (set! (-> self tracking no-follow) (-> gp-3 tracking no-follow)) + (copy-cam-float-seeker (-> self tracking tilt-adjust) (-> gp-3 tracking tilt-adjust)) + (copy-cam-float-seeker (-> self tracking underwater-blend) (-> gp-3 tracking underwater-blend)) + (set! (-> self tracking follow-off quad) (-> gp-3 tracking follow-off quad)) + (set! (-> self tracking follow-pt quad) (-> gp-3 tracking follow-pt quad)) + (let* ((a2-17 (-> self tracking)) + (a3-3 (-> gp-3 tracking)) + (v1-36 (-> a3-3 inv-mat vector 0 quad)) + (a0-37 (-> a3-3 inv-mat vector 1 quad)) + (a1-16 (-> a3-3 inv-mat vector 2 quad)) + (a3-4 (-> a3-3 inv-mat vector 3 quad)) + ) + (set! (-> a2-17 inv-mat vector 0 quad) v1-36) + (set! (-> a2-17 inv-mat vector 1 quad) a0-37) + (set! (-> a2-17 inv-mat vector 2 quad) a1-16) + (set! (-> a2-17 inv-mat vector 3 quad) a3-4) + ) + (set! (-> self tracking use-point-of-interest) (-> gp-3 tracking use-point-of-interest)) + (set! (-> self tracking point-of-interest quad) (-> gp-3 tracking point-of-interest quad)) + (the-as + object (copy-cam-float-seeker (-> self tracking point-of-interest-blend) (-> gp-3 tracking point-of-interest-blend)) ) ) ) ) - ) + ) ) ) ) :code (behavior () (local-vars (sv-160 cam-rotation-tracker)) (loop - (when (and (zero? (logand (-> *camera* master-options) 2)) (!= (-> self tracking-status) 0)) + (when (and (not (logtest? (-> *camera* master-options) 2)) (!= (-> self tracking-status) 0)) (set! (-> self tracking-status) (the-as uint 0)) 0 ) @@ -441,7 +435,3 @@ 0 (none) ) - - - - diff --git a/goal_src/jak1/engine/camera/cam-debug.gc b/goal_src/jak1/engine/camera/cam-debug.gc index 3c0828b576..7db28f69c2 100644 --- a/goal_src/jak1/engine/camera/cam-debug.gc +++ b/goal_src/jak1/engine/camera/cam-debug.gc @@ -5,6 +5,8 @@ ;; name in dgo: cam-debug ;; dgos: GAME, ENGINE +;; DECOMP BEGINS + ;; this file is debug only (declare-file (debug)) @@ -860,9 +862,7 @@ (none) ) -;; definition for method 12 of type tracking-spline -;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-12 tracking-spline ((obj tracking-spline)) +(defmethod tracking-spline-method-12 tracking-spline ((obj tracking-spline)) (let ((s5-0 (-> obj used-point))) (while (!= s5-0 -134250495) (print-nth-point obj s5-0) @@ -874,15 +874,13 @@ (none) ) -;; definition for method 23 of type tracking-spline -;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 tracking-spline ((obj tracking-spline)) +(defmethod tracking-spline-method-23 tracking-spline ((obj tracking-spline)) (let ((s5-0 (-> obj used-point)) (s4-0 (-> obj point (-> obj used-point) next)) ) (let ((s3-0 (new 'stack-no-clear 'vector))) (when (!= s4-0 -134250495) - (TODO-RENAME-19 obj 0.0 s3-0 (the-as tracking-spline-sampler #f)) + (tracking-spline-method-19 obj 0.0 s3-0 (the-as tracking-spline-sampler #f)) (camera-cross (new 'static 'vector :y 1024.0) (new 'static 'vector :z 1024.0) @@ -890,7 +888,7 @@ (new 'static 'vector4w :x #xff :w #x80) (meters 0.25) ) - (TODO-RENAME-19 obj (-> obj sample-len) s3-0 (the-as tracking-spline-sampler #f)) + (tracking-spline-method-19 obj (-> obj sample-len) s3-0 (the-as tracking-spline-sampler #f)) (camera-cross (new 'static 'vector :y 1024.0) (new 'static 'vector :z 1024.0) @@ -917,14 +915,13 @@ (new 'static 'vector4w :x #xff :y #xff :w #x80) ) (vector-! s5-1 (-> obj debug-out-position) (-> obj debug-old-position)) - (TODO-RENAME-20 obj s5-1 (-> obj debug-last-point)) + (tracking-spline-method-20 obj s5-1 (-> obj debug-last-point)) (camera-line-rel (-> obj debug-old-position) s5-1 (new 'static 'vector4w :x #xff :z #xff :w #x80)) ) 0 (none) ) -;; definition for function debug-euler (defun debug-euler ((arg0 cam-dbg-scratch)) (let ((s4-0 (new 'stack-no-clear 'euler-angles)) (gp-0 (new 'stack-no-clear 'matrix)) @@ -1019,7 +1016,6 @@ ) ) -;; definition for function bike-cam-limit (defun bike-cam-limit ((arg0 float)) (let* ((f0-1 (* 10012.444 arg0)) (f30-0 (fmax 0.0 f0-1)) @@ -1031,9 +1027,6 @@ ) ) -;; definition for function camera-slave-debug -;; INFO: Return type mismatch int vs none. -;; Used lq/sq (defun camera-slave-debug ((arg0 camera-slave)) (when *display-camera-marks* (let ((f30-0 (* 0.5 (-> *camera-combiner* fov)))) @@ -1072,7 +1065,7 @@ ) ) ) - (TODO-RENAME-23 (-> arg0 position-spline)) + (tracking-spline-method-23 (-> arg0 position-spline)) (let ((s5-1 (new-stack-vector0))) (let ((s4-1 (new-stack-vector0))) (new-stack-matrix0) @@ -1203,9 +1196,6 @@ (none) ) -;; definition for function master-draw-coordinates -;; INFO: Return type mismatch int vs none. -;; Used lq/sq (defun master-draw-coordinates ((arg0 vector)) (let ((s5-0 (new-stack-vector0)) (gp-0 (new-stack-vector0)) @@ -1229,7 +1219,15 @@ (set! (-> a0-3 w) 1.0) (vector+! a1-2 v1-4 a0-3) ) - (add-debug-line #t (bucket-id debug-no-zbuf) gp-0 s5-0 (new 'static 'rgba :r #xff :a #x80) #f (the-as rgba -1)) + (add-debug-line + #t + (bucket-id debug-no-zbuf) + gp-0 + s5-0 + (new 'static 'rgba :r #xff :a #x80) + #f + (the-as rgba -1) + ) (let ((a1-5 s5-0) (v1-5 gp-0) (a0-5 s5-0) @@ -1240,7 +1238,15 @@ (set! (-> a0-5 w) 1.0) (vector+! a1-5 v1-5 a0-5) ) - (add-debug-line #t (bucket-id debug-no-zbuf) gp-0 s5-0 (new 'static 'rgba :g #xff :a #x80) #f (the-as rgba -1)) + (add-debug-line + #t + (bucket-id debug-no-zbuf) + gp-0 + s5-0 + (new 'static 'rgba :g #xff :a #x80) + #f + (the-as rgba -1) + ) (let ((a1-8 s5-0) (v1-6 gp-0) (a0-7 s5-0) @@ -1251,7 +1257,15 @@ (set! (-> a0-7 w) 1.0) (vector+! a1-8 v1-6 a0-7) ) - (add-debug-line #t (bucket-id debug-no-zbuf) gp-0 s5-0 (new 'static 'rgba :b #xff :a #x80) #f (the-as rgba -1)) + (add-debug-line + #t + (bucket-id debug-no-zbuf) + gp-0 + s5-0 + (new 'static 'rgba :b #xff :a #x80) + #f + (the-as rgba -1) + ) (when arg0 (set! (-> s5-0 quad) (-> arg0 quad)) (vector-normalize! s5-0 4096.0) @@ -1271,7 +1285,6 @@ (none) ) -;; definition of type cam-collision-record (deftype cam-collision-record (structure) ((pos vector :inline :offset-assert 0) (vel vector :inline :offset-assert 16) @@ -1294,28 +1307,7 @@ :flag-assert #x9000000a8 ) -;; definition for method 3 of type cam-collision-record -(defmethod inspect cam-collision-record ((obj cam-collision-record)) - (format #t "[~8x] ~A~%" obj 'cam-collision-record) - (format #t "~Tpos: #~%" (-> obj pos)) - (format #t "~Tvel: #~%" (-> obj vel)) - (format #t "~Tdesired-pos: #~%" (-> obj desired-pos)) - (format #t "~Tcam-tpos-cur: #~%" (-> obj cam-tpos-cur)) - (format #t "~Tcam-tpos-old: #~%" (-> obj cam-tpos-old)) - (format #t "~Tview-flat: #~%" (-> obj view-flat)) - (format #t "~Tstring-min-val: #~%" (-> obj string-min-val)) - (format #t "~Tstring-max-val: #~%" (-> obj string-max-val)) - (format #t "~Tview-off: #~%" (-> obj view-off)) - (format #t "~Tmin-z-override: ~f~%" (-> obj min-z-override)) - (format #t "~Tstring-push-z: ~f~%" (-> obj string-push-z)) - (format #t "~Tview-off-param: ~f~%" (-> obj view-off-param)) - (format #t "~Tframe: ~D~%" (-> obj frame)) - (format #t "~Titeration: ~D~%" (-> obj iteration)) - (format #t "~Tmove-type: ~A~%" (-> obj move-type)) - obj - ) -;; definition of type cam-collision-record-array (deftype cam-collision-record-array (inline-array-class) ((data cam-collision-record :dynamic :offset-assert 16) ) @@ -1324,33 +1316,17 @@ :flag-assert #x900000010 ) -;; definition for method 3 of type cam-collision-record-array -(defmethod inspect cam-collision-record-array ((obj cam-collision-record-array)) - (format #t "[~8x] ~A~%" obj (-> obj type)) - (format #t "~Tlength: ~D~%" (-> obj length)) - (format #t "~Tallocated-length: ~D~%" (-> obj allocated-length)) - (format #t "~Tdata[0] @ #x~X~%" (-> obj data)) - obj - ) -;; failed to figure out what this is: (set! (-> cam-collision-record-array heap-base) (the-as uint 176)) -;; definition for symbol *cam-collision-record-first*, type int (define *cam-collision-record-first* 0) -;; definition for symbol *cam-collision-record-last*, type int (define *cam-collision-record-last* 0) -;; definition for symbol *cam-collision-record-show*, type int (define *cam-collision-record-show* 0) -;; definition for symbol *cam-collision-record*, type cam-collision-record-array (define *cam-collision-record* (new 'debug 'cam-collision-record-array 600)) -;; definition for function cam-collision-record-save -;; INFO: Return type mismatch int vs none. -;; Used lq/sq (defun cam-collision-record-save ((arg0 vector) (arg1 vector) (arg2 int) (arg3 symbol) (arg4 camera-slave)) (when *record-cam-collide-history* (let ((v1-5 (the-as @@ -1387,8 +1363,6 @@ (none) ) -;; definition for function cam-collision-record-step -;; INFO: Return type mismatch int vs none. (defun cam-collision-record-step ((arg0 int)) (set! *cam-collision-record-show* (+ *cam-collision-record-show* arg0)) (while (>= *cam-collision-record-show* 600) @@ -1401,8 +1375,6 @@ (none) ) -;; definition for function cam-collision-record-draw -;; INFO: Return type mismatch int vs none. (defun cam-collision-record-draw () (cond ((cpad-pressed? 0 down) @@ -1507,8 +1479,6 @@ (none) ) -;; definition for function camera-master-debug -;; INFO: Return type mismatch int vs none. (defun camera-master-debug ((arg0 camera-master)) (when *display-cam-other* (let ((f0-1 (* 0.5 (-> *camera-other-fov* data)))) @@ -1559,7 +1529,7 @@ (cam-collision-record-draw) ) (if *display-cam-master-marks* - (TODO-RENAME-23 (-> arg0 target-spline)) + (tracking-spline-method-23 (-> arg0 target-spline)) ) (if *display-xyz-axes* (master-draw-coordinates (the-as vector #f)) @@ -1569,8 +1539,6 @@ (none) ) -;; definition for function debug-set-camera-pos-rot! -;; Used lq/sq (defun debug-set-camera-pos-rot! ((arg0 vector) (arg1 matrix)) (when (and *camera* *camera-combiner*) (send-event *camera* 'change-state cam-free-floating 0) @@ -1591,9 +1559,24 @@ arg0 ) - - - - - - +(defun external-cam-reset! () + (vector-reset! (-> *math-camera* trans)) + (matrix-identity! (-> *math-camera* inv-camera-rot)) + (when *camera-combiner* + (let* ((v1-6 (-> *math-camera* inv-camera-rot)) + (a3-0 (-> *camera-combiner* inv-camera-rot)) + (a0-2 (-> a3-0 vector 0 quad)) + (a1-0 (-> a3-0 vector 1 quad)) + (a2-0 (-> a3-0 vector 2 quad)) + (a3-1 (-> a3-0 vector 3 quad)) + ) + (set! (-> v1-6 vector 0 quad) a0-2) + (set! (-> v1-6 vector 1 quad) a1-0) + (set! (-> v1-6 vector 2 quad) a2-0) + (set! (-> v1-6 vector 3 quad) a3-1) + ) + (set! (-> *math-camera* trans quad) (-> *camera-combiner* trans quad)) + ) + 0 + (none) + ) diff --git a/goal_src/jak1/engine/camera/cam-master.gc b/goal_src/jak1/engine/camera/cam-master.gc index db9ba5b0d3..f39dd81016 100644 --- a/goal_src/jak1/engine/camera/cam-master.gc +++ b/goal_src/jak1/engine/camera/cam-master.gc @@ -109,7 +109,7 @@ ) (let ((gp-1 (new 'stack-no-clear 'vector))) (vector--float*! gp-1 (-> self tpos-curr-adj) (-> self local-down) (-> self target-height)) - (the-as symbol (TODO-RENAME-10 (-> self target-spline) gp-1)) + (the-as symbol (tracking-spline-method-10 (-> self target-spline) gp-1)) ) ) @@ -193,7 +193,7 @@ (set! (-> self under-water) 0) (let ((gp-1 (new 'stack-no-clear 'vector))) (vector--float*! gp-1 (-> self tpos-curr-adj) (-> self local-down) (-> self target-height)) - (the-as symbol (TODO-RENAME-10 (-> self target-spline) gp-1)) + (the-as symbol (tracking-spline-method-10 (-> self target-spline) gp-1)) ) ) @@ -274,9 +274,9 @@ ) (let ((gp-1 (new 'stack-no-clear 'vector))) (vector--float*! gp-1 (-> self tpos-curr-adj) (-> self local-down) (-> self target-height)) - (TODO-RENAME-17 (-> self target-spline) gp-1 2048.0 0.0 #f) + (tracking-spline-method-17 (-> self target-spline) gp-1 2048.0 0.0 #f) ) - (TODO-RENAME-22 (-> self target-spline) 40960.0) + (tracking-spline-method-22 (-> self target-spline) 40960.0) ) ((handle->process (-> self drawable-target)) (logior! (-> self master-options) 2) @@ -499,9 +499,9 @@ ) ) ) - (TODO-RENAME-17 (-> self target-spline) gp-7 2048.0 0.0 #f) + (tracking-spline-method-17 (-> self target-spline) gp-7 2048.0 0.0 #f) ) - (the-as symbol (TODO-RENAME-22 (-> self target-spline) 40960.0)) + (the-as symbol (tracking-spline-method-22 (-> self target-spline) 40960.0)) ) (*target* (logior! (-> self master-options) 2) @@ -1697,7 +1697,7 @@ (set! (-> self drawable-target) (the-as handle #f)) (set! (-> self which-bone) 0) (let ((a1-3 (new-stack-vector0))) - (TODO-RENAME-10 (-> self target-spline) a1-3) + (tracking-spline-method-10 (-> self target-spline) a1-3) ) (set! (-> self pov-handle) (the-as handle #f)) (set! (-> self pov-bone) 0) diff --git a/goal_src/jak1/engine/camera/cam-states.gc b/goal_src/jak1/engine/camera/cam-states.gc index 429f9e4c91..f73da2739d 100644 --- a/goal_src/jak1/engine/camera/cam-states.gc +++ b/goal_src/jak1/engine/camera/cam-states.gc @@ -1070,18 +1070,15 @@ ) (vector+! (-> self circular-follow) (-> self circular-follow) (-> self pivot-pt)) (cam-circular-position #t) - (when (!= (-> self fov1) 0.0) - (let ((f0-7 (lerp-clamp - (-> self fov0) - (-> self fov1) - (parameter-ease-sin-clamp (dummy-10 (-> self fov-index) (-> *camera* tpos-curr-adj))) - ) - ) - ) - (set! (-> self fov) f0-7) - f0-7 + (if (!= (-> self fov1) 0.0) + (set! (-> self fov) + (lerp-clamp + (-> self fov0) + (-> self fov1) + (parameter-ease-sin-clamp (cam-index-method-10 (-> self fov-index) (-> *camera* tpos-curr-adj))) + ) + ) ) - ) ) (defstate cam-circular (camera-slave) @@ -1126,11 +1123,14 @@ (set! (-> self fov1) (cam-slave-get-float (-> self cam-entity) 'focalPull (the-as float 0.0))) (cond ((and (!= (-> self fov1) 0.0) - (dummy-9 (-> self fov-index) 'focalpull (-> self cam-entity) (-> self saved-pt) (the-as curve #f)) + (cam-index-method-9 (-> self fov-index) 'focalpull (-> self cam-entity) (-> self saved-pt) (the-as curve #f)) ) (set! (-> self fov0) (-> self fov)) - (set! (-> self fov) - (lerp-clamp (-> self fov0) (-> self fov1) (dummy-10 (-> self fov-index) (-> *camera* tpos-curr-adj))) + (set! (-> self fov) (lerp-clamp + (-> self fov0) + (-> self fov1) + (cam-index-method-10 (-> self fov-index) (-> *camera* tpos-curr-adj)) + ) ) ) (else @@ -1278,7 +1278,7 @@ (set! (-> self min-z-override) (vector-length (-> self view-flat))) (vector+! (-> self desired-pos) arg0 (-> *camera* tpos-curr-adj)) (set! (-> self string-trans quad) (-> self desired-pos quad)) - (TODO-RENAME-10 (-> self position-spline) (-> self desired-pos)) + (tracking-spline-method-10 (-> self position-spline) (-> self desired-pos)) (vector-reset! (-> self velocity)) (let ((v0-3 (logand -4097 (-> self options)))) (set! (-> self options) v0-3) @@ -2689,7 +2689,7 @@ (cam-string-move) ) ) - (TODO-RENAME-17 + (tracking-spline-method-17 (-> self position-spline) (-> self string-trans) (the-as float 0.04096) @@ -2698,16 +2698,36 @@ ) (cond ((and (logtest? (-> self options) #x4000) (logtest? (-> self options) 256)) - (TODO-RENAME-21 (-> self position-spline) (-> self trans) (the-as float 102.4) (the-as float 4096.0)) + (tracking-spline-method-21 + (-> self position-spline) + (-> self trans) + (the-as float 102.4) + (the-as float 4096.0) + ) ) ((logtest? (-> self options) #x4000) - (TODO-RENAME-21 (-> self position-spline) (-> self trans) (the-as float 40.96) (the-as float 4096.0)) + (tracking-spline-method-21 + (-> self position-spline) + (-> self trans) + (the-as float 40.96) + (the-as float 4096.0) + ) ) ((logtest? (-> self options) 256) - (TODO-RENAME-21 (-> self position-spline) (-> self trans) (the-as float 102.4) (the-as float 2457.6)) + (tracking-spline-method-21 + (-> self position-spline) + (-> self trans) + (the-as float 102.4) + (the-as float 2457.6) + ) ) (else - (TODO-RENAME-21 (-> self position-spline) (-> self trans) (the-as float 20.48) (the-as float 2457.6)) + (tracking-spline-method-21 + (-> self position-spline) + (-> self trans) + (the-as float 20.48) + (the-as float 2457.6) + ) ) ) ) @@ -2906,7 +2926,7 @@ ) (set! (-> self trans quad) (-> self string-trans quad)) (set! (-> self los-last-pos quad) (-> self string-trans quad)) - (TODO-RENAME-10 (-> self position-spline) (-> self string-trans)) + (tracking-spline-method-10 (-> self position-spline) (-> self string-trans)) (set! (-> self blend-from-type) (the-as uint 2)) (set! (-> self blend-to-type) (the-as uint 2)) ) @@ -2923,7 +2943,7 @@ (when (not (paused?)) (set-string-parms) (cam-string-code) - (TODO-RENAME-9 (-> self position-spline)) + (tracking-spline-method-9 (-> self position-spline)) (set! (-> self have-phony-joystick) #f) ) (suspend) diff --git a/goal_src/jak1/engine/camera/camera-h.gc b/goal_src/jak1/engine/camera/camera-h.gc index 2fc484ac2b..f26f56e1d6 100644 --- a/goal_src/jak1/engine/camera/camera-h.gc +++ b/goal_src/jak1/engine/camera/camera-h.gc @@ -102,8 +102,8 @@ :size-assert #x30 :flag-assert #xb00000030 (:methods - (dummy-9 (_type_ symbol entity vector curve) symbol 9) - (dummy-10 (_type_ vector) float 10) + (cam-index-method-9 (_type_ symbol entity vector curve) symbol 9) + (cam-index-method-10 (_type_ vector) float 10) ) ) @@ -151,21 +151,21 @@ :size-assert #x664 :flag-assert #x1800000664 (:methods - (TODO-RENAME-9 (_type_) none 9) - (TODO-RENAME-10 (_type_ vector) none 10) + (tracking-spline-method-9 (_type_) none 9) + (tracking-spline-method-10 (_type_ vector) none 10) (print-nth-point (_type_ int) none 11) - (TODO-RENAME-12 (_type_) none 12) - (TODO-RENAME-13 (_type_ int) none 13) - (TODO-RENAME-14 (_type_ tracking-spline-sampler) none 14) - (TODO-RENAME-15 (_type_) none 15) - (TODO-RENAME-16 (_type_ float) none 16) - (TODO-RENAME-17 (_type_ vector float float symbol) int 17) - (TODO-RENAME-18 (_type_ float vector tracking-spline-sampler) vector 18) - (TODO-RENAME-19 (_type_ float vector tracking-spline-sampler) vector 19) - (TODO-RENAME-20 (_type_ vector int) none 20) - (TODO-RENAME-21 (_type_ vector float float) vector 21) - (TODO-RENAME-22 (_type_ float) none 22) - (TODO-RENAME-23 (_type_) none 23) + (tracking-spline-method-12 (_type_) none 12) + (tracking-spline-method-13 (_type_ int) none 13) + (tracking-spline-method-14 (_type_ tracking-spline-sampler) none 14) + (tracking-spline-method-15 (_type_) none 15) + (tracking-spline-method-16 (_type_ float) none 16) + (tracking-spline-method-17 (_type_ vector float float symbol) int 17) + (tracking-spline-method-18 (_type_ float vector tracking-spline-sampler) vector 18) + (tracking-spline-method-19 (_type_ float vector tracking-spline-sampler) vector 19) + (tracking-spline-method-20 (_type_ vector int) none 20) + (tracking-spline-method-21 (_type_ vector float float) vector 21) + (tracking-spline-method-22 (_type_ float) none 22) + (tracking-spline-method-23 (_type_) none 23) ) ) @@ -239,10 +239,7 @@ (defmethod jump-to-target! cam-float-seeker ((obj cam-float-seeker) (arg0 float)) (set! (-> obj value) (+ (-> obj target) arg0)) - (let ((f0-2 0.0)) - (set! (-> obj vel) f0-2) - f0-2 - ) + (set! (-> obj vel) 0.0) ) (deftype cam-vector-seeker (structure) @@ -506,10 +503,3 @@ list-keeper-active ) ) - - -0 - - - - diff --git a/goal_src/jak1/engine/camera/camera.gc b/goal_src/jak1/engine/camera/camera.gc index 649ec9889c..959d31a37e 100644 --- a/goal_src/jak1/engine/camera/camera.gc +++ b/goal_src/jak1/engine/camera/camera.gc @@ -343,7 +343,7 @@ ) ) -(defmethod dummy-9 cam-index ((obj cam-index) (arg0 symbol) (arg1 entity) (arg2 vector) (arg3 curve)) +(defmethod cam-index-method-9 cam-index ((obj cam-index) (arg0 symbol) (arg1 entity) (arg2 vector) (arg3 curve)) (local-vars (sv-32 (function _varargs_ object))) (format (clear *cam-res-string*) "~S-flags" arg0) (set! (-> obj flags) (the-as cam-index-options (cam-slave-get-flags arg1 (string->symbol *res-key-string*)))) @@ -419,7 +419,7 @@ #t ) -(defmethod dummy-10 cam-index ((obj cam-index) (arg0 vector)) +(defmethod cam-index-method-10 cam-index ((obj cam-index) (arg0 vector)) (let ((s5-0 (new-stack-vector0))) 0.0 (vector-! s5-0 arg0 (the-as vector (-> obj vec))) @@ -438,7 +438,7 @@ ) ) -(defmethod TODO-RENAME-10 tracking-spline ((obj tracking-spline) (arg0 vector)) +(defmethod tracking-spline-method-10 tracking-spline ((obj tracking-spline) (arg0 vector)) (set! (-> obj point 0 position quad) (-> arg0 quad)) (set! (-> obj point 0 next) -134250495) (set! (-> obj summed-len) 0.0) @@ -462,7 +462,7 @@ (none) ) -(defmethod TODO-RENAME-13 tracking-spline ((obj tracking-spline) (arg0 int)) +(defmethod tracking-spline-method-13 tracking-spline ((obj tracking-spline) (arg0 int)) (let ((v1-3 (-> obj point arg0 next))) (cond ((= v1-3 -134250495) @@ -495,7 +495,7 @@ (none) ) -(defmethod TODO-RENAME-14 tracking-spline ((obj tracking-spline) (arg0 tracking-spline-sampler)) +(defmethod tracking-spline-method-14 tracking-spline ((obj tracking-spline) (arg0 tracking-spline-sampler)) (let ((v1-0 (-> obj used-point))) (set! (-> obj partial-point) (-> arg0 partial-pt)) (when (= (-> obj next-to-last-point) v1-0) @@ -532,12 +532,12 @@ (none) ) -(defmethod TODO-RENAME-15 tracking-spline ((obj tracking-spline)) +(defmethod tracking-spline-method-15 tracking-spline ((obj tracking-spline)) (let ((s5-0 (new 'stack-no-clear 'tracking-spline-sampler))) (let ((a2-0 (new 'stack-no-clear 'tracking-point))) (set! (-> s5-0 cur-pt) (-> obj used-point)) (set! (-> s5-0 partial-pt) (-> obj partial-point)) - (TODO-RENAME-19 obj (-> obj sample-len) (the-as vector a2-0) s5-0) + (tracking-spline-method-19 obj (-> obj sample-len) (the-as vector a2-0) s5-0) ) (if (or (= (-> s5-0 cur-pt) (-> obj end-point)) (= (-> s5-0 cur-pt) (-> obj next-to-last-point)) @@ -568,7 +568,7 @@ (set! a0-14 (-> obj point v1-15 next)) ) (if (< -2.0 f0-2) - (TODO-RENAME-13 obj a1-1) + (tracking-spline-method-13 obj a1-1) ) ) ) @@ -578,12 +578,12 @@ (none) ) -(defmethod TODO-RENAME-16 tracking-spline ((obj tracking-spline) (arg0 float)) +(defmethod tracking-spline-method-16 tracking-spline ((obj tracking-spline) (arg0 float)) (let ((s4-0 (new 'stack-no-clear 'tracking-spline-sampler))) (let ((a2-0 (new 'stack-no-clear 'vector))) (set! (-> s4-0 cur-pt) (-> obj used-point)) (set! (-> s4-0 partial-pt) (-> obj partial-point)) - (TODO-RENAME-19 obj (-> obj sample-len) a2-0 s4-0) + (tracking-spline-method-19 obj (-> obj sample-len) a2-0 s4-0) ) (let ((s4-1 (-> obj point (-> s4-0 cur-pt) next))) (when (!= s4-1 -134250495) @@ -603,7 +603,7 @@ ) arg0 ) - (TODO-RENAME-13 obj s4-1) + (tracking-spline-method-13 obj s4-1) (set! s4-1 v1-11) ) (set! v1-11 (-> obj point s4-1 next)) @@ -616,7 +616,7 @@ (none) ) -(defmethod TODO-RENAME-17 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 float) (arg2 float) (arg3 symbol)) +(defmethod tracking-spline-method-17 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 float) (arg2 float) (arg3 symbol)) (let ((s3-0 (-> obj free-point)) (s2-0 (-> obj end-point)) ) @@ -632,7 +632,7 @@ (return 0) ) (when (and arg3 (= s3-0 -134250495)) - (TODO-RENAME-15 obj) + (tracking-spline-method-15 obj) (set! s3-0 (-> obj free-point)) ) (cond @@ -649,7 +649,7 @@ (set! (-> obj point s3-0 position quad) (-> arg0 quad)) (+! (-> obj used-count) 1) (if (< 0.0 arg2) - (TODO-RENAME-16 obj arg2) + (tracking-spline-method-16 obj arg2) ) ) ) @@ -657,7 +657,7 @@ 0 ) -(defmethod TODO-RENAME-18 tracking-spline ((obj tracking-spline) (arg0 float) (arg1 vector) (arg2 tracking-spline-sampler)) +(defmethod tracking-spline-method-18 tracking-spline ((obj tracking-spline) (arg0 float) (arg1 vector) (arg2 tracking-spline-sampler)) (local-vars (f0-4 float)) (when (not arg2) (set! arg2 (new 'stack-no-clear 'tracking-spline-sampler)) @@ -699,13 +699,13 @@ (the-as vector #f) ) -(defmethod TODO-RENAME-19 tracking-spline ((obj tracking-spline) (arg0 float) (arg1 vector) (arg2 tracking-spline-sampler)) +(defmethod tracking-spline-method-19 tracking-spline ((obj tracking-spline) (arg0 float) (arg1 vector) (arg2 tracking-spline-sampler)) (vector-reset! arg1) - (TODO-RENAME-18 obj arg0 arg1 arg2) + (tracking-spline-method-18 obj arg0 arg1 arg2) arg1 ) -(defmethod TODO-RENAME-20 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 int)) +(defmethod tracking-spline-method-20 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 int)) (let ((s3-0 (new 'stack-no-clear 'vector))) (vector-! s3-0 @@ -793,7 +793,7 @@ (none) ) -(defmethod TODO-RENAME-21 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 float) (arg2 float)) +(defmethod tracking-spline-method-21 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 float) (arg2 float)) (let ((v1-0 (-> obj used-point)) (f0-0 (-> obj partial-point)) ) @@ -819,10 +819,10 @@ (let ((s4-0 (new 'stack-no-clear 'tracking-spline-sampler))) (set! (-> s4-0 cur-pt) v1-0) (set! (-> s4-0 partial-pt) f0-0) - (TODO-RENAME-19 obj (* (-> obj max-move) (-> *display* time-adjust-ratio)) arg0 s4-0) - (TODO-RENAME-14 obj s4-0) + (tracking-spline-method-19 obj (* (-> obj max-move) (-> *display* time-adjust-ratio)) arg0 s4-0) + (tracking-spline-method-14 obj s4-0) (dotimes (s3-0 63) - (TODO-RENAME-18 obj (* 0.015625 (-> obj sample-len)) arg0 s4-0) + (tracking-spline-method-18 obj (* 0.015625 (-> obj sample-len)) arg0 s4-0) ) (vector-float*! arg0 arg0 0.015625) (let ((a2-3 (-> s4-0 cur-pt))) @@ -831,7 +831,7 @@ (set! (-> obj debug-old-position quad) (-> obj old-position quad)) (set! (-> obj debug-out-position quad) (-> arg0 quad)) (vector-! s4-1 arg0 (-> obj old-position)) - (TODO-RENAME-20 obj s4-1 a2-3) + (tracking-spline-method-20 obj s4-1 a2-3) (vector+! arg0 (-> obj old-position) s4-1) ) ) @@ -841,22 +841,22 @@ arg0 ) -(defmethod TODO-RENAME-22 tracking-spline ((obj tracking-spline) (arg0 float)) +(defmethod tracking-spline-method-22 tracking-spline ((obj tracking-spline) (arg0 float)) (when (< arg0 (-> obj summed-len)) (let ((s5-0 (new 'stack-no-clear 'tracking-spline-sampler))) (let ((a2-0 (new 'stack-no-clear 'vector))) (set! (-> s5-0 cur-pt) (-> obj used-point)) (set! (-> s5-0 partial-pt) 0.0) - (TODO-RENAME-19 obj (- (-> obj summed-len) arg0) a2-0 s5-0) + (tracking-spline-method-19 obj (- (-> obj summed-len) arg0) a2-0 s5-0) ) - (TODO-RENAME-14 obj s5-0) + (tracking-spline-method-14 obj s5-0) ) ) 0 (none) ) -(defmethod TODO-RENAME-9 tracking-spline ((obj tracking-spline)) +(defmethod tracking-spline-method-9 tracking-spline ((obj tracking-spline)) (let ((v1-0 (-> obj used-point)) (s4-0 0) (s5-0 0) @@ -885,7 +885,7 @@ ) (set! (-> obj free-point) -134250495) (dotimes (v1-21 32) - (when (zero? (logand s5-0 1)) + (when (not (logtest? s5-0 1)) (set! (-> obj point v1-21 next) (-> obj free-point)) (set! (-> obj free-point) v1-21) ) @@ -969,7 +969,7 @@ (init-cam-float-seeker (-> self tracking point-of-interest-blend) 0.0 0.005 0.02 0.125) (init-cam-float-seeker (-> self tracking underwater-blend) 0.0 0.007 0.03 0.125) (set! (-> self tracking use-point-of-interest) #f) - (TODO-RENAME-10 (-> self position-spline) (-> self trans)) + (tracking-spline-method-10 (-> self position-spline) (-> self trans)) (none) ) @@ -1035,60 +1035,52 @@ ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 45] ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 50] (defbehavior cam-standard-event-handler camera-slave ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - object - (cond - ((= v1-0 'go) - (let ((v1-1 (-> arg3 param 0)) - (t9-0 (the-as (function object) enter-state)) - ) - (set! (-> self next-state) (the-as state v1-1)) - (t9-0) - ) - ) - ((or (= v1-0 'change-state) (= v1-0 'change-state-no-go)) - (let ((s5-0 (the-as object (-> arg3 param 0)))) - (cam-slave-init-vars) - (let ((t9-2 (the-as (function object) (-> (the-as state s5-0) enter)))) - (if t9-2 - (t9-2) - ) + (the-as + object + (case arg2 + (('go) + (let ((v1-1 (-> arg3 param 0)) + (t9-0 (the-as (function object) enter-state)) ) - (set! (-> self enter-has-run) #t) - (set! (-> self event-hook) (-> (the-as state s5-0) event)) - (when (= arg2 'change-state) - (let ((t9-3 (the-as (function object) enter-state))) - (set! (-> self next-state) (the-as state s5-0)) - (t9-3) + (set! (-> self next-state) (the-as state v1-1)) + (t9-0) + ) + ) + (('change-state 'change-state-no-go) + (let ((s5-0 (the-as object (-> arg3 param 0)))) + (cam-slave-init-vars) + (let ((t9-2 (the-as (function object) (-> (the-as state s5-0) enter)))) + (if t9-2 + (t9-2) ) + ) + (set! (-> self enter-has-run) #t) + (set! (-> self event-hook) (-> (the-as state s5-0) event)) + (when (= arg2 'change-state) + (let ((t9-3 (the-as (function object) enter-state))) + (set! (-> self next-state) (the-as state s5-0)) + (t9-3) ) ) ) - ((= v1-0 'point-of-interest) - (cond - ((-> arg3 param 0) - (set! (-> self tracking use-point-of-interest) #t) - (set! (-> self tracking point-of-interest quad) (-> (the-as vector (-> arg3 param 0)) quad)) - (let ((f0-0 1.0)) - (set! (-> self tracking point-of-interest-blend target) f0-0) - f0-0 - ) - ) - (else - (set! (-> self tracking use-point-of-interest) #f) - (let ((f0-1 0.0)) - (set! (-> self tracking point-of-interest-blend target) f0-1) - f0-1 - ) - ) + ) + (('point-of-interest) + (cond + ((-> arg3 param 0) + (set! (-> self tracking use-point-of-interest) #t) + (set! (-> self tracking point-of-interest quad) (-> (the-as vector (-> arg3 param 0)) quad)) + (set! (-> self tracking point-of-interest-blend target) 1.0) + ) + (else + (set! (-> self tracking use-point-of-interest) #f) + (set! (-> self tracking point-of-interest-blend target) 0.0) ) ) - ((= v1-0 'teleport) - (cam-calc-follow! (-> self tracking) (-> self trans) #f) - (slave-set-rotation! (-> self tracking) (-> self trans) (the-as float (-> self options)) (-> self fov) #f) - ) - ) + ) + (('teleport) + (cam-calc-follow! (-> self tracking) (-> self trans) #f) + (slave-set-rotation! (-> self tracking) (-> self trans) (the-as float (-> self options)) (-> self fov) #f) + ) ) ) ) @@ -1131,8 +1123,8 @@ ) ((= (-> self spline-follow-dist) 0.0) (let ((f0-18 (if arg3 - (dummy-10 (-> self index) (-> self tracking follow-pt)) - (dummy-10 (-> self index) (-> *camera* tpos-curr-adj)) + (cam-index-method-10 (-> self index) (-> self tracking follow-pt)) + (cam-index-method-10 (-> self index) (-> *camera* tpos-curr-adj)) ) ) ) @@ -1165,7 +1157,7 @@ (when (get-curve-data! (-> self cam-entity) (-> self spline-curve) 'campath 'campath-k -1000000000.0) (curve-get-pos! (-> self spline-offset) 0.0 (-> self spline-curve)) (vector-negate! (-> self spline-offset) (-> self spline-offset)) - (dummy-9 (-> self index) 'campoints (-> self cam-entity) arg0 (-> self spline-curve)) + (cam-index-method-9 (-> self index) 'campoints (-> self cam-entity) arg0 (-> self spline-curve)) (set! (-> self spline-exists) #t) ) (cond @@ -1275,7 +1267,11 @@ 1.0 ) (else - (let* ((f0-29 (* f0-28 f0-28)) (f0-30 (- 1.0 f0-29))) (* f0-30 (* f0-30 f0-30))) + (let* ((f0-29 (* f0-28 f0-28)) + (f0-30 (- 1.0 f0-29)) + ) + (* f0-30 (* f0-30 f0-30)) + ) ) ) ) @@ -1634,11 +1630,9 @@ ) ) -;; WARN: Stack slot offset 144 signed mismatch -;; WARN: Stack slot offset 144 signed mismatch -;; WARN: Unsupported inline assembly instruction kind - [mula.s f0, f3] -;; WARN: Unsupported inline assembly instruction kind - [madda.s f1, f4] -;; WARN: Unsupported inline assembly instruction kind - [madd.s f0, f2, f5] +;; ERROR: Unsupported inline assembly instruction kind - [mula.s f0, f3] +;; ERROR: Unsupported inline assembly instruction kind - [madda.s f1, f4] +;; ERROR: Unsupported inline assembly instruction kind - [madd.s f0, f2, f5] (defun v-slrp2! ((arg0 vector) (arg1 vector) (arg2 vector) (arg3 float) (arg4 vector) (arg5 float)) (local-vars (f0-10 float) @@ -1741,11 +1735,9 @@ arg0 ) -;; WARN: Stack slot offset 144 signed mismatch -;; WARN: Stack slot offset 144 signed mismatch -;; WARN: Unsupported inline assembly instruction kind - [mula.s f0, f3] -;; WARN: Unsupported inline assembly instruction kind - [madda.s f1, f4] -;; WARN: Unsupported inline assembly instruction kind - [madd.s f0, f2, f5] +;; ERROR: Unsupported inline assembly instruction kind - [mula.s f0, f3] +;; ERROR: Unsupported inline assembly instruction kind - [madda.s f1, f4] +;; ERROR: Unsupported inline assembly instruction kind - [madd.s f0, f2, f5] (defun v-slrp3! ((arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) (local-vars (f0-7 float) (f26-0 float) (f28-0 float) (sv-144 float) (sv-160 vector)) (set! sv-144 arg4) @@ -1822,7 +1814,3 @@ ) arg0 ) - - - - diff --git a/goal_src/jak1/engine/collide/collide-cache-h.gc b/goal_src/jak1/engine/collide/collide-cache-h.gc index 3a58064d12..f698bbe55a 100644 --- a/goal_src/jak1/engine/collide/collide-cache-h.gc +++ b/goal_src/jak1/engine/collide/collide-cache-h.gc @@ -9,19 +9,19 @@ (define-extern collide-cache-using-y-probe-test (function vector symbol)) (define-extern collide-cache-using-box-test (function vector symbol)) - +;; DECOMP BEGINS ;;;;;;;;;;;;;;;;;;;;;;; ;; Collide Helpers ;;;;;;;;;;;;;;;;;;;;;;; (deftype collide-using-spheres-params (structure) - ((spheres (inline-array sphere) :offset-assert 0) - (num-spheres uint32 :offset-assert 4) - (collide-with collide-kind :offset-assert 8) - (proc process-drawable :offset-assert 16) - (ignore-pat pat-surface :offset-assert 20) - (solid-only basic :offset-assert 24) + ((spheres (inline-array sphere) :offset-assert 0) + (num-spheres uint32 :offset-assert 4) + (collide-with collide-kind :offset-assert 8) + (proc process-drawable :offset-assert 16) + (ignore-pat pat-surface :offset-assert 20) + (solid-only basic :offset-assert 24) ) :method-count-assert 9 :size-assert #x1c @@ -50,8 +50,8 @@ :size-assert #xc60 :flag-assert #xb00000c60 (:methods - (dummy-9 (_type_ object object) symbol 9) - (dummy-10 (_type_ object object) symbol 10) + (collide-puss-work-method-9 (_type_ object object) symbol 9) + (collide-puss-work-method-10 (_type_ object object) symbol 10) ) ) @@ -75,12 +75,12 @@ ;; The triangles stored in the cache. ;; This is a common return type of collision queries. (deftype collide-cache-tri (structure) - ((vertex vector 3 :inline :offset-assert 0) ;; actual locations - (extra-quad uint128 :offset 48) - (pat pat-surface :offset 48) ;; metadata about the surface of this tri - (prim-index uint16 :offset 52) ;; in the collide-cache-prim list - (user16 uint16 :offset 54) - (user32 uint32 2 :offset 56) + ((vertex vector 3 :inline :offset-assert 0) ;; actual locations + (extra-quad uint128 :offset 48) + (pat pat-surface :offset 48) ;; metadata about the surface of this tri + (prim-index uint16 :offset 52) ;; in the collide-cache-prim list + (user16 uint16 :offset 54) + (user32 uint32 2 :offset 56) ) :method-count-assert 9 :size-assert #x40 @@ -90,18 +90,18 @@ ;; The primitives stored in the cache. ;; The "core" is extracted from the normal collide-shape-prim and placed inline here. (deftype collide-cache-prim (structure) - ((prim-core collide-prim-core :inline :offset-assert 0) - (extra-quad uint128 :offset-assert 32) - (ccache collide-cache :offset 32) - (prim collide-shape-prim :offset 36) - (first-tri uint16 :offset 40) - (num-tris uint16 :offset 42) - (unused uint8 4 :offset 44) - (world-sphere vector :inline :offset 0) - (collide-as collide-kind :offset 16) - (action collide-action :offset 24) - (offense collide-offense :offset 28) - (prim-type int8 :offset 29) + ((prim-core collide-prim-core :inline :offset-assert 0) + (extra-quad uint128 :offset-assert 32) + (ccache collide-cache :offset 32) + (prim collide-shape-prim :offset 36) + (first-tri uint16 :offset 40) + (num-tris uint16 :offset 42) + (unused uint8 4 :offset 44) + (world-sphere vector :inline :offset 0) + (collide-as collide-kind :offset 16) + (action collide-action :offset 24) + (offense collide-offense :offset 28) + (prim-type int8 :offset 29) ) :method-count-assert 11 :size-assert #x30 @@ -114,17 +114,16 @@ ;; The actual cache! (deftype collide-cache (basic) - ((num-tris int32 :offset-assert 4) - ;;(num-tris-u uint32 :offset 4) ;; added - (num-prims int32 :offset-assert 8) - (num-prims-u uint32 :offset 8 );; added - (ignore-mask pat-surface :offset-assert 12) - (proc process-drawable :offset-assert 16) ;; types: target - (collide-box bounding-box :inline :offset-assert 32) - (collide-box4w bounding-box4w :inline :offset-assert 64) - (collide-with collide-kind :offset-assert 96) - (prims collide-cache-prim 100 :inline :offset-assert 112) - (tris collide-cache-tri 461 :inline :offset-assert 4912) + ((num-tris int32 :offset-assert 4) + (num-prims int32 :offset-assert 8) + (num-prims-u uint32 :offset 8) + (ignore-mask pat-surface :offset-assert 12) + (proc process-drawable :offset-assert 16) ;; types: target + (collide-box bounding-box :inline :offset-assert 32) + (collide-box4w bounding-box4w :inline :offset-assert 64) + (collide-with collide-kind :offset-assert 96) + (prims collide-cache-prim 100 :inline :offset-assert 112) + (tris collide-cache-tri 461 :inline :offset-assert 4912) ) :method-count-assert 33 :size-assert #x8670 @@ -148,9 +147,9 @@ (fill-from-foreground-using-y-probe (_type_) none 24) (fill-from-water (_type_ water-control) none 25) ;; or whatever is from 152 in the process passed to 16 (load-mesh-from-spad-in-box (_type_ collide-frag-mesh) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_) none 28) - (dummy-29 (_type_ collide-frag-mesh) none 29) + (collide-cache-method-27 (_type_) none 27) + (collide-cache-method-28 (_type_) none 28) + (collide-cache-method-29 (_type_ collide-frag-mesh) none 29) (puyp-mesh (_type_ collide-puyp-work collide-cache-prim) none 30) (puyp-sphere (_type_ collide-puyp-work collide-cache-prim) vector 31) (unpack-background-collide-mesh (_type_ object object object) none 32) ;; helper for fill from background. @@ -159,8 +158,8 @@ (deftype collide-list-item (structure) - ((mesh collide-frag-mesh :offset-assert 0) - (inst basic :offset-assert 4) + ((mesh collide-frag-mesh :offset-assert 0) + (inst basic :offset-assert 4) ) :method-count-assert 9 :size-assert #x8 @@ -199,17 +198,12 @@ (malloc 'global (* (size-of collide-cache-tri) BIG_COLLIDE_CACHE_SIZE)) ;; but start it at the default. (define *collide-cache-max-tris* 460) -(defmacro activate-big-collide-cache! () - `(set! *collide-cache-max-tris* BIG_COLLIDE_CACHE_SIZE) - ) - + (defmacro activate-big-collide-cache! () + `(set! *collide-cache-max-tris* BIG_COLLIDE_CACHE_SIZE) + ) ) (define-perm *collide-list* collide-list (new 'global 'collide-list)) - - - - diff --git a/goal_src/jak1/engine/collide/collide-cache.gc b/goal_src/jak1/engine/collide/collide-cache.gc index 819c745214..04e22c8b30 100644 --- a/goal_src/jak1/engine/collide/collide-cache.gc +++ b/goal_src/jak1/engine/collide/collide-cache.gc @@ -5,6 +5,8 @@ ;; name in dgo: collide-cache ;; dgos: GAME, ENGINE +;; DECOMP BEGINS + (defmethod debug-draw collide-cache ((obj collide-cache)) "Debug draw all the things in the collide cache!" (let ((gp-0 (the-as collide-cache-tri (-> obj tris)))) @@ -468,7 +470,7 @@ (fill-from-background obj (method-of-type bsp-header collide-y-probe) - (the-as (function collide-cache object none) (method-of-type collide-cache dummy-28)) + (the-as (function collide-cache object none) (method-of-type collide-cache collide-cache-method-28)) ) ) (if (logtest? arg2 (collide-kind water)) @@ -741,7 +743,7 @@ (fill-from-background obj (method-of-type bsp-header collide-ray) - (the-as (function collide-cache object none) (method-of-type collide-cache dummy-27)) + (the-as (function collide-cache object none) (method-of-type collide-cache collide-cache-method-27)) ) ) (if (logtest? arg3 (collide-kind water)) @@ -2503,8 +2505,8 @@ (when (logtest? s3-0 (-> s4-0 prim-core collide-as)) (when (or (not (-> arg0 solid-only)) (logtest? (-> s4-0 prim-core action) (collide-action solid))) (if (>= (-> s4-0 prim-core prim-type) 0) - (set! v1-12 (dummy-9 s5-0 s4-0 arg0)) - (set! v1-12 (dummy-10 s5-0 s4-0 arg0)) + (set! v1-12 (collide-puss-work-method-9 s5-0 s4-0 arg0)) + (set! v1-12 (collide-puss-work-method-10 s5-0 s4-0 arg0)) ) (when v1-12 ;; uncomment to view the point that blocks you from exiting duck. @@ -2519,7 +2521,8 @@ ) (b! #t cfg-21 :delay (nop!)) (label cfg-20) - (format 0 "ERROR: Exceeded max # of spheres in collide-cache::probe-using-spheres!~" a2-0) + ;; fixed bad format string + (format 0 "ERROR: Exceeded max # of spheres in collide-cache::probe-using-spheres!~%") ) (label cfg-21) #f diff --git a/goal_src/jak1/engine/collide/collide-edge-grab-h.gc b/goal_src/jak1/engine/collide/collide-edge-grab-h.gc index 08d66385b9..edae79e793 100644 --- a/goal_src/jak1/engine/collide/collide-edge-grab-h.gc +++ b/goal_src/jak1/engine/collide/collide-edge-grab-h.gc @@ -13,33 +13,35 @@ ;; It doesn't participate in the collide shape system at all ;; It does use the main collide-cache. +;; DECOMP BEGINS + (deftype edge-grab-info (structure) - ((world-vertex vector 6 :inline :offset-assert 0) - (local-vertex vector 6 :inline :offset-assert 96) - (actor-cshape-prim-offset int32 :offset-assert 192) - (actor-handle handle :offset-assert 200) - (hanging-matrix matrix :inline :offset-assert 208) - (edge-vertex vector 2 :inline :offset 0) - (center-hold vector :inline :offset 32) - (tri-vertex vector 3 :inline :offset 48) - (left-hand-hold vector :inline :offset-assert 272) - (right-hand-hold vector :inline :offset-assert 288) - (center-hold-old vector :inline :offset-assert 304) - (edge-tri-pat uint32 :offset-assert 320) + ((world-vertex vector 6 :inline :offset-assert 0) + (local-vertex vector 6 :inline :offset-assert 96) + (actor-cshape-prim-offset int32 :offset-assert 192) + (actor-handle handle :offset-assert 200) + (hanging-matrix matrix :inline :offset-assert 208) + (edge-vertex vector 2 :inline :offset 0) + (center-hold vector :inline :offset 32) + (tri-vertex vector 3 :inline :offset 48) + (left-hand-hold vector :inline :offset-assert 272) + (right-hand-hold vector :inline :offset-assert 288) + (center-hold-old vector :inline :offset-assert 304) + (edge-tri-pat uint32 :offset-assert 320) ) :method-count-assert 11 :size-assert #x144 :flag-assert #xb00000144 (:methods - (dummy-9 (_type_) symbol 9) + (edge-grab-info-method-9 (_type_) symbol 9) (debug-draw (_type_) symbol 10) ) ) (declare-type collide-cache-tri structure) (deftype collide-edge-tri (structure) - ((ctri collide-cache-tri :offset-assert 0) - (normal vector :inline :offset-assert 16) + ((ctri collide-cache-tri :offset-assert 0) + (normal vector :inline :offset-assert 16) ) :method-count-assert 9 :size-assert #x20 @@ -47,11 +49,11 @@ ) (deftype collide-edge-edge (structure) - ((ignore basic :offset-assert 0) - (etri collide-edge-tri :offset-assert 4) - (vertex-ptr (inline-array vector) 2 :offset-assert 8) - (outward vector :inline :offset-assert 16) - (edge-vec-norm vector :inline :offset-assert 32) + ((ignore basic :offset-assert 0) + (etri collide-edge-tri :offset-assert 4) + (vertex-ptr (inline-array vector) 2 :offset-assert 8) + (outward vector :inline :offset-assert 16) + (edge-vec-norm vector :inline :offset-assert 32) ) :method-count-assert 9 :size-assert #x30 @@ -59,12 +61,12 @@ ) (deftype collide-edge-hold-item (structure) - ((next collide-edge-hold-item :offset-assert 0) - (rating float :offset-assert 4) - (split int8 :offset-assert 8) - (edge collide-edge-edge :offset-assert 12) - (center-pt vector :inline :offset-assert 16) - (outward-pt vector :inline :offset-assert 32) + ((next collide-edge-hold-item :offset-assert 0) + (rating float :offset-assert 4) + (split int8 :offset-assert 8) + (edge collide-edge-edge :offset-assert 12) + (center-pt vector :inline :offset-assert 16) + (outward-pt vector :inline :offset-assert 32) ) :method-count-assert 9 :size-assert #x30 @@ -72,10 +74,10 @@ ) (deftype collide-edge-hold-list (structure) - ((num-allocs uint32 :offset-assert 0) - (num-attempts uint32 :offset-assert 4) - (head collide-edge-hold-item :offset-assert 8) - (items collide-edge-hold-item 32 :inline :offset-assert 16) + ((num-allocs uint32 :offset-assert 0) + (num-attempts uint32 :offset-assert 4) + (head collide-edge-hold-item :offset-assert 8) + (items collide-edge-hold-item 32 :inline :offset-assert 16) (attempts qword 32 :inline :offset-assert 1552) ) :method-count-assert 11 @@ -90,32 +92,32 @@ (declare-type collide-cache basic) (declare-type collide-shape basic) (deftype collide-edge-work (structure) - ((ccache collide-cache :offset-assert 0) - (cshape collide-shape :offset-assert 4) - (num-verts uint32 :offset-assert 8) - (num-edges uint32 :offset-assert 12) - (num-tris uint32 :offset-assert 16) - (cache-fill-box bounding-box :inline :offset-assert 32) - (within-reach-box bounding-box :inline :offset-assert 64) - (within-reach-box4w bounding-box4w :inline :offset-assert 96) - (search-pt vector :inline :offset-assert 128) - (search-dir-vec vector :inline :offset-assert 144) - (max-dist-sqrd-to-outward-pt float :offset-assert 160) - (max-dir-cosa-delta float :offset-assert 164) - (split-dists float 2 :offset-assert 168) - (outward-offset vector :inline :offset-assert 176) - (local-cache-fill-box bounding-box :inline :offset-assert 192) - (local-within-reach-box bounding-box :inline :offset-assert 224) - (local-player-spheres sphere 12 :inline :offset-assert 256) - (world-player-spheres sphere 12 :inline :offset-assert 448) - (local-player-hanging-spheres sphere 6 :inline :offset 256) - (world-player-hanging-spheres sphere 6 :inline :offset 448) - (local-player-leap-up-spheres sphere 6 :inline :offset 352) - (world-player-leap-up-spheres sphere 6 :inline :offset 544) - (verts vector 64 :inline :offset-assert 640) - (edges collide-edge-edge 96 :inline :offset-assert 1664) - (tris collide-edge-tri 48 :inline :offset-assert 6272) - (hold-list collide-edge-hold-list :inline :offset-assert 7808) + ((ccache collide-cache :offset-assert 0) + (cshape collide-shape :offset-assert 4) + (num-verts uint32 :offset-assert 8) + (num-edges uint32 :offset-assert 12) + (num-tris uint32 :offset-assert 16) + (cache-fill-box bounding-box :inline :offset-assert 32) + (within-reach-box bounding-box :inline :offset-assert 64) + (within-reach-box4w bounding-box4w :inline :offset-assert 96) + (search-pt vector :inline :offset-assert 128) + (search-dir-vec vector :inline :offset-assert 144) + (max-dist-sqrd-to-outward-pt float :offset-assert 160) + (max-dir-cosa-delta float :offset-assert 164) + (split-dists float 2 :offset-assert 168) + (outward-offset vector :inline :offset-assert 176) + (local-cache-fill-box bounding-box :inline :offset-assert 192) + (local-within-reach-box bounding-box :inline :offset-assert 224) + (local-player-spheres sphere 12 :inline :offset-assert 256) + (world-player-spheres sphere 12 :inline :offset-assert 448) + (local-player-hanging-spheres sphere 6 :inline :offset 256) + (world-player-hanging-spheres sphere 6 :inline :offset 448) + (local-player-leap-up-spheres sphere 6 :inline :offset 352) + (world-player-leap-up-spheres sphere 6 :inline :offset 544) + (verts vector 64 :inline :offset-assert 640) + (edges collide-edge-edge 96 :inline :offset-assert 1664) + (tris collide-edge-tri 48 :inline :offset-assert 6272) + (hold-list collide-edge-hold-list :inline :offset-assert 7808) ) :method-count-assert 20 :size-assert #x2690 @@ -126,7 +128,7 @@ (debug-draw-tris (_type_) none 11) (debug-draw-sphere (_type_) symbol 12) (compute-center-point! (_type_ collide-edge-edge vector) float 13) - (dummy-14 (_type_ vector vector int) float 14) + (collide-edge-work-method-14 (_type_ vector vector int) float 14) (find-grabbable-edges! (_type_) none 15) (find-grabbable-tris! (_type_) none 16) (should-add-to-list? (_type_ collide-edge-hold-item collide-edge-edge) symbol 17) @@ -136,33 +138,33 @@ ) (define *collide-edge-work* (new 'static 'collide-edge-work - :max-dist-sqrd-to-outward-pt 37748736.0 - :max-dir-cosa-delta 0.6 - :split-dists (new 'static 'array float 2 1024.0 1433.6) - :outward-offset (new 'static 'vector :x 708.608 :y 13312.0 :w 1.0) - :local-cache-fill-box (new 'static 'bounding-box - :min (new 'static 'vector :x -8192.0 :y -11059.2 :z -8192.0 :w 1.0) - :max (new 'static 'vector :x 8192.0 :y 24576.0 :z 8192.0 :w 1.0) - ) - :local-within-reach-box (new 'static 'bounding-box - :min (new 'static 'vector :x -6144.0 :y 5324.8 :z -6144.0 :w 1.0) - :max (new 'static 'vector :x 6144.0 :y 11059.2 :z 6144.0 :w 1.0) - ) - :local-player-spheres (new 'static 'inline-array sphere 12 - (new 'static 'sphere :x 1720.32 :y -819.2 :w 1433.6) - (new 'static 'sphere :x 2293.76 :y -3276.8 :w 1884.16) - (new 'static 'sphere :x 1966.08 :y -6144.0 :w 1556.48) - (new 'static 'sphere :x 1966.08 :y -8601.6 :w 1556.48) - (new 'static 'sphere :x 1761.28 :y -11059.2 :w 1351.68) - (new 'static 'sphere :x 1679.36 :y -13312.0 :w 1269.76) - (new 'static 'sphere :x -737.28 :y 4096.0 :w 3072.0) - (new 'static 'sphere :x -737.28 :y 6553.6 :w 3072.0) - (new 'static 'sphere :x -737.28 :y 9420.8 :w 3072.0) - (new 'static 'sphere :x 1720.32 :y 3686.4 :w 2949.12) - (new 'static 'sphere :x 1720.32 :y 5734.4 :w 2949.12) - (new 'static 'sphere :x 1720.32 :y 8601.6 :w 2949.12) - ) + :max-dist-sqrd-to-outward-pt 37748736.0 + :max-dir-cosa-delta 0.6 + :split-dists (new 'static 'array float 2 1024.0 1433.6) + :outward-offset (new 'static 'vector :x 708.608 :y 13312.0 :w 1.0) + :local-cache-fill-box (new 'static 'bounding-box + :min (new 'static 'vector :x -8192.0 :y -11059.2 :z -8192.0 :w 1.0) + :max (new 'static 'vector :x 8192.0 :y 24576.0 :z 8192.0 :w 1.0) ) - ) + :local-within-reach-box (new 'static 'bounding-box + :min (new 'static 'vector :x -6144.0 :y 5324.8 :z -6144.0 :w 1.0) + :max (new 'static 'vector :x 6144.0 :y 11059.2 :z 6144.0 :w 1.0) + ) + :local-player-spheres (new 'static 'inline-array sphere 12 + (new 'static 'sphere :x 1720.32 :y -819.2 :w 1433.6) + (new 'static 'sphere :x 2293.76 :y -3276.8 :w 1884.16) + (new 'static 'sphere :x 1966.08 :y -6144.0 :w 1556.48) + (new 'static 'sphere :x 1966.08 :y -8601.6 :w 1556.48) + (new 'static 'sphere :x 1761.28 :y -11059.2 :w 1351.68) + (new 'static 'sphere :x 1679.36 :y -13312.0 :w 1269.76) + (new 'static 'sphere :x -737.28 :y 4096.0 :w 3072.0) + (new 'static 'sphere :x -737.28 :y 6553.6 :w 3072.0) + (new 'static 'sphere :x -737.28 :y 9420.8 :w 3072.0) + (new 'static 'sphere :x 1720.32 :y 3686.4 :w 2949.12) + (new 'static 'sphere :x 1720.32 :y 5734.4 :w 2949.12) + (new 'static 'sphere :x 1720.32 :y 8601.6 :w 2949.12) + ) + ) + ) (define-perm *edge-grab-info* edge-grab-info (new 'global 'edge-grab-info)) diff --git a/goal_src/jak1/engine/collide/collide-edge-grab.gc b/goal_src/jak1/engine/collide/collide-edge-grab.gc index bb5c41ce80..8410689e84 100644 --- a/goal_src/jak1/engine/collide/collide-edge-grab.gc +++ b/goal_src/jak1/engine/collide/collide-edge-grab.gc @@ -5,6 +5,8 @@ ;; name in dgo: collide-edge-grab ;; dgos: GAME, ENGINE +;; DECOMP BEGINS + (defmethod find-edge-grabs! target ((obj target) (arg0 collide-cache)) "Main edge grabbing method. Will populate *edge-grab-info* and send *target* an 'edge-grab event if successful." @@ -144,7 +146,7 @@ ) (let ((s0-0 (new 'stack-no-clear 'vector))) (vector+*! s0-0 (-> arg0 center-pt) (-> s3-0 edge-vec-norm) 1105.92) - (let ((f0-0 (dummy-14 obj (-> arg1 right-hand-hold) s0-0 (the-as int s4-0)))) + (let ((f0-0 (collide-edge-work-method-14 obj (-> arg1 right-hand-hold) s0-0 (the-as int s4-0)))) (if (< 491.52 f0-0) (return #f) ) @@ -157,7 +159,7 @@ ) (sv-144 sv-160 sv-176 a2-3 a3-2) ) - (let ((f0-1 (dummy-14 obj (-> arg1 left-hand-hold) s0-0 (the-as int s4-0)))) + (let ((f0-1 (collide-edge-work-method-14 obj (-> arg1 left-hand-hold) s0-0 (the-as int s4-0)))) (if (< 491.52 f0-1) (return #f) ) @@ -229,7 +231,7 @@ #t ) -(defmethod dummy-9 edge-grab-info ((obj edge-grab-info)) +(defmethod edge-grab-info-method-9 edge-grab-info ((obj edge-grab-info)) (local-vars (v0-0 symbol) (v1-14 int)) (rlet ((acc :class vf) (Q :class vf) @@ -364,7 +366,7 @@ (defmethod-mips2c "(method 16 collide-edge-work)" 16 collide-edge-work) (defmethod-mips2c "(method 15 collide-edge-work)" 15 collide-edge-work) -(defmethod dummy-14 collide-edge-work ((obj collide-edge-work) (arg0 vector) (arg1 vector) (arg2 int)) +(defmethod collide-edge-work-method-14 collide-edge-work ((obj collide-edge-work) (arg0 vector) (arg1 vector) (arg2 int)) (let ((f30-0 -1.0)) (let ((s2-0 (new 'stack-no-clear 'vector))) (dotimes (s1-0 (the-as int (-> obj num-edges))) @@ -650,7 +652,6 @@ ) ) - (defmethod debug-draw-sphere collide-edge-work ((obj collide-edge-work)) (dotimes (s5-0 (the-as int (-> obj num-verts))) (let ((a2-0 (-> obj verts s5-0))) @@ -730,90 +731,73 @@ (none) ) -;; failed to figure out what this is: -(let - ((v1-1 - (new 'static 'surface - :name '*rotate-surface* - :turnv 1.0 - :turnvv 1.0 - :tiltv 1.0 - :tiltvv 1.0 - :transv-max 1.0 - :target-speed 1.0 - :seek0 153600.0 - :seek90 153600.0 - :seek180 256000.0 - :fric 153600.0 - :nonlin-fric-dist 5120.0 - :slip-factor 1.0 - :slope-down-factor 10240.0 - :slope-slip-angle 8192.0 - :impact-fric 1.0 - :bend-factor 0.8 - :bend-speed 4.0 - :alignv 1.0 - :slope-up-traction 1.0 - :align-speed 1.0 - :flags #x4000 - ) - ) - ) - (define *rotate-surface* v1-1) - (set! - (-> v1-1 mult-hook) - (the-as - (function surface surface surface int none) - (lambda ((arg0 surface) (arg1 object) (arg2 object) (arg3 int)) - (when (= arg3 1) - (let ((f0-0 151756.8)) - (set! (-> arg0 fric) f0-0) - f0-0 - ) +(let ((v1-1 + (new 'static 'surface + :name '*rotate-surface* + :turnv 1.0 + :turnvv 1.0 + :tiltv 1.0 + :tiltvv 1.0 + :transv-max 1.0 + :target-speed 1.0 + :seek0 153600.0 + :seek90 153600.0 + :seek180 256000.0 + :fric 153600.0 + :nonlin-fric-dist 5120.0 + :slip-factor 1.0 + :slope-down-factor 10240.0 + :slope-slip-angle 8192.0 + :impact-fric 1.0 + :bend-factor 0.8 + :bend-speed 4.0 + :alignv 1.0 + :slope-up-traction 1.0 + :align-speed 1.0 + :flags (surface-flags moving-ground) + ) + ) ) - ) - ) - ) + (define *rotate-surface* v1-1) + (set! *rotate-surface* v1-1) + (set! (-> v1-1 mult-hook) + (the-as + (function surface surface surface int none) + (lambda ((arg0 surface) (arg1 object) (arg2 object) (arg3 int)) (if (= arg3 1) + (set! (-> arg0 fric) 151756.8) + ) + ) + ) + ) (set! (-> v1-1 touch-hook) nothing) (set! (-> v1-1 active-hook) nothing) ) -;; failed to figure out what this is: -(let - ((v1-2 - (new 'static 'surface - :name '*no-walk-surface* - :turnv 0.5 - :turnvv 1.0 - :tiltv 1.0 - :tiltvv 1.0 - :transv-max 0.7 - :target-speed 0.7 - :seek0 24576.0 - :seek90 24576.0 - :seek180 24576.0 - :fric 23756.8 - :nonlin-fric-dist 4091904.0 - :slope-slip-angle 16384.0 - :bend-speed 4.0 - :alignv 0.5 - :slope-up-traction 0.9 - :align-speed 1.0 - :flags #x28 - ) - ) - ) +(let ((v1-2 (new 'static 'surface + :name '*no-walk-surface* + :turnv 0.5 + :turnvv 1.0 + :tiltv 1.0 + :tiltvv 1.0 + :transv-max 0.7 + :target-speed 0.7 + :seek0 24576.0 + :seek90 24576.0 + :seek180 24576.0 + :fric 23756.8 + :nonlin-fric-dist 4091904.0 + :slope-slip-angle 16384.0 + :bend-speed 4.0 + :alignv 0.5 + :slope-up-traction 0.9 + :align-speed 1.0 + :flags (surface-flags no-turn-around always-rotate-toward-transv) + ) + ) + ) (define *no-walk-surface* v1-2) - (set! - (-> v1-2 mult-hook) - (the-as (function surface surface surface int none) nothing) - ) + (set! *no-walk-surface* v1-2) + (set! (-> v1-2 mult-hook) (the-as (function surface surface surface int none) nothing)) (set! (-> v1-2 touch-hook) nothing) (set! (-> v1-2 active-hook) nothing) ) - - -; (defmethod find-edge-grabs! target ((obj target) (arg0 collide-cache)) -; (format *stdcon* "no edge grabs for you!~%") -; (the object 0) -; ) \ No newline at end of file diff --git a/goal_src/jak1/engine/collide/collide-shape-h.gc b/goal_src/jak1/engine/collide/collide-shape-h.gc index f7b4ff7cba..12492a94e9 100644 --- a/goal_src/jak1/engine/collide/collide-shape-h.gc +++ b/goal_src/jak1/engine/collide/collide-shape-h.gc @@ -68,7 +68,7 @@ ;; Nav Enemy Collision (made up name) -;; dummy-58 and integrate-for-enemy-with-move-to-ground are nav-enemy specific. +;; collide-shape-moving-method-58 and integrate-for-enemy-with-move-to-ground are nav-enemy specific. ;; the details aren't super well understood yet. But they basically try to go forward if they aren't blocked. ;; Uses find-overlapping-shapes as the detector. (old system) @@ -83,6 +83,8 @@ (declare-type touching-list structure) (declare-type collide-shape-prim basic) +;; DECOMP BEGINS + ;;;;;;;;;;;;;;;;;;; ;; Sticky Rider ;;;;;;;;;;;;;;;;;;; @@ -93,10 +95,10 @@ (deftype collide-sticky-rider (structure) - ((rider-handle handle :offset-assert 0) - (sticky-prim collide-shape-prim :offset-assert 8) - (prim-ry float :offset-assert 12) - (rider-local-pos vector :inline :offset-assert 16) + ((rider-handle handle :offset-assert 0) + (sticky-prim collide-shape-prim :offset-assert 8) + (prim-ry float :offset-assert 12) + (rider-local-pos vector :inline :offset-assert 16) ) :method-count-assert 10 :size-assert #x20 @@ -116,9 +118,9 @@ ;; A collection of collide-sticky-riders ;; dynamic type. There's one collide-sticky-rider per rider. (deftype collide-sticky-rider-group (basic) - ((num-riders int32 :offset-assert 4) - (allocated-riders int32 :offset-assert 8) - (rider collide-sticky-rider 1 :inline :offset-assert 16) + ((num-riders int32 :offset-assert 4) + (allocated-riders int32 :offset-assert 8) + (rider collide-sticky-rider 1 :inline :offset-assert 16) ) :method-count-assert 11 :size-assert #x30 @@ -139,10 +141,10 @@ ;; The rider will be pulled along by the object. ;; This includes possibly rotating the rider (if the platform spins, it spins Jak too). (deftype pull-rider-info (structure) - ((rider collide-sticky-rider :offset-assert 0) - (rider-cshape collide-shape-moving :offset-assert 4) - (rider-delta-ry float :offset-assert 8) - (rider-dest vector :inline :offset-assert 16) + ((rider collide-sticky-rider :offset-assert 0) + (rider-cshape collide-shape-moving :offset-assert 4) + (rider-delta-ry float :offset-assert 8) + (rider-dest vector :inline :offset-assert 16) ) :method-count-assert 9 :size-assert #x20 @@ -158,9 +160,9 @@ ;; this computes a "move-vec" and "u". If you move along "move-vec" by "u", you will move out of collsion. ;; It also tells you which primitives are colliding. (deftype collide-shape-intersect (basic) - ((move-vec vector :inline :offset-assert 16) - (best-u float :offset-assert 32) - (best-tri collide-tri-result :inline :offset-assert 48) + ((move-vec vector :inline :offset-assert 16) + (best-u float :offset-assert 32) + (best-tri collide-tri-result :inline :offset-assert 48) (best-from-prim collide-shape-prim :offset-assert 132) (best-to-prim collide-shape-prim :offset-assert 136) ) @@ -174,10 +176,10 @@ ;; Collision with just overlap distance, no vector. (deftype collide-overlap-result (structure) - ((best-dist float :offset-assert 0) - (best-from-prim collide-shape-prim :offset-assert 4) - (best-to-prim collide-shape-prim :offset-assert 8) - (best-from-tri collide-tri-result :inline :offset-assert 16) + ((best-dist float :offset-assert 0) + (best-from-prim collide-shape-prim :offset-assert 4) + (best-to-prim collide-shape-prim :offset-assert 8) + (best-from-tri collide-tri-result :inline :offset-assert 16) ) :method-count-assert 10 :size-assert #x64 @@ -204,7 +206,7 @@ ;; but this isn't well understood yet (deftype overlaps-others-params (structure) - ((options uint32 :offset-assert 0) + ((options uint32 :offset-assert 0) (tlist touching-list :offset-assert 4) ) :method-count-assert 9 @@ -342,13 +344,13 @@ ;; this is a 32-byte chunk of data that can be pulled out an put in collide caches ;; it stores the transformed world sphere and the collision settings (deftype collide-prim-core (structure) - ((world-sphere vector :inline :offset-assert 0) - (collide-as collide-kind :offset-assert 16) ;; what are we (enemy, etc) - (action collide-action :offset-assert 24) ;; what happens if we collide (physics) - (offense collide-offense :offset-assert 28) ;; how hard to we have to hit it? (touch, attack...) - (prim-type int8 :offset-assert 29) ;; what type of primtive do we belong to? - (extra uint8 2 :offset-assert 30) - (quad uint128 2 :offset 0) + ((world-sphere vector :inline :offset-assert 0) + (collide-as collide-kind :offset-assert 16) ;; what are we (enemy, etc) + (action collide-action :offset-assert 24) ;; what happens if we collide (physics) + (offense collide-offense :offset-assert 28) ;; how hard do we have to hit it? (touch, attack...) + (prim-type int8 :offset-assert 29) ;; what type of primtive do we belong to? + (extra uint8 2 :offset-assert 30) + (quad uint128 2 :offset 0) ) :method-count-assert 9 :size-assert #x20 @@ -362,20 +364,20 @@ ;; the base class for collision shapes. (deftype collide-shape-prim (basic) - ((cshape collide-shape :offset-assert 4) ;; our parent collide-shape - (prim-id uint32 :offset-assert 8) ;; ? - (transform-index int8 :offset-assert 12) ;; ? - (prim-core collide-prim-core :inline :offset-assert 16) ;; core data - (local-sphere vector :inline :offset-assert 48) ;; sphere, pre transform - (collide-with collide-kind :offset-assert 64) ;; things we can collide with + ((cshape collide-shape :offset-assert 4) ;; our parent collide-shape + (prim-id uint32 :offset-assert 8) ;; ? + (transform-index int8 :offset-assert 12) ;; ? + (prim-core collide-prim-core :inline :offset-assert 16) ;; core data + (local-sphere vector :inline :offset-assert 48) ;; sphere, pre transform + (collide-with collide-kind :offset-assert 64) ;; things we can collide with ;; overlays of core. - (world-sphere vector :inline :offset 16) - (collide-as collide-kind :offset 32) - (action collide-action :offset 40) - (offense collide-offense :offset 44) - (prim-type int8 :offset 45) - (radius meters :offset 60) + (world-sphere vector :inline :offset 16) + (collide-as collide-kind :offset 32) + (action collide-action :offset 40) + (offense collide-offense :offset 44) + (prim-type int8 :offset 45) + (radius meters :offset 60) ) :method-count-assert 28 :size-assert #x48 @@ -416,7 +418,7 @@ ;; the pat is stored directly here. ;; I believe the "local sphere" is used as the sphere. (deftype collide-shape-prim-sphere (collide-shape-prim) - ((pat pat-surface :offset-assert 72) + ((pat pat-surface :offset-assert 72) ) :method-count-assert 28 :size-assert #x4c @@ -431,10 +433,10 @@ ;; These meshes interact with a cache automatically (a specific collide-shape-prim-mesh cache, not the ;; more general collide-cache) (deftype collide-shape-prim-mesh (collide-shape-prim) - ((mesh collide-mesh :offset-assert 72) - (mesh-id int32 :offset-assert 76) - (mesh-cache-id uint64 :offset-assert 80) - (mesh-cache-tris (inline-array collide-mesh-cache-tri) :offset-assert 88) + ((mesh collide-mesh :offset-assert 72) + (mesh-id int32 :offset-assert 76) + (mesh-cache-id uint64 :offset-assert 80) + (mesh-cache-tris (inline-array collide-mesh-cache-tri) :offset-assert 88) ) :method-count-assert 29 :size-assert #x5c @@ -447,11 +449,11 @@ ;; A group of collide-shape-prim's (deftype collide-shape-prim-group (collide-shape-prim) - ((num-prims int32 :offset-assert 72) - (num-prims-u uint32 :offset 72) - (allocated-prims int32 :offset-assert 76) - (prim collide-shape-prim 1 :offset-assert 80) - (prims collide-shape-prim :dynamic :score 20 :offset 80) ;; added + ((num-prims int32 :offset-assert 72) + (num-prims-u uint32 :offset 72) + (allocated-prims int32 :offset-assert 76) + (prim collide-shape-prim 1 :offset-assert 80) + (prims collide-shape-prim :dynamic :offset 80) ;; added ) :method-count-assert 30 :size-assert #x54 @@ -492,37 +494,37 @@ ;; we're a child of trsqv, so we store a full transform + derivative. (deftype collide-shape (trsqv) - ((process process-drawable :offset-assert 140) - (max-iteration-count uint8 :offset-assert 144) - (nav-flags nav-flags :offset-assert 145) - (pad-byte uint8 2 :offset-assert 146) - (pat-ignore-mask pat-surface :offset-assert 148) - (event-self symbol :offset-assert 152) - (event-other symbol :offset-assert 156) - (root-prim collide-shape-prim :offset-assert 160) - (riders collide-sticky-rider-group :offset-assert 164) - (backup-collide-as collide-kind :offset-assert 168) - (backup-collide-with collide-kind :offset-assert 176) + ((process process-drawable :offset-assert 140) + (max-iteration-count uint8 :offset-assert 144) + (nav-flags nav-flags :offset-assert 145) + (pad-byte uint8 2 :offset-assert 146) + (pat-ignore-mask pat-surface :offset-assert 148) + (event-self symbol :offset-assert 152) + (event-other symbol :offset-assert 156) + (root-prim collide-shape-prim :offset-assert 160) + (riders collide-sticky-rider-group :offset-assert 164) + (backup-collide-as collide-kind :offset-assert 168) + (backup-collide-with collide-kind :offset-assert 176) ) :method-count-assert 56 :size-assert #xb8 :flag-assert #x38000000b8 (:methods - (new (symbol type process-drawable collide-list-enum) _type_) + (new (symbol type process-drawable collide-list-enum) _type_ 0) (move-by-vector! (_type_ vector) none 28) (alloc-riders (_type_ int) none 29) (move-to-point! (_type_ vector) none 30) ;; ret - symbol | float (CSPG::9) (debug-draw (_type_) none 31) (fill-cache-for-shape! (_type_ float collide-kind) none 32) (fill-cache-integrate-and-collide! (_type_ vector collide-kind) none 33) - (find-prim-by-id (_type_ uint) collide-shape-prim 34) + (find-prim-by-id (_type_ uint) collide-shape-prim 34) (detect-riders! (_type_) symbol 35) (build-bounding-box-for-shape (_type_ bounding-box float collide-kind) symbol 36) (integrate-and-collide! (_type_ vector) none 37) (find-collision-meshes (_type_) symbol 38) (on-platform (_type_ collide-shape collide-overlap-result) symbol 39) (find-overlapping-shapes (_type_ overlaps-others-params) symbol 40) ;; check if blocked?? - (dummy-41 (_type_ attack-info float) vector 41) + (calc-shove-up (_type_ attack-info float) vector 41) (should-push-away (_type_ collide-shape collide-overlap-result) symbol 42) (pull-rider! (_type_ pull-rider-info) none 43) (pull-riders! (_type_) symbol 44) @@ -614,31 +616,31 @@ ;; A collide-shape for independently moving objects (deftype collide-shape-moving (collide-shape) - ((rider-time time-frame :offset-assert 184) - (rider-last-move vector :inline :offset-assert 192) - (trans-old vector 3 :inline :offset-assert 208) - (poly-pat pat-surface :offset-assert 256) - (cur-pat pat-surface :offset-assert 260) - (ground-pat pat-surface :offset-assert 264) - (status cshape-moving-flags :offset-assert 272) - (old-status cshape-moving-flags :offset-assert 280) - (prev-status cshape-moving-flags :offset-assert 288) - (reaction-flag cshape-reaction-flags :offset-assert 296) - (reaction (function collide-shape-moving collide-shape-intersect vector vector cshape-moving-flags) :offset-assert 300) - (no-reaction (function collide-shape-moving collide-shape-intersect vector vector none) :offset-assert 304) - (local-normal vector :inline :offset-assert 320) - (surface-normal vector :inline :offset-assert 336) - (poly-normal vector :inline :offset-assert 352) - (ground-poly-normal vector :inline :offset-assert 368) - (ground-touch-point vector :inline :offset-assert 384) - (shadow-pos vector :inline :offset-assert 400) - (ground-impact-vel meters :offset-assert 416) - (surface-angle float :offset-assert 420) - (poly-angle float :offset-assert 424) - (touch-angle float :offset-assert 428) - (coverage float :offset-assert 432) - (dynam dynamics :offset-assert 436) - (surf surface :offset-assert 440) + ((rider-time time-frame :offset-assert 184) + (rider-last-move vector :inline :offset-assert 192) + (trans-old vector 3 :inline :offset-assert 208) + (poly-pat pat-surface :offset-assert 256) + (cur-pat pat-surface :offset-assert 260) + (ground-pat pat-surface :offset-assert 264) + (status cshape-moving-flags :offset-assert 272) + (old-status cshape-moving-flags :offset-assert 280) + (prev-status cshape-moving-flags :offset-assert 288) + (reaction-flag cshape-reaction-flags :offset-assert 296) + (reaction (function collide-shape-moving collide-shape-intersect vector vector cshape-moving-flags) :offset-assert 300) + (no-reaction (function collide-shape-moving collide-shape-intersect vector vector none) :offset-assert 304) + (local-normal vector :inline :offset-assert 320) + (surface-normal vector :inline :offset-assert 336) + (poly-normal vector :inline :offset-assert 352) + (ground-poly-normal vector :inline :offset-assert 368) + (ground-touch-point vector :inline :offset-assert 384) + (shadow-pos vector :inline :offset-assert 400) + (ground-impact-vel meters :offset-assert 416) + (surface-angle float :offset-assert 420) + (poly-angle float :offset-assert 424) + (touch-angle float :offset-assert 428) + (coverage float :offset-assert 432) + (dynam dynamics :offset-assert 436) + (surf surface :offset-assert 440) ) :method-count-assert 65 :size-assert #x1bc @@ -646,7 +648,7 @@ (:methods (set-and-handle-pat! (_type_ pat-surface) none 56) (integrate-no-collide! (_type_ vector) none 57) - (dummy-58 (_type_ vector) symbol 58) + (collide-shape-moving-method-58 (_type_ vector) symbol 58) (integrate-for-enemy-with-move-to-ground! (_type_ vector collide-kind float symbol symbol symbol) none 59) (move-to-ground (_type_ float float symbol collide-kind) symbol 60) (move-to-ground-point! (_type_ vector vector vector) none 61) diff --git a/goal_src/jak1/engine/collide/collide-shape.gc b/goal_src/jak1/engine/collide/collide-shape.gc index d69168d30a..db825e58ea 100644 --- a/goal_src/jak1/engine/collide/collide-shape.gc +++ b/goal_src/jak1/engine/collide/collide-shape.gc @@ -5,6 +5,8 @@ ;; name in dgo: collide-shape ;; dgos: GAME, ENGINE +;; DECOMP BEGINS + ;; The collide shape system is used to handle collision reactions. ;;;;;;;;;;;;;;;;;;;;;;; @@ -1460,7 +1462,7 @@ ) ) -(defmethod dummy-58 collide-shape-moving ((obj collide-shape-moving) (arg0 vector)) +(defmethod collide-shape-moving-method-58 collide-shape-moving ((obj collide-shape-moving) (arg0 vector)) ;; not sure yet. moves shadow-pos, but possibly not trans. (integrate-no-collide! obj arg0) (let ((a1-1 (new 'stack-no-clear 'overlaps-others-params))) @@ -1477,7 +1479,7 @@ (defmethod move-to-tri! collide-shape-moving ((obj collide-shape-moving) (arg0 collide-tri-result) (arg1 vector)) "Move us to tri arg0, at point arg1." (move-to-point! obj arg1) - (logior! (-> obj status) 7) + (logior! (-> obj status) (cshape-moving-flags onsurf onground tsurf)) (let ((v1-4 (-> arg0 normal))) (set! (-> obj poly-normal quad) (-> v1-4 quad)) (set! (-> obj surface-normal quad) (-> v1-4 quad)) @@ -1492,15 +1494,14 @@ (none) ) -;; WARN: Stack slot offset 128 signed mismatch (defmethod integrate-for-enemy-with-move-to-ground! collide-shape-moving ((obj collide-shape-moving) - (arg0 vector) - (arg1 collide-kind) - (arg2 float) - (arg3 symbol) - (arg4 symbol) - (arg5 symbol) - ) + (arg0 vector) + (arg1 collide-kind) + (arg2 float) + (arg3 symbol) + (arg4 symbol) + (arg5 symbol) + ) "This is likely the main method for stepping an enemy. arg0: velocity arg1: ground collision @@ -1654,7 +1655,7 @@ ;; apply that. note that we scale the slopiness by arg1 ;; (this is not really how things work.) (vector--float*! arg0 s4-0 a2-2 (cond - ((logtest? (-> obj status) 1) + ((logtest? (-> obj status) (cshape-moving-flags onsurf)) (empty) arg1 ) @@ -1805,7 +1806,7 @@ ) ) -;; WARN: Bad vector register dependency: vf31 +;; ERROR: Bad vector register dependency: vf31 (defmethod add-to-bounding-box collide-shape-prim ((obj collide-shape-prim) (arg0 collide-kind)) "Add a single prim to the bounding box. (just adds the bsphere)" (rlet ((vf1 :class vf) @@ -2426,18 +2427,17 @@ (bucket-id debug) (the-as vector (-> obj prim-core)) (-> obj local-sphere w) - (the-as rgba (cond - ((and (zero? (-> obj prim-core collide-as)) (zero? (-> obj collide-with))) - #x40808080 - ) - ((logtest? (-> obj prim-core action) 1) - #x4000ffff - ) - (else - #x400080ff - ) - ) - ) + (cond + ((and (zero? (-> obj prim-core collide-as)) (zero? (-> obj collide-with))) + (new 'static 'rgba :r #x80 :g #x80 :b #x80 :a #x40) + ) + ((logtest? (-> obj prim-core action) (collide-action solid)) + (new 'static 'rgba :r #xff :g #xff :a #x40) + ) + (else + (new 'static 'rgba :r #xff :g #x80 :a #x40) + ) + ) ) ) @@ -3268,7 +3268,7 @@ (add-touching-prims a0-6 obj arg1 -1.0 (the-as collide-tri-result #f) (the-as collide-tri-result #f)) ) (label cfg-16) - (b! (zero? (logand (-> arg0 options) 1)) cfg-19 :delay (set! v1-26 (-> obj prim-core action))) + (b! (not (logtest? (-> arg0 options) 1)) cfg-19 :delay (set! v1-26 (-> obj prim-core action))) (let ((a0-7 (-> arg1 prim-core action))) (b! (logtest? (logand v1-26 (collide-action solid)) a0-7) cfg-19 :delay (nop!)) ) @@ -3314,13 +3314,12 @@ (the-as none 0) (label cfg-9) (b! - (not - (overlap-test - s3-0 - (the-as collide-mesh-cache-tri (-> obj mesh-cache-tris)) - (the-as vector (-> arg1 prim-core)) - ) - ) + (not (overlap-test + s3-0 + (the-as collide-mesh-cache-tri (-> obj mesh-cache-tris)) + (the-as vector (-> arg1 prim-core)) + ) + ) cfg-12 ) ) @@ -3342,7 +3341,7 @@ (add-touching-prims a0-7 obj arg1 -1.0 (the-as collide-tri-result #f) (the-as collide-tri-result #f)) ) (label cfg-16) - (b! (zero? (logand (-> arg0 options) 1)) cfg-19 :delay (set! v1-26 (-> obj prim-core action))) + (b! (not (logtest? (-> arg0 options) 1)) cfg-19 :delay (set! v1-26 (-> obj prim-core action))) (let ((a0-8 (-> arg1 prim-core action))) (b! (logtest? (logand v1-26 (collide-action solid)) a0-8) cfg-19 :delay (nop!)) ) @@ -3479,7 +3478,7 @@ ) ) -(defmethod dummy-41 collide-shape ((obj collide-shape) (arg0 attack-info) (arg1 float)) +(defmethod calc-shove-up collide-shape ((obj collide-shape) (arg0 attack-info) (arg1 float)) (set! (-> arg0 shove-up) arg1) (let* ((s3-0 (-> obj process path)) (s2-0 (-> s3-0 curve num-cverts)) @@ -3501,7 +3500,3 @@ (vector-! (-> arg0 vector) s5-0 s4-0) ) ) - - - - diff --git a/goal_src/jak1/engine/collide/collide-touch-h.gc b/goal_src/jak1/engine/collide/collide-touch-h.gc index 6a87e4e155..c738fc05d8 100644 --- a/goal_src/jak1/engine/collide/collide-touch-h.gc +++ b/goal_src/jak1/engine/collide/collide-touch-h.gc @@ -16,6 +16,8 @@ (defconstant TOUCHING_LIST_LENGTH 32) +;; DECOMP BEGINS + ;; A record of a primitive which is touching another, possibly including the triangle that is involved. (deftype touching-prim (structure) ((cprim collide-shape-prim :offset-assert 0) @@ -29,11 +31,11 @@ ;; A record of two primitives which are touching. (deftype touching-prims-entry (structure) - ((next touching-prims-entry :offset-assert 0) - (prev touching-prims-entry :offset-assert 4) - (allocated? symbol :offset-assert 8) - (u float :offset-assert 12) - (prim1 touching-prim :inline :offset-assert 16) + ((next touching-prims-entry :offset-assert 0) + (prev touching-prims-entry :offset-assert 4) + (allocated? symbol :offset-assert 8) + (u float :offset-assert 12) + (prim1 touching-prim :inline :offset-assert 16) (prim2 touching-prim :inline :offset-assert 128) ) :method-count-assert 13 @@ -41,7 +43,7 @@ :flag-assert #xd000000e4 (:methods (get-touched-prim (_type_ trsqv touching-shapes-entry) collide-shape-prim 9) - (dummy-10 () none 10) + (touching-prims-entry-method-10 () none 10) (get-middle-of-bsphere-overlap (_type_ vector) vector 11) (get-touched-tri (_type_ collide-shape touching-shapes-entry) collide-tri-result 12) ) @@ -49,8 +51,8 @@ ;; A pool of up to 64 touching primitives. There is a linked list of freed entries. (deftype touching-prims-entry-pool (structure) - ((head touching-prims-entry :offset-assert 0) - (nodes touching-prims-entry 64 :inline :offset-assert 16) + ((head touching-prims-entry :offset-assert 0) + (nodes touching-prims-entry 64 :inline :offset-assert 16) ) :method-count-assert 13 :size-assert #x3c10 @@ -104,22 +106,22 @@ ;; two collide shapes which are touching. ;; This stores a list of primitive pairs which are touching. (deftype touching-shapes-entry (structure) - ((cshape1 collide-shape :offset-assert 0) - (cshape2 collide-shape :offset-assert 4) - (resolve-u int8 :offset-assert 8) - (head touching-prims-entry :offset-assert 12) + ((cshape1 collide-shape :offset-assert 0) + (cshape2 collide-shape :offset-assert 4) + (resolve-u int8 :offset-assert 8) + (head touching-prims-entry :offset-assert 12) ) :allow-misaligned :method-count-assert 18 :size-assert #x10 :flag-assert #x1200000010 (:methods - (dummy-9 (_type_) none 9) + (touching-shapes-entry-method-9 (_type_) none 9) (get-touched-shape (_type_ collide-shape) collide-shape 10) - (dummy-11 () none 11) - (prims-touching? (_type_ collide-shape-moving uint) touching-prims-entry 12) ; this one! + (touching-shapes-entry-method-11 () none 11) + (prims-touching? (_type_ collide-shape-moving uint) touching-prims-entry 12) (prims-touching-action? (_type_ collide-shape collide-action collide-action) touching-prims-entry 13) - (dummy-14 () none 14) + (touching-shapes-entry-method-14 () none 14) (free-touching-prims-list (_type_) symbol 15) (get-head (_type_) touching-prims-entry 16) (get-next (_type_ touching-prims-entry) touching-prims-entry 17) @@ -128,9 +130,9 @@ ;; A list of (up to) TOUCHING_LIST_LENGTH pairs of colliding shapes (deftype touching-list (structure) - ((num-touching-shapes int32 :offset-assert 0) - (resolve-u int8 :offset-assert 4) - (touching-shapes touching-shapes-entry TOUCHING_LIST_LENGTH :inline :offset-assert 8) + ((num-touching-shapes int32 :offset-assert 0) + (resolve-u int8 :offset-assert 4) + (touching-shapes touching-shapes-entry TOUCHING_LIST_LENGTH :inline :offset-assert 8) ) :method-count-assert 15 :size-assert #x208 @@ -138,7 +140,7 @@ (:methods (new (symbol type) _type_ 0) (add-touching-prims (_type_ collide-shape-prim collide-shape-prim float collide-tri-result collide-tri-result) none 9) - (dummy-10 () none 10) + (touching-list-method-10 () none 10) (update-from-step-size (_type_ float) none 11) (send-events-for-touching-shapes (_type_) none 12) (get-shapes-entry (_type_ collide-shape collide-shape) touching-shapes-entry 13) @@ -176,4 +178,3 @@ ;; and a list of up to TOUCHING_LIST_LENGTH shape pairs (define-perm *touching-list* touching-list (new 'global 'touching-list)) - diff --git a/goal_src/jak1/engine/common-obs/babak.gc b/goal_src/jak1/engine/common-obs/babak.gc index e4421e2dc0..bc213acba0 100644 --- a/goal_src/jak1/engine/common-obs/babak.gc +++ b/goal_src/jak1/engine/common-obs/babak.gc @@ -293,9 +293,9 @@ (none) ) -(defmethod TODO-RENAME-48 babak ((obj babak)) +(defmethod nav-enemy-method-48 babak ((obj babak)) (initialize-skeleton obj *babak-sg* '()) - (TODO-RENAME-45 obj *babak-nav-enemy-info*) + (init-defaults! obj *babak-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) (set! (-> obj neck ear) (the-as uint 2)) @@ -303,7 +303,7 @@ (none) ) -(defmethod TODO-RENAME-59 babak ((obj babak)) +(defmethod nav-enemy-method-59 babak ((obj babak)) (cond ((and (and (-> obj entity) (logtest? (-> obj entity extra perm status) (entity-perm-status complete))) (logtest? (-> obj enemy-info options) (fact-options has-power-cell)) @@ -320,7 +320,3 @@ 0 (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/basebutton.gc b/goal_src/jak1/engine/common-obs/basebutton.gc index 8b4f46c5cc..d1346a6741 100644 --- a/goal_src/jak1/engine/common-obs/basebutton.gc +++ b/goal_src/jak1/engine/common-obs/basebutton.gc @@ -37,10 +37,10 @@ (basebutton-startup () _type_ :state 23) (basebutton-up-idle () _type_ :state 24) (reset! (_type_) float 25) - (TODO-RENAME-26 (_type_) none 26) - (TODO-RENAME-27 (_type_) collide-shape-moving 27) + (basebutton-method-26 (_type_) none 26) + (basebutton-method-27 (_type_) collide-shape-moving 27) (arm-trigger-event! (_type_) symbol 28) - (TODO-RENAME-29 (_type_ symbol entity) none 29) + (basebutton-method-29 (_type_ symbol entity) none 29) (move-to-vec-or-quat! (_type_ vector quaternion) quaternion 30) (press! (_type_ symbol) int 31) ) @@ -77,12 +77,12 @@ (defstate basebutton-up-idle (basebutton) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('attack) - (case (-> arg3 param 1) + (case (-> event param 1) (('flop) - (TODO-RENAME-29 self (-> self event-going-down) (-> self notify-actor)) + (basebutton-method-29 self (-> self event-going-down) (-> self notify-actor)) (sound-play "silo-button") (go-virtual basebutton-going-down) ) @@ -93,7 +93,7 @@ (go-virtual basebutton-going-down) ) (('move-to) - (move-to-vec-or-quat! self (the-as vector (-> arg3 param 0)) (the-as quaternion (-> arg3 param 1))) + (move-to-vec-or-quat! self (the-as vector (-> event param 0)) (the-as quaternion (-> event param 1))) ) ) ) @@ -121,14 +121,14 @@ (defstate basebutton-going-down (basebutton) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('untrigger) (sound-play "silo-button") (go-virtual basebutton-going-up) ) (('move-to) - (move-to-vec-or-quat! self (the-as vector (-> arg3 param 0)) (the-as quaternion (-> arg3 param 1))) + (move-to-vec-or-quat! self (the-as vector (-> event param 0)) (the-as quaternion (-> event param 1))) ) ) ) @@ -143,7 +143,7 @@ (suspend) (ja :num! (seek! max (-> self anim-speed))) ) - (TODO-RENAME-29 self (-> self event-down) (-> self notify-actor)) + (basebutton-method-29 self (-> self event-down) (-> self notify-actor)) (go-virtual basebutton-down-idle) (none) ) @@ -160,14 +160,14 @@ (defstate basebutton-down-idle (basebutton) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('untrigger) (sound-play "silo-button") (go-virtual basebutton-going-up) ) (('move-to) - (move-to-vec-or-quat! self (the-as vector (-> arg3 param 0)) (the-as quaternion (-> arg3 param 1))) + (move-to-vec-or-quat! self (the-as vector (-> event param 0)) (the-as quaternion (-> event param 1))) ) ) ) @@ -191,7 +191,7 @@ (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) (the int (* 300.0 (-> self timeout)))) (suspend) ) - (TODO-RENAME-29 self (-> self event-going-up) (-> self notify-actor)) + (basebutton-method-29 self (-> self event-going-up) (-> self notify-actor)) (sound-play "silo-button") (go-virtual basebutton-going-up) ) @@ -211,10 +211,10 @@ (defstate basebutton-going-up (basebutton) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('move-to) - (move-to-vec-or-quat! self (the-as vector (-> arg3 param 0)) (the-as quaternion (-> arg3 param 1))) + (move-to-vec-or-quat! self (the-as vector (-> event param 0)) (the-as quaternion (-> event param 1))) ) (('trigger) (sound-play "silo-button") @@ -233,7 +233,7 @@ (suspend) (ja :num! (seek! 0.0 (-> self anim-speed))) ) - (TODO-RENAME-29 self (-> self event-up) (-> self notify-actor)) + (basebutton-method-29 self (-> self event-up) (-> self notify-actor)) (go-virtual basebutton-up-idle) (none) ) @@ -264,7 +264,7 @@ ) ) -(defmethod TODO-RENAME-29 basebutton ((obj basebutton) (arg0 symbol) (arg1 entity)) +(defmethod basebutton-method-29 basebutton ((obj basebutton) (arg0 symbol) (arg1 entity)) (with-pp (when arg0 (cond @@ -304,10 +304,7 @@ (set! (-> obj event-down) #f) (set! (-> obj event-going-up) #f) (set! (-> obj event-up) #f) - (let ((f0-1 1.0)) - (set! (-> obj anim-speed) f0-1) - f0-1 - ) + (set! (-> obj anim-speed) 1.0) ) (defmethod arm-trigger-event! basebutton ((obj basebutton)) @@ -317,7 +314,7 @@ ) ) -(defmethod TODO-RENAME-26 basebutton ((obj basebutton)) +(defmethod basebutton-method-26 basebutton ((obj basebutton)) (initialize-skeleton obj *generic-button-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (ja-channel-set! 1) @@ -351,7 +348,7 @@ (none) ) -(defmethod TODO-RENAME-27 basebutton ((obj basebutton)) +(defmethod basebutton-method-27 basebutton ((obj basebutton)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -406,7 +403,7 @@ (set! (-> obj button-id) (actor-count-before (-> obj link))) ) ) - (TODO-RENAME-27 obj) + (basebutton-method-27 obj) (process-drawable-from-entity! obj arg0) (let ((v1-16 #f)) (if (and (-> obj entity) (logtest? (-> obj entity extra perm status) (entity-perm-status complete))) @@ -420,7 +417,7 @@ (nav-mesh-connect obj (-> obj root-override) (the-as nav-control #f)) ) (arm-trigger-event! obj) - (TODO-RENAME-26 obj) + (basebutton-method-26 obj) (go (method-of-object obj basebutton-startup)) (none) ) @@ -435,24 +432,23 @@ (if arg0 (set! (-> self entity) arg0) ) - (TODO-RENAME-27 self) + (basebutton-method-27 self) (set! (-> self root-override trans quad) (-> arg1 quad)) (quaternion-copy! (-> self root-override quat) arg2) (set-vector! (-> self root-override scale) 1.0 1.0 1.0 1.0) (arm-trigger-event! self) - (TODO-RENAME-26 self) + (basebutton-method-26 self) (go-virtual basebutton-startup) (none) ) -(define *warp-info* (the-as (array string) (new 'static 'boxed-array :type string - "training-warp" - "village1-warp" - "village2-warp" - "village3-warp" - "citadel-warp" - ) - ) +(define *warp-info* (new 'static 'boxed-array :type string + "training-warp" + "village1-warp" + "village2-warp" + "village3-warp" + "citadel-warp" + ) ) (deftype warp-gate (process-drawable) @@ -508,7 +504,7 @@ ;; dispose the old code from memory. (case (-> self level) (('citadel 'lavatube 'training) - (while (and *target* (zero? (logand (-> *target* draw status) (draw-status hidden)))) + (while (and *target* (not (logtest? (-> *target* draw status) (draw-status hidden)))) (suspend) ) ) @@ -555,8 +551,8 @@ ) (defstate target-warp-out (target) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('death-end) (let ((v0-0 (the-as object (logior (-> self draw status) (draw-status hidden))))) (set! (-> self draw status) (the-as draw-status v0-0)) @@ -564,7 +560,7 @@ ) ) (else - (target-generic-event-handler arg0 arg1 arg2 arg3) + (target-generic-event-handler proc arg1 event-type event) ) ) ) @@ -676,7 +672,3 @@ ) :post target-no-stick-post ) - - - - diff --git a/goal_src/jak1/engine/common-obs/baseplat.gc b/goal_src/jak1/engine/common-obs/baseplat.gc index e2fb8270e7..500c94b052 100644 --- a/goal_src/jak1/engine/common-obs/baseplat.gc +++ b/goal_src/jak1/engine/common-obs/baseplat.gc @@ -55,18 +55,18 @@ :size-assert #xe4 :flag-assert #x1b008000e4 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) none 22) + (baseplat-method-20 (_type_) none 20) + (baseplat-method-21 (_type_) none 21) + (baseplat-method-22 (_type_) none 22) (get-unlit-skel (_type_) skeleton-group 23) - (dummy-24 (_type_) none 24) - (TODO-RENAME-25 (_type_) sparticle-launch-group 25) - (dummy-26 (_type_) none 26) + (baseplat-method-24 (_type_) none 24) + (baseplat-method-25 (_type_) sparticle-launch-group 25) + (baseplat-method-26 (_type_) none 26) ) ) -(defmethod dummy-21 baseplat ((obj baseplat)) +(defmethod baseplat-method-21 baseplat ((obj baseplat)) (logior! (-> obj skel status) (janim-status inited)) (set! (-> obj basetrans quad) (-> obj root-override trans quad)) (set! (-> obj bouncing) #f) @@ -74,7 +74,7 @@ (none) ) -(defmethod dummy-22 baseplat ((obj baseplat)) +(defmethod baseplat-method-22 baseplat ((obj baseplat)) (activate! (-> obj smush) -1.0 60 150 1.0 1.0) (set! (-> obj bouncing) #t) (logclear! (-> obj mask) (process-mask sleep)) @@ -122,16 +122,16 @@ ) (defbehavior plat-post baseplat () - (dummy-20 self) + (baseplat-method-20 self) (rider-post) (none) ) -(defmethod TODO-RENAME-25 baseplat ((obj baseplat)) +(defmethod baseplat-method-25 baseplat ((obj baseplat)) (the-as sparticle-launch-group 0) ) -(defmethod dummy-20 baseplat ((obj baseplat)) +(defmethod baseplat-method-20 baseplat ((obj baseplat)) (if (nonzero? (-> obj part)) (spawn (-> obj part) (-> obj root-override trans)) ) @@ -139,12 +139,12 @@ ) (defbehavior plat-event baseplat ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (if (= v1-0 'bonk) - (dummy-22 self) - ) - ) - ) + (the-as object (case arg2 + (('bonk) + (baseplat-method-22 self) + ) + ) + ) ) (deftype eco-door (process-drawable) @@ -170,31 +170,31 @@ (door-opening () _type_ :state 21) (door-open () _type_ :state 22) (door-closing () _type_ :state 23) - (TODO-RENAME-24 (_type_) none 24) - (TODO-RENAME-25 (_type_) none 25) - (dummy-26 (_type_) none 26) + (eco-door-method-24 (_type_) none 24) + (eco-door-method-25 (_type_) none 25) + (eco-door-method-26 (_type_) none 26) ) ) (defbehavior eco-door-event-handler eco-door ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'trigger) - (set! (-> self locked) (not (-> self locked))) - (cond - ((-> self locked) - (if (= (-> self next-state name) 'door-closed) - (sound-play "door-lock") - ) - ) - (else - (sound-play "door-unlock") - ) + (the-as object (case arg2 + (('trigger) + (set! (-> self locked) (not (-> self locked))) + (cond + ((-> self locked) + (if (= (-> self next-state name) 'door-closed) + (sound-play "door-lock") + ) ) - #t - ) - ) - ) + (else + (sound-play "door-unlock") + ) + ) + #t + ) + ) + ) ) eco-door-event-handler @@ -212,7 +212,7 @@ eco-door-event-handler (vector-vector-distance (-> self root-override trans) (-> *target* control trans)) ) ) - (dummy-26 self) + (eco-door-method-26 self) (if (and (not (-> self locked)) (or (and (-> self entity) (logtest? (-> self entity extra perm status) (entity-perm-status complete))) (send-event *target* 'query 'powerup (pickup-type eco-blue)) @@ -318,7 +318,7 @@ eco-door-event-handler :post (the-as (function none :behavior eco-door) transform-post) ) -(defmethod dummy-26 eco-door ((obj eco-door)) +(defmethod eco-door-method-26 eco-door ((obj eco-door)) (when (-> obj state-actor) (if (logtest? (-> obj state-actor extra perm status) (entity-perm-status complete)) (set! (-> obj locked) (logtest? (-> obj flags) (eco-door-flags ecdf01))) @@ -329,7 +329,7 @@ eco-door-event-handler (none) ) -(defmethod TODO-RENAME-24 eco-door ((obj eco-door)) +(defmethod eco-door-method-24 eco-door ((obj eco-door)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -348,13 +348,13 @@ eco-door-event-handler (none) ) -(defmethod TODO-RENAME-25 eco-door ((obj eco-door)) +(defmethod eco-door-method-25 eco-door ((obj eco-door)) 0 (none) ) (defmethod init-from-entity! eco-door ((obj eco-door) (arg0 entity-actor)) - (TODO-RENAME-24 obj) + (eco-door-method-24 obj) (process-drawable-from-entity! obj arg0) (let ((f0-0 (res-lump-float (-> obj entity) 'scale :default 1.0))) (set-vector! (-> obj root-override scale) f0-0 f0-0 f0-0 1.0) @@ -370,13 +370,13 @@ eco-door-event-handler ) (set! (-> obj locked) #f) (set! (-> obj flags) (res-lump-value arg0 'flags eco-door-flags)) - (dummy-26 obj) + (eco-door-method-26 obj) (set! (-> obj auto-close) (logtest? (-> obj flags) (eco-door-flags auto-close))) (set! (-> obj one-way) (logtest? (-> obj flags) (eco-door-flags one-way))) (vector-z-quaternion! (-> obj out-dir) (-> obj root-override quat)) (set! (-> obj out-dir w) (- (vector-dot (-> obj out-dir) (-> obj root-override trans)))) (update-transforms! (-> obj root-override)) - (TODO-RENAME-25 obj) + (eco-door-method-25 obj) (if (and (not (-> obj auto-close)) (-> obj entity) (logtest? (-> obj entity extra perm status) (entity-perm-status complete)) @@ -386,7 +386,3 @@ eco-door-event-handler ) (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/crates.gc b/goal_src/jak1/engine/common-obs/crates.gc index 412beb974d..0cd97c9fa3 100644 --- a/goal_src/jak1/engine/common-obs/crates.gc +++ b/goal_src/jak1/engine/common-obs/crates.gc @@ -90,7 +90,7 @@ (params-init (_type_ entity) none 25) (art-init (_type_) crate 26) (params-set! (_type_ symbol symbol) none 27) - (dummy-28 (_type_) none 28) + (check-dead (_type_) none 28) (smush-update! (_type_) none 29) ) ) @@ -240,7 +240,7 @@ (defpartgroup group-crate-explode :id 71 - :duration 5 + :duration (seconds 0.017) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 12) :parts ((sp-item 281) (sp-item 283) (sp-item 285) (sp-item 286) (sp-item 288)) @@ -248,7 +248,7 @@ (defpartgroup group-crate-steel-explode :id 72 - :duration 5 + :duration (seconds 0.017) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 12) :parts ((sp-item 281) (sp-item 283) (sp-item 285) (sp-item 288) (sp-item 288) (sp-item 288)) @@ -256,7 +256,7 @@ (defpartgroup group-dark-eco-box-explosion :id 73 - :duration 600 + :duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 12) :parts ((sp-item 295 :fade-after (meters 100) :period 600 :length 5 :binding 296) @@ -492,7 +492,7 @@ (('flop 'uppercut 'explode 'darkeco 'eco-yellow 'bonk 'racer 'tube 'flut-bonk 'flut-attack) (if (and (logtest? (-> self fact options) (fact-options require-zoomer)) *target* - (zero? (logand (-> *target* control root-prim prim-core action) (collide-action ca-9))) + (not (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9))) ) (return #f) ) @@ -774,28 +774,28 @@ (defstate die (crate) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touched) (case (-> self defense) (('darkeco) (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode 'darkeco)))) + ((= (-> proc type) target) + (send-event proc 'attack (-> event param 0) (static-attack-info ((mode 'darkeco)))) ) (else (let ((a1-5 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-5 from) self) (set! (-> a1-5 num-params) 4) (set! (-> a1-5 message) 'attack) - (set! (-> a1-5 param 0) (-> arg3 param 0)) + (set! (-> a1-5 param 0) (-> event param 0)) (set! (-> a1-5 param 1) (the-as uint 'darkeco)) (let ((v1-12 (+ *global-attack-id* 1))) (set! *global-attack-id* v1-12) (set! (-> a1-5 param 2) (the-as uint v1-12)) ) (set! (-> a1-5 param 3) (the-as uint 0)) - (send-event-function arg0 a1-5) + (send-event-function proc a1-5) ) ) ) @@ -933,33 +933,33 @@ (defstate special-contents-die (crate) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'notify) - (case (-> arg3 param 0) - (('pickup) - (let ((gp-0 (-> self entity extra perm))) - (logior! (-> gp-0 status) (entity-perm-status user-set-from-cstage)) - (set! (-> gp-0 user-int8 1) (min 127 (+ (-> gp-0 user-int8 1) 1))) - (+! (-> self child-count) -1) - (when (<= (-> self child-count) 0) - (if (or (= (-> self defense) 'iron) (= (-> self defense) 'steel)) - (process-entity-status! self (entity-perm-status bit-4) #f) - ) - (process-entity-status! self (entity-perm-status dead) #t) - (process-entity-status! self (entity-perm-status complete) #t) - (set! (-> gp-0 user-int8 0) 2) - (let ((v0-0 (logclear (-> self mask) (process-mask sleep)))) - (set! (-> self mask) v0-0) - v0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('notify) + (case (-> event param 0) + (('pickup) + (let ((gp-0 (-> self entity extra perm))) + (logior! (-> gp-0 status) (entity-perm-status user-set-from-cstage)) + (set! (-> gp-0 user-int8 1) (min 127 (+ (-> gp-0 user-int8 1) 1))) + (+! (-> self child-count) -1) + (when (<= (-> self child-count) 0) + (if (or (= (-> self defense) 'iron) (= (-> self defense) 'steel)) + (process-entity-status! self (entity-perm-status bit-4) #f) + ) + (process-entity-status! self (entity-perm-status dead) #t) + (process-entity-status! self (entity-perm-status complete) #t) + (set! (-> gp-0 user-int8 0) 2) + (let ((v0-0 (logclear (-> self mask) (process-mask sleep)))) + (set! (-> self mask) v0-0) + v0-0 + ) + ) + ) ) - ) - ) - ) + ) + ) + ) + ) ) :trans (-> (method-of-type crate die) trans) :code (behavior () @@ -1005,14 +1005,14 @@ (set! (-> self look) arg2) (set! (-> self defense) arg2) (art-init self) - (dummy-28 self) + (check-dead self) (none) ) (defmethod init-from-entity! crate ((obj crate) (arg0 entity-actor)) (params-init obj arg0) (art-init obj) - (dummy-28 obj) + (check-dead obj) (none) ) @@ -1154,7 +1154,7 @@ (none) ) -(defmethod dummy-28 crate ((obj crate)) +(defmethod check-dead crate ((obj crate)) (if (>= (-> obj entity extra perm user-int8 0) 1) (go (method-of-object obj die) #t 0) ) @@ -1210,8 +1210,8 @@ (defpartgroup group-buzzer-crate :id 74 - :duration 5 - :linger-duration 450 + :duration (seconds 0.017) + :linger-duration (seconds 1.5) :bounds (static-bspherem 0 0 0 2) :parts ((sp-item 302)) ) @@ -1353,7 +1353,7 @@ (none) ) -(defmethod dummy-28 pickup-spawner ((obj pickup-spawner)) +(defmethod check-dead pickup-spawner ((obj pickup-spawner)) (go (method-of-object obj wait)) 0 (none) @@ -1371,7 +1371,3 @@ (none) ) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/dark-eco-pool.gc b/goal_src/jak1/engine/common-obs/dark-eco-pool.gc index a2a420ea0b..996650d45d 100644 --- a/goal_src/jak1/engine/common-obs/dark-eco-pool.gc +++ b/goal_src/jak1/engine/common-obs/dark-eco-pool.gc @@ -84,8 +84,8 @@ ) ) -(defmethod TODO-RENAME-25 dark-eco-pool ((obj dark-eco-pool)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-25))) +(defmethod water-vol-method-25 dark-eco-pool ((obj dark-eco-pool)) + (let ((t9-0 (method-of-type water-anim water-vol-method-25))) (t9-0 obj) ) (logclear! (-> obj flags) (water-flags wt23)) @@ -108,8 +108,8 @@ (none) ) -(defmethod TODO-RENAME-22 dark-eco-pool ((obj dark-eco-pool)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 dark-eco-pool ((obj dark-eco-pool)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((gp-0 (new 'process 'ripple-control))) @@ -170,8 +170,8 @@ (defpartgroup group-dark-eco-pool-nasty :id 445 - :duration 600 - :linger-duration 600 + :duration (seconds 2) + :linger-duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 12) :parts ((sp-item 2056 :fade-after (meters 100) :period 600 :length 5) @@ -383,7 +383,3 @@ (none) ) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/generic-obs.gc b/goal_src/jak1/engine/common-obs/generic-obs.gc index 00dc2cece0..b23673a1a9 100644 --- a/goal_src/jak1/engine/common-obs/generic-obs.gc +++ b/goal_src/jak1/engine/common-obs/generic-obs.gc @@ -72,7 +72,7 @@ (do-joint-math! self) (let ((a0-22 (-> self skel effect))) (if a0-22 - (TODO-RENAME-9 a0-22) + (effect-control-method-9 a0-22) ) ) (if (logtest? (-> self skel status) (janim-status blerc blerc-done)) @@ -186,15 +186,15 @@ (defstate manipy-idle (manipy) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 none)) - (let ((v1-0 arg2)) + (let ((v1-0 event-type)) (the-as object (cond ((= v1-0 'attackable) (cond - ((-> arg3 param 0) + ((-> event param 0) (set! v0-0 (the-as none (logior (process-mask attackable) (-> self mask)))) (set! (-> self mask) (the-as process-mask v0-0)) ) @@ -207,7 +207,7 @@ ) ((= v1-0 'blend-shape) (cond - ((-> arg3 param 0) + ((-> event param 0) (set! v0-0 (the-as none (logior (-> self skel status) (janim-status blerc eye)))) (set! (-> self skel status) (the-as janim-status v0-0)) ) @@ -220,7 +220,7 @@ ) ((= v1-0 'shadow) (cond - ((-> arg3 param 0) + ((-> event param 0) (set! v0-0 (the-as none (-> self shadow-backup))) (set! (-> self draw shadow) (the-as shadow-geo v0-0)) v0-0 @@ -232,37 +232,40 @@ ) ) ((= v1-0 'trans-hook) - (set! v0-0 (the-as none (-> arg3 param 0))) + (set! v0-0 (the-as none (-> event param 0))) (set! (-> self new-trans-hook) (the-as (function none) v0-0)) v0-0 ) ((= v1-0 'post-hook) - (set! v0-0 (the-as none (-> arg3 param 0))) + (set! v0-0 (the-as none (-> event param 0))) (set! (-> self new-post-hook) (the-as (function none) v0-0)) v0-0 ) ((= v1-0 'eval) - ((the-as (function manipy none) (-> arg3 param 0)) self) + ((the-as (function manipy none) (-> event param 0)) self) ) ((= v1-0 'become-hud-object) - (convert-to-hud-object self (the-as hud (-> arg3 param 0))) + (convert-to-hud-object self (the-as hud (-> event param 0))) ) ((= v1-0 'event-hook) - (set! v0-0 (the-as none (-> arg3 param 0))) + (set! v0-0 (the-as none (-> event param 0))) (set! (-> self cur-event-hook) (the-as (function none) v0-0)) v0-0 ) ((= v1-0 'art-joint-anim) (set! (-> self new-joint-anim) - (the-as art-joint-anim (lookup-art (-> self draw art-group) (the-as string (-> arg3 param 0)) art-joint-anim)) + (the-as + art-joint-anim + (lookup-art (-> self draw art-group) (the-as string (-> event param 0)) art-joint-anim) + ) ) - (set! v0-0 (the-as none (-> arg3 param 1))) + (set! v0-0 (the-as none (-> event param 1))) (set! (-> self new-joint-anim-blend) (the-as uint v0-0)) v0-0 ) ((= v1-0 'anim-mode) (when (nonzero? (-> self skel)) - (set! (-> self anim-mode) (the-as symbol (-> arg3 param 0))) + (set! (-> self anim-mode) (the-as symbol (-> event param 0))) (if (= (-> self anim-mode) 'clone-anim) (ja-post) ) @@ -270,19 +273,16 @@ ) ) ((or (= v1-0 'origin-joint-index) (= v1-0 'center-joint)) - (set! (-> self draw origin-joint-index) (-> arg3 param 0)) - (set! v0-0 (the-as none (-> arg3 param 0))) + (set! (-> self draw origin-joint-index) (-> event param 0)) + (set! v0-0 (the-as none (-> event param 0))) (set! (-> self draw shadow-joint-index) (the-as uint v0-0)) v0-0 ) ((= v1-0 'max-vis-dist) - (let ((f0-0 (the-as float (-> arg3 param 0)))) - (set! (-> self draw lod-set lod (-> self draw lod-set max-lod) dist) f0-0) - f0-0 - ) + (set! (-> self draw lod-set lod (-> self draw lod-set max-lod) dist) (the-as float (-> event param 0))) ) ((= v1-0 'grab) - (set! (-> self cur-grab-handle) (process->handle (the-as process (-> arg3 param 0)))) + (set! (-> self cur-grab-handle) (process->handle (the-as process (-> event param 0)))) (let ((v1-30 (handle->process (-> self cur-grab-handle)))) (when v1-30 (set! v0-0 (the-as none (-> self old-grab-pos))) @@ -292,33 +292,33 @@ ) ) ((= v1-0 'target) - (set! v0-0 (the-as none (process->handle (the-as process (-> arg3 param 0))))) + (set! v0-0 (the-as none (process->handle (the-as process (-> event param 0))))) (set! (-> self cur-target-handle) (the-as handle v0-0)) v0-0 ) ((= v1-0 'trans) (cond ((type-type? (-> self root type) collide-shape) - (move-to-point! (the-as collide-shape (-> self root)) (the-as vector (-> arg3 param 0))) + (move-to-point! (the-as collide-shape (-> self root)) (the-as vector (-> event param 0))) ) (else (set! v0-0 (the-as none (-> self root trans))) - (set! (-> (the-as vector v0-0) quad) (-> (the-as vector (-> arg3 param 0)) quad)) + (set! (-> (the-as vector v0-0) quad) (-> (the-as vector (-> event param 0)) quad)) v0-0 ) ) ) ((= v1-0 'rot) (let ((s5-0 (new 'stack-no-clear 'matrix))) - (matrix-rotate-y! s5-0 (the-as float (-> arg3 param 0))) + (matrix-rotate-y! s5-0 (the-as float (-> event param 0))) (matrix->quaternion (-> self root quat) s5-0) ) ) ((= v1-0 'rot-quat) - (quaternion-copy! (-> self root quat) (the-as quaternion (-> arg3 param 0))) + (quaternion-copy! (-> self root quat) (the-as quaternion (-> event param 0))) ) ((= v1-0 'clone-copy-trans) - (set! v0-0 (the-as none (-> arg3 param 0))) + (set! v0-0 (the-as none (-> event param 0))) (set! (-> self clone-copy-trans) (the-as symbol v0-0)) v0-0 ) @@ -327,9 +327,9 @@ #f ) ((= v1-0 'draw) - (set! (-> self draw?) (the-as symbol (-> arg3 param 0))) + (set! (-> self draw?) (the-as symbol (-> event param 0))) (cond - ((-> arg3 param 0) + ((-> event param 0) (let ((v1-47 (logtest? (-> self draw status) (draw-status hidden)))) (logclear! (-> self draw status) (draw-status hidden)) (when v1-47 @@ -357,7 +357,7 @@ ) ) ((= v1-0 'query) - (case (-> arg3 param 0) + (case (-> event param 0) (('grab) (handle->process (-> self cur-grab-handle)) ) @@ -373,10 +373,7 @@ ((= v1-0 'set-frame-num) (let ((v1-73 (-> self skel root-channel 0))) (set! (-> v1-73 num-func) num-func-identity) - (let ((f0-2 (the-as float (-> arg3 param 0)))) - (set! (-> v1-73 frame-num) f0-2) - f0-2 - ) + (set! (-> v1-73 frame-num) (the-as float (-> event param 0))) ) ) (else @@ -842,7 +839,7 @@ (send-event gp-0 'query 'done) ) ((type-type? (-> gp-0 type) process-drawable) - (when (zero? (logand (-> (the-as process-drawable gp-0) skel status) (janim-status done))) + (when (not (logtest? (-> (the-as process-drawable gp-0) skel status) (janim-status done))) (let ((s5-0 pp)) (set! pp gp-0) (let ((v0-1 (the-as object (ja-done? 0)))) @@ -1080,32 +1077,30 @@ ) (defstate camera-tracker-process (camera-tracker) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 uint)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'message) - (set! v0-0 (-> arg3 param 0)) - (set! (-> self message) (the-as basic v0-0)) - v0-0 - ) - ((= v1-0 'mask) - (set! v0-0 (-> arg3 param 0)) - (set! (-> self mask-to-clear) (the-as process-mask v0-0)) - v0-0 - ) - ((= v1-0 'border) - (set! v0-0 (-> arg3 param 0)) - (set! (-> self border-value) (the-as basic v0-0)) - v0-0 - ) - ) - ) - ) + (the-as object (case event-type + (('message) + (set! v0-0 (-> event param 0)) + (set! (-> self message) (the-as basic v0-0)) + v0-0 + ) + (('mask) + (set! v0-0 (-> event param 0)) + (set! (-> self mask-to-clear) (the-as process-mask v0-0)) + v0-0 + ) + (('border) + (set! v0-0 (-> event param 0)) + (set! (-> self border-value) (the-as basic v0-0)) + v0-0 + ) + ) + ) ) :enter (behavior () (if (-> self entity) - (dummy-30 (-> self entity) (entity-perm-status bit-3) #t) + (set-or-clear-status! (-> self entity) (entity-perm-status bit-3) #t) ) (if (not (-> self border-value)) (add-setting! 'border-mode (-> self border-value) 0.0 0) @@ -1117,7 +1112,7 @@ ) :exit (behavior () (if (-> self entity) - (dummy-30 (-> self entity) (entity-perm-status bit-3) #f) + (set-or-clear-status! (-> self entity) (entity-perm-status bit-3) #f) ) (send-event *camera* 'clear-entity) (none) @@ -1238,7 +1233,7 @@ ) ) ) - (when (zero? (logand (-> self draw status) (draw-status hidden))) + (when (not (logtest? (-> self draw status) (draw-status hidden))) (let ((v1-36 (-> self draw)) (a0-18 (new 'stack-no-clear 'vector)) ) @@ -1330,8 +1325,8 @@ ) (defstate part-spawner-active (part-spawner) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('stop) (process-entity-status! self (entity-perm-status complete) #t) (set! (-> self enable) #f) @@ -1343,7 +1338,7 @@ #t ) (('trans) - (let ((v0-1 (the-as object (-> (the-as vector (-> arg3 param 0)) quad)))) + (let ((v0-1 (the-as object (-> (the-as vector (-> event param 0)) quad)))) (set! (-> self root trans quad) (the-as uint128 v0-1)) v0-1 ) @@ -1703,13 +1698,13 @@ ) (defstate cam-launcher-shortfall (camera-slave) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('teleport) #f ) (else - (cam-standard-event-handler arg0 arg1 arg2 arg3) + (cam-standard-event-handler proc arg1 event-type event) ) ) ) @@ -1735,7 +1730,7 @@ (none) ) :trans (behavior () - (if (zero? (logand (-> *camera* master-options) 2)) + (if (not (logtest? (-> *camera* master-options) 2)) (cam-slave-go cam-free-floating) ) (none) @@ -1774,13 +1769,13 @@ ) (defstate cam-launcher-longfall (camera-slave) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('teleport) #f ) (else - (cam-standard-event-handler arg0 arg1 arg2 arg3) + (cam-standard-event-handler proc arg1 event-type event) ) ) ) @@ -1799,7 +1794,7 @@ (none) ) :trans (behavior () - (if (zero? (logand (-> *camera* master-options) 2)) + (if (not (logtest? (-> *camera* master-options) 2)) (cam-slave-go cam-free-floating) ) (cam-launcher-long-joystick) @@ -1869,13 +1864,13 @@ ) (defstate launcher-idle (launcher) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('instant-death) (go launcher-deactivated) ) (('trans) - (move-to-point! (-> self root-override) (the-as vector (-> arg3 param 0))) + (move-to-point! (-> self root-override) (the-as vector (-> event param 0))) (update-transforms! (-> self root-override)) ) ) @@ -1915,17 +1910,17 @@ ) (defstate launcher-active (launcher) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (when (or (= arg2 'touch) (= arg2 'attack)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (when (or (= event-type 'touch) (= event-type 'attack)) (set! (-> self state-time) (-> *display* base-frame-counter)) - (send-event arg0 'launch (-> self spring-height) (-> self camera) (-> self dest) (-> self seek-time)) + (send-event proc 'launch (-> self spring-height) (-> self camera) (-> self dest) (-> self seek-time)) ) (cond - ((= arg2 'instant-death) + ((= event-type 'instant-death) (go launcher-deactivated) ) - ((= arg2 'trans) - (move-to-point! (-> self root-override) (the-as vector (-> arg3 param 0))) + ((= event-type 'trans) + (move-to-point! (-> self root-override) (the-as vector (-> event param 0))) (update-transforms! (-> self root-override)) ) ) @@ -2094,102 +2089,100 @@ ) (defstate touch-tracker-idle (touch-tracker) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 none)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'touched) - (let ((v1-1 (ppointer->process (-> self parent)))) - (when (!= v1-1 arg0) - (cond - ((= (-> self event) 'attack) - (cond - ((= (-> arg0 type) target) - (send-event - arg0 - (-> self event) - :from (the-as process v1-1) - #f - (static-attack-info ((mode (the-as symbol (-> self event-mode))))) - ) + (the-as object (case event-type + (('touched) + (let ((v1-1 (ppointer->process (-> self parent)))) + (when (!= v1-1 proc) + (cond + ((= (-> self event) 'attack) + (cond + ((= (-> proc type) target) + (send-event + proc + (-> self event) + :from (the-as process v1-1) + #f + (static-attack-info ((mode (the-as symbol (-> self event-mode))))) ) - ((= (-> v1-1 type) target) - (send-event - arg0 - (-> self event) - :from (the-as process v1-1) - #f - (-> self event-mode) - (-> *target* control unknown-dword50) - (-> *target* control unknown-dword51) - ) + ) + ((= (-> v1-1 type) target) + (send-event + proc + (-> self event) + :from (the-as process v1-1) + #f + (-> self event-mode) + (-> *target* control unknown-dword50) + (-> *target* control unknown-dword51) ) - (else - (let ((a1-5 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-5 from) (the-as process v1-1)) - (set! (-> a1-5 num-params) 4) - (set! (-> a1-5 message) (-> self event)) - (set! (-> a1-5 param 0) (the-as uint #f)) - (set! (-> a1-5 param 1) (the-as uint (-> self event-mode))) - (let ((v1-19 (+ *global-attack-id* 1))) - (set! *global-attack-id* v1-19) - (set! (-> a1-5 param 2) (the-as uint v1-19)) - ) - (set! (-> a1-5 param 3) (the-as uint 0)) - (send-event-function arg0 a1-5) + ) + (else + (let ((a1-5 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-5 from) (the-as process v1-1)) + (set! (-> a1-5 num-params) 4) + (set! (-> a1-5 message) (-> self event)) + (set! (-> a1-5 param 0) (the-as uint #f)) + (set! (-> a1-5 param 1) (the-as uint (-> self event-mode))) + (let ((v1-19 (+ *global-attack-id* 1))) + (set! *global-attack-id* v1-19) + (set! (-> a1-5 param 2) (the-as uint v1-19)) ) + (set! (-> a1-5 param 3) (the-as uint 0)) + (send-event-function proc a1-5) ) ) ) - ((-> self event) - (send-event arg0 (-> self event) :from (the-as process v1-1)) - ) - (else - (let ((t0-5 (new 'stack-no-clear 'event-message-block))) - (set! (-> t0-5 from) arg0) - (set! (-> t0-5 num-params) arg1) - (set! (-> t0-5 message) arg2) - (set! (-> t0-5 param 0) (-> arg3 param 0)) - (set! (-> t0-5 param 1) (-> arg3 param 1)) - (set! (-> t0-5 param 2) (-> arg3 param 2)) - (set! (-> t0-5 param 3) (-> arg3 param 3)) - (set! (-> t0-5 param 4) (-> arg3 param 4)) - (set! (-> t0-5 param 5) (-> arg3 param 5)) - (set! (-> t0-5 param 6) (-> arg3 param 6)) - (send-event-function v1-1 t0-5) - ) + ) + ((-> self event) + (send-event proc (-> self event) :from (the-as process v1-1)) + ) + (else + (let ((t0-5 (new 'stack-no-clear 'event-message-block))) + (set! (-> t0-5 from) proc) + (set! (-> t0-5 num-params) arg1) + (set! (-> t0-5 message) event-type) + (set! (-> t0-5 param 0) (-> event param 0)) + (set! (-> t0-5 param 1) (-> event param 1)) + (set! (-> t0-5 param 2) (-> event param 2)) + (set! (-> t0-5 param 3) (-> event param 3)) + (set! (-> t0-5 param 4) (-> event param 4)) + (set! (-> t0-5 param 5) (-> event param 5)) + (set! (-> t0-5 param 6) (-> event param 6)) + (send-event-function v1-1 t0-5) ) ) ) ) ) - ((= v1-0 'target) - (set! v0-0 (the-as none (process->handle (the-as process (-> arg3 param 0))))) - (set! (-> self target) (the-as handle v0-0)) - v0-0 - ) - ((= v1-0 'event) - (set! (-> self event) (the-as symbol (-> arg3 param 0))) - (set! v0-0 (the-as none (-> arg3 param 1))) - (set! (-> self event-mode) (the-as basic v0-0)) - v0-0 - ) - ((= v1-0 'exit) - (set! v0-0 (the-as none (-> arg3 param 0))) - (set! (-> self run-function) (the-as (function object) v0-0)) - v0-0 - ) - ((= v1-0 'eval) - ((the-as (function touch-tracker none) (-> arg3 param 0)) self) - ) - ((= v1-0 'function) - (set! v0-0 (the-as none (-> arg3 param 0))) - (set! (-> self callback) (the-as (function touch-tracker none) v0-0)) - v0-0 - ) - ) - ) - ) + ) + (('target) + (set! v0-0 (the-as none (process->handle (the-as process (-> event param 0))))) + (set! (-> self target) (the-as handle v0-0)) + v0-0 + ) + (('event) + (set! (-> self event) (the-as symbol (-> event param 0))) + (set! v0-0 (the-as none (-> event param 1))) + (set! (-> self event-mode) (the-as basic v0-0)) + v0-0 + ) + (('exit) + (set! v0-0 (the-as none (-> event param 0))) + (set! (-> self run-function) (the-as (function object) v0-0)) + v0-0 + ) + (('eval) + ((the-as (function touch-tracker none) (-> event param 0)) self) + ) + (('function) + (set! v0-0 (the-as none (-> event param 0))) + (set! (-> self callback) (the-as (function touch-tracker none) v0-0)) + v0-0 + ) + ) + ) ) :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -2373,7 +2366,3 @@ 0 (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/nav-enemy-h.gc b/goal_src/jak1/engine/common-obs/nav-enemy-h.gc index 6ed761ad0a..ded981210c 100644 --- a/goal_src/jak1/engine/common-obs/nav-enemy-h.gc +++ b/goal_src/jak1/engine/common-obs/nav-enemy-h.gc @@ -156,54 +156,47 @@ (nav-enemy-stare () _type_ :state 31) (nav-enemy-stop-chase () _type_ :state 32) (nav-enemy-victory () _type_ :state 33) - (dummy-34 (_type_) none 34) + (nav-enemy-method-34 (_type_) none 34) (nav-enemy-wait-for-cue () _type_ :state 35) (nav-enemy-jump-to-point () _type_ :state 36) - (TODO-RENAME-37 (_type_) none 37) - (TODO-RENAME-38 (_type_) none 38) + (nav-enemy-method-37 (_type_) none 37) + (nav-enemy-method-38 (_type_) none 38) (common-post (_type_) none 39) - (dummy-40 (_type_) none 40) - (dummy-41 (_type_) none 41) - (TODO-RENAME-42 (_type_) int 42) - (dummy-43 (_type_ process event-message-block) object 43) - (dummy-44 (_type_ process event-message-block) object 44) - (TODO-RENAME-45 (_type_ nav-enemy-info) none 45) - (TODO-RENAME-46 (_type_ float) basic 46) + (nav-enemy-method-40 (_type_) none 40) + (nav-enemy-method-41 (_type_) none 41) + (new-patrol-point! (_type_) int 42) + (attack-handler (_type_ process event-message-block) object 43) + (touch-handler (_type_ process event-message-block) object 44) + (init-defaults! (_type_ nav-enemy-info) none 45) + (target-in-range? (_type_ float) basic 46) (initialize-collision (_type_) none 47) - (TODO-RENAME-48 (_type_) none 48) - (TODO-RENAME-49 (_type_ nav-enemy-info) float 49) - (TODO-RENAME-50 (_type_ vector) symbol 50) - (dummy-51 (_type_) none 51) - (dummy-52 (_type_ vector) symbol 52) - (dummy-53 (_type_) symbol 53) - (dummy-54 (_type_ vector) symbol 54) - (dummy-55 (_type_) symbol 55) + (nav-enemy-method-48 (_type_) none 48) + (init-jm! (_type_ nav-enemy-info) float 49) + (nav-enemy-method-50 (_type_ vector) symbol 50) + (nav-enemy-method-51 (_type_) none 51) + (nav-enemy-method-52 (_type_ vector) symbol 52) + (nav-enemy-method-53 (_type_) symbol 53) + (nav-enemy-method-54 (_type_ vector) symbol 54) + (nav-enemy-method-55 (_type_) symbol 55) (set-jump-height-factor! (_type_ int) none 56) - (dummy-57 (_type_) none 57) - (dummy-58 (_type_) none 58) - (TODO-RENAME-59 (_type_) none 59) - (dummy-60 (_type_ symbol) symbol 60) + (nav-enemy-method-57 (_type_) none 57) + (nav-enemy-method-58 (_type_) none 58) + (nav-enemy-method-59 (_type_) none 59) + (nav-enemy-method-60 (_type_ symbol) symbol 60) (snow-bunny-attack () _type_ :state 61) (snow-bunny-chase-hop () _type_ :state 62) (snow-bunny-defend () _type_ :state 63) - (dummy-64 () _type_ :state 64) + (nav-enemy-method-64 () _type_ :state 64) (snow-bunny-lunge () _type_ :state 65) (snow-bunny-nav-resume () _type_ :state 66) (snow-bunny-patrol-hop () _type_ :state 67) (snow-bunny-patrol-idle () _type_ :state 68) - (dummy-69 () _type_ :state 69) + (nav-enemy-method-69 () _type_ :state 69) (snow-bunny-retreat-hop () _type_ :state 70) (snow-bunny-tune-spheres () _type_ :state 71) (nav-enemy-touch-handler (_type_ process event-message-block) object 72) (nav-enemy-attack-handler (_type_ process event-message-block) object 73) (nav-enemy-jump-blocked () _type_ :state 74) - (dummy-75 () _type_ :state 75) + (nav-enemy-method-75 () _type_ :state 75) ) ) - - -0 - - - - diff --git a/goal_src/jak1/engine/common-obs/nav-enemy.gc b/goal_src/jak1/engine/common-obs/nav-enemy.gc index 2cbe7e999d..1f6352f97e 100644 --- a/goal_src/jak1/engine/common-obs/nav-enemy.gc +++ b/goal_src/jak1/engine/common-obs/nav-enemy.gc @@ -53,7 +53,7 @@ (the-as nav-enemy ((the-as (function process-drawable int none) (find-parent-method nav-enemy 7)) obj arg0)) ) -(defmethod TODO-RENAME-42 nav-enemy ((obj nav-enemy)) +(defmethod new-patrol-point! nav-enemy ((obj nav-enemy)) (local-vars (v1-11 symbol)) (if (<= (-> obj path curve num-cverts) 0) (go process-drawable-art-error "no path") @@ -76,7 +76,10 @@ (defmethod common-post nav-enemy ((obj nav-enemy)) (when (and (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf8)) (or (not *target*) - (and (zero? (logand (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying))) + (and (not (logtest? (-> *target* state-flags) + (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) + ) + ) (>= (- (-> *display* base-frame-counter) (-> obj touch-time)) (seconds 0.05)) ) ) @@ -110,7 +113,7 @@ (none) ) -(defmethod dummy-44 nav-enemy ((obj nav-enemy) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler nav-enemy ((obj nav-enemy) (arg0 process) (arg1 event-message-block)) (if (and (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf6)) ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) @@ -141,7 +144,7 @@ (the-as object 'die) ) -(defmethod dummy-43 nav-enemy ((obj nav-enemy) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler nav-enemy ((obj nav-enemy) (arg0 process) (arg1 event-message-block)) (cond ((logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf5)) (send-event arg0 'get-attack-count 1) @@ -149,7 +152,7 @@ (go (method-of-object obj nav-enemy-die)) ) (else - (dummy-44 obj arg0 arg1) + (touch-handler obj arg0 arg1) ) ) ) @@ -176,11 +179,11 @@ (case arg2 (('touch) (set! (-> self touch-time) (-> *display* base-frame-counter)) - (dummy-44 self arg0 arg3) + (touch-handler self arg0 arg3) ) (('attack) (nav-enemy-set-hit-from-direction arg0) - (dummy-43 self arg0 arg3) + (attack-handler self arg0 arg3) ) (('instant-death) (let ((gp-1 (-> self hit-from-dir))) @@ -258,13 +261,13 @@ nav-enemy-default-event-handler (none) ) -(defmethod dummy-40 nav-enemy ((obj nav-enemy)) - (dummy-11 (-> obj nav) (-> obj nav target-pos)) +(defmethod nav-enemy-method-40 nav-enemy ((obj nav-enemy)) + (nav-control-method-11 (-> obj nav) (-> obj nav target-pos)) 0 (none) ) -(defmethod dummy-41 nav-enemy ((obj nav-enemy)) +(defmethod nav-enemy-method-41 nav-enemy ((obj nav-enemy)) (cond ((-> obj nav-info use-align) (align-vel-and-quat-only! @@ -314,7 +317,7 @@ nav-enemy-default-event-handler (none) ) -(defmethod TODO-RENAME-37 nav-enemy ((obj nav-enemy)) +(defmethod nav-enemy-method-37 nav-enemy ((obj nav-enemy)) (when (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags enable-travel)) (if (or (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf7)) (logtest? (nav-control-flags navcf19) (-> obj nav flags)) @@ -332,7 +335,7 @@ nav-enemy-default-event-handler (none) ) -(defmethod TODO-RENAME-38 nav-enemy ((obj nav-enemy)) +(defmethod nav-enemy-method-38 nav-enemy ((obj nav-enemy)) (if (-> obj nav-info move-to-ground) (integrate-for-enemy-with-move-to-ground! (-> obj collide-info) @@ -343,7 +346,7 @@ nav-enemy-default-event-handler (-> obj nav-info hover-if-no-ground) (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf15)) ) - (dummy-58 (-> obj collide-info) (-> obj collide-info transv)) + (collide-shape-moving-method-58 (-> obj collide-info) (-> obj collide-info transv)) ) 0 (none) @@ -353,10 +356,10 @@ nav-enemy-default-event-handler (cond ((logtest? (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate)) (compute-alignment! (-> self align)) - (dummy-40 self) - (dummy-41 self) - (TODO-RENAME-37 self) - (TODO-RENAME-38 self) + (nav-enemy-method-40 self) + (nav-enemy-method-41 self) + (nav-enemy-method-37 self) + (nav-enemy-method-38 self) (nav-enemy-common-post) ) (else @@ -387,7 +390,7 @@ nav-enemy-default-event-handler (logior! (-> self nav flags) (nav-control-flags navcf10)) (nav-enemy-get-new-patrol-point) ) - (dummy-19 + (nav-control-method-19 (-> self nav) (-> self nav target-pos) (-> self collide-info) @@ -418,7 +421,7 @@ nav-enemy-default-event-handler (set! (-> self nav travel quad) (-> gp-1 quad)) ) (vector-normalize! (-> self nav travel) 409600.0) - (dummy-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) + (nav-control-method-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) (vector+! (-> self nav target-pos) (-> self collide-info trans) (-> self nav travel)) (nav-enemy-travel-post) 0 @@ -481,14 +484,22 @@ nav-enemy-default-event-handler (defun nav-enemy-player-vulnerable? () (the-as symbol - (and *target* (zero? (logand (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying)))) + (and *target* + (not (logtest? (-> *target* state-flags) + (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) + ) + ) + ) ) ) -(defmethod TODO-RENAME-46 nav-enemy ((obj nav-enemy) (arg0 float)) +(defmethod target-in-range? nav-enemy ((obj nav-enemy) (arg0 float)) (and *target* - (zero? (logand (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying))) - (and (or (zero? (logand (-> obj nav-enemy-flags) (nav-enemy-flags navenmf12))) + (not (logtest? (-> *target* state-flags) + (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) + ) + ) + (and (or (not (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf12))) (< (vector-vector-distance (target-pos 0) (-> obj collide-info trans)) arg0) ) (nav-enemy-test-point-near-nav-mesh? (-> *target* control shadow-pos)) @@ -506,7 +517,7 @@ nav-enemy-default-event-handler ) ) (else - (when (or (TODO-RENAME-46 self (-> self nav-info notice-distance)) + (when (or (target-in-range? self (-> self nav-info notice-distance)) (and (-> self nav-info use-proximity-notice) *target* (>= (-> self nav-info proximity-notice-distance) @@ -545,11 +556,11 @@ nav-enemy-default-event-handler ) (defbehavior nav-enemy-test-nav-mesh-intersection-xz? nav-enemy ((arg0 vector)) - (the-as symbol (dummy-16 (-> self nav) arg0)) + (the-as symbol (nav-control-method-16 (-> self nav) arg0)) ) (defbehavior nav-enemy-test-point-in-nav-mesh? nav-enemy ((arg0 vector)) - (the-as symbol (and (dummy-16 (-> self nav) arg0) + (the-as symbol (and (nav-control-method-16 (-> self nav) arg0) (< (-> arg0 y) (+ (-> self collide-info trans y) (-> self enemy-info notice-top))) ) ) @@ -562,7 +573,7 @@ nav-enemy-default-event-handler ) (defbehavior nav-enemy-get-new-patrol-point nav-enemy () - (TODO-RENAME-42 self) + (new-patrol-point! self) 0 ) @@ -656,7 +667,7 @@ nav-enemy-default-event-handler (when (not s4-1) (compute-alignment! (-> self align)) (align! (-> self align) (align-opts adjust-y-vel ignore-y-if-zero) 1.0 arg1 1.0) - (when (zero? (logand (-> self align flags) (align-flags disabled))) + (when (not (logtest? (-> self align flags) (align-flags disabled))) (let ((f0-6 (* (- (-> self align delta trans z)) (-> *display* frames-per-second)))) (set! (-> self collide-info transv x) (* (-> self hit-from-dir x) f0-6)) (set! (-> self collide-info transv z) (* (-> self hit-from-dir z) f0-6)) @@ -712,7 +723,7 @@ nav-enemy-default-event-handler ) (defmethod run-logic? nav-enemy ((obj nav-enemy)) - (or (zero? (logand (-> obj mask) (process-mask actor-pause))) + (or (not (logtest? (-> obj mask) (process-mask actor-pause))) (or (and (nonzero? (-> obj draw)) (and (>= (+ (-> *ACTOR-bank* pause-dist) (-> obj collide-info pause-adjust-distance)) (vector-vector-distance (-> obj collide-info trans) (camera-pos)) @@ -899,7 +910,7 @@ nav-enemy-default-event-handler ) (set! (-> gp-0 target-pos quad) (-> v1-10 quad)) ) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (set! (-> self rotate-speed) (-> self nav-info run-rotate-speed)) (set! (-> self turn-time) (-> self nav-info run-turn-time)) (none) @@ -1045,7 +1056,7 @@ nav-enemy-default-event-handler ) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf13)) ) - (if (or (not (TODO-RENAME-46 self (-> self nav-info stop-chase-distance))) + (if (or (not (target-in-range? self (-> self nav-info stop-chase-distance))) (logtest? (-> self nav-enemy-flags) (nav-enemy-flags navenmf13)) ) (go-virtual nav-enemy-stop-chase) @@ -1105,7 +1116,7 @@ nav-enemy-default-event-handler (if (logtest? (-> *target* state-flags) (state-flags do-not-notice)) (go-virtual nav-enemy-patrol) ) - (if (and (TODO-RENAME-46 self (-> self nav-info notice-distance)) (not (nav-enemy-frustrated?))) + (if (and (target-in-range? self (-> self nav-info notice-distance)) (not (nav-enemy-frustrated?))) (go-virtual nav-enemy-chase) ) (if (or (or (not *target*) (< (-> self enemy-info idle-distance) @@ -1167,7 +1178,7 @@ nav-enemy-default-event-handler (go-virtual nav-enemy-patrol) ) (cond - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (if (and (>= (- (-> *display* base-frame-counter) (-> self notice-time)) (-> self reaction-time)) (not (nav-enemy-frustrated?)) ) @@ -1224,7 +1235,7 @@ nav-enemy-default-event-handler ) :trans (behavior () (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.1)) - (if (TODO-RENAME-46 self (-> self nav-info notice-distance)) + (if (target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) ) ) @@ -1494,7 +1505,7 @@ nav-enemy-default-event-handler :event nav-enemy-jump-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (if (and (-> self nav-info use-jump-blocked) (TODO-RENAME-50 self (-> self event-param-point))) + (if (and (-> self nav-info use-jump-blocked) (nav-enemy-method-50 self (-> self event-param-point))) (go-virtual nav-enemy-jump-blocked) ) (nav-enemy-initialize-jump (-> self event-param-point)) @@ -1508,7 +1519,7 @@ nav-enemy-default-event-handler (nav-enemy-execute-jump) (let ((a1-0 (-> self nav user-poly))) (if (not a1-0) - (set! a1-0 (dummy-16 (-> self nav) (-> self jump-dest))) + (set! a1-0 (nav-control-method-16 (-> self nav) (-> self jump-dest))) ) (if a1-0 (set-current-poly! (-> self nav) a1-0) @@ -1522,7 +1533,7 @@ nav-enemy-default-event-handler (defbehavior nav-enemy-jump-land-post nav-enemy () (compute-alignment! (-> self align)) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (seek! (-> self target-speed) (-> self nav-info run-travel-speed) 2048.0) (set! (-> self momentum-speed) (-> self target-speed)) (let* ((f0-7 @@ -1713,11 +1724,11 @@ nav-enemy-default-event-handler ) ) -(defmethod TODO-RENAME-45 nav-enemy ((obj nav-enemy) (arg0 nav-enemy-info)) +(defmethod init-defaults! nav-enemy ((obj nav-enemy) (arg0 nav-enemy-info)) (set! (-> obj rand-gen) (new 'process 'random-generator)) (set! (-> obj rand-gen seed) (the-as uint #x666edd1e)) (set! (-> obj mask) (the-as process-mask (logior (process-mask enemy) (-> obj mask)))) - (TODO-RENAME-49 obj arg0) + (init-jm! obj arg0) (if (-> obj draw shadow) (set! (-> obj draw shadow-ctrl) (new @@ -1736,7 +1747,7 @@ nav-enemy-default-event-handler (set! (-> obj nav) (new 'process 'nav-control (-> obj collide-info) 16 (-> arg0 nav-nearest-y-threshold))) (logior! (-> obj nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7)) (set! (-> obj nav gap-event) 'jump) - (TODO-RENAME-26 (-> obj nav)) + (nav-control-method-26 (-> obj nav)) (set! (-> obj path) (new 'process 'path-control obj 'path 0.0)) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) (set! (-> obj enemy-info) @@ -1749,7 +1760,7 @@ nav-enemy-default-event-handler (none) ) -(defmethod TODO-RENAME-49 nav-enemy ((obj nav-enemy) (arg0 nav-enemy-info)) +(defmethod init-jm! nav-enemy ((obj nav-enemy) (arg0 nav-enemy-info)) (set! (-> obj nav-info) arg0) (set! (-> obj rotate-speed) (-> obj nav-info walk-rotate-speed)) (set! (-> obj turn-time) (-> obj nav-info walk-turn-time)) @@ -1762,10 +1773,7 @@ nav-enemy-default-event-handler (set! (-> obj neck nose) (the-as uint 2)) (set! (-> obj neck ear) (the-as uint 0)) (set! (-> obj neck max-dist) 102400.0) - (let ((f0-6 16384.0)) - (set! (-> obj neck ignore-angle) f0-6) - f0-6 - ) + (set! (-> obj neck ignore-angle) 16384.0) ) ) @@ -1781,7 +1789,7 @@ nav-enemy-default-event-handler ) (vector-identity! (-> self collide-info scale)) (set! (-> self entity) (-> arg0 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf12)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (go-virtual nav-enemy-wait-for-cue) @@ -1793,12 +1801,12 @@ nav-enemy-default-event-handler (none) ) -(defmethod TODO-RENAME-48 nav-enemy ((obj nav-enemy)) +(defmethod nav-enemy-method-48 nav-enemy ((obj nav-enemy)) 0 (none) ) -(defmethod TODO-RENAME-59 nav-enemy ((obj nav-enemy)) +(defmethod nav-enemy-method-59 nav-enemy ((obj nav-enemy)) (go (method-of-object obj nav-enemy-idle)) 0 (none) @@ -1807,86 +1815,18 @@ nav-enemy-default-event-handler (defmethod init-from-entity! nav-enemy ((obj nav-enemy) (arg0 entity-actor)) (initialize-collision obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-48 obj) - (TODO-RENAME-59 obj) + (nav-enemy-method-48 obj) + (nav-enemy-method-59 obj) 0 (none) ) -(defmethod TODO-RENAME-50 nav-enemy ((obj nav-enemy) (arg0 vector)) +(defmethod nav-enemy-method-50 nav-enemy ((obj nav-enemy) (arg0 vector)) (let ((s4-0 (new 'stack-no-clear 'vector))) (set! (-> s4-0 quad) (-> obj collide-info trans quad)) (set! (-> obj collide-info trans quad) (-> arg0 quad)) (let ((gp-0 (-> obj nav))) - (TODO-RENAME-28 - gp-0 - (collide-kind - background - cak-1 - cak-2 - cak-3 - target - water - powerup - crate - enemy - wall-object - projectile - ground-object - target-attack - mother-spider - cak-14 - blue-eco-suck - unknown-16 - unknown-17 - unknown-18 - unknown-19 - unknown-20 - unknown-21 - unknown-22 - unknown-23 - unknown-24 - unknown-25 - unknown-26 - unknown-27 - unknown-28 - unknown-29 - unknown-30 - unknown-31 - unknown-32 - unknown-33 - unknown-34 - unknown-35 - unknown-36 - unknown-37 - unknown-38 - unknown-39 - unknown-40 - unknown-41 - unknown-42 - unknown-43 - unknown-44 - unknown-45 - unknown-46 - unknown-47 - unknown-48 - unknown-49 - unknown-50 - unknown-51 - unknown-52 - unknown-53 - unknown-54 - unknown-55 - unknown-56 - unknown-57 - unknown-58 - unknown-59 - unknown-60 - unknown-61 - unknown-62 - unknown-63 - ) - ) + (nav-control-method-28 gp-0 (the-as collide-kind -1)) (set! (-> obj collide-info trans quad) (-> s4-0 quad)) (let* ((v1-8 (-> gp-0 mesh origin)) (f0-1 (- (-> arg0 x) (-> v1-8 x))) @@ -1908,7 +1848,3 @@ nav-enemy-default-event-handler ) #f ) - - - - diff --git a/goal_src/jak1/engine/common-obs/orb-cache.gc b/goal_src/jak1/engine/common-obs/orb-cache.gc index 2bfaed35d3..3501fdb810 100644 --- a/goal_src/jak1/engine/common-obs/orb-cache.gc +++ b/goal_src/jak1/engine/common-obs/orb-cache.gc @@ -42,8 +42,8 @@ ) (defstate orb-cache-top-idle (orb-cache-top) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('eco-blue) (process-entity-status! self (entity-perm-status complete) #t) (dotimes (gp-0 5) @@ -53,7 +53,7 @@ (go orb-cache-top-activate #f) ) (else - (plat-event arg0 arg1 arg2 arg3) + (plat-event proc arg1 event-type event) ) ) ) @@ -90,7 +90,7 @@ ) ) -(defmethod dummy-22 orb-cache-top ((obj orb-cache-top)) +(defmethod baseplat-method-22 orb-cache-top ((obj orb-cache-top)) (if (< 4096.0 (- (-> obj basetrans y) (-> obj root-pos))) (activate! (-> obj smush) -1.0 60 150 1.0 1.0) (activate! (-> obj smush) -0.5 60 150 1.0 1.0) @@ -323,7 +323,7 @@ (initialize-skeleton obj *orb-cache-top-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-override)) - (dummy-21 obj) + (baseplat-method-21 obj) (set! (-> obj money) (res-lump-value (-> obj entity) 'orb-cache-count int :default (the-as uint128 20))) (set! (-> obj active-distance) 61440.0) (set! (-> obj inactive-distance) 245760.0) @@ -355,7 +355,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/plat-button.gc b/goal_src/jak1/engine/common-obs/plat-button.gc index 85eb4ac02b..c0b352f49b 100644 --- a/goal_src/jak1/engine/common-obs/plat-button.gc +++ b/goal_src/jak1/engine/common-obs/plat-button.gc @@ -33,12 +33,12 @@ (plat-button-move-upward () _type_ :state 24) (plat-button-teleport-to-other-end () _type_ :state 25) (can-activate? (_type_) symbol 26) - (TODO-RENAME-27 (_type_) none 27) - (TODO-RENAME-28 (_type_) collide-shape-moving 28) + (plat-button-method-27 (_type_) none 27) + (plat-button-method-28 (_type_) collide-shape-moving 28) (can-target-move? (_type_) none 29) (should-teleport? (_type_) symbol 30) - (TODO-RENAME-31 (_type_) none 31) - (TODO-RENAME-32 (_type_) none 32) + (plat-button-method-31 (_type_) none 31) + (plat-button-method-32 (_type_) none 32) ) ) @@ -58,20 +58,16 @@ (defstate plat-button-idle (plat-button) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch) (when (can-activate? self) (if (and ((method-of-type touching-shapes-entry prims-touching?) - (the-as touching-shapes-entry (-> arg3 param 0)) + (the-as touching-shapes-entry (-> event param 0)) (-> self root-override) (the-as uint 1) ) - (or (not (-> self should-grab-player?)) (let ((v0-3 (process-grab? *target*))) - (set! (-> self grab-player?) v0-3) - v0-3 - ) - ) + (or (not (-> self should-grab-player?)) (set! (-> self grab-player?) (process-grab? *target*))) ) (go-virtual plat-button-pressed) ) @@ -171,8 +167,8 @@ (defstate plat-button-move-downward (plat-button) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (the-as object (when (or (= arg2 'touch) (= arg2 'attack)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (when (or (= event-type 'touch) (= event-type 'attack)) (set! (-> self state-time) (-> *display* base-frame-counter)) #f ) @@ -199,7 +195,7 @@ (when (or (not *target*) (and (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 4)) (not (and (logtest? (-> *target* control unknown-surface00 flags) (surface-flags jump)) - (zero? (logand (-> *target* control status) (cshape-moving-flags onsurf))) + (not (logtest? (-> *target* control status) (cshape-moving-flags onsurf))) ) ) ) @@ -245,8 +241,8 @@ (defstate plat-button-move-upward (plat-button) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (the-as object (when (or (= arg2 'touch) (= arg2 'attack)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (when (or (= event-type 'touch) (= event-type 'attack)) (set! (-> self state-time) (-> *display* base-frame-counter)) #f ) @@ -273,7 +269,7 @@ (when (or (not *target*) (and (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 4)) (not (and (logtest? (-> *target* control unknown-surface00 flags) (surface-flags jump)) - (zero? (logand (-> *target* control status) (cshape-moving-flags onsurf))) + (not (logtest? (-> *target* control status) (cshape-moving-flags onsurf))) ) ) ) @@ -337,7 +333,7 @@ ) ) -(defmethod TODO-RENAME-28 plat-button ((obj plat-button)) +(defmethod plat-button-method-28 plat-button ((obj plat-button)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -383,7 +379,7 @@ (none) ) -(defmethod TODO-RENAME-27 plat-button ((obj plat-button)) +(defmethod plat-button-method-27 plat-button ((obj plat-button)) (ja-channel-set! 1) (cond ((can-activate? obj) @@ -414,13 +410,13 @@ (none) ) -(defmethod TODO-RENAME-31 plat-button ((obj plat-button)) +(defmethod plat-button-method-31 plat-button ((obj plat-button)) (initialize-skeleton obj *plat-button-sg* '()) 0 (none) ) -(defmethod TODO-RENAME-32 plat-button ((obj plat-button)) +(defmethod plat-button-method-32 plat-button ((obj plat-button)) (go (method-of-object obj plat-button-idle)) 0 (none) @@ -444,10 +440,10 @@ ) ) (set! (-> obj bidirectional?) (nonzero? (res-lump-value arg0 'bidirectional uint128))) - (TODO-RENAME-28 obj) + (plat-button-method-28 obj) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (TODO-RENAME-31 obj) + (plat-button-method-31 obj) (logior! (-> obj skel status) (janim-status inited)) (set! (-> obj spawn-pos quad) (-> obj root-override trans quad)) (set! (-> obj path) (new 'process 'curve-control obj 'path -1000000000.0)) @@ -460,11 +456,7 @@ (set! (-> obj sound-id) (new-sound-id)) (set! (-> obj allow-auto-kill) #t) (can-target-move? obj) - (TODO-RENAME-27 obj) - (TODO-RENAME-32 obj) + (plat-button-method-27 obj) + (plat-button-method-32 obj) (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/plat-eco.gc b/goal_src/jak1/engine/common-obs/plat-eco.gc index 29779fe412..5ce0fc6de3 100644 --- a/goal_src/jak1/engine/common-obs/plat-eco.gc +++ b/goal_src/jak1/engine/common-obs/plat-eco.gc @@ -40,13 +40,13 @@ (defstate plat-idle (plat-eco) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('wake) (go-virtual plat-path-active (the-as plat #f)) ) (('eco-blue) - (go-virtual notice-blue (process->handle arg0)) + (go-virtual notice-blue (process->handle proc)) ) (('ridden 'edge-grabbed) (when (send-event *target* 'query 'powerup (pickup-type eco-blue)) @@ -72,13 +72,7 @@ (if (and *target* (>= (-> self notice-dist) (vector-vector-distance (-> self root-override trans) (-> *target* control trans))) ) - (level-hint-spawn - (game-text-id misty-eco-plat) - "sksp0073" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (game-text-id misty-eco-plat) "sksp0073" (the-as entity #f) *entity-pool* (game-task none)) ) (none) ) @@ -93,8 +87,8 @@ (defstate notice-blue (plat-eco) :virtual override - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('wake) (sound-play "blue-eco-on" :position (the-as symbol (-> self root-override trans))) (go-virtual plat-path-active (the-as plat #f)) @@ -230,7 +224,7 @@ ) ) -(defmethod dummy-24 plat-eco ((obj plat-eco)) +(defmethod baseplat-method-24 plat-eco ((obj plat-eco)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -267,7 +261,7 @@ (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) (set! (-> obj notice-dist) (res-lump-float arg0 'notice-dist :default -1.0)) (set! (-> obj link) (new 'process 'actor-link-info obj)) - (dummy-24 obj) + (baseplat-method-24 obj) (process-drawable-from-entity! obj arg0) (let ((s4-0 (get-unlit-skel obj)) (s5-1 (get-lit-skel obj)) @@ -292,8 +286,8 @@ (set! (-> obj path-pos) (get-current-phase-with-mirror (-> obj sync))) (eval-path-curve! (-> obj path) (-> obj root-override trans) (-> obj path-pos) 'interp) (set! (-> obj sound-id) (new-sound-id)) - (dummy-26 obj) - (dummy-21 obj) + (baseplat-method-26 obj) + (baseplat-method-21 obj) (if (or (and (-> obj entity) (logtest? (-> obj entity extra perm status) (entity-perm-status complete))) (< (-> obj notice-dist) 0.0) ) @@ -302,7 +296,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/plat.gc b/goal_src/jak1/engine/common-obs/plat.gc index bf42bff941..494ce50e99 100644 --- a/goal_src/jak1/engine/common-obs/plat.gc +++ b/goal_src/jak1/engine/common-obs/plat.gc @@ -69,7 +69,7 @@ :flag-assert #x2100a00108 (:methods (get-lit-skel (_type_) skeleton-group 27) - (dummy-28 () none 28) + (plat-method-28 () none 28) (wad () _type_ :state 29) (plat-startup (plat) _type_ :state 30) (plat-idle () _type_ :state 31) @@ -130,7 +130,7 @@ ) ) -(defmethod dummy-24 plat ((obj plat)) +(defmethod baseplat-method-24 plat ((obj plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -155,12 +155,12 @@ (none) ) -(defmethod dummy-26 plat ((obj plat)) +(defmethod baseplat-method-26 plat ((obj plat)) 0 (none) ) -(defmethod TODO-RENAME-25 plat ((obj plat)) +(defmethod baseplat-method-25 plat ((obj plat)) (the-as sparticle-launch-group (when (!= (-> (if (-> obj entity) (-> obj entity extra level) (-> *level* level-default) @@ -199,7 +199,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior plat) plat-event) :trans (behavior () - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (behavior () @@ -250,13 +250,13 @@ (defmethod init-from-entity! plat ((obj plat) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (dummy-24 obj) + (baseplat-method-24 obj) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj (get-unlit-skel obj) '()) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-override)) - (dummy-21 obj) - (TODO-RENAME-25 obj) + (baseplat-method-21 obj) + (baseplat-method-25 obj) (load-params! (-> obj sync) obj (the-as uint 0) 0.0 0.15 0.15) (set! (-> obj fact) (new 'process 'fact-info obj (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)) @@ -268,7 +268,7 @@ ((logtest? (-> obj path flags) (path-control-flag not-found)) (set! (-> obj path-pos) 0.0) (let ((a0-14 obj)) - (dummy-26 a0-14) + (baseplat-method-26 a0-14) (go (method-of-object obj plat-startup) a0-14) ) ) @@ -280,7 +280,7 @@ ) (eval-path-curve! (-> obj path) (-> obj root-override trans) (-> obj path-pos) 'interp) (let ((a0-18 obj)) - (dummy-26 a0-18) + (baseplat-method-26 a0-18) (go (method-of-object obj plat-startup) a0-18) ) ) @@ -288,14 +288,10 @@ (set! (-> obj path-pos) 0.0) (eval-path-curve! (-> obj path) (-> obj root-override trans) (-> obj path-pos) 'interp) (let ((a0-20 obj)) - (dummy-26 a0-20) + (baseplat-method-26 a0-20) (go (method-of-object obj plat-startup) a0-20) ) ) ) (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/process-drawable.gc b/goal_src/jak1/engine/common-obs/process-drawable.gc index 8850fc7b16..a1e76f4ef3 100644 --- a/goal_src/jak1/engine/common-obs/process-drawable.gc +++ b/goal_src/jak1/engine/common-obs/process-drawable.gc @@ -924,8 +924,8 @@ 0 ) -;; WARN: Unsupported inline assembly instruction kind - [lw ra, return-from-thread(s7)] -;; WARN: Unsupported inline assembly instruction kind - [jr ra] +;; ERROR: Unsupported inline assembly instruction kind - [lw ra, return-from-thread(s7)] +;; ERROR: Unsupported inline assembly instruction kind - [jr ra] (defmethod evaluate-joint-control process-drawable ((obj process-drawable)) (local-vars (s7-0 none) (ra-0 int)) (let ((gp-0 (-> obj skel))) @@ -983,7 +983,7 @@ (label cfg-27) (let ((a0-17 (-> gp-0 effect))) (if a0-17 - (TODO-RENAME-9 a0-17) + (effect-control-method-9 a0-17) ) ) ) @@ -991,6 +991,7 @@ (none) ) +;; WARN: Function ja-post has a return type of none, but the expression builder found a return statement. (defbehavior ja-post process-drawable () (when (nonzero? (-> self draw)) (let ((gp-1 (logtest? (-> self draw status) (draw-status no-skeleton-update)))) @@ -1092,7 +1093,7 @@ (defbehavior process-drawable-delay-player process-drawable ((arg0 time-frame)) (while (and *target* (logtest? (-> *target* control unknown-surface00 flags) (surface-flags jump)) - (zero? (logand (-> *target* control status) (cshape-moving-flags onsurf))) + (not (logtest? (-> *target* control status) (cshape-moving-flags onsurf))) ) (suspend) ) @@ -1244,7 +1245,3 @@ s5-0 ) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/process-taskable.gc b/goal_src/jak1/engine/common-obs/process-taskable.gc index 06dd7f074c..c3e6cd7754 100644 --- a/goal_src/jak1/engine/common-obs/process-taskable.gc +++ b/goal_src/jak1/engine/common-obs/process-taskable.gc @@ -18,7 +18,7 @@ ;; DECOMP BEGINS -(defmethod dummy-52 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-52 process-taskable ((obj process-taskable)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((a0-1 v1-1)) @@ -150,7 +150,7 @@ (the-as process-taskable ((method-of-type process-drawable relocate) obj arg0)) ) -(defmethod dummy-46 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-46 process-taskable ((obj process-taskable)) (when (nonzero? (-> obj sound-flava)) (let ((s5-1 (vector-! (new 'stack-no-clear 'vector) @@ -213,7 +213,7 @@ (the-as basic #f) ) -(defmethod dummy-33 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-33 process-taskable ((obj process-taskable)) (let ((s5-0 (play-anim! obj #f))) (if (type-type? (-> s5-0 type) spool-anim) (spool-push *art-control* (-> (the-as spool-anim s5-0) name) 0 obj -99.0) @@ -264,7 +264,7 @@ (none) ) -(defmethod dummy-38 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-38 process-taskable ((obj process-taskable)) (if (nonzero? (-> obj cell-for-task)) (go (method-of-object obj give-cell)) ) @@ -281,7 +281,7 @@ (suspend) (ja :num! (loop!)) (if (= (-> self next-state name) 'idle) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) ) ) (the-as none 0) @@ -298,7 +298,7 @@ (go-virtual hidden) ) ) - (dummy-33 self) + (process-taskable-method-33 self) ((-> self cur-trans-hook)) (none) ) @@ -331,7 +331,7 @@ ) ) (go-virtual release) - (dummy-33 self) + (process-taskable-method-33 self) ((-> self cur-trans-hook)) (none) ) @@ -387,7 +387,7 @@ ) ) (set! (-> self last-talk) (-> *display* game-frame-counter)) - (dummy-52 self) + (process-taskable-method-52 self) (none) ) @@ -583,11 +583,11 @@ (defstate play-anim (process-taskable) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('shadow) (cond - ((-> arg3 param 0) + ((-> event param 0) (let ((v0-0 (the-as object (-> self shadow-backup)))) (set! (-> self draw shadow) (the-as shadow-geo v0-0)) v0-0 @@ -602,10 +602,10 @@ (('shadow-min-max) (let ((v1-5 (-> self draw shadow-ctrl))) (let ((a0-4 v1-5)) - (set! (-> a0-4 settings bot-plane w) (- (the-as float (-> arg3 param 0)))) + (set! (-> a0-4 settings bot-plane w) (- (the-as float (-> event param 0)))) ) 0 - (set! (-> v1-5 settings top-plane w) (- (the-as float (-> arg3 param 1)))) + (set! (-> v1-5 settings top-plane w) (- (the-as float (-> event param 1)))) ) 0 ) @@ -625,7 +625,7 @@ ) :code (behavior () (process-taskable-play-anim-code (the-as art-joint-anim (get-art-elem self)) (play-anim! self #t)) - (dummy-38 self) + (process-taskable-method-38 self) (none) ) :post (the-as (function none :behavior process-taskable) ja-post) @@ -715,7 +715,7 @@ ) ;; WARN: disable def twice: 4. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare. -(defmethod TODO-RENAME-50 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-50 process-taskable ((obj process-taskable)) (if *target* (or (not *target*) (< 245760.0 (vector-vector-distance (-> obj root-override trans) (-> *target* control trans))) @@ -745,7 +745,7 @@ ((-> self been-kicked) (go-virtual idle) ) - ((TODO-RENAME-50 self) + ((process-taskable-method-50 self) (if (should-display? self) (go-virtual idle) (go-virtual hidden) @@ -759,44 +759,42 @@ (defstate be-clone (process-taskable) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as shadow-geo (cond - ((= v1-0 'shadow) - (the-as shadow-geo (cond - ((-> arg3 param 0) - (let ((v0-0 (-> self shadow-backup))) - (set! (-> self draw shadow) v0-0) - v0-0 - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as shadow-geo (case event-type + (('shadow) + (the-as shadow-geo (cond + ((-> event param 0) + (let ((v0-0 (-> self shadow-backup))) + (set! (-> self draw shadow) v0-0) + v0-0 ) - (else - (set! (-> self draw shadow) #f) - (the-as shadow-geo #f) - ) + ) + (else + (set! (-> self draw shadow) #f) + (the-as shadow-geo #f) ) - ) - ) - ((= v1-0 'shadow-min-max) - (let ((v1-5 (-> self draw shadow-ctrl))) - (let ((a0-5 v1-5)) - (set! (-> a0-5 settings bot-plane w) (- (the-as float (-> arg3 param 0)))) - ) - 0 - (set! (-> v1-5 settings top-plane w) (- (the-as float (-> arg3 param 1)))) + ) + ) + ) + (('shadow-min-max) + (let ((v1-5 (-> self draw shadow-ctrl))) + (let ((a0-5 v1-5)) + (set! (-> a0-5 settings bot-plane w) (- (the-as float (-> event param 0)))) ) - (the-as shadow-geo 0) + 0 + (set! (-> v1-5 settings top-plane w) (- (the-as float (-> event param 1)))) ) - ((= v1-0 'end-mode) - (the-as shadow-geo (if (should-display? self) - (the-as shadow-geo (go-virtual idle)) - (the-as shadow-geo (go-virtual hidden)) - ) - ) - ) - ) - ) - ) + (the-as shadow-geo 0) + ) + (('end-mode) + (the-as shadow-geo (if (should-display? self) + (the-as shadow-geo (go-virtual idle)) + (the-as shadow-geo (go-virtual hidden)) + ) + ) + ) + ) + ) ) :enter (behavior ((arg0 handle)) (logior! (-> self skel status) (janim-status blerc)) @@ -834,47 +832,45 @@ (defstate idle (process-taskable) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - object - (cond - ((= v1-0 'attack) - (the-as - symbol - (if (-> self bounce-away) - (the-as - symbol - (send-event arg0 'shove #f (static-attack-info ((shove-back (meters 3)) (shove-up (meters 1))))) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as + object + (case event-type + (('attack) + (the-as + symbol + (if (-> self bounce-away) + (the-as + symbol + (send-event proc 'shove #f (static-attack-info ((shove-back (meters 3)) (shove-up (meters 1))))) ) - ) + ) ) - ((= v1-0 'touch) - (the-as symbol (send-shove-back - (-> self root-override) - arg0 - (the-as touching-shapes-entry (-> arg3 param 0)) - 0.7 - 6144.0 - 16384.0 - ) - ) + ) + (('touch) + (the-as symbol (send-shove-back + (-> self root-override) + proc + (the-as touching-shapes-entry (-> event param 0)) + 0.7 + 6144.0 + 16384.0 + ) + ) + ) + (('clone) + (the-as symbol (go-virtual be-clone (the-as handle (-> event param 0)))) + ) + (('play-anim) + (logclear! (-> self mask) (process-mask actor-pause)) + (let ((v0-0 #t)) + (set! (-> self been-kicked) v0-0) + v0-0 ) - ((= v1-0 'clone) - (the-as symbol (go-virtual be-clone (the-as handle (-> arg3 param 0)))) - ) - ((= v1-0 'play-anim) - (logclear! (-> self mask) (process-mask actor-pause)) - (let ((v0-0 #t)) - (set! (-> self been-kicked) v0-0) - v0-0 - ) - ) - ((= v1-0 'hidden-other) - (the-as symbol (go-virtual hidden-other)) - ) - ) + ) + (('hidden-other) + (the-as symbol (go-virtual hidden-other)) + ) ) ) ) @@ -914,13 +910,13 @@ ) ) ((begin - (dummy-46 self) + (process-taskable-method-46 self) (and (not (and (logtest? (-> *target* control unknown-surface00 flags) (surface-flags jump)) - (zero? (logand (-> *target* control status) (cshape-moving-flags onsurf))) + (not (logtest? (-> *target* control status) (cshape-moving-flags onsurf))) ) ) (< (-> (target-pos 0) y) (+ 8192.0 (-> self root-override root-prim prim-core world-sphere y))) - (less-than-hack (vector-vector-distance (target-pos 0) (the-as vector (-> self root-override root-prim prim-core))) + (< (vector-vector-distance (target-pos 0) (the-as vector (-> self root-override root-prim prim-core))) 32768.0 ) (= (-> *level* loading-level) (-> *level* level-default)) @@ -973,7 +969,7 @@ ) ) (if (= (-> *level* loading-level) (-> *level* level-default)) - (dummy-33 self) + (process-taskable-method-33 self) ) (draw-npc-shadow self) (when (and (-> self been-kicked) (and (not *progress-process*) @@ -1024,7 +1020,7 @@ (none) ) -(defmethod dummy-40 process-taskable ((obj process-taskable) (arg0 object) (arg1 skeleton-group) (arg2 int) (arg3 int) (arg4 vector) (arg5 int)) +(defmethod process-taskable-method-40 process-taskable ((obj process-taskable) (arg0 object) (arg1 skeleton-group) (arg2 int) (arg3 int) (arg4 vector) (arg5 int)) (stack-size-set! (-> obj main-thread) 512) (initialize-collision obj arg2 arg4) (process-drawable-from-entity! obj (the-as entity-actor arg0)) @@ -1053,15 +1049,15 @@ (set! (-> obj been-kicked) #f) (set! (-> obj neck-joint-index) arg5) (set! (-> obj cur-trans-hook) nothing) - (dummy-9 (-> obj ambient)) + (ambient-control-method-9 (-> obj ambient)) (set! (-> obj event-hook) (-> (method-of-object obj idle) event)) (set! (-> obj draw shadow-ctrl) (new 'process 'shadow-control 0.0 0.0 614400.0 (the-as float 60) 245760.0)) - (dummy-52 obj) + (process-taskable-method-52 obj) 0 (none) ) -(defmethod dummy-42 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-42 process-taskable ((obj process-taskable)) (cond ((not (should-display? obj)) (go (method-of-object obj hidden)) @@ -1076,17 +1072,17 @@ (none) ) -(defmethod TODO-RENAME-43 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-43 process-taskable ((obj process-taskable)) (the-as symbol 0) ) -(defmethod dummy-9 ambient-control ((obj ambient-control)) +(defmethod ambient-control-method-9 ambient-control ((obj ambient-control)) (set! (-> obj last-ambient-time) (-> *display* game-frame-counter)) 0 (none) ) -(defmethod TODO-RENAME-10 ambient-control ((obj ambient-control) (arg0 vector) (arg1 time-frame) (arg2 float) (arg3 process-drawable)) +(defmethod ambient-control-method-10 ambient-control ((obj ambient-control) (arg0 vector) (arg1 time-frame) (arg2 float) (arg3 process-drawable)) (when (< (- (-> *display* game-frame-counter) (-> obj last-ambient-time)) arg1) (set! arg0 (the-as vector #f)) (goto cfg-6) @@ -1127,9 +1123,9 @@ ) (defstate othercam-running (othercam) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 object)) - (case arg2 + (case event-type (('die) (set! v0-0 #t) (set! (-> self die?) (the-as symbol v0-0)) @@ -1137,13 +1133,13 @@ ) (('joint) (let ((t9-0 type-type?) - (v1-1 (-> arg3 param 0)) + (v1-1 (-> event param 0)) ) (cond ((t9-0 (rtype-of v1-1) string) (let ((v1-8 (lookup-art (-> (the-as process-taskable (-> self hand process 0)) draw jgeo) - (the-as string (-> arg3 param 0)) + (the-as string (-> event param 0)) (the-as type #f) ) ) @@ -1155,8 +1151,8 @@ ) ) ) - ((zero? (logand (-> arg3 param 0) 7)) - (set! v0-0 (-> arg3 param 0)) + ((not (logtest? (-> event param 0) 7)) + (set! v0-0 (-> event param 0)) (set! (-> self cam-joint-index) (the-as int v0-0)) v0-0 ) @@ -1164,7 +1160,7 @@ ) ) (('mask) - (set! v0-0 (-> arg3 param 0)) + (set! v0-0 (-> event param 0)) (set! (-> self mask-to-clear) (the-as process-mask v0-0)) v0-0 ) @@ -1309,7 +1305,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/rigid-body-h.gc b/goal_src/jak1/engine/common-obs/rigid-body-h.gc index f177e2f3b6..8ca7e5d5ee 100644 --- a/goal_src/jak1/engine/common-obs/rigid-body-h.gc +++ b/goal_src/jak1/engine/common-obs/rigid-body-h.gc @@ -32,20 +32,20 @@ :size-assert #x1a8 :flag-assert #x17000001a8 (:methods - (TODO-RENAME-9 (_type_ float float float float) none 9) - (dummy-10 (_type_ float) none 10) + (rigid-body-method-9 (_type_ float float float float) none 9) + (rigid-body-method-10 (_type_ float) none 10) (clear-force-torque! (_type_) none 11) (clear-momentum! (_type_) none 12) - (TODO-RENAME-13 (_type_ vector vector) none 13) - (TODO-RENAME-14 (_type_ vector vector) none 14) - (TODO-RENAME-15 (_type_ vector) none 15) - (TODO-RENAME-16 (_type_ vector vector float) none 16) - (TODO-RENAME-17 (_type_ vector vector) vector 17) - (TODO-RENAME-18 (_type_ vector) vector 18) - (dummy-19 (_type_) none 19) - (dummy-20 (_type_) none 20) - (TODO-RENAME-21 (_type_) none 21) - (TODO-RENAME-22 (_type_ vector quaternion float float) none 22) + (rigid-body-method-13 (_type_ vector vector) none 13) + (rigid-body-method-14 (_type_ vector vector) none 14) + (rigid-body-method-15 (_type_ vector) none 15) + (rigid-body-method-16 (_type_ vector vector float) none 16) + (rigid-body-method-17 (_type_ vector vector) vector 17) + (rigid-body-method-18 (_type_ vector) vector 18) + (print-stats (_type_) none 19) + (rigid-body-method-20 (_type_) none 20) + (rigid-body-method-21 (_type_) none 21) + (rigid-body-method-22 (_type_ vector quaternion float float) none 22) ) ) @@ -59,10 +59,3 @@ :size-assert #x30 :flag-assert #x900000030 ) - - -0 - - - - diff --git a/goal_src/jak1/engine/common-obs/rigid-body.gc b/goal_src/jak1/engine/common-obs/rigid-body.gc index 074faed5f3..dc8c0c4156 100644 --- a/goal_src/jak1/engine/common-obs/rigid-body.gc +++ b/goal_src/jak1/engine/common-obs/rigid-body.gc @@ -22,14 +22,14 @@ (none) ) -(defmethod TODO-RENAME-21 rigid-body ((obj rigid-body)) +(defmethod rigid-body-method-21 rigid-body ((obj rigid-body)) (quaternion->matrix (-> obj matrix) (-> obj rotation)) - (TODO-RENAME-18 obj (-> obj matrix vector 3)) + (rigid-body-method-18 obj (-> obj matrix vector 3)) 0 (none) ) -(defmethod TODO-RENAME-22 rigid-body ((obj rigid-body) (arg0 vector) (arg1 quaternion) (arg2 float) (arg3 float)) +(defmethod rigid-body-method-22 rigid-body ((obj rigid-body) (arg0 vector) (arg1 quaternion) (arg2 float) (arg3 float)) (clear-force-torque! obj) (clear-momentum! obj) (vector+! (-> obj position) arg0 (-> obj cm-offset-joint)) @@ -37,7 +37,7 @@ (quaternion-normalize! (-> obj rotation)) (set! (-> obj lin-momentum-damping-factor) arg2) (set! (-> obj ang-momentum-damping-factor) arg3) - (TODO-RENAME-21 obj) + (rigid-body-method-21 obj) (set! (-> obj lin-velocity quad) (-> *null-vector* quad)) (set! (-> obj ang-velocity quad) (-> *null-vector* quad)) (set! (-> obj inv-i-world vector 0 quad) (the-as uint128 0)) @@ -50,7 +50,7 @@ (none) ) -(defmethod TODO-RENAME-9 rigid-body ((obj rigid-body) (arg0 float) (arg1 float) (arg2 float) (arg3 float)) +(defmethod rigid-body-method-9 rigid-body ((obj rigid-body) (arg0 float) (arg1 float) (arg2 float) (arg3 float)) (set! (-> obj mass) arg0) (let ((f0-1 arg0)) (set! (-> obj inv-mass) (/ 1.0 f0-1)) @@ -93,7 +93,7 @@ (none) ) -(defmethod TODO-RENAME-17 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) +(defmethod rigid-body-method-17 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) (let ((v1-1 (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj position)))) (vector-cross! arg1 (-> obj ang-velocity) v1-1) ) @@ -120,7 +120,7 @@ arg0 ) -(defmethod dummy-10 rigid-body ((obj rigid-body) (arg0 float)) +(defmethod rigid-body-method-10 rigid-body ((obj rigid-body) (arg0 float)) (vector+*! (-> obj lin-momentum) (-> obj lin-momentum) (-> obj force) arg0) (vector+*! (-> obj ang-momentum) (-> obj ang-momentum) (-> obj torque) arg0) (vector-float*! (-> obj lin-momentum) (-> obj lin-momentum) (-> obj lin-momentum-damping-factor)) @@ -142,12 +142,12 @@ ) (quaternion-normalize! (-> obj rotation)) (quaternion->matrix (-> obj matrix) (-> obj rotation)) - (TODO-RENAME-18 obj (-> obj matrix vector 3)) + (rigid-body-method-18 obj (-> obj matrix vector 3)) 0 (none) ) -(defmethod TODO-RENAME-13 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) +(defmethod rigid-body-method-13 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) (vector+! (-> obj force) (-> obj force) arg1) (let* ((v1-2 (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj position))) (a1-2 (vector-cross! (new 'stack-no-clear 'vector) v1-2 arg1)) @@ -158,7 +158,7 @@ (none) ) -(defmethod TODO-RENAME-16 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector) (arg2 float)) +(defmethod rigid-body-method-16 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector) (arg2 float)) (vector+! (-> obj force) (-> obj force) arg1) (let* ((a0-3 (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj position))) (s4-1 (vector-cross! (new 'stack-no-clear 'vector) a0-3 arg1)) @@ -174,26 +174,26 @@ (none) ) -(defmethod TODO-RENAME-14 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) +(defmethod rigid-body-method-14 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) (let ((s5-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) ) (vector-rotate*! s4-0 arg1 (-> obj matrix)) (vector-rotate*! s5-0 arg0 (-> obj matrix)) (vector+! s5-0 s5-0 (-> obj position)) - (TODO-RENAME-13 obj s5-0 s4-0) + (rigid-body-method-13 obj s5-0 s4-0) ) 0 (none) ) -(defmethod TODO-RENAME-15 rigid-body ((obj rigid-body) (arg0 vector)) +(defmethod rigid-body-method-15 rigid-body ((obj rigid-body) (arg0 vector)) (vector+! (-> obj force) (-> obj force) arg0) 0 (none) ) -(defmethod TODO-RENAME-18 rigid-body ((obj rigid-body) (arg0 vector)) +(defmethod rigid-body-method-18 rigid-body ((obj rigid-body) (arg0 vector)) (let ((gp-0 (new 'stack-no-clear 'vector))) (vector-rotate*! gp-0 (-> obj cm-offset-joint) (-> obj matrix)) (vector-! arg0 (-> obj position) gp-0) @@ -201,7 +201,7 @@ arg0 ) -(defmethod dummy-19 rigid-body ((obj rigid-body)) +(defmethod print-stats rigid-body ((obj rigid-body)) (format #t " force ~M ~M ~M" (-> obj force x) (-> obj force y) (-> obj force z)) (format #t " torque ~f ~f ~f~%" (-> obj torque x) (-> obj torque y) (-> obj torque z)) (format #t " position ~M ~M ~M" (-> obj position x) (-> obj position y) (-> obj position z)) @@ -221,7 +221,7 @@ (none) ) -(defmethod dummy-20 rigid-body ((obj rigid-body)) +(defmethod rigid-body-method-20 rigid-body ((obj rigid-body)) (format #t " force ~M ~M ~M" (-> obj force x) (-> obj force y) (-> obj force z)) (format #t " torque ~f ~f ~f~%" (-> obj torque x) (-> obj torque y) (-> obj torque z)) 0 @@ -296,19 +296,19 @@ (:methods (rigid-body-platform-idle () _type_ :state 20) (rigid-body-platform-float () _type_ :state 21) - (TODO-RENAME-22 (_type_ vector float) float 22) - (TODO-RENAME-23 (_type_ float) none 23) - (TODO-RENAME-24 (_type_ rigid-body-control-point float) none 24) - (TODO-RENAME-25 (_type_) none 25) - (TODO-RENAME-26 (_type_) none 26) - (TODO-RENAME-27 (_type_ vector) none 27) - (TODO-RENAME-28 (_type_) none 28) - (TODO-RENAME-29 (_type_ rigid-body-platform-constants) none 29) - (TODO-RENAME-30 (_type_) none 30) - (TODO-RENAME-31 (_type_) none 31) - (dummy-32 (_type_) sound-id 32) - (dummy-33 (_type_) object 33) - (TODO-RENAME-34 (_type_) none 34) + (rigid-body-platform-method-22 (_type_ vector float) float 22) + (rigid-body-platform-method-23 (_type_ float) none 23) + (rigid-body-platform-method-24 (_type_ rigid-body-control-point float) none 24) + (rigid-body-platform-method-25 (_type_) none 25) + (rigid-body-platform-method-26 (_type_) none 26) + (rigid-body-platform-method-27 (_type_ vector) none 27) + (rigid-body-platform-method-28 (_type_) none 28) + (rigid-body-platform-method-29 (_type_ rigid-body-platform-constants) none 29) + (rigid-body-platform-method-30 (_type_) none 30) + (rigid-body-platform-method-31 (_type_) none 31) + (rigid-body-platform-method-32 (_type_) sound-id 32) + (rigid-body-platform-method-33 (_type_) object 33) + (rigid-body-platform-method-34 (_type_) none 34) ) ) @@ -328,7 +328,7 @@ ) ) -(defmethod TODO-RENAME-22 rigid-body-platform ((obj rigid-body-platform) (arg0 vector) (arg1 float)) +(defmethod rigid-body-platform-method-22 rigid-body-platform ((obj rigid-body-platform) (arg0 vector) (arg1 float)) (let ((v1-0 (-> obj water-anim))) 0.0 (+ (the-as float (cond @@ -355,8 +355,8 @@ ) ) -(defmethod TODO-RENAME-24 rigid-body-platform ((obj rigid-body-platform) (arg0 rigid-body-control-point) (arg1 float)) - (set! (-> arg0 world-pos w) (TODO-RENAME-22 obj (-> arg0 world-pos) arg1)) +(defmethod rigid-body-platform-method-24 rigid-body-platform ((obj rigid-body-platform) (arg0 rigid-body-control-point) (arg1 float)) + (set! (-> arg0 world-pos w) (rigid-body-platform-method-22 obj (-> arg0 world-pos) arg1)) (let* ((s4-0 (new 'stack-no-clear 'vector)) (f0-2 (- (-> arg0 world-pos w) (-> arg0 world-pos y))) (f30-0 (/ f0-2 (-> obj info max-buoyancy-depth))) @@ -369,9 +369,9 @@ (-> obj info buoyancy-factor) ) ) - (TODO-RENAME-13 (-> obj rbody) (-> arg0 world-pos) s4-0) + (rigid-body-method-13 (-> obj rbody) (-> arg0 world-pos) s4-0) (vector-float*! s4-0 (-> arg0 velocity) (* -1.0 (-> obj info drag-factor) (fmin 1.0 f30-0))) - (TODO-RENAME-13 (-> obj rbody) (-> arg0 world-pos) s4-0) + (rigid-body-method-13 (-> obj rbody) (-> arg0 world-pos) s4-0) ) ) 0 @@ -379,10 +379,10 @@ (none) ) -(defmethod TODO-RENAME-25 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-25 rigid-body-platform ((obj rigid-body-platform)) (when (or (-> obj player-impulse) (-> obj player-contact)) (set! (-> obj player-impulse) #f) - (TODO-RENAME-16 + (rigid-body-method-16 (-> obj rbody) (-> obj player-force-position) (-> obj player-force) @@ -393,20 +393,20 @@ (none) ) -(defmethod TODO-RENAME-26 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-26 rigid-body-platform ((obj rigid-body-platform)) (let ((a1-0 (new 'stack-no-clear 'vector))) (vector-float*! a1-0 *y-vector* (* -1.0 (-> obj info gravity-factor) (-> obj info gravity) (-> obj rbody mass)) ) - (TODO-RENAME-15 (-> obj rbody) a1-0) + (rigid-body-method-15 (-> obj rbody) a1-0) ) 0 (none) ) -(defmethod TODO-RENAME-27 rigid-body-platform ((obj rigid-body-platform) (arg0 vector)) +(defmethod rigid-body-platform-method-27 rigid-body-platform ((obj rigid-body-platform) (arg0 vector)) (let ((gp-0 (new 'stack-no-clear 'vector))) (vector-! gp-0 arg0 (-> obj rbody position)) (set! (-> gp-0 y) 0.0) @@ -415,7 +415,7 @@ ) (when (< 0.0 f1-1) (vector-float*! gp-0 gp-0 (/ f1-1 f0-1)) - (TODO-RENAME-15 (-> obj rbody) gp-0) + (rigid-body-method-15 (-> obj rbody) gp-0) ) ) ) @@ -423,23 +423,23 @@ (none) ) -(defmethod TODO-RENAME-23 rigid-body-platform ((obj rigid-body-platform) (arg0 float)) +(defmethod rigid-body-platform-method-23 rigid-body-platform ((obj rigid-body-platform) (arg0 float)) (let ((s4-0 (-> obj rbody matrix))) (dotimes (s3-0 (-> obj info control-point-count)) (let ((s2-0 (-> obj control-point-array data s3-0))) (vector-matrix*! (-> s2-0 world-pos) (-> s2-0 local-pos) s4-0) - (TODO-RENAME-17 (-> obj rbody) (-> s2-0 world-pos) (-> s2-0 velocity)) - (TODO-RENAME-24 obj s2-0 arg0) + (rigid-body-method-17 (-> obj rbody) (-> s2-0 world-pos) (-> s2-0 velocity)) + (rigid-body-platform-method-24 obj s2-0 arg0) ) ) ) - (TODO-RENAME-26 obj) - (TODO-RENAME-25 obj) + (rigid-body-platform-method-26 obj) + (rigid-body-platform-method-25 obj) 0 (none) ) -(defmethod TODO-RENAME-28 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-28 rigid-body-platform ((obj rigid-body-platform)) (if (-> obj info platform) (detect-riders! (-> obj root-overlay)) ) @@ -451,13 +451,13 @@ (+! (-> obj sim-time-remaining) (* 0.0033333334 (the float (- (-> *display* base-frame-counter) (-> *display* old-base-frame-counter)))) ) - (let ((f30-0 (* DISPLAY_FPS_RATIO 0.016666668)) ;; changed for high fps + (let ((f30-0 0.016666668) (f28-0 (* 0.0033333334 (the float (logand #xffffff (-> *display* base-frame-counter))))) ) (while (>= (-> obj sim-time-remaining) (* 0.5 f30-0)) (clear-force-torque! (-> obj rbody)) - (TODO-RENAME-23 obj f28-0) - (dummy-10 (-> obj rbody) f30-0) + (rigid-body-platform-method-23 obj f28-0) + (rigid-body-method-10 (-> obj rbody) f30-0) (set! (-> obj sim-time-remaining) (- (-> obj sim-time-remaining) f30-0)) ) ) @@ -603,9 +603,9 @@ #t ) ) - (TODO-RENAME-28 self) + (rigid-body-platform-method-28 self) (quaternion-copy! (-> self root-overlay quat) (-> self rbody rotation)) - (TODO-RENAME-18 (-> self rbody) (-> self root-overlay trans)) + (rigid-body-method-18 (-> self rbody) (-> self root-overlay trans)) (if (-> self info platform) (rider-post) (transform-post) @@ -653,7 +653,7 @@ :post (the-as (function none :behavior rigid-body-platform) rigid-body-platform-post) ) -(defmethod TODO-RENAME-29 rigid-body-platform ((obj rigid-body-platform) (arg0 rigid-body-platform-constants)) +(defmethod rigid-body-platform-method-29 rigid-body-platform ((obj rigid-body-platform) (arg0 rigid-body-platform-constants)) (set! (-> obj info) arg0) (set! (-> obj control-point-array) (new 'process 'rigid-body-control-point-inline-array (-> obj info control-point-count)) @@ -667,14 +667,14 @@ (-> obj info cm-joint-z) 1.0 ) - (TODO-RENAME-22 + (rigid-body-method-22 (-> obj rbody) (-> obj root-overlay trans) (-> obj root-overlay quat) (-> obj info linear-damping) (-> obj info angular-damping) ) - (TODO-RENAME-9 + (rigid-body-method-9 (-> obj rbody) (-> obj info mass) (-> obj info inertial-tensor-x) @@ -692,7 +692,7 @@ (none) ) -(defmethod TODO-RENAME-30 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-30 rigid-body-platform ((obj rigid-body-platform)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -743,15 +743,15 @@ ) ) -(defmethod TODO-RENAME-34 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-34 rigid-body-platform ((obj rigid-body-platform)) (go (method-of-object obj rigid-body-platform-idle)) 0 (none) ) -(defmethod TODO-RENAME-31 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-31 rigid-body-platform ((obj rigid-body-platform)) (set! (-> obj float-height-offset) 0.0) - (TODO-RENAME-29 obj *rigid-body-platform-constants*) + (rigid-body-platform-method-29 obj *rigid-body-platform-constants*) (let ((s5-0 (-> obj info control-point-count))) (dotimes (s4-0 s5-0) (let ((s3-0 (-> obj control-point-array data s4-0))) @@ -770,14 +770,10 @@ (defmethod init-from-entity! rigid-body-platform ((obj rigid-body-platform) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) - (TODO-RENAME-34 obj) + (rigid-body-platform-method-31 obj) + (rigid-body-platform-method-34 obj) 0 (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/ropebridge.gc b/goal_src/jak1/engine/common-obs/ropebridge.gc index d189898f46..5eeb3401cf 100644 --- a/goal_src/jak1/engine/common-obs/ropebridge.gc +++ b/goal_src/jak1/engine/common-obs/ropebridge.gc @@ -505,7 +505,7 @@ (set-to-rest-state (_type_) none 25) (add-collision-meshes (_type_) none 26) (do-integration (_type_) none 27) - (dummy-28 (_type_) none 28) + (ropebridge-method-28 (_type_) none 28) ) (:states ropebridge-idle @@ -550,20 +550,20 @@ ) (defstate ropebridge-idle (ropebridge) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (let ((f0-0 -1.0)) (cond - ((= arg2 'bonk) + ((= event-type 'bonk) (when (>= (- (-> *display* base-frame-counter) (-> self bonk-time-stamp)) (seconds 0.2)) (set! (-> self bonk-time-stamp) (-> *display* base-frame-counter)) - (set! f0-0 (the-as float (-> arg3 param 1))) + (set! f0-0 (the-as float (-> event param 1))) (if (>= f0-0 (-> self tuning rider-bonk-max)) (set! f0-0 (-> self tuning rider-bonk-max)) ) ) ) - ((and (= arg2 'attack) (= (-> arg3 param 1) 'flop)) - (let ((v1-17 (-> arg3 param 2))) + ((and (= event-type 'attack) (= (-> event param 1) 'flop)) + (let ((v1-17 (-> event param 2))) (when (!= v1-17 (-> self player-attack-id)) (set! (-> self player-attack-id) v1-17) (set! (-> self attack-flop-time-stamp) (-> *display* base-frame-counter)) @@ -574,13 +574,13 @@ ) (the-as object - (when (and (>= f0-0 (-> self tuning rider-bonk-min)) (-> arg3 param 0)) + (when (and (>= f0-0 (-> self tuning rider-bonk-min)) (-> event param 0)) (set! (-> self agitated-time-stamp) (-> *display* base-frame-counter)) (let* ((f30-0 (/ (* (- f0-0 (-> self tuning rider-bonk-min)) (-> self tuning rider-bonk-force)) (- (-> self tuning rider-bonk-max) (-> self tuning rider-bonk-min)) ) ) - (gp-0 (the-as object (-> arg3 param 0))) + (gp-0 (the-as object (-> event param 0))) (a0-7 (-> (the-as touching-shapes-entry gp-0) head)) (s4-0 (-> self root-override)) (s5-0 (get-touched-prim a0-7 s4-0 (the-as touching-shapes-entry gp-0))) @@ -641,7 +641,7 @@ ) ) -;; WARN: Expression building failed: Function (method 20 ropebridge) has a return type of none, but the expression builder found a return statement. +;; WARN: Function (method 20 ropebridge) has a return type of none, but the expression builder found a return statement. (defmethod set-vel-from-impact ropebridge ((obj ropebridge) (arg0 uint) (arg1 vector) (arg2 int) (arg3 float)) (loop (let ((f0-2 (fabs (- (-> arg1 z) (-> obj spring-point (the-as int arg0) local-pos z))))) @@ -708,7 +708,7 @@ (none) ) -;; WARN: Expression building failed: Function (method 22 ropebridge) has a return type of none, but the expression builder found a return statement. +;; WARN: Function (method 22 ropebridge) has a return type of none, but the expression builder found a return statement. (defmethod set-vel-from-rider ropebridge ((obj ropebridge) (arg0 uint) (arg1 vector) (arg2 int)) (loop (let ((f0-0 (vector-vector-distance arg1 (the-as vector (-> obj spring-point (the-as int arg0)))))) @@ -983,7 +983,7 @@ ) (defmethod run-logic? ropebridge ((obj ropebridge)) - (or (zero? (logand (-> obj mask) (process-mask actor-pause))) + (or (not (logtest? (-> obj mask) (process-mask actor-pause))) (< (- (-> *display* base-frame-counter) (-> obj agitated-time-stamp)) (seconds 5)) (or (>= (-> obj sleep-dist) (vector-vector-distance (-> obj root-override trans) (math-camera-pos))) (and (nonzero? (-> obj skel)) (!= (-> obj skel root-channel 0) (-> obj skel channel))) @@ -992,7 +992,7 @@ ) ) -(defmethod dummy-28 ropebridge ((obj ropebridge)) +(defmethod ropebridge-method-28 ropebridge ((obj ropebridge)) 0 (none) ) @@ -1064,7 +1064,3 @@ (go ropebridge-idle) (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/sharkey.gc b/goal_src/jak1/engine/common-obs/sharkey.gc index 4836c39286..328e49d552 100644 --- a/goal_src/jak1/engine/common-obs/sharkey.gc +++ b/goal_src/jak1/engine/common-obs/sharkey.gc @@ -11,8 +11,8 @@ (defpartgroup group-sharkey-splash :id 106 - :duration 120 - :linger-duration 780 + :duration (seconds 0.4) + :linger-duration (seconds 2.6) :flags (use-local-clock) :bounds (static-bspherem 0 -12 0 14) :parts ((sp-item 124 :flags (is-3d) :period 900 :length 63) @@ -63,18 +63,18 @@ :bounds (static-spherem 0 0 0 6) ) -(defmethod dummy-44 sharkey ((obj sharkey) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler sharkey ((obj sharkey) (arg0 process) (arg1 event-message-block)) (the-as object #t) ) -(defmethod dummy-43 sharkey ((obj sharkey) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler sharkey ((obj sharkey) (arg0 process) (arg1 event-message-block)) (the-as object #t) ) nav-enemy-default-event-handler (defmethod run-logic? sharkey ((obj sharkey)) - (or (zero? (logand (-> obj mask) (process-mask actor-pause))) + (or (not (logtest? (-> obj mask) (process-mask actor-pause))) (or (>= (+ (-> *ACTOR-bank* pause-dist) (-> obj collide-info pause-adjust-distance)) (vector-vector-distance (-> obj collide-info trans) (math-camera-pos)) ) @@ -84,8 +84,8 @@ nav-enemy-default-event-handler ) ) -(defmethod dummy-40 sharkey ((obj sharkey)) - (dummy-11 (-> obj nav) (-> obj nav target-pos)) +(defmethod nav-enemy-method-40 sharkey ((obj sharkey)) + (nav-control-method-11 (-> obj nav) (-> obj nav target-pos)) (let* ((f0-0 (vector-vector-xz-distance (-> obj collide-info trans) (-> obj nav target-pos))) (f30-0 (/ (- (fmin (-> obj y-max) (-> obj nav target-pos y)) (-> obj collide-info trans y)) f0-0)) ) @@ -95,7 +95,7 @@ nav-enemy-default-event-handler (none) ) -(defmethod TODO-RENAME-37 sharkey ((obj sharkey)) +(defmethod nav-enemy-method-37 sharkey ((obj sharkey)) (let ((s5-0 (new 'stack-no-clear 'vector))) (when (< 8192.0 (vector-length (-> obj nav travel))) (vector-normalize-copy! s5-0 (-> obj nav travel) 1.0) @@ -108,7 +108,7 @@ nav-enemy-default-event-handler (none) ) -(defmethod dummy-41 sharkey ((obj sharkey)) +(defmethod nav-enemy-method-41 sharkey ((obj sharkey)) (let* ((f0-1 (- (-> obj target-speed) (-> obj momentum-speed))) (f1-3 (fmin (* (-> obj acceleration) (-> *display* seconds-per-frame)) (fabs f0-1))) ) @@ -138,12 +138,12 @@ nav-enemy-default-event-handler ) (set-vector! (-> obj draw color-mult) f0-2 f0-2 f0-2 1.0) ) - (dummy-10 (-> obj water)) + (water-control-method-10 (-> obj water)) (let ((f28-0 (-> obj collide-info trans y))) (when (or (and (< f30-0 f28-0) (>= f30-0 (-> obj last-y))) (and (>= f30-0 f28-0) (< f30-0 (-> obj last-y)))) (set! (-> s5-0 quad) (-> obj collide-info trans quad)) (set! (-> s5-0 y) f30-0) - (dummy-13 (-> obj water) 1.0 s5-0 1 (-> obj collide-info transv)) + (create-splash (-> obj water) 1.0 s5-0 1 (-> obj collide-info transv)) ) (set! (-> obj last-y) f28-0) ) @@ -205,10 +205,7 @@ nav-enemy-default-event-handler ) (set! (-> self collide-info trans quad) (-> self spawn-point quad)) (forward-up->quaternion (-> self collide-info quat) (-> self dir) *up-vector*) - (let ((f0-6 0.0)) - (set! (-> self momentum-speed) f0-6) - f0-6 - ) + (set! (-> self momentum-speed) 0.0) ) (defstate nav-enemy-idle (sharkey) @@ -239,11 +236,11 @@ nav-enemy-default-event-handler ) ) ((sharkey-notice-player?) - (when (zero? (logand (-> self nav-enemy-flags) (nav-enemy-flags navenmf0))) + (when (not (logtest? (-> self nav-enemy-flags) (nav-enemy-flags navenmf0))) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf0)) (set! (-> self notice-time) (-> *display* base-frame-counter)) ) - (let ((a0-4 (dummy-16 (-> self nav) (-> *target* control trans)))) + (let ((a0-4 (nav-control-method-16 (-> self nav) (-> *target* control trans)))) (when (or (and a0-4 (logtest? (-> a0-4 pat) 2)) (and (logtest? (-> self draw status) (draw-status hidden)) (>= (- (-> *display* base-frame-counter) (-> self notice-time)) (-> self reaction-time)) @@ -271,7 +268,7 @@ nav-enemy-default-event-handler (ja :num! (loop! (-> self anim-speed))) (seek! (-> self anim-speed) 1.0 0.05) (seek! (-> self collide-info trans y) (-> self y-min) (* (-> self y-speed) (-> *display* seconds-per-frame))) - (dummy-10 (-> self water)) + (water-control-method-10 (-> self water)) (ja-post) (suspend) ) @@ -551,7 +548,7 @@ nav-enemy-default-event-handler nav-enemy-default-event-handler ) :trans (behavior () - (if (TODO-RENAME-46 self (-> self nav-info notice-distance)) + (if (target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) ) (if (>= (- (-> *display* base-frame-counter) (-> self state-time)) (-> self state-timeout)) @@ -670,7 +667,7 @@ nav-enemy-default-event-handler ) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *sharkey-sg* '()) - (TODO-RENAME-45 obj *sharkey-nav-enemy-info*) + (init-defaults! obj *sharkey-nav-enemy-info*) (logclear! (-> obj mask) (process-mask actor-pause)) (set! (-> obj water) (new 'process 'water-control obj 3 12288.0 8192.0 2048.0)) (set! (-> obj water flags) (water-flags wt01 wt22 wt23)) @@ -696,7 +693,3 @@ nav-enemy-default-event-handler (go (method-of-object obj nav-enemy-idle)) (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/tippy.gc b/goal_src/jak1/engine/common-obs/tippy.gc index 9a343edd29..eb84341012 100644 --- a/goal_src/jak1/engine/common-obs/tippy.gc +++ b/goal_src/jak1/engine/common-obs/tippy.gc @@ -20,7 +20,7 @@ :flag-assert #xb0000003c (:methods (reset! (_type_ process-drawable float float) none 9) - (TODO-RENAME-10 (_type_ process-drawable vector) symbol 10) + (tippy-method-10 (_type_ process-drawable vector) symbol 10) ) ) @@ -36,7 +36,7 @@ (none) ) -(defmethod TODO-RENAME-10 tippy ((obj tippy) (arg0 process-drawable) (arg1 vector)) +(defmethod tippy-method-10 tippy ((obj tippy) (arg0 process-drawable) (arg1 vector)) (let ((s4-0 #t)) (cond (arg1 @@ -70,7 +70,3 @@ s4-0 ) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/water-anim.gc b/goal_src/jak1/engine/common-obs/water-anim.gc index 7caf76b0d7..37cafa99a3 100644 --- a/goal_src/jak1/engine/common-obs/water-anim.gc +++ b/goal_src/jak1/engine/common-obs/water-anim.gc @@ -288,225 +288,223 @@ (define *water-anim-look* - (the-as (array water-anim-look) - (new 'static 'boxed-array :type water-anim-look - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-big-room-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 70 :fo-max 80) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-first-room-from-entrance-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 50 :fo-max 60) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-qbert-room-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 48 :fo-max 58) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-first-right-branch-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 30 :fo-max 40) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-circular-with-bullys-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 15 :fo-max 25) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-hall-with-one-whirlpool-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 27 :fo-max 37) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-hall-with-three-whirlpools-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 26 :fo-max 36) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-start-of-helix-slide-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 25 :fo-max 35) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-room-above-exit-chamber-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 45 :fo-max 55) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-hall-before-big-room-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 20 :fo-max 30) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-dark-eco-qbert-sg* - :anim 6 - :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 40 :fo-max 50) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-short-piece-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 20 :fo-max 30) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-big-room-upper-water-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 27 :fo-max 37) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-dark-eco-platform-room-sg* - :anim 6 - :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 22 :fo-max 32) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-maincave-water-with-crystal-sg* - :anim 2 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-maincave-center-pool-sg* - :anim 10 - :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 70 :fo-max 80) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-maincave-lower-right-pool-sg* - :anim 10 - :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 40 :fo-max 50) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-maincave-mid-right-pool-sg* - :anim 10 - :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 37 :fo-max 47) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-maincave-lower-left-pool-sg* - :anim 10 - :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 20 :fo-max 30) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-maincave-mid-left-pool-sg* - :anim 10 - :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 51 :fo-max 61) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-robocave-main-pool-sg* - :anim 3 - :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 54 :fo-max 64) - ) - (new 'static 'water-anim-look :skel-group '*water-anim-misty-mud-by-arena-sg* :anim 24 :ambient-sound-spec #f) - (new 'static 'water-anim-look - :skel-group '*water-anim-misty-mud-above-skeleton-sg* - :anim 24 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-misty-mud-behind-skeleton-sg* - :anim 24 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-misty-mud-above-skull-back-sg* - :anim 24 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-misty-mud-above-skull-front-sg* - :anim 24 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-misty-mud-other-near-skull-sg* - :anim 24 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-misty-mud-near-skull-sg* - :anim 24 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-misty-mud-under-spine-sg* - :anim 24 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look :skel-group '*water-anim-misty-mud-by-dock-sg* :anim 24 :ambient-sound-spec #f) - (new 'static 'water-anim-look - :skel-group '*water-anim-misty-mud-island-near-dock-sg* - :anim 24 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-misty-mud-lonely-island-sg* - :anim 24 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-misty-dark-eco-pool-sg* - :anim 24 - :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 17 :fo-max 27) - ) - (new 'static 'water-anim-look :skel-group '*water-anim-ogre-lava-sg* :anim 2 :ambient-sound-spec #f) - (new 'static 'water-anim-look :skel-group '*water-anim-jungle-river-sg* :anim 3 :ambient-sound-spec #f) - (new 'static 'water-anim-look :skel-group '*water-anim-village3-lava-sg* :anim 3 :ambient-sound-spec #f) - (new 'static 'water-anim-look :skel-group '*water-anim-training-lake-sg* :anim 2 :ambient-sound-spec #f) - (new 'static 'water-anim-look - :skel-group '*water-anim-darkcave-water-with-crystal-sg* - :anim 2 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look :skel-group '*water-anim-rolling-water-back-sg* :anim 4 :ambient-sound-spec #f) - (new 'static 'water-anim-look :skel-group '*water-anim-rolling-water-front-sg* :anim 4 :ambient-sound-spec #f) - (new 'static 'water-anim-look - :skel-group '*water-anim-sunken-dark-eco-helix-room-sg* - :anim 6 - :ambient-sound-spec (static-sound-spec "helix-dark-eco" :fo-min 120 :fo-max 130) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-finalboss-dark-eco-pool-sg* - :anim 2 - :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 19 :fo-max 29) - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-lavatube-energy-lava-sg* - :anim 2 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look :skel-group '*water-anim-village1-rice-paddy-sg* :anim 8 :ambient-sound-spec #f) - (new 'static 'water-anim-look :skel-group '*water-anim-village1-fountain-sg* :anim 8 :ambient-sound-spec #f) - (new 'static 'water-anim-look - :skel-group '*water-anim-village1-rice-paddy-mid-sg* - :anim 8 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look - :skel-group '*water-anim-village1-rice-paddy-top-sg* - :anim 8 - :ambient-sound-spec #f - ) - (new 'static 'water-anim-look :skel-group '*water-anim-village2-bucket-sg* :anim 2 :ambient-sound-spec #f) + (new 'static 'boxed-array :type water-anim-look + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-big-room-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 70 :fo-max 80) ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-first-room-from-entrance-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 50 :fo-max 60) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-qbert-room-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 48 :fo-max 58) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-first-right-branch-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 30 :fo-max 40) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-circular-with-bullys-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 15 :fo-max 25) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-hall-with-one-whirlpool-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 27 :fo-max 37) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-hall-with-three-whirlpools-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 26 :fo-max 36) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-start-of-helix-slide-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 25 :fo-max 35) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-room-above-exit-chamber-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 45 :fo-max 55) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-hall-before-big-room-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 20 :fo-max 30) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-dark-eco-qbert-sg* + :anim 6 + :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 40 :fo-max 50) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-short-piece-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 20 :fo-max 30) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-big-room-upper-water-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "water-loop" :fo-min 27 :fo-max 37) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-dark-eco-platform-room-sg* + :anim 6 + :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 22 :fo-max 32) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-maincave-water-with-crystal-sg* + :anim 2 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-maincave-center-pool-sg* + :anim 10 + :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 70 :fo-max 80) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-maincave-lower-right-pool-sg* + :anim 10 + :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 40 :fo-max 50) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-maincave-mid-right-pool-sg* + :anim 10 + :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 37 :fo-max 47) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-maincave-lower-left-pool-sg* + :anim 10 + :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 20 :fo-max 30) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-maincave-mid-left-pool-sg* + :anim 10 + :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 51 :fo-max 61) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-robocave-main-pool-sg* + :anim 3 + :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 54 :fo-max 64) + ) + (new 'static 'water-anim-look :skel-group '*water-anim-misty-mud-by-arena-sg* :anim 24 :ambient-sound-spec #f) + (new 'static 'water-anim-look + :skel-group '*water-anim-misty-mud-above-skeleton-sg* + :anim 24 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-misty-mud-behind-skeleton-sg* + :anim 24 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-misty-mud-above-skull-back-sg* + :anim 24 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-misty-mud-above-skull-front-sg* + :anim 24 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-misty-mud-other-near-skull-sg* + :anim 24 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-misty-mud-near-skull-sg* + :anim 24 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-misty-mud-under-spine-sg* + :anim 24 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look :skel-group '*water-anim-misty-mud-by-dock-sg* :anim 24 :ambient-sound-spec #f) + (new 'static 'water-anim-look + :skel-group '*water-anim-misty-mud-island-near-dock-sg* + :anim 24 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-misty-mud-lonely-island-sg* + :anim 24 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-misty-dark-eco-pool-sg* + :anim 24 + :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 17 :fo-max 27) + ) + (new 'static 'water-anim-look :skel-group '*water-anim-ogre-lava-sg* :anim 2 :ambient-sound-spec #f) + (new 'static 'water-anim-look :skel-group '*water-anim-jungle-river-sg* :anim 3 :ambient-sound-spec #f) + (new 'static 'water-anim-look :skel-group '*water-anim-village3-lava-sg* :anim 3 :ambient-sound-spec #f) + (new 'static 'water-anim-look :skel-group '*water-anim-training-lake-sg* :anim 2 :ambient-sound-spec #f) + (new 'static 'water-anim-look + :skel-group '*water-anim-darkcave-water-with-crystal-sg* + :anim 2 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look :skel-group '*water-anim-rolling-water-back-sg* :anim 4 :ambient-sound-spec #f) + (new 'static 'water-anim-look :skel-group '*water-anim-rolling-water-front-sg* :anim 4 :ambient-sound-spec #f) + (new 'static 'water-anim-look + :skel-group '*water-anim-sunken-dark-eco-helix-room-sg* + :anim 6 + :ambient-sound-spec (static-sound-spec "helix-dark-eco" :fo-min 120 :fo-max 130) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-finalboss-dark-eco-pool-sg* + :anim 2 + :ambient-sound-spec (static-sound-spec "darkeco-pool" :fo-min 19 :fo-max 29) + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-lavatube-energy-lava-sg* + :anim 2 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look :skel-group '*water-anim-village1-rice-paddy-sg* :anim 8 :ambient-sound-spec #f) + (new 'static 'water-anim-look :skel-group '*water-anim-village1-fountain-sg* :anim 8 :ambient-sound-spec #f) + (new 'static 'water-anim-look + :skel-group '*water-anim-village1-rice-paddy-mid-sg* + :anim 8 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look + :skel-group '*water-anim-village1-rice-paddy-top-sg* + :anim 8 + :ambient-sound-spec #f + ) + (new 'static 'water-anim-look :skel-group '*water-anim-village2-bucket-sg* :anim 2 :ambient-sound-spec #f) ) ) (defstate water-vol-idle (water-anim) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'move-to) - (set! (-> self root trans quad) (-> (the-as vector (-> arg3 param 0)) quad)) - (set! (-> self water-height) (-> self root trans y)) - (if (nonzero? (-> self sound)) - (update-trans! (-> self sound) (-> self root trans)) - ) - (let ((v0-0 (logclear (-> self mask) (process-mask sleep-code)))) - (set! (-> self mask) v0-0) - v0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('move-to) + (set! (-> self root trans quad) (-> (the-as vector (-> event param 0)) quad)) + (set! (-> self water-height) (-> self root trans y)) + (if (nonzero? (-> self sound)) + (update-trans! (-> self sound) (-> self root trans)) + ) + (let ((v0-0 (logclear (-> self mask) (process-mask sleep-code)))) + (set! (-> self mask) v0-0) + v0-0 + ) + ) + ) + ) ) :trans (behavior () (let ((t9-0 (-> (method-of-type water-vol water-vol-idle) trans))) @@ -541,7 +539,7 @@ (none) ) -(defmethod TODO-RENAME-25 water-anim ((obj water-anim)) +(defmethod water-vol-method-25 water-anim ((obj water-anim)) (local-vars (sv-16 res-tag)) (set! (-> obj play-ambient-sound?) #t) (set! (-> obj look) (res-lump-value (-> obj entity) 'look int :default (the-as uint128 -1))) @@ -561,7 +559,7 @@ (none) ) -(defmethod TODO-RENAME-22 water-anim ((obj water-anim)) +(defmethod water-vol-method-22 water-anim ((obj water-anim)) (let ((s5-0 (-> obj look))) (if (or (< s5-0 0) (>= s5-0 (-> *water-anim-look* length))) (go process-drawable-art-error "skel group") @@ -600,7 +598,3 @@ (ja-post) (none) ) - - - - diff --git a/goal_src/jak1/engine/common-obs/water-h.gc b/goal_src/jak1/engine/common-obs/water-h.gc index 638494a32d..5aa0127b6a 100644 --- a/goal_src/jak1/engine/common-obs/water-h.gc +++ b/goal_src/jak1/engine/common-obs/water-h.gc @@ -85,14 +85,14 @@ :flag-assert #x110000011c (:methods (new (symbol type process int float float float) _type_ 0) - (dummy-9 (_type_) none 9) - (dummy-10 (_type_) none 10) + (water-control-method-9 (_type_) none 9) + (water-control-method-10 (_type_) none 10) (start-bobbing! (_type_ float int int) none 11) (distance-from-surface (_type_) float 12) - (dummy-13 (_type_ float vector int vector) none 13) + (create-splash (_type_ float vector int vector) none 13) (display-water-marks? (_type_) symbol 14) - (TODO-RENAME-15 (_type_) none 15) - (TODO-RENAME-16 (_type_) none 16) + (water-control-method-15 (_type_) none 15) + (water-control-method-16 (_type_) none 16) ) ) @@ -136,20 +136,13 @@ (:methods (water-vol-idle () _type_ :state 20) (water-vol-startup () _type_ :state 21) - (TODO-RENAME-22 (_type_) none 22) + (water-vol-method-22 (_type_) none 22) (reset-root! (_type_) none 23) (set-stack-size! (_type_) none 24) - (TODO-RENAME-25 (_type_) none 25) - (TODO-RENAME-26 (_type_) none 26) - (dummy-27 (_type_) none 27) + (water-vol-method-25 (_type_) none 25) + (update! (_type_) none 26) + (on-exit-water (_type_) none 27) (get-ripple-height (_type_ vector) float 28) - (TODO-RENAME-29 (_type_) none 29) + (init! (_type_) none 29) ) ) - - -0 - - - - diff --git a/goal_src/jak1/engine/common-obs/water.gc b/goal_src/jak1/engine/common-obs/water.gc index d77d7998d0..bb77a80681 100644 --- a/goal_src/jak1/engine/common-obs/water.gc +++ b/goal_src/jak1/engine/common-obs/water.gc @@ -247,7 +247,7 @@ (defpartgroup group-part-water-splash :id 40 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 -12 0 14) :parts ((sp-item 124 :flags (is-3d) :period 900 :length 63) @@ -285,7 +285,7 @@ (defpartgroup group-part-water-splash-small :id 41 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 -12 0 14) :parts ((sp-item 124 :flags (is-3d) :period 900 :length 63) @@ -623,16 +623,16 @@ ) ) -(defmethod dummy-9 water-control ((obj water-control)) +(defmethod water-control-method-9 water-control ((obj water-control)) 0 (none) ) -(defmethod dummy-10 water-control ((obj water-control)) +(defmethod water-control-method-10 water-control ((obj water-control)) (with-pp (let ((s5-0 (-> obj flags))) (cond - ((zero? (logand (-> obj flags) (water-flags wt01))) + ((not (logtest? (-> obj flags) (water-flags wt01))) (logclear! (-> obj flags) (water-flags wt09 wt10 wt11 wt12 wt13 wt14 wt16)) ) ((and (logtest? (water-flags wt21) (-> obj flags)) @@ -650,13 +650,13 @@ (set! (-> obj bob-offset) (update! (-> obj bob))) (cond ((and (logtest? (-> obj flags) (water-flags wt08)) - (zero? (logand (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) + (not (logtest? (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) (collide-action ca-9) ) - ) + ) ) (set! (-> obj real-ocean-offset) (- (ocean-get-height (the-as vector (-> obj bottom))) (-> obj base-height))) - (if (zero? (logand (-> obj flags) (water-flags wt09))) + (if (not (logtest? (-> obj flags) (water-flags wt09))) (set! (-> obj ocean-offset) (-> obj real-ocean-offset)) (set! (-> obj ocean-offset) (lerp (-> obj ocean-offset) (-> obj real-ocean-offset) 0.2)) ) @@ -666,7 +666,7 @@ (f30-0 (ripple-find-height (the-as process-drawable a0-26) 0 (the-as vector (-> obj bottom)))) ) (set! (-> obj real-ocean-offset) (- f30-0 (-> obj base-height))) - (if (zero? (logand (-> obj flags) (water-flags wt09))) + (if (not (logtest? (-> obj flags) (water-flags wt09))) (set! (-> obj ocean-offset) (-> obj real-ocean-offset)) (set! (-> obj ocean-offset) (lerp (-> obj ocean-offset) (-> obj real-ocean-offset) 0.2)) ) @@ -699,8 +699,8 @@ (set! (-> obj drip-wetness) 1.0) (set! (-> obj drip-height) (fmax (- (-> obj surface-height) (-> obj bottom 0 y)) (-> obj drip-height))) (set! (-> obj drip-speed) 15.0) - (if (zero? (logand (-> obj flags) (water-flags wt09))) - (TODO-RENAME-15 obj) + (if (not (logtest? (-> obj flags) (water-flags wt09))) + (water-control-method-15 obj) ) (cond ((>= (-> obj top 0 y) (-> obj height)) @@ -733,7 +733,7 @@ ) ) (if (< (-> obj top 1 y) (-> obj height)) - (dummy-13 obj 0.2 s4-0 1 (-> obj process root transv)) + (create-splash obj 0.2 s4-0 1 (-> obj process root transv)) ) ) ) @@ -774,8 +774,8 @@ ) (if (and (logtest? (-> obj flags) (water-flags wt04)) (and s4-3 - (zero? (logand (-> (the-as collide-shape-moving (-> obj process root)) status) (cshape-moving-flags on-water)) - ) + (not (logtest? (-> (the-as collide-shape-moving (-> obj process root)) status) (cshape-moving-flags on-water)) + ) ) ) (set! (-> obj bob amp) (* 0.8 (-> obj bob amp))) @@ -786,7 +786,7 @@ (>= f30-3 (-> obj bottom 0 y)) (and (logtest? s5-0 (water-flags wt11)) (logtest? (-> (the-as collide-shape-moving (-> obj process root)) status) (cshape-moving-flags tsurf)) - (zero? (logand (-> (the-as collide-shape-moving (-> obj process root)) status) (cshape-moving-flags onsurf))) + (not (logtest? (-> (the-as collide-shape-moving (-> obj process root)) status) (cshape-moving-flags onsurf))) (>= (+ 204.8 f30-3) (-> obj bottom 0 y)) ) ) @@ -801,21 +801,21 @@ (set! (-> obj swim-time) (-> *display* base-frame-counter)) (send-event (-> obj process) 'swim) (logior! (-> obj flags) (water-flags wt11)) - (if (zero? (logand s5-0 (water-flags wt11))) + (if (not (logtest? s5-0 (water-flags wt11))) (set! (-> obj enter-swim-time) (-> *display* base-frame-counter)) ) (cond ((and (logtest? (-> obj flags) (water-flags wt04)) (logtest? (-> (the-as collide-shape-moving (-> obj process root)) status) (cshape-moving-flags tsurf)) - (zero? (logand (water-flags wt16) (-> obj flags))) + (not (logtest? (water-flags wt16) (-> obj flags))) ) (let ((v1-200 (new 'stack-no-clear 'vector))) (set! (-> v1-200 quad) (-> obj bottom 0 quad)) (set! (-> v1-200 y) (- (-> obj height) (-> obj swim-height))) (let ((s4-4 (-> obj process root))) - (when (and (zero? (logand (-> (the-as collide-shape-moving s4-4) status) (cshape-moving-flags csmf12))) + (when (and (not (logtest? (-> (the-as collide-shape-moving s4-4) status) (cshape-moving-flags csmf12))) (logtest? (-> obj flags) (water-flags wt11)) - (zero? (logand (-> (the-as collide-shape-moving s4-4) root-prim prim-core action) (collide-action ca-9))) + (not (logtest? (-> (the-as collide-shape-moving s4-4) root-prim prim-core action) (collide-action ca-9))) ) (let ((a1-27 (vector-! (new 'stack-no-clear 'vector) v1-200 (-> s4-4 trans)))) (vector-float*! a1-27 a1-27 (-> *display* frames-per-second)) @@ -826,7 +826,7 @@ ) ) ) - ((and (< (-> obj bottom 0 y) f30-3) (zero? (logand (water-flags wt16) (-> obj flags)))) + ((and (< (-> obj bottom 0 y) f30-3) (not (logtest? (water-flags wt16) (-> obj flags)))) (logior! (-> obj flags) (water-flags wt12)) ) ) @@ -856,7 +856,7 @@ (set! (-> a1-30 quad) (-> obj bottom 0 quad)) (let ((s5-1 (-> obj process root))) (set! (-> a1-30 y) f30-3) - (when (zero? (logand (-> (the-as collide-shape-moving s5-1) root-prim prim-core action) (collide-action ca-9))) + (when (not (logtest? (-> (the-as collide-shape-moving s5-1) root-prim prim-core action) (collide-action ca-9))) (let ((f30-4 (-> (the-as collide-shape-moving s5-1) ground-impact-vel))) (move-to-ground-point! (the-as collide-shape-moving s5-1) a1-30 (-> s5-1 transv) *up-vector*) (logior! (-> (the-as collide-shape-moving s5-1) status) (cshape-moving-flags on-water)) @@ -871,17 +871,17 @@ (when (and (logtest? (-> (the-as collide-shape-moving (-> obj process root)) status) (cshape-moving-flags onsurf on-water) ) - (zero? (logand (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) + (not (logtest? (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) (collide-action ca-9) ) - ) + ) ) (when (< (-> obj process root trans y) -409.6) (send-event (-> obj process) 'no-look-around (seconds 1.5)) - (when (zero? (logand (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) + (when (not (logtest? (-> (the-as collide-shape-moving (-> obj process root)) root-prim prim-core action) (collide-action ca-14) ) - ) + ) (cond ((= (-> obj process type) target) (send-event @@ -919,13 +919,13 @@ ) (else (if (logtest? (-> obj flags) (water-flags wt09)) - (TODO-RENAME-16 obj) + (water-control-method-16 obj) ) ) ) ) - (when (not (or (zero? (logand (-> obj flags) (water-flags wt06))) - (zero? (logand (water-flags wt23) (-> obj flags))) + (when (not (or (not (logtest? (-> obj flags) (water-flags wt06))) + (not (logtest? (water-flags wt23) (-> obj flags))) (= (-> obj drip-wetness) 0.0) ) ) @@ -1072,7 +1072,7 @@ (none) ) -(defmethod TODO-RENAME-15 water-control ((obj water-control)) +(defmethod water-control-method-15 water-control ((obj water-control)) (with-pp (logior! (-> obj flags) (water-flags wt09)) (logclear! (-> obj flags) (water-flags wt16)) @@ -1088,9 +1088,9 @@ (f30-0 (lerp-scale 0.3 1.0 f0-4 2048.0 24576.0)) ) (if (nonzero? (-> obj process skel effect)) - (dummy-10 (-> obj process skel effect) 'swim-stroke 0.0 -1) + (effect-control-method-10 (-> obj process skel effect) 'swim-stroke 0.0 -1) ) - (dummy-13 obj f30-0 (-> obj enter-water-pos) 1 (-> obj process root transv)) + (create-splash obj f30-0 (-> obj enter-water-pos) 1 (-> obj process root transv)) ) ) ) @@ -1102,7 +1102,7 @@ ) ) -(defmethod TODO-RENAME-16 water-control ((obj water-control)) +(defmethod water-control-method-16 water-control ((obj water-control)) (logclear! (-> obj flags) (water-flags wt09)) (set-zero! (-> obj bob)) (if (logtest? (water-flags wt17) (-> obj flags)) @@ -1131,7 +1131,7 @@ (none) ) -(defmethod dummy-13 water-control ((obj water-control) (arg0 float) (arg1 vector) (arg2 int) (arg3 vector)) +(defmethod create-splash water-control ((obj water-control) (arg0 float) (arg1 vector) (arg2 int) (arg3 vector)) (when (and (logtest? (-> obj flags) (water-flags wt05)) (logtest? (water-flags wt23) (-> obj flags))) (let ((a1-3 (vector+float*! (new 'stack-no-clear 'vector) arg1 arg3 0.05))) (set! (-> a1-3 y) (-> obj surface-height)) @@ -1142,7 +1142,7 @@ (none) ) -(defmethod dummy-27 water-vol ((obj water-vol)) +(defmethod on-exit-water water-vol ((obj water-vol)) (when (handle->process (-> obj target)) (let ((v1-7 (-> (the-as target (-> obj target process 0)) water))) (logclear! (-> v1-7 flags) (water-flags wt01 wt02 wt03 wt08 wt17 wt18 wt19 wt20 wt21 wt23 wt24 wt25 wt26)) @@ -1165,12 +1165,12 @@ (none) ) -(defmethod TODO-RENAME-26 water-vol ((obj water-vol)) +(defmethod update! water-vol ((obj water-vol)) (cond ((handle->process (-> obj target)) (cond - ((not (dummy-10 (-> obj vol) (-> (the-as target (-> obj target process 0)) control trans))) - (dummy-27 obj) + ((not (point-in-vol? (-> obj vol) (-> (the-as target (-> obj target process 0)) control trans))) + (on-exit-water obj) ) (else (let ((v1-15 (-> (the-as target (-> obj target process 0)) water))) @@ -1202,8 +1202,9 @@ ) ) ) - ((and *target* - (and (not (handle->process (-> *target* water volume))) (dummy-10 (-> obj vol) (-> *target* control trans))) + ((and *target* (and (not (handle->process (-> *target* water volume))) + (point-in-vol? (-> obj vol) (-> *target* control trans)) + ) ) (let ((s5-0 (-> *target* water))) (process-entity-status! obj (entity-perm-status bit-3) #t) @@ -1240,20 +1241,20 @@ (defstate water-vol-idle (water-vol) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (if (= v1-0 'update) - (TODO-RENAME-26 self) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('update) + (update! self) + ) + ) + ) ) :exit (behavior () - (dummy-27 self) + (on-exit-water self) (none) ) :trans (behavior () - (TODO-RENAME-26 self) + (update! self) (none) ) :code (the-as (function none :behavior water-vol) anim-loop) @@ -1269,12 +1270,12 @@ (none) ) -(defmethod TODO-RENAME-25 water-vol ((obj water-vol)) +(defmethod water-vol-method-25 water-vol ((obj water-vol)) 0 (none) ) -(defmethod TODO-RENAME-29 water-vol ((obj water-vol)) +(defmethod init! water-vol ((obj water-vol)) (local-vars (sv-16 res-tag)) (set! (-> obj attack-event) (the-as symbol ((method-of-type res-lump get-property-struct) (-> obj entity) @@ -1334,7 +1335,7 @@ (none) ) -(defmethod TODO-RENAME-22 water-vol ((obj water-vol)) +(defmethod water-vol-method-22 water-vol ((obj water-vol)) 0 (none) ) @@ -1343,9 +1344,9 @@ (set! (-> self entity) arg0) (set-stack-size! self) (reset-root! self) - (TODO-RENAME-29 self) - (TODO-RENAME-25 self) - (TODO-RENAME-22 self) + (init! self) + (water-vol-method-25 self) + (water-vol-method-22 self) (go-virtual water-vol-startup) (none) ) @@ -1353,13 +1354,9 @@ (defmethod init-from-entity! water-vol ((obj water-vol) (arg0 entity-actor)) (set-stack-size! obj) (reset-root! obj) - (TODO-RENAME-29 obj) - (TODO-RENAME-25 obj) - (TODO-RENAME-22 obj) + (init! obj) + (water-vol-method-25 obj) + (water-vol-method-22 obj) (go (method-of-object obj water-vol-startup)) (none) ) - - - - diff --git a/goal_src/jak1/engine/debug/stats-h.gc b/goal_src/jak1/engine/debug/stats-h.gc index c34a9f6879..2a21698224 100644 --- a/goal_src/jak1/engine/debug/stats-h.gc +++ b/goal_src/jak1/engine/debug/stats-h.gc @@ -5,52 +5,53 @@ ;; name in dgo: stats-h ;; dgos: GAME, ENGINE -;; definition of type tr-stat +;; DECOMP BEGINS + (deftype tr-stat (structure) - ((groups uint16 :offset-assert 0) - (fragments uint16 :offset-assert 2) - (tris uint32 :offset-assert 4) - (dverts uint32 :offset-assert 8) - (instances uint16 :offset-assert 12) - (pad uint16 :offset-assert 14) + ((groups uint16 :offset-assert 0) + (fragments uint16 :offset-assert 2) + (tris uint32 :offset-assert 4) + (dverts uint32 :offset-assert 8) + (instances uint16 :offset-assert 12) + (pad uint16 :offset-assert 14) ) :method-count-assert 9 :size-assert #x10 :flag-assert #x900000010 ) -;; definition of type merc-global-stats + (deftype merc-global-stats (structure) - ((merc tr-stat :inline :offset-assert 0) - (mercneric tr-stat :inline :offset-assert 16) + ((merc tr-stat :inline :offset-assert 0) + (mercneric tr-stat :inline :offset-assert 16) ) :method-count-assert 9 :size-assert #x20 :flag-assert #x900000020 ) -;; definition of type perf-stat + (deftype perf-stat (structure) - ((frame-number uint32 :offset-assert 0) - (count uint32 :offset-assert 4) - (cycles uint32 :offset-assert 8) - (instructions uint32 :offset-assert 12) - (icache uint32 :offset-assert 16) - (dcache uint32 :offset-assert 20) - (select uint32 :offset-assert 24) - (ctrl uint32 :offset-assert 28) - (accum0 uint32 :offset-assert 32) - (accum1 uint32 :offset-assert 36) - (to-vu0-waits uint32 :offset-assert 40) - (to-spr-waits uint32 :offset-assert 44) - (from-spr-waits uint32 :offset-assert 48) + ((frame-number uint32 :offset-assert 0) + (count uint32 :offset-assert 4) + (cycles uint32 :offset-assert 8) + (instructions uint32 :offset-assert 12) + (icache uint32 :offset-assert 16) + (dcache uint32 :offset-assert 20) + (select uint32 :offset-assert 24) + (ctrl uint32 :offset-assert 28) + (accum0 uint32 :offset-assert 32) + (accum1 uint32 :offset-assert 36) + (to-vu0-waits uint32 :offset-assert 40) + (to-spr-waits uint32 :offset-assert 44) + (from-spr-waits uint32 :offset-assert 48) ) :pack-me :method-count-assert 14 :size-assert #x34 :flag-assert #xe00000034 (:methods - (dummy-9 (_type_) none 9) + (perf-stat-method-9 (_type_) none 9) (print-to-stream (_type_ string basic) none 10) (reset! (_type_) none 11) (read! (_type_) none 12) @@ -58,15 +59,15 @@ ) ) -;; definition of type perf-stat-array + (deftype perf-stat-array (inline-array-class) - ((data perf-stat :inline :dynamic :offset-assert 16)) + ((data perf-stat :inline :dynamic :offset-assert 16) + ) :method-count-assert 9 :size-assert #x10 :flag-assert #x900000010 ) -;; failed to figure out what this is: (set! (-> perf-stat-array heap-base) (the-as uint 52)) (define *pc-perf-stat-counter* (the-as uint 0)) @@ -120,14 +121,14 @@ (defmethod update-wait-stats perf-stat ((obj perf-stat) (arg0 uint) (arg1 uint) (arg2 uint)) (when (nonzero? (-> obj ctrl)) - (set! (-> obj to-vu0-waits) (+ (-> obj to-vu0-waits) arg0)) - (set! (-> obj to-spr-waits) (+ (-> obj to-spr-waits) arg1)) - (set! (-> obj from-spr-waits) (+ (-> obj from-spr-waits) arg2)) - ) + (+! (-> obj to-vu0-waits) arg0) + (+! (-> obj to-spr-waits) arg1) + (+! (-> obj from-spr-waits) arg2) + ) + 0 (none) ) -;; failed to figure out what this is: (when (not *debug-segment*) (set! (-> perf-stat method-table 11) nothing) (set! (-> perf-stat method-table 12) nothing) diff --git a/goal_src/jak1/engine/entity/entity-h.gc b/goal_src/jak1/engine/entity/entity-h.gc index bc71c2c290..c711426a54 100644 --- a/goal_src/jak1/engine/entity/entity-h.gc +++ b/goal_src/jak1/engine/entity/entity-h.gc @@ -5,8 +5,12 @@ ;; name in dgo: entity-h ;; dgos: GAME, ENGINE +;; DECOMP BEGINS + (define *generate-actor-vis* #f) + (define *generate-actor-vis-start* #f) + (define *generate-actor-vis-output* #f) (deftype entity-perm (structure) @@ -34,6 +38,7 @@ ) ) + (deftype entity-links (structure) ((prev-link entity-links :offset-assert 0) (next-link entity-links :offset-assert 4) @@ -55,6 +60,7 @@ ) ) + (deftype entity-perm-array (inline-array-class) ((data entity-perm :inline :dynamic :offset-assert 16) ) @@ -62,6 +68,8 @@ :size-assert #x10 :flag-assert #x900000010 ) + + (set! (-> entity-perm-array heap-base) (the-as uint 16)) (deftype entity-links-array (inline-array-class) @@ -71,6 +79,8 @@ :size-assert #x10 :flag-assert #x900000010 ) + + (set! (-> entity-links-array heap-base) (the-as uint 64)) (deftype entity (res-lump) @@ -98,29 +108,33 @@ ) (deftype entity-ambient-data (structure) - ((user-object object 3 :offset-assert 0) - (function (function drawable-ambient vector none) :offset-assert 12) - (quad uint128 :offset 0) - (user-uint64 uint64 1 :offset 0) - (user-float float 3 :offset 0) - (user-int32 int32 3 :offset 0) - (user-uint32 uint32 3 :offset 0) - (user-int16 int16 6 :offset 0) - (user-uint16 uint16 6 :offset 0) - (user-int8 int8 12 :offset 0) - (user-uint8 uint8 12 :offset 0) + ((user-object object 3 :offset-assert 0) + (function (function drawable-ambient vector none) :offset-assert 12) + (quad uint128 :offset 0) + (user-uint64 uint64 1 :offset 0) + (user-float float 3 :offset 0) + (user-int32 int32 3 :offset 0) + (user-uint32 uint32 3 :offset 0) + (user-int16 int16 6 :offset 0) + (user-uint16 uint16 6 :offset 0) + (user-int8 int8 12 :offset 0) + (user-uint8 uint8 12 :offset 0) ) :method-count-assert 9 :size-assert #x10 :flag-assert #x900000010 ) + (deftype entity-ambient-data-array (inline-array-class) - ((data entity-ambient-data :inline :dynamic)) + ((data entity-ambient-data :inline :dynamic :offset-assert 16) + ) :method-count-assert 9 :size-assert #x10 :flag-assert #x900000010 ) + + (set! (-> entity-ambient-data-array heap-base) (the-as uint 16)) (deftype entity-ambient (entity) @@ -136,12 +150,12 @@ ) (deftype entity-actor (entity) - ((nav-mesh nav-mesh :offset-assert 52) - (etype type :offset-assert 56) - (task game-task :offset-assert 60) - (vis-id uint16 :offset-assert 62) - (vis-id-signed int16 :offset 62) ;; added - (quat quaternion :inline :offset-assert 64) + ((nav-mesh nav-mesh :offset-assert 52) + (etype type :offset-assert 56) + (task game-task :offset-assert 60) + (vis-id uint16 :offset-assert 62) + (vis-id-signed int16 :offset 62) ;; added + (quat quaternion :inline :offset-assert 64) ) :method-count-assert 31 :size-assert #x50 @@ -150,7 +164,7 @@ (next-actor (_type_) entity-actor 27) (prev-actor (_type_) entity-actor 28) (debug-print (_type_ symbol type) none 29) - (dummy-30 (_type_ entity-perm-status symbol) none 30) + (set-or-clear-status! (_type_ entity-perm-status symbol) none 30) ) ) diff --git a/goal_src/jak1/engine/entity/entity.gc b/goal_src/jak1/engine/entity/entity.gc index 2c5744e81e..3af0b77f32 100644 --- a/goal_src/jak1/engine/entity/entity.gc +++ b/goal_src/jak1/engine/entity/entity.gc @@ -1050,10 +1050,10 @@ (debug-draw (-> (the-as process-drawable s5-2) nav)) ) (if (nonzero? (-> (the-as process-drawable s5-2) path)) - (dummy-9 (-> (the-as process-drawable s5-2) path)) + (debug-draw (-> (the-as process-drawable s5-2) path)) ) (if (nonzero? (-> (the-as process-drawable s5-2) vol)) - (dummy-9 (-> (the-as process-drawable s5-2) vol)) + (init! (-> (the-as process-drawable s5-2) vol)) ) ) (if (and (the-as process-drawable s5-2) @@ -1108,10 +1108,10 @@ (debug-draw (-> arg0 nav)) ) (if (nonzero? (-> arg0 path)) - (dummy-9 (-> arg0 path)) + (debug-draw (-> arg0 path)) ) (if (nonzero? (-> arg0 vol)) - (dummy-9 (-> arg0 vol)) + (init! (-> arg0 vol)) ) ) (none) @@ -1857,7 +1857,7 @@ (none) ) -(defmethod dummy-30 entity-actor ((obj entity-actor) (arg0 entity-perm-status) (arg1 symbol)) +(defmethod set-or-clear-status! entity-actor ((obj entity-actor) (arg0 entity-perm-status) (arg1 symbol)) (let ((v1-0 (-> obj extra))) (if arg1 (logior! (-> v1-0 perm status) arg0) diff --git a/goal_src/jak1/engine/game/effect-control-h.gc b/goal_src/jak1/engine/game/effect-control-h.gc index f5a61b763f..0072e7d361 100644 --- a/goal_src/jak1/engine/game/effect-control-h.gc +++ b/goal_src/jak1/engine/game/effect-control-h.gc @@ -24,12 +24,12 @@ :flag-assert #xf00000024 (:methods (new (symbol type process-drawable) _type_ 0) - (TODO-RENAME-9 (_type_) none 9) - (dummy-10 (_type_ symbol float int) object 10) - (dummy-11 (_type_ symbol float int basic pat-surface) none 11) - (dummy-12 (_type_ symbol float int basic sound-name) int 12) + (effect-control-method-9 (_type_) none 9) + (effect-control-method-10 (_type_ symbol float int) object 10) + (effect-control-method-11 (_type_ symbol float int basic pat-surface) none 11) + (effect-control-method-12 (_type_ symbol float int basic sound-name) int 12) (set-channel-offset! (_type_ int) none 13) - (TODO-RENAME-14 (_type_ float float float) none 14) + (effect-control-method-14 (_type_ float float float) none 14) ) ) diff --git a/goal_src/jak1/engine/game/effect-control.gc b/goal_src/jak1/engine/game/effect-control.gc index 687d7c6add..876c4e0de0 100644 --- a/goal_src/jak1/engine/game/effect-control.gc +++ b/goal_src/jak1/engine/game/effect-control.gc @@ -129,7 +129,7 @@ arg0 ) -(defmethod TODO-RENAME-9 effect-control ((obj effect-control)) +(defmethod effect-control-method-9 effect-control ((obj effect-control)) (let* ((a0-1 (-> obj process skel)) (v1-3 (if (< (-> obj channel-offset) (-> a0-1 active-channels)) (-> a0-1 root-channel (-> obj channel-offset)) @@ -156,7 +156,7 @@ (if (and (-> obj name) (= (-> obj name 0 key-frame) -1000000000.0)) (set! (-> obj name) (&-> (-> obj name) 1)) ) - (TODO-RENAME-14 obj f30-0 f30-0 f30-0) + (effect-control-method-14 obj f30-0 f30-0 f30-0) ) ((or (not (-> obj name)) (= f30-0 (-> obj last-frame-num))) ) @@ -170,12 +170,12 @@ (cond ((< f26-0 f28-0) (if (>= f28-0 f0-6) - (TODO-RENAME-14 obj f26-0 f28-0 f30-0) + (effect-control-method-14 obj f26-0 f28-0 f30-0) ) ) (else (if (>= f0-6 f28-0) - (TODO-RENAME-14 obj f28-0 f26-0 f30-0) + (effect-control-method-14 obj f28-0 f26-0 f30-0) ) ) ) @@ -186,31 +186,31 @@ ((>= (-> v1-3 param 0) 0.0) (cond ((< f26-0 f28-0) - (TODO-RENAME-14 obj f28-0 9999999.0 f30-0) - (TODO-RENAME-14 obj -100000000.0 f26-0 9999999.0) + (effect-control-method-14 obj f28-0 9999999.0 f30-0) + (effect-control-method-14 obj -100000000.0 f26-0 9999999.0) ) (else - (TODO-RENAME-14 obj f28-0 f26-0 f30-0) + (effect-control-method-14 obj f28-0 f26-0 f30-0) ) ) ) ((< f28-0 f26-0) - (TODO-RENAME-14 obj f26-0 9999999.0 f30-0) - (TODO-RENAME-14 obj -100000000.0 f28-0 9999999.0) + (effect-control-method-14 obj f26-0 9999999.0 f30-0) + (effect-control-method-14 obj -100000000.0 f28-0 9999999.0) ) (else - (TODO-RENAME-14 obj f26-0 f28-0 f30-0) + (effect-control-method-14 obj f26-0 f28-0 f30-0) ) ) ) ((= a0-3 num-func-+!) (if (>= (-> v1-3 param 0) 0.0) - (TODO-RENAME-14 obj f28-0 f26-0 f30-0) - (TODO-RENAME-14 obj f26-0 f28-0 f30-0) + (effect-control-method-14 obj f28-0 f26-0 f30-0) + (effect-control-method-14 obj f26-0 f28-0 f30-0) ) ) ((= a0-3 num-func-identity) - (TODO-RENAME-14 obj f30-0 f30-0 f30-0) + (effect-control-method-14 obj f30-0 f30-0 f30-0) ) ) ) @@ -230,7 +230,7 @@ (none) ) -(defmethod TODO-RENAME-14 effect-control ((obj effect-control) (arg0 float) (arg1 float) (arg2 float)) +(defmethod effect-control-method-14 effect-control ((obj effect-control) (arg0 float) (arg1 float) (arg2 float)) ;; note: this check was added. I believe in the original game name could be false, and then the ;; effect-name check below would fail. This did not cause a crash on original hardware because ;; misaligned 16-byte loads silently align. This causes a crash in opengoal, so we skip it manually. @@ -240,7 +240,7 @@ (let ((f0-0 (-> s2-0 0 key-frame))) (when (or (and (< f0-0 arg1) (< arg0 f0-0)) (= f0-0 arg2)) (let* ((a0-1 obj) - (t9-0 (method-of-object a0-1 dummy-10)) + (t9-0 (method-of-object a0-1 effect-control-method-10)) (v1-7 (-> obj res)) (a1-1 (-> s2-0 0)) ) @@ -268,7 +268,7 @@ ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 364] ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 450] ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 469] -(defmethod dummy-10 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int)) +(defmethod effect-control-method-10 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int)) (local-vars (sv-160 int) (sv-176 symbol) @@ -333,7 +333,7 @@ ) ) ) - (dummy-11 obj arg0 arg1 s5-0 (-> obj res) (the-as pat-surface t1-1)) + (effect-control-method-11 obj arg0 arg1 s5-0 (-> obj res) (the-as pat-surface t1-1)) ) ) ((let ((v1-18 (symbol->string arg0))) @@ -353,7 +353,7 @@ (set! s3-0 (-> v0-5 0)) ) ) - (the-as (pointer sparticle-launch-group) s3-0) + s3-0 ) (else (-> (the-as (pointer sparticle-launch-group) s3-0) 0) @@ -407,7 +407,7 @@ (activate! *camera-smush-control* 819.2 37 600 1.0 0.995) ) ((zero? s3-0) - (dummy-12 obj arg0 arg1 s5-0 (-> obj res) (string->sound-name (symbol->string arg0))) + (effect-control-method-12 obj arg0 arg1 s5-0 (-> obj res) (string->sound-name (symbol->string arg0))) ) ((= (-> (the-as basic s3-0) type) sparticle-launcher) (if *debug-effect-control* @@ -518,7 +518,7 @@ ) (when (-> (the-as death-info s3-0) sound) (let* ((s2-5 obj) - (s1-3 (method-of-object s2-5 dummy-12)) + (s1-3 (method-of-object s2-5 effect-control-method-12)) (s0-3 (-> (the-as death-info s3-0) sound)) ) (set! sv-288 (-> obj res)) @@ -530,7 +530,7 @@ (send-event (-> obj process) 'death-start (the-as death-info s3-0)) ) (else - (dummy-12 obj arg0 arg1 s5-0 (-> obj res) (string->sound-name (symbol->string arg0))) + (effect-control-method-12 obj arg0 arg1 s5-0 (-> obj res) (string->sound-name (symbol->string arg0))) ) ) ) @@ -538,7 +538,7 @@ 0 ) -(defmethod dummy-11 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int) (arg3 basic) (arg4 pat-surface)) +(defmethod effect-control-method-11 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int) (arg3 basic) (arg4 pat-surface)) (local-vars (sv-48 (function sparticle-system sparticle-launcher vector sparticle-launch-state sparticle-launch-control float none) @@ -579,7 +579,7 @@ (('effect-land-poof) (when (< a0-4 9000) (let* ((a0-13 obj) - (t9-8 (method-of-object a0-13 dummy-10)) + (t9-8 (method-of-object a0-13 effect-control-method-10)) (v1-15 (-> arg4 material)) ) (t9-8 @@ -646,7 +646,7 @@ (('effect-run-poof) (when (< a0-4 9000) (let* ((a0-14 obj) - (t9-9 (method-of-object a0-14 dummy-10)) + (t9-9 (method-of-object a0-14 effect-control-method-10)) (v1-20 (-> arg4 material)) ) (t9-9 @@ -712,7 +712,7 @@ ) (('effect-just-footprint) (let* ((a0-15 obj) - (t9-10 (method-of-object a0-15 dummy-10)) + (t9-10 (method-of-object a0-15 effect-control-method-10)) (v1-24 (-> arg4 material)) ) (t9-10 @@ -778,7 +778,7 @@ (('effect-just-poof) (when (< a0-4 9000) (let* ((a0-16 obj) - (t9-11 (method-of-object a0-16 dummy-10)) + (t9-11 (method-of-object a0-16 effect-control-method-10)) (v1-29 (-> arg4 material)) ) (t9-11 @@ -844,7 +844,7 @@ ) (('effect-slide-poof) (let* ((a0-19 obj) - (t9-12 (method-of-object a0-19 dummy-10)) + (t9-12 (method-of-object a0-19 effect-control-method-10)) (v1-33 (-> arg4 material)) ) (t9-12 @@ -1050,14 +1050,14 @@ ) ) (if s1-0 - (dummy-12 obj arg0 arg1 arg2 arg3 s1-0) + (effect-control-method-12 obj arg0 arg1 arg2 arg3 s1-0) ) ) 0 (none) ) -(defmethod dummy-12 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int) (arg3 basic) (arg4 sound-name)) +(defmethod effect-control-method-12 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int) (arg3 basic) (arg4 sound-name)) (local-vars (sv-112 res-tag) (sv-128 sound-name) (sv-144 basic) (sv-160 (function vector vector float))) (set! sv-144 arg3) (let ((s0-0 arg4) @@ -1126,8 +1126,8 @@ (defbehavior target-land-effect target () (cond ((logtest? (-> self control root-prim prim-core action) (collide-action ca-14)) - (dummy-10 (-> self skel effect) 'effect-land-poof -1.0 -1) - (dummy-10 (-> self skel effect) 'effect-flut-land -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-land-poof -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-flut-land -1.0 -1) ) ((logtest? (-> self control root-prim prim-core action) (collide-action ca-9)) (sound-play-by-name @@ -1143,17 +1143,13 @@ ) ) ((logtest? (-> self water flags) (water-flags wt09)) - (dummy-10 (-> self skel effect) 'effect-land-water -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-land-water -1.0 -1) ) (else - (dummy-10 (-> self skel effect) 'effect-land-poof -1.0 -1) - (dummy-10 (-> self skel effect) 'effect-land -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-land-poof -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-land -1.0 -1) ) ) 0 (none) ) - - - - diff --git a/goal_src/jak1/engine/game/game-h.gc b/goal_src/jak1/engine/game/game-h.gc index 24c495f755..974ded9f2b 100644 --- a/goal_src/jak1/engine/game/game-h.gc +++ b/goal_src/jak1/engine/game/game-h.gc @@ -145,49 +145,49 @@ :size-assert #xb0 :flag-assert #x3f004000b0 (:methods - (dummy-20 () none 20) - (dummy-21 () none 21) - (dummy-22 () none 22) - (dummy-23 () none 23) - (dummy-24 () none 24) - (dummy-25 () none 25) - (dummy-26 () none 26) - (dummy-27 () none 27) - (dummy-28 () none 28) - (dummy-29 () none 29) - (dummy-30 () none 30) - (dummy-31 () none 31) - (dummy-32 () none 32) - (dummy-33 () none 33) - (dummy-34 () none 34) - (dummy-35 () none 35) - (dummy-36 () none 36) - (dummy-37 () none 37) - (dummy-38 () none 38) - (dummy-39 () none 39) - (dummy-40 () none 40) - (dummy-41 () none 41) - (dummy-42 () none 42) - (dummy-43 () none 43) - (dummy-44 () none 44) - (dummy-45 () none 45) - (dummy-46 () none 46) - (dummy-47 () none 47) - (dummy-48 () none 48) - (dummy-49 () none 49) - (dummy-50 () none 50) - (dummy-51 () none 51) - (dummy-52 () none 52) - (dummy-53 () none 53) - (dummy-54 () none 54) - (dummy-55 () none 55) - (dummy-56 () none 56) - (dummy-57 () none 57) - (dummy-58 () none 58) - (dummy-59 () none 59) - (dummy-60 () none 60) - (dummy-61 () none 61) - (dummy-62 () none 62) + (process-drawable-reserved-method-20 () none 20) + (process-drawable-reserved-method-21 () none 21) + (process-drawable-reserved-method-22 () none 22) + (process-drawable-reserved-method-23 () none 23) + (process-drawable-reserved-method-24 () none 24) + (process-drawable-reserved-method-25 () none 25) + (process-drawable-reserved-method-26 () none 26) + (process-drawable-reserved-method-27 () none 27) + (process-drawable-reserved-method-28 () none 28) + (process-drawable-reserved-method-29 () none 29) + (process-drawable-reserved-method-30 () none 30) + (process-drawable-reserved-method-31 () none 31) + (process-drawable-reserved-method-32 () none 32) + (process-drawable-reserved-method-33 () none 33) + (process-drawable-reserved-method-34 () none 34) + (process-drawable-reserved-method-35 () none 35) + (process-drawable-reserved-method-36 () none 36) + (process-drawable-reserved-method-37 () none 37) + (process-drawable-reserved-method-38 () none 38) + (process-drawable-reserved-method-39 () none 39) + (process-drawable-reserved-method-40 () none 40) + (process-drawable-reserved-method-41 () none 41) + (process-drawable-reserved-method-42 () none 42) + (process-drawable-reserved-method-43 () none 43) + (process-drawable-reserved-method-44 () none 44) + (process-drawable-reserved-method-45 () none 45) + (process-drawable-reserved-method-46 () none 46) + (process-drawable-reserved-method-47 () none 47) + (process-drawable-reserved-method-48 () none 48) + (process-drawable-reserved-method-49 () none 49) + (process-drawable-reserved-method-50 () none 50) + (process-drawable-reserved-method-51 () none 51) + (process-drawable-reserved-method-52 () none 52) + (process-drawable-reserved-method-53 () none 53) + (process-drawable-reserved-method-54 () none 54) + (process-drawable-reserved-method-55 () none 55) + (process-drawable-reserved-method-56 () none 56) + (process-drawable-reserved-method-57 () none 57) + (process-drawable-reserved-method-58 () none 58) + (process-drawable-reserved-method-59 () none 59) + (process-drawable-reserved-method-60 () none 60) + (process-drawable-reserved-method-61 () none 61) + (process-drawable-reserved-method-62 () none 62) ) ) @@ -213,21 +213,21 @@ ;; The attack-info is generated by attackers and sent to target. (deftype attack-info (structure) - ((trans vector :inline :offset-assert 0) - (vector vector :inline :offset-assert 16) - (intersection vector :inline :offset-assert 32) - (attacker handle :offset-assert 48) - (invinc-time time-frame :offset-assert 56) - (mask attack-mask :offset-assert 64) - (mode symbol :offset-assert 68) - (shove-back meters :offset-assert 72) - (shove-up meters :offset-assert 76) - (speed meters :offset-assert 80) - (dist meters :offset-assert 84) - (control float :offset-assert 88) - (angle symbol :offset-assert 92) - (rotate-to degrees :offset-assert 96) - (prev-state state :offset-assert 100) + ((trans vector :inline :offset-assert 0) + (vector vector :inline :offset-assert 16) + (intersection vector :inline :offset-assert 32) + (attacker handle :offset-assert 48) + (invinc-time time-frame :offset-assert 56) + (mask attack-mask :offset-assert 64) + (mode symbol :offset-assert 68) + (shove-back meters :offset-assert 72) + (shove-up meters :offset-assert 76) + (speed meters :offset-assert 80) + (dist meters :offset-assert 84) + (control float :offset-assert 88) + (angle symbol :offset-assert 92) + (rotate-to degrees :offset-assert 96) + (prev-state state :offset-assert 100) ) :method-count-assert 10 :size-assert #x68 @@ -249,10 +249,3 @@ :size-assert #x24 :flag-assert #x900000024 ) - - -0 - - - - diff --git a/goal_src/jak1/engine/game/game-save.gc b/goal_src/jak1/engine/game/game-save.gc index ecf446595f..cbd95a716f 100644 --- a/goal_src/jak1/engine/game/game-save.gc +++ b/goal_src/jak1/engine/game/game-save.gc @@ -93,6 +93,8 @@ (aspect-ratio 509) ) +;; DECOMP BEGINS + ;; the game save is a bunch of "game-save-tag"s ;; the elt-type field identifies what it is. ;; the data may be stored in one of the user fields, or @@ -149,11 +151,11 @@ :size-assert #x50 :flag-assert #xc00000050 (:methods - (new (symbol type int) _type_ 0) - (save-to-file (_type_ string) _type_ 9) - (load-from-file! (_type_ string) _type_ 10) - (debug-print (_type_ symbol) _type_ 11) - ) + (new (symbol type int) _type_ 0) + (save-to-file (_type_ string) _type_ 9) + (load-from-file! (_type_ string) _type_ 10) + (debug-print (_type_ symbol) _type_ 11) + ) ) (defmethod asize-of game-save ((obj game-save)) @@ -1137,8 +1139,7 @@ ) (defpart 2662 - :init-specs - ((sp-tex spt-texture (new 'static 'texture-id :index #x6b :page #x1cf)) + :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x6b :page #x1cf)) (sp-flt spt-num 1.0) (sp-flt spt-scale-x (meters 1.5)) (sp-copy-from-other spt-scale-y -4) @@ -1159,17 +1160,17 @@ (define *auto-save-info* (new 'global 'mc-slot-info)) (deftype auto-save (process) - ((card int32 :offset-assert 112) - (slot int32 :offset-assert 116) - (which int32 :offset-assert 120) - (buffer kheap :offset-assert 124) - (mode basic :offset-assert 128) - (result mc-status-code :offset-assert 132) - (save game-save :offset-assert 136) - (info mc-slot-info :inline :offset-assert 140) - (notify handle :offset-assert 440) - (state-time time-frame :offset-assert 448) - (part sparticle-launch-control :offset-assert 456) + ((card int32 :offset-assert 112) + (slot int32 :offset-assert 116) + (which int32 :offset-assert 120) + (buffer kheap :offset-assert 124) + (mode basic :offset-assert 128) + (result mc-status-code :offset-assert 132) + (save game-save :offset-assert 136) + (info mc-slot-info :inline :offset-assert 140) + (notify handle :offset-assert 440) + (state-time time-frame :offset-assert 448) + (part sparticle-launch-control :offset-assert 456) ) :heap-base #x160 :method-count-assert 23 @@ -1224,11 +1225,7 @@ (set! (-> v1-6 height) (the float 80)) ) (set! (-> gp-0 flags) (font-flags shadow kerning)) - (format (clear *temp-string*) "~S / ~S ~D~%" - (-> self mode) - (-> self state name) - (-> self which) - ) + (format (clear *temp-string*) "~S / ~S ~D~%" (-> self mode) (-> self state name) (-> self which)) (print-game-text *temp-string* gp-0 #f 128 22) ) ) @@ -1354,8 +1351,7 @@ ;; Get heap memory. (defstate get-heap (auto-save) :virtual #t - :code - (behavior () + :code (behavior () (set! (-> self state-time) (-> *display* real-frame-counter)) (let ((a0-1 (reserve-alloc *art-control*))) (while (not a0-1) @@ -1374,8 +1370,7 @@ (defstate get-card (auto-save) :virtual #t - :code - (behavior () + :code (behavior () (label cfg-0) (mc-get-slot-info (-> self slot) (-> self info)) (when (zero? (-> self info known)) @@ -1426,8 +1421,7 @@ (defstate format-card (auto-save) :virtual #t - :code - (behavior () + :code (behavior () (when (zero? (-> self info formatted)) (label cfg-1) (set! (-> self result) (mc-format (-> self card))) @@ -1467,8 +1461,7 @@ (defstate unformat-card (auto-save) :virtual #t - :code - (behavior () + :code (behavior () (when (nonzero? (-> self info formatted)) (label cfg-1) (set! (-> self result) (mc-unformat (-> self card))) @@ -1476,7 +1469,7 @@ (suspend) (goto cfg-1) ) - (while #t + (loop (set! (-> self result) (the-as mc-status-code (mc-check-result))) (case (-> self result) (((mc-status-code busy)) @@ -1499,8 +1492,7 @@ (defstate create-file (auto-save) :virtual #t - :code - (behavior () + :code (behavior () (cond ((zero? (-> self info formatted)) (go-virtual error (mc-status-code no-format)) @@ -1518,7 +1510,7 @@ (suspend) (goto cfg-6) ) - (while #t + (loop (set! (-> self result) (the-as mc-status-code (mc-check-result))) (case (-> self result) (((mc-status-code busy)) @@ -1550,8 +1542,7 @@ (defstate save (auto-save) :virtual #t - :code - (behavior () + :code (behavior () (cond ((zero? (-> self info formatted)) (go-virtual error (mc-status-code no-format)) @@ -1590,7 +1581,7 @@ (suspend) (goto cfg-7) ) - (while #t + (loop (set! (-> self result) (the-as mc-status-code (mc-check-result))) (let ((v1-24 (-> self result))) (set! gp-0 (cond @@ -1627,8 +1618,7 @@ (defstate restore (auto-save) :virtual #t - :code - (behavior () + :code (behavior () (local-vars (gp-0 object)) (cond ((zero? (-> self info formatted)) @@ -1650,7 +1640,7 @@ (suspend) (goto cfg-6) ) - (while #t + (loop (set! (-> self result) (the-as mc-status-code (mc-check-result))) (let ((v1-22 (-> self result))) (set! gp-0 (cond @@ -1689,7 +1679,7 @@ (set! (-> *game-info* mode) 'play) (initialize! *game-info* 'game (-> self save) (the-as string #f)) (set-master-mode 'game) - (add-setting! 'process-mask 'set 0.0 16) + (add-setting! 'process-mask 'set 0.0 (process-mask progress)) (apply-settings *setting-control*) (dotimes (gp-1 15) (suspend) @@ -1701,22 +1691,18 @@ (defstate error (auto-save) :virtual #t - :event - (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'progress-allowed?) - #t - ) - ((= v1-0 'die) - (deactivate self) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('progress-allowed?) + #t + ) + (('die) + (the-as symbol (deactivate self)) + ) + ) + ) ) - :code - (behavior ((arg0 mc-status-code)) + :code (behavior ((arg0 mc-status-code)) (if (-> self buffer) (reserve-free *art-control* (-> self buffer)) ) @@ -1751,8 +1737,7 @@ (defstate done (auto-save) :virtual #t - :code - (behavior () + :code (behavior () (if (and (-> self buffer) (-> *art-control* reserve-buffer)) (reserve-free *art-control* (-> self buffer)) ) @@ -1795,19 +1780,14 @@ ) (defun auto-save-check () - (when (and (-> *setting-control* current auto-save) - (not (handle->process (-> *game-info* auto-save-proc))) - ) + (when (and (-> *setting-control* current auto-save) (not (handle->process (-> *game-info* auto-save-proc)))) (mc-get-slot-info 0 *auto-save-info*) (if (and (nonzero? (-> *auto-save-info* known)) - (or (zero? (-> *auto-save-info* handle)) - (!= (-> *auto-save-info* handle) (-> *game-info* auto-save-card)) - ) + (or (zero? (-> *auto-save-info* handle)) (!= (-> *auto-save-info* handle) (-> *game-info* auto-save-card))) ) - (auto-save-command 'error 0 0 *default-pool*) - ) - ) + (auto-save-command 'error 0 0 *default-pool*) + ) + ) 0 (none) ) - diff --git a/goal_src/jak1/engine/game/powerups.gc b/goal_src/jak1/engine/game/powerups.gc index 16845f4cf6..f9a875f8f6 100644 --- a/goal_src/jak1/engine/game/powerups.gc +++ b/goal_src/jak1/engine/game/powerups.gc @@ -513,7 +513,7 @@ ) (defbehavior target-powerup-process target () - (dummy-10 (-> self water)) + (water-control-method-10 (-> self water)) (when (not *weather-off*) (case (-> self current-level name) (('swamp) diff --git a/goal_src/jak1/engine/game/projectiles-h.gc b/goal_src/jak1/engine/game/projectiles-h.gc index 63f8bac978..31f339d409 100644 --- a/goal_src/jak1/engine/game/projectiles-h.gc +++ b/goal_src/jak1/engine/game/projectiles-h.gc @@ -44,11 +44,11 @@ (projectile-dissipate () _type_ :state 21) (projectile-impact () _type_ :state 22) (projectile-moving () _type_ :state 23) - (dummy-24 (_type_) none 24) - (dummy-25 (_type_) none 25) - (dummy-26 (_type_) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_) none 28) + (projectile-method-24 (_type_) none 24) + (projectile-method-25 (_type_) none 25) + (projectile-method-26 (_type_) none 26) + (projectile-method-27 (_type_) none 27) + (projectile-method-28 (_type_) none 28) ) ) @@ -73,10 +73,3 @@ :size-assert #x1a4 :flag-assert #x1d014001a4 ) - - -0 - - - - diff --git a/goal_src/jak1/engine/game/projectiles.gc b/goal_src/jak1/engine/game/projectiles.gc index 2b02743888..95037aff66 100644 --- a/goal_src/jak1/engine/game/projectiles.gc +++ b/goal_src/jak1/engine/game/projectiles.gc @@ -143,7 +143,7 @@ (set! sv-80 (logior sv-80 16)) ) (set! sv-224 (< (fabs (-> arg0 surface-angle)) (-> *pat-mode-info* (-> arg0 cur-pat mode) wall-angle))) - (if (zero? (logand (-> arg0 prev-status) (cshape-moving-flags onsurf))) + (if (not (logtest? (-> arg0 prev-status) (cshape-moving-flags onsurf))) (set! (-> arg0 ground-impact-vel) (- (vector-dot (-> arg0 transv) (-> arg0 dynam gravity-normal)))) ) (set! sv-80 (logior sv-80 4)) @@ -176,7 +176,7 @@ (defpartgroup group-yellow-eco-fireball :id 102 - :duration 300 + :duration (seconds 1) :bounds (static-bspherem 0 0 0 3) :parts ((sp-item 349 :flags (launch-asap) :binding 350) (sp-item 350 :flags (start-dead launch-asap) :binding 351) @@ -316,7 +316,7 @@ (defpartgroup group-part-yellow-eco-fireball-launcher :id 103 - :duration 600 + :duration (seconds 2) :bounds (static-bspherem 0 0 0 6) :parts ((sp-item 355 :flags (launch-asap)) (sp-item 356 :flags (bit1) :period 630 :length 15) @@ -487,7 +487,7 @@ (defpartgroup group-part-yellow-eco-fireball-hit :id 104 - :duration 600 + :duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 6) :parts ((sp-item 2059 :period 600 :length 5) @@ -591,46 +591,46 @@ ) ) -(defmethod dummy-24 projectile ((obj projectile)) +(defmethod projectile-method-24 projectile ((obj projectile)) (spawn (-> obj part) (the-as vector (-> obj root-override root-prim prim-core))) 0 (none) ) -(defmethod dummy-28 projectile ((obj projectile)) +(defmethod projectile-method-28 projectile ((obj projectile)) 0 (none) ) (defstate projectile-moving (projectile) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touched) (when (-> self attack-mode) (when (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode (-> self attack-mode))))) + ((= (-> proc type) target) + (send-event proc 'attack (-> event param 0) (static-attack-info ((mode (-> self attack-mode))))) ) (else (let ((a1-2 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-2 from) self) (set! (-> a1-2 num-params) 4) (set! (-> a1-2 message) 'attack) - (set! (-> a1-2 param 0) (-> arg3 param 0)) + (set! (-> a1-2 param 0) (-> event param 0)) (set! (-> a1-2 param 1) (the-as uint (-> self attack-mode))) (let ((v1-13 (+ *global-attack-id* 1))) (set! *global-attack-id* v1-13) (set! (-> a1-2 param 2) (the-as uint v1-13)) ) (set! (-> a1-2 param 3) (the-as uint 0)) - (send-event-function arg0 a1-2) + (send-event-function proc a1-2) ) ) ) (let ((v1-14 (-> self notify-handle))) (if (handle->process v1-14) - (send-event (-> v1-14 process 0) 'notify 'attack arg0) + (send-event (-> v1-14 process 0) 'notify 'attack proc) ) ) (+! (-> self hits) 1) @@ -658,7 +658,7 @@ (if gp-0 (go-virtual projectile-impact) ) - (dummy-28 self) + (projectile-method-28 self) ((-> self update-velocity) self) (when (logtest? (-> self options) 2) (seek! (-> self tween) 1.0 (* 0.5 (-> *display* seconds-per-frame))) @@ -699,7 +699,7 @@ ) (set-time-ratios *display* (the float s5-0)) ) - (dummy-24 self) + (projectile-method-24 self) (suspend) ) ) @@ -792,12 +792,12 @@ ) ) -(defmethod dummy-27 projectile ((obj projectile)) +(defmethod projectile-method-27 projectile ((obj projectile)) 0 (none) ) -(defmethod dummy-26 projectile ((obj projectile)) +(defmethod projectile-method-26 projectile ((obj projectile)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) projectile-collision-reaction) @@ -822,7 +822,7 @@ (none) ) -(defmethod dummy-25 projectile ((obj projectile)) +(defmethod projectile-method-25 projectile ((obj projectile)) (go (method-of-object obj projectile-moving)) 0 (none) @@ -864,7 +864,7 @@ (countdown (v1-4 16) (set! (-> self old-dist v1-4) 4095996000.0) ) - (dummy-26 self) + (projectile-method-26 self) (set! (-> self root-override dynam gravity y) 1228800.0) (set! (-> self root-override dynam gravity-length) 1228800.0) (set! (-> self root-override dynam gravity-max) 1228800.0) @@ -881,8 +881,8 @@ (vector-normalize-copy! (-> self base-vector) arg2 1.0) (vector+float*! (-> self target) (-> self root-override trans) (-> self root-override transv) 2.0) (set! (-> self target-base quad) (-> self target quad)) - (dummy-27 self) - (dummy-24 self) + (projectile-method-27 self) + (projectile-method-24 self) (when (not (type-type? (-> self type) projectile-blue)) (let ((a1-8 (new 'stack-no-clear 'collide-edge-hold-list))) (set! (-> a1-8 num-allocs) (the-as uint 1)) @@ -891,11 +891,11 @@ ) ) (set! (-> self event-hook) (-> (method-of-object self projectile-moving) event)) - (dummy-25 self) + (projectile-method-25 self) (none) ) -(defmethod dummy-27 projectile-yellow ((obj projectile-yellow)) +(defmethod projectile-method-27 projectile-yellow ((obj projectile-yellow)) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 204 (seconds 0.1)) (set! (-> obj attack-mode) 'eco-yellow) (set! (-> obj mode) 1) @@ -922,7 +922,7 @@ ) (sound-play "yellow-fire") (set! (-> obj sound-id) (sound-play "yellow-buzz")) - (if (zero? (logand (-> obj options) 416)) + (if (not (logtest? (-> obj options) 416)) (process-spawn part-tracker :init part-tracker-init (-> *part-group-id-table* 103) -1 #f #f #f s5-0 :to obj) ) (set! (-> *part-id-table* 350 init-specs 2 initial-valuef) f30-0) @@ -942,7 +942,7 @@ (logior! (-> obj root-override root-prim collide-with) (collide-kind water)) ) (('ogre) - (when (zero? (logand (-> obj options) 128)) + (when (not (logtest? (-> obj options) 128)) (set! (-> obj water) (new 'process 'water-control obj 0 0.0 8192.0 2048.0)) (set! (-> obj water flags) (water-flags wt01 wt04 wt07)) (set! (-> obj water height) 129024.0) @@ -962,15 +962,15 @@ (none) ) -(defmethod dummy-26 projectile-yellow ((obj projectile-yellow)) - (let ((t9-0 (method-of-type projectile dummy-26))) +(defmethod projectile-method-26 projectile-yellow ((obj projectile-yellow)) + (let ((t9-0 (method-of-type projectile projectile-method-26))) (t9-0 obj) ) (logior! (-> obj root-override root-prim collide-with) (collide-kind mother-spider)) (none) ) -(defmethod dummy-24 projectile-yellow ((obj projectile-yellow)) +(defmethod projectile-method-24 projectile-yellow ((obj projectile-yellow)) (with-pp (find-ground-and-draw-shadow (-> obj root-override trans) @@ -1024,7 +1024,7 @@ ) ) -(defmethod dummy-28 projectile-yellow ((obj projectile-yellow)) +(defmethod projectile-method-28 projectile-yellow ((obj projectile-yellow)) (cond ((or (not (handle->process (-> obj last-target))) (zero? (-> (the-as target (handle->process (-> obj last-target))) control root-prim prim-core collide-as)) @@ -1103,7 +1103,7 @@ (none) ) -(defmethod dummy-27 projectile-blue ((obj projectile-blue)) +(defmethod projectile-method-27 projectile-blue ((obj projectile-blue)) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 204 (seconds 0.1)) (sound-play "blue-eco-on") (set! (-> obj mode) 2) @@ -1129,7 +1129,7 @@ (none) ) -(defmethod dummy-26 projectile-blue ((obj projectile-blue)) +(defmethod projectile-method-26 projectile-blue ((obj projectile-blue)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) projectile-collision-reaction) @@ -1203,7 +1203,7 @@ ) ) -(defmethod dummy-28 projectile-blue ((obj projectile-blue)) +(defmethod projectile-method-28 projectile-blue ((obj projectile-blue)) (let* ((s5-0 (handle->process (-> obj last-target))) (v1-4 (if (and (nonzero? s5-0) (type-type? (-> s5-0 type) process-drawable)) s5-0 @@ -1221,7 +1221,7 @@ (none) ) -(defmethod dummy-24 projectile-blue ((obj projectile-blue)) +(defmethod projectile-method-24 projectile-blue ((obj projectile-blue)) (if (rand-vu-percent? 0.75) (eco-blue-glow (the-as vector (-> obj root-override root-prim prim-core))) ) @@ -1244,7 +1244,3 @@ (none) ) ) - - - - diff --git a/goal_src/jak1/engine/game/task/task-control-h.gc b/goal_src/jak1/engine/game/task/task-control-h.gc index 82088cf661..33ae9700dd 100644 --- a/goal_src/jak1/engine/game/task/task-control-h.gc +++ b/goal_src/jak1/engine/game/task/task-control-h.gc @@ -102,8 +102,8 @@ :size-assert #x10 :flag-assert #xc00000010 (:methods - (dummy-9 (_type_) none 9) - (TODO-RENAME-10 (_type_ vector time-frame float process-drawable) vector 10) + (ambient-control-method-9 (_type_) none 9) + (ambient-control-method-10 (_type_ vector time-frame float process-drawable) vector 10) (play-ambient (_type_ string symbol vector) symbol 11) ) ) @@ -155,26 +155,26 @@ (idle () _type_ :state 30) (get-art-elem (_type_) art-element 31) (play-anim! (_type_ symbol) basic 32) - (dummy-33 (_type_) none 33) + (process-taskable-method-33 (_type_) none 33) (get-accept-anim (_type_ symbol) spool-anim 34) (push-accept-anim (_type_) none 35) (get-reject-anim (_type_ symbol) spool-anim 36) (push-reject-anim (_type_) none 37) - (dummy-38 (_type_) none 38) + (process-taskable-method-38 (_type_) none 38) (should-display? (_type_) symbol 39) - (dummy-40 (_type_ object skeleton-group int int vector int) none 40) + (process-taskable-method-40 (_type_ object skeleton-group int int vector int) none 40) (initialize-collision (_type_ int vector) none 41) - (dummy-42 (_type_) none 42) - (TODO-RENAME-43 (_type_) symbol 43) + (process-taskable-method-42 (_type_) none 42) + (process-taskable-method-43 (_type_) symbol 43) (play-reminder (_type_) symbol 44) - (dummy-45 (_type_) symbol 45) - (dummy-46 (_type_) none 46) + (process-taskable-method-45 (_type_) symbol 45) + (process-taskable-method-46 (_type_) none 46) (target-above-threshold? (_type_) symbol 47) (draw-npc-shadow (_type_) none 48) (hidden-other () _type_ :state 49) - (TODO-RENAME-50 (_type_) symbol 50) + (process-taskable-method-50 (_type_) symbol 50) (close-anim-file! (_type_) symbol 51) - (dummy-52 (_type_) none 52) + (process-taskable-method-52 (_type_) none 52) ) ) diff --git a/goal_src/jak1/engine/geometry/path-h.gc b/goal_src/jak1/engine/geometry/path-h.gc index ecb8be26b8..e87325335c 100644 --- a/goal_src/jak1/engine/geometry/path-h.gc +++ b/goal_src/jak1/engine/geometry/path-h.gc @@ -15,32 +15,34 @@ (not-found 4) ) +;; DECOMP BEGINS + ;; A path-control is a curve that can be loaded from res-lump/entities. (deftype path-control (basic) - ((flags path-control-flag :offset-assert 4) - (name symbol :offset-assert 8) - (process process-drawable :offset-assert 12) - (curve curve :inline :offset-assert 16) - (num-cverts int32 :offset 20) - (cverts (inline-array vector) :score 100 :offset 16) + ((flags path-control-flag :offset-assert 4) + (name symbol :offset-assert 8) + (process process-drawable :offset-assert 12) + (curve curve :inline :offset-assert 16) + (num-cverts int32 :offset 20) + (cverts (inline-array vector) :offset 16) ) :method-count-assert 21 :size-assert #x24 :flag-assert #x1500000024 (:methods - (new (symbol type process symbol float) _type_) - (dummy-9 (_type_) none 9) + (new (symbol type process symbol float) _type_ 0) + (debug-draw (_type_) none 9) (eval-path-curve-div! (_type_ vector float symbol) vector 10) (get-random-point (_type_ vector) vector 11) - (TODO-RENAME-12 (_type_ vector float) vector 12) + (path-control-method-12 (_type_ vector float) vector 12) (eval-path-curve! (_type_ vector float symbol) vector 13) - (TODO-RENAME-14 (_type_ vector float) vector 14) + (path-control-method-14 (_type_ vector float) vector 14) (length-as-float (_type_) float 15) (path-distance (_type_) float 16) (get-num-verts (_type_) int 17) (should-display? (_type_) symbol 18) - (TODO-RENAME-19 (_type_) float 19) - (TODO-RENAME-20 (_type_) float 20) + (path-control-method-19 (_type_) float 19) + (path-control-method-20 (_type_) float 20) ) ) @@ -51,8 +53,8 @@ :size-assert #x24 :flag-assert #x1500000024 (:methods - (new (symbol type process symbol float) _type_ 0) - ) + (new (symbol type process symbol float) _type_ 0) + ) ) (defmethod new path-control ((allocation symbol) (type-to-make type) (proc process) (name symbol) (time float)) @@ -122,7 +124,7 @@ (let ((obj (object-new allocation type-to-make (the-as int (-> type-to-make size))))) (set! (-> obj process) (the-as process-drawable proc)) (set! (-> obj name) name) - (let* ((ent (the-as entity (-> proc entity))) + (let* ((ent (-> proc entity)) (v1-2 name) (s2-0 (cond ((= v1-2 'path) @@ -136,7 +138,7 @@ ) ) ) - ) + ) ) (let ((lookup-entity (entity-actor-lookup ent 'path-actor 0))) (if lookup-entity @@ -162,4 +164,3 @@ obj ) ) - diff --git a/goal_src/jak1/engine/geometry/path.gc b/goal_src/jak1/engine/geometry/path.gc index 5fa8a5a60f..5163ced390 100644 --- a/goal_src/jak1/engine/geometry/path.gc +++ b/goal_src/jak1/engine/geometry/path.gc @@ -7,7 +7,7 @@ ;; DECOMP BEGINS -(defmethod dummy-9 path-control ((obj path-control)) +(defmethod debug-draw path-control ((obj path-control)) (cond ((logtest? (-> obj flags) (path-control-flag not-found)) (when (and (type-type? (-> obj process type) process-drawable) *display-entity-errors*) @@ -162,8 +162,8 @@ ) ) -(defmethod TODO-RENAME-12 path-control ((obj path-control) (arg0 vector) (arg1 float)) - (when (zero? (logand (-> obj flags) (path-control-flag not-found))) +(defmethod path-control-method-12 path-control ((obj path-control) (arg0 vector) (arg1 float)) + (when (not (logtest? (-> obj flags) (path-control-flag not-found))) (let ((v1-3 (-> obj curve num-cverts)) (f0-3 (the float (the int arg1))) ) @@ -184,12 +184,12 @@ (vector-normalize! arg0 1.0) ) -(defmethod TODO-RENAME-14 path-control ((obj path-control) (arg0 vector) (arg1 float)) - (TODO-RENAME-12 obj arg0 (* arg1 (the float (+ (-> obj curve num-cverts) -1)))) +(defmethod path-control-method-14 path-control ((obj path-control) (arg0 vector) (arg1 float)) + (path-control-method-12 obj arg0 (* arg1 (the float (+ (-> obj curve num-cverts) -1)))) ) -(defmethod TODO-RENAME-14 curve-control ((obj curve-control) (arg0 vector) (arg1 float)) - (when (zero? (logand (-> obj flags) (path-control-flag not-found))) +(defmethod path-control-method-14 curve-control ((obj curve-control) (arg0 vector) (arg1 float)) + (when (not (logtest? (-> obj flags) (path-control-flag not-found))) (let ((s4-0 (new 'stack-no-clear 'vector))) (curve-evaluate! arg0 @@ -228,11 +228,11 @@ (vector-normalize! arg0 1.0) ) -(defmethod TODO-RENAME-12 curve-control ((obj curve-control) (arg0 vector) (arg1 float)) - (TODO-RENAME-14 obj arg0 (/ arg1 (the float (+ (-> obj curve num-cverts) -1)))) +(defmethod path-control-method-12 curve-control ((obj curve-control) (arg0 vector) (arg1 float)) + (path-control-method-14 obj arg0 (/ arg1 (the float (+ (-> obj curve num-cverts) -1)))) ) -(defmethod TODO-RENAME-19 path-control ((obj path-control)) +(defmethod path-control-method-19 path-control ((obj path-control)) (let ((s5-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'vector)) @@ -262,11 +262,11 @@ ) ) -(defmethod TODO-RENAME-20 path-control ((obj path-control)) - (/ (TODO-RENAME-19 obj) (the float (+ (-> obj curve num-cverts) -1))) +(defmethod path-control-method-20 path-control ((obj path-control)) + (/ (path-control-method-19 obj) (the float (+ (-> obj curve num-cverts) -1))) ) -(defmethod dummy-9 curve-control ((obj curve-control)) +(defmethod debug-draw curve-control ((obj curve-control)) (cond ((logtest? (-> obj flags) (path-control-flag not-found)) (when (and (type-type? (-> obj process type) process-drawable) *display-entity-errors*) @@ -319,7 +319,3 @@ 0 (none) ) - - - - diff --git a/goal_src/jak1/engine/geometry/vol-h.gc b/goal_src/jak1/engine/geometry/vol-h.gc index 74d6a4513f..8bd94f771e 100644 --- a/goal_src/jak1/engine/geometry/vol-h.gc +++ b/goal_src/jak1/engine/geometry/vol-h.gc @@ -21,9 +21,9 @@ :size-assert #x18 :flag-assert #xc00000018 (:methods - (dummy-9 (_type_ symbol vector-array vector-array) symbol 9) + (init-vol! (_type_ symbol vector-array vector-array) symbol 9) (debug-draw (_type_) none 10) - (dummy-11 (_type_ vector float) symbol 11) + (point-in-vol? (_type_ vector float) symbol 11) ) ) @@ -43,9 +43,9 @@ :flag-assert #xc0000061c (:methods (new (symbol type process-drawable) _type_ 0) - (dummy-9 (_type_) symbol 9) - (dummy-10 (_type_ vector) symbol 10) - (TODO-RENAME-11 (_type_) symbol 11) + (init! (_type_) symbol 9) + (point-in-vol? (_type_ vector) symbol 10) + (vol-control-method-11 (_type_) symbol 11) ) ) @@ -107,10 +107,6 @@ ) ) -(defmethod TODO-RENAME-11 vol-control ((obj vol-control)) +(defmethod vol-control-method-11 vol-control ((obj vol-control)) (and *display-vol-marks* (logtest? (-> obj flags) 1)) ) - - - - diff --git a/goal_src/jak1/engine/geometry/vol.gc b/goal_src/jak1/engine/geometry/vol.gc index fd8863216a..b58d746cbe 100644 --- a/goal_src/jak1/engine/geometry/vol.gc +++ b/goal_src/jak1/engine/geometry/vol.gc @@ -18,18 +18,7 @@ ) ) -;; WARN: Stack slot offset 148 signed mismatch -;; WARN: Stack slot offset 148 signed mismatch -;; WARN: Stack slot offset 148 signed mismatch -;; WARN: Stack slot offset 148 signed mismatch -;; WARN: Stack slot offset 148 signed mismatch -;; WARN: Stack slot offset 148 signed mismatch -;; WARN: Stack slot offset 148 signed mismatch -;; WARN: Stack slot offset 148 signed mismatch -;; WARN: Stack slot offset 148 signed mismatch -;; WARN: Stack slot offset 148 signed mismatch -;; WARN: Stack slot offset 148 signed mismatch -(defmethod dummy-9 plane-volume ((obj plane-volume) (arg0 symbol) (arg1 vector-array) (arg2 vector-array)) +(defmethod init-vol! plane-volume ((obj plane-volume) (arg0 symbol) (arg1 vector-array) (arg2 vector-array)) (local-vars (sv-144 vector) (sv-148 float) @@ -161,10 +150,7 @@ (set! (-> arg2 data (-> arg2 length) quad) (-> s1-0 quad)) (set! (-> arg2 data (+ (-> arg2 length) 1) quad) (-> s2-0 s3-0 quad)) (+! (-> arg2 length) 2) - (let ((v1-112 (+ (-> obj normal-count) 2))) - (set! (-> obj normal-count) v1-112) - v1-112 - ) + (set! (-> obj normal-count) (+ (-> obj normal-count) 2)) ) ) ) @@ -206,7 +192,7 @@ (none) ) -(defmethod dummy-11 plane-volume ((obj plane-volume) (arg0 vector) (arg1 float)) +(defmethod point-in-vol? plane-volume ((obj plane-volume) (arg0 vector) (arg1 float)) (dotimes (v1-0 (-> obj num-planes)) (if (< arg1 (- (vector-dot arg0 (the-as vector (-> obj plane v1-0))) (the-as float (-> obj plane v1-0 w)))) (return #f) @@ -215,7 +201,7 @@ #t ) -(defmethod dummy-9 vol-control ((obj vol-control)) +(defmethod init! vol-control ((obj vol-control)) (with-pp (let ((a0-1 obj)) (when (and (and *display-vol-marks* (logtest? (-> a0-1 flags) 1)) (logtest? (-> obj flags) 2)) @@ -237,10 +223,10 @@ (set! (-> obj debug-point length) 0) (set! (-> obj debug-normal length) 0) (dotimes (s5-1 (-> obj pos-vol-count)) - (dummy-9 (-> obj pos-vol s5-1) 'vol (-> obj debug-point) (-> obj debug-normal)) + (init-vol! (-> obj pos-vol s5-1) 'vol (-> obj debug-point) (-> obj debug-normal)) ) (dotimes (s5-2 (-> obj neg-vol-count)) - (dummy-9 (-> obj neg-vol s5-2) 'vol (-> obj debug-point) (-> obj debug-normal)) + (init-vol! (-> obj neg-vol s5-2) 'vol (-> obj debug-point) (-> obj debug-normal)) ) ) (dotimes (s5-3 (-> obj pos-vol-count)) @@ -255,20 +241,16 @@ ) ) -(defmethod dummy-10 vol-control ((obj vol-control) (arg0 vector)) +(defmethod point-in-vol? vol-control ((obj vol-control) (arg0 vector)) (dotimes (s4-0 (-> obj neg-vol-count)) - (if (dummy-11 (-> obj neg-vol s4-0) arg0 0.0) + (if (point-in-vol? (-> obj neg-vol s4-0) arg0 0.0) (return #f) ) ) (dotimes (s4-1 (-> obj pos-vol-count)) - (if (dummy-11 (-> obj pos-vol s4-1) arg0 0.0) + (if (point-in-vol? (-> obj pos-vol s4-1) arg0 0.0) (return #t) ) ) #f ) - - - - diff --git a/goal_src/jak1/engine/level/load-boundary.gc b/goal_src/jak1/engine/level/load-boundary.gc index c40c4d251f..5ad6d62b5e 100644 --- a/goal_src/jak1/engine/level/load-boundary.gc +++ b/goal_src/jak1/engine/level/load-boundary.gc @@ -1849,434 +1849,353 @@ (defmethod execute-command load-state ((obj load-state) (arg0 pair)) (local-vars (v1-26 int) (v1-57 int)) (with-pp - (cond - ((null? arg0) - ) - ((pair? arg0) - (let ((v1-4 (car arg0)) - (gp-0 (cdr arg0)) - ) - (cond - ((= v1-4 'set!) - (let ((s5-1 (command-get-param (car gp-0) #f))) - (if s5-1 - (set! - (-> (the-as symbol s5-1) value) - (command-get-param (car (cdr gp-0)) #f) - ) - ) - ) - ) - ((= v1-4 'eval) - ((the-as (function int) (command-get-param (car gp-0) #f))) - ) - ((= v1-4 'want-vis) - (want-vis obj (the-as symbol (command-get-param (car gp-0) #f))) - ) - ((= v1-4 'want-levels) - (want-levels - obj - (the-as symbol (command-get-param (car gp-0) #f)) - (the-as symbol (command-get-param (car (cdr gp-0)) #f)) - ) - ) - ((= v1-4 'display-level) - (want-display-level - obj - (the-as symbol (command-get-param (car gp-0) #f)) - (the-as symbol (command-get-param (car (cdr gp-0)) #f)) - ) - ) - ((= v1-4 'want-force-vis) - (want-force-vis - obj - (the-as symbol (command-get-param (car gp-0) #f)) - (the-as symbol (command-get-param (car (cdr gp-0)) #f)) - ) - ) - ((= v1-4 'want-force-inside) - (set-force-inside! - obj - (the-as symbol (command-get-param (car gp-0) #f)) - (the-as symbol (command-get-param (car (cdr gp-0)) #f)) - ) - ) - ((= v1-4 'alive) - (let ((s4-5 (command-get-param (car gp-0) #f))) - (when s4-5 - (let ((gp-1 (entity-by-name (the-as string s4-5)))) - (when gp-1 - (dotimes (v1-25 256) - (when (not (-> obj object-name v1-25)) - (set! (-> obj object-name v1-25) (the-as symbol s4-5)) - (set! - (-> obj object-status v1-25) - (the-as basic (-> gp-1 extra perm status)) - ) - (set! v1-26 v1-25) - (goto cfg-29) - ) + (cond + ((null? arg0) + ) + ((pair? arg0) + (let ((v1-4 (car arg0)) + (gp-0 (cdr arg0)) ) - (set! v1-26 -1) - (label cfg-29) - (when (>= v1-26 0) - (entity-birth-no-kill gp-1) - (let ((a0-45 (-> gp-1 extra process))) - (when a0-45 - (logclear! (-> a0-45 mask) (process-mask actor-pause)) - (logclear! - (-> a0-45 mask) - (-> *kernel-context* prevent-from-run) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ((= v1-4 'dead) - (let ((s3-4 (command-get-param (car gp-0) #f))) - (when s3-4 - (let ((s4-6 (entity-by-name (the-as string s3-4)))) - (when s4-6 - (dotimes (gp-2 256) - (when - (string= - (the-as string (-> obj object-name gp-2)) - (the-as string s3-4) - ) - (set! - (-> s4-6 extra perm status) - (the-as entity-perm-status (-> obj object-status gp-2)) - ) - (if (-> s4-6 extra process) - (kill! s4-6) - ) - (set! (-> obj object-name gp-2) #f) - (goto cfg-45) - ) - ) - ) - ) - ) - ) - (label cfg-45) - ) - ((= v1-4 'kill) - (let ((s4-7 (command-get-param (car gp-0) #f))) - (when s4-7 - (let ((gp-3 (entity-by-name (the-as string s4-7)))) - (when gp-3 - (dotimes (v1-56 256) - (when (not (-> obj object-name v1-56)) - (set! (-> obj object-name v1-56) (the-as symbol s4-7)) - (set! - (-> obj object-status v1-56) - (the-as basic (-> gp-3 extra perm status)) - ) - (set! v1-57 v1-56) - (goto cfg-56) - ) - ) - (set! v1-57 -1) - (label cfg-56) - (when (>= v1-57 0) - (if (-> gp-3 extra process) - (kill! gp-3) - ) - (logior! (-> gp-3 extra perm status) (entity-perm-status dead)) - ) - ) - ) - ) - ) - ) - ((= v1-4 'special) - (let ((a0-70 (command-get-param (car gp-0) #f))) - (when a0-70 - (let ((s5-2 (entity-by-name (the-as string a0-70)))) - (if s5-2 - (dummy-30 - (the-as entity-actor s5-2) - (entity-perm-status bit-7) - (the-as symbol (command-get-param (car (cdr gp-0)) #f)) - ) - ) - ) - ) - ) - ) - ((= v1-4 'active) - (let ((gp-4 (command-get-param (car gp-0) #f))) - (while (!= (level-status *level* (the-as symbol gp-4)) 'active) - (suspend) - ) - ) - ) - ((= v1-4 'part-tracker) - (let* ((s5-4 (command-get-param (car gp-0) #f)) - (a0-81 (command-get-param (car (cdr gp-0)) #f)) - (gp-5 (entity-by-name (the-as string a0-81))) - (s4-9 - (lookup-part-group-by-name - (symbol->string (the-as symbol s5-4)) - ) - ) - (s5-5 - (if - (and - (nonzero? s4-9) - (type-type? (-> s4-9 type) sparticle-launch-group) + (cond + ((= v1-4 'set!) + (let ((s5-1 (command-get-param (car gp-0) #f))) + (if s5-1 + (set! (-> (the-as symbol s5-1) value) (command-get-param (car (cdr gp-0)) #f)) ) - s4-9 - ) - ) - ) - (when (and gp-5 s5-5) - (let* ((s3-6 (-> gp-5 extra process)) - (s4-10 - (if - (and - (nonzero? s3-6) - (type-type? (-> s3-6 type) process-drawable) - ) - (the-as process-drawable s3-6) - ) - ) - (s3-7 (get-process *default-dead-pool* part-tracker #x4000)) - ) - (when s3-7 - (let ((t9-41 (method-of-type part-tracker activate)) - (a0-86 s3-7) - (a1-40 (the process-tree (ppointer->process (-> *setting-control* current movie)))) - ) - (set! a1-40 - (cond - (a1-40 - a1-40 + ) + ) + ((= v1-4 'eval) + ((the-as (function int) (command-get-param (car gp-0) #f))) + ) + ((= v1-4 'want-vis) + (want-vis obj (the-as symbol (command-get-param (car gp-0) #f))) + ) + ((= v1-4 'want-levels) + (want-levels + obj + (the-as symbol (command-get-param (car gp-0) #f)) + (the-as symbol (command-get-param (car (cdr gp-0)) #f)) + ) + ) + ((= v1-4 'display-level) + (want-display-level + obj + (the-as symbol (command-get-param (car gp-0) #f)) + (the-as symbol (command-get-param (car (cdr gp-0)) #f)) + ) + ) + ((= v1-4 'want-force-vis) + (want-force-vis + obj + (the-as symbol (command-get-param (car gp-0) #f)) + (the-as symbol (command-get-param (car (cdr gp-0)) #f)) + ) + ) + ((= v1-4 'want-force-inside) + (set-force-inside! + obj + (the-as symbol (command-get-param (car gp-0) #f)) + (the-as symbol (command-get-param (car (cdr gp-0)) #f)) + ) + ) + ((= v1-4 'alive) + (let ((s4-5 (command-get-param (car gp-0) #f))) + (when s4-5 + (let ((gp-1 (entity-by-name (the-as string s4-5)))) + (when gp-1 + (dotimes (v1-25 256) + (when (not (-> obj object-name v1-25)) + (set! (-> obj object-name v1-25) (the-as symbol s4-5)) + (set! (-> obj object-status v1-25) (the-as basic (-> gp-1 extra perm status))) + (set! v1-26 v1-25) + (goto cfg-29) ) - (else - *entity-pool* + ) + (set! v1-26 -1) + (label cfg-29) + (when (>= v1-26 0) + (entity-birth-no-kill gp-1) + (let ((a0-45 (-> gp-1 extra process))) + (when a0-45 + (logclear! (-> a0-45 mask) (process-mask actor-pause)) + (logclear! (-> a0-45 mask) (-> *kernel-context* prevent-from-run)) + ) ) ) ) - (t9-41 - (the-as part-tracker a0-86) - a1-40 - 'part-tracker - (the-as pointer #x70004000) + ) + ) ) + ) + ((= v1-4 'dead) + (let ((s3-4 (command-get-param (car gp-0) #f))) + (when s3-4 + (let ((s4-6 (entity-by-name (the-as string s3-4)))) + (when s4-6 + (dotimes (gp-2 256) + (when (string= (the-as string (-> obj object-name gp-2)) (the-as string s3-4)) + (set! (-> s4-6 extra perm status) (the-as entity-perm-status (-> obj object-status gp-2))) + (if (-> s4-6 extra process) + (kill! s4-6) + ) + (set! (-> obj object-name gp-2) #f) + (goto cfg-45) + ) + ) + ) + ) + ) + ) + (label cfg-45) + ) + ((= v1-4 'kill) + (let ((s4-7 (command-get-param (car gp-0) #f))) + (when s4-7 + (let ((gp-3 (entity-by-name (the-as string s4-7)))) + (when gp-3 + (dotimes (v1-56 256) + (when (not (-> obj object-name v1-56)) + (set! (-> obj object-name v1-56) (the-as symbol s4-7)) + (set! (-> obj object-status v1-56) (the-as basic (-> gp-3 extra perm status))) + (set! v1-57 v1-56) + (goto cfg-56) + ) + ) + (set! v1-57 -1) + (label cfg-56) + (when (>= v1-57 0) + (if (-> gp-3 extra process) + (kill! gp-3) + ) + (logior! (-> gp-3 extra perm status) (entity-perm-status dead)) + ) + ) + ) + ) + ) + ) + ((= v1-4 'special) + (let ((a0-70 (command-get-param (car gp-0) #f))) + (when a0-70 + (let ((s5-2 (entity-by-name (the-as string a0-70)))) + (if s5-2 + (set-or-clear-status! + (the-as entity-actor s5-2) + (entity-perm-status bit-7) + (the-as symbol (command-get-param (car (cdr gp-0)) #f)) + ) + ) + ) + ) + ) + ) + ((= v1-4 'active) + (let ((gp-4 (command-get-param (car gp-0) #f))) + (while (!= (level-status *level* (the-as symbol gp-4)) 'active) + (suspend) + ) + ) + ) + ((= v1-4 'part-tracker) + (let* ((s5-4 (command-get-param (car gp-0) #f)) + (a0-81 (command-get-param (car (cdr gp-0)) #f)) + (gp-5 (entity-by-name (the-as string a0-81))) + (s4-9 (lookup-part-group-by-name (symbol->string (the-as symbol s5-4)))) + (s5-5 (if (and (nonzero? s4-9) (type-type? (-> s4-9 type) sparticle-launch-group)) + s4-9 + ) + ) + ) + (when (and gp-5 s5-5) + (let* ((s3-6 (-> gp-5 extra process)) + (s4-10 (if (and (nonzero? s3-6) (type-type? (-> s3-6 type) process-drawable)) + (the-as process-drawable s3-6) + ) + ) + (s3-7 (get-process *default-dead-pool* part-tracker #x4000)) + ) + (when s3-7 + (let ((t9-41 (method-of-type part-tracker activate)) + (a0-86 s3-7) + (a1-40 (ppointer->process (-> *setting-control* current movie))) + ) + (set! a1-40 (cond + (a1-40 + (empty) + a1-40 + ) + (else + *entity-pool* + ) + ) + ) + (t9-41 (the-as part-tracker a0-86) a1-40 'part-tracker (the-as pointer #x70004000)) + ) + (run-now-in-process s3-7 part-tracker-init s5-5 -1 #f #f #f (if s4-10 + (-> s4-10 root trans) + (-> gp-5 extra trans) + ) + ) + (-> s3-7 ppointer) + ) + ) + ) + ) + ) + ((= v1-4 'auto-save) + (auto-save-command (the-as symbol (command-get-param (car gp-0) #f)) 0 0 *default-pool*) + ) + ((= v1-4 'shadow) + (let ((s5-7 (command-list-get-process (car gp-0))) + (v1-95 (command-get-quoted-param (car (cdr gp-0)) #f)) + ) + (send-event s5-7 'shadow v1-95) + ) + ) + ((= v1-4 'time-of-day) + (when *time-of-day-proc* + (let ((v1-99 (command-get-int (car gp-0) 0))) + (cond + ((< v1-99 0) + (set! (-> *time-of-day-proc* 0 time-ratio) 300.0) + ) + (else + (set! (-> *time-of-day-proc* 0 hour) v1-99) + (set! (-> *time-of-day-proc* 0 minute) 0) + (set! (-> *time-of-day-proc* 0 frame) 0) + (set! (-> *time-of-day-proc* 0 time-ratio) 0.0) + ) + ) + ) + ) + ) + ((= v1-4 'save) + (mem-copy! (&-> *backup-load-state* type) (&-> obj type) 2092) + (set! (-> *backup-load-state* command-list) '()) + (dotimes (v1-112 256) + (if (-> *backup-load-state* object-name v1-112) + (set! (-> *backup-load-state* object-name v1-112) #f) + ) + ) + ) + ((= v1-4 'setting-reset) + (set-setting! (the-as symbol (command-get-param (car gp-0) #f)) (command-get-param (car (cdr gp-0)) #f) 0.0 0) + ) + ((= v1-4 'setting-unset) + (remove-setting! (the-as symbol (command-get-param (car gp-0) #f))) + ) + ;; PAL patch here + ((= v1-4 'sfx-volume) + (set-setting! 'sfx-volume (command-get-param (car gp-0) #f) (command-get-float (car (cdr gp-0)) 0.0) 0) ) - (run-now-in-process s3-7 part-tracker-init s5-5 -1 #f #f #f (if s4-10 - (-> - s4-10 - root - trans - ) - (-> - gp-5 - extra - trans - ) - ) - ) - (-> s3-7 ppointer) + ((= v1-4 'blackout) + (set-blackout-frames (the-as time-frame (the int (* 5.0000005 (the float (command-get-int (car gp-0) 0)))))) + ) + ((= v1-4 'teleport) + (set! *teleport* #t) + ) + ((= v1-4 'joint) + (send-event (ppointer->process (-> *setting-control* current movie)) 'joint (command-get-param (car gp-0) #f)) + (set! *teleport-count* 2) + ) + ((= v1-4 'ambient) + (ambient-hint-spawn + (the-as string (command-get-param (car (cdr gp-0)) #f)) + (the-as vector #f) + *entity-pool* + (the-as symbol (command-get-param (car gp-0) #f)) + ) + ) + ((= v1-4 'send-event) + (let ((s5-13 (command-list-get-process (car gp-0))) + (s4-14 (command-get-quoted-param (car (cdr gp-0)) #f)) + (gp-6 (cdr (cdr gp-0))) + ) + (when (and s5-13 (not (null? s4-14))) + (let ((s3-11 (new 'stack-no-clear 'event-message-block))) + (set! (-> s3-11 from) pp) + (let ((a0-142 gp-6)) + (set! (-> s3-11 num-params) ((method-of-type (rtype-of a0-142) length) a0-142)) + ) + (set! (-> s3-11 message) (the-as symbol s4-14)) + (set! (-> s3-11 param 0) (the-as uint (command-get-quoted-param (car gp-6) #f))) + (set! (-> s3-11 param 1) (the-as uint (command-get-quoted-param (car (cdr gp-6)) #f))) + (set! (-> s3-11 param 2) (the-as uint (command-get-quoted-param (car (cdr (cdr gp-6))) #f))) + (send-event-function s5-13 s3-11) + ) + ) + ) ) ) - ) ) - ) - ((= v1-4 'auto-save) - (auto-save-command - (the-as symbol (command-get-param (car gp-0) #f)) - 0 - 0 - *default-pool* - ) - ) - ((= v1-4 'shadow) - (let ((s5-7 (command-list-get-process (car gp-0))) - (v1-95 (command-get-quoted-param (car (cdr gp-0)) #f)) - ) - (send-event s5-7 'shadow v1-95) - ) - ) - ((= v1-4 'time-of-day) - (when *time-of-day-proc* - (let ((v1-99 (command-get-int (car gp-0) 0))) - (cond - ((< v1-99 0) - (set! (-> *time-of-day-proc* 0 time-ratio) 300.0) - ) - (else - (set! (-> *time-of-day-proc* 0 hour) v1-99) - (set! (-> *time-of-day-proc* 0 minute) 0) - (set! (-> *time-of-day-proc* 0 frame) 0) - (set! (-> *time-of-day-proc* 0 time-ratio) 0.0) - ) - ) - ) - ) - ) - ((= v1-4 'save) - (mem-copy! (&-> *backup-load-state* type) (&-> obj type) 2092) - (set! (-> *backup-load-state* command-list) '()) - (dotimes (v1-112 256) - (if (-> *backup-load-state* object-name v1-112) - (set! (-> *backup-load-state* object-name v1-112) #f) - ) - ) - ) - ((= v1-4 'setting-reset) - (set-setting! (the-as symbol (command-get-param (car gp-0) #f)) (command-get-param (car (cdr gp-0)) #f) 0.0 0) - ) - ((= v1-4 'setting-unset) - (remove-setting! (the-as symbol (command-get-param (car gp-0) #f))) - ) - ;; PAL patch here - ((= v1-4 'sfx-volume) - (set-setting! 'sfx-volume (command-get-param (car gp-0) #f) (command-get-float (car (cdr gp-0)) 0.0) 0) - ) - ((= v1-4 'blackout) - (set-blackout-frames - (the int (* 5.0000005 (the float (command-get-int (car gp-0) 0)))) - ) - ) - ((= v1-4 'teleport) - (set! *teleport* #t) - ) - ((= v1-4 'joint) - (send-event - (ppointer->process (-> *setting-control* current movie)) - 'joint - (command-get-param (car gp-0) #f) - ) - (set! *teleport-count* 2) - ) - ((= v1-4 'ambient) - (ambient-hint-spawn - (the-as string (command-get-param (car (cdr gp-0)) #f)) - (the-as vector #f) - *entity-pool* - (the-as symbol (command-get-param (car gp-0) #f)) - ) - ) - ((= v1-4 'send-event) - (let ((s5-13 (command-list-get-process (car gp-0))) - (s4-14 (command-get-quoted-param (car (cdr gp-0)) #f)) - (gp-6 (cdr (cdr gp-0))) - ) - (when (and s5-13 (not (null? s4-14))) - (let ((s3-11 (new 'stack-no-clear 'event-message-block))) - (set! (-> s3-11 from) pp) - (let ((a0-142 gp-6)) - (set! - (-> s3-11 num-params) - ((method-of-type (rtype-of a0-142) length) a0-142) - ) - ) - (set! (-> s3-11 message) (the-as symbol s4-14)) - (set! - (-> s3-11 param 0) - (the-as uint (command-get-quoted-param (car gp-6) #f)) - ) - (set! - (-> s3-11 param 1) - (the-as uint (command-get-quoted-param (car (cdr gp-6)) #f)) - ) - (set! - (-> s3-11 param 2) - (the-as uint (command-get-quoted-param (car (cdr (cdr gp-6))) #f)) - ) - (send-event-function s5-13 s3-11) - ) - ) - ) - ) ) ) - ) + 0 + (none) ) - 0 - (none) - ) ) (defun check-boundary ((arg0 load-boundary)) (local-vars (s5-0 object)) (let ((a1-0 (if (logtest? (-> arg0 flags) (load-boundary-flags player)) - (-> *load-boundary-target* 1) - (-> *load-boundary-target* 0) - ) - ) + (-> *load-boundary-target* 1) + (-> *load-boundary-target* 0) + ) + ) (a2-0 (if (logtest? (-> arg0 flags) (load-boundary-flags player)) - (-> *load-boundary-target* 3) - (-> *load-boundary-target* 2) - ) + (-> *load-boundary-target* 3) + (-> *load-boundary-target* 2) + ) + ) + ) + 0 + (let ((f0-1 (- (-> a1-0 x) (-> arg0 rejector x))) + (f1-2 (- (-> a1-0 z) (-> arg0 rejector z))) + ) + (cond + ((< (+ (* f0-1 f0-1) (* f1-2 f1-2)) (* (-> arg0 rejector w) (-> arg0 rejector w))) + (if (logtest? (-> arg0 flags) (load-boundary-flags closed)) + (set! s5-0 (check-closed-boundary arg0 a1-0 a2-0)) + (set! s5-0 (check-open-boundary arg0 a1-0 a2-0)) + ) + ) + (else + (set! s5-0 0) + (goto cfg-28) + ) + ) + ) + ) + (let ((s4-0 (the-as load-boundary-crossing-command #f))) + (if (= (the-as symbol s5-0) 1) + (set! s4-0 (-> arg0 cmd-fwd)) + ) + (if (= (the-as symbol s5-0) 2) + (set! s4-0 (-> arg0 cmd-bwd)) + ) + (when s4-0 + (cond + ((= (-> s4-0 cmd) (load-boundary-cmd vis)) + (load-state-want-vis (the-as symbol (-> s4-0 lev0))) + ) + ((= (-> s4-0 cmd) (load-boundary-cmd load)) + (load-state-want-levels (the-as symbol (-> s4-0 lev0)) (the-as symbol (-> s4-0 lev1))) + ) + ((= (-> s4-0 cmd) (load-boundary-cmd display)) + (load-state-want-display-level (the-as symbol (-> s4-0 lev0)) (the-as symbol (-> s4-0 lev1))) + ) + ((= (-> s4-0 cmd) (load-boundary-cmd force-vis)) + (load-state-want-force-vis (the-as symbol (-> s4-0 lev0)) (the-as symbol (-> s4-0 lev1))) + ) + ((= (-> s4-0 cmd) (load-boundary-cmd checkpt)) + (format 0 "Setting continue to ~A~%" (-> s4-0 lev0)) + (set-continue! *game-info* (-> s4-0 lev0)) ) ) - 0 - (let ((f0-1 (- (-> a1-0 x) (-> arg0 rejector x))) - (f1-2 (- (-> a1-0 z) (-> arg0 rejector z))) - ) - (cond - ((< - (+ (* f0-1 f0-1) (* f1-2 f1-2)) - (* (-> arg0 rejector w) (-> arg0 rejector w)) - ) - (if (logtest? (-> arg0 flags) (load-boundary-flags closed)) - (set! s5-0 (check-closed-boundary arg0 a1-0 a2-0)) - (set! s5-0 (check-open-boundary arg0 a1-0 a2-0)) - ) ) - (else - (set! s5-0 0) - (goto cfg-28) - ) - ) ) - ) - (let ((s4-0 (the-as load-boundary-crossing-command #f))) - (if (= (the-as symbol s5-0) 1) - (set! s4-0 (-> arg0 cmd-fwd)) - ) - (if (= (the-as symbol s5-0) 2) - (set! s4-0 (-> arg0 cmd-bwd)) - ) - (when s4-0 - (cond - ((= (-> s4-0 cmd) (load-boundary-cmd vis)) - (load-state-want-vis (the-as symbol (-> s4-0 lev0))) - ) - ((= (-> s4-0 cmd) (load-boundary-cmd load)) - (load-state-want-levels - (the-as symbol (-> s4-0 lev0)) - (the-as symbol (-> s4-0 lev1)) - ) - ) - ((= (-> s4-0 cmd) (load-boundary-cmd display)) - (load-state-want-display-level - (the-as symbol (-> s4-0 lev0)) - (the-as symbol (-> s4-0 lev1)) - ) - ) - ((= (-> s4-0 cmd) (load-boundary-cmd force-vis)) - (load-state-want-force-vis - (the-as symbol (-> s4-0 lev0)) - (the-as symbol (-> s4-0 lev1)) - ) - ) - ((= (-> s4-0 cmd) (load-boundary-cmd checkpt)) - (format 0 "Setting continue to ~A~%" (-> s4-0 lev0)) - (set-continue! *game-info* (-> s4-0 lev0)) - ) - ) - ) - ) (label cfg-28) (none) ) -(define-perm *load-state* load-state (new 'global 'load-state)) \ No newline at end of file +(define-perm *load-state* load-state (new 'global 'load-state)) diff --git a/goal_src/jak1/engine/nav/navigate-h.gc b/goal_src/jak1/engine/nav/navigate-h.gc index 2d4b55035b..6399ddb317 100644 --- a/goal_src/jak1/engine/nav/navigate-h.gc +++ b/goal_src/jak1/engine/nav/navigate-h.gc @@ -33,11 +33,13 @@ (navcf21 21) ;; TODO - nav-control::19 ) +;; DECOMP BEGINS + (deftype nav-poly (structure) - ((id uint8 :offset-assert 0) - (vertex uint8 3 :offset-assert 1) - (adj-poly uint8 3 :offset-assert 4) - (pat uint8 :offset-assert 7) + ((id uint8 :offset-assert 0) + (vertex uint8 3 :offset-assert 1) + (adj-poly uint8 3 :offset-assert 4) + (pat uint8 :offset-assert 7) ) :pack-me :method-count-assert 9 @@ -53,7 +55,7 @@ ) (deftype nav-sphere (structure) - ((trans sphere :inline :offset-assert 0) + ((trans sphere :inline :offset-assert 0) ) :method-count-assert 9 :size-assert #x10 @@ -61,17 +63,17 @@ ) (deftype nav-ray (structure) - ((current-pos vector :inline :offset-assert 0) - (dir vector :inline :offset-assert 16) - (dest-pos vector :inline :offset-assert 32) - (current-poly nav-poly :offset-assert 48) - (next-poly nav-poly :offset-assert 52) - (len meters :offset-assert 56) - (last-edge int8 :offset-assert 60) - (terminated symbol :offset-assert 64) ;; TODO - guesses - (reached-dest symbol :offset-assert 68) ;; TODO - guesses - (hit-boundary symbol :offset-assert 72) ;; TODO - guesses - (hit-gap symbol :offset-assert 76) ;; TODO - guesses + ((current-pos vector :inline :offset-assert 0) + (dir vector :inline :offset-assert 16) + (dest-pos vector :inline :offset-assert 32) + (current-poly nav-poly :offset-assert 48) + (next-poly nav-poly :offset-assert 52) + (len meters :offset-assert 56) + (last-edge int8 :offset-assert 60) + (terminated symbol :offset-assert 64) + (reached-dest symbol :offset-assert 68) + (hit-boundary symbol :offset-assert 72) + (hit-gap symbol :offset-assert 76) ) :method-count-assert 9 :size-assert #x50 @@ -79,9 +81,9 @@ ) (deftype nav-route-portal (structure) - ((next-poly nav-poly :offset-assert 0) - (vertex nav-vertex 2 :offset-assert 4) - (edge-index int8 :offset-assert 12) + ((next-poly nav-poly :offset-assert 0) + (vertex nav-vertex 2 :offset-assert 4) + (edge-index int8 :offset-assert 12) ) :method-count-assert 9 :size-assert #xd @@ -90,15 +92,15 @@ (deftype clip-travel-vector-to-mesh-return-info (structure) - ((found-boundary symbol :offset-assert 0) - (intersection vector :inline :offset-assert 16) - (boundary-normal vector :inline :offset-assert 32) - (prev-normal vector :inline :offset-assert 48) - (next-normal vector :inline :offset-assert 64) - (poly nav-poly :offset-assert 80) - (gap-poly nav-poly :offset-assert 84) - (edge int32 :offset-assert 88) - (vert-prev vector :inline :offset-assert 96) + ((found-boundary symbol :offset-assert 0) + (intersection vector :inline :offset-assert 16) + (boundary-normal vector :inline :offset-assert 32) + (prev-normal vector :inline :offset-assert 48) + (next-normal vector :inline :offset-assert 64) + (poly nav-poly :offset-assert 80) + (gap-poly nav-poly :offset-assert 84) + (edge int32 :offset-assert 88) + (vert-prev vector :inline :offset-assert 96) (vert-0 vector :inline :offset-assert 112) (vert-1 vector :inline :offset-assert 128) (vert-next vector :inline :offset-assert 144) @@ -109,24 +111,24 @@ ) (deftype nav-node (structure) - ((center-x float :offset-assert 0) - (center-y float :offset-assert 4) - (center-z float :offset-assert 8) - (type uint16 :offset-assert 12) - (parent-offset uint16 :offset-assert 14) - (center vector :inline :offset 0) - (radius-x float :offset-assert 16) - (radius-y float :offset-assert 20) - (radius-z float :offset-assert 24) - (left-offset uint16 :offset-assert 28) - (right-offset uint16 :offset-assert 30) - (num-tris uint32 :offset 28) - (radius vector :inline :offset 16) - (scale-x float :offset-assert 32) - (first-tris uint8 4 :offset-assert 36) - (scale-z float :offset-assert 40) - (last-tris uint8 4 :offset-assert 44) - (scale vector :inline :offset 32) + ((center-x float :offset-assert 0) + (center-y float :offset-assert 4) + (center-z float :offset-assert 8) + (type uint16 :offset-assert 12) + (parent-offset uint16 :offset-assert 14) + (center vector :inline :offset 0) + (radius-x float :offset-assert 16) + (radius-y float :offset-assert 20) + (radius-z float :offset-assert 24) + (left-offset uint16 :offset-assert 28) + (right-offset uint16 :offset-assert 30) + (num-tris uint32 :offset 28) + (radius vector :inline :offset 16) + (scale-x float :offset-assert 32) + (first-tris uint8 4 :offset-assert 36) + (scale-z float :offset-assert 40) + (last-tris uint8 4 :offset-assert 44) + (scale vector :inline :offset 32) ) :method-count-assert 9 :size-assert #x30 @@ -134,14 +136,14 @@ ) (deftype nav-lookup-elem (structure) - ((vec vector :inline :offset-assert 0) - (y-thresh float :offset 12) - (time uint32 :offset-assert 16) - (node-offset uint32 :offset-assert 20) - (lookup-type uint8 :offset-assert 24) - (poly-ind uint8 :offset-assert 25) - (dummy0 uint16 :offset-assert 26) - (dummy uint32 :offset-assert 28) + ((vec vector :inline :offset-assert 0) + (y-thresh float :offset 12) + (time uint32 :offset-assert 16) + (node-offset uint32 :offset-assert 20) + (lookup-type uint8 :offset-assert 24) + (poly-ind uint8 :offset-assert 25) + (dummy0 uint16 :offset-assert 26) + (dummy uint32 :offset-assert 28) ) :method-count-assert 9 :size-assert #x20 @@ -149,21 +151,21 @@ ) (deftype nav-mesh (basic) - ((user-list engine :offset-assert 4) - (poly-lookup-history uint8 2 :offset-assert 8) - (debug-time uint8 :offset-assert 10) - (static-sphere-count uint8 :offset-assert 11) - (static-sphere (inline-array nav-sphere) :offset-assert 12) - (bounds sphere :inline :offset-assert 16) - (origin vector :inline :offset-assert 32) - (cache nav-lookup-elem 4 :inline :offset-assert 48) ;; guess on type - (node-count int32 :offset-assert 176) - (nodes (inline-array nav-node) :offset-assert 180) - (vertex-count int32 :offset-assert 184) - (vertex (inline-array nav-vertex) :offset-assert 188) - (poly-count int32 :offset-assert 192) - (poly (inline-array nav-poly) :offset-assert 196) - (route (inline-array vector4ub) :offset-assert 200) ;; this is a guess, it's probably wrong -- but its something with a uint8 at offset 0 + ((user-list engine :offset-assert 4) + (poly-lookup-history uint8 2 :offset-assert 8) + (debug-time uint8 :offset-assert 10) + (static-sphere-count uint8 :offset-assert 11) + (static-sphere (inline-array nav-sphere) :offset-assert 12) + (bounds sphere :inline :offset-assert 16) + (origin vector :inline :offset-assert 32) + (cache nav-lookup-elem 4 :inline :offset-assert 48) + (node-count int32 :offset-assert 176) + (nodes (inline-array nav-node) :offset-assert 180) + (vertex-count int32 :offset-assert 184) + (vertex (inline-array nav-vertex) :offset-assert 188) + (poly-count int32 :offset-assert 192) + (poly (inline-array nav-poly) :offset-assert 196) + (route (inline-array vector4ub) :offset-assert 200) ) :method-count-assert 30 :size-assert #xcc @@ -181,14 +183,14 @@ ;; - you hit a nav mesh boundary/gap ;; - you cross 15 triangles. (try-move-along-ray (_type_ nav-poly vector vector float) meters 15) - (TODO-RENAME-16 (_type_ vector nav-poly vector symbol float clip-travel-vector-to-mesh-return-info) none 16) + (nav-mesh-method-16 (_type_ vector nav-poly vector symbol float clip-travel-vector-to-mesh-return-info) none 16) (update-route-table (_type_) none 17) ;; (initialization related) - (dummy-18 (_type_ int vector int (pointer int8) int) none 18) ;; something to do with routes. + (nav-mesh-method-18 (_type_ int vector int (pointer int8) int) none 18) ;; something to do with routes. (compute-bounding-box (_type_ vector vector) none 19) (debug-draw-poly (_type_ nav-poly rgba) none 20) ;; TODO - is rgba a vector4w? (point-in-poly? (_type_ nav-poly vector) symbol 21) ;; is the point inside of the triangle? (find-opposite-vertices (_type_ nav-poly nav-poly) uint 22) ;; given two triangles that share an edge, get the indices of the two vertices that aren't part of the edge. - (dummy-23 (_type_ nav-poly vector vector vector nav-route-portal) vector 23) + (nav-mesh-method-23 (_type_ nav-poly vector vector vector nav-route-portal) vector 23) (closest-point-on-boundary (_type_ nav-poly vector vector) vector 24) ;; find the closest point on the perimeter of the triangle. (project-point-into-tri-3d (_type_ nav-poly vector vector) none 25) ;; will move a 3D point in space to the surface of this nav-poly ;; Looking from the top down, is the point inside the nav-poly? @@ -210,9 +212,9 @@ (define-extern *default-nav-mesh* nav-mesh) (deftype check-vector-collision-with-nav-spheres-info (structure) - ((u float :offset-assert 0) - (intersect vector :inline :offset-assert 16) - (normal vector :inline :offset-assert 32) + ((u float :offset-assert 0) + (intersect vector :inline :offset-assert 16) + (normal vector :inline :offset-assert 32) ) :method-count-assert 9 :size-assert #x30 @@ -220,8 +222,8 @@ ) (deftype nav-gap-info (structure) - ((dest vector :inline :offset-assert 0) - (poly nav-poly :offset-assert 16) + ((dest vector :inline :offset-assert 0) + (poly nav-poly :offset-assert 16) ) :method-count-assert 9 :size-assert #x14 @@ -229,65 +231,65 @@ ) (deftype nav-control (basic) - ((flags nav-control-flags :offset-assert 4) - (process basic :offset-assert 8) - (shape collide-shape :offset-assert 12) - (mesh nav-mesh :offset-assert 16) - (gap-event basic :offset-assert 20) - (block-event basic :offset-assert 24) - (current-poly nav-poly :offset-assert 28) - (next-poly nav-poly :offset-assert 32) - (target-poly nav-poly :offset-assert 36) - (portal nav-route-portal 2 :offset-assert 40) ;; guess - (nearest-y-threshold meters :offset-assert 48) - (event-temp vector :inline :offset-assert 64) - (old-travel vector :inline :offset-assert 80) - (blocked-travel vector :inline :offset-assert 96) - (prev-pos vector :inline :offset-assert 112) - (extra-nav-sphere vector :inline :offset-assert 128) - (travel vector :inline :offset-assert 144) - (target-pos vector :inline :offset-assert 160) - (destination-pos vector :inline :offset-assert 176) - (block-time time-frame :offset-assert 192) - (block-count float :offset-assert 200) - (user-poly nav-poly :offset-assert 204) - (nav-cull-radius float :offset-assert 208) - (num-spheres int16 :offset-assert 212) - (max-spheres int16 :offset-assert 214) - (sphere sphere :inline :dynamic :offset-assert 224) ;; guess + ((flags nav-control-flags :offset-assert 4) + (process basic :offset-assert 8) + (shape collide-shape :offset-assert 12) + (mesh nav-mesh :offset-assert 16) + (gap-event basic :offset-assert 20) + (block-event basic :offset-assert 24) + (current-poly nav-poly :offset-assert 28) + (next-poly nav-poly :offset-assert 32) + (target-poly nav-poly :offset-assert 36) + (portal nav-route-portal 2 :offset-assert 40) + (nearest-y-threshold meters :offset-assert 48) + (event-temp vector :inline :offset-assert 64) + (old-travel vector :inline :offset-assert 80) + (blocked-travel vector :inline :offset-assert 96) + (prev-pos vector :inline :offset-assert 112) + (extra-nav-sphere vector :inline :offset-assert 128) + (travel vector :inline :offset-assert 144) + (target-pos vector :inline :offset-assert 160) + (destination-pos vector :inline :offset-assert 176) + (block-time time-frame :offset-assert 192) + (block-count float :offset-assert 200) + (user-poly nav-poly :offset-assert 204) + (nav-cull-radius float :offset-assert 208) + (num-spheres int16 :offset-assert 212) + (max-spheres int16 :offset-assert 214) + (sphere sphere :inline :dynamic :offset-assert 224) ) :method-count-assert 36 :size-assert #xe0 :flag-assert #x24000000e0 (:methods - (new (symbol type collide-shape int float) _type_) + (new (symbol type collide-shape int float) _type_ 0) (debug-draw (_type_) none 9) (point-in-bounds? (_type_ vector) symbol 10) - (dummy-11 (_type_ vector) vector 11) - (TODO-RENAME-12 (_type_ nav-gap-info) symbol 12) - (dummy-13 (_type_ vector vector) vector 13) ;; see - puffer::20 | second vector may be clip-travel-vector-to-mesh-return-info though + (nav-control-method-11 (_type_ vector) vector 11) + (nav-control-method-12 (_type_ nav-gap-info) symbol 12) + (nav-control-method-13 (_type_ vector vector) vector 13) ;; see - puffer::20 | second vector may be clip-travel-vector-to-mesh-return-info though (set-current-poly! (_type_ nav-poly) none 14) (set-target-pos! (_type_ vector) none 15) - (dummy-16 (_type_ vector) nav-poly 16) ; see - nav-enemy-test-point-in-nav-mesh? + (nav-control-method-16 (_type_ vector) nav-poly 16) ; see - nav-enemy-test-point-in-nav-mesh? (project-onto-nav-mesh (_type_ vector vector) vector 17) ;; moves point to nav-mesh. (find-poly (_type_ vector) nav-poly 18) - (dummy-19 (_type_ vector collide-shape-moving vector float) none 19) ;; csm not trsqv? ret not vector? + (nav-control-method-19 (_type_ vector collide-shape-moving vector float) none 19) ;; csm not trsqv? ret not vector? (project-point-into-tri-3d (_type_ nav-poly vector vector) vector 20) - (TODO-RENAME-21 (_type_ vector) nav-poly 21) - (TODO-RENAME-22 (_type_ vector float) symbol 22) - (dummy-23 (_type_ vector check-vector-collision-with-nav-spheres-info) float 23) ;; TODO - unconfirmed maybe (dummy-23 (_type_ vector matrix) float 23) - (dummy-24 (_type_ float clip-travel-vector-to-mesh-return-info) none 24) + (nav-control-method-21 (_type_ vector) nav-poly 21) + (nav-control-method-22 (_type_ vector float) symbol 22) + (nav-control-method-23 (_type_ vector check-vector-collision-with-nav-spheres-info) float 23) ;; TODO - unconfirmed maybe + (nav-control-method-24 (_type_ float clip-travel-vector-to-mesh-return-info) none 24) (is-in-mesh? (_type_ vector float) symbol 25) ; see - nav-enemy-test-point-near-nav-mesh? - (TODO-RENAME-26 (_type_) none 26) ;; stub - (TODO-RENAME-27 (_type_) none 27) - (TODO-RENAME-28 (_type_ collide-kind) none 28) + (nav-control-method-26 (_type_) none 26) ;; stub + (nav-control-method-27 (_type_) none 27) + (nav-control-method-28 (_type_ collide-kind) none 28) (should-display? (_type_) symbol 29) - (dummy-30 (_type_ vector vector vector) sphere 30) ;; TODO - last arg? - it has a float as the first arg, vector is a total guess + (nav-control-method-30 (_type_ vector vector vector) sphere 30) ;; TODO - last arg? - it has a float as the first arg, vector is a total guess (intersect-ray-line-segment? (_type_ vector vector vector vector) symbol 31) - (TODO-ASM-32 (_type_ vector vector vector vector float) symbol 32) - (TODO-RENAME-33 (_type_ vector vector vector vector float) symbol 33) - (dummy-34 () none 34) - (dummy-35 (_type_ vector vector vector vector float) none 35) + (nav-control-method-32 (_type_ vector vector vector vector float) symbol 32) + (nav-control-method-33 (_type_ vector vector vector vector float) symbol 33) + (nav-control-method-34 () none 34) + (nav-control-method-35 (_type_ vector vector vector vector float) none 35) ) ) @@ -354,43 +356,43 @@ ) ) -(defmethod new nav-control ((allocation symbol) (type-to-make type) (shape collide-shape) (sphere-count int) (nearest-y-threshold-default float)) +(defmethod new nav-control ((allocation symbol) + (type-to-make type) + (shape collide-shape) + (sphere-count int) + (nearest-y-threshold-default float) + ) (let ((obj (object-new allocation type-to-make (the-as int (+ (-> type-to-make size) (* sphere-count 16)))))) - (when (zero? obj) - (go process-drawable-art-error "memory") - (set! obj (the-as nav-control 0)) - (goto cfg-4) + (when (zero? obj) + (go process-drawable-art-error "memory") + (set! obj (the-as nav-control 0)) + (goto cfg-4) + ) + (set! (-> obj max-spheres) sphere-count) + (set! (-> obj flags) (nav-control-flags navcf8 navcf13)) + (set! (-> obj mesh) (nav-mesh-connect (-> shape process) shape obj)) + (let ((ent (-> shape process entity))) + (set! (-> obj nearest-y-threshold) + (res-lump-float ent 'nearest-y-threshold :default nearest-y-threshold-default) + ) + ) + (set! (-> obj shape) shape) + (set! (-> obj process) (-> shape process)) + (set! (-> obj gap-event) #f) + (set! (-> obj current-poly) #f) + (set! (-> obj next-poly) #f) + (set! (-> obj target-poly) #f) + (set! (-> obj user-poly) #f) + (set! (-> obj portal 0) #f) + (set! (-> obj portal 1) #f) + (set! (-> obj nav-cull-radius) 40960.0) + (label cfg-4) + (the-as nav-control obj) ) - (set! (-> obj max-spheres) sphere-count) - (set! (-> obj flags) (nav-control-flags navcf8 navcf13)) - (set! (-> obj mesh) (nav-mesh-connect (-> shape process) shape obj)) - (let ((ent (-> shape process entity))) - (set! (-> obj nearest-y-threshold) - (res-lump-float ent 'nearest-y-threshold :default nearest-y-threshold-default) - ) - ) - (set! (-> obj shape) shape) - (set! (-> obj process) (-> shape process)) - (set! (-> obj gap-event) #f) - (set! (-> obj current-poly) #f) - (set! (-> obj next-poly) #f) - (set! (-> obj target-poly) #f) - (set! (-> obj user-poly) #f) - (set! (-> obj portal 0) #f) - (set! (-> obj portal 1) #f) - (set! (-> obj nav-cull-radius) 40960.0) - (label cfg-4) - (the-as nav-control obj) - ) ) - -;; definition for method 29 of type nav-control (defmethod should-display? nav-control ((obj nav-control)) - (and - *display-nav-marks* - (logtest? (-> obj flags) (nav-control-flags display-marks)) - ) + (and *display-nav-marks* (logtest? (-> obj flags) (nav-control-flags display-marks))) ) (defmethod point-in-bounds? nav-control ((obj nav-control) (arg0 vector)) @@ -406,8 +408,6 @@ (none) ) -;; definition for function has-nav-mesh? -;; INFO: Return type mismatch structure vs symbol. (defun has-nav-mesh? ((arg0 entity-actor)) "Does the actor have a nav mesh? Either loaded an in the nav-mesh field, or in the res-lump." diff --git a/goal_src/jak1/engine/nav/navigate.gc b/goal_src/jak1/engine/nav/navigate.gc index dc283f2898..139c284a5d 100644 --- a/goal_src/jak1/engine/nav/navigate.gc +++ b/goal_src/jak1/engine/nav/navigate.gc @@ -740,6 +740,7 @@ ) ) +;; ERROR: Failed load: (set! vf3 (l.vf a0-4)) at op 42 (defmethod is-in-mesh? nav-mesh ((obj nav-mesh) (arg0 vector) (arg1 float) (arg2 meters)) (local-vars (v1-10 int)) (rlet ((vf1 :class vf) @@ -983,7 +984,7 @@ (define *nav-update-route-table-route-count* 0) -(defmethod dummy-18 nav-mesh ((obj nav-mesh) (arg0 int) (arg1 vector) (arg2 int) (arg3 (pointer int8)) (arg4 int)) +(defmethod nav-mesh-method-18 nav-mesh ((obj nav-mesh) (arg0 int) (arg1 vector) (arg2 int) (arg3 (pointer int8)) (arg4 int)) (local-vars (sv-32 int) (sv-48 uint)) (set! (-> arg3 arg2) 1) (nav-mesh-update-route-table obj arg0 arg2 (the-as uint 3)) @@ -1007,7 +1008,7 @@ ) (when v0-3 (let* ((a0-16 obj) - (t9-5 (method-of-object a0-16 dummy-18)) + (t9-5 (method-of-object a0-16 nav-mesh-method-18)) (a1-7 arg0) (a2-6 arg1) (t0-1 arg3) @@ -1046,7 +1047,7 @@ (let ((a3-0 (-> s2-0 adj-poly s1-0))) (when (!= a3-0 255) (if (not (logtest? (-> obj poly a3-0 pat) 1)) - (dummy-18 obj s3-0 s5-0 (the-as int a3-0) s4-0 0) + (nav-mesh-method-18 obj s3-0 s5-0 (the-as int a3-0) s4-0 0) ) ) ) @@ -1462,7 +1463,7 @@ ) ) -(defmethod dummy-23 nav-mesh ((obj nav-mesh) (arg0 nav-poly) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 nav-route-portal)) +(defmethod nav-mesh-method-23 nav-mesh ((obj nav-mesh) (arg0 nav-poly) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 nav-route-portal)) (local-vars (v1-32 int) (a0-14 int) (a0-17 int) (a1-10 int) (sv-16 nav-vertex)) (let ((s1-0 (-> obj vertex)) (s0-0 -1) @@ -1880,7 +1881,7 @@ (none) ) -(defmethod dummy-30 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector)) +(defmethod nav-control-method-30 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector)) (let ((s5-0 (the-as sphere #f))) (let ((f30-0 -0.000001)) (countdown (s1-0 (-> obj num-spheres)) @@ -1965,7 +1966,7 @@ (none) ) -(defmethod TODO-RENAME-28 nav-control ((obj nav-control) (arg0 collide-kind)) +(defmethod nav-control-method-28 nav-control ((obj nav-control) (arg0 collide-kind)) (local-vars (sv-32 nav-control) (sv-48 sphere) @@ -1981,7 +1982,9 @@ ) (when (and *target* (or (logtest? (-> obj flags) (nav-control-flags navcf11)) - (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying)) + (logtest? (-> *target* state-flags) + (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) + ) ) ) (let ((s2-0 obj) @@ -2113,10 +2116,10 @@ (none) ) -(defmethod dummy-35 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) +(defmethod nav-control-method-35 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) (let ((v1-0 (new 'stack-no-clear 'vector))) (vector-! v1-0 arg1 (-> obj mesh origin)) - (TODO-ASM-32 obj arg0 v1-0 arg2 arg3 arg4) + (nav-control-method-32 obj arg0 v1-0 arg2 arg3 arg4) ) (none) ) @@ -2254,7 +2257,7 @@ ) ) -(defmethod TODO-ASM-32 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) +(defmethod nav-control-method-32 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) (local-vars (v0-3 symbol) (v1-38 int) (a0-29 int) (a3-7 int) (sv-208 sphere)) (let ((gp-0 (new 'stack-no-clear 'nav-control-cfs-work))) (set! (-> gp-0 in-dir quad) (-> arg2 quad)) @@ -2408,7 +2411,7 @@ v0-3 ) -(defmethod dummy-23 nav-control ((obj nav-control) (arg0 vector) (arg1 check-vector-collision-with-nav-spheres-info)) +(defmethod nav-control-method-23 nav-control ((obj nav-control) (arg0 vector) (arg1 check-vector-collision-with-nav-spheres-info)) (let ((s2-1 (vector-! (new 'stack-no-clear 'vector) (-> obj shape trans) (-> obj mesh origin))) (f30-0 -1.0) ) @@ -2449,9 +2452,9 @@ ) ) -(defmethod TODO-RENAME-33 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) +(defmethod nav-control-method-33 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) (let ((f30-0 (vector-xz-length (-> obj travel)))) - (when (TODO-ASM-32 obj arg0 arg1 arg2 arg3 f30-0) + (when (nav-control-method-32 obj arg0 arg1 arg2 arg3 f30-0) (set! (-> obj blocked-travel quad) (-> obj travel quad)) (let ((f0-0 (vector-xz-length (-> obj travel)))) (when (and (>= f30-0 f0-0) (< f0-0 204.8)) @@ -2480,7 +2483,7 @@ (define *test-ray-dest-pos* (new 'static 'vector :x -722887.7 :y 9532.475 :z -958862.25 :w 1.0)) -(defmethod dummy-19 nav-control ((obj nav-control) (arg0 vector) (arg1 collide-shape-moving) (arg2 vector) (arg3 float)) +(defmethod nav-control-method-19 nav-control ((obj nav-control) (arg0 vector) (arg1 collide-shape-moving) (arg2 vector) (arg3 float)) (local-vars (sv-48 float)) (let ((f30-0 (* arg3 (-> *display* seconds-per-frame))) (s0-0 arg1) @@ -2503,7 +2506,7 @@ (logclear! (-> obj flags) (nav-control-flags navcf21)) (vector+! arg0 (-> arg1 trans) s2-1) ) - (when (or (not (dummy-16 obj arg0)) + (when (or (not (nav-control-method-16 obj arg0)) (logtest? (nav-control-flags navcf17) (-> obj flags)) (not (logtest? (-> obj flags) (nav-control-flags navcf10))) ) @@ -2518,7 +2521,7 @@ (none) ) -(defmethod dummy-16 nav-control ((obj nav-control) (arg0 vector)) +(defmethod nav-control-method-16 nav-control ((obj nav-control) (arg0 vector)) (find-poly-fast (-> obj mesh) (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj mesh origin)) @@ -2526,7 +2529,7 @@ ) ) -(defmethod TODO-RENAME-21 nav-control ((obj nav-control) (arg0 vector)) +(defmethod nav-control-method-21 nav-control ((obj nav-control) (arg0 vector)) (find-poly-fast (-> obj mesh) (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj mesh origin)) @@ -2534,7 +2537,7 @@ ) ) -(defmethod TODO-RENAME-22 nav-control ((obj nav-control) (arg0 vector) (arg1 float)) +(defmethod nav-control-method-22 nav-control ((obj nav-control) (arg0 vector) (arg1 float)) (the-as symbol (and (find-poly-fast (-> obj mesh) (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj mesh origin)) @@ -2555,12 +2558,12 @@ ) ) -(defmethod TODO-RENAME-26 nav-control ((obj nav-control)) +(defmethod nav-control-method-26 nav-control ((obj nav-control)) 0 (none) ) -(defmethod TODO-RENAME-27 nav-control ((obj nav-control)) +(defmethod nav-control-method-27 nav-control ((obj nav-control)) (local-vars (v1-7 symbol)) (cond ((-> obj current-poly) @@ -2601,19 +2604,19 @@ (set! (-> obj current-poly) (find-poly obj (-> obj shape trans))) ) ) - (TODO-RENAME-26 obj) + (nav-control-method-26 obj) 0 (none) ) -(defmethod TODO-RENAME-16 nav-mesh ((obj nav-mesh) - (arg0 vector) - (arg1 nav-poly) - (arg2 vector) - (arg3 symbol) - (arg4 float) - (arg5 clip-travel-vector-to-mesh-return-info) - ) +(defmethod nav-mesh-method-16 nav-mesh ((obj nav-mesh) + (arg0 vector) + (arg1 nav-poly) + (arg2 vector) + (arg3 symbol) + (arg4 float) + (arg5 clip-travel-vector-to-mesh-return-info) + ) (local-vars (v1-10 symbol) (sv-96 symbol) (sv-112 int) (sv-128 int)) (when arg5 (set! (-> arg5 found-boundary) #f) @@ -2699,10 +2702,10 @@ (none) ) -(defmethod dummy-24 nav-control ((obj nav-control) (arg0 float) (arg1 clip-travel-vector-to-mesh-return-info)) +(defmethod nav-control-method-24 nav-control ((obj nav-control) (arg0 float) (arg1 clip-travel-vector-to-mesh-return-info)) (let ((v1-0 (new 'stack-no-clear 'vector))) (vector-! v1-0 (-> obj shape trans) (-> obj mesh origin)) - (TODO-RENAME-16 + (nav-mesh-method-16 (-> obj mesh) v1-0 (-> obj current-poly) @@ -2820,7 +2823,7 @@ ) ) -(defmethod dummy-13 nav-control ((obj nav-control) (arg0 vector) (arg1 vector)) +(defmethod nav-control-method-13 nav-control ((obj nav-control) (arg0 vector) (arg1 vector)) (local-vars (sv-80 vector) (sv-84 vector) @@ -2907,9 +2910,9 @@ ) ) ) - (TODO-RENAME-33 obj (-> obj travel) sv-84 (-> obj travel) arg1 40960.0) + (nav-control-method-33 obj (-> obj travel) sv-84 (-> obj travel) arg1 40960.0) (let ((s5-1 (new 'stack-no-clear 'clip-travel-vector-to-mesh-return-info))) - (TODO-RENAME-16 + (nav-mesh-method-16 (-> obj mesh) sv-84 sv-88 @@ -2930,7 +2933,7 @@ (-> obj travel) ) -(defmethod TODO-RENAME-12 nav-control ((obj nav-control) (arg0 nav-gap-info)) +(defmethod nav-control-method-12 nav-control ((obj nav-control) (arg0 nav-gap-info)) (when (and (-> obj next-poly) (logtest? (-> obj next-poly pat) 1)) (let ((s4-0 (-> obj next-poly)) (s3-1 (vector-! (new 'stack-no-clear 'vector) (-> obj shape trans) (-> obj mesh origin))) @@ -2951,16 +2954,16 @@ ) ) -(defmethod dummy-11 nav-control ((obj nav-control) (arg0 vector)) +(defmethod nav-control-method-11 nav-control ((obj nav-control) (arg0 vector)) (set! (-> obj old-travel quad) (-> obj travel quad)) (-> obj block-count) (seek! (-> obj block-count) 0.0 0.016666668) (logclear! (-> obj flags) (nav-control-flags navcf9 navcf17 navcf18 navcf19)) - (TODO-RENAME-27 obj) + (nav-control-method-27 obj) (if (logtest? (-> obj flags) (nav-control-flags navcf8)) - (TODO-RENAME-28 obj (the-as collide-kind -1)) + (nav-control-method-28 obj (the-as collide-kind -1)) ) - (dummy-13 obj arg0 (-> obj old-travel)) + (nav-control-method-13 obj arg0 (-> obj old-travel)) (-> obj mesh) (vector-! (new 'stack-no-clear 'vector) (-> obj shape trans) (-> obj mesh origin)) (let ((s5-1 (new 'stack-no-clear 'nav-gap-info))) @@ -2970,7 +2973,7 @@ ) ((-> obj next-poly) (cond - ((TODO-RENAME-12 obj s5-1) + ((nav-control-method-12 obj s5-1) (set! (-> obj next-poly) #f) (send-event (the-as process-tree (-> obj process)) diff --git a/goal_src/jak1/engine/target/logic-target.gc b/goal_src/jak1/engine/target/logic-target.gc index 20a7e7f11c..71558af622 100644 --- a/goal_src/jak1/engine/target/logic-target.gc +++ b/goal_src/jak1/engine/target/logic-target.gc @@ -1229,7 +1229,7 @@ (defbehavior target-compute-edge target () (let ((s5-0 *edge-grab-info*)) - (if (not (dummy-9 s5-0)) + (if (not (edge-grab-info-method-9 s5-0)) (send-event self 'end-mode) ) (if *display-edge-collision-marks* @@ -1286,7 +1286,7 @@ (defbehavior target-compute-edge-rider target () (let ((gp-0 *edge-grab-info*)) - (if (not (dummy-9 gp-0)) + (if (not (edge-grab-info-method-9 gp-0)) (send-event self 'end-mode) ) (if *display-edge-collision-marks* diff --git a/goal_src/jak1/engine/target/sidekick.gc b/goal_src/jak1/engine/target/sidekick.gc index aa87a04ea3..ba88ca7dc3 100644 --- a/goal_src/jak1/engine/target/sidekick.gc +++ b/goal_src/jak1/engine/target/sidekick.gc @@ -66,11 +66,11 @@ ) (defstate sidekick-clone (sidekick) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 object)) - (case arg2 + (case event-type (('matrix) - (case (-> arg3 param 0) + (case (-> event param 0) (('play-anim) (set! v0-0 (-> self node-list data)) (set! (-> (the-as (inline-array cspace) v0-0) 0 param0) cspace<-cspace+quaternion!) @@ -103,13 +103,13 @@ v0-0 ) (('shadow) - (set! v0-0 (-> arg3 param 0)) + (set! v0-0 (-> event param 0)) (set! (-> self shadow-in-movie?) (the-as symbol v0-0)) v0-0 ) (('blend-shape) (cond - ((-> arg3 param 0) + ((-> event param 0) (set! v0-0 (logior (-> self skel status) (janim-status blerc))) (set! (-> self skel status) (the-as janim-status v0-0)) ) @@ -208,7 +208,7 @@ ) (let ((a0-26 (-> self skel effect))) (if a0-26 - (TODO-RENAME-9 a0-26) + (effect-control-method-9 a0-26) ) ) (if (logtest? (-> self skel status) (janim-status blerc blerc-done)) @@ -261,7 +261,3 @@ (defun starts () (send-event *target* 'sidekick #t) ) - - - - diff --git a/goal_src/jak1/engine/target/target-death.gc b/goal_src/jak1/engine/target/target-death.gc index 05b0fedd2f..8e598060cc 100644 --- a/goal_src/jak1/engine/target/target-death.gc +++ b/goal_src/jak1/engine/target/target-death.gc @@ -729,8 +729,8 @@ (ja-no-eval :group! eichar-jump-ja :num! (seek!) :frame-num 0.0) (when (= (-> arg0 angle) 'air) (sound-play "smack-surface") - (dummy-10 (-> self skel effect) 'group-smack-surface (the-as float 0.0) 5) - (dummy-10 (-> self skel effect) 'group-smack-surface-dizzy (the-as float 0.0) 8) + (effect-control-method-10 (-> self skel effect) 'group-smack-surface (the-as float 0.0) 5) + (effect-control-method-10 (-> self skel effect) 'group-smack-surface-dizzy (the-as float 0.0) 8) ) ) (('shove) diff --git a/goal_src/jak1/engine/target/target-handler.gc b/goal_src/jak1/engine/target/target-handler.gc index a7458be7a0..19d715f94d 100644 --- a/goal_src/jak1/engine/target/target-handler.gc +++ b/goal_src/jak1/engine/target/target-handler.gc @@ -9,304 +9,280 @@ ;; DECOMP BEGINS -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 37] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 39] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 60] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 69] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 73] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 151] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 168] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 185] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 196] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 201] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 222] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 292] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 351] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 366] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 408] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 420] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 427] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 451] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 465] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 472] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 482] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 524] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 552] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 563] (defbehavior target-generic-event-handler target ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) (local-vars (v0-0 object)) - (let ((v1-0 arg2)) - (the-as - object - (cond - ((= v1-0 'get-pickup) - (when (zero? (logand (-> self state-flags) (state-flags dying))) - (let ((s4-0 (-> arg3 param 0)) - (f28-0 (the-as float (-> arg3 param 1))) - ) - (if (!= (pickup-collectable! - (-> self fact-info-target) - (the-as pickup-type s4-0) - (the-as float 0.0) - (the-as handle #f) - ) - (pickup-collectable! (-> self fact-info-target) (the-as pickup-type s4-0) f28-0 (process->handle arg0)) + (the-as + object + (case arg2 + (('get-pickup) + (when (not (logtest? (-> self state-flags) (state-flags dying))) + (let ((s4-0 (-> arg3 param 0)) + (f28-0 (the-as float (-> arg3 param 1))) + ) + (if (!= (pickup-collectable! + (-> self fact-info-target) + (the-as pickup-type s4-0) + (the-as float 0.0) + (the-as handle #f) ) - #t - 'full - ) - ) + (pickup-collectable! (-> self fact-info-target) (the-as pickup-type s4-0) f28-0 (process->handle arg0)) + ) + #t + 'full + ) ) ) - ((= v1-0 'reset-pickup) - (reset! (-> self fact-info-target) (the-as symbol (-> arg3 param 0))) + ) + (('reset-pickup) + (the-as object (reset! (-> self fact-info-target) (the-as symbol (-> arg3 param 0)))) + ) + (('reset-collide) + (cond + ((-> self control unknown-symbol00) + (target-collide-set! (-> self control unknown-symbol00) (-> self control unknown-float90)) + ) + ((-> self control unknown-symbol30) + (target-danger-set! (-> self control unknown-symbol30) #f) + ) ) - ((= v1-0 'reset-collide) - (cond - ((-> self control unknown-symbol00) - (target-collide-set! (-> self control unknown-symbol00) (-> self control unknown-float90)) - ) - ((-> self control unknown-symbol30) - (target-danger-set! (-> self control unknown-symbol30) #f) - ) - ) - ) - ((= v1-0 'level-deactivate) - #f - ) - ((= v1-0 'level-enter) - (let ((v1-21 (level-get *level* (the-as symbol (-> arg3 param 0))))) - (when v1-21 - (let ((s5-1 (-> v1-21 info))) - (let ((v1-22 (-> s5-1 buzzer))) - (if (zero? v1-22) - (set! (-> self fact-info-target buzzer) 0.0) - (set! (-> self fact-info-target buzzer) (pickup-collectable! - (-> self fact-info-target) - (pickup-type buzzer) - (the float (logior -65536 v1-22)) - (the-as handle #f) - ) - ) - ) - ) - (if (and (zero? (-> *game-info* enter-level-time (-> s5-1 index))) - (>= (-> *level-task-data-remap* length) (-> s5-1 index)) - ) - (set! (-> *game-info* enter-level-time (-> *level-task-data-remap* (+ (-> s5-1 index) -1))) - (-> *display* base-frame-counter) + ) + (('level-deactivate) + #f + ) + (('level-enter) + (let ((v1-21 (level-get *level* (the-as symbol (-> arg3 param 0))))) + (when v1-21 + (let ((s5-1 (-> v1-21 info))) + (let ((v1-22 (-> s5-1 buzzer))) + (if (zero? v1-22) + (set! (-> self fact-info-target buzzer) 0.0) + (set! (-> self fact-info-target buzzer) (pickup-collectable! + (-> self fact-info-target) + (pickup-type buzzer) + (the float (logior -65536 v1-22)) + (the-as handle #f) + ) ) ) ) - (send-event (ppointer->process (-> *hud-parts* buzzers)) 'sync) - (format #t "GAMEPLAY: enter ~A~%" (-> arg3 param 0)) + (if (and (zero? (-> *game-info* enter-level-time (-> s5-1 index))) + (>= (-> *level-task-data-remap* length) (-> s5-1 index)) + ) + (set! (-> *game-info* enter-level-time (-> *level-task-data-remap* (+ (-> s5-1 index) -1))) + (-> *display* base-frame-counter) + ) + ) + ) + (send-event (ppointer->process (-> *hud-parts* buzzers)) 'sync) + (format #t "GAMEPLAY: enter ~A~%" (-> arg3 param 0)) + ) + ) + ) + (('get-attack-count) + (set! v0-0 (+ (-> self control unknown-dword51) (-> arg3 param 0))) + (set! (-> self control unknown-dword51) (the-as int v0-0)) + v0-0 + ) + (('continue) + (go target-continue (the-as continue-point (-> arg3 param 0))) + ) + (('query) + (case (-> arg3 param 0) + (('powerup) + (and (= (-> self fact-info-target eco-type) (-> arg3 param 1)) (< 0.0 (-> self fact-info-target eco-level))) + ) + (('pickup) + (pickup-collectable! + (-> self fact-info-target) + (the-as pickup-type (-> arg3 param 1)) + (the-as float 0.0) + (the-as handle #f) + ) + ) + (('ground-height) + (target-height-above-ground) + ) + ) + ) + (('trans) + (case (-> arg3 param 0) + (('save) + (set! (-> self alt-cam-pos quad) (-> self control trans quad)) + (set! (-> self state-flags) (logior (state-flags has-saved-position) (-> self state-flags))) + (mem-copy! (the-as pointer (-> arg3 param 1)) (the-as pointer (-> self control trans)) 48) + ) + (('restore) + (logclear! (-> self state-flags) (state-flags has-saved-position)) + (let ((gp-1 (-> arg3 param 1))) + (move-to-point! (-> self control) (the-as vector (+ gp-1 0))) + (quaternion-copy! (-> self control quat) (the-as quaternion (+ gp-1 16))) + ) + (rot->dir-targ! (-> self control)) + (logior! (-> self control status) (cshape-moving-flags onsurf onground tsurf)) + (set! v0-0 (-> *display* base-frame-counter)) + (set! (-> self control unknown-dword11) (the-as time-frame v0-0)) + v0-0 + ) + (('reset) + (set! v0-0 (logclear (-> self state-flags) (state-flags has-saved-position))) + (set! (-> self state-flags) (the-as state-flags v0-0)) + v0-0 + ) + ) + ) + (('effect) + (the-as object (target-powerup-effect (the-as symbol (-> arg3 param 0)))) + ) + (('do-effect) + (effect-control-method-10 + (-> self skel effect) + (the-as symbol (-> arg3 param 0)) + (the-as float (-> arg3 param 1)) + -1 + ) + (if (-> self sidekick) + (effect-control-method-10 + (-> self sidekick 0 skel effect) + (the-as symbol (-> arg3 param 0)) + (the-as float (-> arg3 param 1)) + -1 ) ) - ) - ((= v1-0 'get-attack-count) - (set! v0-0 (the-as object (+ (-> self control unknown-dword51) (-> arg3 param 0)))) - (set! (-> self control unknown-dword51) (the-as int v0-0)) - v0-0 - ) - ((= v1-0 'continue) - (go target-continue (the-as continue-point (-> arg3 param 0))) - ) - ((= v1-0 'query) - (case (-> arg3 param 0) - (('powerup) - (and (= (-> self fact-info-target eco-type) (-> arg3 param 1)) (< 0.0 (-> self fact-info-target eco-level))) - ) - (('pickup) - (pickup-collectable! - (-> self fact-info-target) - (the-as pickup-type (-> arg3 param 1)) - (the-as float 0.0) - (the-as handle #f) - ) - ) - (('ground-height) - (target-height-above-ground) - ) + ) + (('neck) + (set! (-> self neck flex-blend) (the-as float (-> arg3 param 0))) + (cond + ((-> arg3 param 1) + (set! (-> self state-flags) (logior (state-flags looking-at-enemy) (-> self state-flags))) + (set! (-> self alt-neck-pos quad) (-> (the-as vector (-> arg3 param 1)) quad)) + (the-as object (look-at-enemy! (-> self neck) (-> self alt-neck-pos) 'force arg0)) + ) + (else + (set! v0-0 (logclear (-> self state-flags) (state-flags looking-at-enemy))) + (set! (-> self state-flags) (the-as state-flags v0-0)) + v0-0 ) ) - ((= v1-0 'trans) - (case (-> arg3 param 0) - (('save) - (set! (-> self alt-cam-pos quad) (-> self control trans quad)) - (set! (-> self state-flags) (logior (state-flags has-saved-position) (-> self state-flags))) - (mem-copy! (the-as pointer (-> arg3 param 1)) (the-as pointer (-> self control trans)) 48) - ) - (('restore) - (logclear! (-> self state-flags) (state-flags has-saved-position)) - (let ((gp-1 (-> arg3 param 1))) - (move-to-point! (-> self control) (the-as vector (+ gp-1 0))) - (quaternion-copy! (-> self control quat) (the-as quaternion (+ gp-1 16))) - ) - (rot->dir-targ! (-> self control)) - (logior! (-> self control status) (cshape-moving-flags onsurf onground tsurf)) - (set! v0-0 (the-as object (-> *display* base-frame-counter))) - (set! (-> self control unknown-dword11) (the-as time-frame v0-0)) - v0-0 - ) - (('reset) - (set! v0-0 (the-as object (logclear (-> self state-flags) (state-flags has-saved-position)))) - (set! (-> self state-flags) (the-as state-flags v0-0)) - v0-0 - ) - ) - ) - ((= v1-0 'effect) - (target-powerup-effect (the-as symbol (-> arg3 param 0))) - ) - ((= v1-0 'do-effect) - (dummy-10 (-> self skel effect) (the-as symbol (-> arg3 param 0)) (the-as float (-> arg3 param 1)) -1) - (if (-> self sidekick) - (dummy-10 - (-> self sidekick 0 skel effect) - (the-as symbol (-> arg3 param 0)) - (the-as float (-> arg3 param 1)) - -1 - ) - ) - ) - ((= v1-0 'neck) - (set! (-> self neck flex-blend) (the-as float (-> arg3 param 0))) - (cond - ((-> arg3 param 1) - (set! (-> self state-flags) (logior (state-flags looking-at-enemy) (-> self state-flags))) - (set! (-> self alt-neck-pos quad) (-> (the-as vector (-> arg3 param 1)) quad)) - (look-at-enemy! (-> self neck) (-> self alt-neck-pos) 'force arg0) - ) - (else - (set! v0-0 (the-as object (logclear (-> self state-flags) (state-flags looking-at-enemy)))) - (set! (-> self state-flags) (the-as state-flags v0-0)) - v0-0 - ) - ) - ) - ((= v1-0 'sidekick) - (cond - ((and (-> arg3 param 0) (not (-> self sidekick))) - (let ((gp-2 (get-process *default-dead-pool* sidekick #x4000))) - (set! v0-0 (when gp-2 - (let ((t9-21 (method-of-type sidekick activate))) - (t9-21 (the-as sidekick gp-2) self 'sidekick (the-as pointer #x70004000)) - ) - (run-now-in-process gp-2 init-sidekick) - (-> gp-2 ppointer) + ) + (('sidekick) + (cond + ((and (-> arg3 param 0) (not (-> self sidekick))) + (let ((gp-2 (get-process *default-dead-pool* sidekick #x4000))) + (set! v0-0 (when gp-2 + (let ((t9-21 (method-of-type sidekick activate))) + (t9-21 (the-as sidekick gp-2) self 'sidekick (the-as pointer #x70004000)) ) - ) - ) - (set! (-> self sidekick) (the-as (pointer sidekick) v0-0)) - v0-0 + (run-now-in-process gp-2 init-sidekick) + (-> gp-2 ppointer) + ) + ) ) - ((and (not (-> arg3 param 0)) (-> self sidekick)) - (deactivate (-> self sidekick 0)) - (set! (-> self sidekick) (the-as (pointer sidekick) #f)) - #f + (set! (-> self sidekick) (the-as (pointer sidekick) v0-0)) + v0-0 + ) + ((and (not (-> arg3 param 0)) (-> self sidekick)) + (deactivate (-> self sidekick 0)) + (set! (-> self sidekick) (the-as (pointer sidekick) #f)) + #f + ) + ) + ) + (('blend-shape) + (if (-> arg3 param 0) + (logior! (-> self skel status) (janim-status blerc)) + (logclear! (-> self skel status) (janim-status blerc)) + ) + (let ((v1-105 (new 'stack-no-clear 'event-message-block))) + (set! (-> v1-105 from) arg0) + (set! (-> v1-105 num-params) arg1) + (set! (-> v1-105 message) arg2) + (set! (-> v1-105 param 0) (-> arg3 param 0)) + (set! (-> v1-105 param 1) (-> arg3 param 1)) + (set! (-> v1-105 param 2) (-> arg3 param 2)) + (set! (-> v1-105 param 3) (-> arg3 param 3)) + (set! (-> v1-105 param 4) (-> arg3 param 4)) + (set! (-> v1-105 param 5) (-> arg3 param 5)) + (set! (-> v1-105 param 6) (-> arg3 param 6)) + (send-event-function (ppointer->process (-> self sidekick)) v1-105) + ) + ) + (('shadow) + (cond + ((-> arg3 param 0) + (let ((v1-108 (-> self draw shadow-ctrl))) + (logclear! (-> v1-108 settings flags) (shadow-flags disable-draw)) ) - ) - ) - ((= v1-0 'blend-shape) - (if (-> arg3 param 0) - (logior! (-> self skel status) (janim-status blerc)) - (logclear! (-> self skel status) (janim-status blerc)) + 0 + ) + (else + (let ((v1-110 (-> self draw shadow-ctrl))) + (logior! (-> v1-110 settings flags) (shadow-flags disable-draw)) ) - (let ((v1-105 (new 'stack-no-clear 'event-message-block))) - (set! (-> v1-105 from) arg0) - (set! (-> v1-105 num-params) arg1) - (set! (-> v1-105 message) arg2) - (set! (-> v1-105 param 0) (-> arg3 param 0)) - (set! (-> v1-105 param 1) (-> arg3 param 1)) - (set! (-> v1-105 param 2) (-> arg3 param 2)) - (set! (-> v1-105 param 3) (-> arg3 param 3)) - (set! (-> v1-105 param 4) (-> arg3 param 4)) - (set! (-> v1-105 param 5) (-> arg3 param 5)) - (set! (-> v1-105 param 6) (-> arg3 param 6)) - (send-event-function (ppointer->process (-> self sidekick)) v1-105) + 0 ) ) - ((= v1-0 'shadow) - (cond - ((-> arg3 param 0) - (let ((v1-108 (-> self draw shadow-ctrl))) - (logclear! (-> v1-108 settings flags) (shadow-flags disable-draw)) - ) - 0 - ) - (else - (let ((v1-110 (-> self draw shadow-ctrl))) - (logior! (-> v1-110 settings flags) (shadow-flags disable-draw)) - ) - 0 + ) + (('rotate-y-angle) + (quaternion-rotate-y! + (-> self control unknown-quaternion00) + (-> self control unknown-quaternion00) + (the-as float (-> arg3 param 0)) + ) + (if (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) + (rot->dir-targ! (-> self control)) + ) + ) + (('touched) + (send-event arg0 'touch (-> arg3 param 0)) + ) + (('dry) + (set! (-> self water drip-wetness) 0.0) + ) + (('reset-height) + (set! (-> self control unknown-vector52 quad) (-> self control trans quad)) + #f + ) + (('draw) + (if (-> arg3 param 0) + (logclear! (-> self draw status) (draw-status skip-bones)) + (logior! (-> self draw status) (draw-status skip-bones)) + ) + (let ((v1-132 (new 'stack-no-clear 'event-message-block))) + (set! (-> v1-132 from) arg0) + (set! (-> v1-132 num-params) arg1) + (set! (-> v1-132 message) arg2) + (set! (-> v1-132 param 0) (-> arg3 param 0)) + (set! (-> v1-132 param 1) (-> arg3 param 1)) + (set! (-> v1-132 param 2) (-> arg3 param 2)) + (set! (-> v1-132 param 3) (-> arg3 param 3)) + (set! (-> v1-132 param 4) (-> arg3 param 4)) + (set! (-> v1-132 param 5) (-> arg3 param 5)) + (set! (-> v1-132 param 6) (-> arg3 param 6)) + (send-event-function (ppointer->process (-> self manipy)) v1-132) + ) + ) + (('no-load-wait) + (set! v0-0 (+ (-> *display* base-frame-counter) (the-as time-frame (-> arg3 param 0)))) + (set! (-> self no-load-wait) (the-as time-frame v0-0)) + v0-0 + ) + (('no-look-around) + (set! (-> self no-look-around-wait) + (+ (-> *display* base-frame-counter) (the-as time-frame (-> arg3 param 0))) ) + (if (= (-> self next-state name) 'target-look-around) + (send-event self 'end-mode) ) + ) + (('change-state) + (go + (the-as (state object object object object target) (-> arg3 param 0)) + (-> arg3 param 1) + (-> arg3 param 2) + (-> arg3 param 3) + (-> arg3 param 4) ) - ((= v1-0 'rotate-y-angle) - (quaternion-rotate-y! - (-> self control unknown-quaternion00) - (-> self control unknown-quaternion00) - (the-as float (-> arg3 param 0)) - ) - (if (= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0) - (rot->dir-targ! (-> self control)) - ) - ) - ((= v1-0 'touched) - (send-event arg0 'touch (-> arg3 param 0)) - ) - ((= v1-0 'dry) - (let ((f0-9 0.0)) - (set! (-> self water drip-wetness) f0-9) - f0-9 - ) - ) - ((= v1-0 'reset-height) - (set! (-> self control unknown-vector52 quad) (-> self control trans quad)) - #f - ) - ((= v1-0 'draw) - (if (-> arg3 param 0) - (logclear! (-> self draw status) (draw-status skip-bones)) - (logior! (-> self draw status) (draw-status skip-bones)) - ) - (let ((v1-132 (new 'stack-no-clear 'event-message-block))) - (set! (-> v1-132 from) arg0) - (set! (-> v1-132 num-params) arg1) - (set! (-> v1-132 message) arg2) - (set! (-> v1-132 param 0) (-> arg3 param 0)) - (set! (-> v1-132 param 1) (-> arg3 param 1)) - (set! (-> v1-132 param 2) (-> arg3 param 2)) - (set! (-> v1-132 param 3) (-> arg3 param 3)) - (set! (-> v1-132 param 4) (-> arg3 param 4)) - (set! (-> v1-132 param 5) (-> arg3 param 5)) - (set! (-> v1-132 param 6) (-> arg3 param 6)) - (send-event-function (ppointer->process (-> self manipy)) v1-132) - ) - ) - ((= v1-0 'no-load-wait) - (set! v0-0 (the-as object (+ (-> *display* base-frame-counter) (the-as time-frame (-> arg3 param 0))))) - (set! (-> self no-load-wait) (the-as time-frame v0-0)) - v0-0 - ) - ((= v1-0 'no-look-around) - (set! (-> self no-look-around-wait) - (+ (-> *display* base-frame-counter) (the-as time-frame (-> arg3 param 0))) - ) - (if (= (-> self next-state name) 'target-look-around) - (send-event self 'end-mode) - ) - ) - ((= v1-0 'change-state) - (go - (the-as (state object object object object target) (-> arg3 param 0)) - (-> arg3 param 1) - (-> arg3 param 2) - (-> arg3 param 3) - (-> arg3 param 4) - ) - ) - ) + ) ) ) ) @@ -338,8 +314,13 @@ arg0 ) -(defbehavior target-attacked target ((arg0 symbol) (arg1 attack-info) (arg2 process) (arg3 touching-shapes-entry) (arg4 (state symbol attack-info target))) - (when (zero? (logand (-> self state-flags) (state-flags being-attacked))) +(defbehavior target-attacked target ((arg0 symbol) + (arg1 attack-info) + (arg2 process) + (arg3 touching-shapes-entry) + (arg4 (state symbol attack-info target)) + ) + (when (not (logtest? (-> self state-flags) (state-flags being-attacked))) (cond ((or (logtest? (-> self state-flags) (state-flags invulnerable timed-invulnerable invuln-powerup)) (and (logtest? (-> arg1 mask) (attack-mask mode)) @@ -507,10 +488,10 @@ ) ) (else - (dummy-10 (-> self skel effect) 'group-spin-hit (the-as float -1.0) 74) + (effect-control-method-10 (-> self skel effect) 'group-spin-hit (the-as float -1.0) 74) ) ) - (dummy-12 + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) @@ -591,7 +572,7 @@ ) ) ) - (dummy-12 + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) @@ -602,7 +583,7 @@ (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 178 (seconds 0.1)) ) ((= v1-5 'flip) - (dummy-12 + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) @@ -683,8 +664,8 @@ ) ) ) - (dummy-10 (-> self skel effect) 'group-uppercut-hit (the-as float -1.0) 23) - (dummy-12 + (effect-control-method-10 (-> self skel effect) 'group-uppercut-hit (the-as float -1.0) 23) + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) @@ -695,9 +676,9 @@ (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 178 (seconds 0.1)) ) ((or (= v1-5 'flop) (= v1-5 'flop-down)) - (dummy-10 (-> self skel effect) 'group-flop-hit (the-as float -1.0) 23) - (dummy-10 (-> self skel effect) 'group-flop-hit (the-as float -1.0) 17) - (dummy-12 + (effect-control-method-10 (-> self skel effect) 'group-flop-hit (the-as float -1.0) 23) + (effect-control-method-10 (-> self skel effect) 'group-flop-hit (the-as float -1.0) 17) + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) @@ -708,7 +689,7 @@ (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 178 (seconds 0.1)) ) ((= v1-5 'flut-attack) - (dummy-12 + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) diff --git a/goal_src/jak1/engine/target/target.gc b/goal_src/jak1/engine/target/target.gc index 8f98cae10f..2ff468cf8c 100644 --- a/goal_src/jak1/engine/target/target.gc +++ b/goal_src/jak1/engine/target/target.gc @@ -1625,7 +1625,7 @@ ) :code (behavior ((arg0 float) (arg1 float)) (ja-channel-push! 2 (seconds 0.05)) - (dummy-10 (-> self skel effect) 'jump-double (the-as float -1.0) -1) + (effect-control-method-10 (-> self skel effect) 'jump-double (the-as float -1.0) -1) (ja-no-eval :group! eichar-jump-ja :num! (seek!) :frame-num (ja-aframe (the-as float 5.0) 0)) (ja :chan 1 :group! eichar-jump-forward-ja :num! (chan 0)) (until (ja-done? 0) @@ -1917,7 +1917,7 @@ ((let ((v1-4 (ja-group))) (or (= v1-4 eichar-launch-jump-ja) (= v1-4 eichar-launch-jump-loop-ja)) ) - (dummy-10 (-> self skel effect) 'group-blue-hit-ground-effect (the-as float 0.0) -1) + (effect-control-method-10 (-> self skel effect) 'group-blue-hit-ground-effect (the-as float 0.0) -1) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.3)) ) (else @@ -2033,7 +2033,7 @@ (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) (>= (-> self fact-info-target eco-level) 1.0) ) - (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 74) + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 74) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) (level-hint-spawn (game-text-id misty-eco-red-first-use) @@ -2218,7 +2218,7 @@ (if (and (logtest? (-> self water flags) (water-flags wt09)) (zero? (mod (- (-> *display* base-frame-counter) (-> self state-time)) 21)) ) - (dummy-13 + (create-splash (-> self water) (the-as float 0.6) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 37)) @@ -2229,7 +2229,7 @@ (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) (>= (-> self fact-info-target eco-level) 1.0) ) - (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) (level-hint-spawn (game-text-id misty-eco-red-first-use) @@ -2456,7 +2456,7 @@ (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) (>= (-> self fact-info-target eco-level) 1.0) ) - (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 70) + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 70) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) (level-hint-spawn (game-text-id misty-eco-red-first-use) @@ -2620,7 +2620,7 @@ (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) (>= (-> self fact-info-target eco-level) 1.0) ) - (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) ) (if (and (= (-> self control unknown-symbol30) 'uppercut) @@ -2675,7 +2675,7 @@ ) (cond ((< 6144.0 (target-height-above-ground)) - (dummy-10 (-> self skel effect) 'swim-flop (the-as float -1.0) -1) + (effect-control-method-10 (-> self skel effect) 'swim-flop (the-as float -1.0) -1) (let ((t9-3 enter-state)) (set! (-> self next-state) target-swim-down) ((the-as (function object :behavior target) t9-3)) @@ -2764,7 +2764,7 @@ (>= (-> self fact-info-target eco-level) 1.0) ) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.5)) - (dummy-10 (-> self skel effect) 'group-red-eco-strike-ground (ja-frame-num 0) 0) + (effect-control-method-10 (-> self skel effect) 'group-red-eco-strike-ground (ja-frame-num 0) 0) (let ((s5-1 (process-spawn touch-tracker :init touch-tracker-init (-> self control trans) 4096.0 30 :to self))) (send-event (ppointer->process s5-1) 'event 'attack 'flop) (send-event @@ -2790,7 +2790,7 @@ (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) (>= (-> self fact-info-target eco-level) 1.0) ) - (dummy-10 + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) @@ -2954,7 +2954,7 @@ ) (< (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.25)) ) - (dummy-10 + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) diff --git a/goal_src/jak1/engine/target/target2.gc b/goal_src/jak1/engine/target/target2.gc index 7f10cd2d3c..24d870bfea 100644 --- a/goal_src/jak1/engine/target/target2.gc +++ b/goal_src/jak1/engine/target/target2.gc @@ -1692,7 +1692,7 @@ ) (when (and (cpad-pressed? (-> self control unknown-cpad-info00 number) circle) (can-feet?)) (sound-play "swim-stroke") - (dummy-13 (-> self water) (the-as float 1.4) (-> self control trans) 0 (-> self control transv)) + (create-splash (-> self water) (the-as float 1.4) (-> self control trans) 0 (-> self control transv)) (go target-attack) ) (if (can-hands? #t) @@ -1737,7 +1737,7 @@ ) (when (and (cpad-pressed? (-> self control unknown-cpad-info00 number) circle) (can-feet?)) (sound-play "swim-stroke") - (dummy-13 (-> self water) (the-as float 1.4) (-> self control trans) 0 (-> self control transv)) + (create-splash (-> self water) (the-as float 1.4) (-> self control trans) 0 (-> self control transv)) (go target-attack) ) (if (can-hands? #t) @@ -1893,7 +1893,7 @@ ) (case (the int (ja-aframe-num 0)) ((15 16 17 18) - (dummy-13 + (create-splash (-> self water) (the-as float 0.2) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 75)) @@ -1903,7 +1903,7 @@ (set! gp-6 (the-as int (-> *display* base-frame-counter))) ) ((46 47 48 49) - (dummy-13 + (create-splash (-> self water) (the-as float 0.2) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 71)) @@ -2282,7 +2282,7 @@ (the-as float 1.0) ) (if (= (ja-aframe-num 0) 73.0) - (dummy-13 (-> self water) (the-as float 0.7) (-> self control trans) 1 *null-vector*) + (create-splash (-> self water) (the-as float 0.7) (-> self control trans) 1 *null-vector*) ) (suspend) (ja :num! (seek!)) diff --git a/goal_src/jak1/engine/ui/hud-h.gc b/goal_src/jak1/engine/ui/hud-h.gc index 1a4bd9cc42..2cc351a5bd 100644 --- a/goal_src/jak1/engine/ui/hud-h.gc +++ b/goal_src/jak1/engine/ui/hud-h.gc @@ -96,7 +96,7 @@ (init-particles! (_type_ int) none 20) (get-icon-pos-x (_type_) int 21) (get-icon-pos-y (_type_) int 22) - (dummy-23 (_type_) none 23) ;; unused + (hud-method-23 (_type_) none 23) (set-pos-and-scale (_type_ symbol symbol) none 24) (get-icon-scale-x (_type_) float 25) (get-icon-scale-y (_type_) float 26) diff --git a/goal_src/jak1/engine/ui/progress/progress-h.gc b/goal_src/jak1/engine/ui/progress/progress-h.gc index 5c81771dfe..645275795a 100644 --- a/goal_src/jak1/engine/ui/progress/progress-h.gc +++ b/goal_src/jak1/engine/ui/progress/progress-h.gc @@ -300,11 +300,11 @@ :size-assert #x2dc :flag-assert #x3b027002dc (:methods - (progress-dummy-14 (_type_) none 14) ;; unused - (progress-dummy-15 (_type_) none 15) ;; unused - (progress-dummy-16 (_type_) none 16) ;; unused + (progress-method-14 (_type_) none 14) + (progress-method-15 (_type_) none 15) + (progress-method-16 (_type_) none 16) (draw-progress (_type_) none 17) - (progress-dummy-18 () none 18) ;; unused + (progress-method-18 () none 18) (visible? (_type_) symbol 19) (hidden? (_type_) symbol 20) (adjust-sprites (_type_) none 21) @@ -330,10 +330,10 @@ (draw-memcard-auto-save-error (_type_ font-context) none 41) (draw-memcard-removed (_type_ font-context) none 42) (draw-memcard-error (_type_ font-context) none 43) - (progress-dummy-44 (_type_) none 44) ;; unused + (progress-method-44 (_type_) none 44) (push! (_type_) none 45) (pop! (_type_) none 46) - (progress-dummy-47 (_type_) none 47) ;; unused + (progress-method-47 (_type_) none 47) (enter! (_type_ progress-screen int) none 48) (draw-memcard-format (_type_ font-context) none 49) (draw-auto-save (_type_ font-context) none 50) diff --git a/goal_src/jak1/kernel-defs.gc b/goal_src/jak1/kernel-defs.gc index 76faf69fa9..7fc1dcfb97 100644 --- a/goal_src/jak1/kernel-defs.gc +++ b/goal_src/jak1/kernel-defs.gc @@ -283,7 +283,7 @@ (deactivate (_type_) none 10) (init-from-entity! (_type_ entity-actor) none 11) (run-logic? (_type_) symbol 12) - (dummy-method () none 13) + (process-tree-method-13 () none 13) ) :size-assert #x20 diff --git a/goal_src/jak1/kernel/gkernel-h.gc b/goal_src/jak1/kernel/gkernel-h.gc index baa9ac1840..1ae1f63ceb 100644 --- a/goal_src/jak1/kernel/gkernel-h.gc +++ b/goal_src/jak1/kernel/gkernel-h.gc @@ -246,7 +246,7 @@ (deactivate (_type_) none 10) (init-from-entity! (_type_ entity-actor) none 11) (run-logic? (_type_) symbol 12) - (dummy-method () none 13) + (process-tree-method-13 () none 13) ) :size-assert #x20 diff --git a/goal_src/jak1/levels/beach/beach-obs.gc b/goal_src/jak1/levels/beach/beach-obs.gc index 6525a0d3f0..b31e69db83 100644 --- a/goal_src/jak1/levels/beach/beach-obs.gc +++ b/goal_src/jak1/levels/beach/beach-obs.gc @@ -967,7 +967,7 @@ :size-assert #x110 :flag-assert #x1500a00110 (:methods - (dummy-20 (_type_ float float float) none 20) + (flutflutegg-method-20 (_type_ float float float) none 20) ) (:states (flutflutegg-break symbol) @@ -999,7 +999,7 @@ ) ;; WARN: Function (method 20 flutflutegg) has a return type of none, but the expression builder found a return statement. -(defmethod dummy-20 flutflutegg ((obj flutflutegg) (arg0 float) (arg1 float) (arg2 float)) +(defmethod flutflutegg-method-20 flutflutegg ((obj flutflutegg) (arg0 float) (arg1 float) (arg2 float)) (if (< (- (-> *display* base-frame-counter) (the-as time-frame (-> obj last-impulse-time))) (seconds 0.5)) (return 0) ) @@ -1047,8 +1047,8 @@ (f1-2 (- (* (-> s5-1 x) (-> self dir z)) (* (-> s5-1 z) (-> self dir x)))) ) (if (< f0-2 -0.7) - (dummy-20 self 24576.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) - (dummy-20 self 0.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) + (flutflutegg-method-20 self 24576.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) + (flutflutegg-method-20 self 0.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) ) ) ) @@ -1056,7 +1056,7 @@ ) ) :trans (behavior () - (let* ((gp-0 (TODO-RENAME-10 (-> self ambient) (new 'stack-no-clear 'vector) (seconds 3) 368640.0 self)) + (let* ((gp-0 (ambient-control-method-10 (-> self ambient) (new 'stack-no-clear 'vector) (seconds 3) 368640.0 self)) (v1-2 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) (v1-3 (the-as number (logior #x3f800000 v1-2))) (f30-0 (+ -1.0 (the-as float v1-3))) @@ -1143,8 +1143,8 @@ (f1-2 (- (* (-> s5-1 x) (-> self dir z)) (* (-> s5-1 z) (-> self dir x)))) ) (if (< f0-2 -0.7) - (dummy-20 self 24576.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) - (dummy-20 self 0.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) + (the-as symbol (flutflutegg-method-20 self 24576.0 (* -8192.0 f1-2) (* -8192.0 f0-2))) + (the-as symbol (flutflutegg-method-20 self 0.0 (* -8192.0 f1-2) (* -8192.0 f0-2))) ) ) ) @@ -1163,7 +1163,7 @@ (vector+! a1-0 a1-0 (-> self start)) (move-to-point! (-> self root-override) a1-0) ) - (TODO-RENAME-12 (-> self wobbler) (-> self root-override quat)) + (wobbler-method-12 (-> self wobbler) (-> self root-override quat)) (let ((a2-3 (quaternion-axis-angle! (new 'stack-no-clear 'quaternion) 0.0 1.0 0.0 -18204.445))) (quaternion*! (-> self root-override quat) (-> self root-override quat) a2-3) ) @@ -1229,7 +1229,7 @@ #f ) (move! (-> self wobbler)) - (TODO-RENAME-12 (-> self wobbler) (-> self root-override quat)) + (wobbler-method-12 (-> self wobbler) (-> self root-override quat)) (let ((a2-6 (quaternion-axis-angle! (new 'stack-no-clear 'quaternion) 0.0 1.0 0.0 -18204.445))) (quaternion*! (-> self root-override quat) (-> self root-override quat) a2-6) ) diff --git a/goal_src/jak1/levels/beach/bird-lady-beach.gc b/goal_src/jak1/levels/beach/bird-lady-beach.gc index 41273331d8..13318d8805 100644 --- a/goal_src/jak1/levels/beach/bird-lady-beach.gc +++ b/goal_src/jak1/levels/beach/bird-lady-beach.gc @@ -93,13 +93,9 @@ ) (defmethod init-from-entity! bird-lady-beach ((obj bird-lady-beach) (arg0 entity-actor)) - (dummy-40 obj arg0 *bird-lady-beach-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *bird-lady-beach-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task beach-flutflut))) (set! (-> obj sound-flava) (music-flava birdlady)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/beach/bird-lady.gc b/goal_src/jak1/levels/beach/bird-lady.gc index c6c1d1cea2..3c0ceba8ae 100644 --- a/goal_src/jak1/levels/beach/bird-lady.gc +++ b/goal_src/jak1/levels/beach/bird-lady.gc @@ -24,7 +24,7 @@ :shadow bird-lady-shadow-mg ) -(defmethod dummy-52 bird-lady ((obj bird-lady)) +(defmethod process-taskable-method-52 bird-lady ((obj bird-lady)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -134,8 +134,8 @@ (-> obj draw art-group data 3) ) -(defmethod TODO-RENAME-43 bird-lady ((obj bird-lady)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 bird-lady ((obj bird-lady)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.66 f0-2) @@ -157,7 +157,7 @@ ) (defmethod init-from-entity! bird-lady ((obj bird-lady) (arg0 entity-actor)) - (dummy-40 obj arg0 *bird-lady-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *bird-lady-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task beach-flutflut))) (set! (-> obj sound-flava) (music-flava birdlady)) (set! (-> obj draw light-index) (the-as uint 4)) @@ -167,7 +167,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/beach/lurkercrab.gc b/goal_src/jak1/levels/beach/lurkercrab.gc index 950589af11..496b8bdbe7 100644 --- a/goal_src/jak1/levels/beach/lurkercrab.gc +++ b/goal_src/jak1/levels/beach/lurkercrab.gc @@ -75,7 +75,7 @@ :bounds (static-spherem 0 0 0 2.5) ) -(defmethod dummy-44 lurkercrab ((obj lurkercrab) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler lurkercrab ((obj lurkercrab) (arg0 process) (arg1 event-message-block)) (if (and (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf6)) ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) @@ -93,13 +93,13 @@ 6144.0 16384.0 ) - (the-as object (if (zero? (logand (-> obj nav-enemy-flags) (nav-enemy-flags navenmf8))) + (the-as object (if (not (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf8))) (do-push-aways! (-> obj collide-info)) ) ) ) -(defmethod dummy-43 lurkercrab ((obj lurkercrab) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler lurkercrab ((obj lurkercrab) (arg0 process) (arg1 event-message-block)) (let ((s5-0 (-> obj incomming-attack-id))) (set! (-> obj incomming-attack-id) (the-as handle (-> arg1 param 2))) (let ((v1-1 (-> arg1 param 1))) @@ -158,7 +158,7 @@ nav-enemy-default-event-handler -(defmethod TODO-RENAME-37 lurkercrab ((obj lurkercrab)) +(defmethod nav-enemy-method-37 lurkercrab ((obj lurkercrab)) (when (-> obj orient) (if (logtest? (nav-control-flags navcf19) (-> obj nav flags)) (seek-to-point-toward-point! @@ -181,7 +181,7 @@ nav-enemy-default-event-handler (none) ) -(defmethod TODO-RENAME-38 lurkercrab ((obj lurkercrab)) +(defmethod nav-enemy-method-38 lurkercrab ((obj lurkercrab)) (integrate-for-enemy-with-move-to-ground! (-> obj collide-info) (-> obj collide-info transv) @@ -605,7 +605,7 @@ nav-enemy-default-event-handler ) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *lurkercrab-sg* '()) - (TODO-RENAME-45 obj *lurkercrab-nav-enemy-info*) + (init-defaults! obj *lurkercrab-nav-enemy-info*) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 159) obj)) (set! (-> obj orient) #t) (logclear! (-> obj nav-enemy-flags) (nav-enemy-flags navenmf5 navenmf6)) @@ -615,7 +615,3 @@ nav-enemy-default-event-handler (go (method-of-object obj nav-enemy-idle)) (none) ) - - - - diff --git a/goal_src/jak1/levels/beach/lurkerpuppy.gc b/goal_src/jak1/levels/beach/lurkerpuppy.gc index 7056712508..7ce43763ea 100644 --- a/goal_src/jak1/levels/beach/lurkerpuppy.gc +++ b/goal_src/jak1/levels/beach/lurkerpuppy.gc @@ -285,9 +285,9 @@ nav-enemy-default-event-handler (none) ) -(defmethod TODO-RENAME-48 lurkerpuppy ((obj lurkerpuppy)) +(defmethod nav-enemy-method-48 lurkerpuppy ((obj lurkerpuppy)) (initialize-skeleton obj *lurkerpuppy-sg* '()) - (TODO-RENAME-45 obj *lurkerpuppy-nav-enemy-info*) + (init-defaults! obj *lurkerpuppy-nav-enemy-info*) (when (nonzero? (-> obj neck)) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) @@ -296,7 +296,3 @@ nav-enemy-default-event-handler 0 (none) ) - - - - diff --git a/goal_src/jak1/levels/beach/lurkerworm.gc b/goal_src/jak1/levels/beach/lurkerworm.gc index 8c65a75e11..d5be911b1f 100644 --- a/goal_src/jak1/levels/beach/lurkerworm.gc +++ b/goal_src/jak1/levels/beach/lurkerworm.gc @@ -23,7 +23,7 @@ :size-assert #xc8 :flag-assert #x16006000c8 (:methods - (TODO-RENAME-20 (_type_) none 20) + (lurkerworm-method-20 (_type_) none 20) (particle-effect (_type_) none 21) ) (:states @@ -203,11 +203,11 @@ :init-specs ((sp-flt spt-fade-a -0.10666667)) ) -(defmethod TODO-RENAME-20 lurkerworm ((obj lurkerworm)) +(defmethod lurkerworm-method-20 lurkerworm ((obj lurkerworm)) (let ((s5-0 (new 'stack-no-clear 'vector))) (vector-! s5-0 (target-pos 0) (-> obj root-override trans)) (set-target! (-> obj twister) (atan (-> s5-0 x) (-> s5-0 z))) - (TODO-RENAME-11 (-> obj twister)) + (twister-method-11 (-> obj twister)) (let* ((f0-5 (sqrtf (+ (* (-> s5-0 x) (-> s5-0 x)) (* (-> s5-0 z) (-> s5-0 z))))) (f0-6 (atan (-> s5-0 y) f0-5)) ) @@ -233,7 +233,7 @@ (defun lurkerworm-joint-callback ((arg0 lurkerworm)) (let ((a1-0 arg0)) - (TODO-RENAME-12 (-> a1-0 twister) a1-0) + (twister-method-12 (-> a1-0 twister) a1-0) ) 0 (none) @@ -275,7 +275,7 @@ ) (defbehavior lurkerworm-default-post-behavior lurkerworm () - (TODO-RENAME-20 self) + (lurkerworm-method-20 self) (transform-post) 0 (none) @@ -563,7 +563,7 @@ lurkerworm-default-post-behavior (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 157) obj)) (set! (-> obj part2) (create-launch-control (-> *part-group-id-table* 158) obj)) (set! (-> obj twister) (new 'process 'twister 3 15 1092.2667 72.81778 0.25 0.001)) - (TODO-RENAME-9 (-> obj twister) 3 9 910.2222) + (twister-method-9 (-> obj twister) 3 9 910.2222) (set! (-> obj head-tilt) 0.0) (set! (-> obj skel prebind-function) lurkerworm-prebind-function) (set! (-> obj skel postbind-function) lurkerworm-joint-callback) @@ -572,7 +572,3 @@ lurkerworm-default-post-behavior (go lurkerworm-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/beach/mayor.gc b/goal_src/jak1/levels/beach/mayor.gc index ce05519dbb..ed42c70539 100644 --- a/goal_src/jak1/levels/beach/mayor.gc +++ b/goal_src/jak1/levels/beach/mayor.gc @@ -24,7 +24,7 @@ :shadow mayor-shadow-mg ) -(defmethod dummy-52 mayor ((obj mayor)) +(defmethod process-taskable-method-52 mayor ((obj mayor)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -650,8 +650,8 @@ ) ) -(defmethod TODO-RENAME-43 mayor ((obj mayor)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 mayor ((obj mayor)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.8888889 f0-2) @@ -719,15 +719,11 @@ ) (defmethod init-from-entity! mayor ((obj mayor) (arg0 entity-actor)) - (dummy-40 obj arg0 *mayor-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *mayor-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) (set! (-> obj bounce-away) #f) (set! (-> obj tasks) (get-task-control (game-task jungle-lurkerm))) (set! (-> obj sound-flava) (music-flava mayor)) (set! (-> obj draw light-index) (the-as uint 2)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/beach/pelican.gc b/goal_src/jak1/levels/beach/pelican.gc index 71bcd2f0f0..02ff34d0b8 100644 --- a/goal_src/jak1/levels/beach/pelican.gc +++ b/goal_src/jak1/levels/beach/pelican.gc @@ -119,7 +119,7 @@ (eval-path-curve-div! (-> self path) s3-0 f30-0 'interp) (+! (-> s3-0 y) (-> self align align trans y)) (move-to-point! (-> self root-override) s3-0) - (TODO-RENAME-12 (-> self path) s3-0 f30-0) + (path-control-method-12 (-> self path) s3-0 f30-0) ) (if arg4 (set-heading-vec-clear-roll-pitch! (-> self root-override) s3-0) @@ -182,27 +182,25 @@ ) (defstate pelican-circle (pelican) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - object - (cond - ((= v1-0 'dive) - (let ((v0-0 (the-as structure #t))) - (set! (-> self state-object) (the-as symbol v0-0)) - v0-0 - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as + object + (case event-type + (('dive) + (let ((v0-0 (the-as structure #t))) + (set! (-> self state-object) (the-as symbol v0-0)) + v0-0 ) - ((= v1-0 'fuel-cell) - (handle->process (-> self fuel-cell)) + ) + (('fuel-cell) + (handle->process (-> self fuel-cell)) + ) + (('position) + (set! (-> self path-pos) (the-as float (-> event param 0))) + (let ((a1-3 (path-control-method-12 (-> self path) (new 'stack-no-clear 'vector) (-> self path-pos)))) + (set-heading-vec! (-> self root-override) a1-3) ) - ((= v1-0 'position) - (set! (-> self path-pos) (the-as float (-> arg3 param 0))) - (let ((a1-3 (TODO-RENAME-12 (-> self path) (new 'stack-no-clear 'vector) (-> self path-pos)))) - (set-heading-vec! (-> self root-override) a1-3) - ) - ) - ) + ) ) ) ) @@ -320,18 +318,16 @@ ) (defstate pelican-dive (pelican) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'got-cell?) - (-> self state-object) - ) - ((= v1-0 'fuel-cell) - (handle->process (-> self fuel-cell)) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('got-cell?) + (-> self state-object) + ) + (('fuel-cell) + (handle->process (-> self fuel-cell)) + ) + ) + ) ) :enter (behavior ((arg0 path-control) (arg1 curve-control) (arg2 time-frame)) (init! (-> self query) (the-as string #f) 40 150 25 #t (the-as string #f)) @@ -354,7 +350,7 @@ (set! (-> self path-max) (the float (+ (-> self path curve num-cverts) -1))) (set! (-> self path-speed) (/ (* 300.0 (-> self path-max)) (the float (-> *PELICAN-bank* dive-time)))) (let ((gp-1 (new 'stack-no-clear 'vector))) - (TODO-RENAME-12 (-> self path) gp-1 (-> self path-pos)) + (path-control-method-12 (-> self path) gp-1 (-> self path-pos)) (set-heading-vec! (-> self root-override) gp-1) ) (set! (-> self draw force-lod) 0) @@ -437,54 +433,53 @@ ) (defstate pelican-wait-at-nest (pelican) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - object - (cond - ((= v1-0 'attack) - (case (-> arg3 param 1) - (('explode) - (let ((a0-2 (handle->process (-> self fuel-cell)))) - (if a0-2 - (send-event a0-2 'trans (-> self root-override trans)) - ) - ) - (go pelican-explode #f) - #f + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as + object + (case event-type + (('attack) + (case (-> event param 1) + (('explode) + (let ((a0-2 (handle->process (-> self fuel-cell)))) + (if a0-2 + (send-event a0-2 'trans (-> self root-override trans)) + ) ) - (else - (let* ((gp-0 arg0) - (v1-13 (if (and (nonzero? gp-0) (type-type? (-> gp-0 type) process-drawable)) - gp-0 - ) - ) - (f30-0 8192.0) - (gp-1 (-> self root-override)) - (s4-0 (-> (the-as process-drawable v1-13) root trans)) - ) - (if (< f30-0 - (fabs - (deg-diff (y-angle gp-1) (vector-y-angle (vector-! (new 'stack-no-clear 'vector) s4-0 (-> gp-1 trans)))) - ) + (go pelican-explode #f) + #f + ) + (else + (let* ((gp-0 proc) + (v1-13 (if (and (nonzero? gp-0) (type-type? (-> gp-0 type) process-drawable)) + gp-0 + ) + ) + (f30-0 8192.0) + (gp-1 (-> self root-override)) + (s4-0 (-> (the-as process-drawable v1-13) root trans)) + ) + (if (< f30-0 + (fabs + (deg-diff (y-angle gp-1) (vector-y-angle (vector-! (new 'stack-no-clear 'vector) s4-0 (-> gp-1 trans)))) ) - (go pelican-spit) - ) - ) + ) + (go pelican-spit) + ) ) ) ) - ((= v1-0 'touch) - (send-shove-back - (-> self root-override) - arg0 - (the-as touching-shapes-entry (-> arg3 param 0)) - 0.7 - 6144.0 - 16384.0 - ) - ) - ) + ) + (('touch) + (the-as object (send-shove-back + (-> self root-override) + proc + (the-as touching-shapes-entry (-> event param 0)) + 0.7 + 6144.0 + 16384.0 + ) + ) + ) ) ) ) @@ -500,7 +495,7 @@ ) ) ) - (TODO-RENAME-12 (-> self path) (-> self path-vector) (-> self path-pos)) + (path-control-method-12 (-> self path) (-> self path-vector) (-> self path-pos)) (when arg0 (move-to-point! (-> self root-override) (-> self state-vector)) (set-heading-vec! (-> self root-override) (-> self path-vector)) @@ -915,11 +910,10 @@ ) ) ) - (set! (-> obj fuel-cell) (the-as handle (if s5-2 - (ppointer->handle s5-2) - (the-as int #f) - ) - ) + (set! (-> obj fuel-cell) (if s5-2 + (ppointer->handle s5-2) + (the-as handle #f) + ) ) (when s5-2 (send-event @@ -942,7 +936,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/beach/sculptor.gc b/goal_src/jak1/levels/beach/sculptor.gc index b60eae0caf..97e6012179 100644 --- a/goal_src/jak1/levels/beach/sculptor.gc +++ b/goal_src/jak1/levels/beach/sculptor.gc @@ -32,7 +32,7 @@ :shadow sculptor-shadow-mg ) -(defmethod dummy-52 sculptor ((obj sculptor)) +(defmethod process-taskable-method-52 sculptor ((obj sculptor)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -177,8 +177,8 @@ ) ) -(defmethod TODO-RENAME-43 sculptor ((obj sculptor)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 sculptor ((obj sculptor)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.85714287 f0-2) @@ -303,7 +303,7 @@ ) ) ((begin - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (let* ((f30-3 4.0) (v1-287 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) (v1-288 (the-as number (logior #x3f800000 v1-287))) @@ -349,15 +349,11 @@ ) (defmethod init-from-entity! sculptor ((obj sculptor) (arg0 entity-actor)) - (dummy-40 obj arg0 *sculptor-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *sculptor-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task misty-muse))) (set! (-> obj muse) (the-as handle #f)) (set! (-> obj sound-flava) (music-flava sculptor)) (set! (-> obj draw light-index) (the-as uint 3)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/beach/seagull.gc b/goal_src/jak1/levels/beach/seagull.gc index 136e7afab5..3442440acc 100644 --- a/goal_src/jak1/levels/beach/seagull.gc +++ b/goal_src/jak1/levels/beach/seagull.gc @@ -60,12 +60,12 @@ (:methods (move-vertically! (_type_ symbol) none 20) (adjust-heading-around-point-slow! (_type_ float) none 21) - (dummy-22 (_type_) none 22) + (seagull-method-22 (_type_) none 22) (adjust-heading-around-point! (_type_ float) none 23) - (dummy-24 (_type_) none 24) - (dummy-25 (_type_ float) none 25) - (dummy-26 (_type_) symbol 26) - (dummy-27 (_type_) none 27) + (seagull-method-24 (_type_) none 24) + (seagull-method-25 (_type_ float) none 25) + (seagull-method-26 (_type_) symbol 26) + (seagull-method-27 (_type_) none 27) ) (:states seagull-flying @@ -102,7 +102,7 @@ (:methods (spawn-bird (_type_ vector) (pointer process) 14) (play-hint (_type_ int) none 15) - (dummy-16 (_type_ seagull) float 16) + (seagullflock-method-16 (_type_ seagull) float 16) ) (:states seagullflock-at-waterfall @@ -192,7 +192,7 @@ :bounds (static-spherem 0 0 0 2) ) -(defmethod dummy-25 seagull ((obj seagull) (arg0 float)) +(defmethod seagull-method-25 seagull ((obj seagull) (arg0 float)) (let ((f1-1 (the float (sar (shl (the int (- arg0 (-> obj heading))) 48) 48))) (f0-5 (- (-> obj tilt))) ) @@ -226,12 +226,12 @@ (none) ) -(defmethod dummy-24 seagull ((obj seagull)) +(defmethod seagull-method-24 seagull ((obj seagull)) (let ((s5-0 (new 'stack-no-clear 'vector))) (vector-! s5-0 (-> obj flock 0 target) (-> obj root-override trans)) (when (< (vector-dot s5-0 s5-0) 6710886400.0) (let ((v1-5 (ash 1 (-> obj index)))) - (when (zero? (logand v1-5 (-> obj flock 0 bird-at-waterfall))) + (when (not (logtest? v1-5 (-> obj flock 0 bird-at-waterfall))) (logior! (-> obj flock 0 bird-at-waterfall) v1-5) (+! (-> obj flock 0 birds-at-waterfall) 1) ) @@ -332,7 +332,7 @@ (defstate seagull-idle (seagull) :enter (behavior () (let* ((v1-0 (-> self flock)) - (f30-0 (dummy-16 + (f30-0 (seagullflock-method-16 (if v1-0 (-> v1-0 0 self-override) ) @@ -478,7 +478,7 @@ (none) ) -(defmethod dummy-26 seagull ((obj seagull)) +(defmethod seagull-method-26 seagull ((obj seagull)) (let ((s5-0 (new 'stack-no-clear 'vector))) (let ((f30-0 -4096.0) (f28-0 8192.0) @@ -525,13 +525,13 @@ (none) ) -(defmethod dummy-22 seagull ((obj seagull)) +(defmethod seagull-method-22 seagull ((obj seagull)) (set! (-> obj root-override transv y) -8192.0) 0 (none) ) -(defmethod dummy-27 seagull ((obj seagull)) +(defmethod seagull-method-27 seagull ((obj seagull)) (local-vars (at-0 int)) (rlet ((vf0 :class vf) (vf1 :class vf) @@ -605,7 +605,7 @@ ) 0 ) - (dummy-27 self) + (seagull-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 4.0 0))) ) @@ -633,7 +633,7 @@ (until (ja-done? 0) (ja-blend-eval) (when (-> self teleport) - (dummy-26 self) + (seagull-method-26 self) (suspend) 0 ) @@ -643,7 +643,7 @@ (vector-! s4-0 (-> s5-0 flock 0 target) (-> s5-0 root-override trans)) (when (< (vector-dot s4-0 s4-0) 6710886400.0) (let ((v1-24 (ash 1 (-> s5-0 index)))) - (when (zero? (logand v1-24 (-> s5-0 flock 0 bird-at-waterfall))) + (when (not (logtest? v1-24 (-> s5-0 flock 0 bird-at-waterfall))) (logior! (-> s5-0 flock 0 bird-at-waterfall) v1-24) (+! (-> s5-0 flock 0 birds-at-waterfall) 1) ) @@ -780,7 +780,7 @@ (set! (-> s5-1 root-override transv z) (+ (* 0.8 (-> s5-1 root-override transv z)) (* 0.2 f0-44))) ) 0 - (dummy-27 self) + (seagull-method-27 self) (suspend) (ja :num! (seek!)) ) @@ -825,7 +825,7 @@ (until (ja-done? 0) (ja-blend-eval) (when (-> self teleport) - (dummy-26 self) + (seagull-method-26 self) (suspend) 0 ) @@ -835,7 +835,7 @@ (vector-! s5-0 (-> gp-0 flock 0 target) (-> gp-0 root-override trans)) (when (< (vector-dot s5-0 s5-0) 6710886400.0) (let ((v1-26 (ash 1 (-> gp-0 index)))) - (when (zero? (logand v1-26 (-> gp-0 flock 0 bird-at-waterfall))) + (when (not (logtest? v1-26 (-> gp-0 flock 0 bird-at-waterfall))) (logior! (-> gp-0 flock 0 bird-at-waterfall) v1-26) (+! (-> gp-0 flock 0 birds-at-waterfall) 1) ) @@ -930,7 +930,7 @@ (set! (-> gp-1 root-override transv z) (* DISPLAY_FPS_RATIO (+ (* 0.8 (-> gp-1 root-override transv z)) (* 0.2 f0-41)))) ;; changed for high fps ) 0 - (dummy-27 self) + (seagull-method-27 self) (when (< (-> self angletan) 0.2) (if (< (-> self root-override trans y) 40960.0) (go seagull-flying) @@ -1266,7 +1266,7 @@ (none) ) -(defmethod dummy-16 seagullflock ((obj seagullflock) (arg0 seagull)) +(defmethod seagullflock-method-16 seagullflock ((obj seagullflock) (arg0 seagull)) (let ((gp-0 (new 'stack-no-clear 'vector))) (eval-path-curve-div! (-> obj path) gp-0 (the float (-> obj targetnum)) 'interp) (vector-! gp-0 gp-0 (-> arg0 root-override trans)) @@ -1323,7 +1323,7 @@ ) ) ) - (while (zero? (logand (-> gp-0 extra perm status) (entity-perm-status complete))) + (while (not (logtest? (-> gp-0 extra perm status) (entity-perm-status complete))) (suspend) ) ) @@ -1403,19 +1403,12 @@ ) (defun-debug beach-rock-trigger () - (let ((gp-0 600)) - (set! (-> (the-as - seagullflock - (search-process-tree *active-pool* (lambda ((arg0 process)) (= (-> arg0 type) seagullflock))) - ) - teleport-frames + (set! (-> (the-as + seagullflock + (search-process-tree *active-pool* (lambda ((arg0 process)) (= (-> arg0 type) seagullflock))) ) - gp-0 - ) - gp-0 - ) + teleport-frames + ) + 600 + ) ) - - - - diff --git a/goal_src/jak1/levels/beach/twister.gc b/goal_src/jak1/levels/beach/twister.gc index 9aca6ef4f4..ad21dfe23e 100644 --- a/goal_src/jak1/levels/beach/twister.gc +++ b/goal_src/jak1/levels/beach/twister.gc @@ -36,10 +36,10 @@ :flag-assert #xd00000028 (:methods (new (symbol type int int float float float float) _type_ 0) - (TODO-RENAME-9 (_type_ int int float) none 9) + (twister-method-9 (_type_ int int float) none 9) (set-target! (_type_ float) none 10) - (TODO-RENAME-11 (_type_) none 11) - (TODO-RENAME-12 (_type_ process-drawable) none 12) + (twister-method-11 (_type_) none 11) + (twister-method-12 (_type_ process-drawable) none 12) ) ) @@ -77,7 +77,7 @@ (+ (* (-> obj num-joints) 16) 40) ) -(defmethod TODO-RENAME-9 twister ((obj twister) (arg0 int) (arg1 int) (arg2 float)) +(defmethod twister-method-9 twister ((obj twister) (arg0 int) (arg1 int) (arg2 float)) (let ((v1-1 (- arg0 (-> obj first-joint))) (a1-2 (- arg1 (-> obj first-joint))) ) @@ -96,7 +96,7 @@ (none) ) -(defmethod TODO-RENAME-11 twister ((obj twister)) +(defmethod twister-method-11 twister ((obj twister)) (let* ((s5-0 (+ (-> obj num-joints) -1)) (s4-0 (-> obj data s5-0)) ) @@ -134,7 +134,7 @@ (none) ) -(defmethod TODO-RENAME-12 twister ((obj twister) (arg0 process-drawable)) +(defmethod twister-method-12 twister ((obj twister) (arg0 process-drawable)) (let ((s4-0 (new 'stack-no-clear 'matrix))) (dotimes (s3-0 (-> obj num-joints)) (let ((s2-0 (-> arg0 node-list data (+ (-> obj first-joint) s3-0) bone transform))) @@ -148,7 +148,3 @@ 0 (none) ) - - - - diff --git a/goal_src/jak1/levels/beach/wobbler.gc b/goal_src/jak1/levels/beach/wobbler.gc index 511d6fb90b..ae76226cbf 100644 --- a/goal_src/jak1/levels/beach/wobbler.gc +++ b/goal_src/jak1/levels/beach/wobbler.gc @@ -23,7 +23,7 @@ (reset! (_type_ float float float) none 9) (inc-xy-vel! (_type_ float float) none 10) (move! (_type_) none 11) - (TODO-RENAME-12 (_type_ quaternion) none 12) + (wobbler-method-12 (_type_ quaternion) none 12) ) ) @@ -58,7 +58,7 @@ (none) ) -(defmethod TODO-RENAME-12 wobbler ((obj wobbler) (arg0 quaternion)) +(defmethod wobbler-method-12 wobbler ((obj wobbler) (arg0 quaternion)) (let ((s5-0 (new 'stack-no-clear 'vector))) (set! (-> s5-0 x) (-> obj posy)) (set! (-> s5-0 y) 0.0) @@ -73,7 +73,3 @@ 0 (none) ) - - - - diff --git a/goal_src/jak1/levels/citadel/assistant-citadel.gc b/goal_src/jak1/levels/citadel/assistant-citadel.gc index 7902f1c0f9..b7e4a9d1e0 100644 --- a/goal_src/jak1/levels/citadel/assistant-citadel.gc +++ b/goal_src/jak1/levels/citadel/assistant-citadel.gc @@ -74,7 +74,7 @@ (defstate hidden (assistant-lavatube-end) :virtual #t :trans (behavior () - (dummy-33 self) + (process-taskable-method-33 self) ((-> (method-of-type process-taskable hidden) trans)) (when (and (and *target* (>= 61440.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans)))) (not (closed? (-> self tasks) (game-task village4-button) (task-status need-reward-speech))) @@ -121,13 +121,9 @@ ) (defmethod init-from-entity! assistant-lavatube-end ((obj assistant-lavatube-end) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-lavatube-end-sg* 3 29 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-lavatube-end-sg* 3 29 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task village4-button))) (first-any (-> obj tasks) #t) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/citadel/citadel-obs.gc b/goal_src/jak1/levels/citadel/citadel-obs.gc index b203884383..5003c1463b 100644 --- a/goal_src/jak1/levels/citadel/citadel-obs.gc +++ b/goal_src/jak1/levels/citadel/citadel-obs.gc @@ -355,7 +355,7 @@ :flag-assert #x16005000bc (:methods (init! (_type_) none 20) - (dummy-21 (_type_) none 21) + (citb-disc-method-21 (_type_) none 21) ) (:states citb-disc-idle @@ -364,14 +364,14 @@ (defstate citb-disc-idle (citb-disc) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'touch) - (send-event arg0 'no-look-around (seconds 0.25)) - #f - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('touch) + (send-event proc 'no-look-around (seconds 0.25)) + #f + ) + ) + ) ) :trans (the-as (function none :behavior citb-disc) rider-trans) :code (behavior () @@ -416,7 +416,7 @@ (none) ) -(defmethod dummy-21 citb-disc ((obj citb-disc)) +(defmethod citb-disc-method-21 citb-disc ((obj citb-disc)) 0 (none) ) @@ -437,7 +437,7 @@ ) ) ) - (dummy-21 obj) + (citb-disc-method-21 obj) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "rotate-plat" :fo-max 20) (-> obj root-override trans)) ) @@ -482,25 +482,25 @@ ) -(defmethod dummy-21 citb-disc-a ((obj citb-disc-a)) +(defmethod citb-disc-method-21 citb-disc-a ((obj citb-disc-a)) (initialize-skeleton obj *citb-disc-a-sg* '()) 0 (none) ) -(defmethod dummy-21 citb-disc-b ((obj citb-disc-b)) +(defmethod citb-disc-method-21 citb-disc-b ((obj citb-disc-b)) (initialize-skeleton obj *citb-disc-b-sg* '()) 0 (none) ) -(defmethod dummy-21 citb-disc-c ((obj citb-disc-c)) +(defmethod citb-disc-method-21 citb-disc-c ((obj citb-disc-c)) (initialize-skeleton obj *citb-disc-c-sg* '()) 0 (none) ) -(defmethod dummy-21 citb-disc-d ((obj citb-disc-d)) +(defmethod citb-disc-method-21 citb-disc-d ((obj citb-disc-d)) (initialize-skeleton obj *citb-disc-d-sg* '()) 0 (none) @@ -520,7 +520,7 @@ :bounds (static-spherem 0 0 0 8) ) -(defmethod TODO-RENAME-24 citb-iris-door ((obj citb-iris-door)) +(defmethod eco-door-method-24 citb-iris-door ((obj citb-iris-door)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -539,7 +539,7 @@ (none) ) -(defmethod TODO-RENAME-25 citb-iris-door ((obj citb-iris-door)) +(defmethod eco-door-method-25 citb-iris-door ((obj citb-iris-door)) (initialize-skeleton obj *citb-iris-door-sg* '()) (set! (-> obj open-distance) 32768.0) (set! (-> obj close-distance) 49152.0) @@ -564,7 +564,7 @@ ) -(defmethod TODO-RENAME-27 citb-button ((obj citb-button)) +(defmethod basebutton-method-27 citb-button ((obj citb-button)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -587,7 +587,7 @@ (the-as collide-shape-moving 0) ) -(defmethod TODO-RENAME-26 citb-button ((obj citb-button)) +(defmethod basebutton-method-26 citb-button ((obj citb-button)) (initialize-skeleton obj *citb-button-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (ja-channel-set! 1) @@ -654,7 +654,7 @@ *citb-launcher-sg* ) -(defmethod dummy-26 citb-launcher ((obj citb-launcher)) +(defmethod baseplat-method-26 citb-launcher ((obj citb-launcher)) (let ((f30-0 (res-lump-float (-> obj entity) 'spring-height :default 163840.0)) (s5-0 (res-lump-value (-> obj entity) 'mode uint128)) ) @@ -735,12 +735,12 @@ (defstate citb-robotboss-idle (citb-robotboss) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (sv-96 int) (sv-112 int)) (the-as object (cond - ((= arg2 'shield-off) + ((= event-type 'shield-off) (stop! (-> self sound)) (if (-> self shield-on) (sound-play "robotcage-off") @@ -748,17 +748,17 @@ (set! (-> self shield-on) #f) #f ) - ((= arg2 'shield-on) + ((= event-type 'shield-on) (let ((v0-3 #t)) (set! (-> self shield-on) v0-3) v0-3 ) ) - ((= arg2 'die) + ((= event-type 'die) (cleanup-for-death self) (the-as symbol (deactivate self)) ) - ((or (= arg2 'touch) (= arg2 'attack)) + ((or (= event-type 'touch) (= event-type 'attack)) (let ((s4-0 sound-play-by-name) (s3-0 (make-u128 #x7061 (the-as uint #x7a2d646c65696873))) (s2-0 (new-sound-id)) @@ -772,9 +772,9 @@ ) ) (the-as symbol (send-event - arg0 + proc 'shove - (-> arg3 param 0) + (-> event param 0) (static-attack-info ((shove-up (meters 2)) (shove-back (meters 3)))) ) ) @@ -918,8 +918,8 @@ ) (defstate citb-coil-idle (citb-coil) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) (go citb-coil-break) ) @@ -1118,7 +1118,7 @@ :flag-assert #x1600c00124 (:methods (init! (_type_) none 20) - (dummy-21 (_type_) none 21) + (citb-generator-method-21 (_type_) none 21) ) (:states citb-generator-break @@ -1225,8 +1225,8 @@ ) (defstate citb-generator-idle (citb-generator) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('attack) (if (-> self mushroom) (increment-success-for-hint (game-text-id citadel-generator)) @@ -1382,7 +1382,7 @@ (none) ) -(defmethod dummy-21 citb-generator ((obj citb-generator)) +(defmethod citb-generator-method-21 citb-generator ((obj citb-generator)) (initialize-skeleton obj *citb-generator-sg* '()) (setup-lods! (-> obj normal-look) *citb-generator-sg* (-> obj draw art-group) (-> obj entity)) (setup-lods! (-> obj broken-look) *citb-generator-broken-sg* (-> obj draw art-group) (-> obj entity)) @@ -1430,7 +1430,7 @@ (defmethod init-from-entity! citb-generator ((obj citb-generator) (arg0 entity-actor)) (init! obj) (process-drawable-from-entity! obj arg0) - (dummy-21 obj) + (citb-generator-method-21 obj) (let ((v1-4 (entity-actor-lookup (-> obj entity) 'state-actor 0))) (if (not v1-4) (set! v1-4 (-> obj entity)) @@ -1462,8 +1462,8 @@ (defstate citadelcam-idle (citadelcam) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) (when (and (task-complete? *game-info* (game-task citadel-sage-blue)) (task-complete? *game-info* (game-task citadel-sage-red)) @@ -1525,13 +1525,7 @@ (suspend) ) ) - (level-hint-spawn - (game-text-id citadel-plat) - "sksp0387" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (game-text-id citadel-plat) "sksp0387" (the-as entity #f) *entity-pool* (game-task none)) (go citadelcam-idle) (none) ) @@ -1557,13 +1551,7 @@ (defstate battlecontroller-play-intro-camera (citb-battlecontroller) :virtual #t :code (behavior () - (level-hint-spawn - (game-text-id citadel-battle) - "sksp0383" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (game-text-id citadel-battle) "sksp0383" (the-as entity #f) *entity-pool* (game-task none)) (suspend) (let ((gp-1 (ppointer->handle (process-spawn pov-camera @@ -1602,13 +1590,9 @@ ) ) -(defmethod TODO-RENAME-27 citb-battlecontroller ((obj citb-battlecontroller)) +(defmethod battlecontroller-method-27 citb-battlecontroller ((obj citb-battlecontroller)) ((the-as (function battlecontroller none) (find-parent-method citb-battlecontroller 27)) obj) (set! (-> obj activate-distance) 143360.0) 0 (none) ) - - - - diff --git a/goal_src/jak1/levels/citadel/citadel-sages.gc b/goal_src/jak1/levels/citadel/citadel-sages.gc index 768311b979..8516c8572d 100644 --- a/goal_src/jak1/levels/citadel/citadel-sages.gc +++ b/goal_src/jak1/levels/citadel/citadel-sages.gc @@ -38,8 +38,8 @@ :size-assert #x17c :flag-assert #x160110017c (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) none 21) + (citb-sagecage-method-20 (_type_) none 20) + (citb-sagecage-method-21 (_type_) none 21) ) (:states citb-sagecage-idle @@ -91,36 +91,34 @@ ) (defstate citb-sagecage-idle (citb-sagecage) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (local-vars (v0-3 none)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'disable-bars) - (stop! (-> self sound)) - (sound-play "sagecage-off") - (set! (-> self bars-on) #f) - (citb-sagecage-update-collision) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (local-vars (v0-3 basic)) + (the-as object (case event-type + (('disable-bars) + (stop! (-> self sound)) + (sound-play "sagecage-off") + (set! (-> self bars-on) #f) + (the-as basic (citb-sagecage-update-collision)) + ) + (('enable-bars) + (set! (-> self bars-on) #t) + (the-as basic (citb-sagecage-update-collision)) + ) + (('start-cloning) + (set! v0-3 #t) + (set! (-> self cloning) (the-as symbol v0-3)) + v0-3 + ) + (('stop-cloning) + (set! (-> self cloning) #f) + (let ((v1-7 (-> self skel root-channel 0))) + (set! v0-3 (-> self draw art-group data 3)) + (set! (-> v1-7 frame-group) (the-as art-joint-anim v0-3)) ) - ((= v1-0 'enable-bars) - (set! (-> self bars-on) #t) - (citb-sagecage-update-collision) - ) - ((= v1-0 'start-cloning) - (set! v0-3 (the-as none #t)) - (set! (-> self cloning) (the-as symbol v0-3)) - v0-3 - ) - ((= v1-0 'stop-cloning) - (set! (-> self cloning) #f) - (let ((v1-7 (-> self skel root-channel 0))) - (set! v0-3 (the-as none (-> self draw art-group data 3))) - (set! (-> v1-7 frame-group) (the-as art-joint-anim v0-3)) - ) - v0-3 - ) - ) - ) - ) + v0-3 + ) + ) + ) ) :trans (the-as (function none :behavior citb-sagecage) rider-trans) :code (behavior () @@ -159,7 +157,7 @@ ) ) -(defmethod dummy-20 citb-sagecage ((obj citb-sagecage)) +(defmethod citb-sagecage-method-20 citb-sagecage ((obj citb-sagecage)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -184,7 +182,7 @@ (none) ) -(defmethod dummy-21 citb-sagecage ((obj citb-sagecage)) +(defmethod citb-sagecage-method-21 citb-sagecage ((obj citb-sagecage)) (initialize-skeleton obj *citb-sagecage-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (set! (-> obj root-override pause-adjust-distance) 409600.0) @@ -220,11 +218,11 @@ ) (defbehavior citb-sagecage-init-by-other citb-sagecage ((arg0 citb-sage)) - (dummy-20 self) + (citb-sagecage-method-20 self) (mem-copy! (the-as pointer (-> self root-override trans)) (the-as pointer (-> arg0 root-override trans)) 16) (mem-copy! (the-as pointer (-> self root-override quat)) (the-as pointer (-> arg0 root-override quat)) 16) (mem-copy! (the-as pointer (-> self root-override scale)) (the-as pointer (-> arg0 root-override scale)) 16) - (dummy-21 self) + (citb-sagecage-method-21 self) (go citb-sagecage-idle) (none) ) @@ -339,12 +337,12 @@ (the-as symbol 0) ) -(defmethod dummy-45 citb-sage ((obj citb-sage)) +(defmethod process-taskable-method-45 citb-sage ((obj citb-sage)) (set! (-> obj spawn-pos quad) (-> obj root-override trans quad)) (the-as symbol 0) ) -(defmethod dummy-42 citb-sage ((obj citb-sage)) +(defmethod process-taskable-method-42 citb-sage ((obj citb-sage)) (if (not (should-display? obj)) (go (method-of-object obj hidden)) (go (method-of-object obj idle)) @@ -398,20 +396,20 @@ (vector-! (-> self dir) (-> self target-pos) (-> self spawn-pos)) (set! (-> self rot-y) (vector-y-angle (-> self dir))) (set! (-> self rot-x) (- 16384.0 (vector-x-angle (-> self dir)))) - (dummy-45 self) + (process-taskable-method-45 self) (spawn (-> self part) (-> self spawn-pos)) (spawn (-> self part-impact) (-> self target-pos)) ) (defstate play-anim (citb-sage) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('disable-bars) (send-event (handle->process (-> self cage)) 'disable-bars) ) (else - ((-> (method-of-type process-taskable play-anim) event) arg0 arg1 arg2 arg3) + ((-> (method-of-type process-taskable play-anim) event) proc arg1 event-type event) ) ) ) @@ -419,13 +417,13 @@ (defstate idle (citb-sage) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('open) (send-event (handle->process (-> self cage)) 'disable-bars) ) (else - ((-> (method-of-type process-taskable idle) event) arg0 arg1 arg2 arg3) + ((-> (method-of-type process-taskable idle) event) proc arg1 event-type event) ) ) ) @@ -461,7 +459,7 @@ ) -(defmethod dummy-52 red-sagecage ((obj red-sagecage)) +(defmethod process-taskable-method-52 red-sagecage ((obj red-sagecage)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((a0-1 v1-1)) @@ -501,7 +499,7 @@ (none) ) -(defmethod dummy-45 red-sagecage ((obj red-sagecage)) +(defmethod process-taskable-method-45 red-sagecage ((obj red-sagecage)) (set! (-> *part-id-table* 2455 init-specs 14 initial-valuef) (-> obj rot-y)) (set! (-> *part-id-table* 2455 init-specs 13 initial-valuef) (-> obj rot-x)) (set! (-> *part-id-table* 2457 init-specs 14 initial-valuef) (-> obj rot-y)) @@ -535,11 +533,11 @@ (the-as symbol 0) ) -(defmethod TODO-RENAME-43 red-sagecage ((obj red-sagecage)) +(defmethod process-taskable-method-43 red-sagecage ((obj red-sagecage)) (if (-> obj beam-on) (return #f) ) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.6666667 f0-2) @@ -557,11 +555,11 @@ ) (defmethod init-from-entity! red-sagecage ((obj red-sagecage) (arg0 entity-actor)) - (dummy-40 obj arg0 *redsage-sg* 3 33 (new 'static 'vector :w 8192.0) 5) + (process-taskable-method-40 obj arg0 *redsage-sg* 3 33 (new 'static 'vector :w 8192.0) 5) (set! (-> obj tasks) (get-task-control (-> obj entity extra perm task))) (play-reminder obj) (set! (-> obj sound-flava) (music-flava sage-red)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -574,7 +572,7 @@ ) -(defmethod dummy-52 blue-sagecage ((obj blue-sagecage)) +(defmethod process-taskable-method-52 blue-sagecage ((obj blue-sagecage)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((a0-1 v1-1)) @@ -614,7 +612,7 @@ (none) ) -(defmethod dummy-45 blue-sagecage ((obj blue-sagecage)) +(defmethod process-taskable-method-45 blue-sagecage ((obj blue-sagecage)) (set! (-> *part-id-table* 2448 init-specs 14 initial-valuef) (-> obj rot-y)) (set! (-> *part-id-table* 2448 init-specs 13 initial-valuef) (-> obj rot-x)) (set! (-> *part-id-table* 2450 init-specs 14 initial-valuef) (-> obj rot-y)) @@ -653,11 +651,11 @@ (the-as symbol 0) ) -(defmethod TODO-RENAME-43 blue-sagecage ((obj blue-sagecage)) +(defmethod process-taskable-method-43 blue-sagecage ((obj blue-sagecage)) (if (-> obj beam-on) (return #f) ) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.6666667 f0-2) @@ -675,11 +673,11 @@ ) (defmethod init-from-entity! blue-sagecage ((obj blue-sagecage) (arg0 entity-actor)) - (dummy-40 obj arg0 *bluesage-sg* 3 54 (new 'static 'vector :w 8192.0) 5) + (process-taskable-method-40 obj arg0 *bluesage-sg* 3 54 (new 'static 'vector :w 8192.0) 5) (set! (-> obj tasks) (get-task-control (-> obj entity extra perm task))) (play-reminder obj) (set! (-> obj sound-flava) (music-flava sage-blue)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -692,7 +690,7 @@ ) -(defmethod dummy-52 yellow-sagecage ((obj yellow-sagecage)) +(defmethod process-taskable-method-52 yellow-sagecage ((obj yellow-sagecage)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((a0-1 v1-1)) @@ -732,7 +730,7 @@ (none) ) -(defmethod dummy-45 yellow-sagecage ((obj yellow-sagecage)) +(defmethod process-taskable-method-45 yellow-sagecage ((obj yellow-sagecage)) (set! (-> *part-id-table* 2462 init-specs 14 initial-valuef) (-> obj rot-y)) (set! (-> *part-id-table* 2462 init-specs 13 initial-valuef) (-> obj rot-x)) (set! (-> *part-id-table* 2464 init-specs 14 initial-valuef) (-> obj rot-y)) @@ -766,11 +764,11 @@ (the-as symbol 0) ) -(defmethod TODO-RENAME-43 yellow-sagecage ((obj yellow-sagecage)) +(defmethod process-taskable-method-43 yellow-sagecage ((obj yellow-sagecage)) (if (-> obj beam-on) (return #f) ) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.6666667 f0-2) @@ -788,11 +786,11 @@ ) (defmethod init-from-entity! yellow-sagecage ((obj yellow-sagecage) (arg0 entity-actor)) - (dummy-40 obj arg0 *yellowsage-sg* 3 50 (new 'static 'vector :w 8192.0) 5) + (process-taskable-method-40 obj arg0 *yellowsage-sg* 3 50 (new 'static 'vector :w 8192.0) 5) (set! (-> obj tasks) (get-task-control (-> obj entity extra perm task))) (play-reminder obj) (set! (-> obj sound-flava) (music-flava sage-yellow)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -810,7 +808,7 @@ ) -(defmethod dummy-45 green-sagecage ((obj green-sagecage)) +(defmethod process-taskable-method-45 green-sagecage ((obj green-sagecage)) (set! (-> *part-id-table* 2469 init-specs 14 initial-valuef) (-> obj rot-y)) (set! (-> *part-id-table* 2469 init-specs 13 initial-valuef) (-> obj rot-x)) (set! (-> *part-id-table* 2471 init-specs 14 initial-valuef) (-> obj rot-y)) @@ -999,8 +997,8 @@ (defstate play-anim (green-sagecage) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('spawn-robot) (let ((gp-0 (entity-by-name "robotboss-3"))) (format 0 "robotboss ent ~A~%" gp-0) @@ -1014,17 +1012,14 @@ (let ((s5-1 (handle->process (-> self robotboss)))) (when s5-1 (format 0 "robotboss activated ent ~A~%" gp-0) - (let ((f0-0 327680.0)) - (set! (-> (the-as process-drawable s5-1) draw bounds w) f0-0) - f0-0 - ) + (set! (-> (the-as process-drawable s5-1) draw bounds w) 327680.0) ) ) ) ) ) (else - ((-> (method-of-type citb-sage play-anim) event) arg0 arg1 arg2 arg3) + ((-> (method-of-type citb-sage play-anim) event) proc arg1 event-type event) ) ) ) @@ -1142,7 +1137,7 @@ ) (defmethod init-from-entity! green-sagecage ((obj green-sagecage) (arg0 entity-actor)) - (dummy-40 obj arg0 *green-sagecage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *green-sagecage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (-> obj entity extra perm task))) (play-reminder obj) (set! (-> obj evilbro) (the-as handle #f)) @@ -1159,10 +1154,6 @@ ) ) (set! (-> obj sound-flava) (music-flava sage)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/citadel/citb-bunny.gc b/goal_src/jak1/levels/citadel/citb-bunny.gc index 83cc44ae2e..f832cdd4d1 100644 --- a/goal_src/jak1/levels/citadel/citb-bunny.gc +++ b/goal_src/jak1/levels/citadel/citb-bunny.gc @@ -16,7 +16,7 @@ :size-assert #x200 :flag-assert #x4d01900200 (:methods - (TODO-RENAME-48 (_type_ object) none :replace 48) + (citb-bunny-method-48 (_type_ object) none :replace 48) ) ) @@ -78,16 +78,16 @@ ) ) -(defmethod dummy-60 citb-bunny ((obj citb-bunny)) +(defmethod snow-bunny-method-60 citb-bunny ((obj citb-bunny)) (initialize-skeleton obj *citb-bunny-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) 0 (none) ) -(defmethod TODO-RENAME-48 citb-bunny ((obj citb-bunny) (arg0 object)) - (dummy-60 obj) - (TODO-RENAME-45 obj *citb-bunny-nav-enemy-info*) +(defmethod citb-bunny-method-48 citb-bunny ((obj citb-bunny) (arg0 object)) + (snow-bunny-method-60 obj) + (init-defaults! obj *citb-bunny-nav-enemy-info*) (logclear! (-> obj draw shadow-ctrl settings flags) (shadow-flags shdf03)) (cond ((zero? (res-lump-value (-> obj entity) 'mode uint128)) @@ -136,7 +136,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/citadel/citb-drop-plat.gc b/goal_src/jak1/levels/citadel/citb-drop-plat.gc index 38a293dc80..38abb34b11 100644 --- a/goal_src/jak1/levels/citadel/citb-drop-plat.gc +++ b/goal_src/jak1/levels/citadel/citb-drop-plat.gc @@ -49,8 +49,8 @@ :size-assert #xe1 :flag-assert #x16008000e1 (:methods - (TODO-RENAME-20 (_type_) none 20) - (dummy-21 (_type_) none 21) + (drop-plat-method-20 (_type_) none 20) + (drop-plat-method-21 (_type_) none 21) ) (:states drop-plat-die @@ -63,8 +63,8 @@ (defstate drop-plat-idle (drop-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('drop) (logclear! (-> self mask) (process-mask actor-pause)) (go drop-plat-drop) @@ -108,8 +108,8 @@ ) (defstate drop-plat-spawn (drop-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('drop) (go drop-plat-die) ) @@ -138,8 +138,8 @@ ) (defstate drop-plat-rise (drop-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('drop) (go drop-plat-drop) ) @@ -240,7 +240,7 @@ ) ) -(defmethod TODO-RENAME-20 drop-plat ((obj drop-plat)) +(defmethod drop-plat-method-20 drop-plat ((obj drop-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -265,7 +265,7 @@ (none) ) -(defmethod dummy-21 drop-plat ((obj drop-plat)) +(defmethod drop-plat-method-21 drop-plat ((obj drop-plat)) (case (-> obj color) ((1) (initialize-skeleton obj *citb-drop-plat-red-sg* '()) @@ -310,11 +310,11 @@ (set! (-> self color) arg3) (set! (-> self delay) arg1) (set! (-> self duration) arg2) - (TODO-RENAME-20 self) + (drop-plat-method-20 self) (set! (-> self root-override trans quad) (-> arg0 quad)) (vector-identity! (-> self root-override scale)) (quaternion-copy! (-> self root-override quat) (-> (the-as process-drawable (-> self parent 0)) root quat)) - (dummy-21 self) + (drop-plat-method-21 self) (go drop-plat-spawn) (none) ) @@ -459,8 +459,8 @@ ) (defstate citb-drop-plat-idle (citb-drop-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) (go citb-drop-plat-active) ) @@ -476,21 +476,19 @@ ) (defstate citb-drop-plat-active (citb-drop-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'player-stepped) - (when (>= (- (-> *display* base-frame-counter) (-> self drop-time)) (seconds 0.2)) - (set! (-> self drop-time) (-> *display* base-frame-counter)) - (citb-drop-plat-drop-children (the-as int (-> arg3 param 0))) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('player-stepped) + (when (>= (- (-> *display* base-frame-counter) (-> self drop-time)) (seconds 0.2)) + (set! (-> self drop-time) (-> *display* base-frame-counter)) + (the-as object (citb-drop-plat-drop-children (the-as int (-> event param 0)))) ) - ((= v1-0 'trigger) - (go citb-drop-plat-idle) - ) - ) - ) - ) + ) + (('trigger) + (go citb-drop-plat-idle) + ) + ) + ) ) :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -546,7 +544,3 @@ (go citb-drop-plat-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/citadel/citb-plat.gc b/goal_src/jak1/levels/citadel/citb-plat.gc index 35b11de21d..11b7a34c84 100644 --- a/goal_src/jak1/levels/citadel/citb-plat.gc +++ b/goal_src/jak1/levels/citadel/citb-plat.gc @@ -52,10 +52,10 @@ :flag-assert #x19005000b4 (:methods (citb-base-plat-idle () _type_ :state 20) - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) none 22) + (citb-base-plat-method-21 (_type_) none 21) + (citb-base-plat-method-22 (_type_) none 22) (citb-base-plat-active () _type_ :state 23) - (dummy-24 (_type_) none 24) + (citb-base-plat-method-24 (_type_) none 24) ) ) @@ -91,7 +91,7 @@ :post (the-as (function none :behavior citb-base-plat) rider-post) ) -(defmethod dummy-21 citb-base-plat ((obj citb-base-plat)) +(defmethod citb-base-plat-method-21 citb-base-plat ((obj citb-base-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -116,25 +116,25 @@ (none) ) -(defmethod dummy-22 citb-base-plat ((obj citb-base-plat)) +(defmethod citb-base-plat-method-22 citb-base-plat ((obj citb-base-plat)) (initialize-skeleton obj *plat-citb-sg* '()) 0 (none) ) -(defmethod dummy-24 citb-base-plat ((obj citb-base-plat)) +(defmethod citb-base-plat-method-24 citb-base-plat ((obj citb-base-plat)) (go (method-of-object obj citb-base-plat-idle)) 0 (none) ) (defmethod init-from-entity! citb-base-plat ((obj citb-base-plat) (arg0 entity-actor)) - (dummy-21 obj) + (citb-base-plat-method-21 obj) (process-drawable-from-entity! obj arg0) (set! (-> obj idle-distance) 245760.0) - (dummy-22 obj) + (citb-base-plat-method-22 obj) (logior! (-> obj skel status) (janim-status inited)) - (dummy-24 obj) + (citb-base-plat-method-24 obj) (none) ) @@ -147,7 +147,7 @@ ) -(defmethod dummy-24 citb-plat-eco ((obj citb-plat-eco)) +(defmethod baseplat-method-24 citb-plat-eco ((obj citb-plat-eco)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -172,7 +172,7 @@ (none) ) -(defmethod dummy-26 citb-plat-eco ((obj citb-plat-eco)) +(defmethod baseplat-method-26 citb-plat-eco ((obj citb-plat-eco)) (logclear! (-> obj mask) (process-mask actor-pause)) (set! (-> obj notice-dist) 8192.0) (none) @@ -218,7 +218,7 @@ *plat-citb-sg* ) -(defmethod dummy-24 citb-plat ((obj citb-plat)) +(defmethod baseplat-method-24 citb-plat ((obj citb-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -243,7 +243,7 @@ (none) ) -(defmethod dummy-26 citb-plat ((obj citb-plat)) +(defmethod baseplat-method-26 citb-plat ((obj citb-plat)) (logclear! (-> obj mask) (process-mask actor-pause)) (set! (-> obj root-override scale quad) (-> (res-lump-struct (-> obj entity) 'scale vector) quad)) (let ((f0-0 (-> obj root-override scale x))) @@ -284,17 +284,17 @@ (defstate citb-base-plat-idle (citb-stair-plat) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'trigger) - (logclear! (-> self mask) (process-mask actor-pause)) - (let ((v0-0 #t)) - (set! (-> self rise) v0-0) - v0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('trigger) + (logclear! (-> self mask) (process-mask actor-pause)) + (let ((v0-0 #t)) + (set! (-> self rise) v0-0) + v0-0 + ) + ) + ) + ) ) :trans (the-as (function none :behavior citb-stair-plat) #f) :code (behavior () @@ -345,7 +345,7 @@ :post (the-as (function none :behavior citb-stair-plat) ja-post) ) -(defmethod dummy-22 citb-stair-plat ((obj citb-stair-plat)) +(defmethod citb-base-plat-method-22 citb-stair-plat ((obj citb-stair-plat)) (initialize-skeleton obj *plat-citb-sg* '()) (set! (-> obj rise-height) (-> obj root-override trans y)) (set! (-> obj idle-height) (+ -409600.0 (-> obj rise-height))) @@ -365,7 +365,7 @@ (none) ) -(defmethod dummy-24 citb-stair-plat ((obj citb-stair-plat)) +(defmethod citb-base-plat-method-24 citb-stair-plat ((obj citb-stair-plat)) (if (and (task-complete? *game-info* (game-task citadel-sage-blue)) (task-complete? *game-info* (game-task citadel-sage-red)) (task-complete? *game-info* (game-task citadel-sage-yellow)) @@ -420,7 +420,7 @@ ) -(defmethod TODO-RENAME-22 citb-chain-plat ((obj citb-chain-plat) (arg0 vector) (arg1 float)) +(defmethod rigid-body-platform-method-22 citb-chain-plat ((obj citb-chain-plat) (arg0 vector) (arg1 float)) (+ 12288.0 (* 2048.0 (fmax 0.0 (fmin 1.0 (* 0.000024414063 (-> obj float-height-offset)))) @@ -431,7 +431,7 @@ ) ) -(defmethod TODO-RENAME-27 citb-chain-plat ((obj citb-chain-plat) (arg0 vector)) +(defmethod rigid-body-platform-method-27 citb-chain-plat ((obj citb-chain-plat) (arg0 vector)) (let ((gp-0 (new 'stack-no-clear 'vector))) (vector-! gp-0 arg0 (-> obj rbody position)) (set! (-> gp-0 y) 0.0) @@ -440,7 +440,7 @@ ) (when (< 0.0 f1-1) (vector-float*! gp-0 gp-0 (/ f1-1 f0-1)) - (TODO-RENAME-15 (-> obj rbody) gp-0) + (rigid-body-method-15 (-> obj rbody) gp-0) ) ) ) @@ -448,9 +448,9 @@ (none) ) -(defmethod TODO-RENAME-23 citb-chain-plat ((obj citb-chain-plat) (arg0 float)) +(defmethod rigid-body-platform-method-23 citb-chain-plat ((obj citb-chain-plat) (arg0 float)) ((the-as (function rigid-body-platform float none) (find-parent-method citb-chain-plat 23)) obj arg0) - (TODO-RENAME-27 obj (-> obj orig-trans)) + (rigid-body-platform-method-27 obj (-> obj orig-trans)) 0 (none) ) @@ -546,7 +546,7 @@ ) (set! (-> self root-overlay trans quad) (-> self orig-trans quad)) (quaternion-copy! (-> self root-overlay quat) (-> self orig-quat)) - (TODO-RENAME-22 + (rigid-body-method-22 (-> self rbody) (-> self root-overlay trans) (-> self root-overlay quat) @@ -560,7 +560,7 @@ :post (the-as (function none :behavior citb-chain-plat) rider-post) ) -(defmethod TODO-RENAME-30 citb-chain-plat ((obj citb-chain-plat)) +(defmethod rigid-body-platform-method-30 citb-chain-plat ((obj citb-chain-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -585,13 +585,13 @@ (none) ) -(defmethod TODO-RENAME-31 citb-chain-plat ((obj citb-chain-plat)) +(defmethod rigid-body-platform-method-31 citb-chain-plat ((obj citb-chain-plat)) (initialize-skeleton obj *citb-chain-plat-sg* '()) (set! (-> obj orig-trans quad) (-> obj root-overlay trans quad)) (quaternion-copy! (-> obj orig-quat) (-> obj root-overlay quat)) (set! (-> obj beam-end quad) (-> obj orig-trans quad)) (set! (-> obj beam-end y) (+ -49152.0 (-> obj beam-end y))) - (TODO-RENAME-29 obj *citb-chain-plat-constants*) + (rigid-body-platform-method-29 obj *citb-chain-plat-constants*) (set! (-> obj idle-offset) 0.0) (set! (-> obj float-offset) (res-lump-float (-> obj entity) 'height-info :default 4096.0)) (set! (-> obj float-height-offset) (-> obj idle-offset)) @@ -649,7 +649,7 @@ ) ) -(defmethod dummy-21 citb-rotatebox ((obj citb-rotatebox)) +(defmethod citb-base-plat-method-21 citb-rotatebox ((obj citb-rotatebox)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -674,7 +674,7 @@ (none) ) -(defmethod dummy-22 citb-rotatebox ((obj citb-rotatebox)) +(defmethod citb-base-plat-method-22 citb-rotatebox ((obj citb-rotatebox)) (initialize-skeleton obj *citb-rotatebox-sg* '()) 0 (none) @@ -711,7 +711,7 @@ ) ) -(defmethod dummy-21 citb-donut ((obj citb-donut)) +(defmethod citb-base-plat-method-21 citb-donut ((obj citb-donut)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -736,7 +736,7 @@ (none) ) -(defmethod dummy-22 citb-donut ((obj citb-donut)) +(defmethod citb-base-plat-method-22 citb-donut ((obj citb-donut)) (initialize-skeleton obj *citb-donut-sg* '()) (setup-params! (-> obj sync) (the-as uint 9000) 0.0 0.15 0.15) (set! (-> obj sound) @@ -778,7 +778,7 @@ *citb-stopbox-sg* ) -(defmethod dummy-24 citb-stopbox ((obj citb-stopbox)) +(defmethod baseplat-method-24 citb-stopbox ((obj citb-stopbox)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -803,7 +803,7 @@ (none) ) -(defmethod dummy-26 citb-stopbox ((obj citb-stopbox)) +(defmethod baseplat-method-26 citb-stopbox ((obj citb-stopbox)) (logior! (-> obj fact options) (fact-options wrap-phase)) (logclear! (-> obj mask) (process-mask actor-pause)) 0 @@ -894,13 +894,13 @@ ) (defstate citb-firehose-blast (citb-firehose) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch) (send-event - arg0 + proc 'attack - (-> arg3 param 0) + (-> event param 0) (static-attack-info ((mode 'damage) (shove-back (meters 6)) (shove-up (meters 3)))) ) ) @@ -1003,8 +1003,8 @@ (defstate citb-exit-plat-idle (citb-exit-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) (let ((v1-3 (-> self entity extra perm))) (logior! (-> v1-3 status) (entity-perm-status user-set-from-cstage)) @@ -1103,12 +1103,12 @@ (not (movie?)) ) -(defmethod TODO-RENAME-31 citb-exit-plat ((obj citb-exit-plat)) +(defmethod plat-button-method-31 citb-exit-plat ((obj citb-exit-plat)) (initialize-skeleton obj *citb-exit-plat-sg* '()) (none) ) -(defmethod TODO-RENAME-32 citb-exit-plat ((obj citb-exit-plat)) +(defmethod plat-button-method-32 citb-exit-plat ((obj citb-exit-plat)) (if (-> obj activated) (go (method-of-object obj plat-button-idle)) (go citb-exit-plat-idle) @@ -1117,7 +1117,7 @@ (none) ) -(defmethod TODO-RENAME-28 citb-exit-plat ((obj citb-exit-plat)) +(defmethod plat-button-method-28 citb-exit-plat ((obj citb-exit-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1193,7 +1193,3 @@ 0 (none) ) - - - - diff --git a/goal_src/jak1/levels/common/battlecontroller.gc b/goal_src/jak1/levels/common/battlecontroller.gc index 3190cccd34..364a52792e 100644 --- a/goal_src/jak1/levels/common/battlecontroller.gc +++ b/goal_src/jak1/levels/common/battlecontroller.gc @@ -63,14 +63,14 @@ :size-assert #x27c :flag-assert #x1d0210027c (:methods - (dummy-20 () none 20) + (battlecontroller-method-20 () none 20) (battlecontroller-idle () _type_ :state 21) (battlecontroller-play-intro-camera () _type_ :state 22) - (dummy-23 () none 23) + (battlecontroller-method-23 () none 23) (battlecontroller-active () _type_ :state 24) - (dummy-25 () none 25) + (battlecontroller-method-25 () none 25) (battlecontroller-die () _type_ :state 26) - (TODO-RENAME-27 (_type_) none 27) + (battlecontroller-method-27 (_type_) none 27) (cleanup-if-finished! (_type_) none 28) ) ) @@ -100,10 +100,7 @@ (else (set! (-> v1-4 fact pickup-type) (-> self final-pickup-type)) (set! (-> v1-4 fact pickup-amount) 1.0) - (let ((f0-1 0.0)) - (set! (-> v1-4 fact pickup-spawn-amount) f0-1) - f0-1 - ) + (set! (-> v1-4 fact pickup-spawn-amount) 0.0) ) ) ) @@ -120,7 +117,7 @@ battlecontroller-default-event-handler (defbehavior battlecontroller-draw-debug battlecontroller () (dotimes (gp-0 (-> self spawner-count)) - (dummy-9 (-> self spawner-array gp-0 path)) + (debug-draw (-> self spawner-array gp-0 path)) ) 0 (none) @@ -158,7 +155,7 @@ battlecontroller-default-event-handler (eval-path-curve-div! (-> s5-0 path) s3-0 (the float (-> s5-0 state)) 'interp) (send-event s4-0 'cue-jump-to-point s3-0) ) - (if (zero? (logand (-> (the-as nav-enemy s4-0) nav-enemy-flags) (nav-enemy-flags navenmf11))) + (if (not (logtest? (-> (the-as nav-enemy s4-0) nav-enemy-flags) (nav-enemy-flags navenmf11))) (+! (-> s5-0 state) 1) ) ) @@ -629,7 +626,7 @@ battlecontroller-default-event-handler ) ) -(defmethod TODO-RENAME-27 battlecontroller ((obj battlecontroller)) +(defmethod battlecontroller-method-27 battlecontroller ((obj battlecontroller)) (local-vars (sv-16 res-tag)) (set! (-> obj fact) (new 'process 'fact-info obj (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)) @@ -785,11 +782,7 @@ battlecontroller-default-event-handler (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-27 obj) + (battlecontroller-method-27 obj) (cleanup-if-finished! obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/darkcave/darkcave-obs.gc b/goal_src/jak1/levels/darkcave/darkcave-obs.gc index e688eb82ec..088a431dbb 100644 --- a/goal_src/jak1/levels/darkcave/darkcave-obs.gc +++ b/goal_src/jak1/levels/darkcave/darkcave-obs.gc @@ -93,8 +93,8 @@ ) (defstate cavecrystal-idle (cavecrystal) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('attack) (go cavecrystal-active) ) @@ -122,24 +122,24 @@ ) (defstate cavecrystal-active (cavecrystal) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'attack) - (let ((v1-1 (-> arg3 param 2))) - (cond - ((!= v1-1 (-> self player-attack-id)) - (set! (-> self player-attack-id) v1-1) - (set! (-> self activated-time) (-> *display* game-frame-counter)) - #t - ) - (else - #f - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('attack) + (let ((v1-1 (-> event param 2))) + (cond + ((!= v1-1 (-> self player-attack-id)) + (set! (-> self player-attack-id) v1-1) + (set! (-> self activated-time) (-> *display* game-frame-counter)) + #t ) - ) - ) - ) - ) + (else + #f + ) + ) + ) + ) + ) + ) ) :enter (behavior () (logclear! (-> self mask) (process-mask actor-pause)) @@ -177,7 +177,7 @@ (set! (-> s5-1 w) 0.0) ) ) - (TODO-RENAME-9 *cavecrystal-light-control* (-> self crystal-id) (-> self glow-u) self) + (cavecrystal-light-control-method-9 *cavecrystal-light-control* (-> self crystal-id) (-> self glow-u) self) (update-connected-crystals! self) (when (>= 0.0 f30-0) (level-hint-spawn @@ -258,14 +258,10 @@ ) (ja-post) (update-transforms! (-> obj root-override)) - (TODO-RENAME-9 *cavecrystal-light-control* (-> obj crystal-id) 0.0 obj) + (cavecrystal-light-control-method-9 *cavecrystal-light-control* (-> obj crystal-id) 0.0 obj) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "crystal-on" :fo-max 80) (-> obj root-override trans)) ) (go cavecrystal-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/finalboss/final-door.gc b/goal_src/jak1/levels/finalboss/final-door.gc index e3dff75879..3365a83bbf 100644 --- a/goal_src/jak1/levels/finalboss/final-door.gc +++ b/goal_src/jak1/levels/finalboss/final-door.gc @@ -29,7 +29,7 @@ :flag-assert #x17004000b0 (:methods (idle () _type_ :state 20) - (dummy-21 (_type_) none 21) + (final-door-method-21 (_type_) none 21) (open (symbol) _type_ :state 22) ) ) @@ -52,8 +52,8 @@ (defstate idle (final-door) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('open) (go-virtual open #f) ) @@ -70,24 +70,24 @@ (defstate open (final-door) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'brightness) - (let ((f0-0 (the-as float (-> arg3 param 0))) - (f1-0 (the-as float (-> arg3 param 1))) - ) - (set-vector! (-> self draw color-mult) f0-0 f0-0 f0-0 f0-0) - (let ((v0-0 (-> self draw color-emissive))) - (set! (-> v0-0 x) f1-0) - (set! (-> v0-0 y) f1-0) - (set! (-> v0-0 z) f1-0) - (set! (-> v0-0 w) f1-0) - v0-0 - ) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('brightness) + (let ((f0-0 (the-as float (-> event param 0))) + (f1-0 (the-as float (-> event param 1))) + ) + (set-vector! (-> self draw color-mult) f0-0 f0-0 f0-0 f0-0) + (let ((v0-0 (-> self draw color-emissive))) + (set! (-> v0-0 x) f1-0) + (set! (-> v0-0 y) f1-0) + (set! (-> v0-0 z) f1-0) + (set! (-> v0-0 w) f1-0) + v0-0 + ) + ) + ) + ) + ) ) :code (behavior ((arg0 symbol)) (case (-> self type) @@ -137,7 +137,7 @@ (set! (-> obj root) s4-0) ) (process-drawable-from-entity! obj arg0) - (dummy-21 obj) + (final-door-method-21 obj) (go (method-of-object obj idle)) (none) ) @@ -166,7 +166,7 @@ (ja-post) (loop (if (and (and *target* (>= 61440.0 (vector-vector-distance (-> self root trans) (-> *target* control trans)))) - (and (zero? (logand (-> *target* state-flags) (state-flags grabbed))) + (and (not (logtest? (-> *target* state-flags) (state-flags grabbed))) (and (>= (-> *game-info* fuel) 100.0) (not (and (-> self entity) (logtest? (-> self entity extra perm status) (entity-perm-status complete)))) (= (get-task-status (game-task finalboss-movies)) (task-status need-reward-speech)) @@ -188,13 +188,13 @@ ) ) -(defmethod dummy-21 power-left ((obj power-left)) +(defmethod final-door-method-21 power-left ((obj power-left)) (initialize-skeleton obj *power-left-sg* '()) 0 (none) ) -(defmethod dummy-21 power-right ((obj power-right)) +(defmethod final-door-method-21 power-right ((obj power-right)) (initialize-skeleton obj *power-right-sg* '()) 0 (none) @@ -211,7 +211,7 @@ :size-assert #xd4 :flag-assert #x17007000d4 (:methods - (dummy-20 () none 20) + (powercellalt-method-20 () none 20) (jump () _type_ :state 21) (idle () _type_ :state 22) ) @@ -305,8 +305,8 @@ ) (defstate target-final-door (target) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - ((-> target-grab event) arg0 arg1 arg2 arg3) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + ((-> target-grab event) proc arg1 event-type event) ) :enter (behavior ((arg0 basic) (arg1 handle)) (send-event *camera* 'change-to-entity-by-name "camera-403") @@ -416,7 +416,3 @@ ) :post target-no-stick-post ) - - - - diff --git a/goal_src/jak1/levels/finalboss/green-eco-lurker.gc b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc index 6dd30b705f..4306c6ed48 100644 --- a/goal_src/jak1/levels/finalboss/green-eco-lurker.gc +++ b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc @@ -20,7 +20,7 @@ :size-assert #x1d8 :flag-assert #x4c017001d8 (:methods - (dummy-51 (_type_ vector) symbol :replace 51) + (green-eco-lurker-method-51 (_type_ vector) symbol :replace 51) ) (:states green-eco-lurker-appear @@ -108,7 +108,7 @@ (defpartgroup group-green-eco-lurker-death :id 643 - :duration 600 + :duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 12) :parts ((sp-item 2585 :fade-after (meters 100) :period 600 :length 5 :binding 2583) @@ -296,7 +296,7 @@ ) ) -(defmethod dummy-43 green-eco-lurker ((obj green-eco-lurker) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler green-eco-lurker ((obj green-eco-lurker) (arg0 process) (arg1 event-message-block)) (cond ((= (-> arg0 type) target) (if (nav-enemy-send-attack arg0 (the-as touching-shapes-entry (-> arg1 param 0)) 'generic) @@ -306,7 +306,7 @@ ) (else (nav-enemy-set-hit-from-direction arg0) - ((method-of-type nav-enemy dummy-43) obj arg0 arg1) + ((method-of-type nav-enemy attack-handler) obj arg0 arg1) ) ) ) @@ -325,7 +325,7 @@ ) ) -(defmethod dummy-44 green-eco-lurker ((obj green-eco-lurker) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler green-eco-lurker ((obj green-eco-lurker) (arg0 process) (arg1 event-message-block)) (when (and (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf6)) ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) @@ -353,20 +353,20 @@ ) ) -(defmethod dummy-51 green-eco-lurker ((obj green-eco-lurker) (arg0 vector)) +(defmethod green-eco-lurker-method-51 green-eco-lurker ((obj green-eco-lurker) (arg0 vector)) (when (or (not *target*) (>= (vector-vector-xz-distance arg0 (target-pos 0)) 36864.0)) (let ((v1-3 (new 'stack-no-clear 'vector))) (set! (-> v1-3 quad) (-> arg0 quad)) (set! (-> v1-3 w) (-> obj collide-info root-prim local-sphere w)) ) - (if (not (TODO-RENAME-50 obj arg0)) + (if (not (nav-enemy-method-50 obj arg0)) (return #t) ) ) #f ) -(defmethod dummy-52 green-eco-lurker ((obj green-eco-lurker) (arg0 vector)) +(defmethod nav-enemy-method-52 green-eco-lurker ((obj green-eco-lurker) (arg0 vector)) (let ((s4-0 (-> obj path curve num-cverts))) (when (> s4-0 0) (let ((s2-0 (nav-enemy-rnd-int-count s4-0)) @@ -374,7 +374,7 @@ ) (while (> s3-0 0) (eval-path-curve-div! (-> obj path) arg0 (the float s2-0) 'interp) - (if (dummy-51 obj arg0) + (if (green-eco-lurker-method-51 obj arg0) (return #t) ) (set! s2-0 (mod (+ s2-0 1) s4-0)) @@ -410,7 +410,7 @@ (none) ) :trans (behavior () - (if (dummy-52 self (-> self appear-dest)) + (if (nav-enemy-method-52 self (-> self appear-dest)) (go green-eco-lurker-appear) ) (none) @@ -424,7 +424,7 @@ ) ) -(defmethod dummy-53 green-eco-lurker ((obj green-eco-lurker)) +(defmethod nav-enemy-method-53 green-eco-lurker ((obj green-eco-lurker)) (the-as symbol (cond ((and (-> obj draw shadow) (zero? (-> obj draw cur-lod)) @@ -507,7 +507,7 @@ (set! (-> self played-sound?) #t) (sound-play "blob-jump" :pitch (nav-enemy-rnd-float-range -0.5 0.5)) ) - (dummy-53 self) + (nav-enemy-method-53 self) 0 (none) ) @@ -749,11 +749,11 @@ (none) ) -(defmethod TODO-RENAME-48 green-eco-lurker ((obj green-eco-lurker)) +(defmethod nav-enemy-method-48 green-eco-lurker ((obj green-eco-lurker)) (initialize-skeleton obj *green-eco-lurker-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) (logclear! (-> obj collide-info nav-flags) (nav-flags navf0)) - (TODO-RENAME-45 obj *green-eco-lurker-nav-enemy-info*) + (init-defaults! obj *green-eco-lurker-nav-enemy-info*) (logior! (-> obj draw shadow-ctrl settings flags) (shadow-flags shdf02)) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) @@ -768,15 +768,15 @@ (vector-identity! (-> self collide-info scale)) (quaternion-identity! (-> self collide-info quat)) (set! (-> self entity) (-> arg1 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (logclear! (-> self mask) (process-mask actor-pause)) (go green-eco-lurker-wait-to-appear) (none) ) (defstate spawn-minions (green-eco-lurker-gen) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('blob-died) (set! (-> self num-alive) (max 0 (+ (-> self num-alive) -1))) (send-event (ppointer->process (-> self parent)) 'blob-died) @@ -831,7 +831,3 @@ (go spawn-minions) (none) ) - - - - diff --git a/goal_src/jak1/levels/finalboss/robotboss-misc.gc b/goal_src/jak1/levels/finalboss/robotboss-misc.gc index fa3de6067a..ab8bab5087 100644 --- a/goal_src/jak1/levels/finalboss/robotboss-misc.gc +++ b/goal_src/jak1/levels/finalboss/robotboss-misc.gc @@ -22,11 +22,11 @@ ) (defstate cam-robotboss (camera-slave) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('set-pivot) (let ((v0-0 (the-as object (-> self pivot-pt)))) - (set! (-> (the-as vector v0-0) quad) (-> (the-as vector (-> arg3 param 0)) quad)) + (set! (-> (the-as vector v0-0) quad) (-> (the-as vector (-> event param 0)) quad)) v0-0 ) ) @@ -34,7 +34,7 @@ #f ) (else - (cam-standard-event-handler arg0 arg1 arg2 arg3) + (cam-standard-event-handler proc arg1 event-type event) ) ) ) @@ -53,7 +53,7 @@ (none) ) :trans (behavior () - (when (zero? (logand (-> *camera* master-options) 2)) + (when (not (logtest? (-> *camera* master-options) 2)) (set! *camera-base-mode* cam-string) (cam-slave-go cam-free-floating) ) @@ -159,68 +159,61 @@ (none) ) +;; ERROR: Failed load: (set! a0-3 (l.wu (+ gp-1 -4))) at op 13 ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 28] ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 79] (defbehavior ecoclaw-handler ecoclaw ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - object - (cond - ((= v1-0 'open) - (let ((gp-1 (-> arg3 param 0))) - (set! (-> self particles 0 kind) - (the-as basic (if (and (nonzero? gp-1) (type-type? (rtype-of gp-1) sparticle-launch-group)) - gp-1 - ) - ) - ) - ) - (set! (-> self particles 0 trans quad) (-> self root trans quad)) - (let ((f0-1 (+ 12288.0 (-> self particles 0 trans y)))) - (set! (-> self particles 0 trans y) f0-1) - f0-1 - ) - ) - ((= v1-0 'beam-on) - (let ((s5-0 (-> arg3 param 0))) - (set! (-> self particles 1 kind) - (the-as basic (if (and (nonzero? s5-0) (type-type? (rtype-of s5-0) sparticle-launch-group)) - s5-0 - ) - ) - ) - ) - (set! (-> self particles 1 trans quad) (-> self root trans quad)) - (set! (-> self particles 1 trans y) (+ 24576.0 (-> self particles 1 trans y))) - (let ((s5-1 (-> arg3 param 1))) - (set! (-> self particles 2 kind) - (the-as basic (if (and (nonzero? s5-1) (type-type? (rtype-of s5-1) sparticle-launch-group)) - s5-1 - ) - ) - ) - ) - (set! (-> self particles 2 trans quad) (-> (the-as vector (-> arg3 param 2)) quad)) - (let ((f0-5 (+ 81920.0 (-> self particles 2 trans y)))) - (set! (-> self particles 2 trans y) f0-5) - f0-5 - ) - ) - ((= v1-0 'beam-off) - (set! (-> self particles 1 kind) #f) - (set! (-> self particles 2 kind) #f) - (let ((a0-10 (handle->process (-> self particles 1 tracker)))) - (if a0-10 - (deactivate a0-10) + (the-as + object + (case arg2 + (('open) + (let ((gp-1 (-> arg3 param 0))) + (set! (-> self particles 0 kind) + (the-as basic (if (and (nonzero? gp-1) (type-type? (rtype-of gp-1) sparticle-launch-group)) + gp-1 + ) + ) ) - ) - (let ((a0-14 (handle->process (-> self particles 2 tracker)))) - (if a0-14 - (deactivate a0-14) - ) - ) ) - ) + (set! (-> self particles 0 trans quad) (-> self root trans quad)) + (set! (-> self particles 0 trans y) (+ 12288.0 (-> self particles 0 trans y))) + ) + (('beam-on) + (let ((s5-0 (-> arg3 param 0))) + (set! (-> self particles 1 kind) + (the-as basic (if (and (nonzero? s5-0) (type-type? (rtype-of s5-0) sparticle-launch-group)) + s5-0 + ) + ) + ) + ) + (set! (-> self particles 1 trans quad) (-> self root trans quad)) + (set! (-> self particles 1 trans y) (+ 24576.0 (-> self particles 1 trans y))) + (let ((s5-1 (-> arg3 param 1))) + (set! (-> self particles 2 kind) + (the-as basic (if (and (nonzero? s5-1) (type-type? (rtype-of s5-1) sparticle-launch-group)) + s5-1 + ) + ) + ) + ) + (set! (-> self particles 2 trans quad) (-> (the-as vector (-> arg3 param 2)) quad)) + (set! (-> self particles 2 trans y) (+ 81920.0 (-> self particles 2 trans y))) + ) + (('beam-off) + (set! (-> self particles 1 kind) #f) + (set! (-> self particles 2 kind) #f) + (let ((a0-10 (handle->process (-> self particles 1 tracker)))) + (if a0-10 + (deactivate a0-10) + ) + ) + (let ((a0-14 (handle->process (-> self particles 2 tracker)))) + (if a0-14 + (deactivate a0-14) + ) + ) + ) ) ) ) @@ -319,13 +312,10 @@ (defstate idle (silodoor) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('open) - (let ((f0-0 (the-as float (-> arg3 param 0)))) - (set! (-> self part-opened) f0-0) - f0-0 - ) + (set! (-> self part-opened) (the-as float (-> event param 0))) ) (('hide) (go-virtual hidden) @@ -523,13 +513,9 @@ (defbehavior finalbosscam-init-by-other finalbosscam ((arg0 entity-actor)) (set! (-> self entity) arg0) - (dummy-40 self arg0 *finalbosscam-sg* 4 4 (new 'static 'vector :w 4096.0) 4) + (process-taskable-method-40 self arg0 *finalbosscam-sg* 4 4 (new 'static 'vector :w 4096.0) 4) (set! (-> self tasks) (get-task-control (game-task finalboss-movies))) (set! (-> self robotboss) (the-as handle #f)) (go-virtual hidden) (none) ) - - - - diff --git a/goal_src/jak1/levels/finalboss/robotboss-weapon.gc b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc index a725834006..045e1bea03 100644 --- a/goal_src/jak1/levels/finalboss/robotboss-weapon.gc +++ b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc @@ -21,15 +21,15 @@ :size-assert #x28 :flag-assert #xd00000028 (:methods - (dummy-9 (_type_ vector) none 9) - (TODO-RENAME-10 (_type_ collide-prim-core vector) symbol 10) - (dummy-11 (_type_ vector) symbol 11) - (dummy-12 (_type_ vector) vector 12) + (torus-method-9 (_type_ vector) none 9) + (torus-method-10 (_type_ collide-prim-core vector) symbol 10) + (torus-method-11 (_type_ vector) symbol 11) + (torus-method-12 (_type_ vector) vector 12) ) ) -(defmethod TODO-RENAME-10 torus ((obj torus) (arg0 collide-prim-core) (arg1 vector)) +(defmethod torus-method-10 torus ((obj torus) (arg0 collide-prim-core) (arg1 vector)) (let ((gp-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'vector)) (f30-0 (+ (-> obj radius-secondary) (-> arg0 world-sphere w))) @@ -42,16 +42,16 @@ ) ) -(defmethod dummy-11 torus ((obj torus) (arg0 vector)) +(defmethod torus-method-11 torus ((obj torus) (arg0 vector)) (let ((s4-0 (the-as collide-shape-prim-group (-> *target* control root-prim)))) (when (and (logtest? (-> s4-0 prim-core collide-as) (collide-kind target)) - (TODO-RENAME-10 obj (-> s4-0 prim-core) arg0) + (torus-method-10 obj (-> s4-0 prim-core) arg0) ) (countdown (s3-0 (-> s4-0 num-prims)) (let ((v1-9 (-> s4-0 prims s3-0))) (if (and (logtest? (-> v1-9 prim-core action) (collide-action solid)) (logtest? (-> v1-9 prim-core collide-as) (collide-kind target)) - (TODO-RENAME-10 obj (-> v1-9 prim-core) arg0) + (torus-method-10 obj (-> v1-9 prim-core) arg0) ) (return #t) ) @@ -71,7 +71,7 @@ ) -(defmethod dummy-9 torus ((obj torus) (arg0 vector)) +(defmethod torus-method-9 torus ((obj torus) (arg0 vector)) (local-vars (sv-256 int) (sv-272 int) (sv-288 int)) (let ((s0-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) @@ -121,7 +121,7 @@ (none) ) -(defmethod dummy-12 torus ((obj torus) (arg0 vector)) +(defmethod torus-method-12 torus ((obj torus) (arg0 vector)) (let* ((f30-0 65536.0) (v1-1 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) (v1-2 (the-as number (logior #x3f800000 v1-1))) @@ -179,10 +179,7 @@ ) (set! (-> self y-vel) (* 0.5 (- (sqrtf (- (* f0-6 f0-6) (* 4.0 f3-1))) f0-6))) ) - (let ((f0-12 (/ (- (* (-> self y-vel) (-> self y-vel))) (* 2.0 v1-2)))) - (set! (-> self grav) f0-12) - f0-12 - ) + (set! (-> self grav) (/ (- (* (-> self y-vel) (-> self y-vel))) (* 2.0 v1-2))) ) ) @@ -191,10 +188,7 @@ (vector-lerp! arg0 (-> self from) (-> self to) s5-0) (set! (-> arg0 y) (-> self from y)) (+! (-> arg0 y) (* (-> self y-vel) s5-0)) - (let ((f0-6 (+ (-> arg0 y) (* 0.5 s5-0 s5-0 (-> self grav))))) - (set! (-> arg0 y) f0-6) - f0-6 - ) + (set! (-> arg0 y) (+ (-> arg0 y) (* 0.5 s5-0 s5-0 (-> self grav)))) ) ) @@ -661,7 +655,7 @@ (* 204.8 (the float (- (-> *display* game-frame-counter) (-> self state-time)))) ) (let ((gp-0 (new 'stack-no-clear 'vector))) - (when (dummy-11 (-> self ring) gp-0) + (when (torus-method-11 (-> self ring) gp-0) (vector-normalize! gp-0 16384.0) (send-event *target* 'attack #f (static-attack-info ((vector gp-0)))) (send-event (ppointer->process (-> self parent)) 'hit-jak) @@ -669,7 +663,7 @@ ) (dotimes (gp-1 5) (let ((s5-0 (new 'stack-no-clear 'vector))) - (dummy-12 (-> self ring) s5-0) + (torus-method-12 (-> self ring) s5-0) (spawn (-> self test-particle) s5-0) ) ) @@ -808,11 +802,11 @@ (defstate yellowshot-idle (yellowshot) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch 'attack) - (when (= (-> arg0 type) target) - (send-event *target* 'attack (-> arg3 param 0) (static-attack-info ((mode 'generic)))) + (when (= (-> proc type) target) + (send-event *target* 'attack (-> event param 0) (static-attack-info ((mode 'generic)))) (send-event (ppointer->process (-> self parent)) 'hit-jak) ) ) @@ -871,7 +865,3 @@ (go yellowshot-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/finalboss/robotboss.gc b/goal_src/jak1/levels/finalboss/robotboss.gc index e013b7a2fb..c45e93c8f9 100644 --- a/goal_src/jak1/levels/finalboss/robotboss.gc +++ b/goal_src/jak1/levels/finalboss/robotboss.gc @@ -392,41 +392,36 @@ ) (defbehavior robotboss-handler robotboss ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'flash) - (let ((f0-1 (* 0.0078125 (the-as float (-> arg3 param 0))))) - (set! (-> self palette-val) f0-1) - f0-1 - ) - ) - ((= v1-0 'attack) - (when (>= arg1 2) - (case (-> arg3 param 1) - (('eco-yellow) - (let ((a0-5 (-> arg3 param 0))) - (when (and a0-5 ((method-of-type touching-shapes-entry prims-touching?) - (the-as touching-shapes-entry a0-5) - (-> self root-override) - (the-as uint (-> self vulnerable)) - ) - ) - (when (> (-> self hits-to-go) 0) - (set! (-> self took-hit) #t) - (let ((v0-0 (the-as number (+ (-> self hits-to-go) -1)))) - (set! (-> self hits-to-go) (the-as int v0-0)) - v0-0 - ) + (the-as object (case arg2 + (('flash) + (set! (-> self palette-val) (* 0.0078125 (the-as float (-> arg3 param 0)))) + ) + (('attack) + (when (>= arg1 2) + (case (-> arg3 param 1) + (('eco-yellow) + (let ((a0-5 (-> arg3 param 0))) + (when (and a0-5 ((method-of-type touching-shapes-entry prims-touching?) + (the-as touching-shapes-entry a0-5) + (-> self root-override) + (the-as uint (-> self vulnerable)) + ) + ) + (when (> (-> self hits-to-go) 0) + (set! (-> self took-hit) #t) + (let ((v0-0 (the-as number (+ (-> self hits-to-go) -1)))) + (set! (-> self hits-to-go) (the-as int v0-0)) + v0-0 ) ) ) ) - ) + ) ) ) - ) - ) - ) + ) + ) + ) ) (defstate robotboss-yellow-dark-bomb-wait (robotboss) @@ -452,7 +447,7 @@ ) ) (cleanup-for-death self) - (deactivate self) + (the-as object (deactivate self)) ) (else (robotboss-bomb-handler proc arg1 event-type event) @@ -2625,7 +2620,13 @@ ) (robotboss-blue-beam 8 #t) (robotboss-blue-beam 9 #f) - (when (TODO-RENAME-10 (-> self ambient) (new 'stack-no-clear 'vector) (seconds 10) (the-as float 327680.0) self) + (when (ambient-control-method-10 + (-> self ambient) + (new 'stack-no-clear 'vector) + (seconds 10) + (the-as float 327680.0) + self + ) (let ((f0-2 (rand-float-gen))) (cond ((< 0.8 f0-2) @@ -2941,7 +2942,7 @@ (set! (-> obj blue-smoke) #f) (set! (-> obj red-smoke) #f) (set! (-> obj yellow-smoke) #f) - (dummy-9 (-> obj ambient)) + (ambient-control-method-9 (-> obj ambient)) (set! (-> obj yellow-gun) (new 'process 'joint-mod (joint-mod-handler-mode flex-blend) obj 16)) (set-vector! (-> obj yellow-gun twist-max) 8192.0 8192.0 0.0 1.0) (set! (-> obj yellow-gun up) (the-as uint 1)) diff --git a/goal_src/jak1/levels/finalboss/sage-finalboss.gc b/goal_src/jak1/levels/finalboss/sage-finalboss.gc index 1e232901f6..d6dd81f8bc 100644 --- a/goal_src/jak1/levels/finalboss/sage-finalboss.gc +++ b/goal_src/jak1/levels/finalboss/sage-finalboss.gc @@ -59,7 +59,7 @@ *plat-eco-finalboss-lit-sg* ) -(defmethod dummy-26 plat-eco-finalboss ((obj plat-eco-finalboss)) +(defmethod baseplat-method-26 plat-eco-finalboss ((obj plat-eco-finalboss)) (set! (-> obj force-dest) -1.0) (set! (-> obj targ-dest) -1.0) (set! (-> obj dest) 0.0) @@ -71,14 +71,11 @@ (defstate plat-path-active (plat-eco-finalboss) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('target) (process-entity-status! self (entity-perm-status complete) #t) - (let ((f0-0 (the-as float (-> arg3 param 0)))) - (set! (-> self force-dest) f0-0) - f0-0 - ) + (set! (-> self force-dest) (the-as float (-> event param 0))) ) (('ridden 'edge-grabbed) (if (>= (- (-> *display* base-frame-counter) (-> self touch-time)) (seconds 2)) @@ -100,7 +97,7 @@ #f ) (else - (plat-event arg0 arg1 arg2 arg3) + (plat-event proc arg1 event-type event) ) ) ) @@ -272,7 +269,7 @@ ) ) -(defmethod dummy-45 sage-finalboss ((obj sage-finalboss)) +(defmethod process-taskable-method-45 sage-finalboss ((obj sage-finalboss)) (let ((s5-0 (entity-by-name "assistant-lavatube-end-3"))) (the-as symbol @@ -394,7 +391,7 @@ (set-yaw-angle-clear-roll-pitch! (-> obj root-override) 0.0) (close-current! (-> obj tasks)) (play-reminder obj) - (dummy-45 obj) + (process-taskable-method-45 obj) (set! (-> obj kick-the-credits) #t) (set! (-> obj robotplat) (ppointer->handle @@ -448,7 +445,7 @@ (when arg0 (set-yaw-angle-clear-roll-pitch! (-> obj root-override) -13116.667) (close-current! (-> obj tasks)) - (dummy-45 obj) + (process-taskable-method-45 obj) (send-event *camera* 'teleport) (set-setting! 'allow-progress #f 0.0 0) ) @@ -496,7 +493,7 @@ (when arg0 (set-yaw-angle-clear-roll-pitch! (-> obj root-override) -13116.667) (close-current! (-> obj tasks)) - (dummy-45 obj) + (process-taskable-method-45 obj) (set! (-> obj left-door) (the-as entity-actor (entity-by-name "power-left-2"))) (set! (-> obj right-door) (the-as entity-actor (entity-by-name "power-right-2"))) (set-setting! 'allow-progress #f 0.0 0) @@ -568,28 +565,22 @@ (defstate play-anim (sage-finalboss) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('fade) - (let ((f0-0 1.0)) - (set! (-> self credit-fade) f0-0) - f0-0 - ) + (set! (-> self credit-fade) 1.0) ) (('flash) - (let ((f0-1 1.9921875)) - (set! (-> self palette-val) f0-1) - f0-1 - ) + (set! (-> self palette-val) 1.9921875) ) (('activate-particle) (let ((v0-0 (the-as object #t))) - (set! (-> self particle (-> arg3 param 0) active) (the-as symbol v0-0)) + (set! (-> self particle (-> event param 0) active) (the-as symbol v0-0)) v0-0 ) ) (('deactivate-particle) - (set! (-> self particle (-> arg3 param 0) active) #f) + (set! (-> self particle (-> event param 0) active) #f) #f ) ) @@ -600,15 +591,6 @@ (none) ) :exit (behavior () - (#when PC_PORT - (when (and (= (get-response (-> self query)) 'no) (or (not (= *cheat-mode* 'debug)) (not (cpad-hold? 0 r1)))) - (case (current-status (-> self tasks)) - (((task-status need-reminder-a)) - (close-specific-task! (game-task finalboss-movies) (task-status need-reminder-a)) - (set! (-> self kick-the-credits) #t) - ) - )) - ) (when (= (current-status (-> self tasks)) (task-status invalid)) (cond ((not (-> self credits-played)) @@ -1027,7 +1009,7 @@ ) (defmethod init-from-entity! sage-finalboss ((obj sage-finalboss) (arg0 entity-actor)) - (dummy-40 obj arg0 *sage-finalboss-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *sage-finalboss-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task finalboss-movies))) (set! (-> obj redsage) (the-as handle #f)) (set! (-> obj bluesage) (the-as handle #f)) @@ -1066,7 +1048,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc b/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc index 419008408d..bfb4d7ef78 100644 --- a/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc +++ b/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc @@ -258,13 +258,9 @@ ) (defmethod init-from-entity! assistant-firecanyon ((obj assistant-firecanyon) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-firecanyon-sg* 3 29 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-firecanyon-sg* 3 29 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task firecanyon-assistant))) (first-any (-> obj tasks) #t) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/flut_common/target-flut.gc b/goal_src/jak1/levels/flut_common/target-flut.gc index b2c714094f..5024149496 100644 --- a/goal_src/jak1/levels/flut_common/target-flut.gc +++ b/goal_src/jak1/levels/flut_common/target-flut.gc @@ -1297,7 +1297,7 @@ (if (and (logtest? (-> self water flags) (water-flags wt09)) (zero? (mod (- (-> *display* base-frame-counter) (-> self state-time)) 21)) ) - (dummy-13 + (create-splash (-> self water) (the-as float 0.6) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 37)) @@ -1565,7 +1565,7 @@ (set! (-> self control unknown-dword33) 0) (set! (-> self control unknown-surface00) *flut-air-attack-mods*) (sound-play "flop-land" :pitch -0.4) - (dummy-10 (-> self skel effect) 'group-flut-attack-strike-ground (ja-frame-num 0) 0) + (effect-control-method-10 (-> self skel effect) 'group-flut-attack-strike-ground (ja-frame-num 0) 0) (let ((gp-2 (process-spawn touch-tracker :init touch-tracker-init (-> self control trans) 4096.0 30 :to self))) (send-event (ppointer->process gp-2) 'event 'attack 'flut-attack) (send-event (ppointer->process gp-2) 'function (lambda :behavior target diff --git a/goal_src/jak1/levels/intro/evilbro.gc b/goal_src/jak1/levels/intro/evilbro.gc index bf6f90f33c..2ebe508143 100644 --- a/goal_src/jak1/levels/intro/evilbro.gc +++ b/goal_src/jak1/levels/intro/evilbro.gc @@ -97,10 +97,10 @@ ) (defmethod init-from-entity! evilbro ((obj evilbro) (arg0 entity-actor)) - (dummy-40 obj arg0 *evilbro-intro-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *evilbro-intro-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task leaving-misty))) (set! (-> obj evilsis) (entity-actor-lookup arg0 'alt-actor 0)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -145,12 +145,8 @@ ) (defmethod init-from-entity! evilsis ((obj evilsis) (arg0 entity-actor)) - (dummy-40 obj arg0 *evilsis-intro-sg* 3 0 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *evilsis-intro-sg* 3 0 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task leaving-misty))) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/jungle/fisher.gc b/goal_src/jak1/levels/jungle/fisher.gc index 1d698af5da..17a1b1332f 100644 --- a/goal_src/jak1/levels/jungle/fisher.gc +++ b/goal_src/jak1/levels/jungle/fisher.gc @@ -33,8 +33,8 @@ (defpartgroup group-bad-fish :id 177 - :duration 5 - :linger-duration 450 + :duration (seconds 0.017) + :linger-duration (seconds 1.5) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 2) :parts ((sp-item 828) (sp-item 2013)) @@ -84,8 +84,8 @@ (defpartgroup group-normal-fish :id 178 - :duration 5 - :linger-duration 450 + :duration (seconds 0.017) + :linger-duration (seconds 1.5) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 2) :parts ((sp-item 2001)) @@ -111,8 +111,8 @@ (defpartgroup group-fish-collect :id 179 - :duration 5 - :linger-duration 1200 + :duration (seconds 0.017) + :linger-duration (seconds 4) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 8) :parts ((sp-item 830) (sp-item 831)) @@ -802,7 +802,7 @@ :shadow fisher-shadow-mg ) -(defmethod dummy-52 fisher ((obj fisher)) +(defmethod process-taskable-method-52 fisher ((obj fisher)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -862,7 +862,7 @@ (defbehavior fisher-fish-move fisher-fish () (+! (-> self pos) (* (-> self vel) (-> *display* seconds-per-frame))) (eval-path-curve-div! (-> (the-as fisher (-> self parent 0)) path) (-> self root trans) (-> self pos) 'interp) - (TODO-RENAME-12 (-> (the-as fisher (-> self parent 0)) path) (-> self dir) (-> self pos)) + (path-control-method-12 (-> (the-as fisher (-> self parent 0)) path) (-> self dir) (-> self pos)) (seek-toward-heading-vec! (-> self root) (-> self dir) 291271.12 (seconds 0.2)) (let ((f30-1 (+ 16384.0 (y-angle (-> self root)))) (gp-0 (new-stack-vector0)) @@ -886,7 +886,7 @@ :code (behavior () (set-heading-vec! (-> self root) - (TODO-RENAME-12 (-> (the-as fisher (-> self parent 0)) path) (-> self dir) (-> self pos)) + (path-control-method-12 (-> (the-as fisher (-> self parent 0)) path) (-> self dir) (-> self pos)) ) (loop (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) @@ -1183,7 +1183,7 @@ ) ) -(defmethod dummy-38 fisher ((obj fisher)) +(defmethod process-taskable-method-38 fisher ((obj fisher)) (case (current-status (-> obj tasks)) (((task-status need-reminder-a) (task-status need-reminder)) (go (method-of-object obj query)) @@ -1508,18 +1508,18 @@ ) (defstate fisher-playing (fisher) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-2 object)) - (case arg2 + (case event-type (('fisher-fish-die) (sound-play "fish-miss") - (set! v0-2 (+ (-> self missed) (-> arg3 param 0))) + (set! v0-2 (+ (-> self missed) (-> event param 0))) (set! (-> self missed) (the-as int v0-2)) v0-2 ) (('fisher-fish-caught) (send-event *target* 'bounce) - (set! v0-2 (+ (-> self caught) (-> arg3 param 0))) + (set! v0-2 (+ (-> self caught) (-> event param 0))) (set! (-> self caught) (the-as int v0-2)) v0-2 ) @@ -1689,16 +1689,16 @@ ) :exit (behavior () (#when PC_PORT - ;; needed for cutscene skipping + ;; needed for cutscene skipping (set! (-> self cur-trans-hook) nothing) ) ((-> (method-of-type process-taskable play-anim) exit))) ) -(defmethod TODO-RENAME-43 fisher ((obj fisher)) +(defmethod process-taskable-method-43 fisher ((obj fisher)) (cond ((closed? (-> obj tasks) (game-task jungle-fishgame) (task-status need-reminder)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 1) 122880.0 obj) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 1) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (if (< 0.5 f0-2) (play-ambient (-> obj ambient) "FIS-LO03" #f (-> obj root-override trans)) @@ -1708,7 +1708,7 @@ ) ) (else - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-5 (rand-float-gen))) (cond ((< 0.875 f0-5) @@ -1744,31 +1744,29 @@ (defstate play-accept (fisher) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 rgbaf)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'emissive-on) - (set-vector! (-> self draw color-mult) 0.6 0.6 0.6 1.0) - (set! v0-0 (-> self draw color-emissive)) - (set! (-> v0-0 x) 0.6) - (set! (-> v0-0 y) 0.6) - (set! (-> v0-0 z) 0.6) - (set! (-> v0-0 w) 0.0) - v0-0 - ) - ((= v1-0 'emissive-off) - (set-vector! (-> self draw color-mult) 1.0 1.0 1.0 1.0) - (set! v0-0 (-> self draw color-emissive)) - (set! (-> v0-0 x) 0.0) - (set! (-> v0-0 y) 0.0) - (set! (-> v0-0 z) 0.0) - (set! (-> v0-0 w) 0.0) - v0-0 - ) - ) - ) - ) + (the-as object (case event-type + (('emissive-on) + (set-vector! (-> self draw color-mult) 0.6 0.6 0.6 1.0) + (set! v0-0 (-> self draw color-emissive)) + (set! (-> v0-0 x) 0.6) + (set! (-> v0-0 y) 0.6) + (set! (-> v0-0 z) 0.6) + (set! (-> v0-0 w) 0.0) + v0-0 + ) + (('emissive-off) + (set-vector! (-> self draw color-mult) 1.0 1.0 1.0 1.0) + (set! v0-0 (-> self draw color-emissive)) + (set! (-> v0-0 x) 0.0) + (set! (-> v0-0 y) 0.0) + (set! (-> v0-0 z) 0.0) + (set! (-> v0-0 w) 0.0) + v0-0 + ) + ) + ) ) :trans (behavior () (when (-> self training) @@ -1929,7 +1927,7 @@ (countdown (gp-1 (+ (the int (* f30-0 (+ -1.0 (the-as float v1-10)))) 5)) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (suspend) (ja :num! (seek!)) ) @@ -1938,7 +1936,7 @@ (when (ja-group? fisher-idle-more-often-ja) (ja-no-eval :group! fisher-idle-less-often-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (suspend) (ja :num! (seek!)) ) @@ -1989,12 +1987,12 @@ ) (defmethod init-from-entity! fisher ((obj fisher) (arg0 entity-actor)) - (dummy-40 obj arg0 *fisher-sg* 3 49 (new 'static 'vector :w 4096.0) 33) + (process-taskable-method-40 obj arg0 *fisher-sg* 3 49 (new 'static 'vector :w 4096.0) 33) (set! (-> obj tasks) (get-task-control (game-task jungle-fishgame))) (set! (-> obj path) (new 'process 'curve-control obj 'path -1000000000.0)) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) (let ((s5-0 (eval-path-curve-div! (-> obj path) (-> obj paddle-pos) 6.5 'interp)) - (s4-0 (TODO-RENAME-12 (-> obj path) (new-stack-vector0) 6.5)) + (s4-0 (path-control-method-12 (-> obj path) (new-stack-vector0) 6.5)) ) (set! (-> s5-0 y) (+ 2457.6 (-> s5-0 y))) (vector-normalize! (vector-rotate-y! s4-0 s4-0 16384.0) (-> *FISHER-bank* width)) @@ -2006,23 +2004,23 @@ (set! (-> obj hard) #f) (set! (-> *FISHER-bank* max-caught) 200) (set! (-> obj training) #f) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) (defstate target-fishing (target) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (cond - ((= arg2 'bounce) + ((= event-type 'bounce) (set-zero! (-> self control unknown-smush00)) (activate! (-> self control unknown-smush00) 1.0 120 210 0.3 1.0) ) - ((= arg2 'lose) - (set! (-> self control unknown-uint20) (the-as uint arg2)) - arg2 + ((= event-type 'lose) + (set! (-> self control unknown-uint20) (the-as uint event-type)) + event-type ) (else - ((-> target-grab event) arg0 arg1 arg2 arg3) + ((-> target-grab event) proc arg1 event-type event) ) ) ) @@ -2145,7 +2143,3 @@ ) :post target-post ) - - - - diff --git a/goal_src/jak1/levels/jungle/hopper.gc b/goal_src/jak1/levels/jungle/hopper.gc index 28d9b34b75..35548bda32 100644 --- a/goal_src/jak1/levels/jungle/hopper.gc +++ b/goal_src/jak1/levels/jungle/hopper.gc @@ -99,7 +99,7 @@ nav-enemy-default-event-handler ) (defbehavior hopper-do-jump hopper () - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (if (< (-> self jump-length) (vector-length (-> self nav travel))) (vector-normalize! (-> self nav travel) (-> self jump-length)) ) @@ -142,7 +142,7 @@ nav-enemy-default-event-handler nav-enemy-jump-event-handler ) :trans (behavior () - (if (zero? (logand (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate))) + (if (not (logtest? (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate))) ((-> (method-of-type nav-enemy nav-enemy-patrol) trans)) ) (none) @@ -213,7 +213,7 @@ nav-enemy-default-event-handler nav-enemy-jump-event-handler ) :trans (behavior () - (if (zero? (logand (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate))) + (if (not (logtest? (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate))) ((-> (method-of-type nav-enemy nav-enemy-chase) trans)) ) (none) @@ -365,14 +365,10 @@ nav-enemy-default-event-handler (none) ) -(defmethod TODO-RENAME-48 hopper ((obj hopper)) +(defmethod nav-enemy-method-48 hopper ((obj hopper)) (initialize-skeleton obj *hopper-sg* '()) - (TODO-RENAME-45 obj *hopper-nav-enemy-info*) + (init-defaults! obj *hopper-nav-enemy-info*) (set! (-> obj shadow-min-y) (+ (-> obj collide-info trans y) (-> obj nav-info shadow-min-y))) 0 (none) ) - - - - diff --git a/goal_src/jak1/levels/jungle/jungle-obs.gc b/goal_src/jak1/levels/jungle/jungle-obs.gc index 47b6602e94..f014927e49 100644 --- a/goal_src/jak1/levels/jungle/jungle-obs.gc +++ b/goal_src/jak1/levels/jungle/jungle-obs.gc @@ -52,9 +52,9 @@ (defstate idle (logtrap) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (if (or (= arg2 'touch) (= arg2 'attack)) - (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (if (or (= event-type 'touch) (= event-type 'attack)) + (send-event proc 'attack (-> event param 0) (new 'static 'attack-info)) ) ) :code (behavior () @@ -178,17 +178,14 @@ ) (defstate lurkerm-tall-sail-idle (lurkerm-tall-sail) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'stop) - (process-entity-status! self (entity-perm-status complete) #t) - (let ((f0-0 0.0)) - (set! (-> self speed) f0-0) - f0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('stop) + (process-entity-status! self (entity-perm-status complete) #t) + (set! (-> self speed) 0.0) + ) + ) + ) ) :trans (the-as (function none :behavior lurkerm-tall-sail) rider-trans) :code (behavior () @@ -273,17 +270,14 @@ ) (defstate lurkerm-short-sail-idle (lurkerm-short-sail) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'stop) - (process-entity-status! self (entity-perm-status complete) #t) - (let ((f0-0 0.0)) - (set! (-> self speed) f0-0) - f0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('stop) + (process-entity-status! self (entity-perm-status complete) #t) + (set! (-> self speed) 0.0) + ) + ) + ) ) :trans (the-as (function none :behavior lurkerm-short-sail) rider-trans) :code (behavior () @@ -388,17 +382,14 @@ ) (defstate lurkerm-piston-idle (lurkerm-piston) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'stop) - (process-entity-status! self (entity-perm-status complete) #t) - (let ((f0-0 0.0)) - (set! (-> self speed) f0-0) - f0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('stop) + (process-entity-status! self (entity-perm-status complete) #t) + (set! (-> self speed) 0.0) + ) + ) + ) ) :trans (the-as (function none :behavior lurkerm-piston) rider-trans) :code (behavior () @@ -503,17 +494,14 @@ ) (defstate accordian-idle (accordian) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'stop) - (process-entity-status! self (entity-perm-status complete) #t) - (let ((f0-0 0.0)) - (set! (-> self speed) f0-0) - f0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('stop) + (process-entity-status! self (entity-perm-status complete) #t) + (set! (-> self speed) 0.0) + ) + ) + ) ) :code (behavior () (ja-no-eval :num! (loop!) :frame-num 0.0) @@ -620,8 +608,8 @@ ) (defstate precurbridge-idle (precurbridge) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('go) (go precurbridge-activate) ) @@ -705,20 +693,20 @@ ) (defstate precurbridge-active (precurbridge) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - object - (when (= v1-0 'bonk) - (let* ((gp-0 (the-as object (-> arg3 param 0))) - (a0-2 (-> (the-as touching-shapes-entry gp-0) head)) - (s5-0 (-> self root-override)) - ) - (get-touched-prim a0-2 s5-0 (the-as touching-shapes-entry gp-0)) - ((method-of-type touching-shapes-entry get-touched-shape) (the-as touching-shapes-entry gp-0) s5-0) - ) - (activate! (-> self smush) -1.0 150 600 1.0 1.0) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as + object + (case event-type + (('bonk) + (let* ((gp-0 (the-as object (-> event param 0))) + (a0-2 (-> (the-as touching-shapes-entry gp-0) head)) + (s5-0 (-> self root-override)) + ) + (get-touched-prim a0-2 s5-0 (the-as touching-shapes-entry gp-0)) + ((method-of-type touching-shapes-entry get-touched-shape) (the-as touching-shapes-entry gp-0) s5-0) + ) + (activate! (-> self smush) -1.0 150 600 1.0 1.0) + ) ) ) ) @@ -1080,7 +1068,7 @@ :bounds (static-spherem 0 0 0 8) ) -(defmethod TODO-RENAME-24 sidedoor ((obj sidedoor)) +(defmethod eco-door-method-24 sidedoor ((obj sidedoor)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -1099,7 +1087,7 @@ (none) ) -(defmethod TODO-RENAME-25 sidedoor ((obj sidedoor)) +(defmethod eco-door-method-25 sidedoor ((obj sidedoor)) (initialize-skeleton obj *sidedoor-sg* '()) (set! (-> obj open-distance) 22528.0) (set! (-> obj close-distance) 61440.0) @@ -1229,8 +1217,8 @@ ) ) -(defmethod TODO-RENAME-22 jungle-water ((obj jungle-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 jungle-water ((obj jungle-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) @@ -1243,7 +1231,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/jungle/junglefish.gc b/goal_src/jak1/levels/jungle/junglefish.gc index 87ab0ce8ee..f29ef56660 100644 --- a/goal_src/jak1/levels/jungle/junglefish.gc +++ b/goal_src/jak1/levels/jungle/junglefish.gc @@ -26,7 +26,7 @@ nav-enemy-default-event-handler (defmethod common-post junglefish ((obj junglefish)) - (dummy-10 (-> obj water)) + (water-control-method-10 (-> obj water)) ((the-as (function nav-enemy none) (find-parent-method junglefish 39)) obj) 0 (none) @@ -275,7 +275,7 @@ nav-enemy-default-event-handler ) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *junglefish-sg* '()) - (TODO-RENAME-45 obj *junglefish-nav-enemy-info*) + (init-defaults! obj *junglefish-nav-enemy-info*) (set! (-> obj water) (new 'process 'water-control obj 7 0.0 8192.0 2048.0)) (set! (-> obj water flags) (water-flags wt01)) (set! (-> obj water height) (res-lump-float (-> obj entity) 'water-height)) @@ -284,7 +284,3 @@ nav-enemy-default-event-handler (go (method-of-object obj nav-enemy-idle)) (none) ) - - - - diff --git a/goal_src/jak1/levels/jungle/junglesnake.gc b/goal_src/jak1/levels/jungle/junglesnake.gc index 63b3723484..f6b8eddac7 100644 --- a/goal_src/jak1/levels/jungle/junglesnake.gc +++ b/goal_src/jak1/levels/jungle/junglesnake.gc @@ -88,11 +88,11 @@ :size-assert #x28c :flag-assert #x190220028c (:methods - (dummy-20 (_type_) symbol 20) - (dummy-21 (_type_) symbol 21) - (dummy-22 (_type_ float) symbol 22) - (dummy-23 (_type_) none 23) - (dummy-24 (_type_) none 24) + (junglesnake-method-20 (_type_) symbol 20) + (junglesnake-method-21 (_type_) symbol 21) + (junglesnake-method-22 (_type_ float) symbol 22) + (junglesnake-method-23 (_type_) none 23) + (junglesnake-method-24 (_type_) none 24) ) (:states junglesnake-attack @@ -149,7 +149,7 @@ junglesnake-default-event-handler -(defmethod dummy-20 junglesnake ((obj junglesnake)) +(defmethod junglesnake-method-20 junglesnake ((obj junglesnake)) (when (and *target* (-> obj track-player-ry)) (let ((v1-3 (target-pos 0))) (set! (-> obj des-ry) @@ -368,7 +368,7 @@ junglesnake-default-event-handler (none) ) :trans (behavior () - (dummy-20 self) + (junglesnake-method-20 self) (when *target* (if *target* (look-at-enemy! @@ -420,7 +420,7 @@ junglesnake-default-event-handler ) ) ) - (dummy-20 self) + (junglesnake-method-20 self) (when *target* (if *target* (look-at-enemy! @@ -464,11 +464,11 @@ junglesnake-default-event-handler (none) ) :exit (behavior () - (dummy-24 self) + (junglesnake-method-24 self) (none) ) :trans (behavior () - (dummy-20 self) + (junglesnake-method-20 self) (when *target* (if *target* (look-at-enemy! @@ -485,7 +485,7 @@ junglesnake-default-event-handler (set! (-> self track-player-ry) #t) (set! (-> self track-player-tilt) #t) (ja-channel-push! 2 (seconds 0.15)) - (dummy-23 self) + (junglesnake-method-23 self) (let ((f30-0 (lerp-scale 0.0 1.0 (vector-vector-distance (target-pos 0) (-> self root-override trans)) 0.0 24576.0)) ) (ja-no-eval :group! junglesnake-strike-close-ja :num! (seek! max 1.25) :frame-num 0.0) @@ -505,12 +505,12 @@ junglesnake-default-event-handler (cond ((and (>= f0-12 22.0) (< f0-12 44.0)) (if (not (-> self is-lethal?)) - (dummy-23 self) + (junglesnake-method-23 self) ) ) (else (if (-> self is-lethal?) - (dummy-24 self) + (junglesnake-method-24 self) ) ) ) @@ -538,7 +538,7 @@ junglesnake-default-event-handler (none) ) :trans (behavior () - (dummy-20 self) + (junglesnake-method-20 self) (none) ) :code (behavior () @@ -592,7 +592,7 @@ junglesnake-default-event-handler :post (the-as (function none :behavior junglesnake) ja-post) ) -(defmethod dummy-23 junglesnake ((obj junglesnake)) +(defmethod junglesnake-method-23 junglesnake ((obj junglesnake)) (when (not (-> obj is-lethal?)) (set! (-> obj is-lethal?) #t) (let ((v1-5 (-> (the-as collide-shape-prim-group (-> obj root-override root-prim)) prims 0))) @@ -603,7 +603,7 @@ junglesnake-default-event-handler (none) ) -(defmethod dummy-24 junglesnake ((obj junglesnake)) +(defmethod junglesnake-method-24 junglesnake ((obj junglesnake)) (when (-> obj is-lethal?) (set! (-> obj is-lethal?) #f) (let ((v1-4 (-> (the-as collide-shape-prim-group (-> obj root-override root-prim)) prims 0))) @@ -647,7 +647,7 @@ junglesnake-default-event-handler ) ) -(defmethod dummy-22 junglesnake ((obj junglesnake) (arg0 float)) +(defmethod junglesnake-method-22 junglesnake ((obj junglesnake) (arg0 float)) (let ((f0-0 0.0)) (dotimes (v1-0 24) (let ((a2-2 (-> obj twist-joints v1-0))) @@ -663,7 +663,7 @@ junglesnake-default-event-handler #f ) -(defmethod dummy-21 junglesnake ((obj junglesnake)) +(defmethod junglesnake-method-21 junglesnake ((obj junglesnake)) (dotimes (v1-0 3) (let ((a1-2 (-> obj tilt-joints v1-0))) (set! (-> a1-2 joint-index) (+ v1-0 23)) @@ -790,8 +790,8 @@ junglesnake-default-event-handler (set! (-> obj track-player-ry) #f) (set! (-> obj track-player-tilt) #f) (quaternion-identity! (-> obj root-override quat)) - (dummy-22 obj (-> obj ry)) - (dummy-21 obj) + (junglesnake-method-22 obj (-> obj ry)) + (junglesnake-method-21 obj) (logior! (-> obj skel status) (janim-status inited)) (go junglesnake-sleeping) (none) diff --git a/goal_src/jak1/levels/jungleb/aphid.gc b/goal_src/jak1/levels/jungleb/aphid.gc index 5730999def..fe03ccdfa8 100644 --- a/goal_src/jak1/levels/jungleb/aphid.gc +++ b/goal_src/jak1/levels/jungleb/aphid.gc @@ -37,7 +37,7 @@ (none) ) -(defmethod dummy-43 aphid ((obj aphid) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler aphid ((obj aphid) (arg0 process) (arg1 event-message-block)) (cond ((or (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf5)) (= arg0 (ppointer->process (-> obj parent))) @@ -47,7 +47,7 @@ (go (method-of-object obj nav-enemy-die)) ) (else - (dummy-44 obj arg0 arg1) + (touch-handler obj arg0 arg1) ) ) ) @@ -281,9 +281,9 @@ (none) ) -(defmethod TODO-RENAME-48 aphid ((obj aphid)) +(defmethod nav-enemy-method-48 aphid ((obj aphid)) (initialize-skeleton obj *aphid-sg* '()) - (TODO-RENAME-45 obj *aphid-nav-enemy-info*) + (init-defaults! obj *aphid-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) (set! (-> obj neck ear) (the-as uint 2)) @@ -303,13 +303,9 @@ ) (vector-identity! (-> self collide-info scale)) (set! (-> self entity) (-> arg0 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf12)) (set! (-> self try) (the-as int (send-event (ppointer->process (-> self parent)) 'try))) (go-virtual nav-enemy-chase) (none) ) - - - - diff --git a/goal_src/jak1/levels/jungleb/jungleb-obs.gc b/goal_src/jak1/levels/jungleb/jungleb-obs.gc index 32a3bde799..e1160fb9cf 100644 --- a/goal_src/jak1/levels/jungleb/jungleb-obs.gc +++ b/goal_src/jak1/levels/jungleb/jungleb-obs.gc @@ -45,7 +45,7 @@ (defpartgroup group-jungle-blue-eco-room-activate :id 190 - :duration 900 + :duration (seconds 3) :bounds (static-bspherem 0 -6 0 8) :parts ((sp-item 903) (sp-item 903) (sp-item 904 :flags (bit1) :period 1200 :length 15)) ) @@ -182,19 +182,19 @@ ) (defstate eggtop-idle (eggtop) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'notify) - (case (-> arg3 param 0) - (('pickup) - (if (type-type? (-> arg0 type) fuel-cell) - (save-reminder (get-task-control (-> self entity extra perm task)) 1 0) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('notify) + (case (-> event param 0) + (('pickup) + (if (type-type? (-> proc type) fuel-cell) + (save-reminder (get-task-control (-> self entity extra perm task)) 1 0) + ) ) - ) - ) - ) + ) + ) + ) + ) ) :exit (behavior () (sound-stop (-> self sound-id)) @@ -363,7 +363,7 @@ :bounds (static-spherem 0 0 0 8) ) -(defmethod TODO-RENAME-24 jng-iris-door ((obj jng-iris-door)) +(defmethod eco-door-method-24 jng-iris-door ((obj jng-iris-door)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -382,7 +382,7 @@ (none) ) -(defmethod TODO-RENAME-25 jng-iris-door ((obj jng-iris-door)) +(defmethod eco-door-method-25 jng-iris-door ((obj jng-iris-door)) (initialize-skeleton obj *jng-iris-door-sg* '()) (set! (-> obj open-distance) 32768.0) (set! (-> obj close-distance) 49152.0) @@ -390,7 +390,3 @@ 0 (none) ) - - - - diff --git a/goal_src/jak1/levels/lavatube/assistant-lavatube.gc b/goal_src/jak1/levels/lavatube/assistant-lavatube.gc index 51c291887b..225ac695bd 100644 --- a/goal_src/jak1/levels/lavatube/assistant-lavatube.gc +++ b/goal_src/jak1/levels/lavatube/assistant-lavatube.gc @@ -96,7 +96,13 @@ (set! (-> v1-28 scale) 0.8) ) (set! (-> gp-0 flags) (font-flags shadow kerning middle large)) - (print-game-text (lookup-text! *common-text* (game-text-id assistant-lavatube-need-cells-text) #f) gp-0 #f 128 22) + (print-game-text + (lookup-text! *common-text* (game-text-id assistant-lavatube-need-cells-text) #f) + gp-0 + #f + 128 + 22 + ) ) ) (level-hint-spawn @@ -148,13 +154,9 @@ ) (defmethod init-from-entity! assistant-lavatube-start ((obj assistant-lavatube-start) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-lavatube-start-sg* 3 29 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-lavatube-start-sg* 3 29 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task lavatube-start))) (first-any (-> obj tasks) #t) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/lavatube/lavatube-energy.gc b/goal_src/jak1/levels/lavatube/lavatube-energy.gc index 5f9615140f..b685038535 100644 --- a/goal_src/jak1/levels/lavatube/lavatube-energy.gc +++ b/goal_src/jak1/levels/lavatube/lavatube-energy.gc @@ -398,12 +398,12 @@ ) (defbehavior energydoor-open-handler energydoor ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (if (= v1-0 'open?) - #t - ) - ) - ) + (the-as object (case arg2 + (('open?) + #t + ) + ) + ) ) (defbehavior energydoor-closed-handler energydoor ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) @@ -662,8 +662,8 @@ ) (defstate energybase-idle (energybase) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('stop) (go energybase-stopping) ) @@ -672,13 +672,7 @@ :code (behavior () (loop (if (and *target* (>= 307200.0 (vector-vector-distance (-> self root trans) (-> *target* control trans)))) - (level-hint-spawn - (game-text-id lavatube-balls) - "sksp0375" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (game-text-id lavatube-balls) "sksp0375" (the-as entity #f) *entity-pool* (game-task none)) ) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) @@ -773,29 +767,29 @@ ) (defstate energyball-idle (energyball) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'attack) - (when (and (>= arg1 2) (= (-> arg3 param 1) 'eco-yellow)) - (increment-success-for-hint (game-text-id lavatube-balls)) - (sound-play "dcrate-break") - (process-spawn - part-tracker - :init part-tracker-init - (-> *part-group-id-table* 546) - 600 - #f - #f - #f - (-> self root-override trans) - :to *entity-pool* - ) - (cleanup-for-death self) - (deactivate self) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('attack) + (when (and (>= arg1 2) (= (-> event param 1) 'eco-yellow)) + (increment-success-for-hint (game-text-id lavatube-balls)) + (sound-play "dcrate-break") + (process-spawn + part-tracker + :init part-tracker-init + (-> *part-group-id-table* 546) + 600 + #f + #f + #f + (-> self root-override trans) + :to *entity-pool* + ) + (cleanup-for-death self) + (the-as symbol (deactivate self)) + ) + ) + ) + ) ) :trans (behavior () (rider-trans) @@ -938,8 +932,8 @@ ) (defstate energyarm-no-ball (energyarm) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('stop) (go energyarm-stop) ) @@ -1020,8 +1014,8 @@ ) (defstate energyarm-idle (energyarm) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('stop) (go energyarm-stop) ) @@ -1200,10 +1194,7 @@ ) (set! (-> *palette-fade-controls* control 2 fade) (-> self palette-val)) (set! (-> (the-as process-drawable v1-2) root scale x) 1.25) - (let ((f0-6 1.25)) - (set! (-> (the-as process-drawable v1-2) root scale z) f0-6) - f0-6 - ) + (set! (-> (the-as process-drawable v1-2) root scale z) 1.25) ) ) ) @@ -1246,16 +1237,13 @@ ) (defstate energyhub-stop (energyhub) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'flash) - (let ((f0-0 1.9921875)) - (set! (-> self palette-val) f0-0) - f0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('flash) + (set! (-> self palette-val) 1.9921875) + ) + ) + ) ) :enter (behavior () (set! (-> self rotation-speed target) 0.0) @@ -1330,16 +1318,13 @@ ) (defstate energyhub-idle (energyhub) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'flash) - (let ((f0-0 1.9921875)) - (set! (-> self palette-val) f0-0) - f0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('flash) + (set! (-> self palette-val) 1.9921875) + ) + ) + ) ) :trans (behavior () (if (nonzero? (-> self sound)) @@ -1483,7 +1468,3 @@ (go energylava-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/lavatube/lavatube-obs.gc b/goal_src/jak1/levels/lavatube/lavatube-obs.gc index a4544cedf7..4a84cf5b82 100644 --- a/goal_src/jak1/levels/lavatube/lavatube-obs.gc +++ b/goal_src/jak1/levels/lavatube/lavatube-obs.gc @@ -465,7 +465,7 @@ (gp-0 (new 'stack-no-clear 'matrix)) ) (let ((s4-0 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> self path) s5-0 f30-0) + (path-control-method-14 (-> self path) s5-0 f30-0) (set! (-> s4-0 quad) (-> self down value quad)) (set! (-> s4-0 y) -1.0) (vector-normalize! s4-0 1.0) @@ -528,26 +528,26 @@ ) (defstate darkecobarrel-mover-move (darkecobarrel-mover) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch 'attack) (cond - ((= arg0 *target*) - (let ((s5-0 (-> arg3 param 0))) + ((= proc *target*) + (let ((s5-0 (-> event param 0))) (if (and s5-0 ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry s5-0) (-> self root-override) (the-as uint 1) ) - (send-event arg0 'attack-invinc s5-0 (static-attack-info ((mode 'death)))) + (send-event proc 'attack-invinc s5-0 (static-attack-info ((mode 'death)))) ) (go darkecobarrel-mover-die) ) ) ) ((>= arg1 2) - (case (-> arg3 param 1) + (case (-> event param 1) (('eco-yellow) (+! (-> self hits) 1) (cond @@ -555,8 +555,8 @@ (go darkecobarrel-mover-die) ) (else - (let ((v1-17 (if (and (nonzero? arg0) (type-type? (-> arg0 type) process-drawable)) - arg0 + (let ((v1-17 (if (and (nonzero? proc) (type-type? (-> proc type) process-drawable)) + proc ) ) (gp-1 (new 'stack-no-clear 'vector)) @@ -574,10 +574,9 @@ ) (else (set! (-> self leak (+ (-> self hits) -1) offset quad) (-> self root-override trans quad)) - (let ((f0-1 (+ -49152.0 (-> self leak (+ (-> self hits) -1) offset y)))) - (set! (-> self leak (+ (-> self hits) -1) offset y) f0-1) - f0-1 - ) + (set! (-> self leak (+ (-> self hits) -1) offset y) + (+ -49152.0 (-> self leak (+ (-> self hits) -1) offset y)) + ) ) ) ) @@ -735,9 +734,7 @@ (let ((s5-1 (res-lump-data arg0 'delay pointer :tag-ptr (& sv-16)))) (cond (s5-1 - (set! (-> obj spawn-array) - (the-as (array int64) (new 'process 'boxed-array time-frame (the-as int (-> sv-16 elt-count)))) - ) + (set! (-> obj spawn-array) (new 'process 'boxed-array time-frame (the-as int (-> sv-16 elt-count)))) (dotimes (v1-12 (the-as int (-> sv-16 elt-count))) (set! (-> obj spawn-array v1-12) (the int (* (fabs (-> obj speed)) (-> (the-as (pointer float) (&+ s5-1 (* v1-12 4)))))) @@ -745,7 +742,7 @@ ) ) (else - (set! (-> obj spawn-array) (the-as (array int64) (new 'process 'boxed-array time-frame 4))) + (set! (-> obj spawn-array) (new 'process 'boxed-array time-frame 4)) (set! (-> obj spawn-array 0) (the int (* 45056.0 (fabs (-> obj speed))))) (set! (-> obj spawn-array 1) (the int (* 90112.0 (fabs (-> obj speed))))) (set! (-> obj spawn-array 2) (the int (* 45056.0 (fabs (-> obj speed))))) @@ -1050,10 +1047,10 @@ (defstate idle (chainmine) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('attack 'touch) - (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode 'deadly)))) + (send-event proc 'attack (-> event param 0) (static-attack-info ((mode 'deadly)))) (go-virtual die) ) ) @@ -1126,7 +1123,7 @@ (defpartgroup group-lavaballoon :id 543 - :duration 5 + :duration (seconds 0.017) :bounds (static-bspherem 0 0 0 15) :parts ((sp-item 1987) (sp-item 1988) (sp-item 1989)) ) @@ -1218,16 +1215,16 @@ (defstate idle (lavaballoon) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('attack) - (send-event arg0 'heat -10.0) + (send-event proc 'heat -10.0) (go-virtual die) ) ) ) :trans (behavior () - (when (zero? (logand (-> self path flags) (path-control-flag not-found))) + (when (not (logtest? (-> self path flags) (path-control-flag not-found))) (let ((f0-4 (* 0.5 (+ 1.0 (sin (* (-> self move-per-tick) (the float (-> *display* base-frame-counter)))))))) (eval-path-curve! (-> self path) (-> self root-override trans) f0-4 'interp) ) @@ -1266,7 +1263,7 @@ (set! (-> obj root-override pause-adjust-distance) 122880.0) (set! (-> obj path) (new 'process 'path-control obj 'path 0.0)) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) - (when (zero? (logand (-> obj path flags) (path-control-flag not-found))) + (when (not (logtest? (-> obj path flags) (path-control-flag not-found))) (let ((f30-0 (res-lump-float (-> obj entity) 'speed :default 12288.0))) (set! (-> obj move-per-tick) (* 32768.0 (/ 1.0 (* 300.0 (path-distance (-> obj path)))) f30-0)) ) @@ -1309,8 +1306,8 @@ ) ) -(defmethod TODO-RENAME-22 lavatube-lava ((obj lavatube-lava)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 lavatube-lava ((obj lavatube-lava)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) @@ -1362,7 +1359,3 @@ (go lavayellowtarp-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/maincave/baby-spider.gc b/goal_src/jak1/levels/maincave/baby-spider.gc index 47c27cc737..dcdf876285 100644 --- a/goal_src/jak1/levels/maincave/baby-spider.gc +++ b/goal_src/jak1/levels/maincave/baby-spider.gc @@ -199,7 +199,7 @@ (none) ) -(defmethod dummy-44 baby-spider ((obj baby-spider) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler baby-spider ((obj baby-spider) (arg0 process) (arg1 event-message-block)) (when ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) (-> obj collide-info) @@ -238,7 +238,7 @@ baby-spider-default-event-handler (none) ) -(defmethod TODO-RENAME-38 baby-spider ((obj baby-spider)) +(defmethod nav-enemy-method-38 baby-spider ((obj baby-spider)) (integrate-for-enemy-with-move-to-ground! (-> obj collide-info) (-> obj collide-info transv) @@ -251,7 +251,7 @@ baby-spider-default-event-handler (none) ) -(defmethod dummy-51 baby-spider ((obj baby-spider)) +(defmethod nav-enemy-method-51 baby-spider ((obj baby-spider)) (let* ((f0-0 (rand-vu-float-range 0.0 1.0)) (f1-1 (+ 1.0 (* 2.0 f0-0))) (f2-2 f1-1) @@ -265,7 +265,7 @@ baby-spider-default-event-handler (none) ) -(defmethod dummy-52 baby-spider ((obj baby-spider) (arg0 vector)) +(defmethod nav-enemy-method-52 baby-spider ((obj baby-spider) (arg0 vector)) (+! (-> obj wiggle-angle) (* DISPLAY_FPS_RATIO (-> obj delta-wiggle-angle))) ;; changed for high fps (if (< 65536.0 (-> obj wiggle-angle)) (set! (-> obj wiggle-angle) (+ -65536.0 (-> obj wiggle-angle))) @@ -283,7 +283,7 @@ baby-spider-default-event-handler ) ) -(defmethod dummy-53 baby-spider ((obj baby-spider)) +(defmethod nav-enemy-method-53 baby-spider ((obj baby-spider)) (cond ((logtest? (-> obj draw status) (draw-status was-drawn)) (set! (-> obj last-visible-time) (-> *display* base-frame-counter)) @@ -307,7 +307,7 @@ baby-spider-default-event-handler (ja-channel-push! 1 0) (ja-no-eval :group! baby-spider-birth-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (suspend) @@ -326,7 +326,7 @@ baby-spider-default-event-handler ((not *target*) (go-virtual nav-enemy-idle) ) - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) ) ((and (and *target* (>= (-> self enemy-info idle-distance) @@ -363,7 +363,7 @@ baby-spider-default-event-handler (none) ) :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-idle) trans))) @@ -383,7 +383,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-patrol) trans))) @@ -414,7 +414,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-notice) trans))) @@ -443,7 +443,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (if (>= (- (-> *display* base-frame-counter) (-> self state-time)) (-> self chase-rest-time)) @@ -466,7 +466,7 @@ baby-spider-default-event-handler (loop (when (>= (- (-> *display* base-frame-counter) (-> self wiggle-time)) (seconds 1)) (set! (-> self wiggle-time) (-> *display* base-frame-counter)) - (dummy-51 self) + (nav-enemy-method-51 self) ) (suspend) (ja :num! (loop!)) @@ -474,7 +474,7 @@ baby-spider-default-event-handler (none) ) :post (behavior () - (dummy-52 self (target-pos 0)) + (nav-enemy-method-52 self (target-pos 0)) (nav-enemy-travel-post) (none) ) @@ -484,7 +484,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-stop-chase) trans))) @@ -501,7 +501,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-stare) trans))) @@ -545,7 +545,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-give-up) trans))) @@ -584,7 +584,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-attack) trans))) @@ -610,7 +610,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-victory) trans))) @@ -682,12 +682,12 @@ baby-spider-default-event-handler (none) ) -(defmethod TODO-RENAME-48 baby-spider ((obj baby-spider)) +(defmethod nav-enemy-method-48 baby-spider ((obj baby-spider)) (set! (-> obj last-visible-time) (-> *display* base-frame-counter)) (initialize-skeleton obj *baby-spider-sg* '()) (if (= (-> obj parent 0 type) cave-trap) - (TODO-RENAME-45 obj *baby-spider-nav-enemy-info-for-cave-trap*) - (TODO-RENAME-45 obj *baby-spider-nav-enemy-info*) + (init-defaults! obj *baby-spider-nav-enemy-info-for-cave-trap*) + (init-defaults! obj *baby-spider-nav-enemy-info*) ) (let ((v1-11 (-> obj draw shadow-ctrl settings))) (logclear! (-> v1-11 flags) (shadow-flags shdf03)) @@ -719,7 +719,7 @@ baby-spider-default-event-handler (vector-float*! (-> self collide-info transv) arg2 8192.0) (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) (set! (-> self entity) (-> arg0 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (set! (-> self enemy-info pickup-type) (the-as pickup-type (-> arg3 pickup))) (set! (-> self enemy-info pickup-amount) (the float (-> arg3 pickup-amount))) (create-connection! @@ -765,11 +765,7 @@ baby-spider-default-event-handler -1 4096.0 ) - (TODO-RENAME-48 obj) + (nav-enemy-method-48 obj) (go (method-of-object obj nav-enemy-idle)) (none) ) - - - - diff --git a/goal_src/jak1/levels/maincave/cavecrystal-light.gc b/goal_src/jak1/levels/maincave/cavecrystal-light.gc index 21c8f197ca..561179867a 100644 --- a/goal_src/jak1/levels/maincave/cavecrystal-light.gc +++ b/goal_src/jak1/levels/maincave/cavecrystal-light.gc @@ -34,10 +34,10 @@ :size-assert #x170 :flag-assert #xf00000170 (:methods - (TODO-RENAME-9 (_type_ int float process-drawable) none 9) - (TODO-RENAME-10 (_type_ vector) float 10) + (cavecrystal-light-control-method-9 (_type_ int float process-drawable) none 9) + (cavecrystal-light-control-method-10 (_type_ vector) float 10) (inc-intensities! (_type_) none 11) - (TODO-RENAME-12 (_type_) none 12) + (cavecrystal-light-control-method-12 (_type_) none 12) (create-connection! (_type_ process-drawable res-lump (function object object object object object) int float) connection 13) (execute-connections (_type_) int 14) ) @@ -55,7 +55,7 @@ ) ) (set! (-> s5-0 w) arg2) - (let ((f0-1 (TODO-RENAME-10 *cavecrystal-light-control* s5-0)) + (let ((f0-1 (cavecrystal-light-control-method-10 *cavecrystal-light-control* s5-0)) (a2-2 (new 'static 'vector :x 1.0 :y 1.0 :z 1.0 :w 1.0)) (a1-5 (new 'static 'vector :x 0.05 :y 0.05 :z 0.05 :w 1.0)) ) @@ -81,7 +81,7 @@ (execute-connections *cavecrystal-engine* #f) ) -(defmethod TODO-RENAME-12 cavecrystal-light-control ((obj cavecrystal-light-control)) +(defmethod cavecrystal-light-control-method-12 cavecrystal-light-control ((obj cavecrystal-light-control)) (let ((v1-0 (-> obj last-known-valid-time)) (a1-1 (-> *display* base-frame-counter)) ) @@ -159,9 +159,9 @@ (none) ) -;; WARN: Expression building failed: Function (method 9 cavecrystal-light-control) has a return type of none, but the expression builder found a return statement. -(defmethod TODO-RENAME-9 cavecrystal-light-control ((obj cavecrystal-light-control) (arg0 int) (arg1 float) (arg2 process-drawable)) - (TODO-RENAME-12 obj) +;; WARN: Function (method 9 cavecrystal-light-control) has a return type of none, but the expression builder found a return statement. +(defmethod cavecrystal-light-control-method-9 cavecrystal-light-control ((obj cavecrystal-light-control) (arg0 int) (arg1 float) (arg2 process-drawable)) + (cavecrystal-light-control-method-12 obj) (when (or (< arg0 0) (>= arg0 7)) (format 0 "ERROR: Bogus cavecrystal id!~%") (return #f) @@ -189,8 +189,8 @@ (none) ) -(defmethod TODO-RENAME-10 cavecrystal-light-control ((obj cavecrystal-light-control) (arg0 vector)) - (TODO-RENAME-12 obj) +(defmethod cavecrystal-light-control-method-10 cavecrystal-light-control ((obj cavecrystal-light-control) (arg0 vector)) + (cavecrystal-light-control-method-12 obj) (let ((s5-1 (-> obj head)) (f30-0 0.0) ) @@ -212,7 +212,3 @@ f30-0 ) ) - - - - diff --git a/goal_src/jak1/levels/maincave/dark-crystal.gc b/goal_src/jak1/levels/maincave/dark-crystal.gc index 25ed95094b..1fdc062e87 100644 --- a/goal_src/jak1/levels/maincave/dark-crystal.gc +++ b/goal_src/jak1/levels/maincave/dark-crystal.gc @@ -25,8 +25,8 @@ :size-assert #x100 :flag-assert #x1600900100 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) symbol 21) + (dark-crystal-method-20 (_type_) none 20) + (dark-crystal-method-21 (_type_) symbol 21) ) (:states dark-crystal-activate @@ -47,9 +47,7 @@ :bounds (static-spherem 0 -15 0 50) ) -(define *dark-crystal-flash-delays* - (the-as (array int32) (new 'static 'boxed-array :type int32 #xb4 #x96 #x78 90 60 30 15 7 3)) - ) +(define *dark-crystal-flash-delays* (new 'static 'boxed-array :type int32 #xb4 #x96 #x78 90 60 30 15 7 3)) (define *dark-crystal-exploder-params* (new 'static 'joint-exploder-static-params @@ -75,7 +73,7 @@ (defpartgroup group-dark-crystal-gnd-explode :id 322 - :duration 75 + :duration (seconds 0.25) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 16) :parts ((sp-item 2153 :fade-after (meters 100) :period 600 :length 5 :binding 296) @@ -260,8 +258,8 @@ (defpartgroup group-dark-crystal-water-explode :id 323 - :duration 75 - :linger-duration 12000 + :duration (seconds 0.25) + :linger-duration (seconds 40) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 16) :parts ((sp-item 2159 :period 600 :length 5) @@ -418,10 +416,10 @@ ) (defstate dark-crystal-idle (dark-crystal) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch 'attack) - (if (= (-> arg0 type) target) + (if (= (-> proc type) target) (level-hint-spawn (game-text-id cave-dark-crystals-flee) "sksp0334" @@ -485,12 +483,12 @@ (process-spawn joint-exploder *dark-crystal-explode-sg* 5 gp-0 *dark-crystal-exploder-params* :to self) ) (activate! *camera-smush-control* 819.2 37 210 1.0 0.995) - (let ((gp-1 (dummy-21 self))) + (let ((gp-1 (dark-crystal-method-21 self))) (suspend) (ja-channel-set! 0) (ja-post) (logior! (-> self draw status) (draw-status hidden)) - (dummy-20 self) + (dark-crystal-method-20 self) (if (-> self underwater?) (sound-play "water-explosion") (sound-play "crystal-explode") @@ -564,7 +562,7 @@ ) ) -(defmethod dummy-20 dark-crystal ((obj dark-crystal)) +(defmethod dark-crystal-method-20 dark-crystal ((obj dark-crystal)) (when *target* (let ((s5-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'vector)) @@ -598,7 +596,7 @@ (none) ) -(defmethod dummy-21 dark-crystal ((obj dark-crystal)) +(defmethod dark-crystal-method-21 dark-crystal ((obj dark-crystal)) (let ((s5-0 #f)) (when (nonzero? (-> obj crystal-num)) (let* ((s4-0 (get-task-control (game-task cave-dark-crystals))) @@ -661,7 +659,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/maincave/driller-lurker.gc b/goal_src/jak1/levels/maincave/driller-lurker.gc index 207d20c2b3..180047c54b 100644 --- a/goal_src/jak1/levels/maincave/driller-lurker.gc +++ b/goal_src/jak1/levels/maincave/driller-lurker.gc @@ -42,14 +42,14 @@ :size-assert #x128 :flag-assert #x1c00c00128 (:methods - (dummy-20 (_type_ symbol target) symbol 20) - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) none 22) - (dummy-23 (_type_) float 23) - (dummy-24 (_type_) symbol 24) - (dummy-25 (_type_) symbol 25) - (dummy-26 (_type_) symbol 26) - (dummy-27 (_type_) object 27) + (driller-lurker-method-20 (_type_ symbol target) symbol 20) + (driller-lurker-method-21 (_type_) none 21) + (driller-lurker-method-22 (_type_) none 22) + (driller-lurker-method-23 (_type_) float 23) + (driller-lurker-method-24 (_type_) symbol 24) + (driller-lurker-method-25 (_type_) symbol 25) + (driller-lurker-method-26 (_type_) symbol 26) + (driller-lurker-method-27 (_type_) object 27) ) (:states driller-lurker-attack @@ -317,7 +317,7 @@ ) ) -(defmethod dummy-20 driller-lurker ((obj driller-lurker) (arg0 symbol) (arg1 target)) +(defmethod driller-lurker-method-20 driller-lurker ((obj driller-lurker) (arg0 symbol) (arg1 target)) (let ((v1-1 (-> *display* base-frame-counter))) (when (!= v1-1 (-> obj last-update-time)) (set! (-> obj last-update-time) v1-1) @@ -386,7 +386,7 @@ ) ) (let ((s4-1 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> obj path) s4-1 (-> obj path-u)) + (path-control-method-14 (-> obj path) s4-1 (-> obj path-u)) (let ((f0-13 (atan (-> s4-1 x) (-> s4-1 z)))) (if (< (-> obj path-dir) 0.0) (set! f0-13 (+ 32768.0 f0-13)) @@ -512,10 +512,10 @@ ) (when (and (-> obj hit-player?) (or (not *target*) - (and (zero? (logand (-> *target* state-flags) + (and (not (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) ) - ) + ) (>= (- (-> *display* base-frame-counter) (-> obj hit-player-time)) (seconds 0.05)) ) ) @@ -526,14 +526,14 @@ ) ) -(defmethod dummy-23 driller-lurker ((obj driller-lurker)) +(defmethod driller-lurker-method-23 driller-lurker ((obj driller-lurker)) (let ((v1-1 (-> *display* base-frame-counter))) (when (!= v1-1 (-> obj last-player-path-u-time)) (set! (-> obj last-player-path-u-time) v1-1) (cond (*target* (let* ((s5-0 (-> obj path)) - (s4-0 (method-of-object s5-0 TODO-RENAME-20)) + (s4-0 (method-of-object s5-0 path-control-method-20)) ) (target-pos 0) (set! (-> obj player-path-u) (s4-0 s5-0)) @@ -548,7 +548,7 @@ (-> obj player-path-u) ) -(defmethod dummy-25 driller-lurker ((obj driller-lurker)) +(defmethod driller-lurker-method-25 driller-lurker ((obj driller-lurker)) (when *target* (let* ((s5-0 (target-pos 0)) (f0-1 (- (-> s5-0 y) (-> obj root-overeride trans y))) @@ -577,7 +577,7 @@ #f ) -(defmethod dummy-26 driller-lurker ((obj driller-lurker)) +(defmethod driller-lurker-method-26 driller-lurker ((obj driller-lurker)) (when *target* (let* ((a1-0 (target-pos 0)) (f0-1 (- (-> a1-0 y) (-> obj root-overeride trans y))) @@ -593,7 +593,7 @@ #t ) -(defmethod dummy-24 driller-lurker ((obj driller-lurker)) +(defmethod driller-lurker-method-24 driller-lurker ((obj driller-lurker)) (when *target* (let* ((a1-0 (target-pos 0)) (f0-1 (- (-> a1-0 y) (-> obj root-overeride trans y))) @@ -605,7 +605,7 @@ (return #t) ) ((< f0-2 143360.0) - (let ((f0-3 (dummy-23 obj)) + (let ((f0-3 (driller-lurker-method-23 obj)) (f1-5 (-> obj path-u)) ) (if (>= (* 0.1 (-> obj path-units-per-meter)) (fabs (- f0-3 f1-5))) @@ -621,7 +621,7 @@ #f ) -(defmethod dummy-27 driller-lurker ((obj driller-lurker)) +(defmethod driller-lurker-method-27 driller-lurker ((obj driller-lurker)) (let ((a2-0 (-> obj node-list data 25 bone transform)) (s5-0 (new 'stack-no-clear 'vector)) ) @@ -654,10 +654,10 @@ (none) ) :trans (behavior () - (if (dummy-25 self) + (if (driller-lurker-method-25 self) (go driller-lurker-chase #t) ) - (dummy-20 self #t (the-as target #f)) + (driller-lurker-method-20 self #t (the-as target #f)) (none) ) :code (behavior () @@ -671,7 +671,7 @@ (until (ja-done? 0) (update! (-> self sound2)) (if (and (>= (ja-aframe-num 0) 7.0) (>= 13.0 (ja-aframe-num 0))) - (dummy-27 self) + (driller-lurker-method-27 self) ) (suspend) (ja :num! (seek! max f30-0)) @@ -709,10 +709,10 @@ (none) ) :trans (behavior () - (if (dummy-25 self) + (if (driller-lurker-method-25 self) (go driller-lurker-chase #t) ) - (dummy-20 self #t (the-as target #f)) + (driller-lurker-method-20 self #t (the-as target #f)) (none) ) :code (behavior () @@ -749,10 +749,10 @@ (none) ) :trans (behavior () - (if (dummy-25 self) + (if (driller-lurker-method-25 self) (go driller-lurker-chase #t) ) - (dummy-20 self #t (the-as target #f)) + (driller-lurker-method-20 self #t (the-as target #f)) (none) ) :code (behavior () @@ -810,17 +810,17 @@ (none) ) :trans (behavior () - (if (dummy-24 self) + (if (driller-lurker-method-24 self) (go driller-lurker-attack) ) - (if (dummy-26 self) + (if (driller-lurker-method-26 self) (go driller-lurker-patrol) ) (if (>= (- (-> *display* base-frame-counter) (-> self started-chasing-time)) (seconds 3)) (go driller-lurker-jammed-standing) ) (let* ((gp-0 (-> self path)) - (s5-0 (method-of-object gp-0 TODO-RENAME-20)) + (s5-0 (method-of-object gp-0 path-control-method-20)) ) (target-pos 0) (let ((f0-1 (- (s5-0 gp-0) (-> self path-u)))) @@ -842,7 +842,7 @@ ) ) ) - (dummy-20 self #f (the-as target #t)) + (driller-lurker-method-20 self #f (the-as target #t)) (none) ) :code (behavior ((arg0 symbol)) @@ -875,7 +875,7 @@ ) :trans (behavior () (cond - ((dummy-24 self) + ((driller-lurker-method-24 self) (set! (-> self state-time) (-> *display* base-frame-counter)) ) (else @@ -887,7 +887,7 @@ (if (>= (- (-> *display* base-frame-counter) (-> self started-chasing-time)) (seconds 3)) (go driller-lurker-jammed-standing) ) - (dummy-20 self #f (the-as target #t)) + (driller-lurker-method-20 self #f (the-as target #t)) (none) ) :code (behavior () @@ -919,7 +919,7 @@ (none) ) :trans (behavior () - (dummy-20 self #f (the-as target #f)) + (driller-lurker-method-20 self #f (the-as target #f)) (none) ) :code (behavior () @@ -1128,7 +1128,7 @@ ) (eval-path-curve! (-> obj path) (-> obj root-overeride trans) (-> obj path-u) 'interp) (let ((s5-1 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> obj path) s5-1 (-> obj path-u)) + (path-control-method-14 (-> obj path) s5-1 (-> obj path-u)) (let ((f0-51 (atan (-> s5-1 x) (-> s5-1 z)))) (if (< (-> obj path-dir) 0.0) (set! f0-51 (+ 32768.0 f0-51)) @@ -1164,7 +1164,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/maincave/gnawer.gc b/goal_src/jak1/levels/maincave/gnawer.gc index 879ea79521..f38fa1ad9e 100644 --- a/goal_src/jak1/levels/maincave/gnawer.gc +++ b/goal_src/jak1/levels/maincave/gnawer.gc @@ -95,17 +95,17 @@ :size-assert #x5d0 :flag-assert #x1f056005d0 (:methods - (dummy-20 (_type_ int) matrix 20) - (dummy-21 (_type_ int bounding-box symbol float) float 21) - (dummy-22 (_type_ float) symbol 22) - (dummy-23 (_type_) none 23) - (dummy-24 (_type_) none 24) - (dummy-25 (_type_) symbol 25) - (dummy-26 (_type_) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_ int int) symbol 28) - (dummy-29 (_type_ int vector vector) float 29) - (dummy-30 (_type_ process-drawable) uint 30) + (gnawer-method-20 (_type_ int) matrix 20) + (gnawer-method-21 (_type_ int bounding-box symbol float) float 21) + (gnawer-method-22 (_type_ float) symbol 22) + (gnawer-method-23 (_type_) none 23) + (gnawer-method-24 (_type_) none 24) + (gnawer-method-25 (_type_) symbol 25) + (gnawer-method-26 (_type_) none 26) + (gnawer-method-27 (_type_) none 27) + (gnawer-method-28 (_type_ int int) symbol 28) + (gnawer-method-29 (_type_ int vector vector) float 29) + (gnawer-method-30 (_type_ process-drawable) uint 30) ) (:states gnawer-chewing-on-post @@ -413,7 +413,7 @@ (none) ) -(defmethod dummy-23 gnawer ((obj gnawer)) +(defmethod gnawer-method-23 gnawer ((obj gnawer)) (when (not (-> obj hidden?)) (set! (-> obj hidden?) #t) (logior! (-> obj draw status) (draw-status hidden)) @@ -429,7 +429,7 @@ (none) ) -(defmethod dummy-26 gnawer ((obj gnawer)) +(defmethod gnawer-method-26 gnawer ((obj gnawer)) (when (-> obj hidden?) (set! (-> obj hidden?) #f) (restore-collide-with-as (-> obj root-override)) @@ -439,7 +439,7 @@ (none) ) -(defmethod dummy-24 gnawer ((obj gnawer)) +(defmethod gnawer-method-24 gnawer ((obj gnawer)) (local-vars (sv-48 vector) (sv-64 vector)) (let ((s5-0 0) (s4-0 0) @@ -537,7 +537,7 @@ (none) ) -(defmethod dummy-22 gnawer ((obj gnawer) (arg0 float)) +(defmethod gnawer-method-22 gnawer ((obj gnawer) (arg0 float)) (let ((s4-0 (new 'stack-no-clear 'bounding-box)) (a3-0 #t) (gp-0 #t) @@ -559,11 +559,11 @@ (set! gp-0 #f) ) ) - (dummy-21 obj s2-0 s4-0 a3-0 f0-1) + (gnawer-method-21 obj s2-0 s4-0 a3-0 f0-1) ) ) (else - (dummy-20 obj s2-0) + (gnawer-method-20 obj s2-0) ) ) ) @@ -595,7 +595,7 @@ ) ) -(defmethod dummy-21 gnawer ((obj gnawer) (arg0 int) (arg1 bounding-box) (arg2 symbol) (arg3 float)) +(defmethod gnawer-method-21 gnawer ((obj gnawer) (arg0 int) (arg1 bounding-box) (arg2 symbol) (arg3 float)) (let ((gp-0 (-> obj segments arg0))) (let ((f0-1 (+ 10240.0 (-> obj route surface-dist)))) (cond @@ -658,14 +658,11 @@ (vector-normalize! (the-as vector (-> gp-0 orient-mat)) 1.0) (set! (-> gp-0 orient-mat vector 0 w) 0.0) (set! (-> gp-0 orient-mat vector 1 w) 0.0) - (let ((f0-27 0.0)) - (set! (-> gp-0 orient-mat vector 2 w) f0-27) - f0-27 - ) + (set! (-> gp-0 orient-mat vector 2 w) 0.0) ) ) -(defmethod dummy-20 gnawer ((obj gnawer) (arg0 int)) +(defmethod gnawer-method-20 gnawer ((obj gnawer) (arg0 int)) (let ((v1-3 (-> obj segments arg0)) (a0-1 (-> obj segments (+ arg0 -1))) ) @@ -687,7 +684,7 @@ ) ) -(defmethod dummy-25 gnawer ((obj gnawer)) +(defmethod gnawer-method-25 gnawer ((obj gnawer)) (dotimes (s5-0 3) (when (> (-> obj hit-points) 0) (+! (-> obj hit-points) -1) @@ -722,22 +719,25 @@ (<= (-> obj hit-points) 0) ) -(defmethod dummy-28 gnawer ((obj gnawer) (arg0 int) (arg1 int)) +(defmethod gnawer-method-28 gnawer ((obj gnawer) (arg0 int) (arg1 int)) (when (> arg0 0) - (let* ((v1-1 (rand-vu-int-count arg0)) (a0-2 v1-1)) (until (= a0-2 v1-1) - (let ((a1-2 (ash 1 a0-2))) - (if (zero? (logand a1-2 arg1)) - (return (the-as symbol a1-2)) - ) - ) - (set! a0-2 (mod (+ a0-2 1) arg0)) - ) + (let* ((v1-1 (rand-vu-int-count arg0)) + (a0-2 v1-1) + ) + (until (= a0-2 v1-1) + (let ((a1-2 (ash 1 a0-2))) + (if (not (logtest? a1-2 arg1)) + (return (the-as symbol a1-2)) + ) ) + (set! a0-2 (mod (+ a0-2 1) arg0)) + ) + ) ) (the-as symbol 0) ) -(defmethod dummy-27 gnawer ((obj gnawer)) +(defmethod gnawer-method-27 gnawer ((obj gnawer)) (set! (-> obj eco-green-mask) (the-as uint 0)) (let ((s4-0 (-> obj path curve num-cverts)) (s3-0 (get-death-count *game-info* #f)) @@ -748,7 +748,7 @@ (and (< 1 s3-0) (and (>= 2.0 (-> *target* fact-info-target health)) (rand-vu-percent? 0.05))) ) ) - (let ((v1-14 (dummy-28 obj s4-0 (the-as int s5-0)))) + (let ((v1-14 (gnawer-method-28 obj s4-0 (the-as int s5-0)))) (logior s5-0 (the-as uint v1-14)) (set! (-> obj eco-green-mask) (the-as uint (logior (-> obj eco-green-mask) (the-as uint v1-14)))) ) @@ -757,7 +757,7 @@ (none) ) -(defmethod dummy-29 gnawer ((obj gnawer) (arg0 int) (arg1 vector) (arg2 vector)) +(defmethod gnawer-method-29 gnawer ((obj gnawer) (arg0 int) (arg1 vector) (arg2 vector)) (let ((s1-0 (-> obj path curve num-cverts)) (s2-0 (new 'stack-no-clear 'vector)) ) @@ -781,13 +781,10 @@ ) ) (vector+! arg2 arg2 (-> obj post-trans)) - (let ((f0-11 (+ 4096.0 (-> arg2 y)))) - (set! (-> arg2 y) f0-11) - f0-11 - ) + (set! (-> arg2 y) (+ 4096.0 (-> arg2 y))) ) -(defmethod dummy-30 gnawer ((obj gnawer) (arg0 process-drawable)) +(defmethod gnawer-method-30 gnawer ((obj gnawer) (arg0 process-drawable)) (local-vars (sv-48 vector)) (let ((gp-0 (-> obj entity extra perm))) (logior! (-> gp-0 status) (entity-perm-status user-set-from-cstage)) @@ -801,7 +798,7 @@ (when (logtest? (ash 1 s0-0) s5-0) (let ((a2-0 (new 'stack-no-clear 'vector))) (set! sv-48 (new 'stack-no-clear 'vector)) - (dummy-29 obj s0-0 a2-0 sv-48) + (gnawer-method-29 obj s0-0 a2-0 sv-48) ) (let* ((t9-1 vector-vector-xz-distance) (a1-2 (-> arg0 root trans)) @@ -826,14 +823,14 @@ ) (defstate gnawer-chewing-on-post (gnawer) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch) - (if (= (-> arg0 type) target) + (if (= (-> proc type) target) (send-event - arg0 + proc 'shove - (-> arg3 param 0) + (-> event param 0) (static-attack-info ((shove-up (meters 1.5)) (shove-back (meters 2.5)))) ) ) @@ -965,7 +962,7 @@ (defstate gnawer-wait-to-run (gnawer) :code (behavior () (set! (-> self draw origin-joint-index) (the-as uint 0)) - (dummy-23 self) + (gnawer-method-23 self) (set! (-> self state-time) (-> *display* base-frame-counter)) (let ((gp-0 (rand-vu-int-range 240 360))) (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) gp-0) @@ -978,26 +975,26 @@ ) (defstate gnawer-run (gnawer) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 object)) - (case arg2 + (case event-type (('touch) - (if (= (-> arg0 type) target) + (if (= (-> proc type) target) (send-event - arg0 + proc 'shove - (-> arg3 param 0) + (-> event param 0) (static-attack-info ((shove-up (meters 1.5)) (shove-back (meters 2.5)))) ) ) ) (('attack) (cond - ((= (-> arg0 type) target) + ((= (-> proc type) target) (send-event - arg0 + proc 'attack - (-> arg3 param 0) + (-> event param 0) (static-attack-info ((shove-up (meters 1.5)) (shove-back (meters 2.5)))) ) ) @@ -1005,7 +1002,7 @@ (if (< (- (-> *display* base-frame-counter) (-> self last-hit-time)) (seconds 0.5)) (return #f) ) - (let* ((a2-1 (the-as object (-> arg3 param 0))) + (let* ((a2-1 (the-as object (-> event param 0))) (v1-19 (-> (get-touched-prim (-> (the-as touching-shapes-entry a2-1) head) (-> self root-override) @@ -1018,7 +1015,7 @@ ) (spawn (-> self part) (-> v1-22 world-pos)) ) - (if (dummy-25 self) + (if (gnawer-method-25 self) (go gnawer-die) ) (return #t) @@ -1031,9 +1028,9 @@ :enter (behavior () (logclear! (-> self mask) (process-mask actor-pause)) (set! (-> self route-dist) 0.0) - (dummy-24 self) + (gnawer-method-24 self) (set! (-> self last-hit-time) (-> *display* base-frame-counter)) - (dummy-26 self) + (gnawer-method-26 self) (none) ) :exit (behavior () @@ -1043,7 +1040,7 @@ ) :trans (behavior () (+! (-> self route-dist) (* (-> self speed) (-> *display* seconds-per-frame))) - (if (dummy-22 self (-> self route-dist)) + (if (gnawer-method-22 self (-> self route-dist)) (go gnawer-wait-to-run) ) (update! (-> self sound)) @@ -1125,15 +1122,15 @@ ) (defstate gnawer-dying-give-pickups (gnawer) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'notify) - (if (and (= (-> arg0 type) money) (= (-> arg3 param 0) 'pickup)) - (dummy-30 self (the-as process-drawable arg0)) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('notify) + (if (and (= (-> proc type) money) (= (-> event param 0) 'pickup)) + (gnawer-method-30 self (the-as process-drawable proc)) + ) + ) + ) + ) ) :trans (behavior () (spool-push *art-control* "maincavecam-gnawer-fuel-cell" 0 self -1.0) @@ -1147,7 +1144,7 @@ (ja-post) (logior! (-> self draw status) (draw-status hidden)) (process-entity-status! self (entity-perm-status complete) #t) - (dummy-27 self) + (gnawer-method-27 self) (let ((v1-10 (-> self entity extra perm))) (logior! (-> v1-10 status) (entity-perm-status user-set-from-cstage)) (set! (-> v1-10 user-int16 0) (the-as int (-> self money-mask))) @@ -1156,7 +1153,7 @@ (let ((s4-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'vector)) ) - (dummy-29 self gp-0 s4-0 s5-0) + (gnawer-method-29 self gp-0 s4-0 s5-0) (let ((a1-2 7)) (let ((v1-14 (ash 1 gp-0))) (cond @@ -1196,24 +1193,24 @@ ) (defstate gnawer-give-fuel-cell (gnawer) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'notify) - (cond - ((and (= (-> arg0 type) maincavecam) (= (-> arg3 param 0) 'die)) - (process-entity-status! self (entity-perm-status bit-3) #f) - (let ((v0-0 (the-as uint (logior (-> self mask) (process-mask actor-pause))))) - (set! (-> self mask) (the-as process-mask v0-0)) - v0-0 - ) - ) - ((and (= (-> arg0 type) money) (= (-> arg3 param 0) 'pickup)) - (dummy-30 self (the-as process-drawable arg0)) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('notify) + (cond + ((and (= (-> proc type) maincavecam) (= (-> event param 0) 'die)) + (process-entity-status! self (entity-perm-status bit-3) #f) + (let ((v0-0 (the-as uint (logior (-> self mask) (process-mask actor-pause))))) + (set! (-> self mask) (the-as process-mask v0-0)) + v0-0 + ) ) - ) - ) - ) + ((and (= (-> proc type) money) (= (-> event param 0) 'pickup)) + (gnawer-method-30 self (the-as process-drawable proc)) + ) + ) + ) + ) + ) ) :code (behavior () (when (not (task-complete? *game-info* (-> self entity extra perm task))) @@ -1264,15 +1261,15 @@ ) (defstate gnawer-put-items-at-dest (gnawer) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'notify) - (if (and (= (-> arg0 type) money) (= (-> arg3 param 0) 'pickup)) - (dummy-30 self (the-as process-drawable arg0)) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('notify) + (if (and (= (-> proc type) money) (= (-> event param 0) 'pickup)) + (gnawer-method-30 self (the-as process-drawable proc)) + ) + ) + ) + ) ) :code (behavior () (set! (-> self draw origin-joint-index) (the-as uint 0)) @@ -1306,7 +1303,7 @@ (let ((a2-1 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'vector)) ) - (dummy-29 self s4-0 a2-1 s3-0) + (gnawer-method-29 self s4-0 a2-1 s3-0) (birth-pickup-at-point s3-0 (pickup-type money) 1.0 #f self (the-as fact-info #f)) ) ) @@ -1535,7 +1532,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/maincave/maincave-obs.gc b/goal_src/jak1/levels/maincave/maincave-obs.gc index 33f4db3903..74c9747f2c 100644 --- a/goal_src/jak1/levels/maincave/maincave-obs.gc +++ b/goal_src/jak1/levels/maincave/maincave-obs.gc @@ -96,8 +96,8 @@ ) ) -(defmethod TODO-RENAME-22 cave-water ((obj cave-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 cave-water ((obj cave-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) @@ -144,7 +144,7 @@ (collide-action solid) (collide-action) ) - (target-attack-up *target* 'attack-or-shove 'deadlyup) + (the-as symbol (target-attack-up *target* 'attack-or-shove 'deadlyup)) ) ) ) @@ -445,7 +445,7 @@ (collide-action) ) (let ((s4-0 (new 'stack 'attack-info))) - (dummy-41 (-> self root-override) s4-0 (-> self shove-up)) + (calc-shove-up (-> self root-override) s4-0 (-> self shove-up)) (if (or (= (-> *target* control unknown-surface00 mode) 'air) (>= (+ (-> *display* base-frame-counter) (seconds -0.2)) (-> *target* control unknown-dword11)) (< 0.75 (-> *target* control poly-normal y)) @@ -873,8 +873,8 @@ :size-assert #x150 :flag-assert #x1600e00150 (:methods - (TODO-RENAME-20 (_type_) none 20) - (TODO-RENAME-21 (_type_) float 21) + (caveelevator-method-20 (_type_) none 20) + (caveelevator-method-21 (_type_) float 21) ) (:states caveelevator-cycle-active @@ -900,7 +900,7 @@ ) ) (set! (-> s5-0 w) arg2) - (let ((f0-1 (TODO-RENAME-10 *cavecrystal-light-control* s5-0)) + (let ((f0-1 (cavecrystal-light-control-method-10 *cavecrystal-light-control* s5-0)) (a2-2 (new 'static 'vector :x 1.0 :y 1.0 :z 1.0 :w 1.0)) (a1-5 (new 'static 'vector :x 0.3 :y 0.3 :z 0.3 :w 1.0)) ) @@ -909,7 +909,7 @@ ) ) -(defmethod TODO-RENAME-20 caveelevator ((obj caveelevator)) +(defmethod caveelevator-method-20 caveelevator ((obj caveelevator)) (let ((v1-1 (-> *display* base-frame-counter))) (when (!= v1-1 (-> obj last-update-bounce-time)) (set! (-> obj last-update-bounce-time) v1-1) @@ -925,7 +925,7 @@ (none) ) -(defmethod TODO-RENAME-21 caveelevator ((obj caveelevator)) +(defmethod caveelevator-method-21 caveelevator ((obj caveelevator)) (let ((s5-0 (new 'stack-no-clear 'vector)) (gp-0 (-> obj draw bounds)) ) @@ -954,7 +954,7 @@ ) :trans (behavior () (rider-trans) - (TODO-RENAME-20 self) + (caveelevator-method-20 self) (none) ) :code (behavior () @@ -972,7 +972,7 @@ ) :post (behavior () (rider-post) - (TODO-RENAME-21 self) + (caveelevator-method-21 self) (none) ) ) @@ -995,7 +995,7 @@ ) :trans (behavior () (rider-trans) - (TODO-RENAME-20 self) + (caveelevator-method-20 self) (none) ) :code (behavior () @@ -1011,7 +1011,7 @@ ) :post (behavior () (rider-post) - (TODO-RENAME-21 self) + (caveelevator-method-21 self) (none) ) ) @@ -1035,7 +1035,7 @@ ) :trans (behavior () (rider-trans) - (TODO-RENAME-20 self) + (caveelevator-method-20 self) (none) ) :code (behavior () @@ -1050,7 +1050,7 @@ ) :post (behavior () (rider-post) - (TODO-RENAME-21 self) + (caveelevator-method-21 self) (none) ) ) @@ -1080,7 +1080,7 @@ ) ) (rider-trans) - (TODO-RENAME-20 self) + (caveelevator-method-20 self) (none) ) :code (behavior () @@ -1092,7 +1092,7 @@ ) :post (behavior () (rider-post) - (TODO-RENAME-21 self) + (caveelevator-method-21 self) (none) ) ) @@ -1116,7 +1116,7 @@ ) :trans (behavior () (rider-trans) - (TODO-RENAME-20 self) + (caveelevator-method-20 self) (none) ) :code (behavior () @@ -1131,7 +1131,7 @@ ) :post (behavior () (rider-post) - (TODO-RENAME-21 self) + (caveelevator-method-21 self) (none) ) ) diff --git a/goal_src/jak1/levels/maincave/mother-spider-egg.gc b/goal_src/jak1/levels/maincave/mother-spider-egg.gc index 1e8969c901..2c9a90c511 100644 --- a/goal_src/jak1/levels/maincave/mother-spider-egg.gc +++ b/goal_src/jak1/levels/maincave/mother-spider-egg.gc @@ -27,7 +27,7 @@ :size-assert #x150 :flag-assert #x1600e00150 (:methods - (dummy-20 (_type_) none 20) + (mother-spider-egg-method-20 (_type_) none 20) (draw-egg-shadow (_type_ vector symbol) symbol 21) ) (:states @@ -60,8 +60,8 @@ (defpartgroup group-spider-egg-hatches :id 324 - :duration 5 - :linger-duration 900 + :duration (seconds 0.017) + :linger-duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 8) :parts ((sp-item 2018 :fade-after (meters 50) :falloff-to (meters 50)) @@ -129,8 +129,8 @@ (defpartgroup group-spider-egg-explodes :id 325 - :duration 5 - :linger-duration 375 + :duration (seconds 0.017) + :linger-duration (seconds 1.25) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 8) :parts ((sp-item 2074 :fade-after (meters 50) :falloff-to (meters 50))) @@ -221,8 +221,8 @@ ) (defstate mother-spider-egg-falling (mother-spider-egg) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch 'attack) (go mother-spider-egg-die-while-falling) ) @@ -266,25 +266,24 @@ ) (defstate mother-spider-egg-on-ground (mother-spider-egg) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'touch) - (send-shove-back - (-> self root-override) - arg0 - (the-as touching-shapes-entry (-> arg3 param 0)) - 0.7 - 6144.0 - 16384.0 - ) - ) - ((= v1-0 'attack) - (go mother-spider-egg-die) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('touch) + (the-as object (send-shove-back + (-> self root-override) + proc + (the-as touching-shapes-entry (-> event param 0)) + 0.7 + 6144.0 + 16384.0 + ) + ) + ) + (('attack) + (go mother-spider-egg-die) + ) + ) + ) ) :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -529,7 +528,3 @@ (go mother-spider-egg-falling) (none) ) - - - - diff --git a/goal_src/jak1/levels/maincave/mother-spider-h.gc b/goal_src/jak1/levels/maincave/mother-spider-h.gc index 38db94ace1..f7261857f5 100644 --- a/goal_src/jak1/levels/maincave/mother-spider-h.gc +++ b/goal_src/jak1/levels/maincave/mother-spider-h.gc @@ -116,16 +116,16 @@ :size-assert #x1f0 :flag-assert #x20018001f0 (:methods - (TODO-RENAME-20 (_type_ vector vector) symbol 20) - (TODO-RENAME-21 (_type_ vector float symbol) symbol 21) - (dummy-22 (_type_ matrix vector) float 22) - (TODO-RENAME-23 (_type_) none 23) - (TODO-RENAME-24 (_type_) number 24) + (mother-spider-method-20 (_type_ vector vector) symbol 20) + (mother-spider-method-21 (_type_ vector float symbol) symbol 21) + (mother-spider-method-22 (_type_ matrix vector) float 22) + (mother-spider-method-23 (_type_) none 23) + (shadow-handler (_type_) number 24) (letgo-player? (_type_) symbol 25) (grab-player? (_type_) symbol 26) - (STUB-27 (_type_) none 27) - (STUB-28 (_type_) none 28) - (TODO-RENAME-29 (_type_ symbol symbol) none 29) + (mother-spider-method-27 (_type_) none 27) + (mother-spider-method-28 (_type_) none 28) + (mother-spider-method-29 (_type_ symbol symbol) none 29) (spawn-child (_type_ vector vector symbol) int 30) (is-player-stuck? (_type_) symbol 31) ) @@ -145,10 +145,3 @@ wait-for-children ) ) - - -0 - - - - diff --git a/goal_src/jak1/levels/maincave/mother-spider-proj.gc b/goal_src/jak1/levels/maincave/mother-spider-proj.gc index 1369eb20a3..140d9985fe 100644 --- a/goal_src/jak1/levels/maincave/mother-spider-proj.gc +++ b/goal_src/jak1/levels/maincave/mother-spider-proj.gc @@ -225,7 +225,7 @@ :parts ((sp-item 722)) ) -(defmethod dummy-24 mother-spider-proj ((obj mother-spider-proj)) +(defmethod projectile-method-24 mother-spider-proj ((obj mother-spider-proj)) (with-pp (spawn (-> obj part) (the-as vector (-> obj root-override root-prim prim-core))) (let ((s5-0 (the-as sound-rpc-set-param (get-sound-buffer-entry)))) @@ -290,7 +290,7 @@ (none) ) -(defmethod dummy-26 mother-spider-proj ((obj mother-spider-proj)) +(defmethod projectile-method-26 mother-spider-proj ((obj mother-spider-proj)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) projectile-collision-reaction) @@ -321,7 +321,7 @@ (none) ) -(defmethod dummy-27 mother-spider-proj ((obj mother-spider-proj)) +(defmethod projectile-method-27 mother-spider-proj ((obj mother-spider-proj)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 326) obj)) (set! (-> obj max-speed) 32768.0) (set! (-> obj update-velocity) mother-spider-proj-update-velocity) @@ -337,7 +337,7 @@ (none) ) -(defmethod dummy-28 mother-spider-proj ((obj mother-spider-proj)) +(defmethod projectile-method-28 mother-spider-proj ((obj mother-spider-proj)) (when (and *target* (not (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) diff --git a/goal_src/jak1/levels/maincave/mother-spider.gc b/goal_src/jak1/levels/maincave/mother-spider.gc index 707f52484c..430d5543da 100644 --- a/goal_src/jak1/levels/maincave/mother-spider.gc +++ b/goal_src/jak1/levels/maincave/mother-spider.gc @@ -254,7 +254,7 @@ (set! (-> gp-0 y) 0.0) (vector-normalize! gp-0 1.0) (set! (-> self thread-vel) (+ -40960.0 (-> self thread-vel))) - (if (TODO-RENAME-21 self gp-0 102400.0 #t) + (if (mother-spider-method-21 self gp-0 102400.0 #t) (go mother-spider-die) ) ) @@ -271,7 +271,7 @@ (set! (-> gp-1 y) 0.0) (vector-normalize! gp-1 1.0) (set! (-> self thread-vel) (+ -40960.0 (-> self thread-vel))) - (if (TODO-RENAME-21 self gp-1 102400.0 #t) + (if (mother-spider-method-21 self gp-1 102400.0 #t) (go mother-spider-die) ) ) @@ -293,7 +293,7 @@ (set! (-> gp-2 y) 0.0) (vector-normalize! gp-2 1.0) (set! (-> self thread-vel) (+ -8192.0 (-> self thread-vel))) - (TODO-RENAME-21 self gp-2 40960.0 #f) + (mother-spider-method-21 self gp-2 40960.0 #f) ) ) ) @@ -378,16 +378,16 @@ #f ) -(defmethod STUB-27 mother-spider ((obj mother-spider)) +(defmethod mother-spider-method-27 mother-spider ((obj mother-spider)) (none) ) -(defmethod STUB-28 mother-spider ((obj mother-spider)) +(defmethod mother-spider-method-28 mother-spider ((obj mother-spider)) 0 (none) ) -(defmethod TODO-RENAME-24 mother-spider ((obj mother-spider)) +(defmethod shadow-handler mother-spider ((obj mother-spider)) (cond ((and (-> obj draw shadow) (zero? (-> obj draw cur-lod)) @@ -492,7 +492,7 @@ #f ) -(defmethod TODO-RENAME-21 mother-spider ((obj mother-spider) (arg0 vector) (arg1 float) (arg2 symbol)) +(defmethod mother-spider-method-21 mother-spider ((obj mother-spider) (arg0 vector) (arg1 float) (arg2 symbol)) (local-vars (sv-112 process) (sv-128 vector) (sv-144 vector)) (let ((f30-0 (vector-length (-> obj swing-pos)))) (when (< 0.0 f30-0) @@ -564,11 +564,11 @@ (>= (-> obj damage) 6) ) -(defmethod TODO-RENAME-29 mother-spider ((obj mother-spider) (arg0 symbol) (arg1 symbol)) +(defmethod mother-spider-method-29 mother-spider ((obj mother-spider) (arg0 symbol) (arg1 symbol)) (let ((v1-1 (-> *display* base-frame-counter))) (when (!= v1-1 (-> obj last-update-time)) (set! (-> obj last-update-time) v1-1) - (TODO-RENAME-23 obj) + (mother-spider-method-23 obj) (let ((f0-1 (fmax 0.0 (- (-> obj dist-from-anchor) (-> obj idle-dist-from-anchor))))) (cond ((>= f0-1 20480.0) @@ -582,7 +582,7 @@ ) ) (if arg0 - (TODO-RENAME-24 obj) + (shadow-handler obj) ) (let ((s4-1 (-> obj leg-socket-part-mask))) (when (nonzero? s4-1) @@ -623,7 +623,7 @@ (none) ) -(defmethod TODO-RENAME-23 mother-spider ((obj mother-spider)) +(defmethod mother-spider-method-23 mother-spider ((obj mother-spider)) (local-vars (at-0 int)) (rlet ((vf0 :class vf) (vf1 :class vf) @@ -934,7 +934,7 @@ ) ) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior ((arg0 uint)) @@ -977,7 +977,7 @@ (if (-> self hit?) (go mother-spider-hit-while-tracking) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1077,7 +1077,7 @@ ) ) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1119,7 +1119,7 @@ (set! (-> self last-spit-time) 0) (go mother-spider-tracking) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1153,7 +1153,7 @@ (if (-> self hit?) (go mother-spider-hit-while-tracking) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1194,7 +1194,7 @@ (set! gp-0 #t) (set! (-> self last-spit-time) (-> *display* base-frame-counter)) (vector-negate! s5-0 s5-0) - (TODO-RENAME-21 self s5-0 49152.0 #f) + (mother-spider-method-21 self s5-0 49152.0 #f) (when (nonzero? (-> self max-baby-count)) (+! (-> self spit-counter) -1) (when (< (-> self spit-counter) 0) @@ -1248,12 +1248,12 @@ (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) ) ) - (TODO-RENAME-21 (-> self nav) (-> self root-override trans)) + (nav-control-method-21 (-> self nav) (-> self root-override trans)) ) ) (go mother-spider-birth-baby) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1295,10 +1295,10 @@ (if (letgo-player? self) (go mother-spider-traveling (the-as uint 0)) ) - (if (not (TODO-RENAME-21 (-> self nav) (-> self root-override trans))) + (if (not (nav-control-method-21 (-> self nav) (-> self root-override trans))) (go mother-spider-birthing) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1311,7 +1311,7 @@ (let ((s5-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) ) - (when (TODO-RENAME-20 self s5-0 s4-0) + (when (mother-spider-method-20 self s5-0 s4-0) (process-spawn mother-spider-egg (-> self entity) (-> self root-override trans) s5-0 s4-0 :to self) (+! (-> self baby-count) 1) (+! (-> self birthing-counter) -1) @@ -1329,10 +1329,10 @@ :post (the-as (function none :behavior mother-spider) transform-post) ) -(defmethod TODO-RENAME-20 mother-spider ((obj mother-spider) (arg0 vector) (arg1 vector)) +(defmethod mother-spider-method-20 mother-spider ((obj mother-spider) (arg0 vector) (arg1 vector)) (set! (-> obj nav nav-cull-radius) 40960.0) - (set-current-poly! (-> obj nav) (dummy-16 (-> obj nav) (-> obj root-override trans))) - (TODO-RENAME-28 (-> obj nav) (the-as collide-kind -1)) + (set-current-poly! (-> obj nav) (nav-control-method-16 (-> obj nav) (-> obj root-override trans))) + (nav-control-method-28 (-> obj nav) (the-as collide-kind -1)) (dotimes (s3-1 4) (let ((f28-0 (+ 32768.0 (-> obj orient-rot y))) (f30-0 (rand-vu-float-range 16384.0 40960.0)) @@ -1344,9 +1344,9 @@ (set-vector! s1-0 (sin f28-1) 0.0 (cos f28-1) 1.0) ) (vector-float*! s2-1 s1-0 f30-0) - (dummy-35 (-> obj nav) (-> obj nav travel) (-> obj root-override trans) s2-1 s1-0 f30-0) + (nav-control-method-35 (-> obj nav) (-> obj nav travel) (-> obj root-override trans) s2-1 s1-0 f30-0) ) - (dummy-24 (-> obj nav) f30-0 (the-as clip-travel-vector-to-mesh-return-info #f)) + (nav-control-method-24 (-> obj nav) f30-0 (the-as clip-travel-vector-to-mesh-return-info #f)) ) (cond ((>= (vector-xz-length (-> obj nav travel)) 4096.0) @@ -1424,7 +1424,7 @@ (if (= (-> self spin-vel) 0.0) (go mother-spider-birthing) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1480,7 +1480,7 @@ (none) ) :trans (behavior () - (TODO-RENAME-29 self #f #f) + (mother-spider-method-29 self #f #f) (none) ) :code (behavior () @@ -1505,7 +1505,7 @@ (defstate mother-spider-die (mother-spider) :event mother-spider-death-event-handler :trans (behavior () - (TODO-RENAME-29 self #f #f) + (mother-spider-method-29 self #f #f) (none) ) :code (behavior () @@ -1560,7 +1560,7 @@ (set! (-> s4-0 vector 3 z) (+ (-> arg0 anchor-trans z) (* f0-5 (-> v1-1 swing-arc-u)))) ) (if a1-0 - (dummy-22 arg0 a1-0 (-> s4-0 vector 3)) + (mother-spider-method-22 arg0 a1-0 (-> s4-0 vector 3)) ) (set! a1-0 s4-0) ) @@ -1570,7 +1570,7 @@ ) (vector-! a2-7 (-> arg0 root-override trans) (-> a0-11 vector 3)) (vector+! a2-7 a2-7 (-> arg0 root-override trans)) - (dummy-22 arg0 a1-0 a2-7) + (mother-spider-method-22 arg0 a1-0 a2-7) ) ) (dotimes (v1-16 (-> arg0 damage)) @@ -1593,7 +1593,7 @@ (none) ) -(defmethod dummy-22 mother-spider ((obj mother-spider) (arg0 matrix) (arg1 vector)) +(defmethod mother-spider-method-22 mother-spider ((obj mother-spider) (arg0 matrix) (arg1 vector)) (rlet ((vf0 :class vf)) (init-vf0-vector) (vector-! (-> arg0 vector 2) arg1 (-> arg0 vector 3)) diff --git a/goal_src/jak1/levels/misty/babak-with-cannon.gc b/goal_src/jak1/levels/misty/babak-with-cannon.gc index be921fa9fb..a3c747507f 100644 --- a/goal_src/jak1/levels/misty/babak-with-cannon.gc +++ b/goal_src/jak1/levels/misty/babak-with-cannon.gc @@ -277,7 +277,7 @@ nav-enemy-default-event-handler ) (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-travel)) (nav-enemy-execute-jump) - (let ((a1-6 (dummy-16 (-> self nav) (-> self jump-dest)))) + (let ((a1-6 (nav-control-method-16 (-> self nav) (-> self jump-dest)))) (set-current-poly! (-> self nav) a1-6) ) (go-virtual nav-enemy-jump-land) @@ -408,7 +408,7 @@ nav-enemy-default-event-handler (defmethod init-from-entity! babak-with-cannon ((obj babak-with-cannon) (arg0 entity-actor)) (initialize-collision obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-48 obj) + (nav-enemy-method-48 obj) (set! (-> obj distance) (res-lump-float arg0 'distance :default 163840.0)) (set! (-> obj cannon-ent) (entity-actor-lookup (-> obj entity) 'alt-actor 0)) (logclear! (-> obj mask) (process-mask actor-pause)) diff --git a/goal_src/jak1/levels/misty/balloonlurker.gc b/goal_src/jak1/levels/misty/balloonlurker.gc index aef82b6aad..200a2ad90e 100644 --- a/goal_src/jak1/levels/misty/balloonlurker.gc +++ b/goal_src/jak1/levels/misty/balloonlurker.gc @@ -11,8 +11,8 @@ (defpartgroup group-balloonlurker-pilot-death :id 203 - :duration 5 - :linger-duration 600 + :duration (seconds 0.017) + :linger-duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 12) :parts ((sp-item 2015)) @@ -37,7 +37,7 @@ (defpartgroup group-balloonlurker-mine-explosion :id 204 - :duration 600 + :duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 16) :parts ((sp-item 964 :period 1200 :length 30) @@ -319,8 +319,8 @@ :size-assert #xb0 :flag-assert #x16004000b0 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) none 21) + (balloonlurker-pilot-method-20 (_type_) none 20) + (balloonlurker-pilot-method-21 (_type_) none 21) ) (:states balloonlurker-pilot-die @@ -376,7 +376,7 @@ ) (eval-path-curve-div! (-> self path) s4-0 (the float arg0) 'interp) (set! (-> self root-overlay trans quad) (-> s4-0 quad)) - (TODO-RENAME-12 (-> self path) gp-0 (the float arg0)) + (path-control-method-12 (-> self path) gp-0 (the float arg0)) (set! (-> gp-0 y) 0.0) (vector-normalize! gp-0 1.0) (forward-up-nopitch->quaternion (-> self root-overlay quat) gp-0 *up-vector*) @@ -469,7 +469,7 @@ ) ) -(defmethod TODO-RENAME-23 balloonlurker ((obj balloonlurker) (arg0 float)) +(defmethod rigid-body-platform-method-23 balloonlurker ((obj balloonlurker) (arg0 float)) (let ((s5-0 (new 'stack-no-clear 'vector))) (let ((s3-0 (new 'stack-no-clear 'vector)) (s4-0 (-> obj rbody matrix)) @@ -477,7 +477,7 @@ (dotimes (s2-0 4) (let ((s1-0 (-> obj control-point-array data s2-0))) (vector-matrix*! (-> s1-0 world-pos) (-> s1-0 local-pos) s4-0) - (TODO-RENAME-17 (-> obj rbody) (-> s1-0 world-pos) (-> s1-0 velocity)) + (rigid-body-method-17 (-> obj rbody) (-> s1-0 world-pos) (-> s1-0 velocity)) (let* ((f30-0 (vector-vector-xz-distance (-> obj dest-point) (-> obj root-overlay trans))) (f0-0 (vector-vector-xz-distance (-> obj dest-point-old) (-> obj root-overlay trans))) (f0-6 @@ -502,16 +502,16 @@ ) ) ) - (TODO-RENAME-13 (-> obj rbody) (-> s1-0 world-pos) s5-0) + (rigid-body-method-13 (-> obj rbody) (-> s1-0 world-pos) s5-0) (vector-float*! s5-0 (-> s1-0 velocity) (* -1.0 (-> obj info drag-factor))) - (TODO-RENAME-13 (-> obj rbody) (-> s1-0 world-pos) s5-0) + (rigid-body-method-13 (-> obj rbody) (-> s1-0 world-pos) s5-0) ) 0 ) (let ((s2-1 (-> obj control-point-array data 4))) (let ((f30-1 (* (-> *BALLOONLURKER-bank* max-rudder-deflection-angle) (-> obj rudder-control)))) (vector-matrix*! (-> s2-1 world-pos) (-> s2-1 local-pos) s4-0) - (TODO-RENAME-17 (-> obj rbody) (-> s2-1 world-pos) (-> s2-1 velocity)) + (rigid-body-method-17 (-> obj rbody) (-> s2-1 world-pos) (-> s2-1 velocity)) (set-vector! s3-0 (cos f30-1) 0.0 (sin f30-1) 1.0) ) (vector-rotate*! s3-0 s3-0 s4-0) @@ -520,14 +520,14 @@ s3-0 (* -1.0 (-> *BALLOONLURKER-bank* rudder-factor) (vector-dot s3-0 (-> s2-1 velocity))) ) - (TODO-RENAME-13 (-> obj rbody) (-> s2-1 world-pos) s5-0) + (rigid-body-method-13 (-> obj rbody) (-> s2-1 world-pos) s5-0) ) 0 (let ((s3-1 (-> obj control-point-array data 5))) (vector-matrix*! (-> s3-1 world-pos) (-> s3-1 local-pos) s4-0) (set! (-> s3-1 world-pos quad) (-> s3-1 world-pos quad)) (vector-float*! s5-0 (-> s4-0 vector 2) (-> obj engine-thrust)) - (TODO-RENAME-13 (-> obj rbody) (-> s3-1 world-pos) s5-0) + (rigid-body-method-13 (-> obj rbody) (-> s3-1 world-pos) s5-0) ) ) (dotimes (s4-1 2) @@ -540,7 +540,7 @@ ) ) (vector-float*! s5-0 *y-vector* (-> *BALLOONLURKER-bank* mine-weight)) - (TODO-RENAME-13 (-> obj rbody) (-> v1-43 world-pos) s5-0) + (rigid-body-method-13 (-> obj rbody) (-> v1-43 world-pos) s5-0) ) ) ) @@ -549,15 +549,15 @@ *y-vector* (* -1.0 (-> obj info gravity-factor) (-> obj info gravity) (-> obj rbody mass)) ) - (TODO-RENAME-15 (-> obj rbody) s5-0) + (rigid-body-method-15 (-> obj rbody) s5-0) ) (when (or (-> obj player-impulse) (-> obj player-contact)) (set! (-> obj player-impulse) #f) - (TODO-RENAME-13 (-> obj rbody) (-> obj player-force-position) (-> obj player-force)) + (rigid-body-method-13 (-> obj rbody) (-> obj player-force-position) (-> obj player-force)) ) (when (-> obj explosion) (set! (-> obj explosion) #f) - (TODO-RENAME-13 (-> obj rbody) (-> obj explosion-force-position) (-> obj explosion-force)) + (rigid-body-method-13 (-> obj rbody) (-> obj explosion-force-position) (-> obj explosion-force)) ) 0 (none) @@ -666,9 +666,9 @@ (quaternion-vector-angle! gp-1 *x-vector* f0-34) (quaternion*! (-> self rudder transform quat) (the-as quaternion *balloonlurker-rudder-joint-home*) gp-1) ) - (TODO-RENAME-28 self) + (rigid-body-platform-method-28 self) (quaternion-copy! (-> self root-overlay quat) (-> self rbody rotation)) - (TODO-RENAME-18 (-> self rbody) (-> self root-overlay trans)) + (rigid-body-method-18 (-> self rbody) (-> self root-overlay trans)) (balloonlurker-play-sounds) (when (nonzero? (-> self draw)) (cond @@ -830,8 +830,8 @@ ) (defstate balloonlurker-pilot-idle (balloonlurker-pilot) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('attack) (send-event (ppointer->process (-> self parent-override)) 'die) (go balloonlurker-pilot-die) @@ -874,7 +874,7 @@ (-> self root-override trans) :to *entity-pool* ) - (TODO-RENAME-17 + (rigid-body-method-17 (-> self parent-override 0 rbody) (-> self root-override trans) (-> self root-override transv) @@ -900,7 +900,7 @@ ) ) -(defmethod dummy-20 balloonlurker-pilot ((obj balloonlurker-pilot)) +(defmethod balloonlurker-pilot-method-20 balloonlurker-pilot ((obj balloonlurker-pilot)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -923,7 +923,7 @@ (none) ) -(defmethod dummy-21 balloonlurker-pilot ((obj balloonlurker-pilot)) +(defmethod balloonlurker-pilot-method-21 balloonlurker-pilot ((obj balloonlurker-pilot)) (initialize-skeleton obj *balloonlurker-pilot-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 6)) 0 @@ -932,7 +932,7 @@ (defbehavior balloonlurker-pilot-init-by-other balloonlurker-pilot ((arg0 balloonlurker)) (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) - (dummy-20 self) + (balloonlurker-pilot-method-20 self) (logclear! (-> self mask) (process-mask actor-pause)) (set! (-> self fact) (new 'process 'fact-info-enemy self (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)) @@ -940,12 +940,12 @@ (set! (-> self root-override trans quad) (-> arg0 root-overlay trans quad)) (set! (-> self root-override quat vec quad) (-> arg0 root-overlay quat vec quad)) (set! (-> self root-override scale quad) (-> arg0 root-overlay scale quad)) - (dummy-21 self) + (balloonlurker-pilot-method-21 self) (go balloonlurker-pilot-idle) (none) ) -(defmethod TODO-RENAME-30 balloonlurker ((obj balloonlurker)) +(defmethod rigid-body-platform-method-30 balloonlurker ((obj balloonlurker)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1000,7 +1000,7 @@ (none) ) -(defmethod TODO-RENAME-31 balloonlurker ((obj balloonlurker)) +(defmethod rigid-body-platform-method-31 balloonlurker ((obj balloonlurker)) (logclear! (-> obj mask) (process-mask actor-pause)) (initialize-skeleton obj *balloonlurker-sg* '()) (set! (-> obj root-overlay pause-adjust-distance) 1228800.0) @@ -1013,7 +1013,7 @@ (set! (-> obj link) (new 'process 'actor-link-info obj)) (balloonlurker-find-nearest-path-point) (balloonlurker-snap-to-path-point (-> obj dest-index)) - (TODO-RENAME-29 obj *balloonlurker-constants*) + (rigid-body-platform-method-29 obj *balloonlurker-constants*) (dotimes (s5-0 4) (let ((s4-0 (-> obj control-point-array data s5-0))) (let ((f30-0 (* 16384.0 (the float (logand s5-0 3))))) @@ -1063,12 +1063,12 @@ (none) ) -;; WARN: Expression building failed: Function (method 11 balloonlurker) has a return type of none, but the expression builder found a return statement. +;; WARN: Function (method 11 balloonlurker) has a return type of none, but the expression builder found a return statement. (defmethod init-from-entity! balloonlurker ((obj balloonlurker) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) + (rigid-body-platform-method-31 obj) (cond ((logtest? (-> (entity-actor-lookup (-> obj entity) 'alt-actor 0) extra perm status) (entity-perm-status complete) @@ -1083,7 +1083,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/misty/bonelurker.gc b/goal_src/jak1/levels/misty/bonelurker.gc index 1af1ec2891..43328a4f16 100644 --- a/goal_src/jak1/levels/misty/bonelurker.gc +++ b/goal_src/jak1/levels/misty/bonelurker.gc @@ -42,7 +42,7 @@ (none) ) -(defmethod dummy-44 bonelurker ((obj bonelurker) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler bonelurker ((obj bonelurker) (arg0 process) (arg1 event-message-block)) (the-as object (when (and (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf6)) ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) @@ -58,7 +58,7 @@ ) ) -(defmethod dummy-43 bonelurker ((obj bonelurker) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler bonelurker ((obj bonelurker) (arg0 process) (arg1 event-message-block)) (with-pp (set! (-> obj state-time) (-> *display* base-frame-counter)) (let ((a1-1 (new 'stack-no-clear 'event-message-block))) @@ -114,25 +114,25 @@ ) (defbehavior bonelurker-stunned-event-handler bonelurker ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'attack) - (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.5)) - (nav-enemy-set-hit-from-direction arg0) - (send-event arg0 'get-attack-count 1) - (logclear! (-> self mask) (process-mask actor-pause)) - (go-virtual nav-enemy-die) - 'die - ) - ) - ) - ) + (the-as object (case arg2 + (('attack) + (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.5)) + (nav-enemy-set-hit-from-direction arg0) + (send-event arg0 'get-attack-count 1) + (logclear! (-> self mask) (process-mask actor-pause)) + (go-virtual nav-enemy-die) + 'die + ) + ) + ) + ) ) nav-enemy-default-event-handler (defbehavior bonelurker-push-post bonelurker () (compute-alignment! (-> self align)) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (align-vel-and-quat-only! (-> self align) (align-opts adjust-xz-vel) @@ -206,7 +206,7 @@ nav-enemy-default-event-handler ) :trans (behavior () ((-> (method-of-type nav-enemy nav-enemy-chase) trans)) - (if (and (zero? (logand (-> self nav-enemy-flags) (nav-enemy-flags navenmf6))) + (if (and (not (logtest? (-> self nav-enemy-flags) (nav-enemy-flags navenmf6))) (>= (- (-> *display* base-frame-counter) (-> self bump-player-time)) (seconds 0.5)) ) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf6)) @@ -532,16 +532,12 @@ nav-enemy-default-event-handler (none) ) -(defmethod TODO-RENAME-48 bonelurker ((obj bonelurker)) +(defmethod nav-enemy-method-48 bonelurker ((obj bonelurker)) (initialize-skeleton obj *bonelurker-sg* '()) - (TODO-RENAME-45 obj *bonelurker-nav-enemy-info*) + (init-defaults! obj *bonelurker-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) (set! (-> obj neck ear) (the-as uint 2)) 0 (none) ) - - - - diff --git a/goal_src/jak1/levels/misty/misty-conveyor.gc b/goal_src/jak1/levels/misty/misty-conveyor.gc index 157ae09f3e..3852134cfb 100644 --- a/goal_src/jak1/levels/misty/misty-conveyor.gc +++ b/goal_src/jak1/levels/misty/misty-conveyor.gc @@ -18,8 +18,8 @@ (defpartgroup group-keg-bounce :id 197 - :duration 10 - :linger-duration 600 + :duration (seconds 0.035) + :linger-duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 12) :parts ((sp-item 2014 :fade-after (meters 100) :falloff-to (meters 100))) @@ -135,27 +135,27 @@ ) (defbehavior keg-event-handler keg ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (or (= v1-0 'touch) (= v1-0 'attack)) - (when (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) - (sound-play "icrate-break") - (process-spawn - part-tracker - :init part-tracker-init - (-> *part-group-id-table* 71) - 20 - #f - #f - #f - (-> self root-override trans) - :to *entity-pool* - ) - (sound-stop (-> self sound-id)) - (deactivate self) - ) - ) - ) - ) + (the-as object (case arg2 + (('touch 'attack) + (when (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) + (sound-play "icrate-break") + (process-spawn + part-tracker + :init part-tracker-init + (-> *part-group-id-table* 71) + 20 + #f + #f + #f + (-> self root-override trans) + :to *entity-pool* + ) + (sound-stop (-> self sound-id)) + (deactivate self) + ) + ) + ) + ) ) (defbehavior keg-post keg () @@ -172,8 +172,8 @@ ) (defstate keg-on-paddle (keg) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('detach) (go keg-paddle-to-path) ) @@ -206,7 +206,7 @@ ) (s4-0 (quaternion-copy! (new-stack-quaternion0) (-> self root-override quat))) (s3-0 (new-stack-quaternion0)) - (a1-3 (TODO-RENAME-12 (-> (the-as process-drawable (-> self parent 0)) path) (new-stack-vector0) 0.0)) + (a1-3 (path-control-method-12 (-> (the-as process-drawable (-> self parent 0)) path) (new-stack-vector0) 0.0)) (f30-0 45.0) ) 0.0 @@ -268,7 +268,7 @@ sv-112 'interp ) - (TODO-RENAME-12 (-> (the-as keg-conveyor-paddle (-> self parent 0)) path) gp-0 sv-112) + (path-control-method-12 (-> (the-as keg-conveyor-paddle (-> self parent 0)) path) gp-0 sv-112) (seek-toward-heading-vec! (-> self root-override) gp-0 131072.0 (seconds 0.1)) (set! (-> self root-override trans quad) (-> self path-position quad)) (when (= (-> self keg-behavior) 1) @@ -350,7 +350,7 @@ (defstate keg-in-chute (keg) :event keg-event-handler :code (behavior () - (let ((gp-0 (TODO-RENAME-12 + (let ((gp-0 (path-control-method-12 (-> (the-as process-drawable (-> self parent 0)) path) (new-stack-vector0) (the float (+ (-> (the-as process-drawable (-> self parent 0)) path curve num-cverts) -1)) @@ -441,7 +441,7 @@ (set! (-> self keg-behavior) arg1) (logclear! (-> self mask) (process-mask actor-pause enemy)) (let ((gp-1 (new-stack-vector0))) - (TODO-RENAME-12 (-> (the-as process-drawable (-> self parent 0)) path) gp-1 0.0) + (path-control-method-12 (-> (the-as process-drawable (-> self parent 0)) path) gp-1 0.0) (set-heading-vec! (-> self root-override) gp-1) ) (set! (-> self sound-id) (new-sound-id)) @@ -457,9 +457,7 @@ (process-spawn keg arg0 1 :to arg0) ) -(define *keg-conveyor-keg-spawn-table* - (the-as (array int8) (new 'static 'boxed-array :type int8 1 2 1 1 2 1)) - ) +(define *keg-conveyor-keg-spawn-table* (new 'static 'boxed-array :type int8 1 2 1 1 2 1)) (defstate keg-conveyor-idle (keg-conveyor) :code (behavior () @@ -582,7 +580,7 @@ ) ) -;; WARN: Expression building failed: Function (method 11 keg-conveyor) has a return type of none, but the expression builder found a return statement. +;; WARN: Function (method 11 keg-conveyor) has a return type of none, but the expression builder found a return statement. (defmethod init-from-entity! keg-conveyor ((obj keg-conveyor) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask enemy death) (-> obj mask))) (set! (-> obj root) (new 'process 'trsqv)) @@ -598,7 +596,7 @@ (set! (-> obj pivot) (new 'process 'joint-mod-spinner obj 4 (new 'static 'vector :x 1.0 :w 1.0) 65536.0)) (let ((s5-1 (new-stack-vector0))) (let ((s4-0 (new-stack-matrix0))) - (TODO-RENAME-12 (-> obj path) s5-1 0.0) + (path-control-method-12 (-> obj path) s5-1 0.0) (set-heading-vec! (-> obj root) s5-1) (quaternion->matrix s4-0 (-> obj root quat)) (set-vector! s5-1 -4096.0 -3072.0 -1433.6 1.0) @@ -610,7 +608,3 @@ (go keg-conveyor-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/misty/misty-obs.gc b/goal_src/jak1/levels/misty/misty-obs.gc index a48f8f25dd..8d021681b5 100644 --- a/goal_src/jak1/levels/misty/misty-obs.gc +++ b/goal_src/jak1/levels/misty/misty-obs.gc @@ -156,7 +156,7 @@ (defpartgroup group-misty-bone-01 :id 192 - :duration 600 + :duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 24) :parts ((sp-item 914 :period 780 :length 15) @@ -391,7 +391,7 @@ (defpartgroup group-misty-bone-03 :id 193 - :duration 600 + :duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 24) :parts ((sp-item 914 :period 780 :length 15) @@ -566,7 +566,7 @@ (defpartgroup group-misty-bone-02 :id 194 - :duration 600 + :duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 24) :parts ((sp-item 914 :period 780 :length 15) @@ -741,7 +741,7 @@ (defpartgroup group-misty-bone-07 :id 195 - :duration 600 + :duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 24) :parts ((sp-item 914 :period 780 :length 15) @@ -1370,10 +1370,10 @@ (defstate breakaway-idle (breakaway) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch) - (send-event arg0 'no-look-around (seconds 1.5)) + (send-event proc 'no-look-around (seconds 1.5)) (go breakaway-about-to-fall) ) ) @@ -1576,7 +1576,7 @@ :bounds (static-spherem 0 0 0 4) ) -(defmethod TODO-RENAME-27 bone-platform ((obj bone-platform) (arg0 vector)) +(defmethod rigid-body-platform-method-27 bone-platform ((obj bone-platform) (arg0 vector)) (let ((gp-0 (new 'stack-no-clear 'vector))) (vector-! gp-0 arg0 (-> obj rbody position)) (set! (-> gp-0 y) 0.0) @@ -1585,7 +1585,7 @@ ) (when (< 0.0 f1-1) (vector-float*! gp-0 gp-0 (/ f1-1 f0-1)) - (TODO-RENAME-15 (-> obj rbody) gp-0) + (rigid-body-method-15 (-> obj rbody) gp-0) ) ) ) @@ -1593,12 +1593,12 @@ (none) ) -(defmethod TODO-RENAME-23 bone-platform ((obj bone-platform) (arg0 float)) +(defmethod rigid-body-platform-method-23 bone-platform ((obj bone-platform) (arg0 float)) ((the-as (function rigid-body-platform basic none) (find-parent-method bone-platform 23)) obj (the-as basic arg0) ) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) @@ -1656,7 +1656,7 @@ :post (the-as (function none :behavior bone-platform) rigid-body-platform-post) ) -(defmethod TODO-RENAME-30 bone-platform ((obj bone-platform)) +(defmethod rigid-body-platform-method-30 bone-platform ((obj bone-platform)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1681,9 +1681,9 @@ (none) ) -(defmethod TODO-RENAME-31 bone-platform ((obj bone-platform)) +(defmethod rigid-body-platform-method-31 bone-platform ((obj bone-platform)) (initialize-skeleton obj *mis-bone-platform-sg* '()) - (TODO-RENAME-29 obj *bone-platform-constants*) + (rigid-body-platform-method-29 obj *bone-platform-constants*) (set! (-> obj float-height-offset) -4096.0) (if (name= (-> obj name) "bone-platform-5") (set-vector! (-> obj root-overlay scale) 0.8 1.0 0.8 1.0) @@ -1783,7 +1783,7 @@ ) ) -(defmethod TODO-RENAME-27 misty-battlecontroller ((obj misty-battlecontroller)) +(defmethod battlecontroller-method-27 misty-battlecontroller ((obj misty-battlecontroller)) ((the-as (function battlecontroller none) (find-parent-method misty-battlecontroller 27)) obj) (set! (-> obj misty-ambush-collision-hack) #t) 0 @@ -1847,8 +1847,8 @@ (defstate boat-fuelcell-idle (boat-fuelcell) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('task-complete) (set! (-> self play-cutscene?) #t) (process-entity-status! self (entity-perm-status complete) #t) @@ -1905,7 +1905,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/misty/misty-warehouse.gc b/goal_src/jak1/levels/misty/misty-warehouse.gc index 4881b12c62..9175601cec 100644 --- a/goal_src/jak1/levels/misty/misty-warehouse.gc +++ b/goal_src/jak1/levels/misty/misty-warehouse.gc @@ -34,8 +34,8 @@ ) (defstate silostep-idle (silostep) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) (go silostep-camera) ) @@ -180,7 +180,7 @@ ) -(defmethod TODO-RENAME-24 rounddoor ((obj rounddoor)) +(defmethod eco-door-method-24 rounddoor ((obj rounddoor)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) @@ -199,7 +199,7 @@ (none) ) -(defmethod TODO-RENAME-25 rounddoor ((obj rounddoor)) +(defmethod eco-door-method-25 rounddoor ((obj rounddoor)) (initialize-skeleton obj *rounddoor-sg* '()) (set! (-> obj open-distance) 69632.0) (set! (-> obj close-distance) 81920.0) @@ -214,7 +214,3 @@ 0 (none) ) - - - - diff --git a/goal_src/jak1/levels/misty/mistycannon.gc b/goal_src/jak1/levels/misty/mistycannon.gc index 47c664d925..b6325eb3af 100644 --- a/goal_src/jak1/levels/misty/mistycannon.gc +++ b/goal_src/jak1/levels/misty/mistycannon.gc @@ -662,8 +662,8 @@ ) (defstate mistycannon-missile-idle (mistycannon-missile) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('attack) (go mistycannon-missile-explode) ) @@ -699,7 +699,7 @@ ) (restore-collide-with-as (-> self root-override)) (set-vector! (-> self root-override scale) 0.6 0.6 0.6 1.0) - (while (zero? (logand (-> self root-override status) (cshape-moving-flags onsurf))) + (while (not (logtest? (-> self root-override status) (cshape-moving-flags onsurf))) (if (and (zero? (-> self sfx)) (< (if *target* (vector-vector-distance (-> self root-override trans) (-> *target* control trans)) @@ -835,10 +835,10 @@ ) (defstate mistycannon-missile-explode (mistycannon-missile) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touched) - (let* ((s4-0 arg0) + (let* ((s4-0 proc) (v1-2 (if (and (nonzero? s4-0) (type-type? (-> s4-0 type) process-drawable)) s4-0 ) @@ -866,22 +866,22 @@ 0.0 ) (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode 'explode)))) + ((= (-> proc type) target) + (send-event proc 'attack (-> event param 0) (static-attack-info ((mode 'explode)))) ) (else (let ((a1-4 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-4 from) self) (set! (-> a1-4 num-params) 4) (set! (-> a1-4 message) 'attack) - (set! (-> a1-4 param 0) (-> arg3 param 0)) + (set! (-> a1-4 param 0) (-> event param 0)) (set! (-> a1-4 param 1) (the-as uint 'explode)) (let ((v1-18 (+ *global-attack-id* 1))) (set! *global-attack-id* v1-18) (set! (-> a1-4 param 2) (the-as uint v1-18)) ) (set! (-> a1-4 param 3) (the-as uint 0)) - (send-event-function arg0 a1-4) + (send-event-function proc a1-4) ) ) ) @@ -1053,8 +1053,8 @@ (:methods (rotate! (_type_ float) none 20) (tilt! (_type_ float) none 21) - (dummy-22 (_type_ float float float) none 22) - (dummy-23 (_type_) none 23) + (mistycannon-method-22 (_type_ float float float) none 22) + (mistycannon-method-23 (_type_) none 23) ) (:states mistycannon-aim-at-player @@ -1091,8 +1091,8 @@ (none) ) -;; WARN: Expression building failed: Function (method 22 mistycannon) has a return type of none, but the expression builder found a return statement. -(defmethod dummy-22 mistycannon ((obj mistycannon) (arg0 float) (arg1 float) (arg2 float)) +;; WARN: Function (method 22 mistycannon) has a return type of none, but the expression builder found a return statement. +(defmethod mistycannon-method-22 mistycannon ((obj mistycannon) (arg0 float) (arg1 float) (arg2 float)) (if (not (-> obj postbindinfo-ok)) (return #f) ) @@ -1121,7 +1121,7 @@ (none) ) -(defmethod dummy-23 mistycannon ((obj mistycannon)) +(defmethod mistycannon-method-23 mistycannon ((obj mistycannon)) (when (< (- (-> *display* base-frame-counter) (-> obj part-timer)) (seconds 3)) (let ((v1-4 (-> obj rotate))) (set! (-> *part-id-table* 529 init-specs 24 initial-valuef) @@ -1253,7 +1253,7 @@ ) :code (behavior () (loop - (dummy-23 self) + (mistycannon-method-23 self) (suspend) ) (none) @@ -1360,7 +1360,7 @@ (none) ) -;; WARN: Expression building failed: Function mistycannon-do-aim has a return type of none, but the expression builder found a return statement. +;; WARN: Function mistycannon-do-aim has a return type of none, but the expression builder found a return statement. (defbehavior mistycannon-do-aim mistycannon ((arg0 vector) (arg1 vector)) (if (not (-> self postbindinfo-ok)) (return #f) @@ -1405,14 +1405,14 @@ (mistycannon-find-trajectory gp-0) (when (= (-> gp-0 time) 0.0) (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 3)) - (dummy-22 self 409600.0 2.0 20480.0) + (mistycannon-method-22 self 409600.0 2.0 20480.0) (set! (-> self state-time) (-> *display* base-frame-counter)) ) (return #f) ) (when (angle-tracker-seek! (-> self tilt) (-> gp-0 theta)) (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 3)) - (dummy-22 self (fmax 163840.0 (fmin 409600.0 (-> gp-0 speed))) (-> gp-0 time) 20480.0) + (mistycannon-method-22 self (fmax 163840.0 (fmin 409600.0 (-> gp-0 speed))) (-> gp-0 time) 20480.0) (set! (-> self state-time) (-> *display* base-frame-counter)) ) ) @@ -1446,7 +1446,7 @@ (mistycannon-do-aim (-> *target* control trans) (-> *target* control transv)) (mistycannon-do-aim (-> self at-point) (new-stack-vector0)) ) - (dummy-23 self) + (mistycannon-method-23 self) (suspend) ) (none) @@ -1455,11 +1455,11 @@ ) (defstate mistycannon-waiting-for-player (mistycannon) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch) (when ((method-of-type touching-shapes-entry prims-touching?) - (the-as touching-shapes-entry (-> arg3 param 0)) + (the-as touching-shapes-entry (-> event param 0)) (-> self root-override) (the-as uint 1) ) @@ -1491,7 +1491,7 @@ (angle-tracker-seek! (-> self tilt) 2730.6667) ) ) - (dummy-23 self) + (mistycannon-method-23 self) (when (and (-> self player-touching-grips?) (not (level-hint-displayed?))) (set! (-> self player-touching-grips?) #f) (hide-hud) @@ -1537,7 +1537,7 @@ (none) ) :trans (behavior () - (if (zero? (logand (-> *camera* master-options) 2)) + (if (not (logtest? (-> *camera* master-options) 2)) (cam-slave-go cam-free-floating) ) (none) @@ -1560,8 +1560,8 @@ ) (defstate mistycannon-player-control (mistycannon) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('change-mode) (send-event *camera* 'change-state cam-mistycannon 0) ) @@ -1573,7 +1573,7 @@ (none) ) :trans (behavior () - (dummy-23 self) + (mistycannon-method-23 self) (rider-trans) (none) ) @@ -1619,12 +1619,16 @@ ) (sound-play "cannon-charge" :id (-> self sound-id) :pitch (* 0.008 (the float gp-0))) ) - (when (or (= gp-0 300) - (and (zero? (logand (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons x))) (nonzero? gp-0)) - ) + (when (or (= gp-0 300) (and (not (cpad-hold? 0 x)) (nonzero? gp-0))) (let ((gp-1 (+ 50 (the int (* 0.16666667 (the float gp-0)))))) - (level-hint-spawn (game-text-id sidekick-mistycannon) "sksp009f" (the-as entity #f) *entity-pool* (game-task none)) - (dummy-22 self (* 4096.0 (the float gp-1)) 2.0 40960.0) + (level-hint-spawn + (game-text-id sidekick-mistycannon) + "sksp009f" + (the-as entity #f) + *entity-pool* + (game-task none) + ) + (mistycannon-method-22 self (* 4096.0 (the float gp-1)) 2.0 40960.0) ) (set! (-> self state-time) (-> *display* base-frame-counter)) (set! gp-0 0) @@ -1643,7 +1647,7 @@ ) ) ) - (if (zero? (logand (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons x))) + (if (not (cpad-hold? 0 x)) (set! s5-0 0) ) (suspend) @@ -1655,22 +1659,22 @@ ) (defstate mistycannon-waiting-for-player-to-fuck-off (mistycannon) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'touch) - (when ((method-of-type touching-shapes-entry prims-touching?) - (the-as touching-shapes-entry (-> arg3 param 0)) - (-> self root-override) - (the-as uint 1) - ) - (let ((v0-0 (-> *display* base-frame-counter))) - (set! (-> self state-time) v0-0) - v0-0 - ) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('touch) + (when ((method-of-type touching-shapes-entry prims-touching?) + (the-as touching-shapes-entry (-> event param 0)) + (-> self root-override) + (the-as uint 1) + ) + (let ((v0-0 (-> *display* base-frame-counter))) + (set! (-> self state-time) v0-0) + v0-0 + ) + ) + ) + ) + ) ) :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -1680,7 +1684,7 @@ :code (behavior () (loop (suspend) - (dummy-23 self) + (mistycannon-method-23 self) (if (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 1)) (go mistycannon-waiting-for-player) ) @@ -1804,7 +1808,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/misty/mud.gc b/goal_src/jak1/levels/misty/mud.gc index a51b0599a5..ca764dea30 100644 --- a/goal_src/jak1/levels/misty/mud.gc +++ b/goal_src/jak1/levels/misty/mud.gc @@ -42,8 +42,8 @@ ) ) -(defmethod TODO-RENAME-22 mud ((obj mud)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 mud ((obj mud)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (logclear! (-> obj flags) (water-flags wt23)) @@ -72,7 +72,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/misty/muse.gc b/goal_src/jak1/levels/misty/muse.gc index 54d3d0bab1..5dfde5785a 100644 --- a/goal_src/jak1/levels/misty/muse.gc +++ b/goal_src/jak1/levels/misty/muse.gc @@ -64,18 +64,12 @@ ((< (-> arg0 parametric-index) 0.0) (set! (-> arg0 parametric-index) 0.0) (set! (-> arg0 nearest-point quad) (-> arg0 segment 0 quad)) - (let ((f0-10 (vector-vector-distance (-> arg0 nearest-point) (-> arg0 point)))) - (set! (-> arg0 distance-to-segment) f0-10) - f0-10 - ) + (set! (-> arg0 distance-to-segment) (vector-vector-distance (-> arg0 nearest-point) (-> arg0 point))) ) ((< 1.0 (-> arg0 parametric-index)) (set! (-> arg0 parametric-index) 1.0) (set! (-> arg0 nearest-point quad) (-> arg0 segment 1 quad)) - (let ((f0-13 (vector-vector-distance (-> arg0 nearest-point) (-> arg0 point)))) - (set! (-> arg0 distance-to-segment) f0-13) - f0-13 - ) + (set! (-> arg0 distance-to-segment) (vector-vector-distance (-> arg0 nearest-point) (-> arg0 point))) ) ) ) @@ -147,7 +141,7 @@ (none) ) -(defmethod dummy-51 muse ((obj muse)) +(defmethod nav-enemy-method-51 muse ((obj muse)) (dotimes (s5-0 2) (let ((v1-2 (rand-vu-int-range 3 (+ (-> obj node-list length) -1)))) (launch-particles (-> *part-id-table* 271) (vector<-cspace! (new 'stack-no-clear 'vector) (-> obj node-list data v1-2))) @@ -159,7 +153,7 @@ (defmethod common-post muse ((obj muse)) (spool-push *art-control* (-> obj anim name) 0 obj -99.0) - (dummy-51 obj) + (nav-enemy-method-51 obj) ((method-of-type nav-enemy common-post) obj) (none) ) @@ -170,11 +164,11 @@ :shadow muse-shadow-mg ) -(defmethod dummy-44 muse ((obj muse) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler muse ((obj muse) (arg0 process) (arg1 event-message-block)) (go muse-caught) ) -(defmethod dummy-43 muse ((obj muse) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler muse ((obj muse) (arg0 process) (arg1 event-message-block)) (go muse-caught) ) @@ -210,7 +204,7 @@ nav-enemy-default-event-handler (ja-no-eval :group! muse-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (spool-push *art-control* (-> self anim name) 0 self -99.0) - (dummy-51 self) + (nav-enemy-method-51 self) (suspend) (ja :num! (seek!)) ) @@ -279,7 +273,7 @@ nav-enemy-default-event-handler ) :post (behavior () (set! (-> self nav destination-pos quad) (-> self dest-point quad)) - (dummy-19 + (nav-control-method-19 (-> self nav) (-> self nav target-pos) (-> self collide-info) @@ -412,7 +406,7 @@ nav-enemy-default-event-handler (none) ) :post (behavior () - (dummy-51 self) + (nav-enemy-method-51 self) (level-hint-surpress!) (kill-current-level-hint '() '() 'exit) (ja-post) @@ -498,7 +492,7 @@ nav-enemy-default-event-handler (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *muse-sg* '()) (logclear! (-> obj mask) (process-mask actor-pause)) - (TODO-RENAME-45 obj *muse-nav-enemy-info*) + (init-defaults! obj *muse-nav-enemy-info*) (set! (-> obj max-path-index) (the float (+ (-> obj path curve num-cverts) -1))) (set! (-> obj current-path-index) 7.0) (set! (-> obj prev-path-index) 7.0) @@ -524,7 +518,3 @@ nav-enemy-default-event-handler (go muse-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/misty/quicksandlurker.gc b/goal_src/jak1/levels/misty/quicksandlurker.gc index 81c4cb58a9..35622a17d1 100644 --- a/goal_src/jak1/levels/misty/quicksandlurker.gc +++ b/goal_src/jak1/levels/misty/quicksandlurker.gc @@ -134,7 +134,7 @@ (defpartgroup group-quicksandlurker-pre-missile :id 199 - :duration 5 + :duration (seconds 0.017) :bounds (static-bspherem 0 0 0 3) :parts ((sp-item 2483)) ) @@ -168,7 +168,7 @@ (defpartgroup group-quicksandlurker-missile-impact :id 200 - :duration 10 + :duration (seconds 0.035) :bounds (static-bspherem 0 0 0 3) :parts ((sp-item 2484) (sp-item 2485) (sp-item 2486)) ) @@ -242,7 +242,7 @@ (defpartgroup group-quicksandlurker-hide :id 201 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 -12 0 14) :parts ((sp-item 124 :flags (is-3d) :period 900 :length 63) @@ -266,7 +266,7 @@ (defpartgroup group-quicksandlurker-popup :id 202 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 -12 0 14) :parts ((sp-item 124 :flags (is-3d) :period 900 :length 63) @@ -303,26 +303,26 @@ (defstate quicksandlurker-missile-idle (quicksandlurker-missile) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touched) (when (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode 'explode)))) + ((= (-> proc type) target) + (send-event proc 'attack (-> event param 0) (static-attack-info ((mode 'explode)))) ) (else (let ((a1-4 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-4 from) self) (set! (-> a1-4 num-params) 4) (set! (-> a1-4 message) 'attack) - (set! (-> a1-4 param 0) (-> arg3 param 0)) + (set! (-> a1-4 param 0) (-> event param 0)) (set! (-> a1-4 param 1) (the-as uint 'explode)) (let ((v1-12 (+ *global-attack-id* 1))) (set! *global-attack-id* v1-12) (set! (-> a1-4 param 2) (the-as uint v1-12)) ) (set! (-> a1-4 param 3) (the-as uint 0)) - (send-event-function arg0 a1-4) + (send-event-function proc a1-4) ) ) ) @@ -490,7 +490,7 @@ ;; ERROR: function has no type analysis. Cannot decompile. (defun intersects-nav-mesh? ((arg0 nav-control) (arg1 vector)) - (if (dummy-16 arg0 arg1) + (if (nav-control-method-16 arg0 arg1) #t ) ) @@ -509,12 +509,9 @@ (defun inc-angle ((arg0 (pointer float)) (arg1 float)) (+! (-> arg0 0) arg1) - (when (< 65536.0 (-> arg0 0)) - (let ((f0-4 (+ -65536.0 (-> arg0 0)))) - (set! (-> arg0 0) f0-4) - f0-4 + (if (< 65536.0 (-> arg0 0)) + (set! (-> arg0 0) (+ -65536.0 (-> arg0 0))) ) - ) ) (defbehavior quicksandlurker-post quicksandlurker () @@ -556,7 +553,7 @@ (let ((a0-2 (-> self nav)) (a1-1 (-> *target* control trans)) ) - (when (if (dummy-16 a0-2 a1-1) + (when (if (nav-control-method-16 a0-2 a1-1) #t ) (if (< (- (-> *target* control trans y) (-> self original-position y)) 0.0) @@ -804,7 +801,7 @@ (a1-0 (-> *target* control trans)) ) (cond - ((or (if (dummy-16 a0-0 a1-0) + ((or (if (nav-control-method-16 a0-0 a1-0) #t ) (and *target* (>= 16384.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans)))) @@ -949,7 +946,3 @@ (go quicksandlurker-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/misty/sidekick-human.gc b/goal_src/jak1/levels/misty/sidekick-human.gc index 4a6b227049..73830a513d 100644 --- a/goal_src/jak1/levels/misty/sidekick-human.gc +++ b/goal_src/jak1/levels/misty/sidekick-human.gc @@ -145,7 +145,7 @@ (defpartgroup group-evilsib-appear :id 557 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 2345 :period 1500 :length 20 :offset 1500) @@ -795,7 +795,7 @@ (defpartgroup group-sequenceC-glowing-can :id 560 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 2298)) @@ -824,7 +824,7 @@ (defpartgroup group-sequenceC-exploding-can :id 561 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 2785 :period 1800 :length 5) @@ -1007,7 +1007,7 @@ (defpartgroup group-sequenceC-dark-splash :id 562 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 295 :fade-after (meters 100) :period 600 :length 5 :binding 296) @@ -1051,8 +1051,8 @@ (defpartgroup group-sequenceC-blow-dust :id 681 - :duration 5 - :linger-duration 900 + :duration (seconds 0.017) + :linger-duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 2790)) @@ -1152,63 +1152,61 @@ ) -(define *lurker-army* - (the-as (array army-info) (new 'static 'boxed-array :type army-info - (new 'static 'army-info - :pos (new 'static 'vector :x -920633.4 :y 83546.11 :z 4210409.5) - :rot 28556.04 - :skel 'babak - ) - (new 'static 'army-info - :pos (new 'static 'vector :x -873488.4 :y 86441.984 :z 4225454.0) - :rot 37861.24 - :start-frame 5.0 - :skel 'babak - ) - (new 'static 'army-info - :pos (new 'static 'vector :x -905871.4 :y 83132.414 :z 4231934.0) - :rot 32054.021 - :start-frame 10.0 - :skel 'babak - ) - (new 'static 'army-info - :pos (new 'static 'vector :x -926765.06 :y 83496.96 :z 4236230.5) - :rot 30001.652 - :start-frame 15.0 - :skel 'babak - ) - (new 'static 'army-info - :pos (new 'static 'vector :x -893345.8 :y 83517.44 :z 4212961.5) - :rot 32755.074 - :start-frame 20.0 - :skel 'babak - ) - (new 'static 'army-info - :pos (new 'static 'vector :x -842797.06 :y 84041.73 :z 4218855.5) - :rot 43916.402 - :skel 'bonelurker - ) - (new 'static 'army-info - :pos (new 'static 'vector :x -839274.5 :y 82644.99 :z 4248723.5) - :rot 40510.715 - :start-frame 6.0 - :skel 'bonelurker - ) - (new 'static 'army-info - :pos (new 'static 'vector :x -871485.44 :y 85909.51 :z 4243181.5) - :rot 37046.043 - :start-frame 12.0 - :skel 'bonelurker - ) - (new 'static 'army-info - :pos (new 'static 'vector :x -947523.56 :y 85835.77 :z 4219314.0) - :rot 26980.078 - :start-frame 18.0 - :skel 'bonelurker - ) - ) - ) - ) +(define *lurker-army* (new 'static 'boxed-array :type army-info + (new 'static 'army-info + :pos (new 'static 'vector :x -920633.4 :y 83546.11 :z 4210409.5) + :rot 28556.04 + :skel 'babak + ) + (new 'static 'army-info + :pos (new 'static 'vector :x -873488.4 :y 86441.984 :z 4225454.0) + :rot 37861.24 + :start-frame 5.0 + :skel 'babak + ) + (new 'static 'army-info + :pos (new 'static 'vector :x -905871.4 :y 83132.414 :z 4231934.0) + :rot 32054.021 + :start-frame 10.0 + :skel 'babak + ) + (new 'static 'army-info + :pos (new 'static 'vector :x -926765.06 :y 83496.96 :z 4236230.5) + :rot 30001.652 + :start-frame 15.0 + :skel 'babak + ) + (new 'static 'army-info + :pos (new 'static 'vector :x -893345.8 :y 83517.44 :z 4212961.5) + :rot 32755.074 + :start-frame 20.0 + :skel 'babak + ) + (new 'static 'army-info + :pos (new 'static 'vector :x -842797.06 :y 84041.73 :z 4218855.5) + :rot 43916.402 + :skel 'bonelurker + ) + (new 'static 'army-info + :pos (new 'static 'vector :x -839274.5 :y 82644.99 :z 4248723.5) + :rot 40510.715 + :start-frame 6.0 + :skel 'bonelurker + ) + (new 'static 'army-info + :pos (new 'static 'vector :x -871485.44 :y 85909.51 :z 4243181.5) + :rot 37046.043 + :start-frame 12.0 + :skel 'bonelurker + ) + (new 'static 'army-info + :pos (new 'static 'vector :x -947523.56 :y 85835.77 :z 4219314.0) + :rot 26980.078 + :start-frame 18.0 + :skel 'bonelurker + ) + ) + ) (defbehavior evilsib-trans-hook-hover evilbro () 0 @@ -1390,8 +1388,8 @@ (defstate play-anim (sequenceB) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('offset-army) (dotimes (gp-0 9) (let ((v1-3 (-> *lurker-army* gp-0))) @@ -1521,7 +1519,7 @@ ) (defmethod init-from-entity! sequenceB ((obj sequenceB) (arg0 entity-actor)) - (dummy-40 obj arg0 *sidekick-human-sg* 3 44 (new 'static 'vector :w 4096.0) -1) + (process-taskable-method-40 obj arg0 *sidekick-human-sg* 3 44 (new 'static 'vector :w 4096.0) -1) (set! (-> obj tasks) (get-task-control (game-task intro))) (set! (-> obj bonelurker) (the-as handle #f)) (set! (-> obj evilbro) (the-as handle #f)) @@ -1529,7 +1527,7 @@ (dotimes (v1-2 9) (set! (-> obj lurker-army v1-2) (the-as handle #f)) ) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -1725,15 +1723,11 @@ ) (defmethod init-from-entity! sequenceC ((obj sequenceC) (arg0 entity-actor)) - (dummy-40 obj arg0 *sidekick-human-sg* 3 44 (new 'static 'vector :w 4096.0) -1) + (process-taskable-method-40 obj arg0 *sidekick-human-sg* 3 44 (new 'static 'vector :w 4096.0) -1) (set! (-> obj tasks) (get-task-control (game-task intro))) (set! (-> obj bonelurker) (the-as handle #f)) (set! (-> obj darkecocan) (the-as handle #f)) (set! (-> obj cur-trans-hook) sequenceC-trans-hook) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/ogre/flying-lurker.gc b/goal_src/jak1/levels/ogre/flying-lurker.gc index 91234fc3cf..97df779c5e 100644 --- a/goal_src/jak1/levels/ogre/flying-lurker.gc +++ b/goal_src/jak1/levels/ogre/flying-lurker.gc @@ -315,7 +315,7 @@ :size-assert #x130 :flag-assert #x1500c00130 (:methods - (dummy-20 (_type_) none 20) + (flying-lurker-method-20 (_type_) none 20) ) (:states (flying-lurker-clone handle string) @@ -338,7 +338,7 @@ :shadow flying-lurker-shadow-mg ) -(defmethod dummy-20 flying-lurker ((obj flying-lurker)) +(defmethod flying-lurker-method-20 flying-lurker ((obj flying-lurker)) (with-pp (let ((s5-0 (-> obj draw shadow-ctrl)) (s4-0 #f) @@ -546,7 +546,7 @@ (let ((s3-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) ) - (TODO-RENAME-14 (-> self path) (-> self tangent) (-> self curve-position)) + (path-control-method-14 (-> self path) (-> self tangent) (-> self curve-position)) (eval-path-curve! (-> self path) s3-0 @@ -634,7 +634,7 @@ ) ) (cleanup-for-death self) - (deactivate self) + (the-as object (deactivate self)) ) (('sleep) (let ((v1-12 (new 'stack-no-clear 'event-message-block))) @@ -684,7 +684,7 @@ ) ) ) - (deactivate self) + (the-as object (deactivate self)) ) ) ) @@ -695,7 +695,7 @@ (none) ) :trans (behavior () - (dummy-20 self) + (flying-lurker-method-20 self) (when (not (movie?)) (flying-lurker-calc-speed (meters 15) (meters 30) (meters 0.11666667) (meters 0.083333336)) (flying-lurker-move) @@ -705,7 +705,7 @@ (and *target* (< 4194304000000.0 (vector-vector-distance-squared (-> self root trans) (target-pos 0)))) ) ) - (dummy-30 (-> self alt-actor) (entity-perm-status dead) #f) + (set-or-clear-status! (-> self alt-actor) (entity-perm-status dead) #f) (entity-birth-no-kill (-> self alt-actor)) (let ((a1-4 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-4 from) self) @@ -1008,7 +1008,7 @@ ) ) (cleanup-for-death self) - (deactivate self) + (the-as object (deactivate self)) ) ((= v1-0 'sleep) (let ((v1-6 (new 'stack-no-clear 'event-message-block))) @@ -1058,7 +1058,7 @@ ) ) ) - (deactivate self) + (the-as object (deactivate self)) ) (else (flying-lurker-handler proc arg1 event-type event) @@ -1224,7 +1224,7 @@ (cond ((play-movie?) (eval-path-curve! (-> obj path) (-> obj root trans) (-> obj curve-position) 'interp) - (TODO-RENAME-14 (-> obj path) (-> obj tangent) (-> obj curve-position)) + (path-control-method-14 (-> obj path) (-> obj tangent) (-> obj curve-position)) (quaternion-identity! (-> obj root quat)) ) (else diff --git a/goal_src/jak1/levels/ogre/ogre-obs.gc b/goal_src/jak1/levels/ogre/ogre-obs.gc index f715eb0b90..8b19911324 100644 --- a/goal_src/jak1/levels/ogre/ogre-obs.gc +++ b/goal_src/jak1/levels/ogre/ogre-obs.gc @@ -167,7 +167,7 @@ (defpartgroup group-tntbarrel-explosion :id 474 - :duration 600 + :duration (seconds 2) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 12) :parts ((sp-item 2079 :period 600 :length 5) @@ -354,8 +354,8 @@ (defstate idle (tntbarrel) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('die-big) (go-virtual die #t) ) @@ -363,7 +363,7 @@ (go-virtual die #f) ) (('attack 'touch) - (send-event arg0 'attack-invinc (-> arg3 param 0) (static-attack-info ((mode 'death)))) + (send-event proc 'attack-invinc (-> event param 0) (static-attack-info ((mode 'death)))) (go-virtual die #f) ) ) @@ -449,27 +449,27 @@ ) -(defmethod TODO-RENAME-23 ogre-plat ((obj ogre-plat) (arg0 float)) +(defmethod rigid-body-platform-method-23 ogre-plat ((obj ogre-plat) (arg0 float)) ((the-as (function rigid-body-platform basic none) (find-parent-method ogre-plat 23)) obj (the-as basic arg0)) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) (defstate rigid-body-platform-idle (ogre-plat) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'trigger) - (set! (-> self triggered) (the-as entity-actor #t)) - (set! (-> self delay) (the-as time-frame (-> arg3 param 0))) - (let ((v0-0 (-> *display* base-frame-counter))) - (set! (-> self state-time) v0-0) - v0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('trigger) + (set! (-> self triggered) (the-as entity-actor #t)) + (set! (-> self delay) (the-as time-frame (-> event param 0))) + (let ((v0-0 (-> *display* base-frame-counter))) + (set! (-> self state-time) v0-0) + v0-0 + ) + ) + ) + ) ) :trans (behavior () (cond @@ -537,7 +537,7 @@ :post (the-as (function none :behavior ogre-plat) rigid-body-platform-post) ) -(defmethod TODO-RENAME-30 ogre-plat ((obj ogre-plat)) +(defmethod rigid-body-platform-method-30 ogre-plat ((obj ogre-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -562,7 +562,7 @@ (none) ) -(defmethod TODO-RENAME-31 ogre-plat ((obj ogre-plat)) +(defmethod rigid-body-platform-method-31 ogre-plat ((obj ogre-plat)) (set! (-> obj float-height-offset) (-> obj idle-y-offset)) (let ((s5-0 (-> obj info control-point-count))) (dotimes (s4-0 s5-0) @@ -620,11 +620,11 @@ ) -(defmethod TODO-RENAME-31 ogre-step ((obj ogre-step)) +(defmethod rigid-body-platform-method-31 ogre-step ((obj ogre-step)) (set! (-> obj idle-y-offset) -28672.0) (set! (-> obj float-y-offset) 0.0) (+! (-> obj root-overlay trans y) (-> obj idle-y-offset)) - (TODO-RENAME-29 obj *ogre-step-constants*) + (rigid-body-platform-method-29 obj *ogre-step-constants*) ((the-as (function ogre-plat none) (find-parent-method ogre-step 31)) obj) (let ((a0-5 (entity-actor-lookup (-> obj entity) 'alt-actor 0))) (if (and a0-5 (logtest? (-> a0-5 extra perm status) (entity-perm-status complete))) @@ -635,7 +635,7 @@ (none) ) -(defmethod TODO-RENAME-34 ogre-step ((obj ogre-step)) +(defmethod rigid-body-platform-method-34 ogre-step ((obj ogre-step)) (if (-> obj active) (go (method-of-object obj rigid-body-platform-float)) (go (method-of-object obj rigid-body-platform-idle)) @@ -680,7 +680,7 @@ ) -(defmethod TODO-RENAME-31 ogre-step-a ((obj ogre-step-a)) +(defmethod rigid-body-platform-method-31 ogre-step-a ((obj ogre-step-a)) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 12288.0 0.0 20480.0) (initialize-skeleton obj *ogre-step-a-sg* '()) ((the-as (function ogre-step none) (find-parent-method ogre-step-a 31)) obj) @@ -688,7 +688,7 @@ (none) ) -(defmethod TODO-RENAME-31 ogre-step-b ((obj ogre-step-b)) +(defmethod rigid-body-platform-method-31 ogre-step-b ((obj ogre-step-b)) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 12288.0 0.0 20480.0) (initialize-skeleton obj *ogre-step-b-sg* '()) ((the-as (function ogre-step none) (find-parent-method ogre-step-b 31)) obj) @@ -696,7 +696,7 @@ (none) ) -(defmethod TODO-RENAME-31 ogre-step-c ((obj ogre-step-c)) +(defmethod rigid-body-platform-method-31 ogre-step-c ((obj ogre-step-c)) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 12288.0 0.0 26624.0) (initialize-skeleton obj *ogre-step-c-sg* '()) ((the-as (function ogre-step none) (find-parent-method ogre-step-c 31)) obj) @@ -704,7 +704,7 @@ (none) ) -(defmethod TODO-RENAME-31 ogre-step-d ((obj ogre-step-d)) +(defmethod rigid-body-platform-method-31 ogre-step-d ((obj ogre-step-d)) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 12288.0 0.0 20480.0) (initialize-skeleton obj *ogre-step-b-sg* '()) ((the-as (function ogre-step none) (find-parent-method ogre-step-d 31)) obj) @@ -748,10 +748,10 @@ ) -(defmethod TODO-RENAME-31 ogre-isle ((obj ogre-isle)) +(defmethod rigid-body-platform-method-31 ogre-isle ((obj ogre-isle)) (set! (-> obj idle-y-offset) -6144.0) (set! (-> obj float-y-offset) 4096.0) - (TODO-RENAME-29 obj *ogre-isle-constants*) + (rigid-body-platform-method-29 obj *ogre-isle-constants*) ((the-as (function ogre-plat none) (find-parent-method ogre-isle 31)) obj) (set! (-> obj active) #t) 0 @@ -785,7 +785,7 @@ ) -(defmethod TODO-RENAME-31 ogre-isle-b ((obj ogre-isle-b)) +(defmethod rigid-body-platform-method-31 ogre-isle-b ((obj ogre-isle-b)) (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 24576.0) (initialize-skeleton obj *ogre-isle-b-sg* '()) @@ -794,7 +794,7 @@ (none) ) -(defmethod TODO-RENAME-31 ogre-isle-c ((obj ogre-isle-c)) +(defmethod rigid-body-platform-method-31 ogre-isle-c ((obj ogre-isle-c)) (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 24576.0) (initialize-skeleton obj *ogre-isle-b-sg* '()) @@ -803,7 +803,7 @@ (none) ) -(defmethod TODO-RENAME-31 ogre-isle-d ((obj ogre-isle-d)) +(defmethod rigid-body-platform-method-31 ogre-isle-d ((obj ogre-isle-d)) (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) (set! (-> obj root-overlay trans z) (+ -8192.0 (-> obj root-overlay trans z))) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 22528.0) @@ -919,8 +919,8 @@ ) (defstate ogre-bridge-activated (ogre-bridge) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('break) (+! (-> self dead-joint-count) 4) (go ogre-bridge-break) @@ -946,31 +946,31 @@ ) (defstate ogre-bridge-break (ogre-bridge) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'effect) - (when (= (-> arg3 param 0) 'splash) - (let ((gp-0 (new 'stack-no-clear 'vector))) - (let ((a1-1 (-> arg3 param 2))) - (set! (-> gp-0 quad) (-> self node-list data a1-1 bone transform vector 3 quad)) - ) - (set! (-> gp-0 y) 118784.0) - (process-spawn - part-tracker - :init part-tracker-init - (-> *part-group-id-table* 466) - -1 - #f - #f - #f - gp-0 - :to *entity-pool* - ) - ) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('effect) + (when (= (-> event param 0) 'splash) + (let ((gp-0 (new 'stack-no-clear 'vector))) + (let ((a1-1 (-> event param 2))) + (set! (-> gp-0 quad) (-> self node-list data a1-1 bone transform vector 3 quad)) + ) + (set! (-> gp-0 y) 118784.0) + (process-spawn + part-tracker + :init part-tracker-init + (-> *part-group-id-table* 466) + -1 + #f + #f + #f + gp-0 + :to *entity-pool* + ) + ) + ) + ) + ) + ) ) :code (behavior () (ja-no-eval :group! (-> self draw art-group data 4) :num! (seek!) :frame-num 0.0) @@ -984,9 +984,7 @@ :post (the-as (function none :behavior ogre-bridge) rider-post) ) -(define *ogre-bridge-joint-array* - (the-as (array uint8) (new 'static 'boxed-array :type uint8 #x4 #x9 #xc #x11 #x7 #xa #xf #x12)) - ) +(define *ogre-bridge-joint-array* (new 'static 'boxed-array :type uint8 #x4 #x9 #xc #x11 #x7 #xa #xf #x12)) (defmethod init-from-entity! ogre-bridge ((obj ogre-bridge) (arg0 entity-actor)) (stack-size-set! (-> obj main-thread) 512) @@ -1246,8 +1244,8 @@ (defstate water-vol-idle (ogre-lava) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('submerge1) (set! (-> self anim) 3) (go-virtual water-vol-idle) @@ -1269,7 +1267,7 @@ (go-virtual water-vol-idle) ) (else - ((-> (method-of-type water-anim water-vol-idle) event) arg0 arg1 arg2 arg3) + ((-> (method-of-type water-anim water-vol-idle) event) proc arg1 event-type event) ) ) ) @@ -1315,8 +1313,8 @@ ) ) -(defmethod TODO-RENAME-22 ogre-lava ((obj ogre-lava)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 ogre-lava ((obj ogre-lava)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) @@ -1357,7 +1355,7 @@ (defpartgroup group-shortcut-boulder-explosion :id 475 - :duration 300 + :duration (seconds 1) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 8) :parts ((sp-item 2149 :period 1500 :length 5) @@ -1460,10 +1458,10 @@ ) (defstate shortcut-boulder-idle (shortcut-boulder) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('attack) - (if (and (>= arg1 2) (= (-> arg3 param 1) 'eco-yellow)) + (if (and (>= arg1 2) (= (-> event param 1) 'eco-yellow)) (go shortcut-boulder-break) ) ) @@ -1501,7 +1499,3 @@ (go shortcut-boulder-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/racer_common/racer-states.gc b/goal_src/jak1/levels/racer_common/racer-states.gc index 10b1763299..b4e5c16e74 100644 --- a/goal_src/jak1/levels/racer_common/racer-states.gc +++ b/goal_src/jak1/levels/racer_common/racer-states.gc @@ -807,7 +807,7 @@ :code (behavior ((arg0 handle) (arg1 attack-info)) (target-timed-invulnerable (-> *TARGET-bank* hit-invulnerable-timeout) self) (when (!= (-> self attack-info mode) 'endlessfall) - (dummy-10 (-> self skel effect) 'group-target-hit -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-target-hit -1.0 -1) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.3)) (sound-play "oof") ) @@ -957,7 +957,7 @@ (fmax -182044.44 (fmin 182044.44 (* -40.0 (-> self racer rot z)))) (case (-> self attack-info mode) (('balloonlurker) - (dummy-13 (-> self water) 2.0 (-> self control trans) 1 (-> self control transv)) + (create-splash (-> self water) 2.0 (-> self control trans) 1 (-> self control transv)) (ja-no-eval :group! (-> self draw art-group data 139) :num! (seek! (ja-aframe 240.0 0)) :frame-num 0.0) (until (ja-done? 0) (set! (-> self racer stick-lock) #t) diff --git a/goal_src/jak1/levels/racer_common/target-racer.gc b/goal_src/jak1/levels/racer_common/target-racer.gc index 2c2cbb206e..e49c48353a 100644 --- a/goal_src/jak1/levels/racer_common/target-racer.gc +++ b/goal_src/jak1/levels/racer_common/target-racer.gc @@ -444,7 +444,7 @@ (-> self control trans) :to self ) - (dummy-10 (-> self skel effect) 'effect-land -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-land -1.0 -1) ) ) (deg-diff (vector-y-angle gp-0) (vector-y-angle (-> self control transv))) diff --git a/goal_src/jak1/levels/robocave/cave-trap.gc b/goal_src/jak1/levels/robocave/cave-trap.gc index 8dfa5f593b..f593d3ac3f 100644 --- a/goal_src/jak1/levels/robocave/cave-trap.gc +++ b/goal_src/jak1/levels/robocave/cave-trap.gc @@ -22,7 +22,7 @@ :size-assert #xe0 :flag-assert #x15007000e0 (:methods - (TODO-RENAME-20 (_type_) symbol 20) + (cave-trap-method-20 (_type_) symbol 20) ) (:states cave-trap-active @@ -46,9 +46,9 @@ (defstate spider-vent-idle (spider-vent) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 object)) - (case arg2 + (case event-type (('can-spawn?) (return (>= (- (-> *display* base-frame-counter) (-> self last-spawn-time)) (seconds 1))) v0-0 @@ -113,7 +113,7 @@ ) -(defmethod TODO-RENAME-20 cave-trap ((obj cave-trap)) +(defmethod cave-trap-method-20 cave-trap ((obj cave-trap)) (set! (-> obj last-spawn-time) (-> *display* base-frame-counter)) (set! (-> obj spawn-delay) (rand-vu-int-range (seconds 0.1) (seconds 0.5))) (let ((s5-0 (new 'stack-no-clear 'spawn-baby-spider-work))) @@ -269,7 +269,7 @@ (if (and (< (-> self spider-count) 8) (>= (- (-> *display* base-frame-counter) (-> self last-spawn-time)) (-> self spawn-delay)) ) - (TODO-RENAME-20 self) + (cave-trap-method-20 self) ) ) (else @@ -328,7 +328,7 @@ (set! (-> obj path) (new 'process 'path-control obj 'path 0.0)) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) (let ((s4-1 (entity-actor-count arg0 'alt-actor))) - (set! (-> obj alt-actors) (the-as (array entity-actor) (new 'process 'boxed-array entity-actor s4-1))) + (set! (-> obj alt-actors) (new 'process 'boxed-array entity-actor s4-1)) (dotimes (s3-1 s4-1) (set! (-> obj alt-actors s3-1) (entity-actor-lookup arg0 'alt-actor s3-1)) ) @@ -336,7 +336,3 @@ (go cave-trap-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/robocave/spider-egg.gc b/goal_src/jak1/levels/robocave/spider-egg.gc index b90dc3dfd5..0b698c72cb 100644 --- a/goal_src/jak1/levels/robocave/spider-egg.gc +++ b/goal_src/jak1/levels/robocave/spider-egg.gc @@ -44,33 +44,32 @@ ) (defstate spider-egg-idle (spider-egg) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (local-vars (v0-0 none)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'touch) - (send-shove-back - (-> self root-override) - arg0 - (the-as touching-shapes-entry (-> arg3 param 0)) - 0.7 - 6144.0 - 16384.0 - ) - ) - ((= v1-0 'can-spawn?) - (return (the-as object #t)) - v0-0 - ) - ((= v1-0 'notify-spawned) - (go spider-egg-hatch) - ) - ((= v1-0 'attack) - (go spider-egg-die) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (local-vars (v0-0 object)) + (the-as object (case event-type + (('touch) + (the-as object (send-shove-back + (-> self root-override) + proc + (the-as touching-shapes-entry (-> event param 0)) + 0.7 + 6144.0 + 16384.0 + ) + ) + ) + (('can-spawn?) + (return #t) + v0-0 + ) + (('notify-spawned) + (go spider-egg-hatch) + ) + (('attack) + (go spider-egg-die) + ) + ) + ) ) :enter (behavior ((arg0 symbol)) (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -119,9 +118,9 @@ ) (defstate spider-egg-hatch (spider-egg) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 symbol)) - (case arg2 + (case event-type (('can-spawn?) (return (the-as object #f)) v0-0 @@ -160,9 +159,9 @@ ) (defstate spider-egg-die (spider-egg) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 symbol)) - (case arg2 + (case event-type (('can-spawn?) (return (the-as object #f)) v0-0 @@ -269,7 +268,3 @@ (go spider-egg-idle #t) (none) ) - - - - diff --git a/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc index 282168a711..3f07b7c91a 100644 --- a/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc +++ b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc @@ -22,7 +22,7 @@ (cond ((= v1-4 255) ) - ((zero? (logand (-> arg0 poly v1-4 pat) 1)) + ((not (logtest? (-> arg0 poly v1-4 pat) 1)) (format 0 "ERROR: find-adjacent-bounds-one given a non-boundary edge to start~%") (return #f) ) @@ -81,7 +81,7 @@ #f ) -;; WARN: Expression building failed: Function find-adjacent-bounds has a return type of none, but the expression builder found a return statement. +;; WARN: Function find-adjacent-bounds has a return type of none, but the expression builder found a return statement. (defun find-adjacent-bounds ((arg0 nav-mesh) (arg1 clip-travel-vector-to-mesh-return-info)) (when (!= (-> arg1 found-boundary) #t) (format 0 "ERROR: find-adjacent-bounds passed info which doesn't specify a boundary edge~%") @@ -186,16 +186,12 @@ (parameter-ease-sin-clamp (* 0.00081380206 (+ -409.6 f30-0))) ) ) - (let ((f0-9 (lerp-clamp - (-> self flee-info min-stop-chase-dist) - (-> self flee-info max-stop-chase-dist) - (parameter-ease-sin-clamp (* 0.00081380206 (+ -409.6 f30-0))) - ) - ) + (set! (-> self nav-info stop-chase-distance) (lerp-clamp + (-> self flee-info min-stop-chase-dist) + (-> self flee-info max-stop-chase-dist) + (parameter-ease-sin-clamp (* 0.00081380206 (+ -409.6 f30-0))) + ) ) - (set! (-> self nav-info stop-chase-distance) f0-9) - f0-9 - ) ) ) @@ -207,7 +203,7 @@ ) (set! (-> gp-0 quad) (-> arg0 nav travel quad)) (set! (-> arg0 nav travel quad) (-> arg1 quad)) - (dummy-24 (-> arg0 nav) (-> arg0 flee-info deflection-max-dist) s2-0) + (nav-control-method-24 (-> arg0 nav) (-> arg0 flee-info deflection-max-dist) s2-0) (when (-> s2-0 found-boundary) (let ((s0-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'vector)) @@ -333,12 +329,9 @@ (quaternion->matrix s5-0 (-> self collide-info quat)) (set! (-> self run-blend-interp) (acos (vector-dot (-> s5-0 vector 2) (-> gp-0 vector 2)))) (set! (-> self run-blend-interp) (/ (-> self run-blend-interp) (-> self flee-info blend_interp_angle))) - (when (< (vector-dot (-> s5-0 vector 2) (the-as vector (-> gp-0 vector))) 0.0) - (let ((f0-8 (- (-> self run-blend-interp)))) - (set! (-> self run-blend-interp) f0-8) - f0-8 + (if (< (vector-dot (-> s5-0 vector 2) (the-as vector (-> gp-0 vector))) 0.0) + (set! (-> self run-blend-interp) (- (-> self run-blend-interp))) ) - ) ) ) @@ -900,7 +893,7 @@ :post (the-as (function none :behavior lightning-mole) fleeing-nav-enemy-chase-post) ) -(defmethod dummy-43 lightning-mole ((obj lightning-mole) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler lightning-mole ((obj lightning-mole) (arg0 process) (arg1 event-message-block)) (send-event arg0 'get-attack-count 1) (when (!= (-> obj state) lightning-mole-yelp) (send-event arg0 'jump 32768.0 32768.0) @@ -909,7 +902,7 @@ (the-as object #t) ) -(defmethod dummy-44 lightning-mole ((obj lightning-mole) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler lightning-mole ((obj lightning-mole) (arg0 process) (arg1 event-message-block)) (when (!= (-> obj state) lightning-mole-yelp) (send-event arg0 'jump 32768.0 32768.0) (go lightning-mole-yelp) @@ -991,7 +984,7 @@ ) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *lightning-mole-sg* '()) - (TODO-RENAME-45 obj *lightning-mole-nav-enemy-info*) + (init-defaults! obj *lightning-mole-nav-enemy-info*) (logclear! (-> obj nav flags) (nav-control-flags navcf5 navcf6 navcf7)) (set! (-> obj draw origin-joint-index) (the-as uint 3)) (set! (-> obj reaction-time) (seconds 0.05)) @@ -1033,7 +1026,7 @@ (defpartgroup group-peeper :id 456 - :duration 5 + :duration (seconds 0.017) :bounds (static-bspherem 0 0 0 15) :parts ((sp-item 1768) (sp-item 1769 :period 120 :length 30) (sp-item 1770 :period 120 :length 60)) ) @@ -1199,16 +1192,16 @@ (defstate peeper-wait (peeper) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'hide) - (let ((v0-0 (-> *display* base-frame-counter))) - (set! (-> self state-time) v0-0) - v0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('hide) + (let ((v0-0 (-> *display* base-frame-counter))) + (set! (-> self state-time) v0-0) + v0-0 + ) + ) + ) + ) ) :enter (behavior () (if (nonzero? (-> self sound)) @@ -1253,8 +1246,8 @@ ) (defstate peeper-down (peeper) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('hide) (go peeper-wait) ) @@ -1301,8 +1294,8 @@ ) (defstate peeper-up (peeper) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('hide) (go peeper-hide) ) @@ -1344,7 +1337,3 @@ (go peeper-up) (none) ) - - - - diff --git a/goal_src/jak1/levels/rolling/rolling-obs.gc b/goal_src/jak1/levels/rolling/rolling-obs.gc index 47a4b075c0..4e3cc71a2c 100644 --- a/goal_src/jak1/levels/rolling/rolling-obs.gc +++ b/goal_src/jak1/levels/rolling/rolling-obs.gc @@ -421,7 +421,7 @@ (defpartgroup group-dark-plant :id 455 - :duration 42 + :duration (seconds 0.14) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 15) :parts ((sp-item 1764) (sp-item 2356)) @@ -789,8 +789,8 @@ (defstate rolling-start-break (rolling-start) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('unbreak) (go rolling-start-whole) ) @@ -824,8 +824,8 @@ ) (defstate rolling-start-whole (rolling-start) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('break) (sound-play "cool-rolling-st") (go rolling-start-break #f) @@ -885,10 +885,7 @@ ) (set! (-> self coord vector 3 w) 1.0) (set! (-> self radius) arg2) - (let ((f0-2 arg3)) - (set! (-> self thickness) f0-2) - f0-2 - ) + (set! (-> self thickness) arg3) ) (deftype gorge-start (gorge) @@ -1043,18 +1040,17 @@ ) (defbehavior gorge-start-draw-time gorge-start ((arg0 symbol) (arg1 symbol)) - (let ((gp-0 - (new - 'stack - 'font-context - *font-default-matrix* - 0 - 0 - 0.0 - (font-color yellow-orange) - (font-flags shadow kerning) - ) - ) + (let ((gp-0 (new + 'stack + 'font-context + *font-default-matrix* + 0 + 0 + 0.0 + (font-color yellow-orange) + (font-flags shadow kerning) + ) + ) ) (let ((v1-1 gp-0)) (set! (-> v1-1 width) (the float 200)) @@ -1068,26 +1064,14 @@ (set! (-> gp-0 origin x) (the float (+ (-> self timer-pos-offset) 392))) (set! (-> gp-0 origin y) (the float (- 10 (-> self timer-pos-offset)))) (set! (-> gp-0 flags) (font-flags shadow kerning right large)) - (print-game-text - (lookup-text! *common-text* (game-text-id time) #f) - gp-0 - #f - 128 - 22 - ) + (print-game-text (lookup-text! *common-text* (game-text-id time) #f) gp-0 #f 128 22) (set! (-> gp-0 origin x) (+ 10.0 (-> gp-0 origin x))) (set! (-> gp-0 flags) (font-flags shadow kerning large)) (print-game-text (race-time->string (-> self this-time)) gp-0 #f 128 22) (set! (-> gp-0 origin x) (+ -10.0 (-> gp-0 origin x))) (set! (-> gp-0 origin y) (+ 15.0 (-> gp-0 origin y))) (set! (-> gp-0 flags) (font-flags shadow kerning right large)) - (print-game-text - (lookup-text! *common-text* (game-text-id record) #f) - gp-0 - #f - 128 - 22 - ) + (print-game-text (lookup-text! *common-text* (game-text-id record) #f) gp-0 #f 128 22) (set! (-> gp-0 origin x) (+ 10.0 (-> gp-0 origin x))) (set! (-> gp-0 flags) (font-flags shadow kerning large)) (print-game-text (race-time->string (-> self record-time)) gp-0 #f 128 22) @@ -1105,13 +1089,7 @@ (let ((a0-15 gp-0)) (set! (-> a0-15 color) (font-color orange-red)) ) - (print-game-text - (lookup-text! *common-text* (game-text-id new-record) #f) - gp-0 - #f - 128 - 22 - ) + (print-game-text (lookup-text! *common-text* (game-text-id new-record) #f) gp-0 #f 128 22) ) (when arg1 (close-specific-task! (-> self entity extra perm task) (task-status need-reminder)) @@ -1202,18 +1180,17 @@ (send-event (ppointer->process (-> *hud-parts* money)) 'enable) ) (when (< (mod (-> *display* real-frame-counter) 90) 60) - (let ((gp-0 - (new - 'stack - 'font-context - *font-default-matrix* - 156 - 80 - 0.0 - (font-color orange-red) - (font-flags shadow kerning) - ) - ) + (let ((gp-0 (new + 'stack + 'font-context + *font-default-matrix* + 156 + 80 + 0.0 + (font-color orange-red) + (font-flags shadow kerning) + ) + ) ) (let ((v1-20 gp-0)) (set! (-> v1-20 width) (the float 200)) @@ -1222,13 +1199,7 @@ (set! (-> v1-21 height) (the float 50)) ) (set! (-> gp-0 flags) (font-flags shadow kerning middle left large)) - (print-game-text - (lookup-text! *common-text* (game-text-id race-aborted) #f) - gp-0 - #f - 128 - 22 - ) + (print-game-text (lookup-text! *common-text* (game-text-id race-aborted) #f) gp-0 #f 128 22) ) ) (suspend) @@ -1244,8 +1215,8 @@ ) (defstate gorge-start-racing (gorge-start) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('finished) (go gorge-start-race-finished) ) @@ -1437,8 +1408,8 @@ ) ) -(defmethod TODO-RENAME-22 rolling-water ((obj rolling-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 rolling-water ((obj rolling-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) @@ -1452,7 +1423,3 @@ (logclear! (-> obj flags) (water-flags wt23)) (none) ) - - - - diff --git a/goal_src/jak1/levels/rolling/rolling-robber.gc b/goal_src/jak1/levels/rolling/rolling-robber.gc index b59a1fda22..519fe5e60e 100644 --- a/goal_src/jak1/levels/rolling/rolling-robber.gc +++ b/goal_src/jak1/levels/rolling/rolling-robber.gc @@ -183,7 +183,7 @@ (let ((s5-0 (new 'stack-no-clear 'matrix)) (gp-0 (new 'stack-no-clear 'vector)) ) - (TODO-RENAME-14 (-> self path) (-> self tangent) (-> self curve-position)) + (path-control-method-14 (-> self path) (-> self tangent) (-> self curve-position)) (cond ((and arg0 *target*) (vector-! gp-0 (-> self root-override trans) (target-pos 0)) @@ -250,10 +250,7 @@ ) ) ) - (let ((f0-34 (+ (-> self root-override trans y) (-> self y-offset)))) - (set! (-> self root-override trans y) f0-34) - f0-34 - ) + (set! (-> self root-override trans y) (+ (-> self root-override trans y) (-> self y-offset))) ) (defbehavior robber-calc-speed robber ((arg0 float) (arg1 float) (arg2 float) (arg3 float) (arg4 symbol)) @@ -621,7 +618,7 @@ (none) ) :code (behavior () - (TODO-RENAME-14 (-> self path) (-> self tangent) (-> self curve-position)) + (path-control-method-14 (-> self path) (-> self tangent) (-> self curve-position)) (let ((gp-1 (vector-! (new 'stack-no-clear 'vector) (-> self root-override trans) (target-pos 0))) (f0-1 6.826667) ) @@ -708,7 +705,7 @@ (set! (-> obj draw origin-joint-index) (the-as uint 3)) (set! (-> obj curve-position) (res-lump-float (-> obj entity) 'initial-spline-pos)) (eval-path-curve! (-> obj path) (-> obj root-override trans) (-> obj curve-position) 'interp) - (TODO-RENAME-14 (-> obj path) (-> obj tangent) (-> obj curve-position)) + (path-control-method-14 (-> obj path) (-> obj tangent) (-> obj curve-position)) (set! (-> obj facing quad) (-> obj tangent quad)) (let ((s4-1 (new 'stack-no-clear 'matrix))) (forward-down->inv-matrix s4-1 (-> obj facing) (new 'static 'vector :y -1.0)) @@ -736,7 +733,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/snow/ice-cube.gc b/goal_src/jak1/levels/snow/ice-cube.gc index 824d8142d0..d83ca4aeae 100644 --- a/goal_src/jak1/levels/snow/ice-cube.gc +++ b/goal_src/jak1/levels/snow/ice-cube.gc @@ -38,8 +38,8 @@ :size-assert #x1f0 :flag-assert #x4c018001f0 (:methods - (dummy-51 (_type_ vector vector) symbol :replace 51) - (dummy-53 (_type_ vector vector) symbol :replace 53) + (ice-cube-method-51 (_type_ vector vector) symbol :replace 51) + (ice-cube-method-53 (_type_ vector vector) symbol :replace 53) ) (:states ice-cube-appear @@ -208,8 +208,8 @@ (defpartgroup group-ice-cube-foot-puff :id 567 - :duration 5 - :linger-duration 450 + :duration (seconds 0.017) + :linger-duration (seconds 1.5) :bounds (static-bspherem 0 0 0 2) :parts ((sp-item 2325) (sp-item 2326) (sp-item 2327)) ) @@ -371,104 +371,106 @@ ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 176] ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 194] (defbehavior ice-cube-default-event-handler ice-cube ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - object - (cond - ((= v1-0 'attack) - (cond - ((and (= (-> arg0 type) target) - (= (-> self cprims-type) 2) - (not (send-event *target* 'query 'powerup (pickup-type eco-red))) - ) - (when (and (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) - ) - (else - (let ((a1-3 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-3 from) self) - (set! (-> a1-3 num-params) 4) - (set! (-> a1-3 message) 'attack) - (set! (-> a1-3 param 0) (-> arg3 param 0)) - (set! (-> a1-3 param 1) (the-as uint #f)) - (let ((v1-20 (+ *global-attack-id* 1))) - (set! *global-attack-id* v1-20) - (set! (-> a1-3 param 2) (the-as uint v1-20)) - ) - (set! (-> a1-3 param 3) (the-as uint 0)) - (send-event-function arg0 a1-3) - ) + (the-as object (case arg2 + (('attack) + (cond + ((and (= (-> arg0 type) target) + (= (-> self cprims-type) 2) + (not (send-event *target* 'query 'powerup (pickup-type eco-red))) + ) + (when (and (cond + ((= (-> arg0 type) target) + (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) + ) + (else + (let ((a1-3 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-3 from) self) + (set! (-> a1-3 num-params) 4) + (set! (-> a1-3 message) 'attack) + (set! (-> a1-3 param 0) (-> arg3 param 0)) + (set! (-> a1-3 param 1) (the-as uint #f)) + (let ((v1-20 (+ *global-attack-id* 1))) + (set! *global-attack-id* v1-20) + (set! (-> a1-3 param 2) (the-as uint v1-20)) + ) + (set! (-> a1-3 param 3) (the-as uint 0)) + (send-event-function arg0 a1-3) + ) + ) + ) + (= (-> arg0 type) target) + ) + (set-collide-offense (-> self collide-info) 2 (collide-offense no-offense)) + (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf8)) + (level-hint-spawn + (game-text-id snow-ice-cube-hint) + "sksp0350" + (the-as entity #f) + *entity-pool* + (game-task none) ) ) - (= (-> arg0 type) target) - ) - (set-collide-offense (-> self collide-info) 2 (collide-offense no-offense)) - (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf8)) - (level-hint-spawn (game-text-id snow-ice-cube-hint) "sksp0350" (the-as entity #f) *entity-pool* (game-task none)) - ) - ) - (else - (nav-enemy-set-hit-from-direction arg0) - (go ice-cube-shatter) - ) - ) - ) - ((= v1-0 'touch) - (when (and (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) ) (else - (let ((a1-7 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-7 from) self) - (set! (-> a1-7 num-params) 4) - (set! (-> a1-7 message) 'attack) - (set! (-> a1-7 param 0) (-> arg3 param 0)) - (set! (-> a1-7 param 1) (the-as uint #f)) - (let ((v1-38 (+ *global-attack-id* 1))) - (set! *global-attack-id* v1-38) - (set! (-> a1-7 param 2) (the-as uint v1-38)) + (nav-enemy-set-hit-from-direction arg0) + (go ice-cube-shatter) + ) + ) + ) + (('touch) + (when (and (cond + ((= (-> arg0 type) target) + (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) + ) + (else + (let ((a1-7 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-7 from) self) + (set! (-> a1-7 num-params) 4) + (set! (-> a1-7 message) 'attack) + (set! (-> a1-7 param 0) (-> arg3 param 0)) + (set! (-> a1-7 param 1) (the-as uint #f)) + (let ((v1-38 (+ *global-attack-id* 1))) + (set! *global-attack-id* v1-38) + (set! (-> a1-7 param 2) (the-as uint v1-38)) + ) + (set! (-> a1-7 param 3) (the-as uint 0)) + (send-event-function arg0 a1-7) + ) + ) + ) + (= (-> arg0 type) target) + ) + (set-collide-offense (-> self collide-info) 2 (collide-offense no-offense)) + ;; NOTE fixed decompiler bug + (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf8)) + ) + ) + (('touched) + (when (!= (-> arg0 type) target) + (cond + ((= (-> arg0 type) target) + (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode #f)))) + ) + (else + (let ((a1-10 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-10 from) self) + (set! (-> a1-10 num-params) 4) + (set! (-> a1-10 message) 'attack) + (set! (-> a1-10 param 0) (-> arg3 param 0)) + (set! (-> a1-10 param 1) (the-as uint #f)) + (let ((v1-54 (+ *global-attack-id* 1))) + (set! *global-attack-id* v1-54) + (set! (-> a1-10 param 2) (the-as uint v1-54)) + ) + (set! (-> a1-10 param 3) (the-as uint 0)) + (send-event-function arg0 a1-10) ) - (set! (-> a1-7 param 3) (the-as uint 0)) - (send-event-function arg0 a1-7) ) ) ) - (= (-> arg0 type) target) ) - (set-collide-offense (-> self collide-info) 2 (collide-offense no-offense)) - ;; NOTE fixed decompiler bug - (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf8)) - ) - ) - ((= v1-0 'touched) - (when (!= (-> arg0 type) target) - (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode #f)))) - ) - (else - (let ((a1-10 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-10 from) self) - (set! (-> a1-10 num-params) 4) - (set! (-> a1-10 message) 'attack) - (set! (-> a1-10 param 0) (-> arg3 param 0)) - (set! (-> a1-10 param 1) (the-as uint #f)) - (let ((v1-54 (+ *global-attack-id* 1))) - (set! *global-attack-id* v1-54) - (set! (-> a1-10 param 2) (the-as uint v1-54)) ) - (set! (-> a1-10 param 3) (the-as uint 0)) - (send-event-function arg0 a1-10) - ) - ) - ) - ) - ) - ) - ) - ) + ) ) (defmethod initialize-collision ice-cube ((obj ice-cube)) @@ -533,12 +535,12 @@ (set! (-> obj cprims-type) (the-as uint 0)) (set-root-prim-collide-with! (-> obj collide-info) (collide-kind target)) (set! (-> obj collide-info event-self) 'touched) - (dummy-57 obj) + (nav-enemy-method-57 obj) 0 (none) ) -(defmethod dummy-57 ice-cube ((obj ice-cube)) +(defmethod nav-enemy-method-57 ice-cube ((obj ice-cube)) (when (!= (-> obj cprims-type) 1) (set! (-> obj cprims-type) (the-as uint 1)) (let ((v1-3 (-> obj collide-info root-prim))) @@ -550,7 +552,7 @@ (none) ) -(defmethod dummy-58 ice-cube ((obj ice-cube)) +(defmethod nav-enemy-method-58 ice-cube ((obj ice-cube)) (when (!= (-> obj cprims-type) 2) (set! (-> obj cprims-type) (the-as uint 2)) (let ((v1-3 (-> obj collide-info root-prim))) @@ -562,10 +564,10 @@ (none) ) -(defmethod TODO-RENAME-48 ice-cube ((obj ice-cube)) +(defmethod nav-enemy-method-48 ice-cube ((obj ice-cube)) (process-drawable-from-entity! obj (-> obj entity)) (initialize-skeleton obj *ice-cube-sg* '()) - (TODO-RENAME-45 obj *ice-cube-nav-enemy-info*) + (init-defaults! obj *ice-cube-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) (set! (-> obj neck ear) (the-as uint 2)) @@ -606,7 +608,7 @@ (set! (-> obj part3) (create-launch-control (-> *part-group-id-table* 509) obj)) (set! (-> obj part4) (create-launch-control (-> *part-group-id-table* 567) obj)) (initialize-collision obj) - (TODO-RENAME-48 obj) + (nav-enemy-method-48 obj) (let ((s4-0 (-> obj path curve num-cverts))) (if (<= s4-0 0) (go process-drawable-art-error "no path") @@ -622,7 +624,7 @@ (none) ) -(defmethod dummy-60 ice-cube ((obj ice-cube) (arg0 symbol)) +(defmethod nav-enemy-method-60 ice-cube ((obj ice-cube) (arg0 symbol)) (let ((gp-0 (new 'stack-no-clear 'vector))) (when (-> obj tracking-player?) (if (and *target* arg0) @@ -641,7 +643,7 @@ ) ) -(defmethod dummy-51 ice-cube ((obj ice-cube) (arg0 vector) (arg1 vector)) +(defmethod ice-cube-method-51 ice-cube ((obj ice-cube) (arg0 vector) (arg1 vector)) (let ((s5-0 (new 'stack-no-clear 'vector))) (let* ((s4-0 (new 'stack-no-clear 'collide-tri-result)) (f0-0 40960.0) @@ -671,10 +673,10 @@ #t ) -(defmethod dummy-52 ice-cube ((obj ice-cube) (arg0 vector)) +(defmethod nav-enemy-method-52 ice-cube ((obj ice-cube) (arg0 vector)) (when *target* (let ((f0-0 (vector-vector-xz-distance arg0 (target-pos 0)))) - (when (and (>= f0-0 40960.0) (>= 81920.0 f0-0) (not (TODO-RENAME-50 obj arg0))) + (when (and (>= f0-0 40960.0) (>= 81920.0 f0-0) (not (nav-enemy-method-50 obj arg0))) (let ((a0-4 (new 'stack-no-clear 'vector))) (set! (-> a0-4 quad) (-> arg0 quad)) (set! (-> a0-4 w) (-> obj collide-info root-prim local-sphere w)) @@ -688,7 +690,7 @@ #f ) -(defmethod dummy-53 ice-cube ((obj ice-cube) (arg0 vector) (arg1 vector)) +(defmethod ice-cube-method-53 ice-cube ((obj ice-cube) (arg0 vector) (arg1 vector)) (local-vars (s1-0 int) (s2-0 int)) (let ((s3-0 (-> obj path curve num-cverts))) (if (<= s3-0 0) @@ -706,7 +708,7 @@ ) (while (> s2-0 0) (eval-path-curve-div! (-> obj path) arg0 (the float s1-0) 'interp) - (when (dummy-52 obj arg0) + (when (nav-enemy-method-52 obj arg0) (let ((a1-3 (new 'stack-no-clear 'vector)) (s3-1 (new 'stack-no-clear 'collide-tri-result)) ) @@ -765,10 +767,10 @@ (let ((s5-0 (new 'stack-no-clear 'vector)) (gp-0 (new 'stack-no-clear 'vector)) ) - (when (dummy-53 self s5-0 gp-0) + (when (ice-cube-method-53 self s5-0 gp-0) (set! (-> self collide-info trans quad) (-> s5-0 quad)) (forward-up->quaternion (-> self collide-info quat) gp-0 *up-vector*) - (dummy-57 self) + (nav-enemy-method-57 self) (go ice-cube-appear) ) ) @@ -786,10 +788,10 @@ (defstate ice-cube-appear (ice-cube) :event ice-cube-default-event-handler :enter (behavior () - (dummy-57 self) + (nav-enemy-method-57 self) (set! (-> self ground-y) (-> self collide-info trans y)) (spawn (-> self part) (-> self collide-info trans)) - (set-current-poly! (-> self nav) (dummy-16 (-> self nav) (-> self collide-info trans))) + (set-current-poly! (-> self nav) (nav-control-method-16 (-> self nav) (-> self collide-info trans))) (set! (-> self collide-info trans y) (+ -12288.0 (-> self collide-info trans y))) (set! (-> self collide-info transv quad) (-> *null-vector* quad)) (set! (-> self collide-info transv y) (rand-vu-float-range 102400.0 114688.0)) @@ -840,7 +842,7 @@ (suspend) (ja :num! (seek!)) ) - (if (TODO-RENAME-46 self (-> self nav-info notice-distance)) + (if (target-in-range? self (-> self nav-info notice-distance)) (go ice-cube-become-mean) (go-virtual nav-enemy-idle) ) @@ -894,7 +896,7 @@ :exit (the-as (function none :behavior ice-cube) #f) :trans (the-as (function none :behavior ice-cube) #f) :code (behavior () - (dummy-57 self) + (nav-enemy-method-57 self) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (logclear! (-> self mask) (process-mask actor-pause)) (go ice-cube-face-player) @@ -908,7 +910,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) - (dummy-57 self) + (nav-enemy-method-57 self) (logclear! (-> self mask) (process-mask actor-pause)) (if (or (not *target*) (logtest? (-> *target* state-flags) @@ -947,7 +949,7 @@ (let* ((v1-26 (>= 0.0 (-> self collide-info transv y))) (v1-27 (and v1-26 (logtest? (-> self collide-info status) (cshape-moving-flags onsurf)))) ) - (set! gp-0 (dummy-60 self (not v1-27))) + (set! gp-0 (nav-enemy-method-60 self (not v1-27))) ) (suspend) (ja :num! (seek!)) @@ -973,7 +975,7 @@ #f ) (+! (-> self collide-info transv y) (* -544768.0 (-> *display* seconds-per-frame))) - (set! gp-0 (dummy-60 self (not s5-0))) + (set! gp-0 (nav-enemy-method-60 self (not s5-0))) ) (suspend) ) @@ -1000,7 +1002,7 @@ :enter (behavior () (set! (-> self draw force-lod) 0) (logclear! (-> self mask) (process-mask actor-pause)) - (dummy-57 self) + (nav-enemy-method-57 self) (none) ) :code (behavior () @@ -1010,7 +1012,7 @@ (until (ja-done? 0) (when (and (not gp-0) (>= (ja-aframe-num 0) 8.0)) (set! gp-0 #t) - (dummy-58 self) + (nav-enemy-method-58 self) ) (suspend) (ja :num! (seek!)) @@ -1022,7 +1024,7 @@ :post (the-as (function none :behavior ice-cube) nav-enemy-simple-post) ) -(defmethod dummy-54 ice-cube ((obj ice-cube) (arg0 vector)) +(defmethod nav-enemy-method-54 ice-cube ((obj ice-cube) (arg0 vector)) (let* ((s4-0 (-> obj path curve num-cverts)) (s2-0 (nav-enemy-rnd-int-count s4-0)) (s5-0 (new 'stack-no-clear 'vector)) @@ -1030,7 +1032,7 @@ (dotimes (s3-0 s4-0) (eval-path-curve-div! (-> obj path) s5-0 (the float s2-0) 'interp) (when (>= (vector-vector-xz-distance s5-0 (-> obj collide-info trans)) 32768.0) - (when (dummy-51 obj s5-0 s5-0) + (when (ice-cube-method-51 obj s5-0 s5-0) (set! (-> obj target-pt quad) (-> s5-0 quad)) (return #t) ) @@ -1046,7 +1048,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) - (dummy-58 self) + (nav-enemy-method-58 self) (if (or (not *target*) (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) @@ -1084,7 +1086,7 @@ (let* ((v1-26 (>= 0.0 (-> self collide-info transv y))) (v1-27 (and v1-26 (logtest? (-> self collide-info status) (cshape-moving-flags onsurf)))) ) - (set! gp-0 (dummy-60 self (not v1-27))) + (set! gp-0 (nav-enemy-method-60 self (not v1-27))) ) (suspend) (ja :num! (seek!)) @@ -1110,7 +1112,7 @@ #f ) (+! (-> self collide-info transv y) (* -544768.0 (-> *display* seconds-per-frame))) - (set! gp-0 (dummy-60 self (not s5-0))) + (set! gp-0 (nav-enemy-method-60 self (not s5-0))) ) (suspend) ) @@ -1136,7 +1138,7 @@ :event ice-cube-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (dummy-58 self) + (nav-enemy-method-58 self) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) (set! (-> self next-skid-sound-time) (-> *display* base-frame-counter)) (if (or (not *target*) @@ -1218,8 +1220,8 @@ (set-vector! gp-2 0.0 0.0 (+ 15360.0 (fmax f30-0 f28-0)) 1.0) (vector-rotate-around-y! gp-2 gp-2 (-> self charge-angle)) (vector+! gp-2 gp-2 (-> self starting-pos)) - (TODO-RENAME-28 (-> self nav) (collide-kind wall-object ground-object)) - (dummy-11 (-> self nav) gp-2) + (nav-control-method-28 (-> self nav) (collide-kind wall-object ground-object)) + (nav-control-method-11 (-> self nav) gp-2) ) ) ) @@ -1296,7 +1298,7 @@ (defstate ice-cube-mean-charge-done (ice-cube) :event ice-cube-default-event-handler :code (behavior () - (dummy-58 self) + (nav-enemy-method-58 self) (nav-enemy-neck-control-inactive) (go ice-cube-retract-spikes) (none) @@ -1306,7 +1308,7 @@ (defstate ice-cube-retract-spikes (ice-cube) :event ice-cube-default-event-handler :code (behavior () - (dummy-58 self) + (nav-enemy-method-58 self) (nav-enemy-neck-control-inactive) (ja-channel-push! 1 (seconds 0.07)) (let ((gp-0 #f)) @@ -1314,7 +1316,7 @@ (until (ja-done? 0) (when (and (not gp-0) (>= (ja-aframe-num 0) 3.0)) (set! gp-0 #t) - (dummy-57 self) + (nav-enemy-method-57 self) ) (suspend) (ja :num! (seek!)) @@ -1341,7 +1343,7 @@ ) (go-virtual nav-enemy-idle) ) - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (go ice-cube-face-player) ) (else @@ -1429,7 +1431,3 @@ (none) ) ) - - - - diff --git a/goal_src/jak1/levels/snow/snow-ball.gc b/goal_src/jak1/levels/snow/snow-ball.gc index 0bd388c4d6..e57a9986e2 100644 --- a/goal_src/jak1/levels/snow/snow-ball.gc +++ b/goal_src/jak1/levels/snow/snow-ball.gc @@ -65,7 +65,7 @@ (:methods (follow-path (_type_) none 20) (play-landing-sound (_type_ float) sound-id 21) - (dummy-22 (_type_ process-drawable) none 22) + (snow-ball-roller-method-22 (_type_ process-drawable) none 22) ) (:states snow-ball-roller-idle @@ -86,8 +86,8 @@ :size-assert #x8c :flag-assert #x100020008c (:methods - (dummy-14 (_type_ (inline-array snow-ball-junction) float int) symbol 14) - (dummy-15 (_type_ (inline-array snow-ball-junction) int) symbol 15) + (snow-ball-method-14 (_type_ (inline-array snow-ball-junction) float int) symbol 14) + (snow-ball-method-15 (_type_ (inline-array snow-ball-junction) int) symbol 15) ) (:states snow-ball-idle @@ -253,7 +253,7 @@ ) ) (let ((s4-0 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> self path) s4-0 (-> self path-u)) + (path-control-method-14 (-> self path) s4-0 (-> self path-u)) (let ((gp-0 (new 'stack-no-clear 'matrix))) (let ((s5-0 (new 'stack-no-clear 'matrix))) (let ((s3-0 (new 'stack-no-clear 'vector))) @@ -312,7 +312,7 @@ (none) ) -(defmethod dummy-22 snow-ball-roller ((obj snow-ball-roller) (arg0 process-drawable)) +(defmethod snow-ball-roller-method-22 snow-ball-roller ((obj snow-ball-roller) (arg0 process-drawable)) (cond ((< (+ 4096.0 (-> arg0 root trans y)) (-> obj root-override trans y)) (let ((f0-2 81920.0)) @@ -332,7 +332,7 @@ (vector-! s4-0 (-> arg0 root trans) (-> obj root-override trans)) (set! (-> s4-0 y) 0.0) (vector-normalize! s4-0 1.0) - (TODO-RENAME-14 (-> obj path) s3-0 (-> obj path-u)) + (path-control-method-14 (-> obj path) s3-0 (-> obj path-u)) (set! (-> s3-0 y) 0.0) (vector-normalize! s3-0 1.0) (let* ((f28-0 (atan (-> s4-0 x) (-> s4-0 z))) @@ -365,19 +365,19 @@ ) (defstate snow-ball-roller-idle (snow-ball-roller) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (or (= v1-0 'touch) (= v1-0 'attack)) - (when (= (-> arg0 type) target) - (do-push-aways! (-> self root-override)) - (when (>= (- (-> *display* base-frame-counter) (-> self hit-player-time)) (seconds 0.5)) - (set! (-> self hit-player-time) (-> *display* base-frame-counter)) - (dummy-22 self *target*) - ) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('touch 'attack) + (when (= (-> proc type) target) + (do-push-aways! (-> self root-override)) + (when (>= (- (-> *display* base-frame-counter) (-> self hit-player-time)) (seconds 0.5)) + (set! (-> self hit-player-time) (-> *display* base-frame-counter)) + (the-as symbol (snow-ball-roller-method-22 self *target*)) + ) + ) + ) + ) + ) ) :enter (behavior () (set! (-> self last-bounce-time) (-> *display* base-frame-counter)) @@ -461,7 +461,7 @@ (none) ) -(defmethod dummy-14 snow-ball ((obj snow-ball) (arg0 (inline-array snow-ball-junction)) (arg1 float) (arg2 int)) +(defmethod snow-ball-method-14 snow-ball ((obj snow-ball) (arg0 (inline-array snow-ball-junction)) (arg1 float) (arg2 int)) (local-vars (v1-0 (pointer float))) (if (zero? arg2) (set! v1-0 (new 'static 'array float 8 0.3309 0.36 0.4691 0.5061 0.6904 0.7264 0.864 0.8667)) @@ -481,7 +481,7 @@ #f ) -(defmethod dummy-15 snow-ball ((obj snow-ball) (arg0 (inline-array snow-ball-junction)) (arg1 int)) +(defmethod snow-ball-method-15 snow-ball ((obj snow-ball) (arg0 (inline-array snow-ball-junction)) (arg1 int)) (local-vars (v0-0 symbol)) (let ((v1-0 (-> obj child-override))) (while v1-0 @@ -533,8 +533,8 @@ ) (loop (let ((s3-0 (/ (+ 98304.0 (rand-vu-float-range 0.0 32768.0)) (path-distance (-> self path gp-0))))) - (dummy-14 self s5-0 s3-0 gp-0) - (when (dummy-15 self s5-0 gp-0) + (snow-ball-method-14 self s5-0 s3-0 gp-0) + (when (snow-ball-method-15 self s5-0 gp-0) (process-spawn snow-ball-roller (-> self entity) self s3-0 gp-0 s5-0 :to self) (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self delay-til-next) (rand-vu-int-range 450 1650)) @@ -587,7 +587,3 @@ (go snow-ball-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/snow/snow-bumper.gc b/goal_src/jak1/levels/snow/snow-bumper.gc index 2825b1066b..3c3d0be31e 100644 --- a/goal_src/jak1/levels/snow/snow-bumper.gc +++ b/goal_src/jak1/levels/snow/snow-bumper.gc @@ -22,7 +22,7 @@ :size-assert #xc8 :flag-assert #x16006000c8 (:methods - (dummy-20 (_type_) none 20) + (snow-bumper-method-20 (_type_) none 20) (shove-player (_type_ process-drawable) none 21) ) (:states @@ -160,11 +160,11 @@ ) (defstate snow-bumper-active-close-idle (snow-bumper) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch 'attack 'bonk) - (when (= (-> arg0 type) target) - (let ((gp-0 (-> arg3 param 0))) + (when (= (-> proc type) target) + (let ((gp-0 (-> event param 0))) (when (and (>= 6144.0 (vector-vector-xz-distance (-> self root trans) (target-pos 0))) ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry gp-0) @@ -396,7 +396,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/snow/snow-bunny.gc b/goal_src/jak1/levels/snow/snow-bunny.gc index 9e14b19841..d5859aeafd 100644 --- a/goal_src/jak1/levels/snow/snow-bunny.gc +++ b/goal_src/jak1/levels/snow/snow-bunny.gc @@ -36,12 +36,12 @@ :size-assert #x200 :flag-assert #x4d01900200 (:methods - (dummy-51 (_type_ vector vector) symbol :replace 51) - (dummy-52 (_type_) symbol :replace 52) - (dummy-54 (_type_) symbol :replace 54) - (dummy-57 (_type_) symbol :replace 57) - (dummy-60 (_type_) none :replace 60) - (dummy-76 (_type_ symbol) none 76) + (snow-bunny-method-51 (_type_ vector vector) symbol :replace 51) + (snow-bunny-method-52 (_type_) symbol :replace 52) + (snow-bunny-method-54 (_type_) symbol :replace 54) + (snow-bunny-method-57 (_type_) symbol :replace 57) + (snow-bunny-method-60 (_type_) none :replace 60) + (snow-bunny-method-76 (_type_ symbol) none 76) ) ) @@ -131,7 +131,7 @@ ) ) -(defmethod dummy-76 snow-bunny ((obj snow-bunny) (arg0 symbol)) +(defmethod snow-bunny-method-76 snow-bunny ((obj snow-bunny) (arg0 symbol)) (let ((f0-0 -4096.0)) (if arg0 (set! f0-0 -20480.0) @@ -191,15 +191,15 @@ (none) ) -(defmethod dummy-60 snow-bunny ((obj snow-bunny)) +(defmethod snow-bunny-method-60 snow-bunny ((obj snow-bunny)) (initialize-skeleton obj *snow-bunny-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) (none) ) -(defmethod TODO-RENAME-48 snow-bunny ((obj snow-bunny)) - (dummy-60 obj) - (TODO-RENAME-45 obj *snow-bunny-nav-enemy-info*) +(defmethod nav-enemy-method-48 snow-bunny ((obj snow-bunny)) + (snow-bunny-method-60 obj) + (init-defaults! obj *snow-bunny-nav-enemy-info*) (logclear! (-> obj draw shadow-ctrl settings flags) (shadow-flags shdf03)) (cond ((zero? (res-lump-value (-> obj entity) 'mode uint128)) @@ -228,16 +228,16 @@ (defmethod init-from-entity! snow-bunny ((obj snow-bunny) (arg0 entity-actor)) (initialize-collision obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-48 obj) + (nav-enemy-method-48 obj) (if (<= (-> obj path curve num-cverts) 0) (go process-drawable-art-error "no path") ) (set! *snow-bunny* (the-as (pointer snow-bunny) (process->ppointer obj))) - (TODO-RENAME-59 obj) + (nav-enemy-method-59 obj) (none) ) -(defmethod dummy-58 snow-bunny ((obj snow-bunny)) +(defmethod nav-enemy-method-58 snow-bunny ((obj snow-bunny)) (if (not (logtest? (-> *target* state-flags) (state-flags dangerous))) (set! (-> obj last-nondangerous-time) (-> *display* base-frame-counter)) ) @@ -284,7 +284,7 @@ (none) ) -(defmethod dummy-57 snow-bunny ((obj snow-bunny)) +(defmethod snow-bunny-method-57 snow-bunny ((obj snow-bunny)) (if (or (not *target*) (not (logtest? (-> *target* state-flags) (state-flags dangerous)))) (return #f) ) @@ -324,7 +324,7 @@ (defstate nav-enemy-idle (snow-bunny) :virtual #t :enter (behavior () - (dummy-76 self #f) + (snow-bunny-method-76 self #f) (let ((t9-1 (-> (method-of-type nav-enemy nav-enemy-idle) enter))) (if t9-1 (t9-1) @@ -370,7 +370,7 @@ ((< (-> self nav-info notice-distance) f0-0) (go-virtual snow-bunny-patrol-idle) ) - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-notice) ) (else @@ -392,7 +392,7 @@ :event snow-bunny-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (dummy-76 self #f) + (snow-bunny-method-76 self #f) (set! (-> self nav flags) (logior (nav-control-flags navcf19) (-> self nav flags))) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate)) @@ -400,7 +400,7 @@ (none) ) :trans (behavior () - (if (dummy-57 self) + (if (snow-bunny-method-57 self) (go-virtual snow-bunny-defend) ) (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (-> self state-timeout)) @@ -416,13 +416,13 @@ ) ) ) - (dummy-58 self) + (nav-enemy-method-58 self) (none) ) :code (behavior () (let ((gp-0 (nav-enemy-rnd-int-count 3))) (when (and (not (-> self patrol-hop-failed?)) (zero? gp-0)) - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go-virtual snow-bunny-patrol-hop) ) ) @@ -441,7 +441,7 @@ ) (cond ((zero? gp-2) - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go-virtual snow-bunny-patrol-hop) ) ) @@ -457,7 +457,7 @@ :post (the-as (function none :behavior snow-bunny) nav-enemy-simple-post) ) -(defmethod dummy-51 snow-bunny ((obj snow-bunny) (arg0 vector) (arg1 vector)) +(defmethod snow-bunny-method-51 snow-bunny ((obj snow-bunny) (arg0 vector) (arg1 vector)) (let ((s5-0 (new 'stack-no-clear 'vector))) (let* ((s4-0 (new 'stack-no-clear 'collide-tri-result)) (f0-0 (-> obj gnd-popup)) @@ -487,7 +487,7 @@ #t ) -(defmethod dummy-53 snow-bunny ((obj snow-bunny)) +(defmethod nav-enemy-method-53 snow-bunny ((obj snow-bunny)) (let* ((s4-0 (-> obj path curve num-cverts)) (s2-0 (nav-enemy-rnd-int-count s4-0)) (s5-0 (new 'stack-no-clear 'vector)) @@ -496,7 +496,7 @@ (eval-path-curve-div! (-> obj path) s5-0 (the float s2-0) 'interp) (let ((f30-0 (vector-vector-xz-distance s5-0 (-> obj collide-info trans)))) (when (>= f30-0 6144.0) - (when (dummy-51 obj s5-0 s5-0) + (when (snow-bunny-method-51 obj s5-0 s5-0) (set! (-> obj final-dest quad) (-> s5-0 quad)) (set! (-> obj halfway-dist) (* 0.5 f30-0)) (set! (-> obj base-hop-dist) (rand-vu-float-range 6144.0 22118.4)) @@ -510,7 +510,7 @@ #f ) -(defmethod dummy-54 snow-bunny ((obj snow-bunny)) +(defmethod snow-bunny-method-54 snow-bunny ((obj snow-bunny)) (local-vars (sv-48 (function float float))) (set! (-> obj using-jump-event?) #f) (let* ((s5-1 (vector-! (new 'stack-no-clear 'vector) (-> obj final-dest) (-> obj collide-info trans))) @@ -557,7 +557,7 @@ ) ) (set! (-> obj got-jump-event?) #f) - (dummy-11 (-> obj nav) (-> obj nav target-pos)) + (nav-control-method-11 (-> obj nav) (-> obj nav target-pos)) (cond ((-> obj got-jump-event?) (set! (-> obj nav target-pos quad) (-> obj jump-event-dest quad)) @@ -570,7 +570,7 @@ ) (let ((a2-2 (-> obj nav target-pos))) (vector+! a2-2 (-> obj collide-info trans) s5-2) - (if (not (dummy-51 obj a2-2 a2-2)) + (if (not (snow-bunny-method-51 obj a2-2 a2-2)) (return #f) ) ) @@ -585,16 +585,16 @@ :event snow-bunny-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (when (not (dummy-54 self)) + (when (not (snow-bunny-method-54 self)) (set! (-> self patrol-hop-failed?) #t) (go-virtual snow-bunny-patrol-idle) ) - (if (dummy-57 self) + (if (snow-bunny-method-57 self) (go-virtual snow-bunny-defend) ) (set-jump-height-factor! self 0) (snow-bunny-initialize-jump (-> self nav target-pos)) - (dummy-76 self #t) + (snow-bunny-method-76 self #t) (set! (-> self rotate-speed) 728177.75) (set! (-> self turn-time) (seconds 0.1)) (none) @@ -605,13 +605,13 @@ (none) ) :trans (behavior () - (dummy-58 self) + (nav-enemy-method-58 self) (none) ) :code (behavior () (snow-bunny-execute-jump) (if (-> self using-jump-event?) - (set-current-poly! (-> self nav) (dummy-16 (-> self nav) (-> self collide-info trans))) + (set-current-poly! (-> self nav) (nav-control-method-16 (-> self nav) (-> self collide-info trans))) ) (if (or (zero? (nav-enemy-rnd-int-count (-> self patrol-rand-distraction))) (>= 40.96 (vector-vector-distance (-> self final-dest) (-> self collide-info trans))) @@ -634,13 +634,13 @@ (go-virtual nav-enemy-chase) ) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) - (dummy-76 self #t) + (snow-bunny-method-76 self #t) (set-vector! (-> self collide-info transv) 0.0 (nav-enemy-rnd-float-range 102400.0 131072.0) 0.0 1.0) (none) ) :exit (the-as (function none :behavior snow-bunny) #f) :trans (behavior () - (dummy-58 self) + (nav-enemy-method-58 self) (none) ) :code (behavior () @@ -702,7 +702,7 @@ :post (the-as (function none :behavior snow-bunny) #f) ) -(defmethod dummy-52 snow-bunny ((obj snow-bunny)) +(defmethod snow-bunny-method-52 snow-bunny ((obj snow-bunny)) (local-vars (sv-48 (function float float))) (set! (-> obj using-jump-event?) #f) (if (not *target*) @@ -710,7 +710,7 @@ ) (let ((s4-0 (-> obj final-dest))) (set! (-> s4-0 quad) (-> (target-pos 0) quad)) - (if (not (dummy-51 obj s4-0 s4-0)) + (if (not (snow-bunny-method-51 obj s4-0 s4-0)) (return #f) ) (set! (-> obj base-hop-dist) (rand-vu-float-range 18022.4 22118.4)) @@ -747,7 +747,7 @@ ) ) (set! (-> obj got-jump-event?) #f) - (dummy-11 (-> obj nav) (-> obj nav target-pos)) + (nav-control-method-11 (-> obj nav) (-> obj nav target-pos)) (cond ((-> obj got-jump-event?) (set! (-> obj nav target-pos quad) (-> obj jump-event-dest quad)) @@ -760,7 +760,7 @@ ) (let ((a2-3 (-> obj nav target-pos))) (vector+! a2-3 (-> obj collide-info trans) s5-3) - (if (not (dummy-51 obj a2-3 a2-3)) + (if (not (snow-bunny-method-51 obj a2-3 a2-3)) (return #f) ) ) @@ -779,19 +779,19 @@ (if (or (not *target*) (logtest? (-> *target* state-flags) (state-flags do-not-notice))) (go-virtual nav-enemy-patrol) ) - (if (not (TODO-RENAME-46 self (-> self nav-info stop-chase-distance))) + (if (not (target-in-range? self (-> self nav-info stop-chase-distance))) (go-virtual nav-enemy-patrol) ) - (if (dummy-57 self) + (if (snow-bunny-method-57 self) (go-virtual snow-bunny-defend) ) - (when (not (dummy-52 self)) + (when (not (snow-bunny-method-52 self)) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (go-virtual nav-enemy-notice) ) (set-jump-height-factor! self 1) (snow-bunny-initialize-jump (-> self nav target-pos)) - (dummy-76 self #t) + (snow-bunny-method-76 self #t) (set! (-> self rotate-speed) 728177.75) (set! (-> self turn-time) (seconds 0.1)) (none) @@ -802,16 +802,16 @@ (none) ) :trans (behavior () - (if (dummy-57 self) + (if (snow-bunny-method-57 self) (set! (-> self should-retreat?) #t) ) - (dummy-58 self) + (nav-enemy-method-58 self) (none) ) :code (behavior () (snow-bunny-execute-jump) (if (-> self using-jump-event?) - (set-current-poly! (-> self nav) (dummy-16 (-> self nav) (-> self collide-info trans))) + (set-current-poly! (-> self nav) (nav-control-method-16 (-> self nav) (-> self collide-info trans))) ) (if (-> self should-retreat?) (go-virtual snow-bunny-defend) @@ -846,7 +846,7 @@ ) -(defmethod dummy-55 snow-bunny ((obj snow-bunny)) +(defmethod nav-enemy-method-55 snow-bunny ((obj snow-bunny)) (set! (-> obj using-jump-event?) #f) (if (not *target*) (return #f) @@ -854,8 +854,8 @@ (let ((s5-0 (new 'stack-no-clear 'snow-bunny-retreat-work))) (set! (-> s5-0 found-best) #f) (let ((s4-0 (-> obj nav))) - (TODO-RENAME-27 s4-0) - (TODO-RENAME-28 s4-0 (the-as collide-kind -1)) + (nav-control-method-27 s4-0) + (nav-control-method-28 s4-0 (the-as collide-kind -1)) ) (let ((s4-1 (target-pos 0))) (vector-! (-> s5-0 away-vec) (-> obj collide-info trans) s4-1) @@ -919,10 +919,10 @@ ) (set! (-> obj nav target-pos quad) (-> obj final-dest quad)) (set! (-> obj got-jump-event?) #f) - (dummy-13 (-> obj nav) (-> obj nav target-pos) (-> obj nav old-travel)) + (nav-control-method-13 (-> obj nav) (-> obj nav target-pos) (-> obj nav old-travel)) (when (< (vector-xz-length (-> obj nav travel)) 204.8) (let ((s1-4 (new 'stack-no-clear 'nav-gap-info))) - (when (TODO-RENAME-12 (-> obj nav) s1-4) + (when (nav-control-method-12 (-> obj nav) s1-4) (set! (-> obj got-jump-event?) #t) (set! (-> obj jump-event-dest quad) (-> s1-4 dest quad)) ) @@ -943,7 +943,7 @@ (when (>= f30-2 409.6) (let ((s1-5 (-> obj nav target-pos))) (vector+! s1-5 (-> obj collide-info trans) s0-0) - (when (dummy-51 obj s1-5 s1-5) + (when (snow-bunny-method-51 obj s1-5 s1-5) (if (>= f30-2 (+ -409.6 (-> obj base-hop-dist))) (return #t) ) @@ -988,20 +988,20 @@ (when (or (>= (-> *display* base-frame-counter) (-> self retreat-timeout-time)) (not v1-8)) (if (or (not *target*) (logtest? (-> *target* state-flags) (state-flags do-not-notice)) - (not (TODO-RENAME-46 self (-> self nav-info stop-chase-distance))) + (not (target-in-range? self (-> self nav-info stop-chase-distance))) ) (go-virtual nav-enemy-patrol) (go-virtual snow-bunny-chase-hop) ) ) ) - (when (not (dummy-55 self)) + (when (not (nav-enemy-method-55 self)) (set-vector! (-> self nav travel) 0.0 0.0 0.0 1.0) (set! (-> self nav target-pos quad) (-> self collide-info trans quad)) ) (set-jump-height-factor! self 2) (snow-bunny-initialize-jump (-> self nav target-pos)) - (dummy-76 self #t) + (snow-bunny-method-76 self #t) (set! (-> self rotate-speed) 728177.75) (set! (-> self turn-time) (seconds 0.1)) (none) @@ -1012,13 +1012,13 @@ (none) ) :trans (behavior () - (dummy-58 self) + (nav-enemy-method-58 self) (none) ) :code (behavior () (snow-bunny-execute-jump) (if (-> self using-jump-event?) - (set-current-poly! (-> self nav) (dummy-16 (-> self nav) (-> self collide-info trans))) + (set-current-poly! (-> self nav) (nav-control-method-16 (-> self nav) (-> self collide-info trans))) ) (go-virtual snow-bunny-retreat-hop) (none) @@ -1031,14 +1031,14 @@ :event snow-bunny-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (dummy-76 self #f) + (snow-bunny-method-76 self #f) (none) ) :trans (behavior () (if (not *target*) (go-virtual nav-enemy-patrol) ) - (dummy-58 self) + (nav-enemy-method-58 self) (let ((f0-0 (vector-vector-xz-distance (target-pos 0) (-> self collide-info trans)))) (if (< 73728.0 f0-0) (go-virtual snow-bunny-chase-hop) @@ -1048,7 +1048,7 @@ (go-virtual snow-bunny-chase-hop) ) (if (and (logtest? (-> *target* state-flags) (state-flags dangerous)) - (not (TODO-RENAME-46 self (-> self nav-info notice-distance))) + (not (target-in-range? self (-> self nav-info notice-distance))) ) (go-virtual snow-bunny-retreat-hop) ) @@ -1074,7 +1074,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set-vector! (-> self collide-info transv) 0.0 0.0 0.0 1.0) - (dummy-76 self #t) + (snow-bunny-method-76 self #t) (none) ) :trans (behavior () diff --git a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc index 30049b65db..b1600edfcc 100644 --- a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc +++ b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc @@ -430,8 +430,8 @@ (none) ) -(defmethod dummy-26 flutflut-plat ((obj flutflut-plat)) - (let ((t9-0 (method-of-type plat dummy-26))) +(defmethod baseplat-method-26 flutflut-plat ((obj flutflut-plat)) + (let ((t9-0 (method-of-type plat baseplat-method-26))) (t9-0 obj) ) (if (zero? (-> obj link)) @@ -568,7 +568,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) @@ -611,7 +611,7 @@ (quaternion-slerp! (-> self root-override quat) (-> self appear-quat-bottom) (-> self appear-quat-top) f30-0) (set-vector! (-> self draw color-mult) f30-0 f30-0 f30-0 1.0) (when (>= f30-0 1.0) - (dummy-22 self) + (baseplat-method-22 self) (rider-post) (cond ((= (-> self plat-type) 1) @@ -632,7 +632,7 @@ ) ) ) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -644,7 +644,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('untrigger) (go flutflut-plat-hide) @@ -688,7 +688,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('untrigger) (go flutflut-plat-hide) @@ -724,7 +724,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) @@ -771,7 +771,7 @@ (go flutflut-plat-hidden-idle) ) ) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -784,11 +784,11 @@ object (case event-type (('bonk) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('bounce) (if (not (and (-> self entity) (logtest? (-> self entity extra perm status) (entity-perm-status complete)))) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) ) (('ridden) @@ -806,7 +806,7 @@ ) :trans (behavior () (plat-trans) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -817,21 +817,21 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) ) :trans (behavior () (when (= (-> self path-pos) 1.0) - (dummy-22 self) + (baseplat-method-22 self) (go elevator-idle-at-fort) ) ;; PAL patch here (seek! (-> self path-pos) 1.0 (* 0.16 (-> *display* seconds-per-frame))) (eval-path-curve! (-> self path) (-> self basetrans) (-> self path-pos) 'interp) (plat-trans) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -842,7 +842,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) @@ -864,7 +864,7 @@ ) ) (plat-trans) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -875,21 +875,21 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) ) :trans (behavior () (when (= (-> self path-pos) 0.0) - (dummy-22 self) + (baseplat-method-22 self) (go elevator-idle-at-cave) ) ;; PAL patch here (seek! (-> self path-pos) 0.0 (* 0.16 (-> *display* seconds-per-frame))) (eval-path-curve! (-> self path) (-> self basetrans) (-> self path-pos) 'interp) (plat-trans) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -927,14 +927,14 @@ *flutflut-plat-small-sg* ) -(defmethod TODO-RENAME-25 flutflut-plat-small ((obj flutflut-plat-small)) +(defmethod baseplat-method-25 flutflut-plat-small ((obj flutflut-plat-small)) (let ((v0-0 (create-launch-control (-> *part-group-id-table* 516) obj))) (set! (-> obj part) v0-0) (the-as sparticle-launch-group v0-0) ) ) -(defmethod dummy-20 flutflut-plat-small ((obj flutflut-plat-small)) +(defmethod baseplat-method-20 flutflut-plat-small ((obj flutflut-plat-small)) (when (nonzero? (-> obj part)) (set! (-> *part-id-table* 2087 init-specs 12 initial-valuef) (-> obj part-ry)) (set! (-> *part-id-table* 2088 init-specs 17 initial-valuef) (-> obj part-ry)) @@ -943,15 +943,15 @@ (none) ) -(defmethod dummy-26 flutflut-plat-small ((obj flutflut-plat-small)) - (let ((t9-0 (method-of-type flutflut-plat dummy-26))) +(defmethod baseplat-method-26 flutflut-plat-small ((obj flutflut-plat-small)) + (let ((t9-0 (method-of-type flutflut-plat baseplat-method-26))) (t9-0 obj) ) (set! (-> obj part-ry) (+ 16384.0 (quaternion-y-angle (-> obj root-override quat)))) (none) ) -(defmethod dummy-24 flutflut-plat-small ((obj flutflut-plat-small)) +(defmethod baseplat-method-24 flutflut-plat-small ((obj flutflut-plat-small)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -980,14 +980,14 @@ *flutflut-plat-med-sg* ) -(defmethod TODO-RENAME-25 flutflut-plat-med ((obj flutflut-plat-med)) +(defmethod baseplat-method-25 flutflut-plat-med ((obj flutflut-plat-med)) (let ((v0-0 (create-launch-control (-> *part-group-id-table* 517) obj))) (set! (-> obj part) v0-0) (the-as sparticle-launch-group v0-0) ) ) -(defmethod dummy-24 flutflut-plat-med ((obj flutflut-plat-med)) +(defmethod baseplat-method-24 flutflut-plat-med ((obj flutflut-plat-med)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1016,14 +1016,14 @@ *flutflut-plat-large-sg* ) -(defmethod TODO-RENAME-25 flutflut-plat-large ((obj flutflut-plat-large)) +(defmethod baseplat-method-25 flutflut-plat-large ((obj flutflut-plat-large)) (let ((v0-0 (create-launch-control (-> *part-group-id-table* 518) obj))) (set! (-> obj part) v0-0) (the-as sparticle-launch-group v0-0) ) ) -(defmethod dummy-20 flutflut-plat-large ((obj flutflut-plat-large)) +(defmethod baseplat-method-20 flutflut-plat-large ((obj flutflut-plat-large)) (when (nonzero? (-> obj part)) (set! (-> *part-id-table* 2091 init-specs 12 initial-valuef) (-> obj part-ry)) (set! (-> *part-id-table* 2092 init-specs 17 initial-valuef) (-> obj part-ry)) @@ -1032,15 +1032,15 @@ (none) ) -(defmethod dummy-26 flutflut-plat-large ((obj flutflut-plat-large)) - (let ((t9-0 (method-of-type flutflut-plat dummy-26))) +(defmethod baseplat-method-26 flutflut-plat-large ((obj flutflut-plat-large)) + (let ((t9-0 (method-of-type flutflut-plat baseplat-method-26))) (t9-0 obj) ) (set! (-> obj part-ry) (+ 16384.0 (quaternion-y-angle (-> obj root-override quat)))) (none) ) -(defmethod dummy-24 flutflut-plat-large ((obj flutflut-plat-large)) +(defmethod baseplat-method-24 flutflut-plat-large ((obj flutflut-plat-large)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) diff --git a/goal_src/jak1/levels/snow/snow-obs.gc b/goal_src/jak1/levels/snow/snow-obs.gc index f02a9924e3..d16cb3b3d9 100644 --- a/goal_src/jak1/levels/snow/snow-obs.gc +++ b/goal_src/jak1/levels/snow/snow-obs.gc @@ -648,7 +648,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (baseplat-method-22 self) (sound-play "snow-spat-short" :vol 75 :pitch 0.75) ) ) @@ -721,7 +721,7 @@ (logior! (-> obj skel status) (janim-status inited)) (load-params! (-> obj sync) obj (the-as uint 1500) 0.0 0.15 0.15) (quaternion->matrix (-> obj startmat) (-> obj root-override quat)) - (dummy-21 obj) + (baseplat-method-21 obj) (go snow-spatula-idle) (none) ) @@ -1097,7 +1097,7 @@ :size-assert #xb0 :flag-assert #x15004000b0 (:methods - (TODO-RENAME-20 (_type_) none 20) + (snow-gears-method-20 (_type_) none 20) ) (:states snow-gears-activate @@ -1180,7 +1180,7 @@ :init-specs ((sp-flt spt-fade-a -0.14222223)) ) -(defmethod TODO-RENAME-20 snow-gears ((obj snow-gears)) +(defmethod snow-gears-method-20 snow-gears ((obj snow-gears)) (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> obj root trans quad)) (set! (-> a1-0 y) (+ 61440.0 (-> a1-0 y))) @@ -1212,7 +1212,7 @@ (defstate snow-gears-activate (snow-gears) :trans (behavior () - (TODO-RENAME-20 self) + (snow-gears-method-20 self) (none) ) :code (behavior () @@ -1246,7 +1246,7 @@ (none) ) :trans (behavior () - (TODO-RENAME-20 self) + (snow-gears-method-20 self) (none) ) :code (behavior () diff --git a/goal_src/jak1/levels/snow/snow-ram-boss.gc b/goal_src/jak1/levels/snow/snow-ram-boss.gc index 60800f3a4b..1f6a48ab2f 100644 --- a/goal_src/jak1/levels/snow/snow-ram-boss.gc +++ b/goal_src/jak1/levels/snow/snow-ram-boss.gc @@ -53,9 +53,9 @@ :size-assert #x1f4 :flag-assert #x4c019001f4 (:methods - (dummy-51 (_type_ vector) symbol :replace 51) - (dummy-52 (_type_) symbol :replace 52) - (dummy-57 (_type_ float) float :replace 57) + (ram-boss-method-51 (_type_ vector) symbol :replace 51) + (ram-boss-method-52 (_type_) symbol :replace 52) + (ram-boss-method-57 (_type_ float) float :replace 57) ) (:states (ram-boss-already-down basic) @@ -458,7 +458,7 @@ :parts ((sp-item 1914)) ) -(defmethod dummy-24 ram-boss-proj ((obj ram-boss-proj)) +(defmethod projectile-method-24 ram-boss-proj ((obj ram-boss-proj)) (with-pp (quaternion-rotate-local-x! (-> obj root-override quat) @@ -535,13 +535,13 @@ (none) ) -(defmethod dummy-25 ram-boss-proj ((obj ram-boss-proj)) +(defmethod projectile-method-25 ram-boss-proj ((obj ram-boss-proj)) (go ram-boss-proj-growing) 0 (none) ) -(defmethod dummy-26 ram-boss-proj ((obj ram-boss-proj)) +(defmethod projectile-method-26 ram-boss-proj ((obj ram-boss-proj)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) projectile-collision-reaction) @@ -567,7 +567,7 @@ (none) ) -(defmethod dummy-27 ram-boss-proj ((obj ram-boss-proj)) +(defmethod projectile-method-27 ram-boss-proj ((obj ram-boss-proj)) (set! (-> obj charge-sound-id) (new 'static 'sound-id)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 521) obj)) (set! (-> obj part2) (create-launch-control (-> *part-group-id-table* 522) obj)) @@ -603,7 +603,7 @@ (the-as ram-boss-proj ((method-of-type projectile relocate) obj arg0)) ) -(defmethod dummy-28 ram-boss-proj ((obj ram-boss-proj)) +(defmethod projectile-method-28 ram-boss-proj ((obj ram-boss-proj)) (when (and *target* (not (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) @@ -653,7 +653,7 @@ (sound-stop (-> self charge-sound-id)) (go-virtual projectile-dissipate) ) - (dummy-54 (-> gp-1 0) (-> self root-override trans)) + (nav-enemy-method-54 (-> gp-1 0) (-> self root-override trans)) (update-transforms! (-> self root-override)) (cond ((-> gp-1 0 proj-stoked) @@ -1053,7 +1053,7 @@ (none) ) -(defmethod dummy-52 ram-boss ((obj ram-boss)) +(defmethod ram-boss-method-52 ram-boss ((obj ram-boss)) (let ((v1-1 (the-as basic (-> obj collide-info root-prim)))) (set-vector! (-> (the-as collide-shape-prim v1-1) local-sphere) 0.0 8192.0 0.0 13516.8) (set-vector! (-> (the-as (array collide-shape-prim) v1-1) 16 local-sphere) 0.0 4096.0 0.0 4505.6) @@ -1074,7 +1074,7 @@ ) ) -(defmethod dummy-53 ram-boss ((obj ram-boss)) +(defmethod nav-enemy-method-53 ram-boss ((obj ram-boss)) (let ((v1-1 (the-as (array collide-shape-prim) (-> obj collide-info root-prim)))) (let ((a0-1 (-> v1-1 16))) (set! (-> a0-1 prim-core offense) (collide-offense touch)) @@ -1095,10 +1095,10 @@ (the-as symbol 0) ) -(defmethod TODO-RENAME-48 ram-boss ((obj ram-boss)) +(defmethod nav-enemy-method-48 ram-boss ((obj ram-boss)) (initialize-skeleton obj *ram-boss-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) - (TODO-RENAME-45 obj *ram-boss-nav-enemy-info*) + (init-defaults! obj *ram-boss-nav-enemy-info*) (logclear! (-> obj enemy-info options) (fact-options has-power-cell)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 525) obj)) (set! (-> obj part2) (create-launch-control (-> *part-group-id-table* 574) obj)) @@ -1107,7 +1107,7 @@ (set! (-> obj has-shield?) #t) (when (nonzero? (-> obj entity extra perm user-int8 1)) (set! (-> obj has-shield?) #f) - (TODO-RENAME-49 obj *ram-boss-nav-enemy-info-no-shield*) + (init-jm! obj *ram-boss-nav-enemy-info-no-shield*) (let ((v1-23 (-> obj shield-jmod))) (set! (-> v1-23 enable) #t) (set! (-> v1-23 transform scale quad) (the-as uint128 0)) @@ -1130,7 +1130,7 @@ (set! (-> self nav-enemy-patrol-timeout) (seconds 1)) (initialize-collision self) (set! (-> self entity) (-> arg1 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (set! (-> self collide-info trans quad) (-> arg1 collide-info trans quad)) (set-vector! (-> self collide-info scale) 1.0 1.0 1.0 1.0) (let ((t9-2 quaternion-copy!) @@ -1151,7 +1151,7 @@ (none) ) -(defmethod dummy-54 ram-boss ((obj ram-boss) (arg0 vector)) +(defmethod nav-enemy-method-54 ram-boss ((obj ram-boss) (arg0 vector)) (let ((a2-0 (-> obj node-list data 18 bone transform))) (set-vector! arg0 0.0 0.0 -2457.6 1.0) (vector-matrix*! arg0 arg0 a2-0) @@ -1159,7 +1159,7 @@ (the-as symbol (vector-float*! arg0 arg0 (/ 1.0 (-> arg0 w)))) ) -(defmethod dummy-55 ram-boss ((obj ram-boss)) +(defmethod nav-enemy-method-55 ram-boss ((obj ram-boss)) (if (not *target*) (return #f) ) @@ -1195,7 +1195,7 @@ ) ) -(defmethod dummy-51 ram-boss ((obj ram-boss) (arg0 vector)) +(defmethod ram-boss-method-51 ram-boss ((obj ram-boss) (arg0 vector)) (let* ((f30-0 (quaternion-y-angle (-> obj collide-info quat))) (f0-2 (atan (-> arg0 x) (-> arg0 z))) (f0-3 (deg- f30-0 f0-2)) @@ -1310,7 +1310,7 @@ ) ) :enter (behavior ((arg0 basic)) - (dummy-52 self) + (ram-boss-method-52 self) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) (let ((s5-0 (new 'stack-no-clear 'vector)) (gp-0 (-> self node-list data 0 bone transform)) @@ -1393,7 +1393,7 @@ (defstate ram-boss-already-down (ram-boss) :code (behavior ((arg0 basic)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) - (dummy-52 self) + (ram-boss-method-52 self) (let ((a1-0 (new 'stack-no-clear 'vector)) (a2-0 (-> self parent-override 0 node-list data 0 bone transform)) ) @@ -1413,7 +1413,7 @@ (defstate ram-boss-nav-start (ram-boss) :code (behavior () - (let ((a1-1 (dummy-16 (-> self nav) (-> self collide-info trans)))) + (let ((a1-1 (nav-control-method-16 (-> self nav) (-> self collide-info trans)))) (when (not a1-1) (go process-drawable-art-error "not on nav mesh") (return #f) @@ -1434,10 +1434,10 @@ ((>= 18432.0 f30-0) (go ram-boss-tracking) ) - ((not (TODO-RENAME-46 self 237568.0)) + ((not (target-in-range? self 237568.0)) (go-virtual nav-enemy-patrol) ) - ((and (< f30-0 106496.0) (dummy-55 self)) + ((and (< f30-0 106496.0) (nav-enemy-method-55 self)) (go-virtual nav-enemy-attack) ) ((< f30-0 237568.0) @@ -1494,10 +1494,10 @@ (go ram-boss-tracking) ) (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (-> self reaction-time)) - (if (not (TODO-RENAME-46 self (-> self nav-info stop-chase-distance))) + (if (not (target-in-range? self (-> self nav-info stop-chase-distance))) (go-virtual nav-enemy-patrol) ) - (if (and (>= 73728.0 f30-0) (dummy-55 self)) + (if (and (>= 73728.0 f30-0) (nav-enemy-method-55 self)) (go-virtual nav-enemy-attack) ) ) @@ -1527,7 +1527,7 @@ ) ) -(defmethod dummy-57 ram-boss ((obj ram-boss) (arg0 float)) +(defmethod ram-boss-method-57 ram-boss ((obj ram-boss) (arg0 float)) (let ((f0-0 0.0)) (when *target* (let ((s3-0 (new 'stack-no-clear 'vector))) @@ -1601,7 +1601,7 @@ (go-virtual nav-enemy-chase) ) ((< 18432.0 f0-10) - (if (not (dummy-55 self)) + (if (not (nav-enemy-method-55 self)) (go-virtual nav-enemy-chase) ) (when (>= (-> self frustration) 256) @@ -1622,13 +1622,13 @@ (let ((gp-2 (new 'stack-no-clear 'vector)) (s5-2 (new 'stack-no-clear 'vector)) ) - (dummy-54 self s5-2) + (nav-enemy-method-54 self s5-2) (set! (-> gp-2 quad) (-> (target-pos 0) quad)) (set! (-> gp-2 y) (+ 4915.2 (-> gp-2 y))) (vector-! (-> self proj-launch-vec) gp-2 s5-2) ) (vector-normalize! (-> self proj-launch-vec) 1.0) - (if (not (dummy-51 self (-> self proj-launch-vec))) + (if (not (ram-boss-method-51 self (-> self proj-launch-vec))) (go ram-boss-throw) ) ) @@ -1638,7 +1638,7 @@ :code (behavior () (let ((f30-0 -1.0)) (loop - (set! f30-0 (dummy-57 self f30-0)) + (set! f30-0 (ram-boss-method-57 self f30-0)) (cond ((< 5461.3335 (-> self last-turn-speed)) (cond @@ -1820,8 +1820,8 @@ :enter (behavior () (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) (nav-enemy-neck-control-inactive) - (dummy-53 self) - (TODO-RENAME-49 self *ram-boss-nav-enemy-info-no-shield*) + (nav-enemy-method-53 self) + (init-jm! self *ram-boss-nav-enemy-info-no-shield*) (none) ) :exit (behavior () @@ -1858,7 +1858,7 @@ ) :post (behavior () (compute-alignment! (-> self align)) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (align-vel-and-quat-only! (-> self align) (align-opts adjust-xz-vel) diff --git a/goal_src/jak1/levels/snow/snow-ram-h.gc b/goal_src/jak1/levels/snow/snow-ram-h.gc index 16c84f3856..51a845c283 100644 --- a/goal_src/jak1/levels/snow/snow-ram-h.gc +++ b/goal_src/jak1/levels/snow/snow-ram-h.gc @@ -21,9 +21,9 @@ :size-assert #xe0 :flag-assert #x17007000e0 (:methods - (dummy-20 (_type_) object 20) - (dummy-21 (_type_) object 21) - (dummy-22 (_type_) symbol 22) + (ram-method-20 (_type_) object 20) + (ram-method-21 (_type_) object 21) + (ram-method-22 (_type_) symbol 22) ) (:states ram-fun-idle @@ -31,10 +31,3 @@ ram-idle ) ) - - -0 - - - - diff --git a/goal_src/jak1/levels/snow/snow-ram.gc b/goal_src/jak1/levels/snow/snow-ram.gc index 110fb95a1f..b6e045d13c 100644 --- a/goal_src/jak1/levels/snow/snow-ram.gc +++ b/goal_src/jak1/levels/snow/snow-ram.gc @@ -109,7 +109,7 @@ ) ) -(defmethod dummy-20 ram ((obj ram)) +(defmethod ram-method-20 ram ((obj ram)) (let ((gp-0 (-> obj part))) (when (nonzero? gp-0) (let ((a2-0 (-> obj node-list data 8 bone transform)) @@ -124,7 +124,7 @@ ) ) -(defmethod dummy-21 ram ((obj ram)) +(defmethod ram-method-21 ram ((obj ram)) (let ((gp-0 (-> obj part2))) (let ((s3-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) @@ -155,7 +155,7 @@ ) ) -(defmethod dummy-22 ram ((obj ram)) +(defmethod ram-method-22 ram ((obj ram)) (process-entity-status! obj (entity-perm-status complete) #t) (let ((v1-0 (alt-actor-list-subtask-incomplete-count obj))) (cond @@ -180,18 +180,18 @@ ) (defstate ram-idle (ram) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch 'attack) (if ((method-of-type touching-shapes-entry prims-touching?) - (the-as touching-shapes-entry (-> arg3 param 0)) + (the-as touching-shapes-entry (-> event param 0)) (-> self root-override) (the-as uint 1) ) (send-event - arg0 + proc 'attack - (-> arg3 param 0) + (-> event param 0) (static-attack-info ((shove-up (meters 0.5)) (shove-back (meters 2)))) ) ) @@ -227,10 +227,10 @@ (let ((f30-0 (ja-aframe-num 0))) (when (and (not gp-1) (>= f30-0 61.0)) (set! gp-1 #t) - (dummy-20 self) + (ram-method-20 self) ) (if (and (>= f30-0 62.0) (< f30-0 97.0)) - (dummy-21 self) + (ram-method-21 self) ) ) (suspend) @@ -255,11 +255,11 @@ ) (defstate ram-fun-idle (ram) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('notify) - (when (= (-> arg0 type) ram-boss) - (if (dummy-22 self) + (when (= (-> proc type) ram-boss) + (if (ram-method-22 self) (go ram-give-fuel-cell) ) ) @@ -287,10 +287,10 @@ ) (defstate ram-give-fuel-cell (ram) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('notify) - (if (and (= (-> arg0 type) snowcam) (= (-> arg3 param 0) 'die)) + (if (and (= (-> proc type) snowcam) (= (-> event param 0) 'die)) (go ram-fun-idle) ) ) @@ -473,7 +473,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/snow/yeti.gc b/goal_src/jak1/levels/snow/yeti.gc index 190d702e82..533bfc31f4 100644 --- a/goal_src/jak1/levels/snow/yeti.gc +++ b/goal_src/jak1/levels/snow/yeti.gc @@ -42,7 +42,7 @@ :size-assert #xc8 :flag-assert #x16006000c8 (:methods - (TODO-RENAME-20 (_type_ vector vector) symbol 20) + (yeti-method-20 (_type_ vector vector) symbol 20) (aggro? (_type_ vector) symbol 21) ) (:states @@ -270,7 +270,7 @@ (suspend) (ja :num! (seek! max 0.5)) ) - (if (TODO-RENAME-46 self (-> self nav-info notice-distance)) + (if (target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) (go-virtual nav-enemy-idle) ) @@ -531,10 +531,10 @@ (none) ) -(defmethod TODO-RENAME-48 yeti-slave ((obj yeti-slave)) +(defmethod nav-enemy-method-48 yeti-slave ((obj yeti-slave)) (initialize-skeleton obj *yeti-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) - (TODO-RENAME-45 obj *yeti-nav-enemy-info*) + (init-defaults! obj *yeti-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) (set! (-> obj neck ear) (the-as uint 2)) @@ -565,7 +565,7 @@ (vector-identity! (-> self collide-info scale)) (forward-up->quaternion (-> self collide-info quat) arg3 *up-vector*) (set! (-> self entity) (-> arg1 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (if arg4 (go-virtual nav-enemy-idle) (go yeti-slave-appear-jump-up) @@ -592,7 +592,7 @@ #t ) -(defmethod TODO-RENAME-20 yeti ((obj yeti) (arg0 vector) (arg1 vector)) +(defmethod yeti-method-20 yeti ((obj yeti) (arg0 vector) (arg1 vector)) (let ((s3-0 (-> obj path curve num-cverts))) (if (<= s3-0 0) (return #f) @@ -654,7 +654,7 @@ (let ((s5-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) ) - (if (not (TODO-RENAME-20 self s5-0 s4-0)) + (if (not (yeti-method-20 self s5-0 s4-0)) (go yeti-idle) ) (process-spawn yeti-slave (-> self entity) self s5-0 s4-0 #t :to self) @@ -692,7 +692,7 @@ (let ((gp-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'vector)) ) - (when (TODO-RENAME-20 self gp-0 s5-0) + (when (yeti-method-20 self gp-0 s5-0) (process-spawn yeti-slave (-> self entity) self gp-0 s5-0 #f :to self) (set! (-> self spawn-delay) 0) 0 @@ -722,7 +722,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/bully.gc b/goal_src/jak1/levels/sunken/bully.gc index 60154b300f..5c1c9c7b84 100644 --- a/goal_src/jak1/levels/sunken/bully.gc +++ b/goal_src/jak1/levels/sunken/bully.gc @@ -46,7 +46,7 @@ :size-assert #xf4 :flag-assert #x15009000f4 (:methods - (dummy-20 (_type_) float 20) + (bully-method-20 (_type_) float 20) ) (:states bully-die @@ -251,52 +251,74 @@ ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 248] (defbehavior bully-default-event-handler bully ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) (local-vars (v0-0 none)) - (let ((v1-0 arg2)) - (the-as - object - (when (or (= v1-0 'touch) (= v1-0 'touched) (= v1-0 'attack)) - (cond - ((= (-> arg0 type) bully) - (let ((v1-3 (new 'stack-no-clear 'vector))) - (vector-! v1-3 (-> self root-override trans) (-> (the-as process-drawable arg0) root trans)) - (set! (-> self travel-ry) (atan (-> v1-3 x) (-> v1-3 z))) + (the-as + object + (case arg2 + (('touch 'touched 'attack) + (cond + ((= (-> arg0 type) bully) + (let ((v1-3 (new 'stack-no-clear 'vector))) + (vector-! v1-3 (-> self root-override trans) (-> (the-as process-drawable arg0) root trans)) + (set! (-> self travel-ry) (atan (-> v1-3 x) (-> v1-3 z))) + ) + (set! (-> self bounced?) #t) + (set! v0-0 (the-as none 100)) + (set! (-> self bounce-volume) (the-as int v0-0)) + v0-0 + ) + ((= (-> arg0 type) target) + (cond + ((= (-> arg3 param 1) 'flop) + (go bully-die) + (return (the-as object #t)) + v0-0 ) - (set! (-> self bounced?) #t) - (set! v0-0 (the-as none 100)) - (set! (-> self bounce-volume) (the-as int v0-0)) - v0-0 - ) - ((= (-> arg0 type) target) - (cond - ((= (-> arg3 param 1) 'flop) - (go bully-die) - (return (the-as object #t)) - v0-0 - ) - ((or (= arg2 'touch) (= arg2 'attack)) - (cond - ((>= (- (-> (target-pos 0) y) (-> self root-override trans y)) 6144.0) - (let* ((f0-6 (fmax 0.6 (* 0.000023935356 (-> self travel-speed)))) - (f28-0 (* 8192.0 f0-6)) - (f30-0 (* 8192.0 f0-6)) - (s4-0 (new 'stack-no-clear 'vector)) - ) - (vector-! s4-0 (target-pos 0) (-> self root-override trans)) - (let ((f26-0 (atan (-> s4-0 x) (-> s4-0 z)))) - (when (< 0.0 (-> self travel-speed)) - (let ((f0-11 (deg- f26-0 (-> self travel-ry)))) - (if (< (fabs f0-11) 8192.0) - (set! f26-0 (if (>= f0-11 0.0) - (+ 8192.0 f26-0) - (+ -8192.0 f26-0) - ) - ) - ) - ) + ((or (= arg2 'touch) (= arg2 'attack)) + (cond + ((>= (- (-> (target-pos 0) y) (-> self root-override trans y)) 6144.0) + (let* ((f0-6 (fmax 0.6 (* 0.000023935356 (-> self travel-speed)))) + (f28-0 (* 8192.0 f0-6)) + (f30-0 (* 8192.0 f0-6)) + (s4-0 (new 'stack-no-clear 'vector)) ) - (set-vector! s4-0 (* (sin f26-0) f28-0) 0.0 (* (cos f26-0) f28-0) 1.0) - ) - (when (send-event arg0 'shove (-> arg3 param 0) (static-attack-info ((shove-up f30-0) (vector s4-0)))) + (vector-! s4-0 (target-pos 0) (-> self root-override trans)) + (let ((f26-0 (atan (-> s4-0 x) (-> s4-0 z)))) + (when (< 0.0 (-> self travel-speed)) + (let ((f0-11 (deg- f26-0 (-> self travel-ry)))) + (if (< (fabs f0-11) 8192.0) + (set! f26-0 (if (>= f0-11 0.0) + (+ 8192.0 f26-0) + (+ -8192.0 f26-0) + ) + ) + ) + ) + ) + (set-vector! s4-0 (* (sin f26-0) f28-0) 0.0 (* (cos f26-0) f28-0) 1.0) + ) + (when (send-event arg0 'shove (-> arg3 param 0) (static-attack-info ((shove-up f30-0) (vector s4-0)))) + (level-hint-spawn + (game-text-id sunken-bully-dive-hint) + "sksp0131" + (the-as entity #f) + *entity-pool* + (game-task none) + ) + (set! (-> self bounced?) #t) + (set! v0-0 (the-as none 100)) + (set! (-> self bounce-volume) (the-as int v0-0)) + v0-0 + ) + ) + ) + (else + (let ((f0-21 (fmax 0.6 (* 0.000023935356 (-> self travel-speed))))) + (when (send-event + arg0 + 'attack + (-> arg3 param 0) + (static-attack-info ((shove-up (* 12288.0 f0-21)) (shove-back (* 16384.0 f0-21)))) + ) (level-hint-spawn (game-text-id sunken-bully-dive-hint) "sksp0131" @@ -304,66 +326,44 @@ *entity-pool* (game-task none) ) + (set! (-> self hit-player?) #t) (set! (-> self bounced?) #t) - (set! v0-0 (the-as none 100)) - (set! (-> self bounce-volume) (the-as int v0-0)) - v0-0 + (set! (-> self bounce-volume) 100) + (set! (-> self hit-player-time) (-> *display* base-frame-counter)) + (set-collide-offense (-> self root-override) 2 (collide-offense no-offense)) ) ) ) - (else - (let ((f0-21 (fmax 0.6 (* 0.000023935356 (-> self travel-speed))))) - (when (send-event - arg0 - 'attack - (-> arg3 param 0) - (static-attack-info ((shove-up (* 12288.0 f0-21)) (shove-back (* 16384.0 f0-21)))) - ) - (level-hint-spawn - (game-text-id sunken-bully-dive-hint) - "sksp0131" - (the-as entity #f) - *entity-pool* - (game-task none) - ) - (set! (-> self hit-player?) #t) - (set! (-> self bounced?) #t) - (set! (-> self bounce-volume) 100) - (set! (-> self hit-player-time) (-> *display* base-frame-counter)) - (set-collide-offense (-> self root-override) 2 (collide-offense no-offense)) - ) - ) - ) - ) - ) + ) ) - ) - (else - (when (= arg2 'touched) - (cond - ((= (-> arg0 type) target) - (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode 'explode)))) - ) - (else - (let ((a1-14 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-14 from) self) - (set! (-> a1-14 num-params) 4) - (set! (-> a1-14 message) 'attack) - (set! (-> a1-14 param 0) (-> arg3 param 0)) - (set! (-> a1-14 param 1) (the-as uint 'explode)) - (let ((v1-48 (+ *global-attack-id* 1))) - (set! *global-attack-id* v1-48) - (set! (-> a1-14 param 2) (the-as uint v1-48)) - ) - (set! (-> a1-14 param 3) (the-as uint 0)) - (send-event-function arg0 a1-14) - ) - ) - ) - ) ) ) - ) + (else + (when (= arg2 'touched) + (cond + ((= (-> arg0 type) target) + (send-event arg0 'attack (-> arg3 param 0) (static-attack-info ((mode 'explode)))) + ) + (else + (let ((a1-14 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-14 from) self) + (set! (-> a1-14 num-params) 4) + (set! (-> a1-14 message) 'attack) + (set! (-> a1-14 param 0) (-> arg3 param 0)) + (set! (-> a1-14 param 1) (the-as uint 'explode)) + (let ((v1-48 (+ *global-attack-id* 1))) + (set! *global-attack-id* v1-48) + (set! (-> a1-14 param 2) (the-as uint v1-48)) + ) + (set! (-> a1-14 param 3) (the-as uint 0)) + (send-event-function arg0 a1-14) + ) + ) + ) + ) + ) + ) + ) ) ) ) @@ -371,10 +371,10 @@ (defbehavior bully-post bully () (when (and (-> self hit-player?) (or (not *target*) - (and (zero? (logand (-> *target* state-flags) + (and (not (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) ) - ) + ) (>= (- (-> *display* base-frame-counter) (-> self hit-player-time)) (seconds 0.05)) ) ) @@ -386,7 +386,7 @@ (none) ) -(defmethod dummy-20 bully ((obj bully)) +(defmethod bully-method-20 bully ((obj bully)) (local-vars (at-0 int)) (rlet ((vf0 :class vf) (vf1 :class vf) @@ -401,7 +401,7 @@ 1.0 ) (let ((s5-1 #f)) - (TODO-RENAME-28 (-> obj nav) (collide-kind wall-object ground-object)) + (nav-control-method-28 (-> obj nav) (collide-kind wall-object ground-object)) (let ((v1-4 (-> obj nav travel))) (.lvf vf1 (&-> (-> obj root-override transv) quad)) (let ((f0-8 (-> *display* seconds-per-frame))) @@ -413,7 +413,7 @@ (.svf (&-> v1-4 quad) vf1) ) (let ((s4-0 (new 'stack-no-clear 'check-vector-collision-with-nav-spheres-info))) - (when (>= (dummy-23 (-> obj nav) (-> obj nav travel) s4-0) 0.0) + (when (>= (nav-control-method-23 (-> obj nav) (-> obj nav travel) s4-0) 0.0) (let ((s5-2 (new 'stack-no-clear 'vector))) (set! (-> s5-2 quad) (-> s4-0 normal quad)) (set! (-> s5-2 y) 0.0) @@ -431,7 +431,7 @@ (when (not s5-1) (vector-normalize-copy! (-> obj nav travel) (-> obj root-override transv) 2048.0) (let ((s5-3 (new 'stack 'clip-travel-vector-to-mesh-return-info))) - (dummy-24 (-> obj nav) 2048.0 s5-3) + (nav-control-method-24 (-> obj nav) 2048.0 s5-3) (when (and (-> s5-3 found-boundary) (>= (* (-> obj travel-speed) (-> *display* seconds-per-frame)) (vector-vector-xz-distance (-> s5-3 intersection) (-> obj root-override trans)) @@ -453,10 +453,7 @@ ) ) ) - (let ((f0-25 (+ -36864.0 (-> obj root-override transv y)))) - (set! (-> obj root-override transv y) f0-25) - f0-25 - ) + (set! (-> obj root-override transv y) (+ -36864.0 (-> obj root-override transv y))) ) ) @@ -611,7 +608,7 @@ (set! (-> self travel-speed) (* 41779.2 (-> self speed-u))) (+! (-> self facing-ry) (* (-> self spin-vel) (-> *display* seconds-per-frame))) (quaternion-axis-angle! (-> self root-override quat) 0.0 1.0 0.0 (-> self facing-ry)) - (dummy-20 self) + (bully-method-20 self) (integrate-for-enemy-with-move-to-ground! (-> self root-override) (-> self root-override transv) @@ -621,7 +618,7 @@ #f #f ) - (TODO-RENAME-27 (-> self nav)) + (nav-control-method-27 (-> self nav)) (none) ) :code (behavior () @@ -837,7 +834,3 @@ (go bully-idle #t) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/double-lurker.gc b/goal_src/jak1/levels/sunken/double-lurker.gc index 7fcf1c3e08..c94bd17da2 100644 --- a/goal_src/jak1/levels/sunken/double-lurker.gc +++ b/goal_src/jak1/levels/sunken/double-lurker.gc @@ -42,7 +42,7 @@ :flag-assert #x4c014001a8 (:methods (initialize-collision (_type_) collide-shape-moving :replace 47) - (dummy-53 (_type_ vector) symbol :replace 53) + (double-lurker-method-53 (_type_ vector) symbol :replace 53) ) (:states double-lurker-both-knocked-back @@ -239,18 +239,18 @@ ) (defstate double-lurker-top-on-shoulders (double-lurker-top) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) (let ((v1-1 (-> self fall-dest)) - (a0-4 (-> (the-as vector (-> arg3 param 0)) quad)) + (a0-4 (-> (the-as vector (-> event param 0)) quad)) ) (set! (-> v1-1 quad) a0-4) - (go double-lurker-top-knocked-down a0-4 (the-as vector arg1) (the-as vector arg2)) + (go double-lurker-top-knocked-down a0-4 (the-as vector arg1) (the-as vector event-type)) ) ) (('instant-death) - (let ((v1-3 (the-as object (-> arg3 param 0)))) + (let ((v1-3 (the-as object (-> event param 0)))) (quaternion-axis-angle! (-> self collide-info quat) 0.0 @@ -293,20 +293,20 @@ ) (defstate double-lurker-top-knocked-down (double-lurker-top) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch) (send-event - arg0 + proc 'shove - (-> arg3 param 0) + (-> event param 0) (static-attack-info ((shove-up (meters 3)) (shove-back (meters 2)))) ) ) ) ) :code (behavior ((arg0 object) (arg1 vector) (arg2 vector)) - (dummy-51 self) + (nav-enemy-method-51 self) (let ((v1-3 (-> self draw shadow-ctrl))) (logclear! (-> v1-3 settings flags) (shadow-flags disable-draw)) ) @@ -332,7 +332,7 @@ ) (logior! (-> self collide-info nav-flags) (nav-flags navf0)) (logclear! (-> self collide-info nav-flags) (nav-flags navf1)) - (TODO-RENAME-27 (-> self nav)) + (nav-control-method-27 (-> self nav)) (go double-lurker-top-resume) (none) ) @@ -345,7 +345,7 @@ ((not *target*) (go-virtual nav-enemy-idle) ) - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) ) ((and (and *target* (>= (-> self enemy-info idle-distance) @@ -396,10 +396,10 @@ ) ) -(defmethod dummy-51 double-lurker-top ((obj double-lurker-top)) +(defmethod nav-enemy-method-51 double-lurker-top ((obj double-lurker-top)) (restore-collide-with-as (-> obj collide-info)) (logior! (-> obj collide-info nav-flags) (nav-flags navf0)) - (TODO-RENAME-27 (-> obj nav)) + (nav-control-method-27 (-> obj nav)) (none) ) @@ -473,10 +473,10 @@ (none) ) -(defmethod TODO-RENAME-48 double-lurker-top ((obj double-lurker-top)) +(defmethod nav-enemy-method-48 double-lurker-top ((obj double-lurker-top)) (initialize-skeleton obj *double-lurker-top-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) - (TODO-RENAME-45 obj *double-lurker-top-nav-enemy-info*) + (init-defaults! obj *double-lurker-top-nav-enemy-info*) (let ((v1-5 (-> obj parent-process))) (set! (-> obj collide-info trans quad) (-> v1-5 0 collide-info trans quad)) (set-vector! (-> obj collide-info scale) 1.0 1.0 1.0 1.0) @@ -489,7 +489,7 @@ (defbehavior double-lurker-top-init-by-other double-lurker-top ((arg0 entity) (arg1 double-lurker) (arg2 symbol) (arg3 vector)) (initialize-collision self) (set! (-> self entity) (-> arg1 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (set! (-> self collide-info trans quad) (-> arg3 quad)) (cond (arg2 @@ -507,7 +507,7 @@ (ja :group! double-lurker-idle-ja :num! min) (transform-post) (move-to-ground (-> self collide-info) 40960.0 40960.0 #t (collide-kind background)) - (dummy-51 self) + (nav-enemy-method-51 self) (go double-lurker-top-resume) ) ) @@ -521,7 +521,7 @@ (case arg2 (('touch) (set! (-> self touch-time) (-> *display* base-frame-counter)) - (dummy-44 self arg0 arg3) + (touch-handler self arg0 arg3) ) (('attack) (when (= (-> arg0 type) target) @@ -577,7 +577,7 @@ ) (else (nav-enemy-set-hit-from-direction arg0) - (dummy-43 self arg0 arg3) + (attack-handler self arg0 arg3) ) ) ) @@ -603,7 +603,7 @@ ((not *target*) (go-virtual nav-enemy-idle) ) - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) ) ((and (and *target* (>= (-> self enemy-info idle-distance) @@ -725,83 +725,15 @@ (.svf (&-> v1-7 quad) vf1) ) (let ((gp-0 #f)) - (TODO-RENAME-28 - (-> self nav) - (collide-kind - background - cak-1 - cak-2 - cak-3 - target - water - powerup - crate - enemy - wall-object - projectile - ground-object - target-attack - mother-spider - cak-14 - blue-eco-suck - unknown-16 - unknown-17 - unknown-18 - unknown-19 - unknown-20 - unknown-21 - unknown-22 - unknown-23 - unknown-24 - unknown-25 - unknown-26 - unknown-27 - unknown-28 - unknown-29 - unknown-30 - unknown-31 - unknown-32 - unknown-33 - unknown-34 - unknown-35 - unknown-36 - unknown-37 - unknown-38 - unknown-39 - unknown-40 - unknown-41 - unknown-42 - unknown-43 - unknown-44 - unknown-45 - unknown-46 - unknown-47 - unknown-48 - unknown-49 - unknown-50 - unknown-51 - unknown-52 - unknown-53 - unknown-54 - unknown-55 - unknown-56 - unknown-57 - unknown-58 - unknown-59 - unknown-60 - unknown-61 - unknown-62 - unknown-63 - ) - ) + (nav-control-method-28 (-> self nav) (the-as collide-kind -1)) (let ((a2-1 (new 'stack-no-clear 'check-vector-collision-with-nav-spheres-info))) - (if (>= (dummy-23 (-> self nav) (-> self nav travel) a2-1) 0.0) + (if (>= (nav-control-method-23 (-> self nav) (-> self nav travel) a2-1) 0.0) (set! gp-0 #t) ) ) (when (not gp-0) (let ((s5-0 (new 'stack 'clip-travel-vector-to-mesh-return-info))) - (dummy-24 (-> self nav) (* 1.2 f30-0) s5-0) + (nav-control-method-24 (-> self nav) (* 1.2 f30-0) s5-0) (if (-> s5-0 found-boundary) (set! gp-0 #t) ) @@ -824,7 +756,7 @@ (-> self nav-info hover-if-no-ground) #f ) - (TODO-RENAME-27 (-> self nav)) + (nav-control-method-27 (-> self nav)) (none) ) ) @@ -841,78 +773,12 @@ :post (the-as (function none :behavior double-lurker) nav-enemy-simple-post) ) -(defmethod dummy-52 double-lurker ((obj double-lurker) (arg0 vector)) - (TODO-RENAME-28 (-> obj nav) (collide-kind - background - cak-1 - cak-2 - cak-3 - target - water - powerup - crate - enemy - wall-object - projectile - ground-object - target-attack - mother-spider - cak-14 - blue-eco-suck - unknown-16 - unknown-17 - unknown-18 - unknown-19 - unknown-20 - unknown-21 - unknown-22 - unknown-23 - unknown-24 - unknown-25 - unknown-26 - unknown-27 - unknown-28 - unknown-29 - unknown-30 - unknown-31 - unknown-32 - unknown-33 - unknown-34 - unknown-35 - unknown-36 - unknown-37 - unknown-38 - unknown-39 - unknown-40 - unknown-41 - unknown-42 - unknown-43 - unknown-44 - unknown-45 - unknown-46 - unknown-47 - unknown-48 - unknown-49 - unknown-50 - unknown-51 - unknown-52 - unknown-53 - unknown-54 - unknown-55 - unknown-56 - unknown-57 - unknown-58 - unknown-59 - unknown-60 - unknown-61 - unknown-62 - unknown-63 - ) - ) +(defmethod nav-enemy-method-52 double-lurker ((obj double-lurker) (arg0 vector)) + (nav-control-method-28 (-> obj nav) (the-as collide-kind -1)) (let ((a1-2 (new 'stack-no-clear 'vector))) (vector-float*! a1-2 (-> obj hit-from-dir) 22937.602) (vector+! a1-2 a1-2 (-> obj collide-info trans)) - (dummy-13 (-> obj nav) a1-2 (-> obj hit-from-dir)) + (nav-control-method-13 (-> obj nav) a1-2 (-> obj hit-from-dir)) ) (when (>= (vector-xz-length (-> obj nav travel)) 18841.602) (vector+! arg0 (-> obj collide-info trans) (-> obj nav travel)) @@ -949,13 +815,13 @@ (set! (-> v1-2 user-int8 2) 1) ) (let ((gp-0 (new 'stack-no-clear 'vector))) - (if (dummy-52 self gp-0) + (if (nav-enemy-method-52 self gp-0) (send-event (handle->process (-> self buddy-handle)) 'trigger gp-0) (send-event (handle->process (-> self buddy-handle)) 'instant-death (-> self hit-from-dir)) ) ) - (dummy-51 self) - (TODO-RENAME-49 self *double-lurker-nav-enemy-info*) + (nav-enemy-method-51 self) + (init-jm! self *double-lurker-nav-enemy-info*) (go double-lurker-break-apart) (none) ) @@ -1006,83 +872,15 @@ (.svf (&-> v1-7 quad) vf1) ) (let ((gp-0 #f)) - (TODO-RENAME-28 - (-> self nav) - (collide-kind - background - cak-1 - cak-2 - cak-3 - target - water - powerup - crate - enemy - wall-object - projectile - ground-object - target-attack - mother-spider - cak-14 - blue-eco-suck - unknown-16 - unknown-17 - unknown-18 - unknown-19 - unknown-20 - unknown-21 - unknown-22 - unknown-23 - unknown-24 - unknown-25 - unknown-26 - unknown-27 - unknown-28 - unknown-29 - unknown-30 - unknown-31 - unknown-32 - unknown-33 - unknown-34 - unknown-35 - unknown-36 - unknown-37 - unknown-38 - unknown-39 - unknown-40 - unknown-41 - unknown-42 - unknown-43 - unknown-44 - unknown-45 - unknown-46 - unknown-47 - unknown-48 - unknown-49 - unknown-50 - unknown-51 - unknown-52 - unknown-53 - unknown-54 - unknown-55 - unknown-56 - unknown-57 - unknown-58 - unknown-59 - unknown-60 - unknown-61 - unknown-62 - unknown-63 - ) - ) + (nav-control-method-28 (-> self nav) (the-as collide-kind -1)) (let ((a2-1 (new 'stack-no-clear 'check-vector-collision-with-nav-spheres-info))) - (if (>= (dummy-23 (-> self nav) (-> self nav travel) a2-1) 0.0) + (if (>= (nav-control-method-23 (-> self nav) (-> self nav travel) a2-1) 0.0) (set! gp-0 #t) ) ) (when (not gp-0) (let ((s5-0 (new 'stack 'clip-travel-vector-to-mesh-return-info))) - (dummy-24 (-> self nav) (* 1.2 f30-0) s5-0) + (nav-control-method-24 (-> self nav) (* 1.2 f30-0) s5-0) (if (-> s5-0 found-boundary) (set! gp-0 #t) ) @@ -1105,7 +903,7 @@ (-> self nav-info hover-if-no-ground) #f ) - (TODO-RENAME-27 (-> self nav)) + (nav-control-method-27 (-> self nav)) (none) ) ) @@ -1133,14 +931,14 @@ ) ) -(defmethod dummy-53 double-lurker ((obj double-lurker) (arg0 vector)) +(defmethod double-lurker-method-53 double-lurker ((obj double-lurker) (arg0 vector)) (let* ((s3-0 (-> obj path curve num-cverts)) (s4-0 (rand-vu-int-count s3-0)) ) (while (nonzero? s3-0) (+! s3-0 -1) (eval-path-curve-div! (-> obj path) arg0 (the float s4-0) 'interp) - (if (not (TODO-RENAME-50 obj arg0)) + (if (not (nav-enemy-method-50 obj arg0)) (return #t) ) ) @@ -1241,7 +1039,7 @@ ) ) -(defmethod dummy-51 double-lurker ((obj double-lurker)) +(defmethod nav-enemy-method-51 double-lurker ((obj double-lurker)) (let ((v1-1 (-> obj collide-info root-prim))) (let ((a0-1 0)) (dotimes (a1-0 3) @@ -1266,7 +1064,7 @@ (none) ) -(defmethod TODO-RENAME-48 double-lurker ((obj double-lurker)) +(defmethod nav-enemy-method-48 double-lurker ((obj double-lurker)) (set! (-> obj buddy-handle) (the-as handle #f)) (process-drawable-from-entity! obj (-> obj entity)) (set! (-> obj align) (new 'process 'align-control obj)) @@ -1288,7 +1086,7 @@ (set! (-> obj buddy-on-shoulders?) #f) ) ) - (TODO-RENAME-45 obj *double-lurker-when-both-nav-enemy-info*) + (init-defaults! obj *double-lurker-when-both-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 1)) (set! (-> obj neck nose) (the-as uint 2)) (set! (-> obj neck ear) (the-as uint 0)) @@ -1296,7 +1094,7 @@ (when (not (-> obj buddy-dead?)) (let ((s5-0 (new 'stack-no-clear 'vector))) (when (not (-> obj buddy-on-shoulders?)) - (when (not (dummy-53 obj s5-0)) + (when (not (double-lurker-method-53 obj s5-0)) (set! (-> obj buddy-on-shoulders?) #t) (let ((v1-29 (-> obj entity extra perm))) (logior! (-> v1-29 status) (entity-perm-status user-set-from-cstage)) @@ -1316,22 +1114,18 @@ ) ) (when (and (not (-> obj dead?)) (not (-> obj buddy-on-shoulders?))) - (dummy-51 obj) - (TODO-RENAME-49 obj *double-lurker-nav-enemy-info*) + (nav-enemy-method-51 obj) + (init-jm! obj *double-lurker-nav-enemy-info*) ) (none) ) (defmethod init-from-entity! double-lurker ((obj double-lurker) (arg0 entity-actor)) (initialize-collision obj) - (TODO-RENAME-48 obj) + (nav-enemy-method-48 obj) (if (-> obj dead?) (go double-lurker-waiting-to-die) (go (method-of-object obj nav-enemy-idle)) ) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/floating-launcher.gc b/goal_src/jak1/levels/sunken/floating-launcher.gc index b0bcf6a8de..7c29a790e2 100644 --- a/goal_src/jak1/levels/sunken/floating-launcher.gc +++ b/goal_src/jak1/levels/sunken/floating-launcher.gc @@ -124,12 +124,8 @@ (initialize-skeleton obj *floating-launcher-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-override)) - (dummy-21 obj) + (baseplat-method-21 obj) (set! (-> obj trigger-height) (res-lump-float arg0 'trigger-height)) (go floating-launcher-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/helix-water.gc b/goal_src/jak1/levels/sunken/helix-water.gc index e5c033e432..70c2320f5a 100644 --- a/goal_src/jak1/levels/sunken/helix-water.gc +++ b/goal_src/jak1/levels/sunken/helix-water.gc @@ -86,8 +86,8 @@ :size-assert #xc8 :flag-assert #x16006000c8 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) object 21) + (helix-water-method-20 (_type_) none 20) + (helix-water-method-21 (_type_) object 21) ) (:states helix-water-activated @@ -569,7 +569,7 @@ (none) ) -(defmethod dummy-21 helix-water ((obj helix-water)) +(defmethod helix-water-method-21 helix-water ((obj helix-water)) (let ((s5-0 (+ (-> obj last-alt-actor-consumed) 1))) (when (< s5-0 (-> obj alt-actors length)) (let* ((v1-5 (-> obj alt-actors s5-0)) @@ -617,7 +617,7 @@ (go helix-water-activated) ) (('music) - (set-setting! 'music 'danger 0.0 0) + (the-as object (set-setting! 'music 'danger 0.0 0)) ) ) ) @@ -675,7 +675,7 @@ (set! (-> self root trans y) (-> self end-y)) ) (send-event (ppointer->process (-> self dark-eco)) 'move-to (-> self root trans)) - (dummy-21 self) + (helix-water-method-21 self) (none) ) :code (behavior () diff --git a/goal_src/jak1/levels/sunken/orbit-plat.gc b/goal_src/jak1/levels/sunken/orbit-plat.gc index 54e31c3842..a64b0eee3a 100644 --- a/goal_src/jak1/levels/sunken/orbit-plat.gc +++ b/goal_src/jak1/levels/sunken/orbit-plat.gc @@ -21,7 +21,7 @@ :size-assert #xb4 :flag-assert #x15005000b4 (:methods - (dummy-20 (_type_ vector vector) none 20) + (orbit-plat-bottom-method-20 (_type_ vector vector) none 20) ) (:states orbit-plat-bottom-idle @@ -48,8 +48,8 @@ :size-assert #x118 :flag-assert #x1d00b00118 (:methods - (dummy-27 (_type_) symbol 27) - (dummy-28 (_type_) symbol 28) + (orbit-plat-method-27 (_type_) symbol 27) + (orbit-plat-method-28 (_type_) symbol 28) ) (:states orbit-plat-idle @@ -140,7 +140,7 @@ ) ) -(defmethod dummy-20 orbit-plat-bottom ((obj orbit-plat-bottom) (arg0 vector) (arg1 vector)) +(defmethod orbit-plat-bottom-method-20 orbit-plat-bottom ((obj orbit-plat-bottom) (arg0 vector) (arg1 vector)) (let* ((s5-1 (vector-! (new 'stack-no-clear 'vector) arg1 arg0)) (f30-0 (vector-length s5-1)) ) @@ -215,7 +215,7 @@ (vector+*! s5-0 gp-1 s4-0 26624.0) (vector+*! gp-1 gp-1 s4-0 8192.0) ) - (dummy-20 self gp-1 s5-0) + (orbit-plat-bottom-method-20 self gp-1 s5-0) ) ) ) @@ -265,41 +265,39 @@ ) (defstate orbit-plat-idle (orbit-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'bonk) - (dummy-22 self) - ) - ((= v1-0 'go) - (go orbit-plat-rotating) - ) - ((= v1-0 'query-reset) - (if (not (-> self is-reset?)) - (go orbit-plat-reset) - ) - (let ((a1-1 (new 'stack-no-clear 'event-message-block))) - (set! (-> a1-1 from) self) - (set! (-> a1-1 num-params) 0) - (set! (-> a1-1 message) 'reset) - (let ((t9-3 send-event-function) - (v1-8 (-> self other)) - ) - (t9-3 - (if v1-8 - (-> v1-8 extra process) - ) - a1-1 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk) + (the-as object (baseplat-method-22 self)) + ) + (('go) + (go orbit-plat-rotating) + ) + (('query-reset) + (if (not (-> self is-reset?)) + (go orbit-plat-reset) + ) + (let ((a1-1 (new 'stack-no-clear 'event-message-block))) + (set! (-> a1-1 from) self) + (set! (-> a1-1 num-params) 0) + (set! (-> a1-1 message) 'reset) + (let ((t9-3 send-event-function) + (v1-8 (-> self other)) ) + (t9-3 + (if v1-8 + (-> v1-8 extra process) + ) + a1-1 ) ) ) - ((= v1-0 'reset) - (go orbit-plat-reset) - ) - ) - ) - ) + ) + (('reset) + (go orbit-plat-reset) + ) + ) + ) ) :trans (the-as (function none :behavior orbit-plat) plat-trans) :code (behavior () @@ -358,7 +356,7 @@ :post (the-as (function none :behavior orbit-plat) plat-post) ) -(defmethod dummy-28 orbit-plat ((obj orbit-plat)) +(defmethod orbit-plat-method-28 orbit-plat ((obj orbit-plat)) (when (>= (- (-> *display* base-frame-counter) (-> obj state-time)) (the int (* 300.0 (-> obj timeout)))) (cond (*target* @@ -379,25 +377,23 @@ ) (defstate orbit-plat-still (orbit-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'bonk) - (dummy-22 self) - ) - ((= v1-0 'go) - (go orbit-plat-rotating) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk) + (the-as object (baseplat-method-22 self)) + ) + (('go) + (go orbit-plat-rotating) + ) + ) + ) ) :trans (the-as (function none :behavior orbit-plat) plat-trans) :code (behavior () (set! (-> self plat-status) (the-as uint 0)) (set! (-> self state-time) (-> *display* base-frame-counter)) (ja-no-eval :num! (seek! 0.0)) - (until (dummy-28 self) + (until (orbit-plat-method-28 self) (when (nonzero? (-> self root-override riders num-riders)) (let ((a1-1 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-1 from) self) @@ -484,7 +480,7 @@ (defun get-nav-point! ((arg0 vector) (arg1 orbit-plat) (arg2 vector) (arg3 float)) (set! (-> arg1 nav target-pos quad) (-> arg2 quad)) (logclear! (-> arg1 nav flags) (nav-control-flags navcf19)) - (dummy-11 (-> arg1 nav) (-> arg1 nav target-pos)) + (nav-control-method-11 (-> arg1 nav) (-> arg1 nav target-pos)) (let ((f0-0 (vector-length (-> arg1 nav travel)))) (if (< arg3 f0-0) (set! f0-0 arg3) @@ -498,18 +494,16 @@ ) (defstate orbit-plat-rotating (orbit-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'bonk) - (dummy-22 self) - ) - ((= v1-0 'stop) - (go orbit-plat-still) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk) + (the-as object (baseplat-method-22 self)) + ) + (('stop) + (go orbit-plat-still) + ) + ) + ) ) :trans (the-as (function none :behavior orbit-plat) plat-trans) :code (behavior () @@ -540,7 +534,7 @@ (label cfg-3) (dotimes (s4-0 2) (get-rotate-point! s5-0 gp-0 (-> self basetrans) (the-as vector f30-0) (-> self rot-dir) 40960.0) - (b! (not (dummy-16 (-> self nav) s5-0)) cfg-6 :delay (empty-form)) + (b! (not (nav-control-method-16 (-> self nav) s5-0)) cfg-6 :delay (empty-form)) (set! (-> self basetrans quad) (-> s5-0 quad)) (b! #t cfg-9 :delay (nop!)) (label cfg-6) @@ -561,7 +555,7 @@ ) ;; WARN: disable def twice: 132. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare. -(defmethod dummy-27 orbit-plat ((obj orbit-plat)) +(defmethod orbit-plat-method-27 orbit-plat ((obj orbit-plat)) (local-vars (v0-11 object)) (let* ((v1-0 (-> obj other)) (s5-0 (if v1-0 @@ -620,13 +614,13 @@ (let ((f30-2 (vector-length a0-7))) (get-rotate-point! s5-1 s4-0 (-> obj basetrans) (the-as vector f30-2) (-> obj rot-dir) 40960.0) (cond - ((dummy-16 (-> obj nav) s5-1) + ((nav-control-method-16 (-> obj nav) s5-1) (set! (-> obj basetrans quad) (-> s5-1 quad)) ) (else (set! (-> obj rot-dir) (- (-> obj rot-dir))) (get-rotate-point! s5-1 s4-0 (-> obj basetrans) (the-as vector f30-2) (-> obj rot-dir) 40960.0) - (if (dummy-16 (-> obj nav) s5-1) + (if (nav-control-method-16 (-> obj nav) s5-1) (set! (-> obj basetrans quad) (-> s5-1 quad)) ) ) @@ -661,10 +655,10 @@ (vector-! s5-2 s5-2 s4-1) (vector-normalize! s5-2 (-> obj reset-length)) (vector+! s5-2 s5-2 s4-1) - (when (not (dummy-16 (-> obj nav) s5-2)) + (when (not (nav-control-method-16 (-> obj nav) s5-2)) (logclear! (-> obj nav flags) (nav-control-flags navcf19)) (get-rotate-point! s5-2 s4-1 (-> obj basetrans) (the-as vector (-> obj reset-length)) 0.0 40960.0) - (when (not (dummy-16 (-> obj nav) s5-2)) + (when (not (nav-control-method-16 (-> obj nav) s5-2)) (get-rotate-point! s5-2 s4-1 @@ -673,7 +667,7 @@ (-> obj rot-dir) 40960.0 ) - (when (not (dummy-16 (-> obj nav) s5-2)) + (when (not (nav-control-method-16 (-> obj nav) s5-2)) (set! (-> obj rot-dir) (- (-> obj rot-dir))) (get-rotate-point! s5-2 @@ -699,10 +693,7 @@ (let ((s5-3 (new 'stack-no-clear 'vector))) (set! (-> s5-3 quad) (-> obj basetrans quad)) (get-nav-point! (-> obj basetrans) obj (-> obj reset-trans) 40960.0) - (let ((f0-29 (-> s5-3 y))) - (set! (-> obj basetrans y) f0-29) - f0-29 - ) + (set! (-> obj basetrans y) (-> s5-3 y)) ) ) ) @@ -711,26 +702,24 @@ ) (defstate orbit-plat-reset (orbit-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'bonk) - (dummy-22 self) - ) - ((= v1-0 'go) - (go orbit-plat-rotating) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk) + (the-as object (baseplat-method-22 self)) + ) + (('go) + (go orbit-plat-rotating) + ) + ) + ) ) :trans (the-as (function none :behavior orbit-plat) plat-trans) :code (behavior () (set! (-> self plat-status) (the-as uint 3)) (logclear! (-> self nav flags) (nav-control-flags navcf19)) (ja-no-eval :num! (seek! 0.0)) - (while (zero? (logand (nav-control-flags navcf19) (-> self nav flags))) - (dummy-27 self) + (while (not (logtest? (nav-control-flags navcf19) (-> self nav flags))) + (orbit-plat-method-27 self) (when (nonzero? (-> self root-override riders num-riders)) (let ((a1-1 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-1 from) self) @@ -821,7 +810,7 @@ ) (ja-post) (update-transforms! (-> obj root-override)) - (dummy-21 obj) + (baseplat-method-21 obj) (set! (-> obj nav) (new 'process 'nav-control (-> obj root-override) 16 40960.0)) (logior! (-> obj nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7)) (set! (-> obj nav gap-event) 'blocked) @@ -837,7 +826,3 @@ (go orbit-plat-wait-for-other) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/puffer.gc b/goal_src/jak1/levels/sunken/puffer.gc index 3b63cb666e..284f67df55 100644 --- a/goal_src/jak1/levels/sunken/puffer.gc +++ b/goal_src/jak1/levels/sunken/puffer.gc @@ -46,18 +46,18 @@ :size-assert #x198 :flag-assert #x2001300198 (:methods - (dummy-20 (_type_ vector) none 20) - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) symbol 22) - (dummy-23 (_type_ symbol) symbol 23) - (dummy-24 (_type_ vector) symbol 24) - (dummy-25 (_type_ float) symbol 25) - (dummy-26 (_type_) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_) none 28) + (puffer-method-20 (_type_ vector) none 20) + (puffer-method-21 (_type_) none 21) + (puffer-method-22 (_type_) symbol 22) + (puffer-method-23 (_type_ symbol) symbol 23) + (puffer-method-24 (_type_ vector) symbol 24) + (puffer-method-25 (_type_ float) symbol 25) + (puffer-method-26 (_type_) none 26) + (puffer-method-27 (_type_) none 27) + (puffer-method-28 (_type_) none 28) (flip-look! (_type_ symbol) none 29) - (dummy-30 (_type_) vector 30) - (dummy-31 (_type_) vector 31) + (puffer-method-30 (_type_) vector 30) + (puffer-method-31 (_type_) vector 31) ) (:states puffer-attack @@ -84,44 +84,44 @@ ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 56] (defbehavior puffer-default-event-handler puffer ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - object - (when (or (= v1-0 'touch) (= v1-0 'attack)) - (when (and (= arg2 'attack) (!= (-> self cprims-type) 2)) - (let* ((gp-0 arg0) - (v1-7 (if (and (nonzero? gp-0) (type-type? (-> gp-0 type) process-drawable)) - gp-0 - ) - ) - ) - (when v1-7 - (let ((f0-4 (atan - (- (-> (the-as process-drawable v1-7) root trans x) (-> self root-override trans x)) - (- (-> (the-as process-drawable v1-7) root trans z) (-> self root-override trans z)) - ) + (the-as + object + (case arg2 + (('touch 'attack) + (when (and (= arg2 'attack) (!= (-> self cprims-type) 2)) + (let* ((gp-0 arg0) + (v1-7 (if (and (nonzero? gp-0) (type-type? (-> gp-0 type) process-drawable)) + gp-0 ) - ) - (quaternion-axis-angle! (-> self root-override quat) 0.0 1.0 0.0 f0-4) + ) ) - ) - ) - (go puffer-die) - (return (the-as object #t)) - ) - (when (= (-> arg0 type) target) - (when (send-event - arg0 - 'attack - (-> arg3 param 0) - (static-attack-info ((shove-up (meters 1.5)) (shove-back (meters 2.5)))) - ) - (set! (-> self hit-player?) #t) - (set! (-> self hit-player-time) (-> *display* base-frame-counter)) - (set-collide-offense (-> self root-override) 2 (collide-offense no-offense)) - ) - ) - ) + (when v1-7 + (let ((f0-4 (atan + (- (-> (the-as process-drawable v1-7) root trans x) (-> self root-override trans x)) + (- (-> (the-as process-drawable v1-7) root trans z) (-> self root-override trans z)) + ) + ) + ) + (quaternion-axis-angle! (-> self root-override quat) 0.0 1.0 0.0 f0-4) + ) + ) + ) + (go puffer-die) + (return (the-as object #t)) + ) + (when (= (-> arg0 type) target) + (when (send-event + arg0 + 'attack + (-> arg3 param 0) + (static-attack-info ((shove-up (meters 1.5)) (shove-back (meters 2.5)))) + ) + (set! (-> self hit-player?) #t) + (set! (-> self hit-player-time) (-> *display* base-frame-counter)) + (set-collide-offense (-> self root-override) 2 (collide-offense no-offense)) + ) + ) + ) ) ) ) @@ -129,10 +129,10 @@ (defbehavior puffer-post puffer () (when (and (-> self hit-player?) (or (not *target*) - (and (zero? (logand (-> *target* state-flags) + (and (not (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) ) - ) + ) (>= (- (-> *display* base-frame-counter) (-> self hit-player-time)) (seconds 0.05)) ) ) @@ -144,7 +144,7 @@ (none) ) -(defmethod dummy-28 puffer ((obj puffer)) +(defmethod puffer-method-28 puffer ((obj puffer)) (cond ((and (-> obj draw shadow) (zero? (-> obj draw cur-lod)) @@ -201,13 +201,13 @@ (none) ) -(defmethod dummy-24 puffer ((obj puffer) (arg0 vector)) +(defmethod puffer-method-24 puffer ((obj puffer) (arg0 vector)) (and (is-in-mesh? (-> obj nav) arg0 11468.8) (< (-> arg0 y) (+ (-> obj root-override trans y) (-> obj fact-info-override notice-top))) ) ) -(defmethod dummy-22 puffer ((obj puffer)) +(defmethod puffer-method-22 puffer ((obj puffer)) (let* ((a1-0 (-> obj buddy)) (v1-0 (if a1-0 (-> a1-0 ppointer 3) @@ -225,14 +225,14 @@ #f ) -(defmethod dummy-25 puffer ((obj puffer) (arg0 float)) +(defmethod puffer-method-25 puffer ((obj puffer) (arg0 float)) (when *target* (let ((gp-0 (target-pos 0))) - (when (and (zero? (logand (-> *target* state-flags) + (when (and (not (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) ) - ) - (dummy-24 obj gp-0) + ) + (puffer-method-24 obj gp-0) (>= (-> gp-0 y) (+ -14336.0 (-> obj attack-bottom-y))) (>= (+ 2048.0 (-> obj top-y)) (-> gp-0 y)) ) @@ -280,7 +280,7 @@ ) -(defmethod dummy-23 puffer ((obj puffer) (arg0 symbol)) +(defmethod puffer-method-23 puffer ((obj puffer) (arg0 symbol)) (local-vars (v1-0 process)) (set! v1-0 (when arg0 (let ((a0-1 (-> obj buddy))) @@ -349,7 +349,7 @@ #f ) -(defmethod dummy-20 puffer ((obj puffer) (arg0 vector)) +(defmethod puffer-method-20 puffer ((obj puffer) (arg0 vector)) (if (-> obj attacking?) (set! (-> obj travel-speed) (seek-with-smooth (-> obj travel-speed) 30720.0 (* 8192.0 (-> *display* seconds-per-frame)) 0.125 40.96) @@ -358,77 +358,9 @@ (seek-with-smooth (-> obj travel-speed) 18432.0 (* 2048.0 (-> *display* seconds-per-frame)) 0.125 40.96) ) ) - (TODO-RENAME-27 (-> obj nav)) - (TODO-RENAME-28 - (-> obj nav) - (collide-kind - background - cak-1 - cak-2 - cak-3 - target - water - powerup - crate - enemy - wall-object - projectile - ground-object - target-attack - mother-spider - cak-14 - blue-eco-suck - unknown-16 - unknown-17 - unknown-18 - unknown-19 - unknown-20 - unknown-21 - unknown-22 - unknown-23 - unknown-24 - unknown-25 - unknown-26 - unknown-27 - unknown-28 - unknown-29 - unknown-30 - unknown-31 - unknown-32 - unknown-33 - unknown-34 - unknown-35 - unknown-36 - unknown-37 - unknown-38 - unknown-39 - unknown-40 - unknown-41 - unknown-42 - unknown-43 - unknown-44 - unknown-45 - unknown-46 - unknown-47 - unknown-48 - unknown-49 - unknown-50 - unknown-51 - unknown-52 - unknown-53 - unknown-54 - unknown-55 - unknown-56 - unknown-57 - unknown-58 - unknown-59 - unknown-60 - unknown-61 - unknown-62 - unknown-63 - ) - ) - (dummy-13 (-> obj nav) arg0 (-> obj root-override transv)) + (nav-control-method-27 (-> obj nav)) + (nav-control-method-28 (-> obj nav) (the-as collide-kind -1)) + (nav-control-method-13 (-> obj nav) arg0 (-> obj root-override transv)) (let ((f30-0 (* (vector-xz-length (-> obj nav travel)) (-> *display* frames-per-second)))) (let ((f0-11 (atan (-> obj nav travel x) (-> obj nav travel z))) (s5-1 (new 'stack-no-clear 'vector)) @@ -453,13 +385,13 @@ (set-vector! s4-0 (* (sin (-> obj travel-ry)) f28-0) 0.0 (* (cos (-> obj travel-ry)) f28-0) 1.0) (let ((s3-1 (new 'stack 'clip-travel-vector-to-mesh-return-info))) (set! (-> obj nav travel quad) (-> s4-0 quad)) - (dummy-24 (-> obj nav) f28-0 s3-1) + (nav-control-method-24 (-> obj nav) f28-0 s3-1) (if (-> s3-1 found-boundary) (set! f26-0 (vector-vector-xz-distance (-> s3-1 intersection) (-> obj root-override trans))) ) ) (let ((s3-2 (new 'stack-no-clear 'matrix))) - (when (>= (dummy-23 (-> obj nav) s4-0 (the-as check-vector-collision-with-nav-spheres-info s3-2)) 0.0) + (when (>= (nav-control-method-23 (-> obj nav) s4-0 (the-as check-vector-collision-with-nav-spheres-info s3-2)) 0.0) (let ((f0-26 (vector-vector-xz-distance (-> s3-2 vector 1) (-> obj root-override trans)))) (if (or (< f26-0 0.0) (< f0-26 f26-0)) (set! f26-0 f0-26) @@ -486,11 +418,11 @@ (set! (-> obj facing-ry) (deg-seek-smooth (-> obj facing-ry) (-> obj travel-ry) (* 32768.0 (-> *display* seconds-per-frame)) 0.125) ) - (dummy-27 obj) + (puffer-method-27 obj) (none) ) -(defmethod dummy-27 puffer ((obj puffer)) +(defmethod puffer-method-27 puffer ((obj puffer)) (let ((f30-0 (-> obj patrol-bottom-y))) (cond ((-> obj attacking?) @@ -587,7 +519,7 @@ ) (go puffer-patrol) ) - (dummy-26 self) + (puffer-method-26 self) (suspend) ) (none) @@ -601,7 +533,7 @@ (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self attacking?) #f) (set! (-> self reaction-delay) (rand-vu-int-range (seconds 0.1) (seconds 0.35))) - (if (not (dummy-23 self #f)) + (if (not (puffer-method-23 self #f)) (go puffer-idle) ) (set! (-> self picked-point-time) (-> *display* base-frame-counter)) @@ -629,37 +561,37 @@ ) ) ) - (when (dummy-22 self) - (when (dummy-23 self #t) + (when (puffer-method-22 self) + (when (puffer-method-23 self #t) (set! (-> self picked-point-time) (-> *display* base-frame-counter)) (set! (-> self pick-new-point-delay) (rand-vu-int-range (seconds 3) (seconds 10))) ) ) (if (and (>= (- (-> *display* base-frame-counter) (-> self state-time)) (-> self reaction-delay)) - (dummy-25 self (-> self notice-dist)) + (puffer-method-25 self (-> self notice-dist)) ) (go puffer-attack) ) (when (or (< (vector-vector-xz-distance (-> self root-override trans) (-> self dest-pos)) 8192.0) (>= (- (-> *display* base-frame-counter) (-> self picked-point-time)) (-> self pick-new-point-delay)) ) - (when (dummy-23 self #f) + (when (puffer-method-23 self #f) (set! (-> self picked-point-time) (-> *display* base-frame-counter)) (set! (-> self pick-new-point-delay) (rand-vu-int-range (seconds 3) (seconds 10))) ) ) - (dummy-20 self (-> self dest-pos)) + (puffer-method-20 self (-> self dest-pos)) (let ((gp-0 (new 'stack-no-clear 'vector))) (set-vector! gp-0 (sin (-> self facing-ry)) 0.0 (cos (-> self facing-ry)) 1.0) (set-heading-vec-clear-roll-pitch! (-> self root-override) gp-0) ) (vector-v+! (-> self root-override trans) (-> self root-override trans) (-> self root-override transv)) - (dummy-28 self) + (puffer-method-28 self) (none) ) :code (behavior () (loop - (dummy-26 self) + (puffer-method-26 self) (suspend) ) (none) @@ -682,7 +614,7 @@ (none) ) :trans (behavior () - (if (not (dummy-25 self (-> self give-up-dist))) + (if (not (puffer-method-25 self (-> self give-up-dist))) (go puffer-patrol) ) (when *target* @@ -696,18 +628,18 @@ ) (set-target! (-> self neck) (target-pos 5)) ) - (dummy-20 self (target-pos 0)) + (puffer-method-20 self (target-pos 0)) (let ((gp-2 (new 'stack-no-clear 'vector))) (set-vector! gp-2 (sin (-> self facing-ry)) 0.0 (cos (-> self facing-ry)) 1.0) (set-heading-vec-clear-roll-pitch! (-> self root-override) gp-2) ) (vector-v+! (-> self root-override trans) (-> self root-override trans) (-> self root-override transv)) - (dummy-28 self) + (puffer-method-28 self) (none) ) :code (behavior () (loop - (dummy-26 self) + (puffer-method-26 self) (suspend) ) (none) @@ -716,21 +648,19 @@ ) (defstate puffer-die (puffer) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - uint - (cond - ((= v1-0 'death-start) - (the-as uint (drop-pickup (-> self fact-info-override) #t *entity-pool* (-> self fact-info-override) 0)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as + uint + (case event-type + (('death-start) + (the-as uint (drop-pickup (-> self fact-info-override) #t *entity-pool* (-> self fact-info-override) 0)) + ) + (('death-end) + (let ((v0-0 (the-as uint (logior (-> self draw status) (draw-status hidden))))) + (set! (-> self draw status) (the-as draw-status v0-0)) + v0-0 ) - ((= v1-0 'death-end) - (let ((v0-0 (the-as uint (logior (-> self draw status) (draw-status hidden))))) - (set! (-> self draw status) (the-as draw-status v0-0)) - v0-0 - ) - ) - ) + ) ) ) ) @@ -750,7 +680,7 @@ :post (the-as (function none :behavior puffer) ja-post) ) -(defmethod dummy-21 puffer ((obj puffer)) +(defmethod puffer-method-21 puffer ((obj puffer)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -791,7 +721,7 @@ (backup-collide-with-as s5-0) (set! (-> obj root-override) s5-0) ) - (dummy-30 obj) + (puffer-method-30 obj) 0 (none) ) @@ -807,7 +737,7 @@ (none) ) -(defmethod dummy-30 puffer ((obj puffer)) +(defmethod puffer-method-30 puffer ((obj puffer)) (when (!= (-> obj cprims-type) 1) (set! (-> obj cprims-type) (the-as uint 1)) (let ((v1-3 (the-as basic (-> obj root-override root-prim)))) @@ -823,7 +753,7 @@ ) ) -(defmethod dummy-31 puffer ((obj puffer)) +(defmethod puffer-method-31 puffer ((obj puffer)) (when (!= (-> obj cprims-type) 2) (set! (-> obj cprims-type) (the-as uint 2)) (let ((v1-3 (the-as basic (-> obj root-override root-prim)))) @@ -839,7 +769,7 @@ ) ) -(defmethod dummy-26 puffer ((obj puffer)) +(defmethod puffer-method-26 puffer ((obj puffer)) (let ((f30-0 (get-current-phase (-> obj sync)))) (if (and (< 0.025 f30-0) (< f30-0 0.525)) (flip-look! obj #f) @@ -1132,10 +1062,10 @@ (-> obj skel root-channel 0 frame-group) ) (((-> obj draw art-group data 10) (-> obj draw art-group data 12)) - (dummy-31 obj) + (puffer-method-31 obj) ) (else - (dummy-30 obj) + (puffer-method-30 obj) ) ) (none) @@ -1159,7 +1089,7 @@ (set! (-> obj hit-player?) #f) (set! (-> obj look-mean?) #f) (set! (-> obj travel-turn-speed) 16384.0) - (dummy-21 obj) + (puffer-method-21 obj) (process-drawable-from-entity! obj (-> obj entity)) (initialize-skeleton obj *puffer-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) @@ -1172,7 +1102,7 @@ (set! (-> obj give-up-dist) (+ 20480.0 (-> obj notice-dist))) (set! (-> obj nav) (new 'process 'nav-control (-> obj root-override) 16 40960.0)) (logior! (-> obj nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7)) - (TODO-RENAME-26 (-> obj nav)) + (nav-control-method-26 (-> obj nav)) (set! (-> obj path) (new 'process 'path-control obj 'path 0.0)) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) (set! (-> obj fact-info-override) @@ -1231,7 +1161,3 @@ (go puffer-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/qbert-plat.gc b/goal_src/jak1/levels/sunken/qbert-plat.gc index b80a724fc7..40b21fd44a 100644 --- a/goal_src/jak1/levels/sunken/qbert-plat.gc +++ b/goal_src/jak1/levels/sunken/qbert-plat.gc @@ -106,8 +106,8 @@ (defstate qbert-plat-on-mimic (qbert-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('die) (go qbert-plat-on-die) ) @@ -160,7 +160,7 @@ (defbehavior qbert-plat-event-handler qbert-plat ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) (case arg2 (('notify) - (dummy-32 self) + (rigid-body-platform-method-32 self) ) (else (rigid-body-platform-event-handler arg0 arg1 arg2 arg3) @@ -168,7 +168,7 @@ ) ) -(defmethod dummy-33 qbert-plat ((obj qbert-plat)) +(defmethod rigid-body-platform-method-33 qbert-plat ((obj qbert-plat)) (let* ((a1-0 (-> obj master)) (v1-0 (if a1-0 (-> a1-0 extra process) @@ -181,7 +181,7 @@ ) ) -(defmethod dummy-32 qbert-plat ((obj qbert-plat)) +(defmethod rigid-body-platform-method-32 qbert-plat ((obj qbert-plat)) (let* ((v1-0 (-> obj master)) (a0-1 (if v1-0 (-> v1-0 extra process) @@ -221,7 +221,7 @@ (-> v1-0 extra process) ) (suspend) - (dummy-32 self) + (rigid-body-platform-method-32 self) (go-virtual rigid-body-platform-idle) ) ) @@ -262,7 +262,7 @@ ) (when gp-1 (if (not (-> self player-is-riding?)) - (dummy-33 self) + (rigid-body-platform-method-33 self) ) ) (set! (-> self player-is-riding?) gp-1) @@ -282,21 +282,21 @@ ) ) -(defmethod TODO-RENAME-22 qbert-plat ((obj qbert-plat) (arg0 vector) (arg1 float)) +(defmethod rigid-body-platform-method-22 qbert-plat ((obj qbert-plat) (arg0 vector) (arg1 float)) (+ (-> obj anchor-point y) (-> obj float-height-offset) (* 512.0 (cos (* 546.13336 (+ (* 60.0 arg1) (* 0.03 (-> arg0 x)) (* 0.03 (-> arg0 z)))))) ) ) -(defmethod TODO-RENAME-23 qbert-plat ((obj qbert-plat) (arg0 float)) +(defmethod rigid-body-platform-method-23 qbert-plat ((obj qbert-plat) (arg0 float)) ((the-as (function rigid-body-platform float none) (find-parent-method qbert-plat 23)) obj arg0) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) -(defmethod TODO-RENAME-30 qbert-plat ((obj qbert-plat)) +(defmethod rigid-body-platform-method-30 qbert-plat ((obj qbert-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -321,12 +321,12 @@ (none) ) -(defmethod TODO-RENAME-31 qbert-plat ((obj qbert-plat)) +(defmethod rigid-body-platform-method-31 qbert-plat ((obj qbert-plat)) (initialize-skeleton obj *qbert-plat-sg* '()) (set! (-> obj anchor-point quad) (-> obj root-overlay trans quad)) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-overlay)) - (TODO-RENAME-29 obj *qbert-plat-constants*) + (rigid-body-platform-method-29 obj *qbert-plat-constants*) (set! (-> obj float-height-offset) 6144.0) (let ((v1-11 (-> obj control-point-array data))) (set! (-> v1-11 0 local-pos x) -14336.0) @@ -363,9 +363,9 @@ (defmethod init-from-entity! qbert-plat ((obj qbert-plat) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) + (rigid-body-platform-method-31 obj) (go qbert-plat-wait-for-master) (none) ) @@ -375,19 +375,19 @@ ) (defstate qbert-plat-master-idle (qbert-plat-master) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) (start-hint-timer (game-text-id sunken-qbert-plat-hint)) (close-specific-task! (game-task sunken-platforms) (task-status need-hint)) (when (not (-> self puzzle-beaten?)) - (let ((v1-2 (-> arg3 param 0))) + (let ((v1-2 (-> event param 0))) (when (!= v1-2 (-> self last-plat-triggered)) (set! (-> self last-plat-triggered) (the-as int v1-2)) (let ((s5-1 (= (-> self plat-states-needed-to-open-door) (-> self plat-states)))) (let ((v1-3 (ash 1 v1-2))) (logxor! (-> self plat-states) (the-as uint v1-3)) - (if (zero? (logand v1-3 (-> self plat-states))) + (if (not (logtest? v1-3 (-> self plat-states))) (level-hint-spawn (game-text-id sunken-qbert-plat-hint) "sksp0130" @@ -397,7 +397,7 @@ ) ) ) - (send-event arg0 'notify) + (send-event proc 'notify) (let ((a0-13 (= (-> self plat-states-needed-to-open-door) (-> self plat-states)))) (if (!= s5-1 a0-13) (go qbert-plat-master-do-door a0-13) @@ -754,7 +754,3 @@ (go qbert-plat-master-wait-for-door) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/shover.gc b/goal_src/jak1/levels/sunken/shover.gc index 54d6806801..b6920698e1 100644 --- a/goal_src/jak1/levels/sunken/shover.gc +++ b/goal_src/jak1/levels/sunken/shover.gc @@ -32,39 +32,33 @@ ) (defstate shover-idle (shover) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch 'attack) - (when (= (-> arg0 type) target) + (when (= (-> proc type) target) (when ((method-of-type touching-shapes-entry prims-touching-action?) - (the-as touching-shapes-entry (-> arg3 param 0)) + (the-as touching-shapes-entry (-> event param 0)) (-> *target* control) (collide-action solid) (collide-action) ) (let ((s4-0 (new 'stack 'attack-info))) - (dummy-41 (-> self root-override) s4-0 (-> self shove-up)) - (level-hint-spawn - (game-text-id sunken-hotpipes) - "sksp0134" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (calc-shove-up (-> self root-override) s4-0 (-> self shove-up)) + (level-hint-spawn (game-text-id sunken-hotpipes) "sksp0134" (the-as entity #f) *entity-pool* (game-task none)) (if (or (= (-> *target* control unknown-surface00 mode) 'air) (>= (+ (-> *display* base-frame-counter) (seconds -0.2)) (-> *target* control unknown-dword11)) (< 0.75 (-> *target* control poly-normal y)) ) (send-event - arg0 + proc 'attack-or-shove - (-> arg3 param 0) + (-> event param 0) (static-attack-info ((mode 'burn) (vector (-> s4-0 vector)) (shove-up (-> s4-0 shove-up)))) ) (send-event - arg0 + proc 'attack-or-shove - (-> arg3 param 0) + (-> event param 0) (static-attack-info ((mode 'burn) (shove-up (meters 0)) (shove-back (meters 2)) @@ -139,7 +133,3 @@ (go shover-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/square-platform.gc b/goal_src/jak1/levels/sunken/square-platform.gc index 5fa2d3766d..d822a7e104 100644 --- a/goal_src/jak1/levels/sunken/square-platform.gc +++ b/goal_src/jak1/levels/sunken/square-platform.gc @@ -29,7 +29,7 @@ :size-assert #x130 :flag-assert #x1c00c00130 (:methods - (TODO-RENAME-27 (_type_ symbol) none 27) + (square-platform-method-27 (_type_ symbol) none 27) ) (:states square-platform-lowered @@ -176,7 +176,7 @@ :parts ((sp-item 2222 :flags (is-3d)) (sp-item 2315 :flags (is-3d))) ) -(defmethod TODO-RENAME-27 square-platform ((obj square-platform) (arg0 symbol)) +(defmethod square-platform-method-27 square-platform ((obj square-platform) (arg0 symbol)) (local-vars (v0-3 sound-id) (sv-48 int)) (let ((s4-0 (new 'stack-no-clear 'vector))) (set! (-> s4-0 quad) (-> obj root-override trans quad)) @@ -262,11 +262,11 @@ ) (defstate square-platform-lowered (square-platform) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) - (if (and (= (-> arg0 type) square-platform-master) - (= (-> (the-as square-platform-master arg0) plat-id) (-> self plat-id)) + (if (and (= (-> proc type) square-platform-master) + (= (-> (the-as square-platform-master proc) plat-id) (-> self plat-id)) ) (go square-platform-rising) ) @@ -284,18 +284,16 @@ ) (defstate square-platform-rising (square-platform) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((or (= v1-0 'bonk) (= v1-0 'bounce)) - (dummy-22 self) - ) - ((= v1-0 'untrigger) - (go square-platform-lowering) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk 'bounce) + (the-as object (baseplat-method-22 self)) + ) + (('untrigger) + (go square-platform-lowering) + ) + ) + ) ) :enter (behavior () (set! (-> self start-splash-time) 0) @@ -313,7 +311,7 @@ (plat-post) (go square-platform-raised) ) - (TODO-RENAME-27 self #t) + (square-platform-method-27 self #t) (none) ) :code (behavior () @@ -327,18 +325,16 @@ ) (defstate square-platform-raised (square-platform) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((or (= v1-0 'bonk) (= v1-0 'bounce)) - (dummy-22 self) - ) - ((= v1-0 'untrigger) - (go square-platform-lowering) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk 'bounce) + (the-as object (baseplat-method-22 self)) + ) + (('untrigger) + (go square-platform-lowering) + ) + ) + ) ) :trans (the-as (function none :behavior square-platform) plat-trans) :code (behavior () @@ -353,22 +349,20 @@ ) (defstate square-platform-lowering (square-platform) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((or (= v1-0 'bonk) (= v1-0 'bounce)) - (dummy-22 self) - ) - ((= v1-0 'trigger) - (go square-platform-rising) - ) - ((= v1-0 'touch) - (send-event arg0 'no-look-around (seconds 1.5)) - #f - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk 'bounce) + (the-as object (baseplat-method-22 self)) + ) + (('trigger) + (go square-platform-rising) + ) + (('touch) + (send-event proc 'no-look-around (seconds 1.5)) + #f + ) + ) + ) ) :enter (behavior () (set! (-> self start-splash-time) 0) @@ -386,7 +380,7 @@ (plat-post) (go square-platform-lowered) ) - (TODO-RENAME-27 self #f) + (square-platform-method-27 self #f) (none) ) :code (behavior () @@ -456,7 +450,7 @@ (set! (-> obj link) (new 'process 'actor-link-info obj)) (set! (-> obj plat-id) (actor-count-before (-> obj link))) (initialize-skeleton obj *square-platform-sg* '()) - (dummy-21 obj) + (baseplat-method-21 obj) (ja-channel-set! 1) (let ((s4-1 (-> obj skel root-channel 0))) (joint-control-channel-group-eval! @@ -501,11 +495,11 @@ ) (defstate square-platform-master-idle (square-platform-master) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) - (when (= (-> arg0 type) square-platform-button) - (set! (-> self button-id) (-> (the-as square-platform-button arg0) button-id)) + (when (= (-> proc type) square-platform-button) + (set! (-> self button-id) (-> (the-as square-platform-button proc) button-id)) (logclear! (-> self mask) (process-mask actor-pause)) (process-entity-status! self (entity-perm-status bit-3) #t) (go square-platform-master-activate) @@ -679,7 +673,3 @@ (go square-platform-master-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/steam-cap.gc b/goal_src/jak1/levels/sunken/steam-cap.gc index c36170b290..168fedb11f 100644 --- a/goal_src/jak1/levels/sunken/steam-cap.gc +++ b/goal_src/jak1/levels/sunken/steam-cap.gc @@ -38,8 +38,8 @@ :size-assert #x160 :flag-assert #x1600f00160 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) quaternion 21) + (steam-cap-method-20 (_type_) none 20) + (steam-cap-method-21 (_type_) quaternion 21) ) (:states steam-cap-idle @@ -412,7 +412,7 @@ :bounds (static-spherem 0 0 0 3) ) -(defmethod dummy-20 steam-cap ((obj steam-cap)) +(defmethod steam-cap-method-20 steam-cap ((obj steam-cap)) (when *target* (let* ((a1-0 (target-pos 0)) (f0-0 (-> a1-0 y)) @@ -446,7 +446,7 @@ (none) ) -(defmethod dummy-21 steam-cap ((obj steam-cap)) +(defmethod steam-cap-method-21 steam-cap ((obj steam-cap)) (local-vars (at-0 int) (at-1 int) (s5-0 symbol)) (rlet ((vf0 :class vf) (vf1 :class vf) @@ -637,8 +637,8 @@ :trans (the-as (function none :behavior steam-cap) rider-trans) :code (behavior () (loop - (dummy-20 self) - (dummy-21 self) + (steam-cap-method-20 self) + (steam-cap-method-21 self) (suspend) ) (none) @@ -759,7 +759,3 @@ (go steam-cap-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc index 0351a969c1..0b57ec7f32 100644 --- a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc +++ b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc @@ -26,7 +26,7 @@ :size-assert #xf0 :flag-assert #x15008000f0 (:methods - (dummy-20 (_type_ float) vector 20) + (blue-eco-charger-orb-method-20 (_type_ float) vector 20) ) (:states blue-eco-charger-orb-active @@ -51,8 +51,8 @@ :size-assert #xbc :flag-assert #x16005000bc (:methods - (dummy-20 (_type_) object 20) - (dummy-21 (_type_ symbol) object 21) + (blue-eco-charger-method-20 (_type_) object 20) + (blue-eco-charger-method-21 (_type_ symbol) object 21) ) (:states blue-eco-charger-close @@ -99,11 +99,11 @@ :size-assert #x100 :flag-assert #x1900900100 (:methods - (dummy-20 (_type_ float) float 20) - (dummy-21 (_type_ exit-chamber-items) vector 21) - (dummy-22 (_type_) none 22) - (dummy-23 (_type_ symbol) object 23) - (dummy-24 (_type_ float) none 24) + (exit-chamber-method-20 (_type_ float) float 20) + (exit-chamber-method-21 (_type_ exit-chamber-items) vector 21) + (exit-chamber-method-22 (_type_) none 22) + (exit-chamber-method-23 (_type_ symbol) object 23) + (exit-chamber-method-24 (_type_ float) none 24) ) (:states exit-chamber-charger-puzzle @@ -123,7 +123,7 @@ (defpartgroup group-exit-chamber-ripples :id 620 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 2512 :flags (is-3d))) @@ -185,7 +185,7 @@ ) ) -(defmethod dummy-20 blue-eco-charger-orb ((obj blue-eco-charger-orb) (arg0 float)) +(defmethod blue-eco-charger-orb-method-20 blue-eco-charger-orb ((obj blue-eco-charger-orb) (arg0 float)) (set-vector! (-> obj targ-orbit-rotv) (rand-vu-float-range 72817.78 258503.11) @@ -220,7 +220,7 @@ (vf2 :class vf) ) (init-vf0-vector) - (dummy-20 self (-> self parent-process 0 open-level)) + (blue-eco-charger-orb-method-20 self (-> self parent-process 0 open-level)) (vector-reset! (-> self orbit-rotv)) (loop (let ((f30-0 (-> self parent-process 0 open-level))) @@ -228,7 +228,7 @@ (go blue-eco-charger-orb-idle) ) (if (zero? (rand-vu-int-count 30)) - (dummy-20 self f30-0) + (blue-eco-charger-orb-method-20 self f30-0) ) (set! (-> self orbit-rotv x) (seek-with-smooth (-> self orbit-rotv x) (-> self targ-orbit-rotv x) 873.81335 0.8 0.12136297) @@ -310,7 +310,7 @@ (none) ) -(defmethod dummy-21 blue-eco-charger ((obj blue-eco-charger) (arg0 symbol)) +(defmethod blue-eco-charger-method-21 blue-eco-charger ((obj blue-eco-charger) (arg0 symbol)) (let* ((v1-0 (-> obj master)) (a0-1 (if v1-0 (-> v1-0 extra process) @@ -340,7 +340,7 @@ ) ) -(defmethod dummy-20 blue-eco-charger ((obj blue-eco-charger)) +(defmethod blue-eco-charger-method-20 blue-eco-charger ((obj blue-eco-charger)) (and (and *target* (>= 16384.0 (vector-vector-distance (-> obj root-override trans) (-> *target* control trans)))) (send-event *target* 'query 'powerup (pickup-type eco-blue)) ) @@ -365,7 +365,7 @@ ) ) ) - (when (dummy-20 self) + (when (blue-eco-charger-method-20 self) (increment-success-for-hint (game-text-id sunken-blue-eco-charger-hint)) (go blue-eco-charger-open #t) ) @@ -385,11 +385,11 @@ (if arg0 (sound-play "blue-eco-start") ) - (dummy-21 self #t) + (blue-eco-charger-method-21 self #t) (none) ) :trans (behavior () - (if (dummy-20 self) + (if (blue-eco-charger-method-20 self) (set! (-> self state-time) (-> *display* base-frame-counter)) ) (update! (-> self sound)) @@ -449,7 +449,7 @@ :code (behavior () (ja-no-eval :num! (seek! 0.0)) (while (not (ja-done? 0)) - (when (dummy-20 self) + (when (blue-eco-charger-method-20 self) (increment-success-for-hint (game-text-id sunken-blue-eco-charger-hint)) (go blue-eco-charger-open #t) ) @@ -461,7 +461,7 @@ (ja :num! (seek! 0.0)) (set! (-> self open-level) (/ (ja-frame-num 0) (the float (+ (-> (ja-group) data 0 length) -1)))) ) - (dummy-21 self #f) + (blue-eco-charger-method-21 self #f) (go blue-eco-charger-idle) (none) ) @@ -531,15 +531,12 @@ (none) ) -(defmethod dummy-20 exit-chamber ((obj exit-chamber) (arg0 float)) - (let ((f0-5 (+ (-> obj orig-trans y) - (* 2252.8 arg0 (cos (* 36.40889 (the float (mod (-> *display* base-frame-counter) 1800))))) - ) - ) +(defmethod exit-chamber-method-20 exit-chamber ((obj exit-chamber) (arg0 float)) + (set! (-> obj root-override trans y) + (+ (-> obj orig-trans y) + (* 2252.8 arg0 (cos (* 36.40889 (the float (mod (-> *display* base-frame-counter) 1800))))) + ) ) - (set! (-> obj root-override trans y) f0-5) - f0-5 - ) ) (defpart 2515 @@ -561,7 +558,7 @@ ) ) -(defmethod dummy-24 exit-chamber ((obj exit-chamber) (arg0 float)) +(defmethod exit-chamber-method-24 exit-chamber ((obj exit-chamber) (arg0 float)) (let ((s4-0 (-> obj node-list data 3 bone transform)) (f30-0 (rand-vu-float-range 0.0 65536.0)) (f28-0 (rand-vu-float-range 8192.0 40960.0)) @@ -576,7 +573,7 @@ (none) ) -(defmethod dummy-21 exit-chamber ((obj exit-chamber) (arg0 exit-chamber-items)) +(defmethod exit-chamber-method-21 exit-chamber ((obj exit-chamber) (arg0 exit-chamber-items)) (let ((s5-0 (-> obj node-list data 3 bone transform))) (set-vector! (-> arg0 door-pos) 0.0 13107.2 -40960.0 1.0) (vector-matrix*! (-> arg0 door-pos) (-> arg0 door-pos) s5-0) @@ -592,7 +589,7 @@ (vector-float*! (-> arg0 fcell-pos) (-> arg0 fcell-pos) (/ 1.0 (-> arg0 fcell-pos w))) ) -(defmethod dummy-23 exit-chamber ((obj exit-chamber) (arg0 symbol)) +(defmethod exit-chamber-method-23 exit-chamber ((obj exit-chamber) (arg0 symbol)) (new 'stack-no-clear 'vector) (let ((s5-0 (new 'stack-no-clear 'vector))) (vector<-cspace! (-> obj last-pos) (-> obj node-list data 3)) @@ -602,7 +599,7 @@ (set! (-> obj draw bounds y) (+ 16384.0 (-> obj draw bounds y))) (set! (-> obj draw bounds w) 67584.0) (let ((s5-1 (new 'stack-no-clear 'exit-chamber-items))) - (dummy-21 obj s5-1) + (exit-chamber-method-21 obj s5-1) (if (-> obj button) (send-event (ppointer->process (-> obj button)) 'move-to (-> s5-1 button-pos) (-> s5-1 button-quat)) ) @@ -637,14 +634,14 @@ ) (defstate exit-chamber-charger-puzzle (exit-chamber) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 object)) - (case arg2 + (case event-type (('notify) - (case (-> arg3 param 0) + (case (-> event param 0) ((1) (when (zero? (get-reminder (get-task-control (game-task sunken-room)) 0)) - (let* ((a1-2 (-> arg3 param 1)) + (let* ((a1-2 (-> event param 1)) (v1-5 (logior (-> self chargers-active) (ash 1 a1-2))) ) (set! (-> self chargers-active) v1-5) @@ -659,7 +656,7 @@ ) ((2) (when (zero? (get-reminder (get-task-control (game-task sunken-room)) 0)) - (let ((a1-6 (-> arg3 param 1))) + (let ((a1-6 (-> event param 1))) (set! v0-0 (logclear (-> self chargers-active) (ash 1 a1-6))) ) (set! (-> self chargers-active) (the-as uint v0-0)) @@ -710,16 +707,16 @@ ) (defstate exit-chamber-idle-in-sunken (exit-chamber) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-1 object)) - (case arg2 + (case event-type (('trigger) (go exit-chamber-rise) (return #t) v0-1 ) (('notify) - (when (and (= (-> arg0 type) fuel-cell) (= (-> arg3 param 0) 'pickup)) + (when (and (= (-> proc type) fuel-cell) (= (-> event param 0) 'pickup)) (let ((a0-5 (handle->process (-> self fcell-handle)))) (when a0-5 (let ((v1-10 (new 'stack-no-clear 'vector))) @@ -825,7 +822,7 @@ (load-state-want-levels 'sunken 'village2) (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (dummy-24 self 51200.0) + (exit-chamber-method-24 self 51200.0) (update-trans! (-> self sound) (-> self last-pos)) (update! (-> self sound)) (suspend) @@ -838,7 +835,7 @@ (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (seek! (-> self wave-scale) 1.0 0.0016666667) - (dummy-20 self (-> self wave-scale)) + (exit-chamber-method-20 self (-> self wave-scale)) (if (and (-> self move-player?) (>= (ja-aframe-num 0) 310.0)) (set! (-> self move-player?) #f) ) @@ -869,7 +866,7 @@ (set! (-> self state-time) (-> *display* base-frame-counter)) (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.5)) (seek! (-> self wave-scale) 1.0 0.0016666667) - (dummy-20 self (-> self wave-scale)) + (exit-chamber-method-20 self (-> self wave-scale)) (suspend) ) (if (-> self door) @@ -878,7 +875,7 @@ (set! (-> self state-time) (-> *display* base-frame-counter)) (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 2.5)) (seek! (-> self wave-scale) 1.0 0.0016666667) - (dummy-20 self (-> self wave-scale)) + (exit-chamber-method-20 self (-> self wave-scale)) (suspend) ) (go exit-chamber-idle-in-village #f) @@ -889,19 +886,19 @@ (transform-post) (rider-post) ) - (dummy-23 self #t) + (exit-chamber-method-23 self #t) (none) ) ) (defstate exit-chamber-idle-in-village (exit-chamber) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('trigger) (go exit-chamber-lower) ) (('notify) - (when (and (= (-> arg0 type) fuel-cell) (= (-> arg3 param 0) 'pickup)) + (when (and (= (-> proc type) fuel-cell) (= (-> event param 0) 'pickup)) (let ((a0-5 (handle->process (-> self fcell-handle)))) (when a0-5 (let ((v1-8 (new 'stack-no-clear 'vector))) @@ -957,19 +954,19 @@ ) (when arg0 (logior! (-> self draw status) (draw-status skip-bones)) - (dummy-20 self 1.0) + (exit-chamber-method-20 self 1.0) (suspend) (logclear! (-> self draw status) (draw-status skip-bones)) ) (loop - (dummy-20 self 1.0) + (exit-chamber-method-20 self 1.0) (suspend) ) (none) ) :post (behavior () (rider-post) - (dummy-23 self #t) + (exit-chamber-method-23 self #t) (if (and *target* (>= (vector-vector-xz-distance (target-pos 0) (-> self last-pos)) 40960.0)) (spawn (-> self part) (-> self last-pos)) ) @@ -992,7 +989,7 @@ (rider-trans) ) (seek! (-> self wave-scale) 0.0 0.0016666667) - (dummy-20 self (-> self wave-scale)) + (exit-chamber-method-20 self (-> self wave-scale)) (none) ) :code (behavior () @@ -1043,7 +1040,7 @@ (kill-and-free-particles (-> self part)) (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (dummy-24 self 47104.0) + (exit-chamber-method-24 self 47104.0) (update-trans! (-> self sound) (-> self last-pos)) (update! (-> self sound)) (suspend) @@ -1079,7 +1076,7 @@ (transform-post) (rider-post) ) - (dummy-23 self #t) + (exit-chamber-method-23 self #t) (none) ) ) @@ -1166,7 +1163,7 @@ ) (ja-post) (update-transforms! (-> obj root-override)) - (dummy-21 obj (the-as exit-chamber-items s3-1)) + (exit-chamber-method-21 obj (the-as exit-chamber-items s3-1)) (let ((s1-3 #t)) (let ((v1-64 s4-1)) (cond @@ -1214,7 +1211,7 @@ (set! (-> obj orig-trans quad) (-> obj root-override trans quad)) (set! (-> obj last-pos quad) (-> obj root-override trans quad)) (set! (-> obj move-player?) #f) - (dummy-23 obj #t) + (exit-chamber-method-23 obj #t) (set! (-> obj move-player?) #f) (cond ((zero? s4-1) @@ -1230,7 +1227,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/sunken-fish.gc b/goal_src/jak1/levels/sunken/sunken-fish.gc index bcb3e8d72c..43456ce74e 100644 --- a/goal_src/jak1/levels/sunken/sunken-fish.gc +++ b/goal_src/jak1/levels/sunken/sunken-fish.gc @@ -30,14 +30,14 @@ :size-assert #x140 :flag-assert #x1c00d00140 (:methods - (TODO-RENAME-20 (_type_) float 20) - (TODO-RENAME-orbit?-21 (_type_ vector float vector) vector 21) - (dummy-22 (_type_) none 22) - (TODO-RENAME-23 (_type_) quaternion 23) - (TODO-RENAME-24 (_type_) vector 24) - (dummy-25 (_type_) none 25) - (TODO-RENAME-26 (_type_) float 26) - (TODO-RENAME-27 (_type_) float 27) + (sunkenfisha-method-20 (_type_) float 20) + (sunkenfisha-method-21 (_type_ vector float vector) vector 21) + (sunkenfisha-method-22 (_type_) none 22) + (sunkenfisha-method-23 (_type_) quaternion 23) + (sunkenfisha-method-24 (_type_) vector 24) + (sunkenfisha-method-25 (_type_) none 25) + (sunkenfisha-method-26 (_type_) float 26) + (sunkenfisha-method-27 (_type_) float 27) ) (:states sunkenfisha-idle @@ -60,16 +60,16 @@ :bounds (static-spherem 0 1.5 0 2.5) ) -(defmethod dummy-22 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-22 sunkenfisha ((obj sunkenfisha)) 0 (none) ) -(defmethod TODO-RENAME-orbit?-21 sunkenfisha ((obj sunkenfisha) (arg0 vector) (arg1 float) (arg2 vector)) +(defmethod sunkenfisha-method-21 sunkenfisha ((obj sunkenfisha) (arg0 vector) (arg1 float) (arg2 vector)) (eval-path-curve! (-> obj path) arg0 arg1 'interp) (vector+! arg0 arg0 (-> obj path-trans-offset)) (let ((s2-0 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> obj path) s2-0 arg1) + (path-control-method-14 (-> obj path) s2-0 arg1) (let ((f0-2 (atan (-> s2-0 x) (-> s2-0 z))) (s4-1 (new 'stack-no-clear 'vector)) ) @@ -79,7 +79,7 @@ ) ) -(defmethod TODO-RENAME-24 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-24 sunkenfisha ((obj sunkenfisha)) (let ((s4-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'matrix)) (gp-0 (new 'stack-no-clear 'vector)) @@ -111,7 +111,7 @@ ) ) -(defmethod dummy-25 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-25 sunkenfisha ((obj sunkenfisha)) (let* ((f0-0 (-> obj path-speed)) (f1-1 (seek f0-0 (-> obj targ-path-speed) (* (-> obj path-speed-seek-speed) (-> *display* seconds-per-frame))) @@ -122,11 +122,11 @@ (cond ((< f30-0 0.0) (set! f30-0 (- f30-0)) - (TODO-RENAME-20 obj) + (sunkenfisha-method-20 obj) ) ((< 1.0 f30-0) (+! f30-0 (* 2.0 (- 1.0 f30-0))) - (TODO-RENAME-20 obj) + (sunkenfisha-method-20 obj) ) ) (set! (-> obj path-u) f30-0) @@ -135,7 +135,7 @@ (none) ) -(defmethod TODO-RENAME-23 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-23 sunkenfisha ((obj sunkenfisha)) (let ((s5-0 (new 'stack-no-clear 'vector))) (set-vector! s5-0 (- (vector-x-angle (-> obj root transv))) (vector-y-angle (-> obj root transv)) 0.0 1.0) (set! (-> obj facing-rot x) @@ -148,7 +148,7 @@ (quaternion-zxy! (-> obj root quat) (-> obj facing-rot)) ) -(defmethod TODO-RENAME-20 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-20 sunkenfisha ((obj sunkenfisha)) (set! (-> obj path-dir) (- (-> obj path-dir))) (set! (-> obj path-speed) 0.0) (set! (-> obj targ-path-speed) @@ -164,20 +164,10 @@ (f1-3 (- (-> obj targ-local-path-offset x) f0-8)) ) (when (< (fabs f1-3) 12288.0) - (cond - ((>= f1-3 0.0) - (let ((f0-10 (fmin (+ 12288.0 f0-8) (-> obj max-local-path-offset x)))) - (set! (-> obj targ-local-path-offset x) f0-10) - f0-10 - ) - ) - (else - (let ((f0-12 (fmax (+ -12288.0 f0-8) (- (-> obj max-local-path-offset x))))) - (set! (-> obj targ-local-path-offset x) f0-12) - f0-12 - ) + (if (>= f1-3 0.0) + (set! (-> obj targ-local-path-offset x) (fmin (+ 12288.0 f0-8) (-> obj max-local-path-offset x))) + (set! (-> obj targ-local-path-offset x) (fmax (+ -12288.0 f0-8) (- (-> obj max-local-path-offset x)))) ) - ) ) ) ) @@ -191,12 +181,12 @@ ) (init-vf0-vector) (if (>= (-> *display* base-frame-counter) (-> self change-path-dir-time)) - (TODO-RENAME-20 self) + (sunkenfisha-method-20 self) ) - (TODO-RENAME-24 self) - (dummy-25 self) + (sunkenfisha-method-24 self) + (sunkenfisha-method-25 self) (let ((gp-0 (new 'stack-no-clear 'vector))) - (TODO-RENAME-orbit?-21 self gp-0 (-> self path-u) (-> self local-path-offset)) + (sunkenfisha-method-21 self gp-0 (-> self path-u) (-> self local-path-offset)) (vector-! (-> self root transv) gp-0 (-> self root trans)) (set! (-> self root trans quad) (-> gp-0 quad)) ) @@ -210,7 +200,7 @@ (.mul.x.vf vf1 vf1 vf2 :mask #b111) (.svf (&-> v1-16 quad) vf1) ) - (TODO-RENAME-23 self) + (sunkenfisha-method-23 self) (none) ) ) @@ -227,7 +217,7 @@ :post (the-as (function none :behavior sunkenfisha) ja-post) ) -(defmethod TODO-RENAME-26 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-26 sunkenfisha ((obj sunkenfisha)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj (-> obj entity)) (set-vector! (-> obj root scale) 6.0 6.0 6.0 1.0) @@ -251,14 +241,11 @@ (the-as art-joint-anim (-> obj draw art-group data 6)) num-func-identity ) - (let ((f0-4 0.0)) - (set! (-> s5-0 frame-num) f0-4) - f0-4 - ) + (set! (-> s5-0 frame-num) 0.0) ) ) -(defmethod TODO-RENAME-27 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-27 sunkenfisha ((obj sunkenfisha)) (local-vars (sv-16 res-tag) (sv-32 res-tag) (sv-48 res-tag)) (vector-reset! (-> obj path-trans-offset)) (set! (-> obj path-u) (rand-vu-float-range 0.0 1.0)) @@ -325,28 +312,25 @@ (set! (-> obj path-speed) (rand-vu-float-range (-> obj path-normal-speed-lo) (-> obj path-normal-speed-hi))) (set! (-> obj targ-path-speed) (-> obj path-speed)) (let ((s4-0 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> obj path) s4-0 (-> obj path-u)) + (path-control-method-14 (-> obj path) s4-0 (-> obj path-u)) (set-vector! (-> obj facing-rot) 0.0 (atan (-> s4-0 x) (-> s4-0 z)) 0.0 1.0) ) - (when (< (-> obj path-dir) 0.0) - (let ((f0-52 (- (-> obj facing-rot y)))) - (set! (-> obj facing-rot y) f0-52) - f0-52 + (if (< (-> obj path-dir) 0.0) + (set! (-> obj facing-rot y) (- (-> obj facing-rot y))) ) - ) ) (defbehavior sunkenfisha-init-by-other sunkenfisha ((arg0 entity-actor)) (set! (-> self entity) arg0) - (TODO-RENAME-26 self) - (TODO-RENAME-27 self) + (sunkenfisha-method-26 self) + (sunkenfisha-method-27 self) (go sunkenfisha-idle) (none) ) (defmethod init-from-entity! sunkenfisha ((obj sunkenfisha) (arg0 entity-actor)) - (TODO-RENAME-26 obj) - (TODO-RENAME-27 obj) + (sunkenfisha-method-26 obj) + (sunkenfisha-method-27 obj) (let ((s5-0 (+ (res-lump-value (-> obj entity) 'count uint128 :default (the-as uint128 1)) -1))) (while (> (the-as int s5-0) 0) (process-spawn sunkenfisha (-> obj entity) :to obj) @@ -356,7 +340,3 @@ (go sunkenfisha-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/sunken-obs.gc b/goal_src/jak1/levels/sunken/sunken-obs.gc index 4854637806..2b7ab0d231 100644 --- a/goal_src/jak1/levels/sunken/sunken-obs.gc +++ b/goal_src/jak1/levels/sunken/sunken-obs.gc @@ -93,7 +93,7 @@ *side-to-side-plat-sg* ) -(defmethod dummy-24 side-to-side-plat ((obj side-to-side-plat)) +(defmethod baseplat-method-24 side-to-side-plat ((obj side-to-side-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -118,19 +118,19 @@ (none) ) -(defmethod dummy-26 side-to-side-plat ((obj side-to-side-plat)) +(defmethod baseplat-method-26 side-to-side-plat ((obj side-to-side-plat)) (set! (-> obj part-ry) (+ 16384.0 (quaternion-y-angle (-> obj root-override quat)))) (none) ) -(defmethod TODO-RENAME-25 side-to-side-plat ((obj side-to-side-plat)) +(defmethod baseplat-method-25 side-to-side-plat ((obj side-to-side-plat)) (let ((v0-0 (create-launch-control (-> *part-group-id-table* 436) obj))) (set! (-> obj part) v0-0) (the-as sparticle-launch-group v0-0) ) ) -(defmethod dummy-20 side-to-side-plat ((obj side-to-side-plat)) +(defmethod baseplat-method-20 side-to-side-plat ((obj side-to-side-plat)) (when (nonzero? (-> obj part)) (set! (-> *part-id-table* 1713 init-specs 14 initial-valuef) (-> obj part-ry)) (set! (-> *part-id-table* 1714 init-specs 19 initial-valuef) (-> obj part-ry)) @@ -373,7 +373,3 @@ (go seaweed-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/sunken-pipegame.gc b/goal_src/jak1/levels/sunken/sunken-pipegame.gc index 6e9b24a7ff..0df79b53de 100644 --- a/goal_src/jak1/levels/sunken/sunken-pipegame.gc +++ b/goal_src/jak1/levels/sunken/sunken-pipegame.gc @@ -49,9 +49,9 @@ :size-assert #x2a0 :flag-assert #x17023002a0 (:methods - (dummy-20 (_type_) uint 20) - (dummy-21 (_type_ symbol) symbol 21) - (dummy-22 (_type_ symbol) none 22) + (sunken-pipegame-method-20 (_type_) uint 20) + (sunken-pipegame-method-21 (_type_ symbol) symbol 21) + (sunken-pipegame-method-22 (_type_ symbol) none 22) ) (:states sunken-pipegame-beat-challenge @@ -489,7 +489,7 @@ (none) ) -(defmethod dummy-20 sunken-pipegame ((obj sunken-pipegame)) +(defmethod sunken-pipegame-method-20 sunken-pipegame ((obj sunken-pipegame)) (let ((gp-0 0)) (if (task-complete? *game-info* (game-task sunken-pipe)) (+! gp-0 1) @@ -545,7 +545,7 @@ ) ) :enter (behavior () - (dummy-21 self #f) + (sunken-pipegame-method-21 self #f) (set! (-> self abort-audio-if-beaten?) #f) (dotimes (gp-0 3) (let ((v1-4 (-> self button gp-0))) @@ -648,7 +648,7 @@ (suspend) ) ) - (dummy-22 self #t) + (sunken-pipegame-method-22 self #t) (let ((f30-1 20480.0)) (until (= f30-1 0.0) (set! f30-1 (seek f30-1 0.0 (* 81920.0 (-> *display* seconds-per-frame)))) @@ -762,7 +762,7 @@ ) ) ) - (dummy-22 self #f) + (sunken-pipegame-method-22 self #f) (set! (-> self abort-audio-if-beaten?) #f) (let ((v1-184 (-> self prize (-> self challenge))) (a0-109 (new 'stack-no-clear 'vector)) @@ -826,7 +826,7 @@ (defstate sunken-pipegame-end-play (sunken-pipegame) :code (behavior () (local-vars (v1-3 symbol)) - (dummy-21 self #t) + (sunken-pipegame-method-21 self #t) (set! (-> self abort-audio-if-beaten?) #f) (until v1-3 (suspend) @@ -848,7 +848,7 @@ ) ) -(defmethod dummy-22 sunken-pipegame ((obj sunken-pipegame) (arg0 symbol)) +(defmethod sunken-pipegame-method-22 sunken-pipegame ((obj sunken-pipegame) (arg0 symbol)) (let* ((v1-0 (-> obj challenge)) (a2-0 v1-0) ) @@ -878,7 +878,7 @@ (none) ) -(defmethod dummy-21 sunken-pipegame ((obj sunken-pipegame) (arg0 symbol)) +(defmethod sunken-pipegame-method-21 sunken-pipegame ((obj sunken-pipegame) (arg0 symbol)) (if arg0 (logior! (-> obj mask) (process-mask actor-pause)) (logclear! (-> obj mask) (process-mask actor-pause)) @@ -942,7 +942,7 @@ (process-drawable-from-entity! obj arg0) (set! (-> obj path) (new 'process 'path-control obj 'path 0.0)) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) - (set! (-> obj challenges-mask) (dummy-20 obj)) + (set! (-> obj challenges-mask) (sunken-pipegame-method-20 obj)) (let ((s4-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'quaternion)) ) diff --git a/goal_src/jak1/levels/sunken/sunken-water.gc b/goal_src/jak1/levels/sunken/sunken-water.gc index 8bb8022a5c..037a81216d 100644 --- a/goal_src/jak1/levels/sunken/sunken-water.gc +++ b/goal_src/jak1/levels/sunken/sunken-water.gc @@ -88,15 +88,15 @@ (defstate water-vol-idle (sunken-water) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('notify) - (if (= (-> arg3 param 0) 'attack) + (if (= (-> event param 0) 'attack) (sound-play "get-shocked") ) ) (else - ((-> (method-of-type water-anim water-vol-idle) event) arg0 arg1 arg2 arg3) + ((-> (method-of-type water-anim water-vol-idle) event) proc arg1 event-type event) ) ) ) @@ -179,8 +179,8 @@ :post (the-as (function none :behavior sunken-water) ja-post) ) -(defmethod TODO-RENAME-25 sunken-water ((obj sunken-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-25))) +(defmethod water-vol-method-25 sunken-water ((obj sunken-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-25))) (t9-0 obj) ) (set! (-> obj playing-deadly-sound?) #f) @@ -224,8 +224,8 @@ (none) ) -(defmethod TODO-RENAME-22 sunken-water ((obj sunken-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 sunken-water ((obj sunken-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (set! (-> obj play-ambient-sound?) #f) @@ -251,7 +251,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/target-tube.gc b/goal_src/jak1/levels/sunken/target-tube.gc index 86f4fb35cd..29b9ae8c5e 100644 --- a/goal_src/jak1/levels/sunken/target-tube.gc +++ b/goal_src/jak1/levels/sunken/target-tube.gc @@ -253,7 +253,7 @@ (bucket-id debug-no-zbuf) (-> self control trans) s3-1 - (meters 2.0) + (meters 2) (new 'static 'rgba :r #xff :g #xff :a #x80) ) (vector-matrix*! s3-1 s3-1 (-> self control unknown-matrix00)) @@ -266,7 +266,7 @@ (bucket-id debug-no-zbuf) (-> self control trans) s4-2 - (meters 2.0) + (meters 2) (new 'static 'rgba :r #xff :g #x80 :b #x40 :a #x80) ) (vector-matrix*! s4-2 s4-2 (-> self control unknown-matrix00)) @@ -879,7 +879,7 @@ (defun distance-from-tangent ((arg0 path-control) (arg1 float) (arg2 vector) (arg3 vector) (arg4 vector) (arg5 vector)) (eval-path-curve-div! arg0 arg2 arg1 'interp) - (TODO-RENAME-12 arg0 arg3 arg1) + (path-control-method-12 arg0 arg3 arg1) (set! (-> arg2 y) (-> arg5 y)) (set! (-> arg3 y) 0.0) (let ((s2-1 (new 'stack-no-clear 'vector))) @@ -929,7 +929,7 @@ :enter (behavior () (eval-path-curve-div! (-> self path) (-> self trans) 0.2 'interp) (eval-path-curve-div! (-> self path) (-> self root trans) 0.2 'interp) - (TODO-RENAME-12 (-> self path) (-> self rot) 0.2) + (path-control-method-12 (-> self path) (-> self rot) 0.2) (set! (-> self pos) 0.2) (none) ) diff --git a/goal_src/jak1/levels/sunken/wedge-plats.gc b/goal_src/jak1/levels/sunken/wedge-plats.gc index dcacc4bf05..5be5fe6f43 100644 --- a/goal_src/jak1/levels/sunken/wedge-plats.gc +++ b/goal_src/jak1/levels/sunken/wedge-plats.gc @@ -71,7 +71,7 @@ :size-assert #xf0 :flag-assert #x1c008000f0 (:methods - (dummy-27 (_type_) symbol 27) + (wedge-plat-method-27 (_type_) symbol 27) ) (:states wedge-plat-idle @@ -85,7 +85,7 @@ :bounds (static-spherem 0 0 0 6) ) -(defmethod dummy-27 wedge-plat ((obj wedge-plat)) +(defmethod wedge-plat-method-27 wedge-plat ((obj wedge-plat)) (let* ((a0-1 (-> obj master)) (v1-0 (if a0-1 (-> (the-as process-drawable (-> a0-1 ppointer)) brother) @@ -120,19 +120,19 @@ ) (defstate wedge-plat-idle (wedge-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (if (= v1-0 'bonk) - (dummy-22 self) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk) + (the-as symbol (baseplat-method-22 self)) + ) + ) + ) ) :trans (the-as (function none :behavior wedge-plat) plat-trans) :code (behavior () (ja :num-func num-func-identity :frame-num (ja-aframe 0.0 0)) (loop - (if (dummy-27 self) + (if (wedge-plat-method-27 self) (go wedge-plat-tip) ) (suspend) @@ -143,19 +143,17 @@ ) (defstate wedge-plat-tip (wedge-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'bonk) - (dummy-22 self) - ) - ((= v1-0 'touch) - (send-event arg0 'no-look-around (seconds 1.5)) - #f - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk) + (the-as symbol (baseplat-method-22 self)) + ) + (('touch) + (send-event proc 'no-look-around (seconds 1.5)) + #f + ) + ) + ) ) :trans (the-as (function none :behavior wedge-plat) plat-trans) :code (behavior () @@ -164,7 +162,7 @@ :frame-num (ja-aframe 0.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 60.0 0))) ) @@ -173,14 +171,14 @@ :frame-num (ja-aframe 60.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 100.0 0))) ) (set! (-> self state-time) (-> *display* base-frame-counter)) (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 1)) (ja :num-func num-func-identity :frame-num (ja-aframe 100.0 0)) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) ) (ja-no-eval :group! (-> self draw art-group data 3) @@ -188,7 +186,7 @@ :frame-num (ja-aframe 100.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 153.0 0))) ) @@ -224,7 +222,7 @@ (initialize-skeleton obj *wedge-plat-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-override)) - (dummy-21 obj) + (baseplat-method-21 obj) (set! (-> obj master) (the-as wedge-plat-master (entity-actor-lookup arg0 'alt-actor 0))) (set! (-> obj offset) (res-lump-float arg0 'rotoffset)) (set! (-> obj distance) (res-lump-float arg0 'distance :default 36864.0)) @@ -251,7 +249,7 @@ :bounds (static-spherem 0 0 0 8) ) -(defmethod dummy-27 wedge-plat-outer ((obj wedge-plat-outer)) +(defmethod wedge-plat-method-27 wedge-plat-outer ((obj wedge-plat-outer)) (let* ((a0-1 (-> obj master)) (v1-0 (if a0-1 (-> (the-as process-drawable (-> a0-1 ppointer)) brother) @@ -286,19 +284,19 @@ ) (defstate wedge-plat-outer-idle (wedge-plat-outer) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (if (= v1-0 'bonk) - (dummy-22 self) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk) + (the-as symbol (baseplat-method-22 self)) + ) + ) + ) ) :trans (the-as (function none :behavior wedge-plat-outer) plat-trans) :code (behavior () (loop (ja :num-func num-func-identity :frame-num (ja-aframe 0.0 0)) - (if (dummy-27 self) + (if (wedge-plat-method-27 self) (go wedge-plat-outer-tip) ) (suspend) @@ -309,18 +307,16 @@ ) (defstate wedge-plat-outer-tip (wedge-plat-outer) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'bonk) - (dummy-22 self) - ) - ((= v1-0 'touch) - (send-event arg0 'no-look-around (seconds 1.5)) - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('bonk) + (the-as object (baseplat-method-22 self)) + ) + (('touch) + (send-event proc 'no-look-around (seconds 1.5)) + ) + ) + ) ) :trans (the-as (function none :behavior wedge-plat-outer) plat-trans) :code (behavior () @@ -329,7 +325,7 @@ :frame-num (ja-aframe 0.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 60.0 0))) ) @@ -338,14 +334,14 @@ :frame-num (ja-aframe 60.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 100.0 0))) ) (set! (-> self state-time) (-> *display* base-frame-counter)) (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 1)) (ja :num-func num-func-identity :frame-num (ja-aframe 100.0 0)) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) ) (ja-no-eval :group! (-> self draw art-group data 3) @@ -353,7 +349,7 @@ :frame-num (ja-aframe 100.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 153.0 0))) ) @@ -389,7 +385,7 @@ (initialize-skeleton obj *wedge-plat-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-override)) - (dummy-21 obj) + (baseplat-method-21 obj) (set! (-> obj master) (the-as wedge-plat-master (entity-actor-lookup arg0 'alt-actor 0))) (set! (-> obj offset) (res-lump-float arg0 'rotoffset)) (set! (-> obj distance) (res-lump-float arg0 'distance :default 69632.0)) @@ -397,7 +393,3 @@ (go wedge-plat-outer-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/sunken/whirlpool.gc b/goal_src/jak1/levels/sunken/whirlpool.gc index ec660c7467..20c329d1e4 100644 --- a/goal_src/jak1/levels/sunken/whirlpool.gc +++ b/goal_src/jak1/levels/sunken/whirlpool.gc @@ -21,7 +21,7 @@ :size-assert #xcc :flag-assert #x15006000cc (:methods - (dummy-20 (_type_ float) cshape-moving-flags 20) + (whirlpool-method-20 (_type_ float) cshape-moving-flags 20) ) (:states whirlpool-idle @@ -286,7 +286,7 @@ ) ) -(defmethod dummy-20 whirlpool ((obj whirlpool) (arg0 float)) +(defmethod whirlpool-method-20 whirlpool ((obj whirlpool) (arg0 float)) (let* ((gp-0 (target-pos 0)) (f28-0 (vector-vector-xz-distance (-> obj root-override trans) gp-0)) ) @@ -334,7 +334,7 @@ (+! (-> self spin-ry) (* f30-0 (-> *display* seconds-per-frame))) (quaternion-axis-angle! (-> self root-override quat) 0.0 1.0 0.0 (-> self spin-ry)) (if (and *target* (logtest? (-> *target* water flags) (water-flags wt09))) - (dummy-20 self f30-0) + (whirlpool-method-20 self f30-0) ) (update! (-> self sound)) (let ((f0-9 (fmin 1.0 (* 0.000007608261 (fmax 0.0 (+ -28580.979 (fabs f30-0))))))) @@ -405,7 +405,3 @@ (go whirlpool-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/swamp/billy.gc b/goal_src/jak1/levels/swamp/billy.gc index e949fb790a..39fbbaaf0f 100644 --- a/goal_src/jak1/levels/swamp/billy.gc +++ b/goal_src/jak1/levels/swamp/billy.gc @@ -447,7 +447,7 @@ ) ) -(defmethod dummy-38 billy ((obj billy)) +(defmethod process-taskable-method-38 billy ((obj billy)) (case (current-status (-> obj tasks)) (((task-status need-reminder-a) (task-status need-reminder)) (go (method-of-object obj query)) @@ -984,8 +984,8 @@ ) ) -(defmethod TODO-RENAME-43 billy ((obj billy)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 billy ((obj billy)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f30-0 (rand-float-gen))) (cond ((< 0.9411765 f30-0) @@ -1071,7 +1071,7 @@ (countdown (gp-1 (+ (the int (* f30-0 (+ -1.0 (the-as float v1-10)))) 5)) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (suspend) (ja :num! (seek!)) ) @@ -1097,7 +1097,7 @@ ) (defmethod init-from-entity! billy ((obj billy) (arg0 entity-actor)) - (dummy-40 obj arg0 *billy-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *billy-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task swamp-billy))) (dotimes (s5-0 3) (let ((v1-3 (new 'process 'curve-control obj 'path (the float s5-0)))) @@ -1111,6 +1111,6 @@ ) (send-event (handle->process (-> obj farthy)) 'center-joint 3) (send-event (handle->process (-> obj farthy)) 'anim-mode 'clone-anim) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/goal_src/jak1/levels/swamp/kermit.gc b/goal_src/jak1/levels/swamp/kermit.gc index 638e23951a..d00b99c5af 100644 --- a/goal_src/jak1/levels/swamp/kermit.gc +++ b/goal_src/jak1/levels/swamp/kermit.gc @@ -317,7 +317,7 @@ (defpartgroup group-kermit-pulse-impact :id 301 - :duration 5 + :duration (seconds 0.017) :bounds (static-bspherem 0 0 0 3) :parts ((sp-item 1371) (sp-item 1372)) ) @@ -526,10 +526,10 @@ (defstate kermit-pulse-idle (kermit-pulse) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('touch 'attack) - (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) + (send-event proc 'attack (-> event param 0) (new 'static 'attack-info)) (go kermit-pulse-impact) ) ) @@ -861,7 +861,7 @@ nav-enemy-default-event-handler (defbehavior kermit-post kermit () (cond ((-> self airborne) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (set! (-> self collide-info transv x) (-> self nav travel x)) (set! (-> self collide-info transv y) 0.0) (set! (-> self collide-info transv z) (-> self nav travel z)) @@ -879,9 +879,6 @@ nav-enemy-default-event-handler (-> self collide-info transv) (compute-acc-due-to-gravity (-> self collide-info) (new-stack-vector0) 0.0) ) - ;; high fps fix - (*! (-> self collide-info transv x) DISPLAY_FPS_RATIO) - (*! (-> self collide-info transv z) DISPLAY_FPS_RATIO) (integrate-for-enemy-with-move-to-ground! (-> self collide-info) (-> self collide-info transv) @@ -949,7 +946,7 @@ nav-enemy-default-event-handler (set! (-> self state-time) (-> *display* base-frame-counter)) (set-mode! (-> self neck) (joint-mod-handler-mode flex-blend)) (kermit-get-new-patrol-point) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (none) ) :trans (behavior () @@ -1050,7 +1047,7 @@ nav-enemy-default-event-handler (kermit-set-nav-mesh-target (-> self collide-info trans)) ) ) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (none) ) :trans (behavior () @@ -1092,7 +1089,7 @@ nav-enemy-default-event-handler (set! (-> self state-time) (-> *display* base-frame-counter)) (set-mode! (-> self neck) (joint-mod-handler-mode look-at)) (kermit-set-nav-mesh-target (-> self collide-info trans)) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (none) ) :trans (behavior () @@ -1420,7 +1417,7 @@ nav-enemy-default-event-handler (initialize-skeleton obj *kermit-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) (set! (-> obj airborne) #f) - (TODO-RENAME-45 obj *kermit-nav-enemy-info*) + (init-defaults! obj *kermit-nav-enemy-info*) (set-vector! (-> obj neck twist-max) 3640.889 3640.889 0.0 1.0) (set! (-> obj neck up) (the-as uint 1)) (set! (-> obj neck nose) (the-as uint 2)) @@ -1442,7 +1439,3 @@ nav-enemy-default-event-handler (go kermit-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/swamp/swamp-bat.gc b/goal_src/jak1/levels/swamp/swamp-bat.gc index d57df1f22d..af8ede2d1a 100644 --- a/goal_src/jak1/levels/swamp/swamp-bat.gc +++ b/goal_src/jak1/levels/swamp/swamp-bat.gc @@ -21,12 +21,12 @@ :size-assert #x30 :flag-assert #xa00000030 (:methods - (TODO-RENAME-9 (_type_ vector float) vector 9) + (swamp-bat-idle-path-method-9 (_type_ vector float) vector 9) ) ) -(defmethod TODO-RENAME-9 swamp-bat-idle-path ((obj swamp-bat-idle-path) (arg0 vector) (arg1 float)) +(defmethod swamp-bat-idle-path-method-9 swamp-bat-idle-path ((obj swamp-bat-idle-path) (arg0 vector) (arg1 float)) (let ((f30-0 (* 65536.0 arg1))) (set! (-> arg0 quad) (-> obj origin quad)) (vector+*! arg0 arg0 (-> obj x-axis) (cos f30-0)) @@ -89,7 +89,7 @@ :size-assert #x118 :flag-assert #x1500b00118 (:methods - (dummy-20 (_type_) float 20) + (swamp-bat-slave-method-20 (_type_) float 20) ) (:states (swamp-bat-slave-die handle) @@ -109,7 +109,13 @@ (go swamp-bat-slave-die (process->handle arg0)) ) (('touch) - (level-hint-spawn (game-text-id swamp-bat-duck-hint) "sksp0156" (the-as entity #f) *entity-pool* (game-task none)) + (level-hint-spawn + (game-text-id swamp-bat-duck-hint) + "sksp0156" + (the-as entity #f) + *entity-pool* + (game-task none) + ) (send-event arg0 'attack (-> arg3 param 0) (new 'static 'attack-info)) ) (('launch) @@ -126,7 +132,7 @@ swamp-bat-slave-event-handler (transform-post) ) -(defmethod dummy-20 swamp-bat-slave ((obj swamp-bat-slave)) +(defmethod swamp-bat-slave-method-20 swamp-bat-slave ((obj swamp-bat-slave)) (* (get-current-phase (-> obj sync)) (-> obj path-point-count)) ) @@ -135,11 +141,11 @@ swamp-bat-slave-event-handler (s5-0 (new-stack-vector0)) (gp-0 (new-stack-vector0)) (s4-0 (new-stack-vector0)) - (f30-0 (dummy-20 self)) + (f30-0 (swamp-bat-slave-method-20 self)) (s3-0 (new 'static 'vector :y 1.0 :w 1.0)) ) (eval-path-curve-div! s2-0 s5-0 f30-0 'interp) - (TODO-RENAME-12 s2-0 gp-0 f30-0) + (path-control-method-12 s2-0 gp-0 f30-0) (vector-cross! s4-0 gp-0 s3-0) (vector-normalize! s4-0 1.0) (let ((f0-4 (fmax @@ -182,10 +188,9 @@ swamp-bat-slave-event-handler ) (set! (-> self idle-path y-axis w) 1.0) (vector+! (-> self idle-position) (the-as vector (-> self idle-path)) (-> self idle-path x-axis)) - (let ((f0-8 (the float (+ (-> self parent-process 0 path-list (-> self path-select) curve num-cverts) -1)))) - (set! (-> self path-point-count) f0-8) - f0-8 - ) + (set! (-> self path-point-count) + (the float (+ (-> self parent-process 0 path-list (-> self path-select) curve num-cverts) -1)) + ) ) (defstate swamp-bat-slave-idle (swamp-bat-slave) @@ -200,9 +205,12 @@ swamp-bat-slave-event-handler (let ((s4-0 (quaternion-copy! (new 'stack-no-clear 'quaternion) (-> self root-override quat))) (gp-0 (new-stack-quaternion0)) ) - (let ((s2-0 - (TODO-RENAME-12 (-> self parent-process 0 path-list (-> self path-select)) (new 'stack-no-clear 'vector) 0.1) - ) + (let ((s2-0 (path-control-method-12 + (-> self parent-process 0 path-list (-> self path-select)) + (new 'stack-no-clear 'vector) + 0.1 + ) + ) ) 0 (let* ((f0-0 300.0) @@ -305,7 +313,7 @@ swamp-bat-slave-event-handler (ja-channel-push! 1 (seconds 0.1)) (ja :group! swamp-bat-swoop-ja) (loop - (if (>= (dummy-20 self) 2.0) + (if (>= (swamp-bat-slave-method-20 self) 2.0) (go swamp-bat-slave-strafe) ) (ja :num! (loop!)) @@ -323,7 +331,7 @@ swamp-bat-slave-event-handler (ja-channel-push! 1 (seconds 0.1)) (ja :group! swamp-bat-strafe-ja) (loop - (if (>= (dummy-20 self) 6.0) + (if (>= (swamp-bat-slave-method-20 self) 6.0) (go swamp-bat-slave-return) ) (ja :num! (loop!)) @@ -344,7 +352,7 @@ swamp-bat-slave-event-handler (gp-0 #t) ) (loop - (let ((f28-0 (dummy-20 self))) + (let ((f28-0 (swamp-bat-slave-method-20 self))) (if (>= f28-0 f30-0) (go swamp-bat-slave-idle) ) @@ -467,15 +475,12 @@ swamp-bat-slave-event-handler (__assert-zero-lim-range-int arg0 (-> self path-count) "path-index" "(-> self path-count)") ) (let* ((s5-0 (-> self path-list arg0)) - (gp-1 (TODO-RENAME-12 s5-0 (-> self path-select-plane arg0) 5.0)) + (gp-1 (path-control-method-12 s5-0 (-> self path-select-plane arg0) 5.0)) (s5-1 (eval-path-curve-div! s5-0 (new 'stack-no-clear 'vector) 5.0 'interp)) ) (set! (-> gp-1 y) 0.0) (vector-normalize! gp-1 1.0) - (let ((f0-3 (- (vector-dot s5-1 gp-1)))) - (set! (-> gp-1 w) f0-3) - f0-3 - ) + (set! (-> gp-1 w) (- (vector-dot s5-1 gp-1))) ) ) @@ -532,7 +537,9 @@ swamp-bat-slave-event-handler (deactivate self) ) (swamp-bat-update-path) - (if (or (dummy-10 (-> self vol) (target-pos 5)) (not (swamp-bat-check-slave-paths-match? (-> self path-select)))) + (if (or (point-in-vol? (-> self vol) (target-pos 5)) + (not (swamp-bat-check-slave-paths-match? (-> self path-select))) + ) (go swamp-bat-launch-slaves) ) ) @@ -628,7 +635,3 @@ swamp-bat-slave-event-handler (go swamp-bat-idle) (none) ) - - - - diff --git a/goal_src/jak1/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc index 4d806b7cd4..62a250490f 100644 --- a/goal_src/jak1/levels/swamp/swamp-obs.gc +++ b/goal_src/jak1/levels/swamp/swamp-obs.gc @@ -20,7 +20,7 @@ (defpartgroup group-swamp-spike-up :id 289 - :duration 5 + :duration (seconds 0.017) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 8) :parts ((sp-item 1325 :fade-after (meters 120) :falloff-to (meters 120)) @@ -111,7 +111,7 @@ (defpartgroup group-swamp-spike-down :id 290 - :duration 5 + :duration (seconds 0.017) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 8) :parts ((sp-item 1325 :fade-after (meters 120) :falloff-to (meters 120)) @@ -275,16 +275,16 @@ ) (defstate swamp-spike-gate-up (swampgate) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'trigger) - (let ((v0-0 #t)) - (set! (-> self open-gate) v0-0) - v0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('trigger) + (let ((v0-0 #t)) + (set! (-> self open-gate) v0-0) + v0-0 + ) + ) + ) + ) ) :code (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) @@ -417,16 +417,16 @@ ) (defstate balance-plat-idle (balance-plat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'grow) - (let ((v0-0 #t)) - (set! (-> self got-grow) v0-0) - v0-0 - ) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('grow) + (let ((v0-0 #t)) + (set! (-> self got-grow) v0-0) + v0-0 + ) + ) + ) + ) ) :trans (the-as (function none :behavior balance-plat) rider-trans) :code (behavior () @@ -532,7 +532,7 @@ (defpartgroup group-swamp-rock-explosion :id 291 - :duration 300 + :duration (seconds 1) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 8) :parts ((sp-item 1330 :period 1500 :length 5) @@ -635,10 +635,10 @@ ) (defstate swamp-rock-idle (swamp-rock) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('attack) - (if (and (>= arg1 2) (= (-> arg3 param 1) 'eco-yellow)) + (if (and (>= arg1 2) (= (-> event param 1) 'eco-yellow)) (go swamp-rock-break) ) ) @@ -754,16 +754,16 @@ ) -(defmethod TODO-RENAME-22 tar-plat ((obj tar-plat) (arg0 vector) (arg1 float)) +(defmethod rigid-body-platform-method-22 tar-plat ((obj tar-plat) (arg0 vector) (arg1 float)) (+ (-> obj float-height) (-> obj float-height-offset) (* 512.0 (cos (* 109.22667 (+ (* 60.0 arg1) (* 0.03 (-> arg0 x)) (* 0.03 (-> arg0 z)))))) ) ) -(defmethod TODO-RENAME-23 tar-plat ((obj tar-plat) (arg0 float)) +(defmethod rigid-body-platform-method-23 tar-plat ((obj tar-plat) (arg0 float)) ((the-as (function rigid-body-platform basic none) (find-parent-method tar-plat 23)) obj (the-as basic arg0)) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) @@ -820,7 +820,7 @@ :post (the-as (function none :behavior tar-plat) rigid-body-platform-post) ) -(defmethod TODO-RENAME-30 tar-plat ((obj tar-plat)) +(defmethod rigid-body-platform-method-30 tar-plat ((obj tar-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -845,9 +845,9 @@ (none) ) -(defmethod TODO-RENAME-31 tar-plat ((obj tar-plat)) +(defmethod rigid-body-platform-method-31 tar-plat ((obj tar-plat)) (initialize-skeleton obj *tar-plat-sg* '()) - (TODO-RENAME-29 obj *tar-plat-constants*) + (rigid-body-platform-method-29 obj *tar-plat-constants*) (set! (-> obj float-height) (-> obj entity extra trans y)) (set! (-> obj float-height-offset) -2048.0) (let ((s5-0 (-> obj info control-point-count))) @@ -933,7 +933,3 @@ (none) ) ) - - - - diff --git a/goal_src/jak1/levels/swamp/swamp-rat-nest.gc b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc index d770bf944f..2c054a0005 100644 --- a/goal_src/jak1/levels/swamp/swamp-rat-nest.gc +++ b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc @@ -15,7 +15,7 @@ (defpartgroup group-swamp-rat-nest-a-explosion :id 292 - :duration 5 + :duration (seconds 0.017) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 6) :parts ((sp-item 1334) (sp-item 1335) (sp-item 1336) (sp-item 1337) (sp-item 1338) (sp-item 1339)) @@ -23,7 +23,7 @@ (defpartgroup group-swamp-rat-nest-b-explosion :id 293 - :duration 5 + :duration (seconds 0.017) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 6) :parts ((sp-item 1342) (sp-item 1339) (sp-item 1337) (sp-item 1334)) @@ -31,7 +31,7 @@ (defpartgroup group-swamp-rat-nest-c-explosion :id 294 - :duration 5 + :duration (seconds 0.017) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 6) :parts ((sp-item 1335) (sp-item 1339) (sp-item 1337) (sp-item 1334)) @@ -617,8 +617,8 @@ :size-assert #xcc :flag-assert #x16006000cc (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) int 21) + (swamp-rat-nest-dummy-method-20 (_type_) none 20) + (swamp-rat-nest-dummy-method-21 (_type_) int 21) ) (:states swamp-rat-nest-dummy-die @@ -796,7 +796,7 @@ (defbehavior swamp-rat-nest-dummy-init-by-other swamp-rat-nest-dummy ((arg0 swamp-rat-nest-dummy)) (let ((gp-0 (-> arg0 entity))) (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) - (dummy-20 self) + (swamp-rat-nest-dummy-method-20 self) (process-drawable-from-entity! self gp-0) (set! (-> self top-sphere quad) (-> self root-override trans quad)) (set! (-> self top-sphere y) (+ 24576.0 (-> self top-sphere y))) @@ -807,7 +807,7 @@ (logior! (-> self nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7)) (set-current-poly! (-> self nav) (find-poly (-> self nav) (-> self root-override trans))) (+! (-> self parent-process 0 hit-points) 3) - (dummy-21 self) + (swamp-rat-nest-dummy-method-21 self) (when (zero? (-> self skel)) (set! (-> self spawn-joint-count) 0) 0 @@ -852,7 +852,7 @@ swamp-rat-nest-default-event-handler (-> self dummy 0 spawn-joint-array (rand-vu-int-count (-> self dummy 0 spawn-joint-count))) ) -;; WARN: Function may read a register that is not set: t2 +;; ERROR: Function may read a register that is not set: t2 (defbehavior swamp-rat-nest-spawn-rat swamp-rat-nest () (local-vars (t2-0 none)) (the-as @@ -908,8 +908,8 @@ swamp-rat-nest-default-event-handler ) (defstate swamp-rat-nest-idle (swamp-rat-nest) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('hit) (go swamp-rat-nest-active) ) @@ -1083,7 +1083,7 @@ swamp-rat-nest-default-event-handler :bounds (static-spherem 0 0 0 5) ) -(defmethod dummy-20 swamp-rat-nest-dummy-a ((obj swamp-rat-nest-dummy-a)) +(defmethod swamp-rat-nest-dummy-method-20 swamp-rat-nest-dummy-a ((obj swamp-rat-nest-dummy-a)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -1102,7 +1102,7 @@ swamp-rat-nest-default-event-handler (none) ) -(defmethod dummy-20 swamp-rat-nest-dummy-b ((obj swamp-rat-nest-dummy-b)) +(defmethod swamp-rat-nest-dummy-method-20 swamp-rat-nest-dummy-b ((obj swamp-rat-nest-dummy-b)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -1121,7 +1121,7 @@ swamp-rat-nest-default-event-handler (none) ) -(defmethod dummy-20 swamp-rat-nest-dummy-c ((obj swamp-rat-nest-dummy-c)) +(defmethod swamp-rat-nest-dummy-method-20 swamp-rat-nest-dummy-c ((obj swamp-rat-nest-dummy-c)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -1140,7 +1140,7 @@ swamp-rat-nest-default-event-handler (none) ) -(defmethod dummy-21 swamp-rat-nest-dummy-a ((obj swamp-rat-nest-dummy-a)) +(defmethod swamp-rat-nest-dummy-method-21 swamp-rat-nest-dummy-a ((obj swamp-rat-nest-dummy-a)) (let ((v1-0 0)) (let* ((a0-1 '(5 6 7 8 9 10)) (a1-0 (car a0-1)) @@ -1164,7 +1164,7 @@ swamp-rat-nest-default-event-handler ) ) -(defmethod dummy-21 swamp-rat-nest-dummy-b ((obj swamp-rat-nest-dummy-b)) +(defmethod swamp-rat-nest-dummy-method-21 swamp-rat-nest-dummy-b ((obj swamp-rat-nest-dummy-b)) (let ((v1-0 0)) (let* ((a0-1 '(5 9 10 6 7 8)) (a1-0 (car a0-1)) @@ -1188,17 +1188,20 @@ swamp-rat-nest-default-event-handler ) ) -(defmethod dummy-21 swamp-rat-nest-dummy-c ((obj swamp-rat-nest-dummy-c)) +(defmethod swamp-rat-nest-dummy-method-21 swamp-rat-nest-dummy-c ((obj swamp-rat-nest-dummy-c)) (let ((v1-0 0)) - (let* ((a0-1 '(5 6)) (a1-0 (car a0-1))) (while (not (null? a0-1)) - (when (< v1-0 6) - (set! (-> obj spawn-joint-array v1-0) (/ (the-as int a1-0) 8)) - (+! v1-0 1) - ) - (set! a0-1 (cdr a0-1)) - (set! a1-0 (car a0-1)) - ) + (let* ((a0-1 '(5 6)) + (a1-0 (car a0-1)) + ) + (while (not (null? a0-1)) + (when (< v1-0 6) + (set! (-> obj spawn-joint-array v1-0) (/ (the-as int a1-0) 8)) + (+! v1-0 1) ) + (set! a0-1 (cdr a0-1)) + (set! a1-0 (car a0-1)) + ) + ) (set! (-> obj spawn-joint-count) v1-0) ) (set! (-> obj death-part) (-> *part-group-id-table* 294)) @@ -1208,7 +1211,3 @@ swamp-rat-nest-default-event-handler v0-1 ) ) - - - - diff --git a/goal_src/jak1/levels/swamp/swamp-rat.gc b/goal_src/jak1/levels/swamp/swamp-rat.gc index c271f3794d..ac6fc2df85 100644 --- a/goal_src/jak1/levels/swamp/swamp-rat.gc +++ b/goal_src/jak1/levels/swamp/swamp-rat.gc @@ -42,7 +42,7 @@ :longest-edge (meters 1) ) -(defmethod dummy-44 swamp-rat ((obj swamp-rat) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler swamp-rat ((obj swamp-rat) (arg0 process) (arg1 event-message-block)) (when ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) (-> obj collide-info) @@ -91,7 +91,7 @@ swamp-rat-default-event-handler (none) ) -(defmethod TODO-RENAME-38 swamp-rat ((obj swamp-rat)) +(defmethod nav-enemy-method-38 swamp-rat ((obj swamp-rat)) (integrate-for-enemy-with-move-to-ground! (-> obj collide-info) (-> obj collide-info transv) @@ -168,10 +168,7 @@ swamp-rat-default-event-handler ) (set! (-> self delta-wiggle-angle) (* 910.2222 f1-1)) (set! (-> self wiggle-factor) (* 1.5 f2-4)) - (let ((f0-3 (* 28672.0 f0-2))) - (set! (-> self target-speed) f0-3) - f0-3 - ) + (set! (-> self target-speed) (* 28672.0 f0-2)) ) ) @@ -363,7 +360,7 @@ swamp-rat-default-event-handler (suspend) (ja :num! (seek!)) ) - (if (TODO-RENAME-46 self (-> self nav-info stop-chase-distance)) + (if (target-in-range? self (-> self nav-info stop-chase-distance)) (go-virtual nav-enemy-chase) (go-virtual nav-enemy-idle) ) @@ -448,9 +445,9 @@ swamp-rat-default-event-handler (none) ) -(defmethod TODO-RENAME-48 swamp-rat ((obj swamp-rat)) +(defmethod nav-enemy-method-48 swamp-rat ((obj swamp-rat)) (initialize-skeleton obj *swamp-rat-sg* '()) - (TODO-RENAME-45 obj *swamp-rat-nav-enemy-info*) + (init-defaults! obj *swamp-rat-nav-enemy-info*) (vector-float*! (-> obj collide-info scale) *identity-vector* 1.5) (set! (-> obj neck up) (the-as uint 1)) (set! (-> obj neck nose) (the-as uint 2)) @@ -481,12 +478,8 @@ swamp-rat-default-event-handler (vector-float*! (-> self collide-info scale) *identity-vector* 1.5) (vector-float*! (-> self collide-info transv) arg2 49152.0) (set! (-> self entity) (-> arg0 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (set! (-> self enemy-info pickup-type) arg3) (go swamp-rat-spawn) (none) ) - - - - diff --git a/goal_src/jak1/levels/title/title-obs.gc b/goal_src/jak1/levels/title/title-obs.gc index da4e615eca..77f07638f9 100644 --- a/goal_src/jak1/levels/title/title-obs.gc +++ b/goal_src/jak1/levels/title/title-obs.gc @@ -115,31 +115,29 @@ (defstate idle (logo-slave) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (local-vars (v0-0 uint)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'blend-shape) - (cond - ((-> arg3 param 0) - (set! v0-0 (the-as uint (logior (-> self skel status) (janim-status blerc eye)))) - (set! (-> self skel status) (the-as janim-status v0-0)) - ) - (else - (set! v0-0 (the-as uint (logclear (-> self skel status) (janim-status blerc eye)))) - (set! (-> self skel status) (the-as janim-status v0-0)) - ) + (the-as object (case event-type + (('blend-shape) + (cond + ((-> event param 0) + (set! v0-0 (the-as uint (logior (-> self skel status) (janim-status blerc eye)))) + (set! (-> self skel status) (the-as janim-status v0-0)) + ) + (else + (set! v0-0 (the-as uint (logclear (-> self skel status) (janim-status blerc eye)))) + (set! (-> self skel status) (the-as janim-status v0-0)) ) - v0-0 ) - ((= v1-0 'origin-joint-index) - (set! v0-0 (-> arg3 param 0)) - (set! (-> self draw origin-joint-index) v0-0) - v0-0 - ) - ) - ) - ) + v0-0 + ) + (('origin-joint-index) + (set! v0-0 (-> event param 0)) + (set! (-> self draw origin-joint-index) v0-0) + v0-0 + ) + ) + ) ) :code (behavior () (ja-post) @@ -186,13 +184,13 @@ (defstate startup (logo) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (if (= v1-0 'update) - (remove-setting! 'process-mask) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('update) + (the-as symbol (remove-setting! 'process-mask)) + ) + ) + ) ) :exit (behavior () (let ((a0-0 (-> self anim))) @@ -465,13 +463,13 @@ (defstate ndi (logo) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (if (= v1-0 'blackout) - (set-setting! 'bg-a 'abs 1.0 0) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('blackout) + (the-as symbol (set-setting! 'bg-a 'abs 1.0 0)) + ) + ) + ) ) :enter (behavior () (set-setting! 'bg-a 'abs 0.0 0) @@ -490,7 +488,7 @@ ) :trans (behavior () ((-> (method-of-type logo startup) trans)) - (if (and (or *debug-segment* PC_PORT) + (if (and (or *debug-segment* PC_PORT) (cpad-pressed? 0 start circle x) (member (level-status *level* 'village1) '(loaded active)) ) @@ -571,12 +569,12 @@ )) )) (#t - (ja-play-spooled-anim - (-> self anim) - (the-as art-joint-anim #f) - (the-as art-joint-anim #f) - (the-as (function process-drawable symbol) false-func) - ) + (ja-play-spooled-anim + (-> self anim) + (the-as art-joint-anim #f) + (the-as art-joint-anim #f) + (the-as (function process-drawable symbol) false-func) + ) )) (set! (-> self done?) #t) (set-setting! 'bg-a 'abs 1.0 0) @@ -605,15 +603,15 @@ (initialize-skeleton self *logo-japan-sg* '()) (initialize-skeleton self *logo-sg* '()) ) - (case (scf-get-territory) - ((GAME_TERRITORY_SCEI) - (initialize-skeleton self *logo-japan-sg* '()) - ) - (else - (initialize-skeleton self *logo-sg* '()) - ) + (case (scf-get-territory) + ((GAME_TERRITORY_SCEI) + (initialize-skeleton self *logo-japan-sg* '()) + ) + (else + (initialize-skeleton self *logo-sg* '()) ) ) + ) (set! (-> self main-joint) (new 'process 'joint-mod (joint-mod-handler-mode joint-set*) self 3)) (set! (-> self main-joint max-dist) (the-as meters #t)) (set! (-> self next-anim) (new 'static 'spool-anim @@ -709,8 +707,8 @@ (spool-push *art-control* "ndi-intro" 0 self -1.0) ;; PAL patch here (if *sound-player-enable* - (sound-group-pause (sound-group music)) - ) + (sound-group-pause (sound-group music)) + ) (none) ) :code (behavior () @@ -807,17 +805,17 @@ ) (defstate target-title-play (target) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (let ((v1-0 event-type)) (the-as object (cond ((= v1-0 'wait) (go target-title-wait) ) ((= v1-0 'reset) - (deactivate (-> self manipy 0)) + (the-as object (deactivate (-> self manipy 0))) ) (else - (target-generic-event-handler arg0 arg1 arg2 arg3) + (target-generic-event-handler proc arg1 event-type event) ) ) ) @@ -835,17 +833,17 @@ ) (defstate target-title-wait (target) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (let ((v1-0 event-type)) (the-as object (cond ((= v1-0 'play) (go target-title-play) ) ((= v1-0 'reset) - (deactivate (-> self manipy 0)) + (the-as object (deactivate (-> self manipy 0))) ) (else - (target-generic-event-handler arg0 arg1 arg2 arg3) + (target-generic-event-handler proc arg1 event-type event) ) ) ) @@ -904,7 +902,3 @@ :code (the-as (function none :behavior target) anim-loop) :post target-no-move-post ) - - - - diff --git a/goal_src/jak1/levels/training/training-obs.gc b/goal_src/jak1/levels/training/training-obs.gc index dc37a4ce27..6bf19e4f32 100644 --- a/goal_src/jak1/levels/training/training-obs.gc +++ b/goal_src/jak1/levels/training/training-obs.gc @@ -35,8 +35,8 @@ ) ) -(defmethod TODO-RENAME-22 training-water ((obj training-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 training-water ((obj training-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) @@ -264,17 +264,17 @@ (defmethod init-from-entity! tra-pontoon ((obj tra-pontoon) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) + (rigid-body-platform-method-31 obj) (go (method-of-object obj rigid-body-platform-idle)) 0 (none) ) -(defmethod TODO-RENAME-23 tra-pontoon ((obj tra-pontoon) (arg0 float)) +(defmethod rigid-body-platform-method-23 tra-pontoon ((obj tra-pontoon) (arg0 float)) ((the-as (function rigid-body-platform float none) (find-parent-method tra-pontoon 23)) obj arg0) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) @@ -310,7 +310,7 @@ :bounds (static-spherem 0 0 0 5) ) -(defmethod TODO-RENAME-30 tra-pontoon ((obj tra-pontoon)) +(defmethod rigid-body-platform-method-30 tra-pontoon ((obj tra-pontoon)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -335,9 +335,9 @@ (none) ) -(defmethod TODO-RENAME-31 tra-pontoon ((obj tra-pontoon)) +(defmethod rigid-body-platform-method-31 tra-pontoon ((obj tra-pontoon)) (initialize-skeleton obj *tra-pontoon-sg* '()) - (TODO-RENAME-29 obj *tra-pontoon-constants*) + (rigid-body-platform-method-29 obj *tra-pontoon-constants*) (set! (-> obj float-height-offset) 6144.0) (set! (-> obj root-overlay nav-radius) 20480.0) (let ((v1-6 (-> obj control-point-array data))) @@ -384,7 +384,7 @@ :bounds (static-spherem 0 0 0 8) ) -(defmethod TODO-RENAME-24 tra-iris-door ((obj tra-iris-door)) +(defmethod eco-door-method-24 tra-iris-door ((obj tra-iris-door)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -403,7 +403,7 @@ (none) ) -(defmethod TODO-RENAME-25 tra-iris-door ((obj tra-iris-door)) +(defmethod eco-door-method-25 tra-iris-door ((obj tra-iris-door)) (initialize-skeleton obj *tra-iris-door-sg* '()) (set! (-> obj open-distance) 32768.0) (set! (-> obj close-distance) 49152.0) @@ -699,14 +699,15 @@ ) ) (('touch) - (send-shove-back - (-> self root-override) - proc - (the-as touching-shapes-entry (-> event param 0)) - 0.7 - 6144.0 - 16384.0 - ) + (the-as object (send-shove-back + (-> self root-override) + proc + (the-as touching-shapes-entry (-> event param 0)) + 0.7 + 6144.0 + 16384.0 + ) + ) ) ) ) @@ -735,7 +736,7 @@ :virtual #t :code (behavior ((arg0 float) (arg1 vector) (arg2 symbol)) (when (not arg2) - (dummy-10 (-> self skel effect) 'group-scarecrow-hit 4.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-hit 4.0 -1) (ja-channel-push! 1 (seconds 0.07)) (cond ((< (fabs arg0) 8192.0) @@ -763,9 +764,9 @@ (go-virtual idle) ) (clear-collide-with-as (-> self root-override)) - (dummy-10 (-> self skel effect) 'group-scarecrow-joint-explode 12.0 -1) - (dummy-10 (-> self skel effect) 'group-scarecrow-joint-explode 20.0 -1) - (dummy-10 (-> self skel effect) 'group-scarecrow-explode 4.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-joint-explode 12.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-joint-explode 20.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-explode 4.0 -1) (sound-play "break-dummy") (ja-channel-set! 0) (let ((s5-2 (new 'stack 'joint-exploder-tuning 1))) @@ -873,7 +874,7 @@ :virtual #t :code (behavior ((arg0 float) (arg1 vector) (arg2 symbol)) (when (not arg2) - (dummy-10 (-> self skel effect) 'group-scarecrow-hit 4.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-hit 4.0 -1) (ja-channel-push! 1 (seconds 0.07)) (cond ((< (fabs arg0) 8192.0) @@ -901,9 +902,9 @@ (go-virtual idle) ) (clear-collide-with-as (-> self root-override)) - (dummy-10 (-> self skel effect) 'group-scarecrow-joint-explode 12.0 -1) - (dummy-10 (-> self skel effect) 'group-scarecrow-joint-explode 21.0 -1) - (dummy-10 (-> self skel effect) 'group-scarecrow-explode 4.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-joint-explode 12.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-joint-explode 21.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-explode 4.0 -1) (sound-play "break-dummy") (ja-channel-set! 0) (let ((s5-2 (new 'stack 'joint-exploder-tuning 1))) diff --git a/goal_src/jak1/levels/village1/assistant.gc b/goal_src/jak1/levels/village1/assistant.gc index d53f20a2b0..56e97e7eae 100644 --- a/goal_src/jak1/levels/village1/assistant.gc +++ b/goal_src/jak1/levels/village1/assistant.gc @@ -25,7 +25,7 @@ :shadow assistant-shadow-mg ) -(defmethod dummy-52 assistant ((obj assistant)) +(defmethod process-taskable-method-52 assistant ((obj assistant)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -172,8 +172,8 @@ (-> obj draw art-group data 3) ) -(defmethod TODO-RENAME-43 assistant ((obj assistant)) - (let ((s5-0 (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj))) +(defmethod process-taskable-method-43 assistant ((obj assistant)) + (let ((s5-0 (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj))) (when s5-0 (let ((f0-2 (rand-float-gen))) (cond @@ -208,7 +208,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) (loop - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja :group! assistant-idle-leaning-right-ja) (countdown (gp-0 (+ (the int (rand-float-gen)) 2)) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) @@ -366,7 +366,7 @@ ) (defmethod init-from-entity! assistant ((obj assistant) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-sg* 3 31 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-sg* 3 31 (new 'static 'vector :w 4096.0) 5) (set! (-> obj bounce-away) #f) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 122) obj)) (set! (-> obj tasks) (get-task-control (game-task jungle-eggtop))) @@ -383,7 +383,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/village1/explorer.gc b/goal_src/jak1/levels/village1/explorer.gc index f1d411d9e1..07454b7662 100644 --- a/goal_src/jak1/levels/village1/explorer.gc +++ b/goal_src/jak1/levels/village1/explorer.gc @@ -24,7 +24,7 @@ :shadow explorer-shadow-mg ) -(defmethod dummy-52 explorer ((obj explorer)) +(defmethod process-taskable-method-52 explorer ((obj explorer)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -145,8 +145,8 @@ (-> obj draw art-group data 3) ) -(defmethod TODO-RENAME-43 explorer ((obj explorer)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 explorer ((obj explorer)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.85714287 f0-2) @@ -190,7 +190,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) (loop - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja :group! explorer-idle-ja) (let* ((f30-0 2.0) (v1-11 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) @@ -336,14 +336,10 @@ ) (defmethod init-from-entity! explorer ((obj explorer) (arg0 entity-actor)) - (dummy-40 obj arg0 *explorer-sg* 3 42 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *explorer-sg* 3 42 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task village1-uncle-money))) (set! (-> obj sound-flava) (music-flava explorer)) (set! (-> obj draw light-index) (the-as uint 5)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/village1/farmer.gc b/goal_src/jak1/levels/village1/farmer.gc index 35521df52a..974005b0ff 100644 --- a/goal_src/jak1/levels/village1/farmer.gc +++ b/goal_src/jak1/levels/village1/farmer.gc @@ -81,8 +81,8 @@ ) ) -(defmethod TODO-RENAME-43 farmer ((obj farmer)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 farmer ((obj farmer)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.8333333 f0-2) @@ -143,14 +143,10 @@ ) (defmethod init-from-entity! farmer ((obj farmer) (arg0 entity-actor)) - (dummy-40 obj arg0 *farmer-sg* 3 25 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *farmer-sg* 3 25 (new 'static 'vector :w 4096.0) 5) (set! (-> obj root-override nav-radius) 40960.0) (nav-mesh-connect obj (-> obj root-override) (the-as nav-control #f)) (set! (-> obj tasks) (get-task-control (game-task village1-yakow))) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/village1/fishermans-boat.gc b/goal_src/jak1/levels/village1/fishermans-boat.gc index fac4e6c23a..da8a2488e5 100644 --- a/goal_src/jak1/levels/village1/fishermans-boat.gc +++ b/goal_src/jak1/levels/village1/fishermans-boat.gc @@ -260,13 +260,13 @@ :flag-assert #x110000008c (:methods (init! (_type_ vehicle-path (pointer float) (pointer float) int float) none 9) - (TODO-RENAME-10 (_type_ vector float int) none 10) - (dummy-11 (_type_) none 11) - (TODO-RENAME-12 (_type_ int vector) none 12) + (vehicle-controller-method-10 (_type_ vector float int) none 10) + (vehicle-controller-method-11 (_type_) none 11) + (vehicle-controller-method-12 (_type_ int vector) none 12) (move-to-next-point (_type_ vector) none 13) - (TODO-RENAME-14 (_type_ vector vector) none 14) - (dummy-15 (_type_ collide-shape-moving) none 15) - (dummy-16 (_type_) none 16) + (vehicle-controller-method-14 (_type_ vector vector) none 14) + (vehicle-controller-method-15 (_type_ collide-shape-moving) none 15) + (vehicle-controller-method-16 (_type_) none 16) ) ) @@ -278,7 +278,7 @@ (the-as vehicle-controller 0) ) -(defmethod TODO-RENAME-12 vehicle-controller ((obj vehicle-controller) (arg0 int) (arg1 vector)) +(defmethod vehicle-controller-method-12 vehicle-controller ((obj vehicle-controller) (arg0 int) (arg1 vector)) (when (< arg0 (get-point-count (-> obj path))) (set! (-> obj path-dest-index) arg0) (nth-point (-> obj path) arg0 (-> obj path-dest-point)) @@ -318,13 +318,13 @@ (if (>= s4-0 (get-point-count (-> obj path))) (set! s4-0 0) ) - (TODO-RENAME-12 obj s4-0 arg0) + (vehicle-controller-method-12 obj s4-0 arg0) ) 0 (none) ) -(defmethod TODO-RENAME-14 vehicle-controller ((obj vehicle-controller) (arg0 vector) (arg1 vector)) +(defmethod vehicle-controller-method-14 vehicle-controller ((obj vehicle-controller) (arg0 vector) (arg1 vector)) (let ((s5-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'vector)) ) @@ -359,8 +359,8 @@ (none) ) -(defmethod dummy-15 vehicle-controller ((obj vehicle-controller) (arg0 collide-shape-moving)) - (TODO-RENAME-14 obj (-> arg0 trans) (-> obj target-point)) +(defmethod vehicle-controller-method-15 vehicle-controller ((obj vehicle-controller) (arg0 collide-shape-moving)) + (vehicle-controller-method-14 obj (-> arg0 trans) (-> obj target-point)) (let ((s3-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) ) @@ -399,7 +399,7 @@ (none) ) -(defmethod dummy-11 vehicle-controller ((obj vehicle-controller)) +(defmethod vehicle-controller-method-11 vehicle-controller ((obj vehicle-controller)) (format #t "(define *turning-radius-table* (new 'static 'inline-array 'float 0~%") (dotimes (s5-0 (-> obj table-length)) (format #t " (meters ~4,,2M)~%" (-> obj turning-radius-table s5-0)) @@ -416,7 +416,7 @@ (none) ) -(defmethod TODO-RENAME-10 vehicle-controller ((obj vehicle-controller) (arg0 vector) (arg1 float) (arg2 int)) +(defmethod vehicle-controller-method-10 vehicle-controller ((obj vehicle-controller) (arg0 vector) (arg1 float) (arg2 int)) (let ((s3-0 (new 'stack-no-clear 'vector))) (set! (-> s3-0 quad) (-> arg0 quad)) (set! (-> s3-0 y) 0.0) @@ -447,7 +447,7 @@ (none) ) -(defmethod dummy-16 vehicle-controller ((obj vehicle-controller)) +(defmethod vehicle-controller-method-16 vehicle-controller ((obj vehicle-controller)) (debug-draw (-> obj path)) (add-debug-sphere #t @@ -546,7 +546,7 @@ :bounds (static-spherem 0 0 0 1) ) -(defmethod TODO-RENAME-23 fishermans-boat ((obj fishermans-boat) (arg0 float)) +(defmethod rigid-body-platform-method-23 fishermans-boat ((obj fishermans-boat) (arg0 float)) (local-vars (sv-128 int) (sv-144 rigid-body-control-point) (sv-160 int) (sv-176 vector)) (let ((s4-0 (new 'stack-no-clear 'vector)) (s1-0 (new 'stack-no-clear 'vector)) @@ -561,7 +561,7 @@ (set! sv-144 (-> obj control-point-array data sv-128)) (vector-matrix*! s5-0 (-> sv-144 local-pos) s3-0) (set! (-> sv-144 world-pos quad) (-> s5-0 quad)) - (TODO-RENAME-17 (-> obj rbody) s5-0 s1-0) + (rigid-body-method-17 (-> obj rbody) s5-0 s1-0) (set! (-> sv-144 velocity quad) (-> s1-0 quad)) (set! (-> sv-144 world-pos w) (ocean-get-height s5-0)) (let* ((f0-2 (- (-> sv-144 world-pos w) (-> s5-0 y))) @@ -569,17 +569,17 @@ ) (when (< 0.0 f0-2) (vector-float*! s4-0 *y-vector* (* 20.0 f0-2 (-> obj rbody mass))) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) (vector-float*! s4-0 *y-vector* (* 1.6 f30-0 (fmax 0.0 (vector-dot s2-0 s1-0)))) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) (vector-float*! s4-0 s1-0 (* -1.0 (-> obj info drag-factor) f30-0)) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) (vector-float*! s4-0 (the-as vector (-> s3-0 vector)) (* -0.5 (vector-dot (the-as vector (-> s3-0 vector)) s1-0)) ) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) ) ) 0 @@ -590,9 +590,9 @@ (set! sv-176 (-> obj stabilizer-array sv-160 local-pos)) (vector-matrix*! s5-0 (the-as vector (&-> sv-176 x)) s3-0) (vector-rotate*! s0-0 (&+ sv-176 16) s3-0) - (TODO-RENAME-17 (-> obj rbody) s5-0 s1-0) + (rigid-body-method-17 (-> obj rbody) s5-0 s1-0) (vector-float*! s4-0 s0-0 (* -1.0 (vector-dot s0-0 s1-0))) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) 0 (set! sv-160 (+ sv-160 1)) ) @@ -606,7 +606,7 @@ (if (< 81920.0 (vector-length s4-0)) (vector-normalize! s4-0 81920.0) ) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) (vector+*! s5-0 (-> s3-0 vector 3) s2-0 -24576.0) (vector+*! s1-1 (-> obj dock-point) (-> obj dest-dir) -24576.0) (vector-! s4-0 s1-1 s5-0) @@ -616,7 +616,7 @@ (if (< 81920.0 (vector-length s4-0)) (vector-normalize! s4-0 81920.0) ) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) ) (when (-> obj ignition) (let ((s2-1 (new 'stack-no-clear 'vector))) @@ -626,11 +626,11 @@ (vector-normalize! s2-1 1.0) (vector-float*! s4-0 s2-1 (-> obj engine-thrust)) ) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) ) ) - (TODO-RENAME-26 obj) - (TODO-RENAME-25 obj) + (rigid-body-platform-method-26 obj) + (rigid-body-platform-method-25 obj) 0 (none) ) @@ -643,7 +643,7 @@ ) (defbehavior fishermans-boat-set-path-point fishermans-boat ((arg0 int)) - (TODO-RENAME-12 (-> self controller) arg0 (-> self root-overlay trans)) + (vehicle-controller-method-12 (-> self controller) arg0 (-> self root-overlay trans)) (vector-normalize-copy! (-> self dest-dir) (-> self controller path-dest-velocity) 1.0) 0 (none) @@ -755,7 +755,7 @@ (when (and *target* (-> self ignition)) (cond ((-> self auto-pilot) - (dummy-15 (-> self controller) (-> self root-overlay)) + (vehicle-controller-method-15 (-> self controller) (-> self root-overlay)) (vector-normalize-copy! (-> self dest-dir) (-> self controller path-dest-velocity) 1.0) ) (else @@ -803,11 +803,11 @@ (seek! (-> self propeller spin-rate) 0.0 218.45334) ) ) - (TODO-RENAME-28 self) + (rigid-body-platform-method-28 self) (quaternion-copy! (-> self root-overlay quat) (-> self rbody rotation)) - (TODO-RENAME-18 (-> self rbody) (-> self root-overlay trans)) + (rigid-body-method-18 (-> self rbody) (-> self root-overlay trans)) (when (-> self debug-draw) - (dummy-16 (-> self controller)) + (vehicle-controller-method-16 (-> self controller)) (add-debug-sphere #t (bucket-id debug-no-zbuf) @@ -1122,13 +1122,7 @@ :trans (behavior () (when (fishermans-boat-enter-dock?) (set! (-> self waiting-for-player) #f) - (level-hint-spawn - (game-text-id sidekick-misty) - "sksp0060" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (game-text-id sidekick-misty) "sksp0060" (the-as entity #f) *entity-pool* (game-task none)) (when #t (set! (-> *camera* cam-entity) (the-as entity #t)) (send-event *camera* 'clear-entity) @@ -1229,7 +1223,7 @@ (suspend) ) (vector-z-quaternion! gp-0 (-> self root-overlay quat)) - (TODO-RENAME-10 (-> self controller) gp-0 (-> self controller throttle) s5-0) + (vehicle-controller-method-10 (-> self controller) gp-0 (-> self controller throttle) s5-0) (let ((s3-0 (-> *display* base-frame-counter))) (until (>= (- (-> *display* base-frame-counter) s3-0) (seconds 1)) (fishermans-boat-set-throttle-by-speed f30-0) @@ -1239,7 +1233,7 @@ ) ) (vector-z-quaternion! gp-0 (-> self root-overlay quat)) - (TODO-RENAME-10 (-> self controller) gp-0 (-> self controller throttle) s5-0) + (vehicle-controller-method-10 (-> self controller) gp-0 (-> self controller throttle) s5-0) (+! s5-0 1) ) ) @@ -1263,7 +1257,7 @@ ) ) -(defmethod TODO-RENAME-30 fishermans-boat ((obj fishermans-boat)) +(defmethod rigid-body-platform-method-30 fishermans-boat ((obj fishermans-boat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1296,7 +1290,7 @@ (none) ) -(defmethod TODO-RENAME-31 fishermans-boat ((obj fishermans-boat)) +(defmethod rigid-body-platform-method-31 fishermans-boat ((obj fishermans-boat)) (initialize-skeleton obj *fishermans-boat-sg* '()) (logclear! (-> obj mask) (process-mask actor-pause movie)) (logior! (-> obj skel status) (janim-status inited)) @@ -1337,7 +1331,7 @@ (set! (-> obj root-overlay trans quad) (-> obj dock-point quad)) (set! (-> obj root-overlay trans y) 0.0) (forward-up-nopitch->quaternion (-> obj root-overlay quat) (-> obj dest-dir) *up-vector*) - (TODO-RENAME-29 obj *fishermans-boat-constants*) + (rigid-body-platform-method-29 obj *fishermans-boat-constants*) (let ((v1-39 (-> obj control-point-array data))) (set! (-> v1-39 0 local-pos x) 0.0) (set! (-> v1-39 0 local-pos y) 0.0) @@ -1408,9 +1402,9 @@ (defmethod init-from-entity! fishermans-boat ((obj fishermans-boat) (arg0 entity-actor)) (stack-size-set! (-> obj main-thread) 512) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) + (rigid-body-platform-method-31 obj) (if (= (-> *game-info* current-continue level) 'misty) (go fishermans-boat-docked-misty) (go fishermans-boat-docked-village) @@ -1419,7 +1413,7 @@ ) (defbehavior fishermans-boat-reset-physics fishermans-boat () - (TODO-RENAME-22 + (rigid-body-method-22 (-> self rbody) (-> self root-overlay trans) (-> self root-overlay quat) @@ -1495,13 +1489,7 @@ (suspend) ) (suspend) - (level-hint-spawn - (game-text-id sidekick-misty) - "sksp0060" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn (game-text-id sidekick-misty) "sksp0060" (the-as entity #f) *entity-pool* (game-task none)) (none) ) :to self @@ -1518,48 +1506,46 @@ ) (defstate fishermans-boat-ride-to-village1 (fishermans-boat) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as - object - (cond - ((= v1-0 'evilbro) - (when (= (level-status *level* 'intro) 'active) - (let ((gp-1 (entity-by-name "evilbro-2"))) - (when gp-1 - (set! (-> self evilbro) - (ppointer->handle (manipy-spawn (-> self root-overlay trans) gp-1 *fb-evilbro-sg* #f :to self)) - ) - (send-event (handle->process (-> self evilbro)) 'anim-mode 'clone-anim) - (send-event (handle->process (-> self evilbro)) 'blend-shape #t) - (send-event (handle->process (-> self evilbro)) 'center-joint 3) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as + object + (case event-type + (('evilbro) + (when (= (level-status *level* 'intro) 'active) + (let ((gp-1 (entity-by-name "evilbro-2"))) + (when gp-1 + (set! (-> self evilbro) + (ppointer->handle (manipy-spawn (-> self root-overlay trans) gp-1 *fb-evilbro-sg* #f :to self)) + ) + (send-event (handle->process (-> self evilbro)) 'anim-mode 'clone-anim) + (send-event (handle->process (-> self evilbro)) 'blend-shape #t) + (send-event (handle->process (-> self evilbro)) 'center-joint 3) ) - (let ((gp-2 (entity-by-name "evilsis-2"))) - (when gp-2 - (set! (-> self evilsis) - (ppointer->handle (manipy-spawn (-> self root-overlay trans) gp-2 *fb-evilsis-sg* #f :to self)) - ) - (send-event (handle->process (-> self evilsis)) 'anim-mode 'clone-anim) - (send-event (handle->process (-> self evilsis)) 'blend-shape #t) - (send-event (handle->process (-> self evilsis)) 'center-joint 3) - ) + ) + (let ((gp-2 (entity-by-name "evilsis-2"))) + (when gp-2 + (set! (-> self evilsis) + (ppointer->handle (manipy-spawn (-> self root-overlay trans) gp-2 *fb-evilsis-sg* #f :to self)) + ) + (send-event (handle->process (-> self evilsis)) 'anim-mode 'clone-anim) + (send-event (handle->process (-> self evilsis)) 'blend-shape #t) + (send-event (handle->process (-> self evilsis)) 'center-joint 3) ) ) ) - ((= v1-0 'evilsis) - (let ((a0-44 (handle->process (-> self evilbro)))) - (if a0-44 - (deactivate a0-44) - ) - ) - (let ((a0-48 (handle->process (-> self evilsis)))) - (if a0-48 - (deactivate a0-48) - ) - ) + ) + (('evilsis) + (let ((a0-44 (handle->process (-> self evilbro)))) + (if a0-44 + (deactivate a0-44) + ) ) - ) + (let ((a0-48 (handle->process (-> self evilsis)))) + (if a0-48 + (the-as object (deactivate a0-48)) + ) + ) + ) ) ) ) @@ -1620,7 +1606,3 @@ (none) ) ) - - - - diff --git a/goal_src/jak1/levels/village1/sage.gc b/goal_src/jak1/levels/village1/sage.gc index 82a489f90c..27d6228929 100644 --- a/goal_src/jak1/levels/village1/sage.gc +++ b/goal_src/jak1/levels/village1/sage.gc @@ -335,7 +335,7 @@ ) ) -(defmethod dummy-45 sage ((obj sage)) +(defmethod process-taskable-method-45 sage ((obj sage)) (cond ((and (closed? (-> obj tasks) (game-task beach-ecorocks) (task-status need-reminder)) (= (get-reminder (-> obj tasks) 0) 0) @@ -372,7 +372,7 @@ ) (save-reminder (-> obj tasks) 1 0) ) - ((dummy-45 obj) + ((process-taskable-method-45 obj) (set! (-> obj reminder-played) #f) (cond ((= (current-task (-> obj tasks)) (game-task none)) @@ -418,8 +418,8 @@ ) ) -(defmethod TODO-RENAME-43 sage ((obj sage)) - (let ((s5-0 (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj))) +(defmethod process-taskable-method-43 sage ((obj sage)) + (let ((s5-0 (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj))) (when s5-0 (let ((f0-2 (rand-float-gen))) (cond @@ -471,7 +471,7 @@ (v1-10 (the-as number (logior #x3f800000 v1-9))) ) (countdown (gp-1 (+ (the int (* f30-0 (+ -1.0 (the-as float v1-10)))) 5)) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (-> self reminder-played) @@ -580,16 +580,12 @@ ) (defmethod init-from-entity! sage ((obj sage) (arg0 entity-actor)) - (dummy-40 obj arg0 *sage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *sage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task misty-cannon))) (set! (-> obj reminder-played) #f) (set! (-> obj sound-flava) (music-flava sage)) (set! (-> obj assistant) (the-as handle #f)) (set! (-> obj draw light-index) (the-as uint 1)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/village1/sequence-a-village1.gc b/goal_src/jak1/levels/village1/sequence-a-village1.gc index 49566d8c47..003f2af3ca 100644 --- a/goal_src/jak1/levels/village1/sequence-a-village1.gc +++ b/goal_src/jak1/levels/village1/sequence-a-village1.gc @@ -11,7 +11,7 @@ (defpartgroup group-sequenceAV-splash :id 686 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 2854 :period 900 :length 600)) @@ -42,8 +42,8 @@ (defpartgroup group-sequenceAV-spit :id 687 - :duration 5 - :linger-duration 900 + :duration (seconds 0.017) + :linger-duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 2855)) @@ -261,8 +261,8 @@ (defstate play-anim (sequenceA-village1) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('sidekick-human) (format 0 "got sidekick-human~%") (when (= (level-status *level* 'misty) 'active) @@ -377,7 +377,7 @@ (defbehavior sequenceA-village1-init-by-other sequenceA-village1 ((arg0 entity-actor)) (set! (-> self entity) arg0) - (dummy-40 self arg0 *sage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 self arg0 *sage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> self tasks) (get-task-control (game-task intro))) (set! (-> self boat) (the-as handle #f)) (set! (-> self side) (the-as handle #f)) @@ -399,7 +399,3 @@ 0 (none) ) - - - - diff --git a/goal_src/jak1/levels/village1/village-obs.gc b/goal_src/jak1/levels/village1/village-obs.gc index 4afe1675b6..e1a348dd5f 100644 --- a/goal_src/jak1/levels/village1/village-obs.gc +++ b/goal_src/jak1/levels/village1/village-obs.gc @@ -405,7 +405,7 @@ (defmethod run-logic? windspinner ((obj windspinner)) - (or (zero? (logand (-> obj mask) (process-mask actor-pause))) + (or (not (logtest? (-> obj mask) (process-mask actor-pause))) (or (and (nonzero? (-> obj draw)) (logtest? (-> obj draw status) (draw-status was-drawn)) (>= (+ (-> *ACTOR-bank* pause-dist) (-> obj root pause-adjust-distance)) @@ -803,9 +803,9 @@ (none) ) -(defmethod TODO-RENAME-48 starfish ((obj starfish)) +(defmethod nav-enemy-method-48 starfish ((obj starfish)) (initialize-skeleton obj *starfish-sg* '()) - (TODO-RENAME-45 obj *starfish-nav-enemy-info*) + (init-defaults! obj *starfish-nav-enemy-info*) 0 (none) ) @@ -817,7 +817,7 @@ (quaternion-copy! (-> self collide-info quat) (-> arg0 collide-info quat)) (vector-identity! (-> self collide-info scale)) (set! (-> self entity) (-> arg0 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (go starfish-idle) (none) ) @@ -934,10 +934,7 @@ (defun set-period ((arg0 cyclegen) (arg1 int)) - (let ((f0-1 (/ 5.0 (the float arg1)))) - (set! (-> arg0 inc) f0-1) - f0-1 - ) + (set! (-> arg0 inc) (/ 5.0 (the float arg1))) ) (defun update-clock ((arg0 cyclegen)) @@ -1087,8 +1084,8 @@ ) ) -(defmethod TODO-RENAME-22 villagea-water ((obj villagea-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 villagea-water ((obj villagea-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) @@ -1101,7 +1098,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/village1/yakow.gc b/goal_src/jak1/levels/village1/yakow.gc index 5a68393f5b..fb1bbb5d11 100644 --- a/goal_src/jak1/levels/village1/yakow.gc +++ b/goal_src/jak1/levels/village1/yakow.gc @@ -138,46 +138,44 @@ ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 52] ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 54] (defbehavior yakow-default-event-handler yakow ((arg0 process-drawable) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (cond - ((= v1-0 'touch) - (let* ((s4-0 arg0) - (v1-2 (if (and (nonzero? s4-0) (type-type? (-> s4-0 type) process-drawable)) - s4-0 - ) - ) - ) - (when (and v1-2 (< 8192.0 (- (-> v1-2 root trans y) (-> self root-override trans y)))) - (do-push-aways! (-> self root-override)) - (send-shove-back - (-> self root-override) - arg0 - (the-as touching-shapes-entry (-> arg3 param 0)) - 0.7 - 6144.0 - 16384.0 - ) - ) - ) - ) - ((= v1-0 'attack) - (let ((v1-9 (-> arg3 param 2))) - (cond - ((!= v1-9 (-> self player-attack-id)) - (set! (-> self player-attack-id) (the-as int v1-9)) - (if (-> self vulnerable) - (go yakow-kicked) - ) + (the-as object (case arg2 + (('touch) + (let* ((s4-0 arg0) + (v1-2 (if (and (nonzero? s4-0) (type-type? (-> s4-0 type) process-drawable)) + s4-0 + ) + ) ) - (else - 'push - ) + (when (and v1-2 (< 8192.0 (- (-> v1-2 root trans y) (-> self root-override trans y)))) + (do-push-aways! (-> self root-override)) + (send-shove-back + (-> self root-override) + arg0 + (the-as touching-shapes-entry (-> arg3 param 0)) + 0.7 + 6144.0 + 16384.0 ) ) ) - ) - ) - ) + ) + (('attack) + (let ((v1-9 (-> arg3 param 2))) + (cond + ((!= v1-9 (-> self player-attack-id)) + (set! (-> self player-attack-id) (the-as int v1-9)) + (if (-> self vulnerable) + (go yakow-kicked) + ) + ) + (else + 'push + ) + ) + ) + ) + ) + ) ) yakow-default-event-handler @@ -215,13 +213,13 @@ yakow-default-event-handler ) (suspend) ) - (level-hint-spawn - (game-text-id village1-yakow-resolution) - "sksp018a" - (the-as entity #f) - *entity-pool* - (game-task none) - ) + (level-hint-spawn + (game-text-id village1-yakow-resolution) + "sksp018a" + (the-as entity #f) + *entity-pool* + (game-task none) + ) (none) ) :to self @@ -252,7 +250,7 @@ yakow-default-event-handler ) (defbehavior yakow-post yakow () - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (set! (-> self rotating) #f) (let ((f30-0 0.0)) (when (< 40.96 (vector-length (-> self nav travel))) @@ -309,7 +307,7 @@ yakow-default-event-handler ) ) (set! (-> self travel-speed) (fmin (-> self travel-speed) (-> self final-speed))) - (dummy-10 (-> self water)) + (water-control-method-10 (-> self water)) (when (and (logtest? (-> self nav current-poly pat) 2) (not (and (-> self entity) (logtest? (-> self entity extra perm status) (entity-perm-status complete)))) ) @@ -330,7 +328,7 @@ yakow-default-event-handler (set! (-> gp-1 y) 0.0) (set! (-> self nav travel quad) (-> gp-1 quad)) (vector-normalize! (-> self nav travel) 409600.0) - (dummy-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) + (nav-control-method-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) (when (not (-> self enable-turn-around)) (set! (-> gp-1 quad) (-> self nav travel quad)) (let ((f30-0 (vector-length gp-1))) @@ -341,7 +339,7 @@ yakow-default-event-handler ) (set! (-> self nav travel quad) (-> s5-1 quad)) (vector-normalize! (-> self nav travel) 409600.0) - (dummy-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) + (nav-control-method-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) (vector-length (-> self nav travel)) ) ) @@ -479,10 +477,10 @@ yakow-default-event-handler (loop (cond ((rand-vu-percent? 0.2) - (dummy-10 (-> self skel effect) 'yakow-1 0.0 -1) + (effect-control-method-10 (-> self skel effect) 'yakow-1 0.0 -1) ) ((rand-vu-percent? 0.2) - (dummy-10 (-> self skel effect) 'yakow-2 0.0 -1) + (effect-control-method-10 (-> self skel effect) 'yakow-2 0.0 -1) ) ) (let ((f30-0 (rand-vu-float-range 0.9 1.1))) @@ -562,7 +560,7 @@ yakow-default-event-handler ) :code (the-as (function vector none :behavior yakow) yakow-blend-walk-run) :post (behavior () - (dummy-19 + (nav-control-method-19 (-> self nav) (-> self nav target-pos) (-> self root-override) @@ -836,7 +834,3 @@ yakow-default-event-handler ) (none) ) - - - - diff --git a/goal_src/jak1/levels/village2/assistant-village2.gc b/goal_src/jak1/levels/village2/assistant-village2.gc index 4081637493..19801a0959 100644 --- a/goal_src/jak1/levels/village2/assistant-village2.gc +++ b/goal_src/jak1/levels/village2/assistant-village2.gc @@ -59,7 +59,7 @@ :bounds (static-spherem 0 0 0 0.25) ) -(defmethod dummy-52 assistant-levitator ((obj assistant-levitator)) +(defmethod process-taskable-method-52 assistant-levitator ((obj assistant-levitator)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -465,8 +465,8 @@ (the-as symbol 0) ) -(defmethod TODO-RENAME-43 assistant-bluehut ((obj assistant-bluehut)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 assistant-bluehut ((obj assistant-bluehut)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f30-0 (rand-float-gen))) (cond ((= (get-task-status (game-task village2-levitator)) (task-status invalid)) @@ -507,7 +507,7 @@ (let ((f0-9 (rand-float-gen))) (cond ((< f0-9 0.33333334) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja-no-eval :group! assistant-village2-idle-hut-look-right-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) @@ -600,7 +600,7 @@ (defmethod should-display? assistant-bluehut ((obj assistant-bluehut)) (cond ((not (closed? (-> obj tasks) (game-task village2-levitator) (task-status unknown))) - (dummy-33 obj) + (process-taskable-method-33 obj) #f ) ((or (= (get-task-status (game-task village2-levitator)) (task-status need-reward-speech)) (sages-kidnapped?)) @@ -694,7 +694,7 @@ ) (defmethod init-from-entity! assistant-bluehut ((obj assistant-bluehut) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-village2-sg* 3 31 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-village2-sg* 3 31 (new 'static 'vector :w 4096.0) 5) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 288) obj)) (set! (-> obj tasks) (get-task-control (game-task village2-levitator))) (set! (-> obj jaws) (the-as handle #f)) @@ -702,7 +702,7 @@ (set! (-> obj im-talking) #t) (set! (-> obj draw light-index) (the-as uint 1)) (set! (-> obj sound-id) (new-sound-id)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -987,7 +987,7 @@ (defpartgroup group-levitator-on-big :id 660 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 2751 :fade-after (meters 100) :falloff-to (meters 100) :binding 2750) @@ -1129,7 +1129,7 @@ (defpartgroup group-levitator-on-small :id 661 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 2679)) @@ -1467,7 +1467,7 @@ ) (defmethod init-from-entity! assistant-levitator ((obj assistant-levitator) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-village2-sg* 3 31 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-village2-sg* 3 31 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task village2-levitator))) (set! (-> obj boulder) (entity-actor-lookup arg0 'alt-actor 0)) (set! (-> obj particle 0) (create-launch-control (-> *part-group-id-table* 658) obj)) @@ -1479,11 +1479,7 @@ ) (if (= (get-task-status (game-task village2-levitator)) (task-status invalid)) (go just-particles) - (dummy-42 obj) + (process-taskable-method-42 obj) ) (none) ) - - - - diff --git a/goal_src/jak1/levels/village2/flutflut-bluehut.gc b/goal_src/jak1/levels/village2/flutflut-bluehut.gc index 18f90b2190..bd4e32cfc1 100644 --- a/goal_src/jak1/levels/village2/flutflut-bluehut.gc +++ b/goal_src/jak1/levels/village2/flutflut-bluehut.gc @@ -115,13 +115,9 @@ ) (defmethod init-from-entity! flutflut-bluehut ((obj flutflut-bluehut) (arg0 entity-actor)) - (dummy-40 obj arg0 *flutflut-bluehut-sg* 3 0 (new 'static 'vector :w 4096.0) 27) + (process-taskable-method-40 obj arg0 *flutflut-bluehut-sg* 3 0 (new 'static 'vector :w 4096.0) 27) (set! (-> obj tasks) (get-task-control (game-task village2-levitator))) (set! (-> obj draw light-index) (the-as uint 1)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/village2/gambler.gc b/goal_src/jak1/levels/village2/gambler.gc index 08b019c70e..0a2dcc9613 100644 --- a/goal_src/jak1/levels/village2/gambler.gc +++ b/goal_src/jak1/levels/village2/gambler.gc @@ -124,8 +124,8 @@ (-> obj draw art-group data 7) ) -(defmethod TODO-RENAME-43 gambler ((obj gambler)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 61440.0 obj) +(defmethod process-taskable-method-43 gambler ((obj gambler)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 61440.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.9230769 f0-2) @@ -187,7 +187,7 @@ (suspend) (ja :num! (seek!)) ) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (let ((f0-9 (rand-float-gen))) (cond ((< f0-9 0.16666667) @@ -216,14 +216,10 @@ ) (defmethod init-from-entity! gambler ((obj gambler) (arg0 entity-actor)) - (dummy-40 obj arg0 *gambler-sg* 3 32 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *gambler-sg* 3 32 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task rolling-race))) (set! (-> obj sound-flava) (music-flava gambler)) (set! (-> obj draw light-index) (the-as uint 4)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/village2/geologist.gc b/goal_src/jak1/levels/village2/geologist.gc index 26fd564ca5..4d74ce1a13 100644 --- a/goal_src/jak1/levels/village2/geologist.gc +++ b/goal_src/jak1/levels/village2/geologist.gc @@ -116,8 +116,8 @@ (-> obj draw art-group data 5) ) -(defmethod TODO-RENAME-43 geologist ((obj geologist)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 geologist ((obj geologist)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.8888889 f0-2) @@ -162,14 +162,10 @@ ) (defmethod init-from-entity! geologist ((obj geologist) (arg0 entity-actor)) - (dummy-40 obj arg0 *geologist-sg* 3 45 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *geologist-sg* 3 45 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task rolling-moles))) (set! (-> obj sound-flava) (music-flava geologist)) (set! (-> obj draw light-index) (the-as uint 2)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/village2/sage-bluehut.gc b/goal_src/jak1/levels/village2/sage-bluehut.gc index d5409c5dbd..d5010d0a85 100644 --- a/goal_src/jak1/levels/village2/sage-bluehut.gc +++ b/goal_src/jak1/levels/village2/sage-bluehut.gc @@ -128,7 +128,7 @@ ) ) -(defmethod dummy-45 sage-bluehut ((obj sage-bluehut)) +(defmethod process-taskable-method-45 sage-bluehut ((obj sage-bluehut)) (cond ((= (current-status (-> obj tasks)) (task-status unknown)) #f @@ -171,7 +171,7 @@ ) (save-reminder (-> obj tasks) 1 0) ) - ((dummy-45 obj) + ((process-taskable-method-45 obj) (set! (-> obj reminder-played) #f) (cond ((closed? (-> obj tasks) (game-task rolling-plants) (task-status need-reminder)) @@ -233,8 +233,8 @@ v0-1 ) -(defmethod TODO-RENAME-43 sage-bluehut ((obj sage-bluehut)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 sage-bluehut ((obj sage-bluehut)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.8 f0-2) @@ -273,10 +273,10 @@ (v1-16 (the-as number (logior #x3f800000 v1-15))) ) (countdown (gp-1 (+ (the int (* f30-0 (+ -1.0 (the-as float v1-16)))) 5)) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (if (dummy-45 self) + (if (process-taskable-method-45 self) (go-virtual idle) ) (suspend) @@ -287,7 +287,7 @@ (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! sage-bluehut-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (if (dummy-45 self) + (if (process-taskable-method-45 self) (go-virtual idle) ) (suspend) @@ -295,14 +295,14 @@ ) ) (else - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (if (!= (ja-group) gp-0) (ja-channel-push! 1 (seconds 0.2)) ) (set! (-> self skel root-channel 0 frame-group) (the-as art-joint-anim gp-0)) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (if (dummy-45 self) + (if (process-taskable-method-45 self) (go-virtual idle) ) (suspend) @@ -317,16 +317,12 @@ ) (defmethod init-from-entity! sage-bluehut ((obj sage-bluehut) (arg0 entity-actor)) - (dummy-40 obj arg0 *sage-bluehut-sg* 3 40 (new 'static 'vector :w 4505.6) 5) + (process-taskable-method-40 obj arg0 *sage-bluehut-sg* 3 40 (new 'static 'vector :w 4505.6) 5) (set! (-> obj tasks) (get-task-control (game-task rolling-plants))) (set! (-> obj reminder-played) #f) (set! (-> obj assistant) (entity-actor-lookup arg0 'alt-actor 0)) (set! (-> obj draw light-index) (the-as uint 1)) (set! (-> obj sound-flava) (music-flava sage)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/village2/sunken-elevator.gc b/goal_src/jak1/levels/village2/sunken-elevator.gc index 8d9fc36674..2469cc5697 100644 --- a/goal_src/jak1/levels/village2/sunken-elevator.gc +++ b/goal_src/jak1/levels/village2/sunken-elevator.gc @@ -179,7 +179,7 @@ (none) ) -(defmethod TODO-RENAME-27 sunken-elevator ((obj sunken-elevator)) +(defmethod plat-button-method-27 sunken-elevator ((obj sunken-elevator)) (ja-channel-set! 1) (cond ((can-activate? obj) @@ -210,12 +210,8 @@ (none) ) -(defmethod TODO-RENAME-31 sunken-elevator ((obj sunken-elevator)) +(defmethod plat-button-method-31 sunken-elevator ((obj sunken-elevator)) (initialize-skeleton obj *sunken-elevator-sg* '()) 0 (none) ) - - - - diff --git a/goal_src/jak1/levels/village2/swamp-blimp.gc b/goal_src/jak1/levels/village2/swamp-blimp.gc index b4c37f38b6..68b47abe9b 100644 --- a/goal_src/jak1/levels/village2/swamp-blimp.gc +++ b/goal_src/jak1/levels/village2/swamp-blimp.gc @@ -45,7 +45,7 @@ (defpartgroup group-tetherrock-explode :id 285 - :duration 150 + :duration (seconds 0.5) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 16) :parts ((sp-item 2065 :period 600 :length 5) @@ -339,7 +339,7 @@ :flag-assert #xb00000018 (:methods (init! (_type_ float float float float) none 9) - (TODO-RENAME-10 (_type_ float) none 10) + (swamp-rope-oscillator-method-10 (_type_ float) none 10) ) ) @@ -355,7 +355,7 @@ (none) ) -(defmethod TODO-RENAME-10 swamp-rope-oscillator ((obj swamp-rope-oscillator) (arg0 float)) +(defmethod swamp-rope-oscillator-method-10 swamp-rope-oscillator ((obj swamp-rope-oscillator) (arg0 float)) (let ((f0-3 (* (- (+ (-> obj target) arg0) (-> obj value)) (* (-> obj accel) (-> *display* time-adjust-ratio))))) (+! (-> obj vel) f0-3) ) @@ -424,7 +424,7 @@ :flag-assert #xb0000003c (:methods (init! (_type_ vector float float float) none 9) - (TODO-RENAME-10 (_type_ vector) none 10) + (swamp-blimp-oscillator-method-10 (_type_ vector) none 10) ) ) @@ -448,7 +448,7 @@ (none) ) -(defmethod TODO-RENAME-10 swamp-blimp-oscillator ((obj swamp-blimp-oscillator) (arg0 vector)) +(defmethod swamp-blimp-oscillator-method-10 swamp-blimp-oscillator ((obj swamp-blimp-oscillator) (arg0 vector)) (let ((gp-0 (new 'stack-no-clear 'vector))) (cond (arg0 @@ -538,7 +538,7 @@ :size-assert #x120 :flag-assert #x1500b00120 (:methods - (dummy-20 (_type_) basic 20) + (swamp-rope-method-20 (_type_) basic 20) ) (:states swamp-rope-break @@ -548,7 +548,7 @@ ) -(defmethod dummy-20 swamp-rope ((obj swamp-rope)) +(defmethod swamp-rope-method-20 swamp-rope ((obj swamp-rope)) (and (-> obj other-entity) (not (task-closed? (-> obj other-entity extra perm task) (task-status need-reminder))) ) @@ -817,17 +817,17 @@ ) (defstate swamp-tetherrock-idle (swamp-tetherrock) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('attack) - (when (and (>= arg1 2) (= (-> arg3 param 1) 'eco-yellow)) + (when (and (>= arg1 2) (= (-> event param 1) 'eco-yellow)) (+! (-> self hits) 1) (cond ((>= (-> self hits) 1) (go swamp-tetherrock-break) ) (else - (let* ((s5-0 arg0) + (let* ((s5-0 proc) (gp-0 (if (and (nonzero? s5-0) (type-type? (-> s5-0 type) process-drawable)) s5-0 ) @@ -1001,8 +1001,8 @@ ) (defstate precursor-arm-idle (precursor-arm) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('arm-sink-evt) (go precursor-arm-sink) ) @@ -1248,7 +1248,7 @@ (defbehavior swamp-rope-trans swamp-rope () (vector<-cspace! (-> self root trans) (-> self parent-override 0 node-list data (-> self parent-rp))) (cond - ((not (dummy-20 self)) + ((not (swamp-rope-method-20 self)) (let ((gp-0 (new 'stack-no-clear 'matrix))) (quaternion->matrix gp-0 (-> self root quat)) (set! (-> self base-vec quad) (-> gp-0 vector 1 quad)) @@ -1295,7 +1295,7 @@ ) (set! (-> self frame target) (fmin 1.0 (fmax 0.0 f1-3))) ) - (TODO-RENAME-10 (-> self frame) 0.0) + (swamp-rope-oscillator-method-10 (-> self frame) 0.0) (let* ((v1-6 (-> self other-entity)) (a0-4 (if v1-6 (-> v1-6 extra process) @@ -1330,7 +1330,7 @@ (set! (-> self frame target) (- 1.0 (-> (the-as swamp-rope v1-3) scale-t))) ) ) - (TODO-RENAME-10 (-> self frame) 0.0) + (swamp-rope-oscillator-method-10 (-> self frame) 0.0) (ja :num-func num-func-identity :frame-num (* (-> self frame value) (the float (ja-num-frames 0)))) (suspend) ) @@ -1375,7 +1375,7 @@ ) (update-timer! (-> self scale-rand)) (set! (-> self scale-oscillator target) (* 0.9 (-> self scale-oscillator target))) - (TODO-RENAME-10 (-> self scale-oscillator) (-> self scale-rand value)) + (swamp-rope-oscillator-method-10 (-> self scale-oscillator) (-> self scale-rand value)) (let ((a3-0 (new 'stack-no-clear 'vector))) (set! (-> a3-0 y) (+ 1.0 (-> self scale-oscillator value))) (set! (-> a3-0 x) (sqrtf (/ 1.0 (-> a3-0 y)))) @@ -1385,9 +1385,9 @@ ) (update-timer! (-> self main-tilt-rand)) (update-timer! (-> self pos-rand)) - (TODO-RENAME-10 (-> self main-tilt-oscillator) (-> self main-tilt-rand value)) - (TODO-RENAME-10 (-> self gondola-tilt-oscillator) (the-as vector #f)) - (TODO-RENAME-10 (-> self pos-oscillator) (-> self pos-rand value)) + (swamp-blimp-oscillator-method-10 (-> self main-tilt-oscillator) (-> self main-tilt-rand value)) + (swamp-blimp-oscillator-method-10 (-> self gondola-tilt-oscillator) (the-as vector #f)) + (swamp-blimp-oscillator-method-10 (-> self pos-oscillator) (-> self pos-rand value)) (new 'stack-no-clear 'vector) (let ((gp-0 (new 'stack-no-clear 'quaternion))) (let ((s5-0 (new 'stack-no-clear 'vector))) @@ -1416,10 +1416,7 @@ ) (quaternion-normalize! (-> self root-override quat)) (vector+! (-> self root-override trans) (-> self trans-at-init) (-> self pos-oscillator value)) - (let ((f0-34 (+ (-> self root-override trans y) (-> self y-offset)))) - (set! (-> self root-override trans y) f0-34) - f0-34 - ) + (set! (-> self root-override trans y) (+ (-> self root-override trans y) (-> self y-offset))) ) (defstate swamp-blimp-bye-bye (swamp-blimp) @@ -1489,7 +1486,7 @@ (-> self root-override trans) ) ) - ((dummy-20 (the-as swamp-rope s4-0)) + ((swamp-rope-method-20 (the-as swamp-rope s4-0)) (vector+! (the-as vector (-> self pos-oscillator)) (the-as vector (-> self pos-oscillator)) @@ -1552,14 +1549,14 @@ ) (defstate swamp-blimp-idle (swamp-blimp) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'tetherrock-break-evt) - (increment-success-for-hint (game-text-id swamp-tetherrock-eco-yellow-hint)) - (swamp-blimp-setup) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('tetherrock-break-evt) + (increment-success-for-hint (game-text-id swamp-tetherrock-eco-yellow-hint)) + (swamp-blimp-setup) + ) + ) + ) ) :trans (the-as (function none :behavior swamp-blimp) blimp-trans) :code (behavior () @@ -1692,7 +1689,3 @@ ) ) ) - - - - diff --git a/goal_src/jak1/levels/village2/village2-obs.gc b/goal_src/jak1/levels/village2/village2-obs.gc index a41ed613c1..f18f85ae32 100644 --- a/goal_src/jak1/levels/village2/village2-obs.gc +++ b/goal_src/jak1/levels/village2/village2-obs.gc @@ -146,15 +146,15 @@ (defstate rigid-body-platform-float (pontoon) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (let ((v1-0 event-type)) (the-as object (cond ((= v1-0 'die) (cleanup-for-death self) - (deactivate self) + (the-as vector (deactivate self)) ) (else - (rigid-body-platform-event-handler arg0 arg1 arg2 arg3) + (rigid-body-platform-event-handler proc arg1 event-type event) ) ) ) @@ -164,22 +164,22 @@ (defstate rigid-body-platform-idle (pontoon) :virtual #t - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'die) - (cleanup-for-death self) - (deactivate self) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('die) + (cleanup-for-death self) + (the-as symbol (deactivate self)) + ) + ) + ) ) ) (defmethod init-from-entity! pontoon ((obj pontoon) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) + (rigid-body-platform-method-31 obj) (set! (-> obj water-anim) #f) (set! (-> obj root-overlay pause-adjust-distance) -122880.0) (set! (-> obj task) (the-as uint (-> arg0 extra perm task))) @@ -204,9 +204,9 @@ (none) ) -(defmethod TODO-RENAME-23 pontoon ((obj pontoon) (arg0 float)) +(defmethod rigid-body-platform-method-23 pontoon ((obj pontoon) (arg0 float)) ((the-as (function rigid-body-platform basic none) (find-parent-method pontoon 23)) obj (the-as basic arg0)) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) @@ -293,7 +293,7 @@ :longest-edge (meters 4) ) -(defmethod TODO-RENAME-30 pontoonfive ((obj pontoonfive)) +(defmethod rigid-body-platform-method-30 pontoonfive ((obj pontoonfive)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -318,9 +318,9 @@ (none) ) -(defmethod TODO-RENAME-31 pontoonfive ((obj pontoonfive)) +(defmethod rigid-body-platform-method-31 pontoonfive ((obj pontoonfive)) (initialize-skeleton obj *pontoonfive-sg* '()) - (TODO-RENAME-29 obj *pontoonfive-constants*) + (rigid-body-platform-method-29 obj *pontoonfive-constants*) (set! (-> obj float-height-offset) 6144.0) (set! (-> obj root-overlay nav-radius) 12288.0) (let ((v1-6 (-> obj control-point-array data))) @@ -353,7 +353,7 @@ (none) ) -(defmethod TODO-RENAME-30 pontoonten ((obj pontoonten)) +(defmethod rigid-body-platform-method-30 pontoonten ((obj pontoonten)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -378,9 +378,9 @@ (none) ) -(defmethod TODO-RENAME-31 pontoonten ((obj pontoonten)) +(defmethod rigid-body-platform-method-31 pontoonten ((obj pontoonten)) (initialize-skeleton obj *pontoonten-sg* '()) - (TODO-RENAME-29 obj *pontoonten-constants*) + (rigid-body-platform-method-29 obj *pontoonten-constants*) (set! (-> obj float-height-offset) 6144.0) (set! (-> obj root-overlay nav-radius) 20480.0) (let ((v1-6 (-> obj control-point-array data))) @@ -494,14 +494,14 @@ ) (defstate allpontoons-be-clone (allpontoons) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (let ((v1-0 arg2)) - (the-as object (when (= v1-0 'end-mode) - (cleanup-for-death self) - (deactivate self) - ) - ) - ) + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (the-as object (case event-type + (('end-mode) + (cleanup-for-death self) + (the-as symbol (deactivate self)) + ) + ) + ) ) :enter (behavior ((arg0 handle)) (logclear! (-> self draw status) (draw-status hidden)) @@ -532,10 +532,10 @@ ) (defstate allpontoons-idle (allpontoons) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('clone) - (go allpontoons-be-clone (the-as handle (-> arg3 param 0))) + (go allpontoons-be-clone (the-as handle (-> event param 0))) ) ) ) @@ -694,8 +694,8 @@ ) (defstate fireboulder-be-clone (fireboulder) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('stop-cloning) (go fireboulder-hover) ) @@ -721,10 +721,10 @@ ) (defstate fireboulder-idle (fireboulder) - :event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (case arg2 + :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) + (case event-type (('clone) - (go fireboulder-be-clone (the-as handle (-> arg3 param 0))) + (go fireboulder-be-clone (the-as handle (-> event param 0))) ) ) ) @@ -1074,7 +1074,7 @@ (defpartgroup group-ogreboulder-hit-wall :id 551 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 2287 :period 900 :length 40)) @@ -1100,7 +1100,7 @@ (defpartgroup group-ogreboulder-splash :id 552 - :duration 900 + :duration (seconds 3) :flags (use-local-clock) :bounds (static-bspherem 0 0 0 64) :parts ((sp-item 2288 :period 900 :length 20) @@ -1594,8 +1594,8 @@ ) ) -(defmethod TODO-RENAME-22 villageb-water ((obj villageb-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 villageb-water ((obj villageb-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) @@ -1608,7 +1608,3 @@ ) (none) ) - - - - diff --git a/goal_src/jak1/levels/village2/warrior.gc b/goal_src/jak1/levels/village2/warrior.gc index 0fcbe34a7d..85fbbb6785 100644 --- a/goal_src/jak1/levels/village2/warrior.gc +++ b/goal_src/jak1/levels/village2/warrior.gc @@ -24,7 +24,7 @@ :shadow warrior-shadow-mg ) -(defmethod dummy-52 warrior ((obj warrior)) +(defmethod process-taskable-method-52 warrior ((obj warrior)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -159,8 +159,8 @@ ) ) -(defmethod TODO-RENAME-43 warrior ((obj warrior)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 2) 61440.0 obj) +(defmethod process-taskable-method-43 warrior ((obj warrior)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 2) 61440.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.66 f0-2) @@ -212,14 +212,10 @@ ) (defmethod init-from-entity! warrior ((obj warrior) (arg0 entity-actor)) - (dummy-40 obj arg0 *warrior-sg* 3 33 (new 'static 'vector :y -4096.0 :w 10240.0) 5) + (process-taskable-method-40 obj arg0 *warrior-sg* 3 33 (new 'static 'vector :y -4096.0 :w 10240.0) 5) (set! (-> obj tasks) (get-task-control (game-task village2-warrior-money))) (set! (-> obj sound-flava) (music-flava warrior)) (set! (-> obj draw light-index) (the-as uint 3)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/village3/assistant-village3.gc b/goal_src/jak1/levels/village3/assistant-village3.gc index 3648c90e91..1177272768 100644 --- a/goal_src/jak1/levels/village3/assistant-village3.gc +++ b/goal_src/jak1/levels/village3/assistant-village3.gc @@ -24,7 +24,7 @@ :shadow assistant-village3-shadow-mg ) -(defmethod dummy-52 assistant-villagec ((obj assistant-villagec)) +(defmethod process-taskable-method-52 assistant-villagec ((obj assistant-villagec)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -95,8 +95,8 @@ (the-as symbol (and *target* (< (-> (target-pos 0) z) -14245888.0))) ) -(defmethod TODO-RENAME-43 assistant-villagec ((obj assistant-villagec)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 assistant-villagec ((obj assistant-villagec)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.85714287 f0-2) @@ -144,7 +144,7 @@ (ja-channel-push! 1 (seconds 0.05)) ) (loop - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja-no-eval :group! assistant-village3-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) @@ -183,12 +183,8 @@ ) (defmethod init-from-entity! assistant-villagec ((obj assistant-villagec) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-village3-sg* 3 31 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-village3-sg* 3 31 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task assistant-village3))) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/village3/miners.gc b/goal_src/jak1/levels/village3/miners.gc index efd8aca35d..5b57af99bd 100644 --- a/goal_src/jak1/levels/village3/miners.gc +++ b/goal_src/jak1/levels/village3/miners.gc @@ -22,7 +22,7 @@ (suspend) (ja :num! (loop! 2.0)) (if (= (-> self next-state name) 'idle) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) ) ) (the-as none 0) @@ -44,7 +44,7 @@ :shadow minertall-shadow-mg ) -(defmethod dummy-52 minertall ((obj minertall)) +(defmethod process-taskable-method-52 minertall ((obj minertall)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -115,10 +115,10 @@ ) (defmethod init-from-entity! minertall ((obj minertall) (arg0 entity-actor)) - (dummy-40 obj arg0 *minertall-sg* 32 47 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *minertall-sg* 32 47 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task village3-miner-money1))) (set! (-> obj draw light-index) (the-as uint 1)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -219,7 +219,7 @@ ) ) -(defmethod dummy-52 minershort ((obj minershort)) +(defmethod process-taskable-method-52 minershort ((obj minershort)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -471,8 +471,8 @@ (-> obj draw art-group data 3) ) -(defmethod TODO-RENAME-43 minershort ((obj minershort)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 minershort ((obj minershort)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.9655172 f0-2) @@ -573,14 +573,14 @@ ) (defmethod init-from-entity! minershort ((obj minershort) (arg0 entity-actor)) - (dummy-40 obj arg0 *minershort-sg* 34 46 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *minershort-sg* 34 46 (new 'static 'vector :w 4096.0) 5) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 566) obj)) (set! (-> obj tasks) (get-task-control (game-task village3-miner-money1))) (set! (-> obj other-miner) (the-as minertall (entity-actor-lookup arg0 'alt-actor 0))) (set! (-> obj cur-trans-hook) minershort-trans-hook) (set! (-> obj sound-flava) (music-flava miners)) (set! (-> obj draw light-index) (the-as uint 1)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -623,7 +623,3 @@ (go (method-of-object obj idle)) (none) ) - - - - diff --git a/goal_src/jak1/levels/village3/sage-village3.gc b/goal_src/jak1/levels/village3/sage-village3.gc index 924a1ff328..83ae2c04af 100644 --- a/goal_src/jak1/levels/village3/sage-village3.gc +++ b/goal_src/jak1/levels/village3/sage-village3.gc @@ -191,8 +191,8 @@ (the-as symbol (and *target* (< (-> (target-pos 0) x) 4575232.0) (< -14323302.0 (-> (target-pos 0) z)))) ) -(defmethod TODO-RENAME-43 sage-villagec ((obj sage-villagec)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 sage-villagec ((obj sage-villagec)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.875 f0-2) @@ -266,11 +266,11 @@ (defmethod should-display? sage-villagec ((obj sage-villagec)) (cond ((not (closed? (-> obj tasks) (game-task village3-button) (task-status need-hint))) - (dummy-33 obj) + (process-taskable-method-33 obj) #f ) ((sages-kidnapped?) - (dummy-33 obj) + (process-taskable-method-33 obj) #f ) (else @@ -305,16 +305,12 @@ ) (defmethod init-from-entity! sage-villagec ((obj sage-villagec) (arg0 entity-actor)) - (dummy-40 obj arg0 *sage-village3-sg* 3 40 (new 'static 'vector :w 8192.0) 5) + (process-taskable-method-40 obj arg0 *sage-village3-sg* 3 40 (new 'static 'vector :w 8192.0) 5) (set! (-> obj tasks) (get-task-control (game-task cave-dark-crystals))) (set! (-> obj assistant) (entity-actor-lookup arg0 'alt-actor 0)) (set! (-> obj evilbro) (the-as handle #f)) (set! (-> obj evilsis) (the-as handle #f)) (set! (-> obj sound-flava) (music-flava sage)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/village3/village3-obs.gc b/goal_src/jak1/levels/village3/village3-obs.gc index cc995bbbdc..cfa9cab1e9 100644 --- a/goal_src/jak1/levels/village3/village3-obs.gc +++ b/goal_src/jak1/levels/village3/village3-obs.gc @@ -60,8 +60,8 @@ ) ) -(defmethod TODO-RENAME-22 villagec-lava ((obj villagec-lava)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 villagec-lava ((obj villagec-lava)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) diff --git a/goal_src/jak1/levels/village_common/oracle.gc b/goal_src/jak1/levels/village_common/oracle.gc index eac127ebe7..a9ff575789 100644 --- a/goal_src/jak1/levels/village_common/oracle.gc +++ b/goal_src/jak1/levels/village_common/oracle.gc @@ -238,7 +238,7 @@ ) (defmethod init-from-entity! oracle ((obj oracle) (arg0 entity-actor)) - (dummy-40 obj arg0 *oracle-sg* 3 4 (new 'static 'vector :y -4096.0 :w 4096.0) -1) + (process-taskable-method-40 obj arg0 *oracle-sg* 3 4 (new 'static 'vector :y -4096.0 :w 4096.0) -1) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "oracle-sleep" :fo-max 50) (-> obj root-override trans)) ) @@ -303,10 +303,6 @@ (send-event (handle->process (-> obj left-eye-cell)) 'trans-hook s5-1) ) ) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) - - - - diff --git a/goal_src/jak1/levels/village_common/villagep-obs.gc b/goal_src/jak1/levels/village_common/villagep-obs.gc index e269dcca24..9e48ef10b1 100644 --- a/goal_src/jak1/levels/village_common/villagep-obs.gc +++ b/goal_src/jak1/levels/village_common/villagep-obs.gc @@ -468,7 +468,7 @@ :bounds (static-spherem 0 0 0 1.5) ) -(defmethod TODO-RENAME-27 warp-gate-switch ((obj warp-gate-switch)) +(defmethod basebutton-method-27 warp-gate-switch ((obj warp-gate-switch)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -533,7 +533,7 @@ ) ) -(defmethod TODO-RENAME-26 warp-gate-switch ((obj warp-gate-switch)) +(defmethod basebutton-method-26 warp-gate-switch ((obj warp-gate-switch)) (set! (-> obj warp) (the-as handle #f)) (let ((v1-2 (-> obj entity extra perm task))) (cond @@ -639,7 +639,7 @@ (case event-type (('touch 'attack) (when (pressable? self) - (TODO-RENAME-29 self (-> self event-going-down) (-> self notify-actor)) + (basebutton-method-29 self (-> self event-going-down) (-> self notify-actor)) (go-virtual basebutton-going-down) ) ) diff --git a/test/decompiler/reference/jak1/engine/ambient/ambient_REF.gc b/test/decompiler/reference/jak1/engine/ambient/ambient_REF.gc index dba8a1ec1c..ab71802d55 100644 --- a/test/decompiler/reference/jak1/engine/ambient/ambient_REF.gc +++ b/test/decompiler/reference/jak1/engine/ambient/ambient_REF.gc @@ -414,7 +414,7 @@ (go level-hint-exit) ) (('die) - (deactivate self) + (the-as object (deactivate self)) ) ) ) @@ -477,7 +477,7 @@ (go level-hint-exit) ) (('die) - (deactivate self) + (the-as object (deactivate self)) ) ) ) diff --git a/test/decompiler/reference/jak1/engine/camera/cam-combiner_REF.gc b/test/decompiler/reference/jak1/engine/camera/cam-combiner_REF.gc index f2e2e24e18..d695fb1167 100644 --- a/test/decompiler/reference/jak1/engine/camera/cam-combiner_REF.gc +++ b/test/decompiler/reference/jak1/engine/camera/cam-combiner_REF.gc @@ -27,13 +27,14 @@ (('teleport) (when (nonzero? (-> self tracking-status)) (cam-calc-follow! (-> self tracking) (-> self trans) #f) - (slave-set-rotation! - (-> self tracking) - (-> self trans) - (the-as float (-> self tracking-options)) - (-> self fov) - #f - ) + (the-as object (slave-set-rotation! + (-> self tracking) + (-> self trans) + (the-as float (-> self tracking-options)) + (-> self fov) + #f + ) + ) ) ) (('stop-tracking) @@ -86,13 +87,14 @@ ) (let ((gp-2 (+ (the-as uint gp-1) 108))) (cam-calc-follow! (-> self tracking) (the-as vector gp-2) #f) - (slave-set-rotation! - (-> self tracking) - (the-as vector gp-2) - (the-as float (-> self tracking-options)) - (-> self fov) - #f - ) + (the-as object (slave-set-rotation! + (-> self tracking) + (the-as vector gp-2) + (the-as float (-> self tracking-options)) + (-> self fov) + #f + ) + ) ) ) ) @@ -150,7 +152,10 @@ ) (set! (-> self tracking use-point-of-interest) (-> gp-3 tracking use-point-of-interest)) (set! (-> self tracking point-of-interest quad) (-> gp-3 tracking point-of-interest quad)) - (copy-cam-float-seeker (-> self tracking point-of-interest-blend) (-> gp-3 tracking point-of-interest-blend)) + (the-as + object + (copy-cam-float-seeker (-> self tracking point-of-interest-blend) (-> gp-3 tracking point-of-interest-blend)) + ) ) ) ) diff --git a/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc b/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc index b44a24b8e3..891c054f75 100644 --- a/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc +++ b/test/decompiler/reference/jak1/engine/camera/cam-master_REF.gc @@ -118,7 +118,7 @@ ) (let ((gp-1 (new 'stack-no-clear 'vector))) (vector--float*! gp-1 (-> self tpos-curr-adj) (-> self local-down) (-> self target-height)) - (the-as symbol (TODO-RENAME-10 (-> self target-spline) gp-1)) + (the-as symbol (tracking-spline-method-10 (-> self target-spline) gp-1)) ) ) @@ -207,7 +207,7 @@ (set! (-> self under-water) 0) (let ((gp-1 (new 'stack-no-clear 'vector))) (vector--float*! gp-1 (-> self tpos-curr-adj) (-> self local-down) (-> self target-height)) - (the-as symbol (TODO-RENAME-10 (-> self target-spline) gp-1)) + (the-as symbol (tracking-spline-method-10 (-> self target-spline) gp-1)) ) ) @@ -291,9 +291,9 @@ ) (let ((gp-1 (new 'stack-no-clear 'vector))) (vector--float*! gp-1 (-> self tpos-curr-adj) (-> self local-down) (-> self target-height)) - (TODO-RENAME-17 (-> self target-spline) gp-1 2048.0 0.0 #f) + (tracking-spline-method-17 (-> self target-spline) gp-1 2048.0 0.0 #f) ) - (TODO-RENAME-22 (-> self target-spline) 40960.0) + (tracking-spline-method-22 (-> self target-spline) 40960.0) ) ((handle->process (-> self drawable-target)) (logior! (-> self master-options) 2) @@ -516,9 +516,9 @@ ) ) ) - (TODO-RENAME-17 (-> self target-spline) gp-7 2048.0 0.0 #f) + (tracking-spline-method-17 (-> self target-spline) gp-7 2048.0 0.0 #f) ) - (the-as symbol (TODO-RENAME-22 (-> self target-spline) 40960.0)) + (the-as symbol (tracking-spline-method-22 (-> self target-spline) 40960.0)) ) (*target* (logior! (-> self master-options) 2) @@ -994,7 +994,7 @@ (set! (-> self drawable-target) (the-as handle #f)) (set! (-> self which-bone) 0) (let ((a1-3 (new-stack-vector0))) - (TODO-RENAME-10 (-> self target-spline) a1-3) + (tracking-spline-method-10 (-> self target-spline) a1-3) ) (set! (-> self pov-handle) (the-as handle #f)) (set! (-> self pov-bone) 0) diff --git a/test/decompiler/reference/jak1/engine/camera/cam-states_REF.gc b/test/decompiler/reference/jak1/engine/camera/cam-states_REF.gc index 721375aa53..35c84e19a1 100644 --- a/test/decompiler/reference/jak1/engine/camera/cam-states_REF.gc +++ b/test/decompiler/reference/jak1/engine/camera/cam-states_REF.gc @@ -1097,11 +1097,12 @@ (vector+! (-> self circular-follow) (-> self circular-follow) (-> self pivot-pt)) (cam-circular-position #t) (if (!= (-> self fov1) 0.0) - (set! (-> self fov) (lerp-clamp - (-> self fov0) - (-> self fov1) - (parameter-ease-sin-clamp (dummy-10 (-> self fov-index) (-> *camera* tpos-curr-adj))) - ) + (set! (-> self fov) + (lerp-clamp + (-> self fov0) + (-> self fov1) + (parameter-ease-sin-clamp (cam-index-method-10 (-> self fov-index) (-> *camera* tpos-curr-adj))) + ) ) ) ) @@ -1149,11 +1150,14 @@ (set! (-> self fov1) (cam-slave-get-float (-> self cam-entity) 'focalPull (the-as float 0.0))) (cond ((and (!= (-> self fov1) 0.0) - (dummy-9 (-> self fov-index) 'focalpull (-> self cam-entity) (-> self saved-pt) (the-as curve #f)) + (cam-index-method-9 (-> self fov-index) 'focalpull (-> self cam-entity) (-> self saved-pt) (the-as curve #f)) ) (set! (-> self fov0) (-> self fov)) - (set! (-> self fov) - (lerp-clamp (-> self fov0) (-> self fov1) (dummy-10 (-> self fov-index) (-> *camera* tpos-curr-adj))) + (set! (-> self fov) (lerp-clamp + (-> self fov0) + (-> self fov1) + (cam-index-method-10 (-> self fov-index) (-> *camera* tpos-curr-adj)) + ) ) ) (else @@ -1316,7 +1320,7 @@ (set! (-> self min-z-override) (vector-length (-> self view-flat))) (vector+! (-> self desired-pos) arg0 (-> *camera* tpos-curr-adj)) (set! (-> self string-trans quad) (-> self desired-pos quad)) - (TODO-RENAME-10 (-> self position-spline) (-> self desired-pos)) + (tracking-spline-method-10 (-> self position-spline) (-> self desired-pos)) (vector-reset! (-> self velocity)) (let ((v0-3 (logand -4097 (-> self options)))) (set! (-> self options) v0-3) @@ -2787,7 +2791,7 @@ (cam-string-move) ) ) - (TODO-RENAME-17 + (tracking-spline-method-17 (-> self position-spline) (-> self string-trans) (the-as float 0.04096) @@ -2796,16 +2800,36 @@ ) (cond ((and (logtest? (-> self options) #x4000) (logtest? (-> self options) 256)) - (TODO-RENAME-21 (-> self position-spline) (-> self trans) (the-as float 102.4) (the-as float 4096.0)) + (tracking-spline-method-21 + (-> self position-spline) + (-> self trans) + (the-as float 102.4) + (the-as float 4096.0) + ) ) ((logtest? (-> self options) #x4000) - (TODO-RENAME-21 (-> self position-spline) (-> self trans) (the-as float 40.96) (the-as float 4096.0)) + (tracking-spline-method-21 + (-> self position-spline) + (-> self trans) + (the-as float 40.96) + (the-as float 4096.0) + ) ) ((logtest? (-> self options) 256) - (TODO-RENAME-21 (-> self position-spline) (-> self trans) (the-as float 102.4) (the-as float 2457.6)) + (tracking-spline-method-21 + (-> self position-spline) + (-> self trans) + (the-as float 102.4) + (the-as float 2457.6) + ) ) (else - (TODO-RENAME-21 (-> self position-spline) (-> self trans) (the-as float 20.48) (the-as float 2457.6)) + (tracking-spline-method-21 + (-> self position-spline) + (-> self trans) + (the-as float 20.48) + (the-as float 2457.6) + ) ) ) ) @@ -3007,7 +3031,7 @@ ) (set! (-> self trans quad) (-> self string-trans quad)) (set! (-> self los-last-pos quad) (-> self string-trans quad)) - (TODO-RENAME-10 (-> self position-spline) (-> self string-trans)) + (tracking-spline-method-10 (-> self position-spline) (-> self string-trans)) (set! (-> self blend-from-type) (the-as uint 2)) (set! (-> self blend-to-type) (the-as uint 2)) ) @@ -3024,7 +3048,7 @@ (when (not (paused?)) (set-string-parms) (cam-string-code) - (TODO-RENAME-9 (-> self position-spline)) + (tracking-spline-method-9 (-> self position-spline)) (set! (-> self have-phony-joystick) #f) ) (suspend) diff --git a/test/decompiler/reference/jak1/engine/camera/camera-h_REF.gc b/test/decompiler/reference/jak1/engine/camera/camera-h_REF.gc index 1b2b604402..ecf0926b97 100644 --- a/test/decompiler/reference/jak1/engine/camera/camera-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/camera/camera-h_REF.gc @@ -58,8 +58,8 @@ :size-assert #x30 :flag-assert #xb00000030 (:methods - (dummy-9 (_type_ symbol entity vector curve) symbol 9) - (dummy-10 (_type_ vector) float 10) + (cam-index-method-9 (_type_ symbol entity vector curve) symbol 9) + (cam-index-method-10 (_type_ vector) float 10) ) ) @@ -134,21 +134,21 @@ :size-assert #x664 :flag-assert #x1800000664 (:methods - (TODO-RENAME-9 (_type_) none 9) - (TODO-RENAME-10 (_type_ vector) none 10) + (tracking-spline-method-9 (_type_) none 9) + (tracking-spline-method-10 (_type_ vector) none 10) (print-nth-point (_type_ int) none 11) - (TODO-RENAME-12 (_type_) none 12) - (TODO-RENAME-13 (_type_ int) none 13) - (TODO-RENAME-14 (_type_ tracking-spline-sampler) none 14) - (TODO-RENAME-15 (_type_) none 15) - (TODO-RENAME-16 (_type_ float) none 16) - (TODO-RENAME-17 (_type_ vector float float symbol) int 17) - (TODO-RENAME-18 (_type_ float vector tracking-spline-sampler) vector 18) - (TODO-RENAME-19 (_type_ float vector tracking-spline-sampler) vector 19) - (TODO-RENAME-20 (_type_ vector int) none 20) - (TODO-RENAME-21 (_type_ vector float float) vector 21) - (TODO-RENAME-22 (_type_ float) none 22) - (TODO-RENAME-23 (_type_) none 23) + (tracking-spline-method-12 (_type_) none 12) + (tracking-spline-method-13 (_type_ int) none 13) + (tracking-spline-method-14 (_type_ tracking-spline-sampler) none 14) + (tracking-spline-method-15 (_type_) none 15) + (tracking-spline-method-16 (_type_ float) none 16) + (tracking-spline-method-17 (_type_ vector float float symbol) int 17) + (tracking-spline-method-18 (_type_ float vector tracking-spline-sampler) vector 18) + (tracking-spline-method-19 (_type_ float vector tracking-spline-sampler) vector 19) + (tracking-spline-method-20 (_type_ vector int) none 20) + (tracking-spline-method-21 (_type_ vector float float) vector 21) + (tracking-spline-method-22 (_type_ float) none 22) + (tracking-spline-method-23 (_type_) none 23) ) ) diff --git a/test/decompiler/reference/jak1/engine/camera/camera_REF.gc b/test/decompiler/reference/jak1/engine/camera/camera_REF.gc index fc8941ac41..b05a406b2e 100644 --- a/test/decompiler/reference/jak1/engine/camera/camera_REF.gc +++ b/test/decompiler/reference/jak1/engine/camera/camera_REF.gc @@ -357,7 +357,7 @@ ;; definition for method 9 of type cam-index ;; INFO: Used lq/sq -(defmethod dummy-9 cam-index ((obj cam-index) (arg0 symbol) (arg1 entity) (arg2 vector) (arg3 curve)) +(defmethod cam-index-method-9 cam-index ((obj cam-index) (arg0 symbol) (arg1 entity) (arg2 vector) (arg3 curve)) (local-vars (sv-32 (function _varargs_ object))) (format (clear *cam-res-string*) "~S-flags" arg0) (set! (-> obj flags) (the-as cam-index-options (cam-slave-get-flags arg1 (string->symbol *res-key-string*)))) @@ -435,7 +435,7 @@ ;; definition for method 10 of type cam-index ;; INFO: Used lq/sq -(defmethod dummy-10 cam-index ((obj cam-index) (arg0 vector)) +(defmethod cam-index-method-10 cam-index ((obj cam-index) (arg0 vector)) (let ((s5-0 (new-stack-vector0))) 0.0 (vector-! s5-0 arg0 (the-as vector (-> obj vec))) @@ -457,7 +457,7 @@ ;; definition for method 10 of type tracking-spline ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-10 tracking-spline ((obj tracking-spline) (arg0 vector)) +(defmethod tracking-spline-method-10 tracking-spline ((obj tracking-spline) (arg0 vector)) (set! (-> obj point 0 position quad) (-> arg0 quad)) (set! (-> obj point 0 next) -134250495) (set! (-> obj summed-len) 0.0) @@ -483,7 +483,7 @@ ;; definition for method 13 of type tracking-spline ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-13 tracking-spline ((obj tracking-spline) (arg0 int)) +(defmethod tracking-spline-method-13 tracking-spline ((obj tracking-spline) (arg0 int)) (let ((v1-3 (-> obj point arg0 next))) (cond ((= v1-3 -134250495) @@ -518,7 +518,7 @@ ;; definition for method 14 of type tracking-spline ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-14 tracking-spline ((obj tracking-spline) (arg0 tracking-spline-sampler)) +(defmethod tracking-spline-method-14 tracking-spline ((obj tracking-spline) (arg0 tracking-spline-sampler)) (let ((v1-0 (-> obj used-point))) (set! (-> obj partial-point) (-> arg0 partial-pt)) (when (= (-> obj next-to-last-point) v1-0) @@ -557,12 +557,12 @@ ;; definition for method 15 of type tracking-spline ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-15 tracking-spline ((obj tracking-spline)) +(defmethod tracking-spline-method-15 tracking-spline ((obj tracking-spline)) (let ((s5-0 (new 'stack-no-clear 'tracking-spline-sampler))) (let ((a2-0 (new 'stack-no-clear 'tracking-point))) (set! (-> s5-0 cur-pt) (-> obj used-point)) (set! (-> s5-0 partial-pt) (-> obj partial-point)) - (TODO-RENAME-19 obj (-> obj sample-len) (the-as vector a2-0) s5-0) + (tracking-spline-method-19 obj (-> obj sample-len) (the-as vector a2-0) s5-0) ) (if (or (= (-> s5-0 cur-pt) (-> obj end-point)) (= (-> s5-0 cur-pt) (-> obj next-to-last-point)) @@ -593,7 +593,7 @@ (set! a0-14 (-> obj point v1-15 next)) ) (if (< -2.0 f0-2) - (TODO-RENAME-13 obj a1-1) + (tracking-spline-method-13 obj a1-1) ) ) ) @@ -605,12 +605,12 @@ ;; definition for method 16 of type tracking-spline ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-16 tracking-spline ((obj tracking-spline) (arg0 float)) +(defmethod tracking-spline-method-16 tracking-spline ((obj tracking-spline) (arg0 float)) (let ((s4-0 (new 'stack-no-clear 'tracking-spline-sampler))) (let ((a2-0 (new 'stack-no-clear 'vector))) (set! (-> s4-0 cur-pt) (-> obj used-point)) (set! (-> s4-0 partial-pt) (-> obj partial-point)) - (TODO-RENAME-19 obj (-> obj sample-len) a2-0 s4-0) + (tracking-spline-method-19 obj (-> obj sample-len) a2-0 s4-0) ) (let ((s4-1 (-> obj point (-> s4-0 cur-pt) next))) (when (!= s4-1 -134250495) @@ -630,7 +630,7 @@ ) arg0 ) - (TODO-RENAME-13 obj s4-1) + (tracking-spline-method-13 obj s4-1) (set! s4-1 v1-11) ) (set! v1-11 (-> obj point s4-1 next)) @@ -645,7 +645,7 @@ ;; definition for method 17 of type tracking-spline ;; INFO: Used lq/sq -(defmethod TODO-RENAME-17 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 float) (arg2 float) (arg3 symbol)) +(defmethod tracking-spline-method-17 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 float) (arg2 float) (arg3 symbol)) (let ((s3-0 (-> obj free-point)) (s2-0 (-> obj end-point)) ) @@ -661,7 +661,7 @@ (return 0) ) (when (and arg3 (= s3-0 -134250495)) - (TODO-RENAME-15 obj) + (tracking-spline-method-15 obj) (set! s3-0 (-> obj free-point)) ) (cond @@ -678,7 +678,7 @@ (set! (-> obj point s3-0 position quad) (-> arg0 quad)) (+! (-> obj used-count) 1) (if (< 0.0 arg2) - (TODO-RENAME-16 obj arg2) + (tracking-spline-method-16 obj arg2) ) ) ) @@ -687,7 +687,7 @@ ) ;; definition for method 18 of type tracking-spline -(defmethod TODO-RENAME-18 tracking-spline ((obj tracking-spline) (arg0 float) (arg1 vector) (arg2 tracking-spline-sampler)) +(defmethod tracking-spline-method-18 tracking-spline ((obj tracking-spline) (arg0 float) (arg1 vector) (arg2 tracking-spline-sampler)) (local-vars (f0-4 float)) (when (not arg2) (set! arg2 (new 'stack-no-clear 'tracking-spline-sampler)) @@ -730,15 +730,15 @@ ) ;; definition for method 19 of type tracking-spline -(defmethod TODO-RENAME-19 tracking-spline ((obj tracking-spline) (arg0 float) (arg1 vector) (arg2 tracking-spline-sampler)) +(defmethod tracking-spline-method-19 tracking-spline ((obj tracking-spline) (arg0 float) (arg1 vector) (arg2 tracking-spline-sampler)) (vector-reset! arg1) - (TODO-RENAME-18 obj arg0 arg1 arg2) + (tracking-spline-method-18 obj arg0 arg1 arg2) arg1 ) ;; definition for method 20 of type tracking-spline ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-20 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 int)) +(defmethod tracking-spline-method-20 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 int)) (let ((s3-0 (new 'stack-no-clear 'vector))) (vector-! s3-0 @@ -828,7 +828,7 @@ ;; definition for method 21 of type tracking-spline ;; INFO: Used lq/sq -(defmethod TODO-RENAME-21 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 float) (arg2 float)) +(defmethod tracking-spline-method-21 tracking-spline ((obj tracking-spline) (arg0 vector) (arg1 float) (arg2 float)) (let ((v1-0 (-> obj used-point)) (f0-0 (-> obj partial-point)) ) @@ -854,10 +854,10 @@ (let ((s4-0 (new 'stack-no-clear 'tracking-spline-sampler))) (set! (-> s4-0 cur-pt) v1-0) (set! (-> s4-0 partial-pt) f0-0) - (TODO-RENAME-19 obj (* (-> obj max-move) (-> *display* time-adjust-ratio)) arg0 s4-0) - (TODO-RENAME-14 obj s4-0) + (tracking-spline-method-19 obj (* (-> obj max-move) (-> *display* time-adjust-ratio)) arg0 s4-0) + (tracking-spline-method-14 obj s4-0) (dotimes (s3-0 63) - (TODO-RENAME-18 obj (* 0.015625 (-> obj sample-len)) arg0 s4-0) + (tracking-spline-method-18 obj (* 0.015625 (-> obj sample-len)) arg0 s4-0) ) (vector-float*! arg0 arg0 0.015625) (let ((a2-3 (-> s4-0 cur-pt))) @@ -866,7 +866,7 @@ (set! (-> obj debug-old-position quad) (-> obj old-position quad)) (set! (-> obj debug-out-position quad) (-> arg0 quad)) (vector-! s4-1 arg0 (-> obj old-position)) - (TODO-RENAME-20 obj s4-1 a2-3) + (tracking-spline-method-20 obj s4-1 a2-3) (vector+! arg0 (-> obj old-position) s4-1) ) ) @@ -878,15 +878,15 @@ ;; definition for method 22 of type tracking-spline ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-22 tracking-spline ((obj tracking-spline) (arg0 float)) +(defmethod tracking-spline-method-22 tracking-spline ((obj tracking-spline) (arg0 float)) (when (< arg0 (-> obj summed-len)) (let ((s5-0 (new 'stack-no-clear 'tracking-spline-sampler))) (let ((a2-0 (new 'stack-no-clear 'vector))) (set! (-> s5-0 cur-pt) (-> obj used-point)) (set! (-> s5-0 partial-pt) 0.0) - (TODO-RENAME-19 obj (- (-> obj summed-len) arg0) a2-0 s5-0) + (tracking-spline-method-19 obj (- (-> obj summed-len) arg0) a2-0 s5-0) ) - (TODO-RENAME-14 obj s5-0) + (tracking-spline-method-14 obj s5-0) ) ) 0 @@ -895,7 +895,7 @@ ;; definition for method 9 of type tracking-spline ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-9 tracking-spline ((obj tracking-spline)) +(defmethod tracking-spline-method-9 tracking-spline ((obj tracking-spline)) (let ((v1-0 (-> obj used-point)) (s4-0 0) (s5-0 0) @@ -1010,7 +1010,7 @@ (init-cam-float-seeker (-> self tracking point-of-interest-blend) 0.0 0.005 0.02 0.125) (init-cam-float-seeker (-> self tracking underwater-blend) 0.0 0.007 0.03 0.125) (set! (-> self tracking use-point-of-interest) #f) - (TODO-RENAME-10 (-> self position-spline) (-> self trans)) + (tracking-spline-method-10 (-> self position-spline) (-> self trans)) (none) ) @@ -1173,8 +1173,8 @@ ) ((= (-> self spline-follow-dist) 0.0) (let ((f0-18 (if arg3 - (dummy-10 (-> self index) (-> self tracking follow-pt)) - (dummy-10 (-> self index) (-> *camera* tpos-curr-adj)) + (cam-index-method-10 (-> self index) (-> self tracking follow-pt)) + (cam-index-method-10 (-> self index) (-> *camera* tpos-curr-adj)) ) ) ) @@ -1209,7 +1209,7 @@ (when (get-curve-data! (-> self cam-entity) (-> self spline-curve) 'campath 'campath-k -1000000000.0) (curve-get-pos! (-> self spline-offset) 0.0 (-> self spline-curve)) (vector-negate! (-> self spline-offset) (-> self spline-offset)) - (dummy-9 (-> self index) 'campoints (-> self cam-entity) arg0 (-> self spline-curve)) + (cam-index-method-9 (-> self index) 'campoints (-> self cam-entity) arg0 (-> self spline-curve)) (set! (-> self spline-exists) #t) ) (cond diff --git a/test/decompiler/reference/jak1/engine/collide/collide-cache-h_REF.gc b/test/decompiler/reference/jak1/engine/collide/collide-cache-h_REF.gc index acc608f5fe..f51222278e 100644 --- a/test/decompiler/reference/jak1/engine/collide/collide-cache-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/collide/collide-cache-h_REF.gc @@ -57,8 +57,8 @@ :size-assert #xc60 :flag-assert #xb00000c60 (:methods - (dummy-9 (_type_ object object) symbol 9) - (dummy-10 (_type_ object object) symbol 10) + (collide-puss-work-method-9 (_type_ object object) symbol 9) + (collide-puss-work-method-10 (_type_ object object) symbol 10) ) ) @@ -200,9 +200,9 @@ (fill-from-foreground-using-y-probe (_type_) none 24) (fill-from-water (_type_ water-control) none 25) (load-mesh-from-spad-in-box (_type_ collide-frag-mesh) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_) none 28) - (dummy-29 (_type_ collide-frag-mesh) none 29) + (collide-cache-method-27 (_type_) none 27) + (collide-cache-method-28 (_type_) none 28) + (collide-cache-method-29 (_type_ collide-frag-mesh) none 29) (puyp-mesh (_type_ collide-puyp-work collide-cache-prim) none 30) (puyp-sphere (_type_ collide-puyp-work collide-cache-prim) vector 31) (unpack-background-collide-mesh (_type_ object object object) none 32) diff --git a/test/decompiler/reference/jak1/engine/collide/collide-edge-grab-h_REF.gc b/test/decompiler/reference/jak1/engine/collide/collide-edge-grab-h_REF.gc index 51e2a5b615..7960cc704a 100644 --- a/test/decompiler/reference/jak1/engine/collide/collide-edge-grab-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/collide/collide-edge-grab-h_REF.gc @@ -20,7 +20,7 @@ :size-assert #x144 :flag-assert #xb00000144 (:methods - (dummy-9 (_type_) symbol 9) + (edge-grab-info-method-9 (_type_) symbol 9) (debug-draw (_type_) symbol 10) ) ) @@ -177,7 +177,7 @@ (debug-draw-tris (_type_) none 11) (debug-draw-sphere (_type_) symbol 12) (compute-center-point! (_type_ collide-edge-edge vector) float 13) - (dummy-14 (_type_ vector vector int) float 14) + (collide-edge-work-method-14 (_type_ vector vector int) float 14) (find-grabbable-edges! (_type_) none 15) (find-grabbable-tris! (_type_) none 16) (should-add-to-list? (_type_ collide-edge-hold-item collide-edge-edge) symbol 17) diff --git a/test/decompiler/reference/jak1/engine/collide/collide-edge-grab_REF.gc b/test/decompiler/reference/jak1/engine/collide/collide-edge-grab_REF.gc index d44152ee05..3f4ab400fc 100644 --- a/test/decompiler/reference/jak1/engine/collide/collide-edge-grab_REF.gc +++ b/test/decompiler/reference/jak1/engine/collide/collide-edge-grab_REF.gc @@ -138,7 +138,7 @@ ) (let ((s0-0 (new 'stack-no-clear 'vector))) (vector+*! s0-0 (-> arg0 center-pt) (-> s3-0 edge-vec-norm) 1105.92) - (let ((f0-0 (dummy-14 obj (-> arg1 right-hand-hold) s0-0 (the-as int s4-0)))) + (let ((f0-0 (collide-edge-work-method-14 obj (-> arg1 right-hand-hold) s0-0 (the-as int s4-0)))) (if (< 491.52 f0-0) (return #f) ) @@ -151,7 +151,7 @@ ) (sv-144 sv-160 sv-176 a2-3 a3-2) ) - (let ((f0-1 (dummy-14 obj (-> arg1 left-hand-hold) s0-0 (the-as int s4-0)))) + (let ((f0-1 (collide-edge-work-method-14 obj (-> arg1 left-hand-hold) s0-0 (the-as int s4-0)))) (if (< 491.52 f0-1) (return #f) ) @@ -225,7 +225,7 @@ ;; definition for method 9 of type edge-grab-info ;; INFO: Used lq/sq -(defmethod dummy-9 edge-grab-info ((obj edge-grab-info)) +(defmethod edge-grab-info-method-9 edge-grab-info ((obj edge-grab-info)) (local-vars (v0-0 symbol) (v1-14 float)) (rlet ((acc :class vf) (Q :class vf) @@ -366,7 +366,7 @@ ;; definition for method 14 of type collide-edge-work ;; INFO: Used lq/sq -(defmethod dummy-14 collide-edge-work ((obj collide-edge-work) (arg0 vector) (arg1 vector) (arg2 int)) +(defmethod collide-edge-work-method-14 collide-edge-work ((obj collide-edge-work) (arg0 vector) (arg1 vector) (arg2 int)) (let ((f30-0 -1.0)) (let ((s2-0 (new 'stack-no-clear 'vector))) (dotimes (s1-0 (the-as int (-> obj num-edges))) diff --git a/test/decompiler/reference/jak1/engine/collide/collide-shape-h_REF.gc b/test/decompiler/reference/jak1/engine/collide/collide-shape-h_REF.gc index fb395956df..ca0682d25b 100644 --- a/test/decompiler/reference/jak1/engine/collide/collide-shape-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/collide/collide-shape-h_REF.gc @@ -405,7 +405,7 @@ (find-collision-meshes (_type_) symbol 38) (on-platform (_type_ collide-shape collide-overlap-result) symbol 39) (find-overlapping-shapes (_type_ overlaps-others-params) symbol 40) - (dummy-41 (_type_ attack-info float) vector 41) + (calc-shove-up (_type_ attack-info float) vector 41) (should-push-away (_type_ collide-shape collide-overlap-result) symbol 42) (pull-rider! (_type_ pull-rider-info) none 43) (pull-riders! (_type_) symbol 44) @@ -486,7 +486,7 @@ (:methods (set-and-handle-pat! (_type_ pat-surface) none 56) (integrate-no-collide! (_type_ vector) none 57) - (dummy-58 (_type_ vector) symbol 58) + (collide-shape-moving-method-58 (_type_ vector) symbol 58) (integrate-for-enemy-with-move-to-ground! (_type_ vector collide-kind float symbol symbol symbol) none 59) (move-to-ground (_type_ float float symbol collide-kind) symbol 60) (move-to-ground-point! (_type_ vector vector vector) none 61) diff --git a/test/decompiler/reference/jak1/engine/collide/collide-touch-h_REF.gc b/test/decompiler/reference/jak1/engine/collide/collide-touch-h_REF.gc index 1e46aa6feb..e816e560c7 100644 --- a/test/decompiler/reference/jak1/engine/collide/collide-touch-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/collide/collide-touch-h_REF.gc @@ -35,7 +35,7 @@ :flag-assert #xd000000e4 (:methods (get-touched-prim (_type_ trsqv touching-shapes-entry) collide-shape-prim 9) - (dummy-10 () none 10) + (touching-prims-entry-method-10 () none 10) (get-middle-of-bsphere-overlap (_type_ vector) vector 11) (get-touched-tri (_type_ collide-shape touching-shapes-entry) collide-tri-result 12) ) @@ -125,12 +125,12 @@ :size-assert #x10 :flag-assert #x1200000010 (:methods - (dummy-9 (_type_) none 9) + (touching-shapes-entry-method-9 (_type_) none 9) (get-touched-shape (_type_ collide-shape) collide-shape 10) - (dummy-11 () none 11) + (touching-shapes-entry-method-11 () none 11) (prims-touching? (_type_ collide-shape-moving uint) touching-prims-entry 12) (prims-touching-action? (_type_ collide-shape collide-action collide-action) touching-prims-entry 13) - (dummy-14 () none 14) + (touching-shapes-entry-method-14 () none 14) (free-touching-prims-list (_type_) symbol 15) (get-head (_type_) touching-prims-entry 16) (get-next (_type_ touching-prims-entry) touching-prims-entry 17) @@ -159,7 +159,7 @@ (:methods (new (symbol type) _type_ 0) (add-touching-prims (_type_ collide-shape-prim collide-shape-prim float collide-tri-result collide-tri-result) none 9) - (dummy-10 () none 10) + (touching-list-method-10 () none 10) (update-from-step-size (_type_ float) none 11) (send-events-for-touching-shapes (_type_) none 12) (get-shapes-entry (_type_ collide-shape collide-shape) touching-shapes-entry 13) diff --git a/test/decompiler/reference/jak1/engine/debug/stats-h_REF.gc b/test/decompiler/reference/jak1/engine/debug/stats-h_REF.gc index c58baf10a5..4f75d7d45c 100644 --- a/test/decompiler/reference/jak1/engine/debug/stats-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/debug/stats-h_REF.gc @@ -66,7 +66,7 @@ :size-assert #x34 :flag-assert #xe00000034 (:methods - (dummy-9 (_type_) none 9) + (perf-stat-method-9 (_type_) none 9) (print-to-stream (_type_ string basic) none 10) (reset! (_type_) none 11) (read! (_type_) none 12) diff --git a/test/decompiler/reference/jak1/engine/draw/process-drawable_REF.gc b/test/decompiler/reference/jak1/engine/draw/process-drawable_REF.gc index e677806b25..7e039bef90 100644 --- a/test/decompiler/reference/jak1/engine/draw/process-drawable_REF.gc +++ b/test/decompiler/reference/jak1/engine/draw/process-drawable_REF.gc @@ -969,7 +969,7 @@ (label cfg-27) (let ((a0-17 (-> gp-0 effect))) (if a0-17 - (TODO-RENAME-9 a0-17) + (effect-control-method-9 a0-17) ) ) ) diff --git a/test/decompiler/reference/jak1/engine/entity/entity-h_REF.gc b/test/decompiler/reference/jak1/engine/entity/entity-h_REF.gc index 306a5c0832..76cf9d37fe 100644 --- a/test/decompiler/reference/jak1/engine/entity/entity-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/entity/entity-h_REF.gc @@ -251,7 +251,7 @@ (next-actor (_type_) entity-actor 27) (prev-actor (_type_) entity-actor 28) (debug-print (_type_ symbol type) none 29) - (dummy-30 (_type_ entity-perm-status symbol) none 30) + (set-or-clear-status! (_type_ entity-perm-status symbol) none 30) ) ) diff --git a/test/decompiler/reference/jak1/engine/entity/entity_REF.gc b/test/decompiler/reference/jak1/engine/entity/entity_REF.gc index 6bf2a47bd9..cac9e300e6 100644 --- a/test/decompiler/reference/jak1/engine/entity/entity_REF.gc +++ b/test/decompiler/reference/jak1/engine/entity/entity_REF.gc @@ -1032,10 +1032,10 @@ (debug-draw (-> (the-as process-drawable s5-2) nav)) ) (if (nonzero? (-> (the-as process-drawable s5-2) path)) - (dummy-9 (-> (the-as process-drawable s5-2) path)) + (debug-draw (-> (the-as process-drawable s5-2) path)) ) (if (nonzero? (-> (the-as process-drawable s5-2) vol)) - (dummy-9 (-> (the-as process-drawable s5-2) vol)) + (init! (-> (the-as process-drawable s5-2) vol)) ) ) (if (and (the-as process-drawable s5-2) @@ -1090,10 +1090,10 @@ (debug-draw (-> arg0 nav)) ) (if (nonzero? (-> arg0 path)) - (dummy-9 (-> arg0 path)) + (debug-draw (-> arg0 path)) ) (if (nonzero? (-> arg0 vol)) - (dummy-9 (-> arg0 vol)) + (init! (-> arg0 vol)) ) ) (none) @@ -1838,7 +1838,7 @@ ;; definition for method 30 of type entity-actor ;; INFO: Return type mismatch entity-perm-status vs none. -(defmethod dummy-30 entity-actor ((obj entity-actor) (arg0 entity-perm-status) (arg1 symbol)) +(defmethod set-or-clear-status! entity-actor ((obj entity-actor) (arg0 entity-perm-status) (arg1 symbol)) (let ((v1-0 (-> obj extra))) (if arg1 (logior! (-> v1-0 perm status) arg0) diff --git a/test/decompiler/reference/jak1/engine/game/collectables_REF.gc b/test/decompiler/reference/jak1/engine/game/collectables_REF.gc index f66bbb488f..2011e55bbd 100644 --- a/test/decompiler/reference/jak1/engine/game/collectables_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/collectables_REF.gc @@ -488,7 +488,7 @@ (defstate wait (eco-collectable) :virtual #t :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) - (local-vars (v0-3 none)) + (local-vars (v0-3 object)) (when (and (or (= event-type 'touch) (= event-type 'attack)) (and (logtest? (-> self flags) (collectable-flags can-collect)) (>= (- (-> *display* base-frame-counter) (-> self birth-time)) (-> self collect-timeout)) @@ -516,7 +516,7 @@ ((= event-type 'trans) (set! (-> self root-override trans quad) (-> (the-as vector (-> event param 0)) quad)) (update-transforms! (-> self root-override)) - (ja-post) + (the-as object (ja-post)) ) ((= event-type 'jump) (logclear! (-> self mask) (process-mask actor-pause)) @@ -537,7 +537,7 @@ (go-virtual die) ) ((= event-type 'movie-pos) - (set! v0-3 (the-as none (-> event param 0))) + (set! v0-3 (-> event param 0)) (set! (-> self movie-pos-index) (the-as int v0-3)) v0-3 ) @@ -545,7 +545,7 @@ (cond ((-> event param 0) (logior! (-> self mask) (process-mask actor-pause)) - (set! v0-3 (the-as none #t)) + (set! v0-3 #t) (set! (-> self actor-pause) (the-as symbol v0-3)) v0-3 ) @@ -559,7 +559,7 @@ ((= event-type 'fade) (logior! (-> self flags) (collectable-flags fade)) (set! (-> self fadeout-timeout) (seconds 0.1)) - (set! v0-3 (the-as none (-> *display* base-frame-counter))) + (set! v0-3 (-> *display* base-frame-counter)) (set! (-> self birth-time) (the-as time-frame v0-3)) v0-3 ) @@ -946,7 +946,7 @@ (the-as object (case event-type (('fade) (process-entity-status! self (entity-perm-status dead) #t) - (deactivate self) + (the-as object (deactivate self)) ) (('die) (go-virtual die) @@ -1569,7 +1569,7 @@ (defstate wait (fuel-cell) :virtual #t :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) - (local-vars (v0-3 none)) + (local-vars (v0-3 object)) (when (and (or (= event-type 'touch) (= event-type 'attack)) (and (logtest? (-> self flags) (collectable-flags can-collect)) (>= (- (-> *display* base-frame-counter) (-> self birth-time)) (-> self collect-timeout)) @@ -1603,23 +1603,23 @@ ) ((= event-type 'collide-shape) (if (-> event param 0) - (restore-collide-with-as (-> self root-override)) - (clear-collide-with-as (-> self root-override)) + (the-as object (restore-collide-with-as (-> self root-override))) + (the-as object (clear-collide-with-as (-> self root-override))) ) ) ((= event-type 'movie-pos) - (set! v0-3 (the-as none (-> event param 0))) + (set! v0-3 (-> event param 0)) (set! (-> self movie-pos-index) (the-as int v0-3)) v0-3 ) ((= event-type 'anim) (cond ((-> event param 0) - (set! v0-3 (the-as none (logclear (-> self flags) (collectable-flags anim)))) + (set! v0-3 (logclear (-> self flags) (collectable-flags anim))) (set! (-> self flags) (the-as collectable-flags v0-3)) ) (else - (set! v0-3 (the-as none (logior (-> self flags) (collectable-flags anim)))) + (set! v0-3 (logior (-> self flags) (collectable-flags anim))) (set! (-> self flags) (the-as collectable-flags v0-3)) ) ) diff --git a/test/decompiler/reference/jak1/engine/game/crates_REF.gc b/test/decompiler/reference/jak1/engine/game/crates_REF.gc index e537ac9413..4b9d42e173 100644 --- a/test/decompiler/reference/jak1/engine/game/crates_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/crates_REF.gc @@ -98,7 +98,7 @@ (params-init (_type_ entity) none 25) (art-init (_type_) crate 26) (params-set! (_type_ symbol symbol) none 27) - (dummy-28 (_type_) none 28) + (check-dead (_type_) none 28) (smush-update! (_type_) none 29) ) ) @@ -1059,7 +1059,7 @@ (set! (-> self look) arg2) (set! (-> self defense) arg2) (art-init self) - (dummy-28 self) + (check-dead self) (none) ) @@ -1067,7 +1067,7 @@ (defmethod init-from-entity! crate ((obj crate) (arg0 entity-actor)) (params-init obj arg0) (art-init obj) - (dummy-28 obj) + (check-dead obj) (none) ) @@ -1217,7 +1217,7 @@ ;; definition for method 28 of type crate ;; INFO: Return type mismatch int vs none. -(defmethod dummy-28 crate ((obj crate)) +(defmethod check-dead crate ((obj crate)) (if (>= (-> obj entity extra perm user-int8 0) 1) (go (method-of-object obj die) #t 0) ) @@ -1465,7 +1465,7 @@ ;; definition for method 28 of type pickup-spawner ;; INFO: Return type mismatch int vs none. -(defmethod dummy-28 pickup-spawner ((obj pickup-spawner)) +(defmethod check-dead pickup-spawner ((obj pickup-spawner)) (go (method-of-object obj wait)) 0 (none) diff --git a/test/decompiler/reference/jak1/engine/game/effect-control-h_REF.gc b/test/decompiler/reference/jak1/engine/game/effect-control-h_REF.gc index a6840caf1a..4f44d5d473 100644 --- a/test/decompiler/reference/jak1/engine/game/effect-control-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/effect-control-h_REF.gc @@ -17,12 +17,12 @@ :flag-assert #xf00000024 (:methods (new (symbol type process-drawable) _type_ 0) - (TODO-RENAME-9 (_type_) none 9) - (dummy-10 (_type_ symbol float int) object 10) - (dummy-11 (_type_ symbol float int basic pat-surface) none 11) - (dummy-12 (_type_ symbol float int basic sound-name) int 12) + (effect-control-method-9 (_type_) none 9) + (effect-control-method-10 (_type_ symbol float int) object 10) + (effect-control-method-11 (_type_ symbol float int basic pat-surface) none 11) + (effect-control-method-12 (_type_ symbol float int basic sound-name) int 12) (set-channel-offset! (_type_ int) none 13) - (TODO-RENAME-14 (_type_ float float float) none 14) + (effect-control-method-14 (_type_ float float float) none 14) ) ) diff --git a/test/decompiler/reference/jak1/engine/game/effect-control_REF.gc b/test/decompiler/reference/jak1/engine/game/effect-control_REF.gc index e332aeecc8..b58a5cbacb 100644 --- a/test/decompiler/reference/jak1/engine/game/effect-control_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/effect-control_REF.gc @@ -130,7 +130,7 @@ ;; definition for method 9 of type effect-control ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-9 effect-control ((obj effect-control)) +(defmethod effect-control-method-9 effect-control ((obj effect-control)) (let* ((a0-1 (-> obj process skel)) (v1-3 (if (< (-> obj channel-offset) (-> a0-1 active-channels)) (-> a0-1 root-channel (-> obj channel-offset)) @@ -157,7 +157,7 @@ (if (and (-> obj name) (= (-> obj name 0 key-frame) -1000000000.0)) (set! (-> obj name) (&-> (-> obj name) 1)) ) - (TODO-RENAME-14 obj f30-0 f30-0 f30-0) + (effect-control-method-14 obj f30-0 f30-0 f30-0) ) ((or (not (-> obj name)) (= f30-0 (-> obj last-frame-num))) ) @@ -171,12 +171,12 @@ (cond ((< f26-0 f28-0) (if (>= f28-0 f0-6) - (TODO-RENAME-14 obj f26-0 f28-0 f30-0) + (effect-control-method-14 obj f26-0 f28-0 f30-0) ) ) (else (if (>= f0-6 f28-0) - (TODO-RENAME-14 obj f28-0 f26-0 f30-0) + (effect-control-method-14 obj f28-0 f26-0 f30-0) ) ) ) @@ -187,31 +187,31 @@ ((>= (-> v1-3 param 0) 0.0) (cond ((< f26-0 f28-0) - (TODO-RENAME-14 obj f28-0 9999999.0 f30-0) - (TODO-RENAME-14 obj -100000000.0 f26-0 9999999.0) + (effect-control-method-14 obj f28-0 9999999.0 f30-0) + (effect-control-method-14 obj -100000000.0 f26-0 9999999.0) ) (else - (TODO-RENAME-14 obj f28-0 f26-0 f30-0) + (effect-control-method-14 obj f28-0 f26-0 f30-0) ) ) ) ((< f28-0 f26-0) - (TODO-RENAME-14 obj f26-0 9999999.0 f30-0) - (TODO-RENAME-14 obj -100000000.0 f28-0 9999999.0) + (effect-control-method-14 obj f26-0 9999999.0 f30-0) + (effect-control-method-14 obj -100000000.0 f28-0 9999999.0) ) (else - (TODO-RENAME-14 obj f26-0 f28-0 f30-0) + (effect-control-method-14 obj f26-0 f28-0 f30-0) ) ) ) ((= a0-3 num-func-+!) (if (>= (-> v1-3 param 0) 0.0) - (TODO-RENAME-14 obj f28-0 f26-0 f30-0) - (TODO-RENAME-14 obj f26-0 f28-0 f30-0) + (effect-control-method-14 obj f28-0 f26-0 f30-0) + (effect-control-method-14 obj f26-0 f28-0 f30-0) ) ) ((= a0-3 num-func-identity) - (TODO-RENAME-14 obj f30-0 f30-0 f30-0) + (effect-control-method-14 obj f30-0 f30-0 f30-0) ) ) ) @@ -234,13 +234,13 @@ ;; definition for method 14 of type effect-control ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-14 effect-control ((obj effect-control) (arg0 float) (arg1 float) (arg2 float)) +(defmethod effect-control-method-14 effect-control ((obj effect-control) (arg0 float) (arg1 float) (arg2 float)) (let ((s2-0 (-> obj name))) (while (= (-> s2-0 0 name) 'effect-name) (let ((f0-0 (-> s2-0 0 key-frame))) (when (or (and (< f0-0 arg1) (< arg0 f0-0)) (= f0-0 arg2)) (let* ((a0-1 obj) - (t9-0 (method-of-object a0-1 dummy-10)) + (t9-0 (method-of-object a0-1 effect-control-method-10)) (v1-7 (-> obj res)) (a1-1 (-> s2-0 0)) ) @@ -270,7 +270,7 @@ ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 364] ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 450] ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 469] -(defmethod dummy-10 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int)) +(defmethod effect-control-method-10 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int)) (local-vars (sv-160 int) (sv-176 symbol) @@ -335,7 +335,7 @@ ) ) ) - (dummy-11 obj arg0 arg1 s5-0 (-> obj res) (the-as pat-surface t1-1)) + (effect-control-method-11 obj arg0 arg1 s5-0 (-> obj res) (the-as pat-surface t1-1)) ) ) ((let ((v1-18 (symbol->string arg0))) @@ -409,7 +409,7 @@ (activate! *camera-smush-control* 819.2 37 600 1.0 0.995) ) ((zero? s3-0) - (dummy-12 obj arg0 arg1 s5-0 (-> obj res) (string->sound-name (symbol->string arg0))) + (effect-control-method-12 obj arg0 arg1 s5-0 (-> obj res) (string->sound-name (symbol->string arg0))) ) ((= (-> (the-as basic s3-0) type) sparticle-launcher) (if *debug-effect-control* @@ -524,7 +524,7 @@ ) (when (-> (the-as death-info s3-0) sound) (let* ((s2-5 obj) - (s1-3 (method-of-object s2-5 dummy-12)) + (s1-3 (method-of-object s2-5 effect-control-method-12)) (s0-3 (-> (the-as death-info s3-0) sound)) ) (set! sv-288 (-> obj res)) @@ -536,7 +536,7 @@ (send-event (-> obj process) 'death-start (the-as death-info s3-0)) ) (else - (dummy-12 obj arg0 arg1 s5-0 (-> obj res) (string->sound-name (symbol->string arg0))) + (effect-control-method-12 obj arg0 arg1 s5-0 (-> obj res) (string->sound-name (symbol->string arg0))) ) ) ) @@ -547,7 +547,7 @@ ;; definition for method 11 of type effect-control ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-11 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int) (arg3 basic) (arg4 pat-surface)) +(defmethod effect-control-method-11 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int) (arg3 basic) (arg4 pat-surface)) (local-vars (sv-48 (function sparticle-system sparticle-launcher vector sparticle-launch-state sparticle-launch-control float none) @@ -588,7 +588,7 @@ (('effect-land-poof) (when (< a0-4 9000) (let* ((a0-13 obj) - (t9-8 (method-of-object a0-13 dummy-10)) + (t9-8 (method-of-object a0-13 effect-control-method-10)) (v1-15 (-> arg4 material)) ) (t9-8 @@ -655,7 +655,7 @@ (('effect-run-poof) (when (< a0-4 9000) (let* ((a0-14 obj) - (t9-9 (method-of-object a0-14 dummy-10)) + (t9-9 (method-of-object a0-14 effect-control-method-10)) (v1-20 (-> arg4 material)) ) (t9-9 @@ -721,7 +721,7 @@ ) (('effect-just-footprint) (let* ((a0-15 obj) - (t9-10 (method-of-object a0-15 dummy-10)) + (t9-10 (method-of-object a0-15 effect-control-method-10)) (v1-24 (-> arg4 material)) ) (t9-10 @@ -787,7 +787,7 @@ (('effect-just-poof) (when (< a0-4 9000) (let* ((a0-16 obj) - (t9-11 (method-of-object a0-16 dummy-10)) + (t9-11 (method-of-object a0-16 effect-control-method-10)) (v1-29 (-> arg4 material)) ) (t9-11 @@ -853,7 +853,7 @@ ) (('effect-slide-poof) (let* ((a0-19 obj) - (t9-12 (method-of-object a0-19 dummy-10)) + (t9-12 (method-of-object a0-19 effect-control-method-10)) (v1-33 (-> arg4 material)) ) (t9-12 @@ -1059,7 +1059,7 @@ ) ) (if s1-0 - (dummy-12 obj arg0 arg1 arg2 arg3 s1-0) + (effect-control-method-12 obj arg0 arg1 arg2 arg3 s1-0) ) ) 0 @@ -1068,7 +1068,7 @@ ;; definition for method 12 of type effect-control ;; INFO: Used lq/sq -(defmethod dummy-12 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int) (arg3 basic) (arg4 sound-name)) +(defmethod effect-control-method-12 effect-control ((obj effect-control) (arg0 symbol) (arg1 float) (arg2 int) (arg3 basic) (arg4 sound-name)) (local-vars (sv-112 res-tag) (sv-128 sound-name) (sv-144 basic) (sv-160 (function vector vector float))) (set! sv-144 arg3) (let ((s0-0 arg4) @@ -1139,8 +1139,8 @@ (defbehavior target-land-effect target () (cond ((logtest? (-> self control root-prim prim-core action) (collide-action ca-14)) - (dummy-10 (-> self skel effect) 'effect-land-poof -1.0 -1) - (dummy-10 (-> self skel effect) 'effect-flut-land -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-land-poof -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-flut-land -1.0 -1) ) ((logtest? (-> self control root-prim prim-core action) (collide-action ca-9)) (sound-play-by-name @@ -1156,11 +1156,11 @@ ) ) ((logtest? (-> self water flags) (water-flags wt09)) - (dummy-10 (-> self skel effect) 'effect-land-water -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-land-water -1.0 -1) ) (else - (dummy-10 (-> self skel effect) 'effect-land-poof -1.0 -1) - (dummy-10 (-> self skel effect) 'effect-land -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-land-poof -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-land -1.0 -1) ) ) 0 diff --git a/test/decompiler/reference/jak1/engine/game/game-h_REF.gc b/test/decompiler/reference/jak1/engine/game/game-h_REF.gc index 6af3ab2de3..b81280dc0c 100644 --- a/test/decompiler/reference/jak1/engine/game/game-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/game-h_REF.gc @@ -68,49 +68,49 @@ :size-assert #xb0 :flag-assert #x3f004000b0 (:methods - (dummy-20 () none 20) - (dummy-21 () none 21) - (dummy-22 () none 22) - (dummy-23 () none 23) - (dummy-24 () none 24) - (dummy-25 () none 25) - (dummy-26 () none 26) - (dummy-27 () none 27) - (dummy-28 () none 28) - (dummy-29 () none 29) - (dummy-30 () none 30) - (dummy-31 () none 31) - (dummy-32 () none 32) - (dummy-33 () none 33) - (dummy-34 () none 34) - (dummy-35 () none 35) - (dummy-36 () none 36) - (dummy-37 () none 37) - (dummy-38 () none 38) - (dummy-39 () none 39) - (dummy-40 () none 40) - (dummy-41 () none 41) - (dummy-42 () none 42) - (dummy-43 () none 43) - (dummy-44 () none 44) - (dummy-45 () none 45) - (dummy-46 () none 46) - (dummy-47 () none 47) - (dummy-48 () none 48) - (dummy-49 () none 49) - (dummy-50 () none 50) - (dummy-51 () none 51) - (dummy-52 () none 52) - (dummy-53 () none 53) - (dummy-54 () none 54) - (dummy-55 () none 55) - (dummy-56 () none 56) - (dummy-57 () none 57) - (dummy-58 () none 58) - (dummy-59 () none 59) - (dummy-60 () none 60) - (dummy-61 () none 61) - (dummy-62 () none 62) + (process-drawable-reserved-method-20 () none 20) + (process-drawable-reserved-method-21 () none 21) + (process-drawable-reserved-method-22 () none 22) + (process-drawable-reserved-method-23 () none 23) + (process-drawable-reserved-method-24 () none 24) + (process-drawable-reserved-method-25 () none 25) + (process-drawable-reserved-method-26 () none 26) + (process-drawable-reserved-method-27 () none 27) + (process-drawable-reserved-method-28 () none 28) + (process-drawable-reserved-method-29 () none 29) + (process-drawable-reserved-method-30 () none 30) + (process-drawable-reserved-method-31 () none 31) + (process-drawable-reserved-method-32 () none 32) + (process-drawable-reserved-method-33 () none 33) + (process-drawable-reserved-method-34 () none 34) + (process-drawable-reserved-method-35 () none 35) + (process-drawable-reserved-method-36 () none 36) + (process-drawable-reserved-method-37 () none 37) + (process-drawable-reserved-method-38 () none 38) + (process-drawable-reserved-method-39 () none 39) + (process-drawable-reserved-method-40 () none 40) + (process-drawable-reserved-method-41 () none 41) + (process-drawable-reserved-method-42 () none 42) + (process-drawable-reserved-method-43 () none 43) + (process-drawable-reserved-method-44 () none 44) + (process-drawable-reserved-method-45 () none 45) + (process-drawable-reserved-method-46 () none 46) + (process-drawable-reserved-method-47 () none 47) + (process-drawable-reserved-method-48 () none 48) + (process-drawable-reserved-method-49 () none 49) + (process-drawable-reserved-method-50 () none 50) + (process-drawable-reserved-method-51 () none 51) + (process-drawable-reserved-method-52 () none 52) + (process-drawable-reserved-method-53 () none 53) + (process-drawable-reserved-method-54 () none 54) + (process-drawable-reserved-method-55 () none 55) + (process-drawable-reserved-method-56 () none 56) + (process-drawable-reserved-method-57 () none 57) + (process-drawable-reserved-method-58 () none 58) + (process-drawable-reserved-method-59 () none 59) + (process-drawable-reserved-method-60 () none 60) + (process-drawable-reserved-method-61 () none 61) + (process-drawable-reserved-method-62 () none 62) ) ) diff --git a/test/decompiler/reference/jak1/engine/game/game-save_REF.gc b/test/decompiler/reference/jak1/engine/game/game-save_REF.gc index 71d009c1a8..b59ec7f134 100644 --- a/test/decompiler/reference/jak1/engine/game/game-save_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/game-save_REF.gc @@ -1734,7 +1734,7 @@ auto-save-post #t ) (('die) - (deactivate self) + (the-as symbol (deactivate self)) ) ) ) diff --git a/test/decompiler/reference/jak1/engine/game/generic-obs_REF.gc b/test/decompiler/reference/jak1/engine/game/generic-obs_REF.gc index e563895c40..ca276397f2 100644 --- a/test/decompiler/reference/jak1/engine/game/generic-obs_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/generic-obs_REF.gc @@ -54,7 +54,7 @@ (do-joint-math! self) (let ((a0-22 (-> self skel effect))) (if a0-22 - (TODO-RENAME-9 a0-22) + (effect-control-method-9 a0-22) ) ) (if (logtest? (-> self skel status) (janim-status blerc blerc-done)) @@ -244,7 +244,7 @@ ;; failed to figure out what this is: (defstate manipy-idle (manipy) :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) - (local-vars (v0-0 none)) + (local-vars (v0-0 object)) (let ((v1-0 event-type)) (the-as object @@ -252,11 +252,11 @@ ((= v1-0 'attackable) (cond ((-> event param 0) - (set! v0-0 (the-as none (logior (process-mask attackable) (-> self mask)))) + (set! v0-0 (logior (process-mask attackable) (-> self mask))) (set! (-> self mask) (the-as process-mask v0-0)) ) (else - (set! v0-0 (the-as none (logclear (-> self mask) (process-mask attackable)))) + (set! v0-0 (logclear (-> self mask) (process-mask attackable))) (set! (-> self mask) (the-as process-mask v0-0)) ) ) @@ -265,11 +265,11 @@ ((= v1-0 'blend-shape) (cond ((-> event param 0) - (set! v0-0 (the-as none (logior (-> self skel status) (janim-status blerc eye)))) + (set! v0-0 (logior (-> self skel status) (janim-status blerc eye))) (set! (-> self skel status) (the-as janim-status v0-0)) ) (else - (set! v0-0 (the-as none (logclear (-> self skel status) (janim-status blerc eye)))) + (set! v0-0 (logclear (-> self skel status) (janim-status blerc eye))) (set! (-> self skel status) (the-as janim-status v0-0)) ) ) @@ -278,7 +278,7 @@ ((= v1-0 'shadow) (cond ((-> event param 0) - (set! v0-0 (the-as none (-> self shadow-backup))) + (set! v0-0 (-> self shadow-backup)) (set! (-> self draw shadow) (the-as shadow-geo v0-0)) v0-0 ) @@ -289,23 +289,23 @@ ) ) ((= v1-0 'trans-hook) - (set! v0-0 (the-as none (-> event param 0))) + (set! v0-0 (-> event param 0)) (set! (-> self new-trans-hook) (the-as (function none) v0-0)) v0-0 ) ((= v1-0 'post-hook) - (set! v0-0 (the-as none (-> event param 0))) + (set! v0-0 (-> event param 0)) (set! (-> self new-post-hook) (the-as (function none) v0-0)) v0-0 ) ((= v1-0 'eval) - ((the-as (function manipy none) (-> event param 0)) self) + (the-as object ((the-as (function manipy none) (-> event param 0)) self)) ) ((= v1-0 'become-hud-object) - (convert-to-hud-object self (the-as hud (-> event param 0))) + (the-as object (convert-to-hud-object self (the-as hud (-> event param 0)))) ) ((= v1-0 'event-hook) - (set! v0-0 (the-as none (-> event param 0))) + (set! v0-0 (-> event param 0)) (set! (-> self cur-event-hook) (the-as (function none) v0-0)) v0-0 ) @@ -316,7 +316,7 @@ (lookup-art (-> self draw art-group) (the-as string (-> event param 0)) art-joint-anim) ) ) - (set! v0-0 (the-as none (-> event param 1))) + (set! v0-0 (-> event param 1)) (set! (-> self new-joint-anim-blend) (the-as uint v0-0)) v0-0 ) @@ -331,7 +331,7 @@ ) ((or (= v1-0 'origin-joint-index) (= v1-0 'center-joint)) (set! (-> self draw origin-joint-index) (-> event param 0)) - (set! v0-0 (the-as none (-> event param 0))) + (set! v0-0 (-> event param 0)) (set! (-> self draw shadow-joint-index) (the-as uint v0-0)) v0-0 ) @@ -342,24 +342,24 @@ (set! (-> self cur-grab-handle) (process->handle (the-as process (-> event param 0)))) (let ((v1-30 (handle->process (-> self cur-grab-handle)))) (when v1-30 - (set! v0-0 (the-as none (-> self old-grab-pos))) + (set! v0-0 (-> self old-grab-pos)) (set! (-> (the-as vector v0-0) quad) (-> (the-as process-drawable v1-30) root trans quad)) v0-0 ) ) ) ((= v1-0 'target) - (set! v0-0 (the-as none (process->handle (the-as process (-> event param 0))))) + (set! v0-0 (process->handle (the-as process (-> event param 0)))) (set! (-> self cur-target-handle) (the-as handle v0-0)) v0-0 ) ((= v1-0 'trans) (cond ((type-type? (-> self root type) collide-shape) - (move-to-point! (the-as collide-shape (-> self root)) (the-as vector (-> event param 0))) + (the-as object (move-to-point! (the-as collide-shape (-> self root)) (the-as vector (-> event param 0)))) ) (else - (set! v0-0 (the-as none (-> self root trans))) + (set! v0-0 (-> self root trans)) (set! (-> (the-as vector v0-0) quad) (-> (the-as vector (-> event param 0)) quad)) v0-0 ) @@ -375,7 +375,7 @@ (quaternion-copy! (-> self root quat) (the-as quaternion (-> event param 0))) ) ((= v1-0 'clone-copy-trans) - (set! v0-0 (the-as none (-> event param 0))) + (set! v0-0 (-> event param 0)) (set! (-> self clone-copy-trans) (the-as symbol v0-0)) v0-0 ) @@ -394,20 +394,20 @@ ((nonzero? (-> self skel)) (let ((gp-1 (-> self skel status))) (logior! (-> self skel status) (janim-status inited)) - (set! v0-0 (ja-post)) + (set! v0-0 (the-as object (ja-post))) (set! (-> self skel status) gp-1) ) v0-0 ) (else - (ja-post) + (the-as object (ja-post)) ) ) ) ) ) (else - (set! v0-0 (the-as none (logior (-> self draw status) (draw-status hidden)))) + (set! v0-0 (logior (-> self draw status) (draw-status hidden))) (set! (-> self draw status) (the-as draw-status v0-0)) v0-0 ) @@ -435,7 +435,7 @@ ) (else (if (-> self cur-event-hook) - ((-> self cur-event-hook)) + (the-as object ((-> self cur-event-hook))) ) ) ) @@ -711,8 +711,7 @@ ;; definition for function command-get-process ;; INFO: Return type mismatch object vs process. -;; WARN: Failed load: (set! a0-1 (l.wu (+ a0-0 -4))) at op 11 -;; WARN: Failed load: (set! a0-2 (l.wu (+ a0-0 -4))) at op 48 +;; ERROR: Failed load: (set! a0-1 (l.wu (+ a0-0 -4))) at op 11 ;; WARN: disable def twice: 68. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare. ;; WARN: disable def twice: 82. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare. ;; WARN: disable def twice: 96. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare. @@ -786,9 +785,7 @@ ;; definition for function command-get-camera ;; INFO: Return type mismatch object vs state. -;; WARN: Failed load: (set! a0-3 (l.wu (+ a0-0 -4))) at op 47 -;; WARN: Failed load: (set! a0-1 (l.wu (+ a0-0 -4))) at op 23 -;; WARN: Failed load: (set! a0-2 (l.wu (+ a0-0 -4))) at op 35 +;; ERROR: Failed load: (set! a0-3 (l.wu (+ a0-0 -4))) at op 47 (defun command-get-camera ((arg0 object) (arg1 state)) (the-as state (cond ((null? arg0) @@ -982,8 +979,7 @@ ;; definition for method 14 of type camera-tracker ;; INFO: Return type mismatch object vs process. -;; WARN: Failed load: (set! v1-42 (l.wu (+ a0-22 -4))) at op 159 -;; WARN: Failed load: (set! a0-72 (l.wu (+ s2-3 -4))) at op 393 +;; ERROR: Failed load: (set! v1-42 (l.wu (+ a0-22 -4))) at op 159 (defmethod eval camera-tracker ((obj camera-tracker) (arg0 pair)) (with-pp (let ((gp-0 (the-as object #f))) @@ -1185,7 +1181,7 @@ ) :enter (behavior () (if (-> self entity) - (dummy-30 (-> self entity) (entity-perm-status bit-3) #t) + (set-or-clear-status! (-> self entity) (entity-perm-status bit-3) #t) ) (if (not (-> self border-value)) (add-setting! 'border-mode (-> self border-value) 0.0 0) @@ -1197,7 +1193,7 @@ ) :exit (behavior () (if (-> self entity) - (dummy-30 (-> self entity) (entity-perm-status bit-3) #f) + (set-or-clear-status! (-> self entity) (entity-perm-status bit-3) #f) ) (send-event *camera* 'clear-entity) (none) @@ -1225,7 +1221,7 @@ ) ;; definition for function camera-tracker-init -;; WARN: Failed load: (set! a0-3 (l.wu (+ a0-0 -4))) at op 42 +;; ERROR: Failed load: (set! a0-3 (l.wu (+ a0-0 -4))) at op 42 (defbehavior camera-tracker-init camera-tracker ((arg0 object)) (stack-size-set! (-> self main-thread) 512) (logclear! (-> self mask) (process-mask actor-pause movie enemy platform projectile)) @@ -2239,7 +2235,7 @@ ;; failed to figure out what this is: (defstate touch-tracker-idle (touch-tracker) :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) - (local-vars (v0-0 none)) + (local-vars (v0-0 object)) (the-as object (case event-type (('touched) (let ((v1-1 (ppointer->process (-> self parent)))) @@ -2307,26 +2303,26 @@ ) ) (('target) - (set! v0-0 (the-as none (process->handle (the-as process (-> event param 0))))) + (set! v0-0 (process->handle (the-as process (-> event param 0)))) (set! (-> self target) (the-as handle v0-0)) v0-0 ) (('event) (set! (-> self event) (the-as symbol (-> event param 0))) - (set! v0-0 (the-as none (-> event param 1))) + (set! v0-0 (-> event param 1)) (set! (-> self event-mode) (the-as basic v0-0)) v0-0 ) (('exit) - (set! v0-0 (the-as none (-> event param 0))) + (set! v0-0 (-> event param 0)) (set! (-> self run-function) (the-as (function object) v0-0)) v0-0 ) (('eval) - ((the-as (function touch-tracker none) (-> event param 0)) self) + (the-as object ((the-as (function touch-tracker none) (-> event param 0)) self)) ) (('function) - (set! v0-0 (the-as none (-> event param 0))) + (set! v0-0 (-> event param 0)) (set! (-> self callback) (the-as (function touch-tracker none) v0-0)) v0-0 ) diff --git a/test/decompiler/reference/jak1/engine/game/powerups_REF.gc b/test/decompiler/reference/jak1/engine/game/powerups_REF.gc index 9e9b792bdc..ac34ecd64a 100644 --- a/test/decompiler/reference/jak1/engine/game/powerups_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/powerups_REF.gc @@ -555,7 +555,7 @@ ;; definition for function target-powerup-process ;; INFO: Return type mismatch int vs none. (defbehavior target-powerup-process target () - (dummy-10 (-> self water)) + (water-control-method-10 (-> self water)) (when (not *weather-off*) (case (-> self current-level name) (('swamp) diff --git a/test/decompiler/reference/jak1/engine/game/projectiles-h_REF.gc b/test/decompiler/reference/jak1/engine/game/projectiles-h_REF.gc index 8b58045d72..e7f7188aff 100644 --- a/test/decompiler/reference/jak1/engine/game/projectiles-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/projectiles-h_REF.gc @@ -36,11 +36,11 @@ (projectile-dissipate () _type_ :state 21) (projectile-impact () _type_ :state 22) (projectile-moving () _type_ :state 23) - (dummy-24 (_type_) none 24) - (dummy-25 (_type_) none 25) - (dummy-26 (_type_) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_) none 28) + (projectile-method-24 (_type_) none 24) + (projectile-method-25 (_type_) none 25) + (projectile-method-26 (_type_) none 26) + (projectile-method-27 (_type_) none 27) + (projectile-method-28 (_type_) none 28) ) ) diff --git a/test/decompiler/reference/jak1/engine/game/projectiles_REF.gc b/test/decompiler/reference/jak1/engine/game/projectiles_REF.gc index 715a0a832d..4fed2c0fe4 100644 --- a/test/decompiler/reference/jak1/engine/game/projectiles_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/projectiles_REF.gc @@ -631,7 +631,7 @@ ;; definition for method 24 of type projectile ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 projectile ((obj projectile)) +(defmethod projectile-method-24 projectile ((obj projectile)) (spawn (-> obj part) (the-as vector (-> obj root-override root-prim prim-core))) 0 (none) @@ -639,7 +639,7 @@ ;; definition for method 28 of type projectile ;; INFO: Return type mismatch int vs none. -(defmethod dummy-28 projectile ((obj projectile)) +(defmethod projectile-method-28 projectile ((obj projectile)) 0 (none) ) @@ -701,7 +701,7 @@ (if gp-0 (go-virtual projectile-impact) ) - (dummy-28 self) + (projectile-method-28 self) ((-> self update-velocity) self) (when (logtest? (-> self options) 2) (seek! (-> self tween) 1.0 (* 0.5 (-> *display* seconds-per-frame))) @@ -741,7 +741,7 @@ ) (set-time-ratios *display* (the float s5-0)) ) - (dummy-24 self) + (projectile-method-24 self) (suspend) ) ) @@ -841,14 +841,14 @@ ;; definition for method 27 of type projectile ;; INFO: Return type mismatch int vs none. -(defmethod dummy-27 projectile ((obj projectile)) +(defmethod projectile-method-27 projectile ((obj projectile)) 0 (none) ) ;; definition for method 26 of type projectile ;; INFO: Return type mismatch int vs none. -(defmethod dummy-26 projectile ((obj projectile)) +(defmethod projectile-method-26 projectile ((obj projectile)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) projectile-collision-reaction) @@ -875,7 +875,7 @@ ;; definition for method 25 of type projectile ;; INFO: Return type mismatch int vs none. -(defmethod dummy-25 projectile ((obj projectile)) +(defmethod projectile-method-25 projectile ((obj projectile)) (go (method-of-object obj projectile-moving)) 0 (none) @@ -921,7 +921,7 @@ (countdown (v1-4 16) (set! (-> self old-dist v1-4) 4095996000.0) ) - (dummy-26 self) + (projectile-method-26 self) (set! (-> self root-override dynam gravity y) 1228800.0) (set! (-> self root-override dynam gravity-length) 1228800.0) (set! (-> self root-override dynam gravity-max) 1228800.0) @@ -938,8 +938,8 @@ (vector-normalize-copy! (-> self base-vector) arg2 1.0) (vector+float*! (-> self target) (-> self root-override trans) (-> self root-override transv) 2.0) (set! (-> self target-base quad) (-> self target quad)) - (dummy-27 self) - (dummy-24 self) + (projectile-method-27 self) + (projectile-method-24 self) (when (not (type-type? (-> self type) projectile-blue)) (let ((a1-8 (new 'stack-no-clear 'collide-edge-hold-list))) (set! (-> a1-8 num-allocs) (the-as uint 1)) @@ -948,14 +948,14 @@ ) ) (set! (-> self event-hook) (-> (method-of-object self projectile-moving) event)) - (dummy-25 self) + (projectile-method-25 self) (none) ) ;; definition for method 27 of type projectile-yellow ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-27 projectile-yellow ((obj projectile-yellow)) +(defmethod projectile-method-27 projectile-yellow ((obj projectile-yellow)) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 204 (seconds 0.1)) (set! (-> obj attack-mode) 'eco-yellow) (set! (-> obj mode) 1) @@ -1024,8 +1024,8 @@ ;; definition for method 26 of type projectile-yellow ;; INFO: Return type mismatch collide-kind vs none. -(defmethod dummy-26 projectile-yellow ((obj projectile-yellow)) - (let ((t9-0 (method-of-type projectile dummy-26))) +(defmethod projectile-method-26 projectile-yellow ((obj projectile-yellow)) + (let ((t9-0 (method-of-type projectile projectile-method-26))) (t9-0 obj) ) (logior! (-> obj root-override root-prim collide-with) (collide-kind mother-spider)) @@ -1034,7 +1034,7 @@ ;; definition for method 24 of type projectile-yellow ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 projectile-yellow ((obj projectile-yellow)) +(defmethod projectile-method-24 projectile-yellow ((obj projectile-yellow)) (with-pp (find-ground-and-draw-shadow (-> obj root-override trans) @@ -1091,7 +1091,7 @@ ;; definition for method 28 of type projectile-yellow ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-28 projectile-yellow ((obj projectile-yellow)) +(defmethod projectile-method-28 projectile-yellow ((obj projectile-yellow)) (cond ((or (not (handle->process (-> obj last-target))) (zero? (-> (the-as target (handle->process (-> obj last-target))) control root-prim prim-core collide-as)) @@ -1173,7 +1173,7 @@ ;; definition for method 27 of type projectile-blue ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-27 projectile-blue ((obj projectile-blue)) +(defmethod projectile-method-27 projectile-blue ((obj projectile-blue)) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 204 (seconds 0.1)) (sound-play "blue-eco-on") (set! (-> obj mode) 2) @@ -1201,7 +1201,7 @@ ;; definition for method 26 of type projectile-blue ;; INFO: Return type mismatch int vs none. -(defmethod dummy-26 projectile-blue ((obj projectile-blue)) +(defmethod projectile-method-26 projectile-blue ((obj projectile-blue)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) projectile-collision-reaction) @@ -1280,7 +1280,7 @@ ;; definition for method 28 of type projectile-blue ;; INFO: Return type mismatch int vs none. -(defmethod dummy-28 projectile-blue ((obj projectile-blue)) +(defmethod projectile-method-28 projectile-blue ((obj projectile-blue)) (let* ((s5-0 (handle->process (-> obj last-target))) (v1-4 (if (and (nonzero? s5-0) (type-type? (-> s5-0 type) process-drawable)) s5-0 @@ -1300,7 +1300,7 @@ ;; definition for method 24 of type projectile-blue ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 projectile-blue ((obj projectile-blue)) +(defmethod projectile-method-24 projectile-blue ((obj projectile-blue)) (if (rand-vu-percent? 0.75) (eco-blue-glow (the-as vector (-> obj root-override root-prim prim-core))) ) diff --git a/test/decompiler/reference/jak1/engine/game/task/process-taskable_REF.gc b/test/decompiler/reference/jak1/engine/game/task/process-taskable_REF.gc index bdac48ed68..370705af81 100644 --- a/test/decompiler/reference/jak1/engine/game/task/process-taskable_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/task/process-taskable_REF.gc @@ -3,7 +3,7 @@ ;; definition for method 52 of type process-taskable ;; INFO: Return type mismatch int vs none. -(defmethod dummy-52 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-52 process-taskable ((obj process-taskable)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((a0-1 v1-1)) @@ -151,7 +151,7 @@ ;; definition for method 46 of type process-taskable ;; INFO: Return type mismatch int vs none. -(defmethod dummy-46 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-46 process-taskable ((obj process-taskable)) (when (nonzero? (-> obj sound-flava)) (let ((s5-1 (vector-! (new 'stack-no-clear 'vector) @@ -219,7 +219,7 @@ ;; definition for method 33 of type process-taskable ;; INFO: Return type mismatch int vs none. -(defmethod dummy-33 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-33 process-taskable ((obj process-taskable)) (let ((s5-0 (play-anim! obj #f))) (if (type-type? (-> s5-0 type) spool-anim) (spool-push *art-control* (-> (the-as spool-anim s5-0) name) 0 obj -99.0) @@ -281,7 +281,7 @@ ;; definition for method 38 of type process-taskable ;; INFO: Return type mismatch object vs none. -(defmethod dummy-38 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-38 process-taskable ((obj process-taskable)) (if (nonzero? (-> obj cell-for-task)) (go (method-of-object obj give-cell)) ) @@ -299,7 +299,7 @@ (suspend) (ja :num! (loop!)) (if (= (-> self next-state name) 'idle) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) ) ) (the-as none 0) @@ -317,7 +317,7 @@ (go-virtual hidden) ) ) - (dummy-33 self) + (process-taskable-method-33 self) ((-> self cur-trans-hook)) (none) ) @@ -351,7 +351,7 @@ ) ) (go-virtual release) - (dummy-33 self) + (process-taskable-method-33 self) ((-> self cur-trans-hook)) (none) ) @@ -411,7 +411,7 @@ ) ) (set! (-> self last-talk) (-> *display* game-frame-counter)) - (dummy-52 self) + (process-taskable-method-52 self) (none) ) @@ -647,7 +647,7 @@ ) :code (behavior () (process-taskable-play-anim-code (the-as art-joint-anim (get-art-elem self)) (play-anim! self #t)) - (dummy-38 self) + (process-taskable-method-38 self) (none) ) :post (the-as (function none :behavior process-taskable) ja-post) @@ -747,7 +747,7 @@ ;; definition for method 50 of type process-taskable ;; WARN: disable def twice: 4. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare. -(defmethod TODO-RENAME-50 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-50 process-taskable ((obj process-taskable)) (if *target* (or (not *target*) (< 245760.0 (vector-vector-distance (-> obj root-override trans) (-> *target* control trans))) @@ -778,7 +778,7 @@ ((-> self been-kicked) (go-virtual idle) ) - ((TODO-RENAME-50 self) + ((process-taskable-method-50 self) (if (should-display? self) (go-virtual idle) (go-virtual hidden) @@ -946,7 +946,7 @@ ) ) ((begin - (dummy-46 self) + (process-taskable-method-46 self) (and (not (and (logtest? (-> *target* control unknown-surface00 flags) (surface-flags jump)) (not (logtest? (-> *target* control status) (cshape-moving-flags onsurf))) ) @@ -1005,7 +1005,7 @@ ) ) (if (= (-> *level* loading-level) (-> *level* level-default)) - (dummy-33 self) + (process-taskable-method-33 self) ) (draw-npc-shadow self) (when (and (-> self been-kicked) (and (not *progress-process*) @@ -1060,7 +1060,7 @@ ;; definition for method 40 of type process-taskable ;; INFO: Return type mismatch int vs none. -(defmethod dummy-40 process-taskable ((obj process-taskable) (arg0 object) (arg1 skeleton-group) (arg2 int) (arg3 int) (arg4 vector) (arg5 int)) +(defmethod process-taskable-method-40 process-taskable ((obj process-taskable) (arg0 object) (arg1 skeleton-group) (arg2 int) (arg3 int) (arg4 vector) (arg5 int)) (stack-size-set! (-> obj main-thread) 512) (initialize-collision obj arg2 arg4) (process-drawable-from-entity! obj (the-as entity-actor arg0)) @@ -1087,17 +1087,17 @@ (set! (-> obj been-kicked) #f) (set! (-> obj neck-joint-index) arg5) (set! (-> obj cur-trans-hook) nothing) - (dummy-9 (-> obj ambient)) + (ambient-control-method-9 (-> obj ambient)) (set! (-> obj event-hook) (-> (method-of-object obj idle) event)) (set! (-> obj draw shadow-ctrl) (new 'process 'shadow-control 0.0 0.0 614400.0 (the-as float 60) 245760.0)) - (dummy-52 obj) + (process-taskable-method-52 obj) 0 (none) ) ;; definition for method 42 of type process-taskable ;; INFO: Return type mismatch object vs none. -(defmethod dummy-42 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-42 process-taskable ((obj process-taskable)) (cond ((not (should-display? obj)) (go (method-of-object obj hidden)) @@ -1114,20 +1114,20 @@ ;; definition for method 43 of type process-taskable ;; INFO: Return type mismatch int vs symbol. -(defmethod TODO-RENAME-43 process-taskable ((obj process-taskable)) +(defmethod process-taskable-method-43 process-taskable ((obj process-taskable)) (the-as symbol 0) ) ;; definition for method 9 of type ambient-control ;; INFO: Return type mismatch int vs none. -(defmethod dummy-9 ambient-control ((obj ambient-control)) +(defmethod ambient-control-method-9 ambient-control ((obj ambient-control)) (set! (-> obj last-ambient-time) (-> *display* game-frame-counter)) 0 (none) ) ;; definition for method 10 of type ambient-control -(defmethod TODO-RENAME-10 ambient-control ((obj ambient-control) (arg0 vector) (arg1 time-frame) (arg2 float) (arg3 process-drawable)) +(defmethod ambient-control-method-10 ambient-control ((obj ambient-control) (arg0 vector) (arg1 time-frame) (arg2 float) (arg3 process-drawable)) (when (< (- (-> *display* game-frame-counter) (-> obj last-ambient-time)) arg1) (set! arg0 (the-as vector #f)) (goto cfg-6) diff --git a/test/decompiler/reference/jak1/engine/game/task/task-control-h_REF.gc b/test/decompiler/reference/jak1/engine/game/task/task-control-h_REF.gc index dc2aac826a..b3dfd547ad 100644 --- a/test/decompiler/reference/jak1/engine/game/task/task-control-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/task/task-control-h_REF.gc @@ -73,8 +73,8 @@ :size-assert #x10 :flag-assert #xc00000010 (:methods - (dummy-9 (_type_) none 9) - (TODO-RENAME-10 (_type_ vector time-frame float process-drawable) vector 10) + (ambient-control-method-9 (_type_) none 9) + (ambient-control-method-10 (_type_ vector time-frame float process-drawable) vector 10) (play-ambient (_type_ string symbol vector) symbol 11) ) ) @@ -135,26 +135,26 @@ (idle () _type_ :state 30) (get-art-elem (_type_) art-element 31) (play-anim! (_type_ symbol) basic 32) - (dummy-33 (_type_) none 33) + (process-taskable-method-33 (_type_) none 33) (get-accept-anim (_type_ symbol) spool-anim 34) (push-accept-anim (_type_) none 35) (get-reject-anim (_type_ symbol) spool-anim 36) (push-reject-anim (_type_) none 37) - (dummy-38 (_type_) none 38) + (process-taskable-method-38 (_type_) none 38) (should-display? (_type_) symbol 39) - (dummy-40 (_type_ object skeleton-group int int vector int) none 40) + (process-taskable-method-40 (_type_ object skeleton-group int int vector int) none 40) (initialize-collision (_type_ int vector) none 41) - (dummy-42 (_type_) none 42) - (TODO-RENAME-43 (_type_) symbol 43) + (process-taskable-method-42 (_type_) none 42) + (process-taskable-method-43 (_type_) symbol 43) (play-reminder (_type_) symbol 44) - (dummy-45 (_type_) symbol 45) - (dummy-46 (_type_) none 46) + (process-taskable-method-45 (_type_) symbol 45) + (process-taskable-method-46 (_type_) none 46) (target-above-threshold? (_type_) symbol 47) (draw-npc-shadow (_type_) none 48) (hidden-other () _type_ :state 49) - (TODO-RENAME-50 (_type_) symbol 50) + (process-taskable-method-50 (_type_) symbol 50) (close-anim-file! (_type_) symbol 51) - (dummy-52 (_type_) none 52) + (process-taskable-method-52 (_type_) none 52) ) ) diff --git a/test/decompiler/reference/jak1/engine/geometry/vol-h_REF.gc b/test/decompiler/reference/jak1/engine/geometry/vol-h_REF.gc index d055534a70..63c059d487 100644 --- a/test/decompiler/reference/jak1/engine/geometry/vol-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/geometry/vol-h_REF.gc @@ -16,9 +16,9 @@ :size-assert #x18 :flag-assert #xc00000018 (:methods - (dummy-9 (_type_ symbol vector-array vector-array) symbol 9) + (init-vol! (_type_ symbol vector-array vector-array) symbol 9) (debug-draw (_type_) none 10) - (dummy-11 (_type_ vector float) symbol 11) + (point-in-vol? (_type_ vector float) symbol 11) ) ) @@ -51,9 +51,9 @@ :flag-assert #xc0000061c (:methods (new (symbol type process-drawable) _type_ 0) - (dummy-9 (_type_) symbol 9) - (dummy-10 (_type_ vector) symbol 10) - (TODO-RENAME-11 (_type_) symbol 11) + (init! (_type_) symbol 9) + (point-in-vol? (_type_ vector) symbol 10) + (vol-control-method-11 (_type_) symbol 11) ) ) @@ -132,6 +132,6 @@ ) ;; definition for method 11 of type vol-control -(defmethod TODO-RENAME-11 vol-control ((obj vol-control)) +(defmethod vol-control-method-11 vol-control ((obj vol-control)) (and *display-vol-marks* (logtest? (-> obj flags) 1)) ) diff --git a/test/decompiler/reference/jak1/engine/geometry/vol_REF.gc b/test/decompiler/reference/jak1/engine/geometry/vol_REF.gc index 1ac1dc01c2..afb41015d4 100644 --- a/test/decompiler/reference/jak1/engine/geometry/vol_REF.gc +++ b/test/decompiler/reference/jak1/engine/geometry/vol_REF.gc @@ -26,7 +26,7 @@ ;; WARN: Stack slot offset 148 signed mismatch ;; WARN: Stack slot offset 148 signed mismatch ;; WARN: Stack slot offset 148 signed mismatch -(defmethod dummy-9 plane-volume ((obj plane-volume) (arg0 symbol) (arg1 vector-array) (arg2 vector-array)) +(defmethod init-vol! plane-volume ((obj plane-volume) (arg0 symbol) (arg1 vector-array) (arg2 vector-array)) (local-vars (sv-144 vector) (sv-148 float) @@ -203,7 +203,7 @@ ) ;; definition for method 11 of type plane-volume -(defmethod dummy-11 plane-volume ((obj plane-volume) (arg0 vector) (arg1 float)) +(defmethod point-in-vol? plane-volume ((obj plane-volume) (arg0 vector) (arg1 float)) (dotimes (v1-0 (-> obj num-planes)) (if (< arg1 (- (vector-dot arg0 (the-as vector (-> obj plane v1-0))) (the-as float (-> obj plane v1-0 w)))) (return #f) @@ -214,7 +214,7 @@ ;; definition for method 9 of type vol-control ;; INFO: Return type mismatch int vs symbol. -(defmethod dummy-9 vol-control ((obj vol-control)) +(defmethod init! vol-control ((obj vol-control)) (with-pp (let ((a0-1 obj)) (when (and (and *display-vol-marks* (logtest? (-> a0-1 flags) 1)) (logtest? (-> obj flags) 2)) @@ -236,10 +236,10 @@ (set! (-> obj debug-point length) 0) (set! (-> obj debug-normal length) 0) (dotimes (s5-1 (-> obj pos-vol-count)) - (dummy-9 (-> obj pos-vol s5-1) 'vol (-> obj debug-point) (-> obj debug-normal)) + (init-vol! (-> obj pos-vol s5-1) 'vol (-> obj debug-point) (-> obj debug-normal)) ) (dotimes (s5-2 (-> obj neg-vol-count)) - (dummy-9 (-> obj neg-vol s5-2) 'vol (-> obj debug-point) (-> obj debug-normal)) + (init-vol! (-> obj neg-vol s5-2) 'vol (-> obj debug-point) (-> obj debug-normal)) ) ) (dotimes (s5-3 (-> obj pos-vol-count)) @@ -255,14 +255,14 @@ ) ;; definition for method 10 of type vol-control -(defmethod dummy-10 vol-control ((obj vol-control) (arg0 vector)) +(defmethod point-in-vol? vol-control ((obj vol-control) (arg0 vector)) (dotimes (s4-0 (-> obj neg-vol-count)) - (if (dummy-11 (-> obj neg-vol s4-0) arg0 0.0) + (if (point-in-vol? (-> obj neg-vol s4-0) arg0 0.0) (return #f) ) ) (dotimes (s4-1 (-> obj pos-vol-count)) - (if (dummy-11 (-> obj pos-vol s4-1) arg0 0.0) + (if (point-in-vol? (-> obj pos-vol s4-1) arg0 0.0) (return #t) ) ) diff --git a/test/decompiler/reference/jak1/engine/gfx/water/water-h_REF.gc b/test/decompiler/reference/jak1/engine/gfx/water/water-h_REF.gc index 7ea656adf6..f194bf4092 100644 --- a/test/decompiler/reference/jak1/engine/gfx/water/water-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/gfx/water/water-h_REF.gc @@ -43,14 +43,14 @@ :flag-assert #x110000011c (:methods (new (symbol type process int float float float) _type_ 0) - (dummy-9 (_type_) none 9) - (dummy-10 (_type_) none 10) + (water-control-method-9 (_type_) none 9) + (water-control-method-10 (_type_) none 10) (start-bobbing! (_type_ float int int) none 11) (distance-from-surface (_type_) float 12) - (dummy-13 (_type_ float vector int vector) none 13) + (create-splash (_type_ float vector int vector) none 13) (display-water-marks? (_type_) symbol 14) - (TODO-RENAME-15 (_type_) none 15) - (TODO-RENAME-16 (_type_) none 16) + (water-control-method-15 (_type_) none 15) + (water-control-method-16 (_type_) none 16) ) ) @@ -137,14 +137,14 @@ (:methods (water-vol-idle () _type_ :state 20) (water-vol-startup () _type_ :state 21) - (TODO-RENAME-22 (_type_) none 22) + (water-vol-method-22 (_type_) none 22) (reset-root! (_type_) none 23) (set-stack-size! (_type_) none 24) - (TODO-RENAME-25 (_type_) none 25) - (TODO-RENAME-26 (_type_) none 26) - (dummy-27 (_type_) none 27) + (water-vol-method-25 (_type_) none 25) + (update! (_type_) none 26) + (on-exit-water (_type_) none 27) (get-ripple-height (_type_ vector) float 28) - (TODO-RENAME-29 (_type_) none 29) + (init! (_type_) none 29) ) ) diff --git a/test/decompiler/reference/jak1/engine/gfx/water/water_REF.gc b/test/decompiler/reference/jak1/engine/gfx/water/water_REF.gc index ca6c42729d..6541d457a9 100644 --- a/test/decompiler/reference/jak1/engine/gfx/water/water_REF.gc +++ b/test/decompiler/reference/jak1/engine/gfx/water/water_REF.gc @@ -674,7 +674,7 @@ ;; definition for method 9 of type water-control ;; INFO: Return type mismatch int vs none. -(defmethod dummy-9 water-control ((obj water-control)) +(defmethod water-control-method-9 water-control ((obj water-control)) 0 (none) ) @@ -682,7 +682,7 @@ ;; definition for method 10 of type water-control ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-10 water-control ((obj water-control)) +(defmethod water-control-method-10 water-control ((obj water-control)) (with-pp (let ((s5-0 (-> obj flags))) (cond @@ -754,7 +754,7 @@ (set! (-> obj drip-height) (fmax (- (-> obj surface-height) (-> obj bottom 0 y)) (-> obj drip-height))) (set! (-> obj drip-speed) 15.0) (if (not (logtest? (-> obj flags) (water-flags wt09))) - (TODO-RENAME-15 obj) + (water-control-method-15 obj) ) (cond ((>= (-> obj top 0 y) (-> obj height)) @@ -815,7 +815,7 @@ ) ) (if (< (-> obj top 1 y) (-> obj height)) - (dummy-13 obj 0.2 s4-0 1 (-> obj process root transv)) + (create-splash obj 0.2 s4-0 1 (-> obj process root transv)) ) ) ) @@ -1015,7 +1015,7 @@ ) (else (if (logtest? (-> obj flags) (water-flags wt09)) - (TODO-RENAME-16 obj) + (water-control-method-16 obj) ) ) ) @@ -1181,7 +1181,7 @@ ;; definition for method 15 of type water-control ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-15 water-control ((obj water-control)) +(defmethod water-control-method-15 water-control ((obj water-control)) (with-pp (logior! (-> obj flags) (water-flags wt09)) (logclear! (-> obj flags) (water-flags wt16)) @@ -1197,9 +1197,9 @@ (f30-0 (lerp-scale 0.3 1.0 f0-4 2048.0 24576.0)) ) (if (nonzero? (-> obj process skel effect)) - (dummy-10 (-> obj process skel effect) 'swim-stroke 0.0 -1) + (effect-control-method-10 (-> obj process skel effect) 'swim-stroke 0.0 -1) ) - (dummy-13 obj f30-0 (-> obj enter-water-pos) 1 (-> obj process root transv)) + (create-splash obj f30-0 (-> obj enter-water-pos) 1 (-> obj process root transv)) ) ) ) @@ -1213,7 +1213,7 @@ ;; definition for method 16 of type water-control ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-16 water-control ((obj water-control)) +(defmethod water-control-method-16 water-control ((obj water-control)) (logclear! (-> obj flags) (water-flags wt09)) (set-zero! (-> obj bob)) (if (logtest? (water-flags wt17) (-> obj flags)) @@ -1246,7 +1246,7 @@ ;; definition for method 13 of type water-control ;; INFO: Return type mismatch int vs none. -(defmethod dummy-13 water-control ((obj water-control) (arg0 float) (arg1 vector) (arg2 int) (arg3 vector)) +(defmethod create-splash water-control ((obj water-control) (arg0 float) (arg1 vector) (arg2 int) (arg3 vector)) (when (and (logtest? (-> obj flags) (water-flags wt05)) (logtest? (water-flags wt23) (-> obj flags))) (let ((a1-3 (vector+float*! (new 'stack-no-clear 'vector) arg1 arg3 0.05))) (set! (-> a1-3 y) (-> obj surface-height)) @@ -1259,7 +1259,7 @@ ;; definition for method 27 of type water-vol ;; INFO: Return type mismatch int vs none. -(defmethod dummy-27 water-vol ((obj water-vol)) +(defmethod on-exit-water water-vol ((obj water-vol)) (when (handle->process (-> obj target)) (let ((v1-7 (-> (the-as target (-> obj target process 0)) water))) (logclear! (-> v1-7 flags) (water-flags wt01 wt02 wt03 wt08 wt17 wt18 wt19 wt20 wt21 wt23 wt24 wt25 wt26)) @@ -1284,12 +1284,12 @@ ;; definition for method 26 of type water-vol ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-26 water-vol ((obj water-vol)) +(defmethod update! water-vol ((obj water-vol)) (cond ((handle->process (-> obj target)) (cond - ((not (dummy-10 (-> obj vol) (-> (the-as target (-> obj target process 0)) control trans))) - (dummy-27 obj) + ((not (point-in-vol? (-> obj vol) (-> (the-as target (-> obj target process 0)) control trans))) + (on-exit-water obj) ) (else (let ((v1-15 (-> (the-as target (-> obj target process 0)) water))) @@ -1321,8 +1321,9 @@ ) ) ) - ((and *target* - (and (not (handle->process (-> *target* water volume))) (dummy-10 (-> obj vol) (-> *target* control trans))) + ((and *target* (and (not (handle->process (-> *target* water volume))) + (point-in-vol? (-> obj vol) (-> *target* control trans)) + ) ) (let ((s5-0 (-> *target* water))) (process-entity-status! obj (entity-perm-status bit-3) #t) @@ -1364,17 +1365,17 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('update) - (TODO-RENAME-26 self) + (the-as symbol (update! self)) ) ) ) ) :exit (behavior () - (dummy-27 self) + (on-exit-water self) (none) ) :trans (behavior () - (TODO-RENAME-26 self) + (update! self) (none) ) :code (the-as (function none :behavior water-vol) anim-loop) @@ -1395,7 +1396,7 @@ ;; definition for method 25 of type water-vol ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-25 water-vol ((obj water-vol)) +(defmethod water-vol-method-25 water-vol ((obj water-vol)) 0 (none) ) @@ -1403,7 +1404,7 @@ ;; definition for method 29 of type water-vol ;; INFO: Used lq/sq ;; INFO: Return type mismatch water-flags vs none. -(defmethod TODO-RENAME-29 water-vol ((obj water-vol)) +(defmethod init! water-vol ((obj water-vol)) (local-vars (sv-16 res-tag)) (set! (-> obj attack-event) (the-as symbol ((method-of-type res-lump get-property-struct) (-> obj entity) @@ -1465,7 +1466,7 @@ ;; definition for method 22 of type water-vol ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-22 water-vol ((obj water-vol)) +(defmethod water-vol-method-22 water-vol ((obj water-vol)) 0 (none) ) @@ -1476,9 +1477,9 @@ (set! (-> self entity) arg0) (set-stack-size! self) (reset-root! self) - (TODO-RENAME-29 self) - (TODO-RENAME-25 self) - (TODO-RENAME-22 self) + (init! self) + (water-vol-method-25 self) + (water-vol-method-22 self) (go-virtual water-vol-startup) (none) ) @@ -1488,9 +1489,9 @@ (defmethod init-from-entity! water-vol ((obj water-vol) (arg0 entity-actor)) (set-stack-size! obj) (reset-root! obj) - (TODO-RENAME-29 obj) - (TODO-RENAME-25 obj) - (TODO-RENAME-22 obj) + (init! obj) + (water-vol-method-25 obj) + (water-vol-method-22 obj) (go (method-of-object obj water-vol-startup)) (none) ) diff --git a/test/decompiler/reference/jak1/engine/level/load-boundary_REF.gc b/test/decompiler/reference/jak1/engine/level/load-boundary_REF.gc index 39a3b446fe..2d5e794477 100644 --- a/test/decompiler/reference/jak1/engine/level/load-boundary_REF.gc +++ b/test/decompiler/reference/jak1/engine/level/load-boundary_REF.gc @@ -1425,8 +1425,7 @@ ) ;; definition for function command-get-int -;; WARN: Failed load: (set! a0-2 (l.wu (+ a0-0 -4))) at op 23 -;; WARN: Failed load: (set! a0-1 (l.wu (+ a0-0 -4))) at op 11 +;; ERROR: Failed load: (set! a0-2 (l.wu (+ a0-0 -4))) at op 23 (defun command-get-int ((arg0 object) (arg1 int)) (cond ((null? arg0) @@ -1447,8 +1446,7 @@ ) ;; definition for function command-get-float -;; WARN: Failed load: (set! a0-2 (l.wu (+ a0-0 -4))) at op 26 -;; WARN: Failed load: (set! a0-1 (l.wu (+ a0-0 -4))) at op 11 +;; ERROR: Failed load: (set! a0-2 (l.wu (+ a0-0 -4))) at op 26 (defun command-get-float ((arg0 object) (arg1 float)) (cond ((null? arg0) @@ -1469,8 +1467,7 @@ ) ;; definition for function command-get-time -;; WARN: Failed load: (set! a0-5 (l.wu (+ a0-0 -4))) at op 42 -;; WARN: Failed load: (set! a0-4 (l.wu (+ a0-0 -4))) at op 30 +;; ERROR: Failed load: (set! a0-5 (l.wu (+ a0-0 -4))) at op 42 (defun command-get-time ((arg0 object) (arg1 int)) (cond ((null? arg0) @@ -1494,8 +1491,7 @@ ) ;; definition for function command-get-param -;; WARN: Failed load: (set! a0-16 (l.wu (+ a0-0 -4))) at op 121 -;; WARN: Failed load: (set! a0-15 (l.wu (+ a0-0 -4))) at op 109 +;; ERROR: Failed load: (set! a0-16 (l.wu (+ a0-0 -4))) at op 121 (defun command-get-param ((arg0 object) (arg1 object)) (cond ((null? arg0) @@ -1718,8 +1714,7 @@ ;; definition for function command-list-get-process ;; INFO: Return type mismatch object vs process. -;; WARN: Failed load: (set! a0-1 (l.wu (+ a0-0 -4))) at op 11 -;; WARN: Failed load: (set! a0-2 (l.wu (+ a0-0 -4))) at op 51 +;; ERROR: Failed load: (set! a0-1 (l.wu (+ a0-0 -4))) at op 11 (defun command-list-get-process ((arg0 object)) (with-pp (set! arg0 @@ -1825,7 +1820,7 @@ ;; definition for method 15 of type load-state ;; INFO: Return type mismatch int vs none. -;; WARN: Failed load: (set! v1-138 (l.wu (+ a0-142 -4))) at op 648 +;; ERROR: Failed load: (set! v1-138 (l.wu (+ a0-142 -4))) at op 648 (defmethod execute-command load-state ((obj load-state) (arg0 pair)) (local-vars (v1-26 int) (v1-57 int)) (with-pp @@ -1959,7 +1954,7 @@ (when a0-70 (let ((s5-2 (entity-by-name (the-as string a0-70)))) (if s5-2 - (dummy-30 + (set-or-clear-status! (the-as entity-actor s5-2) (entity-perm-status bit-7) (the-as symbol (command-get-param (car (cdr gp-0)) #f)) diff --git a/test/decompiler/reference/jak1/engine/nav/navigate-h_REF.gc b/test/decompiler/reference/jak1/engine/nav/navigate-h_REF.gc index e7f9aed1de..7eafb5e8e0 100644 --- a/test/decompiler/reference/jak1/engine/nav/navigate-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/nav/navigate-h_REF.gc @@ -264,14 +264,14 @@ (initialize-mesh! (_type_) none 13) (move-along-nav-ray! (_type_ nav-ray) none 14) (try-move-along-ray (_type_ nav-poly vector vector float) meters 15) - (TODO-RENAME-16 (_type_ vector nav-poly vector symbol float clip-travel-vector-to-mesh-return-info) none 16) + (nav-mesh-method-16 (_type_ vector nav-poly vector symbol float clip-travel-vector-to-mesh-return-info) none 16) (update-route-table (_type_) none 17) - (dummy-18 (_type_ int vector int (pointer int8) int) none 18) + (nav-mesh-method-18 (_type_ int vector int (pointer int8) int) none 18) (compute-bounding-box (_type_ vector vector) none 19) (debug-draw-poly (_type_ nav-poly rgba) none 20) (point-in-poly? (_type_ nav-poly vector) symbol 21) (find-opposite-vertices (_type_ nav-poly nav-poly) uint 22) - (dummy-23 (_type_ nav-poly vector vector vector nav-route-portal) vector 23) + (nav-mesh-method-23 (_type_ nav-poly vector vector vector nav-route-portal) vector 23) (closest-point-on-boundary (_type_ nav-poly vector vector) vector 24) (project-point-into-tri-3d (_type_ nav-poly vector vector) none 25) (project-point-into-tri-2d (_type_ nav-poly vector vector) vector 26) @@ -376,31 +376,31 @@ (new (symbol type collide-shape int float) _type_ 0) (debug-draw (_type_) none 9) (point-in-bounds? (_type_ vector) symbol 10) - (dummy-11 (_type_ vector) vector 11) - (TODO-RENAME-12 (_type_ nav-gap-info) symbol 12) - (dummy-13 (_type_ vector vector) vector 13) + (nav-control-method-11 (_type_ vector) vector 11) + (nav-control-method-12 (_type_ nav-gap-info) symbol 12) + (nav-control-method-13 (_type_ vector vector) vector 13) (set-current-poly! (_type_ nav-poly) none 14) (set-target-pos! (_type_ vector) none 15) - (dummy-16 (_type_ vector) nav-poly 16) + (nav-control-method-16 (_type_ vector) nav-poly 16) (project-onto-nav-mesh (_type_ vector vector) vector 17) (find-poly (_type_ vector) nav-poly 18) - (dummy-19 (_type_ vector collide-shape-moving vector float) none 19) + (nav-control-method-19 (_type_ vector collide-shape-moving vector float) none 19) (project-point-into-tri-3d (_type_ nav-poly vector vector) vector 20) - (TODO-RENAME-21 (_type_ vector) nav-poly 21) - (TODO-RENAME-22 (_type_ vector float) symbol 22) - (dummy-23 (_type_ vector check-vector-collision-with-nav-spheres-info) float 23) - (dummy-24 (_type_ float clip-travel-vector-to-mesh-return-info) none 24) + (nav-control-method-21 (_type_ vector) nav-poly 21) + (nav-control-method-22 (_type_ vector float) symbol 22) + (nav-control-method-23 (_type_ vector check-vector-collision-with-nav-spheres-info) float 23) + (nav-control-method-24 (_type_ float clip-travel-vector-to-mesh-return-info) none 24) (is-in-mesh? (_type_ vector float) symbol 25) - (TODO-RENAME-26 (_type_) none 26) - (TODO-RENAME-27 (_type_) none 27) - (TODO-RENAME-28 (_type_ collide-kind) none 28) + (nav-control-method-26 (_type_) none 26) + (nav-control-method-27 (_type_) none 27) + (nav-control-method-28 (_type_ collide-kind) none 28) (should-display? (_type_) symbol 29) - (dummy-30 (_type_ vector vector vector) sphere 30) + (nav-control-method-30 (_type_ vector vector vector) sphere 30) (intersect-ray-line-segment? (_type_ vector vector vector vector) symbol 31) - (TODO-ASM-32 (_type_ vector vector vector vector float) symbol 32) - (TODO-RENAME-33 (_type_ vector vector vector vector float) symbol 33) - (dummy-34 () none 34) - (dummy-35 (_type_ vector vector vector vector float) none 35) + (nav-control-method-32 (_type_ vector vector vector vector float) symbol 32) + (nav-control-method-33 (_type_ vector vector vector vector float) symbol 33) + (nav-control-method-34 () none 34) + (nav-control-method-35 (_type_ vector vector vector vector float) none 35) ) ) diff --git a/test/decompiler/reference/jak1/engine/nav/navigate_REF.gc b/test/decompiler/reference/jak1/engine/nav/navigate_REF.gc index e4c7f83525..25f86338a0 100644 --- a/test/decompiler/reference/jak1/engine/nav/navigate_REF.gc +++ b/test/decompiler/reference/jak1/engine/nav/navigate_REF.gc @@ -1066,7 +1066,7 @@ ;; definition for method 18 of type nav-mesh ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-18 nav-mesh ((obj nav-mesh) (arg0 int) (arg1 vector) (arg2 int) (arg3 (pointer int8)) (arg4 int)) +(defmethod nav-mesh-method-18 nav-mesh ((obj nav-mesh) (arg0 int) (arg1 vector) (arg2 int) (arg3 (pointer int8)) (arg4 int)) (local-vars (sv-32 int) (sv-48 uint)) (set! (-> arg3 arg2) 1) (nav-mesh-update-route-table obj arg0 arg2 (the-as uint 3)) @@ -1090,7 +1090,7 @@ ) (when v0-3 (let* ((a0-16 obj) - (t9-5 (method-of-object a0-16 dummy-18)) + (t9-5 (method-of-object a0-16 nav-mesh-method-18)) (a1-7 arg0) (a2-6 arg1) (t0-1 arg3) @@ -1131,7 +1131,7 @@ (let ((a3-0 (-> s2-0 adj-poly s1-0))) (when (!= a3-0 255) (if (not (logtest? (-> obj poly a3-0 pat) 1)) - (dummy-18 obj s3-0 s5-0 (the-as int a3-0) s4-0 0) + (nav-mesh-method-18 obj s3-0 s5-0 (the-as int a3-0) s4-0 0) ) ) ) @@ -1564,7 +1564,7 @@ ;; definition for method 23 of type nav-mesh ;; INFO: Used lq/sq -(defmethod dummy-23 nav-mesh ((obj nav-mesh) (arg0 nav-poly) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 nav-route-portal)) +(defmethod nav-mesh-method-23 nav-mesh ((obj nav-mesh) (arg0 nav-poly) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 nav-route-portal)) (local-vars (v1-32 int) (a0-14 int) (a0-17 int) (a1-10 int) (sv-16 nav-vertex)) (let ((s1-0 (-> obj vertex)) (s0-0 -1) @@ -1997,7 +1997,7 @@ ) ;; definition for method 30 of type nav-control -(defmethod dummy-30 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector)) +(defmethod nav-control-method-30 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector)) (let ((s5-0 (the-as sphere #f))) (let ((f30-0 -0.000001)) (countdown (s1-0 (-> obj num-spheres)) @@ -2091,7 +2091,7 @@ ;; definition for method 28 of type nav-control ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-28 nav-control ((obj nav-control) (arg0 collide-kind)) +(defmethod nav-control-method-28 nav-control ((obj nav-control) (arg0 collide-kind)) (local-vars (sv-32 nav-control) (sv-48 sphere) @@ -2241,10 +2241,10 @@ ;; definition for method 35 of type nav-control ;; INFO: Return type mismatch symbol vs none. -(defmethod dummy-35 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) +(defmethod nav-control-method-35 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) (let ((v1-0 (new 'stack-no-clear 'vector))) (vector-! v1-0 arg1 (-> obj mesh origin)) - (TODO-ASM-32 obj arg0 v1-0 arg2 arg3 arg4) + (nav-control-method-32 obj arg0 v1-0 arg2 arg3 arg4) ) (none) ) @@ -2441,7 +2441,7 @@ ;; definition for method 32 of type nav-control ;; INFO: Used lq/sq -(defmethod TODO-ASM-32 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) +(defmethod nav-control-method-32 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) (local-vars (v0-3 symbol) (v1-38 int) (a0-29 int) (a3-7 int) (sv-208 sphere)) (let ((gp-0 (new 'stack-no-clear 'nav-control-cfs-work))) (set! (-> gp-0 in-dir quad) (-> arg2 quad)) @@ -2596,7 +2596,7 @@ ) ;; definition for method 23 of type nav-control -(defmethod dummy-23 nav-control ((obj nav-control) (arg0 vector) (arg1 check-vector-collision-with-nav-spheres-info)) +(defmethod nav-control-method-23 nav-control ((obj nav-control) (arg0 vector) (arg1 check-vector-collision-with-nav-spheres-info)) (let ((s2-1 (vector-! (new 'stack-no-clear 'vector) (-> obj shape trans) (-> obj mesh origin))) (f30-0 -1.0) ) @@ -2639,9 +2639,9 @@ ;; definition for method 33 of type nav-control ;; INFO: Used lq/sq -(defmethod TODO-RENAME-33 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) +(defmethod nav-control-method-33 nav-control ((obj nav-control) (arg0 vector) (arg1 vector) (arg2 vector) (arg3 vector) (arg4 float)) (let ((f30-0 (vector-xz-length (-> obj travel)))) - (when (TODO-ASM-32 obj arg0 arg1 arg2 arg3 f30-0) + (when (nav-control-method-32 obj arg0 arg1 arg2 arg3 f30-0) (set! (-> obj blocked-travel quad) (-> obj travel quad)) (let ((f0-0 (vector-xz-length (-> obj travel)))) (when (and (>= f30-0 f0-0) (< f0-0 204.8)) @@ -2679,7 +2679,7 @@ ;; definition for method 19 of type nav-control ;; INFO: Used lq/sq ;; INFO: Return type mismatch vector vs none. -(defmethod dummy-19 nav-control ((obj nav-control) (arg0 vector) (arg1 collide-shape-moving) (arg2 vector) (arg3 float)) +(defmethod nav-control-method-19 nav-control ((obj nav-control) (arg0 vector) (arg1 collide-shape-moving) (arg2 vector) (arg3 float)) (local-vars (sv-48 float)) (let ((f30-0 (* arg3 (-> *display* seconds-per-frame))) (s0-0 arg1) @@ -2702,7 +2702,7 @@ (logclear! (-> obj flags) (nav-control-flags navcf21)) (vector+! arg0 (-> arg1 trans) s2-1) ) - (when (or (not (dummy-16 obj arg0)) + (when (or (not (nav-control-method-16 obj arg0)) (logtest? (nav-control-flags navcf17) (-> obj flags)) (not (logtest? (-> obj flags) (nav-control-flags navcf10))) ) @@ -2718,7 +2718,7 @@ ) ;; definition for method 16 of type nav-control -(defmethod dummy-16 nav-control ((obj nav-control) (arg0 vector)) +(defmethod nav-control-method-16 nav-control ((obj nav-control) (arg0 vector)) (find-poly-fast (-> obj mesh) (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj mesh origin)) @@ -2727,7 +2727,7 @@ ) ;; definition for method 21 of type nav-control -(defmethod TODO-RENAME-21 nav-control ((obj nav-control) (arg0 vector)) +(defmethod nav-control-method-21 nav-control ((obj nav-control) (arg0 vector)) (find-poly-fast (-> obj mesh) (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj mesh origin)) @@ -2737,7 +2737,7 @@ ;; definition for method 22 of type nav-control ;; INFO: Return type mismatch structure vs symbol. -(defmethod TODO-RENAME-22 nav-control ((obj nav-control) (arg0 vector) (arg1 float)) +(defmethod nav-control-method-22 nav-control ((obj nav-control) (arg0 vector) (arg1 float)) (the-as symbol (and (find-poly-fast (-> obj mesh) (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj mesh origin)) @@ -2761,7 +2761,7 @@ ;; definition for method 26 of type nav-control ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-26 nav-control ((obj nav-control)) +(defmethod nav-control-method-26 nav-control ((obj nav-control)) 0 (none) ) @@ -2769,7 +2769,7 @@ ;; definition for method 27 of type nav-control ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-27 nav-control ((obj nav-control)) +(defmethod nav-control-method-27 nav-control ((obj nav-control)) (local-vars (v1-7 symbol)) (cond ((-> obj current-poly) @@ -2810,7 +2810,7 @@ (set! (-> obj current-poly) (find-poly obj (-> obj shape trans))) ) ) - (TODO-RENAME-26 obj) + (nav-control-method-26 obj) 0 (none) ) @@ -2818,14 +2818,14 @@ ;; definition for method 16 of type nav-mesh ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-16 nav-mesh ((obj nav-mesh) - (arg0 vector) - (arg1 nav-poly) - (arg2 vector) - (arg3 symbol) - (arg4 float) - (arg5 clip-travel-vector-to-mesh-return-info) - ) +(defmethod nav-mesh-method-16 nav-mesh ((obj nav-mesh) + (arg0 vector) + (arg1 nav-poly) + (arg2 vector) + (arg3 symbol) + (arg4 float) + (arg5 clip-travel-vector-to-mesh-return-info) + ) (local-vars (v1-10 symbol) (sv-96 symbol) (sv-112 int) (sv-128 int)) (when arg5 (set! (-> arg5 found-boundary) #f) @@ -2913,10 +2913,10 @@ ;; definition for method 24 of type nav-control ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 nav-control ((obj nav-control) (arg0 float) (arg1 clip-travel-vector-to-mesh-return-info)) +(defmethod nav-control-method-24 nav-control ((obj nav-control) (arg0 float) (arg1 clip-travel-vector-to-mesh-return-info)) (let ((v1-0 (new 'stack-no-clear 'vector))) (vector-! v1-0 (-> obj shape trans) (-> obj mesh origin)) - (TODO-RENAME-16 + (nav-mesh-method-16 (-> obj mesh) v1-0 (-> obj current-poly) @@ -3038,7 +3038,7 @@ ;; definition for method 13 of type nav-control ;; INFO: Used lq/sq -(defmethod dummy-13 nav-control ((obj nav-control) (arg0 vector) (arg1 vector)) +(defmethod nav-control-method-13 nav-control ((obj nav-control) (arg0 vector) (arg1 vector)) (local-vars (sv-80 vector) (sv-84 vector) @@ -3125,9 +3125,9 @@ ) ) ) - (TODO-RENAME-33 obj (-> obj travel) sv-84 (-> obj travel) arg1 40960.0) + (nav-control-method-33 obj (-> obj travel) sv-84 (-> obj travel) arg1 40960.0) (let ((s5-1 (new 'stack-no-clear 'clip-travel-vector-to-mesh-return-info))) - (TODO-RENAME-16 + (nav-mesh-method-16 (-> obj mesh) sv-84 sv-88 @@ -3150,7 +3150,7 @@ ;; definition for method 12 of type nav-control ;; INFO: Used lq/sq -(defmethod TODO-RENAME-12 nav-control ((obj nav-control) (arg0 nav-gap-info)) +(defmethod nav-control-method-12 nav-control ((obj nav-control) (arg0 nav-gap-info)) (when (and (-> obj next-poly) (logtest? (-> obj next-poly pat) 1)) (let ((s4-0 (-> obj next-poly)) (s3-1 (vector-! (new 'stack-no-clear 'vector) (-> obj shape trans) (-> obj mesh origin))) @@ -3218,16 +3218,16 @@ ;; definition for method 11 of type nav-control ;; INFO: Used lq/sq -(defmethod dummy-11 nav-control ((obj nav-control) (arg0 vector)) +(defmethod nav-control-method-11 nav-control ((obj nav-control) (arg0 vector)) (set! (-> obj old-travel quad) (-> obj travel quad)) (-> obj block-count) (seek! (-> obj block-count) 0.0 0.016666668) (logclear! (-> obj flags) (nav-control-flags navcf9 navcf17 navcf18 navcf19)) - (TODO-RENAME-27 obj) + (nav-control-method-27 obj) (if (logtest? (-> obj flags) (nav-control-flags navcf8)) - (TODO-RENAME-28 obj (the-as collide-kind -1)) + (nav-control-method-28 obj (the-as collide-kind -1)) ) - (dummy-13 obj arg0 (-> obj old-travel)) + (nav-control-method-13 obj arg0 (-> obj old-travel)) (-> obj mesh) (vector-! (new 'stack-no-clear 'vector) (-> obj shape trans) (-> obj mesh origin)) (let ((s5-1 (new 'stack-no-clear 'nav-gap-info))) @@ -3237,7 +3237,7 @@ ) ((-> obj next-poly) (cond - ((TODO-RENAME-12 obj s5-1) + ((nav-control-method-12 obj s5-1) (set! (-> obj next-poly) #f) (send-event (the-as process-tree (-> obj process)) diff --git a/test/decompiler/reference/jak1/engine/nav/path-h_REF.gc b/test/decompiler/reference/jak1/engine/nav/path-h_REF.gc index 743579e3dd..154a3702c6 100644 --- a/test/decompiler/reference/jak1/engine/nav/path-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/nav/path-h_REF.gc @@ -15,18 +15,18 @@ :flag-assert #x1500000024 (:methods (new (symbol type process symbol float) _type_ 0) - (dummy-9 (_type_) none 9) + (debug-draw (_type_) none 9) (eval-path-curve-div! (_type_ vector float symbol) vector 10) (get-random-point (_type_ vector) vector 11) - (TODO-RENAME-12 (_type_ vector float) vector 12) + (path-control-method-12 (_type_ vector float) vector 12) (eval-path-curve! (_type_ vector float symbol) vector 13) - (TODO-RENAME-14 (_type_ vector float) vector 14) + (path-control-method-14 (_type_ vector float) vector 14) (length-as-float (_type_) float 15) (path-distance (_type_) float 16) (get-num-verts (_type_) int 17) (should-display? (_type_) symbol 18) - (TODO-RENAME-19 (_type_) float 19) - (TODO-RENAME-20 (_type_) float 20) + (path-control-method-19 (_type_) float 19) + (path-control-method-20 (_type_) float 20) ) ) diff --git a/test/decompiler/reference/jak1/engine/nav/path_REF.gc b/test/decompiler/reference/jak1/engine/nav/path_REF.gc index 7403c97ffe..69e817adf4 100644 --- a/test/decompiler/reference/jak1/engine/nav/path_REF.gc +++ b/test/decompiler/reference/jak1/engine/nav/path_REF.gc @@ -3,7 +3,7 @@ ;; definition for method 9 of type path-control ;; INFO: Return type mismatch int vs none. -(defmethod dummy-9 path-control ((obj path-control)) +(defmethod debug-draw path-control ((obj path-control)) (cond ((logtest? (-> obj flags) (path-control-flag not-found)) (when (and (type-type? (-> obj process type) process-drawable) *display-entity-errors*) @@ -170,7 +170,7 @@ ) ;; definition for method 12 of type path-control -(defmethod TODO-RENAME-12 path-control ((obj path-control) (arg0 vector) (arg1 float)) +(defmethod path-control-method-12 path-control ((obj path-control) (arg0 vector) (arg1 float)) (when (not (logtest? (-> obj flags) (path-control-flag not-found))) (let ((v1-3 (-> obj curve num-cverts)) (f0-3 (the float (the int arg1))) @@ -193,12 +193,12 @@ ) ;; definition for method 14 of type path-control -(defmethod TODO-RENAME-14 path-control ((obj path-control) (arg0 vector) (arg1 float)) - (TODO-RENAME-12 obj arg0 (* arg1 (the float (+ (-> obj curve num-cverts) -1)))) +(defmethod path-control-method-14 path-control ((obj path-control) (arg0 vector) (arg1 float)) + (path-control-method-12 obj arg0 (* arg1 (the float (+ (-> obj curve num-cverts) -1)))) ) ;; definition for method 14 of type curve-control -(defmethod TODO-RENAME-14 curve-control ((obj curve-control) (arg0 vector) (arg1 float)) +(defmethod path-control-method-14 curve-control ((obj curve-control) (arg0 vector) (arg1 float)) (when (not (logtest? (-> obj flags) (path-control-flag not-found))) (let ((s4-0 (new 'stack-no-clear 'vector))) (curve-evaluate! @@ -239,13 +239,13 @@ ) ;; definition for method 12 of type curve-control -(defmethod TODO-RENAME-12 curve-control ((obj curve-control) (arg0 vector) (arg1 float)) - (TODO-RENAME-14 obj arg0 (/ arg1 (the float (+ (-> obj curve num-cverts) -1)))) +(defmethod path-control-method-12 curve-control ((obj curve-control) (arg0 vector) (arg1 float)) + (path-control-method-14 obj arg0 (/ arg1 (the float (+ (-> obj curve num-cverts) -1)))) ) ;; definition for method 19 of type path-control ;; INFO: Used lq/sq -(defmethod TODO-RENAME-19 path-control ((obj path-control)) +(defmethod path-control-method-19 path-control ((obj path-control)) (let ((s5-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'vector)) @@ -276,13 +276,13 @@ ) ;; definition for method 20 of type path-control -(defmethod TODO-RENAME-20 path-control ((obj path-control)) - (/ (TODO-RENAME-19 obj) (the float (+ (-> obj curve num-cverts) -1))) +(defmethod path-control-method-20 path-control ((obj path-control)) + (/ (path-control-method-19 obj) (the float (+ (-> obj curve num-cverts) -1))) ) ;; definition for method 9 of type curve-control ;; INFO: Return type mismatch int vs none. -(defmethod dummy-9 curve-control ((obj curve-control)) +(defmethod debug-draw curve-control ((obj curve-control)) (cond ((logtest? (-> obj flags) (path-control-flag not-found)) (when (and (type-type? (-> obj process type) process-drawable) *display-entity-errors*) diff --git a/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc b/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc index 780252d9eb..db5c8ae2f6 100644 --- a/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/logic-target_REF.gc @@ -1264,7 +1264,7 @@ ;; INFO: Used lq/sq (defbehavior target-compute-edge target () (let ((s5-0 *edge-grab-info*)) - (if (not (dummy-9 s5-0)) + (if (not (edge-grab-info-method-9 s5-0)) (send-event self 'end-mode) ) (if *display-edge-collision-marks* @@ -1323,7 +1323,7 @@ ;; INFO: Used lq/sq (defbehavior target-compute-edge-rider target () (let ((gp-0 *edge-grab-info*)) - (if (not (dummy-9 gp-0)) + (if (not (edge-grab-info-method-9 gp-0)) (send-event self 'end-mode) ) (if *display-edge-collision-marks* diff --git a/test/decompiler/reference/jak1/engine/target/sidekick_REF.gc b/test/decompiler/reference/jak1/engine/target/sidekick_REF.gc index 82405e2ffa..be364486c4 100644 --- a/test/decompiler/reference/jak1/engine/target/sidekick_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/sidekick_REF.gc @@ -199,7 +199,7 @@ ) (let ((a0-26 (-> self skel effect))) (if a0-26 - (TODO-RENAME-9 a0-26) + (effect-control-method-9 a0-26) ) ) (if (logtest? (-> self skel status) (janim-status blerc blerc-done)) diff --git a/test/decompiler/reference/jak1/engine/target/target-death_REF.gc b/test/decompiler/reference/jak1/engine/target/target-death_REF.gc index 78bd00149a..8abf5a3f2d 100644 --- a/test/decompiler/reference/jak1/engine/target/target-death_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target-death_REF.gc @@ -733,8 +733,8 @@ (ja-no-eval :group! eichar-jump-ja :num! (seek!) :frame-num 0.0) (when (= (-> arg0 angle) 'air) (sound-play "smack-surface") - (dummy-10 (-> self skel effect) 'group-smack-surface (the-as float 0.0) 5) - (dummy-10 (-> self skel effect) 'group-smack-surface-dizzy (the-as float 0.0) 8) + (effect-control-method-10 (-> self skel effect) 'group-smack-surface (the-as float 0.0) 5) + (effect-control-method-10 (-> self skel effect) 'group-smack-surface-dizzy (the-as float 0.0) 8) ) ) (('shove) diff --git a/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc b/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc index e6148d32db..a1e483b322 100644 --- a/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target-handler_REF.gc @@ -4,32 +4,8 @@ ;; definition for function target-generic-event-handler ;; INFO: Used lq/sq ;; INFO: Return type mismatch none vs object. -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 37] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 39] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 60] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 69] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 73] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 151] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 168] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 185] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 196] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 201] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 222] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 292] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 351] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 366] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 408] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 420] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 427] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 451] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 465] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 472] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 482] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 524] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 552] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 563] (defbehavior target-generic-event-handler target ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) - (local-vars (v0-0 none)) + (local-vars (v0-0 object)) (the-as object (case arg2 @@ -53,7 +29,7 @@ ) ) (('reset-pickup) - (reset! (-> self fact-info-target) (the-as symbol (-> arg3 param 0))) + (the-as object (reset! (-> self fact-info-target) (the-as symbol (-> arg3 param 0)))) ) (('reset-collide) (cond @@ -98,7 +74,7 @@ ) ) (('get-attack-count) - (set! v0-0 (the-as none (+ (-> self control unknown-dword51) (-> arg3 param 0)))) + (set! v0-0 (+ (-> self control unknown-dword51) (-> arg3 param 0))) (set! (-> self control unknown-dword51) (the-as int v0-0)) v0-0 ) @@ -138,24 +114,29 @@ ) (rot->dir-targ! (-> self control)) (logior! (-> self control status) (cshape-moving-flags onsurf onground tsurf)) - (set! v0-0 (the-as none (-> *display* base-frame-counter))) + (set! v0-0 (-> *display* base-frame-counter)) (set! (-> self control unknown-dword11) (the-as time-frame v0-0)) v0-0 ) (('reset) - (set! v0-0 (the-as none (logclear (-> self state-flags) (state-flags has-saved-position)))) + (set! v0-0 (logclear (-> self state-flags) (state-flags has-saved-position))) (set! (-> self state-flags) (the-as state-flags v0-0)) v0-0 ) ) ) (('effect) - (target-powerup-effect (the-as symbol (-> arg3 param 0))) + (the-as object (target-powerup-effect (the-as symbol (-> arg3 param 0)))) ) (('do-effect) - (dummy-10 (-> self skel effect) (the-as symbol (-> arg3 param 0)) (the-as float (-> arg3 param 1)) -1) + (effect-control-method-10 + (-> self skel effect) + (the-as symbol (-> arg3 param 0)) + (the-as float (-> arg3 param 1)) + -1 + ) (if (-> self sidekick) - (dummy-10 + (effect-control-method-10 (-> self sidekick 0 skel effect) (the-as symbol (-> arg3 param 0)) (the-as float (-> arg3 param 1)) @@ -169,10 +150,10 @@ ((-> arg3 param 1) (set! (-> self state-flags) (logior (state-flags looking-at-enemy) (-> self state-flags))) (set! (-> self alt-neck-pos quad) (-> (the-as vector (-> arg3 param 1)) quad)) - (look-at-enemy! (-> self neck) (-> self alt-neck-pos) 'force arg0) + (the-as object (look-at-enemy! (-> self neck) (-> self alt-neck-pos) 'force arg0)) ) (else - (set! v0-0 (the-as none (logclear (-> self state-flags) (state-flags looking-at-enemy)))) + (set! v0-0 (logclear (-> self state-flags) (state-flags looking-at-enemy))) (set! (-> self state-flags) (the-as state-flags v0-0)) v0-0 ) @@ -276,7 +257,7 @@ ) ) (('no-load-wait) - (set! v0-0 (the-as none (+ (-> *display* base-frame-counter) (the-as time-frame (-> arg3 param 0))))) + (set! v0-0 (+ (-> *display* base-frame-counter) (the-as time-frame (-> arg3 param 0)))) (set! (-> self no-load-wait) (the-as time-frame v0-0)) v0-0 ) @@ -509,10 +490,10 @@ ) ) (else - (dummy-10 (-> self skel effect) 'group-spin-hit (the-as float -1.0) 74) + (effect-control-method-10 (-> self skel effect) 'group-spin-hit (the-as float -1.0) 74) ) ) - (dummy-12 + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) @@ -593,7 +574,7 @@ ) ) ) - (dummy-12 + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) @@ -604,7 +585,7 @@ (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 178 (seconds 0.1)) ) ((= v1-5 'flip) - (dummy-12 + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) @@ -685,8 +666,8 @@ ) ) ) - (dummy-10 (-> self skel effect) 'group-uppercut-hit (the-as float -1.0) 23) - (dummy-12 + (effect-control-method-10 (-> self skel effect) 'group-uppercut-hit (the-as float -1.0) 23) + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) @@ -697,9 +678,9 @@ (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 178 (seconds 0.1)) ) ((or (= v1-5 'flop) (= v1-5 'flop-down)) - (dummy-10 (-> self skel effect) 'group-flop-hit (the-as float -1.0) 23) - (dummy-10 (-> self skel effect) 'group-flop-hit (the-as float -1.0) 17) - (dummy-12 + (effect-control-method-10 (-> self skel effect) 'group-flop-hit (the-as float -1.0) 23) + (effect-control-method-10 (-> self skel effect) 'group-flop-hit (the-as float -1.0) 17) + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) @@ -710,7 +691,7 @@ (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 178 (seconds 0.1)) ) ((= v1-5 'flut-attack) - (dummy-12 + (effect-control-method-12 (-> self skel effect) (-> self control unknown-symbol30) (the-as float -1.0) diff --git a/test/decompiler/reference/jak1/engine/target/target2_REF.gc b/test/decompiler/reference/jak1/engine/target/target2_REF.gc index e0b4ca6c9c..35b5e84706 100644 --- a/test/decompiler/reference/jak1/engine/target/target2_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target2_REF.gc @@ -1735,7 +1735,7 @@ ) (when (and (cpad-pressed? (-> self control unknown-cpad-info00 number) circle) (can-feet?)) (sound-play "swim-stroke") - (dummy-13 (-> self water) (the-as float 1.4) (-> self control trans) 0 (-> self control transv)) + (create-splash (-> self water) (the-as float 1.4) (-> self control trans) 0 (-> self control transv)) (go target-attack) ) (if (can-hands? #t) @@ -1781,7 +1781,7 @@ ) (when (and (cpad-pressed? (-> self control unknown-cpad-info00 number) circle) (can-feet?)) (sound-play "swim-stroke") - (dummy-13 (-> self water) (the-as float 1.4) (-> self control trans) 0 (-> self control transv)) + (create-splash (-> self water) (the-as float 1.4) (-> self control trans) 0 (-> self control transv)) (go target-attack) ) (if (can-hands? #t) @@ -1937,7 +1937,7 @@ ) (case (the int (ja-aframe-num 0)) ((15 16 17 18) - (dummy-13 + (create-splash (-> self water) (the-as float 0.2) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 75)) @@ -1947,7 +1947,7 @@ (set! gp-6 (the-as int (-> *display* base-frame-counter))) ) ((46 47 48 49) - (dummy-13 + (create-splash (-> self water) (the-as float 0.2) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 71)) @@ -2330,7 +2330,7 @@ (the-as float 1.0) ) (if (= (ja-aframe-num 0) 73.0) - (dummy-13 (-> self water) (the-as float 0.7) (-> self control trans) 1 *null-vector*) + (create-splash (-> self water) (the-as float 0.7) (-> self control trans) 1 *null-vector*) ) (suspend) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak1/engine/target/target_REF.gc b/test/decompiler/reference/jak1/engine/target/target_REF.gc index 3c09a87071..041e4e8310 100644 --- a/test/decompiler/reference/jak1/engine/target/target_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target_REF.gc @@ -1620,7 +1620,7 @@ ) :code (behavior ((arg0 float) (arg1 float)) (ja-channel-push! 2 (seconds 0.05)) - (dummy-10 (-> self skel effect) 'jump-double (the-as float -1.0) -1) + (effect-control-method-10 (-> self skel effect) 'jump-double (the-as float -1.0) -1) (ja-no-eval :group! eichar-jump-ja :num! (seek!) :frame-num (ja-aframe (the-as float 5.0) 0)) (ja :chan 1 :group! eichar-jump-forward-ja :num! (chan 0)) (until (ja-done? 0) @@ -1873,7 +1873,7 @@ ((let ((v1-4 (ja-group))) (or (= v1-4 eichar-launch-jump-ja) (= v1-4 eichar-launch-jump-loop-ja)) ) - (dummy-10 (-> self skel effect) 'group-blue-hit-ground-effect (the-as float 0.0) -1) + (effect-control-method-10 (-> self skel effect) 'group-blue-hit-ground-effect (the-as float 0.0) -1) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.3)) ) (else @@ -1990,7 +1990,7 @@ (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) (>= (-> self fact-info-target eco-level) 1.0) ) - (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 74) + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 74) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) (level-hint-spawn (game-text-id misty-eco-red-first-use) @@ -2176,7 +2176,7 @@ (if (and (logtest? (-> self water flags) (water-flags wt09)) (zero? (mod (- (-> *display* base-frame-counter) (-> self state-time)) 21)) ) - (dummy-13 + (create-splash (-> self water) (the-as float 0.6) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 37)) @@ -2187,7 +2187,7 @@ (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) (>= (-> self fact-info-target eco-level) 1.0) ) - (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) (level-hint-spawn (game-text-id misty-eco-red-first-use) @@ -2411,7 +2411,7 @@ (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) (>= (-> self fact-info-target eco-level) 1.0) ) - (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 70) + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 70) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) (level-hint-spawn (game-text-id misty-eco-red-first-use) @@ -2577,7 +2577,7 @@ (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) (>= (-> self fact-info-target eco-level) 1.0) ) - (dummy-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) 23) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 153 (seconds 0.1)) ) (if (and (= (-> self control unknown-symbol30) 'uppercut) @@ -2633,7 +2633,7 @@ ) (cond ((< 6144.0 (target-height-above-ground)) - (dummy-10 (-> self skel effect) 'swim-flop (the-as float -1.0) -1) + (effect-control-method-10 (-> self skel effect) 'swim-flop (the-as float -1.0) -1) (let ((t9-3 enter-state)) (set! (-> self next-state) target-swim-down) ((the-as (function object :behavior target) t9-3)) @@ -2719,7 +2719,7 @@ (>= (-> self fact-info-target eco-level) 1.0) ) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.5)) - (dummy-10 (-> self skel effect) 'group-red-eco-strike-ground (ja-frame-num 0) 0) + (effect-control-method-10 (-> self skel effect) 'group-red-eco-strike-ground (ja-frame-num 0) 0) (let ((s5-1 (process-spawn touch-tracker :init touch-tracker-init (-> self control trans) 4096.0 30 :to self))) (send-event (ppointer->process s5-1) 'event 'attack 'flop) (send-event @@ -2742,7 +2742,7 @@ (when (and (= (-> self fact-info-target eco-type) (pickup-type eco-red)) (>= (-> self fact-info-target eco-level) 1.0) ) - (dummy-10 + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) @@ -2907,7 +2907,7 @@ ) (< (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.25)) ) - (dummy-10 + (effect-control-method-10 (-> self skel effect) 'group-red-eco-spinkick (ja-frame-num 0) diff --git a/test/decompiler/reference/jak1/engine/ui/hud-h_REF.gc b/test/decompiler/reference/jak1/engine/ui/hud-h_REF.gc index a6ae4662de..d8e6eac65e 100644 --- a/test/decompiler/reference/jak1/engine/ui/hud-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/ui/hud-h_REF.gc @@ -92,7 +92,7 @@ (init-particles! (_type_ int) none 20) (get-icon-pos-x (_type_) int 21) (get-icon-pos-y (_type_) int 22) - (dummy-23 (_type_) none 23) + (hud-method-23 (_type_) none 23) (set-pos-and-scale (_type_ symbol symbol) none 24) (get-icon-scale-x (_type_) float 25) (get-icon-scale-y (_type_) float 26) diff --git a/test/decompiler/reference/jak1/engine/ui/progress-h_REF.gc b/test/decompiler/reference/jak1/engine/ui/progress-h_REF.gc index f9350cb6d5..1a6814bd95 100644 --- a/test/decompiler/reference/jak1/engine/ui/progress-h_REF.gc +++ b/test/decompiler/reference/jak1/engine/ui/progress-h_REF.gc @@ -172,11 +172,11 @@ :size-assert #x2dc :flag-assert #x3b027002dc (:methods - (progress-dummy-14 (_type_) none 14) - (progress-dummy-15 (_type_) none 15) - (progress-dummy-16 (_type_) none 16) + (progress-method-14 (_type_) none 14) + (progress-method-15 (_type_) none 15) + (progress-method-16 (_type_) none 16) (draw-progress (_type_) none 17) - (progress-dummy-18 () none 18) + (progress-method-18 () none 18) (visible? (_type_) symbol 19) (hidden? (_type_) symbol 20) (adjust-sprites (_type_) none 21) @@ -202,10 +202,10 @@ (draw-memcard-auto-save-error (_type_ font-context) none 41) (draw-memcard-removed (_type_ font-context) none 42) (draw-memcard-error (_type_ font-context) none 43) - (progress-dummy-44 (_type_) none 44) + (progress-method-44 (_type_) none 44) (push! (_type_) none 45) (pop! (_type_) none 46) - (progress-dummy-47 (_type_) none 47) + (progress-method-47 (_type_) none 47) (enter! (_type_ progress-screen int) none 48) (draw-memcard-format (_type_ font-context) none 49) (draw-auto-save (_type_ font-context) none 50) diff --git a/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc b/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc index 29f4c09c46..12bfd096b6 100644 --- a/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc +++ b/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc @@ -1940,7 +1940,7 @@ ;; failed to figure out what this is: (defstate progress-normal (progress) :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) - (local-vars (v0-0 none)) + (local-vars (v0-0 object)) (the-as object (case event-type (('go-away) (go progress-going-out) @@ -1958,10 +1958,10 @@ (initialize! *game-info* 'game (the-as game-save #f) "intro-start") (set! (-> *setting-control* default auto-save) gp-1) ) - (set-master-mode 'game) + (the-as object (set-master-mode 'game)) ) (else - (set! v0-0 (the-as none -1)) + (set! v0-0 -1) (set! (-> self next-display-state) (the-as progress-screen v0-0)) v0-0 ) @@ -1969,18 +1969,18 @@ ) (((progress-screen memcard-formatting)) (set! (-> self force-transition) #t) - (set! v0-0 (the-as none 15)) + (set! v0-0 15) (set! (-> self next-display-state) (the-as progress-screen v0-0)) v0-0 ) (((progress-screen memcard-creating)) (cond ((= (-> self display-state-stack 0) (progress-screen title)) - (set! v0-0 (the-as none 18)) + (set! v0-0 18) (set! (-> self next-display-state) (the-as progress-screen v0-0)) ) (else - (set! v0-0 (the-as none 17)) + (set! v0-0 17) (set! (-> self next-display-state) (the-as progress-screen v0-0)) ) ) @@ -2061,29 +2061,29 @@ ) (case (-> event param 1) ((14) - (set! v0-0 (the-as none 7)) + (set! v0-0 7) (set! (-> self next-display-state) (the-as progress-screen v0-0)) v0-0 ) (else (case (-> self display-state) (((progress-screen memcard-formatting)) - (set! v0-0 (the-as none 24)) + (set! v0-0 24) (set! (-> self next-display-state) (the-as progress-screen v0-0)) v0-0 ) (((progress-screen memcard-creating)) - (set! v0-0 (the-as none 25)) + (set! v0-0 25) (set! (-> self next-display-state) (the-as progress-screen v0-0)) v0-0 ) (((progress-screen memcard-saving)) - (set! v0-0 (the-as none 21)) + (set! v0-0 21) (set! (-> self next-display-state) (the-as progress-screen v0-0)) v0-0 ) (((progress-screen memcard-loading)) - (set! v0-0 (the-as none 20)) + (set! v0-0 20) (set! (-> self next-display-state) (the-as progress-screen v0-0)) v0-0 ) diff --git a/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc b/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc index 1c5a28b130..9e75ae2d0d 100644 --- a/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/beach-obs_REF.gc @@ -1056,7 +1056,7 @@ :size-assert #x110 :flag-assert #x1500a00110 (:methods - (dummy-20 (_type_ float float float) none 20) + (flutflutegg-method-20 (_type_ float float float) none 20) ) (:states (flutflutegg-break symbol) @@ -1111,7 +1111,7 @@ ;; definition for method 20 of type flutflutegg ;; INFO: Return type mismatch int vs none. ;; WARN: Function (method 20 flutflutegg) has a return type of none, but the expression builder found a return statement. -(defmethod dummy-20 flutflutegg ((obj flutflutegg) (arg0 float) (arg1 float) (arg2 float)) +(defmethod flutflutegg-method-20 flutflutegg ((obj flutflutegg) (arg0 float) (arg1 float) (arg2 float)) (if (< (- (-> *display* base-frame-counter) (the-as time-frame (-> obj last-impulse-time))) (seconds 0.5)) (return 0) ) @@ -1162,8 +1162,8 @@ (f1-2 (- (* (-> s5-1 x) (-> self dir z)) (* (-> s5-1 z) (-> self dir x)))) ) (if (< f0-2 -0.7) - (dummy-20 self 24576.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) - (dummy-20 self 0.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) + (flutflutegg-method-20 self 24576.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) + (flutflutegg-method-20 self 0.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) ) ) ) @@ -1171,7 +1171,7 @@ ) ) :trans (behavior () - (let* ((gp-0 (TODO-RENAME-10 (-> self ambient) (new 'stack-no-clear 'vector) (seconds 3) 368640.0 self)) + (let* ((gp-0 (ambient-control-method-10 (-> self ambient) (new 'stack-no-clear 'vector) (seconds 3) 368640.0 self)) (v1-2 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) (v1-3 (the-as number (logior #x3f800000 v1-2))) (f30-0 (+ -1.0 (the-as float v1-3))) @@ -1259,8 +1259,8 @@ (f1-2 (- (* (-> s5-1 x) (-> self dir z)) (* (-> s5-1 z) (-> self dir x)))) ) (if (< f0-2 -0.7) - (dummy-20 self 24576.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) - (dummy-20 self 0.0 (* -8192.0 f1-2) (* -8192.0 f0-2)) + (the-as symbol (flutflutegg-method-20 self 24576.0 (* -8192.0 f1-2) (* -8192.0 f0-2))) + (the-as symbol (flutflutegg-method-20 self 0.0 (* -8192.0 f1-2) (* -8192.0 f0-2))) ) ) ) @@ -1278,7 +1278,7 @@ (vector+! a1-0 a1-0 (-> self start)) (move-to-point! (-> self root-override) a1-0) ) - (TODO-RENAME-12 (-> self wobbler) (-> self root-override quat)) + (wobbler-method-12 (-> self wobbler) (-> self root-override quat)) (let ((a2-3 (quaternion-axis-angle! (new 'stack-no-clear 'quaternion) 0.0 1.0 0.0 -18204.445))) (quaternion*! (-> self root-override quat) (-> self root-override quat) a2-3) ) @@ -1345,7 +1345,7 @@ #f ) (move! (-> self wobbler)) - (TODO-RENAME-12 (-> self wobbler) (-> self root-override quat)) + (wobbler-method-12 (-> self wobbler) (-> self root-override quat)) (let ((a2-6 (quaternion-axis-angle! (new 'stack-no-clear 'quaternion) 0.0 1.0 0.0 -18204.445))) (quaternion*! (-> self root-override quat) (-> self root-override quat) a2-6) ) diff --git a/test/decompiler/reference/jak1/levels/beach/bird-lady-beach_REF.gc b/test/decompiler/reference/jak1/levels/beach/bird-lady-beach_REF.gc index 602f30d7d6..f3ef283aaa 100644 --- a/test/decompiler/reference/jak1/levels/beach/bird-lady-beach_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/bird-lady-beach_REF.gc @@ -103,9 +103,9 @@ ;; definition for method 11 of type bird-lady-beach (defmethod init-from-entity! bird-lady-beach ((obj bird-lady-beach) (arg0 entity-actor)) - (dummy-40 obj arg0 *bird-lady-beach-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *bird-lady-beach-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task beach-flutflut))) (set! (-> obj sound-flava) (music-flava birdlady)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/beach/bird-lady_REF.gc b/test/decompiler/reference/jak1/levels/beach/bird-lady_REF.gc index e1d129fafd..f5f818ecdd 100644 --- a/test/decompiler/reference/jak1/levels/beach/bird-lady_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/bird-lady_REF.gc @@ -29,7 +29,7 @@ ;; definition for method 52 of type bird-lady ;; INFO: Return type mismatch shadow-flags vs none. -(defmethod dummy-52 bird-lady ((obj bird-lady)) +(defmethod process-taskable-method-52 bird-lady ((obj bird-lady)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -143,8 +143,8 @@ ) ;; definition for method 43 of type bird-lady -(defmethod TODO-RENAME-43 bird-lady ((obj bird-lady)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 bird-lady ((obj bird-lady)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.66 f0-2) @@ -169,7 +169,7 @@ ;; definition for method 11 of type bird-lady (defmethod init-from-entity! bird-lady ((obj bird-lady) (arg0 entity-actor)) - (dummy-40 obj arg0 *bird-lady-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *bird-lady-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task beach-flutflut))) (set! (-> obj sound-flava) (music-flava birdlady)) (set! (-> obj draw light-index) (the-as uint 4)) diff --git a/test/decompiler/reference/jak1/levels/beach/lurkercrab_REF.gc b/test/decompiler/reference/jak1/levels/beach/lurkercrab_REF.gc index bdfb1eecab..e0e84c8054 100644 --- a/test/decompiler/reference/jak1/levels/beach/lurkercrab_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/lurkercrab_REF.gc @@ -84,7 +84,7 @@ ;; definition for method 44 of type lurkercrab ;; INFO: Return type mismatch symbol vs object. -(defmethod dummy-44 lurkercrab ((obj lurkercrab) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler lurkercrab ((obj lurkercrab) (arg0 process) (arg1 event-message-block)) (if (and (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf6)) ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) @@ -110,7 +110,7 @@ ;; definition for method 43 of type lurkercrab ;; INFO: Used lq/sq -(defmethod dummy-43 lurkercrab ((obj lurkercrab) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler lurkercrab ((obj lurkercrab) (arg0 process) (arg1 event-message-block)) (let ((s5-0 (-> obj incomming-attack-id))) (set! (-> obj incomming-attack-id) (the-as handle (-> arg1 param 2))) (let ((v1-1 (-> arg1 param 1))) @@ -172,7 +172,7 @@ nav-enemy-default-event-handler ;; definition for method 37 of type lurkercrab ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-37 lurkercrab ((obj lurkercrab)) +(defmethod nav-enemy-method-37 lurkercrab ((obj lurkercrab)) (when (-> obj orient) (if (logtest? (nav-control-flags navcf19) (-> obj nav flags)) (seek-to-point-toward-point! @@ -197,7 +197,7 @@ nav-enemy-default-event-handler ;; definition for method 38 of type lurkercrab ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-38 lurkercrab ((obj lurkercrab)) +(defmethod nav-enemy-method-38 lurkercrab ((obj lurkercrab)) (integrate-for-enemy-with-move-to-ground! (-> obj collide-info) (-> obj collide-info transv) @@ -634,7 +634,7 @@ nav-enemy-default-event-handler ) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *lurkercrab-sg* '()) - (TODO-RENAME-45 obj *lurkercrab-nav-enemy-info*) + (init-defaults! obj *lurkercrab-nav-enemy-info*) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 159) obj)) (set! (-> obj orient) #t) (logclear! (-> obj nav-enemy-flags) (nav-enemy-flags navenmf5 navenmf6)) diff --git a/test/decompiler/reference/jak1/levels/beach/lurkerpuppy_REF.gc b/test/decompiler/reference/jak1/levels/beach/lurkerpuppy_REF.gc index ee5dfcf3c8..8dc0e1665d 100644 --- a/test/decompiler/reference/jak1/levels/beach/lurkerpuppy_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/lurkerpuppy_REF.gc @@ -300,9 +300,9 @@ nav-enemy-default-event-handler ;; definition for method 48 of type lurkerpuppy ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 lurkerpuppy ((obj lurkerpuppy)) +(defmethod nav-enemy-method-48 lurkerpuppy ((obj lurkerpuppy)) (initialize-skeleton obj *lurkerpuppy-sg* '()) - (TODO-RENAME-45 obj *lurkerpuppy-nav-enemy-info*) + (init-defaults! obj *lurkerpuppy-nav-enemy-info*) (when (nonzero? (-> obj neck)) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) diff --git a/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc b/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc index 0e619c73cb..107a35d5e4 100644 --- a/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/lurkerworm_REF.gc @@ -18,7 +18,7 @@ :size-assert #xc8 :flag-assert #x16006000c8 (:methods - (TODO-RENAME-20 (_type_) none 20) + (lurkerworm-method-20 (_type_) none 20) (particle-effect (_type_) none 21) ) (:states @@ -226,11 +226,11 @@ ;; definition for method 20 of type lurkerworm ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-20 lurkerworm ((obj lurkerworm)) +(defmethod lurkerworm-method-20 lurkerworm ((obj lurkerworm)) (let ((s5-0 (new 'stack-no-clear 'vector))) (vector-! s5-0 (target-pos 0) (-> obj root-override trans)) (set-target! (-> obj twister) (atan (-> s5-0 x) (-> s5-0 z))) - (TODO-RENAME-11 (-> obj twister)) + (twister-method-11 (-> obj twister)) (let* ((f0-5 (sqrtf (+ (* (-> s5-0 x) (-> s5-0 x)) (* (-> s5-0 z) (-> s5-0 z))))) (f0-6 (atan (-> s5-0 y) f0-5)) ) @@ -260,7 +260,7 @@ ;; INFO: Return type mismatch int vs none. (defun lurkerworm-joint-callback ((arg0 lurkerworm)) (let ((a1-0 arg0)) - (TODO-RENAME-12 (-> a1-0 twister) a1-0) + (twister-method-12 (-> a1-0 twister) a1-0) ) 0 (none) @@ -335,7 +335,7 @@ ;; definition for function lurkerworm-default-post-behavior ;; INFO: Return type mismatch int vs none. (defbehavior lurkerworm-default-post-behavior lurkerworm () - (TODO-RENAME-20 self) + (lurkerworm-method-20 self) (transform-post) 0 (none) @@ -634,7 +634,7 @@ lurkerworm-default-post-behavior (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 157) obj)) (set! (-> obj part2) (create-launch-control (-> *part-group-id-table* 158) obj)) (set! (-> obj twister) (new 'process 'twister 3 15 1092.2667 72.81778 0.25 0.001)) - (TODO-RENAME-9 (-> obj twister) 3 9 910.2222) + (twister-method-9 (-> obj twister) 3 9 910.2222) (set! (-> obj head-tilt) 0.0) (set! (-> obj skel prebind-function) lurkerworm-prebind-function) (set! (-> obj skel postbind-function) lurkerworm-joint-callback) diff --git a/test/decompiler/reference/jak1/levels/beach/mayor_REF.gc b/test/decompiler/reference/jak1/levels/beach/mayor_REF.gc index 710b273e5e..1153a14d85 100644 --- a/test/decompiler/reference/jak1/levels/beach/mayor_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/mayor_REF.gc @@ -29,7 +29,7 @@ ;; definition for method 52 of type mayor ;; INFO: Return type mismatch int vs none. -(defmethod dummy-52 mayor ((obj mayor)) +(defmethod process-taskable-method-52 mayor ((obj mayor)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -655,8 +655,8 @@ ) ;; definition for method 43 of type mayor -(defmethod TODO-RENAME-43 mayor ((obj mayor)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 mayor ((obj mayor)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.8888889 f0-2) @@ -726,11 +726,11 @@ ;; definition for method 11 of type mayor (defmethod init-from-entity! mayor ((obj mayor) (arg0 entity-actor)) - (dummy-40 obj arg0 *mayor-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *mayor-sg* 3 51 (new 'static 'vector :y 4096.0 :w 4096.0) 5) (set! (-> obj bounce-away) #f) (set! (-> obj tasks) (get-task-control (game-task jungle-lurkerm))) (set! (-> obj sound-flava) (music-flava mayor)) (set! (-> obj draw light-index) (the-as uint 2)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc b/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc index 331a187895..04991f772b 100644 --- a/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/pelican_REF.gc @@ -165,7 +165,7 @@ (eval-path-curve-div! (-> self path) s3-0 f30-0 'interp) (+! (-> s3-0 y) (-> self align align trans y)) (move-to-point! (-> self root-override) s3-0) - (TODO-RENAME-12 (-> self path) s3-0 f30-0) + (path-control-method-12 (-> self path) s3-0 f30-0) ) (if arg4 (set-heading-vec-clear-roll-pitch! (-> self root-override) s3-0) @@ -246,7 +246,7 @@ ) (('position) (set! (-> self path-pos) (the-as float (-> event param 0))) - (let ((a1-3 (TODO-RENAME-12 (-> self path) (new 'stack-no-clear 'vector) (-> self path-pos)))) + (let ((a1-3 (path-control-method-12 (-> self path) (new 'stack-no-clear 'vector) (-> self path-pos)))) (set-heading-vec! (-> self root-override) a1-3) ) ) @@ -400,7 +400,7 @@ (set! (-> self path-max) (the float (+ (-> self path curve num-cverts) -1))) (set! (-> self path-speed) (/ (* 300.0 (-> self path-max)) (the float (-> *PELICAN-bank* dive-time)))) (let ((gp-1 (new 'stack-no-clear 'vector))) - (TODO-RENAME-12 (-> self path) gp-1 (-> self path-pos)) + (path-control-method-12 (-> self path) gp-1 (-> self path-pos)) (set-heading-vec! (-> self root-override) gp-1) ) (set! (-> self draw force-lod) 0) @@ -522,14 +522,15 @@ ) ) (('touch) - (send-shove-back - (-> self root-override) - proc - (the-as touching-shapes-entry (-> event param 0)) - 0.7 - 6144.0 - 16384.0 - ) + (the-as object (send-shove-back + (-> self root-override) + proc + (the-as touching-shapes-entry (-> event param 0)) + 0.7 + 6144.0 + 16384.0 + ) + ) ) ) ) @@ -546,7 +547,7 @@ ) ) ) - (TODO-RENAME-12 (-> self path) (-> self path-vector) (-> self path-pos)) + (path-control-method-12 (-> self path) (-> self path-vector) (-> self path-pos)) (when arg0 (move-to-point! (-> self root-override) (-> self state-vector)) (set-heading-vec! (-> self root-override) (-> self path-vector)) diff --git a/test/decompiler/reference/jak1/levels/beach/sculptor_REF.gc b/test/decompiler/reference/jak1/levels/beach/sculptor_REF.gc index 54c8448c73..d5ad314b3e 100644 --- a/test/decompiler/reference/jak1/levels/beach/sculptor_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/sculptor_REF.gc @@ -38,7 +38,7 @@ ;; definition for method 52 of type sculptor ;; INFO: Return type mismatch int vs none. -(defmethod dummy-52 sculptor ((obj sculptor)) +(defmethod process-taskable-method-52 sculptor ((obj sculptor)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -189,8 +189,8 @@ ) ;; definition for method 43 of type sculptor -(defmethod TODO-RENAME-43 sculptor ((obj sculptor)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 sculptor ((obj sculptor)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.85714287 f0-2) @@ -316,7 +316,7 @@ ) ) ((begin - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (let* ((f30-3 4.0) (v1-287 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) (v1-288 (the-as number (logior #x3f800000 v1-287))) @@ -363,11 +363,11 @@ ;; definition for method 11 of type sculptor (defmethod init-from-entity! sculptor ((obj sculptor) (arg0 entity-actor)) - (dummy-40 obj arg0 *sculptor-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *sculptor-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task misty-muse))) (set! (-> obj muse) (the-as handle #f)) (set! (-> obj sound-flava) (music-flava sculptor)) (set! (-> obj draw light-index) (the-as uint 3)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/beach/seagull_REF.gc b/test/decompiler/reference/jak1/levels/beach/seagull_REF.gc index cd7354677b..f9e954df91 100644 --- a/test/decompiler/reference/jak1/levels/beach/seagull_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/seagull_REF.gc @@ -53,12 +53,12 @@ (:methods (move-vertically! (_type_ symbol) none 20) (adjust-heading-around-point-slow! (_type_ float) none 21) - (dummy-22 (_type_) none 22) + (seagull-method-22 (_type_) none 22) (adjust-heading-around-point! (_type_ float) none 23) - (dummy-24 (_type_) none 24) - (dummy-25 (_type_ float) none 25) - (dummy-26 (_type_) symbol 26) - (dummy-27 (_type_) none 27) + (seagull-method-24 (_type_) none 24) + (seagull-method-25 (_type_ float) none 25) + (seagull-method-26 (_type_) symbol 26) + (seagull-method-27 (_type_) none 27) ) (:states seagull-flying @@ -116,7 +116,7 @@ (:methods (spawn-bird (_type_ vector) (pointer process) 14) (play-hint (_type_ int) none 15) - (dummy-16 (_type_ seagull) float 16) + (seagullflock-method-16 (_type_ seagull) float 16) ) (:states seagullflock-at-waterfall @@ -235,7 +235,7 @@ ;; definition for method 25 of type seagull ;; INFO: Return type mismatch int vs none. -(defmethod dummy-25 seagull ((obj seagull) (arg0 float)) +(defmethod seagull-method-25 seagull ((obj seagull) (arg0 float)) (let ((f1-1 (the float (sar (shl (the int (- arg0 (-> obj heading))) 48) 48))) (f0-5 (- (-> obj tilt))) ) @@ -271,7 +271,7 @@ ;; definition for method 24 of type seagull ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 seagull ((obj seagull)) +(defmethod seagull-method-24 seagull ((obj seagull)) (let ((s5-0 (new 'stack-no-clear 'vector))) (vector-! s5-0 (-> obj flock 0 target) (-> obj root-override trans)) (when (< (vector-dot s5-0 s5-0) 6710886400.0) @@ -380,7 +380,7 @@ (defstate seagull-idle (seagull) :enter (behavior () (let* ((v1-0 (-> self flock)) - (f30-0 (dummy-16 + (f30-0 (seagullflock-method-16 (if v1-0 (-> v1-0 0 self-override) ) @@ -529,7 +529,7 @@ ) ;; definition for method 26 of type seagull -(defmethod dummy-26 seagull ((obj seagull)) +(defmethod seagull-method-26 seagull ((obj seagull)) (let ((s5-0 (new 'stack-no-clear 'vector))) (let ((f30-0 -4096.0) (f28-0 8192.0) @@ -582,14 +582,14 @@ ;; definition for method 22 of type seagull ;; INFO: Return type mismatch int vs none. -(defmethod dummy-22 seagull ((obj seagull)) +(defmethod seagull-method-22 seagull ((obj seagull)) (set! (-> obj root-override transv y) -8192.0) 0 (none) ) ;; definition for method 27 of type seagull -(defmethod dummy-27 seagull ((obj seagull)) +(defmethod seagull-method-27 seagull ((obj seagull)) (local-vars (at-0 int)) (rlet ((vf0 :class vf) (vf1 :class vf) @@ -664,7 +664,7 @@ ) 0 ) - (dummy-27 self) + (seagull-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 4.0 0))) ) @@ -693,7 +693,7 @@ (until (ja-done? 0) (ja-blend-eval) (when (-> self teleport) - (dummy-26 self) + (seagull-method-26 self) (suspend) 0 ) @@ -840,7 +840,7 @@ (set! (-> s5-1 root-override transv z) (+ (* 0.8 (-> s5-1 root-override transv z)) (* 0.2 f0-44))) ) 0 - (dummy-27 self) + (seagull-method-27 self) (suspend) (ja :num! (seek!)) ) @@ -886,7 +886,7 @@ (until (ja-done? 0) (ja-blend-eval) (when (-> self teleport) - (dummy-26 self) + (seagull-method-26 self) (suspend) 0 ) @@ -991,7 +991,7 @@ (set! (-> gp-1 root-override transv z) (+ (* 0.8 (-> gp-1 root-override transv z)) (* 0.2 f0-41))) ) 0 - (dummy-27 self) + (seagull-method-27 self) (when (< (-> self angletan) 0.2) (if (< (-> self root-override trans y) 40960.0) (go seagull-flying) @@ -1336,7 +1336,7 @@ ) ;; definition for method 16 of type seagullflock -(defmethod dummy-16 seagullflock ((obj seagullflock) (arg0 seagull)) +(defmethod seagullflock-method-16 seagullflock ((obj seagullflock) (arg0 seagull)) (let ((gp-0 (new 'stack-no-clear 'vector))) (eval-path-curve-div! (-> obj path) gp-0 (the float (-> obj targetnum)) 'interp) (vector-! gp-0 gp-0 (-> arg0 root-override trans)) diff --git a/test/decompiler/reference/jak1/levels/beach/twister_REF.gc b/test/decompiler/reference/jak1/levels/beach/twister_REF.gc index 7f8b59464f..28214bbbd7 100644 --- a/test/decompiler/reference/jak1/levels/beach/twister_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/twister_REF.gc @@ -39,10 +39,10 @@ :flag-assert #xd00000028 (:methods (new (symbol type int int float float float float) _type_ 0) - (TODO-RENAME-9 (_type_ int int float) none 9) + (twister-method-9 (_type_ int int float) none 9) (set-target! (_type_ float) none 10) - (TODO-RENAME-11 (_type_) none 11) - (TODO-RENAME-12 (_type_ process-drawable) none 12) + (twister-method-11 (_type_) none 11) + (twister-method-12 (_type_ process-drawable) none 12) ) ) @@ -99,7 +99,7 @@ ;; definition for method 9 of type twister ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-9 twister ((obj twister) (arg0 int) (arg1 int) (arg2 float)) +(defmethod twister-method-9 twister ((obj twister) (arg0 int) (arg1 int) (arg2 float)) (let ((v1-1 (- arg0 (-> obj first-joint))) (a1-2 (- arg1 (-> obj first-joint))) ) @@ -122,7 +122,7 @@ ;; definition for method 11 of type twister ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-11 twister ((obj twister)) +(defmethod twister-method-11 twister ((obj twister)) (let* ((s5-0 (+ (-> obj num-joints) -1)) (s4-0 (-> obj data s5-0)) ) @@ -162,7 +162,7 @@ ;; definition for method 12 of type twister ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-12 twister ((obj twister) (arg0 process-drawable)) +(defmethod twister-method-12 twister ((obj twister) (arg0 process-drawable)) (let ((s4-0 (new 'stack-no-clear 'matrix))) (dotimes (s3-0 (-> obj num-joints)) (let ((s2-0 (-> arg0 node-list data (+ (-> obj first-joint) s3-0) bone transform))) diff --git a/test/decompiler/reference/jak1/levels/beach/wobbler_REF.gc b/test/decompiler/reference/jak1/levels/beach/wobbler_REF.gc index b5961201b8..63d6e4529e 100644 --- a/test/decompiler/reference/jak1/levels/beach/wobbler_REF.gc +++ b/test/decompiler/reference/jak1/levels/beach/wobbler_REF.gc @@ -18,7 +18,7 @@ (reset! (_type_ float float float) none 9) (inc-xy-vel! (_type_ float float) none 10) (move! (_type_) none 11) - (TODO-RENAME-12 (_type_ quaternion) none 12) + (wobbler-method-12 (_type_ quaternion) none 12) ) ) @@ -73,7 +73,7 @@ ;; definition for method 12 of type wobbler ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-12 wobbler ((obj wobbler) (arg0 quaternion)) +(defmethod wobbler-method-12 wobbler ((obj wobbler) (arg0 quaternion)) (let ((s5-0 (new 'stack-no-clear 'vector))) (set! (-> s5-0 x) (-> obj posy)) (set! (-> s5-0 y) 0.0) diff --git a/test/decompiler/reference/jak1/levels/citadel/assistant-citadel_REF.gc b/test/decompiler/reference/jak1/levels/citadel/assistant-citadel_REF.gc index 93d7ea3b2e..4369cb1b20 100644 --- a/test/decompiler/reference/jak1/levels/citadel/assistant-citadel_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/assistant-citadel_REF.gc @@ -80,7 +80,7 @@ (defstate hidden (assistant-lavatube-end) :virtual #t :trans (behavior () - (dummy-33 self) + (process-taskable-method-33 self) ((-> (method-of-type process-taskable hidden) trans)) (when (and (and *target* (>= 61440.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans)))) (not (closed? (-> self tasks) (game-task village4-button) (task-status need-reward-speech))) @@ -130,9 +130,9 @@ ;; definition for method 11 of type assistant-lavatube-end (defmethod init-from-entity! assistant-lavatube-end ((obj assistant-lavatube-end) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-lavatube-end-sg* 3 29 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-lavatube-end-sg* 3 29 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task village4-button))) (first-any (-> obj tasks) #t) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc index 59692492f4..745cf62280 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citadel-obs_REF.gc @@ -463,7 +463,7 @@ :flag-assert #x16005000bc (:methods (init! (_type_) none 20) - (dummy-21 (_type_) none 21) + (citb-disc-method-21 (_type_) none 21) ) (:states citb-disc-idle @@ -538,7 +538,7 @@ ;; definition for method 21 of type citb-disc ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 citb-disc ((obj citb-disc)) +(defmethod citb-disc-method-21 citb-disc ((obj citb-disc)) 0 (none) ) @@ -561,7 +561,7 @@ ) ) ) - (dummy-21 obj) + (citb-disc-method-21 obj) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "rotate-plat" :fo-max 20) (-> obj root-override trans)) ) @@ -640,7 +640,7 @@ ;; definition for method 21 of type citb-disc-a ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 citb-disc-a ((obj citb-disc-a)) +(defmethod citb-disc-method-21 citb-disc-a ((obj citb-disc-a)) (initialize-skeleton obj *citb-disc-a-sg* '()) 0 (none) @@ -648,7 +648,7 @@ ;; definition for method 21 of type citb-disc-b ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 citb-disc-b ((obj citb-disc-b)) +(defmethod citb-disc-method-21 citb-disc-b ((obj citb-disc-b)) (initialize-skeleton obj *citb-disc-b-sg* '()) 0 (none) @@ -656,7 +656,7 @@ ;; definition for method 21 of type citb-disc-c ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 citb-disc-c ((obj citb-disc-c)) +(defmethod citb-disc-method-21 citb-disc-c ((obj citb-disc-c)) (initialize-skeleton obj *citb-disc-c-sg* '()) 0 (none) @@ -664,7 +664,7 @@ ;; definition for method 21 of type citb-disc-d ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 citb-disc-d ((obj citb-disc-d)) +(defmethod citb-disc-method-21 citb-disc-d ((obj citb-disc-d)) (initialize-skeleton obj *citb-disc-d-sg* '()) 0 (none) @@ -695,7 +695,7 @@ ;; definition for method 24 of type citb-iris-door ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-24 citb-iris-door ((obj citb-iris-door)) +(defmethod eco-door-method-24 citb-iris-door ((obj citb-iris-door)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -716,7 +716,7 @@ ;; definition for method 25 of type citb-iris-door ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-25 citb-iris-door ((obj citb-iris-door)) +(defmethod eco-door-method-25 citb-iris-door ((obj citb-iris-door)) (initialize-skeleton obj *citb-iris-door-sg* '()) (set! (-> obj open-distance) 32768.0) (set! (-> obj close-distance) 49152.0) @@ -752,7 +752,7 @@ ;; definition for method 27 of type citb-button ;; INFO: Return type mismatch int vs collide-shape-moving. -(defmethod TODO-RENAME-27 citb-button ((obj citb-button)) +(defmethod basebutton-method-27 citb-button ((obj citb-button)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -776,7 +776,7 @@ ) ;; definition for method 26 of type citb-button -(defmethod TODO-RENAME-26 citb-button ((obj citb-button)) +(defmethod basebutton-method-26 citb-button ((obj citb-button)) (initialize-skeleton obj *citb-button-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (ja-channel-set! 1) @@ -857,7 +857,7 @@ ;; definition for method 26 of type citb-launcher ;; INFO: Return type mismatch int vs none. -(defmethod dummy-26 citb-launcher ((obj citb-launcher)) +(defmethod baseplat-method-26 citb-launcher ((obj citb-launcher)) (let ((f30-0 (res-lump-float (-> obj entity) 'spring-height :default 163840.0)) (s5-0 (res-lump-value (-> obj entity) 'mode uint128)) ) @@ -1411,7 +1411,7 @@ :flag-assert #x1600c00124 (:methods (init! (_type_) none 20) - (dummy-21 (_type_) none 21) + (citb-generator-method-21 (_type_) none 21) ) (:states citb-generator-break @@ -1699,7 +1699,7 @@ ;; definition for method 21 of type citb-generator ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 citb-generator ((obj citb-generator)) +(defmethod citb-generator-method-21 citb-generator ((obj citb-generator)) (initialize-skeleton obj *citb-generator-sg* '()) (setup-lods! (-> obj normal-look) *citb-generator-sg* (-> obj draw art-group) (-> obj entity)) (setup-lods! (-> obj broken-look) *citb-generator-broken-sg* (-> obj draw art-group) (-> obj entity)) @@ -1749,7 +1749,7 @@ (defmethod init-from-entity! citb-generator ((obj citb-generator) (arg0 entity-actor)) (init! obj) (process-drawable-from-entity! obj arg0) - (dummy-21 obj) + (citb-generator-method-21 obj) (let ((v1-4 (entity-actor-lookup (-> obj entity) 'state-actor 0))) (if (not v1-4) (set! v1-4 (-> obj entity)) @@ -1934,7 +1934,7 @@ ;; definition for method 27 of type citb-battlecontroller ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-27 citb-battlecontroller ((obj citb-battlecontroller)) +(defmethod battlecontroller-method-27 citb-battlecontroller ((obj citb-battlecontroller)) ((the-as (function battlecontroller none) (find-parent-method citb-battlecontroller 27)) obj) (set! (-> obj activate-distance) 143360.0) 0 diff --git a/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc index 4824f6459b..49f71be06b 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citadel-sages_REF.gc @@ -29,8 +29,8 @@ :size-assert #x17c :flag-assert #x160110017c (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) none 21) + (citb-sagecage-method-20 (_type_) none 20) + (citb-sagecage-method-21 (_type_) none 21) ) (:states citb-sagecage-idle @@ -106,27 +106,27 @@ ;; failed to figure out what this is: (defstate citb-sagecage-idle (citb-sagecage) :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) - (local-vars (v0-3 none)) + (local-vars (v0-3 basic)) (the-as object (case event-type (('disable-bars) (stop! (-> self sound)) (sound-play "sagecage-off") (set! (-> self bars-on) #f) - (citb-sagecage-update-collision) + (the-as basic (citb-sagecage-update-collision)) ) (('enable-bars) (set! (-> self bars-on) #t) - (citb-sagecage-update-collision) + (the-as basic (citb-sagecage-update-collision)) ) (('start-cloning) - (set! v0-3 (the-as none #t)) + (set! v0-3 #t) (set! (-> self cloning) (the-as symbol v0-3)) v0-3 ) (('stop-cloning) (set! (-> self cloning) #f) (let ((v1-7 (-> self skel root-channel 0))) - (set! v0-3 (the-as none (-> self draw art-group data 3))) + (set! v0-3 (-> self draw art-group data 3)) (set! (-> v1-7 frame-group) (the-as art-joint-anim v0-3)) ) v0-3 @@ -173,7 +173,7 @@ ;; definition for method 20 of type citb-sagecage ;; INFO: Return type mismatch int vs none. -(defmethod dummy-20 citb-sagecage ((obj citb-sagecage)) +(defmethod citb-sagecage-method-20 citb-sagecage ((obj citb-sagecage)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -200,7 +200,7 @@ ;; definition for method 21 of type citb-sagecage ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 citb-sagecage ((obj citb-sagecage)) +(defmethod citb-sagecage-method-21 citb-sagecage ((obj citb-sagecage)) (initialize-skeleton obj *citb-sagecage-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (set! (-> obj root-override pause-adjust-distance) 409600.0) @@ -238,11 +238,11 @@ ;; definition for function citb-sagecage-init-by-other ;; INFO: Return type mismatch object vs none. (defbehavior citb-sagecage-init-by-other citb-sagecage ((arg0 citb-sage)) - (dummy-20 self) + (citb-sagecage-method-20 self) (mem-copy! (the-as pointer (-> self root-override trans)) (the-as pointer (-> arg0 root-override trans)) 16) (mem-copy! (the-as pointer (-> self root-override quat)) (the-as pointer (-> arg0 root-override quat)) 16) (mem-copy! (the-as pointer (-> self root-override scale)) (the-as pointer (-> arg0 root-override scale)) 16) - (dummy-21 self) + (citb-sagecage-method-21 self) (go citb-sagecage-idle) (none) ) @@ -396,14 +396,14 @@ ;; definition for method 45 of type citb-sage ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs symbol. -(defmethod dummy-45 citb-sage ((obj citb-sage)) +(defmethod process-taskable-method-45 citb-sage ((obj citb-sage)) (set! (-> obj spawn-pos quad) (-> obj root-override trans quad)) (the-as symbol 0) ) ;; definition for method 42 of type citb-sage ;; INFO: Return type mismatch object vs none. -(defmethod dummy-42 citb-sage ((obj citb-sage)) +(defmethod process-taskable-method-42 citb-sage ((obj citb-sage)) (if (not (should-display? obj)) (go (method-of-object obj hidden)) (go (method-of-object obj idle)) @@ -464,7 +464,7 @@ (vector-! (-> self dir) (-> self target-pos) (-> self spawn-pos)) (set! (-> self rot-y) (vector-y-angle (-> self dir))) (set! (-> self rot-x) (- 16384.0 (vector-x-angle (-> self dir)))) - (dummy-45 self) + (process-taskable-method-45 self) (spawn (-> self part) (-> self spawn-pos)) (spawn (-> self part-impact) (-> self target-pos)) ) @@ -532,7 +532,7 @@ ;; definition for method 52 of type red-sagecage ;; INFO: Return type mismatch shadow-flags vs none. -(defmethod dummy-52 red-sagecage ((obj red-sagecage)) +(defmethod process-taskable-method-52 red-sagecage ((obj red-sagecage)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((a0-1 v1-1)) @@ -575,7 +575,7 @@ ;; definition for method 45 of type red-sagecage ;; INFO: Return type mismatch int vs symbol. -(defmethod dummy-45 red-sagecage ((obj red-sagecage)) +(defmethod process-taskable-method-45 red-sagecage ((obj red-sagecage)) (set! (-> *part-id-table* 2455 init-specs 14 initial-valuef) (-> obj rot-y)) (set! (-> *part-id-table* 2455 init-specs 13 initial-valuef) (-> obj rot-x)) (set! (-> *part-id-table* 2457 init-specs 14 initial-valuef) (-> obj rot-y)) @@ -612,11 +612,11 @@ ) ;; definition for method 43 of type red-sagecage -(defmethod TODO-RENAME-43 red-sagecage ((obj red-sagecage)) +(defmethod process-taskable-method-43 red-sagecage ((obj red-sagecage)) (if (-> obj beam-on) (return #f) ) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.6666667 f0-2) @@ -635,11 +635,11 @@ ;; definition for method 11 of type red-sagecage (defmethod init-from-entity! red-sagecage ((obj red-sagecage) (arg0 entity-actor)) - (dummy-40 obj arg0 *redsage-sg* 3 33 (new 'static 'vector :w 8192.0) 5) + (process-taskable-method-40 obj arg0 *redsage-sg* 3 33 (new 'static 'vector :w 8192.0) 5) (set! (-> obj tasks) (get-task-control (-> obj entity extra perm task))) (play-reminder obj) (set! (-> obj sound-flava) (music-flava sage-red)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -662,7 +662,7 @@ ;; definition for method 52 of type blue-sagecage ;; INFO: Return type mismatch shadow-flags vs none. -(defmethod dummy-52 blue-sagecage ((obj blue-sagecage)) +(defmethod process-taskable-method-52 blue-sagecage ((obj blue-sagecage)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((a0-1 v1-1)) @@ -705,7 +705,7 @@ ;; definition for method 45 of type blue-sagecage ;; INFO: Return type mismatch int vs symbol. -(defmethod dummy-45 blue-sagecage ((obj blue-sagecage)) +(defmethod process-taskable-method-45 blue-sagecage ((obj blue-sagecage)) (set! (-> *part-id-table* 2448 init-specs 14 initial-valuef) (-> obj rot-y)) (set! (-> *part-id-table* 2448 init-specs 13 initial-valuef) (-> obj rot-x)) (set! (-> *part-id-table* 2450 init-specs 14 initial-valuef) (-> obj rot-y)) @@ -747,11 +747,11 @@ ) ;; definition for method 43 of type blue-sagecage -(defmethod TODO-RENAME-43 blue-sagecage ((obj blue-sagecage)) +(defmethod process-taskable-method-43 blue-sagecage ((obj blue-sagecage)) (if (-> obj beam-on) (return #f) ) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.6666667 f0-2) @@ -770,11 +770,11 @@ ;; definition for method 11 of type blue-sagecage (defmethod init-from-entity! blue-sagecage ((obj blue-sagecage) (arg0 entity-actor)) - (dummy-40 obj arg0 *bluesage-sg* 3 54 (new 'static 'vector :w 8192.0) 5) + (process-taskable-method-40 obj arg0 *bluesage-sg* 3 54 (new 'static 'vector :w 8192.0) 5) (set! (-> obj tasks) (get-task-control (-> obj entity extra perm task))) (play-reminder obj) (set! (-> obj sound-flava) (music-flava sage-blue)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -797,7 +797,7 @@ ;; definition for method 52 of type yellow-sagecage ;; INFO: Return type mismatch shadow-flags vs none. -(defmethod dummy-52 yellow-sagecage ((obj yellow-sagecage)) +(defmethod process-taskable-method-52 yellow-sagecage ((obj yellow-sagecage)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((a0-1 v1-1)) @@ -840,7 +840,7 @@ ;; definition for method 45 of type yellow-sagecage ;; INFO: Return type mismatch int vs symbol. -(defmethod dummy-45 yellow-sagecage ((obj yellow-sagecage)) +(defmethod process-taskable-method-45 yellow-sagecage ((obj yellow-sagecage)) (set! (-> *part-id-table* 2462 init-specs 14 initial-valuef) (-> obj rot-y)) (set! (-> *part-id-table* 2462 init-specs 13 initial-valuef) (-> obj rot-x)) (set! (-> *part-id-table* 2464 init-specs 14 initial-valuef) (-> obj rot-y)) @@ -877,11 +877,11 @@ ) ;; definition for method 43 of type yellow-sagecage -(defmethod TODO-RENAME-43 yellow-sagecage ((obj yellow-sagecage)) +(defmethod process-taskable-method-43 yellow-sagecage ((obj yellow-sagecage)) (if (-> obj beam-on) (return #f) ) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.6666667 f0-2) @@ -900,11 +900,11 @@ ;; definition for method 11 of type yellow-sagecage (defmethod init-from-entity! yellow-sagecage ((obj yellow-sagecage) (arg0 entity-actor)) - (dummy-40 obj arg0 *yellowsage-sg* 3 50 (new 'static 'vector :w 8192.0) 5) + (process-taskable-method-40 obj arg0 *yellowsage-sg* 3 50 (new 'static 'vector :w 8192.0) 5) (set! (-> obj tasks) (get-task-control (-> obj entity extra perm task))) (play-reminder obj) (set! (-> obj sound-flava) (music-flava sage-yellow)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -937,7 +937,7 @@ ;; definition for method 45 of type green-sagecage ;; INFO: Return type mismatch int vs symbol. -(defmethod dummy-45 green-sagecage ((obj green-sagecage)) +(defmethod process-taskable-method-45 green-sagecage ((obj green-sagecage)) (set! (-> *part-id-table* 2469 init-specs 14 initial-valuef) (-> obj rot-y)) (set! (-> *part-id-table* 2469 init-specs 13 initial-valuef) (-> obj rot-x)) (set! (-> *part-id-table* 2471 init-specs 14 initial-valuef) (-> obj rot-y)) @@ -1263,7 +1263,7 @@ ;; definition for method 11 of type green-sagecage (defmethod init-from-entity! green-sagecage ((obj green-sagecage) (arg0 entity-actor)) - (dummy-40 obj arg0 *green-sagecage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *green-sagecage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (-> obj entity extra perm task))) (play-reminder obj) (set! (-> obj evilbro) (the-as handle #f)) @@ -1280,6 +1280,6 @@ ) ) (set! (-> obj sound-flava) (music-flava sage)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/citadel/citb-bunny_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citb-bunny_REF.gc index 9a7f87b3b4..69d7065bc7 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citb-bunny_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citb-bunny_REF.gc @@ -11,7 +11,7 @@ :size-assert #x200 :flag-assert #x4d01900200 (:methods - (TODO-RENAME-48 (_type_ object) none :replace 48) + (citb-bunny-method-48 (_type_ object) none :replace 48) ) ) @@ -84,7 +84,7 @@ ;; definition for method 60 of type citb-bunny ;; INFO: Return type mismatch int vs none. -(defmethod dummy-60 citb-bunny ((obj citb-bunny)) +(defmethod snow-bunny-method-60 citb-bunny ((obj citb-bunny)) (initialize-skeleton obj *citb-bunny-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) 0 @@ -93,9 +93,9 @@ ;; definition for method 48 of type citb-bunny ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 citb-bunny ((obj citb-bunny) (arg0 object)) - (dummy-60 obj) - (TODO-RENAME-45 obj *citb-bunny-nav-enemy-info*) +(defmethod citb-bunny-method-48 citb-bunny ((obj citb-bunny) (arg0 object)) + (snow-bunny-method-60 obj) + (init-defaults! obj *citb-bunny-nav-enemy-info*) (logclear! (-> obj draw shadow-ctrl settings flags) (shadow-flags shdf03)) (cond ((zero? (res-lump-value (-> obj entity) 'mode uint128)) diff --git a/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc index a73ab04c72..1ae98d0c94 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citb-drop-plat_REF.gc @@ -49,8 +49,8 @@ :size-assert #xe1 :flag-assert #x16008000e1 (:methods - (TODO-RENAME-20 (_type_) none 20) - (dummy-21 (_type_) none 21) + (drop-plat-method-20 (_type_) none 20) + (drop-plat-method-21 (_type_) none 21) ) (:states drop-plat-die @@ -263,7 +263,7 @@ ;; definition for method 20 of type drop-plat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-20 drop-plat ((obj drop-plat)) +(defmethod drop-plat-method-20 drop-plat ((obj drop-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -290,7 +290,7 @@ ;; definition for method 21 of type drop-plat ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 drop-plat ((obj drop-plat)) +(defmethod drop-plat-method-21 drop-plat ((obj drop-plat)) (case (-> obj color) ((1) (initialize-skeleton obj *citb-drop-plat-red-sg* '()) @@ -338,11 +338,11 @@ (set! (-> self color) arg3) (set! (-> self delay) arg1) (set! (-> self duration) arg2) - (TODO-RENAME-20 self) + (drop-plat-method-20 self) (set! (-> self root-override trans quad) (-> arg0 quad)) (vector-identity! (-> self root-override scale)) (quaternion-copy! (-> self root-override quat) (-> (the-as process-drawable (-> self parent 0)) root quat)) - (dummy-21 self) + (drop-plat-method-21 self) (go drop-plat-spawn) (none) ) @@ -550,7 +550,7 @@ (('player-stepped) (when (>= (- (-> *display* base-frame-counter) (-> self drop-time)) (seconds 0.2)) (set! (-> self drop-time) (-> *display* base-frame-counter)) - (citb-drop-plat-drop-children (the-as int (-> event param 0))) + (the-as object (citb-drop-plat-drop-children (the-as int (-> event param 0)))) ) ) (('trigger) diff --git a/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc b/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc index f05cb0a09e..881b792b3b 100644 --- a/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/citadel/citb-plat_REF.gc @@ -51,10 +51,10 @@ :flag-assert #x19005000b4 (:methods (citb-base-plat-idle () _type_ :state 20) - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) none 22) + (citb-base-plat-method-21 (_type_) none 21) + (citb-base-plat-method-22 (_type_) none 22) (citb-base-plat-active () _type_ :state 23) - (dummy-24 (_type_) none 24) + (citb-base-plat-method-24 (_type_) none 24) ) ) @@ -102,7 +102,7 @@ ;; definition for method 21 of type citb-base-plat ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 citb-base-plat ((obj citb-base-plat)) +(defmethod citb-base-plat-method-21 citb-base-plat ((obj citb-base-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -129,7 +129,7 @@ ;; definition for method 22 of type citb-base-plat ;; INFO: Return type mismatch int vs none. -(defmethod dummy-22 citb-base-plat ((obj citb-base-plat)) +(defmethod citb-base-plat-method-22 citb-base-plat ((obj citb-base-plat)) (initialize-skeleton obj *plat-citb-sg* '()) 0 (none) @@ -137,7 +137,7 @@ ;; definition for method 24 of type citb-base-plat ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 citb-base-plat ((obj citb-base-plat)) +(defmethod citb-base-plat-method-24 citb-base-plat ((obj citb-base-plat)) (go (method-of-object obj citb-base-plat-idle)) 0 (none) @@ -145,12 +145,12 @@ ;; definition for method 11 of type citb-base-plat (defmethod init-from-entity! citb-base-plat ((obj citb-base-plat) (arg0 entity-actor)) - (dummy-21 obj) + (citb-base-plat-method-21 obj) (process-drawable-from-entity! obj arg0) (set! (-> obj idle-distance) 245760.0) - (dummy-22 obj) + (citb-base-plat-method-22 obj) (logior! (-> obj skel status) (janim-status inited)) - (dummy-24 obj) + (citb-base-plat-method-24 obj) (none) ) @@ -173,7 +173,7 @@ ;; definition for method 24 of type citb-plat-eco ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 citb-plat-eco ((obj citb-plat-eco)) +(defmethod baseplat-method-24 citb-plat-eco ((obj citb-plat-eco)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -200,7 +200,7 @@ ;; definition for method 26 of type citb-plat-eco ;; INFO: Return type mismatch float vs none. -(defmethod dummy-26 citb-plat-eco ((obj citb-plat-eco)) +(defmethod baseplat-method-26 citb-plat-eco ((obj citb-plat-eco)) (logclear! (-> obj mask) (process-mask actor-pause)) (set! (-> obj notice-dist) 8192.0) (none) @@ -261,7 +261,7 @@ ;; definition for method 24 of type citb-plat ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 citb-plat ((obj citb-plat)) +(defmethod baseplat-method-24 citb-plat ((obj citb-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -289,7 +289,7 @@ ;; definition for method 26 of type citb-plat ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-26 citb-plat ((obj citb-plat)) +(defmethod baseplat-method-26 citb-plat ((obj citb-plat)) (logclear! (-> obj mask) (process-mask actor-pause)) (set! (-> obj root-override scale quad) (-> (res-lump-struct (-> obj entity) 'scale vector) quad)) (let ((f0-0 (-> obj root-override scale x))) @@ -407,7 +407,7 @@ ;; definition for method 22 of type citb-stair-plat ;; INFO: Return type mismatch int vs none. -(defmethod dummy-22 citb-stair-plat ((obj citb-stair-plat)) +(defmethod citb-base-plat-method-22 citb-stair-plat ((obj citb-stair-plat)) (initialize-skeleton obj *plat-citb-sg* '()) (set! (-> obj rise-height) (-> obj root-override trans y)) (set! (-> obj idle-height) (+ -409600.0 (-> obj rise-height))) @@ -429,7 +429,7 @@ ;; definition for method 24 of type citb-stair-plat ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 citb-stair-plat ((obj citb-stair-plat)) +(defmethod citb-base-plat-method-24 citb-stair-plat ((obj citb-stair-plat)) (if (and (task-complete? *game-info* (game-task citadel-sage-blue)) (task-complete? *game-info* (game-task citadel-sage-red)) (task-complete? *game-info* (game-task citadel-sage-yellow)) @@ -499,7 +499,7 @@ ) ;; definition for method 22 of type citb-chain-plat -(defmethod TODO-RENAME-22 citb-chain-plat ((obj citb-chain-plat) (arg0 vector) (arg1 float)) +(defmethod rigid-body-platform-method-22 citb-chain-plat ((obj citb-chain-plat) (arg0 vector) (arg1 float)) (+ 12288.0 (* 2048.0 (fmax 0.0 (fmin 1.0 (* 0.000024414063 (-> obj float-height-offset)))) @@ -512,7 +512,7 @@ ;; definition for method 27 of type citb-chain-plat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-27 citb-chain-plat ((obj citb-chain-plat) (arg0 vector)) +(defmethod rigid-body-platform-method-27 citb-chain-plat ((obj citb-chain-plat) (arg0 vector)) (let ((gp-0 (new 'stack-no-clear 'vector))) (vector-! gp-0 arg0 (-> obj rbody position)) (set! (-> gp-0 y) 0.0) @@ -521,7 +521,7 @@ ) (when (< 0.0 f1-1) (vector-float*! gp-0 gp-0 (/ f1-1 f0-1)) - (TODO-RENAME-15 (-> obj rbody) gp-0) + (rigid-body-method-15 (-> obj rbody) gp-0) ) ) ) @@ -531,9 +531,9 @@ ;; definition for method 23 of type citb-chain-plat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 citb-chain-plat ((obj citb-chain-plat) (arg0 float)) +(defmethod rigid-body-platform-method-23 citb-chain-plat ((obj citb-chain-plat) (arg0 float)) ((the-as (function rigid-body-platform float none) (find-parent-method citb-chain-plat 23)) obj arg0) - (TODO-RENAME-27 obj (-> obj orig-trans)) + (rigid-body-platform-method-27 obj (-> obj orig-trans)) 0 (none) ) @@ -632,7 +632,7 @@ ) (set! (-> self root-overlay trans quad) (-> self orig-trans quad)) (quaternion-copy! (-> self root-overlay quat) (-> self orig-quat)) - (TODO-RENAME-22 + (rigid-body-method-22 (-> self rbody) (-> self root-overlay trans) (-> self root-overlay quat) @@ -648,7 +648,7 @@ ;; definition for method 30 of type citb-chain-plat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-30 citb-chain-plat ((obj citb-chain-plat)) +(defmethod rigid-body-platform-method-30 citb-chain-plat ((obj citb-chain-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -676,13 +676,13 @@ ;; definition for method 31 of type citb-chain-plat ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 citb-chain-plat ((obj citb-chain-plat)) +(defmethod rigid-body-platform-method-31 citb-chain-plat ((obj citb-chain-plat)) (initialize-skeleton obj *citb-chain-plat-sg* '()) (set! (-> obj orig-trans quad) (-> obj root-overlay trans quad)) (quaternion-copy! (-> obj orig-quat) (-> obj root-overlay quat)) (set! (-> obj beam-end quad) (-> obj orig-trans quad)) (set! (-> obj beam-end y) (+ -49152.0 (-> obj beam-end y))) - (TODO-RENAME-29 obj *citb-chain-plat-constants*) + (rigid-body-platform-method-29 obj *citb-chain-plat-constants*) (set! (-> obj idle-offset) 0.0) (set! (-> obj float-offset) (res-lump-float (-> obj entity) 'height-info :default 4096.0)) (set! (-> obj float-height-offset) (-> obj idle-offset)) @@ -752,7 +752,7 @@ ;; definition for method 21 of type citb-rotatebox ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 citb-rotatebox ((obj citb-rotatebox)) +(defmethod citb-base-plat-method-21 citb-rotatebox ((obj citb-rotatebox)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -779,7 +779,7 @@ ;; definition for method 22 of type citb-rotatebox ;; INFO: Return type mismatch int vs none. -(defmethod dummy-22 citb-rotatebox ((obj citb-rotatebox)) +(defmethod citb-base-plat-method-22 citb-rotatebox ((obj citb-rotatebox)) (initialize-skeleton obj *citb-rotatebox-sg* '()) 0 (none) @@ -829,7 +829,7 @@ ;; definition for method 21 of type citb-donut ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 citb-donut ((obj citb-donut)) +(defmethod citb-base-plat-method-21 citb-donut ((obj citb-donut)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -856,7 +856,7 @@ ;; definition for method 22 of type citb-donut ;; INFO: Return type mismatch int vs none. -(defmethod dummy-22 citb-donut ((obj citb-donut)) +(defmethod citb-base-plat-method-22 citb-donut ((obj citb-donut)) (initialize-skeleton obj *citb-donut-sg* '()) (setup-params! (-> obj sync) (the-as uint 9000) 0.0 0.15 0.15) (set! (-> obj sound) @@ -911,7 +911,7 @@ ;; definition for method 24 of type citb-stopbox ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 citb-stopbox ((obj citb-stopbox)) +(defmethod baseplat-method-24 citb-stopbox ((obj citb-stopbox)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -938,7 +938,7 @@ ;; definition for method 26 of type citb-stopbox ;; INFO: Return type mismatch int vs none. -(defmethod dummy-26 citb-stopbox ((obj citb-stopbox)) +(defmethod baseplat-method-26 citb-stopbox ((obj citb-stopbox)) (logior! (-> obj fact options) (fact-options wrap-phase)) (logclear! (-> obj mask) (process-mask actor-pause)) 0 @@ -1284,14 +1284,14 @@ ) ;; definition for method 31 of type citb-exit-plat -(defmethod TODO-RENAME-31 citb-exit-plat ((obj citb-exit-plat)) +(defmethod plat-button-method-31 citb-exit-plat ((obj citb-exit-plat)) (initialize-skeleton obj *citb-exit-plat-sg* '()) (none) ) ;; definition for method 32 of type citb-exit-plat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-32 citb-exit-plat ((obj citb-exit-plat)) +(defmethod plat-button-method-32 citb-exit-plat ((obj citb-exit-plat)) (if (-> obj activated) (go (method-of-object obj plat-button-idle)) (go citb-exit-plat-idle) @@ -1301,7 +1301,7 @@ ) ;; definition for method 28 of type citb-exit-plat -(defmethod TODO-RENAME-28 citb-exit-plat ((obj citb-exit-plat)) +(defmethod plat-button-method-28 citb-exit-plat ((obj citb-exit-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/common/babak_REF.gc b/test/decompiler/reference/jak1/levels/common/babak_REF.gc index bc4f00b318..02fe5fe595 100644 --- a/test/decompiler/reference/jak1/levels/common/babak_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/babak_REF.gc @@ -306,9 +306,9 @@ ;; definition for method 48 of type babak ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 babak ((obj babak)) +(defmethod nav-enemy-method-48 babak ((obj babak)) (initialize-skeleton obj *babak-sg* '()) - (TODO-RENAME-45 obj *babak-nav-enemy-info*) + (init-defaults! obj *babak-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) (set! (-> obj neck ear) (the-as uint 2)) @@ -318,7 +318,7 @@ ;; definition for method 59 of type babak ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-59 babak ((obj babak)) +(defmethod nav-enemy-method-59 babak ((obj babak)) (cond ((and (and (-> obj entity) (logtest? (-> obj entity extra perm status) (entity-perm-status complete))) (logtest? (-> obj enemy-info options) (fact-options has-power-cell)) diff --git a/test/decompiler/reference/jak1/levels/common/basebutton_REF.gc b/test/decompiler/reference/jak1/levels/common/basebutton_REF.gc index 6f84af53ce..f0ed646ee9 100644 --- a/test/decompiler/reference/jak1/levels/common/basebutton_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/basebutton_REF.gc @@ -31,10 +31,10 @@ (basebutton-startup () _type_ :state 23) (basebutton-up-idle () _type_ :state 24) (reset! (_type_) float 25) - (TODO-RENAME-26 (_type_) none 26) - (TODO-RENAME-27 (_type_) collide-shape-moving 27) + (basebutton-method-26 (_type_) none 26) + (basebutton-method-27 (_type_) collide-shape-moving 27) (arm-trigger-event! (_type_) symbol 28) - (TODO-RENAME-29 (_type_ symbol entity) none 29) + (basebutton-method-29 (_type_ symbol entity) none 29) (move-to-vec-or-quat! (_type_ vector quaternion) quaternion 30) (press! (_type_ symbol) int 31) ) @@ -101,7 +101,7 @@ (('attack) (case (-> event param 1) (('flop) - (TODO-RENAME-29 self (-> self event-going-down) (-> self notify-actor)) + (basebutton-method-29 self (-> self event-going-down) (-> self notify-actor)) (sound-play "silo-button") (go-virtual basebutton-going-down) ) @@ -163,7 +163,7 @@ (suspend) (ja :num! (seek! max (-> self anim-speed))) ) - (TODO-RENAME-29 self (-> self event-down) (-> self notify-actor)) + (basebutton-method-29 self (-> self event-down) (-> self notify-actor)) (go-virtual basebutton-down-idle) (none) ) @@ -212,7 +212,7 @@ (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) (the int (* 300.0 (-> self timeout)))) (suspend) ) - (TODO-RENAME-29 self (-> self event-going-up) (-> self notify-actor)) + (basebutton-method-29 self (-> self event-going-up) (-> self notify-actor)) (sound-play "silo-button") (go-virtual basebutton-going-up) ) @@ -255,7 +255,7 @@ (suspend) (ja :num! (seek! 0.0 (-> self anim-speed))) ) - (TODO-RENAME-29 self (-> self event-up) (-> self notify-actor)) + (basebutton-method-29 self (-> self event-up) (-> self notify-actor)) (go-virtual basebutton-up-idle) (none) ) @@ -288,7 +288,7 @@ ) ;; definition for method 29 of type basebutton -(defmethod TODO-RENAME-29 basebutton ((obj basebutton) (arg0 symbol) (arg1 entity)) +(defmethod basebutton-method-29 basebutton ((obj basebutton) (arg0 symbol) (arg1 entity)) (with-pp (when arg0 (cond @@ -341,7 +341,7 @@ ) ;; definition for method 26 of type basebutton -(defmethod TODO-RENAME-26 basebutton ((obj basebutton)) +(defmethod basebutton-method-26 basebutton ((obj basebutton)) (initialize-skeleton obj *generic-button-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (ja-channel-set! 1) @@ -376,7 +376,7 @@ ) ;; definition for method 27 of type basebutton -(defmethod TODO-RENAME-27 basebutton ((obj basebutton)) +(defmethod basebutton-method-27 basebutton ((obj basebutton)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -433,7 +433,7 @@ (set! (-> obj button-id) (actor-count-before (-> obj link))) ) ) - (TODO-RENAME-27 obj) + (basebutton-method-27 obj) (process-drawable-from-entity! obj arg0) (let ((v1-16 #f)) (if (and (-> obj entity) (logtest? (-> obj entity extra perm status) (entity-perm-status complete))) @@ -447,7 +447,7 @@ (nav-mesh-connect obj (-> obj root-override) (the-as nav-control #f)) ) (arm-trigger-event! obj) - (TODO-RENAME-26 obj) + (basebutton-method-26 obj) (go (method-of-object obj basebutton-startup)) (none) ) @@ -465,12 +465,12 @@ (if arg0 (set! (-> self entity) arg0) ) - (TODO-RENAME-27 self) + (basebutton-method-27 self) (set! (-> self root-override trans quad) (-> arg1 quad)) (quaternion-copy! (-> self root-override quat) arg2) (set-vector! (-> self root-override scale) 1.0 1.0 1.0 1.0) (arm-trigger-event! self) - (TODO-RENAME-26 self) + (basebutton-method-26 self) (go-virtual basebutton-startup) (none) ) diff --git a/test/decompiler/reference/jak1/levels/common/baseplat_REF.gc b/test/decompiler/reference/jak1/levels/common/baseplat_REF.gc index 046be8c459..03556d8c7d 100644 --- a/test/decompiler/reference/jak1/levels/common/baseplat_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/baseplat_REF.gc @@ -13,13 +13,13 @@ :size-assert #xe4 :flag-assert #x1b008000e4 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) none 22) + (baseplat-method-20 (_type_) none 20) + (baseplat-method-21 (_type_) none 21) + (baseplat-method-22 (_type_) none 22) (get-unlit-skel (_type_) skeleton-group 23) - (dummy-24 (_type_) none 24) - (TODO-RENAME-25 (_type_) sparticle-launch-group 25) - (dummy-26 (_type_) none 26) + (baseplat-method-24 (_type_) none 24) + (baseplat-method-25 (_type_) sparticle-launch-group 25) + (baseplat-method-26 (_type_) none 26) ) ) @@ -37,7 +37,7 @@ ;; definition for method 21 of type baseplat ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 baseplat ((obj baseplat)) +(defmethod baseplat-method-21 baseplat ((obj baseplat)) (logior! (-> obj skel status) (janim-status inited)) (set! (-> obj basetrans quad) (-> obj root-override trans quad)) (set! (-> obj bouncing) #f) @@ -47,7 +47,7 @@ ;; definition for method 22 of type baseplat ;; INFO: Return type mismatch int vs none. -(defmethod dummy-22 baseplat ((obj baseplat)) +(defmethod baseplat-method-22 baseplat ((obj baseplat)) (activate! (-> obj smush) -1.0 60 150 1.0 1.0) (set! (-> obj bouncing) #t) (logclear! (-> obj mask) (process-mask sleep)) @@ -100,20 +100,20 @@ ;; definition for function plat-post ;; INFO: Return type mismatch int vs none. (defbehavior plat-post baseplat () - (dummy-20 self) + (baseplat-method-20 self) (rider-post) (none) ) ;; definition for method 25 of type baseplat ;; INFO: Return type mismatch int vs sparticle-launch-group. -(defmethod TODO-RENAME-25 baseplat ((obj baseplat)) +(defmethod baseplat-method-25 baseplat ((obj baseplat)) (the-as sparticle-launch-group 0) ) ;; definition for method 20 of type baseplat ;; INFO: Return type mismatch object vs none. -(defmethod dummy-20 baseplat ((obj baseplat)) +(defmethod baseplat-method-20 baseplat ((obj baseplat)) (if (nonzero? (-> obj part)) (spawn (-> obj part) (-> obj root-override trans)) ) @@ -125,7 +125,7 @@ (defbehavior plat-event baseplat ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) (the-as object (case arg2 (('bonk) - (dummy-22 self) + (baseplat-method-22 self) ) ) ) @@ -155,9 +155,9 @@ (door-opening () _type_ :state 21) (door-open () _type_ :state 22) (door-closing () _type_ :state 23) - (TODO-RENAME-24 (_type_) none 24) - (TODO-RENAME-25 (_type_) none 25) - (dummy-26 (_type_) none 26) + (eco-door-method-24 (_type_) none 24) + (eco-door-method-25 (_type_) none 25) + (eco-door-method-26 (_type_) none 26) ) ) @@ -220,7 +220,7 @@ eco-door-event-handler (vector-vector-distance (-> self root-override trans) (-> *target* control trans)) ) ) - (dummy-26 self) + (eco-door-method-26 self) (if (and (not (-> self locked)) (or (and (-> self entity) (logtest? (-> self entity extra perm status) (entity-perm-status complete))) (send-event *target* 'query 'powerup (pickup-type eco-blue)) @@ -331,7 +331,7 @@ eco-door-event-handler ;; definition for method 26 of type eco-door ;; INFO: Return type mismatch int vs none. -(defmethod dummy-26 eco-door ((obj eco-door)) +(defmethod eco-door-method-26 eco-door ((obj eco-door)) (when (-> obj state-actor) (if (logtest? (-> obj state-actor extra perm status) (entity-perm-status complete)) (set! (-> obj locked) (logtest? (-> obj flags) (eco-door-flags ecdf01))) @@ -344,7 +344,7 @@ eco-door-event-handler ;; definition for method 24 of type eco-door ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-24 eco-door ((obj eco-door)) +(defmethod eco-door-method-24 eco-door ((obj eco-door)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -365,7 +365,7 @@ eco-door-event-handler ;; definition for method 25 of type eco-door ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-25 eco-door ((obj eco-door)) +(defmethod eco-door-method-25 eco-door ((obj eco-door)) 0 (none) ) @@ -373,7 +373,7 @@ eco-door-event-handler ;; definition for method 11 of type eco-door ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! eco-door ((obj eco-door) (arg0 entity-actor)) - (TODO-RENAME-24 obj) + (eco-door-method-24 obj) (process-drawable-from-entity! obj arg0) (let ((f0-0 (res-lump-float (-> obj entity) 'scale :default 1.0))) (set-vector! (-> obj root-override scale) f0-0 f0-0 f0-0 1.0) @@ -389,13 +389,13 @@ eco-door-event-handler ) (set! (-> obj locked) #f) (set! (-> obj flags) (res-lump-value arg0 'flags eco-door-flags)) - (dummy-26 obj) + (eco-door-method-26 obj) (set! (-> obj auto-close) (logtest? (-> obj flags) (eco-door-flags auto-close))) (set! (-> obj one-way) (logtest? (-> obj flags) (eco-door-flags one-way))) (vector-z-quaternion! (-> obj out-dir) (-> obj root-override quat)) (set! (-> obj out-dir w) (- (vector-dot (-> obj out-dir) (-> obj root-override trans)))) (update-transforms! (-> obj root-override)) - (TODO-RENAME-25 obj) + (eco-door-method-25 obj) (if (and (not (-> obj auto-close)) (-> obj entity) (logtest? (-> obj entity extra perm status) (entity-perm-status complete)) diff --git a/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc b/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc index 25d9fd2064..6eb04baaf4 100644 --- a/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/battlecontroller_REF.gc @@ -82,14 +82,14 @@ :size-assert #x27c :flag-assert #x1d0210027c (:methods - (dummy-20 () none 20) + (battlecontroller-method-20 () none 20) (battlecontroller-idle () _type_ :state 21) (battlecontroller-play-intro-camera () _type_ :state 22) - (dummy-23 () none 23) + (battlecontroller-method-23 () none 23) (battlecontroller-active () _type_ :state 24) - (dummy-25 () none 25) + (battlecontroller-method-25 () none 25) (battlecontroller-die () _type_ :state 26) - (TODO-RENAME-27 (_type_) none 27) + (battlecontroller-method-27 (_type_) none 27) (cleanup-if-finished! (_type_) none 28) ) ) @@ -169,7 +169,7 @@ battlecontroller-default-event-handler ;; INFO: Return type mismatch int vs none. (defbehavior battlecontroller-draw-debug battlecontroller () (dotimes (gp-0 (-> self spawner-count)) - (dummy-9 (-> self spawner-array gp-0 path)) + (debug-draw (-> self spawner-array gp-0 path)) ) 0 (none) @@ -717,7 +717,7 @@ battlecontroller-default-event-handler ;; definition for method 27 of type battlecontroller ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-27 battlecontroller ((obj battlecontroller)) +(defmethod battlecontroller-method-27 battlecontroller ((obj battlecontroller)) (local-vars (sv-16 res-tag)) (set! (-> obj fact) (new 'process 'fact-info obj (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)) @@ -876,7 +876,7 @@ battlecontroller-default-event-handler (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-27 obj) + (battlecontroller-method-27 obj) (cleanup-if-finished! obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/common/dark-eco-pool_REF.gc b/test/decompiler/reference/jak1/levels/common/dark-eco-pool_REF.gc index 390ac93a87..ca725c9070 100644 --- a/test/decompiler/reference/jak1/levels/common/dark-eco-pool_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/dark-eco-pool_REF.gc @@ -93,8 +93,8 @@ ;; definition for method 25 of type dark-eco-pool ;; INFO: Return type mismatch object vs none. -(defmethod TODO-RENAME-25 dark-eco-pool ((obj dark-eco-pool)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-25))) +(defmethod water-vol-method-25 dark-eco-pool ((obj dark-eco-pool)) + (let ((t9-0 (method-of-type water-anim water-vol-method-25))) (t9-0 obj) ) (logclear! (-> obj flags) (water-flags wt23)) @@ -119,8 +119,8 @@ ;; definition for method 22 of type dark-eco-pool ;; INFO: Return type mismatch ripple-wave-set vs none. -(defmethod TODO-RENAME-22 dark-eco-pool ((obj dark-eco-pool)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 dark-eco-pool ((obj dark-eco-pool)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((gp-0 (new 'process 'ripple-control))) diff --git a/test/decompiler/reference/jak1/levels/common/joint-exploder_REF.gc b/test/decompiler/reference/jak1/levels/common/joint-exploder_REF.gc index e6e20cd1a2..2c6cf4150c 100644 --- a/test/decompiler/reference/jak1/levels/common/joint-exploder_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/joint-exploder_REF.gc @@ -164,15 +164,15 @@ :size-assert #x210 :flag-assert #x1d01a00210 (:methods - (TODO-RENAME-20 (_type_ joint-exploder-list int) int 20) - (TODO-RENAME-21 (_type_ joint-exploder-list joint-exploder-joint) none 21) - (TODO-RENAME-22 (_type_ joint-exploder-list) symbol 22) - (TODO-RENAME-23 (_type_) symbol 23) - (TODO-RENAME-24 (_type_ joint-exploder-list int) int 24) - (TODO-RENAME-25 (_type_ joint-exploder-list) symbol 25) - (TODO-RENAME-26 (_type_ joint-exploder-list int) int 26) - (TODO-RENAME-27 (_type_ joint-exploder-list int) joint-exploder-list 27) - (TODO-RENAME-28 (_type_ joint-exploder-list) none 28) + (joint-exploder-method-20 (_type_ joint-exploder-list int) int 20) + (joint-exploder-method-21 (_type_ joint-exploder-list joint-exploder-joint) none 21) + (joint-exploder-method-22 (_type_ joint-exploder-list) symbol 22) + (joint-exploder-method-23 (_type_) symbol 23) + (joint-exploder-method-24 (_type_ joint-exploder-list int) int 24) + (joint-exploder-method-25 (_type_ joint-exploder-list) symbol 25) + (joint-exploder-method-26 (_type_ joint-exploder-list int) int 26) + (joint-exploder-method-27 (_type_ joint-exploder-list int) joint-exploder-list 27) + (joint-exploder-method-28 (_type_ joint-exploder-list) none 28) ) (:states joint-exploder-shatter @@ -238,8 +238,8 @@ ;; definition for method 24 of type joint-exploder ;; INFO: Used lq/sq -(defmethod TODO-RENAME-24 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) - (let ((v0-0 (TODO-RENAME-26 obj arg0 arg1))) +(defmethod joint-exploder-method-24 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) + (let ((v0-0 (joint-exploder-method-26 obj arg0 arg1))) (let* ((v1-1 (-> obj joints)) (v1-2 (-> v1-1 joint arg1)) ) @@ -253,7 +253,7 @@ ) ;; definition for method 26 of type joint-exploder -(defmethod TODO-RENAME-26 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) +(defmethod joint-exploder-method-26 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) (let* ((v1-0 (-> obj joints)) (a2-1 (-> v1-0 joint arg1)) (a0-4 (-> a2-1 prev)) @@ -285,7 +285,7 @@ ) ;; definition for method 20 of type joint-exploder -(defmethod TODO-RENAME-20 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) +(defmethod joint-exploder-method-20 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) (let* ((v1-0 (-> obj joints)) (a3-0 (-> v1-0 joint arg1)) (a0-4 (-> arg0 head)) @@ -303,7 +303,7 @@ ;; definition for method 21 of type joint-exploder ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-21 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 joint-exploder-joint)) +(defmethod joint-exploder-method-21 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 joint-exploder-joint)) (let ((a1-1 (-> arg1 mat vector 3))) (cond ((-> arg0 bbox-valid?) @@ -322,7 +322,7 @@ ;; definition for method 27 of type joint-exploder ;; INFO: Used lq/sq -(defmethod TODO-RENAME-27 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) +(defmethod joint-exploder-method-27 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list) (arg1 int)) (local-vars (sv-16 int) (sv-32 int) (sv-48 int)) (let ((s4-0 (the-as joint-exploder-list #f))) (let ((v1-0 1)) @@ -358,13 +358,13 @@ (let ((s0-0 (-> s2-0 joint s1-0))) (cond ((>= (-> s0-0 mat vector 3 x) f30-0) - (set! sv-16 (TODO-RENAME-26 obj arg0 s1-0)) - (TODO-RENAME-20 obj (the-as joint-exploder-list s3-0) s1-0) + (set! sv-16 (joint-exploder-method-26 obj arg0 s1-0)) + (joint-exploder-method-20 obj (the-as joint-exploder-list s3-0) s1-0) (set! s1-0 sv-16) - (TODO-RENAME-21 obj (the-as joint-exploder-list s3-0) s0-0) + (joint-exploder-method-21 obj (the-as joint-exploder-list s3-0) s0-0) ) (else - (TODO-RENAME-21 obj arg0 s0-0) + (joint-exploder-method-21 obj arg0 s0-0) (set! s1-0 (-> s0-0 next)) ) ) @@ -378,13 +378,13 @@ (let ((s0-1 (-> s2-0 joint s1-0))) (cond ((>= (-> s0-1 mat vector 3 y) f30-1) - (set! sv-32 (TODO-RENAME-26 obj arg0 s1-0)) - (TODO-RENAME-20 obj (the-as joint-exploder-list s3-0) s1-0) + (set! sv-32 (joint-exploder-method-26 obj arg0 s1-0)) + (joint-exploder-method-20 obj (the-as joint-exploder-list s3-0) s1-0) (set! s1-0 sv-32) - (TODO-RENAME-21 obj (the-as joint-exploder-list s3-0) s0-1) + (joint-exploder-method-21 obj (the-as joint-exploder-list s3-0) s0-1) ) (else - (TODO-RENAME-21 obj arg0 s0-1) + (joint-exploder-method-21 obj arg0 s0-1) (set! s1-0 (-> s0-1 next)) ) ) @@ -398,13 +398,13 @@ (let ((s0-2 (-> s2-0 joint s1-0))) (cond ((>= (-> s0-2 mat vector 3 z) f30-2) - (set! sv-48 (TODO-RENAME-26 obj arg0 s1-0)) - (TODO-RENAME-20 obj (the-as joint-exploder-list s3-0) s1-0) + (set! sv-48 (joint-exploder-method-26 obj arg0 s1-0)) + (joint-exploder-method-20 obj (the-as joint-exploder-list s3-0) s1-0) (set! s1-0 sv-48) - (TODO-RENAME-21 obj (the-as joint-exploder-list s3-0) s0-2) + (joint-exploder-method-21 obj (the-as joint-exploder-list s3-0) s0-2) ) (else - (TODO-RENAME-21 obj arg0 s0-2) + (joint-exploder-method-21 obj arg0 s0-2) (set! s1-0 (-> s0-2 next)) ) ) @@ -420,32 +420,32 @@ ) ;; definition for method 28 of type joint-exploder -(defmethod TODO-RENAME-28 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) +(defmethod joint-exploder-method-28 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) (when (and (-> arg0 bbox-valid?) (>= (-> arg0 head) 0)) (cond ((< 20480.0 (- (-> arg0 bbox max x) (-> arg0 bbox min x))) - (let ((a1-2 (TODO-RENAME-27 obj arg0 0))) + (let ((a1-2 (joint-exploder-method-27 obj arg0 0))) (if a1-2 - (TODO-RENAME-28 obj a1-2) + (joint-exploder-method-28 obj a1-2) ) ) - (TODO-RENAME-28 obj arg0) + (joint-exploder-method-28 obj arg0) ) ((< 20480.0 (- (-> arg0 bbox max y) (-> arg0 bbox min y))) - (let ((a1-5 (TODO-RENAME-27 obj arg0 1))) + (let ((a1-5 (joint-exploder-method-27 obj arg0 1))) (if a1-5 - (TODO-RENAME-28 obj a1-5) + (joint-exploder-method-28 obj a1-5) ) ) - (TODO-RENAME-28 obj arg0) + (joint-exploder-method-28 obj arg0) ) ((< 20480.0 (- (-> arg0 bbox max z) (-> arg0 bbox min z))) - (let ((a1-8 (TODO-RENAME-27 obj arg0 2))) + (let ((a1-8 (joint-exploder-method-27 obj arg0 2))) (if a1-8 - (TODO-RENAME-28 obj a1-8) + (joint-exploder-method-28 obj a1-8) ) ) - (TODO-RENAME-28 obj arg0) + (joint-exploder-method-28 obj arg0) ) ) ) @@ -454,7 +454,7 @@ ;; definition for method 25 of type joint-exploder ;; INFO: Used lq/sq -(defmethod TODO-RENAME-25 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) +(defmethod joint-exploder-method-25 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) (set! (-> arg0 bbox-valid?) #f) (set! (-> arg0 pre-moved?) #t) (let ((s4-0 (-> obj joints)) @@ -484,10 +484,10 @@ ((or (< (-> s1-0 y) (-> obj die-if-below-y)) (< (-> obj die-if-beyond-xz-dist-sqrd) (vector-vector-xz-distance s1-0 (-> obj root trans))) ) - (set! s3-0 (TODO-RENAME-24 obj arg0 s3-0)) + (set! s3-0 (joint-exploder-method-24 obj arg0 s3-0)) ) (else - (TODO-RENAME-21 obj arg0 s2-0) + (joint-exploder-method-21 obj arg0 s2-0) (set! s3-0 (-> s2-0 next)) ) ) @@ -499,7 +499,7 @@ ;; definition for method 22 of type joint-exploder ;; INFO: Used lq/sq -(defmethod TODO-RENAME-22 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) +(defmethod joint-exploder-method-22 joint-exploder ((obj joint-exploder) (arg0 joint-exploder-list)) (fill-using-bounding-box *collide-cache* (-> arg0 bbox) @@ -572,9 +572,9 @@ (let ((s5-0 (-> self lists gp-0))) (when (>= (-> s5-0 head) 0) (when (not (-> s5-0 pre-moved?)) - (TODO-RENAME-25 self s5-0) + (joint-exploder-method-25 self s5-0) (if (nonzero? gp-0) - (TODO-RENAME-28 self s5-0) + (joint-exploder-method-28 self s5-0) ) ) ) @@ -591,7 +591,7 @@ (add-box! gp-1 (-> s4-0 bbox)) ) (if (nonzero? s5-1) - (TODO-RENAME-22 self s4-0) + (joint-exploder-method-22 self s4-0) ) ) ) @@ -625,7 +625,7 @@ ;; definition for method 23 of type joint-exploder ;; INFO: Used lq/sq -(defmethod TODO-RENAME-23 joint-exploder ((obj joint-exploder)) +(defmethod joint-exploder-method-23 joint-exploder ((obj joint-exploder)) (let ((gp-0 (-> obj joints))) (dotimes (s4-0 (-> gp-0 num-joints)) (let ((v1-2 (-> obj static-params joints s4-0)) @@ -756,7 +756,7 @@ (ja-channel-set! 1) (ja :group! (-> self anim) :num! min) (ja-post) - (TODO-RENAME-23 self) + (joint-exploder-method-23 self) (set! (-> self die-if-below-y) (+ -102400.0 (-> self root trans y))) (set! (-> self skel postbind-function) joint-exploder-joint-callback) (go joint-exploder-shatter) diff --git a/test/decompiler/reference/jak1/levels/common/nav-enemy-h_REF.gc b/test/decompiler/reference/jak1/levels/common/nav-enemy-h_REF.gc index 40dc649660..7d739495cb 100644 --- a/test/decompiler/reference/jak1/levels/common/nav-enemy-h_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/nav-enemy-h_REF.gc @@ -165,48 +165,48 @@ (nav-enemy-stare () _type_ :state 31) (nav-enemy-stop-chase () _type_ :state 32) (nav-enemy-victory () _type_ :state 33) - (dummy-34 (_type_) none 34) + (nav-enemy-method-34 (_type_) none 34) (nav-enemy-wait-for-cue () _type_ :state 35) (nav-enemy-jump-to-point () _type_ :state 36) - (TODO-RENAME-37 (_type_) none 37) - (TODO-RENAME-38 (_type_) none 38) + (nav-enemy-method-37 (_type_) none 37) + (nav-enemy-method-38 (_type_) none 38) (common-post (_type_) none 39) - (dummy-40 (_type_) none 40) - (dummy-41 (_type_) none 41) - (TODO-RENAME-42 (_type_) int 42) - (dummy-43 (_type_ process event-message-block) object 43) - (dummy-44 (_type_ process event-message-block) object 44) - (TODO-RENAME-45 (_type_ nav-enemy-info) none 45) - (TODO-RENAME-46 (_type_ float) basic 46) + (nav-enemy-method-40 (_type_) none 40) + (nav-enemy-method-41 (_type_) none 41) + (new-patrol-point! (_type_) int 42) + (attack-handler (_type_ process event-message-block) object 43) + (touch-handler (_type_ process event-message-block) object 44) + (init-defaults! (_type_ nav-enemy-info) none 45) + (target-in-range? (_type_ float) basic 46) (initialize-collision (_type_) none 47) - (TODO-RENAME-48 (_type_) none 48) - (TODO-RENAME-49 (_type_ nav-enemy-info) float 49) - (TODO-RENAME-50 (_type_ vector) symbol 50) - (dummy-51 (_type_) none 51) - (dummy-52 (_type_ vector) symbol 52) - (dummy-53 (_type_) symbol 53) - (dummy-54 (_type_ vector) symbol 54) - (dummy-55 (_type_) symbol 55) + (nav-enemy-method-48 (_type_) none 48) + (init-jm! (_type_ nav-enemy-info) float 49) + (nav-enemy-method-50 (_type_ vector) symbol 50) + (nav-enemy-method-51 (_type_) none 51) + (nav-enemy-method-52 (_type_ vector) symbol 52) + (nav-enemy-method-53 (_type_) symbol 53) + (nav-enemy-method-54 (_type_ vector) symbol 54) + (nav-enemy-method-55 (_type_) symbol 55) (set-jump-height-factor! (_type_ int) none 56) - (dummy-57 (_type_) none 57) - (dummy-58 (_type_) none 58) - (TODO-RENAME-59 (_type_) none 59) - (dummy-60 (_type_ symbol) symbol 60) + (nav-enemy-method-57 (_type_) none 57) + (nav-enemy-method-58 (_type_) none 58) + (nav-enemy-method-59 (_type_) none 59) + (nav-enemy-method-60 (_type_ symbol) symbol 60) (snow-bunny-attack () _type_ :state 61) (snow-bunny-chase-hop () _type_ :state 62) (snow-bunny-defend () _type_ :state 63) - (dummy-64 () _type_ :state 64) + (nav-enemy-method-64 () _type_ :state 64) (snow-bunny-lunge () _type_ :state 65) (snow-bunny-nav-resume () _type_ :state 66) (snow-bunny-patrol-hop () _type_ :state 67) (snow-bunny-patrol-idle () _type_ :state 68) - (dummy-69 () _type_ :state 69) + (nav-enemy-method-69 () _type_ :state 69) (snow-bunny-retreat-hop () _type_ :state 70) (snow-bunny-tune-spheres () _type_ :state 71) (nav-enemy-touch-handler (_type_ process event-message-block) object 72) (nav-enemy-attack-handler (_type_ process event-message-block) object 73) (nav-enemy-jump-blocked () _type_ :state 74) - (dummy-75 () _type_ :state 75) + (nav-enemy-method-75 () _type_ :state 75) ) ) diff --git a/test/decompiler/reference/jak1/levels/common/nav-enemy_REF.gc b/test/decompiler/reference/jak1/levels/common/nav-enemy_REF.gc index 12143c5b84..9550c41856 100644 --- a/test/decompiler/reference/jak1/levels/common/nav-enemy_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/nav-enemy_REF.gc @@ -55,7 +55,7 @@ ) ;; definition for method 42 of type nav-enemy -(defmethod TODO-RENAME-42 nav-enemy ((obj nav-enemy)) +(defmethod new-patrol-point! nav-enemy ((obj nav-enemy)) (local-vars (v1-11 symbol)) (if (<= (-> obj path curve num-cverts) 0) (go process-drawable-art-error "no path") @@ -118,7 +118,7 @@ ) ;; definition for method 44 of type nav-enemy -(defmethod dummy-44 nav-enemy ((obj nav-enemy) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler nav-enemy ((obj nav-enemy) (arg0 process) (arg1 event-message-block)) (if (and (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf6)) ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) @@ -153,7 +153,7 @@ ) ;; definition for method 43 of type nav-enemy -(defmethod dummy-43 nav-enemy ((obj nav-enemy) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler nav-enemy ((obj nav-enemy) (arg0 process) (arg1 event-message-block)) (cond ((logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf5)) (send-event arg0 'get-attack-count 1) @@ -161,7 +161,7 @@ (go (method-of-object obj nav-enemy-die)) ) (else - (dummy-44 obj arg0 arg1) + (touch-handler obj arg0 arg1) ) ) ) @@ -193,11 +193,11 @@ (case arg2 (('touch) (set! (-> self touch-time) (-> *display* base-frame-counter)) - (dummy-44 self arg0 arg3) + (touch-handler self arg0 arg3) ) (('attack) (nav-enemy-set-hit-from-direction arg0) - (dummy-43 self arg0 arg3) + (attack-handler self arg0 arg3) ) (('instant-death) (let ((gp-1 (-> self hit-from-dir))) @@ -284,8 +284,8 @@ nav-enemy-default-event-handler ;; definition for method 40 of type nav-enemy ;; INFO: Return type mismatch int vs none. -(defmethod dummy-40 nav-enemy ((obj nav-enemy)) - (dummy-11 (-> obj nav) (-> obj nav target-pos)) +(defmethod nav-enemy-method-40 nav-enemy ((obj nav-enemy)) + (nav-control-method-11 (-> obj nav) (-> obj nav target-pos)) 0 (none) ) @@ -293,7 +293,7 @@ nav-enemy-default-event-handler ;; definition for method 41 of type nav-enemy ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-41 nav-enemy ((obj nav-enemy)) +(defmethod nav-enemy-method-41 nav-enemy ((obj nav-enemy)) (cond ((-> obj nav-info use-align) (align-vel-and-quat-only! @@ -345,7 +345,7 @@ nav-enemy-default-event-handler ;; definition for method 37 of type nav-enemy ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-37 nav-enemy ((obj nav-enemy)) +(defmethod nav-enemy-method-37 nav-enemy ((obj nav-enemy)) (when (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags enable-travel)) (if (or (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf7)) (logtest? (nav-control-flags navcf19) (-> obj nav flags)) @@ -365,7 +365,7 @@ nav-enemy-default-event-handler ;; definition for method 38 of type nav-enemy ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-38 nav-enemy ((obj nav-enemy)) +(defmethod nav-enemy-method-38 nav-enemy ((obj nav-enemy)) (if (-> obj nav-info move-to-ground) (integrate-for-enemy-with-move-to-ground! (-> obj collide-info) @@ -376,7 +376,7 @@ nav-enemy-default-event-handler (-> obj nav-info hover-if-no-ground) (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf15)) ) - (dummy-58 (-> obj collide-info) (-> obj collide-info transv)) + (collide-shape-moving-method-58 (-> obj collide-info) (-> obj collide-info transv)) ) 0 (none) @@ -388,10 +388,10 @@ nav-enemy-default-event-handler (cond ((logtest? (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate)) (compute-alignment! (-> self align)) - (dummy-40 self) - (dummy-41 self) - (TODO-RENAME-37 self) - (TODO-RENAME-38 self) + (nav-enemy-method-40 self) + (nav-enemy-method-41 self) + (nav-enemy-method-37 self) + (nav-enemy-method-38 self) (nav-enemy-common-post) ) (else @@ -424,7 +424,7 @@ nav-enemy-default-event-handler (logior! (-> self nav flags) (nav-control-flags navcf10)) (nav-enemy-get-new-patrol-point) ) - (dummy-19 + (nav-control-method-19 (-> self nav) (-> self nav target-pos) (-> self collide-info) @@ -461,7 +461,7 @@ nav-enemy-default-event-handler (set! (-> self nav travel quad) (-> gp-1 quad)) ) (vector-normalize! (-> self nav travel) 409600.0) - (dummy-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) + (nav-control-method-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) (vector+! (-> self nav target-pos) (-> self collide-info trans) (-> self nav travel)) (nav-enemy-travel-post) 0 @@ -548,7 +548,7 @@ nav-enemy-default-event-handler ) ;; definition for method 46 of type nav-enemy -(defmethod TODO-RENAME-46 nav-enemy ((obj nav-enemy) (arg0 float)) +(defmethod target-in-range? nav-enemy ((obj nav-enemy) (arg0 float)) (and *target* (not (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) @@ -573,7 +573,7 @@ nav-enemy-default-event-handler ) ) (else - (when (or (TODO-RENAME-46 self (-> self nav-info notice-distance)) + (when (or (target-in-range? self (-> self nav-info notice-distance)) (and (-> self nav-info use-proximity-notice) *target* (>= (-> self nav-info proximity-notice-distance) @@ -618,13 +618,13 @@ nav-enemy-default-event-handler ;; definition for function nav-enemy-test-nav-mesh-intersection-xz? ;; INFO: Return type mismatch nav-poly vs symbol. (defbehavior nav-enemy-test-nav-mesh-intersection-xz? nav-enemy ((arg0 vector)) - (the-as symbol (dummy-16 (-> self nav) arg0)) + (the-as symbol (nav-control-method-16 (-> self nav) arg0)) ) ;; definition for function nav-enemy-test-point-in-nav-mesh? ;; INFO: Return type mismatch structure vs symbol. (defbehavior nav-enemy-test-point-in-nav-mesh? nav-enemy ((arg0 vector)) - (the-as symbol (and (dummy-16 (-> self nav) arg0) + (the-as symbol (and (nav-control-method-16 (-> self nav) arg0) (< (-> arg0 y) (+ (-> self collide-info trans y) (-> self enemy-info notice-top))) ) ) @@ -639,7 +639,7 @@ nav-enemy-default-event-handler ;; definition for function nav-enemy-get-new-patrol-point (defbehavior nav-enemy-get-new-patrol-point nav-enemy () - (TODO-RENAME-42 self) + (new-patrol-point! self) 0 ) @@ -991,7 +991,7 @@ nav-enemy-default-event-handler ) (set! (-> gp-0 target-pos quad) (-> v1-10 quad)) ) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (set! (-> self rotate-speed) (-> self nav-info run-rotate-speed)) (set! (-> self turn-time) (-> self nav-info run-turn-time)) (none) @@ -1145,7 +1145,7 @@ nav-enemy-default-event-handler ) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf13)) ) - (if (or (not (TODO-RENAME-46 self (-> self nav-info stop-chase-distance))) + (if (or (not (target-in-range? self (-> self nav-info stop-chase-distance))) (logtest? (-> self nav-enemy-flags) (nav-enemy-flags navenmf13)) ) (go-virtual nav-enemy-stop-chase) @@ -1206,7 +1206,7 @@ nav-enemy-default-event-handler (if (logtest? (-> *target* state-flags) (state-flags do-not-notice)) (go-virtual nav-enemy-patrol) ) - (if (and (TODO-RENAME-46 self (-> self nav-info notice-distance)) (not (nav-enemy-frustrated?))) + (if (and (target-in-range? self (-> self nav-info notice-distance)) (not (nav-enemy-frustrated?))) (go-virtual nav-enemy-chase) ) (if (or (or (not *target*) (< (-> self enemy-info idle-distance) @@ -1269,7 +1269,7 @@ nav-enemy-default-event-handler (go-virtual nav-enemy-patrol) ) (cond - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (if (and (>= (- (-> *display* base-frame-counter) (-> self notice-time)) (-> self reaction-time)) (not (nav-enemy-frustrated?)) ) @@ -1327,7 +1327,7 @@ nav-enemy-default-event-handler ) :trans (behavior () (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.1)) - (if (TODO-RENAME-46 self (-> self nav-info notice-distance)) + (if (target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) ) ) @@ -1617,7 +1617,7 @@ nav-enemy-default-event-handler :event nav-enemy-jump-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (if (and (-> self nav-info use-jump-blocked) (TODO-RENAME-50 self (-> self event-param-point))) + (if (and (-> self nav-info use-jump-blocked) (nav-enemy-method-50 self (-> self event-param-point))) (go-virtual nav-enemy-jump-blocked) ) (nav-enemy-initialize-jump (-> self event-param-point)) @@ -1631,7 +1631,7 @@ nav-enemy-default-event-handler (nav-enemy-execute-jump) (let ((a1-0 (-> self nav user-poly))) (if (not a1-0) - (set! a1-0 (dummy-16 (-> self nav) (-> self jump-dest))) + (set! a1-0 (nav-control-method-16 (-> self nav) (-> self jump-dest))) ) (if a1-0 (set-current-poly! (-> self nav) a1-0) @@ -1647,7 +1647,7 @@ nav-enemy-default-event-handler ;; INFO: Used lq/sq (defbehavior nav-enemy-jump-land-post nav-enemy () (compute-alignment! (-> self align)) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (seek! (-> self target-speed) (-> self nav-info run-travel-speed) 2048.0) (set! (-> self momentum-speed) (-> self target-speed)) (let* ((f0-7 @@ -1845,11 +1845,11 @@ nav-enemy-default-event-handler ;; definition for method 45 of type nav-enemy ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-45 nav-enemy ((obj nav-enemy) (arg0 nav-enemy-info)) +(defmethod init-defaults! nav-enemy ((obj nav-enemy) (arg0 nav-enemy-info)) (set! (-> obj rand-gen) (new 'process 'random-generator)) (set! (-> obj rand-gen seed) (the-as uint #x666edd1e)) (set! (-> obj mask) (the-as process-mask (logior (process-mask enemy) (-> obj mask)))) - (TODO-RENAME-49 obj arg0) + (init-jm! obj arg0) (if (-> obj draw shadow) (set! (-> obj draw shadow-ctrl) (new @@ -1868,7 +1868,7 @@ nav-enemy-default-event-handler (set! (-> obj nav) (new 'process 'nav-control (-> obj collide-info) 16 (-> arg0 nav-nearest-y-threshold))) (logior! (-> obj nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7)) (set! (-> obj nav gap-event) 'jump) - (TODO-RENAME-26 (-> obj nav)) + (nav-control-method-26 (-> obj nav)) (set! (-> obj path) (new 'process 'path-control obj 'path 0.0)) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) (set! (-> obj enemy-info) @@ -1882,7 +1882,7 @@ nav-enemy-default-event-handler ) ;; definition for method 49 of type nav-enemy -(defmethod TODO-RENAME-49 nav-enemy ((obj nav-enemy) (arg0 nav-enemy-info)) +(defmethod init-jm! nav-enemy ((obj nav-enemy) (arg0 nav-enemy-info)) (set! (-> obj nav-info) arg0) (set! (-> obj rotate-speed) (-> obj nav-info walk-rotate-speed)) (set! (-> obj turn-time) (-> obj nav-info walk-turn-time)) @@ -1914,7 +1914,7 @@ nav-enemy-default-event-handler ) (vector-identity! (-> self collide-info scale)) (set! (-> self entity) (-> arg0 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf12)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (go-virtual nav-enemy-wait-for-cue) @@ -1930,14 +1930,14 @@ nav-enemy-default-event-handler ;; definition for method 48 of type nav-enemy ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 nav-enemy ((obj nav-enemy)) +(defmethod nav-enemy-method-48 nav-enemy ((obj nav-enemy)) 0 (none) ) ;; definition for method 59 of type nav-enemy ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-59 nav-enemy ((obj nav-enemy)) +(defmethod nav-enemy-method-59 nav-enemy ((obj nav-enemy)) (go (method-of-object obj nav-enemy-idle)) 0 (none) @@ -1948,20 +1948,20 @@ nav-enemy-default-event-handler (defmethod init-from-entity! nav-enemy ((obj nav-enemy) (arg0 entity-actor)) (initialize-collision obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-48 obj) - (TODO-RENAME-59 obj) + (nav-enemy-method-48 obj) + (nav-enemy-method-59 obj) 0 (none) ) ;; definition for method 50 of type nav-enemy ;; INFO: Used lq/sq -(defmethod TODO-RENAME-50 nav-enemy ((obj nav-enemy) (arg0 vector)) +(defmethod nav-enemy-method-50 nav-enemy ((obj nav-enemy) (arg0 vector)) (let ((s4-0 (new 'stack-no-clear 'vector))) (set! (-> s4-0 quad) (-> obj collide-info trans quad)) (set! (-> obj collide-info trans quad) (-> arg0 quad)) (let ((gp-0 (-> obj nav))) - (TODO-RENAME-28 gp-0 (the-as collide-kind -1)) + (nav-control-method-28 gp-0 (the-as collide-kind -1)) (set! (-> obj collide-info trans quad) (-> s4-0 quad)) (let* ((v1-8 (-> gp-0 mesh origin)) (f0-1 (- (-> arg0 x) (-> v1-8 x))) diff --git a/test/decompiler/reference/jak1/levels/common/orb-cache_REF.gc b/test/decompiler/reference/jak1/levels/common/orb-cache_REF.gc index 7dbf45a09d..494726d809 100644 --- a/test/decompiler/reference/jak1/levels/common/orb-cache_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/orb-cache_REF.gc @@ -105,7 +105,7 @@ ;; definition for method 22 of type orb-cache-top ;; INFO: Return type mismatch int vs none. -(defmethod dummy-22 orb-cache-top ((obj orb-cache-top)) +(defmethod baseplat-method-22 orb-cache-top ((obj orb-cache-top)) (if (< 4096.0 (- (-> obj basetrans y) (-> obj root-pos))) (activate! (-> obj smush) -1.0 60 150 1.0 1.0) (activate! (-> obj smush) -0.5 60 150 1.0 1.0) @@ -346,7 +346,7 @@ (initialize-skeleton obj *orb-cache-top-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-override)) - (dummy-21 obj) + (baseplat-method-21 obj) (set! (-> obj money) (res-lump-value (-> obj entity) 'orb-cache-count int :default (the-as uint128 20))) (set! (-> obj active-distance) 61440.0) (set! (-> obj inactive-distance) 245760.0) diff --git a/test/decompiler/reference/jak1/levels/common/plat-button_REF.gc b/test/decompiler/reference/jak1/levels/common/plat-button_REF.gc index c4d0a2e1f7..6f8bbc9762 100644 --- a/test/decompiler/reference/jak1/levels/common/plat-button_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/plat-button_REF.gc @@ -28,12 +28,12 @@ (plat-button-move-upward () _type_ :state 24) (plat-button-teleport-to-other-end () _type_ :state 25) (can-activate? (_type_) symbol 26) - (TODO-RENAME-27 (_type_) none 27) - (TODO-RENAME-28 (_type_) collide-shape-moving 28) + (plat-button-method-27 (_type_) none 27) + (plat-button-method-28 (_type_) collide-shape-moving 28) (can-target-move? (_type_) none 29) (should-teleport? (_type_) symbol 30) - (TODO-RENAME-31 (_type_) none 31) - (TODO-RENAME-32 (_type_) none 32) + (plat-button-method-31 (_type_) none 31) + (plat-button-method-32 (_type_) none 32) ) ) @@ -358,7 +358,7 @@ ) ;; definition for method 28 of type plat-button -(defmethod TODO-RENAME-28 plat-button ((obj plat-button)) +(defmethod plat-button-method-28 plat-button ((obj plat-button)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -408,7 +408,7 @@ ;; definition for method 27 of type plat-button ;; INFO: Return type mismatch symbol vs none. -(defmethod TODO-RENAME-27 plat-button ((obj plat-button)) +(defmethod plat-button-method-27 plat-button ((obj plat-button)) (ja-channel-set! 1) (cond ((can-activate? obj) @@ -441,7 +441,7 @@ ;; definition for method 31 of type plat-button ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 plat-button ((obj plat-button)) +(defmethod plat-button-method-31 plat-button ((obj plat-button)) (initialize-skeleton obj *plat-button-sg* '()) 0 (none) @@ -449,7 +449,7 @@ ;; definition for method 32 of type plat-button ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-32 plat-button ((obj plat-button)) +(defmethod plat-button-method-32 plat-button ((obj plat-button)) (go (method-of-object obj plat-button-idle)) 0 (none) @@ -475,10 +475,10 @@ ) ) (set! (-> obj bidirectional?) (nonzero? (res-lump-value arg0 'bidirectional uint128))) - (TODO-RENAME-28 obj) + (plat-button-method-28 obj) (process-drawable-from-entity! obj arg0) (logclear! (-> obj mask) (process-mask actor-pause)) - (TODO-RENAME-31 obj) + (plat-button-method-31 obj) (logior! (-> obj skel status) (janim-status inited)) (set! (-> obj spawn-pos quad) (-> obj root-override trans quad)) (set! (-> obj path) (new 'process 'curve-control obj 'path -1000000000.0)) @@ -491,7 +491,7 @@ (set! (-> obj sound-id) (new-sound-id)) (set! (-> obj allow-auto-kill) #t) (can-target-move? obj) - (TODO-RENAME-27 obj) - (TODO-RENAME-32 obj) + (plat-button-method-27 obj) + (plat-button-method-32 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/common/plat-eco_REF.gc b/test/decompiler/reference/jak1/levels/common/plat-eco_REF.gc index 42f8eadb73..d1d7120535 100644 --- a/test/decompiler/reference/jak1/levels/common/plat-eco_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/plat-eco_REF.gc @@ -240,7 +240,7 @@ ;; definition for method 24 of type plat-eco ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 plat-eco ((obj plat-eco)) +(defmethod baseplat-method-24 plat-eco ((obj plat-eco)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -281,7 +281,7 @@ (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) (set! (-> obj notice-dist) (res-lump-float arg0 'notice-dist :default -1.0)) (set! (-> obj link) (new 'process 'actor-link-info obj)) - (dummy-24 obj) + (baseplat-method-24 obj) (process-drawable-from-entity! obj arg0) (let ((s4-0 (get-unlit-skel obj)) (s5-1 (get-lit-skel obj)) @@ -306,8 +306,8 @@ (set! (-> obj path-pos) (get-current-phase-with-mirror (-> obj sync))) (eval-path-curve! (-> obj path) (-> obj root-override trans) (-> obj path-pos) 'interp) (set! (-> obj sound-id) (new-sound-id)) - (dummy-26 obj) - (dummy-21 obj) + (baseplat-method-26 obj) + (baseplat-method-21 obj) (if (or (and (-> obj entity) (logtest? (-> obj entity extra perm status) (entity-perm-status complete))) (< (-> obj notice-dist) 0.0) ) diff --git a/test/decompiler/reference/jak1/levels/common/plat_REF.gc b/test/decompiler/reference/jak1/levels/common/plat_REF.gc index 6d938c0f3c..6c42e970ff 100644 --- a/test/decompiler/reference/jak1/levels/common/plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/plat_REF.gc @@ -67,7 +67,7 @@ :flag-assert #x2100a00108 (:methods (get-lit-skel (_type_) skeleton-group 27) - (dummy-28 () none 28) + (plat-method-28 () none 28) (wad () _type_ :state 29) (plat-startup (plat) _type_ :state 30) (plat-idle () _type_ :state 31) @@ -144,7 +144,7 @@ ;; definition for method 24 of type plat ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 plat ((obj plat)) +(defmethod baseplat-method-24 plat ((obj plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -171,14 +171,14 @@ ;; definition for method 26 of type plat ;; INFO: Return type mismatch int vs none. -(defmethod dummy-26 plat ((obj plat)) +(defmethod baseplat-method-26 plat ((obj plat)) 0 (none) ) ;; definition for method 25 of type plat ;; INFO: Return type mismatch sparticle-launch-control vs sparticle-launch-group. -(defmethod TODO-RENAME-25 plat ((obj plat)) +(defmethod baseplat-method-25 plat ((obj plat)) (the-as sparticle-launch-group (when (!= (-> (if (-> obj entity) (-> obj entity extra level) (-> *level* level-default) @@ -219,7 +219,7 @@ :virtual #t :event (the-as (function process int symbol event-message-block object :behavior plat) plat-event) :trans (behavior () - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (behavior () @@ -273,13 +273,13 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! plat ((obj plat) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (dummy-24 obj) + (baseplat-method-24 obj) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj (get-unlit-skel obj) '()) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-override)) - (dummy-21 obj) - (TODO-RENAME-25 obj) + (baseplat-method-21 obj) + (baseplat-method-25 obj) (load-params! (-> obj sync) obj (the-as uint 0) 0.0 0.15 0.15) (set! (-> obj fact) (new 'process 'fact-info obj (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)) @@ -291,7 +291,7 @@ ((logtest? (-> obj path flags) (path-control-flag not-found)) (set! (-> obj path-pos) 0.0) (let ((a0-14 obj)) - (dummy-26 a0-14) + (baseplat-method-26 a0-14) (go (method-of-object obj plat-startup) a0-14) ) ) @@ -303,7 +303,7 @@ ) (eval-path-curve! (-> obj path) (-> obj root-override trans) (-> obj path-pos) 'interp) (let ((a0-18 obj)) - (dummy-26 a0-18) + (baseplat-method-26 a0-18) (go (method-of-object obj plat-startup) a0-18) ) ) @@ -311,7 +311,7 @@ (set! (-> obj path-pos) 0.0) (eval-path-curve! (-> obj path) (-> obj root-override trans) (-> obj path-pos) 'interp) (let ((a0-20 obj)) - (dummy-26 a0-20) + (baseplat-method-26 a0-20) (go (method-of-object obj plat-startup) a0-20) ) ) diff --git a/test/decompiler/reference/jak1/levels/common/rigid-body-h_REF.gc b/test/decompiler/reference/jak1/levels/common/rigid-body-h_REF.gc index 0743ea95d6..34ba645179 100644 --- a/test/decompiler/reference/jak1/levels/common/rigid-body-h_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/rigid-body-h_REF.gc @@ -27,20 +27,20 @@ :size-assert #x1a8 :flag-assert #x17000001a8 (:methods - (TODO-RENAME-9 (_type_ float float float float) none 9) - (dummy-10 (_type_ float) none 10) + (rigid-body-method-9 (_type_ float float float float) none 9) + (rigid-body-method-10 (_type_ float) none 10) (clear-force-torque! (_type_) none 11) (clear-momentum! (_type_) none 12) - (TODO-RENAME-13 (_type_ vector vector) none 13) - (TODO-RENAME-14 (_type_ vector vector) none 14) - (TODO-RENAME-15 (_type_ vector) none 15) - (TODO-RENAME-16 (_type_ vector vector float) none 16) - (TODO-RENAME-17 (_type_ vector vector) vector 17) - (TODO-RENAME-18 (_type_ vector) vector 18) - (dummy-19 (_type_) none 19) - (dummy-20 (_type_) none 20) - (TODO-RENAME-21 (_type_) none 21) - (TODO-RENAME-22 (_type_ vector quaternion float float) none 22) + (rigid-body-method-13 (_type_ vector vector) none 13) + (rigid-body-method-14 (_type_ vector vector) none 14) + (rigid-body-method-15 (_type_ vector) none 15) + (rigid-body-method-16 (_type_ vector vector float) none 16) + (rigid-body-method-17 (_type_ vector vector) vector 17) + (rigid-body-method-18 (_type_ vector) vector 18) + (print-stats (_type_) none 19) + (rigid-body-method-20 (_type_) none 20) + (rigid-body-method-21 (_type_) none 21) + (rigid-body-method-22 (_type_ vector quaternion float float) none 22) ) ) diff --git a/test/decompiler/reference/jak1/levels/common/rigid-body_REF.gc b/test/decompiler/reference/jak1/levels/common/rigid-body_REF.gc index 81d085a686..a323c9b49c 100644 --- a/test/decompiler/reference/jak1/levels/common/rigid-body_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/rigid-body_REF.gc @@ -23,9 +23,9 @@ ;; definition for method 21 of type rigid-body ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-21 rigid-body ((obj rigid-body)) +(defmethod rigid-body-method-21 rigid-body ((obj rigid-body)) (quaternion->matrix (-> obj matrix) (-> obj rotation)) - (TODO-RENAME-18 obj (-> obj matrix vector 3)) + (rigid-body-method-18 obj (-> obj matrix vector 3)) 0 (none) ) @@ -33,7 +33,7 @@ ;; definition for method 22 of type rigid-body ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-22 rigid-body ((obj rigid-body) (arg0 vector) (arg1 quaternion) (arg2 float) (arg3 float)) +(defmethod rigid-body-method-22 rigid-body ((obj rigid-body) (arg0 vector) (arg1 quaternion) (arg2 float) (arg3 float)) (clear-force-torque! obj) (clear-momentum! obj) (vector+! (-> obj position) arg0 (-> obj cm-offset-joint)) @@ -41,7 +41,7 @@ (quaternion-normalize! (-> obj rotation)) (set! (-> obj lin-momentum-damping-factor) arg2) (set! (-> obj ang-momentum-damping-factor) arg3) - (TODO-RENAME-21 obj) + (rigid-body-method-21 obj) (set! (-> obj lin-velocity quad) (-> *null-vector* quad)) (set! (-> obj ang-velocity quad) (-> *null-vector* quad)) (set! (-> obj inv-i-world vector 0 quad) (the-as uint128 0)) @@ -56,7 +56,7 @@ ;; definition for method 9 of type rigid-body ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-9 rigid-body ((obj rigid-body) (arg0 float) (arg1 float) (arg2 float) (arg3 float)) +(defmethod rigid-body-method-9 rigid-body ((obj rigid-body) (arg0 float) (arg1 float) (arg2 float) (arg3 float)) (set! (-> obj mass) arg0) (let ((f0-1 arg0)) (set! (-> obj inv-mass) (/ 1.0 f0-1)) @@ -100,7 +100,7 @@ ) ;; definition for method 17 of type rigid-body -(defmethod TODO-RENAME-17 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) +(defmethod rigid-body-method-17 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) (let ((v1-1 (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj position)))) (vector-cross! arg1 (-> obj ang-velocity) v1-1) ) @@ -131,7 +131,7 @@ ;; definition for method 10 of type rigid-body ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-10 rigid-body ((obj rigid-body) (arg0 float)) +(defmethod rigid-body-method-10 rigid-body ((obj rigid-body) (arg0 float)) (vector+*! (-> obj lin-momentum) (-> obj lin-momentum) (-> obj force) arg0) (vector+*! (-> obj ang-momentum) (-> obj ang-momentum) (-> obj torque) arg0) (vector-float*! (-> obj lin-momentum) (-> obj lin-momentum) (-> obj lin-momentum-damping-factor)) @@ -153,14 +153,14 @@ ) (quaternion-normalize! (-> obj rotation)) (quaternion->matrix (-> obj matrix) (-> obj rotation)) - (TODO-RENAME-18 obj (-> obj matrix vector 3)) + (rigid-body-method-18 obj (-> obj matrix vector 3)) 0 (none) ) ;; definition for method 13 of type rigid-body ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-13 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) +(defmethod rigid-body-method-13 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) (vector+! (-> obj force) (-> obj force) arg1) (let* ((v1-2 (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj position))) (a1-2 (vector-cross! (new 'stack-no-clear 'vector) v1-2 arg1)) @@ -173,7 +173,7 @@ ;; definition for method 16 of type rigid-body ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-16 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector) (arg2 float)) +(defmethod rigid-body-method-16 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector) (arg2 float)) (vector+! (-> obj force) (-> obj force) arg1) (let* ((a0-3 (vector-! (new 'stack-no-clear 'vector) arg0 (-> obj position))) (s4-1 (vector-cross! (new 'stack-no-clear 'vector) a0-3 arg1)) @@ -191,14 +191,14 @@ ;; definition for method 14 of type rigid-body ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-14 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) +(defmethod rigid-body-method-14 rigid-body ((obj rigid-body) (arg0 vector) (arg1 vector)) (let ((s5-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) ) (vector-rotate*! s4-0 arg1 (-> obj matrix)) (vector-rotate*! s5-0 arg0 (-> obj matrix)) (vector+! s5-0 s5-0 (-> obj position)) - (TODO-RENAME-13 obj s5-0 s4-0) + (rigid-body-method-13 obj s5-0 s4-0) ) 0 (none) @@ -206,14 +206,14 @@ ;; definition for method 15 of type rigid-body ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-15 rigid-body ((obj rigid-body) (arg0 vector)) +(defmethod rigid-body-method-15 rigid-body ((obj rigid-body) (arg0 vector)) (vector+! (-> obj force) (-> obj force) arg0) 0 (none) ) ;; definition for method 18 of type rigid-body -(defmethod TODO-RENAME-18 rigid-body ((obj rigid-body) (arg0 vector)) +(defmethod rigid-body-method-18 rigid-body ((obj rigid-body) (arg0 vector)) (let ((gp-0 (new 'stack-no-clear 'vector))) (vector-rotate*! gp-0 (-> obj cm-offset-joint) (-> obj matrix)) (vector-! arg0 (-> obj position) gp-0) @@ -223,7 +223,7 @@ ;; definition for method 19 of type rigid-body ;; INFO: Return type mismatch int vs none. -(defmethod dummy-19 rigid-body ((obj rigid-body)) +(defmethod print-stats rigid-body ((obj rigid-body)) (format #t " force ~M ~M ~M" (-> obj force x) (-> obj force y) (-> obj force z)) (format #t " torque ~f ~f ~f~%" (-> obj torque x) (-> obj torque y) (-> obj torque z)) (format #t " position ~M ~M ~M" (-> obj position x) (-> obj position y) (-> obj position z)) @@ -245,7 +245,7 @@ ;; definition for method 20 of type rigid-body ;; INFO: Return type mismatch int vs none. -(defmethod dummy-20 rigid-body ((obj rigid-body)) +(defmethod rigid-body-method-20 rigid-body ((obj rigid-body)) (format #t " force ~M ~M ~M" (-> obj force x) (-> obj force y) (-> obj force z)) (format #t " torque ~f ~f ~f~%" (-> obj torque x) (-> obj torque y) (-> obj torque z)) 0 @@ -362,19 +362,19 @@ (:methods (rigid-body-platform-idle () _type_ :state 20) (rigid-body-platform-float () _type_ :state 21) - (TODO-RENAME-22 (_type_ vector float) float 22) - (TODO-RENAME-23 (_type_ float) none 23) - (TODO-RENAME-24 (_type_ rigid-body-control-point float) none 24) - (TODO-RENAME-25 (_type_) none 25) - (TODO-RENAME-26 (_type_) none 26) - (TODO-RENAME-27 (_type_ vector) none 27) - (TODO-RENAME-28 (_type_) none 28) - (TODO-RENAME-29 (_type_ rigid-body-platform-constants) none 29) - (TODO-RENAME-30 (_type_) none 30) - (TODO-RENAME-31 (_type_) none 31) - (dummy-32 (_type_) sound-id 32) - (dummy-33 (_type_) object 33) - (TODO-RENAME-34 (_type_) none 34) + (rigid-body-platform-method-22 (_type_ vector float) float 22) + (rigid-body-platform-method-23 (_type_ float) none 23) + (rigid-body-platform-method-24 (_type_ rigid-body-control-point float) none 24) + (rigid-body-platform-method-25 (_type_) none 25) + (rigid-body-platform-method-26 (_type_) none 26) + (rigid-body-platform-method-27 (_type_ vector) none 27) + (rigid-body-platform-method-28 (_type_) none 28) + (rigid-body-platform-method-29 (_type_ rigid-body-platform-constants) none 29) + (rigid-body-platform-method-30 (_type_) none 30) + (rigid-body-platform-method-31 (_type_) none 31) + (rigid-body-platform-method-32 (_type_) sound-id 32) + (rigid-body-platform-method-33 (_type_) object 33) + (rigid-body-platform-method-34 (_type_) none 34) ) ) @@ -418,7 +418,7 @@ ) ;; definition for method 22 of type rigid-body-platform -(defmethod TODO-RENAME-22 rigid-body-platform ((obj rigid-body-platform) (arg0 vector) (arg1 float)) +(defmethod rigid-body-platform-method-22 rigid-body-platform ((obj rigid-body-platform) (arg0 vector) (arg1 float)) (let ((v1-0 (-> obj water-anim))) 0.0 (+ (the-as float (cond @@ -447,8 +447,8 @@ ;; definition for method 24 of type rigid-body-platform ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-24 rigid-body-platform ((obj rigid-body-platform) (arg0 rigid-body-control-point) (arg1 float)) - (set! (-> arg0 world-pos w) (TODO-RENAME-22 obj (-> arg0 world-pos) arg1)) +(defmethod rigid-body-platform-method-24 rigid-body-platform ((obj rigid-body-platform) (arg0 rigid-body-control-point) (arg1 float)) + (set! (-> arg0 world-pos w) (rigid-body-platform-method-22 obj (-> arg0 world-pos) arg1)) (let* ((s4-0 (new 'stack-no-clear 'vector)) (f0-2 (- (-> arg0 world-pos w) (-> arg0 world-pos y))) (f30-0 (/ f0-2 (-> obj info max-buoyancy-depth))) @@ -461,9 +461,9 @@ (-> obj info buoyancy-factor) ) ) - (TODO-RENAME-13 (-> obj rbody) (-> arg0 world-pos) s4-0) + (rigid-body-method-13 (-> obj rbody) (-> arg0 world-pos) s4-0) (vector-float*! s4-0 (-> arg0 velocity) (* -1.0 (-> obj info drag-factor) (fmin 1.0 f30-0))) - (TODO-RENAME-13 (-> obj rbody) (-> arg0 world-pos) s4-0) + (rigid-body-method-13 (-> obj rbody) (-> arg0 world-pos) s4-0) ) ) 0 @@ -473,10 +473,10 @@ ;; definition for method 25 of type rigid-body-platform ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-25 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-25 rigid-body-platform ((obj rigid-body-platform)) (when (or (-> obj player-impulse) (-> obj player-contact)) (set! (-> obj player-impulse) #f) - (TODO-RENAME-16 + (rigid-body-method-16 (-> obj rbody) (-> obj player-force-position) (-> obj player-force) @@ -489,14 +489,14 @@ ;; definition for method 26 of type rigid-body-platform ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-26 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-26 rigid-body-platform ((obj rigid-body-platform)) (let ((a1-0 (new 'stack-no-clear 'vector))) (vector-float*! a1-0 *y-vector* (* -1.0 (-> obj info gravity-factor) (-> obj info gravity) (-> obj rbody mass)) ) - (TODO-RENAME-15 (-> obj rbody) a1-0) + (rigid-body-method-15 (-> obj rbody) a1-0) ) 0 (none) @@ -504,7 +504,7 @@ ;; definition for method 27 of type rigid-body-platform ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-27 rigid-body-platform ((obj rigid-body-platform) (arg0 vector)) +(defmethod rigid-body-platform-method-27 rigid-body-platform ((obj rigid-body-platform) (arg0 vector)) (let ((gp-0 (new 'stack-no-clear 'vector))) (vector-! gp-0 arg0 (-> obj rbody position)) (set! (-> gp-0 y) 0.0) @@ -513,7 +513,7 @@ ) (when (< 0.0 f1-1) (vector-float*! gp-0 gp-0 (/ f1-1 f0-1)) - (TODO-RENAME-15 (-> obj rbody) gp-0) + (rigid-body-method-15 (-> obj rbody) gp-0) ) ) ) @@ -523,18 +523,18 @@ ;; definition for method 23 of type rigid-body-platform ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 rigid-body-platform ((obj rigid-body-platform) (arg0 float)) +(defmethod rigid-body-platform-method-23 rigid-body-platform ((obj rigid-body-platform) (arg0 float)) (let ((s4-0 (-> obj rbody matrix))) (dotimes (s3-0 (-> obj info control-point-count)) (let ((s2-0 (-> obj control-point-array data s3-0))) (vector-matrix*! (-> s2-0 world-pos) (-> s2-0 local-pos) s4-0) - (TODO-RENAME-17 (-> obj rbody) (-> s2-0 world-pos) (-> s2-0 velocity)) - (TODO-RENAME-24 obj s2-0 arg0) + (rigid-body-method-17 (-> obj rbody) (-> s2-0 world-pos) (-> s2-0 velocity)) + (rigid-body-platform-method-24 obj s2-0 arg0) ) ) ) - (TODO-RENAME-26 obj) - (TODO-RENAME-25 obj) + (rigid-body-platform-method-26 obj) + (rigid-body-platform-method-25 obj) 0 (none) ) @@ -542,7 +542,7 @@ ;; definition for method 28 of type rigid-body-platform ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-28 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-28 rigid-body-platform ((obj rigid-body-platform)) (if (-> obj info platform) (detect-riders! (-> obj root-overlay)) ) @@ -559,8 +559,8 @@ ) (while (>= (-> obj sim-time-remaining) (* 0.5 f30-0)) (clear-force-torque! (-> obj rbody)) - (TODO-RENAME-23 obj f28-0) - (dummy-10 (-> obj rbody) f30-0) + (rigid-body-platform-method-23 obj f28-0) + (rigid-body-method-10 (-> obj rbody) f30-0) (set! (-> obj sim-time-remaining) (- (-> obj sim-time-remaining) f30-0)) ) ) @@ -709,9 +709,9 @@ #t ) ) - (TODO-RENAME-28 self) + (rigid-body-platform-method-28 self) (quaternion-copy! (-> self root-overlay quat) (-> self rbody rotation)) - (TODO-RENAME-18 (-> self rbody) (-> self root-overlay trans)) + (rigid-body-method-18 (-> self rbody) (-> self root-overlay trans)) (if (-> self info platform) (rider-post) (transform-post) @@ -764,7 +764,7 @@ ;; definition for method 29 of type rigid-body-platform ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-29 rigid-body-platform ((obj rigid-body-platform) (arg0 rigid-body-platform-constants)) +(defmethod rigid-body-platform-method-29 rigid-body-platform ((obj rigid-body-platform) (arg0 rigid-body-platform-constants)) (set! (-> obj info) arg0) (set! (-> obj control-point-array) (new 'process 'rigid-body-control-point-inline-array (-> obj info control-point-count)) @@ -778,14 +778,14 @@ (-> obj info cm-joint-z) 1.0 ) - (TODO-RENAME-22 + (rigid-body-method-22 (-> obj rbody) (-> obj root-overlay trans) (-> obj root-overlay quat) (-> obj info linear-damping) (-> obj info angular-damping) ) - (TODO-RENAME-9 + (rigid-body-method-9 (-> obj rbody) (-> obj info mass) (-> obj info inertial-tensor-x) @@ -805,7 +805,7 @@ ;; definition for method 30 of type rigid-body-platform ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-30 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-30 rigid-body-platform ((obj rigid-body-platform)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -859,7 +859,7 @@ ;; definition for method 34 of type rigid-body-platform ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-34 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-34 rigid-body-platform ((obj rigid-body-platform)) (go (method-of-object obj rigid-body-platform-idle)) 0 (none) @@ -867,9 +867,9 @@ ;; definition for method 31 of type rigid-body-platform ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 rigid-body-platform ((obj rigid-body-platform)) +(defmethod rigid-body-platform-method-31 rigid-body-platform ((obj rigid-body-platform)) (set! (-> obj float-height-offset) 0.0) - (TODO-RENAME-29 obj *rigid-body-platform-constants*) + (rigid-body-platform-method-29 obj *rigid-body-platform-constants*) (let ((s5-0 (-> obj info control-point-count))) (dotimes (s4-0 s5-0) (let ((s3-0 (-> obj control-point-array data s4-0))) @@ -890,10 +890,10 @@ ;; INFO: Return type mismatch int vs none. (defmethod init-from-entity! rigid-body-platform ((obj rigid-body-platform) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) - (TODO-RENAME-34 obj) + (rigid-body-platform-method-31 obj) + (rigid-body-platform-method-34 obj) 0 (none) ) diff --git a/test/decompiler/reference/jak1/levels/common/ropebridge_REF.gc b/test/decompiler/reference/jak1/levels/common/ropebridge_REF.gc index 4775f7e040..ff9fdf948f 100644 --- a/test/decompiler/reference/jak1/levels/common/ropebridge_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/ropebridge_REF.gc @@ -539,7 +539,7 @@ (set-to-rest-state (_type_) none 25) (add-collision-meshes (_type_) none 26) (do-integration (_type_) none 27) - (dummy-28 (_type_) none 28) + (ropebridge-method-28 (_type_) none 28) ) (:states ropebridge-idle @@ -655,7 +655,7 @@ (&+ v1-37 48) ) (set-vel-from-impact self s5-1 gp-1 -1 f30-0) - (set-vel-from-impact self (+ s5-1 1) gp-1 1 f30-0) + (the-as symbol (set-vel-from-impact self (+ s5-1 1) gp-1 1 f30-0)) ) ) ) @@ -1062,7 +1062,7 @@ ;; definition for method 28 of type ropebridge ;; INFO: Return type mismatch int vs none. -(defmethod dummy-28 ropebridge ((obj ropebridge)) +(defmethod ropebridge-method-28 ropebridge ((obj ropebridge)) 0 (none) ) diff --git a/test/decompiler/reference/jak1/levels/common/sharkey_REF.gc b/test/decompiler/reference/jak1/levels/common/sharkey_REF.gc index 5f854327e3..136e40c7d2 100644 --- a/test/decompiler/reference/jak1/levels/common/sharkey_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/sharkey_REF.gc @@ -84,13 +84,13 @@ ;; definition for method 44 of type sharkey ;; INFO: Return type mismatch symbol vs object. -(defmethod dummy-44 sharkey ((obj sharkey) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler sharkey ((obj sharkey) (arg0 process) (arg1 event-message-block)) (the-as object #t) ) ;; definition for method 43 of type sharkey ;; INFO: Return type mismatch symbol vs object. -(defmethod dummy-43 sharkey ((obj sharkey) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler sharkey ((obj sharkey) (arg0 process) (arg1 event-message-block)) (the-as object #t) ) @@ -111,8 +111,8 @@ nav-enemy-default-event-handler ;; definition for method 40 of type sharkey ;; INFO: Return type mismatch int vs none. -(defmethod dummy-40 sharkey ((obj sharkey)) - (dummy-11 (-> obj nav) (-> obj nav target-pos)) +(defmethod nav-enemy-method-40 sharkey ((obj sharkey)) + (nav-control-method-11 (-> obj nav) (-> obj nav target-pos)) (let* ((f0-0 (vector-vector-xz-distance (-> obj collide-info trans) (-> obj nav target-pos))) (f30-0 (/ (- (fmin (-> obj y-max) (-> obj nav target-pos y)) (-> obj collide-info trans y)) f0-0)) ) @@ -124,7 +124,7 @@ nav-enemy-default-event-handler ;; definition for method 37 of type sharkey ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-37 sharkey ((obj sharkey)) +(defmethod nav-enemy-method-37 sharkey ((obj sharkey)) (let ((s5-0 (new 'stack-no-clear 'vector))) (when (< 8192.0 (vector-length (-> obj nav travel))) (vector-normalize-copy! s5-0 (-> obj nav travel) 1.0) @@ -139,7 +139,7 @@ nav-enemy-default-event-handler ;; definition for method 41 of type sharkey ;; INFO: Return type mismatch int vs none. -(defmethod dummy-41 sharkey ((obj sharkey)) +(defmethod nav-enemy-method-41 sharkey ((obj sharkey)) (let* ((f0-1 (- (-> obj target-speed) (-> obj momentum-speed))) (f1-3 (fmin (* (-> obj acceleration) (-> *display* seconds-per-frame)) (fabs f0-1))) ) @@ -172,12 +172,12 @@ nav-enemy-default-event-handler ) (set-vector! (-> obj draw color-mult) f0-2 f0-2 f0-2 1.0) ) - (dummy-10 (-> obj water)) + (water-control-method-10 (-> obj water)) (let ((f28-0 (-> obj collide-info trans y))) (when (or (and (< f30-0 f28-0) (>= f30-0 (-> obj last-y))) (and (>= f30-0 f28-0) (< f30-0 (-> obj last-y)))) (set! (-> s5-0 quad) (-> obj collide-info trans quad)) (set! (-> s5-0 y) f30-0) - (dummy-13 (-> obj water) 1.0 s5-0 1 (-> obj collide-info transv)) + (create-splash (-> obj water) 1.0 s5-0 1 (-> obj collide-info transv)) ) (set! (-> obj last-y) f28-0) ) @@ -284,7 +284,7 @@ nav-enemy-default-event-handler (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf0)) (set! (-> self notice-time) (-> *display* base-frame-counter)) ) - (let ((a0-4 (dummy-16 (-> self nav) (-> *target* control trans)))) + (let ((a0-4 (nav-control-method-16 (-> self nav) (-> *target* control trans)))) (when (or (and a0-4 (logtest? (-> a0-4 pat) 2)) (and (logtest? (-> self draw status) (draw-status hidden)) (>= (- (-> *display* base-frame-counter) (-> self notice-time)) (-> self reaction-time)) @@ -312,7 +312,7 @@ nav-enemy-default-event-handler (ja :num! (loop! (-> self anim-speed))) (seek! (-> self anim-speed) 1.0 0.05) (seek! (-> self collide-info trans y) (-> self y-min) (* (-> self y-speed) (-> *display* seconds-per-frame))) - (dummy-10 (-> self water)) + (water-control-method-10 (-> self water)) (ja-post) (suspend) ) @@ -599,7 +599,7 @@ nav-enemy-default-event-handler nav-enemy-default-event-handler ) :trans (behavior () - (if (TODO-RENAME-46 self (-> self nav-info notice-distance)) + (if (target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) ) (if (>= (- (-> *display* base-frame-counter) (-> self state-time)) (-> self state-timeout)) @@ -723,7 +723,7 @@ nav-enemy-default-event-handler ) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *sharkey-sg* '()) - (TODO-RENAME-45 obj *sharkey-nav-enemy-info*) + (init-defaults! obj *sharkey-nav-enemy-info*) (logclear! (-> obj mask) (process-mask actor-pause)) (set! (-> obj water) (new 'process 'water-control obj 3 12288.0 8192.0 2048.0)) (set! (-> obj water flags) (water-flags wt01 wt22 wt23)) diff --git a/test/decompiler/reference/jak1/levels/common/tippy_REF.gc b/test/decompiler/reference/jak1/levels/common/tippy_REF.gc index 41e0d0db57..d126091217 100644 --- a/test/decompiler/reference/jak1/levels/common/tippy_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/tippy_REF.gc @@ -15,7 +15,7 @@ :flag-assert #xb0000003c (:methods (reset! (_type_ process-drawable float float) none 9) - (TODO-RENAME-10 (_type_ process-drawable vector) symbol 10) + (tippy-method-10 (_type_ process-drawable vector) symbol 10) ) ) @@ -45,7 +45,7 @@ ) ;; definition for method 10 of type tippy -(defmethod TODO-RENAME-10 tippy ((obj tippy) (arg0 process-drawable) (arg1 vector)) +(defmethod tippy-method-10 tippy ((obj tippy) (arg0 process-drawable) (arg1 vector)) (let ((s4-0 #t)) (cond (arg1 diff --git a/test/decompiler/reference/jak1/levels/common/water-anim_REF.gc b/test/decompiler/reference/jak1/levels/common/water-anim_REF.gc index 707b7d8bca..97b3b5cdc4 100644 --- a/test/decompiler/reference/jak1/levels/common/water-anim_REF.gc +++ b/test/decompiler/reference/jak1/levels/common/water-anim_REF.gc @@ -608,7 +608,7 @@ ;; definition for method 25 of type water-anim ;; INFO: Used lq/sq ;; INFO: Return type mismatch quaternion vs none. -(defmethod TODO-RENAME-25 water-anim ((obj water-anim)) +(defmethod water-vol-method-25 water-anim ((obj water-anim)) (local-vars (sv-16 res-tag)) (set! (-> obj play-ambient-sound?) #t) (set! (-> obj look) (res-lump-value (-> obj entity) 'look int :default (the-as uint128 -1))) @@ -629,7 +629,7 @@ ) ;; definition for method 22 of type water-anim -(defmethod TODO-RENAME-22 water-anim ((obj water-anim)) +(defmethod water-vol-method-22 water-anim ((obj water-anim)) (let ((s5-0 (-> obj look))) (if (or (< s5-0 0) (>= s5-0 (-> *water-anim-look* length))) (go process-drawable-art-error "skel group") diff --git a/test/decompiler/reference/jak1/levels/darkcave/darkcave-obs_REF.gc b/test/decompiler/reference/jak1/levels/darkcave/darkcave-obs_REF.gc index 91df2acd61..235aa690d8 100644 --- a/test/decompiler/reference/jak1/levels/darkcave/darkcave-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/darkcave/darkcave-obs_REF.gc @@ -200,7 +200,7 @@ (set! (-> s5-1 w) 0.0) ) ) - (TODO-RENAME-9 *cavecrystal-light-control* (-> self crystal-id) (-> self glow-u) self) + (cavecrystal-light-control-method-9 *cavecrystal-light-control* (-> self crystal-id) (-> self glow-u) self) (update-connected-crystals! self) (when (>= 0.0 f30-0) (level-hint-spawn @@ -285,7 +285,7 @@ ) (ja-post) (update-transforms! (-> obj root-override)) - (TODO-RENAME-9 *cavecrystal-light-control* (-> obj crystal-id) 0.0 obj) + (cavecrystal-light-control-method-9 *cavecrystal-light-control* (-> obj crystal-id) 0.0 obj) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "crystal-on" :fo-max 80) (-> obj root-override trans)) ) diff --git a/test/decompiler/reference/jak1/levels/finalboss/final-door_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/final-door_REF.gc index e4d5f8017d..24861164e9 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/final-door_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/final-door_REF.gc @@ -54,7 +54,7 @@ :flag-assert #x17004000b0 (:methods (idle () _type_ :state 20) - (dummy-21 (_type_) none 21) + (final-door-method-21 (_type_) none 21) (open (symbol) _type_ :state 22) ) ) @@ -176,7 +176,7 @@ (set! (-> obj root) s4-0) ) (process-drawable-from-entity! obj arg0) - (dummy-21 obj) + (final-door-method-21 obj) (go (method-of-object obj idle)) (none) ) @@ -246,7 +246,7 @@ ;; definition for method 21 of type power-left ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 power-left ((obj power-left)) +(defmethod final-door-method-21 power-left ((obj power-left)) (initialize-skeleton obj *power-left-sg* '()) 0 (none) @@ -254,7 +254,7 @@ ;; definition for method 21 of type power-right ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 power-right ((obj power-right)) +(defmethod final-door-method-21 power-right ((obj power-right)) (initialize-skeleton obj *power-right-sg* '()) 0 (none) @@ -272,7 +272,7 @@ :size-assert #xd4 :flag-assert #x17007000d4 (:methods - (dummy-20 () none 20) + (powercellalt-method-20 () none 20) (jump () _type_ :state 21) (idle () _type_ :state 22) ) diff --git a/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc index e71ed56c87..bb31a5ffb5 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/green-eco-lurker_REF.gc @@ -15,7 +15,7 @@ :size-assert #x1d8 :flag-assert #x4c017001d8 (:methods - (dummy-51 (_type_ vector) symbol :replace 51) + (green-eco-lurker-method-51 (_type_ vector) symbol :replace 51) ) (:states green-eco-lurker-appear @@ -325,7 +325,7 @@ ) ;; definition for method 43 of type green-eco-lurker -(defmethod dummy-43 green-eco-lurker ((obj green-eco-lurker) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler green-eco-lurker ((obj green-eco-lurker) (arg0 process) (arg1 event-message-block)) (cond ((= (-> arg0 type) target) (if (nav-enemy-send-attack arg0 (the-as touching-shapes-entry (-> arg1 param 0)) 'generic) @@ -335,7 +335,7 @@ ) (else (nav-enemy-set-hit-from-direction arg0) - ((method-of-type nav-enemy dummy-43) obj arg0 arg1) + ((method-of-type nav-enemy attack-handler) obj arg0 arg1) ) ) ) @@ -356,7 +356,7 @@ ) ;; definition for method 44 of type green-eco-lurker -(defmethod dummy-44 green-eco-lurker ((obj green-eco-lurker) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler green-eco-lurker ((obj green-eco-lurker) (arg0 process) (arg1 event-message-block)) (when (and (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf6)) ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) @@ -387,13 +387,13 @@ ;; definition for method 51 of type green-eco-lurker ;; INFO: Used lq/sq -(defmethod dummy-51 green-eco-lurker ((obj green-eco-lurker) (arg0 vector)) +(defmethod green-eco-lurker-method-51 green-eco-lurker ((obj green-eco-lurker) (arg0 vector)) (when (or (not *target*) (>= (vector-vector-xz-distance arg0 (target-pos 0)) 36864.0)) (let ((v1-3 (new 'stack-no-clear 'vector))) (set! (-> v1-3 quad) (-> arg0 quad)) (set! (-> v1-3 w) (-> obj collide-info root-prim local-sphere w)) ) - (if (not (TODO-RENAME-50 obj arg0)) + (if (not (nav-enemy-method-50 obj arg0)) (return #t) ) ) @@ -401,7 +401,7 @@ ) ;; definition for method 52 of type green-eco-lurker -(defmethod dummy-52 green-eco-lurker ((obj green-eco-lurker) (arg0 vector)) +(defmethod nav-enemy-method-52 green-eco-lurker ((obj green-eco-lurker) (arg0 vector)) (let ((s4-0 (-> obj path curve num-cverts))) (when (> s4-0 0) (let ((s2-0 (nav-enemy-rnd-int-count s4-0)) @@ -409,7 +409,7 @@ ) (while (> s3-0 0) (eval-path-curve-div! (-> obj path) arg0 (the float s2-0) 'interp) - (if (dummy-51 obj arg0) + (if (green-eco-lurker-method-51 obj arg0) (return #t) ) (set! s2-0 (mod (+ s2-0 1) s4-0)) @@ -447,7 +447,7 @@ (none) ) :trans (behavior () - (if (dummy-52 self (-> self appear-dest)) + (if (nav-enemy-method-52 self (-> self appear-dest)) (go green-eco-lurker-appear) ) (none) @@ -463,7 +463,7 @@ ;; definition for method 53 of type green-eco-lurker ;; INFO: Return type mismatch int vs symbol. -(defmethod dummy-53 green-eco-lurker ((obj green-eco-lurker)) +(defmethod nav-enemy-method-53 green-eco-lurker ((obj green-eco-lurker)) (the-as symbol (cond ((and (-> obj draw shadow) (zero? (-> obj draw cur-lod)) @@ -547,7 +547,7 @@ (set! (-> self played-sound?) #t) (sound-play "blob-jump" :pitch (nav-enemy-rnd-float-range -0.5 0.5)) ) - (dummy-53 self) + (nav-enemy-method-53 self) 0 (none) ) @@ -798,11 +798,11 @@ ;; definition for method 48 of type green-eco-lurker ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 green-eco-lurker ((obj green-eco-lurker)) +(defmethod nav-enemy-method-48 green-eco-lurker ((obj green-eco-lurker)) (initialize-skeleton obj *green-eco-lurker-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) (logclear! (-> obj collide-info nav-flags) (nav-flags navf0)) - (TODO-RENAME-45 obj *green-eco-lurker-nav-enemy-info*) + (init-defaults! obj *green-eco-lurker-nav-enemy-info*) (logior! (-> obj draw shadow-ctrl settings flags) (shadow-flags shdf02)) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) @@ -820,7 +820,7 @@ (vector-identity! (-> self collide-info scale)) (quaternion-identity! (-> self collide-info quat)) (set! (-> self entity) (-> arg1 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (logclear! (-> self mask) (process-mask actor-pause)) (go green-eco-lurker-wait-to-appear) (none) diff --git a/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc index 28cf782fba..7455d85433 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/robotboss-misc_REF.gc @@ -175,9 +175,7 @@ ;; definition for function ecoclaw-handler ;; INFO: Used lq/sq ;; INFO: Return type mismatch none vs object. -;; WARN: Failed load: (set! a0-3 (l.wu (+ gp-1 -4))) at op 13 -;; WARN: Failed load: (set! a0-6 (l.wu (+ s5-0 -4))) at op 41 -;; WARN: Failed load: (set! a0-7 (l.wu (+ s5-1 -4))) at op 65 +;; ERROR: Failed load: (set! a0-3 (l.wu (+ gp-1 -4))) at op 13 ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 28] ;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 79] (defbehavior ecoclaw-handler ecoclaw ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) @@ -568,7 +566,7 @@ ;; INFO: Return type mismatch object vs none. (defbehavior finalbosscam-init-by-other finalbosscam ((arg0 entity-actor)) (set! (-> self entity) arg0) - (dummy-40 self arg0 *finalbosscam-sg* 4 4 (new 'static 'vector :w 4096.0) 4) + (process-taskable-method-40 self arg0 *finalbosscam-sg* 4 4 (new 'static 'vector :w 4096.0) 4) (set! (-> self tasks) (get-task-control (game-task finalboss-movies))) (set! (-> self robotboss) (the-as handle #f)) (go-virtual hidden) diff --git a/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc index 5e54ecf0e5..082be5c93a 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/robotboss-weapon_REF.gc @@ -16,10 +16,10 @@ :size-assert #x28 :flag-assert #xd00000028 (:methods - (dummy-9 (_type_ vector) none 9) - (TODO-RENAME-10 (_type_ collide-prim-core vector) symbol 10) - (dummy-11 (_type_ vector) symbol 11) - (dummy-12 (_type_ vector) vector 12) + (torus-method-9 (_type_ vector) none 9) + (torus-method-10 (_type_ collide-prim-core vector) symbol 10) + (torus-method-11 (_type_ vector) symbol 11) + (torus-method-12 (_type_ vector) vector 12) ) ) @@ -34,7 +34,7 @@ ) ;; definition for method 10 of type torus -(defmethod TODO-RENAME-10 torus ((obj torus) (arg0 collide-prim-core) (arg1 vector)) +(defmethod torus-method-10 torus ((obj torus) (arg0 collide-prim-core) (arg1 vector)) (let ((gp-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'vector)) (f30-0 (+ (-> obj radius-secondary) (-> arg0 world-sphere w))) @@ -48,16 +48,16 @@ ) ;; definition for method 11 of type torus -(defmethod dummy-11 torus ((obj torus) (arg0 vector)) +(defmethod torus-method-11 torus ((obj torus) (arg0 vector)) (let ((s4-0 (the-as collide-shape-prim-group (-> *target* control root-prim)))) (when (and (logtest? (-> s4-0 prim-core collide-as) (collide-kind target)) - (TODO-RENAME-10 obj (-> s4-0 prim-core) arg0) + (torus-method-10 obj (-> s4-0 prim-core) arg0) ) (countdown (s3-0 (-> s4-0 num-prims)) (let ((v1-9 (-> s4-0 prims s3-0))) (if (and (logtest? (-> v1-9 prim-core action) (collide-action solid)) (logtest? (-> v1-9 prim-core collide-as) (collide-kind target)) - (TODO-RENAME-10 obj (-> v1-9 prim-core) arg0) + (torus-method-10 obj (-> v1-9 prim-core) arg0) ) (return #t) ) @@ -87,7 +87,7 @@ ;; definition for method 9 of type torus ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-9 torus ((obj torus) (arg0 vector)) +(defmethod torus-method-9 torus ((obj torus) (arg0 vector)) (local-vars (sv-256 int) (sv-272 int) (sv-288 int)) (let ((s0-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) @@ -138,7 +138,7 @@ ) ;; definition for method 12 of type torus -(defmethod dummy-12 torus ((obj torus) (arg0 vector)) +(defmethod torus-method-12 torus ((obj torus) (arg0 vector)) (let* ((f30-0 65536.0) (v1-1 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) (v1-2 (the-as number (logior #x3f800000 v1-1))) @@ -751,7 +751,7 @@ (* 204.8 (the float (- (-> *display* game-frame-counter) (-> self state-time)))) ) (let ((gp-0 (new 'stack-no-clear 'vector))) - (when (dummy-11 (-> self ring) gp-0) + (when (torus-method-11 (-> self ring) gp-0) (vector-normalize! gp-0 16384.0) (send-event *target* 'attack #f (static-attack-info ((vector gp-0)))) (send-event (ppointer->process (-> self parent)) 'hit-jak) @@ -759,7 +759,7 @@ ) (dotimes (gp-1 5) (let ((s5-0 (new 'stack-no-clear 'vector))) - (dummy-12 (-> self ring) s5-0) + (torus-method-12 (-> self ring) s5-0) (spawn (-> self test-particle) s5-0) ) ) diff --git a/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc index 64fc1a7e37..cea84e7bf9 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/robotboss_REF.gc @@ -459,7 +459,7 @@ ) ) (cleanup-for-death self) - (deactivate self) + (the-as object (deactivate self)) ) (else (robotboss-bomb-handler proc arg1 event-type event) @@ -2677,7 +2677,13 @@ ) (robotboss-blue-beam 8 #t) (robotboss-blue-beam 9 #f) - (when (TODO-RENAME-10 (-> self ambient) (new 'stack-no-clear 'vector) (seconds 10) (the-as float 327680.0) self) + (when (ambient-control-method-10 + (-> self ambient) + (new 'stack-no-clear 'vector) + (seconds 10) + (the-as float 327680.0) + self + ) (let ((f0-2 (rand-float-gen))) (cond ((< 0.8 f0-2) @@ -2996,7 +3002,7 @@ (set! (-> obj blue-smoke) #f) (set! (-> obj red-smoke) #f) (set! (-> obj yellow-smoke) #f) - (dummy-9 (-> obj ambient)) + (ambient-control-method-9 (-> obj ambient)) (set! (-> obj yellow-gun) (new 'process 'joint-mod (joint-mod-handler-mode flex-blend) obj 16)) (set-vector! (-> obj yellow-gun twist-max) 8192.0 8192.0 0.0 1.0) (set! (-> obj yellow-gun up) (the-as uint 1)) diff --git a/test/decompiler/reference/jak1/levels/finalboss/sage-finalboss_REF.gc b/test/decompiler/reference/jak1/levels/finalboss/sage-finalboss_REF.gc index 593a59ba68..4b5145f0b9 100644 --- a/test/decompiler/reference/jak1/levels/finalboss/sage-finalboss_REF.gc +++ b/test/decompiler/reference/jak1/levels/finalboss/sage-finalboss_REF.gc @@ -75,7 +75,7 @@ ;; definition for method 26 of type plat-eco-finalboss ;; INFO: Return type mismatch int vs none. -(defmethod dummy-26 plat-eco-finalboss ((obj plat-eco-finalboss)) +(defmethod baseplat-method-26 plat-eco-finalboss ((obj plat-eco-finalboss)) (set! (-> obj force-dest) -1.0) (set! (-> obj targ-dest) -1.0) (set! (-> obj dest) 0.0) @@ -327,7 +327,7 @@ ;; definition for method 45 of type sage-finalboss ;; INFO: Return type mismatch object vs symbol. -(defmethod dummy-45 sage-finalboss ((obj sage-finalboss)) +(defmethod process-taskable-method-45 sage-finalboss ((obj sage-finalboss)) (let ((s5-0 (entity-by-name "assistant-lavatube-end-3"))) (the-as symbol @@ -451,7 +451,7 @@ (set-yaw-angle-clear-roll-pitch! (-> obj root-override) 0.0) (close-current! (-> obj tasks)) (play-reminder obj) - (dummy-45 obj) + (process-taskable-method-45 obj) (set! (-> obj kick-the-credits) #t) (set! (-> obj robotplat) (ppointer->handle @@ -505,7 +505,7 @@ (when arg0 (set-yaw-angle-clear-roll-pitch! (-> obj root-override) -13116.667) (close-current! (-> obj tasks)) - (dummy-45 obj) + (process-taskable-method-45 obj) (send-event *camera* 'teleport) (set-setting! 'allow-progress #f 0.0 0) ) @@ -553,7 +553,7 @@ (when arg0 (set-yaw-angle-clear-roll-pitch! (-> obj root-override) -13116.667) (close-current! (-> obj tasks)) - (dummy-45 obj) + (process-taskable-method-45 obj) (set! (-> obj left-door) (the-as entity-actor (entity-by-name "power-left-2"))) (set! (-> obj right-door) (the-as entity-actor (entity-by-name "power-right-2"))) (set-setting! 'allow-progress #f 0.0 0) @@ -1083,7 +1083,7 @@ ;; definition for method 11 of type sage-finalboss ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! sage-finalboss ((obj sage-finalboss) (arg0 entity-actor)) - (dummy-40 obj arg0 *sage-finalboss-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *sage-finalboss-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task finalboss-movies))) (set! (-> obj redsage) (the-as handle #f)) (set! (-> obj bluesage) (the-as handle #f)) diff --git a/test/decompiler/reference/jak1/levels/firecanyon/assistant-firecanyon_REF.gc b/test/decompiler/reference/jak1/levels/firecanyon/assistant-firecanyon_REF.gc index 04f7390e79..6b102620a2 100644 --- a/test/decompiler/reference/jak1/levels/firecanyon/assistant-firecanyon_REF.gc +++ b/test/decompiler/reference/jak1/levels/firecanyon/assistant-firecanyon_REF.gc @@ -267,9 +267,9 @@ ;; definition for method 11 of type assistant-firecanyon (defmethod init-from-entity! assistant-firecanyon ((obj assistant-firecanyon) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-firecanyon-sg* 3 29 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-firecanyon-sg* 3 29 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task firecanyon-assistant))) (first-any (-> obj tasks) #t) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc b/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc index 53ad81aff2..ac7f453a98 100644 --- a/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc +++ b/test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc @@ -1340,7 +1340,7 @@ (if (and (logtest? (-> self water flags) (water-flags wt09)) (zero? (mod (- (-> *display* base-frame-counter) (-> self state-time)) 21)) ) - (dummy-13 + (create-splash (-> self water) (the-as float 0.6) (vector<-cspace! (new 'stack-no-clear 'vector) (-> self node-list data 37)) @@ -1610,7 +1610,7 @@ (set! (-> self control unknown-dword33) 0) (set! (-> self control unknown-surface00) *flut-air-attack-mods*) (sound-play "flop-land" :pitch -0.4) - (dummy-10 (-> self skel effect) 'group-flut-attack-strike-ground (ja-frame-num 0) 0) + (effect-control-method-10 (-> self skel effect) 'group-flut-attack-strike-ground (ja-frame-num 0) 0) (let ((gp-2 (process-spawn touch-tracker :init touch-tracker-init (-> self control trans) 4096.0 30 :to self))) (send-event (ppointer->process gp-2) 'event 'attack 'flut-attack) (send-event (ppointer->process gp-2) 'function (lambda :behavior target diff --git a/test/decompiler/reference/jak1/levels/intro/evilbro_REF.gc b/test/decompiler/reference/jak1/levels/intro/evilbro_REF.gc index be0c728e15..6611c2a187 100644 --- a/test/decompiler/reference/jak1/levels/intro/evilbro_REF.gc +++ b/test/decompiler/reference/jak1/levels/intro/evilbro_REF.gc @@ -107,10 +107,10 @@ ;; definition for method 11 of type evilbro (defmethod init-from-entity! evilbro ((obj evilbro) (arg0 entity-actor)) - (dummy-40 obj arg0 *evilbro-intro-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *evilbro-intro-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task leaving-misty))) (set! (-> obj evilsis) (entity-actor-lookup arg0 'alt-actor 0)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -169,8 +169,8 @@ ;; definition for method 11 of type evilsis (defmethod init-from-entity! evilsis ((obj evilsis) (arg0 entity-actor)) - (dummy-40 obj arg0 *evilsis-intro-sg* 3 0 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *evilsis-intro-sg* 3 0 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task leaving-misty))) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc b/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc index ee7531299a..6833309c1d 100644 --- a/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc @@ -883,7 +883,7 @@ ;; definition for method 52 of type fisher ;; INFO: Return type mismatch shadow-flags vs none. -(defmethod dummy-52 fisher ((obj fisher)) +(defmethod process-taskable-method-52 fisher ((obj fisher)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -957,7 +957,7 @@ (defbehavior fisher-fish-move fisher-fish () (+! (-> self pos) (* (-> self vel) (-> *display* seconds-per-frame))) (eval-path-curve-div! (-> (the-as fisher (-> self parent 0)) path) (-> self root trans) (-> self pos) 'interp) - (TODO-RENAME-12 (-> (the-as fisher (-> self parent 0)) path) (-> self dir) (-> self pos)) + (path-control-method-12 (-> (the-as fisher (-> self parent 0)) path) (-> self dir) (-> self pos)) (seek-toward-heading-vec! (-> self root) (-> self dir) 291271.12 (seconds 0.2)) (let ((f30-1 (+ 16384.0 (y-angle (-> self root)))) (gp-0 (new-stack-vector0)) @@ -982,7 +982,7 @@ :code (behavior () (set-heading-vec! (-> self root) - (TODO-RENAME-12 (-> (the-as fisher (-> self parent 0)) path) (-> self dir) (-> self pos)) + (path-control-method-12 (-> (the-as fisher (-> self parent 0)) path) (-> self dir) (-> self pos)) ) (loop (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) @@ -1288,7 +1288,7 @@ ) ;; definition for method 38 of type fisher -(defmethod dummy-38 fisher ((obj fisher)) +(defmethod process-taskable-method-38 fisher ((obj fisher)) (case (current-status (-> obj tasks)) (((task-status need-reminder-a) (task-status need-reminder)) (go (method-of-object obj query)) @@ -1772,10 +1772,10 @@ ) ;; definition for method 43 of type fisher -(defmethod TODO-RENAME-43 fisher ((obj fisher)) +(defmethod process-taskable-method-43 fisher ((obj fisher)) (cond ((closed? (-> obj tasks) (game-task jungle-fishgame) (task-status need-reminder)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 1) 122880.0 obj) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 1) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (if (< 0.5 f0-2) (play-ambient (-> obj ambient) "FIS-LO03" #f (-> obj root-override trans)) @@ -1785,7 +1785,7 @@ ) ) (else - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-5 (rand-float-gen))) (cond ((< 0.875 f0-5) @@ -2034,7 +2034,7 @@ (countdown (gp-1 (+ (the int (* f30-0 (+ -1.0 (the-as float v1-10)))) 5)) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (suspend) (ja :num! (seek!)) ) @@ -2043,7 +2043,7 @@ (when (ja-group? fisher-idle-more-often-ja) (ja-no-eval :group! fisher-idle-less-often-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (suspend) (ja :num! (seek!)) ) @@ -2099,12 +2099,12 @@ ;; definition for method 11 of type fisher ;; INFO: Used lq/sq (defmethod init-from-entity! fisher ((obj fisher) (arg0 entity-actor)) - (dummy-40 obj arg0 *fisher-sg* 3 49 (new 'static 'vector :w 4096.0) 33) + (process-taskable-method-40 obj arg0 *fisher-sg* 3 49 (new 'static 'vector :w 4096.0) 33) (set! (-> obj tasks) (get-task-control (game-task jungle-fishgame))) (set! (-> obj path) (new 'process 'curve-control obj 'path -1000000000.0)) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) (let ((s5-0 (eval-path-curve-div! (-> obj path) (-> obj paddle-pos) 6.5 'interp)) - (s4-0 (TODO-RENAME-12 (-> obj path) (new-stack-vector0) 6.5)) + (s4-0 (path-control-method-12 (-> obj path) (new-stack-vector0) 6.5)) ) (set! (-> s5-0 y) (+ 2457.6 (-> s5-0 y))) (vector-normalize! (vector-rotate-y! s4-0 s4-0 16384.0) (-> *FISHER-bank* width)) @@ -2116,7 +2116,7 @@ (set! (-> obj hard) #f) (set! (-> *FISHER-bank* max-caught) 200) (set! (-> obj training) #f) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc b/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc index 46cc027915..aa0408327f 100644 --- a/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/hopper_REF.gc @@ -115,7 +115,7 @@ nav-enemy-default-event-handler ;; definition for function hopper-do-jump ;; INFO: Return type mismatch int vs none. (defbehavior hopper-do-jump hopper () - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (if (< (-> self jump-length) (vector-length (-> self nav travel))) (vector-normalize! (-> self nav travel) (-> self jump-length)) ) @@ -391,9 +391,9 @@ nav-enemy-default-event-handler ;; definition for method 48 of type hopper ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 hopper ((obj hopper)) +(defmethod nav-enemy-method-48 hopper ((obj hopper)) (initialize-skeleton obj *hopper-sg* '()) - (TODO-RENAME-45 obj *hopper-nav-enemy-info*) + (init-defaults! obj *hopper-nav-enemy-info*) (set! (-> obj shadow-min-y) (+ (-> obj collide-info trans y) (-> obj nav-info shadow-min-y))) 0 (none) diff --git a/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc b/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc index ba562e0350..f417aa497a 100644 --- a/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/jungle-obs_REF.gc @@ -1240,7 +1240,7 @@ ;; definition for method 24 of type sidedoor ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-24 sidedoor ((obj sidedoor)) +(defmethod eco-door-method-24 sidedoor ((obj sidedoor)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-player)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -1261,7 +1261,7 @@ ;; definition for method 25 of type sidedoor ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-25 sidedoor ((obj sidedoor)) +(defmethod eco-door-method-25 sidedoor ((obj sidedoor)) (initialize-skeleton obj *sidedoor-sg* '()) (set! (-> obj open-distance) 22528.0) (set! (-> obj close-distance) 61440.0) @@ -1418,8 +1418,8 @@ ;; definition for method 22 of type jungle-water ;; INFO: Return type mismatch ripple-wave-set vs none. -(defmethod TODO-RENAME-22 jungle-water ((obj jungle-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 jungle-water ((obj jungle-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) diff --git a/test/decompiler/reference/jak1/levels/jungle/junglefish_REF.gc b/test/decompiler/reference/jak1/levels/jungle/junglefish_REF.gc index cb6cf84da3..64d9697458 100644 --- a/test/decompiler/reference/jak1/levels/jungle/junglefish_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/junglefish_REF.gc @@ -32,7 +32,7 @@ nav-enemy-default-event-handler ;; definition for method 39 of type junglefish ;; INFO: Return type mismatch int vs none. (defmethod common-post junglefish ((obj junglefish)) - (dummy-10 (-> obj water)) + (water-control-method-10 (-> obj water)) ((the-as (function nav-enemy none) (find-parent-method junglefish 39)) obj) 0 (none) @@ -292,7 +292,7 @@ nav-enemy-default-event-handler ) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *junglefish-sg* '()) - (TODO-RENAME-45 obj *junglefish-nav-enemy-info*) + (init-defaults! obj *junglefish-nav-enemy-info*) (set! (-> obj water) (new 'process 'water-control obj 7 0.0 8192.0 2048.0)) (set! (-> obj water flags) (water-flags wt01)) (set! (-> obj water height) (res-lump-float (-> obj entity) 'water-height)) diff --git a/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc b/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc index a65759c31b..00b45bfdbc 100644 --- a/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungle/junglesnake_REF.gc @@ -103,11 +103,11 @@ :size-assert #x28c :flag-assert #x190220028c (:methods - (dummy-20 (_type_) symbol 20) - (dummy-21 (_type_) symbol 21) - (dummy-22 (_type_ float) symbol 22) - (dummy-23 (_type_) none 23) - (dummy-24 (_type_) none 24) + (junglesnake-method-20 (_type_) symbol 20) + (junglesnake-method-21 (_type_) symbol 21) + (junglesnake-method-22 (_type_ float) symbol 22) + (junglesnake-method-23 (_type_) none 23) + (junglesnake-method-24 (_type_) none 24) ) (:states junglesnake-attack @@ -186,7 +186,7 @@ junglesnake-default-event-handler ;; definition for method 20 of type junglesnake -(defmethod dummy-20 junglesnake ((obj junglesnake)) +(defmethod junglesnake-method-20 junglesnake ((obj junglesnake)) (when (and *target* (-> obj track-player-ry)) (let ((v1-3 (target-pos 0))) (set! (-> obj des-ry) @@ -410,7 +410,7 @@ junglesnake-default-event-handler (none) ) :trans (behavior () - (dummy-20 self) + (junglesnake-method-20 self) (when *target* (if *target* (look-at-enemy! @@ -463,7 +463,7 @@ junglesnake-default-event-handler ) ) ) - (dummy-20 self) + (junglesnake-method-20 self) (when *target* (if *target* (look-at-enemy! @@ -508,11 +508,11 @@ junglesnake-default-event-handler (none) ) :exit (behavior () - (dummy-24 self) + (junglesnake-method-24 self) (none) ) :trans (behavior () - (dummy-20 self) + (junglesnake-method-20 self) (when *target* (if *target* (look-at-enemy! @@ -529,7 +529,7 @@ junglesnake-default-event-handler (set! (-> self track-player-ry) #t) (set! (-> self track-player-tilt) #t) (ja-channel-push! 2 (seconds 0.15)) - (dummy-23 self) + (junglesnake-method-23 self) (let ((f30-0 (lerp-scale 0.0 1.0 (vector-vector-distance (target-pos 0) (-> self root-override trans)) 0.0 24576.0)) ) (ja-no-eval :group! junglesnake-strike-close-ja :num! (seek! max 1.25) :frame-num 0.0) @@ -549,12 +549,12 @@ junglesnake-default-event-handler (cond ((and (>= f0-12 22.0) (< f0-12 44.0)) (if (not (-> self is-lethal?)) - (dummy-23 self) + (junglesnake-method-23 self) ) ) (else (if (-> self is-lethal?) - (dummy-24 self) + (junglesnake-method-24 self) ) ) ) @@ -583,7 +583,7 @@ junglesnake-default-event-handler (none) ) :trans (behavior () - (dummy-20 self) + (junglesnake-method-20 self) (none) ) :code (behavior () @@ -640,7 +640,7 @@ junglesnake-default-event-handler ;; definition for method 23 of type junglesnake ;; INFO: Return type mismatch int vs none. -(defmethod dummy-23 junglesnake ((obj junglesnake)) +(defmethod junglesnake-method-23 junglesnake ((obj junglesnake)) (when (not (-> obj is-lethal?)) (set! (-> obj is-lethal?) #t) (let ((v1-5 (-> (the-as collide-shape-prim-group (-> obj root-override root-prim)) prims 0))) @@ -653,7 +653,7 @@ junglesnake-default-event-handler ;; definition for method 24 of type junglesnake ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 junglesnake ((obj junglesnake)) +(defmethod junglesnake-method-24 junglesnake ((obj junglesnake)) (when (-> obj is-lethal?) (set! (-> obj is-lethal?) #f) (let ((v1-4 (-> (the-as collide-shape-prim-group (-> obj root-override root-prim)) prims 0))) @@ -699,7 +699,7 @@ junglesnake-default-event-handler ) ;; definition for method 22 of type junglesnake -(defmethod dummy-22 junglesnake ((obj junglesnake) (arg0 float)) +(defmethod junglesnake-method-22 junglesnake ((obj junglesnake) (arg0 float)) (let ((f0-0 0.0)) (dotimes (v1-0 24) (let ((a2-2 (-> obj twist-joints v1-0))) @@ -716,7 +716,7 @@ junglesnake-default-event-handler ) ;; definition for method 21 of type junglesnake -(defmethod dummy-21 junglesnake ((obj junglesnake)) +(defmethod junglesnake-method-21 junglesnake ((obj junglesnake)) (dotimes (v1-0 3) (let ((a1-2 (-> obj tilt-joints v1-0))) (set! (-> a1-2 joint-index) (+ v1-0 23)) @@ -845,8 +845,8 @@ junglesnake-default-event-handler (set! (-> obj track-player-ry) #f) (set! (-> obj track-player-tilt) #f) (quaternion-identity! (-> obj root-override quat)) - (dummy-22 obj (-> obj ry)) - (dummy-21 obj) + (junglesnake-method-22 obj (-> obj ry)) + (junglesnake-method-21 obj) (logior! (-> obj skel status) (janim-status inited)) (go junglesnake-sleeping) (none) diff --git a/test/decompiler/reference/jak1/levels/jungleb/aphid_REF.gc b/test/decompiler/reference/jak1/levels/jungleb/aphid_REF.gc index aed3e53162..469f81b307 100644 --- a/test/decompiler/reference/jak1/levels/jungleb/aphid_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungleb/aphid_REF.gc @@ -44,7 +44,7 @@ ) ;; definition for method 43 of type aphid -(defmethod dummy-43 aphid ((obj aphid) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler aphid ((obj aphid) (arg0 process) (arg1 event-message-block)) (cond ((or (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf5)) (= arg0 (ppointer->process (-> obj parent))) @@ -54,7 +54,7 @@ (go (method-of-object obj nav-enemy-die)) ) (else - (dummy-44 obj arg0 arg1) + (touch-handler obj arg0 arg1) ) ) ) @@ -296,9 +296,9 @@ ;; definition for method 48 of type aphid ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 aphid ((obj aphid)) +(defmethod nav-enemy-method-48 aphid ((obj aphid)) (initialize-skeleton obj *aphid-sg* '()) - (TODO-RENAME-45 obj *aphid-nav-enemy-info*) + (init-defaults! obj *aphid-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) (set! (-> obj neck ear) (the-as uint 2)) @@ -321,7 +321,7 @@ ) (vector-identity! (-> self collide-info scale)) (set! (-> self entity) (-> arg0 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf12)) (set! (-> self try) (the-as int (send-event (ppointer->process (-> self parent)) 'try))) (go-virtual nav-enemy-chase) diff --git a/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc b/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc index bcd6a7e81a..76039b4975 100644 --- a/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/jungleb/jungleb-obs_REF.gc @@ -393,7 +393,7 @@ ;; definition for method 24 of type jng-iris-door ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-24 jng-iris-door ((obj jng-iris-door)) +(defmethod eco-door-method-24 jng-iris-door ((obj jng-iris-door)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -414,7 +414,7 @@ ;; definition for method 25 of type jng-iris-door ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-25 jng-iris-door ((obj jng-iris-door)) +(defmethod eco-door-method-25 jng-iris-door ((obj jng-iris-door)) (initialize-skeleton obj *jng-iris-door-sg* '()) (set! (-> obj open-distance) 32768.0) (set! (-> obj close-distance) 49152.0) diff --git a/test/decompiler/reference/jak1/levels/lavatube/assistant-lavatube_REF.gc b/test/decompiler/reference/jak1/levels/lavatube/assistant-lavatube_REF.gc index 76b782c7f7..7160bc2f07 100644 --- a/test/decompiler/reference/jak1/levels/lavatube/assistant-lavatube_REF.gc +++ b/test/decompiler/reference/jak1/levels/lavatube/assistant-lavatube_REF.gc @@ -163,9 +163,9 @@ ;; definition for method 11 of type assistant-lavatube-start (defmethod init-from-entity! assistant-lavatube-start ((obj assistant-lavatube-start) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-lavatube-start-sg* 3 29 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-lavatube-start-sg* 3 29 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task lavatube-start))) (first-any (-> obj tasks) #t) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc b/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc index 0b9ad00980..b3c3d8a457 100644 --- a/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc +++ b/test/decompiler/reference/jak1/levels/lavatube/lavatube-energy_REF.gc @@ -879,7 +879,7 @@ :to *entity-pool* ) (cleanup-for-death self) - (deactivate self) + (the-as symbol (deactivate self)) ) ) ) diff --git a/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc b/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc index 8fc991d8ac..4817dbc17c 100644 --- a/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/lavatube/lavatube-obs_REF.gc @@ -557,7 +557,7 @@ (gp-0 (new 'stack-no-clear 'matrix)) ) (let ((s4-0 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> self path) s5-0 f30-0) + (path-control-method-14 (-> self path) s5-0 f30-0) (set! (-> s4-0 quad) (-> self down value quad)) (set! (-> s4-0 y) -1.0) (vector-normalize! s4-0 1.0) @@ -1485,8 +1485,8 @@ ;; definition for method 22 of type lavatube-lava ;; INFO: Return type mismatch symbol vs none. -(defmethod TODO-RENAME-22 lavatube-lava ((obj lavatube-lava)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 lavatube-lava ((obj lavatube-lava)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) diff --git a/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc b/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc index f047d3ef10..e85e61bd5f 100644 --- a/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/baby-spider_REF.gc @@ -235,7 +235,7 @@ ) ;; definition for method 44 of type baby-spider -(defmethod dummy-44 baby-spider ((obj baby-spider) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler baby-spider ((obj baby-spider) (arg0 process) (arg1 event-message-block)) (when ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) (-> obj collide-info) @@ -280,7 +280,7 @@ baby-spider-default-event-handler ) ;; definition for method 38 of type baby-spider -(defmethod TODO-RENAME-38 baby-spider ((obj baby-spider)) +(defmethod nav-enemy-method-38 baby-spider ((obj baby-spider)) (integrate-for-enemy-with-move-to-ground! (-> obj collide-info) (-> obj collide-info transv) @@ -295,7 +295,7 @@ baby-spider-default-event-handler ;; definition for method 51 of type baby-spider ;; INFO: Return type mismatch float vs none. -(defmethod dummy-51 baby-spider ((obj baby-spider)) +(defmethod nav-enemy-method-51 baby-spider ((obj baby-spider)) (let* ((f0-0 (rand-vu-float-range 0.0 1.0)) (f1-1 (+ 1.0 (* 2.0 f0-0))) (f2-2 f1-1) @@ -312,7 +312,7 @@ baby-spider-default-event-handler ;; definition for method 52 of type baby-spider ;; INFO: Used lq/sq ;; INFO: Return type mismatch vector vs symbol. -(defmethod dummy-52 baby-spider ((obj baby-spider) (arg0 vector)) +(defmethod nav-enemy-method-52 baby-spider ((obj baby-spider) (arg0 vector)) (+! (-> obj wiggle-angle) (-> obj delta-wiggle-angle)) (if (< 65536.0 (-> obj wiggle-angle)) (set! (-> obj wiggle-angle) (+ -65536.0 (-> obj wiggle-angle))) @@ -331,7 +331,7 @@ baby-spider-default-event-handler ) ;; definition for method 53 of type baby-spider -(defmethod dummy-53 baby-spider ((obj baby-spider)) +(defmethod nav-enemy-method-53 baby-spider ((obj baby-spider)) (cond ((logtest? (-> obj draw status) (draw-status was-drawn)) (set! (-> obj last-visible-time) (-> *display* base-frame-counter)) @@ -356,7 +356,7 @@ baby-spider-default-event-handler (ja-channel-push! 1 0) (ja-no-eval :group! baby-spider-birth-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (suspend) @@ -376,7 +376,7 @@ baby-spider-default-event-handler ((not *target*) (go-virtual nav-enemy-idle) ) - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) ) ((and (and *target* (>= (-> self enemy-info idle-distance) @@ -414,7 +414,7 @@ baby-spider-default-event-handler (none) ) :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-idle) trans))) @@ -435,7 +435,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-patrol) trans))) @@ -467,7 +467,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-notice) trans))) @@ -497,7 +497,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (if (>= (- (-> *display* base-frame-counter) (-> self state-time)) (-> self chase-rest-time)) @@ -520,7 +520,7 @@ baby-spider-default-event-handler (loop (when (>= (- (-> *display* base-frame-counter) (-> self wiggle-time)) (seconds 1)) (set! (-> self wiggle-time) (-> *display* base-frame-counter)) - (dummy-51 self) + (nav-enemy-method-51 self) ) (suspend) (ja :num! (loop!)) @@ -528,7 +528,7 @@ baby-spider-default-event-handler (none) ) :post (behavior () - (dummy-52 self (target-pos 0)) + (nav-enemy-method-52 self (target-pos 0)) (nav-enemy-travel-post) (none) ) @@ -539,7 +539,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-stop-chase) trans))) @@ -557,7 +557,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-stare) trans))) @@ -602,7 +602,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-give-up) trans))) @@ -642,7 +642,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-attack) trans))) @@ -669,7 +669,7 @@ baby-spider-default-event-handler :virtual #t :event baby-spider-default-event-handler :trans (behavior () - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go baby-spider-die-fast) ) (let ((t9-2 (-> (method-of-type nav-enemy nav-enemy-victory) trans))) @@ -748,12 +748,12 @@ baby-spider-default-event-handler ;; definition for method 48 of type baby-spider ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 baby-spider ((obj baby-spider)) +(defmethod nav-enemy-method-48 baby-spider ((obj baby-spider)) (set! (-> obj last-visible-time) (-> *display* base-frame-counter)) (initialize-skeleton obj *baby-spider-sg* '()) (if (= (-> obj parent 0 type) cave-trap) - (TODO-RENAME-45 obj *baby-spider-nav-enemy-info-for-cave-trap*) - (TODO-RENAME-45 obj *baby-spider-nav-enemy-info*) + (init-defaults! obj *baby-spider-nav-enemy-info-for-cave-trap*) + (init-defaults! obj *baby-spider-nav-enemy-info*) ) (let ((v1-11 (-> obj draw shadow-ctrl settings))) (logclear! (-> v1-11 flags) (shadow-flags shdf03)) @@ -788,7 +788,7 @@ baby-spider-default-event-handler (vector-float*! (-> self collide-info transv) arg2 8192.0) (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) (set! (-> self entity) (-> arg0 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (set! (-> self enemy-info pickup-type) (the-as pickup-type (-> arg3 pickup))) (set! (-> self enemy-info pickup-amount) (the float (-> arg3 pickup-amount))) (create-connection! @@ -836,7 +836,7 @@ baby-spider-default-event-handler -1 4096.0 ) - (TODO-RENAME-48 obj) + (nav-enemy-method-48 obj) (go (method-of-object obj nav-enemy-idle)) (none) ) diff --git a/test/decompiler/reference/jak1/levels/maincave/cavecrystal-light_REF.gc b/test/decompiler/reference/jak1/levels/maincave/cavecrystal-light_REF.gc index 6f577344a9..ad55ca2cef 100644 --- a/test/decompiler/reference/jak1/levels/maincave/cavecrystal-light_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/cavecrystal-light_REF.gc @@ -43,10 +43,10 @@ :size-assert #x170 :flag-assert #xf00000170 (:methods - (TODO-RENAME-9 (_type_ int float process-drawable) none 9) - (TODO-RENAME-10 (_type_ vector) float 10) + (cavecrystal-light-control-method-9 (_type_ int float process-drawable) none 9) + (cavecrystal-light-control-method-10 (_type_ vector) float 10) (inc-intensities! (_type_) none 11) - (TODO-RENAME-12 (_type_) none 12) + (cavecrystal-light-control-method-12 (_type_) none 12) (create-connection! (_type_ process-drawable res-lump (function object object object object object) int float) connection 13) (execute-connections (_type_) int 14) ) @@ -77,7 +77,7 @@ ) ) (set! (-> s5-0 w) arg2) - (let ((f0-1 (TODO-RENAME-10 *cavecrystal-light-control* s5-0)) + (let ((f0-1 (cavecrystal-light-control-method-10 *cavecrystal-light-control* s5-0)) (a2-2 (new 'static 'vector :x 1.0 :y 1.0 :z 1.0 :w 1.0)) (a1-5 (new 'static 'vector :x 0.05 :y 0.05 :z 0.05 :w 1.0)) ) @@ -107,7 +107,7 @@ ;; definition for method 12 of type cavecrystal-light-control ;; INFO: Return type mismatch symbol vs none. -(defmethod TODO-RENAME-12 cavecrystal-light-control ((obj cavecrystal-light-control)) +(defmethod cavecrystal-light-control-method-12 cavecrystal-light-control ((obj cavecrystal-light-control)) (let ((v1-0 (-> obj last-known-valid-time)) (a1-1 (-> *display* base-frame-counter)) ) @@ -191,8 +191,8 @@ ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. ;; WARN: Function (method 9 cavecrystal-light-control) has a return type of none, but the expression builder found a return statement. -(defmethod TODO-RENAME-9 cavecrystal-light-control ((obj cavecrystal-light-control) (arg0 int) (arg1 float) (arg2 process-drawable)) - (TODO-RENAME-12 obj) +(defmethod cavecrystal-light-control-method-9 cavecrystal-light-control ((obj cavecrystal-light-control) (arg0 int) (arg1 float) (arg2 process-drawable)) + (cavecrystal-light-control-method-12 obj) (when (or (< arg0 0) (>= arg0 7)) (format 0 "ERROR: Bogus cavecrystal id!~%") (return #f) @@ -221,8 +221,8 @@ ) ;; definition for method 10 of type cavecrystal-light-control -(defmethod TODO-RENAME-10 cavecrystal-light-control ((obj cavecrystal-light-control) (arg0 vector)) - (TODO-RENAME-12 obj) +(defmethod cavecrystal-light-control-method-10 cavecrystal-light-control ((obj cavecrystal-light-control) (arg0 vector)) + (cavecrystal-light-control-method-12 obj) (let ((s5-1 (-> obj head)) (f30-0 0.0) ) diff --git a/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc b/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc index 3bcd3eef35..c001121daa 100644 --- a/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/dark-crystal_REF.gc @@ -19,8 +19,8 @@ :size-assert #x100 :flag-assert #x1600900100 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) symbol 21) + (dark-crystal-method-20 (_type_) none 20) + (dark-crystal-method-21 (_type_) symbol 21) ) (:states dark-crystal-activate @@ -513,12 +513,12 @@ (process-spawn joint-exploder *dark-crystal-explode-sg* 5 gp-0 *dark-crystal-exploder-params* :to self) ) (activate! *camera-smush-control* 819.2 37 210 1.0 0.995) - (let ((gp-1 (dummy-21 self))) + (let ((gp-1 (dark-crystal-method-21 self))) (suspend) (ja-channel-set! 0) (ja-post) (logior! (-> self draw status) (draw-status hidden)) - (dummy-20 self) + (dark-crystal-method-20 self) (if (-> self underwater?) (sound-play "water-explosion") (sound-play "crystal-explode") @@ -596,7 +596,7 @@ ;; definition for method 20 of type dark-crystal ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. -(defmethod dummy-20 dark-crystal ((obj dark-crystal)) +(defmethod dark-crystal-method-20 dark-crystal ((obj dark-crystal)) (when *target* (let ((s5-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'vector)) @@ -631,7 +631,7 @@ ) ;; definition for method 21 of type dark-crystal -(defmethod dummy-21 dark-crystal ((obj dark-crystal)) +(defmethod dark-crystal-method-21 dark-crystal ((obj dark-crystal)) (let ((s5-0 #f)) (when (nonzero? (-> obj crystal-num)) (let* ((s4-0 (get-task-control (game-task cave-dark-crystals))) diff --git a/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc b/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc index b8688f9eb2..b1d5bfcbe7 100644 --- a/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/driller-lurker_REF.gc @@ -36,14 +36,14 @@ :size-assert #x128 :flag-assert #x1c00c00128 (:methods - (dummy-20 (_type_ symbol target) symbol 20) - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) none 22) - (dummy-23 (_type_) float 23) - (dummy-24 (_type_) symbol 24) - (dummy-25 (_type_) symbol 25) - (dummy-26 (_type_) symbol 26) - (dummy-27 (_type_) object 27) + (driller-lurker-method-20 (_type_ symbol target) symbol 20) + (driller-lurker-method-21 (_type_) none 21) + (driller-lurker-method-22 (_type_) none 22) + (driller-lurker-method-23 (_type_) float 23) + (driller-lurker-method-24 (_type_) symbol 24) + (driller-lurker-method-25 (_type_) symbol 25) + (driller-lurker-method-26 (_type_) symbol 26) + (driller-lurker-method-27 (_type_) object 27) ) (:states driller-lurker-attack @@ -354,7 +354,7 @@ ;; definition for method 20 of type driller-lurker ;; INFO: Used lq/sq -(defmethod dummy-20 driller-lurker ((obj driller-lurker) (arg0 symbol) (arg1 target)) +(defmethod driller-lurker-method-20 driller-lurker ((obj driller-lurker) (arg0 symbol) (arg1 target)) (let ((v1-1 (-> *display* base-frame-counter))) (when (!= v1-1 (-> obj last-update-time)) (set! (-> obj last-update-time) v1-1) @@ -412,7 +412,7 @@ ) ) (let ((s4-1 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> obj path) s4-1 (-> obj path-u)) + (path-control-method-14 (-> obj path) s4-1 (-> obj path-u)) (let ((f0-13 (atan (-> s4-1 x) (-> s4-1 z)))) (if (< (-> obj path-dir) 0.0) (set! f0-13 (+ 32768.0 f0-13)) @@ -553,14 +553,14 @@ ) ;; definition for method 23 of type driller-lurker -(defmethod dummy-23 driller-lurker ((obj driller-lurker)) +(defmethod driller-lurker-method-23 driller-lurker ((obj driller-lurker)) (let ((v1-1 (-> *display* base-frame-counter))) (when (!= v1-1 (-> obj last-player-path-u-time)) (set! (-> obj last-player-path-u-time) v1-1) (cond (*target* (let* ((s5-0 (-> obj path)) - (s4-0 (method-of-object s5-0 TODO-RENAME-20)) + (s4-0 (method-of-object s5-0 path-control-method-20)) ) (target-pos 0) (set! (-> obj player-path-u) (s4-0 s5-0)) @@ -576,7 +576,7 @@ ) ;; definition for method 25 of type driller-lurker -(defmethod dummy-25 driller-lurker ((obj driller-lurker)) +(defmethod driller-lurker-method-25 driller-lurker ((obj driller-lurker)) (when *target* (let* ((s5-0 (target-pos 0)) (f0-1 (- (-> s5-0 y) (-> obj root-overeride trans y))) @@ -606,7 +606,7 @@ ) ;; definition for method 26 of type driller-lurker -(defmethod dummy-26 driller-lurker ((obj driller-lurker)) +(defmethod driller-lurker-method-26 driller-lurker ((obj driller-lurker)) (when *target* (let* ((a1-0 (target-pos 0)) (f0-1 (- (-> a1-0 y) (-> obj root-overeride trans y))) @@ -623,7 +623,7 @@ ) ;; definition for method 24 of type driller-lurker -(defmethod dummy-24 driller-lurker ((obj driller-lurker)) +(defmethod driller-lurker-method-24 driller-lurker ((obj driller-lurker)) (when *target* (let* ((a1-0 (target-pos 0)) (f0-1 (- (-> a1-0 y) (-> obj root-overeride trans y))) @@ -635,7 +635,7 @@ (return #t) ) ((< f0-2 143360.0) - (let ((f0-3 (dummy-23 obj)) + (let ((f0-3 (driller-lurker-method-23 obj)) (f1-5 (-> obj path-u)) ) (if (>= (* 0.1 (-> obj path-units-per-meter)) (fabs (- f0-3 f1-5))) @@ -652,7 +652,7 @@ ) ;; definition for method 27 of type driller-lurker -(defmethod dummy-27 driller-lurker ((obj driller-lurker)) +(defmethod driller-lurker-method-27 driller-lurker ((obj driller-lurker)) (let ((a2-0 (-> obj node-list data 25 bone transform)) (s5-0 (new 'stack-no-clear 'vector)) ) @@ -687,10 +687,10 @@ (none) ) :trans (behavior () - (if (dummy-25 self) + (if (driller-lurker-method-25 self) (go driller-lurker-chase #t) ) - (dummy-20 self #t (the-as target #f)) + (driller-lurker-method-20 self #t (the-as target #f)) (none) ) :code (behavior () @@ -704,7 +704,7 @@ (until (ja-done? 0) (update! (-> self sound2)) (if (and (>= (ja-aframe-num 0) 7.0) (>= 13.0 (ja-aframe-num 0))) - (dummy-27 self) + (driller-lurker-method-27 self) ) (suspend) (ja :num! (seek! max f30-0)) @@ -743,10 +743,10 @@ (none) ) :trans (behavior () - (if (dummy-25 self) + (if (driller-lurker-method-25 self) (go driller-lurker-chase #t) ) - (dummy-20 self #t (the-as target #f)) + (driller-lurker-method-20 self #t (the-as target #f)) (none) ) :code (behavior () @@ -784,10 +784,10 @@ (none) ) :trans (behavior () - (if (dummy-25 self) + (if (driller-lurker-method-25 self) (go driller-lurker-chase #t) ) - (dummy-20 self #t (the-as target #f)) + (driller-lurker-method-20 self #t (the-as target #f)) (none) ) :code (behavior () @@ -846,17 +846,17 @@ (none) ) :trans (behavior () - (if (dummy-24 self) + (if (driller-lurker-method-24 self) (go driller-lurker-attack) ) - (if (dummy-26 self) + (if (driller-lurker-method-26 self) (go driller-lurker-patrol) ) (if (>= (- (-> *display* base-frame-counter) (-> self started-chasing-time)) (seconds 3)) (go driller-lurker-jammed-standing) ) (let* ((gp-0 (-> self path)) - (s5-0 (method-of-object gp-0 TODO-RENAME-20)) + (s5-0 (method-of-object gp-0 path-control-method-20)) ) (target-pos 0) (let ((f0-1 (- (s5-0 gp-0) (-> self path-u)))) @@ -878,7 +878,7 @@ ) ) ) - (dummy-20 self #f (the-as target #t)) + (driller-lurker-method-20 self #f (the-as target #t)) (none) ) :code (behavior ((arg0 symbol)) @@ -912,7 +912,7 @@ ) :trans (behavior () (cond - ((dummy-24 self) + ((driller-lurker-method-24 self) (set! (-> self state-time) (-> *display* base-frame-counter)) ) (else @@ -924,7 +924,7 @@ (if (>= (- (-> *display* base-frame-counter) (-> self started-chasing-time)) (seconds 3)) (go driller-lurker-jammed-standing) ) - (dummy-20 self #f (the-as target #t)) + (driller-lurker-method-20 self #f (the-as target #t)) (none) ) :code (behavior () @@ -957,7 +957,7 @@ (none) ) :trans (behavior () - (dummy-20 self #f (the-as target #f)) + (driller-lurker-method-20 self #f (the-as target #f)) (none) ) :code (behavior () @@ -1173,7 +1173,7 @@ ) (eval-path-curve! (-> obj path) (-> obj root-overeride trans) (-> obj path-u) 'interp) (let ((s5-1 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> obj path) s5-1 (-> obj path-u)) + (path-control-method-14 (-> obj path) s5-1 (-> obj path-u)) (let ((f0-51 (atan (-> s5-1 x) (-> s5-1 z)))) (if (< (-> obj path-dir) 0.0) (set! f0-51 (+ 32768.0 f0-51)) diff --git a/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc b/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc index ac8cc77141..2ac21e1c0c 100644 --- a/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/gnawer_REF.gc @@ -131,17 +131,17 @@ :size-assert #x5d0 :flag-assert #x1f056005d0 (:methods - (dummy-20 (_type_ int) matrix 20) - (dummy-21 (_type_ int bounding-box symbol float) float 21) - (dummy-22 (_type_ float) symbol 22) - (dummy-23 (_type_) none 23) - (dummy-24 (_type_) none 24) - (dummy-25 (_type_) symbol 25) - (dummy-26 (_type_) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_ int int) symbol 28) - (dummy-29 (_type_ int vector vector) float 29) - (dummy-30 (_type_ process-drawable) uint 30) + (gnawer-method-20 (_type_ int) matrix 20) + (gnawer-method-21 (_type_ int bounding-box symbol float) float 21) + (gnawer-method-22 (_type_ float) symbol 22) + (gnawer-method-23 (_type_) none 23) + (gnawer-method-24 (_type_) none 24) + (gnawer-method-25 (_type_) symbol 25) + (gnawer-method-26 (_type_) none 26) + (gnawer-method-27 (_type_) none 27) + (gnawer-method-28 (_type_ int int) symbol 28) + (gnawer-method-29 (_type_ int vector vector) float 29) + (gnawer-method-30 (_type_ process-drawable) uint 30) ) (:states gnawer-chewing-on-post @@ -489,7 +489,7 @@ ;; definition for method 23 of type gnawer ;; INFO: Used lq/sq ;; INFO: Return type mismatch vector vs none. -(defmethod dummy-23 gnawer ((obj gnawer)) +(defmethod gnawer-method-23 gnawer ((obj gnawer)) (when (not (-> obj hidden?)) (set! (-> obj hidden?) #t) (logior! (-> obj draw status) (draw-status hidden)) @@ -507,7 +507,7 @@ ;; definition for method 26 of type gnawer ;; INFO: Return type mismatch draw-status vs none. -(defmethod dummy-26 gnawer ((obj gnawer)) +(defmethod gnawer-method-26 gnawer ((obj gnawer)) (when (-> obj hidden?) (set! (-> obj hidden?) #f) (restore-collide-with-as (-> obj root-override)) @@ -520,7 +520,7 @@ ;; definition for method 24 of type gnawer ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 gnawer ((obj gnawer)) +(defmethod gnawer-method-24 gnawer ((obj gnawer)) (local-vars (sv-48 vector) (sv-64 vector)) (let ((s5-0 0) (s4-0 0) @@ -620,7 +620,7 @@ ;; definition for method 22 of type gnawer ;; INFO: Used lq/sq -(defmethod dummy-22 gnawer ((obj gnawer) (arg0 float)) +(defmethod gnawer-method-22 gnawer ((obj gnawer) (arg0 float)) (let ((s4-0 (new 'stack-no-clear 'bounding-box)) (a3-0 #t) (gp-0 #t) @@ -642,11 +642,11 @@ (set! gp-0 #f) ) ) - (dummy-21 obj s2-0 s4-0 a3-0 f0-1) + (gnawer-method-21 obj s2-0 s4-0 a3-0 f0-1) ) ) (else - (dummy-20 obj s2-0) + (gnawer-method-20 obj s2-0) ) ) ) @@ -680,7 +680,7 @@ ;; definition for method 21 of type gnawer ;; INFO: Used lq/sq -(defmethod dummy-21 gnawer ((obj gnawer) (arg0 int) (arg1 bounding-box) (arg2 symbol) (arg3 float)) +(defmethod gnawer-method-21 gnawer ((obj gnawer) (arg0 int) (arg1 bounding-box) (arg2 symbol) (arg3 float)) (let ((gp-0 (-> obj segments arg0))) (let ((f0-1 (+ 10240.0 (-> obj route surface-dist)))) (cond @@ -749,7 +749,7 @@ ;; definition for method 20 of type gnawer ;; INFO: Used lq/sq -(defmethod dummy-20 gnawer ((obj gnawer) (arg0 int)) +(defmethod gnawer-method-20 gnawer ((obj gnawer) (arg0 int)) (let ((v1-3 (-> obj segments arg0)) (a0-1 (-> obj segments (+ arg0 -1))) ) @@ -772,7 +772,7 @@ ) ;; definition for method 25 of type gnawer -(defmethod dummy-25 gnawer ((obj gnawer)) +(defmethod gnawer-method-25 gnawer ((obj gnawer)) (dotimes (s5-0 3) (when (> (-> obj hit-points) 0) (+! (-> obj hit-points) -1) @@ -809,7 +809,7 @@ ;; definition for method 28 of type gnawer ;; INFO: Return type mismatch int vs symbol. -(defmethod dummy-28 gnawer ((obj gnawer) (arg0 int) (arg1 int)) +(defmethod gnawer-method-28 gnawer ((obj gnawer) (arg0 int) (arg1 int)) (when (> arg0 0) (let* ((v1-1 (rand-vu-int-count arg0)) (a0-2 v1-1) @@ -829,7 +829,7 @@ ;; definition for method 27 of type gnawer ;; INFO: Return type mismatch int vs none. -(defmethod dummy-27 gnawer ((obj gnawer)) +(defmethod gnawer-method-27 gnawer ((obj gnawer)) (set! (-> obj eco-green-mask) (the-as uint 0)) (let ((s4-0 (-> obj path curve num-cverts)) (s3-0 (get-death-count *game-info* #f)) @@ -840,7 +840,7 @@ (and (< 1 s3-0) (and (>= 2.0 (-> *target* fact-info-target health)) (rand-vu-percent? 0.05))) ) ) - (let ((v1-14 (dummy-28 obj s4-0 (the-as int s5-0)))) + (let ((v1-14 (gnawer-method-28 obj s4-0 (the-as int s5-0)))) (logior s5-0 (the-as uint v1-14)) (set! (-> obj eco-green-mask) (the-as uint (logior (-> obj eco-green-mask) (the-as uint v1-14)))) ) @@ -850,7 +850,7 @@ ) ;; definition for method 29 of type gnawer -(defmethod dummy-29 gnawer ((obj gnawer) (arg0 int) (arg1 vector) (arg2 vector)) +(defmethod gnawer-method-29 gnawer ((obj gnawer) (arg0 int) (arg1 vector) (arg2 vector)) (let ((s1-0 (-> obj path curve num-cverts)) (s2-0 (new 'stack-no-clear 'vector)) ) @@ -879,7 +879,7 @@ ;; definition for method 30 of type gnawer ;; INFO: Used lq/sq -(defmethod dummy-30 gnawer ((obj gnawer) (arg0 process-drawable)) +(defmethod gnawer-method-30 gnawer ((obj gnawer) (arg0 process-drawable)) (local-vars (sv-48 vector)) (let ((gp-0 (-> obj entity extra perm))) (logior! (-> gp-0 status) (entity-perm-status user-set-from-cstage)) @@ -893,7 +893,7 @@ (when (logtest? (ash 1 s0-0) s5-0) (let ((a2-0 (new 'stack-no-clear 'vector))) (set! sv-48 (new 'stack-no-clear 'vector)) - (dummy-29 obj s0-0 a2-0 sv-48) + (gnawer-method-29 obj s0-0 a2-0 sv-48) ) (let* ((t9-1 vector-vector-xz-distance) (a1-2 (-> arg0 root trans)) @@ -1060,7 +1060,7 @@ (defstate gnawer-wait-to-run (gnawer) :code (behavior () (set! (-> self draw origin-joint-index) (the-as uint 0)) - (dummy-23 self) + (gnawer-method-23 self) (set! (-> self state-time) (-> *display* base-frame-counter)) (let ((gp-0 (rand-vu-int-range 240 360))) (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) gp-0) @@ -1114,7 +1114,7 @@ ) (spawn (-> self part) (-> v1-22 world-pos)) ) - (if (dummy-25 self) + (if (gnawer-method-25 self) (go gnawer-die) ) (return #t) @@ -1127,9 +1127,9 @@ :enter (behavior () (logclear! (-> self mask) (process-mask actor-pause)) (set! (-> self route-dist) 0.0) - (dummy-24 self) + (gnawer-method-24 self) (set! (-> self last-hit-time) (-> *display* base-frame-counter)) - (dummy-26 self) + (gnawer-method-26 self) (none) ) :exit (behavior () @@ -1139,7 +1139,7 @@ ) :trans (behavior () (+! (-> self route-dist) (* (-> self speed) (-> *display* seconds-per-frame))) - (if (dummy-22 self (-> self route-dist)) + (if (gnawer-method-22 self (-> self route-dist)) (go gnawer-wait-to-run) ) (update! (-> self sound)) @@ -1227,7 +1227,7 @@ (the-as object (case event-type (('notify) (if (and (= (-> proc type) money) (= (-> event param 0) 'pickup)) - (dummy-30 self (the-as process-drawable proc)) + (gnawer-method-30 self (the-as process-drawable proc)) ) ) ) @@ -1245,7 +1245,7 @@ (ja-post) (logior! (-> self draw status) (draw-status hidden)) (process-entity-status! self (entity-perm-status complete) #t) - (dummy-27 self) + (gnawer-method-27 self) (let ((v1-10 (-> self entity extra perm))) (logior! (-> v1-10 status) (entity-perm-status user-set-from-cstage)) (set! (-> v1-10 user-int16 0) (the-as int (-> self money-mask))) @@ -1254,7 +1254,7 @@ (let ((s4-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'vector)) ) - (dummy-29 self gp-0 s4-0 s5-0) + (gnawer-method-29 self gp-0 s4-0 s5-0) (let ((a1-2 7)) (let ((v1-14 (ash 1 gp-0))) (cond @@ -1307,7 +1307,7 @@ ) ) ((and (= (-> proc type) money) (= (-> event param 0) 'pickup)) - (dummy-30 self (the-as process-drawable proc)) + (gnawer-method-30 self (the-as process-drawable proc)) ) ) ) @@ -1368,7 +1368,7 @@ (the-as object (case event-type (('notify) (if (and (= (-> proc type) money) (= (-> event param 0) 'pickup)) - (dummy-30 self (the-as process-drawable proc)) + (gnawer-method-30 self (the-as process-drawable proc)) ) ) ) @@ -1406,7 +1406,7 @@ (let ((a2-1 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'vector)) ) - (dummy-29 self s4-0 a2-1 s3-0) + (gnawer-method-29 self s4-0 a2-1 s3-0) (birth-pickup-at-point s3-0 (pickup-type money) 1.0 #f self (the-as fact-info #f)) ) ) diff --git a/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc b/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc index 2a8330136d..74517361dc 100644 --- a/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/maincave-obs_REF.gc @@ -113,8 +113,8 @@ ;; definition for method 22 of type cave-water ;; INFO: Return type mismatch rgbaf vs none. -(defmethod TODO-RENAME-22 cave-water ((obj cave-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 cave-water ((obj cave-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) @@ -171,7 +171,7 @@ (collide-action solid) (collide-action) ) - (target-attack-up *target* 'attack-or-shove 'deadlyup) + (the-as symbol (target-attack-up *target* 'attack-or-shove 'deadlyup)) ) ) ) @@ -506,7 +506,7 @@ (collide-action) ) (let ((s4-0 (new 'stack 'attack-info))) - (dummy-41 (-> self root-override) s4-0 (-> self shove-up)) + (calc-shove-up (-> self root-override) s4-0 (-> self shove-up)) (if (or (= (-> *target* control unknown-surface00 mode) 'air) (>= (+ (-> *display* base-frame-counter) (seconds -0.2)) (-> *target* control unknown-dword11)) (< 0.75 (-> *target* control poly-normal y)) @@ -979,8 +979,8 @@ :size-assert #x150 :flag-assert #x1600e00150 (:methods - (TODO-RENAME-20 (_type_) none 20) - (TODO-RENAME-21 (_type_) float 21) + (caveelevator-method-20 (_type_) none 20) + (caveelevator-method-21 (_type_) float 21) ) (:states caveelevator-cycle-active @@ -1025,7 +1025,7 @@ ) ) (set! (-> s5-0 w) arg2) - (let ((f0-1 (TODO-RENAME-10 *cavecrystal-light-control* s5-0)) + (let ((f0-1 (cavecrystal-light-control-method-10 *cavecrystal-light-control* s5-0)) (a2-2 (new 'static 'vector :x 1.0 :y 1.0 :z 1.0 :w 1.0)) (a1-5 (new 'static 'vector :x 0.3 :y 0.3 :z 0.3 :w 1.0)) ) @@ -1036,7 +1036,7 @@ ;; definition for method 20 of type caveelevator ;; INFO: Used lq/sq -(defmethod TODO-RENAME-20 caveelevator ((obj caveelevator)) +(defmethod caveelevator-method-20 caveelevator ((obj caveelevator)) (let ((v1-1 (-> *display* base-frame-counter))) (when (!= v1-1 (-> obj last-update-bounce-time)) (set! (-> obj last-update-bounce-time) v1-1) @@ -1053,7 +1053,7 @@ ) ;; definition for method 21 of type caveelevator -(defmethod TODO-RENAME-21 caveelevator ((obj caveelevator)) +(defmethod caveelevator-method-21 caveelevator ((obj caveelevator)) (let ((s5-0 (new 'stack-no-clear 'vector)) (gp-0 (-> obj draw bounds)) ) @@ -1083,7 +1083,7 @@ ) :trans (behavior () (rider-trans) - (TODO-RENAME-20 self) + (caveelevator-method-20 self) (none) ) :code (behavior () @@ -1101,7 +1101,7 @@ ) :post (behavior () (rider-post) - (TODO-RENAME-21 self) + (caveelevator-method-21 self) (none) ) ) @@ -1125,7 +1125,7 @@ ) :trans (behavior () (rider-trans) - (TODO-RENAME-20 self) + (caveelevator-method-20 self) (none) ) :code (behavior () @@ -1141,7 +1141,7 @@ ) :post (behavior () (rider-post) - (TODO-RENAME-21 self) + (caveelevator-method-21 self) (none) ) ) @@ -1166,7 +1166,7 @@ ) :trans (behavior () (rider-trans) - (TODO-RENAME-20 self) + (caveelevator-method-20 self) (none) ) :code (behavior () @@ -1181,7 +1181,7 @@ ) :post (behavior () (rider-post) - (TODO-RENAME-21 self) + (caveelevator-method-21 self) (none) ) ) @@ -1212,7 +1212,7 @@ ) ) (rider-trans) - (TODO-RENAME-20 self) + (caveelevator-method-20 self) (none) ) :code (behavior () @@ -1224,7 +1224,7 @@ ) :post (behavior () (rider-post) - (TODO-RENAME-21 self) + (caveelevator-method-21 self) (none) ) ) @@ -1249,7 +1249,7 @@ ) :trans (behavior () (rider-trans) - (TODO-RENAME-20 self) + (caveelevator-method-20 self) (none) ) :code (behavior () @@ -1264,7 +1264,7 @@ ) :post (behavior () (rider-post) - (TODO-RENAME-21 self) + (caveelevator-method-21 self) (none) ) ) diff --git a/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc b/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc index d72f0c81c6..89d49cb826 100644 --- a/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/mother-spider-egg_REF.gc @@ -21,7 +21,7 @@ :size-assert #x150 :flag-assert #x1600e00150 (:methods - (dummy-20 (_type_) none 20) + (mother-spider-egg-method-20 (_type_) none 20) (draw-egg-shadow (_type_ vector symbol) symbol 21) ) (:states @@ -291,14 +291,15 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('touch) - (send-shove-back - (-> self root-override) - proc - (the-as touching-shapes-entry (-> event param 0)) - 0.7 - 6144.0 - 16384.0 - ) + (the-as object (send-shove-back + (-> self root-override) + proc + (the-as touching-shapes-entry (-> event param 0)) + 0.7 + 6144.0 + 16384.0 + ) + ) ) (('attack) (go mother-spider-egg-die) diff --git a/test/decompiler/reference/jak1/levels/maincave/mother-spider-h_REF.gc b/test/decompiler/reference/jak1/levels/maincave/mother-spider-h_REF.gc index 3ad446cdb4..7dceed2b65 100644 --- a/test/decompiler/reference/jak1/levels/maincave/mother-spider-h_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/mother-spider-h_REF.gc @@ -158,16 +158,16 @@ :size-assert #x1f0 :flag-assert #x20018001f0 (:methods - (TODO-RENAME-20 (_type_ vector vector) symbol 20) - (TODO-RENAME-21 (_type_ vector float symbol) symbol 21) - (dummy-22 (_type_ matrix vector) float 22) - (TODO-RENAME-23 (_type_) none 23) - (TODO-RENAME-24 (_type_) number 24) + (mother-spider-method-20 (_type_ vector vector) symbol 20) + (mother-spider-method-21 (_type_ vector float symbol) symbol 21) + (mother-spider-method-22 (_type_ matrix vector) float 22) + (mother-spider-method-23 (_type_) none 23) + (shadow-handler (_type_) number 24) (letgo-player? (_type_) symbol 25) (grab-player? (_type_) symbol 26) - (STUB-27 (_type_) none 27) - (STUB-28 (_type_) none 28) - (TODO-RENAME-29 (_type_ symbol symbol) none 29) + (mother-spider-method-27 (_type_) none 27) + (mother-spider-method-28 (_type_) none 28) + (mother-spider-method-29 (_type_ symbol symbol) none 29) (spawn-child (_type_ vector vector symbol) int 30) (is-player-stuck? (_type_) symbol 31) ) diff --git a/test/decompiler/reference/jak1/levels/maincave/mother-spider-proj_REF.gc b/test/decompiler/reference/jak1/levels/maincave/mother-spider-proj_REF.gc index 3b52b13fa2..fc9dc1f43e 100644 --- a/test/decompiler/reference/jak1/levels/maincave/mother-spider-proj_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/mother-spider-proj_REF.gc @@ -239,7 +239,7 @@ ) ;; definition for method 24 of type mother-spider-proj -(defmethod dummy-24 mother-spider-proj ((obj mother-spider-proj)) +(defmethod projectile-method-24 mother-spider-proj ((obj mother-spider-proj)) (with-pp (spawn (-> obj part) (the-as vector (-> obj root-override root-prim prim-core))) (let ((s5-0 (the-as sound-rpc-set-param (get-sound-buffer-entry)))) @@ -308,7 +308,7 @@ ;; definition for method 26 of type mother-spider-proj ;; INFO: Return type mismatch int vs none. -(defmethod dummy-26 mother-spider-proj ((obj mother-spider-proj)) +(defmethod projectile-method-26 mother-spider-proj ((obj mother-spider-proj)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) projectile-collision-reaction) @@ -342,7 +342,7 @@ ;; definition for method 27 of type mother-spider-proj ;; INFO: Used lq/sq ;; INFO: Return type mismatch sound-id vs none. -(defmethod dummy-27 mother-spider-proj ((obj mother-spider-proj)) +(defmethod projectile-method-27 mother-spider-proj ((obj mother-spider-proj)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 326) obj)) (set! (-> obj max-speed) 32768.0) (set! (-> obj update-velocity) mother-spider-proj-update-velocity) @@ -361,7 +361,7 @@ ;; definition for method 28 of type mother-spider-proj ;; INFO: Used lq/sq ;; INFO: Return type mismatch vector vs none. -(defmethod dummy-28 mother-spider-proj ((obj mother-spider-proj)) +(defmethod projectile-method-28 mother-spider-proj ((obj mother-spider-proj)) (when (and *target* (not (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) diff --git a/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc b/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc index 298f5ec09e..ce09527aa1 100644 --- a/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc +++ b/test/decompiler/reference/jak1/levels/maincave/mother-spider_REF.gc @@ -259,7 +259,7 @@ (set! (-> gp-0 y) 0.0) (vector-normalize! gp-0 1.0) (set! (-> self thread-vel) (+ -40960.0 (-> self thread-vel))) - (if (TODO-RENAME-21 self gp-0 102400.0 #t) + (if (mother-spider-method-21 self gp-0 102400.0 #t) (go mother-spider-die) ) ) @@ -276,7 +276,7 @@ (set! (-> gp-1 y) 0.0) (vector-normalize! gp-1 1.0) (set! (-> self thread-vel) (+ -40960.0 (-> self thread-vel))) - (if (TODO-RENAME-21 self gp-1 102400.0 #t) + (if (mother-spider-method-21 self gp-1 102400.0 #t) (go mother-spider-die) ) ) @@ -298,7 +298,7 @@ (set! (-> gp-2 y) 0.0) (vector-normalize! gp-2 1.0) (set! (-> self thread-vel) (+ -8192.0 (-> self thread-vel))) - (TODO-RENAME-21 self gp-2 40960.0 #f) + (mother-spider-method-21 self gp-2 40960.0 #f) ) ) ) @@ -388,20 +388,20 @@ ;; definition for method 27 of type mother-spider ;; INFO: Return type mismatch symbol vs none. -(defmethod STUB-27 mother-spider ((obj mother-spider)) +(defmethod mother-spider-method-27 mother-spider ((obj mother-spider)) (none) ) ;; definition for method 28 of type mother-spider ;; INFO: Return type mismatch int vs none. -(defmethod STUB-28 mother-spider ((obj mother-spider)) +(defmethod mother-spider-method-28 mother-spider ((obj mother-spider)) 0 (none) ) ;; definition for method 24 of type mother-spider ;; INFO: Used lq/sq -(defmethod TODO-RENAME-24 mother-spider ((obj mother-spider)) +(defmethod shadow-handler mother-spider ((obj mother-spider)) (cond ((and (-> obj draw shadow) (zero? (-> obj draw cur-lod)) @@ -510,7 +510,7 @@ ;; definition for method 21 of type mother-spider ;; INFO: Used lq/sq -(defmethod TODO-RENAME-21 mother-spider ((obj mother-spider) (arg0 vector) (arg1 float) (arg2 symbol)) +(defmethod mother-spider-method-21 mother-spider ((obj mother-spider) (arg0 vector) (arg1 float) (arg2 symbol)) (local-vars (sv-112 process) (sv-128 vector) (sv-144 vector)) (let ((f30-0 (vector-length (-> obj swing-pos)))) (when (< 0.0 f30-0) @@ -583,11 +583,11 @@ ) ;; definition for method 29 of type mother-spider -(defmethod TODO-RENAME-29 mother-spider ((obj mother-spider) (arg0 symbol) (arg1 symbol)) +(defmethod mother-spider-method-29 mother-spider ((obj mother-spider) (arg0 symbol) (arg1 symbol)) (let ((v1-1 (-> *display* base-frame-counter))) (when (!= v1-1 (-> obj last-update-time)) (set! (-> obj last-update-time) v1-1) - (TODO-RENAME-23 obj) + (mother-spider-method-23 obj) (let ((f0-1 (fmax 0.0 (- (-> obj dist-from-anchor) (-> obj idle-dist-from-anchor))))) (cond ((>= f0-1 20480.0) @@ -601,7 +601,7 @@ ) ) (if arg0 - (TODO-RENAME-24 obj) + (shadow-handler obj) ) (let ((s4-1 (-> obj leg-socket-part-mask))) (when (nonzero? s4-1) @@ -645,7 +645,7 @@ ;; definition for method 23 of type mother-spider ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 mother-spider ((obj mother-spider)) +(defmethod mother-spider-method-23 mother-spider ((obj mother-spider)) (local-vars (at-0 int)) (rlet ((vf0 :class vf) (vf1 :class vf) @@ -958,7 +958,7 @@ ) ) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior ((arg0 uint)) @@ -1002,7 +1002,7 @@ (if (-> self hit?) (go mother-spider-hit-while-tracking) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1103,7 +1103,7 @@ ) ) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1146,7 +1146,7 @@ (set! (-> self last-spit-time) 0) (go mother-spider-tracking) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1181,7 +1181,7 @@ (if (-> self hit?) (go mother-spider-hit-while-tracking) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1222,7 +1222,7 @@ (set! gp-0 #t) (set! (-> self last-spit-time) (-> *display* base-frame-counter)) (vector-negate! s5-0 s5-0) - (TODO-RENAME-21 self s5-0 49152.0 #f) + (mother-spider-method-21 self s5-0 49152.0 #f) (when (nonzero? (-> self max-baby-count)) (+! (-> self spit-counter) -1) (when (< (-> self spit-counter) 0) @@ -1277,12 +1277,12 @@ (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) ) ) - (TODO-RENAME-21 (-> self nav) (-> self root-override trans)) + (nav-control-method-21 (-> self nav) (-> self root-override trans)) ) ) (go mother-spider-birth-baby) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1325,10 +1325,10 @@ (if (letgo-player? self) (go mother-spider-traveling (the-as uint 0)) ) - (if (not (TODO-RENAME-21 (-> self nav) (-> self root-override trans))) + (if (not (nav-control-method-21 (-> self nav) (-> self root-override trans))) (go mother-spider-birthing) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1341,7 +1341,7 @@ (let ((s5-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) ) - (when (TODO-RENAME-20 self s5-0 s4-0) + (when (mother-spider-method-20 self s5-0 s4-0) (process-spawn mother-spider-egg (-> self entity) (-> self root-override trans) s5-0 s4-0 :to self) (+! (-> self baby-count) 1) (+! (-> self birthing-counter) -1) @@ -1361,10 +1361,10 @@ ;; definition for method 20 of type mother-spider ;; INFO: Used lq/sq -(defmethod TODO-RENAME-20 mother-spider ((obj mother-spider) (arg0 vector) (arg1 vector)) +(defmethod mother-spider-method-20 mother-spider ((obj mother-spider) (arg0 vector) (arg1 vector)) (set! (-> obj nav nav-cull-radius) 40960.0) - (set-current-poly! (-> obj nav) (dummy-16 (-> obj nav) (-> obj root-override trans))) - (TODO-RENAME-28 (-> obj nav) (the-as collide-kind -1)) + (set-current-poly! (-> obj nav) (nav-control-method-16 (-> obj nav) (-> obj root-override trans))) + (nav-control-method-28 (-> obj nav) (the-as collide-kind -1)) (dotimes (s3-1 4) (let ((f28-0 (+ 32768.0 (-> obj orient-rot y))) (f30-0 (rand-vu-float-range 16384.0 40960.0)) @@ -1376,9 +1376,9 @@ (set-vector! s1-0 (sin f28-1) 0.0 (cos f28-1) 1.0) ) (vector-float*! s2-1 s1-0 f30-0) - (dummy-35 (-> obj nav) (-> obj nav travel) (-> obj root-override trans) s2-1 s1-0 f30-0) + (nav-control-method-35 (-> obj nav) (-> obj nav travel) (-> obj root-override trans) s2-1 s1-0 f30-0) ) - (dummy-24 (-> obj nav) f30-0 (the-as clip-travel-vector-to-mesh-return-info #f)) + (nav-control-method-24 (-> obj nav) f30-0 (the-as clip-travel-vector-to-mesh-return-info #f)) ) (cond ((>= (vector-xz-length (-> obj nav travel)) 4096.0) @@ -1457,7 +1457,7 @@ (if (= (-> self spin-vel) 0.0) (go mother-spider-birthing) ) - (TODO-RENAME-29 self #t #t) + (mother-spider-method-29 self #t #t) (none) ) :code (behavior () @@ -1514,7 +1514,7 @@ (none) ) :trans (behavior () - (TODO-RENAME-29 self #f #f) + (mother-spider-method-29 self #f #f) (none) ) :code (behavior () @@ -1540,7 +1540,7 @@ (defstate mother-spider-die (mother-spider) :event mother-spider-death-event-handler :trans (behavior () - (TODO-RENAME-29 self #f #f) + (mother-spider-method-29 self #f #f) (none) ) :code (behavior () @@ -1599,7 +1599,7 @@ (set! (-> s4-0 vector 3 z) (+ (-> arg0 anchor-trans z) (* f0-5 (-> v1-1 swing-arc-u)))) ) (if a1-0 - (dummy-22 arg0 a1-0 (-> s4-0 vector 3)) + (mother-spider-method-22 arg0 a1-0 (-> s4-0 vector 3)) ) (set! a1-0 s4-0) ) @@ -1609,7 +1609,7 @@ ) (vector-! a2-7 (-> arg0 root-override trans) (-> a0-11 vector 3)) (vector+! a2-7 a2-7 (-> arg0 root-override trans)) - (dummy-22 arg0 a1-0 a2-7) + (mother-spider-method-22 arg0 a1-0 a2-7) ) ) (dotimes (v1-16 (-> arg0 damage)) @@ -1633,7 +1633,7 @@ ) ;; definition for method 22 of type mother-spider -(defmethod dummy-22 mother-spider ((obj mother-spider) (arg0 matrix) (arg1 vector)) +(defmethod mother-spider-method-22 mother-spider ((obj mother-spider) (arg0 matrix) (arg1 vector)) (rlet ((vf0 :class vf)) (init-vf0-vector) (vector-! (-> arg0 vector 2) arg1 (-> arg0 vector 3)) diff --git a/test/decompiler/reference/jak1/levels/misty/babak-with-cannon_REF.gc b/test/decompiler/reference/jak1/levels/misty/babak-with-cannon_REF.gc index 8f58ecef89..b036b9b4ff 100644 --- a/test/decompiler/reference/jak1/levels/misty/babak-with-cannon_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/babak-with-cannon_REF.gc @@ -291,7 +291,7 @@ nav-enemy-default-event-handler ) (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-travel)) (nav-enemy-execute-jump) - (let ((a1-6 (dummy-16 (-> self nav) (-> self jump-dest)))) + (let ((a1-6 (nav-control-method-16 (-> self nav) (-> self jump-dest)))) (set-current-poly! (-> self nav) a1-6) ) (go-virtual nav-enemy-jump-land) @@ -428,7 +428,7 @@ nav-enemy-default-event-handler (defmethod init-from-entity! babak-with-cannon ((obj babak-with-cannon) (arg0 entity-actor)) (initialize-collision obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-48 obj) + (nav-enemy-method-48 obj) (set! (-> obj distance) (res-lump-float arg0 'distance :default 163840.0)) (set! (-> obj cannon-ent) (entity-actor-lookup (-> obj entity) 'alt-actor 0)) (logclear! (-> obj mask) (process-mask actor-pause)) diff --git a/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc b/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc index 0635101083..b15fadf5ef 100644 --- a/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/balloonlurker_REF.gc @@ -374,8 +374,8 @@ :size-assert #xb0 :flag-assert #x16004000b0 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) none 21) + (balloonlurker-pilot-method-20 (_type_) none 20) + (balloonlurker-pilot-method-21 (_type_) none 21) ) (:states balloonlurker-pilot-die @@ -447,7 +447,7 @@ ) (eval-path-curve-div! (-> self path) s4-0 (the float arg0) 'interp) (set! (-> self root-overlay trans quad) (-> s4-0 quad)) - (TODO-RENAME-12 (-> self path) gp-0 (the float arg0)) + (path-control-method-12 (-> self path) gp-0 (the float arg0)) (set! (-> gp-0 y) 0.0) (vector-normalize! gp-0 1.0) (forward-up-nopitch->quaternion (-> self root-overlay quat) gp-0 *up-vector*) @@ -550,7 +550,7 @@ ;; definition for method 23 of type balloonlurker ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 balloonlurker ((obj balloonlurker) (arg0 float)) +(defmethod rigid-body-platform-method-23 balloonlurker ((obj balloonlurker) (arg0 float)) (let ((s5-0 (new 'stack-no-clear 'vector))) (let ((s3-0 (new 'stack-no-clear 'vector)) (s4-0 (-> obj rbody matrix)) @@ -558,7 +558,7 @@ (dotimes (s2-0 4) (let ((s1-0 (-> obj control-point-array data s2-0))) (vector-matrix*! (-> s1-0 world-pos) (-> s1-0 local-pos) s4-0) - (TODO-RENAME-17 (-> obj rbody) (-> s1-0 world-pos) (-> s1-0 velocity)) + (rigid-body-method-17 (-> obj rbody) (-> s1-0 world-pos) (-> s1-0 velocity)) (let* ((f30-0 (vector-vector-xz-distance (-> obj dest-point) (-> obj root-overlay trans))) (f0-0 (vector-vector-xz-distance (-> obj dest-point-old) (-> obj root-overlay trans))) (f0-6 @@ -583,16 +583,16 @@ ) ) ) - (TODO-RENAME-13 (-> obj rbody) (-> s1-0 world-pos) s5-0) + (rigid-body-method-13 (-> obj rbody) (-> s1-0 world-pos) s5-0) (vector-float*! s5-0 (-> s1-0 velocity) (* -1.0 (-> obj info drag-factor))) - (TODO-RENAME-13 (-> obj rbody) (-> s1-0 world-pos) s5-0) + (rigid-body-method-13 (-> obj rbody) (-> s1-0 world-pos) s5-0) ) 0 ) (let ((s2-1 (-> obj control-point-array data 4))) (let ((f30-1 (* (-> *BALLOONLURKER-bank* max-rudder-deflection-angle) (-> obj rudder-control)))) (vector-matrix*! (-> s2-1 world-pos) (-> s2-1 local-pos) s4-0) - (TODO-RENAME-17 (-> obj rbody) (-> s2-1 world-pos) (-> s2-1 velocity)) + (rigid-body-method-17 (-> obj rbody) (-> s2-1 world-pos) (-> s2-1 velocity)) (set-vector! s3-0 (cos f30-1) 0.0 (sin f30-1) 1.0) ) (vector-rotate*! s3-0 s3-0 s4-0) @@ -601,14 +601,14 @@ s3-0 (* -1.0 (-> *BALLOONLURKER-bank* rudder-factor) (vector-dot s3-0 (-> s2-1 velocity))) ) - (TODO-RENAME-13 (-> obj rbody) (-> s2-1 world-pos) s5-0) + (rigid-body-method-13 (-> obj rbody) (-> s2-1 world-pos) s5-0) ) 0 (let ((s3-1 (-> obj control-point-array data 5))) (vector-matrix*! (-> s3-1 world-pos) (-> s3-1 local-pos) s4-0) (set! (-> s3-1 world-pos quad) (-> s3-1 world-pos quad)) (vector-float*! s5-0 (-> s4-0 vector 2) (-> obj engine-thrust)) - (TODO-RENAME-13 (-> obj rbody) (-> s3-1 world-pos) s5-0) + (rigid-body-method-13 (-> obj rbody) (-> s3-1 world-pos) s5-0) ) ) (dotimes (s4-1 2) @@ -621,7 +621,7 @@ ) ) (vector-float*! s5-0 *y-vector* (-> *BALLOONLURKER-bank* mine-weight)) - (TODO-RENAME-13 (-> obj rbody) (-> v1-43 world-pos) s5-0) + (rigid-body-method-13 (-> obj rbody) (-> v1-43 world-pos) s5-0) ) ) ) @@ -630,15 +630,15 @@ *y-vector* (* -1.0 (-> obj info gravity-factor) (-> obj info gravity) (-> obj rbody mass)) ) - (TODO-RENAME-15 (-> obj rbody) s5-0) + (rigid-body-method-15 (-> obj rbody) s5-0) ) (when (or (-> obj player-impulse) (-> obj player-contact)) (set! (-> obj player-impulse) #f) - (TODO-RENAME-13 (-> obj rbody) (-> obj player-force-position) (-> obj player-force)) + (rigid-body-method-13 (-> obj rbody) (-> obj player-force-position) (-> obj player-force)) ) (when (-> obj explosion) (set! (-> obj explosion) #f) - (TODO-RENAME-13 (-> obj rbody) (-> obj explosion-force-position) (-> obj explosion-force)) + (rigid-body-method-13 (-> obj rbody) (-> obj explosion-force-position) (-> obj explosion-force)) ) 0 (none) @@ -752,9 +752,9 @@ (quaternion-vector-angle! gp-1 *x-vector* f0-34) (quaternion*! (-> self rudder transform quat) (the-as quaternion *balloonlurker-rudder-joint-home*) gp-1) ) - (TODO-RENAME-28 self) + (rigid-body-platform-method-28 self) (quaternion-copy! (-> self root-overlay quat) (-> self rbody rotation)) - (TODO-RENAME-18 (-> self rbody) (-> self root-overlay trans)) + (rigid-body-method-18 (-> self rbody) (-> self root-overlay trans)) (balloonlurker-play-sounds) (when (nonzero? (-> self draw)) (cond @@ -967,7 +967,7 @@ (-> self root-override trans) :to *entity-pool* ) - (TODO-RENAME-17 + (rigid-body-method-17 (-> self parent-override 0 rbody) (-> self root-override trans) (-> self root-override transv) @@ -995,7 +995,7 @@ ;; definition for method 20 of type balloonlurker-pilot ;; INFO: Return type mismatch int vs none. -(defmethod dummy-20 balloonlurker-pilot ((obj balloonlurker-pilot)) +(defmethod balloonlurker-pilot-method-20 balloonlurker-pilot ((obj balloonlurker-pilot)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1020,7 +1020,7 @@ ;; definition for method 21 of type balloonlurker-pilot ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 balloonlurker-pilot ((obj balloonlurker-pilot)) +(defmethod balloonlurker-pilot-method-21 balloonlurker-pilot ((obj balloonlurker-pilot)) (initialize-skeleton obj *balloonlurker-pilot-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 6)) 0 @@ -1032,7 +1032,7 @@ ;; INFO: Return type mismatch object vs none. (defbehavior balloonlurker-pilot-init-by-other balloonlurker-pilot ((arg0 balloonlurker)) (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) - (dummy-20 self) + (balloonlurker-pilot-method-20 self) (logclear! (-> self mask) (process-mask actor-pause)) (set! (-> self fact) (new 'process 'fact-info-enemy self (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)) @@ -1040,14 +1040,14 @@ (set! (-> self root-override trans quad) (-> arg0 root-overlay trans quad)) (set! (-> self root-override quat vec quad) (-> arg0 root-overlay quat vec quad)) (set! (-> self root-override scale quad) (-> arg0 root-overlay scale quad)) - (dummy-21 self) + (balloonlurker-pilot-method-21 self) (go balloonlurker-pilot-idle) (none) ) ;; definition for method 30 of type balloonlurker ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-30 balloonlurker ((obj balloonlurker)) +(defmethod rigid-body-platform-method-30 balloonlurker ((obj balloonlurker)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1105,7 +1105,7 @@ ;; definition for method 31 of type balloonlurker ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 balloonlurker ((obj balloonlurker)) +(defmethod rigid-body-platform-method-31 balloonlurker ((obj balloonlurker)) (logclear! (-> obj mask) (process-mask actor-pause)) (initialize-skeleton obj *balloonlurker-sg* '()) (set! (-> obj root-overlay pause-adjust-distance) 1228800.0) @@ -1118,7 +1118,7 @@ (set! (-> obj link) (new 'process 'actor-link-info obj)) (balloonlurker-find-nearest-path-point) (balloonlurker-snap-to-path-point (-> obj dest-index)) - (TODO-RENAME-29 obj *balloonlurker-constants*) + (rigid-body-platform-method-29 obj *balloonlurker-constants*) (dotimes (s5-0 4) (let ((s4-0 (-> obj control-point-array data s5-0))) (let ((f30-0 (* 16384.0 (the float (logand s5-0 3))))) @@ -1173,9 +1173,9 @@ ;; WARN: Function (method 11 balloonlurker) has a return type of none, but the expression builder found a return statement. (defmethod init-from-entity! balloonlurker ((obj balloonlurker) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask enemy) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) + (rigid-body-platform-method-31 obj) (cond ((logtest? (-> (entity-actor-lookup (-> obj entity) 'alt-actor 0) extra perm status) (entity-perm-status complete) diff --git a/test/decompiler/reference/jak1/levels/misty/bonelurker_REF.gc b/test/decompiler/reference/jak1/levels/misty/bonelurker_REF.gc index 4b2827c66e..68a6ae7e04 100644 --- a/test/decompiler/reference/jak1/levels/misty/bonelurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/bonelurker_REF.gc @@ -50,7 +50,7 @@ ;; definition for method 44 of type bonelurker ;; INFO: Return type mismatch symbol vs object. -(defmethod dummy-44 bonelurker ((obj bonelurker) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler bonelurker ((obj bonelurker) (arg0 process) (arg1 event-message-block)) (the-as object (when (and (logtest? (-> obj nav-enemy-flags) (nav-enemy-flags navenmf6)) ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) @@ -68,7 +68,7 @@ ;; definition for method 43 of type bonelurker ;; INFO: Return type mismatch symbol vs object. -(defmethod dummy-43 bonelurker ((obj bonelurker) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler bonelurker ((obj bonelurker) (arg0 process) (arg1 event-message-block)) (with-pp (set! (-> obj state-time) (-> *display* base-frame-counter)) (let ((a1-1 (new 'stack-no-clear 'event-message-block))) @@ -147,7 +147,7 @@ nav-enemy-default-event-handler ;; INFO: Used lq/sq (defbehavior bonelurker-push-post bonelurker () (compute-alignment! (-> self align)) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (align-vel-and-quat-only! (-> self align) (align-opts adjust-xz-vel) @@ -561,9 +561,9 @@ nav-enemy-default-event-handler ;; definition for method 48 of type bonelurker ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 bonelurker ((obj bonelurker)) +(defmethod nav-enemy-method-48 bonelurker ((obj bonelurker)) (initialize-skeleton obj *bonelurker-sg* '()) - (TODO-RENAME-45 obj *bonelurker-nav-enemy-info*) + (init-defaults! obj *bonelurker-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) (set! (-> obj neck ear) (the-as uint 2)) diff --git a/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc b/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc index cd14dde7d0..b4320d8c99 100644 --- a/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/misty-conveyor_REF.gc @@ -243,7 +243,7 @@ ) (s4-0 (quaternion-copy! (new-stack-quaternion0) (-> self root-override quat))) (s3-0 (new-stack-quaternion0)) - (a1-3 (TODO-RENAME-12 (-> (the-as process-drawable (-> self parent 0)) path) (new-stack-vector0) 0.0)) + (a1-3 (path-control-method-12 (-> (the-as process-drawable (-> self parent 0)) path) (new-stack-vector0) 0.0)) (f30-0 45.0) ) 0.0 @@ -306,7 +306,7 @@ sv-112 'interp ) - (TODO-RENAME-12 (-> (the-as keg-conveyor-paddle (-> self parent 0)) path) gp-0 sv-112) + (path-control-method-12 (-> (the-as keg-conveyor-paddle (-> self parent 0)) path) gp-0 sv-112) (seek-toward-heading-vec! (-> self root-override) gp-0 131072.0 (seconds 0.1)) (set! (-> self root-override trans quad) (-> self path-position quad)) (when (= (-> self keg-behavior) 1) @@ -389,7 +389,7 @@ (defstate keg-in-chute (keg) :event keg-event-handler :code (behavior () - (let ((gp-0 (TODO-RENAME-12 + (let ((gp-0 (path-control-method-12 (-> (the-as process-drawable (-> self parent 0)) path) (new-stack-vector0) (the float (+ (-> (the-as process-drawable (-> self parent 0)) path curve num-cverts) -1)) @@ -484,7 +484,7 @@ (set! (-> self keg-behavior) arg1) (logclear! (-> self mask) (process-mask actor-pause enemy)) (let ((gp-1 (new-stack-vector0))) - (TODO-RENAME-12 (-> (the-as process-drawable (-> self parent 0)) path) gp-1 0.0) + (path-control-method-12 (-> (the-as process-drawable (-> self parent 0)) path) gp-1 0.0) (set-heading-vec! (-> self root-override) gp-1) ) (set! (-> self sound-id) (new-sound-id)) @@ -654,7 +654,7 @@ (set! (-> obj pivot) (new 'process 'joint-mod-spinner obj 4 (new 'static 'vector :x 1.0 :w 1.0) 65536.0)) (let ((s5-1 (new-stack-vector0))) (let ((s4-0 (new-stack-matrix0))) - (TODO-RENAME-12 (-> obj path) s5-1 0.0) + (path-control-method-12 (-> obj path) s5-1 0.0) (set-heading-vec! (-> obj root) s5-1) (quaternion->matrix s4-0 (-> obj root quat)) (set-vector! s5-1 -4096.0 -3072.0 -1433.6 1.0) diff --git a/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc b/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc index a5eb12541a..ff807a47c5 100644 --- a/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/misty-obs_REF.gc @@ -1729,7 +1729,7 @@ ;; definition for method 27 of type bone-platform ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-27 bone-platform ((obj bone-platform) (arg0 vector)) +(defmethod rigid-body-platform-method-27 bone-platform ((obj bone-platform) (arg0 vector)) (let ((gp-0 (new 'stack-no-clear 'vector))) (vector-! gp-0 arg0 (-> obj rbody position)) (set! (-> gp-0 y) 0.0) @@ -1738,7 +1738,7 @@ ) (when (< 0.0 f1-1) (vector-float*! gp-0 gp-0 (/ f1-1 f0-1)) - (TODO-RENAME-15 (-> obj rbody) gp-0) + (rigid-body-method-15 (-> obj rbody) gp-0) ) ) ) @@ -1748,12 +1748,12 @@ ;; definition for method 23 of type bone-platform ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 bone-platform ((obj bone-platform) (arg0 float)) +(defmethod rigid-body-platform-method-23 bone-platform ((obj bone-platform) (arg0 float)) ((the-as (function rigid-body-platform basic none) (find-parent-method bone-platform 23)) obj (the-as basic arg0) ) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) @@ -1815,7 +1815,7 @@ ;; definition for method 30 of type bone-platform ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-30 bone-platform ((obj bone-platform)) +(defmethod rigid-body-platform-method-30 bone-platform ((obj bone-platform)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1843,9 +1843,9 @@ ;; definition for method 31 of type bone-platform ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 bone-platform ((obj bone-platform)) +(defmethod rigid-body-platform-method-31 bone-platform ((obj bone-platform)) (initialize-skeleton obj *mis-bone-platform-sg* '()) - (TODO-RENAME-29 obj *bone-platform-constants*) + (rigid-body-platform-method-29 obj *bone-platform-constants*) (set! (-> obj float-height-offset) -4096.0) (if (name= (-> obj name) "bone-platform-5") (set-vector! (-> obj root-overlay scale) 0.8 1.0 0.8 1.0) @@ -1991,7 +1991,7 @@ ;; definition for method 27 of type misty-battlecontroller ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-27 misty-battlecontroller ((obj misty-battlecontroller)) +(defmethod battlecontroller-method-27 misty-battlecontroller ((obj misty-battlecontroller)) ((the-as (function battlecontroller none) (find-parent-method misty-battlecontroller 27)) obj) (set! (-> obj misty-ambush-collision-hack) #t) 0 diff --git a/test/decompiler/reference/jak1/levels/misty/misty-warehouse_REF.gc b/test/decompiler/reference/jak1/levels/misty/misty-warehouse_REF.gc index 457ea466ab..29a3277daa 100644 --- a/test/decompiler/reference/jak1/levels/misty/misty-warehouse_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/misty-warehouse_REF.gc @@ -201,7 +201,7 @@ ;; definition for method 24 of type rounddoor ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-24 rounddoor ((obj rounddoor)) +(defmethod eco-door-method-24 rounddoor ((obj rounddoor)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind ground-object)) @@ -223,7 +223,7 @@ ;; definition for method 25 of type rounddoor ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-25 rounddoor ((obj rounddoor)) +(defmethod eco-door-method-25 rounddoor ((obj rounddoor)) (initialize-skeleton obj *rounddoor-sg* '()) (set! (-> obj open-distance) 69632.0) (set! (-> obj close-distance) 81920.0) diff --git a/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc b/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc index 579ec85ae4..4fd140a03b 100644 --- a/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc @@ -1132,8 +1132,8 @@ (:methods (rotate! (_type_ float) none 20) (tilt! (_type_ float) none 21) - (dummy-22 (_type_ float float float) none 22) - (dummy-23 (_type_) none 23) + (mistycannon-method-22 (_type_ float float float) none 22) + (mistycannon-method-23 (_type_) none 23) ) (:states mistycannon-aim-at-player @@ -1204,7 +1204,7 @@ ;; definition for method 22 of type mistycannon ;; INFO: Return type mismatch int vs none. ;; WARN: Function (method 22 mistycannon) has a return type of none, but the expression builder found a return statement. -(defmethod dummy-22 mistycannon ((obj mistycannon) (arg0 float) (arg1 float) (arg2 float)) +(defmethod mistycannon-method-22 mistycannon ((obj mistycannon) (arg0 float) (arg1 float) (arg2 float)) (if (not (-> obj postbindinfo-ok)) (return #f) ) @@ -1235,7 +1235,7 @@ ;; definition for method 23 of type mistycannon ;; INFO: Return type mismatch int vs none. -(defmethod dummy-23 mistycannon ((obj mistycannon)) +(defmethod mistycannon-method-23 mistycannon ((obj mistycannon)) (when (< (- (-> *display* base-frame-counter) (-> obj part-timer)) (seconds 3)) (let ((v1-4 (-> obj rotate))) (set! (-> *part-id-table* 529 init-specs 24 initial-valuef) @@ -1374,7 +1374,7 @@ ) :code (behavior () (loop - (dummy-23 self) + (mistycannon-method-23 self) (suspend) ) (none) @@ -1553,14 +1553,14 @@ (mistycannon-find-trajectory gp-0) (when (= (-> gp-0 time) 0.0) (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 3)) - (dummy-22 self 409600.0 2.0 20480.0) + (mistycannon-method-22 self 409600.0 2.0 20480.0) (set! (-> self state-time) (-> *display* base-frame-counter)) ) (return #f) ) (when (angle-tracker-seek! (-> self tilt) (-> gp-0 theta)) (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 3)) - (dummy-22 self (fmax 163840.0 (fmin 409600.0 (-> gp-0 speed))) (-> gp-0 time) 20480.0) + (mistycannon-method-22 self (fmax 163840.0 (fmin 409600.0 (-> gp-0 speed))) (-> gp-0 time) 20480.0) (set! (-> self state-time) (-> *display* base-frame-counter)) ) ) @@ -1595,7 +1595,7 @@ (mistycannon-do-aim (-> *target* control trans) (-> *target* control transv)) (mistycannon-do-aim (-> self at-point) (new-stack-vector0)) ) - (dummy-23 self) + (mistycannon-method-23 self) (suspend) ) (none) @@ -1641,7 +1641,7 @@ (angle-tracker-seek! (-> self tilt) 2730.6667) ) ) - (dummy-23 self) + (mistycannon-method-23 self) (when (and (-> self player-touching-grips?) (not (level-hint-displayed?))) (set! (-> self player-touching-grips?) #f) (hide-hud) @@ -1725,7 +1725,7 @@ (none) ) :trans (behavior () - (dummy-23 self) + (mistycannon-method-23 self) (rider-trans) (none) ) @@ -1780,7 +1780,7 @@ *entity-pool* (game-task none) ) - (dummy-22 self (* 4096.0 (the float gp-1)) 2.0 40960.0) + (mistycannon-method-22 self (* 4096.0 (the float gp-1)) 2.0 40960.0) ) (set! (-> self state-time) (-> *display* base-frame-counter)) (set! gp-0 0) @@ -1837,7 +1837,7 @@ :code (behavior () (loop (suspend) - (dummy-23 self) + (mistycannon-method-23 self) (if (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 1)) (go mistycannon-waiting-for-player) ) diff --git a/test/decompiler/reference/jak1/levels/misty/mud_REF.gc b/test/decompiler/reference/jak1/levels/misty/mud_REF.gc index cd33374c30..b221baa6a4 100644 --- a/test/decompiler/reference/jak1/levels/misty/mud_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/mud_REF.gc @@ -48,8 +48,8 @@ ;; definition for method 22 of type mud ;; INFO: Return type mismatch ripple-wave-set vs none. -(defmethod TODO-RENAME-22 mud ((obj mud)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 mud ((obj mud)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (logclear! (-> obj flags) (water-flags wt23)) diff --git a/test/decompiler/reference/jak1/levels/misty/muse_REF.gc b/test/decompiler/reference/jak1/levels/misty/muse_REF.gc index 5ba35befac..c7432ab516 100644 --- a/test/decompiler/reference/jak1/levels/misty/muse_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/muse_REF.gc @@ -175,7 +175,7 @@ ;; definition for method 51 of type muse ;; INFO: Return type mismatch int vs none. -(defmethod dummy-51 muse ((obj muse)) +(defmethod nav-enemy-method-51 muse ((obj muse)) (dotimes (s5-0 2) (let ((v1-2 (rand-vu-int-range 3 (+ (-> obj node-list length) -1)))) (sp-launch-particles-var @@ -195,7 +195,7 @@ ;; definition for method 39 of type muse (defmethod common-post muse ((obj muse)) (spool-push *art-control* (-> obj anim name) 0 obj -99.0) - (dummy-51 obj) + (nav-enemy-method-51 obj) ((method-of-type nav-enemy common-post) obj) (none) ) @@ -208,12 +208,12 @@ ) ;; definition for method 44 of type muse -(defmethod dummy-44 muse ((obj muse) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler muse ((obj muse) (arg0 process) (arg1 event-message-block)) (go muse-caught) ) ;; definition for method 43 of type muse -(defmethod dummy-43 muse ((obj muse) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler muse ((obj muse) (arg0 process) (arg1 event-message-block)) (go muse-caught) ) @@ -251,7 +251,7 @@ nav-enemy-default-event-handler (ja-no-eval :group! muse-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (spool-push *art-control* (-> self anim name) 0 self -99.0) - (dummy-51 self) + (nav-enemy-method-51 self) (suspend) (ja :num! (seek!)) ) @@ -321,7 +321,7 @@ nav-enemy-default-event-handler ) :post (behavior () (set! (-> self nav destination-pos quad) (-> self dest-point quad)) - (dummy-19 + (nav-control-method-19 (-> self nav) (-> self nav target-pos) (-> self collide-info) @@ -457,7 +457,7 @@ nav-enemy-default-event-handler (none) ) :post (behavior () - (dummy-51 self) + (nav-enemy-method-51 self) (level-hint-surpress!) (kill-current-level-hint '() '() 'exit) (ja-post) @@ -547,7 +547,7 @@ nav-enemy-default-event-handler (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *muse-sg* '()) (logclear! (-> obj mask) (process-mask actor-pause)) - (TODO-RENAME-45 obj *muse-nav-enemy-info*) + (init-defaults! obj *muse-nav-enemy-info*) (set! (-> obj max-path-index) (the float (+ (-> obj path curve num-cverts) -1))) (set! (-> obj current-path-index) 7.0) (set! (-> obj prev-path-index) 7.0) diff --git a/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc b/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc index c718c63f9e..0554b55a53 100644 --- a/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/quicksandlurker_REF.gc @@ -538,7 +538,7 @@ ;; definition for function intersects-nav-mesh? (defun intersects-nav-mesh? ((arg0 nav-control) (arg1 vector)) - (if (dummy-16 arg0 arg1) + (if (nav-control-method-16 arg0 arg1) #t ) ) @@ -607,7 +607,7 @@ (let ((a0-2 (-> self nav)) (a1-1 (-> *target* control trans)) ) - (when (if (dummy-16 a0-2 a1-1) + (when (if (nav-control-method-16 a0-2 a1-1) #t ) (if (< (- (-> *target* control trans y) (-> self original-position y)) 0.0) @@ -865,7 +865,7 @@ (a1-0 (-> *target* control trans)) ) (cond - ((or (if (dummy-16 a0-0 a1-0) + ((or (if (nav-control-method-16 a0-0 a1-0) #t ) (and *target* (>= 16384.0 (vector-vector-distance (-> self root-override trans) (-> *target* control trans)))) diff --git a/test/decompiler/reference/jak1/levels/misty/sidekick-human_REF.gc b/test/decompiler/reference/jak1/levels/misty/sidekick-human_REF.gc index 44d17bda32..53b1d01b7a 100644 --- a/test/decompiler/reference/jak1/levels/misty/sidekick-human_REF.gc +++ b/test/decompiler/reference/jak1/levels/misty/sidekick-human_REF.gc @@ -1622,7 +1622,7 @@ ;; definition for method 11 of type sequenceB (defmethod init-from-entity! sequenceB ((obj sequenceB) (arg0 entity-actor)) - (dummy-40 obj arg0 *sidekick-human-sg* 3 44 (new 'static 'vector :w 4096.0) -1) + (process-taskable-method-40 obj arg0 *sidekick-human-sg* 3 44 (new 'static 'vector :w 4096.0) -1) (set! (-> obj tasks) (get-task-control (game-task intro))) (set! (-> obj bonelurker) (the-as handle #f)) (set! (-> obj evilbro) (the-as handle #f)) @@ -1630,7 +1630,7 @@ (dotimes (v1-2 9) (set! (-> obj lurker-army v1-2) (the-as handle #f)) ) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -1827,11 +1827,11 @@ ;; definition for method 11 of type sequenceC (defmethod init-from-entity! sequenceC ((obj sequenceC) (arg0 entity-actor)) - (dummy-40 obj arg0 *sidekick-human-sg* 3 44 (new 'static 'vector :w 4096.0) -1) + (process-taskable-method-40 obj arg0 *sidekick-human-sg* 3 44 (new 'static 'vector :w 4096.0) -1) (set! (-> obj tasks) (get-task-control (game-task intro))) (set! (-> obj bonelurker) (the-as handle #f)) (set! (-> obj darkecocan) (the-as handle #f)) (set! (-> obj cur-trans-hook) sequenceC-trans-hook) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc b/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc index a45f9c72f0..08251ea6c5 100644 --- a/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc @@ -328,7 +328,7 @@ :size-assert #x130 :flag-assert #x1500c00130 (:methods - (dummy-20 (_type_) none 20) + (flying-lurker-method-20 (_type_) none 20) ) (:states (flying-lurker-clone handle string) @@ -381,7 +381,7 @@ ;; definition for method 20 of type flying-lurker ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-20 flying-lurker ((obj flying-lurker)) +(defmethod flying-lurker-method-20 flying-lurker ((obj flying-lurker)) (with-pp (let ((s5-0 (-> obj draw shadow-ctrl)) (s4-0 #f) @@ -595,7 +595,7 @@ (let ((s3-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) ) - (TODO-RENAME-14 (-> self path) (-> self tangent) (-> self curve-position)) + (path-control-method-14 (-> self path) (-> self tangent) (-> self curve-position)) (eval-path-curve! (-> self path) s3-0 @@ -685,7 +685,7 @@ ) ) (cleanup-for-death self) - (deactivate self) + (the-as object (deactivate self)) ) (('sleep) (let ((v1-12 (new 'stack-no-clear 'event-message-block))) @@ -735,7 +735,7 @@ ) ) ) - (deactivate self) + (the-as object (deactivate self)) ) ) ) @@ -746,7 +746,7 @@ (none) ) :trans (behavior () - (dummy-20 self) + (flying-lurker-method-20 self) (when (not (movie?)) (flying-lurker-calc-speed (meters 15) (meters 30) (meters 0.11666667) (meters 0.083333336)) (flying-lurker-move) @@ -756,7 +756,7 @@ (and *target* (< 4194304000000.0 (vector-vector-distance-squared (-> self root trans) (target-pos 0)))) ) ) - (dummy-30 (-> self alt-actor) (entity-perm-status dead) #f) + (set-or-clear-status! (-> self alt-actor) (entity-perm-status dead) #f) (entity-birth-no-kill (-> self alt-actor)) (let ((a1-4 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-4 from) self) @@ -1064,7 +1064,7 @@ ) ) (cleanup-for-death self) - (deactivate self) + (the-as object (deactivate self)) ) ((= v1-0 'sleep) (let ((v1-6 (new 'stack-no-clear 'event-message-block))) @@ -1114,7 +1114,7 @@ ) ) ) - (deactivate self) + (the-as object (deactivate self)) ) (else (flying-lurker-handler proc arg1 event-type event) @@ -1284,7 +1284,7 @@ (cond ((play-movie?) (eval-path-curve! (-> obj path) (-> obj root trans) (-> obj curve-position) 'interp) - (TODO-RENAME-14 (-> obj path) (-> obj tangent) (-> obj curve-position)) + (path-control-method-14 (-> obj path) (-> obj tangent) (-> obj curve-position)) (quaternion-identity! (-> obj root quat)) ) (else diff --git a/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc b/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc index 2f56ca4502..9e59651ef9 100644 --- a/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/ogre/ogre-obs_REF.gc @@ -498,9 +498,9 @@ ;; definition for method 23 of type ogre-plat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 ogre-plat ((obj ogre-plat) (arg0 float)) +(defmethod rigid-body-platform-method-23 ogre-plat ((obj ogre-plat) (arg0 float)) ((the-as (function rigid-body-platform basic none) (find-parent-method ogre-plat 23)) obj (the-as basic arg0)) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) @@ -590,7 +590,7 @@ ;; definition for method 30 of type ogre-plat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-30 ogre-plat ((obj ogre-plat)) +(defmethod rigid-body-platform-method-30 ogre-plat ((obj ogre-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum usually-hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -618,7 +618,7 @@ ;; definition for method 31 of type ogre-plat ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 ogre-plat ((obj ogre-plat)) +(defmethod rigid-body-platform-method-31 ogre-plat ((obj ogre-plat)) (set! (-> obj float-height-offset) (-> obj idle-y-offset)) (let ((s5-0 (-> obj info control-point-count))) (dotimes (s4-0 s5-0) @@ -687,11 +687,11 @@ ;; definition for method 31 of type ogre-step ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 ogre-step ((obj ogre-step)) +(defmethod rigid-body-platform-method-31 ogre-step ((obj ogre-step)) (set! (-> obj idle-y-offset) -28672.0) (set! (-> obj float-y-offset) 0.0) (+! (-> obj root-overlay trans y) (-> obj idle-y-offset)) - (TODO-RENAME-29 obj *ogre-step-constants*) + (rigid-body-platform-method-29 obj *ogre-step-constants*) ((the-as (function ogre-plat none) (find-parent-method ogre-step 31)) obj) (let ((a0-5 (entity-actor-lookup (-> obj entity) 'alt-actor 0))) (if (and a0-5 (logtest? (-> a0-5 extra perm status) (entity-perm-status complete))) @@ -704,7 +704,7 @@ ;; definition for method 34 of type ogre-step ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-34 ogre-step ((obj ogre-step)) +(defmethod rigid-body-platform-method-34 ogre-step ((obj ogre-step)) (if (-> obj active) (go (method-of-object obj rigid-body-platform-float)) (go (method-of-object obj rigid-body-platform-idle)) @@ -783,7 +783,7 @@ ;; definition for method 31 of type ogre-step-a ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 ogre-step-a ((obj ogre-step-a)) +(defmethod rigid-body-platform-method-31 ogre-step-a ((obj ogre-step-a)) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 12288.0 0.0 20480.0) (initialize-skeleton obj *ogre-step-a-sg* '()) ((the-as (function ogre-step none) (find-parent-method ogre-step-a 31)) obj) @@ -793,7 +793,7 @@ ;; definition for method 31 of type ogre-step-b ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 ogre-step-b ((obj ogre-step-b)) +(defmethod rigid-body-platform-method-31 ogre-step-b ((obj ogre-step-b)) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 12288.0 0.0 20480.0) (initialize-skeleton obj *ogre-step-b-sg* '()) ((the-as (function ogre-step none) (find-parent-method ogre-step-b 31)) obj) @@ -803,7 +803,7 @@ ;; definition for method 31 of type ogre-step-c ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 ogre-step-c ((obj ogre-step-c)) +(defmethod rigid-body-platform-method-31 ogre-step-c ((obj ogre-step-c)) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 12288.0 0.0 26624.0) (initialize-skeleton obj *ogre-step-c-sg* '()) ((the-as (function ogre-step none) (find-parent-method ogre-step-c 31)) obj) @@ -813,7 +813,7 @@ ;; definition for method 31 of type ogre-step-d ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 ogre-step-d ((obj ogre-step-d)) +(defmethod rigid-body-platform-method-31 ogre-step-d ((obj ogre-step-d)) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 12288.0 0.0 20480.0) (initialize-skeleton obj *ogre-step-b-sg* '()) ((the-as (function ogre-step none) (find-parent-method ogre-step-d 31)) obj) @@ -868,10 +868,10 @@ ;; definition for method 31 of type ogre-isle ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 ogre-isle ((obj ogre-isle)) +(defmethod rigid-body-platform-method-31 ogre-isle ((obj ogre-isle)) (set! (-> obj idle-y-offset) -6144.0) (set! (-> obj float-y-offset) 4096.0) - (TODO-RENAME-29 obj *ogre-isle-constants*) + (rigid-body-platform-method-29 obj *ogre-isle-constants*) ((the-as (function ogre-plat none) (find-parent-method ogre-isle 31)) obj) (set! (-> obj active) #t) 0 @@ -931,7 +931,7 @@ ;; definition for method 31 of type ogre-isle-b ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 ogre-isle-b ((obj ogre-isle-b)) +(defmethod rigid-body-platform-method-31 ogre-isle-b ((obj ogre-isle-b)) (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 24576.0) (initialize-skeleton obj *ogre-isle-b-sg* '()) @@ -942,7 +942,7 @@ ;; definition for method 31 of type ogre-isle-c ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 ogre-isle-c ((obj ogre-isle-c)) +(defmethod rigid-body-platform-method-31 ogre-isle-c ((obj ogre-isle-c)) (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 24576.0) (initialize-skeleton obj *ogre-isle-b-sg* '()) @@ -953,7 +953,7 @@ ;; definition for method 31 of type ogre-isle-d ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 ogre-isle-d ((obj ogre-isle-d)) +(defmethod rigid-body-platform-method-31 ogre-isle-d ((obj ogre-isle-d)) (set! (-> obj root-overlay trans x) (+ -8192.0 (-> obj root-overlay trans x))) (set! (-> obj root-overlay trans z) (+ -8192.0 (-> obj root-overlay trans z))) (set-vector! (-> obj root-overlay root-prim local-sphere) 0.0 8192.0 0.0 22528.0) @@ -1512,8 +1512,8 @@ ;; definition for method 22 of type ogre-lava ;; INFO: Return type mismatch symbol vs none. -(defmethod TODO-RENAME-22 ogre-lava ((obj ogre-lava)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 ogre-lava ((obj ogre-lava)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) diff --git a/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc b/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc index cc41ebec7a..5f6a7cf0fa 100644 --- a/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc +++ b/test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc @@ -816,7 +816,7 @@ :code (behavior ((arg0 handle) (arg1 attack-info)) (target-timed-invulnerable (-> *TARGET-bank* hit-invulnerable-timeout) self) (when (!= (-> self attack-info mode) 'endlessfall) - (dummy-10 (-> self skel effect) 'group-target-hit -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-target-hit -1.0 -1) (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 255 (seconds 0.3)) (sound-play "oof") ) @@ -967,7 +967,7 @@ (fmax -182044.44 (fmin 182044.44 (* -40.0 (-> self racer rot z)))) (case (-> self attack-info mode) (('balloonlurker) - (dummy-13 (-> self water) 2.0 (-> self control trans) 1 (-> self control transv)) + (create-splash (-> self water) 2.0 (-> self control trans) 1 (-> self control transv)) (ja-no-eval :group! (-> self draw art-group data 139) :num! (seek! (ja-aframe 240.0 0)) :frame-num 0.0) (until (ja-done? 0) (set! (-> self racer stick-lock) #t) diff --git a/test/decompiler/reference/jak1/levels/racer_common/target-racer_REF.gc b/test/decompiler/reference/jak1/levels/racer_common/target-racer_REF.gc index 9059e574fe..7c5f80432f 100644 --- a/test/decompiler/reference/jak1/levels/racer_common/target-racer_REF.gc +++ b/test/decompiler/reference/jak1/levels/racer_common/target-racer_REF.gc @@ -456,7 +456,7 @@ (-> self control trans) :to self ) - (dummy-10 (-> self skel effect) 'effect-land -1.0 -1) + (effect-control-method-10 (-> self skel effect) 'effect-land -1.0 -1) ) ) (deg-diff (vector-y-angle gp-0) (vector-y-angle (-> self control transv))) diff --git a/test/decompiler/reference/jak1/levels/robocave/cave-trap_REF.gc b/test/decompiler/reference/jak1/levels/robocave/cave-trap_REF.gc index 0eb293c986..60fc9b7dbd 100644 --- a/test/decompiler/reference/jak1/levels/robocave/cave-trap_REF.gc +++ b/test/decompiler/reference/jak1/levels/robocave/cave-trap_REF.gc @@ -15,7 +15,7 @@ :size-assert #xe0 :flag-assert #x15007000e0 (:methods - (TODO-RENAME-20 (_type_) symbol 20) + (cave-trap-method-20 (_type_) symbol 20) ) (:states cave-trap-active @@ -148,7 +148,7 @@ ;; definition for method 20 of type cave-trap ;; INFO: Used lq/sq -(defmethod TODO-RENAME-20 cave-trap ((obj cave-trap)) +(defmethod cave-trap-method-20 cave-trap ((obj cave-trap)) (set! (-> obj last-spawn-time) (-> *display* base-frame-counter)) (set! (-> obj spawn-delay) (rand-vu-int-range (seconds 0.1) (seconds 0.5))) (let ((s5-0 (new 'stack-no-clear 'spawn-baby-spider-work))) @@ -306,7 +306,7 @@ (if (and (< (-> self spider-count) 8) (>= (- (-> *display* base-frame-counter) (-> self last-spawn-time)) (-> self spawn-delay)) ) - (TODO-RENAME-20 self) + (cave-trap-method-20 self) ) ) (else diff --git a/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc b/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc index 9406e3445e..8f99cae104 100644 --- a/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc +++ b/test/decompiler/reference/jak1/levels/robocave/spider-egg_REF.gc @@ -51,20 +51,21 @@ ;; failed to figure out what this is: (defstate spider-egg-idle (spider-egg) :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) - (local-vars (v0-0 none)) + (local-vars (v0-0 object)) (the-as object (case event-type (('touch) - (send-shove-back - (-> self root-override) - proc - (the-as touching-shapes-entry (-> event param 0)) - 0.7 - 6144.0 - 16384.0 - ) + (the-as object (send-shove-back + (-> self root-override) + proc + (the-as touching-shapes-entry (-> event param 0)) + 0.7 + 6144.0 + 16384.0 + ) + ) ) (('can-spawn?) - (return (the-as object #t)) + (return #t) v0-0 ) (('notify-spawned) diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc index 7d331bcd9b..4aaf17868c 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-lightning-mole_REF.gc @@ -235,7 +235,7 @@ ) (set! (-> gp-0 quad) (-> arg0 nav travel quad)) (set! (-> arg0 nav travel quad) (-> arg1 quad)) - (dummy-24 (-> arg0 nav) (-> arg0 flee-info deflection-max-dist) s2-0) + (nav-control-method-24 (-> arg0 nav) (-> arg0 flee-info deflection-max-dist) s2-0) (when (-> s2-0 found-boundary) (let ((s0-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'vector)) @@ -964,7 +964,7 @@ ;; definition for method 43 of type lightning-mole ;; INFO: Return type mismatch symbol vs object. -(defmethod dummy-43 lightning-mole ((obj lightning-mole) (arg0 process) (arg1 event-message-block)) +(defmethod attack-handler lightning-mole ((obj lightning-mole) (arg0 process) (arg1 event-message-block)) (send-event arg0 'get-attack-count 1) (when (!= (-> obj state) lightning-mole-yelp) (send-event arg0 'jump 32768.0 32768.0) @@ -975,7 +975,7 @@ ;; definition for method 44 of type lightning-mole ;; INFO: Return type mismatch symbol vs object. -(defmethod dummy-44 lightning-mole ((obj lightning-mole) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler lightning-mole ((obj lightning-mole) (arg0 process) (arg1 event-message-block)) (when (!= (-> obj state) lightning-mole-yelp) (send-event arg0 'jump 32768.0 32768.0) (go lightning-mole-yelp) @@ -1060,7 +1060,7 @@ ) (process-drawable-from-entity! obj arg0) (initialize-skeleton obj *lightning-mole-sg* '()) - (TODO-RENAME-45 obj *lightning-mole-nav-enemy-info*) + (init-defaults! obj *lightning-mole-nav-enemy-info*) (logclear! (-> obj nav flags) (nav-control-flags navcf5 navcf6 navcf7)) (set! (-> obj draw origin-joint-index) (the-as uint 3)) (set! (-> obj reaction-time) (seconds 0.05)) diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc index 3d4dbc1757..bf1253fb75 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc @@ -1664,8 +1664,8 @@ ;; definition for method 22 of type rolling-water ;; INFO: Return type mismatch water-flags vs none. -(defmethod TODO-RENAME-22 rolling-water ((obj rolling-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 rolling-water ((obj rolling-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc index 0de49adead..8430fc5fdd 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-robber_REF.gc @@ -210,7 +210,7 @@ (let ((s5-0 (new 'stack-no-clear 'matrix)) (gp-0 (new 'stack-no-clear 'vector)) ) - (TODO-RENAME-14 (-> self path) (-> self tangent) (-> self curve-position)) + (path-control-method-14 (-> self path) (-> self tangent) (-> self curve-position)) (cond ((and arg0 *target*) (vector-! gp-0 (-> self root-override trans) (target-pos 0)) @@ -656,7 +656,7 @@ (none) ) :code (behavior () - (TODO-RENAME-14 (-> self path) (-> self tangent) (-> self curve-position)) + (path-control-method-14 (-> self path) (-> self tangent) (-> self curve-position)) (let ((gp-1 (vector-! (new 'stack-no-clear 'vector) (-> self root-override trans) (target-pos 0))) (f0-1 6.826667) ) @@ -747,7 +747,7 @@ (set! (-> obj draw origin-joint-index) (the-as uint 3)) (set! (-> obj curve-position) (res-lump-float (-> obj entity) 'initial-spline-pos)) (eval-path-curve! (-> obj path) (-> obj root-override trans) (-> obj curve-position) 'interp) - (TODO-RENAME-14 (-> obj path) (-> obj tangent) (-> obj curve-position)) + (path-control-method-14 (-> obj path) (-> obj tangent) (-> obj curve-position)) (set! (-> obj facing quad) (-> obj tangent quad)) (let ((s4-1 (new 'stack-no-clear 'matrix))) (forward-down->inv-matrix s4-1 (-> obj facing) (new 'static 'vector :y -1.0)) diff --git a/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc b/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc index f0721714ee..2fed55438b 100644 --- a/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/ice-cube_REF.gc @@ -34,8 +34,8 @@ :size-assert #x1f0 :flag-assert #x4c018001f0 (:methods - (dummy-51 (_type_ vector vector) symbol :replace 51) - (dummy-53 (_type_ vector vector) symbol :replace 53) + (ice-cube-method-51 (_type_ vector vector) symbol :replace 51) + (ice-cube-method-53 (_type_ vector vector) symbol :replace 53) ) (:states ice-cube-appear @@ -575,14 +575,14 @@ (set! (-> obj cprims-type) (the-as uint 0)) (set-root-prim-collide-with! (-> obj collide-info) (collide-kind target)) (set! (-> obj collide-info event-self) 'touched) - (dummy-57 obj) + (nav-enemy-method-57 obj) 0 (none) ) ;; definition for method 57 of type ice-cube ;; INFO: Return type mismatch vector vs none. -(defmethod dummy-57 ice-cube ((obj ice-cube)) +(defmethod nav-enemy-method-57 ice-cube ((obj ice-cube)) (when (!= (-> obj cprims-type) 1) (set! (-> obj cprims-type) (the-as uint 1)) (let ((v1-3 (-> obj collide-info root-prim))) @@ -596,7 +596,7 @@ ;; definition for method 58 of type ice-cube ;; INFO: Return type mismatch vector vs none. -(defmethod dummy-58 ice-cube ((obj ice-cube)) +(defmethod nav-enemy-method-58 ice-cube ((obj ice-cube)) (when (!= (-> obj cprims-type) 2) (set! (-> obj cprims-type) (the-as uint 2)) (let ((v1-3 (-> obj collide-info root-prim))) @@ -610,10 +610,10 @@ ;; definition for method 48 of type ice-cube ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 ice-cube ((obj ice-cube)) +(defmethod nav-enemy-method-48 ice-cube ((obj ice-cube)) (process-drawable-from-entity! obj (-> obj entity)) (initialize-skeleton obj *ice-cube-sg* '()) - (TODO-RENAME-45 obj *ice-cube-nav-enemy-info*) + (init-defaults! obj *ice-cube-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) (set! (-> obj neck ear) (the-as uint 2)) @@ -659,7 +659,7 @@ (set! (-> obj part3) (create-launch-control (-> *part-group-id-table* 509) obj)) (set! (-> obj part4) (create-launch-control (-> *part-group-id-table* 567) obj)) (initialize-collision obj) - (TODO-RENAME-48 obj) + (nav-enemy-method-48 obj) (let ((s4-0 (-> obj path curve num-cverts))) (if (<= s4-0 0) (go process-drawable-art-error "no path") @@ -677,7 +677,7 @@ ;; definition for method 60 of type ice-cube ;; INFO: Used lq/sq -(defmethod dummy-60 ice-cube ((obj ice-cube) (arg0 symbol)) +(defmethod nav-enemy-method-60 ice-cube ((obj ice-cube) (arg0 symbol)) (let ((gp-0 (new 'stack-no-clear 'vector))) (when (-> obj tracking-player?) (if (and *target* arg0) @@ -698,7 +698,7 @@ ;; definition for method 51 of type ice-cube ;; INFO: Used lq/sq -(defmethod dummy-51 ice-cube ((obj ice-cube) (arg0 vector) (arg1 vector)) +(defmethod ice-cube-method-51 ice-cube ((obj ice-cube) (arg0 vector) (arg1 vector)) (let ((s5-0 (new 'stack-no-clear 'vector))) (let* ((s4-0 (new 'stack-no-clear 'collide-tri-result)) (f0-0 40960.0) @@ -730,10 +730,10 @@ ;; definition for method 52 of type ice-cube ;; INFO: Used lq/sq -(defmethod dummy-52 ice-cube ((obj ice-cube) (arg0 vector)) +(defmethod nav-enemy-method-52 ice-cube ((obj ice-cube) (arg0 vector)) (when *target* (let ((f0-0 (vector-vector-xz-distance arg0 (target-pos 0)))) - (when (and (>= f0-0 40960.0) (>= 81920.0 f0-0) (not (TODO-RENAME-50 obj arg0))) + (when (and (>= f0-0 40960.0) (>= 81920.0 f0-0) (not (nav-enemy-method-50 obj arg0))) (let ((a0-4 (new 'stack-no-clear 'vector))) (set! (-> a0-4 quad) (-> arg0 quad)) (set! (-> a0-4 w) (-> obj collide-info root-prim local-sphere w)) @@ -749,7 +749,7 @@ ;; definition for method 53 of type ice-cube ;; INFO: Used lq/sq -(defmethod dummy-53 ice-cube ((obj ice-cube) (arg0 vector) (arg1 vector)) +(defmethod ice-cube-method-53 ice-cube ((obj ice-cube) (arg0 vector) (arg1 vector)) (local-vars (s1-0 int) (s2-0 int)) (let ((s3-0 (-> obj path curve num-cverts))) (if (<= s3-0 0) @@ -767,7 +767,7 @@ ) (while (> s2-0 0) (eval-path-curve-div! (-> obj path) arg0 (the float s1-0) 'interp) - (when (dummy-52 obj arg0) + (when (nav-enemy-method-52 obj arg0) (let ((a1-3 (new 'stack-no-clear 'vector)) (s3-1 (new 'stack-no-clear 'collide-tri-result)) ) @@ -827,10 +827,10 @@ (let ((s5-0 (new 'stack-no-clear 'vector)) (gp-0 (new 'stack-no-clear 'vector)) ) - (when (dummy-53 self s5-0 gp-0) + (when (ice-cube-method-53 self s5-0 gp-0) (set! (-> self collide-info trans quad) (-> s5-0 quad)) (forward-up->quaternion (-> self collide-info quat) gp-0 *up-vector*) - (dummy-57 self) + (nav-enemy-method-57 self) (go ice-cube-appear) ) ) @@ -849,10 +849,10 @@ (defstate ice-cube-appear (ice-cube) :event ice-cube-default-event-handler :enter (behavior () - (dummy-57 self) + (nav-enemy-method-57 self) (set! (-> self ground-y) (-> self collide-info trans y)) (spawn (-> self part) (-> self collide-info trans)) - (set-current-poly! (-> self nav) (dummy-16 (-> self nav) (-> self collide-info trans))) + (set-current-poly! (-> self nav) (nav-control-method-16 (-> self nav) (-> self collide-info trans))) (set! (-> self collide-info trans y) (+ -12288.0 (-> self collide-info trans y))) (set! (-> self collide-info transv quad) (-> *null-vector* quad)) (set! (-> self collide-info transv y) (rand-vu-float-range 102400.0 114688.0)) @@ -904,7 +904,7 @@ (suspend) (ja :num! (seek!)) ) - (if (TODO-RENAME-46 self (-> self nav-info notice-distance)) + (if (target-in-range? self (-> self nav-info notice-distance)) (go ice-cube-become-mean) (go-virtual nav-enemy-idle) ) @@ -961,7 +961,7 @@ :exit (the-as (function none :behavior ice-cube) #f) :trans (the-as (function none :behavior ice-cube) #f) :code (behavior () - (dummy-57 self) + (nav-enemy-method-57 self) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (logclear! (-> self mask) (process-mask actor-pause)) (go ice-cube-face-player) @@ -976,7 +976,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) - (dummy-57 self) + (nav-enemy-method-57 self) (logclear! (-> self mask) (process-mask actor-pause)) (if (or (not *target*) (logtest? (-> *target* state-flags) @@ -1015,7 +1015,7 @@ (let* ((v1-26 (>= 0.0 (-> self collide-info transv y))) (v1-27 (and v1-26 (logtest? (-> self collide-info status) (cshape-moving-flags onsurf)))) ) - (set! gp-0 (dummy-60 self (not v1-27))) + (set! gp-0 (nav-enemy-method-60 self (not v1-27))) ) (suspend) (ja :num! (seek!)) @@ -1041,7 +1041,7 @@ #f ) (+! (-> self collide-info transv y) (* -544768.0 (-> *display* seconds-per-frame))) - (set! gp-0 (dummy-60 self (not s5-0))) + (set! gp-0 (nav-enemy-method-60 self (not s5-0))) ) (suspend) ) @@ -1069,7 +1069,7 @@ :enter (behavior () (set! (-> self draw force-lod) 0) (logclear! (-> self mask) (process-mask actor-pause)) - (dummy-57 self) + (nav-enemy-method-57 self) (none) ) :code (behavior () @@ -1079,7 +1079,7 @@ (until (ja-done? 0) (when (and (not gp-0) (>= (ja-aframe-num 0) 8.0)) (set! gp-0 #t) - (dummy-58 self) + (nav-enemy-method-58 self) ) (suspend) (ja :num! (seek!)) @@ -1093,7 +1093,7 @@ ;; definition for method 54 of type ice-cube ;; INFO: Used lq/sq -(defmethod dummy-54 ice-cube ((obj ice-cube) (arg0 vector)) +(defmethod nav-enemy-method-54 ice-cube ((obj ice-cube) (arg0 vector)) (let* ((s4-0 (-> obj path curve num-cverts)) (s2-0 (nav-enemy-rnd-int-count s4-0)) (s5-0 (new 'stack-no-clear 'vector)) @@ -1101,7 +1101,7 @@ (dotimes (s3-0 s4-0) (eval-path-curve-div! (-> obj path) s5-0 (the float s2-0) 'interp) (when (>= (vector-vector-xz-distance s5-0 (-> obj collide-info trans)) 32768.0) - (when (dummy-51 obj s5-0 s5-0) + (when (ice-cube-method-51 obj s5-0 s5-0) (set! (-> obj target-pt quad) (-> s5-0 quad)) (return #t) ) @@ -1118,7 +1118,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) - (dummy-58 self) + (nav-enemy-method-58 self) (if (or (not *target*) (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) @@ -1156,7 +1156,7 @@ (let* ((v1-26 (>= 0.0 (-> self collide-info transv y))) (v1-27 (and v1-26 (logtest? (-> self collide-info status) (cshape-moving-flags onsurf)))) ) - (set! gp-0 (dummy-60 self (not v1-27))) + (set! gp-0 (nav-enemy-method-60 self (not v1-27))) ) (suspend) (ja :num! (seek!)) @@ -1182,7 +1182,7 @@ #f ) (+! (-> self collide-info transv y) (* -544768.0 (-> *display* seconds-per-frame))) - (set! gp-0 (dummy-60 self (not s5-0))) + (set! gp-0 (nav-enemy-method-60 self (not s5-0))) ) (suspend) ) @@ -1209,7 +1209,7 @@ :event ice-cube-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (dummy-58 self) + (nav-enemy-method-58 self) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) (set! (-> self next-skid-sound-time) (-> *display* base-frame-counter)) (if (or (not *target*) @@ -1291,8 +1291,8 @@ (set-vector! gp-2 0.0 0.0 (+ 15360.0 (fmax f30-0 f28-0)) 1.0) (vector-rotate-around-y! gp-2 gp-2 (-> self charge-angle)) (vector+! gp-2 gp-2 (-> self starting-pos)) - (TODO-RENAME-28 (-> self nav) (collide-kind wall-object ground-object)) - (dummy-11 (-> self nav) gp-2) + (nav-control-method-28 (-> self nav) (collide-kind wall-object ground-object)) + (nav-control-method-11 (-> self nav) gp-2) ) ) ) @@ -1370,7 +1370,7 @@ (defstate ice-cube-mean-charge-done (ice-cube) :event ice-cube-default-event-handler :code (behavior () - (dummy-58 self) + (nav-enemy-method-58 self) (nav-enemy-neck-control-inactive) (go ice-cube-retract-spikes) (none) @@ -1381,7 +1381,7 @@ (defstate ice-cube-retract-spikes (ice-cube) :event ice-cube-default-event-handler :code (behavior () - (dummy-58 self) + (nav-enemy-method-58 self) (nav-enemy-neck-control-inactive) (ja-channel-push! 1 (seconds 0.07)) (let ((gp-0 #f)) @@ -1389,7 +1389,7 @@ (until (ja-done? 0) (when (and (not gp-0) (>= (ja-aframe-num 0) 3.0)) (set! gp-0 #t) - (dummy-57 self) + (nav-enemy-method-57 self) ) (suspend) (ja :num! (seek!)) @@ -1417,7 +1417,7 @@ ) (go-virtual nav-enemy-idle) ) - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (go ice-cube-face-player) ) (else diff --git a/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc index 0c1a347cc4..d189857a5c 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-ball_REF.gc @@ -84,7 +84,7 @@ (:methods (follow-path (_type_) none 20) (play-landing-sound (_type_ float) sound-id 21) - (dummy-22 (_type_ process-drawable) none 22) + (snow-ball-roller-method-22 (_type_ process-drawable) none 22) ) (:states snow-ball-roller-idle @@ -127,8 +127,8 @@ :size-assert #x8c :flag-assert #x100020008c (:methods - (dummy-14 (_type_ (inline-array snow-ball-junction) float int) symbol 14) - (dummy-15 (_type_ (inline-array snow-ball-junction) int) symbol 15) + (snow-ball-method-14 (_type_ (inline-array snow-ball-junction) float int) symbol 14) + (snow-ball-method-15 (_type_ (inline-array snow-ball-junction) int) symbol 15) ) (:states snow-ball-idle @@ -322,7 +322,7 @@ ) ) (let ((s4-0 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> self path) s4-0 (-> self path-u)) + (path-control-method-14 (-> self path) s4-0 (-> self path-u)) (let ((gp-0 (new 'stack-no-clear 'matrix))) (let ((s5-0 (new 'stack-no-clear 'matrix))) (let ((s3-0 (new 'stack-no-clear 'vector))) @@ -384,7 +384,7 @@ ;; definition for method 22 of type snow-ball-roller ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. -(defmethod dummy-22 snow-ball-roller ((obj snow-ball-roller) (arg0 process-drawable)) +(defmethod snow-ball-roller-method-22 snow-ball-roller ((obj snow-ball-roller) (arg0 process-drawable)) (cond ((< (+ 4096.0 (-> arg0 root trans y)) (-> obj root-override trans y)) (let ((f0-2 81920.0)) @@ -404,7 +404,7 @@ (vector-! s4-0 (-> arg0 root trans) (-> obj root-override trans)) (set! (-> s4-0 y) 0.0) (vector-normalize! s4-0 1.0) - (TODO-RENAME-14 (-> obj path) s3-0 (-> obj path-u)) + (path-control-method-14 (-> obj path) s3-0 (-> obj path-u)) (set! (-> s3-0 y) 0.0) (vector-normalize! s3-0 1.0) (let* ((f28-0 (atan (-> s4-0 x) (-> s4-0 z))) @@ -445,7 +445,7 @@ (do-push-aways! (-> self root-override)) (when (>= (- (-> *display* base-frame-counter) (-> self hit-player-time)) (seconds 0.5)) (set! (-> self hit-player-time) (-> *display* base-frame-counter)) - (dummy-22 self *target*) + (the-as symbol (snow-ball-roller-method-22 self *target*)) ) ) ) @@ -537,7 +537,7 @@ ) ;; definition for method 14 of type snow-ball -(defmethod dummy-14 snow-ball ((obj snow-ball) (arg0 (inline-array snow-ball-junction)) (arg1 float) (arg2 int)) +(defmethod snow-ball-method-14 snow-ball ((obj snow-ball) (arg0 (inline-array snow-ball-junction)) (arg1 float) (arg2 int)) (local-vars (v1-0 (pointer float))) (if (zero? arg2) (set! v1-0 (new 'static 'array float 8 0.3309 0.36 0.4691 0.5061 0.6904 0.7264 0.864 0.8667)) @@ -558,7 +558,7 @@ ) ;; definition for method 15 of type snow-ball -(defmethod dummy-15 snow-ball ((obj snow-ball) (arg0 (inline-array snow-ball-junction)) (arg1 int)) +(defmethod snow-ball-method-15 snow-ball ((obj snow-ball) (arg0 (inline-array snow-ball-junction)) (arg1 int)) (local-vars (v0-0 symbol)) (let ((v1-0 (-> obj child-override))) (while v1-0 @@ -611,8 +611,8 @@ ) (loop (let ((s3-0 (/ (+ 98304.0 (rand-vu-float-range 0.0 32768.0)) (path-distance (-> self path gp-0))))) - (dummy-14 self s5-0 s3-0 gp-0) - (when (dummy-15 self s5-0 gp-0) + (snow-ball-method-14 self s5-0 s3-0 gp-0) + (when (snow-ball-method-15 self s5-0 gp-0) (process-spawn snow-ball-roller (-> self entity) self s3-0 gp-0 s5-0 :to self) (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self delay-til-next) (rand-vu-int-range 450 1650)) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc index 8a118102ad..f46d3feda2 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-bumper_REF.gc @@ -16,7 +16,7 @@ :size-assert #xc8 :flag-assert #x16006000c8 (:methods - (dummy-20 (_type_) none 20) + (snow-bumper-method-20 (_type_) none 20) (shove-player (_type_ process-drawable) none 21) ) (:states diff --git a/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc index 8befb67acd..db862adb03 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-bunny_REF.gc @@ -31,12 +31,12 @@ :size-assert #x200 :flag-assert #x4d01900200 (:methods - (dummy-51 (_type_ vector vector) symbol :replace 51) - (dummy-52 (_type_) symbol :replace 52) - (dummy-54 (_type_) symbol :replace 54) - (dummy-57 (_type_) symbol :replace 57) - (dummy-60 (_type_) none :replace 60) - (dummy-76 (_type_ symbol) none 76) + (snow-bunny-method-51 (_type_ vector vector) symbol :replace 51) + (snow-bunny-method-52 (_type_) symbol :replace 52) + (snow-bunny-method-54 (_type_) symbol :replace 54) + (snow-bunny-method-57 (_type_) symbol :replace 57) + (snow-bunny-method-60 (_type_) none :replace 60) + (snow-bunny-method-76 (_type_ symbol) none 76) ) ) @@ -158,7 +158,7 @@ ;; definition for method 76 of type snow-bunny ;; INFO: Return type mismatch int vs none. -(defmethod dummy-76 snow-bunny ((obj snow-bunny) (arg0 symbol)) +(defmethod snow-bunny-method-76 snow-bunny ((obj snow-bunny) (arg0 symbol)) (let ((f0-0 -4096.0)) (if arg0 (set! f0-0 -20480.0) @@ -222,7 +222,7 @@ ;; definition for method 60 of type snow-bunny ;; INFO: Return type mismatch int vs none. -(defmethod dummy-60 snow-bunny ((obj snow-bunny)) +(defmethod snow-bunny-method-60 snow-bunny ((obj snow-bunny)) (initialize-skeleton obj *snow-bunny-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) (none) @@ -230,9 +230,9 @@ ;; definition for method 48 of type snow-bunny ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 snow-bunny ((obj snow-bunny)) - (dummy-60 obj) - (TODO-RENAME-45 obj *snow-bunny-nav-enemy-info*) +(defmethod nav-enemy-method-48 snow-bunny ((obj snow-bunny)) + (snow-bunny-method-60 obj) + (init-defaults! obj *snow-bunny-nav-enemy-info*) (logclear! (-> obj draw shadow-ctrl settings flags) (shadow-flags shdf03)) (cond ((zero? (res-lump-value (-> obj entity) 'mode uint128)) @@ -262,18 +262,18 @@ (defmethod init-from-entity! snow-bunny ((obj snow-bunny) (arg0 entity-actor)) (initialize-collision obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-48 obj) + (nav-enemy-method-48 obj) (if (<= (-> obj path curve num-cverts) 0) (go process-drawable-art-error "no path") ) (set! *snow-bunny* (the-as (pointer snow-bunny) (process->ppointer obj))) - (TODO-RENAME-59 obj) + (nav-enemy-method-59 obj) (none) ) ;; definition for method 58 of type snow-bunny ;; INFO: Return type mismatch time-frame vs none. -(defmethod dummy-58 snow-bunny ((obj snow-bunny)) +(defmethod nav-enemy-method-58 snow-bunny ((obj snow-bunny)) (if (not (logtest? (-> *target* state-flags) (state-flags dangerous))) (set! (-> obj last-nondangerous-time) (-> *display* base-frame-counter)) ) @@ -327,7 +327,7 @@ ) ;; definition for method 57 of type snow-bunny -(defmethod dummy-57 snow-bunny ((obj snow-bunny)) +(defmethod snow-bunny-method-57 snow-bunny ((obj snow-bunny)) (if (or (not *target*) (not (logtest? (-> *target* state-flags) (state-flags dangerous)))) (return #f) ) @@ -369,7 +369,7 @@ (defstate nav-enemy-idle (snow-bunny) :virtual #t :enter (behavior () - (dummy-76 self #f) + (snow-bunny-method-76 self #f) (let ((t9-1 (-> (method-of-type nav-enemy nav-enemy-idle) enter))) (if t9-1 (t9-1) @@ -417,7 +417,7 @@ ((< (-> self nav-info notice-distance) f0-0) (go-virtual snow-bunny-patrol-idle) ) - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-notice) ) (else @@ -440,7 +440,7 @@ :event snow-bunny-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (dummy-76 self #f) + (snow-bunny-method-76 self #f) (set! (-> self nav flags) (logior (nav-control-flags navcf19) (-> self nav flags))) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags enable-rotate)) @@ -448,7 +448,7 @@ (none) ) :trans (behavior () - (if (dummy-57 self) + (if (snow-bunny-method-57 self) (go-virtual snow-bunny-defend) ) (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (-> self state-timeout)) @@ -464,13 +464,13 @@ ) ) ) - (dummy-58 self) + (nav-enemy-method-58 self) (none) ) :code (behavior () (let ((gp-0 (nav-enemy-rnd-int-count 3))) (when (and (not (-> self patrol-hop-failed?)) (zero? gp-0)) - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go-virtual snow-bunny-patrol-hop) ) ) @@ -489,7 +489,7 @@ ) (cond ((zero? gp-2) - (if (dummy-53 self) + (if (nav-enemy-method-53 self) (go-virtual snow-bunny-patrol-hop) ) ) @@ -507,7 +507,7 @@ ;; definition for method 51 of type snow-bunny ;; INFO: Used lq/sq -(defmethod dummy-51 snow-bunny ((obj snow-bunny) (arg0 vector) (arg1 vector)) +(defmethod snow-bunny-method-51 snow-bunny ((obj snow-bunny) (arg0 vector) (arg1 vector)) (let ((s5-0 (new 'stack-no-clear 'vector))) (let* ((s4-0 (new 'stack-no-clear 'collide-tri-result)) (f0-0 (-> obj gnd-popup)) @@ -539,7 +539,7 @@ ;; definition for method 53 of type snow-bunny ;; INFO: Used lq/sq -(defmethod dummy-53 snow-bunny ((obj snow-bunny)) +(defmethod nav-enemy-method-53 snow-bunny ((obj snow-bunny)) (let* ((s4-0 (-> obj path curve num-cverts)) (s2-0 (nav-enemy-rnd-int-count s4-0)) (s5-0 (new 'stack-no-clear 'vector)) @@ -548,7 +548,7 @@ (eval-path-curve-div! (-> obj path) s5-0 (the float s2-0) 'interp) (let ((f30-0 (vector-vector-xz-distance s5-0 (-> obj collide-info trans)))) (when (>= f30-0 6144.0) - (when (dummy-51 obj s5-0 s5-0) + (when (snow-bunny-method-51 obj s5-0 s5-0) (set! (-> obj final-dest quad) (-> s5-0 quad)) (set! (-> obj halfway-dist) (* 0.5 f30-0)) (set! (-> obj base-hop-dist) (rand-vu-float-range 6144.0 22118.4)) @@ -564,7 +564,7 @@ ;; definition for method 54 of type snow-bunny ;; INFO: Used lq/sq -(defmethod dummy-54 snow-bunny ((obj snow-bunny)) +(defmethod snow-bunny-method-54 snow-bunny ((obj snow-bunny)) (local-vars (sv-48 (function float float))) (set! (-> obj using-jump-event?) #f) (let* ((s5-1 (vector-! (new 'stack-no-clear 'vector) (-> obj final-dest) (-> obj collide-info trans))) @@ -611,7 +611,7 @@ ) ) (set! (-> obj got-jump-event?) #f) - (dummy-11 (-> obj nav) (-> obj nav target-pos)) + (nav-control-method-11 (-> obj nav) (-> obj nav target-pos)) (cond ((-> obj got-jump-event?) (set! (-> obj nav target-pos quad) (-> obj jump-event-dest quad)) @@ -624,7 +624,7 @@ ) (let ((a2-2 (-> obj nav target-pos))) (vector+! a2-2 (-> obj collide-info trans) s5-2) - (if (not (dummy-51 obj a2-2 a2-2)) + (if (not (snow-bunny-method-51 obj a2-2 a2-2)) (return #f) ) ) @@ -640,16 +640,16 @@ :event snow-bunny-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (when (not (dummy-54 self)) + (when (not (snow-bunny-method-54 self)) (set! (-> self patrol-hop-failed?) #t) (go-virtual snow-bunny-patrol-idle) ) - (if (dummy-57 self) + (if (snow-bunny-method-57 self) (go-virtual snow-bunny-defend) ) (set-jump-height-factor! self 0) (snow-bunny-initialize-jump (-> self nav target-pos)) - (dummy-76 self #t) + (snow-bunny-method-76 self #t) (set! (-> self rotate-speed) 728177.75) (set! (-> self turn-time) (seconds 0.1)) (none) @@ -660,13 +660,13 @@ (none) ) :trans (behavior () - (dummy-58 self) + (nav-enemy-method-58 self) (none) ) :code (behavior () (snow-bunny-execute-jump) (if (-> self using-jump-event?) - (set-current-poly! (-> self nav) (dummy-16 (-> self nav) (-> self collide-info trans))) + (set-current-poly! (-> self nav) (nav-control-method-16 (-> self nav) (-> self collide-info trans))) ) (if (or (zero? (nav-enemy-rnd-int-count (-> self patrol-rand-distraction))) (>= 40.96 (vector-vector-distance (-> self final-dest) (-> self collide-info trans))) @@ -690,13 +690,13 @@ (go-virtual nav-enemy-chase) ) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) - (dummy-76 self #t) + (snow-bunny-method-76 self #t) (set-vector! (-> self collide-info transv) 0.0 (nav-enemy-rnd-float-range 102400.0 131072.0) 0.0 1.0) (none) ) :exit (the-as (function none :behavior snow-bunny) #f) :trans (behavior () - (dummy-58 self) + (nav-enemy-method-58 self) (none) ) :code (behavior () @@ -761,7 +761,7 @@ ;; definition for method 52 of type snow-bunny ;; INFO: Used lq/sq -(defmethod dummy-52 snow-bunny ((obj snow-bunny)) +(defmethod snow-bunny-method-52 snow-bunny ((obj snow-bunny)) (local-vars (sv-48 (function float float))) (set! (-> obj using-jump-event?) #f) (if (not *target*) @@ -769,7 +769,7 @@ ) (let ((s4-0 (-> obj final-dest))) (set! (-> s4-0 quad) (-> (target-pos 0) quad)) - (if (not (dummy-51 obj s4-0 s4-0)) + (if (not (snow-bunny-method-51 obj s4-0 s4-0)) (return #f) ) (set! (-> obj base-hop-dist) (rand-vu-float-range 18022.4 22118.4)) @@ -806,7 +806,7 @@ ) ) (set! (-> obj got-jump-event?) #f) - (dummy-11 (-> obj nav) (-> obj nav target-pos)) + (nav-control-method-11 (-> obj nav) (-> obj nav target-pos)) (cond ((-> obj got-jump-event?) (set! (-> obj nav target-pos quad) (-> obj jump-event-dest quad)) @@ -819,7 +819,7 @@ ) (let ((a2-3 (-> obj nav target-pos))) (vector+! a2-3 (-> obj collide-info trans) s5-3) - (if (not (dummy-51 obj a2-3 a2-3)) + (if (not (snow-bunny-method-51 obj a2-3 a2-3)) (return #f) ) ) @@ -839,19 +839,19 @@ (if (or (not *target*) (logtest? (-> *target* state-flags) (state-flags do-not-notice))) (go-virtual nav-enemy-patrol) ) - (if (not (TODO-RENAME-46 self (-> self nav-info stop-chase-distance))) + (if (not (target-in-range? self (-> self nav-info stop-chase-distance))) (go-virtual nav-enemy-patrol) ) - (if (dummy-57 self) + (if (snow-bunny-method-57 self) (go-virtual snow-bunny-defend) ) - (when (not (dummy-52 self)) + (when (not (snow-bunny-method-52 self)) (logclear! (-> self nav-enemy-flags) (nav-enemy-flags navenmf1)) (go-virtual nav-enemy-notice) ) (set-jump-height-factor! self 1) (snow-bunny-initialize-jump (-> self nav target-pos)) - (dummy-76 self #t) + (snow-bunny-method-76 self #t) (set! (-> self rotate-speed) 728177.75) (set! (-> self turn-time) (seconds 0.1)) (none) @@ -862,16 +862,16 @@ (none) ) :trans (behavior () - (if (dummy-57 self) + (if (snow-bunny-method-57 self) (set! (-> self should-retreat?) #t) ) - (dummy-58 self) + (nav-enemy-method-58 self) (none) ) :code (behavior () (snow-bunny-execute-jump) (if (-> self using-jump-event?) - (set-current-poly! (-> self nav) (dummy-16 (-> self nav) (-> self collide-info trans))) + (set-current-poly! (-> self nav) (nav-control-method-16 (-> self nav) (-> self collide-info trans))) ) (if (-> self should-retreat?) (go-virtual snow-bunny-defend) @@ -920,7 +920,7 @@ ;; definition for method 55 of type snow-bunny ;; INFO: Used lq/sq -(defmethod dummy-55 snow-bunny ((obj snow-bunny)) +(defmethod nav-enemy-method-55 snow-bunny ((obj snow-bunny)) (set! (-> obj using-jump-event?) #f) (if (not *target*) (return #f) @@ -928,8 +928,8 @@ (let ((s5-0 (new 'stack-no-clear 'snow-bunny-retreat-work))) (set! (-> s5-0 found-best) #f) (let ((s4-0 (-> obj nav))) - (TODO-RENAME-27 s4-0) - (TODO-RENAME-28 s4-0 (the-as collide-kind -1)) + (nav-control-method-27 s4-0) + (nav-control-method-28 s4-0 (the-as collide-kind -1)) ) (let ((s4-1 (target-pos 0))) (vector-! (-> s5-0 away-vec) (-> obj collide-info trans) s4-1) @@ -993,10 +993,10 @@ ) (set! (-> obj nav target-pos quad) (-> obj final-dest quad)) (set! (-> obj got-jump-event?) #f) - (dummy-13 (-> obj nav) (-> obj nav target-pos) (-> obj nav old-travel)) + (nav-control-method-13 (-> obj nav) (-> obj nav target-pos) (-> obj nav old-travel)) (when (< (vector-xz-length (-> obj nav travel)) 204.8) (let ((s1-4 (new 'stack-no-clear 'nav-gap-info))) - (when (TODO-RENAME-12 (-> obj nav) s1-4) + (when (nav-control-method-12 (-> obj nav) s1-4) (set! (-> obj got-jump-event?) #t) (set! (-> obj jump-event-dest quad) (-> s1-4 dest quad)) ) @@ -1017,7 +1017,7 @@ (when (>= f30-2 409.6) (let ((s1-5 (-> obj nav target-pos))) (vector+! s1-5 (-> obj collide-info trans) s0-0) - (when (dummy-51 obj s1-5 s1-5) + (when (snow-bunny-method-51 obj s1-5 s1-5) (if (>= f30-2 (+ -409.6 (-> obj base-hop-dist))) (return #t) ) @@ -1063,20 +1063,20 @@ (when (or (>= (-> *display* base-frame-counter) (-> self retreat-timeout-time)) (not v1-8)) (if (or (not *target*) (logtest? (-> *target* state-flags) (state-flags do-not-notice)) - (not (TODO-RENAME-46 self (-> self nav-info stop-chase-distance))) + (not (target-in-range? self (-> self nav-info stop-chase-distance))) ) (go-virtual nav-enemy-patrol) (go-virtual snow-bunny-chase-hop) ) ) ) - (when (not (dummy-55 self)) + (when (not (nav-enemy-method-55 self)) (set-vector! (-> self nav travel) 0.0 0.0 0.0 1.0) (set! (-> self nav target-pos quad) (-> self collide-info trans quad)) ) (set-jump-height-factor! self 2) (snow-bunny-initialize-jump (-> self nav target-pos)) - (dummy-76 self #t) + (snow-bunny-method-76 self #t) (set! (-> self rotate-speed) 728177.75) (set! (-> self turn-time) (seconds 0.1)) (none) @@ -1087,13 +1087,13 @@ (none) ) :trans (behavior () - (dummy-58 self) + (nav-enemy-method-58 self) (none) ) :code (behavior () (snow-bunny-execute-jump) (if (-> self using-jump-event?) - (set-current-poly! (-> self nav) (dummy-16 (-> self nav) (-> self collide-info trans))) + (set-current-poly! (-> self nav) (nav-control-method-16 (-> self nav) (-> self collide-info trans))) ) (go-virtual snow-bunny-retreat-hop) (none) @@ -1107,14 +1107,14 @@ :event snow-bunny-default-event-handler :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) - (dummy-76 self #f) + (snow-bunny-method-76 self #f) (none) ) :trans (behavior () (if (not *target*) (go-virtual nav-enemy-patrol) ) - (dummy-58 self) + (nav-enemy-method-58 self) (let ((f0-0 (vector-vector-xz-distance (target-pos 0) (-> self collide-info trans)))) (if (< 73728.0 f0-0) (go-virtual snow-bunny-chase-hop) @@ -1124,7 +1124,7 @@ (go-virtual snow-bunny-chase-hop) ) (if (and (logtest? (-> *target* state-flags) (state-flags dangerous)) - (not (TODO-RENAME-46 self (-> self nav-info notice-distance))) + (not (target-in-range? self (-> self nav-info notice-distance))) ) (go-virtual snow-bunny-retreat-hop) ) @@ -1151,7 +1151,7 @@ :enter (behavior () (set! (-> self state-time) (-> *display* base-frame-counter)) (set-vector! (-> self collide-info transv) 0.0 0.0 0.0 1.0) - (dummy-76 self #t) + (snow-bunny-method-76 self #t) (none) ) :trans (behavior () diff --git a/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc index 8a0e248644..f14662b204 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-flutflut-obs_REF.gc @@ -468,8 +468,8 @@ ;; definition for method 26 of type flutflut-plat ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-26 flutflut-plat ((obj flutflut-plat)) - (let ((t9-0 (method-of-type plat dummy-26))) +(defmethod baseplat-method-26 flutflut-plat ((obj flutflut-plat)) + (let ((t9-0 (method-of-type plat baseplat-method-26))) (t9-0 obj) ) (if (zero? (-> obj link)) @@ -611,7 +611,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) @@ -654,7 +654,7 @@ (quaternion-slerp! (-> self root-override quat) (-> self appear-quat-bottom) (-> self appear-quat-top) f30-0) (set-vector! (-> self draw color-mult) f30-0 f30-0 f30-0 1.0) (when (>= f30-0 1.0) - (dummy-22 self) + (baseplat-method-22 self) (rider-post) (cond ((= (-> self plat-type) 1) @@ -675,7 +675,7 @@ ) ) ) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -688,7 +688,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('untrigger) (go flutflut-plat-hide) @@ -733,7 +733,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('untrigger) (go flutflut-plat-hide) @@ -770,7 +770,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) @@ -817,7 +817,7 @@ (go flutflut-plat-hidden-idle) ) ) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -831,11 +831,11 @@ object (case event-type (('bonk) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('bounce) (if (not (and (-> self entity) (logtest? (-> self entity extra perm status) (entity-perm-status complete)))) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) ) (('ridden) @@ -853,7 +853,7 @@ ) :trans (behavior () (plat-trans) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -865,20 +865,20 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) ) :trans (behavior () (when (= (-> self path-pos) 1.0) - (dummy-22 self) + (baseplat-method-22 self) (go elevator-idle-at-fort) ) (seek! (-> self path-pos) 1.0 (* 0.06666667 (-> *display* seconds-per-frame))) (eval-path-curve! (-> self path) (-> self basetrans) (-> self path-pos) 'interp) (plat-trans) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -890,7 +890,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) @@ -912,7 +912,7 @@ ) ) (plat-trans) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -924,20 +924,20 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) ) :trans (behavior () (when (= (-> self path-pos) 0.0) - (dummy-22 self) + (baseplat-method-22 self) (go elevator-idle-at-cave) ) (seek! (-> self path-pos) 0.0 (* 0.06666667 (-> *display* seconds-per-frame))) (eval-path-curve! (-> self path) (-> self basetrans) (-> self path-pos) 'interp) (plat-trans) - (dummy-20 self) + (baseplat-method-20 self) (none) ) :code (the-as (function none :behavior flutflut-plat) anim-loop) @@ -1002,7 +1002,7 @@ ;; definition for method 25 of type flutflut-plat-small ;; INFO: Return type mismatch sparticle-launch-control vs sparticle-launch-group. -(defmethod TODO-RENAME-25 flutflut-plat-small ((obj flutflut-plat-small)) +(defmethod baseplat-method-25 flutflut-plat-small ((obj flutflut-plat-small)) (let ((v0-0 (create-launch-control (-> *part-group-id-table* 516) obj))) (set! (-> obj part) v0-0) (the-as sparticle-launch-group v0-0) @@ -1011,7 +1011,7 @@ ;; definition for method 20 of type flutflut-plat-small ;; INFO: Return type mismatch object vs none. -(defmethod dummy-20 flutflut-plat-small ((obj flutflut-plat-small)) +(defmethod baseplat-method-20 flutflut-plat-small ((obj flutflut-plat-small)) (when (nonzero? (-> obj part)) (set! (-> *part-id-table* 2087 init-specs 12 initial-valuef) (-> obj part-ry)) (set! (-> *part-id-table* 2088 init-specs 17 initial-valuef) (-> obj part-ry)) @@ -1022,8 +1022,8 @@ ;; definition for method 26 of type flutflut-plat-small ;; INFO: Return type mismatch float vs none. -(defmethod dummy-26 flutflut-plat-small ((obj flutflut-plat-small)) - (let ((t9-0 (method-of-type flutflut-plat dummy-26))) +(defmethod baseplat-method-26 flutflut-plat-small ((obj flutflut-plat-small)) + (let ((t9-0 (method-of-type flutflut-plat baseplat-method-26))) (t9-0 obj) ) (set! (-> obj part-ry) (+ 16384.0 (quaternion-y-angle (-> obj root-override quat)))) @@ -1032,7 +1032,7 @@ ;; definition for method 24 of type flutflut-plat-small ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 flutflut-plat-small ((obj flutflut-plat-small)) +(defmethod baseplat-method-24 flutflut-plat-small ((obj flutflut-plat-small)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1064,7 +1064,7 @@ ;; definition for method 25 of type flutflut-plat-med ;; INFO: Return type mismatch sparticle-launch-control vs sparticle-launch-group. -(defmethod TODO-RENAME-25 flutflut-plat-med ((obj flutflut-plat-med)) +(defmethod baseplat-method-25 flutflut-plat-med ((obj flutflut-plat-med)) (let ((v0-0 (create-launch-control (-> *part-group-id-table* 517) obj))) (set! (-> obj part) v0-0) (the-as sparticle-launch-group v0-0) @@ -1073,7 +1073,7 @@ ;; definition for method 24 of type flutflut-plat-med ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 flutflut-plat-med ((obj flutflut-plat-med)) +(defmethod baseplat-method-24 flutflut-plat-med ((obj flutflut-plat-med)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1105,7 +1105,7 @@ ;; definition for method 25 of type flutflut-plat-large ;; INFO: Return type mismatch sparticle-launch-control vs sparticle-launch-group. -(defmethod TODO-RENAME-25 flutflut-plat-large ((obj flutflut-plat-large)) +(defmethod baseplat-method-25 flutflut-plat-large ((obj flutflut-plat-large)) (let ((v0-0 (create-launch-control (-> *part-group-id-table* 518) obj))) (set! (-> obj part) v0-0) (the-as sparticle-launch-group v0-0) @@ -1114,7 +1114,7 @@ ;; definition for method 20 of type flutflut-plat-large ;; INFO: Return type mismatch object vs none. -(defmethod dummy-20 flutflut-plat-large ((obj flutflut-plat-large)) +(defmethod baseplat-method-20 flutflut-plat-large ((obj flutflut-plat-large)) (when (nonzero? (-> obj part)) (set! (-> *part-id-table* 2091 init-specs 12 initial-valuef) (-> obj part-ry)) (set! (-> *part-id-table* 2092 init-specs 17 initial-valuef) (-> obj part-ry)) @@ -1125,8 +1125,8 @@ ;; definition for method 26 of type flutflut-plat-large ;; INFO: Return type mismatch float vs none. -(defmethod dummy-26 flutflut-plat-large ((obj flutflut-plat-large)) - (let ((t9-0 (method-of-type flutflut-plat dummy-26))) +(defmethod baseplat-method-26 flutflut-plat-large ((obj flutflut-plat-large)) + (let ((t9-0 (method-of-type flutflut-plat baseplat-method-26))) (t9-0 obj) ) (set! (-> obj part-ry) (+ 16384.0 (quaternion-y-angle (-> obj root-override quat)))) @@ -1135,7 +1135,7 @@ ;; definition for method 24 of type flutflut-plat-large ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 flutflut-plat-large ((obj flutflut-plat-large)) +(defmethod baseplat-method-24 flutflut-plat-large ((obj flutflut-plat-large)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc index d2ddfe4858..1aa5da46af 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-obs_REF.gc @@ -712,7 +712,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (baseplat-method-22 self) (sound-play "snow-spat-short" :vol 75 :pitch 0.75) ) ) @@ -787,7 +787,7 @@ (logior! (-> obj skel status) (janim-status inited)) (load-params! (-> obj sync) obj (the-as uint 1500) 0.0 0.15 0.15) (quaternion->matrix (-> obj startmat) (-> obj root-override quat)) - (dummy-21 obj) + (baseplat-method-21 obj) (go snow-spatula-idle) (none) ) @@ -1197,7 +1197,7 @@ :size-assert #xb0 :flag-assert #x15004000b0 (:methods - (TODO-RENAME-20 (_type_) none 20) + (snow-gears-method-20 (_type_) none 20) ) (:states snow-gears-activate @@ -1296,7 +1296,7 @@ ;; definition for method 20 of type snow-gears ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. -(defmethod TODO-RENAME-20 snow-gears ((obj snow-gears)) +(defmethod snow-gears-method-20 snow-gears ((obj snow-gears)) (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> obj root trans quad)) (set! (-> a1-0 y) (+ 61440.0 (-> a1-0 y))) @@ -1330,7 +1330,7 @@ ;; failed to figure out what this is: (defstate snow-gears-activate (snow-gears) :trans (behavior () - (TODO-RENAME-20 self) + (snow-gears-method-20 self) (none) ) :code (behavior () @@ -1365,7 +1365,7 @@ (none) ) :trans (behavior () - (TODO-RENAME-20 self) + (snow-gears-method-20 self) (none) ) :code (behavior () diff --git a/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc index 0747424ca4..a4f98a4498 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-ram-boss_REF.gc @@ -60,9 +60,9 @@ :size-assert #x1f4 :flag-assert #x4c019001f4 (:methods - (dummy-51 (_type_ vector) symbol :replace 51) - (dummy-52 (_type_) symbol :replace 52) - (dummy-57 (_type_ float) float :replace 57) + (ram-boss-method-51 (_type_ vector) symbol :replace 51) + (ram-boss-method-52 (_type_) symbol :replace 52) + (ram-boss-method-57 (_type_ float) float :replace 57) ) (:states (ram-boss-already-down basic) @@ -505,7 +505,7 @@ ;; definition for method 24 of type ram-boss-proj ;; INFO: Return type mismatch sound-id vs none. -(defmethod dummy-24 ram-boss-proj ((obj ram-boss-proj)) +(defmethod projectile-method-24 ram-boss-proj ((obj ram-boss-proj)) (with-pp (quaternion-rotate-local-x! (-> obj root-override quat) @@ -586,7 +586,7 @@ ;; definition for method 25 of type ram-boss-proj ;; INFO: Return type mismatch int vs none. -(defmethod dummy-25 ram-boss-proj ((obj ram-boss-proj)) +(defmethod projectile-method-25 ram-boss-proj ((obj ram-boss-proj)) (go ram-boss-proj-growing) 0 (none) @@ -594,7 +594,7 @@ ;; definition for method 26 of type ram-boss-proj ;; INFO: Return type mismatch int vs none. -(defmethod dummy-26 ram-boss-proj ((obj ram-boss-proj)) +(defmethod projectile-method-26 ram-boss-proj ((obj ram-boss-proj)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) projectile-collision-reaction) @@ -622,7 +622,7 @@ ;; definition for method 27 of type ram-boss-proj ;; INFO: Return type mismatch int vs none. -(defmethod dummy-27 ram-boss-proj ((obj ram-boss-proj)) +(defmethod projectile-method-27 ram-boss-proj ((obj ram-boss-proj)) (set! (-> obj charge-sound-id) (new 'static 'sound-id)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 521) obj)) (set! (-> obj part2) (create-launch-control (-> *part-group-id-table* 522) obj)) @@ -664,7 +664,7 @@ ;; definition for method 28 of type ram-boss-proj ;; INFO: Used lq/sq ;; INFO: Return type mismatch vector vs none. -(defmethod dummy-28 ram-boss-proj ((obj ram-boss-proj)) +(defmethod projectile-method-28 ram-boss-proj ((obj ram-boss-proj)) (when (and *target* (not (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) @@ -715,7 +715,7 @@ (sound-stop (-> self charge-sound-id)) (go-virtual projectile-dissipate) ) - (dummy-54 (-> gp-1 0) (-> self root-override trans)) + (nav-enemy-method-54 (-> gp-1 0) (-> self root-override trans)) (update-transforms! (-> self root-override)) (cond ((-> gp-1 0 proj-stoked) @@ -1132,7 +1132,7 @@ ;; definition for method 52 of type ram-boss ;; INFO: Return type mismatch vector vs symbol. -(defmethod dummy-52 ram-boss ((obj ram-boss)) +(defmethod ram-boss-method-52 ram-boss ((obj ram-boss)) (let ((v1-1 (the-as basic (-> obj collide-info root-prim)))) (set-vector! (-> (the-as collide-shape-prim v1-1) local-sphere) 0.0 8192.0 0.0 13516.8) (set-vector! (-> (the-as (array collide-shape-prim) v1-1) 16 local-sphere) 0.0 4096.0 0.0 4505.6) @@ -1155,7 +1155,7 @@ ;; definition for method 53 of type ram-boss ;; INFO: Return type mismatch int vs symbol. -(defmethod dummy-53 ram-boss ((obj ram-boss)) +(defmethod nav-enemy-method-53 ram-boss ((obj ram-boss)) (let ((v1-1 (the-as (array collide-shape-prim) (-> obj collide-info root-prim)))) (let ((a0-1 (-> v1-1 16))) (set! (-> a0-1 prim-core offense) (collide-offense touch)) @@ -1179,10 +1179,10 @@ ;; definition for method 48 of type ram-boss ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 ram-boss ((obj ram-boss)) +(defmethod nav-enemy-method-48 ram-boss ((obj ram-boss)) (initialize-skeleton obj *ram-boss-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) - (TODO-RENAME-45 obj *ram-boss-nav-enemy-info*) + (init-defaults! obj *ram-boss-nav-enemy-info*) (logclear! (-> obj enemy-info options) (fact-options has-power-cell)) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 525) obj)) (set! (-> obj part2) (create-launch-control (-> *part-group-id-table* 574) obj)) @@ -1191,7 +1191,7 @@ (set! (-> obj has-shield?) #t) (when (nonzero? (-> obj entity extra perm user-int8 1)) (set! (-> obj has-shield?) #f) - (TODO-RENAME-49 obj *ram-boss-nav-enemy-info-no-shield*) + (init-jm! obj *ram-boss-nav-enemy-info-no-shield*) (let ((v1-23 (-> obj shield-jmod))) (set! (-> v1-23 enable) #t) (set! (-> v1-23 transform scale quad) (the-as uint128 0)) @@ -1217,7 +1217,7 @@ (set! (-> self nav-enemy-patrol-timeout) (seconds 1)) (initialize-collision self) (set! (-> self entity) (-> arg1 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (set! (-> self collide-info trans quad) (-> arg1 collide-info trans quad)) (set-vector! (-> self collide-info scale) 1.0 1.0 1.0 1.0) (let ((t9-2 quaternion-copy!) @@ -1240,7 +1240,7 @@ ;; definition for method 54 of type ram-boss ;; INFO: Return type mismatch vector vs symbol. -(defmethod dummy-54 ram-boss ((obj ram-boss) (arg0 vector)) +(defmethod nav-enemy-method-54 ram-boss ((obj ram-boss) (arg0 vector)) (let ((a2-0 (-> obj node-list data 18 bone transform))) (set-vector! arg0 0.0 0.0 -2457.6 1.0) (vector-matrix*! arg0 arg0 a2-0) @@ -1250,7 +1250,7 @@ ;; definition for method 55 of type ram-boss ;; INFO: Used lq/sq -(defmethod dummy-55 ram-boss ((obj ram-boss)) +(defmethod nav-enemy-method-55 ram-boss ((obj ram-boss)) (if (not *target*) (return #f) ) @@ -1287,7 +1287,7 @@ ) ;; definition for method 51 of type ram-boss -(defmethod dummy-51 ram-boss ((obj ram-boss) (arg0 vector)) +(defmethod ram-boss-method-51 ram-boss ((obj ram-boss) (arg0 vector)) (let* ((f30-0 (quaternion-y-angle (-> obj collide-info quat))) (f0-2 (atan (-> arg0 x) (-> arg0 z))) (f0-3 (deg- f30-0 f0-2)) @@ -1408,7 +1408,7 @@ ) ) :enter (behavior ((arg0 basic)) - (dummy-52 self) + (ram-boss-method-52 self) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) (let ((s5-0 (new 'stack-no-clear 'vector)) (gp-0 (-> self node-list data 0 bone transform)) @@ -1493,7 +1493,7 @@ (defstate ram-boss-already-down (ram-boss) :code (behavior ((arg0 basic)) (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) - (dummy-52 self) + (ram-boss-method-52 self) (let ((a1-0 (new 'stack-no-clear 'vector)) (a2-0 (-> self parent-override 0 node-list data 0 bone transform)) ) @@ -1514,7 +1514,7 @@ ;; failed to figure out what this is: (defstate ram-boss-nav-start (ram-boss) :code (behavior () - (let ((a1-1 (dummy-16 (-> self nav) (-> self collide-info trans)))) + (let ((a1-1 (nav-control-method-16 (-> self nav) (-> self collide-info trans)))) (when (not a1-1) (go process-drawable-art-error "not on nav mesh") (return #f) @@ -1536,10 +1536,10 @@ ((>= 18432.0 f30-0) (go ram-boss-tracking) ) - ((not (TODO-RENAME-46 self 237568.0)) + ((not (target-in-range? self 237568.0)) (go-virtual nav-enemy-patrol) ) - ((and (< f30-0 106496.0) (dummy-55 self)) + ((and (< f30-0 106496.0) (nav-enemy-method-55 self)) (go-virtual nav-enemy-attack) ) ((< f30-0 237568.0) @@ -1598,10 +1598,10 @@ (go ram-boss-tracking) ) (when (>= (- (-> *display* base-frame-counter) (-> self state-time)) (-> self reaction-time)) - (if (not (TODO-RENAME-46 self (-> self nav-info stop-chase-distance))) + (if (not (target-in-range? self (-> self nav-info stop-chase-distance))) (go-virtual nav-enemy-patrol) ) - (if (and (>= 73728.0 f30-0) (dummy-55 self)) + (if (and (>= 73728.0 f30-0) (nav-enemy-method-55 self)) (go-virtual nav-enemy-attack) ) ) @@ -1633,7 +1633,7 @@ ) ;; definition for method 57 of type ram-boss -(defmethod dummy-57 ram-boss ((obj ram-boss) (arg0 float)) +(defmethod ram-boss-method-57 ram-boss ((obj ram-boss) (arg0 float)) (let ((f0-0 0.0)) (when *target* (let ((s3-0 (new 'stack-no-clear 'vector))) @@ -1708,7 +1708,7 @@ (go-virtual nav-enemy-chase) ) ((< 18432.0 f0-10) - (if (not (dummy-55 self)) + (if (not (nav-enemy-method-55 self)) (go-virtual nav-enemy-chase) ) (when (>= (-> self frustration) 256) @@ -1729,13 +1729,13 @@ (let ((gp-2 (new 'stack-no-clear 'vector)) (s5-2 (new 'stack-no-clear 'vector)) ) - (dummy-54 self s5-2) + (nav-enemy-method-54 self s5-2) (set! (-> gp-2 quad) (-> (target-pos 0) quad)) (set! (-> gp-2 y) (+ 4915.2 (-> gp-2 y))) (vector-! (-> self proj-launch-vec) gp-2 s5-2) ) (vector-normalize! (-> self proj-launch-vec) 1.0) - (if (not (dummy-51 self (-> self proj-launch-vec))) + (if (not (ram-boss-method-51 self (-> self proj-launch-vec))) (go ram-boss-throw) ) ) @@ -1745,7 +1745,7 @@ :code (behavior () (let ((f30-0 -1.0)) (loop - (set! f30-0 (dummy-57 self f30-0)) + (set! f30-0 (ram-boss-method-57 self f30-0)) (cond ((< 5461.3335 (-> self last-turn-speed)) (cond @@ -1933,8 +1933,8 @@ :enter (behavior () (logior! (-> self nav-enemy-flags) (nav-enemy-flags navenmf2)) (nav-enemy-neck-control-inactive) - (dummy-53 self) - (TODO-RENAME-49 self *ram-boss-nav-enemy-info-no-shield*) + (nav-enemy-method-53 self) + (init-jm! self *ram-boss-nav-enemy-info-no-shield*) (none) ) :exit (behavior () @@ -1971,7 +1971,7 @@ ) :post (behavior () (compute-alignment! (-> self align)) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (align-vel-and-quat-only! (-> self align) (align-opts adjust-xz-vel) diff --git a/test/decompiler/reference/jak1/levels/snow/snow-ram-h_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-ram-h_REF.gc index 97595fb997..fd00bfe813 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-ram-h_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-ram-h_REF.gc @@ -16,9 +16,9 @@ :size-assert #xe0 :flag-assert #x17007000e0 (:methods - (dummy-20 (_type_) object 20) - (dummy-21 (_type_) object 21) - (dummy-22 (_type_) symbol 22) + (ram-method-20 (_type_) object 20) + (ram-method-21 (_type_) object 21) + (ram-method-22 (_type_) symbol 22) ) (:states ram-fun-idle diff --git a/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc b/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc index 6821332ee9..ab3e20ea93 100644 --- a/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/snow-ram_REF.gc @@ -111,7 +111,7 @@ ) ;; definition for method 20 of type ram -(defmethod dummy-20 ram ((obj ram)) +(defmethod ram-method-20 ram ((obj ram)) (let ((gp-0 (-> obj part))) (when (nonzero? gp-0) (let ((a2-0 (-> obj node-list data 8 bone transform)) @@ -127,7 +127,7 @@ ) ;; definition for method 21 of type ram -(defmethod dummy-21 ram ((obj ram)) +(defmethod ram-method-21 ram ((obj ram)) (let ((gp-0 (-> obj part2))) (let ((s3-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) @@ -159,7 +159,7 @@ ) ;; definition for method 22 of type ram -(defmethod dummy-22 ram ((obj ram)) +(defmethod ram-method-22 ram ((obj ram)) (process-entity-status! obj (entity-perm-status complete) #t) (let ((v1-0 (alt-actor-list-subtask-incomplete-count obj))) (cond @@ -232,10 +232,10 @@ (let ((f30-0 (ja-aframe-num 0))) (when (and (not gp-1) (>= f30-0 61.0)) (set! gp-1 #t) - (dummy-20 self) + (ram-method-20 self) ) (if (and (>= f30-0 62.0) (< f30-0 97.0)) - (dummy-21 self) + (ram-method-21 self) ) ) (suspend) @@ -265,7 +265,7 @@ (case event-type (('notify) (when (= (-> proc type) ram-boss) - (if (dummy-22 self) + (if (ram-method-22 self) (go ram-give-fuel-cell) ) ) diff --git a/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc b/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc index 800962064d..32b8d9ac62 100644 --- a/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc +++ b/test/decompiler/reference/jak1/levels/snow/yeti_REF.gc @@ -44,7 +44,7 @@ :size-assert #xc8 :flag-assert #x16006000c8 (:methods - (TODO-RENAME-20 (_type_ vector vector) symbol 20) + (yeti-method-20 (_type_ vector vector) symbol 20) (aggro? (_type_ vector) symbol 21) ) (:states @@ -293,7 +293,7 @@ (suspend) (ja :num! (seek! max 0.5)) ) - (if (TODO-RENAME-46 self (-> self nav-info notice-distance)) + (if (target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) (go-virtual nav-enemy-idle) ) @@ -564,10 +564,10 @@ ;; definition for method 48 of type yeti-slave ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 yeti-slave ((obj yeti-slave)) +(defmethod nav-enemy-method-48 yeti-slave ((obj yeti-slave)) (initialize-skeleton obj *yeti-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) - (TODO-RENAME-45 obj *yeti-nav-enemy-info*) + (init-defaults! obj *yeti-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 0)) (set! (-> obj neck nose) (the-as uint 1)) (set! (-> obj neck ear) (the-as uint 2)) @@ -604,7 +604,7 @@ (vector-identity! (-> self collide-info scale)) (forward-up->quaternion (-> self collide-info quat) arg3 *up-vector*) (set! (-> self entity) (-> arg1 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (if arg4 (go-virtual nav-enemy-idle) (go yeti-slave-appear-jump-up) @@ -633,7 +633,7 @@ ) ;; definition for method 20 of type yeti -(defmethod TODO-RENAME-20 yeti ((obj yeti) (arg0 vector) (arg1 vector)) +(defmethod yeti-method-20 yeti ((obj yeti) (arg0 vector) (arg1 vector)) (let ((s3-0 (-> obj path curve num-cverts))) (if (<= s3-0 0) (return #f) @@ -697,7 +697,7 @@ (let ((s5-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) ) - (if (not (TODO-RENAME-20 self s5-0 s4-0)) + (if (not (yeti-method-20 self s5-0 s4-0)) (go yeti-idle) ) (process-spawn yeti-slave (-> self entity) self s5-0 s4-0 #t :to self) @@ -736,7 +736,7 @@ (let ((gp-0 (new 'stack-no-clear 'vector)) (s5-0 (new 'stack-no-clear 'vector)) ) - (when (TODO-RENAME-20 self gp-0 s5-0) + (when (yeti-method-20 self gp-0 s5-0) (process-spawn yeti-slave (-> self entity) self gp-0 s5-0 #f :to self) (set! (-> self spawn-delay) 0) 0 diff --git a/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc b/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc index 560f0f7ed6..019aa87776 100644 --- a/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/bully_REF.gc @@ -47,7 +47,7 @@ :size-assert #xf4 :flag-assert #x15009000f4 (:methods - (dummy-20 (_type_) float 20) + (bully-method-20 (_type_) float 20) ) (:states bully-die @@ -430,7 +430,7 @@ ;; definition for method 20 of type bully ;; INFO: Used lq/sq -(defmethod dummy-20 bully ((obj bully)) +(defmethod bully-method-20 bully ((obj bully)) (local-vars (at-0 int)) (rlet ((vf0 :class vf) (vf1 :class vf) @@ -445,7 +445,7 @@ 1.0 ) (let ((s5-1 #f)) - (TODO-RENAME-28 (-> obj nav) (collide-kind wall-object ground-object)) + (nav-control-method-28 (-> obj nav) (collide-kind wall-object ground-object)) (let ((v1-4 (-> obj nav travel))) (.lvf vf1 (&-> (-> obj root-override transv) quad)) (let ((f0-8 (-> *display* seconds-per-frame))) @@ -457,7 +457,7 @@ (.svf (&-> v1-4 quad) vf1) ) (let ((s4-0 (new 'stack-no-clear 'check-vector-collision-with-nav-spheres-info))) - (when (>= (dummy-23 (-> obj nav) (-> obj nav travel) s4-0) 0.0) + (when (>= (nav-control-method-23 (-> obj nav) (-> obj nav travel) s4-0) 0.0) (let ((s5-2 (new 'stack-no-clear 'vector))) (set! (-> s5-2 quad) (-> s4-0 normal quad)) (set! (-> s5-2 y) 0.0) @@ -475,7 +475,7 @@ (when (not s5-1) (vector-normalize-copy! (-> obj nav travel) (-> obj root-override transv) 2048.0) (let ((s5-3 (new 'stack 'clip-travel-vector-to-mesh-return-info))) - (dummy-24 (-> obj nav) 2048.0 s5-3) + (nav-control-method-24 (-> obj nav) 2048.0 s5-3) (when (and (-> s5-3 found-boundary) (>= (* (-> obj travel-speed) (-> *display* seconds-per-frame)) (vector-vector-xz-distance (-> s5-3 intersection) (-> obj root-override trans)) @@ -655,7 +655,7 @@ (set! (-> self travel-speed) (* 41779.2 (-> self speed-u))) (+! (-> self facing-ry) (* (-> self spin-vel) (-> *display* seconds-per-frame))) (quaternion-axis-angle! (-> self root-override quat) 0.0 1.0 0.0 (-> self facing-ry)) - (dummy-20 self) + (bully-method-20 self) (integrate-for-enemy-with-move-to-ground! (-> self root-override) (-> self root-override transv) @@ -665,7 +665,7 @@ #f #f ) - (TODO-RENAME-27 (-> self nav)) + (nav-control-method-27 (-> self nav)) (none) ) :code (behavior () diff --git a/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc b/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc index 77d4ba089a..dec7177b35 100644 --- a/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/double-lurker_REF.gc @@ -44,7 +44,7 @@ :flag-assert #x4c014001a8 (:methods (initialize-collision (_type_) collide-shape-moving :replace 47) - (dummy-53 (_type_ vector) symbol :replace 53) + (double-lurker-method-53 (_type_ vector) symbol :replace 53) ) (:states double-lurker-both-knocked-back @@ -328,7 +328,7 @@ ) ) :code (behavior ((arg0 object) (arg1 vector) (arg2 vector)) - (dummy-51 self) + (nav-enemy-method-51 self) (let ((v1-3 (-> self draw shadow-ctrl))) (logclear! (-> v1-3 settings flags) (shadow-flags disable-draw)) ) @@ -354,7 +354,7 @@ ) (logior! (-> self collide-info nav-flags) (nav-flags navf0)) (logclear! (-> self collide-info nav-flags) (nav-flags navf1)) - (TODO-RENAME-27 (-> self nav)) + (nav-control-method-27 (-> self nav)) (go double-lurker-top-resume) (none) ) @@ -368,7 +368,7 @@ ((not *target*) (go-virtual nav-enemy-idle) ) - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) ) ((and (and *target* (>= (-> self enemy-info idle-distance) @@ -422,10 +422,10 @@ ) ;; definition for method 51 of type double-lurker-top -(defmethod dummy-51 double-lurker-top ((obj double-lurker-top)) +(defmethod nav-enemy-method-51 double-lurker-top ((obj double-lurker-top)) (restore-collide-with-as (-> obj collide-info)) (logior! (-> obj collide-info nav-flags) (nav-flags navf0)) - (TODO-RENAME-27 (-> obj nav)) + (nav-control-method-27 (-> obj nav)) (none) ) @@ -503,10 +503,10 @@ ;; definition for method 48 of type double-lurker-top ;; INFO: Used lq/sq ;; INFO: Return type mismatch nav-flags vs none. -(defmethod TODO-RENAME-48 double-lurker-top ((obj double-lurker-top)) +(defmethod nav-enemy-method-48 double-lurker-top ((obj double-lurker-top)) (initialize-skeleton obj *double-lurker-top-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) - (TODO-RENAME-45 obj *double-lurker-top-nav-enemy-info*) + (init-defaults! obj *double-lurker-top-nav-enemy-info*) (let ((v1-5 (-> obj parent-process))) (set! (-> obj collide-info trans quad) (-> v1-5 0 collide-info trans quad)) (set-vector! (-> obj collide-info scale) 1.0 1.0 1.0 1.0) @@ -522,7 +522,7 @@ (defbehavior double-lurker-top-init-by-other double-lurker-top ((arg0 entity) (arg1 double-lurker) (arg2 symbol) (arg3 vector)) (initialize-collision self) (set! (-> self entity) (-> arg1 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (set! (-> self collide-info trans quad) (-> arg3 quad)) (cond (arg2 @@ -540,7 +540,7 @@ (ja :group! double-lurker-idle-ja :num! min) (transform-post) (move-to-ground (-> self collide-info) 40960.0 40960.0 #t (collide-kind background)) - (dummy-51 self) + (nav-enemy-method-51 self) (go double-lurker-top-resume) ) ) @@ -555,7 +555,7 @@ (case arg2 (('touch) (set! (-> self touch-time) (-> *display* base-frame-counter)) - (dummy-44 self arg0 arg3) + (touch-handler self arg0 arg3) ) (('attack) (when (= (-> arg0 type) target) @@ -611,7 +611,7 @@ ) (else (nav-enemy-set-hit-from-direction arg0) - (dummy-43 self arg0 arg3) + (attack-handler self arg0 arg3) ) ) ) @@ -639,7 +639,7 @@ ((not *target*) (go-virtual nav-enemy-idle) ) - ((TODO-RENAME-46 self (-> self nav-info notice-distance)) + ((target-in-range? self (-> self nav-info notice-distance)) (go-virtual nav-enemy-chase) ) ((and (and *target* (>= (-> self enemy-info idle-distance) @@ -770,15 +770,15 @@ (.svf (&-> v1-7 quad) vf1) ) (let ((gp-0 #f)) - (TODO-RENAME-28 (-> self nav) (the-as collide-kind -1)) + (nav-control-method-28 (-> self nav) (the-as collide-kind -1)) (let ((a2-1 (new 'stack-no-clear 'check-vector-collision-with-nav-spheres-info))) - (if (>= (dummy-23 (-> self nav) (-> self nav travel) a2-1) 0.0) + (if (>= (nav-control-method-23 (-> self nav) (-> self nav travel) a2-1) 0.0) (set! gp-0 #t) ) ) (when (not gp-0) (let ((s5-0 (new 'stack 'clip-travel-vector-to-mesh-return-info))) - (dummy-24 (-> self nav) (* 1.2 f30-0) s5-0) + (nav-control-method-24 (-> self nav) (* 1.2 f30-0) s5-0) (if (-> s5-0 found-boundary) (set! gp-0 #t) ) @@ -801,7 +801,7 @@ (-> self nav-info hover-if-no-ground) #f ) - (TODO-RENAME-27 (-> self nav)) + (nav-control-method-27 (-> self nav)) (none) ) ) @@ -820,12 +820,12 @@ ;; definition for method 52 of type double-lurker ;; INFO: Used lq/sq -(defmethod dummy-52 double-lurker ((obj double-lurker) (arg0 vector)) - (TODO-RENAME-28 (-> obj nav) (the-as collide-kind -1)) +(defmethod nav-enemy-method-52 double-lurker ((obj double-lurker) (arg0 vector)) + (nav-control-method-28 (-> obj nav) (the-as collide-kind -1)) (let ((a1-2 (new 'stack-no-clear 'vector))) (vector-float*! a1-2 (-> obj hit-from-dir) 22937.602) (vector+! a1-2 a1-2 (-> obj collide-info trans)) - (dummy-13 (-> obj nav) a1-2 (-> obj hit-from-dir)) + (nav-control-method-13 (-> obj nav) a1-2 (-> obj hit-from-dir)) ) (when (>= (vector-xz-length (-> obj nav travel)) 18841.602) (vector+! arg0 (-> obj collide-info trans) (-> obj nav travel)) @@ -863,13 +863,13 @@ (set! (-> v1-2 user-int8 2) 1) ) (let ((gp-0 (new 'stack-no-clear 'vector))) - (if (dummy-52 self gp-0) + (if (nav-enemy-method-52 self gp-0) (send-event (handle->process (-> self buddy-handle)) 'trigger gp-0) (send-event (handle->process (-> self buddy-handle)) 'instant-death (-> self hit-from-dir)) ) ) - (dummy-51 self) - (TODO-RENAME-49 self *double-lurker-nav-enemy-info*) + (nav-enemy-method-51 self) + (init-jm! self *double-lurker-nav-enemy-info*) (go double-lurker-break-apart) (none) ) @@ -922,15 +922,15 @@ (.svf (&-> v1-7 quad) vf1) ) (let ((gp-0 #f)) - (TODO-RENAME-28 (-> self nav) (the-as collide-kind -1)) + (nav-control-method-28 (-> self nav) (the-as collide-kind -1)) (let ((a2-1 (new 'stack-no-clear 'check-vector-collision-with-nav-spheres-info))) - (if (>= (dummy-23 (-> self nav) (-> self nav travel) a2-1) 0.0) + (if (>= (nav-control-method-23 (-> self nav) (-> self nav travel) a2-1) 0.0) (set! gp-0 #t) ) ) (when (not gp-0) (let ((s5-0 (new 'stack 'clip-travel-vector-to-mesh-return-info))) - (dummy-24 (-> self nav) (* 1.2 f30-0) s5-0) + (nav-control-method-24 (-> self nav) (* 1.2 f30-0) s5-0) (if (-> s5-0 found-boundary) (set! gp-0 #t) ) @@ -953,7 +953,7 @@ (-> self nav-info hover-if-no-ground) #f ) - (TODO-RENAME-27 (-> self nav)) + (nav-control-method-27 (-> self nav)) (none) ) ) @@ -983,14 +983,14 @@ ) ;; definition for method 53 of type double-lurker -(defmethod dummy-53 double-lurker ((obj double-lurker) (arg0 vector)) +(defmethod double-lurker-method-53 double-lurker ((obj double-lurker) (arg0 vector)) (let* ((s3-0 (-> obj path curve num-cverts)) (s4-0 (rand-vu-int-count s3-0)) ) (while (nonzero? s3-0) (+! s3-0 -1) (eval-path-curve-div! (-> obj path) arg0 (the float s4-0) 'interp) - (if (not (TODO-RENAME-50 obj arg0)) + (if (not (nav-enemy-method-50 obj arg0)) (return #t) ) ) @@ -1094,7 +1094,7 @@ ;; definition for method 51 of type double-lurker ;; INFO: Return type mismatch symbol vs none. -(defmethod dummy-51 double-lurker ((obj double-lurker)) +(defmethod nav-enemy-method-51 double-lurker ((obj double-lurker)) (let ((v1-1 (-> obj collide-info root-prim))) (let ((a0-1 0)) (dotimes (a1-0 3) @@ -1122,7 +1122,7 @@ ;; definition for method 48 of type double-lurker ;; INFO: Used lq/sq ;; INFO: Return type mismatch float vs none. -(defmethod TODO-RENAME-48 double-lurker ((obj double-lurker)) +(defmethod nav-enemy-method-48 double-lurker ((obj double-lurker)) (set! (-> obj buddy-handle) (the-as handle #f)) (process-drawable-from-entity! obj (-> obj entity)) (set! (-> obj align) (new 'process 'align-control obj)) @@ -1144,7 +1144,7 @@ (set! (-> obj buddy-on-shoulders?) #f) ) ) - (TODO-RENAME-45 obj *double-lurker-when-both-nav-enemy-info*) + (init-defaults! obj *double-lurker-when-both-nav-enemy-info*) (set! (-> obj neck up) (the-as uint 1)) (set! (-> obj neck nose) (the-as uint 2)) (set! (-> obj neck ear) (the-as uint 0)) @@ -1152,7 +1152,7 @@ (when (not (-> obj buddy-dead?)) (let ((s5-0 (new 'stack-no-clear 'vector))) (when (not (-> obj buddy-on-shoulders?)) - (when (not (dummy-53 obj s5-0)) + (when (not (double-lurker-method-53 obj s5-0)) (set! (-> obj buddy-on-shoulders?) #t) (let ((v1-29 (-> obj entity extra perm))) (logior! (-> v1-29 status) (entity-perm-status user-set-from-cstage)) @@ -1172,8 +1172,8 @@ ) ) (when (and (not (-> obj dead?)) (not (-> obj buddy-on-shoulders?))) - (dummy-51 obj) - (TODO-RENAME-49 obj *double-lurker-nav-enemy-info*) + (nav-enemy-method-51 obj) + (init-jm! obj *double-lurker-nav-enemy-info*) ) (none) ) @@ -1182,7 +1182,7 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! double-lurker ((obj double-lurker) (arg0 entity-actor)) (initialize-collision obj) - (TODO-RENAME-48 obj) + (nav-enemy-method-48 obj) (if (-> obj dead?) (go double-lurker-waiting-to-die) (go (method-of-object obj nav-enemy-idle)) diff --git a/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc b/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc index f002ce2478..dc6f331283 100644 --- a/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/floating-launcher_REF.gc @@ -134,7 +134,7 @@ (initialize-skeleton obj *floating-launcher-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-override)) - (dummy-21 obj) + (baseplat-method-21 obj) (set! (-> obj trigger-height) (res-lump-float arg0 'trigger-height)) (go floating-launcher-idle) (none) diff --git a/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc b/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc index daa9571a80..7d3eb4138e 100644 --- a/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/helix-water_REF.gc @@ -105,8 +105,8 @@ :size-assert #xc8 :flag-assert #x16006000c8 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) object 21) + (helix-water-method-20 (_type_) none 20) + (helix-water-method-21 (_type_) object 21) ) (:states helix-water-activated @@ -616,7 +616,7 @@ ) ;; definition for method 21 of type helix-water -(defmethod dummy-21 helix-water ((obj helix-water)) +(defmethod helix-water-method-21 helix-water ((obj helix-water)) (let ((s5-0 (+ (-> obj last-alt-actor-consumed) 1))) (when (< s5-0 (-> obj alt-actors length)) (let* ((v1-5 (-> obj alt-actors s5-0)) @@ -665,7 +665,7 @@ (go helix-water-activated) ) (('music) - (set-setting! 'music 'danger 0.0 0) + (the-as object (set-setting! 'music 'danger 0.0 0)) ) ) ) @@ -724,7 +724,7 @@ (set! (-> self root trans y) (-> self end-y)) ) (send-event (ppointer->process (-> self dark-eco)) 'move-to (-> self root trans)) - (dummy-21 self) + (helix-water-method-21 self) (none) ) :code (behavior () diff --git a/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc b/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc index 2acf78f034..467762a536 100644 --- a/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/orbit-plat_REF.gc @@ -14,7 +14,7 @@ :size-assert #xb4 :flag-assert #x15005000b4 (:methods - (dummy-20 (_type_ vector vector) none 20) + (orbit-plat-bottom-method-20 (_type_ vector vector) none 20) ) (:states orbit-plat-bottom-idle @@ -51,8 +51,8 @@ :size-assert #x118 :flag-assert #x1d00b00118 (:methods - (dummy-27 (_type_) symbol 27) - (dummy-28 (_type_) symbol 28) + (orbit-plat-method-27 (_type_) symbol 27) + (orbit-plat-method-28 (_type_) symbol 28) ) (:states orbit-plat-idle @@ -164,7 +164,7 @@ ;; definition for method 20 of type orbit-plat-bottom ;; INFO: Return type mismatch int vs none. -(defmethod dummy-20 orbit-plat-bottom ((obj orbit-plat-bottom) (arg0 vector) (arg1 vector)) +(defmethod orbit-plat-bottom-method-20 orbit-plat-bottom ((obj orbit-plat-bottom) (arg0 vector) (arg1 vector)) (let* ((s5-1 (vector-! (new 'stack-no-clear 'vector) arg1 arg0)) (f30-0 (vector-length s5-1)) ) @@ -247,7 +247,7 @@ (vector+*! s5-0 gp-1 s4-0 26624.0) (vector+*! gp-1 gp-1 s4-0 8192.0) ) - (dummy-20 self gp-1 s5-0) + (orbit-plat-bottom-method-20 self gp-1 s5-0) ) ) ) @@ -307,7 +307,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('go) (go orbit-plat-rotating) @@ -396,7 +396,7 @@ ) ;; definition for method 28 of type orbit-plat -(defmethod dummy-28 orbit-plat ((obj orbit-plat)) +(defmethod orbit-plat-method-28 orbit-plat ((obj orbit-plat)) (when (>= (- (-> *display* base-frame-counter) (-> obj state-time)) (the int (* 300.0 (-> obj timeout)))) (cond (*target* @@ -421,7 +421,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('go) (go orbit-plat-rotating) @@ -434,7 +434,7 @@ (set! (-> self plat-status) (the-as uint 0)) (set! (-> self state-time) (-> *display* base-frame-counter)) (ja-no-eval :num! (seek! 0.0)) - (until (dummy-28 self) + (until (orbit-plat-method-28 self) (when (nonzero? (-> self root-override riders num-riders)) (let ((a1-1 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-1 from) self) @@ -525,7 +525,7 @@ (defun get-nav-point! ((arg0 vector) (arg1 orbit-plat) (arg2 vector) (arg3 float)) (set! (-> arg1 nav target-pos quad) (-> arg2 quad)) (logclear! (-> arg1 nav flags) (nav-control-flags navcf19)) - (dummy-11 (-> arg1 nav) (-> arg1 nav target-pos)) + (nav-control-method-11 (-> arg1 nav) (-> arg1 nav target-pos)) (let ((f0-0 (vector-length (-> arg1 nav travel)))) (if (< arg3 f0-0) (set! f0-0 arg3) @@ -543,7 +543,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('stop) (go orbit-plat-still) @@ -580,7 +580,7 @@ (label cfg-3) (dotimes (s4-0 2) (get-rotate-point! s5-0 gp-0 (-> self basetrans) (the-as vector f30-0) (-> self rot-dir) 40960.0) - (b! (not (dummy-16 (-> self nav) s5-0)) cfg-6 :delay (empty-form)) + (b! (not (nav-control-method-16 (-> self nav) s5-0)) cfg-6 :delay (empty-form)) (set! (-> self basetrans quad) (-> s5-0 quad)) (b! #t cfg-9 :delay (nop!)) (label cfg-6) @@ -604,7 +604,7 @@ ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs symbol. ;; WARN: disable def twice: 132. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare. -(defmethod dummy-27 orbit-plat ((obj orbit-plat)) +(defmethod orbit-plat-method-27 orbit-plat ((obj orbit-plat)) (local-vars (v0-11 object)) (let* ((v1-0 (-> obj other)) (s5-0 (if v1-0 @@ -663,13 +663,13 @@ (let ((f30-2 (vector-length a0-7))) (get-rotate-point! s5-1 s4-0 (-> obj basetrans) (the-as vector f30-2) (-> obj rot-dir) 40960.0) (cond - ((dummy-16 (-> obj nav) s5-1) + ((nav-control-method-16 (-> obj nav) s5-1) (set! (-> obj basetrans quad) (-> s5-1 quad)) ) (else (set! (-> obj rot-dir) (- (-> obj rot-dir))) (get-rotate-point! s5-1 s4-0 (-> obj basetrans) (the-as vector f30-2) (-> obj rot-dir) 40960.0) - (if (dummy-16 (-> obj nav) s5-1) + (if (nav-control-method-16 (-> obj nav) s5-1) (set! (-> obj basetrans quad) (-> s5-1 quad)) ) ) @@ -704,10 +704,10 @@ (vector-! s5-2 s5-2 s4-1) (vector-normalize! s5-2 (-> obj reset-length)) (vector+! s5-2 s5-2 s4-1) - (when (not (dummy-16 (-> obj nav) s5-2)) + (when (not (nav-control-method-16 (-> obj nav) s5-2)) (logclear! (-> obj nav flags) (nav-control-flags navcf19)) (get-rotate-point! s5-2 s4-1 (-> obj basetrans) (the-as vector (-> obj reset-length)) 0.0 40960.0) - (when (not (dummy-16 (-> obj nav) s5-2)) + (when (not (nav-control-method-16 (-> obj nav) s5-2)) (get-rotate-point! s5-2 s4-1 @@ -716,7 +716,7 @@ (-> obj rot-dir) 40960.0 ) - (when (not (dummy-16 (-> obj nav) s5-2)) + (when (not (nav-control-method-16 (-> obj nav) s5-2)) (set! (-> obj rot-dir) (- (-> obj rot-dir))) (get-rotate-point! s5-2 @@ -755,7 +755,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('go) (go orbit-plat-rotating) @@ -769,7 +769,7 @@ (logclear! (-> self nav flags) (nav-control-flags navcf19)) (ja-no-eval :num! (seek! 0.0)) (while (not (logtest? (nav-control-flags navcf19) (-> self nav flags))) - (dummy-27 self) + (orbit-plat-method-27 self) (when (nonzero? (-> self root-override riders num-riders)) (let ((a1-1 (new 'stack-no-clear 'event-message-block))) (set! (-> a1-1 from) self) @@ -864,7 +864,7 @@ ) (ja-post) (update-transforms! (-> obj root-override)) - (dummy-21 obj) + (baseplat-method-21 obj) (set! (-> obj nav) (new 'process 'nav-control (-> obj root-override) 16 40960.0)) (logior! (-> obj nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7)) (set! (-> obj nav gap-event) 'blocked) diff --git a/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc b/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc index 1b41600d49..6798a20ce6 100644 --- a/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/puffer_REF.gc @@ -40,18 +40,18 @@ :size-assert #x198 :flag-assert #x2001300198 (:methods - (dummy-20 (_type_ vector) none 20) - (dummy-21 (_type_) none 21) - (dummy-22 (_type_) symbol 22) - (dummy-23 (_type_ symbol) symbol 23) - (dummy-24 (_type_ vector) symbol 24) - (dummy-25 (_type_ float) symbol 25) - (dummy-26 (_type_) none 26) - (dummy-27 (_type_) none 27) - (dummy-28 (_type_) none 28) + (puffer-method-20 (_type_ vector) none 20) + (puffer-method-21 (_type_) none 21) + (puffer-method-22 (_type_) symbol 22) + (puffer-method-23 (_type_ symbol) symbol 23) + (puffer-method-24 (_type_ vector) symbol 24) + (puffer-method-25 (_type_ float) symbol 25) + (puffer-method-26 (_type_) none 26) + (puffer-method-27 (_type_) none 27) + (puffer-method-28 (_type_) none 28) (flip-look! (_type_ symbol) none 29) - (dummy-30 (_type_) vector 30) - (dummy-31 (_type_) vector 31) + (puffer-method-30 (_type_) vector 30) + (puffer-method-31 (_type_) vector 31) ) (:states puffer-attack @@ -181,7 +181,7 @@ ;; definition for method 28 of type puffer ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-28 puffer ((obj puffer)) +(defmethod puffer-method-28 puffer ((obj puffer)) (cond ((and (-> obj draw shadow) (zero? (-> obj draw cur-lod)) @@ -239,14 +239,14 @@ ) ;; definition for method 24 of type puffer -(defmethod dummy-24 puffer ((obj puffer) (arg0 vector)) +(defmethod puffer-method-24 puffer ((obj puffer) (arg0 vector)) (and (is-in-mesh? (-> obj nav) arg0 11468.8) (< (-> arg0 y) (+ (-> obj root-override trans y) (-> obj fact-info-override notice-top))) ) ) ;; definition for method 22 of type puffer -(defmethod dummy-22 puffer ((obj puffer)) +(defmethod puffer-method-22 puffer ((obj puffer)) (let* ((a1-0 (-> obj buddy)) (v1-0 (if a1-0 (-> a1-0 ppointer 3) @@ -265,14 +265,14 @@ ) ;; definition for method 25 of type puffer -(defmethod dummy-25 puffer ((obj puffer) (arg0 float)) +(defmethod puffer-method-25 puffer ((obj puffer) (arg0 float)) (when *target* (let ((gp-0 (target-pos 0))) (when (and (not (logtest? (-> *target* state-flags) (state-flags being-attacked invulnerable timed-invulnerable invuln-powerup do-not-notice dying) ) ) - (dummy-24 obj gp-0) + (puffer-method-24 obj gp-0) (>= (-> gp-0 y) (+ -14336.0 (-> obj attack-bottom-y))) (>= (+ 2048.0 (-> obj top-y)) (-> gp-0 y)) ) @@ -334,7 +334,7 @@ ;; definition for method 23 of type puffer ;; INFO: Used lq/sq -(defmethod dummy-23 puffer ((obj puffer) (arg0 symbol)) +(defmethod puffer-method-23 puffer ((obj puffer) (arg0 symbol)) (local-vars (v1-0 process)) (set! v1-0 (when arg0 (let ((a0-1 (-> obj buddy))) @@ -405,7 +405,7 @@ ;; definition for method 20 of type puffer ;; INFO: Used lq/sq -(defmethod dummy-20 puffer ((obj puffer) (arg0 vector)) +(defmethod puffer-method-20 puffer ((obj puffer) (arg0 vector)) (if (-> obj attacking?) (set! (-> obj travel-speed) (seek-with-smooth (-> obj travel-speed) 30720.0 (* 8192.0 (-> *display* seconds-per-frame)) 0.125 40.96) @@ -414,9 +414,9 @@ (seek-with-smooth (-> obj travel-speed) 18432.0 (* 2048.0 (-> *display* seconds-per-frame)) 0.125 40.96) ) ) - (TODO-RENAME-27 (-> obj nav)) - (TODO-RENAME-28 (-> obj nav) (the-as collide-kind -1)) - (dummy-13 (-> obj nav) arg0 (-> obj root-override transv)) + (nav-control-method-27 (-> obj nav)) + (nav-control-method-28 (-> obj nav) (the-as collide-kind -1)) + (nav-control-method-13 (-> obj nav) arg0 (-> obj root-override transv)) (let ((f30-0 (* (vector-xz-length (-> obj nav travel)) (-> *display* frames-per-second)))) (let ((f0-11 (atan (-> obj nav travel x) (-> obj nav travel z))) (s5-1 (new 'stack-no-clear 'vector)) @@ -441,13 +441,13 @@ (set-vector! s4-0 (* (sin (-> obj travel-ry)) f28-0) 0.0 (* (cos (-> obj travel-ry)) f28-0) 1.0) (let ((s3-1 (new 'stack 'clip-travel-vector-to-mesh-return-info))) (set! (-> obj nav travel quad) (-> s4-0 quad)) - (dummy-24 (-> obj nav) f28-0 s3-1) + (nav-control-method-24 (-> obj nav) f28-0 s3-1) (if (-> s3-1 found-boundary) (set! f26-0 (vector-vector-xz-distance (-> s3-1 intersection) (-> obj root-override trans))) ) ) (let ((s3-2 (new 'stack-no-clear 'matrix))) - (when (>= (dummy-23 (-> obj nav) s4-0 (the-as check-vector-collision-with-nav-spheres-info s3-2)) 0.0) + (when (>= (nav-control-method-23 (-> obj nav) s4-0 (the-as check-vector-collision-with-nav-spheres-info s3-2)) 0.0) (let ((f0-26 (vector-vector-xz-distance (-> s3-2 vector 1) (-> obj root-override trans)))) (if (or (< f26-0 0.0) (< f0-26 f26-0)) (set! f26-0 f0-26) @@ -474,13 +474,13 @@ (set! (-> obj facing-ry) (deg-seek-smooth (-> obj facing-ry) (-> obj travel-ry) (* 32768.0 (-> *display* seconds-per-frame)) 0.125) ) - (dummy-27 obj) + (puffer-method-27 obj) (none) ) ;; definition for method 27 of type puffer ;; INFO: Return type mismatch float vs none. -(defmethod dummy-27 puffer ((obj puffer)) +(defmethod puffer-method-27 puffer ((obj puffer)) (let ((f30-0 (-> obj patrol-bottom-y))) (cond ((-> obj attacking?) @@ -578,7 +578,7 @@ ) (go puffer-patrol) ) - (dummy-26 self) + (puffer-method-26 self) (suspend) ) (none) @@ -593,7 +593,7 @@ (set! (-> self state-time) (-> *display* base-frame-counter)) (set! (-> self attacking?) #f) (set! (-> self reaction-delay) (rand-vu-int-range (seconds 0.1) (seconds 0.35))) - (if (not (dummy-23 self #f)) + (if (not (puffer-method-23 self #f)) (go puffer-idle) ) (set! (-> self picked-point-time) (-> *display* base-frame-counter)) @@ -621,37 +621,37 @@ ) ) ) - (when (dummy-22 self) - (when (dummy-23 self #t) + (when (puffer-method-22 self) + (when (puffer-method-23 self #t) (set! (-> self picked-point-time) (-> *display* base-frame-counter)) (set! (-> self pick-new-point-delay) (rand-vu-int-range (seconds 3) (seconds 10))) ) ) (if (and (>= (- (-> *display* base-frame-counter) (-> self state-time)) (-> self reaction-delay)) - (dummy-25 self (-> self notice-dist)) + (puffer-method-25 self (-> self notice-dist)) ) (go puffer-attack) ) (when (or (< (vector-vector-xz-distance (-> self root-override trans) (-> self dest-pos)) 8192.0) (>= (- (-> *display* base-frame-counter) (-> self picked-point-time)) (-> self pick-new-point-delay)) ) - (when (dummy-23 self #f) + (when (puffer-method-23 self #f) (set! (-> self picked-point-time) (-> *display* base-frame-counter)) (set! (-> self pick-new-point-delay) (rand-vu-int-range (seconds 3) (seconds 10))) ) ) - (dummy-20 self (-> self dest-pos)) + (puffer-method-20 self (-> self dest-pos)) (let ((gp-0 (new 'stack-no-clear 'vector))) (set-vector! gp-0 (sin (-> self facing-ry)) 0.0 (cos (-> self facing-ry)) 1.0) (set-heading-vec-clear-roll-pitch! (-> self root-override) gp-0) ) (vector-v+! (-> self root-override trans) (-> self root-override trans) (-> self root-override transv)) - (dummy-28 self) + (puffer-method-28 self) (none) ) :code (behavior () (loop - (dummy-26 self) + (puffer-method-26 self) (suspend) ) (none) @@ -675,7 +675,7 @@ (none) ) :trans (behavior () - (if (not (dummy-25 self (-> self give-up-dist))) + (if (not (puffer-method-25 self (-> self give-up-dist))) (go puffer-patrol) ) (when *target* @@ -689,18 +689,18 @@ ) (set-target! (-> self neck) (target-pos 5)) ) - (dummy-20 self (target-pos 0)) + (puffer-method-20 self (target-pos 0)) (let ((gp-2 (new 'stack-no-clear 'vector))) (set-vector! gp-2 (sin (-> self facing-ry)) 0.0 (cos (-> self facing-ry)) 1.0) (set-heading-vec-clear-roll-pitch! (-> self root-override) gp-2) ) (vector-v+! (-> self root-override trans) (-> self root-override trans) (-> self root-override transv)) - (dummy-28 self) + (puffer-method-28 self) (none) ) :code (behavior () (loop - (dummy-26 self) + (puffer-method-26 self) (suspend) ) (none) @@ -744,7 +744,7 @@ ;; definition for method 21 of type puffer ;; INFO: Return type mismatch int vs none. -(defmethod dummy-21 puffer ((obj puffer)) +(defmethod puffer-method-21 puffer ((obj puffer)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -785,7 +785,7 @@ (backup-collide-with-as s5-0) (set! (-> obj root-override) s5-0) ) - (dummy-30 obj) + (puffer-method-30 obj) 0 (none) ) @@ -803,7 +803,7 @@ ) ;; definition for method 30 of type puffer -(defmethod dummy-30 puffer ((obj puffer)) +(defmethod puffer-method-30 puffer ((obj puffer)) (when (!= (-> obj cprims-type) 1) (set! (-> obj cprims-type) (the-as uint 1)) (let ((v1-3 (the-as basic (-> obj root-override root-prim)))) @@ -820,7 +820,7 @@ ) ;; definition for method 31 of type puffer -(defmethod dummy-31 puffer ((obj puffer)) +(defmethod puffer-method-31 puffer ((obj puffer)) (when (!= (-> obj cprims-type) 2) (set! (-> obj cprims-type) (the-as uint 2)) (let ((v1-3 (the-as basic (-> obj root-override root-prim)))) @@ -838,7 +838,7 @@ ;; definition for method 26 of type puffer ;; INFO: Return type mismatch vector vs none. -(defmethod dummy-26 puffer ((obj puffer)) +(defmethod puffer-method-26 puffer ((obj puffer)) (let ((f30-0 (get-current-phase (-> obj sync)))) (if (and (< 0.025 f30-0) (< f30-0 0.525)) (flip-look! obj #f) @@ -1131,10 +1131,10 @@ (-> obj skel root-channel 0 frame-group) ) (((-> obj draw art-group data 10) (-> obj draw art-group data 12)) - (dummy-31 obj) + (puffer-method-31 obj) ) (else - (dummy-30 obj) + (puffer-method-30 obj) ) ) (none) @@ -1163,7 +1163,7 @@ (set! (-> obj hit-player?) #f) (set! (-> obj look-mean?) #f) (set! (-> obj travel-turn-speed) 16384.0) - (dummy-21 obj) + (puffer-method-21 obj) (process-drawable-from-entity! obj (-> obj entity)) (initialize-skeleton obj *puffer-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) @@ -1176,7 +1176,7 @@ (set! (-> obj give-up-dist) (+ 20480.0 (-> obj notice-dist))) (set! (-> obj nav) (new 'process 'nav-control (-> obj root-override) 16 40960.0)) (logior! (-> obj nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7)) - (TODO-RENAME-26 (-> obj nav)) + (nav-control-method-26 (-> obj nav)) (set! (-> obj path) (new 'process 'path-control obj 'path 0.0)) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) (set! (-> obj fact-info-override) diff --git a/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc b/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc index a4c1841e5c..3707957b12 100644 --- a/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/qbert-plat_REF.gc @@ -200,7 +200,7 @@ (defbehavior qbert-plat-event-handler qbert-plat ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block)) (case arg2 (('notify) - (dummy-32 self) + (rigid-body-platform-method-32 self) ) (else (rigid-body-platform-event-handler arg0 arg1 arg2 arg3) @@ -209,7 +209,7 @@ ) ;; definition for method 33 of type qbert-plat -(defmethod dummy-33 qbert-plat ((obj qbert-plat)) +(defmethod rigid-body-platform-method-33 qbert-plat ((obj qbert-plat)) (let* ((a1-0 (-> obj master)) (v1-0 (if a1-0 (-> a1-0 extra process) @@ -223,7 +223,7 @@ ) ;; definition for method 32 of type qbert-plat -(defmethod dummy-32 qbert-plat ((obj qbert-plat)) +(defmethod rigid-body-platform-method-32 qbert-plat ((obj qbert-plat)) (let* ((v1-0 (-> obj master)) (a0-1 (if v1-0 (-> v1-0 extra process) @@ -264,7 +264,7 @@ (-> v1-0 extra process) ) (suspend) - (dummy-32 self) + (rigid-body-platform-method-32 self) (go-virtual rigid-body-platform-idle) ) ) @@ -307,7 +307,7 @@ ) (when gp-1 (if (not (-> self player-is-riding?)) - (dummy-33 self) + (rigid-body-platform-method-33 self) ) ) (set! (-> self player-is-riding?) gp-1) @@ -328,7 +328,7 @@ ) ;; definition for method 22 of type qbert-plat -(defmethod TODO-RENAME-22 qbert-plat ((obj qbert-plat) (arg0 vector) (arg1 float)) +(defmethod rigid-body-platform-method-22 qbert-plat ((obj qbert-plat) (arg0 vector) (arg1 float)) (+ (-> obj anchor-point y) (-> obj float-height-offset) (* 512.0 (cos (* 546.13336 (+ (* 60.0 arg1) (* 0.03 (-> arg0 x)) (* 0.03 (-> arg0 z)))))) @@ -337,16 +337,16 @@ ;; definition for method 23 of type qbert-plat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 qbert-plat ((obj qbert-plat) (arg0 float)) +(defmethod rigid-body-platform-method-23 qbert-plat ((obj qbert-plat) (arg0 float)) ((the-as (function rigid-body-platform float none) (find-parent-method qbert-plat 23)) obj arg0) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) ;; definition for method 30 of type qbert-plat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-30 qbert-plat ((obj qbert-plat)) +(defmethod rigid-body-platform-method-30 qbert-plat ((obj qbert-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -374,12 +374,12 @@ ;; definition for method 31 of type qbert-plat ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 qbert-plat ((obj qbert-plat)) +(defmethod rigid-body-platform-method-31 qbert-plat ((obj qbert-plat)) (initialize-skeleton obj *qbert-plat-sg* '()) (set! (-> obj anchor-point quad) (-> obj root-overlay trans quad)) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-overlay)) - (TODO-RENAME-29 obj *qbert-plat-constants*) + (rigid-body-platform-method-29 obj *qbert-plat-constants*) (set! (-> obj float-height-offset) 6144.0) (let ((v1-11 (-> obj control-point-array data))) (set! (-> v1-11 0 local-pos x) -14336.0) @@ -418,9 +418,9 @@ ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! qbert-plat ((obj qbert-plat) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) + (rigid-body-platform-method-31 obj) (go qbert-plat-wait-for-master) (none) ) diff --git a/test/decompiler/reference/jak1/levels/sunken/shover_REF.gc b/test/decompiler/reference/jak1/levels/sunken/shover_REF.gc index 9b01e19fbc..9bd82e4e5c 100644 --- a/test/decompiler/reference/jak1/levels/sunken/shover_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/shover_REF.gc @@ -45,7 +45,7 @@ (collide-action) ) (let ((s4-0 (new 'stack 'attack-info))) - (dummy-41 (-> self root-override) s4-0 (-> self shove-up)) + (calc-shove-up (-> self root-override) s4-0 (-> self shove-up)) (level-hint-spawn (game-text-id sunken-hotpipes) "sksp0134" (the-as entity #f) *entity-pool* (game-task none)) (if (or (= (-> *target* control unknown-surface00 mode) 'air) (>= (+ (-> *display* base-frame-counter) (seconds -0.2)) (-> *target* control unknown-dword11)) diff --git a/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc b/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc index 854d42c3a1..417378a248 100644 --- a/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/square-platform_REF.gc @@ -21,7 +21,7 @@ :size-assert #x130 :flag-assert #x1c00c00130 (:methods - (TODO-RENAME-27 (_type_ symbol) none 27) + (square-platform-method-27 (_type_ symbol) none 27) ) (:states square-platform-lowered @@ -222,7 +222,7 @@ ;; definition for method 27 of type square-platform ;; INFO: Used lq/sq ;; INFO: Return type mismatch object vs none. -(defmethod TODO-RENAME-27 square-platform ((obj square-platform) (arg0 symbol)) +(defmethod square-platform-method-27 square-platform ((obj square-platform) (arg0 symbol)) (local-vars (v0-3 sound-id) (sv-48 int)) (let ((s4-0 (new 'stack-no-clear 'vector))) (set! (-> s4-0 quad) (-> obj root-override trans quad)) @@ -335,7 +335,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('untrigger) (go square-platform-lowering) @@ -359,7 +359,7 @@ (plat-post) (go square-platform-raised) ) - (TODO-RENAME-27 self #t) + (square-platform-method-27 self #t) (none) ) :code (behavior () @@ -377,7 +377,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('untrigger) (go square-platform-lowering) @@ -402,7 +402,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk 'bounce) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('trigger) (go square-platform-rising) @@ -430,7 +430,7 @@ (plat-post) (go square-platform-lowered) ) - (TODO-RENAME-27 self #f) + (square-platform-method-27 self #f) (none) ) :code (behavior () @@ -506,7 +506,7 @@ (set! (-> obj link) (new 'process 'actor-link-info obj)) (set! (-> obj plat-id) (actor-count-before (-> obj link))) (initialize-skeleton obj *square-platform-sg* '()) - (dummy-21 obj) + (baseplat-method-21 obj) (ja-channel-set! 1) (let ((s4-1 (-> obj skel root-channel 0))) (joint-control-channel-group-eval! diff --git a/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc b/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc index 1ae41a1d48..727497443c 100644 --- a/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/steam-cap_REF.gc @@ -41,8 +41,8 @@ :size-assert #x160 :flag-assert #x1600f00160 (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) quaternion 21) + (steam-cap-method-20 (_type_) none 20) + (steam-cap-method-21 (_type_) quaternion 21) ) (:states steam-cap-idle @@ -455,7 +455,7 @@ ;; definition for method 20 of type steam-cap ;; INFO: Return type mismatch object vs none. -(defmethod dummy-20 steam-cap ((obj steam-cap)) +(defmethod steam-cap-method-20 steam-cap ((obj steam-cap)) (when *target* (let* ((a1-0 (target-pos 0)) (f0-0 (-> a1-0 y)) @@ -491,7 +491,7 @@ ;; definition for method 21 of type steam-cap ;; INFO: Used lq/sq -(defmethod dummy-21 steam-cap ((obj steam-cap)) +(defmethod steam-cap-method-21 steam-cap ((obj steam-cap)) (local-vars (at-0 int) (at-1 int) (s5-0 symbol)) (rlet ((vf0 :class vf) (vf1 :class vf) @@ -683,8 +683,8 @@ :trans (the-as (function none :behavior steam-cap) rider-trans) :code (behavior () (loop - (dummy-20 self) - (dummy-21 self) + (steam-cap-method-20 self) + (steam-cap-method-21 self) (suspend) ) (none) diff --git a/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc index 01e3256ba3..38fa948267 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sun-exit-chamber_REF.gc @@ -18,7 +18,7 @@ :size-assert #xf0 :flag-assert #x15008000f0 (:methods - (dummy-20 (_type_ float) vector 20) + (blue-eco-charger-orb-method-20 (_type_ float) vector 20) ) (:states blue-eco-charger-orb-active @@ -56,8 +56,8 @@ :size-assert #xbc :flag-assert #x16005000bc (:methods - (dummy-20 (_type_) object 20) - (dummy-21 (_type_ symbol) object 21) + (blue-eco-charger-method-20 (_type_) object 20) + (blue-eco-charger-method-21 (_type_ symbol) object 21) ) (:states blue-eco-charger-close @@ -127,11 +127,11 @@ :size-assert #x100 :flag-assert #x1900900100 (:methods - (dummy-20 (_type_ float) float 20) - (dummy-21 (_type_ exit-chamber-items) vector 21) - (dummy-22 (_type_) none 22) - (dummy-23 (_type_ symbol) object 23) - (dummy-24 (_type_ float) none 24) + (exit-chamber-method-20 (_type_ float) float 20) + (exit-chamber-method-21 (_type_ exit-chamber-items) vector 21) + (exit-chamber-method-22 (_type_) none 22) + (exit-chamber-method-23 (_type_ symbol) object 23) + (exit-chamber-method-24 (_type_ float) none 24) ) (:states exit-chamber-charger-puzzle @@ -236,7 +236,7 @@ ) ;; definition for method 20 of type blue-eco-charger-orb -(defmethod dummy-20 blue-eco-charger-orb ((obj blue-eco-charger-orb) (arg0 float)) +(defmethod blue-eco-charger-orb-method-20 blue-eco-charger-orb ((obj blue-eco-charger-orb) (arg0 float)) (set-vector! (-> obj targ-orbit-rotv) (rand-vu-float-range 72817.78 258503.11) @@ -273,7 +273,7 @@ (vf2 :class vf) ) (init-vf0-vector) - (dummy-20 self (-> self parent-process 0 open-level)) + (blue-eco-charger-orb-method-20 self (-> self parent-process 0 open-level)) (vector-reset! (-> self orbit-rotv)) (loop (let ((f30-0 (-> self parent-process 0 open-level))) @@ -281,7 +281,7 @@ (go blue-eco-charger-orb-idle) ) (if (zero? (rand-vu-int-count 30)) - (dummy-20 self f30-0) + (blue-eco-charger-orb-method-20 self f30-0) ) (set! (-> self orbit-rotv x) (seek-with-smooth (-> self orbit-rotv x) (-> self targ-orbit-rotv x) 873.81335 0.8 0.12136297) @@ -367,7 +367,7 @@ ) ;; definition for method 21 of type blue-eco-charger -(defmethod dummy-21 blue-eco-charger ((obj blue-eco-charger) (arg0 symbol)) +(defmethod blue-eco-charger-method-21 blue-eco-charger ((obj blue-eco-charger) (arg0 symbol)) (let* ((v1-0 (-> obj master)) (a0-1 (if v1-0 (-> v1-0 extra process) @@ -398,7 +398,7 @@ ) ;; definition for method 20 of type blue-eco-charger -(defmethod dummy-20 blue-eco-charger ((obj blue-eco-charger)) +(defmethod blue-eco-charger-method-20 blue-eco-charger ((obj blue-eco-charger)) (and (and *target* (>= 16384.0 (vector-vector-distance (-> obj root-override trans) (-> *target* control trans)))) (send-event *target* 'query 'powerup (pickup-type eco-blue)) ) @@ -424,7 +424,7 @@ ) ) ) - (when (dummy-20 self) + (when (blue-eco-charger-method-20 self) (increment-success-for-hint (game-text-id sunken-blue-eco-charger-hint)) (go blue-eco-charger-open #t) ) @@ -445,11 +445,11 @@ (if arg0 (sound-play "blue-eco-start") ) - (dummy-21 self #t) + (blue-eco-charger-method-21 self #t) (none) ) :trans (behavior () - (if (dummy-20 self) + (if (blue-eco-charger-method-20 self) (set! (-> self state-time) (-> *display* base-frame-counter)) ) (update! (-> self sound)) @@ -511,7 +511,7 @@ :code (behavior () (ja-no-eval :num! (seek! 0.0)) (while (not (ja-done? 0)) - (when (dummy-20 self) + (when (blue-eco-charger-method-20 self) (increment-success-for-hint (game-text-id sunken-blue-eco-charger-hint)) (go blue-eco-charger-open #t) ) @@ -523,7 +523,7 @@ (ja :num! (seek! 0.0)) (set! (-> self open-level) (/ (ja-frame-num 0) (the float (+ (-> (ja-group) data 0 length) -1)))) ) - (dummy-21 self #f) + (blue-eco-charger-method-21 self #f) (go blue-eco-charger-idle) (none) ) @@ -605,7 +605,7 @@ ) ;; definition for method 20 of type exit-chamber -(defmethod dummy-20 exit-chamber ((obj exit-chamber) (arg0 float)) +(defmethod exit-chamber-method-20 exit-chamber ((obj exit-chamber) (arg0 float)) (set! (-> obj root-override trans y) (+ (-> obj orig-trans y) (* 2252.8 arg0 (cos (* 36.40889 (the float (mod (-> *display* base-frame-counter) 1800))))) @@ -634,7 +634,7 @@ ) ;; definition for method 24 of type exit-chamber -(defmethod dummy-24 exit-chamber ((obj exit-chamber) (arg0 float)) +(defmethod exit-chamber-method-24 exit-chamber ((obj exit-chamber) (arg0 float)) (let ((s4-0 (-> obj node-list data 3 bone transform)) (f30-0 (rand-vu-float-range 0.0 65536.0)) (f28-0 (rand-vu-float-range 8192.0 40960.0)) @@ -657,7 +657,7 @@ ) ;; definition for method 21 of type exit-chamber -(defmethod dummy-21 exit-chamber ((obj exit-chamber) (arg0 exit-chamber-items)) +(defmethod exit-chamber-method-21 exit-chamber ((obj exit-chamber) (arg0 exit-chamber-items)) (let ((s5-0 (-> obj node-list data 3 bone transform))) (set-vector! (-> arg0 door-pos) 0.0 13107.2 -40960.0 1.0) (vector-matrix*! (-> arg0 door-pos) (-> arg0 door-pos) s5-0) @@ -675,7 +675,7 @@ ;; definition for method 23 of type exit-chamber ;; INFO: Used lq/sq -(defmethod dummy-23 exit-chamber ((obj exit-chamber) (arg0 symbol)) +(defmethod exit-chamber-method-23 exit-chamber ((obj exit-chamber) (arg0 symbol)) (new 'stack-no-clear 'vector) (let ((s5-0 (new 'stack-no-clear 'vector))) (vector<-cspace! (-> obj last-pos) (-> obj node-list data 3)) @@ -685,7 +685,7 @@ (set! (-> obj draw bounds y) (+ 16384.0 (-> obj draw bounds y))) (set! (-> obj draw bounds w) 67584.0) (let ((s5-1 (new 'stack-no-clear 'exit-chamber-items))) - (dummy-21 obj s5-1) + (exit-chamber-method-21 obj s5-1) (if (-> obj button) (send-event (ppointer->process (-> obj button)) 'move-to (-> s5-1 button-pos) (-> s5-1 button-quat)) ) @@ -912,7 +912,7 @@ (load-state-want-levels 'sunken 'village2) (ja-no-eval :group! (-> self draw art-group data 5) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (dummy-24 self 51200.0) + (exit-chamber-method-24 self 51200.0) (update-trans! (-> self sound) (-> self last-pos)) (update! (-> self sound)) (suspend) @@ -925,7 +925,7 @@ (ja-no-eval :group! (-> self draw art-group data 6) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (seek! (-> self wave-scale) 1.0 0.0016666667) - (dummy-20 self (-> self wave-scale)) + (exit-chamber-method-20 self (-> self wave-scale)) (if (and (-> self move-player?) (>= (ja-aframe-num 0) 310.0)) (set! (-> self move-player?) #f) ) @@ -956,7 +956,7 @@ (set! (-> self state-time) (-> *display* base-frame-counter)) (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 0.5)) (seek! (-> self wave-scale) 1.0 0.0016666667) - (dummy-20 self (-> self wave-scale)) + (exit-chamber-method-20 self (-> self wave-scale)) (suspend) ) (if (-> self door) @@ -965,7 +965,7 @@ (set! (-> self state-time) (-> *display* base-frame-counter)) (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 2.5)) (seek! (-> self wave-scale) 1.0 0.0016666667) - (dummy-20 self (-> self wave-scale)) + (exit-chamber-method-20 self (-> self wave-scale)) (suspend) ) (go exit-chamber-idle-in-village #f) @@ -976,7 +976,7 @@ (transform-post) (rider-post) ) - (dummy-23 self #t) + (exit-chamber-method-23 self #t) (none) ) ) @@ -1045,19 +1045,19 @@ ) (when arg0 (logior! (-> self draw status) (draw-status skip-bones)) - (dummy-20 self 1.0) + (exit-chamber-method-20 self 1.0) (suspend) (logclear! (-> self draw status) (draw-status skip-bones)) ) (loop - (dummy-20 self 1.0) + (exit-chamber-method-20 self 1.0) (suspend) ) (none) ) :post (behavior () (rider-post) - (dummy-23 self #t) + (exit-chamber-method-23 self #t) (if (and *target* (>= (vector-vector-xz-distance (target-pos 0) (-> self last-pos)) 40960.0)) (spawn (-> self part) (-> self last-pos)) ) @@ -1081,7 +1081,7 @@ (rider-trans) ) (seek! (-> self wave-scale) 0.0 0.0016666667) - (dummy-20 self (-> self wave-scale)) + (exit-chamber-method-20 self (-> self wave-scale)) (none) ) :code (behavior () @@ -1132,7 +1132,7 @@ (kill-and-free-particles (-> self part)) (ja-no-eval :group! (-> self draw art-group data 8) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (dummy-24 self 47104.0) + (exit-chamber-method-24 self 47104.0) (update-trans! (-> self sound) (-> self last-pos)) (update! (-> self sound)) (suspend) @@ -1168,7 +1168,7 @@ (transform-post) (rider-post) ) - (dummy-23 self #t) + (exit-chamber-method-23 self #t) (none) ) ) @@ -1258,7 +1258,7 @@ ) (ja-post) (update-transforms! (-> obj root-override)) - (dummy-21 obj (the-as exit-chamber-items s3-1)) + (exit-chamber-method-21 obj (the-as exit-chamber-items s3-1)) (let ((s1-3 #t)) (let ((v1-64 s4-1)) (cond @@ -1306,7 +1306,7 @@ (set! (-> obj orig-trans quad) (-> obj root-override trans quad)) (set! (-> obj last-pos quad) (-> obj root-override trans quad)) (set! (-> obj move-player?) #f) - (dummy-23 obj #t) + (exit-chamber-method-23 obj #t) (set! (-> obj move-player?) #f) (cond ((zero? s4-1) diff --git a/test/decompiler/reference/jak1/levels/sunken/sunken-fish_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sunken-fish_REF.gc index cecf82736c..29d07290b2 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sunken-fish_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sunken-fish_REF.gc @@ -25,14 +25,14 @@ :size-assert #x140 :flag-assert #x1c00d00140 (:methods - (TODO-RENAME-20 (_type_) float 20) - (TODO-RENAME-orbit?-21 (_type_ vector float vector) vector 21) - (dummy-22 (_type_) none 22) - (TODO-RENAME-23 (_type_) quaternion 23) - (TODO-RENAME-24 (_type_) vector 24) - (dummy-25 (_type_) none 25) - (TODO-RENAME-26 (_type_) float 26) - (TODO-RENAME-27 (_type_) float 27) + (sunkenfisha-method-20 (_type_) float 20) + (sunkenfisha-method-21 (_type_ vector float vector) vector 21) + (sunkenfisha-method-22 (_type_) none 22) + (sunkenfisha-method-23 (_type_) quaternion 23) + (sunkenfisha-method-24 (_type_) vector 24) + (sunkenfisha-method-25 (_type_) none 25) + (sunkenfisha-method-26 (_type_) float 26) + (sunkenfisha-method-27 (_type_) float 27) ) (:states sunkenfisha-idle @@ -81,17 +81,17 @@ ;; definition for method 22 of type sunkenfisha ;; INFO: Return type mismatch int vs none. -(defmethod dummy-22 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-22 sunkenfisha ((obj sunkenfisha)) 0 (none) ) ;; definition for method 21 of type sunkenfisha -(defmethod TODO-RENAME-orbit?-21 sunkenfisha ((obj sunkenfisha) (arg0 vector) (arg1 float) (arg2 vector)) +(defmethod sunkenfisha-method-21 sunkenfisha ((obj sunkenfisha) (arg0 vector) (arg1 float) (arg2 vector)) (eval-path-curve! (-> obj path) arg0 arg1 'interp) (vector+! arg0 arg0 (-> obj path-trans-offset)) (let ((s2-0 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> obj path) s2-0 arg1) + (path-control-method-14 (-> obj path) s2-0 arg1) (let ((f0-2 (atan (-> s2-0 x) (-> s2-0 z))) (s4-1 (new 'stack-no-clear 'vector)) ) @@ -102,7 +102,7 @@ ) ;; definition for method 24 of type sunkenfisha -(defmethod TODO-RENAME-24 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-24 sunkenfisha ((obj sunkenfisha)) (let ((s4-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'matrix)) (gp-0 (new 'stack-no-clear 'vector)) @@ -136,7 +136,7 @@ ;; definition for method 25 of type sunkenfisha ;; INFO: Return type mismatch float vs none. -(defmethod dummy-25 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-25 sunkenfisha ((obj sunkenfisha)) (let* ((f0-0 (-> obj path-speed)) (f1-1 (seek f0-0 (-> obj targ-path-speed) (* (-> obj path-speed-seek-speed) (-> *display* seconds-per-frame))) @@ -147,11 +147,11 @@ (cond ((< f30-0 0.0) (set! f30-0 (- f30-0)) - (TODO-RENAME-20 obj) + (sunkenfisha-method-20 obj) ) ((< 1.0 f30-0) (+! f30-0 (* 2.0 (- 1.0 f30-0))) - (TODO-RENAME-20 obj) + (sunkenfisha-method-20 obj) ) ) (set! (-> obj path-u) f30-0) @@ -161,7 +161,7 @@ ) ;; definition for method 23 of type sunkenfisha -(defmethod TODO-RENAME-23 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-23 sunkenfisha ((obj sunkenfisha)) (let ((s5-0 (new 'stack-no-clear 'vector))) (set-vector! s5-0 (- (vector-x-angle (-> obj root transv))) (vector-y-angle (-> obj root transv)) 0.0 1.0) (set! (-> obj facing-rot x) @@ -175,7 +175,7 @@ ) ;; definition for method 20 of type sunkenfisha -(defmethod TODO-RENAME-20 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-20 sunkenfisha ((obj sunkenfisha)) (set! (-> obj path-dir) (- (-> obj path-dir))) (set! (-> obj path-speed) 0.0) (set! (-> obj targ-path-speed) @@ -209,12 +209,12 @@ ) (init-vf0-vector) (if (>= (-> *display* base-frame-counter) (-> self change-path-dir-time)) - (TODO-RENAME-20 self) + (sunkenfisha-method-20 self) ) - (TODO-RENAME-24 self) - (dummy-25 self) + (sunkenfisha-method-24 self) + (sunkenfisha-method-25 self) (let ((gp-0 (new 'stack-no-clear 'vector))) - (TODO-RENAME-orbit?-21 self gp-0 (-> self path-u) (-> self local-path-offset)) + (sunkenfisha-method-21 self gp-0 (-> self path-u) (-> self local-path-offset)) (vector-! (-> self root transv) gp-0 (-> self root trans)) (set! (-> self root trans quad) (-> gp-0 quad)) ) @@ -228,7 +228,7 @@ (.mul.x.vf vf1 vf1 vf2 :mask #b111) (.svf (&-> v1-16 quad) vf1) ) - (TODO-RENAME-23 self) + (sunkenfisha-method-23 self) (none) ) ) @@ -246,7 +246,7 @@ ) ;; definition for method 26 of type sunkenfisha -(defmethod TODO-RENAME-26 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-26 sunkenfisha ((obj sunkenfisha)) (set! (-> obj root) (new 'process 'trsqv)) (process-drawable-from-entity! obj (-> obj entity)) (set-vector! (-> obj root scale) 6.0 6.0 6.0 1.0) @@ -276,7 +276,7 @@ ;; definition for method 27 of type sunkenfisha ;; INFO: Used lq/sq -(defmethod TODO-RENAME-27 sunkenfisha ((obj sunkenfisha)) +(defmethod sunkenfisha-method-27 sunkenfisha ((obj sunkenfisha)) (local-vars (sv-16 res-tag) (sv-32 res-tag) (sv-48 res-tag)) (vector-reset! (-> obj path-trans-offset)) (set! (-> obj path-u) (rand-vu-float-range 0.0 1.0)) @@ -343,7 +343,7 @@ (set! (-> obj path-speed) (rand-vu-float-range (-> obj path-normal-speed-lo) (-> obj path-normal-speed-hi))) (set! (-> obj targ-path-speed) (-> obj path-speed)) (let ((s4-0 (new 'stack-no-clear 'vector))) - (TODO-RENAME-14 (-> obj path) s4-0 (-> obj path-u)) + (path-control-method-14 (-> obj path) s4-0 (-> obj path-u)) (set-vector! (-> obj facing-rot) 0.0 (atan (-> s4-0 x) (-> s4-0 z)) 0.0 1.0) ) (if (< (-> obj path-dir) 0.0) @@ -355,8 +355,8 @@ ;; INFO: Return type mismatch object vs none. (defbehavior sunkenfisha-init-by-other sunkenfisha ((arg0 entity-actor)) (set! (-> self entity) arg0) - (TODO-RENAME-26 self) - (TODO-RENAME-27 self) + (sunkenfisha-method-26 self) + (sunkenfisha-method-27 self) (go sunkenfisha-idle) (none) ) @@ -364,8 +364,8 @@ ;; definition for method 11 of type sunkenfisha ;; INFO: Return type mismatch object vs none. (defmethod init-from-entity! sunkenfisha ((obj sunkenfisha) (arg0 entity-actor)) - (TODO-RENAME-26 obj) - (TODO-RENAME-27 obj) + (sunkenfisha-method-26 obj) + (sunkenfisha-method-27 obj) (let ((s5-0 (+ (res-lump-value (-> obj entity) 'count uint128 :default (the-as uint128 1)) -1))) (while (> (the-as int s5-0) 0) (process-spawn sunkenfisha (-> obj entity) :to obj) diff --git a/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc index 37df5dc337..4f4300fd4c 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sunken-obs_REF.gc @@ -132,7 +132,7 @@ ;; definition for method 24 of type side-to-side-plat ;; INFO: Return type mismatch int vs none. -(defmethod dummy-24 side-to-side-plat ((obj side-to-side-plat)) +(defmethod baseplat-method-24 side-to-side-plat ((obj side-to-side-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -159,14 +159,14 @@ ;; definition for method 26 of type side-to-side-plat ;; INFO: Return type mismatch float vs none. -(defmethod dummy-26 side-to-side-plat ((obj side-to-side-plat)) +(defmethod baseplat-method-26 side-to-side-plat ((obj side-to-side-plat)) (set! (-> obj part-ry) (+ 16384.0 (quaternion-y-angle (-> obj root-override quat)))) (none) ) ;; definition for method 25 of type side-to-side-plat ;; INFO: Return type mismatch sparticle-launch-control vs sparticle-launch-group. -(defmethod TODO-RENAME-25 side-to-side-plat ((obj side-to-side-plat)) +(defmethod baseplat-method-25 side-to-side-plat ((obj side-to-side-plat)) (let ((v0-0 (create-launch-control (-> *part-group-id-table* 436) obj))) (set! (-> obj part) v0-0) (the-as sparticle-launch-group v0-0) @@ -175,7 +175,7 @@ ;; definition for method 20 of type side-to-side-plat ;; INFO: Return type mismatch object vs none. -(defmethod dummy-20 side-to-side-plat ((obj side-to-side-plat)) +(defmethod baseplat-method-20 side-to-side-plat ((obj side-to-side-plat)) (when (nonzero? (-> obj part)) (set! (-> *part-id-table* 1713 init-specs 14 initial-valuef) (-> obj part-ry)) (set! (-> *part-id-table* 1714 init-specs 19 initial-valuef) (-> obj part-ry)) diff --git a/test/decompiler/reference/jak1/levels/sunken/sunken-pipegame_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sunken-pipegame_REF.gc index 02cdd67303..c54a79b71f 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sunken-pipegame_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sunken-pipegame_REF.gc @@ -70,9 +70,9 @@ :size-assert #x2a0 :flag-assert #x17023002a0 (:methods - (dummy-20 (_type_) uint 20) - (dummy-21 (_type_ symbol) symbol 21) - (dummy-22 (_type_ symbol) none 22) + (sunken-pipegame-method-20 (_type_) uint 20) + (sunken-pipegame-method-21 (_type_ symbol) symbol 21) + (sunken-pipegame-method-22 (_type_ symbol) none 22) ) (:states sunken-pipegame-beat-challenge @@ -554,7 +554,7 @@ ;; definition for method 20 of type sunken-pipegame ;; INFO: Return type mismatch int vs uint. -(defmethod dummy-20 sunken-pipegame ((obj sunken-pipegame)) +(defmethod sunken-pipegame-method-20 sunken-pipegame ((obj sunken-pipegame)) (let ((gp-0 0)) (if (task-complete? *game-info* (game-task sunken-pipe)) (+! gp-0 1) @@ -613,7 +613,7 @@ ) ) :enter (behavior () - (dummy-21 self #f) + (sunken-pipegame-method-21 self #f) (set! (-> self abort-audio-if-beaten?) #f) (dotimes (gp-0 3) (let ((v1-4 (-> self button gp-0))) @@ -716,7 +716,7 @@ (suspend) ) ) - (dummy-22 self #t) + (sunken-pipegame-method-22 self #t) (let ((f30-1 20480.0)) (until (= f30-1 0.0) (set! f30-1 (seek f30-1 0.0 (* 81920.0 (-> *display* seconds-per-frame)))) @@ -830,7 +830,7 @@ ) ) ) - (dummy-22 self #f) + (sunken-pipegame-method-22 self #f) (set! (-> self abort-audio-if-beaten?) #f) (let ((v1-184 (-> self prize (-> self challenge))) (a0-109 (new 'stack-no-clear 'vector)) @@ -896,7 +896,7 @@ (defstate sunken-pipegame-end-play (sunken-pipegame) :code (behavior () (local-vars (v1-3 symbol)) - (dummy-21 self #t) + (sunken-pipegame-method-21 self #t) (set! (-> self abort-audio-if-beaten?) #f) (until v1-3 (suspend) @@ -919,7 +919,7 @@ ) ;; definition for method 22 of type sunken-pipegame -(defmethod dummy-22 sunken-pipegame ((obj sunken-pipegame) (arg0 symbol)) +(defmethod sunken-pipegame-method-22 sunken-pipegame ((obj sunken-pipegame) (arg0 symbol)) (let* ((v1-0 (-> obj challenge)) (a2-0 v1-0) ) @@ -950,7 +950,7 @@ ) ;; definition for method 21 of type sunken-pipegame -(defmethod dummy-21 sunken-pipegame ((obj sunken-pipegame) (arg0 symbol)) +(defmethod sunken-pipegame-method-21 sunken-pipegame ((obj sunken-pipegame) (arg0 symbol)) (if arg0 (logior! (-> obj mask) (process-mask actor-pause)) (logclear! (-> obj mask) (process-mask actor-pause)) @@ -1020,7 +1020,7 @@ (process-drawable-from-entity! obj arg0) (set! (-> obj path) (new 'process 'path-control obj 'path 0.0)) (logior! (-> obj path flags) (path-control-flag display draw-line draw-point draw-text)) - (set! (-> obj challenges-mask) (dummy-20 obj)) + (set! (-> obj challenges-mask) (sunken-pipegame-method-20 obj)) (let ((s4-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'quaternion)) ) diff --git a/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc b/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc index 13509409d5..6189a325f2 100644 --- a/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/sunken-water_REF.gc @@ -205,8 +205,8 @@ ;; definition for method 25 of type sunken-water ;; INFO: Return type mismatch uint vs none. -(defmethod TODO-RENAME-25 sunken-water ((obj sunken-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-25))) +(defmethod water-vol-method-25 sunken-water ((obj sunken-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-25))) (t9-0 obj) ) (set! (-> obj playing-deadly-sound?) #f) @@ -253,8 +253,8 @@ ;; definition for method 22 of type sunken-water ;; INFO: Used lq/sq ;; INFO: Return type mismatch ripple-merc-query vs none. -(defmethod TODO-RENAME-22 sunken-water ((obj sunken-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 sunken-water ((obj sunken-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (set! (-> obj play-ambient-sound?) #f) diff --git a/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc b/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc index 67ae11328b..9f5a4f7766 100644 --- a/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc @@ -930,7 +930,7 @@ ;; definition for function distance-from-tangent (defun distance-from-tangent ((arg0 path-control) (arg1 float) (arg2 vector) (arg3 vector) (arg4 vector) (arg5 vector)) (eval-path-curve-div! arg0 arg2 arg1 'interp) - (TODO-RENAME-12 arg0 arg3 arg1) + (path-control-method-12 arg0 arg3 arg1) (set! (-> arg2 y) (-> arg5 y)) (set! (-> arg3 y) 0.0) (let ((s2-1 (new 'stack-no-clear 'vector))) @@ -983,7 +983,7 @@ :enter (behavior () (eval-path-curve-div! (-> self path) (-> self trans) 0.2 'interp) (eval-path-curve-div! (-> self path) (-> self root trans) 0.2 'interp) - (TODO-RENAME-12 (-> self path) (-> self rot) 0.2) + (path-control-method-12 (-> self path) (-> self rot) 0.2) (set! (-> self pos) 0.2) (none) ) diff --git a/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc b/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc index 2e5b3815ef..6c4bbf9ec0 100644 --- a/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/wedge-plats_REF.gc @@ -78,7 +78,7 @@ :size-assert #xf0 :flag-assert #x1c008000f0 (:methods - (dummy-27 (_type_) symbol 27) + (wedge-plat-method-27 (_type_) symbol 27) ) (:states wedge-plat-idle @@ -104,7 +104,7 @@ ) ;; definition for method 27 of type wedge-plat -(defmethod dummy-27 wedge-plat ((obj wedge-plat)) +(defmethod wedge-plat-method-27 wedge-plat ((obj wedge-plat)) (let* ((a0-1 (-> obj master)) (v1-0 (if a0-1 (-> (the-as process-drawable (-> a0-1 ppointer)) brother) @@ -143,7 +143,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) @@ -152,7 +152,7 @@ :code (behavior () (ja :num-func num-func-identity :frame-num (ja-aframe 0.0 0)) (loop - (if (dummy-27 self) + (if (wedge-plat-method-27 self) (go wedge-plat-tip) ) (suspend) @@ -167,7 +167,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) (('touch) (send-event proc 'no-look-around (seconds 1.5)) @@ -183,7 +183,7 @@ :frame-num (ja-aframe 0.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 60.0 0))) ) @@ -192,14 +192,14 @@ :frame-num (ja-aframe 60.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 100.0 0))) ) (set! (-> self state-time) (-> *display* base-frame-counter)) (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 1)) (ja :num-func num-func-identity :frame-num (ja-aframe 100.0 0)) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) ) (ja-no-eval :group! (-> self draw art-group data 3) @@ -207,7 +207,7 @@ :frame-num (ja-aframe 100.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 153.0 0))) ) @@ -245,7 +245,7 @@ (initialize-skeleton obj *wedge-plat-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-override)) - (dummy-21 obj) + (baseplat-method-21 obj) (set! (-> obj master) (the-as wedge-plat-master (entity-actor-lookup arg0 'alt-actor 0))) (set! (-> obj offset) (res-lump-float arg0 'rotoffset)) (set! (-> obj distance) (res-lump-float arg0 'distance :default 36864.0)) @@ -282,7 +282,7 @@ ) ;; definition for method 27 of type wedge-plat-outer -(defmethod dummy-27 wedge-plat-outer ((obj wedge-plat-outer)) +(defmethod wedge-plat-method-27 wedge-plat-outer ((obj wedge-plat-outer)) (let* ((a0-1 (-> obj master)) (v1-0 (if a0-1 (-> (the-as process-drawable (-> a0-1 ppointer)) brother) @@ -321,7 +321,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (the-as symbol (baseplat-method-22 self)) ) ) ) @@ -330,7 +330,7 @@ :code (behavior () (loop (ja :num-func num-func-identity :frame-num (ja-aframe 0.0 0)) - (if (dummy-27 self) + (if (wedge-plat-method-27 self) (go wedge-plat-outer-tip) ) (suspend) @@ -345,7 +345,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('bonk) - (dummy-22 self) + (the-as object (baseplat-method-22 self)) ) (('touch) (send-event proc 'no-look-around (seconds 1.5)) @@ -360,7 +360,7 @@ :frame-num (ja-aframe 0.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 60.0 0))) ) @@ -369,14 +369,14 @@ :frame-num (ja-aframe 60.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 100.0 0))) ) (set! (-> self state-time) (-> *display* base-frame-counter)) (until (>= (- (-> *display* base-frame-counter) (-> self state-time)) (seconds 1)) (ja :num-func num-func-identity :frame-num (ja-aframe 100.0 0)) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) ) (ja-no-eval :group! (-> self draw art-group data 3) @@ -384,7 +384,7 @@ :frame-num (ja-aframe 100.0 0) ) (until (ja-done? 0) - (dummy-27 self) + (wedge-plat-method-27 self) (suspend) (ja :num! (seek! (ja-aframe 153.0 0))) ) @@ -422,7 +422,7 @@ (initialize-skeleton obj *wedge-plat-sg* '()) (logior! (-> obj skel status) (janim-status inited)) (update-transforms! (-> obj root-override)) - (dummy-21 obj) + (baseplat-method-21 obj) (set! (-> obj master) (the-as wedge-plat-master (entity-actor-lookup arg0 'alt-actor 0))) (set! (-> obj offset) (res-lump-float arg0 'rotoffset)) (set! (-> obj distance) (res-lump-float arg0 'distance :default 69632.0)) diff --git a/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc b/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc index cf7e88b8ed..d2b7a5806c 100644 --- a/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc +++ b/test/decompiler/reference/jak1/levels/sunken/whirlpool_REF.gc @@ -16,7 +16,7 @@ :size-assert #xcc :flag-assert #x15006000cc (:methods - (dummy-20 (_type_ float) cshape-moving-flags 20) + (whirlpool-method-20 (_type_ float) cshape-moving-flags 20) ) (:states whirlpool-idle @@ -299,7 +299,7 @@ ) ;; definition for method 20 of type whirlpool -(defmethod dummy-20 whirlpool ((obj whirlpool) (arg0 float)) +(defmethod whirlpool-method-20 whirlpool ((obj whirlpool) (arg0 float)) (let* ((gp-0 (target-pos 0)) (f28-0 (vector-vector-xz-distance (-> obj root-override trans) gp-0)) ) @@ -348,7 +348,7 @@ (+! (-> self spin-ry) (* f30-0 (-> *display* seconds-per-frame))) (quaternion-axis-angle! (-> self root-override quat) 0.0 1.0 0.0 (-> self spin-ry)) (if (and *target* (logtest? (-> *target* water flags) (water-flags wt09))) - (dummy-20 self f30-0) + (whirlpool-method-20 self f30-0) ) (update! (-> self sound)) (let ((f0-9 (fmin 1.0 (* 0.000007608261 (fmax 0.0 (+ -28580.979 (fabs f30-0))))))) diff --git a/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc b/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc index 67951647a9..f5c65052c7 100644 --- a/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/billy_REF.gc @@ -507,7 +507,7 @@ ) ;; definition for method 38 of type billy -(defmethod dummy-38 billy ((obj billy)) +(defmethod process-taskable-method-38 billy ((obj billy)) (case (current-status (-> obj tasks)) (((task-status need-reminder-a) (task-status need-reminder)) (go (method-of-object obj query)) @@ -1054,8 +1054,8 @@ ) ;; definition for method 43 of type billy -(defmethod TODO-RENAME-43 billy ((obj billy)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 billy ((obj billy)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f30-0 (rand-float-gen))) (cond ((< 0.9411765 f30-0) @@ -1143,7 +1143,7 @@ (countdown (gp-1 (+ (the int (* f30-0 (+ -1.0 (the-as float v1-10)))) 5)) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (suspend) (ja :num! (seek!)) ) @@ -1172,7 +1172,7 @@ ;; definition for method 11 of type billy (defmethod init-from-entity! billy ((obj billy) (arg0 entity-actor)) - (dummy-40 obj arg0 *billy-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *billy-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task swamp-billy))) (dotimes (s5-0 3) (let ((v1-3 (new 'process 'curve-control obj 'path (the float s5-0)))) @@ -1186,6 +1186,6 @@ ) (send-event (handle->process (-> obj farthy)) 'center-joint 3) (send-event (handle->process (-> obj farthy)) 'anim-mode 'clone-anim) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc b/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc index 470c97cf9f..a6480d3305 100644 --- a/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/kermit_REF.gc @@ -960,7 +960,7 @@ nav-enemy-default-event-handler (defbehavior kermit-post kermit () (cond ((-> self airborne) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (set! (-> self collide-info transv x) (-> self nav travel x)) (set! (-> self collide-info transv y) 0.0) (set! (-> self collide-info transv z) (-> self nav travel z)) @@ -1049,7 +1049,7 @@ nav-enemy-default-event-handler (set! (-> self state-time) (-> *display* base-frame-counter)) (set-mode! (-> self neck) (joint-mod-handler-mode flex-blend)) (kermit-get-new-patrol-point) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (none) ) :trans (behavior () @@ -1153,7 +1153,7 @@ nav-enemy-default-event-handler (kermit-set-nav-mesh-target (-> self collide-info trans)) ) ) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (none) ) :trans (behavior () @@ -1196,7 +1196,7 @@ nav-enemy-default-event-handler (set! (-> self state-time) (-> *display* base-frame-counter)) (set-mode! (-> self neck) (joint-mod-handler-mode look-at)) (kermit-set-nav-mesh-target (-> self collide-info trans)) - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (none) ) :trans (behavior () @@ -1530,7 +1530,7 @@ nav-enemy-default-event-handler (initialize-skeleton obj *kermit-sg* '()) (set! (-> obj draw origin-joint-index) (the-as uint 3)) (set! (-> obj airborne) #f) - (TODO-RENAME-45 obj *kermit-nav-enemy-info*) + (init-defaults! obj *kermit-nav-enemy-info*) (set-vector! (-> obj neck twist-max) 3640.889 3640.889 0.0 1.0) (set! (-> obj neck up) (the-as uint 1)) (set! (-> obj neck nose) (the-as uint 2)) diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc index ead89a1bcf..6f521b29cb 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-bat_REF.gc @@ -13,7 +13,7 @@ :size-assert #x30 :flag-assert #xa00000030 (:methods - (TODO-RENAME-9 (_type_ vector float) vector 9) + (swamp-bat-idle-path-method-9 (_type_ vector float) vector 9) ) ) @@ -28,7 +28,7 @@ ;; definition for method 9 of type swamp-bat-idle-path ;; INFO: Used lq/sq -(defmethod TODO-RENAME-9 swamp-bat-idle-path ((obj swamp-bat-idle-path) (arg0 vector) (arg1 float)) +(defmethod swamp-bat-idle-path-method-9 swamp-bat-idle-path ((obj swamp-bat-idle-path) (arg0 vector) (arg1 float)) (let ((f30-0 (* 65536.0 arg1))) (set! (-> arg0 quad) (-> obj origin quad)) (vector+*! arg0 arg0 (-> obj x-axis) (cos f30-0)) @@ -109,7 +109,7 @@ :size-assert #x118 :flag-assert #x1500b00118 (:methods - (dummy-20 (_type_) float 20) + (swamp-bat-slave-method-20 (_type_) float 20) ) (:states (swamp-bat-slave-die handle) @@ -173,7 +173,7 @@ swamp-bat-slave-event-handler ) ;; definition for method 20 of type swamp-bat-slave -(defmethod dummy-20 swamp-bat-slave ((obj swamp-bat-slave)) +(defmethod swamp-bat-slave-method-20 swamp-bat-slave ((obj swamp-bat-slave)) (* (get-current-phase (-> obj sync)) (-> obj path-point-count)) ) @@ -184,11 +184,11 @@ swamp-bat-slave-event-handler (s5-0 (new-stack-vector0)) (gp-0 (new-stack-vector0)) (s4-0 (new-stack-vector0)) - (f30-0 (dummy-20 self)) + (f30-0 (swamp-bat-slave-method-20 self)) (s3-0 (new 'static 'vector :y 1.0 :w 1.0)) ) (eval-path-curve-div! s2-0 s5-0 f30-0 'interp) - (TODO-RENAME-12 s2-0 gp-0 f30-0) + (path-control-method-12 s2-0 gp-0 f30-0) (vector-cross! s4-0 gp-0 s3-0) (vector-normalize! s4-0 1.0) (let ((f0-4 (fmax @@ -252,9 +252,12 @@ swamp-bat-slave-event-handler (let ((s4-0 (quaternion-copy! (new 'stack-no-clear 'quaternion) (-> self root-override quat))) (gp-0 (new-stack-quaternion0)) ) - (let ((s2-0 - (TODO-RENAME-12 (-> self parent-process 0 path-list (-> self path-select)) (new 'stack-no-clear 'vector) 0.1) - ) + (let ((s2-0 (path-control-method-12 + (-> self parent-process 0 path-list (-> self path-select)) + (new 'stack-no-clear 'vector) + 0.1 + ) + ) ) 0 (let* ((f0-0 300.0) @@ -359,7 +362,7 @@ swamp-bat-slave-event-handler (ja-channel-push! 1 (seconds 0.1)) (ja :group! swamp-bat-swoop-ja) (loop - (if (>= (dummy-20 self) 2.0) + (if (>= (swamp-bat-slave-method-20 self) 2.0) (go swamp-bat-slave-strafe) ) (ja :num! (loop!)) @@ -378,7 +381,7 @@ swamp-bat-slave-event-handler (ja-channel-push! 1 (seconds 0.1)) (ja :group! swamp-bat-strafe-ja) (loop - (if (>= (dummy-20 self) 6.0) + (if (>= (swamp-bat-slave-method-20 self) 6.0) (go swamp-bat-slave-return) ) (ja :num! (loop!)) @@ -400,7 +403,7 @@ swamp-bat-slave-event-handler (gp-0 #t) ) (loop - (let ((f28-0 (dummy-20 self))) + (let ((f28-0 (swamp-bat-slave-method-20 self))) (if (>= f28-0 f30-0) (go swamp-bat-slave-idle) ) @@ -529,7 +532,7 @@ swamp-bat-slave-event-handler (__assert-zero-lim-range-int arg0 (-> self path-count) "path-index" "(-> self path-count)") ) (let* ((s5-0 (-> self path-list arg0)) - (gp-1 (TODO-RENAME-12 s5-0 (-> self path-select-plane arg0) 5.0)) + (gp-1 (path-control-method-12 s5-0 (-> self path-select-plane arg0) 5.0)) (s5-1 (eval-path-curve-div! s5-0 (new 'stack-no-clear 'vector) 5.0 'interp)) ) (set! (-> gp-1 y) 0.0) @@ -597,7 +600,9 @@ swamp-bat-slave-event-handler (deactivate self) ) (swamp-bat-update-path) - (if (or (dummy-10 (-> self vol) (target-pos 5)) (not (swamp-bat-check-slave-paths-match? (-> self path-select)))) + (if (or (point-in-vol? (-> self vol) (target-pos 5)) + (not (swamp-bat-check-slave-paths-match? (-> self path-select))) + ) (go swamp-bat-launch-slaves) ) ) diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc index 10a379e6b7..cf3d76d1c0 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-obs_REF.gc @@ -825,7 +825,7 @@ ) ;; definition for method 22 of type tar-plat -(defmethod TODO-RENAME-22 tar-plat ((obj tar-plat) (arg0 vector) (arg1 float)) +(defmethod rigid-body-platform-method-22 tar-plat ((obj tar-plat) (arg0 vector) (arg1 float)) (+ (-> obj float-height) (-> obj float-height-offset) (* 512.0 (cos (* 109.22667 (+ (* 60.0 arg1) (* 0.03 (-> arg0 x)) (* 0.03 (-> arg0 z)))))) @@ -834,9 +834,9 @@ ;; definition for method 23 of type tar-plat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 tar-plat ((obj tar-plat) (arg0 float)) +(defmethod rigid-body-platform-method-23 tar-plat ((obj tar-plat) (arg0 float)) ((the-as (function rigid-body-platform basic none) (find-parent-method tar-plat 23)) obj (the-as basic arg0)) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) @@ -897,7 +897,7 @@ ;; definition for method 30 of type tar-plat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-30 tar-plat ((obj tar-plat)) +(defmethod rigid-body-platform-method-30 tar-plat ((obj tar-plat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -925,9 +925,9 @@ ;; definition for method 31 of type tar-plat ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 tar-plat ((obj tar-plat)) +(defmethod rigid-body-platform-method-31 tar-plat ((obj tar-plat)) (initialize-skeleton obj *tar-plat-sg* '()) - (TODO-RENAME-29 obj *tar-plat-constants*) + (rigid-body-platform-method-29 obj *tar-plat-constants*) (set! (-> obj float-height) (-> obj entity extra trans y)) (set! (-> obj float-height-offset) -2048.0) (let ((s5-0 (-> obj info control-point-count))) diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc index b401f7565e..59ef1bb7f6 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-rat-nest_REF.gc @@ -654,8 +654,8 @@ :size-assert #xcc :flag-assert #x16006000cc (:methods - (dummy-20 (_type_) none 20) - (dummy-21 (_type_) int 21) + (swamp-rat-nest-dummy-method-20 (_type_) none 20) + (swamp-rat-nest-dummy-method-21 (_type_) int 21) ) (:states swamp-rat-nest-dummy-die @@ -880,7 +880,7 @@ (defbehavior swamp-rat-nest-dummy-init-by-other swamp-rat-nest-dummy ((arg0 swamp-rat-nest-dummy)) (let ((gp-0 (-> arg0 entity))) (set! (-> self mask) (logior (process-mask enemy) (-> self mask))) - (dummy-20 self) + (swamp-rat-nest-dummy-method-20 self) (process-drawable-from-entity! self gp-0) (set! (-> self top-sphere quad) (-> self root-override trans quad)) (set! (-> self top-sphere y) (+ 24576.0 (-> self top-sphere y))) @@ -891,7 +891,7 @@ (logior! (-> self nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7)) (set-current-poly! (-> self nav) (find-poly (-> self nav) (-> self root-override trans))) (+! (-> self parent-process 0 hit-points) 3) - (dummy-21 self) + (swamp-rat-nest-dummy-method-21 self) (when (zero? (-> self skel)) (set! (-> self spawn-joint-count) 0) 0 @@ -1187,7 +1187,7 @@ swamp-rat-nest-default-event-handler ) ;; definition for method 20 of type swamp-rat-nest-dummy-a -(defmethod dummy-20 swamp-rat-nest-dummy-a ((obj swamp-rat-nest-dummy-a)) +(defmethod swamp-rat-nest-dummy-method-20 swamp-rat-nest-dummy-a ((obj swamp-rat-nest-dummy-a)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -1207,7 +1207,7 @@ swamp-rat-nest-default-event-handler ) ;; definition for method 20 of type swamp-rat-nest-dummy-b -(defmethod dummy-20 swamp-rat-nest-dummy-b ((obj swamp-rat-nest-dummy-b)) +(defmethod swamp-rat-nest-dummy-method-20 swamp-rat-nest-dummy-b ((obj swamp-rat-nest-dummy-b)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -1227,7 +1227,7 @@ swamp-rat-nest-default-event-handler ) ;; definition for method 20 of type swamp-rat-nest-dummy-c -(defmethod dummy-20 swamp-rat-nest-dummy-c ((obj swamp-rat-nest-dummy-c)) +(defmethod swamp-rat-nest-dummy-method-20 swamp-rat-nest-dummy-c ((obj swamp-rat-nest-dummy-c)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -1247,7 +1247,7 @@ swamp-rat-nest-default-event-handler ) ;; definition for method 21 of type swamp-rat-nest-dummy-a -(defmethod dummy-21 swamp-rat-nest-dummy-a ((obj swamp-rat-nest-dummy-a)) +(defmethod swamp-rat-nest-dummy-method-21 swamp-rat-nest-dummy-a ((obj swamp-rat-nest-dummy-a)) (let ((v1-0 0)) (let* ((a0-1 '(5 6 7 8 9 10)) (a1-0 (car a0-1)) @@ -1272,7 +1272,7 @@ swamp-rat-nest-default-event-handler ) ;; definition for method 21 of type swamp-rat-nest-dummy-b -(defmethod dummy-21 swamp-rat-nest-dummy-b ((obj swamp-rat-nest-dummy-b)) +(defmethod swamp-rat-nest-dummy-method-21 swamp-rat-nest-dummy-b ((obj swamp-rat-nest-dummy-b)) (let ((v1-0 0)) (let* ((a0-1 '(5 9 10 6 7 8)) (a1-0 (car a0-1)) @@ -1297,7 +1297,7 @@ swamp-rat-nest-default-event-handler ) ;; definition for method 21 of type swamp-rat-nest-dummy-c -(defmethod dummy-21 swamp-rat-nest-dummy-c ((obj swamp-rat-nest-dummy-c)) +(defmethod swamp-rat-nest-dummy-method-21 swamp-rat-nest-dummy-c ((obj swamp-rat-nest-dummy-c)) (let ((v1-0 0)) (let* ((a0-1 '(5 6)) (a1-0 (car a0-1)) diff --git a/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc b/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc index a1eaa14584..40c1a176b7 100644 --- a/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc +++ b/test/decompiler/reference/jak1/levels/swamp/swamp-rat_REF.gc @@ -53,7 +53,7 @@ ) ;; definition for method 44 of type swamp-rat -(defmethod dummy-44 swamp-rat ((obj swamp-rat) (arg0 process) (arg1 event-message-block)) +(defmethod touch-handler swamp-rat ((obj swamp-rat) (arg0 process) (arg1 event-message-block)) (when ((method-of-type touching-shapes-entry prims-touching?) (the-as touching-shapes-entry (-> arg1 param 0)) (-> obj collide-info) @@ -110,7 +110,7 @@ swamp-rat-default-event-handler ;; definition for method 38 of type swamp-rat ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-38 swamp-rat ((obj swamp-rat)) +(defmethod nav-enemy-method-38 swamp-rat ((obj swamp-rat)) (integrate-for-enemy-with-move-to-ground! (-> obj collide-info) (-> obj collide-info transv) @@ -392,7 +392,7 @@ swamp-rat-default-event-handler (suspend) (ja :num! (seek!)) ) - (if (TODO-RENAME-46 self (-> self nav-info stop-chase-distance)) + (if (target-in-range? self (-> self nav-info stop-chase-distance)) (go-virtual nav-enemy-chase) (go-virtual nav-enemy-idle) ) @@ -483,9 +483,9 @@ swamp-rat-default-event-handler ;; definition for method 48 of type swamp-rat ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 swamp-rat ((obj swamp-rat)) +(defmethod nav-enemy-method-48 swamp-rat ((obj swamp-rat)) (initialize-skeleton obj *swamp-rat-sg* '()) - (TODO-RENAME-45 obj *swamp-rat-nav-enemy-info*) + (init-defaults! obj *swamp-rat-nav-enemy-info*) (vector-float*! (-> obj collide-info scale) *identity-vector* 1.5) (set! (-> obj neck up) (the-as uint 1)) (set! (-> obj neck nose) (the-as uint 2)) @@ -519,7 +519,7 @@ swamp-rat-default-event-handler (vector-float*! (-> self collide-info scale) *identity-vector* 1.5) (vector-float*! (-> self collide-info transv) arg2 49152.0) (set! (-> self entity) (-> arg0 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (set! (-> self enemy-info pickup-type) arg3) (go swamp-rat-spawn) (none) diff --git a/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc b/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc index 45c6e544d0..6f9388ef67 100644 --- a/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc @@ -225,7 +225,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('update) - (remove-setting! 'process-mask) + (the-as symbol (remove-setting! 'process-mask)) ) ) ) @@ -494,7 +494,7 @@ :event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block)) (the-as object (case event-type (('blackout) - (set-setting! 'bg-a 'abs 1.0 0) + (the-as symbol (set-setting! 'bg-a 'abs 1.0 0)) ) ) ) @@ -817,7 +817,7 @@ (go target-title-wait) ) ((= v1-0 'reset) - (deactivate (-> self manipy 0)) + (the-as object (deactivate (-> self manipy 0))) ) (else (target-generic-event-handler proc arg1 event-type event) @@ -846,7 +846,7 @@ (go target-title-play) ) ((= v1-0 'reset) - (deactivate (-> self manipy 0)) + (the-as object (deactivate (-> self manipy 0))) ) (else (target-generic-event-handler proc arg1 event-type event) diff --git a/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc b/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc index a00919fa3d..0aa2f4c673 100644 --- a/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/training/training-obs_REF.gc @@ -40,8 +40,8 @@ ;; definition for method 22 of type training-water ;; INFO: Return type mismatch ripple-wave-set vs none. -(defmethod TODO-RENAME-22 training-water ((obj training-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 training-water ((obj training-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) @@ -299,9 +299,9 @@ ;; INFO: Return type mismatch int vs none. (defmethod init-from-entity! tra-pontoon ((obj tra-pontoon) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) + (rigid-body-platform-method-31 obj) (go (method-of-object obj rigid-body-platform-idle)) 0 (none) @@ -309,9 +309,9 @@ ;; definition for method 23 of type tra-pontoon ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 tra-pontoon ((obj tra-pontoon) (arg0 float)) +(defmethod rigid-body-platform-method-23 tra-pontoon ((obj tra-pontoon) (arg0 float)) ((the-as (function rigid-body-platform float none) (find-parent-method tra-pontoon 23)) obj arg0) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) @@ -351,7 +351,7 @@ ;; definition for method 30 of type tra-pontoon ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-30 tra-pontoon ((obj tra-pontoon)) +(defmethod rigid-body-platform-method-30 tra-pontoon ((obj tra-pontoon)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -379,9 +379,9 @@ ;; definition for method 31 of type tra-pontoon ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 tra-pontoon ((obj tra-pontoon)) +(defmethod rigid-body-platform-method-31 tra-pontoon ((obj tra-pontoon)) (initialize-skeleton obj *tra-pontoon-sg* '()) - (TODO-RENAME-29 obj *tra-pontoon-constants*) + (rigid-body-platform-method-29 obj *tra-pontoon-constants*) (set! (-> obj float-height-offset) 6144.0) (set! (-> obj root-overlay nav-radius) 20480.0) (let ((v1-6 (-> obj control-point-array data))) @@ -439,7 +439,7 @@ ;; definition for method 24 of type tra-iris-door ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-24 tra-iris-door ((obj tra-iris-door)) +(defmethod eco-door-method-24 tra-iris-door ((obj tra-iris-door)) (let ((s5-0 (new 'process 'collide-shape obj (collide-list-enum hit-by-others)))) (let ((s4-0 (new 'process 'collide-shape-prim-mesh s5-0 (the-as uint 0) (the-as uint 0)))) (set! (-> s4-0 prim-core collide-as) (collide-kind wall-object)) @@ -460,7 +460,7 @@ ;; definition for method 25 of type tra-iris-door ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-25 tra-iris-door ((obj tra-iris-door)) +(defmethod eco-door-method-25 tra-iris-door ((obj tra-iris-door)) (initialize-skeleton obj *tra-iris-door-sg* '()) (set! (-> obj open-distance) 32768.0) (set! (-> obj close-distance) 49152.0) @@ -791,14 +791,15 @@ ) ) (('touch) - (send-shove-back - (-> self root-override) - proc - (the-as touching-shapes-entry (-> event param 0)) - 0.7 - 6144.0 - 16384.0 - ) + (the-as object (send-shove-back + (-> self root-override) + proc + (the-as touching-shapes-entry (-> event param 0)) + 0.7 + 6144.0 + 16384.0 + ) + ) ) ) ) @@ -828,7 +829,7 @@ :virtual #t :code (behavior ((arg0 float) (arg1 vector) (arg2 symbol)) (when (not arg2) - (dummy-10 (-> self skel effect) 'group-scarecrow-hit 4.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-hit 4.0 -1) (ja-channel-push! 1 (seconds 0.07)) (cond ((< (fabs arg0) 8192.0) @@ -856,9 +857,9 @@ (go-virtual idle) ) (clear-collide-with-as (-> self root-override)) - (dummy-10 (-> self skel effect) 'group-scarecrow-joint-explode 12.0 -1) - (dummy-10 (-> self skel effect) 'group-scarecrow-joint-explode 20.0 -1) - (dummy-10 (-> self skel effect) 'group-scarecrow-explode 4.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-joint-explode 12.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-joint-explode 20.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-explode 4.0 -1) (sound-play "break-dummy") (ja-channel-set! 0) (let ((s5-2 (new 'stack 'joint-exploder-tuning 1))) @@ -972,7 +973,7 @@ :virtual #t :code (behavior ((arg0 float) (arg1 vector) (arg2 symbol)) (when (not arg2) - (dummy-10 (-> self skel effect) 'group-scarecrow-hit 4.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-hit 4.0 -1) (ja-channel-push! 1 (seconds 0.07)) (cond ((< (fabs arg0) 8192.0) @@ -1000,9 +1001,9 @@ (go-virtual idle) ) (clear-collide-with-as (-> self root-override)) - (dummy-10 (-> self skel effect) 'group-scarecrow-joint-explode 12.0 -1) - (dummy-10 (-> self skel effect) 'group-scarecrow-joint-explode 21.0 -1) - (dummy-10 (-> self skel effect) 'group-scarecrow-explode 4.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-joint-explode 12.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-joint-explode 21.0 -1) + (effect-control-method-10 (-> self skel effect) 'group-scarecrow-explode 4.0 -1) (sound-play "break-dummy") (ja-channel-set! 0) (let ((s5-2 (new 'stack 'joint-exploder-tuning 1))) diff --git a/test/decompiler/reference/jak1/levels/village1/assistant_REF.gc b/test/decompiler/reference/jak1/levels/village1/assistant_REF.gc index 49285b525b..7bf63fabbb 100644 --- a/test/decompiler/reference/jak1/levels/village1/assistant_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/assistant_REF.gc @@ -31,7 +31,7 @@ ;; definition for method 52 of type assistant ;; INFO: Return type mismatch shadow-flags vs none. -(defmethod dummy-52 assistant ((obj assistant)) +(defmethod process-taskable-method-52 assistant ((obj assistant)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -182,8 +182,8 @@ ) ;; definition for method 43 of type assistant -(defmethod TODO-RENAME-43 assistant ((obj assistant)) - (let ((s5-0 (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj))) +(defmethod process-taskable-method-43 assistant ((obj assistant)) + (let ((s5-0 (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj))) (when s5-0 (let ((f0-2 (rand-float-gen))) (cond @@ -219,7 +219,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) (loop - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja :group! assistant-idle-leaning-right-ja) (countdown (gp-0 (+ (the int (rand-float-gen)) 2)) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) @@ -390,7 +390,7 @@ ;; definition for method 11 of type assistant (defmethod init-from-entity! assistant ((obj assistant) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-sg* 3 31 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-sg* 3 31 (new 'static 'vector :w 4096.0) 5) (set! (-> obj bounce-away) #f) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 122) obj)) (set! (-> obj tasks) (get-task-control (game-task jungle-eggtop))) diff --git a/test/decompiler/reference/jak1/levels/village1/explorer_REF.gc b/test/decompiler/reference/jak1/levels/village1/explorer_REF.gc index 644e2a84ad..8645d68bdd 100644 --- a/test/decompiler/reference/jak1/levels/village1/explorer_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/explorer_REF.gc @@ -29,7 +29,7 @@ ;; definition for method 52 of type explorer ;; INFO: Return type mismatch shadow-flags vs none. -(defmethod dummy-52 explorer ((obj explorer)) +(defmethod process-taskable-method-52 explorer ((obj explorer)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -154,8 +154,8 @@ ) ;; definition for method 43 of type explorer -(defmethod TODO-RENAME-43 explorer ((obj explorer)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 explorer ((obj explorer)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.85714287 f0-2) @@ -202,7 +202,7 @@ (ja-channel-push! 1 (seconds 0.2)) ) (loop - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja :group! explorer-idle-ja) (let* ((f30-0 2.0) (v1-11 (/ (the-as int (rand-uint31-gen *random-generator*)) 256)) @@ -349,10 +349,10 @@ ;; definition for method 11 of type explorer (defmethod init-from-entity! explorer ((obj explorer) (arg0 entity-actor)) - (dummy-40 obj arg0 *explorer-sg* 3 42 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *explorer-sg* 3 42 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task village1-uncle-money))) (set! (-> obj sound-flava) (music-flava explorer)) (set! (-> obj draw light-index) (the-as uint 5)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village1/farmer_REF.gc b/test/decompiler/reference/jak1/levels/village1/farmer_REF.gc index 20ca9ecb6e..e2cd15d9d0 100644 --- a/test/decompiler/reference/jak1/levels/village1/farmer_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/farmer_REF.gc @@ -87,8 +87,8 @@ ) ;; definition for method 43 of type farmer -(defmethod TODO-RENAME-43 farmer ((obj farmer)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 farmer ((obj farmer)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.8333333 f0-2) @@ -152,10 +152,10 @@ ;; definition for method 11 of type farmer (defmethod init-from-entity! farmer ((obj farmer) (arg0 entity-actor)) - (dummy-40 obj arg0 *farmer-sg* 3 25 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *farmer-sg* 3 25 (new 'static 'vector :w 4096.0) 5) (set! (-> obj root-override nav-radius) 40960.0) (nav-mesh-connect obj (-> obj root-override) (the-as nav-control #f)) (set! (-> obj tasks) (get-task-control (game-task village1-yakow))) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc b/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc index 5d49368e1e..c2be8b83a2 100644 --- a/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc @@ -280,13 +280,13 @@ :flag-assert #x110000008c (:methods (init! (_type_ vehicle-path (pointer float) (pointer float) int float) none 9) - (TODO-RENAME-10 (_type_ vector float int) none 10) - (dummy-11 (_type_) none 11) - (TODO-RENAME-12 (_type_ int vector) none 12) + (vehicle-controller-method-10 (_type_ vector float int) none 10) + (vehicle-controller-method-11 (_type_) none 11) + (vehicle-controller-method-12 (_type_ int vector) none 12) (move-to-next-point (_type_ vector) none 13) - (TODO-RENAME-14 (_type_ vector vector) none 14) - (dummy-15 (_type_ collide-shape-moving) none 15) - (dummy-16 (_type_) none 16) + (vehicle-controller-method-14 (_type_ vector vector) none 14) + (vehicle-controller-method-15 (_type_ collide-shape-moving) none 15) + (vehicle-controller-method-16 (_type_) none 16) ) ) @@ -325,7 +325,7 @@ ;; definition for method 12 of type vehicle-controller ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-12 vehicle-controller ((obj vehicle-controller) (arg0 int) (arg1 vector)) +(defmethod vehicle-controller-method-12 vehicle-controller ((obj vehicle-controller) (arg0 int) (arg1 vector)) (when (< arg0 (get-point-count (-> obj path))) (set! (-> obj path-dest-index) arg0) (nth-point (-> obj path) arg0 (-> obj path-dest-point)) @@ -367,7 +367,7 @@ (if (>= s4-0 (get-point-count (-> obj path))) (set! s4-0 0) ) - (TODO-RENAME-12 obj s4-0 arg0) + (vehicle-controller-method-12 obj s4-0 arg0) ) 0 (none) @@ -376,7 +376,7 @@ ;; definition for method 14 of type vehicle-controller ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-14 vehicle-controller ((obj vehicle-controller) (arg0 vector) (arg1 vector)) +(defmethod vehicle-controller-method-14 vehicle-controller ((obj vehicle-controller) (arg0 vector) (arg1 vector)) (let ((s5-0 (new 'stack-no-clear 'vector)) (s3-0 (new 'stack-no-clear 'vector)) ) @@ -414,8 +414,8 @@ ;; definition for method 15 of type vehicle-controller ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod dummy-15 vehicle-controller ((obj vehicle-controller) (arg0 collide-shape-moving)) - (TODO-RENAME-14 obj (-> arg0 trans) (-> obj target-point)) +(defmethod vehicle-controller-method-15 vehicle-controller ((obj vehicle-controller) (arg0 collide-shape-moving)) + (vehicle-controller-method-14 obj (-> arg0 trans) (-> obj target-point)) (let ((s3-0 (new 'stack-no-clear 'vector)) (s4-0 (new 'stack-no-clear 'vector)) ) @@ -456,7 +456,7 @@ ;; definition for method 11 of type vehicle-controller ;; INFO: Return type mismatch int vs none. -(defmethod dummy-11 vehicle-controller ((obj vehicle-controller)) +(defmethod vehicle-controller-method-11 vehicle-controller ((obj vehicle-controller)) (format #t "(define *turning-radius-table* (new 'static 'inline-array 'float 0~%") (dotimes (s5-0 (-> obj table-length)) (format #t " (meters ~4,,2M)~%" (-> obj turning-radius-table s5-0)) @@ -476,7 +476,7 @@ ;; definition for method 10 of type vehicle-controller ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-10 vehicle-controller ((obj vehicle-controller) (arg0 vector) (arg1 float) (arg2 int)) +(defmethod vehicle-controller-method-10 vehicle-controller ((obj vehicle-controller) (arg0 vector) (arg1 float) (arg2 int)) (let ((s3-0 (new 'stack-no-clear 'vector))) (set! (-> s3-0 quad) (-> arg0 quad)) (set! (-> s3-0 y) 0.0) @@ -509,7 +509,7 @@ ;; definition for method 16 of type vehicle-controller ;; INFO: Return type mismatch int vs none. -(defmethod dummy-16 vehicle-controller ((obj vehicle-controller)) +(defmethod vehicle-controller-method-16 vehicle-controller ((obj vehicle-controller)) (debug-draw (-> obj path)) (add-debug-sphere #t @@ -651,7 +651,7 @@ ;; definition for method 23 of type fishermans-boat ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 fishermans-boat ((obj fishermans-boat) (arg0 float)) +(defmethod rigid-body-platform-method-23 fishermans-boat ((obj fishermans-boat) (arg0 float)) (local-vars (sv-128 int) (sv-144 rigid-body-control-point) (sv-160 int) (sv-176 vector)) (let ((s4-0 (new 'stack-no-clear 'vector)) (s1-0 (new 'stack-no-clear 'vector)) @@ -666,7 +666,7 @@ (set! sv-144 (-> obj control-point-array data sv-128)) (vector-matrix*! s5-0 (-> sv-144 local-pos) s3-0) (set! (-> sv-144 world-pos quad) (-> s5-0 quad)) - (TODO-RENAME-17 (-> obj rbody) s5-0 s1-0) + (rigid-body-method-17 (-> obj rbody) s5-0 s1-0) (set! (-> sv-144 velocity quad) (-> s1-0 quad)) (set! (-> sv-144 world-pos w) (ocean-get-height s5-0)) (let* ((f0-2 (- (-> sv-144 world-pos w) (-> s5-0 y))) @@ -674,17 +674,17 @@ ) (when (< 0.0 f0-2) (vector-float*! s4-0 *y-vector* (* 20.0 f0-2 (-> obj rbody mass))) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) (vector-float*! s4-0 *y-vector* (* 1.6 f30-0 (fmax 0.0 (vector-dot s2-0 s1-0)))) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) (vector-float*! s4-0 s1-0 (* -1.0 (-> obj info drag-factor) f30-0)) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) (vector-float*! s4-0 (the-as vector (-> s3-0 vector)) (* -0.5 (vector-dot (the-as vector (-> s3-0 vector)) s1-0)) ) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) ) ) 0 @@ -695,9 +695,9 @@ (set! sv-176 (-> obj stabilizer-array sv-160 local-pos)) (vector-matrix*! s5-0 (the-as vector (&-> sv-176 x)) s3-0) (vector-rotate*! s0-0 (&+ sv-176 16) s3-0) - (TODO-RENAME-17 (-> obj rbody) s5-0 s1-0) + (rigid-body-method-17 (-> obj rbody) s5-0 s1-0) (vector-float*! s4-0 s0-0 (* -1.0 (vector-dot s0-0 s1-0))) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) 0 (set! sv-160 (+ sv-160 1)) ) @@ -711,7 +711,7 @@ (if (< 81920.0 (vector-length s4-0)) (vector-normalize! s4-0 81920.0) ) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) (vector+*! s5-0 (-> s3-0 vector 3) s2-0 -24576.0) (vector+*! s1-1 (-> obj dock-point) (-> obj dest-dir) -24576.0) (vector-! s4-0 s1-1 s5-0) @@ -721,7 +721,7 @@ (if (< 81920.0 (vector-length s4-0)) (vector-normalize! s4-0 81920.0) ) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) ) (when (-> obj ignition) (let ((s2-1 (new 'stack-no-clear 'vector))) @@ -731,11 +731,11 @@ (vector-normalize! s2-1 1.0) (vector-float*! s4-0 s2-1 (-> obj engine-thrust)) ) - (TODO-RENAME-13 (-> obj rbody) s5-0 s4-0) + (rigid-body-method-13 (-> obj rbody) s5-0 s4-0) ) ) - (TODO-RENAME-26 obj) - (TODO-RENAME-25 obj) + (rigid-body-platform-method-26 obj) + (rigid-body-platform-method-25 obj) 0 (none) ) @@ -752,7 +752,7 @@ ;; definition for function fishermans-boat-set-path-point ;; INFO: Return type mismatch int vs none. (defbehavior fishermans-boat-set-path-point fishermans-boat ((arg0 int)) - (TODO-RENAME-12 (-> self controller) arg0 (-> self root-overlay trans)) + (vehicle-controller-method-12 (-> self controller) arg0 (-> self root-overlay trans)) (vector-normalize-copy! (-> self dest-dir) (-> self controller path-dest-velocity) 1.0) 0 (none) @@ -883,7 +883,7 @@ (when (and *target* (-> self ignition)) (cond ((-> self auto-pilot) - (dummy-15 (-> self controller) (-> self root-overlay)) + (vehicle-controller-method-15 (-> self controller) (-> self root-overlay)) (vector-normalize-copy! (-> self dest-dir) (-> self controller path-dest-velocity) 1.0) ) (else @@ -931,11 +931,11 @@ (seek! (-> self propeller spin-rate) 0.0 218.45334) ) ) - (TODO-RENAME-28 self) + (rigid-body-platform-method-28 self) (quaternion-copy! (-> self root-overlay quat) (-> self rbody rotation)) - (TODO-RENAME-18 (-> self rbody) (-> self root-overlay trans)) + (rigid-body-method-18 (-> self rbody) (-> self root-overlay trans)) (when (-> self debug-draw) - (dummy-16 (-> self controller)) + (vehicle-controller-method-16 (-> self controller)) (add-debug-sphere #t (bucket-id debug-no-zbuf) @@ -1363,7 +1363,7 @@ (suspend) ) (vector-z-quaternion! gp-0 (-> self root-overlay quat)) - (TODO-RENAME-10 (-> self controller) gp-0 (-> self controller throttle) s5-0) + (vehicle-controller-method-10 (-> self controller) gp-0 (-> self controller throttle) s5-0) (let ((s3-0 (-> *display* base-frame-counter))) (until (>= (- (-> *display* base-frame-counter) s3-0) (seconds 1)) (fishermans-boat-set-throttle-by-speed f30-0) @@ -1373,7 +1373,7 @@ ) ) (vector-z-quaternion! gp-0 (-> self root-overlay quat)) - (TODO-RENAME-10 (-> self controller) gp-0 (-> self controller throttle) s5-0) + (vehicle-controller-method-10 (-> self controller) gp-0 (-> self controller throttle) s5-0) (+! s5-0 1) ) ) @@ -1401,7 +1401,7 @@ ;; definition for method 30 of type fishermans-boat ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-30 fishermans-boat ((obj fishermans-boat)) +(defmethod rigid-body-platform-method-30 fishermans-boat ((obj fishermans-boat)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-others)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -1437,7 +1437,7 @@ ;; definition for method 31 of type fishermans-boat ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 fishermans-boat ((obj fishermans-boat)) +(defmethod rigid-body-platform-method-31 fishermans-boat ((obj fishermans-boat)) (initialize-skeleton obj *fishermans-boat-sg* '()) (logclear! (-> obj mask) (process-mask actor-pause movie)) (logior! (-> obj skel status) (janim-status inited)) @@ -1478,7 +1478,7 @@ (set! (-> obj root-overlay trans quad) (-> obj dock-point quad)) (set! (-> obj root-overlay trans y) 0.0) (forward-up-nopitch->quaternion (-> obj root-overlay quat) (-> obj dest-dir) *up-vector*) - (TODO-RENAME-29 obj *fishermans-boat-constants*) + (rigid-body-platform-method-29 obj *fishermans-boat-constants*) (let ((v1-39 (-> obj control-point-array data))) (set! (-> v1-39 0 local-pos x) 0.0) (set! (-> v1-39 0 local-pos y) 0.0) @@ -1551,9 +1551,9 @@ (defmethod init-from-entity! fishermans-boat ((obj fishermans-boat) (arg0 entity-actor)) (stack-size-set! (-> obj main-thread) 512) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) + (rigid-body-platform-method-31 obj) (if (= (-> *game-info* current-continue level) 'misty) (go fishermans-boat-docked-misty) (go fishermans-boat-docked-village) @@ -1564,7 +1564,7 @@ ;; definition for function fishermans-boat-reset-physics ;; INFO: Return type mismatch int vs none. (defbehavior fishermans-boat-reset-physics fishermans-boat () - (TODO-RENAME-22 + (rigid-body-method-22 (-> self rbody) (-> self root-overlay trans) (-> self root-overlay quat) @@ -1695,7 +1695,7 @@ ) (let ((a0-48 (handle->process (-> self evilsis)))) (if a0-48 - (deactivate a0-48) + (the-as object (deactivate a0-48)) ) ) ) diff --git a/test/decompiler/reference/jak1/levels/village1/sage_REF.gc b/test/decompiler/reference/jak1/levels/village1/sage_REF.gc index 75579c56e6..9fcc73d3cb 100644 --- a/test/decompiler/reference/jak1/levels/village1/sage_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/sage_REF.gc @@ -342,7 +342,7 @@ ) ;; definition for method 45 of type sage -(defmethod dummy-45 sage ((obj sage)) +(defmethod process-taskable-method-45 sage ((obj sage)) (cond ((and (closed? (-> obj tasks) (game-task beach-ecorocks) (task-status need-reminder)) (= (get-reminder (-> obj tasks) 0) 0) @@ -380,7 +380,7 @@ ) (save-reminder (-> obj tasks) 1 0) ) - ((dummy-45 obj) + ((process-taskable-method-45 obj) (set! (-> obj reminder-played) #f) (cond ((= (current-task (-> obj tasks)) (game-task none)) @@ -427,8 +427,8 @@ ) ;; definition for method 43 of type sage -(defmethod TODO-RENAME-43 sage ((obj sage)) - (let ((s5-0 (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj))) +(defmethod process-taskable-method-43 sage ((obj sage)) + (let ((s5-0 (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj))) (when s5-0 (let ((f0-2 (rand-float-gen))) (cond @@ -481,7 +481,7 @@ (v1-10 (the-as number (logior #x3f800000 v1-9))) ) (countdown (gp-1 (+ (the int (* f30-0 (+ -1.0 (the-as float v1-10)))) 5)) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (if (and (-> self reminder-played) @@ -583,12 +583,12 @@ ;; definition for method 11 of type sage (defmethod init-from-entity! sage ((obj sage) (arg0 entity-actor)) - (dummy-40 obj arg0 *sage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *sage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task misty-cannon))) (set! (-> obj reminder-played) #f) (set! (-> obj sound-flava) (music-flava sage)) (set! (-> obj assistant) (the-as handle #f)) (set! (-> obj draw light-index) (the-as uint 1)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village1/sequence-a-village1_REF.gc b/test/decompiler/reference/jak1/levels/village1/sequence-a-village1_REF.gc index bab28cefe9..5b74dd0b1a 100644 --- a/test/decompiler/reference/jak1/levels/village1/sequence-a-village1_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/sequence-a-village1_REF.gc @@ -372,7 +372,7 @@ ;; INFO: Return type mismatch object vs none. (defbehavior sequenceA-village1-init-by-other sequenceA-village1 ((arg0 entity-actor)) (set! (-> self entity) arg0) - (dummy-40 self arg0 *sage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 self arg0 *sage-sg* 3 40 (new 'static 'vector :w 4096.0) 5) (set! (-> self tasks) (get-task-control (game-task intro))) (set! (-> self boat) (the-as handle #f)) (set! (-> self side) (the-as handle #f)) diff --git a/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc b/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc index bf09ae2ef4..54b614fb8a 100644 --- a/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/village-obs_REF.gc @@ -882,9 +882,9 @@ ;; definition for method 48 of type starfish ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-48 starfish ((obj starfish)) +(defmethod nav-enemy-method-48 starfish ((obj starfish)) (initialize-skeleton obj *starfish-sg* '()) - (TODO-RENAME-45 obj *starfish-nav-enemy-info*) + (init-defaults! obj *starfish-nav-enemy-info*) 0 (none) ) @@ -899,7 +899,7 @@ (quaternion-copy! (-> self collide-info quat) (-> arg0 collide-info quat)) (vector-identity! (-> self collide-info scale)) (set! (-> self entity) (-> arg0 entity)) - (TODO-RENAME-48 self) + (nav-enemy-method-48 self) (go starfish-idle) (none) ) @@ -1262,8 +1262,8 @@ ;; definition for method 22 of type villagea-water ;; INFO: Return type mismatch ripple-wave-set vs none. -(defmethod TODO-RENAME-22 villagea-water ((obj villagea-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 villagea-water ((obj villagea-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) diff --git a/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc b/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc index cb4bc0ca0e..af938ee782 100644 --- a/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc +++ b/test/decompiler/reference/jak1/levels/village1/yakow_REF.gc @@ -297,7 +297,7 @@ yakow-default-event-handler ;; definition for function yakow-post ;; INFO: Used lq/sq (defbehavior yakow-post yakow () - (dummy-11 (-> self nav) (-> self nav target-pos)) + (nav-control-method-11 (-> self nav) (-> self nav target-pos)) (set! (-> self rotating) #f) (let ((f30-0 0.0)) (when (< 40.96 (vector-length (-> self nav travel))) @@ -354,7 +354,7 @@ yakow-default-event-handler ) ) (set! (-> self travel-speed) (fmin (-> self travel-speed) (-> self final-speed))) - (dummy-10 (-> self water)) + (water-control-method-10 (-> self water)) (when (and (logtest? (-> self nav current-poly pat) 2) (not (and (-> self entity) (logtest? (-> self entity extra perm status) (entity-perm-status complete)))) ) @@ -377,7 +377,7 @@ yakow-default-event-handler (set! (-> gp-1 y) 0.0) (set! (-> self nav travel quad) (-> gp-1 quad)) (vector-normalize! (-> self nav travel) 409600.0) - (dummy-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) + (nav-control-method-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) (when (not (-> self enable-turn-around)) (set! (-> gp-1 quad) (-> self nav travel quad)) (let ((f30-0 (vector-length gp-1))) @@ -388,7 +388,7 @@ yakow-default-event-handler ) (set! (-> self nav travel quad) (-> s5-1 quad)) (vector-normalize! (-> self nav travel) 409600.0) - (dummy-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) + (nav-control-method-24 (-> self nav) 204.8 (the-as clip-travel-vector-to-mesh-return-info #f)) (vector-length (-> self nav travel)) ) ) @@ -533,10 +533,10 @@ yakow-default-event-handler (loop (cond ((rand-vu-percent? 0.2) - (dummy-10 (-> self skel effect) 'yakow-1 0.0 -1) + (effect-control-method-10 (-> self skel effect) 'yakow-1 0.0 -1) ) ((rand-vu-percent? 0.2) - (dummy-10 (-> self skel effect) 'yakow-2 0.0 -1) + (effect-control-method-10 (-> self skel effect) 'yakow-2 0.0 -1) ) ) (let ((f30-0 (rand-vu-float-range 0.9 1.1))) @@ -618,7 +618,7 @@ yakow-default-event-handler ) :code (the-as (function vector none :behavior yakow) yakow-blend-walk-run) :post (behavior () - (dummy-19 + (nav-control-method-19 (-> self nav) (-> self nav target-pos) (-> self root-override) diff --git a/test/decompiler/reference/jak1/levels/village2/assistant-village2_REF.gc b/test/decompiler/reference/jak1/levels/village2/assistant-village2_REF.gc index 5347fc100d..41d88611b6 100644 --- a/test/decompiler/reference/jak1/levels/village2/assistant-village2_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/assistant-village2_REF.gc @@ -70,7 +70,7 @@ ;; definition for method 52 of type assistant-levitator ;; INFO: Return type mismatch shadow-flags vs none. -(defmethod dummy-52 assistant-levitator ((obj assistant-levitator)) +(defmethod process-taskable-method-52 assistant-levitator ((obj assistant-levitator)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -482,8 +482,8 @@ ) ;; definition for method 43 of type assistant-bluehut -(defmethod TODO-RENAME-43 assistant-bluehut ((obj assistant-bluehut)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 assistant-bluehut ((obj assistant-bluehut)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f30-0 (rand-float-gen))) (cond ((= (get-task-status (game-task village2-levitator)) (task-status invalid)) @@ -525,7 +525,7 @@ (let ((f0-9 (rand-float-gen))) (cond ((< f0-9 0.33333334) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja-no-eval :group! assistant-village2-idle-hut-look-right-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) @@ -620,7 +620,7 @@ (defmethod should-display? assistant-bluehut ((obj assistant-bluehut)) (cond ((not (closed? (-> obj tasks) (game-task village2-levitator) (task-status unknown))) - (dummy-33 obj) + (process-taskable-method-33 obj) #f ) ((or (= (get-task-status (game-task village2-levitator)) (task-status need-reward-speech)) (sages-kidnapped?)) @@ -727,7 +727,7 @@ ;; definition for method 11 of type assistant-bluehut (defmethod init-from-entity! assistant-bluehut ((obj assistant-bluehut) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-village2-sg* 3 31 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-village2-sg* 3 31 (new 'static 'vector :w 4096.0) 5) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 288) obj)) (set! (-> obj tasks) (get-task-control (game-task village2-levitator))) (set! (-> obj jaws) (the-as handle #f)) @@ -735,7 +735,7 @@ (set! (-> obj im-talking) #t) (set! (-> obj draw light-index) (the-as uint 1)) (set! (-> obj sound-id) (new-sound-id)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -1536,7 +1536,7 @@ ;; definition for method 11 of type assistant-levitator (defmethod init-from-entity! assistant-levitator ((obj assistant-levitator) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-village2-sg* 3 31 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-village2-sg* 3 31 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task village2-levitator))) (set! (-> obj boulder) (entity-actor-lookup arg0 'alt-actor 0)) (set! (-> obj particle 0) (create-launch-control (-> *part-group-id-table* 658) obj)) @@ -1548,7 +1548,7 @@ ) (if (= (get-task-status (game-task village2-levitator)) (task-status invalid)) (go just-particles) - (dummy-42 obj) + (process-taskable-method-42 obj) ) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village2/flutflut-bluehut_REF.gc b/test/decompiler/reference/jak1/levels/village2/flutflut-bluehut_REF.gc index 6ba730c0f6..5fcf1ffa37 100644 --- a/test/decompiler/reference/jak1/levels/village2/flutflut-bluehut_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/flutflut-bluehut_REF.gc @@ -124,9 +124,9 @@ ;; definition for method 11 of type flutflut-bluehut (defmethod init-from-entity! flutflut-bluehut ((obj flutflut-bluehut) (arg0 entity-actor)) - (dummy-40 obj arg0 *flutflut-bluehut-sg* 3 0 (new 'static 'vector :w 4096.0) 27) + (process-taskable-method-40 obj arg0 *flutflut-bluehut-sg* 3 0 (new 'static 'vector :w 4096.0) 27) (set! (-> obj tasks) (get-task-control (game-task village2-levitator))) (set! (-> obj draw light-index) (the-as uint 1)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village2/gambler_REF.gc b/test/decompiler/reference/jak1/levels/village2/gambler_REF.gc index 759687984a..e8c200790f 100644 --- a/test/decompiler/reference/jak1/levels/village2/gambler_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/gambler_REF.gc @@ -130,8 +130,8 @@ ) ;; definition for method 43 of type gambler -(defmethod TODO-RENAME-43 gambler ((obj gambler)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 61440.0 obj) +(defmethod process-taskable-method-43 gambler ((obj gambler)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 61440.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.9230769 f0-2) @@ -194,7 +194,7 @@ (suspend) (ja :num! (seek!)) ) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (let ((f0-9 (rand-float-gen))) (cond ((< f0-9 0.16666667) @@ -224,10 +224,10 @@ ;; definition for method 11 of type gambler (defmethod init-from-entity! gambler ((obj gambler) (arg0 entity-actor)) - (dummy-40 obj arg0 *gambler-sg* 3 32 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *gambler-sg* 3 32 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task rolling-race))) (set! (-> obj sound-flava) (music-flava gambler)) (set! (-> obj draw light-index) (the-as uint 4)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village2/geologist_REF.gc b/test/decompiler/reference/jak1/levels/village2/geologist_REF.gc index 928d1408f8..2c7a495aca 100644 --- a/test/decompiler/reference/jak1/levels/village2/geologist_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/geologist_REF.gc @@ -122,8 +122,8 @@ ) ;; definition for method 43 of type geologist -(defmethod TODO-RENAME-43 geologist ((obj geologist)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 geologist ((obj geologist)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.8888889 f0-2) @@ -169,10 +169,10 @@ ;; definition for method 11 of type geologist (defmethod init-from-entity! geologist ((obj geologist) (arg0 entity-actor)) - (dummy-40 obj arg0 *geologist-sg* 3 45 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *geologist-sg* 3 45 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task rolling-moles))) (set! (-> obj sound-flava) (music-flava geologist)) (set! (-> obj draw light-index) (the-as uint 2)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village2/sage-bluehut_REF.gc b/test/decompiler/reference/jak1/levels/village2/sage-bluehut_REF.gc index 194d7b2419..b0c7c6b43f 100644 --- a/test/decompiler/reference/jak1/levels/village2/sage-bluehut_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/sage-bluehut_REF.gc @@ -147,7 +147,7 @@ ) ;; definition for method 45 of type sage-bluehut -(defmethod dummy-45 sage-bluehut ((obj sage-bluehut)) +(defmethod process-taskable-method-45 sage-bluehut ((obj sage-bluehut)) (cond ((= (current-status (-> obj tasks)) (task-status unknown)) #f @@ -191,7 +191,7 @@ ) (save-reminder (-> obj tasks) 1 0) ) - ((dummy-45 obj) + ((process-taskable-method-45 obj) (set! (-> obj reminder-played) #f) (cond ((closed? (-> obj tasks) (game-task rolling-plants) (task-status need-reminder)) @@ -259,8 +259,8 @@ ) ;; definition for method 43 of type sage-bluehut -(defmethod TODO-RENAME-43 sage-bluehut ((obj sage-bluehut)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 sage-bluehut ((obj sage-bluehut)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.8 f0-2) @@ -300,10 +300,10 @@ (v1-16 (the-as number (logior #x3f800000 v1-15))) ) (countdown (gp-1 (+ (the int (* f30-0 (+ -1.0 (the-as float v1-16)))) 5)) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (if (dummy-45 self) + (if (process-taskable-method-45 self) (go-virtual idle) ) (suspend) @@ -314,7 +314,7 @@ (ja-channel-push! 1 (seconds 0.2)) (ja-no-eval :group! sage-bluehut-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (if (dummy-45 self) + (if (process-taskable-method-45 self) (go-virtual idle) ) (suspend) @@ -322,14 +322,14 @@ ) ) (else - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (if (!= (ja-group) gp-0) (ja-channel-push! 1 (seconds 0.2)) ) (set! (-> self skel root-channel 0 frame-group) (the-as art-joint-anim gp-0)) (ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (if (dummy-45 self) + (if (process-taskable-method-45 self) (go-virtual idle) ) (suspend) @@ -345,12 +345,12 @@ ;; definition for method 11 of type sage-bluehut (defmethod init-from-entity! sage-bluehut ((obj sage-bluehut) (arg0 entity-actor)) - (dummy-40 obj arg0 *sage-bluehut-sg* 3 40 (new 'static 'vector :w 4505.6) 5) + (process-taskable-method-40 obj arg0 *sage-bluehut-sg* 3 40 (new 'static 'vector :w 4505.6) 5) (set! (-> obj tasks) (get-task-control (game-task rolling-plants))) (set! (-> obj reminder-played) #f) (set! (-> obj assistant) (entity-actor-lookup arg0 'alt-actor 0)) (set! (-> obj draw light-index) (the-as uint 1)) (set! (-> obj sound-flava) (music-flava sage)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village2/sunken-elevator_REF.gc b/test/decompiler/reference/jak1/levels/village2/sunken-elevator_REF.gc index 617e24b449..9aa1fc3485 100644 --- a/test/decompiler/reference/jak1/levels/village2/sunken-elevator_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/sunken-elevator_REF.gc @@ -193,7 +193,7 @@ ;; definition for method 27 of type sunken-elevator ;; INFO: Return type mismatch symbol vs none. -(defmethod TODO-RENAME-27 sunken-elevator ((obj sunken-elevator)) +(defmethod plat-button-method-27 sunken-elevator ((obj sunken-elevator)) (ja-channel-set! 1) (cond ((can-activate? obj) @@ -226,7 +226,7 @@ ;; definition for method 31 of type sunken-elevator ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 sunken-elevator ((obj sunken-elevator)) +(defmethod plat-button-method-31 sunken-elevator ((obj sunken-elevator)) (initialize-skeleton obj *sunken-elevator-sg* '()) 0 (none) diff --git a/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc b/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc index 97b9031fb7..df6c3ac679 100644 --- a/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/swamp-blimp_REF.gc @@ -385,7 +385,7 @@ :flag-assert #xb00000018 (:methods (init! (_type_ float float float float) none 9) - (TODO-RENAME-10 (_type_ float) none 10) + (swamp-rope-oscillator-method-10 (_type_ float) none 10) ) ) @@ -416,7 +416,7 @@ ;; definition for method 10 of type swamp-rope-oscillator ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-10 swamp-rope-oscillator ((obj swamp-rope-oscillator) (arg0 float)) +(defmethod swamp-rope-oscillator-method-10 swamp-rope-oscillator ((obj swamp-rope-oscillator) (arg0 float)) (let ((f0-3 (* (- (+ (-> obj target) arg0) (-> obj value)) (* (-> obj accel) (-> *display* time-adjust-ratio))))) (+! (-> obj vel) f0-3) ) @@ -502,7 +502,7 @@ :flag-assert #xb0000003c (:methods (init! (_type_ vector float float float) none 9) - (TODO-RENAME-10 (_type_ vector) none 10) + (swamp-blimp-oscillator-method-10 (_type_ vector) none 10) ) ) @@ -542,7 +542,7 @@ ;; definition for method 10 of type swamp-blimp-oscillator ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-10 swamp-blimp-oscillator ((obj swamp-blimp-oscillator) (arg0 vector)) +(defmethod swamp-blimp-oscillator-method-10 swamp-blimp-oscillator ((obj swamp-blimp-oscillator) (arg0 vector)) (let ((gp-0 (new 'stack-no-clear 'vector))) (cond (arg0 @@ -662,7 +662,7 @@ :size-assert #x120 :flag-assert #x1500b00120 (:methods - (dummy-20 (_type_) basic 20) + (swamp-rope-method-20 (_type_) basic 20) ) (:states swamp-rope-break @@ -692,7 +692,7 @@ ) ;; definition for method 20 of type swamp-rope -(defmethod dummy-20 swamp-rope ((obj swamp-rope)) +(defmethod swamp-rope-method-20 swamp-rope ((obj swamp-rope)) (and (-> obj other-entity) (not (task-closed? (-> obj other-entity extra perm task) (task-status need-reminder))) ) @@ -1448,7 +1448,7 @@ (defbehavior swamp-rope-trans swamp-rope () (vector<-cspace! (-> self root trans) (-> self parent-override 0 node-list data (-> self parent-rp))) (cond - ((not (dummy-20 self)) + ((not (swamp-rope-method-20 self)) (let ((gp-0 (new 'stack-no-clear 'matrix))) (quaternion->matrix gp-0 (-> self root quat)) (set! (-> self base-vec quad) (-> gp-0 vector 1 quad)) @@ -1496,7 +1496,7 @@ ) (set! (-> self frame target) (fmin 1.0 (fmax 0.0 f1-3))) ) - (TODO-RENAME-10 (-> self frame) 0.0) + (swamp-rope-oscillator-method-10 (-> self frame) 0.0) (let* ((v1-6 (-> self other-entity)) (a0-4 (if v1-6 (-> v1-6 extra process) @@ -1532,7 +1532,7 @@ (set! (-> self frame target) (- 1.0 (-> (the-as swamp-rope v1-3) scale-t))) ) ) - (TODO-RENAME-10 (-> self frame) 0.0) + (swamp-rope-oscillator-method-10 (-> self frame) 0.0) (ja :num-func num-func-identity :frame-num (* (-> self frame value) (the float (ja-num-frames 0)))) (suspend) ) @@ -1581,7 +1581,7 @@ ) (update-timer! (-> self scale-rand)) (set! (-> self scale-oscillator target) (* 0.9 (-> self scale-oscillator target))) - (TODO-RENAME-10 (-> self scale-oscillator) (-> self scale-rand value)) + (swamp-rope-oscillator-method-10 (-> self scale-oscillator) (-> self scale-rand value)) (let ((a3-0 (new 'stack-no-clear 'vector))) (set! (-> a3-0 y) (+ 1.0 (-> self scale-oscillator value))) (set! (-> a3-0 x) (sqrtf (/ 1.0 (-> a3-0 y)))) @@ -1591,9 +1591,9 @@ ) (update-timer! (-> self main-tilt-rand)) (update-timer! (-> self pos-rand)) - (TODO-RENAME-10 (-> self main-tilt-oscillator) (-> self main-tilt-rand value)) - (TODO-RENAME-10 (-> self gondola-tilt-oscillator) (the-as vector #f)) - (TODO-RENAME-10 (-> self pos-oscillator) (-> self pos-rand value)) + (swamp-blimp-oscillator-method-10 (-> self main-tilt-oscillator) (-> self main-tilt-rand value)) + (swamp-blimp-oscillator-method-10 (-> self gondola-tilt-oscillator) (the-as vector #f)) + (swamp-blimp-oscillator-method-10 (-> self pos-oscillator) (-> self pos-rand value)) (new 'stack-no-clear 'vector) (let ((gp-0 (new 'stack-no-clear 'quaternion))) (let ((s5-0 (new 'stack-no-clear 'vector))) @@ -1694,7 +1694,7 @@ (-> self root-override trans) ) ) - ((dummy-20 (the-as swamp-rope s4-0)) + ((swamp-rope-method-20 (the-as swamp-rope s4-0)) (vector+! (the-as vector (-> self pos-oscillator)) (the-as vector (-> self pos-oscillator)) diff --git a/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc b/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc index beaf55ae95..86f15c94ea 100644 --- a/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/village2-obs_REF.gc @@ -173,7 +173,7 @@ (the-as object (cond ((= v1-0 'die) (cleanup-for-death self) - (deactivate self) + (the-as vector (deactivate self)) ) (else (rigid-body-platform-event-handler proc arg1 event-type event) @@ -191,7 +191,7 @@ (the-as object (case event-type (('die) (cleanup-for-death self) - (deactivate self) + (the-as symbol (deactivate self)) ) ) ) @@ -202,9 +202,9 @@ ;; INFO: Return type mismatch int vs none. (defmethod init-from-entity! pontoon ((obj pontoon) (arg0 entity-actor)) (set! (-> obj mask) (logior (process-mask platform) (-> obj mask))) - (TODO-RENAME-30 obj) + (rigid-body-platform-method-30 obj) (process-drawable-from-entity! obj arg0) - (TODO-RENAME-31 obj) + (rigid-body-platform-method-31 obj) (set! (-> obj water-anim) #f) (set! (-> obj root-overlay pause-adjust-distance) -122880.0) (set! (-> obj task) (the-as uint (-> arg0 extra perm task))) @@ -231,9 +231,9 @@ ;; definition for method 23 of type pontoon ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-23 pontoon ((obj pontoon) (arg0 float)) +(defmethod rigid-body-platform-method-23 pontoon ((obj pontoon) (arg0 float)) ((the-as (function rigid-body-platform basic none) (find-parent-method pontoon 23)) obj (the-as basic arg0)) - (TODO-RENAME-27 obj (-> obj anchor-point)) + (rigid-body-platform-method-27 obj (-> obj anchor-point)) 0 (none) ) @@ -342,7 +342,7 @@ ;; definition for method 30 of type pontoonfive ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-30 pontoonfive ((obj pontoonfive)) +(defmethod rigid-body-platform-method-30 pontoonfive ((obj pontoonfive)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -370,9 +370,9 @@ ;; definition for method 31 of type pontoonfive ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 pontoonfive ((obj pontoonfive)) +(defmethod rigid-body-platform-method-31 pontoonfive ((obj pontoonfive)) (initialize-skeleton obj *pontoonfive-sg* '()) - (TODO-RENAME-29 obj *pontoonfive-constants*) + (rigid-body-platform-method-29 obj *pontoonfive-constants*) (set! (-> obj float-height-offset) 6144.0) (set! (-> obj root-overlay nav-radius) 12288.0) (let ((v1-6 (-> obj control-point-array data))) @@ -407,7 +407,7 @@ ;; definition for method 30 of type pontoonten ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-30 pontoonten ((obj pontoonten)) +(defmethod rigid-body-platform-method-30 pontoonten ((obj pontoonten)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -435,9 +435,9 @@ ;; definition for method 31 of type pontoonten ;; INFO: Used lq/sq ;; INFO: Return type mismatch int vs none. -(defmethod TODO-RENAME-31 pontoonten ((obj pontoonten)) +(defmethod rigid-body-platform-method-31 pontoonten ((obj pontoonten)) (initialize-skeleton obj *pontoonten-sg* '()) - (TODO-RENAME-29 obj *pontoonten-constants*) + (rigid-body-platform-method-29 obj *pontoonten-constants*) (set! (-> obj float-height-offset) 6144.0) (set! (-> obj root-overlay nav-radius) 20480.0) (let ((v1-6 (-> obj control-point-array data))) @@ -570,7 +570,7 @@ (the-as object (case event-type (('end-mode) (cleanup-for-death self) - (deactivate self) + (the-as symbol (deactivate self)) ) ) ) @@ -1786,8 +1786,8 @@ ;; definition for method 22 of type villageb-water ;; INFO: Return type mismatch ripple-wave-set vs none. -(defmethod TODO-RENAME-22 villageb-water ((obj villageb-water)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 villageb-water ((obj villageb-water)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) diff --git a/test/decompiler/reference/jak1/levels/village2/warrior_REF.gc b/test/decompiler/reference/jak1/levels/village2/warrior_REF.gc index 038c5c112b..335a7c02a8 100644 --- a/test/decompiler/reference/jak1/levels/village2/warrior_REF.gc +++ b/test/decompiler/reference/jak1/levels/village2/warrior_REF.gc @@ -29,7 +29,7 @@ ;; definition for method 52 of type warrior ;; INFO: Return type mismatch int vs none. -(defmethod dummy-52 warrior ((obj warrior)) +(defmethod process-taskable-method-52 warrior ((obj warrior)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -169,8 +169,8 @@ ) ;; definition for method 43 of type warrior -(defmethod TODO-RENAME-43 warrior ((obj warrior)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 2) 61440.0 obj) +(defmethod process-taskable-method-43 warrior ((obj warrior)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 2) 61440.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.66 f0-2) @@ -225,10 +225,10 @@ ;; definition for method 11 of type warrior (defmethod init-from-entity! warrior ((obj warrior) (arg0 entity-actor)) - (dummy-40 obj arg0 *warrior-sg* 3 33 (new 'static 'vector :y -4096.0 :w 10240.0) 5) + (process-taskable-method-40 obj arg0 *warrior-sg* 3 33 (new 'static 'vector :y -4096.0 :w 10240.0) 5) (set! (-> obj tasks) (get-task-control (game-task village2-warrior-money))) (set! (-> obj sound-flava) (music-flava warrior)) (set! (-> obj draw light-index) (the-as uint 3)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village3/assistant-village3_REF.gc b/test/decompiler/reference/jak1/levels/village3/assistant-village3_REF.gc index 8130d49a5a..5ef8def057 100644 --- a/test/decompiler/reference/jak1/levels/village3/assistant-village3_REF.gc +++ b/test/decompiler/reference/jak1/levels/village3/assistant-village3_REF.gc @@ -29,7 +29,7 @@ ;; definition for method 52 of type assistant-villagec ;; INFO: Return type mismatch int vs none. -(defmethod dummy-52 assistant-villagec ((obj assistant-villagec)) +(defmethod process-taskable-method-52 assistant-villagec ((obj assistant-villagec)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -107,8 +107,8 @@ ) ;; definition for method 43 of type assistant-villagec -(defmethod TODO-RENAME-43 assistant-villagec ((obj assistant-villagec)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 assistant-villagec ((obj assistant-villagec)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.85714287 f0-2) @@ -157,7 +157,7 @@ (ja-channel-push! 1 (seconds 0.05)) ) (loop - (TODO-RENAME-43 self) + (process-taskable-method-43 self) (ja-no-eval :group! assistant-village3-idle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) (suspend) @@ -197,8 +197,8 @@ ;; definition for method 11 of type assistant-villagec (defmethod init-from-entity! assistant-villagec ((obj assistant-villagec) (arg0 entity-actor)) - (dummy-40 obj arg0 *assistant-village3-sg* 3 31 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *assistant-village3-sg* 3 31 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task assistant-village3))) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village3/miners_REF.gc b/test/decompiler/reference/jak1/levels/village3/miners_REF.gc index a422533c26..37cad60fe7 100644 --- a/test/decompiler/reference/jak1/levels/village3/miners_REF.gc +++ b/test/decompiler/reference/jak1/levels/village3/miners_REF.gc @@ -15,7 +15,7 @@ (suspend) (ja :num! (loop! 2.0)) (if (= (-> self next-state name) 'idle) - (TODO-RENAME-43 self) + (process-taskable-method-43 self) ) ) (the-as none 0) @@ -48,7 +48,7 @@ ;; definition for method 52 of type minertall ;; INFO: Return type mismatch shadow-flags vs none. -(defmethod dummy-52 minertall ((obj minertall)) +(defmethod process-taskable-method-52 minertall ((obj minertall)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -125,10 +125,10 @@ ;; definition for method 11 of type minertall (defmethod init-from-entity! minertall ((obj minertall) (arg0 entity-actor)) - (dummy-40 obj arg0 *minertall-sg* 32 47 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *minertall-sg* 32 47 (new 'static 'vector :w 4096.0) 5) (set! (-> obj tasks) (get-task-control (game-task village3-miner-money1))) (set! (-> obj draw light-index) (the-as uint 1)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) @@ -245,7 +245,7 @@ ;; definition for method 52 of type minershort ;; INFO: Return type mismatch shadow-flags vs none. -(defmethod dummy-52 minershort ((obj minershort)) +(defmethod process-taskable-method-52 minershort ((obj minershort)) (let ((v1-1 (-> obj draw shadow-ctrl))) (when v1-1 (let ((f0-0 (-> obj root-override trans y))) @@ -504,8 +504,8 @@ ) ;; definition for method 43 of type minershort -(defmethod TODO-RENAME-43 minershort ((obj minershort)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 minershort ((obj minershort)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.9655172 f0-2) @@ -608,14 +608,14 @@ ;; definition for method 11 of type minershort (defmethod init-from-entity! minershort ((obj minershort) (arg0 entity-actor)) - (dummy-40 obj arg0 *minershort-sg* 34 46 (new 'static 'vector :w 4096.0) 5) + (process-taskable-method-40 obj arg0 *minershort-sg* 34 46 (new 'static 'vector :w 4096.0) 5) (set! (-> obj part) (create-launch-control (-> *part-group-id-table* 566) obj)) (set! (-> obj tasks) (get-task-control (game-task village3-miner-money1))) (set! (-> obj other-miner) (the-as minertall (entity-actor-lookup arg0 'alt-actor 0))) (set! (-> obj cur-trans-hook) minershort-trans-hook) (set! (-> obj sound-flava) (music-flava miners)) (set! (-> obj draw light-index) (the-as uint 1)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village3/sage-village3_REF.gc b/test/decompiler/reference/jak1/levels/village3/sage-village3_REF.gc index 28d692f156..b6cf2fbdad 100644 --- a/test/decompiler/reference/jak1/levels/village3/sage-village3_REF.gc +++ b/test/decompiler/reference/jak1/levels/village3/sage-village3_REF.gc @@ -204,8 +204,8 @@ ) ;; definition for method 43 of type sage-villagec -(defmethod TODO-RENAME-43 sage-villagec ((obj sage-villagec)) - (when (TODO-RENAME-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) +(defmethod process-taskable-method-43 sage-villagec ((obj sage-villagec)) + (when (ambient-control-method-10 (-> obj ambient) (new 'stack-no-clear 'vector) (seconds 30) 122880.0 obj) (let ((f0-2 (rand-float-gen))) (cond ((< 0.875 f0-2) @@ -282,11 +282,11 @@ (defmethod should-display? sage-villagec ((obj sage-villagec)) (cond ((not (closed? (-> obj tasks) (game-task village3-button) (task-status need-hint))) - (dummy-33 obj) + (process-taskable-method-33 obj) #f ) ((sages-kidnapped?) - (dummy-33 obj) + (process-taskable-method-33 obj) #f ) (else @@ -323,12 +323,12 @@ ;; definition for method 11 of type sage-villagec (defmethod init-from-entity! sage-villagec ((obj sage-villagec) (arg0 entity-actor)) - (dummy-40 obj arg0 *sage-village3-sg* 3 40 (new 'static 'vector :w 8192.0) 5) + (process-taskable-method-40 obj arg0 *sage-village3-sg* 3 40 (new 'static 'vector :w 8192.0) 5) (set! (-> obj tasks) (get-task-control (game-task cave-dark-crystals))) (set! (-> obj assistant) (entity-actor-lookup arg0 'alt-actor 0)) (set! (-> obj evilbro) (the-as handle #f)) (set! (-> obj evilsis) (the-as handle #f)) (set! (-> obj sound-flava) (music-flava sage)) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc b/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc index f38feacc36..ab30253d8e 100644 --- a/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc @@ -69,8 +69,8 @@ ;; definition for method 22 of type villagec-lava ;; INFO: Return type mismatch symbol vs none. -(defmethod TODO-RENAME-22 villagec-lava ((obj villagec-lava)) - (let ((t9-0 (method-of-type water-anim TODO-RENAME-22))) +(defmethod water-vol-method-22 villagec-lava ((obj villagec-lava)) + (let ((t9-0 (method-of-type water-anim water-vol-method-22))) (t9-0 obj) ) (let ((v1-2 (new 'process 'ripple-control))) diff --git a/test/decompiler/reference/jak1/levels/village_common/oracle_REF.gc b/test/decompiler/reference/jak1/levels/village_common/oracle_REF.gc index 8340be2b8e..249be97d88 100644 --- a/test/decompiler/reference/jak1/levels/village_common/oracle_REF.gc +++ b/test/decompiler/reference/jak1/levels/village_common/oracle_REF.gc @@ -249,7 +249,7 @@ ;; definition for method 11 of type oracle (defmethod init-from-entity! oracle ((obj oracle) (arg0 entity-actor)) - (dummy-40 obj arg0 *oracle-sg* 3 4 (new 'static 'vector :y -4096.0 :w 4096.0) -1) + (process-taskable-method-40 obj arg0 *oracle-sg* 3 4 (new 'static 'vector :y -4096.0 :w 4096.0) -1) (set! (-> obj sound) (new 'process 'ambient-sound (static-sound-spec "oracle-sleep" :fo-max 50) (-> obj root-override trans)) ) @@ -314,6 +314,6 @@ (send-event (handle->process (-> obj left-eye-cell)) 'trans-hook s5-1) ) ) - (dummy-42 obj) + (process-taskable-method-42 obj) (none) ) diff --git a/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc b/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc index 45f62cce0b..d4ce4192ca 100644 --- a/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc @@ -514,7 +514,7 @@ ) ;; definition for method 27 of type warp-gate-switch -(defmethod TODO-RENAME-27 warp-gate-switch ((obj warp-gate-switch)) +(defmethod basebutton-method-27 warp-gate-switch ((obj warp-gate-switch)) (let ((s5-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player)))) (set! (-> s5-0 dynam) (copy *standard-dynamics* 'process)) (set! (-> s5-0 reaction) default-collision-reaction) @@ -581,7 +581,7 @@ ) ;; definition for method 26 of type warp-gate-switch -(defmethod TODO-RENAME-26 warp-gate-switch ((obj warp-gate-switch)) +(defmethod basebutton-method-26 warp-gate-switch ((obj warp-gate-switch)) (set! (-> obj warp) (the-as handle #f)) (let ((v1-2 (-> obj entity extra perm task))) (cond @@ -684,7 +684,7 @@ (case event-type (('touch 'attack) (when (pressable? self) - (TODO-RENAME-29 self (-> self event-going-down) (-> self notify-actor)) + (basebutton-method-29 self (-> self event-going-down) (-> self notify-actor)) (go-virtual basebutton-going-down) ) )