From c104a1481ae0db0f4f3f3b730ffa4e34274d0cdb Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Thu, 2 Jun 2016 11:38:27 -0400 Subject: Cinnabar Gym --- main.asm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'main.asm') 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" -- cgit v1.3.1-sl0p