From a4df2578414fa534f065532b34032ee33a9dbcac Mon Sep 17 00:00:00 2001 From: coco875 Date: Thu, 10 Jul 2025 03:14:49 +0200 Subject: [PATCH] adjust some naming and other just two other in link with time trial --- src/actors/kiwano_fruit/update.inc.c | 2 +- src/menu_items.c | 10 +++++----- src/racing/actors.c | 4 ++-- src/racing/actors.h | 2 +- src/replays.c | 12 ++++++------ src/replays.h | 2 +- src/update_objects.c | 2 +- src/update_objects.h | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/actors/kiwano_fruit/update.inc.c b/src/actors/kiwano_fruit/update.inc.c index ed2a46a0c..ef1a634ab 100644 --- a/src/actors/kiwano_fruit/update.inc.c +++ b/src/actors/kiwano_fruit/update.inc.c @@ -58,7 +58,7 @@ void update_actor_kiwano_fruit(struct KiwanoFruit* fruit) { player->velocity[2] -= temp_f14 * 0.7f; func_800C9060(player - gPlayerOne, SOUND_ARG_LOAD(0x19, 0x00, 0x70, 0x18)); if (gModeSelection != GRAND_PRIX) { - gPostTTReplayCannotSave = 1; + gPostTimeTrialReplayCannotSave = 1; } } } diff --git a/src/menu_items.c b/src/menu_items.c index 0a33f77d4..edf8e9ad2 100644 --- a/src/menu_items.c +++ b/src/menu_items.c @@ -7346,7 +7346,7 @@ void func_800A3E60(MenuItem* arg0) { text_rainbow_effect(arg0->state - 5, var_s1, 1); switch (var_s1) { /* switch 3; irregular */ case 4: /* switch 3 */ - if (gPostTTReplayCannotSave == 1) { + if (gPostTimeTrialReplayCannotSave == 1) { var_v1 = 1; } break; @@ -11062,7 +11062,7 @@ void func_800AD2E8(MenuItem* arg0) { arg0->param2 = 0; arg0->column = 0; arg0->state = gTimeTrialsResultCursorSelection; - if ((arg0->state == 9) && (gPostTTReplayCannotSave == 1)) { + if ((arg0->state == 9) && (gPostTimeTrialReplayCannotSave == 1)) { arg0->state--; } D_800DC5EC->screenStartX = 0x00F0; @@ -11079,7 +11079,7 @@ void func_800AD2E8(MenuItem* arg0) { if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x800) { if (arg0->state >= 6) { arg0->state--; - if ((gPostTTReplayCannotSave == 1) && (arg0->state == 9)) { + if ((gPostTimeTrialReplayCannotSave == 1) && (arg0->state == 9)) { arg0->state--; } play_sound2(SOUND_MENU_CURSOR_MOVE); @@ -11092,7 +11092,7 @@ void func_800AD2E8(MenuItem* arg0) { if ((gControllerOne->buttonPressed | gControllerOne->stickPressed) & 0x400) { if (arg0->state < 0xA) { arg0->state++; - if ((gPostTTReplayCannotSave == 1) && (arg0->state == 9)) { + if ((gPostTimeTrialReplayCannotSave == 1) && (arg0->state == 9)) { arg0->state++; } if ((arg0->state == 0x0000000A) && (bPlayerGhostDisabled != 0)) { @@ -11821,7 +11821,7 @@ void func_800AEF14(MenuItem* arg0) { void func_800AEF74(MenuItem* arg0) { switch (arg0->state) { /* irregular */ case 0: - if (gPostTTReplayCannotSave == 1) { + if (gPostTimeTrialReplayCannotSave == 1) { arg0->state = 1; arg0->param1 = 0; } else if (playerHUD[PLAYER_ONE].raceCompleteBool == (s8) 1) { diff --git a/src/racing/actors.c b/src/racing/actors.c index dd10cb589..cf0c6cc84 100644 --- a/src/racing/actors.c +++ b/src/racing/actors.c @@ -1660,7 +1660,7 @@ bool collision_yoshi_egg(Player* player, struct YoshiValleyEgg* egg) { } else { apply_hit_sound_effect(player, player - gPlayerOne); if ((gModeSelection == TIME_TRIALS) && ((player->type & PLAYER_CPU) == 0)) { - gPostTTReplayCannotSave = 1; + gPostTimeTrialReplayCannotSave = 1; } } } else { @@ -2200,7 +2200,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor if (query_collision_player_vs_actor_item(player, actor) == COLLISION) { func_800C98B8(actor->pos, actor->velocity, SOUND_ACTION_EXPLOSION); if ((gModeSelection == TIME_TRIALS) && !(player->type & PLAYER_CPU)) { - gPostTTReplayCannotSave = 1; + gPostTimeTrialReplayCannotSave = 1; } if (player->effects & STAR_EFFECT) { actor->velocity[1] = 10.0f; diff --git a/src/racing/actors.h b/src/racing/actors.h index 41884f49a..095bf33c7 100644 --- a/src/racing/actors.h +++ b/src/racing/actors.h @@ -145,7 +145,7 @@ extern Gfx toads_turnpike_dl_9[]; extern Gfx toads_turnpike_dl_10[]; extern Gfx toads_turnpike_dl_11[]; -extern s32 gPostTTReplayCannotSave; +extern s32 gPostTimeTrialReplayCannotSave; extern Gfx D_0D001750[]; extern Gfx D_0D001780[]; diff --git a/src/replays.c b/src/replays.c index d8a4740de..5071c8bc6 100644 --- a/src/replays.c +++ b/src/replays.c @@ -66,7 +66,7 @@ s32 D_80162DE8; UNUSED static s32 sUnusedReplayCounter; s32 gPauseTriggered; UNUSED static s32 bUnusedCourseGhostDisabled; -s32 gPostTTReplayCannotSave; +s32 gPostTimeTrialReplayCannotSave; s32 D_80162DFC; s32 D_80162E00; @@ -214,7 +214,7 @@ void func_80005310(void) { sPrevCourseId = (u16) gCurrentCourseId; gPauseTriggered = 0; sUnusedReplayCounter = 0; - gPostTTReplayCannotSave = 0; + gPostTimeTrialReplayCannotSave = 0; if (gModeSelection == TIME_TRIALS && gActiveScreenMode == SCREEN_MODE_1P) { @@ -455,7 +455,7 @@ void save_player_replay(void) { /* Input file is too long or picked up by lakitu or Out of bounds Not sure if there is any way to be considered out of bounds without lakitu getting called */ if (((sPlayerInputIdx >= 0x1000) || ((gPlayerOne->unk_0CA & 2) != 0)) || ((gPlayerOne->unk_0CA & 8) != 0)) { - gPostTTReplayCannotSave = 1; + gPostTimeTrialReplayCannotSave = 1; return; } @@ -517,7 +517,7 @@ void func_80005AE8(Player* ply) { void func_80005B18(void) { if (gModeSelection == TIME_TRIALS) { - if ((gLapCountByPlayerId[0] == 3) && (D_80162DDC == 0) && (gPostTTReplayCannotSave != 1)) { + if ((gLapCountByPlayerId[0] == 3) && (D_80162DDC == 0) && (gPostTimeTrialReplayCannotSave != 1)) { if (bPlayerGhostDisabled == 1) { D_80162DD0 = D_80162DCC; func_800052A4(); @@ -551,7 +551,7 @@ void func_80005B18(void) { func_80005AE8(gPlayerThree); } } else { - if ((gLapCountByPlayerId[0] == 3) && (D_80162DDC == 0) && (gPostTTReplayCannotSave == 1)) { + if ((gLapCountByPlayerId[0] == 3) && (D_80162DDC == 0) && (gPostTimeTrialReplayCannotSave == 1)) { sReplayGhostBuffer = D_802BFB80.arraySize8[0][D_80162DC8][3].pixel_index_array; sReplayGhostBufferSize = D_80162D86; D_80162DDC = 1; @@ -608,5 +608,5 @@ void replays_loop(void) { } /* This only gets triggered when the previous if-statements are not met Seems like just for pausing */ - gPostTTReplayCannotSave = 1; + gPostTimeTrialReplayCannotSave = 1; } diff --git a/src/replays.h b/src/replays.h index 36aecf017..32c9f4c4e 100644 --- a/src/replays.h +++ b/src/replays.h @@ -36,6 +36,6 @@ extern s32 D_80162DE0; extern s32 D_80162DE4; extern s32 D_80162DE8; extern s32 gPauseTriggered; -extern s32 gPostTTReplayCannotSave; +extern s32 gPostTimeTrialReplayCannotSave; #endif /* STAFF_GHOSTS_H */ diff --git a/src/update_objects.c b/src/update_objects.c index 7533ae63a..1ea0f202b 100644 --- a/src/update_objects.c +++ b/src/update_objects.c @@ -206,7 +206,7 @@ void func_80072180(void) { if (gModeSelection == TIME_TRIALS) { if (((gPlayerOne->type & PLAYER_EXISTS) != 0) && ((gPlayerOne->type & (PLAYER_INVISIBLE_OR_BOMB | PLAYER_CPU)) == 0)) { - gPostTTReplayCannotSave = 1; + gPostTimeTrialReplayCannotSave = 1; } } } diff --git a/src/update_objects.h b/src/update_objects.h index bc2127942..e9381a8b7 100644 --- a/src/update_objects.h +++ b/src/update_objects.h @@ -385,7 +385,7 @@ extern u16* gHudLapTextures[]; extern u16* gPortraitTLUTs[]; extern u8* gPortraitTextures[]; -extern s32 gPostTTReplayCannotSave; +extern s32 gPostTimeTrialReplayCannotSave; extern s16 D_8016347C; extern s32 D_80165594; extern s32 D_80165598;