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

Merge branch 'mr-origin-80'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-26 19:10:37 -05:00
parent e8eed5ecb9 249f5a7329
commit 8a312a3e64
170 changed files with 1495 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MMM/ch/loggo.c
View File

@@ -36,7 +36,7 @@ void __chLoggo_textCallback(ActorMarker* caller, enum asset_e text_id, s32 arg3)
void __chLoggo_collide(ActorMarker* this_marker, ActorMarker *other_marker) {
Actor *this = marker_getActor(this_marker);
if ((player_getTransformation() == TRANSFORM_3_PUMPKIN) && !fileProgressFlag_get(FILEPROG_89_ENTERED_LOGGO_AS_PUMPKIN)) {
if (func_80311480(ASSET_ADF_TEXT_ENTER_LOGGO, 0x2B, this->position, this->marker, &__chLoggo_textCallback, 0) != 0) {
if (gcdialog_showText(ASSET_ADF_TEXT_ENTER_LOGGO, 0x2B, this->position, this->marker, &__chLoggo_textCallback, 0) != 0) {
actor_collisionOff(this);
fileProgressFlag_set(FILEPROG_89_ENTERED_LOGGO_AS_PUMPKIN, TRUE);
@@ -50,7 +50,7 @@ void __chLoggo_collide(ActorMarker* this_marker, ActorMarker *other_marker) {
}
if ((player_getTransformation() == TRANSFORM_1_BANJO) && !fileProgressFlag_get(FILEPROG_88_TRIED_LOGGO_AS_BEAR)){
if(func_80311480(ASSET_ADE_TEXT_LOGGO_AS_BEAR, 0x2A, this->position, NULL, NULL, NULL)) {
if(gcdialog_showText(ASSET_ADE_TEXT_LOGGO_AS_BEAR, 0x2A, this->position, NULL, NULL, NULL)) {
fileProgressFlag_set(FILEPROG_88_TRIED_LOGGO_AS_BEAR, TRUE);
}
}
@@ -71,7 +71,7 @@ void chLoggo_update(Actor *this){
actor_loopAnimation(this);
this->lifetime_value = 0.0f;
if(!fileProgressFlag_get(FILEPROG_8A_EXITED_LOGGO) && levelSpecificFlags_get(0x33)){
if(func_80311480(ASSET_AE0_TEXT_EXIT_LOGGO, 4, NULL, NULL, NULL, NULL)){
if(gcdialog_showText(ASSET_AE0_TEXT_EXIT_LOGGO, 4, NULL, NULL, NULL, NULL)){
fileProgressFlag_set(FILEPROG_8A_EXITED_LOGGO, TRUE);
}
}

12
src/MMM/ch/napper.c
View File

@@ -42,11 +42,11 @@ void __chnapper_setState(Actor *this, s32 next_state){
if(next_state == 3){
skeletalAnim_set(this->unk148, ASSET_A5_ANIM_NAPPER_WALK, 0.2f, 1.5f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
func_8030E484(SFX_41_MUMBO_ERGHHH);
sfxsource_playHighPriority(SFX_41_MUMBO_ERGHHH);
}
if(next_state == 4){
func_8030E484(SFX_C_TAKING_FLIGHT_LIFTOFF);
sfxsource_playHighPriority(SFX_C_TAKING_FLIGHT_LIFTOFF);
func_803895B0(0);
}
@@ -62,9 +62,9 @@ void __chnapper_setState(Actor *this, s32 next_state){
void func_80386ACC(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
if(!this->is_first_encounter){
if(func_80311480(0xad8, 0, NULL, NULL, NULL, NULL)){
this->is_first_encounter = TRUE;
if(!this->has_met_before){
if(gcdialog_showText(0xad8, 0, NULL, NULL, NULL, NULL)){
this->has_met_before = TRUE;
}
}
}
@@ -80,7 +80,7 @@ Actor *chnapper_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
else {
func_8033A45C(1, FALSE);
func_8033A45C(2, (local->unk10) ? TRUE : FALSE);
func_8033A45C(2, BOOL(local->unk10));
func_8033A45C(3, (local->unk10) ? FALSE : TRUE);
}

2
src/MMM/code_2040.c
View File

@@ -287,7 +287,7 @@ void func_80388BDC(Actor *this) {
f64 phi_f0;
func_802D3D74(this);
mapSpecificFlags_set(1, ((this->yaw > 260.0f) && (this->yaw < 330.0f)) ? TRUE : FALSE);
mapSpecificFlags_set(1, BOOL((this->yaw > 260.0f) && (this->yaw < 330.0f)));
if (!this->volatile_initialized) {
if (this->yaw != 0.0f) {
this->lifetime_value = 0.5f;

10
src/MMM/code_3420.c
View File

@@ -175,7 +175,7 @@ void func_803898EC() {
}
void func_80389910() {
func_80311480(0xAD5, 0xE, NULL, NULL, MMM_func_80389810, NULL);
gcdialog_showText(0xAD5, 0xE, NULL, NULL, MMM_func_80389810, NULL);
timedFunc_set_2(0.0f, func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
timed_setStaticCameraToNode(2.0f, 0);
timedFunc_set_0(2.1f, MMM_func_803898A0);
@@ -195,10 +195,10 @@ void organMinigame_setState(s32 next_state){
if(next_state == 2){
if(D_8038C4F0.pattern == 0){
D_8038C4F0.pattern = 1;
func_80311480(0xad3, 4, NULL, NULL, MMM_func_80389810, NULL);
gcdialog_showText(0xad3, 4, NULL, NULL, MMM_func_80389810, NULL);
}
else{//L80389A84
func_80311480(0xad6, 4, NULL, NULL, MMM_func_80389810, NULL);
gcdialog_showText(0xad6, 4, NULL, NULL, MMM_func_80389810, NULL);
}
}//L80389A9C
@@ -215,13 +215,13 @@ void organMinigame_setState(s32 next_state){
}//L80389AF4
if(next_state == 4){
func_80311480(0xadd, 4, NULL, NULL, MMM_func_80389810, NULL);
gcdialog_showText(0xadd, 4, NULL, NULL, MMM_func_80389810, NULL);
func_80387720(D_8038C4F0.motzhand_marker);
}
if(next_state == 5){
D_8038C4F0.pattern++;
func_80311480(0xad4, 4, NULL, NULL, MMM_func_80389810, NULL);
gcdialog_showText(0xad4, 4, NULL, NULL, MMM_func_80389810, NULL);
func_80387720(D_8038C4F0.motzhand_marker);
}

6
src/MMM/code_47D0.c
View File

@@ -16,7 +16,7 @@ typedef struct {
/* .code */
void MMM_func_8038ABC0(s32 arg0) {
if (getGameMode() != 7) {
if (getGameMode() != GAME_MODE_7_ATTRACT_DEMO) {
ability_setAllLearned(ability_getAllLearned() & ~arg0);
}
}
@@ -104,7 +104,7 @@ void func_8038AF0C(ActorMarker *marker, enum asset_e text_id, s32 arg2) {
}
void func_8038AF3C(Struct_MMM_47D0_0 *arg0, s32 arg1) {
func_80311480(0xADB, 4, NULL, arg0->unk0, func_8038AF0C, NULL);
gcdialog_showText(0xADB, 4, NULL, arg0->unk0, func_8038AF0C, NULL);
arg0->unk4 = 1;
}
@@ -178,7 +178,7 @@ void func_8038AF90(Struct_MMM_47D0_0 *arg0, Struct68s *arg1, f32 arg2) {
player_getPosition(sp48);
func_8035179C(arg1, sp54);
if (!mapSpecificFlags_get(0) && (arg0->unk4 == 0) && (func_80258640(sp54, sp48) < 250.0f)){
if(func_80311480(0xADA, 0, NULL, NULL, NULL, NULL)) {
if(gcdialog_showText(0xADA, 0, NULL, NULL, NULL, NULL)) {
mapSpecificFlags_set(0, TRUE);
}
}