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

16
src/FP/ch/boggy2.c
View File

@@ -124,10 +124,10 @@ void func_80388A50(Actor *this){
void func_80388A94(Actor *this){
func_80388A50(this);
if(mapSpecificFlags_get(6)){
func_80311480(0xc0a, 0xe, this->position, this->marker, func_80388D70, NULL);
gcdialog_showText(ASSET_C0A_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL);
}
else{
func_80311480(0xc09, 0xe, this->position, this->marker, func_80388D70, NULL);
gcdialog_showText(ASSET_C09_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL);
}
}
@@ -136,15 +136,15 @@ void func_80388B18(Actor *this, u8 arg1){
if(player_getTransformation() == TRANSFORM_4_WALRUS){
func_80388A50(this);
if(mapSpecificFlags_get(5)){
func_80311480(0xc05, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showText(ASSET_C05_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else{
func_80311480(0xc02, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showText(ASSET_C02_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
}
}
else{//L80388BB8
if(!volatileFlag_get(VOLATILE_FLAG_B3)){
if(func_80311480(0xc01, 0xe, this->position, this->marker, func_80388D70, NULL)){
if(gcdialog_showText(ASSET_C01_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){
volatileFlag_set(VOLATILE_FLAG_B3, TRUE);
func_80388A50(this);
}
@@ -154,7 +154,7 @@ void func_80388B18(Actor *this, u8 arg1){
else{//L80388C08
if(player_getTransformation() == TRANSFORM_4_WALRUS){
if(!volatileFlag_get(VOLATILE_FLAG_B4)){
if(func_80311480(0xc08, 0xe, this->position, this->marker, func_80388D70, NULL)){
if(gcdialog_showText(ASSET_C08_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){
volatileFlag_set(VOLATILE_FLAG_B4, TRUE);
func_80388A50(this);
}
@@ -478,13 +478,13 @@ void func_803896FC(Actor *this){
&& player_getTransformation() != TRANSFORM_4_WALRUS
&& volatileFlag_get(VOLATILE_FLAG_B3)
){
func_80311480(0xC01, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showText(ASSET_C01_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else if( local->unk19 == 2){
if( player_getTransformation() == TRANSFORM_4_WALRUS
&& volatileFlag_get(VOLATILE_FLAG_B4)
){
func_80311480(0xC08, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showText(ASSET_C08_TEXT_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else if( player_getTransformation() != TRANSFORM_4_WALRUS){
func_80388A94(this);