ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix secret base jsons

Browse Source
This commit is contained in:
GriffinR 2019-09-06 02:49:26 -04:00
parent 9fbcd552de
commit cb82d868af
25 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/SecretBase_BlueCave1/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_BlueCave2/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_BlueCave3/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_BlueCave4/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_BrownCave1/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_BrownCave2/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_BrownCave3/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_BrownCave4/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_RedCave1/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_RedCave2/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_RedCave3/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_RedCave4/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_Shrub1/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_Shrub2/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_Shrub3/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_Shrub4/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_Tree1/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_Tree2/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_Tree3/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_Tree4/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_YellowCave1/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_YellowCave2/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_YellowCave3/map.json
View File

@ -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"
},
{

2
data/maps/SecretBase_YellowCave4/map.json
View File

@ -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"
},
{

26
data/scripts/shared_secret_base.inc
View File

@ -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