diff options
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/jp/ignored_addresses.txt | 2 | ||||
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_assets.txt | 14 | ||||
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_code.txt | 24 | ||||
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_overlays.txt | 39 | ||||
| -rw-r--r-- | linker_scripts/jp/undefined_syms.ld | 8 |
5 files changed, 51 insertions, 36 deletions
diff --git a/linker_scripts/jp/ignored_addresses.txt b/linker_scripts/jp/ignored_addresses.txt index f6d2388..0069d07 100644 --- a/linker_scripts/jp/ignored_addresses.txt +++ b/linker_scripts/jp/ignored_addresses.txt @@ -43,4 +43,6 @@ D_6000140 = 0x06000140; // ignore:true D_6000180 = 0x06000180; // ignore:true D_6000220 = 0x06000220; // ignore:true D_60003E8 = 0x060003E8; // ignore:true +D_6000E78 = 0x06000E78; // ignore:true +D_6000F58 = 0x06000F58; // ignore:true D_6001B68 = 0x06001B68; // ignore:true diff --git a/linker_scripts/jp/symbol_addrs_assets.txt b/linker_scripts/jp/symbol_addrs_assets.txt index 9b11c49..eb5401a 100644 --- a/linker_scripts/jp/symbol_addrs_assets.txt +++ b/linker_scripts/jp/symbol_addrs_assets.txt @@ -1209,3 +1209,17 @@ tol_hata_01_evw_anime_1_anime_ptn = 0x60003D4; // segment:tol_hata_01 rom:0x1130 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_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 diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt index 8acac57..7e3a3f1 100644 --- a/linker_scripts/jp/symbol_addrs_code.txt +++ b/linker_scripts/jp/symbol_addrs_code.txt @@ -382,9 +382,9 @@ Camera2_getCenterPos_p = 0x800608DC; // type:func func_800608F0_jp = 0x800608F0; // type:func func_80060904_jp = 0x80060904; // type:func func_80060918_jp = 0x80060918; // type:func -func_80060970_jp = 0x80060970; // type:func +Camera2_CheckCullingMode = 0x80060970; // type:func func_80060A6C_jp = 0x80060A6C; // type:func -func_80060B18_jp = 0x80060B18; // type:func +Camera2_CheckEnterCullingArea = 0x80060B18; // type:func Camera2_ClearActorTalking_Cull = 0x80060CDC; // type:func func_80060D1C_jp = 0x80060D1C; // type:func func_80060D58_jp = 0x80060D58; // type:func @@ -799,7 +799,7 @@ func_80072BE8_jp = 0x80072BE8; // type:func func_80072C60_jp = 0x80072C60; // type:func mCoBG_SearchWaterLimitDistN = 0x80072CC4; // type:func func_80072E70_jp = 0x80072E70; // type:func -func_80072F9C_jp = 0x80072F9C; // type:func +mCoBG_GetBalloonGroundY = 0x80072F9C; // type:func func_800730C8_jp = 0x800730C8; // type:func func_800731A8_jp = 0x800731A8; // type:func func_800732DC_jp = 0x800732DC; // type:func @@ -1314,9 +1314,9 @@ func_80088270_jp = 0x80088270; // type:func func_800882AC_jp = 0x800882AC; // type:func func_800882FC_jp = 0x800882FC; // type:func func_80088320_jp = 0x80088320; // type:func -func_80088344_jp = 0x80088344; // type:func +mFI_Wpos2UtNum = 0x80088344; // type:func func_80088458_jp = 0x80088458; // type:func -func_800884E0_jp = 0x800884E0; // type:func +mFI_Wpos2UtCenterWpos = 0x800884E0; // type:func func_800885A8_jp = 0x800885A8; // type:func mFI_Wpos2BlockNum = 0x80088710; // type:func mFI_Wpos2BkandUtNuminBlock = 0x80088780; // type:func @@ -1590,8 +1590,8 @@ func_80092538_jp = 0x80092538; // type:func mFont_UnintToString = 0x8009264C; // type:func Balloon_init = 0x800928C0; // type:func Balloon_move = 0x800928E8; // type:func -func_80092B7C_jp = 0x80092B7C; // type:func -func_80092B8C_jp = 0x80092B8C; // type:func +Balloon_kill = 0x80092B7C; // type:func +Balloon_look_up = 0x80092B8C; // type:func func_80092BA0_jp = 0x80092BA0; // type:func func_80092BE8_jp = 0x80092BE8; // type:func mHsRm_GetHuusuiRoom = 0x80092C2C; // type:func @@ -1739,8 +1739,8 @@ Global_kankyo_set = 0x800984CC; // type:func mEnv_DecideWindDirect = 0x80098558; // type:func func_8009867C_jp = 0x8009867C; // type:func mEnv_RandomWeather = 0x80098794; // type:func -func_8009895C_jp = 0x8009895C; // type:func -func_80098980_jp = 0x80098980; // type:func +mEnv_GetWindAngleS = 0x8009895C; // type:func +mEnv_GetWindPowerF = 0x80098980; // type:func func_80098990_jp = 0x80098990; // type:func func_80098A90_jp = 0x80098A90; // type:func mEnv_WindMove = 0x80098B50; // type:func @@ -2660,8 +2660,8 @@ func_800B5AA0_jp = 0x800B5AA0; // type:func func_800B5AB8_jp = 0x800B5AB8; // type:func func_800B5B1C_jp = 0x800B5B1C; // type:func func_800B5B70_jp = 0x800B5B70; // type:func -func_800B5BC0_jp = 0x800B5BC0; // type:func -func_800B5C10_jp = 0x800B5C10; // type:func +mPlib_Check_tree_shaken_little = 0x800B5BC0; // type:func +mPlib_Check_tree_shaken_big = 0x800B5C10; // type:func func_800B5C60_jp = 0x800B5C60; // type:func func_800B5CD4_jp = 0x800B5CD4; // type:func func_800B5D34_jp = 0x800B5D34; // type:func @@ -4639,7 +4639,7 @@ D_80106D64_jp = 0x80106D64; // D_80106D78_jp = 0x80106D78; // D_80106D8C_jp = 0x80106D8C; // D_80106DA0_jp = 0x80106DA0; // -D_80106E10_jp = 0x80106E10; // +fuusen_DEBUG_mode_flag = 0x80106E10; // game_dlftbls = 0x80106E20; // type:GameStateOverlay size:0x1E0 game_dlftbls_num = 0x80107000; // size:0x4 diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt index cb67799..079ea80 100644 --- a/linker_scripts/jp/symbol_addrs_overlays.txt +++ b/linker_scripts/jp/symbol_addrs_overlays.txt @@ -21577,15 +21577,15 @@ D_80AAD064_jp = 0x80AAD064; // aFSN_actor_ct = 0x80AAD0E0; // type:func aFSN_actor_dt = 0x80AAD230; // type:func -func_80AAD270_jp = 0x80AAD270; // type:func -func_80AAD490_jp = 0x80AAD490; // type:func -func_80AAD4A0_jp = 0x80AAD4A0; // type:func -func_80AAD4DC_jp = 0x80AAD4DC; // type:func -func_80AAD580_jp = 0x80AAD580; // type:func -func_80AAD5A4_jp = 0x80AAD5A4; // type:func -func_80AADB9C_jp = 0x80AADB9C; // type:func -func_80AADDA8_jp = 0x80AADDA8; // type:func -func_80AADEC4_jp = 0x80AADEC4; // type:func +aFSN_birth_init = 0x80AAD270; // type:func +aFSN_moving_init = 0x80AAD490; // type:func +aFSN_wood_stop_init = 0x80AAD4A0; // type:func +aFSN_escape_init = 0x80AAD4DC; // type:func +aFSN_birth = 0x80AAD580; // type:func +aFSN_moving = 0x80AAD5A4; // type:func +aFSN_wood_stop = 0x80AADB9C; // type:func +aFSN_escape = 0x80AADDA8; // type:func +aFSN_setupAction = 0x80AADEC4; // type:func func_80AADF10_jp = 0x80AADF10; // type:func aFSN_actor_move = 0x80AADF9C; // type:func func_80AAE10C_jp = 0x80AAE10C; // type:func @@ -21594,17 +21594,16 @@ aFSN_actor_draw = 0x80AAE198; // type:func // .data Fuusen_Profile = 0x80AAE4B0; // -D_80AAE4D4_jp = 0x80AAE4D4; // -D_80AAE4E0_jp = 0x80AAE4E0; // -D_80AAE520_jp = 0x80AAE520; // -D_FLT_80AAE580_jp = 0x80AAE580; // type:f32 -D_FLT_80AAE588_jp = 0x80AAE588; // type:f32 -D_80AAE5E0_jp = 0x80AAE5E0; // type:u8 -D_80AAE5F4_jp = 0x80AAE5F4; // type:u8 -D_80AAE608_jp = 0x80AAE608; // type:s16 -D_80AAE614_jp = 0x80AAE614; // -D_80AAE624_jp = 0x80AAE624; // -D_80AAE634_jp = 0x80AAE634; // +Init_Size = 0x80AAE4D4; // +data_index_data = 0x80AAE4E0; // +birth_pos_data = 0x80AAE520; // +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 d008fe5..f9af915 100644 --- a/linker_scripts/jp/undefined_syms.ld +++ b/linker_scripts/jp/undefined_syms.ld @@ -5556,10 +5556,10 @@ D_6000D50 = 0x06000D50; // ovl_Fuusen -D_4009580 = 0x04009580; -D_4009620 = 0x04009620; -D_6000F44 = 0x06000F44; -D_6000F88 = 0x06000F88; +present_DL_mode = 0x04009580; +present_DL_vtx = 0x04009620; +cKF_ba_r_act_balloon = 0x06000F44; +cKF_bs_r_act_balloon = 0x06000F88; // ovl__0096E8E0 |