diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2025-01-23 11:22:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-23 11:22:07 -0700 |
| commit | 1f189dfa804a05177f99dda1044898eb63fdcb3f (patch) | |
| tree | 598e0a6c26a5554afd1fcbcd801079fd1df090d3 /src/effects.c | |
| parent | 24ecfc3db43bfa606f41c42ef8778f96b5047c6b (diff) | |
Game.cpp and World.cpp Cleanup (#159)
* Remove CProperties and delete dup Properties from World.h
* Improvement
* Fix compile
* Cleanup
* Document gRaceState
* wip cleanup
* compile
* Impl PlayerBombKart
* Rename CourseManager_ to CM_
* Finish renames m_ to CM_
* cleanup
* Remove extra printf
---------
Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/effects.c')
| -rw-r--r-- | src/effects.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/effects.c b/src/effects.c index bff1803ff..06e476117 100644 --- a/src/effects.c +++ b/src/effects.c @@ -1510,7 +1510,7 @@ void func_8008FC1C(Player* player) { if ((player->type & PLAYER_UNKNOWN_0x40) != 0) { playerIndex = get_player_index_for_player(player); - player->type = 0x7000; + player->type = PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_KART_AI; func_80056A94(playerIndex); } } @@ -1522,7 +1522,6 @@ void func_8008FC64(Player* player, s8 arg1) { player->soundEffects &= 0xFBFFFFFF; player->soundEffects |= 0x08000000; player->type |= PLAYER_UNKNOWN_0x40; - func_8008FDA8(player, arg1); func_800569F4(arg1); } @@ -1534,7 +1533,6 @@ void func_8008FCDC(Player* player, s8 arg1) { player->unk_0C6 = 0xFF; player->soundEffects &= ~0x08000000; } - func_80056A40(arg1, (u32) player->unk_0C6); } @@ -1588,12 +1586,12 @@ void func_8008FEDC(Player* player, UNUSED s8 arg1) { player->kartHopAcceleration = 0.0f; } -void CourseManager_Waypoints(Player*, s8); +void CM_Waypoints(Player*, s8); void func_8008FF08(Player* player, s8 playerId) { s16 waypoint; - CourseManager_Waypoints(player, playerId); + CM_Waypoints(player, playerId); // switch (gCurrentCourseId) { // case COURSE_BOWSER_CASTLE: |