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/pewterpokecenter.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/pewterpokecenter.asm')
| -rwxr-xr-x | scripts/pewterpokecenter.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 90f5e2b9..70cf17f6 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -14,7 +14,7 @@ PewterPokecenterTextPointers: ; 5c58d (17:458d) dw PewterPokecenterText6 PewterPokecenterText1: ; 5c595 (17:4595) - db $ff + TX_POKECENTER_NURSE PewterPokecenterText2: ; 5c596 (17:4596) TX_FAR _PewterPokecenterText1 @@ -26,7 +26,7 @@ PewterPokecenterText3: ; 5c59b (17:459b) jp TextScriptEnd PewterPokecenterText4: ; 5c60c (17:460c) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST PewterPokecenterText5: ; 5c603 (17:4603) TX_ASM @@ -35,5 +35,5 @@ PewterPokecenterText5: ; 5c603 (17:4603) PewterPokecenterText6: TX_ASM - callab Func_f0f12 + callab PokecenterChanseyText jp TextScriptEnd |