diff options
| author | Melody <melody@pallet.town> | 2018-12-24 21:22:56 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-12-28 08:22:21 -0600 |
| commit | 6d556f8cf77a21b20cdad75de69eaf61a59cf54e (patch) | |
| tree | a55ada3c41c9ffe7c590d13555bf4318ae05f674 /asm | |
| parent | d59f5a8e5649ad09a41b65edcc68f701320ca52e (diff) | |
improve checkplayergender calls
clean up constant definitions
make tweaks from review
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/trade.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/trade.s b/asm/trade.s index eb2d22b06..b833240dd 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -1,6 +1,6 @@ .include "asm/macros.inc" .include "constants/gba_constants.inc" - .include "constants/misc_constants.inc" + .include "constants/global.inc" .syntax unified @@ -2399,7 +2399,7 @@ _08078726: bne _08078766 adds r0, r4, 0 movs r1, 0x2 - ldr r2, =gSpeciesNames + 303 * POKEMON_NAME_LENGTH @ SPECIES_SHEDINJA + ldr r2, =gSpeciesNames + 303 * 11 @ SPECIES_SHEDINJA * POKEMON_NAME_LENGTH + 1 bl SetMonData _08078766: adds r4, 0x64 |