diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/LavenderMart.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/LavenderMart.asm')
| -rw-r--r-- | scripts/LavenderMart.asm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/LavenderMart.asm b/scripts/LavenderMart.asm index 2b67aaa6..15da1bfc 100644 --- a/scripts/LavenderMart.asm +++ b/scripts/LavenderMart.asm @@ -2,15 +2,16 @@ LavenderMart_Script: jp EnableAutoTextBoxDrawing LavenderMart_TextPointers: - dw LavenderCashierText - dw LavenderMartText2 - dw LavenderMartText3 + def_text_pointers + dw_const LavenderMartClerkText, TEXT_LAVENDERMART_CLERK + dw_const LavenderMartBaldingGuyText, TEXT_LAVENDERMART_BALDING_GUY + dw_const LavenderMartCooltrainerMText, TEXT_LAVENDERMART_COOLTRAINER_M -LavenderMartText2: - text_far _LavenderMartText2 +LavenderMartBaldingGuyText: + text_far _LavenderMartBaldingGuyText text_end -LavenderMartText3: +LavenderMartCooltrainerMText: text_asm CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .Nugget @@ -24,9 +25,9 @@ LavenderMartText3: jp TextScriptEnd .ReviveText - text_far _LavenderMartReviveText + text_far _LavenderMartCooltrainerMReviveText text_end .NuggetText - text_far _LavenderMartNuggetText + text_far _LavenderMartCooltrainerMNuggetText text_end |