diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-07-10 23:11:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-10 17:11:36 -0600 |
| commit | 6a8baf89369374a4e3bbccb5b45d5de36eb7e843 (patch) | |
| tree | aa7f4d83f1c965950b82165228903c68089eccc6 /src/racing | |
| parent | 371adbd7b98d221a460bbbb31301a81498d44227 (diff) | |
port pr 730 from the decomp (#445)
* port pr 730 from the decomp
Co-Authored-By: Jed Grabman <7600154+jedgrabman@users.noreply.github.com>
* rename file
* small fix
* finish fix time trial
---------
Co-authored-by: Jed Grabman <7600154+jedgrabman@users.noreply.github.com>
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/racing')
| -rw-r--r-- | src/racing/actors.c | 4 | ||||
| -rw-r--r-- | src/racing/actors.h | 2 | ||||
| -rw-r--r-- | src/racing/race_logic.c | 6 | ||||
| -rw-r--r-- | src/racing/race_logic.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/racing/actors.c b/src/racing/actors.c index 87c6e8231..05a56d68b 100644 --- a/src/racing/actors.c +++ b/src/racing/actors.c @@ -1632,7 +1632,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)) { - D_80162DF8 = 1; + gPostTimeTrialReplayCannotSave = 1; } } } else { @@ -2174,7 +2174,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)) { - D_80162DF8 = 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 4f71c9b97..8fa5741da 100644 --- a/src/racing/actors.h +++ b/src/racing/actors.h @@ -130,7 +130,7 @@ extern s16 gCurrentCourseId; extern u16 isCrossingTriggeredByIndex[]; extern Lights1 D_800DC610[]; -extern s32 D_80162DF8; +extern s32 gPostTimeTrialReplayCannotSave; extern s8 D_800DC628[]; extern s8 D_800DC630[]; diff --git a/src/racing/race_logic.c b/src/racing/race_logic.c index 243cba428..cd99ab400 100644 --- a/src/racing/race_logic.c +++ b/src/racing/race_logic.c @@ -7,7 +7,7 @@ #include <sounds.h> #include "camera.h" #include "waypoints.h" -#include "staff_ghosts.h" +#include "replays.h" #include "main.h" #include "code_800029B0.h" #include "code_80057C60.h" @@ -775,7 +775,7 @@ void func_8028F970(void) { gIsGamePaused = (controller - gControllerOne) + 1; controller->buttonPressed = 0; func_800C9F90(1); - D_80162DF0 = 1; + gPauseTriggered = 1; if (gModeSelection == TIME_TRIALS) { if (gPlayerOne->type & (PLAYER_EXISTS | PLAYER_INVISIBLE_OR_BOMB)) { func_80005AE8(gPlayerOne); @@ -907,7 +907,7 @@ void func_8028FCBC(void) { D_800DC5B0 = 0; D_800DC5B8 = 1; CM_SpawnStarterLakitu(); // func_80078F64(); - if ((gModeSelection == TIME_TRIALS) && (D_80162DD6 == 0)) { + if ((gModeSelection == TIME_TRIALS) && (bCourseGhostDisabled == 0)) { phi_v0_4 = 0x1; //! @warning this used to be < gCurrentCourseId // Hopefully this is equivallent. diff --git a/src/racing/race_logic.h b/src/racing/race_logic.h index d2c3d7936..e63094a30 100644 --- a/src/racing/race_logic.h +++ b/src/racing/race_logic.h @@ -39,6 +39,6 @@ void func_80290B14(void); extern f32 gLapCompletionPercentByPlayerId[]; extern s32 gGPCurrentRaceRankByPlayerId[]; // D_801643B8 (position for each player) -extern u16 D_80162DD6; +extern u16 bCourseGhostDisabled; #endif |