diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/683030.h | 4 | ||||
| -rw-r--r-- | include/code_variables.h | 2 | ||||
| -rw-r--r-- | include/m_actor.h | 1 | ||||
| -rw-r--r-- | include/m_clip.h | 5 | ||||
| -rw-r--r-- | include/m_collision_bg.h | 2 | ||||
| -rw-r--r-- | include/m_field_info.h | 4 | ||||
| -rw-r--r-- | include/m_handbill.h | 4 | ||||
| -rw-r--r-- | include/m_kankyo.h | 4 | ||||
| -rw-r--r-- | include/m_player_lib.h | 4 | ||||
| -rw-r--r-- | include/tables/dmatables/dmadata_table_jp.h | 2 | ||||
| -rw-r--r-- | include/tables/object_table.h | 2 |
11 files changed, 20 insertions, 14 deletions
diff --git a/include/683030.h b/include/683030.h index a20a1c3..8e0cf17 100644 --- a/include/683030.h +++ b/include/683030.h @@ -48,9 +48,9 @@ xyz_t* Camera2_getCenterPos_p(void); // void func_800608F0_jp(); // void func_80060904_jp(); // void func_80060918_jp(); -// void func_80060970_jp(); +s32 Camera2_CheckCullingMode(void); // void func_80060A6C_jp(); -// void func_80060B18_jp(); +s32 Camera2_CheckEnterCullingArea(f32, f32, f32); void Camera2_ClearActorTalking_Cull(struct Game_Play* game_play); // void func_80060D1C_jp(); // void func_80060D58_jp(); diff --git a/include/code_variables.h b/include/code_variables.h index 68794be..ef7a780 100644 --- a/include/code_variables.h +++ b/include/code_variables.h @@ -459,7 +459,7 @@ extern s32 CanLookGokiCount; // extern UNK_TYPE D_80106D78_jp; // extern UNK_TYPE D_80106D8C_jp; // extern UNK_TYPE D_80106DA0_jp; -// extern UNK_TYPE D_80106E10_jp; +extern s32 fuusen_DEBUG_mode_flag; // extern UNK_TYPE D_80107010_jp; // extern UNK_TYPE D_80107020_jp; diff --git a/include/m_actor.h b/include/m_actor.h index bb52865..0096964 100644 --- a/include/m_actor.h +++ b/include/m_actor.h @@ -6,6 +6,7 @@ #include "m_collision_bg.h" #include "z64math.h" #include "unk.h" +#include "m_collision_bg.h" struct Actor; struct Game_Play; diff --git a/include/m_clip.h b/include/m_clip.h index 844ee70..69c34d1 100644 --- a/include/m_clip.h +++ b/include/m_clip.h @@ -86,10 +86,15 @@ typedef struct Clip_unk_070 { typedef UNK_RET (*Clip_unk_074_unk_00)(UNK_TYPE); typedef void (*Clip_unk_074_unk_04)(struct Game_Play* game_play, struct ShadowData* shadowData, s16 unk2); +typedef void (*Clip_unk_074_unk_30)(UNK_TYPE, UNK_TYPE, UNK_TYPE, UNK_TYPE); typedef struct Clip_unk_074 { /* 0x00 */ Clip_unk_074_unk_00 unk_00; /* 0x04 */ Clip_unk_074_unk_04 unk_04; + /* 0x08 */ UNK_TYPE1 unk_08[0x28]; + /* 0x30 */ Clip_unk_074_unk_30 unk_30; + /* 0x34 */ UNK_TYPE1 unk_34[0x4]; + /* 0x38 */ s32 unk_38; } Clip_unk_074; // size >= 0x8 typedef void (*Clip_unk_07C_unk_4)(struct ObjectExchangeBank*); diff --git a/include/m_collision_bg.h b/include/m_collision_bg.h index c3463b6..6080ba5 100644 --- a/include/m_collision_bg.h +++ b/include/m_collision_bg.h @@ -248,7 +248,7 @@ s32 func_8007244C_jp(u32); // void func_80072C60_jp(); s32 mCoBG_SearchWaterLimitDistN(UNK_TYPE* arg0, xyz_t arg1, s16 arg4, f32 arg5, s32 arg6); // void func_80072E70_jp(); -// void func_80072F9C_jp(); +f32 mCoBG_GetBalloonGroundY(xyz_t*); // void func_800730C8_jp(); // void func_800731A8_jp(); // void func_800732DC_jp(); diff --git a/include/m_field_info.h b/include/m_field_info.h index e2b4e5e..b47d9f4 100644 --- a/include/m_field_info.h +++ b/include/m_field_info.h @@ -57,9 +57,9 @@ s32 mFI_GetBlockZMax(void); // void func_800882AC_jp(); // void func_800882FC_jp(); // void func_80088320_jp(); -// void func_80088344_jp(); +s32 mFI_Wpos2UtNum(s32*, s32*, xyz_t); // void func_80088458_jp(); -// void func_800884E0_jp(); +s32 mFI_Wpos2UtCenterWpos(xyz_t*, xyz_t); // void func_800885A8_jp(); s32 mFI_Wpos2BlockNum(s32*, s32*, xyz_t); s32 mFI_Wpos2BkandUtNuminBlock(s32*,s32*, s32* ,s32* ,xyz_t); diff --git a/include/m_handbill.h b/include/m_handbill.h index 7bf4641..fe15111 100644 --- a/include/m_handbill.h +++ b/include/m_handbill.h @@ -26,8 +26,8 @@ typedef struct HandbillzInfo { //TODO: move these out of the handbill header 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 Balloon_kill(void); +void Balloon_look_up(void); // void func_80092BA0_jp(); // void func_80092BE8_jp(); void mHsRm_GetHuusuiRoom(struct Game* game_play, s32 player_no); diff --git a/include/m_kankyo.h b/include/m_kankyo.h index b640d21..109586e 100644 --- a/include/m_kankyo.h +++ b/include/m_kankyo.h @@ -61,8 +61,8 @@ void Global_kankyo_set(struct Game_Play* game_play, struct Kankyo* kankyo, struc void mEnv_DecideWindDirect(struct s_xyz*, s16,s16); // void func_8009867C_jp(); void mEnv_RandomWeather(s16*, s16*); -// void func_8009895C_jp(); -// void func_80098980_jp(); +s16 mEnv_GetWindAngleS(void); +f32 mEnv_GetWindPowerF(void); // void func_80098990_jp(); // void func_80098A90_jp(); void mEnv_WindMove(void); diff --git a/include/m_player_lib.h b/include/m_player_lib.h index acdffe9..d0a5ab7 100644 --- a/include/m_player_lib.h +++ b/include/m_player_lib.h @@ -165,8 +165,8 @@ void func_800B594C_jp(void); // void func_800B5AB8_jp(); // void func_800B5B1C_jp(); // void func_800B5B70_jp(); -// void func_800B5BC0_jp(); -// void func_800B5C10_jp(); +s32 mPlib_Check_tree_shaken_little(xyz_t*); +s32 mPlib_Check_tree_shaken_big(xyz_t*); // void func_800B5C60_jp(); // void func_800B5CD4_jp(); // void func_800B5D34_jp(); diff --git a/include/tables/dmatables/dmadata_table_jp.h b/include/tables/dmatables/dmadata_table_jp.h index dc07943..9528409 100644 --- a/include/tables/dmatables/dmadata_table_jp.h +++ b/include/tables/dmatables/dmadata_table_jp.h @@ -2307,7 +2307,7 @@ DEFINE_DMA_ENTRY(segment_011F1000, "segment_011F1000") DEFINE_DMA_ENTRY(segment_011F2000, "segment_011F2000") DEFINE_DMA_ENTRY(segment_011F3000, "segment_011F3000") DEFINE_DMA_ENTRY(object_011F4000, "object_011F4000") -DEFINE_DMA_ENTRY(object_011F5000, "object_011F5000") +DEFINE_DMA_ENTRY(act_balloon, "act_balloon") DEFINE_DMA_ENTRY(segment_011F6000, "segment_011F6000") DEFINE_DMA_ENTRY(segment_011F8000, "segment_011F8000") DEFINE_DMA_ENTRY(segment_011FA000, "segment_011FA000") diff --git a/include/tables/object_table.h b/include/tables/object_table.h index ee4f5fb..3ae62d5 100644 --- a/include/tables/object_table.h +++ b/include/tables/object_table.h @@ -410,7 +410,7 @@ /* 0x18D */ DEFINE_OBJECT(object_00F48000, OBJECT_397) /* 0x18E */ DEFINE_OBJECT(object_00FD6000, OBJECT_398) /* 0x18F */ DEFINE_OBJECT(object_00FD9000, OBJECT_399) -/* 0x190 */ DEFINE_OBJECT(object_011F5000, OBJECT_400) +/* 0x190 */ DEFINE_OBJECT(act_balloon, OBJECT_ACT_BALLOON) /* 0x191 */ DEFINE_OBJECT_UNSET(OBJECT_UNSET_401) /* 0x192 */ DEFINE_OBJECT_UNSET(OBJECT_UNSET_402) /* 0x193 */ DEFINE_OBJECT_UNSET(OBJECT_UNSET_403) |