diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2026-03-26 07:59:39 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-26 07:59:39 -0300 |
| commit | a9da608e187f0f6874ee15491347751751fcedeb (patch) | |
| tree | 3c6a69aad3623d66afd2ab6e46b2a693a2529b2d /include | |
| parent | 02eafced87237be63b32ddc187ea85faf92afe00 (diff) | |
[n64-jp-1.1] CIC6105.c matched (#1843)
* match CIC6105.c
* Renames and fixes
* Fix bss
* format
* Review
* Version check inequalities
Diffstat (limited to 'include')
| -rw-r--r-- | include/CIC6105.h | 6 | ||||
| -rw-r--r-- | include/PR/mbi.h | 1 | ||||
| -rw-r--r-- | include/PR/ucode.h | 3 | ||||
| -rw-r--r-- | include/regs.h | 1 |
4 files changed, 11 insertions, 0 deletions
diff --git a/include/CIC6105.h b/include/CIC6105.h index 09a363a4d..60c55cbc7 100644 --- a/include/CIC6105.h +++ b/include/CIC6105.h @@ -3,6 +3,8 @@ #include "ultra64.h" +#include "versions.h" + // IPL3 puts values in those addresses as part of the anti-piracy checks #define CIC_ADDRESS_1 0x002FB1F4 #define CIC_ADDRESS_2 0x002FE1C0 @@ -15,6 +17,10 @@ void CIC6105_AddRomInfoFaultPage(void); void CIC6105_Destroy(void); void CIC6105_Init(void); +#if MM_VERSION <= N64_JP_1_1 +void CIC6105_ScheduleCICTask(void); +#endif + extern s32 gCICAddr1Val; extern s32 gCICAddr2Val; diff --git a/include/PR/mbi.h b/include/PR/mbi.h index acfe89084..011107f2a 100644 --- a/include/PR/mbi.h +++ b/include/PR/mbi.h @@ -80,6 +80,7 @@ #define M_AUDTASK 2 #define M_VIDTASK 3 #define M_NJPEGTASK 4 +#define M_CICTASK 4 #define M_HVQTASK 6 #define M_HVQMTASK 7 diff --git a/include/PR/ucode.h b/include/PR/ucode.h index 848983ebe..bb0c1d1b4 100644 --- a/include/PR/ucode.h +++ b/include/PR/ucode.h @@ -13,6 +13,9 @@ extern u64 rspbootTextStart[]; extern u64 rspbootTextEnd[]; +extern u64 cic6105TextStart[]; +extern u64 cic6105TextEnd[]; + extern u64 aspMainTextStart[]; extern u64 aspMainTextEnd[]; extern u64 aspMainDataStart[]; diff --git a/include/regs.h b/include/regs.h index 7bd88d784..d45064640 100644 --- a/include/regs.h +++ b/include/regs.h @@ -68,6 +68,7 @@ extern RegEditor* gRegEditor; #define R_RUN_SPEED_LIMIT REG(45) #define R_ENABLE_ARENA_DBG SREG(0) // Same as OoT +#define R_AUDIOMGR_DEBUG_LEVEL SREG(20) #define R_ROOM_IMAGE_NODRAW_FLAGS SREG(25) #define R_UPDATE_RATE SREG(30) #define R_VI_MODE_EDIT_STATE SREG(48) |