diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-31 10:23:19 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-31 10:23:19 -0400 |
| commit | bfd9f617c96af851ad4100b752ea967ef8989edc (patch) | |
| tree | 078f667a596ee500839f21081c2371ade0ec7950 /engine/overworld | |
| parent | 70eac3a1f7a27d5b71b968708f423dbbff6b146c (diff) | |
Use constants to delineate map types, and factor out more data
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/map_sprites.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/missable_objects.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index 031ddc76..fa3a37dc 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -255,7 +255,7 @@ ReadSpriteSheetData: ; sets carry if the map is a city or route, unsets carry if not InitOutsideMapSprites: ld a, [wCurMap] - cp REDS_HOUSE_1F ; is the map a city or a route (map ID less than $25)? + cp FIRST_INDOOR_MAP ; is the map a city or a route? ret nc ; if not, return ld hl, MapSpriteSets add l diff --git a/engine/overworld/missable_objects.asm b/engine/overworld/missable_objects.asm index fd2fe578..31fdc257 100644 --- a/engine/overworld/missable_objects.asm +++ b/engine/overworld/missable_objects.asm @@ -1,6 +1,6 @@ MarkTownVisitedAndLoadMissableObjects:: ld a, [wCurMap] - cp ROUTE_1 + cp FIRST_ROUTE_MAP jr nc, .notInTown ld c, a ld b, FLAG_SET |