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/pokemon/mail.c | |
| parent | 7383117626ebb2b3d993e5ad8855da5752c9cce8 (diff) | |
| parent | 68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff) | |
resolve merge conflicts and make it compile
Diffstat (limited to 'src/pokemon/mail.c')
| -rw-r--r-- | src/pokemon/mail.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index 160bce913..db0c96938 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -1600,7 +1600,7 @@ void debug_sub_810CE1C() "._197:\n" " .align 2, 0\n" "._196:\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" "\n" ); } @@ -1774,7 +1774,7 @@ void debug_sub_810CED0() " .word 0xffff\n" " .word gSaveBlock2\n" " .word 0x2b66\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_810CEA4+1\n" "._214:\n" " bl Menu_EraseScreen\n" @@ -2185,7 +2185,7 @@ void debug_sub_810D174() "._260:\n" " .align 2, 0\n" "._259:\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_810CE48+1\n" "._249:\n" " ldr r1, ._262\n" @@ -2194,7 +2194,7 @@ void debug_sub_810D174() "._263:\n" " .align 2, 0\n" "._262:\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_810CED0+1\n" "._255:\n" " ldr r1, ._265\n" @@ -2203,7 +2203,7 @@ void debug_sub_810D174() "._266:\n" " .align 2, 0\n" "._265:\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_810CFA4+1\n" "._256:\n" " ldr r1, ._267\n" @@ -2222,7 +2222,7 @@ void debug_sub_810D174() "._268:\n" " .align 2, 0\n" "._267:\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_810D030+1\n" "\n" ); @@ -2313,7 +2313,7 @@ void debug_sub_810D340() " .align 2, 0\n" "._281:\n" " .word _84116BC\n" - " .word gCallback_03004AE8\n" + " .word gMenuCallback\n" " .word debug_sub_810D2F4+1\n" "\n" ); |