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

core2/code_83D70.c done

Browse Source
This commit is contained in:
Banjo Kazooie
2022-08-15 16:45:08 -05:00
parent 46ed2ced3c
commit 91a7ea3cad
66 changed files with 575 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/FP/code_0.c
View File

@@ -46,7 +46,7 @@ void func_803864F4(ActorMarker *this_marker, ActorMarker *other_marker){
if(this->state != 1) return;
if(player_getTransformation() != TRANSFORM_1_BANJO) return;
if(func_8028F68C(0x27, this->marker))
if(func_8028F68C(BS_INTR_27_BANJO_SLED, this->marker))
func_803863F0(this, 2);
}

10
src/FP/code_3E00.c
View File

@@ -41,17 +41,17 @@ ActorInfo D_80391E50 = { MARKER_1FC_POLAR_BEAR_CUB_RED, ACTOR_1EC_POLAR_BEAR_CUB
f32 D_80391E74[3] = {-5.0f, 180.0f, 1.0f};
Struct_FP_3E00 D_80391E80[] ={
{0x11, 0x1FD, 0x1ED, 0x1EE},
{0x12, 0x1FE, 0x1EF, 0x1F0},
{0x13, 0x1FF, 0x1F1, 0x1F2}
{0x11, MARKER_1FD_BLUE_PRESENT_COLLECTABLE, ACTOR_1ED_BLUE_PRESENT_COLLECTABLE, 0x1EE},
{0x12, MARKER_1FE_GREEN_PRESENT_COLLECTABLE, ACTOR_1EF_GREEN_PRESENT_COLLECTABLE, 0x1F0},
{0x13, MARKER_1FF_RED_PRESENT_COLLECTABLE, ACTOR_1F1_RED_PRESENT_COLLECTABLE, 0x1F2}
};
/* .code */
void func_8038A1F0(Actor **this_ptr, s32 arg1, enum actor_e actor_id, s32 arg3){
void func_8038A1F0(Actor **this_ptr, enum marker_e carried_obj_marker_id, enum actor_e actor_id, enum actor_e arg3){
func_8028F31C((*this_ptr)->position, 600.0f, actor_id, this_ptr);
if(!func_80329530(*this_ptr, 400)) return;
if(func_8028E88C() != arg1) return;
if(carriedObj_getMarkerId() != carried_obj_marker_id) return;
if(!func_8028FC34()) return;
func_8028FA34(arg3, *this_ptr);

6
src/FP/code_4770.c
View File

@@ -198,7 +198,7 @@ void func_8038B130(enum jiggy_e jiggy_id){
}
void func_8038B190(void){
func_8028F66C(0x2B);
func_8028F66C(BS_INTR_2B);
mapSpecificFlags_set(4, FALSE);
func_8028F918(0);
}
@@ -223,7 +223,7 @@ void func_8038B268(void){
timedFunc_set_0(0.0f, func_8038AEA0);
timedFunc_set_0(0.0f, func_8038B0B8);
func_8028FA14(map_get(), 0x11);
func_8028F66C(0x2A);
func_8028F66C(BS_INTR_2A);
}
void func_8038B2C8(ActorMarker *caller, enum asset_e text_id, s32 arg2){
@@ -252,7 +252,7 @@ void func_8038B2C8(ActorMarker *caller, enum asset_e text_id, s32 arg2){
case 0xc10: //8038B358
func_8038ABDC();
func_8028FA14(map_get(), 0x11);
func_8028F66C(0x2A);
func_8028F66C(BS_INTR_2A);
timedFunc_set_0(0.0f, func_8038B1C4);
break;
}//L8038B38C

2
src/FP/code_4D0.c
View File

@@ -58,7 +58,7 @@ void func_803869FC(ActorMarker *this_marker, ActorMarker *other_marker){
if( this->position_y + 20.0f < plyr_pos[1]
&& func_8028F20C()
&& player_getTransformation() == TRANSFORM_4_WALRUS
&& func_8028F68C(0x29, this->marker)
&& func_8028F68C(BS_INTR_27_WALRUS_SLED, this->marker)
){
func_80386920(this, 3); //start_race
}