summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-02 11:38:27 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-02 11:38:27 -0400
commitc104a1481ae0db0f4f3f3b730ffa4e34274d0cdb (patch)
treee5cf5f273c248ea5f69c6e0bc93ef4f51d9b0115 /main.asm
parent9a815ac80ae7b31ca21c6f17e7705002f5f2b646 (diff)
Cinnabar Gym
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm26
1 files changed, 25 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index f11910f5..55ff27b7 100755
--- a/main.asm
+++ b/main.asm
@@ -1647,7 +1647,31 @@ INCLUDE "data/mapHeaders/fuchsiameetingroom.asm"
INCLUDE "scripts/fuchsiameetingroom.asm"
INCLUDE "data/mapObjects/fuchsiameetingroom.asm"
FuchsiaMeetingRoomBlocks: INCBIN "maps/fuchsiameetingroom.blk"
- dr $74ee6,$757a0
+
+INCLUDE "data/mapHeaders/cinnabargym.asm"
+INCLUDE "scripts/cinnabargym.asm"
+INCLUDE "data/mapObjects/cinnabargym.asm"
+CinnabarGymBlocks: INCBIN "maps/cinnabargym.blk"
+
+CinnabarGymScript_753de:
+ callab Func_f2150
+ jp TextScriptEnd
+
+CinnabarGymScript_753e9:
+ push hl
+ ld hl, wd475
+ bit 7, [hl]
+ res 7, [hl]
+ pop hl
+ ret
+
+CinnabarGymScript_753f3:
+ push hl
+ ld hl, wd475
+ bit 7, [hl]
+ pop hl
+ ret
+ dr $753fb,$757a0
INCLUDE "data/mapHeaders/gary.asm"
INCLUDE "scripts/gary.asm"