diff options
| author | inspectredc <78732756+inspectredc@users.noreply.github.com> | 2024-04-16 00:19:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-15 16:19:43 -0700 |
| commit | 7f426967efd07046bfbe791ed4e64808ae5a26e2 (patch) | |
| tree | 51014dee003a4e30ac6db96c640c66db13dc6d3f /linker_scripts/jp | |
| parent | 4ab3a1d9dcb76d80fe745dcbe79f3e925b8fac7e (diff) | |
ac_ball OK and documented (#173)
* ac_ball OK
* hopefully format
* address warnings
* Apply suggestions from code review
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
* suggestions pt2
---------
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
Diffstat (limited to 'linker_scripts/jp')
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_assets.txt | 20 | ||||
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_code.txt | 42 | ||||
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_overlays.txt | 40 |
3 files changed, 61 insertions, 41 deletions
diff --git a/linker_scripts/jp/symbol_addrs_assets.txt b/linker_scripts/jp/symbol_addrs_assets.txt index 3cc697d..9b11c49 100644 --- a/linker_scripts/jp/symbol_addrs_assets.txt +++ b/linker_scripts/jp/symbol_addrs_assets.txt @@ -874,6 +874,26 @@ cKF_ba_r_obj_w_windmill = 0x06092A24; // segment:object_00D5E000 rom:0xDF0A24 cKF_je_r_obj_w_windmill = 0x06092A38; // segment:object_00D5E000 rom:0xDF0A38 cKF_bs_r_obj_w_windmill = 0x06092A74; // segment:object_00D5E000 rom:0xDF0A74 +act_ball_b_v = 0x6000000; // segment:act_ball_b rom:0x1100000 size:0x1A0 +act_ball_b_modelT = 0x60001A0; // segment:act_ball_b rom:0x11001A0 +act_ball_b_model = 0x60001A8; // segment:act_ball_b rom:0x11001A8 +act_ball_b_pal = 0x6000318; // segment:act_ball_b rom:0x1100318 +act_ball_b_1_tex = 0x6000338; // segment:act_ball_b rom:0x1100338 + +act_ball_d_v = 0x6000000; // segment:act_ball_d rom:0x1101000 size:0x360 +act_ball_d_modelT = 0x6000360; // segment:act_ball_d rom:0x1101360 +act_ball_d_model = 0x6000368; // segment:act_ball_d rom:0x1101368 +act_ball_d_pal = 0x60005C8; // segment:act_ball_d rom:0x11015C8 +act_ball_d_1_tex = 0x60005E8; // segment:act_ball_d rom:0x11015E8 +act_ball_d_2_tex = 0x6000668; // segment:act_ball_d rom:0x1101668 +act_ball_d_3_tex = 0x60006E8; // segment:act_ball_d rom:0x11016E8 + +act_ball_s_v = 0x6000000; // segment:act_ball_s rom:0x1102000 size:0x700 +act_ball_s_modelT = 0x6000700; // segment:act_ball_s rom:0x1102700 +act_ball_s_model = 0x6000708; // segment:act_ball_s rom:0x1102708 +act_ball_s_pal = 0x60008B8; // segment:act_ball_s rom:0x11028B8 +act_ball_s_5_tex = 0x60008D8; // segment:act_ball_s rom:0x11028D8 + tol_umb_01_v = 0x6000000; // segment:tol_umb_01 rom:0x1107000 size:0x380 kasa_umb01_model = 0x6000380; // segment:tol_umb_01 rom:0x1107380 e_umb01_model = 0x6000448; // segment:tol_umb_01 rom:0x1107448 diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt index 30576ac..8acac57 100644 --- a/linker_scripts/jp/symbol_addrs_code.txt +++ b/linker_scripts/jp/symbol_addrs_code.txt @@ -771,7 +771,7 @@ mCoBG_GetBgY_AngleS_FromWpos = 0x80071884; // type:func func_80071A08_jp = 0x80071A08; // type:func func_80071AB8_jp = 0x80071AB8; // type:func mCoBG_GetBgY_OnlyCenter_FromWpos2 = 0x80071B78; // type:func -func_80071C1C_jp = 0x80071C1C; // type:func +mCoBG_GetBgNorm_FromWpos = 0x80071C1C; // type:func func_80071DB4_jp = 0x80071DB4; // type:func func_800721C8_jp = 0x800721C8; // type:func func_800721E4_jp = 0x800721E4; // type:func @@ -838,19 +838,19 @@ func_80075954_jp = 0x80075954; // type:func func_80075A10_jp = 0x80075A10; // type:func func_80075AB4_jp = 0x80075AB4; // type:func func_80075B28_jp = 0x80075B28; // type:func -func_80075EA0_jp = 0x80075EA0; // type:func +mCoBG_GetWaterHeight_File = 0x80075EA0; // type:func func_8007620C_jp = 0x8007620C; // type:func func_80076248_jp = 0x80076248; // type:func func_80076270_jp = 0x80076270; // type:func func_80076280_jp = 0x80076280; // type:func -func_80076290_jp = 0x80076290; // type:func +mCoBG_GetWaterFlow = 0x80076290; // type:func func_80076358_jp = 0x80076358; // type:func func_8007638C_jp = 0x8007638C; // type:func func_800763F0_jp = 0x800763F0; // type:func func_800763FC_jp = 0x800763FC; // type:func func_8007648C_jp = 0x8007648C; // type:func func_800764CC_jp = 0x800764CC; // type:func -func_800765AC_jp = 0x800765AC; // type:func +mCoBG_BgCheckControll = 0x800765AC; // type:func func_80076778_jp = 0x80076778; // type:func func_800768C8_jp = 0x800768C8; // type:func func_80076A04_jp = 0x80076A04; // type:func @@ -1303,8 +1303,8 @@ func_80087C9C_jp = 0x80087C9C; // type:func func_80087D30_jp = 0x80087D30; // type:func func_80087DC8_jp = 0x80087DC8; // type:func func_80087E14_jp = 0x80087E14; // type:func -func_80087E58_jp = 0x80087E58; // type:func -func_80087E94_jp = 0x80087E94; // type:func +mFI_GetBlockXMax = 0x80087E58; // type:func +mFI_GetBlockZMax = 0x80087E94; // type:func func_80087ED0_jp = 0x80087ED0; // type:func func_80088018_jp = 0x80088018; // type:func func_80088160_jp = 0x80088160; // type:func @@ -1328,7 +1328,7 @@ func_80088A58_jp = 0x80088A58; // type:func func_80088B3C_jp = 0x80088B3C; // type:func mFI_UtNum2PosXZInBk = 0x80088BC0; // type:func func_80088BFC_jp = 0x80088BFC; // type:func -func_80088C74_jp = 0x80088C74; // type:func +mFI_BkandUtNum2CenterWpos = 0x80088C74; // type:func func_80088CBC_jp = 0x80088CBC; // type:func func_80088CD0_jp = 0x80088CD0; // type:func func_80088CE4_jp = 0x80088CE4; // type:func @@ -1350,7 +1350,7 @@ func_800892CC_jp = 0x800892CC; // type:func func_8008930C_jp = 0x8008930C; // type:func func_80089348_jp = 0x80089348; // type:func func_800893C8_jp = 0x800893C8; // type:func -func_80089404_jp = 0x80089404; // type:func +mFI_CheckBlockKind_OR = 0x80089404; // type:func mFI_BlockKind2BkNum = 0x80089440; // type:func func_800894D0_jp = 0x800894D0; // type:func mFI_GetBkNum2ColTop = 0x80089538; // type:func @@ -1422,7 +1422,7 @@ func_8008BF34_jp = 0x8008BF34; // type:func func_8008BFC4_jp = 0x8008BFC4; // type:func func_8008C058_jp = 0x8008C058; // type:func mFI_CheckPlayerWade = 0x8008C0FC; // type:func -func_8008C120_jp = 0x8008C120; // type:func +mFI_GetPlayerWade = 0x8008C120; // type:func func_8008C130_jp = 0x8008C130; // type:func mFI_GetDepositP = 0x8008C1E0; // type:func func_8008C344_jp = 0x8008C344; // type:func @@ -2851,8 +2851,8 @@ func_800BC368_jp = 0x800BC368; // type:func func_800BC394_jp = 0x800BC394; // type:func mQst_GetRandom = 0x800BC414; // type:func func_800BC454_jp = 0x800BC454; // type:func -func_800BC528_jp = 0x800BC528; // type:func -func_800BC5D4_jp = 0x800BC5D4; // type:func +mQst_CheckSoccerTarget = 0x800BC528; // type:func +mQst_NextSoccer = 0x800BC5D4; // type:func func_800BC6B0_jp = 0x800BC6B0; // type:func func_800BC724_jp = 0x800BC724; // type:func func_800BC830_jp = 0x800BC830; // type:func @@ -3247,17 +3247,17 @@ func_800CE110_jp = 0x800CE110; // type:func func_800CE120_jp = 0x800CE120; // type:func func_800CE1CC_jp = 0x800CE1CC; // type:func func_800CE328_jp = 0x800CE328; // type:func -func_800CE4B0_jp = 0x800CE4B0; // type:func -func_800CE4F4_jp = 0x800CE4F4; // type:func -func_800CE554_jp = 0x800CE554; // type:func -func_800CE694_jp = 0x800CE694; // type:func -func_800CE7E4_jp = 0x800CE7E4; // type:func -func_800CE874_jp = 0x800CE874; // type:func -func_800CE8F0_jp = 0x800CE8F0; // type:func -func_800CE9C4_jp = 0x800CE9C4; // type:func -func_800CEB1C_jp = 0x800CEB1C; // type:func +mRlib_spdXZ_to_spdF_Angle = 0x800CE4B0; // type:func +mRlib_spdF_Angle_to_spdXZ = 0x800CE4F4; // type:func +mRlib_position_move_for_sloop = 0x800CE554; // type:func +mRlib_Get_norm_Clif = 0x800CE694; // type:func +mRlib_Roll_Matrix_to_s_xyz = 0x800CE7E4; // type:func +mRlib_Get_HitWallAngleY = 0x800CE874; // type:func +mRlib_Station_step_modify_to_wall = 0x800CE8F0; // type:func +mRlib_Set_Position_Check = 0x800CE9C4; // type:func +mRlib_HeightGapCheck_And_ReversePos = 0x800CEB1C; // type:func func_800CEC30_jp = 0x800CEC30; // type:func -func_800CEC98_jp = 0x800CEC98; // type:func +mRlib_Get_ground_norm_inHole = 0x800CEC98; // type:func func_800CEE24_jp = 0x800CEE24; // type:func func_800CEED4_jp = 0x800CEED4; // type:func func_800CF05C_jp = 0x800CF05C; // type:func diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt index 3a1cdb8..cb67799 100644 --- a/linker_scripts/jp/symbol_addrs_overlays.txt +++ b/linker_scripts/jp/symbol_addrs_overlays.txt @@ -8673,38 +8673,38 @@ jtbl_80968840_jp = 0x80968840; // type:jtbl // .text -func_80968A10_jp = 0x80968A10; // type:func +aBALL_secure_bank_area = 0x80968A10; // type:func func_80968AF4_jp = 0x80968AF4; // type:func -func_80968B9C_jp = 0x80968B9C; // type:func +aBALL_Random_pos_set = 0x80968B9C; // type:func aBALL_actor_ct = 0x80968D08; // type:func aBALL_actor_dt = 0x80968F98; // type:func -func_80969040_jp = 0x80969040; // type:func -func_80969114_jp = 0x80969114; // type:func -func_809693EC_jp = 0x809693EC; // type:func size:0x414 -func_80969800_jp = 0x80969800; // type:func -func_8096983C_jp = 0x8096983C; // type:func -func_809698E8_jp = 0x809698E8; // type:func -func_80969998_jp = 0x80969998; // type:func -func_809699D8_jp = 0x809699D8; // type:func -func_80969DE8_jp = 0x80969DE8; // type:func -func_80969FBC_jp = 0x80969FBC; // type:func -func_80969FD8_jp = 0x80969FD8; // type:func -func_8096A0CC_jp = 0x8096A0CC; // type:func -func_8096A0EC_jp = 0x8096A0EC; // type:func -func_8096A23C_jp = 0x8096A23C; // type:func -func_8096A334_jp = 0x8096A334; // type:func -func_8096A3D8_jp = 0x8096A3D8; // type:func +aBALL_position_move = 0x80969040; // type:func +aBALL_BGcheck = 0x80969114; // type:func +aBALL_OBJcheck = 0x809693EC; // type:func size:0x414 +aBALL_House_Tree_Rev_Check = 0x80969800; // type:func +aBALL_process_air_init = 0x8096983C; // type:func +aBALL_process_air = 0x809698E8; // type:func +aBALL_process_ground_init = 0x80969998; // type:func +aBALL_process_ground = 0x809699D8; // type:func +aBALL_set_spd_relations_in_water = 0x80969DE8; // type:func +aBALL_process_air_water_init = 0x80969FBC; // type:func +aBALL_process_air_water = 0x80969FD8; // type:func +aBALL_process_ground_water_init = 0x8096A0CC; // type:func +aBALL_process_ground_water = 0x8096A0EC; // type:func +aBALL_calc_axis = 0x8096A23C; // type:func +aBALL_player_angle_distance_check = 0x8096A334; // type:func +aBALL_status_check = 0x8096A3D8; // type:func aBALL_actor_move = 0x8096A678; // type:func aBALL_actor_draw = 0x8096A77C; // type:func func_8096A86C_jp = 0x8096A86C; // type:func // .data -D_8096A8B0_jp = 0x8096A8B0; // +ball_model_tbl = 0x8096A8B0; // Ball_Profile = 0x8096A8BC; // aBALL_CoInfoData = 0x8096A8E0; // aBALL_StatusData = 0x8096A8F0; // -D_8096A8FC_jp = 0x8096A8FC; // type:s16 +angl_add_table = 0x8096A8FC; // type:s16 // .rodata |
