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 /scripts/CinnabarLabTradeRoom.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 'scripts/CinnabarLabTradeRoom.asm')
| -rw-r--r-- | scripts/CinnabarLabTradeRoom.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm index 1f8710be..64f1975d 100644 --- a/scripts/CinnabarLabTradeRoom.asm +++ b/scripts/CinnabarLabTradeRoom.asm @@ -12,13 +12,13 @@ Lab2Text1: Lab2Text2: text_asm - ld a, TRADE_FOR_DORIS + ld a, TRADE_FOR_BUFFY ld [wWhichTrade], a jr Lab2DoTrade Lab2Text3: text_asm - ld a, TRADE_FOR_CRINKLES + ld a, TRADE_FOR_CEZANNE ld [wWhichTrade], a Lab2DoTrade: predef DoInGameTradeDialogue |