diff options
author | SNBeast <snburchett@gmail.com> | 2021-07-10 03:07:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-10 03:07:05 +0000 |
commit | 795f3323f2649e89e3cfe89676bf0d0f182a6c5d (patch) | |
tree | 845d8dbe395227c709bd401d1d4e01f8eabfe467 /arm9/src | |
parent | d2a86ad721f4b57004c03cc11af8887b7694158d (diff) |
Fix the merge conflict right this time
Diffstat (limited to 'arm9/src')
-rw-r--r-- | arm9/src/game_init.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arm9/src/game_init.c b/arm9/src/game_init.c index 020d4b75..44dcc111 100644 --- a/arm9/src/game_init.c +++ b/arm9/src/game_init.c @@ -15,18 +15,6 @@ #pragma thumb on -typedef volatile struct -{ - u8 sys_and_irq_stack[0x3F80]; - u8 svc_stack[0x40]; - u8 reserved[0x38]; - u32 intr_check; - void * intr_vector; -} -OS_DTCM; - -#define DTCM (*(OS_DTCM *)HW_DTCM) - static struct { void * contents; u32 name_hash; |