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

Renaming gcdialog_showText function

Browse Source
This commit is contained in:
Nabnut
2024-09-19 12:32:04 +02:00
parent db8a200799
commit 6cf31d1df0
100 changed files with 386 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/TTC/ch/blubber.c
View File

@@ -82,8 +82,8 @@ void func_803875D4(ActorMarker *marker){
this->actor_specific_1_f = 0.0f;
if(!mapSpecificFlags_get(2)) {
text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? 0xa2a : 0xa0d;
func_80311480( text_id, 0xf, this->position, this->marker, func_80387520, func_80387574);
text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_TEXT_UNKNOWN : ASSET_A0D_TEXT_UNKNOWN;
gcdialog_showText(text_id, 0xf, this->position, this->marker, func_80387520, func_80387574);
mapSpecificFlags_set(2, TRUE);
}
}
@@ -149,7 +149,7 @@ void func_803878CC(Actor * this){
&& !this->is_first_encounter
&& item_getCount(ITEM_18_GOLD_BULLIONS) == 0
){
func_80311480(0xa0b, 0xe, this->position, this->marker, func_80387520, NULL);
gcdialog_showText(ASSET_A0B_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80387520, NULL);
this->is_first_encounter = TRUE;
subaddie_set_state_forward(this, 3);
}
@@ -157,8 +157,9 @@ void func_803878CC(Actor * this){
if( mapSpecificFlags_get(0)
&& !this->unk138_23
){
if(item_getCount(ITEM_18_GOLD_BULLIONS) == 0)
func_80311480(0xa0c, 4, NULL, NULL, NULL, NULL);
if (item_getCount(ITEM_18_GOLD_BULLIONS) == 0) {
gcdialog_showText(ASSET_A0C_TEXT_UNKNOWN, 4, NULL, NULL, NULL, NULL);
}
this->unk138_23 = TRUE;
this->is_first_encounter = TRUE;

2
src/TTC/ch/clam.c
View File

@@ -249,7 +249,7 @@ void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_marker){
if(func_80297C6C() == 3) return;
if( !mapSpecificFlags_get(5) && func_80311480(0xA14, 0, NULL, NULL, NULL, NULL)){
if( !mapSpecificFlags_get(5) && gcdialog_showText(ASSET_A14_TEXT_UNKNOWN, 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(5, TRUE);
}

4
src/TTC/ch/leaky.c
View File

@@ -57,7 +57,7 @@ void chLeaky_update(Actor *this) {
&& !this->is_first_encounter
&& func_80329530(this, 250) && !func_80329530(this, 160)
&& !func_8028ECAC()
&& func_80311480(0xA1A, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showText(0xA1A, 0, NULL, NULL, NULL, NULL)
){
this->is_first_encounter = TRUE;
}
@@ -111,6 +111,6 @@ bool chLeaky_eggCollision(ActorMarker *marker){
levelSpecificFlags_set(2, TRUE);
levelSpecificFlags_set(5, TRUE);
func_80311480(ASSET_A28_TEXT_LEAKY_DONE, 0x2a, this->position, this->marker, __chLeaky_startCutscene, NULL);
gcdialog_showText(ASSET_A28_TEXT_LEAKY_DONE, 0x2a, this->position, this->marker, __chLeaky_startCutscene, NULL);
return TRUE;
}

2
src/TTC/ch/lockup.c
View File

@@ -81,7 +81,7 @@ void func_80389600(Actor *this){
&& func_80329530(this, 320)
&& !func_80329530(this, 160)
&& !func_8028ECAC()
&& func_80311480(0xA15, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showText(0xA15, 0, NULL, NULL, NULL, NULL)
){
this->is_first_encounter = TRUE;
}//L803896AC

8
src/TTC/ch/nipper.c
View File

@@ -147,7 +147,7 @@ void func_80388178(ActorMarker *this_marker, ActorMarker *other_marker) {
TTC_func_80387FF4(this);
this->lifetime_value = 80.0f;
func_80311480(0xA10, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(0xA10, 4, NULL, NULL, NULL, NULL);
return;
}
@@ -168,7 +168,7 @@ void func_80388344(ActorMarker * this_marker, ActorMarker *other_marker){
this = marker_getActor(this_marker);
if( !mapSpecificFlags_get(7)
&& this->is_first_encounter
&& func_80311480(0xa0f, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showText(0xa0f, 0, NULL, NULL, NULL, NULL)
){
mapSpecificFlags_set(7, TRUE);
}
@@ -179,7 +179,7 @@ void func_803883C8(ActorMarker * this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
if( !this->unk138_23
&& this->is_first_encounter
&& func_80311480(0xa11, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showText(0xa11, 0, NULL, NULL, NULL, NULL)
){
this->unk138_23 = TRUE;
}
@@ -234,7 +234,7 @@ void func_80388434(Actor *this){
&& temp_v0 != 10
){
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
if(func_80311480(0xa0e, 0xf, this->position, this->marker, TTC_func_80387FB0, NULL)){
if(gcdialog_showText(0xa0e, 0xf, this->position, this->marker, TTC_func_80387FB0, NULL)){
this->is_first_encounter = TRUE;
}
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 5000, 300);

6
src/TTC/ch/treasurehunt.c
View File

@@ -116,10 +116,10 @@ void func_80389A9C(void) {
void func_80389B38(s32 arg0){
if(D_8037DCB4 == arg0 && TTC_func_803899C0()){
if(arg0 == 0 && !jiggyscore_isCollected(JIGGY_11_TTC_RED_X)){
func_80311480(0xA18, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(0xA18, 4, NULL, NULL, NULL, NULL);
}
else if(arg0 == 4){
func_80311480(0xA19, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(0xA19, 4, NULL, NULL, NULL, NULL);
}
D_8037DCB4++;
@@ -170,7 +170,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){
gcpausemenu_80314AC8(0);
timedFunc_set_2(0.1f, (GenFunction_2) func_8028F45C, 9, (s32)&D_8038D708);
timedFunc_set_1(0.1f, (GenFunction_1) gcpausemenu_80314AC8, 1);
func_80311480(ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL);
D_8037DCB4++;
}//L80389E70
}

6
src/TTC/code_3E30.c
View File

@@ -681,7 +681,7 @@ void __sandcastleCodes_eraseGameDialogCallback(ActorMarker *caller, enum asset_e
if (confirmed == 1) {
__sandcastleCodes_setNumberEntered(3);
func_8038B800(D_8038CAD4);
func_80311480(0xFBF, 0xC, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_FBF_TEXT_UNKNOWN, 0xC, NULL, NULL, NULL, NULL);
gameFile_clear(func_802C5A30());
gameFile_8033CFD4(func_802C5A30());
func_802C5A3C(-1);
@@ -710,11 +710,11 @@ void TTC_func_8038BBA0(s32 secretCodeIndex) {
__sandcastleCodes_setNumberEntered(2);
func_8038B800(secretCodeIndex);
func_8038B5B4();
func_80311480(0xFBE, 0xC, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_FBE_TEXT_UNKNOWN, 0xC, NULL, NULL, NULL, NULL);
return;
case 2:
D_8038CAD4 = secretCodeIndex;
func_80311480(0xE38, 0xC, NULL, NULL, __sandcastleCodes_eraseGameDialogCallback, NULL);
gcdialog_showText(ASSET_E38_TEXT_UNKNOWN, 0xC, NULL, NULL, __sandcastleCodes_eraseGameDialogCallback, NULL);
return;
}
return;