From cb82d868afab3d98c028b29ff516201d4157826a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 6 Sep 2019 02:49:26 -0400 Subject: [PATCH] fix secret base jsons --- data/maps/SecretBase_BlueCave1/map.json | 2 +- data/maps/SecretBase_BlueCave2/map.json | 2 +- data/maps/SecretBase_BlueCave3/map.json | 2 +- data/maps/SecretBase_BlueCave4/map.json | 2 +- data/maps/SecretBase_BrownCave1/map.json | 2 +- data/maps/SecretBase_BrownCave2/map.json | 2 +- data/maps/SecretBase_BrownCave3/map.json | 2 +- data/maps/SecretBase_BrownCave4/map.json | 2 +- data/maps/SecretBase_RedCave1/map.json | 2 +- data/maps/SecretBase_RedCave2/map.json | 2 +- data/maps/SecretBase_RedCave3/map.json | 2 +- data/maps/SecretBase_RedCave4/map.json | 2 +- data/maps/SecretBase_Shrub1/map.json | 2 +- data/maps/SecretBase_Shrub2/map.json | 2 +- data/maps/SecretBase_Shrub3/map.json | 2 +- data/maps/SecretBase_Shrub4/map.json | 2 +- data/maps/SecretBase_Tree1/map.json | 2 +- data/maps/SecretBase_Tree2/map.json | 2 +- data/maps/SecretBase_Tree3/map.json | 2 +- data/maps/SecretBase_Tree4/map.json | 2 +- data/maps/SecretBase_YellowCave1/map.json | 2 +- data/maps/SecretBase_YellowCave2/map.json | 2 +- data/maps/SecretBase_YellowCave3/map.json | 2 +- data/maps/SecretBase_YellowCave4/map.json | 2 +- data/scripts/shared_secret_base.inc | 26 +++++++++++++++++++++-- 25 files changed, 48 insertions(+), 26 deletions(-) diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 8f255972f4..ecd5c0d832 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BlueCave1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index ec5d74d2f6..1b6acbcbf5 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BlueCave2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 07be1610a8..9889b7005f 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BlueCave3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index 45762d6198..23a8f65790 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BlueCave4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 679564ba7a..2a6d2662c8 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BrownCave1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index 35d5be558b..5f5c365fc2 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BrownCave2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index 5424ee85e5..cd8af903e6 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BrownCave3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index de3b4709ef..406d276986 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BrownCave4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index eac0366c17..342bc4dfc5 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_RedCave1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index bcbfbd0f2f..51a60e6bc2 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_RedCave2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index 00c14d3f31..7617560d55 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_RedCave3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index b54974c4cc..2b8d31f3ed 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_RedCave4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index 38cb8997f1..6991ef41bc 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Shrub1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 728226fdc6..2b1b003d87 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Shrub2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index a3c5cdf057..394d04e82d 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Shrub3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 9977f6eeb1..14bdece7ac 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Shrub4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 5d3309cc77..8876749b09 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Tree1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 67deb9a10a..3ae3ccd503 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Tree2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 6e4494836d..03e41eb832 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Tree3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index 465b1d50b5..cae1ff2386 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Tree4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index a14826a3a5..30759724c2 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_YellowCave1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 97b6baa22f..73dd09931c 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_YellowCave2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index 581a3479f7..be526fc95e 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_YellowCave3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 3dfa7cc08c..1a45ea4f53 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_YellowCave4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc index cbde8af361..f2a0f85238 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -1,5 +1,27 @@ -@ Label is unused, but all the Secret Base MapScripts fall through to here -SecretBase_MapScripts:: +SecretBase_RedCave1_MapScripts:: @ 823B483 +SecretBase_RedCave2_MapScripts:: @ 823B483 +SecretBase_RedCave3_MapScripts:: @ 823B483 +SecretBase_RedCave4_MapScripts:: @ 823B483 +SecretBase_BrownCave1_MapScripts:: @ 823B483 +SecretBase_BrownCave2_MapScripts:: @ 823B483 +SecretBase_BrownCave3_MapScripts:: @ 823B483 +SecretBase_BrownCave4_MapScripts:: @ 823B483 +SecretBase_BlueCave1_MapScripts:: @ 823B483 +SecretBase_BlueCave2_MapScripts:: @ 823B483 +SecretBase_BlueCave3_MapScripts:: @ 823B483 +SecretBase_BlueCave4_MapScripts:: @ 823B483 +SecretBase_YellowCave1_MapScripts:: @ 823B483 +SecretBase_YellowCave2_MapScripts:: @ 823B483 +SecretBase_YellowCave3_MapScripts:: @ 823B483 +SecretBase_YellowCave4_MapScripts:: @ 823B483 +SecretBase_Tree1_MapScripts:: @ 823B483 +SecretBase_Tree2_MapScripts:: @ 823B483 +SecretBase_Tree3_MapScripts:: @ 823B483 +SecretBase_Tree4_MapScripts:: @ 823B483 +SecretBase_Shrub1_MapScripts:: @ 823B483 +SecretBase_Shrub2_MapScripts:: @ 823B483 +SecretBase_Shrub3_MapScripts:: @ 823B483 +SecretBase_Shrub4_MapScripts:: @ 823B483 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_MapScript2_OnWarp map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_MapScript2_OnFrame