diff options
Diffstat (limited to 'include')
34 files changed, 161 insertions, 161 deletions
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 |