All global state coming from g_state now

This commit is contained in:
jaburns
2020-10-27 21:35:18 -06:00
parent d12a3e2568
commit c3c004ce94
5 changed files with 24 additions and 17 deletions
+3 -4
View File
@@ -5,8 +5,6 @@
struct GlobalState
{
// Not yet implemented:
// interaction.c
u8 msDelayInvincTimer;
s16 msInvulnerable;
@@ -27,8 +25,6 @@ struct GlobalState
// rendering_graph_node.c
u16 mgAreaUpdateCounter;
// Implemented and in use:
// platform_displacement.c
void *mgMarioPlatform;
@@ -50,6 +46,9 @@ struct GlobalState
struct MarioState mgMarioStateVal;
};
// From mario_actions_submerged.c, needed to initialize global state
#define MIN_SWIM_STRENGTH 160
extern struct GlobalState *g_state;
extern struct GlobalState *global_state_create(void);