diff options
| author | glank <tommy.bergman91@gmail.com> | 2020-03-21 12:31:29 +0100 |
|---|---|---|
| committer | glank <tommy.bergman91@gmail.com> | 2020-03-21 12:31:29 +0100 |
| commit | fa4c848cade2dab5e0834fb0f2a05b6fcef5b11e (patch) | |
| tree | 5e6bcee444ff58c5fd70a6d497abc9cbb96c5d9e /src/code/main.c | |
| parent | 8e5c9e78e4fd05f6bd49e1121d7c74b88aef8507 (diff) | |
| parent | af62b0e7d7d78a4060cf909b4ac1a4182a04a9db (diff) | |
Merge branch 'master' into z_en_tk
Diffstat (limited to 'src/code/main.c')
| -rw-r--r-- | src/code/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/main.c b/src/code/main.c index f69f62317..987654a41 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -7,7 +7,7 @@ u32 gScreenWidth = SCREEN_WIDTH; u32 gScreenHeight = SCREEN_HEIGHT; u32 gSystemHeapSize = 0; -u8* gAppNmiBufferPtr; +PreNmiBuff* gAppNmiBufferPtr; SchedContext gSchedContext; PadMgr gPadMgr; IrqMgr gIrqMgr; @@ -50,8 +50,8 @@ void Main(void* arg0) osSyncPrintf("mainproc 実行開始\n"); //Start running gScreenWidth = SCREEN_WIDTH; gScreenHeight = SCREEN_HEIGHT; - gAppNmiBufferPtr = osAppNmiBuffer; - func_8007BE60(gAppNmiBufferPtr); + gAppNmiBufferPtr = (PreNmiBuff*)osAppNmiBuffer; + PreNmiBuff_Init(gAppNmiBufferPtr); Fault_Start(); SysCfb_Init(0); sysHeap = (u32)gSystemHeap; @@ -112,7 +112,7 @@ void Main(void* arg0) if (*msg == OS_SC_PRE_NMI_MSG) { osSyncPrintf("main.c: リセットされたみたいだよ\n"); //Looks like it's been reset - func_8007BED4(gAppNmiBufferPtr); + PreNmiBuff_SetReset(gAppNmiBufferPtr); } } |