Define constants for in-game trades

wrulfy · Jul 16, 2020 · 8c83ebe · 8c83ebe
1 parent b9a113a
commit 8c83ebe
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 9 deletions.
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
@@ -12,6 +12,19 @@ SLOTSFISH EQU $0E0C
 SLOTSBIRD EQU $1210
 SLOTSMOUSE EQU $1614
 
+; in game trades
+ 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
+
 ; in game trade dialog sets
  const_def
  const TRADE_DIALOGSET_CASUAL

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,7 +6,7 @@ VermilionTradeHouse_TextPointers:
 
 VermilionHouse3Text1:
  text_asm
- ld a, $4
+ ld a, TRADE_FOR_DUX
  ld [wWhichTrade], a
  predef DoInGameTradeDialogue
  jp TextScriptEnd