diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
| commit | 72ed86171500c58644655bac7d33c07749cbf299 (patch) | |
| tree | 66ef93a15092fa5978fe4c1409605fc3236390ef /data/event_scripts.s | |
| parent | 20d158cf4a17e8d362cdafbf13906c59d9916e24 (diff) | |
| parent | 3040c1e1aa07a8a6466dd3653462595c2dd0fc9c (diff) | |
fix rom3 conflicts
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 4dd5761e5..e700ad181 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -822,7 +822,15 @@ gUnknown_0827EE09:: @ 27EE09 .incbin "baserom.gba", 0x27ee09, 0x2 gUnknown_0827EE0B:: @ 827EE0B - .incbin "baserom.gba", 0x27ee0b, 0x118fa + .incbin "baserom.gba", 0x27ee0b, 0x46a + + .include "data/text/tv.inc" + + .incbin "baserom.gba", 0x0028c7e9, 0x90f + + .include "data/text/pokemon_news.inc" + + .incbin "baserom.gba", 0x28e066, 0x269f gUnknown_08290705:: @ 8290705 .incbin "baserom.gba", 0x290705, 0xeb |