summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-11-27 02:19:02 -0800
committerYamaArashi <shadow962@live.com>2015-11-27 02:19:02 -0800
commit6105801ee7f6ef3e3e58fdd14fae8ccab507c441 (patch)
treea41f79af9cc02032df1384717e8045bd9a85ef15 /data
parent85036fe67f90992493292b922f29269bf3237c1d (diff)
split out multiboot.s
Diffstat (limited to 'data')
-rw-r--r--data/data2.s10
1 files changed, 7 insertions, 3 deletions
diff --git a/data/data2.s b/data/data2.s
index 794eb79d6..2c93284ec 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -12296,11 +12296,15 @@ gUnknown_089A3470: ; 89A3470
gUnknown_089A6550: ; 89A6550
.incbin "base_emerald.gba", 0x9a6550, 0xc0
-gUnknown_089A6610: ; 89A6610
+gMultiBootProgram_BerryGlitchFix_Start: ; 89A6610
.incbin "base_emerald.gba", 0x9a6610, 0x3b34
+gMultiBootProgram_BerryGlitchFix_End:
-gUnknown_089AA144: ; 89AA144
- .incbin "base_emerald.gba", 0x9aa144, 0x155ebc
+gMultiBootProgram_PokemonColosseum_Start: ; 89AA144
+ .incbin "base_emerald.gba", 0x9aa144, 0x28000
+gMultiBootProgram_PokemonColosseum_End:
+
+ zero_fill 0x8B00000 - 0x89D2144
; 8B00000
.include "data/graphics/pokemon/mon_front_pics.s"