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

Hide/show flags through 07F

Browse Source
This commit is contained in:
PikalaxALT
2019-10-19 20:30:38 -04:00
parent a8b767965a
commit 2ff8af13d5
154 changed files with 806 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity/map.json
+5 -5
View File
@@ -35,7 +35,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_166CFA",
"flag": "FLAG_0x05F"
"flag": "FLAG_HIDE_CELADON_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_FAT_MAN",
@@ -126,7 +126,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_166D03",
"flag": "FLAG_0x05F"
"flag": "FLAG_HIDE_CELADON_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
@@ -152,7 +152,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_1BDF13",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -165,7 +165,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_1BDF13",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_BOY",
@@ -217,7 +217,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_166D15",
"flag": "FLAG_0x05F"
"flag": "FLAG_HIDE_CELADON_ROCKETS"
}
],
"warp_events": [
data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D",
"flag": "FLAG_0x057"
"flag": "FLAG_HIDE_EEVEE_BALL"
}
],
"warp_events": [
data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+2 -2
View File
@@ -4,7 +4,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152
CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
lockall
setvar VAR_0x8004, 3
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 0, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_0x403A
special sub_80CB580
@@ -119,5 +119,5 @@ EventScript_16C313:: @ 816C313
waitse
special sub_80CB498
waitstate
setflag FLAG_0x002
setflag FLAG_TEMP_2
return
data/maps/CeladonCity_GameCorner/map.json
+1 -1
View File
@@ -154,7 +154,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_GameCorner_EventScript_16CAF5",
"flag": "FLAG_0x05B"
"flag": "FLAG_HIDE_GAME_CORNER_ROCKET"
}
],
"warp_events": [
data/maps/CeladonCity_Gym/map.json
+3 -3
View File
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Gym_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Gym_EventScript_1BDF13",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -154,7 +154,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Gym_EventScript_1BDF13",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
}
],
"warp_events": [
data/maps/CeladonCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/CeruleanCave_1F/map.json
+6 -6
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "FLAG_0x016"
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "FLAG_0x017"
"flag": "FLAG_TEMP_17"
}
],
"warp_events": [
data/maps/CeruleanCave_2F/map.json
+10 -10
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "FLAG_0x016"
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "FLAG_0x017"
"flag": "FLAG_TEMP_17"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "FLAG_0x018"
"flag": "FLAG_TEMP_18"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -154,7 +154,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "FLAG_0x019"
"flag": "FLAG_TEMP_19"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -167,7 +167,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "FLAG_0x01A"
"flag": "FLAG_TEMP_1A"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -180,7 +180,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "FLAG_0x01B"
"flag": "FLAG_TEMP_1B"
}
],
"warp_events": [
data/maps/CeruleanCave_B1F/map.json
+9 -9
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "FLAG_0x016"
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "FLAG_0x017"
"flag": "FLAG_TEMP_17"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "FLAG_0x018"
"flag": "FLAG_TEMP_18"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -154,7 +154,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "FLAG_0x019"
"flag": "FLAG_TEMP_19"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -167,7 +167,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "FLAG_0x01A"
"flag": "FLAG_TEMP_1A"
}
],
"warp_events": [
data/maps/CeruleanCity/map.json
+4 -4
View File
@@ -58,7 +58,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_166603",
"flag": "FLAG_0x03B"
"flag": "FLAG_HIDE_CERULEAN_ROCKET"
},
{
"graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
@@ -136,7 +136,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x03C"
"flag": "FLAG_HIDE_CERULEAN_RIVAL"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -149,7 +149,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_1BDF13",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "65375",
@@ -188,7 +188,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_16672F",
"flag": "FLAG_0x05C"
"flag": "FLAG_HIDE_CERULEAN_CAVE_GUARD"
}
],
"warp_events": [
data/maps/CeruleanCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/CinnabarIsland/map.json
+2 -2
View File
@@ -61,7 +61,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x062"
"flag": "FLAG_HIDE_CINNABAR_BILL"
},
{
"graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
@@ -74,7 +74,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x06B"
"flag": "FLAG_HIDE_CINNABAR_SEAGALLOP"
}
],
"warp_events": [
data/maps/CinnabarIsland/scripts.inc
+16 -16
View File
@@ -16,7 +16,7 @@ CinnabarIsland_MapScript1_166EE1:: @ 8166EE1
EventScript_166F0B:: @ 8166F0B
savebgm MUS_ANNAI
setflag FLAG_0x002
setflag FLAG_TEMP_2
setobjectxyperm 3, 15, 12
setobjectmovementtype 3, 9
setobjectxyperm 4, 30, 12
@@ -26,7 +26,7 @@ EventScript_166F24:: @ 8166F24
getplayerxy VAR_0x8004, VAR_0x8005
compare_var_to_value VAR_0x8004, 18
goto_if 4, EventScript_166F4A
setflag FLAG_0x002
setflag FLAG_TEMP_2
setobjectxyperm 3, 18, 12
setobjectmovementtype 3, 7
setobjectxyperm 4, 30, 12
@@ -76,8 +76,8 @@ EventScript_166FA0:: @ 8166FA0
waitmovement 0
removeobject 3
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4
setflag FLAG_0x075
clearflag FLAG_0x076
setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE
clearflag FLAG_HIDE_LOSTELLE_IN_HER_HOME
releaseall
end
@@ -93,18 +93,18 @@ Movement_166FC6:: @ 8166FC6
EventScript_166FCD:: @ 8166FCD
lockall
textcolor 0
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 0, EventScript_167032
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 1, EventScript_16703D
playse SE_PIN
applymovement 3, Movement_1A75DB
waitmovement 0
applymovement 3, Movement_1A75DD
waitmovement 0
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 0, EventScript_167048
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 1, EventScript_167053
msgbox gUnknown_8180C90
msgbox gUnknown_8180CAA, MSGBOX_YESNO
@@ -146,9 +146,9 @@ EventScript_167068:: @ 8167068
EventScript_167078:: @ 8167078
msgbox gUnknown_8180DF8
closemessage
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 0, EventScript_1670A0
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 1, EventScript_1670B3
removeobject 3
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
@@ -201,23 +201,23 @@ Movement_1670E2:: @ 81670E2
step_end
EventScript_1670E6:: @ 81670E6
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 1, EventScript_167142
addobject 4
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 0, EventScript_167154
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 1, EventScript_167166
msgbox gUnknown_8180EAD
closemessage
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 0, EventScript_167171
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 1, EventScript_167183
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
removeobject 3
delay 40
setflag FLAG_0x06B
setflag FLAG_HIDE_CINNABAR_SEAGALLOP
setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
setvar VAR_0x8004, 8
setvar VAR_0x8006, 1
data/maps/CinnabarIsland_Gym/scripts.inc
+1 -1
View File
@@ -71,7 +71,7 @@ EventScript_16DA06:: @ 816DA06
setflag FLAG_BADGE07_GET
setrespawn SPAWN_CINNABAR_ISLAND
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1
clearflag FLAG_0x062
clearflag FLAG_HIDE_CINNABAR_BILL
setvar VAR_0x8008, 7
call EventScript_1A6B18
goto EventScript_16DA34
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -47,7 +47,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
call_if 1, EventScript_16E993
removeobject 7
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
clearflag FLAG_0x062
clearflag FLAG_HIDE_CINNABAR_BILL
warp MAP_CINNABAR_ISLAND, 255, 14, 11
waitstate
release
data/maps/CinnabarIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/FiveIsland_Meadow/map.json
+2 -2
View File
@@ -74,7 +74,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_Meadow_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -87,7 +87,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_Meadow_EventScript_1BDF13",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/FiveIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+3 -3
View File
@@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE
special sub_8112364
lock
faceplayer
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
goto_if_eq EventScript_172043
compare_var_to_value VAR_STORAGE_UNKNOWN, 65535
goto_if_eq EventScript_171F0B
@@ -65,7 +65,7 @@ EventScript_171F34:: @ 8171F34
giveitem VAR_0x403B
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_172025
setflag FLAG_0x002
setflag FLAG_TEMP_2
setvar VAR_STORAGE_UNKNOWN, 0
release
end
@@ -103,7 +103,7 @@ EventScript_172025:: @ 8172025
msgbox gUnknown_81A45E8
textcolor 1
msgbox gUnknown_81A461B
setflag FLAG_0x002
setflag FLAG_TEMP_2
setvar VAR_STORAGE_UNKNOWN, 0
release
end
data/maps/FourIsland/map.json
+1 -1
View File
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/FourIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/FuchsiaCity/map.json
+4 -4
View File
@@ -170,7 +170,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -183,7 +183,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_EventScript_1BDF13",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -196,7 +196,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_EventScript_1BDF13",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -209,7 +209,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_EventScript_1BDF13",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
data/maps/FuchsiaCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/IndigoPlateau_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/LavenderTown/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ LavenderTown_MapScripts:: @ 816686B
LavenderTown_MapScript1_166871:: @ 8166871
setworldmapflag FLAG_WORLD_MAP_LAVENDER_TOWN
setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1
setflag FLAG_0x03D
setflag FLAG_HIDE_SS_ANNE_RIVAL
end
LavenderTown_EventScript_16687D:: @ 816687D
data/maps/LavenderTown_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "LavenderTown_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/LavenderTown_VolunteerPokemonHouse/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_3",
"graphics_id": "MAP_OBJ_GFX_MR_FUJI",
"x": 3,
"y": 3,
"elevation": 3,
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B14A",
"flag": "FLAG_0x035"
"flag": "FLAG_HIDE_POKEHOUSE_FUJI"
},
{
"graphics_id": "MAP_OBJ_GFX_NIDORINO",
data/maps/MtEmber_Exterior/map.json
+6 -6
View File
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -167,7 +167,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1BE00C",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -180,7 +180,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1BE00C",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -219,7 +219,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1BE00C",
"flag": "FLAG_0x016"
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -232,7 +232,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1BE00C",
"flag": "FLAG_0x017"
"flag": "FLAG_TEMP_17"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/MtEmber_RubyPath_1F/map.json
+5 -5
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_1F_EventScript_1BE00C",
"flag": "FLAG_0x016"
"flag": "FLAG_TEMP_16"
}
],
"warp_events": [
data/maps/MtEmber_RubyPath_B1F/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B1F_EventScript_1BE00C",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
}
],
"warp_events": [
data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
}
],
"warp_events": [
data/maps/MtEmber_RubyPath_B2F/map.json
+4 -4
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B2F_EventScript_1BE00C",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
}
],
"warp_events": [
data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
}
],
"warp_events": [
data/maps/MtEmber_RubyPath_B3F/map.json
+6 -6
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
"flag": "FLAG_0x016"
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_RubyPath_B3F_EventScript_1BE00C",
"flag": "FLAG_0x017"
"flag": "FLAG_TEMP_17"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
data/maps/MtEmber_Summit/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Summit_EventScript_163B33",
"flag": "FLAG_0x052"
"flag": "FLAG_HIDE_MOLTRES"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
data/maps/MtEmber_Summit/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ MtEmber_Summit_MapScript1_163B25:: @ 8163B25
end
EventScript_163B2F:: @ 8163B2F
clearflag FLAG_0x052
clearflag FLAG_HIDE_MOLTRES
return
MtEmber_Summit_EventScript_163B33:: @ 8163B33
data/maps/MtEmber_SummitPath_2F/map.json
+9 -9
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
"flag": "FLAG_0x016"
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
"flag": "FLAG_0x017"
"flag": "FLAG_TEMP_17"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
"flag": "FLAG_0x018"
"flag": "FLAG_TEMP_18"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
"flag": "FLAG_0x019"
"flag": "FLAG_TEMP_19"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_SummitPath_2F_EventScript_1BE00C",
"flag": "FLAG_0x01A"
"flag": "FLAG_TEMP_1A"
}
],
"warp_events": [
data/maps/MtMoon_B2F/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_B2F_EventScript_16071B",
"flag": "FLAG_0x02F"
"flag": "FLAG_HIDE_DOME_FOSSIL"
},
{
"graphics_id": "MAP_OBJ_GFX_FOSSIL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_B2F_EventScript_16077F",
"flag": "FLAG_0x030"
"flag": "FLAG_HIDE_HELIX_FOSSIL"
},
{
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
data/maps/MtMoon_B2F/scripts.inc
+2 -2
View File
@@ -8,8 +8,8 @@ MtMoon_B2F_MapScript1_16069F:: @ 816069F
end
EventScript_1606A9:: @ 81606A9
clearflag FLAG_0x02F
clearflag FLAG_0x030
clearflag FLAG_HIDE_DOME_FOSSIL
clearflag FLAG_HIDE_HELIX_FOSSIL
return
MtMoon_B2F_EventScript_1606B0:: @ 81606B0
data/maps/OneIsland/map.json
+1 -1
View File
@@ -35,7 +35,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x071"
"flag": "FLAG_HIDE_ONE_ISLAND_BILL"
},
{
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
data/maps/OneIsland_KindleRoad/map.json
+13 -13
View File
@@ -199,7 +199,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -212,7 +212,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -225,7 +225,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x016"
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -238,7 +238,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x017"
"flag": "FLAG_TEMP_17"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -251,7 +251,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x018"
"flag": "FLAG_TEMP_18"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -264,7 +264,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x019"
"flag": "FLAG_TEMP_19"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -277,7 +277,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x01A"
"flag": "FLAG_TEMP_1A"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -290,7 +290,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x01B"
"flag": "FLAG_TEMP_1B"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -303,7 +303,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x01C"
"flag": "FLAG_TEMP_1C"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -316,7 +316,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x01D"
"flag": "FLAG_TEMP_1D"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -329,7 +329,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x01E"
"flag": "FLAG_TEMP_1E"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -342,7 +342,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x01F"
"flag": "FLAG_TEMP_1F"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -355,7 +355,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BE00C",
"flag": "FLAG_0x011"
"flag": "FLAG_TEMP_11"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/OneIsland_PokemonCenter_1F/map.json
+2 -2
View File
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_PokemonCenter_1F_EventScript_170E9D",
"flag": "FLAG_0x072"
"flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL"
},
{
"graphics_id": "MAP_OBJ_GFX_CELIO",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_PokemonCenter_1F_EventScript_170EC5",
"flag": "FLAG_0x073"
"flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO"
},
{
"graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+4 -4
View File
@@ -146,7 +146,7 @@ EventScript_170E46:: @ 8170E46
return
EventScript_170E58:: @ 8170E58
setflag FLAG_0x039
setflag FLAG_HIDE_TOWN_MAP
setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
additem ITEM_TOWN_MAP, 1
giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5
@@ -300,7 +300,7 @@ EventScript_170FA5:: @ 8170FA5
msgbox gUnknown_81A1D7D
special sub_810B82C
setflag FLAG_0x844
setflag FLAG_0x05C
setflag FLAG_HIDE_CERULEAN_CAVE_GUARD
setflag FLAG_0x08C
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
special InitRoamer
@@ -514,9 +514,9 @@ EventScript_1711DA:: @ 81711DA
applymovement 2, Movement_17132D
waitmovement 0
playse SE_KAIDAN
setflag FLAG_0x072
setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
clearflag FLAG_0x062
clearflag FLAG_HIDE_CINNABAR_BILL
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 3
setvar VAR_0x8004, 1
setvar VAR_0x8006, 8
data/maps/OneIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/PalletTown/map.json
+1 -1
View File
@@ -61,7 +61,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x02C"
"flag": "FLAG_HIDE_OAK_IN_PALLET_TOWN"
}
],
"warp_events": [
data/maps/PalletTown/scripts.inc
+5 -5
View File
@@ -76,7 +76,7 @@ EventScript_1654D8:: @ 81654D8
waitdooranim
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7
setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3
setflag FLAG_0x02C
setflag FLAG_HIDE_OAK_IN_PALLET_TOWN
warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12
waitstate
releaseall
@@ -221,9 +221,9 @@ EventScript_165605:: @ 8165605
closedoor 16, 13
waitdooranim
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
clearflag FLAG_0x02B
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 1
setflag FLAG_0x02C
setflag FLAG_HIDE_OAK_IN_PALLET_TOWN
setflag FLAG_SPECIAL_FLAG_0x4001
warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12
waitstate
@@ -382,7 +382,7 @@ PalletTown_EventScript_16575C:: @ 816575C
goto_if_eq EventScript_165815
compare_var_to_value VAR_0x4002, 1
goto_if_eq EventScript_1658C2
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
goto_if_eq EventScript_165801
msgbox gUnknown_81B1C8B
applymovement 1, Movement_1A75E1
@@ -399,7 +399,7 @@ PalletTown_EventScript_16575C:: @ 816575C
compare_var_to_value VAR_FACING, 4
call_if 5, EventScript_1657E2
moveobjectoffscreen 1
setflag FLAG_0x002
setflag FLAG_TEMP_2
release
end
data/maps/PalletTown_GarysHouse/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_GarysHouse_EventScript_168F63",
"flag": "FLAG_0x039"
"flag": "FLAG_HIDE_TOWN_MAP"
}
],
"warp_events": [
data/maps/PalletTown_ProfessorOaksLab/map.json
+7 -7
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169595",
"flag": "FLAG_0x02B"
"flag": "FLAG_HIDE_OAK_IN_HIS_LAB"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169BAB",
"flag": "FLAG_0x028"
"flag": "FLAG_HIDE_BULBASAUR_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169D78",
"flag": "FLAG_0x029"
"flag": "FLAG_HIDE_SQUIRTLE_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169DAE",
"flag": "FLAG_0x02A"
"flag": "FLAG_HIDE_CHARMANDER_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_BLUE",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_16955F",
"flag": "FLAG_0x02D"
"flag": "FLAG_HIDE_RIVAL_IN_LAB"
},
{
"graphics_id": "MAP_OBJ_GFX_POKEDEX",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169E5F",
"flag": "FLAG_0x03A"
"flag": "FLAG_HIDE_POKEDEX"
},
{
"graphics_id": "MAP_OBJ_GFX_POKEDEX",
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PalletTown_ProfessorOaksLab_EventScript_169E5F",
"flag": "FLAG_0x03A"
"flag": "FLAG_HIDE_POKEDEX"
}
],
"warp_events": [
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+4 -4
View File
@@ -57,7 +57,7 @@ EventScript_169002:: @ 8169002
removeobject 4
setobjectxyperm 4, 6, 3
setobjectmovementtype 4, 8
clearflag FLAG_0x02B
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement 255, Movement_1692B7
waitmovement 0
goto EventScript_169035
@@ -219,7 +219,7 @@ EventScript_16923E:: @ 816923E
removeobject 4
setobjectxyperm 4, 6, 3
setobjectmovementtype 4, 8
clearflag FLAG_0x02B
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement 255, Movement_1692B7
waitmovement 0
applymovement 8, Movement_1A75E9
@@ -595,7 +595,7 @@ EventScript_16958B:: @ 816958B
PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595
lock
faceplayer
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
goto_if_eq EventScript_169600
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
goto_if_eq EventScript_169903
@@ -871,7 +871,7 @@ EventScript_169913:: @ 8169913
closemessage
delay 70
msgbox gUnknown_81A72AD
setflag FLAG_0x002
setflag FLAG_TEMP_2
release
end
data/maps/PewterCity/map.json
+3 -3
View File
@@ -48,7 +48,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_EventScript_16607E",
"flag": "FLAG_0x050"
"flag": "FLAG_HIDE_PEWTER_MUSEUM_ESCORT"
},
{
"graphics_id": "MAP_OBJ_GFX_FAT_MAN",
@@ -87,7 +87,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_EventScript_165B9D",
"flag": "FLAG_0x02E"
"flag": "FLAG_HIDE_PEWTER_CITY_GYM_ESCORT"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -100,7 +100,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
data/maps/PewterCity/scripts.inc
+3 -3
View File
@@ -21,7 +21,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D
waitmovement 0
fadedefaultbgm
removeobject 5
clearflag FLAG_0x02E
clearflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT
release
end
@@ -457,7 +457,7 @@ EventScript_165DBE:: @ 8165DBE
waitmovement 0
fadedefaultbgm
removeobject 5
clearflag FLAG_0x02E
clearflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT
releaseall
end
@@ -1053,7 +1053,7 @@ PewterCity_EventScript_16607E:: @ 816607E
waitmovement 0
fadedefaultbgm
removeobject 2
clearflag FLAG_0x050
clearflag FLAG_HIDE_PEWTER_MUSEUM_ESCORT
release
end
data/maps/PewterCity_Gym/scripts.inc
+1 -1
View File
@@ -19,7 +19,7 @@ EventScript_16A5C5:: @ 816A5C5
setflag FLAG_0x4B0
setflag FLAG_BADGE01_GET
setvar VAR_MAP_SCENE_PEWTER_CITY, 1
setflag FLAG_0x02E
setflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT
clearflag FLAG_0x092
setvar VAR_0x8008, 1
call EventScript_1A6B18
data/maps/PewterCity_Museum_1F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_Museum_1F_EventScript_16A509",
"flag": "FLAG_0x056"
"flag": "FLAG_HIDE_OLD_AMBER"
},
{
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
data/maps/PewterCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PewterCity_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/PokemonLeague_AgathasRoom/scripts.inc
+3 -3
View File
@@ -65,13 +65,13 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877
call_if 0, EventScript_1628E9
checkflag FLAG_SYS_GAME_CLEAR
call_if 1, EventScript_1628F2
setflag FLAG_0x003
setflag FLAG_0x005
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_0x844
call_if 0, EventScript_1628FB
checkflag FLAG_0x844
call_if 1, EventScript_162906
clearflag FLAG_0x005
clearflag FLAG_TEMP_5
goto EventScript_16291B
EventScript_1628E8:: @ 81628E8
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+3 -3
View File
@@ -62,13 +62,13 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC
call_if 0, EventScript_162751
checkflag FLAG_SYS_GAME_CLEAR
call_if 1, EventScript_16275A
setflag FLAG_0x003
setflag FLAG_0x005
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_0x844
call_if 0, EventScript_162763
checkflag FLAG_0x844
call_if 1, EventScript_16276E
clearflag FLAG_0x005
clearflag FLAG_TEMP_5
goto EventScript_1627B0
EventScript_162750:: @ 8162750
data/maps/PokemonLeague_ChampionsRoom/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x05A"
"flag": "FLAG_HIDE_OAK_IN_CHAMP_ROOM"
}
],
"warp_events": [
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+6 -6
View File
@@ -55,7 +55,7 @@ PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C
EventScript_162B76:: @ 8162B76
lockall
textcolor 0
setflag FLAG_0x002
setflag FLAG_TEMP_2
applymovement 255, Movement_162D07
waitmovement 0
delay 20
@@ -66,17 +66,17 @@ EventScript_162B76:: @ 8162B76
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_162C68
setflag FLAG_0x003
setflag FLAG_0x005
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
savebgm MUS_WIN_GYM
checkflag FLAG_0x844
call_if 0, EventScript_162C6F
checkflag FLAG_0x844
call_if 1, EventScript_162C91
setflag FLAG_0x004
clearflag FLAG_0x005
setflag FLAG_TEMP_4
clearflag FLAG_TEMP_5
setflag FLAG_0x4BC
setflag FLAG_0x004
setflag FLAG_TEMP_4
msgbox gUnknown_8178F2F
playbgm MUS_SLOWMASARA, 0
addobject 2
data/maps/PokemonLeague_LancesRoom/scripts.inc
+4 -4
View File
@@ -41,7 +41,7 @@ EventScript_162987:: @ 8162987
lockall
applymovement 255, Movement_1629F1
waitmovement 0
setflag FLAG_0x002
setflag FLAG_TEMP_2
call EventScript_1629A8
playse SE_KI_GASYAN
special DrawWholeMapView
@@ -116,13 +116,13 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14
call_if 0, EventScript_162A79
checkflag FLAG_SYS_GAME_CLEAR
call_if 1, EventScript_162A82
setflag FLAG_0x003
setflag FLAG_0x005
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_0x844
call_if 0, EventScript_162A8B
checkflag FLAG_0x844
call_if 1, EventScript_162A96
clearflag FLAG_0x005
clearflag FLAG_TEMP_5
goto EventScript_162AAB
EventScript_162A78:: @ 8162A78
data/maps/PokemonLeague_LoreleisRoom/scripts.inc
+3 -3
View File
@@ -67,13 +67,13 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC
call_if 0, EventScript_162641
checkflag FLAG_0x844
call_if 1, EventScript_16264A
setflag FLAG_0x003
setflag FLAG_0x005
setflag FLAG_TEMP_3
setflag FLAG_TEMP_5
checkflag FLAG_0x844
call_if 0, EventScript_162653
checkflag FLAG_0x844
call_if 1, EventScript_16265E
clearflag FLAG_0x005
clearflag FLAG_TEMP_5
goto EventScript_162673
EventScript_162640:: @ 8162640
data/maps/PokemonTower_2F/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x051"
"flag": "FLAG_HIDE_TOWER_RIVAL"
},
{
"graphics_id": "MAP_OBJ_GFX_CHANNELER",
data/maps/PokemonTower_7F/map.json
+5 -5
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_3",
"graphics_id": "MAP_OBJ_GFX_MR_FUJI",
"x": 11,
"y": 4,
"elevation": 3,
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_7F_EventScript_16355A",
"flag": "FLAG_0x034"
"flag": "FLAG_HIDE_TOWER_FUJI"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -37,7 +37,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "PokemonTower_7F_EventScript_163586",
"flag": "FLAG_0x05E"
"flag": "FLAG_HIDE_TOWER_ROCKET_1"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -50,7 +50,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "PokemonTower_7F_EventScript_16363D",
"flag": "FLAG_0x083"
"flag": "FLAG_HIDE_TOWER_ROCKET_2"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "PokemonTower_7F_EventScript_1636D6",
"flag": "FLAG_0x084"
"flag": "FLAG_HIDE_TOWER_ROCKET_3"
}
],
"warp_events": [
data/maps/PokemonTower_7F/scripts.inc
+2 -2
View File
@@ -7,8 +7,8 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A
setvar VAR_0x8004, 14
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
setflag FLAG_0x034
clearflag FLAG_0x035
setflag FLAG_HIDE_TOWER_FUJI
clearflag FLAG_HIDE_POKEHOUSE_FUJI
setflag FLAG_0x23C
msgbox gUnknown_817A529
closemessage
data/maps/PowerPlant/map.json
+1 -1
View File
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_1637B8",
"flag": "FLAG_0x05D"
"flag": "FLAG_HIDE_ZAPDOS"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/PowerPlant/scripts.inc
+1 -1
View File
@@ -26,7 +26,7 @@ PowerPlant_MapScript2_16378D:: @ 816378D
end
EventScript_1637AC:: @ 81637AC
clearflag FLAG_0x05D
clearflag FLAG_HIDE_ZAPDOS
return
EventScript_1637B0:: @ 81637B0
data/maps/RockTunnel_B1F/map.json
+15 -15
View File
@@ -167,7 +167,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -180,7 +180,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -193,7 +193,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -206,7 +206,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -219,7 +219,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x016"
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -232,7 +232,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x017"
"flag": "FLAG_TEMP_17"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -245,7 +245,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x018"
"flag": "FLAG_TEMP_18"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -258,7 +258,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x019"
"flag": "FLAG_TEMP_19"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -271,7 +271,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x01A"
"flag": "FLAG_TEMP_1A"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -284,7 +284,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x01B"
"flag": "FLAG_TEMP_1B"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -297,7 +297,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x01C"
"flag": "FLAG_TEMP_1C"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -310,7 +310,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x01D"
"flag": "FLAG_TEMP_1D"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -323,7 +323,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x01E"
"flag": "FLAG_TEMP_1E"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -336,7 +336,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x01F"
"flag": "FLAG_TEMP_1F"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
@@ -349,7 +349,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BE00C",
"flag": "FLAG_0x011"
"flag": "FLAG_TEMP_11"
}
],
"warp_events": [
data/maps/RocketHideout_B4F/map.json
+3 -3
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B4F_EventScript_161317",
"flag": "FLAG_0x038"
"flag": "FLAG_HIDE_HIDEOUT_GIOVANNI"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B4F_EventScript_161363",
"flag": "FLAG_0x037"
"flag": "FLAG_HIDE_SILPH_SCOPE"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B4F_EventScript_1613AD",
"flag": "FLAG_0x036"
"flag": "FLAG_HIDE_LIFT_KEY"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
data/maps/RocketHideout_B4F/scripts.inc
+3 -3
View File
@@ -32,8 +32,8 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317
closemessage
removeobject 1
addobject 2
clearflag FLAG_0x037
setflag FLAG_0x05F
clearflag FLAG_HIDE_SILPH_SCOPE
setflag FLAG_HIDE_CELADON_ROCKETS
setvar VAR_0x8004, 15
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
@@ -60,7 +60,7 @@ RocketHideout_B4F_EventScript_161381:: @ 8161381
EventScript_16139D:: @ 816139D
msgbox gUnknown_81754BD
addobject 4
clearflag FLAG_0x036
clearflag FLAG_HIDE_LIFT_KEY
release
end
data/maps/RocketHideout_Elevator/scripts.inc
+2 -2
View File
@@ -6,7 +6,7 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
checkflag FLAG_0x2A5
goto_if 0, EventScript_16161B
setvar VAR_0x8004, 2
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
call_if 0, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_0x403A
special sub_80CB580
@@ -97,7 +97,7 @@ EventScript_16160E:: @ 816160E
waitse
special sub_80CB498
waitstate
setflag FLAG_0x002
setflag FLAG_TEMP_2
return
EventScript_16161B:: @ 816161B
data/maps/Route10/map.json
+4 -4
View File
@@ -113,7 +113,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route10_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -126,7 +126,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route10_EventScript_1BDF13",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -139,7 +139,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route10_EventScript_1BDF13",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -152,7 +152,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route10_EventScript_1BDF13",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
}
],
"warp_events": [
data/maps/Route10_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route10_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/Route12/map.json
+3 -3
View File
@@ -92,7 +92,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route12_EventScript_168014",
"flag": "FLAG_0x054"
"flag": "FLAG_HIDE_ROUTE_12_SNORLAX"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKER",
@@ -144,7 +144,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route12_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -209,7 +209,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route12_EventScript_1BDF13",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
}
],
"warp_events": [
data/maps/Route12/scripts.inc
+1 -1
View File
@@ -29,7 +29,7 @@ Route12_EventScript_168014:: @ 8168014
playmoncry SPECIES_SNORLAX, 2
delay 40
waitmoncry
setflag FLAG_0x054
setflag FLAG_HIDE_ROUTE_12_SNORLAX
setflag FLAG_0x807
setflag FLAG_0x253
dowildbattle
data/maps/Route13/map.json
+1 -1
View File
@@ -165,7 +165,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route13_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
}
],
"warp_events": [],
data/maps/Route14/map.json
+3 -3
View File
@@ -165,7 +165,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route14_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -178,7 +178,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route14_EventScript_1BDF13",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -191,7 +191,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route14_EventScript_1BDF13",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
data/maps/Route16/map.json
+1 -1
View File
@@ -113,7 +113,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route16_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_BEAUTY",
data/maps/Route2/map.json
+4 -4
View File
@@ -35,7 +35,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_EventScript_1BDF13",
"flag": "FLAG_0x014"
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -48,7 +48,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_EventScript_1BDF13",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -61,7 +61,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_EventScript_1BDF13",
"flag": "FLAG_0x015"
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -74,7 +74,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_EventScript_1BDF13",
"flag": "FLAG_0x016"
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/Route20/scripts.inc
+14 -14
View File
@@ -10,23 +10,23 @@ Route20_MapScript1_168241:: @ 8168241
end
EventScript_168254:: @ 8168254
clearflag FLAG_0x040
clearflag FLAG_0x041
setflag FLAG_0x042
setflag FLAG_0x043
setflag FLAG_0x044
setflag FLAG_0x045
setflag FLAG_0x046
setflag FLAG_0x047
clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_1
clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_2
setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_1
setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_2
setflag FLAG_HIDE_SEAFOAM_B2F_BOULDER_1
setflag FLAG_HIDE_SEAFOAM_B2F_BOULDER_2
setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1
setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2
return
EventScript_16826D:: @ 816826D
clearflag FLAG_0x048
clearflag FLAG_0x049
clearflag FLAG_0x04A
clearflag FLAG_0x04B
setflag FLAG_0x04C
setflag FLAG_0x04D
clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_3
clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_4
clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_5
clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_6
setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1
setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2
return
Route20_EventScript_168280:: @ 8168280
data/maps/Route22/map.json
+1 -1
View File
@@ -35,7 +35,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x04F"
"flag": "FLAG_HIDE_ROUTE_22_RIVAL"
}
],
"warp_events": [
data/maps/Route23/scripts.inc
+2 -2
View File
@@ -3,8 +3,8 @@ Route23_MapScripts:: @ 81684EB
.byte 0
Route23_MapScript1_1684F1:: @ 81684F1
clearflag FLAG_0x059
setflag FLAG_0x058
clearflag FLAG_HIDE_VICTORY_ROAD_3F_BOULDER
setflag FLAG_HIDE_VICTORY_ROAD_2F_BOULDER
setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 0
setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 0
setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 0
data/maps/Route24/map.json
+1 -1
View File
@@ -35,7 +35,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route24_EventScript_168620",
"flag": "FLAG_0x031"
"flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET"
},
{
"graphics_id": "MAP_OBJ_GFX_CAMPER",
data/maps/Route25/map.json
+1 -1
View File
@@ -160,7 +160,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route25_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_BEAUTY",
data/maps/Route25_SeaCottage/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route25_SeaCottage_EventScript_17054B",
"flag": "FLAG_0x033"
"flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE"
},
{
"graphics_id": "MAP_OBJ_GFX_CLEFAIRY",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route25_SeaCottage_EventScript_17054B",
"flag": "FLAG_0x032"
"flag": "FLAG_HIDE_BILL_CLEFAIRY"
}
],
"warp_events": [
data/maps/Route25_SeaCottage/scripts.inc
+9 -9
View File
@@ -10,18 +10,18 @@ Route25_SeaCottage_MapScript1_170529:: @ 8170529
end
EventScript_17053C:: @ 817053C
clearflag FLAG_0x032
clearflag FLAG_HIDE_BILL_CLEFAIRY
setobjectxyperm 1, 3, 3
return
EventScript_170547:: @ 8170547
setflag FLAG_0x003
setflag FLAG_TEMP_3
return
Route25_SeaCottage_EventScript_17054B:: @ 817054B
lock
faceplayer
checkflag FLAG_0x003
checkflag FLAG_TEMP_3
goto_if_eq EventScript_1706C8
checkflag FLAG_0x234
goto_if_eq EventScript_170640
@@ -66,7 +66,7 @@ EventScript_17059C:: @ 817059C
playse SE_C_MAKU_D
closedoor 10, 3
waitdooranim
setflag FLAG_0x002
setflag FLAG_TEMP_2
release
end
@@ -116,7 +116,7 @@ EventScript_17064A:: @ 817064A
additem ITEM_SS_TICKET, 1
giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5
setflag FLAG_0x235
setflag FLAG_0x031
setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET
setflag FLAG_0x234
setflag FLAG_SYS_NOT_SOMEONES_PC
goto EventScript_170640
@@ -159,9 +159,9 @@ Movement_1706DB:: @ 81706DB
Route25_SeaCottage_EventScript_1706DD:: @ 81706DD
lockall
checkflag FLAG_0x003
checkflag FLAG_TEMP_3
goto_if_eq EventScript_1707CA
checkflag FLAG_0x002
checkflag FLAG_TEMP_2
goto_if_eq EventScript_1706FA
msgbox gUnknown_81A0402
releaseall
@@ -171,7 +171,7 @@ EventScript_1706FA:: @ 81706FA
fadeoutbgm 0
msgbox gUnknown_81A042D
closemessage
clearflag FLAG_0x002
clearflag FLAG_TEMP_2
setflag FLAG_0x233
special SpawnScriptFieldObject
applymovement 127, Movement_1707BE
@@ -203,7 +203,7 @@ EventScript_1706FA:: @ 81706FA
waitdooranim
fadeinbgm 0
addobject 1
clearflag FLAG_0x033
clearflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE
delay 50
playfanfare MUS_FANFA1
applymovement 1, Movement_170888
data/maps/Route4_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route4_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/Route8/map.json
+2 -2
View File
@@ -152,7 +152,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route8_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
@@ -165,7 +165,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route8_EventScript_1BDF13",
"flag": "FLAG_0x013"
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
data/maps/Route9/map.json
+1 -1
View File
@@ -152,7 +152,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route9_EventScript_1BDF13",
"flag": "FLAG_0x012"
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/SSAnne_2F_Corridor/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x03D"
"flag": "FLAG_HIDE_SS_ANNE_RIVAL"
},
{
"graphics_id": "MAP_OBJ_GFX_SAILOR",
data/maps/SaffronCity/map.json
+14 -14
View File
@@ -46,7 +46,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_16737A",
"flag": "FLAG_0x03E"
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -59,7 +59,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_167383",
"flag": "FLAG_0x03E"
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -72,7 +72,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_16738C",
"flag": "FLAG_0x03E"
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -85,7 +85,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_167395",
"flag": "FLAG_0x03E"
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -98,7 +98,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_16739E",
"flag": "FLAG_0x03E"
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -111,7 +111,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673B9",
"flag": "FLAG_0x03E"
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -124,7 +124,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673B0",
"flag": "FLAG_0x03E"
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
@@ -137,7 +137,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673A7",
"flag": "FLAG_0x03E"
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
"graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
@@ -150,7 +150,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673EC",
"flag": "FLAG_0x03F"
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
"graphics_id": "MAP_OBJ_GFX_WORKER_M",
@@ -163,7 +163,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673E3",
"flag": "FLAG_0x03F"
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
"graphics_id": "MAP_OBJ_GFX_MAN",
@@ -176,7 +176,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_16741A",
"flag": "FLAG_0x03F"
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
"graphics_id": "MAP_OBJ_GFX_BOY",
@@ -189,7 +189,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673FE",
"flag": "FLAG_0x03F"
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
"graphics_id": "MAP_OBJ_GFX_PIDGEOT",
@@ -202,7 +202,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_167407",
"flag": "FLAG_0x03F"
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
"graphics_id": "MAP_OBJ_GFX_LASS",
@@ -215,7 +215,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673F5",
"flag": "FLAG_0x03F"
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
"graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
data/maps/SaffronCity_Dojo/map.json
+2 -2
View File
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_Dojo_EventScript_16EC00",
"flag": "FLAG_0x060"
"flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_Dojo_EventScript_16EC46",
"flag": "FLAG_0x061"
"flag": "FLAG_HIDE_DOJO_HITMONCHAN_BALL"
}
],
"warp_events": [
data/maps/SaffronCity_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/SaffronCity_PokemonTrainerFanClub/map.json
+4 -4
View File
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D",
"flag": "FLAG_0x06E"
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKER",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF",
"flag": "FLAG_0x06D"
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER"
},
{
"graphics_id": "MAP_OBJ_GFX_BEAUTY",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521",
"flag": "FLAG_0x06F"
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY"
},
{
"graphics_id": "MAP_OBJ_GFX_BLACKBELT",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583",
"flag": "FLAG_0x06C"
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT"
},
{
"graphics_id": "MAP_OBJ_GFX_RED_NORMAL",
data/maps/SeafoamIslands_1F/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 66,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_1F_EventScript_1BE11D",
"flag": "FLAG_0x040"
"flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -37,7 +37,7 @@
"trainer_type": 67,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_1F_EventScript_1BE11D",
"flag": "FLAG_0x041"
"flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/SeafoamIslands_B1F/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 68,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B1F_EventScript_1BE11D",
"flag": "FLAG_0x042"
"flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -37,7 +37,7 @@
"trainer_type": 69,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B1F_EventScript_1BE11D",
"flag": "FLAG_0x043"
"flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/SeafoamIslands_B2F/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 70,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B2F_EventScript_1BE11D",
"flag": "FLAG_0x044"
"flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -37,7 +37,7 @@
"trainer_type": 71,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B2F_EventScript_1BE11D",
"flag": "FLAG_0x045"
"flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
data/maps/SeafoamIslands_B3F/map.json
+6 -6
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x046"
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x047"
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -50,7 +50,7 @@
"trainer_type": 77,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B3F_EventScript_1BE11D",
"flag": "FLAG_0x04A"
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B3F_EventScript_1BE11D",
"flag": "FLAG_0x04B"
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B3F_EventScript_1BE11D",
"flag": "FLAG_0x049"
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -89,7 +89,7 @@
"trainer_type": 76,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B3F_EventScript_1BE11D",
"flag": "FLAG_0x048"
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_3"
}
],
"warp_events": [
data/maps/SeafoamIslands_B3F/scripts.inc
+4 -4
View File
@@ -12,9 +12,9 @@ SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A
EventScript_162F6D:: @ 8162F6D
setvar VAR_0x4002, 0
checkflag FLAG_0x046
checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1
call_if 0, EventScript_162FF0
checkflag FLAG_0x047
checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2
call_if 0, EventScript_162FF0
compare_var_to_value VAR_0x4002, 2
call_if 1, EventScript_162F90
@@ -35,9 +35,9 @@ SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98
EventScript_162FA2:: @ 8162FA2
lockall
setvar VAR_0x4002, 0
checkflag FLAG_0x046
checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1
call_if 0, EventScript_162FF0
checkflag FLAG_0x047
checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2
call_if 0, EventScript_162FF0
compare_var_to_value VAR_0x4002, 2
goto_if_eq EventScript_16300C
data/maps/SeafoamIslands_B4F/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x04C"
"flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "FLAG_0x04D"
"flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_2"
},
{
"graphics_id": "MAP_OBJ_GFX_ARTICUNO",
data/maps/SeafoamIslands_B4F/scripts.inc
+6 -6
View File
@@ -29,9 +29,9 @@ SeafoamIslands_B4F_MapScript1_163066:: @ 8163066
EventScript_163082:: @ 8163082
setvar VAR_0x4002, 0
checkflag FLAG_0x04C
checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1
call_if 0, EventScript_163169
checkflag FLAG_0x04D
checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2
call_if 0, EventScript_163169
compare_var_to_value VAR_0x4002, 2
call_if 1, EventScript_1630A5
@@ -51,9 +51,9 @@ EventScript_1630AD:: @ 81630AD
SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1
setvar VAR_0x4002, 0
checkflag FLAG_0x04C
checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1
call_if 0, EventScript_163169
checkflag FLAG_0x04D
checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2
call_if 0, EventScript_163169
compare_var_to_value VAR_0x4002, 2
goto_if_eq EventScript_1630D4
@@ -95,9 +95,9 @@ Movement_16311D:: @ 816311D
EventScript_163121:: @ 8163121
lockall
setvar VAR_0x4002, 0
checkflag FLAG_0x04C
checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1
call_if 0, EventScript_163169
checkflag FLAG_0x04D
checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2
call_if 0, EventScript_163169
compare_var_to_value VAR_0x4002, 2
goto_if_eq EventScript_163185
data/maps/SevenIsland_PokemonCenter_2F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "FLAG_0x070"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [

Some files were not shown because too many files have changed in this diff Show More