ac_bee OK (#175)

* ac_bee OK

* fix warning

* change sAdo_OngenPos back

* and in code..

* fix linker script stuff

5 files changed, 14 insertions, 12 deletions

diff --git a/include/m_clip.h b/include/m_clip.h
index 69c34d1..b096d4f 100644
--- a/include/m_clip.h
+++ b/include/m_clip.h
@@ -17,6 +17,7 @@ struct FurnitureActor;
 struct WeatherClip;
 struct ObjectExchangeBank;
 struct xyz_t;
+struct Clip_unk_07C_unk_0_arg0;
 
 typedef UNK_RET (*Clip_unk_040_unk_04)(struct ActorOverlay*, const u8*, size_t, s32);
 typedef UNK_RET (*Clip_unk_040_unk_08)(void);
@@ -97,9 +98,10 @@ typedef struct Clip_unk_074 {
     /* 0x38 */ s32 unk_38;
 } Clip_unk_074; // size >= 0x8
 
+typedef UNK_RET (*Clip_unk_07C_unk_0)(struct Clip_unk_07C_unk_0_arg0*, UNK_TYPE);
 typedef void (*Clip_unk_07C_unk_4)(struct ObjectExchangeBank*);
 typedef struct Clip_unk_07C {
-    /* 0x00 */ s8 unk_0[0x4];
+    /* 0x00 */ Clip_unk_07C_unk_0 unk_0;
     /* 0x04 */ Clip_unk_07C_unk_4 unk_4;
 } Clip_unk_07C; // size >= 0x8
 typedef void (*Clip_unk_080_unk_24)(void);
diff --git a/include/m_common_data.h b/include/m_common_data.h
index b872666..20758c6 100644
--- a/include/m_common_data.h
+++ b/include/m_common_data.h
@@ -165,7 +165,7 @@ typedef struct CommonData {
     /* 0x109F8 */ u8 unk109F8;
     /* 0x109FC */ s8 unk109F9[0x3F];
     /* 0x10A38 */ s8 beeStingFlag;
-    /* 0x10A39 */ UNK_TYPE1 unk_10A39[0x1];
+    /* 0x10A39 */ s8 unk_10A39;
     /* 0x10A3A */ u8 gokiShockedFlag;
     /* 0x10A3B */ UNK_TYPE1 unk_10A3B[0x1];
     /* 0x10A3C */ UNK_TYPE1 unk_10A3C[0x2C];
diff --git a/include/m_player_lib.h b/include/m_player_lib.h
index d0a5ab7..057ea84 100644
--- a/include/m_player_lib.h
+++ b/include/m_player_lib.h
@@ -42,7 +42,7 @@ void mPlib_Object_Exchange_keep_Player_dt(struct Game_Play* game_play);
 // void func_800B1BE8_jp();
 struct Player* get_player_actor_withoutCheck(struct Game_Play* game_play);
 // void func_800B1C90_jp();
-// void func_800B1CBC_jp();
+s32 func_800B1CBC_jp(Game_Play*);
 // void func_800B1CE0_jp();
 // void func_800B1D14_jp();
 // void func_800B1D40_jp();
@@ -89,7 +89,7 @@ void mPlib_request_main_invade_type1(struct Game_Play*);
 // void func_800B2A04_jp();
 // void func_800B2A48_jp();
 // void func_800B2A8C_jp();
-// void func_800B2AD0_jp();
+void func_800B2AD0_jp(Game_Play*);
 // void func_800B2B08_jp();
 // void func_800B2B60_jp();
 // void func_800B2BA0_jp();
@@ -133,9 +133,9 @@ s32 mPlib_check_player_open_umbrella(struct Game_Play* game_play);
 // void func_800B3A74_jp();
 // void func_800B3A84_jp();
 // void func_800B3AD4_jp();
-// void func_800B3B24_jp();
-// void func_800B3B74_jp();
-// void func_800B3BBC_jp();
+s32 func_800B3B24_jp(xyz_t*);
+Actor* func_800B3B74_jp(void);
+s32 func_800B3BBC_jp(s32, s32);
 // void func_800B3C14_jp();
 // void func_800B3C64_jp();
 // void func_800B3CB4_jp();
@@ -149,8 +149,8 @@ s32 mPlib_check_player_open_umbrella(struct Game_Play* game_play);
 // void func_800B5620_jp();
 // void func_800B5678_jp();
 void mPlib_Set_able_hand_all_item_in_demo(s8 arg0);
-// void func_800B56D0_jp();
-// void func_800B5718_jp();
+s32 func_800B56D0_jp(void);
+s32 func_800B5718_jp(void);
 // void func_800B5760_jp();
 // void func_800B579C_jp();
 // void func_800B57D8_jp();
@@ -173,7 +173,7 @@ s32 mPlib_Check_tree_shaken_big(xyz_t*);
 // void func_800B5DA8_jp();
 // void func_800B5DEC_jp();
 // void func_800B5E30_jp();
-// void func_800B5EA4_jp();
+s32 func_800B5EA4_jp(Game_Play*);
 // void func_800B5F18_jp();
 // void func_800B5FD0_jp();
 // void func_800B6074_jp();
diff --git a/include/tables/dmatables/dmadata_table_jp.h b/include/tables/dmatables/dmadata_table_jp.h
index 9528409..a461b89 100644
--- a/include/tables/dmatables/dmadata_table_jp.h
+++ b/include/tables/dmatables/dmadata_table_jp.h
@@ -2306,7 +2306,7 @@ DEFINE_DMA_ENTRY(segment_011F0000, "segment_011F0000")
 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(act_bee, "act_bee")
 DEFINE_DMA_ENTRY(act_balloon, "act_balloon")
 DEFINE_DMA_ENTRY(segment_011F6000, "segment_011F6000")
 DEFINE_DMA_ENTRY(segment_011F8000, "segment_011F8000")
diff --git a/include/tables/object_table.h b/include/tables/object_table.h
index 3ae62d5..c091d92 100644
--- a/include/tables/object_table.h
+++ b/include/tables/object_table.h
@@ -402,7 +402,7 @@
 /* 0x185 */ DEFINE_OBJECT(object_010AA000, OBJECT_389)
 /* 0x186 */ DEFINE_OBJECT(object_010AC000, OBJECT_390)
 /* 0x187 */ DEFINE_OBJECT(tol_tamaire, OBJECT_TOL_TAMAIRE)
-/* 0x188 */ DEFINE_OBJECT(object_011F4000, OBJECT_392)
+/* 0x188 */ DEFINE_OBJECT(act_bee, OBJECT_ACT_BEE)
 /* 0x189 */ DEFINE_OBJECT_UNSET(OBJECT_UNSET_393)
 /* 0x18A */ DEFINE_OBJECT(object_01106000, OBJECT_394)
 /* 0x18B */ DEFINE_OBJECT(tol_cracker_1, OBJECT_TOL_CRACKER_1)