diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-16 09:32:09 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-16 09:32:09 -0400 |
| commit | 8c83ebe9663ef317c8bd3b74339047bda29be1a4 (patch) | |
| tree | 07a174f77b42b51d6e2d7d0d2f5b124134ab79b2 /scripts | |
| parent | b9a113a9f4712771e37313a4c8a76f7ef23cebb2 (diff) | |
Define constants for in-game trades
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/CeruleanTradeHouse.asm | 2 | ||||
| -rwxr-xr-x | scripts/CinnabarLabFossilRoom.asm | 2 | ||||
| -rwxr-xr-x | scripts/CinnabarLabTradeRoom.asm | 4 | ||||
| -rwxr-xr-x | scripts/Route11Gate2F.asm | 2 | ||||
| -rwxr-xr-x | scripts/Route18Gate2F.asm | 2 | ||||
| -rwxr-xr-x | scripts/Route2TradeHouse.asm | 2 | ||||
| -rwxr-xr-x | scripts/UndergroundPathRoute5.asm | 2 | ||||
| -rwxr-xr-x | scripts/VermilionTradeHouse.asm | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/scripts/CeruleanTradeHouse.asm b/scripts/CeruleanTradeHouse.asm index ba88f1b5..66952cd4 100755 --- a/scripts/CeruleanTradeHouse.asm +++ b/scripts/CeruleanTradeHouse.asm @@ -11,7 +11,7 @@ CeruleanHouse1Text1: CeruleanHouse1Text2: text_asm - ld a, $6 + ld a, TRADE_FOR_LOLA ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm index 4bdb8a36..8fe52190 100755 --- a/scripts/CinnabarLabFossilRoom.asm +++ b/scripts/CinnabarLabFossilRoom.asm @@ -100,7 +100,7 @@ Lab4Text_75dd5: Lab4Text2: text_asm - ld a, $3 + ld a, TRADE_FOR_SAILOR ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm index d313c128..1f8710be 100755 --- a/scripts/CinnabarLabTradeRoom.asm +++ b/scripts/CinnabarLabTradeRoom.asm @@ -12,13 +12,13 @@ Lab2Text1: Lab2Text2: text_asm - ld a, $7 + ld a, TRADE_FOR_DORIS ld [wWhichTrade], a jr Lab2DoTrade Lab2Text3: text_asm - ld a, $8 + ld a, TRADE_FOR_CRINKLES ld [wWhichTrade], a Lab2DoTrade: predef DoInGameTradeDialogue diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm index 1797c540..21d742c0 100755 --- a/scripts/Route11Gate2F.asm +++ b/scripts/Route11Gate2F.asm @@ -9,7 +9,7 @@ Route11Gate2F_TextPointers: Route11GateUpstairsText1: text_asm - xor a + xor a ; TRADE_FOR_TERRY ld [wWhichTrade], a predef DoInGameTradeDialogue Route11GateUpstairsScriptEnd: diff --git a/scripts/Route18Gate2F.asm b/scripts/Route18Gate2F.asm index d7511859..efb6d70a 100755 --- a/scripts/Route18Gate2F.asm +++ b/scripts/Route18Gate2F.asm @@ -8,7 +8,7 @@ Route18Gate2F_TextPointers: Route18GateUpstairsText1: text_asm - ld a, $5 + ld a, TRADE_FOR_MARC ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/Route2TradeHouse.asm b/scripts/Route2TradeHouse.asm index fd3c51e3..85ed2d34 100755 --- a/scripts/Route2TradeHouse.asm +++ b/scripts/Route2TradeHouse.asm @@ -11,7 +11,7 @@ Route2HouseText1: Route2HouseText2: text_asm - ld a, $1 + ld a, TRADE_FOR_MARCEL ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/UndergroundPathRoute5.asm b/scripts/UndergroundPathRoute5.asm index 1cb1f78a..5c078050 100755 --- a/scripts/UndergroundPathRoute5.asm +++ b/scripts/UndergroundPathRoute5.asm @@ -11,7 +11,7 @@ UndergroundPathRoute5_TextPointers: UndergroundPathEntranceRoute5Text1: text_asm - ld a, $9 + ld a, TRADE_FOR_SPOT ld [wWhichTrade], a predef DoInGameTradeDialogue ld hl, UndergroundPathEntranceRoute5_TextScriptEndingText diff --git a/scripts/VermilionTradeHouse.asm b/scripts/VermilionTradeHouse.asm index 368654d9..7fdb9f40 100755 --- a/scripts/VermilionTradeHouse.asm +++ b/scripts/VermilionTradeHouse.asm @@ -6,7 +6,7 @@ VermilionTradeHouse_TextPointers: VermilionHouse3Text1: text_asm - ld a, $4 + ld a, TRADE_FOR_DUX ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd |