dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

escort --> guide

Browse Source
This commit is contained in:
PikalaxALT
2019-10-21 10:49:19 -04:00
parent 221259d0d6
commit 85a033f350
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PewterCity/map.json
+2 -2
View File
@@ -48,7 +48,7 @@
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_EventScript_16607E", "script": "PewterCity_EventScript_16607E",
"flag": "FLAG_HIDE_PEWTER_MUSEUM_ESCORT" "flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE"
}, },
{ {
"graphics_id": "MAP_OBJ_GFX_FAT_MAN", "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
@@ -87,7 +87,7 @@
"trainer_type": 0, "trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0, "trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_EventScript_165B9D", "script": "PewterCity_EventScript_165B9D",
"flag": "FLAG_HIDE_PEWTER_CITY_GYM_ESCORT" "flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE"
}, },
{ {
"graphics_id": "MAP_OBJ_GFX_CUT_TREE", "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
data/maps/PewterCity/scripts.inc
+3 -3
View File
@@ -21,7 +21,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D
waitmovement 0 waitmovement 0
fadedefaultbgm fadedefaultbgm
removeobject 5 removeobject 5
clearflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE
release release
end end
@@ -457,7 +457,7 @@ EventScript_165DBE:: @ 8165DBE
waitmovement 0 waitmovement 0
fadedefaultbgm fadedefaultbgm
removeobject 5 removeobject 5
clearflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE
releaseall releaseall
end end
@@ -1053,7 +1053,7 @@ PewterCity_EventScript_16607E:: @ 816607E
waitmovement 0 waitmovement 0
fadedefaultbgm fadedefaultbgm
removeobject 2 removeobject 2
clearflag FLAG_HIDE_PEWTER_MUSEUM_ESCORT clearflag FLAG_HIDE_PEWTER_MUSEUM_GUIDE
release release
end end
data/maps/PewterCity_Gym/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ EventScript_16A5C5:: @ 816A5C5
setflag FLAG_DEFEATED_BROCK setflag FLAG_DEFEATED_BROCK
setflag FLAG_BADGE01_GET setflag FLAG_BADGE01_GET
setvar VAR_MAP_SCENE_PEWTER_CITY, 1 setvar VAR_MAP_SCENE_PEWTER_CITY, 1
setflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT setflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE
clearflag FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY clearflag FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY
set_gym_trainers 1 set_gym_trainers 1
goto EventScript_16A5F3 goto EventScript_16A5F3
include/constants/flags.h
+2 -2
View File
@@ -51,7 +51,7 @@
#define FLAG_HIDE_OAK_IN_HIS_LAB 0x02B #define FLAG_HIDE_OAK_IN_HIS_LAB 0x02B
#define FLAG_HIDE_OAK_IN_PALLET_TOWN 0x02C #define FLAG_HIDE_OAK_IN_PALLET_TOWN 0x02C
#define FLAG_HIDE_RIVAL_IN_LAB 0x02D #define FLAG_HIDE_RIVAL_IN_LAB 0x02D
#define FLAG_HIDE_PEWTER_CITY_GYM_ESCORT 0x02E #define FLAG_HIDE_PEWTER_CITY_GYM_GUIDE 0x02E
#define FLAG_HIDE_DOME_FOSSIL 0x02F #define FLAG_HIDE_DOME_FOSSIL 0x02F
#define FLAG_HIDE_HELIX_FOSSIL 0x030 #define FLAG_HIDE_HELIX_FOSSIL 0x030
#define FLAG_HIDE_NUGGET_BRIDGE_ROCKET 0x031 #define FLAG_HIDE_NUGGET_BRIDGE_ROCKET 0x031
@@ -85,7 +85,7 @@
#define FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 0x04D #define FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 0x04D
#define FLAG_HIDE_SILPH_RIVAL 0x04E #define FLAG_HIDE_SILPH_RIVAL 0x04E
#define FLAG_HIDE_ROUTE_22_RIVAL 0x04F #define FLAG_HIDE_ROUTE_22_RIVAL 0x04F
#define FLAG_HIDE_PEWTER_MUSEUM_ESCORT 0x050 #define FLAG_HIDE_PEWTER_MUSEUM_GUIDE 0x050
#define FLAG_HIDE_TOWER_RIVAL 0x051 #define FLAG_HIDE_TOWER_RIVAL 0x051
#define FLAG_HIDE_MOLTRES 0x052 #define FLAG_HIDE_MOLTRES 0x052
#define FLAG_HIDE_SILPH_ROCKETS 0x053 #define FLAG_HIDE_SILPH_ROCKETS 0x053