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/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);
}
}