kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

PAL: sync core2/code_7060 & resolve file compiler warnings

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

14
decompressed.pal.yaml
View File

@@ -515,8 +515,8 @@ segments:
- [0xF7D990, c, ba/marker]
- [0xF7FD00, c, code_6B30]
- [0xF7FFA0, c, ba/carriedobj]
- [0xF80230, bin, core2_untouched_text]
# - [0xF5C9C0, c, code_7060] #DONE
- [0xF80230, c, code_7060]
- [0xF81F70, bin, core2_untouched_text]
# - [0xF5E700, c, code_8DA0] #DONE
# - [0xF5EA40, c, code_90E0] #DONE
# - [0xF5EBF0, c, code_9290] #DONE
@@ -904,8 +904,8 @@ segments:
- [0x1055E70, .data, ba/anim]
- [0x1055EA0, .data, snackerctl]
- [0x1055EC0, .data, ba/marker]
- [0x1055F20, bin, core2_untouched_data]
# - [0x1032060, .data, code_7060]
- [0x1055F20, .data, code_7060]
- [0x1055F60, bin, core2_untouched_data]
# - [0x10320A0, .data, code_90E0]
# - [0x1032150, .data, ba/model]
# - [0x1032150, .data, code_B850]
@@ -1129,8 +1129,8 @@ segments:
- [0x1066870, .rodata, code_39D0]
- [0x1066910, .rodata, ba/marker]
- [0x1066D40, .rodata, code_6B30]
- [0x1066E30, bin, core2_untouched_rodata]
# - [0x1042E60, .rodata, code_7060]
- [0x1066E30, .rodata, code_7060]
- [0x1066F60, bin, core2_untouched_rodata]
# - [0x1042F90, .rodata, code_9450]
# - [0x1042FC0, .rodata, code_9900]
# - [0x1042FD0, .rodata, code_9BD0]
@@ -1382,7 +1382,7 @@ segments:
- [0x0106C980, .bss, code_39D0]
- [0x0106C980, .bss, ba/marker]
- [0x0106C980, .bss, code_6B30]
# - [0x0106C980, .bss, code_7060]
- [0x0106C980, .bss, code_7060]
# - [0x0106C980, .bss, code_8DA0]
# - [0x0106C980, .bss, code_90E0]
# - [0x0106C980, .bss, code_9290]

4
include/functions.h
View File

@@ -284,8 +284,8 @@ void baanim_playForDuration_onceSmooth(enum asset_e, f32);
void baanim_setEndAndDuration(f32, f32);
int func_8028AED4(f32*, f32);
void func_8028E668(f32[3], f32, f32, f32);
bool func_8028F364(f32[3], f32, f32, enum actor_e actor_id, Actor**);
void func_8028FA54(f32[3]);
bool player_setCarryObjectPoseInCylinder(f32[3], f32, f32, enum actor_e actor_id, Actor**);
void player_setThrowTargetPosition(f32[3]);
f32 func_802915D8(void);
f32 func_80291604(void);

112
manual_syms.pal.txt
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;

4
src/CCW/code_3310.c
View File

@@ -270,9 +270,9 @@ void CCW_func_80389BFC(Actor *this) {
func_8028F784(0);
}
if ((local->unk0->map_id != MAP_43_CCW_SPRING) && ((this->position[0] + 500.0f) < sp4C[0])) {
func_8028F364(this->position, 1110.0f, 200.0f, ACTOR_2A2_CATERPILLAR, &this);
player_setCarryObjectPoseInCylinder(this->position, 1110.0f, 200.0f, ACTOR_2A2_CATERPILLAR, &this);
if ((local->unk0->unkE != 0) && (carriedObj_getActorId() == ACTOR_2A2_CATERPILLAR) && (ml_distance_vec3f(this->position, sp4C) < 1010.0f) && (player_throwCarriedObject() != 0)) {
func_8028FA54(D_8038FDE0);
player_setThrowTargetPosition(D_8038FDE0);
if ((local->unk0->map_id == MAP_44_CCW_SUMMER) && (local->unk4 == 0)) {
gcdialog_showText(0xCD8, 4, NULL, NULL, NULL, NULL);
}

4
src/CCW/code_5540.c
View File

@@ -142,9 +142,9 @@ void chnabnut_update(Actor *this) {
this->yaw += sp24 * 10.0f;
}
if (this->has_met_before && !func_803114B0()) {
func_8028F364(this->position, 500.0f, 200.0f, ACTOR_2A9_ACORN, &this);
player_setCarryObjectPoseInCylinder(this->position, 500.0f, 200.0f, ACTOR_2A9_ACORN, &this);
if ((carriedObj_getActorId() == ACTOR_2A9_ACORN) && (ml_distance_vec3f(this->position, sp30) < 300.0f) && player_throwCarriedObject()) {
func_8028FA54(D_8038F350);
player_setThrowTargetPosition(D_8038F350);
local->returned_acorn_count++;
if (local->returned_acorn_count == 6) {
chnabnut_setState(this, NABNUT_STATE_2_WAIT);

2
src/FP/ch/scarfsled.c
View File

@@ -105,7 +105,7 @@ void __chScarfSled_func_80386630(Actor *this){
sp64[0] = this->pitch;
sp64[1] = this->yaw;
sp64[2] = this->roll;
func_8028FAEC(sp64);
player_setIdealRotation(sp64);
}//L80386724
if(1.0 == this->unk48){

4
src/GV/ch/histup.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern void func_8028F738(f32[3], f32[3], f32, s32);
extern void player_setClimbParams(f32[3], f32[3], f32, s32);
extern int func_8030E3FC(u8);
@@ -62,7 +62,7 @@ Actor *func_8038DA18(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
sp38[1] = this->position_y;
}
if(func_8038D920(this, sp38[1])){
func_8028F738(sp2C, sp38, (f32)this->unkF4_8, 2);
player_setClimbParams(sp2C, sp38, (f32)this->unkF4_8, 2);
}
return this;

2
src/TTC/ch/blubber.c
View File

@@ -111,7 +111,7 @@ void func_8038771C(Actor *this){
void func_80387774(Actor **this_ptr){
ActorLocal_Blubber *local = (ActorLocal_Blubber *)&(*this_ptr)->local;
func_8028F364(local->throw_target_position, local->throw_target_radius, 100.0f, ACTOR_2A_GOLD_BULLION, this_ptr);
player_setCarryObjectPoseInCylinder(local->throw_target_position, local->throw_target_radius, 100.0f, ACTOR_2A_GOLD_BULLION, this_ptr);
if( func_80329530(*this_ptr, 200)
&& bacarry_get_markerId() == MARKER_37_GOLD_BULLION
&& player_throwCarriedObject()

2
src/core2/ch/badShad.c
View File

@@ -90,7 +90,7 @@ f32 func_802D7038(Actor *this) {
void func_802D7124(Actor *actor, f32 arg1) {
f32 vp[3];
viewport_getPosition_vec3f(&vp);
viewport_getPosition_vec3f(vp);
if ((actor->position[0] - vp[0]) * (actor->position[0] - vp[0]) + (actor->position[2] - vp[2]) * (actor->position[2] - vp[2]) < 12250000.0f) {
func_802D729C(actor, arg1);
}

4
src/core2/ch/climbBase.c
View File

@@ -4,7 +4,7 @@
void func_802D77D4(Actor *this);
extern void func_8028F738(f32[3], f32[3], f32, u32);
extern void player_setClimbParams(f32[3], f32[3], f32, u32);
extern f32 func_80258640(f32[3], f32[3]);
typedef struct {
@@ -78,7 +78,7 @@ void func_802D77D4(Actor *this) {
if (((sp4C[0] * sp4C[0]) + (sp4C[2] * sp4C[2])) < (sp3C * sp3C)) {
if ((this->position[1] < sp40[1]) && (sp40[1] <= local->unk0[1])) {
if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) == 0) {
func_8028F738(this->position, local->unk0, (f32)this->unkF4_8, local->unkC);
player_setClimbParams(this->position, local->unk0, (f32)this->unkF4_8, local->unkC);
}
}
}

2
src/core2/ch/termite.c
View File

@@ -57,7 +57,7 @@ void __chTermite_updateWalkSFX(Actor *this) {
f32 sp24[3];
f32 sp20;
viewport_getPosition_vec3f(&sp24);
viewport_getPosition_vec3f(sp24);
sp20 = ml_map_f( (300.0f - sp24[0])*(300.0f - sp24[0]) + (this->position[1] - sp24[1])*(this->position[1] - sp24[1]) + (-858.0f - sp24[2])*(-858.0f - sp24[2])
, 7617600.0f, 8236900.0f
, 8000.0f, 1000.0f

32
src/core2/code_7060.c
View File

@@ -22,7 +22,7 @@ extern void func_8029B73C(f32 arg0[3], f32 arg1, f32 arg2, f32 arg3, f32 arg4);
bool func_8028F4B8(f32 arg0[3], f32 arg1, f32 arg2);
bool func_8028F620(f32 arg0[3], f32 arg1, f32 arg2);
void func_8028F85C(f32 arg0[3]);
void func_8028F8A4(f32 rotation[3]);
void player_setRotation(f32 rotation[3]);
void func_8028F918(s32 arg0);
@@ -46,15 +46,15 @@ f32 D_8037BFCC;
f32 D_8037BFD0;
/* .code */
bool func_8028DFF0(s32 arg0, s32 arg1[3]) {
bool func_8028DFF0(s32 arg0, s32 position[3]) {
if (arg0 >= 0x80) {
arg1[0] = func_802E4A98(arg0);
arg1[1] = func_802E4AAC(arg0);
arg1[2] = func_802E4AC0(arg0);
position[0] = func_802E4A98(arg0);
position[1] = func_802E4AAC(arg0);
position[2] = func_802E4AC0(arg0);
return TRUE;
}
else{
return _nodeProp_findPositionFromActorId(func_803084F0(arg0), arg1);
return _nodeProp_findPositionFromActorId(func_803084F0(arg0), position);
}
}
@@ -151,7 +151,7 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) {
bs_setState(badrone_goto(sp7C, 1.0f, func_8028E0B0, NULL));
return;
}
func_8028F85C(&sp7C);
func_8028F85C(sp7C);
func_80295A8C();
bsStoredState_setTrot(FALSE);
miscFlag_clear(MISC_FLAG_16);
@@ -192,7 +192,7 @@ void func_8028E4B0(void) {
return;
}
if (sp20 == 0x63) {
func_8028F85C(&D_8037BFC0);
func_8028F85C(D_8037BFC0);
yaw_set(D_8037BFCC);
D_8037BFBC = (s32) D_8037BFD0;
D_8037BFB8 = 1;
@@ -213,12 +213,12 @@ void func_8028E4B0(void) {
D_80363694--;
if (D_80363694 == 0) {
func_8028F85C(D_80363698);
func_8028F8A4(D_803636A4);
player_setRotation(D_803636A4);
}
}
if (D_803636B0) {
D_803636B0 = FALSE;
func_8028F85C(&D_803636B4);
func_8028F85C(D_803636B4);
}
}
@@ -668,7 +668,7 @@ bool player_setCarryObjectPoseInHorizontalRadius(f32 position[3], f32 radius, en
}
//sets carry actor if player is within a cylinder around a point
bool func_8028F364(f32 position[3], f32 radius, f32 vert_range, enum actor_e actor_id, Actor **arg4) {
bool player_setCarryObjectPoseInCylinder(f32 position[3], f32 radius, f32 vert_range, enum actor_e actor_id, Actor **arg4) {
if (player_isInVerticalRange(position, vert_range)) {
return player_setCarryObjectPoseInHorizontalRadius(position, radius, actor_id, arg4);
}
@@ -774,7 +774,7 @@ void player_stateTimer_set(enum state_timer_e timer_id, f32 value){
stateTimer_set(timer_id, value);
}
void func_8028F738(f32 bottom[3], f32 top[3], f32 radius, u32 arg3){
void player_setClimbParams(f32 bottom[3], f32 top[3], f32 radius, u32 arg3){
climbSet(bottom, top, radius, arg3);
}
@@ -824,7 +824,7 @@ void func_8028F85C(f32 arg0[3]){
cameraMode_update();
}
void func_8028F8A4(f32 rotation[3]){
void player_setRotation(f32 rotation[3]){
pitch_setIdeal(rotation[0]);
yaw_setIdeal(rotation[1]);
roll_setIdeal(rotation[2]);
@@ -875,8 +875,8 @@ void func_8028FA34(enum actor_e arg0, Actor *arg1){
func_8028DEEC(arg0, arg1);
}
void func_8028FA54(f32 arg0[3]){
set_throw_target_position(arg0);
void player_setThrowTargetPosition(f32 position[3]){
set_throw_target_position(position);
}
void func_8028FA74(f32 dst[3]){
@@ -897,7 +897,7 @@ void func_8028FAB0(f32 arg0[3]){
func_80298564(diff);
}
void func_8028FAEC(f32 rotation[3]){
void player_setIdealRotation(f32 rotation[3]){
pitch_setIdeal(rotation[0]);
yaw_setIdeal(rotation[1]);
roll_setIdeal(rotation[2]);

8
src/core2/code_85800.c
View File

@@ -219,8 +219,8 @@ s32 func_8030CDE4(SfxSource *arg0){
f32 temp_f0;
f32 pad;
viewport_getPosition_vec3f(&sp44);
viewport_getLookVector(&sp38);
viewport_getPosition_vec3f(sp44);
viewport_getLookVector(sp38);
sp2C[0] = arg0->position[0] - sp44[0];
sp2C[1] = arg0->position[1] - sp44[1];
sp2C[2] = arg0->position[2] - sp44[2];
@@ -228,9 +228,9 @@ s32 func_8030CDE4(SfxSource *arg0){
if(sp2C[0]*sp2C[0] + sp2C[1]*sp2C[1] + sp2C[2]*sp2C[2] < 10.0f){
return 0x40;
}
ml_vec3f_normalize(&sp2C);
ml_vec3f_normalize(sp2C);
sp38[1] = 0.0f;
ml_vec3f_normalize(&sp38);
ml_vec3f_normalize(sp38);
temp_f0 = func_80256AB4(sp38[0], sp38[2], sp2C[0], sp2C[2]);
if(arg0->unk16){
arg0->unk18 += 0.07*((f32)(s32)(64.0f - (temp_f0 * 63.0f)) - arg0->unk18);

2
src/core2/code_935F0.c
View File

@@ -163,7 +163,7 @@ void chMinigame_update(Actor *this){
marker_setFreeMethod(this->marker, __chMinigame_free);
func_8028FAB0(this->position);
this->unk1C[0] = 0.0f; this->unk1C[1] = this->yaw; this->unk1C[2] = 0.0f;
func_8028FAEC(this->unk1C);
player_setIdealRotation(this->unk1C);
this->has_met_before = FALSE;
if(this->unk10_12 >= 7){
marker_despawn(this->marker);

2
src/core2/code_C8760.c
View File

@@ -55,7 +55,7 @@ void func_8034F774(void){
sfxsource_setSfxId(D_803720A0.sfxsourceIdx, 0x3EC);
func_8030DD14(D_803720A0.sfxsourceIdx, 3);
func_8030DFF0(D_803720A0.sfxsourceIdx, 1);
sfxsource_set_position(D_803720A0.sfxsourceIdx, &sp44);
sfxsource_set_position(D_803720A0.sfxsourceIdx, sp44);
sfxsource_set_fade_distances(D_803720A0.sfxsourceIdx, 400.0f, 3200.0f);
func_8030DE44(D_803720A0.sfxsourceIdx, 2, 0.5f);
func_8030E2C4(D_803720A0.sfxsourceIdx);

4
src/fight/chfinalboss.c
View File

@@ -23,7 +23,7 @@ extern void sfxsource_setSampleRate(u8, s32);
extern void func_80328FF0(Actor *arg0, f32 arg1);
extern f32 func_80257204(f32, f32, f32, f32);
extern void func_8028F85C(f32[3]);
extern void func_8028FAEC(f32[3]);
extern void player_setIdealRotation(f32[3]);
extern f32 func_8033229C(ActorMarker *);
Actor *chfinalboss_draw(ActorMarker *arg0, Gfx **arg1, Mtx **arg2, Vtx **arg3);
@@ -1883,7 +1883,7 @@ void chfinalboss_phase5_update(ActorMarker *marker) {
D_803928C8[0] = 0.0f;
D_803928C8[1] = func_80257204(D_803917E0[0], D_803917E0[2], this->position[0], this->position[2]);
D_803928C8[2] = 0.0f;
func_8028FAEC(D_803928C8);
player_setIdealRotation(D_803928C8);
}
if (__chFinalBossJinjonatorHits == 3) {
gcdialog_showText(randi2(0, 5) + 0x1159, 0x20, NULL, NULL, NULL, NULL);

2
src/lair/code_5ED0.c
View File

@@ -1142,7 +1142,7 @@ void func_8038DFBC(void)
void func_8038E070(void)
{
func_8028F85C(&D_8037DCB8->playerPosition);
func_8028F8A4(&D_8037DCB8->playerRotation);
player_setRotation(&D_8037DCB8->playerRotation);
func_8028F918(2);
}