Code

Merge upstream#4

Code

Open

MainMemory wants to merge 73 commits intoflamewing:masterflamewing/flamedriver-skdisasm:masterfrom MainMemory:merge-upstreamMainMemory/skdisasm:merge-upstreamCopy head branch name to clipboard

+14,692-14,612

Commits

Commits on Feb 4, 2021

• Minor renaming of some terrain collision functions

  Show description for 4b5e25d
  flamewing

  committed
  4b5e25d

• OOps, forgot to include this

  flamewing

  committed
  7ad1bfd

Commits on Apr 25, 2021

• Correct some sound driver constants

  Show description for 66bb703
  Clownacy

  committed
  66bb703

• Document a buggy FM volume envelope

  Clownacy

  committed
  b166513

• Deobfuscate the modulation envelopes

  Clownacy

  committed
  75cec47

Commits on Apr 26, 2021

• Add a driver bugfix and some optimisations

  Clownacy

  committed
  dd8209a

Commits on May 17, 2021

• Correct a comment about the PSG frequency table

  Clownacy

  committed
  72cf5ac

• Document a quirk of the FM frequency table

  Clownacy

  committed
  984dadb

• Add another sound driver optimisation

  Clownacy

  committed
  4ae20b5

Commits on May 29, 2021

• identified some lap count addresses used in competition mode

  

  vinegar97

  authored and

  flamewing

  committed
  2b03313

• updated address names for Sonic 3 solo, too

  

  vinegar97

  authored and

  flamewing

  committed
  909df6f

• identified addresses to control peppermint and goal sprite animations

  

  vinegar97

  authored and

  flamewing

  committed
  b4388b5

• identified various addresses related to competition mode

  

  vinegar97

  authored and

  flamewing

  committed
  1906c75

• typos fixed

  

  vinegar97

  authored and

  flamewing

  committed
  73ade0a

• fixed another typo in address name

  

  vinegar97

  authored and

  flamewing

  committed
  d982b42

Commits on May 30, 2021

• AS 1.42 build 136 changed phase/dephase

  Show description for 46ee64a
  flamewing

  committed
  46ee64a

• Updating AS

  Show description for 547d615
  flamewing

  committed
  547d615

Commits on Jun 4, 2021

• identified some Tails AI-related addresses

  

  vinegar97

  authored and

  flamewing

  committed
  144cc9e

• identified addresses used for Mecha Sonic's Metropolis Zone boss in Sky Sanctuary

  

  vinegar97

  authored and

  flamewing

  committed
  55b5c75

Commits on Jun 5, 2021

• Documenting a function from S2

  flamewing

  committed
  691d4f2

Commits on Oct 16, 2021

• Update accurate-kosinski and clownlzss

  Show description for 29391b6
  Clownacy

  committed
  29391b6

Commits on Oct 17, 2021

• Recompile the 64-bit Linux s3p2bin

  Show description for c4e56ac
  Clownacy

  committed
  c4e56ac

• Remove a leftover debug print in the build script

  Show description for 9ceb3eb
  Clownacy

  committed
  9ceb3eb

Commits on Nov 10, 2021

• Update SonLVL definitions

  

  liliambean

  authored and

  flamewing

  committed
  3ec137a

• Update split files

  

  liliambean

  authored and

  flamewing

  committed
  d6a2818

• Split Mecha Sonic palettes and fix SonLVL project

  

  liliambean

  authored and

  flamewing

  committed
  fb571a5

• Identify unknown palettes

  

  liliambean

  authored and

  flamewing

  committed
  50f8565

• Split a few more unused palettes

  

  liliambean

  authored and

  flamewing

  committed
  2bfbd08

• Split special stage plane mappings

  

  liliambean

  authored and

  flamewing

  committed
  0dffff1

• Split even more stuff

  

  liliambean

  authored and

  flamewing

  committed
  3ec8901

• Rename a couple of files

  

  liliambean

  authored and

  flamewing

  committed
  fa3f17b

• Rename a few labels

  

  liliambean

  authored and

  flamewing

  committed
  019320b

• Document a few subroutines and constants

  

  liliambean

  authored and

  flamewing

  committed
  fcd8be1

• Fix a bunch of disassembly burps

  

  liliambean

  authored and

  flamewing

  committed
  0589f93

• Convert a few integer constants to decimal where it's more readable

  

  liliambean

  authored and

  flamewing

  committed
  a32d692

• Convert bitwise constants from unsigned to unsigned

  

  liliambean

  authored and

  flamewing

  committed
  218ec45

• Convert a few more constants to unsigned where it seems reasonable

  

  liliambean

  authored and

  flamewing

  committed
  a51f451

• Finally fix AIZ1 water BG deformation after breaking it in 127fb71

  

  liliambean

  authored and

  flamewing

  committed
  6a7044a

Commits on Jan 1, 2022

• Did we really need to repeat this stupid message everywhere? Uh... no

  

  liliambean

  authored and

  flamewing

  committed
  02aed46

• Fix up a bunch of constants

  

  liliambean

  authored and

  flamewing

  committed
  f84877c

• Rename shield labels

  

  liliambean

  authored and

  flamewing

  committed
  fc967dc

• Move a bunch of files

  

  liliambean

  authored and

  flamewing

  committed
  e3956ef

• Clean up direct addressing of KosM modules (where possible)

  

  liliambean

  authored and

  flamewing

  committed
  13b0ec6

• Format ending data

  

  liliambean

  authored and

  flamewing

  committed
  025574a

• Label player object base routines

  

  liliambean

  authored and

  flamewing

  committed
  a0afc9b

• Fix up a couple of labels

  

  liliambean

  authored and

  flamewing

  committed
  b2e3813

• Rename Play_Sound subroutines

  

  liliambean

  authored and

  flamewing

  committed
  f287a03

• Normalize names of S3 enemies

  

  liliambean

  authored and

  flamewing

  committed
  25b5dd8

• Normalize labels of layout objects

  

  liliambean

  authored and

  flamewing

  committed
  47fe88a

• Label a couple more things

  

  liliambean

  authored and

  flamewing

  committed
  3949ad1

• Clean up unused/dead code comments

  

  liliambean

  authored and

  flamewing

  committed
  3338ad1

• Format screen event arrays

  

  liliambean

  authored and

  flamewing

  committed
  c7e3edf

• Format macros

  

  liliambean

  authored and

  flamewing

  committed
  6e52184

• Format data

  

  liliambean

  authored and

  flamewing

  committed
  fcabb6e

• Format raw animations

  

  liliambean

  authored and

  flamewing

  committed
  a65b0f4

• Format lock-on pointers

  

  liliambean

  authored and

  flamewing

  committed
  c7f2188

• More formatting

  

  liliambean

  authored and

  flamewing

  committed
  d44e5eb

Commits on Jan 17, 2022

• Labeled RAM address for updating player 2's timer in competition mode

  

  vinegar97

  authored and

  flamewing

  committed
  b423c1f

• Give PLC pointer lists some more individually identifiable labels

  

  vinegar97

  authored and

  flamewing

  committed
  7cd4ccb

• Labeled and commented on PLC for Super Sonic's unused idle frame

  

  vinegar97

  authored and

  flamewing

  committed
  ded21e3

• Labeled Knuckles' glide turn and ledge climb animations

  

  vinegar97

  authored and

  flamewing

  committed
  3aee50b

Commits on Feb 15, 2022

• Report correct ROM size in Sonic3_Complete mode.

  MainMemory

  committed
  e34b46b

Commits on Feb 22, 2022

• Fix more constant crap

  

  liliambean

  authored and

  flamewing

  committed
  788e35c

• Add VRAM constants for explosion/star post

  

  liliambean

  authored and

  flamewing

  committed
  7b5416d

• Rename player DPLC files

  

  liliambean

  authored and

  flamewing

  committed
  e242ab1

• Rename S2 shield files

  

  liliambean

  authored and

  flamewing

  committed
  c3c3803

• Rename air countdown files/labels

  

  liliambean

  authored and

  flamewing

  committed
  5ca410c

• Sprite_CheckDeleteTouch3

  

  liliambean

  authored and

  flamewing

  committed
  d7757f3

• Fix up formatting flubs introduced through find/replace

  

  liliambean

  authored and

  flamewing

  committed
  5f13fa5

Commits on May 9, 2022

• Explain the purpose of some code in s3p2bin

  Clownacy

  committed
  36a256b

• Document Knuckles' gliding and wall-climbing code

  Show description for dc3b0db
  Clownacy

  committed
  dc3b0db

Commits on Jun 21, 2022

• Apply dmaFillVRAM macro to some code.

  Clownacy

  committed
  646e49b

Commits on Jul 30, 2022

• Merge branch 'master' of https://github.com/sonicretro/skdisasm into merge-upstream

  Show description for 522350b
  MainMemory

  committed
  522350b