diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
| commit | 5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch) | |
| tree | 97319f45578efa0901fb1986678c16bbdeda6bcc /engine/town_map.asm | |
| parent | Is this an OAM printer? (diff) | |
| parent | Clean up main.asm (diff) | |
| download | pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.gz pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.xz pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/town_map.asm')
| -rwxr-xr-x | engine/town_map.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/town_map.asm b/engine/town_map.asm index 2d4f0023..82e24d75 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -587,12 +587,12 @@ LoadTownMapEntry: ; 7137a (1c:537a) ld h, [hl] ld l, a ret - + ; ExternalMapEntries: ; 7139c (1c:539c) ; dr $7139c,$7140b ; InternalMapEntries: ; 7140b (1c:540b) ; dr $7140b,$7174b - + INCLUDE "data/town_map_entries.asm" INCLUDE "text/map_names.asm" ; TODO: relabel addresses |
