summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-29 20:52:05 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-29 20:52:05 -0400
commitb8cced19fce2a212f5cb205039382a63821a3762 (patch)
tree6a01fb5bbe4e6558a25db77c76cf357e846e7590 /main.asm
parentf17f3f1a06ce8c28f044cdb04c1d6355efc01a8f (diff)
Mt Moon B2F
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm10
1 files changed, 9 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index a8c063ba..8b3569e3 100755
--- a/main.asm
+++ b/main.asm
@@ -793,7 +793,15 @@ INCLUDE "scripts/mtmoon1.asm"
INCLUDE "data/mapObjects/mtmoon1.asm"
MtMoon1Blocks:
INCBIN "maps/mtmoon1.blk"
- dr $49c7e,$4a540
+
+INCLUDE "data/mapHeaders/mtmoon3.asm"
+INCLUDE "scripts/mtmoon3.asm"
+INCLUDE "data/mapObjects/mtmoon3.asm"
+MtMoon3Blocks:
+INCBIN "maps/mtmoon3.blk"
+
+MtMoon3Script_4a325: ; pikachu-related function?
+ dr $4a325,$4a540
SECTION "bank13",ROMX,BANK[$13]