aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/CinnabarLabTradeRoom.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2023-11-20 00:33:27 -0600
committerdannye <33dannye@gmail.com>2023-11-20 20:23:27 -0600
commit298e99d3776580585c3f434e5d93137ae431bdd3 (patch)
treea808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/CinnabarLabTradeRoom.asm
parentAdd sound bits documentation for wOptions (#110) (diff)
parentName 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff)
downloadpokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz
pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz
pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/CinnabarLabTradeRoom.asm')
-rw-r--r--scripts/CinnabarLabTradeRoom.asm19
1 files changed, 10 insertions, 9 deletions
diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm
index 64f1975d..452aff5d 100644
--- a/scripts/CinnabarLabTradeRoom.asm
+++ b/scripts/CinnabarLabTradeRoom.asm
@@ -2,24 +2,25 @@ CinnabarLabTradeRoom_Script:
jp EnableAutoTextBoxDrawing
CinnabarLabTradeRoom_TextPointers:
- dw Lab2Text1
- dw Lab2Text2
- dw Lab2Text3
+ def_text_pointers
+ dw_const CinnabarLabTradeRoomSuperNerdText, TEXT_CINNABARLABTRADEROOM_SUPER_NERD
+ dw_const CinnabarLabTradeRoomGrampsText, TEXT_CINNABARLABTRADEROOM_GRAMPS
+ dw_const CinnabarLabTradeRoomBeautyText, TEXT_CINNABARLABTRADEROOM_BEAUTY
-Lab2Text1:
- text_far _Lab2Text1
+CinnabarLabTradeRoomSuperNerdText:
+ text_far _CinnabarLabTradeRoomSuperNerdText
text_end
-Lab2Text2:
+CinnabarLabTradeRoomGrampsText:
text_asm
ld a, TRADE_FOR_BUFFY
ld [wWhichTrade], a
- jr Lab2DoTrade
+ jr CinnabarLabTradeRoomDoTrade
-Lab2Text3:
+CinnabarLabTradeRoomBeautyText:
text_asm
ld a, TRADE_FOR_CEZANNE
ld [wWhichTrade], a
-Lab2DoTrade:
+CinnabarLabTradeRoomDoTrade:
predef DoInGameTradeDialogue
jp TextScriptEnd