summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2018-10-03 11:30:16 -0600
committerIIMarckus <iimarckus@gmail.com>2018-10-03 11:30:16 -0600
commit9425a0110e00a3173accdac94cb2a4a4042efdd0 (patch)
tree93509932659c3e70225651629e16bdf668db8d70 /main.asm
parent095d1b60fd0a2d21d40c1091a04b37ea83cfe7cf (diff)
Add map objects from bank 51.
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm31
1 files changed, 15 insertions, 16 deletions
diff --git a/main.asm b/main.asm
index 8057da20..8b3609ba 100644
--- a/main.asm
+++ b/main.asm
@@ -1714,22 +1714,21 @@ SECTION "bank50", ROMX, BANK[$50]
dr $140000, $144000
SECTION "bank51", ROMX, BANK[$51]
-;INCLUDE "maps/OlivinePokecenter1F.asm"
-;INCLUDE "maps/OlivineGym.asm"
-;INCLUDE "maps/OlivineTimsHouse.asm"
-;INCLUDE "maps/OlivineHouseBeta.asm"
-;INCLUDE "maps/OlivinePunishmentSpeechHouse.asm"
-;INCLUDE "maps/OlivineGoodRodHouse.asm"
-;INCLUDE "maps/OlivineCafe.asm"
-;INCLUDE "maps/OlivineMart.asm"
-;INCLUDE "maps/Route38EcruteakGate.asm"
-;INCLUDE "maps/Route39Barn.asm"
-;INCLUDE "maps/Route39Farmhouse.asm
-;INCLUDE "maps/MahoganyRedGyaradosSpeechHouse.asm"
-;INCLUDE "maps/MahoganyGym.asm"
-;INCLUDE "maps/MahoganyPokecenter1F.asm"
-;INCLUDE "maps/Route42EcruteakGate.asm"
- dr $144000, $148000
+INCLUDE "maps/OlivinePokecenter1F.asm"
+INCLUDE "maps/OlivineGym.asm"
+INCLUDE "maps/OlivineTimsHouse.asm"
+INCLUDE "maps/OlivineHouseBeta.asm"
+INCLUDE "maps/OlivinePunishmentSpeechHouse.asm"
+INCLUDE "maps/OlivineGoodRodHouse.asm"
+INCLUDE "maps/OlivineCafe.asm"
+INCLUDE "maps/OlivineMart.asm"
+INCLUDE "maps/Route38EcruteakGate.asm"
+INCLUDE "maps/Route39Barn.asm"
+INCLUDE "maps/Route39Farmhouse.asm"
+INCLUDE "maps/MahoganyRedGyaradosSpeechHouse.asm"
+INCLUDE "maps/MahoganyGym.asm"
+INCLUDE "maps/MahoganyPokecenter1F.asm"
+INCLUDE "maps/Route42EcruteakGate.asm"
SECTION "bank52", ROMX, BANK[$52]
INCLUDE "maps/EcruteakTinTowerEntrance.asm"