diff options
| author | Henny022p <info@henny022.de> | 2022-02-10 01:29:15 +0100 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2022-02-10 01:29:15 +0100 |
| commit | d64fea8164f590e85d6468e661843320702ac4c5 (patch) | |
| tree | f45d84cbcda1cb199614054e2a0800008e4acf3e /include/droptables.h | |
| parent | 5145c4776d656a49e69298dc47366f26db2d3350 (diff) | |
moved gCurrentAreaDroptable into gRoomVars properly
also rename globals
Diffstat (limited to 'include/droptables.h')
| -rw-r--r-- | include/droptables.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/droptables.h b/include/droptables.h index b659e18e..f05ae94e 100644 --- a/include/droptables.h +++ b/include/droptables.h @@ -24,14 +24,15 @@ typedef union { } Droptable; static_assert(sizeof(Droptable) == 0x20); -extern const Droptable gDroptablesEnemies[]; -extern const Droptable gDroptablesAreas[]; -extern const Droptable gDroptablesObjects[]; +extern const Droptable gEnemyDroptables[]; +extern const Droptable gAreaDroptables[]; +extern const Droptable gObjectDroptables[]; extern const Droptable gUnk_0800191C[]; -extern const Droptable gDroptablesModifiers[]; - -#define gDroptableModifierNone gDroptablesModifiers[0] -#define gDroptableModifierNoShells gDroptablesModifiers[1] -#define gDroptableModifierNoKinstones gDroptablesModifiers[2] +enum { + DROPTABLE_NONE, + DROPTABLE_NO_SHELLS, + DROPTABLE_NO_KINSTONES, +}; +extern const Droptable gDroptableModifiers[]; #endif // TMC_DROPTABLES_H |