summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-01-19 20:08:30 -0600
committerDiegoisawesome <diego@domoreaweso.me>2018-01-19 20:08:30 -0600
commit2d74179d866ea7cd9492cd2610ed2913676d1215 (patch)
tree6ab9c51636e177da0a1f8248bd523691db0fe387
parent4559a95d9b67a9f5e9f00d8e4349bb578ccf027f (diff)
parent4be109e60e963c7d1f74788d54232c3194000c63 (diff)
Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald
-rw-r--r--data/trade.s2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/trade.s b/data/trade.s
index 4958d5717..d9708d0e6 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -266,7 +266,7 @@ gJPText_Shedinja:: @ 832DF94
.string "ヌケニン$"
gUnknown_0832DF99:: @ 832DF99
- .incbin "baserom.gba", 0x32df99, 0x7
+ .byte 0x04, 0x03, 0x13, 0x03, 0x00, 0x00, 0x00
.align 2
gTradeBallPalette:: @ 832DFA0