diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2024-08-28 01:47:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-27 17:47:39 -0600 |
| commit | a1f0d32d666c07d0754d97f107a5be59153768fd (patch) | |
| tree | fcc84d9daa940274be8cf76715be902d93338e64 /src/render_player.h | |
| parent | bb3cbe0500197f894c83230a9a170a2cbe7aa3e8 (diff) | |
Update decomp clang (#67)
* 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)
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
* Update (#642)
* Delete trig_tables_bss.c (#650)
* fix typo audio (#656)
* fix typo src actor (#657)
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
* fix typo include (#658)
* fix course (#659)
* fix typo debug (#660)
* fix typo data (#661)
* 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
* update libultra asm (#648)
* update libultra asm
* fix gcc __osThreadTail
---------
* Document Vehicles (#641)
* start doc collision
* fix merge
* finish rename fonction related to vehicle
* document around waypoint of vehicle
* make some modification
* make some change and rename one
* copy_ to oldPos
* doc smoke ferry and train
* some rename
* fix some renaming
* precise index
* rename a funciton
* simplify waypoint_vehicles
* change some name
* change some name
* rename move_to_point_direction
* fix some conflict
* Update code_80005FD0.c
* Update code_80005FD0.h
---------
* Label a save info loop (#645)
* save info
* more gcc progress
* fix a value and do a rename (#669)
* update clang and add action (#664)
* update clang and add action
* try clang on course folder only
* forget two file
* Update course_displaylists.inc.c
* forget few other file
* Update course_vertices.inc.c
* format all code while get it match
* second pass
* format other dir
* disable clang format on bad ido code
* fix some tabulation
* revert format on tool dir
* Update clang-format.yml
* ignore gbi.h
* add some read me instruction
* fix error
* format and fixing error
* Update README.md
---------
* Update linkonly_generator.py (#670)
* format more file
* update
* fix compilation issue
* remove course_metadata folder
* re add course metadata folder
* fix banshee bordwalk crash
* fix windows eurk
* Update CMakeLists.txt
---------
Diffstat (limited to 'src/render_player.h')
| -rw-r--r-- | src/render_player.h | 319 |
1 files changed, 158 insertions, 161 deletions
diff --git a/src/render_player.h b/src/render_player.h index 63e1a3afd..212f8810b 100644 --- a/src/render_player.h +++ b/src/render_player.h @@ -11,8 +11,8 @@ void func_8001F980(s32*, s32*); void func_8001F9E4(Player*, Camera*, s8); -u16 check_player_camera_collision(Player*, Camera*, f32, f32); -u16 func_8001FD78(Player*, f32, f32, f32); +u16 check_player_camera_collision(Player*, Camera*, f32, f32); +u16 func_8001FD78(Player*, f32, f32, f32); void init_render_player(Player*, Camera*, s8, s8); void load_kart_texture_and_render_kart_particle_on_screen_one(void); void load_kart_texture_and_render_kart_particle_on_screen_two(void); @@ -32,7 +32,7 @@ void func_80021F50(Mat4, Vec3f); void mtxf_scale2(Mat4, f32); void failed_fixed_point_matrix_conversion(Mtx*, Mat4); void convert_to_fixed_point_matrix(Mtx*, Mat4); -bool adjust_angle(s16*, s16, s16); +bool adjust_angle(s16*, s16, s16); void move_s32_towards(s32*, s32, f32); void move_f32_towards(f32*, f32, f32); void move_s16_towards(s16*, s16, f32); @@ -48,7 +48,7 @@ void func_80022DB4(Player*, s8); void func_80022E84(Player*, s8, s8, s8); void change_player_color_effect_rgb(Player*, s8, s32, f32); void change_player_color_effect_cmy(Player*, s8, s32, f32); -bool is_player_under_light_luigi_raceway(Player*, s8); +bool is_player_under_light_luigi_raceway(Player*, s8); void render_light_environment_on_player(Player*, s8); void func_800235AC(Player*, s8); void func_80023BF0(Player*, s8, s8, s8); @@ -67,13 +67,13 @@ void func_80027024(s32, s32, s32); /* This is where I'd put my static data, if I had any */ -extern struct_D_802F1F80 *gPlayerPalette; +extern struct_D_802F1F80* gPlayerPalette; extern s32 D_80164A28; extern s16 gPlayersToRenderPlayerId[]; extern s16 D_80164ABE[]; extern s16 gPlayersToRenderScreenId[]; -extern Player *gPlayersToRenderPlayer[]; +extern Player* gPlayersToRenderPlayer[]; extern s16 gMatrixEffectCount; extern u16 gPlayerRedEffect[]; extern u16 gPlayerGreenEffect[]; @@ -86,8 +86,8 @@ extern s32 D_80164B80[]; extern s32 D_8018D930[]; extern s32 gPlayersToRenderCount; -extern void *D_800DDB5C[]; -extern Vtx *D_800DDBB4[]; +extern void* D_800DDB5C[]; +extern Vtx* D_800DDBB4[]; extern f32 gCharacterSize[]; extern s32 D_800DDE74[]; extern Vtx D_800E51D0[]; @@ -123,163 +123,160 @@ extern u32 gKartPeachWheels1[]; extern u32 gKartWarioWheels0[]; extern u32 gKartWarioWheels1[]; - -extern u32 *gKartWheels0[]; -extern u32 *gKartWheels1[]; - - // These all come the kart data stuff, they should end up in their own inc.c eventually -// extern u8 *gKartMario168Wheel0[]; -// extern u8 *gKartMario147Wheel0[]; -// extern u8 *gKartMario126Wheel0[]; -// extern u8 *gKartMario105Wheel0[]; -// extern u8 *gKartMario084Wheel0[]; -// extern u8 *gKartMario063Wheel0[]; -// extern u8 *gKartMario042Wheel0[]; -// extern u8 *gKartMario021Wheel0[]; -// extern u8 *gKartMario000Wheel0[]; -// extern u8 *gKartMario269Wheel0[]; -// extern u8 *gKartMario269Wheel0[]; -// extern u8 *gKartMario249Wheel0[]; -// extern u8 *gKartMario229Wheel0[]; -// extern u8 *gKartMario229Wheel0[]; -// extern u8 *gKartMario229Wheel0[]; -// extern u8 *gKartMario209Wheel0[]; -// extern u8 *gKartMario189Wheel0[]; -// extern u8 *gKartMario189Wheel0[]; -// extern u8 *gKartLuigi168Wheel0[]; -// extern u8 *gKartLuigi147Wheel0[]; -// extern u8 *gKartLuigi126Wheel0[]; -// extern u8 *gKartLuigi105Wheel0[]; -// extern u8 *gKartLuigi084Wheel0[]; -// extern u8 *gKartLuigi063Wheel0[]; -// extern u8 *gKartLuigi042Wheel0[]; -// extern u8 *gKartLuigi021Wheel0[]; -// extern u8 *gKartLuigi000Wheel0[]; -// extern u8 *gKartLuigi269Wheel0[]; -// extern u8 *gKartLuigi269Wheel0[]; -// extern u8 *gKartLuigi249Wheel0[]; -// extern u8 *gKartLuigi229Wheel0[]; -// extern u8 *gKartLuigi229Wheel0[]; -// extern u8 *gKartLuigi229Wheel0[]; -// extern u8 *gKartLuigi209Wheel0[]; -// extern u8 *gKartLuigi189Wheel0[]; -// extern u8 *gKartLuigi189Wheel0[]; -// extern u8 *gKartBowser168Wheel0[]; -// extern u8 *gKartBowser147Wheel0[]; -// extern u8 *gKartBowser126Wheel0[]; -// extern u8 *gKartBowser105Wheel0[]; -// extern u8 *gKartBowser084Wheel0[]; -// extern u8 *gKartBowser063Wheel0[]; -// extern u8 *gKartBowser042Wheel0[]; -// extern u8 *gKartBowser021Wheel0[]; -// extern u8 *gKartBowser000Wheel0[]; -// extern u8 *gKartBowser269Wheel0[]; -// extern u8 *gKartBowser269Wheel0[]; -// extern u8 *gKartBowser249Wheel0[]; -// extern u8 *gKartBowser229Wheel0[]; -// extern u8 *gKartBowser229Wheel0[]; -// extern u8 *gKartBowser229Wheel0[]; -// extern u8 *gKartBowser209Wheel0[]; -// extern u8 *gKartBowser189Wheel0[]; -// extern u8 *gKartBowser189Wheel0[]; -// extern u8 *gKartToad168Wheel0[]; -// extern u8 *gKartToad147Wheel0[]; -// extern u8 *gKartToad126Wheel0[]; -// extern u8 *gKartToad105Wheel0[]; -// extern u8 *gKartToad084Wheel0[]; -// extern u8 *gKartToad063Wheel0[]; -// extern u8 *gKartToad042Wheel0[]; -// extern u8 *gKartToad021Wheel0[]; -// extern u8 *gKartToad000Wheel0[]; -// extern u8 *gKartToad269Wheel0[]; -// extern u8 *gKartToad269Wheel0[]; -// extern u8 *gKartToad249Wheel0[]; -// extern u8 *gKartToad229Wheel0[]; -// extern u8 *gKartToad229Wheel0[]; -// extern u8 *gKartToad229Wheel0[]; -// extern u8 *gKartToad209Wheel0[]; -// extern u8 *gKartToad189Wheel0[]; -// extern u8 *gKartToad189Wheel0[]; -// extern u8 *gKartYoshi168Wheel0[]; -// extern u8 *gKartYoshi147Wheel0[]; -// extern u8 *gKartYoshi126Wheel0[]; -// extern u8 *gKartYoshi105Wheel0[]; -// extern u8 *gKartYoshi084Wheel0[]; -// extern u8 *gKartYoshi063Wheel0[]; -// extern u8 *gKartYoshi042Wheel0[]; -// extern u8 *gKartYoshi021Wheel0[]; -// extern u8 *gKartYoshi000Wheel0[]; -// extern u8 *gKartYoshi269Wheel0[]; -// extern u8 *gKartYoshi269Wheel0[]; -// extern u8 *gKartYoshi249Wheel0[]; -// extern u8 *gKartYoshi229Wheel0[]; -// extern u8 *gKartYoshi229Wheel0[]; -// extern u8 *gKartYoshi229Wheel0[]; -// extern u8 *gKartYoshi209Wheel0[]; -// extern u8 *gKartYoshi189Wheel0[]; -// extern u8 *gKartYoshi189Wheel0[]; -// extern u8 *gKartDK168Wheel0[]; -// extern u8 *gKartDK147Wheel0[]; -// extern u8 *gKartDK126Wheel0[]; -// extern u8 *gKartDK105Wheel0[]; -// extern u8 *gKartDK084Wheel0[]; -// extern u8 *gKartDK063Wheel0[]; -// extern u8 *gKartDK042Wheel0[]; -// extern u8 *gKartDK021Wheel0[]; -// extern u8 *gKartDK000Wheel0[]; -// extern u8 *gKartDK269Wheel0[]; -// extern u8 *gKartDK269Wheel0[]; -// extern u8 *gKartDK249Wheel0[]; -// extern u8 *gKartDK229Wheel0[]; -// extern u8 *gKartDK229Wheel0[]; -// extern u8 *gKartDK229Wheel0[]; -// extern u8 *gKartDK209Wheel0[]; -// extern u8 *gKartDK189Wheel0[]; -// extern u8 *gKartDK189Wheel0[]; -// extern u8 *gKartPeach168Wheel0[]; -// extern u8 *gKartPeach147Wheel0[]; -// extern u8 *gKartPeach126Wheel0[]; -// extern u8 *gKartPeach105Wheel0[]; -// extern u8 *gKartPeach084Wheel0[]; -// extern u8 *gKartPeach063Wheel0[]; -// extern u8 *gKartPeach042Wheel0[]; -// extern u8 *gKartPeach021Wheel0[]; -// extern u8 *gKartPeach000Wheel0[]; -// extern u8 *gKartPeach269Wheel0[]; -// extern u8 *gKartPeach269Wheel0[]; -// extern u8 *gKartPeach249Wheel0[]; -// extern u8 *gKartPeach229Wheel0[]; -// extern u8 *gKartPeach229Wheel0[]; -// extern u8 *gKartPeach229Wheel0[]; -// extern u8 *gKartPeach209Wheel0[]; -// extern u8 *gKartPeach189Wheel0[]; -// extern u8 *gKartPeach189Wheel0[]; -// extern u8 *gKartWario168Wheel0[]; -// extern u8 *gKartWario147Wheel0[]; -// extern u8 *gKartWario126Wheel0[]; -// extern u8 *gKartWario105Wheel0[]; -// extern u8 *gKartWario084Wheel0[]; -// extern u8 *gKartWario063Wheel0[]; -// extern u8 *gKartWario042Wheel0[]; -// extern u8 *gKartWario021Wheel0[]; -// extern u8 *gKartWario000Wheel0[]; -// extern u8 *gKartWario269Wheel0[]; -// extern u8 *gKartWario269Wheel0[]; -// extern u8 *gKartWario249Wheel0[]; -// extern u8 *gKartWario229Wheel0[]; -// extern u8 *gKartWario229Wheel0[]; -// extern u8 *gKartWario229Wheel0[]; -// extern u8 *gKartWario209Wheel0[]; -// extern u8 *gKartWario189Wheel0[]; -// extern u8 *gKartWario189Wheel0[]; +#ifdef TARGET_N64 +extern u8* gKartMario168Wheel0[]; +extern u8* gKartMario147Wheel0[]; +extern u8* gKartMario126Wheel0[]; +extern u8* gKartMario105Wheel0[]; +extern u8* gKartMario084Wheel0[]; +extern u8* gKartMario063Wheel0[]; +extern u8* gKartMario042Wheel0[]; +extern u8* gKartMario021Wheel0[]; +extern u8* gKartMario000Wheel0[]; +extern u8* gKartMario269Wheel0[]; +extern u8* gKartMario269Wheel0[]; +extern u8* gKartMario249Wheel0[]; +extern u8* gKartMario229Wheel0[]; +extern u8* gKartMario229Wheel0[]; +extern u8* gKartMario229Wheel0[]; +extern u8* gKartMario209Wheel0[]; +extern u8* gKartMario189Wheel0[]; +extern u8* gKartMario189Wheel0[]; +extern u8* gKartLuigi168Wheel0[]; +extern u8* gKartLuigi147Wheel0[]; +extern u8* gKartLuigi126Wheel0[]; +extern u8* gKartLuigi105Wheel0[]; +extern u8* gKartLuigi084Wheel0[]; +extern u8* gKartLuigi063Wheel0[]; +extern u8* gKartLuigi042Wheel0[]; +extern u8* gKartLuigi021Wheel0[]; +extern u8* gKartLuigi000Wheel0[]; +extern u8* gKartLuigi269Wheel0[]; +extern u8* gKartLuigi269Wheel0[]; +extern u8* gKartLuigi249Wheel0[]; +extern u8* gKartLuigi229Wheel0[]; +extern u8* gKartLuigi229Wheel0[]; +extern u8* gKartLuigi229Wheel0[]; +extern u8* gKartLuigi209Wheel0[]; +extern u8* gKartLuigi189Wheel0[]; +extern u8* gKartLuigi189Wheel0[]; +extern u8* gKartBowser168Wheel0[]; +extern u8* gKartBowser147Wheel0[]; +extern u8* gKartBowser126Wheel0[]; +extern u8* gKartBowser105Wheel0[]; +extern u8* gKartBowser084Wheel0[]; +extern u8* gKartBowser063Wheel0[]; +extern u8* gKartBowser042Wheel0[]; +extern u8* gKartBowser021Wheel0[]; +extern u8* gKartBowser000Wheel0[]; +extern u8* gKartBowser269Wheel0[]; +extern u8* gKartBowser269Wheel0[]; +extern u8* gKartBowser249Wheel0[]; +extern u8* gKartBowser229Wheel0[]; +extern u8* gKartBowser229Wheel0[]; +extern u8* gKartBowser229Wheel0[]; +extern u8* gKartBowser209Wheel0[]; +extern u8* gKartBowser189Wheel0[]; +extern u8* gKartBowser189Wheel0[]; +extern u8* gKartToad168Wheel0[]; +extern u8* gKartToad147Wheel0[]; +extern u8* gKartToad126Wheel0[]; +extern u8* gKartToad105Wheel0[]; +extern u8* gKartToad084Wheel0[]; +extern u8* gKartToad063Wheel0[]; +extern u8* gKartToad042Wheel0[]; +extern u8* gKartToad021Wheel0[]; +extern u8* gKartToad000Wheel0[]; +extern u8* gKartToad269Wheel0[]; +extern u8* gKartToad269Wheel0[]; +extern u8* gKartToad249Wheel0[]; +extern u8* gKartToad229Wheel0[]; +extern u8* gKartToad229Wheel0[]; +extern u8* gKartToad229Wheel0[]; +extern u8* gKartToad209Wheel0[]; +extern u8* gKartToad189Wheel0[]; +extern u8* gKartToad189Wheel0[]; +extern u8* gKartYoshi168Wheel0[]; +extern u8* gKartYoshi147Wheel0[]; +extern u8* gKartYoshi126Wheel0[]; +extern u8* gKartYoshi105Wheel0[]; +extern u8* gKartYoshi084Wheel0[]; +extern u8* gKartYoshi063Wheel0[]; +extern u8* gKartYoshi042Wheel0[]; +extern u8* gKartYoshi021Wheel0[]; +extern u8* gKartYoshi000Wheel0[]; +extern u8* gKartYoshi269Wheel0[]; +extern u8* gKartYoshi269Wheel0[]; +extern u8* gKartYoshi249Wheel0[]; +extern u8* gKartYoshi229Wheel0[]; +extern u8* gKartYoshi229Wheel0[]; +extern u8* gKartYoshi229Wheel0[]; +extern u8* gKartYoshi209Wheel0[]; +extern u8* gKartYoshi189Wheel0[]; +extern u8* gKartYoshi189Wheel0[]; +extern u8* gKartDK168Wheel0[]; +extern u8* gKartDK147Wheel0[]; +extern u8* gKartDK126Wheel0[]; +extern u8* gKartDK105Wheel0[]; +extern u8* gKartDK084Wheel0[]; +extern u8* gKartDK063Wheel0[]; +extern u8* gKartDK042Wheel0[]; +extern u8* gKartDK021Wheel0[]; +extern u8* gKartDK000Wheel0[]; +extern u8* gKartDK269Wheel0[]; +extern u8* gKartDK269Wheel0[]; +extern u8* gKartDK249Wheel0[]; +extern u8* gKartDK229Wheel0[]; +extern u8* gKartDK229Wheel0[]; +extern u8* gKartDK229Wheel0[]; +extern u8* gKartDK209Wheel0[]; +extern u8* gKartDK189Wheel0[]; +extern u8* gKartDK189Wheel0[]; +extern u8* gKartPeach168Wheel0[]; +extern u8* gKartPeach147Wheel0[]; +extern u8* gKartPeach126Wheel0[]; +extern u8* gKartPeach105Wheel0[]; +extern u8* gKartPeach084Wheel0[]; +extern u8* gKartPeach063Wheel0[]; +extern u8* gKartPeach042Wheel0[]; +extern u8* gKartPeach021Wheel0[]; +extern u8* gKartPeach000Wheel0[]; +extern u8* gKartPeach269Wheel0[]; +extern u8* gKartPeach269Wheel0[]; +extern u8* gKartPeach249Wheel0[]; +extern u8* gKartPeach229Wheel0[]; +extern u8* gKartPeach229Wheel0[]; +extern u8* gKartPeach229Wheel0[]; +extern u8* gKartPeach209Wheel0[]; +extern u8* gKartPeach189Wheel0[]; +extern u8* gKartPeach189Wheel0[]; +extern u8* gKartWario168Wheel0[]; +extern u8* gKartWario147Wheel0[]; +extern u8* gKartWario126Wheel0[]; +extern u8* gKartWario105Wheel0[]; +extern u8* gKartWario084Wheel0[]; +extern u8* gKartWario063Wheel0[]; +extern u8* gKartWario042Wheel0[]; +extern u8* gKartWario021Wheel0[]; +extern u8* gKartWario000Wheel0[]; +extern u8* gKartWario269Wheel0[]; +extern u8* gKartWario269Wheel0[]; +extern u8* gKartWario249Wheel0[]; +extern u8* gKartWario229Wheel0[]; +extern u8* gKartWario229Wheel0[]; +extern u8* gKartWario229Wheel0[]; +extern u8* gKartWario209Wheel0[]; +extern u8* gKartWario189Wheel0[]; +extern u8* gKartWario189Wheel0[]; +#endif extern s16 D_80165020[40]; extern Vec3f D_80165070[8]; extern s16 gLastAnimFrameSelector[4][8]; -extern s16 gLastAnimGroupSelector[4][8]; -extern s16 D_80165150[4][8]; -extern s16 D_80165190[4][8]; -extern s16 D_801651D0[4][8]; +extern s16 gLastAnimGroupSelector[4][8]; +extern s16 D_80165150[4][8]; +extern s16 D_80165190[4][8]; +extern s16 D_801651D0[4][8]; #endif |
