summaryrefslogtreecommitdiff
path: root/src/os
diff options
context:
space:
mode:
authorcoco875 <59367621+coco875@users.noreply.github.com>2024-08-23 02:20:13 +0200
committerGitHub <noreply@github.com>2024-08-22 18:20:13 -0600
commite135178097f416bc54e36058e10d9b1c013929fd (patch)
tree0903c79b59ed716497e55618631d5e76611fe032 /src/os
parent3781ce2830a143df855003b65fe069d2e26215d9 (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/os')
-rw-r--r--src/os/epidma.c2
-rw-r--r--src/os/leointerrupt.c2
-rw-r--r--src/os/osCartRomInit.c10
-rw-r--r--src/os/osEPiRawStartDma.c2
-rw-r--r--src/os/osPfsIsPlug.c2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/os/epidma.c b/src/os/epidma.c
index 3aa76f17a..fb9e36393 100644
--- a/src/os/epidma.c
+++ b/src/os/epidma.c
@@ -1,6 +1,6 @@
#ifdef VERSION_SH
-#include "PR/os_internal.h"
+#include <PR/os_internal.h>
#include "piint.h"
s32 osEPiStartDma(OSPiHandle *pihandle, OSIoMesg *mb, s32 direction) {
diff --git a/src/os/leointerrupt.c b/src/os/leointerrupt.c
index db221dba9..1bc26a1a9 100644
--- a/src/os/leointerrupt.c
+++ b/src/os/leointerrupt.c
@@ -1,5 +1,5 @@
#include "libultra_internal.h"
-#include "PR/rcp.h"
+#include <PR/rcp.h>
#include "bstring.h"
#include "piint.h"
#include "osint.h"
diff --git a/src/os/osCartRomInit.c b/src/os/osCartRomInit.c
index 389e69ea0..30af8aab6 100644
--- a/src/os/osCartRomInit.c
+++ b/src/os/osCartRomInit.c
@@ -1,10 +1,10 @@
#include "libultra_internal.h"
-#include "PR/os_vi.h"
-#include "PR/os_internal.h"
-#include "PR/R4300.h"
-#include "PR/rcp.h"
-#include "PR/os_pi.h"
+#include <PR/os_vi.h>
+#include <PR/os_internal.h>
+#include <PR/R4300.h>
+#include <PR/rcp.h>
+#include <PR/os_pi.h>
#include <libultraship.h>
OSPiHandle CartRomHandle;
diff --git a/src/os/osEPiRawStartDma.c b/src/os/osEPiRawStartDma.c
index 31d9fd37c..2c444d176 100644
--- a/src/os/osEPiRawStartDma.c
+++ b/src/os/osEPiRawStartDma.c
@@ -1,7 +1,7 @@
#include "libultra_internal.h"
#include "hardware.h"
#include "new_func.h"
-#include "PR/R4300.h"
+#include <PR/R4300.h>
//! @todo This define is from piint.h, but including that causes problems...
#define UPDATE_REG(reg, var) \
if (cHandle->var != pihandle->var) \
diff --git a/src/os/osPfsIsPlug.c b/src/os/osPfsIsPlug.c
index 4df1bf328..434a097c5 100644
--- a/src/os/osPfsIsPlug.c
+++ b/src/os/osPfsIsPlug.c
@@ -1,6 +1,6 @@
#include "libultra_internal.h"
-#include "PR/os_pi.h"
+#include <PR/os_pi.h>
#include "controller.h"
OSPifRam __osPfsPifRam;