diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
| commit | c979b3bb03b121dd03a800df74144cd69a74601a (patch) | |
| tree | 0d6bb48125efe6f6215347967383ba4c3b7da391 /scripts/lavendermart.asm | |
| parent | Sync with pokered (diff) | |
| parent | Part 1 of syncing with pokered. (diff) | |
| download | pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.gz pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.xz pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.zip | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'scripts/lavendermart.asm')
| -rwxr-xr-x | scripts/lavendermart.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/lavendermart.asm b/scripts/lavendermart.asm index 85518fd2..915c9662 100755 --- a/scripts/lavendermart.asm +++ b/scripts/lavendermart.asm @@ -1,16 +1,16 @@ -LavenderMartScript: ; 5c92c (17:492c) +LavenderMartScript: jp EnableAutoTextBoxDrawing -LavenderMartTextPointers: ; 5c92f (17:492f) +LavenderMartTextPointers: dw LavenderMartText1 dw LavenderMartText2 dw LavenderMartText3 -LavenderMartText2: ; 5c935 (17:4935) +LavenderMartText2: TX_FAR _LavenderMartText2 db "@" -LavenderMartText3: ; 5c93a (17:493a) +LavenderMartText3: TX_ASM CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .asm_c88d4 @@ -23,10 +23,10 @@ LavenderMartText3: ; 5c93a (17:493a) .asm_6d225 jp TextScriptEnd -LavenderMart_5c953: ; 5c953 (17:4953) +LavenderMart_5c953: TX_FAR _LavenderMart_5c953 db "@" -LavenderMart_5c958: ; 5c958 (17:4958) +LavenderMart_5c958: TX_FAR _LavenderMart_5c958 db "@" |