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

Merge branch 'mr-origin-86'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-08 01:58:19 -05:00
parent 06204d3b68 7f41a49ef8
commit 680cf7a950
34 changed files with 568 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ ActorInfo D_80365F00 = { 0xE6, 0x197, 0x532, 0x1, D_80365ED0, func_802C4C14, act
/* .bss */
s32 mm_hut_smash_count;
u32 D_8037DCB4;
u32 CH_TREASUREHUNT_PUZZLE_CURRENT_STEP;
struct FF_StorageStruct* D_8037DCB8;
s32 D_8037DCBC;
u8 D_8037DCC0[7];

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

@@ -349,7 +349,7 @@ void chmole_update(Actor *this){
if(!this->initialized){
// Checks if player is within radius of a specific actor exists within the same cube
// If actor exists and player is within radius, force trigger conversation
node_prop = func_80304C38(0x372, this);
node_prop = nodeprop_findByActorIdAndActorPosition(0x372, this);
if(node_prop == NULL){
this->unk38_0 = FALSE;
}
@@ -363,7 +363,7 @@ void chmole_update(Actor *this){
this->marker->collidable = FALSE;
this->initialized = TRUE;
if(this->unkF4_8 == 0x12){
node_prop = func_80304C38(0x349, this);
node_prop = nodeprop_findByActorIdAndActorPosition(0x349, this);
if(node_prop == NULL){
this->velocity[0] = this->position[0];
this->velocity[1] = this->position[1];