From eaed94c1855f3d8df88bd1d61ca8e7fd881ca15b Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 28 Apr 2019 18:49:53 +0200 Subject: [PATCH] Forgot to split the link rooms' map scripts --- data/maps/scripts.asm | 3 --- maps/Colosseum.asm | 4 ++++ maps/TradeCenter.asm | 4 ++++ pokecrystal.link | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 5ee07983285..f4201134c4d 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -274,11 +274,8 @@ INCLUDE "maps/VermilionGym.asm" INCLUDE "maps/Route6SaffronGate.asm" INCLUDE "maps/Route6UndergroundPathEntrance.asm" INCLUDE "maps/Pokecenter2F.asm" - -SECTION "TradeCenter_MapScripts - Colosseum_MapEvents", ROMX INCLUDE "maps/TradeCenter.asm" INCLUDE "maps/Colosseum.asm" - INCLUDE "maps/TimeCapsule.asm" INCLUDE "maps/MobileTradeRoom.asm" INCLUDE "maps/MobileBattleRoom.asm" diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 3eac0765b86..b587f0d8adb 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -2,6 +2,10 @@ const COLOSSEUM_CHRIS1 const COLOSSEUM_CHRIS2 + +; FLOAT: Referred to by TradeCenter_MapEvents +SECTION "Colosseum_MapScripts", ROMX, BANK[$64] + Colosseum_MapScripts: db 3 ; scene scripts scene_script .InitializeColosseum ; SCENE_DEFAULT diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index b7b7089731d..2e2976444cc 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -2,6 +2,10 @@ const TRADECENTER_CHRIS1 const TRADECENTER_CHRIS2 + +; FLOAT: Must be in the same bank as CableClubFriendScript +SECTION "TradeCenter_MapScripts", ROMX, BANK[$64] + TradeCenter_MapScripts: db 2 ; scene scripts scene_script .InitializeTradeCenter ; SCENE_DEFAULT diff --git a/pokecrystal.link b/pokecrystal.link index 82c20a43328..10a25fccdad 100644 --- a/pokecrystal.link +++ b/pokecrystal.link @@ -1381,7 +1381,8 @@ ROMX $64 "Route6SaffronGate_MapScripts" ; maps/Route6SaffronGate.asm "Route6UndergroundPathEntrance_MapScripts" ; maps/Route6UndergroundPathEntrance.asm "Pokecenter2F_MapScripts" ; maps/Pokecenter2F.asm - "TradeCenter_MapScripts - Colosseum_MapEvents" ; data/maps/scripts.asm + "TradeCenter_MapScripts" ; maps/TradeCenter.asm + "Colosseum_MapScripts" ; maps/Colosseum.asm "TimeCapsule_MapScripts" ; maps/TimeCapsule.asm "MobileTradeRoom_MapScripts" ; maps/MobileTradeRoom.asm "MobileBattleRoom_MapScripts" ; maps/MobileBattleRoom.asm