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 /engine/town_map.asm | |
| parent | 8cdf73265f95e9a55112f373804867244512878d (diff) | |
| parent | 2f0305d80a0f64c093eabceb434a2fd0c122caa2 (diff) | |
Merge pull request #11 from PikalaxALT/master
MILESTONE: Finish disassembly
Diffstat (limited to 'engine/town_map.asm')
| -rwxr-xr-x | engine/town_map.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/town_map.asm b/engine/town_map.asm index aff126ee..2d4f0023 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -588,14 +588,14 @@ LoadTownMapEntry: ; 7137a (1c:537a) ld l, a ret -ExternalMapEntries: ; 7139c (1c:539c) - dr $7139c,$7140b -InternalMapEntries: ; 7140b (1c:540b) - dr $7140b,$7174b +; ExternalMapEntries: ; 7139c (1c:539c) + ; dr $7139c,$7140b +; InternalMapEntries: ; 7140b (1c:540b) + ; dr $7140b,$7174b -;INCLUDE "data/town_map_entries.asm" +INCLUDE "data/town_map_entries.asm" -;INCLUDE "text/map_names.asm" ; TODO: relabel addresses +INCLUDE "text/map_names.asm" ; TODO: relabel addresses MonNestIcon: ; 7174b (1c:574b) INCBIN "gfx/mon_nest_icon.1bpp" |