diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-05 16:39:42 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-05 16:39:42 -0400 |
| commit | 08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239 (patch) | |
| tree | 7b5d7d54ed3ce4cebd9b3e2809c5ce54e8eaddfd /text | |
| parent | 8cdf73265f95e9a55112f373804867244512878d (diff) | |
| parent | 2f0305d80a0f64c093eabceb434a2fd0c122caa2 (diff) | |
Merge pull request #11 from PikalaxALT/master
MILESTONE: Finish disassembly
Diffstat (limited to 'text')
| -rwxr-xr-x | text/map_names.asm | 2 | ||||
| -rw-r--r-- | text/maps/agatha.asm | 2 | ||||
| -rw-r--r-- | text/maps/bruno.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/text/map_names.asm b/text/map_names.asm index dd8592be..0338cba3 100755 --- a/text/map_names.asm +++ b/text/map_names.asm @@ -98,7 +98,7 @@ RocketHQName: ; 7167a (1c:567a) SilphCoName: ; 71684 (1c:5684) db "SILPH CO.@" PokemonMansionName: ; 7168e (1c:568e) - db $4a," MANSION@" + db "<pkmn> MANSION@" SafariZoneName: ; 71698 (1c:5698) db "SAFARI ZONE@" CeruleanCaveName: ; 716a4 (1c:56a4) diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index 7d1b97bb..95b455c8 100644 --- a/text/maps/agatha.asm +++ b/text/maps/agatha.asm @@ -38,7 +38,7 @@ _AgathaAfterBattleText:: cont "along now, child!" done -_AgathaText2:: +_AgathaDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm index dea3d201..ddcbdb59 100644 --- a/text/maps/bruno.asm +++ b/text/maps/bruno.asm @@ -31,7 +31,7 @@ _BrunoAfterBattleText:: cont "challenge!" done -_UnnamedText_763d2:: +_BrunoDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done |