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/lavenderpokecenter.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/lavenderpokecenter.asm')
| -rwxr-xr-x | scripts/lavenderpokecenter.asm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/lavenderpokecenter.asm b/scripts/lavenderpokecenter.asm index 452cc8a4..8f9c5454 100755 --- a/scripts/lavenderpokecenter.asm +++ b/scripts/lavenderpokecenter.asm @@ -7,12 +7,13 @@ LavenderPokecenterTextPointers: ; 5c8e0 (17:48e0) dw LavenderPokecenterText2 dw LavenderPokecenterText3 dw LavenderPokecenterText4 + dw LavenderPokecenterText5 LavenderPokecenterText4: ; 5c8e8 (17:48e8) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST LavenderPokecenterText1: ; 5c8e9 (17:48e9) - db $ff + TX_POKECENTER_NURSE LavenderPokecenterText2: ; 5c8ea (17:48ea) TX_FAR _LavenderPokecenterText1 @@ -21,3 +22,8 @@ LavenderPokecenterText2: ; 5c8ea (17:48ea) LavenderPokecenterText3: ; 5c8ef (17:48ef) TX_FAR _LavenderPokecenterText3 db "@" + +LavenderPokecenterText5: + TX_ASM + callab PokecenterChanseyText + jp TextScriptEnd |