ac_bee OK (#175)

* ac_bee OK

* fix warning

* change sAdo_OngenPos back

* and in code..

* fix linker script stuff

3 files changed, 29 insertions, 31 deletions

diff --git a/linker_scripts/jp/symbol_addrs_assets.txt b/linker_scripts/jp/symbol_addrs_assets.txt
index eb5401a..d092978 100644
--- a/linker_scripts/jp/symbol_addrs_assets.txt
+++ b/linker_scripts/jp/symbol_addrs_assets.txt
@@ -1210,16 +1210,29 @@ tol_hata_01_evw_anime_1 = 0x60003D8; // segment:tol_hata_01 rom:0x11303D8
 tol_hata_01_evw_anime_2 = 0x60003E8; // segment:tol_hata_01 rom:0x11303E8
 tol_hata_01_evw_anime = 0x60003F0; // segment:tol_hata_01 rom:0x11303F0
 
+act_bee_v = 0x6000000; // segment:act_bee rom:0x11F4000 size:0x3A0
+act_bee_C_model = 0x60003A0; // segment:act_bee rom:0x11F43A0
+act_bee_B_model = 0x60004B8; // segment:act_bee rom:0x11F44B8
+act_bee_A_model = 0x60005B0; // segment:act_bee rom:0x11F45B0
+act_bee_tex_txt = 0x60006A8; // segment:act_bee rom:0x11F46A8
+cKF_ckcb_r_act_bee_tbl = 0x60008A8; // segment:act_bee rom:0x11F48A8
+cKF_kn_act_bee_tbl = 0x60008AC; // segment:act_bee rom:0x11F48AC
+cKF_c_act_bee_tbl = 0x60008B0; // segment:act_bee rom:0x11F48B0
+cKF_ds_act_bee_tbl = 0x60008CC; // segment:act_bee rom:0x11F48CC
+cKF_ba_r_act_bee = 0x60008E4; // segment:act_bee rom:0x11F48E4
+cKF_je_r_act_bee_tbl = 0x60008F8; // segment:act_bee rom:0x11F48F8
+cKF_bs_r_act_bee = 0x6000928; // segment:act_bee rom:0x11F4928
+
 act_balloon_v = 0x6000000; // segment:act_balloon rom:0x11F5000 size:0x340
 act_balloon_head_model = 0x6000340; // segment:act_balloon rom:0x11F5340
 act_balloon_wireB_model = 0x6000450; // segment:act_balloon rom:0x11F5450
 act_balloon_wireA_model = 0x6000560; // segment:act_balloon rom:0x11F5560
 act_balloon_wire_tex_txt = 0x60005F8; // segment:act_balloon rom:0x11F55F8
 act_balloon_head_tex_rgb_ia16 = 0x6000678; // segment:act_balloon rom:0x11F5678
-cKF_ckcb_r_act_balloon_tbl = 0x60000E78; // segment:act_balloon rom:0x11F5E78
-cKF_kn_act_balloon_tbl = 0x60000E7C; // segment:act_balloon rom:0x11F5E7C
-cKF_c_act_balloon_tbl = 0x60000E88; // segment:act_balloon rom:0x11F5E88
-cKF_ds_act_balloon_tbl = 0x60000E9C; // segment:act_balloon rom:0x11F5E9C
-cKF_ba_r_act_balloon = 0x60000F44; // segment:act_balloon rom:0x11F5F44
-cKF_je_r_act_balloon_tbl = 0x60000F58; // segment:act_balloon rom:0x11F5F58
-cKF_bs_r_act_balloon = 0x60000F88; // segment:act_balloon rom:0x11F5F88
+cKF_ckcb_r_act_balloon_tbl = 0x6000E78; // segment:act_balloon rom:0x11F5E78
+cKF_kn_act_balloon_tbl = 0x6000E7C; // segment:act_balloon rom:0x11F5E7C
+cKF_c_act_balloon_tbl = 0x6000E88; // segment:act_balloon rom:0x11F5E88
+cKF_ds_act_balloon_tbl = 0x6000E9C; // segment:act_balloon rom:0x11F5E9C
+cKF_ba_r_act_balloon = 0x6000F44; // segment:act_balloon rom:0x11F5F44
+cKF_je_r_act_balloon_tbl = 0x6000F58; // segment:act_balloon rom:0x11F5F58
+cKF_bs_r_act_balloon = 0x6000F88; // segment:act_balloon rom:0x11F5F88
diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt
index 079ea80..5f2e06e 100644
--- a/linker_scripts/jp/symbol_addrs_overlays.txt
+++ b/linker_scripts/jp/symbol_addrs_overlays.txt
@@ -20294,13 +20294,13 @@ obj_e_koinobori_b_pal = 0x80A93AD4; //
 
 aBEE_actor_ct = 0x80A93CC0; // type:func
 func_80A93DD0_jp = 0x80A93DD0; // type:func
-func_80A93DE0_jp = 0x80A93DE0; // type:func
+aBEE_appear_init = 0x80A93DE0; // type:func
 func_80A93E38_jp = 0x80A93E38; // type:func
-func_80A93E48_jp = 0x80A93E48; // type:func
-func_80A93E6C_jp = 0x80A93E6C; // type:func
+aBEE_disappear_init = 0x80A93E48; // type:func
+aBEE_appear = 0x80A93E6C; // type:func
 func_80A93EFC_jp = 0x80A93EFC; // type:func
-func_80A94408_jp = 0x80A94408; // type:func
-func_80A94450_jp = 0x80A94450; // type:func
+aBEE_disappear = 0x80A94408; // type:func
+aBEE_setupAction = 0x80A94450; // type:func
 func_80A9449C_jp = 0x80A9449C; // type:func
 aBEE_actor_move = 0x80A94528; // type:func
 aBEE_actor_draw = 0x80A94788; // type:func
@@ -20308,12 +20308,10 @@ aBEE_actor_draw = 0x80A94788; // type:func
 // .data
 
 Bee_Profile = 0x80A94950; //
-D_80A94974_jp = 0x80A94974; //
-D_80A94980_jp = 0x80A94980; //
-D_80A9498C_jp = 0x80A9498C; //
-D_80A94998_jp = 0x80A94998; //
-D_80A949A4_jp = 0x80A949A4; //
-D_80A949B0_jp = 0x80A949B0; //
+InitSize = 0x80A94974; //
+Size_data = 0x80A94980; //
+SizeFraction = 0x80A949A4; //
+SizeStep = 0x80A949B0; //
 
 // .rodata
 
@@ -21601,8 +21599,6 @@ birth_pos_random_data = 0x80AAE580; // type:f32
 balloon_prim_data = 0x80AAE5E0; // type:u8
 balloon_env_data = 0x80AAE5F4; // type:u8
 senkou_check_data = 0x80AAE608; // type:s16
-init_proc = 0x80AAE614; //
-act_proc = 0x80AAE624; //
 offset0 = 0x80AAE634; //
 
 // .rodata
diff --git a/linker_scripts/jp/undefined_syms.ld b/linker_scripts/jp/undefined_syms.ld
index f9af915..70cb5ef 100644
--- a/linker_scripts/jp/undefined_syms.ld
+++ b/linker_scripts/jp/undefined_syms.ld
@@ -1137,10 +1137,6 @@ D_60000C0 = 0x060000C0;
 
 D_60000B0 = 0x060000B0;
 
-// ovl_Ball
-
-D_6000708 = 0x06000708;
-
 // ovl_Haniwa
 
 D_60018AC = 0x060018AC;
@@ -4933,11 +4929,6 @@ D_6000020 = 0x06000020;
 D_6000CF0 = 0x06000CF0;
 D_6000E50 = 0x06000E50;
 
-// ovl_Bee
-
-D_60008E4 = 0x060008E4;
-D_6000928 = 0x06000928;
-
 // ovl__00954D30
 
 D_6000000 = 0x06000000;
@@ -5558,8 +5549,6 @@ D_6000D50 = 0x06000D50;
 
 present_DL_mode = 0x04009580;
 present_DL_vtx = 0x04009620;
-cKF_ba_r_act_balloon = 0x06000F44;
-cKF_bs_r_act_balloon = 0x06000F88;
 
 // ovl__0096E8E0