diff options
| author | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
| commit | 11a9371349e1743a18dce28cc60b69dd6a29b665 (patch) | |
| tree | e696d1fda7556af8b5234eae833ea2fd146fc75d /src/debug/mori_debug_menu.c | |
| parent | 7383117626ebb2b3d993e5ad8855da5752c9cce8 (diff) | |
| parent | 68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff) | |
resolve merge conflicts and make it compile
Diffstat (limited to 'src/debug/mori_debug_menu.c')
| -rw-r--r-- | src/debug/mori_debug_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c index 7b9a579a7..767f4cda0 100644 --- a/src/debug/mori_debug_menu.c +++ b/src/debug/mori_debug_menu.c @@ -12,7 +12,7 @@ #define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT) -extern u8 (*gCallback_03004AE8)(void); +extern u8 (*gMenuCallback)(void); u8 gUnknown_03004DA0[0x20]; @@ -98,7 +98,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr) Menu_EraseScreen(); Menu_DrawStdWindowFrame(0, 14, 30, 19); Menu_PrintText(localPtr, 1, 15); - gCallback_03004AE8 = sub_8083D4C; + gMenuCallback = sub_8083D4C; return 0; } @@ -184,7 +184,7 @@ bool8 MoriDebugMenuProcessInput(void) switch (choice) { default: - gCallback_03004AE8 = gMoriDebugMenuActions[choice].func; + gMenuCallback = gMoriDebugMenuActions[choice].func; return FALSE; case -2: return FALSE; @@ -200,6 +200,6 @@ s8 InitMoriDebugMenu(void) Menu_DrawStdWindowFrame(0, 0, 10, 19); Menu_PrintItems(1, 1, 9, gMoriDebugMenuActions); InitMenu(0, 1, 1, 9, 0, 9); - gCallback_03004AE8 = MoriDebugMenuProcessInput; + gMenuCallback = MoriDebugMenuProcessInput; return 0; } |