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/code_80057C60.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/code_80057C60.h')
| -rw-r--r-- | src/code_80057C60.h | 142 |
1 files changed, 71 insertions, 71 deletions
diff --git a/src/code_80057C60.h b/src/code_80057C60.h index 2b76314cd..6fd7b67ab 100644 --- a/src/code_80057C60.h +++ b/src/code_80057C60.h @@ -7,15 +7,15 @@ // code_80057C60 -#define RENDER_SCREEN_MODE_1P_PLAYER_ONE PLAYER_ONE+SCREEN_MODE_1P -#define RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_ONE PLAYER_ONE+SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL -#define RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_TWO PLAYER_TWO+SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL -#define RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_ONE PLAYER_ONE+SCREEN_MODE_2P_SPLITSCREEN_VERTICAL+1 -#define RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_TWO PLAYER_TWO+SCREEN_MODE_2P_SPLITSCREEN_VERTICAL+1 -#define RENDER_SCREEN_MODE_3P_4P_PLAYER_ONE PLAYER_ONE+SCREEN_MODE_3P_4P_SPLITSCREEN+5 -#define RENDER_SCREEN_MODE_3P_4P_PLAYER_TWO PLAYER_TWO+SCREEN_MODE_3P_4P_SPLITSCREEN+5 -#define RENDER_SCREEN_MODE_3P_4P_PLAYER_THREE PLAYER_THREE+SCREEN_MODE_3P_4P_SPLITSCREEN+5 -#define RENDER_SCREEN_MODE_3P_4P_PLAYER_FOUR PLAYER_FOUR+SCREEN_MODE_3P_4P_SPLITSCREEN+5 +#define RENDER_SCREEN_MODE_1P_PLAYER_ONE PLAYER_ONE + SCREEN_MODE_1P +#define RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_ONE PLAYER_ONE + SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL +#define RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_TWO PLAYER_TWO + SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL +#define RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_ONE PLAYER_ONE + SCREEN_MODE_2P_SPLITSCREEN_VERTICAL + 1 +#define RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_TWO PLAYER_TWO + SCREEN_MODE_2P_SPLITSCREEN_VERTICAL + 1 +#define RENDER_SCREEN_MODE_3P_4P_PLAYER_ONE PLAYER_ONE + SCREEN_MODE_3P_4P_SPLITSCREEN + 5 +#define RENDER_SCREEN_MODE_3P_4P_PLAYER_TWO PLAYER_TWO + SCREEN_MODE_3P_4P_SPLITSCREEN + 5 +#define RENDER_SCREEN_MODE_3P_4P_PLAYER_THREE PLAYER_THREE + SCREEN_MODE_3P_4P_SPLITSCREEN + 5 +#define RENDER_SCREEN_MODE_3P_4P_PLAYER_FOUR PLAYER_FOUR + SCREEN_MODE_3P_4P_SPLITSCREEN + 5 typedef struct { char unk_00[0x4]; @@ -27,7 +27,7 @@ typedef struct { /** @cond */ -void func_8005C674(s8, s16 *, s16 *, s16 *); +void func_8005C674(s8, s16*, s16*, s16*); void func_80057C60(void); void func_80057CE4(void); void func_80057DD0(void); @@ -118,9 +118,9 @@ void func_8005D1F4(s32); void func_8005D290(void); void func_8005D6C0(Player*); void func_8005D794(Player*, UnkPlayerStruct258*, f32, f32, f32, s8, s8); -s32 func_8005D7D8(UnkPlayerStruct258*, s8, f32); -s32 func_8005D800(UnkPlayerStruct258*, s32, s16); -s32 func_8005D82C(UnkPlayerStruct258*, s32, s16); +s32 func_8005D7D8(UnkPlayerStruct258*, s8, f32); +s32 func_8005D800(UnkPlayerStruct258*, s32, s16); +s32 func_8005D82C(UnkPlayerStruct258*, s32, s16); void func_8005D898(Player*, s16, s32, s8, s8); void func_8005DA30(Player*, s16, s32, s8, s8); void func_8005DAD0(void); @@ -257,8 +257,8 @@ void func_80075CA8(void); void func_80085214(); extern s16 D_800E4730[]; -extern u8 **D_800E4770[]; -extern u8 **D_800E47A0[]; +extern u8** D_800E4770[]; +extern u8** D_800E47A0[]; extern s32 D_800E47DC[]; extern s32 D_800E480C[]; @@ -358,7 +358,7 @@ extern s32 D_80165860; extern s32 D_8016586C; extern s32 D_80165878; extern s32 D_8016587C; -extern u8 *D_80165880; +extern u8* D_80165880; extern s8 D_80165888; extern s8 D_80165890; extern s8 D_80165898; @@ -377,7 +377,7 @@ extern s8 D_801658FE; extern u8 gControllerRandom; extern s16 D_80165900; -extern s8 D_80165908; +extern s8 D_80165908; extern s8 D_80165A90; // extern Object gObjectList[]; -> objects.h @@ -410,10 +410,10 @@ extern Vec3su D_80183E98; // extern s32 indexObjectList1[]; -> objects.h // extern s32 indexObjectList2[]; -> objects.h -extern const char *gLakituTextureBuffer[4][2]; +extern const char* gLakituTextureBuffer[4][2]; // extern s32 indexObjectList3[]; -> objects.h -extern const char **gLakituTexturePtr; +extern const char** gLakituTexturePtr; // extern s32 indexObjectList4[]; -> objects.h // extern Collision D_8018C0B0[]; -> objects.h // extern s32 gObjectParticle1[]; -> objects.h @@ -432,11 +432,11 @@ extern hud_player playerHUD[]; extern struct_D_8018CE10 D_8018CE10[]; // extern s32 D_8018CF10; -> objects.h -extern Camera *D_8018CF14; +extern Camera* D_8018CF14; extern s16 D_8018CF18; -extern Player *D_8018CF1C; +extern Player* D_8018CF1C; extern s16 D_8018CF20; -extern Player *D_8018CF28[]; +extern Player* D_8018CF28[]; extern s16 D_8018CF48; extern s16 D_8018CF50[]; extern s16 D_8018CF60; @@ -454,10 +454,10 @@ extern s16 D_8018CFC0; extern s16 D_8018CFC8; extern s16 D_8018CFD0; extern s16 D_8018CFD8; -extern s8 D_8018CFAC[]; -extern s8 D_8018CFB4[]; -extern s8 D_8018CFBC[]; -extern s8 D_8018CFC4[]; +extern s8 D_8018CFAC[]; +extern s8 D_8018CFB4[]; +extern s8 D_8018CFBC[]; +extern s8 D_8018CFC4[]; extern s16 D_8018CFE0; extern f32 D_8018CFE4; extern s16 D_8018CFE8; @@ -521,7 +521,7 @@ extern s32 D_8018D1D4; // extern s32 D_8018D1D8; -> objects.h extern s32 D_8018D1DC; -extern u8 *D_8018D1E0; +extern u8* D_8018D1E0; extern f32 D_8018D1E8; extern s32 D_8018D1EC; // extern s32 D_8018D1F0; -> objects.h @@ -538,12 +538,12 @@ extern s16 D_8018D218; extern s32 D_8018D21C; extern u8 (*D_8018D220)[1024]; extern s32 D_8018D224; -extern u8 D_8018D228; +extern u8 D_8018D228; extern s32 D_8018D22C; // extern s8 D_8018D230; -> objects.h extern uintptr_t D_8018D240; -extern u8 *D_8018D248[]; +extern u8* D_8018D248[]; extern f32 D_8018D2A0; extern s32 D_8018D2A4; extern s32 D_8018D2AC; @@ -585,48 +585,48 @@ extern s32 gRaceFrameCounter; extern s32 D_8018D400; extern s32 D_8018D40C; extern s32 D_8018D410; -extern u8 *D_8018D420; -extern u8 *D_8018D424; -extern u8 *D_8018D428; -extern u8 *D_8018D42C; -extern u8 *D_8018D430; -extern u8 *D_8018D434; -extern u8 *D_8018D438; -extern u8 *D_8018D43C; -extern u8 *D_8018D440; -extern u8 *D_8018D444; -extern u8 *D_8018D448; -extern u8 *D_8018D44C; -extern u8 *D_8018D450; -extern u8 *D_8018D454; -extern u8 *D_8018D458; -extern u8 *D_8018D45C; -extern u8 *D_8018D460; -extern u8 *D_8018D464; -extern u8 *D_8018D468; -extern u8 *D_8018D46C; -extern u8 *D_8018D470; -extern u8 *D_8018D474; -extern u8 *D_8018D478; -extern u8 *D_8018D480; -extern u8 *D_8018D484; -extern u8 *D_8018D488; -extern u8 *D_8018D48C; +extern u8* D_8018D420; +extern u8* D_8018D424; +extern u8* D_8018D428; +extern u8* D_8018D42C; +extern u8* D_8018D430; +extern u8* D_8018D434; +extern u8* D_8018D438; +extern u8* D_8018D43C; +extern u8* D_8018D440; +extern u8* D_8018D444; +extern u8* D_8018D448; +extern u8* D_8018D44C; +extern u8* D_8018D450; +extern u8* D_8018D454; +extern u8* D_8018D458; +extern u8* D_8018D45C; +extern u8* D_8018D460; +extern u8* D_8018D464; +extern u8* D_8018D468; +extern u8* D_8018D46C; +extern u8* D_8018D470; +extern u8* D_8018D474; +extern u8* D_8018D478; +extern u8* D_8018D480; +extern u8* D_8018D484; +extern u8* D_8018D488; +extern u8* D_8018D48C; extern u8* D_8018D490; -extern u8 *D_8018D494; -extern u8 *D_8018D498; -extern u8 *D_8018D49C; -extern u8 *D_8018D4A0; -extern u8 *D_8018D4A4; -extern u8 *D_8018D4A8; -extern u8 *D_8018D4AC; -extern u8 *D_8018D4B0; -extern u8 *D_8018D4B4; -extern u8 *D_8018D4B8; -extern u8 *D_8018D4BC; -extern u8 *D_8018D4C0; -extern u8 *D_8018D4C4; -extern u8 *D_8018D4C8; +extern u8* D_8018D494; +extern u8* D_8018D498; +extern u8* D_8018D49C; +extern u8* D_8018D4A0; +extern u8* D_8018D4A4; +extern u8* D_8018D4A8; +extern u8* D_8018D4AC; +extern u8* D_8018D4B0; +extern u8* D_8018D4B4; +extern u8* D_8018D4B8; +extern u8* D_8018D4BC; +extern u8* D_8018D4C0; +extern u8* D_8018D4C4; +extern u8* D_8018D4C8; extern Vec3f D_8018D4D0[]; extern Vec3f D_8018D530[]; extern Vec3f D_8018D590[]; @@ -644,7 +644,7 @@ extern Vec3s D_8018D800[]; extern Vec3s D_8018D830[]; extern Vec3s D_8018D860[]; extern Vec3s D_8018D890[]; -extern s16 gPlayerBalloonCount[]; // D_8018D8C0 +extern s16 gPlayerBalloonCount[]; // D_8018D8C0 extern Vec3s D_8018D8D0[]; /** @endcond */ |
