diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-03 17:54:53 -0400 |
| commit | 8cdf73265f95e9a55112f373804867244512878d (patch) | |
| tree | 64f4263b86839e1eb9770688ad890683fa89c503 /scripts/saffronpokecenter.asm | |
| parent | Update extras with fixed gbz80disasm.py (diff) | |
| parent | Fix tileset incbin statement alignment (diff) | |
| download | pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.gz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.xz pokeyellow-8cdf73265f95e9a55112f373804867244512878d.zip | |
Merge pull request #10 from PikalaxALT/master
Next batch of scripts, etc.
Diffstat (limited to 'scripts/saffronpokecenter.asm')
| -rwxr-xr-x | scripts/saffronpokecenter.asm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/saffronpokecenter.asm b/scripts/saffronpokecenter.asm index 8f569a8e..05420812 100755 --- a/scripts/saffronpokecenter.asm +++ b/scripts/saffronpokecenter.asm @@ -7,9 +7,10 @@ SaffronPokecenterTextPointers: ; 5d53b (17:553b) dw SaffronPokecenterText2 dw SaffronPokecenterText3 dw SaffronPokecenterText4 + dw SaffronPokecenterText5 SaffronPokecenterText1: ; 5d543 (17:5543) - db $ff + TX_POKECENTER_NURSE SaffronPokecenterText2: ; 5d544 (17:5544) TX_FAR _SaffronPokecenterText1 @@ -20,4 +21,9 @@ SaffronPokecenterText3: ; 5d549 (17:5549) db "@" SaffronPokecenterText4: ; 5d54e (17:554e) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST + +SaffronPokecenterText5: + TX_ASM + callab PokecenterChanseyText + jp TextScriptEnd |