diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-09 20:45:02 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-09 20:45:02 -0400 |
| commit | a2f7701f3441c71b0734a28d44168576f6f28716 (patch) | |
| tree | 84fecc02816fc4fc31fdd172e8e79fc59947cedb /constants/map_constants.asm | |
| parent | 0d687ba25ae223f6de2c69d46fd1c3df6ad52da3 (diff) | |
| parent | 2a529796374f3798fb507931a7c8a9bad4281107 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'constants/map_constants.asm')
| -rw-r--r-- | constants/map_constants.asm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index ad37e3cf..cbedef3f 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -253,7 +253,3 @@ ENDM mapconst LORELEIS_ROOM, 6, 5 ; $F5 mapconst BRUNOS_ROOM, 6, 5 ; $F6 mapconst AGATHAS_ROOM, 6, 5 ; $F7 - -IF DEF(_OPTION_BEACH_HOUSE) - mapconst BEACH_HOUSE, 4, 7 ; $F8 -ENDC |