summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-07-17 20:48:34 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-07-17 20:48:34 -0400
commitb23014cfa0573e53a104f433cf2d75f350340d60 (patch)
tree238805ebd3640688c171220a10334f665001b259 /data
parent23c169df9d72eb1c571f650a56252b772a17f85e (diff)
parent67ced1d77ec0d36cc2b6ebcbfc58ba28b357ddbb (diff)
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'data')
-rw-r--r--data/trader.s17
1 files changed, 0 insertions, 17 deletions
diff --git a/data/trader.s b/data/trader.s
deleted file mode 100644
index 5029338d2..000000000
--- a/data/trader.s
+++ /dev/null
@@ -1,17 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_083F62D8:: @ 83F62D8
- .4byte SecretBaseText_Tristan
- .4byte SecretBaseText_Philip
- .4byte SecretBaseText_Dennis
- .4byte SecretBaseText_Roberto
-
-gTraderDecorations:: @ 83F62E8
- .byte DECOR_DUSKULL_DOLL
- .byte DECOR_BALL_CUSHION
- .byte DECOR_TIRE
- .byte DECOR_PRETTY_FLOWERS