diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2017-10-02 22:09:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 22:09:29 -0400 |
| commit | 2701191a769784640d6a4fb819ae48272d01eb75 (patch) | |
| tree | 6e6ebcf4bc02c2528e58ddcbe699b1d0601a50e1 /src/berry_fix_program.c | |
| parent | 4cf115000289d10de3408e752b37128446dd261c (diff) | |
| parent | 0fe97e838eab14723a4a38a773e2bc4d1494241e (diff) | |
Merge branch 'master' into unk_text_util_2
Diffstat (limited to 'src/berry_fix_program.c')
| -rw-r--r-- | src/berry_fix_program.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index f04308ae8..eca20af9d 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -129,8 +129,7 @@ static const u8 *const gUnknown_08618178[][3] = { }, }; -extern const u8 gUnknown_089A6550[0xC0]; -extern const u8 gMultiBootProgram_BerryGlitchFix_Start[0x3b34]; +extern const u8 gMultiBootProgram_BerryGlitchFix_Start[0x3BF4]; extern const u8 gMultiBootProgram_BerryGlitchFix_End[]; // .text @@ -174,7 +173,7 @@ static void berry_fix_main(void) case 3: if (berry_fix_text_update(1) == 1) { - berry_fix_mb_manager->mb.masterp = gUnknown_089A6550; + berry_fix_mb_manager->mb.masterp = gMultiBootProgram_BerryGlitchFix_Start; berry_fix_mb_manager->mb.server_type = 0; MultiBootInit(&berry_fix_mb_manager->mb); berry_fix_mb_manager->unk2 = 0; @@ -189,7 +188,7 @@ static void berry_fix_main(void) } else if (++ berry_fix_mb_manager->unk2 > 180) { - MultiBootStartMaster(&berry_fix_mb_manager->mb, gMultiBootProgram_BerryGlitchFix_Start, (u32)(gMultiBootProgram_BerryGlitchFix_End - gMultiBootProgram_BerryGlitchFix_Start), 4, 1); + MultiBootStartMaster(&berry_fix_mb_manager->mb, gMultiBootProgram_BerryGlitchFix_Start + ROM_HEADER_SIZE, (u32)(gMultiBootProgram_BerryGlitchFix_End - (gMultiBootProgram_BerryGlitchFix_Start + ROM_HEADER_SIZE)), 4, 1); berry_fix_mb_manager->state = 5; } break; |