diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-14 00:36:24 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-14 00:36:24 -0500 |
| commit | e48a401290e794854880f06fc230a369f37e6b9b (patch) | |
| tree | dcad6cd5d1a7e62a2f2a92522c5619d41dc416cf /data | |
| parent | 8745915dbd38e9647e0b27d20cb73da0fdde353f (diff) | |
Reorganize macros
Diffstat (limited to 'data')
| -rw-r--r-- | data/hm_moves.asm | 12 | ||||
| -rw-r--r-- | data/unown_words.asm | 67 |
2 files changed, 67 insertions, 12 deletions
diff --git a/data/hm_moves.asm b/data/hm_moves.asm deleted file mode 100644 index ac9f1f542..000000000 --- a/data/hm_moves.asm +++ /dev/null @@ -1,12 +0,0 @@ -; HM moves can't be forgotten - -HMMoves: ; 34f0 - db CUT - db FLY - db SURF - db STRENGTH - db FLASH - db WATERFALL - db WHIRLPOOL - db -1 ; end -; 34f8 diff --git a/data/unown_words.asm b/data/unown_words.asm new file mode 100644 index 000000000..a36dea6d1 --- /dev/null +++ b/data/unown_words.asm @@ -0,0 +1,67 @@ +unownword: macro +x = 1 + rept STRLEN(\1) + db STRSUB(\1, x, 1) - $40 +x = x + 1 + endr + db -1 +endm + +UnownWords: ; fba5a +; entries correspond to Unown forms + dw UnownWord1 + dw UnownWord1 + dw UnownWord2 + dw UnownWord3 + dw UnownWord4 + dw UnownWord5 + dw UnownWord6 + dw UnownWord7 + dw UnownWord8 + dw UnownWord9 + dw UnownWord10 + dw UnownWord11 + dw UnownWord12 + dw UnownWord13 + dw UnownWord14 + dw UnownWord15 + dw UnownWord16 + dw UnownWord17 + dw UnownWord18 + dw UnownWord19 + dw UnownWord20 + dw UnownWord21 + dw UnownWord22 + dw UnownWord23 + dw UnownWord24 + dw UnownWord25 + dw UnownWord26 +; fba90 + +UnownWord1: unownword "ANGRY" +UnownWord2: unownword "BEAR" +UnownWord3: unownword "CHASE" +UnownWord4: unownword "DIRECT" +UnownWord5: unownword "ENGAGE" +UnownWord6: unownword "FIND" +UnownWord7: unownword "GIVE" +UnownWord8: unownword "HELP" +UnownWord9: unownword "INCREASE" +UnownWord10: unownword "JOIN" +UnownWord11: unownword "KEEP" +UnownWord12: unownword "LAUGH" +UnownWord13: unownword "MAKE" +UnownWord14: unownword "NUZZLE" +UnownWord15: unownword "OBSERVE" +UnownWord16: unownword "PERFORM" +UnownWord17: unownword "QUICKEN" +UnownWord18: unownword "REASSURE" +UnownWord19: unownword "SEARCH" +UnownWord20: unownword "TELL" +UnownWord21: unownword "UNDO" +UnownWord22: unownword "VANISH" +UnownWord23: unownword "WANT" +UnownWord24: unownword "XXXXX" +UnownWord25: unownword "YIELD" +UnownWord26: unownword "ZOOM" +; fbb32 |