diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
| commit | f5983c0f813d3d908b6016db3ed866e4ca9437dc (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /scripts/indigoplateaulobby.asm | |
| parent | Character dict; surfing minigame; printer debug (diff) | |
| parent | More syncing with pokered (diff) | |
| download | pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.gz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.xz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/indigoplateaulobby.asm')
| -rwxr-xr-x | scripts/indigoplateaulobby.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm index c639adb7..36ed7fd5 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/indigoplateaulobby.asm @@ -1,7 +1,7 @@ -IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) +IndigoPlateauLobbyScript: call Serial_TryEstablishingExternallyClockedConnection call EnableAutoTextBoxDrawing - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z @@ -14,26 +14,26 @@ IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR ret -IndigoPlateauLobbyTextPointers: ; 19c7f (6:5c7f) - dw IndigoPlateauLobbyText1 +IndigoPlateauLobbyTextPointers: + dw IndigoHealNurseText dw IndigoPlateauLobbyText2 dw IndigoPlateauLobbyText3 - dw IndigoPlateauLobbyText4 - dw IndigoPlateauLobbyText5 + dw IndigoCashierText + dw IndigoTradeNurseText dw IndigoPlateauLobbyText6 -IndigoPlateauLobbyText1: ; 19c89 (6:5c89) +IndigoHealNurseText: TX_POKECENTER_NURSE -IndigoPlateauLobbyText2: ; 19c8a (6:5c8a) - TX_FAR _IndigoPlateauLobbyText1 +IndigoPlateauLobbyText2: + TX_FAR _IndigoPlateauLobbyText2 db "@" -IndigoPlateauLobbyText3: ; 19c8f (6:5c8f) +IndigoPlateauLobbyText3: TX_FAR _IndigoPlateauLobbyText3 db "@" -IndigoPlateauLobbyText5: ; 19c94 (6:5c94) +IndigoTradeNurseText: TX_CABLE_CLUB_RECEPTIONIST IndigoPlateauLobbyText6: |