Game renaming (#63)

* rename GameState to Game * Rename the structs * fix table * whoops * rename play parameter * format * undo what i messed in z64compress
author: Anghelo Carvajal <angheloalf95@gmail.com> 2023-08-17 12:19:13 -0400
committer: GitHub <noreply@github.com> 2023-08-17 09:19:13 -0700
commit: c65a8dbc3903af19fe0253ab8774accbc06b0cb7 (patch)
tree: 8c136e0ecea87503261cdd22fc5b81cf31044f50
parent: 1bebc761b638ad061778667e4bab4ec92fe81aa7 (diff)
410 files changed, 1782 insertions, 1779 deletions
diff --git a/docs/STYLE.md b/docs/STYLE.md
index e193e5d..a3bd6c6 100644
--- a/docs/STYLE.md
+++ b/docs/STYLE.md
@@ -116,17 +116,17 @@ Floats usually need an `f` on the end to match, or IDO will use doubles. Our flo
 
 ## Play2
 
-In some particular instances, IDO requires the function argument `play` to be cast to a second variable of the same type to match. In these particular instances, the function argument should be renamed to `play2` and than this `play2` just assigned to a stack variable called `play`. This cast should occur before the actor `THIS` cast is made. For example in `z_en_firefly.c`
+In some particular instances, IDO requires the function argument `game_play` to be cast to a second variable of the same type to match. In these particular instances, the function argument should be renamed to `play2` and than this `play2` just assigned to a stack variable called `game_play`. This cast should occur before the actor `THIS` cast is made. For example in `z_en_firefly.c`
 ```c
-void EnFirefly_Update(Actor* thisx, PlayState* play2) {
-    PlayState* play = play2;
+void EnFirefly_Update(Actor* thisx, Game_Play* play2) {
+    Game_Play* game_play = play2;
     EnFirefly* this = THIS;
 ```
 
 In other places the cast is actually not explicitly needed, but a stack `pad` variable is still needed. For this there should just be a stack variable called `pad` of type `s32` before the actor `THIS` cast. For example in `z_bg_goron_oyu`
 
 ```c
-void BgGoronOyu_Init(Actor* thisx, PlayState* play) {
+void BgGoronOyu_Init(Actor* thisx, Game_Play* game_play) {
     s32 pad;
     BgGoronOyu* this = THIS;
     CollisionHeader* colHeader = NULL;
diff --git a/include/67D890.h b/include/67D890.h
index 1006d41..2ee8aba 100644
--- a/include/67D890.h
+++ b/include/67D890.h
@@ -3,14 +3,14 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
 void func_80059BF0_jp(void);
-void banti_move(struct PlayState* play);
+void banti_move(struct Game_Play* game_play);
 // void func_80059EC0_jp();
 // void func_8005A070_jp();
 // void func_8005A154_jp();
 // void func_8005A238_jp();
-void banti_draw(struct PlayState* play);
+void banti_draw(struct Game_Play* game_play);
 
 #endif
diff --git a/include/67E840.h b/include/67E840.h
index aa2316c..fe460f6 100644
--- a/include/67E840.h
+++ b/include/67E840.h
@@ -3,8 +3,8 @@
 
 #include "ultra64.h"
 
-struct PlayState;
-struct GameState;
+struct Game_Play;
+struct Game;
 
 // void func_8005ABA0_jp();
 // void func_8005ABE0_jp();
@@ -109,7 +109,7 @@ struct GameState;
 // void func_8005DCCC_jp();
 // void mBGMPsComp_make_ps_lost_fanfare();
 // void func_8005DD5C_jp();
-void mBGMPsComp_make_ps_wipe(s32 arg0, struct PlayState* play);
+void mBGMPsComp_make_ps_wipe(s32 arg0, struct Game_Play* game_play);
 // void func_8005DE0C_jp();
 // void func_8005DE60_jp();
 // void func_8005DE88_jp();
@@ -179,7 +179,7 @@ void mBGMPsComp_make_ps_wipe(s32 arg0, struct PlayState* play);
 // void func_8005EE00_jp();
 // void func_8005EE20_jp();
 // void func_8005EEA0_jp();
-void mBGM_main(struct GameState* gameState);
+void mBGM_main(struct Game* gameState);
 // void mBGM_ct();
 void func_8005F020_jp(void);
 void mBGM_cleanup(void);
diff --git a/include/683030.h b/include/683030.h
index 7cda1e9..efd5048 100644
--- a/include/683030.h
+++ b/include/683030.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
 // void func_8005F390_jp();
 // void func_8005F3DC_jp();
@@ -43,7 +43,7 @@ struct PlayState;
 // void func_80060970_jp();
 // void func_80060A6C_jp();
 // void func_80060B18_jp();
-void Camera2_ClearActorTalking_Cull(struct PlayState* play);
+void Camera2_ClearActorTalking_Cull(struct Game_Play* game_play);
 // void func_80060D1C_jp();
 // void func_80060D58_jp();
 // void func_80060D6C_jp();
@@ -156,9 +156,9 @@ void Camera2_ClearActorTalking_Cull(struct PlayState* play);
 // void func_80064EF0_jp();
 // void func_80064F08_jp();
 // void func_80064F28_jp();
-void func_80064F48_jp(struct PlayState* play);
+void func_80064F48_jp(struct Game_Play* game_play);
 // void func_80064F84_jp();
-void Camera2_process(struct PlayState* play);
-void Camera2_draw(struct PlayState* play);
+void Camera2_process(struct Game_Play* game_play);
+void Camera2_draw(struct Game_Play* game_play);
 
 #endif
diff --git a/include/69E2C0.h b/include/69E2C0.h
index 43d6d41..8dd26e0 100644
--- a/include/69E2C0.h
+++ b/include/69E2C0.h
@@ -5,7 +5,7 @@
 
 struct Input;
 struct GraphicsContext;
-struct PlayState;
+struct Game_Play;
 
 // void func_8007A620_jp();
 // void func_8007A630_jp();
@@ -77,8 +77,8 @@ void mDemo_stock_clear(void);
 // void func_8007CF34_jp();
 // void func_8007CF44_jp();
 // void func_8007CF84_jp();
-void mDemo_Main(struct PlayState* play);
-void func_8007CFD8_jp(struct PlayState* play);
+void mDemo_Main(struct Game_Play* game_play);
+void func_8007CFD8_jp(struct Game_Play* game_play);
 // void func_8007D030_jp();
 // void func_8007D048_jp();
 // void func_8007D080_jp();
diff --git a/include/6A6E80.h b/include/6A6E80.h
index 8d49ac7..5bea574 100644
--- a/include/6A6E80.h
+++ b/include/6A6E80.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
 typedef struct Play80804480 {
     /* 0x00 */ char unk00[0xDC];
@@ -12,7 +12,7 @@ typedef struct Play80804480 {
 // void func_800831E0_jp();
 // void func_800835AC_jp();
 void fbdemo_cleanup(Play80804480* arg0);
-s32 fbdemo_init(Play80804480* arg0, s32 arg1, s32 arg2, struct PlayState* play);
+s32 fbdemo_init(Play80804480* arg0, s32 arg1, s32 arg2, struct Game_Play* game_play);
 // void func_80083870_jp();
 void fbdemo_draw(Play80804480* arg0, Gfx** gfx);
 // void func_80083AB0_jp();
@@ -23,7 +23,7 @@ void fbdemo_triforce_init(void*);
 // void func_80083CE8_jp();
 void fbdemo_triforce_move(void*, u8);
 void fbdemo_triforce_draw(void*, Gfx**);
-s32 fbdemo_triforce_is_finish(void*, PlayState* play);
+s32 fbdemo_triforce_is_finish(void*, Game_Play* game_play);
 void fbdemo_triforce_settype(void*, s32);
 void fbdemo_triforce_setcolor_rgba8888(void*, s32);
 
diff --git a/include/6A7D20.h b/include/6A7D20.h
index ec6e456..3a0a651 100644
--- a/include/6A7D20.h
+++ b/include/6A7D20.h
@@ -10,6 +10,6 @@ void fbdemo_wipe1_startup(void*);
 void fbdemo_wipe1_settype(void*, s32);
 void fbdemo_wipe1_setcolor_rgba8888(void*, s32);
 // void func_800844BC_jp();
-s32 fbdemo_wipe1_is_finish(void*, PlayState* play);
+s32 fbdemo_wipe1_is_finish(void*, Game_Play* game_play);
 
 #endif
diff --git a/include/6A8180.h b/include/6A8180.h
index 8b9ecd5..5092a06 100644
--- a/include/6A8180.h
+++ b/include/6A8180.h
@@ -3,11 +3,11 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
-typedef struct PlayState2128 {
+typedef struct Game_Play2128 {
     /* 0x00 */ char unk00[0x10];
-} PlayState2128; // size = 0x10
+} Game_Play2128; // size = 0x10
 
 void fbdemo_fade_init(void* arg0);
 void fbdemo_fade_move(void* arg0, u8 arg1);
@@ -15,6 +15,6 @@ void fbdemo_fade_draw(void* arg0, Gfx** gfx);
 void fbdemo_fade_startup(void* arg0);
 void fbdemo_fade_settype(void* arg0, s32 arg1);
 void fbdemo_fade_setcolor_rgba8888(void* arg0, s32 arg1);
-s32 fbdemo_fade_is_finish(void* arg0, struct PlayState* play);
+s32 fbdemo_fade_is_finish(void* arg0, struct Game_Play* game_play);
 
 #endif
diff --git a/include/6DA460.h b/include/6DA460.h
index 0bcd63e..bf1d350 100644
--- a/include/6DA460.h
+++ b/include/6DA460.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
 // void func_800B67C0_jp();
 // void func_800B6838_jp();
@@ -30,7 +30,7 @@ struct PlayState;
 // void func_800B7468_jp();
 // void func_800B74E8_jp();
 // void func_800B7560_jp();
-void mPO_business_proc(struct PlayState* play);
+void mPO_business_proc(struct Game_Play* game_play);
 // void func_800B7680_jp();
 // void func_800B7700_jp();
 
diff --git a/include/6E0F50.h b/include/6E0F50.h
index 1e28acb..a7c7230 100644
--- a/include/6E0F50.h
+++ b/include/6E0F50.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
 // void func_800BD2B0_jp();
 Gfx* gfx_set_fog_nosync(Gfx* gfx, u8 arg1, u8 arg2, u8 arg3, s32 arg4, s16 arg5, s16 arg6);
@@ -34,7 +34,7 @@ Gfx* func_800BD720_jp(Gfx* gfx);
 // void func_800BD9FC_jp();
 // void func_800BDA20_jp();
 // void two_tex_scroll();
-void DisplayList_initialize(GraphicsContext* gfxCtx, u8 arg1, u8 arg2, u8 arg3, struct PlayState* play);
+void DisplayList_initialize(GraphicsContext* gfxCtx, u8 arg1, u8 arg2, u8 arg3, struct Game_Play* game_play);
 void fade_rgba8888_draw(Gfx** gfx, s32 arg1);
 // void func_800BE030_jp();
 // void fade_black_draw();
diff --git a/include/6E80C0.h b/include/6E80C0.h
index 9c90a9f..4d9a834 100644
--- a/include/6E80C0.h
+++ b/include/6E80C0.h
@@ -3,14 +3,14 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
-typedef struct PlayState1CBC {
+typedef struct Game_Play1CBC {
     /* 0x00 */ s32 unk_00;
     /* 0x04 */ char unk04[0x8];
     /* 0x0C */ s32 unk_0C;
     /* 0x10 */ char unk10[0xE0];
-} PlayState1CBC; // size = 0xF0
+} Game_Play1CBC; // size = 0xF0
 
 // void func_800C4420_jp();
 // void func_800C4440_jp();
@@ -20,24 +20,24 @@ typedef struct PlayState1CBC {
 // void mSM_ovlptr_dllcnv();
 // void func_800C47B4_jp();
 // void func_800C497C_jp();
-void func_800C49D4_jp(struct PlayState* play);
-void mSM_submenu_ovlptr_cleanup(PlayState1CBC* arg0);
+void func_800C49D4_jp(struct Game_Play* game_play);
+void mSM_submenu_ovlptr_cleanup(Game_Play1CBC* arg0);
 // void load_player();
-void mSM_submenu_ct(PlayState1CBC* arg0);
-void mSM_submenu_dt(PlayState1CBC* arg0);
+void mSM_submenu_ct(Game_Play1CBC* arg0);
+void mSM_submenu_dt(Game_Play1CBC* arg0);
 // void func_800C4D8C_jp();
 // void func_800C4DB0_jp();
 // void func_800C4DD8_jp();
 // void func_800C4DFC_jp();
 // void func_800C4E2C_jp();
-void mSM_submenu_ctrl(struct PlayState* play);
+void mSM_submenu_ctrl(struct Game_Play* game_play);
 // void func_800C50C4_jp();
 // void func_800C50EC_jp();
 // void func_800C510C_jp();
 // void func_800C5228_jp();
 // void func_800C524C_jp();
-void mSM_submenu_move(PlayState1CBC* arg0);
-void mSM_submenu_draw(PlayState1CBC* arg0, struct PlayState* play);
+void mSM_submenu_move(Game_Play1CBC* arg0);
+void mSM_submenu_draw(Game_Play1CBC* arg0, struct Game_Play* game_play);
 // void func_800C53B8_jp();
 // void func_800C543C_jp();
 // void func_800C54A8_jp();
diff --git a/include/6E9650.h b/include/6E9650.h
index 29faf70..1ec3eb1 100644
--- a/include/6E9650.h
+++ b/include/6E9650.h
@@ -3,8 +3,8 @@
 
 #include "ultra64.h"
 
-struct PlayState;
-struct PlayState_unk_0110;
+struct Game_Play;
+struct Game_Play_unk_0110;
 
 // void func_800C59B0_jp();
 // void func_800C5A08_jp();
@@ -19,16 +19,16 @@ struct PlayState_unk_0110;
 // void func_800C5E10_jp();
 // void func_800C5EA0_jp();
 // void func_800C5F0C_jp();
-void mSc_dmacopy_data_bank(struct PlayState_unk_0110* arg0);
-s32 mSc_bank_regist_check(struct PlayState_unk_0110* arg0, s16 arg1);
-void func_800C6144_jp(struct PlayState_unk_0110* arg0, s16 arg1);
-void mSc_regist_initial_exchange_bank(struct PlayState* play);
+void mSc_dmacopy_data_bank(struct Game_Play_unk_0110* arg0);
+s32 mSc_bank_regist_check(struct Game_Play_unk_0110* arg0, s16 arg1);
+void func_800C6144_jp(struct Game_Play_unk_0110* arg0, s16 arg1);
+void mSc_regist_initial_exchange_bank(struct Game_Play* game_play);
 // void func_800C62C4_jp();
 // void func_800C639C_jp();
-void mSc_data_bank_ct(struct PlayState* play, struct PlayState_unk_0110* arg1);
-void mSc_decide_exchange_bank(struct PlayState_unk_0110* arg0);
+void mSc_data_bank_ct(struct Game_Play* game_play, struct Game_Play_unk_0110* arg1);
+void mSc_decide_exchange_bank(struct Game_Play_unk_0110* arg0);
 // void func_800C6690_jp();
-void Scene_ct(struct PlayState* play, void* arg1);
+void Scene_ct(struct Game_Play* game_play, void* arg1);
 // void func_800C6960_jp();
 // void func_800C69F4_jp();
 // void func_800C6A28_jp();
diff --git a/include/6EC9E0.h b/include/6EC9E0.h
index 642e2ff..fee3e18 100644
--- a/include/6EC9E0.h
+++ b/include/6EC9E0.h
@@ -3,16 +3,16 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
 // void func_800C8D40_jp();
 // void func_800C8D98_jp();
 // void func_800C8E08_jp();
-void mTD_player_keydata_init(struct PlayState* play);
+void mTD_player_keydata_init(struct Game_Play* game_play);
 // void func_800C8ECC_jp();
 // void func_800C8F5C_jp();
 // void func_800C8F84_jp();
-void title_demo_move(struct PlayState* play);
+void title_demo_move(struct Game_Play* game_play);
 void func_800C9010_jp(void);
 // void func_800C9088_jp();
 // void mTD_get_titledemo_no();
diff --git a/include/6ECD90.h b/include/6ECD90.h
index c980f3d..7ae9812 100644
--- a/include/6ECD90.h
+++ b/include/6ECD90.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
 // void func_800C90F0_jp();
 // void func_800C91E0_jp();
@@ -20,6 +20,6 @@ struct PlayState;
 // void func_800C98A0_jp();
 // void func_800C9D38_jp();
 // void func_800C9F88_jp();
-void mTRC_move(struct PlayState* play);
+void mTRC_move(struct Game_Play* game_play);
 
 #endif
diff --git a/include/6EFC20.h b/include/6EFC20.h
index 8e7c3d4..124a1ca 100644
--- a/include/6EFC20.h
+++ b/include/6EFC20.h
@@ -3,11 +3,11 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
 void func_800CBF80_jp(void);
-void watch_my_step_move(struct PlayState* play);
-void watch_my_step_draw(struct PlayState* play);
+void watch_my_step_move(struct Game_Play* game_play);
+void watch_my_step_draw(struct Game_Play* game_play);
 // void func_800CC9C4_jp();
 // void func_800CC9EC_jp();
 // void func_800CCB44_jp();
diff --git a/include/6F5550.h b/include/6F5550.h
index 5468036..cbb848a 100644
--- a/include/6F5550.h
+++ b/include/6F5550.h
@@ -3,8 +3,8 @@
 
 #include "ultra64.h"
 
-struct PlayState;
-struct PlayState_Unk_1EE8;
+struct Game_Play;
+struct Game_Play_Unk_1EE8;
 
 // void func_800D18B0_jp();
 // void func_800D195C_jp();
@@ -65,7 +65,7 @@ struct PlayState_Unk_1EE8;
 // void func_800D22CC_jp();
 // void func_800D22F4_jp();
 s32 sAdo_BgmFadeoutCheck(void);
-s32 func_800D2334_jp(struct PlayState_Unk_1EE8* arg0, struct PlayState* play);
+s32 func_800D2334_jp(struct Game_Play_Unk_1EE8* arg0, struct Game_Play* game_play);
 // void func_800D2354_jp();
 // void func_800D2360_jp();
 void sAdo_RoomType(u8 arg0);
diff --git a/include/c_keyframe.h b/include/c_keyframe.h
index dd3ac32..6193640 100644
--- a/include/c_keyframe.h
+++ b/include/c_keyframe.h
@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "z64math.h"
 
-struct PlayState;
+struct Game_Play;
 
 typedef enum AnimationMode {
     /* 0 */ ANIMATION_STOP,
@@ -83,7 +83,7 @@ typedef struct {
     /* 0x1C */ s32 keyframeStartIndex;
 } SkeletonInfoRCombineWork; // size = 0x20
 
-typedef s32 (*DrawCallback)(struct PlayState* play, SkeletonInfoR* skeletonInfo, s32 jointIndex, Gfx** dlist, u8* displayBufferFlag, void*, Vec3s* rotation, Vec3f* translation);
+typedef s32 (*DrawCallback)(struct Game_Play* game_play, SkeletonInfoR* skeletonInfo, s32 jointIndex, Gfx** dlist, u8* displayBufferFlag, void*, Vec3s* rotation, Vec3f* translation);
 
 void cKF_FrameControl_zeroClear(FrameControl* frameControl);
 void cKF_FrameControl_ct(FrameControl* frameControl);
@@ -117,9 +117,9 @@ void cKF_SkeletonInfo_R_init(SkeletonInfoR* skeletonInfo, BaseSkeletonR* skeleto
 void cKF_SkeletonInfo_R_setAnim(SkeletonInfoR* skeletonInfo, BaseAnimationR* animation);
 void cKF_SkeletonInfo_R_morphJoint(SkeletonInfoR* skeletonInfo);
 s32 cKF_SkeletonInfo_R_play(SkeletonInfoR* skeletonInfo);
-void cKF_Si3_draw_SV_R_child(struct PlayState* play, SkeletonInfoR* skeletonInfo, s32* jointIndex,
+void cKF_Si3_draw_SV_R_child(struct Game_Play* game_play, SkeletonInfoR* skeletonInfo, s32* jointIndex,
                              DrawCallback beforeCallback, DrawCallback afterCallback, void* arg, Mtx** mtx);
-void cKF_Si3_draw_R_SV(struct PlayState* play, SkeletonInfoR* skeletonInfo, Mtx* mtx, DrawCallback beforeCallback,
+void cKF_Si3_draw_R_SV(struct Game_Play* game_play, SkeletonInfoR* skeletonInfo, Mtx* mtx, DrawCallback beforeCallback,
                        DrawCallback afterCallback, void* arg);
 void cKF_SkeletonInfo_R_init_standard_repeat_speedsetandmorph(SkeletonInfoR* skeletonInfo, BaseAnimationR* animation,
                                                               Vec3s* diffRotTable, f32 speed, f32 morphCounter);
diff --git a/include/game.h b/include/game.h
index 2af1c10..390703b 100644
--- a/include/game.h
+++ b/include/game.h
@@ -9,7 +9,7 @@
 #include "unk.h"
 #include "m_controller.h"
 
-struct GameState;
+struct Game;
 struct GraphicsContext;
 struct struct_80145020_jp;
 
@@ -26,7 +26,7 @@ typedef enum GameStateId {
 #undef DEFINE_GAMESTATE_INTERNAL
 
 
-typedef void (*GameStateFunc)(struct GameState* gameState);
+typedef void (*GameStateFunc)(struct Game* gameState);
 
 typedef struct {
     /* 0x00 */ void*         loadedRamAddr;
@@ -43,7 +43,7 @@ typedef struct {
     /* 0x2C */ size_t        instanceSize;
 } GameStateOverlay; // size = 0x30
 
-typedef struct GameState {
+typedef struct Game {
     /* 0x00 */ struct GraphicsContext* gfxCtx;
     /* 0x04 */ GameStateFunc main;
     /* 0x08 */ GameStateFunc destroy;
@@ -60,37 +60,37 @@ typedef struct GameState {
     /* 0xA0 */ s32 unk_A0;
     /* 0xA4 */ UNK_TYPE1 unk_A4[0x4];
     /* 0xA8 */ Controller controller;
-} GameState; // size = 0xE0
+} Game; // size = 0xE0
 
-void func_800D2E00_jp(GameState* gameState);
+void func_800D2E00_jp(Game* gameState);
 void func_800D2E58_jp(u16 button, Gfx** gfxP);
-void game_debug_draw_last(GameState* gameState, struct GraphicsContext* gfxCtx);
+void game_debug_draw_last(Game* gameState, struct GraphicsContext* gfxCtx);
 void game_draw_first(struct GraphicsContext* gfxCtx);
 void game_draw_last(struct GraphicsContext* gfxCtx);
-void game_get_controller(GameState* gameState);
+void game_get_controller(Game* gameState);
 void SetGameFrame(s32 divisor);
-void game_main(GameState* gameState);
-void game_init_hyral(GameState* gameState, size_t size);
-void game_resize_hyral(GameState* gameState, size_t size);
-void game_ct(GameState* gameState, GameStateFunc init, struct GraphicsContext* gfxCtx);
-void game_dt(GameState* gameState);
-GameStateFunc game_get_next_game_init(GameState* gameState);
-size_t game_get_next_game_class_size(GameState* gameState);
-s32 game_is_doing(GameState* gameState);
-s32 game_getFreeBytes(GameState* gameState);
-void game_goto_next_game_play(GameState* gameState);
-void game_goto_next_game_name_famicom_emu(GameState* gameState);
+void game_main(Game* gameState);
+void game_init_hyral(Game* gameState, size_t size);
+void game_resize_hyral(Game* gameState, size_t size);
+void game_ct(Game* gameState, GameStateFunc init, struct GraphicsContext* gfxCtx);
+void game_dt(Game* gameState);
+GameStateFunc game_get_next_game_init(Game* gameState);
+size_t game_get_next_game_class_size(Game* gameState);
+s32 game_is_doing(Game* gameState);
+s32 game_getFreeBytes(Game* gameState);
+void game_goto_next_game_play(Game* gameState);
+void game_goto_next_game_name_famicom_emu(Game* gameState);
 
 
 // .data
 
-extern GameState* gamePT;
+extern Game* gamePT;
 
 // .bss
 
 extern struct struct_80145020_jp B_80145020_jp;
 extern s16 B_80145040_jp;
-extern GameState* game_class_p;
+extern Game* game_class_p;
 extern u8 game_GameFrame;
 extern f32 game_GameFrameF;
 extern f32 game_GameFrame_2F;
@@ -110,14 +110,14 @@ extern GameStateId game_dlftbls_num;
 
 #define STOP_GAMESTATE(curState)     \
     do {                             \
-        GameState* state = curState; \
+        Game* state = curState; \
                                      \
         state->running = false;      \
     } while(0)
 
 #define SET_NEXT_GAMESTATE(curState, nextInit, nextSize) \
     do {                                                 \
-        GameState* state = curState;                     \
+        Game* state = curState;                     \
                                                          \
         (state)->init = nextInit;                        \
         (state)->size = nextSize;                        \
diff --git a/include/m_actor.h b/include/m_actor.h
index ed5d04f..8ff4467 100644
--- a/include/m_actor.h
+++ b/include/m_actor.h
@@ -7,7 +7,7 @@
 #include "unk.h"
 
 struct Actor;
-struct PlayState;
+struct Game_Play;
 struct ActorEntry;
 struct ActorOverlay;
 struct struct_801161E8_jp;
@@ -47,7 +47,7 @@ typedef enum FgNameF000 {
     /* 0xE */ FGNAME_F000_E
 } FgNameF000;
 
-typedef void (*ActorFunc)(struct Actor* this, struct PlayState* play);
+typedef void (*ActorFunc)(struct Actor* this, struct Game_Play* game_play);
 
 // a.k.a. ActorInit
 typedef struct ActorProfile {
@@ -69,7 +69,7 @@ typedef struct PosRot {
     /* 0x0C */ Vec3s rot;
 } PosRot; // size = 0x14
 
-typedef void (*Shape_Info_unk_0C)(struct Actor*, struct Lights*, struct PlayState*);
+typedef void (*Shape_Info_unk_0C)(struct Actor*, struct Lights*, struct Game_Play*);
 
 typedef struct Shape_Info {
     /* 0x00 */ Vec3s rot;
@@ -229,34 +229,34 @@ typedef struct ActorInfo {
 
 #define ACTOR_FGNAME_GET_F000(fgName) (((fgName) & 0xF000) >> 12)
 
-void projection_pos_set(struct PlayState* play, Vec3f* worldPos, Vec3f* projectedPos, f32* invW);
+void projection_pos_set(struct Game_Play* game_play, Vec3f* worldPos, Vec3f* projectedPos, f32* invW);
 void Actor_world_to_eye(Actor* actor, f32 arg1);
 void Actor_position_move(Actor* actor);
 void Actor_position_speed_set(Actor* actor);
 void Actor_position_moveF(Actor* actor);
-s32 Actor_player_look_direction_check(Actor* actor, s16 maxAngleDiff, struct PlayState* play);
-void Actor_display_position_set(struct PlayState* play, Actor* actor, s16* x, s16* y);
+s32 Actor_player_look_direction_check(Actor* actor, s16 maxAngleDiff, struct Game_Play* game_play);
+void Actor_display_position_set(struct Game_Play* game_play, Actor* actor, s16* x, s16* y);
 void Shape_Info_init(Actor* actor, f32 arg1, Shape_Info_unk_0C arg2, f32 arg3, f32 arg4);
 void Actor_foot_shadow_pos_set(Actor* actor, s32 limbIndex, s32 leftFootIndex, Vec3f* leftFootPos, s32 rightFootIndex, Vec3f* rightFootPos);
 void Actor_delete(Actor* actor);
 s32 Actor_draw_actor_no_culling_check(Actor* actor);
 s32 Actor_draw_actor_no_culling_check2(Actor* actor, Vec3f* arg1, f32 arg2);
 void Actor_cull_check(Actor* actor);
-void Actor_delete_check(Actor* actor, struct PlayState* play);
-void Actor_info_ct(struct PlayState* play2, ActorInfo* actorInfo, struct ActorEntry* actorEntry);
-void Actor_info_dt(ActorInfo* actorInfo, struct PlayState* play);
-void Actor_info_call_actor(struct PlayState* play, ActorInfo* actorInfo);
-void Actor_info_draw_actor(struct PlayState* play, ActorInfo* actorInfo);
+void Actor_delete_check(Actor* actor, struct Game_Play* game_play);
+void Actor_info_ct(struct Game_Play* play2, ActorInfo* actorInfo, struct ActorEntry* actorEntry);
+void Actor_info_dt(ActorInfo* actorInfo, struct Game_Play* game_play);
+void Actor_info_call_actor(struct Game_Play* game_play, ActorInfo* actorInfo);
+void Actor_info_draw_actor(struct Game_Play* game_play, ActorInfo* actorInfo);
 void Actor_free_overlay_area(struct ActorOverlay* overlayEntry);
 void Actor_get_overlay_area(struct ActorOverlay* overlayEntry, const struct struct_801161E8_jp* arg1, size_t overlaySize);
-void Actor_init_actor_class(Actor* actor, ActorProfile* profile, struct ActorOverlay* overlayEntry, struct PlayState* play, s32 arg4, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s8 argB, s8 argC, s16 argD, u16 fgName, s16 params);
-Actor* Actor_info_make_actor(ActorInfo* actorInfo, struct PlayState* play, s16 actorId, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s8 arg9, s8 argA, s16 argB, u16 fgName, s16 params, s8 argE, s32 argF);
-Actor* Actor_info_make_child_actor(ActorInfo* actorInfo, Actor* arg1, struct PlayState* play, s16 actorId, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s16 argA, u16 fgName, s16 params, s32 argD);
-void restore_fgdata(Actor* actor, struct PlayState* play);
-void restore_fgdata_one(Actor* actor, struct PlayState* play);
-void restore_fgdata_all(struct PlayState* play);
-void Actor_info_save_actor(struct PlayState* play);
-Actor* Actor_info_delete(ActorInfo* actorInfo, Actor* actor, struct PlayState* play);
+void Actor_init_actor_class(Actor* actor, ActorProfile* profile, struct ActorOverlay* overlayEntry, struct Game_Play* game_play, s32 arg4, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s8 argB, s8 argC, s16 argD, u16 fgName, s16 params);
+Actor* Actor_info_make_actor(ActorInfo* actorInfo, struct Game_Play* game_play, s16 actorId, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s8 arg9, s8 argA, s16 argB, u16 fgName, s16 params, s8 argE, s32 argF);
+Actor* Actor_info_make_child_actor(ActorInfo* actorInfo, Actor* arg1, struct Game_Play* game_play, s16 actorId, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s16 argA, u16 fgName, s16 params, s32 argD);
+void restore_fgdata(Actor* actor, struct Game_Play* game_play);
+void restore_fgdata_one(Actor* actor, struct Game_Play* game_play);
+void restore_fgdata_all(struct Game_Play* game_play);
+void Actor_info_save_actor(struct Game_Play* game_play);
+Actor* Actor_info_delete(ActorInfo* actorInfo, Actor* actor, struct Game_Play* game_play);
 Actor* Actor_info_name_search(ActorInfo* actorInfo, s16 name, ActorPart part);
 Actor* Actor_info_fgName_search(ActorInfo* actorInfo, u16 fgName, ActorPart part);
 void Part_Break_init(Part_Break* partBreak, s32 count, UNK_TYPE arg2);
@@ -264,8 +264,8 @@ Gfx* HiliteReflect_new(Vec3f* object, Vec3f* eye, Vec3f* lightDir, struct Graphi
 Hilite* HiliteReflect_init(Vec3f* object, Vec3f* eye, Vec3f* lightDir, struct GraphicsContext* gfxCtx);
 Hilite* HiliteReflect_xlu_init(Vec3f* object, Vec3f* eye, Vec3f* lightDir, struct GraphicsContext* gfxCtx);
 Hilite* HiliteReflect_light_init(Vec3f* object, Vec3f* eye, Vec3f* lightDir, struct GraphicsContext* gfxCtx);
-Hilite* Setpos_HiliteReflect_init(Vec3f* object, struct PlayState* play);
-Hilite* Setpos_HiliteReflect_xlu_init(Vec3f* object, struct PlayState* play);
-Hilite* Setpos_HiliteReflect_light_init(Vec3f* object, struct PlayState* play);
+Hilite* Setpos_HiliteReflect_init(Vec3f* object, struct Game_Play* game_play);
+Hilite* Setpos_HiliteReflect_xlu_init(Vec3f* object, struct Game_Play* game_play);
+Hilite* Setpos_HiliteReflect_light_init(Vec3f* object, struct Game_Play* game_play);
 
 #endif
diff --git a/include/m_collision_obj.h b/include/m_collision_obj.h
index 547eee1..7d2ef43 100644
--- a/include/m_collision_obj.h
+++ b/include/m_collision_obj.h
@@ -12,11 +12,11 @@ typedef struct CollisionCheck_Status {
 } CollisionCheck_Status; // size >= 0x18
 
 
-typedef struct PlayState2138 {
+typedef struct Game_Play2138 {
     /* 0x00 */ char unk00[0xD0];
-} PlayState2138; // size = 0xD0
+} Game_Play2138; // size = 0xD0
 
-struct PlayState;
+struct Game_Play;
 
 // void func_80076B40_jp();
 // void func_80076BA4_jp();
@@ -55,9 +55,9 @@ struct PlayState;
 // void func_80077410_jp();
 // void func_800774B4_jp();
 // void func_80077580_jp();
-void func_80077620_jp(struct PlayState* play, PlayState2138* arg1);
-void CollisionCheck_dt(struct PlayState* play, PlayState2138* arg1);
-void CollisionCheck_clear(struct PlayState* play, PlayState2138* arg1);
+void func_80077620_jp(struct Game_Play* game_play, Game_Play2138* arg1);
+void CollisionCheck_dt(struct Game_Play* game_play, Game_Play2138* arg1);
+void CollisionCheck_clear(struct Game_Play* game_play, Game_Play2138* arg1);
 // void CollisionCheck_setOC();
 // void func_80077794_jp();
 // void func_800777D0_jp();
@@ -67,7 +67,7 @@ void CollisionCheck_clear(struct PlayState* play, PlayState2138* arg1);
 // void func_80077F20_jp();
 // void func_80077FF0_jp();
 // void func_80078014_jp();
-void CollisionCheck_OC(struct PlayState* play, PlayState2138* arg1);
+void CollisionCheck_OC(struct Game_Play* game_play, Game_Play2138* arg1);
 // void func_80078214_jp();
 // void func_80078258_jp();
 // void func_8007841C_jp();
diff --git a/include/m_common_data.h b/include/m_common_data.h
index ef1950e..2c0d526 100644
--- a/include/m_common_data.h
+++ b/include/m_common_data.h
@@ -7,9 +7,9 @@
 struct Actor;
 struct ActorOverlay;
 struct struct_801161E8_jp;
-struct PlayState_unk_0110;
+struct Game_Play_unk_0110;
 struct CommonData_unk_1004C_unk_14_arg0;
-struct PlayState;
+struct Game_Play;
 
 typedef UNK_RET (*CommonData_unk_1004C_unk_04)(struct ActorOverlay*, const struct struct_801161E8_jp*, size_t, s32);
 typedef UNK_RET (*CommonData_unk_1004C_unk_08)(void);
@@ -20,9 +20,9 @@ typedef UNK_PTR (*CommonData_unk_1004C_unk_0C)(size_t, const struct struct_80116
 typedef UNK_RET (*CommonData_unk_1004C_unk_10)(struct Actor*);
 typedef UNK_RET (*CommonData_unk_1004C_unk_14)(struct CommonData_unk_1004C_unk_14_arg0*, u16);
 
-typedef UNK_RET (*CommonData_unk_1004C_unk_EC)(struct PlayState_unk_0110*, s16, s16);
-typedef UNK_RET (*CommonData_unk_1004C_unk_F0)(struct PlayState_unk_0110*, struct Actor*);
-typedef s32 (*CommonData_unk_1004C_unk_F4)(struct PlayState_unk_0110*, struct Actor*);
+typedef UNK_RET (*CommonData_unk_1004C_unk_EC)(struct Game_Play_unk_0110*, s16, s16);
+typedef UNK_RET (*CommonData_unk_1004C_unk_F0)(struct Game_Play_unk_0110*, struct Actor*);
+typedef s32 (*CommonData_unk_1004C_unk_F4)(struct Game_Play_unk_0110*, struct Actor*);
 
 typedef struct CommonData_unk_1004C {
     /* 0x00 */ UNK_TYPE1 unk_00[0x4];
@@ -67,7 +67,7 @@ typedef struct CommonData10138 {
     /* 0xA86 */ CommonData10138_Sub unk_A86;
 } CommonData10138; // size >= 0xA90
 
-typedef void (*CommonData_100E4_Func)(struct PlayState*);
+typedef void (*CommonData_100E4_Func)(struct Game_Play*);
 
 typedef struct CommonData {
     /* 0x00000 */ u8 unk00000[0x14];
diff --git a/include/m_controller.h b/include/m_controller.h
index 5a8eaf8..5fdac72 100644
--- a/include/m_controller.h
+++ b/include/m_controller.h
@@ -31,12 +31,12 @@ typedef struct Controller {
     /* 0x34 */ f32 lastAdjustedR;
 } Controller; // size = 0x38
 
-struct GameState;
+struct Game;
 
-void mCon_ct(struct GameState* gameState);
-void mCon_dt(struct GameState* gameState);
+void mCon_ct(struct Game* gameState);
+void mCon_dt(struct Game* gameState);
 void mCon_calc(Controller* controller, f32 x, f32 y);
-void mCon_main(struct GameState* game);
+void mCon_main(struct Game* game);
 s32 chkButton(u16 mask);
 u16 getButton(void);
 s32 chkTrigger(u16 mask);
diff --git a/include/m_debug_display.h b/include/m_debug_display.h
index b566f07..48fe452 100644
--- a/include/m_debug_display.h
+++ b/include/m_debug_display.h
@@ -3,11 +3,11 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
 void Debug_Display_init(void);
 // void Debug_Display_new();
-void Debug_Display_output(struct PlayState* play);
+void Debug_Display_output(struct Game_Play* game_play);
 // void debug_display_output_sprite_16x16_I8();
 // void debug_display_output_polygon();
 
diff --git a/include/m_event.h b/include/m_event.h
index 9dafb1f..00ab4a5 100644
--- a/include/m_event.h
+++ b/include/m_event.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 
-typedef struct PlayState1EBC {
+typedef struct Game_Play1EBC {
     /* 0x00 */ u8 unk_00;
     /* 0x01 */ u8 unk_01;
     /* 0x02 */ u8 unk_02;
@@ -12,7 +12,7 @@ typedef struct PlayState1EBC {
     /* 0x06 */ s16 unk_06;
     /* 0x08 */ s32 unk_08;
     /* 0x0C */ s32 unk_0C;
-} PlayState1EBC; // size = 0x10
+} Game_Play1EBC; // size = 0x10
 
 // void func_8007D140_jp();
 // void func_8007D180_jp();
@@ -92,12 +92,12 @@ s32 mEv_CheckTitleDemo(void);
 // void func_8007F358_jp();
 // void func_8007F6A0_jp();
 // void func_8007F764_jp();
-void func_8007F858_jp(PlayState1EBC* arg0);
+void func_8007F858_jp(Game_Play1EBC* arg0);
 // void func_8007F8A4_jp();
-void mEv_2nd_init(PlayState1EBC* arg0);
+void mEv_2nd_init(Game_Play1EBC* arg0);
 // void func_8007F950_jp();
-void mEv_run(PlayState1EBC* arg0);
-void mEv_finish(PlayState1EBC* arg0);
+void mEv_run(Game_Play1EBC* arg0);
+void mEv_finish(Game_Play1EBC* arg0);
 // void func_8007FCB8_jp();
 // void func_8007FD40_jp();
 // void func_8007FDA8_jp();
diff --git a/include/m_field_info.h b/include/m_field_info.h
index bae4419..bb80205 100644
--- a/include/m_field_info.h
+++ b/include/m_field_info.h
@@ -5,7 +5,7 @@
 #include "z64math.h"
 
 struct CommonData;
-struct PlayState;
+struct Game_Play;
 
 // void func_80087C30_jp();
 // void func_80087C40_jp();
@@ -111,7 +111,7 @@ UNK_TYPE mFI_SetFG_common(u16 fgName, Vec3f arg1, s32 arg2);
 // void func_8008B2D0_jp();
 // void func_8008B300_jp();
 // void func_8008B318_jp();
-void mFI_SetBearActor(struct PlayState* play, Vec3f arg1, s32 arg2);
+void mFI_SetBearActor(struct Game_Play* game_play, Vec3f arg1, s32 arg2);
 s32 func_8008B3E8_jp(Vec3f* arg0, UNK_TYPE arg1);
 // void func_8008B4C0_jp();
 // void func_8008B598_jp();
diff --git a/include/m_handbill.h b/include/m_handbill.h
index a62b610..bae1cde 100644
--- a/include/m_handbill.h
+++ b/include/m_handbill.h
@@ -3,10 +3,10 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
-void Balloon_init(struct PlayState* play);
-void Balloon_move(struct PlayState* play);
+void Balloon_init(struct Game_Play* game_play);
+void Balloon_move(struct Game_Play* game_play);
 // void func_80092B7C_jp();
 // void func_80092B8C_jp();
 // void func_80092BA0_jp();
diff --git a/include/m_kankyo.h b/include/m_kankyo.h
index 61b14a4..d2c89ce 100644
--- a/include/m_kankyo.h
+++ b/include/m_kankyo.h
@@ -31,7 +31,7 @@ typedef struct Kankyo {
 // void func_80096F5C_jp();
 // void func_80097048_jp();
 // void mEnv_RoomTypeLightSet();
-void Global_kankyo_ct(struct PlayState* play, struct Kankyo* kankyo);
+void Global_kankyo_ct(struct Game_Play* game_play, struct Kankyo* kankyo);
 // void mEnv_MakeShadowInfo();
 // void mEnv_set_time();
 // void func_800976BC_jp();
@@ -49,7 +49,7 @@ void Global_kankyo_ct(struct PlayState* play, struct Kankyo* kankyo);
 // void func_800981B8_jp();
 // void func_8009836C_jp();
 // void func_800983F0_jp();
-void Global_kankyo_set(struct PlayState* play, struct Kankyo* kankyo, struct LightContext* arg2);
+void Global_kankyo_set(struct Game_Play* game_play, struct Kankyo* kankyo, struct LightContext* arg2);
 // void func_80098558_jp();
 // void func_8009867C_jp();
 // void func_80098794_jp();
diff --git a/include/m_lights.h b/include/m_lights.h
index fe7f898..0fbdb59 100644
--- a/include/m_lights.h
+++ b/include/m_lights.h
@@ -7,7 +7,7 @@
 #include "color.h"
 
 struct GraphicsContext;
-struct PlayState;
+struct Game_Play;
 
 typedef struct Lights {
     /* 0x00 */ UNK_TYPE1 unk_00[0x80];
@@ -49,6 +49,6 @@ Lights* Global_light_read(LightContext* lightCtx, struct GraphicsContext* gfxCtx
 // void func_8009BBEC_jp();
 // void func_8009BC48_jp();
 // void func_8009BD90_jp();
-void Light_list_point_draw(struct PlayState* play);
+void Light_list_point_draw(struct Game_Play* game_play);
 
 #endif
diff --git a/include/m_msg_main.h b/include/m_msg_main.h
index 84d62bc..917b51a 100644
--- a/include/m_msg_main.h
+++ b/include/m_msg_main.h
@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 
 // void func_8009D1F0_jp();
 // void func_8009D200_jp();
@@ -283,11 +283,11 @@ struct PlayState;
 // void func_800A3190_jp();
 // void func_800A31D8_jp();
 // void func_800A3220_jp();
-void mMsg_ct(struct PlayState* play);
-void func_800A3304_jp(struct PlayState* play);
+void mMsg_ct(struct Game_Play* game_play);
+void func_800A3304_jp(struct Game_Play* game_play);
 // void func_800A332C_jp();
-void mMsg_Main(struct PlayState* play);
-void mMsg_Draw(struct PlayState* play);
+void mMsg_Main(struct Game_Play* game_play);
+void mMsg_Draw(struct Game_Play* game_play);
 // void func_800A3400_jp();
 // void func_800A3420_jp();
 // void func_800A345C_jp();
diff --git a/include/m_player_lib.h b/include/m_player_lib.h
index 70b153d..66aba4e 100644
--- a/include/m_player_lib.h
+++ b/include/m_player_lib.h
@@ -4,7 +4,7 @@
 #include "ultra64.h"
 
 struct Player;
-struct PlayState;
+struct Game_Play;
 
 // void func_800B1160_jp();
 // void func_800B11B0_jp();
@@ -33,13 +33,13 @@ struct PlayState;
 // void func_800B19C4_jp();
 // void func_800B1A28_jp();
 // void func_800B1A60_jp();
-void mPlib_Object_Exchange_keep_Player_dt(struct PlayState* play);
+void mPlib_Object_Exchange_keep_Player_dt(struct Game_Play* game_play);
 // void func_800B1AE0_jp();
 // void func_800B1B3C_jp();
 // void func_800B1B6C_jp();
 // void func_800B1BB8_jp();
 // void func_800B1BE8_jp();
-struct Player* get_player_actor_withoutCheck(struct PlayState* play);
+struct Player* get_player_actor_withoutCheck(struct Game_Play* game_play);
 // void func_800B1C90_jp();
 // void func_800B1CBC_jp();
 // void func_800B1CE0_jp();
diff --git a/include/m_view.h b/include/m_view.h
index 19a4a4e..c3afa87 100644
--- a/include/m_view.h
+++ b/include/m_view.h
@@ -3,10 +3,10 @@
 
 #include "ultra64.h"
 
-struct PlayState;
+struct Game_Play;
 struct GraphicsContext;
 
-typedef struct PlayState1938 {
+typedef struct Game_Play1938 {
     /* 0x000 */ char unk000[0x28];
     /* 0x028 */ Vec3f unk_028;
     /* 0x034 */ char unk034[0x2C];
@@ -15,7 +15,7 @@ typedef struct PlayState1938 {
     /* 0x0E0 */ char unk0E0[0x40];
     /* 0x120 */ s32 unk_120;
     /* 0x124 */ char unk124[0x4];
-} PlayState1938; // size = 0x128
+} Game_Play1938; // size = 0x128
 
 typedef struct ScissorViewArg1 {
     /* 0x00 */ s32 unk_00;
@@ -25,26 +25,26 @@ typedef struct ScissorViewArg1 {
 } ScissorViewArg1; // size = 0x10
 
 // void set_viewport();
-void initView(PlayState1938* arg0, struct GraphicsContext* gfxCtx);
+void initView(Game_Play1938* arg0, struct GraphicsContext* gfxCtx);
 // void setLookAtView();
 // void getLookAtView();
 // void setScaleView();
 // void getScaleView();
 // void setPerspectiveView();
 // void getPerspectiveView();
-void setScissorView(PlayState1938* arg0, ScissorViewArg1* arg1);
+void setScissorView(Game_Play1938* arg0, ScissorViewArg1* arg1);
 // void getScissorView();
 // void setScissorX();
 // void setScissorOvl();
 // void setScissor();
 // void stretchViewInit();
 // void do_stretch_view();
-void showView(PlayState1938* arg0, s32 arg1, struct PlayState* play);
+void showView(Game_Play1938* arg0, s32 arg1, struct Game_Play* game_play);
 // void showPerspectiveView();
 // void showOrthoView();
 // void showOverLayView();
 // void showPerspectiveOverLayView();
 // void showOrthoView1();
-void showView1(PlayState1938* arg0, s32 arg1, Gfx** gfx);
+void showView1(Game_Play1938* arg0, s32 arg1, Gfx** gfx);
 
 #endif
diff --git a/include/speed_meter.h b/include/speed_meter.h
index 09b9dcc..65d6333 100644
--- a/include/speed_meter.h
+++ b/include/speed_meter.h
@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "unk.h"
 
-struct GameState;
+struct Game;
 struct GraphicsContext;
 
 typedef struct struct_80145020_jp {
@@ -18,7 +18,7 @@ void func_800D88E0_jp(struct_80145020_jp *arg0);
 void func_800D8A54_jp(struct_80145020_jp *arg0, struct GraphicsContext* gfxCtx);
 // void func_800D8DD4_jp();
 // void func_800D8E18_jp();
-void func_800D9018_jp(struct_80145020_jp *arg0, struct GraphicsContext* gfxCtx, struct GameState *gameState);
+void func_800D9018_jp(struct_80145020_jp *arg0, struct GraphicsContext* gfxCtx, struct Game *gameState);
 // void func_800D93F4_jp();
 
 #endif
diff --git a/include/sys_matrix.h b/include/sys_matrix.h
index f46411f..0d24c24 100644
--- a/include/sys_matrix.h
+++ b/include/sys_matrix.h
@@ -5,14 +5,14 @@
 #include "z64math.h"
 
 struct GraphicsContext;
-struct GameState;
+struct Game;
 
 typedef enum {
     /* 0 */ MTXMODE_NEW,  // generates a new matrix
     /* 1 */ MTXMODE_APPLY // applies transformation to the current matrix
 } MatrixMode;
 
-void new_Matrix(struct GameState* gameState);
+void new_Matrix(struct Game* gameState);
 void Matrix_push(void);
 void Matrix_pull(void);
 void Matrix_get(MtxF* dest);
diff --git a/include/tables/gamestate_table.h b/include/tables/gamestate_table.h
index 1358bae..6b9754d 100644
--- a/include/tables/gamestate_table.h
+++ b/include/tables/gamestate_table.h
@@ -1,5 +1,5 @@
 /* 0x00 */ DEFINE_GAMESTATE(FirstGame, GAMESTATE_FIRST_GAME, first_game)
-/* 0x01 */ DEFINE_GAMESTATE(MapSelect, GAMESTATE_MAP_SELECT, select)
+/* 0x01 */ DEFINE_GAMESTATE(Select, GAMESTATE_MAP_SELECT, select)
 /* 0x02 */ DEFINE_GAMESTATE(Play, GAMESTATE_PLAY, play)
 /* 0x03 */ DEFINE_GAMESTATE(SecondGame, GAMESTATE_SECOND_GAME, second_game)
 /* 0x04 */ DEFINE_GAMESTATE(_00743CD0, GAMESTATE_00743CD0, _00743CD0)
diff --git a/include/unknown_structs.h b/include/unknown_structs.h
index 492de3f..afb93e2 100644
--- a/include/unknown_structs.h
+++ b/include/unknown_structs.h
@@ -24,13 +24,13 @@ typedef struct CommonData_unk_1004C_unk_14_arg0 {
     /* 0x04 */ UNK_TYPE1 unk_04[0x60];
 } CommonData_unk_1004C_unk_14_arg0; // size >= 0x64, maybe less, guessed from stack usage
 
-typedef struct PlayState_unk_0110 {
+typedef struct Game_Play_unk_0110 {
     /* 0x00 */ s16 unk_00;
     /* 0x02 */ UNK_TYPE1 unk_02[0x2];
     /* 0x04 */ void* segment;
     /* 0x08 */ UNK_TYPE1 unk_08[0x48];
     /* 0x50 */ s16 unk_50;
     /* 0x52 */ UNK_TYPE1 unk_52[0x2];
-} PlayState_unk_0110; // size = 0x54
+} Game_Play_unk_0110; // size = 0x54
 
 #endif
diff --git a/lib/ultralib/src/audio/event.c b/lib/ultralib/src/audio/event.c
index 3112c99..531e17c 100644
--- a/lib/ultralib/src/audio/event.c
+++ b/lib/ultralib/src/audio/event.c
@@ -59,7 +59,7 @@ ALMicroTime alEvtqNextEvent(ALEventQueue *evtq, ALEvent *evt)
     {
         /* sct 11/28/95 - If we get here, most like we overflowed the event queue */
 	/* with non-self-perpetuating events.  Eg. if we filled the evtq with volume */
-	/* events, then when the seqp is told to play it will handle all the events */
+	/* events, then when the seqp is told to game_play it will handle all the events */
 	/* at once completely emptying out the queue.  At this point this problem */
 	/* must be treated as an out of resource error and the evtq should be increased. */
 	evt->type = -1;
diff --git a/lib/ultralib/src/audio/sndp.h b/lib/ultralib/src/audio/sndp.h
index 17d7015..e21739d 100644
--- a/lib/ultralib/src/audio/sndp.h
+++ b/lib/ultralib/src/audio/sndp.h
@@ -53,7 +53,7 @@ typedef struct {
     ALSound     *sound;         /* sound referenced here */
     s16         priority;
     f32         pitch;          /* current playback pitch                    */
-    s32         state;          /* play state for this sound                 */
+    s32         state;          /* game_play state for this sound                 */
     s16         vol;            /* volume - combined with volume from bank   */
     ALPan       pan;            /* pan - 0 = left, 127 = right               */
     u8          fxMix;          /* wet/dry mix - 0 = dry, 127 = wet          */
diff --git a/lib/ultralib/src/error/commonerror.c b/lib/ultralib/src/error/commonerror.c
index 53cca55..7c60755 100644
--- a/lib/ultralib/src/error/commonerror.c
+++ b/lib/ultralib/src/error/commonerror.c
@@ -126,7 +126,7 @@ const char* __os_error_message[] = {
     "Synthesizer: no free updates",
     "alSndPDeallocate: attempt to deallocate a sound which is playing",
     "alSndpDelete: attempt to delete player with playing sounds",
-    "alSndpPlay: attempt to play a sound which is playing",
+    "alSndpPlay: attempt to game_play a sound which is playing",
     "alSndpSetSound: sound id (%d) out of range (0 - %d)",
     "alSndpSetPriority: sound id (%d) out of range (0 - %d)",
     "alSndpSet Parameter: target (%d) out of range (0 - %d)",
diff --git a/src/code/c_keyframe.c b/src/code/c_keyframe.c
index 352eac5..385de5e 100644
--- a/src/code/c_keyframe.c
+++ b/src/code/c_keyframe.c
@@ -529,7 +529,7 @@ s32 cKF_SkeletonInfo_R_play(SkeletonInfoR* skeletonInfo) {
         return cKF_FrameControl_play(&skeletonInfo->frameControl);
 
     } else if (skeletonInfo->morphCounter > 0.0f) {
-        // A positive morphCounter will wait to play the animation until the morph has finished.
+        // A positive morphCounter will wait to game_play the animation until the morph has finished.
         cKF_SkeletonInfo_R_morphJoint(skeletonInfo);
 
         skeletonInfo->morphCounter -= 1.0f;
@@ -539,7 +539,7 @@ s32 cKF_SkeletonInfo_R_play(SkeletonInfoR* skeletonInfo) {
         return 0;
 
     } else {
-        // A negative morphCounter will play the animation and morph at the same time.
+        // A negative morphCounter will game_play the animation and morph at the same time.
         cKF_SkeletonInfo_R_morphJoint(skeletonInfo);
 
         skeletonInfo->morphCounter += 1.0f;
@@ -563,8 +563,8 @@ s32 cKF_SkeletonInfo_R_play(SkeletonInfoR* skeletonInfo) {
  *
  * @param jointIndex The index of the jointElem to draw.
  */
-void cKF_Si3_draw_SV_R_child(PlayState* play, SkeletonInfoR* skeletonInfo, s32* jointIndex, DrawCallback beforeCallback,
-                             DrawCallback afterCallback, void* arg, Mtx** mtx) {
+void cKF_Si3_draw_SV_R_child(Game_Play* game_play, SkeletonInfoR* skeletonInfo, s32* jointIndex,
+                             DrawCallback beforeCallback, DrawCallback afterCallback, void* arg, Mtx** mtx) {
     JointElemR* jointElem = *jointIndex + (JointElemR*)Lib_SegmentedToVirtual(skeletonInfo->skeleton->jointElemTable);
     s32 i;
     Gfx* newDlist;
@@ -616,14 +616,14 @@ void cKF_Si3_draw_SV_R_child(PlayState* play, SkeletonInfoR* skeletonInfo, s32*
         }
     }
 
-    OPEN_DISPS(play->state.gfxCtx);
+    OPEN_DISPS(game_play->state.gfxCtx);
     Matrix_push();
     newDlist = shape = jointElem->shape;
     displayBufferFlag = jointElem->displayBufferFlag;
 
     if ((beforeCallback == NULL) ||
-        (beforeCallback != NULL && beforeCallback(play, skeletonInfo, *jointIndex, &newDlist, &displayBufferFlag, arg,
-                                                  &rotation, &translation) != NULL)) {
+        (beforeCallback != NULL && beforeCallback(game_play, skeletonInfo, *jointIndex, &newDlist, &displayBufferFlag,
+                                                  arg, &rotation, &translation) != NULL)) {
         Matrix_softcv3_mult(&translation, &rotation);
 
         if (newDlist != NULL) {
@@ -647,17 +647,18 @@ void cKF_Si3_draw_SV_R_child(PlayState* play, SkeletonInfoR* skeletonInfo, s32*
     }
 
     if (afterCallback != NULL) {
-        afterCallback(play, skeletonInfo, *jointIndex, &newDlist, &displayBufferFlag, arg, &rotation, &translation);
+        afterCallback(game_play, skeletonInfo, *jointIndex, &newDlist, &displayBufferFlag, arg, &rotation,
+                      &translation);
     }
 
     (*jointIndex)++;
 
     for (i = 0; i < jointElem->numberOfChildren; i++) {
-        cKF_Si3_draw_SV_R_child(play, skeletonInfo, jointIndex, beforeCallback, afterCallback, arg, mtx);
+        cKF_Si3_draw_SV_R_child(game_play, skeletonInfo, jointIndex, beforeCallback, afterCallback, arg, mtx);
     }
 
     Matrix_pull();
-    CLOSE_DISPS(play->state.gfxCtx);
+    CLOSE_DISPS(game_play->state.gfxCtx);
 }
 
 /**
@@ -665,17 +666,17 @@ void cKF_Si3_draw_SV_R_child(PlayState* play, SkeletonInfoR* skeletonInfo, s32*
  *
  * This function calls cKF_Si3_draw_SV_R_child() to recursively draw each joint.
  */
-void cKF_Si3_draw_R_SV(PlayState* play, SkeletonInfoR* skeletonInfo, Mtx* mtx, DrawCallback beforeCallback,
+void cKF_Si3_draw_R_SV(Game_Play* game_play, SkeletonInfoR* skeletonInfo, Mtx* mtx, DrawCallback beforeCallback,
                        DrawCallback afterCallback, void* arg) {
     s32 jointIndex;
 
     if (mtx != NULL) {
-        OPEN_DISPS(play->state.gfxCtx);
+        OPEN_DISPS(game_play->state.gfxCtx);
         gSPSegment(POLY_OPA_DISP++, 0x0D, mtx);
         gSPSegment(POLY_XLU_DISP++, 0x0D, mtx);
         jointIndex = 0;
-        cKF_Si3_draw_SV_R_child(play, skeletonInfo, &jointIndex, beforeCallback, afterCallback, arg, &mtx);
-        CLOSE_DISPS(play->state.gfxCtx);
+        cKF_Si3_draw_SV_R_child(game_play, skeletonInfo, &jointIndex, beforeCallback, afterCallback, arg, &mtx);
+        CLOSE_DISPS(game_play->state.gfxCtx);
     }
 }
 
diff --git a/src/code/game.c b/src/code/game.c
index 03677a8..a9a37ed 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -17,17 +17,17 @@
 #include "overlays/gamestates/ovl_famicom_emu/famicom_emu.h"
 #include "macros.h"
 
-GameState* gamePT = NULL;
+Game* gamePT = NULL;
 
 struct_80145020_jp B_80145020_jp;
 s16 B_80145040_jp;
-GameState* game_class_p;
+Game* game_class_p;
 u8 game_GameFrame;
 f32 game_GameFrameF;
 f32 game_GameFrame_2F;
 f32 game_GameFrame__1F;
 
-void func_800D2E00_jp(GameState* gameState) {
+void func_800D2E00_jp(Game* gameState) {
     if (zurumode_flag >= 2) {
         Debug_mode_input(CONTROLLER2(gameState));
     }
@@ -82,7 +82,7 @@ void func_800D2E58_jp(u16 button, Gfx** gfxP) {
     *gfxP = gfx;
 }
 
-void game_debug_draw_last(GameState* gameState, GraphicsContext* gfxCtx) {
+void game_debug_draw_last(Game* gameState, GraphicsContext* gfxCtx) {
     Gfx* gfx;
     Gfx* gfxHead;
 
@@ -172,7 +172,7 @@ void game_draw_last(GraphicsContext* gfxCtx) {
     CLOSE_DISPS(gfxCtx);
 }
 
-void game_get_controller(GameState* gameState) {
+void game_get_controller(Game* gameState) {
     if (gameState->unk_74 == 1) {
         padmgr_RequestPadData(gameState->input, 1);
     } else {
@@ -190,7 +190,7 @@ void SetGameFrame(s32 divisor) {
     }
 }
 
-void game_main(GameState* gameState) {
+void game_main(Game* gameState) {
     GraphicsContext* gfxCtx = gameState->gfxCtx;
     u8 gameframe = game_GameFrame;
 
@@ -213,7 +213,7 @@ void game_main(GameState* gameState) {
     gameState->unk_A0++;
 }
 
-void game_init_hyral(GameState* gameState, size_t size) {
+void game_init_hyral(Game* gameState, size_t size) {
     void* buf = gamealloc_malloc(&gameState->alloc, size);
 
     if (buf != NULL) {
@@ -225,7 +225,7 @@ void game_init_hyral(GameState* gameState, size_t size) {
     _dbg_hungup("../game.c", 462);
 }
 
-void game_resize_hyral(GameState* gameState, size_t size) {
+void game_resize_hyral(Game* gameState, size_t size) {
     GameAlloc* alloc = &gameState->alloc;
     void* gameArena;
     size_t maxFree;
@@ -254,7 +254,7 @@ void game_resize_hyral(GameState* gameState, size_t size) {
     _dbg_hungup("../game.c", 508);
 }
 
-void game_ct(GameState* gameState, GameStateFunc init, GraphicsContext* gfxCtx) {
+void game_ct(Game* gameState, GameStateFunc init, GraphicsContext* gfxCtx) {
     gamePT = gameState;
 
     gfxCtx->unk_2F2 = 1;
@@ -291,7 +291,7 @@ void game_ct(GameState* gameState, GameStateFunc init, GraphicsContext* gfxCtx)
     func_800D3E14_jp(gameState->gfxCtx);
 }
 
-void game_dt(GameState* gameState) {
+void game_dt(Game* gameState) {
     mCon_dt(gameState);
     func_800D3E40_jp(gameState->gfxCtx);
     mBGM_cleanup();
@@ -306,28 +306,28 @@ void game_dt(GameState* gameState) {
     gamePT = NULL;
 }
 
-GameStateFunc game_get_next_game_init(GameState* gameState) {
+GameStateFunc game_get_next_game_init(Game* gameState) {
     return gameState->init;
 }
 
-size_t game_get_next_game_class_size(GameState* gameState) {
+size_t game_get_next_game_class_size(Game* gameState) {
     return gameState->size;
 }
 
-s32 game_is_doing(GameState* gameState) {
+s32 game_is_doing(Game* gameState) {
     return gameState->running;
 }
 
-s32 game_getFreeBytes(GameState* gameState) {
+s32 game_getFreeBytes(Game* gameState) {
     return THA_getFreeBytes(&gameState->heap);
 }
 
-void game_goto_next_game_play(GameState* gameState) {
+void game_goto_next_game_play(Game* gameState) {
     STOP_GAMESTATE(gameState);
-    SET_NEXT_GAMESTATE(gameState, play_init, sizeof(PlayState));
+    SET_NEXT_GAMESTATE(gameState, play_init, sizeof(Game_Play));
 }
 
-void game_goto_next_game_name_famicom_emu(GameState* gameState) {
+void game_goto_next_game_name_famicom_emu(Game* gameState) {
     STOP_GAMESTATE(gameState);
-    SET_NEXT_GAMESTATE(gameState, famicom_emu_init, sizeof(FamicomEmuState));
+    SET_NEXT_GAMESTATE(gameState, famicom_emu_init, sizeof(Game_FamicomEmu));
 }
diff --git a/src/code/m_actor.c b/src/code/m_actor.c
index ccc31fd..21fc868 100644
--- a/src/code/m_actor.c
+++ b/src/code/m_actor.c
@@ -40,8 +40,8 @@ void func_80056380_jp(void* arg0, void* arg1 UNUSED) {
     FaultDrawer_Printf("ACTOR NAME %08x:%s", actor, name);
 }
 
-void projection_pos_set(PlayState* play, Vec3f* worldPos, Vec3f* projectedPos, f32* invW) {
-    Skin_Matrix_PrjMulVector(&play->viewProjectionMtxF, worldPos, projectedPos, invW);
+void projection_pos_set(Game_Play* game_play, Vec3f* worldPos, Vec3f* projectedPos, f32* invW) {
+    Skin_Matrix_PrjMulVector(&game_play->viewProjectionMtxF, worldPos, projectedPos, invW);
 
     *invW = (*invW < 1.0f) ? 1.0f : (1.0f / *invW);
 }
@@ -56,7 +56,7 @@ void Actor_world_to_eye(Actor* actor, f32 arg1) {
 }
 
 void Actor_position_move(Actor* actor) {
-    Kankyo* kankyo = &((PlayState*)gamePT)->kankyo;
+    Kankyo* kankyo = &((Game_Play*)gamePT)->kankyo;
     f32 speedRate;
 
     speedRate = game_GameFrame_2F;
@@ -80,34 +80,34 @@ void Actor_position_moveF(Actor* actor) {
     Actor_position_move(actor);
 }
 
-s32 Actor_player_look_direction_check(Actor* actor, s16 maxAngleDiff, PlayState* play) {
-    s16 yawDiff = BINANG_ROT180(actor->yawTowardsPlayer) - get_player_actor_withoutCheck(play)->actor.shape.rot.y;
+s32 Actor_player_look_direction_check(Actor* actor, s16 maxAngleDiff, Game_Play* game_play) {
+    s16 yawDiff = BINANG_ROT180(actor->yawTowardsPlayer) - get_player_actor_withoutCheck(game_play)->actor.shape.rot.y;
 
     return ABS(yawDiff) < maxAngleDiff;
 }
 
-void Actor_display_position_set(PlayState* play, Actor* actor, s16* x, s16* y) {
+void Actor_display_position_set(Game_Play* game_play, Actor* actor, s16* x, s16* y) {
     Vec3f projectedPos;
     f32 invW;
 
-    projection_pos_set(play, &actor->world.pos, &projectedPos, &invW);
+    projection_pos_set(game_play, &actor->world.pos, &projectedPos, &invW);
 
     // Explicit cast to avoid implicit cast from f32 to s16
     *x = (s32)PROJECTED_TO_SCREEN_X(projectedPos, invW);
     *y = (s32)PROJECTED_TO_SCREEN_Y(projectedPos, invW);
 }
 
-s32 Actor_data_bank_dma_end_check(Actor* actor, PlayState* play) {
+s32 Actor_data_bank_dma_end_check(Actor* actor, Game_Play* game_play) {
     s32 var_v1;
 
     switch (ACTOR_FGNAME_GET_F000(actor->fgName)) {
         case FGNAME_F000_D:
         case FGNAME_F000_E:
-            var_v1 = common_data.unk_1004C->unk_F4(play->unk_0110, actor);
+            var_v1 = common_data.unk_1004C->unk_F4(game_play->unk_0110, actor);
             break;
 
         default:
-            var_v1 = play->unk_0110[actor->unk_026].unk_00 > 0;
+            var_v1 = game_play->unk_0110[actor->unk_026].unk_00 > 0;
             break;
     }
 
@@ -145,14 +145,14 @@ void Actor_delete(Actor* actor) {
     }
 }
 
-void Actor_ct(Actor* actor, PlayState* play) {
+void Actor_ct(Actor* actor, Game_Play* game_play) {
     s32 pad[2] UNUSED;
-    PlayState_unk_0110* temp;
+    Game_Play_unk_0110* temp;
     Npc* npc;
     CommonData_unk_1004C_unk_14_arg0 sp34;
-    PlayState_unk_0110* temp_a0;
+    Game_Play_unk_0110* temp_a0;
 
-    temp_a0 = play->unk_0110;
+    temp_a0 = game_play->unk_0110;
 
     temp = temp_a0;
     temp += actor->unk_026;
@@ -192,25 +192,25 @@ void Actor_ct(Actor* actor, PlayState* play) {
     CollisionCheck_Status_ct(&actor->colStatus);
     Shape_Info_init(actor, 0.0f, NULL, 0.0f, 0.0f);
 
-    if (Actor_data_bank_dma_end_check(actor, play) == 1) {
+    if (Actor_data_bank_dma_end_check(actor, game_play) == 1) {
         gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(temp_a0[actor->unk_026].segment);
-        actor->ct(actor, play);
+        actor->ct(actor, game_play);
         actor->ct = NULL;
     }
 }
 
 #ifdef NON_MATCHING
-void Actor_dt(Actor* actor, PlayState* play) {
-    PlayState_unk_0110* temp_v0_6;
+void Actor_dt(Actor* actor, Game_Play* game_play) {
+    Game_Play_unk_0110* temp_v0_6;
     s32 new_var;
 
     if (actor->save != NULL) {
-        actor->save(actor, play);
+        actor->save(actor, game_play);
         actor->save = NULL;
     }
 
     if (actor->dt != NULL) {
-        actor->dt(actor, play);
+        actor->dt(actor, game_play);
         actor->dt = NULL;
     }
 
@@ -222,7 +222,7 @@ void Actor_dt(Actor* actor, PlayState* play) {
         actor->parent->child = NULL;
     }
 
-    temp_v0_6 = play->unk_0110;
+    temp_v0_6 = game_play->unk_0110;
     if (0) {}
 
     switch ((actor->fgName & 0xF000) >> 0xC) {
@@ -232,7 +232,7 @@ void Actor_dt(Actor* actor, PlayState* play) {
             break;
 
         default:
-            new_var = play->unk_190C;
+            new_var = game_play->unk_190C;
 
             if (actor->unk_026 >= new_var) {
                 temp_v0_6 = &temp_v0_6[(void)0, actor->unk_026];
@@ -245,11 +245,11 @@ void Actor_dt(Actor* actor, PlayState* play) {
     }
 }
 #else
-void Actor_dt(Actor* actor, struct PlayState* play);
+void Actor_dt(Actor* actor, struct Game_Play* game_play);
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_actor/Actor_dt.s")
 #endif
 
-void Actor_draw(PlayState* play, Actor* actor) {
+void Actor_draw(Game_Play* game_play, Actor* actor) {
     FaultClient faultClient;
     Lights* light;
 
@@ -261,18 +261,19 @@ void Actor_draw(PlayState* play, Actor* actor) {
     if (1) {}
     if (1) {}
 
-    OPEN_DISPS(play->state.gfxCtx);
+    OPEN_DISPS(game_play->state.gfxCtx);
 
-    light = Global_light_read(&play->lightCtx, play->state.gfxCtx);
-    LightsN_list_check(light, play->lightCtx.listHead, (actor->flags & ACTOR_FLAG_400000) ? NULL : &actor->world.pos);
-    LightsN_disp(light, play->state.gfxCtx);
+    light = Global_light_read(&game_play->lightCtx, game_play->state.gfxCtx);
+    LightsN_list_check(light, game_play->lightCtx.listHead,
+                       (actor->flags & ACTOR_FLAG_400000) ? NULL : &actor->world.pos);
+    LightsN_disp(light, game_play->state.gfxCtx);
 
     Matrix_softcv3_load(actor->world.pos.x, actor->world.pos.y + actor->shape.unk_08 * actor->scale.y,
                         actor->world.pos.z, &actor->shape.rot);
     Matrix_scale(actor->scale.x, actor->scale.y, actor->scale.z, MTXMODE_APPLY);
 
     {
-        void* segment = play->unk_0110[(void)0, actor->unk_026].segment;
+        void* segment = game_play->unk_0110[(void)0, actor->unk_026].segment;
 
         gSegments[6] = (uintptr_t)OS_PHYSICAL_TO_K0(segment);
 
@@ -281,13 +282,13 @@ void Actor_draw(PlayState* play, Actor* actor) {
         gSPSegment(UNK_2C0_DISP++, 0x06, segment);
     }
 
-    actor->draw(actor, play);
+    actor->draw(actor, game_play);
 
     if (actor->shape.unk_0C != NULL) {
-        actor->shape.unk_0C(actor, light, play);
+        actor->shape.unk_0C(actor, light, game_play);
     }
 
-    CLOSE_DISPS(play->state.gfxCtx);
+    CLOSE_DISPS(game_play->state.gfxCtx);
 
     Fault_RemoveClient(&faultClient);
 }
@@ -328,7 +329,7 @@ void Actor_cull_check(Actor* actor) {
     }
 }
 
-void Actor_delete_check(Actor* actor, PlayState* play) {
+void Actor_delete_check(Actor* actor, Game_Play* game_play) {
     if ((actor->flags & (ACTOR_FLAG_40 | ACTOR_FLAG_20 | ACTOR_FLAG_10)) || (actor->fgName == 0)) {
         return;
     }
@@ -337,15 +338,15 @@ void Actor_delete_check(Actor* actor, PlayState* play) {
         return;
     }
 
-    if ((actor->unk_008 == play->unk_00E4) && (actor->unk_009 == play->unk_00E5)) {
+    if ((actor->unk_008 == game_play->unk_00E4) && (actor->unk_009 == game_play->unk_00E5)) {
         return;
     }
 
     Actor_delete(actor);
 }
 
-void Actor_info_ct(PlayState* play2, ActorInfo* actorInfo, ActorEntry* actorEntry) {
-    PlayState* play = play2;
+void Actor_info_ct(Game_Play* play2, ActorInfo* actorInfo, ActorEntry* actorEntry) {
+    Game_Play* game_play = play2;
     Actor* temp_v0;
     ActorOverlay* var_v0;
     ActorEntry* var_s0_2;
@@ -355,8 +356,8 @@ void Actor_info_ct(PlayState* play2, ActorInfo* actorInfo, ActorEntry* actorEntr
     bzero(actorInfo, sizeof(ActorInfo));
 
     actor_dlftbls_init();
-    Matrix_copy_MtxF(&play->billboardMtxF, &MtxF_clear);
-    Matrix_copy_MtxF(&play->viewProjectionMtxF, &MtxF_clear);
+    Matrix_copy_MtxF(&game_play->billboardMtxF, &MtxF_clear);
+    Matrix_copy_MtxF(&game_play->viewProjectionMtxF, &MtxF_clear);
 
     var_v0 = actor_dlftbls;
     for (var_s1 = 0; var_s1 < 0xC9; var_s1++) {
@@ -370,59 +371,59 @@ void Actor_info_ct(PlayState* play2, ActorInfo* actorInfo, ActorEntry* actorEntr
     }
 
     if (common_data.unk_107B6 != 0xC9) {
-        Actor_info_make_actor(actorInfo, play, common_data.unk_107B6, 0.0f, 0.0f, 0.0f, 0, 0, 0, -1, -1, -1, 0, -1, -1,
-                              -1);
+        Actor_info_make_actor(actorInfo, game_play, common_data.unk_107B6, 0.0f, 0.0f, 0.0f, 0, 0, 0, -1, -1, -1, 0, -1,
+                              -1, -1);
     }
     common_data.unk_107B6 = 0xC9;
 
 label:
 
-    temp_v0 = Actor_info_make_actor(actorInfo, play, actorEntry->id, actorEntry->pos.x, actorEntry->pos.y,
+    temp_v0 = Actor_info_make_actor(actorInfo, game_play, actorEntry->id, actorEntry->pos.x, actorEntry->pos.y,
                                     actorEntry->pos.z, actorEntry->rot.x, actorEntry->rot.y, actorEntry->rot.z, -1, -1,
                                     -1, 0, actorEntry->params, -1, -1);
     if (temp_v0 != NULL) {
         temp_v0->world.pos.y = mCoBG_GetBgY_OnlyCenter_FromWpos2(temp_v0->world.pos, 0.0f);
-        mFI_SetBearActor(play, temp_v0->world.pos, 0);
+        mFI_SetBearActor(game_play, temp_v0->world.pos, 0);
     }
 
     if (common_data.unk_1014E != 0) {
-        Actor_info_make_actor(actorInfo, play, common_data.unk_1014E, 0.0f, 0.0f, 0.0f, 0, 0, 0, -1, -1, -1, 0, -1, -1,
-                              -1);
+        Actor_info_make_actor(actorInfo, game_play, common_data.unk_1014E, 0.0f, 0.0f, 0.0f, 0, 0, 0, -1, -1, -1, 0, -1,
+                              -1, -1);
     }
 
-    if (play->unk_1EA6 != 0) {
-        var_s0 = play->unk_1EB0;
+    if (game_play->unk_1EA6 != 0) {
+        var_s0 = game_play->unk_1EB0;
 
-        for (var_s1 = 0; var_s1 < play->unk_1EA6; var_s1++) {
-            Actor_info_make_actor(&play->actorInfo, play, *var_s0, 0.0f, 0.0f, 0.0f, 0, 0, 0, -1, -1, -1, 0, -1, -1,
-                                  -1);
+        for (var_s1 = 0; var_s1 < game_play->unk_1EA6; var_s1++) {
+            Actor_info_make_actor(&game_play->actorInfo, game_play, *var_s0, 0.0f, 0.0f, 0.0f, 0, 0, 0, -1, -1, -1, 0,
+                                  -1, -1, -1);
             var_s0 += 1;
         }
-        play->unk_1EA6 = 0;
+        game_play->unk_1EA6 = 0;
     }
 
-    mSc_regist_initial_exchange_bank(play);
+    mSc_regist_initial_exchange_bank(game_play);
 
-    if (play->unk_1EA5 != 0) {
-        var_s0_2 = play->unk_1EAC;
-        for (var_s1 = 0; var_s1 < play->unk_1EA5; var_s1++) {
-            Actor_info_make_actor(&play->actorInfo, play, var_s0_2->id, var_s0_2->pos.x, var_s0_2->pos.y,
+    if (game_play->unk_1EA5 != 0) {
+        var_s0_2 = game_play->unk_1EAC;
+        for (var_s1 = 0; var_s1 < game_play->unk_1EA5; var_s1++) {
+            Actor_info_make_actor(&game_play->actorInfo, game_play, var_s0_2->id, var_s0_2->pos.x, var_s0_2->pos.y,
                                   var_s0_2->pos.z, var_s0_2->rot.x, var_s0_2->rot.y, var_s0_2->rot.z, -1, -1, -1, 0,
                                   var_s0_2->params, -1, -1);
             var_s0_2 += 1;
         }
-        play->unk_1EA5 = 0;
+        game_play->unk_1EA5 = 0;
     }
 }
 
-void Actor_info_dt(ActorInfo* actorInfo, PlayState* play) {
+void Actor_info_dt(ActorInfo* actorInfo, Game_Play* game_play) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(actorInfo->actorLists); i++) {
         Actor* actor = actorInfo->actorLists[i].head;
 
         while (actor != NULL) {
-            Actor_info_delete(actorInfo, actor, play);
+            Actor_info_delete(actorInfo, actor, game_play);
             actor = actorInfo->actorLists[i].head;
         }
     }
@@ -430,12 +431,12 @@ void Actor_info_dt(ActorInfo* actorInfo, PlayState* play) {
     actor_dlftbls_cleanup();
 }
 
-void Actor_info_call_actor(PlayState* play, ActorInfo* actorInfo) {
+void Actor_info_call_actor(Game_Play* game_play, ActorInfo* actorInfo) {
     s32 pad[1] UNUSED;
     ActorPart part;
     Player* player;
 
-    player = get_player_actor_withoutCheck(play);
+    player = get_player_actor_withoutCheck(game_play);
     func_8008E5F4_jp(player->actor.world.pos);
 
     for (part = 0; part < ACTOR_PART_MAX; part++) {
@@ -443,41 +444,41 @@ void Actor_info_call_actor(PlayState* play, ActorInfo* actorInfo) {
         Actor* next;
 
         for (actor = actorInfo->actorLists[part].head; actor != NULL; actor = next) {
-            play->state.unk_9C = actor->name;
-            play->state.unk_9D = 0x97;
+            game_play->state.unk_9C = actor->name;
+            game_play->state.unk_9D = 0x97;
 
             if (actor->world.pos.y < -25000.0f) {
                 actor->world.pos.y = -25000.0f;
             }
 
             if (actor->ct != NULL) {
-                if (Actor_data_bank_dma_end_check(actor, play) == 1) {
-                    gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(play->unk_0110[actor->unk_026].segment);
+                if (Actor_data_bank_dma_end_check(actor, game_play) == 1) {
+                    gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_0110[actor->unk_026].segment);
 
-                    play->state.unk_9D = 0x98;
-                    actor->ct(actor, play);
-                    play->state.unk_9D = 0x99;
+                    game_play->state.unk_9D = 0x98;
+                    actor->ct(actor, game_play);
+                    game_play->state.unk_9D = 0x99;
                     actor->ct = NULL;
                 }
                 next = actor->next;
-            } else if (Actor_data_bank_dma_end_check(actor, play) == 0) {
-                play->state.unk_9D = 0x9A;
+            } else if (Actor_data_bank_dma_end_check(actor, game_play) == 0) {
+                game_play->state.unk_9D = 0x9A;
                 Actor_delete(actor);
-                play->state.unk_9D = 0x9B;
+                game_play->state.unk_9D = 0x9B;
                 next = actor->next;
             } else if (actor->update == NULL) {
                 if (!actor->isDrawn) {
-                    play->state.unk_9D = 0x9C;
-                    next = Actor_info_delete(&play->actorInfo, actor, play);
-                    play->state.unk_9D = 0x9D;
+                    game_play->state.unk_9D = 0x9C;
+                    next = Actor_info_delete(&game_play->actorInfo, actor, game_play);
+                    game_play->state.unk_9D = 0x9D;
                 } else {
-                    play->state.unk_9D = 0x9E;
-                    Actor_dt(actor, play);
-                    play->state.unk_9D = 0x9F;
+                    game_play->state.unk_9D = 0x9E;
+                    Actor_dt(actor, game_play);
+                    game_play->state.unk_9D = 0x9F;
                     next = actor->next;
                 }
             } else {
-                play->state.unk_9D = 0xA0;
+                game_play->state.unk_9D = 0xA0;
                 xyz_t_move(&actor->prevPos, &actor->world.pos);
 
                 actor->xzDistToPlayer = search_position_distanceXZ(&actor->world.pos, &player->actor.world.pos);
@@ -488,10 +489,10 @@ void Actor_info_call_actor(PlayState* play, ActorInfo* actorInfo) {
 
                 actor->flags &= ~ACTOR_FLAG_1000000;
                 if ((actor->flags & (ACTOR_FLAG_40 | ACTOR_FLAG_10)) || (actor->part == ACTOR_PART_NPC)) {
-                    gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(play->unk_0110[actor->unk_026].segment);
-                    play->state.unk_9D = 0xA1;
-                    actor->update(actor, play);
-                    play->state.unk_9D = 0xA2;
+                    gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_0110[actor->unk_026].segment);
+                    game_play->state.unk_9D = 0xA1;
+                    actor->update(actor, game_play);
+                    game_play->state.unk_9D = 0xA2;
                 }
 
                 CollisionCheck_Status_Clear(&actor->colStatus);
@@ -500,11 +501,11 @@ void Actor_info_call_actor(PlayState* play, ActorInfo* actorInfo) {
         }
     }
 
-    play->state.unk_9D = 0xA3;
+    game_play->state.unk_9D = 0xA3;
 }
 
-void Actor_info_draw_actor(PlayState* play, ActorInfo* actorInfo) {
-    PlayState_unk_2208 temp_s4 = play->unk_2208;
+void Actor_info_draw_actor(Game_Play* game_play, ActorInfo* actorInfo) {
+    Game_Play_unk_2208 temp_s4 = game_play->unk_2208;
     ActorListEntry* actorEntry = actorInfo->actorLists;
     ActorPart part = 0;
 
@@ -516,11 +517,11 @@ void Actor_info_draw_actor(PlayState* play, ActorInfo* actorInfo) {
         for (actor = actorEntry->head; actor != NULL; actor = actor->next) {
             s32 temp;
 
-            Skin_Matrix_PrjMulVector(&play->viewProjectionMtxF, &actor->world.pos, &actor->projectedPos,
+            Skin_Matrix_PrjMulVector(&game_play->viewProjectionMtxF, &actor->world.pos, &actor->projectedPos,
                                      &actor->projectedW);
             Actor_cull_check(actor);
 
-            temp = temp_s4(actor, play);
+            temp = temp_s4(actor, game_play);
             actor->isDrawn = false;
 
             if (temp != 0) {
@@ -533,17 +534,17 @@ void Actor_info_draw_actor(PlayState* play, ActorInfo* actorInfo) {
 
             if (actor->flags & (ACTOR_FLAG_40 | ACTOR_FLAG_20)) {
                 if (!(actor->flags & ACTOR_FLAG_80) && (actor->unk_148 == 0) && (actor->unk_149 == 0)) {
-                    Actor_draw(play, actor);
+                    Actor_draw(game_play, actor);
                     actor->isDrawn = true;
                 }
             } else {
-                Actor_delete_check(actor, play);
+                Actor_delete_check(actor, game_play);
             }
         }
     }
 
     if (debug_mode->r[0x380] == 0) {
-        Light_list_point_draw(play);
+        Light_list_point_draw(game_play);
     }
 }
 
@@ -673,7 +674,8 @@ s32 func_80057940_jp(ActorProfile** profileP, ActorOverlay* overlayEntry, const
 }
 
 // this function may be Actor_data_bank_regist_check_npc
-s32 func_80057A8C_jp(s32* arg0, ActorProfile* profile UNUSED, ActorOverlay* overlayEntry, PlayState* play, u16 fgName) {
+s32 func_80057A8C_jp(s32* arg0, ActorProfile* profile UNUSED, ActorOverlay* overlayEntry, Game_Play* game_play,
+                     u16 fgName) {
     s32 pad UNUSED;
     s16 sp92;
     s16 sp90;
@@ -691,8 +693,8 @@ s32 func_80057A8C_jp(s32* arg0, ActorProfile* profile UNUSED, ActorOverlay* over
         sp90 = sp24.unk_02;
     }
 
-    *arg0 = mSc_bank_regist_check(play->unk_0110, sp92);
-    temp_v0 = mSc_bank_regist_check(play->unk_0110, sp90);
+    *arg0 = mSc_bank_regist_check(game_play->unk_0110, sp92);
+    temp_v0 = mSc_bank_regist_check(game_play->unk_0110, sp90);
 
     if ((*arg0 < 0) || (temp_v0 < 0)) {
         if (*arg0 >= 0) {
@@ -701,21 +703,21 @@ s32 func_80057A8C_jp(s32* arg0, ActorProfile* profile UNUSED, ActorOverlay* over
         if (temp_v0 >= 0) {
             sp90 = 0;
         }
-        common_data.unk_1004C->unk_EC(play->unk_0110, sp92, sp90);
+        common_data.unk_1004C->unk_EC(game_play->unk_0110, sp92, sp90);
         actor_free_check(overlayEntry, fgName);
         ret = 0;
     }
     return ret;
 }
 
-s32 func_80057B70_jp(s32* arg0, ActorProfile* profile, ActorOverlay* overlayEntry, PlayState* play, u16 fgName) {
+s32 func_80057B70_jp(s32* arg0, ActorProfile* profile, ActorOverlay* overlayEntry, Game_Play* game_play, u16 fgName) {
     s32 pad UNUSED;
     s32 ret = 1;
 
-    *arg0 = mSc_bank_regist_check(play->unk_0110, profile->objectId);
+    *arg0 = mSc_bank_regist_check(game_play->unk_0110, profile->objectId);
 
     if (*arg0 == -1) {
-        func_800C6144_jp(play->unk_0110, profile->objectId);
+        func_800C6144_jp(game_play->unk_0110, profile->objectId);
         actor_free_check(overlayEntry, fgName);
         ret = 0;
     }
@@ -723,15 +725,15 @@ s32 func_80057B70_jp(s32* arg0, ActorProfile* profile, ActorOverlay* overlayEntr
     return ret;
 }
 
-s32 Actor_data_bank_regist_check(s32* arg0, ActorProfile* profile, ActorOverlay* overlayEntry, PlayState* play,
+s32 Actor_data_bank_regist_check(s32* arg0, ActorProfile* profile, ActorOverlay* overlayEntry, Game_Play* game_play,
                                  u16 fgName) {
     s32 var_v1 = 1;
 
     if (*arg0 == -1) {
         if (profile->part == ACTOR_PART_NPC) {
-            var_v1 = func_80057A8C_jp(arg0, profile, overlayEntry, play, fgName);
+            var_v1 = func_80057A8C_jp(arg0, profile, overlayEntry, game_play, fgName);
         } else {
-            var_v1 = func_80057B70_jp(arg0, profile, overlayEntry, play, fgName);
+            var_v1 = func_80057B70_jp(arg0, profile, overlayEntry, game_play, fgName);
         }
     }
     return var_v1;
@@ -768,9 +770,9 @@ s32 Actor_malloc_actor_class(Actor** actorP, ActorProfile* profile, ActorOverlay
     return 1;
 }
 
-void Actor_init_actor_class(Actor* actor, ActorProfile* profile, ActorOverlay* overlayEntry, PlayState* play, s32 arg4,
-                            f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s8 argB, s8 argC, s16 argD, u16 fgName,
-                            s16 params) {
+void Actor_init_actor_class(Actor* actor, ActorProfile* profile, ActorOverlay* overlayEntry, Game_Play* game_play,
+                            s32 arg4, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s8 argB, s8 argC, s16 argD,
+                            u16 fgName, s16 params) {
     mem_clear(actor, profile->instanceSize, 0);
 
     actor->overlayEntry = overlayEntry;
@@ -788,7 +790,7 @@ void Actor_init_actor_class(Actor* actor, ActorProfile* profile, ActorOverlay* o
 
     actor->params = params;
 
-    actor->unk_004 = play->unk_00E0;
+    actor->unk_004 = game_play->unk_00E0;
 
     actor->home.pos.x = x;
     actor->home.pos.y = y;
@@ -806,7 +808,7 @@ void Actor_init_actor_class(Actor* actor, ActorProfile* profile, ActorOverlay* o
 extern const struct_801161E8_jp RO_801161E8_jp;
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/code/m_actor/RO_801161E8_jp.s")
 
-Actor* Actor_info_make_actor(ActorInfo* actorInfo, PlayState* play, s16 actorId, f32 x, f32 y, f32 z, s16 rotX,
+Actor* Actor_info_make_actor(ActorInfo* actorInfo, Game_Play* game_play, s16 actorId, f32 x, f32 y, f32 z, s16 rotX,
                              s16 rotY, s16 rotZ, s8 arg9, s8 argA, s16 argB, u16 fgName, s16 params, s8 argE,
                              s32 argF) {
     u16* new_var = &fgName;
@@ -822,7 +824,7 @@ Actor* Actor_info_make_actor(ActorInfo* actorInfo, PlayState* play, s16 actorId,
     if (func_80057940_jp(&profile, temp_s0, &RO_801161E8_jp, size, *new_var) == 0) {
         return NULL;
     }
-    if (Actor_data_bank_regist_check(&argF, profile, temp_s0, play, fgName) == 0) {
+    if (Actor_data_bank_regist_check(&argF, profile, temp_s0, game_play, fgName) == 0) {
         return NULL;
     }
     if (Actor_malloc_actor_class(&sp68, profile, temp_s0, &RO_801161E8_jp, fgName) == 0) {
@@ -830,7 +832,7 @@ Actor* Actor_info_make_actor(ActorInfo* actorInfo, PlayState* play, s16 actorId,
     }
 
     temp_s0->numLoaded++;
-    Actor_init_actor_class(sp68, profile, temp_s0, play, argF, x, y, z, rotX, rotY, rotZ, arg9, argA, argB, fgName,
+    Actor_init_actor_class(sp68, profile, temp_s0, game_play, argF, x, y, z, rotX, rotY, rotZ, arg9, argA, argB, fgName,
                            params);
 
     Actor_info_part_new(actorInfo, sp68, profile->part);
@@ -841,17 +843,17 @@ Actor* Actor_info_make_actor(ActorInfo* actorInfo, PlayState* play, s16 actorId,
         uintptr_t segmentTemp;
 
         segmentTemp = gSegments[6];
-        Actor_ct(sp68, play);
+        Actor_ct(sp68, game_play);
         gSegments[6] = segmentTemp;
     }
 
     return sp68;
 }
 
-Actor* Actor_info_make_child_actor(ActorInfo* actorInfo, Actor* arg1, PlayState* play, s16 actorId, f32 x, f32 y, f32 z,
-                                   s16 rotX, s16 rotY, s16 rotZ, s16 argA, u16 fgName, s16 params, s32 argD) {
-    Actor* temp_v0 = Actor_info_make_actor(actorInfo, play, actorId, x, y, z, rotX, rotY, rotZ, -1, -1, argA, fgName,
-                                           params, -1, argD);
+Actor* Actor_info_make_child_actor(ActorInfo* actorInfo, Actor* arg1, Game_Play* game_play, s16 actorId, f32 x, f32 y,
+                                   f32 z, s16 rotX, s16 rotY, s16 rotZ, s16 argA, u16 fgName, s16 params, s32 argD) {
+    Actor* temp_v0 = Actor_info_make_actor(actorInfo, game_play, actorId, x, y, z, rotX, rotY, rotZ, -1, -1, argA,
+                                           fgName, params, -1, argD);
 
     if (temp_v0 != NULL) {
         arg1->child = temp_v0;
@@ -861,7 +863,7 @@ Actor* Actor_info_make_child_actor(ActorInfo* actorInfo, Actor* arg1, PlayState*
     return temp_v0;
 }
 
-void restore_fgdata(Actor* actor, PlayState* play UNUSED) {
+void restore_fgdata(Actor* actor, Game_Play* game_play UNUSED) {
     Vec3f sp34;
 
     if ((actor->fgName == 0) || (actor->unk_00A != -1)) {
@@ -897,16 +899,16 @@ s32 restore_flag[ACTOR_PART_MAX] = {
     0, // ACTOR_PART_7
 };
 
-void restore_fgdata_one(Actor* actor, PlayState* play) {
+void restore_fgdata_one(Actor* actor, Game_Play* game_play) {
     if (restore_flag[actor->part] == 1) {
-        restore_fgdata(actor, play);
+        restore_fgdata(actor, game_play);
     } else if (actor->unk_003 == 1) {
-        restore_fgdata(actor, play);
+        restore_fgdata(actor, game_play);
     }
 }
 
-void restore_fgdata_all(PlayState* play) {
-    ActorInfo* actorInfo = &play->actorInfo;
+void restore_fgdata_all(Game_Play* game_play) {
+    ActorInfo* actorInfo = &game_play->actorInfo;
     ActorPart part;
 
     for (part = 0; part < ACTOR_PART_MAX; part++) {
@@ -914,20 +916,20 @@ void restore_fgdata_all(PlayState* play) {
 
         if (restore_flag[part] == 1) {
             for (actor = actorInfo->actorLists[part].head; actor != NULL; actor = actor->next) {
-                restore_fgdata(actor, play);
+                restore_fgdata(actor, game_play);
             }
         } else {
             for (actor = actorInfo->actorLists[part].head; actor != NULL; actor = actor->next) {
                 if (actor->unk_003 == 1) {
-                    restore_fgdata(actor, play);
+                    restore_fgdata(actor, game_play);
                 }
             }
         }
     }
 }
 
-void Actor_info_save_actor(PlayState* play) {
-    ActorInfo* actorInfo = &play->actorInfo;
+void Actor_info_save_actor(Game_Play* game_play) {
+    ActorInfo* actorInfo = &game_play->actorInfo;
     ActorPart part;
 
     for (part = 0; part < ACTOR_PART_MAX; part++) {
@@ -935,16 +937,16 @@ void Actor_info_save_actor(PlayState* play) {
 
         for (actor = actorInfo->actorLists[part].head; actor != NULL; actor = actor->next) {
             if (actor->save != NULL) {
-                actor->save(actor, play);
+                actor->save(actor, game_play);
                 actor->save = NULL;
             }
         }
     }
 
-    restore_fgdata_all(play);
+    restore_fgdata_all(game_play);
 }
 
-Actor* Actor_info_delete(ActorInfo* actorInfo, Actor* actor, PlayState* play) {
+Actor* Actor_info_delete(ActorInfo* actorInfo, Actor* actor, Game_Play* game_play) {
     Actor* newHead;
     s32 pad UNUSED;
     ActorOverlay* overlayEntry;
@@ -952,8 +954,8 @@ Actor* Actor_info_delete(ActorInfo* actorInfo, Actor* actor, PlayState* play) {
 
     overlayEntry = actor->overlayEntry;
 
-    restore_fgdata_one(actor, play);
-    Actor_dt(actor, play);
+    restore_fgdata_one(actor, game_play);
+    Actor_dt(actor, game_play);
 
     newHead = Actor_info_part_delete(actorInfo, actor);
 
@@ -1115,29 +1117,29 @@ Hilite* HiliteReflect_light_init(Vec3f* object, Vec3f* eye, Vec3f* lightDir, Gra
     return hilite;
 }
 
-Hilite* Setpos_HiliteReflect_init(Vec3f* object, PlayState* play) {
+Hilite* Setpos_HiliteReflect_init(Vec3f* object, Game_Play* game_play) {
     Vec3f sp24;
 
-    sp24.x = play->kankyo.unk_02;
-    sp24.y = play->kankyo.unk_03;
-    sp24.z = play->kankyo.unk_04;
-    return HiliteReflect_init(object, &play->unk_1938.unk_028, &sp24, play->state.gfxCtx);
+    sp24.x = game_play->kankyo.unk_02;
+    sp24.y = game_play->kankyo.unk_03;
+    sp24.z = game_play->kankyo.unk_04;
+    return HiliteReflect_init(object, &game_play->unk_1938.unk_028, &sp24, game_play->state.gfxCtx);
 }
 
-Hilite* Setpos_HiliteReflect_xlu_init(Vec3f* object, PlayState* play) {
+Hilite* Setpos_HiliteReflect_xlu_init(Vec3f* object, Game_Play* game_play) {
     Vec3f sp24;
 
-    sp24.x = play->kankyo.unk_02;
-    sp24.y = play->kankyo.unk_03;
-    sp24.z = play->kankyo.unk_04;
-    return HiliteReflect_xlu_init(object, &play->unk_1938.unk_028, &sp24, play->state.gfxCtx);
+    sp24.x = game_play->kankyo.unk_02;
+    sp24.y = game_play->kankyo.unk_03;
+    sp24.z = game_play->kankyo.unk_04;
+    return HiliteReflect_xlu_init(object, &game_play->unk_1938.unk_028, &sp24, game_play->state.gfxCtx);
 }
 
-Hilite* Setpos_HiliteReflect_light_init(Vec3f* object, PlayState* play) {
+Hilite* Setpos_HiliteReflect_light_init(Vec3f* object, Game_Play* game_play) {
     Vec3f sp24;
 
-    sp24.x = play->kankyo.unk_02;
-    sp24.y = play->kankyo.unk_03;
-    sp24.z = play->kankyo.unk_04;
-    return HiliteReflect_xlu_init(object, &play->unk_1938.unk_028, &sp24, play->state.gfxCtx);
+    sp24.x = game_play->kankyo.unk_02;
+    sp24.y = game_play->kankyo.unk_03;
+    sp24.z = game_play->kankyo.unk_04;
+    return HiliteReflect_xlu_init(object, &game_play->unk_1938.unk_028, &sp24, game_play->state.gfxCtx);
 }
diff --git a/src/code/m_controller.c b/src/code/m_controller.c
index 1c108f5..41ab478 100644
--- a/src/code/m_controller.c
+++ b/src/code/m_controller.c
@@ -5,10 +5,10 @@
 #include "sys_math_atan.h"
 #include "attributes.h"
 
-void mCon_ct(UNUSED GameState* game) {
+void mCon_ct(UNUSED Game* game) {
 }
 
-void mCon_dt(UNUSED GameState* game) {
+void mCon_dt(UNUSED Game* game) {
 }
 
 void mCon_calc(Controller* controller, f32 x, f32 y) {
@@ -54,7 +54,7 @@ void mCon_calc(Controller* controller, f32 x, f32 y) {
     }
 }
 
-void mCon_main(GameState* game) {
+void mCon_main(Game* game) {
     Controller* controller = &game->controller;
     f32 x = getJoystick_X();
     f32 y = getJoystick_Y();
diff --git a/src/code/m_game_dlftbls.c b/src/code/m_game_dlftbls.c
index 21e59ec..45b17cc 100644
--- a/src/code/m_game_dlftbls.c
+++ b/src/code/m_game_dlftbls.c
@@ -22,7 +22,7 @@
 
 // Gamestate Overlay Table definition
 #define DEFINE_GAMESTATE_INTERNAL(typeName, _enumName) \
-    { NULL, 0, 0, NULL, NULL, NULL, typeName##_Init, typeName##_Destroy, NULL, NULL, 0, sizeof(typeName##State) },
+    { NULL, 0, 0, NULL, NULL, NULL, typeName##_Init, typeName##_Destroy, NULL, NULL, 0, sizeof(Game_##typeName) },
 
 #define DEFINE_GAMESTATE(typeName, _enumName, segmentName) \
     { NULL,                                                \
@@ -36,7 +36,7 @@
       NULL,                                                \
       NULL,                                                \
       0,                                                   \
-      sizeof(typeName##State) },
+      sizeof(Game_##typeName) },
 
 GameStateOverlay game_dlftbls[GAMESTATE_ID_MAX] = {
 #include "tables/gamestate_table.h"
diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c
index 815677e..1661c13 100644
--- a/src/code/sys_matrix.c
+++ b/src/code/sys_matrix.c
@@ -75,7 +75,7 @@ MtxF* Matrix_now;   // Top of the stack.
 /**
  * Create the matrix stack and set the pointer to the top of it.
  */
-void new_Matrix(GameState* gameState) {
+void new_Matrix(Game* gameState) {
     Matrix_now = THA_alloc16(&gameState->heap, MATRIX_STACK_SIZE * sizeof(MtxF));
     Matrix_stack = Matrix_now;
 }
diff --git a/src/overlays/actors/ovl_Airplane/ac_airplane.c b/src/overlays/actors/ovl_Airplane/ac_airplane.c
index 864d0c7..883c545 100644
--- a/src/overlays/actors/ovl_Airplane/ac_airplane.c
+++ b/src/overlays/actors/ovl_Airplane/ac_airplane.c
@@ -1,10 +1,10 @@
 #include "ac_airplane.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Airplane_Actor_ct(Actor* thisx, PlayState* play);
-void Airplane_Actor_dt(Actor* thisx, PlayState* play);
-void Airplane_Actor_move(Actor* thisx, PlayState* play);
-void Airplane_Actor_draw(Actor* thisx, PlayState* play);
+void Airplane_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Airplane_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Airplane_Actor_move(Actor* thisx, Game_Play* game_play);
+void Airplane_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Airplane_Profile = {
diff --git a/src/overlays/actors/ovl_Airplane/ac_airplane.h b/src/overlays/actors/ovl_Airplane/ac_airplane.h
index 4ba53b8..dfa8209 100644
--- a/src/overlays/actors/ovl_Airplane/ac_airplane.h
+++ b/src/overlays/actors/ovl_Airplane/ac_airplane.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Airplane;
 
-typedef void (*AirplaneActionFunc)(struct Airplane*, struct PlayState*);
+typedef void (*AirplaneActionFunc)(struct Airplane*, struct Game_Play*);
 
 typedef struct Airplane {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Animal_Logo/ac_animal_logo.c b/src/overlays/actors/ovl_Animal_Logo/ac_animal_logo.c
index f38bec5..1d223ad 100644
--- a/src/overlays/actors/ovl_Animal_Logo/ac_animal_logo.c
+++ b/src/overlays/actors/ovl_Animal_Logo/ac_animal_logo.c
@@ -1,10 +1,10 @@
 #include "ac_animal_logo.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aAL_actor_ct(Actor* thisx, PlayState* play);
-void aAL_actor_dt(Actor* thisx, PlayState* play);
-void aAL_actor_move(Actor* thisx, PlayState* play);
-void aAL_actor_draw(Actor* thisx, PlayState* play);
+void aAL_actor_ct(Actor* thisx, Game_Play* game_play);
+void aAL_actor_dt(Actor* thisx, Game_Play* game_play);
+void aAL_actor_move(Actor* thisx, Game_Play* game_play);
+void aAL_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Animal_Logo_Profile = {
diff --git a/src/overlays/actors/ovl_Animal_Logo/ac_animal_logo.h b/src/overlays/actors/ovl_Animal_Logo/ac_animal_logo.h
index 51d9d6c..9023bc0 100644
--- a/src/overlays/actors/ovl_Animal_Logo/ac_animal_logo.h
+++ b/src/overlays/actors/ovl_Animal_Logo/ac_animal_logo.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Animal_Logo;
 
-typedef void (*Animal_LogoActionFunc)(struct Animal_Logo*, struct PlayState*);
+typedef void (*Animal_LogoActionFunc)(struct Animal_Logo*, struct Game_Play*);
 
 typedef struct Animal_Logo {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Arrange_Furniture/ac_arrange_ftr.c b/src/overlays/actors/ovl_Arrange_Furniture/ac_arrange_ftr.c
index ce61d40..94e93fe 100644
--- a/src/overlays/actors/ovl_Arrange_Furniture/ac_arrange_ftr.c
+++ b/src/overlays/actors/ovl_Arrange_Furniture/ac_arrange_ftr.c
@@ -1,10 +1,10 @@
 #include "ac_arrange_ftr.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Arrange_Furniture_Actor_ct(Actor* thisx, PlayState* play);
-void Arrange_Furniture_Actor_dt(Actor* thisx, PlayState* play);
-void Arrange_Furniture_Actor_move(Actor* thisx, PlayState* play);
-void Arrange_Furniture_Actor_draw(Actor* thisx, PlayState* play);
+void Arrange_Furniture_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Arrange_Furniture_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Arrange_Furniture_Actor_move(Actor* thisx, Game_Play* game_play);
+void Arrange_Furniture_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Arrange_Furniture_Profile = {
diff --git a/src/overlays/actors/ovl_Arrange_Furniture/ac_arrange_ftr.h b/src/overlays/actors/ovl_Arrange_Furniture/ac_arrange_ftr.h
index b358e98..36b53d5 100644
--- a/src/overlays/actors/ovl_Arrange_Furniture/ac_arrange_ftr.h
+++ b/src/overlays/actors/ovl_Arrange_Furniture/ac_arrange_ftr.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Arrange_Furniture;
 
-typedef void (*Arrange_FurnitureActionFunc)(struct Arrange_Furniture*, struct PlayState*);
+typedef void (*Arrange_FurnitureActionFunc)(struct Arrange_Furniture*, struct Game_Play*);
 
 typedef struct Arrange_Furniture {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Arrange_Room/ac_arrange_room.c b/src/overlays/actors/ovl_Arrange_Room/ac_arrange_room.c
index fbe0e8e..d127f24 100644
--- a/src/overlays/actors/ovl_Arrange_Room/ac_arrange_room.c
+++ b/src/overlays/actors/ovl_Arrange_Room/ac_arrange_room.c
@@ -1,10 +1,10 @@
 #include "ac_arrange_room.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Arrange_Room_Actor_ct(Actor* thisx, PlayState* play);
-void Arrange_Room_Actor_dt(Actor* thisx, PlayState* play);
-void Arrange_Room_Actor_move(Actor* thisx, PlayState* play);
-void Arrange_Room_Actor_draw(Actor* thisx, PlayState* play);
+void Arrange_Room_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Arrange_Room_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Arrange_Room_Actor_move(Actor* thisx, Game_Play* game_play);
+void Arrange_Room_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Arrange_Room_Profile = {
diff --git a/src/overlays/actors/ovl_Arrange_Room/ac_arrange_room.h b/src/overlays/actors/ovl_Arrange_Room/ac_arrange_room.h
index 0d57853..1e6de9e 100644
--- a/src/overlays/actors/ovl_Arrange_Room/ac_arrange_room.h
+++ b/src/overlays/actors/ovl_Arrange_Room/ac_arrange_room.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Arrange_Room;
 
-typedef void (*Arrange_RoomActionFunc)(struct Arrange_Room*, struct PlayState*);
+typedef void (*Arrange_RoomActionFunc)(struct Arrange_Room*, struct Game_Play*);
 
 typedef struct Arrange_Room {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ball/ac_ball.c b/src/overlays/actors/ovl_Ball/ac_ball.c
index d4fc47f..cf7482c 100644
--- a/src/overlays/actors/ovl_Ball/ac_ball.c
+++ b/src/overlays/actors/ovl_Ball/ac_ball.c
@@ -1,10 +1,10 @@
 #include "ac_ball.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aBALL_actor_ct(Actor* thisx, PlayState* play);
-void aBALL_actor_dt(Actor* thisx, PlayState* play);
-void aBALL_actor_move(Actor* thisx, PlayState* play);
-void aBALL_actor_draw(Actor* thisx, PlayState* play);
+void aBALL_actor_ct(Actor* thisx, Game_Play* game_play);
+void aBALL_actor_dt(Actor* thisx, Game_Play* game_play);
+void aBALL_actor_move(Actor* thisx, Game_Play* game_play);
+void aBALL_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ball_Profile = {
diff --git a/src/overlays/actors/ovl_Ball/ac_ball.h b/src/overlays/actors/ovl_Ball/ac_ball.h
index 4fcf962..41653a0 100644
--- a/src/overlays/actors/ovl_Ball/ac_ball.h
+++ b/src/overlays/actors/ovl_Ball/ac_ball.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ball;
 
-typedef void (*BallActionFunc)(struct Ball*, struct PlayState*);
+typedef void (*BallActionFunc)(struct Ball*, struct Game_Play*);
 
 typedef struct Ball {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Bee/ac_bee.c b/src/overlays/actors/ovl_Bee/ac_bee.c
index 5313980..f69964b 100644
--- a/src/overlays/actors/ovl_Bee/ac_bee.c
+++ b/src/overlays/actors/ovl_Bee/ac_bee.c
@@ -1,10 +1,10 @@
 #include "ac_bee.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aBEE_actor_ct(Actor* thisx, PlayState* play);
-void func_80A93DD0_jp(Actor* thisx, PlayState* play);
-void aBEE_actor_move(Actor* thisx, PlayState* play);
-void aBEE_actor_draw(Actor* thisx, PlayState* play);
+void aBEE_actor_ct(Actor* thisx, Game_Play* game_play);
+void func_80A93DD0_jp(Actor* thisx, Game_Play* game_play);
+void aBEE_actor_move(Actor* thisx, Game_Play* game_play);
+void aBEE_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Bee_Profile = {
diff --git a/src/overlays/actors/ovl_Bee/ac_bee.h b/src/overlays/actors/ovl_Bee/ac_bee.h
index f035584..3e8e8b8 100644
--- a/src/overlays/actors/ovl_Bee/ac_bee.h
+++ b/src/overlays/actors/ovl_Bee/ac_bee.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Bee;
 
-typedef void (*BeeActionFunc)(struct Bee*, struct PlayState*);
+typedef void (*BeeActionFunc)(struct Bee*, struct Game_Play*);
 
 typedef struct Bee {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_BgCherryItem/bg_cherry_item.c b/src/overlays/actors/ovl_BgCherryItem/bg_cherry_item.c
index 41011c0..1ae0a04 100644
--- a/src/overlays/actors/ovl_BgCherryItem/bg_cherry_item.c
+++ b/src/overlays/actors/ovl_BgCherryItem/bg_cherry_item.c
@@ -1,10 +1,10 @@
 #include "bg_cherry_item.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void bCI_actor_ct(Actor* thisx, PlayState* play);
-void bCI_actor_dt(Actor* thisx, PlayState* play);
-void bCI_actor_move(Actor* thisx, PlayState* play);
-void bCI_actor_draw(Actor* thisx, PlayState* play);
+void bCI_actor_ct(Actor* thisx, Game_Play* game_play);
+void bCI_actor_dt(Actor* thisx, Game_Play* game_play);
+void bCI_actor_move(Actor* thisx, Game_Play* game_play);
+void bCI_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile BgCherryItem_Profile = {
diff --git a/src/overlays/actors/ovl_BgCherryItem/bg_cherry_item.h b/src/overlays/actors/ovl_BgCherryItem/bg_cherry_item.h
index 17b4874..2a6d3d3 100644
--- a/src/overlays/actors/ovl_BgCherryItem/bg_cherry_item.h
+++ b/src/overlays/actors/ovl_BgCherryItem/bg_cherry_item.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct BgCherryItem;
 
-typedef void (*BgCherryItemActionFunc)(struct BgCherryItem*, struct PlayState*);
+typedef void (*BgCherryItemActionFunc)(struct BgCherryItem*, struct Game_Play*);
 
 typedef struct BgCherryItem {
     /* 0x00000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_BgItem/bg_item.c b/src/overlays/actors/ovl_BgItem/bg_item.c
index 0008055..ba95026 100644
--- a/src/overlays/actors/ovl_BgItem/bg_item.c
+++ b/src/overlays/actors/ovl_BgItem/bg_item.c
@@ -1,10 +1,10 @@
 #include "bg_item.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void bIT_actor_ct(Actor* thisx, PlayState* play);
-void bIT_actor_dt(Actor* thisx, PlayState* play);
-void bIT_actor_move(Actor* thisx, PlayState* play);
-void bIT_actor_draw(Actor* thisx, PlayState* play);
+void bIT_actor_ct(Actor* thisx, Game_Play* game_play);
+void bIT_actor_dt(Actor* thisx, Game_Play* game_play);
+void bIT_actor_move(Actor* thisx, Game_Play* game_play);
+void bIT_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile BgItem_Profile = {
diff --git a/src/overlays/actors/ovl_BgItem/bg_item.h b/src/overlays/actors/ovl_BgItem/bg_item.h
index 003f291..1fcab4f 100644
--- a/src/overlays/actors/ovl_BgItem/bg_item.h
+++ b/src/overlays/actors/ovl_BgItem/bg_item.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct BgItem;
 
-typedef void (*BgItemActionFunc)(struct BgItem*, struct PlayState*);
+typedef void (*BgItemActionFunc)(struct BgItem*, struct Game_Play*);
 
 typedef struct BgItem {
     /* 0x00000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_BgPoliceItem/bg_police_item.c b/src/overlays/actors/ovl_BgPoliceItem/bg_police_item.c
index f76bd8a..c9ff89d 100644
--- a/src/overlays/actors/ovl_BgPoliceItem/bg_police_item.c
+++ b/src/overlays/actors/ovl_BgPoliceItem/bg_police_item.c
@@ -2,8 +2,8 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void bPI_actor_move(Actor* thisx, PlayState* play);
-void bPI_actor_draw(Actor* thisx, PlayState* play);
+void bPI_actor_move(Actor* thisx, Game_Play* game_play);
+void bPI_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile BgPoliceItem_Profile = {
diff --git a/src/overlays/actors/ovl_BgPoliceItem/bg_police_item.h b/src/overlays/actors/ovl_BgPoliceItem/bg_police_item.h
index 7fb8384..b118a61 100644
--- a/src/overlays/actors/ovl_BgPoliceItem/bg_police_item.h
+++ b/src/overlays/actors/ovl_BgPoliceItem/bg_police_item.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct BgPoliceItem;
 
-typedef void (*BgPoliceItemActionFunc)(struct BgPoliceItem*, struct PlayState*);
+typedef void (*BgPoliceItemActionFunc)(struct BgPoliceItem*, struct Game_Play*);
 
 typedef struct BgPoliceItem {
     /* 0x0000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_BgPostItem/bg_post_item.c b/src/overlays/actors/ovl_BgPostItem/bg_post_item.c
index 036077f..78ba024 100644
--- a/src/overlays/actors/ovl_BgPostItem/bg_post_item.c
+++ b/src/overlays/actors/ovl_BgPostItem/bg_post_item.c
@@ -2,8 +2,8 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void bPTI_actor_ct(Actor* thisx, PlayState* play);
-void bPTI_actor_draw(Actor* thisx, PlayState* play);
+void bPTI_actor_ct(Actor* thisx, Game_Play* game_play);
+void bPTI_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile BgPostItem_Profile = {
diff --git a/src/overlays/actors/ovl_BgPostItem/bg_post_item.h b/src/overlays/actors/ovl_BgPostItem/bg_post_item.h
index fb88643..c3beaab 100644
--- a/src/overlays/actors/ovl_BgPostItem/bg_post_item.h
+++ b/src/overlays/actors/ovl_BgPostItem/bg_post_item.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct BgPostItem;
 
-typedef void (*BgPostItemActionFunc)(struct BgPostItem*, struct PlayState*);
+typedef void (*BgPostItemActionFunc)(struct BgPostItem*, struct Game_Play*);
 
 typedef struct BgPostItem {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_BgWinterItem/bg_winter_item.c b/src/overlays/actors/ovl_BgWinterItem/bg_winter_item.c
index 6b15575..8932417 100644
--- a/src/overlays/actors/ovl_BgWinterItem/bg_winter_item.c
+++ b/src/overlays/actors/ovl_BgWinterItem/bg_winter_item.c
@@ -1,10 +1,10 @@
 #include "bg_winter_item.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void bWI_actor_ct(Actor* thisx, PlayState* play);
-void bWI_actor_dt(Actor* thisx, PlayState* play);
-void bWI_actor_move(Actor* thisx, PlayState* play);
-void bWI_actor_draw(Actor* thisx, PlayState* play);
+void bWI_actor_ct(Actor* thisx, Game_Play* game_play);
+void bWI_actor_dt(Actor* thisx, Game_Play* game_play);
+void bWI_actor_move(Actor* thisx, Game_Play* game_play);
+void bWI_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile BgWinterItem_Profile = {
diff --git a/src/overlays/actors/ovl_BgWinterItem/bg_winter_item.h b/src/overlays/actors/ovl_BgWinterItem/bg_winter_item.h
index 1cab64a..12f2a1d 100644
--- a/src/overlays/actors/ovl_BgWinterItem/bg_winter_item.h
+++ b/src/overlays/actors/ovl_BgWinterItem/bg_winter_item.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct BgWinterItem;
 
-typedef void (*BgWinterItemActionFunc)(struct BgWinterItem*, struct PlayState*);
+typedef void (*BgWinterItemActionFunc)(struct BgWinterItem*, struct Game_Play*);
 
 typedef struct BgWinterItem {
     /* 0x00000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_BgXmasItem/bg_xmas_item.c b/src/overlays/actors/ovl_BgXmasItem/bg_xmas_item.c
index 26c05de..ea4b05a 100644
--- a/src/overlays/actors/ovl_BgXmasItem/bg_xmas_item.c
+++ b/src/overlays/actors/ovl_BgXmasItem/bg_xmas_item.c
@@ -1,10 +1,10 @@
 #include "bg_xmas_item.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void bXI_actor_ct(Actor* thisx, PlayState* play);
-void bXI_actor_dt(Actor* thisx, PlayState* play);
-void bXI_actor_move(Actor* thisx, PlayState* play);
-void bXI_actor_draw(Actor* thisx, PlayState* play);
+void bXI_actor_ct(Actor* thisx, Game_Play* game_play);
+void bXI_actor_dt(Actor* thisx, Game_Play* game_play);
+void bXI_actor_move(Actor* thisx, Game_Play* game_play);
+void bXI_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile BgXmasItem_Profile = {
diff --git a/src/overlays/actors/ovl_BgXmasItem/bg_xmas_item.h b/src/overlays/actors/ovl_BgXmasItem/bg_xmas_item.h
index bf26094..746a76d 100644
--- a/src/overlays/actors/ovl_BgXmasItem/bg_xmas_item.h
+++ b/src/overlays/actors/ovl_BgXmasItem/bg_xmas_item.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct BgXmasItem;
 
-typedef void (*BgXmasItemActionFunc)(struct BgXmasItem*, struct PlayState*);
+typedef void (*BgXmasItemActionFunc)(struct BgXmasItem*, struct Game_Play*);
 
 typedef struct BgXmasItem {
     /* 0x00000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Birth_Control/ac_birth_control.c b/src/overlays/actors/ovl_Birth_Control/ac_birth_control.c
index aa244e8..bf5ed7d 100644
--- a/src/overlays/actors/ovl_Birth_Control/ac_birth_control.c
+++ b/src/overlays/actors/ovl_Birth_Control/ac_birth_control.c
@@ -2,7 +2,7 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aBC_actor_move(Actor* thisx, PlayState* play);
+void aBC_actor_move(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Birth_Control_Profile = {
diff --git a/src/overlays/actors/ovl_Birth_Control/ac_birth_control.h b/src/overlays/actors/ovl_Birth_Control/ac_birth_control.h
index 10f8a65..e33a6c9 100644
--- a/src/overlays/actors/ovl_Birth_Control/ac_birth_control.h
+++ b/src/overlays/actors/ovl_Birth_Control/ac_birth_control.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Birth_Control;
 
-typedef void (*Birth_ControlActionFunc)(struct Birth_Control*, struct PlayState*);
+typedef void (*Birth_ControlActionFunc)(struct Birth_Control*, struct Game_Play*);
 
 typedef struct Birth_Control {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_BoxManager/ac_boxManager.c b/src/overlays/actors/ovl_BoxManager/ac_boxManager.c
index eda16a7..c2214b4 100644
--- a/src/overlays/actors/ovl_BoxManager/ac_boxManager.c
+++ b/src/overlays/actors/ovl_BoxManager/ac_boxManager.c
@@ -1,10 +1,10 @@
 #include "ac_boxManager.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void BoxManager_Actor_ct(Actor* thisx, PlayState* play);
-void BoxManager_Actor_dt(Actor* thisx, PlayState* play);
-void BoxManager_Actor_move(Actor* thisx, PlayState* play);
-void BoxManager_Actor_draw(Actor* thisx, PlayState* play);
+void BoxManager_Actor_ct(Actor* thisx, Game_Play* game_play);
+void BoxManager_Actor_dt(Actor* thisx, Game_Play* game_play);
+void BoxManager_Actor_move(Actor* thisx, Game_Play* game_play);
+void BoxManager_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile BoxManager_Profile = {
diff --git a/src/overlays/actors/ovl_BoxManager/ac_boxManager.h b/src/overlays/actors/ovl_BoxManager/ac_boxManager.h
index 8135283..0cb3fd9 100644
--- a/src/overlays/actors/ovl_BoxManager/ac_boxManager.h
+++ b/src/overlays/actors/ovl_BoxManager/ac_boxManager.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct BoxManager;
 
-typedef void (*BoxManagerActionFunc)(struct BoxManager*, struct PlayState*);
+typedef void (*BoxManagerActionFunc)(struct BoxManager*, struct Game_Play*);
 
 typedef struct BoxManager {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_BoxMove/ac_boxMove.c b/src/overlays/actors/ovl_BoxMove/ac_boxMove.c
index 871fd93..2e1c05b 100644
--- a/src/overlays/actors/ovl_BoxMove/ac_boxMove.c
+++ b/src/overlays/actors/ovl_BoxMove/ac_boxMove.c
@@ -1,10 +1,10 @@
 #include "ac_boxMove.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void BoxMove_Actor_ct(Actor* thisx, PlayState* play);
-void BoxMove_Actor_dt(Actor* thisx, PlayState* play);
-void BoxMove_Actor_move(Actor* thisx, PlayState* play);
-void BoxMove_Actor_draw(Actor* thisx, PlayState* play);
+void BoxMove_Actor_ct(Actor* thisx, Game_Play* game_play);
+void BoxMove_Actor_dt(Actor* thisx, Game_Play* game_play);
+void BoxMove_Actor_move(Actor* thisx, Game_Play* game_play);
+void BoxMove_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile BoxMove_Profile = {
diff --git a/src/overlays/actors/ovl_BoxMove/ac_boxMove.h b/src/overlays/actors/ovl_BoxMove/ac_boxMove.h
index 06d3971..61bb6d4 100644
--- a/src/overlays/actors/ovl_BoxMove/ac_boxMove.h
+++ b/src/overlays/actors/ovl_BoxMove/ac_boxMove.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct BoxMove;
 
-typedef void (*BoxMoveActionFunc)(struct BoxMove*, struct PlayState*);
+typedef void (*BoxMoveActionFunc)(struct BoxMove*, struct Game_Play*);
 
 typedef struct BoxMove {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_BoxTrick01/ac_boxTrick01.c b/src/overlays/actors/ovl_BoxTrick01/ac_boxTrick01.c
index e34262b..c21f561 100644
--- a/src/overlays/actors/ovl_BoxTrick01/ac_boxTrick01.c
+++ b/src/overlays/actors/ovl_BoxTrick01/ac_boxTrick01.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void BoxTrick01_Actor_ct(Actor* thisx, PlayState* play);
-void BoxTrick01_Actor_dt(Actor* thisx, PlayState* play);
-void BoxTrick01_Actor_move(Actor* thisx, PlayState* play);
+void BoxTrick01_Actor_ct(Actor* thisx, Game_Play* game_play);
+void BoxTrick01_Actor_dt(Actor* thisx, Game_Play* game_play);
+void BoxTrick01_Actor_move(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile BoxTrick01_Profile = {
diff --git a/src/overlays/actors/ovl_BoxTrick01/ac_boxTrick01.h b/src/overlays/actors/ovl_BoxTrick01/ac_boxTrick01.h
index 394783b..82b6654 100644
--- a/src/overlays/actors/ovl_BoxTrick01/ac_boxTrick01.h
+++ b/src/overlays/actors/ovl_BoxTrick01/ac_boxTrick01.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct BoxTrick01;
 
-typedef void (*BoxTrick01ActionFunc)(struct BoxTrick01*, struct PlayState*);
+typedef void (*BoxTrick01ActionFunc)(struct BoxTrick01*, struct Game_Play*);
 
 typedef struct BoxTrick01 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_BrShop/ac_br_shop.c b/src/overlays/actors/ovl_BrShop/ac_br_shop.c
index ac5c12c..f697e26 100644
--- a/src/overlays/actors/ovl_BrShop/ac_br_shop.c
+++ b/src/overlays/actors/ovl_BrShop/ac_br_shop.c
@@ -1,10 +1,10 @@
 #include "ac_br_shop.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aBRS_actor_ct(Actor* thisx, PlayState* play);
-void aBRS_actor_dt(Actor* thisx, PlayState* play);
-void aBRS_actor_init(Actor* thisx, PlayState* play);
-void aBRS_actor_draw(Actor* thisx, PlayState* play);
+void aBRS_actor_ct(Actor* thisx, Game_Play* game_play);
+void aBRS_actor_dt(Actor* thisx, Game_Play* game_play);
+void aBRS_actor_init(Actor* thisx, Game_Play* game_play);
+void aBRS_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile BrShop_Profile = {
diff --git a/src/overlays/actors/ovl_BrShop/ac_br_shop.h b/src/overlays/actors/ovl_BrShop/ac_br_shop.h
index 6fcb2f0..5084afd 100644
--- a/src/overlays/actors/ovl_BrShop/ac_br_shop.h
+++ b/src/overlays/actors/ovl_BrShop/ac_br_shop.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct BrShop;
 
-typedef void (*BrShopActionFunc)(struct BrShop*, struct PlayState*);
+typedef void (*BrShopActionFunc)(struct BrShop*, struct Game_Play*);
 
 typedef struct BrShop {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Broker_Design/ac_broker_design.c b/src/overlays/actors/ovl_Broker_Design/ac_broker_design.c
index 7d3a47f..1412013 100644
--- a/src/overlays/actors/ovl_Broker_Design/ac_broker_design.c
+++ b/src/overlays/actors/ovl_Broker_Design/ac_broker_design.c
@@ -1,10 +1,10 @@
 #include "ac_broker_design.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Broker_Design_Actor_ct(Actor* thisx, PlayState* play);
-void Broker_Design_Actor_dt(Actor* thisx, PlayState* play);
-void Broker_Design_Actor_move(Actor* thisx, PlayState* play);
-void Broker_Design_Actor_draw(Actor* thisx, PlayState* play);
+void Broker_Design_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Broker_Design_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Broker_Design_Actor_move(Actor* thisx, Game_Play* game_play);
+void Broker_Design_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Broker_Design_Profile = {
diff --git a/src/overlays/actors/ovl_Broker_Design/ac_broker_design.h b/src/overlays/actors/ovl_Broker_Design/ac_broker_design.h
index 5326b41..f8fac93 100644
--- a/src/overlays/actors/ovl_Broker_Design/ac_broker_design.h
+++ b/src/overlays/actors/ovl_Broker_Design/ac_broker_design.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Broker_Design;
 
-typedef void (*Broker_DesignActionFunc)(struct Broker_Design*, struct PlayState*);
+typedef void (*Broker_DesignActionFunc)(struct Broker_Design*, struct Game_Play*);
 
 typedef struct Broker_Design {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Buggy/ac_buggy.c b/src/overlays/actors/ovl_Buggy/ac_buggy.c
index 5a20ed1..fcc79a5 100644
--- a/src/overlays/actors/ovl_Buggy/ac_buggy.c
+++ b/src/overlays/actors/ovl_Buggy/ac_buggy.c
@@ -1,10 +1,10 @@
 #include "ac_buggy.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aBGY_actor_ct(Actor* thisx, PlayState* play);
-void aBGY_actor_dt(Actor* thisx, PlayState* play);
-void aBGY_actor_init(Actor* thisx, PlayState* play);
-void aBGY_actor_draw(Actor* thisx, PlayState* play);
+void aBGY_actor_ct(Actor* thisx, Game_Play* game_play);
+void aBGY_actor_dt(Actor* thisx, Game_Play* game_play);
+void aBGY_actor_init(Actor* thisx, Game_Play* game_play);
+void aBGY_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Buggy_Profile = {
diff --git a/src/overlays/actors/ovl_Buggy/ac_buggy.h b/src/overlays/actors/ovl_Buggy/ac_buggy.h
index 016a197..5675ca5 100644
--- a/src/overlays/actors/ovl_Buggy/ac_buggy.h
+++ b/src/overlays/actors/ovl_Buggy/ac_buggy.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Buggy;
 
-typedef void (*BuggyActionFunc)(struct Buggy*, struct PlayState*);
+typedef void (*BuggyActionFunc)(struct Buggy*, struct Game_Play*);
 
 typedef struct Buggy {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Conveni/ac_conveni.c b/src/overlays/actors/ovl_Conveni/ac_conveni.c
index 5512eda..07a6115 100644
--- a/src/overlays/actors/ovl_Conveni/ac_conveni.c
+++ b/src/overlays/actors/ovl_Conveni/ac_conveni.c
@@ -1,10 +1,10 @@
 #include "ac_conveni.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aCNV_actor_ct(Actor* thisx, PlayState* play);
-void aCNV_actor_dt(Actor* thisx, PlayState* play);
-void aCNV_actor_init(Actor* thisx, PlayState* play);
-void aCNV_actor_draw(Actor* thisx, PlayState* play);
+void aCNV_actor_ct(Actor* thisx, Game_Play* game_play);
+void aCNV_actor_dt(Actor* thisx, Game_Play* game_play);
+void aCNV_actor_init(Actor* thisx, Game_Play* game_play);
+void aCNV_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Conveni_Profile = {
diff --git a/src/overlays/actors/ovl_Conveni/ac_conveni.h b/src/overlays/actors/ovl_Conveni/ac_conveni.h
index b45d5c6..e7a2cd9 100644
--- a/src/overlays/actors/ovl_Conveni/ac_conveni.h
+++ b/src/overlays/actors/ovl_Conveni/ac_conveni.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Conveni;
 
-typedef void (*ConveniActionFunc)(struct Conveni*, struct PlayState*);
+typedef void (*ConveniActionFunc)(struct Conveni*, struct Game_Play*);
 
 typedef struct Conveni {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Count/ac_countdown.c b/src/overlays/actors/ovl_Count/ac_countdown.c
index 934f2ba..027b87e 100644
--- a/src/overlays/actors/ovl_Count/ac_countdown.c
+++ b/src/overlays/actors/ovl_Count/ac_countdown.c
@@ -1,10 +1,10 @@
 #include "ac_countdown.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_805ac0ac(Actor* thisx, PlayState* play);
-void func_805ac120(Actor* thisx, PlayState* play);
-void func_805ac5ec(Actor* thisx, PlayState* play);
-void func_805ac7b0(Actor* thisx, PlayState* play);
+void func_805ac0ac(Actor* thisx, Game_Play* game_play);
+void func_805ac120(Actor* thisx, Game_Play* game_play);
+void func_805ac5ec(Actor* thisx, Game_Play* game_play);
+void func_805ac7b0(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Count_Profile = {
diff --git a/src/overlays/actors/ovl_Count/ac_countdown.h b/src/overlays/actors/ovl_Count/ac_countdown.h
index 12b7d85..0bcf38c 100644
--- a/src/overlays/actors/ovl_Count/ac_countdown.h
+++ b/src/overlays/actors/ovl_Count/ac_countdown.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Count;
 
-typedef void (*CountActionFunc)(struct Count*, struct PlayState*);
+typedef void (*CountActionFunc)(struct Count*, struct Game_Play*);
 
 typedef struct Count {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Count02/ac_count02.c b/src/overlays/actors/ovl_Count02/ac_count02.c
index af28c77..ac5c46f 100644
--- a/src/overlays/actors/ovl_Count02/ac_count02.c
+++ b/src/overlays/actors/ovl_Count02/ac_count02.c
@@ -1,10 +1,10 @@
 #include "ac_count02.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_805ab8b8(Actor* thisx, PlayState* play);
-void func_805ab988(Actor* thisx, PlayState* play);
-void func_805abdac(Actor* thisx, PlayState* play);
-void func_805abe88(Actor* thisx, PlayState* play);
+void func_805ab8b8(Actor* thisx, Game_Play* game_play);
+void func_805ab988(Actor* thisx, Game_Play* game_play);
+void func_805abdac(Actor* thisx, Game_Play* game_play);
+void func_805abe88(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Count02_Profile = {
diff --git a/src/overlays/actors/ovl_Count02/ac_count02.h b/src/overlays/actors/ovl_Count02/ac_count02.h
index add3f29..3268848 100644
--- a/src/overlays/actors/ovl_Count02/ac_count02.h
+++ b/src/overlays/actors/ovl_Count02/ac_count02.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Count02;
 
-typedef void (*Count02ActionFunc)(struct Count02*, struct PlayState*);
+typedef void (*Count02ActionFunc)(struct Count02*, struct Game_Play*);
 
 typedef struct Count02 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Countdown_Npc0/ac_countdown_npc0.c b/src/overlays/actors/ovl_Countdown_Npc0/ac_countdown_npc0.c
index aebf8a8..3fdfb44 100644
--- a/src/overlays/actors/ovl_Countdown_Npc0/ac_countdown_npc0.c
+++ b/src/overlays/actors/ovl_Countdown_Npc0/ac_countdown_npc0.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aCD0_actor_ct(Actor* thisx, PlayState* play);
-void aCD0_actor_dt(Actor* thisx, PlayState* play);
-void aCD0_actor_init(Actor* thisx, PlayState* play);
-void aCD0_actor_save(Actor* thisx, PlayState* play);
+void aCD0_actor_ct(Actor* thisx, Game_Play* game_play);
+void aCD0_actor_dt(Actor* thisx, Game_Play* game_play);
+void aCD0_actor_init(Actor* thisx, Game_Play* game_play);
+void aCD0_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Countdown_Npc0_Profile = {
diff --git a/src/overlays/actors/ovl_Countdown_Npc0/ac_countdown_npc0.h b/src/overlays/actors/ovl_Countdown_Npc0/ac_countdown_npc0.h
index 39f275a..30182b7 100644
--- a/src/overlays/actors/ovl_Countdown_Npc0/ac_countdown_npc0.h
+++ b/src/overlays/actors/ovl_Countdown_Npc0/ac_countdown_npc0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Countdown_Npc0;
 
-typedef void (*Countdown_Npc0ActionFunc)(struct Countdown_Npc0*, struct PlayState*);
+typedef void (*Countdown_Npc0ActionFunc)(struct Countdown_Npc0*, struct Game_Play*);
 
 typedef struct Countdown_Npc0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Countdown_Npc1/ac_countdown_npc1.c b/src/overlays/actors/ovl_Countdown_Npc1/ac_countdown_npc1.c
index 7a2a2bd..64c9571 100644
--- a/src/overlays/actors/ovl_Countdown_Npc1/ac_countdown_npc1.c
+++ b/src/overlays/actors/ovl_Countdown_Npc1/ac_countdown_npc1.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aCD1_actor_ct(Actor* thisx, PlayState* play);
-void aCD1_actor_dt(Actor* thisx, PlayState* play);
-void aCD1_actor_init(Actor* thisx, PlayState* play);
-void aCD1_actor_save(Actor* thisx, PlayState* play);
+void aCD1_actor_ct(Actor* thisx, Game_Play* game_play);
+void aCD1_actor_dt(Actor* thisx, Game_Play* game_play);
+void aCD1_actor_init(Actor* thisx, Game_Play* game_play);
+void aCD1_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Countdown_Npc1_Profile = {
diff --git a/src/overlays/actors/ovl_Countdown_Npc1/ac_countdown_npc1.h b/src/overlays/actors/ovl_Countdown_Npc1/ac_countdown_npc1.h
index f6bd901..3ad57c2 100644
--- a/src/overlays/actors/ovl_Countdown_Npc1/ac_countdown_npc1.h
+++ b/src/overlays/actors/ovl_Countdown_Npc1/ac_countdown_npc1.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Countdown_Npc1;
 
-typedef void (*Countdown_Npc1ActionFunc)(struct Countdown_Npc1*, struct PlayState*);
+typedef void (*Countdown_Npc1ActionFunc)(struct Countdown_Npc1*, struct Game_Play*);
 
 typedef struct Countdown_Npc1 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Depart/ac_depart.c b/src/overlays/actors/ovl_Depart/ac_depart.c
index a53eba9..f3b616a 100644
--- a/src/overlays/actors/ovl_Depart/ac_depart.c
+++ b/src/overlays/actors/ovl_Depart/ac_depart.c
@@ -1,10 +1,10 @@
 #include "ac_depart.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aDPT_actor_ct(Actor* thisx, PlayState* play);
-void aDPT_actor_dt(Actor* thisx, PlayState* play);
-void aDPT_actor_init(Actor* thisx, PlayState* play);
-void aDPT_actor_draw(Actor* thisx, PlayState* play);
+void aDPT_actor_ct(Actor* thisx, Game_Play* game_play);
+void aDPT_actor_dt(Actor* thisx, Game_Play* game_play);
+void aDPT_actor_init(Actor* thisx, Game_Play* game_play);
+void aDPT_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Depart_Profile = {
diff --git a/src/overlays/actors/ovl_Depart/ac_depart.h b/src/overlays/actors/ovl_Depart/ac_depart.h
index 27edaad..458b42b 100644
--- a/src/overlays/actors/ovl_Depart/ac_depart.h
+++ b/src/overlays/actors/ovl_Depart/ac_depart.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Depart;
 
-typedef void (*DepartActionFunc)(struct Depart*, struct PlayState*);
+typedef void (*DepartActionFunc)(struct Depart*, struct Game_Play*);
 
 typedef struct Depart {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Douzou/ac_douzou.c b/src/overlays/actors/ovl_Douzou/ac_douzou.c
index 21e31b6..24e6c52 100644
--- a/src/overlays/actors/ovl_Douzou/ac_douzou.c
+++ b/src/overlays/actors/ovl_Douzou/ac_douzou.c
@@ -1,10 +1,10 @@
 #include "ac_douzou.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aDOU_actor_ct(Actor* thisx, PlayState* play);
-void aDOU_actor_dt(Actor* thisx, PlayState* play);
-void aDOU_actor_init(Actor* thisx, PlayState* play);
-void aDOU_actor_draw(Actor* thisx, PlayState* play);
+void aDOU_actor_ct(Actor* thisx, Game_Play* game_play);
+void aDOU_actor_dt(Actor* thisx, Game_Play* game_play);
+void aDOU_actor_init(Actor* thisx, Game_Play* game_play);
+void aDOU_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Douzou_Profile = {
diff --git a/src/overlays/actors/ovl_Douzou/ac_douzou.h b/src/overlays/actors/ovl_Douzou/ac_douzou.h
index 3904063..16af4c7 100644
--- a/src/overlays/actors/ovl_Douzou/ac_douzou.h
+++ b/src/overlays/actors/ovl_Douzou/ac_douzou.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Douzou;
 
-typedef void (*DouzouActionFunc)(struct Douzou*, struct PlayState*);
+typedef void (*DouzouActionFunc)(struct Douzou*, struct Game_Play*);
 
 typedef struct Douzou {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Dummy/ac_dumm.c b/src/overlays/actors/ovl_Dummy/ac_dumm.c
index fe6d973..4619db8 100644
--- a/src/overlays/actors/ovl_Dummy/ac_dumm.c
+++ b/src/overlays/actors/ovl_Dummy/ac_dumm.c
@@ -1,10 +1,10 @@
 #include "ac_dumm.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Dummy_Actor_ct(Actor* thisx, PlayState* play);
-void Dummy_Actor_dt(Actor* thisx, PlayState* play);
-void Dummy_Actor_move(Actor* thisx, PlayState* play);
-void Dummy_Actor_draw(Actor* thisx, PlayState* play);
+void Dummy_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Dummy_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Dummy_Actor_move(Actor* thisx, Game_Play* game_play);
+void Dummy_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Dummy_Profile = {
diff --git a/src/overlays/actors/ovl_Dummy/ac_dumm.h b/src/overlays/actors/ovl_Dummy/ac_dumm.h
index b6bd2d7..48daa13 100644
--- a/src/overlays/actors/ovl_Dummy/ac_dumm.h
+++ b/src/overlays/actors/ovl_Dummy/ac_dumm.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Dummy;
 
-typedef void (*DummyActionFunc)(struct Dummy*, struct PlayState*);
+typedef void (*DummyActionFunc)(struct Dummy*, struct Game_Play*);
 
 typedef struct Dummy {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Dump/ac_dump.c b/src/overlays/actors/ovl_Dump/ac_dump.c
index 2a44d58..6bb8459 100644
--- a/src/overlays/actors/ovl_Dump/ac_dump.c
+++ b/src/overlays/actors/ovl_Dump/ac_dump.c
@@ -1,10 +1,10 @@
 #include "ac_dump.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aDUM_actor_ct(Actor* thisx, PlayState* play);
-void aDUM_actor_dt(Actor* thisx, PlayState* play);
-void aDUM_actor_init(Actor* thisx, PlayState* play);
-void aDUM_actor_draw(Actor* thisx, PlayState* play);
+void aDUM_actor_ct(Actor* thisx, Game_Play* game_play);
+void aDUM_actor_dt(Actor* thisx, Game_Play* game_play);
+void aDUM_actor_init(Actor* thisx, Game_Play* game_play);
+void aDUM_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Dump_Profile = {
diff --git a/src/overlays/actors/ovl_Dump/ac_dump.h b/src/overlays/actors/ovl_Dump/ac_dump.h
index ac874c3..85ff7d8 100644
--- a/src/overlays/actors/ovl_Dump/ac_dump.h
+++ b/src/overlays/actors/ovl_Dump/ac_dump.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Dump;
 
-typedef void (*DumpActionFunc)(struct Dump*, struct PlayState*);
+typedef void (*DumpActionFunc)(struct Dump*, struct Game_Play*);
 
 typedef struct Dump {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Effect_Control/ef_effect_control.c b/src/overlays/actors/ovl_Effect_Control/ef_effect_control.c
index f1ec1eb..34fef64 100644
--- a/src/overlays/actors/ovl_Effect_Control/ef_effect_control.c
+++ b/src/overlays/actors/ovl_Effect_Control/ef_effect_control.c
@@ -1,10 +1,10 @@
 #include "ef_effect_control.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void eEC_actor_ct(Actor* thisx, PlayState* play);
-void eEC_actor_dt(Actor* thisx, PlayState* play);
-void eEC_actor_move(Actor* thisx, PlayState* play);
-void eEC_actor_draw(Actor* thisx, PlayState* play);
+void eEC_actor_ct(Actor* thisx, Game_Play* game_play);
+void eEC_actor_dt(Actor* thisx, Game_Play* game_play);
+void eEC_actor_move(Actor* thisx, Game_Play* game_play);
+void eEC_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Effect_Control_Profile = {
diff --git a/src/overlays/actors/ovl_Effect_Control/ef_effect_control.h b/src/overlays/actors/ovl_Effect_Control/ef_effect_control.h
index 20c360c..2552cf6 100644
--- a/src/overlays/actors/ovl_Effect_Control/ef_effect_control.h
+++ b/src/overlays/actors/ovl_Effect_Control/ef_effect_control.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Effect_Control;
 
-typedef void (*Effect_ControlActionFunc)(struct Effect_Control*, struct PlayState*);
+typedef void (*Effect_ControlActionFunc)(struct Effect_Control*, struct Game_Play*);
 
 typedef struct Effect_Control {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Effectbg/ac_effectbg.c b/src/overlays/actors/ovl_Effectbg/ac_effectbg.c
index 24cabc0..38cbc5e 100644
--- a/src/overlays/actors/ovl_Effectbg/ac_effectbg.c
+++ b/src/overlays/actors/ovl_Effectbg/ac_effectbg.c
@@ -1,10 +1,10 @@
 #include "ac_effectbg.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Effectbg_actor_ct(Actor* thisx, PlayState* play);
-void Effectbg_actor_dt(Actor* thisx, PlayState* play);
-void Effectbg_actor_move(Actor* thisx, PlayState* play);
-void Effectbg_actor_draw(Actor* thisx, PlayState* play);
+void Effectbg_actor_ct(Actor* thisx, Game_Play* game_play);
+void Effectbg_actor_dt(Actor* thisx, Game_Play* game_play);
+void Effectbg_actor_move(Actor* thisx, Game_Play* game_play);
+void Effectbg_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Effectbg_Profile = {
diff --git a/src/overlays/actors/ovl_Effectbg/ac_effectbg.h b/src/overlays/actors/ovl_Effectbg/ac_effectbg.h
index 1988c1b..020f2e7 100644
--- a/src/overlays/actors/ovl_Effectbg/ac_effectbg.h
+++ b/src/overlays/actors/ovl_Effectbg/ac_effectbg.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Effectbg;
 
-typedef void (*EffectbgActionFunc)(struct Effectbg*, struct PlayState*);
+typedef void (*EffectbgActionFunc)(struct Effectbg*, struct Game_Play*);
 
 typedef struct Effectbg {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Angler/ac_ev_angler.c b/src/overlays/actors/ovl_Ev_Angler/ac_ev_angler.c
index c17dd66..5293246 100644
--- a/src/overlays/actors/ovl_Ev_Angler/ac_ev_angler.c
+++ b/src/overlays/actors/ovl_Ev_Angler/ac_ev_angler.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEANG_actor_ct(Actor* thisx, PlayState* play);
-void aEANG_actor_dt(Actor* thisx, PlayState* play);
-void aEANG_actor_init(Actor* thisx, PlayState* play);
-void aEANG_actor_save(Actor* thisx, PlayState* play);
+void aEANG_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEANG_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEANG_actor_init(Actor* thisx, Game_Play* game_play);
+void aEANG_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Angler_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Angler/ac_ev_angler.h b/src/overlays/actors/ovl_Ev_Angler/ac_ev_angler.h
index 7cd4281..078c47f 100644
--- a/src/overlays/actors/ovl_Ev_Angler/ac_ev_angler.h
+++ b/src/overlays/actors/ovl_Ev_Angler/ac_ev_angler.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Angler;
 
-typedef void (*Ev_AnglerActionFunc)(struct Ev_Angler*, struct PlayState*);
+typedef void (*Ev_AnglerActionFunc)(struct Ev_Angler*, struct Game_Play*);
 
 typedef struct Ev_Angler {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Artist/ac_ev_artist.c b/src/overlays/actors/ovl_Ev_Artist/ac_ev_artist.c
index 3b52a57..6faeab4 100644
--- a/src/overlays/actors/ovl_Ev_Artist/ac_ev_artist.c
+++ b/src/overlays/actors/ovl_Ev_Artist/ac_ev_artist.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEART_actor_ct(Actor* thisx, PlayState* play);
-void aEART_actor_dt(Actor* thisx, PlayState* play);
-void aEART_actor_init(Actor* thisx, PlayState* play);
-void aEART_actor_save(Actor* thisx, PlayState* play);
+void aEART_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEART_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEART_actor_init(Actor* thisx, Game_Play* game_play);
+void aEART_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Artist_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Artist/ac_ev_artist.h b/src/overlays/actors/ovl_Ev_Artist/ac_ev_artist.h
index e033fcb..7b579a6 100644
--- a/src/overlays/actors/ovl_Ev_Artist/ac_ev_artist.h
+++ b/src/overlays/actors/ovl_Ev_Artist/ac_ev_artist.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Artist;
 
-typedef void (*Ev_ArtistActionFunc)(struct Ev_Artist*, struct PlayState*);
+typedef void (*Ev_ArtistActionFunc)(struct Ev_Artist*, struct Game_Play*);
 
 typedef struct Ev_Artist {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Broker/ac_ev_broker.c b/src/overlays/actors/ovl_Ev_Broker/ac_ev_broker.c
index cb2a59a..475993d 100644
--- a/src/overlays/actors/ovl_Ev_Broker/ac_ev_broker.c
+++ b/src/overlays/actors/ovl_Ev_Broker/ac_ev_broker.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEBRK_actor_ct(Actor* thisx, PlayState* play);
-void aEBRK_actor_dt(Actor* thisx, PlayState* play);
-void aEBRK_actor_init(Actor* thisx, PlayState* play);
-void aEBRK_actor_save(Actor* thisx, PlayState* play);
+void aEBRK_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEBRK_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEBRK_actor_init(Actor* thisx, Game_Play* game_play);
+void aEBRK_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Broker_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Broker/ac_ev_broker.h b/src/overlays/actors/ovl_Ev_Broker/ac_ev_broker.h
index 4c65c31..6ff011e 100644
--- a/src/overlays/actors/ovl_Ev_Broker/ac_ev_broker.h
+++ b/src/overlays/actors/ovl_Ev_Broker/ac_ev_broker.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Broker;
 
-typedef void (*Ev_BrokerActionFunc)(struct Ev_Broker*, struct PlayState*);
+typedef void (*Ev_BrokerActionFunc)(struct Ev_Broker*, struct Game_Play*);
 
 typedef struct Ev_Broker {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Broker2/ac_ev_broker2.c b/src/overlays/actors/ovl_Ev_Broker2/ac_ev_broker2.c
index 11272d4..1b7d180 100644
--- a/src/overlays/actors/ovl_Ev_Broker2/ac_ev_broker2.c
+++ b/src/overlays/actors/ovl_Ev_Broker2/ac_ev_broker2.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEBR2_actor_ct(Actor* thisx, PlayState* play);
-void aEBR2_actor_dt(Actor* thisx, PlayState* play);
-void aEBR2_actor_init(Actor* thisx, PlayState* play);
-void aEBR2_actor_save(Actor* thisx, PlayState* play);
+void aEBR2_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEBR2_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEBR2_actor_init(Actor* thisx, Game_Play* game_play);
+void aEBR2_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Broker2_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Broker2/ac_ev_broker2.h b/src/overlays/actors/ovl_Ev_Broker2/ac_ev_broker2.h
index de66a47..68c2b0d 100644
--- a/src/overlays/actors/ovl_Ev_Broker2/ac_ev_broker2.h
+++ b/src/overlays/actors/ovl_Ev_Broker2/ac_ev_broker2.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Broker2;
 
-typedef void (*Ev_Broker2ActionFunc)(struct Ev_Broker2*, struct PlayState*);
+typedef void (*Ev_Broker2ActionFunc)(struct Ev_Broker2*, struct Game_Play*);
 
 typedef struct Ev_Broker2 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_CarpetPeddler/ac_ev_carpetPeddler.c b/src/overlays/actors/ovl_Ev_CarpetPeddler/ac_ev_carpetPeddler.c
index cc326c6..edb260b 100644
--- a/src/overlays/actors/ovl_Ev_CarpetPeddler/ac_ev_carpetPeddler.c
+++ b/src/overlays/actors/ovl_Ev_CarpetPeddler/ac_ev_carpetPeddler.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aECPD_actor_ct(Actor* thisx, PlayState* play);
-void aECPD_actor_dt(Actor* thisx, PlayState* play);
-void aECPD_actor_init(Actor* thisx, PlayState* play);
-void aECPD_actor_save(Actor* thisx, PlayState* play);
+void aECPD_actor_ct(Actor* thisx, Game_Play* game_play);
+void aECPD_actor_dt(Actor* thisx, Game_Play* game_play);
+void aECPD_actor_init(Actor* thisx, Game_Play* game_play);
+void aECPD_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_CarpetPeddler_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_CarpetPeddler/ac_ev_carpetPeddler.h b/src/overlays/actors/ovl_Ev_CarpetPeddler/ac_ev_carpetPeddler.h
index da4c448..1100012 100644
--- a/src/overlays/actors/ovl_Ev_CarpetPeddler/ac_ev_carpetPeddler.h
+++ b/src/overlays/actors/ovl_Ev_CarpetPeddler/ac_ev_carpetPeddler.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_CarpetPeddler;
 
-typedef void (*Ev_CarpetPeddlerActionFunc)(struct Ev_CarpetPeddler*, struct PlayState*);
+typedef void (*Ev_CarpetPeddlerActionFunc)(struct Ev_CarpetPeddler*, struct Game_Play*);
 
 typedef struct Ev_CarpetPeddler {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Cherry_Manager/ev_cherry_manager.c b/src/overlays/actors/ovl_Ev_Cherry_Manager/ev_cherry_manager.c
index 757f029..4af1acc 100644
--- a/src/overlays/actors/ovl_Ev_Cherry_Manager/ev_cherry_manager.c
+++ b/src/overlays/actors/ovl_Ev_Cherry_Manager/ev_cherry_manager.c
@@ -1,10 +1,10 @@
 #include "ev_cherry_manager.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void eChryMgr_ct(Actor* thisx, PlayState* play);
-void eChryMgr_dt(Actor* thisx, PlayState* play);
-void eChryMgr_move(Actor* thisx, PlayState* play);
-void eChryMgr_draw(Actor* thisx, PlayState* play);
+void eChryMgr_ct(Actor* thisx, Game_Play* game_play);
+void eChryMgr_dt(Actor* thisx, Game_Play* game_play);
+void eChryMgr_move(Actor* thisx, Game_Play* game_play);
+void eChryMgr_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Cherry_Manager_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Cherry_Manager/ev_cherry_manager.h b/src/overlays/actors/ovl_Ev_Cherry_Manager/ev_cherry_manager.h
index ca96b9e..90ca6ab 100644
--- a/src/overlays/actors/ovl_Ev_Cherry_Manager/ev_cherry_manager.h
+++ b/src/overlays/actors/ovl_Ev_Cherry_Manager/ev_cherry_manager.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Cherry_Manager;
 
-typedef void (*Ev_Cherry_ManagerActionFunc)(struct Ev_Cherry_Manager*, struct PlayState*);
+typedef void (*Ev_Cherry_ManagerActionFunc)(struct Ev_Cherry_Manager*, struct Game_Play*);
 
 typedef struct Ev_Cherry_Manager {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Designer/ac_ev_designer.c b/src/overlays/actors/ovl_Ev_Designer/ac_ev_designer.c
index 1e14e6e..328e308 100644
--- a/src/overlays/actors/ovl_Ev_Designer/ac_ev_designer.c
+++ b/src/overlays/actors/ovl_Ev_Designer/ac_ev_designer.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEDSN_actor_ct(Actor* thisx, PlayState* play);
-void aEDSN_actor_dt(Actor* thisx, PlayState* play);
-void aEDSN_actor_init(Actor* thisx, PlayState* play);
-void aEDSN_actor_save(Actor* thisx, PlayState* play);
+void aEDSN_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEDSN_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEDSN_actor_init(Actor* thisx, Game_Play* game_play);
+void aEDSN_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Designer_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Designer/ac_ev_designer.h b/src/overlays/actors/ovl_Ev_Designer/ac_ev_designer.h
index 0754f74..5b9f84d 100644
--- a/src/overlays/actors/ovl_Ev_Designer/ac_ev_designer.h
+++ b/src/overlays/actors/ovl_Ev_Designer/ac_ev_designer.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Designer;
 
-typedef void (*Ev_DesignerActionFunc)(struct Ev_Designer*, struct PlayState*);
+typedef void (*Ev_DesignerActionFunc)(struct Ev_Designer*, struct Game_Play*);
 
 typedef struct Ev_Designer {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Dokutu/ac_ev_dokutu.c b/src/overlays/actors/ovl_Ev_Dokutu/ac_ev_dokutu.c
index e4ca0f2..adffdd6 100644
--- a/src/overlays/actors/ovl_Ev_Dokutu/ac_ev_dokutu.c
+++ b/src/overlays/actors/ovl_Ev_Dokutu/ac_ev_dokutu.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEVD_actor_ct(Actor* thisx, PlayState* play);
-void aEVD_actor_dt(Actor* thisx, PlayState* play);
-void aEVD_actor_init(Actor* thisx, PlayState* play);
-void aEVD_actor_save(Actor* thisx, PlayState* play);
+void aEVD_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEVD_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEVD_actor_init(Actor* thisx, Game_Play* game_play);
+void aEVD_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Dokutu_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Dokutu/ac_ev_dokutu.h b/src/overlays/actors/ovl_Ev_Dokutu/ac_ev_dokutu.h
index 8414086..cce24cf 100644
--- a/src/overlays/actors/ovl_Ev_Dokutu/ac_ev_dokutu.h
+++ b/src/overlays/actors/ovl_Ev_Dokutu/ac_ev_dokutu.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Dokutu;
 
-typedef void (*Ev_DokutuActionFunc)(struct Ev_Dokutu*, struct PlayState*);
+typedef void (*Ev_DokutuActionFunc)(struct Ev_Dokutu*, struct Game_Play*);
 
 typedef struct Ev_Dokutu {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Dozaemon/ac_ev_dozaemon.c b/src/overlays/actors/ovl_Ev_Dozaemon/ac_ev_dozaemon.c
index 913ede3..2db166c 100644
--- a/src/overlays/actors/ovl_Ev_Dozaemon/ac_ev_dozaemon.c
+++ b/src/overlays/actors/ovl_Ev_Dozaemon/ac_ev_dozaemon.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEDZ_actor_ct(Actor* thisx, PlayState* play);
-void aEDZ_actor_dt(Actor* thisx, PlayState* play);
-void aEDZ_actor_init(Actor* thisx, PlayState* play);
-void aEDZ_actor_save(Actor* thisx, PlayState* play);
+void aEDZ_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEDZ_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEDZ_actor_init(Actor* thisx, Game_Play* game_play);
+void aEDZ_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Dozaemon_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Dozaemon/ac_ev_dozaemon.h b/src/overlays/actors/ovl_Ev_Dozaemon/ac_ev_dozaemon.h
index 6825c12..d03df39 100644
--- a/src/overlays/actors/ovl_Ev_Dozaemon/ac_ev_dozaemon.h
+++ b/src/overlays/actors/ovl_Ev_Dozaemon/ac_ev_dozaemon.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Dozaemon;
 
-typedef void (*Ev_DozaemonActionFunc)(struct Ev_Dozaemon*, struct PlayState*);
+typedef void (*Ev_DozaemonActionFunc)(struct Ev_Dozaemon*, struct Game_Play*);
 
 typedef struct Ev_Dozaemon {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Gypsy/ac_ev_gypsy.c b/src/overlays/actors/ovl_Ev_Gypsy/ac_ev_gypsy.c
index 85173fe..593e4dd 100644
--- a/src/overlays/actors/ovl_Ev_Gypsy/ac_ev_gypsy.c
+++ b/src/overlays/actors/ovl_Ev_Gypsy/ac_ev_gypsy.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEGPS_actor_ct(Actor* thisx, PlayState* play);
-void aEGPS_actor_dt(Actor* thisx, PlayState* play);
-void aEGPS_actor_init(Actor* thisx, PlayState* play);
-void aEGPS_actor_save(Actor* thisx, PlayState* play);
+void aEGPS_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEGPS_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEGPS_actor_init(Actor* thisx, Game_Play* game_play);
+void aEGPS_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Gypsy_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Gypsy/ac_ev_gypsy.h b/src/overlays/actors/ovl_Ev_Gypsy/ac_ev_gypsy.h
index aa3b4f8..0418291 100644
--- a/src/overlays/actors/ovl_Ev_Gypsy/ac_ev_gypsy.h
+++ b/src/overlays/actors/ovl_Ev_Gypsy/ac_ev_gypsy.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Gypsy;
 
-typedef void (*Ev_GypsyActionFunc)(struct Ev_Gypsy*, struct PlayState*);
+typedef void (*Ev_GypsyActionFunc)(struct Ev_Gypsy*, struct Game_Play*);
 
 typedef struct Ev_Gypsy {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_KabuPeddler/ac_ev_kabuPeddler.c b/src/overlays/actors/ovl_Ev_KabuPeddler/ac_ev_kabuPeddler.c
index b9d3458..25dcdf1 100644
--- a/src/overlays/actors/ovl_Ev_KabuPeddler/ac_ev_kabuPeddler.c
+++ b/src/overlays/actors/ovl_Ev_KabuPeddler/ac_ev_kabuPeddler.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEKPD_actor_ct(Actor* thisx, PlayState* play);
-void aEKPD_actor_dt(Actor* thisx, PlayState* play);
-void aEKPD_actor_init(Actor* thisx, PlayState* play);
-void aEKPD_actor_save(Actor* thisx, PlayState* play);
+void aEKPD_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEKPD_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEKPD_actor_init(Actor* thisx, Game_Play* game_play);
+void aEKPD_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_KabuPeddler_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_KabuPeddler/ac_ev_kabuPeddler.h b/src/overlays/actors/ovl_Ev_KabuPeddler/ac_ev_kabuPeddler.h
index d7c82cc..c0457cd 100644
--- a/src/overlays/actors/ovl_Ev_KabuPeddler/ac_ev_kabuPeddler.h
+++ b/src/overlays/actors/ovl_Ev_KabuPeddler/ac_ev_kabuPeddler.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_KabuPeddler;
 
-typedef void (*Ev_KabuPeddlerActionFunc)(struct Ev_KabuPeddler*, struct PlayState*);
+typedef void (*Ev_KabuPeddlerActionFunc)(struct Ev_KabuPeddler*, struct Game_Play*);
 
 typedef struct Ev_KabuPeddler {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Miko/ac_ev_miko.c b/src/overlays/actors/ovl_Ev_Miko/ac_ev_miko.c
index a327696..3142a71 100644
--- a/src/overlays/actors/ovl_Ev_Miko/ac_ev_miko.c
+++ b/src/overlays/actors/ovl_Ev_Miko/ac_ev_miko.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEMK_actor_ct(Actor* thisx, PlayState* play);
-void aEMK_actor_dt(Actor* thisx, PlayState* play);
-void aEMK_actor_init(Actor* thisx, PlayState* play);
-void aEMK_actor_save(Actor* thisx, PlayState* play);
+void aEMK_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEMK_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEMK_actor_init(Actor* thisx, Game_Play* game_play);
+void aEMK_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Miko_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Miko/ac_ev_miko.h b/src/overlays/actors/ovl_Ev_Miko/ac_ev_miko.h
index 7c22040..a9732a6 100644
--- a/src/overlays/actors/ovl_Ev_Miko/ac_ev_miko.h
+++ b/src/overlays/actors/ovl_Ev_Miko/ac_ev_miko.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Miko;
 
-typedef void (*Ev_MikoActionFunc)(struct Ev_Miko*, struct PlayState*);
+typedef void (*Ev_MikoActionFunc)(struct Ev_Miko*, struct Game_Play*);
 
 typedef struct Ev_Miko {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Pumpkin/ac_ev_pumpkin.c b/src/overlays/actors/ovl_Ev_Pumpkin/ac_ev_pumpkin.c
index 97f2786..339d768 100644
--- a/src/overlays/actors/ovl_Ev_Pumpkin/ac_ev_pumpkin.c
+++ b/src/overlays/actors/ovl_Ev_Pumpkin/ac_ev_pumpkin.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEPK_actor_ct(Actor* thisx, PlayState* play);
-void aEPK_actor_dt(Actor* thisx, PlayState* play);
-void aEPK_actor_init(Actor* thisx, PlayState* play);
-void aEPK_actor_save(Actor* thisx, PlayState* play);
+void aEPK_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEPK_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEPK_actor_init(Actor* thisx, Game_Play* game_play);
+void aEPK_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Pumpkin_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Pumpkin/ac_ev_pumpkin.h b/src/overlays/actors/ovl_Ev_Pumpkin/ac_ev_pumpkin.h
index c59db58..2bd5b23 100644
--- a/src/overlays/actors/ovl_Ev_Pumpkin/ac_ev_pumpkin.h
+++ b/src/overlays/actors/ovl_Ev_Pumpkin/ac_ev_pumpkin.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Pumpkin;
 
-typedef void (*Ev_PumpkinActionFunc)(struct Ev_Pumpkin*, struct PlayState*);
+typedef void (*Ev_PumpkinActionFunc)(struct Ev_Pumpkin*, struct Game_Play*);
 
 typedef struct Ev_Pumpkin {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Santa/ac_ev_santa.c b/src/overlays/actors/ovl_Ev_Santa/ac_ev_santa.c
index 2505cac..e14e5c3 100644
--- a/src/overlays/actors/ovl_Ev_Santa/ac_ev_santa.c
+++ b/src/overlays/actors/ovl_Ev_Santa/ac_ev_santa.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aESNT_actor_ct(Actor* thisx, PlayState* play);
-void aESNT_actor_dt(Actor* thisx, PlayState* play);
-void aESNT_actor_init(Actor* thisx, PlayState* play);
-void aESNT_actor_save(Actor* thisx, PlayState* play);
+void aESNT_actor_ct(Actor* thisx, Game_Play* game_play);
+void aESNT_actor_dt(Actor* thisx, Game_Play* game_play);
+void aESNT_actor_init(Actor* thisx, Game_Play* game_play);
+void aESNT_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Santa_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Santa/ac_ev_santa.h b/src/overlays/actors/ovl_Ev_Santa/ac_ev_santa.h
index f794a87..84b3e8a 100644
--- a/src/overlays/actors/ovl_Ev_Santa/ac_ev_santa.h
+++ b/src/overlays/actors/ovl_Ev_Santa/ac_ev_santa.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Santa;
 
-typedef void (*Ev_SantaActionFunc)(struct Ev_Santa*, struct PlayState*);
+typedef void (*Ev_SantaActionFunc)(struct Ev_Santa*, struct Game_Play*);
 
 typedef struct Ev_Santa {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ev_Yomise/ac_ev_yomise.c b/src/overlays/actors/ovl_Ev_Yomise/ac_ev_yomise.c
index 86996e9..dc5d827 100644
--- a/src/overlays/actors/ovl_Ev_Yomise/ac_ev_yomise.c
+++ b/src/overlays/actors/ovl_Ev_Yomise/ac_ev_yomise.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEYMS_actor_ct(Actor* thisx, PlayState* play);
-void aEYMS_actor_dt(Actor* thisx, PlayState* play);
-void aEYMS_actor_init(Actor* thisx, PlayState* play);
-void aEYMS_actor_save(Actor* thisx, PlayState* play);
+void aEYMS_actor_ct(Actor* thisx, Game_Play* game_play);
+void aEYMS_actor_dt(Actor* thisx, Game_Play* game_play);
+void aEYMS_actor_init(Actor* thisx, Game_Play* game_play);
+void aEYMS_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ev_Yomise_Profile = {
diff --git a/src/overlays/actors/ovl_Ev_Yomise/ac_ev_yomise.h b/src/overlays/actors/ovl_Ev_Yomise/ac_ev_yomise.h
index 13b704c..c81bd0e 100644
--- a/src/overlays/actors/ovl_Ev_Yomise/ac_ev_yomise.h
+++ b/src/overlays/actors/ovl_Ev_Yomise/ac_ev_yomise.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ev_Yomise;
 
-typedef void (*Ev_YomiseActionFunc)(struct Ev_Yomise*, struct PlayState*);
+typedef void (*Ev_YomiseActionFunc)(struct Ev_Yomise*, struct Game_Play*);
 
 typedef struct Ev_Yomise {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Event_Manager/ac_event_manager.c b/src/overlays/actors/ovl_Event_Manager/ac_event_manager.c
index ba8c56c..35ae828 100644
--- a/src/overlays/actors/ovl_Event_Manager/ac_event_manager.c
+++ b/src/overlays/actors/ovl_Event_Manager/ac_event_manager.c
@@ -1,11 +1,11 @@
 #include "ac_event_manager.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aEvMgr_ct(Actor* thisx, PlayState* play);
-void aEvMgr_dt(Actor* thisx, PlayState* play);
-void aEvMgr_move(Actor* thisx, PlayState* play);
-void aEvMgr_draw(Actor* thisx, PlayState* play);
-void aEvMgr_save(Actor* thisx, PlayState* play);
+void aEvMgr_ct(Actor* thisx, Game_Play* game_play);
+void aEvMgr_dt(Actor* thisx, Game_Play* game_play);
+void aEvMgr_move(Actor* thisx, Game_Play* game_play);
+void aEvMgr_draw(Actor* thisx, Game_Play* game_play);
+void aEvMgr_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Event_Manager_Profile = {
diff --git a/src/overlays/actors/ovl_Event_Manager/ac_event_manager.h b/src/overlays/actors/ovl_Event_Manager/ac_event_manager.h
index 37a926c..a8aac24 100644
--- a/src/overlays/actors/ovl_Event_Manager/ac_event_manager.h
+++ b/src/overlays/actors/ovl_Event_Manager/ac_event_manager.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Event_Manager;
 
-typedef void (*Event_ManagerActionFunc)(struct Event_Manager*, struct PlayState*);
+typedef void (*Event_ManagerActionFunc)(struct Event_Manager*, struct Game_Play*);
 
 typedef struct Event_Manager {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_FallS/ac_fallS.c b/src/overlays/actors/ovl_FallS/ac_fallS.c
index 2e251d5..641a177 100644
--- a/src/overlays/actors/ovl_FallS/ac_fallS.c
+++ b/src/overlays/actors/ovl_FallS/ac_fallS.c
@@ -1,10 +1,10 @@
 #include "ac_fallS.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_80A03230_jp(Actor* thisx, PlayState* play);
-void func_80A03240_jp(Actor* thisx, PlayState* play);
-void aFLS_actor_move(Actor* thisx, PlayState* play);
-void aFLS_actor_draw(Actor* thisx, PlayState* play);
+void func_80A03230_jp(Actor* thisx, Game_Play* game_play);
+void func_80A03240_jp(Actor* thisx, Game_Play* game_play);
+void aFLS_actor_move(Actor* thisx, Game_Play* game_play);
+void aFLS_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile FallS_Profile = {
diff --git a/src/overlays/actors/ovl_FallS/ac_fallS.h b/src/overlays/actors/ovl_FallS/ac_fallS.h
index 475afac..45108c6 100644
--- a/src/overlays/actors/ovl_FallS/ac_fallS.h
+++ b/src/overlays/actors/ovl_FallS/ac_fallS.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct FallS;
 
-typedef void (*FallSActionFunc)(struct FallS*, struct PlayState*);
+typedef void (*FallSActionFunc)(struct FallS*, struct Game_Play*);
 
 typedef struct FallS {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_FallSESW/ac_fallSESW.c b/src/overlays/actors/ovl_FallSESW/ac_fallSESW.c
index 65fa21d..f84fd73 100644
--- a/src/overlays/actors/ovl_FallSESW/ac_fallSESW.c
+++ b/src/overlays/actors/ovl_FallSESW/ac_fallSESW.c
@@ -1,10 +1,10 @@
 #include "ac_fallSESW.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_80A034A0_jp(Actor* thisx, PlayState* play);
-void func_80A034B0_jp(Actor* thisx, PlayState* play);
-void aFLEW_actor_move(Actor* thisx, PlayState* play);
-void aFLEW_actor_draw(Actor* thisx, PlayState* play);
+void func_80A034A0_jp(Actor* thisx, Game_Play* game_play);
+void func_80A034B0_jp(Actor* thisx, Game_Play* game_play);
+void aFLEW_actor_move(Actor* thisx, Game_Play* game_play);
+void aFLEW_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile FallSESW_Profile = {
diff --git a/src/overlays/actors/ovl_FallSESW/ac_fallSESW.h b/src/overlays/actors/ovl_FallSESW/ac_fallSESW.h
index 22c15eb..40bc8be 100644
--- a/src/overlays/actors/ovl_FallSESW/ac_fallSESW.h
+++ b/src/overlays/actors/ovl_FallSESW/ac_fallSESW.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct FallSESW;
 
-typedef void (*FallSESWActionFunc)(struct FallSESW*, struct PlayState*);
+typedef void (*FallSESWActionFunc)(struct FallSESW*, struct Game_Play*);
 
 typedef struct FallSESW {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Field_Draw/ac_field_draw.c b/src/overlays/actors/ovl_Field_Draw/ac_field_draw.c
index a20c9df..130054a 100644
--- a/src/overlays/actors/ovl_Field_Draw/ac_field_draw.c
+++ b/src/overlays/actors/ovl_Field_Draw/ac_field_draw.c
@@ -1,10 +1,10 @@
 #include "ac_field_draw.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Bg_Draw_Actor_ct(Actor* thisx, PlayState* play);
-void Bg_Draw_Actor_dt(Actor* thisx, PlayState* play);
-void Bg_Draw_Actor_move(Actor* thisx, PlayState* play);
-void Bg_Draw_Actor_draw(Actor* thisx, PlayState* play);
+void Bg_Draw_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Bg_Draw_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Bg_Draw_Actor_move(Actor* thisx, Game_Play* game_play);
+void Bg_Draw_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Field_Draw_Profile = {
diff --git a/src/overlays/actors/ovl_Field_Draw/ac_field_draw.h b/src/overlays/actors/ovl_Field_Draw/ac_field_draw.h
index f389ce8..bd79acb 100644
--- a/src/overlays/actors/ovl_Field_Draw/ac_field_draw.h
+++ b/src/overlays/actors/ovl_Field_Draw/ac_field_draw.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Field_Draw;
 
-typedef void (*Field_DrawActionFunc)(struct Field_Draw*, struct PlayState*);
+typedef void (*Field_DrawActionFunc)(struct Field_Draw*, struct Game_Play*);
 
 typedef struct Field_Draw {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.c b/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.c
index 33f0a5f..11f2b30 100644
--- a/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.c
+++ b/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.c
@@ -1,10 +1,10 @@
 #include "ac_fieldm_draw.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Fieldm_Actor_ct(Actor* thisx, PlayState* play);
-void Fieldm_Actor_dt(Actor* thisx, PlayState* play);
-void Fieldm_Actor_move(Actor* thisx, PlayState* play);
-void Fieldm_Actor_draw(Actor* thisx, PlayState* play);
+void Fieldm_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Fieldm_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Fieldm_Actor_move(Actor* thisx, Game_Play* game_play);
+void Fieldm_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Fieldm_Draw_Profile = {
diff --git a/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.h b/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.h
index 1729c0a..b0e5972 100644
--- a/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.h
+++ b/src/overlays/actors/ovl_Fieldm_Draw/ac_fieldm_draw.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Fieldm_Draw;
 
-typedef void (*Fieldm_DrawActionFunc)(struct Fieldm_Draw*, struct PlayState*);
+typedef void (*Fieldm_DrawActionFunc)(struct Fieldm_Draw*, struct Game_Play*);
 
 typedef struct Fieldm_Draw {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Fuusen/ac_fuusen.c b/src/overlays/actors/ovl_Fuusen/ac_fuusen.c
index 7f8cf55..b85008e 100644
--- a/src/overlays/actors/ovl_Fuusen/ac_fuusen.c
+++ b/src/overlays/actors/ovl_Fuusen/ac_fuusen.c
@@ -1,10 +1,10 @@
 #include "ac_fuusen.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aFSN_actor_ct(Actor* thisx, PlayState* play);
-void aFSN_actor_dt(Actor* thisx, PlayState* play);
-void aFSN_actor_move(Actor* thisx, PlayState* play);
-void aFSN_actor_draw(Actor* thisx, PlayState* play);
+void aFSN_actor_ct(Actor* thisx, Game_Play* game_play);
+void aFSN_actor_dt(Actor* thisx, Game_Play* game_play);
+void aFSN_actor_move(Actor* thisx, Game_Play* game_play);
+void aFSN_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Fuusen_Profile = {
diff --git a/src/overlays/actors/ovl_Fuusen/ac_fuusen.h b/src/overlays/actors/ovl_Fuusen/ac_fuusen.h
index eec07ad..172a826 100644
--- a/src/overlays/actors/ovl_Fuusen/ac_fuusen.h
+++ b/src/overlays/actors/ovl_Fuusen/ac_fuusen.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Fuusen;
 
-typedef void (*FuusenActionFunc)(struct Fuusen*, struct PlayState*);
+typedef void (*FuusenActionFunc)(struct Fuusen*, struct Game_Play*);
 
 typedef struct Fuusen {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Garagara/ac_garagara.c b/src/overlays/actors/ovl_Garagara/ac_garagara.c
index a039ee7..8990406 100644
--- a/src/overlays/actors/ovl_Garagara/ac_garagara.c
+++ b/src/overlays/actors/ovl_Garagara/ac_garagara.c
@@ -1,10 +1,10 @@
 #include "ac_garagara.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Garagara_Actor_ct(Actor* thisx, PlayState* play);
-void Garagara_Actor_dt(Actor* thisx, PlayState* play);
-void Garagara_Actor_move_dummy(Actor* thisx, PlayState* play);
-void Garagara_Actor_draw_dummy(Actor* thisx, PlayState* play);
+void Garagara_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Garagara_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Garagara_Actor_move_dummy(Actor* thisx, Game_Play* game_play);
+void Garagara_Actor_draw_dummy(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Garagara_Profile = {
diff --git a/src/overlays/actors/ovl_Garagara/ac_garagara.h b/src/overlays/actors/ovl_Garagara/ac_garagara.h
index 6388131..17564a8 100644
--- a/src/overlays/actors/ovl_Garagara/ac_garagara.h
+++ b/src/overlays/actors/ovl_Garagara/ac_garagara.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Garagara;
 
-typedef void (*GaragaraActionFunc)(struct Garagara*, struct PlayState*);
+typedef void (*GaragaraActionFunc)(struct Garagara*, struct Game_Play*);
 
 typedef struct Garagara {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Goza/ac_goza.c b/src/overlays/actors/ovl_Goza/ac_goza.c
index 0baf78b..c59a42d 100644
--- a/src/overlays/actors/ovl_Goza/ac_goza.c
+++ b/src/overlays/actors/ovl_Goza/ac_goza.c
@@ -1,10 +1,10 @@
 #include "ac_goza.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aGOZ_actor_ct(Actor* thisx, PlayState* play);
-void func_80A76208_jp(Actor* thisx, PlayState* play);
-void aGOZ_actor_init(Actor* thisx, PlayState* play);
-void aGOZ_actor_draw(Actor* thisx, PlayState* play);
+void aGOZ_actor_ct(Actor* thisx, Game_Play* game_play);
+void func_80A76208_jp(Actor* thisx, Game_Play* game_play);
+void aGOZ_actor_init(Actor* thisx, Game_Play* game_play);
+void aGOZ_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Goza_Profile = {
diff --git a/src/overlays/actors/ovl_Goza/ac_goza.h b/src/overlays/actors/ovl_Goza/ac_goza.h
index ba40042..6b14a9d 100644
--- a/src/overlays/actors/ovl_Goza/ac_goza.h
+++ b/src/overlays/actors/ovl_Goza/ac_goza.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Goza;
 
-typedef void (*GozaActionFunc)(struct Goza*, struct PlayState*);
+typedef void (*GozaActionFunc)(struct Goza*, struct Game_Play*);
 
 typedef struct Goza {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Gyo_Kage/ac_gyo_kage.c b/src/overlays/actors/ovl_Gyo_Kage/ac_gyo_kage.c
index ea6c462..f1b6064 100644
--- a/src/overlays/actors/ovl_Gyo_Kage/ac_gyo_kage.c
+++ b/src/overlays/actors/ovl_Gyo_Kage/ac_gyo_kage.c
@@ -1,10 +1,10 @@
 #include "ac_gyo_kage.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aGYO_KAGE_actor_ct(Actor* thisx, PlayState* play);
-void aGYO_KAGE_actor_dt(Actor* thisx, PlayState* play);
-void aGYO_KAGE_actor_move(Actor* thisx, PlayState* play);
-void aGYO_KAGE_actor_draw(Actor* thisx, PlayState* play);
+void aGYO_KAGE_actor_ct(Actor* thisx, Game_Play* game_play);
+void aGYO_KAGE_actor_dt(Actor* thisx, Game_Play* game_play);
+void aGYO_KAGE_actor_move(Actor* thisx, Game_Play* game_play);
+void aGYO_KAGE_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Gyo_Kage_Profile = {
diff --git a/src/overlays/actors/ovl_Gyo_Kage/ac_gyo_kage.h b/src/overlays/actors/ovl_Gyo_Kage/ac_gyo_kage.h
index 12fc9a1..93e4baf 100644
--- a/src/overlays/actors/ovl_Gyo_Kage/ac_gyo_kage.h
+++ b/src/overlays/actors/ovl_Gyo_Kage/ac_gyo_kage.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Gyo_Kage;
 
-typedef void (*Gyo_KageActionFunc)(struct Gyo_Kage*, struct PlayState*);
+typedef void (*Gyo_KageActionFunc)(struct Gyo_Kage*, struct Game_Play*);
 
 typedef struct Gyo_Kage {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Gyo_Release/ac_gyo_release.c b/src/overlays/actors/ovl_Gyo_Release/ac_gyo_release.c
index 858de90..c0e23fc 100644
--- a/src/overlays/actors/ovl_Gyo_Release/ac_gyo_release.c
+++ b/src/overlays/actors/ovl_Gyo_Release/ac_gyo_release.c
@@ -1,10 +1,10 @@
 #include "ac_gyo_release.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aGYR_actor_ct(Actor* thisx, PlayState* play);
-void aGYR_actor_dt(Actor* thisx, PlayState* play);
-void aGYR_actor_move(Actor* thisx, PlayState* play);
-void aGYR_actor_draw(Actor* thisx, PlayState* play);
+void aGYR_actor_ct(Actor* thisx, Game_Play* game_play);
+void aGYR_actor_dt(Actor* thisx, Game_Play* game_play);
+void aGYR_actor_move(Actor* thisx, Game_Play* game_play);
+void aGYR_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Gyo_Release_Profile = {
diff --git a/src/overlays/actors/ovl_Gyo_Release/ac_gyo_release.h b/src/overlays/actors/ovl_Gyo_Release/ac_gyo_release.h
index 0a21b99..0450b24 100644
--- a/src/overlays/actors/ovl_Gyo_Release/ac_gyo_release.h
+++ b/src/overlays/actors/ovl_Gyo_Release/ac_gyo_release.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Gyo_Release;
 
-typedef void (*Gyo_ReleaseActionFunc)(struct Gyo_Release*, struct PlayState*);
+typedef void (*Gyo_ReleaseActionFunc)(struct Gyo_Release*, struct Game_Play*);
 
 typedef struct Gyo_Release {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Gyoei/ac_gyoei.c b/src/overlays/actors/ovl_Gyoei/ac_gyoei.c
index 1f3ed0f..638c433 100644
--- a/src/overlays/actors/ovl_Gyoei/ac_gyoei.c
+++ b/src/overlays/actors/ovl_Gyoei/ac_gyoei.c
@@ -1,10 +1,10 @@
 #include "ac_gyoei.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aGYO_actor_ct(Actor* thisx, PlayState* play);
-void aGYO_actor_dt(Actor* thisx, PlayState* play);
-void aGYO_actor_move(Actor* thisx, PlayState* play);
-void aGYO_actor_draw(Actor* thisx, PlayState* play);
+void aGYO_actor_ct(Actor* thisx, Game_Play* game_play);
+void aGYO_actor_dt(Actor* thisx, Game_Play* game_play);
+void aGYO_actor_move(Actor* thisx, Game_Play* game_play);
+void aGYO_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Gyoei_Profile = {
diff --git a/src/overlays/actors/ovl_Gyoei/ac_gyoei.h b/src/overlays/actors/ovl_Gyoei/ac_gyoei.h
index a6583b0..5a5d439 100644
--- a/src/overlays/actors/ovl_Gyoei/ac_gyoei.h
+++ b/src/overlays/actors/ovl_Gyoei/ac_gyoei.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Gyoei;
 
-typedef void (*GyoeiActionFunc)(struct Gyoei*, struct PlayState*);
+typedef void (*GyoeiActionFunc)(struct Gyoei*, struct Game_Play*);
 
 typedef struct Gyoei {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Halloween_Npc/ac_halloween_npc.c b/src/overlays/actors/ovl_Halloween_Npc/ac_halloween_npc.c
index 3957010..5eb9fc9 100644
--- a/src/overlays/actors/ovl_Halloween_Npc/ac_halloween_npc.c
+++ b/src/overlays/actors/ovl_Halloween_Npc/ac_halloween_npc.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aHWN_actor_ct(Actor* thisx, PlayState* play);
-void aHWN_actor_dt(Actor* thisx, PlayState* play);
-void aHWN_actor_init(Actor* thisx, PlayState* play);
-void aHWN_actor_save(Actor* thisx, PlayState* play);
+void aHWN_actor_ct(Actor* thisx, Game_Play* game_play);
+void aHWN_actor_dt(Actor* thisx, Game_Play* game_play);
+void aHWN_actor_init(Actor* thisx, Game_Play* game_play);
+void aHWN_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Halloween_Npc_Profile = {
diff --git a/src/overlays/actors/ovl_Halloween_Npc/ac_halloween_npc.h b/src/overlays/actors/ovl_Halloween_Npc/ac_halloween_npc.h
index c9b48b0..0dba10b 100644
--- a/src/overlays/actors/ovl_Halloween_Npc/ac_halloween_npc.h
+++ b/src/overlays/actors/ovl_Halloween_Npc/ac_halloween_npc.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Halloween_Npc;
 
-typedef void (*Halloween_NpcActionFunc)(struct Halloween_Npc*, struct PlayState*);
+typedef void (*Halloween_NpcActionFunc)(struct Halloween_Npc*, struct Game_Play*);
 
 typedef struct Halloween_Npc {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Hanabi_Npc0/ac_hanabi_npc0.c b/src/overlays/actors/ovl_Hanabi_Npc0/ac_hanabi_npc0.c
index 0acfd5e..7e16a04 100644
--- a/src/overlays/actors/ovl_Hanabi_Npc0/ac_hanabi_npc0.c
+++ b/src/overlays/actors/ovl_Hanabi_Npc0/ac_hanabi_npc0.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_80528514(Actor* thisx, PlayState* play);
-void func_805285d0(Actor* thisx, PlayState* play);
-void func_80528608(Actor* thisx, PlayState* play);
-void func_80528598(Actor* thisx, PlayState* play);
+void func_80528514(Actor* thisx, Game_Play* game_play);
+void func_805285d0(Actor* thisx, Game_Play* game_play);
+void func_80528608(Actor* thisx, Game_Play* game_play);
+void func_80528598(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Hanabi_Npc0_Profile = {
diff --git a/src/overlays/actors/ovl_Hanabi_Npc0/ac_hanabi_npc0.h b/src/overlays/actors/ovl_Hanabi_Npc0/ac_hanabi_npc0.h
index 52eb5cd..ac75bf1 100644
--- a/src/overlays/actors/ovl_Hanabi_Npc0/ac_hanabi_npc0.h
+++ b/src/overlays/actors/ovl_Hanabi_Npc0/ac_hanabi_npc0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Hanabi_Npc0;
 
-typedef void (*Hanabi_Npc0ActionFunc)(struct Hanabi_Npc0*, struct PlayState*);
+typedef void (*Hanabi_Npc0ActionFunc)(struct Hanabi_Npc0*, struct Game_Play*);
 
 typedef struct Hanabi_Npc0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Hanabi_Npc1/ac_hanabi_npc1.c b/src/overlays/actors/ovl_Hanabi_Npc1/ac_hanabi_npc1.c
index 4c5c060..b678d99 100644
--- a/src/overlays/actors/ovl_Hanabi_Npc1/ac_hanabi_npc1.c
+++ b/src/overlays/actors/ovl_Hanabi_Npc1/ac_hanabi_npc1.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aHN1_actor_ct(Actor* thisx, PlayState* play);
-void aHN1_actor_dt(Actor* thisx, PlayState* play);
-void aHN1_actor_init(Actor* thisx, PlayState* play);
-void aHN1_actor_save(Actor* thisx, PlayState* play);
+void aHN1_actor_ct(Actor* thisx, Game_Play* game_play);
+void aHN1_actor_dt(Actor* thisx, Game_Play* game_play);
+void aHN1_actor_init(Actor* thisx, Game_Play* game_play);
+void aHN1_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Hanabi_Npc1_Profile = {
diff --git a/src/overlays/actors/ovl_Hanabi_Npc1/ac_hanabi_npc1.h b/src/overlays/actors/ovl_Hanabi_Npc1/ac_hanabi_npc1.h
index a249133..b309d80 100644
--- a/src/overlays/actors/ovl_Hanabi_Npc1/ac_hanabi_npc1.h
+++ b/src/overlays/actors/ovl_Hanabi_Npc1/ac_hanabi_npc1.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Hanabi_Npc1;
 
-typedef void (*Hanabi_Npc1ActionFunc)(struct Hanabi_Npc1*, struct PlayState*);
+typedef void (*Hanabi_Npc1ActionFunc)(struct Hanabi_Npc1*, struct Game_Play*);
 
 typedef struct Hanabi_Npc1 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Hanami_Npc0/ac_hanami_npc0.c b/src/overlays/actors/ovl_Hanami_Npc0/ac_hanami_npc0.c
index 9e1aaf7..7bd0173 100644
--- a/src/overlays/actors/ovl_Hanami_Npc0/ac_hanami_npc0.c
+++ b/src/overlays/actors/ovl_Hanami_Npc0/ac_hanami_npc0.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aHM0_actor_ct(Actor* thisx, PlayState* play);
-void aHM0_actor_dt(Actor* thisx, PlayState* play);
-void aHM0_actor_init(Actor* thisx, PlayState* play);
-void aHM0_actor_save(Actor* thisx, PlayState* play);
+void aHM0_actor_ct(Actor* thisx, Game_Play* game_play);
+void aHM0_actor_dt(Actor* thisx, Game_Play* game_play);
+void aHM0_actor_init(Actor* thisx, Game_Play* game_play);
+void aHM0_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Hanami_Npc0_Profile = {
diff --git a/src/overlays/actors/ovl_Hanami_Npc0/ac_hanami_npc0.h b/src/overlays/actors/ovl_Hanami_Npc0/ac_hanami_npc0.h
index 9a21514..7d7bc4d 100644
--- a/src/overlays/actors/ovl_Hanami_Npc0/ac_hanami_npc0.h
+++ b/src/overlays/actors/ovl_Hanami_Npc0/ac_hanami_npc0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Hanami_Npc0;
 
-typedef void (*Hanami_Npc0ActionFunc)(struct Hanami_Npc0*, struct PlayState*);
+typedef void (*Hanami_Npc0ActionFunc)(struct Hanami_Npc0*, struct Game_Play*);
 
 typedef struct Hanami_Npc0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Hanami_Npc1/ac_hanami_npc1.c b/src/overlays/actors/ovl_Hanami_Npc1/ac_hanami_npc1.c
index f35f287..c63e3d9 100644
--- a/src/overlays/actors/ovl_Hanami_Npc1/ac_hanami_npc1.c
+++ b/src/overlays/actors/ovl_Hanami_Npc1/ac_hanami_npc1.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aHM1_actor_ct(Actor* thisx, PlayState* play);
-void aHM1_actor_dt(Actor* thisx, PlayState* play);
-void aHM1_actor_init(Actor* thisx, PlayState* play);
-void aHM1_actor_save(Actor* thisx, PlayState* play);
+void aHM1_actor_ct(Actor* thisx, Game_Play* game_play);
+void aHM1_actor_dt(Actor* thisx, Game_Play* game_play);
+void aHM1_actor_init(Actor* thisx, Game_Play* game_play);
+void aHM1_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Hanami_Npc1_Profile = {
diff --git a/src/overlays/actors/ovl_Hanami_Npc1/ac_hanami_npc1.h b/src/overlays/actors/ovl_Hanami_Npc1/ac_hanami_npc1.h
index e6e40d7..30a8b91 100644
--- a/src/overlays/actors/ovl_Hanami_Npc1/ac_hanami_npc1.h
+++ b/src/overlays/actors/ovl_Hanami_Npc1/ac_hanami_npc1.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Hanami_Npc1;
 
-typedef void (*Hanami_Npc1ActionFunc)(struct Hanami_Npc1*, struct PlayState*);
+typedef void (*Hanami_Npc1ActionFunc)(struct Hanami_Npc1*, struct Game_Play*);
 
 typedef struct Hanami_Npc1 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_HandOverItem/ac_handOverItem.c b/src/overlays/actors/ovl_HandOverItem/ac_handOverItem.c
index d2c817e..9dd50e6 100644
--- a/src/overlays/actors/ovl_HandOverItem/ac_handOverItem.c
+++ b/src/overlays/actors/ovl_HandOverItem/ac_handOverItem.c
@@ -1,10 +1,10 @@
 #include "ac_handOverItem.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aHOI_actor_ct(Actor* thisx, PlayState* play);
-void aHOI_actor_dt(Actor* thisx, PlayState* play);
-void aHOI_actor_move(Actor* thisx, PlayState* play);
-void aHOI_actor_draw(Actor* thisx, PlayState* play);
+void aHOI_actor_ct(Actor* thisx, Game_Play* game_play);
+void aHOI_actor_dt(Actor* thisx, Game_Play* game_play);
+void aHOI_actor_move(Actor* thisx, Game_Play* game_play);
+void aHOI_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile HandOverItem_Profile = {
diff --git a/src/overlays/actors/ovl_HandOverItem/ac_handOverItem.h b/src/overlays/actors/ovl_HandOverItem/ac_handOverItem.h
index 0cea022..aea5d6c 100644
--- a/src/overlays/actors/ovl_HandOverItem/ac_handOverItem.h
+++ b/src/overlays/actors/ovl_HandOverItem/ac_handOverItem.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct HandOverItem;
 
-typedef void (*HandOverItemActionFunc)(struct HandOverItem*, struct PlayState*);
+typedef void (*HandOverItemActionFunc)(struct HandOverItem*, struct Game_Play*);
 
 typedef struct HandOverItem {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Haniwa/ac_haniwa.c b/src/overlays/actors/ovl_Haniwa/ac_haniwa.c
index 82ccbe7..1bf3d15 100644
--- a/src/overlays/actors/ovl_Haniwa/ac_haniwa.c
+++ b/src/overlays/actors/ovl_Haniwa/ac_haniwa.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aHNW_actor_ct(Actor* thisx, PlayState* play);
-void aHNW_actor_dt(Actor* thisx, PlayState* play);
-void aHNW_actor_init(Actor* thisx, PlayState* play);
+void aHNW_actor_ct(Actor* thisx, Game_Play* game_play);
+void aHNW_actor_dt(Actor* thisx, Game_Play* game_play);
+void aHNW_actor_init(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Haniwa_Profile = {
diff --git a/src/overlays/actors/ovl_Haniwa/ac_haniwa.h b/src/overlays/actors/ovl_Haniwa/ac_haniwa.h
index 72b5cd8..cb1e3b8 100644
--- a/src/overlays/actors/ovl_Haniwa/ac_haniwa.h
+++ b/src/overlays/actors/ovl_Haniwa/ac_haniwa.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Haniwa;
 
-typedef void (*HaniwaActionFunc)(struct Haniwa*, struct PlayState*);
+typedef void (*HaniwaActionFunc)(struct Haniwa*, struct Game_Play*);
 
 typedef struct Haniwa {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Hatumode_Control/ac_hatumode_control.c b/src/overlays/actors/ovl_Hatumode_Control/ac_hatumode_control.c
index 77e652e..69cf24c 100644
--- a/src/overlays/actors/ovl_Hatumode_Control/ac_hatumode_control.c
+++ b/src/overlays/actors/ovl_Hatumode_Control/ac_hatumode_control.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aHTC_actor_ct(Actor* thisx, PlayState* play);
-void aHTC_actor_dt(Actor* thisx, PlayState* play);
-void aHTC_actor_move(Actor* thisx, PlayState* play);
+void aHTC_actor_ct(Actor* thisx, Game_Play* game_play);
+void aHTC_actor_dt(Actor* thisx, Game_Play* game_play);
+void aHTC_actor_move(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Hatumode_Control_Profile = {
diff --git a/src/overlays/actors/ovl_Hatumode_Control/ac_hatumode_control.h b/src/overlays/actors/ovl_Hatumode_Control/ac_hatumode_control.h
index e25a1de..de2a85e 100644
--- a/src/overlays/actors/ovl_Hatumode_Control/ac_hatumode_control.h
+++ b/src/overlays/actors/ovl_Hatumode_Control/ac_hatumode_control.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Hatumode_Control;
 
-typedef void (*Hatumode_ControlActionFunc)(struct Hatumode_Control*, struct PlayState*);
+typedef void (*Hatumode_ControlActionFunc)(struct Hatumode_Control*, struct Game_Play*);
 
 typedef struct Hatumode_Control {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Hatumode_Npc0/ac_hatumode_npc0.c b/src/overlays/actors/ovl_Hatumode_Npc0/ac_hatumode_npc0.c
index 638daa4..590f77f 100644
--- a/src/overlays/actors/ovl_Hatumode_Npc0/ac_hatumode_npc0.c
+++ b/src/overlays/actors/ovl_Hatumode_Npc0/ac_hatumode_npc0.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_8052ab54(Actor* thisx, PlayState* play);
-void func_8052ac90(Actor* thisx, PlayState* play);
-void func_8052ad14(Actor* thisx, PlayState* play);
-void func_8052ac70(Actor* thisx, PlayState* play);
+void func_8052ab54(Actor* thisx, Game_Play* game_play);
+void func_8052ac90(Actor* thisx, Game_Play* game_play);
+void func_8052ad14(Actor* thisx, Game_Play* game_play);
+void func_8052ac70(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Hatumode_Npc0_Profile = {
diff --git a/src/overlays/actors/ovl_Hatumode_Npc0/ac_hatumode_npc0.h b/src/overlays/actors/ovl_Hatumode_Npc0/ac_hatumode_npc0.h
index 0df1e25..bcf3b61 100644
--- a/src/overlays/actors/ovl_Hatumode_Npc0/ac_hatumode_npc0.h
+++ b/src/overlays/actors/ovl_Hatumode_Npc0/ac_hatumode_npc0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Hatumode_Npc0;
 
-typedef void (*Hatumode_Npc0ActionFunc)(struct Hatumode_Npc0*, struct PlayState*);
+typedef void (*Hatumode_Npc0ActionFunc)(struct Hatumode_Npc0*, struct Game_Play*);
 
 typedef struct Hatumode_Npc0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_House/ac_house.c b/src/overlays/actors/ovl_House/ac_house.c
index 7f693f4..1748012 100644
--- a/src/overlays/actors/ovl_House/ac_house.c
+++ b/src/overlays/actors/ovl_House/ac_house.c
@@ -1,10 +1,10 @@
 #include "ac_house.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aHUS_actor_ct(Actor* thisx, PlayState* play);
-void aHUS_actor_dt(Actor* thisx, PlayState* play);
-void aHUS_actor_init(Actor* thisx, PlayState* play);
-void aHUS_actor_draw(Actor* thisx, PlayState* play);
+void aHUS_actor_ct(Actor* thisx, Game_Play* game_play);
+void aHUS_actor_dt(Actor* thisx, Game_Play* game_play);
+void aHUS_actor_init(Actor* thisx, Game_Play* game_play);
+void aHUS_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile House_Profile = {
diff --git a/src/overlays/actors/ovl_House/ac_house.h b/src/overlays/actors/ovl_House/ac_house.h
index f0e81b3..8fd0c1b 100644
--- a/src/overlays/actors/ovl_House/ac_house.h
+++ b/src/overlays/actors/ovl_House/ac_house.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct House;
 
-typedef void (*HouseActionFunc)(struct House*, struct PlayState*);
+typedef void (*HouseActionFunc)(struct House*, struct Game_Play*);
 
 typedef struct House {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_House_Clock/ac_house_clock.c b/src/overlays/actors/ovl_House_Clock/ac_house_clock.c
index 702488d..77703f6 100644
--- a/src/overlays/actors/ovl_House_Clock/ac_house_clock.c
+++ b/src/overlays/actors/ovl_House_Clock/ac_house_clock.c
@@ -1,10 +1,10 @@
 #include "ac_house_clock.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void House_Clock_Actor_ct(Actor* thisx, PlayState* play);
-void House_Clock_Actor_dt(Actor* thisx, PlayState* play);
-void House_Clock_Actor_move(Actor* thisx, PlayState* play);
-void House_Clock_Actor_draw(Actor* thisx, PlayState* play);
+void House_Clock_Actor_ct(Actor* thisx, Game_Play* game_play);
+void House_Clock_Actor_dt(Actor* thisx, Game_Play* game_play);
+void House_Clock_Actor_move(Actor* thisx, Game_Play* game_play);
+void House_Clock_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile House_Clock_Profile = {
diff --git a/src/overlays/actors/ovl_House_Clock/ac_house_clock.h b/src/overlays/actors/ovl_House_Clock/ac_house_clock.h
index 2e51943..5ac7850 100644
--- a/src/overlays/actors/ovl_House_Clock/ac_house_clock.h
+++ b/src/overlays/actors/ovl_House_Clock/ac_house_clock.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct House_Clock;
 
-typedef void (*House_ClockActionFunc)(struct House_Clock*, struct PlayState*);
+typedef void (*House_ClockActionFunc)(struct House_Clock*, struct Game_Play*);
 
 typedef struct House_Clock {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_House_Goki/ac_house_goki.c b/src/overlays/actors/ovl_House_Goki/ac_house_goki.c
index 786e6f4..6de442f 100644
--- a/src/overlays/actors/ovl_House_Goki/ac_house_goki.c
+++ b/src/overlays/actors/ovl_House_Goki/ac_house_goki.c
@@ -1,10 +1,10 @@
 #include "ac_house_goki.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aHG_actor_ct(Actor* thisx, PlayState* play);
-void func_80A83770_jp(Actor* thisx, PlayState* play);
-void aHG_actor_move(Actor* thisx, PlayState* play);
-void aHG_actor_draw(Actor* thisx, PlayState* play);
+void aHG_actor_ct(Actor* thisx, Game_Play* game_play);
+void func_80A83770_jp(Actor* thisx, Game_Play* game_play);
+void aHG_actor_move(Actor* thisx, Game_Play* game_play);
+void aHG_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile House_Goki_Profile = {
diff --git a/src/overlays/actors/ovl_House_Goki/ac_house_goki.h b/src/overlays/actors/ovl_House_Goki/ac_house_goki.h
index 05a3627..81ef9ab 100644
--- a/src/overlays/actors/ovl_House_Goki/ac_house_goki.h
+++ b/src/overlays/actors/ovl_House_Goki/ac_house_goki.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct House_Goki;
 
-typedef void (*House_GokiActionFunc)(struct House_Goki*, struct PlayState*);
+typedef void (*House_GokiActionFunc)(struct House_Goki*, struct Game_Play*);
 
 typedef struct House_Goki {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Insect/ac_insect.c b/src/overlays/actors/ovl_Insect/ac_insect.c
index 1111e02..a75d4ae 100644
--- a/src/overlays/actors/ovl_Insect/ac_insect.c
+++ b/src/overlays/actors/ovl_Insect/ac_insect.c
@@ -1,10 +1,10 @@
 #include "ac_insect.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aINS_actor_ct(Actor* thisx, PlayState* play);
-void aINS_actor_dt(Actor* thisx, PlayState* play);
-void aINS_actor_move(Actor* thisx, PlayState* play);
-void aINS_actor_draw(Actor* thisx, PlayState* play);
+void aINS_actor_ct(Actor* thisx, Game_Play* game_play);
+void aINS_actor_dt(Actor* thisx, Game_Play* game_play);
+void aINS_actor_move(Actor* thisx, Game_Play* game_play);
+void aINS_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Insect_Profile = {
diff --git a/src/overlays/actors/ovl_Insect/ac_insect.h b/src/overlays/actors/ovl_Insect/ac_insect.h
index 6c287d6..046d84c 100644
--- a/src/overlays/actors/ovl_Insect/ac_insect.h
+++ b/src/overlays/actors/ovl_Insect/ac_insect.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Insect;
 
-typedef void (*InsectActionFunc)(struct Insect*, struct PlayState*);
+typedef void (*InsectActionFunc)(struct Insect*, struct Game_Play*);
 
 typedef struct Insect {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Intro_Demo/ac_intro_demo.c b/src/overlays/actors/ovl_Intro_Demo/ac_intro_demo.c
index 08cfbd2..22405b3 100644
--- a/src/overlays/actors/ovl_Intro_Demo/ac_intro_demo.c
+++ b/src/overlays/actors/ovl_Intro_Demo/ac_intro_demo.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aID_actor_ct(Actor* thisx, PlayState* play);
-void aID_actor_dt(Actor* thisx, PlayState* play);
-void aID_actor_move(Actor* thisx, PlayState* play);
+void aID_actor_ct(Actor* thisx, Game_Play* game_play);
+void aID_actor_dt(Actor* thisx, Game_Play* game_play);
+void aID_actor_move(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Intro_Demo_Profile = {
diff --git a/src/overlays/actors/ovl_Intro_Demo/ac_intro_demo.h b/src/overlays/actors/ovl_Intro_Demo/ac_intro_demo.h
index b8b3011..4ebc915 100644
--- a/src/overlays/actors/ovl_Intro_Demo/ac_intro_demo.h
+++ b/src/overlays/actors/ovl_Intro_Demo/ac_intro_demo.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Intro_Demo;
 
-typedef void (*Intro_DemoActionFunc)(struct Intro_Demo*, struct PlayState*);
+typedef void (*Intro_DemoActionFunc)(struct Intro_Demo*, struct Game_Play*);
 
 typedef struct Intro_Demo {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Kago/ac_kago.c b/src/overlays/actors/ovl_Kago/ac_kago.c
index c23678f..7f9c717 100644
--- a/src/overlays/actors/ovl_Kago/ac_kago.c
+++ b/src/overlays/actors/ovl_Kago/ac_kago.c
@@ -1,10 +1,10 @@
 #include "ac_kago.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aKAG_actor_ct(Actor* thisx, PlayState* play);
-void func_80A8F340_jp(Actor* thisx, PlayState* play);
-void aKAG_actor_init(Actor* thisx, PlayState* play);
-void aKAG_actor_draw(Actor* thisx, PlayState* play);
+void aKAG_actor_ct(Actor* thisx, Game_Play* game_play);
+void func_80A8F340_jp(Actor* thisx, Game_Play* game_play);
+void aKAG_actor_init(Actor* thisx, Game_Play* game_play);
+void aKAG_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Kago_Profile = {
diff --git a/src/overlays/actors/ovl_Kago/ac_kago.h b/src/overlays/actors/ovl_Kago/ac_kago.h
index 2ac1548..2f91cd8 100644
--- a/src/overlays/actors/ovl_Kago/ac_kago.h
+++ b/src/overlays/actors/ovl_Kago/ac_kago.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Kago;
 
-typedef void (*KagoActionFunc)(struct Kago*, struct PlayState*);
+typedef void (*KagoActionFunc)(struct Kago*, struct Game_Play*);
 
 typedef struct Kago {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Kamakura/ac_kamakura.c b/src/overlays/actors/ovl_Kamakura/ac_kamakura.c
index f6420bf..d761f25 100644
--- a/src/overlays/actors/ovl_Kamakura/ac_kamakura.c
+++ b/src/overlays/actors/ovl_Kamakura/ac_kamakura.c
@@ -1,10 +1,10 @@
 #include "ac_kamakura.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aKKR_actor_ct(Actor* thisx, PlayState* play);
-void aKKR_actor_dt(Actor* thisx, PlayState* play);
-void aKKR_actor_init(Actor* thisx, PlayState* play);
-void aKKR_actor_draw(Actor* thisx, PlayState* play);
+void aKKR_actor_ct(Actor* thisx, Game_Play* game_play);
+void aKKR_actor_dt(Actor* thisx, Game_Play* game_play);
+void aKKR_actor_init(Actor* thisx, Game_Play* game_play);
+void aKKR_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Kamakura_Profile = {
diff --git a/src/overlays/actors/ovl_Kamakura/ac_kamakura.h b/src/overlays/actors/ovl_Kamakura/ac_kamakura.h
index a443d90..a529899 100644
--- a/src/overlays/actors/ovl_Kamakura/ac_kamakura.h
+++ b/src/overlays/actors/ovl_Kamakura/ac_kamakura.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Kamakura;
 
-typedef void (*KamakuraActionFunc)(struct Kamakura*, struct PlayState*);
+typedef void (*KamakuraActionFunc)(struct Kamakura*, struct Game_Play*);
 
 typedef struct Kamakura {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Kamakura_Indoor/ac_kamakura_indoor.c b/src/overlays/actors/ovl_Kamakura_Indoor/ac_kamakura_indoor.c
index e7c5f55..fdd1f19 100644
--- a/src/overlays/actors/ovl_Kamakura_Indoor/ac_kamakura_indoor.c
+++ b/src/overlays/actors/ovl_Kamakura_Indoor/ac_kamakura_indoor.c
@@ -1,10 +1,10 @@
 #include "ac_kamakura_indoor.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Kamakura_Indoor_Actor_ct(Actor* thisx, PlayState* play);
-void Kamakura_Indoor_Actor_dt(Actor* thisx, PlayState* play);
-void Kamakura_Indoor_Actor_move(Actor* thisx, PlayState* play);
-void Kamakura_Indoor_Actor_draw(Actor* thisx, PlayState* play);
+void Kamakura_Indoor_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Kamakura_Indoor_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Kamakura_Indoor_Actor_move(Actor* thisx, Game_Play* game_play);
+void Kamakura_Indoor_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Kamakura_Indoor_Profile = {
diff --git a/src/overlays/actors/ovl_Kamakura_Indoor/ac_kamakura_indoor.h b/src/overlays/actors/ovl_Kamakura_Indoor/ac_kamakura_indoor.h
index 1f89d85..69e963a 100644
--- a/src/overlays/actors/ovl_Kamakura_Indoor/ac_kamakura_indoor.h
+++ b/src/overlays/actors/ovl_Kamakura_Indoor/ac_kamakura_indoor.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Kamakura_Indoor;
 
-typedef void (*Kamakura_IndoorActionFunc)(struct Kamakura_Indoor*, struct PlayState*);
+typedef void (*Kamakura_IndoorActionFunc)(struct Kamakura_Indoor*, struct Game_Play*);
 
 typedef struct Kamakura_Indoor {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c b/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c
index f257640..d119adf 100644
--- a/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c
+++ b/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aKM0_actor_ct(Actor* thisx, PlayState* play);
-void aKM0_actor_dt(Actor* thisx, PlayState* play);
-void aKM0_actor_init(Actor* thisx, PlayState* play);
-void aKM0_actor_save(Actor* thisx, PlayState* play);
+void aKM0_actor_ct(Actor* thisx, Game_Play* game_play);
+void aKM0_actor_dt(Actor* thisx, Game_Play* game_play);
+void aKM0_actor_init(Actor* thisx, Game_Play* game_play);
+void aKM0_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Kamakura_Npc0_Profile = {
diff --git a/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.h b/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.h
index 0f2ab07..6ac416f 100644
--- a/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.h
+++ b/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Kamakura_Npc0;
 
-typedef void (*Kamakura_Npc0ActionFunc)(struct Kamakura_Npc0*, struct PlayState*);
+typedef void (*Kamakura_Npc0ActionFunc)(struct Kamakura_Npc0*, struct Game_Play*);
 
 typedef struct Kamakura_Npc0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Koinobori/ac_koinobori.c b/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
index 8775072..811abe3 100644
--- a/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
+++ b/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
@@ -1,10 +1,10 @@
 #include "ac_koinobori.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aKOI_actor_ct(Actor* thisx, PlayState* play);
-void aKOI_actor_dt(Actor* thisx, PlayState* play);
-void aKOI_actor_init(Actor* thisx, PlayState* play);
-void aKOI_actor_draw(Actor* thisx, PlayState* play);
+void aKOI_actor_ct(Actor* thisx, Game_Play* game_play);
+void aKOI_actor_dt(Actor* thisx, Game_Play* game_play);
+void aKOI_actor_init(Actor* thisx, Game_Play* game_play);
+void aKOI_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Koinobori_Profile = {
diff --git a/src/overlays/actors/ovl_Koinobori/ac_koinobori.h b/src/overlays/actors/ovl_Koinobori/ac_koinobori.h
index 9e2921a..7623bd5 100644
--- a/src/overlays/actors/ovl_Koinobori/ac_koinobori.h
+++ b/src/overlays/actors/ovl_Koinobori/ac_koinobori.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Koinobori;
 
-typedef void (*KoinoboriActionFunc)(struct Koinobori*, struct PlayState*);
+typedef void (*KoinoboriActionFunc)(struct Koinobori*, struct Game_Play*);
 
 typedef struct Koinobori {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Lamp_Light/ef_lamp_light.c b/src/overlays/actors/ovl_Lamp_Light/ef_lamp_light.c
index ed87fff..af0c61e 100644
--- a/src/overlays/actors/ovl_Lamp_Light/ef_lamp_light.c
+++ b/src/overlays/actors/ovl_Lamp_Light/ef_lamp_light.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Ef_Lamp_Light_actor_ct(Actor* thisx, PlayState* play);
-void Ef_Lamp_Light_actor_dt(Actor* thisx, PlayState* play);
-void Ef_Lamp_Light_actor_move(Actor* thisx, PlayState* play);
+void Ef_Lamp_Light_actor_ct(Actor* thisx, Game_Play* game_play);
+void Ef_Lamp_Light_actor_dt(Actor* thisx, Game_Play* game_play);
+void Ef_Lamp_Light_actor_move(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Lamp_Light_Profile = {
diff --git a/src/overlays/actors/ovl_Lamp_Light/ef_lamp_light.h b/src/overlays/actors/ovl_Lamp_Light/ef_lamp_light.h
index 5348334..4b10b98 100644
--- a/src/overlays/actors/ovl_Lamp_Light/ef_lamp_light.h
+++ b/src/overlays/actors/ovl_Lamp_Light/ef_lamp_light.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Lamp_Light;
 
-typedef void (*Lamp_LightActionFunc)(struct Lamp_Light*, struct PlayState*);
+typedef void (*Lamp_LightActionFunc)(struct Lamp_Light*, struct Game_Play*);
 
 typedef struct Lamp_Light {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Lotus/ac_lotus.c b/src/overlays/actors/ovl_Lotus/ac_lotus.c
index d742a99..40bb448 100644
--- a/src/overlays/actors/ovl_Lotus/ac_lotus.c
+++ b/src/overlays/actors/ovl_Lotus/ac_lotus.c
@@ -1,10 +1,10 @@
 #include "ac_lotus.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aLOT_actor_ct(Actor* thisx, PlayState* play);
-void aLOT_actor_dt(Actor* thisx, PlayState* play);
-void aLOT_actor_init(Actor* thisx, PlayState* play);
-void aLOT_actor_draw(Actor* thisx, PlayState* play);
+void aLOT_actor_ct(Actor* thisx, Game_Play* game_play);
+void aLOT_actor_dt(Actor* thisx, Game_Play* game_play);
+void aLOT_actor_init(Actor* thisx, Game_Play* game_play);
+void aLOT_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Lotus_Profile = {
diff --git a/src/overlays/actors/ovl_Lotus/ac_lotus.h b/src/overlays/actors/ovl_Lotus/ac_lotus.h
index 02f4666..58cfe5b 100644
--- a/src/overlays/actors/ovl_Lotus/ac_lotus.h
+++ b/src/overlays/actors/ovl_Lotus/ac_lotus.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Lotus;
 
-typedef void (*LotusActionFunc)(struct Lotus*, struct PlayState*);
+typedef void (*LotusActionFunc)(struct Lotus*, struct Game_Play*);
 
 typedef struct Lotus {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_MailBox/ac_mailbox.c b/src/overlays/actors/ovl_MailBox/ac_mailbox.c
index c8769b3..5574251 100644
--- a/src/overlays/actors/ovl_MailBox/ac_mailbox.c
+++ b/src/overlays/actors/ovl_MailBox/ac_mailbox.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aMBX_actor_ct(Actor* thisx, PlayState* play);
-void aMBX_actor_dt(Actor* thisx, PlayState* play);
-void aMBX_actor_init(Actor* thisx, PlayState* play);
+void aMBX_actor_ct(Actor* thisx, Game_Play* game_play);
+void aMBX_actor_dt(Actor* thisx, Game_Play* game_play);
+void aMBX_actor_init(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile MailBox_Profile = {
diff --git a/src/overlays/actors/ovl_MailBox/ac_mailbox.h b/src/overlays/actors/ovl_MailBox/ac_mailbox.h
index 5f9dfaf..83e30ce 100644
--- a/src/overlays/actors/ovl_MailBox/ac_mailbox.h
+++ b/src/overlays/actors/ovl_MailBox/ac_mailbox.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct MailBox;
 
-typedef void (*MailBoxActionFunc)(struct MailBox*, struct PlayState*);
+typedef void (*MailBoxActionFunc)(struct MailBox*, struct Game_Play*);
 
 typedef struct MailBox {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Mbg/ac_mbg.c b/src/overlays/actors/ovl_Mbg/ac_mbg.c
index 460444f..ba73475 100644
--- a/src/overlays/actors/ovl_Mbg/ac_mbg.c
+++ b/src/overlays/actors/ovl_Mbg/ac_mbg.c
@@ -1,10 +1,10 @@
 #include "ac_mbg.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Mbg_Actor_ct(Actor* thisx, PlayState* play);
-void Mbg_Actor_dt(Actor* thisx, PlayState* play);
-void Mbg_Actor_move(Actor* thisx, PlayState* play);
-void Mbg_Actor_draw(Actor* thisx, PlayState* play);
+void Mbg_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Mbg_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Mbg_Actor_move(Actor* thisx, Game_Play* game_play);
+void Mbg_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Mbg_Profile = {
diff --git a/src/overlays/actors/ovl_Mbg/ac_mbg.h b/src/overlays/actors/ovl_Mbg/ac_mbg.h
index 71ceab8..d48058a 100644
--- a/src/overlays/actors/ovl_Mbg/ac_mbg.h
+++ b/src/overlays/actors/ovl_Mbg/ac_mbg.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Mbg;
 
-typedef void (*MbgActionFunc)(struct Mbg*, struct PlayState*);
+typedef void (*MbgActionFunc)(struct Mbg*, struct Game_Play*);
 
 typedef struct Mbg {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Mikanbox/ac_mikanbox.c b/src/overlays/actors/ovl_Mikanbox/ac_mikanbox.c
index dbc410a..a96a905 100644
--- a/src/overlays/actors/ovl_Mikanbox/ac_mikanbox.c
+++ b/src/overlays/actors/ovl_Mikanbox/ac_mikanbox.c
@@ -1,11 +1,11 @@
 #include "ac_mikanbox.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_805b3010(Actor* thisx, PlayState* play);
-void aMIK_actor_dt(Actor* thisx, PlayState* play);
-void func_805b3e58(Actor* thisx, PlayState* play);
-void func_805b4054(Actor* thisx, PlayState* play);
-void aMIK_actor_save(Actor* thisx, PlayState* play);
+void func_805b3010(Actor* thisx, Game_Play* game_play);
+void aMIK_actor_dt(Actor* thisx, Game_Play* game_play);
+void func_805b3e58(Actor* thisx, Game_Play* game_play);
+void func_805b4054(Actor* thisx, Game_Play* game_play);
+void aMIK_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Mikanbox_Profile = {
diff --git a/src/overlays/actors/ovl_Mikanbox/ac_mikanbox.h b/src/overlays/actors/ovl_Mikanbox/ac_mikanbox.h
index 3656cb3..53befcb 100644
--- a/src/overlays/actors/ovl_Mikanbox/ac_mikanbox.h
+++ b/src/overlays/actors/ovl_Mikanbox/ac_mikanbox.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Mikanbox;
 
-typedef void (*MikanboxActionFunc)(struct Mikanbox*, struct PlayState*);
+typedef void (*MikanboxActionFunc)(struct Mikanbox*, struct Game_Play*);
 
 typedef struct Mikanbox {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Mikuji/ac_mikuji.c b/src/overlays/actors/ovl_Mikuji/ac_mikuji.c
index d203c9f..9dc13dd 100644
--- a/src/overlays/actors/ovl_Mikuji/ac_mikuji.c
+++ b/src/overlays/actors/ovl_Mikuji/ac_mikuji.c
@@ -1,10 +1,10 @@
 #include "ac_mikuji.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_805b414c(Actor* thisx, PlayState* play);
-void func_80A82638_jp(Actor* thisx, PlayState* play);
-void func_805b437c(Actor* thisx, PlayState* play);
-void func_805b43f4(Actor* thisx, PlayState* play);
+void func_805b414c(Actor* thisx, Game_Play* game_play);
+void func_80A82638_jp(Actor* thisx, Game_Play* game_play);
+void func_805b437c(Actor* thisx, Game_Play* game_play);
+void func_805b43f4(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Mikuji_Profile = {
diff --git a/src/overlays/actors/ovl_Mikuji/ac_mikuji.h b/src/overlays/actors/ovl_Mikuji/ac_mikuji.h
index 0a632d5..7290a9b 100644
--- a/src/overlays/actors/ovl_Mikuji/ac_mikuji.h
+++ b/src/overlays/actors/ovl_Mikuji/ac_mikuji.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Mikuji;
 
-typedef void (*MikujiActionFunc)(struct Mikuji*, struct PlayState*);
+typedef void (*MikujiActionFunc)(struct Mikuji*, struct Game_Play*);
 
 typedef struct Mikuji {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_MyHouse/ac_my_house.c b/src/overlays/actors/ovl_MyHouse/ac_my_house.c
index bc0a7ac..f5e526c 100644
--- a/src/overlays/actors/ovl_MyHouse/ac_my_house.c
+++ b/src/overlays/actors/ovl_MyHouse/ac_my_house.c
@@ -1,10 +1,10 @@
 #include "ac_my_house.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_80A05D50_jp(Actor* thisx, PlayState* play);
-void func_80A05F88_jp(Actor* thisx, PlayState* play);
-void func_80A06DF0_jp(Actor* thisx, PlayState* play);
-void func_80A071A0_jp(Actor* thisx, PlayState* play);
+void func_80A05D50_jp(Actor* thisx, Game_Play* game_play);
+void func_80A05F88_jp(Actor* thisx, Game_Play* game_play);
+void func_80A06DF0_jp(Actor* thisx, Game_Play* game_play);
+void func_80A071A0_jp(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile MyHouse_Profile = {
diff --git a/src/overlays/actors/ovl_MyHouse/ac_my_house.h b/src/overlays/actors/ovl_MyHouse/ac_my_house.h
index 8ad87d1..099054a 100644
--- a/src/overlays/actors/ovl_MyHouse/ac_my_house.h
+++ b/src/overlays/actors/ovl_MyHouse/ac_my_house.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct MyHouse;
 
-typedef void (*MyHouseActionFunc)(struct MyHouse*, struct PlayState*);
+typedef void (*MyHouseActionFunc)(struct MyHouse*, struct Game_Play*);
 
 typedef struct MyHouse {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_My_Indoor/ac_my_indoor.c b/src/overlays/actors/ovl_My_Indoor/ac_my_indoor.c
index 5263d4c..baa9a03 100644
--- a/src/overlays/actors/ovl_My_Indoor/ac_my_indoor.c
+++ b/src/overlays/actors/ovl_My_Indoor/ac_my_indoor.c
@@ -1,10 +1,10 @@
 #include "ac_my_indoor.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void My_Indoor_Actor_ct(Actor* thisx, PlayState* play);
-void My_Indoor_Actor_dt(Actor* thisx, PlayState* play);
-void My_Indoor_Actor_move(Actor* thisx, PlayState* play);
-void My_Indoor_Actor_draw(Actor* thisx, PlayState* play);
+void My_Indoor_Actor_ct(Actor* thisx, Game_Play* game_play);
+void My_Indoor_Actor_dt(Actor* thisx, Game_Play* game_play);
+void My_Indoor_Actor_move(Actor* thisx, Game_Play* game_play);
+void My_Indoor_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile My_Indoor_Profile = {
diff --git a/src/overlays/actors/ovl_My_Indoor/ac_my_indoor.h b/src/overlays/actors/ovl_My_Indoor/ac_my_indoor.h
index 0019452..22c4442 100644
--- a/src/overlays/actors/ovl_My_Indoor/ac_my_indoor.h
+++ b/src/overlays/actors/ovl_My_Indoor/ac_my_indoor.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct My_Indoor;
 
-typedef void (*My_IndoorActionFunc)(struct My_Indoor*, struct PlayState*);
+typedef void (*My_IndoorActionFunc)(struct My_Indoor*, struct Game_Play*);
 
 typedef struct My_Indoor {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_My_Room/ac_my_room.c b/src/overlays/actors/ovl_My_Room/ac_my_room.c
index ea3a3a1..6618e7a 100644
--- a/src/overlays/actors/ovl_My_Room/ac_my_room.c
+++ b/src/overlays/actors/ovl_My_Room/ac_my_room.c
@@ -1,10 +1,10 @@
 #include "ac_my_room.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void My_Room_Actor_ct(Actor* thisx, PlayState* play);
-void My_Room_Actor_dt(Actor* thisx, PlayState* play);
-void My_Room_Actor_move(Actor* thisx, PlayState* play);
-void My_Room_Actor_draw(Actor* thisx, PlayState* play);
+void My_Room_Actor_ct(Actor* thisx, Game_Play* game_play);
+void My_Room_Actor_dt(Actor* thisx, Game_Play* game_play);
+void My_Room_Actor_move(Actor* thisx, Game_Play* game_play);
+void My_Room_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile My_Room_Profile = {
diff --git a/src/overlays/actors/ovl_My_Room/ac_my_room.h b/src/overlays/actors/ovl_My_Room/ac_my_room.h
index 2d04c50..701dffc 100644
--- a/src/overlays/actors/ovl_My_Room/ac_my_room.h
+++ b/src/overlays/actors/ovl_My_Room/ac_my_room.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct My_Room;
 
-typedef void (*My_RoomActionFunc)(struct My_Room*, struct PlayState*);
+typedef void (*My_RoomActionFunc)(struct My_Room*, struct Game_Play*);
 
 typedef struct My_Room {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Nameplate/ac_nameplate.c b/src/overlays/actors/ovl_Nameplate/ac_nameplate.c
index 68e8a3c..ba384fe 100644
--- a/src/overlays/actors/ovl_Nameplate/ac_nameplate.c
+++ b/src/overlays/actors/ovl_Nameplate/ac_nameplate.c
@@ -1,9 +1,9 @@
 #include "ac_nameplate.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_80A963C0_jp(Actor* thisx, PlayState* play);
-void func_80A963D0_jp(Actor* thisx, PlayState* play);
-void aNP_actor_init(Actor* thisx, PlayState* play);
+void func_80A963C0_jp(Actor* thisx, Game_Play* game_play);
+void func_80A963D0_jp(Actor* thisx, Game_Play* game_play);
+void aNP_actor_init(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Nameplate_Profile = {
diff --git a/src/overlays/actors/ovl_Nameplate/ac_nameplate.h b/src/overlays/actors/ovl_Nameplate/ac_nameplate.h
index 33c4bcc..30f7e3f 100644
--- a/src/overlays/actors/ovl_Nameplate/ac_nameplate.h
+++ b/src/overlays/actors/ovl_Nameplate/ac_nameplate.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Nameplate;
 
-typedef void (*NameplateActionFunc)(struct Nameplate*, struct PlayState*);
+typedef void (*NameplateActionFunc)(struct Nameplate*, struct Game_Play*);
 
 typedef struct Nameplate {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c b/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c
index 88f577e..22ac655 100644
--- a/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c
+++ b/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNOR_actor_ct(Actor* thisx, PlayState* play);
-void aNOR_actor_dt(Actor* thisx, PlayState* play);
-void aNOR_actor_init(Actor* thisx, PlayState* play);
-void aNOR_actor_save(Actor* thisx, PlayState* play);
+void aNOR_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNOR_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNOR_actor_init(Actor* thisx, Game_Play* game_play);
+void aNOR_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Normal_Npc_Profile = {
diff --git a/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.h b/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.h
index fb4885a..c751993 100644
--- a/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.h
+++ b/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Normal_Npc;
 
-typedef void (*Normal_NpcActionFunc)(struct Normal_Npc*, struct PlayState*);
+typedef void (*Normal_NpcActionFunc)(struct Normal_Npc*, struct Game_Play*);
 
 typedef struct Normal_Npc {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc/ac_npc.c b/src/overlays/actors/ovl_Npc/ac_npc.c
index d2d7565..14077a2 100644
--- a/src/overlays/actors/ovl_Npc/ac_npc.c
+++ b/src/overlays/actors/ovl_Npc/ac_npc.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_8053a354(Actor* thisx, PlayState* play);
-void func_8053a6fc(Actor* thisx, PlayState* play);
-void func_8053aab0(Actor* thisx, PlayState* play);
+void func_8053a354(Actor* thisx, Game_Play* game_play);
+void func_8053a6fc(Actor* thisx, Game_Play* game_play);
+void func_8053aab0(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Profile = {
diff --git a/src/overlays/actors/ovl_Npc/ac_npc.h b/src/overlays/actors/ovl_Npc/ac_npc.h
index 1a97579..3d5cadd 100644
--- a/src/overlays/actors/ovl_Npc/ac_npc.h
+++ b/src/overlays/actors/ovl_Npc/ac_npc.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc;
 
-typedef void (*NpcActionFunc)(struct Npc*, struct PlayState*);
+typedef void (*NpcActionFunc)(struct Npc*, struct Game_Play*);
 
 typedef struct Npc {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc2/ac_npc2.c b/src/overlays/actors/ovl_Npc2/ac_npc2.c
index 8ac33e9..71a9738 100644
--- a/src/overlays/actors/ovl_Npc2/ac_npc2.c
+++ b/src/overlays/actors/ovl_Npc2/ac_npc2.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_80545034(Actor* thisx, PlayState* play);
-void func_805453b8(Actor* thisx, PlayState* play);
-void func_80545604(Actor* thisx, PlayState* play);
+void func_80545034(Actor* thisx, Game_Play* game_play);
+void func_805453b8(Actor* thisx, Game_Play* game_play);
+void func_80545604(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc2_Profile = {
diff --git a/src/overlays/actors/ovl_Npc2/ac_npc2.h b/src/overlays/actors/ovl_Npc2/ac_npc2.h
index 7621c58..bd95c41 100644
--- a/src/overlays/actors/ovl_Npc2/ac_npc2.h
+++ b/src/overlays/actors/ovl_Npc2/ac_npc2.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc2;
 
-typedef void (*Npc2ActionFunc)(struct Npc2*, struct PlayState*);
+typedef void (*Npc2ActionFunc)(struct Npc2*, struct Game_Play*);
 
 typedef struct Npc2 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Conv_Master/ac_npc_conv_master.c b/src/overlays/actors/ovl_Npc_Conv_Master/ac_npc_conv_master.c
index 2be140d..add777c 100644
--- a/src/overlays/actors/ovl_Npc_Conv_Master/ac_npc_conv_master.c
+++ b/src/overlays/actors/ovl_Npc_Conv_Master/ac_npc_conv_master.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNCM_actor_ct(Actor* thisx, PlayState* play);
-void aNCM_actor_dt(Actor* thisx, PlayState* play);
-void aNCM_actor_init(Actor* thisx, PlayState* play);
-void aNCM_actor_save(Actor* thisx, PlayState* play);
+void aNCM_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNCM_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNCM_actor_init(Actor* thisx, Game_Play* game_play);
+void aNCM_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Conv_Master_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Conv_Master/ac_npc_conv_master.h b/src/overlays/actors/ovl_Npc_Conv_Master/ac_npc_conv_master.h
index 3fe83cf..2a1e376 100644
--- a/src/overlays/actors/ovl_Npc_Conv_Master/ac_npc_conv_master.h
+++ b/src/overlays/actors/ovl_Npc_Conv_Master/ac_npc_conv_master.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Conv_Master;
 
-typedef void (*Npc_Conv_MasterActionFunc)(struct Npc_Conv_Master*, struct PlayState*);
+typedef void (*Npc_Conv_MasterActionFunc)(struct Npc_Conv_Master*, struct Game_Play*);
 
 typedef struct Npc_Conv_Master {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Depart_Master/ac_npc_depart_master.c b/src/overlays/actors/ovl_Npc_Depart_Master/ac_npc_depart_master.c
index 3805e71..a329f17 100644
--- a/src/overlays/actors/ovl_Npc_Depart_Master/ac_npc_depart_master.c
+++ b/src/overlays/actors/ovl_Npc_Depart_Master/ac_npc_depart_master.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNDM_actor_ct(Actor* thisx, PlayState* play);
-void aNDM_actor_dt(Actor* thisx, PlayState* play);
-void aNDM_actor_init(Actor* thisx, PlayState* play);
-void aNDM_actor_save(Actor* thisx, PlayState* play);
+void aNDM_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNDM_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNDM_actor_init(Actor* thisx, Game_Play* game_play);
+void aNDM_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Depart_Master_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Depart_Master/ac_npc_depart_master.h b/src/overlays/actors/ovl_Npc_Depart_Master/ac_npc_depart_master.h
index b5be182..50ee773 100644
--- a/src/overlays/actors/ovl_Npc_Depart_Master/ac_npc_depart_master.h
+++ b/src/overlays/actors/ovl_Npc_Depart_Master/ac_npc_depart_master.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Depart_Master;
 
-typedef void (*Npc_Depart_MasterActionFunc)(struct Npc_Depart_Master*, struct PlayState*);
+typedef void (*Npc_Depart_MasterActionFunc)(struct Npc_Depart_Master*, struct Game_Play*);
 
 typedef struct Npc_Depart_Master {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c b/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c
index 8a867b4..1383028 100644
--- a/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c
+++ b/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNEG_actor_ct(Actor* thisx, PlayState* play);
-void aNEG_actor_dt(Actor* thisx, PlayState* play);
-void aNEG_actor_init(Actor* thisx, PlayState* play);
-void aNEG_actor_save(Actor* thisx, PlayState* play);
+void aNEG_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNEG_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNEG_actor_init(Actor* thisx, Game_Play* game_play);
+void aNEG_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Engineer_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.h b/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.h
index e7c4dfc..76657b9 100644
--- a/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.h
+++ b/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Engineer;
 
-typedef void (*Npc_EngineerActionFunc)(struct Npc_Engineer*, struct PlayState*);
+typedef void (*Npc_EngineerActionFunc)(struct Npc_Engineer*, struct Game_Play*);
 
 typedef struct Npc_Engineer {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Guide/ac_npc_guide.c b/src/overlays/actors/ovl_Npc_Guide/ac_npc_guide.c
index 4083db7..02c668e 100644
--- a/src/overlays/actors/ovl_Npc_Guide/ac_npc_guide.c
+++ b/src/overlays/actors/ovl_Npc_Guide/ac_npc_guide.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNGD_actor_ct(Actor* thisx, PlayState* play);
-void aNGD_actor_dt(Actor* thisx, PlayState* play);
-void aNGD_actor_init(Actor* thisx, PlayState* play);
-void aNGD_actor_save(Actor* thisx, PlayState* play);
+void aNGD_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNGD_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNGD_actor_init(Actor* thisx, Game_Play* game_play);
+void aNGD_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Guide_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Guide/ac_npc_guide.h b/src/overlays/actors/ovl_Npc_Guide/ac_npc_guide.h
index 5850d67..826e5ff 100644
--- a/src/overlays/actors/ovl_Npc_Guide/ac_npc_guide.h
+++ b/src/overlays/actors/ovl_Npc_Guide/ac_npc_guide.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Guide;
 
-typedef void (*Npc_GuideActionFunc)(struct Npc_Guide*, struct PlayState*);
+typedef void (*Npc_GuideActionFunc)(struct Npc_Guide*, struct Game_Play*);
 
 typedef struct Npc_Guide {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.c b/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.c
index 9a72ce5..1dd01e9 100644
--- a/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.c
+++ b/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNG2_actor_ct(Actor* thisx, PlayState* play);
-void aNG2_actor_dt(Actor* thisx, PlayState* play);
-void aNG2_actor_init(Actor* thisx, PlayState* play);
-void aNG2_actor_save(Actor* thisx, PlayState* play);
+void aNG2_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNG2_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNG2_actor_init(Actor* thisx, Game_Play* game_play);
+void aNG2_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Guide2_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.h b/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.h
index 3efd8a2..4cdcb6a 100644
--- a/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.h
+++ b/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Guide2;
 
-typedef void (*Npc_Guide2ActionFunc)(struct Npc_Guide2*, struct PlayState*);
+typedef void (*Npc_Guide2ActionFunc)(struct Npc_Guide2*, struct Game_Play*);
 
 typedef struct Npc_Guide2 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Majin/ovl_Npc_Majin.c b/src/overlays/actors/ovl_Npc_Majin/ovl_Npc_Majin.c
index f05774c..35acad7 100644
--- a/src/overlays/actors/ovl_Npc_Majin/ovl_Npc_Majin.c
+++ b/src/overlays/actors/ovl_Npc_Majin/ovl_Npc_Majin.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aMJN_actor_ct(Actor* thisx, PlayState* play);
-void aMJN_actor_dt(Actor* thisx, PlayState* play);
-void aMJN_actor_init(Actor* thisx, PlayState* play);
-void aMJN_actor_save(Actor* thisx, PlayState* play);
+void aMJN_actor_ct(Actor* thisx, Game_Play* game_play);
+void aMJN_actor_dt(Actor* thisx, Game_Play* game_play);
+void aMJN_actor_init(Actor* thisx, Game_Play* game_play);
+void aMJN_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Majin_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Majin/ovl_Npc_Majin.h b/src/overlays/actors/ovl_Npc_Majin/ovl_Npc_Majin.h
index 7ce0326..3817438 100644
--- a/src/overlays/actors/ovl_Npc_Majin/ovl_Npc_Majin.h
+++ b/src/overlays/actors/ovl_Npc_Majin/ovl_Npc_Majin.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Majin;
 
-typedef void (*Npc_MajinActionFunc)(struct Npc_Majin*, struct PlayState*);
+typedef void (*Npc_MajinActionFunc)(struct Npc_Majin*, struct Game_Play*);
 
 typedef struct Npc_Majin {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Majin2/ac_npc_majin.c b/src/overlays/actors/ovl_Npc_Majin2/ac_npc_majin.c
index e5cfb38..a335a5d 100644
--- a/src/overlays/actors/ovl_Npc_Majin2/ac_npc_majin.c
+++ b/src/overlays/actors/ovl_Npc_Majin2/ac_npc_majin.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aMJN2_actor_ct(Actor* thisx, PlayState* play);
-void aMJN2_actor_dt(Actor* thisx, PlayState* play);
-void aMJN2_actor_init(Actor* thisx, PlayState* play);
-void aMJN2_actor_save(Actor* thisx, PlayState* play);
+void aMJN2_actor_ct(Actor* thisx, Game_Play* game_play);
+void aMJN2_actor_dt(Actor* thisx, Game_Play* game_play);
+void aMJN2_actor_init(Actor* thisx, Game_Play* game_play);
+void aMJN2_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Majin2_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Majin2/ac_npc_majin.h b/src/overlays/actors/ovl_Npc_Majin2/ac_npc_majin.h
index 8762adf..3c0dd11 100644
--- a/src/overlays/actors/ovl_Npc_Majin2/ac_npc_majin.h
+++ b/src/overlays/actors/ovl_Npc_Majin2/ac_npc_majin.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Majin2;
 
-typedef void (*Npc_Majin2ActionFunc)(struct Npc_Majin2*, struct PlayState*);
+typedef void (*Npc_Majin2ActionFunc)(struct Npc_Majin2*, struct Game_Play*);
 
 typedef struct Npc_Majin2 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Majin3/ac_npc_majin3.c b/src/overlays/actors/ovl_Npc_Majin3/ac_npc_majin3.c
index 3db73b4..99375cf 100644
--- a/src/overlays/actors/ovl_Npc_Majin3/ac_npc_majin3.c
+++ b/src/overlays/actors/ovl_Npc_Majin3/ac_npc_majin3.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aMJN3_actor_ct(Actor* thisx, PlayState* play);
-void aMJN3_actor_dt(Actor* thisx, PlayState* play);
-void aMJN3_actor_init(Actor* thisx, PlayState* play);
-void aMJN3_actor_save(Actor* thisx, PlayState* play);
+void aMJN3_actor_ct(Actor* thisx, Game_Play* game_play);
+void aMJN3_actor_dt(Actor* thisx, Game_Play* game_play);
+void aMJN3_actor_init(Actor* thisx, Game_Play* game_play);
+void aMJN3_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Majin3_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Majin3/ac_npc_majin3.h b/src/overlays/actors/ovl_Npc_Majin3/ac_npc_majin3.h
index ad8fe77..4a997b1 100644
--- a/src/overlays/actors/ovl_Npc_Majin3/ac_npc_majin3.h
+++ b/src/overlays/actors/ovl_Npc_Majin3/ac_npc_majin3.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Majin3;
 
-typedef void (*Npc_Majin3ActionFunc)(struct Npc_Majin3*, struct PlayState*);
+typedef void (*Npc_Majin3ActionFunc)(struct Npc_Majin3*, struct Game_Play*);
 
 typedef struct Npc_Majin3 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Majin4/ac_npc_majin4.c b/src/overlays/actors/ovl_Npc_Majin4/ac_npc_majin4.c
index 22cdf84..7ad30c5 100644
--- a/src/overlays/actors/ovl_Npc_Majin4/ac_npc_majin4.c
+++ b/src/overlays/actors/ovl_Npc_Majin4/ac_npc_majin4.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aMJN4_actor_ct(Actor* thisx, PlayState* play);
-void aMJN4_actor_dt(Actor* thisx, PlayState* play);
-void aMJN4_actor_init(Actor* thisx, PlayState* play);
-void aMJN4_actor_save(Actor* thisx, PlayState* play);
+void aMJN4_actor_ct(Actor* thisx, Game_Play* game_play);
+void aMJN4_actor_dt(Actor* thisx, Game_Play* game_play);
+void aMJN4_actor_init(Actor* thisx, Game_Play* game_play);
+void aMJN4_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Majin4_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Majin4/ac_npc_majin4.h b/src/overlays/actors/ovl_Npc_Majin4/ac_npc_majin4.h
index 639095a..d49cfb4 100644
--- a/src/overlays/actors/ovl_Npc_Majin4/ac_npc_majin4.h
+++ b/src/overlays/actors/ovl_Npc_Majin4/ac_npc_majin4.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Majin4;
 
-typedef void (*Npc_Majin4ActionFunc)(struct Npc_Majin4*, struct PlayState*);
+typedef void (*Npc_Majin4ActionFunc)(struct Npc_Majin4*, struct Game_Play*);
 
 typedef struct Npc_Majin4 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Majin5/ac_npc_majin5.c b/src/overlays/actors/ovl_Npc_Majin5/ac_npc_majin5.c
index 1ff079f..f06cfeb 100644
--- a/src/overlays/actors/ovl_Npc_Majin5/ac_npc_majin5.c
+++ b/src/overlays/actors/ovl_Npc_Majin5/ac_npc_majin5.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNMJ5_actor_ct(Actor* thisx, PlayState* play);
-void aNMJ5_actor_dt(Actor* thisx, PlayState* play);
-void aNMJ5_actor_init(Actor* thisx, PlayState* play);
-void aNMJ5_actor_save(Actor* thisx, PlayState* play);
+void aNMJ5_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNMJ5_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNMJ5_actor_init(Actor* thisx, Game_Play* game_play);
+void aNMJ5_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Majin5_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Majin5/ac_npc_majin5.h b/src/overlays/actors/ovl_Npc_Majin5/ac_npc_majin5.h
index 7ec5372..2d3d973 100644
--- a/src/overlays/actors/ovl_Npc_Majin5/ac_npc_majin5.h
+++ b/src/overlays/actors/ovl_Npc_Majin5/ac_npc_majin5.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Majin5;
 
-typedef void (*Npc_Majin5ActionFunc)(struct Npc_Majin5*, struct PlayState*);
+typedef void (*Npc_Majin5ActionFunc)(struct Npc_Majin5*, struct Game_Play*);
 
 typedef struct Npc_Majin5 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Mamedanuki/ac_npc_mamedanuki.c b/src/overlays/actors/ovl_Npc_Mamedanuki/ac_npc_mamedanuki.c
index 86aa54e..f23cd15 100644
--- a/src/overlays/actors/ovl_Npc_Mamedanuki/ac_npc_mamedanuki.c
+++ b/src/overlays/actors/ovl_Npc_Mamedanuki/ac_npc_mamedanuki.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNMD_actor_ct(Actor* thisx, PlayState* play);
-void aNMD_actor_dt(Actor* thisx, PlayState* play);
-void aNMD_actor_init(Actor* thisx, PlayState* play);
-void aNMD_actor_save(Actor* thisx, PlayState* play);
+void aNMD_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNMD_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNMD_actor_init(Actor* thisx, Game_Play* game_play);
+void aNMD_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Mamedanuki_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Mamedanuki/ac_npc_mamedanuki.h b/src/overlays/actors/ovl_Npc_Mamedanuki/ac_npc_mamedanuki.h
index 3f58496..f2e29c0 100644
--- a/src/overlays/actors/ovl_Npc_Mamedanuki/ac_npc_mamedanuki.h
+++ b/src/overlays/actors/ovl_Npc_Mamedanuki/ac_npc_mamedanuki.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Mamedanuki;
 
-typedef void (*Npc_MamedanukiActionFunc)(struct Npc_Mamedanuki*, struct PlayState*);
+typedef void (*Npc_MamedanukiActionFunc)(struct Npc_Mamedanuki*, struct Game_Play*);
 
 typedef struct Npc_Mamedanuki {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_P_Sel/ac_npc_p_sel.c b/src/overlays/actors/ovl_Npc_P_Sel/ac_npc_p_sel.c
index 651aafd..8fb6d1d 100644
--- a/src/overlays/actors/ovl_Npc_P_Sel/ac_npc_p_sel.c
+++ b/src/overlays/actors/ovl_Npc_P_Sel/ac_npc_p_sel.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNPS_actor_ct(Actor* thisx, PlayState* play);
-void aNPS_actor_dt(Actor* thisx, PlayState* play);
-void aNPS_actor_init(Actor* thisx, PlayState* play);
-void aNPS_actor_save(Actor* thisx, PlayState* play);
+void aNPS_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNPS_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNPS_actor_init(Actor* thisx, Game_Play* game_play);
+void aNPS_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_P_Sel_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_P_Sel/ac_npc_p_sel.h b/src/overlays/actors/ovl_Npc_P_Sel/ac_npc_p_sel.h
index 4938492..b9f93ac 100644
--- a/src/overlays/actors/ovl_Npc_P_Sel/ac_npc_p_sel.h
+++ b/src/overlays/actors/ovl_Npc_P_Sel/ac_npc_p_sel.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_P_Sel;
 
-typedef void (*Npc_P_SelActionFunc)(struct Npc_P_Sel*, struct PlayState*);
+typedef void (*Npc_P_SelActionFunc)(struct Npc_P_Sel*, struct Game_Play*);
 
 typedef struct Npc_P_Sel {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_P_Sel2/ac_npc_p_sel2.c b/src/overlays/actors/ovl_Npc_P_Sel2/ac_npc_p_sel2.c
index ab2dfa7..7443978 100644
--- a/src/overlays/actors/ovl_Npc_P_Sel2/ac_npc_p_sel2.c
+++ b/src/overlays/actors/ovl_Npc_P_Sel2/ac_npc_p_sel2.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNPS2_actor_ct(Actor* thisx, PlayState* play);
-void aNPS2_actor_dt(Actor* thisx, PlayState* play);
-void aNPS2_actor_init(Actor* thisx, PlayState* play);
-void aNPS2_actor_save(Actor* thisx, PlayState* play);
+void aNPS2_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNPS2_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNPS2_actor_init(Actor* thisx, Game_Play* game_play);
+void aNPS2_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_P_Sel2_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_P_Sel2/ac_npc_p_sel2.h b/src/overlays/actors/ovl_Npc_P_Sel2/ac_npc_p_sel2.h
index d60e4e8..f742de2 100644
--- a/src/overlays/actors/ovl_Npc_P_Sel2/ac_npc_p_sel2.h
+++ b/src/overlays/actors/ovl_Npc_P_Sel2/ac_npc_p_sel2.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_P_Sel2;
 
-typedef void (*Npc_P_Sel2ActionFunc)(struct Npc_P_Sel2*, struct PlayState*);
+typedef void (*Npc_P_Sel2ActionFunc)(struct Npc_P_Sel2*, struct Game_Play*);
 
 typedef struct Npc_P_Sel2 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Police/ac_npc_police.c b/src/overlays/actors/ovl_Npc_Police/ac_npc_police.c
index 13ac554..ca5960f 100644
--- a/src/overlays/actors/ovl_Npc_Police/ac_npc_police.c
+++ b/src/overlays/actors/ovl_Npc_Police/ac_npc_police.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aPOL_actor_ct(Actor* thisx, PlayState* play);
-void aPOL_actor_dt(Actor* thisx, PlayState* play);
-void aPOL_actor_init(Actor* thisx, PlayState* play);
-void aPOL_actor_save(Actor* thisx, PlayState* play);
+void aPOL_actor_ct(Actor* thisx, Game_Play* game_play);
+void aPOL_actor_dt(Actor* thisx, Game_Play* game_play);
+void aPOL_actor_init(Actor* thisx, Game_Play* game_play);
+void aPOL_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Police_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Police/ac_npc_police.h b/src/overlays/actors/ovl_Npc_Police/ac_npc_police.h
index b4bc5aa..5c6b74b 100644
--- a/src/overlays/actors/ovl_Npc_Police/ac_npc_police.h
+++ b/src/overlays/actors/ovl_Npc_Police/ac_npc_police.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Police;
 
-typedef void (*Npc_PoliceActionFunc)(struct Npc_Police*, struct PlayState*);
+typedef void (*Npc_PoliceActionFunc)(struct Npc_Police*, struct Game_Play*);
 
 typedef struct Npc_Police {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Police2/ac_npc_police2.c b/src/overlays/actors/ovl_Npc_Police2/ac_npc_police2.c
index 2a0ee50..611f493 100644
--- a/src/overlays/actors/ovl_Npc_Police2/ac_npc_police2.c
+++ b/src/overlays/actors/ovl_Npc_Police2/ac_npc_police2.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aPOL2_actor_ct(Actor* thisx, PlayState* play);
-void aPOL2_actor_dt(Actor* thisx, PlayState* play);
-void aPOL2_actor_init(Actor* thisx, PlayState* play);
-void aPOL2_actor_save(Actor* thisx, PlayState* play);
+void aPOL2_actor_ct(Actor* thisx, Game_Play* game_play);
+void aPOL2_actor_dt(Actor* thisx, Game_Play* game_play);
+void aPOL2_actor_init(Actor* thisx, Game_Play* game_play);
+void aPOL2_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Police2_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Police2/ac_npc_police2.h b/src/overlays/actors/ovl_Npc_Police2/ac_npc_police2.h
index 1234947..7c54b47 100644
--- a/src/overlays/actors/ovl_Npc_Police2/ac_npc_police2.h
+++ b/src/overlays/actors/ovl_Npc_Police2/ac_npc_police2.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Police2;
 
-typedef void (*Npc_Police2ActionFunc)(struct Npc_Police2*, struct PlayState*);
+typedef void (*Npc_Police2ActionFunc)(struct Npc_Police2*, struct Game_Play*);
 
 typedef struct Npc_Police2 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Post_Girl/ac_npc_post_girl.c b/src/overlays/actors/ovl_Npc_Post_Girl/ac_npc_post_girl.c
index 8e098cb..c9733e1 100644
--- a/src/overlays/actors/ovl_Npc_Post_Girl/ac_npc_post_girl.c
+++ b/src/overlays/actors/ovl_Npc_Post_Girl/ac_npc_post_girl.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aPG_actor_ct(Actor* thisx, PlayState* play);
-void aPG_actor_dt(Actor* thisx, PlayState* play);
-void aPG_actor_init(Actor* thisx, PlayState* play);
-void aPG_actor_save(Actor* thisx, PlayState* play);
+void aPG_actor_ct(Actor* thisx, Game_Play* game_play);
+void aPG_actor_dt(Actor* thisx, Game_Play* game_play);
+void aPG_actor_init(Actor* thisx, Game_Play* game_play);
+void aPG_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Post_Girl_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Post_Girl/ac_npc_post_girl.h b/src/overlays/actors/ovl_Npc_Post_Girl/ac_npc_post_girl.h
index e621c5a..529dc84 100644
--- a/src/overlays/actors/ovl_Npc_Post_Girl/ac_npc_post_girl.h
+++ b/src/overlays/actors/ovl_Npc_Post_Girl/ac_npc_post_girl.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Post_Girl;
 
-typedef void (*Npc_Post_GirlActionFunc)(struct Npc_Post_Girl*, struct PlayState*);
+typedef void (*Npc_Post_GirlActionFunc)(struct Npc_Post_Girl*, struct Game_Play*);
 
 typedef struct Npc_Post_Girl {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Post_Man/ac_npc_post_man.c b/src/overlays/actors/ovl_Npc_Post_Man/ac_npc_post_man.c
index 083ea74..1863540 100644
--- a/src/overlays/actors/ovl_Npc_Post_Man/ac_npc_post_man.c
+++ b/src/overlays/actors/ovl_Npc_Post_Man/ac_npc_post_man.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aPMAN_actor_ct(Actor* thisx, PlayState* play);
-void aPMAN_actor_dt(Actor* thisx, PlayState* play);
-void aPMAN_actor_init(Actor* thisx, PlayState* play);
-void aPMAN_actor_save(Actor* thisx, PlayState* play);
+void aPMAN_actor_ct(Actor* thisx, Game_Play* game_play);
+void aPMAN_actor_dt(Actor* thisx, Game_Play* game_play);
+void aPMAN_actor_init(Actor* thisx, Game_Play* game_play);
+void aPMAN_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Post_Man_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Post_Man/ac_npc_post_man.h b/src/overlays/actors/ovl_Npc_Post_Man/ac_npc_post_man.h
index 70da384..de8cf32 100644
--- a/src/overlays/actors/ovl_Npc_Post_Man/ac_npc_post_man.h
+++ b/src/overlays/actors/ovl_Npc_Post_Man/ac_npc_post_man.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Post_Man;
 
-typedef void (*Npc_Post_ManActionFunc)(struct Npc_Post_Man*, struct PlayState*);
+typedef void (*Npc_Post_ManActionFunc)(struct Npc_Post_Man*, struct Game_Play*);
 
 typedef struct Npc_Post_Man {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Rcn_Guide/ac_npc_rcn_guide.c b/src/overlays/actors/ovl_Npc_Rcn_Guide/ac_npc_rcn_guide.c
index 2fb67b7..7bb3e26 100644
--- a/src/overlays/actors/ovl_Npc_Rcn_Guide/ac_npc_rcn_guide.c
+++ b/src/overlays/actors/ovl_Npc_Rcn_Guide/ac_npc_rcn_guide.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNRG_actor_ct(Actor* thisx, PlayState* play);
-void aNRG_actor_dt(Actor* thisx, PlayState* play);
-void aNRG_actor_init(Actor* thisx, PlayState* play);
-void aNRG_actor_save(Actor* thisx, PlayState* play);
+void aNRG_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNRG_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNRG_actor_init(Actor* thisx, Game_Play* game_play);
+void aNRG_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Rcn_Guide_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Rcn_Guide/ac_npc_rcn_guide.h b/src/overlays/actors/ovl_Npc_Rcn_Guide/ac_npc_rcn_guide.h
index db76f34..99b4ccc 100644
--- a/src/overlays/actors/ovl_Npc_Rcn_Guide/ac_npc_rcn_guide.h
+++ b/src/overlays/actors/ovl_Npc_Rcn_Guide/ac_npc_rcn_guide.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Rcn_Guide;
 
-typedef void (*Npc_Rcn_GuideActionFunc)(struct Npc_Rcn_Guide*, struct PlayState*);
+typedef void (*Npc_Rcn_GuideActionFunc)(struct Npc_Rcn_Guide*, struct Game_Play*);
 
 typedef struct Npc_Rcn_Guide {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Rcn_Guide2/ac_npc_rcn_guide2.c b/src/overlays/actors/ovl_Npc_Rcn_Guide2/ac_npc_rcn_guide2.c
index 6bc42be..fc423d2 100644
--- a/src/overlays/actors/ovl_Npc_Rcn_Guide2/ac_npc_rcn_guide2.c
+++ b/src/overlays/actors/ovl_Npc_Rcn_Guide2/ac_npc_rcn_guide2.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNRG2_actor_ct(Actor* thisx, PlayState* play);
-void aNRG2_actor_dt(Actor* thisx, PlayState* play);
-void aNRG2_actor_init(Actor* thisx, PlayState* play);
-void aNRG2_actor_save(Actor* thisx, PlayState* play);
+void aNRG2_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNRG2_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNRG2_actor_init(Actor* thisx, Game_Play* game_play);
+void aNRG2_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Rcn_Guide2_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Rcn_Guide2/ac_npc_rcn_guide2.h b/src/overlays/actors/ovl_Npc_Rcn_Guide2/ac_npc_rcn_guide2.h
index 31ec0a2..a815533 100644
--- a/src/overlays/actors/ovl_Npc_Rcn_Guide2/ac_npc_rcn_guide2.h
+++ b/src/overlays/actors/ovl_Npc_Rcn_Guide2/ac_npc_rcn_guide2.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Rcn_Guide2;
 
-typedef void (*Npc_Rcn_Guide2ActionFunc)(struct Npc_Rcn_Guide2*, struct PlayState*);
+typedef void (*Npc_Rcn_Guide2ActionFunc)(struct Npc_Rcn_Guide2*, struct Game_Play*);
 
 typedef struct Npc_Rcn_Guide2 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Restart/ac_npc_restart.c b/src/overlays/actors/ovl_Npc_Restart/ac_npc_restart.c
index ca5fb53..3081e67 100644
--- a/src/overlays/actors/ovl_Npc_Restart/ac_npc_restart.c
+++ b/src/overlays/actors/ovl_Npc_Restart/ac_npc_restart.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNRST_actor_ct(Actor* thisx, PlayState* play);
-void aNRST_actor_dt(Actor* thisx, PlayState* play);
-void aNRST_actor_init(Actor* thisx, PlayState* play);
-void aNRST_actor_save(Actor* thisx, PlayState* play);
+void aNRST_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNRST_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNRST_actor_init(Actor* thisx, Game_Play* game_play);
+void aNRST_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Restart_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Restart/ac_npc_restart.h b/src/overlays/actors/ovl_Npc_Restart/ac_npc_restart.h
index b264fc6..3c0e1ca 100644
--- a/src/overlays/actors/ovl_Npc_Restart/ac_npc_restart.h
+++ b/src/overlays/actors/ovl_Npc_Restart/ac_npc_restart.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Restart;
 
-typedef void (*Npc_RestartActionFunc)(struct Npc_Restart*, struct PlayState*);
+typedef void (*Npc_RestartActionFunc)(struct Npc_Restart*, struct Game_Play*);
 
 typedef struct Npc_Restart {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Rtc/ac_npc_rtc.c b/src/overlays/actors/ovl_Npc_Rtc/ac_npc_rtc.c
index 72265e3..29d0049 100644
--- a/src/overlays/actors/ovl_Npc_Rtc/ac_npc_rtc.c
+++ b/src/overlays/actors/ovl_Npc_Rtc/ac_npc_rtc.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNRTC_actor_ct(Actor* thisx, PlayState* play);
-void aNRTC_actor_dt(Actor* thisx, PlayState* play);
-void aNRTC_actor_init(Actor* thisx, PlayState* play);
-void aNRTC_actor_save(Actor* thisx, PlayState* play);
+void aNRTC_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNRTC_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNRTC_actor_init(Actor* thisx, Game_Play* game_play);
+void aNRTC_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Rtc_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Rtc/ac_npc_rtc.h b/src/overlays/actors/ovl_Npc_Rtc/ac_npc_rtc.h
index a905917..ae71a4e 100644
--- a/src/overlays/actors/ovl_Npc_Rtc/ac_npc_rtc.h
+++ b/src/overlays/actors/ovl_Npc_Rtc/ac_npc_rtc.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Rtc;
 
-typedef void (*Npc_RtcActionFunc)(struct Npc_Rtc*, struct PlayState*);
+typedef void (*Npc_RtcActionFunc)(struct Npc_Rtc*, struct Game_Play*);
 
 typedef struct Npc_Rtc {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Shop_Master/ac_npc_shop_master.c b/src/overlays/actors/ovl_Npc_Shop_Master/ac_npc_shop_master.c
index 0c6c511..6225c44 100644
--- a/src/overlays/actors/ovl_Npc_Shop_Master/ac_npc_shop_master.c
+++ b/src/overlays/actors/ovl_Npc_Shop_Master/ac_npc_shop_master.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNSM_actor_ct(Actor* thisx, PlayState* play);
-void aNSM_actor_dt(Actor* thisx, PlayState* play);
-void aNSM_actor_init(Actor* thisx, PlayState* play);
-void aNSM_actor_save(Actor* thisx, PlayState* play);
+void aNSM_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNSM_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNSM_actor_init(Actor* thisx, Game_Play* game_play);
+void aNSM_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Shop_Master_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Shop_Master/ac_npc_shop_master.h b/src/overlays/actors/ovl_Npc_Shop_Master/ac_npc_shop_master.h
index 7ec3140..1c3e307 100644
--- a/src/overlays/actors/ovl_Npc_Shop_Master/ac_npc_shop_master.h
+++ b/src/overlays/actors/ovl_Npc_Shop_Master/ac_npc_shop_master.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Shop_Master;
 
-typedef void (*Npc_Shop_MasterActionFunc)(struct Npc_Shop_Master*, struct PlayState*);
+typedef void (*Npc_Shop_MasterActionFunc)(struct Npc_Shop_Master*, struct Game_Play*);
 
 typedef struct Npc_Shop_Master {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Shop_Mastersp/ac_npc_shop_mastersp.c b/src/overlays/actors/ovl_Npc_Shop_Mastersp/ac_npc_shop_mastersp.c
index 7a02b8d..07a9aee 100644
--- a/src/overlays/actors/ovl_Npc_Shop_Mastersp/ac_npc_shop_mastersp.c
+++ b/src/overlays/actors/ovl_Npc_Shop_Mastersp/ac_npc_shop_mastersp.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aSHM_actor_ct(Actor* thisx, PlayState* play);
-void aSHM_actor_dt(Actor* thisx, PlayState* play);
-void aSHM_actor_init(Actor* thisx, PlayState* play);
-void aSHM_actor_save(Actor* thisx, PlayState* play);
+void aSHM_actor_ct(Actor* thisx, Game_Play* game_play);
+void aSHM_actor_dt(Actor* thisx, Game_Play* game_play);
+void aSHM_actor_init(Actor* thisx, Game_Play* game_play);
+void aSHM_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Shop_Mastersp_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Shop_Mastersp/ac_npc_shop_mastersp.h b/src/overlays/actors/ovl_Npc_Shop_Mastersp/ac_npc_shop_mastersp.h
index 7855644..4e4b56c 100644
--- a/src/overlays/actors/ovl_Npc_Shop_Mastersp/ac_npc_shop_mastersp.h
+++ b/src/overlays/actors/ovl_Npc_Shop_Mastersp/ac_npc_shop_mastersp.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Shop_Mastersp;
 
-typedef void (*Npc_Shop_MasterspActionFunc)(struct Npc_Shop_Mastersp*, struct PlayState*);
+typedef void (*Npc_Shop_MasterspActionFunc)(struct Npc_Shop_Mastersp*, struct Game_Play*);
 
 typedef struct Npc_Shop_Mastersp {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Sleep_Obaba/ac_npc_sleep_obaba.c b/src/overlays/actors/ovl_Npc_Sleep_Obaba/ac_npc_sleep_obaba.c
index b5ba668..3b80ce2 100644
--- a/src/overlays/actors/ovl_Npc_Sleep_Obaba/ac_npc_sleep_obaba.c
+++ b/src/overlays/actors/ovl_Npc_Sleep_Obaba/ac_npc_sleep_obaba.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNSO_actor_ct(Actor* thisx, PlayState* play);
-void aNSO_actor_dt(Actor* thisx, PlayState* play);
-void aNSO_actor_init(Actor* thisx, PlayState* play);
-void aNSO_actor_save(Actor* thisx, PlayState* play);
+void aNSO_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNSO_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNSO_actor_init(Actor* thisx, Game_Play* game_play);
+void aNSO_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Sleep_Obaba_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Sleep_Obaba/ac_npc_sleep_obaba.h b/src/overlays/actors/ovl_Npc_Sleep_Obaba/ac_npc_sleep_obaba.h
index 72c906c..5dc14d0 100644
--- a/src/overlays/actors/ovl_Npc_Sleep_Obaba/ac_npc_sleep_obaba.h
+++ b/src/overlays/actors/ovl_Npc_Sleep_Obaba/ac_npc_sleep_obaba.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Sleep_Obaba;
 
-typedef void (*Npc_Sleep_ObabaActionFunc)(struct Npc_Sleep_Obaba*, struct PlayState*);
+typedef void (*Npc_Sleep_ObabaActionFunc)(struct Npc_Sleep_Obaba*, struct Game_Play*);
 
 typedef struct Npc_Sleep_Obaba {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Station_Master/ac_npc_station_master.c b/src/overlays/actors/ovl_Npc_Station_Master/ac_npc_station_master.c
index 3084acf..49a7d22 100644
--- a/src/overlays/actors/ovl_Npc_Station_Master/ac_npc_station_master.c
+++ b/src/overlays/actors/ovl_Npc_Station_Master/ac_npc_station_master.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aSTM_actor_ct(Actor* thisx, PlayState* play);
-void aSTM_actor_dt(Actor* thisx, PlayState* play);
-void aSTM_actor_init(Actor* thisx, PlayState* play);
-void aSTM_actor_save(Actor* thisx, PlayState* play);
+void aSTM_actor_ct(Actor* thisx, Game_Play* game_play);
+void aSTM_actor_dt(Actor* thisx, Game_Play* game_play);
+void aSTM_actor_init(Actor* thisx, Game_Play* game_play);
+void aSTM_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Station_Master_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Station_Master/ac_npc_station_master.h b/src/overlays/actors/ovl_Npc_Station_Master/ac_npc_station_master.h
index 6df3a34..4135d3c 100644
--- a/src/overlays/actors/ovl_Npc_Station_Master/ac_npc_station_master.h
+++ b/src/overlays/actors/ovl_Npc_Station_Master/ac_npc_station_master.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Station_Master;
 
-typedef void (*Npc_Station_MasterActionFunc)(struct Npc_Station_Master*, struct PlayState*);
+typedef void (*Npc_Station_MasterActionFunc)(struct Npc_Station_Master*, struct Game_Play*);
 
 typedef struct Npc_Station_Master {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Super_Master/ac_npc_super_master.c b/src/overlays/actors/ovl_Npc_Super_Master/ac_npc_super_master.c
index 33d3f11..10a003c 100644
--- a/src/overlays/actors/ovl_Npc_Super_Master/ac_npc_super_master.c
+++ b/src/overlays/actors/ovl_Npc_Super_Master/ac_npc_super_master.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNSPM_actor_ct(Actor* thisx, PlayState* play);
-void aNSPM_actor_dt(Actor* thisx, PlayState* play);
-void aNSPM_actor_init(Actor* thisx, PlayState* play);
-void aNSPM_actor_save(Actor* thisx, PlayState* play);
+void aNSPM_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNSPM_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNSPM_actor_init(Actor* thisx, Game_Play* game_play);
+void aNSPM_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Super_Master_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Super_Master/ac_npc_super_master.h b/src/overlays/actors/ovl_Npc_Super_Master/ac_npc_super_master.h
index e5630ce..9f419cf 100644
--- a/src/overlays/actors/ovl_Npc_Super_Master/ac_npc_super_master.h
+++ b/src/overlays/actors/ovl_Npc_Super_Master/ac_npc_super_master.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Super_Master;
 
-typedef void (*Npc_Super_MasterActionFunc)(struct Npc_Super_Master*, struct PlayState*);
+typedef void (*Npc_Super_MasterActionFunc)(struct Npc_Super_Master*, struct Game_Play*);
 
 typedef struct Npc_Super_Master {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Npc_Totakeke/ac_npc_totakeke.c b/src/overlays/actors/ovl_Npc_Totakeke/ac_npc_totakeke.c
index ec6779c..1421134 100644
--- a/src/overlays/actors/ovl_Npc_Totakeke/ac_npc_totakeke.c
+++ b/src/overlays/actors/ovl_Npc_Totakeke/ac_npc_totakeke.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aNTT_actor_ct(Actor* thisx, PlayState* play);
-void aNTT_actor_dt(Actor* thisx, PlayState* play);
-void aNTT_actor_init(Actor* thisx, PlayState* play);
-void aNTT_actor_save(Actor* thisx, PlayState* play);
+void aNTT_actor_ct(Actor* thisx, Game_Play* game_play);
+void aNTT_actor_dt(Actor* thisx, Game_Play* game_play);
+void aNTT_actor_init(Actor* thisx, Game_Play* game_play);
+void aNTT_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Npc_Totakeke_Profile = {
diff --git a/src/overlays/actors/ovl_Npc_Totakeke/ac_npc_totakeke.h b/src/overlays/actors/ovl_Npc_Totakeke/ac_npc_totakeke.h
index eb6e431..a4e6389 100644
--- a/src/overlays/actors/ovl_Npc_Totakeke/ac_npc_totakeke.h
+++ b/src/overlays/actors/ovl_Npc_Totakeke/ac_npc_totakeke.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Npc_Totakeke;
 
-typedef void (*Npc_TotakekeActionFunc)(struct Npc_Totakeke*, struct PlayState*);
+typedef void (*Npc_TotakekeActionFunc)(struct Npc_Totakeke*, struct Game_Play*);
 
 typedef struct Npc_Totakeke {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Police_Box/ac_police_box.c b/src/overlays/actors/ovl_Police_Box/ac_police_box.c
index f1ba019..ad579e9 100644
--- a/src/overlays/actors/ovl_Police_Box/ac_police_box.c
+++ b/src/overlays/actors/ovl_Police_Box/ac_police_box.c
@@ -1,10 +1,10 @@
 #include "ac_police_box.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aPBOX_actor_ct(Actor* thisx, PlayState* play);
-void func_80A078A4_jp(Actor* thisx, PlayState* play);
-void aPBOX_actor_init(Actor* thisx, PlayState* play);
-void aPBOX_actor_draw(Actor* thisx, PlayState* play);
+void aPBOX_actor_ct(Actor* thisx, Game_Play* game_play);
+void func_80A078A4_jp(Actor* thisx, Game_Play* game_play);
+void aPBOX_actor_init(Actor* thisx, Game_Play* game_play);
+void aPBOX_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Police_Box_Profile = {
diff --git a/src/overlays/actors/ovl_Police_Box/ac_police_box.h b/src/overlays/actors/ovl_Police_Box/ac_police_box.h
index 75d40b3..45d4d81 100644
--- a/src/overlays/actors/ovl_Police_Box/ac_police_box.h
+++ b/src/overlays/actors/ovl_Police_Box/ac_police_box.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Police_Box;
 
-typedef void (*Police_BoxActionFunc)(struct Police_Box*, struct PlayState*);
+typedef void (*Police_BoxActionFunc)(struct Police_Box*, struct Game_Play*);
 
 typedef struct Police_Box {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Post_Office/ac_post_office.c b/src/overlays/actors/ovl_Post_Office/ac_post_office.c
index aaa5639..e9b8273 100644
--- a/src/overlays/actors/ovl_Post_Office/ac_post_office.c
+++ b/src/overlays/actors/ovl_Post_Office/ac_post_office.c
@@ -1,10 +1,10 @@
 #include "ac_post_office.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aPOFF_actor_ct(Actor* thisx, PlayState* play);
-void aPOFF_actor_dt(Actor* thisx, PlayState* play);
-void aPOFF_actor_init(Actor* thisx, PlayState* play);
-void aPOFF_actor_draw(Actor* thisx, PlayState* play);
+void aPOFF_actor_ct(Actor* thisx, Game_Play* game_play);
+void aPOFF_actor_dt(Actor* thisx, Game_Play* game_play);
+void aPOFF_actor_init(Actor* thisx, Game_Play* game_play);
+void aPOFF_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Post_Office_Profile = {
diff --git a/src/overlays/actors/ovl_Post_Office/ac_post_office.h b/src/overlays/actors/ovl_Post_Office/ac_post_office.h
index fddb10e..ad31a67 100644
--- a/src/overlays/actors/ovl_Post_Office/ac_post_office.h
+++ b/src/overlays/actors/ovl_Post_Office/ac_post_office.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Post_Office;
 
-typedef void (*Post_OfficeActionFunc)(struct Post_Office*, struct PlayState*);
+typedef void (*Post_OfficeActionFunc)(struct Post_Office*, struct Game_Play*);
 
 typedef struct Post_Office {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Psnowman/ac_psnowman.c b/src/overlays/actors/ovl_Psnowman/ac_psnowman.c
index 283a865..4f5cf15 100644
--- a/src/overlays/actors/ovl_Psnowman/ac_psnowman.c
+++ b/src/overlays/actors/ovl_Psnowman/ac_psnowman.c
@@ -1,10 +1,10 @@
 #include "ac_psnowman.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aPSM_actor_ct(Actor* thisx, PlayState* play);
-void aPSM_actor_dt(Actor* thisx, PlayState* play);
-void aPSM_actor_move(Actor* thisx, PlayState* play);
-void aPSM_actor_draw(Actor* thisx, PlayState* play);
+void aPSM_actor_ct(Actor* thisx, Game_Play* game_play);
+void aPSM_actor_dt(Actor* thisx, Game_Play* game_play);
+void aPSM_actor_move(Actor* thisx, Game_Play* game_play);
+void aPSM_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Psnowman_Profile = {
diff --git a/src/overlays/actors/ovl_Psnowman/ac_psnowman.h b/src/overlays/actors/ovl_Psnowman/ac_psnowman.h
index d88c06f..8b5d154 100644
--- a/src/overlays/actors/ovl_Psnowman/ac_psnowman.h
+++ b/src/overlays/actors/ovl_Psnowman/ac_psnowman.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Psnowman;
 
-typedef void (*PsnowmanActionFunc)(struct Psnowman*, struct PlayState*);
+typedef void (*PsnowmanActionFunc)(struct Psnowman*, struct Game_Play*);
 
 typedef struct Psnowman {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Quest_Manager/ac_quest_manager.c b/src/overlays/actors/ovl_Quest_Manager/ac_quest_manager.c
index 06a38ef..0290f9a 100644
--- a/src/overlays/actors/ovl_Quest_Manager/ac_quest_manager.c
+++ b/src/overlays/actors/ovl_Quest_Manager/ac_quest_manager.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aQMgr_actor_ct(Actor* thisx, PlayState* play);
-void aQMgr_actor_dt(Actor* thisx, PlayState* play);
-void aQMgr_actor_move_main(Actor* thisx, PlayState* play);
-void aQMgr_actor_save(Actor* thisx, PlayState* play);
+void aQMgr_actor_ct(Actor* thisx, Game_Play* game_play);
+void aQMgr_actor_dt(Actor* thisx, Game_Play* game_play);
+void aQMgr_actor_move_main(Actor* thisx, Game_Play* game_play);
+void aQMgr_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Quest_Manager_Profile = {
diff --git a/src/overlays/actors/ovl_Quest_Manager/ac_quest_manager.h b/src/overlays/actors/ovl_Quest_Manager/ac_quest_manager.h
index 9f6273a..4414bbb 100644
--- a/src/overlays/actors/ovl_Quest_Manager/ac_quest_manager.h
+++ b/src/overlays/actors/ovl_Quest_Manager/ac_quest_manager.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Quest_Manager;
 
-typedef void (*Quest_ManagerActionFunc)(struct Quest_Manager*, struct PlayState*);
+typedef void (*Quest_ManagerActionFunc)(struct Quest_Manager*, struct Game_Play*);
 
 typedef struct Quest_Manager {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Radio/ac_radio.c b/src/overlays/actors/ovl_Radio/ac_radio.c
index 6c49113..98c07f1 100644
--- a/src/overlays/actors/ovl_Radio/ac_radio.c
+++ b/src/overlays/actors/ovl_Radio/ac_radio.c
@@ -1,10 +1,10 @@
 #include "ac_radio.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aRAD_actor_ct(Actor* thisx, PlayState* play);
-void func_80A76958_jp(Actor* thisx, PlayState* play);
-void aRAD_actor_init(Actor* thisx, PlayState* play);
-void aRAD_actor_draw(Actor* thisx, PlayState* play);
+void aRAD_actor_ct(Actor* thisx, Game_Play* game_play);
+void func_80A76958_jp(Actor* thisx, Game_Play* game_play);
+void aRAD_actor_init(Actor* thisx, Game_Play* game_play);
+void aRAD_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Radio_Profile = {
diff --git a/src/overlays/actors/ovl_Radio/ac_radio.h b/src/overlays/actors/ovl_Radio/ac_radio.h
index ac2ddab..387346c 100644
--- a/src/overlays/actors/ovl_Radio/ac_radio.h
+++ b/src/overlays/actors/ovl_Radio/ac_radio.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Radio;
 
-typedef void (*RadioActionFunc)(struct Radio*, struct PlayState*);
+typedef void (*RadioActionFunc)(struct Radio*, struct Game_Play*);
 
 typedef struct Radio {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Reserve/ac_reserve.c b/src/overlays/actors/ovl_Reserve/ac_reserve.c
index 6e7799e..a485ac4 100644
--- a/src/overlays/actors/ovl_Reserve/ac_reserve.c
+++ b/src/overlays/actors/ovl_Reserve/ac_reserve.c
@@ -1,10 +1,10 @@
 #include "ac_reserve.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aRSV_actor_ct(Actor* thisx, PlayState* play);
-void func_80A09370_jp(Actor* thisx, PlayState* play);
-void aRSV_actor_init(Actor* thisx, PlayState* play);
-void aRSV_actor_draw(Actor* thisx, PlayState* play);
+void aRSV_actor_ct(Actor* thisx, Game_Play* game_play);
+void func_80A09370_jp(Actor* thisx, Game_Play* game_play);
+void aRSV_actor_init(Actor* thisx, Game_Play* game_play);
+void aRSV_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Reserve_Profile = {
diff --git a/src/overlays/actors/ovl_Reserve/ac_reserve.h b/src/overlays/actors/ovl_Reserve/ac_reserve.h
index 2ddfda2..687fbad 100644
--- a/src/overlays/actors/ovl_Reserve/ac_reserve.h
+++ b/src/overlays/actors/ovl_Reserve/ac_reserve.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Reserve;
 
-typedef void (*ReserveActionFunc)(struct Reserve*, struct PlayState*);
+typedef void (*ReserveActionFunc)(struct Reserve*, struct Game_Play*);
 
 typedef struct Reserve {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Ride_Off_Demo/ac_ride_off_demo.c b/src/overlays/actors/ovl_Ride_Off_Demo/ac_ride_off_demo.c
index c58ac79..a3080ac 100644
--- a/src/overlays/actors/ovl_Ride_Off_Demo/ac_ride_off_demo.c
+++ b/src/overlays/actors/ovl_Ride_Off_Demo/ac_ride_off_demo.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aROD_actor_ct(Actor* thisx, PlayState* play);
-void aROD_actor_dt(Actor* thisx, PlayState* play);
-void aROD_actor_move(Actor* thisx, PlayState* play);
+void aROD_actor_ct(Actor* thisx, Game_Play* game_play);
+void aROD_actor_dt(Actor* thisx, Game_Play* game_play);
+void aROD_actor_move(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Ride_Off_Demo_Profile = {
diff --git a/src/overlays/actors/ovl_Ride_Off_Demo/ac_ride_off_demo.h b/src/overlays/actors/ovl_Ride_Off_Demo/ac_ride_off_demo.h
index d2244c4..61fdb35 100644
--- a/src/overlays/actors/ovl_Ride_Off_Demo/ac_ride_off_demo.h
+++ b/src/overlays/actors/ovl_Ride_Off_Demo/ac_ride_off_demo.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Ride_Off_Demo;
 
-typedef void (*Ride_Off_DemoActionFunc)(struct Ride_Off_Demo*, struct PlayState*);
+typedef void (*Ride_Off_DemoActionFunc)(struct Ride_Off_Demo*, struct Game_Play*);
 
 typedef struct Ride_Off_Demo {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Room_Sunshine/ef_room_sunshine.c b/src/overlays/actors/ovl_Room_Sunshine/ef_room_sunshine.c
index 2abb798..183f672 100644
--- a/src/overlays/actors/ovl_Room_Sunshine/ef_room_sunshine.c
+++ b/src/overlays/actors/ovl_Room_Sunshine/ef_room_sunshine.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Ef_Room_Sunshine_actor_ct(Actor* thisx, PlayState* play);
-void Ef_Room_SunshineR_actor_move(Actor* thisx, PlayState* play);
-void Ef_Room_SunshineR_actor_draw(Actor* thisx, PlayState* play);
+void Ef_Room_Sunshine_actor_ct(Actor* thisx, Game_Play* game_play);
+void Ef_Room_SunshineR_actor_move(Actor* thisx, Game_Play* game_play);
+void Ef_Room_SunshineR_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Room_Sunshine_Profile = {
diff --git a/src/overlays/actors/ovl_Room_Sunshine/ef_room_sunshine.h b/src/overlays/actors/ovl_Room_Sunshine/ef_room_sunshine.h
index 19f6091..d6c21b0 100644
--- a/src/overlays/actors/ovl_Room_Sunshine/ef_room_sunshine.h
+++ b/src/overlays/actors/ovl_Room_Sunshine/ef_room_sunshine.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Room_Sunshine;
 
-typedef void (*Room_SunshineActionFunc)(struct Room_Sunshine*, struct PlayState*);
+typedef void (*Room_SunshineActionFunc)(struct Room_Sunshine*, struct Game_Play*);
 
 typedef struct Room_Sunshine {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Room_Sunshine_Police/ef_room_sunshine_police.c b/src/overlays/actors/ovl_Room_Sunshine_Police/ef_room_sunshine_police.c
index cc70fb5..37545a0 100644
--- a/src/overlays/actors/ovl_Room_Sunshine_Police/ef_room_sunshine_police.c
+++ b/src/overlays/actors/ovl_Room_Sunshine_Police/ef_room_sunshine_police.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Ef_Room_Sunshine_Police_actor_ct(Actor* thisx, PlayState* play);
-void Ef_Room_Sunshine_PoliceR_actor_move(Actor* thisx, PlayState* play);
-void Ef_Room_Sunshine_PoliceR_actor_draw(Actor* thisx, PlayState* play);
+void Ef_Room_Sunshine_Police_actor_ct(Actor* thisx, Game_Play* game_play);
+void Ef_Room_Sunshine_PoliceR_actor_move(Actor* thisx, Game_Play* game_play);
+void Ef_Room_Sunshine_PoliceR_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Room_Sunshine_Police_Profile = {
diff --git a/src/overlays/actors/ovl_Room_Sunshine_Police/ef_room_sunshine_police.h b/src/overlays/actors/ovl_Room_Sunshine_Police/ef_room_sunshine_police.h
index 8147f9d..4abc216 100644
--- a/src/overlays/actors/ovl_Room_Sunshine_Police/ef_room_sunshine_police.h
+++ b/src/overlays/actors/ovl_Room_Sunshine_Police/ef_room_sunshine_police.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Room_Sunshine_Police;
 
-typedef void (*Room_Sunshine_PoliceActionFunc)(struct Room_Sunshine_Police*, struct PlayState*);
+typedef void (*Room_Sunshine_PoliceActionFunc)(struct Room_Sunshine_Police*, struct Game_Play*);
 
 typedef struct Room_Sunshine_Police {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Room_Sunshine_Posthouse/ef_room_sunshine_posthouse.c b/src/overlays/actors/ovl_Room_Sunshine_Posthouse/ef_room_sunshine_posthouse.c
index 7124e99..05eca51 100644
--- a/src/overlays/actors/ovl_Room_Sunshine_Posthouse/ef_room_sunshine_posthouse.c
+++ b/src/overlays/actors/ovl_Room_Sunshine_Posthouse/ef_room_sunshine_posthouse.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Ef_Room_Sunshine_Posthouse_actor_ct(Actor* thisx, PlayState* play);
-void Ef_Room_Sunshine_PosthouseR_actor_move(Actor* thisx, PlayState* play);
-void Ef_Room_Sunshine_PosthouseR_actor_draw(Actor* thisx, PlayState* play);
+void Ef_Room_Sunshine_Posthouse_actor_ct(Actor* thisx, Game_Play* game_play);
+void Ef_Room_Sunshine_PosthouseR_actor_move(Actor* thisx, Game_Play* game_play);
+void Ef_Room_Sunshine_PosthouseR_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Room_Sunshine_Posthouse_Profile = {
diff --git a/src/overlays/actors/ovl_Room_Sunshine_Posthouse/ef_room_sunshine_posthouse.h b/src/overlays/actors/ovl_Room_Sunshine_Posthouse/ef_room_sunshine_posthouse.h
index ae08ec2..b755bdf 100644
--- a/src/overlays/actors/ovl_Room_Sunshine_Posthouse/ef_room_sunshine_posthouse.h
+++ b/src/overlays/actors/ovl_Room_Sunshine_Posthouse/ef_room_sunshine_posthouse.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Room_Sunshine_Posthouse;
 
-typedef void (*Room_Sunshine_PosthouseActionFunc)(struct Room_Sunshine_Posthouse*, struct PlayState*);
+typedef void (*Room_Sunshine_PosthouseActionFunc)(struct Room_Sunshine_Posthouse*, struct Game_Play*);
 
 typedef struct Room_Sunshine_Posthouse {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Rope/ac_rope.c b/src/overlays/actors/ovl_Rope/ac_rope.c
index cfcfea9..a573972 100644
--- a/src/overlays/actors/ovl_Rope/ac_rope.c
+++ b/src/overlays/actors/ovl_Rope/ac_rope.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aRP_actor_ct(Actor* thisx, PlayState* play);
-void aRP_actor_dt(Actor* thisx, PlayState* play);
-void aRP_actor_draw(Actor* thisx, PlayState* play);
+void aRP_actor_ct(Actor* thisx, Game_Play* game_play);
+void aRP_actor_dt(Actor* thisx, Game_Play* game_play);
+void aRP_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Rope_Profile = {
diff --git a/src/overlays/actors/ovl_Rope/ac_rope.h b/src/overlays/actors/ovl_Rope/ac_rope.h
index d7787fb..3b164e6 100644
--- a/src/overlays/actors/ovl_Rope/ac_rope.h
+++ b/src/overlays/actors/ovl_Rope/ac_rope.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Rope;
 
-typedef void (*RopeActionFunc)(struct Rope*, struct PlayState*);
+typedef void (*RopeActionFunc)(struct Rope*, struct Game_Play*);
 
 typedef struct Rope {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_S_Car/ac_s_car.c b/src/overlays/actors/ovl_S_Car/ac_s_car.c
index d062ea8..ff84b8e 100644
--- a/src/overlays/actors/ovl_S_Car/ac_s_car.c
+++ b/src/overlays/actors/ovl_S_Car/ac_s_car.c
@@ -1,10 +1,10 @@
 #include "ac_s_car.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aSCR_actor_ct(Actor* thisx, PlayState* play);
-void aSCR_actor_dt(Actor* thisx, PlayState* play);
-void aSCR_actor_init(Actor* thisx, PlayState* play);
-void aSCR_actor_draw(Actor* thisx, PlayState* play);
+void aSCR_actor_ct(Actor* thisx, Game_Play* game_play);
+void aSCR_actor_dt(Actor* thisx, Game_Play* game_play);
+void aSCR_actor_init(Actor* thisx, Game_Play* game_play);
+void aSCR_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile S_Car_Profile = {
diff --git a/src/overlays/actors/ovl_S_Car/ac_s_car.h b/src/overlays/actors/ovl_S_Car/ac_s_car.h
index aaca9eb..b0d50dd 100644
--- a/src/overlays/actors/ovl_S_Car/ac_s_car.h
+++ b/src/overlays/actors/ovl_S_Car/ac_s_car.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct S_Car;
 
-typedef void (*S_CarActionFunc)(struct S_Car*, struct PlayState*);
+typedef void (*S_CarActionFunc)(struct S_Car*, struct Game_Play*);
 
 typedef struct S_Car {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Sample/ac_sample.c b/src/overlays/actors/ovl_Sample/ac_sample.c
index 102c0d5..8cfc788 100644
--- a/src/overlays/actors/ovl_Sample/ac_sample.c
+++ b/src/overlays/actors/ovl_Sample/ac_sample.c
@@ -1,10 +1,10 @@
 #include "ac_sample.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Ac_Sample_Actor_ct(Actor* thisx, PlayState* play);
-void Ac_Sample_Actor_dt(Actor* thisx, PlayState* play);
-void Ac_Sample_Actor_main(Actor* thisx, PlayState* play);
-void Ac_Sample_Actor_draw(Actor* thisx, PlayState* play);
+void Ac_Sample_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Ac_Sample_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Ac_Sample_Actor_main(Actor* thisx, Game_Play* game_play);
+void Ac_Sample_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Sample_Profile = {
diff --git a/src/overlays/actors/ovl_Sample/ac_sample.h b/src/overlays/actors/ovl_Sample/ac_sample.h
index eeab2f2..303c04b 100644
--- a/src/overlays/actors/ovl_Sample/ac_sample.h
+++ b/src/overlays/actors/ovl_Sample/ac_sample.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Sample;
 
-typedef void (*SampleActionFunc)(struct Sample*, struct PlayState*);
+typedef void (*SampleActionFunc)(struct Sample*, struct Game_Play*);
 
 typedef struct Sample {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Set_Manager/ac_set_manager.c b/src/overlays/actors/ovl_Set_Manager/ac_set_manager.c
index 4fe2f7d..1f8d383 100644
--- a/src/overlays/actors/ovl_Set_Manager/ac_set_manager.c
+++ b/src/overlays/actors/ovl_Set_Manager/ac_set_manager.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aSetMgr_ct(Actor* thisx, PlayState* play);
-void aSetMgr_dt(Actor* thisx, PlayState* play);
-void aSetMgr_move(Actor* thisx, PlayState* play);
+void aSetMgr_ct(Actor* thisx, Game_Play* game_play);
+void aSetMgr_dt(Actor* thisx, Game_Play* game_play);
+void aSetMgr_move(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Set_Manager_Profile = {
diff --git a/src/overlays/actors/ovl_Set_Manager/ac_set_manager.h b/src/overlays/actors/ovl_Set_Manager/ac_set_manager.h
index 29c8e1a..312550b 100644
--- a/src/overlays/actors/ovl_Set_Manager/ac_set_manager.h
+++ b/src/overlays/actors/ovl_Set_Manager/ac_set_manager.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Set_Manager;
 
-typedef void (*Set_ManagerActionFunc)(struct Set_Manager*, struct PlayState*);
+typedef void (*Set_ManagerActionFunc)(struct Set_Manager*, struct Game_Play*);
 
 typedef struct Set_Manager {
     /* 0x0000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Set_Npc_Manager/ac_set_npc_manager.c b/src/overlays/actors/ovl_Set_Npc_Manager/ac_set_npc_manager.c
index 6590140..2ddae75 100644
--- a/src/overlays/actors/ovl_Set_Npc_Manager/ac_set_npc_manager.c
+++ b/src/overlays/actors/ovl_Set_Npc_Manager/ac_set_npc_manager.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aSNMgr_actor_ct(Actor* thisx, PlayState* play);
-void aSNMgr_actor_dt(Actor* thisx, PlayState* play);
-void aSNMgr_actor_move(Actor* thisx, PlayState* play);
+void aSNMgr_actor_ct(Actor* thisx, Game_Play* game_play);
+void aSNMgr_actor_dt(Actor* thisx, Game_Play* game_play);
+void aSNMgr_actor_move(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Set_Npc_Manager_Profile = {
diff --git a/src/overlays/actors/ovl_Set_Npc_Manager/ac_set_npc_manager.h b/src/overlays/actors/ovl_Set_Npc_Manager/ac_set_npc_manager.h
index 485f69a..054ef3d 100644
--- a/src/overlays/actors/ovl_Set_Npc_Manager/ac_set_npc_manager.h
+++ b/src/overlays/actors/ovl_Set_Npc_Manager/ac_set_npc_manager.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Set_Npc_Manager;
 
-typedef void (*Set_Npc_ManagerActionFunc)(struct Set_Npc_Manager*, struct PlayState*);
+typedef void (*Set_Npc_ManagerActionFunc)(struct Set_Npc_Manager*, struct Game_Play*);
 
 typedef struct Set_Npc_Manager {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Shop/ac_shop.c b/src/overlays/actors/ovl_Shop/ac_shop.c
index 399b3ee..bd4d87b 100644
--- a/src/overlays/actors/ovl_Shop/ac_shop.c
+++ b/src/overlays/actors/ovl_Shop/ac_shop.c
@@ -1,10 +1,10 @@
 #include "ac_shop.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aSHOP_actor_ct(Actor* thisx, PlayState* play);
-void aSHOP_actor_dt(Actor* thisx, PlayState* play);
-void aSHOP_actor_init(Actor* thisx, PlayState* play);
-void aSHOP_actor_draw(Actor* thisx, PlayState* play);
+void aSHOP_actor_ct(Actor* thisx, Game_Play* game_play);
+void aSHOP_actor_dt(Actor* thisx, Game_Play* game_play);
+void aSHOP_actor_init(Actor* thisx, Game_Play* game_play);
+void aSHOP_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Shop_Profile = {
diff --git a/src/overlays/actors/ovl_Shop/ac_shop.h b/src/overlays/actors/ovl_Shop/ac_shop.h
index e389576..88ff580 100644
--- a/src/overlays/actors/ovl_Shop/ac_shop.h
+++ b/src/overlays/actors/ovl_Shop/ac_shop.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Shop;
 
-typedef void (*ShopActionFunc)(struct Shop*, struct PlayState*);
+typedef void (*ShopActionFunc)(struct Shop*, struct Game_Play*);
 
 typedef struct Shop {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Shop_Design/ac_shop_design.c b/src/overlays/actors/ovl_Shop_Design/ac_shop_design.c
index 474a329..eb4cbb8 100644
--- a/src/overlays/actors/ovl_Shop_Design/ac_shop_design.c
+++ b/src/overlays/actors/ovl_Shop_Design/ac_shop_design.c
@@ -1,10 +1,10 @@
 #include "ac_shop_design.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Shop_Design_Actor_ct(Actor* thisx, PlayState* play);
-void Shop_Design_Actor_dt(Actor* thisx, PlayState* play);
-void Shop_Design_Actor_move(Actor* thisx, PlayState* play);
-void Shop_Design_Actor_draw(Actor* thisx, PlayState* play);
+void Shop_Design_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Shop_Design_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Shop_Design_Actor_move(Actor* thisx, Game_Play* game_play);
+void Shop_Design_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Shop_Design_Profile = {
diff --git a/src/overlays/actors/ovl_Shop_Design/ac_shop_design.h b/src/overlays/actors/ovl_Shop_Design/ac_shop_design.h
index b382c80..f56c6fa 100644
--- a/src/overlays/actors/ovl_Shop_Design/ac_shop_design.h
+++ b/src/overlays/actors/ovl_Shop_Design/ac_shop_design.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Shop_Design;
 
-typedef void (*Shop_DesignActionFunc)(struct Shop_Design*, struct PlayState*);
+typedef void (*Shop_DesignActionFunc)(struct Shop_Design*, struct Game_Play*);
 
 typedef struct Shop_Design {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Shop_Goods/ac_shop_goods.c b/src/overlays/actors/ovl_Shop_Goods/ac_shop_goods.c
index 54b2fd9..c7b7be8 100644
--- a/src/overlays/actors/ovl_Shop_Goods/ac_shop_goods.c
+++ b/src/overlays/actors/ovl_Shop_Goods/ac_shop_goods.c
@@ -1,10 +1,10 @@
 #include "ac_shop_goods.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Shop_Goods_Actor_ct(Actor* thisx, PlayState* play);
-void Shop_Goods_Actor_dt(Actor* thisx, PlayState* play);
-void Shop_Goods_Actor_move(Actor* thisx, PlayState* play);
-void Shop_Goods_Actor_draw(Actor* thisx, PlayState* play);
+void Shop_Goods_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Shop_Goods_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Shop_Goods_Actor_move(Actor* thisx, Game_Play* game_play);
+void Shop_Goods_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Shop_Goods_Profile = {
diff --git a/src/overlays/actors/ovl_Shop_Goods/ac_shop_goods.h b/src/overlays/actors/ovl_Shop_Goods/ac_shop_goods.h
index d0446d6..68dee17 100644
--- a/src/overlays/actors/ovl_Shop_Goods/ac_shop_goods.h
+++ b/src/overlays/actors/ovl_Shop_Goods/ac_shop_goods.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Shop_Goods;
 
-typedef void (*Shop_GoodsActionFunc)(struct Shop_Goods*, struct PlayState*);
+typedef void (*Shop_GoodsActionFunc)(struct Shop_Goods*, struct Game_Play*);
 
 typedef struct Shop_Goods {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Shop_Indoor/ac_shop_indoor.c b/src/overlays/actors/ovl_Shop_Indoor/ac_shop_indoor.c
index 39d2257..8417556 100644
--- a/src/overlays/actors/ovl_Shop_Indoor/ac_shop_indoor.c
+++ b/src/overlays/actors/ovl_Shop_Indoor/ac_shop_indoor.c
@@ -1,10 +1,10 @@
 #include "ac_shop_indoor.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Shop_Indoor_Actor_ct(Actor* thisx, PlayState* play);
-void Shop_Indoor_Actor_dt(Actor* thisx, PlayState* play);
-void Shop_Indoor_Actor_move(Actor* thisx, PlayState* play);
-void Shop_Indoor_Actor_draw(Actor* thisx, PlayState* play);
+void Shop_Indoor_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Shop_Indoor_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Shop_Indoor_Actor_move(Actor* thisx, Game_Play* game_play);
+void Shop_Indoor_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Shop_Indoor_Profile = {
diff --git a/src/overlays/actors/ovl_Shop_Indoor/ac_shop_indoor.h b/src/overlays/actors/ovl_Shop_Indoor/ac_shop_indoor.h
index d87a91e..d1ed003 100644
--- a/src/overlays/actors/ovl_Shop_Indoor/ac_shop_indoor.h
+++ b/src/overlays/actors/ovl_Shop_Indoor/ac_shop_indoor.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Shop_Indoor;
 
-typedef void (*Shop_IndoorActionFunc)(struct Shop_Indoor*, struct PlayState*);
+typedef void (*Shop_IndoorActionFunc)(struct Shop_Indoor*, struct Game_Play*);
 
 typedef struct Shop_Indoor {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Shop_Level/ac_shop_level.c b/src/overlays/actors/ovl_Shop_Level/ac_shop_level.c
index 99a20df..d711b68 100644
--- a/src/overlays/actors/ovl_Shop_Level/ac_shop_level.c
+++ b/src/overlays/actors/ovl_Shop_Level/ac_shop_level.c
@@ -1,10 +1,10 @@
 #include "ac_shop_level.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Shop_Level_Actor_ct(Actor* thisx, PlayState* play);
-void Shop_Level_Actor_dt(Actor* thisx, PlayState* play);
-void Shop_Level_Actor_move(Actor* thisx, PlayState* play);
-void Shop_Level_Actor_draw(Actor* thisx, PlayState* play);
+void Shop_Level_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Shop_Level_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Shop_Level_Actor_move(Actor* thisx, Game_Play* game_play);
+void Shop_Level_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Shop_Level_Profile = {
diff --git a/src/overlays/actors/ovl_Shop_Level/ac_shop_level.h b/src/overlays/actors/ovl_Shop_Level/ac_shop_level.h
index 03bb78b..7692eb7 100644
--- a/src/overlays/actors/ovl_Shop_Level/ac_shop_level.h
+++ b/src/overlays/actors/ovl_Shop_Level/ac_shop_level.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Shop_Level;
 
-typedef void (*Shop_LevelActionFunc)(struct Shop_Level*, struct PlayState*);
+typedef void (*Shop_LevelActionFunc)(struct Shop_Level*, struct Game_Play*);
 
 typedef struct Shop_Level {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Shop_Manekin/ac_shop_manekin.c b/src/overlays/actors/ovl_Shop_Manekin/ac_shop_manekin.c
index 467c0b0..5ae261a 100644
--- a/src/overlays/actors/ovl_Shop_Manekin/ac_shop_manekin.c
+++ b/src/overlays/actors/ovl_Shop_Manekin/ac_shop_manekin.c
@@ -1,10 +1,10 @@
 #include "ac_shop_manekin.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Shop_Manekin_Actor_ct(Actor* thisx, PlayState* play);
-void Shop_Manekin_Actor_dt(Actor* thisx, PlayState* play);
-void Shop_Manekin_Actor_move(Actor* thisx, PlayState* play);
-void Shop_Manekin_Actor_draw(Actor* thisx, PlayState* play);
+void Shop_Manekin_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Shop_Manekin_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Shop_Manekin_Actor_move(Actor* thisx, Game_Play* game_play);
+void Shop_Manekin_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Shop_Manekin_Profile = {
diff --git a/src/overlays/actors/ovl_Shop_Manekin/ac_shop_manekin.h b/src/overlays/actors/ovl_Shop_Manekin/ac_shop_manekin.h
index d13619b..89ced56 100644
--- a/src/overlays/actors/ovl_Shop_Manekin/ac_shop_manekin.h
+++ b/src/overlays/actors/ovl_Shop_Manekin/ac_shop_manekin.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Shop_Manekin;
 
-typedef void (*Shop_ManekinActionFunc)(struct Shop_Manekin*, struct PlayState*);
+typedef void (*Shop_ManekinActionFunc)(struct Shop_Manekin*, struct Game_Play*);
 
 typedef struct Shop_Manekin {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Shop_Umbrella/ac_shop_umbrella.c b/src/overlays/actors/ovl_Shop_Umbrella/ac_shop_umbrella.c
index 5f2dea0..7895f44 100644
--- a/src/overlays/actors/ovl_Shop_Umbrella/ac_shop_umbrella.c
+++ b/src/overlays/actors/ovl_Shop_Umbrella/ac_shop_umbrella.c
@@ -1,10 +1,10 @@
 #include "ac_shop_umbrella.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Shop_Umbrella_Actor_ct(Actor* thisx, PlayState* play);
-void Shop_Umbrella_Actor_dt(Actor* thisx, PlayState* play);
-void Shop_Umbrella_Actor_move(Actor* thisx, PlayState* play);
-void Shop_Umbrella_Actor_draw(Actor* thisx, PlayState* play);
+void Shop_Umbrella_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Shop_Umbrella_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Shop_Umbrella_Actor_move(Actor* thisx, Game_Play* game_play);
+void Shop_Umbrella_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Shop_Umbrella_Profile = {
diff --git a/src/overlays/actors/ovl_Shop_Umbrella/ac_shop_umbrella.h b/src/overlays/actors/ovl_Shop_Umbrella/ac_shop_umbrella.h
index f287413..456e618 100644
--- a/src/overlays/actors/ovl_Shop_Umbrella/ac_shop_umbrella.h
+++ b/src/overlays/actors/ovl_Shop_Umbrella/ac_shop_umbrella.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Shop_Umbrella;
 
-typedef void (*Shop_UmbrellaActionFunc)(struct Shop_Umbrella*, struct PlayState*);
+typedef void (*Shop_UmbrellaActionFunc)(struct Shop_Umbrella*, struct Game_Play*);
 
 typedef struct Shop_Umbrella {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Shrine/ac_shrine.c b/src/overlays/actors/ovl_Shrine/ac_shrine.c
index a0c6ff5..42a82b3 100644
--- a/src/overlays/actors/ovl_Shrine/ac_shrine.c
+++ b/src/overlays/actors/ovl_Shrine/ac_shrine.c
@@ -1,10 +1,10 @@
 #include "ac_shrine.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aSHR_actor_ct(Actor* thisx, PlayState* play);
-void aSHR_actor_dt(Actor* thisx, PlayState* play);
-void aSHR_actor_init(Actor* thisx, PlayState* play);
-void aSHR_actor_draw(Actor* thisx, PlayState* play);
+void aSHR_actor_ct(Actor* thisx, Game_Play* game_play);
+void aSHR_actor_dt(Actor* thisx, Game_Play* game_play);
+void aSHR_actor_init(Actor* thisx, Game_Play* game_play);
+void aSHR_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Shrine_Profile = {
diff --git a/src/overlays/actors/ovl_Shrine/ac_shrine.h b/src/overlays/actors/ovl_Shrine/ac_shrine.h
index f209aed..490ff59 100644
--- a/src/overlays/actors/ovl_Shrine/ac_shrine.h
+++ b/src/overlays/actors/ovl_Shrine/ac_shrine.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Shrine;
 
-typedef void (*ShrineActionFunc)(struct Shrine*, struct PlayState*);
+typedef void (*ShrineActionFunc)(struct Shrine*, struct Game_Play*);
 
 typedef struct Shrine {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Snowman/ac_snowman.c b/src/overlays/actors/ovl_Snowman/ac_snowman.c
index 9ff4fc4..02cdd19 100644
--- a/src/overlays/actors/ovl_Snowman/ac_snowman.c
+++ b/src/overlays/actors/ovl_Snowman/ac_snowman.c
@@ -1,10 +1,10 @@
 #include "ac_snowman.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aSMAN_actor_ct(Actor* thisx, PlayState* play);
-void aSMAN_actor_dt(Actor* thisx, PlayState* play);
-void aSMAN_actor_move(Actor* thisx, PlayState* play);
-void aSMAN_actor_draw(Actor* thisx, PlayState* play);
+void aSMAN_actor_ct(Actor* thisx, Game_Play* game_play);
+void aSMAN_actor_dt(Actor* thisx, Game_Play* game_play);
+void aSMAN_actor_move(Actor* thisx, Game_Play* game_play);
+void aSMAN_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Snowman_Profile = {
diff --git a/src/overlays/actors/ovl_Snowman/ac_snowman.h b/src/overlays/actors/ovl_Snowman/ac_snowman.h
index b9ed602..044b33a 100644
--- a/src/overlays/actors/ovl_Snowman/ac_snowman.h
+++ b/src/overlays/actors/ovl_Snowman/ac_snowman.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Snowman;
 
-typedef void (*SnowmanActionFunc)(struct Snowman*, struct PlayState*);
+typedef void (*SnowmanActionFunc)(struct Snowman*, struct Game_Play*);
 
 typedef struct Snowman {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Station/ac_station.c b/src/overlays/actors/ovl_Station/ac_station.c
index 519a999..f8c8a2c 100644
--- a/src/overlays/actors/ovl_Station/ac_station.c
+++ b/src/overlays/actors/ovl_Station/ac_station.c
@@ -1,10 +1,10 @@
 #include "ac_station.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aSTA_actor_ct(Actor* thisx, PlayState* play);
-void aSTA_actor_dt(Actor* thisx, PlayState* play);
-void aSTA_actor_init(Actor* thisx, PlayState* play);
-void aSTA_actor_draw(Actor* thisx, PlayState* play);
+void aSTA_actor_ct(Actor* thisx, Game_Play* game_play);
+void aSTA_actor_dt(Actor* thisx, Game_Play* game_play);
+void aSTA_actor_init(Actor* thisx, Game_Play* game_play);
+void aSTA_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Station_Profile = {
diff --git a/src/overlays/actors/ovl_Station/ac_station.h b/src/overlays/actors/ovl_Station/ac_station.h
index 75fc623..3795792 100644
--- a/src/overlays/actors/ovl_Station/ac_station.h
+++ b/src/overlays/actors/ovl_Station/ac_station.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Station;
 
-typedef void (*StationActionFunc)(struct Station*, struct PlayState*);
+typedef void (*StationActionFunc)(struct Station*, struct Game_Play*);
 
 typedef struct Station {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Structure/ac_structure.c b/src/overlays/actors/ovl_Structure/ac_structure.c
index cc933a8..175ad9f 100644
--- a/src/overlays/actors/ovl_Structure/ac_structure.c
+++ b/src/overlays/actors/ovl_Structure/ac_structure.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aSTR_actor_ct(Actor* thisx, PlayState* play);
-void aSTR_actor_dt(Actor* thisx, PlayState* play);
-void aSTR_actor_move(Actor* thisx, PlayState* play);
+void aSTR_actor_ct(Actor* thisx, Game_Play* game_play);
+void aSTR_actor_dt(Actor* thisx, Game_Play* game_play);
+void aSTR_actor_move(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Structure_Profile = {
diff --git a/src/overlays/actors/ovl_Structure/ac_structure.h b/src/overlays/actors/ovl_Structure/ac_structure.h
index 6712ef1..e9a7204 100644
--- a/src/overlays/actors/ovl_Structure/ac_structure.h
+++ b/src/overlays/actors/ovl_Structure/ac_structure.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Structure;
 
-typedef void (*StructureActionFunc)(struct Structure*, struct PlayState*);
+typedef void (*StructureActionFunc)(struct Structure*, struct Game_Play*);
 
 typedef struct Structure {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Super/ac_super.c b/src/overlays/actors/ovl_Super/ac_super.c
index 80f5daf..7fb0315 100644
--- a/src/overlays/actors/ovl_Super/ac_super.c
+++ b/src/overlays/actors/ovl_Super/ac_super.c
@@ -1,10 +1,10 @@
 #include "ac_super.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aSPR_actor_ct(Actor* thisx, PlayState* play);
-void aSPR_actor_dt(Actor* thisx, PlayState* play);
-void aSPR_actor_init(Actor* thisx, PlayState* play);
-void aSPR_actor_draw(Actor* thisx, PlayState* play);
+void aSPR_actor_ct(Actor* thisx, Game_Play* game_play);
+void aSPR_actor_dt(Actor* thisx, Game_Play* game_play);
+void aSPR_actor_init(Actor* thisx, Game_Play* game_play);
+void aSPR_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Super_Profile = {
diff --git a/src/overlays/actors/ovl_Super/ac_super.h b/src/overlays/actors/ovl_Super/ac_super.h
index d523235..c08ec1f 100644
--- a/src/overlays/actors/ovl_Super/ac_super.h
+++ b/src/overlays/actors/ovl_Super/ac_super.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Super;
 
-typedef void (*SuperActionFunc)(struct Super*, struct PlayState*);
+typedef void (*SuperActionFunc)(struct Super*, struct Game_Play*);
 
 typedef struct Super {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_T_Cracker/ac_t_cracker.c b/src/overlays/actors/ovl_T_Cracker/ac_t_cracker.c
index 2330537..04c1ad7 100644
--- a/src/overlays/actors/ovl_T_Cracker/ac_t_cracker.c
+++ b/src/overlays/actors/ovl_T_Cracker/ac_t_cracker.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTCR_actor_ct(Actor* thisx, PlayState* play);
-void aTCR_actor_move(Actor* thisx, PlayState* play);
-void aTCR_actor_draw(Actor* thisx, PlayState* play);
+void aTCR_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTCR_actor_move(Actor* thisx, Game_Play* game_play);
+void aTCR_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile T_Cracker_Profile = {
diff --git a/src/overlays/actors/ovl_T_Cracker/ac_t_cracker.h b/src/overlays/actors/ovl_T_Cracker/ac_t_cracker.h
index 8194507..c96c29b 100644
--- a/src/overlays/actors/ovl_T_Cracker/ac_t_cracker.h
+++ b/src/overlays/actors/ovl_T_Cracker/ac_t_cracker.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct T_Cracker;
 
-typedef void (*T_CrackerActionFunc)(struct T_Cracker*, struct PlayState*);
+typedef void (*T_CrackerActionFunc)(struct T_Cracker*, struct Game_Play*);
 
 typedef struct T_Cracker {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_T_Flag/ac_t_flag.c b/src/overlays/actors/ovl_T_Flag/ac_t_flag.c
index 0a82305..c730d4a 100644
--- a/src/overlays/actors/ovl_T_Flag/ac_t_flag.c
+++ b/src/overlays/actors/ovl_T_Flag/ac_t_flag.c
@@ -2,7 +2,7 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTFL_actor_draw(Actor* thisx, PlayState* play);
+void aTFL_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile T_Flag_Profile = {
diff --git a/src/overlays/actors/ovl_T_Flag/ac_t_flag.h b/src/overlays/actors/ovl_T_Flag/ac_t_flag.h
index 9fcb619..3ec778c 100644
--- a/src/overlays/actors/ovl_T_Flag/ac_t_flag.h
+++ b/src/overlays/actors/ovl_T_Flag/ac_t_flag.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct T_Flag;
 
-typedef void (*T_FlagActionFunc)(struct T_Flag*, struct PlayState*);
+typedef void (*T_FlagActionFunc)(struct T_Flag*, struct Game_Play*);
 
 typedef struct T_Flag {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_T_Hanabi/ac_t_hanabi.c b/src/overlays/actors/ovl_T_Hanabi/ac_t_hanabi.c
index 77fad3e..917ac66 100644
--- a/src/overlays/actors/ovl_T_Hanabi/ac_t_hanabi.c
+++ b/src/overlays/actors/ovl_T_Hanabi/ac_t_hanabi.c
@@ -1,10 +1,10 @@
 #include "ac_t_hanabi.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTHB_actor_ct(Actor* thisx, PlayState* play);
-void aTHB_actor_dt(Actor* thisx, PlayState* play);
-void aTHB_actor_move(Actor* thisx, PlayState* play);
-void aTHB_actor_draw(Actor* thisx, PlayState* play);
+void aTHB_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTHB_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTHB_actor_move(Actor* thisx, Game_Play* game_play);
+void aTHB_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile T_Hanabi_Profile = {
diff --git a/src/overlays/actors/ovl_T_Hanabi/ac_t_hanabi.h b/src/overlays/actors/ovl_T_Hanabi/ac_t_hanabi.h
index 09b1e45..b234832 100644
--- a/src/overlays/actors/ovl_T_Hanabi/ac_t_hanabi.h
+++ b/src/overlays/actors/ovl_T_Hanabi/ac_t_hanabi.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct T_Hanabi;
 
-typedef void (*T_HanabiActionFunc)(struct T_Hanabi*, struct PlayState*);
+typedef void (*T_HanabiActionFunc)(struct T_Hanabi*, struct Game_Play*);
 
 typedef struct T_Hanabi {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_T_Keitai/ac_t_keitai.c b/src/overlays/actors/ovl_T_Keitai/ac_t_keitai.c
index ba37ece..7b21fb2 100644
--- a/src/overlays/actors/ovl_T_Keitai/ac_t_keitai.c
+++ b/src/overlays/actors/ovl_T_Keitai/ac_t_keitai.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTKT_actor_ct(Actor* thisx, PlayState* play);
-void aTKT_actor_move(Actor* thisx, PlayState* play);
-void aTKT_actor_draw(Actor* thisx, PlayState* play);
+void aTKT_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTKT_actor_move(Actor* thisx, Game_Play* game_play);
+void aTKT_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile T_Keitai_Profile = {
diff --git a/src/overlays/actors/ovl_T_Keitai/ac_t_keitai.h b/src/overlays/actors/ovl_T_Keitai/ac_t_keitai.h
index 5409dcf..434b9a8 100644
--- a/src/overlays/actors/ovl_T_Keitai/ac_t_keitai.h
+++ b/src/overlays/actors/ovl_T_Keitai/ac_t_keitai.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct T_Keitai;
 
-typedef void (*T_KeitaiActionFunc)(struct T_Keitai*, struct PlayState*);
+typedef void (*T_KeitaiActionFunc)(struct T_Keitai*, struct Game_Play*);
 
 typedef struct T_Keitai {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_T_NpcSao/ac_t_npc_sao.c b/src/overlays/actors/ovl_T_NpcSao/ac_t_npc_sao.c
index 78b3c8a..acb93e6 100644
--- a/src/overlays/actors/ovl_T_NpcSao/ac_t_npc_sao.c
+++ b/src/overlays/actors/ovl_T_NpcSao/ac_t_npc_sao.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTNS_actor_ct(Actor* thisx, PlayState* play);
-void aTNS_actor_move(Actor* thisx, PlayState* play);
-void aTNS_actor_draw(Actor* thisx, PlayState* play);
+void aTNS_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTNS_actor_move(Actor* thisx, Game_Play* game_play);
+void aTNS_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile T_NpcSao_Profile = {
diff --git a/src/overlays/actors/ovl_T_NpcSao/ac_t_npc_sao.h b/src/overlays/actors/ovl_T_NpcSao/ac_t_npc_sao.h
index 54de9eb..fc0c3de 100644
--- a/src/overlays/actors/ovl_T_NpcSao/ac_t_npc_sao.h
+++ b/src/overlays/actors/ovl_T_NpcSao/ac_t_npc_sao.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct T_NpcSao;
 
-typedef void (*T_NpcSaoActionFunc)(struct T_NpcSao*, struct PlayState*);
+typedef void (*T_NpcSaoActionFunc)(struct T_NpcSao*, struct Game_Play*);
 
 typedef struct T_NpcSao {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_T_Pistol/ac_t_pistol.c b/src/overlays/actors/ovl_T_Pistol/ac_t_pistol.c
index f8b069a..dc775ff 100644
--- a/src/overlays/actors/ovl_T_Pistol/ac_t_pistol.c
+++ b/src/overlays/actors/ovl_T_Pistol/ac_t_pistol.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTPT_actor_ct(Actor* thisx, PlayState* play);
-void aTPT_actor_move(Actor* thisx, PlayState* play);
-void aTPT_actor_draw(Actor* thisx, PlayState* play);
+void aTPT_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTPT_actor_move(Actor* thisx, Game_Play* game_play);
+void aTPT_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile T_Pistol_Profile = {
diff --git a/src/overlays/actors/ovl_T_Pistol/ac_t_pistol.h b/src/overlays/actors/ovl_T_Pistol/ac_t_pistol.h
index 32bc60a..76799fc 100644
--- a/src/overlays/actors/ovl_T_Pistol/ac_t_pistol.h
+++ b/src/overlays/actors/ovl_T_Pistol/ac_t_pistol.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct T_Pistol;
 
-typedef void (*T_PistolActionFunc)(struct T_Pistol*, struct PlayState*);
+typedef void (*T_PistolActionFunc)(struct T_Pistol*, struct Game_Play*);
 
 typedef struct T_Pistol {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_T_Tama/ac_t_tam.c b/src/overlays/actors/ovl_T_Tama/ac_t_tam.c
index 8e564c9..db0dc24 100644
--- a/src/overlays/actors/ovl_T_Tama/ac_t_tam.c
+++ b/src/overlays/actors/ovl_T_Tama/ac_t_tam.c
@@ -2,7 +2,7 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTTM_actor_draw(Actor* thisx, PlayState* play);
+void aTTM_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile T_Tama_Profile = {
diff --git a/src/overlays/actors/ovl_T_Tama/ac_t_tam.h b/src/overlays/actors/ovl_T_Tama/ac_t_tam.h
index dac84c1..179b336 100644
--- a/src/overlays/actors/ovl_T_Tama/ac_t_tam.h
+++ b/src/overlays/actors/ovl_T_Tama/ac_t_tam.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct T_Tama;
 
-typedef void (*T_TamaActionFunc)(struct T_Tama*, struct PlayState*);
+typedef void (*T_TamaActionFunc)(struct T_Tama*, struct Game_Play*);
 
 typedef struct T_Tama {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_T_Tumbler/ac_t_tumbler.c b/src/overlays/actors/ovl_T_Tumbler/ac_t_tumbler.c
index 5e2755a..b3a5274 100644
--- a/src/overlays/actors/ovl_T_Tumbler/ac_t_tumbler.c
+++ b/src/overlays/actors/ovl_T_Tumbler/ac_t_tumbler.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTTB_actor_ct(Actor* thisx, PlayState* play);
-void aTTB_actor_move(Actor* thisx, PlayState* play);
-void aTTB_actor_draw(Actor* thisx, PlayState* play);
+void aTTB_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTTB_actor_move(Actor* thisx, Game_Play* game_play);
+void aTTB_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile T_Tumbler_Profile = {
diff --git a/src/overlays/actors/ovl_T_Tumbler/ac_t_tumbler.h b/src/overlays/actors/ovl_T_Tumbler/ac_t_tumbler.h
index d7f065b..7651900 100644
--- a/src/overlays/actors/ovl_T_Tumbler/ac_t_tumbler.h
+++ b/src/overlays/actors/ovl_T_Tumbler/ac_t_tumbler.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct T_Tumbler;
 
-typedef void (*T_TumblerActionFunc)(struct T_Tumbler*, struct PlayState*);
+typedef void (*T_TumblerActionFunc)(struct T_Tumbler*, struct Game_Play*);
 
 typedef struct T_Tumbler {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_T_Umbrella/ac_t_umbrella.c b/src/overlays/actors/ovl_T_Umbrella/ac_t_umbrella.c
index 4d445e6..a08fdd2 100644
--- a/src/overlays/actors/ovl_T_Umbrella/ac_t_umbrella.c
+++ b/src/overlays/actors/ovl_T_Umbrella/ac_t_umbrella.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTUMB_actor_ct(Actor* thisx, PlayState* play);
-void aTUMB_actor_move(Actor* thisx, PlayState* play);
-void aTUMB_actor_draw(Actor* thisx, PlayState* play);
+void aTUMB_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTUMB_actor_move(Actor* thisx, Game_Play* game_play);
+void aTUMB_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile T_Umbrella_Profile = {
diff --git a/src/overlays/actors/ovl_T_Umbrella/ac_t_umbrella.h b/src/overlays/actors/ovl_T_Umbrella/ac_t_umbrella.h
index c048b21..b69a375 100644
--- a/src/overlays/actors/ovl_T_Umbrella/ac_t_umbrella.h
+++ b/src/overlays/actors/ovl_T_Umbrella/ac_t_umbrella.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct T_Umbrella;
 
-typedef void (*T_UmbrellaActionFunc)(struct T_Umbrella*, struct PlayState*);
+typedef void (*T_UmbrellaActionFunc)(struct T_Umbrella*, struct Game_Play*);
 
 typedef struct T_Umbrella {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_T_Utiwa/ac_t_utiwa.c b/src/overlays/actors/ovl_T_Utiwa/ac_t_utiwa.c
index a5eab72..9250d10 100644
--- a/src/overlays/actors/ovl_T_Utiwa/ac_t_utiwa.c
+++ b/src/overlays/actors/ovl_T_Utiwa/ac_t_utiwa.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTUT_actor_ct(Actor* thisx, PlayState* play);
-void aTUT_actor_move(Actor* thisx, PlayState* play);
-void aTUT_actor_draw(Actor* thisx, PlayState* play);
+void aTUT_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTUT_actor_move(Actor* thisx, Game_Play* game_play);
+void aTUT_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile T_Utiwa_Profile = {
diff --git a/src/overlays/actors/ovl_T_Utiwa/ac_t_utiwa.h b/src/overlays/actors/ovl_T_Utiwa/ac_t_utiwa.h
index 01f0804..e5b544c 100644
--- a/src/overlays/actors/ovl_T_Utiwa/ac_t_utiwa.h
+++ b/src/overlays/actors/ovl_T_Utiwa/ac_t_utiwa.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct T_Utiwa;
 
-typedef void (*T_UtiwaActionFunc)(struct T_Utiwa*, struct PlayState*);
+typedef void (*T_UtiwaActionFunc)(struct T_Utiwa*, struct Game_Play*);
 
 typedef struct T_Utiwa {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Taisou_Npc0/ac_taisou_npc0.c b/src/overlays/actors/ovl_Taisou_Npc0/ac_taisou_npc0.c
index fd32030..5da0d59 100644
--- a/src/overlays/actors/ovl_Taisou_Npc0/ac_taisou_npc0.c
+++ b/src/overlays/actors/ovl_Taisou_Npc0/ac_taisou_npc0.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTS0_actor_ct(Actor* thisx, PlayState* play);
-void aTS0_actor_dt(Actor* thisx, PlayState* play);
-void aTS0_actor_init(Actor* thisx, PlayState* play);
-void aTS0_actor_save(Actor* thisx, PlayState* play);
+void aTS0_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTS0_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTS0_actor_init(Actor* thisx, Game_Play* game_play);
+void aTS0_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Taisou_Npc0_Profile = {
diff --git a/src/overlays/actors/ovl_Taisou_Npc0/ac_taisou_npc0.h b/src/overlays/actors/ovl_Taisou_Npc0/ac_taisou_npc0.h
index c3c1e69..cd35beb 100644
--- a/src/overlays/actors/ovl_Taisou_Npc0/ac_taisou_npc0.h
+++ b/src/overlays/actors/ovl_Taisou_Npc0/ac_taisou_npc0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Taisou_Npc0;
 
-typedef void (*Taisou_Npc0ActionFunc)(struct Taisou_Npc0*, struct PlayState*);
+typedef void (*Taisou_Npc0ActionFunc)(struct Taisou_Npc0*, struct Game_Play*);
 
 typedef struct Taisou_Npc0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tama/ac_tama.c b/src/overlays/actors/ovl_Tama/ac_tama.c
index 5ab37df..b41bfd0 100644
--- a/src/overlays/actors/ovl_Tama/ac_tama.c
+++ b/src/overlays/actors/ovl_Tama/ac_tama.c
@@ -1,10 +1,10 @@
 #include "ac_tama.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTAM_actor_ct(Actor* thisx, PlayState* play);
-void func_80A8EF30_jp(Actor* thisx, PlayState* play);
-void aTAM_actor_init(Actor* thisx, PlayState* play);
-void aTAM_actor_draw(Actor* thisx, PlayState* play);
+void aTAM_actor_ct(Actor* thisx, Game_Play* game_play);
+void func_80A8EF30_jp(Actor* thisx, Game_Play* game_play);
+void aTAM_actor_init(Actor* thisx, Game_Play* game_play);
+void aTAM_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tama_Profile = {
diff --git a/src/overlays/actors/ovl_Tama/ac_tama.h b/src/overlays/actors/ovl_Tama/ac_tama.h
index bb31316..82a39bc 100644
--- a/src/overlays/actors/ovl_Tama/ac_tama.h
+++ b/src/overlays/actors/ovl_Tama/ac_tama.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tama;
 
-typedef void (*TamaActionFunc)(struct Tama*, struct PlayState*);
+typedef void (*TamaActionFunc)(struct Tama*, struct Game_Play*);
 
 typedef struct Tama {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tamaire_Npc0/ac_tamaire_npc0.c b/src/overlays/actors/ovl_Tamaire_Npc0/ac_tamaire_npc0.c
index 51c56ac..94da349 100644
--- a/src/overlays/actors/ovl_Tamaire_Npc0/ac_tamaire_npc0.c
+++ b/src/overlays/actors/ovl_Tamaire_Npc0/ac_tamaire_npc0.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTMN0_actor_ct(Actor* thisx, PlayState* play);
-void aTMN0_actor_dt(Actor* thisx, PlayState* play);
-void aTMN0_actor_init(Actor* thisx, PlayState* play);
-void aTMN0_actor_save(Actor* thisx, PlayState* play);
+void aTMN0_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTMN0_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTMN0_actor_init(Actor* thisx, Game_Play* game_play);
+void aTMN0_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tamaire_Npc0_Profile = {
diff --git a/src/overlays/actors/ovl_Tamaire_Npc0/ac_tamaire_npc0.h b/src/overlays/actors/ovl_Tamaire_Npc0/ac_tamaire_npc0.h
index 4f1a5a2..984e423 100644
--- a/src/overlays/actors/ovl_Tamaire_Npc0/ac_tamaire_npc0.h
+++ b/src/overlays/actors/ovl_Tamaire_Npc0/ac_tamaire_npc0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tamaire_Npc0;
 
-typedef void (*Tamaire_Npc0ActionFunc)(struct Tamaire_Npc0*, struct PlayState*);
+typedef void (*Tamaire_Npc0ActionFunc)(struct Tamaire_Npc0*, struct Game_Play*);
 
 typedef struct Tamaire_Npc0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tamaire_Npc1/ac_tamaire_npc1.c b/src/overlays/actors/ovl_Tamaire_Npc1/ac_tamaire_npc1.c
index 35f9272..74c446b 100644
--- a/src/overlays/actors/ovl_Tamaire_Npc1/ac_tamaire_npc1.c
+++ b/src/overlays/actors/ovl_Tamaire_Npc1/ac_tamaire_npc1.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTMN1_actor_ct(Actor* thisx, PlayState* play);
-void aTMN1_actor_dt(Actor* thisx, PlayState* play);
-void aTMN1_actor_init(Actor* thisx, PlayState* play);
-void aTMN1_actor_save(Actor* thisx, PlayState* play);
+void aTMN1_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTMN1_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTMN1_actor_init(Actor* thisx, Game_Play* game_play);
+void aTMN1_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tamaire_Npc1_Profile = {
diff --git a/src/overlays/actors/ovl_Tamaire_Npc1/ac_tamaire_npc1.h b/src/overlays/actors/ovl_Tamaire_Npc1/ac_tamaire_npc1.h
index e79f55c..0e833e5 100644
--- a/src/overlays/actors/ovl_Tamaire_Npc1/ac_tamaire_npc1.h
+++ b/src/overlays/actors/ovl_Tamaire_Npc1/ac_tamaire_npc1.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tamaire_Npc1;
 
-typedef void (*Tamaire_Npc1ActionFunc)(struct Tamaire_Npc1*, struct PlayState*);
+typedef void (*Tamaire_Npc1ActionFunc)(struct Tamaire_Npc1*, struct Game_Play*);
 
 typedef struct Tamaire_Npc1 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tokyoso_Control/ac_tokyoso_control.c b/src/overlays/actors/ovl_Tokyoso_Control/ac_tokyoso_control.c
index 5b1eb9e..c40684b 100644
--- a/src/overlays/actors/ovl_Tokyoso_Control/ac_tokyoso_control.c
+++ b/src/overlays/actors/ovl_Tokyoso_Control/ac_tokyoso_control.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTKC_actor_ct(Actor* thisx, PlayState* play);
-void aTKC_actor_dt(Actor* thisx, PlayState* play);
-void aTKC_actor_move(Actor* thisx, PlayState* play);
+void aTKC_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTKC_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTKC_actor_move(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tokyoso_Control_Profile = {
diff --git a/src/overlays/actors/ovl_Tokyoso_Control/ac_tokyoso_control.h b/src/overlays/actors/ovl_Tokyoso_Control/ac_tokyoso_control.h
index eaab63b..7e77063 100644
--- a/src/overlays/actors/ovl_Tokyoso_Control/ac_tokyoso_control.h
+++ b/src/overlays/actors/ovl_Tokyoso_Control/ac_tokyoso_control.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tokyoso_Control;
 
-typedef void (*Tokyoso_ControlActionFunc)(struct Tokyoso_Control*, struct PlayState*);
+typedef void (*Tokyoso_ControlActionFunc)(struct Tokyoso_Control*, struct Game_Play*);
 
 typedef struct Tokyoso_Control {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tokyoso_Npc0/ac_tokyoso_npc0.c b/src/overlays/actors/ovl_Tokyoso_Npc0/ac_tokyoso_npc0.c
index 5f91d46..0cd5db4 100644
--- a/src/overlays/actors/ovl_Tokyoso_Npc0/ac_tokyoso_npc0.c
+++ b/src/overlays/actors/ovl_Tokyoso_Npc0/ac_tokyoso_npc0.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTKN0_actor_ct(Actor* thisx, PlayState* play);
-void aTKN0_actor_dt(Actor* thisx, PlayState* play);
-void aTKN0_actor_init(Actor* thisx, PlayState* play);
-void aTKN0_actor_save(Actor* thisx, PlayState* play);
+void aTKN0_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTKN0_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTKN0_actor_init(Actor* thisx, Game_Play* game_play);
+void aTKN0_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tokyoso_Npc0_Profile = {
diff --git a/src/overlays/actors/ovl_Tokyoso_Npc0/ac_tokyoso_npc0.h b/src/overlays/actors/ovl_Tokyoso_Npc0/ac_tokyoso_npc0.h
index 2ec806b..4cfb71a 100644
--- a/src/overlays/actors/ovl_Tokyoso_Npc0/ac_tokyoso_npc0.h
+++ b/src/overlays/actors/ovl_Tokyoso_Npc0/ac_tokyoso_npc0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tokyoso_Npc0;
 
-typedef void (*Tokyoso_Npc0ActionFunc)(struct Tokyoso_Npc0*, struct PlayState*);
+typedef void (*Tokyoso_Npc0ActionFunc)(struct Tokyoso_Npc0*, struct Game_Play*);
 
 typedef struct Tokyoso_Npc0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tokyoso_Npc1/ac_tokyoso_npc1.c b/src/overlays/actors/ovl_Tokyoso_Npc1/ac_tokyoso_npc1.c
index 2845c24..0e5341b 100644
--- a/src/overlays/actors/ovl_Tokyoso_Npc1/ac_tokyoso_npc1.c
+++ b/src/overlays/actors/ovl_Tokyoso_Npc1/ac_tokyoso_npc1.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTKN1_actor_ct(Actor* thisx, PlayState* play);
-void aTKN1_actor_dt(Actor* thisx, PlayState* play);
-void aTKN1_actor_init(Actor* thisx, PlayState* play);
-void aTKN1_actor_save(Actor* thisx, PlayState* play);
+void aTKN1_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTKN1_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTKN1_actor_init(Actor* thisx, Game_Play* game_play);
+void aTKN1_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tokyoso_Npc1_Profile = {
diff --git a/src/overlays/actors/ovl_Tokyoso_Npc1/ac_tokyoso_npc1.h b/src/overlays/actors/ovl_Tokyoso_Npc1/ac_tokyoso_npc1.h
index 26fc521..1a3f9e4 100644
--- a/src/overlays/actors/ovl_Tokyoso_Npc1/ac_tokyoso_npc1.h
+++ b/src/overlays/actors/ovl_Tokyoso_Npc1/ac_tokyoso_npc1.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tokyoso_Npc1;
 
-typedef void (*Tokyoso_Npc1ActionFunc)(struct Tokyoso_Npc1*, struct PlayState*);
+typedef void (*Tokyoso_Npc1ActionFunc)(struct Tokyoso_Npc1*, struct Game_Play*);
 
 typedef struct Tokyoso_Npc1 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tools/ac_tools.c b/src/overlays/actors/ovl_Tools/ac_tools.c
index 4358f93..454f31c 100644
--- a/src/overlays/actors/ovl_Tools/ac_tools.c
+++ b/src/overlays/actors/ovl_Tools/ac_tools.c
@@ -2,8 +2,8 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTOL_actor_ct(Actor* thisx, PlayState* play);
-void aTOL_actor_dt(Actor* thisx, PlayState* play);
+void aTOL_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTOL_actor_dt(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tools_Profile = {
diff --git a/src/overlays/actors/ovl_Tools/ac_tools.h b/src/overlays/actors/ovl_Tools/ac_tools.h
index fa86de8..67aed4f 100644
--- a/src/overlays/actors/ovl_Tools/ac_tools.h
+++ b/src/overlays/actors/ovl_Tools/ac_tools.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tools;
 
-typedef void (*ToolsActionFunc)(struct Tools*, struct PlayState*);
+typedef void (*ToolsActionFunc)(struct Tools*, struct Game_Play*);
 
 typedef struct Tools {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Toudai/ac_toudai.c b/src/overlays/actors/ovl_Toudai/ac_toudai.c
index 7e16329..1b453ad 100644
--- a/src/overlays/actors/ovl_Toudai/ac_toudai.c
+++ b/src/overlays/actors/ovl_Toudai/ac_toudai.c
@@ -1,10 +1,10 @@
 #include "ac_toudai.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTOU_actor_ct(Actor* thisx, PlayState* play);
-void aTOU_actor_dt(Actor* thisx, PlayState* play);
-void aTOU_actor_init(Actor* thisx, PlayState* play);
-void aTOU_actor_draw(Actor* thisx, PlayState* play);
+void aTOU_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTOU_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTOU_actor_init(Actor* thisx, Game_Play* game_play);
+void aTOU_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Toudai_Profile = {
diff --git a/src/overlays/actors/ovl_Toudai/ac_toudai.h b/src/overlays/actors/ovl_Toudai/ac_toudai.h
index 61e088a..7efe709 100644
--- a/src/overlays/actors/ovl_Toudai/ac_toudai.h
+++ b/src/overlays/actors/ovl_Toudai/ac_toudai.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Toudai;
 
-typedef void (*ToudaiActionFunc)(struct Toudai*, struct PlayState*);
+typedef void (*ToudaiActionFunc)(struct Toudai*, struct Game_Play*);
 
 typedef struct Toudai {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Train0/ac_train0.c b/src/overlays/actors/ovl_Train0/ac_train0.c
index 42cd71a..db1bc12 100644
--- a/src/overlays/actors/ovl_Train0/ac_train0.c
+++ b/src/overlays/actors/ovl_Train0/ac_train0.c
@@ -1,10 +1,10 @@
 #include "ac_train0.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_805bfc28(Actor* thisx, PlayState* play);
-void func_805bfcdc(Actor* thisx, PlayState* play);
-void func_805c03ec(Actor* thisx, PlayState* play);
-void func_805c04e0(Actor* thisx, PlayState* play);
+void func_805bfc28(Actor* thisx, Game_Play* game_play);
+void func_805bfcdc(Actor* thisx, Game_Play* game_play);
+void func_805c03ec(Actor* thisx, Game_Play* game_play);
+void func_805c04e0(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Train0_Profile = {
diff --git a/src/overlays/actors/ovl_Train0/ac_train0.h b/src/overlays/actors/ovl_Train0/ac_train0.h
index f46c68a..4062508 100644
--- a/src/overlays/actors/ovl_Train0/ac_train0.h
+++ b/src/overlays/actors/ovl_Train0/ac_train0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Train0;
 
-typedef void (*Train0ActionFunc)(struct Train0*, struct PlayState*);
+typedef void (*Train0ActionFunc)(struct Train0*, struct Game_Play*);
 
 typedef struct Train0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Train1/ac_train1.c b/src/overlays/actors/ovl_Train1/ac_train1.c
index 62c8e67..191977d 100644
--- a/src/overlays/actors/ovl_Train1/ac_train1.c
+++ b/src/overlays/actors/ovl_Train1/ac_train1.c
@@ -1,10 +1,10 @@
 #include "ac_train1.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTR1_actor_ct(Actor* thisx, PlayState* play);
-void aTR1_actor_dt(Actor* thisx, PlayState* play);
-void aTR1_actor_move(Actor* thisx, PlayState* play);
-void aTR1_actor_draw(Actor* thisx, PlayState* play);
+void aTR1_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTR1_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTR1_actor_move(Actor* thisx, Game_Play* game_play);
+void aTR1_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Train1_Profile = {
diff --git a/src/overlays/actors/ovl_Train1/ac_train1.h b/src/overlays/actors/ovl_Train1/ac_train1.h
index 00514f3..c41b9a8 100644
--- a/src/overlays/actors/ovl_Train1/ac_train1.h
+++ b/src/overlays/actors/ovl_Train1/ac_train1.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Train1;
 
-typedef void (*Train1ActionFunc)(struct Train1*, struct PlayState*);
+typedef void (*Train1ActionFunc)(struct Train1*, struct Game_Play*);
 
 typedef struct Train1 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_TrainDoor/ac_train_door.c b/src/overlays/actors/ovl_TrainDoor/ac_train_door.c
index 8707214..c883b11 100644
--- a/src/overlays/actors/ovl_TrainDoor/ac_train_door.c
+++ b/src/overlays/actors/ovl_TrainDoor/ac_train_door.c
@@ -1,10 +1,10 @@
 #include "ac_train_door.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTRD_actor_ct(Actor* thisx, PlayState* play);
-void aTRD_actor_dt(Actor* thisx, PlayState* play);
-void aTRD_actor_move(Actor* thisx, PlayState* play);
-void aTRD_actor_draw(Actor* thisx, PlayState* play);
+void aTRD_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTRD_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTRD_actor_move(Actor* thisx, Game_Play* game_play);
+void aTRD_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile TrainDoor_Profile = {
diff --git a/src/overlays/actors/ovl_TrainDoor/ac_train_door.h b/src/overlays/actors/ovl_TrainDoor/ac_train_door.h
index 22b0d1c..b85a00c 100644
--- a/src/overlays/actors/ovl_TrainDoor/ac_train_door.h
+++ b/src/overlays/actors/ovl_TrainDoor/ac_train_door.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct TrainDoor;
 
-typedef void (*TrainDoorActionFunc)(struct TrainDoor*, struct PlayState*);
+typedef void (*TrainDoorActionFunc)(struct TrainDoor*, struct Game_Play*);
 
 typedef struct TrainDoor {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Train_Window/ac_train_window.c b/src/overlays/actors/ovl_Train_Window/ac_train_window.c
index f498ec2..85bbf3d 100644
--- a/src/overlays/actors/ovl_Train_Window/ac_train_window.c
+++ b/src/overlays/actors/ovl_Train_Window/ac_train_window.c
@@ -1,10 +1,10 @@
 #include "ac_train_window.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Train_Window_Actor_ct(Actor* thisx, PlayState* play);
-void Train_Window_Actor_dt(Actor* thisx, PlayState* play);
-void Train_Window_Actor_move(Actor* thisx, PlayState* play);
-void Train_Window_Actor_draw(Actor* thisx, PlayState* play);
+void Train_Window_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Train_Window_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Train_Window_Actor_move(Actor* thisx, Game_Play* game_play);
+void Train_Window_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Train_Window_Profile = {
diff --git a/src/overlays/actors/ovl_Train_Window/ac_train_window.h b/src/overlays/actors/ovl_Train_Window/ac_train_window.h
index 32c446b..5a56e05 100644
--- a/src/overlays/actors/ovl_Train_Window/ac_train_window.h
+++ b/src/overlays/actors/ovl_Train_Window/ac_train_window.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Train_Window;
 
-typedef void (*Train_WindowActionFunc)(struct Train_Window*, struct PlayState*);
+typedef void (*Train_WindowActionFunc)(struct Train_Window*, struct Game_Play*);
 
 typedef struct Train_Window {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tukimi/ac_tukimi.c b/src/overlays/actors/ovl_Tukimi/ac_tukimi.c
index 43a0d37..4da5f33 100644
--- a/src/overlays/actors/ovl_Tukimi/ac_tukimi.c
+++ b/src/overlays/actors/ovl_Tukimi/ac_tukimi.c
@@ -1,10 +1,10 @@
 #include "ac_tukimi.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTUK_actor_ct(Actor* thisx, PlayState* play);
-void aTUK_actor_dt(Actor* thisx, PlayState* play);
-void aTUK_actor_init(Actor* thisx, PlayState* play);
-void aTUK_actor_draw(Actor* thisx, PlayState* play);
+void aTUK_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTUK_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTUK_actor_init(Actor* thisx, Game_Play* game_play);
+void aTUK_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tukimi_Profile = {
diff --git a/src/overlays/actors/ovl_Tukimi/ac_tukimi.h b/src/overlays/actors/ovl_Tukimi/ac_tukimi.h
index e226fb2..f998c93 100644
--- a/src/overlays/actors/ovl_Tukimi/ac_tukimi.h
+++ b/src/overlays/actors/ovl_Tukimi/ac_tukimi.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tukimi;
 
-typedef void (*TukimiActionFunc)(struct Tukimi*, struct PlayState*);
+typedef void (*TukimiActionFunc)(struct Tukimi*, struct Game_Play*);
 
 typedef struct Tukimi {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tukimi_Npc0/ac_tukimi_npc0.c b/src/overlays/actors/ovl_Tukimi_Npc0/ac_tukimi_npc0.c
index 81c0d18..d608403 100644
--- a/src/overlays/actors/ovl_Tukimi_Npc0/ac_tukimi_npc0.c
+++ b/src/overlays/actors/ovl_Tukimi_Npc0/ac_tukimi_npc0.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTM0_actor_ct(Actor* thisx, PlayState* play);
-void aTM0_actor_dt(Actor* thisx, PlayState* play);
-void aTM0_actor_init(Actor* thisx, PlayState* play);
-void aTM0_actor_save(Actor* thisx, PlayState* play);
+void aTM0_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTM0_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTM0_actor_init(Actor* thisx, Game_Play* game_play);
+void aTM0_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tukimi_Npc0_Profile = {
diff --git a/src/overlays/actors/ovl_Tukimi_Npc0/ac_tukimi_npc0.h b/src/overlays/actors/ovl_Tukimi_Npc0/ac_tukimi_npc0.h
index 41556df..d9c26f7 100644
--- a/src/overlays/actors/ovl_Tukimi_Npc0/ac_tukimi_npc0.h
+++ b/src/overlays/actors/ovl_Tukimi_Npc0/ac_tukimi_npc0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tukimi_Npc0;
 
-typedef void (*Tukimi_Npc0ActionFunc)(struct Tukimi_Npc0*, struct PlayState*);
+typedef void (*Tukimi_Npc0ActionFunc)(struct Tukimi_Npc0*, struct Game_Play*);
 
 typedef struct Tukimi_Npc0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tukimi_Npc1/ac_tukimi_npc1.c b/src/overlays/actors/ovl_Tukimi_Npc1/ac_tukimi_npc1.c
index ef0d917..8fc84bd 100644
--- a/src/overlays/actors/ovl_Tukimi_Npc1/ac_tukimi_npc1.c
+++ b/src/overlays/actors/ovl_Tukimi_Npc1/ac_tukimi_npc1.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTM1_actor_ct(Actor* thisx, PlayState* play);
-void aTM1_actor_dt(Actor* thisx, PlayState* play);
-void aTM1_actor_init(Actor* thisx, PlayState* play);
-void aTM1_actor_save(Actor* thisx, PlayState* play);
+void aTM1_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTM1_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTM1_actor_init(Actor* thisx, Game_Play* game_play);
+void aTM1_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tukimi_Npc1_Profile = {
diff --git a/src/overlays/actors/ovl_Tukimi_Npc1/ac_tukimi_npc1.h b/src/overlays/actors/ovl_Tukimi_Npc1/ac_tukimi_npc1.h
index 696f064..121d762 100644
--- a/src/overlays/actors/ovl_Tukimi_Npc1/ac_tukimi_npc1.h
+++ b/src/overlays/actors/ovl_Tukimi_Npc1/ac_tukimi_npc1.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tukimi_Npc1;
 
-typedef void (*Tukimi_Npc1ActionFunc)(struct Tukimi_Npc1*, struct PlayState*);
+typedef void (*Tukimi_Npc1ActionFunc)(struct Tukimi_Npc1*, struct Game_Play*);
 
 typedef struct Tukimi_Npc1 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tunahiki_Control/ac_tunahiki_control.c b/src/overlays/actors/ovl_Tunahiki_Control/ac_tunahiki_control.c
index 8433710..a7cf411 100644
--- a/src/overlays/actors/ovl_Tunahiki_Control/ac_tunahiki_control.c
+++ b/src/overlays/actors/ovl_Tunahiki_Control/ac_tunahiki_control.c
@@ -2,9 +2,9 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTNC_actor_ct(Actor* thisx, PlayState* play);
-void aTNC_actor_dt(Actor* thisx, PlayState* play);
-void aTNC_actor_move(Actor* thisx, PlayState* play);
+void aTNC_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTNC_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTNC_actor_move(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tunahiki_Control_Profile = {
diff --git a/src/overlays/actors/ovl_Tunahiki_Control/ac_tunahiki_control.h b/src/overlays/actors/ovl_Tunahiki_Control/ac_tunahiki_control.h
index 5f7d802..9f25897 100644
--- a/src/overlays/actors/ovl_Tunahiki_Control/ac_tunahiki_control.h
+++ b/src/overlays/actors/ovl_Tunahiki_Control/ac_tunahiki_control.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tunahiki_Control;
 
-typedef void (*Tunahiki_ControlActionFunc)(struct Tunahiki_Control*, struct PlayState*);
+typedef void (*Tunahiki_ControlActionFunc)(struct Tunahiki_Control*, struct Game_Play*);
 
 typedef struct Tunahiki_Control {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tunahiki_Npc0/ac_tunahiki_npc0.c b/src/overlays/actors/ovl_Tunahiki_Npc0/ac_tunahiki_npc0.c
index 7ced8d4..6135d61 100644
--- a/src/overlays/actors/ovl_Tunahiki_Npc0/ac_tunahiki_npc0.c
+++ b/src/overlays/actors/ovl_Tunahiki_Npc0/ac_tunahiki_npc0.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTNN0_actor_ct(Actor* thisx, PlayState* play);
-void aTNN0_actor_dt(Actor* thisx, PlayState* play);
-void aTNN0_actor_init(Actor* thisx, PlayState* play);
-void aTNN0_actor_save(Actor* thisx, PlayState* play);
+void aTNN0_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTNN0_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTNN0_actor_init(Actor* thisx, Game_Play* game_play);
+void aTNN0_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tunahiki_Npc0_Profile = {
diff --git a/src/overlays/actors/ovl_Tunahiki_Npc0/ac_tunahiki_npc0.h b/src/overlays/actors/ovl_Tunahiki_Npc0/ac_tunahiki_npc0.h
index 9589399..0d12bc2 100644
--- a/src/overlays/actors/ovl_Tunahiki_Npc0/ac_tunahiki_npc0.h
+++ b/src/overlays/actors/ovl_Tunahiki_Npc0/ac_tunahiki_npc0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tunahiki_Npc0;
 
-typedef void (*Tunahiki_Npc0ActionFunc)(struct Tunahiki_Npc0*, struct PlayState*);
+typedef void (*Tunahiki_Npc0ActionFunc)(struct Tunahiki_Npc0*, struct Game_Play*);
 
 typedef struct Tunahiki_Npc0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Tunahiki_Npc1/ac_tunahiki_npc1.c b/src/overlays/actors/ovl_Tunahiki_Npc1/ac_tunahiki_npc1.c
index b456e7c..1cb37c6 100644
--- a/src/overlays/actors/ovl_Tunahiki_Npc1/ac_tunahiki_npc1.c
+++ b/src/overlays/actors/ovl_Tunahiki_Npc1/ac_tunahiki_npc1.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTNN1_actor_ct(Actor* thisx, PlayState* play);
-void aTNN1_actor_dt(Actor* thisx, PlayState* play);
-void aTNN1_actor_init(Actor* thisx, PlayState* play);
-void aTNN1_actor_save(Actor* thisx, PlayState* play);
+void aTNN1_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTNN1_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTNN1_actor_init(Actor* thisx, Game_Play* game_play);
+void aTNN1_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Tunahiki_Npc1_Profile = {
diff --git a/src/overlays/actors/ovl_Tunahiki_Npc1/ac_tunahiki_npc1.h b/src/overlays/actors/ovl_Tunahiki_Npc1/ac_tunahiki_npc1.h
index 8178bb1..51cf91a 100644
--- a/src/overlays/actors/ovl_Tunahiki_Npc1/ac_tunahiki_npc1.h
+++ b/src/overlays/actors/ovl_Tunahiki_Npc1/ac_tunahiki_npc1.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Tunahiki_Npc1;
 
-typedef void (*Tunahiki_Npc1ActionFunc)(struct Tunahiki_Npc1*, struct PlayState*);
+typedef void (*Tunahiki_Npc1ActionFunc)(struct Tunahiki_Npc1*, struct Game_Play*);
 
 typedef struct Tunahiki_Npc1 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Turi/ac_turi.c b/src/overlays/actors/ovl_Turi/ac_turi.c
index 59500cb..22ab328 100644
--- a/src/overlays/actors/ovl_Turi/ac_turi.c
+++ b/src/overlays/actors/ovl_Turi/ac_turi.c
@@ -1,10 +1,10 @@
 #include "ac_turi.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aTUR_actor_ct(Actor* thisx, PlayState* play);
-void aTUR_actor_dt(Actor* thisx, PlayState* play);
-void aTUR_actor_init(Actor* thisx, PlayState* play);
-void aTUR_actor_draw(Actor* thisx, PlayState* play);
+void aTUR_actor_ct(Actor* thisx, Game_Play* game_play);
+void aTUR_actor_dt(Actor* thisx, Game_Play* game_play);
+void aTUR_actor_init(Actor* thisx, Game_Play* game_play);
+void aTUR_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Turi_Profile = {
diff --git a/src/overlays/actors/ovl_Turi/ac_turi.h b/src/overlays/actors/ovl_Turi/ac_turi.h
index 125c626..9df1367 100644
--- a/src/overlays/actors/ovl_Turi/ac_turi.h
+++ b/src/overlays/actors/ovl_Turi/ac_turi.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Turi;
 
-typedef void (*TuriActionFunc)(struct Turi*, struct PlayState*);
+typedef void (*TuriActionFunc)(struct Turi*, struct Game_Play*);
 
 typedef struct Turi {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Turi_Npc0/ac_turi_npc0.c b/src/overlays/actors/ovl_Turi_Npc0/ac_turi_npc0.c
index f8703fd..ad8b40f 100644
--- a/src/overlays/actors/ovl_Turi_Npc0/ac_turi_npc0.c
+++ b/src/overlays/actors/ovl_Turi_Npc0/ac_turi_npc0.c
@@ -2,10 +2,10 @@
 #include "m_lib.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_805900b0(Actor* thisx, PlayState* play);
-void func_805901d8(Actor* thisx, PlayState* play);
-void aTR0_actor_init(Actor* thisx, PlayState* play);
-void aTR0_actor_save(Actor* thisx, PlayState* play);
+void func_805900b0(Actor* thisx, Game_Play* game_play);
+void func_805901d8(Actor* thisx, Game_Play* game_play);
+void aTR0_actor_init(Actor* thisx, Game_Play* game_play);
+void aTR0_actor_save(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Turi_Npc0_Profile = {
diff --git a/src/overlays/actors/ovl_Turi_Npc0/ac_turi_npc0.h b/src/overlays/actors/ovl_Turi_Npc0/ac_turi_npc0.h
index 8dba754..2688d24 100644
--- a/src/overlays/actors/ovl_Turi_Npc0/ac_turi_npc0.h
+++ b/src/overlays/actors/ovl_Turi_Npc0/ac_turi_npc0.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Turi_Npc0;
 
-typedef void (*Turi_Npc0ActionFunc)(struct Turi_Npc0*, struct PlayState*);
+typedef void (*Turi_Npc0ActionFunc)(struct Turi_Npc0*, struct Game_Play*);
 
 typedef struct Turi_Npc0 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Uki/ac_uki.c b/src/overlays/actors/ovl_Uki/ac_uki.c
index bac5cb2..fc235ee 100644
--- a/src/overlays/actors/ovl_Uki/ac_uki.c
+++ b/src/overlays/actors/ovl_Uki/ac_uki.c
@@ -1,10 +1,10 @@
 #include "ac_uki.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aUKI_actor_ct(Actor* thisx, PlayState* play);
-void aUKI_actor_dt(Actor* thisx, PlayState* play);
-void aUKI_actor_move(Actor* thisx, PlayState* play);
-void func_80A66978_jp(Actor* thisx, PlayState* play);
+void aUKI_actor_ct(Actor* thisx, Game_Play* game_play);
+void aUKI_actor_dt(Actor* thisx, Game_Play* game_play);
+void aUKI_actor_move(Actor* thisx, Game_Play* game_play);
+void func_80A66978_jp(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Uki_Profile = {
diff --git a/src/overlays/actors/ovl_Uki/ac_uki.h b/src/overlays/actors/ovl_Uki/ac_uki.h
index 6f45f79..4a6a6c1 100644
--- a/src/overlays/actors/ovl_Uki/ac_uki.h
+++ b/src/overlays/actors/ovl_Uki/ac_uki.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Uki;
 
-typedef void (*UkiActionFunc)(struct Uki*, struct PlayState*);
+typedef void (*UkiActionFunc)(struct Uki*, struct Game_Play*);
 
 typedef struct Uki {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Weather/ac_weather.c b/src/overlays/actors/ovl_Weather/ac_weather.c
index 2374c79..611fda9 100644
--- a/src/overlays/actors/ovl_Weather/ac_weather.c
+++ b/src/overlays/actors/ovl_Weather/ac_weather.c
@@ -1,10 +1,10 @@
 #include "ac_weather.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void Weather_Actor_ct(Actor* thisx, PlayState* play);
-void Weather_Actor_dt(Actor* thisx, PlayState* play);
-void Weather_Actor_move(Actor* thisx, PlayState* play);
-void Weather_Actor_draw(Actor* thisx, PlayState* play);
+void Weather_Actor_ct(Actor* thisx, Game_Play* game_play);
+void Weather_Actor_dt(Actor* thisx, Game_Play* game_play);
+void Weather_Actor_move(Actor* thisx, Game_Play* game_play);
+void Weather_Actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Weather_Profile = {
diff --git a/src/overlays/actors/ovl_Weather/ac_weather.h b/src/overlays/actors/ovl_Weather/ac_weather.h
index c48bf1f..de9ef8c 100644
--- a/src/overlays/actors/ovl_Weather/ac_weather.h
+++ b/src/overlays/actors/ovl_Weather/ac_weather.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Weather;
 
-typedef void (*WeatherActionFunc)(struct Weather*, struct PlayState*);
+typedef void (*WeatherActionFunc)(struct Weather*, struct Game_Play*);
 
 typedef struct Weather {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Windmill/ac_windmil.c b/src/overlays/actors/ovl_Windmill/ac_windmil.c
index 5ca4981..b409014 100644
--- a/src/overlays/actors/ovl_Windmill/ac_windmil.c
+++ b/src/overlays/actors/ovl_Windmill/ac_windmil.c
@@ -1,10 +1,10 @@
 #include "ac_windmil.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void func_80A9C3C0_jp(Actor* thisx, PlayState* play);
-void aWIN_actor_dt(Actor* thisx, PlayState* play);
-void aWIN_actor_init(Actor* thisx, PlayState* play);
-void aWIN_actor_draw(Actor* thisx, PlayState* play);
+void func_80A9C3C0_jp(Actor* thisx, Game_Play* game_play);
+void aWIN_actor_dt(Actor* thisx, Game_Play* game_play);
+void aWIN_actor_init(Actor* thisx, Game_Play* game_play);
+void aWIN_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Windmill_Profile = {
diff --git a/src/overlays/actors/ovl_Windmill/ac_windmil.h b/src/overlays/actors/ovl_Windmill/ac_windmil.h
index f40c3ce..5be3bfb 100644
--- a/src/overlays/actors/ovl_Windmill/ac_windmil.h
+++ b/src/overlays/actors/ovl_Windmill/ac_windmil.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Windmill;
 
-typedef void (*WindmillActionFunc)(struct Windmill*, struct PlayState*);
+typedef void (*WindmillActionFunc)(struct Windmill*, struct Game_Play*);
 
 typedef struct Windmill {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Yatai/ac_yatai.c b/src/overlays/actors/ovl_Yatai/ac_yatai.c
index 97bea28..69fedd0 100644
--- a/src/overlays/actors/ovl_Yatai/ac_yatai.c
+++ b/src/overlays/actors/ovl_Yatai/ac_yatai.c
@@ -1,10 +1,10 @@
 #include "ac_yatai.h"
 #include "overlays/gamestates/ovl_play/m_play.h"
 
-void aYAT_actor_ct(Actor* thisx, PlayState* play);
-void func_80A76EC4_jp(Actor* thisx, PlayState* play);
-void aYAT_actor_init(Actor* thisx, PlayState* play);
-void aYAT_actor_draw(Actor* thisx, PlayState* play);
+void aYAT_actor_ct(Actor* thisx, Game_Play* game_play);
+void func_80A76EC4_jp(Actor* thisx, Game_Play* game_play);
+void aYAT_actor_init(Actor* thisx, Game_Play* game_play);
+void aYAT_actor_draw(Actor* thisx, Game_Play* game_play);
 
 #if 0
 ActorProfile Yatai_Profile = {
diff --git a/src/overlays/actors/ovl_Yatai/ac_yatai.h b/src/overlays/actors/ovl_Yatai/ac_yatai.h
index 2f2d92b..ed528e8 100644
--- a/src/overlays/actors/ovl_Yatai/ac_yatai.h
+++ b/src/overlays/actors/ovl_Yatai/ac_yatai.h
@@ -5,10 +5,10 @@
 #include "m_actor.h"
 #include "unk.h"
 
-struct PlayState;
+struct Game_Play;
 struct Yatai;
 
-typedef void (*YataiActionFunc)(struct Yatai*, struct PlayState*);
+typedef void (*YataiActionFunc)(struct Yatai*, struct Game_Play*);
 
 typedef struct Yatai {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/gamestates/ovl__00743CD0/_00743CD0.h b/src/overlays/gamestates/ovl__00743CD0/_00743CD0.h
index f4d7127..6aa683e 100644
--- a/src/overlays/gamestates/ovl__00743CD0/_00743CD0.h
+++ b/src/overlays/gamestates/ovl__00743CD0/_00743CD0.h
@@ -5,12 +5,12 @@
 #include "game.h"
 #include "unk.h"
 
-typedef struct _00743CD0State {
-    /* 0x00 */ GameState state;
+typedef struct Game__00743CD0 {
+    /* 0x00 */ Game state;
     /* 0xE0 */ UNK_TYPE1 unk_00[0x1B20-0xE0];
-} _00743CD0State; // size = 0x1B20
+} Game__00743CD0; // size = 0x1B20
 
-void _00743CD0_init(GameState *thisx);
-void _00743CD0_cleanup(GameState *thisx);
+void _00743CD0_init(Game *thisx);
+void _00743CD0_cleanup(Game *thisx);
 
 #endif
diff --git a/src/overlays/gamestates/ovl_famicom_emu/famicom_emu.h b/src/overlays/gamestates/ovl_famicom_emu/famicom_emu.h
index 13bda30..8b6fd65 100644
--- a/src/overlays/gamestates/ovl_famicom_emu/famicom_emu.h
+++ b/src/overlays/gamestates/ovl_famicom_emu/famicom_emu.h
@@ -5,11 +5,11 @@
 #include "game.h"
 #include "unk.h"
 
-typedef struct FamicomEmuState {
-    /* 0x00 */ GameState state;
-} FamicomEmuState; // size = 0xE0
+typedef struct Game_FamicomEmu {
+    /* 0x00 */ Game state;
+} Game_FamicomEmu; // size = 0xE0
 
-void famicom_emu_init(GameState *thisx);
-void famicom_emu_cleanup(GameState *thisx);
+void famicom_emu_init(Game *thisx);
+void famicom_emu_cleanup(Game *thisx);
 
 #endif
diff --git a/src/overlays/gamestates/ovl_first_game/first_game.h b/src/overlays/gamestates/ovl_first_game/first_game.h
index f258e78..6234e53 100644
--- a/src/overlays/gamestates/ovl_first_game/first_game.h
+++ b/src/overlays/gamestates/ovl_first_game/first_game.h
@@ -5,11 +5,11 @@
 #include "game.h"
 #include "unk.h"
 
-typedef struct FirstGameState {
-    /* 0x00 */ GameState state;
-} FirstGameState; // size = 0xE0
+typedef struct Game_FirstGame {
+    /* 0x00 */ Game state;
+} Game_FirstGame; // size = 0xE0
 
-void first_game_init(GameState *thisx);
-void first_game_cleanup(GameState *thisx);
+void first_game_init(Game *thisx);
+void first_game_cleanup(Game *thisx);
 
 #endif
diff --git a/src/overlays/gamestates/ovl_play/m_play.c b/src/overlays/gamestates/ovl_play/m_play.c
index 7c9e851..7aa524b 100644
--- a/src/overlays/gamestates/ovl_play/m_play.c
+++ b/src/overlays/gamestates/ovl_play/m_play.c
@@ -38,13 +38,13 @@
 #include "6A7D20.h"
 #include "m_scene_table.h"
 
-void play_main(GameState* gameState);
-void Gameplay_Scene_Read(PlayState* play, s16 arg1);
-void Game_play_fbdemo_wipe_create(PlayState* play);
-void Game_play_fbdemo_wipe_init(PlayState* play);
-void Game_play_fbdemo_wipe_move(PlayState* play);
+void play_main(Game* gameState);
+void Gameplay_Scene_Read(Game_Play* game_play, s16 arg1);
+void Game_play_fbdemo_wipe_create(Game_Play* game_play);
+void Game_play_fbdemo_wipe_init(Game_Play* game_play);
+void Game_play_fbdemo_wipe_move(Game_Play* game_play);
 
-PlayStateUnkFuncsStruct D_80804320_jp = {
+Game_PlayUnkFuncsStruct D_80804320_jp = {
     fbdemo_wipe1_init,
     (void*)none_proc1,
     fbdemo_wipe1_move,
@@ -56,7 +56,7 @@ PlayStateUnkFuncsStruct D_80804320_jp = {
     fbdemo_wipe1_is_finish,
 };
 
-PlayStateUnkFuncsStruct D_80804344_jp = {
+Game_PlayUnkFuncsStruct D_80804344_jp = {
     fbdemo_triforce_init,
     (void*)none_proc1,
     fbdemo_triforce_move,
@@ -68,7 +68,7 @@ PlayStateUnkFuncsStruct D_80804344_jp = {
     fbdemo_triforce_is_finish,
 };
 
-PlayStateUnkFuncsStruct D_80804368_jp = {
+Game_PlayUnkFuncsStruct D_80804368_jp = {
     fbdemo_fade_init,
     (void*)none_proc1,
     fbdemo_fade_move,
@@ -80,12 +80,12 @@ PlayStateUnkFuncsStruct D_80804368_jp = {
     fbdemo_fade_is_finish,
 };
 
-PlayStateUnkFuncsStruct* D_8080438C_jp[] = {
+Game_PlayUnkFuncsStruct* D_8080438C_jp[] = {
     &D_80804320_jp, &D_80804344_jp, &D_80804368_jp, &D_80804368_jp, &D_80804344_jp, &D_80804344_jp, &D_80804368_jp,
 };
 
-typedef void (*PlayStateUnkFunc)(PlayState* play);
-PlayStateUnkFunc D_808043A8_jp[] = {
+typedef void (*Game_PlayUnkFunc)(Game_Play* game_play);
+Game_PlayUnkFunc D_808043A8_jp[] = {
     (void*)none_proc1,
     Game_play_fbdemo_wipe_create,
     Game_play_fbdemo_wipe_init,
@@ -121,57 +121,57 @@ void event_title_flag_off(void) {
     }
 }
 
-void Game_play_camera_proc(PlayState* play) {
-    Camera2_ClearActorTalking_Cull(play);
-    Camera2_process(play);
+void Game_play_camera_proc(Game_Play* game_play) {
+    Camera2_ClearActorTalking_Cull(game_play);
+    Camera2_process(game_play);
 }
 
-void Game_play_fbdemo_wipe_destroy(PlayState* play) {
-    play->unk_1EE8.unk_21C.unk_04(&play->unk_1EE8, play);
-    play->unk_1EE3 = 0;
-    play->unk_1EE8.unk_218 = -1;
+void Game_play_fbdemo_wipe_destroy(Game_Play* game_play) {
+    game_play->unk_1EE8.unk_21C.unk_04(&game_play->unk_1EE8, game_play);
+    game_play->unk_1EE3 = 0;
+    game_play->unk_1EE8.unk_218 = -1;
 }
 
-void Game_play_fbdemo_wipe_create_sub(PlayState* play) {
-    s32 sp1C = play->unk_1EE1;
+void Game_play_fbdemo_wipe_create_sub(Game_Play* game_play) {
+    s32 sp1C = game_play->unk_1EE1;
 
-    bzero(&play->unk_1EE8, sizeof(PlayState_Unk_1EE8));
+    bzero(&game_play->unk_1EE8, sizeof(Game_Play_Unk_1EE8));
     if (sp1C >= 7) {
         sp1C = 1;
     }
-    play->unk_1EE8.unk_218 = sp1C;
+    game_play->unk_1EE8.unk_218 = sp1C;
 
     {
-        PlayStateUnkFuncsStruct* temp_v0 = D_8080438C_jp[sp1C];
-
-        play->unk_1EE8.unk_21C.unk_00 = temp_v0->unk_00;
-        play->unk_1EE8.unk_21C.unk_04 = temp_v0->unk_04;
-        play->unk_1EE8.unk_21C.unk_08 = temp_v0->unk_08;
-        play->unk_1EE8.unk_21C.unk_0C = temp_v0->unk_0C;
-        play->unk_1EE8.unk_21C.unk_10 = temp_v0->unk_10;
-        play->unk_1EE8.unk_21C.unk_14 = temp_v0->unk_14;
-        play->unk_1EE8.unk_21C.unk_18 = temp_v0->unk_18;
-        play->unk_1EE8.unk_21C.unk_20 = temp_v0->unk_20;
+        Game_PlayUnkFuncsStruct* temp_v0 = D_8080438C_jp[sp1C];
+
+        game_play->unk_1EE8.unk_21C.unk_00 = temp_v0->unk_00;
+        game_play->unk_1EE8.unk_21C.unk_04 = temp_v0->unk_04;
+        game_play->unk_1EE8.unk_21C.unk_08 = temp_v0->unk_08;
+        game_play->unk_1EE8.unk_21C.unk_0C = temp_v0->unk_0C;
+        game_play->unk_1EE8.unk_21C.unk_10 = temp_v0->unk_10;
+        game_play->unk_1EE8.unk_21C.unk_14 = temp_v0->unk_14;
+        game_play->unk_1EE8.unk_21C.unk_18 = temp_v0->unk_18;
+        game_play->unk_1EE8.unk_21C.unk_20 = temp_v0->unk_20;
     }
 }
 
-void Game_play_fbdemo_wipe_create(PlayState* play) {
-    Game_play_fbdemo_wipe_create_sub(play);
-    Game_play_fbdemo_wipe_init(play);
+void Game_play_fbdemo_wipe_create(Game_Play* game_play) {
+    Game_play_fbdemo_wipe_create_sub(game_play);
+    Game_play_fbdemo_wipe_init(game_play);
 }
 
-void Game_play_fbdemo_wipe_init(PlayState* play) {
-    PlayState_Unk_1EE8* temp_s0 = &play->unk_1EE8;
+void Game_play_fbdemo_wipe_init(Game_Play* game_play) {
+    Game_Play_Unk_1EE8* temp_s0 = &game_play->unk_1EE8;
     u8 var_v0;
 
-    play->unk_1EE8.unk_21C.unk_00(temp_s0);
+    game_play->unk_1EE8.unk_21C.unk_00(temp_s0);
 
     common_data.unk_1014A = 14;
     common_data.unk_10149 = 30;
 
     temp_s0->unk_21C.unk_18(temp_s0, 0);
 
-    var_v0 = play->unk_1EE0;
+    var_v0 = game_play->unk_1EE0;
     if (temp_s0->unk_218 == 4) {
         var_v0 |= 0x80;
     } else if (temp_s0->unk_218 == 5) {
@@ -181,76 +181,76 @@ void Game_play_fbdemo_wipe_init(PlayState* play) {
     temp_s0->unk_21C.unk_14(temp_s0, var_v0);
     temp_s0->unk_21C.unk_10(temp_s0);
 
-    play->unk_1EE3 = 3;
+    game_play->unk_1EE3 = 3;
     S_back_title_timer = 300;
     S_se_endcheck_timeout = 300;
 }
 
-void Game_play_fbdemo_fade_in_move_end(PlayState* play) {
-    Game_play_fbdemo_wipe_destroy(play);
-    if (play->unk_1EE2 == 3) {
+void Game_play_fbdemo_fade_in_move_end(Game_Play* game_play) {
+    Game_play_fbdemo_wipe_destroy(game_play);
+    if (game_play->unk_1EE2 == 3) {
         fbdemo_cleanup(&fbdemo);
-        play->unk_1EE2 = 0;
+        game_play->unk_1EE2 = 0;
         SetGameFrame(3);
     }
 }
 
-void Game_play_fbdemo_fade_out_start_emu_move_end(PlayState* play) {
-    STOP_GAMESTATE(&play->state);
-    SET_NEXT_GAMESTATE(&play->state, famicom_emu_init, sizeof(FamicomEmuState));
+void Game_play_fbdemo_fade_out_start_emu_move_end(Game_Play* game_play) {
+    STOP_GAMESTATE(&game_play->state);
+    SET_NEXT_GAMESTATE(&game_play->state, famicom_emu_init, sizeof(Game_FamicomEmu));
 }
 
-void Game_play_fbdemo_fade_out_game_end_move_end(PlayState* play) {
-    STOP_GAMESTATE(&play->state);
-    SET_NEXT_GAMESTATE(&play->state, trademark_init, sizeof(TrademarkState));
+void Game_play_fbdemo_fade_out_game_end_move_end(Game_Play* game_play) {
+    STOP_GAMESTATE(&game_play->state);
+    SET_NEXT_GAMESTATE(&game_play->state, trademark_init, sizeof(Game_Trademark));
 }
 
-void Game_play_change_scene_move_end(PlayState* play) {
-    game_goto_next_game_play(&play->state);
+void Game_play_change_scene_move_end(Game_Play* game_play) {
+    game_goto_next_game_play(&game_play->state);
     common_data.unk_10004 = common_data.unk_00014;
-    common_data.unk_00014 = play->unk_1E18;
+    common_data.unk_00014 = game_play->unk_1E18;
 }
 
-void Game_play_fbdemo_wipe_move(PlayState* play) {
+void Game_play_fbdemo_wipe_move(Game_Play* game_play) {
     UNUSED s32 pad[2];
     s16 sp26 = 0;
     s32 sp20 = 1;
-    PlayState_Unk_1EE8* sp18 = &play->unk_1EE8;
+    Game_Play_Unk_1EE8* sp18 = &game_play->unk_1EE8;
 
-    if (play->unk_1EE8.unk_21C.unk_20(sp18, play) != 0) {
-        if ((play->unk_1EE0 != 1) && (play->unk_1EE0 != 11)) {
+    if (game_play->unk_1EE8.unk_21C.unk_20(sp18, game_play) != 0) {
+        if ((game_play->unk_1EE0 != 1) && (game_play->unk_1EE0 != 11)) {
             if (S_se_endcheck_timeout != 0) {
                 S_se_endcheck_timeout--;
             }
 
-            if ((func_800D2334_jp(sp18, play) == 0) && (S_se_endcheck_timeout != 0)) {
+            if ((func_800D2334_jp(sp18, game_play) == 0) && (S_se_endcheck_timeout != 0)) {
                 sp20 = 0;
             } else {
                 func_800D2568_jp(1);
             }
         }
 
-        if (play->unk_1EE0 == 11) {
+        if (game_play->unk_1EE0 == 11) {
             func_800D2568_jp(2);
         }
 
         if (sp20 == 1) {
-            switch (play->unk_1EE0) {
+            switch (game_play->unk_1EE0) {
                 case 1:
-                    Game_play_fbdemo_fade_in_move_end(play);
+                    Game_play_fbdemo_fade_in_move_end(game_play);
                     break;
 
                 case 3:
                     //! FAKE
                     if (1) {}
                     if (1) {}
-                    Game_play_fbdemo_fade_out_start_emu_move_end(play);
+                    Game_play_fbdemo_fade_out_start_emu_move_end(game_play);
                     break;
 
                 case 4:
                 case 6:
                     if (S_back_title_timer == 300) {
-                        mBGMPsComp_make_ps_wipe(0x168, play);
+                        mBGMPsComp_make_ps_wipe(0x168, game_play);
                     }
 
                 case 5:
@@ -260,7 +260,7 @@ void Game_play_fbdemo_wipe_move(PlayState* play) {
                     }
 
                     if ((sAdo_BgmFadeoutCheck() == 1) || (S_back_title_timer == 0)) {
-                        Game_play_fbdemo_fade_out_game_end_move_end(play);
+                        Game_play_fbdemo_fade_out_game_end_move_end(game_play);
                     } else {
                         sp26 = 1;
                     }
@@ -269,8 +269,8 @@ void Game_play_fbdemo_wipe_move(PlayState* play) {
                 case 8:
                     if (common_data.unk_100E4 != NULL) {
                         if (*common_data.unk_100E4 != NULL) {
-                            (*common_data.unk_100E4)(play);
-                            Game_play_change_scene_move_end(play);
+                            (*common_data.unk_100E4)(game_play);
+                            Game_play_change_scene_move_end(game_play);
                         }
                     }
                     break;
@@ -281,19 +281,19 @@ void Game_play_fbdemo_wipe_move(PlayState* play) {
                     }
 
                     if ((sAdo_BgmFadeoutCheck() == 1) || (S_back_title_timer == 0)) {
-                        Game_play_change_scene_move_end(play);
+                        Game_play_change_scene_move_end(game_play);
                     } else {
                         sp26 = 1;
                     }
                     break;
 
                 default:
-                    Game_play_change_scene_move_end(play);
+                    Game_play_change_scene_move_end(game_play);
                     break;
             }
 
             if (sp26 == 0) {
-                play->unk_1EE0 = 0;
+                game_play->unk_1EE0 = 0;
             }
         }
     } else {
@@ -301,29 +301,29 @@ void Game_play_fbdemo_wipe_move(PlayState* play) {
     }
 }
 
-void Game_play_fbdemo_wipe_proc(PlayState* play) {
-    if ((play->unk_1EE3 == 0) && (play->unk_1EE0 != 0)) {
-        play->unk_1EE3 = 1;
+void Game_play_fbdemo_wipe_proc(Game_Play* game_play) {
+    if ((game_play->unk_1EE3 == 0) && (game_play->unk_1EE0 != 0)) {
+        game_play->unk_1EE3 = 1;
     }
-    D_808043A8_jp[play->unk_1EE3](play);
+    D_808043A8_jp[game_play->unk_1EE3](game_play);
 }
 
-Gfx* game_play_set_fog(PlayState* play, Gfx* gfx) {
-    return gfx_set_fog_nosync(gfx, play->lightCtx.fogColor.r, play->lightCtx.fogColor.g, play->lightCtx.fogColor.b, 0,
-                              play->lightCtx.fogNear, play->lightCtx.zFar);
+Gfx* game_play_set_fog(Game_Play* game_play, Gfx* gfx) {
+    return gfx_set_fog_nosync(gfx, game_play->lightCtx.fogColor.r, game_play->lightCtx.fogColor.g,
+                              game_play->lightCtx.fogColor.b, 0, game_play->lightCtx.fogNear, game_play->lightCtx.zFar);
 }
 
-void Game_play_fbdemo_proc(PlayState* play) {
+void Game_play_fbdemo_proc(Game_Play* game_play) {
     UNUSED s32 pad;
-    GraphicsContext* gfxCtx = play->state.gfxCtx;
+    GraphicsContext* gfxCtx = game_play->state.gfxCtx;
 
-    switch (play->unk_1EE2) {
+    switch (game_play->unk_1EE2) {
         case 2:
-            if (fbdemo_init(&fbdemo, 10, 7, play) == 0) {
-                play->unk_1EE2 = 0;
+            if (fbdemo_init(&fbdemo, 10, 7, game_play) == 0) {
+                game_play->unk_1EE2 = 0;
             } else {
                 B_8080455C_jp = gfxCtx->unk_008;
-                play->unk_1EE2 = 3;
+                game_play->unk_1EE2 = 3;
                 SetGameFrame(1);
             }
             break;
@@ -333,40 +333,40 @@ void Game_play_fbdemo_proc(PlayState* play) {
     }
 }
 
-void play_cleanup(GameState* gameState) {
-    PlayState* play = (PlayState*)gameState;
+void play_cleanup(Game* gameState) {
+    Game_Play* game_play = (Game_Play*)gameState;
 
-    func_800A3304_jp(play);
-    play->state.gfxCtx->unk_2F4 = 0;
-    play->state.gfxCtx->unk_2F8 = 0;
-    play->unk_1CBC.unk_00 = 0;
-    PreRender_cleanup(&play->unk_1DC0);
-    CollisionCheck_dt(play, &play->unk_2138);
+    func_800A3304_jp(game_play);
+    game_play->state.gfxCtx->unk_2F4 = 0;
+    game_play->state.gfxCtx->unk_2F8 = 0;
+    game_play->unk_1CBC.unk_00 = 0;
+    PreRender_cleanup(&game_play->unk_1DC0);
+    CollisionCheck_dt(game_play, &game_play->unk_2138);
 
-    if (play->unk_1EE2 == 3) {
+    if (game_play->unk_1EE2 == 3) {
         fbdemo_cleanup(&fbdemo);
-        play->unk_1EE2 = 0;
+        game_play->unk_1EE2 = 0;
     }
 
-    if (play->unk_1EE3 == 3) {
-        Game_play_fbdemo_wipe_destroy(play);
+    if (game_play->unk_1EE3 == 3) {
+        Game_play_fbdemo_wipe_destroy(game_play);
     }
 
-    Actor_info_dt(&play->actorInfo, play);
-    mEv_finish(&play->unk_1EBC);
+    Actor_info_dt(&game_play->actorInfo, game_play);
+    mEv_finish(&game_play->unk_1EBC);
     func_800AA124_jp();
-    mSM_submenu_dt(&play->unk_1CBC);
-    play->unk_1DAC = -1;
-    mSM_submenu_ovlptr_cleanup(&play->unk_1CBC);
-    mPlib_Object_Exchange_keep_Player_dt(play);
+    mSM_submenu_dt(&game_play->unk_1CBC);
+    game_play->unk_1DAC = -1;
+    mSM_submenu_ovlptr_cleanup(&game_play->unk_1CBC);
+    mPlib_Object_Exchange_keep_Player_dt(game_play);
     mHsRm_GetHuusuiRoom(0, common_data.unk_10003);
     func_80087280_jp();
     zelda_CleanupArena();
 }
 
-void play_init(GameState* gameState) {
-    PlayState* play = (PlayState*)gameState;
-    GraphicsContext* gfxCtx = play->state.gfxCtx;
+void play_init(Game* gameState) {
+    Game_Play* game_play = (Game_Play*)gameState;
+    GraphicsContext* gfxCtx = game_play->state.gfxCtx;
     u32 temp_v1;
     u32 temp_v0_2;
     UNUSED s32 pad[2];
@@ -374,170 +374,170 @@ void play_init(GameState* gameState) {
     s32 sp30;
 
     //! FAKE
-    if (play && play && play) {}
+    if (game_play && game_play && game_play) {}
 
-    game_resize_hyral(&play->state, 0x7D0000);
+    game_resize_hyral(&game_play->state, 0x7D0000);
     func_800D2568_jp(0);
     event_title_flag_on();
     func_800C9010_jp();
     mTM_set_season();
     func_800B594C_jp();
-    func_800C49D4_jp(play);
-    func_8007CFD8_jp(play);
-    func_8007F858_jp(&play->unk_1EBC);
-    initView(&play->unk_1938, gfxCtx);
-    func_80064F48_jp(play);
-    func_80077620_jp(play, &play->unk_2138);
+    func_800C49D4_jp(game_play);
+    func_8007CFD8_jp(game_play);
+    func_8007F858_jp(&game_play->unk_1EBC);
+    initView(&game_play->unk_1938, gfxCtx);
+    func_80064F48_jp(game_play);
+    func_80077620_jp(game_play, &game_play->unk_2138);
     func_8006BB64_jp();
     func_8006C8D0_jp();
-    play->unk_1DAC = -1;
-    Gameplay_Scene_Read(play, common_data.unk_00014);
-    mSM_submenu_ct(&play->unk_1CBC);
-    play->unk_1CBC.unk_00 = 0;
-    PreRender_init(&play->unk_1DC0);
-    PreRender_setup_savebuf(&play->unk_1DC0, 0x140, 0xF0, 0, 0, 0);
-    PreRender_setup_renderbuf(&play->unk_1DC0, 0x140, 0xF0, NULL, NULL);
+    game_play->unk_1DAC = -1;
+    Gameplay_Scene_Read(game_play, common_data.unk_00014);
+    mSM_submenu_ct(&game_play->unk_1CBC);
+    game_play->unk_1CBC.unk_00 = 0;
+    PreRender_init(&game_play->unk_1DC0);
+    PreRender_setup_savebuf(&game_play->unk_1DC0, 0x140, 0xF0, 0, 0, 0);
+    PreRender_setup_renderbuf(&game_play->unk_1DC0, 0x140, 0xF0, NULL, NULL);
 
     //! FAKE
     if (1) {}
-    play->unk_1EE2 = 0;
-    play->unk_1EE3 = 0;
-    play->unk_1EE0 = 1;
+    game_play->unk_1EE2 = 0;
+    game_play->unk_1EE3 = 0;
+    game_play->unk_1EE0 = 1;
 
     temp = 1;
     if (common_data.unk_1014B != 0xFF) {
         temp = common_data.unk_1014B;
         common_data.unk_1014B = 0xFF;
     }
-    play->unk_1EE1 = temp;
-
-    Pause_ct(&play->pause);
-    new_Matrix(&play->state);
-    play->state.main = play_main;
-    play->state.destroy = play_cleanup;
-    fbdemo_fade_init(&play->unk_2128);
-    fbdemo_fade_settype(&play->unk_2128, 7);
-    fbdemo_fade_setcolor_rgba8888(&play->unk_2128, 0xA0A0A0FF);
-    fbdemo_fade_startup(&play->unk_2128);
-    play->unk_220C = 0;
-    sp30 = THA_getFreeBytes(&play->state.heap);
-    temp_v0_2 = (u32)THA_alloc16(&play->state.heap, sp30);
+    game_play->unk_1EE1 = temp;
+
+    Pause_ct(&game_play->pause);
+    new_Matrix(&game_play->state);
+    game_play->state.main = play_main;
+    game_play->state.destroy = play_cleanup;
+    fbdemo_fade_init(&game_play->unk_2128);
+    fbdemo_fade_settype(&game_play->unk_2128, 7);
+    fbdemo_fade_setcolor_rgba8888(&game_play->unk_2128, 0xA0A0A0FF);
+    fbdemo_fade_startup(&game_play->unk_2128);
+    game_play->unk_220C = 0;
+    sp30 = THA_getFreeBytes(&game_play->state.heap);
+    temp_v0_2 = (u32)THA_alloc16(&game_play->state.heap, sp30);
     temp_v1 = ALIGN16(temp_v0_2);
     //! FAKE
     zelda_InitArena((void*)(temp_v1 & 0xFFFFFFFF), (sp30 - temp_v1) + temp_v0_2);
     func_800C2EE0_jp();
     func_80087004_jp();
-    Actor_info_ct(play, &play->actorInfo, play->unk_1EA8);
-    play->unk_2208 = (void*)none_proc1;
-    mMsg_ct(play);
-    mEv_2nd_init(&play->unk_1EBC);
-    mTD_player_keydata_init(play);
-    Balloon_init(play);
+    Actor_info_ct(game_play, &game_play->actorInfo, game_play->unk_1EA8);
+    game_play->unk_2208 = (void*)none_proc1;
+    mMsg_ct(game_play);
+    mEv_2nd_init(&game_play->unk_1EBC);
+    mTD_player_keydata_init(game_play);
+    Balloon_init(game_play);
     func_800A65C4_jp();
     func_80059BF0_jp();
     func_800CBF80_jp();
     event_title_flag_off();
 }
 
-void Game_play_move_fbdemo_not_move(PlayState* play) {
+void Game_play_move_fbdemo_not_move(Game_Play* game_play) {
     UNUSED s32 pad[2];
 
-    play->state.unk_9D = 0x8F;
-    play->state.unk_9C = 1;
-    mSM_submenu_ctrl(play);
-    if (play->unk_1CBC.unk_0C == 0) {
-        play->state.unk_9C = 2;
-        mDemo_Main(play);
-        play->state.unk_9C = 3;
-        mEv_run(&play->unk_1EBC);
+    game_play->state.unk_9D = 0x8F;
+    game_play->state.unk_9C = 1;
+    mSM_submenu_ctrl(game_play);
+    if (game_play->unk_1CBC.unk_0C == 0) {
+        game_play->state.unk_9C = 2;
+        mDemo_Main(game_play);
+        game_play->state.unk_9C = 3;
+        mEv_run(&game_play->unk_1EBC);
     }
-    play->state.unk_9C = 4;
+    game_play->state.unk_9C = 4;
     mDemo_stock_clear();
-    play->state.unk_9C = 5;
-    mSc_dmacopy_data_bank(play->unk_0110);
-    play->state.unk_9C = 6;
-    mSM_submenu_move(&play->unk_1CBC);
-    if ((play->unk_1CBC.unk_0C == 0) && (REGADDR(IREG, 0x48) == 0)) {
-        play->unk_1EA0++;
-        play->state.unk_9C = 7;
-        CollisionCheck_OC(play, &play->unk_2138);
-        play->state.unk_9C = 8;
-        CollisionCheck_clear(play, &play->unk_2138);
-        play->state.unk_9D = 0x90;
-        play->state.unk_9C = 0;
-        Actor_info_call_actor(play, &play->actorInfo);
-        play->state.unk_9D = 0x91;
-        play->state.unk_9C = 1;
+    game_play->state.unk_9C = 5;
+    mSc_dmacopy_data_bank(game_play->unk_0110);
+    game_play->state.unk_9C = 6;
+    mSM_submenu_move(&game_play->unk_1CBC);
+    if ((game_play->unk_1CBC.unk_0C == 0) && (REGADDR(IREG, 0x48) == 0)) {
+        game_play->unk_1EA0++;
+        game_play->state.unk_9C = 7;
+        CollisionCheck_OC(game_play, &game_play->unk_2138);
+        game_play->state.unk_9C = 8;
+        CollisionCheck_clear(game_play, &game_play->unk_2138);
+        game_play->state.unk_9D = 0x90;
+        game_play->state.unk_9C = 0;
+        Actor_info_call_actor(game_play, &game_play->actorInfo);
+        game_play->state.unk_9D = 0x91;
+        game_play->state.unk_9C = 1;
         mCoBG_CalcTimerDecalCircle();
-        play->state.unk_9C = 2;
-        mMsg_Main(play);
+        game_play->state.unk_9C = 2;
+        mMsg_Main(game_play);
     }
-    fbdemo_fade_move(&play->unk_2128, game_GameFrame);
+    fbdemo_fade_move(&game_play->unk_2128, game_GameFrame);
 }
 
-void Game_play_move(PlayState* play) {
-    PlayState_unk_0110* p = play->unk_0110;
+void Game_play_move(Game_Play* game_play) {
+    Game_Play_unk_0110* p = game_play->unk_0110;
     s32 var_v1;
 
-    play->state.unk_9D = 0x8D;
-    play->state.unk_9C = 1;
+    game_play->state.unk_9D = 0x8D;
+    game_play->state.unk_9C = 1;
     Game_play_Reset_destiny();
     gSegments[4] = (uintptr_t)OS_K0_TO_PHYSICAL(p->segment);
-    gSegments[2] = (uintptr_t)OS_K0_TO_PHYSICAL(play->unk_010C);
-    play->state.unk_9C = 2;
+    gSegments[2] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_010C);
+    game_play->state.unk_9C = 2;
 
     if (zurumode_flag >= 2) {
-        var_v1 = Pause_proc(&play->pause, CONTROLLER2(&play->state)) == 0;
+        var_v1 = Pause_proc(&game_play->pause, CONTROLLER2(&game_play->state)) == 0;
     } else {
         var_v1 = 0;
     }
 
-    play->state.unk_9D = 0x8E;
-    play->state.unk_9C = 0;
+    game_play->state.unk_9D = 0x8E;
+    game_play->state.unk_9C = 0;
 
     if (var_v1 == 0) {
-        play->state.unk_9C = 1;
-        Game_play_fbdemo_wipe_proc(play);
-        play->state.unk_9C = 2;
-        Game_play_fbdemo_proc(play);
-        play->state.unk_9C = 3;
-        if (play->unk_1EE2 != 3) {
-            Game_play_move_fbdemo_not_move(play);
+        game_play->state.unk_9C = 1;
+        Game_play_fbdemo_wipe_proc(game_play);
+        game_play->state.unk_9C = 2;
+        Game_play_fbdemo_proc(game_play);
+        game_play->state.unk_9C = 3;
+        if (game_play->unk_1EE2 != 3) {
+            Game_play_move_fbdemo_not_move(game_play);
         }
     }
 
-    if (play->unk_1CBC.unk_0C == 0) {
-        play->state.unk_9D = 0x92;
-        play->state.unk_9C = 1;
-        Game_play_camera_proc(play);
-        play->state.unk_9C = 2;
-        mPO_business_proc(play);
-        play->state.unk_9C = 3;
-        mTRC_move(play);
-        play->state.unk_9C = 4;
-        Balloon_move(play);
+    if (game_play->unk_1CBC.unk_0C == 0) {
+        game_play->state.unk_9D = 0x92;
+        game_play->state.unk_9C = 1;
+        Game_play_camera_proc(game_play);
+        game_play->state.unk_9C = 2;
+        mPO_business_proc(game_play);
+        game_play->state.unk_9C = 3;
+        mTRC_move(game_play);
+        game_play->state.unk_9C = 4;
+        Balloon_move(game_play);
     }
 
-    play->state.unk_9D = 0x93;
-    play->state.unk_9C = 1;
-    Global_kankyo_set(play, &play->kankyo, &play->lightCtx);
-    play->state.unk_9C = 2;
+    game_play->state.unk_9D = 0x93;
+    game_play->state.unk_9C = 1;
+    Global_kankyo_set(game_play, &game_play->kankyo, &game_play->lightCtx);
+    game_play->state.unk_9C = 2;
     mEnv_WindMove();
-    play->state.unk_9C = 3;
-    watch_my_step_move(play);
-    play->state.unk_9C = 4;
-    banti_move(play);
-    play->state.unk_9C = 5;
-    title_demo_move(play);
-    play->state.unk_9D = 0x95;
-    play->state.unk_9C = 0;
+    game_play->state.unk_9C = 3;
+    watch_my_step_move(game_play);
+    game_play->state.unk_9C = 4;
+    banti_move(game_play);
+    game_play->state.unk_9C = 5;
+    title_demo_move(game_play);
+    game_play->state.unk_9D = 0x95;
+    game_play->state.unk_9C = 0;
 }
 
-void func_80803810_jp(PlayState* play, GraphicsContext* gfxCtx) {
-    void* temp_v0 = play->unk_0110[0].segment;
+void func_80803810_jp(Game_Play* game_play, GraphicsContext* gfxCtx) {
+    void* temp_v0 = game_play->unk_0110[0].segment;
 
     gSegments[4] = (uintptr_t)OS_K0_TO_PHYSICAL(temp_v0);
-    gSegments[2] = (uintptr_t)OS_K0_TO_PHYSICAL(play->unk_010C);
+    gSegments[2] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_010C);
 
     OPEN_DISPS(gfxCtx);
 
@@ -555,50 +555,50 @@ void func_80803810_jp(PlayState* play, GraphicsContext* gfxCtx) {
     gSPSegment(UNK_2C0_DISP++, 0x04, temp_v0);
     gSPSegment(LIGHT_DISP++, 0x04, temp_v0);
 
-    gSPSegment(POLY_OPA_DISP++, 0x02, play->unk_010C);
-    gSPSegment(POLY_XLU_DISP++, 0x02, play->unk_010C);
-    gSPSegment(OVERLAY_DISP++, 0x02, play->unk_010C);
-    gSPSegment(UNK_2B0_DISP++, 0x02, play->unk_010C);
-    gSPSegment(UNK_2C0_DISP++, 0x02, play->unk_010C);
-    gSPSegment(LIGHT_DISP++, 0x02, play->unk_010C);
+    gSPSegment(POLY_OPA_DISP++, 0x02, game_play->unk_010C);
+    gSPSegment(POLY_XLU_DISP++, 0x02, game_play->unk_010C);
+    gSPSegment(OVERLAY_DISP++, 0x02, game_play->unk_010C);
+    gSPSegment(UNK_2B0_DISP++, 0x02, game_play->unk_010C);
+    gSPSegment(UNK_2C0_DISP++, 0x02, game_play->unk_010C);
+    gSPSegment(LIGHT_DISP++, 0x02, game_play->unk_010C);
 
     CLOSE_DISPS(gfxCtx);
 }
 
-void setupFog(PlayState* play, GraphicsContext* gfxCtx) {
+void setupFog(Game_Play* game_play, GraphicsContext* gfxCtx) {
     OPEN_DISPS(gfxCtx);
 
-    POLY_OPA_DISP = game_play_set_fog(play, POLY_OPA_DISP);
-    POLY_XLU_DISP = game_play_set_fog(play, POLY_XLU_DISP);
+    POLY_OPA_DISP = game_play_set_fog(game_play, POLY_OPA_DISP);
+    POLY_XLU_DISP = game_play_set_fog(game_play, POLY_XLU_DISP);
 
     CLOSE_DISPS(gfxCtx);
 }
 
-void setupViewer(PlayState* play) {
-    showView(&play->unk_1938, 0xF, play);
+void setupViewer(Game_Play* game_play) {
+    showView(&game_play->unk_1938, 0xF, game_play);
 }
 
-void setupViewMatrix(PlayState* play, GraphicsContext* __gfxCtx, GraphicsContext* gfxCtx2) {
+void setupViewMatrix(Game_Play* game_play, GraphicsContext* __gfxCtx, GraphicsContext* gfxCtx2) {
     // TODO: A way to fit OPEN_DISPS/CLOSE_DISPS on the stack
-    Matrix_MtxtoMtxF(&play->unk_1938.unk_0A0, &play->billboardMtxF);
-    Matrix_MtxtoMtxF(&play->unk_1938.unk_060, &play->viewProjectionMtxF);
-    Skin_Matrix_MulMatrix(&play->viewProjectionMtxF, &play->billboardMtxF, &play->viewProjectionMtxF);
+    Matrix_MtxtoMtxF(&game_play->unk_1938.unk_0A0, &game_play->billboardMtxF);
+    Matrix_MtxtoMtxF(&game_play->unk_1938.unk_060, &game_play->viewProjectionMtxF);
+    Skin_Matrix_MulMatrix(&game_play->viewProjectionMtxF, &game_play->billboardMtxF, &game_play->viewProjectionMtxF);
 
-    play->billboardMtxF.mf[0][3] = 0.0f;
-    play->billboardMtxF.mf[1][3] = 0.0f;
-    play->billboardMtxF.mf[2][3] = 0.0f;
-    play->billboardMtxF.mf[3][0] = 0.0f;
-    play->billboardMtxF.mf[3][1] = 0.0f;
-    play->billboardMtxF.mf[3][2] = 0.0f;
+    game_play->billboardMtxF.mf[0][3] = 0.0f;
+    game_play->billboardMtxF.mf[1][3] = 0.0f;
+    game_play->billboardMtxF.mf[2][3] = 0.0f;
+    game_play->billboardMtxF.mf[3][0] = 0.0f;
+    game_play->billboardMtxF.mf[3][1] = 0.0f;
+    game_play->billboardMtxF.mf[3][2] = 0.0f;
 
-    Matrix_reverse(&play->billboardMtxF);
+    Matrix_reverse(&game_play->billboardMtxF);
 
-    play->unk_1E9C = _MtxF_to_Mtx(&play->billboardMtxF, GRAPH_ALLOC(gfxCtx2, sizeof(MtxF) * 1));
+    game_play->unk_1E9C = _MtxF_to_Mtx(&game_play->billboardMtxF, GRAPH_ALLOC(gfxCtx2, sizeof(MtxF) * 1));
 
-    gSPSegment(POLY_OPA_DISP++, 0x01, play->unk_1E9C);
+    gSPSegment(POLY_OPA_DISP++, 0x01, game_play->unk_1E9C);
 }
 
-s32 makeBumpTexture(PlayState* play, GraphicsContext* __gfxCtx, GraphicsContext* gfxCtx2) {
+s32 makeBumpTexture(Game_Play* game_play, GraphicsContext* __gfxCtx, GraphicsContext* gfxCtx2) {
     // TODO: A way to fit OPEN_DISPS/CLOSE_DISPS on the stack
     {
         Gfx* sp194;
@@ -608,8 +608,8 @@ s32 makeBumpTexture(PlayState* play, GraphicsContext* __gfxCtx, GraphicsContext*
 
         gSPDisplayList(OVERLAY_DISP++, sp194);
 
-        if (play->unk_1EE3 == 3) {
-            PlayState1938 sp60;
+        if (game_play->unk_1EE3 == 3) {
+            Game_Play1938 sp60;
             ScissorViewArg1 sp50;
 
             initView(&sp60, gfxCtx2);
@@ -623,11 +623,11 @@ s32 makeBumpTexture(PlayState* play, GraphicsContext* __gfxCtx, GraphicsContext*
             sp50.unk_08 = 0;
             setScissorView(&sp60, &sp50);
             showView1(&sp60, 0xF, &sp194);
-            play->unk_1EE8.unk_21C.unk_0C(&play->unk_1EE8, &sp194);
+            game_play->unk_1EE8.unk_21C.unk_0C(&game_play->unk_1EE8, &sp194);
         }
 
-        fbdemo_fade_draw(&play->unk_2128, &sp194);
-        fade_rgba8888_draw(&sp194, play->unk_220C);
+        fbdemo_fade_draw(&game_play->unk_2128, &sp194);
+        fade_rgba8888_draw(&sp194, game_play->unk_220C);
 
         gSPEndDisplayList(sp194++);
 
@@ -635,7 +635,7 @@ s32 makeBumpTexture(PlayState* play, GraphicsContext* __gfxCtx, GraphicsContext*
         POLY_OPA_DISP = sp194;
     }
 
-    if (play->unk_1EE2 == 3) {
+    if (game_play->unk_1EE2 == 3) {
         Gfx* sp48 = POLY_OPA_DISP;
 
         fbdemo_draw(&fbdemo, &sp48);
@@ -643,36 +643,36 @@ s32 makeBumpTexture(PlayState* play, GraphicsContext* __gfxCtx, GraphicsContext*
         return 1;
     }
 
-    PreRender_setup_renderbuf(&play->unk_1DC0, 0x140, 0xF0, gfxCtx2->unk_2E4, gfxCtx2->unk_008);
-    if (play->unk_1CBC.unk_00 == 2) {
+    PreRender_setup_renderbuf(&game_play->unk_1DC0, 0x140, 0xF0, gfxCtx2->unk_2E4, gfxCtx2->unk_008);
+    if (game_play->unk_1CBC.unk_00 == 2) {
         func_800B0010_jp();
-        PreRender_ConvertFrameBuffer_fg(&play->unk_1DC0);
-        play->unk_1CBC.unk_00 = 3;
-    } else if (play->unk_1CBC.unk_00 >= 5) {
-        play->unk_1CBC.unk_00 = 0;
+        PreRender_ConvertFrameBuffer_fg(&game_play->unk_1DC0);
+        game_play->unk_1CBC.unk_00 = 3;
+    } else if (game_play->unk_1CBC.unk_00 >= 5) {
+        game_play->unk_1CBC.unk_00 = 0;
     }
 
-    if (play->unk_1CBC.unk_00 == 3) {
+    if (game_play->unk_1CBC.unk_00 == 3) {
         Gfx* sp44 = POLY_OPA_DISP;
 
-        PreRender_loadFrameBufferCopy(&play->unk_1DC0, &sp44);
+        PreRender_loadFrameBufferCopy(&game_play->unk_1DC0, &sp44);
         POLY_OPA_DISP = sp44;
         return 1;
     }
 
     {
-        Lights* sp40 = Global_light_read(&play->lightCtx, gfxCtx2);
+        Lights* sp40 = Global_light_read(&game_play->lightCtx, gfxCtx2);
 
-        LightsN_list_check(sp40, play->lightCtx.listHead, NULL);
+        LightsN_list_check(sp40, game_play->lightCtx.listHead, NULL);
         LightsN_disp(sp40, gfxCtx2);
     }
 
-    Actor_info_draw_actor(play, &play->actorInfo);
-    Camera2_draw(play);
-    mMsg_Draw(play);
-    Debug_Display_output(play);
+    Actor_info_draw_actor(game_play, &game_play->actorInfo);
+    Camera2_draw(game_play);
+    mMsg_Draw(game_play);
+    Debug_Display_output(game_play);
 
-    if ((play->unk_1CBC.unk_00 == 1) || (play->unk_1EE2 == 1)) {
+    if ((game_play->unk_1CBC.unk_00 == 1) || (game_play->unk_1EE2 == 1)) {
         Gfx* sp3C;
         Gfx* sp38;
 
@@ -681,16 +681,16 @@ s32 makeBumpTexture(PlayState* play, GraphicsContext* __gfxCtx, GraphicsContext*
 
         gSPDisplayList(OVERLAY_DISP++, sp3C);
 
-        play->unk_1DC0.unk_10 = gfxCtx2->unk_2E4;
-        play->unk_1DC0.unk_14 = gfxCtx2->unk_008;
-        PreRender_saveFrameBuffer(&play->unk_1DC0, &sp3C);
+        game_play->unk_1DC0.unk_10 = gfxCtx2->unk_2E4;
+        game_play->unk_1DC0.unk_14 = gfxCtx2->unk_008;
+        PreRender_saveFrameBuffer(&game_play->unk_1DC0, &sp3C);
 
-        if (play->unk_1CBC.unk_00 == 1) {
-            play->unk_1DC0.unk_18 = gfxCtx2->unk_2E4;
-            PreRender_saveCVG(&play->unk_1DC0, &sp3C);
-            play->unk_1CBC.unk_00 = 2;
+        if (game_play->unk_1CBC.unk_00 == 1) {
+            game_play->unk_1DC0.unk_18 = gfxCtx2->unk_2E4;
+            PreRender_saveCVG(&game_play->unk_1DC0, &sp3C);
+            game_play->unk_1CBC.unk_00 = 2;
         } else {
-            play->unk_1EE2 = 2;
+            game_play->unk_1EE2 = 2;
         }
 
         gSPEndDisplayList(sp3C++);
@@ -729,37 +729,37 @@ void draw_version(GraphicsContext* gfxCtx) {
     CLOSE_DISPS(gfxCtx);
 }
 
-void Game_play_draw(PlayState* play) {
-    GraphicsContext* gfxCtx = play->state.gfxCtx;
+void Game_play_draw(Game_Play* game_play) {
+    GraphicsContext* gfxCtx = game_play->state.gfxCtx;
     u8 sp2B = 0;
     u8 sp2A = 0;
     u8 sp29 = 0;
 
     //! FAKE
 label:;
-    func_80803810_jp(play, gfxCtx);
+    func_80803810_jp(game_play, gfxCtx);
     if (common_data.unk_10001 == 0) {
         if (mEv_CheckTitleDemo() != -9) {
-            sp2B = play->kankyo.unk_AE;
-            sp2A = play->kankyo.unk_AF;
-            sp29 = play->kankyo.unk_B0;
+            sp2B = game_play->kankyo.unk_AE;
+            sp2A = game_play->kankyo.unk_AF;
+            sp29 = game_play->kankyo.unk_B0;
         }
     }
 
-    DisplayList_initialize(gfxCtx, sp2B, sp2A, sp29, play);
-    setupFog(play, gfxCtx);
-    setupViewer(play);
-    setupViewMatrix(play, gfxCtx, gfxCtx);
+    DisplayList_initialize(gfxCtx, sp2B, sp2A, sp29, game_play);
+    setupFog(game_play, gfxCtx);
+    setupViewer(game_play);
+    setupViewMatrix(game_play, gfxCtx, gfxCtx);
 
     //! FAKE
     if (1) {}
     if (1) {}
     if (1) {}
 
-    if (makeBumpTexture(play, gfxCtx, gfxCtx) == 1) {
-        watch_my_step_draw(play);
-        banti_draw(play);
-        mSM_submenu_draw(&play->unk_1CBC, play);
+    if (makeBumpTexture(game_play, gfxCtx, gfxCtx) == 1) {
+        watch_my_step_draw(game_play);
+        banti_draw(game_play);
+        mSM_submenu_draw(&game_play->unk_1CBC, game_play);
     }
 
     if (zurumode_flag != 0) {
@@ -776,61 +776,61 @@ label:;
     }
 }
 
-void play_main(GameState* gameState) {
-    PlayState* play = (PlayState*)gameState;
+void play_main(Game* gameState) {
+    Game_Play* game_play = (Game_Play*)gameState;
 
-    play->state.unk_9D = 0x6E;
-    play->state.unk_9C = 0;
+    game_play->state.unk_9D = 0x6E;
+    game_play->state.unk_9C = 0;
     fqrand();
-    play->state.unk_9D = 0x78;
-    play->state.unk_9C = 0;
-    mCon_main(&play->state);
-    play->state.unk_9D = 0x82;
-    play->state.unk_9C = 0;
+    game_play->state.unk_9D = 0x78;
+    game_play->state.unk_9C = 0;
+    mCon_main(&game_play->state);
+    game_play->state.unk_9D = 0x82;
+    game_play->state.unk_9C = 0;
     Debug_Display_init();
-    play->state.unk_9D = 0x8C;
-    play->state.unk_9C = 0;
-    Game_play_move(play);
-    play->state.unk_9D = 0xAA;
-    play->state.unk_9C = 0;
-    Game_play_draw(play);
-    play->state.unk_9D = 0xB4;
-    play->state.unk_9C = 0;
-    if (play->unk_1CBC.unk_00 != 2) {
-        GraphicsContext* gfxCtx = play->state.gfxCtx;
-
-        game_debug_draw_last(&play->state, gfxCtx);
+    game_play->state.unk_9D = 0x8C;
+    game_play->state.unk_9C = 0;
+    Game_play_move(game_play);
+    game_play->state.unk_9D = 0xAA;
+    game_play->state.unk_9C = 0;
+    Game_play_draw(game_play);
+    game_play->state.unk_9D = 0xB4;
+    game_play->state.unk_9C = 0;
+    if (game_play->unk_1CBC.unk_00 != 2) {
+        GraphicsContext* gfxCtx = game_play->state.gfxCtx;
+
+        game_debug_draw_last(&game_play->state, gfxCtx);
         game_draw_last(gfxCtx);
-        play->state.unk_9C = 0;
+        game_play->state.unk_9C = 0;
     }
-    play->state.unk_9D = 0xBE;
+    game_play->state.unk_9D = 0xBE;
 }
 
-void* func_80804138_jp(PlayState* play, Struct_8010EAA0* arg1) {
+void* func_80804138_jp(Game_Play* game_play, Struct_8010EAA0* arg1) {
     u32 sp24 = arg1->unk_04 - arg1->unk_00;
-    void* sp20 = THA_alloc16(&play->state.heap, sp24);
+    void* sp20 = THA_alloc16(&game_play->state.heap, sp24);
 
     func_80026E10_jp(sp20, arg1->unk_00, sp24, "../m_play.c", 2302);
     return sp20;
 }
 
-void func_808041A4_jp(PlayState* play) {
-    Global_kankyo_ct(play, &play->kankyo);
+void func_808041A4_jp(Game_Play* game_play) {
+    Global_kankyo_ct(game_play, &game_play->kankyo);
 }
 
-void Gameplay_Scene_Init(PlayState* play) {
-    play->unk_1EA8 = NULL;
-    play->unk_1EA5 = 0;
-    play->unk_1EA6 = 0;
-    play->unk_1EA7 = 0;
-    play->unk_1EB8 = 0;
-    mSc_data_bank_ct(play, play->unk_0110);
-    Global_light_ct(&play->lightCtx);
-    Door_info_ct(&play->unk_1E10);
+void Gameplay_Scene_Init(Game_Play* game_play) {
+    game_play->unk_1EA8 = NULL;
+    game_play->unk_1EA5 = 0;
+    game_play->unk_1EA6 = 0;
+    game_play->unk_1EA7 = 0;
+    game_play->unk_1EB8 = 0;
+    mSc_data_bank_ct(game_play, game_play->unk_0110);
+    Global_light_ct(&game_play->lightCtx);
+    Door_info_ct(&game_play->unk_1E10);
     common_data_clear();
-    Scene_ct(play, play->unk_010C);
-    mSc_decide_exchange_bank(play->unk_0110);
-    func_808041A4_jp(play);
+    Scene_ct(game_play, game_play->unk_010C);
+    mSc_decide_exchange_bank(game_play->unk_0110);
+    func_808041A4_jp(game_play);
 }
 
 s32 mPl_SceneNo2SoundRoomType(s32 arg0) {
@@ -857,15 +857,15 @@ s32 mPl_SceneNo2SoundRoomType(s32 arg0) {
     }
 }
 
-void Gameplay_Scene_Read(PlayState* play, s16 arg1) {
+void Gameplay_Scene_Read(Game_Play* game_play, s16 arg1) {
     Struct_8010EAA0* sp1C = &scene_data_status[arg1];
 
     sp1C->unk_13 = 0;
-    play->unk_2210 = sp1C;
-    play->unk_00E0 = arg1;
-    play->unk_010C = func_80804138_jp(play, sp1C);
+    game_play->unk_2210 = sp1C;
+    game_play->unk_00E0 = arg1;
+    game_play->unk_010C = func_80804138_jp(game_play, sp1C);
     sp1C->unk_13 = 0;
-    gSegments[2] = (uintptr_t)OS_K0_TO_PHYSICAL(play->unk_010C);
-    Gameplay_Scene_Init(play);
+    gSegments[2] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_010C);
+    Gameplay_Scene_Init(game_play);
     sAdo_RoomType(mPl_SceneNo2SoundRoomType(common_data.unk_00014));
 }
diff --git a/src/overlays/gamestates/ovl_play/m_play.h b/src/overlays/gamestates/ovl_play/m_play.h
index b199f0f..46b12cd 100644
--- a/src/overlays/gamestates/ovl_play/m_play.h
+++ b/src/overlays/gamestates/ovl_play/m_play.h
@@ -24,41 +24,41 @@
 
 struct Actor;
 struct ActorEntry;
-struct PlayState;
+struct Game_Play;
 
-typedef void (*PlayState_unk_1C58)(struct Actor*);
-typedef UNK_RET (*PlayState_unk_2208)(struct Actor*, struct PlayState*);
+typedef void (*Game_Play_unk_1C58)(struct Actor*);
+typedef UNK_RET (*Game_Play_unk_2208)(struct Actor*, struct Game_Play*);
 
-typedef void (*PlayStateUnkFunc_00)(void*);
-typedef void (*PlayStateUnkFunc_04)(void*, struct PlayState*);
-typedef void (*PlayStateUnkFunc_08)(void*, u8);
-typedef void (*PlayStateUnkFunc_0C)(void*, Gfx**);
-typedef void (*PlayStateUnkFunc_10)(void*);
-typedef void (*PlayStateUnkFunc_14)(void*, s32);
-typedef void (*PlayStateUnkFunc_18)(void*, s32);
-typedef void (*PlayStateUnkFunc_1C)(void);
-typedef s32 (*PlayStateUnkFunc_20)(void*, struct PlayState*);
+typedef void (*Game_PlayUnkFunc_00)(void*);
+typedef void (*Game_PlayUnkFunc_04)(void*, struct Game_Play*);
+typedef void (*Game_PlayUnkFunc_08)(void*, u8);
+typedef void (*Game_PlayUnkFunc_0C)(void*, Gfx**);
+typedef void (*Game_PlayUnkFunc_10)(void*);
+typedef void (*Game_PlayUnkFunc_14)(void*, s32);
+typedef void (*Game_PlayUnkFunc_18)(void*, s32);
+typedef void (*Game_PlayUnkFunc_1C)(void);
+typedef s32 (*Game_PlayUnkFunc_20)(void*, struct Game_Play*);
 
-typedef struct PlayStateUnkFuncsStruct {
-    /* 0x00 */ PlayStateUnkFunc_00 unk_00;
-    /* 0x04 */ PlayStateUnkFunc_04 unk_04;
-    /* 0x08 */ PlayStateUnkFunc_08 unk_08;
-    /* 0x0C */ PlayStateUnkFunc_0C unk_0C;
-    /* 0x10 */ PlayStateUnkFunc_10 unk_10;
-    /* 0x14 */ PlayStateUnkFunc_14 unk_14;
-    /* 0x18 */ PlayStateUnkFunc_18 unk_18;
-    /* 0x1C */ PlayStateUnkFunc_1C unk_1C;
-    /* 0x20 */ PlayStateUnkFunc_20 unk_20;
-} PlayStateUnkFuncsStruct; // size = 0x24
+typedef struct Game_PlayUnkFuncsStruct {
+    /* 0x00 */ Game_PlayUnkFunc_00 unk_00;
+    /* 0x04 */ Game_PlayUnkFunc_04 unk_04;
+    /* 0x08 */ Game_PlayUnkFunc_08 unk_08;
+    /* 0x0C */ Game_PlayUnkFunc_0C unk_0C;
+    /* 0x10 */ Game_PlayUnkFunc_10 unk_10;
+    /* 0x14 */ Game_PlayUnkFunc_14 unk_14;
+    /* 0x18 */ Game_PlayUnkFunc_18 unk_18;
+    /* 0x1C */ Game_PlayUnkFunc_1C unk_1C;
+    /* 0x20 */ Game_PlayUnkFunc_20 unk_20;
+} Game_PlayUnkFuncsStruct; // size = 0x24
 
-typedef struct PlayState_Unk_1EE8 {
+typedef struct Game_Play_Unk_1EE8 {
     /* 0x000 */ char unk000[0x218];
     /* 0x218 */ s32 unk_218;
-    /* 0x21C */ PlayStateUnkFuncsStruct unk_21C;
-} PlayState_Unk_1EE8; // size = 0x240
+    /* 0x21C */ Game_PlayUnkFuncsStruct unk_21C;
+} Game_Play_Unk_1EE8; // size = 0x240
 
-typedef struct PlayState {
-    /* 0x0000 */ GameState state;
+typedef struct Game_Play {
+    /* 0x0000 */ Game state;
     /* 0x00E0 */ s16 unk_00E0;
     /* 0x00E2 */ UNK_TYPE1 unk_00E2[0x2];
     /* 0x00E4 */ s8 unk_00E4;
@@ -66,17 +66,17 @@ typedef struct PlayState {
     /* 0x00E6 */ UNK_TYPE1 unk_00E6[0x2];
     /* 0x00E8 */ UNK_TYPE1 unk_00E8[0x24];
     /* 0x010C */ void* unk_010C;
-    /* 0x0110 */ PlayState_unk_0110 unk_0110[UNK_SIZE];
+    /* 0x0110 */ Game_Play_unk_0110 unk_0110[UNK_SIZE];
     /* 0x0164 */ UNK_TYPE1 unk_0164[0x17A8];
     /* 0x190C */ s32 unk_190C;
     /* 0x1910 */ UNK_TYPE1 unk_1910[0x28];
-    /* 0x1938 */ PlayState1938 unk_1938;
+    /* 0x1938 */ Game_Play1938 unk_1938;
     /* 0x1A60 */ UNK_TYPE1 unk_1A60[0x138];
     /* 0x1B98 */ Kankyo kankyo;
     /* 0x1C60 */ LightContext lightCtx;
     /* 0x1C70 */ Pause pause;
     /* 0x1C78 */ ActorInfo actorInfo;
-    /* 0x1CBC */ PlayState1CBC unk_1CBC;
+    /* 0x1CBC */ Game_Play1CBC unk_1CBC;
     /* 0x1DAC */ s8 unk_1DAC;
     /* 0x1DAD */ UNK_TYPE1 unk_1DAD[0x3];
     /* 0x1DB0 */ UNK_TYPE1 unk_1DB0[0x10];
@@ -97,23 +97,23 @@ typedef struct PlayState {
     /* 0x1EB0 */ s16 *unk_1EB0;
     /* 0x1EB4 */ UNK_TYPE1 unk_1EB4[0x4];
     /* 0x1EB8 */ s32 unk_1EB8;
-    /* 0x1EBC */ PlayState1EBC unk_1EBC;
+    /* 0x1EBC */ Game_Play1EBC unk_1EBC;
     /* 0x1ECC */ UNK_TYPE1 unk_1ECC[0x14];
     /* 0x1EE0 */ u8 unk_1EE0;
     /* 0x1EE1 */ u8 unk_1EE1;
     /* 0x1EE2 */ u8 unk_1EE2;
     /* 0x1EE3 */ u8 unk_1EE3;
     /* 0x1EE4 */ UNK_TYPE1 unk_1EE4[0x4];
-    /* 0x1EE8 */ PlayState_Unk_1EE8 unk_1EE8;
-    /* 0x2128 */ PlayState2128 unk_2128;
-    /* 0x2138 */ PlayState2138 unk_2138;
-    /* 0x2208 */ PlayState_unk_2208 unk_2208;
+    /* 0x1EE8 */ Game_Play_Unk_1EE8 unk_1EE8;
+    /* 0x2128 */ Game_Play2128 unk_2128;
+    /* 0x2138 */ Game_Play2138 unk_2138;
+    /* 0x2208 */ Game_Play_unk_2208 unk_2208;
     /* 0x220C */ s32 unk_220C;
     /* 0x2210 */ Struct_8010EAA0* unk_2210;
     /* 0x2214 */ UNK_TYPE1 unk_2214[0x1FC];
-} PlayState; // size = 0x2410
+} Game_Play; // size = 0x2410
 
-void play_init(GameState* gameState);
-void play_cleanup(GameState* gameState);
+void play_init(Game* gameState);
+void play_cleanup(Game* gameState);
 
 #endif
diff --git a/src/overlays/gamestates/ovl_player_select/player_select.h b/src/overlays/gamestates/ovl_player_select/player_select.h
index dc5f3ff..f526b7f 100644
--- a/src/overlays/gamestates/ovl_player_select/player_select.h
+++ b/src/overlays/gamestates/ovl_player_select/player_select.h
@@ -5,12 +5,12 @@
 #include "game.h"
 #include "unk.h"
 
-typedef struct PlayerSelectState {
-    /* 0x00 */ GameState state;
+typedef struct Game_PlayerSelect {
+    /* 0x00 */ Game state;
     /* 0xE0 */ UNK_TYPE1 unk_00[0x288-0xE0];
-} PlayerSelectState; // size = 0x288
+} Game_PlayerSelect; // size = 0x288
 
-void player_select_init(GameState *thisx);
-void player_select_cleanup(GameState *thisx);
+void player_select_init(Game *thisx);
+void player_select_cleanup(Game *thisx);
 
 #endif
diff --git a/src/overlays/gamestates/ovl_prenmi/m_prenmi.h b/src/overlays/gamestates/ovl_prenmi/m_prenmi.h
index 4f7622e..f0eaf8c 100644
--- a/src/overlays/gamestates/ovl_prenmi/m_prenmi.h
+++ b/src/overlays/gamestates/ovl_prenmi/m_prenmi.h
@@ -5,12 +5,12 @@
 #include "game.h"
 #include "unk.h"
 
-typedef struct PrenmiState {
-    /* 0x00 */ GameState state;
+typedef struct Game_Prenmi {
+    /* 0x00 */ Game state;
     /* 0xE0 */ UNK_TYPE1 unk00[0xE8 - 0xE0];
-} PrenmiState; // size = 0xE8
+} Game_Prenmi; // size = 0xE8
 
-void prenmi_init(GameState *thisx);
-void prenmi_cleanup(GameState *thisx);
+void prenmi_init(Game *thisx);
+void prenmi_cleanup(Game *thisx);
 
 #endif
diff --git a/src/overlays/gamestates/ovl_save_menu/save_menu.h b/src/overlays/gamestates/ovl_save_menu/save_menu.h
index 92b4d67..4be98dd 100644
--- a/src/overlays/gamestates/ovl_save_menu/save_menu.h
+++ b/src/overlays/gamestates/ovl_save_menu/save_menu.h
@@ -5,12 +5,12 @@
 #include "game.h"
 #include "unk.h"
 
-typedef struct SaveMenuState {
-    /* 0x00 */ GameState state;
+typedef struct Game_SaveMenu {
+    /* 0x00 */ Game state;
     /* 0xE0 */ UNK_TYPE1 unk_00[0x230-0xE0];
-} SaveMenuState; // size = 0x230
+} Game_SaveMenu; // size = 0x230
 
-void save_menu_init(GameState *thisx);
-void save_menu_cleanup(GameState *thisx);
+void save_menu_init(Game *thisx);
+void save_menu_cleanup(Game *thisx);
 
 #endif
diff --git a/src/overlays/gamestates/ovl_second_game/second_game.h b/src/overlays/gamestates/ovl_second_game/second_game.h
index 50478ff..dd70975 100644
--- a/src/overlays/gamestates/ovl_second_game/second_game.h
+++ b/src/overlays/gamestates/ovl_second_game/second_game.h
@@ -5,11 +5,11 @@
 #include "game.h"
 #include "unk.h"
 
-typedef struct SecondGameState {
-    /* 0x00 */ GameState state;
-} SecondGameState; // size = 0xE0
+typedef struct Game_SecondGame {
+    /* 0x00 */ Game state;
+} Game_SecondGame; // size = 0xE0
 
-void second_game_init(GameState *thisx);
-void second_game_cleanup(GameState *thisx);
+void second_game_init(Game *thisx);
+void second_game_cleanup(Game *thisx);
 
 #endif
diff --git a/src/overlays/gamestates/ovl_select/m_select.h b/src/overlays/gamestates/ovl_select/m_select.h
index 1f4c713..ccfcfb3 100644
--- a/src/overlays/gamestates/ovl_select/m_select.h
+++ b/src/overlays/gamestates/ovl_select/m_select.h
@@ -5,12 +5,12 @@
 #include "game.h"
 #include "unk.h"
 
-typedef struct MapSelectState {
-    /* 0x00 */ GameState state;
+typedef struct Game_Select {
+    /* 0x00 */ Game state;
     /* 0xE0 */ UNK_TYPE1 unk_00[0x240-0xE0];
-} MapSelectState; // size = 0x240
+} Game_Select; // size = 0x240
 
-void select_init(GameState *thisx);
-void select_cleanup(GameState *thisx);
+void select_init(Game *thisx);
+void select_cleanup(Game *thisx);
 
 #endif
diff --git a/src/overlays/gamestates/ovl_trademark/m_trademark.h b/src/overlays/gamestates/ovl_trademark/m_trademark.h
index 708c98a..5bce862 100644
--- a/src/overlays/gamestates/ovl_trademark/m_trademark.h
+++ b/src/overlays/gamestates/ovl_trademark/m_trademark.h
@@ -5,12 +5,12 @@
 #include "game.h"
 #include "unk.h"
 
-typedef struct TrademarkState {
-    /* 0x00 */ GameState state;
+typedef struct Game_Trademark {
+    /* 0x00 */ Game state;
     /* 0xE0 */ UNK_TYPE1 unk_00[0x25A78-0xE0];
-} TrademarkState; // size = 0x25A78
+} Game_Trademark; // size = 0x25A78
 
-void trademark_init(GameState *thisx);
-void trademark_cleanup(GameState *thisx);
+void trademark_init(Game *thisx);
+void trademark_cleanup(Game *thisx);
 
 #endif
diff --git a/tools/actor_bootstraper.py b/tools/actor_bootstraper.py
index a50f588..41143eb 100755
--- a/tools/actor_bootstraper.py
+++ b/tools/actor_bootstraper.py
@@ -32,7 +32,7 @@ with profiles_txt.open() as f:
 def funcToDecl(func):
     if func == "NULL" or func == "none_proc1":
         return ""
-    return f"void {func}(Actor* thisx, PlayState* play);\n"
+    return f"void {func}(Actor* thisx, Game_Play* game_play);\n"
 
 def funcToProf(func):
     if func == "none_proc1":
@@ -751,11 +751,11 @@ for profName, (filepath, prof) in n64Profiles.items():
         f.write('#include "unk.h"\n')
         f.write('\n')
 
-        f.write(f"struct PlayState;\n")
+        f.write(f"struct Game_Play;\n")
         f.write(f"struct {structName};\n")
         f.write('\n')
 
-        f.write(f"typedef void (*{structName}ActionFunc)(struct {structName}*, struct PlayState*);\n")
+        f.write(f"typedef void (*{structName}ActionFunc)(struct {structName}*, struct Game_Play*);\n")
         f.write("\n")
 
         f.write(f"typedef struct {structName} {{\n")
author	Anghelo Carvajal <angheloalf95@gmail.com>	2023-08-17 12:19:13 -0400
committer	GitHub <noreply@github.com>	2023-08-17 09:19:13 -0700
commit	c65a8dbc3903af19fe0253ab8774accbc06b0cb7 (patch)
tree	8c136e0ecea87503261cdd22fc5b81cf31044f50
parent	1bebc761b638ad061778667e4bab4ec92fe81aa7 (diff)