summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-12-11 12:27:51 -0600
committercamthesaxman <cameronghall@cox.net>2017-12-11 12:27:51 -0600
commitc681b482c2ab0a4281cb6ad5927ce8ca565a3692 (patch)
treef921b45edbf2dfc050524dd48b1e0cf1bb6d45e9 /asm
parent19fbf024ff7e5bedc0f297a44c7df298a9bd0ef4 (diff)
convert more constants
Diffstat (limited to 'asm')
-rw-r--r--asm/macros/pokemon_data.inc2
-rw-r--r--asm/trade.s4
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