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/nohara_debug_menu.c | |
| parent | 7383117626ebb2b3d993e5ad8855da5752c9cce8 (diff) | |
| parent | 68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff) | |
resolve merge conflicts and make it compile
Diffstat (limited to 'src/debug/nohara_debug_menu.c')
| -rw-r--r-- | src/debug/nohara_debug_menu.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index 629b7b9eb..a932fee8d 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -42,7 +42,7 @@ void InitNoharaDebugMenu() " .align 2, 0\n" "._1:\n" " .word gUnknown_Debug_083C4938\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_808F414+1\n" "\n" ); @@ -76,7 +76,7 @@ void debug_sub_808F414() "._7:\n" " .align 2, 0\n" "._6:\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word gUnknown_Debug_083C4938\n" "._4:\n" " bl CloseMenu\n" @@ -129,7 +129,7 @@ void NoharaDebugMenu_TV() "._8:\n" " .word gDebug_03000724+0x2\n" " .word gUnknown_Debug_083C4B8C\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_808F4AC+1\n" "\n" ); @@ -163,7 +163,7 @@ void debug_sub_808F4AC() "._14:\n" " .align 2, 0\n" "._13:\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word gUnknown_Debug_083C4B8C\n" "._11:\n" " bl CloseMenu\n" @@ -196,7 +196,7 @@ void debug_sub_808F4EC() " .align 2, 0\n" "._15:\n" " .word gUnknown_Debug_083C4980\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_808F648+1\n" "\n" ); @@ -379,7 +379,7 @@ void debug_sub_808F5D8() " .word gStringVar1\n" " .word gUnknown_Debug_083C4BD4\n" " .word gSpecialVar_0x8004\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_8090278+1\n" "\n" ); @@ -779,7 +779,7 @@ void debug_sub_808F8CC() " .word gUnknown_Debug_083C49CA\n" " .word gUnknown_Debug_083C4ABD+0xf\n" " .word gStringVar1\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_808F93C+1\n" "\n" ); @@ -1517,7 +1517,7 @@ void debug_sub_808FECC() " .word gUnknown_Debug_083C49CA\n" " .word gUnknown_Debug_083C4B20+0x4\n" " .word gStringVar1\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_808FF3C+1\n" "\n" ); @@ -1847,7 +1847,7 @@ void NoharaDebugMenu_Fan() " .align 2, 0\n" "._204:\n" " .word gUnknown_Debug_083C4D28\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_80901A4+1\n" "\n" ); @@ -1881,7 +1881,7 @@ void debug_sub_80901A4() "._210:\n" " .align 2, 0\n" "._209:\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word gUnknown_Debug_083C4D28\n" "._207:\n" " bl CloseMenu\n" @@ -1938,7 +1938,7 @@ void debug_sub_80901F8() "._211:\n" " .word gUnknown_Debug_083C4CA8\n" " .word gUnknown_083F8408\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_8090278+1\n" "\n" ); @@ -1974,7 +1974,7 @@ void debug_sub_8090238() "._213:\n" " .word gUnknown_Debug_083C4CA8\n" " .word gUnknown_083F8410\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_8090278+1\n" "\n" ); @@ -2040,7 +2040,7 @@ void debug_sub_809029C() " .word gStringVar1\n" " .word gSaveBlock1\n" " .word 0x13c2\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_8090278+1\n" "\n" ); |