diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
| commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
| tree | 70220c06025360d7089011f5d80239b61ac183af /data/event_scripts.s | |
| parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
| parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) | |
fix merge conflicts
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 4dd5761e5..0f6ea494e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -12,13 +12,13 @@ gScriptCmdTableEnd:: @ 81DBA08 gSpecialVars:: @ 81DBA0C .incbin "baserom.gba", 0x1dba0c, 0x58 -gUnknown_081DBA64:: @ 81DBA64 +gSpecials:: @ 81DBA64 .incbin "baserom.gba", 0x1dba64, 0x83c -gUnknown_081DC2A0:: @ 81DC2A0 +gStdScripts:: @ 81DC2A0 .incbin "baserom.gba", 0x1dc2a0, 0x2c -gUnknown_081DC2CC:: @ 81DC2CC +gStdScripts_End:: @ 81DC2CC .incbin "baserom.gba", 0x1dc2cc, 0x34ee gUnknown_081DF7BA:: @ 81DF7BA @@ -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 |