diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-04-18 18:14:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-18 18:14:36 -0400 |
| commit | 38d21bbe9753568ff3c708ec602d037aca6a0f27 (patch) | |
| tree | be399fb71b38c8f1974ab10f332a8632da924453 /src/boot_O2_g3 | |
| parent | 4647ebb91b9646d92d85929814815e48fa6e44ac (diff) | |
Name some `SurfaceType_` functions (#1155)
* enums
* renaming functions
* fixes
* SurfaceType_IsSoft
* type fixing
* format
* Update src/code/z_bgcheck.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_bgcheck.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* SurfaceType_GetFloorEffect
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* format
* bss
* cleanups
* extra material docs
* cleanup
* cleanups
* Remove Bg prefix
* minor fixes
* Remove BG_
* SURFACE_MATERIAL_DIRT_SHALLOW
* format
* bss
* bss
* review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* format
* format again
* bug
* format
* namefixer
* bss
* bss
* bss
* review
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Diffstat (limited to 'src/boot_O2_g3')
| -rw-r--r-- | src/boot_O2_g3/fault.c | 4 | ||||
| -rw-r--r-- | src/boot_O2_g3/irqmgr.c | 2 | ||||
| -rw-r--r-- | src/boot_O2_g3/z_std_dma.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/boot_O2_g3/fault.c b/src/boot_O2_g3/fault.c index 5e4f8e24a..2c8f4a667 100644 --- a/src/boot_O2_g3/fault.c +++ b/src/boot_O2_g3/fault.c @@ -802,8 +802,8 @@ void Fault_ThreadEntry(void* arg) { u32 pad; OSThread* faultedThread; - osSetEventMesg(10, &sFaultContext->queue, (OSMesg)1); - osSetEventMesg(12, &sFaultContext->queue, (OSMesg)2); + osSetEventMesg(OS_EVENT_CPU_BREAK, &sFaultContext->queue, (OSMesg)1); + osSetEventMesg(OS_EVENT_FAULT, &sFaultContext->queue, (OSMesg)2); while (1) { do { osRecvMesg(&sFaultContext->queue, &msg, OS_MESG_BLOCK); diff --git a/src/boot_O2_g3/irqmgr.c b/src/boot_O2_g3/irqmgr.c index 424451a5b..1f1e94ab4 100644 --- a/src/boot_O2_g3/irqmgr.c +++ b/src/boot_O2_g3/irqmgr.c @@ -161,7 +161,7 @@ void IrqMgr_Init(IrqMgr* irqmgr, void* stack, OSPri pri, u8 retraceCount) { irqmgr->lastPrenmiTime = 0; osCreateMesgQueue(&irqmgr->irqQueue, (OSMesg*)irqmgr->irqBuffer, ARRAY_COUNT(irqmgr->irqBuffer)); - osSetEventMesg(0xE, &irqmgr->irqQueue, (OSMesg)0x29D); + osSetEventMesg(OS_EVENT_PRENMI, &irqmgr->irqQueue, (OSMesg)0x29D); osViSetEvent(&irqmgr->irqQueue, (OSMesg)0x29A, retraceCount); osCreateThread(&irqmgr->thread, Z_THREAD_ID_IRQMGR, IrqMgr_ThreadEntry, irqmgr, stack, pri); diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c index 00d894f74..bbf8e4bed 100644 --- a/src/boot_O2_g3/z_std_dma.c +++ b/src/boot_O2_g3/z_std_dma.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" #include "stack.h" #include "stackcheck.h" |