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/gfx | |
| parent | 70eac3a1f7a27d5b71b968708f423dbbff6b146c (diff) | |
Use constants to delineate map types, and factor out more data
Diffstat (limited to 'engine/gfx')
| -rwxr-xr-x | engine/gfx/palettes.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index f2019e85..f25ff215 100755 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -145,11 +145,11 @@ SetPal_Overworld: cp CAVERN jr z, .caveOrBruno ld a, [wCurMap] - cp REDS_HOUSE_1F + cp FIRST_INDOOR_MAP jr c, .townOrRoute cp CERULEAN_CAVE_2F jr c, .normalDungeonOrBuilding - cp NAME_RATERS_HOUSE + cp CERULEAN_CAVE_1F + 1 jr c, .caveOrBruno cp LORELEIS_ROOM jr z, .Lorelei @@ -158,7 +158,7 @@ SetPal_Overworld: .normalDungeonOrBuilding ld a, [wLastMap] ; town or route that current dungeon or building is located .townOrRoute - cp SAFFRON_CITY + 1 + cp NUM_CITY_MAPS jr c, .town ld a, PAL_ROUTE - 1 .town |