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

Remaining NPC hide/show flags

Browse Source
This commit is contained in:
PikalaxALT
2019-10-19 21:10:29 -04:00
parent 2ff8af13d5
commit 2702aa2754
72 changed files with 307 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BirthIsland_Exterior/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "BirthIsland_Exterior_EventScript_165271",
"flag": "FLAG_0x09A"
"flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
},
{
"graphics_id": "MAP_OBJ_GFX_VAR_0",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x099"
"flag": "FLAG_HIDE_DEOXYS"
}
],
"warp_events": [
data/maps/BirthIsland_Exterior/scripts.inc
+3 -3
View File
@@ -20,14 +20,14 @@ BirthIsland_Exterior_MapScript1_165217:: @ 8165217
end
EventScript_16523C:: @ 816523C
setflag FLAG_0x099
setflag FLAG_0x09A
setflag FLAG_HIDE_DEOXYS
setflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
return
EventScript_165243:: @ 8165243
checkflag FLAG_0x2F7
goto_if_eq EventScript_1A77A9
clearflag FLAG_0x09A
clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
clearflag FLAG_0x848
return
data/maps/CeladonCity_Condominiums_2F/map.json
+4 -4
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 6,
"y": 6,
"elevation": 0,
@@ -24,10 +24,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
"flag": "FLAG_0x09E"
"flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 5,
"y": 6,
"elevation": 0,
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
"flag": "FLAG_0x09E"
"flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS"
}
],
"warp_events": [
data/maps/CeladonCity_DepartmentStore_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/CeladonCity_Gym/scripts.inc
+1 -1
View File
@@ -19,7 +19,7 @@ EventScript_16D0A0:: @ 816D0A0
setvar VAR_0x8004, 5
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
clearflag FLAG_0x09E
clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS
setflag FLAG_0x4B3
setflag FLAG_BADGE04_GET
setvar VAR_0x8008, 4
data/maps/CeruleanCave_B1F/map.json
+1 -1
View File
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1624F5",
"flag": "FLAG_0x081"
"flag": "FLAG_HIDE_MEWTWO"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
data/maps/CeruleanCave_B1F/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7
end
EventScript_1624F1:: @ 81624F1
clearflag FLAG_0x081
clearflag FLAG_HIDE_MEWTWO
return
CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
data/maps/CeruleanCity_PokemonCenter_1F/map.json
+4 -4
View File
@@ -79,7 +79,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 2,
"y": 1,
"elevation": 0,
@@ -89,10 +89,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 3,
"y": 1,
"elevation": 0,
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/CinnabarIsland/scripts.inc
+1 -1
View File
@@ -152,7 +152,7 @@ EventScript_167078:: @ 8167078
call_if 1, EventScript_1670B3
removeobject 3
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
clearflag FLAG_0x0A2
clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
releaseall
end
data/maps/CinnabarIsland_PokemonCenter_1F/map.json
+5 -5
View File
@@ -66,7 +66,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 2,
"y": 1,
"elevation": 0,
@@ -76,10 +76,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 3,
"y": 1,
"elevation": 0,
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "MAP_OBJ_GFX_BILL",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E90A",
"flag": "FLAG_0x0A2"
"flag": "FLAG_HIDE_CINNABAR_POKECENTER_BILL"
}
],
"warp_events": [
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -37,7 +37,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
playbgm MUS_ANNAI, 1
savebgm MUS_ANNAI
setflag FLAG_SPECIAL_FLAG_0x4001
setflag FLAG_0x0A2
setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
delay 20
compare_var_to_value VAR_FACING, 1
call_if 1, EventScript_16E96F
data/maps/FiveIsland_LostCave_Room10/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x093"
"flag": "FLAG_HIDE_LOST_CAVE_SELPHY"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/FiveIsland_LostCave_Room10/scripts.inc
+2 -2
View File
@@ -38,8 +38,8 @@ EventScript_164C52:: @ 8164C52
end
EventScript_164CA5:: @ 8164CA5
setflag FLAG_0x093
clearflag FLAG_0x094
setflag FLAG_HIDE_LOST_CAVE_SELPHY
clearflag FLAG_HIDE_RESORT_GORGEOUS_SELPHY
setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1
setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1
return
data/maps/FiveIsland_Meadow/map.json
+3 -3
View File
@@ -35,7 +35,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "FiveIsland_Meadow_EventScript_1689BB",
"flag": "FLAG_0x088"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -48,7 +48,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
"script": "FiveIsland_Meadow_EventScript_16898D",
"flag": "FLAG_0x088"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -61,7 +61,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "FiveIsland_Meadow_EventScript_1689A4",
"flag": "FLAG_0x088"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
data/maps/FiveIsland_PokemonCenter_1F/map.json
+4 -4
View File
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 2,
"y": 1,
"elevation": 0,
@@ -63,10 +63,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 3,
"y": 1,
"elevation": 0,
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/FiveIsland_ResortGorgeous/map.json
+1 -1
View File
@@ -121,7 +121,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x094"
"flag": "FLAG_HIDE_RESORT_GORGEOUS_SELPHY"
}
],
"warp_events": [
data/maps/FiveIsland_ResortGorgeous/scripts.inc
+1 -1
View File
@@ -29,7 +29,7 @@ EventScript_168808:: @ 8168808
closedoor 39, 8
waitdooranim
removeobject 8
clearflag FLAG_0x095
clearflag FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY
setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 2
releaseall
end
data/maps/FiveIsland_ResortGorgeous_House/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_ResortGorgeous_House_EventScript_171EBE",
"flag": "FLAG_0x095"
"flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY"
},
{
"graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_ResortGorgeous_House_EventScript_172062",
"flag": "FLAG_0x096"
"flag": "FLAG_HIDE_SELPHYS_BUTLER"
}
],
"warp_events": [
data/maps/FiveIsland_RocketWarehouse/map.json
+5 -5
View File
@@ -24,7 +24,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "FiveIsland_RocketWarehouse_EventScript_163FE6",
"flag": "FLAG_0x088"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "FiveIsland_RocketWarehouse_EventScript_163FFD",
"flag": "FLAG_0x088"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_F",
@@ -50,7 +50,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "FiveIsland_RocketWarehouse_EventScript_164087",
"flag": "FLAG_0x088"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "FiveIsland_RocketWarehouse_EventScript_164014",
"flag": "FLAG_0x088"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_F",
@@ -76,7 +76,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "FiveIsland_RocketWarehouse_EventScript_164070",
"flag": "FLAG_0x088"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+1 -1
View File
@@ -89,7 +89,7 @@ EventScript_16402F:: @ 816402F
removeobject 2
removeobject 4
removeobject 3
setflag FLAG_0x088
setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS
fadescreen 0
setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
setflag FLAG_0x2D5
data/maps/FourIsland/map.json
+1 -1
View File
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x097"
"flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL"
},
{
"graphics_id": "MAP_OBJ_GFX_FAT_MAN",
data/maps/FourIsland/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ FourIsland_MapScript1_167CB9:: @ 8167CB9
end
EventScript_167CCD:: @ 8167CCD
clearflag FLAG_0x097
clearflag FLAG_HIDE_FOUR_ISLAND_RIVAL
return
EventScript_167CD1:: @ 8167CD1
data/maps/FourIsland_IcefallCave_Back/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x08D"
"flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x08D"
"flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_LORELEI",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_IcefallCave_Back_EventScript_163F25",
"flag": "FLAG_0x08B"
"flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x08D"
"flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
}
],
"warp_events": [
data/maps/FourIsland_IcefallCave_Back/scripts.inc
+3 -3
View File
@@ -8,7 +8,7 @@ FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88
end
EventScript_163D94:: @ 8163D94
setflag FLAG_0x08B
setflag FLAG_HIDE_ICEFALL_CAVE_LORELEI
return
FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
@@ -81,8 +81,8 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
waitmovement 0
textcolor 1
msgbox gUnknown_817B457
setflag FLAG_0x08E
clearflag FLAG_0x08C
setflag FLAG_HIDE_RUIN_VALLEY_SCIENTIST
clearflag FLAG_HIDE_LORELEI_IN_HER_HOUSE
setvar VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
releaseall
end
data/maps/FourIsland_LoreleisHouse/map.json
+9 -9
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C58",
"flag": "FLAG_0x08C"
"flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE"
},
{
"graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"flag": "FLAG_0x0A5"
"flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL"
},
{
"graphics_id": "MAP_OBJ_GFX_CHANSEY",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"flag": "FLAG_0x0A6"
"flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL"
},
{
"graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF",
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"flag": "FLAG_0x0A8"
"flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL"
},
{
"graphics_id": "MAP_OBJ_GFX_NIDORAN_F",
@@ -154,7 +154,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"flag": "FLAG_0x0A7"
"flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL"
},
{
"graphics_id": "MAP_OBJ_GFX_NIDORAN_M",
@@ -167,7 +167,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"flag": "FLAG_0x0A9"
"flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL"
},
{
"graphics_id": "MAP_OBJ_GFX_PIDGEOT",
@@ -180,7 +180,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"flag": "FLAG_0x0AB"
"flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL"
},
{
"graphics_id": "MAP_OBJ_GFX_FEAROW",
@@ -193,7 +193,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"flag": "FLAG_0x0AA"
"flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL"
},
{
"graphics_id": "MAP_OBJ_GFX_LAPRAS_DOLL",
@@ -206,7 +206,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"flag": "FLAG_0x0AC"
"flag": "FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL"
}
],
"warp_events": [
data/maps/FuchsiaCity/map.json
+1 -1
View File
@@ -235,7 +235,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_EventScript_166DC1",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/FuchsiaCity_Building1/map.json
+2 -2
View File
@@ -53,7 +53,7 @@
"flag": "FLAG_0x1B9"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 4,
"y": 1,
"elevation": 0,
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_Building1_EventScript_1ACEB8",
"flag": "FLAG_0x09F"
"flag": "FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL"
}
],
"warp_events": [
data/maps/FuchsiaCity_Gym/scripts.inc
+1 -1
View File
@@ -16,7 +16,7 @@ EventScript_16D580:: @ 816D580
setvar VAR_0x8004, 6
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
clearflag FLAG_0x09F
clearflag FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL
setflag FLAG_0x4B4
setflag FLAG_BADGE05_GET
setvar VAR_0x8008, 5
data/maps/IndigoPlateau_Exterior/map.json
+2 -2
View File
@@ -30,7 +30,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x0A3"
"flag": "FLAG_HIDE_CREDITS_RIVAL"
},
{
"graphics_id": "MAP_OBJ_GFX_PROF_OAK",
@@ -43,7 +43,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x0A4"
"flag": "FLAG_HIDE_CREDITS_OAK"
}
],
"warp_events": [
data/maps/IndigoPlateau_PokemonCenter_1F/map.json
+6 -6
View File
@@ -76,10 +76,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 22,
"y": 9,
"elevation": 0,
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
@@ -102,10 +102,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD087",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 23,
"y": 9,
"elevation": 0,
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/LavenderTown_PokemonCenter_1F/map.json
+1 -1
View File
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "LavenderTown_PokemonCenter_1F_EventScript_1AD0A0",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/MtEmber_Exterior/map.json
+2 -2
View File
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_16397F",
"flag": "FLAG_0x089"
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1639F0",
"flag": "FLAG_0x089"
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
data/maps/MtEmber_RubyPath_B5F/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B5F_EventScript_163C49",
"flag": "FLAG_0x08A"
"flag": "FLAG_HIDE_RUBY"
}
],
"warp_events": [
data/maps/MtMoon_B2F/map.json
+4 -4
View File
@@ -63,7 +63,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "MtMoon_B2F_EventScript_160829",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -76,7 +76,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "MtMoon_B2F_EventScript_1607E4",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -89,7 +89,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "MtMoon_B2F_EventScript_160812",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -102,7 +102,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "MtMoon_B2F_EventScript_1607FB",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/NavelRock_Base/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "NavelRock_Base_EventScript_165134",
"flag": "FLAG_0x09B"
"flag": "FLAG_HIDE_LUGIA"
}
],
"warp_events": [
data/maps/NavelRock_Base/scripts.inc
+2 -2
View File
@@ -11,13 +11,13 @@ NavelRock_Base_MapScript1_1650F2:: @ 81650F2
end
EventScript_165105:: @ 8165105
setflag FLAG_0x09B
setflag FLAG_HIDE_LUGIA
return
EventScript_165109:: @ 8165109
checkflag FLAG_0x2F5
goto_if_eq EventScript_1A77A9
clearflag FLAG_0x09B
clearflag FLAG_HIDE_LUGIA
return
NavelRock_Base_MapScript2_165116:: @ 8165116
data/maps/NavelRock_Summit/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x09C"
"flag": "FLAG_HIDE_HO_OH"
}
],
"warp_events": [
data/maps/NavelRock_Summit/scripts.inc
+2 -2
View File
@@ -12,7 +12,7 @@ NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA
EventScript_164FBD:: @ 8164FBD
setvar VAR_0x4001, 1
setflag FLAG_0x09C
setflag FLAG_HIDE_HO_OH
return
EventScript_164FC6:: @ 8164FC6
@@ -20,7 +20,7 @@ EventScript_164FC6:: @ 8164FC6
checkflag FLAG_0x2F6
goto_if_eq EventScript_1A77A9
setvar VAR_0x4001, 0
clearflag FLAG_0x09C
clearflag FLAG_HIDE_HO_OH
return
NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD
data/maps/OneIsland_KindleRoad_EmberSpa/map.json
+1 -1
View File
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EmberSpa_EventScript_165380",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -301,7 +301,7 @@ EventScript_170FA5:: @ 8170FA5
special sub_810B82C
setflag FLAG_0x844
setflag FLAG_HIDE_CERULEAN_CAVE_GUARD
setflag FLAG_0x08C
setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
special InitRoamer
release
data/maps/PewterCity/map.json
+1 -1
View File
@@ -113,7 +113,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_EventScript_1662A9",
"flag": "FLAG_0x092"
"flag": "FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY"
}
],
"warp_events": [
data/maps/PewterCity_Gym/scripts.inc
+1 -1
View File
@@ -20,7 +20,7 @@ EventScript_16A5C5:: @ 816A5C5
setflag FLAG_BADGE01_GET
setvar VAR_MAP_SCENE_PEWTER_CITY, 1
setflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT
clearflag FLAG_0x092
clearflag FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY
setvar VAR_0x8008, 1
call EventScript_1A6B18
goto EventScript_16A5F3
data/maps/PowerPlant/map.json
+2 -2
View File
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_16388D",
"flag": "FLAG_0x086"
"flag": "FLAG_HIDE_POWER_PLANT_VOLTORB_2"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_16382F",
"flag": "FLAG_0x085"
"flag": "FLAG_HIDE_POWER_PLANT_VOLTORB_1"
}
],
"warp_events": [
data/maps/PowerPlant/scripts.inc
+2 -2
View File
@@ -30,11 +30,11 @@ EventScript_1637AC:: @ 81637AC
return
EventScript_1637B0:: @ 81637B0
clearflag FLAG_0x085
clearflag FLAG_HIDE_POWER_PLANT_VOLTORB_1
return
EventScript_1637B4:: @ 81637B4
clearflag FLAG_0x086
clearflag FLAG_HIDE_POWER_PLANT_VOLTORB_2
return
PowerPlant_EventScript_1637B8:: @ 81637B8
data/maps/RocketHideout_B1F/map.json
+5 -5
View File
@@ -24,7 +24,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
"script": "RocketHideout_B1F_EventScript_1611C5",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "RocketHideout_B1F_EventScript_1611AE",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -50,7 +50,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "RocketHideout_B1F_EventScript_1611F3",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "RocketHideout_B1F_EventScript_1611DC",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -76,7 +76,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "RocketHideout_B1F_EventScript_16120A",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/RocketHideout_B2F/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "RocketHideout_B2F_EventScript_1612A2",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/RocketHideout_B3F/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "RocketHideout_B3F_EventScript_1612D1",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "RocketHideout_B3F_EventScript_1612BA",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/RocketHideout_B4F/map.json
+3 -3
View File
@@ -50,7 +50,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "RocketHideout_B4F_EventScript_161381",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B4F_EventScript_161418",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -89,7 +89,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B4F_EventScript_1613CE",
"flag": "FLAG_0x0AD"
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/Route16/map.json
+1 -1
View File
@@ -152,7 +152,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route16_EventScript_168121",
"flag": "FLAG_0x080"
"flag": "FLAG_HIDE_ROUTE_16_SNORLAX"
}
],
"warp_events": [
data/maps/Route16/scripts.inc
+1 -1
View File
@@ -48,7 +48,7 @@ Route16_EventScript_168121:: @ 8168121
playmoncry SPECIES_SNORLAX, 2
delay 40
waitmoncry
setflag FLAG_0x080
setflag FLAG_HIDE_ROUTE_16_SNORLAX
setflag FLAG_0x807
dowildbattle
clearflag FLAG_0x807
data/maps/SSAnne_Exterior/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x087"
"flag": "FLAG_HIDE_SS_ANNE"
}
],
"warp_events": [
data/maps/SaffronCity/map.json
+1 -1
View File
@@ -228,7 +228,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1AD03A",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/SaffronCity_Gym/scripts.inc
+1 -1
View File
@@ -19,7 +19,7 @@ EventScript_16EE0A:: @ 816EE0A
setvar VAR_0x8004, 7
setvar VAR_0x8005, 3
special SetFlavorTextFlagFromSpecialVars
clearflag FLAG_0x0AE
clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS
setflag FLAG_0x4B5
setflag FLAG_BADGE06_GET
setvar VAR_0x8008, 6
data/maps/SaffronCity_PokemonCenter_1F/map.json
+4 -4
View File
@@ -66,7 +66,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 2,
"y": 1,
"elevation": 0,
@@ -76,10 +76,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
"flag": "FLAG_0x0AE"
"flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 3,
"y": 1,
"elevation": 0,
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
"flag": "FLAG_0x0AE"
"flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS"
}
],
"warp_events": [
data/maps/SaffronCity_PokemonTrainerFanClub/map.json
+4 -4
View File
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 2,
"y": 1,
"elevation": 0,
@@ -128,10 +128,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 3,
"y": 1,
"elevation": 0,
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/SeafoamIslands_B4F/map.json
+1 -1
View File
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B4F_EventScript_1631AC",
"flag": "FLAG_0x082"
"flag": "FLAG_HIDE_ARTICUNO"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/SeafoamIslands_B4F/scripts.inc
+1 -1
View File
@@ -46,7 +46,7 @@ EventScript_1630A9:: @ 81630A9
return
EventScript_1630AD:: @ 81630AD
clearflag FLAG_0x082
clearflag FLAG_HIDE_ARTICUNO
return
SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1
data/maps/SevenIsland_PokemonCenter_1F/map.json
+4 -4
View File
@@ -66,7 +66,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 3,
"y": 1,
"elevation": 0,
@@ -76,10 +76,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 2,
"y": 1,
"elevation": 0,
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4",
"flag": "FLAG_0x09D"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/SixIsland_DottedHole_SapphireRoom/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5",
"flag": "FLAG_0x08F"
"flag": "FLAG_HIDE_SAPPHIRE"
},
{
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x090"
"flag": "s"
}
],
"warp_events": [
data/maps/SixIsland_OutcastIsland/map.json
+1 -1
View File
@@ -30,7 +30,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "SixIsland_OutcastIsland_EventScript_168B16",
"flag": "FLAG_0x088"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_FISHER",
data/maps/SixIsland_PokemonCenter_1F/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x098"
"flag": "FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL"
},
{
"graphics_id": "MAP_OBJ_GFX_HIKER",
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A
end
EventScript_171D89:: @ 8171D89
clearflag FLAG_0x098
clearflag FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL
return
SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D
data/maps/SixIsland_RuinValley/map.json
+1 -1
View File
@@ -30,7 +30,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_RuinValley_EventScript_168B6D",
"flag": "FLAG_0x08E"
"flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST"
},
{
"graphics_id": "MAP_OBJ_GFX_HIKER",
data/maps/ThreeIsland/map.json
+1 -1
View File
@@ -61,7 +61,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ThreeIsland_EventScript_1677D8",
"flag": "FLAG_0x091"
"flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER"
},
{
"graphics_id": "MAP_OBJ_GFX_BIKER",
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+1 -1
View File
@@ -87,7 +87,7 @@ EventScript_17145F:: @ 817145F
fadedefaultbgm
delay 60
msgbox gUnknown_81A270C
clearflag FLAG_0x091
clearflag FLAG_HIDE_THREE_ISLAND_LONE_BIKER
setvar VAR_MAP_SCENE_THREE_ISLAND, 2
setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 1
releaseall
data/maps/VermilionCity/map.json
+1 -1
View File
@@ -126,7 +126,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VermilionCity_EventScript_166C20",
"flag": "FLAG_0x0A1"
"flag": "FLAG_HIDE_VERMILION_CITY_OAKS_AIDE"
}
],
"warp_events": [
data/maps/VermilionCity/scripts.inc
+1 -1
View File
@@ -27,7 +27,7 @@ VermilionCity_MapScript1_166906:: @ 8166906
end
EventScript_166913:: @ 8166913
setflag FLAG_0x0A1
setflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE
return
VermilionCity_EventScript_166917:: @ 8166917
data/maps/VermilionCity_Gym/scripts.inc
+2 -2
View File
@@ -224,7 +224,7 @@ EventScript_16B97C:: @ 816B97C
special SetFlavorTextFlagFromSpecialVars
checkflag FLAG_0x23B
call_if 0, EventScript_16B9AB
clearflag FLAG_0x0A0
clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL
setflag FLAG_0x4B2
setflag FLAG_BADGE03_GET
setvar VAR_0x8008, 3
@@ -233,7 +233,7 @@ EventScript_16B97C:: @ 816B97C
end
EventScript_16B9AB:: @ 816B9AB
clearflag FLAG_0x0A1
clearflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE
return
EventScript_16B9AF:: @ 816B9AF
data/maps/VermilionCity_PokemonCenter_1F/map.json
+4 -4
View File
@@ -79,7 +79,7 @@
"flag": "0"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 2,
"y": 1,
"elevation": 0,
@@ -89,10 +89,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83",
"flag": "FLAG_0x0A0"
"flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
"graphics_id": "0",
"x": 3,
"y": 1,
"elevation": 0,
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83",
"flag": "FLAG_0x0A0"
"flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL"
}
],
"warp_events": [
data/maps/ViridianCity_Gym/scripts.inc
+1 -1
View File
@@ -20,7 +20,7 @@ EventScript_169F04:: @ 8169F04
setvar VAR_0x8004, 15
setvar VAR_0x8005, 3
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x0AD
setflag FLAG_HIDE_MISC_KANTO_ROCKETS
setflag FLAG_0x4B7
setflag FLAG_BADGE08_GET
setvar VAR_MAP_SCENE_ROUTE22, 3