diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-12-11 12:45:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 12:45:08 -0600 |
| commit | c9f196cdfea08eefffd39ebc77a150f197e1250e (patch) | |
| tree | af62f4a34588c3ad679249cfed757ac2a8eb075a /asm | |
| parent | 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 (diff) | |
| parent | 9525fdd54de805e8b45e23df6a57074e077c175d (diff) | |
Merge pull request #137 from camthesaxman/constants_headers
move constants to C headers
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/pokemon_data.inc | 2 | ||||
| -rw-r--r-- | asm/trade.s | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/asm/macros/pokemon_data.inc b/asm/macros/pokemon_data.inc index 31c015334..ce8ef98ac 100644 --- a/asm/macros/pokemon_data.inc +++ b/asm/macros/pokemon_data.inc @@ -52,5 +52,5 @@ .byte \max_level .endif - .2byte SPECIES_\species + .2byte \species .endm diff --git a/asm/trade.s b/asm/trade.s index f850cc5b4..d36ae3c67 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -1,5 +1,7 @@ .include "asm/macros.inc" - .include "constants/constants.inc" + .include "constants/gba_constants.inc" + .include "constants/misc_constants.inc" + .include "constants/species_constants.inc" .syntax unified |