diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2024-08-23 02:20:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-22 18:20:13 -0600 |
| commit | e135178097f416bc54e36058e10d9b1c013929fd (patch) | |
| tree | 0903c79b59ed716497e55618631d5e76611fe032 /src/code_80005FD0.c | |
| parent | 3781ce2830a143df855003b65fe069d2e26215d9 (diff) | |
Update from decomp (#34)
* Update menus.c (#634)
* Update common_data.yml (#635)
* Renames for screenId and other changes (#636)
* screenId renames
* Rename surface map to collision mesh (#637)
* Rename some stack vars (#638)
* Fix syntax error (#639)
* Rename some stack vars
* Update collision.c
* Collision Documentation (#640)
* Collision related renames
* update doxygen (#649)
* change bool (#644)
* Update (#642)
* Delete trig_tables_bss.c (#650)
* fix typo audio (#656)
* fix typo src actor (#657)
* fix typo include (#658)
* fix course (#659)
* fix typo debug (#660)
* fix typo data (#661)
* Update common_structs.h
* replace number with const (#665)
* fix typo buffers (#655)
* fix typo buffers
* tweak ld file
* rename to sMemoryPool
* add a warning
---------
* fix typo src (#654)
* fix typo src
* fix non matcing
* Update code_80091750.c
---------
* fix typo racing (#653)
* fix typo racing
* get it match
* replace G_LINE3D to G_QUAD
---------
* fix typo src (#652)
* fix ending typo (#651)
* Action more info when it doesn't match and fix first diff (#662)
* Update linux-compile.yml
* fix first-diff
* Update first-diff.py
---------
* document texture of kart (#663)
* document texture of kart
* change screenPlayerId to screenId
* some documentation around object
* Revert "some documentation around object"
This reverts commit cbb39078e036bf2a417bed67359e910213acab28.
* more rename
---------
* Make evaluate_collision_players_palm_tree better (#667)
This matches just the same as before, but using those two casts instead of
shifts seems more likely to be accurate to the original source code
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
* add fedora instruciton (#666)
* start documenting animation (#668)
* start documenting animation
* Update course_data.c
* change comment
* fix error of compilation
* fix error of compilation
* Update animation.c
Diffstat (limited to 'src/code_80005FD0.c')
| -rw-r--r-- | src/code_80005FD0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index a9ddf4917..b06034bf7 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -24,7 +24,7 @@ #include "bomb_kart.h" #include "courses/all_course_data.h" #include <assets/common_data.h> -#include "common_structs.h" +#include <common_structs.h> #include "main.h" #include "menus.h" #include "code_80091750.h" @@ -1412,7 +1412,7 @@ void func_800090F0(s32 playerId, Player *player) { f32 func_80009258(UNUSED s32 playerId, f32 arg1, f32 arg2) { f32 temp_f2 = D_8016344C - arg2; f32 temp_f12 = arg1 - D_8016344C; - return gCourseTimer - ( (COURSE_TIMER_ITER * temp_f2) / (temp_f2 + temp_f12) ); + return gCourseTimer - ( (COURSE_TIMER_ITER_f * temp_f2) / (temp_f2 + temp_f12) ); } #ifdef NON_MATCHING |