diff options
author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /data/trader.s | |
parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) |
Merge branch 'master' into link
Diffstat (limited to 'data/trader.s')
-rw-r--r-- | data/trader.s | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/data/trader.s b/data/trader.s new file mode 100644 index 000000000..1fe929ae7 --- /dev/null +++ b/data/trader.s @@ -0,0 +1,22 @@ + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_085B09E4:: @ 85B09E4 + .4byte gText_Tristan + .4byte gText_Philip + .4byte gText_Dennis + .4byte gText_Roberto + + .align 2 +gUnknown_085B09F4:: @ 85B09F4 + .byte 0x5b, 0x6b, 0x25, 0x15 + + .align 2 +gUnknown_085B09F8:: @ 85B09F8 + .4byte 0x0a010100, 0x00010f0a + + |