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/viridianpokecenter.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/viridianpokecenter.asm')
| -rwxr-xr-x | scripts/viridianpokecenter.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/viridianpokecenter.asm b/scripts/viridianpokecenter.asm index f8aed602..c2e2d283 100755 --- a/scripts/viridianpokecenter.asm +++ b/scripts/viridianpokecenter.asm @@ -10,7 +10,7 @@ ViridianPokecenterTextPointers: ; 44263 (11:4263) dw ViridianPokeCenterText5 ViridianPokeCenterText1: ; 4426b (11:426b) - db $ff + TX_POKECENTER_NURSE ViridianPokeCenterText2: ; 4426c (11:426c) TX_FAR _ViridianPokeCenterText1 @@ -21,9 +21,9 @@ ViridianPokeCenterText3: ; 44271 (11:4271) db "@" ViridianPokeCenterText4: ; 44276 (11:4276) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST ViridianPokeCenterText5: TX_ASM - callab Func_f0f12 + callab PokecenterChanseyText jp TextScriptEnd |