diff options
| author | dannye <33dannye@gmail.com> | 2022-09-11 23:34:59 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2022-09-12 00:53:37 -0500 |
| commit | ecab35295aefb44227ba38f257dc40c8c10474e3 (patch) | |
| tree | d04160bc19180ee50a941d121f90cc7071e7a672 /constants/script_constants.asm | |
| parent | Replace Hard-Coded Number With Constant (diff) | |
| parent | Add `UNUSED_TYPE`/`UNUSED_TYPE_END` constants (diff) | |
| download | pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.gz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.xz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'constants/script_constants.asm')
| -rw-r--r-- | constants/script_constants.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/constants/script_constants.asm b/constants/script_constants.asm index ed2ffe31..005fbb14 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -25,23 +25,23 @@ DEF SLOTS_SOMEONESKEYS EQU $ff ; in game trades ; TradeMons indexes (see data/events/trades.asm) const_def - const TRADE_FOR_TERRY - const TRADE_FOR_MARCEL - const TRADE_FOR_CHIKUCHIKU - const TRADE_FOR_SAILOR - const TRADE_FOR_DUX - const TRADE_FOR_MARC - const TRADE_FOR_LOLA - const TRADE_FOR_DORIS - const TRADE_FOR_CRINKLES - const TRADE_FOR_SPOT + const TRADE_FOR_GURIO + const TRADE_FOR_MILES + const TRADE_FOR_STINGER ; unused + const TRADE_FOR_STICKY + const TRADE_FOR_BART ; unused + const TRADE_FOR_SPIKE + const TRADE_FOR_MARTY ; unused + const TRADE_FOR_BUFFY + const TRADE_FOR_CEZANNE + const TRADE_FOR_RICKY DEF NUM_NPC_TRADES EQU const_value ; in game trade dialog sets ; InGameTradeTextPointers indexes (see engine/events/in_game_trades.asm) const_def const TRADE_DIALOGSET_CASUAL - const TRADE_DIALOGSET_POLITE + const TRADE_DIALOGSET_EVOLUTION const TRADE_DIALOGSET_HAPPY ; badges |