summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-19 21:41:03 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-19 21:52:38 -0400
commit26d8c4d04b174e40b62298a6bf42e2bad67cf81c (patch)
tree0e04d6030bfa57898f4dc6744067487f3d57721c
parent44a293d84cea9397bc75167f0fd4c418cbdc8952 (diff)
Name all item ball hide/show flags
-rw-r--r--data/event_scripts.s682
-rw-r--r--data/maps/CeladonCity/map.json2
-rw-r--r--data/maps/CeladonCity_Gym/scripts.inc6
-rw-r--r--data/maps/CeruleanCave_1F/map.json6
-rw-r--r--data/maps/CeruleanCave_2F/map.json6
-rw-r--r--data/maps/CeruleanCave_B1F/map.json4
-rw-r--r--data/maps/CinnabarIsland/scripts.inc2
-rw-r--r--data/maps/FiveIsland_LostCave_Room10/map.json2
-rw-r--r--data/maps/FiveIsland_LostCave_Room11/map.json2
-rw-r--r--data/maps/FiveIsland_LostCave_Room12/map.json2
-rw-r--r--data/maps/FiveIsland_LostCave_Room13/map.json2
-rw-r--r--data/maps/FiveIsland_LostCave_Room14/map.json2
-rw-r--r--data/maps/FiveIsland_Meadow/map.json4
-rw-r--r--data/maps/FiveIsland_MemorialPillar/map.json2
-rw-r--r--data/maps/FiveIsland_RocketWarehouse/map.json8
-rw-r--r--data/maps/FourIsland/map.json4
-rw-r--r--data/maps/FourIsland_IcefallCave_1F/map.json4
-rw-r--r--data/maps/FourIsland_IcefallCave_B1F/map.json4
-rw-r--r--data/maps/FuchsiaCity_Building1/map.json2
-rw-r--r--data/maps/FuchsiaCity_Building1/scripts.inc2
-rw-r--r--data/maps/MtEmber_Exterior/map.json6
-rw-r--r--data/maps/MtMoon_1F/map.json12
-rw-r--r--data/maps/MtMoon_B2F/map.json8
-rw-r--r--data/maps/OneIsland_KindleRoad/map.json6
-rw-r--r--data/maps/PokemonMansion_1F/map.json6
-rw-r--r--data/maps/PokemonMansion_2F/map.json6
-rw-r--r--data/maps/PokemonMansion_3F/map.json4
-rw-r--r--data/maps/PokemonMansion_B1F/map.json8
-rw-r--r--data/maps/PokemonTower_3F/map.json2
-rw-r--r--data/maps/PokemonTower_4F/map.json6
-rw-r--r--data/maps/PokemonTower_5F/map.json4
-rw-r--r--data/maps/PokemonTower_6F/map.json4
-rw-r--r--data/maps/PowerPlant/map.json10
-rw-r--r--data/maps/RockTunnel_1F/map.json6
-rw-r--r--data/maps/RockTunnel_B1F/map.json4
-rw-r--r--data/maps/RocketHideout_B1F/map.json4
-rw-r--r--data/maps/RocketHideout_B2F/map.json8
-rw-r--r--data/maps/RocketHideout_B3F/map.json6
-rw-r--r--data/maps/RocketHideout_B4F/map.json6
-rw-r--r--data/maps/Route11/map.json6
-rw-r--r--data/maps/Route12/map.json4
-rw-r--r--data/maps/Route15/map.json2
-rw-r--r--data/maps/Route2/map.json4
-rw-r--r--data/maps/Route24/map.json2
-rw-r--r--data/maps/Route25/map.json2
-rw-r--r--data/maps/Route4/map.json2
-rw-r--r--data/maps/Route9/map.json4
-rw-r--r--data/maps/SSAnne_1F_Room2/map.json2
-rw-r--r--data/maps/SSAnne_2F_Room2/map.json2
-rw-r--r--data/maps/SSAnne_2F_Room4/map.json2
-rw-r--r--data/maps/SSAnne_B1F_Room2/map.json2
-rw-r--r--data/maps/SSAnne_B1F_Room3/map.json2
-rw-r--r--data/maps/SSAnne_B1F_Room5/map.json2
-rw-r--r--data/maps/SSAnne_Kitchen/map.json2
-rw-r--r--data/maps/SafariZone_Center/map.json2
-rw-r--r--data/maps/SafariZone_East/map.json8
-rw-r--r--data/maps/SafariZone_North/map.json6
-rw-r--r--data/maps/SafariZone_West/map.json8
-rw-r--r--data/maps/SeafoamIslands_1F/map.json2
-rw-r--r--data/maps/SeafoamIslands_B1F/map.json4
-rw-r--r--data/maps/SeafoamIslands_B2F/map.json2
-rw-r--r--data/maps/SeafoamIslands_B4F/map.json2
-rw-r--r--data/maps/SevenIsland_House_Room2/scripts.inc3
-rw-r--r--data/maps/SevenIsland_SevaultCanyon/map.json6
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_House/map.json2
-rw-r--r--data/maps/SilphCo_10F/map.json6
-rw-r--r--data/maps/SilphCo_11F/map.json2
-rw-r--r--data/maps/SilphCo_3F/map.json2
-rw-r--r--data/maps/SilphCo_4F/map.json8
-rw-r--r--data/maps/SilphCo_5F/map.json6
-rw-r--r--data/maps/SilphCo_6F/map.json4
-rw-r--r--data/maps/SilphCo_7F/map.json4
-rw-r--r--data/maps/SilphCo_8F/map.json2
-rw-r--r--data/maps/SixIsland_OutcastIsland/map.json2
-rw-r--r--data/maps/SixIsland_RuinValley/map.json6
-rw-r--r--data/maps/SixIsland_WaterPath/map.json4
-rw-r--r--data/maps/ThreeIsland/map.json2
-rw-r--r--data/maps/ThreeIsland_BerryForest/map.json6
-rw-r--r--data/maps/TwoIsland/map.json2
-rw-r--r--data/maps/VictoryRoad_1F/map.json4
-rw-r--r--data/maps/VictoryRoad_2F/map.json8
-rw-r--r--data/maps/VictoryRoad_3F/map.json4
-rw-r--r--data/maps/ViridianCity/map.json2
-rw-r--r--data/maps/ViridianForest/map.json8
-rw-r--r--include/constants/flags.h346
-rw-r--r--src/help_system_812B1E0.c2
86 files changed, 518 insertions, 861 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 416da56b2..b3ffff452 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -809,9 +809,7 @@ gStdScript_ItemMessageAndFanfare:: @ 81A4E66
waitfanfare
compare_var_to_value VAR_0x8002, MUS_FANFA1
call_if 1, EventScript_1A4EAA
- setorcopyvar VAR_0x8000, VAR_0x8000
- setorcopyvar VAR_0x8001, VAR_0x8001
- callstd 8
+ giveitem VAR_0x8000, VAR_0x8001, 8
call EventScript_1A6675
return
@@ -3828,7 +3826,7 @@ SilphCo_11F_EventScript_1A8B09:: @ 81A8B09
end
EventScript_1A8B23:: @ 81A8B23
- checkflag FLAG_0x192
+ checkflag FLAG_HIDE_SILPH_CO_5F_CARD_KEY
goto_if 1, EventScript_1A8B32
goto EventScript_1A8135
end
@@ -4047,9 +4045,7 @@ VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08
goto_if 1, EventScript_1A8D3F
msgbox Text_194234
setflag FLAG_0x292
- setorcopyvar VAR_0x8000, 362
- setorcopyvar VAR_0x8001, 1
- callstd 0
+ giveitem 362
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_1A6BF9
msgbox Text_19430F
@@ -10923,1011 +10919,675 @@ Text_1BE56D:: @ 81BE56D
.string "Looks like there's nothing here…$"
Route2_EventScript_1BE58E:: @ 81BE58E
- setorcopyvar VAR_0x8000, 34
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ETHER, 1, 1
end
Route2_EventScript_1BE59B:: @ 81BE59B
- setorcopyvar VAR_0x8000, 18
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_PARALYZE_HEAL, 1, 1
end
ViridianForest_EventScript_1BE5A8:: @ 81BE5A8
- setorcopyvar VAR_0x8000, 4
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_POKE_BALL, 1, 1
end
ViridianForest_EventScript_1BE5B5:: @ 81BE5B5
- setorcopyvar VAR_0x8000, 14
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ANTIDOTE, 1, 1
end
ViridianForest_EventScript_1BE5C2:: @ 81BE5C2
- setorcopyvar VAR_0x8000, 13
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_POTION, 1, 1
end
MtMoon_1F_EventScript_1BE5CF:: @ 81BE5CF
- setorcopyvar VAR_0x8000, 18
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_PARALYZE_HEAL, 1, 1
end
MtMoon_1F_EventScript_1BE5DC:: @ 81BE5DC
- setorcopyvar VAR_0x8000, 297
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM09, 1, 1
end
MtMoon_1F_EventScript_1BE5E9:: @ 81BE5E9
- setorcopyvar VAR_0x8000, 13
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_POTION, 1, 1
end
MtMoon_1F_EventScript_1BE5F6:: @ 81BE5F6
- setorcopyvar VAR_0x8000, 68
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_RARE_CANDY, 1, 1
end
MtMoon_1F_EventScript_1BE603:: @ 81BE603
- setorcopyvar VAR_0x8000, 85
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ESCAPE_ROPE, 1, 1
end
MtMoon_1F_EventScript_1BE610:: @ 81BE610
- setorcopyvar VAR_0x8000, 94
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MOON_STONE, 1, 1
end
MtMoon_B2F_EventScript_1BE61D:: @ 81BE61D
- setorcopyvar VAR_0x8000, 109
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_STAR_PIECE, 1, 1
end
MtMoon_B2F_EventScript_1BE62A:: @ 81BE62A
- setorcopyvar VAR_0x8000, 334
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM46, 1, 1
end
Route4_EventScript_1BE637:: @ 81BE637
- setorcopyvar VAR_0x8000, 293
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM05, 1, 1
end
Route24_EventScript_1BE644:: @ 81BE644
- setorcopyvar VAR_0x8000, 333
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM45, 1, 1
end
Route25_EventScript_1BE651:: @ 81BE651
- setorcopyvar VAR_0x8000, 331
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM43, 1, 1
end
SSAnne_1F_Room2_EventScript_1BE65E:: @ 81BE65E
- setorcopyvar VAR_0x8000, 319
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM31, 1, 1
end
SSAnne_2F_Room2_EventScript_1BE66B:: @ 81BE66B
- setorcopyvar VAR_0x8000, 108
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_STARDUST, 1, 1
end
SSAnne_2F_Room4_EventScript_1BE678:: @ 81BE678
- setorcopyvar VAR_0x8000, 75
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_X_ATTACK, 1, 1
end
SSAnne_B1F_Room2_EventScript_1BE685:: @ 81BE685
- setorcopyvar VAR_0x8000, 332
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM44, 1, 1
end
SSAnne_B1F_Room3_EventScript_1BE692:: @ 81BE692
- setorcopyvar VAR_0x8000, 34
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ETHER, 1, 1
end
SSAnne_B1F_Room5_EventScript_1BE69F:: @ 81BE69F
- setorcopyvar VAR_0x8000, 22
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_SUPER_POTION, 1, 1
end
SSAnne_Kitchen_EventScript_1BE6AC:: @ 81BE6AC
- setorcopyvar VAR_0x8000, 3
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_GREAT_BALL, 1, 1
end
Route9_EventScript_1BE6B9:: @ 81BE6B9
- setorcopyvar VAR_0x8000, 328
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM40, 1, 1
end
RocketHideout_B1F_EventScript_1BE6C6:: @ 81BE6C6
- setorcopyvar VAR_0x8000, 85
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ESCAPE_ROPE, 1, 1
end
RocketHideout_B1F_EventScript_1BE6D3:: @ 81BE6D3
- setorcopyvar VAR_0x8000, 21
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_HYPER_POTION, 1, 1
end
RocketHideout_B2F_EventScript_1BE6E0:: @ 81BE6E0
- setorcopyvar VAR_0x8000, 77
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_X_SPEED, 1, 1
end
RocketHideout_B2F_EventScript_1BE6ED:: @ 81BE6ED
- setorcopyvar VAR_0x8000, 94
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MOON_STONE, 1, 1
end
RocketHideout_B2F_EventScript_1BE6FA:: @ 81BE6FA
- setorcopyvar VAR_0x8000, 300
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM12, 1, 1
end
RocketHideout_B2F_EventScript_1BE707:: @ 81BE707
- setorcopyvar VAR_0x8000, 22
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_SUPER_POTION, 1, 1
end
RocketHideout_B3F_EventScript_1BE714:: @ 81BE714
- setorcopyvar VAR_0x8000, 68
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_RARE_CANDY, 1, 1
end
RocketHideout_B3F_EventScript_1BE721:: @ 81BE721
- setorcopyvar VAR_0x8000, 309
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM21, 1, 1
end
RocketHideout_B4F_EventScript_1BE72E:: @ 81BE72E
- setorcopyvar VAR_0x8000, 337
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM49, 1, 1
end
RocketHideout_B4F_EventScript_1BE73B:: @ 81BE73B
- setorcopyvar VAR_0x8000, 35
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_ETHER, 1, 1
end
RocketHideout_B4F_EventScript_1BE748:: @ 81BE748
- setorcopyvar VAR_0x8000, 67
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_CALCIUM, 1, 1
end
PokemonTower_3F_EventScript_1BE755:: @ 81BE755
- setorcopyvar VAR_0x8000, 85
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ESCAPE_ROPE, 1, 1
end
PokemonTower_4F_EventScript_1BE762:: @ 81BE762
- setorcopyvar VAR_0x8000, 36
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ELIXIR, 1, 1
end
PokemonTower_4F_EventScript_1BE76F:: @ 81BE76F
- setorcopyvar VAR_0x8000, 17
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_AWAKENING, 1, 1
end
PokemonTower_4F_EventScript_1BE77C:: @ 81BE77C
- setorcopyvar VAR_0x8000, 3
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_GREAT_BALL, 1, 1
end
PokemonTower_5F_EventScript_1BE789:: @ 81BE789
- setorcopyvar VAR_0x8000, 110
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_NUGGET, 1, 1
end
PokemonTower_6F_EventScript_1BE796:: @ 81BE796
- setorcopyvar VAR_0x8000, 68
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_RARE_CANDY, 1, 1
end
PokemonTower_6F_EventScript_1BE7A3:: @ 81BE7A3
- setorcopyvar VAR_0x8000, 78
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_X_ACCURACY, 1, 1
end
Route12_EventScript_1BE7B0:: @ 81BE7B0
- setorcopyvar VAR_0x8000, 336
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM48, 1, 1
end
Route12_EventScript_1BE7BD:: @ 81BE7BD
- setorcopyvar VAR_0x8000, 65
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_IRON, 1, 1
end
Route15_EventScript_1BE7CA:: @ 81BE7CA
- setorcopyvar VAR_0x8000, 306
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM18, 1, 1
end
SafariZone_Center_EventScript_1BE7D7:: @ 81BE7D7
- setorcopyvar VAR_0x8000, 110
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_NUGGET, 1, 1
end
SafariZone_East_EventScript_1BE7E4:: @ 81BE7E4
- setorcopyvar VAR_0x8000, 20
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_POTION, 1, 1
end
SafariZone_East_EventScript_1BE7F1:: @ 81BE7F1
- setorcopyvar VAR_0x8000, 19
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_FULL_RESTORE, 1, 1
end
SafariZone_East_EventScript_1BE7FE:: @ 81BE7FE
- setorcopyvar VAR_0x8000, 299
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM11, 1, 1
end
SafariZone_East_EventScript_1BE80B:: @ 81BE80B
- setorcopyvar VAR_0x8000, 98
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_LEAF_STONE, 1, 1
end
SafariZone_North_EventScript_1BE818:: @ 81BE818
- setorcopyvar VAR_0x8000, 64
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_PROTEIN, 1, 1
end
SafariZone_North_EventScript_1BE825:: @ 81BE825
- setorcopyvar VAR_0x8000, 335
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM47, 1, 1
end
SafariZone_West_EventScript_1BE832:: @ 81BE832
- setorcopyvar VAR_0x8000, 320
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM32, 1, 1
end
SafariZone_West_EventScript_1BE83F:: @ 81BE83F
- setorcopyvar VAR_0x8000, 353
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_GOLD_TEETH, 1, 1
end
SafariZone_West_EventScript_1BE84C:: @ 81BE84C
- setorcopyvar VAR_0x8000, 20
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_POTION, 1, 1
end
SafariZone_West_EventScript_1BE859:: @ 81BE859
- setorcopyvar VAR_0x8000, 25
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_REVIVE, 1, 1
end
SilphCo_3F_EventScript_1BE866:: @ 81BE866
- setorcopyvar VAR_0x8000, 21
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_HYPER_POTION, 1, 1
end
SilphCo_4F_EventScript_1BE873:: @ 81BE873
- setorcopyvar VAR_0x8000, 25
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_REVIVE, 1, 1
end
SilphCo_4F_EventScript_1BE880:: @ 81BE880
- setorcopyvar VAR_0x8000, 85
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ESCAPE_ROPE, 1, 1
end
SilphCo_4F_EventScript_1BE88D:: @ 81BE88D
- setorcopyvar VAR_0x8000, 23
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_FULL_HEAL, 1, 1
end
SilphCo_5F_EventScript_1BE89A:: @ 81BE89A
- setorcopyvar VAR_0x8000, 64
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_PROTEIN, 1, 1
end
SilphCo_5F_EventScript_1BE8A7:: @ 81BE8A7
- setorcopyvar VAR_0x8000, 289
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM01, 1, 1
end
SilphCo_5F_EventScript_1BE8B4:: @ 81BE8B4
- setorcopyvar VAR_0x8000, 355
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_CARD_KEY, 1, 1
end
SilphCo_6F_EventScript_1BE8C1:: @ 81BE8C1
- setorcopyvar VAR_0x8000, 63
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_HP_UP, 1, 1
end
SilphCo_6F_EventScript_1BE8CE:: @ 81BE8CE
- setorcopyvar VAR_0x8000, 79
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_X_SPECIAL, 1, 1
end
SilphCo_7F_EventScript_1BE8DB:: @ 81BE8DB
- setorcopyvar VAR_0x8000, 67
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_CALCIUM, 1, 1
end
SilphCo_7F_EventScript_1BE8E8:: @ 81BE8E8
- setorcopyvar VAR_0x8000, 296
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM08, 1, 1
end
SilphCo_10F_EventScript_1BE8F5:: @ 81BE8F5
- setorcopyvar VAR_0x8000, 66
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_CARBOS, 1, 1
end
SilphCo_10F_EventScript_1BE902:: @ 81BE902
- setorcopyvar VAR_0x8000, 2
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ULTRA_BALL, 1, 1
end
SilphCo_10F_EventScript_1BE90F:: @ 81BE90F
- setorcopyvar VAR_0x8000, 68
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_RARE_CANDY, 1, 1
end
PowerPlant_EventScript_1BE91C:: @ 81BE91C
- setorcopyvar VAR_0x8000, 20
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_POTION, 1, 1
end
PowerPlant_EventScript_1BE929:: @ 81BE929
- setorcopyvar VAR_0x8000, 305
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM17, 1, 1
end
PowerPlant_EventScript_1BE936:: @ 81BE936
- setorcopyvar VAR_0x8000, 313
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM25, 1, 1
end
PowerPlant_EventScript_1BE943:: @ 81BE943
- setorcopyvar VAR_0x8000, 96
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_THUNDER_STONE, 1, 1
end
PowerPlant_EventScript_1BE950:: @ 81BE950
- setorcopyvar VAR_0x8000, 36
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ELIXIR, 1, 1
end
PokemonMansion_1F_EventScript_1BE95D:: @ 81BE95D
- setorcopyvar VAR_0x8000, 66
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_CARBOS, 1, 1
end
PokemonMansion_1F_EventScript_1BE96A:: @ 81BE96A
- setorcopyvar VAR_0x8000, 85
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ESCAPE_ROPE, 1, 1
end
PokemonMansion_2F_EventScript_1BE977:: @ 81BE977
- setorcopyvar VAR_0x8000, 67
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_CALCIUM, 1, 1
end
PokemonMansion_3F_EventScript_1BE984:: @ 81BE984
- setorcopyvar VAR_0x8000, 20
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_POTION, 1, 1
end
PokemonMansion_3F_EventScript_1BE991:: @ 81BE991
- setorcopyvar VAR_0x8000, 65
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_IRON, 1, 1
end
PokemonMansion_B1F_EventScript_1BE99E:: @ 81BE99E
- setorcopyvar VAR_0x8000, 302
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM14, 1, 1
end
PokemonMansion_B1F_EventScript_1BE9AB:: @ 81BE9AB
- setorcopyvar VAR_0x8000, 19
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_FULL_RESTORE, 1, 1
end
PokemonMansion_B1F_EventScript_1BE9B8:: @ 81BE9B8
- setorcopyvar VAR_0x8000, 310
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM22, 1, 1
end
PokemonMansion_B1F_EventScript_1BE9C5:: @ 81BE9C5
- setorcopyvar VAR_0x8000, 351
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_SECRET_KEY, 1, 1
end
VictoryRoad_1F_EventScript_1BE9D2:: @ 81BE9D2
- setorcopyvar VAR_0x8000, 68
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_RARE_CANDY, 1, 1
end
VictoryRoad_1F_EventScript_1BE9DF:: @ 81BE9DF
- setorcopyvar VAR_0x8000, 290
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM02, 1, 1
end
VictoryRoad_2F_EventScript_1BE9EC:: @ 81BE9EC
- setorcopyvar VAR_0x8000, 73
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_GUARD_SPEC, 1, 1
end
VictoryRoad_2F_EventScript_1BE9F9:: @ 81BE9F9
- setorcopyvar VAR_0x8000, 295
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM07, 1, 1
end
VictoryRoad_2F_EventScript_1BEA06:: @ 81BEA06
- setorcopyvar VAR_0x8000, 23
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_FULL_HEAL, 1, 1
end
VictoryRoad_2F_EventScript_1BEA13:: @ 81BEA13
- setorcopyvar VAR_0x8000, 325
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM37, 1, 1
end
VictoryRoad_3F_EventScript_1BEA20:: @ 81BEA20
- setorcopyvar VAR_0x8000, 25
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_REVIVE, 1, 1
end
VictoryRoad_3F_EventScript_1BEA2D:: @ 81BEA2D
- setorcopyvar VAR_0x8000, 338
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM50, 1, 1
end
CeruleanCave_1F_EventScript_1BEA3A:: @ 81BEA3A
- setorcopyvar VAR_0x8000, 37
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_ELIXIR, 1, 1
end
CeruleanCave_1F_EventScript_1BEA47:: @ 81BEA47
- setorcopyvar VAR_0x8000, 110
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_NUGGET, 1, 1
end
CeruleanCave_1F_EventScript_1BEA54:: @ 81BEA54
- setorcopyvar VAR_0x8000, 19
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_FULL_RESTORE, 1, 1
end
CeruleanCave_2F_EventScript_1BEA61:: @ 81BEA61
- setorcopyvar VAR_0x8000, 19
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_FULL_RESTORE, 1, 1
end
CeruleanCave_2F_EventScript_1BEA6E:: @ 81BEA6E
- setorcopyvar VAR_0x8000, 69
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_PP_UP, 1, 1
end
CeruleanCave_2F_EventScript_1BEA7B:: @ 81BEA7B
- setorcopyvar VAR_0x8000, 2
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ULTRA_BALL, 1, 1
end
CeruleanCave_B1F_EventScript_1BEA88:: @ 81BEA88
- setorcopyvar VAR_0x8000, 25
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_REVIVE, 1, 1
end
CeruleanCave_B1F_EventScript_1BEA95:: @ 81BEA95
- setorcopyvar VAR_0x8000, 2
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ULTRA_BALL, 1, 1
end
FuchsiaCity_Building1_EventScript_1BEAA2:: @ 81BEAA2
- setorcopyvar VAR_0x8000, 68
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_RARE_CANDY, 1, 1
end
TwoIsland_EventScript_1BEAAF:: @ 81BEAAF
- setorcopyvar VAR_0x8000, 24
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_REVIVE, 1, 1
end
ThreeIsland_EventScript_1BEABC:: @ 81BEABC
- setorcopyvar VAR_0x8000, 70
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ZINC, 1, 1
end
ViridianForest_EventScript_1BEAC9:: @ 81BEAC9
- setorcopyvar VAR_0x8000, 13
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_POTION, 1, 1
end
MtMoon_B2F_EventScript_1BEAD6:: @ 81BEAD6
- setorcopyvar VAR_0x8000, 24
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_REVIVE, 1, 1
end
MtMoon_B2F_EventScript_1BEAE3:: @ 81BEAE3
- setorcopyvar VAR_0x8000, 14
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ANTIDOTE, 1, 1
end
Route11_EventScript_1BEAF0:: @ 81BEAF0
- setorcopyvar VAR_0x8000, 76
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_X_DEFEND, 1, 1
end
Route9_EventScript_1BEAFD:: @ 81BEAFD
- setorcopyvar VAR_0x8000, 15
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_BURN_HEAL, 1, 1
end
RockTunnel_1F_EventScript_1BEB0A:: @ 81BEB0A
- setorcopyvar VAR_0x8000, 86
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_REPEL, 1, 1
end
RockTunnel_1F_EventScript_1BEB17:: @ 81BEB17
- setorcopyvar VAR_0x8000, 106
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_PEARL, 1, 1
end
RockTunnel_1F_EventScript_1BEB24:: @ 81BEB24
- setorcopyvar VAR_0x8000, 85
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ESCAPE_ROPE, 1, 1
end
RockTunnel_B1F_EventScript_1BEB31:: @ 81BEB31
- setorcopyvar VAR_0x8000, 24
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_REVIVE, 1, 1
end
RockTunnel_B1F_EventScript_1BEB3E:: @ 81BEB3E
- setorcopyvar VAR_0x8000, 35
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_ETHER, 1, 1
end
SilphCo_8F_EventScript_1BEB4B:: @ 81BEB4B
- setorcopyvar VAR_0x8000, 65
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_IRON, 1, 1
end
SilphCo_11F_EventScript_1BEB58:: @ 81BEB58
- setorcopyvar VAR_0x8000, 70
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ZINC, 1, 1
end
PokemonMansion_1F_EventScript_1BEB65:: @ 81BEB65
- setorcopyvar VAR_0x8000, 64
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_PROTEIN, 1, 1
end
PokemonMansion_2F_EventScript_1BEB72:: @ 81BEB72
- setorcopyvar VAR_0x8000, 70
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ZINC, 1, 1
end
PokemonMansion_2F_EventScript_1BEB7F:: @ 81BEB7F
- setorcopyvar VAR_0x8000, 63
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_HP_UP, 1, 1
end
ViridianCity_EventScript_1BEB8C:: @ 81BEB8C
- setorcopyvar VAR_0x8000, 13
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_POTION, 1, 1
end
Route11_EventScript_1BEB99:: @ 81BEB99
- setorcopyvar VAR_0x8000, 3
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_GREAT_BALL, 1, 1
end
Route11_EventScript_1BEBA6:: @ 81BEBA6
- setorcopyvar VAR_0x8000, 17
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_AWAKENING, 1, 1
end
PokemonTower_5F_EventScript_1BEBB3:: @ 81BEBB3
- setorcopyvar VAR_0x8000, 190
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_CLEANSE_TAG, 1, 1
end
CeladonCity_EventScript_1BEBC0:: @ 81BEBC0
- setorcopyvar VAR_0x8000, 34
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ETHER, 1, 1
end
RocketHideout_B3F_EventScript_1BEBCD:: @ 81BEBCD
- setorcopyvar VAR_0x8000, 206
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_BLACK_GLASSES, 1, 1
end
SafariZone_North_EventScript_1BEBDA:: @ 81BEBDA
- setorcopyvar VAR_0x8000, 183
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_QUICK_CLAW, 1, 1
end
SeafoamIslands_1F_EventScript_1BEBE7:: @ 81BEBE7
- setorcopyvar VAR_0x8000, 16
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ICE_HEAL, 1, 1
end
SeafoamIslands_B1F_EventScript_1BEBF4:: @ 81BEBF4
- setorcopyvar VAR_0x8000, 97
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_WATER_STONE, 1, 1
end
SeafoamIslands_B1F_EventScript_1BEC01:: @ 81BEC01
- setorcopyvar VAR_0x8000, 24
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_REVIVE, 1, 1
end
SeafoamIslands_B2F_EventScript_1BEC0E:: @ 81BEC0E
- setorcopyvar VAR_0x8000, 107
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_BIG_PEARL, 1, 1
end
SeafoamIslands_B4F_EventScript_1BEC1B:: @ 81BEC1B
- setorcopyvar VAR_0x8000, 2
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ULTRA_BALL, 1, 1
end
FourIsland_EventScript_1BEC28:: @ 81BEC28
- setorcopyvar VAR_0x8000, 109
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_STAR_PIECE, 1, 1
end
FourIsland_EventScript_1BEC35:: @ 81BEC35
- setorcopyvar VAR_0x8000, 108
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_STARDUST, 1, 1
end
OneIsland_KindleRoad_EventScript_1BEC42:: @ 81BEC42
- setorcopyvar VAR_0x8000, 34
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ETHER, 1, 1
end
OneIsland_KindleRoad_EventScript_1BEC4F:: @ 81BEC4F
- setorcopyvar VAR_0x8000, 84
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_REPEL, 1, 1
end
OneIsland_KindleRoad_EventScript_1BEC5C:: @ 81BEC5C
- setorcopyvar VAR_0x8000, 66
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_CARBOS, 1, 1
end
FiveIsland_Meadow_EventScript_1BEC69:: @ 81BEC69
- setorcopyvar VAR_0x8000, 20
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_POTION, 1, 1
end
FiveIsland_Meadow_EventScript_1BEC76:: @ 81BEC76
- setorcopyvar VAR_0x8000, 69
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_PP_UP, 1, 1
end
FiveIsland_MemorialPillar_EventScript_1BEC83:: @ 81BEC83
- setorcopyvar VAR_0x8000, 199
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_METAL_COAT, 1, 1
end
SixIsland_OutcastIsland_EventScript_1BEC90:: @ 81BEC90
- setorcopyvar VAR_0x8000, 69
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_PP_UP, 1, 1
end
SixIsland_WaterPath_EventScript_1BEC9D:: @ 81BEC9D
- setorcopyvar VAR_0x8000, 36
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ELIXIR, 1, 1
end
SixIsland_WaterPath_EventScript_1BECAA:: @ 81BECAA
- setorcopyvar VAR_0x8000, 201
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_DRAGON_SCALE, 1, 1
end
SixIsland_RuinValley_EventScript_1BECB7:: @ 81BECB7
- setorcopyvar VAR_0x8000, 19
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_FULL_RESTORE, 1, 1
end
SixIsland_RuinValley_EventScript_1BECC4:: @ 81BECC4
- setorcopyvar VAR_0x8000, 63
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_HP_UP, 1, 1
end
SixIsland_RuinValley_EventScript_1BECD1:: @ 81BECD1
- setorcopyvar VAR_0x8000, 93
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_SUN_STONE, 1, 1
end
SevenIsland_SevaultCanyon_EventScript_1BECDE:: @ 81BECDE
- setorcopyvar VAR_0x8000, 187
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_KINGS_ROCK, 1, 1
end
SevenIsland_SevaultCanyon_EventScript_1BECEB:: @ 81BECEB
- setorcopyvar VAR_0x8000, 37
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_ELIXIR, 1, 1
end
SevenIsland_SevaultCanyon_EventScript_1BECF8:: @ 81BECF8
- setorcopyvar VAR_0x8000, 110
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_NUGGET, 1, 1
end
ThreeIsland_BerryForest_EventScript_1BED05:: @ 81BED05
- setorcopyvar VAR_0x8000, 35
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_ETHER, 1, 1
end
ThreeIsland_BerryForest_EventScript_1BED12:: @ 81BED12
- setorcopyvar VAR_0x8000, 23
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_FULL_HEAL, 1, 1
end
ThreeIsland_BerryForest_EventScript_1BED1F:: @ 81BED1F
- setorcopyvar VAR_0x8000, 37
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_ELIXIR, 1, 1
end
MtEmber_Exterior_EventScript_1BED2C:: @ 81BED2C
- setorcopyvar VAR_0x8000, 2
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ULTRA_BALL, 1, 1
end
MtEmber_Exterior_EventScript_1BED39:: @ 81BED39
- setorcopyvar VAR_0x8000, 95
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_FIRE_STONE, 1, 1
end
MtEmber_Exterior_EventScript_1BED46:: @ 81BED46
- setorcopyvar VAR_0x8000, 74
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_DIRE_HIT, 1, 1
end
FourIsland_IcefallCave_1F_EventScript_1BED53:: @ 81BED53
- setorcopyvar VAR_0x8000, 2
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_ULTRA_BALL, 1, 1
end
FourIsland_IcefallCave_1F_EventScript_1BED60:: @ 81BED60
- setorcopyvar VAR_0x8000, 345
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_HM07, 1, 1
end
FourIsland_IcefallCave_B1F_EventScript_1BED6D:: @ 81BED6D
- setorcopyvar VAR_0x8000, 19
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_FULL_RESTORE, 1, 1
end
FourIsland_IcefallCave_B1F_EventScript_1BED7A:: @ 81BED7A
- setorcopyvar VAR_0x8000, 212
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_NEVER_MELT_ICE, 1, 1
end
FiveIsland_RocketWarehouse_EventScript_1BED87:: @ 81BED87
- setorcopyvar VAR_0x8000, 107
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_BIG_PEARL, 1, 1
end
FiveIsland_RocketWarehouse_EventScript_1BED94:: @ 81BED94
- setorcopyvar VAR_0x8000, 324
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM36, 1, 1
end
FiveIsland_RocketWarehouse_EventScript_1BEDA1:: @ 81BEDA1
- setorcopyvar VAR_0x8000, 106
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_PEARL, 1, 1
end
FiveIsland_RocketWarehouse_EventScript_1BEDAE:: @ 81BEDAE
- setorcopyvar VAR_0x8000, 218
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_UP_GRADE, 1, 1
end
FiveIsland_LostCave_Room10_EventScript_1BEDBB:: @ 81BEDBB
- setorcopyvar VAR_0x8000, 217
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_SILK_SCARF, 1, 1
end
FiveIsland_LostCave_Room11_EventScript_1BEDC8:: @ 81BEDC8
- setorcopyvar VAR_0x8000, 221
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_LAX_INCENSE, 1, 1
end
FiveIsland_LostCave_Room12_EventScript_1BEDD5:: @ 81BEDD5
- setorcopyvar VAR_0x8000, 220
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_SEA_INCENSE, 1, 1
end
FiveIsland_LostCave_Room13_EventScript_1BEDE2:: @ 81BEDE2
- setorcopyvar VAR_0x8000, 25
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_MAX_REVIVE, 1, 1
end
FiveIsland_LostCave_Room14_EventScript_1BEDEF:: @ 81BEDEF
- setorcopyvar VAR_0x8000, 68
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_RARE_CANDY, 1, 1
end
SevenIsland_SevaultCanyon_House_EventScript_1BEDFC:: @ 81BEDFC
- setorcopyvar VAR_0x8000, 222
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_LUCKY_PUNCH, 1, 1
end
SilphCo_4F_EventScript_1BEE09:: @ 81BEE09
- setorcopyvar VAR_0x8000, 329
- setorcopyvar VAR_0x8001, 1
- callstd 1
+ giveitem ITEM_TM41, 1, 1
end
PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
index 33fb3eba7..ea4fb60a3 100644
--- a/data/maps/CeladonCity/map.json
+++ b/data/maps/CeladonCity/map.json
@@ -204,7 +204,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_1BEBC0",
- "flag": "FLAG_0x1D1"
+ "flag": "FLAG_HIDE_CELADON_CITY_ETHER"
},
{
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc
index 148f14c26..7c3e23424 100644
--- a/data/maps/CeladonCity_Gym/scripts.inc
+++ b/data/maps/CeladonCity_Gym/scripts.inc
@@ -33,11 +33,7 @@ EventScript_16D0C6:: @ 816D0C6
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16D107
additem ITEM_TM19, 1
- loadword 0, gUnknown_81973BA
- setorcopyvar VAR_0x8000, ITEM_TM19
- setorcopyvar VAR_0x8001, 1
- setorcopyvar VAR_0x8002, MUS_FANFA1
- callstd 9 @ gStdScript_ItemMessageAndFanfare
+ giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19
setflag FLAG_0x293
msgbox gUnknown_81973D7
release
diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json
index 95a103e82..db9bb32b4 100644
--- a/data/maps/CeruleanCave_1F/map.json
+++ b/data/maps/CeruleanCave_1F/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BEA47",
- "flag": "FLAG_0x1B2"
+ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BEA54",
- "flag": "FLAG_0x1B3"
+ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BEA3A",
- "flag": "FLAG_0x1B1"
+ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json
index 7266ada75..d1be328e6 100644
--- a/data/maps/CeruleanCave_2F/map.json
+++ b/data/maps/CeruleanCave_2F/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BEA6E",
- "flag": "FLAG_0x1B5"
+ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BEA7B",
- "flag": "FLAG_0x1B6"
+ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BEA61",
- "flag": "FLAG_0x1B4"
+ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json
index 1713f66e9..48b268644 100644
--- a/data/maps/CeruleanCave_B1F/map.json
+++ b/data/maps/CeruleanCave_B1F/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BEA95",
- "flag": "FLAG_0x1B8"
+ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BEA88",
- "flag": "FLAG_0x1B7"
+ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE"
},
{
"graphics_id": "MAP_OBJ_GFX_MEWTWO",
diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc
index 7f10405da..0493fecbb 100644
--- a/data/maps/CinnabarIsland/scripts.inc
+++ b/data/maps/CinnabarIsland/scripts.inc
@@ -42,7 +42,7 @@ EventScript_166F52:: @ 8166F52
return
EventScript_166F5E:: @ 8166F5E
- checkflag FLAG_0x1A8
+ checkflag FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY
goto_if_eq EventScript_166F68
return
diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json
index f6399440c..5626f8a64 100644
--- a/data/maps/FiveIsland_LostCave_Room10/map.json
+++ b/data/maps/FiveIsland_LostCave_Room10/map.json
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_LostCave_Room10_EventScript_1BEDBB",
- "flag": "FLAG_0x1F8"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM10_SILK_SCARF"
}
],
"warp_events": [
diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json
index b8522005b..82463cc38 100644
--- a/data/maps/FiveIsland_LostCave_Room11/map.json
+++ b/data/maps/FiveIsland_LostCave_Room11/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_LostCave_Room11_EventScript_1BEDC8",
- "flag": "FLAG_0x1F9"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM11_LAX_INCENSE"
}
],
"warp_events": [
diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json
index 6a0e49b0d..6e3a0ffc7 100644
--- a/data/maps/FiveIsland_LostCave_Room12/map.json
+++ b/data/maps/FiveIsland_LostCave_Room12/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_LostCave_Room12_EventScript_1BEDD5",
- "flag": "FLAG_0x1FA"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM12_SEA_INCENSE"
}
],
"warp_events": [
diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json
index 304cab4f0..dc558c6b2 100644
--- a/data/maps/FiveIsland_LostCave_Room13/map.json
+++ b/data/maps/FiveIsland_LostCave_Room13/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_LostCave_Room13_EventScript_1BEDE2",
- "flag": "FLAG_0x1FB"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM13_MAX_REVIVE"
}
],
"warp_events": [
diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json
index 089d0c044..046685c55 100644
--- a/data/maps/FiveIsland_LostCave_Room14/map.json
+++ b/data/maps/FiveIsland_LostCave_Room14/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_LostCave_Room14_EventScript_1BEDEF",
- "flag": "FLAG_0x1FC"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM14_RARE_CANDY"
}
],
"warp_events": [
diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json
index 7fde83f08..f99c9e3b2 100644
--- a/data/maps/FiveIsland_Meadow/map.json
+++ b/data/maps/FiveIsland_Meadow/map.json
@@ -100,7 +100,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_Meadow_EventScript_1BEC69",
- "flag": "FLAG_0x1DE"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -113,7 +113,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_Meadow_EventScript_1BEC76",
- "flag": "FLAG_0x1DF"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_PP_UP"
}
],
"warp_events": [
diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json
index 459dfe953..37aadaceb 100644
--- a/data/maps/FiveIsland_MemorialPillar/map.json
+++ b/data/maps/FiveIsland_MemorialPillar/map.json
@@ -82,7 +82,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_MemorialPillar_EventScript_1BEC83",
- "flag": "FLAG_0x1E0"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_MEMORIAL_PILLAR_METAL_COAT"
}
],
"warp_events": [],
diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json
index d93933db6..7c3f182f8 100644
--- a/data/maps/FiveIsland_RocketWarehouse/map.json
+++ b/data/maps/FiveIsland_RocketWarehouse/map.json
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_RocketWarehouse_EventScript_1BED87",
- "flag": "FLAG_0x1F4"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_RocketWarehouse_EventScript_1BED94",
- "flag": "FLAG_0x1F5"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_RocketWarehouse_EventScript_1BEDA1",
- "flag": "FLAG_0x1F6"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_RocketWarehouse_EventScript_1BEDAE",
- "flag": "FLAG_0x1F7"
+ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_UP_GRADE"
}
],
"warp_events": [
diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json
index 211c2b37c..4d0694404 100644
--- a/data/maps/FourIsland/map.json
+++ b/data/maps/FourIsland/map.json
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_EventScript_1BEC28",
- "flag": "FLAG_0x1D9"
+ "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_EventScript_1BEC35",
- "flag": "FLAG_0x1DA"
+ "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST"
},
{
"graphics_id": "MAP_OBJ_GFX_BLUE",
diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json
index 6e4f19dbd..995ac7728 100644
--- a/data/maps/FourIsland_IcefallCave_1F/map.json
+++ b/data/maps/FourIsland_IcefallCave_1F/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_IcefallCave_1F_EventScript_1BED53",
- "flag": "FLAG_0x1F0"
+ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_IcefallCave_1F_EventScript_1BED60",
- "flag": "FLAG_0x1F1"
+ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_HM07"
}
],
"warp_events": [
diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json
index 1bb5b7bdb..0fbf41a57 100644
--- a/data/maps/FourIsland_IcefallCave_B1F/map.json
+++ b/data/maps/FourIsland_IcefallCave_B1F/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_IcefallCave_B1F_EventScript_1BED6D",
- "flag": "FLAG_0x1F2"
+ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_IcefallCave_B1F_EventScript_1BED7A",
- "flag": "FLAG_0x1F3"
+ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_NEVER_MELT_ICE"
}
],
"warp_events": [
diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json
index b8d5a2e78..f58cdb457 100644
--- a/data/maps/FuchsiaCity_Building1/map.json
+++ b/data/maps/FuchsiaCity_Building1/map.json
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FuchsiaCity_Building1_EventScript_1BEAA2",
- "flag": "FLAG_0x1B9"
+ "flag": "FLAG_HIDE_FUCHSIA_CITY_BUILDING1_RARE_CANDY"
},
{
"graphics_id": "0",
diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc
index 58cacf92e..4d305e346 100644
--- a/data/maps/FuchsiaCity_Building1/scripts.inc
+++ b/data/maps/FuchsiaCity_Building1/scripts.inc
@@ -6,7 +6,7 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C
faceplayer
checkflag FLAG_0x23A
goto_if_eq EventScript_16D7FA
- checkflag FLAG_0x189
+ checkflag FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH
goto_if_eq EventScript_16D780
msgbox gUnknown_8198DF9, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json
index 8acda2333..a82947af7 100644
--- a/data/maps/MtEmber_Exterior/map.json
+++ b/data/maps/MtEmber_Exterior/map.json
@@ -245,7 +245,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1BED2C",
- "flag": "FLAG_0x1ED"
+ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -258,7 +258,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1BED39",
- "flag": "FLAG_0x1EE"
+ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -271,7 +271,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Exterior_EventScript_1BED46",
- "flag": "FLAG_0x1EF"
+ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_DIRE_HIT"
}
],
"warp_events": [
diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json
index 78869beff..2701adad6 100644
--- a/data/maps/MtMoon_1F/map.json
+++ b/data/maps/MtMoon_1F/map.json
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_1F_EventScript_1BE5CF",
- "flag": "FLAG_0x159"
+ "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_1F_EventScript_1BE5DC",
- "flag": "FLAG_0x15A"
+ "flag": "FLAG_HIDE_MT_MOON_1F_TM09"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_1F_EventScript_1BE5E9",
- "flag": "FLAG_0x15B"
+ "flag": "FLAG_HIDE_MT_MOON_1F_POTION"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -154,7 +154,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_1F_EventScript_1BE5F6",
- "flag": "FLAG_0x15C"
+ "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -167,7 +167,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_1F_EventScript_1BE603",
- "flag": "FLAG_0x15D"
+ "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -180,7 +180,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_1F_EventScript_1BE610",
- "flag": "FLAG_0x15E"
+ "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE"
},
{
"graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json
index 2e65061ca..0141d7410 100644
--- a/data/maps/MtMoon_B2F/map.json
+++ b/data/maps/MtMoon_B2F/map.json
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_B2F_EventScript_1BE61D",
- "flag": "FLAG_0x15F"
+ "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_B2F_EventScript_1BE62A",
- "flag": "FLAG_0x160"
+ "flag": "FLAG_HIDE_MT_MOON_B2F_TM46"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_B2F_EventScript_1BEAD6",
- "flag": "FLAG_0x1BF"
+ "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -154,7 +154,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtMoon_B2F_EventScript_1BEAE3",
- "flag": "FLAG_0x1C0"
+ "flag": "FLAG_HIDE_MT_MOON_B2F_ANTIDOTE"
}
],
"warp_events": [
diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json
index 2e2a99881..376cee21f 100644
--- a/data/maps/OneIsland_KindleRoad/map.json
+++ b/data/maps/OneIsland_KindleRoad/map.json
@@ -368,7 +368,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BEC42",
- "flag": "FLAG_0x1DB"
+ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -381,7 +381,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BEC4F",
- "flag": "FLAG_0x1DC"
+ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -394,7 +394,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "OneIsland_KindleRoad_EventScript_1BEC5C",
- "flag": "FLAG_0x1DD"
+ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_CARBOS"
}
],
"warp_events": [
diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json
index 911b12629..b7783c486 100644
--- a/data/maps/PokemonMansion_1F/map.json
+++ b/data/maps/PokemonMansion_1F/map.json
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_1F_EventScript_1BE95D",
- "flag": "FLAG_0x19F"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_1F_EventScript_1BE96A",
- "flag": "FLAG_0x1A0"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_1F_EventScript_1BEB65",
- "flag": "FLAG_0x1CA"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN"
},
{
"graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json
index 7bddef15b..4a618c86d 100644
--- a/data/maps/PokemonMansion_2F/map.json
+++ b/data/maps/PokemonMansion_2F/map.json
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_2F_EventScript_1BE977",
- "flag": "FLAG_0x1A1"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_2F_EventScript_1BEB72",
- "flag": "FLAG_0x1CB"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_2F_EventScript_1BEB7F",
- "flag": "FLAG_0x1CC"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_HP_UP"
}
],
"warp_events": [
diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json
index f846a0556..f2d2715ab 100644
--- a/data/maps/PokemonMansion_3F/map.json
+++ b/data/maps/PokemonMansion_3F/map.json
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_3F_EventScript_1BE984",
- "flag": "FLAG_0x1A2"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_3F_EventScript_1BE991",
- "flag": "FLAG_0x1A3"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_3F_IRON"
}
],
"warp_events": [
diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json
index d3d6b2506..24f8295c3 100644
--- a/data/maps/PokemonMansion_B1F/map.json
+++ b/data/maps/PokemonMansion_B1F/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_B1F_EventScript_1BE9B8",
- "flag": "FLAG_0x1A7"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22"
},
{
"graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_B1F_EventScript_1BE99E",
- "flag": "FLAG_0x1A4"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_B1F_EventScript_1BE9AB",
- "flag": "FLAG_0x1A5"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonMansion_B1F_EventScript_1BE9C5",
- "flag": "FLAG_0x1A8"
+ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY"
}
],
"warp_events": [
diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json
index eb53d726e..49ca729a0 100644
--- a/data/maps/PokemonTower_3F/map.json
+++ b/data/maps/PokemonTower_3F/map.json
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_3F_EventScript_1BE755",
- "flag": "FLAG_0x177"
+ "flag": "FLAG_HIDE_POKEMON_TOWER_3F_ESCAPE_ROPE"
}
],
"warp_events": [
diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json
index 7d7e85cd1..94832e3da 100644
--- a/data/maps/PokemonTower_4F/map.json
+++ b/data/maps/PokemonTower_4F/map.json
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_4F_EventScript_1BE762",
- "flag": "FLAG_0x178"
+ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_4F_EventScript_1BE76F",
- "flag": "FLAG_0x179"
+ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_4F_EventScript_1BE77C",
- "flag": "FLAG_0x17A"
+ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_GREAT_BALL"
}
],
"warp_events": [
diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json
index fc115f22b..85bc4e003 100644
--- a/data/maps/PokemonTower_5F/map.json
+++ b/data/maps/PokemonTower_5F/map.json
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_5F_EventScript_1BE789",
- "flag": "FLAG_0x17B"
+ "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_5F_EventScript_1BEBB3",
- "flag": "FLAG_0x1D0"
+ "flag": "FLAG_HIDE_POKEMON_TOWER_5F_CLEANSE_TAG"
}
],
"warp_events": [
diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json
index 4a20cdaed..4f1934e2c 100644
--- a/data/maps/PokemonTower_6F/map.json
+++ b/data/maps/PokemonTower_6F/map.json
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_6F_EventScript_1BE796",
- "flag": "FLAG_0x17C"
+ "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_6F_EventScript_1BE7A3",
- "flag": "FLAG_0x17D"
+ "flag": "FLAG_HIDE_POKEMON_TOWER_6F_X_ACCURACY"
}
],
"warp_events": [
diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json
index 6b8ceac8f..9c6716048 100644
--- a/data/maps/PowerPlant/map.json
+++ b/data/maps/PowerPlant/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_1BE91C",
- "flag": "FLAG_0x19A"
+ "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_1BE929",
- "flag": "FLAG_0x19B"
+ "flag": "FLAG_HIDE_POWER_PLANT_TM17"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_1BE936",
- "flag": "FLAG_0x19C"
+ "flag": "FLAG_HIDE_POWER_PLANT_TM25"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_1BE943",
- "flag": "FLAG_0x19D"
+ "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PowerPlant_EventScript_1BE950",
- "flag": "FLAG_0x19E"
+ "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR"
},
{
"graphics_id": "MAP_OBJ_GFX_ZAPDOS",
diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json
index 48413cccb..ab85b27d2 100644
--- a/data/maps/RockTunnel_1F/map.json
+++ b/data/maps/RockTunnel_1F/map.json
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_1F_EventScript_1BEB0A",
- "flag": "FLAG_0x1C3"
+ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_1F_EventScript_1BEB17",
- "flag": "FLAG_0x1C4"
+ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_1F_EventScript_1BEB24",
- "flag": "FLAG_0x1C5"
+ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_ESCAPE_ROPE"
}
],
"warp_events": [
diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json
index b6b6d424d..086b21910 100644
--- a/data/maps/RockTunnel_B1F/map.json
+++ b/data/maps/RockTunnel_B1F/map.json
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BEB31",
- "flag": "FLAG_0x1C6"
+ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -154,7 +154,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RockTunnel_B1F_EventScript_1BEB3E",
- "flag": "FLAG_0x1C7"
+ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json
index b15197871..57f128d72 100644
--- a/data/maps/RocketHideout_B1F/map.json
+++ b/data/maps/RocketHideout_B1F/map.json
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B1F_EventScript_1BE6C6",
- "flag": "FLAG_0x16C"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B1F_EventScript_1BE6D3",
- "flag": "FLAG_0x16D"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_HYPER_POTION"
}
],
"warp_events": [
diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json
index a39f4dba8..c306907fd 100644
--- a/data/maps/RocketHideout_B2F/map.json
+++ b/data/maps/RocketHideout_B2F/map.json
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B2F_EventScript_1BE6E0",
- "flag": "FLAG_0x16E"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B2F_EventScript_1BE6ED",
- "flag": "FLAG_0x16F"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B2F_EventScript_1BE6FA",
- "flag": "FLAG_0x170"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B2F_EventScript_1BE707",
- "flag": "FLAG_0x171"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_SUPER_POTION"
}
],
"warp_events": [
diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json
index 6b8e2f8ef..d9422b4f4 100644
--- a/data/maps/RocketHideout_B3F/map.json
+++ b/data/maps/RocketHideout_B3F/map.json
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B3F_EventScript_1BE714",
- "flag": "FLAG_0x172"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B3F_EventScript_1BE721",
- "flag": "FLAG_0x173"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B3F_EventScript_1BEBCD",
- "flag": "FLAG_0x1D2"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_BLACK_GLASSES"
}
],
"warp_events": [
diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json
index e8e428591..1a036dbc4 100644
--- a/data/maps/RocketHideout_B4F/map.json
+++ b/data/maps/RocketHideout_B4F/map.json
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B4F_EventScript_1BE72E",
- "flag": "FLAG_0x174"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B4F_EventScript_1BE73B",
- "flag": "FLAG_0x175"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "RocketHideout_B4F_EventScript_1BE748",
- "flag": "FLAG_0x176"
+ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_CALCIUM"
}
],
"warp_events": [
diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json
index 59ca5b8fe..2bd401437 100644
--- a/data/maps/Route11/map.json
+++ b/data/maps/Route11/map.json
@@ -165,7 +165,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route11_EventScript_1BEAF0",
- "flag": "FLAG_0x1C1"
+ "flag": "FLAG_HIDE_ROUTE11_X_DEFEND"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -178,7 +178,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route11_EventScript_1BEB99",
- "flag": "FLAG_0x1CE"
+ "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -191,7 +191,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route11_EventScript_1BEBA6",
- "flag": "FLAG_0x1CF"
+ "flag": "FLAG_HIDE_ROUTE11_AWAKENING"
}
],
"warp_events": [
diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json
index 00e154310..d25ee1304 100644
--- a/data/maps/Route12/map.json
+++ b/data/maps/Route12/map.json
@@ -157,7 +157,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route12_EventScript_1BE7B0",
- "flag": "FLAG_0x17E"
+ "flag": "FLAG_HIDE_ROUTE12_TM48"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -170,7 +170,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route12_EventScript_1BE7BD",
- "flag": "FLAG_0x17F"
+ "flag": "FLAG_HIDE_ROUTE12_IRON"
},
{
"graphics_id": "MAP_OBJ_GFX_BEAUTY",
diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json
index 80e04eb86..6d33098a6 100644
--- a/data/maps/Route15/map.json
+++ b/data/maps/Route15/map.json
@@ -165,7 +165,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route15_EventScript_1BE7CA",
- "flag": "FLAG_0x180"
+ "flag": "FLAG_HIDE_ROUTE15_TM18"
},
{
"graphics_id": "MAP_OBJ_GFX_BLACKBELT",
diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json
index 8aca651aa..037722cdc 100644
--- a/data/maps/Route2/map.json
+++ b/data/maps/Route2/map.json
@@ -87,7 +87,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_EventScript_1BE58E",
- "flag": "FLAG_0x154"
+ "flag": "FLAG_HIDE_ROUTE2_ETHER"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -100,7 +100,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route2_EventScript_1BE59B",
- "flag": "FLAG_0x155"
+ "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL"
},
{
"graphics_id": "65375",
diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json
index 5b541fbbc..bbcab600b 100644
--- a/data/maps/Route24/map.json
+++ b/data/maps/Route24/map.json
@@ -126,7 +126,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route24_EventScript_1BE644",
- "flag": "FLAG_0x162"
+ "flag": "FLAG_HIDE_ROUTE24_TM45"
}
],
"warp_events": [],
diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json
index 72a66aded..d9c39608d 100644
--- a/data/maps/Route25/map.json
+++ b/data/maps/Route25/map.json
@@ -147,7 +147,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route25_EventScript_1BE651",
- "flag": "FLAG_0x163"
+ "flag": "FLAG_HIDE_ROUTE25_TM43"
},
{
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json
index 5f2a32fca..7848dbe01 100644
--- a/data/maps/Route4/map.json
+++ b/data/maps/Route4/map.json
@@ -61,7 +61,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route4_EventScript_1BE637",
- "flag": "FLAG_0x161"
+ "flag": "FLAG_HIDE_ROUTE4_TM05"
},
{
"graphics_id": "MAP_OBJ_GFX_BOY",
diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json
index 128766a3f..4c1aac684 100644
--- a/data/maps/Route9/map.json
+++ b/data/maps/Route9/map.json
@@ -165,7 +165,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route9_EventScript_1BE6B9",
- "flag": "FLAG_0x16B"
+ "flag": "FLAG_HIDE_ROUTE9_TM40"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -178,7 +178,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route9_EventScript_1BEAFD",
- "flag": "FLAG_0x1C2"
+ "flag": "FLAG_HIDE_ROUTE9_BURN_HEAL"
}
],
"warp_events": [],
diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json
index cb55f49a6..1895ff07a 100644
--- a/data/maps/SSAnne_1F_Room2/map.json
+++ b/data/maps/SSAnne_1F_Room2/map.json
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_1F_Room2_EventScript_1BE65E",
- "flag": "FLAG_0x164"
+ "flag": "FLAG_HIDE_SSANNE_1F_ROOM2_TM31"
}
],
"warp_events": [
diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json
index 6586004ab..124f37b4f 100644
--- a/data/maps/SSAnne_2F_Room2/map.json
+++ b/data/maps/SSAnne_2F_Room2/map.json
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_2F_Room2_EventScript_1BE66B",
- "flag": "FLAG_0x165"
+ "flag": "FLAG_HIDE_SSANNE_2F_ROOM2_STARDUST"
}
],
"warp_events": [
diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json
index fa0aca76b..966b86cf6 100644
--- a/data/maps/SSAnne_2F_Room4/map.json
+++ b/data/maps/SSAnne_2F_Room4/map.json
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_2F_Room4_EventScript_1BE678",
- "flag": "FLAG_0x166"
+ "flag": "FLAG_HIDE_SSANNE_2F_ROOM4_X_ATTACK"
}
],
"warp_events": [
diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json
index 3009045a3..c69229610 100644
--- a/data/maps/SSAnne_B1F_Room2/map.json
+++ b/data/maps/SSAnne_B1F_Room2/map.json
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_B1F_Room2_EventScript_1BE685",
- "flag": "FLAG_0x167"
+ "flag": "FLAG_HIDE_SSANNE_B1F_ROOM2_TM44"
}
],
"warp_events": [
diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json
index f1cbab62d..d4f6b9c97 100644
--- a/data/maps/SSAnne_B1F_Room3/map.json
+++ b/data/maps/SSAnne_B1F_Room3/map.json
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_B1F_Room3_EventScript_1BE692",
- "flag": "FLAG_0x168"
+ "flag": "FLAG_HIDE_SSANNE_B1F_ROOM3_ETHER"
}
],
"warp_events": [
diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json
index 6ff25abb3..bd70e785b 100644
--- a/data/maps/SSAnne_B1F_Room5/map.json
+++ b/data/maps/SSAnne_B1F_Room5/map.json
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_B1F_Room5_EventScript_1BE69F",
- "flag": "FLAG_0x169"
+ "flag": "FLAG_HIDE_SSANNE_B1F_ROOM5_SUPER_POTION"
}
],
"warp_events": [
diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json
index 980304be4..c4a75b80b 100644
--- a/data/maps/SSAnne_Kitchen/map.json
+++ b/data/maps/SSAnne_Kitchen/map.json
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SSAnne_Kitchen_EventScript_1BE6AC",
- "flag": "FLAG_0x16A"
+ "flag": "FLAG_HIDE_SSANNE_KITCHEN_GREAT_BALL"
}
],
"warp_events": [
diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json
index 90999fd84..8dc80073e 100644
--- a/data/maps/SafariZone_Center/map.json
+++ b/data/maps/SafariZone_Center/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_Center_EventScript_1BE7D7",
- "flag": "FLAG_0x181"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_CENTER_NUGGET"
}
],
"warp_events": [
diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json
index bc67fc7f2..dae5d93f8 100644
--- a/data/maps/SafariZone_East/map.json
+++ b/data/maps/SafariZone_East/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_East_EventScript_1BE7E4",
- "flag": "FLAG_0x182"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_East_EventScript_1BE7F1",
- "flag": "FLAG_0x183"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_East_EventScript_1BE7FE",
- "flag": "FLAG_0x184"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_East_EventScript_1BE80B",
- "flag": "FLAG_0x185"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_LEAF_STONE"
}
],
"warp_events": [
diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json
index d39f6fc7b..5d15f61f9 100644
--- a/data/maps/SafariZone_North/map.json
+++ b/data/maps/SafariZone_North/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_North_EventScript_1BE818",
- "flag": "FLAG_0x186"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_North_EventScript_1BE825",
- "flag": "FLAG_0x187"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_North_EventScript_1BEBDA",
- "flag": "FLAG_0x1D3"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_QUICK_CLAW"
}
],
"warp_events": [
diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json
index 6d55d24a6..1d309fdc0 100644
--- a/data/maps/SafariZone_West/map.json
+++ b/data/maps/SafariZone_West/map.json
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_West_EventScript_1BE83F",
- "flag": "FLAG_0x189"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_West_EventScript_1BE832",
- "flag": "FLAG_0x188"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_West_EventScript_1BE84C",
- "flag": "FLAG_0x18A"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SafariZone_West_EventScript_1BE859",
- "flag": "FLAG_0x18B"
+ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_REVIVE"
}
],
"warp_events": [
diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json
index 15aec6bd0..fbb66d878 100644
--- a/data/maps/SeafoamIslands_1F/map.json
+++ b/data/maps/SeafoamIslands_1F/map.json
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_1F_EventScript_1BEBE7",
- "flag": "FLAG_0x1D4"
+ "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_1F_ICE_HEAL"
}
],
"warp_events": [
diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json
index 4d4d60c97..d0a54af61 100644
--- a/data/maps/SeafoamIslands_B1F/map.json
+++ b/data/maps/SeafoamIslands_B1F/map.json
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B1F_EventScript_1BEBF4",
- "flag": "FLAG_0x1D5"
+ "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B1F_EventScript_1BEC01",
- "flag": "FLAG_0x1D6"
+ "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_REVIVE"
}
],
"warp_events": [
diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json
index 337484bf5..caf197521 100644
--- a/data/maps/SeafoamIslands_B2F/map.json
+++ b/data/maps/SeafoamIslands_B2F/map.json
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B2F_EventScript_1BEC0E",
- "flag": "FLAG_0x1D7"
+ "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B2F_BIG_PEARL"
}
],
"warp_events": [
diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json
index a1220fc45..63922d1a5 100644
--- a/data/maps/SeafoamIslands_B4F/map.json
+++ b/data/maps/SeafoamIslands_B4F/map.json
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SeafoamIslands_B4F_EventScript_1BEC1B",
- "flag": "FLAG_0x1D8"
+ "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B4F_ULTRA_BALL"
}
],
"warp_events": [
diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc
index db52423e4..236c95be3 100644
--- a/data/maps/SevenIsland_House_Room2/scripts.inc
+++ b/data/maps/SevenIsland_House_Room2/scripts.inc
@@ -16,8 +16,7 @@ EventScript_170A97:: @ 8170A97
applymovement 255, Movement_170B22
waitmovement 0
special sub_80E7538
- loadword 0, gStringVar4 @ 2021D18
- callstd 4
+ msgbox gStringVar4
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json
index ba0ce481c..213ada388 100644
--- a/data/maps/SevenIsland_SevaultCanyon/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon/map.json
@@ -243,7 +243,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_SevaultCanyon_EventScript_1BECDE",
- "flag": "FLAG_0x1E7"
+ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -256,7 +256,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_SevaultCanyon_EventScript_1BECEB",
- "flag": "FLAG_0x1E8"
+ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -269,7 +269,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_SevaultCanyon_EventScript_1BECF8",
- "flag": "FLAG_0x1E9"
+ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET"
},
{
"graphics_id": "MAP_OBJ_GFX_BLACKBELT",
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json
index 32e68bb2f..8fa5f28fb 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_SevaultCanyon_House_EventScript_1BEDFC",
- "flag": "FLAG_0x1FD"
+ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE_LUCKY_PUNCH"
}
],
"warp_events": [
diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json
index 734a1281b..79add7fa9 100644
--- a/data/maps/SilphCo_10F/map.json
+++ b/data/maps/SilphCo_10F/map.json
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_10F_EventScript_1BE8F5",
- "flag": "FLAG_0x197"
+ "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_10F_EventScript_1BE902",
- "flag": "FLAG_0x198"
+ "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_10F_EventScript_1BE90F",
- "flag": "FLAG_0x199"
+ "flag": "FLAG_HIDE_SILPH_CO_10F_RARE_CANDY"
}
],
"warp_events": [
diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json
index 0533712db..89abd5bc2 100644
--- a/data/maps/SilphCo_11F/map.json
+++ b/data/maps/SilphCo_11F/map.json
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_11F_EventScript_1BEB58",
- "flag": "FLAG_0x1C9"
+ "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json
index 248c96651..8e9fe83bc 100644
--- a/data/maps/SilphCo_3F/map.json
+++ b/data/maps/SilphCo_3F/map.json
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_3F_EventScript_1BE866",
- "flag": "FLAG_0x18C"
+ "flag": "FLAG_HIDE_SILPH_CO_3F_HYPER_POTION"
}
],
"warp_events": [
diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json
index 3fbca5be2..3612af63d 100644
--- a/data/maps/SilphCo_4F/map.json
+++ b/data/maps/SilphCo_4F/map.json
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_4F_EventScript_1BE873",
- "flag": "FLAG_0x18D"
+ "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_4F_EventScript_1BE880",
- "flag": "FLAG_0x18E"
+ "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_4F_EventScript_1BE88D",
- "flag": "FLAG_0x18F"
+ "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_4F_EventScript_1BEE09",
- "flag": "FLAG_0x1FE"
+ "flag": "FLAG_HIDE_SILPH_CO_4F_TM41"
}
],
"warp_events": [
diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json
index 01fcc8406..6359f0c2e 100644
--- a/data/maps/SilphCo_5F/map.json
+++ b/data/maps/SilphCo_5F/map.json
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_5F_EventScript_1BE89A",
- "flag": "FLAG_0x190"
+ "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_5F_EventScript_1BE8A7",
- "flag": "FLAG_0x191"
+ "flag": "FLAG_HIDE_SILPH_CO_5F_TM01"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_5F_EventScript_1BE8B4",
- "flag": "FLAG_0x192"
+ "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY"
},
{
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json
index 01467b3b9..431d0af5a 100644
--- a/data/maps/SilphCo_6F/map.json
+++ b/data/maps/SilphCo_6F/map.json
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_6F_EventScript_1BE8C1",
- "flag": "FLAG_0x193"
+ "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_6F_EventScript_1BE8CE",
- "flag": "FLAG_0x194"
+ "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL"
},
{
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json
index fd9e05ed6..31997f440 100644
--- a/data/maps/SilphCo_7F/map.json
+++ b/data/maps/SilphCo_7F/map.json
@@ -141,7 +141,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_7F_EventScript_1BE8DB",
- "flag": "FLAG_0x195"
+ "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -154,7 +154,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_7F_EventScript_1BE8E8",
- "flag": "FLAG_0x196"
+ "flag": "FLAG_HIDE_SILPH_CO_7F_TM08"
}
],
"warp_events": [
diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json
index 3c7962e3a..e279a7f69 100644
--- a/data/maps/SilphCo_8F/map.json
+++ b/data/maps/SilphCo_8F/map.json
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SilphCo_8F_EventScript_1BEB4B",
- "flag": "FLAG_0x1C8"
+ "flag": "FLAG_HIDE_SILPH_CO_8F_IRON"
},
{
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json
index e788715a7..7b27d16d2 100644
--- a/data/maps/SixIsland_OutcastIsland/map.json
+++ b/data/maps/SixIsland_OutcastIsland/map.json
@@ -108,7 +108,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_OutcastIsland_EventScript_1BEC90",
- "flag": "FLAG_0x1E1"
+ "flag": "FLAG_HIDE_SIX_ISLAND_OUTCAST_ISLAND_PP_UP"
}
],
"warp_events": [
diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json
index c6fa6519b..69669971c 100644
--- a/data/maps/SixIsland_RuinValley/map.json
+++ b/data/maps/SixIsland_RuinValley/map.json
@@ -212,7 +212,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_RuinValley_EventScript_1BECC4",
- "flag": "FLAG_0x1E5"
+ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -225,7 +225,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_RuinValley_EventScript_1BECB7",
- "flag": "FLAG_0x1E4"
+ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -238,7 +238,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_RuinValley_EventScript_1BECD1",
- "flag": "FLAG_0x1E6"
+ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_SUN_STONE"
}
],
"warp_events": [
diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json
index 9f6d0a73a..72e9fa17f 100644
--- a/data/maps/SixIsland_WaterPath/map.json
+++ b/data/maps/SixIsland_WaterPath/map.json
@@ -131,7 +131,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_WaterPath_EventScript_1BEC9D",
- "flag": "FLAG_0x1E2"
+ "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -144,7 +144,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SixIsland_WaterPath_EventScript_1BECAA",
- "flag": "FLAG_0x1E3"
+ "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_DRAGON_SCALE"
}
],
"warp_events": [
diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json
index e8fcd8e83..6d6f17ad0 100644
--- a/data/maps/ThreeIsland/map.json
+++ b/data/maps/ThreeIsland/map.json
@@ -152,7 +152,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ThreeIsland_EventScript_1BEABC",
- "flag": "FLAG_0x1BB"
+ "flag": "FLAG_HIDE_THREE_ISLAND_ZINC"
},
{
"graphics_id": "MAP_OBJ_GFX_WOMAN_1",
diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json
index 9eb128545..6ce4a164e 100644
--- a/data/maps/ThreeIsland_BerryForest/map.json
+++ b/data/maps/ThreeIsland_BerryForest/map.json
@@ -167,7 +167,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ThreeIsland_BerryForest_EventScript_1BED05",
- "flag": "FLAG_0x1EA"
+ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -180,7 +180,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ThreeIsland_BerryForest_EventScript_1BED12",
- "flag": "FLAG_0x1EB"
+ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -193,7 +193,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ThreeIsland_BerryForest_EventScript_1BED1F",
- "flag": "FLAG_0x1EC"
+ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ELIXIR"
}
],
"warp_events": [
diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json
index ebbabf5c1..704b95e20 100644
--- a/data/maps/TwoIsland/map.json
+++ b/data/maps/TwoIsland/map.json
@@ -108,7 +108,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TwoIsland_EventScript_1BEAAF",
- "flag": "FLAG_0x1BA"
+ "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE"
},
{
"graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index c3b1d79c0..8df8cfddf 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -50,7 +50,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VictoryRoad_1F_EventScript_1BE9D2",
- "flag": "FLAG_0x1A9"
+ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VictoryRoad_1F_EventScript_1BE9DF",
- "flag": "FLAG_0x1AA"
+ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json
index 1917174e5..22f727361 100644
--- a/data/maps/VictoryRoad_2F/map.json
+++ b/data/maps/VictoryRoad_2F/map.json
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VictoryRoad_2F_EventScript_1BE9EC",
- "flag": "FLAG_0x1AB"
+ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VictoryRoad_2F_EventScript_1BE9F9",
- "flag": "FLAG_0x1AC"
+ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VictoryRoad_2F_EventScript_1BEA06",
- "flag": "FLAG_0x1AD"
+ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -128,7 +128,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VictoryRoad_2F_EventScript_1BEA13",
- "flag": "FLAG_0x1AE"
+ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json
index 97b9f117e..7130a06f4 100644
--- a/data/maps/VictoryRoad_3F/map.json
+++ b/data/maps/VictoryRoad_3F/map.json
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VictoryRoad_3F_EventScript_1BEA20",
- "flag": "FLAG_0x1AF"
+ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "VictoryRoad_3F_EventScript_1BEA2D",
- "flag": "FLAG_0x1B0"
+ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50"
},
{
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json
index 6c52616d8..dbf0659a5 100644
--- a/data/maps/ViridianCity/map.json
+++ b/data/maps/ViridianCity/map.json
@@ -144,7 +144,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianCity_EventScript_1BEB8C",
- "flag": "FLAG_0x1CD"
+ "flag": "FLAG_HIDE_VIRIDIAN_CITY_POTION"
}
],
"warp_events": [
diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json
index b18edb3ef..a1ad34cd9 100644
--- a/data/maps/ViridianForest/map.json
+++ b/data/maps/ViridianForest/map.json
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianForest_EventScript_1BE5A8",
- "flag": "FLAG_0x156"
+ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianForest_EventScript_1BE5B5",
- "flag": "FLAG_0x157"
+ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE"
},
{
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
@@ -115,7 +115,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianForest_EventScript_1BE5C2",
- "flag": "FLAG_0x158"
+ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION"
},
{
"graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
@@ -154,7 +154,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "ViridianForest_EventScript_1BEAC9",
- "flag": "FLAG_0x1BE"
+ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION_2"
}
],
"warp_events": [
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 132b63be6..ee6cd2dae 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -181,7 +181,7 @@
#define FLAG_HIDE_MISC_KANTO_ROCKETS 0x0AD
#define FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS 0x0AE
-// Item ball hide/show flags
+// Unused?
#define FLAG_0x0AF 0x0AF
#define FLAG_0x0B0 0x0B0
#define FLAG_0x0B1 0x0B1
@@ -347,177 +347,179 @@
#define FLAG_0x151 0x151
#define FLAG_0x152 0x152
#define FLAG_0x153 0x153
-#define FLAG_0x154 0x154
-#define FLAG_0x155 0x155
-#define FLAG_0x156 0x156
-#define FLAG_0x157 0x157
-#define FLAG_0x158 0x158
-#define FLAG_0x159 0x159
-#define FLAG_0x15A 0x15A
-#define FLAG_0x15B 0x15B
-#define FLAG_0x15C 0x15C
-#define FLAG_0x15D 0x15D
-#define FLAG_0x15E 0x15E
-#define FLAG_0x15F 0x15F
-#define FLAG_0x160 0x160
-#define FLAG_0x161 0x161
-#define FLAG_0x162 0x162
-#define FLAG_0x163 0x163
-#define FLAG_0x164 0x164
-#define FLAG_0x165 0x165
-#define FLAG_0x166 0x166
-#define FLAG_0x167 0x167
-#define FLAG_0x168 0x168
-#define FLAG_0x169 0x169
-#define FLAG_0x16A 0x16A
-#define FLAG_0x16B 0x16B
-#define FLAG_0x16C 0x16C
-#define FLAG_0x16D 0x16D
-#define FLAG_0x16E 0x16E
-#define FLAG_0x16F 0x16F
-#define FLAG_0x170 0x170
-#define FLAG_0x171 0x171
-#define FLAG_0x172 0x172
-#define FLAG_0x173 0x173
-#define FLAG_0x174 0x174
-#define FLAG_0x175 0x175
-#define FLAG_0x176 0x176
-#define FLAG_0x177 0x177
-#define FLAG_0x178 0x178
-#define FLAG_0x179 0x179
-#define FLAG_0x17A 0x17A
-#define FLAG_0x17B 0x17B
-#define FLAG_0x17C 0x17C
-#define FLAG_0x17D 0x17D
-#define FLAG_0x17E 0x17E
-#define FLAG_0x17F 0x17F
-#define FLAG_0x180 0x180
-#define FLAG_0x181 0x181
-#define FLAG_0x182 0x182
-#define FLAG_0x183 0x183
-#define FLAG_0x184 0x184
-#define FLAG_0x185 0x185
-#define FLAG_0x186 0x186
-#define FLAG_0x187 0x187
-#define FLAG_0x188 0x188
-#define FLAG_0x189 0x189
-#define FLAG_0x18A 0x18A
-#define FLAG_0x18B 0x18B
-#define FLAG_0x18C 0x18C
-#define FLAG_0x18D 0x18D
-#define FLAG_0x18E 0x18E
-#define FLAG_0x18F 0x18F
-#define FLAG_0x190 0x190
-#define FLAG_0x191 0x191
-#define FLAG_0x192 0x192
-#define FLAG_0x193 0x193
-#define FLAG_0x194 0x194
-#define FLAG_0x195 0x195
-#define FLAG_0x196 0x196
-#define FLAG_0x197 0x197
-#define FLAG_0x198 0x198
-#define FLAG_0x199 0x199
-#define FLAG_0x19A 0x19A
-#define FLAG_0x19B 0x19B
-#define FLAG_0x19C 0x19C
-#define FLAG_0x19D 0x19D
-#define FLAG_0x19E 0x19E
-#define FLAG_0x19F 0x19F
-#define FLAG_0x1A0 0x1A0
-#define FLAG_0x1A1 0x1A1
-#define FLAG_0x1A2 0x1A2
-#define FLAG_0x1A3 0x1A3
-#define FLAG_0x1A4 0x1A4
-#define FLAG_0x1A5 0x1A5
-#define FLAG_0x1A6 0x1A6
-#define FLAG_0x1A7 0x1A7
-#define FLAG_0x1A8 0x1A8
-#define FLAG_0x1A9 0x1A9
-#define FLAG_0x1AA 0x1AA
-#define FLAG_0x1AB 0x1AB
-#define FLAG_0x1AC 0x1AC
-#define FLAG_0x1AD 0x1AD
-#define FLAG_0x1AE 0x1AE
-#define FLAG_0x1AF 0x1AF
-#define FLAG_0x1B0 0x1B0
-#define FLAG_0x1B1 0x1B1
-#define FLAG_0x1B2 0x1B2
-#define FLAG_0x1B3 0x1B3
-#define FLAG_0x1B4 0x1B4
-#define FLAG_0x1B5 0x1B5
-#define FLAG_0x1B6 0x1B6
-#define FLAG_0x1B7 0x1B7
-#define FLAG_0x1B8 0x1B8
-#define FLAG_0x1B9 0x1B9
-#define FLAG_0x1BA 0x1BA
-#define FLAG_0x1BB 0x1BB
-#define FLAG_0x1BC 0x1BC
-#define FLAG_0x1BD 0x1BD
-#define FLAG_0x1BE 0x1BE
-#define FLAG_0x1BF 0x1BF
-#define FLAG_0x1C0 0x1C0
-#define FLAG_0x1C1 0x1C1
-#define FLAG_0x1C2 0x1C2
-#define FLAG_0x1C3 0x1C3
-#define FLAG_0x1C4 0x1C4
-#define FLAG_0x1C5 0x1C5
-#define FLAG_0x1C6 0x1C6
-#define FLAG_0x1C7 0x1C7
-#define FLAG_0x1C8 0x1C8
-#define FLAG_0x1C9 0x1C9
-#define FLAG_0x1CA 0x1CA
-#define FLAG_0x1CB 0x1CB
-#define FLAG_0x1CC 0x1CC
-#define FLAG_0x1CD 0x1CD
-#define FLAG_0x1CE 0x1CE
-#define FLAG_0x1CF 0x1CF
-#define FLAG_0x1D0 0x1D0
-#define FLAG_0x1D1 0x1D1
-#define FLAG_0x1D2 0x1D2
-#define FLAG_0x1D3 0x1D3
-#define FLAG_0x1D4 0x1D4
-#define FLAG_0x1D5 0x1D5
-#define FLAG_0x1D6 0x1D6
-#define FLAG_0x1D7 0x1D7
-#define FLAG_0x1D8 0x1D8
-#define FLAG_0x1D9 0x1D9
-#define FLAG_0x1DA 0x1DA
-#define FLAG_0x1DB 0x1DB
-#define FLAG_0x1DC 0x1DC
-#define FLAG_0x1DD 0x1DD
-#define FLAG_0x1DE 0x1DE
-#define FLAG_0x1DF 0x1DF
-#define FLAG_0x1E0 0x1E0
-#define FLAG_0x1E1 0x1E1
-#define FLAG_0x1E2 0x1E2
-#define FLAG_0x1E3 0x1E3
-#define FLAG_0x1E4 0x1E4
-#define FLAG_0x1E5 0x1E5
-#define FLAG_0x1E6 0x1E6
-#define FLAG_0x1E7 0x1E7
-#define FLAG_0x1E8 0x1E8
-#define FLAG_0x1E9 0x1E9
-#define FLAG_0x1EA 0x1EA
-#define FLAG_0x1EB 0x1EB
-#define FLAG_0x1EC 0x1EC
-#define FLAG_0x1ED 0x1ED
-#define FLAG_0x1EE 0x1EE
-#define FLAG_0x1EF 0x1EF
-#define FLAG_0x1F0 0x1F0
-#define FLAG_0x1F1 0x1F1
-#define FLAG_0x1F2 0x1F2
-#define FLAG_0x1F3 0x1F3
-#define FLAG_0x1F4 0x1F4
-#define FLAG_0x1F5 0x1F5
-#define FLAG_0x1F6 0x1F6
-#define FLAG_0x1F7 0x1F7
-#define FLAG_0x1F8 0x1F8
-#define FLAG_0x1F9 0x1F9
-#define FLAG_0x1FA 0x1FA
-#define FLAG_0x1FB 0x1FB
-#define FLAG_0x1FC 0x1FC
-#define FLAG_0x1FD 0x1FD
-#define FLAG_0x1FE 0x1FE
+
+// Item ball hide/show
+#define FLAG_HIDE_ROUTE2_ETHER 0x154
+#define FLAG_HIDE_ROUTE2_PARALYZE_HEAL 0x155
+#define FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL 0x156
+#define FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE 0x157
+#define FLAG_HIDE_VIRIDIAN_FOREST_POTION 0x158
+#define FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL 0x159
+#define FLAG_HIDE_MT_MOON_1F_TM09 0x15A
+#define FLAG_HIDE_MT_MOON_1F_POTION 0x15B
+#define FLAG_HIDE_MT_MOON_1F_RARE_CANDY 0x15C
+#define FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE 0x15D
+#define FLAG_HIDE_MT_MOON_1F_MOON_STONE 0x15E
+#define FLAG_HIDE_MT_MOON_B2F_STAR_PIECE 0x15F
+#define FLAG_HIDE_MT_MOON_B2F_TM46 0x160
+#define FLAG_HIDE_ROUTE4_TM05 0x161
+#define FLAG_HIDE_ROUTE24_TM45 0x162
+#define FLAG_HIDE_ROUTE25_TM43 0x163
+#define FLAG_HIDE_SSANNE_1F_ROOM2_TM31 0x164
+#define FLAG_HIDE_SSANNE_2F_ROOM2_STARDUST 0x165
+#define FLAG_HIDE_SSANNE_2F_ROOM4_X_ATTACK 0x166
+#define FLAG_HIDE_SSANNE_B1F_ROOM2_TM44 0x167
+#define FLAG_HIDE_SSANNE_B1F_ROOM3_ETHER 0x168
+#define FLAG_HIDE_SSANNE_B1F_ROOM5_SUPER_POTION 0x169
+#define FLAG_HIDE_SSANNE_KITCHEN_GREAT_BALL 0x16A
+#define FLAG_HIDE_ROUTE9_TM40 0x16B
+#define FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE 0x16C
+#define FLAG_HIDE_ROCKET_HIDEOUT_B1F_HYPER_POTION 0x16D
+#define FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED 0x16E
+#define FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE 0x16F
+#define FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12 0x170
+#define FLAG_HIDE_ROCKET_HIDEOUT_B2F_SUPER_POTION 0x171
+#define FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY 0x172
+#define FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21 0x173
+#define FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49 0x174
+#define FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER 0x175
+#define FLAG_HIDE_ROCKET_HIDEOUT_B4F_CALCIUM 0x176
+#define FLAG_HIDE_POKEMON_TOWER_3F_ESCAPE_ROPE 0x177
+#define FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR 0x178
+#define FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING 0x179
+#define FLAG_HIDE_POKEMON_TOWER_4F_GREAT_BALL 0x17A
+#define FLAG_HIDE_POKEMON_TOWER_5F_NUGGET 0x17B
+#define FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY 0x17C
+#define FLAG_HIDE_POKEMON_TOWER_6F_X_ACCURACY 0x17D
+#define FLAG_HIDE_ROUTE12_TM48 0x17E
+#define FLAG_HIDE_ROUTE12_IRON 0x17F
+#define FLAG_HIDE_ROUTE15_TM18 0x180
+#define FLAG_HIDE_SAFARI_ZONE_CENTER_NUGGET 0x181
+#define FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION 0x182
+#define FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE 0x183
+#define FLAG_HIDE_SAFARI_ZONE_EAST_TM11 0x184
+#define FLAG_HIDE_SAFARI_ZONE_EAST_LEAF_STONE 0x185
+#define FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN 0x186
+#define FLAG_HIDE_SAFARI_ZONE_NORTH_TM47 0x187
+#define FLAG_HIDE_SAFARI_ZONE_WEST_TM32 0x188
+#define FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH 0x189
+#define FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION 0x18A
+#define FLAG_HIDE_SAFARI_ZONE_WEST_MAX_REVIVE 0x18B
+#define FLAG_HIDE_SILPH_CO_3F_HYPER_POTION 0x18C
+#define FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE 0x18D
+#define FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE 0x18E
+#define FLAG_HIDE_SILPH_CO_4F_FULL_HEAL 0x18F
+#define FLAG_HIDE_SILPH_CO_5F_PROTEIN 0x190
+#define FLAG_HIDE_SILPH_CO_5F_TM01 0x191
+#define FLAG_HIDE_SILPH_CO_5F_CARD_KEY 0x192
+#define FLAG_HIDE_SILPH_CO_6F_HP_UP 0x193
+#define FLAG_HIDE_SILPH_CO_6F_X_SPECIAL 0x194
+#define FLAG_HIDE_SILPH_CO_7F_CALCIUM 0x195
+#define FLAG_HIDE_SILPH_CO_7F_TM08 0x196
+#define FLAG_HIDE_SILPH_CO_10F_CARBOS 0x197
+#define FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL 0x198
+#define FLAG_HIDE_SILPH_CO_10F_RARE_CANDY 0x199
+#define FLAG_HIDE_POWER_PLANT_MAX_POTION 0x19A
+#define FLAG_HIDE_POWER_PLANT_TM17 0x19B
+#define FLAG_HIDE_POWER_PLANT_TM25 0x19C
+#define FLAG_HIDE_POWER_PLANT_THUNDER_STONE 0x19D
+#define FLAG_HIDE_POWER_PLANT_ELIXIR 0x19E
+#define FLAG_HIDE_POKEMON_MANSION_1F_CARBOS 0x19F
+#define FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE 0x1A0
+#define FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM 0x1A1
+#define FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION 0x1A2
+#define FLAG_HIDE_POKEMON_MANSION_3F_IRON 0x1A3
+#define FLAG_HIDE_POKEMON_MANSION_B1F_TM14 0x1A4
+#define FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE 0x1A5
+#define FLAG_0x1A6 0x1A6
+#define FLAG_HIDE_POKEMON_MANSION_B1F_TM22 0x1A7
+#define FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY 0x1A8
+#define FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY 0x1A9
+#define FLAG_HIDE_VICTORY_ROAD_1F_TM02 0x1AA
+#define FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC 0x1AB
+#define FLAG_HIDE_VICTORY_ROAD_2F_TM07 0x1AC
+#define FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL 0x1AD
+#define FLAG_HIDE_VICTORY_ROAD_2F_TM37 0x1AE
+#define FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE 0x1AF
+#define FLAG_HIDE_VICTORY_ROAD_3F_TM50 0x1B0
+#define FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR 0x1B1
+#define FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET 0x1B2
+#define FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE 0x1B3
+#define FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE 0x1B4
+#define FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP 0x1B5
+#define FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL 0x1B6
+#define FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE 0x1B7
+#define FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL 0x1B8
+#define FLAG_HIDE_FUCHSIA_CITY_BUILDING1_RARE_CANDY 0x1B9
+#define FLAG_HIDE_TWO_ISLAND_REVIVE 0x1BA
+#define FLAG_HIDE_THREE_ISLAND_ZINC 0x1BB
+#define FLAG_0x1BC 0x1BC
+#define FLAG_0x1BD 0x1BD
+#define FLAG_HIDE_VIRIDIAN_FOREST_POTION_2 0x1BE
+#define FLAG_HIDE_MT_MOON_B2F_REVIVE 0x1BF
+#define FLAG_HIDE_MT_MOON_B2F_ANTIDOTE 0x1C0
+#define FLAG_HIDE_ROUTE11_X_DEFEND 0x1C1
+#define FLAG_HIDE_ROUTE9_BURN_HEAL 0x1C2
+#define FLAG_HIDE_ROCK_TUNNEL_1F_REPEL 0x1C3
+#define FLAG_HIDE_ROCK_TUNNEL_1F_PEARL 0x1C4
+#define FLAG_HIDE_ROCK_TUNNEL_1F_ESCAPE_ROPE 0x1C5
+#define FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE 0x1C6
+#define FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER 0x1C7
+#define FLAG_HIDE_SILPH_CO_8F_IRON 0x1C8
+#define FLAG_HIDE_SILPH_CO_11F_ZINC 0x1C9
+#define FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN 0x1CA
+#define FLAG_HIDE_POKEMON_MANSION_2F_ZINC 0x1CB
+#define FLAG_HIDE_POKEMON_MANSION_2F_HP_UP 0x1CC
+#define FLAG_HIDE_VIRIDIAN_CITY_POTION 0x1CD
+#define FLAG_HIDE_ROUTE11_GREAT_BALL 0x1CE
+#define FLAG_HIDE_ROUTE11_AWAKENING 0x1CF
+#define FLAG_HIDE_POKEMON_TOWER_5F_CLEANSE_TAG 0x1D0
+#define FLAG_HIDE_CELADON_CITY_ETHER 0x1D1
+#define FLAG_HIDE_ROCKET_HIDEOUT_B3F_BLACK_GLASSES 0x1D2
+#define FLAG_HIDE_SAFARI_ZONE_NORTH_QUICK_CLAW 0x1D3
+#define FLAG_HIDE_SEAFOAM_ISLANDS_1F_ICE_HEAL 0x1D4
+#define FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE 0x1D5
+#define FLAG_HIDE_SEAFOAM_ISLANDS_B1F_REVIVE 0x1D6
+#define FLAG_HIDE_SEAFOAM_ISLANDS_B2F_BIG_PEARL 0x1D7
+#define FLAG_HIDE_SEAFOAM_ISLANDS_B4F_ULTRA_BALL 0x1D8
+#define FLAG_HIDE_FOUR_ISLAND_STAR_PIECE 0x1D9
+#define FLAG_HIDE_FOUR_ISLAND_STARDUST 0x1DA
+#define FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER 0x1DB
+#define FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL 0x1DC
+#define FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_CARBOS 0x1DD
+#define FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION 0x1DE
+#define FLAG_HIDE_FIVE_ISLAND_MEADOW_PP_UP 0x1DF
+#define FLAG_HIDE_FIVE_ISLAND_MEMORIAL_PILLAR_METAL_COAT 0x1E0
+#define FLAG_HIDE_SIX_ISLAND_OUTCAST_ISLAND_PP_UP 0x1E1
+#define FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR 0x1E2
+#define FLAG_HIDE_SIX_ISLAND_WATER_PATH_DRAGON_SCALE 0x1E3
+#define FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE 0x1E4
+#define FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP 0x1E5
+#define FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_SUN_STONE 0x1E6
+#define FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK 0x1E7
+#define FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR 0x1E8
+#define FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET 0x1E9
+#define FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER 0x1EA
+#define FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL 0x1EB
+#define FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ELIXIR 0x1EC
+#define FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL 0x1ED
+#define FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE 0x1EE
+#define FLAG_HIDE_MT_EMBER_EXTERIOR_DIRE_HIT 0x1EF
+#define FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL 0x1F0
+#define FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_HM07 0x1F1
+#define FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE 0x1F2
+#define FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_NEVER_MELT_ICE 0x1F3
+#define FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL 0x1F4
+#define FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36 0x1F5
+#define FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL 0x1F6
+#define FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_UP_GRADE 0x1F7
+#define FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM10_SILK_SCARF 0x1F8
+#define FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM11_LAX_INCENSE 0x1F9
+#define FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM12_SEA_INCENSE 0x1FA
+#define FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM13_MAX_REVIVE 0x1FB
+#define FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM14_RARE_CANDY 0x1FC
+#define FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE_LUCKY_PUNCH 0x1FD
+#define FLAG_HIDE_SILPH_CO_4F_TM41 0x1FE
// Unused?
#define FLAG_0x1FF 0x1FF
diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c
index 803a3fa66..964995d6c 100644
--- a/src/help_system_812B1E0.c
+++ b/src/help_system_812B1E0.c
@@ -1353,7 +1353,7 @@ static bool8 sub_812BB10(void)
return TRUE;
if (FlagGet(FLAG_0x2EF) == TRUE)
return TRUE;
- if (FlagGet(FLAG_0x1F1) == TRUE)
+ if (FlagGet(FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_HM07) == TRUE)
return TRUE;
return FALSE;
}