summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-31 22:05:54 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-31 22:05:54 -0400
commit717ee9ff15c28afb84b1977fe1654ec68c2ef9af (patch)
treea5efe5b21f0bb7a86a86fec58ab2bfc32c92410f /main.asm
parent6d80537563abb145d48c1f3cde003e50e482e1dd (diff)
Celadon Gym
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm8
1 files changed, 7 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 3ef6cb47..cecff2eb 100755
--- a/main.asm
+++ b/main.asm
@@ -937,7 +937,13 @@ INCBIN "maps/celadonmansion4.blk"
INCLUDE "data/mapHeaders/celadonpokecenter.asm"
INCLUDE "scripts/celadonpokecenter.asm"
INCLUDE "data/mapObjects/celadonpokecenter.asm"
- dr $48915,$492a9
+
+INCLUDE "data/mapHeaders/celadongym.asm"
+INCLUDE "scripts/celadongym.asm"
+INCLUDE "data/mapObjects/celadongym.asm"
+CeladonGymBlocks:
+INCBIN "maps/celadongym.blk"
+ dr $48bc8,$492a9
INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
INCLUDE "scripts/mtmoonpokecenter.asm"