aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-02 14:19:19 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-02 14:19:19 -0400
commitf963d9019a6e728c7293783ca8ee6e10dd6c8876 (patch)
treebed667d85b9229b9c6781d56140ef968e7a052e9 /main.asm
parentCopycat's House 2F and Fighting Dojo (diff)
downloadpokeyellow-f963d9019a6e728c7293783ca8ee6e10dd6c8876.tar.gz
pokeyellow-f963d9019a6e728c7293783ca8ee6e10dd6c8876.tar.xz
pokeyellow-f963d9019a6e728c7293783ca8ee6e10dd6c8876.zip
Saffron Gym
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm7
1 files changed, 6 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 1d1bf43a..3a3a7ee1 100755
--- a/main.asm
+++ b/main.asm
@@ -1406,7 +1406,12 @@ INCLUDE "data/mapHeaders/fightingdojo.asm"
INCLUDE "scripts/fightingdojo.asm"
INCLUDE "data/mapObjects/fightingdojo.asm"
FightingDojoBlocks: INCBIN "maps/fightingdojo.blk"
- dr $5cef7,$5d485
+
+INCLUDE "data/mapHeaders/saffrongym.asm"
+INCLUDE "scripts/saffrongym.asm"
+INCLUDE "data/mapObjects/saffrongym.asm"
+SaffronGymBlocks: INCBIN "maps/saffrongym.blk"
+ dr $5d2f3,$5d485
INCLUDE "data/mapHeaders/viridianforestexit.asm"
INCLUDE "scripts/viridianforestexit.asm"