diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-15 12:20:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-15 12:20:22 -0500 |
| commit | 755d9143a6c727d64f4a31418d4c4fdb1a47e110 (patch) | |
| tree | 8e1edecc2dc0a1e7186689af001190e6f3c839a2 /data | |
| parent | 9ded1eb14e4ce38724fccf4f9304913e8f3f4969 (diff) | |
| parent | fd7457b05a1b109ae42cb4a956266b6acebb5644 (diff) | |
Merge pull request #1600 from GriffinRichards/remove-berry-fix
Remove berry fix
Diffstat (limited to 'data')
| -rw-r--r-- | data/ereader_link_data.s | 6 | ||||
| -rwxr-xr-x | data/mb_berry_fix.gba | bin | 0 -> 15348 bytes | |||
| -rw-r--r-- | data/mb_colosseum.gba (renamed from data/pokemon_colosseum.mb) | bin | 163840 -> 163840 bytes | |||
| -rw-r--r-- | data/mb_ereader.gba (renamed from data/ereader_link_data.bin) | bin | 12512 -> 12512 bytes | |||
| -rw-r--r-- | data/multiboot_berry_glitch_fix.s | 2 | ||||
| -rw-r--r-- | data/multiboot_ereader.s | 6 | ||||
| -rw-r--r-- | data/multiboot_pokemon_colosseum.s | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/data/ereader_link_data.s b/data/ereader_link_data.s deleted file mode 100644 index d3269ebfe..000000000 --- a/data/ereader_link_data.s +++ /dev/null @@ -1,6 +0,0 @@ - .section .rodata - - .align 2 -gEReaderLinkData_Start:: - .incbin "data/ereader_link_data.bin" -gEReaderLinkData_End:: diff --git a/data/mb_berry_fix.gba b/data/mb_berry_fix.gba Binary files differnew file mode 100755 index 000000000..0afff07f5 --- /dev/null +++ b/data/mb_berry_fix.gba diff --git a/data/pokemon_colosseum.mb b/data/mb_colosseum.gba Binary files differindex fdeb854a0..fdeb854a0 100644 --- a/data/pokemon_colosseum.mb +++ b/data/mb_colosseum.gba diff --git a/data/ereader_link_data.bin b/data/mb_ereader.gba Binary files differindex 85057cf4e..85057cf4e 100644 --- a/data/ereader_link_data.bin +++ b/data/mb_ereader.gba diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s index 7d65c0d4d..d0d54d550 100644 --- a/data/multiboot_berry_glitch_fix.s +++ b/data/multiboot_berry_glitch_fix.s @@ -1,5 +1,5 @@ .section .rodata gMultiBootProgram_BerryGlitchFix_Start:: - .incbin "berry_fix/berry_fix.gba" + .incbin "data/mb_berry_fix.gba" gMultiBootProgram_BerryGlitchFix_End:: diff --git a/data/multiboot_ereader.s b/data/multiboot_ereader.s new file mode 100644 index 000000000..ab97f7279 --- /dev/null +++ b/data/multiboot_ereader.s @@ -0,0 +1,6 @@ + .section .rodata + + .align 2 +gMultiBootProgram_EReader_Start:: + .incbin "data/mb_ereader.gba" +gMultiBootProgram_EReader_End:: diff --git a/data/multiboot_pokemon_colosseum.s b/data/multiboot_pokemon_colosseum.s index 179f8a067..a5f894908 100644 --- a/data/multiboot_pokemon_colosseum.s +++ b/data/multiboot_pokemon_colosseum.s @@ -1,5 +1,5 @@ .section .rodata gMultiBootProgram_PokemonColosseum_Start:: - .incbin "data/pokemon_colosseum.mb" + .incbin "data/mb_colosseum.gba" gMultiBootProgram_PokemonColosseum_End:: |