Code

Next PSP DRA file code-share#2274

Code

Merged

bismurphy merged 42 commits intoXeeynamo:masterXeeynamo/sotn-decomp:masterfrom bismurphy:next_psp_filebismurphy/sotn-decomp:next_psp_fileCopy head branch name to clipboardMar 2, 2025

+833-979

Commits

Commits on Feb 19, 2025

• 8011e4bc

  bismurphy

  committed
  61a2016

  Copy full SHA for 61a2016

• 8011eda8

  bismurphy

  committed
  edc4615

  Copy full SHA for edc4615

• finish current psp file

  bismurphy

  committed
  aa893cc

  Copy full SHA for aa893cc

• Unsplit psp file

  bismurphy

  committed
  e60de14

  Copy full SHA for e60de14

• Unsplit psp file

  bismurphy

  committed
  d110e87

  Copy full SHA for d110e87

• hit by ice

  bismurphy

  committed
  1568819

  Copy full SHA for 1568819

• transparentwhitecircle

  bismurphy

  committed
  6c9d615

  Copy full SHA for 6c9d615

• unsplit psp file for pink effect

  bismurphy

  committed
  1e93478

  Copy full SHA for 1e93478

• pink effect

  bismurphy

  committed
  3345639

  Copy full SHA for 3345639

• more unsplitting

  bismurphy

  committed
  3d6448f

  Copy full SHA for 3d6448f

Commits on Feb 20, 2025

• player dissolves

  bismurphy

  committed
  4baf111

  Copy full SHA for 4baf111

• levelupanimation

  bismurphy

  committed
  9bd7e18

  Copy full SHA for 9bd7e18

• 80121f14

  bismurphy

  committed
  4c84339

  Copy full SHA for 4c84339

• 80121F58

  bismurphy

  committed
  5229536

  Copy full SHA for 5229536

• entitymist

  bismurphy

  committed
  95ca925

  Copy full SHA for 95ca925

• next psp unsplit

  bismurphy

  committed
  b4bb4e2

  Copy full SHA for b4bb4e2

• ent48

  bismurphy

  committed
  57152a4

  Copy full SHA for 57152a4

Commits on Feb 21, 2025

• ent49

  bismurphy

  committed
  0dc7312

  Copy full SHA for 0dc7312

• another psp file unsplit

  bismurphy

  committed
  5cdef59

  Copy full SHA for 5cdef59

• 80123A60

  bismurphy

  committed
  b3d6a14

  Copy full SHA for b3d6a14

• 80123B40

  bismurphy

  committed
  652a8ad

  Copy full SHA for 652a8ad

• single func psp unsplit

  bismurphy

  committed
  c313561

  Copy full SHA for c313561

• 80123F78

  bismurphy

  committed
  fb8c7bd

  Copy full SHA for fb8c7bd

• move one function over to align files

  bismurphy

  committed
  36fb5bb

  Copy full SHA for 36fb5bb

• 80124164 reworked, needs more for psp

  bismurphy

  committed
  3ffe09b

  Copy full SHA for 3ffe09b

Commits on Feb 28, 2025

• Split out scaling vars to match psp

  bismurphy

  committed
  ad78956

  Copy full SHA for ad78956

• PSP for 80124164

  bismurphy

  committed
  2f2b90b

  Copy full SHA for 2f2b90b

• Unsplit US

  bismurphy

  committed
  c9e60a9

  Copy full SHA for c9e60a9

• Unsplit PSP to match

  bismurphy

  committed
  dcfe9b6

  Copy full SHA for dcfe9b6

Commits on Mar 1, 2025

• entityteleport

  bismurphy

  committed
  25c2a81

  Copy full SHA for 25c2a81

• psp pull in data

  bismurphy

  committed
  bd4a033

  Copy full SHA for bd4a033

• resolve first few diffs

  bismurphy

  committed
  0558dc9

  Copy full SHA for 0558dc9

• resolve all diffs

  bismurphy

  committed
  d9c0e72

  Copy full SHA for d9c0e72

• full codeshare

  bismurphy

  committed
  03013a0

  Copy full SHA for 03013a0

• format

  bismurphy

  committed
  5416dfa

  Copy full SHA for 5416dfa

• Merge branch 'master' into next_psp_file

  bismurphy

  authored
  563dbd1

  Copy full SHA for 563dbd1

• delete psp file

  bismurphy

  committed
  3870b98

  Copy full SHA for 3870b98

• remove eliminated file from cmakelists

  bismurphy

  committed
  b8073a0

  Copy full SHA for b8073a0

• fix hd

  bismurphy

  committed
  48cdad7

  Copy full SHA for 48cdad7

• FIX macros

  bismurphy

  committed
  263080b

  Copy full SHA for 263080b

• PAL

  bismurphy

  committed
  fc01fe7

  Copy full SHA for fc01fe7

• Adjust player steps

  bismurphy

  committed
  ca62c04

  Copy full SHA for ca62c04