Merge remote-tracking branch 'thecozies/water-surface-type'

This commit is contained in:
Reonu
2021-04-27 11:52:36 +01:00
16 changed files with 348 additions and 47 deletions

View File

@@ -14,6 +14,7 @@
* linker script syntax.
*/
#define USE_EXT_RAM
#ifndef USE_EXT_RAM
#define RAM_END 0x80400000
#else

View File

@@ -4,6 +4,8 @@
// Surface Types
#define SURFACE_DEFAULT 0x0000 // Environment default
#define SURFACE_BURNING 0x0001 // Lava / Frostbite (in SL), but is used mostly for Lava
#define SURFACE_NEW_WATER 0x0002 // Custom water surface
#define SURFACE_NEW_WATER_BOTTOM 0x0003 // Custom water surface bottom marker
#define SURFACE_0004 0x0004 // Unused, has no function and has parameters
#define SURFACE_HANGABLE 0x0005 // Ceiling that Mario can climb on
#define SURFACE_SLOW 0x0009 // Slow down Mario, unused