summaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorcoco875 <59367621+coco875@users.noreply.github.com>2024-08-28 01:47:39 +0200
committerGitHub <noreply@github.com>2024-08-27 17:47:39 -0600
commita1f0d32d666c07d0754d97f107a5be59153768fd (patch)
treefcc84d9daa940274be8cf76715be902d93338e64 /src/main.h
parentbb3cbe0500197f894c83230a9a170a2cbe7aa3e8 (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/main.h')
-rw-r--r--src/main.h89
1 files changed, 44 insertions, 45 deletions
diff --git a/src/main.h b/src/main.h
index ac99447e8..3a5ceaf56 100644
--- a/src/main.h
+++ b/src/main.h
@@ -43,17 +43,17 @@
#define GFX_POOL_SIZE 15000
struct GfxPool {
- /* 0x00000 */ Mtx mtxScreen; // Matrix for skybox and startup logo
- /* 0x00040 */ Mtx mtxPersp[4]; // Matrix for perspective screen modes
- /* 0x00140 */ Mtx mtxOrtho; // Matrix for ortho hud screen modes
- /* 0x00180 */ Mtx mtxUnk; // Matrix unused
- /* 0x001C0 */ Mtx mtxLookAt[4]; // Matrix for lookat screen modes
- /* 0x002C0 */ Mtx mtxHud[MTX_HUD_POOL_SIZE]; // Matrix hud elements and 2D related effects
+ /* 0x00000 */ Mtx mtxScreen; // Matrix for skybox and startup logo
+ /* 0x00040 */ Mtx mtxPersp[4]; // Matrix for perspective screen modes
+ /* 0x00140 */ Mtx mtxOrtho; // Matrix for ortho hud screen modes
+ /* 0x00180 */ Mtx mtxUnk; // Matrix unused
+ /* 0x001C0 */ Mtx mtxLookAt[4]; // Matrix for lookat screen modes
+ /* 0x002C0 */ Mtx mtxHud[MTX_HUD_POOL_SIZE]; // Matrix hud elements and 2D related effects
/* 0x0CAC0 */ Mtx mtxObject[MTX_OBJECT_POOL_SIZE]; // Matrix course objects
/* 0x0EAC0 */ Mtx mtxShadow[MTX_SHADOW_POOL_SIZE]; // Matrix shadow characters
- /* 0x0F2C0 */ Mtx mtxKart[MTX_KART_POOL_SIZE]; // Matrix kart characters
+ /* 0x0F2C0 */ Mtx mtxKart[MTX_KART_POOL_SIZE]; // Matrix kart characters
/* 0x0FAC0 */ Mtx mtxEffect[MTX_EFFECT_POOL_SIZE]; // Matrix misc effects
- /* 0x19FC0 */ Mtx mtxArr[4]; // Matrix unused array
+ /* 0x19FC0 */ Mtx mtxArr[4]; // Matrix unused array
/* 0x1A0C0 */ Gfx gfxPool[GFX_POOL_SIZE];
/* 0x28B20 */ struct SPTask spTask;
}; // size = 0x28B70
@@ -63,7 +63,7 @@ typedef struct {
u16 numTriangles;
} CollisionGrid;
-void create_thread(OSThread*, OSId, void (*entry)(void *), void*, void*, OSPri);
+void create_thread(OSThread*, OSId, void (*entry)(void*), void*, void*, OSPri);
void main_func(void);
void thread1_idle(void*);
void setup_mesg_queues(void);
@@ -77,7 +77,7 @@ void dispatch_audio_sptask(struct SPTask*);
void exec_display_list(struct SPTask*);
void init_rcp(void);
void end_master_display_list(void);
-void *clear_framebuffer(s32);
+void* clear_framebuffer(s32);
void rendering_init(void);
void config_gfx_pool(void);
void display_and_vsync(void);
@@ -105,41 +105,40 @@ void thread5_game_loop(void);
void thread5_iteration(void);
void thread4_audio(void*);
+extern struct VblankHandler* gVblankHandler1;
+extern struct VblankHandler* gVblankHandler2;
-extern struct VblankHandler *gVblankHandler1;
-extern struct VblankHandler *gVblankHandler2;
-
-extern struct SPTask *gActiveSPTask;
-extern struct SPTask *sCurrentAudioSPTask;
+extern struct SPTask* gActiveSPTask;
+extern struct SPTask* sCurrentAudioSPTask;
extern struct SPTask* sCurrentDisplaySPTask;
extern struct SPTask* sNextAudioSPTask;
extern struct SPTask* sNextDisplaySPTask;
extern struct Controller gControllers[];
-extern struct Controller *gControllerOne;
-extern struct Controller *gControllerTwo;
-extern struct Controller *gControllerThree;
-extern struct Controller *gControllerFour;
-extern struct Controller *gControllerFive;
-extern struct Controller *gControllerSix;
-extern struct Controller *gControllerSeven;
-extern struct Controller *gControllerEight;
+extern struct Controller* gControllerOne;
+extern struct Controller* gControllerTwo;
+extern struct Controller* gControllerThree;
+extern struct Controller* gControllerFour;
+extern struct Controller* gControllerFive;
+extern struct Controller* gControllerSix;
+extern struct Controller* gControllerSeven;
+extern struct Controller* gControllerEight;
extern Player gPlayers[];
-extern Player *gPlayerOne;
-extern Player *gPlayerTwo;
-extern Player *gPlayerThree;
-extern Player *gPlayerFour;
-extern Player *gPlayerFive;
-extern Player *gPlayerSix;
-extern Player *gPlayerSeven;
-extern Player *gPlayerEight;
-
-extern Player *gPlayerOneCopy;
-extern Player *gPlayerTwoCopy;
+extern Player* gPlayerOne;
+extern Player* gPlayerTwo;
+extern Player* gPlayerThree;
+extern Player* gPlayerFour;
+extern Player* gPlayerFive;
+extern Player* gPlayerSix;
+extern Player* gPlayerSeven;
+extern Player* gPlayerEight;
+
+extern Player* gPlayerOneCopy;
+extern Player* gPlayerTwoCopy;
extern struct GfxPool gGfxPools[];
-extern struct GfxPool *gGfxPool;
+extern struct GfxPool* gGfxPool;
extern struct VblankHandler gGameVblankHandler;
extern struct VblankHandler sSoundVblankHandler;
@@ -177,11 +176,11 @@ extern f32 D_80150150;
extern struct D_80150158 gD_80150158[];
extern uintptr_t gSegmentTable[];
-extern Gfx *gDisplayListHead;
-extern struct SPTask *gGfxSPTask;
+extern Gfx* gDisplayListHead;
+extern struct SPTask* gGfxSPTask;
extern s32 D_801502A0;
extern s32 D_801502A4;
-extern u16 *gPhysicalFramebuffers[];
+extern u16* gPhysicalFramebuffers[];
extern uintptr_t gPhysicalZBuffer;
extern Mat4 D_801502C0;
@@ -206,13 +205,13 @@ extern OSMesgQueue gPIMesgQueue;
void race_logic_loop(void);
extern s32 gGamestate;
#ifndef D_800DC510_AS_U16
- // Prevent overlapping writes in gcc
- // Whether D_800DC510 was intended to be a separate variable in main.c from the rest of the game is unknown
- #ifdef GCC
- extern u16 D_800DC510;
- #else
- extern s32 D_800DC510;
- #endif
+// Prevent overlapping writes in gcc
+// Whether D_800DC510 was intended to be a separate variable in main.c from the rest of the game is unknown
+#ifdef GCC
+extern u16 D_800DC510;
+#else
+extern s32 D_800DC510;
+#endif
#endif
extern u16 D_800DC514;