diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/map_events.s | 1 | ||||
| -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/unknown_serial_data.bin) | bin | 14176 -> 14176 bytes | |||
| -rw-r--r-- | data/multiboot_berry_glitch_fix.s | 2 | ||||
| -rw-r--r-- | data/multiboot_ereader.s | 5 | ||||
| -rw-r--r-- | data/multiboot_pokemon_colosseum.s | 2 | ||||
| -rw-r--r-- | data/unknown_serial_data.s | 5 |
8 files changed, 7 insertions, 8 deletions
diff --git a/data/map_events.s b/data/map_events.s index 5fd6a9331..1607ef982 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -11,7 +11,6 @@ #include "constants/weather.h" .include "asm/macros.inc" .include "constants/constants.inc" - .include "constants/item_data_constants.inc" .section .rodata 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 2ff3f88bc..2ff3f88bc 100644 --- a/data/pokemon_colosseum.mb +++ b/data/mb_colosseum.gba diff --git a/data/unknown_serial_data.bin b/data/mb_ereader.gba Binary files differindex 63d26ca2a..63d26ca2a 100644 --- a/data/unknown_serial_data.bin +++ b/data/mb_ereader.gba diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s index 1eb843d3f..9820f22d6 100644 --- a/data/multiboot_berry_glitch_fix.s +++ b/data/multiboot_berry_glitch_fix.s @@ -1,5 +1,5 @@ .section .rodata gMultiBootProgram_BerryGlitchFix_Start:: @ 86FFC6C - .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..d91fc2e23 --- /dev/null +++ b/data/multiboot_ereader.s @@ -0,0 +1,5 @@ + .section .rodata + +gMultiBootProgram_EReader_Start:: @ 86FC50C + .incbin "data/mb_ereader.gba" +gMultiBootProgram_EReader_End:: diff --git a/data/multiboot_pokemon_colosseum.s b/data/multiboot_pokemon_colosseum.s index bbc47a9e8..5d8abec4a 100644 --- a/data/multiboot_pokemon_colosseum.s +++ b/data/multiboot_pokemon_colosseum.s @@ -1,5 +1,5 @@ .section .rodata gMultiBootProgram_PokemonColosseum_Start:: @ 8703860 - .incbin "data/pokemon_colosseum.mb" + .incbin "data/mb_colosseum.gba" gMultiBootProgram_PokemonColosseum_End:: diff --git a/data/unknown_serial_data.s b/data/unknown_serial_data.s deleted file mode 100644 index ec5818604..000000000 --- a/data/unknown_serial_data.s +++ /dev/null @@ -1,5 +0,0 @@ - .section .rodata - -gUnknownSerialData_Start:: @ 86FC50C - .incbin "data/unknown_serial_data.bin" -gUnknownSerialData_End:: |