diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:41:25 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:41:25 +0000 |
| commit | 2acab81713aac51f96a50dc42a67ec7761901aa4 (patch) | |
| tree | c39251dc3e6eb2f7cc884cbe4953b8c34dce8423 /data/event_scripts.s | |
| parent | e373cf4bb9217eb5e4edba08c7cb95ecc895b821 (diff) | |
| parent | 72b57b342eaf6e4a3ea77fae8b40e4ab11c64ae2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
also started fixing pointers in my dumps
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index ad1216b91..b650c7501 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -683,7 +683,16 @@ gUnknown_0827E8DA:: @ 827E8DA .incbin "baserom.gba", 0x27e8da, 0x132 gUnknown_0827EA0C:: @ 827EA0C - .incbin "baserom.gba", 0x27ea0c, 0x2b0 + .incbin "baserom.gba", 0x27ea0c, 0x13 + +@ 827EA1F + .include "data/text/contest_rank_text.inc" + +gUnknown_0827EA52:: @ 827EA52 + .incbin "baserom.gba", 0x27ea52, 0x2d + +@ 827EA7F + .include "data/text/contest_painting_descriptions.inc" gUnknown_0827ECBC:: @ 27ECBC .incbin "baserom.gba", 0x27ecbc, 0x7 @@ -1029,7 +1038,7 @@ gUnknown_082C8845:: @ 82C8845 gUnknown_082C892A:: @ 82C892A .incbin "baserom.gba", 0x2c892a, 0x2f -gUnknown_082C8959:: @ 82C8959 +gText_SavingDontTurnOffPower:: @ 82C8959 .incbin "baserom.gba", 0x2c8959, 0x22 gUnknown_082C897B:: @ 82C897B |