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/ceruleanhouse1.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/ceruleanhouse1.asm')
| -rwxr-xr-x | scripts/ceruleanhouse1.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/ceruleanhouse1.asm b/scripts/ceruleanhouse1.asm index 0b9a9052..ba75c240 100755 --- a/scripts/ceruleanhouse1.asm +++ b/scripts/ceruleanhouse1.asm @@ -1,14 +1,14 @@ -CeruleanHouse1Script: ; 1d6f6 (7:56f6) +CeruleanHouse1Script: call EnableAutoTextBoxDrawing ret -CeruleanHouse1TextPointers: ; 1d6f9 (7:56f9) +CeruleanHouse1TextPointers: dw CeruleanHouse1Text1 dw CeruleanHouse1Text2 dw CeruleanHouse1Text3 dw CeruleanHouse1Text4 -CeruleanHouse1Text1: ; 1d6fd (7:56fd) +CeruleanHouse1Text1: TX_ASM ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -84,21 +84,21 @@ CeruleanHouse1Text_1cfdf: TX_WAIT_BUTTON db "@" -CeruleanHouse1Text2: ; 1d702 (7:5702) +CeruleanHouse1Text2: TX_FAR MelanieBulbasaurText TX_ASM ld a, BULBASAUR call PlayCry jp TextScriptEnd -CeruleanHouse1Text3: ; 1d702 (7:5702) +CeruleanHouse1Text3: TX_FAR MelanieOddishText TX_ASM ld a, ODDISH call PlayCry jp TextScriptEnd -CeruleanHouse1Text4: ; 1d702 (7:5702) +CeruleanHouse1Text4: TX_FAR MelanieSandshrewText TX_ASM ld a, SANDSHREW |