diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-30 15:11:22 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-30 15:11:22 -0400 |
| commit | a4e406b821808db73574193e0bfdffd6ee756687 (patch) | |
| tree | dd3bff339f85de031af3c977f9d7f72c9164e5db /arm9/lib/include | |
| parent | 1d92bac012170fda7ec543433eb9572f75f9b710 (diff) | |
| parent | b45ab57b275ffbd0a46852c62f824e6cff73e116 (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/include')
| -rw-r--r-- | arm9/lib/include/OS_reset.h | 1 | ||||
| -rw-r--r-- | arm9/lib/include/SND_main.h | 2 | ||||
| -rw-r--r-- | arm9/lib/include/registers.h | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/arm9/lib/include/OS_reset.h b/arm9/lib/include/OS_reset.h index 1efc3f2d..d3cb4355 100644 --- a/arm9/lib/include/OS_reset.h +++ b/arm9/lib/include/OS_reset.h @@ -18,6 +18,7 @@ static void OSi_SendToPxi(u16 data); void OS_ResetSystem(u32 parameter); void OSi_DoBoot(void); static void OSi_CpuClear32(register u32 data, register void *destp, register u32 size); +void OSi_ReadCardRom32(u32 src, void *dst, s32 len); static inline u32 OS_GetResetParameter(void) { diff --git a/arm9/lib/include/SND_main.h b/arm9/lib/include/SND_main.h index 7412c1ae..e35f1ee1 100644 --- a/arm9/lib/include/SND_main.h +++ b/arm9/lib/include/SND_main.h @@ -19,7 +19,7 @@ struct SNDBinaryFileHeader { typedef struct SNDBinaryBlockHeader { u32 type; // 0x0 u32 size; // 0x4 -}; // size = 0x8 +} SNDBinaryBlockHeader; // size = 0x8 struct SNDWaveParam { u8 format; // 0x0 diff --git a/arm9/lib/include/registers.h b/arm9/lib/include/registers.h index 366f4654..a1536eb8 100644 --- a/arm9/lib/include/registers.h +++ b/arm9/lib/include/registers.h @@ -98,9 +98,12 @@ #define reg_PXI_SEND_FIFO (*(REGType32v *)0x4000188) #define reg_MI_MCCNT0 (*(REGType16v *)0x40001a0) +#define reg_CARD_MASTERCNT (*(REGType8v *)0x40001a1) //? #define reg_MI_MCD0 (*(REGType16v *)0x40001a2) #define reg_MI_MCCNT1 (*(REGType32v *)0x40001a4) +#define reg_CARD_CNT (*(REGType32v *)0x40001a4) //? #define reg_MI_MCCMD0 (*(REGType32v *)0x40001a8) +#define reg_CARD_CMD (*(REGType8v *)0x40001a8) //? #define reg_MI_MCCMD1 (*(REGType32v *)0x40001ac) #define reg_MI_EXMEMCNT (*(REGType16v *)0x4000204) @@ -355,6 +358,7 @@ #define reg_PXI_RECV_FIFO (*(REGType32v *)0x4100000) #define reg_MI_MCD1 (*(REGType32v *)0x4100010) +#define reg_CARD_DATA (*(REGType32v *)0x4100010) //? #define REG_PAD_KEYINPUT_L_SHIFT 9 #define REG_PAD_KEYINPUT_L_SIZE 1 |