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/indigoplateaulobby.asm | |
| parent | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (diff) | |
| parent | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'scripts/indigoplateaulobby.asm')
| -rwxr-xr-x | scripts/indigoplateaulobby.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm index bc82a4c6..63f228d0 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/indigoplateaulobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) +IndigoPlateauLobbyScript: call Serial_TryEstablishingExternallyClockedConnection call EnableAutoTextBoxDrawing ld hl, wCurrentMapScriptFlags @@ -14,7 +14,7 @@ IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR ret -IndigoPlateauLobbyTextPointers: ; 19c7f (6:5c7f) +IndigoPlateauLobbyTextPointers: dw IndigoPlateauLobbyText1 dw IndigoPlateauLobbyText2 dw IndigoPlateauLobbyText3 @@ -22,18 +22,18 @@ IndigoPlateauLobbyTextPointers: ; 19c7f (6:5c7f) dw IndigoPlateauLobbyText5 dw IndigoPlateauLobbyText6 -IndigoPlateauLobbyText1: ; 19c89 (6:5c89) +IndigoPlateauLobbyText1: TX_POKECENTER_NURSE -IndigoPlateauLobbyText2: ; 19c8a (6:5c8a) +IndigoPlateauLobbyText2: TX_FAR _IndigoPlateauLobbyText1 db "@" -IndigoPlateauLobbyText3: ; 19c8f (6:5c8f) +IndigoPlateauLobbyText3: TX_FAR _IndigoPlateauLobbyText3 db "@" -IndigoPlateauLobbyText5: ; 19c94 (6:5c94) +IndigoPlateauLobbyText5: TX_CABLE_CLUB_RECEPTIONIST IndigoPlateauLobbyText6: |