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/update_objects.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/update_objects.c')
| -rw-r--r-- | src/update_objects.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/update_objects.c b/src/update_objects.c index 03d085329..33474c201 100644 --- a/src/update_objects.c +++ b/src/update_objects.c @@ -7273,7 +7273,7 @@ void func_80084430(s32 objectIndex, UNUSED s32 arg1) { func_80086EF0(objectIndex); object->spline = D_800E672C[0]; set_object_flag_status_true(objectIndex, 0x04000800); - object->type = func_80004EAC(d_course_sherbet_land_unk_data11, 0); + object->type = get_animation_length(d_course_sherbet_land_unk_data11, 0); func_80072488(objectIndex); } @@ -7391,7 +7391,7 @@ void func_800845C8(s32 objectIndex, s32 arg1) { } func_80086EF0(objectIndex); object->unk_034 = 0.0f; - object->type = func_80004EAC(d_course_sherbet_land_unk_data11, 0); + object->type = get_animation_length(d_course_sherbet_land_unk_data11, 0); func_80072488(objectIndex); } @@ -7464,7 +7464,7 @@ void func_80084D2C(s32 objectIndex, s32 arg1) { gObjectList[objectIndex].unk_09C = 1; gObjectList[objectIndex].unk_0D8 = 1; gObjectList[objectIndex].itemDisplay = 0; - gObjectList[objectIndex].type = func_80004EAC(d_course_sherbet_land_unk_data11, gObjectList[objectIndex].unk_0D8); + gObjectList[objectIndex].type = get_animation_length(d_course_sherbet_land_unk_data11, gObjectList[objectIndex].unk_0D8); func_800726CC(objectIndex, 3); func_80086FD4(objectIndex); if (func_80072354(objectIndex, 0x00000020) != 0) { @@ -7504,7 +7504,7 @@ void func_80084D2C(s32 objectIndex, s32 arg1) { func_800722A4(objectIndex, 2); gObjectList[objectIndex].unk_0D8 = 2; gObjectList[objectIndex].itemDisplay = 0; - gObjectList[objectIndex].type = func_80004EAC(d_course_sherbet_land_unk_data11, gObjectList[objectIndex].unk_0D8); + gObjectList[objectIndex].type = get_animation_length(d_course_sherbet_land_unk_data11, gObjectList[objectIndex].unk_0D8); func_800726CC(objectIndex, 3); func_80086FD4(objectIndex); } @@ -7513,7 +7513,7 @@ void func_80084D2C(s32 objectIndex, s32 arg1) { if (func_80072354(objectIndex, 2) != 0) { gObjectList[objectIndex].unk_0D8 = 0; gObjectList[objectIndex].itemDisplay = 0; - gObjectList[objectIndex].type = func_80004EAC(d_course_sherbet_land_unk_data11, gObjectList[objectIndex].unk_0D8); + gObjectList[objectIndex].type = get_animation_length(d_course_sherbet_land_unk_data11, gObjectList[objectIndex].unk_0D8); gObjectList[objectIndex].unk_0C6 += 0x8000; func_800726CC(objectIndex, 2); func_8008701C(objectIndex, 1); @@ -7727,7 +7727,7 @@ void func_80085878(s32 objectIndex, s32 arg1) { set_obj_origin_offset(objectIndex, temp_v0->posX, temp_v0->posY, temp_v0->posZ); set_obj_direction_angle(objectIndex, 0U, 0U, 0U); object->unk_034 = 4.0f; - object->type = func_80004EAC(d_rainbow_road_unk3, 0); + object->type = get_animation_length(d_rainbow_road_unk3, 0); func_80072488(objectIndex); } |
