Added global force parameter (thx cozies)

This commit is contained in:
Reonu
2021-08-02 17:44:03 +01:00
parent cc3ecd1939
commit 179fc3196b
4 changed files with 41 additions and 0 deletions

View File

@@ -107,6 +107,8 @@
#define MODEL_ID_COUNT 256
// Increase audio heap size to allow for more concurrent notes to be played and for more custom sequences/banks to be imported (does nothing with EU and SH versions)
#define EXPAND_AUDIO_HEAP
// Allow all surfaces types to have force, (doesn't require setting force, just allows it to be optional).
#define ALL_SURFACES_HAVE_FORCE
// BUG/GAME QOL FIXES
// Fix instant warp offset not working when warping across different areas

View File

@@ -1,6 +1,8 @@
#ifndef SURFACE_TERRAINS_H
#define SURFACE_TERRAINS_H
#include "config.h"
// Surface Types
#define SURFACE_DEFAULT 0x0000 // Environment default
#define SURFACE_BURNING 0x0001 // Lava / Frostbite (in SL), but is used mostly for Lava
@@ -202,7 +204,11 @@
#define COL_TRI_INIT(surfType, triNum) surfType, triNum
// Collision Tri
#ifdef ALL_SURFACES_HAVE_FORCE
#define COL_TRI(v1, v2, v3) v1, v2, v3, 0
#else
#define COL_TRI(v1, v2, v3) v1, v2, v3
#endif
// Collision Tri With Special Params
#define COL_TRI_SPECIAL(v1, v2, v3, param) v1, v2, v3, param