summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/events/npc_trades.asm5
-rw-r--r--data/pokemon/unown_words.asm4
2 files changed, 4 insertions, 5 deletions
diff --git a/data/events/npc_trades.asm b/data/events/npc_trades.asm
index 42715df1..47352952 100644
--- a/data/events/npc_trades.asm
+++ b/data/events/npc_trades.asm
@@ -1,9 +1,8 @@
npctrade: MACRO
; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested
db \1, \2, \3, \4, \5, \6, \7
- shift
- dw \7
- db \8, \9, 0
+ dw \8
+ db \9, \<10>, 0
ENDM
NPCTrades:
diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm
index 7c41e19a..11ddd46b 100644
--- a/data/pokemon/unown_words.asm
+++ b/data/pokemon/unown_words.asm
@@ -1,6 +1,6 @@
unownword: MACRO
-for x, STRLEN(\1)
- db STRSUB(\1, x + 1, 1) - "A" + FIRST_UNOWN_CHAR
+for n, CHARLEN(\1)
+ db CHARSUB(\1, n + 1) - "A" + FIRST_UNOWN_CHAR
endr
db -1
ENDM