diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-09 12:47:43 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-09 12:47:43 -0400 |
| commit | 65d1e12d6ac15937977d28651a656ff255ea0d5d (patch) | |
| tree | 53cecd90548df6957851b2341cdaf2a060d68255 /data | |
| parent | 2a9ae6ecefe12e798c15e7a37a77005f5373aa9d (diff) | |
Require rgbds 0.5.1
Use some new features: \<10> macro args, SECTION UNION, SIZEOF/STARTOF, and CHARLEN/CHARSUB
Diffstat (limited to 'data')
| -rw-r--r-- | data/events/npc_trades.asm | 5 | ||||
| -rw-r--r-- | data/pokemon/unown_words.asm | 4 |
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 |