From 89d35e82a27c7328bf5987b4993b3456bb78f440 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:17 -0500 Subject: Move 'map attributes' into 'layouts' --- data/maps/BattleFrontier_PokemonCenter_2F/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/BattleFrontier_PokemonCenter_2F') diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 6aa965d08..361c58a04 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 - .4byte BattleFrontier_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte BattleFrontier_PokemonCenter_2F_MapEvents .4byte BattleFrontier_PokemonCenter_2F_MapScripts .4byte 0x0 -- cgit v1.2.3 From 135a11e50eba1e12108e5c2025f534e3bd0cc722 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:41 -0500 Subject: Move events and scripts into map dirs --- data/maps/BattleFrontier_PokemonCenter_2F/events.inc | 14 ++++++++++++++ data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/events.inc create mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc (limited to 'data/maps/BattleFrontier_PokemonCenter_2F') diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..bb5bb6119 --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702 + +BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 + warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_UNION_ROOM + warp_def 9, 1, 3, 0, MAP_TRADE_CENTER + +BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678 + map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc new file mode 100644 index 000000000..7d3c3a2f1 --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc @@ -0,0 +1,19 @@ +BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 + map_script 2, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B + map_script 4, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C + map_script 1, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE + map_script 3, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +BattleFrontier_PokemonCenter_2F_EventScript_267ABF:: @ 8267ABF + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +BattleFrontier_PokemonCenter_2F_EventScript_267AC5:: @ 8267AC5 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + -- cgit v1.2.3