Add OBJ_LIST_EXT in place of OBJ_LIST_UNUSED_1

This commit is contained in:
Agent X 2024-03-04 20:09:53 -05:00
parent 55fe506b82
commit 9870e18bf5
6 changed files with 6 additions and 5 deletions

View File

@ -7676,7 +7676,7 @@ TIME_STOP_UNKNOWN_0 = (1 << 0)
OBJ_LIST_PLAYER = 0
--- @type ObjectList
OBJ_LIST_UNUSED_1 = 1
OBJ_LIST_EXT = 1
--- @type ObjectList
OBJ_LIST_DESTRUCTIVE = 2

View File

@ -168,7 +168,7 @@ s64 DynOS_Bhv_ParseBehaviorIntegerScriptConstants(const String &_Arg, bool *foun
// Object List Types
bhv_constant(OBJ_LIST_PLAYER);
bhv_constant(OBJ_LIST_UNUSED_1);
bhv_constant(OBJ_LIST_EXT);
bhv_constant(OBJ_LIST_DESTRUCTIVE);
bhv_constant(OBJ_LIST_UNUSED_3);
bhv_constant(OBJ_LIST_GENACTOR);

View File

@ -2743,7 +2743,7 @@
| Identifier | Value |
| :--------- | :---- |
| OBJ_LIST_PLAYER | 0 |
| OBJ_LIST_UNUSED_1 | 1 |
| OBJ_LIST_EXT | 1 |
| OBJ_LIST_DESTRUCTIVE | 2 |
| OBJ_LIST_UNUSED_3 | 3 |
| OBJ_LIST_GENACTOR | 4 |

View File

@ -180,6 +180,7 @@ s8 sObjectListUpdateOrder[] = { OBJ_LIST_SPAWNER,
OBJ_LIST_LEVEL,
OBJ_LIST_DEFAULT,
OBJ_LIST_UNIMPORTANT,
OBJ_LIST_EXT,
-1 };
/**

View File

@ -32,7 +32,7 @@
enum ObjectList
{
OBJ_LIST_PLAYER, // (0) Mario
OBJ_LIST_UNUSED_1, // (1) (unused)
OBJ_LIST_EXT, // (1) extra object list for Lua mods to use
OBJ_LIST_DESTRUCTIVE, // (2) things that can be used to destroy other objects, like
// bob-ombs and corkboxes
OBJ_LIST_UNUSED_3, // (3) (unused)

View File

@ -2763,7 +2763,7 @@ char gSmluaConstants[] = ""
"TIME_STOP_ACTIVE = (1 << 6)\n"
"OBJECT_POOL_CAPACITY = 1200\n"
"OBJ_LIST_PLAYER = 0\n"
"OBJ_LIST_UNUSED_1 = 1\n"
"OBJ_LIST_EXT = 1\n"
"OBJ_LIST_DESTRUCTIVE = 2\n"
"OBJ_LIST_UNUSED_3 = 3\n"
"OBJ_LIST_GENACTOR = 4\n"