diff options
Diffstat (limited to 'data/maps')
50 files changed, 32 insertions, 54 deletions
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 133163ac5..bac89c25e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -7,8 +7,8 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_2F_EventScript_1527CE compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6950 - call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D - setvar VAR_0x4089, 0 + call SecretBase_EventScript_SetDecorationFlags + setvar VAR_SECRET_BASE_INITIALIZED, 0 end LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE @@ -17,13 +17,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE return LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA - map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 .2byte 0 LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 checkplayergender compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 + goto_if_eq SecretBase_EventScript_InitDecorations end @ 81527F1 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index a71baa3f5..7a176908b 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -7,8 +7,8 @@ LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950 - call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D - setvar VAR_0x4089, 0 + call SecretBase_EventScript_SetDecorationFlags + setvar VAR_SECRET_BASE_INITIALIZED, 0 end LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A @@ -17,13 +17,13 @@ LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A return LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 - map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 .2byte 0 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 checkplayergender compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 + goto_if_eq SecretBase_EventScript_InitDecorations end LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 1100ada56..cafc327b2 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE1", "name": "SecretBase_BlueCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BlueCave1/scripts.inc b/data/maps/SecretBase_BlueCave1/scripts.inc deleted file mode 100644 index bca6bee55..000000000 --- a/data/maps/SecretBase_BlueCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 8b3b35721..f3e9d8062 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE2", "name": "SecretBase_BlueCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BlueCave2/scripts.inc b/data/maps/SecretBase_BlueCave2/scripts.inc deleted file mode 100644 index 4fc579fb9..000000000 --- a/data/maps/SecretBase_BlueCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 11ab94ef5..2304dd2a5 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE3", "name": "SecretBase_BlueCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BlueCave3/scripts.inc b/data/maps/SecretBase_BlueCave3/scripts.inc deleted file mode 100644 index 0a8199f19..000000000 --- a/data/maps/SecretBase_BlueCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index ce0338ac4..dedff942d 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE4", "name": "SecretBase_BlueCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BlueCave4/scripts.inc b/data/maps/SecretBase_BlueCave4/scripts.inc deleted file mode 100644 index 72c1e9612..000000000 --- a/data/maps/SecretBase_BlueCave4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 4df7c9b36..6f6d65d57 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE1", "name": "SecretBase_BrownCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BrownCave1/scripts.inc b/data/maps/SecretBase_BrownCave1/scripts.inc deleted file mode 100644 index ddbf182e4..000000000 --- a/data/maps/SecretBase_BrownCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index f96c7ac37..f335e4198 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE2", "name": "SecretBase_BrownCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BrownCave2/scripts.inc b/data/maps/SecretBase_BrownCave2/scripts.inc deleted file mode 100644 index 06dcb6335..000000000 --- a/data/maps/SecretBase_BrownCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index b1c136f37..a228d136e 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE3", "name": "SecretBase_BrownCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BrownCave3/scripts.inc b/data/maps/SecretBase_BrownCave3/scripts.inc deleted file mode 100644 index a0a85dc11..000000000 --- a/data/maps/SecretBase_BrownCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index 348b19024..740e16515 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE4", "name": "SecretBase_BrownCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_BrownCave4/scripts.inc b/data/maps/SecretBase_BrownCave4/scripts.inc deleted file mode 100644 index 12d931e9e..000000000 --- a/data/maps/SecretBase_BrownCave4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index 8ef1182dc..46ff6b973 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE1", "name": "SecretBase_RedCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_RedCave1/scripts.inc b/data/maps/SecretBase_RedCave1/scripts.inc deleted file mode 100644 index 77b99daec..000000000 --- a/data/maps/SecretBase_RedCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index 9746434b2..b610dbbb7 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE2", "name": "SecretBase_RedCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_RedCave2/scripts.inc b/data/maps/SecretBase_RedCave2/scripts.inc deleted file mode 100644 index 735d386fc..000000000 --- a/data/maps/SecretBase_RedCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index 4ea1ae21f..23522278a 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE3", "name": "SecretBase_RedCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_RedCave3/scripts.inc b/data/maps/SecretBase_RedCave3/scripts.inc deleted file mode 100644 index c9b72ca30..000000000 --- a/data/maps/SecretBase_RedCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index 458d8e469..3f9c09a84 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE4", "name": "SecretBase_RedCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_RedCave4/scripts.inc b/data/maps/SecretBase_RedCave4/scripts.inc deleted file mode 100644 index 6d2402f03..000000000 --- a/data/maps/SecretBase_RedCave4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index 4b314b856..3ee8d9072 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB1", "name": "SecretBase_Shrub1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Shrub1/scripts.inc b/data/maps/SecretBase_Shrub1/scripts.inc deleted file mode 100644 index 79116a0cf..000000000 --- a/data/maps/SecretBase_Shrub1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 10463cf97..bdbdf0407 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB2", "name": "SecretBase_Shrub2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Shrub2/scripts.inc b/data/maps/SecretBase_Shrub2/scripts.inc deleted file mode 100644 index 49835f7f3..000000000 --- a/data/maps/SecretBase_Shrub2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index cbbf64305..0da13143a 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB3", "name": "SecretBase_Shrub3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Shrub3/scripts.inc b/data/maps/SecretBase_Shrub3/scripts.inc deleted file mode 100644 index 0aeb7bdf9..000000000 --- a/data/maps/SecretBase_Shrub3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 487c0f09f..b2926c167 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB4", "name": "SecretBase_Shrub4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Shrub4/scripts.inc b/data/maps/SecretBase_Shrub4/scripts.inc deleted file mode 100644 index f131b308d..000000000 --- a/data/maps/SecretBase_Shrub4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 9fcb78bc3..f7831972b 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE1", "name": "SecretBase_Tree1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Tree1/scripts.inc b/data/maps/SecretBase_Tree1/scripts.inc deleted file mode 100644 index 7345c3bbb..000000000 --- a/data/maps/SecretBase_Tree1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index b7c0da914..5285269d7 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE2", "name": "SecretBase_Tree2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Tree2/scripts.inc b/data/maps/SecretBase_Tree2/scripts.inc deleted file mode 100644 index 0f2976a8c..000000000 --- a/data/maps/SecretBase_Tree2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 349e340eb..f17d16851 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE3", "name": "SecretBase_Tree3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Tree3/scripts.inc b/data/maps/SecretBase_Tree3/scripts.inc deleted file mode 100644 index cb80b0d25..000000000 --- a/data/maps/SecretBase_Tree3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index c6c0856cf..b907de4da 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE4", "name": "SecretBase_Tree4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_Tree4/scripts.inc b/data/maps/SecretBase_Tree4/scripts.inc deleted file mode 100644 index 0a6771740..000000000 --- a/data/maps/SecretBase_Tree4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree4_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index ab18d10de..02a0256ac 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE1", "name": "SecretBase_YellowCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_YellowCave1/scripts.inc b/data/maps/SecretBase_YellowCave1/scripts.inc deleted file mode 100644 index b76a5f44e..000000000 --- a/data/maps/SecretBase_YellowCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave1_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 07481867c..011080f51 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE2", "name": "SecretBase_YellowCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_YellowCave2/scripts.inc b/data/maps/SecretBase_YellowCave2/scripts.inc deleted file mode 100644 index 0bc1fc354..000000000 --- a/data/maps/SecretBase_YellowCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave2_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index d1060d26d..5bbb30751 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE3", "name": "SecretBase_YellowCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_YellowCave3/scripts.inc b/data/maps/SecretBase_YellowCave3/scripts.inc deleted file mode 100644 index 137f04316..000000000 --- a/data/maps/SecretBase_YellowCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave3_MapScripts:: @ 815F337 diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index f717b2c88..0732d6282 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE4", "name": "SecretBase_YellowCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc deleted file mode 100644 index 4f93a99d7..000000000 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave4_MapScripts:: @ 815F337 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_15F358 - map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_15F34F - map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_15F362 - map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_15F34C - .byte 0 - -SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C - setstepcallback 6 - end - -SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F - call SecretBase_RedCave1_EventScript_1A2F3D - special sub_80BBFA4 - end - -SecretBase_RedCave1_MapScript2_15F358:: @ 815F358 - map_script_2 0x4089, 0, SecretBase_RedCave1_EventScript_1A2F68 - .2byte 0 - -SecretBase_RedCave1_MapScript2_15F362:: @ 815F362 - map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE - .2byte 0 |