diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2024-01-21 06:01:53 +0000 |
|---|---|---|
| committer | Garrett Cox <garrettjcox@gmail.com> | 2024-05-22 09:04:58 -0500 |
| commit | 508f8378ded6ec33ee48073e7f2af6cf5e00a9a6 (patch) | |
| tree | 48840209dfd5d1c644170db3e75b77bcd2ffce1c /mm/src/code | |
| parent | b341e7bab015d9e3f54bb3a8cc645bc08979a241 (diff) | |
Better map select (#85)
* Add human readable name and entrance scene ID to scene table
* Add better map select
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_parameter.c | 2 | ||||
| -rw-r--r-- | mm/src/code/z_scene_table.c | 2 | ||||
| -rw-r--r-- | mm/src/code/z_sram_NES.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mm/src/code/z_parameter.c b/mm/src/code/z_parameter.c index 590a6bcdf..ee40cc0ec 100644 --- a/mm/src/code/z_parameter.c +++ b/mm/src/code/z_parameter.c @@ -127,7 +127,7 @@ Input sPostmanTimerInput[MAXCONTROLLERS]; #define RESTRICTIONS_MOON RESTRICTIONS_SET(0, 0, 0, 0, 0, 3, 3, 3, 0, 0, 0, 0) #define RESTRICTIONS_NO_DOUBLE_TIME RESTRICTIONS_SET(0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0) -#define DEFINE_SCENE(_name, enumValue, _textId, _drawConfig, restrictionFlags, _persistentCycleFlags) \ +#define DEFINE_SCENE(_name, enumValue, _textId, _drawConfig, restrictionFlags, _persistentCycleFlags, _entranceSceneId, _humanName) \ { enumValue, restrictionFlags }, #define DEFINE_SCENE_UNSET(enumValue) { enumValue, RESTRICTIONS_NONE }, diff --git a/mm/src/code/z_scene_table.c b/mm/src/code/z_scene_table.c index 33f6e862a..0d37621df 100644 --- a/mm/src/code/z_scene_table.c +++ b/mm/src/code/z_scene_table.c @@ -13,7 +13,7 @@ #endif -#define DEFINE_SCENE(name, _enumValue, textId, drawConfig, _restrictionFlags, _persistentCycleFlags) \ +#define DEFINE_SCENE(name, _enumValue, textId, drawConfig, _restrictionFlags, _persistentCycleFlags, _entranceSceneId, _humanName) \ { { 0, 0, #name }, textId, 0, drawConfig, 0, 0 }, #define DEFINE_SCENE_UNSET(_enumValue) { 0 }, diff --git a/mm/src/code/z_sram_NES.c b/mm/src/code/z_sram_NES.c index 4e2cae8ac..ec24524a5 100644 --- a/mm/src/code/z_sram_NES.c +++ b/mm/src/code/z_sram_NES.c @@ -22,7 +22,7 @@ typedef struct PersistentCycleSceneFlags { #define PERSISTENT_CYCLE_FLAGS_SET(switch0, switch1, chest, collectible) { switch0, switch1, chest, collectible }, #define PERSISTENT_CYCLE_FLAGS_NONE PERSISTENT_CYCLE_FLAGS_SET(0, 0, 0, 0) -#define DEFINE_SCENE(_name, _enumValue, _textId, _drawConfig, _restrictionFlags, persistentCycleFlags) \ +#define DEFINE_SCENE(_name, _enumValue, _textId, _drawConfig, _restrictionFlags, persistentCycleFlags, _entranceSceneId, _humanName) \ persistentCycleFlags #define DEFINE_SCENE_UNSET(_enumValue) PERSISTENT_CYCLE_FLAGS_NONE |