PAL: sync core2/code_7060 & resolve file compiler warnings

This commit is contained in:
Banjo Kazooie
2024-09-28 13:20:56 -05:00
parent 86b22d6d09
commit 87b9bb398f
17 changed files with 136 additions and 68 deletions

View File

@@ -32,54 +32,70 @@ boot_gOverlayTable = gOverlayTable;
boot_func_8023DA20 = func_8023DA20;
/* Temporary*/
/* Temporary Correct*/
player_getActiveHitbox = 0x8028e58c;
player_getTransformation = 0x8028e5ec;
func_8028E964 = 0x8028e784;
player_getPosition = 0x8028e7c4;
func_8028E9C4 = 0x8028e7e4;
player_getPosition_s32 = 0x8028e95c;
player_getYaw = 0x8028e9c4;
func_8028ECAC = 0x8028eacc;
player_getWaterState = 0x8028eca4;
func_8028F170 = 0x8028ef90;
ability_isUnlocked = 0x8028efb0;
player_is_present = 0x8028eff4;
func_8028F1E0 = 0x8028f000;
player_isDead = 0x8028f04c;
func_8028F25C = 0x8028f07c;
func_8028F428 = 0x8028f248;
func_8028F55C = 0x8028f37c;
func_8028F918 = 0x8028f738;
func_8028F94C = 0x8028f76c;
func_8028FB88 = 0x8028f9a8;
func_8029026C = 0x8029008c;
func_80290B6C = 0x8029098c;
cameraMode_update = 0x80291178;
func_8029151C = 0x8029133c;
func_802915D8 = 0x802913f8;
func_80291604 = 0x80291424;
func_80291610 = 0x80291430;
func_80291634 = 0x80291454;
stateTimer_get = 0x80291490;
stateTimer_isActive = 0x802914b8;
stateTimer_set = 0x80291604;
baModel_80291AAC = 0x802918cc;
baModel_draw = 0x80291910;
baModel_setVisible = 0x80291fe8;
baModel_8029223C = 0x8029205c;
baModel_80292260 = 0x80292080;
baModel_80292284 = 0x802920a4;
baModel_getPosition = 0x80292288;
baModel_802924E8 = 0x80292308;
baModel_isVisible = 0x80292368;
badrone_goto = 0x80292478;
eggShatter_draw = 0x80292900;
bafalldamage_get_damage = 0x80292ffc;
miscFlag_isTrue = 0x802931e0;
miscFlag_isFalse = 0x802931f0;
miscFlag_set = 0x80293208;
miscFlag_clear = 0x8029321c;
func_80293D2C = 0x80293b4c;
func_80293F0C = 0x80293d2c;
func_80294438 = 0x80294258;
func_80294480 = 0x802942a0;
func_80294500 = 0x80294320;
func_8029453C = 0x8029435c;
func_80294548 = 0x80294368;
func_80294554 = 0x80294374;
func_80294574 = 0x80294394;
func_80294610 = 0x80294430;
func_802946F0 = 0x80294510;
bacarry_reset_marker = 0x80294700;
bacarry_get_marker = 0x8029470c;
bacarry_set_marker = 0x80294718;
bacarry_set_offsets = 0x80294744;
func_802949C8 = 0x802947e8;
get_slope_timer = 0x802947f4;
get_throw_target_position = 0x8029483c;
set_talk_target_position = 0x802948b8;
set_throw_target_position = 0x802948e0;
set_turbo_duration = 0x80294908;
func_80294AF4 = 0x80294914;
func_80294E54 = 0x80294c74;
func_802955A4 = 0x802953c4;
func_802955BC = 0x802953dc;
ability_hasLearned = 0x80295618;
ability_setLearned = 0x80295658;
func_80295914 = 0x80295754;
func_80295A8C = 0x802958cc;
func_80295B04 = 0x80295944;
func_80295C14 = 0x80295a54;
func_80295D74 = 0x80295bb4;
func_80296C90 = 0x80296ad0;
func_80296C9C = 0x80296adc;
func_80296CA8 = 0x80296ae8;
func_80296CB4 = 0x80296af4;
func_80296CC0 = 0x80296b00;
baphysics_set_type = 0x8029771c;
@@ -87,20 +103,46 @@ baphysics_set_target_horizontal_velocity = 0x802977b0;
baphysics_get_velocity = 0x802978c8;
baphysics_get_vertical_velocity = 0x802978ec;
baphysics_set_goto_position = 0x80297a04;
func_80297C6C = 0x80297aac;
pitch_setIdeal = 0x80297d7c;
pitch_applyIdeal = 0x80297dc4;
pitch_get = 0x80297dd8;
climbGetBottom = 0x80298060;
climbSet = 0x802980b4;
func_80298464 = 0x802982a4;
player_setPosition = 0x802982e0;
_player_getPosition = 0x80298314;
player_getYPosition = 0x80298338;
func_80298540 = 0x80298380;
func_80298564 = 0x802983a4;
func_80298850 = 0x80298690;
func_80298890 = 0x802986d0;
func_802988DC = 0x8029871c;
func_8029892C = 0x8029876c;
roll_setIdeal = 0x80298b20;
roll_applyIdeal = 0x80298b68;
roll_get = 0x80298b7c;
yaw_setUpdateState = 0x80298fe8;
yaw_setIdeal = 0x80298ff4;
yaw_set = 0x80299018;
yaw_applyIdeal = 0x8029903c;
yaw_get = 0x8029905c;
yaw_getIdeal = 0x80299068;
func_8029957C = 0x802993bc;
bsList_getInterruptMethod = 0x8029a534;
bs_setState = 0x8029a56c;
bs_getState = 0x8029a608;
bs_checkInterrupt = 0x8029a65c;
bsStoredState_getTransformation = 0x8029a734;
bsStoredState_setTrot = 0x8029a7c0;
func_8029B318 = 0x8029b158;
func_8029B41C = 0x8029b25c;
func_8029B73C = 0x8029b57c;
bs_getIdleState = 0x8029bdb8;
func_8029C0D0 = 0x8029bf10;
func_8029C834 = 0x8029c674;
func_8029CDA0 = 0x8029cbe0;
func_8029CF20 = 0x8029cd60;
func_8029D66C = 0x8029d4ac;
@@ -109,13 +151,23 @@ bsbbarge_hitboxActive = 0x8029f484;
bsbbuster_hitboxActive = 0x8029fa98;
func_8028F66C = 0x8028f48c;
func_802A02B4 = 0x802a00f4;
bsbfly_inSet = 0x802a35b8;
bsbfly_bombHitboxActive = 0x802a3dd0;
bslongleg_inSet = 0x802a50ec;
func_802A6388 = 0x802a61c8;
bsbpeck_hitboxActive = 0x802a6350;
bsbswim_inSet = 0x802a7348;
bscarry_inSet = 0x802aafc4;
bsclaw_hitboxActive = 0x802ab0c0;
bsclimb_inSet = 0x802ab640;
bscroc_hitboxActive = 0x802acd8c;
func_802AD3A0 = 0x802ad1e0;
bsjump_jumpingFromWater = 0x802b1c14;
bspumpkin_inSet = 0x802b2154;
bsswim_inset = 0x802b5594;
bstwirl_hitboxActive = 0x802b68b0;
func_802B6F9C = 0x802b6e0c;
bswalrus_inSledSet = 0x802b8000;
func_802BAFE4 = 0x802bae54;
func_802BB360 = 0x802bb1d0;
func_802BB378 = 0x802bb1e8;
@@ -142,6 +194,8 @@ chtrainers_pickup = 0x802ca910;
mapSpecificFlags_get = 0x802caeb8;
mapSpecificFlags_set = 0x802caf80;
mapSpecificFlags_validateCRC1 = 0x802cb1cc;
func_802D6088 = 0x802d6268;
func_802D60C4 = 0x802d62a4;
func_802D6264 = 0x802d6444;
func_802D686C = 0x802d6a4c;
func_802D6924 = 0x802d6b0c;
@@ -160,6 +214,7 @@ func_802E3580 = 0x802E3770;
dummy_func_802E35D0 = 0x802E37C0;
func_802E35D8 = 0x802E37c8;
game_draw = 0x802E417c;
func_802E4078 = 0x802e4268;
func_802E4170 = 0x802E4360;
func_802E4214 = 0x802E4404;
func_802E4384 = 0x802e4574;
@@ -168,6 +223,10 @@ game_defrag = 0x802e4ac8;
func_802E49E0 = 0x802e4bd0;
getGameMode = 0x802e4bec;
func_802E4A08 = 0x802e4bf8;
func_802E4A98 = 0x802e4c88;
func_802E4AAC = 0x802e4c9c;
func_802E4AC0 = 0x802e4cb0;
func_802E4AD4 = 0x802e4cc4;
func_802E4B38 = 0x802e4d28;
func_802E6820 = 0x802e6a04;
animMtxList_setBoned = 0x802ea388;
@@ -202,8 +261,13 @@ func_802FA060 = 0x802fa240;
func_802FADD4 = 0x802fafb4;
cubeList_findNodePropByActorId = 0x80304b6c;
func_80304C38 = 0x80304dd8;
func_80304CAC = 0x80304e4c;
nodeprop_getPosition_s32 = 0x80304eec;
nodeprop_getPosition = 0x80304f08;
_nodeProp_findPositionFromActorId = 0x80304f70;
func_80305248 = 0x803053e8;
func_80305344 = 0x803054e4;
func_803084F0 = 0x80308690;
func_80309B48 = 0x80309ce8;
func_80309D58 = 0x80309ef8;
func_8030A850 = 0x8030a9f0;
@@ -229,6 +293,7 @@ func_8030E394 = 0x8030e534;
func_803012F8 = 0x803014d8;
fxairscore_count_to_time = 0x80301f5c;
gcdialog_showText = 0x803116cc;
func_803114B0 = 0x803116fc;
gcpausemenu_80314AC8 = 0x80314e1c;
func_8031B908 = 0x8031bce8;
@@ -280,7 +345,10 @@ marker_setCollisionScripts = 0x803304f8;
func_803300B8 = 0x80330508;
func_803306C8 = 0x80330b18;
func_80332790 = 0x80332be0;
func_8033452C = 0x8033497c;
map_get = 0x80334d10;
exit_get = 0x80334d1c;
func_80334904 = 0x80334d54;
func_80335134 = 0x80335584;
sfxInstruments_init = 0x80335670;
modelRender_setBoneTransformList = 0x8033A688;